From fc743a77eb5a0a44b282ac31712d1d25a7b64a03 Mon Sep 17 00:00:00 2001
From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Tue, 15 Jul 2014 03:04:34 +0000
Subject: [PATCH] Manual merging of OS fingerprints

Because of previous merging, some fingerprints had grown to encompass
others. Other fingerprints for the same or similar devices were close
enough that they could be merged. This was a manual review of 614
fingerprints that were identified as differing from some other
fingerprint by only the SEQ line (256 unique non-SEQ fingerprints).

The result: 44 fingerprints were merged into others, or were deleted
because they were a proper subset of some other fingerprint (e.g. Linux
2.6.17 that is not distinguishable from a broader Linux 2.6.11-2.6.32
fingerprint). A couple of these appeared to be identical copy-and-paste
errors in the past. I was very conservative in what I chose to merge,
choosing only the most-obvious fingerprint pairs that did not lose
information (e.g. not merging unrelated specialized devices, even if
their fingerprints were very close).
---
 nmap-os-db | 1006 +++++++---------------------------------------------
 1 file changed, 132 insertions(+), 874 deletions(-)

diff --git a/nmap-os-db b/nmap-os-db
index 03754ddcc..c875fa4a3 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -2529,11 +2529,13 @@ IE(R=N)
 # AMBIT DOCSIS 2.0 Cable Modem :: Boot Code Version : 2.1.5 / Software Version : 5.11.1130 / Hardware version 4.7
 # Xerox Phaser 6350DT Network Printer
 # OS: 5.78; Engine 3.1.0;
-Fingerprint Ambit DOCSIS 2.0 cable modem, or Xerox Phaser 6250N or 6350DT printer
+# Xerox Phaser 8560MFP, Operating System: 8.26, Networking: 33.16.05.04.2007
+Fingerprint Ambit DOCSIS 2.0 cable modem, or Xerox Phaser 6250N, 6350DT, or 8560MFP printer
 Class Ambit | embedded || broadband router
 Class Xerox | embedded || printer
 CPE cpe:/h:xerox:phaser_6250n
 CPE cpe:/h:xerox:phaser_6350dt
+CPE cpe:/h:xerox:phaser_8560mfp
 SEQ(SP=E-52%GCD=FA00|1F400|2EE00|3E800|4E200|5DC00%ISR=98-C4%TI=I%II=I%SS=S%TS=U)
 OPS(O1=M5B4NW0%O2=M5B4NW0%O3=M5B4NW0%O4=M5B4NW0%O5=M5B4NW0%O6=M5B4)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -9213,10 +9215,11 @@ U1(DF=N%T=76%TG=80%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUD=G)
 IE(DFI=N%T=76%TG=80%CD=Z)
 
 # it is a brother HL-2070N network laster printer
+# Brother HL-2070N series, Firmware Version 1.33
 Fingerprint Brother HL-2070N printer
 Class Brother | embedded || printer
 CPE cpe:/h:brother:hl-2070n auto
-SEQ(SP=C6-D0%GCD=1-6%ISR=D5-DF%TI=I%II=I%SS=S%TS=U)
+SEQ(SP=C6-DB%GCD=1-6%ISR=D5-DF%TI=I%II=I%SS=S%TS=U)
 OPS(O1=M5B4%O2=M578%O3=M280%O4=M200%O5=M218%O6=M109)
 WIN(W1=111C%W2=111C%W3=111C%W4=111C%W5=111C%W6=111C)
 ECN(R=Y%DF=N%T=74%TG=80%W=111C%O=M5B4%CC=N%Q=)
@@ -9320,24 +9323,6 @@ T7(R=Y%DF=N%T=72%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=72%TG=80%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUD=G)
 IE(DFI=N%T=72%TG=80%CD=Z)
 
-# Brother HL-2070N series, Firmware Version 1.33
-Fingerprint Brother HL-2070N printer
-Class Brother | embedded || printer
-CPE cpe:/h:brother:hl-2070n auto
-SEQ(SP=D1-DB%GCD=1-6%ISR=D5-DF%TI=I%II=I%SS=S%TS=U)
-OPS(O1=M5B4%O2=M578%O3=M280%O4=M200%O5=M218%O6=M109)
-WIN(W1=111C%W2=111C%W3=111C%W4=111C%W5=111C%W6=111C)
-ECN(R=Y%DF=N%T=74%TG=80%W=111C%O=M5B4%CC=N%Q=)
-T1(R=Y%DF=N%T=74%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=N%T=74%TG=80%W=111C%S=O%A=S+%F=AS%O=M109%RD=0%Q=)
-T4(R=Y%DF=N%T=74%TG=80%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=74%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=74%TG=80%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=74%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=74%TG=80%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUD=G)
-IE(DFI=N%T=74%TG=80%CD=Z)
-
 # Brother HL-2070N Laser Printer
 Fingerprint Brother HL-2070N printer
 Class Brother | embedded || printer
@@ -9830,77 +9815,25 @@ T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(R=N)
 IE(DFI=N%T=3B-45%TG=40%CD=Z)
 
-# Brother MFC-7820N
-Fingerprint Brother MFC-7820N printer
-Class Brother | embedded || printer
-CPE cpe:/h:brother:mfc-7820n auto
-SEQ(SP=CB-D5%GCD=1-6%ISR=D4-DE%TI=I%II=I%SS=S%TS=U)
-OPS(O1=M5B4%O2=M578%O3=M280%O4=M200%O5=M218%O6=M109)
-WIN(W1=1000%W2=1000%W3=1000%W4=1000%W5=1000%W6=1000)
-ECN(R=Y%DF=N%T=7C%TG=80%W=1000%O=M5B4%CC=N%Q=)
-T1(R=Y%DF=N%T=7C%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=N%T=7C%TG=80%W=1000%S=O%A=S+%F=AS%O=M109%RD=0%Q=)
-T4(R=Y%DF=N%T=7C%TG=80%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=7C%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=7C%TG=80%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=7C%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=7C%TG=80%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUD=G)
-IE(DFI=N%T=7C%TG=80%CD=Z)
-
 # Brother MFC-7820N all-in-one laser printer (NC-6200h firmware version K)
-Fingerprint Brother MFC-7820N printer
-Class Brother | embedded || printer
-CPE cpe:/h:brother:mfc-7820n auto
-SEQ(SP=CC-D6%GCD=1-6%ISR=D5-DF%TI=I%II=I%SS=S%TS=U)
-OPS(O1=M5B4%O2=M578%O3=M280%O4=M200%O5=M218%O6=M109)
-WIN(W1=1000%W2=1000%W3=1000%W4=1000%W5=1000%W6=1000)
-ECN(R=Y%DF=N%T=7C%TG=80%W=1000%O=M5B4%CC=N%Q=)
-T1(R=Y%DF=N%T=7C%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=N%T=7C%TG=80%W=1000%S=O%A=S+%F=AS%O=M109%RD=0%Q=)
-T4(R=Y%DF=N%T=7C%TG=80%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=7C%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=7C%TG=80%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=7C%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=7C%TG=80%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUD=G)
-IE(DFI=N%T=7C%TG=80%CD=Z)
-
+# Brother MFC-7820N, MFC Firmware Version E
 # Brother MFC-7820N
 Fingerprint Brother MFC-7820N printer
 Class Brother | embedded || printer
 CPE cpe:/h:brother:mfc-7820n auto
-SEQ(SP=D1-DB%GCD=1-6%ISR=D4-DE%TI=I%II=I%SS=S%TS=U)
+SEQ(SP=C8-DB%GCD=1-6%ISR=D3-DF%TI=I%II=I%SS=S%TS=U)
 OPS(O1=M5B4%O2=M578%O3=M280%O4=M200%O5=M218%O6=M109)
 WIN(W1=1000%W2=1000%W3=1000%W4=1000%W5=1000%W6=1000)
