RubyGems - recog - Versions diffs - 2.3.7 → 2.3.8 - Mend

recog 2.3.7 → 2.3.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (50) hide show

checksums.yaml +4 -4
data/.gitignore +3 -2
data/.ruby-gemset +1 -0
data/.ruby-version +1 -0
data/.travis.yml +2 -4
data/Gemfile +2 -5
data/bin/recog_standardize +118 -0
data/cpe-remap.yaml +21 -0
data/features/match.feature +4 -0
data/features/support/aruba.rb +3 -0
data/features/verify.feature +5 -0
data/identifiers/README.md +47 -0
data/identifiers/os_architecture.txt +20 -0
data/identifiers/os_device.txt +52 -0
data/identifiers/os_family.txt +160 -0
data/identifiers/os_product.txt +199 -0
data/identifiers/service_family.txt +185 -0
data/identifiers/service_product.txt +255 -0
data/identifiers/software_class.txt +26 -0
data/identifiers/software_family.txt +91 -0
data/identifiers/software_product.txt +333 -0
data/identifiers/vendor.txt +405 -0
data/lib/recog/version.rb +1 -1
data/spec/lib/fingerprint_self_test_spec.rb +1 -1
data/spec/lib/recog/fingerprint/regexp_factory_spec.rb +1 -1
data/update_cpes.py +1 -1
data/xml/apache_os.xml +9 -0
data/xml/architecture.xml +9 -5
data/xml/dns_versionbind.xml +9 -11
data/xml/ftp_banners.xml +47 -5
data/xml/html_title.xml +310 -196
data/xml/http_cookies.xml +13 -1
data/xml/http_servers.xml +145 -7
data/xml/http_wwwauth.xml +13 -1
data/xml/mdns_device-info_txt.xml +20 -16
data/xml/mysql_banners.xml +420 -38
data/xml/ntp_banners.xml +16 -8
data/xml/operating_system.xml +1 -0
data/xml/rtsp_servers.xml +21 -21
data/xml/sip_banners.xml +5 -41
data/xml/sip_user_agents.xml +40 -1
data/xml/smb_native_os.xml +1 -0
data/xml/smtp_banners.xml +3 -4
data/xml/snmp_sysdescr.xml +44 -28
data/xml/ssh_banners.xml +78 -73
data/xml/telnet_banners.xml +30 -9
data/xml/x11_banners.xml +1 -1
data/xml/x509_issuers.xml +7 -7
data/xml/x509_subjects.xml +329 -28
metadata +23 -6

data/xml/architecture.xml CHANGED

@@ -6,7 +6,7 @@
   <fingerprint pattern="x64|amd64|x86_64" flags="REG_ICASE">
     <description>x64 (x86_x64)</description>
     <example>Linux claw 3.11.0-15-generic #23-Ubuntu SMP Mon Dec 9 18:17:04 UTC 2013 x86_64 x86_64 x86_64 GNU/Linux</example>
-    <param pos="0" name="os.arch" value="x64"/>
+    <param pos="0" name="os.arch" value="x86_64"/>
   </fingerprint>
   <fingerprint pattern="x86|i[3456]86" flags="REG_ICASE">
     <description>x86</description>
@@ -15,18 +15,22 @@
   </fingerprint>
   <fingerprint pattern="PowerPC|PPC|POWER|ppc">
     <description>PowerPC</description>
-    <param pos="0" name="os.arch" value="ppc"/>
+    <param pos="0" name="os.arch" value="PowerPC"/>
   </fingerprint>
   <fingerprint pattern="SPARC" flags="REG_ICASE">
     <description>SPARC</description>
-    <param pos="0" name="os.arch" value="sparc"/>
+    <param pos="0" name="os.arch" value="Sparc"/>
   </fingerprint>
   <fingerprint pattern="mips" flags="REG_ICASE">
     <description>MIPS</description>
-    <param pos="0" name="os.arch" value="mips"/>
+    <param pos="0" name="os.arch" value="MIPS"/>
   </fingerprint>
+  <fingerprint pattern="arm64|aarch64" flags="REG_ICASE">
+    <description>ARM64 (aarch64)</description>
+    <param pos="0" name="os.arch" value="ARM64"/>
+  </fingerprint>
   <fingerprint pattern="arm" flags="REG_ICASE">
     <description>ARM</description>
-    <param pos="0" name="os.arch" value="arm"/>
+    <param pos="0" name="os.arch" value="ARM"/>
   </fingerprint>
 </fingerprints>

data/xml/dns_versionbind.xml CHANGED

@@ -154,7 +154,7 @@
     <param pos="0" name="os.product" value="Zentyal"/>
   </fingerprint>
   <fingerprint pattern="^(9.[^-]+(?:-[SP]\d)?)-9\+deb8u[\w~\.]+-Debian$">
-    <description>ISC BIND: Debian Jessie</description>
+    <description>ISC BIND: Debian 8.0 (jessie)</description>
     <example service.version="9.9.5">9.9.5-9+deb8u11-Debian</example>
     <example service.version="9.9.5">9.9.5-9+deb8u6A~4.2.0.201702281603-Debian</example>
     <param pos="0" name="service.vendor" value="ISC"/>
@@ -169,7 +169,7 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:8.0"/>
   </fingerprint>
   <fingerprint pattern="^(9.[^-]+(?:-[SP]\d)?)-9wheezy\w+-Debian$">
-    <description>ISC BIND: Debian Wheezy</description>
+    <description>ISC BIND: Debian 7.0 (wheezy)</description>
     <example service.version="9.9.5">9.9.5-9wheezy1-Debian</example>
     <param pos="0" name="service.vendor" value="ISC"/>
     <param pos="0" name="service.family" value="BIND"/>
@@ -403,7 +403,7 @@
   </fingerprint>
   <fingerprint pattern="^Nominum Vantio ([\d.]+) \(build (\d+)\)$">
     <description>Nominum Vantio CacheServe, with build</description>
-    <example service.version.version="114872">Nominum Vantio 5.4.5.1 (build 114872)</example>
+    <example service.version="5.4.5.1" service.version.version="114872">Nominum Vantio 5.4.5.1 (build 114872)</example>
     <param pos="0" name="service.vendor" value="Nominum"/>
     <param pos="0" name="service.family" value="Vantio"/>
     <param pos="0" name="service.product" value="CacheServe"/>
@@ -734,14 +734,12 @@
   </fingerprint>
   <fingerprint pattern="^dnsmasq-pi-hole-(.*)$">
     <description>dnsmasq: pi-hole</description>
-    <example os.vendor="Pi-hole" service.vendor="Thekelleys" service.family="Dnsmasq" service.product="Dnsmasq" os.version="2.80" os.cpe23="cpe:/a:pi-hole:pi-hole:2.80" service.cpe23="cpe:/a:thekelleys:dnsmasq:-">dnsmasq-pi-hole-2.80</example>
-    <param pos="0" name="os.vendor" value="Pi-hole"/>
-    <param pos="0" name="service.vendor" value="Thekelleys"/>
-    <param pos="0" name="service.family" value="Dnsmasq"/>
-    <param pos="0" name="service.product" value="Dnsmasq"/>
-    <param pos="1" name="os.version"/>
-    <param pos="0" name="os.cpe23" value="cpe:/a:pi-hole:pi-hole:{os.version}"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:thekelleys:dnsmasq:-"/>
+    <example service.version="2.80">dnsmasq-pi-hole-2.80</example>
+    <param pos="0" name="service.vendor" value="Pi-hole"/>
+    <param pos="0" name="service.family" value="Pi-hole"/>
+    <param pos="0" name="service.product" value="Pi-hole"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:pi-hole:pi-hole:{service.version}"/>
   </fingerprint>
   <fingerprint pattern="^Q9-[^\-]-(.*)$">
     <description>Quad9 Resolver</description>

data/xml/ftp_banners.xml CHANGED

@@ -323,6 +323,7 @@ example.com FTP server (Version:  Mac OS X Server) ready.
     <param pos="0" name="service.vendor" value="ProFTPD Project"/>
     <param pos="0" name="service.product" value="ProFTPD"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:proftpd:proftpd:{service.version}"/>
     <param pos="2" name="host.name"/>
   </fingerprint>
   <fingerprint pattern="^=\(&lt;\*&gt;\)=-\.:\. \(\( Welcome to Pure-FTPd ([\d.]+) \)\) \.:\.-=\(&lt;\*&gt;\)=-" flags="REG_MULTILINE">
@@ -582,6 +583,9 @@ more text
     <param pos="0" name="hw.device" value="Web cam"/>
     <param pos="1" name="hw.product"/>
     <param pos="2" name="hw.version"/>
+    <param pos="0" name="os.vendor" value="AXIS"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.device" value="Web cam"/>
   </fingerprint>
   <fingerprint pattern="(?i)^AXIS (\S+) (?:(?:Mk II )?Video|IO Audio) (?:Encoder|Encoder Blade|Module|Server|Decoder) (\S+) .*">
     <description>Axis Audio/Video encoders/servers</description>
@@ -600,7 +604,7 @@ more text
     <description>Axis Door Controllers</description>
     <example hw.product="A1001" hw.version="1.65.1.1">AXIS A1001 Network Door Controller 1.65.1.1 (2018) ready.</example>
     <param pos="0" name="hw.vendor" value="Axis"/>
-    <param pos="0" name="hw.device" value="Building Automation"/>
+    <param pos="0" name="hw.device" value="Access Controller"/>
     <param pos="1" name="hw.product"/>
     <param pos="2" name="hw.version"/>
   </fingerprint>
@@ -726,6 +730,15 @@ more text
     <param pos="0" name="hw.device" value="Printer"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
+  <fingerprint pattern="^220 ECOSYS ([^\s]+) FTP server$">
+    <description>Kyocera Multifunction Device</description>
+    <example hw.product="P2135dn">220 ECOSYS P2135dn FTP server</example>
+    <param pos="0" name="os.vendor" value="Kyocera"/>
+    <param pos="0" name="os.device" value="Multifunction Device"/>
+    <param pos="0" name="hw.vendor" value="Kyocera"/>
+    <param pos="0" name="hw.device" value="Multifunction Device"/>
+    <param pos="1" name="hw.product"/>
+  </fingerprint>
   <fingerprint pattern="^(?:Tornado-)?VxWorks \((?:VxWorks)?([^\)]+)\) FTP server(?: ready)?\.?$" flags="REG_ICASE">
     <description>VxWorks with version information</description>
     <example os.version="5.3.1">VxWorks (5.3.1) FTP server ready</example>
