From 40e8199d23325c7966302e78693d9c0fdad9600e Mon Sep 17 00:00:00 2001
From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Thu, 31 Aug 2017 16:27:17 +0000
Subject: [PATCH 1/3] Process 108 OS fingerprint submissions

---
 nmap-os-db | 502 +++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 430 insertions(+), 72 deletions(-)

diff --git a/nmap-os-db b/nmap-os-db
index df3a3a2bb2..7c3e3cdb0a 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -1646,6 +1646,24 @@ 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)
 
+# HiveOS 6.8r1 Jakarta build-130440
+Fingerprint Aerohive HiveOS 6.8
+Class Aerohive | HiveOS | 6.X | WAP
+CPE cpe:/o:aerohive:hiveos:6.8 auto
+SEQ(SP=C5-CF%GCD=1-6%ISR=C3-CD%TI=I%II=I%SS=S%TS=A)
+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=N%T=3B-45%TG=40%W=16D0%O=M5B4NNSNW4%CC=Y%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=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)
+
 # 7.1r1
 Fingerprint Aerohive HiveOS 7.1
 Class Aerohive | HiveOS | 7.X | WAP
@@ -1814,6 +1832,26 @@ T7(R=N)
 U1(DF=N%T=3A-44%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
 IE(DFI=S%T=3A-44%TG=40%CD=S)
 
+# Linux version 2.6.21.7-hrt1-WR2.0bl_standard on PowerPC (MPC83XX), Airvana HubBub C1-600-RT
+Fingerprint Airvana C1-600-RT signal booster (Linux 2.6.21)
+Class Airvana | embedded || specialized
+CPE cpe:/h:airvana:c1-600-rt
+Class Linux | Linux | 2.6.X | specialized
+CPE cpe:/o:linux:linux_kernel:2.6.21 auto
+SEQ(SP=0-5%GCD=FA01|1F402|2EE03|3E804|4E205%ISR=95-9F%TI=I%CI=I%II=I%SS=S%TS=U)
+OPS(O1=NNM460SNW0%O2=NNM460SNW0%O3=M460NW0%O4=NNM460SNW0%O5=NNM460SNW0%O6=NNM460S)
+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=NNM460SNW0%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=FA-104%TG=FF%W=0%S=A%A=S+%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=S+%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=Z%A=S+%F=R%O=%RD=0%Q=)
+U1(DF=N%T=3B-45%TG=40%IPL=138%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=S%T=3B-45%TG=40%CD=Z)
+
 # AKCP sensorProbe2, www.AKCP.com. Firmware SP2388, dated 090608
 Fingerprint AKCP sensorProbe2 remote sensor device
 Class AKCP | embedded || specialized
@@ -11685,8 +11723,8 @@ T4(R=Y%DF=N%T=0A-14%TG=20%W=800%S=A%A=Z%F=R%O=%RD=0%Q=)
 T5(R=Y%DF=N%T=0A-14%TG=20%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 T6(R=Y%DF=N%T=0A-14%TG=20%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
 T7(R=Y%DF=N%T=0A-14%TG=20%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=G%RUD=G)
-IE(DFI=N%T=35-3F%TG=40%CD=S)
+U1(DF=N%T=34-45%TG=40%IPL=38%UN=0%RIPL=G%RID=4210%RIPCK=Z%RUCK=G%RUD=G)
+IE(DFI=N%T=2C-3F%TG=40%CD=S)
 
 # 4.3 BSD UNIX #3: Sat Feb 14 20:31:03 PST 2004. This is UC Berkeley's 4.3BSD on VAX/SimH.
 Fingerprint 4.3BSD
@@ -23068,6 +23106,23 @@ T7(R=Y%DF=N%T=6B-75%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=6B-75%TG=80%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=1CAC%RUD=G)
 IE(DFI=N%T=6B-75%TG=80%CD=Z)
 
+# DYMO LabelManager Wireless PNP
+Fingerprint DYMO LabelManager Wireless PNP printer
+Class DYMO | embedded || printer
+SEQ(SP=0-5%GCD=64|C8|12C|190|1F4%ISR=4B-55%TI=I%II=I%SS=S%TS=U)
+OPS(R=N)
+WIN(R=N)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=3%O=WANM5B4SNN%CC=N%Q=U)
+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=N)
+T5(R=N)
+T6(R=N)
+T7(R=N)
+U1(DF=N%T=3B-45%TG=40%IPL=38%UN=176%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
 # EasyPath Series PON Switch Software, GROS Version V2R02B157, ProductOS Version V1R12B157
 Fingerprint EasyPath PON switch
 Class EasyPath | embedded || switch
@@ -23724,6 +23779,25 @@ T7(R=N)
 U1(DF=Y%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)
 
+# Enlogic PDU Network Management Card running FreeRTOS
+Fingerprint Enlogic PDU (FreeRTOS/lwIP)
+Class Enlogic | embedded || specialized
+Class lwIP | lwIP || specialized
+CPE cpe:/a:lwip_project:lwip auto
+SEQ(SP=10-1A%GCD=1-6%ISR=60-6A%TI=I%CI=I%II=RI%SS=S%TS=U)
+OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
+WIN(W1=B68%W2=B68%W3=B68%W4=B68%W5=B68%W6=B68)
+ECN(R=Y%DF=N%T=FA-104%TG=FF%W=B68%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=N)
+T3(R=Y%DF=N%T=FA-104%TG=FF%W=B68%S=O%A=S+%F=AS%O=M5B4%RD=0%Q=)
+T4(R=Y%DF=N%T=FA-104%TG=FF%W=B68%S=A%A=S%F=AR%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=FA-104%TG=FF%W=B68%S=A%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=FA-104%TG=FF%W=B68%S=A%A=S%F=AR%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=FA-104%TG=FF%W=B68%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)
+
 # Enterasys XSR Security Router
 Fingerprint Enterasys XSR firewall
 Class Enterasys | embedded || firewall
@@ -28823,21 +28897,22 @@ IE(DFI=S%T=2D-37%TG=40%CD=S)
 
 # Frontier Silicon Venice 6.2, firmware 2.5.13.EX33141-1A12, device: MEDION LIFE P85017
 # Hama DIR3100 digital radio
+# Arcam AVR450
 Fingerprint Frontier Silicon internet radio
 Class Frontier Silicon | embedded || media device
-SEQ(SP=DA-E6%GCD=1-6%ISR=DB-E9%TI=I%CI=I%II=I%SS=S%TS=U)
+SEQ(SP=DA-104%GCD=1-6%ISR=DB-F3%TI=I%CI=I%II=I%SS=S%TS=U)
 OPS(O1=M5B4W0L%O2=M5B4W0L%O3=M5B4W0L%O4=M5B4W0L%O5=M5B4W0L%O6=M5B4)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
-ECN(R=Y%DF=N%T=71-7B%TG=80%W=2000%O=M5B4W0L%CC=N%Q=)
-T1(R=Y%DF=N%T=71-7B%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+ECN(R=Y%DF=N%T=6A-7B%TG=80%W=2000%O=M5B4W0L%CC=N%Q=)
+T1(R=Y%DF=N%T=6A-7B%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
 T2(R=N)
 T3(R=N)
-T4(R=Y%DF=N%T=71-7B%TG=80%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=71-7B%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=71-7B%TG=80%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=71-7B%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=71-7B%TG=80%IPL=240%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=>0%RUD=I)
-IE(DFI=N%T=71-7B%TG=80%CD=Z)
+T4(R=Y%DF=N%T=6A-7B%TG=80%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=6A-7B%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=6A-7B%TG=80%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=6A-7B%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=6A-7B%TG=80%IPL=240%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=>0|83CB%RUD=I)
+IE(DFI=N%T=6A-7B%TG=80%CD=Z)
 
 # Pinell Supersound II iRadio
 # Firmware: ir-mmi-FS2026-0500-0013_V2.6.17.EX53300-1RC5
@@ -30260,26 +30335,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)
 
-# Android 5.0.2
-# Android Lollipop 5.0.2 on Samsung Galaxy Tab S - T800
-# Sony Z3 Compact. Android 5.1.1
-Fingerprint Android 5.0 - 5.1
-Class Google | Android | 5.X | phone
-CPE cpe:/o:google:android:5
-SEQ(SP=FF-10B%GCD=1-6%ISR=106-110%TI=Z%CI=I|Z%II=I%TS=7|8)
-OPS(O1=M5B4ST11NW7%O2=M5B4ST11NW7%O3=M5B4NNT11NW7%O4=M5B4ST11NW7%O5=M5B4ST11NW7%O6=M5B4ST11)
-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=M5B4NNSNW7%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=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)
-
 # Cyanogenmod nightlies
 # Linux 3.10.49-g38a3dc5c hudsoncm@ilclbld52 #1 Fri Jun 19 23:31:27 CDT 2015 (Android 5.1)
 # ASUS Zenfone 5, when used as wifi router (SEQ.CI=Z)
@@ -30307,6 +30362,29 @@ 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)
 
