From 230ca4f717fe44aa0505729b1e28b6d5b212a7c8 Mon Sep 17 00:00:00 2001
From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Mon, 4 Dec 2017 18:06:21 +0000
Subject: [PATCH] Process 23 os fingerprint submissions

---
 nmap-os-db | 178 +++++++++++++++++++++++++----------------------------
 1 file changed, 84 insertions(+), 94 deletions(-)

diff --git a/nmap-os-db b/nmap-os-db
index d561001a2..3135f1e16 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -11633,24 +11633,6 @@ T7(R=Y%DF=N%T=6F%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=6F%TG=80%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=164B%RUD=G)
 IE(DFI=N%T=6F%TG=80%CD=Z)
 
-# MFC-J4510DW (VxWorks --ed.)
-Fingerprint Brother MFC-J4510DW printer
-Class Brother | embedded || printer
-CPE cpe:/h:brother:mfc-j4510dw auto
-SEQ(SP=F6-104%GCD=1-6%ISR=103-113%TI=I%CI=I|RI%II=I|RI%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%RD=0)
-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)
-
 # Brother MFC-J615W
 # Brother MFC-9325CW printer
 Fingerprint Brother MFC-J615W, MFC-9325CW, or HL-5370DW printer
@@ -12508,10 +12490,11 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 
 # Canon iRC2880i printer
 # canon ir c2380
-Fingerprint Canon imageRUNNER C2380 or C2880i printer
+Fingerprint Canon imageRUNNER C2380 or C2880i or Xerox Phaser 8860MFP printer
 Class Canon | embedded || printer
 CPE cpe:/h:canon:imagerunner_c2380
 CPE cpe:/h:canon:imagerunner_c2880i
+CPE cpe:/h:xerox:phaser_8860mfp
 SEQ(SP=FB-105%GCD=1-6%ISR=105-10F%TI=I%II=I%SS=O|S%TS=6)
 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)
@@ -12754,36 +12737,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=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=Z)
 
-# Canon MP980 printer/copier
-# Cannon Mg6100 printer
-# Canon MX410 series Firmware Version: 1.000
-# Cannon Pixma 882
-# Printer Canon Pixma MP495
-# Pixma MG6450 printer
-# Canon MX920 series, Firmware Version: 2.010,
-Fingerprint Canon PIXMA MS410, MP495, MP980, MX870, MX882, MX920, MG6100, or MG6450 printer
-Class Canon | embedded || printer
-CPE cpe:/h:canon:pixma_ms410
-CPE cpe:/h:canon:pixma_mp495
-CPE cpe:/h:canon:pixma_mp980
-CPE cpe:/h:canon:pixma_mx870
-CPE cpe:/h:canon:pixma_mx882
-CPE cpe:/h:canon:pixma_mx920
-CPE cpe:/h:canon:pixma_mg6100
-SEQ(SP=0-23%GCD=>1000000%ISR=DD-115%TI=RD%CI=RD%II=RI%TS=U)
-OPS(O1=M5B4%O2=M578%O3=M280%O4=M5B4%O5=M218%O6=M109)
-WIN(W1=2D00%W2=2D00%W3=2D00%W4=2D00%W5=2D00%W6=2D00)
-ECN(R=Y%DF=N%T=3B-45%TG=40%W=2D00%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=2D00%S=O%A=S+%F=AS%O=M109%RD=0%Q=)
-T4(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=S%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=S%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=N%T=3B-45%TG=40%CD=S)
-
 # Canon Pixma MX860 network printer/scanner/fax.
 # Canon Pixma MX870.
 # Canon Pixma MP-495
@@ -12850,6 +12803,30 @@ 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=N%T=3B-45%TG=40%CD=Z)
 
+# Canon MP980 printer/copier
+# Cannon Mg6100 printer
+# Canon MX410 series Firmware Version: 1.000
+# Cannon Pixma 882
+# Printer Canon Pixma MP495
+# Pixma MG6450 printer
+# Canon MX920 series, Firmware Version: 2.010,
+# Keep getting corrections with more and more models. Indistinguishable.
+Fingerprint Canon PIXMA printer
+Class Canon | embedded || printer
+SEQ(SP=0-23%GCD=>1000000%ISR=DD-115%TI=RD%CI=RD%II=RI%TS=U)
+OPS(O1=M5B4%O2=M578%O3=M280%O4=M5B4%O5=M218%O6=M109)
+WIN(W1=2D00%W2=2D00%W3=2D00%W4=2D00%W5=2D00%W6=2D00)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=2D00%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=2D00%S=O%A=S+%F=AS%O=M109%RD=0%Q=)
+T4(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=S%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=S%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=N%T=3B-45%TG=40%CD=S)
+
 # MX870, but same as the one with *all* the Pixma printers. Differs only in MSS
 Fingerprint Canon Pixma printer
 Class Canon | embedded || printer
