From 233d3a36919c4b0e49f72f6db845e4fd0e838f82 Mon Sep 17 00:00:00 2001
From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Thu, 18 Jun 2020 16:57:07 +0000
Subject: [PATCH] Remove fingerprints with too little detail that match too
 many observations

---
 nmap-os-db | 491 ++++++++++++-----------------------------------------
 1 file changed, 107 insertions(+), 384 deletions(-)

diff --git a/nmap-os-db b/nmap-os-db
index 99970668e..4a907ef1f 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -3604,9 +3604,13 @@ 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)
 
 # iOS 11.0 beta
-Fingerprint Apple iOS 11.0
+# Darwin Kernel Version 18.6.0: Thu Apr 25 23:16:27 PDT 2019; root:xnu-4903.261.4~2/RELEASE_X86_64 x86_64
+# Apple 10.14.6 macOS Mojave(  Darwin Kernel version 18.7.0)
+Fingerprint Apple iOS 11.0 or macOS 10.14 (Mojave) (Darwin 17.0.0 - 18.7.0)
 Class Apple | iOS | 11.X | phone
-CPE cpe:/o:apple:iphone_os:11.0 auto
+CPE cpe:/o:apple:iphone_os:11 auto
+Class Apple | macOS | 10.14.X | general purpose
+CPE cpe:/o:apple:mac_os_x:10.14 auto
 SEQ(SP=100-10A%GCD=1-6%ISR=108-112%TI=Z%CI=RD%II=RI%TS=1|A|B)
 OPS(O1=M5B4NW6NNT11SLL%O2=M5B4NW6NNT11SLL%O3=M5B4NW6NNT11%O4=M5B4NW6NNT11SLL%O5=M5B4NW6NNT11SLL%O6=M5B4NNT11SLL)
 WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
@@ -3995,8 +3999,6 @@ IE(DFI=S%T=3B-45%TG=40%CD=S)
 Fingerprint Apple iOS 5.1.1
 Class Apple | iOS | 5.X | media device
 CPE cpe:/o:apple:iphone_os:5.1.1 auto
-Class Apple | iOS | 5.X | phone
-CPE cpe:/o:apple:iphone_os:5.1.1 auto
 SEQ(SP=FE-108%GCD=1-6%ISR=104-10E%TI=RD%CI=RI%II=RI%TS=A)
 OPS(O1=M56CNW4NNT11SLL%O2=M56CNW4NNT11SLL%O3=M56CNW4NNT11%O4=M56CNW4NNT11SLL%O5=M56CNW4NNT11SLL%O6=M56CNNT11SLL)
 WIN(W1=FFFF%W2=FFFF%W3=FFFF%W4=FFFF%W5=FFFF%W6=FFFF)
@@ -4593,6 +4595,24 @@ 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)
 
+# iPod touch 2nd generation, (Firmware) Version: 2.2 (5G77a), Model: MB528BT
+Fingerprint Apple iPod touch audio player (iPhone OS 2.2)
+Class Apple | iPhone OS | 2.X | media device
+CPE cpe:/o:apple:iphone_os:2.2 auto
+SEQ(R=N)
+OPS(O1=%O2=%O3=%O4=%O5=%O6=)
+WIN(W1=0%W2=0%W3=0%W4=0%W5=0%W6=0)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=0%O=%CC=N%Q=)
+T1(R=Y%DF=N%T=3B-45%TG=40%S=Z%A=S+%F=AR%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=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=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=0%RUD=G)
+IE(DFI=S%T=3B-45%TG=40%CD=S)
+
 # iPhone model MB500X firmware version 2.0.2 (5C1)
 Fingerprint Apple iPhone mobile phone (iPhone OS 2.0.2)
 Class Apple | iPhone OS | 2.X | phone
@@ -5015,6 +5035,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=G%RIPCK=G%RUCK=0%RUD=G)
 IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