+# Android 5.0.2
+# Android Lollipop 5.0.2 on Samsung Galaxy Tab S - T800
+# Sony Z3 Compact. Android 5.1.1
+# Linux localhost 3.4.0-8903521 #1 SMP PREEMPT Fri Oct 7 18:26:14 KST 2016 armv71 Android 6.0.1
+Fingerprint Android 5.0 - 6.0.1
+Class Google | Android | 5.X | phone
+CPE cpe:/o:google:android:5
+Class Google | Android | 6.X | phone
+CPE cpe:/o:google:android:6 auto
+SEQ(SP=FF-10B%GCD=1-6%ISR=106-110%TI=Z%CI=I|Z%II=I%TS=7|8)
+OPS(O1=M5B4ST11NW7%O2=M5B4ST11NW7%O3=M5B4NNT11NW7%O4=M5B4ST11NW7%O5=M5B4ST11NW7%O6=M5B4ST11)
+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=M5B4NNSNW7%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=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)
+
 # Android Lollipop 5.0.1
 Fingerprint Android 5.0.1
 Class Google | Android | 5.X | phone
@@ -30441,6 +30519,26 @@ T7(R=Y%DF=Y%T=3B-45%TG=40%W=0%S=Z%A=O%F=AR%RD=0)
 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)
 
+# Samsung Galaxy S7 Edge, Android version 6.0.1, Kernel Version: 3.18.14-9519568
+Fingerprint Android 6.0.1 (Linux 3.18)
+Class Google | Android | 6.X | phone
+CPE cpe:/o:google:android:6.0.1 auto
+Class Linux | Linux | 3.X | phone
+CPE cpe:/o:linux:linux_kernel:3.18 auto
+SEQ(SP=FC-108%GCD=1-6%ISR=FF-10B%TI=Z%CI=I%II=I%TS=7)
+OPS(O1=M5B4ST11NW5%O2=M5B4ST11NW5%O3=M5B4NNT11NW5%O4=M5B4ST11NW5%O5=M5B4ST11NW5%O6=M5B4ST11)
+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=M5B4NNSNW5%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=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)
+
 # Google Nexus Player
 Fingerprint Google Nexus Player
 Class Google | Android || media device
@@ -30936,6 +31034,23 @@ 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)
 
+# Anova Precision Cooker
+Fingerprint Anova Precision Cooker (High-Flying WLAN module)
+Class High-Flying | embedded || specialized
+SEQ(SP=32-3C%GCD=1-6%ISR=5F-69%TI=I%CI=I%II=RI%SS=O%TS=U)
+OPS(O1=M578%O2=M578%O3=M578%O4=M578%O5=M578%O6=M578)
+WIN(W1=5DC%W2=5DC%W3=5DC%W4=5DC%W5=5DC%W6=5DC)
+ECN(R=Y%DF=N%T=FA-104%TG=FF%W=5DC%O=M578%CC=N%Q=)
+T1(R=Y%DF=N%T=FA-104%TG=FF%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=Y%DF=N%T=FA-104%TG=FF%W=5DC%S=O%A=S+%F=AS%O=M578%RD=0%Q=)
+T4(R=Y%DF=N%T=FA-104%TG=FF%W=5DC%S=A+%A=S%F=AR%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=FA-104%TG=FF%W=5DC%S=A%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=FA-104%TG=FF%W=5DC%S=A%A=S%F=AR%O=%RD=0%Q=)
+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%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=S%T=FA-104%TG=FF%CD=S)
+
 # Jinan USR IOT Technology Co., Ltd. embedded WLAN module
 Fingerprint High-Flying HF-LPT100 embedded WLAN module
 Class High-Flying | embedded || specialized
@@ -44066,10 +44181,11 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 # Linux 2.4.21-40.EL #1 Thu Feb 2 22:32:00 EST 2006 i686 i686 i386 GNU/Linux (VMware)
 # 2.4.21-32.0.1.ELsmp #1 SMP i686
 # Linux 2.6.5-7.244.smp #1 SMP Mon Dec 3 22:38:12 BRST 2007 i686 athlon i386 GNU/Linux
