Packman Build Service PMBS

aircrack-ng.changes Changed

aircrack-ng.spec Changed

@@ -1,8 +1,7 @@
-# vim: set sw=4 ts=4 et:
 #
 # spec file for package aircrack-ng
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,32 +16,31 @@
 #
 
 
+%define pkg_version 1.2-rc4
 %bcond_without unstable
 %bcond_without sqlite
-%define pkg_version 1.2-rc2
-
 Name:           aircrack-ng
-Version:        1.2.rc2
+Version:        1.2.rc4
 Release:        0
-License:        GPL-2.0
 Summary:        A set of tools for auditing wireless networks
-Url:            http://www.aircrack-ng.org/
+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
 Source1:        README.SUSE
 BuildRequires:  gcc-c++
-BuildRequires:	libgcrypt-devel
+BuildRequires:  libgcrypt-devel
+BuildRequires:  libtool
+BuildRequires:  pkg-config
+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
+BuildRequires:  libnl3-devel
 %endif
-BuildRequires:  libtool
-BuildRequires:  pkg-config
-BuildRequires:	sqlite3-devel
-BuildRequires:	zlib-devel
-Requires:	    wireless-tools
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Aircrack-ng is an 802.11 WEP and WPA-PSK keys cracking program that
@@ -71,7 +69,7 @@
         docdir="%{_docdir}/%{name}"
 
 %install
-%makeinstall \
+make %{?_smp_mflags} DESTDIR=%{buildroot} install \
         SQLITE=%{?with_sqlite:true}%{?!with_sqlite:false} \
         EXPERIMENTAL=%{?with_unstable:true}%{?!with_unstable:false} \
         ext_scripts=true \
@@ -83,8 +81,8 @@
         mandir="%{_mandir}/man1" \
         libdir="%{_libdir}" \
         docdir="%{_docdir}/%{name}" \
-        localedir="/usr/share/locale" \
-        DESTDIR="%{buildroot}"
+        localedir="%{_datadir}/locale" \
+        DESTDIR=%{buildroot}
 
 %files
 %defattr(-,root,root)
@@ -116,7 +114,7 @@
 %{_sbindir}/tkiptun-ng
 %{_sbindir}/wesside-ng
 %endif
