From 979e57ed9dc43fe56cbb2330601c710583d046ba Mon Sep 17 00:00:00 2001 From: fyodor Date: Tue, 24 Oct 2006 02:14:20 +0000 Subject: [PATCH] Preparing to release ALPHA10 --- CHANGELOG | 19 +++++++++++++++---- Makefile.in | 2 +- docs/nmap.usage.txt | 4 +++- nmap-os-db | 6 ++++-- nmap_winconfig.h | 2 +- osscan.cc | 2 +- scripts/fingerfix.cc | 2 +- tcpip.cc | 2 +- 8 files changed, 27 insertions(+), 12 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 8b2284e18..8dbdb682c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,15 +1,26 @@ # Nmap Changelog ($Id$); -*-text-*- + +4.20ALPHA10 + +o Integrated tons of new OS fingerprints. The DB now contains 116 + fingerprints, which is up 63% since the previous version. Please keep + the submissions coming. + 4.20ALPHA9 -o Added --open option, which causes Nmap to show only open ports. +o Integrated the newly submitted OS fingerprints. The DB now contains + 71 fingerprints, up 27% from 56 in ALPHA8. Please keep them coming! + We still only have 4.2% as many fingerprints as the gen1 database. + +o Added the --open option, which causes Nmap to show only open ports. Ports in the states "open|closed" and "unfiltered" might be open, so those are shown unless the host has an overwhelming number of them. o Nmap gen2 OS detection used to always do 2 retries if it fails to find a match. Now it normally does just 1 retry, but does 4 retries - if conditions are good enough to warrant fingerprint submission. A - new --max-os-tries option lets you specify a or higher maximum - number of tries. + if conditions are good enough to warrant fingerprint submission. + This should speed things up on average. A new --max-os-tries option + lets you specify a higher lower maximum number of tries. o Added --unprivileged option, which is the opposite of --privileged. It tells Nmap to treat the user as lacking network raw socket and diff --git a/Makefile.in b/Makefile.in index bc2460427..caa4633eb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -export NMAP_VERSION = 4.20ALPHA9 +export NMAP_VERSION = 4.20ALPHA10 NMAP_NAME= Nmap NMAP_URL= http://insecure.org NMAP_PLATFORM=@host@ diff --git a/docs/nmap.usage.txt b/docs/nmap.usage.txt index 480f9fbf9..5d97003a6 100644 --- a/docs/nmap.usage.txt +++ b/docs/nmap.usage.txt @@ -1,4 +1,4 @@ -Nmap 4.20ALPHA8 ( http://Insecure.Org ) +Nmap 4.20ALPHA9 ( http://insecure.org ) Usage: nmap [Scan Type(s)] [Options] {target specification} TARGET SPECIFICATION: Can pass hostnames, IP addresses, networks, etc. @@ -69,6 +69,7 @@ OUTPUT: -oA : Output in the three major formats at once -v: Increase verbosity level (use twice for more effect) -d[level]: Set or increase debugging level (Up to 9 is meaningful) + --open: Only show open (or possibly open) ports --packet-trace: Show all packets sent and received --iflist: Print host interfaces and routes (for debugging) --log-errors: Log errors/warnings to the normal-format output file @@ -83,6 +84,7 @@ MISC: --datadir : Specify custom Nmap data file location --send-eth/--send-ip: Send using raw ethernet frames or IP packets --privileged: Assume that the user is fully privileged + --unprivileged: Assume the user lacks raw socket privileges -V: Print version number -h: Print this help summary page. EXAMPLES: diff --git a/nmap-os-db b/nmap-os-db index 2983d5cf6..efd8985d0 100644 --- a/nmap-os-db +++ b/nmap-os-db @@ -1908,9 +1908,11 @@ U1(DF=Y%T=FF%TG=FF%TOS=0%IPL=70%UN=0%RIPL=G%RID=%RIPCK=G%RUCK=G%RUL=G%RUD=G) IE(DFI=Y%T=FF%TG=FF%TOSI=S%CD=S%SI=S%DLI=S) # Ultra 10 uni-processor -Fingerprint Sun Solaris 9 (SPARC) +# SunOS sparc10 5.10 Generic_118822-30 sun4u sparc SUNW,Ultra-5_10 Solaris +Fingerprint Sun Solaris 9 or 10 (SPARC) Class Sun | Solaris | 9 | general purpose -SEQ(SP=8D-9C%GCD=<5%ISR=A2-A5%TI=I%II=I%SS=S%TS=7) +Class Sun | Solaris | 10 | general purpose +SEQ(SP=8D-A1%GCD=<5%ISR=A2-A5%TI=I%II=I%SS=S%TS=7) OPS(O1=NNT11M5B4NW0NNS%O2=NNT11M5B4NW0NNS%O3=NNT11M5B4NW0%O4=NNT11M5B4NW0NNS%O5=NNT11M5B4NW0NNS%O6=NNT11M5B4NNS) WIN(W1=C050%W2=C330%W3=C1CC%W4=C068%W5=C068%W6=C0B7) ECN(R=Y%DF=Y%T=3C|40%TG=3C|40%W=C1E8%O=M5B4NW0NNS%CC=Y%Q=) diff --git a/nmap_winconfig.h b/nmap_winconfig.h index 73fb7200e..6062a0d53 100644 --- a/nmap_winconfig.h +++ b/nmap_winconfig.h @@ -106,7 +106,7 @@ /* Without this, Windows will give us all sorts of crap about using functions like strcpy() even if they are done safely */ #define _CRT_SECURE_NO_DEPRECATE 1 -#define NMAP_VERSION "4.20ALPHA9" +#define NMAP_VERSION "4.20ALPHA10" #define NMAP_NAME "Nmap" #define NMAP_URL "http://insecure.org" #define NMAP_PLATFORM "i686-pc-windows-windows" diff --git a/osscan.cc b/osscan.cc index 2100e93f0..cd227398a 100644 --- a/osscan.cc +++ b/osscan.cc @@ -1145,7 +1145,7 @@ static int compareclassifications(FingerPrint *referenceFP, return 1; } if (verbose) - printf("Warning: Classification of observed fingerprint does not appear in reference fingerprint.\n"); + printf("[WARN] Classification of observed fingerprint does not appear in reference fingerprint.\n"); return 1; } diff --git a/scripts/fingerfix.cc b/scripts/fingerfix.cc index f61792521..c0c3fdc9b 100644 --- a/scripts/fingerfix.cc +++ b/scripts/fingerfix.cc @@ -562,7 +562,7 @@ int main(int argc, char *argv[]) { // OS Name if(observedFP->OS_name) { - printf("Fingerprint %s\n", observedFP->OS_name); + printf("# %s\nFingerprint %s\n", observedFP->OS_name, observedFP->OS_name); } else { // print an empty fingerprint printf("Fingerprint\n"); diff --git a/tcpip.cc b/tcpip.cc index 4f234c30f..0f8ea2645 100644 --- a/tcpip.cc +++ b/tcpip.cc @@ -2780,7 +2780,7 @@ struct sys_route *getsysroutes(int *howmany) { /* First let us try Linux-style /proc/net/route */ routefp = fopen("/proc/net/route", "r"); if (routefp) { - fgets(buf, sizeof(buf), routefp); /* Kill the first line (column headers) */ + (void) fgets(buf, sizeof(buf), routefp); /* Kill the first line (column headers) */ while(fgets(buf,sizeof(buf), routefp)) { p = strtok(buf, " \t\n"); if (!p) {