@@ -751,15 +764,15 @@ more text
     <param pos="0" name="os.vendor" value="Wind River"/>
     <param pos="0" name="os.product" value="VxWorks"/>
     <param pos="1" name="os.version"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:windriver:vxworks:-{os.version}"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:windriver:vxworks:{os.version}"/>
   </fingerprint>
   <fingerprint pattern="^[\w&lt;&gt;]+\s*Tenor Multipath Switch FTP server \(Version VxWorks([\d\.]+)\) ready\.$" flags="REG_ICASE">
     <description>VxWorks on Tenor MultiPath with version information</description>
-    <example os.version="5.4.2"><![CDATA[<38785ca0>  Tenor Multipath Switch FTP server (Version VxWorks5.4.2) ready.]]></example>
+    <example os.version="5.4.2">&lt;38785ca0&gt;  Tenor Multipath Switch FTP server (Version VxWorks5.4.2) ready.</example>
     <param pos="0" name="os.vendor" value="Wind River"/>
     <param pos="0" name="os.product" value="VxWorks"/>
     <param pos="1" name="os.version"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:windriver:vxworks:-{os.version}"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:windriver:vxworks:{os.version}"/>
   </fingerprint>
   <fingerprint pattern="^VxWorks FTP server \(VxWorks ([\d\.]+) - Secure NetLinx version \([\d\.]+\)\) ready.$">
     <description>VxWorks with Secure NetLinx</description>
@@ -767,7 +780,7 @@ more text
     <param pos="0" name="os.vendor" value="Wind River"/>
     <param pos="0" name="os.product" value="VxWorks"/>
     <param pos="1" name="os.version"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:windriver:vxworks:-{os.version}"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:windriver:vxworks:{os.version}"/>
   </fingerprint>
   <fingerprint pattern="^ADC iScale$">
     <description>ADC iScale</description>
@@ -1121,6 +1134,17 @@ more text
     <param pos="0" name="hw.device" value="Print server"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
+  <fingerprint pattern="^(ET(\S+)) Dell (\S+ Laser Printer) FTP Server">
+    <description>Dell Laser Printer</description>
+    <example host.name="ET0021B71A1111" host.mac="0021B71A1111" hw.product="2350dn Laser Printer">ET0021B71A1111 Dell 2350dn Laser Printer FTP Server NR.APS.N449 ready.</example>
+    <param pos="0" name="os.vendor" value="Dell"/>
+    <param pos="0" name="os.device" value="Printer"/>
+    <param pos="0" name="hw.vendor" value="Dell"/>
+    <param pos="0" name="hw.device" value="Printer"/>
+    <param pos="1" name="host.name"/>
+    <param pos="2" name="host.mac"/>
+    <param pos="3" name="hw.product"/>
+  </fingerprint>
   <fingerprint pattern="^(\S+) FTP server \(Version \S+ \w+ \w+ \d{1,2} \d{1,2}:\d{1,2}:\d{1,2} [A-Z]+ (?:1|2)\d{3}\) ready\.?$">
     <description>Generic/unknown FTP Server found on HP-UX and AIX systems</description>
     <example host.name="host.example.com">host.example.com FTP server (Version 4.1 Sat Sep 7 14:31:53 CDT 2002) ready.</example>
@@ -1509,4 +1533,22 @@ more text
     <param pos="0" name="service.vendor" value="Dreamhost"/>
     <param pos="0" name="service.product" value="FTP Server"/>
   </fingerprint>
+  <fingerprint pattern="^QTCP at ([a-zA-Z0-9\.\_\-]+)$">
+    <description>IBM iSeries FTP</description>
+    <example host.name="core.bank.local.">QTCP at core.bank.local.</example>
+    <param pos="0" name="os.vendor" value="IBM"/>
+    <param pos="0" name="os.family" value="OS/400"/>
+    <param pos="0" name="os.product" value="OS/400"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:ibm:os_400:-"/>
+    <param pos="1" name="host.name"/>
+  </fingerprint>
+  <fingerprint pattern="^HomeLogic FTP Server">
+    <description>ELAN Smart Home Controller</description>
+    <example>HomeLogic FTP Server Please Give User Name</example>
+    <param pos="0" name="hw.vendor" value="ELAN"/>
+    <param pos="0" name="hw.device" value="Building Automation"/>
+    <param pos="0" name="hw.product" value="Home Controller"/>
+    <param pos="0" name="os.vendor" value="ELAN"/>
+    <param pos="0" name="os.family" value="Linux"/>
+  </fingerprint>
 </fingerprints>

data/xml/html_title.xml CHANGED

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fingerprints matches="html_title" database_type="service" preference="0.90">
   <!-- HTML Title elements found in HTTP response bodies are matched against these patterns to fingerprint HTTP servers. -->
   <fingerprint pattern="^Index of /">
     <description>Apache HTTPD indexes</description>
     <example>Index of /</example>
@@ -11,7 +9,6 @@
     <param pos="0" name="service.family" value="Apache"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:apache:http_server:-"/>
   </fingerprint>
   <fingerprint pattern="^Test Page for the Nginx HTTP Server on (?:the )?Amazon Linux(?: AMI)?$">
     <description>Apache HTTPD default installation on Amazon Linux</description>
     <example>Test Page for the Nginx HTTP Server on the Amazon Linux AMI</example>
@@ -24,7 +21,6 @@
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Linux AMI"/>
   </fingerprint>
   <fingerprint pattern="^Apache HTTP Server Test Page powered by CentOS$">
     <description>Apache HTTPD default installation on CentOS</description>
     <example>Apache HTTP Server Test Page powered by CentOS</example>
@@ -37,7 +33,6 @@
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:centos:centos:-"/>
   </fingerprint>
   <fingerprint pattern="^Apache2 Debian Default Page: It works$">
     <description>Apache HTTPD default installation on Debian</description>
     <example>Apache2 Debian Default Page: It works</example>
@@ -49,7 +44,6 @@
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:-"/>
   </fingerprint>
   <fingerprint pattern="^Apache2 Ubuntu Default Page: It works$">
     <description>Apache HTTPD default installation on Ubuntu</description>
     <example>Apache2 Ubuntu Default Page: It works</example>
@@ -61,7 +55,18 @@
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:-"/>
   </fingerprint>
+  <fingerprint pattern="^Sample Home Page for APACHEDFT Server$">
+    <description>IBM iSeries Apache Default Page</description>
+    <example>Sample Home Page for APACHEDFT Server</example>
+    <param pos="0" name="os.vendor" value="IBM"/>
+    <param pos="0" name="os.family" value="OS/400"/>
+    <param pos="0" name="os.product" value="OS/400"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:ibm:os_400:-"/>
+    <param pos="0" name="service.vendor" value="Apache"/>
+    <param pos="0" name="service.product" value="HTTPD"/>
+    <param pos="0" name="service.family" value="Apache"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:apache:http_server:-"/>
+  </fingerprint>
   <fingerprint pattern="^Apache Tomcat$">
     <description>Apache Tomcat with no version</description>
     <example>Apache Tomcat</example>
@@ -70,7 +75,6 @@
     <param pos="0" name="service.family" value="Tomcat"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:apache:tomcat:-"/>
   </fingerprint>
   <fingerprint pattern="^Apache Tomcat/(\S+)$">
     <description>Apache tomcat with minimal version information</description>
     <example service.version="8.0.32">Apache Tomcat/8.0.32</example>
@@ -80,14 +84,12 @@
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:apache:tomcat:{service.version}"/>
   </fingerprint>
   <fingerprint pattern="^AiCloud">
     <description>ASUS AiCloud</description>
     <example>AiCloud</example>
     <param pos="0" name="hw.vendor" value="Asus"/>
     <param pos="0" name="hw.device" value="WAP"/>
   </fingerprint>
   <!-- HiSilicon is OEMd by a number of DVR manufacturers -->
   <fingerprint pattern="^DVR Components Download$">
     <description>Web server found on DVR and webcam servers sourced from HiSilicon</description>
@@ -98,7 +100,6 @@
     <param pos="0" name="os.device" value="DVR"/>
     <param pos="0" name="hw.device" value="DVR"/>
   </fingerprint>
   <fingerprint pattern="^FRITZ!Box$">
     <description>AVM FRITZ!Box</description>
     <example>FRITZ!Box</example>
@@ -106,7 +107,6 @@
     <param pos="0" name="hw.device" value="WAP"/>
     <param pos="0" name="hw.family" value="FRITZ!Box"/>
   </fingerprint>
   <fingerprint pattern="^FRITZ!Powerline$">
     <description>AVM FRITZ!Powerline</description>
     <example>FRITZ!Powerline</example>
@@ -114,7 +114,6 @@
     <param pos="0" name="hw.device" value="Powerline"/>
     <param pos="0" name="hw.family" value="FRITZ!Powerline"/>
   </fingerprint>
   <fingerprint pattern="^FRITZ!WLAN Repeater$">
     <description>FRITZ!WLAN Repeater</description>
     <example>FRITZ!WLAN Repeater</example>
@@ -122,7 +121,6 @@
     <param pos="0" name="hw.device" value="WLAN Repeater"/>
     <param pos="0" name="hw.family" value="FRITZ!WLAN Repeater"/>
   </fingerprint>
   <fingerprint pattern="^cPanel Login$">
     <description>cPanel</description>
     <example>cPanel Login</example>
@@ -130,7 +128,6 @@
     <param pos="0" name="service.product" value="cPanel"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:cpanel:cpanel:-"/>
   </fingerprint>
   <fingerprint pattern="^WHM Login$">
     <description>cPanel Web Host Manager</description>
     <example>WHM Login</example>
@@ -138,16 +135,14 @@
     <param pos="0" name="service.product" value="WHM"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:cpanel:whm:-"/>
   </fingerprint>
   <fingerprint pattern="^Windows CE$">
     <description>Windows CE</description>
     <example>Windows CE</example>
     <param pos="0" name="os.vendor" value="Microsoft"/>
     <param pos="0" name="os.family" value="Windows"/>
     <param pos="0" name="os.product" value="Windows CE"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows-ce:-"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_ce:-"/>
   </fingerprint>
   <fingerprint pattern="^IIS7$">
     <description>Default IIS 7</description>
     <example>IIS7</example>
@@ -155,13 +150,12 @@
     <param pos="0" name="service.product" value="IIS"/>
     <param pos="0" name="service.family" value="IIS"/>
     <param pos="0" name="service.version" value="7"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:iis:{service.version}"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:iis:7"/>
     <param pos="0" name="os.vendor" value="Microsoft"/>
     <param pos="0" name="os.family" value="Windows"/>
     <param pos="0" name="os.product" value="Windows"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
   </fingerprint>
   <fingerprint pattern="^Microsoft Internet Information Services 8">
     <description>Default IIS 8</description>
     <example>Microsoft Internet Information Services 8</example>
