Merged from master

This commit is contained in:
Giga1699 2014-02-16 18:44:43 -05:00
commit 3cdc70adb6
3 changed files with 35 additions and 15 deletions

View File

@ -71,30 +71,47 @@ OS Fingerprinting
OSINT Analysis OSINT Analysis
------------ ------------
* [first]() * [casefile](../tools/casefile.md)
* [second]() * [creepy](../tools/creepy.md)
* [third]() * [dmitry](../tools/dmistry.md)
* [jigsaw](../tools/jigsaw.md)
* [maltego](../tools/maltego.md)
* [metagoofil](../tools/metagoofil.md)
* [theharvester](../tools/theharvester.md)
* [twofi](../tools/twofi.md)
* [urlcrazy](../tools/urlcrazy.md)
Route Analysis Route Analysis
------------ ------------
* [first]() * [Otrace](../tools/0trace.md)
* [second]() * [dnmap-client](../tools/dnmap-client.md)
* [third]() * [dnmap-server](../tools/dnmap-server.md)
* [intrace](../tools/intrace.md)
* [netmask](../tools/netmask.md)
* [trace6](../tools/trace6.md)
Service Fingerprinting Service Fingerprinting
------------ ------------
* [first]() * [dnmap-client](../tools/dnmap-client.md)
* [second]() * [dnmap-server](../tools/dnmap-server.md)
* [third]() * [implementation6](../tools/implementation6.md)
* [implementation6d](../tools/implementation6d.md)
* [ncat](../tools/ncat.md)
* [nmap](../tools/nmap.md)
* [sslscan](../tools/sslscan.md)
* [sslyze](../tools/sslyze.md)
* [tlssled](../tools/tlssled.md)
* [zenmap](../tools/zenmap.md)
SMB Analysis SMB Analysis
------------ ------------
* [first]() * [acccheck](../tools/acccheck.md)
* [second]() * [nbtscan](../tools/nbtscan.md)
* [third]() * [nmap](../tools/nmap.md)
* [zenmap](../tools.zenmap.md)
SMTP Analysis SMTP Analysis
------------ ------------

View File

@ -6,7 +6,7 @@ Notes
Help Text Help Text
------- -------
``` ```
Nmap 6.40 ( http://nmap.org ) Nmap 6.25 ( http://nmap.org )
Usage: nmap [Scan Type(s)] [Options] {target specification} Usage: nmap [Scan Type(s)] [Options] {target specification}
TARGET SPECIFICATION: TARGET SPECIFICATION:
Can pass hostnames, IP addresses, networks, etc. Can pass hostnames, IP addresses, networks, etc.
@ -118,7 +118,6 @@ EXAMPLES:
nmap -v -iR 10000 -Pn -p 80 nmap -v -iR 10000 -Pn -p 80
SEE THE MAN PAGE (http://nmap.org/book/man.html) FOR MORE OPTIONS AND EXAMPLES SEE THE MAN PAGE (http://nmap.org/book/man.html) FOR MORE OPTIONS AND EXAMPLES
``` ```
Example Usage Example Usage
------- -------
# nmap -O -v scanme.nmap.org # nmap -O -v scanme.nmap.org
@ -148,5 +147,4 @@ Nmap done: 1 IP address (1 host up) scanned in 5.58 seconds
Links Links
------- -------
http://nmap.org/ http://nmap.org/

5
wifi/airmon-ng.md Normal file
View File

@ -0,0 +1,5 @@
```
root@kali:~# airmon-ng -help
usage: airmon-ng <start|stop|check> <interface> [channel or frequency]