Merge pull request #416 from v1s1t0r1sh3r3/dev

Dev to master v10.40

CHANGELOG.md

@@ -1,3 +1,11 @@
+### 10.40
+ - Removed deprecated route command
+ - Fixed error on WPS PINs found in database counter
+ - Sslstrip Evil Twin attack replaced by Bettercap-Sslstrip2 Evil Twin attack, sslstrip dependency removed
+ - Fixed error on Evil Twin attacks when tmux and Bettercap 2.x used
+ - Fixed wrong username shown on asleap decryption after capture for Enterprise Evil Twin attack
+ - Fixed freezing while trying to resume reaver session
+
 ### 10.31
  - Fixed error of no returning to DoS menu after fail on handshake capture for Evil Twin Captive portal attack
  - Fixed error of no returning to Evil Twin main menu for some special situations on BeEF attack
@@ -41,7 +49,7 @@
  - Fixed error on enterprise certificates validation
  - Added autoselection for secondary interface if only one existing
  - Airmon compatibility check system refactored
- - Fixed error in default paths trophy files for ettercap/bettercap
+ - Fixed error in default paths trophy files for Ettercap/Bettercap
 
 ### 10.0
  - Added plugins system
@@ -124,7 +132,7 @@
 ### 8.10
  - WPS decrypted networks now have trophy file
  - Tested compatibility with Kali 2018.2, Ubuntu 18.04 and Parrot 4.x
- - Controlled error for unsupported bettercap 2.x version
+ - Controlled error for unsupported Bettercap 2.x version
  - Automatic check added on Handshake capture (Thank you to "IwraStudios")
  - Fixed card detection bug on some Linux
 

Dockerfile

@@ -73,7 +73,7 @@ RUN \
 	hcxtools \
 	hcxdumptool \
 	beef-git \
-	sslstrip \
+	bettercap \
 	wireshark-cli
 
 #Env var for display
@@ -113,16 +113,6 @@ RUN \
 	cp /opt/hashcat2.0/hashcat /usr/bin/ && \
 	chmod +x /usr/bin/hashcat
 
-#Install Bettercap and some dependencies
-RUN \
-	pacman -S --noconfirm \
-	ruby \
-	libffi && \
-	gem install bettercap && \
-	ln -s /root/.gem/ruby/2.7.0/bin/bettercap /usr/local/bin/bettercap && \
-	ln -s /usr/lib/libffi.so.7 /usr/lib/libffi.so.6 && \
-	chmod +x /usr/local/bin/bettercap
-
 #Clean packages
 RUN \
 	yes | pacman -Sccc --noconfirm

README.md

@@ -104,7 +104,7 @@ All the needed info about how to "install | use | enjoy" `airgeddon` is present
 [Hat Tip To]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Hat%20Tip%20To
 [Inspiration]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Inspiration
 
-[Version-shield]: https://img.shields.io/badge/version-10.31-blue.svg?style=flat-square&colorA=273133&colorB=0093ee "Latest version"
+[Version-shield]: https://img.shields.io/badge/version-10.40-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+"
 [Docker-shield]: https://img.shields.io/docker/cloud/automated/v1s1t0r1sh3r3/airgeddon.svg?style=flat-square&colorA=273133&colorB=a9a9a9 "Docker rules!"