-ECN(R=Y%DF=N%T=75%TG=80%W=1000%O=M5B4%CC=N%Q=)
-T1(R=Y%DF=N%T=75%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+ECN(R=Y%DF=N%T=70-81%TG=80%W=1000%O=M5B4%CC=N%Q=)
+T1(R=Y%DF=N%T=70-81%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
 T2(R=N)
-T3(R=Y%DF=N%T=75%TG=80%W=1000%S=O%A=S+%F=AS%O=M109%RD=0%Q=)
-T4(R=Y%DF=N%T=75%TG=80%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=75%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=75%TG=80%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=75%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=75%TG=80%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUD=G)
-IE(DFI=N%T=75%TG=80%CD=Z)
-
-# Brother MFC-7820N, MFC Firmware Version E
-Fingerprint Brother MFC-7820N printer
-Class Brother | embedded || printer
-CPE cpe:/h:brother:mfc-7820n auto
-SEQ(SP=C8-D8%GCD=1-6%ISR=D3-DD%TI=I%II=I%SS=S%TS=U)
-OPS(O1=M5B4%O2=M578%O3=M280%O4=M200%O5=M218%O6=M109)
-WIN(W1=1000%W2=1000%W3=1000%W4=1000%W5=1000%W6=1000)
-ECN(R=Y%DF=N%T=79%TG=80%W=1000%O=M5B4%CC=N%Q=)
-T1(R=Y%DF=N%T=79%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=N%T=79%TG=80%W=1000%S=O%A=S+%F=AS%O=M109%RD=0%Q=)
-T4(R=Y%DF=N%T=79%TG=80%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=79%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=79%TG=80%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=79%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=79%TG=80%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUD=G)
-IE(DFI=N%T=79%TG=80%CD=Z)
+T3(R=Y%DF=N%T=70-81%TG=80%W=1000%S=O%A=S+%F=AS%O=M109%RD=0%Q=)
+T4(R=Y%DF=N%T=70-81%TG=80%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=70-81%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=70-81%TG=80%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=70-81%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=70-81%TG=80%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUD=G)
+IE(DFI=N%T=70-81%TG=80%CD=Z)
 
 # Brother MFC-7820N
 Fingerprint Brother MFC-7820N printer
@@ -9957,9 +9890,8 @@ U1(DF=N%T=75%TG=80%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUD=G)
 IE(DFI=N%T=75%TG=80%CD=Z)
 
 # Brother HL-2070N series
-Fingerprint Brother MFC-7820N printer
+Fingerprint Brother HL-2070N printer
 Class Brother | embedded || printer
-CPE cpe:/h:brother:mfc-7820n auto
 SEQ(SP=A4-102%GCD=1-6%ISR=C4-FA%TI=I%CI=I%II=I%SS=S%TS=U)
 OPS(O1=M5B4%O2=M578%O3=M280%O4=M200%O5=M218%O6=M109)
 WIN(W1=111C%W2=111C%W3=111C%W4=111C%W5=111C%W6=111C)
@@ -10707,10 +10639,12 @@ U1(DF=N%T=3B-45%TG=40%IPL=70%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
 # Canon net printer/scanner/fax IR3100C
-Fingerprint Canon imageRUNNER C3100 printer
+# Canon iR6800C EUR printer/scanner/copier
+Fingerprint Canon imageRUNNER C3100 or C6800 printer
 Class Canon | embedded || printer
 CPE cpe:/h:canon:imagerunner_c3100
-SEQ(SP=13-1D%GCD=FA00|1F400|2EE00|3E800|4E200|5DC00%ISR=98-A2%TI=I%II=I%SS=S%TS=U)
+CPE cpe:/h:canon:imagerunner_c6800
+SEQ(SP=13-1E%GCD=FA00|1F400|2EE00|3E800|4E200|5DC00%ISR=98-A3%TI=I%II=I%SS=S%TS=U)
 OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
 WIN(W1=4000%W2=4000%W3=4000%W4=4000%W5=4000%W6=4000)
 ECN(R=Y%DF=N%T=3B-45%TG=40%W=4000%O=M5B4%CC=N%Q=)
@@ -10777,24 +10711,6 @@ T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=3B-45%TG=40%IPL=70%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
-# Canon iR6800C EUR printer/scanner/copier
-Fingerprint Canon imageRUNNER C6800 printer
-Class Canon | embedded || printer
-CPE cpe:/h:canon:imagerunner_c6800
-SEQ(SP=14-1E%GCD=FA00|1F400|2EE00|3E800|4E200%ISR=99-A3%TI=I%II=I%SS=S%TS=U)
-OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
-WIN(W1=4000%W2=4000%W3=4000%W4=4000%W5=4000%W6=4000)
-ECN(R=Y%DF=N%T=3B-45%TG=40%W=4000%O=M5B4%CC=N%Q=)
-T1(R=Y%DF=N%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=N%T=3B-45%TG=40%W=4000%S=O%A=O%F=A%O=%RD=0%Q=)
-T4(R=Y%DF=N%T=3B-45%TG=40%W=4000%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=0%RUD=G)
-IE(DFI=S%T=3B-45%TG=40%CD=S)
-
 # Canon MF4360-4390 Printer
 # Canon 4370dn network laser all-in-one printer
 Fingerprint Canon MF4360-4390 or 4370dn printer
@@ -12043,10 +11959,14 @@ U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=FA-104%TG=FF%CD=S)
 
 # Cisco Switch CE500
-Fingerprint Cisco Catalyst Express 500 switch
-Class Cisco | embedded || switch
+# Catalyst Express 500
+# Catalyst Express 520
+Fingerprint Cisco Catalyst Express 500 or 520 switch
+Class Cisco | IOS | 12.X | switch
 CPE cpe:/h:cisco:catalyst_express_500
-SEQ(SP=FF-109%GCD=1-6%ISR=103-10F%TI=RD%CI=RD%II=RI%TS=U)
+CPE cpe:/h:cisco:catalyst_express_520
+CPE cpe:/o:cisco:ios:12 auto
+SEQ(SP=FA-10A%GCD=1-6%ISR=103-10F%TI=Z|RD%CI=I|RD%II=RI%TS=U)
 OPS(O1=M5B4%O2=M578%O3=M280%O4=M218%O5=M218%O6=M109)
 WIN(W1=1020%W2=1020%W3=1020%W4=1020%W5=1020%W6=1020)
 ECN(R=Y%DF=N%T=FA-104%TG=FF%W=1020%O=M5B4%CC=N%Q=)
@@ -15056,25 +14976,6 @@ T7(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
-# Catalyst Express 500
-Fingerprint Cisco Catalyst Express 500 switch
-Class Cisco | IOS | 12.X | switch
-CPE cpe:/h:cisco:catalyst_express_500
-CPE cpe:/o:cisco:ios:12 auto
-SEQ(SP=FA-108%GCD=1-6%ISR=103-10D%TI=Z%CI=I%II=RI%TS=U)
-OPS(O1=M5B4%O2=M578%O3=M280%O4=M218%O5=M218%O6=M109)
-WIN(W1=1020%W2=1020%W3=1020%W4=1020%W5=1020%W6=1020)
-ECN(R=Y%DF=N%T=FA-104%TG=FF%W=1020%O=M5B4%CC=N%Q=)
-T1(R=Y%DF=N%T=FA-104%TG=FF%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=N%T=FA-104%TG=FF%W=1020%S=O%A=S+%F=AS%O=M7A6%RD=0%Q=)
-T4(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=A%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=S%T=FA-104%TG=FF%CD=S)
-
 # Cisco Catalyst Express 500, IOS 12.2(25)SEG
 Fingerprint Cisco Catalyst Express 500 switch (IOS 12.2)
 Class Cisco | IOS | 12.X | switch
@@ -15094,25 +14995,6 @@ T7(R=N)
 U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
-# Catalyst Express 520
-Fingerprint Cisco Catalyst Express 520 switch
-Class Cisco | IOS | 12.X | switch
-CPE cpe:/h:cisco:catalyst_express_520
-CPE cpe:/o:cisco:ios:12 auto
-SEQ(SP=100-10A%GCD=1-6%ISR=104-10E%TI=RD%CI=I%II=RI%TS=U)
-OPS(O1=M5B4%O2=M578%O3=M280%O4=M218%O5=M218%O6=M109)
-WIN(W1=1020%W2=1020%W3=1020%W4=1020%W5=1020%W6=1020)
-ECN(R=Y%DF=N%T=FA-104%TG=FF%W=1020%O=M5B4%CC=N%Q=)
-T1(R=Y%DF=N%T=FA-104%TG=FF%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=N%T=FA-104%TG=FF%W=1020%S=O%A=S+%F=AS%O=M7A6%RD=0%Q=)
-T4(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=A%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=S%T=FA-104%TG=FF%CD=S)
-
 # cisco 1131AG wireless access point running IOS 12.3(8)JA2
 Fingerprint Cisco 1131AG WAP (IOS 12.3)
 Class Cisco | IOS | 12.X | WAP
@@ -15174,25 +15056,6 @@ T7(R=Y%DF=N%T=F7-101%TG=FF%W=0%S=A%A=S%F=AR%RD=0)
 U1(DF=N%T=F7-101%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=F7-101%TG=FF%CD=S)
 
-# Cisco Aironet 1200 IOS Version  12.3(2)JA4
-Fingerprint Cisco Aironet 1200 WAP (IOS 12.3)
-Class Cisco | IOS | 12.X | WAP
-CPE cpe:/h:cisco:aironet_ap1200
-CPE cpe:/o:cisco:ios:12.3
-SEQ(SP=F9-109%GCD=1-6%ISR=106-110%TI=Z%II=RI%TS=U)
-OPS(O1=M218%O2=M218%O3=M218%O4=M218%O5=M218%O6=M109)
-WIN(W1=1020%W2=1020%W3=1020%W4=1020%W5=1020%W6=1020)
-ECN(R=Y%DF=N%T=FA-104%TG=FF%W=1020%O=M218%CC=N%Q=)
-T1(R=Y%DF=N%T=FA-104%TG=FF%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
-T3(R=N)
-T4(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=A%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=S%T=FA-104%TG=FF%CD=S)
-
 # Cisco Aironet 1200 Series (AIR-LAP-1232AG-E-K9)
 Fingerprint Cisco Aironet 1200 WAP (IOS 12.3)
 Class Cisco | IOS | 12.X | WAP
@@ -15351,13 +15214,15 @@ IE(DFI=S%T=FA-104%TG=FF%CD=S)
 # cisco AIR-AP1232AG-E-K9 Cisco IOS Software, C1200 Software (C1200-K9W7-M), Version 12.3(7)JA2, RELEASE SOFTWARE (fc1)
 # Cisco IOS Software, C1240 Software (C1240-K9W7-M), Version 12.3(8)JA2, RELEASE SOFTWARE (fc1)
 # Cisco 5350 Media Gateway
-Fingerprint Cisco AS5350 VoIP gateway, or Aironet 1230 or 1240-series WAP (IOS 12.3)
+# Cisco Aironet 1200 IOS Version  12.3(2)JA4
+Fingerprint Cisco AS5350 VoIP gateway, or Aironet 1200, 1230, or 1240-series WAP (IOS 12.3)
 Class Cisco | IOS | 12.X | WAP
 CPE cpe:/h:cisco:as5350
 CPE cpe:/h:cisco:aironet_ap1230
 CPE cpe:/h:cisco:aironet_ap1240
+CPE cpe:/h:cisco:aironet_ap1200
 CPE cpe:/o:cisco:ios:12.3
-SEQ(SP=CF-10D%GCD=1-6%ISR=F5-10D%TI=Z%CI=I%II=RI%TS=U)
+SEQ(SP=CF-10D%GCD=1-6%ISR=F5-110%TI=Z%CI=I%II=RI%TS=U)
 OPS(O1=M218%O2=M218%O3=M218%O4=M218%O5=M218%O6=M109)
 WIN(W1=1020%W2=1020%W3=1020%W4=1020%W5=1020%W6=1020)
 ECN(R=Y%DF=N%T=FA-104%TG=FF%W=1020%O=M218%CC=N%Q=)
@@ -22153,10 +22018,11 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 # FreeBSD 5.4-RELEASE FreeBSD 5.4-RELEASE #0: Wed Aug 31 15:36:36 MSD 2005 i386
 # Kylin v2.1, derived from FreeBSD 5.3
 # FreeBSD 5.3-RELEASE FreeBSD 5.3-RELEASE #1: Thu Dec 23 00:27:47 CST 2004     root@mydomain.com:/usr/obj/usr/src/sys/NS  i386
-Fingerprint FreeBSD 5.3 or 5.5 (x86)
+# FreeBSD 5.4-RELEASE-p7 FreeBSD 5.4-RELEASE-p7 #0: Sun Oct  2 08:13:15 EDT 2005 amd64
+Fingerprint FreeBSD 5.3 - 5.5
 Class FreeBSD | FreeBSD | 5.X | general purpose
 CPE cpe:/o:freebsd:freebsd:5 auto
-SEQ(SP=D6-10C%GCD=1-6%ISR=105-111%TI=I%II=I%SS=S%TS=7)
+SEQ(SP=D6-10C%GCD=1-6%ISR=105-111%TI=I%CI=I%II=I%SS=S%TS=7|A)
 OPS(O1=M5B4NW1NNT11NNS%O2=M5B4NW1NNT11NNS%O3=M5B4NW1NNT11%O4=M5B4NW1NNT11NNS%O5=M5B4NW1NNT11NNS%O6=M5B4NNT11NNS)
 WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
 ECN(R=Y%DF=Y%T=3B-45%TG=40%W=FFFF%O=M5B4NW1NNS%CC=N%Q=)
@@ -22224,24 +22090,6 @@ T7(R=N)
 U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
-# FreeBSD 5.4-RELEASE-p7 FreeBSD 5.4-RELEASE-p7 #0: Sun Oct  2 08:13:15 EDT 2005 amd64
-Fingerprint FreeBSD 5.4-RELEASE
-Class FreeBSD | FreeBSD | 5.X | general purpose
-CPE cpe:/o:freebsd:freebsd:5.4
-SEQ(SP=EB-109%GCD=1-6%ISR=105-10F%TI=I%CI=I%II=I%SS=S%TS=A)
-OPS(O1=M5B4NW1NNT11NNS%O2=M5B4NW1NNT11NNS%O3=M5B4NW1NNT11%O4=M5B4NW1NNT11NNS%O5=M5B4NW1NNT11NNS%O6=M5B4NNT11NNS)
-WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=FFFF%O=M5B4NW1NNS%CC=N%Q=)
-T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=Y%T=3B-45%TG=40%W=FFFF%S=O%A=S+%F=AS%O=M5B4NW1NNT11NNS%RD=0%Q=)
-T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
-IE(DFI=S%T=3B-45%TG=40%CD=S)
-
 # FreeBSD 5.4-STABLE FreeBSD 5.4-STABLE #1: Sun Aug 20 15:55:44 CEST 2006 i386
 Fingerprint FreeBSD 5.4-STABLE
 Class FreeBSD | FreeBSD | 5.X | general purpose
@@ -22834,24 +22682,6 @@ T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
-# FreeBSD 6.2-RELEASE-p11 FreeBSD 6.2-RELEASE-p11 #0: Sun Feb 17 09:52:57 CET 2008     root@pcbsd62:/usr/obj/freenas/usr/src/sys/FREENAS-i386  i386
-Fingerprint FreeNAS (FreeBSD 6.2-RELEASE)
-Class FreeBSD | FreeBSD | 6.X | storage-misc
-CPE cpe:/o:freebsd:freebsd:6.2
-SEQ(SP=EA-10C%GCD=1-6%ISR=103-10F%TI=I%II=I%SS=S%TS=9)
-OPS(O1=M5B4NW1NNT11SLL%O2=M5B4NW1NNT11SLL%O3=M5B4NW1NNT11%O4=M5B4NW1NNT11SLL%O5=M5B4NW1NNT11SLL%O6=M5B4NNT11SLL)
-WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
-ECN(R=Y%DF=N%T=3B-45%TG=40%W=FFFF%O=M5B4NW1SLL%CC=N%Q=)
-T1(R=Y%DF=N%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=N%T=3B-45%TG=40%W=FFFF%S=O%A=S+%F=AS%O=M5B4NW1NNT11SLL%RD=0%Q=)
-T4(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
-IE(DFI=S%T=3B-45%TG=40%CD=S)
-
 # FreeBSD 6.4-RELEASE-p3 (revision 199506)
 Fingerprint FreeNAS (FreeBSD 6.4-RELEASE-p3)
 Class FreeBSD | FreeBSD | 6.X | storage-misc
@@ -22870,24 +22700,6 @@ T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
-# FreeBSD 6.4-RELEASE-p3 FreeBSD 6.4-RELEASE-p3 #0: Fri Jan 16 22:41:42 UTC 2009 i386, FreeNAS
-Fingerprint FreeNAS (FreeBSD 6.4-RELEASE-p3)
-Class FreeBSD | FreeBSD | 6.X | storage-misc
-CPE cpe:/o:freebsd:freebsd:6 auto
-SEQ(SP=FE-108%GCD=1-6%ISR=102-10C%TI=I%CI=I%II=I%SS=S%TS=7)
-OPS(O1=M5B4NW1NNT11SLL%O2=M5B4NW1NNT11SLL%O3=M5B4NW1NNT11%O4=M5B4NW1NNT11SLL%O5=M5B4NW1NNT11SLL%O6=M5B4NNT11SLL)
-WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
-ECN(R=Y%DF=N%T=3B-45%TG=40%W=FFFF%O=M5B4NW1SLL%CC=N%Q=)
-T1(R=Y%DF=N%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=N%T=3B-45%TG=40%W=FFFF%S=O%A=S+%F=AS%O=M5B4NW1NNT11SLL%RD=0%Q=)
-T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=S%T=3B-45%TG=40%CD=S)
-
 # FreeNAS 0.671, OS Version: FreeBSD 6.1-STABLE (revison 199506), Platform: generic-pc on Intel Pentium III
 Fingerprint FreeNAS 0.671 (FreeBSD 6.1-STABLE)
 Class FreeBSD | FreeBSD | 6.X | storage-misc
@@ -22954,10 +22766,11 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 
 # FreeBSD 6.2-RELEASE-p8 (revison 199506), FreeNas server 0.686b1
 # FreeBSD 6.2-RELEASE-p8 FreeBSD 6.2-RELEASE-p8 #0: Mon Oct 29 20:21:28 CET 2007 i386, FreeNAS Network Attached Storage
+# FreeBSD 6.2-RELEASE-p11 FreeBSD 6.2-RELEASE-p11 #0: Sun Feb 17 09:52:57 CET 2008     root@pcbsd62:/usr/obj/freenas/usr/src/sys/FREENAS-i386  i386
 Fingerprint FreeNAS 0.686b (FreeBSD 6.2-RELEASE)
 Class FreeBSD | FreeBSD | 6.X | storage-misc
 CPE cpe:/o:freebsd:freebsd:6.2
-SEQ(SP=FA-106%GCD=1-6%ISR=E9-111%TI=I%II=I%SS=S%TS=7)
+SEQ(SP=EA-10C%GCD=1-6%ISR=E9-111%TI=I%II=I%SS=S%TS=7|9)
 OPS(O1=M5B4NW1NNT11SLL%O2=M5B4NW1NNT11SLL%O3=M5B4NW1NNT11%O4=M5B4NW1NNT11SLL%O5=M5B4NW1NNT11SLL%O6=M5B4NNT11SLL)
 WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
 ECN(R=Y%DF=N%T=3B-45%TG=40%W=FFFF%O=M5B4NW1SLL%CC=N%Q=)
@@ -23009,30 +22822,13 @@ T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
-# FreeBSD 6.4-RELEASE-p5 FreeBSD 6.4-RELEASE-p5 #0: Wed Jun 10 23:45:29 UTC 2009 i386, FreeNAS 0.69.2 Muad'Dib (revision 4700)
-Fingerprint FreeNAS 0.69.2 (FreeBSD 6.4-RELEASE)
-Class FreeBSD | FreeBSD | 6.X | storage-misc
-CPE cpe:/o:freebsd:freebsd:6 auto
-SEQ(SP=F9-103%GCD=1-6%ISR=105-113%CI=I%II=I%TS=7)
-OPS(O1=M5B4NW1NNT11SLL%O2=M5B4NW1NNT11SLL%O3=M5B4NW1NNT11%O4=M5B4NW1NNT11SLL%O5=M5B4NW1NNT11SLL%O6=M5B4NNT11SLL)
-WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
-ECN(R=Y%DF=N%T=3B-45%TG=40%W=FFFF%O=M5B4NW1SLL%CC=N%Q=)
-T1(R=Y%DF=N%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=N%T=3B-45%TG=40%W=FFFF%S=O%A=S+%F=AS%O=M5B4NW1NNT11SLL%RD=0%Q=)
-T4(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=S%T=3B-45%TG=40%CD=S)
-
 # FreeBSD 6.4-RELEASE FreeBSD 6.4-RELEASE #0: Sun Nov 30 10:41:35 UTC 2008 i386, FreeNAS 0.69RC2 Rev. 4084
 # FreeBSD 6.4-RELEASE-p5 FreeBSD 6.4-RELEASE-p5 #0: Wed Jun 10 23:45:29 UTC 2009 i386
+# FreeBSD 6.4-RELEASE-p5 FreeBSD 6.4-RELEASE-p5 #0: Wed Jun 10 23:45:29 UTC 2009 i386, FreeNAS 0.69.2 Muad'Dib (revision 4700)
 Fingerprint FreeNAS 0.69RC2 (FreeBSD 6.4-RELEASE)
 Class FreeBSD | FreeBSD | 6.X | storage-misc
-CPE cpe:/o:freebsd:freebsd:6 auto
-SEQ(SP=FB-10B%GCD=1-6%ISR=FF-10F%TI=I%II=I%SS=S%TS=A)
+CPE cpe:/o:freebsd:freebsd:6.4
+SEQ(SP=F9-10B%GCD=1-6%ISR=FF-113%TI=I%CI=I%II=I%SS=S%TS=7|A)
 OPS(O1=M5B4NW1NNT11SLL%O2=M5B4NW1NNT11SLL%O3=M5B4NW1NNT11%O4=M5B4NW1NNT11SLL%O5=M5B4NW1NNT11SLL%O6=M5B4NNT11SLL)
 WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
 ECN(R=Y%DF=N%T=3B-45%TG=40%W=FFFF%O=M5B4NW1SLL%CC=N%Q=)
@@ -23048,10 +22844,11 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 
 # FreeBSD 6.4-RELEASE-p3 FreeBSD 6.4-RELEASE-p3 #0: Fri Jan 16 22:41:42 UTC 2009 i386, FreeNAS 0.69 Kwisatz Haderach (revision 4276)
 # FreeBSD 6.4-RELEASE-p3 FreeBSD 6.4-RELEASE-p3 #0: Sat Apr 18 22:20:57 UTC 2009, amd64FreeNAS 0.69.1 (build 4554-AMD64)
-Fingerprint FreeNAS 0.69RC2 (FreeBSD 6.4-RELEASE-p3)
+# FreeBSD 6.4-RELEASE-p3 FreeBSD 6.4-RELEASE-p3 #0: Fri Jan 16 22:41:42 UTC 2009 i386, FreeNAS
+Fingerprint FreeNAS 0.69 (FreeBSD 6.4-RELEASE-p3)
 Class FreeBSD | FreeBSD | 6.X | storage-misc
-CPE cpe:/o:freebsd:freebsd:6 auto
-SEQ(SP=FC-10A%GCD=1-6%ISR=F6-112%TI=I%CI=I%II=I%SS=S%TS=A)
+CPE cpe:/o:freebsd:freebsd:6.4
+SEQ(SP=FC-10A%GCD=1-6%ISR=F6-112%TI=I%CI=I%II=I%SS=S%TS=7|A)
 OPS(O1=M5B4NW1NNT11SLL%O2=M5B4NW1NNT11SLL%O3=M5B4NW1NNT11%O4=M5B4NW1NNT11SLL%O5=M5B4NW1NNT11SLL%O6=M5B4NNT11SLL)
 WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
 ECN(R=Y%DF=N%T=3B-45%TG=40%W=FFFF%O=M5B4NW1SLL%CC=N%Q=)
@@ -23258,10 +23055,11 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 
 # FreeBSD 7.0-RELEASE FreeBSD 7.0-RELEASE #0: Mon Feb 25 09:35:41 UTC 2008 sparc64, PF firewall running.
 # FreeBSD 7.0-RELEASE FreeBSD 7.0-RELEASE #0: Sun Feb 24 19:59:52 UTC 2008 i386
+# FreeBSD 7.0-RELEASE FreeBSD 7.0-RELEASE #1
 Fingerprint FreeBSD 7.0-RELEASE
 Class FreeBSD | FreeBSD | 7.X | general purpose
 CPE cpe:/o:freebsd:freebsd:7.0
-SEQ(SP=FF-109%GCD=1-6%ISR=106-110%TI=I%II=I%SS=S%TS=21|22)
+SEQ(SP=FD-109%GCD=1-6%ISR=101-110%TI=I%II=I%SS=S%TS=21|22)
 OPS(O1=M5B4NW3ST11%O2=M578NW3ST11%O3=M280NW3NNT11%O4=M5B4NW3ST11%O5=M218NW3ST11%O6=M109ST11)
 WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
 ECN(R=Y%DF=Y%T=3B-45%TG=40%W=FFFF%O=M5B4NW3SLN%CC=N%Q=)
@@ -23329,24 +23127,6 @@ T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
-# FreeBSD 7.0-RELEASE FreeBSD 7.0-RELEASE #1
-Fingerprint FreeBSD 7.0-RELEASE
-Class FreeBSD | FreeBSD | 7.X | general purpose
-CPE cpe:/o:freebsd:freebsd:7.0
-SEQ(SP=FD-107%GCD=1-6%ISR=101-10D%TI=I%II=I%SS=S%TS=21)
-OPS(O1=M5B4NW3ST11%O2=M578NW3ST11%O3=M280NW3NNT11%O4=M5B4NW3ST11%O5=M218NW3ST11%O6=M109ST11)
-WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=FFFF%O=M5B4NW3SLN%CC=N%Q=)
-T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=N)
-T4(R=N)
-T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=N)
-T7(R=N)
-U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=S%T=3B-45%TG=40%CD=S)
-
 # FreeBSD 7.0-RELEASE FreeBSD 7.0-RELEASE #0: Wed May 21 10:13:51 UTC 2008 amd64
 Fingerprint FreeBSD 7.0-RELEASE
 Class FreeBSD | FreeBSD | 7.X | general purpose
