Merge branch 'master' into master

This commit is contained in:
Taehoon Kim 2018-05-11 10:14:18 +09:00 committed by GitHub
commit 88523d0b85
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -139,14 +139,14 @@ For a list of free hacking books available for download, go [here](https://githu
* [Habu](https://github.com/portantier/habu) - Python Network Hacking Toolkit
* [Wifi Jammer](https://n0where.net/wifijammer/) - Free program to jam all wifi clients in range
* [Firesheep](https://codebutler.github.io/firesheep/) - Free program for HTTP session hijacking attacks.
* [Scapy](https://github.com/secdev/scapy) - A Python tool and library for low level packet creation and maniputalion
* [Scapy](https://github.com/secdev/scapy) - A Python tool and library for low level packet creation and manipulation
* [Amass](https://github.com/caffix/amass) - In-depth subdomain enumeration tool that performs scraping, recursive brute forcing, crawling of web archives, name altering and reverse DNS sweeping
# Forensic
## Tools
* [Autospy](http://www.sleuthkit.org/autopsy/) - A digital forensics platform and graphical interface to [The Sleuth Kit](http://www.sleuthkit.org/sleuthkit/index.php) and other digital forensics tools
* [Autopsy](http://www.sleuthkit.org/autopsy/) - A digital forensics platform and graphical interface to [The Sleuth Kit](http://www.sleuthkit.org/sleuthkit/index.php) and other digital forensics tools
* [sleuthkit](https://github.com/sleuthkit/sleuthkit) - A library and collection of command-line digital forensics tools
* [EnCase](https://www.guidancesoftware.com/products/Pages/encase-forensic/overview.aspx) - The shared technology within a suite of digital investigations products by Guidance Software
* [malzilla](http://malzilla.sourceforge.net/) - Malware hunting tool
@ -191,7 +191,7 @@ For a list of free hacking books available for download, go [here](https://githu
* [OverTheWire - Krypton](http://overthewire.org/wargames/krypton/)
## Bug bounty
* [Awsome bug bounty resourses by Edoverflow](https://github.com/EdOverflow/bugbounty-cheatsheet)
* [Awesome bug bounty resources by EdOverflow](https://github.com/EdOverflow/bugbounty-cheatsheet)
# CTF
@ -214,7 +214,7 @@ For a list of free hacking books available for download, go [here](https://githu
* [CTF archives (shell-storm)](http://shell-storm.org/repo/CTF/)
* [Rookit Arsenal](https://amzn.com/144962636X) - OS RE and rootkit development
* [Pentest Cheat Sheets](https://github.com/coreb1t/awesome-pentest-cheat-sheets) - Collection of cheat sheets useful for pentesting
* [Movies For Hacker](https://github.com/k4m4/movies-for-hackers) - A curated list of movies every hacker & cyberpunk must watch.
* [Movies For Hackers](https://github.com/k4m4/movies-for-hackers) - A curated list of movies every hacker & cyberpunk must watch.
# OS