+# Linux version 2.4.27-ubnt0 (buildd@builder) (gcc version 3.3.3) #2 Thu Mar 28 10:55:48 EET 2013
 Fingerprint Linux 2.4.21 - 2.4.27
 Class Linux | Linux | 2.4.X | general purpose
 CPE cpe:/o:linux:linux_kernel:2.4 auto
-SEQ(SP=BC-D0%GCD=1-6%ISR=C1-D7%TI=Z%CI=I%II=I%TS=7)
+SEQ(SP=B2-D0%GCD=1-6%ISR=C1-D7%TI=Z%CI=I%II=I%TS=7)
 OPS(O1=M5B4ST11NW0%O2=M5B4ST11NW0%O3=M5B4NNT11NW0%O4=M5B4ST11NW0%O5=M5B4ST11NW0%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=M5B4NNSNW0%CC=N%Q=)
@@ -58453,7 +58569,7 @@ Class Linux | Linux | 2.6.X | remote management
 CPE cpe:/o:linux:linux_kernel:2.6 auto
 Class Supermicro | embedded || remote management
 CPE cpe:/h:supermicro:aoc-simso+
-SEQ(SP=C1-CB%GCD=1-6%ISR=C7-D1%TI=Z%CI=I%II=I%TS=7)
+SEQ(SP=C1-CB%GCD=1-6%ISR=C7-D1%TI=Z%CI=I|Z%II=I%TS=7)
 OPS(O1=M5B4ST11NW1%O2=M5B4ST11NW1%O3=M5B4NNT11NW1%O4=M5B4ST11NW1%O5=M5B4ST11NW1%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%CC=N%Q=)
@@ -59952,7 +60068,7 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 Fingerprint Orange Livebox Pro v3 (Linux 2.6)
 Class Linux | Linux | 2.6.X | WAP
 CPE cpe:/o:linux:linux_kernel:2.6 auto
-SEQ(SP=BB-C5%GCD=1-6%ISR=C1-CB%TI=Z%CI=Z%II=I%TS=U)
+SEQ(SP=BB-C7%GCD=1-6%ISR=C1-CD%TI=Z%CI=Z%II=I%TS=U)
 OPS(O1=M5B4NNSNW4%O2=M5B4NNSNW4%O3=M5B4NW4%O4=M5B4NNSNW4%O5=M5B4NNSNW4%O6=M5B4NNS)
 WIN(W1=16D0%W2=16D0%W3=16D0%W4=16D0%W5=16D0%W6=16D0)
 ECN(R=Y%DF=Y%T=3B-45%TG=40%W=16D0%O=M5B4NNSNW4%CC=N%Q=)
@@ -60555,7 +60671,7 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 Fingerprint OpenWrt Chaos Calmer 15.05 (Linux 3.18)
 Class Linux | Linux | 3.X | broadband router
 CPE cpe:/o:linux:linux_kernel:3.18 auto
-SEQ(SP=103-10D%GCD=1-6%ISR=105-10F%TI=Z%CI=Z%II=I%TS=7)
+SEQ(SP=101-10D%GCD=1-6%ISR=105-10F%TI=Z%CI=Z%II=I%TS=7)
 OPS(O1=M5B4ST11NW2%O2=M5B4ST11NW2%O3=M5B4NNT11NW2%O4=M5B4ST11NW2%O5=M5B4ST11NW2%O6=M5B4ST11)
 WIN(W1=7120%W2=7120%W3=7120%W4=7120%W5=7120%W6=7120)
 ECN(R=Y%DF=Y%T=3B-45%TG=40%W=7210%O=M5B4NNSNW2%CC=N%Q=)
@@ -65058,7 +65174,8 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 # Linux 4.1.13 #1 Sun Dec 27 17:57:31 CET 2015 mips GNU/Linux
 # OpenWRT CHAOS CALMER (15.05.1, r48532)
 # OpenWrt Chaos Calmer 15.05.1 / LuCI 15.05-188-g87e9837 Release (git-16.018.33482-3201903), Linux 3.18.23
-Fingerprint OpenWrt Chaos Calmer 15.05 (Linux 3.18) or Designated Driver (Linux 4.1)
+# OpenWrt omnia 15.05 r47055 / LuCI 5ca9e5d2391f6ca149db4e53cda7c8f5d3ef6644 branch (git-16.335.29518-5ca9e5d), Linux 4.4.38
+Fingerprint OpenWrt Chaos Calmer 15.05 (Linux 3.18) or Designated Driver (Linux 4.1 or 4.4)
 Class Linux | Linux | 3.X | WAP
 CPE cpe:/o:linux:linux_kernel:3.18
 Class Linux | Linux | 4.X | WAP
@@ -65592,16 +65709,14 @@ 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)
 
-# Localhost
-# Linux 4.4.0-47-generic #68-Ubuntu SMP Wed Oct 26 19:39:52 UTC 2016 x86_64 x86_64 x86_64 GNU/Linux / Mint 18 XFCE
-# Linux  4.4.0-62-generic #83-Ubuntu SMP Wed Jan 18 14:09:55 UTC 2017 i686 i686 i686 GNU/Linux
+# Linux 4.4.0-57-generic #78-Ubuntu SMP Fri Dec 9 23:50:32 UTC 2016 x86_64 x86_64 x86_64 GNU/Linux
 Fingerprint Linux 4.4
 Class Linux | Linux | 4.X | general purpose
 CPE cpe:/o:linux:linux_kernel:4.4 auto
-SEQ(SP=F3-10A%GCD=1-6%ISR=103-113%TI=Z%CI=I%II=I%TS=8)
-OPS(O1=MFFD7ST11NW0%O2=MFFD7ST11NW0%O3=MFFD7NNT11NW0%O4=MFFD7ST11NW0%O5=MFFD7ST11NW0%O6=MFFD7ST11)
-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=MFFD7NNSNW0%CC=Y%Q=)
+SEQ(SP=FF-109%GCD=1-6%ISR=109-113%TI=Z%CI=I%TS=8)
+OPS(O1=M4D8ST11NW7%O2=M4D8ST11NW7%O3=M4D8NNT11NW7%O4=M4D8ST11NW7%O5=M4D8ST11NW7%O6=M4D8ST11)
+WIN(W1=5FF0%W2=5FF0%W3=5FF0%W4=5FF0%W5=5FF0%W6=5FF0)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=60E0%O=M4D8NNSNW7%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)
@@ -65612,32 +65727,32 @@ 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 4.4.0-57-generic #78-Ubuntu SMP Fri Dec 9 23:50:32 UTC 2016 x86_64 x86_64 x86_64 GNU/Linux
+# Linux 4.4.26, Mageia 5
 Fingerprint Linux 4.4
 Class Linux | Linux | 4.X | general purpose
 CPE cpe:/o:linux:linux_kernel:4.4 auto