@@ -26634,9 +26414,14 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 # HP LaserJet 4345
 # HP LaserJet 9040
 # "HP Color LaserJet 3800 Printer" (model number Q5983A)
+# HP LASERJET 4345MFP, Firmware 20070628 09.081.6
 Fingerprint HP LaserJet 3800, 4250, 4345, 9040 printer
 Class HP | embedded || printer
-SEQ(SP=18-1C%GCD=FA00|1F400|2EE00|3E800|4E200%ISR=9D-A3%TI=I%CI=I%II=I%SS=S%TS=1)
+CPE cpe:/h:hp:laserjet_3800
+CPE cpe:/h:hp:laserjet_4250
+CPE cpe:/h:hp:laserjet_4345
+CPE cpe:/h:hp:laserjet_9040
+SEQ(SP=16-20%GCD=FA00|1F400|2EE00|3E800|4E200%ISR=9B-A5%TI=I%CI=I%II=I%SS=S%TS=1|2)
 OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
 WIN(W1=5B4%W2=5B4%W3=5B4%W4=5B4%W5=5B4%W6=5B4)
 ECN(R=Y%DF=N%T=3B-45%TG=40%W=5B4%O=M5B4NW0%CC=N%Q=)
@@ -26904,24 +26689,6 @@ T7(R=N)
 U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=4210%RIPCK=Z%RUCK=0)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
-# HP LASERJET 4345MFP, Firmware 20070628 09.081.6
-Fingerprint HP LaserJet 4345 printer
-Class HP | embedded || printer
-CPE cpe:/h:hp:laserjet_4345 auto
-SEQ(SP=16-20%GCD=FA00|1F400|2EE00|3E800|4E200%ISR=9B-A5%TI=I%II=I%SS=S%TS=2)
-OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
-WIN(W1=5B4%W2=5B4%W3=5B4%W4=5B4%W5=5B4%W6=5B4)
-ECN(R=Y%DF=N%T=3B-45%TG=40%W=5B4%O=M5B4NW0%CC=N%Q=)
-T1(R=Y%DF=N%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=N%T=3B-45%TG=40%W=5B4%S=O%A=O%F=A%O=NNT11%RD=0%Q=)
-T4(R=Y%DF=N%T=3B-45%TG=40%W=5B4%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=4210%RIPCK=Z%RUCK=0%RUD=G)
-IE(DFI=S%T=3B-45%TG=40%CD=S)
-
 # HP 4350 Laserjet
 Fingerprint HP LaserJet 4350 printer
 Class HP | embedded || printer
@@ -27323,25 +27090,6 @@ T7(R=N)
 U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(R=N)
 
-# HP LaserJet M2727nf MFP
-# HP LaserJet M27227
-Fingerprint HP LaserJet M2727 printer
-Class HP | embedded || printer
-CPE cpe:/h:hp:laserjet_m2727 auto
-SEQ(SP=C5-D1%GCD=1-6%ISR=BD-C7%TI=I%II=I%SS=S%TS=A)
-OPS(O1=M5B4NW0NNSNNT11%O2=M578NW0NNSNNT11%O3=M280NW0NNT11%O4=M5B4NW0NNSNNT11%O5=M218NW0NNSNNT11%O6=M109NNSNNT11)
-WIN(W1=21F0%W2=2088%W3=2258%W4=21F0%W5=20C0%W6=209D)
-ECN(R=Y%DF=N%T=3B-45%TG=40%W=2238%O=M5B4NW0NNS%CC=N%Q=)
-T1(R=Y%DF=N%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=N)
-T4(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=FA-104%TG=FF%CD=S)
-
 # HP LaserJet M2727nf MFP
 # HP Laserjet p1505n
 Fingerprint HP LaserJet M2727nf or P1505n printer
@@ -27397,24 +27145,6 @@ T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=FA-104%TG=FF%CD=S)
 
-# HP LaserJet P1505n
-Fingerprint HP LaserJet P1505n printer
-Class HP | embedded || printer
-CPE cpe:/h:hp:laserjet_p1505n auto
-SEQ(SP=AB-B5%GCD=1-6%ISR=AC-B6%TI=I%TS=7)
-OPS(O1=M5B4NW0NNSNNT11%O2=M578NW0NNSNNT11%O3=M280NW0NNT11%O4=M5B4NW0NNSNNT11%O5=M218NW0NNSNNT11%O6=M109NNSNNT11)
-WIN(W1=21F0%W2=2088%W3=2258%W4=21F0%W5=20C0%W6=209D)
-ECN(R=Y%DF=N%T=3B-45%TG=40%W=2238%O=M5B4NW0NNS%CC=N%Q=)
-T1(R=Y%DF=N%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=N)
-T4(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=FA-104%TG=FF%CD=S)
-
 # HP LaserJet Professional P1606dn
 Fingerprint HP LaserJet P1606dn printer
 Class HP | embedded || printer
@@ -28503,9 +28233,13 @@ IE(DFI=N%T=FA-104%TG=FF%CD=S)
 
 # ProCurve J9091A Switch 8212zl, Software revision K.14.41
 # ProCurve J9311A Switch 3500yl-48G-PoE+, Software revision K.14.52
-Fingerprint HP ProCurve 3500yl or 8212zl switch
+# HP Procurve 5412zl Routing Switch FW: K.15.07.0008
+Fingerprint HP ProCurve 3500yl, 5412zl, or 8212zl switch
 Class HP | embedded || switch
-SEQ(SP=A5-AF%GCD=1-6%ISR=A6-B0%TI=I%CI=I%II=I%SS=S%TS=A)
+CPE cpe:/h:hp:procurve_switch_3500yl
+CPE cpe:/h:hp:procurve_switch_5412zl
+CPE cpe:/h:hp:procurve_switch_8212zl
+SEQ(SP=75-E5%GCD=1-6%ISR=92-BA%TI=I|RD%CI=I%II=I%SS=S%TS=A|C)
 OPS(O1=M5B4NW1NNSNNT11%O2=M578NW1NNSNNT11%O3=M280NW1NNT11%O4=M23C6NW1NNSNNT11%O5=M218NW1NNSNNT11%O6=M109NNSNNT11)
 WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
 ECN(R=Y%DF=Y%T=3B-45%TG=40%W=FFFF%O=M5B4NW1NNS%CC=N%Q=)
