Resolve conflicts

This commit is contained in:
Nick Raienko 2015-03-09 05:10:32 +02:00
parent 424a9082c1
commit 920c276364

View File

@ -105,6 +105,7 @@ A collection of awesome penetration testing resources, tools, books, confs, maga
#### Wireless Network Tools #### Wireless Network Tools
* [Aircrack-ng](http://www.aircrack-ng.org/) - a set of tools for auditing wireless network * [Aircrack-ng](http://www.aircrack-ng.org/) - a set of tools for auditing wireless network
* [Kismet](https://kismetwireless.net/) - Wireless network detector, sniffer, and IDS * [Kismet](https://kismetwireless.net/) - Wireless network detector, sniffer, and IDS
* [Reaver](https://code.google.com/p/reaver-wps/) - Brute force attack against Wifi Protected Setup
#### SSL Analysis Tools #### SSL Analysis Tools
* [SSLyze](https://github.com/nabla-c0d3/sslyze) - SSL configuration scanner * [SSLyze](https://github.com/nabla-c0d3/sslyze) - SSL configuration scanner