-SEQ(SP=FF-109%GCD=1-6%ISR=109-113%TI=Z%CI=I%TS=8)
-OPS(O1=M4D8ST11NW7%O2=M4D8ST11NW7%O3=M4D8NNT11NW7%O4=M4D8ST11NW7%O5=M4D8ST11NW7%O6=M4D8ST11)
-WIN(W1=5FF0%W2=5FF0%W3=5FF0%W4=5FF0%W5=5FF0%W6=5FF0)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=60E0%O=M4D8NNSNW7%CC=Y%Q=)
+SEQ(SP=103-10D%GCD=1-6%ISR=104-10E%TI=Z%CI=I%TS=7)
+OPS(O1=M5B4ST11NW7%O2=M5B4ST11NW7%O3=M5B4NNT11NW7%O4=M5B4ST11NW7%O5=M5B4ST11NW7%O6=M5B4ST11)
+WIN(W1=7120%W2=7120%W3=7120%W4=7120%W5=7120%W6=7120)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=7210%O=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=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)
+T7(R=N)
+U1(R=N)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
-# Linux 4.4.26, Mageia 5
+# Raspbian Jessie Lite, Linux 4.4
 Fingerprint Linux 4.4
 Class Linux | Linux | 4.X | general purpose
 CPE cpe:/o:linux:linux_kernel:4.4 auto
-SEQ(SP=103-10D%GCD=1-6%ISR=104-10E%TI=Z%CI=I%TS=7)
-OPS(O1=M5B4ST11NW7%O2=M5B4ST11NW7%O3=M5B4NNT11NW7%O4=M5B4ST11NW7%O5=M5B4ST11NW7%O6=M5B4ST11)
+SEQ(SP=E3-10B%GCD=1-6%ISR=103-10D%TI=Z%CI=Z%TS=7)
+OPS(O1=M5B4ST11NW6%O2=M5B4ST11NW6%O3=M5B4NNT11NW6%O4=M5B4ST11NW6%O5=M5B4ST11NW6%O6=M5B4ST11)
 WIN(W1=7120%W2=7120%W3=7120%W4=7120%W5=7120%W6=7120)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=7210%O=M5B4NNSNW7%CC=N%Q=)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=7210%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)
@@ -65645,7 +65760,28 @@ 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(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)
+
+# Localhost
+# Linux 4.4.0-47-generic #68-Ubuntu SMP Wed Oct 26 19:39:52 UTC 2016 x86_64 x86_64 x86_64 GNU/Linux / Mint 18 XFCE
+# Linux  4.4.0-62-generic #83-Ubuntu SMP Wed Jan 18 14:09:55 UTC 2017 i686 i686 i686 GNU/Linux
+# Linux michel-ubuntu 4.8.0-34-generic #36-Ubuntu SMP Wed Dec 21 17:24:18 UTC 2016 x86_64 x86_64 x86_64 GNU/Linux
+Fingerprint Linux 4.4 - 4.8
+Class Linux | Linux | 4.X | general purpose
+CPE cpe:/o:linux:linux_kernel:4 auto
+SEQ(SP=F3-10A%GCD=1-6%ISR=103-113%TI=Z%CI=I%II=I%TS=8)
+OPS(O1=MFFD7ST11NW0%O2=MFFD7ST11NW0%O3=MFFD7NNT11NW0%O4=MFFD7ST11NW0%O5=MFFD7ST11NW0%O6=MFFD7ST11)
+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=MFFD7NNSNW0%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=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 4.5.4-1-ARCH #1 SMP PREEMPT Wed May 11 22:21:28 CEST 2016 x86_64 GNU/Linux
@@ -76283,7 +76419,7 @@ IE(DFI=S%T=7B-85%TG=80%CD=Z)
 # Windows CE 3.0
 Fingerprint Microsoft Windows CE 3.0
 Class Microsoft | Windows | PocketPC/CE | general purpose
-CPE cpe:/o:microsoft:windows_ce auto
+CPE cpe:/o:microsoft:windows_ce:3.0 auto
 SEQ(TI=BI%CI=BI%II=BI%SS=O%TS=0)
 OPS(O1=M5B8NW0NNT00NNS%O2=M5B8NW0NNT00NNS%O3=M5B8NW0NNT00%O4=%O5=%O6=)
 WIN(W1=8000%W2=8000%W3=8000%W4=0%W5=0%W6=0)
@@ -76301,7 +76437,7 @@ IE(DFI=S%T=7B-85%TG=80%CD=Z)
 # Windows CE 5.0 on Intel XScale
 Fingerprint Microsoft Windows CE 5.0
 Class Microsoft | Windows | PocketPC/CE | general purpose
-CPE cpe:/o:microsoft:windows_ce auto
+CPE cpe:/o:microsoft:windows_ce:5.0 auto
 SEQ(SP=73-81%GCD=1-6%ISR=92-9C%TI=I%CI=I%II=I%SS=S%TS=0)
 OPS(O1=M527NW0NNT00NNS%O2=M527NW0NNT00NNS%O3=M527NW0NNT00%O4=M527NW0NNT00NNS%O5=M527NW0NNT00NNS%O6=M527NNT00NNS)
 WIN(W1=80CF%W2=80CF%W3=8200%W4=81D0%W5=81D0%W6=805C)
@@ -76319,7 +76455,7 @@ IE(DFI=S%T=7B-85%TG=80%CD=Z)
 # Windows embedded CE 6.0 HP thin client t5550 512flash 1024ram
 Fingerprint Microsoft Windows CE 6.0
 Class Microsoft | Windows | PocketPC/CE | general purpose
-CPE cpe:/o:microsoft:windows_ce auto
+CPE cpe:/o:microsoft:windows_ce:6.0 auto
 SEQ(SP=74-7E%GCD=1-6%ISR=93-9D%TI=I%CI=I%II=I%SS=O%TS=0)
 OPS(O1=M5B4NW1NNT00NNS%O2=M5B4NW1NNT00NNS%O3=M5B4NW1NNT00%O4=M5B4NW1NNT00NNS)
 WIN(W1=8052|FFFF%W2=8084|FFFF%W3=80C0|FFFF%W4=80C4|FFFF%W5=0%W6=0)