+# Darwin Kernel Version 16.1.0: Thu Oct 13 21:26:57 PDT 2016; root:xnu-3789.21.3~60/RELEASE_X86_64 x86_64
+Fingerprint Apple macOS 10.12.1 (Sierra) (Darwin 16.1.0)
+Class Apple | macOS | 10.12.X | general purpose
+CPE cpe:/o:apple:mac_os_x:10.12 auto
+SEQ(SP=100-10A%GCD=1-6%ISR=106-110%TI=RD%CI=RI%TS=A)
+OPS(O1=M3FD8NW5NNT11SLL%O2=M3FD8NW5NNT11SLL%O3=M3FD8NW5NNT11%O4=M3FD8NW5NNT11SLL%O5=M3FD8NW5NNT11SLL%O6=M3FD8NNT11SLL)
+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=M3FD8NW5SLL%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=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=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=0%RUD=G)
+IE(R=N)
+
 # Darwin Kernel Version 6.8: Wed Sep 10 15:20:55 PDT 2003; root:xnu/xnu-344.49.obj~2/RELEASE_PPC  Power Macintosh powerpc
 # Darwin 6.8 Darwin Kernel Version 6.8: Wed Sep 10 15:20:55 PDT 2003; root:xnu/xnu-344.49.obj~2/RELEASE_PPC  Power Macintosh powerpc
 Fingerprint Apple Mac OS X Server 10.2.8 (Jaguar) (Darwin 6.8, PowerPC)
@@ -7093,24 +7131,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=0%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
-# Darwin Kernel Version 16.1.0: Thu Oct 13 21:26:57 PDT 2016; root:xnu-3789.21.3~60/RELEASE_X86_64 x86_64
-Fingerprint Apple macOS 10.12.1 (Sierra) (Darwin 16.1.0)
-Class Apple | macOS | 10.12.X | general purpose
-CPE cpe:/o:apple:mac_os_x:10.12 auto
-SEQ(SP=100-10A%GCD=1-6%ISR=106-110%TI=RD%CI=RI%TS=A)
-OPS(O1=M3FD8NW5NNT11SLL%O2=M3FD8NW5NNT11SLL%O3=M3FD8NW5NNT11%O4=M3FD8NW5NNT11SLL%O5=M3FD8NW5NNT11SLL%O6=M3FD8NNT11SLL)
-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=M3FD8NW5SLL%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=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=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=0%RUD=G)
-IE(R=N)
-
 # Mac OS Sierra 10.12.5
 Fingerprint Apple macOS 10.12.5 (Sierra)
 Class Apple | macOS | 10.12.X | general purpose
@@ -7465,6 +7485,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=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)
 
+# Darwin 15.2.0 Darwin Kernel Version 15.2.0: Fri Nov 13 19:56:56 PST 2015; root:xnu-3248.20.55~2/RELEASE_X86_64 x86_64
+Fingerprint Apple OS X 10.11.2 (El Capitan) (Darwin 15.2.0)
+Class Apple | OS X | 10.11.X | general purpose
+CPE cpe:/o:apple:mac_os_x:10.11.2 auto
+SEQ(SP=FB-105%GCD=1-6%ISR=FC-106%TI=RD%CI=RI%II=RI%TS=A)
+OPS(O1=M5B4NW5NNT11SLL%O2=M5B4NW5NNT11SLL%O3=M5B4NW5NNT11%O4=M5B4NW5NNT11SLL%O5=M5B4NW5NNT11SLL%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=M5B4NW5SLL%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=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=Y%DF=N%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=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
+IE(DFI=N%T=3B-45%TG=40%CD=S)
+
 # Darwin 15.4.0 Darwin Kernel Version 15.4.0: Fri Feb 26 22:08:05 PST 2016; root:xnu-3248.40.184~3/RELEASE_X86_64 x86_64
 # iOS 10.2.1
 # 10.1.1 (14B100) on iPad
@@ -7491,24 +7529,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=0%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
-# Darwin 15.2.0 Darwin Kernel Version 15.2.0: Fri Nov 13 19:56:56 PST 2015; root:xnu-3248.20.55~2/RELEASE_X86_64 x86_64
-Fingerprint Apple OS X 10.11.2 (El Capitan) (Darwin 15.2.0)
-Class Apple | OS X | 10.11.X | general purpose
-CPE cpe:/o:apple:mac_os_x:10.11.2 auto
-SEQ(SP=FB-105%GCD=1-6%ISR=FC-106%TI=RD%CI=RI%II=RI%TS=A)
-OPS(O1=M5B4NW5NNT11SLL%O2=M5B4NW5NNT11SLL%O3=M5B4NW5NNT11%O4=M5B4NW5NNT11SLL%O5=M5B4NW5NNT11SLL%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=M5B4NW5SLL%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=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=Y%DF=N%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=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=0%RUD=G)
-IE(DFI=N%T=3B-45%TG=40%CD=S)
-
 # Apple | OS X | 10.8.X
 Fingerprint Apple OS X 10.8 (Mountain Lion)
 Class Apple | OS X | 10.8.X | general purpose
@@ -9799,23 +9819,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=G%RUCK=G%RUD=G)
 IE(DFI=N%T=FA-104%TG=FF%CD=S)
 