-%doc %{_mandir}/man1/*.1%{ext_man}
-%doc %{_mandir}/man8/*.8%{ext_man}
+%{_mandir}/man1/*.1%{ext_man}
+%{_mandir}/man8/*.8%{ext_man}
 
 %changelog

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

@@ -1,3 +1,67 @@
+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).
+* Aircrack-ng: Make benchmark last 15 seconds for a more accurate value.
+* Aircrack-ng: Fixed compilation on Cygwin 64 and drastically improve cracking speed for all CPUs (up to +175% performance).
+* Airmon-ng: Improved chipset detection on FreeBSD.
+* Airmon-ng: Display chipset for some Broadcom SDIO.
+* Airbase-ng: Fixed broadcasting 'default'.
+* General: Updated and cleanup TravisCI file to test compilation and testing on OSX.
+* General: Fixed reading large files on Cygwin.
+* General: Fixed a bunch of compilation warnings with gcc and clang.
+* General: Fixed compilation on Solaris, OpenBSD, DragonFlyBSD 4.4, NetBSD, OSX.
+* General: Fixed compilation on ARM and MIPS.
+* General: Improved compatibility on FreeBSD and Cygwin (RAM and CPU detection).
+* General: Fixed gcc segfault on cygwin.
+* General: Memory cleanups, fixed memory leaks and fix other issues reported by Valgrind.
+* Testing: Fixes on various OSes.
+* INSTALLING: Updated installation instructions for different OS.
+* TravisCI: Improved file.
+
+Version 1.2-rc3 (changes from aircrack-ng 1.2-rc2) - Released 21 Nov 2015:
+* Airodump-ng: Prevent sending signal to init which caused the system to reboot/shutdown.
+* Airbase-ng: Allow to use a user-specified ANonce instead of a randomized one when doing the 4-way handshake
+* Aircrack-ng: Fixed compilation warnings.
+* Aircrack-ng: Removed redundant NULL check and fixed typo in another one.
+* Aircrack-ng: Workaround for segfault when compiling aircrack-ng with clang and gcrypt and running a check.
+* Airmon-ng: Created version for FreeBSD.
+* Airmon-ng: Prevent passing invalid values as channel.
+* Airmon-ng: Handle udev renaming interfaces.
+* Airmon-ng: Better handling of rfkill.
+* Airmon-ng: Updated OUI URL.
+* Airmon-ng: Fix VM detection.
+* Airmon-ng: Make lsusb optional if there doesn't seem to be a usb bus.  Improve pci detection slightly.
+* Airmon-ng: Various cleanup and fixes (including wording and typos).
+* Airmon-ng: Display iw errors.
+* Airmon-ng: Improved handling of non-monitor interfaces.
+* Airmon-ng: Fixed error when running 'check kill'.
+* Airdrop-ng: Display error instead of stack trace.
+* Airmon-ng: Fixed bashism.
+* Airdecap-ng: Allow specifying output file names.
+* Airtun-ng: Added missing parameter to help screen.
+* Besside-ng-crawler: Removed reference to darkircop.org (non-existent subdomain).
+* Airgraph-ng: Display error when no graph type is specified.
+* Airgraph-ng: Fixed make install.
+* Manpages: Fixed, updated and improved airodump-ng, airmon-ng, aircrack-ng, airbase-ng and aireplay-ng manpages.
+* Aircrack-ng GUI: Fixes issues with wordlists selection.
+* OSdep: Add missing RADIOTAP_SUPPORT_OVERRIDES check.
+* OSdep: Fix possible infinite loop.
+* OSdep: Use a default MTU of 1500 (Linux only).
+* OSdep: Fixed compilation on OSX.
+* AppArmor: Improved and added profiles.
+* General: Fixed warnings reported by clang.
+* General: Updated TravisCI configuration file
+* General: Fixed typos in various tools.
+* General: Fixed clang warning about 'gcry_thread_cbs()' being deprecated with gcrypt > 1.6.0.
+* General: Fixed compilation on cygwin due to undefined reference to GUID_DEVCLASS_NET
+* 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 compilation on FreeBSD.
+* General: Various fixes and improvements to README (wording, compilation, etc).
+* General: Updated copyrights in help screen.
+
 Version 1.2-rc2 (changes from aircrack-ng 1.2-rc1) - Released 10 April 2015:
 * Airtun-ng: Adds WPA CCMP and TKIP decryption and CCMP encryption
 * Compilation: Added support for DUMA.

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

@@ -1,21 +1,32 @@
 === Requirements ===
 
- * OpenSSL development package or libgcrypt development package
- * pkg-config
+ * 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.
+ * pkg-config (pkgconf on FreeBSD)
+ * FreeBSD, OpenBSD, NetBSD, Solaris and OS X with macports: gmake
+ * Linux/Cygwin: make
+
+=== Optional stuff ===
+
+ * If you want SSID filtering with regular expression in airodump-ng
+   (-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):
-   -  libsqlite3-devel
- * On windows, cygwin has to be used and it also requires w32api and gcc-4 package.
+   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.
- * Linux: LibNetlink 1 or 3. It can be disabled by setting the flag 'libnl' to false.
-          See Makefile flags below.
- * Linux: pkg-config
+ * For best performance on FreeBSD (50-70% more), install gcc5 via: pkg install gcc5
+          Then compile with: gmake CC=gcc5 CXX=g++5
+ * rfkill
 
-=== Compilating ===
+=== Compiling ===
 
  * Compilation:
     make
 
+ * Compilation on *BSD or Solaris:
+    gmake
+
  * Strip debugging symbols:
     make strip
 
@@ -28,10 +39,12 @@
 ==== Makefile flags ====
 
 When compile and installing, the following flags can be used and combined
-to compile and install the suite:
+to compile and install the suite (by setting them to true):
 
-* sqlite:   needed to compile airolib-ng and add support for airolib-ng
-            databases in aircrack-ng.
+* sqlite:   Compile airolib-ng and add support for airolib-ng databases
+            in aircrack-ng:
+            - Debian based distro: libsqlite3-dev
+            - FreeBSD: sqlite3
 
 * airpcap:  needed for supporting airpcap devices on windows (cygwin only)
             REQUIREMENT: Copy 'developers' directory from Airpcap CD one 
@@ -39,7 +52,9 @@
             Note: Not working yet.
 
 * experimental: needed to compile tkiptun-ng, easside-ng (and buddy-ng),
-                wesside-ng and besside-ng
+                wesside-ng and besside-ng.
+                Building besside-ng-crawler requires LibPCAP (development package).
+                On Debian based distributions: libpcap-dev
 
 * ext_scripts: needed to build airoscript-ng, versuck-ng, airgraph-ng and 
             airdrop-ng. 
@@ -48,6 +63,7 @@
 
 * 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):
@@ -55,11 +71,17 @@
 		LibNL 3: libnl-3-dev and libnl-genl-3-dev.
 
 * pcre:	    Add support for regular expression matching for ESSID in airodump-ng and besside-ng.
-            Dependencies (debian): libpcre3-dev
+            Dependencies:
+            - Debian based distro: libpcre3-dev
+            - FreeBSD: pcre
 
 * duma:     Compile with DUMA support. DUMA is a library to detect buffer overruns and under-runs.
             Dependencies (debian): duma
 
+* xcode:    Set this flag to true to compile on OS X with Xcode 7+.
+
+* macport:  Set this flag to true to compile on OS X with macports.
+
 Example:
 
   * Compiling:
@@ -74,6 +96,15 @@
   * Installing, with external scripts:
     make sqlite=true pcre=true experimental=true ext_scripts=true
 
+  * Testing (with sqlite, experimental and pcre)
+    make sqlite=true experimental=true pcre=true check
+
+  * Compiling on OS X with macports (and all options):
+    gmake macport=true sqlite=true experimental=true pcre=true
+
+  * Compiling on FreeBSD with better performance
+    gmake CC=gcc5 CXX=g++5
+
 === Using precompiled binaries ===
 
 Linux/BSD:

aircrack-ng-1.2-rc2.tar.gz/Makefile -> aircrack-ng-1.2-rc4.tar.gz/Makefile Changed

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

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

aircrack-ng-1.2-rc4.tar.gz/apparmor Added

aircrack-ng-1.2-rc4.tar.gz/apparmor/usr.bin.aircrack-ng Added

aircrack-ng-1.2-rc4.tar.gz/apparmor/usr.bin.airdecap-ng Added

aircrack-ng-1.2-rc4.tar.gz/apparmor/usr.bin.airdecloak-ng Added

aircrack-ng-1.2-rc4.tar.gz/apparmor/usr.bin.airgraph-ng Added

aircrack-ng-1.2-rc4.tar.gz/apparmor/usr.bin.airolib-ng Added

aircrack-ng-1.2-rc4.tar.gz/apparmor/usr.bin.buddy-ng Added

aircrack-ng-1.2-rc4.tar.gz/apparmor/usr.bin.ivstools Added

aircrack-ng-1.2-rc4.tar.gz/apparmor/usr.bin.kstats Added

aircrack-ng-1.2-rc4.tar.gz/apparmor/usr.bin.packetforge-ng Added

aircrack-ng-1.2-rc4.tar.gz/apparmor/usr.sbin.airbase-ng Added

aircrack-ng-1.2-rc4.tar.gz/apparmor/usr.sbin.aireplay-ng Added

aircrack-ng-1.2-rc4.tar.gz/apparmor/usr.sbin.airmon-ng Added

@@ -0,0 +1,179 @@
+#include <tunables/global>
+
+/usr/sbin/airmon-ng {
+  #include <abstractions/base>
+  #include <abstractions/bash>
+  #include <abstractions/private-files-strict>
+
+  /usr/sbin/airmon-ng rix,
+  
+  /bin/cat rix,
+  
+  /bin/dmesg rCx,
+  profile /bin/dmesg {
+    #include <abstractions/base>
+
+    /bin/dmesg mr,
+  }
+  
+  /bin/*sh ix,
+  /bin/grep rix,
+
+  /bin/ip rCx,  
+  profile /bin/ip {
+    #include <abstractions/base>
+
+    /bin/ip mr,
+    
+    capability net_admin,
+  }
+  
+  /bin/kmod rCx,
+  profile /bin/kmod {
+    #include <abstractions/base>
+
+    /bin/kmod mr,
+
+    /proc/cmdline r,
+  }
+  
+  /bin/ps rCx,
+  profile /bin/ps {
+    #include <abstractions/base>
+
+    /bin/ps mr,
+
+    capability sys_ptrace,
+    capability dac_override,
+    
+    ptrace (trace),
+    ptrace (read),
+  
+    /proc/ r,
+    /proc/*/ r,
+    /proc/*/maps r,
+    /proc/*/net/dev r,
+    /proc/*/stat r,
+    /proc/*/status r,
+    /proc/*/task/ r,
+    /proc/sys/kernel/pid_max r,
+    /proc/tty/drivers r,
+    /proc/uptime r,
+  }
+  
+  /bin/readlink rix,
+  /bin/sed rix,
+  /bin/sleep rix,
+  /bin/uname rix,
+  /dev/bus/usb/ r,
+  /dev/rfkill rix,
+  /dev/tty* r,
+  /dev/vmnet r,
+  /etc/udev/udev.conf r,
+  /proc/*/net/dev r,
+  /proc/*/net/psched r,
+  /proc/bus/pci/ r,
+  /proc/ide/hd*/model r,
+  /proc/filesystems r,
+  /proc/meminfo r,
+  /proc/scsi/scsi/ r,
+  /proc/sys/dev/*/fftxqmin r,
+  
+  /sbin/ethtool rCx,
+  profile /sbin/ethtool {
+    #include <abstractions/base>
+
+    /sbin/ethtool mr,
+    
+      capability net_admin,
+      capability net_raw,
+      
+      network,
+  }
+  
+  /sbin/ifconfig rCx,
+  profile /sbin/ifconfig {
+    #include <abstractions/base>
+
+    /sbin/ifconfig mr,
+  }
+  
+  
+  /sbin/iw rCx,
+  profile /sbin/iw {
+    #include <abstractions/base>
+
+    /sbin/iw mr,
+    
+    capability net_admin,
+    
+    /proc/net/psched r,
+    /sys/class/ieee80211/ r,
+    /sys/class/ieee80211/** r,
+    /sys/devices/** r,
+    /proc/*/net/psched r,
+  }
+  
+  /sbin/iwconfig rCx,
+  profile /sbin/iwconfig {
+    #include <abstractions/base>
+
+    /sbin/iwconfig mr,
+      
+      capability net_admin,
+      capability net_raw,
+      
+      network inet dgram,
+      
+      /proc/filesystems r,
+      /proc/*/net/dev r,
+  }
+  
+  /sbin/modinfo rCx,
+  profile /sbin/modinfo {
+    #include <abstractions/base>
+
+    /sbin/modinfo mr,
+    
+    /proc/cmdline r,
+  }
+  
+  /sbin/modprobe rCx,
+  profile /sbin/modprobe {
+    #include <abstractions/base>
+
+    /sbin/modprobe mr,
+  }
+  
+  
+  /sys/bus/ r,
+  /sys/bus/pci r,
+  /sys/bus/pci_express r,
+  /sys/bus/usb/devices/ r,
+  /sys/class/ r,
+  /sys/class/ieee80211/ r,
+  /sys/class/ieee80211/** r,
+  /sys/class/net/ r,
+  /sys/class/net/** r,
+  /sys/devices/** r,
+  /sys/module/ r,
+  /usr/bin/basename rix,
+  /usr/bin/cut rix,
+  /usr/bin/*awk rix,
+  /usr/bin/head rix,
+  /usr/bin/id rix,
+  /usr/bin/lspci rix,
+  /usr/bin/lscpu rix,
+  /usr/bin/lsusb rix,
+  /usr/bin/sort rix,
+  
+  /usr/sbin/dmidecode rCx,
+  profile /usr/sbin/dmidecode {
+    #include <abstractions/base>
+
+    /usr/sbin/dmidecode mr,
+  }
+
+  /usr/sbin/rfkill rix,
+  /var/lib/usbutils/usb.ids r,
+}

aircrack-ng-1.2-rc4.tar.gz/apparmor/usr.sbin.airodump-ng Added

aircrack-ng-1.2-rc4.tar.gz/apparmor/usr.sbin.airserv-ng Added

aircrack-ng-1.2-rc4.tar.gz/apparmor/usr.sbin.airtun-ng Added

aircrack-ng-1.2-rc4.tar.gz/apparmor/usr.sbin.easside-ng Added

aircrack-ng-1.2-rc4.tar.gz/apparmor/usr.sbin.tkiptun-ng Added

aircrack-ng-1.2-rc4.tar.gz/apparmor/usr.sbin.wesside-ng Added

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

@@ -0,0 +1,210 @@
+#!/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

aircrack-ng-1.2-rc2.tar.gz/common.mak -> aircrack-ng-1.2-rc4.tar.gz/common.mak Changed

@@ -1,5 +1,13 @@
 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
@@ -20,7 +28,12 @@
 SQLITE		= false
 else
 EXE		=
+ifeq ($(OSNAME), SunOS)
+PIC		=
+LDFLAGS		+= -lsocket -lnsl
+else
 PIC		= -fPIC
+endif
 ifndef SQLITE
 SQLITE		= true
 endif
@@ -28,7 +41,14 @@
 
 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
@@ -106,9 +126,18 @@
 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
@@ -117,8 +146,65 @@
 REVISION	= $(shell $(AC_ROOT)/evalrev $(AC_ROOT))
 REVFLAGS	?= -D_REVISION=$(REVISION)
 
-OPTFLAGS        = -D_FILE_OFFSET_BITS=64
-CFLAGS          ?= -g -W -Wall -O3
+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
@@ -131,6 +217,7 @@
 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 }'`)
@@ -144,7 +231,6 @@
 	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
@@ -158,6 +244,7 @@
 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

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

@@ -1,4 +1,4 @@
-.TH AIRBASE-NG 8 "April 2015" "Version 1.2-rc2"
+.TH AIRBASE-NG 8 "February 2016" "Version 1.2-rc4"
 
 .SH NAME
 airbase-ng - multi-purpose tool aimed at attacking clients as opposed to the Access Point (AP) itself
@@ -141,6 +141,9 @@
 .TP
 .I -C <seconds>
 The wildcard ESSIDs will also be beaconed this number of seconds. A good typical value to use is "-C 60" (require -P).
+.TP
+.I -n <hex>
+ANonce (nonce from the AP) to use instead of a randomized one. It must be 64 hexadecimal characters.
 .PP
 .TP
 .B Filter options:
@@ -161,7 +164,7 @@
 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
 .TP
 .I --essids <file>, -E <file>
-read a list of ESSIDs out of that 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/
 .SH AUTHOR
 This manual page was written by Thomas d\(aqOtreppe.
 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

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

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

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

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

@@ -1,4 +1,4 @@
-.TH AIREPLAY-NG 8 "April 2015" "Version 1.2-rc2"
+.TH AIREPLAY-NG 8 "February 2016" "Version 1.2-rc4"
 
 .SH NAME
 aireplay-ng - inject packets into a wireless network to generate traffic
@@ -140,7 +140,7 @@
 Of course, this attack is totally useless if there are no associated wireless client or on fake authentications.
 .TP
 .I -1 <delay>, --fakeauth=<delay>
-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 useful 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.
+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.
 .TP
 .I -2, --interactive
 This attack allows you to choose a specific packet for replaying (injecting). The attack can obtain packets to replay from two sources. The first being a live flow of packets from your wireless card. The second being from a pcap file. Reading from a file is an often overlooked feature of aireplay-ng. This allows you read packets from other capture sessions or quite often, various attacks generate pcap files for easy reuse. A common use of reading a file containing a packet your created with packetforge-ng.

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

@@ -1,7 +1,7 @@
-.TH AIRMON-NG 8 "April 2015" "Version 1.2-rc2"
+.TH AIRMON-NG 8 "February 2016" "Version 1.2-rc4"
 
 .SH NAME
-airmon-ng - bash script designed to turn wireless cards into monitor mode.
+airmon-ng - POSIX sh script designed to turn wireless cards into monitor mode.
 .SH SYNOPSIS
 .B airmon-ng
 <start|stop> <interface> [channel]
@@ -9,21 +9,36 @@
 <check> [kill]
 .SH DESCRIPTION
 .BI airmon-ng
-is script can be used to enable monitor mode on wireless interfaces. It may also be used to go back from monitor mode to managed mode. Entering the airmon-ng command without parameters will show the interfaces status. 
-It can list/kill programs that can interfere with the wireless card and set the right sources in /etc/kismet/kismet.conf too.
+This script can be used to enable monitor mode on wireless interfaces. It may also be used to go back from monitor mode to managed mode. Entering the airmon-ng command without parameters will show the interfaces status. 
+It can also list/kill programs that can interfere with the wireless card operation.
 .SH OPTIONAL PARAMETERS
 .PP
 .TP
 .I start <interface> [channel]
 Enable monitor mode on an interface (and specify a channel). Note: Madwifi-ng is a special case, \(aqstart\(aq has to be used on wifi interfaces and \(aqstop\(aq on ath interfaces.
+.TP
 .I stop <interface>
 Disable monitor mode and go back to managed mode (except for madwifi-ng where it kills the ath VAP).
 .TP
 .I check [kill]
 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 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 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
+WARNING: DO NOT USE: This flag must precede start or stop and will prevent airmon-ng from removing interfaces. 
+WARNING: Use of this flag will immediately disqualify receiving any support from the aircrack-ng team, due to the fact that this behavior is known to be broken. WARNING!
+
 .SH AUTHOR
 This manual page was written by Adam Cecile <gandalf@le-vert.net> for the Debian system (but may be used by others).
 And modified to fit airmon-ng by David Francos Cuartero <xayon@xayon.net>.
+Most recently modified by Zero_Chaos to update for the airmon-zc rewrite.
 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
 On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -4,106 +4,109 @@
 ELITE="0"
 USERID=""
 IFACE=""
+checkvm_status=""
 MAC80211=0
-IW_SOURCE="https://www.kernel.org/pub/software/network/iw/iw-4.0.tar.gz"
+IW_SOURCE="https://www.kernel.org/pub/software/network/iw/iw-4.3.tar.gz"
 IW_ERROR=""
-UDEV_ISSUE=0
-SYSFS=0
-if [ -d /sys/ ]
-then
-	SYSFS=1
+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
+if [ "${1}" = "--elite" ]; then
 	shift
 	ELITE="1"
 fi
 
-if [ "${1}" = "--verbose" ]
-then
+if [ "${1}" = "--verbose" ]; then
 	shift
 	VERBOSE="1"
 fi
 
-if [ "${1}" = "--debug" ]
-then
+if [ "${1}" = "--debug" ]; then
 	shift
 	DEBUG="1"
 	VERBOSE="1"
 fi
 
 #yes, I know this is in here twice
-if [ "${1}" = "--elite" ]
-then
+if [ "${1}" = "--elite" ]; then
 	shift
 	ELITE="1"
 fi
 
 
-CH=${3}; [ x${3} = "x" ] && CH=10
+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 [ x"$(command -v id 2> /dev/null)" != "x" ]
-then
+if [ -n "$(command -v id 2> /dev/null)" ]; then
 	USERID="$(id -u 2> /dev/null)"
 fi
 
-if [ x${USERID} = "x" -a x"$(id -ru)" != "x" ]
-then
+if [ -z "${USERID}" ] && [ -n "$(id -ru)" ]; then
 	USERID="$(id -ru)"
 fi
 
-if [ x${USERID} != "x" -a x${USERID} != "x0" ]
-then
+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
+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
-#	#write something in here to test uname for Darwin/Linux and set a variable
+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
+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
+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
+if [ ! -x "$(command -v ethtool 2>&1)" ]; then
 	printf "Please install the ethtool package for your distro.\n"
 	exit 1
 fi
 
-if [ ! -x "$(command -v lsusb 2>&1)" ]
-then
-	printf "Please install lsusb from your distro's package manager.\n"
-	exit 1
+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 /proc/bus/pci ]
-then
-	if [ ! -x "$(command -v lspci 2>&1)" ]
-	then
+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
@@ -113,18 +116,15 @@
 	LSPCI=0
 fi
 
-if [ -f /proc/modules ]
-then
-	if [ ! -x "$(command -v modprobe 2>&1)" ]
-	then
+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
+	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"
@@ -132,17 +132,29 @@
 	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
+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)" ]

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

@@ -1,12 +1,127 @@
 #!/bin/sh
 
-cat << EOF
-On $(uname), it is not necessary to use airmon-ng to enable the monitor
-mode of your wireless card. Instead, you need to specify this mode when
-creating your wlan device. For example:
 
-        ifconfig wlan0 create wlandev ath0 wlanmode monitor
 
-EOF
+if [ -n "$1" ] && [ -z "$2" ]; then
+	echo "Invalid command. Valid commands: [start|stop] INTERFACE."
+	exit 1
+fi
+
+if [ -n "$1" ]; then
+	if [ "$1" != 'stop' ] && [ "$1" != 'start' ]; then
+		echo "Invalid command. Valid commands: [start|stop] INTERFACE."
+		exit 1
+	fi
+fi
+
+if [ -n "$2" ]; then
+	ifconfig $2 >/dev/null 2>/dev/null
+	if [ $? -ne 0 ]; then
+		echo "Error: Interface $2 does not exist."
+		exit 1
+	fi
+fi
+
+COMMAND=$1
+INTERFACE_TO_USE=$2
+
+CHIPSET=""
+DRIVER=""
+PARENT=""
+
+get_interface_info() {
+	[ -z "$1" ] && return
+	if [ -n "$(echo $1 | grep -E '^(ath|otus|urtwn)[0-9]+$' )" ]; then
+		DRIVER="$(echo $1 | sed 's/[0-9]*//g')"
+	elif [ -n "$(echo $1 | grep -E ^wlan[0-9]+$)" ]; then
+		# It most likely is a monitor interface.
+		IFACE_IDX=$(echo $1 | sed 's/[^0-9]*//g')
+		PARENT=$(sysctl net.wlan.${IFACE_IDX}.%parent | awk '{print $2}')
+		if [ -n "${PARENT}" ]; then
+			get_interface_info ${PARENT}
+			return
+		fi
+	fi	
+
+	if [ "${DRIVER}" = "ath" ]; then
+		CHIPSET=$(dmesg | grep -E "^$1: <" | tail -n 1 | awk -F\< '{print $2}' | awk -F\> '{print $1}' )
+	elif [ "${DRIVER}" = "urtwn" ]; then
+		USB_INFO=$(dmesg | grep -E "^$1: <" | tail -n 1 | tr ',' '\n' | tail -n 1 | tr '>' ' ')
+		USB_ADDR=$(echo ${USB_INFO} | awk '{print $2}')
+		USB_BUS=$(echo ${USB_INFO} | awk '{print $4}' | sed 's/[^0-9]*//g')
+		VENDOR_ID=$(usbconfig -u ${USB_BUS} -a ${USB_ADDR} dump_device_desc | grep idVendor | awk '{print $3}')
+		PRODUCT_ID=$(usbconfig -u ${USB_BUS} -a ${USB_ADDR} dump_device_desc | grep idProduct | awk '{print $3}')
+		if [ "${VENDOR_ID}" = "0x0bda" ]; then
+			[ "${PRODUCT_ID}" = "0x8171" ] && CHIPSET="RTL8188SU"
+			[ "${PRODUCT_ID}" = "0x8172" ] && CHIPSET="RTL8191SU"
+			[ "${PRODUCT_ID}" = "0x8174" ] && CHIPSET="RTL8192SU"
+			[ "${PRODUCT_ID}" = "0x8176" ] && CHIPSET="RTL8188CUS"
+			[ "${PRODUCT_ID}" = "0x8178" ] && CHIPSET="RTL8192CU"
+			[ "${PRODUCT_ID}" = "0x8179" ] && CHIPSET="RTL8188EUS"
+			[ "${PRODUCT_ID}" = "0x817f" ] && CHIPSET="RTL8188RU"
+			[ "${PRODUCT_ID}" = "0x8192" ] && CHIPSET="RTL8191SU"
+			[ "${PRODUCT_ID}" = "0x8193" ] && CHIPSET="RTL8192DU"
+			[ "${PRODUCT_ID}" = "0x8199" ] && CHIPSET="RTL8187SU"
+			[ "${PRODUCT_ID}" = "0x8812" ] && CHIPSET="RTL8812AU"
+		elif [ "${VENDOR_ID}" = "0x06f8" ] && [ "${PRODUCT_ID}" = "0xe033" ]; then
+			CHIPSET="RTL8188CUS"
+		elif [ "${VENDOR_ID}" = "0x2001" ] && [ "${PRODUCT_ID}" = "0x3308" ]; then
+			CHIPSET="RTL8188CUS"
+		elif [ "${VENDOR_ID}" = "0x20f4" ] && [ "${PRODUCT_ID}" = "0x648b" ]; then
+			CHIPSET="RTL8188CUS"
+		elif [ "${VENDOR_ID}" = "0x7392" ] && [ "${PRODUCT_ID}" = "0x7811" ]; then
+			CHIPSET="RTL8188CUS"
+		elif [ "${VENDOR_ID}" = "0x2019" ]; then
+			[ "${PRODUCT_ID}" = "0xab2a" ] && CHIPSET="RTL8188CUS"
+			[ "${PRODUCT_ID}" = "0xed17" ] && CHIPSET="RTL8188CUS"
+		elif [ "${VENDOR_ID}" = "0x050d" ]; then
+			[ "${PRODUCT_ID}" = "0x1102" ] && CHIPSET="RTL8188CUS"
+			[ "${PRODUCT_ID}" = "0x11f2" ] && CHIPSET="RTL8188CUS"
+		elif [ "${VENDOR_ID}" = "0x0846" ]; then
+			[ "${PRODUCT_ID}" = "0x9041" ] && CHIPSET="RTL8188CUS"
+			[ "${PRODUCT_ID}" = "0x9042" ] && CHIPSET="RTL8188CUS"
+			[ "${PRODUCT_ID}" = "0x9043" ] && CHIPSET="RTL8188CUS"
+		fi
+		[ -z "${CHIPSET}" ] && CHIPSET="Report dmesg and usbconfig (dump commands) to http://trac.aircrack-ng.org" 
+	elif [ -n "${DRIVER}" ]; then
+		CHIPSET="Report dmesg and usbconfig (dump commands) to http://trac.aircrack-ng.org"
+	else
+		CHIPSET="Unknown"
+		[ -z "${DRIVER}" ] && DRIVER="Unknown"
+	fi
+}
+
+printf "\nInterface\tDriver\t\tChipset\n\n"
+
+for IFACE in $(ifconfig -a | grep -E '^(wlan|ath|otus|urtwn)[0-9]+' | awk -F: '{print $1}' )
+do
+	get_interface_info ${IFACE}
+	printf "${IFACE}\t\t${DRIVER}\t\t${CHIPSET}\n\n"
+	if [ -n "${PARENT}" ]; then
+		printf "\t(monitor mode interface. Parent: ${PARENT})\n"
+	fi
+
+	if [ "${INTERFACE_TO_USE}" = "${IFACE}" ]; then
+		if [ "${COMMAND}" = 'start' ]; then
+			if [ -n "${PARENT}" ]; then
+				printf "\t Interface is already in monitor mode, ignoring\n"
+			else
+				MONITOR_IFACE=$(ifconfig wlan create wlandev ${IFACE} wlanmode monitor)
+				if [ $? -eq 0 ]; then
+					 printf "\tCreated monitor mode interface ${MONITOR_IFACE} from ${IFACE}\n"
+				else
+					printf "\tFailed creating monitor interface\n"
+				fi
+			fi
+		elif [ "${COMMAND}" = 'stop' ]; then
+			ifconfig ${IFACE} destroy 2>/dev/null
+			if [ $? -ne 0 ]; then
+				printf "\tFailed to remove monitor mode interface ${IFACE}\n"
+			else
+				printf "\tDestroyed monitor interface ${IFACE}\n"
+			fi
+		fi
+	fi 
+done
 
 exit 0

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

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

