Merge pull request #106 from v1s1t0r1sh3r3/dev

Dev to master v7.22

CHANGELOG.md

@@ -1,3 +1,10 @@
+### 7.22
+ - Fixed error caused by Bettercap. Bug: https://github.com/evilsocket/bettercap/issues/356
+ - Arcadyan WPS PIN generation algorithm integrated
+ - Tested compatibility with Kali 2017.2 and Parrot 3.8
+ - WPS Bully bruteforce attack modified to use --sequential (-S) argument
+ - Added WPS offline PIN generation and database menu option
+
 ### 7.21
  - Italian language translation added (Thank you to "salu90")
  - Tested compatibility with Parrot 3.7, Fedora 26 and Wifislax 64-1.1
@@ -110,8 +117,8 @@
 
 ### 5.1
  - Integrated online PIN database for "known WPS PINs attack" (reaver and bully)
- - Zhao Chunsheng algorithm integrated (computepin)
- - Stefan Viehböck algorithm integrated (easybox)
+ - Zhao Chunsheng WPS PIN generation algorithm integrated (ComputePIN)
+ - Stefan Viehböck WPS PIN generation algorithm integrated (EasyBox)
  - Some language strings changed
  - Fixed bug showing selected charset for hashcat v3.0 on bruteforce offline decrypt attack
 
@@ -311,7 +318,7 @@
  - Some language strings changed
 
 ### 2.31
- - French language translation added (Thank you to "Kcdtv")
+ - French language translation added (Thank you to "kcdtv")
  - Only one network autoselect bug fixed
 
 ### 2.3

README.md

@@ -11,6 +11,7 @@ All the needed info about how to "install | use | enjoy" `airgeddon` is present
 - *I. Content & Features*
   - [Home]
   - [Features]
+  - [Screenshots]
 
 
 - *II. Requirements*
@@ -51,6 +52,7 @@ All the needed info about how to "install | use | enjoy" `airgeddon` is present
 
 [Home]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki
 [Features]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Features
+[Screenshots]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Screenshots
 [Requirements]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Requirements
 [Compatibility]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Compatibility
 [Essential Tools]: https://github.com/v1s1t0r1sh3r3/airgeddon/wiki/Essential%20Tools
@@ -74,7 +76,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-7.21-blue.svg?style=flat-square&colorA=273133&colorB=0093ee "Latest version"
+[Version-shield]: https://img.shields.io/badge/version-7.22-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/automated/v1s1t0r1sh3r3/airgeddon.svg?style=flat-square&colorA=273133&colorB=f9ff5a "Docker rules!"