@@ -28614,24 +28348,6 @@ T7(R=N)
 U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=FA-104%TG=FF%CD=S)
 
-# HP Procurve 5412zl Routing Switch FW: K.15.07.0008
-Fingerprint HP ProCurve 5412zl switch
-Class HP | embedded || switch
-CPE cpe:/h:hp:procurve_switch_5412zl auto
-SEQ(SP=75-E5%GCD=1-6%ISR=92-BA%TI=I|RD%CI=I%II=I%SS=S%TS=A|C)
-OPS(O1=M5B4NW1NNSNNT11%O2=M578NW1NNSNNT11%O3=M280NW1NNT11%O4=M23C6NW1NNSNNT11%O5=M218NW1NNSNNT11%O6=M109NNSNNT11)
-WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=FFFF%O=M5B4NW1NNS%CC=N%Q=)
-T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=N)
-T4(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=FA-104%TG=FF%CD=S)
-
 # J4138A HP ProCurve Routing Switch 9308M, Software Version 07.6.04cT53
 # HP ProCurve Routing Switch 9304m
 Fingerprint HP ProCurve 9304m or 9308m switch
@@ -29869,6 +29585,9 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 # HP Color LaserJet CP2025dn (VxWorks?)
 # HP LaserJet P2035n.
 # Vocality BASICS 4-Wire running VOS 8.0
+# HP LaserJet M2727nf MFP
+# HP LaserJet M27227
+# HP LaserJet P1505n
 Fingerprint VxWorks: HP printer or Vocality BASICS Four Wire VoIP gateway
 Class HP | VxWorks || printer
 CPE cpe:/o:hp:vxworks auto
@@ -30502,10 +30221,11 @@ U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=15C%RID=G%RIPCK=I%RUCK=0%RUD=G)
 IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
 # AIX 2 5 0050AA7A4C00
+# IBM AIX 5.2.0.0 Maintenance Level 2 on F50
 Fingerprint IBM AIX 5.2
 Class IBM | AIX | 5.X | general purpose
 CPE cpe:/o:ibm:aix:5 auto
-SEQ(SP=101-10B%GCD=1-6%ISR=104-10E%TI=I%II=I%SS=O|S%TS=U)
+SEQ(SP=F6-10B%GCD=1-6%ISR=100-10E%TI=I%II=I%SS=O|S%TS=U)
 OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
 WIN(W1=4470%W2=41A0%W3=4100%W4=4000%W5=40E8%W6=402E)
 ECN(R=Y%DF=Y%T=3B-3D%TG=40%W=4470%O=M5B4%CC=N%Q=)
@@ -30665,24 +30385,6 @@ T7(R=Y%DF=N%T=3B-3D%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=15C%RID=G%RIPCK=I%RUCK=0%RUD=G)
 IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
-# IBM AIX 5.2.0.0 Maintenance Level 2 on F50
-Fingerprint IBM AIX 5.2.0.0 Maintenance Level 2
-Class IBM | AIX | 5.X | general purpose
-CPE cpe:/o:ibm:aix:5 auto
-SEQ(SP=F6-106%GCD=1-6%ISR=100-10A%II=I%TS=U)
-OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
-WIN(W1=4470%W2=41A0%W3=4100%W4=4000%W5=40E8%W6=402E)
-ECN(R=Y%DF=Y%T=3B-3D%TG=40%W=4470%O=M5B4%CC=N%Q=)
-T1(R=Y%DF=Y%T=3B-3D%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=Y%T=3B-3D%TG=40%W=402E%S=O%A=S+%F=AS%O=M5B4%RD=0%Q=)
-T4(R=Y%DF=N%T=3B-3D%TG=40%W=4000%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=3B-3D%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=3B-3D%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=3B-3D%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=15C%RID=G%RIPCK=I%RUCK=0%RUD=G)
-IE(DFI=S%T=FA-104%TG=FF%CD=S)
-
 # IBM AIX 5.3 TL-05 SP3
 # IBM AIX 5.3 (Maint. Pack 5) on RS/6000
 # IBM Power5 P570 running AIX 5.3 64bit [uname -a: AIX 3 5 00CF679E4C00]
@@ -30933,6 +30635,8 @@ IE(DFI=S%T=FA-104%TG=FF%CD=S)
 # AIX-RS/6000, version: 5.4.3.0
 # AIX 3 5 00CC377F4C00, (Technology Level 7 , Service Pack 2)
 # AIX 1 6 00075EF1D600
+# AIX 5.3 ML 4
+# IBM PowerPC CHRP Computer
 Fingerprint IBM AIX 5.3 - 6.1
 Class IBM | AIX | 5.X | general purpose
 CPE cpe:/o:ibm:aix:5 auto
@@ -31022,25 +30726,6 @@ T7(R=Y%DF=N%T=3B-3D%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
 IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
-# AIX 5.3 ML 4
-# IBM PowerPC CHRP Computer
-Fingerprint IBM AIX 5.3 ML 4
-Class IBM | AIX | 5.X | general purpose
-CPE cpe:/o:ibm:aix:5 auto
-SEQ(SP=E4-EE%GCD=1-6%ISR=100-10A%TI=I%II=I%SS=S%TS=U)
-OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
-WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
-ECN(R=Y%DF=Y%T=3B-3D%TG=40%W=FFFF%O=M5B4%CC=N%Q=)
-T1(R=Y%DF=Y%T=3B-3D%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=Y%T=3B-3D%TG=40%W=FFFF%S=O%A=S+%F=AS%O=M5B4%RD=0%Q=)
-T4(R=Y%DF=N%T=3B-3D%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=3B-3D%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=3B-3D%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=3B-3D%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=15C%RID=G%RIPCK=I%RUCK=0%RUD=G)
-IE(DFI=S%T=FA-104%TG=FF%CD=S)
-
 # 5300-04-CSP, AIX 5.3 with SP4, running on a 7026-B80 (Power4)
 Fingerprint IBM AIX 5.3 SP4
 Class IBM | AIX | 5.X | general purpose
@@ -33361,10 +33046,14 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 
 # Juniper M320 Version 7.4R3.4
 # Juniper M10 Version 7.4R3.4
-Fingerprint Juniper Networks M10 or M320 router (JUNOS 7.4R3.4)
+# Juniper j4350, JUNOS Software Release [8.3R1.5] (Export edition)
+# Juniper JUNOS M Series - 8.3R2.8
+Fingerprint Juniper Networks JUNOS 7.4R3.4 or 8.3
 Class Juniper | JUNOS | 7.X | router
 CPE cpe:/o:juniper:junos:7 auto
-SEQ(SP=FE-108%GCD=1-6%ISR=104-110%TI=I%II=I%SS=S%TS=7)
+Class Juniper | JUNOS | 8.X | router
+CPE cpe:/o:juniper:junos:8 auto
+SEQ(SP=F8-10A%GCD=1-6%ISR=FC-110%TI=I%II=I|RI%SS=S%TS=7)
 OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
 WIN(W1=E000%W2=E000%W3=E000%W4=E000%W5=E000%W6=E000)
 ECN(R=Y%DF=Y%T=3B-45%TG=40%W=E000%O=M5B4NW0%CC=N%Q=)
@@ -33426,24 +33115,6 @@ T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
 U1(DF=Y%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
-# Juniper j4350, JUNOS Software Release [8.3R1.5] (Export edition)
-Fingerprint Juniper Networks J4350 router (JUNOS 8.3R1.5)
-Class Juniper | JUNOS | 8.X | router
-CPE cpe:/o:juniper:junos:8 auto
-SEQ(SP=F8-10A%GCD=1-6%ISR=106-110%TI=I%II=RI%SS=S%TS=7)
-OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
-WIN(W1=E000%W2=E000%W3=E000%W4=E000%W5=E000%W6=E000)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=E000%O=M5B4NW0%CC=N%Q=)
-T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=Y%T=3B-45%TG=40%W=E000%S=O%A=S+%F=AS%O=M5B4NW0NNT11%RD=0%Q=)
-T4(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-U1(DF=Y%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=S%T=3B-45%TG=40%CD=S)
-
 # --- JUNOS 8.5B2.5 built 2007-09-07 01:02:08 UTC
 Fingerprint Juniper Networks JUNOS 8.5B2.5
 Class Juniper | JUNOS | 8.X | router
@@ -33462,24 +33133,6 @@ T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
 U1(DF=Y%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
-# Juniper JUNOS M Series - 8.3R2.8
-Fingerprint Juniper Networks M series router (JUNOS 8.3R2.8)
-Class Juniper | JUNOS | 8.X | router
-CPE cpe:/o:juniper:junos:8 auto
-SEQ(SP=F8-108%GCD=1-6%ISR=FC-110%TI=I%II=I%SS=S%TS=7)
-OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
-WIN(W1=E000%W2=E000%W3=E000%W4=E000%W5=E000%W6=E000)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=E000%O=M5B4NW0%CC=N%Q=)
-T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=Y%T=3B-45%TG=40%W=E000%S=O%A=S+%F=AS%O=M5B4NW0NNT11%RD=0%Q=)
-T4(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-U1(DF=Y%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=S%T=3B-45%TG=40%CD=S)
-
 # JUNOS 9.2R1.10 built 2008-08-07 06:14:51 UTC
 Fingerprint Juniper JUNOS 9.2R1.10
 Class Juniper | JUNOS | 9.X | router
@@ -35010,9 +34663,14 @@ IE(DFI=N%T=F8-102%TG=FF%CD=S)
 # Lexmark Laser-Printer Optra T610 with Printserver MarkNet N2001e, Firmwareversion 3.20.30
 # Lexmark Optra T622 Printer
 # Lexmark Optra M410
-Fingerprint Lexmark Optra M410, T610, or T622 printer
+# Lexmark Optra T612 Printer
+Fingerprint Lexmark Optra M410, T610, T612, or T622 printer
 Class Lexmark | embedded || printer
-SEQ(SP=8B-A1%GCD=1-6%ISR=90-A6%TI=I%II=I%SS=S%TS=1|2)
+CPE cpe:/h:lexmark:optra_m410
+CPE cpe:/h:lexmark:optra_t610
+CPE cpe:/h:lexmark:optra_t612
+CPE cpe:/h:lexmark:optra_t622
+SEQ(SP=8B-A4%GCD=1-6%ISR=90-A7%TI=I%II=I%SS=S%TS=1|2)
 OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
 WIN(W1=B50%W2=AD8%W3=9D0%W4=B50%W5=830%W6=8E5)
 ECN(R=Y%DF=Y%T=FE%TG=FF%W=B68%O=M5B4NW0%CC=N%Q=)
@@ -35062,24 +34720,6 @@ T7(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=I%RUCK=G%RUD=G)
 IE(DFI=N%T=FA-104%TG=FF%CD=Z)
 
-# Lexmark Optra T612 Printer
-Fingerprint Lexmark Optra T612 printer
-Class Lexmark | embedded || printer
-CPE cpe:/h:lexmark:optra_t612 auto
-SEQ(SP=8D-A4%GCD=1-6%ISR=93-A7%TI=I%II=I%SS=S%TS=1)
-OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
-WIN(W1=B50%W2=AD8%W3=9D0%W4=B50%W5=830%W6=8E5)
-ECN(R=Y%DF=Y%T=FE%TG=FF%W=B68%O=M5B4NW0%CC=N%Q=)
-T1(R=Y%DF=Y%T=FE%TG=FF%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=Y%T=FE%TG=FF%W=8E5%S=O%A=S+%F=AS%O=M5B4NW0NNT11%RD=0%Q=)
-T4(R=Y%DF=N%T=FE%TG=FF%W=800%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=FE%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=FE%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=FE%TG=FF%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=S%T=FA-104%TG=FF%CD=S)
-
 # Lexmark multifunction printer
 Fingerprint Lexmark printer
 Class Lexmark | embedded || printer
@@ -38894,25 +38534,6 @@ T7(R=N)
 U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
-# 2.6.15-28-server #1 SMP Wed Jul 18 23:11:55 UTC 2007 i686 GNU/Linux / Ubuntu 6.06
-# Linux 2.6.16.29-xen #1 SMP Sun Sep 30 04:00:13 UTC 2007 x86_64 GNU/Linux
-Fingerprint Linux 2.6.15 - 2.6.16 (Ubuntu)
-Class Linux | Linux | 2.6.X | general purpose
-CPE cpe:/o:linux:linux_kernel:2.6 auto
-SEQ(SP=C1-CB%GCD=1-6%ISR=C6-D0%TI=Z%II=I%TS=7)
-OPS(O1=M400CST11NW2%O2=M400CST11NW2%O3=M400CNNT11NW2%O4=M400CST11NW2%O5=M400CST11NW2%O6=M400CST11)
-WIN(W1=7FFF%W2=7FFF%W3=7FFF%W4=7FFF%W5=7FFF%W6=7FFF)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=7FFF%O=M400CNNSNW2%CC=N%Q=)
-T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=Y%T=3B-45%TG=40%W=7FFF%S=O%A=S+%F=AS%O=M400CST11NW2%RD=0%Q=)
-T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=3B-45%TG=40%CD=S)
-
 # Speedport W 501 V with firmware 28.04.38
 # Gennet ADSL Router
 # Linux neuros 2.6.15 #1 PREEMPT Mon Oct 8 18:23:13 CST 2007 armv5tejl unknown (neuros OSD running busybox)
