Merge branch 'filinpavel-patch-1'

This commit is contained in:
Nick Raienko 2014-11-12 10:30:32 +02:00
commit 11b2fce70e

View File

@ -1,7 +1,7 @@
## Awesome Penetration Testing
A collection of awesome penetration testing resources, tools, books, , confs, magazines and other shiny things
A collection of awesome penetration testing resources, tools, books, confs, magazines and other shiny things
- [Online Resources](#online-resources)
@ -64,8 +64,9 @@ A collection of awesome penetration testing resources, tools, books, , confs, ma
### Tools
#### Penetration Testing Distributions
* [Kali](http://www.kali.org/) - A Linux distribution designed for digital forensics and penetration testing\
* [Kali](http://www.kali.org/) - A Linux distribution designed for digital forensics and penetration testing
* [NST](http://networksecuritytoolkit.org/) - Network Security Toolkit distribution
* [Pentoo](http://www.pentoo.ch/) - security-focused livecd based on Gentoo
#### Basic Penetration Testing Tools
* [Metasploit](http://www.metasploit.com/) - World's most used penetration testing software
@ -83,7 +84,7 @@ A collection of awesome penetration testing resources, tools, books, , confs, ma
* [nmap](http://nmap.org/) - Free Security Scanner For Network Exploration & Security Audits
* [tcpdump/libpcap](http://www.tcpdump.org/) - A common packet analyzer that runs under the command line
* [Wireshark](http://www.wireshark.org/) - A network protocol analyzer for Unix and Windows
* [Network Tools](http://network-tools.com/) - Different network tools: pink, lookup, whois, etc
* [Network Tools](http://network-tools.com/) - Different network tools: ping, lookup, whois, etc
* [netsniff-ng](https://github.com/netsniff-ng/netsniff-ng) - A Swiss army knife for for network sniffing
#### SSL Analysis Tools