@@ -0,0 +1,217 @@
+/*
+ * 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.
+ */

aircrack-ng-1.2-rc2.tar.gz/src/Makefile -> aircrack-ng-1.2-rc4.tar.gz/src/Makefile Changed

@@ -5,9 +5,9 @@
 
 CFLAGS		+= -Iinclude
 
-iCC             = $(shell find /opt/intel/cc/*/bin/icc)
-iCFLAGS         = -w -mcpu=pentiumpro -march=pentiumpro $(COMMON_CFLAGS)
-iOPTFLAGS       = -O3 -ip -ipo -D_FILE_OFFSET_BITS=64
+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) \
@@ -34,7 +34,7 @@
 
 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/*
 
@@ -44,11 +44,39 @@
 	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 $(SRC_PTW)
+SRC_AC		= aircrack-ng.c crypto.c common.c $(SSEC_INT) $(SRC_PTW)
 OBJS_PTW	= aircrack-ptw-lib.o
-OBJS_AC		= aircrack-ng.o crypto.o common.o uniqueiv.o $(OBJS_PTW)
+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
@@ -81,6 +109,8 @@
 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
@@ -107,10 +137,20 @@
 	LIBSQL		=
 endif
 
-all: userland $(SBINFILES)
+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)
 
@@ -130,7 +170,24 @@
 	aircrack-ng-opt-prof -lpthread $(LIBSQL)
 
 aircrack-ng$(EXE): $(OBJS_AC)
-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_AC) $(ASM_AC) -o $(@) -lpthread $(LIBSSL) $(LIBSQL)
+	$(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)
@@ -194,7 +251,7 @@
 
 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
+	-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
 
@@ -234,6 +291,10 @@
 	./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)

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

@@ -2,7 +2,7 @@
  *  802.11 monitor AP
  *  based on airtun-ng
  *
- *  Copyright (C) 2008-2015 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *  Copyright (C) 2008-2016 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
@@ -58,6 +58,7 @@
 #include <getopt.h>
 #include <sys/file.h>
 #include <fcntl.h>
+
 #include <ctype.h>
 
 #include "version.h"
@@ -69,8 +70,11 @@
 #include "osdep/osdep.h"
 #include "osdep/common.h"
 
+// libgcrypt thread callback definition for libgcrypt < 1.6.0
 #ifdef USE_GCRYPT
-    GCRY_THREAD_OPTION_PTHREAD_IMPL;
+    #if GCRYPT_VERSION_NUMBER < 0x010600
+        GCRY_THREAD_OPTION_PTHREAD_IMPL;
+    #endif
 #endif
 
 static struct wif *_wi_in, *_wi_out;
@@ -154,9 +158,11 @@
 
 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-2014 Thomas d'Otreppe\n"
+"  %s - (C) 2008-2015 Thomas d'Otreppe\n"
 "  Original work: Martin Beck\n"
 "  http://www.aircrack-ng.org\n"
 "\n"
@@ -194,6 +200,7 @@
 "      -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"
@@ -271,6 +278,10 @@
 
     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;
 
@@ -399,6 +410,7 @@
 pthread_t cfragpid;
 
 pESSID_t    rESSID;
+pthread_mutex_t	rESSIDmutex;
 pMAC_t      rBSSID;
 pMAC_t      rClient;
 pFrag_t     rFragment;
@@ -416,17 +428,21 @@
 int addESSID(char* essid, int len, int expiration)
 {
     pESSID_t tmp;
-	pESSID_t cur = rESSID;
+	pESSID_t cur;
 	time_t now;
-
     if(essid == NULL)
         return -1;
 
     if(len <= 0 || len > 255)
         return -1;
 
-    if(rESSID == NULL)
+    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
@@ -435,6 +451,7 @@
                 time(&now);
                 cur->expire = now + expiration;
             }
+            pthread_mutex_unlock(&rESSIDmutex);
             return 0;
         }
         cur = cur->next;
@@ -460,6 +477,7 @@
     tmp->next = NULL;
 	cur->next = tmp;
 
+    pthread_mutex_unlock(&rESSIDmutex);
     return 0;
 }
 
@@ -467,8 +485,13 @@
 {
     struct pcap_pkthdr pkh;
     struct timeval tv;
-
     int n;
+#if defined(__sun__)
+	struct flock fl;
+	fl.l_start = 0;
+	fl.l_len = 0;
+	fl.l_whence = SEEK_SET;
+#endif
 
     if( opt.f_cap != NULL && length >= 10)
     {
@@ -481,13 +504,23 @@
 
         n = sizeof( pkh );
 
-        flock(fileno(opt.f_cap), LOCK_EX);
+#if defined(__sun__)
+	fl.l_type = F_WRLCK;
+	fcntl(fileno(opt.f_cap), F_SETLKW, &fl);
+#else
+	flock(fileno(opt.f_cap), LOCK_EX);
+#endif
         if( fwrite( &pkh, 1, n, opt.f_cap ) != (size_t) n )
         {
-            perror( "fwrite(packet header) failed" );
-            flock(fileno(opt.f_cap), LOCK_UN);
-            return( 1 );
-        }
+		perror( "fwrite(packet header) failed" );
+#if defined(__sun__)
+		fl.l_type = F_UNLCK;
+		fcntl(fileno(opt.f_cap), F_GETLK, &fl);
+#else
+		flock(fileno(opt.f_cap), LOCK_UN);
+#endif
+		return( 1 );
+	}
 
         fflush( stdout );
 
@@ -495,15 +528,25 @@
 
         if( fwrite( packet, 1, n, opt.f_cap ) != (size_t) n )
         {
-            perror( "fwrite(packet data) failed" );
-            flock(fileno(opt.f_cap), LOCK_UN);
-            return( 1 );
+		perror( "fwrite(packet data) failed" );
+#if defined(__sun__)
+		fl.l_type = F_UNLCK;
+		fcntl(fileno(opt.f_cap), F_GETLK, &fl);
+#else
+		flock(fileno(opt.f_cap), LOCK_UN);
+#endif
+		return( 1 );
         }
 
         fflush( stdout );
 
         fflush( opt.f_cap );
-        flock(fileno(opt.f_cap), LOCK_UN);
+#if defined(__sun__)
+	fl.l_type = F_UNLCK;
+	fcntl(fileno(opt.f_cap), F_GETLK, &fl);
+#else
+	flock(fileno(opt.f_cap), LOCK_UN);
+#endif
     }
     return 0;
 }
@@ -896,7 +939,7 @@
 
 int delESSID(char* essid, int len)
 {
-    pESSID_t old, cur = rESSID;
+    pESSID_t old, cur;
 
     if(essid == NULL)
         return -1;
@@ -904,8 +947,13 @@
     if(len <= 0 || len > 255)
         return -1;
 
-    if(rESSID == NULL)
+    pthread_mutex_lock(&rESSIDmutex);

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

@@ -1,7 +1,7 @@
 /*
  *  802.11 WEP / WPA-PSK Key Cracker
  *
- *  Copyright (C) 2006-2015 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *  Copyright (C) 2006-2016 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
  *  Copyright (C) 2004, 2005 Christophe Devine
  *
  *  Advanced WEP attacks developed by KoreK
@@ -70,18 +70,21 @@
 #include "osdep/byteorder.h"
 #include "common.h"
 #include "wkp-frame.h"
+#include "linecount.h"
+#include "wpapsk.h"
 
 #ifdef HAVE_SQLITE
 #include <sqlite3.h>
 sqlite3 *db;
 #endif
 
+// libgcrypt thread callback definition for libgcrypt < 1.6.0
 #ifdef USE_GCRYPT
-	GCRY_THREAD_OPTION_PTHREAD_IMPL;
+	#if GCRYPT_VERSION_NUMBER < 0x010600
+		GCRY_THREAD_OPTION_PTHREAD_IMPL;
+	#endif
 #endif
 
-extern int get_nb_cpus();
-
 static unsigned char ZERO[32] =
 "\x00\x00\x00\x00\x00\x00\x00\x00"
 "\x00\x00\x00\x00\x00\x00\x00\x00"
@@ -94,11 +97,13 @@
 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        */
 
 /* 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  */
@@ -151,6 +156,7 @@
 }
 read_buf;
 
+read_buf rb, crb;
 
 int K_COEFF[N_ATTACKS] =
 {
@@ -181,7 +187,7 @@
 
 char usage[] =
 "\n"
-"  %s - (C) 2006-2014 Thomas d\'Otreppe\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"
@@ -240,7 +246,7 @@
 "\n";
 
 
-char * progname;
+char * progname = NULL;
 int intr_read = 0;
 
 int safe_write( int fd, void *buf, size_t len );
@@ -250,6 +256,7 @@
 	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;
@@ -275,16 +282,53 @@
             #endif
         }
 
-	if( opt.amode != 2 )
-	{
-		for(i=0; i<id; i++)
-		{
-			if(pthread_join(tid[i], NULL) != 0)
-			{
+	for (i = 0; i < id; i++) {
+		if (pthread_join(tid[i], NULL) != 0) {
 //	 			printf("Can't join thread %d\n", i);
+		}
+	}
+
+#ifndef OLD_SSE_CORE
+	for (i = 0; i < MAX_THREADS; i++)
+		free_ssecore(i);
+#endif
+
+	if (opt.totaldicts) {
+		for (i = 0; i < opt.totaldicts; i++) {
+			if (opt.dicts[i] != NULL) {
+				free(opt.dicts[i]);
+				opt.dicts[i] = NULL;
 			}
 		}
+	}
+
+	if (rb.buf1 != NULL)
+	{
+		free(rb.buf1);
+		rb.buf1=NULL;
+	}
+
+	if (rb.buf2 != NULL)
+	{
+		free(rb.buf2);
+		rb.buf2=NULL;
+	}
+
+	if (crb.buf1 != NULL)
+	{
+		free(crb.buf1);
+		crb.buf1=NULL;
+	}
 
+	if (crb.buf2 != NULL)
+	{
+		free(crb.buf2);
+		crb.buf2=NULL;
+	}
+
+	if (buffer != NULL) {
+		free(buffer);
+		buffer = NULL;
 	}
 
 	if(wep.ivbuf != NULL)
@@ -304,7 +348,16 @@
 			ap_cur->ivbuf = NULL;
 		}
 
+
+		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;
+		}
+
 		uniqueiv_wipe( ap_cur->uiv_root );
+		ap_cur->uiv_root = NULL;
 
 		if( ap_cur->ptw_clean != NULL )
 		{
@@ -336,14 +389,14 @@
 
 	while( ap_cur != NULL )
 	{
-		ap_next = ap_cur->next;
-
-		if( ap_cur != NULL )
-			free(ap_cur);
-
-		ap_cur = ap_next;
+		ap_next = ap_cur;
+		ap_cur = ap_cur->next;
+		free(ap_next);
+		ap_next = NULL;
 	}
 
+	ap_prv = NULL;
+
 // 	attack = A_s5_1;
 // 	printf("Please wait for evaluation...\n");
 // 	for(i=0; i<(256*256*256); i++)
@@ -361,6 +414,11 @@
 // 	printf("%d unused IVs\n", j);
 // 	printf("%d used IVs for %d\n", k, attack);
 
+	if (progname != NULL) {
+		free(progname);
+		progname = NULL;
+	}
+
 	child_pid=fork();
 
 	if(child_pid==-1)
@@ -382,7 +440,12 @@
 	#if ((defined(__INTEL_COMPILER) || defined(__ICC)) && defined(DO_PGO_DUMP))
 	_PGOPTI_Prof_Dump();
 	#endif
-	signal( signum, sighandler );
+#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

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

@@ -37,9 +37,16 @@
 
 #include <stdint.h>
 #include <stdio.h>
+#include <time.h>
+#include <sys/time.h>
+#if defined(__FreeBSD__)
+#include <unistd.h>
+#endif
 #include "aircrack-ptw-lib.h"
 #include "eapol.h"
 
+#include <pthread.h>
+
 #define SUCCESS  0
 #define FAILURE  1
 #define RESTART  2
@@ -80,14 +87,32 @@
 	uint8_t pmk[32];
 } __attribute__ ((packed));
 
+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*/
+};
 