@@ -169,13 +163,12 @@
     <param pos="0" name="service.product" value="IIS"/>
     <param pos="0" name="service.family" value="IIS"/>
     <param pos="0" name="service.version" value="8"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:iis:{service.version}"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:iis:8"/>
     <param pos="0" name="os.vendor" value="Microsoft"/>
     <param pos="0" name="os.family" value="Windows"/>
     <param pos="0" name="os.product" value="Windows"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
   </fingerprint>
   <fingerprint pattern="^IIS (\d\.\d) Detailed Error">
     <description>IIS Detailed Error</description>
     <example service.version="7.0">IIS 7.0 Detailed Error - 401.2 - Unauthorized</example>
@@ -191,7 +184,6 @@
     <param pos="0" name="os.product" value="Windows"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
   </fingerprint>
   <fingerprint pattern="^IIS Windows(?: Server)?$">
     <description>Default IIS</description>
     <example>IIS Windows</example>
@@ -199,21 +191,20 @@
     <param pos="0" name="service.vendor" value="Microsoft"/>
     <param pos="0" name="service.product" value="IIS"/>
     <param pos="0" name="service.family" value="IIS"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:iis:-"/>
     <param pos="0" name="os.vendor" value="Microsoft"/>
     <param pos="0" name="os.family" value="Windows"/>
     <param pos="0" name="os.product" value="Windows"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
   </fingerprint>
   <fingerprint pattern="^(?:NETIASPOT Management Console|Konsola zarzdzania NETIASPOT)$">
     <description>Netia Spot wireless router</description>
     <example>Konsola zarzdzania NETIASPOT</example>
     <example>NETIASPOT Management Console</example>
     <param pos="0" name="hw.vendor" value="Netia"/>
     <param pos="0" name="hw.product" value="Spot"/>
-    <param pos="0" name="hw.product" value="WAP"/>
+    <param pos="0" name="hw.device" value="WAP"/>
   </fingerprint>
   <fingerprint pattern="^hue personal wireless lighting$">
     <description>Philips Hue Personal Wireless Lighting</description>
     <example>hue personal wireless lighting</example>
@@ -221,58 +212,51 @@
     <param pos="0" name="hw.product" value="Hue"/>
     <param pos="0" name="hw.device" value="Light Bulb"/>
   </fingerprint>
   <fingerprint pattern="LANDesk\(R\) Management Agent$">
     <description>LANDesk Management Agent</description>
     <param pos="0" name="service.vendor" value="LANDesk"/>
     <param pos="0" name="service.product" value="Management Agent"/>
     <param pos="0" name="service.family" value="Management Agent"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:landesk:management_agent:-"/>
   </fingerprint>
   <fingerprint pattern="^(?:Parallels )?Plesk (?:(?:Onyx|Panel) )?([\d\.]+)$">
     <description>Plesk web hosting platform with a version</description>
     <example service.version="12.0.18">Plesk 12.0.18</example>
     <example service.version="17.5.3">Plesk Onyx 17.5.3</example>
     <example service.version="12.0.1">Parallels Plesk 12.0.1</example>
     <example service.version="11.5.30">Parallels Plesk Panel 11.5.30</example>
-    <param pos="0" name="service.vendor" value="Plesk"/>
+    <param pos="0" name="service.vendor" value="Parallels"/>
     <param pos="0" name="service.product" value="Plesk"/>
     <param pos="1" name="service.version"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:plesk:plesk:{service.version}"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:parallels:parallels_plesk_panel:{service.version}"/>
   </fingerprint>
   <fingerprint pattern="^(?:Parallels )?Plesk (?:(?:Onyx|Panel) )?([\d\.]+) for Microsoft Windows$">
     <description>Plesk web hosting platform with a version on Windows</description>
     <example service.version="12.5.30">Plesk 12.5.30 for Microsoft Windows</example>
     <example service.version="11.5.30">Parallels Plesk Panel 11.5.30 for Microsoft Windows</example>
-    <param pos="0" name="service.vendor" value="Plesk"/>
+    <param pos="0" name="service.vendor" value="Parallels"/>
     <param pos="0" name="service.product" value="Plesk"/>
     <param pos="1" name="service.version"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:plesk:plesk:{service.version}"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:parallels:parallels_plesk_panel:{service.version}"/>
     <param pos="0" name="os.vendor" value="Microsoft"/>
     <param pos="0" name="os.family" value="Windows"/>
     <param pos="0" name="os.product" value="Windows"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
   </fingerprint>
   <fingerprint pattern="^(?i)Default (?:Parallels )?Plesk (?:Panel )?Page$">
     <description>Plesk web hosting platform with no version</description>
     <example>Default Parallels Plesk Panel Page</example>
     <example>Default Parallels Plesk Page</example>
     <example>Default PLESK Page</example>
-    <param pos="0" name="service.vendor" value="Plesk"/>
+    <param pos="0" name="service.vendor" value="Parallels"/>
     <param pos="0" name="service.product" value="Plesk"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:plesk:plesk:-"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:parallels:parallels_plesk_panel:-"/>
   </fingerprint>
   <fingerprint pattern="^Web Viewer for Samsung DVR$">
     <description>Samsung DVRs</description>
     <example>Web Viewer for Samsung DVR</example>
     <param pos="0" name="hw.vendor" value="Samsung"/>
     <param pos="0" name="hw.device" value="DVR"/>
   </fingerprint>
   <fingerprint pattern="^(?i)(?:Dell )?Sonicwall - Authentication$">
     <description>Sonicwall firewalls</description>
     <example>SonicWall - Authentication</example>
@@ -280,7 +264,6 @@
     <param pos="0" name="os.device" value="Firewall"/>
     <param pos="0" name="os.family" value="SonicOS"/>
   </fingerprint>
   <fingerprint pattern="^(.*).nbsp;-.nbsp;Synology.nbsp;DiskStation$">
     <description>Synology DiskStation</description>
     <example host.name="DiskStation">DiskStation&amp;nbsp;-&amp;nbsp;Synology&amp;nbsp;DiskStation</example>
@@ -294,7 +277,6 @@
     <param pos="0" name="os.vendor" value="Synology"/>
     <param pos="1" name="host.name"/>
   </fingerprint>
   <fingerprint pattern="Synology Web Station!$">
     <description>Synology with WebStation web hosting</description>
     <example>Hello! Welcome to Synology Web Station!</example>
@@ -307,7 +289,6 @@
     <param pos="0" name="os.product" value="DSM"/>
     <param pos="0" name="os.vendor" value="Synology"/>
   </fingerprint>
   <fingerprint pattern="^Web Filter Block Override$">
     <description>Fortinet FortiGate/Fortiguard Web Filter</description>
     <example>Web Filter Block Override</example>
@@ -320,27 +301,30 @@
     <param pos="0" name="hw.family" value="FortiGate"/>
     <param pos="0" name="hw.device" value="Firewall"/>
   </fingerprint>
   <!-- Various products by Ubiquiti networks -->
   <fingerprint pattern="^Ubiquiti Networks$">
     <description>Generic products by Ubiquiti Networks</description>
     <example>Ubiquiti Networks</example>
     <param pos="0" name="hw.vendor" value="Ubiquiti"/>
   </fingerprint>
+  <fingerprint pattern="^UniFi Security Gateway$">
+    <description>Ubiquiti Security Gateway</description>
+    <example>UniFi Security Gateway</example>
+    <param pos="0" name="hw.vendor" value="Ubiquiti"/>
+    <param pos="0" name="hw.device" value="Router"/>
+    <param pos="0" name="hw.product" value="UniFi Security Gateway"/>
+  </fingerprint>
   <fingerprint pattern="^EdgeOS$">
     <description>Ubiquiti EdgeRouter/EdgeSwitch/etc</description>
     <example>EdgeOS</example>
     <param pos="0" name="hw.vendor" value="Ubiquiti"/>
   </fingerprint>
   <fingerprint pattern="^CloudKey$">
     <description>Ubiquiti UniFi Cloud Key</description>
     <example>CloudKey</example>
     <param pos="0" name="hw.vendor" value="Ubiquiti"/>
     <param pos="0" name="hw.product" value="UniFi Cloud Key"/>
   </fingerprint>
   <fingerprint pattern="^airCube$">
     <description>Ubiquiti airCube WAP</description>
     <example>airCube</example>
@@ -348,24 +332,21 @@
     <param pos="0" name="hw.product" value="airCube"/>
     <param pos="0" name="hw.device" value="WAP"/>
   </fingerprint>
   <fingerprint pattern="^UniFi Video$">
-    <description>Various UniFi Video products by Ubiquiti Networks</description>
+    <description>Various UniFi Video web service</description>
     <example>UniFi Video</example>
-    <param pos="0" name="hw.vendor" value="Ubiquiti"/>
-    <param pos="0" name="hw.family" value="UniFi"/>
-    <param pos="0" name="hw.device" value="Web Cam"/>
+    <param pos="0" name="service.vendor" value="Ubiquiti"/>
+    <param pos="0" name="service.product" value="UniFi Video"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:ui:unifi_video:-"/>
   </fingerprint>
   <fingerprint pattern="^UniFi NVR: Software Portal$">
     <description>UniFi NVR for recording from UniFi video cameras</description>
     <example>UniFi NVR: Software Portal</example>
     <param pos="0" name="hw.vendor" value="Ubiquiti"/>
     <param pos="0" name="hw.family" value="UniFi"/>
-    <param pos="0" name="hw.family" value="UniFi NVR"/>
+    <param pos="0" name="hw.product" value="UniFi NVR"/>
     <param pos="0" name="hw.device" value="DVR"/>
   </fingerprint>
   <fingerprint pattern="^RomPager Embedded Web Server Toolkit$">
     <description>Embedded HTTP server used by many vendors and device
       types, including APC, 3Com, Andover Controls, Cisco VoIP, D-Link,
@@ -376,7 +357,6 @@
     <param pos="0" name="service.vendor" value="Allegro Software"/>
     <param pos="0" name="service.product" value="RomPager"/>
   </fingerprint>
   <fingerprint pattern="^RouterOS router configuration page$">
     <description>MikroTik RouterOS router configuration page</description>
     <example>RouterOS router configuration page</example>
@@ -387,7 +367,6 @@
     <param pos="0" name="hw.vendor" value="MikroTik"/>
     <param pos="0" name="hw.device" value="Router"/>
   </fingerprint>
   <fingerprint pattern="^(?:Welcome to nginx!|Test Page for the Nginx HTTP Server)$">
     <description>Default OS-agnostic nginx</description>
     <example>Welcome to nginx!</example>
@@ -397,7 +376,6 @@
     <param pos="0" name="service.vendor" value="nginx"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:nginx:nginx:-"/>
   </fingerprint>
   <fingerprint pattern="^Test Page for the Nginx HTTP Server on (?:Fedora|EPEL)$">
     <description>Default nginx on Fedora</description>
     <example>Test Page for the Nginx HTTP Server on Fedora</example>
