Skip to content

Commit

Permalink
Merge pull request #352 from v1s1t0r1sh3r3/dev
Browse files Browse the repository at this point in the history
Dev to master v10.10
  • Loading branch information
OscarAkaElvis authored Mar 19, 2020
2 parents dfee46c + e365eb9 commit dee5c41
Show file tree
Hide file tree
Showing 16 changed files with 661 additions and 200 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
### 10.10
- PMKID capture feature
- PMKID offline decryption feature
- Tested compatibility with Manjaro Linux
- Fixed error on auto_update plugin on some Linux distros

### 10.01
- Removed deprecated ifconfig and iwconfig commands and dependencies
- Fixed error on enterprise certificates validation
Expand Down
6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#airgeddon Dockerfile

#Base image
FROM parrotsec/parrot:latest
FROM parrotsec/security:latest

#Credits & Data
LABEL \
Expand Down Expand Up @@ -86,7 +86,9 @@ RUN \
hostapd-wpe \
asleap \
john \
openssl
openssl \
hcxtools \
hcxdumptool

#Install needed dependencies for Bettercap and BeEF
RUN \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,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.01-blue.svg?style=flat-square&colorA=273133&colorB=0093ee "Latest version"
[Version-shield]: https://img.shields.io/badge/version-10.10-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!"
Expand Down
Loading

0 comments on commit dee5c41

Please sign in to comment.