+extern float chrono(struct timeval *start, int reset);
 
 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 readLine(char line[], int maxlength);
 extern int hexToInt(char s[], int len);
 extern int hexCharToInt(unsigned char c);
-
+extern int cpuid_simdsize();
+extern int cpuid_getinfo();
+extern struct _cpuinfo cpuinfo;
+extern int get_nb_cpus();
 
 #define S_LLC_SNAP      "\xAA\xAA\x03\x00\x00\x00"
 #define S_LLC_SNAP_ARP  (S_LLC_SNAP "\x08\x06")
@@ -118,6 +143,13 @@
 	A_neg						 /* helps reject false positives */
 };
 
+struct dictfiles {
+	off_t	dictsize;			/* Total file size */
+	off_t	dictpos;			/* Current position of dictionary */
+	off_t	wordcount;			/* Total amount of words in dict file */
+	int	loaded;				/* Have finished processing? */
+} dicts;
+
 struct options
 {
 	int amode;					 /* attack mode          */
@@ -152,7 +184,10 @@
 	int nbdict;				 /* current dict number  */
 	int no_stdin;				 /* if dict == stdin     */
 	int hexdict[MAX_DICTS];			 /* if dict in hex       */
-
+	long long int wordcount;		/* Total wordcount for all dicts*/
+	struct dictfiles dictidx[MAX_DICTS];	/* Dictionary structure		*/
+	int totaldicts;				/* total loaded dictionaries	*/
+	int dictfinish;				/* finished processing all dicts*/
 	int showASCII;				 /* Show ASCII version of*/
 								 /* the wepkey           */
 
@@ -186,7 +221,7 @@
         int forced_amode;	/* signals disregarding automatic detection of encryption type */
 
 	char * wkp;					 /* EWSA Project file */
-	char * hccap;				         /* Hashcat capture file */                  
+	char * hccap;				         /* Hashcat capture file */
 
 }
 
@@ -249,6 +284,7 @@
 struct WPA_data {
 	struct AP_info* ap;				/* AP information */
 	int	thread;						/* number of this thread */
+	int	threadid;						/* id of this thread */
 	int nkeys;						/* buffer capacity */
 	char *key_buffer;				/* queue as a circular buffer for feeding and consuming keys */
 	int front;						/* front marker for the circular buffers */
@@ -261,5 +297,4 @@
 
 void show_wep_stats( int B, int force, PTW_tableentry table[PTW_KEYHSBYTES][PTW_n], int choices[KEYHSBYTES], int depth[KEYHSBYTES], int prod );
 
-
 #endif /* _AIRCRACK_NG_H */

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

@@ -35,6 +35,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <pthread.h>
+#if defined(__sun__)
+#include <alloca.h>
+#endif
 #include "pcap.h"
 #include "aircrack-ptw-lib.h"
 #include "aircrack-ng.h"
@@ -116,6 +119,11 @@
 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
+#endif
+
 // For sorting
 static int compare(const void * ina, const void * inb) {
 	PTW_tableentry * a = (PTW_tableentry * )ina;
@@ -137,7 +145,7 @@
 }
 
 
-#if defined(__amd64) && defined(__SSE2__)
+#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)
@@ -567,7 +575,7 @@
 	doublesorthelper helper[KEYHSBYTES];
 	int simple, onestrong, twostrong;
 	int i,j;
-#if defined(__amd64) && defined(__SSE2__)
+#ifdef USE_AMD64_RC4_OPTIMIZED
 	/*
 	 * The 64-bit SSE2-optimized rc4test() requires this buffer to be
 	 * aligned at 3 bytes.
@@ -581,7 +589,7 @@
 	sorthelper(*sh)[n-1];
 	PTW_tableentry (*table)[n] = alloca(sizeof(PTW_tableentry) * n * keylen);
 
-#if defined(__amd64) && defined(__SSE2__)
+#ifdef USE_AMD64_RC4_OPTIMIZED
 	/*
 	 * sse2-optimized rc4test() function for amd64 only works
 	 * for keylen == 5 or keylen == 13

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

@@ -1,7 +1,7 @@
 /*
  *  802.11 to Ethernet pcap translator
  *
- *  Copyright (C) 2006-2015 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *  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
@@ -57,7 +57,7 @@
 char usage[] =
 
 "\n"
-"  %s - (C) 2006-2014 Thomas d\'Otreppe\n"
+"  %s - (C) 2006-2015 Thomas d\'Otreppe\n"
 "  http://www.aircrack-ng.org\n"
 "\n"
 "  usage: airdecap-ng [options] <pcap file>\n"
@@ -66,9 +66,11 @@
 "      -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"
@@ -100,6 +102,8 @@
     unsigned char wepkey[64];
     int weplen, crypt;
     int store_bad;
+    char decrypted_fpath[65536];
+    char corrupted_fpath[65536];
 }
 opt;
 
@@ -239,7 +243,7 @@
             {0,         0, 0,  0 }
         };
 
-        int option = getopt_long( argc, argv, "lb:k:e:p:w:H",
+        int option = getopt_long( argc, argv, "lb:k:e:o:p:w:c:H",
                         long_options, &option_index );
 
         if( option < 0 ) break;
@@ -358,6 +362,30 @@
                 strncpy( opt.essid, optarg, sizeof( opt.essid ) - 1 );
                 break;
 
+            case 'o' :
+
+                if ( opt.decrypted_fpath[0])
+                {
+                    printf( "filename for decrypted packets already specified.\n" );
+                    printf("\"%s --help\" for help.\n", argv[0]);
+                    return( 1 );
+                }
+
+                strncpy( opt.decrypted_fpath, optarg, sizeof( opt.decrypted_fpath ) - 1 );
+                break;
+
+            case 'c' :
+
+                if ( opt.corrupted_fpath[0])
+                {
+                    printf( "filename for corrupted packets already specified.\n" );
+                    printf("\"%s --help\" for help.\n", argv[0]);
+                    return( 1 );
+                }
+
+                strncpy( opt.corrupted_fpath, optarg, sizeof( opt.corrupted_fpath ) - 1 );
+                break;
+
             case 'p' :
 
                 if( opt.crypt != CRYPT_NONE )
@@ -551,7 +579,13 @@
         opt.store_bad=1;
     }
 
-    if( ( f_out = fopen( (char *) buffer, "wb+" ) ) == NULL )
+    /* 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 );
@@ -560,7 +594,12 @@
 
     if(opt.store_bad)
     {
-        if( ( f_bad = fopen( (char *) buffer2, "wb+" ) ) == NULL )
+        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 );
@@ -1002,6 +1041,13 @@
         }
     }
 
+    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)

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

@@ -1,7 +1,7 @@
 /*
  *  WEP Cloaking filtering
  *
- *  Copyright (C) 2008-2015 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *  Copyright (C) 2008-2016 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
  *
  *  Thanks to Alex Hernandez aka alt3kx for the hardware.
  *
@@ -164,6 +164,12 @@
 
 	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 )
@@ -1260,7 +1266,13 @@
 // Return 1 on success
 BOOLEAN write_packets() {
 	// Open files ...
-	FILE * invalid_status_file = init_new_pcap("invalid_status.pcap");
+	FILE * invalid_status_file;
+
+	if (_filename_output_invalid != NULL)
+		invalid_status_file = init_new_pcap(_filename_output_invalid);
+	else
+		invalid_status_file = init_new_pcap("invalid_status.pcap");
+
 	_output_cloaked_packets_file = init_new_pcap(_filename_output_cloaked);
 	_output_clean_capture_file = init_new_pcap(_filename_output_filtered);
 
@@ -1317,8 +1329,9 @@
 }
 
 void usage() {
+	char *version_info = getVersion("Airdecloak-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC);
 	printf("\n"
-			"  %s - (C) 2008-2014 Thomas d\'Otreppe\n"
+			"  %s - (C) 2008-2015 Thomas d\'Otreppe\n"
 			"  http://www.aircrack-ng.org\n"
 			"\n"
 			"  usage: airdecloak-ng [options]\n"
@@ -1332,6 +1345,9 @@
 			"     --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"
@@ -1354,12 +1370,14 @@
 			"\n"
 			"     --help                : Displays this usage screen\n"
 			"\n",
-			getVersion("Airdecloak-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC)  );
+			version_info );
+	free(version_info);
 }
 
 int main( int argc, char *argv[] )
 {
-    int temp, option;
+    int temp = 0, option;
+    int manual_cloaked_fname=0, manual_filtered_fname=0;
     BOOLEAN tempBool;
     char * input_filename;
     char * input_bssid;
@@ -1375,6 +1393,7 @@
 	memset(_bssid, 0, 6);
 	_filters = 0;
 
+    _filename_output_invalid = NULL;
 
 	// Parse options
 	while( 1 )
@@ -1398,11 +1417,13 @@
             //{"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:",
+		option = getopt_long( argc, argv, "e:b:hf:nbdi:c:o:u:",
                         long_options, &option_index );
 
 		if( option < 0 ) break;
@@ -1425,7 +1446,24 @@
 			case 'i':
 				input_filename = optarg;
 				break;
-
+			case 'c':
+				if (optarg != NULL)
+				{
+					_filename_output_cloaked = optarg;
+					manual_cloaked_fname = 1;
+				}
+				break;
+			case 'o':
+				if (optarg != NULL)
+				{
+    				_filename_output_filtered = optarg;
+	    			manual_filtered_fname = 1;
+    			}
+				break;
+			case 'u':
+				if (optarg != NULL)
+					_filename_output_invalid = optarg;
+				break;
 			case 'b':
 				if (getmac(optarg, 1, _bssid)) {
 					puts("Failed to parse MAC address");
@@ -1485,6 +1523,9 @@
 				break;
 			case 'r':
 				_options_disable_retry = 1;
+				printf("'%c' option not yet implemented\n", option);
+				exit(0);
+				break;
 			case 'e':
 				printf("'%c' option not yet implemented\n", option);
 				exit(0);
@@ -1511,6 +1552,9 @@
 			--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)
 			-f (--filters/--filter)
 				Available filters:
 					* signal: Tries to filter based on the signal (AP never/is not supposed to moves thus ...)
@@ -1539,31 +1583,43 @@
 	}
 
 	// Create output filenames
-    temp = strlen( input_filename );
-
-    _filename_output_cloaked = (char *) calloc(temp + 9 + 5, 1);
-    _filename_output_filtered = (char *) calloc(temp + 10 + 5, 1);
-
-	while (--temp > 0)
+	if (manual_cloaked_fname == 0 || manual_filtered_fname == 0)
 	{
-		if (input_filename[temp] == '.')
-			break;
-	}
-
-	// No extension
-	if (temp == 0) {
-		snprintf(_filename_output_cloaked, strlen( input_filename ) + 9 + 5, "%s-cloaked.pcap", input_filename);
-		snprintf(_filename_output_filtered, strlen( input_filename ) + 10 + 5, "%s-filtered.pcap", input_filename);
-	}
-	else {
-		strncpy(_filename_output_cloaked, input_filename, strlen( input_filename ) + 9 + 5 - 1);
-		strncpy(_filename_output_filtered, input_filename, strlen( input_filename ) + 10 + 5 - 1);
-		strncat(_filename_output_cloaked, "-cloaked.pcap", 14);
-		strncat(_filename_output_filtered, "-filtered.pcap", 15);
-	}
-
+        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)
+            {

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

@@ -1,7 +1,7 @@
 /*
  *  802.11 WEP replay & injection attacks
  *
- *  Copyright (C) 2006-2015 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *  Copyright (C) 2006-2016 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
  *  Copyright (C) 2004, 2005 Christophe Devine
  *
  *  WEP decryption attack (chopchop) developed by KoreK
@@ -140,7 +140,7 @@
 char usage[] =
 
 "\n"
-"  %s - (C) 2006-2014 Thomas d\'Otreppe\n"
+"  %s - (C) 2006-2015 Thomas d\'Otreppe\n"
 "  http://www.aircrack-ng.org\n"
 "\n"
 "  usage: aireplay-ng <options> <replay interface>\n"
@@ -441,7 +441,19 @@
             {
                 if(bitrates[i-1] >= newrate)
                 {
-                    printf("Couldn't set rate to %.1fMBit. (%.1fMBit instead)\n", (rate/1000000.0), (wi_get_rate(wi)/1000000.0));
+                    printf("Couldn't set rate to %.1fMBit. (%.1fMBit instead)\n", (rate/
+#if defined(__x86_64__) && defined(__CYGWIN__)
+			(0.0f + 1000000)),
+#else
+			1000000.0),
+#endif
+			(wi_get_rate(wi)/
+#if defined(__x86_64__) && defined(__CYGWIN__)
+			(0.0f + 1000000)
+#else
+			1000000.0
+#endif
+			));
                     return 1;
                 }
             }
@@ -449,13 +461,36 @@
             {
                 if(bitrates[i+1] <= newrate)
                 {
-                    printf("Couldn't set rate to %.1fMBit. (%.1fMBit instead)\n", (rate/1000000.0), (wi_get_rate(wi)/1000000.0));
+                    printf("Couldn't set rate to %.1fMBit. (%.1fMBit instead)\n", (rate/
+#if defined(__x86_64__) && defined(__CYGWIN__)
+			(0.0f + 1000000)),
+#else
+			1000000.0),
+#endif
+			 (wi_get_rate(wi)/
+#if defined(__x86_64__) && defined(__CYGWIN__)
+			(0.0f + 1000000)));
+#else
+			1000000.0));
+#endif
                     return 1;
                 }
             }
             return 0;
         }
-        printf("Couldn't set rate to %.1fMBit. (%.1fMBit instead)\n", (rate/1000000.0), (wi_get_rate(wi)/1000000.0));
+        printf("Couldn't set rate to %.1fMBit. (%.1fMBit instead)\n", (rate/
+#if defined(__x86_64__) && defined(__CYGWIN__)
+		(0.0f + 1000000)),
+#else
+		1000000.0),
+#endif
+		(wi_get_rate(wi)/
+#if defined(__x86_64__) && defined(__CYGWIN__)
+		(0.0f + 1000000)));
+#else
+		1000000.0));
+#endif
+
         return 1;
     }
     return 0;
@@ -1438,6 +1473,7 @@
     unsigned char challenge[2048];
     unsigned char keystream[2048];
 
+    memset(iv, 0, sizeof(iv));
 
     if( memcmp( opt.r_smac,  NULL_MAC, 6 ) == 0 )
     {
@@ -2407,6 +2443,7 @@
     if( fwrite( &pfh_out, n, 1, f_cap_out ) != 1 )
     {
         perror( "fwrite failed\n" );
+        fclose( f_cap_out );
         return( 1 );
     }
 
@@ -2420,6 +2457,7 @@
         if( fcntl( dev.fd_in, F_SETFL, O_NONBLOCK ) < 0 )
         {
             perror( "fcntl(O_NONBLOCK) failed" );
+            fclose( f_cap_out );
             return( 1 );
         }
     }
@@ -2450,6 +2488,8 @@
             if( read( dev.fd_rtc, &n, sizeof( n ) ) < 0 )
             {
                 perror( "read(/dev/rtc) failed" );
+                free( arp );
+                fclose( f_cap_out );
                 return( 1 );
             }
 
@@ -2493,13 +2533,21 @@
 
                 if( send_packet( arp[arp_off1].buf,
                                  arp[arp_off1].len ) < 0 )
-                    return( 1 );
+                    {
+                        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 )
@@ -2515,7 +2563,12 @@
 
             caplen = read_packet( h80211, sizeof( h80211 ), NULL );
 
-            if( caplen  < 0 ) return( 1 );
+            if( caplen  < 0 )
+            {
+                free( arp );
+                fclose( f_cap_out );
+                return( 1 );
+            }
             if( caplen == 0 ) continue;
         }
         else
@@ -2718,6 +2771,8 @@
 
                 if( ( arp[nb_arp].buf = malloc( 128 ) ) == NULL ) {
                     perror( "malloc failed" );
+                    free(arp);
+                    fclose( f_cap_out );
                     return( 1 );
                 }
 
@@ -2735,6 +2790,8 @@
 
                 if( fwrite( &pkh, n, 1, f_cap_out ) != 1 ) {
                     perror( "fwrite failed" );
+                    free( arp );
+                    fclose( f_cap_out );
                     return( 1 );
                 }
 
@@ -2742,6 +2799,8 @@
 
                 if( fwrite( h80211, n, 1, f_cap_out ) != 1 ) {
                     perror( "fwrite failed" );
+                    free( arp );
+                    fclose( f_cap_out );
                     return( 1 );
                 }
 
@@ -2820,6 +2879,7 @@
     if( fwrite( &pfh_out, n, 1, f_cap_out ) != 1 )
     {
         perror( "fwrite failed\n" );
+        fclose( f_cap_out );
         return( 1 );
     }
 
@@ -2833,6 +2893,7 @@
         if( fcntl( dev.fd_in, F_SETFL, O_NONBLOCK ) < 0 )
         {
             perror( "fcntl(O_NONBLOCK) failed" );
+            fclose( f_cap_out );
             return( 1 );
         }
     }
@@ -2863,6 +2924,8 @@
             if( read( dev.fd_rtc, &n, sizeof( n ) ) < 0 )
             {
                 perror( "read(/dev/rtc) failed" );
+                free( arp );
+                fclose( f_cap_out );
                 return( 1 );
             }

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

@@ -1,7 +1,7 @@
 /*
  *  pcap-compatible 802.11 packet sniffer
  *
- *  Copyright (C) 2006-2015 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *  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
@@ -49,6 +49,7 @@
 #include <signal.h>
 #include <string.h>
 #include <stdlib.h>
+#define _WITH_DPRINTF
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
@@ -73,8 +74,11 @@
 #include "osdep/common.h"
 #include "common.h"
 
+// libgcrypt thread callback definition for libgcrypt < 1.6.0
 #ifdef USE_GCRYPT
-	GCRY_THREAD_OPTION_PTHREAD_IMPL;
+	#if GCRYPT_VERSION_NUMBER < 0x010600
+		GCRY_THREAD_OPTION_PTHREAD_IMPL;
+	#endif
 #endif
 
 // in common.c
@@ -122,7 +126,7 @@
 {	char command[13];
 
 	/* Command is the control command to the terminal */
-	sprintf(command, "%c[%d;%d;%dm", 0x1B, attr, fg + 30, bg + 40);
+	snprintf(command, sizeof(command), "%c[%d;%d;%dm", 0x1B, attr, fg + 30, bg + 40);
 	fprintf(stderr, "%s", command);
 	fflush(stderr);
 }