@@ -410,7 +388,6 @@
     <param pos="0" name="os.product" value="Fedora Core Linux"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:redhat:fedora_core:-"/>
   </fingerprint>
   <fingerprint pattern="^Welcome to nginx on Debian!$">
     <description>Default nginx on Debian</description>
     <example>Welcome to nginx on Debian!</example>
@@ -422,7 +399,6 @@
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:-"/>
   </fingerprint>
   <fingerprint pattern="^Eagle Eye Networks ">
     <description>Eagle Eye Networks to manage IoT cameras home webpage</description>
     <example>Eagle Eye Networks (Local)</example>
@@ -435,7 +411,6 @@
     <param pos="0" name="hw.product" value=" Bridge"/>
     <param pos="0" name="hw.vendor" value="Eagle Eye Networks"/>
   </fingerprint>
   <!-- Netgear Products -->
   <fingerprint pattern="^(?:NETGEAR|NetGear) ([a-zA-Z0-9\-\+]+)$">
     <description>Netgear Switches</description>
@@ -446,7 +421,6 @@
     <param pos="0" name="hw.device" value="Switch"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
   <fingerprint pattern="^(?:NETGEAR|NetGear) Router ([a-zA-Z0-9\-\+]+)$">
     <description>Netgear Routers</description>
     <example hw.product="WNR2000v4">NETGEAR Router WNR2000v4</example>
@@ -455,7 +429,6 @@
     <param pos="0" name="hw.device" value="Router"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
   <fingerprint pattern="^Netgear Prosafe Plus Switch$">
     <description>Netgear Prosafe Plus Switch</description>
     <example>Netgear Prosafe Plus Switch</example>
@@ -463,7 +436,6 @@
     <param pos="0" name="hw.device" value="Switch"/>
     <param pos="0" name="hw.product" value="Prosafe Plus"/>
   </fingerprint>
   <fingerprint pattern="^(.*).nbsp;Configuration and Management$">
     <description>Digi Terminal Servers</description>
     <example hw.product="Digi One SP">Digi One SP&amp;nbsp;Configuration and Management</example>
@@ -476,7 +448,6 @@
     <param pos="0" name="os.device" value="Device Server"/>
     <param pos="0" name="os.product" value="NET+OS"/>
   </fingerprint>
   <fingerprint pattern="^NPort Web Console$">
     <description>Moxa NPort Terminal Servers</description>
     <example>NPort Web Console</example>
@@ -484,7 +455,6 @@
     <param pos="0" name="hw.device" value="Device Server"/>
     <param pos="0" name="hw.product" value="NPort"/>
   </fingerprint>
   <fingerprint pattern="^Lantronix (SL[BC].*)$">
     <description>Lantronix terminal server</description>
     <example hw.product="SLB882/8824">Lantronix SLB882/8824</example>
@@ -494,7 +464,6 @@
     <param pos="0" name="hw.device" value="Device Server"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
   <fingerprint pattern="^(KN\S+) - Cover$">
     <description>ATEN KVM over IP</description>
     <example hw.product="KN4140v">KN4140v - Cover</example>
@@ -503,7 +472,6 @@
     <param pos="0" name="hw.device" value="KVM"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
   <fingerprint pattern="^Ethernet Relay Module$">
     <description>AVT.pl Ethernet Relay Module</description>
     <example>Ethernet Relay Module</example>
@@ -511,7 +479,6 @@
     <param pos="0" name="hw.device" value="Power Relay"/>
     <param pos="0" name="hw.product" value="Ethernet Relay Module"/>
   </fingerprint>
   <fingerprint pattern="^Inveo Lantick Ethernet Relay Controller$">
     <description>Inveo Lantick Ethernet Relay Controller</description>
     <example>Inveo Lantick Ethernet Relay Controller</example>
@@ -519,7 +486,6 @@
     <param pos="0" name="hw.device" value="Power Relay"/>
     <param pos="0" name="hw.product" value="Lantick Ethernet Relay Controller"/>
   </fingerprint>
   <fingerprint pattern="^(myUTN(?:-[a-zA-Z0-9]+)?) Control Center$">
     <description>myUTN Device Server</description>
     <example hw.product="myUTN-50a">myUTN-50a Control Center</example>
@@ -528,7 +494,6 @@
     <param pos="0" name="hw.device" value="Device Server"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
   <fingerprint pattern="^iCOM Control Board$">
     <description>Liebert iCOM Cooling Unit Control Board</description>
     <example>iCOM Control Board</example>
@@ -536,7 +501,6 @@
     <param pos="0" name="hw.device" value="Environment Control"/>
     <param pos="0" name="hw.product" value="iCOM Control Panel"/>
   </fingerprint>
   <fingerprint pattern="^Sigma Control 2$">
     <description>Sigma Control 2 Air Compressor Controls</description>
     <example>Sigma Control 2</example>
@@ -544,42 +508,34 @@
     <param pos="0" name="hw.device" value="Environment Control"/>
     <param pos="0" name="hw.product" value="Sigma Control 2"/>
   </fingerprint>
   <fingerprint pattern="^WebPower$">
     <description>Eltek Power Controller</description>
     <example>WebPower</example>
     <param pos="0" name="hw.vendor" value="Eltek"/>
-    <param pos="0" name="hw.device" value="Power Device"/>
+    <param pos="0" name="hw.device" value="Power device"/>
   </fingerprint>
   <fingerprint pattern="(Expert Power Control NET \d+x\d+) - (.*)$">
     <description>Gude Expert Power Control</description>
     <example host.name="Rack42" hw.product="Expert Power Control NET 2x6">Expert Power Control NET 2x6 - Rack42</example>
     <param pos="0" name="hw.vendor" value="Gude"/>
-    <param pos="0" name="hw.device" value="Power Device"/>
+    <param pos="0" name="hw.device" value="Power device"/>
     <param pos="1" name="hw.product"/>
     <param pos="2" name="host.name"/>
   </fingerprint>
   <fingerprint pattern="^Sentry Switched CDU$">
     <description>Sentry Switched CDU</description>
     <example>Sentry Switched CDU</example>
     <param pos="0" name="hw.vendor" value="ServerTech"/>
-    <param pos="0" name="hw.device" value="Power Device"/>
+    <param pos="0" name="hw.device" value="Power device"/>
     <param pos="0" name="hw.product" value="Sentry Switched CDU"/>
   </fingerprint>
   <fingerprint pattern="^Emerson Network Power Rack PDU Card$">
     <description>Emerson Network Power Rack PDU Card</description>
     <example>Emerson Network Power Rack PDU Card</example>
     <param pos="0" name="hw.vendor" value="Emerson"/>
-    <param pos="0" name="hw.device" value="Power Device"/>
+    <param pos="0" name="hw.device" value="Power device"/>
     <param pos="0" name="hw.product" value="Rack PDU Card"/>
   </fingerprint>
   <fingerprint pattern="^(.*) IntelliSlot Web(?:/\d+)? Card?$">
     <description>Emerson Network Power IntelliSlot Web Card and rebrands</description>
     <example hw.vendor="Emerson Network Power">Emerson Network Power IntelliSlot Web Card</example>
@@ -587,18 +543,16 @@
     <example hw.vendor="Vertiv">Vertiv IntelliSlot Web Card</example>
     <example hw.vendor="Liebert">Liebert IntelliSlot Web Card</example>
     <param pos="1" name="hw.vendor"/>
-    <param pos="0" name="hw.device" value="Power Device"/>
+    <param pos="0" name="hw.device" value="Power device"/>
     <param pos="0" name="hw.product" value="IntelliSlot Web Card"/>
   </fingerprint>
   <fingerprint pattern="^ConnectUPS Web/SNMP Card$">
     <description>ConnectUPS Web/SNMP Card</description>
     <example>ConnectUPS Web/SNMP Card</example>
     <param pos="0" name="hw.vendor" value="APC"/>
-    <param pos="0" name="hw.device" value="Power Device"/>
+    <param pos="0" name="hw.device" value="Power device"/>
     <param pos="0" name="hw.product" value="ConnectUPS Web Card"/>
   </fingerprint>
   <fingerprint pattern="^Calient Technologies Inc\.$">
     <description>Calient Photonic Switch</description>
     <example>Calient Technologies Inc.</example>
@@ -609,7 +563,6 @@
     <param pos="0" name="os.device" value="Switch"/>
     <param pos="0" name="os.family" value="Linux"/>
   </fingerprint>
   <fingerprint pattern="^Google Fiber Network Box Diagnostics$">
     <description>Google Fiber Router</description>
     <example>Google Fiber Network Box Diagnostics</example>
@@ -617,7 +570,6 @@
     <param pos="0" name="hw.device" value="Router"/>
     <param pos="0" name="hw.product" value="Fiber Network Box"/>
   </fingerprint>
   <fingerprint pattern="ServerView.* (iRMC S\d+) Web Server">
     <description>Fujitsu iRMC BMC</description>
     <example hw.product="iRMC S3" os.product="iRMC S3">ServerView Remote Management iRMC S3 Web Server</example>
@@ -629,7 +581,6 @@
     <param pos="0" name="os.vendor" value="Fujitsu"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
   <fingerprint pattern="^Cisco UCS KVM Direct$">
     <description>Cisco UCS KVM Direct</description>
     <example>Cisco UCS KVM Direct</example>
@@ -640,8 +591,8 @@
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="NX-OS"/>
     <param pos="0" name="os.certainty" value="0.8"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:cisco:nx-os:-"/>
   </fingerprint>
   <fingerprint pattern="^Cisco UCS Manager$">
     <description>Cisco UCS Manager</description>
     <example>Cisco UCS Manager</example>
@@ -652,8 +603,21 @@
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="NX-OS"/>
     <param pos="0" name="os.certainty" value="0.8"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:cisco:nx-os:-"/>
+  </fingerprint>
+  <fingerprint pattern="^Cisco (?:IMC Login|Integrated Management Controller)">
+    <description>Cisco Integrated Management Controller</description>
+    <example>Cisco Integrated Management Controller</example>
+    <example>Cisco Integrated Management Controller Login</example>
+    <example>Cisco Integrated Management Controller WebUI</example>
+    <example>Cisco IMC Login Page</example>
+    <param pos="0" name="hw.device" value="Lights Out Management"/>
+    <param pos="0" name="hw.vendor" value="Cisco"/>
+    <param pos="0" name="hw.product" value="IMC"/>
+    <param pos="0" name="os.vendor" value="Cisco"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="IMC"/>
   </fingerprint>
   <fingerprint pattern="^HPE Virtual Connect Manager$">
     <description>HPE Virtual Connect Manager</description>
     <example>HPE Virtual Connect Manager</example>