-# Billion Electric ADSL VoIP Router Modem (Model BiPAC 7402VGP)
-Fingerprint Billion 7402VGP DSL router
-Class Billion | embedded || broadband router
-CPE cpe:/h:billion:7402vgp auto
-SEQ(R=N)
-OPS(R=N)
-WIN(R=N)
-ECN(R=N)
-T1(R=N)
-T2(R=Y%DF=Y%T=7B-85%TG=80%W=4000%S=A%A=Z%F=R%O=%RD=0%Q=)
-T3(R=N)
-T4(R=Y%DF=Y%T=7B-85%TG=80%W=4000%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=Z%F=R%O=%RD=0%Q=)
-U1(DF=N%T=96-A0%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(R=N)
 
 # Billion 7404VGO-M DSL Router [Firmware 5.52d]
 # Zoom ADSL X6 (5590 series)
@@ -15401,23 +15404,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)
 
-# Cisco Wireless IP Phone 7920-ETSI
-Fingerprint Cisco Wireless IP Phone 7920-ETSI
-Class Cisco | embedded || VoIP phone
-CPE cpe:/h:cisco:unified_wireless_ip_phone_7920
-SEQ(R=N)
-OPS(R=N)
-WIN(R=N)
-ECN(R=N)
-T1(R=N)
-T2(R=N)
-T3(R=N)
-T4(R=Y%DF=N%T=3B-45%TG=40%W=4000%S=A|O%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=O|S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A|O%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=O|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=S%T=3B-45%TG=40%CD=S)
 
 # Cisco Small Business RV110W Wireless-N VPN Firewall, Firmware Version: 1.2.0.9
 Fingerprint Cisco RV110W Wireless-N VPN Firewall
@@ -15511,24 +15497,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=60%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=S%T=FA-104%TG=FF%CD=S)
 
-# IOS (tm) 3000 Software (IGS-I-L), Version 10.3(7), RELEASE SOFTWARE (fc1)
-Fingerprint Cisco 3000 switch (IOS 10.3)
-Class Cisco | IOS | 10.X | switch
-CPE cpe:/h:cisco:catalyst_3000
-CPE cpe:/o:cisco:ios:10.3
-SEQ(R=N)
-OPS(R=N)
-WIN(R=N)
-ECN(R=N)
-T1(R=N)
-T2(R=Y%DF=N%T=100%TG=FF%W=0%S=Z%A=O|S%F=AR%O=%RD=0%Q=)
-T3(R=N)
-T4(R=Y%DF=N%T=100%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=N)
-T6(R=Y%DF=N%T=100%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=100%TG=FF%W=0%S=Z%A=O|S%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=100%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=S%T=100%TG=FF%CD=S)
 
 # Cisco 2500 (68030) IGS-I-L, Version 11.1(24)
 Fingerprint Cisco 2500 router (IOS 11.1)
@@ -20824,28 +20792,6 @@ IE(R=N)
 
 # D-Link DWL-624+ WAN Router (Connected thru Wi-FI, default network configurations, no cryptography.)
 #  d-link vdi-624 Airplus XtremeG 2.4GHz Wireless Router, firmware 2.43DDM 1/12/2005 (Wireless broadband router produced by D-Link for Verizon FIOS customers.  D-Link calls it a 'di-624' but this version (for Verizon FIOS customers) is called a 'vdi-624'.)