@@ -39017,34 +38638,6 @@ T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
-# Linux 2.6.19-gentoo-r5 #1 SMP Mon Mar 26 08:55:15 EDT 2007 i686 Intel(R) Pentium(R) 4 CPU 3.00GHz GenuineIntel GNU/Linux
-# Linux 2.6.19-gentoo-r5 #2 Fri Apr 6 11:18:32 CEST 2007 x86_64 AMD Athlon(tm) 64 Processor 3500+ AuthenticAMD GNU/Linux
-# Linux 2.6.20-gentoo-r8 #1 Sun May 13 14:47:15 CEST 2007 x86_64 AMD Athlon(tm) 64 Processor 3500+ AuthenticAMD GNU/Linux
-# Linux 2.6.24-gentoo-r3 #6 Mon Mar 17 22:02:40 CET 2008 x86_64 AMD Athlon(tm) 64 Processor 3500+ AuthenticAMD GNU/Linux
-# Linux 2.6.24-19-server #1 SMP Wed Jun 18 14:44:47 UTC 2008 x86_64 GNU/Linux
-# Linux 2.6.15-gentoo-r1-
-# SMC Comcast Business Gateway, Model:SMCD3G
-# Linux 2.6.28-15-server #52-Ubuntu SMP Wed Sep 9 11:34:09 UTC 2009 x86_64 GNU/Linux
-# 2.6.30-gentoo-r4
-# Linux Nokia-N900 2.6.28.10power37 #1 PREEMPT Wed May 26 00:24:03 EEST 2010 armv7l unknown
-# This is a Lantronix "Spider" single port KVM. Product Name Lantronix SLS. Firmware Version 03.00.01.
-Fingerprint Linux 2.6.15 - 2.6.30
-Class Linux | Linux | 2.6.X | general purpose
-CPE cpe:/o:linux:linux_kernel:2.6 auto
-SEQ(SP=B4-D0%GCD=1-6%ISR=C2-D6%TI=Z%II=I%TS=7)
-OPS(O1=M5B4ST11NW1|M5B4ST11NW2|M5B4ST11NW3|M5B4ST11NW4|M5B4ST11NW5|M5B4ST11NW6|M5B4ST11NW7%O2=M5B4ST11NW1|M5B4ST11NW2|M5B4ST11NW3|M5B4ST11NW4|M5B4ST11NW5|M5B4ST11NW6|M5B4ST11NW7%O3=M5B4NNT11NW1|M5B4NNT11NW2|M5B4NNT11NW3|M5B4NNT11NW4|M5B4NNT11NW5|M5B4NNT11NW6|M5B4NNT11NW7%O4=M5B4ST11NW1|M5B4ST11NW2|M5B4ST11NW3|M5B4ST11NW4|M5B4ST11NW5|M5B4ST11NW6|M5B4ST11NW7%O5=M5B4ST11NW1|M5B4ST11NW2|M5B4ST11NW3|M5B4ST11NW4|M5B4ST11NW5|M5B4ST11NW6|M5B4ST11NW7%O6=M5B4ST11)
-WIN(W1=16A0%W2=16A0%W3=16A0%W4=16A0%W5=16A0%W6=16A0)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=16D0%O=M5B4NNSNW1|M5B4NNSNW2|M5B4NNSNW3|M5B4NNSNW4|M5B4NNSNW5|M5B4NNSNW6|M5B4NNSNW7%CC=N%Q=)
-T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=N)
-T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=N)
-U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=3B-45%TG=40%CD=S)
-
 # Gentoo Linux, kernel 2.6.20-gentoo-r2, x86, custom compiled.
 # Linux 2.6.15-28-amd64-generic #1 SMP PREEMPT Tue Mar 13 20:51:52 UTC 2007 x86_64 GNU/Linux Ubuntu 6.10
 # Linux 2.6.20 (x86, custom compiled, gcc version 3.4.6 (Gentoo 3.4.6-r2, ssp-3.4.6-1.0, pie-8.7.10))6-1.0, pie-8.7.10))
@@ -39456,28 +39049,11 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 
 # Linux 2.6.17-11-generic #2 SMP Thu Feb 1 18:03:05 UTC 2007 x86_64 GNU/Linux Ubuntu Server 6.10
 # Linux 2.6.21.5-smp #2 SMP Tue Jun 19 14:58:11 CDT 2007 i686 AMD Athlon(tm) 64 X2 Dual Core Processor 3600+ AuthenticAMD GNU/Linux
-Fingerprint Linux 2.6.17 - 2.6.21
-Class Linux | Linux | 2.6.X | general purpose
-CPE cpe:/o:linux:linux_kernel:2.6 auto
-SEQ(SP=C1-CB%GCD=1-6%ISR=C8-D4%TI=Z%II=I%TS=8)
-OPS(O1=M400CNNT11%O2=M400CNNT11%O3=M400CNNT11%O4=M400CNNT11%O5=M400CNNT11%O6=M400CNNT11)
-WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=8018%O=M400C%CC=N%Q=)
-T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=Y%T=3B-45%TG=40%W=8000%S=O%A=S+%F=AS%O=M400CNNT11%RD=0%Q=)
-T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=3B-45%TG=40%CD=S)
-
 # Ubuntu 10.10
 Fingerprint Linux 2.6.17 - 2.6.21
 Class Linux | Linux | 2.6.X | general purpose
 CPE cpe:/o:linux:linux_kernel:2.6 auto
-SEQ(SP=C0-CE%GCD=1-6%ISR=C6-D2%TI=Z%CI=Z%II=I%TS=7)
+SEQ(SP=C0-CE%GCD=1-6%ISR=C6-D4%TI=Z%CI=Z%II=I%TS=7|8)
 OPS(O1=M400CNNT11%O2=M400CNNT11%O3=M400CNNT11%O4=M400CNNT11%O5=M400CNNT11%O6=M400CNNT11)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
 ECN(R=Y%DF=Y%T=3B-45%TG=40%W=8018%O=M400C%CC=N%Q=)
@@ -39944,28 +39520,11 @@ U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=0-FFFF%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
 # Linux 2.6.18-128.4.1.el5 #1 SMP Tue Aug 4 20:23:34 EDT 2009 i686 i686 i386 GNU/Linux
-Fingerprint Linux 2.6.18
-Class Linux | Linux | 2.6.X | general purpose
-CPE cpe:/o:linux:linux_kernel:2.6.18
-SEQ(SP=B7-CF%GCD=1-6%ISR=C4-D2%TI=Z%II=I%TS=8)
-OPS(O1=M5ACST11NW5|M5ACST11NW7%O2=M5ACST11NW5|M5ACST11NW7%O3=M5ACNNT11NW5|M5ACNNT11NW7%O4=M5ACST11NW5|M5ACST11NW7%O5=M5ACST11NW5|M5ACST11NW7%O6=M5ACST11)
-WIN(W1=16A0%W2=16A0%W3=16A0%W4=16A0%W5=16A0%W6=16A0)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=16D0%O=M5ACNNSNW5|M5ACNNSNW7%CC=N%Q=)
-T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=Y%T=3B-45%TG=40%W=16A0%S=O%A=S+%F=AS%O=M5ACST11NW5|M5ACST11NW7%RD=0%Q=)
-T4(R=N)
-T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=N)
-T7(R=N)
-U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=1-FFFF%RUD=G)
-IE(DFI=N%T=3B-45%TG=40%CD=S)
-
 # Linux 2.6.18-164.el5 #1 SMP Thu Sep 3 03:33:56 EDT 2009 i686 i686 i386 GNU/Linux
 Fingerprint Linux 2.6.18
 Class Linux | Linux | 2.6.X | general purpose
 CPE cpe:/o:linux:linux_kernel:2.6.18
-SEQ(SP=B7-CF%GCD=1-6%ISR=C4-D2%TI=Z%II=I%TS=A)
+SEQ(SP=B7-CF%GCD=1-6%ISR=C4-D2%TI=Z%II=I%TS=8|A)
 OPS(O1=M5ACST11NW5|M5ACST11NW7%O2=M5ACST11NW5|M5ACST11NW7%O3=M5ACNNT11NW5|M5ACNNT11NW7%O4=M5ACST11NW5|M5ACST11NW7%O5=M5ACST11NW5|M5ACST11NW7%O6=M5ACST11)
 WIN(W1=16A0%W2=16A0%W3=16A0%W4=16A0%W5=16A0%W6=16A0)
 ECN(R=Y%DF=Y%T=3B-45%TG=40%W=16D0%O=M5ACNNSNW5|M5ACNNSNW7%CC=N%Q=)
@@ -40675,10 +40234,11 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 # Debian Lenny 2.6.18-4-686 #1 SMP GNU/Linux
 # Linux ubuntu 2.6.24-18-server
 # Seagate NAS-AL Serial Number 2GG10LHL Firmware Version 4000.0631
+# ARCHLINUX 0.8 - 2.6.21-ARCH #1 SMP PREEMPT Sat May 5 15:01:53 CEST 2007 i686 Intel(R) Celeron(TM) CPU
 Fingerprint Linux 2.6.18 - 2.6.24
 Class Linux | Linux | 2.6.X | general purpose
 CPE cpe:/o:linux:linux_kernel:2.6 auto
-SEQ(SP=C9-DF%GCD=1-6%ISR=EA-F4%TI=Z%II=I%TS=7|8)
+SEQ(SP=C5-DF%GCD=1-6%ISR=EA-F4%TI=Z%II=I%TS=7|8)
 OPS(O1=M5B4ST11NW4%O2=M5B4ST11NW4%O3=M5B4NNT11NW4%O4=M5B4ST11NW4%O5=M5B4ST11NW4%O6=M5B4ST11)
 WIN(W1=16A0%W2=16A0%W3=16A0%W4=16A0%W5=16A0%W6=16A0)
 ECN(R=Y%DF=Y%T=3B-45%TG=40%W=16D0%O=M5B4NNSNW4%CC=N%Q=)
@@ -41518,24 +41078,6 @@ T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
-# ARCHLINUX 0.8 - 2.6.21-ARCH #1 SMP PREEMPT Sat May 5 15:01:53 CEST 2007 i686 Intel(R) Celeron(TM) CPU
-Fingerprint Linux 2.6.21 (Arch Linux 0.8, x86)
-Class Linux | Linux | 2.6.X | general purpose
-CPE cpe:/o:linux:linux_kernel:2.6.21
-SEQ(SP=C5-CF%GCD=1-6%ISR=CB-D5%TI=Z%II=I%TS=8)
-OPS(O1=M5B4ST11NW4%O2=M5B4ST11NW4%O3=M5B4NNT11NW4%O4=M5B4ST11NW4%O5=M5B4ST11NW4%O6=M5B4ST11)
-WIN(W1=16A0%W2=16A0%W3=16A0%W4=16A0%W5=16A0%W6=16A0)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=16D0%O=M5B4NNSNW4%CC=N%Q=)
-T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=N)
-T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=N)
-U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=3B-45%TG=40%CD=S)
-
 # Linux 2.6.21.5-smp #2 SMP Tue Jun 19 14:58:11 CDT 2007 i686 Dual-Core AMD Opteron(tm) Processor 2210 AuthenticAMD GNU/Linux
 # Linux 2.6.25-ARCH #1 SMP PREEMPT Sat Jun 14 18:07:19 CEST 2008 i686 AMD Athlon(tm) 64 Processor 3700+ AuthenticAMD GNU/Linux , Ditribution: Arch linux
 # Linux 2.6.27-11-generic #1 SMP Thu Jan 29 19:28:32 UTC 2009 x86_64 GNU/Linux
@@ -41658,10 +41200,11 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 # Linux 2.6.22 #3 Sat Jul 28 12:08:46 CEST 2007 i686 GNU/Linux
 # Linux 2.6.22-1-686 #1 SMP Sun Jul 29 14:37:42 UTC 2007 i686 GNU/Linux / Debian
 # Linux 2.6.22-14-generic #1 SMP Sun Oct 14 23:05:12 GMT 2007 i686 GNU/Linux
+# Linux 2.6.22-14-server #1 SMP Tue Feb 12 08:27:05 UTC 2008 i686 GNU/Linux
 Fingerprint Linux 2.6.22
 Class Linux | Linux | 2.6.X | general purpose
 CPE cpe:/o:linux:linux_kernel:2.6.22
-SEQ(SP=C0-D7%GCD=1-6%ISR=EA-F4%TI=Z%II=I%TS=8)
+SEQ(SP=C0-D7%GCD=1-6%ISR=EA-F4%TI=Z%II=I%TS=7|8)
 OPS(O1=M400CST11NW4%O2=M400CST11NW4%O3=M400CNNT11NW4%O4=M400CST11NW4%O5=M400CST11NW4%O6=M400CST11)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
 ECN(R=Y%DF=Y%T=3B-45%TG=40%W=8018%O=M400CNNSNW4%CC=N%Q=)
@@ -41893,24 +41436,6 @@ T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
-# Linux 2.6.22-14-server #1 SMP Tue Feb 12 08:27:05 UTC 2008 i686 GNU/Linux
-Fingerprint Linux 2.6.22
-Class Linux | Linux | 2.6.X | general purpose
-CPE cpe:/o:linux:linux_kernel:2.6.22
-SEQ(SP=CC-D6%GCD=1-6%ISR=EA-F4%TI=Z%II=I%TS=7)
-OPS(O1=M400CST11NW4%O2=M400CST11NW4%O3=M400CNNT11NW4%O4=M400CST11NW4%O5=M400CST11NW4%O6=M400CST11)
-WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=8018%O=M400CNNSNW4%CC=N%Q=)
-T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=Y%T=3B-45%TG=40%W=8000%S=O%A=S+%F=AS%O=M400CST11NW4%RD=0%Q=)
-T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=3B-45%TG=40%CD=S)
-
 # Linux 2.6.22-gentoo-r10-3 #1 Fri Apr 4 22:58:00 CEST 2008 i686 VIA Esther processor 1200MHz CentaurHauls GNU/Linux
 Fingerprint Linux 2.6.22
 Class Linux | Linux | 2.6.X | general purpose