@@ -664,7 +628,6 @@
     <param pos="0" name="os.device" value="Lights Out Management"/>
     <param pos="0" name="os.product" value="iLO"/>
   </fingerprint>
   <fingerprint pattern="^HPE BladeSystem Onboard Administrator$">
     <description>HPE BladeSystem Onboard Administrator</description>
     <example>HPE BladeSystem Onboard Administrator</example>
@@ -672,7 +635,6 @@
     <param pos="0" name="hw.vendor" value="HPE"/>
     <param pos="0" name="hw.product" value="BladeSystem Onboard Administrator"/>
   </fingerprint>
   <fingerprint pattern="^HPE System Management Homepage$">
     <description>HPE System Management Homepage</description>
     <example>HPE System Management Homepage</example>
@@ -683,31 +645,30 @@
     <param pos="0" name="os.device" value="Lights Out Management"/>
     <param pos="0" name="os.product" value="iLO"/>
   </fingerprint>
   <fingerprint pattern="^HP Integrated Lights-Out$">
     <description>HP Integrated Lights-Out</description>
     <example>HP Integrated Lights-Out</example>
     <param pos="0" name="hw.device" value="Lights Out Management"/>
     <param pos="0" name="hw.vendor" value="HP"/>
     <param pos="0" name="hw.product" value="iLO"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:hp:integrated_lights_out:-"/>
     <param pos="0" name="os.vendor" value="HP"/>
     <param pos="0" name="os.device" value="Lights Out Management"/>
     <param pos="0" name="os.family" value="iLO"/>
     <param pos="0" name="os.product" value="iLO"/>
   </fingerprint>
   <fingerprint pattern="^HP Integrated Lights-Out 2$">
     <description>HP Integrated Lights-Out 2</description>
     <example>HP Integrated Lights-Out 2</example>
     <param pos="0" name="hw.device" value="Lights Out Management"/>
     <param pos="0" name="hw.vendor" value="HP"/>
     <param pos="0" name="hw.product" value="iLO"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:hp:integrated_lights_out:-"/>
     <param pos="0" name="os.vendor" value="HP"/>
     <param pos="0" name="os.device" value="Lights Out Management"/>
     <param pos="0" name="os.family" value="iLO"/>
     <param pos="0" name="os.product" value="iLO 2"/>
   </fingerprint>
   <fingerprint pattern="^(iLO \d+)$">
     <description>HP Integrated Lights-Out 3+</description>
     <example hw.product="iLO 3" os.product="iLO 3">iLO 3</example>
@@ -720,7 +681,6 @@
     <param pos="0" name="os.family" value="iLO"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
   <fingerprint pattern="^HPE SimpliVity OmniStack$">
     <description>HPE SimpliVity OmniStack</description>
     <example>HPE SimpliVity OmniStack</example>
@@ -728,7 +688,6 @@
     <param pos="0" name="hw.vendor" value="HPE"/>
     <param pos="0" name="hw.product" value="SimpliVity OmniStack"/>
   </fingerprint>
   <fingerprint pattern="^HPE (StoreEver \S+)$">
     <description>HPE StoreEver</description>
     <example hw.product="StoreEver MSL3040">HPE StoreEver MSL3040</example>
@@ -736,7 +695,6 @@
     <param pos="0" name="hw.vendor" value="HPE"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
   <fingerprint pattern="^Dell OpenManage Switch Administrator$">
     <description>Dell OpenManage Switch Administrator</description>
     <example>Dell OpenManage Switch Administrator</example>
@@ -744,7 +702,6 @@
     <param pos="0" name="hw.device" value="Switch"/>
     <param pos="0" name="hw.product" value="OpenManage Switch"/>
   </fingerprint>
   <fingerprint pattern="^(\S+)\s+-\s+ProCurve Switch (\S+) \((.*)\)$">
     <description>HPE ProCurve Switch w/Hostname</description>
     <example host.name="SW1" hw.product="4204vl" procurve.model="J8770A">SW1 - ProCurve Switch 4204vl (J8770A)</example>
@@ -754,7 +711,6 @@
     <param pos="1" name="host.name"/>
     <param pos="3" name="procurve.model"/>
   </fingerprint>
   <fingerprint pattern="^ProCurve Switch (\S+) \((.*)\)$">
     <description>HPE ProCurve Switch w/o Hostname</description>
     <example hw.product="2610-24/12PWR" procurve.model="J9086A">ProCurve Switch 2610-24/12PWR (J9086A)</example>
@@ -763,7 +719,6 @@
     <param pos="1" name="hw.product"/>
     <param pos="2" name="procurve.model"/>
   </fingerprint>
   <fingerprint pattern="^FlexiPacket Hub$">
     <description>Nokia Siemens FlexiPacket Hub</description>
     <example>FlexiPacket Hub</example>
@@ -771,7 +726,6 @@
     <param pos="0" name="hw.device" value="Switch"/>
     <param pos="0" name="hw.product" value="FlexiPacket Hub"/>
   </fingerprint>
   <fingerprint pattern="^R&amp;S Instrument VNC desktop$">
     <description>Rohde and Schwarz Remote Instrument (vnc)</description>
     <example>R&amp;S Instrument VNC desktop</example>
@@ -781,14 +735,12 @@
     <param pos="0" name="os.vendor" value="Rohde &amp; Schwarz"/>
     <param pos="0" name="os.family" value="Linux"/>
   </fingerprint>
   <fingerprint pattern="^Rohde &amp; Schwarz remote instrument$">
     <description>Rohde and Schwarz Remote Instrument (web admin)</description>
     <example>Rohde &amp; Schwarz remote instrument</example>
     <param pos="0" name="hw.device" value="Test Instrument"/>
     <param pos="0" name="hw.vendor" value="Rohde &amp; Schwarz"/>
   </fingerprint>
   <fingerprint pattern="^EXA$">
     <description>Keysight EXA Signal Analyzer</description>
     <example>EXA</example>
@@ -797,7 +749,6 @@
     <param pos="0" name="hw.product" value="EXA Signal Analyzer"/>
     <param pos="0" name="os.device" value="Test Instrument"/>
   </fingerprint>
   <fingerprint pattern="^MXA$">
     <description>Keysight MXA Signal Analyzer</description>
     <example>MXA</example>
@@ -806,7 +757,6 @@
     <param pos="0" name="hw.product" value="MXA Signal Analyzer"/>
     <param pos="0" name="os.device" value="Test Instrument"/>
   </fingerprint>
   <fingerprint pattern="^Paragon-100G$">
     <description>Calnex Paragon-100G</description>
     <example>Paragon-100G</example>
@@ -814,7 +764,6 @@
     <param pos="0" name="hw.device" value="Test Instrument"/>
     <param pos="0" name="hw.product" value="Paragon-100G"/>
   </fingerprint>
   <fingerprint pattern="^33521A$">
     <description>Keysight 33521A Waveform Generator</description>
     <example>33521A</example>
@@ -822,7 +771,6 @@
     <param pos="0" name="hw.device" value="Test Instrument"/>
     <param pos="0" name="hw.product" value="33521A Waveform Generator"/>
   </fingerprint>
   <fingerprint pattern="^34972A$">
     <description>Keysight 34972A Data Logger</description>
     <example>34972A</example>
@@ -830,7 +778,6 @@
     <param pos="0" name="hw.device" value="Test Instrument"/>
     <param pos="0" name="hw.product" value="34972A Data Logger"/>
   </fingerprint>
   <fingerprint pattern="^53230A$">
     <description>Agilent 53230A Frequency Counter</description>
     <example>53230A</example>
@@ -838,7 +785,6 @@
     <param pos="0" name="hw.device" value="Test Instrument"/>
     <param pos="0" name="hw.product" value="53230A Frequency Counter"/>
   </fingerprint>
   <fingerprint pattern="^Agilent 33220A \((.*)\)$">
     <description>Agilent 33220A</description>
     <example agilent.serial="MY44041111">Agilent 33220A (MY44041111)</example>
@@ -847,7 +793,6 @@
     <param pos="0" name="hw.product" value="33220A Waveform Generator"/>
     <param pos="1" name="agilent.serial"/>
   </fingerprint>
   <fingerprint pattern="^Agilent N5172B (?:EXG )?(MY\S+)$">
     <description>Agilent N5172B</description>
     <example agilent.serial="MY44041111">Agilent N5172B EXG MY44041111</example>
@@ -856,7 +801,6 @@
     <param pos="0" name="hw.product" value="N5172B Signal Generator"/>
     <param pos="1" name="agilent.serial"/>
   </fingerprint>
   <fingerprint pattern="^Polycom - Configuration Utility$">
     <description>Polycom IP Phone</description>
     <example>Polycom - Configuration Utility</example>
@@ -866,15 +810,12 @@
     <param pos="0" name="os.vendor" value="Polycom"/>
     <param pos="0" name="os.product" value="Polycom"/>
   </fingerprint>
   <fingerprint pattern="^Digium Phone Settings$">
     <description>Digium Phone Settings</description>
     <example>Digium Phone Settings</example>
     <param pos="0" name="hw.vendor" value="Digium"/>
     <param pos="0" name="hw.device" value="VoIP"/>
   </fingerprint>
   <fingerprint pattern="^(SPA\S+) Configuration Utility$">
     <description>Cisco IP Phone - SPA504G Configuration Utility</description>
     <example hw.product="SPA504G">SPA504G Configuration Utility</example>
@@ -882,7 +823,6 @@
     <param pos="0" name="hw.device" value="VoIP"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
   <fingerprint pattern="^Cisco (?:SPA Configuration|IP Phone)$">
     <description>Cisco IP Phone </description>
     <example>Cisco SPA Configuration</example>
@@ -890,14 +830,12 @@
     <param pos="0" name="hw.vendor" value="Cisco"/>
     <param pos="0" name="hw.device" value="VoIP"/>
   </fingerprint>
   <fingerprint pattern="^Cisco IP Camera$">
     <description>Cisco IP Camera</description>
     <example>Cisco IP Camera</example>
     <param pos="0" name="hw.vendor" value="Cisco"/>
-    <param pos="0" name="hw.device" value="Web Cam"/>
+    <param pos="0" name="hw.device" value="Web cam"/>
   </fingerprint>
   <fingerprint pattern="^Cisco TelePresence MCU">
     <description>Cisco TelePresence MCU - Home page</description>
     <example>Cisco TelePresence MCU - Home page</example>
@@ -906,7 +844,6 @@
     <param pos="0" name="hw.device" value="Video Conferencing"/>
     <param pos="0" name="hw.product" value="TelePresence MCU"/>
   </fingerprint>
   <fingerprint pattern="^Cisco (Nexus \d+\S+)$">
     <description>Cisco Nexus Virtual Switch</description>
     <example hw.product="Nexus 1000V">Cisco Nexus 1000V</example>
@@ -914,7 +851,6 @@
     <param pos="0" name="hw.device" value="Switch"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
   <fingerprint pattern="^Cisco Catalyst Switch - Home$">
     <description>Cisco Catalyst Switch</description>
     <example>Cisco Catalyst Switch - Home</example>