-# TrendNet Wireless AP tew-432brp
-# DI-624revD2 w/firmware 4.03
-# D-Link DWL-2000AP, firmware 3.13, 16 Jun 2004
-Fingerprint D-Link DWL-624+ or DWL-2000AP, or TRENDnet TEW-432BRP WAP
-Class D-Link | embedded || WAP
-CPE cpe:/h:dlink:dwl-624%2b
-CPE cpe:/h:dlink:dwl-2000ap
-Class TRENDnet | embedded || WAP
-CPE cpe:/h:trendnet:tew-432brp auto
-SEQ(R=N)
-OPS(R=N)
-WIN(R=N)
-ECN(R=N)
-T1(R=Y%DF=N%T=7A-84%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=7A-84%TG=80%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=7A-84%TG=80%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=7A-84%TG=80%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=7A-84%TG=80%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=7A-84%TG=80%CD=S)
 
 # d-link dwl 900ap access point
 Fingerprint D-Link DWL-900AP WAP
@@ -20979,26 +20925,6 @@ T7(R=Y%DF=N%T=3B-45%TG=40%W=FFFF%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)
 
-# Linksys BEFSR41 V3 Cable/DSL Router (Firmware Version: 1.05.00)
-# it is actually a DCS-6620G wireless IP camera
-Fingerprint D-Link DCS-6620G webcam or Linksys BEFSR41 EtherFast router
-Class D-Link | embedded || webcam
-CPE cpe:/h:dlink:dcs-6620g auto
-Class Linksys | embedded || router
-CPE cpe:/h:linksys:befsr41
-SEQ(R=N)
-OPS(R=N)
-WIN(R=N)
-ECN(R=N)
-T1(R=Y%DF=N%T=91-9B%TG=FF%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=N%T=91-9B%TG=FF%W=100%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T4(R=N)
-T5(R=Y%DF=N%T=91-9B%TG=FF%W=7A69%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=91-9B%TG=FF%W=8000%S=A%A=S%F=AR%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=91-9B%TG=FF%W=FFFF%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=91-9B%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=91-9B%TG=FF%CD=S)
 
 # dgux agaviion R4.11MU06 generic AViiON mc88110, Data General 8540 running the following operating system "DG/UX Release R4.11MU06"
 Fingerprint Data General DG/UX 4.11MU06
@@ -35072,26 +34998,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=4210%RIPCK=Z%RUCK=0%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
-# HP 9100c Digital Sender  (scanner)
-# HP ProCurve Switch 2524
-Fingerprint HP ProCurve 2524 switch or 9100c Digital Sender printer
-Class HP | embedded || switch
-CPE cpe:/h:hp:procurve_switch_2524
-Class HP | embedded || printer
-CPE cpe:/h:hp:9100c_digital_sender
-SEQ(R=N)
-OPS(R=N)
-WIN(R=N)
-ECN(R=N)
-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=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=4210%RIPCK=Z%RUCK=0%RUD=G)
-IE(DFI=S%T=3B-45%TG=40%CD=S)
 
 # HP Procurve 2524 (firmware F.05.34)
 # HP Procurve 2524 (firmware F.05.17)
@@ -36459,23 +36365,6 @@ T7(R=Y%DF=N%T=3B-45%TG=40%W=FFFF%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)
 
-# iLO Firmware 1.82 on a Proliant ML350 G4p System ROM D19 08/19/2005
-Fingerprint HP ProLiant ML350 iLO remote management interface
-Class HP | iLO || remote management
-CPE cpe:/o:hp:ilo auto
-SEQ(R=N)
-OPS(R=N)
-WIN(R=N)
-ECN(R=Y%DF=N%T=3B-45%TG=40%W=3%O=%CC=N%Q=U)
-T1(R=N)
-T2(R=Y%DF=N%T=3B-45%TG=40%W=80%S=A%A=Z%F=R%O=%RD=0%Q=)
-T3(R=Y%DF=N%T=3B-45%TG=40%W=100%S=A%A=Z%F=R%O=%RD=0%Q=)
-T4(R=Y%DF=N%T=3B-45%TG=40%W=400%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=3B-45%TG=40%W=7A69%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=3B-45%TG=40%W=8000%S=A%A=S%F=AR%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=3B-45%TG=40%W=FFFF%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)
 
 # HPe3000a500 Mini computer running HP MPE/iX Version 7.5
 Fingerprint HP MPE/iX 7.5