@@ -43738,10 +43263,11 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 # Linux 2.6.27-desktop-0.rc8.2mnb #1 SMP Thu Oct 2 06:11:56 EDT 2008 i686 Pentium III (Coppermine) GNU/Linux  (Mandriva 2009 Free)
 # Linux 2.6.27.4-grsec #1 PREEMPT Tue Oct 28 11:56:22 CET 2008 i686 GNU/Linux
 # Linux 2.6.27.4-linode14 #1 SMP Thu Nov 6 09:22:58 EST 2008 i686 GNU/Linux
+# Linux 2.6.27-ARCH
 Fingerprint Linux 2.6.27
 Class Linux | Linux | 2.6.X | general purpose
 CPE cpe:/o:linux:linux_kernel:2.6.27
-SEQ(SP=C1-D1%GCD=1-6%ISR=C8-D6%TI=Z%II=I%TS=A)
+SEQ(SP=C1-D1%GCD=1-6%ISR=C1-D6%TI=Z%II=I%TS=8|A)
 OPS(O1=ST11M400CNW5%O2=ST11M400CNW5%O3=NNT11M400CNW5%O4=ST11M400CNW5%O5=ST11M400CNW5%O6=ST11M400C)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
 ECN(R=Y%DF=Y%T=3B-45%TG=40%W=8018%O=M400CNNSNW5%CC=N%Q=)
@@ -43859,24 +43385,6 @@ T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
-# Linux 2.6.27-ARCH
-Fingerprint Linux 2.6.27
-Class Linux | Linux | 2.6.X | general purpose
-CPE cpe:/o:linux:linux_kernel:2.6.27
-SEQ(SP=C2-CC%GCD=1-6%ISR=C1-CB%TI=Z%II=I%TS=8)
-OPS(O1=ST11M400CNW5%O2=ST11M400CNW5%O3=NNT11M400CNW5%O4=ST11M400CNW5%O5=ST11M400CNW5%O6=ST11M400C)
-WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=8018%O=M400CNNSNW5%CC=N%Q=)
-T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=Y%T=3B-45%TG=40%W=8000%S=O%A=S+%F=AS%O=ST11M400CNW5%RD=0%Q=)
-T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=3B-45%TG=40%CD=S)
-
 # OS Ubuntu 8.10 server , kernel 2.6.27-7-server
 # Kemp Technologies LoadMaster (Load Balancer)
 Fingerprint Linux 2.6.27
@@ -47245,10 +46753,11 @@ U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
 # Linux 2.6.37-ARCH #1 SMP PREEMPT Tue Mar 15 11:40:49 UTC 2011 i686 Intel(R) Pentium(R) 4 CPU 3.20GHz GenuineIntel GNU/Linux
+# Linux 2.6.37.6-smp #2 SMP Sat Apr 9 23:39:07 CDT 2011 i686 Intel(R) Pentium(R) III CPU family      1133MHz GenuineIntel GNU/Linux / Slackware Linux 13.37
 Fingerprint Linux 2.6.37
 Class Linux | Linux | 2.6.X | general purpose
 CPE cpe:/o:linux:linux_kernel:2.6.37
-SEQ(SP=C4-CE%GCD=1-6%ISR=C7-D1%TI=Z%CI=Z%II=I%TS=8)
+SEQ(SP=C4-D0%GCD=1-6%ISR=C7-D6%TI=Z%CI=Z%II=I%TS=8|A)
 OPS(O1=M5B4ST11NW6%O2=M5B4ST11NW6%O3=M5B4NNT11NW6%O4=M5B4ST11NW6%O5=M5B4ST11NW6%O6=M5B4ST11)
 WIN(W1=10F8%W2=10F8%W3=10F8%W4=10F8%W5=10F8%W6=10F8)
 ECN(R=Y%DF=Y%T=3B-45%TG=40%W=111C%O=M5B4NNSNW6%CC=Y%Q=)
@@ -47299,24 +46808,6 @@ T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
-# Linux 2.6.37.6-smp #2 SMP Sat Apr 9 23:39:07 CDT 2011 i686 Intel(R) Pentium(R) III CPU family      1133MHz GenuineIntel GNU/Linux / Slackware Linux 13.37
-Fingerprint Linux 2.6.37
-Class Linux | Linux | 2.6.X | general purpose
-CPE cpe:/o:linux:linux_kernel:2.6.37
-SEQ(SP=C6-D0%GCD=1-6%ISR=CC-D6%TI=Z%CI=Z%II=I%TS=A)
-OPS(O1=M5B4ST11NW6%O2=M5B4ST11NW6%O3=M5B4NNT11NW6%O4=M5B4ST11NW6%O5=M5B4ST11NW6%O6=M5B4ST11)
-WIN(W1=10F8%W2=10F8%W3=10F8%W4=10F8%W5=10F8%W6=10F8)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=111C%O=M5B4NNSNW6%CC=Y%Q=)
-T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=N)
-T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=N)
-U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=3B-45%TG=40%CD=S)
-
 # Linux 2.6.37.6-smp #2 SMP Sat Apr 9 23:39:07 CDT 2011 i686 Intel(R) Pentium(R) 4 CPU 2.80GHz GenuineIntel GNU/Linux Slackware 13.37
 Fingerprint Linux 2.6.37
 Class Linux | Linux | 2.6.X | general purpose
@@ -47464,10 +46955,11 @@ U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
 # Linux 2.6.38-8-generic #42-Ubuntu SMP Mon Apr 11 03:31:50 UTC 2011 i686 i6 86 i386 GNU/Linux
+# Linux 2.6.38.6-27.fc15.i686.PAE #1 SMP Sun May 15 17:39:47 UTC 2011 i686 i686 i386 GNU/Linux, Fedora 15
 Fingerprint Linux 2.6.38
 Class Linux | Linux | 2.6.X | general purpose
 CPE cpe:/o:linux:linux_kernel:2.6.38
-SEQ(SP=C2-D0%GCD=1-6%ISR=C7-D3%TI=Z%II=I%TS=8)
+SEQ(SP=BF-D0%GCD=1-6%ISR=C7-D7%TI=Z%II=I%TS=8|A)
 OPS(O1=M5B4ST11NW6%O2=M5B4ST11NW6%O3=M5B4NNT11NW6%O4=M5B4ST11NW6%O5=M5B4ST11NW6%O6=M5B4ST11)
 WIN(W1=3890%W2=3890%W3=3890%W4=3890%W5=3890%W6=3890)
 ECN(R=Y%DF=Y%T=3B-45%TG=40%W=3908%O=M5B4NNSNW6%CC=Y%Q=)
@@ -47517,24 +47009,6 @@ T7(R=N)
 U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
-# Linux 2.6.38.6-27.fc15.i686.PAE #1 SMP Sun May 15 17:39:47 UTC 2011 i686 i686 i386 GNU/Linux, Fedora 15
-Fingerprint Linux 2.6.38
-Class Linux | Linux | 2.6.X | general purpose
-CPE cpe:/o:linux:linux_kernel:2.6.38
-SEQ(SP=BF-C9%GCD=1-6%ISR=CD-D7%TI=Z%II=I%TS=A)
-OPS(O1=M5B4ST11NW6%O2=M5B4ST11NW6%O3=M5B4NNT11NW6%O4=M5B4ST11NW6%O5=M5B4ST11NW6%O6=M5B4ST11)
-WIN(W1=3890%W2=3890%W3=3890%W4=3890%W5=3890%W6=3890)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=3908%O=M5B4NNSNW6%CC=Y%Q=)
-T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=Y%T=3B-45%TG=40%W=3890%S=O%A=S+%F=AS%O=M5B4ST11NW6%RD=0%Q=)
-T4(R=N)
-T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=N)
-T7(R=N)
-U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=3B-45%TG=40%CD=S)
-
 # Linux 2.6.38-8-server #42-Ubuntu SMP Mon Apr 11 03:49:04 UTC 2011 x86_64 x86_64 x86_64 GNU/Linux
 Fingerprint Linux 2.6.38
 Class Linux | Linux | 2.6.X | general purpose
@@ -48353,10 +47827,21 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 # Linux 2.6.27-14-generic #1 SMP Wed Apr 15 18:59:16 UTC 2009 i686 GNU/Linux Ubuntu 8.10
 # D-LINK ADSL Wireless G (DSL-2640B)
 # Linux version 2.6.8.1 (root@localhost.localdomain) (gcc version 3.4.2) #1 Wed Jul 2 19:28:36 CST 2008
-Fingerprint Linux 2.6.8 - 2.6.27
+# Linux 2.6.19-gentoo-r5 #1 SMP Mon Mar 26 08:55:15 EDT 2007 i686 Intel(R) Pentium(R) 4 CPU 3.00GHz GenuineIntel GNU/Linux
+# Linux 2.6.19-gentoo-r5 #2 Fri Apr 6 11:18:32 CEST 2007 x86_64 AMD Athlon(tm) 64 Processor 3500+ AuthenticAMD GNU/Linux
+# Linux 2.6.20-gentoo-r8 #1 Sun May 13 14:47:15 CEST 2007 x86_64 AMD Athlon(tm) 64 Processor 3500+ AuthenticAMD GNU/Linux
+# Linux 2.6.24-gentoo-r3 #6 Mon Mar 17 22:02:40 CET 2008 x86_64 AMD Athlon(tm) 64 Processor 3500+ AuthenticAMD GNU/Linux
+# Linux 2.6.24-19-server #1 SMP Wed Jun 18 14:44:47 UTC 2008 x86_64 GNU/Linux
+# Linux 2.6.15-gentoo-r1-
+# SMC Comcast Business Gateway, Model:SMCD3G
+# Linux 2.6.28-15-server #52-Ubuntu SMP Wed Sep 9 11:34:09 UTC 2009 x86_64 GNU/Linux
+# 2.6.30-gentoo-r4
+# Linux Nokia-N900 2.6.28.10power37 #1 PREEMPT Wed May 26 00:24:03 EEST 2010 armv7l unknown
+# This is a Lantronix "Spider" single port KVM. Product Name Lantronix SLS. Firmware Version 03.00.01.
+Fingerprint Linux 2.6.8 - 2.6.30
 Class Linux | Linux | 2.6.X | general purpose
 CPE cpe:/o:linux:linux_kernel:2.6 auto
-SEQ(SP=B6-D2%GCD=1-6%ISR=C3-D5%TI=Z%II=I%TS=8)
+SEQ(SP=B4-D2%GCD=1-6%ISR=C2-D6%TI=Z%II=I%TS=7|8)
 OPS(O1=M5B4ST11NW1|M5B4ST11NW2|M5B4ST11NW3|M5B4ST11NW4|M5B4ST11NW5|M5B4ST11NW6|M5B4ST11NW7%O2=M5B4ST11NW1|M5B4ST11NW2|M5B4ST11NW3|M5B4ST11NW4|M5B4ST11NW5|M5B4ST11NW6|M5B4ST11NW7%O3=M5B4NNT11NW1|M5B4NNT11NW2|M5B4NNT11NW3|M5B4NNT11NW4|M5B4NNT11NW5|M5B4NNT11NW6|M5B4NNT11NW7%O4=M5B4ST11NW1|M5B4ST11NW2|M5B4ST11NW3|M5B4ST11NW4|M5B4ST11NW5|M5B4ST11NW6|M5B4ST11NW7%O5=M5B4ST11NW1|M5B4ST11NW2|M5B4ST11NW3|M5B4ST11NW4|M5B4ST11NW5|M5B4ST11NW6|M5B4ST11NW7%O6=M5B4ST11)
 WIN(W1=16A0%W2=16A0%W3=16A0%W4=16A0%W5=16A0%W6=16A0)
 ECN(R=Y%DF=Y%T=3B-45%TG=40%W=16D0%O=M5B4NNSNW1|M5B4NNSNW2|M5B4NNSNW3|M5B4NNSNW4|M5B4NNSNW5|M5B4NNSNW6|M5B4NNSNW7%CC=N%Q=)
@@ -48698,10 +48183,12 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 # Linux 2.6.12-21mdk i686 Pentium III (Katmai)
 # 2.6.9-34.ELsmp #1 SMP Fri Feb 24 16:54:53 EST 2006 i686 i686 i386 GNU/Linux (Red Hat Enterprise Linux AS release 4 (Nahant Update 4))
 # Linux 2.6.15-23-386 #1 PREEMPT Tue May 23 13:49:40 UTC 2006 i686 GNU/Linux
-Fingerprint Linux 2.6.9 - 2.6.15
+# 2.6.15-28-server #1 SMP Wed Jul 18 23:11:55 UTC 2007 i686 GNU/Linux / Ubuntu 6.06
+# Linux 2.6.16.29-xen #1 SMP Sun Sep 30 04:00:13 UTC 2007 x86_64 GNU/Linux
+Fingerprint Linux 2.6.9 - 2.6.16
 Class Linux | Linux | 2.6.X | general purpose
 CPE cpe:/o:linux:linux_kernel:2.6 auto
-SEQ(SP=AE-CE%GCD=1-6%ISR=C4-DB%TI=Z%II=I%TS=A)
+SEQ(SP=AE-CE%GCD=1-6%ISR=C4-DB%TI=Z%II=I%TS=7|A)
 OPS(O1=M400CST11NW2%O2=M400CST11NW2%O3=M400CNNT11NW2%O4=M400CST11NW2%O5=M400CST11NW2%O6=M400CST11)
 WIN(W1=7FFF%W2=7FFF%W3=7FFF%W4=7FFF%W5=7FFF%W6=7FFF)
 ECN(R=Y%DF=Y%T=3B-45%TG=40%W=7FFF%O=M400CNNSNW2%CC=N%Q=)