@@ -76341,7 +76477,7 @@ IE(DFI=S%T=7B-85%TG=80%CD=Z)
 # XP64 with all available Windows updates
 Fingerprint AT&T U-Verse set-top box (Windows CE 5.0)
 Class Microsoft | Windows | PocketPC/CE | media device
-CPE cpe:/o:microsoft:windows_ce auto
+CPE cpe:/o:microsoft:windows_ce:5.0 auto
 SEQ(CI=I%II=I)
 OPS(O1=%O2=%O3=%O4=%O5=%O6=)
 WIN(W1=0%W2=0%W3=0%W4=0%W5=0%W6=0)
@@ -76427,7 +76563,7 @@ IE(R=N)
 # WinCE/5.0.0
 Fingerprint Motorola VIP1200-series or Swisscom Bluewin TV digital set top box (Windows CE 5.0)
 Class Microsoft | Windows | PocketPC/CE | media device
-CPE cpe:/o:microsoft:windows_ce auto
+CPE cpe:/o:microsoft:windows_ce:5.0 auto
 SEQ(SP=69-94%GCD=1-6%ISR=92-9D%TI=I%II=I%SS=S%TS=0)
 OPS(O1=M5B4NW2NNT00NNS%O2=M5B4NW2NNT00NNS%O3=M5B4NW2NNT00%O4=M5B4NW2NNT00NNS%O5=M5B4NW2NNT00NNS%O6=M5B4NNT00NNS)
 WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
@@ -76525,7 +76661,7 @@ IE(DFI=S%T=7B-85%TG=80%CD=Z)
 # Compumaster WT-3000 running Windows CE
 Fingerprint Microsoft Windows CE 3.0
 Class Microsoft | Windows | PocketPC/CE | PDA
-CPE cpe:/o:microsoft:windows_ce auto
+CPE cpe:/o:microsoft:windows_ce:3.0 auto
 SEQ(SP=7-35%GCD=1-6%ISR=4B-55%TI=BI%II=BI%SS=S%TS=0)
 OPS(O1=M5B4NW0NNT00NNS%O2=M5B4NW0NNT00NNS%O3=M5B4NW0NNT00%O4=M5B4NW0NNT00NNS%O5=M5B4NW0NNT00NNS%O6=M5B4NNT00NNS)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
@@ -76562,7 +76698,7 @@ IE(DFI=S%T=7B-85%TG=80%CD=Z)
 # Symbol, Mobile computer used in warehouse environments, Windows CE 5.0
 Fingerprint Datalogic Kyman barcode scanner (Windows CE 5.0)
 Class Microsoft | Windows | PocketPC/CE | specialized
-CPE cpe:/o:microsoft:windows_ce auto
+CPE cpe:/o:microsoft:windows_ce:5.0 auto
 Class Datalogic | embedded || specialized
 CPE cpe:/h:datalogic:kyman
 SEQ(SP=74-94%GCD=1-6%ISR=93-9D%TI=I%CI=I%II=I%SS=S%TS=0)
@@ -76583,7 +76719,7 @@ IE(DFI=S%T=7B-85%TG=80%CD=Z)
 # direct IP link via browser returns: MSN TV rm4100
 Fingerprint Microsoft Windows CE 5.0 (ARM)
 Class Microsoft | Windows | PocketPC/CE | specialized
-CPE cpe:/o:microsoft:windows_ce auto
+CPE cpe:/o:microsoft:windows_ce:5.0 auto
 SEQ(SP=43-81%GCD=1-6%ISR=92-9C%TI=I%CI=I%II=I%SS=O%TS=0)
 OPS(O1=M5B4NW0NNT00NNS%O2=M5B4NW0NNT00NNS%O3=M5B4NW0NNT00%O4=M5B4NW0NNT00NNS%O5=%O6=)
 WIN(W1=832C%W2=8340%W3=8200%W4=81D0%W5=0%W6=0)
@@ -76601,7 +76737,7 @@ IE(DFI=S%T=7B-85%TG=80%CD=Z)
 # Microsoft-WinCE/6.00
 Fingerprint Microsoft Windows CE 6.0
 Class Microsoft | Windows | PocketPC/CE | specialized
-CPE cpe:/o:microsoft:windows_ce auto
+CPE cpe:/o:microsoft:windows_ce:6.0 auto
 SEQ(SP=78-82%GCD=1-6%ISR=92-9C%TI=I%II=I%SS=S%TS=0)
 OPS(O1=M5B4NW0NNT00NNS%O2=M5B4NW0NNT00NNS%O3=M5B4NW0NNT00%O4=M5B4NW0NNT00NNS%O5=M5B4NW0NNT00NNS%O6=M5B4NNT00NNS)
 WIN(W1=832C%W2=8340%W3=8200%W4=81D0%W5=81D0%W6=805C)
@@ -76619,7 +76755,7 @@ IE(DFI=S%T=7B-85%TG=80%CD=Z)
 # Windows CE 5 Professional on a motorola WT4090 mobile computer with a barcode scanner.
 Fingerprint Motorola WT4090 mobile computer (Windows CE 5)
 Class Microsoft | Windows | PocketPC/CE | specialized
-CPE cpe:/o:microsoft:windows_ce auto
+CPE cpe:/o:microsoft:windows_ce:5 auto
 SEQ(SP=42-9C%GCD=1-6%ISR=8B-9B%TI=I%TS=0)
 OPS(O1=M570NW0NNT00NNS%O2=M570NW0NNT00NNS%O3=M570NW0NNT00%O4=M570NW0NNT00NNS%O5=M570NW0NNT00NNS%O6=M570NNT00NNS)
 WIN(W1=8280%W2=8280%W3=8200%W4=81D0%W5=81D0%W6=805C)
@@ -76655,7 +76791,7 @@ IE(DFI=S%T=1C-26%TG=20%CD=Z)
 # The device is a real time controller with Windows CE Net 4.2 Core, Phoenix Contact, ILC 350 PN
 Fingerprint Phoenix Contact ILC 350 PN control system (Windows CE 4.2)
 Class Microsoft | Windows | PocketPC/CE | specialized
