Updated links and details for ctf tools.

Author: Siri Keith

tools.md

@@ -2,71 +2,74 @@
 
 ### Scanners
 
-- [Nikto](tools/nikto.md) - Web Application Scanner
-- [Nmap](tools/nmap.md) - Port Scanner, Command line based
+- [Nikto](http://www.cirt.net/nikto2) - Web Application Scanner [Downloadable Package](http://www.cirt.net/nikto/nikto-2.1.5.tar.gz)
+- [Nmap](http://nmap.org) - Port Scanner, Command line based
 - [Nessus](tools/nessus.md) - Vulnerability Scanner
-- [FireSheep](tools/firesheep.md)
-- [Social Engineers Toolkit](tools/set.md) - Dave Rel1k rocks
+- [FireSheep](http://codebutler.com/firesheep) - Firefox Extension that steals login cookie from the local network and allows the person running firesheep to use the cookie to hijack the session 
+- [Social Engineers Toolkit by Dave "Rel1k" Kennedy](http://www.securitytube.net/video/829) - Clone any website you want and to use the Java Applet to attack automatically.
 - [Metasploit](tools/metasploit.md) - Framework for exploits and scanners by Rapid7
 - [TeamSploit](tools/teamsploit.md) - Pen Testing With Friends, By Justin Wray, a Free Penetration Automation Tool Suite
 - [Armitage](tools/armitage.md) - GUI for Metasploit written by Raphael Mudge, its extremely powerful and easy to use
-- Win 8 hack  http://www.youtube.com/watch?v=W3yu45g7pTI
-- [Burp Suite](tools/burp.md) - http://portswigger.net/burp/
+- [Burp Suite](http://portswigger.net/burp) - Burp Suite is an integrated platform for performing security testing of web applications. 
 - [Remote Administration Tools](tools/rats.md) (RATs) - Poison Ivy and more as I find them and have time to get info on them
-- [Pen Testing Hardware](tools/hardware.md) - All those beautiful little toys that can do so much
+- [Pen Testing Hardware](tools/pentestinghardware.md) - All those beautiful little toys that can do so much
+- [Kryptos](https://github.com/nickmc01/Kryptos) - This OpenWire Sec Web App is designed to help Pen Testers collaborate
 
 ### Fuzzing Resources
 
-- http://www.youtube.com/watch?v=DHvHGwczsMY
-- http://grey-corner.blogspot.com/2010/12/introducing-vulnserver.html  Port 9999
+- From Fuzzing to Metasploit [Part 1](http://www.youtube.com/watch?v=DHvHGwczsMY) [Part 2](https://www.youtube.com/watch?v=TTng0EKTCgQ) [Part 3](https://www.youtube.com/watch?v=DHvHGwczsMY)
+- [Introducing Vulnserver](http://grey-corner.blogspot.com/2010/12/introducing-vulnserver.html)
 
 ### Password Cracking Tools
 
-- [[John The Ripper]]
-- [[HASHCat]]
-- [[Cain and Able]]
+- [John The Ripper](johntheripper.md)
+- [HASHCat](http://hashcat.net)
+- [Cain and Able](http://www.oxid.it)
 
 ## Defensive Tools   
 
-- http://sourceforge.net/projects/unsploitable/ by Justin Wray <br />
-- http://blogs.mcafee.com/enterprise/security-connected/full-database-activity-auditing-for-the-mysql-user-base?utm_source=twitterfeed&utm_medium=twitter Mcafee MySQL Audit Application <br />
-[[Network Miner]] - Windows based capture tool capable of pulling objects out of a tcp stream <br />
-US Gov Baseline Config: http://usgcb.nist.gov/usgcb_content.html <br />
-http://www.mandiant.com/products/free_software <- Mandiant has a bunch... dunno how useful they are for competitions though, more investigation to ensue.... <br />
-[[ModSecurity]] - Open Source WAF<br />
-https://www.owasp.org/index.php/Category:Countermeasure <-Owasp has a category for countermeasures, I am sure some of the other tools are awesome <br />
-[[Forensic Tools]] - Gotta figure out what happened <br />
-[[MBR Tools]] - in light of National CCDC Red Team playing with MBRs <br />
-[[Basic Linux Administration]]
+- [Unsploitable by Justin Wray](http://sourceforge.net/projects/unsploitable) - Automatically Patch Metasploitable Vulnerabilities
+- [Full Database Activity Auditing for the MySQL User Base](https://blogs.mcafee.com/business/security-connected/full-database-activity-auditing-for-the-mysql-user-base) - Mcafee MySQL Audit Application
+- [Network Miner](http://www.netresec.com/?page=NetworkMiner) - Windows based capture tool capable of pulling objects out of a tcp stream
+- [US Gov Baseline Config](http://usgcb.nist.gov/usgcb_content.html) - Security configuration baselines for Information Technology products widely deployed across the federal agencies.
+- [Mandiant Community Resources Software Downloads](https://www.mandiant.com/resources/downloads) More details forthcoming...
+- [ModSecurity](https://www.modsecurity.org) - Open Source WAF
+- [OWASP Countermeasures](https://www.owasp.org/index.php/Category:Countermeasure)- Details countermeasures and tools used.
+- [Forensic Tools](tools/forensictools.md) - Gotta figure out what happened
+- [Master Boot Record by Jamie Levy](http://gleeda.blogspot.com/2012/04/mbr-parser.html) - MBR parser
+- [Basic Linux Administration](tools/basiclinuxadministration.md)
+- [Snort IDS Wiki](https://www.blindseeker.com/wiki/Introduction_to_IDS_and_IPS_concepts) - Best IDS resource you will find
+
 
 ## Learning Reverse Engineering
 
-- http://tuts4you.com/download.php?list.17 <br />
-- http://resources.infosecinstitute.com/step-by-step-tutorial-on-reverse-engineering-malware-the-zeroaccessmaxsmiscer-crimeware-rootkit/ <br />
-- [[http://zeltser.com/remnux/ Remnux]] - Malware Reverse Engineering Distro based on Ubuntu <br />
+- [Collection of reverse engineering tutorials for beginners by Lenas](http://tuts4you.com/download.php?list.17) 
+- [ZeroAccess Rootkit](http://resources.infosecinstitute.com/step-by-step-tutorial-on-reverse-engineering-malware-the-zeroaccessmaxsmiscer-crimeware-rootkit) - Four part article series with step-by-step tutorials on how to reverse engineer the ZeroAccess Rootkit 
+- [REMnux: A Linux Toolkit for Reverse-Engineering and Analyzing Malware](http://zeltser.com/remnux/ Remnux)
+- [HopperApp](http://www.hopperapp.com) - Reverse engineering tool for OS X and Linux, that lets you disassemble, decompile and debug your 32/64bits as executables
 
 ### Debuggers
 
-- [OllyDebug](re/olly.md)
-- [IDA](re/ida.md) - if you have money .... its expensive
+- [OllyDebug](http://www.ollydbg.de) - OllyDbg is a 32-bit assembler level analysing debugger for Windows
+- [IDA](https://www.hex-rays.com/products/ida/) - IDA is a Windows, Linux or Mac OS X hosted multi-processor disassembler and debugger if you have money...It's expensive.
 
 ### Sandbox Tools
 
-- [Sandboxie](http://www.sandboxie.com/)
-- [Cuckoo](http://www.cuckoosandbox.org/)
+- [Sandboxie](http://www.sandboxie.com)
+- [Cuckoo](http://www.cuckoosandbox.org)
 
 ### Other Reversing Tools
 
-- [http://www.gmer.net/ GMER] - Rootkit Detector for NT/W2K/XP/VISTA/7 and Samples <br />
-- [http://technet.microsoft.com/en-us/sysinternals/0e18b180-9b7a-4c49-8120-c47c5a693683.aspx SysInternals] - Toolkit for Windows <br />
-- [http://www.mandiant.com/resources/download/redline Mandiant's RedLine] - Windows XP, Windows Vista, Windows 7 (32-bit and 64-bit) <br />
-- [http://www.linux-tutorial.info/modules.php?name=ManPage&sec=1&manpage=xxd XXD] - Free Linux command line hex editor <br />
-- [http://www.fireeye.com FireEye] <br />
+- [GMER](http://www.gmer.net)  - Rootkit Detector for NT/W2K/XP/VISTA/7 and Samples 
+- [SysInternals](http://technet.microsoft.com/en-us/sysinternals/0e18b180-9b7a-4c49-8120-c47c5a693683.aspx) - Toolkit for Windows 
+- [Mandiant's RedLine](http://www.mandiant.com/resources/download/redline) - Windows XP, Windows Vista, Windows 7 (32-bit and 64-bit) 
+- [XXD](http://linuxcommand.org/man_pages/xxd1.html) - Free Linux command line hex editor 
+- [FireEye](http://www.fireeye.com) 
 
 ## Other Tools  
 
-- [[Wireshark]] - Packet Analysis tool <br />
-- [http://zxing.org/w/decode.jspx QR Decoder] - can also do barcodes <br />
-- [http://www.libpng.org/pub/png/apps/pngcheck.html pngcheck] - Tool for checking CRC values within a PNG file. <br />
-- [http://www.bpsoft.com/downloads/ Hex Workshop] - Windows Hex Editor <br />
-- [http://www.gns3.net/ GNS3] - Graphical Network Simulator using Virtual Box <br />
+- [Wireshark](https://www.wireshark.org) - Packet Analysis tool 
+- [QR Decoder](http://zxing.org/w/decode.jspx) - can also do barcodes 
+- [pngcheck](http://www.libpng.org/pub/png/apps/pngcheck.html) - Tool for checking CRC values within a PNG file. 
+- [Hex Workshop](http://www.bpsoft.com/downloads) - Windows Hex Editor 
+- [GNS3](http://www.gns3.net) - Graphical Network Simulator using Virtual Box 

tools/armitage.md

@@ -0,0 +1,47 @@
+==Armitage Tool==
+
+Armitage is a free and open-source front-end to the Metasploit framework Developed by Raphael Mudge and Strategic Cyber LLC. The motto and design goal of Armitage is "fast and easy hacking". This is achieved by an easy to navigate GUI, integration of db_autopwn by way of Armitage's Hail Mary along with easy host management and network pivoting through exploited hosts. Armitage also boasts collaborative capability through its deconfliction server in combination with msfrpcd, as well as attack automation via the cortana scripting engine.
+
+==Red Teaming==
+
+Red Teaming allows multiple members of a pentest team or red team to collaborate during an engagement.It also reduces duplication of effort, attacker footprint and chances of destabilizing controlled hosts through multiple users exploiting the same host repeatedly -- you know who has sessions on the system, and can pass sessions or have different users interact with a single session as necessary.
+
+The architecture relies on armitage's deconfliction server to manage connections from armitage clients and in turn proxy/manage connections to msfrpcd and in turn to the controlled host(s)
+
+to summarize, in order to perform red teaming, the system that will be acting as a server has two components:
+msfrpcd (metasploit framework RPC daemon)
+armitage deconfliction server (connection manager for armitage clients, and proxy to msfrpcd)
+
+
+the method of doing this is in fact already scripted through the script teamserver.sh available on fastandeasyhacking.com
+
+the script handles all the fun of the lovecraftian summoning of msfrpcd, generating an SSL cert for deconfliction server and summarily telling java to use the SSL cert on the deconfliction connection, then Here are the basic steps to do this:
+
+1. install the latest backtrack release
+2. dhclient ethX && apt-get update && apt-get -y upgrade && cd /pentest/exploit/framework && msfupdate && startx (get an ip address, patch all the things, svn up metasploit/armitage and start X)
+3. terminal window: current directory will be /pentest/exploit/framework
+cd data/armitage
+4. cp teamserver /pentest/exploit/framework/data/armitage
+5. chmod u+x teamserver && ./teamserver [ip address] [deconfliction server password you want to use]
+6. tell clients connection information: ip address:port username:password
+7. ???
+8. profit.
+
+***NOTE: Don't try to start msfrpcd and the deconfliction server yourself. The teamserver.sh script is made available for a reason and protects you in the event that the deconfliction server setup process changes (This is per Raphael Mudge himself). Take it from somebody that did NOT RTFM. Don't do this, and you will avoid much crying, wailing and gnashing of teeth.***
+
+==Cortana== 
+
+Cortana is the scripting engine for armitage and can be used to automate several tedious tasks in armitage. There are several scripts made available by Raphael and other contributors as well as the script recorder built into Armitage itself for recording manual operations you perform on a host for automation.
+
+[A collection of Cortana scripts that you may use with Armitage and Cobalt Strike](https://github.com/rsmudge/cortana-scripts cortana-scripts github)
+
+==References==
+
+[Manual from Raphael Mudge](http://www.fastandeasyhacking.com/manual)
+[Training from Raphael Mudge](http://www.fastandeasyhacking.com/training)
+
+==Raphael Mudge== 
+Red Team for Multiple regions: NE-CCDC, MA-CCDC, creator of Red Team Tool: [Armitage](http://www.fastandeasyhacking.com)
+[@armitagehacker](https://twitter.com/armitagehacker)
+
+[Tools](../tools.md)