@@ -923,8 +859,8 @@
     <param pos="0" name="hw.product" value="Catalyst"/>
     <param pos="0" name="os.vendor" value="Cisco"/>
     <param pos="0" name="os.product" value="CatOS"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:cisco:catos:-"/>
   </fingerprint>
   <fingerprint pattern="^Cisco MDS 9000(?: and Nexus 5000)? Management Modules (\d+\.\d+\S+)$">
     <description>Cisco MDS 9000/Nexus 5000</description>
     <example os.version="7.3(1)D1(1)">Cisco MDS 9000 and Nexus 5000 Management Modules 7.3(1)D1(1)</example>
@@ -933,12 +869,94 @@
     <param pos="0" name="hw.vendor" value="Cisco"/>
     <param pos="0" name="hw.device" value="Switch"/>
     <param pos="0" name="hw.product" value="MDS 9000"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:cisco:mds_9000:-"/>
     <param pos="0" name="os.vendor" value="Cisco"/>
     <param pos="0" name="os.device" value="Switch"/>
     <param pos="0" name="os.product" value="MDS 9000"/>
     <param pos="1" name="os.version"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:cisco:mds_9000:{os.version}"/>
+  </fingerprint>
+  <fingerprint pattern="^Stealthwatch Management Console$">
+    <description>Stealthwatch Management Console</description>
+    <example>Stealthwatch Management Console</example>
+    <param pos="0" name="hw.vendor" value="Cisco"/>
+    <param pos="0" name="hw.device" value="Security Appliance"/>
+    <param pos="0" name="hw.product" value="Stealthwatch"/>
+    <param pos="0" name="os.vendor" value="Cisco"/>
+    <param pos="0" name="os.device" value="Security Appliance"/>
+    <param pos="0" name="os.product" value="Stealthwatch"/>
+  </fingerprint>
+  <fingerprint pattern="^Cisco vManage$">
+    <description>Cisco vManage SD-WAN</description>
+    <example>Cisco vManage</example>
+    <param pos="0" name="hw.vendor" value="Cisco"/>
+    <param pos="0" name="hw.device" value="SD-WAN Appliance"/>
+    <param pos="0" name="hw.product" value="vManage"/>
+    <param pos="0" name="os.vendor" value="Cisco"/>
+    <param pos="0" name="os.device" value="SD-WAN Appliance"/>
+    <param pos="0" name="os.product" value="vManage"/>
+  </fingerprint>
+  <fingerprint pattern="^Login - Cisco DNA Center$">
+    <description>Cisco DNA Center Appliance</description>
+    <example>Login - Cisco DNA Center</example>
+    <param pos="0" name="hw.vendor" value="Cisco"/>
+    <param pos="0" name="hw.device" value="Network Management Device"/>
+    <param pos="0" name="hw.product" value="DNA Center"/>
+    <param pos="0" name="os.vendor" value="Cisco"/>
+    <param pos="0" name="os.device" value="Network Management Device"/>
+    <param pos="0" name="os.product" value="DNA Center"/>
+  </fingerprint>
+  <fingerprint pattern="^Cisco (?:Enterprise )?NFVIS$">
+    <description>Cisco NFVIS</description>
+    <example>Cisco NFVIS</example>
+    <example>Cisco Enterprise NFVIS</example>
+    <param pos="0" name="hw.vendor" value="Cisco"/>
+    <param pos="0" name="hw.device" value="Network Management Device"/>
+    <param pos="0" name="hw.product" value="NFVIS"/>
+    <param pos="0" name="os.vendor" value="Cisco"/>
+    <param pos="0" name="os.device" value="Network Management Device"/>
+    <param pos="0" name="os.product" value="NFVIS"/>
+  </fingerprint>
+  <fingerprint pattern="^Cisco Systems Login$">
+    <description>Cisco WLC</description>
+    <example>Cisco Systems Login</example>
+    <param pos="0" name="os.vendor" value="Cisco"/>
+    <param pos="0" name="os.device" value="Wireless Controller"/>
+    <param pos="0" name="os.product" value="Wireless LAN Controller"/>
+    <param pos="0" name="hw.vendor" value="Cisco"/>
+    <param pos="0" name="hw.device" value="Wireless Controller"/>
+    <param pos="0" name="hw.product" value="Wireless LAN Controller"/>
+  </fingerprint>
+  <fingerprint pattern="^Duo Access Gateway$">
+    <description>Duo Access Gateway</description>
+    <example>Duo Access Gateway</example>
+    <param pos="0" name="hw.vendor" value="Duo"/>
+    <param pos="0" name="hw.device" value="Security Appliance"/>
+    <param pos="0" name="hw.product" value="Access Gateway"/>
+    <param pos="0" name="os.vendor" value="Duo"/>
+    <param pos="0" name="os.device" value="Security Appliance"/>
+    <param pos="0" name="os.product" value="Access Gateway"/>
+  </fingerprint>
+  <fingerprint pattern="^Login - Duo Network Gateway$">
+    <description>Duo Network Gateway</description>
+    <example>Login - Duo Network Gateway</example>
+    <param pos="0" name="hw.vendor" value="Duo"/>
+    <param pos="0" name="hw.device" value="Security Appliance"/>
+    <param pos="0" name="hw.product" value="Network Gateway"/>
+    <param pos="0" name="os.vendor" value="Duo"/>
+    <param pos="0" name="os.device" value="Security Appliance"/>
+    <param pos="0" name="os.product" value="Network Gateway"/>
+  </fingerprint>
+  <fingerprint pattern="^VBrick Rev">
+    <description>VBrick Rev</description>
+    <example>VBrick Rev</example>
+    <param pos="0" name="hw.vendor" value="Cisco"/>
+    <param pos="0" name="hw.device" value="Video Conferencing"/>
+    <param pos="0" name="hw.product" value="VBrick Rev"/>
+    <param pos="0" name="os.vendor" value="Cisco"/>
+    <param pos="0" name="os.device" value="Video Conferencing"/>
+    <param pos="0" name="os.product" value="VBrick Rev"/>
   </fingerprint>
   <fingerprint pattern="^(LinxVII-\S+) Remote Access$">
     <description>LinxVII-5S Data Terminal</description>
     <example hw.product="LinxVII-5S">LinxVII-5S Remote Access</example>
@@ -946,46 +964,41 @@
     <param pos="0" name="hw.device" value="Data Terminal"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
   <fingerprint pattern="^Datalogic Mobile Portable$">
     <description>Datalogic Mobile Portable</description>
     <example>Datalogic Mobile Portable</example>
     <param pos="0" name="hw.vendor" value="Datalogic Mobile"/>
     <param pos="0" name="hw.device" value="Handheld Scanner"/>
   </fingerprint>
   <fingerprint pattern="^AXIS$">
     <description>Axis Communications Web Cam</description>
     <example>AXIS</example>
     <param pos="0" name="hw.vendor" value="AXIS"/>
-    <param pos="0" name="hw.device" value="Web Cam"/>
+    <param pos="0" name="hw.device" value="Web cam"/>
     <param pos="0" name="os.vendor" value="AXIS"/>
-    <param pos="0" name="os.device" value="Web Cam"/>
     <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.device" value="Web cam"/>
   </fingerprint>
   <fingerprint pattern="^Hanwha Techwin$">
     <description>Hanwha Techwin IP Camera</description>
     <example>Hanwha Techwin</example>
     <param pos="0" name="hw.vendor" value="Hanwha Techwin"/>
-    <param pos="0" name="hw.device" value="Web Cam"/>
+    <param pos="0" name="hw.device" value="Web cam"/>
     <param pos="0" name="os.vendor" value="Hanwha Techwin"/>
-    <param pos="0" name="os.device" value="Web Cam"/>
+    <param pos="0" name="os.device" value="Web cam"/>
     <param pos="0" name="os.family" value="Linux"/>
   </fingerprint>
   <fingerprint pattern="^(WV-NS\S+) Network Camera$">
     <description>WV-NS202A Network Camera</description>
     <example hw.product="WV-NS202A">WV-NS202A Network Camera</example>
     <example hw.product="WV-NS954">WV-NS954 Network Camera</example>
     <param pos="0" name="hw.vendor" value="Panasonic"/>
-    <param pos="0" name="hw.device" value="Web Cam"/>
+    <param pos="0" name="hw.device" value="Web cam"/>
     <param pos="1" name="hw.product"/>
     <param pos="0" name="os.vendor" value="Panasonic"/>
-    <param pos="0" name="os.device" value="Web Cam"/>
+    <param pos="0" name="os.device" value="Web cam"/>
     <param pos="0" name="os.family" value="Linux"/>
   </fingerprint>
   <fingerprint pattern="^KACE Systems Management Appliance">
     <description>KACE Systems Management Appliances</description>
     <example>KACE Systems Management Appliance Service Center</example>
@@ -995,7 +1008,6 @@
     <param pos="0" name="os.vendor" value="KACE"/>
     <param pos="0" name="os.family" value="FreeBSD"/>
   </fingerprint>
   <fingerprint pattern="Portal.*Powered by BOMGAR$">
     <description>Bomgar Appliances</description>
     <example>Remote Support Portal | Powered by BOMGAR</example>
@@ -1005,7 +1017,6 @@
     <param pos="0" name="os.vendor" value="Bomgar"/>
     <param pos="0" name="os.family" value="Linux"/>
   </fingerprint>
   <fingerprint pattern="^XRoads Network Appliance Administration$">
     <description>XRoads SD-WAN Network Appliance </description>
     <example>XRoads Network Appliance Administration</example>
@@ -1014,7 +1025,6 @@
     <param pos="0" name="os.vendor" value="XRoads"/>
     <param pos="0" name="os.family" value="Linux"/>
   </fingerprint>
   <!-- An OEM of the Quantum Corporation SuperLoader 3 -->
   <fingerprint pattern="^On Board Remote Management$">
     <description>PowerVault 124T Tape Library</description>
@@ -1024,8 +1034,7 @@
     <param pos="0" name="hw.product" value="PowerVault 124T"/>
     <param pos="0" name="os.vendor" value="Dell"/>
   </fingerprint>
- <fingerprint pattern="^(HD-RX-\S+)$">
+  <fingerprint pattern="^(HD-RX-\S+)$">
     <description>Crestron Multiformat Receivers</description>
     <example hw.product="HD-RX-201-C-E">HD-RX-201-C-E</example>
     <param pos="0" name="hw.vendor" value="Crestron"/>
@@ -1033,8 +1042,7 @@
     <param pos="1" name="hw.product"/>
     <param pos="0" name="os.vendor" value="Crestron"/>
   </fingerprint>