@@ -52888,24 +52375,6 @@ T7(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(R=N)
 IE(DFI=S%T=7B-85%TG=80%CD=Z)
 
-# Windows 2000 Server Version 5 Build 2195 Service Pack 4
-Fingerprint Microsoft Windows 2000 Server SP4
-Class Microsoft | Windows | 2000 | general purpose
-CPE cpe:/o:microsoft:windows_2000::sp4:professional
-SEQ(SP=FD-107%GCD=1-6%ISR=101-10B%TI=I%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)
-ECN(R=Y%DF=Y%T=7B-85%TG=80%W=4470%O=M5B4NW0NNS%CC=N%Q=)
-T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=Y%T=7B-85%TG=80%W=402E%S=O%A=S+%F=AS%O=M5B4NW0NNT00NNS%RD=0%Q=)
-T4(R=N)
-T5(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=N)
-T7(R=N)
-U1(DF=N%T=7B-85%TG=80%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(R=N)
-
 # Microsoft Windows 2000 Server (Service Pack 4)
 # Microsoft Windows 2000 Server (Service Pack 4) (Steel-belted Radius server)
 Fingerprint Microsoft Windows 2000 Server SP4
@@ -53822,10 +53291,11 @@ U1(DF=N%T=7B-85%TG=80%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=7B-85%TG=80%CD=Z)
 
 # Version 5.0 (Build 2195: Service Pack 4)
+# Windows 2000 Server Version 5 Build 2195 Service Pack 4
 Fingerprint Microsoft Windows 2000 SP4
 Class Microsoft | Windows | 2000 | general purpose
 CPE cpe:/o:microsoft:windows_2000::sp4
-SEQ(SP=F5-FF%GCD=1-6%ISR=FB-105%TI=I%TS=0)
+SEQ(SP=F5-107%GCD=1-6%ISR=FB-10B%TI=I%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)
 ECN(R=Y%DF=Y%T=7B-85%TG=80%W=4470%O=M5B4NW0NNS%CC=N%Q=)
@@ -55769,28 +55239,11 @@ IE(R=N)
 
 # Version 5.2 R2 (Build 3790.svr03_sp2_gdr.080813-1204 : Service Pack 2)
 # Microsoft Windows Server 2003 R2, Standard Edition, Service Pack 2
-Fingerprint Microsoft Windows Server 2003 SP2
-Class Microsoft | Windows | 2003 | general purpose
-CPE cpe:/o:microsoft:windows_server_2003::sp2
-SEQ(SP=FC-106%GCD=1-6%ISR=101-10F%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)
-ECN(R=Y%DF=N%T=7B-85%TG=80%W=FAF0%O=M5B4NW0NNS%CC=N%Q=)
-T1(R=Y%DF=N%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=N)
-T4(R=N)
-T5(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=N)
-T7(R=N)
-U1(DF=N%T=7B-85%TG=80%IPL=B0%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=S%T=7B-85%TG=80%CD=Z)
-
 # Windows Server 2003 R2 3790 Service Pack 2
 Fingerprint Microsoft Windows Server 2003 SP2
 Class Microsoft | Windows | 2003 | general purpose
 CPE cpe:/o:microsoft:windows_server_2003::sp2
-SEQ(SP=FC-106%GCD=1-6%ISR=101-10D%TI=RD%II=I%SS=S%TS=0)
+SEQ(SP=FC-106%GCD=1-6%ISR=101-10F%TI=I|RD%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)
 ECN(R=Y%DF=N%T=7B-85%TG=80%W=FAF0%O=M5B4NW0NNS%CC=N%Q=)
@@ -57946,28 +57399,6 @@ T7(R=Y%DF=Y%T=7C-86%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=7C-86%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=7C-86%TG=80%CD=Z)
 
-# Version 6.1 (Build 7600), Windows 7 Ultimate
-# Windows Server 2012 Release Candidate Datacenter, 6.2 Build 8400
-# Windows Server 2012 Version 6.2 Build 9200
-Fingerprint Microsoft Windows 7 or Windows Server 2012
-Class Microsoft | Windows | 7 | general purpose
-CPE cpe:/o:microsoft:windows_7::-:ultimate
-Class Microsoft | Windows | 2012 | general purpose
-CPE cpe:/o:microsoft:windows_2012
-SEQ(SP=FA-104%GCD=1-6%ISR=101-10F%TI=I%CI=I|RD%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)
-ECN(R=Y%DF=Y%T=7C-86%TG=80%W=2000%O=M5B4NW8NNS%CC=Y%Q=)
-T1(R=Y%DF=Y%T=7C-86%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=Y%T=7C-86%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=Y%T=7C-86%TG=80%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
-T4(R=Y%DF=Y%T=7C-86%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=7C-86%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=7C-86%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=Y%T=7C-86%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=7C-86%TG=80%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=7C-86%TG=80%CD=Z)
-
 # Windows 7 Professional version 6.1 build 7600  64Bit IA64
 Fingerprint Microsoft Windows 7 Professional
 Class Microsoft | Windows | 7 | general purpose
@@ -60467,29 +59898,6 @@ T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=Z)
 
-# Windows 7 Ultimate 6.1 Build 7600
-# Windows 7 Ultimate 6.1 Build 7601: Service Pack 1
-# Version 6.0 (Build 6002: Service Pack 2)
-Fingerprint Microsoft Windows Vista SP2 or Windows 7 Ultimate SP0 - SP1
-Class Microsoft | Windows | Vista | general purpose
-CPE cpe:/o:microsoft:windows_vista::sp2
-Class Microsoft | Windows | 7 | general purpose
-CPE cpe:/o:microsoft:windows_7::-
-CPE cpe:/o:microsoft:windows_7::sp1
-SEQ(SP=F6-10C%GCD=1-6%ISR=107-111%TI=I%CI=I%II=I%SS=O|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)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=2000%O=M5B4NW8NNS%CC=Y%Q=)
-T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
-T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=3B-45%TG=40%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=3B-45%TG=40%CD=Z)
-
 # Microsoft Windows Server Version 6.0 (Build 6002)
 # Windows Vista (TM) Ultimate 6002 Service Pack 2
 # Windows 7 Professional 7601 Service Pack 1 (Windows 7 Professional 6.1)
@@ -65720,28 +65128,12 @@ T7(R=N)
 U1(DF=N%T=FA-104%TG=FF%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=FA-104%TG=FF%CD=S)
 
+# Canopy Lite - 5.4GHz - Subscriber Module, CANOPY 8.2 SM-DES
 # Motorola BackHaul, CANOPY 8.1.5 BH20-DES
 # CANOPY 8.1.4 AP-DES CANOPYBOOT 1.0
 Fingerprint Motorola Canopy wireless bridge
 Class Motorola | embedded || bridge
-SEQ(SP=0-5%GCD=FA7F|1F4FE|2EF7D|3E9FC|4E47B%ISR=95-9F%TI=I%II=I%SS=S%TS=U)
-OPS(O1=M5B0%O2=M578%O3=M280%O4=M5B0%O5=M218%O6=M109)
-WIN(W1=4000%W2=4000%W3=4000%W4=4000%W5=4000%W6=4000)
-ECN(R=Y%DF=N%T=19-23%TG=20%W=4000%O=M5B0%CC=N%Q=)
-T1(R=Y%DF=N%T=19-23%TG=20%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=N%T=19-23%TG=20%W=4000%S=O%A=O%F=A%O=%RD=0%Q=)
-T4(R=Y%DF=N%T=19-23%TG=20%W=4000%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=19-23%TG=20%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=19-23%TG=20%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=19-23%TG=20%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=19-23%TG=20%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=19-23%TG=20%CD=S)
-
-# Canopy Lite - 5.4GHz - Subscriber Module, CANOPY 8.2 SM-DES
-Fingerprint Motorola Canopy wireless bridge
-Class Motorola | embedded || bridge
-SEQ(SP=0-16%GCD=FA7F|1F4FE|2EF7D|3E9FC|4E47B%ISR=97-A1%TI=I%II=I%SS=S%TS=U)
+SEQ(SP=0-16%GCD=FA7F|1F4FE|2EF7D|3E9FC|4E47B%ISR=95-A1%TI=I%II=I%SS=S%TS=U)
 OPS(O1=M5B0%O2=M578%O3=M280%O4=M5B0%O5=M218%O6=M109)
 WIN(W1=4000%W2=4000%W3=4000%W4=4000%W5=4000%W6=4000)
 ECN(R=Y%DF=N%T=19-23%TG=20%W=4000%O=M5B0%CC=N%Q=)
@@ -70551,12 +69943,13 @@ IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
 # OpenBSD 5.3 GENERIC#76 loongson
 # OpenBSD 4.9 GENERIC#671 i386
-Fingerprint OpenBSD 4.9 - 5.3
+# OpenBSD 5.4
+Fingerprint OpenBSD 4.9 - 5.4
 Class OpenBSD | OpenBSD | 4.X | general purpose
 CPE cpe:/o:openbsd:openbsd:4 auto
 Class OpenBSD | OpenBSD | 5.X | general purpose
 CPE cpe:/o:openbsd:openbsd:5 auto
-SEQ(SP=FC-106%GCD=1-6%ISR=106-110%TI=RD%CI=RD%II=RI%TS=22)
+SEQ(SP=FC-107%GCD=1-6%ISR=106-116%TI=RD%CI=RD%II=RI%TS=21|22)
 OPS(O1=M5B4NNSNW3NNT11%O2=M5B4NNSNW3NNT11%O3=M5B4NW3NNT11%O4=M5B4NNSNW3NNT11%O5=M5B4NNSNW3NNT11%O6=M5B4NNSNNT11)
 WIN(W1=4000%W2=4000%W3=4000%W4=4000%W5=4000%W6=4000)
 ECN(R=Y%DF=Y%T=3B-45%TG=40%W=4000%O=M5B4NNSNW3%CC=N%Q=)
@@ -70718,24 +70111,6 @@ T7(R=N)
 U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=I%RUCK=G%RUD=G)
 IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
-# OpenBSD 5.4
-Fingerprint OpenBSD 5.4
-Class OpenBSD | OpenBSD | 5.X | general purpose
-CPE cpe:/o:openbsd:openbsd:5 auto
-SEQ(SP=FD-107%GCD=1-6%ISR=10C-116%TI=RD%CI=RD%II=RI%TS=21)
-OPS(O1=M5B4NNSNW3NNT11%O2=M5B4NNSNW3NNT11%O3=M5B4NW3NNT11%O4=M5B4NNSNW3NNT11%O5=M5B4NNSNW3NNT11%O6=M5B4NNSNNT11)
-WIN(W1=4000%W2=4000%W3=4000%W4=4000%W5=4000%W6=4000)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=4000%O=M5B4NNSNW3%CC=N%Q=)
-T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=Y%T=3B-45%TG=40%W=4000%S=O%A=S+%F=AS%O=M5B4NNSNW3NNT11%RD=0%Q=)
-T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=S%T=FA-104%TG=FF%CD=S)
-
 # OpenIndiana
 Fingerprint OpenIndiana
 Class OpenIndiana | OpenIndiana || general purpose
@@ -72772,24 +72147,6 @@ T7(R=N)
 U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=0%RUD=G)
 IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
-# RICOH Aficio 1060 - version 3.53.3, network control service version 3.74
-Fingerprint Ricoh Aficio 1060 copier
-Class Ricoh | embedded || printer
-CPE cpe:/h:ricoh:aficio_1060 auto
-SEQ(SP=9D-A7%GCD=1-6%ISR=A7-B1%TI=I%II=I%SS=S%TS=1)
-OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
-WIN(W1=4000%W2=4000%W3=4000%W4=4000%W5=4000%W6=4000)
-ECN(R=Y%DF=N%T=3B-45%TG=40%W=4000%O=M5B4NW0%CC=N%Q=)
-T1(R=Y%DF=N%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=N%T=3B-45%TG=40%W=4000%S=O%A=S+%F=AS%O=M5B4NW0NNT11%RD=0%Q=)
-T4(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=0%RUD=G)
-IE(DFI=S%T=FA-104%TG=FF%CD=S)
-
 # Aficio Ricoh AP400N Network Printer
 # RICOH Aficio 1224C  2.07.2, Firmware Version: 3.74
 Fingerprint Ricoh Aficio 1224C or AP400N printer
@@ -72809,10 +72166,12 @@ U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=0%RUD=G)
 IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
 # Ricoh Aficio 2035e  System: 2.40 NIB: 4.12 Printer
-Fingerprint Ricoh Aficio 2035e printer
+# RICOH Aficio 1060 - version 3.53.3, network control service version 3.74
+Fingerprint Ricoh Aficio 1060 or 2035e printer
 Class Ricoh | embedded || printer
 CPE cpe:/h:ricoh:aficio_2035e auto
-SEQ(SP=93-AF%GCD=1-6%ISR=A8-B2%TI=I%II=I%SS=S%TS=1|2)
+CPE cpe:/h:ricoh:aficio_1060 auto
+SEQ(SP=93-AF%GCD=1-6%ISR=A7-B2%TI=I%II=I%SS=S%TS=1|2)
 OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
 WIN(W1=4000%W2=4000%W3=4000%W4=4000%W5=4000%W6=4000)
 ECN(R=Y%DF=N%T=3B-45%TG=40%W=4000%O=M5B4NW0%CC=N%Q=)