@@ -40408,22 +40297,6 @@ 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)
 
 # iPXE 1.0.0+ (a4d1). This doesn't have a real TCP; it doesn't respond with any open ports, will send RST for any SYN, and responds to ICMP echo.
-Fingerprint iPXE 1.0.0+
-Class iPXE | iPXE | 1.X | specialized
-CPE cpe:/o:ipxe:ipxe:1.0.0%2b
-SEQ(R=N)
-OPS(R=N)
-WIN(R=N)
-ECN(R=N)
-T1(R=N)
-T2(R=N)
-T3(R=N)
-T4(R=N)
-T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%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=AR%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=S%F=AR%O=%RD=0%Q=)
-U1(R=N)
-IE(DFI=N%T=3B-45%TG=40%CD=S)
 
 # iRobot Roomba 980
 Fingerprint iRobot Roomba 980 vacuum cleaner
@@ -42746,22 +42619,6 @@ T7(R=Y%DF=N%T=1B-25%TG=20%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=1B-25%TG=20%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=1B-25%TG=20%CD=S)
 
-# Lexmark 1400 series
-Fingerprint Lexmark 1400-series printer
-Class Lexmark | embedded || printer
-SEQ(R=N)
-OPS(R=N)
-WIN(R=N)
-ECN(R=Y%DF=Y%T=FE%TG=FF%W=16D0%O=M5B4NNSNW1%CC=N%Q=)
-T1(R=N)
-T2(R=N)
-T3(R=N)
-T4(R=Y%DF=Y%T=FE%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=FE%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=FE%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=Y%T=FE%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=FE%TG=FF%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=FE%TG=FF%CD=S)
 
 # Lexmark C500
 # Lexmark C720
@@ -42925,23 +42782,6 @@ T7(R=Y%DF=Y%T=FE%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=FE%TG=FF%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=FE%TG=FF%CD=S)
 
-# Lexmark E332n version 140.237 kernel 2.4.0-test6 All-N-1
-Fingerprint Lexmark E332n printer
-Class Lexmark | embedded || printer
-CPE cpe:/h:lexmark:e332n auto
-SEQ(R=N)
-OPS(R=N)
-WIN(R=N)
-ECN(R=Y%DF=Y%T=FE%TG=FF%W=5B4%O=M5B4NNSNW0%CC=N%Q=)
-T1(R=N)
-T2(R=N)
-T3(R=N)
-T4(R=Y%DF=Y%T=FE%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=FE%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=FE%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=Y%T=FE%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=Y%T=FE%TG=FF%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=Y%T=FE%TG=FF%CD=S)
 
 # Lexmark E450dn
 Fingerprint Lexmark E450dn printer
@@ -43232,23 +43072,6 @@ T7(R=Y%DF=Y%T=F9-103%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=F9-103%TG=FF%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=F9-103%TG=FF%CD=S)
 
-# Lexmark X644e printer
-Fingerprint Lexmark X644e printer
-Class Lexmark | embedded || printer
-CPE cpe:/h:lexmark:x644e auto
-SEQ(R=N)
-OPS(R=N)
-WIN(R=N)
-ECN(R=Y%DF=Y%T=FE%TG=FF%W=B68%O=M5B4NNSNW1%CC=N%Q=)
-T1(R=N)
-T2(R=N)
-T3(R=N)
-T4(R=Y%DF=Y%T=FE%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=FE%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=FE%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=N)
-U1(DF=N%T=FE%TG=FF%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=FE%TG=FF%CD=S)
 
 # Lexmark C770
 # Lexmark X646e printer
@@ -43692,23 +43515,6 @@ T7(R=Y%DF=N%T=F5-FF%TG=FF%W=0%S=Z%A=S%F=ARF%O=%RD=0%Q=)
 U1(DF=N%T=F5-FF%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=F5-FF%TG=FF%CD=S)
 