- <fingerprint pattern="^Lencore Sound Manager 2$">
+  <fingerprint pattern="^Lencore Sound Manager 2$">
     <description>Lencore Sound Manager 2</description>
     <example>Lencore Sound Manager 2</example>
     <param pos="0" name="hw.vendor" value="Lencore"/>
@@ -1043,10 +1051,8 @@
     <param pos="0" name="os.vendor" value="i.LON"/>
     <param pos="0" name="os.product" value="SmartServer"/>
   </fingerprint>
- <!-- Various ICS/OT -->
- <fingerprint pattern="^CTI (25\S+) Main Menu$">
+  <!-- Various ICS/OT -->
+  <fingerprint pattern="^CTI (25\S+) Main Menu$">
     <description>Siemens 257x Ethernet Adapter (CTI Branded)</description>
     <example hw.product="2572-A">CTI 2572-A Main Menu</example>
     <param pos="0" name="hw.vendor" value="Siemens"/>
@@ -1054,7 +1060,6 @@
     <param pos="1" name="hw.product"/>
     <param pos="0" name="os.vendor" value="Siemens"/>
   </fingerprint>
   <fingerprint pattern="^(25\S+) Ethernet TCP/IP Module$">
     <description>Siemens 257x Ethernet Adapter</description>
     <example hw.product="2572-B">2572-B Ethernet TCP/IP Module</example>
@@ -1063,7 +1068,6 @@
     <param pos="1" name="hw.product"/>
     <param pos="0" name="os.vendor" value="Siemens"/>
   </fingerprint>
   <fingerprint pattern="^ECOM100 Main$">
     <description>DirectLOGIC DL205 communication module</description>
     <example>ECOM100 Main</example>
@@ -1072,7 +1076,6 @@
     <param pos="0" name="hw.product" value="ECOM100"/>
     <param pos="0" name="os.vendor" value="DirectLOGIC"/>
   </fingerprint>
   <fingerprint pattern="^(1794-\S+) FLEX Ethernet Adapter$">
     <description>Allen-Bradley 1794-AENTR FLEX Ethernet Adapter</description>
     <example hw.product="1794-AENTR">1794-AENTR FLEX Ethernet Adapter</example>
@@ -1081,7 +1084,6 @@
     <param pos="1" name="hw.product"/>
     <param pos="0" name="os.vendor" value="Allen-Bradley"/>
   </fingerprint>
   <fingerprint pattern="^Anybus-CC EtherNet/IP$">
     <description>Anybus-CC EtherNet/IP</description>
     <example>Anybus-CC EtherNet/IP</example>
@@ -1090,7 +1092,6 @@
     <param pos="0" name="hw.product" value="CC EtherNet/IP"/>
     <param pos="0" name="os.vendor" value="AnyBus"/>
   </fingerprint>
   <fingerprint pattern="^Symmetry 2DBC">
     <description>AMAG Technology Symmetry EN-2DBC Access Controller</description>
     <example>Symmetry 2DBC STD APP (EN2DBC_00_EF_4F)</example>
@@ -1099,7 +1100,6 @@
     <param pos="0" name="hw.product" value="Symmetry EN-2DBC"/>
     <param pos="0" name="os.vendor" value="AMAG Technology"/>
   </fingerprint>
   <fingerprint pattern="^(1747-\S+) Home Page$">
     <description>Allen-Bradley 1747-LXXX SLC 5/05 Controller</description>
     <example hw.product="1747-L551">1747-L551 Home Page</example>
@@ -1110,7 +1110,6 @@
     <param pos="1" name="hw.product"/>
     <param pos="0" name="os.vendor" value="Allen-Bradley"/>
   </fingerprint>
   <fingerprint pattern="^(1766-\S+) (B/\S+)$">
     <description>Allen-Bradley 1766-L32BXB PLC</description>
     <example hw.product="1766-L32BXB" os.product="1766-L32BXB" os.version="B/11.00">1766-L32BXB B/11.00</example>
@@ -1122,7 +1121,6 @@
     <param pos="1" name="os.product"/>
     <param pos="2" name="os.version"/>
   </fingerprint>
   <fingerprint pattern="^PLC-5 Ethernet Base Page$">
     <description>PLC-5 Ethernet Interface Module</description>
     <example>PLC-5 Ethernet Base Page</example>
@@ -1133,7 +1131,6 @@
     <param pos="0" name="os.device" value="PLC"/>
     <param pos="0" name="os.product" value="PLC-5"/>
   </fingerprint>
   <fingerprint pattern="^(1761-NET-\S+)$">
     <description>Allen-Bradley Ethernet Module</description>
     <example hw.product="1761-NET-EN">1761-NET-EN</example>
@@ -1143,7 +1140,6 @@
     <param pos="1" name="hw.product"/>
     <param pos="0" name="os.vendor" value="Allen-Bradley"/>
   </fingerprint>
   <fingerprint pattern="^(1785-\S+) Ethernet Base Page$">
     <description>Allen-Bradley 1785 Ethernet Module</description>
     <example hw.product="1785-ENET">1785-ENET Ethernet Base Page</example>
@@ -1152,7 +1148,6 @@
     <param pos="1" name="hw.product"/>
     <param pos="0" name="os.vendor" value="Allen-Bradley"/>
   </fingerprint>
   <fingerprint pattern="^NFT S7 - DALI-Gateway\(Ethernet\)$">
     <description>NFT DALI S7 Ethernet Module</description>
     <example>NFT S7 - DALI-Gateway(Ethernet)</example>
@@ -1161,7 +1156,6 @@
     <param pos="0" name="hw.product" value="S7 DALI Gateway"/>
     <param pos="0" name="os.vendor" value="NFT"/>
   </fingerprint>
   <fingerprint pattern="^IBHLink S7\+\+$">
     <description>IBHsofte IBHLink S7++</description>
     <example>IBHLink S7++</example>
@@ -1170,18 +1164,13 @@
     <param pos="0" name="hw.product" value="IBHLink S7++"/>
     <param pos="0" name="os.vendor" value="IBHsofte"/>
   </fingerprint>
   <!-- Software and Appliances -->
   <fingerprint pattern="^S7/S5 OPC Server$">
     <description>Softing Industrial S7/S5 OPC Server</description>
     <example>S7/S5 OPC Server</example>
     <param pos="0" name="service.vendor" value="Softing"/>
     <param pos="0" name="service.product" value="S7/S5 OPC Server"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:softing:s7-s5-opc-server:-"/>
   </fingerprint>
   <fingerprint pattern="^Nessus$">
     <description>Nessus</description>
     <example>Nessus</example>
@@ -1189,7 +1178,6 @@
     <param pos="0" name="service.product" value="Nessus"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:tenable:nessus:-"/>
   </fingerprint>
   <fingerprint pattern="^Tenable Appliance$">
     <description>Tenable Appliance</description>
     <example>Tenable Appliance</example>
@@ -1197,7 +1185,6 @@
     <param pos="0" name="hw.device" value="Security Appliance"/>
     <param pos="0" name="hw.product" value="Tenable Appliance"/>
   </fingerprint>
   <fingerprint pattern="^(?:Welcome to Citrix )?XenServer ([0-9\.]+)$">
     <description>XenServer</description>
     <example service.version="7.2.0">Welcome to Citrix XenServer 7.2.0</example>
@@ -1207,40 +1194,33 @@
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:citrix:xenserver:{service.version}"/>
   </fingerprint>
   <fingerprint pattern="^RabbitMQ Management$">
     <description>RabbitMQ Management</description>
     <example>RabbitMQ Management</example>
     <param pos="0" name="service.vendor" value="RabbitMQ"/>
     <param pos="0" name="service.product" value="Management Server"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:rabbitmq:rabbitmq-manager:-"/>
   </fingerprint>
   <fingerprint pattern="^Statistics Report for HAProxy$">
     <description>HAProxy Stats Server</description>
     <example>Statistics Report for HAProxy</example>
     <param pos="0" name="service.vendor" value="HAProxy"/>
     <param pos="0" name="service.product" value="HAProxy Stats Server"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:haproxy:stats-server:-"/>
   </fingerprint>
   <fingerprint pattern="^Open Manage&amp;trade;$">
-    <description>Dell Open Manage Admin</description>
+    <description>Dell OpenManage Admin</description>
     <example>Open Manage&amp;trade;</example>
     <param pos="0" name="service.vendor" value="Dell"/>
-    <param pos="0" name="service.product" value="Open Manage"/>
+    <param pos="0" name="service.product" value="OpenManage"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:dell:openmanage:-"/>
   </fingerprint>
   <fingerprint pattern="^TightVNC desktop \[(.*)\]$">
     <description>TightVNC Web Server</description>
     <example host.name="teller01">TightVNC desktop [teller01]</example>
     <param pos="0" name="service.vendor" value="TightVNC"/>
     <param pos="0" name="service.product" value="Desktop"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:tightvnc:desktop:-"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:tightvnc:tightvnc:-"/>
     <param pos="1" name="host.name"/>
   </fingerprint>
   <fingerprint pattern="^noVNC$">
     <description>noVNC Web Server</description>
     <example>noVNC</example>
@@ -1248,7 +1228,6 @@
     <param pos="0" name="service.product" value="noVNC"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:novnc:novnc:-"/>
   </fingerprint>
   <fingerprint pattern="^.* \[Jenkins\]$">
     <description>Jenkins Customized Dashboard</description>
     <example>Continuous Integrations [Jenkins]</example>
@@ -1257,39 +1236,31 @@
     <param pos="0" name="service.product" value="Jenkins"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:jenkins:jenkins:-"/>
   </fingerprint>
   <fingerprint pattern="^Shell In A Box$">
     <description>Shell In A Box (OSS Project)</description>
     <example>Shell In A Box</example>
     <param pos="0" name="service.vendor" value="ShellInABox"/>
     <param pos="0" name="service.product" value="ShellInABox"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:shellinabox:shellinabox:-"/>
   </fingerprint>
   <fingerprint pattern="^AgilentLicenseManagerService Service$">
     <description>Agilent License Manager Service</description>
     <example>AgilentLicenseManagerService Service</example>
     <param pos="0" name="service.vendor" value="Agilent"/>
     <param pos="0" name="service.product" value="License Manager"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:agilent:license-manager-"/>
   </fingerprint>
   <fingerprint pattern="^Red Hat OpenStack Platform Director$">
     <description>Red Hat OpenStack Platform Director</description>
     <example>Red Hat OpenStack Platform Director</example>
     <param pos="0" name="service.vendor" value="Red Hat"/>
     <param pos="0" name="service.product" value="Open Stack Platform Director"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:openstack:platform-director:-"/>
   </fingerprint>
   <fingerprint pattern="^splunkd$">
     <description>Splunk HTTP server used in the web interface, forwarders, indexers and more</description>
     <example>splunkd</example>
     <param pos="0" name="service.vendor" value="Splunk"/>