-CPE cpe:/o:microsoft:windows_ce auto
+CPE cpe:/o:microsoft:windows_ce:4.2 auto
 SEQ(SP=79-8B%GCD=1-6%ISR=97-A1%TI=I%CI=I%II=I%SS=S%TS=U)
 OPS(O1=M5B4NNS%O2=M5B4NNS%O3=M5B4%O4=M5B4NNS%O5=M5B4NNS%O6=M5B4NNS)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
@@ -76670,6 +76806,26 @@ T7(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%RD=0)
 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)
 
+# ILC 350 PN, Win CE NET 4.2 Core
+Fingerprint Phoenix Contact ILC 350 PN control system (Windows CE 4.2)
+Class Microsoft | Windows | PocketPC/CE | specialized
+CPE cpe:/o:microsoft:windows_ce:4.2 auto
+Class Phoenix Contact | embedded || specialized
+CPE cpe:/h:phoenix_contact:ilc_350_pn
+SEQ(SP=7E-88%GCD=1-6%ISR=98-A2%TI=I%CI=I%II=I%SS=S%TS=U)
+OPS(O1=M5B4NNS%O2=M5B4NNS%O3=M5B4%O4=M5B4NNS%O5=M5B4NNS%O6=)
+WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=0)
+ECN(R=Y%DF=N%T=7B-85%TG=80%W=0%O=%CC=N%Q=)
+T1(R=Y%DF=Y%T=7B-85%TG=80%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=O%F=AR%O=%RD=0%Q=)
+T4(R=Y%DF=N%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=7B-85%TG=80%W=0%S=A%A=O%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+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)
+
 # Microsoft Windows CE .NET 4.20 running on a Symbol MC9060-G (XScale PXA255 400 MHz)
 # This is some sort of specialized mobile computer for data entry, etc.
 Fingerprint Symbol MC9060-G mobile computer (runs Microsoft Windows CE .NET 4.20)
@@ -76694,7 +76850,7 @@ IE(DFI=S%T=7C-86%TG=80%CD=Z)
 # Symbol Technologies industrial scanner, WinCE 5.0
 Fingerprint Symbol Technologies handheld scanner (Windows CE 5.0)
 Class Microsoft | Windows | PocketPC/CE | specialized
-CPE cpe:/o:microsoft:windows_ce auto
+CPE cpe:/o:microsoft:windows_ce:5.0 auto
 SEQ(SP=87-93%GCD=1-6%ISR=90-9A%TI=I%CI=I%II=I%SS=S%TS=0)
 OPS(O1=M56CNW0NNT00NNS%O2=M56CNW0NNT00NNS%O3=M56CNW0NNT00%O4=M56CNW0NNT00NNS%O5=M56CNW0NNT00NNS%O6=M56CNNT00NNS)
 WIN(W1=8220%W2=8220%W3=8200%W4=81D0%W5=81D0%W6=805C)
@@ -84079,7 +84235,7 @@ 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)
 
-#
+# 
 Fingerprint NetApp FAS2040 NAS device (Data ONTAP)
 Class NetApp | Data ONTAP | 7.X | storage-misc
 CPE cpe:/o:netapp:data_ontap:7 auto
@@ -84135,9 +84291,10 @@ 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=FA-104%TG=FF%CD=S)
 
 # NetApp Release 8.0.1P1D3 7-Mode: Mon Feb 28 22:53:14 PST 2011
-Fingerprint NetApp Data ONTAP 8.0.1P1D3
+# 8.0.2P4
+Fingerprint NetApp Data ONTAP 8.0.1 - 8.0.2
 Class NetApp | Data ONTAP | 8.X | storage-misc
-CPE cpe:/o:netapp:data_ontap:8.0.1p1d3 auto
+CPE cpe:/o:netapp:data_ontap:8.0
 SEQ(SP=FC-108%GCD=1-6%ISR=104-112%TI=BI%CI=BI%II=BI%SS=S%TS=7)
 OPS(O1=M5B4NNSNW0NNT11%O2=M5B4NNSNW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NNSNW0NNT11%O5=M5B4NNSNW0NNT11%O6=M5B4NNSNNT11)
 WIN(W1=2238%W2=20D0%W3=2080%W4=2000%W5=2180%W6=2017)
@@ -84931,9 +85088,10 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 
 # Netgear Prosafe GS748T-500EUS
 # GS716Tv3 ProSafe 16-port Gigabit Ethernet Smart Switch, 6.3.1.11, B1.0.0.4
-Fingerprint Netgear GS700T-series switch
+# XS716T
+Fingerprint Netgear GS700T- or XS700T-series switch
 Class Netgear | embedded || switch
-SEQ(SP=101-10B%GCD=1-6%ISR=103-10D%TI=Z%CI=Z%II=I%TS=7)
+SEQ(SP=FB-10B%GCD=1-6%ISR=103-10F%TI=Z%CI=Z%II=I%TS=7)
 OPS(O1=M5B4ST11NW0%O2=M5B4ST11NW0%O3=M5B4NNT11NW0%O4=M5B4ST11NW0%O5=M5B4ST11NW0%O6=M5B4ST11)
 WIN(W1=B50%W2=B50%W3=B50%W4=B50%W5=B50%W6=B50)
 ECN(R=Y%DF=Y%T=3B-45%TG=40%W=B68%O=M5B4NNSNW0%CC=Y%Q=)
@@ -86821,6 +86979,42 @@ T7(R=N)
 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)
 
+# ES8473 MFP
+Fingerprint Oki ES8473 printer
+Class Oki | embedded || printer
+CPE cpe:/h:oki:es8473 auto
+SEQ(SP=97-A1%GCD=1-6%ISR=94-9E%TI=I%CI=I%II=I%SS=S%TS=U)
+OPS(O1=NNM5A0SNW0%O2=NNM5A0SNW0%O3=M5A0NW0%O4=NNM5A0SNW0%O5=NNM5A0SNW0%O6=NNM5A0S)
+WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=8000%O=NNM5A0SNW0%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=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=Z%F=R%O=%RD=0%Q=)
+U1(DF=N%T=3B-45%TG=40%IPL=138%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=S%T=3B-45%TG=40%CD=Z)
+
+# MC342
+Fingerprint Oki MC342 printer
+Class Oki | embedded || printer
+CPE cpe:/h:oki:mc342 auto
+SEQ(SP=F9-103%GCD=1-6%ISR=FD-107%TI=I%CI=I%II=I%SS=S%TS=6)
+OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
+WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=8000%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=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=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)
+
 # OKI Network Printer OKI-C5600-340179
 # OKI printer, model C5650
 # OKI ES8460 MFP CU Version 04.70  PU Version 00.06.07  SIP Version 04.23