-# Linksys PAP2T VoIP Router Software Version 5.1.3(LS) Hardware Version 0.1.5
-# LinkSys Phone Adapter with 2 Ports for Voice-Over-IP, Firmware Version: 3.1.15(LS)
-Fingerprint Linksys PAP2T VoIP router
-Class Linksys | embedded || VoIP adapter
-SEQ(R=N)
-OPS(R=N)
-WIN(R=N)
-ECN(R=N)
-T1(R=Y%DF=N%T=F5-FF%TG=FF%S=O%A=O|S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=N%T=F5-FF%TG=FF%W=0%S=Z%A=S%F=ARF%O=%RD=0%Q=)
-T3(R=N)
-T4(R=Y%DF=N%T=F5-FF%TG=FF%W=0%S=A%A=Z%F=RF%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=F5-FF%TG=FF%W=0%S=Z%A=S+%F=ARF%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=F5-FF%TG=FF%W=0%S=A%A=Z%F=RF%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=F5-FF%TG=FF%W=0%S=Z%A=S%F=ARF%O=%RD=0%Q=)
-U1(DF=N%T=F5-FF%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=F5-FF%TG=FF%CD=S)
 
 # LinksysPAP Product Name:   PAP2T Software Version:       3.1.15(LS)
 Fingerprint Linksys PAP2T VoIP router
@@ -43937,23 +43743,6 @@ T7(R=Y%DF=N%T=96%TG=FF%W=FFFF%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=96%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=96%TG=FF%CD=S)
 
-# Wireless-B BroadBand Router BEFW11S4, Firmware Version: 1.52.02
-Fingerprint Linksys BEFW11S4 WAP
-Class Linksys | embedded || WAP
-CPE cpe:/h:linksys:befw11s4 auto
-SEQ(R=N)
-OPS(R=N)
-WIN(R=N)
-ECN(R=N)
-T1(R=Y%DF=N%T=91-9B%TG=FF%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=N%T=91-9B%TG=FF%W=80%S=Z%A=S%F=AR%O=%RD=0%Q=)
-T3(R=Y%DF=N%T=91-9B%TG=FF%W=100%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T4(R=Y%DF=N%T=91-9B%TG=FF%W=400%S=A%A=S%F=AR%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=91-9B%TG=FF%W=7A69%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=91-9B%TG=FF%W=8000%S=A%A=S%F=AR%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=91-9B%TG=FF%W=FFFF%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=91-9B%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=91-9B%TG=FF%CD=S)
 
 # Linux 2.4.17_mvl21-malta-mips_fp_le, Linksys WAG200G Wireless Broadband Router
 Fingerprint Linksys WAG200G WAP (MontaVista Linux 2.4.17)
@@ -45434,23 +45223,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.4.26 #6 Mon Jun 14 19:07:27 PDT 2004 i686 unknown unknown GNU/Linux
-Fingerprint Linux 2.4.26 (Slackware 10.0.0)
-Class Linux | Linux | 2.4.X | general purpose
-CPE cpe:/o:linux:linux_kernel:2.4.26
-SEQ(R=N)
-OPS(R=N)
-WIN(R=N)
-ECN(R=N)
-T1(R=N)
-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 2.4.27-2-386 #1 Wed Aug 17 09:33:35 UTC 2005 i686 GNU/Linux (Debian)
 Fingerprint Linux 2.4.27
@@ -49698,24 +49470,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.18-4-ixp4xx #1 Sun Apr 22 08:34:11 UTC 2007 armv5tel GNU/Linux, Debian on NSLU2
-# Tomato USB Version 1.28 Tomato Firmware v1.28.7821 MIPSR1-Toastman-ND K26 MiniIPv6 - Linux kernel 2.6.22.19 and Broadcom Wireless Driver 5.10.147.0 updates
-Fingerprint Linux 2.6.18 - 2.6.22
-Class Linux | Linux | 2.6.X | general purpose
-CPE cpe:/o:linux:linux_kernel:2.6 auto
-SEQ(R=N)
-OPS(R=N)
-WIN(R=N)
-ECN(R=N)
-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=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.18-6-amd64 #1 SMP Sun Feb 10 17:50:19 UTC 2008 x86_64 GNU/Linux/Debian Etch
 # Linux 2.6.24-18-generic #1 SMP Wed May 28 20:27:26 UTC 2008 i686 GNU/Linux Ubuntu 8.04.1
@@ -51922,23 +51676,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=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.24-reiser4-r3 #1 Fri Mar 14 14:34:25 CET 2008 i686 Intel(R) Pentium(R) M processor 1.60GHz GenuineIntel GNU/Linux / Gentoo Linux
-Fingerprint Linux 2.6.24
-Class Linux | Linux | 2.6.X | general purpose
-CPE cpe:/o:linux:linux_kernel:2.6.24
-SEQ(R=N)
-OPS(R=N)
-WIN(R=N)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=8018%O=M400CNNSNW6%CC=N%Q=)
-T1(R=N)
-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 2.6.24-gentoo-r8 #3 SMP Sat May 24 17:16:10 CEST 2008 i686 Intel(R) Pentium(R) 4 CPU 3.00GHz GenuineIntel GNU/Linux
 # Linux 2.6.24-19-generic #1 SMP Wed Aug 20 22:56:21 UTC 2008 i686 GNU/Linux Ubuntu Server Linux LTS 8.04.1