-    <param pos="0" name="service.product" value="Splunkd"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:splunk:splunkd:-"/>
+    <param pos="0" name="service.product" value="Splunk"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:splunk:splunk:-"/>
   </fingerprint>
   <fingerprint pattern="^VMware Horizon$">
     <description>VMware Horizon</description>
     <example>VMware Horizon</example>
@@ -1297,7 +1268,17 @@
     <param pos="0" name="service.product" value="Horizon"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:vmware:horizon:-"/>
   </fingerprint>
+  <fingerprint pattern="^Welcome to VMware Site Recovery Manager$">
+    <description>VMware SRM</description>
+    <example>Welcome to VMware Site Recovery Manager</example>
+    <param pos="0" name="os.vendor" value="VMWare"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="hw.vendor" value="VMWare"/>
+    <param pos="0" name="hw.device" value="Appliance"/>
+    <param pos="0" name="hw.product" value="Site Recovery Manager"/>
+    <param pos="0" name="service.vendor" value="VMWare"/>
+    <param pos="0" name="service.product" value="Site Recovery Manager"/>
+  </fingerprint>
   <fingerprint pattern="^Graylog Web Interface$">
     <description>Graylog Web Interface</description>
     <example>Graylog Web Interface</example>
@@ -1305,31 +1286,40 @@
     <param pos="0" name="service.product" value="Graylog"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:graylog:graylog:-"/>
   </fingerprint>
+  <!-- The 'vendor' here has changed over time -->
+  <fingerprint pattern="^Kibana$">
+    <description>Kibana Web Interface</description>
+    <example>Kibana</example>
+    <param pos="0" name="service.vendor" value="Kibana"/>
+    <param pos="0" name="service.product" value="Kibana"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:elasticsearch:kibana:-"/>
+  </fingerprint>
+  <fingerprint pattern="^Grafana$">
+    <description>Grafana Web Interface</description>
+    <example>Grafana</example>
+    <param pos="0" name="service.vendor" value="Grafana"/>
+    <param pos="0" name="service.product" value="Grafana"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:grafana:grafana:-"/>
+  </fingerprint>
   <fingerprint pattern="^Symantec Endpoint Protection Manager$">
     <description>Symantec Endpoint Protection Manager</description>
     <example>Symantec Endpoint Protection Manager</example>
     <param pos="0" name="service.vendor" value="Symantec"/>
     <param pos="0" name="service.product" value="Endpoint Protection Manager"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:symantec:endpoint-protection-manager:-"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:symantec:endpoint_protection_manager:-"/>
   </fingerprint>
   <fingerprint pattern="^Login Gateway - Kiwi Syslog Web Access$">
     <description>Kiwi Syslog Web Access</description>
     <example>Login Gateway - Kiwi Syslog Web Access</example>
     <param pos="0" name="service.vendor" value="Solarwinds"/>
     <param pos="0" name="service.product" value="Kiwi Syslog Web Access"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:solarwinds:kiwi-syslog-web:-"/>
   </fingerprint>
   <fingerprint pattern="^Hadoop Administration$">
     <description>Hadoop Administration Web Service</description>
     <example>Hadoop Administration</example>
     <param pos="0" name="service.vendor" value="Hadoop"/>
     <param pos="0" name="service.product" value="Hadoop Web Admin"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:hadoop:web-admin:-"/>
   </fingerprint>
   <fingerprint pattern="^ManageEngine OpManager$">
     <description>ManageEngine OpManager</description>
     <example>ManageEngine OpManager</example>
@@ -1337,5 +1327,129 @@
     <param pos="0" name="service.product" value="OpManager"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:manageengine:opmanager:-"/>
   </fingerprint>
+  <fingerprint pattern="^(ScanFront \d.+)Web Menu$">
+    <!-- no space between the product model and "Web Menu" in the title -->
+    <description>Canon ScanFront</description>
+    <example os.product="ScanFront 220" hw.product="ScanFront 220">ScanFront 220Web Menu</example>
+    <param pos="0" name="hw.device" value="Scanner"/>
+    <param pos="0" name="hw.vendor" value="Canon"/>
+    <param pos="1" name="hw.product"/>
+    <param pos="0" name="os.device" value="Scanner"/>
+    <param pos="0" name="os.vendor" value="Canon"/>
+    <param pos="1" name="os.product"/>
+  </fingerprint>
+  <fingerprint pattern="^CDVI Update$">
+    <description>CDVI Door Control System</description>
+    <example>CDVI Update</example>
+    <param pos="0" name="hw.vendor" value="CDVI"/>
+    <param pos="0" name="hw.device" value="Access Controller"/>
+  </fingerprint>
+  <fingerprint pattern="^Liebert OpenComms Network Interface Card$">
+    <description>Liebert UPS</description>
+    <example>Liebert OpenComms Network Interface Card</example>
+    <param pos="0" name="hw.device" value="Power device"/>
+    <param pos="0" name="hw.vendor" value="Liebert"/>
+    <param pos="0" name="os.device" value="Power device"/>
+    <param pos="0" name="os.vendor" value="Liebert"/>
+  </fingerprint>
+  <fingerprint pattern="^Excella Main Page$">
+    <description>MagTek Excella STX Check Scanner</description>
+    <example>Excella Main Page</example>
+    <param pos="0" name="hw.device" value="Check Scanner"/>
+    <param pos="0" name="hw.vendor" value="MagTek"/>
+    <param pos="0" name="hw.product" value="Excella"/>
+    <param pos="0" name="os.device" value="Check Scanner"/>
+    <param pos="0" name="os.vendor" value="MagTek"/>
+    <param pos="0" name="os.product" value="Excella"/>
+  </fingerprint>
+  <fingerprint pattern="^B426$">
+    <description>Bosch Security Systems Ethernet Module (Alarm Panel)</description>
+    <example>B426</example>
+    <param pos="0" name="hw.device" value="Alarm Panel"/>
+    <param pos="0" name="hw.vendor" value="Bosch"/>
+    <param pos="0" name="os.device" value="Alarm Panel"/>
+    <param pos="0" name="os.vendor" value="Bosch"/>
+  </fingerprint>
+  <fingerprint pattern="^Citrix Login$">
+    <description>Citrix NetScaler</description>
+    <example>Citrix Login</example>
+    <param pos="0" name="os.vendor" value="Citrix"/>
+    <param pos="0" name="os.family" value="NetScaler"/>
+    <param pos="0" name="os.device" value="Network Management Device"/>
+    <param pos="0" name="os.product" value="NetScaler"/>
+    <param pos="0" name="service.vendor" value="Citrix"/>
+    <param pos="0" name="service.family" value="NetScaler"/>
+    <param pos="0" name="service.device" value="Network Management Device"/>
+    <param pos="0" name="service.product" value="NetScaler"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:citrix:netscaler:-"/>
+  </fingerprint>
+  <fingerprint pattern="^HP (?:Color )?LaserJet ([^&amp;]+)&amp;">
+    <description>HP LaserJet</description>
+    <example hw.product="M1536dnf MFP">HP LaserJet M1536dnf MFP&amp;nbsp;&amp;nbsp;&amp;nbsp;1.1.1.1</example>
+    <param pos="0" name="hw.vendor" value="HP"/>
+    <param pos="0" name="hw.family" value="LaserJet"/>
+    <param pos="0" name="hw.device" value="Printer"/>
+    <param pos="1" name="hw.product"/>
+  </fingerprint>
+  <fingerprint pattern="^Jamf Pro Login - Jamf Pro v(\S+)$">
+    <description>Jamf Pro</description>
+    <example service.version="10.14.0-t1563397490">Jamf Pro Login - Jamf Pro v10.14.0-t1563397490</example>
+    <param pos="0" name="service.vendor" value="Jamf"/>
+    <param pos="0" name="service.product" value="Jamf Pro"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:jamf:jamf:{service.version}"/>
+  </fingerprint>
+  <fingerprint pattern="^Keyper Systems Administration - Login$">
+    <description>Keyper Systems Administration - Login</description>
+    <example>Keyper Systems Administration - Login</example>
+    <param pos="0" name="hw.vendor" value="Keyper"/>
+    <param pos="0" name="hw.device" value="Access Control"/>
+    <param pos="0" name="hw.product" value="Key Management"/>
+  </fingerprint>
+  <fingerprint pattern="FireEye:\s*$">
+    <description>FireEye Investigation Analysis System Appliance</description>
+    <example>FireEye:</example>
+    <param pos="0" name="hw.vendor" value="FireEye"/>
+    <param pos="0" name="hw.product" value="IA Appliance"/>
+    <param pos="0" name="hw.device" value="Security Appliance"/>
+  </fingerprint>
+  <fingerprint pattern="^GigaVUE-OS$">
+    <description>Gigamon GigaVUE Appliance</description>
+    <example>GigaVUE-OS</example>
+    <param pos="0" name="hw.vendor" value="Gigamon"/>
+    <param pos="0" name="hw.device" value="Monitoring"/>
+    <param pos="0" name="hw.product" value="GigaVUE"/>
+  </fingerprint>
+  <fingerprint pattern="^Pure Storage Login$">
+    <description>Pure Storage Appliance</description>
+    <example>Pure Storage Login</example>
+    <param pos="0" name="hw.vendor" value="Pure Storage"/>
+    <param pos="0" name="hw.device" value="NAS"/>
+    <param pos="0" name="hw.product" value="Appliance"/>
+  </fingerprint>
+  <fingerprint pattern="^CRESTRON$">
+    <description>Crestron Video Conferencing</description>
+    <example>CRESTRON</example>
+    <param pos="0" name="hw.vendor" value="Crestron"/>
+    <param pos="0" name="hw.device" value="Video Conferencing"/>
+    <param pos="0" name="os.vendor" value="Crestron"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.device" value="Video Conferencing"/>
+  </fingerprint>
+  <fingerprint pattern="^ELAN Viewer Installation$">
+    <description>ELAN Smart Home Controller</description>
+    <example>ELAN Viewer Installation</example>
+    <param pos="0" name="hw.vendor" value="ELAN"/>
+    <param pos="0" name="hw.device" value="Building Automation"/>
+    <param pos="0" name="hw.product" value="Home Controller"/>
+    <param pos="0" name="os.vendor" value="ELAN"/>
+    <param pos="0" name="os.family" value="Linux"/>
+  </fingerprint>
+  <fingerprint pattern="^iTach IP2IR Setup and Configuration$">
+    <description>iTach IP2IR</description>
+    <example>iTach IP2IR Setup and Configuration</example>
+    <param pos="0" name="hw.vendor" value="iTach"/>
+    <param pos="0" name="hw.device" value="Device"/>
+    <param pos="0" name="hw.product" value="IP2IR"/>
+  </fingerprint>
 </fingerprints>