Merge pull request #95 from v1s1t0r1sh3r3/dev

Dev to master v7.11

CHANGELOG.md

@@ -1,3 +1,10 @@
+### 7.11
+ - Added hccapx support for hashcat 3.40 or higher
+ - Decrypted hashcat trophy files beautified
+ - Added confirm questions before attacks if no target selected
+ - WPA/WPA2 decrypted files using aircrack now have trophy file
+ - Some outputs colorized using ccze
+
 ### 7.1
  - Added default choice for some yes/no question. Regexp improved
  - Tested compatibility with Backbox 4.7 and Parrot 3.6

CONTRIBUTING.md

@@ -16,6 +16,7 @@ Please note we have a code of conduct, please follow it in all your interactions
 2. Translate the strings located in `language_strings.sh`.
 3. Ask by mail [[email protected]] if you have any doubt. You'll be informed about how to proceed.
 4. You can be added as a collaborator on the project.
+5. Knowledge about `git` is not mandatory but is really appreciated to push directly into the project repository.
 
 ## Collaborating Developers
 
@@ -40,9 +41,10 @@ To be added on it you must prove first you are a *trusted collaborator* with you
 
 ## WPS PIN Database Collaborators
 
-1. Add PINs ordered by the key in the associative array located in the `known_pins.db` file. (Keys are the first 6 BSSID digits).
-2. Update the `pindb_checksum.txt` file with the calculated checksum of the database file using `md5sum` tool.
-3. Update the date under shebang.
+1. Send MAC of the BSSID and the default PIN to [[email protected]]. If you are going to push directly into the repository, keep reading the next points.
+2. Add PINs ordered by the key in the associative array located in the `known_pins.db` file. (Keys are the first 6 BSSID digits).
+3. Update the `pindb_checksum.txt` file with the calculated checksum of the database file using `md5sum` tool.
+4. Update the date under shebang.
 
 *PINs should be from devices that generate generic ones.*
 
@@ -144,6 +146,10 @@ If you enjoyed the script, feel free to donate. Support the project through Payp
  
 [![Bitcoin][Bitcoin]](https://blockchain.info/address/1AKnTXbomtwUzrm81FRzi5acSSXxGteGTH)
 
+Bitcoin QR code:
+
+[![BitcoinQR][BitcoinQR]](https://blockchain.info/address/1AKnTXbomtwUzrm81FRzi5acSSXxGteGTH)
+
 <!-- MDs -->
 [Readme]: README.md
 [Changelog]: CHANGELOG.md
@@ -162,3 +168,4 @@ If you enjoyed the script, feel free to donate. Support the project through Payp
 <!-- Images -->
 [Paypal]: /imgs/banners/paypal_donate.png "Show me the money!"
 [Bitcoin]: /imgs/banners/bitcoin_donate.png "Show me the money!"
+[BitcoinQR]: /imgs/banners/bitcoin_qr.png "Show me the money!"

Dockerfile

@@ -50,7 +50,8 @@ RUN \
 	usbutils \
 	rfkill \
 	x11-utils \
-	wget
+	wget \
+	ccze
 
 #Install update tools
 RUN \

README.md

@@ -74,7 +74,7 @@ All the needed info about how to install|use|enjoy `airgeddon` is present at [Gi
 [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.1-blue.svg?style=flat-square&colorA=273133&colorB=0093ee "Latest version"
+[Version-shield]: https://img.shields.io/badge/version-7.11-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!"