@@ -72828,9 +72187,14 @@ IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
 # RICOH Aficio 3245C Copier, Printer, Scanner, Fax (MFP)
 # RICOH Aficio 3045 - Copier, Printer, Scanner, Fax (MFP)
-Fingerprint Ricoh Aficio 3045/3245C printer
+# Savin 8025e
+Fingerprint Ricoh Aficio 3045/3245C or Savin 8025e printer
 Class Ricoh | embedded || printer
-SEQ(SP=C2-DA%GCD=1-6%ISR=D7-E1%TI=I%II=I%SS=S%TS=1)
+CPE cpe:/h:ricoh:aficio_3045
+CPE cpe:/h:ricoh:aficio_3245c
+Class Savin | embedded || printer
+CPE cpe:/h:savin:8025e auto
+SEQ(SP=C2-DD%GCD=1-6%ISR=D7-E2%TI=I%II=I%SS=S%TS=1)
 OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
 WIN(W1=4000%W2=4000%W3=4000%W4=4000%W5=4000%W6=4000)
 ECN(R=Y%DF=N%T=FA-104%TG=FF%W=4000%O=M5B4NW0%CC=N%Q=)
@@ -73864,24 +73228,6 @@ T7(R=Y%DF=N%T=FA-104%TG=FF%W=5DC%S=A%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=FA-104%TG=FF%IPL=38%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=22-3E%TG=40%CD=S)
 
-# Savin 8025e
-Fingerprint Savin 8025e printer
-Class Savin | embedded || printer
-CPE cpe:/h:savin:8025e auto
-SEQ(SP=D1-DD%GCD=1-6%ISR=D8-E2%TI=I%II=I%SS=S%TS=1)
-OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
-WIN(W1=4000%W2=4000%W3=4000%W4=4000%W5=4000%W6=4000)
-ECN(R=Y%DF=N%T=FA-104%TG=FF%W=4000%O=M5B4NW0%CC=N%Q=)
-T1(R=Y%DF=N%T=FA-104%TG=FF%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=N%T=FA-104%TG=FF%W=4000%S=O%A=S+%F=AS%O=M5B4NW0NNT11%RD=0%Q=)
-T4(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=S%T=FA-104%TG=FF%CD=S)
-
 # TSX ETY PORT Web Server made by Schneider Electric.
 Fingerprint Schneider Electric TSX ETY programmable logic controller
 Class Schneider Electric | embedded || specialized
@@ -77486,30 +76832,12 @@ T7(R=Y%DF=Y%T=2B-3E%TG=40%W=FFFF%S=A|O%A=O|S+%F=AR%O=WFNM109T10S%RD=0%Q=)
 U1(DF=Y%T=FA-104%TG=FF%IPL=70%UN=0%RIPL=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=Y%T=FA-104%TG=FF%CD=S)
 
-# Solaris 11 x86
-Fingerprint Sun Solaris 11
-Class Sun | Solaris | 11 | general purpose
-CPE cpe:/o:sun:sunos:5.11 auto
-SEQ(SP=8A-D6%GCD=1-6%ISR=9D-FD%TI=I%CI=I%II=I%SS=S%TS=A)
-OPS(O1=ST11M5B4NW1%O2=ST11M5B4NW1%O3=NNT11M5B4NW1%O4=ST11M5B4NW1%O5=ST11M5B4NW1%O6=ST11M5B4)
-WIN(W1=FBB4%W2=FC1E%W3=FA38%W4=FABE%W5=FABE%W6=FFF7)
-ECN(R=Y%DF=Y%T=37-41%TG=40%W=FAF0%O=M5B4NNSNW1%CC=Y%Q=)
-T1(R=Y%DF=Y%T=37-41%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=Y%T=37-41%TG=40%W=FA09%S=O%A=S+%F=AS%O=ST11M5B4NW1%RD=0%Q=)
-T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=N)
-U1(DF=N%T=FA-104%TG=FF%IPL=70%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=Y%T=FA-104%TG=FF%CD=S)
-
 # Sun Solaris 11
 # Sun ZFS Storage Appliance 7420 firmware revision ak-nas@2011.04.24.2.1,1-1.15
 Fingerprint Sun Solaris 11
 Class Sun | Solaris | 11 | general purpose
 CPE cpe:/o:sun:sunos:5.11 auto
-SEQ(SP=8A-D6%GCD=1-6%ISR=9D-FD%TI=I%CI=I%TS=7)
+SEQ(SP=8A-D6%GCD=1-6%ISR=9D-FD%TI=I%CI=I|RI%TS=7)
 OPS(O1=ST11M5B4NW5%O2=ST11M5B4NW5%O3=NNT11M5B4NW5%O4=ST11M5B4NW5%O5=ST11M5B4NW5%O6=ST11M5B4)
 WIN(W1=8026%W2=8017%W3=8005%W4=800E%W5=800E%W6=FFF7)
 ECN(R=Y%DF=Y%T=37-41%TG=40%W=8024%O=M5B4NNSNW5%CC=Y%Q=)
@@ -77527,7 +76855,7 @@ IE(DFI=Y%T=FA-104%TG=FF%CD=S)
 Fingerprint Sun Solaris 11
 Class Sun | Solaris | 11 | general purpose
 CPE cpe:/o:sun:sunos:5.11 auto
-SEQ(SP=8A-D6%GCD=1-6%ISR=9D-FD%TI=I%CI=RI%TS=7)
+SEQ(SP=8A-D6%GCD=1-6%ISR=9D-FD%TI=I%CI=RI%TS=7|A)
 OPS(O1=ST11M5B4NW1%O2=ST11M5B4NW1%O3=NNT11M5B4NW1%O4=ST11M5B4NW1%O5=ST11M5B4NW1%O6=ST11M5B4)
 WIN(W1=FBB4%W2=FC1E%W3=FA38%W4=FABE%W5=FABE%W6=FFF7)
 ECN(R=Y%DF=Y%T=37-41%TG=40%W=FAF0%O=M5B4NNSNW1%CC=Y%Q=)
@@ -77559,42 +76887,6 @@ T7(R=N)
 U1(DF=N%T=FA-104%TG=FF%IPL=70%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=Y%T=FA-104%TG=FF%CD=S)
 
-# Sun Solaris 11
-Fingerprint Sun Solaris 11
-Class Sun | Solaris | 11 | general purpose
-CPE cpe:/o:sun:sunos:5.11 auto
-SEQ(SP=8A-D6%GCD=1-6%ISR=9D-FD%TI=I%CI=RI%TS=7)
-OPS(O1=ST11M5B4NW5%O2=ST11M5B4NW5%O3=NNT11M5B4NW5%O4=ST11M5B4NW5%O5=ST11M5B4NW5%O6=ST11M5B4)
-WIN(W1=8026%W2=8017%W3=8005%W4=800E%W5=800E%W6=FFF7)
-ECN(R=Y%DF=Y%T=37-41%TG=40%W=8024%O=M5B4NNSNW5%CC=Y%Q=)
-T1(R=Y%DF=Y%T=37-41%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=Y%T=37-41%TG=40%W=8003%S=O%A=S+%F=AS%O=ST11M5B4NW5%RD=0%Q=)
-T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=N)
-U1(DF=N%T=FA-104%TG=FF%IPL=70%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=Y%T=FA-104%TG=FF%CD=S)
-
-# Sun Solaris 11
-Fingerprint Sun Solaris 11
-Class Sun | Solaris | 11 | general purpose
-CPE cpe:/o:sun:sunos:5.11 auto
-SEQ(SP=8A-D6%GCD=1-6%ISR=9D-FD%TI=I%CI=RI%TS=A)
-OPS(O1=ST11M5B4NW1%O2=ST11M5B4NW1%O3=NNT11M5B4NW1%O4=ST11M5B4NW1%O5=ST11M5B4NW1%O6=ST11M5B4)
-WIN(W1=FBB4%W2=FC1E%W3=FA38%W4=FABE%W5=FABE%W6=FFF7)
-ECN(R=Y%DF=Y%T=37-41%TG=40%W=FAF0%O=M5B4NNSNW1%CC=Y%Q=)
-T1(R=Y%DF=Y%T=37-41%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=Y%T=37-41%TG=40%W=FA09%S=O%A=S+%F=AS%O=ST11M5B4NW1%RD=0%Q=)
-T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=N)
-U1(DF=N%T=FA-104%TG=FF%IPL=70%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=Y%T=FA-104%TG=FF%CD=S)
-
 # SunOS  5.11 11.0 i86pc i386 i86pc
 Fingerprint Sun Solaris 11
 Class Sun | Solaris | 11 | general purpose
@@ -77641,12 +76933,13 @@ IE(DFI=Y%T=FA-104%TG=FF%CD=S)
 # OpenIndiana version oi_148
 # OpenIndiana (powered by illumos)    SunOS 5.11    oi_151a    December 2011, 5.11 oi_151a i86pc i386 i86pc Solaris
 # Joyent's SmartOS which is based on Illumos which is based on OpenSolaris.
+# Solaris 11 x86
 Fingerprint Sun Solaris 11 (snv_151a) or OpenIndiana oi_147 - oi_151a
 Class Sun | Solaris | 11 | general purpose
 CPE cpe:/o:sun:sunos:5.11 auto
 Class OpenIndiana | OpenIndiana || general purpose
 CPE cpe:/o:openindiana:openindiana auto
-SEQ(SP=8A-D6%GCD=1-6%ISR=9D-FD%TI=I%CI=I%II=I%SS=S%TS=7)
+SEQ(SP=8A-D6%GCD=1-6%ISR=9D-FD%TI=I%CI=I%II=I%SS=S%TS=7|A)
 OPS(O1=ST11M5B4NW1%O2=ST11M5B4NW1%O3=NNT11M5B4NW1%O4=ST11M5B4NW1%O5=ST11M5B4NW1%O6=ST11M5B4)
 WIN(W1=FBB4%W2=FC1E%W3=FA38%W4=FABE%W5=FABE%W6=FFF7)
 ECN(R=Y%DF=Y%T=37-41%TG=40%W=FAF0%O=M5B4NNSNW1%CC=Y%Q=)
@@ -80718,10 +80011,11 @@ U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
 # VMWare ESXi, 4.1.0, 320137 running on HP ProLiant Server.
+# ESXi 4.1
 Fingerprint VMware ESXi Server 4.1.0
 Class VMware | ESX Server | 4.X | specialized
 CPE cpe:/o:vmware:esxi:4.1
-SEQ(SP=B0-CE%GCD=7|E|15|1C|23%ISR=F4-FE%TI=I%CI=I%II=I%SS=S%TS=7)
+SEQ(SP=B0-D9%GCD=7|E|15|1C|23%ISR=F4-100%TI=I%CI=I%II=I%SS=S%TS=7)
 OPS(O1=M5B4NW4ST11%O2=M578NW4ST11%O3=M280NW4NNT11%O4=M5B4NW4ST11%O5=M218NW4ST11%O6=M109ST11)
 WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
 ECN(R=Y%DF=Y%T=3B-45%TG=40%W=FFFF%O=M5B4NW4SLL%CC=N%Q=)
@@ -80771,24 +80065,6 @@ T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
-# ESXi 4.1
-Fingerprint VMware ESXi Server 4.1.0
-Class VMware | ESX Server | 4.X | specialized
-CPE cpe:/o:vmware:esxi:4.1
-SEQ(SP=BF-D9%GCD=7|E|15|1C|23%ISR=F6-100%TI=I%CI=I%II=I%SS=S%TS=7)
-OPS(O1=M5B4NW4ST11%O2=M578NW4ST11%O3=M280NW4NNT11%O4=M5B4NW4ST11%O5=M218NW4ST11%O6=M109ST11)
-WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=FFFF%O=M5B4NW4SLL%CC=N%Q=)
-T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=Y%T=3B-45%TG=40%W=FFFF%S=O%A=S+%F=AS%O=M109NW4ST11%RD=0%Q=)
-T4(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=S%T=3B-45%TG=40%CD=S)
-
 # VMware ESX Server 5.X
 Fingerprint VMware ESX Server 5
 Class VMware | ESX Server | 5.X | specialized
@@ -82341,24 +81617,6 @@ T7(R=Y%DF=N%T=3B-45%TG=40%W=FFFF%S=A%A=S+%F=AR%O=WFNM109T10S%RD=0%Q=)
 U1(R=N)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
-# Xerox Phaser 8560MFP, Operating System: 8.26, Networking: 33.16.05.04.2007
-Fingerprint Xerox Phaser 8560 printer
-Class Xerox | embedded || printer
-CPE cpe:/h:xerox:phaser_8560 auto
-SEQ(SP=14-1E%GCD=FA00|1F400|2EE00|3E800|4E200%ISR=99-A3%TI=I%II=I%SS=S%TS=U)
-OPS(O1=M5B4NW0%O2=M5B4NW0%O3=M5B4NW0%O4=M5B4NW0%O5=M5B4NW0%O6=M5B4)
-WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
-ECN(R=Y%DF=N%T=3B-45%TG=40%W=2000%O=M5B4NW0%CC=N%Q=)
-T1(R=Y%DF=N%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=N%T=3B-45%TG=40%W=2000%S=O%A=O%F=A%O=%RD=0%Q=)
-T4(R=Y%DF=N%T=3B-45%TG=40%W=2000%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=I%RUCK=0%RUD=G)
-IE(DFI=S%T=3B-45%TG=40%CD=S)
-
 # Xerox Phaser 860N
 # Operating system: 3.38; Networking  12.86.04.06.2001
 # Xerox Phaser 8200N