@@ -131,7 +135,7 @@
 {	char command[13];
 
 	/* Command is the control command to the terminal */
-	sprintf(command, "\033[%dm", fg + 30);
+	snprintf(command, sizeof(command), "\033[%dm", fg + 30);
 	fprintf(stderr, "%s", command);
 	fflush(stderr);
 }
@@ -140,7 +144,7 @@
 {	char command[13];
 
 	/* Command is the control command to the terminal */
-	sprintf(command, "\033[%dm", bg + 40);
+	snprintf(command, sizeof(command), "\033[%dm", bg + 40);
 	fprintf(stderr, "%s", command);
 	fflush(stderr);
 }
@@ -149,7 +153,7 @@
 {	char command[13];
 
 	/* Command is the control command to the terminal */
-	sprintf(command, "\033[%im", attr);
+	snprintf(command, sizeof(command), "\033[%im", attr);
 	fprintf(stderr, "%s", command);
 	fflush(stderr);
 }
@@ -421,7 +425,7 @@
 	unsigned char b[2];
 	unsigned char c[2];
 	struct oui *oui_ptr = NULL, *oui_head = NULL;
-	
+
 	fp = open_oui_file();
 	if (!fp) {
 		return NULL;
@@ -448,6 +452,13 @@
 				if (!(oui_ptr->next = (struct oui *)malloc(sizeof(struct oui)))) {
 					fclose(fp);
 					perror("malloc failed");
+
+					while(oui_head != NULL)
+					{
+						oui_ptr = oui_head->next;
+						free(oui_head);
+						oui_head = oui_ptr;
+					}
 					return NULL;
 				}
 				oui_ptr = oui_ptr->next;
@@ -627,7 +638,7 @@
 char usage[] =
 
 "\n"
-"  %s - (C) 2006-2014 Thomas d\'Otreppe\n"
+"  %s - (C) 2006-2015 Thomas d\'Otreppe\n"
 "  http://www.aircrack-ng.org\n"
 "\n"
 "  usage: airodump-ng <options> <interface>[,<interface>,...]\n"
@@ -771,7 +782,12 @@
                     ap_cur->fmiss += missed_frames;
                 }
 
-                ap_cur->rx_quality = ((float)((float)ap_cur->fcapt / ((float)ap_cur->fcapt + (float)ap_cur->fmiss)) * 100.0);
+                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));
+#else
+			100.0f);
+#endif
             }
             else ap_cur->rx_quality = 0; /* no packets -> zero quality */
 
@@ -980,6 +996,10 @@
             return( 1 );
         }
     }
+    else
+    {
+        free( ofn );
+    }
 
     return( 0 );
 }
