Skip to content

Commit

Permalink
Merge pull request #72 from v1s1t0r1sh3r3/dev
Browse files Browse the repository at this point in the history
Dev to master. v6.12
  • Loading branch information
OscarAkaElvis authored Apr 3, 2017
2 parents 2a2a727 + eba0a32 commit 343d130
Show file tree
Hide file tree
Showing 4 changed files with 67 additions and 63 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
###6.12
- Fixed bug on network detection
- Fixed bug causing strange behaviour on some Linux handling optional_tools array

###6.11
- Optional MAC spoofing added for all Evil Twin attacks
- Spoofed MAC addresses restored on exit
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ Compatible with any Linux distribution that has installed the tools needed. The
<li>Gentoo 20160514 and 20160704</li>
<li>Fedora 24</li>
<li>Red Hat 7 (Maipo)</li>
<li>Arch 4.6.2-1 to 4.10.4-1</li>
<li>Arch 4.6.2-1 to 4.10.6-1</li>
<li>Raspbian 7 (Wheezy) and 8 (Jessie) (Raspberry Pi)</li>
<li>OpenMandriva LX3</li>
</em>
Expand Down Expand Up @@ -316,7 +316,7 @@ Use it on your own networks or with the permission of the network's owner only.<
[xtonousou]: https://github.com/xtonousou
[OscarAkaElvis]: https://github.com/OscarAkaElvis
<!-- Badges URLs -->
[Version-shield]: https://img.shields.io/badge/version-6.11-blue.svg?style=flat-square&colorA=273133&colorB=0093ee "Latest version"
[Version-shield]: https://img.shields.io/badge/version-6.12-blue.svg?style=flat-square&colorA=273133&colorB=0093ee "Latest version"
[Bash4.2-shield]: https://img.shields.io/badge/bash-4.2%2B-blue.svg?style=flat-square&colorA=273133&colorB=00db00 "Bash 4.2 or later"
[License-shield]: https://img.shields.io/badge/license-GPL%20v3%2B-blue.svg?style=flat-square&colorA=273133&colorB=bd0000 "GPL v3+"
[Paypal-shield]: https://img.shields.io/badge/donate-paypal-blue.svg?style=flat-square&colorA=002f86&colorB=009cde "Show me the money!"
Expand Down
12 changes: 6 additions & 6 deletions airgeddon.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
#Title........: airgeddon.sh
#Description..: This is a multi-use bash script for Linux systems to audit wireless networks.
#Author.......: v1s1t0r
#Date.........: 20170311
#Version......: 6.11
#Date.........: 20170324
#Version......: 6.12
#Usage........: bash airgeddon.sh
#Bash Version.: 4.2 or later

Expand Down Expand Up @@ -104,8 +104,8 @@ declare -A possible_alias_names=(
)

#General vars
airgeddon_version="6.11"
language_strings_expected_version="6.11-2"
airgeddon_version="6.12"
language_strings_expected_version="6.12-1"
standardhandshake_filename="handshake-01.cap"
tmpdir="/tmp/"
osversionfile_dir="/etc/"
Expand Down Expand Up @@ -2152,7 +2152,7 @@ function initialize_optional_tools_values() {

debug_print

declare -gA optional_tools=()
declare -gA optional_tools

for item in "${optional_tools_names[@]}"; do
optional_tools[${item}]=0
Expand Down Expand Up @@ -6113,7 +6113,7 @@ function explore_for_targets_option() {
rm -rf "${tmpdir}clts.csv" > /dev/null 2>&1
recalculate_windows_sizes
xterm +j -bg black -fg white -geometry "${g1_topright_window}" -T "Exploring for targets" -e airodump-ng -w "${tmpdir}nws" "${interface}" > /dev/null 2>&1
targetline=$(awk '/(Station|Client[es])/{print NR}' < "${tmpdir}nws-01.csv")
targetline=$(awk '/(^Station[s]?|^Client[es]?)/{print NR}' < "${tmpdir}nws-01.csv")
targetline=$((targetline - 1))

head -n "${targetline}" "${tmpdir}nws-01.csv" &> "${tmpdir}nws.csv"
Expand Down
Loading

0 comments on commit 343d130

Please sign in to comment.