From 7d9065cdd2fbe555a76c0da8347be69691a13572 Mon Sep 17 00:00:00 2001 From: david Date: Sat, 14 Apr 2012 05:44:06 +0000 Subject: [PATCH] Manually do some Windows service packs with multiple classes. --- nmap-os-db | 50 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/nmap-os-db b/nmap-os-db index 80688e352..7ac65ba85 100644 --- a/nmap-os-db +++ b/nmap-os-db @@ -42083,9 +42083,14 @@ IE(DFI=S%T=7B-85%TG=80%CD=Z) # Windows 2000 Server SP4 Fingerprint Microsoft Windows 2000 SP0 - SP4 or Windows XP SP0 - SP1 Class Microsoft | Windows | 2000 | general purpose -CPE cpe:/o:microsoft:windows_2000 auto +CPE cpe:/o:microsoft:windows_2000::- +CPE cpe:/o:microsoft:windows_2000::sp1 +CPE cpe:/o:microsoft:windows_2000::sp2 +CPE cpe:/o:microsoft:windows_2000::sp3 +CPE cpe:/o:microsoft:windows_2000::sp4 Class Microsoft | Windows | XP | general purpose -CPE cpe:/o:microsoft:windows_xp auto +CPE cpe:/o:microsoft:windows_xp::- +CPE cpe:/o:microsoft:windows_xp::sp1 SEQ(SP=6A-8C%GCD=1-6%ISR=95-9F%TI=I%II=I%SS=S%TS=0) OPS(O1=M5B4NW0NNT00NNS%O2=M5B4NW0NNT00NNS%O3=M5B4NW0NNT00%O4=M5B4NW0NNT00NNS%O5=M5B4NW0NNT00NNS%O6=M5B4NNT00NNS) WIN(W1=FAF0%W2=FAF0%W3=FAF0%W4=FAF0%W5=FAF0%W6=FAF0) @@ -42108,9 +42113,12 @@ IE(DFI=S%T=7B-85%TG=80%CD=Z) # Microsoft (R) Windows Version 5.0 (Build 2195: Service Pack 4) Fingerprint Microsoft Windows 2000 SP0/SP2/SP4 or Windows XP SP0/SP1 Class Microsoft | Windows | 2000 | general purpose -CPE cpe:/o:microsoft:windows_2000 auto +CPE cpe:/o:microsoft:windows_2000::- +CPE cpe:/o:microsoft:windows_2000::sp2 +CPE cpe:/o:microsoft:windows_2000::sp4 Class Microsoft | Windows | XP | general purpose -CPE cpe:/o:microsoft:windows_xp auto +CPE cpe:/o:microsoft:windows_xp::- +CPE cpe:/o:microsoft:windows_xp::sp1 SEQ(SP=7C-9F%GCD=1-6%ISR=96-A0%TI=I%II=I%SS=S%TS=0) OPS(O1=M5B4NW0NNT00NNS%O2=M5B4NW0NNT00NNS%O3=M5B4NW0NNT00%O4=M5B4NW0NNT00NNS%O5=M5B4NW0NNT00NNS%O6=M5B4NNT00NNS) WIN(W1=4470%W2=41A0%W3=4100%W4=40E8%W5=40E8%W6=402E) @@ -42200,11 +42208,16 @@ IE(R=N) # Version 5.1 (Build 2600.xpsp_sp3_gdr.080814-1236 : Service Pack 3) Fingerprint Microsoft Windows 2000 SP2 - SP4, Windows XP SP2 - SP3, or Windows Server 2003 SP0 - SP2 Class Microsoft | Windows | 2000 | general purpose -CPE cpe:/o:microsoft:windows_2000 auto +CPE cpe:/o:microsoft:windows_2000::sp2 +CPE cpe:/o:microsoft:windows_2000::sp3 +CPE cpe:/o:microsoft:windows_2000::sp4 Class Microsoft | Windows | XP | general purpose -CPE cpe:/o:microsoft:windows_xp auto +CPE cpe:/o:microsoft:windows_xp::sp2 +CPE cpe:/o:microsoft:windows_xp::sp3 Class Microsoft | Windows | 2003 | general purpose -CPE cpe:/o:microsoft:windows_server_2003 auto +CPE cpe:/o:microsoft:windows_server_2003::- +CPE cpe:/o:microsoft:windows_server_2003::sp1 +CPE cpe:/o:microsoft:windows_server_2003::sp2 SEQ(SP=EC-10A%GCD=1-6%ISR=FB-112%TI=I%CI=I%II=I%SS=S%TS=0) OPS(O1=M5B4NW0NNT00NNS%O2=M5B4NW0NNT00NNS%O3=M5B4NW0NNT00%O4=M5B4NW0NNT00NNS%O5=M5B4NW0NNT00NNS%O6=M5B4NNT00NNS) WIN(W1=4470%W2=41A0%W3=4100%W4=40E8%W5=40E8%W6=402E) @@ -42226,9 +42239,11 @@ IE(DFI=S%T=7B-85%TG=80%CD=Z) # Version 5.1 (num\303\251ro 2600.xpsp2.050301-1526 : Service Pack 1) Fingerprint Microsoft Windows 2000 SP3/SP4 or Windows XP SP1/SP2 Class Microsoft | Windows | 2000 | general purpose -CPE cpe:/o:microsoft:windows_2000 auto +CPE cpe:/o:microsoft:windows_2000::sp3 +CPE cpe:/o:microsoft:windows_2000::sp4 Class Microsoft | Windows | XP | general purpose -CPE cpe:/o:microsoft:windows_xp auto +CPE cpe:/o:microsoft:windows_xp::sp1 +CPE cpe:/o:microsoft:windows_xp::sp2 SEQ(SP=D4-114%GCD=1-6%ISR=FE-114%TI=I%II=I%SS=S%TS=0) OPS(O1=M5B4NW0NNT00NNS%O2=M5B4NW0NNT00NNS%O3=M5B4NW0NNT00%O4=M5B4NW0NNT00NNS%O5=M5B4NW0NNT00NNS%O6=M5B4NNT00NNS) WIN(W1=FAF0%W2=FAF0%W3=FAF0%W4=FAF0%W5=FAF0%W6=FAF0) @@ -43351,7 +43366,8 @@ Fingerprint Microsoft Windows 2000 SP4 or Windows XP SP2 or SP3 Class Microsoft | Windows | 2000 | general purpose CPE cpe:/o:microsoft:windows_2000::sp4 Class Microsoft | Windows | XP | general purpose -CPE cpe:/o:microsoft:windows_xp auto +CPE cpe:/o:microsoft:windows_xp::sp2 +CPE cpe:/o:microsoft:windows_xp::sp3 SEQ(SP=FD-109%GCD=1-6%ISR=102-110%TI=I%II=I%SS=S%TS=0) OPS(O1=M5B4NW0NNT00NNS%O2=M5B4NW0NNT00NNS%O3=M5B4NW0NNT00%O4=M5B4NW0NNT00NNS%O5=M5B4NW0NNT00NNS%O6=M5B4NNT00NNS) WIN(W1=4470%W2=41A0%W3=4100%W4=40E8%W5=40E8%W6=402E) @@ -47955,11 +47971,12 @@ IE(DFI=N%T=7B-85%TG=80%CD=Z) # Windows 7 Professional x64 Fingerprint Microsoft Windows Vista SP0 or SP1, Windows Server 2008 SP1, or Windows 7 Class Microsoft | Windows | Vista | general purpose -CPE cpe:/o:microsoft:windows_vista auto +CPE cpe:/o:microsoft:windows_vista::- +CPE cpe:/o:microsoft:windows_vista::sp1 Class Microsoft | Windows | 2008 | general purpose CPE cpe:/o:microsoft:windows_server_2008::sp1 Class Microsoft | Windows | 7 | general purpose -CPE cpe:/o:microsoft:windows_7 auto +CPE cpe:/o:microsoft:windows_7 SEQ(SP=E4-10A%GCD=1-6%ISR=F5-111%TI=I%II=I%SS=S%TS=7) OPS(O1=M5B4NW8ST11%O2=M5B4NW8ST11%O3=M5B4NW8NNT11%O4=M5B4NW8ST11%O5=M5B4NW8ST11%O6=M5B4ST11) WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000) @@ -48237,7 +48254,7 @@ Fingerprint Microsoft Windows Server 2003 SP0 or Windows XP SP2 Class Microsoft | Windows | XP | general purpose CPE cpe:/o:microsoft:windows_xp::sp2 Class Microsoft | Windows | 2003 | general purpose -CPE cpe:/o:microsoft:windows_server_2003 auto +CPE cpe:/o:microsoft:windows_server_2003::- SEQ(SP=F6-10C%GCD=1-6%ISR=107-111%TI=I%II=I%SS=S%TS=0) OPS(O1=M5B4NW0NNT00NNS%O2=M5B4NW0NNT00NNS%O3=M5B4NW0NNT00%O4=M5B4NW0NNT00NNS%O5=M5B4NW0NNT00NNS%O6=M5B4NNT00NNS) WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF) @@ -50740,9 +50757,10 @@ IE(DFI=S%T=7B-85%TG=80%CD=Z) # Microsoft Windows 2003 Standard R2 version 5.2 Service Pack 2 (build 3790.srv03_sp2_gdr.070304-2240) Fingerprint Microsoft Windows XP SP2 or Windows Server 2003 SP1 or SP2 Class Microsoft | Windows | XP | general purpose -CPE cpe:/o:microsoft:windows_xp auto +CPE cpe:/o:microsoft:windows_xp::sp2 Class Microsoft | Windows | 2003 | general purpose -CPE cpe:/o:microsoft:windows_server_2003 auto +CPE cpe:/o:microsoft:windows_server_2003::sp1 +CPE cpe:/o:microsoft:windows_server_2003::sp2 SEQ(SP=F0-10A%GCD=1-6%ISR=F7-111%TI=I%CI=I%II=I%SS=S%TS=0) OPS(O1=M5B4NW0NNT00NNS%O2=M5B4NW0NNT00NNS%O3=M5B4NW0NNT00%O4=M5B4NW0NNT00NNS%O5=M5B4NW0NNT00NNS%O6=M5B4NNT00NNS) WIN(W1=4000%W2=4000%W3=4000%W4=4000%W5=4000%W6=4000) @@ -52716,7 +52734,7 @@ Fingerprint Microsoft Windows XP SP3, Windows Server 2003, or Windows Vista SP1 Class Microsoft | Windows | XP | general purpose CPE cpe:/o:microsoft:windows_xp::sp3 Class Microsoft | Windows | 2003 | general purpose -CPE cpe:/o:microsoft:windows_server_2003 auto +CPE cpe:/o:microsoft:windows_server_2003 Class Microsoft | Windows | Vista | general purpose CPE cpe:/o:microsoft:windows_vista::sp1 SEQ(SP=FE-10C%GCD=1-6%ISR=104-10E%TI=I%TS=0)