@@ -19199,9 +19176,12 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 
 # Possibly a bad print, because no response to open TCP port. Compare Crestron XPanel control system print elsewhere.
 # MPC-M5 Cntrl Eng [v4.001.1039 (Oct 22 2009), #0090B136]
-Fingerprint Crestron MPC-M5 AV controller
+# Wago 750-852
+Fingerprint Crestron MPC-M5 AV controller or Wago Kontakttechnik 750-852 PLC
 Class Crestron | embedded || media device
 CPE cpe:/h:crestron:mpc-m5
+Class Wago Kontakttechnik | embedded || specialized
+CPE cpe:/h:wago_kontakttechnik:750-852
 SEQ(CI=I%II=I)
 OPS(R=N)
 WIN(R=N)
@@ -25644,6 +25624,27 @@ 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)
 
+# Playstation 4
+# FreeBSD 10.2-RELEASE-p24 FreeBSD 10.2-RELEASE-p24 #0: Sat Oct 22 01:03:53 UTC 2016 amd64
+Fingerprint Sony Playstation 4 or FreeBSD 10.2-RELEASE
+Class FreeBSD | FreeBSD | 10.X | general purpose
+CPE cpe:/o:freebsd:freebsd:10.2 auto
+Class Sony | embedded || game console
+CPE cpe:/h:sony:playstation_4
+SEQ(SP=FC-106%GCD=1-6%ISR=FF-110%TI=RD%CI=RD%II=RI%TS=21|22)
+OPS(O1=M5B4NW6ST11%O2=M578NW6ST11%O3=M280NW6NNT11%O4=M5B4NW6ST11%O5=M218NW6ST11%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=M5B4NW6SLL%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=M109NW6ST11%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)
+
 # FreeBSD 10.2-RELEASE-p7 FreeBSD 10.2-RELEASE-p7 #0 r290499M: root@dev.nas4free.org:/usr/obj/nas4free/usr/src/sys/NAS4FREE-amd64  amd64
 Fingerprint NAS4Free (FreeBSD 10.2-RELEASE)
 Class FreeBSD | FreeBSD | 10.X | storage-misc
@@ -28534,26 +28535,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=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
-# Playstation 4
-Fingerprint Sony Playstation 4
-Class FreeBSD | FreeBSD || game console
-CPE cpe:/o:freebsd:freebsd auto
-Class Sony | embedded || game console
-CPE cpe:/h:sony:playstation_4
-SEQ(SP=FC-106%GCD=1-6%ISR=FF-110%TI=RD%CI=RD%II=RI%TS=21|22)
-OPS(O1=M5B4NW6ST11%O2=M578NW6ST11%O3=M280NW6NNT11%O4=M5B4NW6ST11%O5=M218NW6ST11%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=M5B4NW6SLL%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=M109NW6ST11%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)
-
 # Freecom Network Drive
 Fingerprint Freecom Network Drive NAS device
 Class Freecom | embedded || storage-misc
@@ -59883,11 +59864,14 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 
 # Huawei HG8245T GPON ONU
 # Linux version 2.6.21.7-hrt1 (wangqian@suse-ssmp-server) (gcc version 4.1.2 (Wind River Linux Sourcery G++ 4.1-84)) #28 Thu Sep 27 11:06:55 HKT 2012
-Fingerprint Huawei HG8245T GPON ONU WAP (Linux 2.6.21)
+# Sagemcom F@st 4350
+Fingerprint Huawei HG8245T GPON ONU WAP (Linux 2.6.21) or Sagemcom F@st 4350 WAP
 Class Linux | Linux | 2.6.X | WAP
 CPE cpe:/o:linux:linux_kernel:2.6.21 auto
 Class Huawei | embedded || WAP
 CPE cpe:/h:huawei:hg8245t