@@ -66115,6 +65852,33 @@ 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 3.8.13.13-1-MANJARO #1 SMP Thu Nov 14 19:23:30 UTC 2013 x86_64 GNU/Linux
+# Linux 3.10.20-1-MANJARO #1 SMP Thu Nov 21 16:53:15 UTC 2013 x86_64 GNU/Linux
+# Linux 3.10.25-1-MANJARO #1 SMP Sat Dec 21 01:02:47 UTC 2013 x86_64 GNU/Linux
+# Linux 3.18.7-v7+ #755 SMP PREEMPT Thu Feb 12 17:20:48 GMT 2015 armv7l GNU/Linu
+# Linux 4.1.19-v7+ #858 SMP Tue Mar 15 15:56:00 GMT 2016 armv7l GNU/Linux
+# Linux 4.1.19-4-ARCH #1 SMP Wed Mar 9 18:23:02 MST 2016 armv7l GNU/Linux
+# Linux 4.4.21-v7+ #911 SMP Thu Sep 15 14:22:38 BST 2016 armv7l GNU/Linux
+Fingerprint Linux 3.8 - 4.4
+Class Linux | Linux | 3.X | general purpose
+CPE cpe:/o:linux:linux_kernel:3 auto
+Class Linux | Linux | 4.X | general purpose
+CPE cpe:/o:linux:linux_kernel:4 auto
+SEQ(SP=F6-10A%GCD=1-6%ISR=FA-110%TI=Z%CI=I%II=I%TS=7)
+OPS(O1=MFFD7ST11NW7%O2=MFFD7ST11NW7%O3=MFFD7NNT11NW7%O4=MFFD7ST11NW7%O5=MFFD7ST11NW7%O6=MFFD7ST11)
+WIN(W1=AAAA%W2=AAAA%W3=AAAA%W4=AAAA%W5=AAAA%W6=AAAA)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=AAAA%O=MFFD7NNSNW7%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)
+
 # Localhost
 # Deletion candidate: too broad?
 # Linux 3.11.6-1-ARCH #1 SMP PREEMPT Fri Oct 18 23:22:36 CEST 2013 x86_64 GNU/Linux
@@ -66161,33 +65925,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)
 