@@ -1000,7 +1020,11 @@
     {
         sec = (tv.tv_sec - ap_cur->tv.tv_sec);
         usec = (tv.tv_usec - ap_cur->tv.tv_usec);
-        pause = (((float)(sec*1000000.0f + usec))/(1000000.0f));
+#if defined(__x86_64__) && defined(__CYGWIN__)
+        pause = (((float)(sec*(0.0f + 1000000) + usec))/((0.0f + 1000000)));
+#else
+	pause = (((float)(sec*1000000.0f + usec))/(1000000.0f));
+#endif
         if( pause > 2.0f )
         {
             diff = ap_cur->nb_data - ap_cur->nb_data_old;
@@ -1018,7 +1042,11 @@
     {
         sec = (tv.tv_sec - na_cur->tv.tv_sec);
         usec = (tv.tv_usec - na_cur->tv.tv_usec);
-        pause = (((float)(sec*1000000.0f + usec))/(1000000.0f));
+#if defined(__x86_64__) && defined(__CYGWIN__)
+        pause = (((float)(sec*(0.0f + 1000000) + usec))/((0.0f + 1000000)));
+#else
+	pause = (((float)(sec*1000000.0f + usec))/(1000000.0f));
+#endif
         if( pause > 2.0f )
         {
             diff = na_cur->ack - na_cur->ack_old;
@@ -1439,16 +1467,6 @@
 
     ap_cur->nb_pkt++;
 
-    /* find wpa handshake */
-    if( h80211[0] == 0x10 )
-    {
-        /* reset the WPA handshake state */
-
-        if( st_cur != NULL && st_cur->wpa.state != 0xFF )
-            st_cur->wpa.state = 0;
-//        printf("initial auth %d\n", ap_cur->wpa_state);
-    }
-
     /* locate the station MAC in the 802.11 header */
 
     switch( h80211[1] & 3 )
@@ -3898,15 +3916,13 @@
                      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(st_cur->probes[i], st_cur->ssid_length[i]);
+	    temp = format_text_for_csv((unsigned char *)st_cur->probes[i], st_cur->ssid_length[i]);
 
 	    if( probes_written == 0)
 	    {
@@ -4121,12 +4137,12 @@
 					"\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(client->probes[i], client->ssid_length[i]);
+		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");
 
 		++nb_probes_written;
@@ -4150,7 +4166,12 @@

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

@@ -59,6 +59,7 @@
 extern char * getVersion(char * progname, int maj, int min, int submin, int svnrev, int beta, int rc);
 
 void print_help(const char * msg) {
+	char *version_info = getVersion("Airolib-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC);
 	printf("\n"
 		"  %s - (C) 2007, 2008, 2009 ebfe\n"
 		"  http://www.aircrack-ng.org\n"
@@ -84,7 +85,8 @@
 		"       --export cowpatty <essid> <file> :\n"
 		"                        Export to a cowpatty file.\n"
 		"\n",
-		getVersion("Airolib-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC));
+		version_info);
+	free(version_info);
 
 	if (msg && strlen(msg) > 0) {
 		printf("%s", msg);
@@ -496,6 +498,8 @@
 	f = fopen(filename, "w");
 	if (f == NULL || fwrite(&filehead, sizeof(filehead), 1, f) != 1) {
 		printf("Couldn't open the export file for writing.\n");
+		if (f != NULL)
+			fclose(f);
 		return;
 	}
 
@@ -531,6 +535,8 @@
 	}
 	if (f == NULL || fread(&filehead, sizeof(filehead),1,f) != 1) {
 		printf("Couldn't open the import file for reading.\n");
+		if (f != NULL)
+			fclose(f);
 		return 0;
 	} else if (filehead.magic != GENPMKMAGIC) {
 		printf("File doesn't seem to be a cowpatty file.\n");
@@ -569,7 +575,7 @@
 
 	printf("Reading...\n");
 	while ((rc = fread(&rec.rec_size, sizeof(rec.rec_size), 1, f)) == 1) {
-		wordlength = abs(rec.rec_size) - (sizeof(rec.pmk) + sizeof(rec.rec_size));
+		wordlength = rec.rec_size - (sizeof(rec.pmk) + sizeof(rec.rec_size));
 		//prevent out of bounds writing (sigsegv guaranteed) but don't skip the whole file if wordlength < 8
 		if (wordlength > 0 && wordlength < (int) sizeof(passwd)) {
 			passwd[wordlength] = 0;

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

@@ -34,6 +34,10 @@
 #include <stdarg.h>
 #include <signal.h>
 
+#ifdef __NetBSD__
+	#include <sys/select.h>
+#endif
+
 #include "osdep/osdep.h"
 #include "osdep/network.h"
 #include "version.h"
@@ -69,7 +73,7 @@
 static void usage(char *p)
 {
 	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"
@@ -84,7 +88,8 @@
 		"       -c  <chan> : Channel to use\n"
 		"       -v <level> : Debug level (1 to 3; default: 1)\n"
 		"\n",
-		getVersion("Airserv-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC));
+		version_info);
+	free(version_info);
 	exit(1);
 }
 
@@ -429,6 +434,7 @@
 	int rd;
 	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)
@@ -444,9 +450,9 @@
 
 	c = ss->ss_clients.c_next;
 	while (c != &ss->ss_clients) {
+		next_c = c->c_next;
 		client_send_packet(ss, c, buf, rd);
-		if (c == NULL) break;
-		c = c->c_next;
+		c = next_c;
 	}
 }

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

@@ -2,7 +2,7 @@
  *  802.11 WEP network connection tunneling
  *  based on aireplay-ng
  *
- *  Copyright (C) 2006-2015 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *  Copyright (C) 2006-2016 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
@@ -84,7 +84,7 @@
 
 char usage[] =
 "\n"
-"  %s - (C) 2006-2014 Thomas d'Otreppe\n"
+"  %s - (C) 2006-2015 Thomas d'Otreppe\n"
 "  Original work: Martin Beck\n"
 "  http://www.aircrack-ng.org\n"
 "\n"
@@ -92,22 +92,23 @@
 "\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"
+"                         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"
+"                         (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"
+"                         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"
+"                         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"
@@ -1204,8 +1205,6 @@
                 }
                 else
                 {
-                    buffer = malloc( length );
-                    memcpy( buffer, packet, length );
                     if ( memcmp( smac, st_cur->stmac, 6 ) == 0 ) {
                         st_cur->pn[0] = packet[z + 7];
                         st_cur->pn[1] = packet[z + 6];

aircrack-ng-1.2-rc4.tar.gz/src/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.2-rc4.tar.gz/src/arch.h Added

@@ -0,0 +1,495 @@
+/*
+ * 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

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

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

@@ -379,6 +379,7 @@
 	wait(NULL);
 }
 
+#if 0
 static inline void hexdump(void *p, int len)
 {
 	unsigned char *x = p;
@@ -388,6 +389,7 @@
 
 	printf("\n");
 }
+#endif
 
 static void *xmalloc(size_t sz)
 {
@@ -414,13 +416,14 @@
 	return n - p;
 }
 
+#if 0
 static inline void timer_print(void)
 {
 	int i = 0;
 	struct timer *t = _state.s_timers.t_next;
 
 	printf(
-			#ifndef __APPLE_CC__
+			#if !defined( __APPLE_CC__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
 			"\nNow %lu.%lu\n",
 			#else
 			"\nNow %lu.%d\n",
@@ -430,7 +433,7 @@
 	while (t) {
 
 		printf(
-				#ifndef __APPLE_CC__
+				#if !defined( __APPLE_CC__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
 				"%d) %lu.%lu %p(%p)\n",
 				#else
 				"%d) %lu.%d %p(%p)\n",
@@ -444,6 +447,7 @@
 		t = t->t_next;
 	}
 }
+#endif
 
 static void timer_next(struct timeval *tv)
 {
@@ -2825,7 +2829,8 @@
 		switch (state) {
 		/* ssid */
 		case 0:
-			strcpy(n->n_ssid, p);
+			strncpy(n->n_ssid, p, sizeof(n->n_ssid));
+			(n->n_ssid)[sizeof(n->n_ssid) -1] = '\0';
 			break;
 
 		/* key */
@@ -3102,7 +3107,7 @@
 	printf("\n");
 
 	printf(
-		#ifndef __APPLE_CC__
+		#if !defined( __APPLE_CC__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
 		"Now: %lu.%lu\n",
 		#else
 		"Now: %lu.%d\n",
@@ -3112,7 +3117,7 @@
 
 	while (t) {
 		printf(
-		       #ifndef __APPLE_CC__
+		       #if !defined( __APPLE_CC__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
 		       "Timer: %lu.%lu %p[%s](%p)\n",
 		       #else
 		       "Timer: %lu.%d %p[%s](%p)\n",
@@ -3130,6 +3135,7 @@
 
 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"
@@ -3149,9 +3155,9 @@
                 "       -v              : verbose, -vv for more, etc.\n"
                 "       -h              : This help screen\n"
                 "\n",
-                getVersion("Besside-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC),
+                version_info,
 		prog);
-
+    free(version_info);
 	exit(1);
 }

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

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

@@ -1,7 +1,7 @@
 /*
  *  Common functions for all aircrack-ng tools
  *
- *  Copyright (C) 2006-2015 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *  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
@@ -41,38 +41,143 @@
 #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(*str))) {
+
+	if (*str != '-' && !(isdigit((int)(*str)))) {
 		return 0;
 	}
-	
+
 	for (i = 1; str[i] != 0; i++) {
-		if (!isdigit(str[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;
-	int ret = -1;
 
 	if (!(fp = fopen("/proc/meminfo", "r"))) {
-		perror("fopen fails");
+		perror("fopen fails on /proc/meminfo");
 		return ret;
 	}
 
@@ -84,6 +189,7 @@
 	}
 
 	fclose(fp);
+#endif
 	return ret;
 }
 
@@ -128,43 +234,66 @@
 // Return the number of cpu. If detection fails, it will return -1;
 int get_nb_cpus()
 {
-		// Optmization for windows: use GetSystemInfo()
-        char * s, * pos;
-        FILE * f;
         int number = -1;
 
-		// Reading /proc/cpuinfo is more reliable on current CPUs,
-		// so put it first and try the old method if this one fails
+#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;

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

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

@@ -0,0 +1,618 @@
+/*
+ * 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))

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

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

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

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

@@ -385,20 +385,22 @@
 
 #else /* _KERNEL */
 
-#include <sys/cdefs.h>
-
 /*
  * Ethernet address conversion/parsing routines.
  */
-__BEGIN_DECLS
-struct	ether_addr *ether_aton(const char *);
-struct	ether_addr *ether_aton_r(const char *, struct ether_addr *);
-int	ether_hostton(const char *, struct ether_addr *);
-int	ether_line(const char *, struct ether_addr *, char *);
-char 	*ether_ntoa(const struct ether_addr *);
-char 	*ether_ntoa_r(const struct ether_addr *, char *);
-int	ether_ntohost(char *, const struct ether_addr *);
-__END_DECLS
+#ifdef __cplusplus
+extern "C" {
+#endif
+	struct	ether_addr *ether_aton(const char *);
+	struct	ether_addr *ether_aton_r(const char *, struct ether_addr *);
+	int	ether_hostton(const char *, struct ether_addr *);
+	int	ether_line(const char *, struct ether_addr *, char *);
+	char 	*ether_ntoa(const struct ether_addr *);
+	char 	*ether_ntoa_r(const struct ether_addr *, char *);
+	int	ether_ntohost(char *, const struct ether_addr *);
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* !_KERNEL */

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

@@ -1,7 +1,7 @@
  /*
   *  IVS Tools - Convert or merge IVs
   *
-  *  Copyright (C) 2006-2015 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+  *  Copyright (C) 2006-2016 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
@@ -102,9 +102,11 @@
 
 void usage(int what)
 {
-    printf("\n  %s - (C) 2006-2014 Thomas d\'Otreppe\n"
+    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: ", getVersion("ivsTools", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC));
+            "\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");

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

@@ -0,0 +1,118 @@
+/*
+ * 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 Added

@@ -0,0 +1,131 @@
+/*
+ * 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-rc2.tar.gz/src/kstats.c -> aircrack-ng-1.2-rc4.tar.gz/src/kstats.c Changed

aircrack-ng-1.2-rc4.tar.gz/src/linecount.cpp Added

@@ -0,0 +1,123 @@
+/*
+ *  High speed wordcounting functions for ETA calculations by Len White <lwhite at nrw.ca>
+ *
+ *  Copyright (C) 2015 Len White <lwhite at 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
+ *
+ *
+ *  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.
+ *
+ *  Why is this in C++?
+ *
+ *  The first several versions of this function were written in C
+ *  but when it came to optimizing the speed, I kept hitting brick walls.
+ *  mmap() produced favorable results on Linux but when I tested it on
+ *  Windows or BSD, it was beyond horrible.  Memory Mapping seems to work
+ *  drastically different there, and I even went so far as to write a version
+ *  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
+ *  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
+ *  except for mmap() on Linux which beat it out by 3-4% but usually only
+ *  on a 2nd run.
+ *
+ *  A possible alternative to this could be the SFIO library but further
+ *  research and testing is required, other big projects like graphviz and perl
+ *  make use of it.  This was designed so it's easy to replace if we can
+ *  find a better solution performance wise.
+ */
+
+#include <iostream>
+#include <fstream>
+#include <vector>
+#include <ctime>
+#include <string.h>
+#include "linecount.h"
+
+using namespace std;
+
+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) {
+	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++;
+
+			i	+= 1;
+			charct	= 1;
+			continue;
+	    	}
+
+		charct++;
+	}
+
+	return lines;
+}
+
+unsigned int linecount(const char *file, off_t offset, size_t offsetmax) {
+	const int SZ = READBUF_BLKSIZE;
+	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);
+
+	// 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;
+
+			blkcnt++;
+		}
+	} else {
+		while ((cc = FileRead(ifs, buff))) {
+			n += countBuffer(buff, cc);
+		}
+	}
+
+	return n;
+}

aircrack-ng-1.2-rc4.tar.gz/src/linecount.h Added

@@ -0,0 +1,46 @@
+/*
+ * High speed wordcounting header
+ *
+ *  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 LINECOUNT_H
+#define LINECOUNT_H
+
+#ifdef __cplusplus
+#define EXTERNC extern "C"
+#else
+#define EXTERNC
+#endif
+
+EXTERNC unsigned int linecount(const char *file, off_t offset, size_t blksize);
+
+#define READBUF_BLKSIZE (1024*1024*3)
+
+#endif /* LINECOUNT_H */

aircrack-ng-1.2-rc2.tar.gz/src/makeivs-ng.c -> aircrack-ng-1.2-rc4.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-2015 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+  *  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
@@ -38,7 +38,7 @@
 char usage[] =
 
 "\n"
-"  %s - (C) 2006-2014 Thomas d\'Otreppe\n"
+"  %s - (C) 2006-2015 Thomas d\'Otreppe\n"
 "  http://www.aircrack-ng.org\n"
 "\n"
 "  usage: makeivs-ng [options]\n"
@@ -182,8 +182,12 @@
 
 				paramUsed = 1;
                 sscanf(optarg, "%f", &errorrate);
+#if defined(__x86_64__) && defined(__CYGWIN__)
+                if (errorrate < 0.0f || errorrate > (0.0f + 100)) {
+#else
                 if (errorrate < 0.0f || errorrate > 100.0f) {
-					printf( usage, getVersion("makeivs-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC)  );
+#endif
+			printf( usage, getVersion("makeivs-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC)  );
                     printf( "Specified errorrate is invalid. [0-100]" );
                     return( 1 );
                 }
@@ -193,8 +197,12 @@
             case 'd':
 
 				paramUsed = 1;
-                sscanf(optarg, "%f", &dupe);
-                if (dupe < 0.0f || dupe > 100.0f) {
+                if (sscanf(optarg, "%f", &dupe) != 1 || dupe < 0.0f || dupe >
+#if defined(__x86_64__) && defined(__CYGWIN__)
+			(0.0f + 100)) {
+#else
+			100.0f) {
+#endif
 					printf( usage, getVersion("makeivs-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC)  );
 
                     printf( "Specified dupe is invalid. [0-100]" );
@@ -414,7 +422,12 @@
     pre_n=0;
     for( n = 0; n < count; n++ )
     {
-        if( (dupe==0) || (pre_n == n) || ((float)rand()/(float)RAND_MAX > (float)((float)dupe/100.0f)) )
+        if( (dupe==0) || (pre_n == n) || ((float)rand()/(float)RAND_MAX > (float)((float)dupe/
+#if defined(__x86_64__) && defined(__CYGWIN__)
+		(0.0f + 100))) )
+#else
+		100.0f)) )
+#endif
         {
             if(prng)
             {
@@ -465,7 +478,12 @@
             SWAP( S[i], S[j] );
         }
 
-        if(errorrate > 0 && ((float)((float)rand()/(float)RAND_MAX) <= (float)(errorrate/100.0f)) )
+        if(errorrate > 0 && ((float)((float)rand()/(float)RAND_MAX) <= (float)(errorrate/
+#if defined(__x86_64__) && defined(__CYGWIN__)
+		(0.0f + 100))) )
+#else
+		100.0f)) )
+#endif
         {
             SWAP( S[1], S[11] );
         }
@@ -503,7 +521,12 @@
             fprintf( f_ivs_out, "%c", S[(S[i] + S[j]) & 0xFF] );
         }
         if((n%10000) == 0)
-            printf("%2.1f%%\r", ((float)n/(float)count)*100.0f);
+            printf("%2.1f%%\r", ((float)n/(float)count)*
+#if defined(__x86_64__) && defined(__CYGWIN__)
+		(0.0f + 100));
+#else
+		100.0f);
+#endif
         fflush(stdout);
     }

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

@@ -0,0 +1,67 @@
+/*
+ * 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 Added

@@ -0,0 +1,234 @@
+/*
+ * 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

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

@@ -0,0 +1,694 @@
+/*
+ * 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.

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

@@ -0,0 +1,371 @@
+/*
+ * 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) \
+{ \

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

@@ -0,0 +1,205 @@
+/*
+ * 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))

aircrack-ng-1.2-rc2.tar.gz/src/osdep/Makefile -> aircrack-ng-1.2-rc4.tar.gz/src/osdep/Makefile Changed

aircrack-ng-1.2-rc2.tar.gz/src/osdep/airpcap.c -> aircrack-ng-1.2-rc4.tar.gz/src/osdep/airpcap.c Changed

aircrack-ng-1.2-rc2.tar.gz/src/osdep/byteorder.h -> aircrack-ng-1.2-rc4.tar.gz/src/osdep/byteorder.h Changed

@@ -1,7 +1,7 @@
 /*
  *  Compatibility header
  *
- *  Copyright (C) 2009-2015 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *  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
@@ -181,11 +181,17 @@
 	 * Solaris
 	 * -------
 	 */
-	#if defined(__sparc__) && defined(__sun__)
+	#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)
@@ -199,13 +205,11 @@
 		#define __cpu_to_le32(x) ___my_swab32(x)
 		#define __cpu_to_le16(x) ___my_swab16(x)
 
-		typedef uint64_t u_int64_t;
-		typedef uint32_t u_int32_t;
-		typedef uint16_t u_int16_t;
-		typedef uint8_t  u_int8_t;
-
 		#define AIRCRACK_NG_BYTE_ORDER_DEFINED
-
+	#else
+		#define AIRCRACK_NG_BYTE_ORDER 1
+		#define LITTLE_ENDIAN 1
+	#endif
 	#endif
 
 	/*
@@ -217,13 +221,13 @@
 		#define __cpu_to_be32(x) = OSSwapHostToBigInt32(x)
 
 		#define AIRCRACK_NG_BYTE_ORDER_DEFINED
-
 	#endif
 
-
 	// FreeBSD
 	#ifdef __FreeBSD__
-		#include <machine/endian.h>
+		#undef ushort
+		#undef uint
+		#include <sys/types.h>
 	#endif
 
 	// XXX: Is there anything to include on OpenBSD/NetBSD/DragonFlyBSD/...?

aircrack-ng-1.2-rc2.tar.gz/src/osdep/common.c -> aircrack-ng-1.2-rc4.tar.gz/src/osdep/common.c Changed

aircrack-ng-1.2-rc2.tar.gz/src/osdep/common.h -> aircrack-ng-1.2-rc4.tar.gz/src/osdep/common.h Changed

aircrack-ng-1.2-rc2.tar.gz/src/osdep/cygwin_tap.c -> aircrack-ng-1.2-rc4.tar.gz/src/osdep/cygwin_tap.c Changed

aircrack-ng-1.2-rc2.tar.gz/src/osdep/freebsd.c -> aircrack-ng-1.2-rc4.tar.gz/src/osdep/freebsd.c Changed

@@ -29,9 +29,15 @@
 #include <net/if_media.h>
 #include <sys/ioctl.h>
 #include <net/if_dl.h>
-#include <net80211/ieee80211_ioctl.h>
-#include <net80211/ieee80211_radiotap.h>
-#include <net80211/ieee80211_freebsd.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>
@@ -389,7 +395,7 @@
 
         memset(&ifr, 0, sizeof(ifr));
         strcpy(ifr.ifr_name, iface);
-        ifr.ifr_media = ifmr.ifm_current | IFM_IEEE80211_MONITOR;
+        ifr.ifr_media = ifmr.ifm_current;
         if (ioctl(s, SIOCSIFMEDIA, &ifr) == -1)
 		goto close_sock;
 
@@ -510,6 +516,39 @@
 	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;
@@ -530,7 +569,9 @@
 	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_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);
@@ -544,6 +585,8 @@
 	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;

aircrack-ng-1.2-rc2.tar.gz/src/osdep/linux.c -> aircrack-ng-1.2-rc4.tar.gz/src/osdep/linux.c Changed

@@ -1,7 +1,7 @@
 /*
  *  OS dependent APIs for Linux
  *
- *  Copyright (C) 2006-2015 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *  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
@@ -226,10 +226,9 @@
             (void)closedir(dp);
             return curfile;
         }
-        lstat(curfile, &sb);
 
         //If it's a directory and not a link, try to go inside to search
-        if (S_ISDIR(sb.st_mode) && !S_ISLNK(sb.st_mode))
+        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))
@@ -360,6 +359,7 @@
 
 /* Callbacks */
 
+/*
 static int error_handler(struct sockaddr_nl *nla, struct nlmsgerr *err,
                      void *arg)
 {
@@ -369,11 +369,14 @@
 	*ret = err->error;
 	return NL_STOP;
 }
+*/
 
+/*
 static void test_callback(struct nl_msg *msg, void *arg)
 {
 	if (msg || arg) { }
 }
+*/
 #endif /* End nl80211 */
 
 
@@ -390,7 +393,7 @@
         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)
@@ -424,7 +427,7 @@
         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)
@@ -514,6 +517,7 @@
         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;
@@ -540,6 +544,7 @@
         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 )
     {
@@ -925,7 +930,7 @@
     return( ret );
 }
 
-#ifdef CONFIG_LIBNL
+#if defined(CONFIG_LIBNL)
 static int ieee80211_channel_to_frequency(int chan)
 {
     if (chan < 14)
@@ -947,7 +952,6 @@
     unsigned int devid;
     struct nl_msg *msg;
     unsigned int freq;
-    int err;
     unsigned int htval = NL80211_CHAN_NO_HT;
 
     memset( s, 0, sizeof( s ) );
@@ -1039,7 +1043,7 @@
  nla_put_failure:
     return -ENOBUFS;
 }
-#endif //CONFIG_LIBNL
+#else //CONFIG_LIBNL
 
 static int linux_set_channel(struct wif *wi, int channel)
 {
@@ -1111,6 +1115,8 @@
 
     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;
 
@@ -1129,6 +1135,7 @@
 
     return( 0 );
 }
+#endif
 
 static int linux_set_freq(struct wif *wi, int freq)
 {
@@ -1164,6 +1171,8 @@
 
     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;
 
@@ -1240,6 +1249,7 @@
     /* 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 )
     {
@@ -1344,6 +1354,7 @@
 
         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 )
@@ -1432,6 +1443,7 @@
         /* 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 )
         {
@@ -1485,6 +1497,7 @@
     /* 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 )
     {
@@ -1498,7 +1511,7 @@
           ifr.ifr_hwaddr.sa_family != ARPHRD_IEEE80211_FULL) ||
         ( wrq.u.mode != IW_MODE_MONITOR) )
     {
-        if (set_monitor( dev, iface, fd ) && !dev->drivertype == DT_ORINOCO )
+        if (set_monitor( dev, iface, fd ) && dev->drivertype != DT_ORINOCO )
         {
             ifr.ifr_flags &= ~(IFF_UP | IFF_BROADCAST | IFF_RUNNING);
 
@@ -1508,7 +1521,7 @@
                 return( 1 );
             }
 
-            if (set_monitor( dev, iface, fd ) && !dev->drivertype == DT_ORINOCO )
+            if (set_monitor( dev, iface, fd ) )
             {
                 printf("Error setting monitor mode on %s\n",iface);
                 return( 1 );
@@ -1594,7 +1607,7 @@
     int kver, unused;
     struct utsname checklinuxversion;
     struct priv_linux *dev = wi_priv(wi);
-    char *iwpriv;
+    char *iwpriv = NULL;
     char strbuf[512];
     FILE *f;
     char athXraw[] = "athXraw";
@@ -2012,6 +2025,7 @@
 close_in:
     close(dev->fd_in);
     if(iface_malloced) free(iface);
+    if(iwpriv) free(iwpriv);
     return 1;
 }
 
@@ -2041,6 +2055,7 @@
 	free(wi);
 }

aircrack-ng-1.2-rc2.tar.gz/src/osdep/linux_tap.c -> aircrack-ng-1.2-rc4.tar.gz/src/osdep/linux_tap.c Changed

aircrack-ng-1.2-rc2.tar.gz/src/osdep/network.c -> aircrack-ng-1.2-rc4.tar.gz/src/osdep/network.c Changed

@@ -35,18 +35,18 @@
 
 #define QUEUE_MAX 666
 
-struct queue {
+struct netqueue {
 	unsigned char	q_buf[2048];
 	int		q_len;
 
-	struct queue	*q_next;
-	struct queue	*q_prev;
+	struct netqueue	*q_next;
+	struct netqueue	*q_prev;
 };
 
 struct priv_net {
 	int		pn_s;
-	struct queue	pn_queue;
-	struct queue	pn_queue_free;
+	struct netqueue	pn_queue;
+	struct netqueue	pn_queue_free;
 	int		pn_queue_len;
 };
 
@@ -142,15 +142,15 @@
 	return nh.nh_type;
 }
 
-static void queue_del(struct queue *q)
+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 queue *head, struct queue *q)
+static void queue_add(struct netqueue *head, struct netqueue *q)
 {
-	struct queue *pos = head->q_prev;
+	struct netqueue *pos = head->q_prev;
 
 	q->q_prev = pos;
 	q->q_next = pos->q_next;
@@ -159,9 +159,9 @@
 }
 
 #if 0
-static int queue_len(struct queue *head)
+static int queue_len(struct netqueue *head)
 {
-	struct queue *q = head->q_next;
+	struct netqueue *q = head->q_next;
 	int i = 0;
 
 	while (q != head) {
@@ -173,9 +173,9 @@
 }
 #endif
 
-static struct queue *queue_get_slot(struct priv_net *pn)
+static struct netqueue *queue_get_slot(struct priv_net *pn)
 {
-	struct queue *q = pn->pn_queue_free.q_next;
+	struct netqueue *q = pn->pn_queue_free.q_next;
 
 	if (q != &pn->pn_queue_free) {
 		queue_del(q);
@@ -190,7 +190,7 @@
 
 static void net_enque(struct priv_net *pn, void *buf, int len)
 {
-	struct queue *q;
+	struct netqueue *q;
 
 	q = queue_get_slot(pn);
 	if (!q)
@@ -211,12 +211,14 @@
 	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);
+		if(c > 0)
+			net_enque(pn, buf, l);
 	}
 
 	assert(l <= *len);
@@ -251,8 +253,8 @@
 
 static int queue_get(struct priv_net *pn, void *buf, int len)
 {
-	struct queue *head = &pn->pn_queue;
-	struct queue *q = head->q_next;
+	struct netqueue *head = &pn->pn_queue;
+	struct netqueue *q = head->q_next;
 
 	if (q == head)
 		return 0;

aircrack-ng-1.2-rc2.tar.gz/src/osdep/openbsd.c -> aircrack-ng-1.2-rc4.tar.gz/src/osdep/openbsd.c Changed

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

aircrack-ng-1.2-rc2.tar.gz/src/osdep/radiotap/parse.c -> aircrack-ng-1.2-rc4.tar.gz/src/osdep/radiotap/parse.c Changed

aircrack-ng-1.2-rc2.tar.gz/src/osdep/radiotap/platform.h -> aircrack-ng-1.2-rc4.tar.gz/src/osdep/radiotap/platform.h Changed

@@ -3,7 +3,33 @@
 #ifndef _BSD_SOURCE
 #define _BSD_SOURCE
 #endif
-#include <endian.h>
+#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__)
+	#include <sys/endian.h>
+#elif defined(__APPLE__)
+	#include <machine/endian.h>
+	#include <libkern/OSByteOrder.h>
+
+	#define htobe16(x) OSSwapHostToBigInt16(x)
+	#define htole16(x) OSSwapHostToLittleInt16(x)
+	#define be16toh(x) OSSwapBigToHostInt16(x)
+	#define le16toh(x) OSSwapLittleToHostInt16(x)
+
+	#define htobe32(x) OSSwapHostToBigInt32(x)
+	#define htole32(x) OSSwapHostToLittleInt32(x)
+	#define be32toh(x) OSSwapBigToHostInt32(x)
+	#define le32toh(x) OSSwapLittleToHostInt32(x)
+
+	#define htobe64(x) OSSwapHostToBigInt64(x)
+	#define htole64(x) OSSwapHostToLittleInt64(x)
+	#define be64toh(x) OSSwapBigToHostInt64(x)
+	#define le64toh(x) OSSwapLittleToHostInt64(x)
+
+	#define __BIG_ENDIAN    BIG_ENDIAN
+	#define __LITTLE_ENDIAN LITTLE_ENDIAN
+	#define __BYTE_ORDER    BYTE_ORDER
+#elif !defined(__sun__)
+	#include <endian.h>
+#endif
 
 #define le16_to_cpu		le16toh
 #define le32_to_cpu		le32toh

aircrack-ng-1.2-rc2.tar.gz/src/osdep/radiotap/radiotap.c -> aircrack-ng-1.2-rc4.tar.gz/src/osdep/radiotap/radiotap.c Changed

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

@@ -2,7 +2,7 @@
  *  802.11 ARP-request WEP packet forgery
  *  UDP, ICMP and custom packet forging developped by Martin Beck
  *
- *  Copyright (C) 2006-2015 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *  Copyright (C) 2006-2016 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
@@ -76,7 +76,7 @@
 
 char usage[] =
 "\n"
-"  %s - (C) 2006-2014 Thomas d\'Otreppe\n"
+"  %s - (C) 2006-2015 Thomas d\'Otreppe\n"
 "  Original work: Martin Beck\n"
 "  http://www.aircrack-ng.org\n"
 "\n"
@@ -950,6 +950,7 @@
         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));
@@ -1104,7 +1105,9 @@
 
 void print_usage(void)
 {
-    printf(usage, getVersion("Packetforge-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC) );
+    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[])

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

@@ -0,0 +1,672 @@
+/*
+ * 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))

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

@@ -151,11 +151,11 @@
 	unsigned int A,B,C,D,E;
 	unsigned int array[16];
 
-	A = ctx->H[0];
-	B = ctx->H[1];
-	C = ctx->H[2];
-	D = ctx->H[3];
-	E = ctx->H[4];
+	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);
@@ -247,11 +247,11 @@
 	T_60_79(78, C, D, E, A, B);
 	T_60_79(79, B, C, D, E, A);
 
-	ctx->H[0] += A;
-	ctx->H[1] += B;
-	ctx->H[2] += C;
-	ctx->H[3] += D;
-	ctx->H[4] += E;
+	ctx->h0 += A;
+	ctx->h1 += B;
+	ctx->h2 += C;
+	ctx->h3 += D;
+	ctx->h4 += E;
 }
 
 void blk_SHA1_Init(blk_SHA_CTX *ctx)
@@ -259,11 +259,11 @@
 	ctx->size = 0;
 
 	/* Initialize H with the magic constants (see FIPS180 for constants) */
-	ctx->H[0] = 0x67452301;
-	ctx->H[1] = 0xefcdab89;
-	ctx->H[2] = 0x98badcfe;
-	ctx->H[3] = 0x10325476;
-	ctx->H[4] = 0xc3d2e1f0;
+	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)
@@ -309,8 +309,11 @@
 	blk_SHA1_Update(ctx, padlen, 8);
 
 	/* Output hash */
-	for (i = 0; i < 5; i++)
-		put_be32(hashout + i*4, ctx->H[i]);
+	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-rc2.tar.gz/src/sha1-git.h -> aircrack-ng-1.2-rc4.tar.gz/src/sha1-git.h Changed

aircrack-ng-1.2-rc2.tar.gz/src/sha1-sse2.S -> aircrack-ng-1.2-rc4.tar.gz/src/sha1-sse2.S Changed

@@ -170,65 +170,119 @@
         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;                         \
+        movdqa   a, tmp2;                       \
+        movdqa   a, tmp3;                       \
         paddd  tmp1, e;                         \
         pslld    $5, tmp2;                      \
         psrld   $27, tmp3;                      \
         por    tmp3, tmp2;                      \
         paddd  tmp2, e;                         \
-        movdqa   b, tmp2;                         \
+        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;							\
+        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;                \
+        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;                      \
+        movdqa   tmp1, tmp2;                    \
         psrld  $16, tmp1;                       \
         pslld  $16, tmp2;                       \
         por    tmp2, tmp1;                      \
-        movdqa   tmp1, (data*16)(ecx_rdx);            \
+        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;                      \
+	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);            \
+        movdqa  tmp1, (data*16)(ecx_rdx);       \
         paddd  tmp1, e;                         \
         f(b,c,d);                               \
-        movdqa   a, tmp2;                         \
-        movdqa   a, tmp3;                         \
+        movdqa   a, tmp2;                       \
+        movdqa   a, tmp3;                       \
         paddd  tmp1, e;                         \
         pslld    $5, tmp2;                      \
         psrld   $27, tmp3;                      \
         por    tmp3, tmp2;                      \
         paddd  tmp2, e;                         \
-        movdqa   b, tmp2;                         \
+        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;                            \
+        paddd  MANGLE(k), e;                    \
         psrld  $2, tmp2;                        \
         por    tmp2, b;
- 
+#endif 
 .text
 
 // arg 1 (eax) (64bit: rdi): context (4*20 bytes)
@@ -237,15 +291,25 @@
 _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)
@@ -270,13 +334,17 @@
         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
@@ -297,7 +365,9 @@
         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
@@ -305,7 +375,9 @@

aircrack-ng-1.2-rc2.tar.gz/src/sha1-sse2.h -> aircrack-ng-1.2-rc4.tar.gz/src/sha1-sse2.h Changed

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

@@ -0,0 +1,144 @@
+/*
+ * 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 Added

@@ -0,0 +1,2721 @@
+/*
+ * 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

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

@@ -0,0 +1,178 @@
+/*
+ * 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 Added

@@ -0,0 +1,81 @@
+/*
+ * 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 Added

@@ -0,0 +1,2212 @@
+/*
+ * 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)                      \
+{                                               \

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

@@ -0,0 +1,145 @@
+/*
+ * 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-rc2.tar.gz/src/tkiptun-ng.c -> aircrack-ng-1.2-rc4.tar.gz/src/tkiptun-ng.c Changed

@@ -138,12 +138,12 @@
 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 hexStringToHex(char* in, int length, unsigned char* out);
+extern int hexStringToArray(char* in, int in_length, unsigned char* out, int out_length);
 
 char usage[] =
 
 "\n"
-"  %s - (C) 2008-2014 Thomas d\'Otreppe\n"
+"  %s - (C) 2008-2015 Thomas d\'Otreppe\n"
 "  http://www.aircrack-ng.org\n"
 "\n"
 "  usage: tkiptun-ng <options> <replay interface>\n"
@@ -2655,7 +2655,10 @@
             errno = 0;
 
             if( send_packet( h80211, data_end -1 ) != 0 )
+            {
+                free(chopped);
                 return( 1 );
+            }
 
             if( errno != EAGAIN )
             {
@@ -2698,7 +2701,10 @@
 
         n = read_packet( h80211, sizeof( h80211 ), NULL );
 
-        if( n  < 0 ) return( 1 );
+        if( n  < 0 ){
+            free(chopped);
+            return( 1 );
+        }
         if( n == 0 ) continue;
 
         nb_pkt_read++;
@@ -2717,6 +2723,7 @@
                 "\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 );
                 }
 
@@ -2738,6 +2745,7 @@
                 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 );
 //             }
         }
@@ -4037,7 +4045,12 @@
             case 'P' :
 
                 memset(  opt.pmk, 0, sizeof( opt.pmk ) );
-                i = hexStringToHex(optarg, strlen(optarg), 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;
 
@@ -4057,7 +4070,7 @@
             case 'M' :
 
                 ret = sscanf( optarg, "%d", &opt.mic_failure_interval );
-                if( opt.mic_failure_interval < 0 )
+                if( ret != 1 || opt.mic_failure_interval < 0 )
                 {
                     printf( "Invalid MIC error timeout. [>=0]\n" );
                     printf("\"%s --help\" for help.\n", argv[0]);

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

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

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

@@ -199,7 +199,7 @@
     static int is_cleared = 0;
 
     return;
-
+    /*
     if( ioctl( 0, TIOCGWINSZ, &ws ) < 0 )
     {
         ws.ws_row = 25;
@@ -255,6 +255,7 @@
 //        printf( "\33[J" );
 
     printf( "\n" );
+    */
 }
 
 static struct wstate *get_ws(void)
@@ -1072,6 +1073,7 @@
 	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);
 
 	ptr = strchr(ws->ws_myip, '.');
@@ -1613,7 +1615,7 @@
         int (* all)[256];
         int i,j;
 
-        all = malloc(256*32*sizeof(int));
+        all = malloc(32*sizeof(int [256]));
         if (all == NULL) {
             return 1;
         }
@@ -2035,7 +2037,7 @@
 static void usage(char* pname)
 {
 	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"
@@ -2056,8 +2058,8 @@
 		"       -f   <max chan> : Highest scanned chan (default: 11)\n"
 		"       -k      <txnum> : Ignore acks and tx txnum times\n"
 		"\n",
-		getVersion("Wesside-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC));
-
+		version_info);
+    free(version_info);
 	exit(0);
 }

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

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

@@ -0,0 +1,546 @@
+/*
+ * 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;

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

@@ -0,0 +1,117 @@
+/*
+ * 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 Added

aircrack-ng-1.2-rc2.tar.gz/test/cryptounittest/Makefile -> aircrack-ng-1.2-rc4.tar.gz/test/cryptounittest/Makefile Changed

@@ -1,7 +1,15 @@
 AC_ROOT         = ../..
 SRC_DIR		= $(AC_ROOT)/src
 include $(AC_ROOT)/common.mak
-CFLAGS          += -I$(SRC_DIR) -I$(SRC_DIR)/include
+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)
@@ -12,9 +20,9 @@
 
 all:	check
 
-SRC_CRYPTO	  = $(AC_ROOT)/src/crypto.c $(AC_ROOT)/src/sha1-git.c
+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$(EX) test-encrypt-ccmp$(EXE) test-decrypt-ccmp$(EXE) test-calc-4pmk$(EXE)
+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)

aircrack-ng-1.2-rc2.tar.gz/test/cryptounittest/test-calc-4pmk.c -> aircrack-ng-1.2-rc4.tar.gz/test/cryptounittest/test-calc-4pmk.c Changed

@@ -25,10 +25,15 @@
 
 #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
 
@@ -37,9 +42,10 @@
     if (argc < 1) return 1;
 
     int error=0, j;
-    char  key[4][128];
-    unsigned char pmk[4][128];
-    unsigned char epmk[4][128];
+    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));
@@ -47,6 +53,14 @@
     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);
@@ -59,15 +73,46 @@
     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 (shasse2_cpuid()>=2) {
-        calc_4pmk( key[0], key[1], key[2], key[3], essid, pmk[0], pmk[1], pmk[2], pmk[3] );
-        for (j=0;j<4;j++)
+    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

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

aircrack-ng-1.2-rc2.tar.gz/test/cryptounittest/test-calc-ptk.c -> aircrack-ng-1.2-rc4.tar.gz/test/cryptounittest/test-calc-ptk.c Changed

aircrack-ng-1.2-rc2.tar.gz/test/cryptounittest/test-decrypt-ccmp.c -> aircrack-ng-1.2-rc4.tar.gz/test/cryptounittest/test-decrypt-ccmp.c Changed

aircrack-ng-1.2-rc2.tar.gz/test/cryptounittest/test-encrypt-ccmp.c -> aircrack-ng-1.2-rc4.tar.gz/test/cryptounittest/test-encrypt-ccmp.c Changed

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

@@ -1,37 +1,67 @@
-#! /bin/bash
+#! /bin/sh
 #
 # Carlos Alberto Lopez Perez <clopez@igalia.com>
-#
-# This will fail ("set -e" + "set -o pipefail") if any error happens.
-# So:
-#    If this exits with zero the test is correct. Otherwise the test failed
-#
-set -e
-set -o pipefail
+# Thomas d'Otreppe <tdotreppe@aircrack-ng.org> - Support for sha1 and sh
 TESTDIR="$(dirname $0)"
-tmpdir="$(mktemp -d)"
+if [ "$(uname -s)" = 'OpenBSD' ]; then
+	tmpdir="$(mktemp -d -t acng.XXXXXX)"
+else
+	tmpdir="$(mktemp -d -t acng.XXXX)"
+fi
+
+compute_sha1() {
+    if type "sha1sum" > /dev/null 2>/dev/null ; then
+        sha1sum "${1}" | awk '{print $1}'
+    elif type "shasum" > /dev/null 2>/dev/null ; then
+        shasum "${1}" | awk '{print $1}'
+    elif type "sha1" > /dev/null 2>/dev/null ; then
+        sha1 -q "${1}"
+    else
+        echo "Unable to find something to compute sha1" 1>&2
+	exit 1
+    fi
+}
+
+
 # Clean on exit
-trap "rm -fr "${tmpdir}"" SIGINT SIGKILL SIGQUIT SIGSEGV SIGPIPE SIGALRM SIGTERM EXIT
+if [ "$(uname -s)" = 'OpenBSD' ]; then
+	trap "rm -rf "${tmpdir}"" EXIT
+else
+	trap "rm -fr "${tmpdir}"" SIGINT SIGKILL SIGQUIT SIGSEGV SIGPIPE SIGALRM SIGTERM EXIT
+fi
 # Test1
 cp -f "${TESTDIR}/wpa.cap" "${tmpdir}"
 ./airdecap-ng -e test -p biscotte "${tmpdir}/wpa.cap" | \
-	grep "Number of decrypted WPA  packets         2"
-# Check that the hash is what we expect.
-# For each hash there are two possibilities: little or big endian
-sha1sum=$(sha1sum "${tmpdir}/wpa-dec.cap" | awk '{print $1}')
-[[ "${sha1sum}" == "69f8557cf96a26060989e88adfb521a01fc9b122" ]] || \
-	[[ "${sha1sum}" == "fb1592b2c0dccef542c1f46297394ee2892f8ed3" ]]
+        grep "Number of decrypted WPA  packets         2" || exit 1
+[ $? -ne 0 ] && exit 1
+result=$(compute_sha1 "${tmpdir}/wpa-dec.cap")
+
+if [ "${result}" != "69f8557cf96a26060989e88adfb521a01fc9b122" ] &&
+        [ "${result}" != "fb1592b2c0dccef542c1f46297394ee2892f8ed3" ]; then
+        exit 1
+fi
+
 # Test 2
 cp -f "${TESTDIR}/wpa-psk-linksys.cap" "${tmpdir}"
 ./airdecap-ng -e linksys -p dictionary "${tmpdir}/wpa-psk-linksys.cap" | \
-	grep "Number of decrypted WPA  packets        53"
-sha1sum=$(sha1sum "${tmpdir}/wpa-psk-linksys-dec.cap" | awk '{print $1}')
-[[ "${sha1sum}" == "1e75a9af0d9703c4ae4fc8ea454326aeb4abecc1" ]] || \
-	[[ "${sha1sum}"  == "1c3c4123ba6718bd3db66de251a125ed65cd6ee6" ]]
+        grep "Number of decrypted WPA  packets        53"
+[ $? -ne 0 ] && exit 1
+result=$(compute_sha1 "${tmpdir}/wpa-psk-linksys-dec.cap")
+
+if [ "${result}" != "1e75a9af0d9703c4ae4fc8ea454326aeb4abecc1" ] &&
+        [ "${result}"  != "1c3c4123ba6718bd3db66de251a125ed65cd6ee6" ]; then
+        exit 1
+fi
+
 # Test 3
 cp -f "${TESTDIR}/wpa2-psk-linksys.cap" "${tmpdir}"
 ./airdecap-ng -e linksys -p dictionary "${tmpdir}/wpa2-psk-linksys.cap" | \
-	grep "Number of decrypted WPA  packets        25"
-sha1sum=$(sha1sum "${tmpdir}/wpa2-psk-linksys-dec.cap" | awk '{print $1}')
-[[ "${sha1sum}" == "2da107b96fbe19d926020ffb0da72553b18a5775" ]] || \
-	[[ "${sha1sum}" == "dc7d033b9759838d57b74db04185c3586cbd8042" ]]
+        grep "Number of decrypted WPA  packets        25"
+[ $? -ne 0 ] && exit 1
+result=$(compute_sha1 "${tmpdir}/wpa2-psk-linksys-dec.cap")
+
+if [ "${result}" != "2da107b96fbe19d926020ffb0da72553b18a5775" ] &&
+        [ "${result}" != "dc7d033b9759838d57b74db04185c3586cbd8042" ]; then
+        exit 1
+fi
+exit 0

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

aircrack-ng-1.2-rc4.tar.gz/test/test-hex_string_to_array.c Added

aircrack-ng-1.2-rc4.tar.gz/test/test-hex_string_to_array.sh Added

@@ -0,0 +1,55 @@
+#! /bin/sh
+
+./test-hex_string_to_array >/dev/null 2>/dev/null
+RET=$?
+if [ ${RET} -ne 1 ]; then
+	"Hex string test fail. Expected return value of 1 (missing parameter), got ${RET} with no parameter."
+	exit 1
+fi
+echo "Test Hex string to array with empty string: failure - Test successful"
+
+hex_failing_test() {
+	./test-hex_string_to_array "${1}" >/dev/null 2>/dev/null
+	RET=$?
+	if [ ${RET} -ne 2 ]; then
+	echo "Hex string failed. Expected return value of 2 (failure), got ${RET} with ${failure}."
+		exit 1
+	fi
+	echo "Test Hex string to array with ${failure}: failure - Test successful"
+}
+
+# sh does not support arrays, so we have to do it this way
+hex_failing_test 'F'
+hex_failing_test 'A'
+hex_failing_test 'a'
+hex_failing_test '1'
+hex_failing_test '9'
+hex_failing_test 'G'
+hex_failing_test 'AG'
+hex_failing_test '9U'
+hex_failing_test 'aO'
+hex_failing_test 'FF:FF:FF:AS'
+hex_failing_test 'BLAH'
+
+
+hex_success_test() {
+	./test-hex_string_to_array "${1}" >/dev/null 2>/dev/null
+	RET=$?
+	if [ ${RET} -ne 0 ]; then
+		echo "Hex string test failed. Expected return value of 0 (success), got ${RET} with ${success}"
+		exit 1
+	fi
+	echo "Test Hex string to array with ${success}: success - Test successful"
+}
+
+hex_success_test 'FF'
+hex_success_test 'AA'
+hex_success_test 'aa'
+hex_success_test '11'
+hex_success_test '22'
+hex_success_test 'FF:AA:FF'
+hex_success_test 'C0:FF:EE:'
+hex_success_test '00:11:22:33:44:55:66:77:88:99:AA:BB:CC:DD:EE:FF'
+
+echo "Hex string tests successful."
+exit 0

aircrack-ng-1.2-rc4.tar.gz/test/wep_64_ptw.cap Added

Changes of Revision 7