diff --git a/CHANGELOG b/CHANGELOG index 21dbdbd37..3ed41fb7e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,7 @@ # Nmap Changelog ($Id$); -*-text-*- +o [Ndiff] Ndiff now shows changes in script output. [David] + o A bug in Nsock was fixed: On systems where a nonblocking connect could succeed immediately, connections that were requested to be tunnelled through SSL would actually be plain text. This could be diff --git a/ndiff/README b/ndiff/README index 5dfd089ee..0ec00a29b 100644 --- a/ndiff/README +++ b/ndiff/README @@ -3,7 +3,8 @@ Ndiff Ndiff is a tool to aid in the comparison of Nmap scans. Specifically, it takes two Nmap XML output files and prints the differences between them. It is capable of showing changes in host states (up or down), port -states (open, closed, etc.), and changes in service and OS detection. +states (open, closed, etc.), script results, and changes in service and +OS detection. To install, run (as root) python setup.py install diff --git a/ndiff/docs/ndiff.xml b/ndiff/docs/ndiff.xml index 4726c4113..f389f0fbd 100644 --- a/ndiff/docs/ndiff.xml +++ b/ndiff/docs/ndiff.xml @@ -31,13 +31,30 @@ Ndiff is a tool to aid in the comparison of Nmap scans. It takes two - Nmap XML output files and prints the differences between them: hosts - coming up and down, ports becoming open or closed, etc. + Nmap XML output files and prints the differences between them. The + differences observed are: + + + Host states (e.g. up to down) + + + Port states (e.g. open to closed) + + + Service versions (from ) + + + OS matches (from ) + + + Script output + + - Ndiff compares two scans at a time. The first scan is called the A - scan and the second scan is called the B scan. + Ndiff, like the standard diff utility, compares two scans + at a time. @@ -86,8 +103,7 @@ Any other arguments are taken to be the names of Nmap XML output - files. There must be exactly two. The first one listed is the A scan - and the second is the B scan. + files. There must be exactly two.