-# Localhost
-# Linux 3.8.13.13-1-MANJARO #1 SMP Thu Nov 14 19:23:30 UTC 2013 x86_64 GNU/Linux
-# Linux 3.10.20-1-MANJARO #1 SMP Thu Nov 21 16:53:15 UTC 2013 x86_64 GNU/Linux
-# Linux 3.10.25-1-MANJARO #1 SMP Sat Dec 21 01:02:47 UTC 2013 x86_64 GNU/Linux
-# Linux 3.18.7-v7+ #755 SMP PREEMPT Thu Feb 12 17:20:48 GMT 2015 armv7l GNU/Linu
-# Linux 4.1.19-v7+ #858 SMP Tue Mar 15 15:56:00 GMT 2016 armv7l GNU/Linux
-# Linux 4.1.19-4-ARCH #1 SMP Wed Mar 9 18:23:02 MST 2016 armv7l GNU/Linux
-# Linux 4.4.21-v7+ #911 SMP Thu Sep 15 14:22:38 BST 2016 armv7l GNU/Linux
-Fingerprint Linux 3.8 - 4.4
-Class Linux | Linux | 3.X | general purpose
-CPE cpe:/o:linux:linux_kernel:3 auto
-Class Linux | Linux | 4.X | general purpose
-CPE cpe:/o:linux:linux_kernel:4 auto
-SEQ(SP=F6-10A%GCD=1-6%ISR=FA-110%TI=Z%CI=I%II=I%TS=7)
-OPS(O1=MFFD7ST11NW7%O2=MFFD7ST11NW7%O3=MFFD7NNT11NW7%O4=MFFD7ST11NW7%O5=MFFD7ST11NW7%O6=MFFD7ST11)
-WIN(W1=AAAA%W2=AAAA%W3=AAAA%W4=AAAA%W5=AAAA%W6=AAAA)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=AAAA%O=MFFD7NNSNW7%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 ralph 3.9.7-gentoo #1 SMP Sat Jun 22 15:45:18 CEST 2013 x86_64 Intel(R) Core(TM) i7-2600K CPU @ 3.40GHz GenuineIntel GNU/Linux
 Fingerprint Linux 3.9
 Class Linux | Linux | 3.X | general purpose
@@ -96907,23 +96644,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)
 
-# ShoteTel ShoteGear T1
-Fingerprint ShoreTel ShoreGear-T1 VoIP switch
-Class ShoreTel | embedded || VoIP adapter
-CPE cpe:/h:shoretel:shoregear-t1
-SEQ(R=N)
-OPS(R=N)
-WIN(R=N)
-ECN(R=N)
-T1(R=N)
-T2(R=N)
-T3(R=N)
-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(R=N)
-IE(DFI=S%T=3B-45%TG=40%CD=S)
 
 # ShoreTel Voice Switch 220T1A
 Fingerprint ShoreTel Voice Switch 220T1A VoIP gateway
@@ -103985,23 +103705,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=CFC2%RUD=G)
 IE(R=N)
 
-# Vodavi XTS-IP PBX (it's Vodavi's newer class of PBX's)
-Fingerprint Vodavi XTS-IP PBX
-Class Vodavi | embedded || PBX
-CPE cpe:/h:vodavi:xts-ip
-SEQ(R=N)
-OPS(R=N)
-WIN(R=N)
-ECN(R=N)
-T1(R=Y%DF=Y%T=FE%TG=FF%S=O%A=O|S+%F=AS|RF%RD=0%Q=)
-T2(R=N)
-T3(R=N)
-T4(R=Y%DF=Y%T=FE%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=Y%T=FE%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=Y%T=FE%TG=FF%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=Y%T=FE%TG=FF%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=FE%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
-IE(DFI=N%T=FE%TG=FF%CD=S)
 
 # Vonage V-Portal device.
 Fingerprint Vonage V-Portal VoIP adapter
@@ -107404,3 +107107,23 @@ 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=FE%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=D624%RUD=G)
 IE(DFI=N%T=FE%TG=FF%CD=S)
+
+# Juniper SRX firewall, JUNOS 12.1R1.9, model SRX240H
+# srx650, Junos 12.3X48-D30.7
+Fingerprint Juniper SRX200-series firewall (JUNOS 12.1 - 12.3)
+Class Juniper | JUNOS | 12.X | firewall
+CPE cpe:/o:juniper:junos:12 auto
+SEQ(SP=100-10A%GCD=1-6%ISR=107-111%TI=I%II=RI%SS=S|O%TS=U)
+OPS(O1=M56A%O2=M56A%O3=M56A%O4=M56A%O5=M56A%O6=M56A)
+WIN(W1=7D78%W2=7D78%W3=7D78%W4=7D78%W5=7D78%W6=7D78)
+ECN(R=Y%DF=N%T=3B-45%TG=40%W=7D78%O=M56A%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=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(R=N)
+IE(DFI=S%T=3B-45%TG=40%CD=S)
+