+Class Sagemcom | embedded || WAP
+CPE cpe:/h:sagemcom:fast_4350
 SEQ(SP=C3-CD%GCD=1-6%ISR=C8-D8%TI=Z%CI=Z%II=I%TS=U)
 OPS(O1=M5B4NNSNW2%O2=M5B4NNSNW2%O3=M5B4NW2%O4=M5B4NNSNW2%O5=M5B4NNSNW2%O6=M5B4NNS)
 WIN(W1=16D0%W2=16D0%W3=16D0%W4=16D0%W5=16D0%W6=16D0)
@@ -63691,7 +63675,8 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 # Linux 4.4.0-12-generic #28-Ubuntu SMP Wed Mar 9 00:33:55 UTC 2016 x86_64 x86_64 x86_64 GNU/Linux
 # Linux 4.6.0-0.bpo.1-686-pae #1 SMP Debian 4.6.4-1~bpo8+1 (2016-08-11) i686 GNU/Linux
 # Linux 4.8.3-x86_64-linode76 #1 SMP
-Fingerprint Linux 3.2 - 4.8
+# Linux 4.9
+Fingerprint Linux 3.2 - 4.9
 Class Linux | Linux | 3.X | general purpose
 CPE cpe:/o:linux:linux_kernel:3 auto
 Class Linux | Linux | 4.X | general purpose
@@ -65691,10 +65676,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 4.4.13-v7+ #894 SMP Mon Jun 13 13:13:27 BST 2016 armv7l GNU/Linux
+# Linux 4.4.21-v7+ #911 SMP Thu Sep 15 14:22:38 BST 2016 armv7l GNU/Linux
 Fingerprint Linux 4.4
 Class Linux | Linux | 4.X | general purpose
 CPE cpe:/o:linux:linux_kernel:4.4 auto
-SEQ(SP=F4-FE%GCD=1-6%ISR=106-110%TI=Z%CI=I%II=I%TS=7)
+SEQ(SP=F4-FE%GCD=1-6%ISR=F0-110%TI=Z%CI=I|RI%II=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=Y%Q=)
@@ -88562,27 +88548,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)
 
-# OpenBSD 5.0 GENERIC#43 i386
-# OpenBSD 5.0 GENERIC.MP#59 i386
-# OpenBSD 5.3 GENERIC#53 amd64
-# OpenBSD 5.4 GENERIC.MP#41 amd64
-Fingerprint OpenBSD 5.0 - 5.4
-Class OpenBSD | OpenBSD | 5.X | general purpose
-CPE cpe:/o:openbsd:openbsd:5 auto
-SEQ(SP=F5-10D%GCD=1-6%ISR=103-10F%TI=RD%II=RI%TS=20|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)
-T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0)
-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%RD=0)
-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=S%T=FA-104%TG=FF%CD=S)
-
 # OpenBSD 5.0 GENERIC#43 i386
 # OpenBSD 5.5 GENERIC#264 i386
 # OpenBSD 5.7 GENERIC.MP#0 amd64
@@ -88604,6 +88569,30 @@ 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)
 
+# OpenBSD 5.0 GENERIC#43 i386
+# OpenBSD 5.0 GENERIC.MP#59 i386
+# OpenBSD 5.3 GENERIC#53 amd64
+# OpenBSD 5.4 GENERIC.MP#41 amd64
+# OpenBSD 6.0 amd64
+Fingerprint OpenBSD 5.0 - 6.0
+Class OpenBSD | OpenBSD | 5.X | general purpose
+CPE cpe:/o:openbsd:openbsd:5 auto
+Class OpenBSD | OpenBSD | 6.X | general purpose
+CPE cpe:/o:openbsd:openbsd:6 auto
+SEQ(SP=F5-10D%GCD=1-6%ISR=103-10F%TI=RD%II=RI%TS=20|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)
+T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0)
+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%RD=0)
+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=S%T=FA-104%TG=FF%CD=S)
+
 # OpenBSD 5.1-stable (i386)
 Fingerprint OpenBSD 5.1
 Class OpenBSD | OpenBSD | 5.X | general purpose
@@ -102150,6 +102139,7 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 # Brother DCP-J4110DW
 # Brother HL-3170CDW
 # HP LaserJet 400 colorMFP M475dn (Firmware Version 20120808)
+# MFC-J4510DW (VxWorks --ed.)
 Fingerprint VxWorks
 Class Wind River | VxWorks || general purpose
 CPE cpe:/o:windriver:vxworks auto