@@ -86862,6 +87056,24 @@ T7(R=Y%DF=N%T=77-81%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=77-81%TG=80%IPL=240%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=82A3%RUD=I)
 IE(DFI=N%T=77-81%TG=80%CD=Z)
 
+# Omron CJ2M
+Fingerprint Omron CJ2M PLC
+Class Omron | embedded || specialized
+CPE cpe:/h:omron:cj2m
+SEQ(SP=F-19%GCD=7D00|FA00|17700|1F400|27100%ISR=97-A1%TI=I%CI=I%II=I%SS=S%TS=U)
+OPS(O1=M400%O2=M400%O3=M400%O4=M400%O5=M400%O6=M400)
+WIN(W1=1000%W2=1000%W3=1000%W4=1000%W5=1000%W6=1000)
+ECN(R=Y%DF=N%T=19-23%TG=20%W=1000%O=M400%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=1000%S=O%A=O%F=A%O=%RD=0%Q=)
+T4(R=Y%DF=N%T=19-23%TG=20%W=1000%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=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=G%RUD=G)
+IE(DFI=S%T=FA-104%TG=FF%CD=S)
+
 # OMRON CP1W-CIF41
 Fingerprint Omron CP1W-CIF41 PLC Ethernet Module
 Class Omron | embedded || specialized
@@ -86896,6 +87108,24 @@ 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=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=G%RUD=G)
 IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
+# Omron NE1A Safety PLC.
+Fingerprint Omron NE1A Safety PLC
+Class Omron | embedded || specialized
+CPE cpe:/h:omron:ne1a
+SEQ(SP=F-19%GCD=7D00|FA00|17700|1F400|27100%ISR=97-A1%TI=I%CI=I%II=I%SS=S%TS=U)
+OPS(O1=M400%O2=M400%O3=M400%O4=M400%O5=M400%O6=M400)
+WIN(W1=1800%W2=1800%W3=1800%W4=1800%W5=1800%W6=1800)
+ECN(R=Y%DF=N%T=19-23%TG=20%W=1800%O=M400%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=1800%S=O%A=O%F=A%O=%RD=0%Q=)
+T4(R=Y%DF=N%T=19-23%TG=20%W=1800%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=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=G%RUD=G)
+IE(DFI=S%T=FA-104%TG=FF%CD=S)
+
 # OMRON OPEN NETWORK CONTROLLER ITNC-EIS01. Welcome to QNX 4.25 Copyright (c) QNX Software Systems Ltd. 1982,1998
 Fingerprint Omron ITNV-EIS01 automation controller (QNX 4.25)
 Class Omron | QNX | 4.X | specialized
@@ -89169,6 +89399,25 @@ 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=N%T=3B-45%TG=40%CD=S)
 
+# WV-SP300, WV-SF330
+Fingerprint Panasonic WV-SP300 or WV-SF330 webcam
+Class Panasonic | embedded || webcam
+CPE cpe:/h:panasonic:wv-sp300
+CPE cpe:/h:panasonic:wv-sf330
+SEQ(SP=CD-D7%GCD=1-6%ISR=D9-E3%II=I%TS=U)
+OPS(O1=M5B4%O2=M5B4%O3=M5B4%O4=M5B4%O5=M5B4%O6=M5B4)
+WIN(W1=1000%W2=1000%W3=1000%W4=1000%W5=1000%W6=1000)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=1000%O=M5B4%CC=N%Q=U)
+T1(R=Y%DF=N%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=U)
+T2(R=N)
+T3(R=N)
+T4(R=N)
+T5(R=Y%DF=N%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=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
 # 'papouch.com' Ethernet IP Thermometer of model type 'TME'
 Fingerprint Papouch TME Ethernet thermometer
 Class Papouch | embedded || specialized
@@ -91501,6 +91750,24 @@ 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=4210%RIPCK=Z%RUCK=0%RUD=G)
 IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
+# 5.23
+Fingerprint RISCOS Ltd RISC OS 5.23
+Class RISCOS Ltd | RISC OS | 5.X | general purpose
+CPE cpe:/o:riscosltd:risc_os:5.23 auto
+SEQ(SP=2A-4A%GCD=1-6%ISR=8A-94%TI=I%CI=I%II=I%SS=S%TS=1)
+OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
+WIN(W1=43E0%W2=4110%W3=423C%W4=4180%W5=4180%W6=403D)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=4470%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=403D%S=O%A=S+%F=AS%O=M5B4NW0NNT11%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=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=4210%RIPCK=Z%RUCK=0%RUD=G)
+IE(DFI=S%T=FA-104%TG=FF%CD=S)
+
 # Acorn RiscPC running Risc OS Select 6.20 (kernel 10.62) softloaded over Risc OS Adjust 4.39
 Fingerprint RISCOS Ltd RISC OS 6.20
 Class RISCOS Ltd | RISC OS | 6.X | general purpose
@@ -91883,6 +92150,26 @@ 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=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
+# Ruijie (no other details, but other than having a more common MSS it is identical to the other with this name. --Ed.)
+Fingerprint Ruijie N18010 switch (Linux 2.6.32)
+Class Ruijie | embedded || switch
+CPE cpe:/h:ruijie:n18010 auto
+Class Linux | Linux | 2.6.X | switch
+CPE cpe:/o:linux:linux_kernel:2.6.32 auto
+SEQ(SP=F9-103%GCD=1-6%ISR=103-10D%CI=I%II=I%TS=7)
+OPS(O1=M5B4ST11NW0%O2=M5B4ST11NW0%O3=M5B4NNT11NW0%O4=M5B4ST11NW0%O5=M5B4ST11NW0%O6=M5B4ST11)
+WIN(W1=16A0%W2=16A0%W3=16A0%W4=16A0%W5=16A0%W6=16A0)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=16D0%O=M5B4NNSNW0%CC=Y%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=16A0%S=O%A=S+%F=AS%O=M5B4ST11NW0%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=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
 # DSL router SAGEM F@st 3302, unknown firmware
 Fingerprint Sagem F@st 3302 DSL router
 Class Sagem Communication | embedded || broadband router
@@ -94366,6 +94653,24 @@ T7(R=Y%DF=N%T=FA-104%TG=FF%W=FAF0%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)
 
