Request 2769 (accepted)

Overview

Request 2769 (accepted)

No description set

Created by marguerite almost 10 years ago
In state accepted
Package maintainers: Mailaender and pbleser

Submit aircrack-ng

Submit package home:margueri...ranches:Extra / aircrack-ng to package Extra / aircrack-ng

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
+	test_header_file sys/auxv.h HAS_AUXV
+fi
+
+if  $IS_CROSS -eq 1 ; then
+	echo "NEWSSE=false" >>$CFGFILE
+fi
+
+# If we fall thru all the tests and still haven't created a config, create an empty one.
+if  ! -f "$CFGFILE" ; then
+	echo >$CFGFILE
+fi

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

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 ^wlan0-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_binary4;
+
+/*
+ * Various structures for internal use.
+ */
+
+typedef union {
+	double dummy;
+	MD5_word w15;
+	char b60;
+} MD5_block;
+
+typedef struct {
+	int length;
+	MD5_block *even, *odd;
+} MD5_pattern;
+
+typedef struct {
+	char s8;
+	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 AC64;
+	MD5_word IV4;
+	MD5_word masks2;
+} 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 outMD5_N;
+
+	MD5_block _blockMD5_N;
+	MD5_pattern _order21MD5_N;
+	MD5_pool _poolMD5_N;
+	char *prefix;
+	int prelen;
+} MD5_std_combined;
+
+#if defined(_OPENMP) && !MD5_ASM
+#define MD5_std_mt			1
+#define MD5_std_cpt			128
+#define MD5_std_mt_max			(MD5_std_cpt * 576)
+extern MD5_std_combined *MD5_std_all_p;
+extern int MD5_std_min_kpc, MD5_std_max_kpc;
+extern int MD5_std_nt;
+#define MD5_std_all_align		64
+#define MD5_std_all_size \
+	((sizeof(MD5_std_combined) + (MD5_std_all_align - 1)) & \
+	    ~(MD5_std_all_align - 1))
+#ifdef __GNUC__
+#define MD5_std_all \
+	(*(MD5_std_combined *)((char *)MD5_std_all_p + t))
+#define for_each_t(n) \
+	for (t = 0; t < (n) * MD5_std_all_size; t += MD5_std_all_size)
+#define init_t() \
+	int t = (unsigned int)index / MD5_N * MD5_std_all_size; \
+	index = (unsigned int)index % MD5_N;
+#else
+/*
+ * For compilers that complain about the above e.g. with "iteration expression
+ * of omp for loop does not have a canonical shape".
+ */
+#define MD5_std_all \
+	(*(MD5_std_combined *)((char *)MD5_std_all_p + t * MD5_std_all_size))
+#define for_each_t(n) \
+	for (t = 0; t < (n); t++)
+#define init_t() \
+	int t = (unsigned int)index / MD5_N; \
+	index = (unsigned int)index % MD5_N;
+#endif
+#else
+#define MD5_std_mt			0
+extern MD5_std_combined MD5_std_all;
+#define for_each_t(n)
+#define init_t()
+#endif
+
+/*
+ * MD5_std_crypt() output buffer.
+ */
+#define MD5_out				MD5_std_all.out
+
+// these 2 are still used by the 'para' function
+#define MD5_TYPE_APACHE 1
+#define MD5_TYPE_STD	2
+#define MD5_TYPE_AIX	3
+
+/*
+ * Initializes the internal structures.
+ */
+struct fmt_main;
+extern void MD5_std_init(struct fmt_main *self);
+
+/*
+ * Sets a salt for MD5_std_crypt().
+ */
+extern void MD5_std_set_salt(char *salt);
+
+/*
+ * Sets a key for MD5_std_crypt().
+ * Currently only supports keys up to 15 characters long.
+ */
+extern void MD5_std_set_key(char *key, int index);
+
+/*
+ * Main hashing routine, sets MD5_out.
+ */
+extern void MD5_std_crypt(int count);
+
+/*
+ * Returns the salt for MD5_std_set_salt().
+ */
+extern char *MD5_std_get_salt(char *ciphertext);
+
+/*
+ * Converts an ASCII ciphertext to binary.
+ */
+extern MD5_word *MD5_std_get_binary(char *ciphertext);
+
+#endif

aircrack-ng-1.2-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_tbl256;
 
+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_nonce32;
 }
 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);
+    cur = rESSID;
+
+    if(rESSID == NULL) {
+        pthread_mutex_unlock(&rESSIDmutex);
         return -1;
+    }
 
     while(cur->next != NULL)
     {
@@ -922,12 +970,14 @@
                 old->next = NULL;
                 old->len = 0;
                 free(old);
+                pthread_mutex_unlock(&rESSIDmutex);
                 return 0;
             }
         }
         cur = cur->next;
     }
 
+    pthread_mutex_unlock(&rESSIDmutex);
     return -1;
 }
 
@@ -935,11 +985,16 @@
 void flushESSID(void)
 {
     pESSID_t old;
-	pESSID_t cur = rESSID;
+	pESSID_t cur;
 	time_t now;
 
-    if(rESSID == NULL)
+    pthread_mutex_lock(&rESSIDmutex);
+    cur = rESSID;
+
+    if(rESSID == NULL) {
+        pthread_mutex_unlock(&rESSIDmutex);
         return;
+    }
 
     while(cur->next != NULL)
     {
@@ -957,11 +1012,13 @@
                 old->next = NULL;
                 old->len = 0;
                 free(old);
+                pthread_mutex_unlock(&rESSIDmutex);
                 return;
             }
         }
         cur = cur->next;
     }
+    pthread_mutex_unlock(&rESSIDmutex);
 }
 
 
@@ -995,7 +1052,7 @@
 
 int gotESSID(char* essid, int len)
 {
-    pESSID_t old, cur = rESSID;
+    pESSID_t old, cur;
 
     if(essid == NULL)
         return -1;
@@ -1003,8 +1060,13 @@
     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)
     {
@@ -1013,12 +1075,14 @@
         {
             if(memcmp(old->essid, essid, len) == 0)
             {
+                pthread_mutex_unlock(&rESSIDmutex);
                 return 1;
             }
         }
         cur = cur->next;
     }
 
+    pthread_mutex_unlock(&rESSIDmutex);
     return 0;
 }
 
@@ -1045,26 +1109,75 @@
     return 0;
 }
 
-char* getESSID(int *len)
+int getESSID(char *essid)
 {
-    if(rESSID == NULL)
-        return NULL;
+    int len;
+    pthread_mutex_lock(&rESSIDmutex);
 
-    if(rESSID->next == NULL)
-        return NULL;
+    if(rESSID == NULL || rESSID->next == NULL) {
+        pthread_mutex_unlock(&rESSIDmutex);
+        return 0;
+    }
+
+    memcpy(essid, rESSID->next->essid, rESSID->next->len + 1);
+    len = rESSID->next->len;
+    pthread_mutex_unlock(&rESSIDmutex);
 
-    *len = rESSID->next->len;
+    return len;
+}
+
+int getNextESSID(char *essid)
+{
+    int len;
+    pESSID_t cur;
+
+    pthread_mutex_lock(&rESSIDmutex);
+
+    if(rESSID == NULL || rESSID->next == NULL) {
+        pthread_mutex_unlock(&rESSIDmutex);
+        return 0;
+    }
+
+    len = strlen(essid);
+    for (cur = rESSID->next; cur != NULL; cur = cur->next)
+    {
+    	if (*essid == 0) {
+    		break;
+    	}
+    	// Check if current SSID.
+    	if (cur->len == len && cur->essid != NULL && strcmp(essid, cur->essid) == 0) {
+        	// SSID found, get next one
+        	cur = cur->next;
+        	if (cur == NULL) {
+        		cur = rESSID->next;
+        	}
+        	break;
+    	}
+    }
+    len = 0;
+
+    if (cur != NULL) {
+        memcpy(essid, cur->essid, cur->len + 1);
+        len = cur->len;
 
-    return rESSID->next->essid;
+    }
+    pthread_mutex_unlock(&rESSIDmutex);
+
+    return len;
 }
 
 int getESSIDcount()
 {
-    pESSID_t cur = rESSID;
+    pESSID_t cur;
     int count=0;
 
-    if(rESSID == NULL)
+    pthread_mutex_lock(&rESSIDmutex);
+    cur = rESSID;
+
+    if(rESSID == NULL) {
+        pthread_mutex_unlock(&rESSIDmutex);
         return -1;
+    }
 
     while(cur->next != NULL)
     {
@@ -1072,6 +1185,7 @@
         count++;
     }
 
+    pthread_mutex_unlock(&rESSIDmutex);
     return count;
 }
 
@@ -2478,7 +2592,7 @@
     char essid256;
     struct timeval tv1;
     u_int64_t timestamp;
-    char *fessid;
+    char fessidMAX_IE_ELEMENT_SIZE+1;
     int seqnum, fragnum, morefrag;
     int gotsource, gotbssid;
     int remaining, bytes2use;
@@ -2717,9 +2831,12 @@
                     }
                     st_cur->wpa.state = 0;
 
-                    for(i=0; i<32; i++)
-                        st_cur->wpa.anoncei = rand()&0xFF;
-
+                    if (opt.use_fixed_nonce) {
+                    	memcpy(st_cur->wpa.anonce, opt.fixed_nonce, 32);
+                    } else {
+                    	for(i=0; i<32; i++)
+                    		st_cur->wpa.anoncei = rand()&0xFF;
+                    }
                     st_cur->wpa.state |= 1;
 
                     /* build first eapol frame */
@@ -3098,10 +3215,10 @@
                     }
 
                     //insert essid
-                    fessid = getESSID(&len);
-                    if(fessid == NULL)
+                    len = getESSID(fessid);
+                    if(!len)
                     {
-                        fessid = "default";
+                        strcpy(fessid, "default");
                         len = strlen(fessid);
                     }
                     packetz+12 = 0x00;
@@ -3378,8 +3495,12 @@
             {
                 st_cur->wpa.state = 0;
 
-                for(i=0; i<32; i++)
-                    st_cur->wpa.anoncei = rand()&0xFF;
+                if (opt.use_fixed_nonce) {
+					memcpy(st_cur->wpa.anonce, opt.fixed_nonce, 32);
+				} else {
+					for(i=0; i<32; i++)
+						st_cur->wpa.anoncei = rand()&0xFF;
+				}
 
                 st_cur->wpa.state |= 1;
 
@@ -3478,10 +3599,10 @@
     int beacon_len=0;
     int seq=0, i=0, n=0;
     int essid_len, temp_channel;
-    char *essid = "";
-    pESSID_t cur_essid = rESSID;
+    char essidMAX_IE_ELEMENT_SIZE+1;
     float f, ticks3;
 
+    memset(essid, 0, MAX_IE_ELEMENT_SIZE+1);
     memcpy(&apc, arg, sizeof(struct AP_conf));
 
     ticks0=0;
@@ -3509,7 +3630,12 @@
             usleep( 1000000/RTC_RESOLUTION );
             gettimeofday( &tv2, NULL );
 
-            f = 1000000.0 * (float) ( tv2.tv_sec  - tv.tv_sec  )
+#if defined(__x86_64__) && defined(__CYGWIN__)
+        	f = (0.0f + 1000000)
+#else
+		f = 1000000.0
+#endif
+			 * (float) ( tv2.tv_sec  - tv.tv_sec  )
                         + (float) ( tv2.tv_usec - tv.tv_usec );
 
             ticks0 += f / ( 1000000/RTC_RESOLUTION );
@@ -3517,7 +3643,12 @@
             ticks2 += f / ( 1000000/RTC_RESOLUTION );
         }
 
-        if( ( (double)ticks2 / (double)RTC_RESOLUTION )  >= ((double)apc.interval/1000.0)*(double)seq )
+        if( ( (double)ticks2 / (double)RTC_RESOLUTION )  >= ((double)apc.interval/
+#if defined(__x86_64__) && defined(__CYGWIN__)
+		(0.0f + 1000))*(double)seq )
+#else
+		1000.0)*(double)seq )
+#endif
         {
             /* threshold reach, send one frame */
 //             ticks2 = 0;
@@ -3526,22 +3657,12 @@
             timestamp=tv1.tv_sec*1000000UL + tv1.tv_usec;
             fflush(stdout);
 
-
-            if(cur_essid == NULL) {
-            	cur_essid = rESSID;
-            	cur_essid = cur_essid->next;
-            }
-            if(cur_essid == NULL) {
-	            essid = "default";
-	            essid_len = strlen(essid);
-            } else {
-
-                /* flush expired ESSID entries */
-                flushESSID();
-
-	            essid     = cur_essid->essid;
-	            essid_len = cur_essid->len;
-	            cur_essid = cur_essid->next;
+            /* flush expired ESSID entries */
+            flushESSID();
+            essid_len = getNextESSID(essid);
+            if (!essid_len) {
+                strcpy(essid, "default");
+                essid_len = strlen("default");
             }
 
             beacon_len = 0;
@@ -3666,14 +3787,25 @@
         usleep( 1000000/RTC_RESOLUTION );
         gettimeofday( &tv2, NULL );
 
-        f = 1000000.0 * (float) ( tv2.tv_sec  - tv.tv_sec  )
+#if defined(__x86_64__) && defined(__CYGWIN__)
+        f = (0.0f + 1000000)
+#else
+	f = 1000000.0
+#endif
+		 * (float) ( tv2.tv_sec  - tv.tv_sec  )
                     + (float) ( tv2.tv_usec - tv.tv_usec );
 
         ticks0 += f / ( 1000000/RTC_RESOLUTION );
         ticks1 += f / ( 1000000/RTC_RESOLUTION );
         ticks2 += f / ( 1000000/RTC_RESOLUTION );
 
-        if( ( (double)ticks2 / (double)RTC_RESOLUTION )  >= ((double)1000.0/(double)opt.r_nbpps)*(double)seq )
+        if( ( (double)ticks2 / (double)RTC_RESOLUTION )  >= ((double)
+#if defined(__x86_64__) && defined(__CYGWIN__)
+		(0.0f + 1000)
+#else
+		1000.0
+#endif
+		/(double)opt.r_nbpps)*(double)seq )
         {
             /* threshold reach, send one frame */
 //            ticks2 = 0;
@@ -3804,14 +3936,25 @@
         usleep( 1000000/RTC_RESOLUTION );
         gettimeofday( &tv2, NULL );
 
-        f = 1000000.0 * (float) ( tv2.tv_sec  - tv.tv_sec  )
+#if defined(__x86_64__) && defined(__CYGWIN__)
+        f = (0.0f + 1000000)
+#else
+	f = 1000000.0
+#endif
+		* (float) ( tv2.tv_sec  - tv.tv_sec  )
                     + (float) ( tv2.tv_usec - tv.tv_usec );
 
         ticks0 += f / ( 1000000/RTC_RESOLUTION );
         ticks1 += f / ( 1000000/RTC_RESOLUTION );
         ticks2 += f / ( 1000000/RTC_RESOLUTION );
 
-        if( ( (double)ticks2 / (double)RTC_RESOLUTION )  >= ((double)1000.0/(double)opt.r_nbpps)*(double)seq )
+        if( ( (double)ticks2 / (double)RTC_RESOLUTION )  >= ((double)
+#if defined(__x86_64__) && defined(__CYGWIN__)
+		(0.0f + 1000)
+#else
+		1000.0
+#endif
+		/(double)opt.r_nbpps)*(double)seq )
         {
             /* threshold reach, send one frame */
 //            ticks2 = 0;
@@ -3907,7 +4050,7 @@
     struct pcap_pkthdr pkh;
     fd_set read_fds;
     unsigned char buffer4096;
-    char *s, buf128, *fessid;
+    char *s, buf128;
     int caplen;
     struct AP_conf apc;
     unsigned char mac6;
@@ -3918,6 +4061,7 @@
     memset( &dev, 0, sizeof( dev ) );
     memset( &apc, 0, sizeof( struct AP_conf ));
 
+    pthread_mutex_init(&rESSIDmutex, NULL);
     rESSID = (pESSID_t) malloc(sizeof(struct ESSID_list));
     memset(rESSID, 0, sizeof(struct ESSID_list));
 
@@ -3934,8 +4078,10 @@
     memset(rCF, 0, sizeof(struct CF_packet));
 
 #ifdef USE_GCRYPT
-    // Register callback functions to ensure proper locking in the sensitive parts of libgcrypt.
-    gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+    // Register callback functions to ensure proper locking in the sensitive parts of libgcrypt < 1.6.0
+    #if GCRYPT_VERSION_NUMBER < 0x010600
+        gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+    #endif
     // Disable secure memory.
     gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
     // Tell Libgcrypt that initialization has completed.
@@ -3955,6 +4101,7 @@
     opt.interval    = 0x64;
     opt.channel		= 0;
     opt.beacon_cache = 0; /* disable by default */
+    opt.use_fixed_nonce = 0;
     opt.ti_mtu = TI_MTU;
     opt.wif_mtu = WIF_MTU;
     invalid_channel_displayed = 0;
@@ -3987,7 +4134,7 @@
         };
 
         int option = getopt_long( argc, argv,
-                        "a:h:i:C:I:r:w:HPe:E:c:d:D:f:W:qMY:b:B:XsS:Lx:vAz:Z:yV:0NF:",
+                        "a:h:i:C:I:r:w:HPe:E:c:d:D:f:W:qMY:b:B:XsS:Lx:vAz:Z:yV:0NF:n:",
                         long_options, &option_index );
 
         if( option < 0 ) break;
@@ -4008,6 +4155,17 @@
                 printf("\"%s --help\" for help.\n", argv0);
                 return( 1 );
 
+            case 'n' :
+
+		// Check the value is 32 bytes, in hex (64 hex)
+		if (hexStringToArray(optarg, strlen(optarg), opt.fixed_nonce, 32) != 32) {
+			printf("Invalid fixed nonce. It must be 64 hexadecimal chars.\n");
+			printf("\"%s --help\" for help.\n", argv0);
+			return( 1 );
+		}
+		opt.use_fixed_nonce = 1;
+		break;
+
             case 'a' :
 
                 if( getmac( optarg, 1, opt.r_bssid ) != 0 )
@@ -4707,9 +4865,9 @@
     memcpy(apc.bssid, opt.r_bssid, 6);
     if( getESSIDcount() == 1 && opt.hidden != 1)
     {
-        fessid = getESSID(&(apc.essid_len));
-        apc.essid = (char*) malloc(apc.essid_len + 1);
-        memcpy(apc.essid, fessid, apc.essid_len);
+        apc.essid = (char*) malloc(MAX_IE_ELEMENT_SIZE+1);
+        apc.essid_len = getESSID(apc.essid);
+        apc.essid = (char*) realloc((void *)apc.essid, apc.essid_len + 1);
         apc.essidapc.essid_len = 0x00;
     }
     else

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 ZERO32 =
 "\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_COEFFN_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(tidi, NULL) != 0)
-			{
+	for (i = 0; i < id; i++) {
+		if (pthread_join(tidi, 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.dictsi != NULL) {
+				free(opt.dictsi);
+				opt.dictsi = 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
+        // at around 2.5-3% of runs
+        signal( signum, sighandler );
+#endif
 
 	if( signum == SIGQUIT )
 		clean_exit( SUCCESS );
@@ -426,11 +489,46 @@
 	usleep( 100000 );
 }
 
+int wpa_send_passphrase(char *key, struct WPA_data* data, int lock);
 
 inline int wpa_send_passphrase(char *key, struct WPA_data* data, int lock)
 {
+	int delta = 0, i = 0, fincnt = 0;
+	off_t tmpword = 0;
+
 	pthread_mutex_lock(&data->mutex);
 
+	if (!opt.dictfinish) {
+		delta = chrono(&t_dictup, 0);
+
+		if ((int)delta >= 2) {
+			for (; i < opt.totaldicts; i++) {
+				if (opt.dictidxi.loaded) {
+					fincnt++;
+					continue;
+				}
+
+				if (opt.dictidxi.dictsize > READBUF_BLKSIZE) {
+					tmpword			= (long double)linecount(opt.dictsi, opt.dictidxi.dictpos, 32);
+					opt.dictidxi.wordcount+= tmpword;
+					opt.wordcount		+= tmpword;
+					opt.dictidxi.dictpos	+= (READBUF_BLKSIZE*32);
+
+					if (opt.dictidxi.dictpos >= opt.dictidxi.dictsize)
+						opt.dictidxi.loaded = 1;
+
+					// Only process a chunk then come back later for more.
+					break;
+				}
+			}
+
+			if (fincnt == opt.totaldicts)
+				opt.dictfinish	= 1;
+			else
+				delta		= chrono(&t_dictup, 1);
+		}
+	}
+
 	if ((data->back+1) % data->nkeys == data->front)
 	{
 		if (lock != 0)
@@ -454,6 +552,7 @@
 	return 1;
 }
 
+int wpa_receive_passphrase(char *key, struct WPA_data* data);
 
 inline int wpa_receive_passphrase(char *key, struct WPA_data* data)
 {
@@ -476,6 +575,10 @@
 	return 1;
 }
 
+/* Returns number of BSSIDs.
+
+    Return value is negative for failures
+*/
 int checkbssids(char *bssidlist)
 {
 	int first = 1;
@@ -546,6 +649,10 @@
 			}
 
 			opt.firstbssid = (unsigned char *) malloc(sizeof(unsigned char));
+			if (opt.firstbssid == NULL){
+				free(frontlist);
+				return -1;
+			}
 			getmac(tmp, 1, opt.firstbssid);
 			first = 0;
 		}
@@ -736,13 +843,11 @@
 	int fd, n, fmt;
 	unsigned z;
 	int eof_notified = 0;
-	read_buf rb;
 // 	int ret=0;
 
 	unsigned char bssid6;
 	unsigned char dest6;
 	unsigned char stmac6;
-	unsigned char *buffer;
 	unsigned char *h80211;
 	unsigned char *p;
 	int weight16;
@@ -1656,6 +1761,7 @@
 			    ( ap_cur->nb_ivs_vague >= opt.max_ivs ) )
 			{
 				eof_wait( &eof_notified );
+				free(buffer);
 				return;
 			}
 		}
@@ -1691,7 +1797,6 @@
 {
 	int fd, n, fmt;
 	unsigned z;
-	read_buf rb;
 // 	int ret=0;
 
 	unsigned char bssid6;
@@ -1709,7 +1814,7 @@
 	struct AP_info *ap_prv, *ap_cur;
 	struct ST_info *st_prv, *st_cur;
 
-	memset( &rb, 0, sizeof( rb ) );
+	memset( &crb, 0, sizeof( crb ) );
 	ap_cur = NULL;
 
 	if( ( buffer = (unsigned char *) malloc( 65536 ) ) == NULL )
@@ -1736,7 +1841,7 @@
 		}
 	}
 
-	if( ! atomic_read( &rb, fd, 4, &pfh ) )
+	if( ! atomic_read( &crb, fd, 4, &pfh ) )
 	{
 		perror( "read(file header) failed" );
 		goto read_fail;
@@ -1759,7 +1864,7 @@
 
 		/* read the rest of the pcap file header */
 
-		if( ! atomic_read( &rb, fd, 20, (unsigned char *) &pfh + 4 ) )
+		if( ! atomic_read( &crb, fd, 20, (unsigned char *) &pfh + 4 ) )
 		{
 			perror( "read(file header) failed" );
 			goto read_fail;
@@ -1789,7 +1894,7 @@
 		{
 			fmt = FORMAT_IVS2;
 
-			if( ! atomic_read( &rb, fd, sizeof(struct ivs2_filehdr), (unsigned char *) &fivs2 ) )
+			if( ! atomic_read( &crb, fd, sizeof(struct ivs2_filehdr), (unsigned char *) &fivs2 ) )
 			{
 				perror( "read(file header) failed" );
 				goto read_fail;
@@ -1819,7 +1924,7 @@
 		{
 			/* read one IV */
 
-			while( ! atomic_read( &rb, fd, 1, buffer ) )
+			while( ! atomic_read( &crb, fd, 1, buffer ) )
 				goto read_fail;
 
 			if( buffer0 != 0xFF )
@@ -1828,31 +1933,31 @@
 
 				bssid0 = buffer0;
 
-				while( ! atomic_read( &rb, fd, 5, bssid + 1 ) )
+				while( ! atomic_read( &crb, fd, 5, bssid + 1 ) )
 					goto read_fail;
 			}
 
-			while( ! atomic_read( &rb, fd, 5, buffer ) )
+			while( ! atomic_read( &crb, fd, 5, buffer ) )
 				goto read_fail;
 		}
 		else if( fmt == FORMAT_IVS2 )
 		{
-			while( ! atomic_read( &rb, fd, sizeof( struct ivs2_pkthdr ), &ivs2 ) )
+			while( ! atomic_read( &crb, fd, sizeof( struct ivs2_pkthdr ), &ivs2 ) )
 				goto read_fail;
 
 			if(ivs2.flags & IVS2_BSSID)
 			{
-				while( ! atomic_read( &rb, fd, 6, bssid ) )
+				while( ! atomic_read( &crb, fd, 6, bssid ) )
 					goto read_fail;
 				ivs2.len -= 6;
 			}
 
-			while( ! atomic_read( &rb, fd, ivs2.len, buffer ) )
+			while( ! atomic_read( &crb, fd, ivs2.len, buffer ) )
 				goto read_fail;
 		}
 		else
 		{
-			while( ! atomic_read( &rb, fd, sizeof( pkh ), &pkh ) )
+			while( ! atomic_read( &crb, fd, sizeof( pkh ), &pkh ) )
 				goto read_fail;
 
 			if( pfh.magic == TCPDUMP_CIGAM ) {
@@ -1865,10 +1970,9 @@
 				fprintf( stderr, "\nInvalid packet capture length %d - "
 					"corrupted file?\n", pkh.caplen );
 				goto read_fail;
-				_exit( FAILURE );
 			}
 
-			while( ! atomic_read( &rb, fd, pkh.caplen, buffer ) )
+			while( ! atomic_read( &crb, fd, pkh.caplen, buffer ) )
 				goto read_fail;
 
 			h80211 = buffer;
@@ -2009,6 +2113,7 @@
 				sizeof( struct AP_info ) ) ) )
 			{
 				perror( "malloc failed" );
+				pthread_mutex_unlock( &mx_apl );
 				break;
 			}
 
@@ -2154,6 +2259,7 @@
 				sizeof( struct ST_info ) ) ) )
 			{
 				perror( "malloc failed" );
+				pthread_mutex_unlock( &mx_apl );
 				break;
 			}
 
@@ -2460,15 +2566,15 @@
 
 	read_fail:
 
-	if(rb.buf1 != NULL)
+	if(crb.buf1 != NULL)
 	{
-		free(rb.buf1);
-		rb.buf1 = NULL;
+		free(crb.buf1);
+		crb.buf1 = NULL;
 	}
-	if(rb.buf2 != NULL)
+	if(crb.buf2 != NULL)
 	{
-		free(rb.buf2);
-		rb.buf2 = NULL;
+		free(crb.buf2);
+		crb.buf2 = NULL;
 	}
 	if(buffer != NULL)
 	{
@@ -3047,7 +3153,10 @@
 	if (keylen<=0)
 		keylen = opt.keylen;
 
+	pthread_mutex_lock(&mx_nb);
 	nb_tried++;
+	pthread_mutex_unlock(&mx_nb);
+
 	bad = 0;
 
 	memcpy( K + 3, wepkey, keylen );
@@ -3820,9 +3929,10 @@
 void show_wpa_stats( char *key, int keylen, unsigned char pmk32, unsigned char ptk64,
 unsigned char mic16, int force )
 {
-	float delta;
+	float delta, calc, ksec;
 	int i, et_h, et_m, et_s;
 	char tmpbuf28;
+	long long int remain, eta;
 
 	if (chrono( &t_stats, 0 ) < 0.15 && force == 0)
 		return;
@@ -3858,7 +3968,7 @@
 		printf("%d k/s\r", ks);
 		fflush(stdout);
 
-		if (et_s >= 5) {
+		if (et_s >= 15) {
 			printf("\n");
 			exit(0);
 		}
@@ -3866,10 +3976,26 @@
 		goto __out;
 	}
 
+	ksec = (float) nb_kprev / delta;
+
 	if( opt.l33t ) printf( "\3333;1m" );
-	printf( "\335;20H%02d:%02d:%02d %lld keys tested "
-		"(%2.2f k/s)", et_h, et_m, et_s,
-		nb_tried, (float) nb_kprev / delta);
+
+	if (opt.stdin_dict) {
+		printf( "\335;20H%02d:%02d:%02d %lld keys tested "
+			"(%2.2f k/s) ", et_h, et_m, et_s,
+			nb_tried, (float) nb_kprev / delta);
+	} else {
+		calc = ((float)nb_tried / (float)opt.wordcount)*100;
+		remain = (opt.wordcount - nb_tried);
+		eta = (remain / (long long int)ksec);
+
+		printf( "\334;7H%02d:%02d:%02d %lld/%lld keys tested "
+			"(%2.2f k/s) ", et_h, et_m, et_s,
+			nb_tried, opt.wordcount, (float) nb_kprev / delta);
+
+		printf( "\336;7HTime left: ");
+		calctime(eta, calc);
+	}
 
 	memset( tmpbuf, ' ', sizeof( tmpbuf ) );
 	memcpy( tmpbuf, key, keylen > 27 ? 27 : keylen );
@@ -3915,31 +4041,41 @@
 {
 	FILE * keyFile;
 	char  essid36;
-	char  key4128;
-	unsigned char pmk4128;
+	char  key8128;
+	unsigned char pmk8128;
 
 	unsigned char pke100;
-	unsigned char ptk480;
-	unsigned char mic420;
+	unsigned char ptk880;
+	unsigned char mic820;
 
 	struct WPA_data* data;
 	struct AP_info* ap;
 	int thread;
+	int threadid=0;
 	int ret=0;
 	int i, j, len, slen;
-	int nparallel = 1;
+//	int nparallel = 1;
 
 #if defined(__i386__) || defined(__x86_64__)
-	// Check for SSE2, with SSE2 the algorithm works with 4 keys
-	if (shasse2_cpuid()>=2)
-		nparallel = 4;
+	// Set SIMD size to match what we can support, 1/4/8 (MMX/SSE2/AVX2)
+	cpuinfo.simdsize = cpuid_simdsize(0);
+
+//	if (shasse2_cpuid()>=2)
+//		nparallel = 4;
+#else
+	cpuinfo.simdsize = 1;
 #endif
 
 	data = (struct WPA_data*)arg;
 	ap = data->ap;
 	thread = data->thread;
+	threadid = data->threadid;
 	strncpy(essid, ap->essid, 36);
 
+#ifndef OLD_SSE_CORE
+	init_ssecore(threadid);
+#endif
+
 	/* pre-compute the key expansion buffer */
 	memcpy( pke, "Pairwise key expansion", 23 );
 	if( memcmp( ap->wpa.stmac, ap->bssid, 6 ) < 0 )	{
@@ -3961,14 +4097,22 @@
 
 	slen = strlen(essid) + 4;
 
+#ifndef OLD_SSE_CORE
+	init_atoi();
+#endif
+
 	while( 1 )
 	{
-		if (close_aircrack)
+		if (close_aircrack) {
+#ifndef OLD_SSE_CORE
+			free_ssecore(threadid);
+#endif
 			pthread_exit(&ret);
+		}
 
 		/* receive passphrases */
 
-		for(j=0; j<nparallel; ++j)
+		for(j=0; j < cpuinfo.simdsize; ++j)
 		{
 			keyj0=0;
 
@@ -3989,15 +4133,29 @@
 			keyj127=0;
 		}
 
-
 		// PMK calculation
-		if (nparallel==4)
+		if (cpuinfo.simdsize >= 4) {
+#ifndef OLD_SSE_CORE
+			init_wpapsk(key, essid, threadid);
+//			init_wpapsk(key0, key1, key2, key3, essid, threadid);
+			memcpy(pmk0, xpmk1threadid, 32);
+			memcpy(pmk1, xpmk2threadid, 32);
+			memcpy(pmk2, xpmk3threadid, 32);
+			memcpy(pmk3, xpmk4threadid, 32);
+			if (cpuinfo.simdsize == 8) {
+				memcpy(pmk4, xpmk5threadid, 32);
+				memcpy(pmk5, xpmk6threadid, 32);
+				memcpy(pmk6, xpmk7threadid, 32);
+				memcpy(pmk7, xpmk8threadid, 32);
+			}
+#else
 			calc_4pmk(key0, key1, key2, key3, essid, pmk0, pmk1, pmk2, pmk3);
-		else
-			for(j=0; j<nparallel; ++j)
+#endif
+		} else
+			for(j=0; j < cpuinfo.simdsize; ++j)
 				calc_pmk( keyj, essid, pmkj );
 
-		for(j=0; j<nparallel; ++j)
+		for(j=0; j < cpuinfo.simdsize; ++j)
 		{
 			/* compute the pairwise transient key and the frame MIC */
 
@@ -4043,19 +4201,23 @@
 					}
 				}
 
-				if (opt.is_quiet)
+				if (opt.is_quiet) {
+#ifndef OLD_SSE_CORE
+					ret = SUCCESS;
+					goto crack_wpa_cleanup;
+#else
 					return SUCCESS;
+#endif
+				}
 
 				pthread_mutex_lock(&mx_nb);
-				nb_tried += 4;
 
-				// # of key tried might not always be a multiple of 4
-				if(key00==0) nb_tried--;
-				if(key10==0) nb_tried--;
-				if(key20==0) nb_tried--;
-				if(key30==0) nb_tried--;
+				for (i = 0; i < cpuinfo.simdsize; i++)
+					if (keyi0 != 0) {
+						nb_tried++;
+						nb_kprev++;
+					}
 
-				nb_kprev += 4;
 				pthread_mutex_unlock(&mx_nb);
 
 				len = strlen(keyj);
@@ -4072,20 +4234,23 @@
 				if (opt.l33t)
 					printf( "\3332;22m" );
 
+#ifndef OLD_SSE_CORE
+				ret = SUCCESS;
+				goto crack_wpa_cleanup;
+#else
 				return SUCCESS;
+#endif
 			}
 		}
 
 		pthread_mutex_lock(&mx_nb);
-		nb_tried += 4;
 
-		// # of key tried might not always be a multiple of 4
-		if(key00==0) nb_tried--;
-		if(key10==0) nb_tried--;
-		if(key20==0) nb_tried--;
-		if(key30==0) nb_tried--;
+		for (i = 0; i < cpuinfo.simdsize; i++)
+			if (keyi0 != 0) {
+				nb_tried++;
+				nb_kprev++;
+			}
 
-		nb_kprev += 4;
 		pthread_mutex_unlock(&mx_nb);
 
 		if (!opt.is_quiet)
@@ -4097,6 +4262,12 @@
 			show_wpa_stats(key0, len, pmk0, ptk0, mic0, 0);
 		}
 	}
+
+#ifndef OLD_SSE_CORE
+	crack_wpa_cleanup:
+	free_ssecore(threadid);
+	return ret;
+#endif
 }
 
 /**
@@ -4106,6 +4277,7 @@
  */
 int next_dict(int nb)
 {
+	off_t tmpword = 0;
 
 	pthread_mutex_lock( &mx_dic );
 	if(opt.dict != NULL)
@@ -4125,10 +4297,11 @@
 		if( strcmp( opt.dictsopt.nbdict, "-" ) == 0 )
 		{
 			opt.stdin_dict = 1;
+			opt.dictfinish = 1; // no ETA stats on stdin
 
 			if( ( opt.dict = fdopen( fileno(stdin) , "r" ) ) == NULL )
 			{
-				perror( "fopen(dictionary) failed" );
+				perror( "fdopen(stdin) failed" );
 				opt.nbdict++;
 				continue;
 			}
@@ -4140,7 +4313,7 @@
 			opt.stdin_dict = 0;
 			if( ( opt.dict = fopen( opt.dictsopt.nbdict, "r" ) ) == NULL )
 			{
-				perror( "fopen(dictionary) failed" );
+				printf("ERROR: Opening dictionary %s failed (%s)\n", opt.dictsopt.nbdict, strerror(errno));
 				opt.nbdict++;
 				continue;
 			}
@@ -4149,13 +4322,25 @@
 
 			if ( ftello( opt.dict ) <= 0L )
 			{
-				printf("ERROR: %s\n", strerror(errno));
+				printf("ERROR: Processing dictionary file %s (%s)\n", opt.dictsopt.nbdict, strerror(errno));
 				fclose( opt.dict );
 				opt.dict = NULL;
 				opt.nbdict++;
 				continue;
 			}
 
+			if (!opt.dictfinish) {
+				chrono(&t_dictup, 1);
+				opt.dictidxopt.nbdict.dictsize	= ftello(opt.dict);
+
+				if (!opt.dictidxopt.nbdict.dictpos || (opt.dictidxopt.nbdict.dictpos > opt.dictidxopt.nbdict.dictsize)) {
+					tmpword					= (long double)linecount(opt.dictsopt.nbdict, (opt.dictidxopt.nbdict.dictpos ? opt.dictidxopt.nbdict.dictpos : 0), 32);
+					opt.dictidxopt.nbdict.wordcount	+= tmpword;
+					opt.wordcount				+= tmpword;
+					opt.dictidxopt.nbdict.dictpos		= (READBUF_BLKSIZE*32);
+				}
+			}
+
 			rewind( opt.dict );
 		}
 		break;
@@ -4215,8 +4400,10 @@
 		return 1;
 	}
 
+	pthread_mutex_lock(&mx_nb);
 	nb_tried++;
 	nb_kprev++;
+	pthread_mutex_unlock(&mx_nb);
 
 	if( ! opt.is_quiet )
 		show_wpa_stats( values1, strlen(values1), (unsigned char*)(values0), ptk, mic, 0 );
@@ -4733,37 +4920,28 @@
 	int len;
 	char *optarg;
 
-	opt.nbdict = 0;
-	optarg = strsep(&optargs, ",");
+	opt.dictfinish = opt.totaldicts = opt.nbdict = 0;
 
-	for(len=0; len<MAX_DICTS; len++)
-	{
-		opt.dictslen = NULL;
-	}
-
-	while(optarg != NULL && opt.nbdict<MAX_DICTS)
-	{
-		len = strlen(optarg)+1;
-		opt.dictsopt.nbdict = (char*)malloc(len * sizeof(char));
-		if(opt.dictsopt.nbdict == NULL)
-		{
-			perror("allocation failed!");
-			return( FAILURE );
-		}
-		if(strncasecmp(optarg, "h:", 2) == 0)
-		{
-			strncpy(opt.dictsopt.nbdict, optarg+2, len-2);
+	while ((opt.nbdict < MAX_DICTS) && (optarg = strsep(&optargs, ",")) != NULL)  {
+		if (!strncasecmp(optarg, "h:", 2)) {
+			optarg += 2;
 			opt.hexdictopt.nbdict = 1;
-		}
-		else
-		{
-			strncpy(opt.dictsopt.nbdict, optarg, len);
+		} else {
 			opt.hexdictopt.nbdict = 0;
 		}
-		optarg = strsep(&optargs, ",");
+
+		if (!(opt.dictsopt.nbdict = strdup(optarg))) {
+			perror("Failed to allocate memory for dictionary");
+			return( FAILURE );
+		}
+
 		opt.nbdict++;
+		opt.totaldicts++;
 	}
 
+	for (len = opt.nbdict; len < MAX_DICTS; len++)
+		opt.dictslen = NULL;
+
 	next_dict(0);
 
 	while(next_dict(opt.nbdict+1) == 0) {}
@@ -4773,6 +4951,12 @@
 	return 0;
 }
 
+/*
+Uses the specified dictionary to crack the WEP key.
+
+Return: SUCCESS if it cracked the key,
+        FAILURE if it could not.
+*/
 int crack_wep_dict()
 {
 	struct timeval t_last;
@@ -4791,12 +4975,19 @@
 	}
 
 	key = (char*) malloc(sizeof(char) * (opt.keylen + 1));
+	if (key == NULL)
+		return( FAILURE );
+
 	gettimeofday( &t_last, NULL );
 	t_last.tv_sec--;
 
 	while(1)
 	{
-		if( next_key( &key, keysize ) != SUCCESS) return( FAILURE );
+		if( next_key( &key, keysize ) != SUCCESS)
+		{
+			free(key);
+			return( FAILURE );
+		}
 
 		i = strlen( key );
 
@@ -4833,6 +5024,12 @@
 	}
 }
 
+/*
+Uses the PTW attack to crack the WEP key.
+
+Return: SUCCESS if it cracked the key,
+        FAILURE if it could not.
+*/
 static int crack_wep_ptw(struct AP_info *ap_cur)
 {
     int (* all)256;
@@ -4840,7 +5037,7 @@
 
     opt.ap = ap_cur;
 
-    all = malloc(256*32*sizeof(int));
+    all = malloc(32*sizeof(int 256));
     if (all == NULL) {
     	return FAILURE;
     }
@@ -4946,8 +5143,10 @@
 #endif
 
 #ifdef USE_GCRYPT
-	// Register callback functions to ensure proper locking in the sensitive parts of libgcrypt.
-	gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+	// Register callback functions to ensure proper locking in the sensitive parts of libgcrypt < 1.6.0
+	#if GCRYPT_VERSION_NUMBER < 0x010600
+		gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+	#endif
 	// Disable secure memory.
 	gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
 	// Tell Libgcrypt that initialization has completed.
@@ -5041,18 +5240,11 @@
 				return( 1 );
 
 			case 'u' :
-				printf("Nb CPU detected: %d ", cpu_count);
 #if defined(__i386__) || defined(__x86_64__)
-				unused = shasse2_cpuid();
-
-				if (unused == 1) {
-					printf(" (MMX available)");
-				}
-				if (unused >= 2) {
-					printf(" (SSE2 available)");
-				}
+				cpuid_getinfo();
+#else
+				printf("Nb CPU detected: %d\n", cpu_count);
 #endif
-				printf("\n");
 				return( 0 );
 
 			case 'V' :
@@ -5077,7 +5269,7 @@
 				else if ( strcasecmp( optarg, "wpa" ) == 0 )
 					opt.amode = 2;
 
-				if( opt.amode != 1 && opt.amode != 2 )
+				if( ret1 !=1 || (opt.amode != 1 && opt.amode != 2) )
 				{
 					printf( "Invalid attack mode. 1,2 or wep,wpa\n" );
 					printf("\"%s --help\" for help.\n", argv0);
@@ -5191,6 +5383,8 @@
 					buf0 = s0;
 					buf1 = s1;
 				}
+
+				opt.do_ptw = 0;
 				break;
 
 
@@ -5361,6 +5555,8 @@
 					printf("\"%s --help\" for help.\n", argv0);
 					return FAILURE;
 				}
+
+				opt.do_ptw = 0;
 				break;
 
 			case 'r' :
@@ -5425,17 +5621,17 @@
 		opt.amode = 2;
 		opt.dict = stdin;
 		opt.bssid_set = 1;
-		
+
 		ap_1st = ap_cur = malloc(sizeof(*ap_cur));
 		if (!ap_cur)
 			err(1, "malloc()");
-		
+
 		memset(ap_cur, 0, sizeof(*ap_cur));
-		
+
 		ap_cur->target = 1;
 		ap_cur->wpa.state = 7;
 		strcpy(ap_cur->essid, "sorbo");
-		
+
 		goto __start;
 	}
 
@@ -5774,8 +5970,10 @@
 __start:
 	/* launch the attack */
 
+	pthread_mutex_lock(&mx_nb);
 	nb_tried = 0;
 	nb_kprev = 0;
+	pthread_mutex_unlock(&mx_nb);
 
 	chrono( &t_begin, 1 );
 	chrono( &t_stats, 1 );
@@ -5799,7 +5997,7 @@
 
 		if(j + opt.do_brute > 4)
 		{
-			printf( "Bruteforcing more then 4 bytes will take too long, aborting!" );
+			printf( "Bruteforcing more than 4 bytes will take too long, aborting!" );
 			goto exit_main;
 		}
 
@@ -5984,9 +6182,20 @@
 
 			for( i = 0; i < opt.nbcpu; i++ )
 			{
+				if (ap_cur->ivbuf_size) {
+					free(ap_cur->ivbuf);
+					ap_cur->ivbuf		= NULL;
+					ap_cur->ivbuf_size	= 0;
+				}
+
+				uniqueiv_wipe( ap_cur->uiv_root );
+				ap_cur->uiv_root = NULL;
+				ap_cur->nb_ivs = 0;
+
 				/* start one thread per cpu */
 				wpa_datai.ap = ap_cur;
 				wpa_datai.thread = i;
+				wpa_datai.threadid = id;
 				wpa_datai.nkeys = 17;
 				wpa_datai.key_buffer = (char*) malloc(wpa_datai.nkeys * 128);
 				wpa_datai.front = 0;
@@ -6033,7 +6242,7 @@
 				if( opt.is_quiet )
 				{
 					printf( "KEY FOUND!  %s \n", wpa_datai.key );
-					return( SUCCESS );
+					clean_exit( SUCCESS );
 				}
 
 				if( opt.l33t )
@@ -6045,21 +6254,24 @@
 				if( opt.l33t )
 					printf( "\3332;22m" );
 
-				return( SUCCESS );
-			}
-			else
-				{
-					if( opt.is_quiet )
-					{
-						printf( "Passphrase not in dictionary\n" );
-						return( FAILURE );
-					}
+				clean_exit( SUCCESS );
+			} else {
+				printf("%sPassphrase not in dictionary\n", (opt.is_quiet?"":"\n"));
+
+				if (opt.is_quiet)
+					clean_exit( FAILURE );
 
-					printf( "\nPassphrase not in dictionary \n" );
+				if (opt.stdin_dict)
 					printf("\335;30H %lld",nb_tried);
-					printf("\3332;0H\n");
+				else {
+					printf("\334;18H%lld/%lld keys tested ", nb_tried, opt.wordcount);
+					printf("\336;7HTime left: ");
+					calctime(0, ((float)nb_tried / (float)opt.wordcount)*100);
 				}
 
+				printf("\3332;0H\n");
+			}
+
 			printf("\n");
 
 #ifdef HAVE_SQLITE

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 pmk32;
 } __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 hexdictMAX_DICTS;			 /* if dict in hex       */
-
+	long long int wordcount;		/* Total wordcount for all dicts*/
+	struct dictfiles dictidxMAX_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 tablePTW_KEYHSBYTESPTW_n, int choicesKEYHSBYTES, int depthKEYHSBYTES, 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 depthKEYHSBYTES;
 PTW_tableentry keytableKEYHSBYTESn;
 
+// 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 helperKEYHSBYTES;
 	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 wepkey64;
     int weplen, crypt;
     int store_bad;
+    char decrypted_fpath65536;
+    char corrupted_fpath65536;
 }
 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_fpath0)
+                {
+                    printf( "filename for decrypted packets already specified.\n" );
+                    printf("\"%s --help\" for help.\n", argv0);
+                    return( 1 );
+                }
+
+                strncpy( opt.decrypted_fpath, optarg, sizeof( opt.decrypted_fpath ) - 1 );
+                break;
+
+            case 'c' :
+
+                if ( opt.corrupted_fpath0)
+                {
+                    printf( "filename for corrupted packets already specified.\n" );
+                    printf("\"%s --help\" for help.\n", argv0);
+                    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_fpath0)
+        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_fpath0)
+            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_filenametemp == '.')
-			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_filenametemp == '.')
+			    break;
+	    }
+
+	    // No extension
+        if (temp == 0) {
+            if (!manual_cloaked_fname)
+                snprintf(_filename_output_cloaked, strlen( input_filename ) + 9 + 5, "%s-cloaked.pcap", input_filename);
+            if (!manual_filtered_fname)
+                snprintf(_filename_output_filtered, strlen( input_filename ) + 10 + 5, "%s-filtered.pcap", input_filename);
+        }
+        else {
+            if (!manual_cloaked_fname)
+            {
+                strncpy(_filename_output_cloaked, input_filename, strlen( input_filename ) + 9 + 5 - 1);
+                strncat(_filename_output_cloaked, "-cloaked.pcap", 14);
+            }
+            if (!manual_filtered_fname)
+            {
+                strncpy(_filename_output_filtered, input_filename, strlen( input_filename ) + 10 + 5 - 1);
+                strncat(_filename_output_filtered, "-filtered.pcap", 15);
+            }
+        }
+    }
 
-	printf("Output packets (valids) filename: %s\n",  _filename_output_filtered);
+	printf("Output packets (valid) filename: %s\n",  _filename_output_filtered);
 	printf("Output packets (cloaked) filename: %s\n",  _filename_output_cloaked);
 
 	// 1. Read all packets and put the following in a linked list:

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(bitratesi-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(bitratesi+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 challenge2048;
     unsigned char keystream2048;
 
+    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( arparp_off1.buf,
                                  arparp_off1.len ) < 0 )
-                    return( 1 );
+                    {
+                        free( arp );
+                        fclose( f_cap_out );
+                        return( 1 );
+                    }
 
                 if( ((double)ticks0/(double)RTC_RESOLUTION)*(double)opt.r_nbpps > (double)nb_pkt_sent  )
                 {
                     if( send_packet( arparp_off1.buf,
                                     arparp_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( ( arpnb_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 );
             }
 
@@ -2906,13 +2969,20 @@
 
                 if( send_packet( arparp_off1.buf,
                                  arparp_off1.len ) < 0 )
-                    return( 1 );
-
+                    {
+                        free( arp );
+                        fclose( f_cap_out );
+                        return( 1 );
+                    }
                 if( ((double)ticks0/(double)RTC_RESOLUTION)*(double)opt.r_nbpps > (double)nb_pkt_sent  )
                 {
                     if( send_packet( arparp_off1.buf,
                                     arparp_off1.len ) < 0 )
+                    {
+                        free( arp );
+                        fclose( f_cap_out );
                         return( 1 );
+                    }
                 }
 
                 if( ++arp_off1 >= nb_arp )
@@ -2928,8 +2998,15 @@
 
             caplen = read_packet( h80211, sizeof( h80211 ), NULL );
 
-            if( caplen  < 0 ) return( 1 );
-            if( caplen == 0 ) continue;
+            if( caplen  < 0 )
+            {
+                free( arp );
+                fclose( f_cap_out );
+                return( 1 );
+            }
+
+            if( caplen == 0 )
+               continue;
         }
         else
         {
@@ -3131,6 +3208,8 @@
 
                 if( ( arpnb_arp.buf = malloc( 128 ) ) == NULL ) {
                     perror( "malloc failed" );
+                    free(arp);
+                    fclose( f_cap_out );
                     return( 1 );
                 }
 
@@ -3159,6 +3238,8 @@
 
                 if( fwrite( &pkh, n, 1, f_cap_out ) != 1 ) {
                     perror( "fwrite failed" );
+                    free(arp);
+                    fclose( f_cap_out );
                     return( 1 );
                 }
 
@@ -3166,6 +3247,8 @@
 
                 if( fwrite( h80211, n, 1, f_cap_out ) != 1 ) {
                     perror( "fwrite failed" );
+                    free(arp);
+                    fclose( f_cap_out );
                     return( 1 );
                 }
 
@@ -3173,7 +3256,7 @@
             }
         }
     }
-
+    fclose( f_cap_out );
     return( 0 );
 }
 
@@ -3202,6 +3285,9 @@
     else
         arp = (struct ARP_req*) malloc( sizeof( struct ARP_req ) );
 
+    if (arp == NULL)
+        return 1;
+
     /* capture only WEP data to broadcast address */
 
     opt.f_type    = 2;
@@ -3209,12 +3295,15 @@
     opt.f_iswep   = 1;
     opt.f_fromds  = 1;
 
-    if(getnet(NULL, 1, 1) != 0)
+    if(getnet(NULL, 1, 1) != 0){
+        free(arp);
         return 1;
+    }
 
     if( memcmp( opt.f_bssid, NULL_MAC, 6 ) == 0 )
     {
         printf( "Please specify a BSSID (-b).\n" );
+        free(arp);
         return( 1 );
     }
     /* create and write the output pcap header */
@@ -3242,6 +3331,7 @@
     if( ( f_cap_out = fopen( strbuf, "wb+" ) ) == NULL )
     {
         perror( "fopen failed" );
+        free(arp);
         return( 1 );
     }
 
@@ -3250,6 +3340,8 @@
     if( fwrite( &pfh_out, n, 1, f_cap_out ) != 1 )
     {
         perror( "fwrite failed\n" );
+        free(arp);
+        fclose( f_cap_out );
         return( 1 );
     }
 
@@ -3266,6 +3358,8 @@
         if( fcntl( dev.fd_in, F_SETFL, O_NONBLOCK ) < 0 )
         {
             perror( "fcntl(O_NONBLOCK) failed" );
+            free(arp);
+            fclose( f_cap_out );
             return( 1 );
         }
     }
@@ -3291,6 +3385,8 @@
             if( read( dev.fd_rtc, &n, sizeof( n ) ) < 0 )
             {
                 perror( "read(/dev/rtc) failed" );
+                free( arp );
+                fclose( f_cap_out );
                 return( 1 );
             }
 
@@ -3334,13 +3430,21 @@
 
                 if( send_packet( arparp_off1.buf,
                                  arparp_off1.len ) < 0 )
+                {
+                    free(arp);
+                    fclose( f_cap_out );
                     return( 1 );
+                }
 
                 if( ((double)ticks0/(double)RTC_RESOLUTION)*(double)opt.r_nbpps > (double)nb_pkt_sent  )
                 {
                     if( send_packet( arparp_off1.buf,
                                     arparp_off1.len ) < 0 )
+                    {
+                        free(arp);
+                        fclose( f_cap_out );
                         return( 1 );
+                    }
                 }
 
                 if( ++arp_off1 >= nb_arp )
@@ -3356,7 +3460,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
@@ -3544,6 +3653,8 @@
 
                 if( ( arpnb_arp.buf = malloc( 128 ) ) == NULL ) {
                     perror( "malloc failed" );
+                    free(arp);
+                    fclose( f_cap_out );
                     return( 1 );
                 }
 
@@ -3578,6 +3689,8 @@
 
                 if( fwrite( &pkh, n, 1, f_cap_out ) != 1 ) {
                     perror( "fwrite failed" );
+                    free( arp );
+                    fclose( f_cap_out );
                     return( 1 );
                 }
 
@@ -3585,6 +3698,8 @@
 
                 if( fwrite( h80211, n, 1, f_cap_out ) != 1 ) {
                     perror( "fwrite failed" );
+                    free( arp );
+                    fclose( f_cap_out );
                     return( 1 );
                 }
 
@@ -4170,6 +4285,7 @@
         if( fcntl( dev.fd_in, F_SETFL, O_NONBLOCK ) < 0 )
         {
             perror( "fcntl(O_NONBLOCK) failed" );
+            free(chopped);
             return( 1 );
         }
     }
@@ -4196,6 +4312,7 @@
 "      Try running another aireplay-ng to fake authentication (attack \"-1\").\n"
 "    * The AP isn't vulnerable when operating in authenticated mode.\n"
 "      Try aireplay-ng in non-authenticated mode instead (no -h option).\n\n" );
+            free(chopped);
             return( 1 );
         }
 
@@ -4206,6 +4323,7 @@
             if( read( dev.fd_rtc, &n, sizeof( n ) ) < 0 )
             {
                 perror( "\nread(/dev/rtc) failed" );
+                free(chopped);
                 return( 1 );
             }
 
@@ -4356,7 +4474,10 @@
             errno = 0;
 
             if( send_packet( h80211, data_end -1 ) != 0 )
+            {
+                free(chopped);
                 return( 1 );
+            }
 
             if( errno != EAGAIN )
             {
@@ -4371,8 +4492,14 @@
 
         n = read_packet( h80211, sizeof( h80211 ), NULL );
 
-        if( n  < 0 ) return( 1 );
-        if( n == 0 ) continue;
+        if( n  < 0 )
+        {
+            free(chopped);
+            return( 1 );
+        }
+
+        if( n == 0 )
+            continue;
 
         nb_pkt_read++;
 
@@ -4410,6 +4537,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 );
             }
         }
@@ -4450,6 +4578,7 @@
                 printf( "\n\nFailure: the access point does not properly "
                         "discard frames with an\ninvalid ICV - try running "
                         "aireplay-ng in non-authenticated mode instead.\n\n" );
+                free(chopped);
                 return( 1 );
             }
         }
@@ -4561,6 +4690,7 @@
     if( ( f_cap_out = fopen( strbuf, "wb+" ) ) == NULL )
     {
         perror( "fopen failed" );
+        free(chopped);
         return( 1 );
     }
 
@@ -4569,6 +4699,8 @@
     if( fwrite( &pfh_out, n, 1, f_cap_out ) != 1 )
     {
         perror( "fwrite failed\n" );
+        free(chopped);
+        fclose( f_cap_out );
         return( 1 );
     }
 
@@ -4577,6 +4709,8 @@
     if( fwrite( &pkh, n, 1, f_cap_out ) != 1 )
     {
         perror( "fwrite failed" );
+        free(chopped);
+        fclose( f_cap_out );
         return( 1 );
     }
 
@@ -4585,6 +4719,8 @@
     if( fwrite( h80211, n, 1, f_cap_out ) != 1 )
     {
         perror( "fwrite failed" );
+        free(chopped);
+        fclose( f_cap_out );
         return( 1 );
     }
 
@@ -4603,6 +4739,7 @@
     if( ( f_cap_out = fopen( strbuf, "wb+" ) ) == NULL )
     {
         perror( "fopen failed" );
+        free(chopped);
         return( 1 );
     }
 
@@ -4611,13 +4748,16 @@
     if( fwrite( chopped + 24, n, 1, f_cap_out ) != 1 )
     {
         perror( "fwrite failed" );
+        free(chopped);
+        fclose( f_cap_out );
         return( 1 );
     }
 
+    free(chopped);
     fclose( f_cap_out );
 
     printf( "\nCompleted in %lds (%0.2f bytes/s)\n\n",
-            (long) time( NULL ) - tt,
+            (long) (time( NULL ) - tt),
             (float) ( pkh.caplen - 6 - 24 ) /
             (float) ( time( NULL ) - tt  ) );
 
@@ -5330,6 +5470,7 @@
     if( fcntl( sock, F_SETFL, O_NONBLOCK ) < 0 )
     {
         perror( "fcntl(O_NONBLOCK) failed" );
+        close(sock);
         return( 1 );
     }
 
@@ -5377,6 +5518,7 @@
     if (send(sock, &nh, sizeof(nh), 0) != sizeof(nh))
     {
         perror("send");
+        close(sock);
         return -1;
     }
 
@@ -5392,6 +5534,7 @@
             if( errno != EAGAIN )
             {
                 perror("read");
+                close(sock);
                 return -1;
             }
         }
@@ -5452,6 +5595,7 @@
         if( fcntl( sock, F_SETFL, O_NONBLOCK ) < 0 )
         {
             perror( "fcntl(O_NONBLOCK) failed" );
+            close(sock);
             return( 1 );
         }
 
@@ -5506,7 +5650,12 @@
     }
     avg /= REQUESTS;
 
-    PCT; printf("ping %s:%d (min/avg/max): %.3fms/%.3fms/%.3fms\n", ip_str, port, min/1000.0, avg/1000.0, max/1000.0);
+    PCT; printf("ping %s:%d (min/avg/max): %.3fms/%.3fms/%.3fms\n", ip_str, port, min/
+#if defined(__x86_64__) && defined(__CYGWIN__)
+	(0.0f + 1000), avg/(0.0f + 1000), max/(0.0f + 1000));
+#else
+	1000.0, avg/1000.0, max/1000.0);
+#endif
 
     return 0;
 }
@@ -5907,7 +6056,12 @@
         {
             avg /= api.found;
             avg2 /= api.found;
-            PCT; printf("Ping (min/avg/max): %.3fms/%.3fms/%.3fms Power: %.2f\n", (min/1000.0), (avg/1000.0), (max/1000.0), avg2);
+            PCT; printf("Ping (min/avg/max): %.3fms/%.3fms/%.3fms Power: %.2f\n",
+#if defined(__x86_64__) && defined(__CYGWIN__)
+	(min/(0.0f + 1000)), (avg/(0.0f + 1000)), (max/(0.0f + 1000)), avg2);
+#else
+	(min/1000.0), (avg/1000.0), (max/1000.0), avg2);
+#endif
         }
         PCT; printf("%2d/%2d: %3d%%\n\n", api.found, REQUESTS, ((api.found*100)/REQUESTS));
 
@@ -6017,7 +6171,12 @@
                     avg2 += api.pwrj;
                 if(api.found > 0)
                     avg2 /= api.found;
-                PCT; printf("Probing at %2.1f Mbps:\t%2d/%2d: %3d%%\n", wi_get_rate(_wi_out)/1000000.0,
+                PCT; printf("Probing at %2.1f Mbps:\t%2d/%2d: %3d%%\n", wi_get_rate(_wi_out)/
+#if defined(__x86_64__) && defined(__CYGWIN__)
+	(0.0f + 1000000),
+#else
+	1000000.0,
+#endif
                             api.found, REQUESTS, ((api.found*100)/REQUESTS));
             }

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 command13;
 
 	/* 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 command13;
 
 	/* 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 command13;
 
 	/* 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 command13;
 
 	/* 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 b2;
 	unsigned char c2;
 	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( h802110 == 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( h802111 & 3 )
@@ -3898,15 +3916,13 @@
                      ap_cur->bssid2, ap_cur->bssid3,
                      ap_cur->bssid4, ap_cur->bssid5 );
 
-	
-
 	probes_written = 0;
         for( i = 0, n = 0; i < NB_PRB; i++ )
         {
             if( st_cur->ssid_lengthi == 0 )
                 continue;
 
-	    temp = format_text_for_csv(st_cur->probesi, st_cur->ssid_lengthi);
+	    temp = format_text_for_csv((unsigned char *)st_cur->probesi, st_cur->ssid_lengthi);
 
 	    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->probesi, client->ssid_lengthi);
+		essid = sanitize_xml((unsigned char *)client->probesi, client->ssid_lengthi);
 		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 @@
 
 	/* Rate: inaccurate because it's the latest rate seen */
 	client_max_rate = ( client->rate_from > client->rate_to ) ? client->rate_from : client->rate_to ;
-	fprintf(G.f_kis_xml, "\t\t\t<maxseenrate>%.6f</maxseenrate>\n", client_max_rate / 1000000.0 );
+	fprintf(G.f_kis_xml, "\t\t\t<maxseenrate>%.6f</maxseenrate>\n", client_max_rate /
+#if defined(__x86_64__) && defined(__CYGWIN__)
+		(0.0f + 1000000) );
+#else
+		1000000.0 );
+#endif
 
 	/* Those 2 lines always stays the same */
 	fprintf(G.f_kis_xml, "\t\t\t<carrier>IEEE 802.11b+</carrier>\n");
@@ -4452,10 +4473,10 @@
 			/* Write new network information */
 			strncpy(first_time, ctime(&st_cur->tinit), TIME_STR_LENGTH - 1);
 			first_timestrlen(first_time) - 1 = 0; // remove new line
-			
+
 			strncpy(last_time, ctime(&st_cur->tlast), TIME_STR_LENGTH - 1);
 			last_timestrlen(last_time) - 1 = 0; // remove new line
-			
+
 			fprintf(G.f_kis_xml, "\t<wireless-network number=\"%d\" type=\"probe\" ",
 				network_number);
 			fprintf(G.f_kis_xml, "first-time=\"%s\" last-time=\"%s\">\n", first_time, last_time);
@@ -4483,7 +4504,12 @@
 
 			/* Rate: inaccurate because it's the latest rate seen */
 			client_max_rate = ( st_cur->rate_from > st_cur->rate_to ) ? st_cur->rate_from : st_cur->rate_to ;
-			fprintf(G.f_kis_xml, "\t\t<maxseenrate>%.6f</maxseenrate>\n", client_max_rate / 1000000.0 );
+			fprintf(G.f_kis_xml, "\t\t<maxseenrate>%.6f</maxseenrate>\n", client_max_rate /
+#if defined(__x86_64__) && defined(__CYGWIN__)
+				(0.0f + 1000000) );
+#else
+				1000000.0 );
+#endif
 
 			fprintf(G.f_kis_xml, "\t\t<carrier>IEEE 802.11b+</carrier>\n");
 			fprintf(G.f_kis_xml, "\t\t<encoding>CCK</encoding>\n");
@@ -4501,7 +4527,7 @@
 
 			/* XXX: What does that field mean? Is it the total size of data? */
 			fprintf(G.f_kis_xml, "\t\t<datasize>0</datasize>\n");
-	
+
 			/* SNR information */
 			average_power = (st_cur->power == -1) ? 0 : st_cur->power;
 			fprintf(G.f_kis_xml, "\t\t<snr-info>\n"
@@ -4774,10 +4800,10 @@
 }
 
 /* See if a string contains a character in the first "n" bytes.
- * 
+ *
  * Returns a pointer to the first occurrence of the character, or NULL
  * if the character is not present in the string.
- * 
+ *
  * Breaks the str* naming convention to avoid a name collision if we're
  * compiling on a system that has strnchr()
  */
@@ -4798,10 +4824,10 @@
 }
 
 /* Read at least one full line from the network.
- * 
+ *
  * Returns the amount of data in the buffer on success, 0 on connection
  * closed, or a negative value on error.
- * 
+ *
  * If the return value is >0, the buffer contains at least one newline
  * character.  If the return value is <= 0, the contents of the buffer
  * are undefined.
@@ -4830,14 +4856,14 @@
 	{
 		return -1;
 	}
-	
+
 	return pos;
 }
 
-/* Remove a newline-terminated block of data from a buffer, replacing 
+/* Remove a newline-terminated block of data from a buffer, replacing
  * the newline with a '\0'.
- * 
- * Returns the number of characters left in the buffer, or -1 if the 
+ *
+ * Returns the number of characters left in the buffer, or -1 if the
  * buffer did not contain a newline.
  */
 static int get_line_from_buffer(char *buffer, int size, char *line)
@@ -4851,16 +4877,16 @@
 		memmove(buffer, cursor, size - (strlen(line) + 1));
 		return size - (strlen(line) + 1);
 	}
-	
+
 	return -1;
-} 
+}
 
 /* Extract a name:value pair from a null-terminated line of JSON.
- * 
- * Returns 1 if the name was found, or 0 otherwise. 
- * 
+ *
+ * Returns 1 if the name was found, or 0 otherwise.
+ *
  * The string in "value" is null-terminated if the name was found.  If
- * the name was not found, the contents of "value" are undefined. 
+ * the name was not found, the contents of "value" are undefined.
  */
 static int json_get_value_for_name( const char *buffer, const char *name, char *value )
 {
@@ -4869,7 +4895,7 @@
 	size_t to_find_len;
 	char *vcursor = value;
 	int ret = 0;
-	
+
 	if (buffer == NULL || strlen(buffer) == 0 || name == NULL || strlen(name) == 0 || value == NULL)
 	{
 		return 0;
@@ -4877,7 +4903,7 @@
 
 	to_find_len = strlen(name) + 3;
 	to_find = (char*) malloc(to_find_len);
-	snprintf(to_find, sizeof(to_find), "\"%s\"", name);
+	snprintf(to_find, to_find_len, "\"%s\"", name);
 	cursor = strstr(buffer, to_find);
 	free(to_find);
 	if(cursor != NULL)
@@ -4890,7 +4916,7 @@
 		if(*cursor != '\0')
 		{
 			cursor++;
-			while(isspace(*cursor) && *cursor != '\0')
+			while(isspace((int)(*cursor)) && *cursor != '\0')
 			{
 				cursor++;
 			}
@@ -4944,7 +4970,7 @@
 		else
 		{
 			/* Number, supposedly.  Copy as-is. */
-			while(*cursor != ',' && *cursor != '}' && !isspace(*cursor))
+			while(*cursor != ',' && *cursor != '}' && !isspace((int)(*cursor)))
 			{
 				*vcursor = *cursor;
 				cursor++; vcursor++;
@@ -4957,7 +4983,7 @@
 	return ret;
 }
 
-void gps_tracker( void )
+void gps_tracker(pid_t parent)
 {
 	ssize_t unused;
     int gpsd_sock;
@@ -4987,6 +5013,7 @@
 
     if( connect( gpsd_sock, (struct sockaddr *) &gpsd_addr,
                  sizeof( gpsd_addr ) ) < 0 ) {
+        close(gpsd_sock);
         return;
     }
 
@@ -4998,18 +5025,18 @@
     timeout.tv_sec = 1;
     timeout.tv_usec = 0;
     is_json = select(gpsd_sock + 1, &read_fd, NULL, NULL, &timeout);
-    
+
     if (is_json > 0) {
 		/* Probably JSON.  Read the first line and verify it's a version of the protocol we speak. */
 
     	if((pos = read_line(gpsd_sock, buffer, 0, sizeof(buffer))) <= 0)
     		return;
-    	
+
     	pos = get_line_from_buffer(buffer, pos, line);
 
     	is_json = (json_get_value_for_name(line, "class", data) &&
     			   strncmp(data, "VERSION", 7) == 0);
-		
+
     	if (is_json) {
 			/* Verify it's a version of the protocol we speak */
 			if(json_get_value_for_name(line, "proto_major", data) && data0 != '3')
@@ -5017,7 +5044,7 @@
 				/* It's an unknown version of the protocol.  Bail out. */
 				return;
 			}
-			
+
 			// Send ?WATCH={"json":true};
 			memset(line, 0, sizeof(line));
 			strcpy(line, "?WATCH={\"json\":true};\n");
@@ -5172,7 +5199,7 @@
         if (G.do_exit == 0)
 		{
 			unused = write( G.gc_pipe1, G.gps_loc, sizeof( float ) * 5 );
-			kill( getppid(), SIGUSR2 );
+			kill( parent, SIGUSR2 );
 		}
     }
 }
@@ -5180,54 +5207,63 @@
 void sighandler( int signum)
 {
 	ssize_t unused;
-    int card=0;
-
-    signal( signum, sighandler );
+	int card = 0;
+	signal( signum, sighandler );
 
-    if( signum == SIGUSR1 )
-    {
+	if( signum == SIGUSR1 )
+	{
 		unused = read( G.cd_pipe0, &card, sizeof(int) );
-        if(G.freqoption)
-            unused = read( G.ch_pipe0, &(G.frequencycard), sizeof( int ) );
-        else
-            unused = read( G.ch_pipe0, &(G.channelcard), sizeof( int ) );
-    }
 
-    if( signum == SIGUSR2 )
-        unused = read( G.gc_pipe0, &G.gps_loc, sizeof( float ) * 5 );
+		if(G.freqoption)
+			unused = read( G.ch_pipe0, &(G.frequencycard), sizeof( int ) );
+		else
+			unused = read( G.ch_pipe0, &(G.channelcard), sizeof( int ) );
+	}
 
-    if( signum == SIGINT || signum == SIGTERM )
-    {
-	reset_term();
-        alarm( 1 );
-        G.do_exit = 1;
-        signal( SIGALRM, sighandler );
-        dprintf( STDOUT_FILENO, "\n" );
-    }
+	if( signum == SIGUSR2 )
+		unused = read( G.gc_pipe0, &G.gps_loc, sizeof( float ) * 5 );
 
-    if( signum == SIGSEGV )
-    {
-        fprintf( stderr, "Caught signal 11 (SIGSEGV). Please"
-                         " contact the author!\33?25h\n\n" );
-        fflush( stdout );
-        exit( 1 );
-    }
+	if( signum == SIGINT || signum == SIGTERM )
+	{
+		reset_term();
+		alarm( 1 );
+		G.do_exit = 1;
+		signal( SIGALRM, sighandler );
+#if defined(__sun__)
+		fprintf(stdout, "\n" );
+#else
+		dprintf( STDOUT_FILENO, "\n" );
+#endif
+	}
 
-    if( signum == SIGALRM )
-    {
-        dprintf( STDERR_FILENO, "Caught signal 14 (SIGALRM). Please"
+	if( signum == SIGSEGV )
+	{
+		fprintf( stderr, "Caught signal 11 (SIGSEGV). Please"
+				" contact the author!\33?25h\n\n" );
+		fflush( stdout );
+		exit( 1 );
+	}
+
+	if( signum == SIGALRM )
+	{
+#if defined(__sun__)
+		fprintf(stdout,
+#else
+		dprintf( STDERR_FILENO,
+#endif
+			 "Caught signal 14 (SIGALRM). Please"
                          " contact the author!\33?25h\n\n" );
-        _exit( 1 );
-    }
+		_exit( 1 );
+	}
 
-    if( signum == SIGCHLD )
-        wait( NULL );
+	if( signum == SIGCHLD )
+		wait( NULL );
 
-    if( signum == SIGWINCH )
-    {
-        fprintf( stderr, "\332J" );
-        fflush( stdout );
-    }
+	if( signum == SIGWINCH )
+	{
+		fprintf( stderr, "\332J" );
+		fflush( stdout );
+	}
 }
 
 int send_probe_request(struct wif *wi)
@@ -5312,13 +5348,13 @@
     return i;
 }
 
-void channel_hopper(struct wif *wi, int if_num, int chan_count )
+void channel_hopper(struct wif *wi, int if_num, int chan_count, pid_t parent)
 {
 	ssize_t unused;
     int ch, ch_idx = 0, card=0, chi=0, cai=0, j=0, k=0, first=1, again=1;
     int dropped=0;
 
-    while( getppid() != 1 )
+    while( 0 == kill(parent, 0) )
     {
         for( j = 0; j < if_num; j++ )
         {
@@ -5365,7 +5401,7 @@
                     G.channelcard = ch;
                     unused = write( G.cd_pipe1, &card, sizeof(int) );
                     unused = write( G.ch_pipe1, &ch, sizeof( int ) );
-                    kill( getppid(), SIGUSR1 );
+                    kill( parent, SIGUSR1 );
                     usleep(1000);
                 }
                 continue;
@@ -5382,7 +5418,7 @@
                 unused = write( G.ch_pipe1, &ch, sizeof( int ) );
                 if(G.active_scan_sim > 0)
                     send_probe_request(wicard);
-                kill( getppid(), SIGUSR1 );
+                kill( parent, SIGUSR1 );
                 usleep(1000);
             }
             else
@@ -5410,13 +5446,13 @@
     exit( 0 );
 }
 
-void frequency_hopper(struct wif *wi, int if_num, int chan_count )
+void frequency_hopper(struct wif *wi, int if_num, int chan_count, pid_t parent)
 {
 	ssize_t unused;
     int ch, ch_idx = 0, card=0, chi=0, cai=0, j=0, k=0, first=1, again=1;
     int dropped=0;
 
-    while( getppid() != 1 )
+    while( 0 == kill(parent, 0) )
     {
         for( j = 0; j < if_num; j++ )
         {
@@ -5463,7 +5499,7 @@
                     G.frequencycard = ch;
                     unused = write( G.cd_pipe1, &card, sizeof(int) );
                     unused = write( G.ch_pipe1, &ch, sizeof( int ) );
-                    kill( getppid(), SIGUSR1 );
+                    kill( parent, SIGUSR1 );
                     usleep(1000);
                 }
                 continue;
@@ -5478,7 +5514,7 @@
                 G.frequencycard = ch;
                 unused = write( G.cd_pipe1, &card, sizeof(int) );
                 unused = write( G.ch_pipe1, &ch, sizeof( int ) );
-                kill( getppid(), SIGUSR1 );
+                kill( parent, SIGUSR1 );
                 usleep(1000);
             }
             else
@@ -6136,10 +6172,14 @@
         {0,          0, 0,  0 }
     };
 
+    pid_t main_pid = getpid();
+
 
 #ifdef USE_GCRYPT
-    // Register callback functions to ensure proper locking in the sensitive parts of libgcrypt.
-    gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+    // Register callback functions to ensure proper locking in the sensitive parts of libgcrypt < 1.6.0
+    #if GCRYPT_VERSION_NUMBER < 0x010600
+        gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
+    #endif
     // Disable secure memory.
     gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
     // Tell Libgcrypt that initialization has completed.
@@ -6327,15 +6367,15 @@
             		printf("Error: Write interval is not a number (>0). Aborting.\n");
             		exit ( 1 );
             	}
-            	
+
             	G.file_write_interval = atoi(optarg);
-            	
+
             	if (G.file_write_interval <= 0) {
             		printf("Error: Write interval must be greater than 0. Aborting.\n");
             		exit ( 1 );
             	}
             	break;
-                
+
 			case 'E':
 				G.detect_anomaly = 1;
 				break;
@@ -6798,7 +6838,7 @@
 						perror("setuid");
 					}
 
-                    frequency_hopper(wi, G.num_cards, freq_count);
+                    frequency_hopper(wi, G.num_cards, freq_count, main_pid);
                     exit( 1 );
                 }
             }
@@ -6849,7 +6889,7 @@
 						perror("setuid");
 					}
 
-                    channel_hopper(wi, G.num_cards, chan_count);
+                    channel_hopper(wi, G.num_cards, chan_count, main_pid);
                     exit( 1 );
                 }
             }
@@ -6938,7 +6978,7 @@
 
         if( ! fork() )
         {
-            gps_tracker();
+            gps_tracker(main_pid);
             exit( 1 );
         }
 
@@ -6958,7 +6998,13 @@
     G.batt     = getBatteryString();
 
     G.elapsed_time = (char *) calloc( 1, 4 );
+    if(G.elapsed_time == NULL)
+    {
+        perror( "Error allocating memory" );
+        return 1;
+    }
     strncpy(G.elapsed_time, "0 s", 4 - 1);
+    G.elapsed_timestrlen(G.elapsed_time) = 0;
 
 	/* Create start time string for kismet netxml file */
     G.airodump_start_time = (char *) calloc( 1, 1000 * sizeof(char) );
@@ -7195,8 +7241,8 @@
 
             if( ioctl( 0, TIOCGWINSZ, &(G.ws) ) < 0 )
             {
-                G.ws.ws_row = 25;
-                G.ws.ws_col = 80;
+                G.ws.ws_row = 50;
+                G.ws.ws_col = 120;
             }
 
             if( G.ws.ws_col <   1 ) G.ws.ws_col =   1;

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)) {
 			passwdwordlength = 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->pn0 = packetz + 7;
                         st_cur->pn1 = packetz + 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
+#define DES_BS_ALGORITHM_NAME		"DES 256/256 X2 XOP-16"
+#else
+#define DES_BS_ALGORITHM_NAME		"DES 256/256 X2 AVX-16"
+#endif
+#elif 0
+/* 384-bit as 256+128 */
+#define DES_BS_VECTOR_SIZE		8
+#define DES_BS_VECTOR			6
+#if defined(JOHN_XOP) && defined(__GNUC__)
+/* Require gcc for 256-bit XOP because of __builtin_ia32_vpcmov_v8sf256() */
+#undef DES_BS
+#define DES_BS				3
+#define DES_BS_ALGORITHM_NAME		"DES 256/256 XOP-16 + 128/128 XOP-16"
+#else
+#define DES_BS_ALGORITHM_NAME		"DES 256/256 AVX-16 + 128/128 AVX-16"
+#endif
+#elif 0
+/* 384-bit as 256+64+64 */
+#define DES_BS_NO_AVX128
+#define DES_BS_VECTOR_SIZE		8
+#define DES_BS_VECTOR			6
+#define DES_BS_ALGORITHM_NAME		"DES 256/256 AVX-16 + 64/64 MMX + 64/64"
+#elif 0
+/* 320-bit as 256+64 MMX */
+#define DES_BS_VECTOR_SIZE		8
+#define DES_BS_VECTOR			5
+#define DES_BS_ALGORITHM_NAME		"DES 256/256 AVX-16 + 64/64 MMX"
+#elif 0
+/* 320-bit as 256+64 */
+#define DES_BS_NO_MMX
+#define DES_BS_VECTOR_SIZE		8
+#define DES_BS_VECTOR			5
+#define DES_BS_ALGORITHM_NAME		"DES 256/256 AVX-16 + 64/64"
+#elif __AVX2__ || JOHN_AVX2
+/* 256-bit as 1x256 */
+#define DES_BS_VECTOR			4
+#undef CPU_NAME
+#define CPU_NAME			"AVX2"
+#define CPU_DETECT			1
+#define CPU_REQ				1
+#define CPU_REQ_AVX2			1
+#if CPU_FALLBACK && !defined(CPU_FALLBACK_BINARY)
+#define CPU_FALLBACK_BINARY		"john-non-avx2"
+#define CPU_FALLBACK_BINARY_DEFAULT
+#endif
+#define DES_BS_ALGORITHM_NAME		"DES 256/256 AVX2-16"
+#elif 0
+/* 256-bit as 2x128 */
+#define DES_BS_NO_AVX256
+#define DES_BS_VECTOR			4
+#ifdef JOHN_XOP
+#undef DES_BS
+#define DES_BS				3
+#define DES_BS_ALGORITHM_NAME		"DES 128/128 X2 XOP-16"
+#else
+#define DES_BS_ALGORITHM_NAME		"DES 128/128 X2 AVX-16"
+#endif
+#else
+/* 128-bit */
+#define DES_BS_VECTOR			2
+#ifdef JOHN_XOP
+#undef DES_BS
+#define DES_BS				3
+#define DES_BS_ALGORITHM_NAME		"DES 128/128 XOP-16"
+#else
+#define DES_BS_ALGORITHM_NAME		"DES 128/128 AVX-16"
+#endif
+#endif
+#elif (defined(__SSE2__) && defined(_OPENMP))
+#define DES_BS_ASM			0
+#if 1
+#define DES_BS_VECTOR			2
+#define DES_BS_ALGORITHM_NAME		"DES 128/128 SSE2-16"
+#elif 0
+#define DES_BS_VECTOR			3
+#define DES_BS_VECTOR_SIZE		4
+#define DES_BS_ALGORITHM_NAME		"DES 128/128 SSE2-16 + 64/64 MMX"
+#elif 0
+#define DES_BS_NO_MMX
+#define DES_BS_VECTOR			3
+#define DES_BS_VECTOR_SIZE		4
+#define DES_BS_ALGORITHM_NAME		"DES 128/128 SSE2-16 + 64/64"
+#elif 0
+#define DES_BS_NO_MMX
+#define DES_BS_VECTOR			4
+#define DES_BS_ALGORITHM_NAME		"DES 128/128 X2 SSE2-16"
+#else
+#define DES_BS_VECTOR			4
+#define DES_BS_ALGORITHM_NAME		"DES 128/128 SSE2-16 + 64/64 MMX + 64/64"
+#endif
+#else
+#define DES_BS_ASM			1
+#define DES_BS_VECTOR			2
+#define DES_BS_ALGORITHM_NAME		"DES 128/128 SSE2-16"
+#endif
+#define DES_BS_EXPAND			1
+
+#if CPU_DETECT && DES_BS == 3
+#define CPU_REQ_XOP			1
+#undef CPU_NAME
+#define CPU_NAME			"XOP"
+#ifdef CPU_FALLBACK_BINARY_DEFAULT
+#undef CPU_FALLBACK_BINARY
+#define CPU_FALLBACK_BINARY		"john-non-xop"
+#endif
+#endif
+
+#define MD5_ASM				0
+#define MD5_X2				1
+#define MD5_IMM				1
+
+#ifdef __GNUC__
+#define GCC_VERSION			(__GNUC__ * 10000 \
+			 + __GNUC_MINOR__ * 100 \
+			 + __GNUC_PATCHLEVEL__)
+#endif
+
+#ifdef __SSE2__
+
+#if __AVX512F__
+#define SIMD_COEF_32 16
+#define SIMD_COEF_64 8
+#elif __AVX2__
+#define SIMD_COEF_32 8
+#define SIMD_COEF_64 4
+#elif __SSE2__
+#define SIMD_COEF_32 4
+#define SIMD_COEF_64 2
+#elif __MMX__
+#define SIMD_COEF_32 2
+#define SIMD_COEF_64 1
+#endif
+
+/*
+#ifndef SIMD_PARA_MD4
+#if defined(__INTEL_COMPILER)
+#define SIMD_PARA_MD4			3
+#elif defined(__clang__)
+#define SIMD_PARA_MD4			4
+#elif defined(__llvm__)
+#define SIMD_PARA_MD4			3
+#elif defined(__GNUC__) && GCC_VERSION < 40405	// 4.4.5
+#define SIMD_PARA_MD4			1
+#elif defined(__GNUC__) && GCC_VERSION < 40500	// 4.5.0
+#define SIMD_PARA_MD4			3
+#elif defined(__GNUC__) && (GCC_VERSION < 40600 || defined(__XOP__)) // 4.6.0
+#define SIMD_PARA_MD4			2
+#else
+#define SIMD_PARA_MD4			3
+#endif
+#endif
+
+#ifndef SIMD_PARA_MD5
+#if defined(__INTEL_COMPILER)
+#define SIMD_PARA_MD5			3
+#elif defined(__clang__)
+#define SIMD_PARA_MD5			5
+#elif defined(__llvm__)
+#define SIMD_PARA_MD5			3
+#elif defined(__GNUC__) && GCC_VERSION == 30406	// 3.4.6
+#define SIMD_PARA_MD5			3
+#elif defined(__GNUC__) && GCC_VERSION < 40405	// 4.4.5
+#define SIMD_PARA_MD5			1
+#elif defined(__GNUC__) && GCC_VERSION < 40500	// 4.5.0
+#define SIMD_PARA_MD5			3
+#elif defined(__GNUC__) && (GCC_VERSION < 40600 || defined(__XOP__)) // 4.6.0
+#define SIMD_PARA_MD5			2
+#else
+#define SIMD_PARA_MD5			3
+#endif
+#endif
+*/
+#ifndef SIMD_PARA_SHA1
+#if defined(__INTEL_COMPILER)
+#define SIMD_PARA_SHA1			1
+#elif defined(__clang__)
+#define SIMD_PARA_SHA1			2
+#elif defined(__llvm__)
+#define SIMD_PARA_SHA1			2
+#elif defined(__GNUC__) && GCC_VERSION < 40504	// 4.5.4
+#define SIMD_PARA_SHA1			1
+#elif !defined(__AVX__) && defined(__GNUC__) && GCC_VERSION > 40700 // 4.7.0
+#define SIMD_PARA_SHA1			1
+#else
+#define SIMD_PARA_SHA1			1
+#endif
+#endif
+
+#ifndef SIMD_PARA_SHA256
+#if __XOP__
+#define SIMD_PARA_SHA256 2
+#else
+#define SIMD_PARA_SHA256 1
+#endif
+#endif
+#ifndef SIMD_PARA_SHA512
+#define SIMD_PARA_SHA512 1
+#endif
+
+#ifndef SHA1_SSE_PARA
+#if defined(__INTEL_COMPILER) || defined(USING_ICC_S_FILE)
+#define SHA1_SSE_PARA		   1
+//#define SHA1_N_STR		      "4x"
+#elif defined(__clang__)
+#define SHA1_SSE_PARA		   2
+//#define SHA1_N_STR		      "8x"
+#elif defined(__llvm__)
+#define SHA_BUF_SIZ		     80
+#define SHA1_SSE_PARA		   2
+//#define SHA1_N_STR		      "8x"
+#elif defined(__GNUC__) && GCC_VERSION < 40504  // 4.5.4
+#define SHA1_SSE_PARA		   1
+//#define SHA1_N_STR		      "4x"
+#elif !defined(JOHN_AVX) && defined(__GNUC__) && GCC_VERSION > 40700 // 4.7.0
+#define SHA1_SSE_PARA		   1
+//#define SHA1_N_STR		      "4x"
+#else
+#define SHA1_SSE_PARA			2
+//#define SHA1_N_STR			"8x"
+#endif
+#endif
+
+#define STR_VALUE(arg)			#arg
+#define PARA_TO_N(n)			STR_VALUE(n) "x"
+#define PARA_TO_MxN(m, n)		STR_VALUE(m) "x" STR_VALUE(n)
+
+#if SIMD_PARA_MD4 > 1
+#define MD4_N_STR			PARA_TO_MxN(SIMD_COEF_32, SIMD_PARA_MD4)
+#else
+#define MD4_N_STR			PARA_TO_N(SIMD_COEF_32)
+#endif
+#if SIMD_PARA_MD5 > 1
+#define MD5_N_STR			PARA_TO_MxN(SIMD_COEF_32, SIMD_PARA_MD5)
+#else
+#define MD5_N_STR			PARA_TO_N(SIMD_COEF_32)
+#endif
+#if SIMD_PARA_SHA1 > 1
+#define SHA1_N_STR			PARA_TO_MxN(SIMD_COEF_32, SIMD_PARA_SHA1)
+#else
+#define SHA1_N_STR			PARA_TO_N(SIMD_COEF_32)
+#endif
+#if SIMD_PARA_SHA256 > 1
+#define SHA256_N_STR		PARA_TO_MxN(SIMD_COEF_32, SIMD_PARA_SHA256)
+#else
+#define SHA256_N_STR		PARA_TO_N(SIMD_COEF_32)
+#endif
+#if SIMD_PARA_SHA512 > 1
+#define SHA512_N_STR		PARA_TO_MxN(SIMD_COEF_64, SIMD_PARA_SHA512)
+#else
+#define SHA512_N_STR		PARA_TO_N(SIMD_COEF_64)
+#endif
+
+#define SHA_BUF_SIZ			16
+
+#define NT_X86_64
+
+#ifndef SIMD_CORE
+#define MMX_TYPE			" SSE2"
+#define MMX_COEF			4
+#define MMX_COEF_SHA256			4
+#define MMX_COEF_SHA512			2
+#endif
+
+#endif /* __SSE2__ */
+
+#define BF_ASM				0
+#define BF_SCALE			1
+
+/*
+ * 3x (as opposed to 2x) interleaving provides substantial speedup on Core 2
+ * CPUs, as well as slight speedup on some other CPUs.  Unfortunately, it
+ * results in lower cumulative performance with multiple concurrent threads or
+ * processes on some newer SMT-capable CPUs.  While this has nothing to do with
+ * AVX per se, building for AVX implies we do not intend to run on a Core 2
+ * (which has at most SSE4.1), so checking for AVX here provides an easy way to
+ * avoid this performance regression in AVX-enabled builds.  In multi-binary
+ * packages with runtime fallbacks, the AVX-enabled binary would invoke a
+ * non-AVX fallback binary from its john.c if run e.g. on a Core 2.  We could
+ * check for SSE4.2 rather than AVX here, as SSE4.2 was introduced along with
+ * SMT-capable Nehalem microarchitecture CPUs, but apparently those CPUs did
+ * not yet exhibit the performance regression with 3x interleaving.  Besides,
+ * some newer CPUs capable of SSE4.2 but not AVX happen to lack SMT, so will
+ * likely benefit from the 3x interleaving with no adverse effects for the
+ * multi-threaded case.
+ *
+ * In Jumbo, we may get BF_X2 from autoconf (after testing ht cpuid flag).
+ */
+#ifndef BF_X2
+#if __AVX__ && HAVE_HT && _OPENMP
+#define BF_X2				1
+#else
+#define BF_X2				3
+#endif
+#endif
+
+#endif

aircrack-ng-1.2-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 buf8;
+
+	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; stri != 0; i++) {
-		if (!isdigit(stri)) {
+		if (!isdigit((int)(stri))) {
 			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 str256;
 	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;
-					while (fgets(s, 80, f) != NULL) {
-							pos = strstr(s, "processor");
-							if (pos == s) {
-									pos = strchr(s, ':');
-									number = atoi(pos + 1);
-							}
-					}
-					++number;
-					free(s);
+		s = (char *)calloc(1, 81);
+
+		if (s != NULL) {
+			// Get the latest value of "processor" element
+			// and increment it by 1 and it that value
+			// will be the number of CPU.
+			number = -2;
+
+			while (fgets(s, 80, f) != NULL) {
+				pos = strstr(s, "processor");
+
+				if (pos == s) {
+					pos = strchr(s, ':');
+					number = atoi(pos + 1);
 				}
-				fclose(f);
+			}
+
+			++number;
+			free(s);
+		}
+
+		fclose(f);
         }
+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+// Not sure about defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
+	int mib = { CTL_HW, HW_NCPU };
+	size_t len;
+	unsigned long nbcpu;
+
+	len     = sizeof(nbcpu);
+
+	if (!sysctl(mib, 2, &nbcpu, &len, NULL, 0)) {
+		number = (int)nbcpu;
+	}
+#endif
 
         #ifdef _SC_NPROCESSORS_ONLN
         // Try the usual method if _SC_NPROCESSORS_ONLN exist
         if (number == -1) {
-
-			number   = sysconf(_SC_NPROCESSORS_ONLN);
-			/* Fails on some archs */
-			if (number < 1) {
-				number = -1;
-			}
+		number   = sysconf(_SC_NPROCESSORS_ONLN);
+		/* Fails on some archs */
+		if (number < 1) {
+			number = -1;
+		}
         }
         #endif
 
@@ -284,31 +413,46 @@
 	return tablec;
 }
 
-int hexStringToHex(char* in, int length, unsigned char* out)
+// in: input string
+// in_length: length of the string
+// out: output string (needs to be already allocated).
+// out_length: length of the array
+// returns amount of bytes saved to 'out' or -1 if an error happened
+int hexStringToArray(char* in, int in_length, unsigned char* out, int out_length)
 {
-    int i=0;
-    int char1, char2;
+    int i, out_pos;
+    int chars2;
 
     char *input=in;
     unsigned char *output=out;
 
-    if(length < 1)
-        return 1;
+    if (in_length < 2 || out_length < (in_length / 3) + 1 || input == NULL || output == NULL)
+    	return -1;
 
-    for(i=0; i<length; i+=2)
+    out_pos = 0;
+    for (i = 0; i < in_length - 1; ++i)
     {
-        if(inputi == '-' || inputi == ':' || inputi == '_' || inputi == ' ')
-        {
-            input++;
-            length--;
-        }
-        char1 = hexCharToInt(inputi);
-        char2 = hexCharToInt(inputi+1);
-        if(char1 < 0 || char1 > 15)
+		if(inputi == '-' || inputi == ':' || inputi == '_' || inputi == ' ' || inputi == '.')
+		{
+			continue;
+		}
+		// Check output array is big enough
+    	if(out_pos >= out_length)
+		{
+			return -1;
+		}
+    	chars0 = hexCharToInt(inputi);
+        // If first char is invalid (or '\0'), don't bother continuing (and you really shouldn't).
+        if(chars0 < 0 || chars0 > 15)
+        	return -1;
+
+        chars1 = hexCharToInt(input++i);
+        // It should always be a multiple of 2 hex characters with or without separator
+        if(chars1 < 0 || chars1 > 15)
             return -1;
-        outputi/2 = ((char1 << 4) + char2) & 0xFF;
+        outputout_pos++ = ((chars0 << 4) + chars1) & 0xFF;
     }
-    return (i/2);
+    return out_pos;
 }
 
 //Return the mac address bytes (or null if it's not a mac address)

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 flags64 = {0};
+#ifdef _X86
+	unsigned eax = 0, ebx = 0, ecx = 0, edx = 0;
+	unsigned int max_level = __get_cpuid_max(0, NULL);
+
+	__cpuid(1, eax, ebx, ecx, edx);
+
+	if (edx & (1 << 23))
+		sprintcat((char *)&flags, "MMX", sizeof(flags));
+
+	if (edx & (1 << 25))
+		sprintcat((char *)&flags, "SSE", sizeof(flags));
+
+	if (edx & (1 << 26))
+		sprintcat((char *)&flags, "SSE2", sizeof(flags));
+
+	if (ecx & (1 << 0))
+		sprintcat((char *)&flags, "SSE3", sizeof(flags));
+
+	if (ecx & (1 << 9))
+		sprintcat((char *)&flags, "SSSE3", sizeof(flags));
+
+	if (ecx & (1 << 19))
+		sprintcat((char *)&flags, "SSE4.1", sizeof(flags));
+
+	if (ecx & (1 << 20))
+		sprintcat((char *)&flags, "SSE4.2", sizeof(flags));
+
+	if (ecx & (1 << 25))
+		sprintcat((char *)&flags, "AES-NI", sizeof(flags));
+
+	// Don't set this if we got it from a higher topology previously.
+	if (cpuinfo.maxlogic == 0)	// Maximum addressable logical CPUs per pkg/socket.
+		cpuinfo.maxlogic = (ebx >> 16) & 0xFF;
+
+	if (edx & (1 << 28))		// Hyper-threading
+		cpuinfo.htt = 1;
+
+	if (ecx & (1 << 28))		// AVX
+		sprintcat((char *)&flags, "AVX", sizeof(flags));
+
+	if (ecx & (1 << 31))		// Hypervisor
+		cpuinfo.hv = 1;
+
+	if (max_level >= 7) {
+		__cpuid_count(7, 0, eax, ebx, ecx, edx);
+
+		if (ebx & (1 << 5))	// AVX2
+			sprintcat((char *)&flags, "AVX2", sizeof(flags));
+	}
+#elif defined(__arm__) && defined(HAS_AUXV)
+	long hwcaps = getauxval(AT_HWCAP);
+
+	if (hwcaps & (1 << 12))
+		sprintcat((char *)&flags, "NEON", sizeof(flags));
+
+	if (hwcaps & (1 << 1))
+		sprintcat((char *)&flags, "HALF", sizeof(flags));
+
+	if (hwcaps & (1 << 2))
+		sprintcat((char *)&flags, "THUMB", sizeof(flags));
+
+	if (hwcaps & (1 << 11))
+		sprintcat((char *)&flags, "THUMBEE", sizeof(flags));
+
+	if (hwcaps & (1 << 6))
+		sprintcat((char *)&flags, "VFP", sizeof(flags));
+
+	if ((hwcaps & (1 << 13)) || (hwcaps & (1 << 14)))
+		sprintcat((char *)&flags, "VFPv3", sizeof(flags));
+
+	if (hwcaps & (1 << 16))
+		sprintcat((char *)&flags, "VFPv4", sizeof(flags));
+
+	if (hwcaps & (1 << 15))
+		sprintcat((char *)&flags, "TLS", sizeof(flags));
+
+	if (hwcaps & (1 << 10))
+		sprintcat((char *)&flags, "CRUNCH", sizeof(flags));
+
+	if (hwcaps & (1 << 9))
+		sprintcat((char *)&flags, "iwMMXt", sizeof(flags));
+
+	if ((hwcaps & (1 << 17)) || (hwcaps & (1 << 18)))
+		sprintcat((char *)&flags, "IDIV", sizeof(flags));
+#endif
+	return strdup(flags);
+}
+
+float cpuid_getcoretemp() {
+#ifdef __FreeBSD__
+	int tempval = 0;
+	size_t len = sizeof(tempval);
+
+	if (sysctlbyname("dev.cpu.0.temperature", &tempval, &len, NULL, 0) == -1)
+		return 0;
+
+	cpuinfo.coretemp = (tempval-2732)/10;
+#elif __linux__
+	if (cpuinfo.cputemppath != NULL) {
+		cpuinfo.coretemp = cpuid_readsysfs((const char *)cpuinfo.cputemppath)/1000;
+	}
+#else
+	return 0;
+#endif
+	return cpuinfo.coretemp;
+}
+
+#ifdef __linux__
+//
+// Locate the primary temp input on the coretemp sysfs
+//
+int cpuid_findcpusensorpath(const char *path) {
+	DIR *dirp;
+	struct dirent *dp;
+	char tbuf1632 = {{0}};
+	int cnt = 0, i = 0, sensorx = 0;
+	char sensor8 = {0};
+
+	dirp = opendir(path);
+
+	if (dirp == NULL)
+		return -1;
+
+	snprintf(sensor, sizeof(sensor), "temp%d", sensorx);
+
+	while ((dp = readdir(dirp)) != NULL) {
+		if (!strncmp(dp->d_name, sensor, 5)) {
+			(void)closedir(dirp);
+			asprintf(&cpuinfo.cputemppath, "%stemp%d_input", CORETEMP_PATH, sensorx);
+			return sensorx;
+		} else if (!strncmp(dp->d_name, "temp", 4))
+			sprintf(tbufcnt++, "%s", dp->d_name);
+	}
+
+	(void)closedir(dirp);
+
+	// Hopefully we found the ID on the first pass, but Linux is its infinite wisdom
+	// sometimes starts the sensors at 2-6+
+	for (sensorx = 1; sensorx < 8; sensorx++)
+		for (i = 0; i < cnt; i++) {
+			snprintf(sensor, sizeof(sensor), "temp%d", sensorx);
+
+			if (!strncasecmp(tbufi, sensor, strlen(sensor))) {
+				asprintf(&cpuinfo.cputemppath, "%stemp%d_input", CORETEMP_PATH, sensorx);
+				return sensorx;
+			}
+		}
+
+	return -1;
+}
+
+int cpuid_readsysfs(const char *file) {
+	int fd, ival = 0;
+	struct stat sf;
+	char buf16 = {0};
+
+	if (stat(file, &sf))
+		return -1;
+
+	fd = open(file, O_RDONLY);
+
+	if (fd == -1)
+		return -1;
+
+	if (read(fd, &buf, sizeof(buf))) {
+		ival = atoi(buf);
+	}
+
+	close(fd);
+
+	return ival;
+}
+
+//
+// Return CPU frequency from scaling governor when supported
+//
+int cpuid_getfreq(int type) {
+	int fd, ifreq = 0;
+	struct stat sf;
+	char freq16 = {0}, *fptr;
+
+	fptr = (type == 1 ? CPUFREQ_CPU0C : CPUFREQ_CPU0M);
+
+	if (stat(fptr, &sf))
+		return 0;
+
+	fd = open(fptr, O_RDONLY);
+
+	if (fd == -1)
+		return 0;
+
+	if (read(fd, &freq, sizeof(freq)))
+		ifreq = atoi(freq)/1000;
+
+	close(fd);
+
+	return ifreq;
+}
+#endif
+
+char* cpuid_modelinfo() {
+#ifdef _X86
+	unsigned eax = 0, ebx = 0, ecx = 0, edx = 0;
+	int bi = 2, broff = 0;
+	char *tmpmodel = calloc(1, (sizeof(unsigned) * 4) * 5);
+#elif __linux__
+	FILE *cfd;
+	char *line = NULL, *token = NULL;
+	size_t linecap = 0;
+	ssize_t linelen;
+#elif __FreeBSD__ /* ARM support for FreeBSD */
+	int mib = { CTL_HW, HW_MODEL };
+	char modelbuf64;
+	size_t len = sizeof(modelbuf);
+#endif
+	char *pm = NULL, *model = NULL;
+
+#ifdef _X86
+	if (tmpmodel == NULL) {
+		fprintf(stderr, "ERROR: calloc() failed to allocate memory for cpuid_modelinfo(): %s\n", strerror(errno));
+		return "Unknown";
+	}
+
+	for (; bi < 5; bi++, broff += 16) {
+		__cpuid(0x80000000+bi, eax, ebx, ecx, edx);
+
+       		memcpy(tmpmodel+broff, &eax, sizeof(unsigned));
+	        memcpy(tmpmodel+broff+4, &ebx, sizeof(unsigned));
+        	memcpy(tmpmodel+broff+8, &ecx, sizeof(unsigned));
+	        memcpy(tmpmodel+broff+12, &edx, sizeof(unsigned));
+	}
+
+	pm = tmpmodel;
+
+#elif __linux__
+	cfd = fopen("/proc/cpuinfo", "r");
+
+	if (cfd == NULL) {
+		fprintf(stderr, "ERROR: Failed opening /proc/cpuinfo: %s\n", strerror(errno));
+		return "Unknown";
+	}
+
+	while ((linelen = getline(&line, &linecap, cfd)) > 0) {
+		if (!strncasecmp(line, "model", 5)) {
+			token = strsep(&line, ":");
+			token = strsep(&line, ":");
+
+			tokenstrlen(token)-1 = 0;
+			(void)*token++;
+
+			pm = token;
+			break;
+		}
+	}
+
+	free(line);
+	line = NULL;
+
+	fclose(cfd);
+#elif __FreeBSD__
+	if (sysctl(mib, 2, modelbuf, &len, NULL, 0))
+		snprintf(modelbuf,sizeof(modelbuf), "Unknown");
+
+	pm = modelbuf;
+#endif
+
+	// Clean up the empty spaces in the model name on some intel's because they let their engineers fall asleep on the space bar
+	while (*pm == ' ') {
+		pm++;
+	}
+
+	model = strdup(pm);
+
+#ifdef _X86
+	free(tmpmodel);
+	tmpmodel = NULL;
+#endif
+
+	if (model == NULL) {
+		fprintf(stderr, "ERROR: strdup() failed to allocate memory for cpuid_modelinfo(): %s\n", strerror(errno));
+		return "Unknown";
+	}
+
+	return model;
+}
+
+int cpuid_getinfo() {
+	int cpu_count = get_nb_cpus();
+	float cpu_temp;
+#ifdef _X86
+	unsigned eax = 0, ebx = 0, ecx = 0, edx = 0;
+	unsigned int max_level = __get_cpuid_max(0, NULL);
+	int topologyLevel = 0, topologyType;
+#ifdef DEBUG
+	int topologyShift;
+#endif
+
+	// Attempt higher level topology scan first.
+	do {
+		__cpuid_count(11, topologyLevel, eax, ebx, ecx, edx);
+
+		// if EBX ==0 then this subleaf is not valid, and the processor doesn't support this.
+		if (ebx == 0)
+			break;
+
+		topologyType = getRegister(ecx,8,15);
+#ifdef DEBUG
+		topologyShift = getRegister(eax,0,4);
+#endif
+
+		if ((topologyType == 2) && ((int)eax != 0 && (int)ebx != 0)) {
+			cpuinfo.cores		= (int)eax;
+			cpuinfo.maxlogic	= (int)ebx;
+		}
+#ifdef DEBUG
+		printf("%u %u %u %u\n",eax,ebx,ecx,edx);
+		printf("type %d, shift = %d\n", topologyType, topologyShift);
+#endif
+		topologyLevel++;
+	} while (topologyLevel < 5);
+
+#ifdef DEBUG
+	__cpuid(1, eax, ebx, ecx, edx);
+
+	printf("Family: %d", (eax >> 8) & 0xF);
+	printf("\t\tStepping %d\t\t", eax & 0xF);
+	printf("Model %d\n", (eax >> 4) & 0xF);
+	printf("Processor type %d\t", (eax >> 12) & 0x3);
+	printf("Extended model %d\t", (eax >> 16) & 0xF);
+	printf("Extended family %d\n", (eax >> 20) & 0xFF);
+#endif
+
+	printf("Vendor          = %s\n", cpuid_vendor());
+
+	if (max_level >= 4) {
+		__cpuid(4, eax, ebx, ecx, edx);
+
+		if (topologyLevel == 0) {
+			if (eax >> 26)
+				cpuinfo.coreperid = (eax >> 26) + 1;
+			else	// This processor only supports level1 topology. :'(
+				cpuinfo.coreperid = 1;
+		}
+	} else
+		cpuinfo.coreperid = 1;
+
+#ifdef DEBUG
+	printf("cpuinfo.coreperid = %d, cpuinfo.cores = %d, maxlogic = %d (tlevel %d)\n", cpuinfo.coreperid, cpuinfo.cores, cpuinfo.maxlogic, topologyLevel);
+#endif
+
+	if ((cpuinfo.cores == 0) && (cpuinfo.coreperid != 0)) {
+		// On lower topology processors we have to caclulate the cores from max cores per id (pkg/socket) by max addressable
+		cpuinfo.cores = (cpuinfo.maxlogic / cpuinfo.coreperid);
+	}
+#endif
+#ifdef __linux__
+	cpuid_findcpusensorpath(CORETEMP_PATH);
+	cpuinfo.cpufreq_cur = cpuid_getfreq(1);
+	cpuinfo.cpufreq_max = cpuid_getfreq(2);
+#endif
+
+	cpuinfo.model = cpuid_modelinfo();
+	cpuinfo.flags = cpuid_featureflags();
+
+	printf("Model           = %s\n", cpuinfo.model);
+	printf("Features        = %s\n", cpuinfo.flags);
+
+	// this shouldn't happen but prepare for the worst.
+	if (cpuinfo.cores == 0)
+		cpuinfo.cores = cpu_count;
+
+	// If our max logic matches our cores, we don't have HT even if the proc says otherwise.
+	if (cpuinfo.cores == cpuinfo.maxlogic)
+		cpuinfo.htt = 0;
+
+#ifdef _X86
+	printf("Hyper-Threading = %s\n", cpuinfo.htt?"Yes":"No");
+#endif
+
+	if (cpuinfo.hv)
+		printf("Hypervisor      = Yes (Virtualization detected)\n");
+
+	// This inaccuracy can happen when running under a hypervisor, correct it.
+	if (cpuinfo.cores > cpuinfo.maxlogic)
+		cpuinfo.maxlogic = cpuinfo.cores;
+
+	if (cpuinfo.cpufreq_cur)
+		printf("CPU frequency   = %d MHz (Max: %d MHz)\n", cpuinfo.cpufreq_cur, cpuinfo.cpufreq_max);
+
+	cpu_temp = cpuid_getcoretemp();
+	if (cpu_temp != 0.0)
+		printf("CPU temperature = %2.2f C\n", cpu_temp);
+
+	if (cpuinfo.htt)
+		printf("Logical CPUs    = %d\n", cpuinfo.maxlogic);
+
+	printf("CPU cores       = %d", cpuinfo.cores);
+
+	if (cpuinfo.maxlogic != cpu_count) {
+		if (cpu_count > cpuinfo.maxlogic)
+			printf(" (%d total, %d sockets)", cpu_count, (cpu_count / cpuinfo.maxlogic));
+		else
+			printf(" (%d total)", cpu_count);
+	}
+
+	cpuinfo.simdsize = cpuid_simdsize(1);
+
+	printf("\nSIMD size       = %d ", cpuinfo.simdsize);
+
+	if (cpuinfo.simdsize == 1)
+		printf("(64 bit)\n");
+	else if (cpuinfo.simdsize == 4)
+		printf("(128 bit)\n");
+	else
+		printf("(256 bit)\n");
+
+#ifndef JOHN_AVX2
+	if (cpuinfo.simdsize == 8) {
+		printf("NOTE: Your processor is capable of AVX2 but AVX2 support was not compiled in!\n");
+		printf("Please send a copy of this output to the aircrack team to improve autodetection.\n");
+	}
+#endif
+
+	free(cpuinfo.flags);
+	cpuinfo.flags = NULL;
+	free(cpuinfo.model);
+	cpuinfo.model = NULL;
+
+	if (cpuinfo.cputemppath != NULL) {
+		free(cpuinfo.cputemppath);
+		cpuinfo.cputemppath = NULL;
+	}
+
+	return 0;
+}

aircrack-ng-1.2-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 itoa6464; /* crypt(3) base64 - not MIME Base64! */
+extern char atoi640x100;
+extern const char itoa1616;
+extern char atoi160x100;
+extern const char itoa16u16; // 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 l2;
+			} w, r;
+		w.ll = x;
+		r.l0 = john_bswap_32(w.l1);
+		r.l1 = john_bswap_32(w.l0);
+		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 l2;
+			} w, r;
+		w.ll = x;
+		r.l0 = john_bswap_32(w.l1);
+		r.l1 = john_bswap_32(w.l0);
+		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(&buff0, buff.size());
+	return is.gcount();
+}
+
+unsigned int countBuffer(const vector <char> &buff, int bufsize) {
+	int lines = 0, i = 4;
+	const char * p = &buff0;
+	unsigned short charct = 0;
+
+	bufsize--;
+
+	while (i++ < bufsize) {
+	    	if (pi == '\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( Si, Sj );
         }
 
-        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( S1, S11 );
         }
@@ -503,7 +521,12 @@
             fprintf( f_ivs_out, "%c", S(Si + Sj) & 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
+ * someone builds and runs with MEMDBG_ON. But when it is off, we do
+ * try to protect the program.
+ */
+#undef libc_free
+#undef libc_calloc
+#undef libc_malloc
+#define libc_free(a)  do {if(a) MEMDBG_libc_free(a); a=0; } while(0)
+#define libc_malloc(a)   MEMDBG_libc_alloc(a)
+#define libc_calloc(a)   MEMDBG_libc_calloc(a)
+
+#if !defined(__MEMDBG__)
+/* this code mimicks JtR's FREE_MEM(a) but does it for any normal free(a) call */
+//extern void MEMDBG_off_free(void *a);
+//#define free(a)   do { if(a) MEMDBG_off_free(a); a=0; } while(0)
+#endif
+#define MemDbg_Used(a) 0
+#define MemDbg_Display(a)
+#define MemDbg_Validate(a)
+#define MemDbg_Validate_msg(a,b)
+#define MemDbg_Validate_msg2(a,b,c)
+#define MEMDBG_PROGRAM_EXIT_CHECKS(a)
+#define MEMDBG_tag_mem_from_alloc_tiny(a)
+
+#define MEMDBG_HANDLE int
+#define MEMDBG_getSnapshot(a) 0
+#define MEMDBG_checkSnapshot(a) if(a) printf(" \b")
+#define MEMDBG_checkSnapshot_possible_exit_on_error(a, b) if(a) printf(" \b")
+
+#endif /* MEMDBG_ON */
+
+extern void MEMDBG_libc_free(void *);
+extern void *MEMDBG_libc_alloc(size_t size);
+extern void *MEMDBG_libc_calloc(size_t size);
+
+#endif /* __MEMDBG_H_ */

aircrack-ng-1.2-rc4.tar.gz/src/memory.c 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.
+	 */
+	if (size == 0)
+		size = 1;
+#endif
+
+#if ARCH_ALLOWS_UNALIGNED
+	if (mem_saving_level > 2 && align < MEM_ALIGN_SIMD)
+		align = MEM_ALIGN_NONE;
+#endif
+
+	mask = align - 1;
+
+	do {
+		if (buffer) {
+			size_t need =
+			    size + mask - (((size_t)buffer + mask) & mask);
+			if (bufree >= need) {
+				p = buffer;
+				p += mask;
+				p -= (size_t)p & mask;
+				bufree -= need;
+				buffer = p + size;
+#if defined(DEBUG) || defined(MEMDBG)
+				/* Ensure alignment is no better than requested */
+				if (((size_t)p & ((mask << 1) + 1)) == 0)
+					p += align;
+#endif
+				return p;
+			}
+		}
+
+		if (size + mask > MEM_ALLOC_SIZE ||
+		    bufree > MEM_ALLOC_MAX_WASTE)
+			break;
+#if defined (MEMDBG_ON)
+		buffer = (char*)mem_alloc_func(MEM_ALLOC_SIZE, file, line);
+#else
+		buffer = (char*)mem_alloc(MEM_ALLOC_SIZE);
+#endif
+		add_memory_link((void*)buffer);
+		bufree = MEM_ALLOC_SIZE;
+	} while (1);
+
+#if defined (MEMDBG_ON)
+	p = (char*)mem_alloc_func(size + mask, file, line);
+#else
+	p = (char*)mem_alloc(size + mask);
+#endif
+	add_memory_link((void*)p);
+	p += mask;
+	p -= (size_t)p & mask;
+#if defined(DEBUG) || defined(MEMDBG)
+	/* Ensure alignment is no better than requested */
+	if (((size_t)p & ((mask << 1) + 1)) == 0)
+		p += align;
+#endif
+	return p;
+}
+
+void *mem_calloc_tiny_func(size_t size, size_t align
+#if defined (MEMDBG_ON)
+	, char *file, int line
+#endif
+	) {
+#if defined (MEMDBG_ON)
+	char *cp = (char*)mem_alloc_tiny_func(size, align, file, line);
+#else
+	char *cp = (char*) mem_alloc_tiny(size, align);
+#endif
+	memset(cp, 0, size);
+	return cp;
+}
+
+void *mem_alloc_copy_func(void *src, size_t size, size_t align
+#if defined (MEMDBG_ON)
+	, char *file, int line
+#endif
+	) {
+#if defined (MEMDBG_ON)
+	return memcpy(mem_alloc_tiny_func(size, align, file, line), src, size);
+#else
+	return memcpy(mem_alloc_tiny(size, align), src, size);
+#endif
+}
+
+void *mem_alloc_align_func(size_t size, size_t align
+#if defined (MEMDBG_ON)
+	, char *file, int line
+#endif
+	)
+{
+	void *ptr = NULL;
+#if defined (MEMDBG_ON)
+	ptr = (char*) MEMDBG_alloc_align(size, align, file, line);
+#elif HAVE_POSIX_MEMALIGN
+	if (posix_memalign(&ptr, align, size))
+		pexit("posix_memalign");
+#elif HAVE_ALIGNED_ALLOC
+	/* According to the Linux man page, "size should be a multiple of
+	   alignment", whatever they mean with "should"... This does not
+	   make any sense whatsoever but we round it up to comply. */
+	size = ((size + (align - 1)) / align) * align;
+	if (!(ptr = aligned_alloc(align, size)))
+		pexit("aligned_alloc");
+#elif HAVE_MEMALIGN
+	/* Let's just pray this implementation can actually free it */
+#if defined(__sparc__) || defined(__sparc) || defined(sparc) || defined(__sparcv9)
+	if (!(ptr = memalign(align, size)))
+#else
+	if (!(ptr = memalign(&ptr, align, size)))
+#endif
+		perror("memalign");
+#elif HAVE___MINGW_ALIGNED_MALLOC
+	if (!(ptr = __mingw_aligned_malloc(size, align)))
+		perror("__mingw_aligned_malloc");
+#elif HAVE__ALIGNED_MALLOC
+	if (!(ptr = _aligned_malloc(size, align)))
+		perror("aligned_malloc");
+
+#elif AC_BUILT
+#error No suitable alligned alloc found, please report to john-dev mailing list (state your OS details).
+
+/* we need an aligned alloc function for legacy builds */
+#elif _ISOC11_SOURCE
+	size = ((size + (align - 1)) / align) * align;
+	if (!(ptr = aligned_alloc(align, size)))
+		perror("aligned_alloc");
+#else
+	if (posix_memalign(&ptr, align, size))
+		perror("posix_memalign");
+#endif
+	return ptr;
+}
+
+void *mem_calloc_align_func(size_t count, size_t size, size_t align
+#if defined (MEMDBG_ON)
+	, char *file, int line
+#endif
+	)
+{
+#if defined (MEMDBG_ON)
+	void *ptr = mem_alloc_align_func(size * count, align, file, line);
+#else
+	void *ptr = mem_alloc_align_func(size * count, align);
+#endif
+
+	memset(ptr, 0, size * count);
+	return ptr;
+}
+
+char *str_alloc_copy_func(char *src
+#if defined (MEMDBG_ON)
+	, char *file, int line
+#endif
+	) {
+	size_t size;
+
+	if (!src) return "";
+	if (!*src) return "";
+
+	size = strlen(src) + 1;
+#if defined (MEMDBG_ON)
+	return (char *)memcpy(mem_alloc_tiny_func(size, MEM_ALIGN_NONE, file, line), src, size);
+#else
+	return (char *)memcpy(mem_alloc_tiny(size, MEM_ALIGN_NONE), src, size);
+#endif
+}
+
+void dump_text(void *in, int len)
+{
+	unsigned char *p = (unsigned char*)in;
+
+	while (len--) {
+		fputc(isprint(*p) ? *p : '.', stdout);
+		p++;
+	}
+	fputc('\n', stdout);
+}
+
+void dump_stuff_noeol(void *x, unsigned int size)
+{
+	unsigned int i;
+	for(i=0;i<size;i++)
+	{
+		printf("%.2x", ((unsigned char*)x)i);
+		if( (i%4)==3 )
+		printf(" ");
+	}
+}
+void dump_stuff(void* x, unsigned int size)
+{
+	dump_stuff_noeol(x,size);
+	printf("\n");
+}
+void dump_stuff_msg(const void *msg, void *x, unsigned int size) {
+	printf("%s : ", (char *)msg);
+	dump_stuff(x, size);
+}
+void dump_stuff_msg_sepline(const void *msg, void *x, unsigned int size) {
+	printf("%s :\n", (char *)msg);
+	dump_stuff(x, size);
+}
+
+void dump_stuff_be_noeol(void *x, unsigned int size) {
+	unsigned int i;
+	for(i=0;i<size;i++)
+	{
+		printf("%.2x", ((unsigned char*)x)i^3);
+		if( (i%4)==3 )
+		printf(" ");
+	}
+}
+void dump_stuff_be(void* x, unsigned int size)
+{
+	dump_stuff_be_noeol(x,size);
+	printf("\n");
+}
+void dump_stuff_be_msg(const void *msg, void *x, unsigned int size) {
+	printf("%s : ", (char *)msg);
+	dump_stuff_be(x, size);
+}
+void dump_stuff_be_msg_sepline(const void *msg, void *x, unsigned int size) {
+	printf("%s :\n", (char *)msg);
+	dump_stuff_be(x, size);
+}
+
+void alter_endianity(void *_x, unsigned int size) {
+	ARCH_WORD_32 *x = (ARCH_WORD_32*)_x;
+
+	// size is in octets
+	size>>=2;
+
+#if !ARCH_ALLOWS_UNALIGNED
+	if (is_aligned(x, sizeof(ARCH_WORD_32))) {
+#endif
+		while (size--) {
+			*x = JOHNSWAP(*x);
+			x++;
+		}
+#if !ARCH_ALLOWS_UNALIGNED
+	} else {
+		unsigned char *cpX, c;
+
+		cpX = (unsigned char*)x;
+		while (size--) {
+			c = *cpX;
+			*cpX = cpX3;
+			cpX3 = c;
+			c = cpX1;
+			cpX1 = cpX2;
+			cpX2 = c;
+			cpX += 4;
+		}
+	}
+#endif
+}
+
+#if defined(SIMD_COEF_32) || defined(NT_X86_64) || defined (SIMD_PARA_MD5) || defined (SIMD_PARA_MD4) || defined (SIMD_PARA_SHA1)
+#ifndef SIMD_COEF_32
+#define SIMD_COEF_32	4
+#endif
+#ifndef SIMD_COEF_64
+#define SIMD_COEF_64 2
+#endif
+#ifndef SIMD_COEF_32
+#define SIMD_COEF_32 4
+#endif
+
+// These work for standard SIMD_COEF_32 buffers, AND for SSEi MMX_PARA multiple SIMD_COEF_32 blocks, where index will be mod(X * SIMD_COEF_32) and not simply mod(SIMD_COEF_32)
+#define SHAGETPOS(i, index)		( (index&(SIMD_COEF_32-1))*4 + ((i)&(0xffffffff-3) )*SIMD_COEF_32 + (3-((i)&3)) + (unsigned int)index/SIMD_COEF_32*SHA_BUF_SIZ*4*SIMD_COEF_32 ) //for endianity conversion
+#define SHAGETOUTPOS(i, index)	( (index&(SIMD_COEF_32-1))*4 + ((i)&(0xffffffff-3) )*SIMD_COEF_32 + (3-((i)&3)) + (unsigned int)index/SIMD_COEF_32*20*SIMD_COEF_32 ) //for endianity conversion
+// for MD4/MD5 or any 64 byte LE SSE interleaved hash
+#define GETPOS(i, index)		( (index&(SIMD_COEF_32-1))*4 + ((i)&(0xffffffff-3) )*SIMD_COEF_32 +    ((i)&3)  + (unsigned int)index/SIMD_COEF_32*64*SIMD_COEF_32  )
+#define GETOUTPOS(i, index)		( (index&(SIMD_COEF_32-1))*4 + ((i)&(0xffffffff-3) )*SIMD_COEF_32 +    ((i)&3)  + (unsigned int)index/SIMD_COEF_32*16*SIMD_COEF_32  )
+// for SHA384/SHA512 128 byte BE interleaved hash (arrays of 16 8 byte ints)
+#define SHA64GETPOS(i,index)	( (index&(SIMD_COEF_64-1))*8 + ((i)&(0xffffffff-7) )*SIMD_COEF_64 + (7-((i)&7)) + (unsigned int)index/SIMD_COEF_64*SHA_BUF_SIZ*8*SIMD_COEF_64 )
+#define SHA64GETOUTPOS(i,index)	( (index&(SIMD_COEF_64-1))*8 + ((i)&(0xffffffff-7) )*SIMD_COEF_64 + (7-((i)&7)) + (unsigned int)index/SIMD_COEF_64*64*SIMD_COEF_64 )
+
+// for SHA384/SHA512 128 byte FLAT interleaved hash (arrays of 16 8 byte ints), but we do not BE interleave.
+#define SHA64GETPOSne(i,index)      ( (index&(SIMD_COEF_64-1))*8 + ((i)&(0xffffffff-7) )*SIMD_COEF_64 + ((i)&7) + (unsigned int)index/SIMD_COEF_64*SHA_BUF_SIZ*8*SIMD_COEF_64 )
+
+void dump_stuff_mmx_noeol(void *buf, unsigned int size, unsigned int index) {
+	unsigned int i;
+	for(i=0;i<size;i++)
+	{
+		printf("%.2x", ((unsigned char*)buf)GETPOS(i, index));
+		if( (i%4)==3 )
+			printf(" ");
+	}
+}
+void dump_stuff_mmx(void *buf, unsigned int size, unsigned int index) {
+	dump_stuff_mmx_noeol(buf, size, index);
+	printf("\n");
+}
+void dump_stuff_mmx_msg(const void *msg, void *buf, unsigned int size, unsigned int index) {
+	printf("%s : ", (char*)msg);
+	dump_stuff_mmx(buf, size, index);
+}
+void dump_stuff_mmx_msg_sepline(const void *msg, void *buf, unsigned int size, unsigned int index) {
+	printf("%s :\n", (char*)msg);
+	dump_stuff_mmx(buf, size, index);
+}
+void dump_out_mmx_noeol(void *buf, unsigned int size, unsigned int index) {
+	unsigned int i;
+	for(i=0;i<size;i++)
+	{
+		printf("%.2x", ((unsigned char*)buf)GETOUTPOS(i, index));
+		if( (i%4)==3 )
+			printf(" ");
+	}
+}
+void dump_out_mmx(void *buf, unsigned int size, unsigned int index) {
+	dump_out_mmx_noeol(buf,size,index);
+	printf("\n");
+}
+void dump_out_mmx_msg(const void *msg, void *buf, unsigned int size, unsigned int index) {
+	printf("%s : ", (char*)msg);
+	dump_out_mmx(buf, size, index);
+}
+void dump_out_mmx_msg_sepline(const void *msg, void *buf, unsigned int size, unsigned int index) {
+	printf("%s :\n", (char*)msg);
+	dump_out_mmx(buf, size, index);
+}
+
+#if defined (SIMD_PARA_MD5)
+#define GETPOSMPARA(i, index)	( (index&(SIMD_COEF_32-1))*4 + (((i)&(0xffffffff-3))%64)*SIMD_COEF_32 + (i/64)*SIMD_COEF_32*SIMD_PARA_MD5*64 +    ((i)&3)  + (unsigned int)index/SIMD_COEF_32*64*SIMD_COEF_32  )
+// multiple para blocks
+void dump_stuff_mpara_mmx_noeol(void *buf, unsigned int size, unsigned int index) {
+	unsigned int i;
+	for(i=0;i<size;i++)
+	{
+		printf("%.2x", ((unsigned char*)buf)GETPOSMPARA(i, index));
+		if( (i%4)==3 )
+			printf(" ");
+	}
+}
+void dump_stuff_mpara_mmx(void *buf, unsigned int size, unsigned int index) {
+	dump_stuff_mpara_mmx_noeol(buf, size, index);
+	printf("\n");
+}
+// obuf has to be at lease size long.  This function will unwind the SSE-para buffers into a flat.
+void getbuf_stuff_mpara_mmx(unsigned char *oBuf, void *buf, unsigned int size, unsigned int index) {
+	unsigned int i;
+	for(i=0;i<size;i++)
+		*oBuf++ = ((unsigned char*)buf)GETPOSMPARA(i, index);
+}
+void dump_stuff_mpara_mmx_msg(const void *msg, void *buf, unsigned int size, unsigned int index) {
+	printf("%s : ", (char*)msg);
+	dump_stuff_mpara_mmx(buf, size, index);
+}
+void dump_stuff_mpara_mmx_msg_sepline(const void *msg, void *buf, unsigned int size, unsigned int index) {
+	printf("%s :\n", (char*)msg);
+	dump_stuff_mpara_mmx(buf, size, index);
+}
+#endif
+
+void dump_stuff_shammx(void *buf, unsigned int size, unsigned int index) {
+	unsigned int i;
+	for(i=0;i<size;i++)
+	{
+		printf("%.2x", ((unsigned char*)buf)SHAGETPOS(i, index));
+		if( (i%4)==3 )
+			printf(" ");
+	}
+	printf("\n");
+}
+void dump_stuff_shammx_msg(const void *msg, void *buf, unsigned int size, unsigned int index) {
+	printf("%s : ", (char*)msg);
+	dump_stuff_shammx(buf, size, index);
+}
+void dump_out_shammx(void *buf, unsigned int size, unsigned int index) {
+	unsigned int i;
+	for(i=0;i<size;i++)
+	{
+		printf("%.2x", ((unsigned char*)buf)SHAGETOUTPOS(i, index));
+		if( (i%4)==3 )
+			printf(" ");
+	}
+	printf("\n");
+}
+void dump_out_shammx_msg(const void *msg, void *buf, unsigned int size, unsigned int index) {
+	printf("%s : ", (char*)msg);
+	dump_out_shammx(buf, size, index);
+}
+
+void dump_stuff_shammx64(void *buf, unsigned int size, unsigned int index) {
+	unsigned int i;
+	for(i=0;i<size;i++)
+	{
+		printf("%.2x", ((unsigned char*)buf)SHA64GETPOS(i, index));
+		if( (i%4)==3 )
+			printf(" ");
+	}
+	printf("\n");
+}
+void dump_stuff_shammx64_msg(const void *msg, void *buf, unsigned int size, unsigned int index) {
+	printf("%s : ", (char*)msg);
+	dump_stuff_shammx64(buf, size, index);
+}
+void dump_stuff_mmx64(void *buf, unsigned int size, unsigned int index) {
+	unsigned int i;
+	for(i=0;i<size;i++)
+	{
+		printf("%.2x", ((unsigned char*)buf)SHA64GETPOSne(i, index));
+		if( (i%4)==3 )
+			printf(" ");
+	}
+	printf("\n");
+}
+void dump_stuff_mmx64_msg(const void *msg, void *buf, unsigned int size, unsigned int index) {
+	printf("%s : ", (char*)msg);
+	dump_stuff_mmx64(buf, size, index);
+}
+
+void dump_out_shammx64(void *buf, unsigned int size, unsigned int index) {
+	unsigned int i;
+	for(i=0;i<size;i++)
+	{
+		printf("%.2x", ((unsigned char*)buf)SHA64GETOUTPOS(i, index));
+		if( (i%4)==3 )
+			printf(" ");
+	}
+	printf("\n");
+}
+void dump_out_shammx64_msg(const void *msg, void *buf, unsigned int size, unsigned int index) {
+	printf("%s : ", (char*)msg);
+	dump_out_shammx64(buf, size, index);
+}
+#endif
+
+void alter_endianity_w(void *_x, unsigned int count) {
+	int i = -1;
+	ARCH_WORD_32 *x = (ARCH_WORD_32*)_x;
+#if ARCH_ALLOWS_UNALIGNED
+	while (++i < (int)count) {
+		xi = JOHNSWAP(xi);
+	}
+#else
+	unsigned char *cpX, c;
+	if (is_aligned(x,sizeof(ARCH_WORD_32))) {
+		// we are in alignment.
+		while (++i < (int)count) {
+			xi = JOHNSWAP(xi);
+		}
+		return;
+	}
+	// non-aligned data :(
+	cpX = (unsigned char*)x;
+	while (++i < (int)count) {
+		c = *cpX;
+		*cpX = cpX3;
+		cpX3 = c;
+		c = cpX1;
+		cpX1 = cpX2;
+		cpX2 = c;
+		cpX += 4;
+	}
+#endif
+}
+
+void alter_endianity_w64(void *_x, unsigned int count) {
+	int i = -1;
+	ARCH_WORD_64 *x = (ARCH_WORD_64*)_x;
+#if ARCH_ALLOWS_UNALIGNED
+	while (++i < (int)count) {
+		xi = JOHNSWAP64(xi);
+	}
+#else
+	unsigned char *cpX, c;
+	if (is_aligned(x,sizeof(ARCH_WORD_64))) {
+		// we are in alignment.
+		while (++i < (int)count) {
+			xi = JOHNSWAP64(xi);
+		}
+		return;
+	}
+	// non-aligned data :(
+	cpX = (unsigned char*)x;
+	while (++i < (int)count) {
+		c = *cpX;
+		*cpX = cpX7;
+		cpX7 = c;
+		c = cpX1;
+		cpX1 = cpX6;
+		cpX6 = c;
+		c = cpX2;
+		cpX2 = cpX5;
+		cpX5 = c;
+		c = cpX3;
+		cpX3 = cpX4;
+		cpX4 = c;
+		cpX += 8;
+	}
+#endif
+}

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) \
+{ \
+	if ((ptr)) { \
+		MEMDBG_free(((const void*)ptr),__FILE__,__LINE__); \
+		(ptr) = NULL; \
+	} \
+}
+#endif
+
+#else
+#define MEM_FREE(ptr) \
+{ \
+	if ((ptr)) { \
+		free((ptr)); \
+		(ptr) = NULL; \
+	} \
+}
+#endif
+
+/*
+ * Similar to the above function, except the memory can't be freed.
+ * This one is used to reduce the overhead.
+ */
+extern void *mem_alloc_tiny_func(size_t size, size_t align
+#if defined (MEMDBG_ON)
+	, char *file, int line
+#endif
+	);
+
+/*
+ * this version same as mem_alloc_tiny, but initialized the memory
+ * to NULL bytes, like CALLOC(3) function does
+ */
+extern void *mem_calloc_tiny_func(size_t size, size_t align
+#if defined (MEMDBG_ON)
+	, char *file, int line
+#endif
+	);
+
+/*
+ * Uses mem_alloc_tiny() to allocate the memory, and copies src in there.
+ */
+extern void *mem_alloc_copy_func(void *src, size_t size, size_t align
+#if defined (MEMDBG_ON)
+	, char *file, int line
+#endif
+	);
+
+/*
+ * Similar to the above function, but for ASCIIZ strings.
+ */
+extern char *str_alloc_copy_func(char *src
+#if defined (MEMDBG_ON)
+	, char *file, int line
+#endif
+	);
+
+/*
+ * This will 'cleanup' the memory allocated by mem_alloc_tiny().  All
+ * of that memory was 'blindly' allocated, and not freed up during
+ * the run of john.  Now, it is 'cleaned' up.
+ */
+extern void cleanup_tiny_memory();
+
+
+void dump_text(void *in, int len);
+void dump_stuff(void *x, unsigned int size);
+void dump_stuff_msg(const void *msg, void *x, unsigned int size);
+void dump_stuff_noeol(void *x, unsigned int size);
+void dump_stuff_msg_sepline(const void *msg, void *x, unsigned int size);
+void dump_stuff_be(void *x, unsigned int size);
+void dump_stuff_be_msg(const void *msg, void *x, unsigned int size);
+void dump_stuff_be_noeol(void *x, unsigned int size);
+void dump_stuff_be_msg_sepline(const void *msg, void *x, unsigned int size);
+
+#if defined (SIMD_COEF_32) || defined(NT_X86_64) || defined (SIMD_PARA_MD5) || defined (SIMD_PARA_MD4) || defined (SIMD_PARA_SHA1)
+void dump_stuff_mmx(void *x, unsigned int size, unsigned int index);
+void dump_stuff_mmx_noeol(void *x, unsigned int size, unsigned int index);
+void dump_stuff_mmx_msg(const void *msg, void *buf, unsigned int size, unsigned int index);
+void dump_stuff_mmx_msg_sepline(const void *msg, void *buf, unsigned int size, unsigned int index);
+// for flat input, we do want to see SHA512 without byte swapping.
+void dump_stuff_mmx64(void *buf, unsigned int size, unsigned int index);
+void dump_stuff_mmx64_msg(const void *msg, void *buf, unsigned int size, unsigned int index);
+void dump_out_mmx(void *x, unsigned int size, unsigned int index);
+void dump_out_mmx_noeol(void *x, unsigned int size, unsigned int index);
+void dump_out_mmx_msg(const void *msg, void *buf, unsigned int size, unsigned int index);
+void dump_out_mmx_msg_sepline(const void *msg, void *buf, unsigned int size, unsigned int index);
+void dump_stuff_shammx(void *x, unsigned int size, unsigned int index);
+void dump_stuff_shammx_msg(const void *msg, void *buf, unsigned int size, unsigned int index);
+void dump_out_shammx(void *x, unsigned int size, unsigned int index);
+void dump_out_shammx_msg(const void *msg, void *buf, unsigned int size, unsigned int index);
+void dump_stuff_shammx64(void *x, unsigned int size, unsigned int index);
+void dump_stuff_shammx64_msg(const void *msg, void *buf, unsigned int size, unsigned int index);
+void dump_out_shammx64(void *x, unsigned int size, unsigned int index);
+void dump_out_shammx64_msg(const void *msg, void *buf, unsigned int size, unsigned int index);
+#endif
+
+#if defined (SIMD_PARA_MD5)
+// these functions help debug arrays of contigious MD5 prepared PARA buffers. Seen in sunmd5 at the current time.
+void dump_stuff_mpara_mmx(void *x, unsigned int size, unsigned int index);
+void dump_stuff_mpara_mmx_noeol(void *x, unsigned int size, unsigned int index);
+void dump_stuff_mpara_mmx_msg(const void *msg, void *buf, unsigned int size, unsigned int index);
+void dump_stuff_mpara_mmx_msg_sepline(const void *msg, void *buf, unsigned int size, unsigned int index);
+// a 'getter' to help debugging.  Returns a flat buffer, vs printing it out.
+void getbuf_stuff_mpara_mmx(unsigned char *oBuf, void *buf, unsigned int size, unsigned int index);
+#endif
+
+/*
+ * here, a stack buffer that is at least align-1 bytes LARGER than required, can be
+ * properly aligned to 'align' bytes. So:   char tmpbuf256+15, *aligned_buf=mem_align(tmpbuf,16);
+ * will give you a stack buffer, aligned to 16 bytes.  There are bugs in some compilers which cause
+ * JTR_ALIGN(x) to fail properly (such as a bug in bitcoin OMP mode for linux32)
+ * Switched to a define macro for performance.
+ */
+#define mem_align(a,b) (void*)(((char*)(a))+(((b)-1)-(((size_t)((char*)(a))-1)&((b)-1))))
+
+
+/*
+ * 32-bit endian-swap a memory buffer in place. Size is in octets (so should
+ * be a multiple of 4). From now on, this function may be used on any arch.
+ */
+void alter_endianity(void * x, unsigned int size);
+
+/* 32-bit endian-swap a memory buffer in place. Count is in 32-bit words */
+void alter_endianity_w(void *x, unsigned int count);
+
+/* 64-bit endian-swap a memory buffer in place. Count is in 64-bit words */
+void alter_endianity_w64(void *x, unsigned int count);
+
+#if ARCH_ALLOWS_UNALIGNED
+// we can inline these, to always use JOHNSWAP/JOHNSWAP64
+// NOTE, more portable to use #defines to inline, than the MAYBE_INLINE within header files.
+#if (ARCH_LITTLE_ENDIAN==0)
+#define alter_endianity_to_BE(a,b)
+#define alter_endianity_to_BE64(a,b)
+#define alter_endianity_to_LE(ptr,word32_cnt) do{ \
+    int i; \
+    for (i=0;i<word32_cnt; i++) \
+        ((ARCH_WORD_32*)ptr)i = JOHNSWAP(((ARCH_WORD_32*)ptr)i); \
+}while(0)
+#define alter_endianity_to_LE64(ptr,word64_cnt) do{ \
+    int i; \
+    for (i=0;i<word64_cnt; i++) \
+        ((ARCH_WORD_64*)ptr)i = JOHNSWAP64(((ARCH_WORD_64*)ptr)i); \
+}while(0)
+#else
+#define alter_endianity_to_LE(a,b)
+#define alter_endianity_to_LE64(a,b)
+#define alter_endianity_to_BE(ptr,word32_cnt) do{ \
+    int i; \
+    for (i=0;i<word32_cnt; i++) \
+        ((ARCH_WORD_32*)ptr)i = JOHNSWAP(((ARCH_WORD_32*)ptr)i); \
+}while(0)
+#define alter_endianity_to_BE64(ptr,word64_cnt) do{ \
+    int i; \
+    for (i=0;i<word64_cnt; i++) \
+        ((ARCH_WORD_64*)ptr)i = JOHNSWAP64(((ARCH_WORD_64*)ptr)i); \
+}while(0)
+#endif
+#else
+#if (ARCH_LITTLE_ENDIAN==0)
+#define alter_endianity_to_BE(a,b)
+#define alter_endianity_to_LE(a,b) do{alter_endianity_w(a,b);}while(0)
+#define alter_endianity_to_BE64(a,b)
+#define alter_endianity_to_LE64(a,b) do{alter_endianity_w64(a,b);}while(0)
+#else
+#define alter_endianity_to_BE(a,b) do{alter_endianity_w(a,b);}while(0)
+#define alter_endianity_to_LE(a,b)
+#define alter_endianity_to_BE64(a,b) do{alter_endianity_w64(a,b);}while(0)
+#define alter_endianity_to_LE64(a,b)
+#endif
+#endif
+
+#endif

aircrack-ng-1.2-rc4.tar.gz/src/misc.h 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))
+  #define WITH_ASAN
+#else
+  #define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS
+#endif
+
+#endif

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_nameIFNAMSIZ-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_nameIFNAMSIZ-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_nameIFNAMSIZ-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_nameIFNAMSIZ-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_nameIFNAMSIZ-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_nameIFNAMSIZ-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_nameIFNAMSIZ-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_nameIFNAMSIZ-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_nameIFNAMSIZ-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_nameIFNAMSIZ-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 strbuf512;
     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);
 }
 
+#ifndef CONFIG_LIBNL
 static void linux_close(struct wif *wi)
 {
 	struct priv_linux *pl = wi_priv(wi);
@@ -2055,7 +2070,8 @@
 	do_free(wi);
 }
 
-#ifdef CONFIG_LIBNL
+#else
+
 static void linux_close_nl80211(struct wif *wi)
 {
 	struct priv_linux *pl = wi_priv(wi);
@@ -2224,24 +2240,29 @@
 
     if (linux_apm == 1)
     {
+        char *battery_data = NULL;
+
         if ((apm = fopen("/proc/apm", "r")) != NULL ) {
-            if ( fgets(buf, 128,apm) != NULL ) {
-                int charging, ac;
-                fclose(apm);
+            battery_data = fgets(buf, 128, apm);
+            fclose(apm);
+        }
 
-                ret = sscanf(buf, "%*s %*d.%*d %*x %x %x %x %*d%% %d %s\n", &ac,
-                                                        &charging, &flag, &batteryTime, units);
+        if ( battery_data != NULL ) {
+            int charging, ac;
 
-                                if(!ret) return 0;
+            ret = sscanf(battery_data, "%*s %*d.%*d %*x %x %x %x %*d%% %d %s\n", &ac,
+                                                    &charging, &flag, &batteryTime, units);
+            if(!ret)
+                return 0;
 
-                if ((flag & 0x80) == 0 && charging != 0xFF && ac != 1 && batteryTime != -1) {
-                    if (!strncmp(units, "min", 32))
-                        batteryTime *= 60;
-                }
-                else return 0;
-                linux_acpi = 0;
-                return batteryTime;
+            if ((flag & 0x80) == 0 && charging != 0xFF && ac != 1 && batteryTime != -1) {
+                if (!strncmp(units, "min", 32))
+                    batteryTime *= 60;
             }
+            else
+                return 0;
+            linux_acpi = 0;
+            return batteryTime;
         }
         linux_apm = 0;
     }
@@ -2321,6 +2342,7 @@
                 else if (strncmp(buf, "charging state:", 15) == 0) {
                                 /* the space makes it different than discharging */
                     if (strstr(buf, " charging" )) {
+                        closedir(batteries);
                         fclose( acpi );
                         return 0;
                     }

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_buf2048;
 	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)).val1
+#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)).val0
+#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 (y1z, y0z); }
+
+/*************************** 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 s32SIMD_COEF_32;
+	uint64_t s64SIMD_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 (y1z, y0z); }
+
+/*************************** AVX512 and MIC ***************************/
+#elif __AVX512F__ || __MIC__
+#include <immintrin.h>
+
+typedef __m512i vtype;
+
+#define vadd_epi32              _mm512_add_epi32
+#define vadd_epi64              _mm512_add_epi64
+#define vand                    _mm512_and_si512
+#define vandnot                 _mm512_andnot_si512
+#define vcmov                   vcmov_emu
+#define VCMOV_EMULATED          1
+/*
+ * NOTE: AVX2 has it as (base, index, scale) while MIC and AVX512 are
+ * different.
+ */
+#define vgather_epi32(b, i, s)  _mm512_i32gather_epi32(i, (void*)(b), s)
+#define vgather_epi64(b, i, s)  _mm512_i64gather_epi64(i, (void*)(b), s)
+#define vload(x)                _mm512_load_si512((void*)(x))
+#define vloadu(x)               _mm512_loadu_si512((void*)(x))
+#define vor                     _mm512_or_si512
+#define vroti_epi32             vroti_epi32_emu
+#define vroti_epi64             vroti_epi64_emu
+#define vroti16_epi32           vroti_epi32
+#define vscatter_epi32(b,i,v,s) _mm512_i32scatter_epi32((void*)b, i, v, s)
+#define vscatter_epi64(b,i,v,s) _mm512_i64scatter_epi64((void*)b, i, v, s)
+#define vset1_epi8              _mm512_set1_epi8
+#define vset1_epi32             _mm512_set1_epi32
+#define vset1_epi64             _mm512_set1_epi64
+#define vset_epi32              _mm512_set_epi32
+#define vset_epi64              _mm512_set_epi64
+#define vsetzero                _mm512_setzero_si512
+#define vshuffle_epi32          _mm512_shuffle_epi32
+#define vslli_epi32             _mm512_slli_epi32
+#define vslli_epi64             _mm512_slli_epi64
+#define vsrli_epi32             _mm512_srli_epi32
+#define vsrli_epi64             _mm512_srli_epi64
+#define vstore(x, y)            _mm512_store_si512((void*)(x), y)
+#define vstoreu(x, y)           _mm512_storeu_si512((void*)(x), y)
+#define vunpackhi_epi32         _mm512_unpackhi_epi32
+#define vunpackhi_epi64         _mm512_unpackhi_epi64
+#define vunpacklo_epi32         _mm512_unpacklo_epi32
+#define vunpacklo_epi64         _mm512_unpacklo_epi64
+#define vxor                    _mm512_xor_si512
+
+#define vanyeq_epi32(x, y)     _mm512_cmp_epi32_mask(x, y, _MM_CMPINT_EQ)
+
+#define GATHER_4x(x, y, z)                               \
+{                                                        \
+    vtype indices = vset_epi32(15<<6,14<<6,13<<6,12<<6,  \
+                               11<<6,10<<6, 9<<6, 8<<6,  \
+                                7<<6, 6<<6, 5<<6, 4<<6,  \
+                                3<<6, 2<<6, 1<<6, 0<<6); \
+    x = vgather_epi32(&yz, indices, sizeof(yz));     \
+}
+#define GATHER_2x(x, y, z)                               \
+{                                                        \
+    vtype indices = vset_epi32(15<<5,14<<5,13<<5,12<<5,  \
+                               11<<5,10<<5, 9<<5, 8<<5,  \
+                                7<<5, 6<<5, 5<<5, 4<<5,  \
+                                3<<5, 2<<5, 1<<5, 0<<5); \
+    x = vgather_epi32(&yz, indices, sizeof(yz));     \
+}
+#define GATHER(x, y, z)                                  \
+{                                                        \
+    vtype indices = vset_epi32(15<<4,14<<4,13<<4,12<<4,  \
+                               11<<4,10<<4, 9<<4, 8<<4,  \
+                                7<<4, 6<<4, 5<<4, 4<<4,  \
+                                3<<4, 2<<4, 1<<4, 0<<4); \
+    x = vgather_epi32(&yz, indices, sizeof(yz));     \
+}
+
+#define GATHER64(x, y, z)                                               \
+{                                                                       \
+    uint64_t stride = sizeof(*y);                                       \
+    vtype indices = vset_epi64(7*stride, 6*stride, 5*stride, 4*stride,  \
+                               3*stride, 2*stride, 1*stride, 0);        \
+    x = vgather_epi64(&y0z, indices, 1);                            \
+}
+
+#if __AVX512F__
+#undef vcmov
+#undef VCMOV_EMULATED
+#define vcmov(x, y, z)          vternarylogic(x, y, z, 0xE4)
+#define vternarylogic           _mm512_ternarylogic_epi32
+#endif
+
+#if __AVX512BW__
+#define vcmpeq_epi8_mask        (uint64_t)_mm512_cmpeq_epi8_mask
+#define vshuffle_epi8           _mm512_shuffle_epi8
+#define vshufflehi_epi16        _mm512_shufflehi_epi16
+#define vshufflelo_epi16        _mm512_shufflelo_epi16
+#define vslli_epi16             _mm512_slli_epi16
+#define vsrli_epi16             _mm512_srli_epi16
+
+#define vswap32(n)                                              \
+    n = vshuffle_epi8(n, vset_epi32(0x3c3d3e3f, 0x38393a3b,     \
+                                    0x34353637, 0x30313233,     \
+                                    0x2c2d2e2f, 0x28292a2b,     \
+                                    0x24252627, 0x20212223,     \
+                                    0x1c1d1e1f, 0x18191a1b,     \
+                                    0x14151617, 0x10111213,     \
+                                    0x0c0d0e0f, 0x08090a0b,     \
+                                    0x04050607, 0x00010203))
+#define vswap64(n) \
+    n = vshuffle_epi8(n, vset_epi64(0x38393a3b3c3d3e3fULL, \
+                                    0x3031323334353637ULL, \
+                                    0x28292a2b2c2d2e2fULL, \
+                                    0x2021222324252627ULL, \
+                                    0x18191a1b1c1d1e1fULL, \
+                                    0x1011121314151617ULL, \
+                                    0x08090a0b0c0d0e0fULL, \
+                                    0x0001020304050607ULL))
+#else /* workarounds without AVX512BW */
+#define vswap32 vswap32_emu
+#define vswap64(x) \
+	(x = vshuffle_epi32(x, _MM_SHUFFLE(2, 3, 0, 1)), vswap32(x))
+
+#endif /* __AVX512BW__ */
+
+/* MIC lacks some intrinsics in AVX512F, thus needing emulation. */
+#if __MIC__
+#define _mm512_set1_epi8(x) _mm512_set1_epi32(x | x<<8 | x<<16 | x<<24)
+
+static inline __m512i _mm512_loadu_si512(void const *addr)
+{
+	__m512i indices = _mm512_set_epi64(7, 6, 5, 4, 3, 2, 1, 0);
+	return is_aligned(addr, 64) ? _mm512_load_si512(addr) :
+	                              _mm512_i64gather_epi64(indices, addr, 8);
+}
+
+static inline void _mm512_storeu_si512(void *addr, vtype d)
+{
+	__m512i indices = _mm512_set_epi64(7, 6, 5, 4, 3, 2, 1, 0);
+
+	if (is_aligned(addr, 64))
+		_mm512_store_si512(addr, d);
+	else
+		_mm512_i64scatter_epi64(addr, indices, d, 8);
+}
+#endif /* __MIC__ */
+
+/******************************** AVX2 ********************************/
+#elif __AVX2__
+#include <immintrin.h>
+
+typedef __m256i vtype;
+
+#define vadd_epi32              _mm256_add_epi32
+#define vadd_epi64              _mm256_add_epi64
+#define vand                    _mm256_and_si256
+#define vandnot                 _mm256_andnot_si256
+#define vcmov                   vcmov_emu
+#define VCMOV_EMULATED          1
+#define vcmpeq_epi8_mask(a, b)  _mm256_movemask_epi8(_mm256_cmpeq_epi8(a, b))
+#define vcmpeq_epi32            _mm256_cmpeq_epi32
+#define vcvtsi32                _mm256_cvtsi32_si256
+#define vgather_epi32(b, i, s)  _mm256_i32gather_epi32((void*)(b), i, s)
+#define vgather_epi64(b, i, s)  _mm256_i64gather_epi64((void*)(b), i, s)
+#define vinsert_epi32           _mm256_insert_epi32
+#define vload(x)                _mm256_load_si256((void*)(x))
+#define vloadu(x)               _mm256_loadu_si256((void*)(x))
+#define vmovemask_epi8          _mm256_movemask_epi8
+#define vor                     _mm256_or_si256
+#define vpermute2x128           _mm256_permute2x128_si256
+#define vpermute4x64_epi64      _mm256_permute4x64_epi64
+#define vroti_epi32             vroti_epi32_emu
+#define vroti_epi64             vroti_epi64_emu
+#define vroti16_epi32           vroti_epi32
+#define vset1_epi8              _mm256_set1_epi8
+#define vset1_epi32             _mm256_set1_epi32
+#define vset1_epi64             _mm256_set1_epi64x
+#define vset_epi32              _mm256_set_epi32
+#define vset_epi64              _mm256_set_epi64x
+#define vsetzero                _mm256_setzero_si256
+#define vshuffle_epi8           _mm256_shuffle_epi8
+#define vshuffle_epi32          _mm256_shuffle_epi32
+#define vshufflehi_epi16        _mm256_shufflehi_epi16
+#define vshufflelo_epi16        _mm256_shufflelo_epi16
+#define vslli_epi16             _mm256_slli_epi16
+#define vslli_epi32             _mm256_slli_epi32
+#define vslli_epi64             _mm256_slli_epi64
+#define vsrli_epi16             _mm256_srli_epi16
+#define vsrli_epi32             _mm256_srli_epi32
+#define vsrli_epi64             _mm256_srli_epi64
+#define vstore(x, y)            _mm256_store_si256((void*)(x), y)
+#define vstoreu(x, y)           _mm256_storeu_si256((void*)(x), y)
+#define vunpackhi_epi32         _mm256_unpackhi_epi32
+#define vunpackhi_epi64         _mm256_unpackhi_epi64
+#define vunpacklo_epi32         _mm256_unpacklo_epi32
+#define vunpacklo_epi64         _mm256_unpacklo_epi64
+#define vxor                    _mm256_xor_si256
+
+#define vanyeq_epi32(x, y)     vmovemask_epi8(vcmpeq_epi32(x, y))
+
+#define swap_endian_mask                                                \
+    _mm256_set_epi32(0x1c1d1e1f, 0x18191a1b, 0x14151617, 0x10111213,    \
+                     0x0c0d0e0f, 0x08090a0b, 0x04050607, 0x00010203)
+
+#define swap_endian64_mask                                    \
+    vset_epi64(0x18191a1b1c1d1e1fULL, 0x1011121314151617ULL, \
+               0x08090a0b0c0d0e0fULL, 0x0001020304050607ULL)
+
+#define vswap32(n)                              \
+    (n = vshuffle_epi8(n, swap_endian_mask))
+
+#define vswap64(n)                              \
+    (n = vshuffle_epi8(n, swap_endian64_mask))
+
+#define GATHER_4x(x, y, z)                           \
+{                                                    \
+    vtype indices = vset_epi32(7<<6,6<<6,5<<6,4<<6,  \
+                               3<<6,2<<6,1<<6,0<<6); \
+    x = vgather_epi32(&yz, indices, sizeof(yz)); \
+}
+#define GATHER_2x(x, y, z)                           \
+{                                                    \
+    vtype indices = vset_epi32(7<<5,6<<5,5<<5,4<<5,  \
+                               3<<5,2<<5,1<<5,0<<5); \
+    x = vgather_epi32(&yz, indices, sizeof(yz)); \
+}
+#define GATHER(x, y, z)                              \
+{                                                    \
+    vtype indices = vset_epi32(7<<4,6<<4,5<<4,4<<4,  \
+                               3<<4,2<<4,1<<4,0<<4); \
+    x = vgather_epi32(&yz, indices, sizeof(yz)); \
+}
+
+#define GATHER64(x, y, z)                                         \
+{                                                                 \
+    uint64_t stride = sizeof(*y);                                 \
+    vtype indices = vset_epi64(3*stride, 2*stride, 1*stride, 0);  \
+    x = vgather_epi64(&y0z, indices, 1);                      \
+}
+
+/************************* SSE2/3/4/AVX/XOP ***************************/
+#elif __SSE2__
+
+#if __XOP__
+#include <x86intrin.h>
+#elif __AVX__
+#include <immintrin.h>
+#elif __SSE4_1__
+#include <smmintrin.h>
+#elif __SSSE3__
+#include <tmmintrin.h>
+#endif
+
+#include <emmintrin.h>
+
+typedef __m128i vtype;
+
+#define vadd_epi32              _mm_add_epi32
+#define vadd_epi64              _mm_add_epi64
+#define vand                    _mm_and_si128
+#define vandnot                 _mm_andnot_si128
+#if __XOP__
+#define vcmov                   _mm_cmov_si128
+#else
+#define vcmov                   vcmov_emu
+#define VCMOV_EMULATED          1
+#endif
+#define vcmpeq_epi8_mask(a, b)  _mm_movemask_epi8(_mm_cmpeq_epi8(a, b))
+#define vcmpeq_epi32            _mm_cmpeq_epi32
+#if __SSE4_1__
+#define vcvtsi32                _mm_cvtsi32_si128
+#endif
+#define vinsert_epi32           _mm_insert_epi32
+#define vload(x)                _mm_load_si128((const vtype*)(x))
+#define vloadu(x)               _mm_loadu_si128((const vtype*)(x))
+#define vmovemask_epi8          _mm_movemask_epi8
+#define vor                     _mm_or_si128
+#define vpermute4x64_epi64      _mm_permute4x64_epi64
+#define vpermute2x128           _mm_permute2x128_si128
+#if __XOP__
+#define vroti_epi32             _mm_roti_epi32
+#define vroti16_epi32           _mm_roti_epi32
+#define vroti_epi64             _mm_roti_epi64
+#else
+#define vroti_epi32             vroti_epi32_emu
+#define vroti_epi64             vroti_epi64_emu
+/* Specialized ROTL16 for SSE4.1 and lower (eg. MD5) */
+#if __SSSE3__
+#define vroti16_epi32(a, s)     vshuffle_epi8((a), vset_epi32(0x0d0c0f0e, 0x09080b0a, 0x05040706, 0x01000302))
+#elif __SSE2__
+#define vroti16_epi32(a, s)     vshufflelo_epi16(vshufflehi_epi16((a), 0xb1), 0xb1)
+#else
+#define vroti16_epi32           vroti_epi32
+#endif /* __SSSE3__ */
+#endif /* __XOP__ */
+#define vset_epi32              _mm_set_epi32
+#define vset1_epi8              _mm_set1_epi8
+#define vset1_epi32             _mm_set1_epi32
+#ifndef _MSC_VER
+#define vset1_epi64             _mm_set1_epi64x
+#define vset_epi64              _mm_set_epi64x
+#else
+#define vset1_epi64             _mm_set1_epi64
+#define vset_epi64              _mm_set_epi64
+#endif
+#define vsetzero                _mm_setzero_si128
+#if __SSSE3__
+#define vshuffle_epi8           _mm_shuffle_epi8
+#endif
+#define vshuffle_epi32          _mm_shuffle_epi32
+#define vshufflehi_epi16        _mm_shufflehi_epi16
+#define vshufflelo_epi16        _mm_shufflelo_epi16
+#define vslli_epi16             _mm_slli_epi16
+#define vslli_epi32             _mm_slli_epi32
+#define vslli_epi64             _mm_slli_epi64
+#define vsrli_epi16             _mm_srli_epi16
+#define vsrli_epi32             _mm_srli_epi32
+#define vsrli_epi64             _mm_srli_epi64
+#define vstore(x, y)            _mm_store_si128((vtype*)(x), y)
+#define vstoreu(x, y)           _mm_storeu_si128((vtype*)(x), y)
+#define vunpackhi_epi32         _mm_unpackhi_epi32
+#define vunpackhi_epi64         _mm_unpackhi_epi64
+#define vunpacklo_epi32         _mm_unpacklo_epi32
+#define vunpacklo_epi64         _mm_unpacklo_epi64
+#define vxor                    _mm_xor_si128
+
+#define vanyeq_epi32(x, y)     vmovemask_epi8(vcmpeq_epi32(x, y))
+
+#if __SSSE3__
+
+#define swap_endian_mask    \
+    vset_epi32(0x0c0d0e0f, 0x08090a0b, 0x04050607, 0x00010203)
+#define vswap32(n)              (n = vshuffle_epi8(n, swap_endian_mask))
+
+#define swap_endian64_mask  \
+    vset_epi64(0x08090a0b0c0d0e0fULL, 0x0001020304050607ULL)
+#define vswap64(n)              (n = vshuffle_epi8(n, swap_endian64_mask))
+
+#else /* Just basic SSE2 */
+
+#define vswap32(n)                                  \
+    (n = vxor(                                      \
+        vsrli_epi16(                                \
+            vroti16_epi32(n,16), 8),                \
+            vslli_epi16(vroti16_epi32(n,16), 8)))
+
+#define vswap64(n)                                              \
+    (                                                           \
+        n = vshufflehi_epi16(vshufflelo_epi16(n, 0xb1), 0xb1),  \
+        n = vxor(vslli_epi16(n, 8), vsrli_epi16(n, 8)),         \
+        n = vshuffle_epi32(n, 0xb1)                             \
+    )
+
+#endif /* __SSSE3__ */
+
+#if __SSE4_1__
+#define GATHER_4x(x, y, z)                      \
+{                                               \
+    x = vcvtsi32(   yz   );                   \
+    x = vinsert_epi32(x, yz+(1<<6), 1);       \
+    x = vinsert_epi32(x, yz+(2<<6), 2);       \
+    x = vinsert_epi32(x, yz+(3<<6), 3);       \
+}
+#define GATHER_2x(x, y, z)                      \
+{                                               \
+    x = vcvtsi32(   yz   );                   \
+    x = vinsert_epi32(x, yz+(1<<5), 1);       \
+    x = vinsert_epi32(x, yz+(2<<5), 2);       \
+    x = vinsert_epi32(x, yz+(3<<5), 3);       \
+}
+#define GATHER(x, y, z)                         \
+{                                               \
+    x = vcvtsi32(   yz   );                   \
+    x = vinsert_epi32(x, yz+(1<<4), 1);       \
+    x = vinsert_epi32(x, yz+(2<<4), 2);       \
+    x = vinsert_epi32(x, yz+(3<<4), 3);       \
+}
+#endif /* __SSE4_1__ */
+
+#define GATHER64(x,y,z)     { x = vset_epi64 (y1z, y0z); }
+
+#if _MSC_VER && !_M_X64
+/*
+ * These are slow, but the F'n 32 bit compiler will not build these intrinsics.
+ * Only the 64-bit (Win64) MSVC compiler has these as intrinsics. These slow
+ * ones let me debug, and develop this code, and work, but use CPU
+ */
+#define _mm_set_epi64 __mm_set_epi64
+#define _mm_set1_epi64 __mm_set1_epi64
+_inline __m128i _mm_set_epi64(long long a, long long b)
+{
+	__m128i x;
+
+	x.m128i_i640 = b;
+	x.m128i_i641 = a;
+	return x;
+}
+_inline __m128i _mm_set1_epi64(long long a)
+{
+	__m128i x;
+
+	x.m128i_i640 = x.m128i_i641 = a;
+	return x;
+}
+#define vset1_epi64x(x)         vset_epi64x(x, x)
+#define vset_epi64x(x1, x0)     (vtype)(vtype64){x0, x1}
+#endif
+
+/******************************** MMX *********************************/
+
+#elif __MMX__
+#include <mmintrin.h>
+
+typedef __m64i vtype;
+
+#error MMX intrinsics not implemented (contributions are welcome!)
+
+#endif /* __SIMD__ elif __SIMD__ elif __SIMD__ */
+
+/************************* COMMON STUFF BELOW *************************/
+
+#ifdef _MSC_VER
+#define MEM_ALIGN_SIMD			16
+#define INLINE _inline
+#else
+#define MEM_ALIGN_SIMD          (SIMD_COEF_32 * 4)
+#define INLINE inline
+#endif
+
+#if VLOADU_EMULATED
+static INLINE vtype vloadu_emu(const void *addr)
+{
+	if (is_aligned(addr, MEM_ALIGN_SIMD))
+		return vload(addr);
+	else {
+		JTR_ALIGN(MEM_ALIGN_SIMD) char bufsizeof(vtype);
+
+		return vload(memcpy(buf, addr, sizeof(vtype)));
+	}
+}
+#endif
+
+#if VSTOREU_EMULATED
+static INLINE void vstoreu_emu(void *addr, vtype v)
+{
+	if (is_aligned(addr, MEM_ALIGN_SIMD))
+		vstore(addr, v);
+	else {
+		JTR_ALIGN(MEM_ALIGN_SIMD) char bufsizeof(vtype);
+
+		vstore(buf, v);
+		memcpy(addr, buf, sizeof(vtype));
+	}
+}
+#endif
+
+#define vswap32_emu(x) \
+	x = vxor(vsrli_epi32(x, 24),                                            \
+	         vxor(vslli_epi32(vsrli_epi32(vslli_epi32(x, 8), 24), 8),       \
+	              vxor(vsrli_epi32(vslli_epi32(vsrli_epi32(x, 8), 24), 8),  \
+                       vslli_epi32(x, 24))))
+#define vswap64_emu(x) \
+	(x = vxor(vsrli_epi64(x, 32), vslli_epi64(x, 32)), vswap32_emu(x))
+
+#if VCMOV_EMULATED
+#if VANDNOT_EMULATED /* currently never */
+#define vcmov_emu(x, y, z)      vxor(y, vand(z, vxor(x, y)))
+#else
+#define vcmov_emu(x, y, z)      vxor(vand(z, x), vandnot(z, y))
+#endif
+#endif
+
+#if __SSE3__ || __MIC__
+#define vslli_epi64a(a, s)      vslli_epi64(a, s)
+
+#else
+/* Optimization for really old CPUs for << 1 (for vroti -1) (eg. SHA512) */
+#define vslli_epi64a(a, s) ((s) == 1 ?              \
+     vadd_epi64((a), (a)) : vslli_epi64((a), (s)))
+
+#endif /* __SSE3__ || __MIC__ */
+
+/*
+ * vroti must handle both ROTL and ROTR. If s < 0, then ROTR. Note that
+ * the ternary will normally be optimized away!
+ */
+#define vroti_epi32_emu(a, s)  ((s) < 0 ?                               \
+     vxor(vsrli_epi32((a), ~(s) + 1), vslli_epi32((a), 32 + (s))) :     \
+     vxor(vslli_epi32((a), (s)), vsrli_epi32((a), 32 - (s))))
+
+#define vroti_epi64_emu(a, s)  ((s) < 0 ?                               \
+     vxor(vsrli_epi64((a), ~(s) + 1), vslli_epi64a((a), 64 + (s))) :    \
+     vxor(vslli_epi64a((a), (s)), vsrli_epi64((a), 64 - (s))))
+
+#endif /* SIMD_COEF_32 */
+
+#endif /* _SSE_PSEUDO_H */

aircrack-ng-1.2-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 array16;
 
-	A = ctx->H0;
-	B = ctx->H1;
-	C = ctx->H2;
-	D = ctx->H3;
-	E = ctx->H4;
+	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->H0 += A;
-	ctx->H1 += B;
-	ctx->H2 += C;
-	ctx->H3 += D;
-	ctx->H4 += 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->H0 = 0x67452301;
-	ctx->H1 = 0xefcdab89;
-	ctx->H2 = 0x98badcfe;
-	ctx->H3 = 0x10325476;
-	ctx->H4 = 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->Hi);
+	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 @@
         pand   tmp5, ctxc
         pand   tmp5, ctxd
         pand   tmp5, ctxe
+#if !defined(__x86_64__) && !defined(__CYGWIN__)
         PRELOAD(const_00ff)
+#endif
         movdqa   MANGLE(const_00ff), tmp5
         pand   tmp5, tmp1
         pand   tmp5, tmp2
@@ -523,10 +595,17 @@
 		ret
 #ifdef __i386__
 #ifdef __PIC__
+#ifndef __APPLE__
 	.section .gnu.linkonce.t.__i686.get_pc_thunk.bx,"ax",@progbits
+#endif
 .globl __i686.get_pc_thunk.bx
+
+#ifdef __APPLE__
+    .private_extern  __i686.get_pc_thunk.bx
+#else
 	.hidden  __i686.get_pc_thunk.bx
 	.type    __i686.get_pc_thunk.bx,@function
+#endif
 __i686.get_pc_thunk.bx:
 	movl (%esp), %ebx
 	ret

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 charCOEF64 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)                            \
+    tmpi = vcmov((yi),(zi),(xi));
+
+#define MD5_G(x,y,z)                            \
+    tmpi = vcmov((xi),(yi),(zi));
+
+#if __AVX512F__
+#define MD5_H(x,y,z)                            \
+    tmpi = vternarylogic(xi, yi, zi, 0x96);
+
+#define MD5_H2(x,y,z)                           \
+    tmpi = vternarylogic(xi, yi, zi, 0x96);
+#elif 1
+#define MD5_H(x,y,z)                            \
+    tmp2i = vxor((xi),(yi));              \
+    tmpi = vxor(tmp2i, (zi));
+
+#define MD5_H2(x,y,z)                           \
+    tmpi = vxor((xi), tmp2i);
+#else
+#define MD5_H(x,y,z)                            \
+    tmpi = vxor((xi),(yi));               \
+    tmpi = vxor((tmpi),(zi));
+
+#define MD5_H2(x,y,z)                           \
+    tmpi = vxor((yi),(zi));               \
+    tmpi = vxor((tmpi),(xi));
+#endif
+
+#if __AVX512F__
+#define MD5_I(x,y,z)                            \
+    tmpi = vternarylogic(xi, yi, zi, 0x39);
+#elif __ARM_NEON__
+#define MD5_I(x,y,z)                            \
+    tmpi = vorn((xi), (zi));              \
+    tmpi = vxor((tmpi), (yi));
+#elif !VCMOV_EMULATED
+#define MD5_I(x,y,z)                            \
+    tmpi = vcmov((xi), mask, (zi));       \
+    tmpi = vxor((tmpi), (yi));
+#else
+#define MD5_I(x,y,z)                            \
+    tmpi = vandnot((zi), mask);             \
+    tmpi = vor((tmpi),(xi));              \
+    tmpi = vxor((tmpi),(yi));
+#endif
+
+#define MD5_STEP(f, a, b, c, d, x, t, s)            \
+    MD5_PARA_DO(i) {                                \
+        ai = vadd_epi32( ai, vset1_epi32(t) );  \
+        ai = vadd_epi32( ai, datai*16+x );    \
+        f((b),(c),(d))                              \
+        ai = vadd_epi32( ai, tmpi );          \
+        ai = vroti_epi32( ai, (s) );            \
+        ai = vadd_epi32( ai, bi );            \
+    }
+
+#define MD5_STEP_r16(f, a, b, c, d, x, t, s)        \
+    MD5_PARA_DO(i) {                                \
+        ai = vadd_epi32( ai, vset1_epi32(t) );  \
+        ai = vadd_epi32( ai, datai*16+x );    \
+        f((b),(c),(d))                              \
+        ai = vadd_epi32( ai, tmpi );          \
+        ai = vroti16_epi32( ai, (s) );          \
+        ai = vadd_epi32( ai, bi );            \
+    }
+
+#define INIT_A 0x67452301
+
+void md5_reverse(uint32_t *hash)
+{
+	hash0 -= INIT_A;
+}
+
+void md5_unreverse(uint32_t *hash)
+{
+	hash0 += INIT_A;
+}
+
+#undef INIT_A
+
+void SIMDmd5body(vtype* _data, unsigned int *out,
+                ARCH_WORD_32 *reload_state, unsigned SSEi_flags)
+{
+	vtype w16*SIMD_PARA_MD5;
+	vtype aSIMD_PARA_MD5;
+	vtype bSIMD_PARA_MD5;
+	vtype cSIMD_PARA_MD5;
+	vtype dSIMD_PARA_MD5;
+	vtype tmpSIMD_PARA_MD5;
+#if !__AVX512F__
+	vtype tmp2SIMD_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(Wi, saved_key, i); }
+				saved_key += (VS32<<6);
+			} else if (SSEi_flags & SSEi_2BUF_INPUT) {
+				for (i=0; i < 16; ++i) { GATHER_2x(Wi, saved_key, i); }
+				saved_key += (VS32<<5);
+			} else {
+				for (i=0; i < 16; ++i) { GATHER(Wi, saved_key, i); }
+				saved_key += (VS32<<4);
+			}
+			W += 16;
+		}
+#else
+		unsigned j, k;
+		ARCH_WORD_32 *p = (ARCH_WORD_32*)w;
+		vtype *W = w;
+		ARCH_WORD_32 *saved_key = (ARCH_WORD_32*)_data;
+		MD5_PARA_DO(k)
+		{
+			if (SSEi_flags & SSEi_4BUF_INPUT) {
+				for (j=0; j < 16; j++)
+					for (i=0; i < VS32; i++)
+						*p++ = saved_key(i<<6)+j;
+				saved_key += (VS32<<6);
+			} else if (SSEi_flags & SSEi_2BUF_INPUT) {
+				for (j=0; j < 16; j++)
+					for (i=0; i < VS32; i++)
+						*p++ = saved_key(i<<5)+j;
+				saved_key += (VS32<<5);
+			} else {
+				for (j=0; j < 16; j++)
+					for (i=0; i < VS32; i++)
+						*p++ = saved_key(i<<4)+j;
+				saved_key += (VS32<<4);
+			}
+			W += 16;
+		}
+#endif
+		// now set our data pointer to point to this 'mixed' data.
+		data = w;
+	} else
+		data = _data;
+
+	if((SSEi_flags & SSEi_RELOAD)==0)
+	{
+		MD5_PARA_DO(i)
+		{
+			ai = vset1_epi32(0x67452301);
+			bi = vset1_epi32(0xefcdab89);
+			ci = vset1_epi32(0x98badcfe);
+			di = vset1_epi32(0x10325476);
+		}
+	}
+	else
+	{
+		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
+		{
+			MD5_PARA_DO(i)
+			{
+				ai = vload((vtype*)&reload_statei*16*VS32+0*VS32);
+				bi = vload((vtype*)&reload_statei*16*VS32+1*VS32);
+				ci = vload((vtype*)&reload_statei*16*VS32+2*VS32);
+				di = vload((vtype*)&reload_statei*16*VS32+3*VS32);
+			}
+		}
+		else
+		{
+			MD5_PARA_DO(i)
+			{
+				ai = vload((vtype*)&reload_statei*4*VS32+0*VS32);
+				bi = vload((vtype*)&reload_statei*4*VS32+1*VS32);
+				ci = vload((vtype*)&reload_statei*4*VS32+2*VS32);
+				di = vload((vtype*)&reload_statei*4*VS32+3*VS32);
+			}
+		}
+	}
+
+/* Round 1 */
+	MD5_STEP(MD5_F, a, b, c, d, 0, 0xd76aa478, 7)
+	MD5_STEP(MD5_F, d, a, b, c, 1, 0xe8c7b756, 12)
+	MD5_STEP(MD5_F, c, d, a, b, 2, 0x242070db, 17)
+	MD5_STEP(MD5_F, b, c, d, a, 3, 0xc1bdceee, 22)
+	MD5_STEP(MD5_F, a, b, c, d, 4, 0xf57c0faf, 7)
+	MD5_STEP(MD5_F, d, a, b, c, 5, 0x4787c62a, 12)
+	MD5_STEP(MD5_F, c, d, a, b, 6, 0xa8304613, 17)
+	MD5_STEP(MD5_F, b, c, d, a, 7, 0xfd469501, 22)
+	MD5_STEP(MD5_F, a, b, c, d, 8, 0x698098d8, 7)
+	MD5_STEP(MD5_F, d, a, b, c, 9, 0x8b44f7af, 12)
+	MD5_STEP(MD5_F, c, d, a, b, 10, 0xffff5bb1, 17)
+	MD5_STEP(MD5_F, b, c, d, a, 11, 0x895cd7be, 22)
+	MD5_STEP(MD5_F, a, b, c, d, 12, 0x6b901122, 7)
+	MD5_STEP(MD5_F, d, a, b, c, 13, 0xfd987193, 12)
+	MD5_STEP(MD5_F, c, d, a, b, 14, 0xa679438e, 17)
+	MD5_STEP(MD5_F, b, c, d, a, 15, 0x49b40821, 22)
+
+/* Round 2 */
+	MD5_STEP(MD5_G, a, b, c, d, 1, 0xf61e2562, 5)
+	MD5_STEP(MD5_G, d, a, b, c, 6, 0xc040b340, 9)
+	MD5_STEP(MD5_G, c, d, a, b, 11, 0x265e5a51, 14)
+	MD5_STEP(MD5_G, b, c, d, a, 0, 0xe9b6c7aa, 20)
+	MD5_STEP(MD5_G, a, b, c, d, 5, 0xd62f105d, 5)
+	MD5_STEP(MD5_G, d, a, b, c, 10, 0x02441453, 9)
+	MD5_STEP(MD5_G, c, d, a, b, 15, 0xd8a1e681, 14)
+	MD5_STEP(MD5_G, b, c, d, a, 4, 0xe7d3fbc8, 20)
+	MD5_STEP(MD5_G, a, b, c, d, 9, 0x21e1cde6, 5)
+	MD5_STEP(MD5_G, d, a, b, c, 14, 0xc33707d6, 9)
+	MD5_STEP(MD5_G, c, d, a, b, 3, 0xf4d50d87, 14)
+	MD5_STEP(MD5_G, b, c, d, a, 8, 0x455a14ed, 20)
+	MD5_STEP(MD5_G, a, b, c, d, 13, 0xa9e3e905, 5)
+	MD5_STEP(MD5_G, d, a, b, c, 2, 0xfcefa3f8, 9)
+	MD5_STEP(MD5_G, c, d, a, b, 7, 0x676f02d9, 14)
+	MD5_STEP(MD5_G, b, c, d, a, 12, 0x8d2a4c8a, 20)
+
+/* Round 3 */
+	MD5_STEP(MD5_H, a, b, c, d, 5, 0xfffa3942, 4)
+	MD5_STEP(MD5_H2, d, a, b, c, 8, 0x8771f681, 11)
+	MD5_STEP_r16(MD5_H, c, d, a, b, 11, 0x6d9d6122, 16)
+	MD5_STEP(MD5_H2, b, c, d, a, 14, 0xfde5380c, 23)
+	MD5_STEP(MD5_H, a, b, c, d, 1, 0xa4beea44, 4)
+	MD5_STEP(MD5_H2, d, a, b, c, 4, 0x4bdecfa9, 11)
+	MD5_STEP_r16(MD5_H, c, d, a, b, 7, 0xf6bb4b60, 16)
+	MD5_STEP(MD5_H2, b, c, d, a, 10, 0xbebfbc70, 23)
+	MD5_STEP(MD5_H, a, b, c, d, 13, 0x289b7ec6, 4)
+	MD5_STEP(MD5_H2, d, a, b, c, 0, 0xeaa127fa, 11)
+	MD5_STEP_r16(MD5_H, c, d, a, b, 3, 0xd4ef3085, 16)
+	MD5_STEP(MD5_H2, b, c, d, a, 6, 0x04881d05, 23)
+	MD5_STEP(MD5_H, a, b, c, d, 9, 0xd9d4d039, 4)
+	MD5_STEP(MD5_H2, d, a, b, c, 12, 0xe6db99e5, 11)
+	MD5_STEP_r16(MD5_H, c, d, a, b, 15, 0x1fa27cf8, 16)
+	MD5_STEP(MD5_H2, b, c, d, a, 2, 0xc4ac5665, 23)
+
+/* Round 4 */
+	MD5_STEP(MD5_I, a, b, c, d, 0, 0xf4292244, 6)
+	MD5_STEP(MD5_I, d, a, b, c, 7, 0x432aff97, 10)
+	MD5_STEP(MD5_I, c, d, a, b, 14, 0xab9423a7, 15)
+	MD5_STEP(MD5_I, b, c, d, a, 5, 0xfc93a039, 21)
+	MD5_STEP(MD5_I, a, b, c, d, 12, 0x655b59c3, 6)
+	MD5_STEP(MD5_I, d, a, b, c, 3, 0x8f0ccc92, 10)
+	MD5_STEP(MD5_I, c, d, a, b, 10, 0xffeff47d, 15)
+	MD5_STEP(MD5_I, b, c, d, a, 1, 0x85845dd1, 21)
+	MD5_STEP(MD5_I, a, b, c, d, 8, 0x6fa87e4f, 6)
+	MD5_STEP(MD5_I, d, a, b, c, 15, 0xfe2ce6e0, 10)
+	MD5_STEP(MD5_I, c, d, a, b, 6, 0xa3014314, 15)
+	MD5_STEP(MD5_I, b, c, d, a, 13, 0x4e0811a1, 21)
+	MD5_STEP(MD5_I, a, b, c, d, 4, 0xf7537e82, 6)
+
+	if (SSEi_flags & SSEi_REVERSE_STEPS)
+	{
+		MD5_PARA_DO(i)
+		{
+			vstore((vtype*)&outi*4*VS32+0*VS32, ai);
+		}
+		return;
+	}
+
+	MD5_STEP(MD5_I, d, a, b, c, 11, 0xbd3af235, 10)
+	MD5_STEP(MD5_I, c, d, a, b, 2, 0x2ad7d2bb, 15)
+	MD5_STEP(MD5_I, b, c, d, a, 9, 0xeb86d391, 21)
+
+	if((SSEi_flags & SSEi_RELOAD)==0)
+	{
+		MD5_PARA_DO(i)
+		{
+			ai = vadd_epi32(ai, vset1_epi32(0x67452301));
+			bi = vadd_epi32(bi, vset1_epi32(0xefcdab89));
+			ci = vadd_epi32(ci, vset1_epi32(0x98badcfe));
+			di = vadd_epi32(di, vset1_epi32(0x10325476));
+		}
+	}
+	else
+	{
+		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
+		{
+			MD5_PARA_DO(i)
+			{
+				ai = vadd_epi32(ai, vload((vtype*)&reload_statei*16*VS32+0*VS32));
+				bi = vadd_epi32(bi, vload((vtype*)&reload_statei*16*VS32+1*VS32));
+				ci = vadd_epi32(ci, vload((vtype*)&reload_statei*16*VS32+2*VS32));
+				di = vadd_epi32(di, vload((vtype*)&reload_statei*16*VS32+3*VS32));
+			}
+		}
+		else
+		{
+			MD5_PARA_DO(i)
+			{
+				ai = vadd_epi32(ai, vload((vtype*)&reload_statei*4*VS32+0*VS32));
+				bi = vadd_epi32(bi, vload((vtype*)&reload_statei*4*VS32+1*VS32));
+				ci = vadd_epi32(ci, vload((vtype*)&reload_statei*4*VS32+2*VS32));
+				di = vadd_epi32(di, vload((vtype*)&reload_statei*4*VS32+3*VS32));
+			}
+		}
+	}
+
+#if USE_EXPERIMENTAL
+/*
+ * This is currently not used for MD5, and was observed to result
+ * in a significant performance regression (at least on XOP) just by sitting
+ * here. http://www.openwall.com/lists/john-dev/2015/09/05/5
+ * NOTE the regression might be gone now anyway since we went from -O3 to -O2.
+ */
+	if (SSEi_flags & SSEi_FLAT_OUT) {
+		MD5_PARA_DO(i)
+		{
+			uint32_t *o = (uint32_t*)&outi*4*VS32;
+#if __AVX512F__ || __MIC__
+			vtype idxs = vset_epi32(15*4,14*4,13*4,12*4,
+			                        11*4,10*4, 9*4, 8*4,
+			                         7*4, 6*4, 5*4, 4*4,
+			                         3*4, 2*4, 1*4, 0*4);
+
+			vscatter_epi32(o + 0, idxs, ai, 4);
+			vscatter_epi32(o + 1, idxs, bi, 4);
+			vscatter_epi32(o + 2, idxs, ci, 4);
+			vscatter_epi32(o + 3, idxs, di, 4);
+#else
+			uint32_t j, k;
+			union {
+				vtype v4;
+				uint32_t s4 * VS32;
+			} tmp;
+
+			tmp.v0 = ai;
+			tmp.v1 = bi;
+			tmp.v2 = ci;
+			tmp.v3 = di;
+
+			for (j = 0; j < VS32; j++)
+				for (k = 0; k < 4; k++)
+					oj*4+k = tmp.sk*VS32+j;
+#endif
+		}
+	}
+	else
+#endif
+	if (SSEi_flags & SSEi_OUTPUT_AS_INP_FMT)
+	{
+		if ((SSEi_flags & SSEi_OUTPUT_AS_2BUF_INP_FMT) == SSEi_OUTPUT_AS_2BUF_INP_FMT) {
+			MD5_PARA_DO(i)
+			{
+				vstore((vtype*)&outi*32*VS32+0*VS32, ai);
+				vstore((vtype*)&outi*32*VS32+1*VS32, bi);
+				vstore((vtype*)&outi*32*VS32+2*VS32, ci);
+				vstore((vtype*)&outi*32*VS32+3*VS32, di);
+			}
+		} else {
+			MD5_PARA_DO(i)
+			{
+				vstore((vtype*)&outi*16*VS32+0*VS32, ai);
+				vstore((vtype*)&outi*16*VS32+1*VS32, bi);
+				vstore((vtype*)&outi*16*VS32+2*VS32, ci);
+				vstore((vtype*)&outi*16*VS32+3*VS32, di);
+			}
+		}
+	}
+	else
+	{
+		MD5_PARA_DO(i)
+		{
+			vstore((vtype*)&outi*4*VS32+0*VS32, ai);
+			vstore((vtype*)&outi*4*VS32+1*VS32, bi);
+			vstore((vtype*)&outi*4*VS32+2*VS32, ci);
+			vstore((vtype*)&outi*4*VS32+3*VS32, di);
+		}
+	}
+}
+
+#define GETPOS(i, index)    ( (index&(VS32-1))*4 + (i& (0xffffffff-3) )*VS32 + ((i)&3) )
+
+static MAYBE_INLINE void mmxput(void *buf, unsigned int index, unsigned int bid,
+                                unsigned int offset, unsigned char *src,
+                                unsigned int len)
+{
+	unsigned char *nbuf;
+	unsigned int i;
+
+	nbuf = ((unsigned char*)buf) + index/VS32*64*VS32 + bid*64*MD5_SSE_NUM_KEYS;
+	for(i=0;i<len;i++)
+		nbuf GETPOS((offset+i), index)  = srci;
+
+}
+
+static MAYBE_INLINE void mmxput2(void *buf, unsigned int bid, void *src)
+{
+	unsigned char *nbuf;
+	unsigned int i;
+
+	nbuf = ((unsigned char*)buf) + bid*64*MD5_SSE_NUM_KEYS;
+	MD5_PARA_DO(i)
+		memcpy( nbuf+i*64*VS32, ((unsigned char*)src)+i*16*VS32, 16*VS32);
+}
+
+#if (ARCH_SIZE >= 8) || defined(__i386__) || defined(__ARM_NEON__)
+#define BITALIGN(hi, lo, s) ((((uint64_t)(hi) << 32) | (lo)) >> (s))
+#else
+#define BITALIGN(hi, lo, s) (((hi) << (32 - (s))) | ((lo) >> (s)))
+#endif
+
+static MAYBE_INLINE void mmxput3(void *buf, unsigned int bid,
+                                 unsigned int *offset, unsigned int mult,
+                                 unsigned int saltlen, void *src)
+{
+	unsigned int j;
+
+	MD5_PARA_DO(j) {
+		unsigned int i;
+		unsigned int jm = j * VS32 * 4;
+		unsigned char *nbuf = ((unsigned char *)buf) + bid * (64 * MD5_SSE_NUM_KEYS) + jm * 16;
+		unsigned int *s = (unsigned int *)src + jm;
+		for (i = 0; i < VS32; i++, s++) {
+			unsigned int n = offseti + jm / 4 * mult + saltlen;
+			unsigned int *d = (unsigned int *)(nbuf + (n & ~3U) * VS32) + i;
+
+			switch (n &= 3) {
+			case 0:
+				d0 = s0;
+				d1 * VS32 = s1 * VS32;
+				d2 * VS32 = s2 * VS32;
+				d3 * VS32 = s3 * VS32;
+				break;
+#if 0
+			default:
+				n <<= 3;
+				{
+					unsigned int m = 32 - n;
+					d0 = (d0 & (0xffffffffU >> m)) | (s0 << n);
+					d1 * VS32 = BITALIGN(s1 * VS32, s0, m);
+					d2 * VS32 = BITALIGN(s2 * VS32, s1 * VS32, m);
+					d3 * VS32 = BITALIGN(s3 * VS32, s2 * VS32, m);
+					d4 * VS32 = (d4 * VS32 & (0xffffffffU << n)) | (s3 * VS32 >> m);
+				}
+#else
+			case 1:
+				d0 = (d0 & 0xffU) | (s0 << 8);
+				d1 * VS32 = BITALIGN(s1 * VS32, s0, 24);
+				d2 * VS32 = BITALIGN(s2 * VS32, s1 * VS32, 24);
+				d3 * VS32 = BITALIGN(s3 * VS32, s2 * VS32, 24);
+				d4 * VS32 = (d4 * VS32 & 0xffffff00U) | (s3 * VS32 >> 24);
+				break;
+			case 2:
+				d0 = (d0 & 0xffffU) | (s0 << 16);
+				d1 * VS32 = BITALIGN(s1 * VS32, s0, 16);
+				d2 * VS32 = BITALIGN(s2 * VS32, s1 * VS32, 16);
+				d3 * VS32 = BITALIGN(s3 * VS32, s2 * VS32, 16);
+				d4 * VS32 = (d4 * VS32 & 0xffff0000U) | (s3 * VS32 >> 16);
+				break;
+			case 3:
+				d0 = (d0 & 0xffffffU) | (s0 << 24);
+				d1 * VS32 = BITALIGN(s1 * VS32, s0, 8);
+				d2 * VS32 = BITALIGN(s2 * VS32, s1 * VS32, 8);
+				d3 * VS32 = BITALIGN(s3 * VS32, s2 * VS32, 8);
+				d4 * VS32 = (d4 * VS32 & 0xff000000U) | (s3 * VS32 >> 8);
+#endif
+			}
+		}
+	}
+}
+
+static MAYBE_INLINE void dispatch(unsigned char buffers864*MD5_SSE_NUM_KEYS,
+                                  unsigned int f4*MD5_SSE_NUM_KEYS,
+                                  unsigned int lengthMD5_SSE_NUM_KEYS,
+                                  unsigned int saltlen)
+{
+	unsigned int i, j;
+	unsigned int bufferid;
+
+	i = 1000 / 42; j = 0;
+	do {
+		switch(j)
+		{
+			case 0:
+				bufferid = 0;
+				mmxput2(buffers, bufferid, f);
+				break;
+			case 21:
+				bufferid = 1;
+				mmxput3(buffers, bufferid, length, 1, 0, f);
+				break;
+			case 3:
+			case 9:
+			case 15:
+			case 27:
+			case 33:
+			case 39:
+				bufferid = 2;
+				mmxput3(buffers, bufferid, length, 2, 0, f);
+				break;
+			case 6:
+			case 12:
+			case 18:
+			case 24:
+			case 30:
+			case 36:
+				bufferid = 3;
+				mmxput2(buffers, bufferid, f);
+				break;
+			case 7:
+			case 35:
+				bufferid = 4;
+				mmxput3(buffers, bufferid, length, 1, saltlen, f);
+				break;
+			case 14:
+			case 28:
+				bufferid = 5;
+				mmxput2(buffers, bufferid, f);
+				break;
+			case 2:
+			case 4:
+			case 8:
+			case 10:
+			case 16:
+			case 20:
+			case 22:
+			case 26:
+			case 32:
+			case 34:
+			case 38:
+			case 40:
+				bufferid = 6;
+				mmxput2(buffers, bufferid, f);
+				break;
+			default:
+				bufferid = 7;
+				mmxput3(buffers, bufferid, length, 2, saltlen, f);
+				break;
+		}
+		SIMDmd5body((vtype*)&buffersbufferid, f, NULL, SSEi_MIXED_IN);
+		if (j++ < 1000 % 42 - 1)
+			continue;
+		if (j == 1000 % 42) {
+			if (!i)
+				break;
+			i--;
+			continue;
+		}
+		if (j >= 42)
+			j = 0;
+	} while (1);
+}
+
+
+void md5cryptsse(unsigned char pwdMD5_SSE_NUM_KEYS16, unsigned char *salt,
+                 char *out, unsigned int md5_type)
+{
+	unsigned int lengthMD5_SSE_NUM_KEYS;
+	unsigned int saltlen;
+	unsigned int i,j;
+	MD5_CTX ctx;
+	MD5_CTX tctx;
+	JTR_ALIGN(MEM_ALIGN_SIMD)
+		unsigned char buffers864*MD5_SSE_NUM_KEYS = { { 0 } };
+	JTR_ALIGN(MEM_ALIGN_SIMD) unsigned int F4*MD5_SSE_NUM_KEYS;
+
+	saltlen = strlen((char*)salt);
+	for(i=0;i<MD5_SSE_NUM_KEYS;i++)
+	{
+		unsigned int length_i = strlen((char*)pwdi);
+		unsigned int *bt;
+		unsigned int tf4;
+
+		/* cas 0 fs */
+		mmxput(buffers, i, 0, 16, pwdi, length_i);
+		mmxput(buffers, i, 0, length_i+16, (unsigned char*)"\x80", 1);
+		/* cas 1 sf */
+		mmxput(buffers, i, 1, 0, pwdi, length_i);
+		mmxput(buffers, i, 1, length_i+16, (unsigned char*)"\x80", 1);
+		/* cas 2 ssf */
+		mmxput(buffers, i, 2, 0, pwdi, length_i);
+		mmxput(buffers, i, 2, length_i, pwdi, length_i);
+		mmxput(buffers, i, 2, length_i*2+16, (unsigned char*)"\x80", 1);
+		/* cas 3 fss */
+		mmxput(buffers, i, 3, 16, pwdi, length_i);
+		mmxput(buffers, i, 3, 16+length_i, pwdi, length_i);
+		mmxput(buffers, i, 3, length_i*2+16, (unsigned char*)"\x80", 1);
+		/* cas 4 scf */
+		mmxput(buffers, i, 4, 0, pwdi, length_i);
+		mmxput(buffers, i, 4, length_i, salt, saltlen);
+		mmxput(buffers, i, 4, saltlen+length_i+16, (unsigned char*)"\x80", 1);
+		/* cas 5 fcs */
+		mmxput(buffers, i, 5, 16, salt, saltlen);
+		mmxput(buffers, i, 5, 16+saltlen, pwdi, length_i);
+		mmxput(buffers, i, 5, saltlen+length_i+16, (unsigned char*)"\x80", 1);
+		/* cas 6 fcss */
+		mmxput(buffers, i, 6, 16, salt, saltlen);
+		mmxput(buffers, i, 6, 16+saltlen, pwdi, length_i);
+		mmxput(buffers, i, 6, 16+saltlen+length_i, pwdi, length_i);
+		mmxput(buffers, i, 6, saltlen+2*length_i+16, (unsigned char*)"\x80", 1);
+		/* cas 7 scsf */
+		mmxput(buffers, i, 7, 0, pwdi, length_i);
+		mmxput(buffers, i, 7, length_i, salt, saltlen);
+		mmxput(buffers, i, 7, length_i+saltlen, pwdi, length_i);
+		mmxput(buffers, i, 7, saltlen+2*length_i+16, (unsigned char*)"\x80", 1);
+
+		bt = (unsigned int*)&buffers0;
+		bt14*VS32 + (i&(VS32-1)) + i/VS32*16*VS32 = (length_i+16)<<3;
+		bt = (unsigned int*)&buffers1;
+		bt14*VS32 + (i&(VS32-1)) + i/VS32*16*VS32 = (length_i+16)<<3;
+		bt = (unsigned int*)&buffers2;
+		bt14*VS32 + (i&(VS32-1)) + i/VS32*16*VS32 = (length_i*2+16)<<3;
+		bt = (unsigned int*)&buffers3;
+		bt14*VS32 + (i&(VS32-1)) + i/VS32*16*VS32 = (length_i*2+16)<<3;
+		bt = (unsigned int*)&buffers4;
+		bt14*VS32 + (i&(VS32-1)) + i/VS32*16*VS32 = (length_i+saltlen+16)<<3;
+		bt = (unsigned int*)&buffers5;
+		bt14*VS32 + (i&(VS32-1)) + i/VS32*16*VS32 = (length_i+saltlen+16)<<3;
+		bt = (unsigned int*)&buffers6;
+		bt14*VS32 + (i&(VS32-1)) + i/VS32*16*VS32 = (length_i*2+saltlen+16)<<3;
+		bt = (unsigned int*)&buffers7;
+		bt14*VS32 + (i&(VS32-1)) + i/VS32*16*VS32 = (length_i*2+saltlen+16)<<3;
+
+		MD5_Init(&ctx);
+		MD5_Update(&ctx, pwdi, length_i);
+		if (md5_type == MD5_TYPE_STD)
+			MD5_Update(&ctx, "$1$", 3);
+		else if (md5_type == MD5_TYPE_APACHE)
+			MD5_Update(&ctx, "$apr1$", 6);
+		// else it's AIX and no prefix included
+		MD5_Update(&ctx, salt, saltlen);
+		MD5_Init(&tctx);
+		MD5_Update(&tctx, pwdi, length_i);
+		MD5_Update(&tctx, salt, saltlen);
+		MD5_Update(&tctx, pwdi, length_i);
+		MD5_Final((unsigned char*)tf, &tctx);
+		MD5_Update(&ctx, tf, length_i);
+		lengthi = length_i;
+		for(j=length_i;j;j>>=1)
+			if(j&1)
+				MD5_Update(&ctx, "\0", 1);
+			else
+				MD5_Update(&ctx, pwdi, 1);
+		MD5_Final((unsigned char*)tf, &ctx);
+		Fi/VS32*4*VS32 + (i&(VS32-1)) + 0*VS32 = tf0;
+		Fi/VS32*4*VS32 + (i&(VS32-1)) + 1*VS32 = tf1;
+		Fi/VS32*4*VS32 + (i&(VS32-1)) + 2*VS32 = tf2;
+		Fi/VS32*4*VS32 + (i&(VS32-1)) + 3*VS32 = tf3;
+	}
+	dispatch(buffers, F, length, saltlen);
+	memcpy(out, F, MD5_SSE_NUM_KEYS*16);
+}
+#endif /* SIMD_PARA_MD5 */
+
+
+#if SIMD_PARA_MD4
+#define MD4_SSE_NUM_KEYS	(SIMD_COEF_32*SIMD_PARA_MD4)
+#define MD4_PARA_DO(x)	for((x)=0;(x)<SIMD_PARA_MD4;(x)++)
+
+#define MD4_F(x,y,z)                            \
+    tmpi = vcmov((yi),(zi),(xi));
+
+#if __AVX512F__
+#define MD4_G(x,y,z)                            \
+    tmpi = vternarylogic(xi, yi, zi, 0xE8);
+#elif !VCMOV_EMULATED
+#define MD4_G(x,y,z)                            \
+    tmpi = vxor((yi), (zi));              \
+    tmpi = vcmov((xi), (zi), (tmpi));
+#else
+#define MD4_G(x,y,z)                            \
+    tmpi = vor((yi),(zi));                \
+    tmp2i = vand((yi),(zi));              \
+    tmpi = vand((tmpi),(xi));             \
+    tmpi = vor((tmpi), (tmp2i) );
+#endif
+
+#if __AVX512F__
+#define MD4_H(x,y,z)                            \
+    tmpi = vternarylogic(xi, yi, zi, 0x96);
+
+#define MD4_H2(x,y,z)                           \
+    tmpi = vternarylogic(xi, yi, zi, 0x96);
+#elif SIMD_PARA_MD4 < 3
+#define MD4_H(x,y,z)                            \
+    tmp2i = vxor((xi),(yi));              \
+    tmpi = vxor(tmp2i, (zi));
+
+#define MD4_H2(x,y,z)                           \
+    tmpi = vxor((xi), tmp2i);
+#else
+#define MD4_H(x,y,z)                            \
+    tmpi = vxor((xi),(yi));               \
+    tmpi = vxor((tmpi),(zi));
+
+#define MD4_H2(x,y,z)                           \
+    tmpi = vxor((yi),(zi));               \
+    tmpi = vxor((tmpi),(xi));
+#endif
+
+#define MD4_STEP(f, a, b, c, d, x, t, s)            \
+    MD4_PARA_DO(i) {                                \
+        ai = vadd_epi32( ai, t );               \
+        f((b),(c),(d))                              \
+        ai = vadd_epi32( ai, tmpi );          \
+        ai = vadd_epi32( ai, datai*16+x );    \
+        ai = vroti_epi32( ai, (s) );            \
+    }
+
+#define MD4_REV_STEP(f, a, b, c, d, x, t, s)        \
+    MD4_PARA_DO(i) {                                \
+        f((b),(c),(d))                              \
+        ai = vadd_epi32( ai, tmpi );          \
+        ai = vadd_epi32( ai, datai*16+x );    \
+    }
+
+#define INIT_A 0x67452301
+#define INIT_B 0xefcdab89
+#define INIT_C 0x98badcfe
+#define INIT_D 0x10325476
+#define SQRT_3 0x6ed9eba1
+
+void md4_reverse(uint32_t *hash)
+{
+	hash0 -= INIT_A;
+	hash1 -= INIT_B;
+	hash2 -= INIT_C;
+	hash3 -= INIT_D;
+	hash1  = (hash1 >> 15) | (hash1 << 17);
+	hash1 -= SQRT_3 + (hash2 ^ hash3 ^ hash0);
+	hash1  = (hash1 >> 15) | (hash1 << 17);
+	hash1 -= SQRT_3;
+}
+
+void md4_unreverse(uint32_t *hash)
+{
+	hash1 += SQRT_3;
+	hash1  = (hash1 >> 17) | (hash1 << 15);
+	hash1 += SQRT_3 + (hash2 ^ hash3 ^ hash0);
+	hash1  = (hash1 >> 17) | (hash1 << 15);
+	hash3 += INIT_D;
+	hash2 += INIT_C;
+	hash1 += INIT_B;
+	hash0 += INIT_A;
+}
+
+#undef SQRT_3
+#undef INIT_D
+#undef INIT_C
+#undef INIT_B
+#undef INIT_A
+
+void SIMDmd4body(vtype* _data, unsigned int *out, ARCH_WORD_32 *reload_state,
+                unsigned SSEi_flags)
+{
+	vtype w16*SIMD_PARA_MD4;
+	vtype aSIMD_PARA_MD4;
+	vtype bSIMD_PARA_MD4;
+	vtype cSIMD_PARA_MD4;
+	vtype dSIMD_PARA_MD4;
+	vtype tmpSIMD_PARA_MD4;
+#if (SIMD_PARA_MD4 < 3 || VCMOV_EMULATED) && !__AVX512F__
+	vtype tmp2SIMD_PARA_MD4;
+#endif
+	vtype cst;
+	unsigned int i;
+	vtype *data;
+
+	if(SSEi_flags & SSEi_FLAT_IN) {
+		// Move _data to __data, mixing it SIMD_COEF_32 wise.
+#if __SSE4_1__ || __MIC__
+		unsigned k;
+		vtype *W = w;
+		ARCH_WORD_32 *saved_key = (ARCH_WORD_32*)_data;
+		MD4_PARA_DO(k)
+		{
+			if (SSEi_flags & SSEi_4BUF_INPUT) {
+				for (i=0; i < 16; ++i) { GATHER_4x(Wi, saved_key, i); }
+				saved_key += (VS32<<6);
+			} else if (SSEi_flags & SSEi_2BUF_INPUT) {
+				for (i=0; i < 16; ++i) { GATHER_2x(Wi, saved_key, i); }
+				saved_key += (VS32<<5);
+			} else {
+				for (i=0; i < 16; ++i) { GATHER(Wi, saved_key, i); }
+				saved_key += (VS32<<4);
+			}
+			W += 16;
+		}
+#else
+		unsigned j, k;
+		ARCH_WORD_32 *p = (ARCH_WORD_32*)w;
+		vtype *W = w;
+		ARCH_WORD_32 *saved_key = (ARCH_WORD_32*)_data;
+		MD4_PARA_DO(k)
+		{
+			if (SSEi_flags & SSEi_4BUF_INPUT) {
+				for (j=0; j < 16; j++)
+					for (i=0; i < VS32; i++)
+						*p++ = saved_key(i<<6)+j;
+				saved_key += (VS32<<6);
+			} else if (SSEi_flags & SSEi_2BUF_INPUT) {
+				for (j=0; j < 16; j++)
+					for (i=0; i < VS32; i++)
+						*p++ = saved_key(i<<5)+j;
+				saved_key += (VS32<<5);
+			} else {
+				for (j=0; j < 16; j++)
+					for (i=0; i < VS32; i++)
+						*p++ = saved_key(i<<4)+j;
+				saved_key += (VS32<<4);
+			}
+			W += 16;
+		}
+#endif
+		// now set our data pointer to point to this 'mixed' data.
+		data = w;
+	} else
+		data = _data;
+
+	if((SSEi_flags & SSEi_RELOAD)==0)
+	{
+		MD4_PARA_DO(i)
+		{
+			ai = vset1_epi32(0x67452301);
+			bi = vset1_epi32(0xefcdab89);
+			ci = vset1_epi32(0x98badcfe);
+			di = vset1_epi32(0x10325476);
+		}
+	}
+	else
+	{
+		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
+		{
+			MD4_PARA_DO(i)
+			{
+				ai = vload((vtype*)&reload_statei*16*VS32+0*VS32);
+				bi = vload((vtype*)&reload_statei*16*VS32+1*VS32);
+				ci = vload((vtype*)&reload_statei*16*VS32+2*VS32);
+				di = vload((vtype*)&reload_statei*16*VS32+3*VS32);
+			}
+		}
+		else
+		{
+			MD4_PARA_DO(i)
+			{
+				ai = vload((vtype*)&reload_statei*4*VS32+0*VS32);
+				bi = vload((vtype*)&reload_statei*4*VS32+1*VS32);
+				ci = vload((vtype*)&reload_statei*4*VS32+2*VS32);
+				di = vload((vtype*)&reload_statei*4*VS32+3*VS32);
+			}
+		}
+	}
+
+
+/* Round 1 */
+	cst = vsetzero();
+	MD4_STEP(MD4_F, a, b, c, d, 0, cst, 3)
+	MD4_STEP(MD4_F, d, a, b, c, 1, cst, 7)
+	MD4_STEP(MD4_F, c, d, a, b, 2, cst, 11)
+	MD4_STEP(MD4_F, b, c, d, a, 3, cst, 19)
+	MD4_STEP(MD4_F, a, b, c, d, 4, cst, 3)
+	MD4_STEP(MD4_F, d, a, b, c, 5, cst, 7)
+	MD4_STEP(MD4_F, c, d, a, b, 6, cst, 11)
+	MD4_STEP(MD4_F, b, c, d, a, 7, cst, 19)
+	MD4_STEP(MD4_F, a, b, c, d, 8, cst, 3)
+	MD4_STEP(MD4_F, d, a, b, c, 9, cst, 7)
+	MD4_STEP(MD4_F, c, d, a, b, 10, cst, 11)
+	MD4_STEP(MD4_F, b, c, d, a, 11, cst, 19)
+	MD4_STEP(MD4_F, a, b, c, d, 12, cst, 3)
+	MD4_STEP(MD4_F, d, a, b, c, 13, cst, 7)
+	MD4_STEP(MD4_F, c, d, a, b, 14, cst, 11)
+	MD4_STEP(MD4_F, b, c, d, a, 15, cst, 19)
+
+/* Round 2 */
+	cst = vset1_epi32(0x5A827999L);
+	MD4_STEP(MD4_G, a, b, c, d, 0, cst, 3)
+	MD4_STEP(MD4_G, d, a, b, c, 4, cst, 5)
+	MD4_STEP(MD4_G, c, d, a, b, 8, cst, 9)
+	MD4_STEP(MD4_G, b, c, d, a, 12, cst, 13)
+	MD4_STEP(MD4_G, a, b, c, d, 1, cst, 3)
+	MD4_STEP(MD4_G, d, a, b, c, 5, cst, 5)
+	MD4_STEP(MD4_G, c, d, a, b, 9, cst, 9)
+	MD4_STEP(MD4_G, b, c, d, a, 13, cst, 13)
+	MD4_STEP(MD4_G, a, b, c, d, 2, cst, 3)
+	MD4_STEP(MD4_G, d, a, b, c, 6, cst, 5)
+	MD4_STEP(MD4_G, c, d, a, b, 10, cst, 9)
+	MD4_STEP(MD4_G, b, c, d, a, 14, cst, 13)
+	MD4_STEP(MD4_G, a, b, c, d, 3, cst, 3)
+	MD4_STEP(MD4_G, d, a, b, c, 7, cst, 5)
+	MD4_STEP(MD4_G, c, d, a, b, 11, cst, 9)
+	MD4_STEP(MD4_G, b, c, d, a, 15, cst, 13)
+
+/* Round 3 */
+	cst = vset1_epi32(0x6ED9EBA1L);
+	MD4_STEP(MD4_H, a, b, c, d, 0, cst, 3)
+	MD4_STEP(MD4_H2, d, a, b, c, 8, cst, 9)
+	MD4_STEP(MD4_H, c, d, a, b, 4, cst, 11)
+	MD4_STEP(MD4_H2, b, c, d, a, 12, cst, 15)
+	MD4_STEP(MD4_H, a, b, c, d, 2, cst, 3)
+	MD4_STEP(MD4_H2, d, a, b, c, 10, cst, 9)
+	MD4_STEP(MD4_H, c, d, a, b, 6, cst, 11)
+	MD4_STEP(MD4_H2, b, c, d, a, 14, cst, 15)
+	MD4_STEP(MD4_H, a, b, c, d, 1, cst, 3)
+	MD4_STEP(MD4_H2, d, a, b, c, 9, cst, 9)
+	MD4_STEP(MD4_H, c, d, a, b, 5, cst, 11)
+
+	if (SSEi_flags & SSEi_REVERSE_STEPS)
+	{
+		MD4_REV_STEP(MD4_H2, b, c, d, a, 13, cst, 15)
+		MD4_PARA_DO(i)
+		{
+			vstore((vtype*)&outi*4*VS32+1*VS32, bi);
+		}
+		return;
+	}
+
+	MD4_STEP(MD4_H2, b, c, d, a, 13, cst, 15)
+	MD4_STEP(MD4_H, a, b, c, d, 3, cst, 3)
+	MD4_STEP(MD4_H2, d, a, b, c, 11, cst, 9)
+	MD4_STEP(MD4_H, c, d, a, b, 7, cst, 11)
+	MD4_STEP(MD4_H2, b, c, d, a, 15, cst, 15)
+
+	if((SSEi_flags & SSEi_RELOAD)==0)
+	{
+		MD4_PARA_DO(i)
+		{
+			ai = vadd_epi32(ai, vset1_epi32(0x67452301));
+			bi = vadd_epi32(bi, vset1_epi32(0xefcdab89));
+			ci = vadd_epi32(ci, vset1_epi32(0x98badcfe));
+			di = vadd_epi32(di, vset1_epi32(0x10325476));
+		}
+	}
+	else
+	{
+		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
+		{
+			MD4_PARA_DO(i)
+			{
+				ai = vadd_epi32(ai, vload((vtype*)&reload_statei*16*VS32+0*VS32));
+				bi = vadd_epi32(bi, vload((vtype*)&reload_statei*16*VS32+1*VS32));
+				ci = vadd_epi32(ci, vload((vtype*)&reload_statei*16*VS32+2*VS32));
+				di = vadd_epi32(di, vload((vtype*)&reload_statei*16*VS32+3*VS32));
+			}
+		}
+		else
+		{
+			MD4_PARA_DO(i)
+			{
+				ai = vadd_epi32(ai, vload((vtype*)&reload_statei*4*VS32+0*VS32));
+				bi = vadd_epi32(bi, vload((vtype*)&reload_statei*4*VS32+1*VS32));
+				ci = vadd_epi32(ci, vload((vtype*)&reload_statei*4*VS32+2*VS32));
+				di = vadd_epi32(di, vload((vtype*)&reload_statei*4*VS32+3*VS32));
+			}
+		}
+	}
+
+#if USE_EXPERIMENTAL
+/*
+ * This is currently not used for MD4, and was observed to result
+ * in a significant performance regression (at least on XOP) just by sitting
+ * here. http://www.openwall.com/lists/john-dev/2015/09/05/5
+ * NOTE the regression might be gone now anyway since we went from -O3 to -O2.
+ */
+	if (SSEi_flags & SSEi_FLAT_OUT) {
+		MD4_PARA_DO(i)
+		{
+			uint32_t *o = (uint32_t*)&outi*4*VS32;
+#if __AVX512F__ || __MIC__
+			vtype idxs = vset_epi32(15*4,14*4,13*4,12*4,
+			                        11*4,10*4, 9*4, 8*4,
+			                         7*4, 6*4, 5*4, 4*4,
+			                         3*4, 2*4, 1*4, 0*4);
+
+			vscatter_epi32(o + 0, idxs, ai, 4);
+			vscatter_epi32(o + 1, idxs, bi, 4);
+			vscatter_epi32(o + 2, idxs, ci, 4);
+			vscatter_epi32(o + 3, idxs, di, 4);
+#else
+			uint32_t j, k;
+			union {
+				vtype v4;
+				uint32_t s4 * VS32;
+			} tmp;
+
+			tmp.v0 = ai;
+			tmp.v1 = bi;
+			tmp.v2 = ci;
+			tmp.v3 = di;
+
+			for (j = 0; j < VS32; j++)
+				for (k = 0; k < 4; k++)
+					oj*4+k = tmp.sk*VS32+j;
+#endif
+		}
+	}
+	else
+#endif
+	if (SSEi_flags & SSEi_OUTPUT_AS_INP_FMT)
+	{
+		if ((SSEi_flags & SSEi_OUTPUT_AS_2BUF_INP_FMT) == SSEi_OUTPUT_AS_2BUF_INP_FMT) {
+			MD4_PARA_DO(i)
+			{
+				vstore((vtype*)&outi*32*VS32+0*VS32, ai);
+				vstore((vtype*)&outi*32*VS32+1*VS32, bi);
+				vstore((vtype*)&outi*32*VS32+2*VS32, ci);
+				vstore((vtype*)&outi*32*VS32+3*VS32, di);
+			}
+		} else {
+			MD4_PARA_DO(i)
+			{
+				vstore((vtype*)&outi*16*VS32+0*VS32, ai);
+				vstore((vtype*)&outi*16*VS32+1*VS32, bi);
+				vstore((vtype*)&outi*16*VS32+2*VS32, ci);
+				vstore((vtype*)&outi*16*VS32+3*VS32, di);
+			}
+		}
+	}
+	else
+	{
+		MD4_PARA_DO(i)
+		{
+			vstore((vtype*)&outi*4*VS32+0*VS32, ai);
+			vstore((vtype*)&outi*4*VS32+1*VS32, bi);
+			vstore((vtype*)&outi*4*VS32+2*VS32, ci);
+			vstore((vtype*)&outi*4*VS32+3*VS32, di);
+		}
+	}
+}
+
+#endif /* SIMD_PARA_MD4 */
+
+
+#if SIMD_PARA_SHA1
+#define SHA1_SSE_NUM_KEYS	(SIMD_COEF_32*SIMD_PARA_SHA1)
+#define SHA1_PARA_DO(x)		for((x)=0;(x)<SIMD_PARA_SHA1;(x)++)
+
+#define SHA1_F(x,y,z)                           \
+    tmpi = vcmov((yi),(zi),(xi));
+
+#if __AVX512F__
+#define SHA1_G(x,y,z)                           \
+    tmpi = vternarylogic(xi, yi, zi, 0x96);
+#else
+#define SHA1_G(x,y,z)                           \
+    tmpi = vxor((yi),(zi));               \
+    tmpi = vxor((tmpi),(xi));
+#endif
+
+#if __AVX512F__
+#define SHA1_H(x,y,z)                           \
+    tmpi = vternarylogic(xi, yi, zi, 0xE8);
+#elif !VCMOV_EMULATED
+#define SHA1_H(x,y,z)                           \
+    tmpi = vxor((zi), (yi));              \
+    tmpi = vcmov((xi), (yi), tmpi);
+#else
+#define SHA1_H(x,y,z)                                       \
+    tmpi = vand((xi),(yi));                           \
+    tmpi = vor((tmpi),vand(vor((xi),(yi)),(zi)));
+#endif
+
+#define SHA1_I(x,y,z) SHA1_G(x,y,z)
+
+#define SHA1_EXPAND2a(t)                                \
+    tmpi = vxor( datai*16+t-3, datai*16+t-8 );    \
+    tmpi = vxor( tmpi, datai*16+t-14 );           \
+    tmpi = vxor( tmpi, datai*16+t-16 );           \
+    wi*16+((t)&0xF) = vroti_epi32(tmpi, 1);
+
+#define SHA1_EXPAND2b(t)                                    \
+    tmpi = vxor( wi*16+((t-3)&0xF), datai*16+t-8 );   \
+    tmpi = vxor( tmpi, datai*16+t-14 );               \
+    tmpi = vxor( tmpi, datai*16+t-16 );               \
+    wi*16+((t)&0xF) = vroti_epi32(tmpi, 1);
+
+#define SHA1_EXPAND2c(t)                                        \
+    tmpi = vxor( wi*16+((t-3)&0xF), wi*16+((t-8)&0xF) );  \
+    tmpi = vxor( tmpi, datai*16+t-14 );                   \
+    tmpi = vxor( tmpi, datai*16+t-16 );                   \
+    wi*16+((t)&0xF) = vroti_epi32(tmpi, 1);
+
+#define SHA1_EXPAND2d(t)                                        \
+    tmpi = vxor( wi*16+((t-3)&0xF), wi*16+((t-8)&0xF) );  \
+    tmpi = vxor( tmpi, wi*16+((t-14)&0xF) );              \
+    tmpi = vxor( tmpi, datai*16+t-16 );                   \
+    wi*16+((t)&0xF) = vroti_epi32(tmpi, 1);
+
+#define SHA1_EXPAND2(t)                                         \
+    tmpi = vxor( wi*16+((t-3)&0xF), wi*16+((t-8)&0xF) );  \
+    tmpi = vxor( tmpi, wi*16+((t-14)&0xF) );              \
+    tmpi = vxor( tmpi, wi*16+((t-16)&0xF) );              \
+    wi*16+((t)&0xF) = vroti_epi32(tmpi, 1);
+
+#define SHA1_ROUND2a(a,b,c,d,e,F,t)                 \
+    SHA1_PARA_DO(i) {                               \
+        F(b,c,d)                                    \
+        ei = vadd_epi32( ei, tmpi );          \
+        tmpi = vroti_epi32(ai, 5);              \
+        ei = vadd_epi32( ei, tmpi );          \
+        ei = vadd_epi32( ei, cst );             \
+        ei = vadd_epi32( ei, datai*16+t );    \
+        bi = vroti_epi32(bi, 30);               \
+        SHA1_EXPAND2a(t+16)                         \
+    }
+
+#define SHA1_ROUND2b(a,b,c,d,e,F,t)                 \
+    SHA1_PARA_DO(i) {                               \
+        F(b,c,d)                                    \
+        ei = vadd_epi32( ei, tmpi );          \
+        tmpi = vroti_epi32(ai, 5);              \
+        ei = vadd_epi32( ei, tmpi );          \
+        ei = vadd_epi32( ei, cst );             \
+        ei = vadd_epi32( ei, datai*16+t );    \
+        bi = vroti_epi32(bi, 30);               \
+        SHA1_EXPAND2b(t+16)                         \
+    }
+
+#define SHA1_ROUND2c(a,b,c,d,e,F,t)                 \
+    SHA1_PARA_DO(i) {                               \
+        F(b,c,d)                                    \
+        ei = vadd_epi32( ei, tmpi );          \
+        tmpi = vroti_epi32(ai, 5);              \
+        ei = vadd_epi32( ei, tmpi );          \
+        ei = vadd_epi32( ei, cst );             \
+        ei = vadd_epi32( ei, datai*16+t );    \
+        bi = vroti_epi32(bi, 30);               \
+        SHA1_EXPAND2c(t+16)                         \
+    }
+
+#define SHA1_ROUND2d(a,b,c,d,e,F,t)                 \
+    SHA1_PARA_DO(i) {                               \
+        F(b,c,d)                                    \
+        ei = vadd_epi32( ei, tmpi );          \
+        tmpi = vroti_epi32(ai, 5);              \
+        ei = vadd_epi32( ei, tmpi );          \
+        ei = vadd_epi32( ei, cst );             \
+        ei = vadd_epi32( ei, datai*16+t );    \
+        bi = vroti_epi32(bi, 30);               \
+        SHA1_EXPAND2d(t+16)                         \
+    }
+
+#define SHA1_ROUND2(a,b,c,d,e,F,t)                  \
+    SHA1_PARA_DO(i) {                               \
+        F(b,c,d)                                    \
+        ei = vadd_epi32( ei, tmpi );          \
+        tmpi = vroti_epi32(ai, 5);              \
+        ei = vadd_epi32( ei, tmpi );          \
+        ei = vadd_epi32( ei, cst );             \
+        ei = vadd_epi32( ei, wi*16+(t&0xF) ); \
+        bi = vroti_epi32(bi, 30);               \
+        SHA1_EXPAND2(t+16)                          \
+    }
+
+#define SHA1_ROUND2x(a,b,c,d,e,F,t)                 \
+    SHA1_PARA_DO(i) {                               \
+        F(b,c,d)                                    \
+        ei = vadd_epi32( ei, tmpi );          \
+        tmpi = vroti_epi32(ai, 5);              \
+        ei = vadd_epi32( ei, tmpi );          \
+        ei = vadd_epi32( ei, cst );             \
+        ei = vadd_epi32( ei, wi*16+(t&0xF) ); \
+        bi = vroti_epi32(bi, 30);               \
+    }
+
+#define INIT_E 0xC3D2E1F0
+
+void sha1_reverse(uint32_t *hash)
+{
+	hash4 -= INIT_E;
+	hash4  = (hash4 << 2) | (hash4 >> 30);
+}
+
+void sha1_unreverse(uint32_t *hash)
+{
+	hash4  = (hash4 << 30) | (hash4 >> 2);
+	hash4 += INIT_E;
+}
+
+#undef INIT_E
+
+void SIMDSHA1body(vtype* _data, ARCH_WORD_32 *out, ARCH_WORD_32 *reload_state,
+                 unsigned SSEi_flags)
+{
+	vtype w16*SIMD_PARA_SHA1;
+	vtype aSIMD_PARA_SHA1;
+	vtype bSIMD_PARA_SHA1;
+	vtype cSIMD_PARA_SHA1;
+	vtype dSIMD_PARA_SHA1;
+	vtype eSIMD_PARA_SHA1;
+	vtype tmpSIMD_PARA_SHA1;
+	vtype cst;
+	unsigned int i;
+	vtype *data;
+
+	if(SSEi_flags & SSEi_FLAT_IN) {
+		// Move _data to __data, mixing it SIMD_COEF_32 wise.
+#if __SSE4_1__ || __MIC__
+		unsigned k;
+		vtype *W = w;
+		ARCH_WORD_32 *saved_key = (ARCH_WORD_32*)_data;
+		SHA1_PARA_DO(k)
+		{
+			if (SSEi_flags & SSEi_4BUF_INPUT) {
+				for (i=0; i < 14; ++i) {
+					GATHER_4x(Wi, saved_key, i);
+					vswap32(Wi);
+				}
+				GATHER_4x(W14, saved_key, 14);
+				GATHER_4x(W15, saved_key, 15);
+				saved_key += (VS32<<6);
+			} else if (SSEi_flags & SSEi_2BUF_INPUT) {
+				for (i=0; i < 14; ++i) {
+					GATHER_2x(Wi, saved_key, i);
+					vswap32(Wi);
+				}
+				GATHER_2x(W14, saved_key, 14);
+				GATHER_2x(W15, saved_key, 15);
+				saved_key += (VS32<<5);
+			} else {
+				for (i=0; i < 14; ++i) {
+					GATHER(Wi, saved_key, i);
+					vswap32(Wi);
+				}
+				GATHER(W14, saved_key, 14);
+				GATHER(W15, saved_key, 15);
+				saved_key += (VS32<<4);
+			}
+			if ( ((SSEi_flags & SSEi_2BUF_INPUT_FIRST_BLK) == SSEi_2BUF_INPUT_FIRST_BLK) ||
+				 ((SSEi_flags & SSEi_4BUF_INPUT_FIRST_BLK) == SSEi_4BUF_INPUT_FIRST_BLK) ||
+				 ((SSEi_flags & SSEi_FLAT_RELOAD_SWAPLAST) == SSEi_FLAT_RELOAD_SWAPLAST) ) {
+				vswap32(W14);
+				vswap32(W15);
+			}
+			W += 16;
+		}
+#else
+		unsigned j, k;
+		ARCH_WORD_32 *p = (ARCH_WORD_32*)w;
+		vtype *W = w;
+		ARCH_WORD_32 *saved_key = (ARCH_WORD_32*)_data;
+		SHA1_PARA_DO(k)
+		{
+			if (SSEi_flags & SSEi_4BUF_INPUT) {
+				for (j=0; j < 16; j++)
+					for (i=0; i < VS32; i++)
+						*p++ = saved_key(i<<6)+j;
+				saved_key += (VS32<<6);
+			} else if (SSEi_flags & SSEi_2BUF_INPUT) {
+				for (j=0; j < 16; j++)
+					for (i=0; i < VS32; i++)
+						*p++ = saved_key(i<<5)+j;
+				saved_key += (VS32<<5);
+			} else {
+				for (j=0; j < 16; j++)
+					for (i=0; i < VS32; i++)
+						*p++ = saved_key(i<<4)+j;
+				saved_key += (VS32<<4);
+			}
+			for (i=0; i < 14; i++)
+				vswap32(Wi);
+			if ( ((SSEi_flags & SSEi_2BUF_INPUT_FIRST_BLK) == SSEi_2BUF_INPUT_FIRST_BLK) ||
+				 ((SSEi_flags & SSEi_4BUF_INPUT_FIRST_BLK) == SSEi_4BUF_INPUT_FIRST_BLK) ||
+				 ((SSEi_flags & SSEi_FLAT_RELOAD_SWAPLAST) == SSEi_FLAT_RELOAD_SWAPLAST)) {
+				vswap32(W14);
+				vswap32(W15);
+			}
+			W += 16;
+		}
+#endif
+
+		// now set our data pointer to point to this 'mixed' data.
+		data = w;
+	} else
+		data = _data;
+
+	if((SSEi_flags & SSEi_RELOAD)==0)
+	{
+		SHA1_PARA_DO(i)
+		{
+			ai = vset1_epi32(0x67452301);
+			bi = vset1_epi32(0xefcdab89);
+			ci = vset1_epi32(0x98badcfe);
+			di = vset1_epi32(0x10325476);
+			ei = vset1_epi32(0xC3D2E1F0);
+		}
+	}
+	else
+	{
+		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
+		{
+			SHA1_PARA_DO(i)
+			{
+				ai = vload((vtype*)&reload_statei*16*VS32+0*VS32);
+				bi = vload((vtype*)&reload_statei*16*VS32+1*VS32);
+				ci = vload((vtype*)&reload_statei*16*VS32+2*VS32);
+				di = vload((vtype*)&reload_statei*16*VS32+3*VS32);
+				ei = vload((vtype*)&reload_statei*16*VS32+4*VS32);
+			}
+		}
+		else
+		{
+			SHA1_PARA_DO(i)
+			{
+				ai = vload((vtype*)&reload_statei*5*VS32+0*VS32);
+				bi = vload((vtype*)&reload_statei*5*VS32+1*VS32);
+				ci = vload((vtype*)&reload_statei*5*VS32+2*VS32);
+				di = vload((vtype*)&reload_statei*5*VS32+3*VS32);
+				ei = vload((vtype*)&reload_statei*5*VS32+4*VS32);
+			}
+		}
+	}
+
+	cst = vset1_epi32(0x5A827999);
+	SHA1_ROUND2a( a, b, c, d, e, SHA1_F,  0 );
+	SHA1_ROUND2a( e, a, b, c, d, SHA1_F,  1 );
+	SHA1_ROUND2a( d, e, a, b, c, SHA1_F,  2 );
+	SHA1_ROUND2b( c, d, e, a, b, SHA1_F,  3 );
+	SHA1_ROUND2b( b, c, d, e, a, SHA1_F,  4 );
+	SHA1_ROUND2b( a, b, c, d, e, SHA1_F,  5 );
+	SHA1_ROUND2b( e, a, b, c, d, SHA1_F,  6 );
+	SHA1_ROUND2b( d, e, a, b, c, SHA1_F,  7 );
+	SHA1_ROUND2c( c, d, e, a, b, SHA1_F,  8 );
+	SHA1_ROUND2c( b, c, d, e, a, SHA1_F,  9 );
+	SHA1_ROUND2c( a, b, c, d, e, SHA1_F, 10 );
+	SHA1_ROUND2c( e, a, b, c, d, SHA1_F, 11 );
+	SHA1_ROUND2c( d, e, a, b, c, SHA1_F, 12 );
+	SHA1_ROUND2c( c, d, e, a, b, SHA1_F, 13 );
+	SHA1_ROUND2d( b, c, d, e, a, SHA1_F, 14 );
+	SHA1_ROUND2d( a, b, c, d, e, SHA1_F, 15 );
+	SHA1_ROUND2( e, a, b, c, d, SHA1_F, 16 );
+	SHA1_ROUND2( d, e, a, b, c, SHA1_F, 17 );
+	SHA1_ROUND2( c, d, e, a, b, SHA1_F, 18 );
+	SHA1_ROUND2( b, c, d, e, a, SHA1_F, 19 );
+
+	cst = vset1_epi32(0x6ED9EBA1);
+	SHA1_ROUND2( a, b, c, d, e, SHA1_G, 20 );
+	SHA1_ROUND2( e, a, b, c, d, SHA1_G, 21 );
+	SHA1_ROUND2( d, e, a, b, c, SHA1_G, 22 );
+	SHA1_ROUND2( c, d, e, a, b, SHA1_G, 23 );
+	SHA1_ROUND2( b, c, d, e, a, SHA1_G, 24 );
+	SHA1_ROUND2( a, b, c, d, e, SHA1_G, 25 );
+	SHA1_ROUND2( e, a, b, c, d, SHA1_G, 26 );
+	SHA1_ROUND2( d, e, a, b, c, SHA1_G, 27 );
+	SHA1_ROUND2( c, d, e, a, b, SHA1_G, 28 );
+	SHA1_ROUND2( b, c, d, e, a, SHA1_G, 29 );
+	SHA1_ROUND2( a, b, c, d, e, SHA1_G, 30 );
+	SHA1_ROUND2( e, a, b, c, d, SHA1_G, 31 );
+	SHA1_ROUND2( d, e, a, b, c, SHA1_G, 32 );
+	SHA1_ROUND2( c, d, e, a, b, SHA1_G, 33 );
+	SHA1_ROUND2( b, c, d, e, a, SHA1_G, 34 );
+	SHA1_ROUND2( a, b, c, d, e, SHA1_G, 35 );
+	SHA1_ROUND2( e, a, b, c, d, SHA1_G, 36 );
+	SHA1_ROUND2( d, e, a, b, c, SHA1_G, 37 );
+	SHA1_ROUND2( c, d, e, a, b, SHA1_G, 38 );
+	SHA1_ROUND2( b, c, d, e, a, SHA1_G, 39 );
+
+	cst = vset1_epi32(0x8F1BBCDC);
+	SHA1_ROUND2( a, b, c, d, e, SHA1_H, 40 );
+	SHA1_ROUND2( e, a, b, c, d, SHA1_H, 41 );
+	SHA1_ROUND2( d, e, a, b, c, SHA1_H, 42 );
+	SHA1_ROUND2( c, d, e, a, b, SHA1_H, 43 );
+	SHA1_ROUND2( b, c, d, e, a, SHA1_H, 44 );
+	SHA1_ROUND2( a, b, c, d, e, SHA1_H, 45 );
+	SHA1_ROUND2( e, a, b, c, d, SHA1_H, 46 );
+	SHA1_ROUND2( d, e, a, b, c, SHA1_H, 47 );
+	SHA1_ROUND2( c, d, e, a, b, SHA1_H, 48 );
+	SHA1_ROUND2( b, c, d, e, a, SHA1_H, 49 );
+	SHA1_ROUND2( a, b, c, d, e, SHA1_H, 50 );
+	SHA1_ROUND2( e, a, b, c, d, SHA1_H, 51 );
+	SHA1_ROUND2( d, e, a, b, c, SHA1_H, 52 );
+	SHA1_ROUND2( c, d, e, a, b, SHA1_H, 53 );
+	SHA1_ROUND2( b, c, d, e, a, SHA1_H, 54 );
+	SHA1_ROUND2( a, b, c, d, e, SHA1_H, 55 );
+	SHA1_ROUND2( e, a, b, c, d, SHA1_H, 56 );
+	SHA1_ROUND2( d, e, a, b, c, SHA1_H, 57 );
+	SHA1_ROUND2( c, d, e, a, b, SHA1_H, 58 );
+	SHA1_ROUND2( b, c, d, e, a, SHA1_H, 59 );
+
+	cst = vset1_epi32(0xCA62C1D6);
+	SHA1_ROUND2( a, b, c, d, e, SHA1_I, 60 );
+	SHA1_ROUND2( e, a, b, c, d, SHA1_I, 61 );
+	SHA1_ROUND2( d, e, a, b, c, SHA1_I, 62 );
+	SHA1_ROUND2( c, d, e, a, b, SHA1_I, 63 );
+	SHA1_ROUND2x( b, c, d, e, a, SHA1_I, 64 );
+	SHA1_ROUND2x( a, b, c, d, e, SHA1_I, 65 );
+	SHA1_ROUND2x( e, a, b, c, d, SHA1_I, 66 );
+	SHA1_ROUND2x( d, e, a, b, c, SHA1_I, 67 );
+	SHA1_ROUND2x( c, d, e, a, b, SHA1_I, 68 );
+	SHA1_ROUND2x( b, c, d, e, a, SHA1_I, 69 );
+	SHA1_ROUND2x( a, b, c, d, e, SHA1_I, 70 );
+	SHA1_ROUND2x( e, a, b, c, d, SHA1_I, 71 );
+	SHA1_ROUND2x( d, e, a, b, c, SHA1_I, 72 );
+	SHA1_ROUND2x( c, d, e, a, b, SHA1_I, 73 );
+	SHA1_ROUND2x( b, c, d, e, a, SHA1_I, 74 );
+	SHA1_ROUND2x( a, b, c, d, e, SHA1_I, 75 );
+
+	if (SSEi_flags & SSEi_REVERSE_STEPS)
+	{
+		SHA1_PARA_DO(i)
+		{
+			vstore((vtype*)&outi*5*VS32+4*VS32, ei);
+		}
+		return;
+	}
+
+	SHA1_ROUND2x( e, a, b, c, d, SHA1_I, 76 );
+	SHA1_ROUND2x( d, e, a, b, c, SHA1_I, 77 );
+	SHA1_ROUND2x( c, d, e, a, b, SHA1_I, 78 );
+	SHA1_ROUND2x( b, c, d, e, a, SHA1_I, 79 );
+
+	if((SSEi_flags & SSEi_RELOAD)==0)
+	{
+		SHA1_PARA_DO(i)
+		{
+			ai = vadd_epi32(ai, vset1_epi32(0x67452301));
+			bi = vadd_epi32(bi, vset1_epi32(0xefcdab89));
+			ci = vadd_epi32(ci, vset1_epi32(0x98badcfe));
+			di = vadd_epi32(di, vset1_epi32(0x10325476));
+			ei = vadd_epi32(ei, vset1_epi32(0xC3D2E1F0));
+		}
+	}
+	else
+	{
+		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
+		{
+			SHA1_PARA_DO(i)
+			{
+				ai = vadd_epi32(ai, vload((vtype*)&reload_statei*16*VS32+0*VS32));
+				bi = vadd_epi32(bi, vload((vtype*)&reload_statei*16*VS32+1*VS32));
+				ci = vadd_epi32(ci, vload((vtype*)&reload_statei*16*VS32+2*VS32));
+				di = vadd_epi32(di, vload((vtype*)&reload_statei*16*VS32+3*VS32));
+				ei = vadd_epi32(ei, vload((vtype*)&reload_statei*16*VS32+4*VS32));
+			}
+		}
+		else
+		{
+			SHA1_PARA_DO(i)
+			{
+				ai = vadd_epi32(ai, vload((vtype*)&reload_statei*5*VS32+0*VS32));
+				bi = vadd_epi32(bi, vload((vtype*)&reload_statei*5*VS32+1*VS32));
+				ci = vadd_epi32(ci, vload((vtype*)&reload_statei*5*VS32+2*VS32));
+				di = vadd_epi32(di, vload((vtype*)&reload_statei*5*VS32+3*VS32));
+				ei = vadd_epi32(ei, vload((vtype*)&reload_statei*5*VS32+4*VS32));
+			}
+		}
+	}
+
+	if (SSEi_flags & SSEi_FLAT_OUT) {
+		SHA1_PARA_DO(i)
+		{
+			uint32_t *o = (uint32_t*)&outi*5*VS32;
+#if __AVX512F__ || __MIC__
+			vtype idxs = vset_epi32(15*5,14*5,13*5,12*5,
+			                        11*5,10*5, 9*5, 8*5,
+			                         7*5, 6*5, 5*5, 4*5,
+			                         3*5, 2*5, 1*5, 0*5);
+
+			vscatter_epi32(o + 0, idxs, vswap32(ai), 4);
+			vscatter_epi32(o + 1, idxs, vswap32(bi), 4);
+			vscatter_epi32(o + 2, idxs, vswap32(ci), 4);
+			vscatter_epi32(o + 3, idxs, vswap32(di), 4);
+			vscatter_epi32(o + 4, idxs, vswap32(ei), 4);
+#else
+			uint32_t j, k;
+			union {
+				vtype v5;
+				uint32_t s5 * VS32;
+			} tmp;
+
+			tmp.v0 = vswap32(ai);
+			tmp.v1 = vswap32(bi);
+			tmp.v2 = vswap32(ci);
+			tmp.v3 = vswap32(di);
+			tmp.v4 = vswap32(ei);
+
+			for (j = 0; j < VS32; j++)
+				for (k = 0; k < 5; k++)
+					oj*5+k = tmp.sk*VS32+j;
+#endif
+		}
+	}
+	else if (SSEi_flags & SSEi_OUTPUT_AS_INP_FMT)
+	{
+		if ((SSEi_flags & SSEi_OUTPUT_AS_2BUF_INP_FMT) == SSEi_OUTPUT_AS_2BUF_INP_FMT) {
+			SHA1_PARA_DO(i)
+			{
+				vstore((vtype*)&outi*32*VS32+0*VS32, ai);
+				vstore((vtype*)&outi*32*VS32+1*VS32, bi);
+				vstore((vtype*)&outi*32*VS32+2*VS32, ci);
+				vstore((vtype*)&outi*32*VS32+3*VS32, di);
+				vstore((vtype*)&outi*32*VS32+4*VS32, ei);
+			}
+		} else {
+			SHA1_PARA_DO(i)
+			{
+				vstore((vtype*)&outi*16*VS32+0*VS32, ai);
+				vstore((vtype*)&outi*16*VS32+1*VS32, bi);
+				vstore((vtype*)&outi*16*VS32+2*VS32, ci);
+				vstore((vtype*)&outi*16*VS32+3*VS32, di);
+				vstore((vtype*)&outi*16*VS32+4*VS32, ei);
+			}
+		}
+	}
+	else
+	{
+		SHA1_PARA_DO(i)
+		{
+			vstore((vtype*)&outi*5*VS32+0*VS32, ai);
+			vstore((vtype*)&outi*5*VS32+1*VS32, bi);
+			vstore((vtype*)&outi*5*VS32+2*VS32, ci);
+			vstore((vtype*)&outi*5*VS32+3*VS32, di);
+			vstore((vtype*)&outi*5*VS32+4*VS32, ei);
+		}
+	}
+}
+#endif /* SIMD_PARA_SHA1 */
+
+
+#if SIMD_PARA_SHA256
+
+/*
+ * These optimized Sigma alternatives are from "Fast SHA-256 Implementations
+ * on Intel Architecture Processors" whitepaper by Intel. They should result
+ * in less register copy operations but in our case they definitely cause a
+ * regression. Not sure why.
+ */
+#if 0
+#define S0(x) vroti_epi32(vxor(vroti_epi32(vxor(vroti_epi32(x, -9), x), -11), x), -2)
+#define S1(x) vroti_epi32(vxor(vroti_epi32(vxor(vroti_epi32(x, -14), x), -5), x), -6)
+#else
+#define S0(x)                                   \
+(                                               \
+    vxor(                                       \
+        vroti_epi32(x, -22),                    \
+        vxor(                                   \
+            vroti_epi32(x,  -2),                \
+            vroti_epi32(x, -13)                 \
+        )                                       \
+    )                                           \
+)
+
+#define S1(x)                                   \
+(                                               \
+    vxor(                                       \
+        vroti_epi32(x, -25),                    \
+        vxor(                                   \
+            vroti_epi32(x,  -6),                \
+            vroti_epi32(x, -11)                 \
+        )                                       \
+    )                                           \
+)
+#endif
+
+#define s0(x)                                   \
+(                                               \
+    vxor(                                       \
+        vsrli_epi32(x, 3),                      \
+        vxor(                                   \
+            vroti_epi32(x,  -7),                \
+            vroti_epi32(x, -18)                 \
+        )                                       \
+    )                                           \
+)
+
+#define s1(x)                                   \
+(                                               \
+    vxor(                                       \
+        vsrli_epi32(x, 10),                     \
+        vxor(                                   \
+            vroti_epi32(x, -17),                \
+            vroti_epi32(x, -19)                 \
+        )                                       \
+    )                                           \
+)
+
+#if __AVX512F__
+#define Maj(x,y,z) vternarylogic(x, y, z, 0xE8)
+#elif !VCMOV_EMULATED
+#define Maj(x,y,z) vcmov(x, y, vxor(z, y))
+#else
+#define Maj(x,y,z) vor(vand(x, y), vand(vor(x, y), z))
+#endif
+
+#define Ch(x,y,z) vcmov(y, z, x)
+
+#undef R
+#define R(t)                                                \
+{                                                           \
+    tmp1i = vadd_epi32(s1(w(t-2)&0xf), w(t-7)&0xf);   \
+    tmp2i = vadd_epi32(s0(w(t-15)&0xf), w(t-16)&0xf); \
+    w(t)&0xf = vadd_epi32(tmp1i, tmp2i);              \
+}
+
+#define SHA256_PARA_DO(x) for (x = 0; x < SIMD_PARA_SHA256; ++x)
+
+#define SHA256_STEP(a,b,c,d,e,f,g,h,x,K)                    \
+{                                                           \
+    SHA256_PARA_DO(i)                                       \
+    {                                                       \
+        w = _wi.w;                                        \
+        tmp1i = vadd_epi32(hi,    S1(ei));            \
+        tmp1i = vadd_epi32(tmp1i, Ch(ei,fi,gi));  \
+        tmp1i = vadd_epi32(tmp1i, vset1_epi32(K));      \
+        tmp1i = vadd_epi32(tmp1i, w(x)&0xf);          \
+        tmp2i = vadd_epi32(S0(ai),Maj(ai,bi,ci)); \
+        di    = vadd_epi32(tmp1i, di);                \
+        hi    = vadd_epi32(tmp1i, tmp2i);             \
+        if (x < 48) R(x);                                   \
+    }                                                       \
+}
+
+#define INIT_A 0x6a09e667
+#define INIT_B 0xbb67ae85
+#define INIT_C 0x3c6ef372
+#define INIT_D 0xa54ff53a
+#define INIT_E 0x510e527f
+#define INIT_F 0x9b05688c
+#define INIT_G 0x1f83d9ab
+#define INIT_H 0x5be0cd19
+
+#define ror(x, n)       ((x >> n) | (x << (32 - n)))
+
+void sha256_reverse(uint32_t *hash)
+{
+	uint32_t a, b, c, d, e, f, g, h, s0, maj, tmp;
+
+	a = hash0 - INIT_A;
+	b = hash1 - INIT_B;
+	c = hash2 - INIT_C;
+	d = hash3 - INIT_D;
+	e = hash4 - INIT_E;
+	f = hash5 - INIT_F;
+	g = hash6 - INIT_G;
+	h = hash7 - INIT_H;
+
+	s0 = ror(b, 2) ^ ror(b, 13) ^ ror(b, 22);
+	maj = (b & c) ^ (b & d) ^ (c & d);
+	tmp = d;
+	d = e - (a - (s0 + maj));
+	e = f;
+	f = g;
+	g = h;
+	a = b;
+	b = c;
+	c = tmp;
+
+	s0 = ror(b, 2) ^ ror(b, 13) ^ ror(b, 22);
+	maj = (b & c) ^ (b & d) ^ (c & d);
+	tmp = d;
+	d = e - (a - (s0 + maj));
+	e = f;
+	f = g;
+	a = b;
+	b = c;
+	c = tmp;
+
+	s0 = ror(b, 2) ^ ror(b, 13) ^ ror(b, 22);
+	maj = (b & c) ^ (b & d) ^ (c & d);
+	tmp = d;
+	d = e - (a - (s0 + maj));
+	e = f;
+	a = b;
+	b = c;
+	c = tmp;
+
+	s0 = ror(b, 2) ^ ror(b, 13) ^ ror(b, 22);
+	maj = (b & c) ^ (b & d) ^ (c & d);
+
+	hash0 = e - (a - (s0 + maj));
+}
+
+void sha256_unreverse()
+{
+	fprintf(stderr, "sha256_unreverse() not implemented\n");
+	perror("sha256_unreverse");
+}
+
+#undef ror
+
+#undef INIT_H
+#undef INIT_G
+#undef INIT_F
+#undef INIT_E
+#undef INIT_D
+#undef INIT_C
+#undef INIT_B
+#undef INIT_A
+
+#define INIT_D 0xf70e5939
+
+void sha224_reverse(uint32_t *hash)
+{
+	hash3 -= INIT_D;
+}
+
+void sha224_unreverse(uint32_t *hash)
+{
+	hash3 += INIT_D;
+}
+
+#undef INIT_D
+
+void SIMDSHA256body(vtype *data, ARCH_WORD_32 *out, ARCH_WORD_32 *reload_state, unsigned SSEi_flags)
+{
+	vtype aSIMD_PARA_SHA256,
+		  bSIMD_PARA_SHA256,
+		  cSIMD_PARA_SHA256,
+		  dSIMD_PARA_SHA256,
+		  eSIMD_PARA_SHA256,
+		  fSIMD_PARA_SHA256,
+		  gSIMD_PARA_SHA256,
+		  hSIMD_PARA_SHA256;
+	union {
+		vtype w16;
+		ARCH_WORD_32 p16*sizeof(vtype)/sizeof(ARCH_WORD_32);
+	}_wSIMD_PARA_SHA256;
+	vtype tmp1SIMD_PARA_SHA256, tmp2SIMD_PARA_SHA256, *w = NULL;
+	ARCH_WORD_32 *saved_key=0;
+
+	unsigned int i, k;
+	if (SSEi_flags & SSEi_FLAT_IN) {
+
+#if __SSE4_1__ || __MIC__
+		saved_key = (ARCH_WORD_32*)data;
+		SHA256_PARA_DO(k)
+		{
+			w = _wk.w;
+			if (SSEi_flags & SSEi_4BUF_INPUT) {
+				for (i=0; i < 14; ++i) {
+					GATHER_4x(wi, saved_key, i);
+					vswap32(wi);
+				}
+				GATHER_4x(w14, saved_key, 14);
+				GATHER_4x(w15, saved_key, 15);
+				saved_key += (VS32<<6);
+			} else if (SSEi_flags & SSEi_2BUF_INPUT) {
+				for (i=0; i < 14; ++i) {
+					GATHER_2x(wi, saved_key, i);
+					vswap32(wi);
+				}
+				GATHER_2x(w14, saved_key, 14);
+				GATHER_2x(w15, saved_key, 15);
+				saved_key += (VS32<<5);
+			} else {
+				for (i=0; i < 14; ++i) {
+					GATHER(wi, saved_key, i);
+					vswap32(wi);
+				}
+				GATHER(w14, saved_key, 14);
+				GATHER(w15, saved_key, 15);
+				saved_key += (VS32<<4);
+			}
+			if ( ((SSEi_flags & SSEi_2BUF_INPUT_FIRST_BLK) == SSEi_2BUF_INPUT_FIRST_BLK) ||
+				 ((SSEi_flags & SSEi_4BUF_INPUT_FIRST_BLK) == SSEi_4BUF_INPUT_FIRST_BLK) ||
+				 ((SSEi_flags & SSEi_FLAT_RELOAD_SWAPLAST) == SSEi_FLAT_RELOAD_SWAPLAST)) {
+				vswap32(w14);
+				vswap32(w15);
+			}
+		}
+#else
+		unsigned int j;
+		saved_key = (ARCH_WORD_32*)data;
+		SHA256_PARA_DO(k)
+		{
+			ARCH_WORD_32 *p = _wk.p;
+			w = _wk.w;
+			if (SSEi_flags & SSEi_4BUF_INPUT) {
+				for (j=0; j < 16; j++)
+					for (i=0; i < VS32; i++)
+						*p++ = saved_key(i<<6)+j;
+				saved_key += (VS32<<6);
+			} else if (SSEi_flags & SSEi_2BUF_INPUT) {
+				for (j=0; j < 16; j++)
+					for (i=0; i < VS32; i++)
+						*p++ = saved_key(i<<5)+j;
+				saved_key += (VS32<<5);
+			} else {
+				for (j=0; j < 16; j++)
+					for (i=0; i < VS32; i++)
+						*p++ = saved_key(i<<4)+j;
+				saved_key += (VS32<<4);
+			}
+			for (i=0; i < 14; i++)
+				vswap32(wi);
+			if ( ((SSEi_flags & SSEi_2BUF_INPUT_FIRST_BLK) == SSEi_2BUF_INPUT_FIRST_BLK) ||
+				 ((SSEi_flags & SSEi_4BUF_INPUT_FIRST_BLK) == SSEi_4BUF_INPUT_FIRST_BLK) ||
+				 ((SSEi_flags & SSEi_FLAT_RELOAD_SWAPLAST) == SSEi_FLAT_RELOAD_SWAPLAST)) {
+				vswap32(w14);
+				vswap32(w15);
+			}
+		}
+#endif
+	} else
+		memcpy(_w, data, 16*sizeof(vtype)*SIMD_PARA_SHA256);
+
+//	dump_stuff_shammx(w, 64, 0);
+
+
+	if (SSEi_flags & SSEi_RELOAD) {
+		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
+		{
+			SHA256_PARA_DO(i)
+			{
+				ai = vload((vtype*)&reload_statei*16*VS32+0*VS32);
+				bi = vload((vtype*)&reload_statei*16*VS32+1*VS32);
+				ci = vload((vtype*)&reload_statei*16*VS32+2*VS32);
+				di = vload((vtype*)&reload_statei*16*VS32+3*VS32);
+				ei = vload((vtype*)&reload_statei*16*VS32+4*VS32);
+				fi = vload((vtype*)&reload_statei*16*VS32+5*VS32);
+				gi = vload((vtype*)&reload_statei*16*VS32+6*VS32);
+				hi = vload((vtype*)&reload_statei*16*VS32+7*VS32);
+			}
+		}
+		else
+		{
+			SHA256_PARA_DO(i)
+			{
+				ai = vload((vtype*)&reload_statei*8*VS32+0*VS32);
+				bi = vload((vtype*)&reload_statei*8*VS32+1*VS32);
+				ci = vload((vtype*)&reload_statei*8*VS32+2*VS32);
+				di = vload((vtype*)&reload_statei*8*VS32+3*VS32);
+				ei = vload((vtype*)&reload_statei*8*VS32+4*VS32);
+				fi = vload((vtype*)&reload_statei*8*VS32+5*VS32);
+				gi = vload((vtype*)&reload_statei*8*VS32+6*VS32);
+				hi = vload((vtype*)&reload_statei*8*VS32+7*VS32);
+			}
+		}
+	} else {
+		if (SSEi_flags & SSEi_CRYPT_SHA224) {
+			SHA256_PARA_DO(i)
+			{
+				/* SHA-224 IV */
+				ai = vset1_epi32(0xc1059ed8);
+				bi = vset1_epi32(0x367cd507);
+				ci = vset1_epi32(0x3070dd17);
+				di = vset1_epi32(0xf70e5939);
+				ei = vset1_epi32(0xffc00b31);
+				fi = vset1_epi32(0x68581511);
+				gi = vset1_epi32(0x64f98fa7);
+				hi = vset1_epi32(0xbefa4fa4);
+			}
+		} else {
+			SHA256_PARA_DO(i)
+			{
+				// SHA-256 IV */
+				ai = vset1_epi32(0x6a09e667);
+				bi = vset1_epi32(0xbb67ae85);
+				ci = vset1_epi32(0x3c6ef372);
+				di = vset1_epi32(0xa54ff53a);
+				ei = vset1_epi32(0x510e527f);
+				fi = vset1_epi32(0x9b05688c);
+				gi = vset1_epi32(0x1f83d9ab);
+				hi = vset1_epi32(0x5be0cd19);
+			}
+		}
+	}
+
+	SHA256_STEP(a, b, c, d, e, f, g, h,  0, 0x428a2f98);
+	SHA256_STEP(h, a, b, c, d, e, f, g,  1, 0x71374491);
+	SHA256_STEP(g, h, a, b, c, d, e, f,  2, 0xb5c0fbcf);
+	SHA256_STEP(f, g, h, a, b, c, d, e,  3, 0xe9b5dba5);
+	SHA256_STEP(e, f, g, h, a, b, c, d,  4, 0x3956c25b);
+	SHA256_STEP(d, e, f, g, h, a, b, c,  5, 0x59f111f1);
+	SHA256_STEP(c, d, e, f, g, h, a, b,  6, 0x923f82a4);
+	SHA256_STEP(b, c, d, e, f, g, h, a,  7, 0xab1c5ed5);
+	SHA256_STEP(a, b, c, d, e, f, g, h,  8, 0xd807aa98);
+	SHA256_STEP(h, a, b, c, d, e, f, g,  9, 0x12835b01);
+	SHA256_STEP(g, h, a, b, c, d, e, f, 10, 0x243185be);
+	SHA256_STEP(f, g, h, a, b, c, d, e, 11, 0x550c7dc3);
+	SHA256_STEP(e, f, g, h, a, b, c, d, 12, 0x72be5d74);
+	SHA256_STEP(d, e, f, g, h, a, b, c, 13, 0x80deb1fe);
+	SHA256_STEP(c, d, e, f, g, h, a, b, 14, 0x9bdc06a7);
+	SHA256_STEP(b, c, d, e, f, g, h, a, 15, 0xc19bf174);
+
+	SHA256_STEP(a, b, c, d, e, f, g, h, 16, 0xe49b69c1);
+	SHA256_STEP(h, a, b, c, d, e, f, g, 17, 0xefbe4786);
+	SHA256_STEP(g, h, a, b, c, d, e, f, 18, 0x0fc19dc6);
+	SHA256_STEP(f, g, h, a, b, c, d, e, 19, 0x240ca1cc);
+	SHA256_STEP(e, f, g, h, a, b, c, d, 20, 0x2de92c6f);
+	SHA256_STEP(d, e, f, g, h, a, b, c, 21, 0x4a7484aa);
+	SHA256_STEP(c, d, e, f, g, h, a, b, 22, 0x5cb0a9dc);
+	SHA256_STEP(b, c, d, e, f, g, h, a, 23, 0x76f988da);
+	SHA256_STEP(a, b, c, d, e, f, g, h, 24, 0x983e5152);
+	SHA256_STEP(h, a, b, c, d, e, f, g, 25, 0xa831c66d);
+	SHA256_STEP(g, h, a, b, c, d, e, f, 26, 0xb00327c8);
+	SHA256_STEP(f, g, h, a, b, c, d, e, 27, 0xbf597fc7);
+	SHA256_STEP(e, f, g, h, a, b, c, d, 28, 0xc6e00bf3);
+	SHA256_STEP(d, e, f, g, h, a, b, c, 29, 0xd5a79147);
+	SHA256_STEP(c, d, e, f, g, h, a, b, 30, 0x06ca6351);
+	SHA256_STEP(b, c, d, e, f, g, h, a, 31, 0x14292967);
+
+	SHA256_STEP(a, b, c, d, e, f, g, h, 32, 0x27b70a85);
+	SHA256_STEP(h, a, b, c, d, e, f, g, 33, 0x2e1b2138);
+	SHA256_STEP(g, h, a, b, c, d, e, f, 34, 0x4d2c6dfc);
+	SHA256_STEP(f, g, h, a, b, c, d, e, 35, 0x53380d13);
+	SHA256_STEP(e, f, g, h, a, b, c, d, 36, 0x650a7354);
+	SHA256_STEP(d, e, f, g, h, a, b, c, 37, 0x766a0abb);
+	SHA256_STEP(c, d, e, f, g, h, a, b, 38, 0x81c2c92e);
+	SHA256_STEP(b, c, d, e, f, g, h, a, 39, 0x92722c85);
+	SHA256_STEP(a, b, c, d, e, f, g, h, 40, 0xa2bfe8a1);
+	SHA256_STEP(h, a, b, c, d, e, f, g, 41, 0xa81a664b);
+	SHA256_STEP(g, h, a, b, c, d, e, f, 42, 0xc24b8b70);
+	SHA256_STEP(f, g, h, a, b, c, d, e, 43, 0xc76c51a3);
+	SHA256_STEP(e, f, g, h, a, b, c, d, 44, 0xd192e819);
+	SHA256_STEP(d, e, f, g, h, a, b, c, 45, 0xd6990624);
+	SHA256_STEP(c, d, e, f, g, h, a, b, 46, 0xf40e3585);
+	SHA256_STEP(b, c, d, e, f, g, h, a, 47, 0x106aa070);
+
+	SHA256_STEP(a, b, c, d, e, f, g, h, 48, 0x19a4c116);
+	SHA256_STEP(h, a, b, c, d, e, f, g, 49, 0x1e376c08);
+	SHA256_STEP(g, h, a, b, c, d, e, f, 50, 0x2748774c);
+	SHA256_STEP(f, g, h, a, b, c, d, e, 51, 0x34b0bcb5);
+	SHA256_STEP(e, f, g, h, a, b, c, d, 52, 0x391c0cb3);
+	SHA256_STEP(d, e, f, g, h, a, b, c, 53, 0x4ed8aa4a);
+	SHA256_STEP(c, d, e, f, g, h, a, b, 54, 0x5b9cca4f);
+	SHA256_STEP(b, c, d, e, f, g, h, a, 55, 0x682e6ff3);
+	SHA256_STEP(a, b, c, d, e, f, g, h, 56, 0x748f82ee);
+
+	if (SSEi_flags & SSEi_REVERSE_STEPS && !(SSEi_flags & SSEi_CRYPT_SHA224))
+	{
+		SHA256_PARA_DO(i)
+		{
+			vstore((vtype*)&(outi*8*VS32+0*VS32), hi);
+		}
+		return;
+	}
+
+	SHA256_STEP(h, a, b, c, d, e, f, g, 57, 0x78a5636f);
+	SHA256_STEP(g, h, a, b, c, d, e, f, 58, 0x84c87814);
+	SHA256_STEP(f, g, h, a, b, c, d, e, 59, 0x8cc70208);
+	SHA256_STEP(e, f, g, h, a, b, c, d, 60, 0x90befffa);
+
+	if (SSEi_flags & SSEi_REVERSE_STEPS)
+	{
+		SHA256_PARA_DO(i)
+		{
+			vstore((vtype*)&(outi*8*VS32+3*VS32), di);
+		}
+		return;
+	}
+
+	SHA256_STEP(d, e, f, g, h, a, b, c, 61, 0xa4506ceb);
+	SHA256_STEP(c, d, e, f, g, h, a, b, 62, 0xbef9a3f7);
+	SHA256_STEP(b, c, d, e, f, g, h, a, 63, 0xc67178f2);
+
+	if (SSEi_flags & SSEi_RELOAD) {
+		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
+		{
+			SHA256_PARA_DO(i)
+			{
+				ai = vadd_epi32(ai,vload((vtype*)&reload_statei*16*VS32+0*VS32));
+				bi = vadd_epi32(bi,vload((vtype*)&reload_statei*16*VS32+1*VS32));
+				ci = vadd_epi32(ci,vload((vtype*)&reload_statei*16*VS32+2*VS32));
+				di = vadd_epi32(di,vload((vtype*)&reload_statei*16*VS32+3*VS32));
+				ei = vadd_epi32(ei,vload((vtype*)&reload_statei*16*VS32+4*VS32));
+				fi = vadd_epi32(fi,vload((vtype*)&reload_statei*16*VS32+5*VS32));
+				gi = vadd_epi32(gi,vload((vtype*)&reload_statei*16*VS32+6*VS32));
+				hi = vadd_epi32(hi,vload((vtype*)&reload_statei*16*VS32+7*VS32));
+			}
+		}
+		else
+		{
+			SHA256_PARA_DO(i)
+			{
+				ai = vadd_epi32(ai,vload((vtype*)&reload_statei*8*VS32+0*VS32));
+				bi = vadd_epi32(bi,vload((vtype*)&reload_statei*8*VS32+1*VS32));
+				ci = vadd_epi32(ci,vload((vtype*)&reload_statei*8*VS32+2*VS32));
+				di = vadd_epi32(di,vload((vtype*)&reload_statei*8*VS32+3*VS32));
+				ei = vadd_epi32(ei,vload((vtype*)&reload_statei*8*VS32+4*VS32));
+				fi = vadd_epi32(fi,vload((vtype*)&reload_statei*8*VS32+5*VS32));
+				gi = vadd_epi32(gi,vload((vtype*)&reload_statei*8*VS32+6*VS32));
+				hi = vadd_epi32(hi,vload((vtype*)&reload_statei*8*VS32+7*VS32));
+			}
+		}
+	} else {
+		if (SSEi_flags & SSEi_CRYPT_SHA224) {
+			SHA256_PARA_DO(i)
+			{
+				/* SHA-224 IV */
+				ai = vadd_epi32(ai, vset1_epi32(0xc1059ed8));
+				bi = vadd_epi32(bi, vset1_epi32(0x367cd507));
+				ci = vadd_epi32(ci, vset1_epi32(0x3070dd17));
+				di = vadd_epi32(di, vset1_epi32(0xf70e5939));
+				ei = vadd_epi32(ei, vset1_epi32(0xffc00b31));
+				fi = vadd_epi32(fi, vset1_epi32(0x68581511));
+				gi = vadd_epi32(gi, vset1_epi32(0x64f98fa7));
+				hi = vadd_epi32(hi, vset1_epi32(0xbefa4fa4));
+			}
+		} else {
+			SHA256_PARA_DO(i)
+			{
+				/* SHA-256 IV */
+				ai = vadd_epi32(ai, vset1_epi32(0x6a09e667));
+				bi = vadd_epi32(bi, vset1_epi32(0xbb67ae85));
+				ci = vadd_epi32(ci, vset1_epi32(0x3c6ef372));
+				di = vadd_epi32(di, vset1_epi32(0xa54ff53a));
+				ei = vadd_epi32(ei, vset1_epi32(0x510e527f));
+				fi = vadd_epi32(fi, vset1_epi32(0x9b05688c));
+				gi = vadd_epi32(gi, vset1_epi32(0x1f83d9ab));
+				hi = vadd_epi32(hi, vset1_epi32(0x5be0cd19));
+			}
+		}
+	}
+
+	if (SSEi_flags & SSEi_FLAT_OUT) {
+		SHA256_PARA_DO(i)
+		{
+			uint32_t *o = (uint32_t*)&outi*8*VS32;
+#if __AVX512F__ || __MIC__
+			vtype idxs = vset_epi32(15<<3,14<<3,13<<3,12<<3,
+			                        11<<3,10<<3, 9<<3, 8<<3,
+			                         7<<3, 6<<3, 5<<3, 4<<3,
+			                         3<<3, 2<<3, 1<<3, 0<<3);
+
+			vscatter_epi32(o + 0, idxs, vswap32(ai), 4);
+			vscatter_epi32(o + 1, idxs, vswap32(bi), 4);
+			vscatter_epi32(o + 2, idxs, vswap32(ci), 4);
+			vscatter_epi32(o + 3, idxs, vswap32(di), 4);
+			vscatter_epi32(o + 4, idxs, vswap32(ei), 4);
+			vscatter_epi32(o + 5, idxs, vswap32(fi), 4);
+			vscatter_epi32(o + 6, idxs, vswap32(gi), 4);
+			vscatter_epi32(o + 7, idxs, vswap32(hi), 4);
+#else
+			uint32_t j, k;
+			union {
+				vtype v8;
+				uint32_t s8 * VS32;
+			} tmp;
+
+			tmp.v0 = vswap32(ai);
+			tmp.v1 = vswap32(bi);
+			tmp.v2 = vswap32(ci);
+			tmp.v3 = vswap32(di);
+			tmp.v4 = vswap32(ei);
+			tmp.v5 = vswap32(fi);
+			tmp.v6 = vswap32(gi);
+			tmp.v7 = vswap32(hi);
+
+			for (j = 0; j < VS32; j++)
+				for (k = 0; k < 8; k++)
+					oj*8+k = tmp.sk*VS32+j;
+#endif
+		}
+	}
+	else if (SSEi_flags & SSEi_OUTPUT_AS_INP_FMT) {
+		if ((SSEi_flags & SSEi_OUTPUT_AS_2BUF_INP_FMT) == SSEi_OUTPUT_AS_2BUF_INP_FMT) {
+			SHA256_PARA_DO(i)
+			{
+				vstore((vtype*)&outi*32*VS32+0*VS32, ai);
+				vstore((vtype*)&outi*32*VS32+1*VS32, bi);
+				vstore((vtype*)&outi*32*VS32+2*VS32, ci);
+				vstore((vtype*)&outi*32*VS32+3*VS32, di);
+				vstore((vtype*)&outi*32*VS32+4*VS32, ei);
+				vstore((vtype*)&outi*32*VS32+5*VS32, fi);
+				vstore((vtype*)&outi*32*VS32+6*VS32, gi);
+				vstore((vtype*)&outi*32*VS32+7*VS32, hi);
+			}
+		} else {
+			SHA256_PARA_DO(i)
+			{
+				vstore((vtype*)&outi*16*VS32+0*VS32, ai);
+				vstore((vtype*)&outi*16*VS32+1*VS32, bi);
+				vstore((vtype*)&outi*16*VS32+2*VS32, ci);
+				vstore((vtype*)&outi*16*VS32+3*VS32, di);
+				vstore((vtype*)&outi*16*VS32+4*VS32, ei);
+				vstore((vtype*)&outi*16*VS32+5*VS32, fi);
+				vstore((vtype*)&outi*16*VS32+6*VS32, gi);
+				vstore((vtype*)&outi*16*VS32+7*VS32, hi);
+			}
+		}
+	}
+	else
+	{
+		SHA256_PARA_DO(i)
+		{
+			vstore((vtype*)&(outi*8*VS32+0*VS32), ai);
+			vstore((vtype*)&(outi*8*VS32+1*VS32), bi);
+			vstore((vtype*)&(outi*8*VS32+2*VS32), ci);
+			vstore((vtype*)&(outi*8*VS32+3*VS32), di);
+			vstore((vtype*)&(outi*8*VS32+4*VS32), ei);
+			vstore((vtype*)&(outi*8*VS32+5*VS32), fi);
+			vstore((vtype*)&(outi*8*VS32+6*VS32), gi);
+			vstore((vtype*)&(outi*8*VS32+7*VS32), hi);
+		}
+	}
+
+}
+#endif /* SIMD_PARA_SHA256 */
+
+
+#if SIMD_PARA_SHA512
+
+#undef S0
+#define S0(x)                                   \
+(                                               \
+    vxor(                                       \
+        vroti_epi64(x, -39),                    \
+        vxor(                                   \
+            vroti_epi64(x, -28),                \
+            vroti_epi64(x, -34)                 \
+        )                                       \
+    )                                           \
+)
+
+#undef S1
+#define S1(x)                                   \
+(                                               \
+    vxor(                                       \
+        vroti_epi64(x, -41),                    \
+        vxor(                                   \
+            vroti_epi64(x, -14),                \
+            vroti_epi64(x, -18)                 \
+        )                                       \
+    )                                           \
+)
+
+/*
+ * These optimized sigma alternatives are from "Fast SHA-512 Implementations
+ * on Intel Architecture Processors" whitepaper by Intel. They result in less
+ * register copy operations so is faster despite using more ops. Slight boost
+ * indeed seen on intel core i7.
+ */
+#if 1
+#undef s0
+#define s0(x)  (vxor(vsrli_epi64(vxor(vsrli_epi64(vxor(             \
+                     vsrli_epi64(x, 1), x), 6), x), 1),             \
+                     vslli_epi64(vxor(vslli_epi64(x, 7), x), 56)))
+#undef s1
+#define s1(x)  (vxor(vsrli_epi64(vxor(vsrli_epi64(vxor(             \
+                     vsrli_epi64(x, 42), x), 13), x), 6),           \
+                     vslli_epi64(vxor(vslli_epi64(x, 42), x), 3)))
+#else
+#undef s0
+#define s0(x)                                   \
+(                                               \
+    vxor(                                       \
+        vsrli_epi64(x, 7),                      \
+        vxor(                                   \
+            vroti_epi64(x, -1),                 \
+            vroti_epi64(x, -8)                  \
+        )                                       \
+    )                                           \
+)
+
+#undef s1
+#define s1(x)                                   \
+(                                               \
+    vxor(                                       \
+        vsrli_epi64(x, 6),                      \
+        vxor(                                   \
+            vroti_epi64(x, -19),                \
+            vroti_epi64(x, -61)                 \
+        )                                       \
+    )                                           \
+)
+#endif
+
+#if __AVX512F__
+#define Maj(x,y,z) vternarylogic(x, y, z, 0xE8)
+#elif !VCMOV_EMULATED
+#define Maj(x,y,z) vcmov(x, y, vxor(z, y))
+#else
+#define Maj(x,y,z) vor(vand(x, y), vand(vor(x, y), z))
+#endif
+
+#define Ch(x,y,z) vcmov(y, z, x)
+
+#define SHA512_PARA_DO(x) for (x = 0; x < SIMD_PARA_SHA512; ++x)
+
+#undef R
+#define R(t)                                                        \
+{                                                                   \
+    tmp1i = vadd_epi64(s1(wi(t-2)&0xf), wi(t-7)&0xf);     \
+    tmp2i = vadd_epi64(s0(wi(t-15)&0xf), wi(t-16)&0xf);   \
+    wi(t)&0xf = vadd_epi64(tmp1i, tmp2i);                   \
+}
+
+#define SHA512_STEP(a,b,c,d,e,f,g,h,x,K)                    \
+{                                                           \
+    SHA512_PARA_DO(i)                                       \
+    {                                                       \
+        tmp1i = vadd_epi64(hi,    wi(x)&0xf);       \
+        tmp2i = vadd_epi64(S1(ei),vset1_epi64(K));      \
+        tmp1i = vadd_epi64(tmp1i, Ch(ei,fi,gi));  \
+        tmp1i = vadd_epi64(tmp1i, tmp2i);             \
+        tmp2i = vadd_epi64(S0(ai),Maj(ai,bi,ci)); \
+        di    = vadd_epi64(tmp1i, di);                \
+        hi    = vadd_epi64(tmp1i, tmp2i);             \
+        if (x < 64) R(x);                                   \
+    }                                                       \
+}
+
+#define INIT_A 0x6a09e667f3bcc908ULL
+#define INIT_B 0xbb67ae8584caa73bULL
+#define INIT_C 0x3c6ef372fe94f82bULL
+#define INIT_D 0xa54ff53a5f1d36f1ULL
+#define INIT_E 0x510e527fade682d1ULL
+#define INIT_F 0x9b05688c2b3e6c1fULL
+#define INIT_G 0x1f83d9abfb41bd6bULL
+#define INIT_H 0x5be0cd19137e2179ULL
+
+#define ror(x, n)       ((x >> n) | (x << (64 - n)))
+
+void sha512_reverse(uint64_t *hash)
+{
+	uint64_t a, b, c, d, e, f, g, h, s0, maj, tmp;
+
+	a = hash0 - INIT_A;
+	b = hash1 - INIT_B;
+	c = hash2 - INIT_C;
+	d = hash3 - INIT_D;
+	e = hash4 - INIT_E;
+	f = hash5 - INIT_F;
+	g = hash6 - INIT_G;
+	h = hash7 - INIT_H;
+
+	s0 = ror(b, 28) ^ ror(b, 34) ^ ror(b, 39);
+	maj = (b & c) ^ (b & d) ^ (c & d);
+	tmp = d;
+	d = e - (a - (s0 + maj));
+	e = f;
+	f = g;
+	g = h;
+	a = b;
+	b = c;
+	c = tmp;
+
+	s0 = ror(b, 28) ^ ror(b, 34) ^ ror(b, 39);
+	maj = (b & c) ^ (b & d) ^ (c & d);
+	tmp = d;
+	d = e - (a - (s0 + maj));
+	e = f;
+	f = g;
+	a = b;
+	b = c;
+	c = tmp;
+
+	s0 = ror(b, 28) ^ ror(b, 34) ^ ror(b, 39);
+	maj = (b & c) ^ (b & d) ^ (c & d);
+	tmp = d;
+	d = e - (a - (s0 + maj));
+	e = f;
+	a = b;
+	b = c;
+	c = tmp;
+
+	s0 = ror(b, 28) ^ ror(b, 34) ^ ror(b, 39);
+	maj = (b & c) ^ (b & d) ^ (c & d);
+
+	hash0 = e - (a - (s0 + maj));
+}
+
+void sha512_unreverse()
+{
+	fprintf(stderr, "sha512_unreverse() not implemented\n");
+	perror("sha512");
+}
+
+#undef ror
+
+#undef INIT_H
+#undef INIT_G
+#undef INIT_F
+#undef INIT_E
+#undef INIT_D
+#undef INIT_C
+#undef INIT_B
+#undef INIT_A
+
+#define INIT_D 0x152fecd8f70e5939ULL
+
+void sha384_reverse(ARCH_WORD_64 *hash)
+{
+	hash3 -= INIT_D;
+}
+
+void sha384_unreverse(ARCH_WORD_64 *hash)
+{
+	hash3 += INIT_D;
+}
+
+#undef INIT_D
+
+void SIMDSHA512body(vtype* data, ARCH_WORD_64 *out, ARCH_WORD_64 *reload_state,
+                   unsigned SSEi_flags)
+{
+	unsigned int i, k;
+
+	vtype aSIMD_PARA_SHA512,
+	      bSIMD_PARA_SHA512,
+	      cSIMD_PARA_SHA512,
+	      dSIMD_PARA_SHA512,
+	      eSIMD_PARA_SHA512,
+	      fSIMD_PARA_SHA512,
+	      gSIMD_PARA_SHA512,
+	      hSIMD_PARA_SHA512;
+	vtype wSIMD_PARA_SHA51216;
+	vtype tmp1SIMD_PARA_SHA512, tmp2SIMD_PARA_SHA512;
+
+	if (SSEi_flags & SSEi_FLAT_IN) {
+		ARCH_WORD_64 *_data = (ARCH_WORD_64*)data;
+		SHA512_PARA_DO(k)
+		{
+			if (SSEi_flags & SSEi_2BUF_INPUT) {
+				ARCH_WORD_64 (*saved_key)32 = (ARCH_WORD_64(*)32)_data;
+				for (i = 0; i < 14; i += 2) {
+					GATHER64(tmp1k, saved_key, i);
+					GATHER64(tmp2k, saved_key, i + 1);
+					vswap64(tmp1k);
+					vswap64(tmp2k);
+					wki = tmp1k;
+					wki + 1 = tmp2k;
+				}
+				GATHER64(tmp1k, saved_key, 14);
+				GATHER64(tmp2k, saved_key, 15);
+				_data += (VS64<<5);
+			} else {
+				ARCH_WORD_64 (*saved_key)16 = (ARCH_WORD_64(*)16)_data;
+				for (i = 0; i < 14; i += 2) {
+					GATHER64(tmp1k, saved_key, i);
+					GATHER64(tmp2k, saved_key, i + 1);
+					vswap64(tmp1k);
+					vswap64(tmp2k);
+					wki = tmp1k;
+					wki + 1 = tmp2k;
+				}
+				GATHER64(tmp1k, saved_key, 14);
+				GATHER64(tmp2k, saved_key, 15);
+				_data += (VS64<<4);
+			}
+			if ( ((SSEi_flags & SSEi_2BUF_INPUT_FIRST_BLK) == SSEi_2BUF_INPUT_FIRST_BLK) ||
+				 ((SSEi_flags & SSEi_FLAT_RELOAD_SWAPLAST) == SSEi_FLAT_RELOAD_SWAPLAST)) {
+				vswap64(tmp1k);
+				vswap64(tmp2k);
+			}
+			wk14 = tmp1k;
+			wk15 = tmp2k;
+		}
+	} else
+		memcpy(w, data, 16 * sizeof(vtype) * SIMD_PARA_SHA512);
+
+	//dump_stuff_shammx64_msg("\nindex 2", w, 128, 2);
+
+	if (SSEi_flags & SSEi_RELOAD) {
+		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
+		{
+			SHA512_PARA_DO(i)
+			{
+				ai = vload((vtype*)&reload_statei*16*VS64+0*VS64);
+				bi = vload((vtype*)&reload_statei*16*VS64+1*VS64);
+				ci = vload((vtype*)&reload_statei*16*VS64+2*VS64);
+				di = vload((vtype*)&reload_statei*16*VS64+3*VS64);
+				ei = vload((vtype*)&reload_statei*16*VS64+4*VS64);
+				fi = vload((vtype*)&reload_statei*16*VS64+5*VS64);
+				gi = vload((vtype*)&reload_statei*16*VS64+6*VS64);
+				hi = vload((vtype*)&reload_statei*16*VS64+7*VS64);
+			}
+		}
+		else
+		{
+			SHA512_PARA_DO(i)
+			{
+				ai = vload((vtype*)&reload_statei*8*VS64+0*VS64);
+				bi = vload((vtype*)&reload_statei*8*VS64+1*VS64);
+				ci = vload((vtype*)&reload_statei*8*VS64+2*VS64);
+				di = vload((vtype*)&reload_statei*8*VS64+3*VS64);
+				ei = vload((vtype*)&reload_statei*8*VS64+4*VS64);
+				fi = vload((vtype*)&reload_statei*8*VS64+5*VS64);
+				gi = vload((vtype*)&reload_statei*8*VS64+6*VS64);
+				hi = vload((vtype*)&reload_statei*8*VS64+7*VS64);
+			}
+		}
+	} else {
+		if (SSEi_flags & SSEi_CRYPT_SHA384) {
+			SHA512_PARA_DO(i)
+			{
+				/* SHA-384 IV */
+				ai = vset1_epi64(0xcbbb9d5dc1059ed8ULL);
+				bi = vset1_epi64(0x629a292a367cd507ULL);
+				ci = vset1_epi64(0x9159015a3070dd17ULL);
+				di = vset1_epi64(0x152fecd8f70e5939ULL);
+				ei = vset1_epi64(0x67332667ffc00b31ULL);
+				fi = vset1_epi64(0x8eb44a8768581511ULL);
+				gi = vset1_epi64(0xdb0c2e0d64f98fa7ULL);
+				hi = vset1_epi64(0x47b5481dbefa4fa4ULL);
+			}
+		} else {
+			SHA512_PARA_DO(i)
+			{
+				/* SHA-512 IV */
+				ai = vset1_epi64(0x6a09e667f3bcc908ULL);
+				bi = vset1_epi64(0xbb67ae8584caa73bULL);
+				ci = vset1_epi64(0x3c6ef372fe94f82bULL);
+				di = vset1_epi64(0xa54ff53a5f1d36f1ULL);
+				ei = vset1_epi64(0x510e527fade682d1ULL);
+				fi = vset1_epi64(0x9b05688c2b3e6c1fULL);
+				gi = vset1_epi64(0x1f83d9abfb41bd6bULL);
+				hi = vset1_epi64(0x5be0cd19137e2179ULL);
+			}
+		}
+	}
+
+	SHA512_STEP(a, b, c, d, e, f, g, h,  0, 0x428a2f98d728ae22ULL);
+	SHA512_STEP(h, a, b, c, d, e, f, g,  1, 0x7137449123ef65cdULL);
+	SHA512_STEP(g, h, a, b, c, d, e, f,  2, 0xb5c0fbcfec4d3b2fULL);
+	SHA512_STEP(f, g, h, a, b, c, d, e,  3, 0xe9b5dba58189dbbcULL);
+	SHA512_STEP(e, f, g, h, a, b, c, d,  4, 0x3956c25bf348b538ULL);
+	SHA512_STEP(d, e, f, g, h, a, b, c,  5, 0x59f111f1b605d019ULL);
+	SHA512_STEP(c, d, e, f, g, h, a, b,  6, 0x923f82a4af194f9bULL);
+	SHA512_STEP(b, c, d, e, f, g, h, a,  7, 0xab1c5ed5da6d8118ULL);
+	SHA512_STEP(a, b, c, d, e, f, g, h,  8, 0xd807aa98a3030242ULL);
+	SHA512_STEP(h, a, b, c, d, e, f, g,  9, 0x12835b0145706fbeULL);
+	SHA512_STEP(g, h, a, b, c, d, e, f, 10, 0x243185be4ee4b28cULL);
+	SHA512_STEP(f, g, h, a, b, c, d, e, 11, 0x550c7dc3d5ffb4e2ULL);
+	SHA512_STEP(e, f, g, h, a, b, c, d, 12, 0x72be5d74f27b896fULL);
+	SHA512_STEP(d, e, f, g, h, a, b, c, 13, 0x80deb1fe3b1696b1ULL);
+	SHA512_STEP(c, d, e, f, g, h, a, b, 14, 0x9bdc06a725c71235ULL);
+	SHA512_STEP(b, c, d, e, f, g, h, a, 15, 0xc19bf174cf692694ULL);
+
+	SHA512_STEP(a, b, c, d, e, f, g, h, 16, 0xe49b69c19ef14ad2ULL);
+	SHA512_STEP(h, a, b, c, d, e, f, g, 17, 0xefbe4786384f25e3ULL);
+	SHA512_STEP(g, h, a, b, c, d, e, f, 18, 0x0fc19dc68b8cd5b5ULL);
+	SHA512_STEP(f, g, h, a, b, c, d, e, 19, 0x240ca1cc77ac9c65ULL);
+	SHA512_STEP(e, f, g, h, a, b, c, d, 20, 0x2de92c6f592b0275ULL);
+	SHA512_STEP(d, e, f, g, h, a, b, c, 21, 0x4a7484aa6ea6e483ULL);
+	SHA512_STEP(c, d, e, f, g, h, a, b, 22, 0x5cb0a9dcbd41fbd4ULL);
+	SHA512_STEP(b, c, d, e, f, g, h, a, 23, 0x76f988da831153b5ULL);
+	SHA512_STEP(a, b, c, d, e, f, g, h, 24, 0x983e5152ee66dfabULL);
+	SHA512_STEP(h, a, b, c, d, e, f, g, 25, 0xa831c66d2db43210ULL);
+	SHA512_STEP(g, h, a, b, c, d, e, f, 26, 0xb00327c898fb213fULL);
+	SHA512_STEP(f, g, h, a, b, c, d, e, 27, 0xbf597fc7beef0ee4ULL);
+	SHA512_STEP(e, f, g, h, a, b, c, d, 28, 0xc6e00bf33da88fc2ULL);
+	SHA512_STEP(d, e, f, g, h, a, b, c, 29, 0xd5a79147930aa725ULL);
+	SHA512_STEP(c, d, e, f, g, h, a, b, 30, 0x06ca6351e003826fULL);
+	SHA512_STEP(b, c, d, e, f, g, h, a, 31, 0x142929670a0e6e70ULL);
+
+	SHA512_STEP(a, b, c, d, e, f, g, h, 32, 0x27b70a8546d22ffcULL);
+	SHA512_STEP(h, a, b, c, d, e, f, g, 33, 0x2e1b21385c26c926ULL);
+	SHA512_STEP(g, h, a, b, c, d, e, f, 34, 0x4d2c6dfc5ac42aedULL);
+	SHA512_STEP(f, g, h, a, b, c, d, e, 35, 0x53380d139d95b3dfULL);
+	SHA512_STEP(e, f, g, h, a, b, c, d, 36, 0x650a73548baf63deULL);
+	SHA512_STEP(d, e, f, g, h, a, b, c, 37, 0x766a0abb3c77b2a8ULL);
+	SHA512_STEP(c, d, e, f, g, h, a, b, 38, 0x81c2c92e47edaee6ULL);
+	SHA512_STEP(b, c, d, e, f, g, h, a, 39, 0x92722c851482353bULL);
+	SHA512_STEP(a, b, c, d, e, f, g, h, 40, 0xa2bfe8a14cf10364ULL);
+	SHA512_STEP(h, a, b, c, d, e, f, g, 41, 0xa81a664bbc423001ULL);
+	SHA512_STEP(g, h, a, b, c, d, e, f, 42, 0xc24b8b70d0f89791ULL);
+	SHA512_STEP(f, g, h, a, b, c, d, e, 43, 0xc76c51a30654be30ULL);
+	SHA512_STEP(e, f, g, h, a, b, c, d, 44, 0xd192e819d6ef5218ULL);
+	SHA512_STEP(d, e, f, g, h, a, b, c, 45, 0xd69906245565a910ULL);
+	SHA512_STEP(c, d, e, f, g, h, a, b, 46, 0xf40e35855771202aULL);
+	SHA512_STEP(b, c, d, e, f, g, h, a, 47, 0x106aa07032bbd1b8ULL);
+
+	SHA512_STEP(a, b, c, d, e, f, g, h, 48, 0x19a4c116b8d2d0c8ULL);
+	SHA512_STEP(h, a, b, c, d, e, f, g, 49, 0x1e376c085141ab53ULL);
+	SHA512_STEP(g, h, a, b, c, d, e, f, 50, 0x2748774cdf8eeb99ULL);
+	SHA512_STEP(f, g, h, a, b, c, d, e, 51, 0x34b0bcb5e19b48a8ULL);
+	SHA512_STEP(e, f, g, h, a, b, c, d, 52, 0x391c0cb3c5c95a63ULL);
+	SHA512_STEP(d, e, f, g, h, a, b, c, 53, 0x4ed8aa4ae3418acbULL);
+	SHA512_STEP(c, d, e, f, g, h, a, b, 54, 0x5b9cca4f7763e373ULL);
+	SHA512_STEP(b, c, d, e, f, g, h, a, 55, 0x682e6ff3d6b2b8a3ULL);
+	SHA512_STEP(a, b, c, d, e, f, g, h, 56, 0x748f82ee5defb2fcULL);
+	SHA512_STEP(h, a, b, c, d, e, f, g, 57, 0x78a5636f43172f60ULL);
+	SHA512_STEP(g, h, a, b, c, d, e, f, 58, 0x84c87814a1f0ab72ULL);
+	SHA512_STEP(f, g, h, a, b, c, d, e, 59, 0x8cc702081a6439ecULL);
+	SHA512_STEP(e, f, g, h, a, b, c, d, 60, 0x90befffa23631e28ULL);
+	SHA512_STEP(d, e, f, g, h, a, b, c, 61, 0xa4506cebde82bde9ULL);
+	SHA512_STEP(c, d, e, f, g, h, a, b, 62, 0xbef9a3f7b2c67915ULL);
+	SHA512_STEP(b, c, d, e, f, g, h, a, 63, 0xc67178f2e372532bULL);
+
+	SHA512_STEP(a, b, c, d, e, f, g, h, 64, 0xca273eceea26619cULL);
+	SHA512_STEP(h, a, b, c, d, e, f, g, 65, 0xd186b8c721c0c207ULL);
+	SHA512_STEP(g, h, a, b, c, d, e, f, 66, 0xeada7dd6cde0eb1eULL);
+	SHA512_STEP(f, g, h, a, b, c, d, e, 67, 0xf57d4f7fee6ed178ULL);
+	SHA512_STEP(e, f, g, h, a, b, c, d, 68, 0x06f067aa72176fbaULL);
+	SHA512_STEP(d, e, f, g, h, a, b, c, 69, 0x0a637dc5a2c898a6ULL);
+	SHA512_STEP(c, d, e, f, g, h, a, b, 70, 0x113f9804bef90daeULL);
+	SHA512_STEP(b, c, d, e, f, g, h, a, 71, 0x1b710b35131c471bULL);
+	SHA512_STEP(a, b, c, d, e, f, g, h, 72, 0x28db77f523047d84ULL);
+
+	if (SSEi_flags & SSEi_REVERSE_STEPS && !(SSEi_flags & SSEi_CRYPT_SHA384))
+	{
+		SHA512_PARA_DO(i)
+		{
+			vstore((vtype*)&(outi*8*VS64+0*VS64), hi);
+		}
+		return;
+	}
+
+	SHA512_STEP(h, a, b, c, d, e, f, g, 73, 0x32caab7b40c72493ULL);
+	SHA512_STEP(g, h, a, b, c, d, e, f, 74, 0x3c9ebe0a15c9bebcULL);
+	SHA512_STEP(f, g, h, a, b, c, d, e, 75, 0x431d67c49c100d4cULL);
+	SHA512_STEP(e, f, g, h, a, b, c, d, 76, 0x4cc5d4becb3e42b6ULL);
+
+	if (SSEi_flags & SSEi_REVERSE_STEPS)
+	{
+		SHA512_PARA_DO(i)
+		{
+			vstore((vtype*)&(outi*8*VS64+3*VS64), di);
+		}
+		return;
+	}
+
+	SHA512_STEP(d, e, f, g, h, a, b, c, 77, 0x597f299cfc657e2aULL);
+	SHA512_STEP(c, d, e, f, g, h, a, b, 78, 0x5fcb6fab3ad6faecULL);
+	SHA512_STEP(b, c, d, e, f, g, h, a, 79, 0x6c44198c4a475817ULL);
+
+	if (SSEi_flags & SSEi_RELOAD) {
+		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
+		{
+			SHA512_PARA_DO(i)
+			{
+				ai = vadd_epi64(ai,vload((vtype*)&reload_statei*16*VS64+0*VS64));
+				bi = vadd_epi64(bi,vload((vtype*)&reload_statei*16*VS64+1*VS64));
+				ci = vadd_epi64(ci,vload((vtype*)&reload_statei*16*VS64+2*VS64));
+				di = vadd_epi64(di,vload((vtype*)&reload_statei*16*VS64+3*VS64));
+				ei = vadd_epi64(ei,vload((vtype*)&reload_statei*16*VS64+4*VS64));
+				fi = vadd_epi64(fi,vload((vtype*)&reload_statei*16*VS64+5*VS64));
+				gi = vadd_epi64(gi,vload((vtype*)&reload_statei*16*VS64+6*VS64));
+				hi = vadd_epi64(hi,vload((vtype*)&reload_statei*16*VS64+7*VS64));
+			}
+		}
+		else
+		{
+			SHA512_PARA_DO(i)
+			{
+				ai = vadd_epi64(ai,vload((vtype*)&reload_statei*8*VS64+0*VS64));
+				bi = vadd_epi64(bi,vload((vtype*)&reload_statei*8*VS64+1*VS64));
+				ci = vadd_epi64(ci,vload((vtype*)&reload_statei*8*VS64+2*VS64));
+				di = vadd_epi64(di,vload((vtype*)&reload_statei*8*VS64+3*VS64));
+				ei = vadd_epi64(ei,vload((vtype*)&reload_statei*8*VS64+4*VS64));
+				fi = vadd_epi64(fi,vload((vtype*)&reload_statei*8*VS64+5*VS64));
+				gi = vadd_epi64(gi,vload((vtype*)&reload_statei*8*VS64+6*VS64));
+				hi = vadd_epi64(hi,vload((vtype*)&reload_statei*8*VS64+7*VS64));
+			}
+		}
+	} else {
+		if (SSEi_flags & SSEi_CRYPT_SHA384) {
+			SHA512_PARA_DO(i)
+			{
+				/* SHA-384 IV */
+				ai = vadd_epi64(ai, vset1_epi64(0xcbbb9d5dc1059ed8ULL));
+				bi = vadd_epi64(bi, vset1_epi64(0x629a292a367cd507ULL));
+				ci = vadd_epi64(ci, vset1_epi64(0x9159015a3070dd17ULL));
+				di = vadd_epi64(di, vset1_epi64(0x152fecd8f70e5939ULL));
+				ei = vadd_epi64(ei, vset1_epi64(0x67332667ffc00b31ULL));
+				fi = vadd_epi64(fi, vset1_epi64(0x8eb44a8768581511ULL));
+				gi = vadd_epi64(gi, vset1_epi64(0xdb0c2e0d64f98fa7ULL));
+				hi = vadd_epi64(hi, vset1_epi64(0x47b5481dbefa4fa4ULL));
+			}
+		} else {
+			SHA512_PARA_DO(i)
+			{
+				/* SHA-512 IV */
+				ai = vadd_epi64(ai, vset1_epi64(0x6a09e667f3bcc908ULL));
+				bi = vadd_epi64(bi, vset1_epi64(0xbb67ae8584caa73bULL));
+				ci = vadd_epi64(ci, vset1_epi64(0x3c6ef372fe94f82bULL));
+				di = vadd_epi64(di, vset1_epi64(0xa54ff53a5f1d36f1ULL));
+				ei = vadd_epi64(ei, vset1_epi64(0x510e527fade682d1ULL));
+				fi = vadd_epi64(fi, vset1_epi64(0x9b05688c2b3e6c1fULL));
+				gi = vadd_epi64(gi, vset1_epi64(0x1f83d9abfb41bd6bULL));
+				hi = vadd_epi64(hi, vset1_epi64(0x5be0cd19137e2179ULL));
+			}
+		}
+	}
+
+	if (SSEi_flags & SSEi_FLAT_OUT) {
+		SHA512_PARA_DO(i)
+		{
+			uint64_t *o = (uint64_t*)&outi*8*VS64;
+#if __AVX512F__ || __MIC__
+			vtype idxs = vset_epi64(7<<3, 6<<3, 5<<3, 4<<3,
+			                        3<<3, 2<<3, 1<<3, 0<<3);
+
+			vscatter_epi64(o + 0, idxs, vswap64(ai), 8);
+			vscatter_epi64(o + 1, idxs, vswap64(bi), 8);
+			vscatter_epi64(o + 2, idxs, vswap64(ci), 8);
+			vscatter_epi64(o + 3, idxs, vswap64(di), 8);
+			vscatter_epi64(o + 4, idxs, vswap64(ei), 8);
+			vscatter_epi64(o + 5, idxs, vswap64(fi), 8);
+			vscatter_epi64(o + 6, idxs, vswap64(gi), 8);
+			vscatter_epi64(o + 7, idxs, vswap64(hi), 8);
+#else
+			uint64_t j, k;
+			union {
+				vtype v8;
+				uint64_t s8 * VS64;
+			} tmp;
+
+			tmp.v0 = vswap64(ai);
+			tmp.v1 = vswap64(bi);
+			tmp.v2 = vswap64(ci);
+			tmp.v3 = vswap64(di);
+			tmp.v4 = vswap64(ei);
+			tmp.v5 = vswap64(fi);
+			tmp.v6 = vswap64(gi);
+			tmp.v7 = vswap64(hi);
+
+			for (j = 0; j < VS64; j++)
+				for (k = 0; k < 8; k++)
+					oj*8+k = tmp.sk*VS64+j;
+#endif
+		}
+	}
+	else if (SSEi_flags & SSEi_OUTPUT_AS_INP_FMT)
+	{
+		if ((SSEi_flags & SSEi_OUTPUT_AS_2BUF_INP_FMT) == SSEi_OUTPUT_AS_2BUF_INP_FMT) {
+			SHA512_PARA_DO(i)
+			{
+				vstore((vtype*)&outi*32*VS64+0*VS64, ai);
+				vstore((vtype*)&outi*32*VS64+1*VS64, bi);
+				vstore((vtype*)&outi*32*VS64+2*VS64, ci);
+				vstore((vtype*)&outi*32*VS64+3*VS64, di);
+				vstore((vtype*)&outi*32*VS64+4*VS64, ei);
+				vstore((vtype*)&outi*32*VS64+5*VS64, fi);
+				vstore((vtype*)&outi*32*VS64+6*VS64, gi);
+				vstore((vtype*)&outi*32*VS64+7*VS64, hi);
+			}
+		} else {
+			SHA512_PARA_DO(i)
+			{
+				vstore((vtype*)&outi*16*VS64+0*VS64, ai);
+				vstore((vtype*)&outi*16*VS64+1*VS64, bi);
+				vstore((vtype*)&outi*16*VS64+2*VS64, ci);
+				vstore((vtype*)&outi*16*VS64+3*VS64, di);
+				vstore((vtype*)&outi*16*VS64+4*VS64, ei);
+				vstore((vtype*)&outi*16*VS64+5*VS64, fi);
+				vstore((vtype*)&outi*16*VS64+6*VS64, gi);
+				vstore((vtype*)&outi*16*VS64+7*VS64, hi);
+			}
+		}
+	}
+	else
+	{
+		SHA512_PARA_DO(i)
+		{
+			vstore((vtype*)&(outi*8*VS64+0*VS64), ai);
+			vstore((vtype*)&(outi*8*VS64+1*VS64), bi);
+			vstore((vtype*)&(outi*8*VS64+2*VS64), ci);
+			vstore((vtype*)&(outi*8*VS64+3*VS64), di);
+			vstore((vtype*)&(outi*8*VS64+4*VS64), ei);
+			vstore((vtype*)&(outi*8*VS64+5*VS64), fi);
+			vstore((vtype*)&(outi*8*VS64+6*VS64), gi);
+			vstore((vtype*)&(outi*8*VS64+7*VS64), hi);
+		}
+	}
+}
+
+#endif /* SIMD_PARA_SHA512 */

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 out0-=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_i640 = b; x.m128i_i641 = a;
+	return x;
+}
+_inline __m128i _mm_set1_epi64x(long long a)
+{
+	__m128i x; x.m128i_i640 = x.m128i_i641 = a;
+	return x;
+}
+#endif
+
+#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(__clang__) && !defined(__llvm__) && !defined (_MSC_VER)
+#pragma GCC optimize 3
+#endif
+
+#ifdef __XOP__
+// for non XOP, we have a 'special' 16 bit roti. So we simply define
+// it back to the real roti intrinsic.
+#define _mm_roti16_epi32	_mm_roti_epi32
+#else
+  #define _mm_slli_epi32a(a, s)		\
+	((s) == 1 ?						\
+		_mm_add_epi32((a), (a))		\
+	:								\
+		_mm_slli_epi32((a), (s)))
+
+  #define _mm_cmov_si128(y,z,x)		\
+	(_mm_xor_si128(z, _mm_and_si128(x, _mm_xor_si128 (y,z))))
+
+  // XOP roti must handle both ROTL and ROTR. If s < 0, then ROTR. Else ROTL
+  // There's a specialized rotate16, which is specialized for ssse3+
+  #define _mm_roti_epi32(a, s)													\
+	((s) < 0 ?																	\
+		_mm_or_si128(_mm_srli_epi32((a), ~(s)+1), _mm_slli_epi32a((a),32+(s)))	\
+	:																			\
+		_mm_or_si128(_mm_slli_epi32a((a), (s)), _mm_srli_epi32((a), 32-(s))))
+
+  // 64 bit roti  (both ROTL and ROTR handled)
+  #define _mm_roti_epi64(a, s)													\
+	((s) < 0 ?																	\
+		_mm_or_si128(_mm_srli_epi64((a), ~(s)+1), _mm_slli_epi64((a),64+(s)))	\
+	:																			\
+		_mm_or_si128(_mm_slli_epi64((a), (s)), _mm_srli_epi64((a), 64-(s))))
+
+  #ifdef __SSSE3__
+    #define rot16_mask				\
+		_mm_set_epi32(0x0d0c0f0e, 0x09080b0a, 0x05040706, 0x01000302)
+
+    #define _mm_roti16_epi32(a,s)	\
+		(_mm_shuffle_epi8((a), rot16_mask))
+  #else
+    #define _mm_roti16_epi32(a,s)		\
+		(_mm_shufflelo_epi16(_mm_shufflehi_epi16((a), 0xb1), 0xb1))
+  #endif
+#endif
+
+#ifdef __SSSE3__
+
+#ifndef __XOP__
+  #define rot16_mask				\
+	_mm_set_epi32(0x0d0c0f0e, 0x09080b0a, 0x05040706, 0x01000302)
+
+  #define _mm_roti16_epi32(a,s)	\
+	(_mm_shuffle_epi8((a), rot16_mask))
+#endif
+
+  #define swap_endian_mask		\
+	_mm_set_epi32(0x0c0d0e0f, 0x08090a0b, 0x04050607, 0x00010203)
+  #define swap_endian64_mask		\
+	_mm_set_epi64x(0x08090a0b0c0d0e0fULL, 0x0001020304050607ULL)
+
+  #define SWAP_ENDIAN(n)			\
+	(n = _mm_shuffle_epi8(n, swap_endian_mask))
+  #define SWAP_ENDIAN64(n)		\
+	(n = _mm_shuffle_epi8(n, swap_endian64_mask))
+ #else
+  #define SWAP_ENDIAN(n)			\
+	(n = _mm_xor_si128(				\
+		_mm_srli_epi16(				\
+			_mm_roti16_epi32(n,16), 8),	\
+			_mm_slli_epi16(_mm_roti16_epi32(n,16), 8)))
+  #define SWAP_ENDIAN64(n)                                                \
+  {                                                                       \
+    n = _mm_shufflehi_epi16 (_mm_shufflelo_epi16 (n, 0xb1), 0xb1);        \
+    n = _mm_xor_si128 (_mm_slli_epi16 (n, 8), _mm_srli_epi16 (n, 8));     \
+    n = _mm_shuffle_epi32 (n, 0xb1);                                      \
+  }
+#endif
+
+#ifdef __SSE4_1__
+#define GATHER_4x(x, y, z)                      \
+{                                               \
+    x = _mm_cvtsi32_si128 (   yz   );         \
+    x = _mm_insert_epi32  (x, yz+(1<<6), 1);  \
+    x = _mm_insert_epi32  (x, yz+(2<<6), 2);  \
+    x = _mm_insert_epi32  (x, yz+(3<<6), 3);  \
+}
+#define GATHER_2x(x, y, z)                      \
+{                                               \
+    x = _mm_cvtsi32_si128 (   yz   );         \
+    x = _mm_insert_epi32  (x, yz+(1<<5), 1);  \
+    x = _mm_insert_epi32  (x, yz+(2<<5), 2);  \
+    x = _mm_insert_epi32  (x, yz+(3<<5), 3);  \
+}
+#define GATHER(x, y, z)                         \
+{                                               \
+    x = _mm_cvtsi32_si128 (   yz   );    \
+    x = _mm_insert_epi32  (x, yz+(1<<4), 1);  \
+    x = _mm_insert_epi32  (x, yz+(2<<4), 2);  \
+    x = _mm_insert_epi32  (x, yz+(3<<4), 3);  \
+}
+#endif
+#define GATHER64(x,y,z)		{x = _mm_set_epi64x (y1z, y0z);}
+
+
+#ifndef MMX_COEF
+#define MMX_COEF 4
+#endif
+
+#ifdef MD5_SSE_PARA
+#define MD5_SSE_NUM_KEYS	(MMX_COEF*MD5_SSE_PARA)
+#define MD5_PARA_DO(x)	for((x)=0;(x)<MD5_SSE_PARA;(x)++)
+
+#define MD5_F(x,y,z) \
+	MD5_PARA_DO(i) tmpi = _mm_cmov_si128((yi),(zi),(xi));
+
+#define MD5_G(x,y,z) \
+	MD5_PARA_DO(i) tmpi = _mm_cmov_si128((xi),(yi),(zi));
+
+#define MD5_H(x,y,z) \
+	MD5_PARA_DO(i) tmpi = _mm_xor_si128((yi),(zi)); \
+	MD5_PARA_DO(i) tmpi = _mm_xor_si128((tmpi),(xi));
+
+#define MD5_I(x,y,z) \
+	MD5_PARA_DO(i) tmpi = _mm_andnot_si128((zi), mask); \
+	MD5_PARA_DO(i) tmpi = _mm_or_si128((tmpi),(xi)); \
+	MD5_PARA_DO(i) tmpi = _mm_xor_si128((tmpi),(yi));
+
+#define MD5_STEP(f, a, b, c, d, x, t, s) \
+	MD5_PARA_DO(i) ai = _mm_add_epi32( ai, _mm_set_epi32(t,t,t,t) ); \
+	f((b),(c),(d)) \
+	MD5_PARA_DO(i) ai = _mm_add_epi32( ai, tmpi ); \
+	MD5_PARA_DO(i) ai = _mm_add_epi32( ai, datai*16+x ); \
+	MD5_PARA_DO(i) ai = _mm_roti_epi32( ai, (s) ); \
+	MD5_PARA_DO(i) ai = _mm_add_epi32( ai, bi );
+
+#define MD5_STEP_r16(f, a, b, c, d, x, t, s) \
+	MD5_PARA_DO(i) ai = _mm_add_epi32( ai, _mm_set_epi32(t,t,t,t) ); \
+	f((b),(c),(d)) \
+	MD5_PARA_DO(i) ai = _mm_add_epi32( ai, tmpi ); \
+	MD5_PARA_DO(i) ai = _mm_add_epi32( ai, datai*16+x ); \
+	MD5_PARA_DO(i) ai = _mm_roti16_epi32( ai, (s) ); \
+	MD5_PARA_DO(i) ai = _mm_add_epi32( ai, bi );
+
+void SSEmd5body(__m128i* _data, unsigned int * out, ARCH_WORD_32 *reload_state, unsigned SSEi_flags)
+{
+	__m128i w16*MD5_SSE_PARA;
+	__m128i aMD5_SSE_PARA;
+	__m128i bMD5_SSE_PARA;
+	__m128i cMD5_SSE_PARA;
+	__m128i dMD5_SSE_PARA;
+	__m128i tmpMD5_SSE_PARA;
+	__m128i mask;
+	unsigned int i;
+	__m128i *data;
+
+	mask = _mm_set1_epi32(0Xffffffff);
+
+	if(SSEi_flags & SSEi_FLAT_IN) {
+		// Move _data to __data, mixing it MMX_COEF wise.
+#ifdef __SSE4_1__
+		unsigned k;
+		__m128i *W = w;
+		ARCH_WORD_32 *saved_key = (ARCH_WORD_32 *)_data;
+		MD5_PARA_DO(k)
+		{
+			if (SSEi_flags & SSEi_4BUF_INPUT) {
+				for (i=0; i < 16; ++i) { GATHER_4x (Wi, saved_key, i); }
+				saved_key += (MMX_COEF<<6);
+			} else if (SSEi_flags & SSEi_2BUF_INPUT) {
+				for (i=0; i < 16; ++i) { GATHER_2x (Wi, saved_key, i); }
+				saved_key += (MMX_COEF<<5);
+			} else {
+				for (i=0; i < 16; ++i) { GATHER (Wi, saved_key, i); }
+				saved_key += (MMX_COEF<<4);
+			}
+			W += 16;
+		}
+#else
+		unsigned j, k;
+		ARCH_WORD_32 *p = (ARCH_WORD_32 *)w;
+		__m128i *W = w;
+		ARCH_WORD_32 *saved_key = (ARCH_WORD_32 *)_data;
+		MD5_PARA_DO(k)
+		{
+			if (SSEi_flags & SSEi_4BUF_INPUT) {
+				for (j=0; j < 16; j++)
+					for (i=0; i < MMX_COEF; i++)
+						*p++ = saved_key(i<<6)+j;
+				saved_key += (MMX_COEF<<6);
+			} else if (SSEi_flags & SSEi_2BUF_INPUT) {
+				for (j=0; j < 16; j++)
+					for (i=0; i < MMX_COEF; i++)
+						*p++ = saved_key(i<<5)+j;
+				saved_key += (MMX_COEF<<5);
+			} else {
+				for (j=0; j < 16; j++)
+					for (i=0; i < MMX_COEF; i++)
+						*p++ = saved_key(i<<4)+j;
+				saved_key += (MMX_COEF<<4);
+			}
+			W += 16;
+		}
+#endif
+		// now set our data pointer to point to this 'mixed' data.
+		data = w;
+	} else
+		data = _data;
+
+	if((SSEi_flags & SSEi_RELOAD)==0)
+	{
+		MD5_PARA_DO(i)
+		{
+			ai = _mm_set1_epi32(0x67452301);
+			bi = _mm_set1_epi32(0xefcdab89);
+			ci = _mm_set1_epi32(0x98badcfe);
+			di = _mm_set1_epi32(0x10325476);
+		}
+	}
+	else
+	{
+		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
+		{
+			MD5_PARA_DO(i)
+			{
+				ai = _mm_load_si128((__m128i *)&reload_statei*16*4+0);
+				bi = _mm_load_si128((__m128i *)&reload_statei*16*4+4);
+				ci = _mm_load_si128((__m128i *)&reload_statei*16*4+8);
+				di = _mm_load_si128((__m128i *)&reload_statei*16*4+12);
+			}
+		}
+		else
+		{
+			MD5_PARA_DO(i)
+			{
+				ai = _mm_load_si128((__m128i *)&reload_statei*16+0);
+				bi = _mm_load_si128((__m128i *)&reload_statei*16+4);
+				ci = _mm_load_si128((__m128i *)&reload_statei*16+8);
+				di = _mm_load_si128((__m128i *)&reload_statei*16+12);
+			}
+		}
+	}
+
+/* Round 1 */
+		MD5_STEP(MD5_F, a, b, c, d, 0, 0xd76aa478, 7)
+		MD5_STEP(MD5_F, d, a, b, c, 1, 0xe8c7b756, 12)
+		MD5_STEP(MD5_F, c, d, a, b, 2, 0x242070db, 17)
+		MD5_STEP(MD5_F, b, c, d, a, 3, 0xc1bdceee, 22)
+		MD5_STEP(MD5_F, a, b, c, d, 4, 0xf57c0faf, 7)
+		MD5_STEP(MD5_F, d, a, b, c, 5, 0x4787c62a, 12)
+		MD5_STEP(MD5_F, c, d, a, b, 6, 0xa8304613, 17)
+		MD5_STEP(MD5_F, b, c, d, a, 7, 0xfd469501, 22)
+		MD5_STEP(MD5_F, a, b, c, d, 8, 0x698098d8, 7)
+		MD5_STEP(MD5_F, d, a, b, c, 9, 0x8b44f7af, 12)
+		MD5_STEP(MD5_F, c, d, a, b, 10, 0xffff5bb1, 17)
+		MD5_STEP(MD5_F, b, c, d, a, 11, 0x895cd7be, 22)
+		MD5_STEP(MD5_F, a, b, c, d, 12, 0x6b901122, 7)
+		MD5_STEP(MD5_F, d, a, b, c, 13, 0xfd987193, 12)
+		MD5_STEP(MD5_F, c, d, a, b, 14, 0xa679438e, 17)
+		MD5_STEP(MD5_F, b, c, d, a, 15, 0x49b40821, 22)
+
+/* Round 2 */
+		MD5_STEP(MD5_G, a, b, c, d, 1, 0xf61e2562, 5)
+		MD5_STEP(MD5_G, d, a, b, c, 6, 0xc040b340, 9)
+		MD5_STEP(MD5_G, c, d, a, b, 11, 0x265e5a51, 14)
+		MD5_STEP(MD5_G, b, c, d, a, 0, 0xe9b6c7aa, 20)
+		MD5_STEP(MD5_G, a, b, c, d, 5, 0xd62f105d, 5)
+		MD5_STEP(MD5_G, d, a, b, c, 10, 0x02441453, 9)
+		MD5_STEP(MD5_G, c, d, a, b, 15, 0xd8a1e681, 14)
+		MD5_STEP(MD5_G, b, c, d, a, 4, 0xe7d3fbc8, 20)
+		MD5_STEP(MD5_G, a, b, c, d, 9, 0x21e1cde6, 5)
+		MD5_STEP(MD5_G, d, a, b, c, 14, 0xc33707d6, 9)
+		MD5_STEP(MD5_G, c, d, a, b, 3, 0xf4d50d87, 14)
+		MD5_STEP(MD5_G, b, c, d, a, 8, 0x455a14ed, 20)
+		MD5_STEP(MD5_G, a, b, c, d, 13, 0xa9e3e905, 5)
+		MD5_STEP(MD5_G, d, a, b, c, 2, 0xfcefa3f8, 9)
+		MD5_STEP(MD5_G, c, d, a, b, 7, 0x676f02d9, 14)
+		MD5_STEP(MD5_G, b, c, d, a, 12, 0x8d2a4c8a, 20)
+
+/* Round 3 */
+		MD5_STEP(MD5_H, a, b, c, d, 5, 0xfffa3942, 4)
+		MD5_STEP(MD5_H, d, a, b, c, 8, 0x8771f681, 11)
+		MD5_STEP_r16(MD5_H, c, d, a, b, 11, 0x6d9d6122, 16)
+		MD5_STEP(MD5_H, b, c, d, a, 14, 0xfde5380c, 23)
+		MD5_STEP(MD5_H, a, b, c, d, 1, 0xa4beea44, 4)
+		MD5_STEP(MD5_H, d, a, b, c, 4, 0x4bdecfa9, 11)
+		MD5_STEP_r16(MD5_H, c, d, a, b, 7, 0xf6bb4b60, 16)
+		MD5_STEP(MD5_H, b, c, d, a, 10, 0xbebfbc70, 23)
+		MD5_STEP(MD5_H, a, b, c, d, 13, 0x289b7ec6, 4)
+		MD5_STEP(MD5_H, d, a, b, c, 0, 0xeaa127fa, 11)
+		MD5_STEP_r16(MD5_H, c, d, a, b, 3, 0xd4ef3085, 16)
+		MD5_STEP(MD5_H, b, c, d, a, 6, 0x04881d05, 23)
+		MD5_STEP(MD5_H, a, b, c, d, 9, 0xd9d4d039, 4)
+		MD5_STEP(MD5_H, d, a, b, c, 12, 0xe6db99e5, 11)
+		MD5_STEP_r16(MD5_H, c, d, a, b, 15, 0x1fa27cf8, 16)
+		MD5_STEP(MD5_H, b, c, d, a, 2, 0xc4ac5665, 23)
+
+/* Round 4 */
+		MD5_STEP(MD5_I, a, b, c, d, 0, 0xf4292244, 6)
+		MD5_STEP(MD5_I, d, a, b, c, 7, 0x432aff97, 10)
+		MD5_STEP(MD5_I, c, d, a, b, 14, 0xab9423a7, 15)
+		MD5_STEP(MD5_I, b, c, d, a, 5, 0xfc93a039, 21)
+		MD5_STEP(MD5_I, a, b, c, d, 12, 0x655b59c3, 6)
+		MD5_STEP(MD5_I, d, a, b, c, 3, 0x8f0ccc92, 10)
+		MD5_STEP(MD5_I, c, d, a, b, 10, 0xffeff47d, 15)
+		MD5_STEP(MD5_I, b, c, d, a, 1, 0x85845dd1, 21)
+		MD5_STEP(MD5_I, a, b, c, d, 8, 0x6fa87e4f, 6)
+		MD5_STEP(MD5_I, d, a, b, c, 15, 0xfe2ce6e0, 10)
+		MD5_STEP(MD5_I, c, d, a, b, 6, 0xa3014314, 15)
+		MD5_STEP(MD5_I, b, c, d, a, 13, 0x4e0811a1, 21)
+		MD5_STEP(MD5_I, a, b, c, d, 4, 0xf7537e82, 6)
+		MD5_STEP(MD5_I, d, a, b, c, 11, 0xbd3af235, 10)
+		MD5_STEP(MD5_I, c, d, a, b, 2, 0x2ad7d2bb, 15)
+		MD5_STEP(MD5_I, b, c, d, a, 9, 0xeb86d391, 21)
+
+	if((SSEi_flags & SSEi_RELOAD)==0)
+	{
+		MD5_PARA_DO(i)
+		{
+			ai = _mm_add_epi32(ai, _mm_set1_epi32(0x67452301));
+			bi = _mm_add_epi32(bi, _mm_set1_epi32(0xefcdab89));
+			ci = _mm_add_epi32(ci, _mm_set1_epi32(0x98badcfe));
+			di = _mm_add_epi32(di, _mm_set1_epi32(0x10325476));
+		}
+	}
+	else
+	{
+		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
+		{
+			MD5_PARA_DO(i)
+			{
+				ai = _mm_add_epi32(ai, _mm_load_si128((__m128i *)&reload_statei*16*4+0));
+				bi = _mm_add_epi32(bi, _mm_load_si128((__m128i *)&reload_statei*16*4+4));
+				ci = _mm_add_epi32(ci, _mm_load_si128((__m128i *)&reload_statei*16*4+8));
+				di = _mm_add_epi32(di, _mm_load_si128((__m128i *)&reload_statei*16*4+12));
+			}
+		}
+		else
+		{
+			MD5_PARA_DO(i)
+			{
+				ai = _mm_add_epi32(ai, _mm_load_si128((__m128i *)&reload_statei*16+0));
+				bi = _mm_add_epi32(bi, _mm_load_si128((__m128i *)&reload_statei*16+4));
+				ci = _mm_add_epi32(ci, _mm_load_si128((__m128i *)&reload_statei*16+8));
+				di = _mm_add_epi32(di, _mm_load_si128((__m128i *)&reload_statei*16+12));
+			}
+		}
+	}
+	if (SSEi_flags & SSEi_OUTPUT_AS_INP_FMT)
+	{
+		MD5_PARA_DO(i)
+		{
+			_mm_store_si128((__m128i *)&outi*16*4+0, ai);
+			_mm_store_si128((__m128i *)&outi*16*4+4, bi);
+			_mm_store_si128((__m128i *)&outi*16*4+8, ci);
+			_mm_store_si128((__m128i *)&outi*16*4+12, di);
+		}
+	}
+	else
+	{
+		MD5_PARA_DO(i)
+		{
+			_mm_store_si128((__m128i *)&outi*16+0, ai);
+			_mm_store_si128((__m128i *)&outi*16+4, bi);
+			_mm_store_si128((__m128i *)&outi*16+8, ci);
+			_mm_store_si128((__m128i *)&outi*16+12, di);
+		}
+	}
+}
+
+#define GETPOS(i, index)                ( (index&3)*4 + (i& (0xffffffff-3) )*MMX_COEF + ((i)&3) )
+
+static MAYBE_INLINE void mmxput(void * buf, unsigned int index, unsigned int bid, unsigned int offset, unsigned char * src, unsigned int len)
+{
+	unsigned char * nbuf;
+	unsigned int i;
+
+	nbuf = ((unsigned char*)buf) + (index>>2)*64*MMX_COEF + bid*64*MD5_SSE_NUM_KEYS;
+	for(i=0;i<len;i++)
+		nbuf GETPOS((offset+i), index)  = srci;
+
+}
+
+static MAYBE_INLINE void mmxput2(void * buf, unsigned int bid, void * src)
+{
+	unsigned char * nbuf;
+	unsigned int i;
+
+	nbuf = ((unsigned char*)buf) + bid*64*MD5_SSE_NUM_KEYS;
+	MD5_PARA_DO(i)
+		memcpy( nbuf+i*64*MMX_COEF, ((unsigned char*)src)+i*64, 64);
+}
+
+static MAYBE_INLINE void mmxput3(void * buf, unsigned int bid, unsigned int * offset, int mult, int saltlen, void * src)
+{
+	unsigned char * nbuf;
+	unsigned int noff;
+	unsigned int noffd;
+	unsigned int i,j;
+	unsigned int dec;
+
+	MD5_PARA_DO(j)
+	{
+		nbuf = ((unsigned char*)buf) + bid*64*MD5_SSE_NUM_KEYS + j*64*MMX_COEF;
+		for(i=0;i<MMX_COEF;i++)
+		{
+			noff = offseti+j*MMX_COEF*mult + saltlen;
+			dec = (noff&3)*8;
+			if(dec)
+			{
+				noffd = noff & (~3);
+				((unsigned int *)(nbuf+noffd*4))i &= (0xffffffff>>(32-dec));
+				((unsigned int *)(nbuf+noffd*4))i |= (((unsigned int *)src)i+j*16+0 << dec);
+				((unsigned int *)(nbuf+noffd*4))i+4 = (((unsigned int *)src)i+j*16+4 << dec) | (((unsigned int *)src)i+j*16+0 >> (32-dec));
+				((unsigned int *)(nbuf+noffd*4))i+8 = (((unsigned int *)src)i+j*16+8 << dec) | (((unsigned int *)src)i+j*16+4 >> (32-dec));
+				((unsigned int *)(nbuf+noffd*4))i+12 = (((unsigned int *)src)i+j*16+12 << dec) | (((unsigned int *)src)i+j*16+8 >> (32-dec));
+				((unsigned int *)(nbuf+noffd*4))i+16 &= (0xffffffff<<dec);
+				((unsigned int *)(nbuf+noffd*4))i+16 |= (((unsigned int *)src)i+j*16+12 >> (32-dec));
+			}
+			else
+			{
+				((unsigned int *)(nbuf+noff*4))i = ((unsigned int *)src)i+j*16+0;
+				((unsigned int *)(nbuf+noff*4))i+4 = ((unsigned int *)src)i+j*16+4;
+				((unsigned int *)(nbuf+noff*4))i+8 = ((unsigned int *)src)i+j*16+8;
+				((unsigned int *)(nbuf+noff*4))i+12 = ((unsigned int *)src)i+j*16+12;
+			}
+		}
+	}
+
+}
+
+static MAYBE_INLINE void dispatch(unsigned char buffers864*MD5_SSE_NUM_KEYS, unsigned int f4*MD5_SSE_NUM_KEYS, unsigned int lengthMD5_SSE_NUM_KEYS, unsigned int saltlen)
+{
+	unsigned int i, j;
+	unsigned int bufferid;
+
+	i = 1000 / 42; j = 0;
+	do {
+		switch(j)
+		{
+			case 0:
+				bufferid = 0;
+				mmxput2(buffers, bufferid, f);
+				break;
+			case 21:
+				bufferid = 1;
+				mmxput3(buffers, bufferid, length, 1, 0, f);
+				break;
+			case 3:
+			case 9:
+			case 15:
+			case 27:
+			case 33:
+			case 39:
+				bufferid = 2;
+				mmxput3(buffers, bufferid, length, 2, 0, f);
+				break;
+			case 6:
+			case 12:
+			case 18:
+			case 24:
+			case 30:
+			case 36:
+				bufferid = 3;
+				mmxput2(buffers, bufferid, f);
+				break;
+			case 7:
+			case 35:
+				bufferid = 4;
+				mmxput3(buffers, bufferid, length, 1, saltlen, f);
+				break;
+			case 14:
+			case 28:
+				bufferid = 5;
+				mmxput2(buffers, bufferid, f);
+				break;
+			case 2:
+			case 4:
+			case 8:
+			case 10:
+			case 16:
+			case 20:
+			case 22:
+			case 26:
+			case 32:
+			case 34:
+			case 38:
+			case 40:
+				bufferid = 6;
+				mmxput2(buffers, bufferid, f);
+				break;
+			default:
+				bufferid = 7;
+				mmxput3(buffers, bufferid, length, 2, saltlen, f);
+				break;
+		}
+		SSEmd5body((__m128i*)&buffersbufferid, f, NULL, SSEi_MIXED_IN);
+		if (j++ < 1000 % 42 - 1)
+			continue;
+		if (j == 1000 % 42) {
+			if (!i)
+				break;
+			i--;
+			continue;
+		}
+		if (j >= 42)
+			j = 0;
+	} while (1);
+}
+
+
+#endif /* MD5_SSE_PARA */
+
+#ifdef MD4_SSE_PARA
+#define MD4_SSE_NUM_KEYS	(MMX_COEF*MD4_SSE_PARA)
+#define MD4_PARA_DO(x)	for((x)=0;(x)<MD4_SSE_PARA;(x)++)
+
+#define MD4_F(x,y,z) \
+	MD4_PARA_DO(i) tmpi = _mm_cmov_si128((yi),(zi),(xi));
+
+#define MD4_G(x,y,z) \
+	MD4_PARA_DO(i) tmpi = _mm_or_si128((yi),(zi)); \
+	MD4_PARA_DO(i) tmp2i = _mm_and_si128((yi),(zi)); \
+	MD4_PARA_DO(i) tmpi = _mm_and_si128((tmpi),(xi)); \
+	MD4_PARA_DO(i) tmpi = _mm_or_si128((tmpi), (tmp2i) );
+
+#define MD4_H(x,y,z) \
+	MD4_PARA_DO(i) tmpi = _mm_xor_si128((yi),(zi)); \
+	MD4_PARA_DO(i) tmpi = _mm_xor_si128((tmpi),(xi));
+
+#define MD4_STEP(f, a, b, c, d, x, t, s) \
+	MD4_PARA_DO(i) ai = _mm_add_epi32( ai, t ); \
+	f((b),(c),(d)) \
+	MD4_PARA_DO(i) ai = _mm_add_epi32( ai, tmpi ); \
+	MD4_PARA_DO(i) ai = _mm_add_epi32( ai, datai*16+x ); \
+	MD4_PARA_DO(i) ai = _mm_roti_epi32( ai, (s) );
+
+void SSEmd4body(__m128i* _data, unsigned int * out, ARCH_WORD_32 *reload_state, unsigned SSEi_flags)
+{
+	__m128i w16*MD4_SSE_PARA;
+	__m128i aMD4_SSE_PARA;
+	__m128i bMD4_SSE_PARA;
+	__m128i cMD4_SSE_PARA;
+	__m128i dMD4_SSE_PARA;
+	__m128i tmpMD4_SSE_PARA;
+	__m128i tmp2MD4_SSE_PARA;
+	__m128i	cst;
+	unsigned int i;
+	__m128i *data;
+
+if(SSEi_flags & SSEi_FLAT_IN) {
+		// Move _data to __data, mixing it MMX_COEF wise.
+#ifdef __SSE4_1__
+		unsigned k;
+		__m128i *W = w;
+		ARCH_WORD_32 *saved_key = (ARCH_WORD_32 *)_data;
+		MD4_PARA_DO(k)
+		{
+			if (SSEi_flags & SSEi_4BUF_INPUT) {
+				for (i=0; i < 16; ++i) { GATHER_4x (Wi, saved_key, i); }
+				saved_key += (MMX_COEF<<6);
+			} else if (SSEi_flags & SSEi_2BUF_INPUT) {
+				for (i=0; i < 16; ++i) { GATHER_2x (Wi, saved_key, i); }
+				saved_key += (MMX_COEF<<5);
+			} else {
+				for (i=0; i < 16; ++i) { GATHER (Wi, saved_key, i); }
+				saved_key += (MMX_COEF<<4);
+			}
+			W += 16;
+		}
+#else
+		unsigned j, k;
+		ARCH_WORD_32 *p = (ARCH_WORD_32 *)w;
+		__m128i *W = w;
+		ARCH_WORD_32 *saved_key = (ARCH_WORD_32 *)_data;
+		MD4_PARA_DO(k)
+		{
+			if (SSEi_flags & SSEi_4BUF_INPUT) {
+				for (j=0; j < 16; j++)
+					for (i=0; i < MMX_COEF; i++)
+						*p++ = saved_key(i<<6)+j;
+				saved_key += (MMX_COEF<<6);
+			} else if (SSEi_flags & SSEi_2BUF_INPUT) {
+				for (j=0; j < 16; j++)
+					for (i=0; i < MMX_COEF; i++)
+						*p++ = saved_key(i<<5)+j;
+				saved_key += (MMX_COEF<<5);
+			} else {
+				for (j=0; j < 16; j++)
+					for (i=0; i < MMX_COEF; i++)
+						*p++ = saved_key(i<<4)+j;
+				saved_key += (MMX_COEF<<4);
+			}
+			W += 16;
+		}
+#endif
+		// now set our data pointer to point to this 'mixed' data.
+		data = w;
+	} else
+		data = _data;
+
+	if((SSEi_flags & SSEi_RELOAD)==0)
+	{
+		MD4_PARA_DO(i)
+		{
+			ai = _mm_set1_epi32(0x67452301);
+			bi = _mm_set1_epi32(0xefcdab89);
+			ci = _mm_set1_epi32(0x98badcfe);
+			di = _mm_set1_epi32(0x10325476);
+		}
+	}
+	else
+	{
+		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
+		{
+			MD4_PARA_DO(i)
+			{
+				ai = _mm_load_si128((__m128i *)&reload_statei*16*4+0);
+				bi = _mm_load_si128((__m128i *)&reload_statei*16*4+4);
+				ci = _mm_load_si128((__m128i *)&reload_statei*16*4+8);
+				di = _mm_load_si128((__m128i *)&reload_statei*16*4+12);
+			}
+		}
+		else
+		{
+			MD4_PARA_DO(i)
+			{
+				ai = _mm_load_si128((__m128i *)&reload_statei*16+0);
+				bi = _mm_load_si128((__m128i *)&reload_statei*16+4);
+				ci = _mm_load_si128((__m128i *)&reload_statei*16+8);
+				di = _mm_load_si128((__m128i *)&reload_statei*16+12);
+			}
+		}
+	}
+
+
+/* Round 1 */
+		cst = _mm_set_epi32(0,0,0,0);
+		MD4_STEP(MD4_F, a, b, c, d, 0, cst, 3)
+		MD4_STEP(MD4_F, d, a, b, c, 1, cst, 7)
+		MD4_STEP(MD4_F, c, d, a, b, 2, cst, 11)
+		MD4_STEP(MD4_F, b, c, d, a, 3, cst, 19)
+		MD4_STEP(MD4_F, a, b, c, d, 4, cst, 3)
+		MD4_STEP(MD4_F, d, a, b, c, 5, cst, 7)
+		MD4_STEP(MD4_F, c, d, a, b, 6, cst, 11)
+		MD4_STEP(MD4_F, b, c, d, a, 7, cst, 19)
+		MD4_STEP(MD4_F, a, b, c, d, 8, cst, 3)
+		MD4_STEP(MD4_F, d, a, b, c, 9, cst, 7)
+		MD4_STEP(MD4_F, c, d, a, b, 10, cst, 11)
+		MD4_STEP(MD4_F, b, c, d, a, 11, cst, 19)
+		MD4_STEP(MD4_F, a, b, c, d, 12, cst, 3)
+		MD4_STEP(MD4_F, d, a, b, c, 13, cst, 7)
+		MD4_STEP(MD4_F, c, d, a, b, 14, cst, 11)
+		MD4_STEP(MD4_F, b, c, d, a, 15, cst, 19)
+
+/* Round 2 */
+		cst = _mm_set_epi32(0x5A827999L,0x5A827999L,0x5A827999L,0x5A827999L);
+		MD4_STEP(MD4_G, a, b, c, d, 0, cst, 3)
+		MD4_STEP(MD4_G, d, a, b, c, 4, cst, 5)
+		MD4_STEP(MD4_G, c, d, a, b, 8, cst, 9)
+		MD4_STEP(MD4_G, b, c, d, a, 12, cst, 13)
+		MD4_STEP(MD4_G, a, b, c, d, 1, cst, 3)
+		MD4_STEP(MD4_G, d, a, b, c, 5, cst, 5)
+		MD4_STEP(MD4_G, c, d, a, b, 9, cst, 9)
+		MD4_STEP(MD4_G, b, c, d, a, 13, cst, 13)
+		MD4_STEP(MD4_G, a, b, c, d, 2, cst, 3)
+		MD4_STEP(MD4_G, d, a, b, c, 6, cst, 5)
+		MD4_STEP(MD4_G, c, d, a, b, 10, cst, 9)
+		MD4_STEP(MD4_G, b, c, d, a, 14, cst, 13)
+		MD4_STEP(MD4_G, a, b, c, d, 3, cst, 3)
+		MD4_STEP(MD4_G, d, a, b, c, 7, cst, 5)
+		MD4_STEP(MD4_G, c, d, a, b, 11, cst, 9)
+		MD4_STEP(MD4_G, b, c, d, a, 15, cst, 13)
+
+/* Round 3 */
+		cst = _mm_set_epi32(0x6ED9EBA1L,0x6ED9EBA1L,0x6ED9EBA1L,0x6ED9EBA1L);
+		MD4_STEP(MD4_H, a, b, c, d, 0, cst, 3)
+		MD4_STEP(MD4_H, d, a, b, c, 8, cst, 9)
+		MD4_STEP(MD4_H, c, d, a, b, 4, cst, 11)
+		MD4_STEP(MD4_H, b, c, d, a, 12, cst, 15)
+		MD4_STEP(MD4_H, a, b, c, d, 2, cst, 3)
+		MD4_STEP(MD4_H, d, a, b, c, 10, cst, 9)
+		MD4_STEP(MD4_H, c, d, a, b, 6, cst, 11)
+		MD4_STEP(MD4_H, b, c, d, a, 14, cst, 15)
+		MD4_STEP(MD4_H, a, b, c, d, 1, cst, 3)
+		MD4_STEP(MD4_H, d, a, b, c, 9, cst, 9)
+		MD4_STEP(MD4_H, c, d, a, b, 5, cst, 11)
+		MD4_STEP(MD4_H, b, c, d, a, 13, cst, 15)
+		MD4_STEP(MD4_H, a, b, c, d, 3, cst, 3)
+		MD4_STEP(MD4_H, d, a, b, c, 11, cst, 9)
+		MD4_STEP(MD4_H, c, d, a, b, 7, cst, 11)
+		MD4_STEP(MD4_H, b, c, d, a, 15, cst, 15)
+
+
+	if((SSEi_flags & SSEi_RELOAD)==0)
+	{
+		MD4_PARA_DO(i)
+		{
+			ai = _mm_add_epi32(ai, _mm_set1_epi32(0x67452301));
+			bi = _mm_add_epi32(bi, _mm_set1_epi32(0xefcdab89));
+			ci = _mm_add_epi32(ci, _mm_set1_epi32(0x98badcfe));
+			di = _mm_add_epi32(di, _mm_set1_epi32(0x10325476));
+		}
+	}
+	else
+	{
+		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
+		{
+			MD4_PARA_DO(i)
+			{
+				ai = _mm_add_epi32(ai, _mm_load_si128((__m128i *)&reload_statei*16*4+0));
+				bi = _mm_add_epi32(bi, _mm_load_si128((__m128i *)&reload_statei*16*4+4));
+				ci = _mm_add_epi32(ci, _mm_load_si128((__m128i *)&reload_statei*16*4+8));
+				di = _mm_add_epi32(di, _mm_load_si128((__m128i *)&reload_statei*16*4+12));
+			}
+		}
+		else
+		{
+			MD4_PARA_DO(i)
+			{
+				ai = _mm_add_epi32(ai, _mm_load_si128((__m128i *)&reload_statei*16+0));
+				bi = _mm_add_epi32(bi, _mm_load_si128((__m128i *)&reload_statei*16+4));
+				ci = _mm_add_epi32(ci, _mm_load_si128((__m128i *)&reload_statei*16+8));
+				di = _mm_add_epi32(di, _mm_load_si128((__m128i *)&reload_statei*16+12));
+			}
+		}
+	}
+	if (SSEi_flags & SSEi_OUTPUT_AS_INP_FMT)
+	{
+		MD4_PARA_DO(i)
+		{
+			_mm_store_si128((__m128i *)&outi*16*4+0, ai);
+			_mm_store_si128((__m128i *)&outi*16*4+4, bi);
+			_mm_store_si128((__m128i *)&outi*16*4+8, ci);
+			_mm_store_si128((__m128i *)&outi*16*4+12, di);
+		}
+	}
+	else
+	{
+		MD4_PARA_DO(i)
+		{
+			_mm_store_si128((__m128i *)&outi*16+0, ai);
+			_mm_store_si128((__m128i *)&outi*16+4, bi);
+			_mm_store_si128((__m128i *)&outi*16+8, ci);
+			_mm_store_si128((__m128i *)&outi*16+12, di);
+		}
+	}
+}
+
+#endif /* MD4_SSE_PARA */
+
+#ifdef SHA1_SSE_PARA
+#define SHA1_SSE_NUM_KEYS	(MMX_COEF*SHA1_SSE_PARA)
+#define SHA1_PARA_DO(x)		for((x)=0;(x)<SHA1_SSE_PARA;(x)++)
+
+#define SHA1_F(x,y,z) \
+	SHA1_PARA_DO(i) tmpi = _mm_cmov_si128((yi),(zi),(xi));
+
+#define SHA1_G(x,y,z) \
+	SHA1_PARA_DO(i) tmpi = _mm_xor_si128((yi),(zi)); \
+	SHA1_PARA_DO(i) tmpi = _mm_xor_si128((tmpi),(xi));
+
+#ifdef __XOP__
+#define SHA1_H(x,y,z) \
+	SHA1_PARA_DO(i) tmpi = _mm_cmov_si128((xi),(yi),(zi)); \
+	SHA1_PARA_DO(i) tmp2i = _mm_andnot_si128((xi),(yi)); \
+	SHA1_PARA_DO(i) tmpi = _mm_xor_si128((tmpi),(tmp2i));
+#else
+#define SHA1_H(x,y,z) \
+	SHA1_PARA_DO(i) tmpi = _mm_and_si128((xi),(yi)); \
+	SHA1_PARA_DO(i) tmp2i = _mm_or_si128((xi),(yi)); \
+	SHA1_PARA_DO(i) tmp2i = _mm_and_si128((tmp2i),(zi)); \
+	SHA1_PARA_DO(i) tmpi = _mm_or_si128((tmpi),(tmp2i));
+#endif
+
+#define SHA1_I(x,y,z) SHA1_G(x,y,z)
+
+#if SHA_BUF_SIZ == 80
+// Bartavelle's original code, using 80x4 words of buffer
+
+#define SHA1_EXPAND(t) \
+	SHA1_PARA_DO(i) tmpi = _mm_xor_si128( datai*80+t-3, datai*80+t-8 ); \
+	SHA1_PARA_DO(i) tmpi = _mm_xor_si128( tmpi, datai*80+t-14 ); \
+	SHA1_PARA_DO(i) tmpi = _mm_xor_si128( tmpi, datai*80+t-16 ); \
+	SHA1_PARA_DO(i) datai*80+t = _mm_roti_epi32(tmpi, 1);
+
+#define SHA1_ROUND(a,b,c,d,e,F,t) \
+	F(b,c,d) \
+	SHA1_PARA_DO(i) ei = _mm_add_epi32( ei, tmpi ); \
+	SHA1_PARA_DO(i) tmpi = _mm_roti_epi32(ai, 5); \
+	SHA1_PARA_DO(i) ei = _mm_add_epi32( ei, tmpi ); \
+	SHA1_PARA_DO(i) ei = _mm_add_epi32( ei, cst ); \
+	SHA1_PARA_DO(i) ei = _mm_add_epi32( ei, datai*80+t ); \
+	SHA1_PARA_DO(i) bi = _mm_roti_epi32(bi, 30);
+
+void SSESHA1body(__m128i* data, ARCH_WORD_32 *out, ARCH_WORD_32 *reload_state, unsigned int SSEi_flags)
+{
+	__m128i aSHA1_SSE_PARA;
+	__m128i bSHA1_SSE_PARA;
+	__m128i cSHA1_SSE_PARA;
+	__m128i dSHA1_SSE_PARA;
+	__m128i eSHA1_SSE_PARA;
+	__m128i tmpSHA1_SSE_PARA;
+	__m128i tmp2SHA1_SSE_PARA;
+	__m128i	cst;
+	unsigned int i,j;
+
+	for(j=16;j<80;j++)
+	{
+		SHA1_EXPAND(j);
+	}
+
+	if((SSEi_flags & SSEi_RELOAD)==0)
+	{
+		SHA1_PARA_DO(i)
+		{
+			ai = _mm_set1_epi32(0x67452301);
+			bi = _mm_set1_epi32(0xefcdab89);
+			ci = _mm_set1_epi32(0x98badcfe);
+			di = _mm_set1_epi32(0x10325476);
+			ei = _mm_set1_epi32(0xC3D2E1F0);
+		}
+	}
+	else
+	{
+		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
+		{
+			SHA1_PARA_DO(i)
+			{
+				ai = _mm_load_si128((__m128i *)&reload_statei*80*4+0);
+				bi = _mm_load_si128((__m128i *)&reload_statei*80*4+4);
+				ci = _mm_load_si128((__m128i *)&reload_statei*80*4+8);
+				di = _mm_load_si128((__m128i *)&reload_statei*80*4+12);
+				ei = _mm_load_si128((__m128i *)&reload_statei*80*4+16);
+			}
+		}
+		else
+		{
+			SHA1_PARA_DO(i)
+			{
+				ai = _mm_load_si128((__m128i *)&reload_statei*20+0);
+				bi = _mm_load_si128((__m128i *)&reload_statei*20+4);
+				ci = _mm_load_si128((__m128i *)&reload_statei*20+8);
+				di = _mm_load_si128((__m128i *)&reload_statei*20+12);
+				ei = _mm_load_si128((__m128i *)&reload_statei*20+16);
+			}
+		}
+	}
+
+	cst = _mm_set1_epi32(0x5A827999);
+	SHA1_ROUND( a, b, c, d, e, SHA1_F,  0 );
+	SHA1_ROUND( e, a, b, c, d, SHA1_F,  1 );
+	SHA1_ROUND( d, e, a, b, c, SHA1_F,  2 );
+	SHA1_ROUND( c, d, e, a, b, SHA1_F,  3 );
+	SHA1_ROUND( b, c, d, e, a, SHA1_F,  4 );
+	SHA1_ROUND( a, b, c, d, e, SHA1_F,  5 );
+	SHA1_ROUND( e, a, b, c, d, SHA1_F,  6 );
+	SHA1_ROUND( d, e, a, b, c, SHA1_F,  7 );
+	SHA1_ROUND( c, d, e, a, b, SHA1_F,  8 );
+	SHA1_ROUND( b, c, d, e, a, SHA1_F,  9 );
+	SHA1_ROUND( a, b, c, d, e, SHA1_F, 10 );
+	SHA1_ROUND( e, a, b, c, d, SHA1_F, 11 );
+	SHA1_ROUND( d, e, a, b, c, SHA1_F, 12 );
+	SHA1_ROUND( c, d, e, a, b, SHA1_F, 13 );
+	SHA1_ROUND( b, c, d, e, a, SHA1_F, 14 );
+	SHA1_ROUND( a, b, c, d, e, SHA1_F, 15 );
+	SHA1_ROUND( e, a, b, c, d, SHA1_F, 16 );
+	SHA1_ROUND( d, e, a, b, c, SHA1_F, 17 );
+	SHA1_ROUND( c, d, e, a, b, SHA1_F, 18 );
+	SHA1_ROUND( b, c, d, e, a, SHA1_F, 19 );
+
+	cst = _mm_set1_epi32(0x6ED9EBA1);
+	SHA1_ROUND( a, b, c, d, e, SHA1_G, 20 );
+	SHA1_ROUND( e, a, b, c, d, SHA1_G, 21 );
+	SHA1_ROUND( d, e, a, b, c, SHA1_G, 22 );
+	SHA1_ROUND( c, d, e, a, b, SHA1_G, 23 );
+	SHA1_ROUND( b, c, d, e, a, SHA1_G, 24 );
+	SHA1_ROUND( a, b, c, d, e, SHA1_G, 25 );
+	SHA1_ROUND( e, a, b, c, d, SHA1_G, 26 );
+	SHA1_ROUND( d, e, a, b, c, SHA1_G, 27 );
+	SHA1_ROUND( c, d, e, a, b, SHA1_G, 28 );
+	SHA1_ROUND( b, c, d, e, a, SHA1_G, 29 );
+	SHA1_ROUND( a, b, c, d, e, SHA1_G, 30 );
+	SHA1_ROUND( e, a, b, c, d, SHA1_G, 31 );
+	SHA1_ROUND( d, e, a, b, c, SHA1_G, 32 );
+	SHA1_ROUND( c, d, e, a, b, SHA1_G, 33 );
+	SHA1_ROUND( b, c, d, e, a, SHA1_G, 34 );
+	SHA1_ROUND( a, b, c, d, e, SHA1_G, 35 );
+	SHA1_ROUND( e, a, b, c, d, SHA1_G, 36 );
+	SHA1_ROUND( d, e, a, b, c, SHA1_G, 37 );
+	SHA1_ROUND( c, d, e, a, b, SHA1_G, 38 );
+	SHA1_ROUND( b, c, d, e, a, SHA1_G, 39 );
+
+	cst = _mm_set1_epi32(0x8F1BBCDC);
+	SHA1_ROUND( a, b, c, d, e, SHA1_H, 40 );
+	SHA1_ROUND( e, a, b, c, d, SHA1_H, 41 );
+	SHA1_ROUND( d, e, a, b, c, SHA1_H, 42 );
+	SHA1_ROUND( c, d, e, a, b, SHA1_H, 43 );
+	SHA1_ROUND( b, c, d, e, a, SHA1_H, 44 );
+	SHA1_ROUND( a, b, c, d, e, SHA1_H, 45 );
+	SHA1_ROUND( e, a, b, c, d, SHA1_H, 46 );
+	SHA1_ROUND( d, e, a, b, c, SHA1_H, 47 );
+	SHA1_ROUND( c, d, e, a, b, SHA1_H, 48 );
+	SHA1_ROUND( b, c, d, e, a, SHA1_H, 49 );
+	SHA1_ROUND( a, b, c, d, e, SHA1_H, 50 );
+	SHA1_ROUND( e, a, b, c, d, SHA1_H, 51 );
+	SHA1_ROUND( d, e, a, b, c, SHA1_H, 52 );
+	SHA1_ROUND( c, d, e, a, b, SHA1_H, 53 );
+	SHA1_ROUND( b, c, d, e, a, SHA1_H, 54 );
+	SHA1_ROUND( a, b, c, d, e, SHA1_H, 55 );
+	SHA1_ROUND( e, a, b, c, d, SHA1_H, 56 );
+	SHA1_ROUND( d, e, a, b, c, SHA1_H, 57 );
+	SHA1_ROUND( c, d, e, a, b, SHA1_H, 58 );
+	SHA1_ROUND( b, c, d, e, a, SHA1_H, 59 );
+
+	cst = _mm_set1_epi32(0xCA62C1D6);
+	SHA1_ROUND( a, b, c, d, e, SHA1_I, 60 );
+	SHA1_ROUND( e, a, b, c, d, SHA1_I, 61 );
+	SHA1_ROUND( d, e, a, b, c, SHA1_I, 62 );
+	SHA1_ROUND( c, d, e, a, b, SHA1_I, 63 );
+	SHA1_ROUND( b, c, d, e, a, SHA1_I, 64 );
+	SHA1_ROUND( a, b, c, d, e, SHA1_I, 65 );
+	SHA1_ROUND( e, a, b, c, d, SHA1_I, 66 );
+	SHA1_ROUND( d, e, a, b, c, SHA1_I, 67 );
+	SHA1_ROUND( c, d, e, a, b, SHA1_I, 68 );
+	SHA1_ROUND( b, c, d, e, a, SHA1_I, 69 );
+	SHA1_ROUND( a, b, c, d, e, SHA1_I, 70 );
+	SHA1_ROUND( e, a, b, c, d, SHA1_I, 71 );
+	SHA1_ROUND( d, e, a, b, c, SHA1_I, 72 );
+	SHA1_ROUND( c, d, e, a, b, SHA1_I, 73 );
+	SHA1_ROUND( b, c, d, e, a, SHA1_I, 74 );
+	SHA1_ROUND( a, b, c, d, e, SHA1_I, 75 );
+	SHA1_ROUND( e, a, b, c, d, SHA1_I, 76 );
+	SHA1_ROUND( d, e, a, b, c, SHA1_I, 77 );
+	SHA1_ROUND( c, d, e, a, b, SHA1_I, 78 );
+	SHA1_ROUND( b, c, d, e, a, SHA1_I, 79 );
+
+	if((SSEi_flags & SSEi_RELOAD)==0)
+	{
+		SHA1_PARA_DO(i)
+		{
+			ai = _mm_add_epi32(ai, _mm_set1_epi32(0x67452301));
+			bi = _mm_add_epi32(bi, _mm_set1_epi32(0xefcdab89));
+			ci = _mm_add_epi32(ci, _mm_set1_epi32(0x98badcfe));
+			di = _mm_add_epi32(di, _mm_set1_epi32(0x10325476));
+			ei = _mm_add_epi32(ei, _mm_set1_epi32(0xC3D2E1F0));
+		}
+	}
+	else
+	{
+		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
+		{
+			SHA1_PARA_DO(i)
+			{
+				ai = _mm_add_epi32(ai, _mm_load_si128((__m128i *)&reload_statei*80*4+0));
+				bi = _mm_add_epi32(bi, _mm_load_si128((__m128i *)&reload_statei*80*4+4));
+				ci = _mm_add_epi32(ci, _mm_load_si128((__m128i *)&reload_statei*80*4+8));
+				di = _mm_add_epi32(di, _mm_load_si128((__m128i *)&reload_statei*80*4+12));
+				ei = _mm_add_epi32(ei, _mm_load_si128((__m128i *)&reload_statei*80*4+16));
+			}
+		}
+		else
+		{
+			SHA1_PARA_DO(i)
+			{
+				ai = _mm_add_epi32(ai, _mm_load_si128((__m128i *)&reload_statei*20+0));
+				bi = _mm_add_epi32(bi, _mm_load_si128((__m128i *)&reload_statei*20+4));
+				ci = _mm_add_epi32(ci, _mm_load_si128((__m128i *)&reload_statei*20+8));
+				di = _mm_add_epi32(di, _mm_load_si128((__m128i *)&reload_statei*20+12));
+				ei = _mm_add_epi32(ei, _mm_load_si128((__m128i *)&reload_statei*20+16));
+			}
+		}
+	}
+	if (SSEi_flags & SSEi_OUTPUT_AS_INP_FMT)
+	{
+		SHA1_PARA_DO(i)
+		{
+			_mm_store_si128((__m128i *)&outi*80*4+0, ai);
+			_mm_store_si128((__m128i *)&outi*80*4+4, bi);
+			_mm_store_si128((__m128i *)&outi*80*4+8, ci);
+			_mm_store_si128((__m128i *)&outi*80*4+12, di);
+			_mm_store_si128((__m128i *)&outi*80*4+16, ei);
+		}
+	}
+	else
+	{
+		SHA1_PARA_DO(i)
+		{
+			_mm_store_si128((__m128i *)&outi*20+0, ai);
+			_mm_store_si128((__m128i *)&outi*20+4, bi);
+			_mm_store_si128((__m128i *)&outi*20+8, ci);
+			_mm_store_si128((__m128i *)&outi*20+12, di);
+			_mm_store_si128((__m128i *)&outi*20+16, ei);
+		}
+	}
+}
+#else /* SHA_BUF_SIZ */
+
+// JimF's code, using 16x4 words of buffer just like MD4/5
+
+#define SHA1_EXPAND2a(t) \
+	SHA1_PARA_DO(i) tmpi = _mm_xor_si128( datai*16+t-3, datai*16+t-8 ); \
+	SHA1_PARA_DO(i) tmpi = _mm_xor_si128( tmpi, datai*16+t-14 ); \
+	SHA1_PARA_DO(i) tmpi = _mm_xor_si128( tmpi, datai*16+t-16 ); \
+	SHA1_PARA_DO(i) tmpRi*16+((t)&0xF) = _mm_roti_epi32(tmpi, 1);
+#define SHA1_EXPAND2b(t) \
+	SHA1_PARA_DO(i) tmpi = _mm_xor_si128( tmpRi*16+((t-3)&0xF), datai*16+t-8 ); \
+	SHA1_PARA_DO(i) tmpi = _mm_xor_si128( tmpi, datai*16+t-14 ); \
+	SHA1_PARA_DO(i) tmpi = _mm_xor_si128( tmpi, datai*16+t-16 ); \
+	SHA1_PARA_DO(i) tmpRi*16+((t)&0xF) = _mm_roti_epi32(tmpi, 1);
+#define SHA1_EXPAND2c(t) \
+	SHA1_PARA_DO(i) tmpi = _mm_xor_si128( tmpRi*16+((t-3)&0xF), tmpRi*16+((t-8)&0xF) ); \
+	SHA1_PARA_DO(i) tmpi = _mm_xor_si128( tmpi, datai*16+t-14 ); \
+	SHA1_PARA_DO(i) tmpi = _mm_xor_si128( tmpi, datai*16+t-16 ); \
+	SHA1_PARA_DO(i) tmpRi*16+((t)&0xF) = _mm_roti_epi32(tmpi, 1);
+#define SHA1_EXPAND2d(t) \
+	SHA1_PARA_DO(i) tmpi = _mm_xor_si128( tmpRi*16+((t-3)&0xF), tmpRi*16+((t-8)&0xF) ); \
+	SHA1_PARA_DO(i) tmpi = _mm_xor_si128( tmpi, tmpRi*16+((t-14)&0xF) ); \
+	SHA1_PARA_DO(i) tmpi = _mm_xor_si128( tmpi, datai*16+t-16 ); \
+	SHA1_PARA_DO(i) tmpRi*16+((t)&0xF) = _mm_roti_epi32(tmpi, 1);
+#define SHA1_EXPAND2(t) \
+	SHA1_PARA_DO(i) tmpi = _mm_xor_si128( tmpRi*16+((t-3)&0xF), tmpRi*16+((t-8)&0xF) ); \
+	SHA1_PARA_DO(i) tmpi = _mm_xor_si128( tmpi, tmpRi*16+((t-14)&0xF) ); \
+	SHA1_PARA_DO(i) tmpi = _mm_xor_si128( tmpi, tmpRi*16+((t-16)&0xF) ); \
+	SHA1_PARA_DO(i) tmpRi*16+((t)&0xF) = _mm_roti_epi32(tmpi, 1);
+
+#define SHA1_ROUND2a(a,b,c,d,e,F,t) \
+	SHA1_EXPAND2a(t+16) \
+	F(b,c,d) \
+	SHA1_PARA_DO(i) ei = _mm_add_epi32( ei, tmpi ); \
+	SHA1_PARA_DO(i) tmpi = _mm_roti_epi32(ai, 5); \
+	SHA1_PARA_DO(i) ei = _mm_add_epi32( ei, tmpi ); \
+	SHA1_PARA_DO(i) ei = _mm_add_epi32( ei, cst ); \
+	SHA1_PARA_DO(i) ei = _mm_add_epi32( ei, datai*16+t ); \
+	SHA1_PARA_DO(i) bi = _mm_roti_epi32(bi, 30);
+#define SHA1_ROUND2b(a,b,c,d,e,F,t) \
+	SHA1_EXPAND2b(t+16) \
+	F(b,c,d) \
+	SHA1_PARA_DO(i) ei = _mm_add_epi32( ei, tmpi ); \
+	SHA1_PARA_DO(i) tmpi = _mm_roti_epi32(ai, 5); \
+	SHA1_PARA_DO(i) ei = _mm_add_epi32( ei, tmpi ); \
+	SHA1_PARA_DO(i) ei = _mm_add_epi32( ei, cst ); \
+	SHA1_PARA_DO(i) ei = _mm_add_epi32( ei, datai*16+t ); \
+	SHA1_PARA_DO(i) bi = _mm_roti_epi32(bi, 30);
+#define SHA1_ROUND2c(a,b,c,d,e,F,t) \
+	SHA1_EXPAND2c(t+16) \
+	F(b,c,d) \
+	SHA1_PARA_DO(i) ei = _mm_add_epi32( ei, tmpi ); \
+	SHA1_PARA_DO(i) tmpi = _mm_roti_epi32(ai, 5); \
+	SHA1_PARA_DO(i) ei = _mm_add_epi32( ei, tmpi ); \
+	SHA1_PARA_DO(i) ei = _mm_add_epi32( ei, cst ); \
+	SHA1_PARA_DO(i) ei = _mm_add_epi32( ei, datai*16+t ); \
+	SHA1_PARA_DO(i) bi = _mm_roti_epi32(bi, 30);
+#define SHA1_ROUND2d(a,b,c,d,e,F,t) \
+	SHA1_EXPAND2d(t+16) \
+	F(b,c,d) \
+	SHA1_PARA_DO(i) ei = _mm_add_epi32( ei, tmpi ); \
+	SHA1_PARA_DO(i) tmpi = _mm_roti_epi32(ai, 5); \
+	SHA1_PARA_DO(i) ei = _mm_add_epi32( ei, tmpi ); \
+	SHA1_PARA_DO(i) ei = _mm_add_epi32( ei, cst ); \
+	SHA1_PARA_DO(i) ei = _mm_add_epi32( ei, datai*16+t ); \
+	SHA1_PARA_DO(i) bi = _mm_roti_epi32(bi, 30);
+#define SHA1_ROUND2(a,b,c,d,e,F,t) \
+	SHA1_PARA_DO(i) tmp3i = tmpRi*16+(t&0xF); \
+	SHA1_EXPAND2(t+16) \
+	F(b,c,d) \
+	SHA1_PARA_DO(i) ei = _mm_add_epi32( ei, tmpi ); \
+	SHA1_PARA_DO(i) tmpi = _mm_roti_epi32(ai, 5); \
+	SHA1_PARA_DO(i) ei = _mm_add_epi32( ei, tmpi ); \
+	SHA1_PARA_DO(i) ei = _mm_add_epi32( ei, cst ); \
+	SHA1_PARA_DO(i) ei = _mm_add_epi32( ei, tmp3i ); \
+	SHA1_PARA_DO(i) bi = _mm_roti_epi32(bi, 30);
+#define SHA1_ROUND2x(a,b,c,d,e,F,t) \
+	F(b,c,d) \
+	SHA1_PARA_DO(i) ei = _mm_add_epi32( ei, tmpi ); \
+	SHA1_PARA_DO(i) tmpi = _mm_roti_epi32(ai, 5); \
+	SHA1_PARA_DO(i) ei = _mm_add_epi32( ei, tmpi ); \
+	SHA1_PARA_DO(i) ei = _mm_add_epi32( ei, cst ); \
+	SHA1_PARA_DO(i) ei = _mm_add_epi32( ei, tmpRi*16+(t&0xF) ); \
+	SHA1_PARA_DO(i) bi = _mm_roti_epi32(bi, 30);
+
+void SSESHA1body(__m128i* _data, ARCH_WORD_32 *out, ARCH_WORD_32 *reload_state, unsigned SSEi_flags)
+{
+	__m128i w16*SHA1_SSE_PARA;
+	__m128i aSHA1_SSE_PARA;
+	__m128i bSHA1_SSE_PARA;
+	__m128i cSHA1_SSE_PARA;
+	__m128i dSHA1_SSE_PARA;
+	__m128i eSHA1_SSE_PARA;
+	__m128i tmpSHA1_SSE_PARA;
+	__m128i tmp2SHA1_SSE_PARA;
+	__m128i tmp3SHA1_SSE_PARA;
+	__m128i tmpRSHA1_SSE_PARA*16;
+	__m128i	cst;
+	unsigned int i;
+	__m128i *data;
+
+	if(SSEi_flags & SSEi_FLAT_IN) {
+		// Move _data to __data, mixing it MMX_COEF wise.
+#ifdef __SSE4_1__
+//#error test
+		unsigned k;
+		__m128i *W = w;
+		ARCH_WORD_32 *saved_key = (ARCH_WORD_32 *)_data;
+		SHA1_PARA_DO(k)
+		{
+			if (SSEi_flags & SSEi_4BUF_INPUT) {
+				for (i=0; i < 14; ++i) { GATHER_4x (Wi, saved_key, i); SWAP_ENDIAN (Wi); }
+				GATHER_4x (W14, saved_key, 14);
+				GATHER_4x (W15, saved_key, 15);
+				saved_key += (MMX_COEF<<6);
+			} else if (SSEi_flags & SSEi_2BUF_INPUT) {
+				for (i=0; i < 14; ++i) { GATHER_2x (Wi, saved_key, i); SWAP_ENDIAN (Wi); }
+				GATHER_2x (W14, saved_key, 14);
+				GATHER_2x (W15, saved_key, 15);
+				saved_key += (MMX_COEF<<5);
+			} else {
+				for (i=0; i < 14; ++i) { GATHER (Wi, saved_key, i); SWAP_ENDIAN (Wi); }
+				GATHER (W14, saved_key, 14);
+				GATHER (W15, saved_key, 15);
+				saved_key += (MMX_COEF<<4);
+			}
+			if ( ((SSEi_flags & SSEi_2BUF_INPUT_FIRST_BLK) == SSEi_2BUF_INPUT_FIRST_BLK) ||
+				 ((SSEi_flags & SSEi_4BUF_INPUT_FIRST_BLK) == SSEi_4BUF_INPUT_FIRST_BLK)) {
+				SWAP_ENDIAN (W14);
+				SWAP_ENDIAN (W15);
+			}
+			W += 16;
+		}
+#else
+		unsigned j, k;
+		ARCH_WORD_32 *p = (ARCH_WORD_32 *)w;
+		__m128i *W = w;
+		ARCH_WORD_32 *saved_key = (ARCH_WORD_32 *)_data;
+		SHA1_PARA_DO(k)
+		{
+			if (SSEi_flags & SSEi_4BUF_INPUT) {
+				for (j=0; j < 16; j++)
+					for (i=0; i < MMX_COEF; i++)
+						*p++ = saved_key(i<<6)+j;
+				saved_key += (MMX_COEF<<6);
+			} else if (SSEi_flags & SSEi_2BUF_INPUT) {
+				for (j=0; j < 16; j++)
+					for (i=0; i < MMX_COEF; i++)
+						*p++ = saved_key(i<<5)+j;
+				saved_key += (MMX_COEF<<5);
+			} else {
+				for (j=0; j < 16; j++)
+					for (i=0; i < MMX_COEF; i++)
+						*p++ = saved_key(i<<4)+j;
+				saved_key += (MMX_COEF<<4);
+			}
+			for (i=0; i < 14; i++)
+				SWAP_ENDIAN (Wi);
+			if ( ((SSEi_flags & SSEi_2BUF_INPUT_FIRST_BLK) == SSEi_2BUF_INPUT_FIRST_BLK) ||
+				 ((SSEi_flags & SSEi_4BUF_INPUT_FIRST_BLK) == SSEi_4BUF_INPUT_FIRST_BLK)) {
+				SWAP_ENDIAN (W14);
+				SWAP_ENDIAN (W15);
+			}
+			W += 16;
+		}
+#endif
+
+		// now set our data pointer to point to this 'mixed' data.
+		data = w;
+	} else
+		data = _data;
+
+	if((SSEi_flags & SSEi_RELOAD)==0)
+	{
+		SHA1_PARA_DO(i)
+		{
+			ai = _mm_set1_epi32(0x67452301);
+			bi = _mm_set1_epi32(0xefcdab89);
+			ci = _mm_set1_epi32(0x98badcfe);
+			di = _mm_set1_epi32(0x10325476);
+			ei = _mm_set1_epi32(0xC3D2E1F0);
+		}
+	}
+	else
+	{
+		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
+		{
+			SHA1_PARA_DO(i)
+			{
+				ai = _mm_load_si128((__m128i *)&reload_statei*16*4+0);
+				bi = _mm_load_si128((__m128i *)&reload_statei*16*4+4);
+				ci = _mm_load_si128((__m128i *)&reload_statei*16*4+8);
+				di = _mm_load_si128((__m128i *)&reload_statei*16*4+12);
+				ei = _mm_load_si128((__m128i *)&reload_statei*16*4+16);
+			}
+		}
+		else
+		{
+			SHA1_PARA_DO(i)
+			{
+				ai = _mm_load_si128((__m128i *)&reload_statei*20+0);
+				bi = _mm_load_si128((__m128i *)&reload_statei*20+4);
+				ci = _mm_load_si128((__m128i *)&reload_statei*20+8);
+				di = _mm_load_si128((__m128i *)&reload_statei*20+12);
+				ei = _mm_load_si128((__m128i *)&reload_statei*20+16);
+			}
+		}
+	}
+
+	cst = _mm_set1_epi32(0x5A827999);
+	SHA1_ROUND2a( a, b, c, d, e, SHA1_F,  0 );
+	SHA1_ROUND2a( e, a, b, c, d, SHA1_F,  1 );
+	SHA1_ROUND2a( d, e, a, b, c, SHA1_F,  2 );
+	SHA1_ROUND2b( c, d, e, a, b, SHA1_F,  3 );
+	SHA1_ROUND2b( b, c, d, e, a, SHA1_F,  4 );
+	SHA1_ROUND2b( a, b, c, d, e, SHA1_F,  5 );
+	SHA1_ROUND2b( e, a, b, c, d, SHA1_F,  6 );
+	SHA1_ROUND2b( d, e, a, b, c, SHA1_F,  7 );
+	SHA1_ROUND2c( c, d, e, a, b, SHA1_F,  8 );
+	SHA1_ROUND2c( b, c, d, e, a, SHA1_F,  9 );
+	SHA1_ROUND2c( a, b, c, d, e, SHA1_F, 10 );
+	SHA1_ROUND2c( e, a, b, c, d, SHA1_F, 11 );
+	SHA1_ROUND2c( d, e, a, b, c, SHA1_F, 12 );
+	SHA1_ROUND2c( c, d, e, a, b, SHA1_F, 13 );
+	SHA1_ROUND2d( b, c, d, e, a, SHA1_F, 14 );
+	SHA1_ROUND2d( a, b, c, d, e, SHA1_F, 15 );
+	SHA1_ROUND2( e, a, b, c, d, SHA1_F, 16 );
+	SHA1_ROUND2( d, e, a, b, c, SHA1_F, 17 );
+	SHA1_ROUND2( c, d, e, a, b, SHA1_F, 18 );
+	SHA1_ROUND2( b, c, d, e, a, SHA1_F, 19 );
+
+	cst = _mm_set1_epi32(0x6ED9EBA1);
+	SHA1_ROUND2( a, b, c, d, e, SHA1_G, 20 );
+	SHA1_ROUND2( e, a, b, c, d, SHA1_G, 21 );
+	SHA1_ROUND2( d, e, a, b, c, SHA1_G, 22 );
+	SHA1_ROUND2( c, d, e, a, b, SHA1_G, 23 );
+	SHA1_ROUND2( b, c, d, e, a, SHA1_G, 24 );
+	SHA1_ROUND2( a, b, c, d, e, SHA1_G, 25 );
+	SHA1_ROUND2( e, a, b, c, d, SHA1_G, 26 );
+	SHA1_ROUND2( d, e, a, b, c, SHA1_G, 27 );
+	SHA1_ROUND2( c, d, e, a, b, SHA1_G, 28 );
+	SHA1_ROUND2( b, c, d, e, a, SHA1_G, 29 );
+	SHA1_ROUND2( a, b, c, d, e, SHA1_G, 30 );
+	SHA1_ROUND2( e, a, b, c, d, SHA1_G, 31 );
+	SHA1_ROUND2( d, e, a, b, c, SHA1_G, 32 );
+	SHA1_ROUND2( c, d, e, a, b, SHA1_G, 33 );
+	SHA1_ROUND2( b, c, d, e, a, SHA1_G, 34 );
+	SHA1_ROUND2( a, b, c, d, e, SHA1_G, 35 );
+	SHA1_ROUND2( e, a, b, c, d, SHA1_G, 36 );
+	SHA1_ROUND2( d, e, a, b, c, SHA1_G, 37 );
+	SHA1_ROUND2( c, d, e, a, b, SHA1_G, 38 );
+	SHA1_ROUND2( b, c, d, e, a, SHA1_G, 39 );
+
+	cst = _mm_set1_epi32(0x8F1BBCDC);
+	SHA1_ROUND2( a, b, c, d, e, SHA1_H, 40 );
+	SHA1_ROUND2( e, a, b, c, d, SHA1_H, 41 );
+	SHA1_ROUND2( d, e, a, b, c, SHA1_H, 42 );
+	SHA1_ROUND2( c, d, e, a, b, SHA1_H, 43 );
+	SHA1_ROUND2( b, c, d, e, a, SHA1_H, 44 );
+	SHA1_ROUND2( a, b, c, d, e, SHA1_H, 45 );
+	SHA1_ROUND2( e, a, b, c, d, SHA1_H, 46 );
+	SHA1_ROUND2( d, e, a, b, c, SHA1_H, 47 );
+	SHA1_ROUND2( c, d, e, a, b, SHA1_H, 48 );
+	SHA1_ROUND2( b, c, d, e, a, SHA1_H, 49 );
+	SHA1_ROUND2( a, b, c, d, e, SHA1_H, 50 );
+	SHA1_ROUND2( e, a, b, c, d, SHA1_H, 51 );
+	SHA1_ROUND2( d, e, a, b, c, SHA1_H, 52 );
+	SHA1_ROUND2( c, d, e, a, b, SHA1_H, 53 );
+	SHA1_ROUND2( b, c, d, e, a, SHA1_H, 54 );
+	SHA1_ROUND2( a, b, c, d, e, SHA1_H, 55 );
+	SHA1_ROUND2( e, a, b, c, d, SHA1_H, 56 );
+	SHA1_ROUND2( d, e, a, b, c, SHA1_H, 57 );
+	SHA1_ROUND2( c, d, e, a, b, SHA1_H, 58 );
+	SHA1_ROUND2( b, c, d, e, a, SHA1_H, 59 );
+
+	cst = _mm_set1_epi32(0xCA62C1D6);
+	SHA1_ROUND2( a, b, c, d, e, SHA1_I, 60 );
+	SHA1_ROUND2( e, a, b, c, d, SHA1_I, 61 );
+	SHA1_ROUND2( d, e, a, b, c, SHA1_I, 62 );
+	SHA1_ROUND2( c, d, e, a, b, SHA1_I, 63 );
+	SHA1_ROUND2x( b, c, d, e, a, SHA1_I, 64 );
+	SHA1_ROUND2x( a, b, c, d, e, SHA1_I, 65 );
+	SHA1_ROUND2x( e, a, b, c, d, SHA1_I, 66 );
+	SHA1_ROUND2x( d, e, a, b, c, SHA1_I, 67 );
+	SHA1_ROUND2x( c, d, e, a, b, SHA1_I, 68 );
+	SHA1_ROUND2x( b, c, d, e, a, SHA1_I, 69 );
+	SHA1_ROUND2x( a, b, c, d, e, SHA1_I, 70 );
+	SHA1_ROUND2x( e, a, b, c, d, SHA1_I, 71 );
+	SHA1_ROUND2x( d, e, a, b, c, SHA1_I, 72 );
+	SHA1_ROUND2x( c, d, e, a, b, SHA1_I, 73 );
+	SHA1_ROUND2x( b, c, d, e, a, SHA1_I, 74 );
+	SHA1_ROUND2x( a, b, c, d, e, SHA1_I, 75 );
+	SHA1_ROUND2x( e, a, b, c, d, SHA1_I, 76 );
+	SHA1_ROUND2x( d, e, a, b, c, SHA1_I, 77 );
+	SHA1_ROUND2x( c, d, e, a, b, SHA1_I, 78 );
+	SHA1_ROUND2x( b, c, d, e, a, SHA1_I, 79 );
+
+	if((SSEi_flags & SSEi_RELOAD)==0)
+	{
+		SHA1_PARA_DO(i)
+		{
+			ai = _mm_add_epi32(ai, _mm_set1_epi32(0x67452301));
+			bi = _mm_add_epi32(bi, _mm_set1_epi32(0xefcdab89));
+			ci = _mm_add_epi32(ci, _mm_set1_epi32(0x98badcfe));
+			di = _mm_add_epi32(di, _mm_set1_epi32(0x10325476));
+			ei = _mm_add_epi32(ei, _mm_set1_epi32(0xC3D2E1F0));
+		}
+	}
+	else
+	{
+		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
+		{
+			SHA1_PARA_DO(i)
+			{
+				ai = _mm_add_epi32(ai, _mm_load_si128((__m128i *)&reload_statei*16*4+0));
+				bi = _mm_add_epi32(bi, _mm_load_si128((__m128i *)&reload_statei*16*4+4));
+				ci = _mm_add_epi32(ci, _mm_load_si128((__m128i *)&reload_statei*16*4+8));
+				di = _mm_add_epi32(di, _mm_load_si128((__m128i *)&reload_statei*16*4+12));
+				ei = _mm_add_epi32(ei, _mm_load_si128((__m128i *)&reload_statei*16*4+16));
+			}
+		}
+		else
+		{
+			SHA1_PARA_DO(i)
+			{
+				ai = _mm_add_epi32(ai, _mm_load_si128((__m128i *)&reload_statei*20+0));
+				bi = _mm_add_epi32(bi, _mm_load_si128((__m128i *)&reload_statei*20+4));
+				ci = _mm_add_epi32(ci, _mm_load_si128((__m128i *)&reload_statei*20+8));
+				di = _mm_add_epi32(di, _mm_load_si128((__m128i *)&reload_statei*20+12));
+				ei = _mm_add_epi32(ei, _mm_load_si128((__m128i *)&reload_statei*20+16));
+			}
+		}
+	}
+	if (SSEi_flags & SSEi_OUTPUT_AS_INP_FMT)
+	{
+		SHA1_PARA_DO(i)
+		{
+			_mm_store_si128((__m128i *)&outi*16*4+0, ai);
+			_mm_store_si128((__m128i *)&outi*16*4+4, bi);
+			_mm_store_si128((__m128i *)&outi*16*4+8, ci);
+			_mm_store_si128((__m128i *)&outi*16*4+12, di);
+			_mm_store_si128((__m128i *)&outi*16*4+16, ei);
+		}
+	}
+	else
+	{
+		SHA1_PARA_DO(i)
+		{
+			_mm_store_si128((__m128i *)&outi*20+0, ai);
+			_mm_store_si128((__m128i *)&outi*20+4, bi);
+			_mm_store_si128((__m128i *)&outi*20+8, ci);
+			_mm_store_si128((__m128i *)&outi*20+12, di);
+			_mm_store_si128((__m128i *)&outi*20+16, ei);
+		}
+	}
+}
+#endif /* SHA_BUF_SIZ */
+#endif /* SHA1_SSE_PARA */
+
+
+#define S0(x)                           \
+(                                       \
+    _mm_xor_si128 (                     \
+        _mm_roti_epi32 (x, -22),        \
+        _mm_xor_si128 (                 \
+            _mm_roti_epi32 (x,  -2),    \
+            _mm_roti_epi32 (x, -13)     \
+        )                               \
+    )                                   \
+)
+
+#define S1(x)                           \
+(                                       \
+    _mm_xor_si128 (                     \
+        _mm_roti_epi32 (x, -25),        \
+        _mm_xor_si128 (                 \
+            _mm_roti_epi32 (x,  -6),    \
+            _mm_roti_epi32 (x, -11)     \
+        )                               \
+    )                                   \
+)
+
+#define s0(x)                           \
+(                                       \
+    _mm_xor_si128 (                     \
+        _mm_srli_epi32 (x, 3),          \
+        _mm_xor_si128 (                 \
+            _mm_roti_epi32 (x,  -7),    \
+            _mm_roti_epi32 (x, -18)     \
+        )                               \
+    )                                   \
+)
+
+#define s1(x)                           \
+(                                       \
+    _mm_xor_si128 (                     \
+        _mm_srli_epi32 (x, 10),         \
+        _mm_xor_si128 (                 \
+            _mm_roti_epi32 (x, -17),    \
+            _mm_roti_epi32 (x, -19)     \
+        )                               \
+    )                                   \
+)
+
+#define Maj(x,y,z) _mm_cmov_si128 (x, y, _mm_xor_si128 (z, y))
+
+#define Ch(x,y,z) _mm_cmov_si128 (y, z, x)
+
+#undef R
+#define R(x,x1,x2,x3)                         \
+{                                             \
+    tmp1 = _mm_add_epi32 (s1(wx1), wx2);  \
+    tmp1 = _mm_add_epi32 (wx,  tmp1);       \
+    wx = _mm_add_epi32 (s0(wx3), tmp1);   \
+}
+
+#define SHA256_STEP0(a,b,c,d,e,f,g,h,x,K)            \
+{                                                    \
+    tmp1 = _mm_add_epi32 (h,    S1(e));              \
+    tmp1 = _mm_add_epi32 (tmp1, Ch(e,f,g));          \
+    tmp1 = _mm_add_epi32 (tmp1, _mm_set1_epi32(K));  \
+    tmp1 = _mm_add_epi32 (tmp1, wx);               \
+    tmp2 = _mm_add_epi32 (S0(a),Maj(a,b,c));         \
+    d    = _mm_add_epi32 (tmp1, d);                  \
+    h    = _mm_add_epi32 (tmp1, tmp2);               \
+}
+#define SHA256_STEP_R(a,b,c,d,e,f,g,h, x,x1,x2,x3, K)\
+{                                                    \
+	R(x,x1,x2,x3);								     \
+    tmp1 = _mm_add_epi32 (h,    S1(e));              \
+    tmp1 = _mm_add_epi32 (tmp1, Ch(e,f,g));          \
+    tmp1 = _mm_add_epi32 (tmp1, _mm_set1_epi32(K));  \
+    tmp1 = _mm_add_epi32 (tmp1, wx);				 \
+    tmp2 = _mm_add_epi32 (S0(a),Maj(a,b,c));         \
+    d    = _mm_add_epi32 (tmp1, d);                  \
+    h    = _mm_add_epi32 (tmp1, tmp2);               \
+}
+
+// this macro was used to create the new macros for the smaller w16 array.
+/*
+#define SHA256_STEP(a,b,c,d,e,f,g,h,x,K)       \
+	printf ("_SHA256_STEP(%s,%s,%s,%s,%s,%s,%s,%s, %d,%d,%2d,%2d, 0x%08x);\n", \
+                        #a, #b, #c, #d, #e, #f, #g, #h, \
+                        (x)%16, (x-2)>15?(x-2)%16:x-2, (x-7)>15?(x-7)%16:x-7, (x-15)>15?(x-15)%16:x-15, K);
+*/
+
+/* TODO:
+ *  1. (DONE) try to get w array down to w32.  (Actually, now it is ONLY 16 in size.
+ *            the data array is only required to be 16 elements also.
+ *  2. (DONE) Get sha224 working (different IV, and only copy 224 bits)
+ *  3. (DONE, needs tested.) Handle the init, so we can do more than 1 block.
+ *  4. (DONE) try to make this function work properly with either a 'flat' input or a more common (in JtR lingo), COEF mixed set of data
+ *  5. (DONE) Redid the out, into a MMX mixed blob, and not 8 arrays
+ *  6. (DONE) Separated the reload array from the out array.  Required for work like PBKDF2, where we capture first block value, then replay it over and over.
+ *  6. Optimizations.  Look at intel, AMD, newest intel, newest AMD, etc performances.
+ *  7. See if we can do anything better using 'DO_PARA' type methods, like we do in SHA1/MD4/5
+ */
+#if defined (MMX_COEF_SHA256)
+void SSESHA256body(__m128i *data, ARCH_WORD_32 *out, ARCH_WORD_32 *reload_state, unsigned SSEi_flags)
+{
+	__m128i a, b, c, d, e, f, g, h;
+	union {
+		__m128i w16;
+		ARCH_WORD_32 p16*sizeof(__m128i)/sizeof(ARCH_WORD_32);
+
+	}_w;
+	__m128i tmp1, tmp2, *w=_w.w;
+	ARCH_WORD_32 *saved_key=0;
+
+	int i;
+	if (SSEi_flags & SSEi_FLAT_IN) {
+
+#ifdef __SSE4_1__
+		saved_key = (ARCH_WORD_32 *)data;
+		if (SSEi_flags & SSEi_4BUF_INPUT) {
+			for (i=0; i < 14; ++i) { GATHER_4x (wi, saved_key, i); SWAP_ENDIAN (wi); }
+			GATHER_4x (w14, saved_key, 14);
+			GATHER_4x (w15, saved_key, 15);
+		} else if (SSEi_flags & SSEi_2BUF_INPUT) {
+			for (i=0; i < 14; ++i) { GATHER_2x (wi, saved_key, i); SWAP_ENDIAN (wi); }
+			GATHER_2x (w14, saved_key, 14);
+			GATHER_2x (w15, saved_key, 15);
+		} else {
+			for (i=0; i < 14; ++i) { GATHER (wi, saved_key, i); SWAP_ENDIAN (wi); }
+			GATHER (w14, saved_key, 14);
+			GATHER (w15, saved_key, 15);
+		}
+		if ( ((SSEi_flags & SSEi_2BUF_INPUT_FIRST_BLK) == SSEi_2BUF_INPUT_FIRST_BLK) ||
+			 ((SSEi_flags & SSEi_4BUF_INPUT_FIRST_BLK) == SSEi_4BUF_INPUT_FIRST_BLK)) {
+			SWAP_ENDIAN (w14);
+			SWAP_ENDIAN (w15);
+		}
+#else
+		int j;
+		ARCH_WORD_32 *p = _w.p;
+		saved_key = (ARCH_WORD_32 *)data;
+		if (SSEi_flags & SSEi_4BUF_INPUT) {
+			for (j=0; j < 16; j++)
+				for (i=0; i < MMX_COEF_SHA256; i++)
+					*p++ = saved_key(i<<6)+j;
+		} else if (SSEi_flags & SSEi_2BUF_INPUT) {
+			for (j=0; j < 16; j++)
+				for (i=0; i < MMX_COEF_SHA256; i++)
+					*p++ = saved_key(i<<5)+j;
+		} else {
+			for (j=0; j < 16; j++)
+				for (i=0; i < MMX_COEF_SHA256; i++)
+					*p++ = saved_key(i<<4)+j;
+		}
+		for (i=0; i < 14; i++)
+			SWAP_ENDIAN (wi);
+		if ( ((SSEi_flags & SSEi_2BUF_INPUT_FIRST_BLK) == SSEi_2BUF_INPUT_FIRST_BLK) ||
+			 ((SSEi_flags & SSEi_4BUF_INPUT_FIRST_BLK) == SSEi_4BUF_INPUT_FIRST_BLK)) {
+			SWAP_ENDIAN (w14);
+			SWAP_ENDIAN (w15);
+		}
+#endif
+	} else
+		memcpy(w, data, 16*sizeof(__m128i));
+
+//	dump_stuff_shammx(w, 64, 0);
+
+
+	if (SSEi_flags & SSEi_RELOAD) {
+		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
+		{
+			i=0; // later if we do PARA, i will be used in the PARA_FOR loop
+			a = _mm_load_si128((__m128i *)&reload_statei*16*4+0);
+			b = _mm_load_si128((__m128i *)&reload_statei*16*4+4);
+			c = _mm_load_si128((__m128i *)&reload_statei*16*4+8);
+			d = _mm_load_si128((__m128i *)&reload_statei*16*4+12);
+			e = _mm_load_si128((__m128i *)&reload_statei*16*4+16);
+			f = _mm_load_si128((__m128i *)&reload_statei*16*4+20);
+			g = _mm_load_si128((__m128i *)&reload_statei*16*4+24);
+			h = _mm_load_si128((__m128i *)&reload_statei*16*4+28);
+		}
+		else
+		{
+			i=0;
+			a = _mm_load_si128((__m128i *)&reload_statei*32+0);
+			b = _mm_load_si128((__m128i *)&reload_statei*32+4);
+			c = _mm_load_si128((__m128i *)&reload_statei*32+8);
+			d = _mm_load_si128((__m128i *)&reload_statei*32+12);
+			e = _mm_load_si128((__m128i *)&reload_statei*32+16);
+			f = _mm_load_si128((__m128i *)&reload_statei*32+20);
+			g = _mm_load_si128((__m128i *)&reload_statei*32+24);
+			h = _mm_load_si128((__m128i *)&reload_statei*32+28);
+		}
+	} else {
+		if (SSEi_flags & SSEi_CRYPT_SHA224) {
+			/* SHA-224 IV */
+			a = _mm_set1_epi32 (0xc1059ed8);
+			b = _mm_set1_epi32 (0x367cd507);
+			c = _mm_set1_epi32 (0x3070dd17);
+			d = _mm_set1_epi32 (0xf70e5939);
+			e = _mm_set1_epi32 (0xffc00b31);
+			f = _mm_set1_epi32 (0x68581511);
+			g = _mm_set1_epi32 (0x64f98fa7);
+			h = _mm_set1_epi32 (0xbefa4fa4);
+		} else {
+			// SHA-256 IV */
+			a = _mm_set1_epi32 (0x6a09e667);
+			b = _mm_set1_epi32 (0xbb67ae85);
+			c = _mm_set1_epi32 (0x3c6ef372);
+			d = _mm_set1_epi32 (0xa54ff53a);
+			e = _mm_set1_epi32 (0x510e527f);
+			f = _mm_set1_epi32 (0x9b05688c);
+			g = _mm_set1_epi32 (0x1f83d9ab);
+			h = _mm_set1_epi32 (0x5be0cd19);
+		}
+	}
+	SHA256_STEP0(a, b, c, d, e, f, g, h,  0, 0x428a2f98);
+	SHA256_STEP0(h, a, b, c, d, e, f, g,  1, 0x71374491);
+	SHA256_STEP0(g, h, a, b, c, d, e, f,  2, 0xb5c0fbcf);
+	SHA256_STEP0(f, g, h, a, b, c, d, e,  3, 0xe9b5dba5);
+	SHA256_STEP0(e, f, g, h, a, b, c, d,  4, 0x3956c25b);
+	SHA256_STEP0(d, e, f, g, h, a, b, c,  5, 0x59f111f1);
+	SHA256_STEP0(c, d, e, f, g, h, a, b,  6, 0x923f82a4);
+	SHA256_STEP0(b, c, d, e, f, g, h, a,  7, 0xab1c5ed5);
+	SHA256_STEP0(a, b, c, d, e, f, g, h,  8, 0xd807aa98);
+	SHA256_STEP0(h, a, b, c, d, e, f, g,  9, 0x12835b01);
+	SHA256_STEP0(g, h, a, b, c, d, e, f, 10, 0x243185be);
+	SHA256_STEP0(f, g, h, a, b, c, d, e, 11, 0x550c7dc3);
+	SHA256_STEP0(e, f, g, h, a, b, c, d, 12, 0x72be5d74);
+	SHA256_STEP0(d, e, f, g, h, a, b, c, 13, 0x80deb1fe);
+	SHA256_STEP0(c, d, e, f, g, h, a, b, 14, 0x9bdc06a7);
+	SHA256_STEP0(b, c, d, e, f, g, h, a, 15, 0xc19bf174);
+
+	SHA256_STEP_R(a,b,c,d,e,f,g,h,  0,14, 9, 1, 0xe49b69c1);
+	SHA256_STEP_R(h,a,b,c,d,e,f,g,  1,15,10, 2, 0xefbe4786);
+	SHA256_STEP_R(g,h,a,b,c,d,e,f,  2, 0,11, 3, 0x0fc19dc6);
+	SHA256_STEP_R(f,g,h,a,b,c,d,e,  3, 1,12, 4, 0x240ca1cc);
+	SHA256_STEP_R(e,f,g,h,a,b,c,d,  4, 2,13, 5, 0x2de92c6f);
+	SHA256_STEP_R(d,e,f,g,h,a,b,c,  5, 3,14, 6, 0x4a7484aa);
+	SHA256_STEP_R(c,d,e,f,g,h,a,b,  6, 4,15, 7, 0x5cb0a9dc);
+	SHA256_STEP_R(b,c,d,e,f,g,h,a,  7, 5, 0, 8, 0x76f988da);
+	SHA256_STEP_R(a,b,c,d,e,f,g,h,  8, 6, 1, 9, 0x983e5152);
+	SHA256_STEP_R(h,a,b,c,d,e,f,g,  9, 7, 2,10, 0xa831c66d);
+	SHA256_STEP_R(g,h,a,b,c,d,e,f, 10, 8, 3,11, 0xb00327c8);
+	SHA256_STEP_R(f,g,h,a,b,c,d,e, 11, 9, 4,12, 0xbf597fc7);
+	SHA256_STEP_R(e,f,g,h,a,b,c,d, 12,10, 5,13, 0xc6e00bf3);
+	SHA256_STEP_R(d,e,f,g,h,a,b,c, 13,11, 6,14, 0xd5a79147);
+	SHA256_STEP_R(c,d,e,f,g,h,a,b, 14,12, 7,15, 0x06ca6351);
+	SHA256_STEP_R(b,c,d,e,f,g,h,a, 15,13, 8, 0, 0x14292967);
+
+	SHA256_STEP_R(a,b,c,d,e,f,g,h,  0,14, 9, 1, 0x27b70a85);
+	SHA256_STEP_R(h,a,b,c,d,e,f,g,  1,15,10, 2, 0x2e1b2138);
+	SHA256_STEP_R(g,h,a,b,c,d,e,f,  2, 0,11, 3, 0x4d2c6dfc);
+	SHA256_STEP_R(f,g,h,a,b,c,d,e,  3, 1,12, 4, 0x53380d13);
+	SHA256_STEP_R(e,f,g,h,a,b,c,d,  4, 2,13, 5, 0x650a7354);
+	SHA256_STEP_R(d,e,f,g,h,a,b,c,  5, 3,14, 6, 0x766a0abb);
+	SHA256_STEP_R(c,d,e,f,g,h,a,b,  6, 4,15, 7, 0x81c2c92e);
+	SHA256_STEP_R(b,c,d,e,f,g,h,a,  7, 5, 0, 8, 0x92722c85);
+	SHA256_STEP_R(a,b,c,d,e,f,g,h,  8, 6, 1, 9, 0xa2bfe8a1);
+	SHA256_STEP_R(h,a,b,c,d,e,f,g,  9, 7, 2,10, 0xa81a664b);
+	SHA256_STEP_R(g,h,a,b,c,d,e,f, 10, 8, 3,11, 0xc24b8b70);
+	SHA256_STEP_R(f,g,h,a,b,c,d,e, 11, 9, 4,12, 0xc76c51a3);
+	SHA256_STEP_R(e,f,g,h,a,b,c,d, 12,10, 5,13, 0xd192e819);
+	SHA256_STEP_R(d,e,f,g,h,a,b,c, 13,11, 6,14, 0xd6990624);
+	SHA256_STEP_R(c,d,e,f,g,h,a,b, 14,12, 7,15, 0xf40e3585);
+	SHA256_STEP_R(b,c,d,e,f,g,h,a, 15,13, 8, 0, 0x106aa070);
+
+	SHA256_STEP_R(a,b,c,d,e,f,g,h,  0,14, 9, 1, 0x19a4c116);
+	SHA256_STEP_R(h,a,b,c,d,e,f,g,  1,15,10, 2, 0x1e376c08);
+	SHA256_STEP_R(g,h,a,b,c,d,e,f,  2, 0,11, 3, 0x2748774c);
+	SHA256_STEP_R(f,g,h,a,b,c,d,e,  3, 1,12, 4, 0x34b0bcb5);
+	SHA256_STEP_R(e,f,g,h,a,b,c,d,  4, 2,13, 5, 0x391c0cb3);
+	SHA256_STEP_R(d,e,f,g,h,a,b,c,  5, 3,14, 6, 0x4ed8aa4a);
+	SHA256_STEP_R(c,d,e,f,g,h,a,b,  6, 4,15, 7, 0x5b9cca4f);
+	SHA256_STEP_R(b,c,d,e,f,g,h,a,  7, 5, 0, 8, 0x682e6ff3);
+	SHA256_STEP_R(a,b,c,d,e,f,g,h,  8, 6, 1, 9, 0x748f82ee);
+	SHA256_STEP_R(h,a,b,c,d,e,f,g,  9, 7, 2,10, 0x78a5636f);
+	SHA256_STEP_R(g,h,a,b,c,d,e,f, 10, 8, 3,11, 0x84c87814);
+	SHA256_STEP_R(f,g,h,a,b,c,d,e, 11, 9, 4,12, 0x8cc70208);
+	SHA256_STEP_R(e,f,g,h,a,b,c,d, 12,10, 5,13, 0x90befffa);
+	SHA256_STEP_R(d,e,f,g,h,a,b,c, 13,11, 6,14, 0xa4506ceb);
+	SHA256_STEP_R(c,d,e,f,g,h,a,b, 14,12, 7,15, 0xbef9a3f7);
+	SHA256_STEP_R(b,c,d,e,f,g,h,a, 15,13, 8, 0, 0xc67178f2);
+
+	if (SSEi_flags & SSEi_RELOAD) {
+		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
+		{
+			i=0; // later if we do PARA, i will be used in the PARA_FOR loop
+			a = _mm_add_epi32(a,_mm_load_si128((__m128i *)&reload_statei*16*2+0));
+			b = _mm_add_epi32(b,_mm_load_si128((__m128i *)&reload_statei*16*2+4));
+			c = _mm_add_epi32(c,_mm_load_si128((__m128i *)&reload_statei*16*2+8));
+			d = _mm_add_epi32(d,_mm_load_si128((__m128i *)&reload_statei*16*2+12));
+			e = _mm_add_epi32(e,_mm_load_si128((__m128i *)&reload_statei*16*2+16));
+			f = _mm_add_epi32(f,_mm_load_si128((__m128i *)&reload_statei*16*2+20));
+			g = _mm_add_epi32(g,_mm_load_si128((__m128i *)&reload_statei*16*2+24));
+			h = _mm_add_epi32(h,_mm_load_si128((__m128i *)&reload_statei*16*2+28));
+		}
+		else
+		{
+			i=0;
+			a = _mm_add_epi32(a,_mm_load_si128((__m128i *)&reload_statei*32+0));
+			b = _mm_add_epi32(b,_mm_load_si128((__m128i *)&reload_statei*32+4));
+			c = _mm_add_epi32(c,_mm_load_si128((__m128i *)&reload_statei*32+8));
+			d = _mm_add_epi32(d,_mm_load_si128((__m128i *)&reload_statei*32+12));
+			e = _mm_add_epi32(e,_mm_load_si128((__m128i *)&reload_statei*32+16));
+			f = _mm_add_epi32(f,_mm_load_si128((__m128i *)&reload_statei*32+20));
+			g = _mm_add_epi32(g,_mm_load_si128((__m128i *)&reload_statei*32+24));
+			h = _mm_add_epi32(h,_mm_load_si128((__m128i *)&reload_statei*32+28));
+		}
+	} else if ((SSEi_flags & SSEi_SKIP_FINAL_ADD) == 0) {
+		if (SSEi_flags & SSEi_CRYPT_SHA224) {
+			/* SHA-224 IV */
+			a = _mm_add_epi32 (a, _mm_set1_epi32 (0xc1059ed8));
+			b = _mm_add_epi32 (b, _mm_set1_epi32 (0x367cd507));
+			c = _mm_add_epi32 (c, _mm_set1_epi32 (0x3070dd17));
+			d = _mm_add_epi32 (d, _mm_set1_epi32 (0xf70e5939));
+			e = _mm_add_epi32 (e, _mm_set1_epi32 (0xffc00b31));
+			f = _mm_add_epi32 (f, _mm_set1_epi32 (0x68581511));
+			g = _mm_add_epi32 (g, _mm_set1_epi32 (0x64f98fa7));
+			h = _mm_add_epi32 (h, _mm_set1_epi32 (0xbefa4fa4));
+		} else {
+			/* SHA-256 IV */
+			a = _mm_add_epi32 (a, _mm_set1_epi32 (0x6a09e667));
+			b = _mm_add_epi32 (b, _mm_set1_epi32 (0xbb67ae85));
+			c = _mm_add_epi32 (c, _mm_set1_epi32 (0x3c6ef372));
+			d = _mm_add_epi32 (d, _mm_set1_epi32 (0xa54ff53a));
+			e = _mm_add_epi32 (e, _mm_set1_epi32 (0x510e527f));
+			f = _mm_add_epi32 (f, _mm_set1_epi32 (0x9b05688c));
+			g = _mm_add_epi32 (g, _mm_set1_epi32 (0x1f83d9ab));
+			h = _mm_add_epi32 (h, _mm_set1_epi32 (0x5be0cd19));
+		}
+	}
+	if (SSEi_flags & SSEi_SWAP_FINAL) {
+		/* NOTE, if we swap OUT of BE into proper LE, then this can not be
+		 * used in a sha256_flags&SHA256_RELOAD manner, without swapping back into BE format.
+		 * NORMALLY, a format will switch binary values into BE format at start, and then
+		 * just take the 'normal' non swapped output of this function (i.e. keep it in BE) */
+		SWAP_ENDIAN (a);
+		SWAP_ENDIAN (b);
+		SWAP_ENDIAN (c);
+		SWAP_ENDIAN (d);
+		SWAP_ENDIAN (e);
+		SWAP_ENDIAN (f);
+		SWAP_ENDIAN (g);
+		SWAP_ENDIAN (h);
+	}
+	/* We store the MMX_mixed values.  This will be in proper 'mixed' format, in BE
+	 * format (i.e. correct to reload on a subsquent call), UNLESS, swapped in the prior
+	 * if statement (the SHA256_SWAP_FINAL) */
+	if (SSEi_flags & SSEi_OUTPUT_AS_INP_FMT)
+	{
+		i=0;
+		//SHA512_PARA_DO(i)
+		{
+			_mm_store_si128((__m128i *)&outi*16*4+0, a);
+			_mm_store_si128((__m128i *)&outi*16*4+4, b);
+			_mm_store_si128((__m128i *)&outi*16*4+8, c);
+			_mm_store_si128((__m128i *)&outi*16*4+12, d);
+			_mm_store_si128((__m128i *)&outi*16*4+16, e);
+			_mm_store_si128((__m128i *)&outi*16*4+20, f);
+			_mm_store_si128((__m128i *)&outi*16*4+24, g);
+			_mm_store_si128((__m128i *)&outi*16*4+28, h);
+		}
+	}
+	else
+	{
+		i=0;
+		//SHA512_PARA_DO(i)
+		{
+			_mm_store_si128 ((__m128i *)&(outi*32+0), a);
+			_mm_store_si128 ((__m128i *)&(outi*32+4), b);
+			_mm_store_si128 ((__m128i *)&(outi*32+8), c);
+			_mm_store_si128 ((__m128i *)&(outi*32+12), d);
+			_mm_store_si128 ((__m128i *)&(outi*32+16), e);
+			_mm_store_si128 ((__m128i *)&(outi*32+20), f);
+			_mm_store_si128 ((__m128i *)&(outi*32+24), g);
+			_mm_store_si128 ((__m128i *)&(outi*32+28), h);
+		}
+	}
+
+}
+#endif
+
+/* SHA-512 below */
+
+#undef S0
+#define S0(x)                          \
+(                                      \
+    _mm_xor_si128 (                    \
+        _mm_roti_epi64 (x, -39),       \
+        _mm_xor_si128 (                \
+            _mm_roti_epi64 (x, -28),   \
+            _mm_roti_epi64 (x, -34)    \
+        )                              \
+    )                                  \
+)
+
+#undef S1
+#define S1(x)                          \
+(                                      \
+    _mm_xor_si128 (                    \
+        _mm_roti_epi64 (x, -41),       \
+        _mm_xor_si128 (                \
+            _mm_roti_epi64 (x, -14),   \
+            _mm_roti_epi64 (x, -18)    \
+        )                              \
+    )                                  \
+)
+
+#undef s0
+#define s0(x)                          \
+(                                      \
+    _mm_xor_si128 (                    \
+        _mm_srli_epi64 (x, 7),         \
+        _mm_xor_si128 (                \
+            _mm_roti_epi64 (x, -1),    \
+            _mm_roti_epi64 (x, -8)     \
+        )                              \
+    )                                  \
+)
+
+#undef s1
+#define s1(x)                          \
+(                                      \
+    _mm_xor_si128 (                    \
+        _mm_srli_epi64 (x, 6),         \
+        _mm_xor_si128 (                \
+            _mm_roti_epi64 (x, -19),   \
+            _mm_roti_epi64 (x, -61)    \
+        )                              \
+    )                                  \
+)
+
+#define Maj(x,y,z) _mm_cmov_si128 (x, y, _mm_xor_si128 (z, y))
+
+#define Ch(x,y,z)  _mm_cmov_si128 (y, z, x)
+
+#undef R
+#define R(t)                                         \
+{                                                    \
+    tmp1 = _mm_add_epi64 (s1(wt -  2), wt - 7);  \
+    tmp2 = _mm_add_epi64 (s0(wt - 15), wt - 16); \
+    wt = _mm_add_epi64 (tmp1, tmp2);               \
+}
+
+#define SHA512_STEP(a,b,c,d,e,f,g,h,x,K)             \
+{                                                    \
+    tmp1 = _mm_add_epi64 (h,    wx);               \
+    tmp2 = _mm_add_epi64 (S1(e),_mm_set1_epi64x(K)); \
+    tmp1 = _mm_add_epi64 (tmp1, Ch(e,f,g));          \
+    tmp1 = _mm_add_epi64 (tmp1, tmp2);               \
+    tmp2 = _mm_add_epi64 (S0(a),Maj(a,b,c));         \
+    d    = _mm_add_epi64 (tmp1, d);                  \
+    h    = _mm_add_epi64 (tmp1, tmp2);               \
+}
+
+#if defined (MMX_COEF_SHA512)
+void SSESHA512body(__m128i* data, ARCH_WORD_64 *out, ARCH_WORD_64 *reload_state, unsigned SSEi_flags)
+{
+	int i;
+
+	__m128i a, b, c, d, e, f, g, h;
+	__m128i w80, tmp1, tmp2;
+
+	if (SSEi_flags & SSEi_FLAT_IN) {
+
+		if (SSEi_flags & SSEi_2BUF_INPUT) {
+			ARCH_WORD_64 (*saved_key)32 = (ARCH_WORD_64(*)32)data;
+			for (i = 0; i < 14; i += 2) {
+				GATHER64 (tmp1, saved_key, i);
+				GATHER64 (tmp2, saved_key, i + 1);
+				SWAP_ENDIAN64 (tmp1);
+				SWAP_ENDIAN64 (tmp2);
+				wi = tmp1;
+				wi + 1 = tmp2;
+			}
+			GATHER64 (tmp1, saved_key, 14);
+			GATHER64 (tmp2, saved_key, 15);
+		} else {
+			ARCH_WORD_64 (*saved_key)16 = (ARCH_WORD_64(*)16)data;
+			for (i = 0; i < 14; i += 2) {
+				GATHER64 (tmp1, saved_key, i);
+				GATHER64 (tmp2, saved_key, i + 1);
+				SWAP_ENDIAN64 (tmp1);
+				SWAP_ENDIAN64 (tmp2);
+				wi = tmp1;
+				wi + 1 = tmp2;
+			}
+			GATHER64 (tmp1, saved_key, 14);
+			GATHER64 (tmp2, saved_key, 15);
+		}
+		if ( ((SSEi_flags & SSEi_2BUF_INPUT_FIRST_BLK) == SSEi_2BUF_INPUT_FIRST_BLK)) {
+			SWAP_ENDIAN64 (tmp1);
+			SWAP_ENDIAN64 (tmp2);
+		}
+		w14 = tmp1;
+		w15 = tmp2;
+	} else
+		memcpy(w, data, 16*sizeof(__m128i));
+
+	for (i = 16; i < 80; i++)
+		R(i);
+
+	if (SSEi_flags & SSEi_RELOAD) {
+		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
+		{
+			i=0; // later if we do PARA, i will be used in the PARA_FOR loop
+			a = _mm_load_si128((__m128i *)&reload_statei*(16/2)*8+( 0/2));
+			b = _mm_load_si128((__m128i *)&reload_statei*(16/2)*8+( 4/2));
+			c = _mm_load_si128((__m128i *)&reload_statei*(16/2)*8+( 8/2));
+			d = _mm_load_si128((__m128i *)&reload_statei*(16/2)*8+(12/2));
+			e = _mm_load_si128((__m128i *)&reload_statei*(16/2)*8+(16/2));
+			f = _mm_load_si128((__m128i *)&reload_statei*(16/2)*8+(20/2));
+			g = _mm_load_si128((__m128i *)&reload_statei*(16/2)*8+(24/2));
+			h = _mm_load_si128((__m128i *)&reload_statei*(16/2)*8+(28/2));
+		}
+		else
+		{
+			i=0;
+			a = _mm_load_si128((__m128i *)&reload_statei*(32/2)+( 0/2));
+			b = _mm_load_si128((__m128i *)&reload_statei*(32/2)+( 4/2));
+			c = _mm_load_si128((__m128i *)&reload_statei*(32/2)+( 8/2));
+			d = _mm_load_si128((__m128i *)&reload_statei*(32/2)+(12/2));
+			e = _mm_load_si128((__m128i *)&reload_statei*(32/2)+(16/2));
+			f = _mm_load_si128((__m128i *)&reload_statei*(32/2)+(20/2));
+			g = _mm_load_si128((__m128i *)&reload_statei*(32/2)+(24/2));
+			h = _mm_load_si128((__m128i *)&reload_statei*(32/2)+(28/2));
+		}
+	} else {
+		if (SSEi_flags & SSEi_CRYPT_SHA384) {
+			/* SHA-384 IV */
+			a = _mm_set1_epi64x (0xcbbb9d5dc1059ed8ULL);
+			b = _mm_set1_epi64x (0x629a292a367cd507ULL);
+			c = _mm_set1_epi64x (0x9159015a3070dd17ULL);
+			d = _mm_set1_epi64x (0x152fecd8f70e5939ULL);
+			e = _mm_set1_epi64x (0x67332667ffc00b31ULL);
+			f = _mm_set1_epi64x (0x8eb44a8768581511ULL);
+			g = _mm_set1_epi64x (0xdb0c2e0d64f98fa7ULL);
+			h = _mm_set1_epi64x (0x47b5481dbefa4fa4ULL);
+		} else {
+			// SHA-512 IV */
+			a = _mm_set1_epi64x (0x6a09e667f3bcc908ULL);
+			b = _mm_set1_epi64x (0xbb67ae8584caa73bULL);
+			c = _mm_set1_epi64x (0x3c6ef372fe94f82bULL);
+			d = _mm_set1_epi64x (0xa54ff53a5f1d36f1ULL);
+			e = _mm_set1_epi64x (0x510e527fade682d1ULL);
+			f = _mm_set1_epi64x (0x9b05688c2b3e6c1fULL);
+			g = _mm_set1_epi64x (0x1f83d9abfb41bd6bULL);
+			h = _mm_set1_epi64x (0x5be0cd19137e2179ULL);
+		}
+	}
+
+	SHA512_STEP(a, b, c, d, e, f, g, h,  0, 0x428a2f98d728ae22ULL);
+	SHA512_STEP(h, a, b, c, d, e, f, g,  1, 0x7137449123ef65cdULL);
+	SHA512_STEP(g, h, a, b, c, d, e, f,  2, 0xb5c0fbcfec4d3b2fULL);
+	SHA512_STEP(f, g, h, a, b, c, d, e,  3, 0xe9b5dba58189dbbcULL);
+	SHA512_STEP(e, f, g, h, a, b, c, d,  4, 0x3956c25bf348b538ULL);
+	SHA512_STEP(d, e, f, g, h, a, b, c,  5, 0x59f111f1b605d019ULL);
+	SHA512_STEP(c, d, e, f, g, h, a, b,  6, 0x923f82a4af194f9bULL);
+	SHA512_STEP(b, c, d, e, f, g, h, a,  7, 0xab1c5ed5da6d8118ULL);
+	SHA512_STEP(a, b, c, d, e, f, g, h,  8, 0xd807aa98a3030242ULL);
+	SHA512_STEP(h, a, b, c, d, e, f, g,  9, 0x12835b0145706fbeULL);
+	SHA512_STEP(g, h, a, b, c, d, e, f, 10, 0x243185be4ee4b28cULL);
+	SHA512_STEP(f, g, h, a, b, c, d, e, 11, 0x550c7dc3d5ffb4e2ULL);
+	SHA512_STEP(e, f, g, h, a, b, c, d, 12, 0x72be5d74f27b896fULL);
+	SHA512_STEP(d, e, f, g, h, a, b, c, 13, 0x80deb1fe3b1696b1ULL);
+	SHA512_STEP(c, d, e, f, g, h, a, b, 14, 0x9bdc06a725c71235ULL);
+	SHA512_STEP(b, c, d, e, f, g, h, a, 15, 0xc19bf174cf692694ULL);
+
+	SHA512_STEP(a, b, c, d, e, f, g, h, 16, 0xe49b69c19ef14ad2ULL);
+	SHA512_STEP(h, a, b, c, d, e, f, g, 17, 0xefbe4786384f25e3ULL);
+	SHA512_STEP(g, h, a, b, c, d, e, f, 18, 0x0fc19dc68b8cd5b5ULL);
+	SHA512_STEP(f, g, h, a, b, c, d, e, 19, 0x240ca1cc77ac9c65ULL);
+	SHA512_STEP(e, f, g, h, a, b, c, d, 20, 0x2de92c6f592b0275ULL);
+	SHA512_STEP(d, e, f, g, h, a, b, c, 21, 0x4a7484aa6ea6e483ULL);
+	SHA512_STEP(c, d, e, f, g, h, a, b, 22, 0x5cb0a9dcbd41fbd4ULL);
+	SHA512_STEP(b, c, d, e, f, g, h, a, 23, 0x76f988da831153b5ULL);
+	SHA512_STEP(a, b, c, d, e, f, g, h, 24, 0x983e5152ee66dfabULL);
+	SHA512_STEP(h, a, b, c, d, e, f, g, 25, 0xa831c66d2db43210ULL);
+	SHA512_STEP(g, h, a, b, c, d, e, f, 26, 0xb00327c898fb213fULL);
+	SHA512_STEP(f, g, h, a, b, c, d, e, 27, 0xbf597fc7beef0ee4ULL);
+	SHA512_STEP(e, f, g, h, a, b, c, d, 28, 0xc6e00bf33da88fc2ULL);
+	SHA512_STEP(d, e, f, g, h, a, b, c, 29, 0xd5a79147930aa725ULL);
+	SHA512_STEP(c, d, e, f, g, h, a, b, 30, 0x06ca6351e003826fULL);
+	SHA512_STEP(b, c, d, e, f, g, h, a, 31, 0x142929670a0e6e70ULL);
+
+	SHA512_STEP(a, b, c, d, e, f, g, h, 32, 0x27b70a8546d22ffcULL);
+	SHA512_STEP(h, a, b, c, d, e, f, g, 33, 0x2e1b21385c26c926ULL);
+	SHA512_STEP(g, h, a, b, c, d, e, f, 34, 0x4d2c6dfc5ac42aedULL);
+	SHA512_STEP(f, g, h, a, b, c, d, e, 35, 0x53380d139d95b3dfULL);
+	SHA512_STEP(e, f, g, h, a, b, c, d, 36, 0x650a73548baf63deULL);
+	SHA512_STEP(d, e, f, g, h, a, b, c, 37, 0x766a0abb3c77b2a8ULL);
+	SHA512_STEP(c, d, e, f, g, h, a, b, 38, 0x81c2c92e47edaee6ULL);
+	SHA512_STEP(b, c, d, e, f, g, h, a, 39, 0x92722c851482353bULL);
+	SHA512_STEP(a, b, c, d, e, f, g, h, 40, 0xa2bfe8a14cf10364ULL);
+	SHA512_STEP(h, a, b, c, d, e, f, g, 41, 0xa81a664bbc423001ULL);
+	SHA512_STEP(g, h, a, b, c, d, e, f, 42, 0xc24b8b70d0f89791ULL);
+	SHA512_STEP(f, g, h, a, b, c, d, e, 43, 0xc76c51a30654be30ULL);
+	SHA512_STEP(e, f, g, h, a, b, c, d, 44, 0xd192e819d6ef5218ULL);
+	SHA512_STEP(d, e, f, g, h, a, b, c, 45, 0xd69906245565a910ULL);
+	SHA512_STEP(c, d, e, f, g, h, a, b, 46, 0xf40e35855771202aULL);
+	SHA512_STEP(b, c, d, e, f, g, h, a, 47, 0x106aa07032bbd1b8ULL);
+
+	SHA512_STEP(a, b, c, d, e, f, g, h, 48, 0x19a4c116b8d2d0c8ULL);
+	SHA512_STEP(h, a, b, c, d, e, f, g, 49, 0x1e376c085141ab53ULL);
+	SHA512_STEP(g, h, a, b, c, d, e, f, 50, 0x2748774cdf8eeb99ULL);
+	SHA512_STEP(f, g, h, a, b, c, d, e, 51, 0x34b0bcb5e19b48a8ULL);
+	SHA512_STEP(e, f, g, h, a, b, c, d, 52, 0x391c0cb3c5c95a63ULL);
+	SHA512_STEP(d, e, f, g, h, a, b, c, 53, 0x4ed8aa4ae3418acbULL);
+	SHA512_STEP(c, d, e, f, g, h, a, b, 54, 0x5b9cca4f7763e373ULL);
+	SHA512_STEP(b, c, d, e, f, g, h, a, 55, 0x682e6ff3d6b2b8a3ULL);
+	SHA512_STEP(a, b, c, d, e, f, g, h, 56, 0x748f82ee5defb2fcULL);
+	SHA512_STEP(h, a, b, c, d, e, f, g, 57, 0x78a5636f43172f60ULL);
+	SHA512_STEP(g, h, a, b, c, d, e, f, 58, 0x84c87814a1f0ab72ULL);
+	SHA512_STEP(f, g, h, a, b, c, d, e, 59, 0x8cc702081a6439ecULL);
+	SHA512_STEP(e, f, g, h, a, b, c, d, 60, 0x90befffa23631e28ULL);
+	SHA512_STEP(d, e, f, g, h, a, b, c, 61, 0xa4506cebde82bde9ULL);
+	SHA512_STEP(c, d, e, f, g, h, a, b, 62, 0xbef9a3f7b2c67915ULL);
+	SHA512_STEP(b, c, d, e, f, g, h, a, 63, 0xc67178f2e372532bULL);
+
+	SHA512_STEP(a, b, c, d, e, f, g, h, 64, 0xca273eceea26619cULL);
+	SHA512_STEP(h, a, b, c, d, e, f, g, 65, 0xd186b8c721c0c207ULL);
+	SHA512_STEP(g, h, a, b, c, d, e, f, 66, 0xeada7dd6cde0eb1eULL);
+	SHA512_STEP(f, g, h, a, b, c, d, e, 67, 0xf57d4f7fee6ed178ULL);
+	SHA512_STEP(e, f, g, h, a, b, c, d, 68, 0x06f067aa72176fbaULL);
+	SHA512_STEP(d, e, f, g, h, a, b, c, 69, 0x0a637dc5a2c898a6ULL);
+	SHA512_STEP(c, d, e, f, g, h, a, b, 70, 0x113f9804bef90daeULL);
+	SHA512_STEP(b, c, d, e, f, g, h, a, 71, 0x1b710b35131c471bULL);
+	SHA512_STEP(a, b, c, d, e, f, g, h, 72, 0x28db77f523047d84ULL);
+	SHA512_STEP(h, a, b, c, d, e, f, g, 73, 0x32caab7b40c72493ULL);
+	SHA512_STEP(g, h, a, b, c, d, e, f, 74, 0x3c9ebe0a15c9bebcULL);
+	SHA512_STEP(f, g, h, a, b, c, d, e, 75, 0x431d67c49c100d4cULL);
+	SHA512_STEP(e, f, g, h, a, b, c, d, 76, 0x4cc5d4becb3e42b6ULL);
+	SHA512_STEP(d, e, f, g, h, a, b, c, 77, 0x597f299cfc657e2aULL);
+	SHA512_STEP(c, d, e, f, g, h, a, b, 78, 0x5fcb6fab3ad6faecULL);
+	SHA512_STEP(b, c, d, e, f, g, h, a, 79, 0x6c44198c4a475817ULL);
+
+	if (SSEi_flags & SSEi_RELOAD) {
+		if ((SSEi_flags & SSEi_RELOAD_INP_FMT)==SSEi_RELOAD_INP_FMT)
+		{
+			i=0; // later if we do PARA, i will be used in the PARA_FOR loop
+			//SHA512_PARA_DO(i)
+			{
+				a = _mm_add_epi64(a,_mm_load_si128((__m128i *)&reload_statei*(16/2)*8+( 0/2)));
+				b = _mm_add_epi64(b,_mm_load_si128((__m128i *)&reload_statei*(16/2)*8+( 4/2)));
+				c = _mm_add_epi64(c,_mm_load_si128((__m128i *)&reload_statei*(16/2)*8+( 8/2)));
+				d = _mm_add_epi64(d,_mm_load_si128((__m128i *)&reload_statei*(16/2)*8+(12/2)));
+				e = _mm_add_epi64(e,_mm_load_si128((__m128i *)&reload_statei*(16/2)*8+(16/2)));
+				f = _mm_add_epi64(f,_mm_load_si128((__m128i *)&reload_statei*(16/2)*8+(20/2)));
+				g = _mm_add_epi64(g,_mm_load_si128((__m128i *)&reload_statei*(16/2)*8+(24/2)));
+				h = _mm_add_epi64(h,_mm_load_si128((__m128i *)&reload_statei*(16/2)*8+(28/2)));
+			}
+		}
+		else
+		{
+			i=0;
+			//SHA512_PARA_DO(i)
+			{
+				a = _mm_add_epi64(a,_mm_load_si128((__m128i *)&reload_statei*(32/2)+( 0/2)));
+				b = _mm_add_epi64(b,_mm_load_si128((__m128i *)&reload_statei*(32/2)+( 4/2)));
+				c = _mm_add_epi64(c,_mm_load_si128((__m128i *)&reload_statei*(32/2)+( 8/2)));
+				d = _mm_add_epi64(d,_mm_load_si128((__m128i *)&reload_statei*(32/2)+(12/2)));
+				e = _mm_add_epi64(e,_mm_load_si128((__m128i *)&reload_statei*(32/2)+(16/2)));
+				f = _mm_add_epi64(f,_mm_load_si128((__m128i *)&reload_statei*(32/2)+(20/2)));
+				g = _mm_add_epi64(g,_mm_load_si128((__m128i *)&reload_statei*(32/2)+(24/2)));
+				h = _mm_add_epi64(h,_mm_load_si128((__m128i *)&reload_statei*(32/2)+(28/2)));
+				}
+		}
+	} else if ((SSEi_flags & SSEi_SKIP_FINAL_ADD) == 0) {
+		if (SSEi_flags & SSEi_CRYPT_SHA384) {
+			/* SHA-384 IV */
+			a = _mm_add_epi64 (a, _mm_set1_epi64x (0xcbbb9d5dc1059ed8ULL));
+			b = _mm_add_epi64 (b, _mm_set1_epi64x (0x629a292a367cd507ULL));
+			c = _mm_add_epi64 (c, _mm_set1_epi64x (0x9159015a3070dd17ULL));
+			d = _mm_add_epi64 (d, _mm_set1_epi64x (0x152fecd8f70e5939ULL));
+			e = _mm_add_epi64 (e, _mm_set1_epi64x (0x67332667ffc00b31ULL));
+			f = _mm_add_epi64 (f, _mm_set1_epi64x (0x8eb44a8768581511ULL));
+			g = _mm_add_epi64 (g, _mm_set1_epi64x (0xdb0c2e0d64f98fa7ULL));
+			h = _mm_add_epi64 (h, _mm_set1_epi64x (0x47b5481dbefa4fa4ULL));
+		} else {
+			/* SHA-512 IV */
+			a = _mm_add_epi64 (a, _mm_set1_epi64x (0x6a09e667f3bcc908ULL));
+			b = _mm_add_epi64 (b, _mm_set1_epi64x (0xbb67ae8584caa73bULL));
+			c = _mm_add_epi64 (c, _mm_set1_epi64x (0x3c6ef372fe94f82bULL));
+			d = _mm_add_epi64 (d, _mm_set1_epi64x (0xa54ff53a5f1d36f1ULL));
+			e = _mm_add_epi64 (e, _mm_set1_epi64x (0x510e527fade682d1ULL));
+			f = _mm_add_epi64 (f, _mm_set1_epi64x (0x9b05688c2b3e6c1fULL));
+			g = _mm_add_epi64 (g, _mm_set1_epi64x (0x1f83d9abfb41bd6bULL));
+			h = _mm_add_epi64 (h, _mm_set1_epi64x (0x5be0cd19137e2179ULL));
+		}
+	}
+
+	if (SSEi_flags & SSEi_SWAP_FINAL) {
+		/* NOTE, if we swap OUT of BE into proper LE, then this can not be
+		 * used in a sha512_flags&SHA512_RELOAD manner, without swapping back into BE format.
+		 * NORMALLY, a format will switch binary values into BE format at start, and then
+		 * just take the 'normal' non swapped output of this function (i.e. keep it in BE) */
+		SWAP_ENDIAN64(a);
+		SWAP_ENDIAN64(b);
+		SWAP_ENDIAN64(c);
+		SWAP_ENDIAN64(d);
+		SWAP_ENDIAN64(e);
+		SWAP_ENDIAN64(f);
+		SWAP_ENDIAN64(g);
+		SWAP_ENDIAN64(h);
+	}
+
+	/* We store the MMX_mixed values.  This will be in proper 'mixed' format, in BE
+	 * format (i.e. correct to reload on a subsquent call), UNLESS, swapped in the prior
+	 * if statement (the SHA512_SWAP_FINAL) */
+	if (SSEi_flags & SSEi_OUTPUT_AS_INP_FMT)
+	{
+		i=0;
+		//SHA512_PARA_DO(i)
+		{
+			_mm_store_si128((__m128i *)&outi*(16/2)*8+( 0/2), a);
+			_mm_store_si128((__m128i *)&outi*(16/2)*8+( 4/2), b);
+			_mm_store_si128((__m128i *)&outi*(16/2)*8+( 8/2), c);
+			_mm_store_si128((__m128i *)&outi*(16/2)*8+(12/2), d);
+			_mm_store_si128((__m128i *)&outi*(16/2)*8+(16/2), e);
+			_mm_store_si128((__m128i *)&outi*(16/2)*8+(20/2), f);
+			_mm_store_si128((__m128i *)&outi*(16/2)*8+(24/2), g);
+			_mm_store_si128((__m128i *)&outi*(16/2)*8+(28/2), h);
+		}
+	}
+	else
+	{
+		i=0;
+		//SHA512_PARA_DO(i)
+		{
+			_mm_store_si128 ((__m128i *)&(outi*(32/2)+( 0/2)), a);
+			_mm_store_si128 ((__m128i *)&(outi*(32/2)+( 4/2)), b);
+			_mm_store_si128 ((__m128i *)&(outi*(32/2)+( 8/2)), c);
+			_mm_store_si128 ((__m128i *)&(outi*(32/2)+(12/2)), d);
+			_mm_store_si128 ((__m128i *)&(outi*(32/2)+(16/2)), e);
+			_mm_store_si128 ((__m128i *)&(outi*(32/2)+(20/2)), f);
+			_mm_store_si128 ((__m128i *)&(outi*(32/2)+(24/2)), g);
+			_mm_store_si128 ((__m128i *)&(outi*(32/2)+(28/2)), h);
+		}
+	}
+
+
+}
+#endif

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_tbl256;
 extern const unsigned char crc_chop_tbl2564;
-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", argv0);

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( "\33J" );
 
     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 itoa6464 = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+char atoi640x100;
+
+wpapsk_password *wpapass128	= { 0 };
+unsigned char *xpmk1128	= { NULL };
+unsigned char *xpmk2128	= { NULL };
+unsigned char *xpmk3128	= { NULL };
+unsigned char *xpmk4128	= { NULL };
+unsigned char *xpmk5128	= { NULL };
+unsigned char *xpmk6128	= { NULL };
+unsigned char *xpmk7128	= { NULL };
+unsigned char *xpmk8128	= { NULL };
+unsigned char *xsse_hash1128	= { NULL };
+unsigned char *xsse_crypt1128 = { NULL };
+unsigned char *xsse_crypt2128 = { 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_hash1threadid == NULL) {
+//	      printf("allocing ssememory%d\n", threadid);
+		xsse_hash1threadid    = mem_calloc_align(MAX_KEYS_PER_CRYPT, 2048, MEM_ALIGN_SIMD);
+		xsse_crypt1threadid   = mem_calloc_align(MAX_KEYS_PER_CRYPT, 2048, MEM_ALIGN_SIMD);
+		xsse_crypt2threadid   = mem_calloc_align(MAX_KEYS_PER_CRYPT, 2048, MEM_ALIGN_SIMD);
+		xpmk1threadid		= mem_calloc_align(MAX_KEYS_PER_CRYPT, 2048, MEM_ALIGN_SIMD);
+		xpmk2threadid		= mem_calloc_align(MAX_KEYS_PER_CRYPT, 2048, MEM_ALIGN_SIMD);
+		xpmk3threadid		= mem_calloc_align(MAX_KEYS_PER_CRYPT, 2048, MEM_ALIGN_SIMD);
+		xpmk4threadid		= mem_calloc_align(MAX_KEYS_PER_CRYPT, 2048, MEM_ALIGN_SIMD);
+		xpmk5threadid		= mem_calloc_align(MAX_KEYS_PER_CRYPT, 2048, MEM_ALIGN_SIMD);
+		xpmk6threadid		= mem_calloc_align(MAX_KEYS_PER_CRYPT, 2048, MEM_ALIGN_SIMD);
+		xpmk7threadid		= mem_calloc_align(MAX_KEYS_PER_CRYPT, 2048, MEM_ALIGN_SIMD);
+		xpmk8threadid		= mem_calloc_align(MAX_KEYS_PER_CRYPT, 2048, MEM_ALIGN_SIMD);
+		wpapassthreadid	= mem_calloc_align(MAX_KEYS_PER_CRYPT, 2048, MEM_ALIGN_SIMD);
+	}
+}
+
+void free_ssecore(int threadid) {
+	if (xsse_hash1threadid != NULL) {
+		MEM_FREE(xsse_hash1threadid);
+		MEM_FREE(xsse_crypt1threadid);
+		MEM_FREE(xsse_crypt2threadid);
+		MEM_FREE(xpmk1threadid);
+		MEM_FREE(xpmk2threadid);
+		MEM_FREE(xpmk3threadid);
+		MEM_FREE(xpmk4threadid);
+		MEM_FREE(xpmk5threadid);
+		MEM_FREE(xpmk6threadid);
+		MEM_FREE(xpmk7threadid);
+		MEM_FREE(xpmk8threadid);
+		MEM_FREE(wpapassthreadid);
+	}
+}
+
+static void set_key(char *key, int index, wpapsk_password *in)
+{
+	uint8_t length = strlen(key);
+	if (length > PLAINTEXT_LENGTH)
+		length = PLAINTEXT_LENGTH;
+	inindex.length = length;
+//      inbufferindex.length = length;
+	memcpy(inindex.v, key, length);
+//      count = index+1;
+}
+
+static MAYBE_INLINE void wpapsk_sse(int threadid, int count, char *salt, wpapsk_password * in)
+{
+	int t; // thread count
+#ifdef XDEBUG
+	int prloop = 0;
+#endif
+	int salt_length = strlen(salt);
+	int slen = salt_length + 4;
+	int loops = (count+NBKEYS-1) / NBKEYS;
+	uint8_t tmpbuf32;
+	char xsalt32+4;
+
+	static unsigned char *sse_hash1	 = NULL;
+	static unsigned char *sse_crypt1 = NULL;
+	static unsigned char *sse_crypt2 = NULL;
+	static wpapsk_password	*inbuffer;     	//table for candidate passwords (pointer to threads copy)
+	unsigned char essid32 + 4;
+
+	inbuffer	= wpapassthreadid;
+	sse_hash1 	= xsse_hash1threadid;
+	sse_crypt1	= xsse_crypt1threadid;
+	sse_crypt2	= xsse_crypt2threadid;
+
+	sprintf(xsalt, "%s", salt);
+
+	{
+		int index;
+		for (index = 0; index < cpuinfo.simdsize; ++index) {
+			// set the length of all hash1 SSE buffer to 64+20 * 8 bits. The 64 is for the ipad/opad,
+			// the 20 is for the length of the SHA1 buffer that also gets into each crypt.
+			// Works for SSE2i and SSE2
+#ifdef SIMD_CORE
+			((unsigned int *)sse_hash1)15*SIMD_COEF_32 + (index&(SIMD_COEF_32-1)) + (unsigned int)index/SIMD_COEF_32*SHA_BUF_SIZ*SIMD_COEF_32 = (84<<3); // all encrypts are 64+20 bytes.
+#else
+			((unsigned int *)sse_hash1)15*MMX_COEF + (index&(MMX_COEF-1)) + (index>>(MMX_COEF>>1))*SHA_BUF_SIZ*MMX_COEF = (84<<3); // all encrypts are 64+20 bytes.
+#endif
+			sse_hash1GETPOS(20,index) = 0x80;
+		}
+	}
+
+//	printf("t = %d, nbkeys = %d, loops = %d, essid = %s\n", count, NBKEYS, loops, xsalt);
+
+	memset(essid, 0, 32 + 4);
+	memcpy(essid, xsalt, salt_length);
+
+	for (t = 0; t < loops; t++) {
+		unsigned int i, k, j;
+		union {
+			unsigned char c64;
+			uint32_t i16;
+		} bufferNBKEYS;
+		union {
+			unsigned char c40;
+			uint32_t i10;
+		} outbufNBKEYS;
+		SHA_CTX ctx_ipadNBKEYS;
+		SHA_CTX ctx_opadNBKEYS;
+
+		SHA_CTX sha1_ctx;
+		unsigned int *i1, *i2, *o1;
+		unsigned char *t_sse_crypt1, *t_sse_crypt2, *t_sse_hash1;
+
+		// All pointers get their offset for this thread here. No further offsetting below.
+		t_sse_crypt1 = &sse_crypt1t * NBKEYS * 20;
+		t_sse_crypt2 = &sse_crypt2t * NBKEYS * 20;
+		t_sse_hash1 = &sse_hash1t * NBKEYS * SHA_BUF_SIZ * 4;
+		i1 = (unsigned int*)t_sse_crypt1;
+		i2 = (unsigned int*)t_sse_crypt2;
+		o1 = (unsigned int*)t_sse_hash1;
+
+		for (j = 0; j < NBKEYS; ++j) {
+			memset(bufferj.c, 0, 64);
+			memcpy(bufferj.c, int*NBKEYS+j.v, int*NBKEYS+j.length);
+			memset(&bufferj.cint*NBKEYS+j.length, 0, 64-int*NBKEYS+j.length);
+			SHA1_Init(&ctx_ipadj);
+			SHA1_Init(&ctx_opadj);
+
+			for (i = 0; i < 16; i++)
+				bufferj.ii ^= 0x36363636;
+			SHA1_Update(&ctx_ipadj, bufferj.c, 64);
+
+			for (i = 0; i < 16; i++)
+				bufferj.ii ^= 0x6a6a6a6a;
+			SHA1_Update(&ctx_opadj, bufferj.c, 64);
+
+			// we memcopy from flat into MMX_COEF output buffer's (our 'temp' ctx buffer).
+			// This data will NOT need to be BE swapped (it already IS BE swapped).
+#ifdef SIMD_CORE
+			i1(j/SIMD_COEF_32)*SIMD_COEF_32*5+(j&(SIMD_COEF_32-1))+0*SIMD_COEF_32 = ctx_ipadj.h0;
+			i1(j/SIMD_COEF_32)*SIMD_COEF_32*5+(j&(SIMD_COEF_32-1))+1*SIMD_COEF_32 = ctx_ipadj.h1;
+			i1(j/SIMD_COEF_32)*SIMD_COEF_32*5+(j&(SIMD_COEF_32-1))+2*SIMD_COEF_32 = ctx_ipadj.h2;
+			i1(j/SIMD_COEF_32)*SIMD_COEF_32*5+(j&(SIMD_COEF_32-1))+3*SIMD_COEF_32 = ctx_ipadj.h3;
+			i1(j/SIMD_COEF_32)*SIMD_COEF_32*5+(j&(SIMD_COEF_32-1))+4*SIMD_COEF_32 = ctx_ipadj.h4;
+
+			i2(j/SIMD_COEF_32)*SIMD_COEF_32*5+(j&(SIMD_COEF_32-1))+0*SIMD_COEF_32 = ctx_opadj.h0;
+			i2(j/SIMD_COEF_32)*SIMD_COEF_32*5+(j&(SIMD_COEF_32-1))+1*SIMD_COEF_32 = ctx_opadj.h1;
+			i2(j/SIMD_COEF_32)*SIMD_COEF_32*5+(j&(SIMD_COEF_32-1))+2*SIMD_COEF_32 = ctx_opadj.h2;
+			i2(j/SIMD_COEF_32)*SIMD_COEF_32*5+(j&(SIMD_COEF_32-1))+3*SIMD_COEF_32 = ctx_opadj.h3;
+			i2(j/SIMD_COEF_32)*SIMD_COEF_32*5+(j&(SIMD_COEF_32-1))+4*SIMD_COEF_32 = ctx_opadj.h4;
+#else
+			i1(j/MMX_COEF)*MMX_COEF*5+(j&(MMX_COEF-1))				= ctx_ipadj.h0;
+			i1(j/MMX_COEF)*MMX_COEF*5+(j&(MMX_COEF-1))+MMX_COEF			= ctx_ipadj.h1;
+			i1(j/MMX_COEF)*MMX_COEF*5+(j&(MMX_COEF-1))+(MMX_COEF<<1)		= ctx_ipadj.h2;
+			i1(j/MMX_COEF)*MMX_COEF*5+(j&(MMX_COEF-1))+MMX_COEF*3			= ctx_ipadj.h3;
+			i1(j/MMX_COEF)*MMX_COEF*5+(j&(MMX_COEF-1))+(MMX_COEF<<2)		= ctx_ipadj.h4;
+
+			i2(j/MMX_COEF)*MMX_COEF*5+(j&(MMX_COEF-1))				= ctx_opadj.h0;
+			i2(j/MMX_COEF)*MMX_COEF*5+(j&(MMX_COEF-1))+MMX_COEF			= ctx_opadj.h1;
+			i2(j/MMX_COEF)*MMX_COEF*5+(j&(MMX_COEF-1))+(MMX_COEF<<1)		= ctx_opadj.h2;
+			i2(j/MMX_COEF)*MMX_COEF*5+(j&(MMX_COEF-1))+MMX_COEF*3			= ctx_opadj.h3;
+			i2(j/MMX_COEF)*MMX_COEF*5+(j&(MMX_COEF-1))+(MMX_COEF<<2)		= ctx_opadj.h4;
+#endif
+			essidslen - 1 = 1;
+
+//			HMAC(EVP_sha1(), inj.v, inj.length, essid, slen, outbufj.c, NULL);
+//			memcpy(&bufferj, &outbufj.c, 20);
+
+			// This code does the HMAC(EVP_....) call.  NOTE, we already have essid
+			// appended with BE((int)1) so we simply call a single SHA1_Update
+			memcpy(&sha1_ctx, &ctx_ipadj, sizeof(sha1_ctx));
+			SHA1_Update(&sha1_ctx, essid, slen);
+			SHA1_Final(outbufj.c, &sha1_ctx);
+			memcpy(&sha1_ctx, &ctx_opadj, sizeof(sha1_ctx));
+			SHA1_Update(&sha1_ctx, outbufj.c, SHA_DIGEST_LENGTH);
+			SHA1_Final(outbufj.c, &sha1_ctx);
+
+			// now convert this from flat into MMX_COEF buffers.   (same as the memcpy() commented out in the last line)
+			// Also, perform the 'first' ^= into the crypt buffer.  NOTE, we are doing that in BE format
+			// so we will need to 'undo' that in the end.
+#ifdef SIMD_CORE
+			o1(j/SIMD_COEF_32)*SIMD_COEF_32*SHA_BUF_SIZ+(j&(SIMD_COEF_32-1))+0*SIMD_COEF_32 = outbufj.i0 = sha1_ctx.h0;
+			o1(j/SIMD_COEF_32)*SIMD_COEF_32*SHA_BUF_SIZ+(j&(SIMD_COEF_32-1))+1*SIMD_COEF_32 = outbufj.i1 = sha1_ctx.h1;
+			o1(j/SIMD_COEF_32)*SIMD_COEF_32*SHA_BUF_SIZ+(j&(SIMD_COEF_32-1))+2*SIMD_COEF_32 = outbufj.i2 = sha1_ctx.h2;
+			o1(j/SIMD_COEF_32)*SIMD_COEF_32*SHA_BUF_SIZ+(j&(SIMD_COEF_32-1))+3*SIMD_COEF_32 = outbufj.i3 = sha1_ctx.h3;
+			o1(j/SIMD_COEF_32)*SIMD_COEF_32*SHA_BUF_SIZ+(j&(SIMD_COEF_32-1))+4*SIMD_COEF_32 = outbufj.i4 = sha1_ctx.h4;
+#else
+			o1(j/MMX_COEF)*MMX_COEF*SHA_BUF_SIZ+(j&(MMX_COEF-1))			= outbufj.i0 = sha1_ctx.h0;
+			o1(j/MMX_COEF)*MMX_COEF*SHA_BUF_SIZ+(j&(MMX_COEF-1))+MMX_COEF		= outbufj.i1 = sha1_ctx.h1;
+			o1(j/MMX_COEF)*MMX_COEF*SHA_BUF_SIZ+(j&(MMX_COEF-1))+(MMX_COEF<<1)	= outbufj.i2 = sha1_ctx.h2;
+			o1(j/MMX_COEF)*MMX_COEF*SHA_BUF_SIZ+(j&(MMX_COEF-1))+MMX_COEF*3	= outbufj.i3 = sha1_ctx.h3;
+			o1(j/MMX_COEF)*MMX_COEF*SHA_BUF_SIZ+(j&(MMX_COEF-1))+(MMX_COEF<<2)	= outbufj.i4 = sha1_ctx.h4;
+#endif
+		}
+
+		for (i = 1; i < 4096; i++) {
+			SIMDSHA1body((unsigned int*)t_sse_hash1, (unsigned int*)t_sse_hash1, (unsigned int*)t_sse_crypt1, SSEi_MIXED_IN|SSEi_RELOAD|SSEi_OUTPUT_AS_INP_FMT);
+			SIMDSHA1body((unsigned int*)t_sse_hash1, (unsigned int*)t_sse_hash1, (unsigned int*)t_sse_crypt2, SSEi_MIXED_IN|SSEi_RELOAD|SSEi_OUTPUT_AS_INP_FMT);
+
+			for (j = 0; j < NBKEYS; j++) {
+#ifdef SIMD_CORE
+				unsigned *p = &((unsigned int*)t_sse_hash1)(((j/SIMD_COEF_32)*SHA_BUF_SIZ)*SIMD_COEF_32) + (j&(SIMD_COEF_32-1));
+				for(k = 0; k < 5; k++)
+					outbufj.ik ^= p(k*SIMD_COEF_32);
+#else
+				unsigned *p = &((unsigned int*)t_sse_hash1)(((j>>2)*SHA_BUF_SIZ)<<2) + (j&(MMX_COEF-1));
+				for(k = 0; k < 5; k++)
+					outbufj.ik ^= p(k<<(MMX_COEF>>1));
+#endif
+			}
+		}
+		essidslen - 1 = 2;
+
+		for (j = 0; j < NBKEYS; ++j) {
+//			HMAC(EVP_sha1(), inj.v, inj.length, essid, slen, &outbufj.c20, NULL);
+//			memcpy(&bufferj, &outbufj.c20, 20);
+
+			// This code does the HMAC(EVP_....) call.  NOTE, we already have essid
+			// appended with BE((int)1) so we simply call a single SHA1_Update
+			memcpy(&sha1_ctx, &ctx_ipadj, sizeof(sha1_ctx));
+			SHA1_Update(&sha1_ctx, essid, slen);
+			SHA1_Final(&outbufj.c20, &sha1_ctx);
+			memcpy(&sha1_ctx, &ctx_opadj, sizeof(sha1_ctx));
+			SHA1_Update(&sha1_ctx, &outbufj.c20, 20);
+			SHA1_Final(&outbufj.c20, &sha1_ctx);
+
+			// now convert this from flat into MMX_COEF buffers.  (same as the memcpy() commented out in the last line)
+			// Also, perform the 'first' ^= into the crypt buffer.  NOTE, we are doing that in BE format
+			// so we will need to 'undo' that in the end. (only 3 dwords of the 2nd block outbuf are worked with).
+#ifdef SIMD_CORE
+			o1(j/SIMD_COEF_32)*SIMD_COEF_32*SHA_BUF_SIZ+(j&(SIMD_COEF_32-1))+0*SIMD_COEF_32 = outbufj.i5 = sha1_ctx.h0;
+			o1(j/SIMD_COEF_32)*SIMD_COEF_32*SHA_BUF_SIZ+(j&(SIMD_COEF_32-1))+1*SIMD_COEF_32 = outbufj.i6 = sha1_ctx.h1;
+			o1(j/SIMD_COEF_32)*SIMD_COEF_32*SHA_BUF_SIZ+(j&(SIMD_COEF_32-1))+2*SIMD_COEF_32 = outbufj.i7 = sha1_ctx.h2;
+			o1(j/SIMD_COEF_32)*SIMD_COEF_32*SHA_BUF_SIZ+(j&(SIMD_COEF_32-1))+3*SIMD_COEF_32 = sha1_ctx.h3;
+			o1(j/SIMD_COEF_32)*SIMD_COEF_32*SHA_BUF_SIZ+(j&(SIMD_COEF_32-1))+4*SIMD_COEF_32 = sha1_ctx.h4;
+#else
+			o1(j/MMX_COEF)*MMX_COEF*SHA_BUF_SIZ+(j&(MMX_COEF-1))			= outbufj.i5 = sha1_ctx.h0;
+			o1(j/MMX_COEF)*MMX_COEF*SHA_BUF_SIZ+(j&(MMX_COEF-1))+MMX_COEF		= outbufj.i6 = sha1_ctx.h1;
+			o1(j/MMX_COEF)*MMX_COEF*SHA_BUF_SIZ+(j&(MMX_COEF-1))+(MMX_COEF<<1)	= outbufj.i7 = sha1_ctx.h2;
+			o1(j/MMX_COEF)*MMX_COEF*SHA_BUF_SIZ+(j&(MMX_COEF-1))+MMX_COEF*3			 = sha1_ctx.h3;
+			o1(j/MMX_COEF)*MMX_COEF*SHA_BUF_SIZ+(j&(MMX_COEF-1))+(MMX_COEF<<2)			 = sha1_ctx.h4;
+#endif
+		}
+		for (i = 1; i < 4096; i++) {
+			SIMDSHA1body((unsigned int*)t_sse_hash1, (unsigned int*)t_sse_hash1, (unsigned int*)t_sse_crypt1, SSEi_MIXED_IN|SSEi_RELOAD|SSEi_OUTPUT_AS_INP_FMT);
+			SIMDSHA1body((unsigned int*)t_sse_hash1, (unsigned int*)t_sse_hash1, (unsigned int*)t_sse_crypt2, SSEi_MIXED_IN|SSEi_RELOAD|SSEi_OUTPUT_AS_INP_FMT);
+			for (j = 0; j < NBKEYS; j++) {
+#ifdef SIMD_CORE
+				unsigned *p = &((unsigned int*)t_sse_hash1)(((j/SIMD_COEF_32)*SHA_BUF_SIZ)*SIMD_COEF_32) + (j&(SIMD_COEF_32-1));
+				for(k = 5; k < 8; k++)
+					outbufj.ik ^= p((k-5)*SIMD_COEF_32);
+#else
+				unsigned *p = &((unsigned int*)t_sse_hash1)(((j>>2)*SHA_BUF_SIZ)<<2) + (j&(MMX_COEF-1));
+				for(k = 5; k < 8; k++)
+					outbufj.ik ^= p((k-5)<<(MMX_COEF>>1));
+#endif
+			}
+		}
+
+		for (j = 0; j < NBKEYS; ++j) {
+			// the BE() convert should be done in binary, BUT since we use 'common' code for
+			// binary(), which is shared between CPU and CUDA/OPenCL, we have to do it here.
+			memset(tmpbuf, 0, 32);
+			memcpy(tmpbuf, outbufj.c, 32);
+
+#ifdef XDEBUG
+			printf("%d tmpbuf = ", threadid);
+			for (prloop = 0; prloop < 32; prloop++)
+				printf( "%02X:", tmpbufprloop );
+			printf("\n");
+#endif
+
+			if (j == 0) {
+				memcpy(xpmk1threadid, tmpbuf, 32);
+#ifdef XDEBUG
+				printf("xpmk1%d = ", threadid);
+				for (prloop = 0; prloop < 32; prloop++)
+					printf( "%02X:", xpmk1threadidprloop );
+				printf("\n");
+#endif
+
+				alter_endianity_to_BE(xpmk1threadid,32);
+
+			}
+			if (j == 1) {
+				memcpy(xpmk2threadid, tmpbuf, 32);
+#ifdef XDEBUG
+				printf("xpmk2%d = ", threadid);
+				for (prloop = 0; prloop < 32; prloop++)
+					printf( "%02X:", xpmk2threadidprloop );
+				printf("\n");
+#endif
+
+				alter_endianity_to_BE(xpmk2threadid,32);
+			}
+			if (j == 2) {
+				memcpy(xpmk3threadid, tmpbuf, 32);
+#ifdef XDEBUG
+				printf("xpmk3%d = ", threadid);
+				for (prloop = 0; prloop < 32; prloop++)
+					printf( "%02X:", xpmk3threadidprloop );
+				printf("\n");
+#endif
+
+				alter_endianity_to_BE(xpmk3threadid,32);
+			}
+
+			if (j == 3) {
+				memcpy(xpmk4threadid, tmpbuf, 32);
+#ifdef XDEBUG
+				printf("xpmk4%d = ", threadid);
+				for (prloop = 0; prloop < 32; prloop++)
+					printf( "%02X:", xpmk4threadidprloop );
+				printf("\n");
+#endif
+
+				alter_endianity_to_BE(xpmk4threadid,32);
+			}
+			if (j == 4) {
+				memcpy(xpmk5threadid, tmpbuf, 32);
+				alter_endianity_to_BE(xpmk5threadid,32);
+			}
+			if (j == 5) {
+				memcpy(xpmk6threadid, tmpbuf, 32);
+				alter_endianity_to_BE(xpmk6threadid,32);
+			}
+			if (j == 6) {
+				memcpy(xpmk7threadid, tmpbuf, 32);
+				alter_endianity_to_BE(xpmk7threadid,32);
+			}
+			if (j == 7) {
+				memcpy(xpmk8threadid, tmpbuf, 32);
+				alter_endianity_to_BE(xpmk8threadid,32);
+			}
+		}
+	}
+
+	return;
+}
+
+void init_atoi() {
+	char *pos;
+
+	memset(atoi64, 0x7F, sizeof(atoi64));
+	for (pos = itoa64; pos <= &itoa6463; pos++)
+		atoi64ARCH_INDEX(*pos) = pos - itoa64;
+}
+
+//#define XDEBUG 1
+//#define ODEBUG 1
+int init_wpapsk(char (*key)128, char *essid, int threadid) {
+#ifdef ODEBUG
+	int prloop = 0;
+#endif
+	int i = 0;
+	static int count = 0;
+	static unsigned char *lpmk1 = NULL, *lpmk2 = NULL, *lpmk3 = NULL, *lpmk4 = NULL;
+	static unsigned char *lpmk5 = NULL, *lpmk6 = NULL, *lpmk7 = NULL, *lpmk8 = NULL;
+	static wpapsk_password	*inbuffer;	//table for candidate passwords (pointer to threads copy)
+
+	lpmk1		= xpmk1threadid;
+	lpmk2		= xpmk2threadid;
+	lpmk3		= xpmk3threadid;
+	lpmk4		= xpmk4threadid;
+	lpmk5		= xpmk5threadid;
+	lpmk6		= xpmk6threadid;
+	lpmk7		= xpmk7threadid;
+	lpmk8		= xpmk8threadid;
+	inbuffer	= wpapassthreadid;
+
+	for (; i < cpuinfo.simdsize; i++) {
+		memset(inbufferi.v, 0, sizeof(inbufferi.v));
+		inbufferi.length = 0;
+	}
+
+	for (i = 0; i < 8; ++i) {
+		if (keyi0 != 0) {
+			set_key(keyi, i, inbuffer);
+#ifdef XDEBUG
+			printf("key%d (inbuffer) = %s\n", i+1, inbufferi.v);
+#endif
+			count = i + 1;
+		}
+	}
+
+#ifdef XDEBUG
+//	printf("%d key (%s) (%s) (%s) (%s)\n",threadid, key1,key2,key3,key4);
+#endif
+
+	memset(&lpmk1threadid, 0, 32);
+	memset(&lpmk2threadid, 0, 32);
+	memset(&lpmk3threadid, 0, 32);
+	memset(&lpmk4threadid, 0, 32);
+	memset(&lpmk5threadid, 0, 32);
+	memset(&lpmk6threadid, 0, 32);
+	memset(&lpmk7threadid, 0, 32);
+	memset(&lpmk8threadid, 0, 32);
+
+	wpapsk_sse(threadid, count, essid, inbuffer);
+
+	return 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 *xpmk1128;
+extern unsigned char *xpmk2128;
+extern unsigned char *xpmk3128;
+extern unsigned char *xpmk4128;
+extern unsigned char *xpmk5128;
+extern unsigned char *xpmk6128;
+extern unsigned char *xpmk7128;
+extern unsigned char *xpmk8128;
+extern unsigned char *xsse_hash1128;
+extern unsigned char *xsse_crypt1128;
+extern unsigned char *xsse_crypt2128;
+
+#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  vPLAINTEXT_LENGTH + 1;
+};
+
+typedef struct {
+	uint32_t length;
+	uint8_t  vPLAINTEXT_LENGTH + 1;
+} wpapsk_password;
+
+extern wpapsk_password *wpapass128;
+
+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 buff100;
+
+	memcpy(buff, text, 22);
+	memcpy(buff + 23, data, 76);
+	buff22 = 0;
+	buff76 + 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  key4128;
-    unsigned char pmk4128;
-    unsigned char epmk4128;
+    char key8128;
+    unsigned char pmk8128;
+    unsigned char epmk8128;
+    cpuinfo.simdsize = cpuid_simdsize(0);
     bzero(&pmk,sizeof(pmk));
     bzero(&epmk,sizeof(epmk));
     bzero(&key,sizeof(key));
@@ -47,6 +53,14 @@
     strcpy(key1,"password");
     strcpy(key2,"aircrack");
     strcpy(key3,"keyboard");
+#ifndef OLD_SSE_CORE
+    if (cpuinfo.simdsize > 4) { // For testing AVX2 / 256bit
+	strcpy(key4,"biscotte");
+	strcpy(key5,"password");
+	strcpy(key6,"aircrack");
+	strcpy(key7,"keyboard");
+    }
+#endif
     memcpy(epmk0,
     "\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(epmk3,
     "\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(epmk4,
+    "\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(epmk5,
+    "\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(epmk6,
+    "\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(epmk7,
+    "\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( key0, key1, key2, key3, essid, pmk0, pmk1, pmk2, pmk3 );
-        for (j=0;j<4;j++)
+    if (cpuinfo.simdsize >= 4) {
+#ifdef OLD_SSE_CORE
+	calc_4pmk( key0, key1, key2, key3, essid, pmk0, pmk1, pmk2, pmk3 );
+#else
+	init_wpapsk(key, essid, threadid);
+	memcpy(pmk0, xpmk1threadid, 32);
+	memcpy(pmk1, xpmk2threadid, 32);
+	memcpy(pmk2, xpmk3threadid, 32);
+	memcpy(pmk3, xpmk4threadid, 32);
+	if (cpuinfo.simdsize > 4) {
+		memcpy(pmk4, xpmk5threadid, 32);
+		memcpy(pmk5, xpmk6threadid, 32);
+		memcpy(pmk6, xpmk7threadid, 32);
+		memcpy(pmk7, xpmk8threadid, 32);
+	}
+#endif
+        for (j = 0; j < cpuinfo.simdsize; j++)
             error += test(pmkj,epmkj,32, argv0);
     }
 #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

Build Results
RPM Lint

Refresh

Comments for request 2769 0

Request History

marguerite created request almost 10 years ago

marguerite accepted request almost 10 years ago

Please add a comment