+# Smartlink DIGISOL DG-HR3400
+Fingerprint Smartlink DIGISOL DG-HR3400 WAP
+Class Smartlink | embedded || WAP
+CPE cpe:/h:smartlink:digisol_dg-hr3400 auto
+SEQ(SP=98-A2%GCD=1-6%ISR=98-A2%TI=I%CI=I%II=RI%TS=1)
+OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
+WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
+ECN(R=Y%DF=N%T=7B-85%TG=80%W=2000%O=M5B4NW0%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=Y%DF=N%T=7B-85%TG=80%W=2000%S=O%A=S+%F=AS%O=M5B4NW0NNT11NNLLLLLLLLLL%RD=0%Q=)
+T4(R=Y%DF=N%T=7B-85%TG=80%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=7B-85%TG=80%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=7B-85%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+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=S)
+
 # SMC7004ABR
 Fingerprint SMC SMB7004ABR WAP
 Class SMC | embedded || broadband router
@@ -97320,6 +97625,24 @@ T7(R=N)
 U1(DF=Y%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)
 
+# 5.10 Generic_147148-26 i86pc i386 i86pc
+Fingerprint Sun Solaris 10
+Class Sun | SunOS | 10 | general purpose
+CPE cpe:/o:sun:sunos:10 auto
+SEQ(SP=95-9F%GCD=1-6%ISR=9F-A9%TI=I%II=I%SS=S%TS=7)
+OPS(O1=NNT11M529NW0NNS%O2=NNT11M529NW0NNS%O3=NNT11M529NW0%O4=NNT11M529NW0NNS%O5=NNT11M529NW0NNS%O6=NNT11M529NNS)
+WIN(W1=C24E%W2=C24E%W3=C1CC%W4=C068%W5=C068%W6=C0B7)
+ECN(R=Y%DF=Y%T=37-41%TG=40%W=C416%O=M529NW0NNS%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=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=Y%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 4.1.3 sun4m on SuperSPARC
 Fingerprint Sun SunOS 4.1.3 (SPARC)
 Class Sun | SunOS | 4.X | general purpose
@@ -98267,6 +98590,23 @@ 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)
 
+# Mitsubishi VFD
+Fingerprint Mitsubishi VFD (Texas Instruments chipset)
+Class Texas Instruments | embedded || specialized
+SEQ(SP=0-5%GCD=2EE00|5DC00|8CA00|BB800|EA600%ISR=A2-AC%TI=I%CI=I%II=RI%SS=O%TS=U)
+OPS(O1=M5B4%O2=M578%O3=M280%O4=M5B4%O5=M218%O6=M109)
+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=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=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+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=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=FA-104%TG=FF%CD=S)
+
 # Thales nCipher NetHSM 500 running firmware version 2.50.16
 Fingerprint Thales nCipher NetHSM 500 hardware security module
 Class Thales | embedded || security-misc
@@ -101299,6 +101639,24 @@ T7(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=Z%A=S+%F=R%RD=0)
 U1(DF=N%T=3B-45%TG=40%IPL=138%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=Z)
 
+# 7.X
+Fingerprint VxWorks 7
+Class Wind River | VxWorks | 7.X | general purpose
+CPE cpe:/o:windriver:vxworks:7 auto
+SEQ(SP=102-10C%GCD=1-6%ISR=106-110%TI=RD|RI%CI=BI%II=BI%SS=S%TS=U)
+OPS(O1=M5B4NW0%O2=M5B4NW0%O3=M5B4NW0%O4=M5B4NW0%O5=M5B4NW0%O6=M5B4)
+WIN(W1=EA60%W2=EA60%W3=EA60%W4=EA60%W5=EA60%W6=EA60)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=EA60%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=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=Z%F=R%O=%RD=0%Q=)
+U1(DF=N%T=3B-45%TG=40%IPL=138%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
+IE(DFI=S%T=3B-45%TG=40%CD=Z)
+
 # Dick Smith Electronics XH1169 USB & 4x LAN ADSL Router
 # Vendor: Ambit. modem-router provided by neuf telecom in france known as neufbox trio3c
 # Netgear WGR614v6. VxWorks: http://forum.openwrt.org/viewtopic.php?id=3843 http://www.dd-wrt.com/phpBB2/viewtopic.php?t=44439&highlight=wgr614v6

From 0afdee18fe2e9227096ba0e33baa043cca5c8919 Mon Sep 17 00:00:00 2001
From: henri <henri@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Thu, 31 Aug 2017 17:57:40 +0000
Subject: [PATCH 2/3] nsock: minor style fix

---
 nsock/src/nsock_log.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nsock/src/nsock_log.c b/nsock/src/nsock_log.c
index 1b095a2d38..d01b10ca68 100644
--- a/nsock/src/nsock_log.c
+++ b/nsock/src/nsock_log.c
@@ -76,9 +76,9 @@ nsock_logger_t      NsockLogger   = nsock_stderr_logger;
 
 void nsock_set_log_function(nsock_logger_t logger) {
   if (logger != NULL)
-      NsockLogger = logger;
+    NsockLogger = logger;
   else
-      NsockLogger = nsock_stderr_logger;
+    NsockLogger = nsock_stderr_logger;
 
   nsock_log_debug("Registered external logging function: %p", NsockLogger);
 }

From 005167d25bb76890c930bee3e9fe30ec00f69915 Mon Sep 17 00:00:00 2001
From: rewanth <rewanth@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Fri, 1 Sep 2017 04:45:43 +0000
Subject: [PATCH 3/3] Adds unmarshall_lptstr function to msrpctypes.lua. Closes
 #991.

---
 nselib/msrpctypes.lua | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/nselib/msrpctypes.lua b/nselib/msrpctypes.lua
index 2ae2f64d3b..a720ef04ec 100644
--- a/nselib/msrpctypes.lua
+++ b/nselib/msrpctypes.lua
@@ -4523,6 +4523,26 @@ function unmarshall_SERVICE_STATUS(data, pos)
 end
 
 
+--- Unmarshalls a null-terminated Unicode string (LPTSTR datatype)
+-- @param w_str The data being processed
+-- @param startpos  The current position within the data
+-- @return The new position
+-- @return The unmarshalled string
+function unmarshall_lptstr(w_str, startpos)
+
+  local _
+  local endpos = startpos
+
+  repeat
+    _, endpos = w_str:find("\0\0", endpos, true)
+    if not endpos then
+      return
+    end
+  until endpos % 2 == 0
+
+  return endpos + 1, w_str:sub(startpos, endpos)
+
+end
 
 local atsvc_DaysOfMonth =
 {