recog 2.3.21 → 2.3.22

data/xml/http_servers.xml

@@ -199,7 +199,7 @@
     <param pos="2" name="apache.info"/>
   </fingerprint>
 
-  <fingerprint pattern="(?i)^CouchDB/([\.\d]+) .*$">
+  <fingerprint pattern="(?i)^CouchDB/([\.\d]+)">
     <description>Apache CouchDB</description>
     <example service.version="2.1.1">CouchDB/2.1.1 (Erlang OTP/20)</example>
     <param pos="0" name="service.vendor" value="Apache"/>
@@ -711,7 +711,7 @@
     <param pos="0" name="service.cpe23" value="cpe:/a:oracle:web_cache:{service.version}"/>
   </fingerprint>
 
-  <fingerprint pattern="^OracleAS-Web-Cache-10g/([\d.]+).*">
+  <fingerprint pattern="^OracleAS-Web-Cache-10g/([\d.]+)">
     <description>Oracle Application Server Web Cache</description>
     <example service.version="10.1.2.3.0">OracleAS-Web-Cache-10g/10.1.2.3.0</example>
     <param pos="0" name="service.vendor" value="Oracle"/>
@@ -1207,7 +1207,7 @@
     <param pos="1" name="apache.variant.version"/>
   </fingerprint>
 
-  <fingerprint pattern="(?i)^(?:IBM_HTTP_SERVER|IBM-HTTP-SERVER)$">
+  <fingerprint pattern="(?i)^IBM_HTTP_SERVER|IBM-HTTP-SERVER$">
     <description>IBM HTTP Server with no version info</description>
     <example>IBM_HTTP_SERVER</example>
     <example>IBM_HTTP_Server</example>
@@ -1445,7 +1445,7 @@
     <param pos="0" name="service.cpe23" value="cpe:/a:squid-cache:squid:-"/>
   </fingerprint>
 
-  <fingerprint pattern="^thttpd/(\d\.[\w.]+)-MX\s*.*$">
+  <fingerprint pattern="^thttpd/(\d\.[\w.]+)-MX\s*">
     <description>ACME thttpd with SSL support</description>
     <example service.version="2.19">thttpd/2.19-MX Jan 24 2006</example>
     <param pos="0" name="service.vendor" value="ACME"/>
@@ -1470,7 +1470,7 @@
     <param pos="0" name="service.cpe23" value="cpe:/a:acme:thttpd:{service.version}"/>
   </fingerprint>
 
-  <fingerprint pattern="(?i)^lighttpd(?:/(\d[\d.]+))?.*$">
+  <fingerprint pattern="(?i)^lighttpd(?:/(\d[\d.]+))?">
     <description>Lighttpd</description>
     <example>lighttpd</example>
     <example>Lighttpd</example>
@@ -1528,7 +1528,7 @@
     <param pos="0" name="service.cpe23" value="cpe:/a:ibm:lotus_domino:{service.version}"/>
   </fingerprint>
 
-  <fingerprint pattern="^WebLogic (?:WebLogic )?Server (\d+\.\d+(?:\s+SP\d+)?)\s+.*$">
+  <fingerprint pattern="^WebLogic (?:WebLogic )?Server (\d+\.\d+(?:\s+SP\d+)?)\s+">
     <description>BEA WebLogic</description>
     <example service.version="8.1 SP3">WebLogic Server 8.1 SP3 Tue Jun 29 23:11:19 PDT 2004 404973</example>
     <example service.version="7.0 SP4">WebLogic Server 7.0 SP4 Tue Aug 12 11:22:26 PDT 2003</example>
@@ -1945,7 +1945,7 @@
     <param pos="0" name="os.product" value="Appliance"/>
   </fingerprint>
 
-  <fingerprint pattern="^(?:BigIP|BIG-IP)$">
+  <fingerprint pattern="^BigIP|BIG-IP$">
     <description>F5 BIG-IP</description>
     <param pos="0" name="service.vendor" value="F5"/>
     <param pos="0" name="service.product" value="BIG-IP LTM"/>
@@ -2064,7 +2064,7 @@
     <param pos="0" name="hw.device" value="Multifunction Device"/>
   </fingerprint>
 
-  <fingerprint pattern=".*Linksys.*">
+  <fingerprint pattern="Linksys">
     <description>Linksys Wireless Access Point</description>
     <param pos="0" name="os.vendor" value="Linksys"/>
     <param pos="0" name="os.device" value="WAP"/>
@@ -2087,7 +2087,7 @@
     <param pos="0" name="hw.vendor" value="Cisco"/>
   </fingerprint>
 
-  <fingerprint pattern="^cisco-IOS/([^\s]+) HTTP-server/.*$">
+  <fingerprint pattern="^cisco-IOS/([^\s]+) HTTP-server/">
     <description>Cisco IOS with version information</description>
     <example>cisco-IOS/12.1 HTTP-server/1.0(1)</example>
     <param pos="0" name="service.vendor" value="Cisco"/>
@@ -2159,7 +2159,7 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
   </fingerprint>
 
-  <fingerprint pattern="^Agent-ListenServer-HttpSvr/.*$">
+  <fingerprint pattern="^Agent-ListenServer-HttpSvr/">
     <description>McAfee ePolicy Orchestrator</description>
     <param pos="0" name="service.vendor" value="McAfee"/>
     <param pos="0" name="service.product" value="ePolicy Orchestrator"/>
@@ -2167,7 +2167,7 @@
     <param pos="0" name="service.cpe23" value="cpe:/a:mcafee:epolicy_orchestrator:-"/>
   </fingerprint>
 
-  <fingerprint pattern="^LANDesk Management Agent/.*$">
+  <fingerprint pattern="^LANDesk Management Agent/">
     <description>LANDesk Management Agent</description>
     <param pos="0" name="service.vendor" value="LANDesk"/>
     <param pos="0" name="service.product" value="Management Agent"/>
@@ -2308,7 +2308,7 @@
     <param pos="0" name="os.device" value="IP Camera"/>
   </fingerprint>
 
-  <fingerprint pattern="^ListManagerWeb/(\S+) .*$">
+  <fingerprint pattern="^ListManagerWeb/(\S+)">
     <description>Lyris ListManager</description>
     <example>ListManagerWeb/8.8a (based on Tcl-Webserver/3.4.2)</example>
     <param pos="0" name="service.vendor" value="Lyris"/>
@@ -2887,7 +2887,7 @@
     <param pos="0" name="service.cpe23" value="cpe:/a:treck:tcp\/ip:{service.version}"/>
   </fingerprint>
 
-  <fingerprint pattern="^WEBrick/([\d\.]+) .*$">
+  <fingerprint pattern="^WEBrick/([\d\.]+)">
     <description>WEBrick default setup</description>
     <example service.version="1.3.1">WEBrick/1.3.1 (Ruby/1.9.3/2013-02-22)</example>
     <param pos="0" name="service.vendor" value="Ruby-Lang"/>
@@ -3148,7 +3148,7 @@
     <param pos="0" name="service.cpe23" value="cpe:/a:intel:active_management_technology:{service.version}"/>
   </fingerprint>
 
-  <fingerprint pattern="^(?:AMT|Intel\(R\) Active Management Technology)$">
+  <fingerprint pattern="^AMT|Intel\(R\) Active Management Technology$">
     <description>Intel(R) Active Management Technology (AMT) without a version</description>
     <example>AMT</example>
     <example>Intel(R) Active Management Technology</example>
@@ -3340,6 +3340,19 @@
     <param pos="0" name="os.device" value="WAP"/>
   </fingerprint>
 
+  <fingerprint pattern="(?i)^(AsusWRT)\/(\S+) UPnP/\S+ MiniUPnPd/([\d.]+)$">
+    <description>AsusWRT Firmware</description>
+    <example os.product="AsusWRT" os.version="3.0.0.4" service.version="1.9">AsusWRT/3.0.0.4 UPnP/1.1 MiniUPnPd/1.9</example>
+    <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
+    <param pos="0" name="service.product" value="MiniUPnPd"/>
+    <param pos="3" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:miniupnp_project:miniupnpd:{service.version}"/>
+    <param pos="0" name="os.vendor" value="Asus"/>
+    <param pos="1" name="os.product"/>
+    <param pos="2" name="os.version"/>
+    <param pos="0" name="os.device" value="Router"/>
+  </fingerprint>
+
   <fingerprint pattern="(?i)^DrayTek/Vigor(\S+) UPnP/\S+ miniupnpd/([\d.]+)$">
     <description>DrayTek Vigor router UPnP Server</description>
     <example service.version="1.0" hw.model="2130">DrayTek/Vigor2130 UPnP/1.0 miniupnpd/1.0</example>
@@ -3937,6 +3950,15 @@
     <param pos="0" name="hw.device" value="Router"/>
   </fingerprint>
 
+  <fingerprint pattern="^TP-LINK HTTPD/1.0$">
+    <description>TP-Link httpd</description>
+    <example>TP-LINK HTTPD/1.0</example>
+    <param pos="0" name="service.vendor" value="TP-LINK"/>
+    <param pos="0" name="os.vendor" value="TP-LINK"/>
+    <param pos="0" name="hw.vendor" value="TP-LINK"/>
+    <param pos="0" name="hw.device" value="Device"/>
+  </fingerprint>
+
   <fingerprint pattern="^Linux/(\S+\_eureka_1), UPnP/[\d\.]+, Portable SDK for UPnP devices/(\S+)$">
     <description>Siqura Video Encoder</description>
     <example>Linux/2.6.37_eureka_1, UPnP/1.0, Portable SDK for UPnP devices/1.6.6</example>
@@ -4090,6 +4112,7 @@
     <param pos="0" name="hw.product" value="Roku"/>
     <param pos="0" name="hw.device" value="Media Server"/>
     <param pos="1" name="hw.version"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:roku:roku:{hw.version}"/>
   </fingerprint>
 
   <fingerprint pattern="^Roku/(\S+) UPnP/\S+ Roku/\S+$">
@@ -4099,6 +4122,7 @@
     <param pos="0" name="hw.product" value="Roku"/>
     <param pos="0" name="hw.device" value="Media Server"/>
     <param pos="1" name="hw.version"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:roku:roku:{hw.version}"/>
   </fingerprint>
 
   <fingerprint pattern="^Roku UPnP/\S+ MiniUPnPd/([\d\.]+)$">
@@ -4107,6 +4131,7 @@
     <param pos="0" name="hw.vendor" value="Roku"/>
     <param pos="0" name="hw.product" value="Roku"/>
     <param pos="0" name="hw.device" value="Media Server"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:roku:roku:-"/>
     <param pos="0" name="service.vendor" value="MiniUPnP Project"/>
     <param pos="0" name="service.product" value="MiniUPnPd"/>
     <param pos="1" name="service.version"/>
@@ -4544,6 +4569,14 @@
     <param pos="0" name="hw.device" value="IP Camera"/>
   </fingerprint>
 
+  <fingerprint pattern="UNMS (\d+\.\d+\.\d+)">
+    <description>Ubiquiti UNMS</description>
+    <example>302 Found UNMS 1.2.7</example>
+    <param pos="0" name="service.vendor" value="Ubiquiti"/>
+    <param pos="0" name="service.product" value="UNMS"/>
+    <param pos="1" name="service.version"/>
+  </fingerprint>
+
   <fingerprint pattern="^xxxxxxxx-xxxxx$">
     <description>Fortinet - device unknown</description>
     <example>xxxxxxxx-xxxxx</example>
@@ -4555,4 +4588,31 @@
     <param pos="0" name="hw.vendor" value="Fortinet"/>
   </fingerprint>
 
+  <fingerprint pattern="^VBrick (\S+) Server$">
+    <description>VBrick Encoding Server</description>
+    <example service.product="VB6000">VBrick VB6000 Server</example>
+    <param pos="0" name="service.vendor" value="VBrick"/>
+    <param pos="1" name="service.product"/>
+    <param pos="0" name="hw.product" value="{service.product}"/>
+    <param pos="0" name="hw.vendor" value="{service.vendor}"/>
+    <param pos="0" name="hw.device" value="Video Encoder"/>
+  </fingerprint>
+
+  <fingerprint pattern="^kx-ns1000$">
+    <description>Panasonic KX-NS1000 IP PBX</description>
+    <example>kx-ns1000</example>
+    <param pos="0" name="hw.product" value="KX-NS1000"/>
+    <param pos="0" name="hw.vendor" value="Panasonic"/>
+    <param pos="0" name="hw.device" value="VoIP Server"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Oce Express WebTools$">
+    <description>Oce Printer</description>
+    <example>Oce Express WebTools</example>
+    <param pos="0" name="service.vendor" value="Oce"/>
+    <param pos="0" name="service.product" value="Express WebTools"/>
+    <param pos="0" name="hw.vendor" value="Oce"/>
+    <param pos="0" name="hw.device" value="Printer"/>
+  </fingerprint>
+
 </fingerprints>

data/xml/http_wwwauth.xml

@@ -78,7 +78,7 @@
     <param pos="1" name="hw.product"/>
   </fingerprint>
 
-  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;Cisco_CCSP_CWMP_TCPCR&quot;.*$">
+  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;Cisco_CCSP_CWMP_TCPCR&quot;">
     <description>Generic Cisco CWMP/CPE equipment</description>
     <example>Basic realm="Cisco_CCSP_CWMP_TCPCR"</example>
     <param pos="0" name="hw.vendor" value="Cisco"/>
@@ -97,7 +97,7 @@
     <param pos="0" name="os.product" value="Firewall-1"/>
   </fingerprint>
 
-  <fingerprint pattern="(?i)^(?:Basic|Digest).*realm=&quot;cpanel&quot;.*">
+  <fingerprint pattern="(?i)^(?:Basic|Digest).*realm=&quot;cpanel&quot;">
     <description>cPanel</description>
     <example>Basic realm="cPanel"</example>
     <param pos="0" name="service.vendor" value="cPanel"/>
@@ -114,7 +114,7 @@
     <param pos="0" name="os.device" value="Power Device"/>
   </fingerprint>
 
-  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;ADSL\S* (?:Modem|Router|Modem/Router)&quot;.*$">
+  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;ADSL\S* (?:Modem|Router|Modem/Router)&quot;">
     <description>Generic ADSL modems/routers</description>
     <example>Basic realm="ADSL Modem"</example>
     <example>Basic realm="ADSL Modem/Router"</example>
@@ -123,19 +123,19 @@
     <param pos="0" name="hw.device" value="ADSL Modem"/>
   </fingerprint>
 
-  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;Broadband Router&quot;.*$">
+  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;Broadband Router&quot;">
     <description>Generic Broadband modems/routers</description>
     <example>Basic realm="Broadband Router"</example>
     <param pos="0" name="hw.device" value="Broadband Router"/>
   </fingerprint>
 
-  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;DSL\S* (?:Modem|Router|Modem/Router)&quot;.*$">
+  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;DSL\S* (?:Modem|Router|Modem/Router)&quot;">
     <description>Generic DSL modems/routers</description>
     <example>Basic realm="DSL Modem"</example>
     <param pos="0" name="hw.device" value="DSL Modem"/>
   </fingerprint>
 
-  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;DVR&quot;.*$">
+  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;DVR&quot;">
     <description>Generic DVR</description>
     <example>Basic realm="DVR"</example>
     <param pos="0" name="hw.device" value="DVR"/>
@@ -143,7 +143,7 @@
 
   <!-- Hikvision is OEMd by a number of DVR manufacturers -->
 
-  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;(?i:hikvision)&quot;.*$">
+  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;(?i:hikvision)&quot;">
     <description>Web server found on DVR and webcam servers sourced from Hikvision</description>
     <example>Basic realm="hikvision"</example>
     <param pos="0" name="service.vendor" value="Hikvision"/>
@@ -154,20 +154,20 @@
     <param pos="0" name="hw.device" value="DVR"/>
   </fingerprint>
 
-  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;Merit LILIN Ent\. Co\., Ltd.&quot;.*$">
+  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;Merit LILIN Ent\. Co\., Ltd.&quot;">
     <description>Merit LILIN generic device</description>
     <example>Basic realm="Merit LILIN Ent. Co., Ltd,"</example>
     <example>Basic realm="Merit LILIN Ent. Co., Ltd."</example>
     <param pos="0" name="hw.vendor" value="Merit LILIN"/>
   </fingerprint>
 
-  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;Wireless Access Point&quot;.*$">
+  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;Wireless Access Point&quot;">
     <description>Generic WAP</description>
     <example>Basic realm="Wireless Access Point"</example>
     <param pos="0" name="hw.device" value="WAP"/>
   </fingerprint>
 
-  <fingerprint pattern="(?i)^(?:Basic|Digest).*realm=&quot;(?:(?:Cube|(?:Mini )?Dome|Day/Night|PAN/Tilt|POE|IR|HD|H.264|Surveillance|Wired|Wireless(?: N)?|Network|Internet|(?:IP(?:[\s_-])?)?Cameras?[\s_]*\d*) ?){1,4}?(?: Login)?&quot;.*$">
+  <fingerprint pattern="(?i)^(?:Basic|Digest).*realm=&quot;(?:(?:Cube|(?:Mini )?Dome|Day/Night|PAN/Tilt|POE|IR|HD|H.264|Surveillance|Wired|Wireless(?: N)?|Network|Internet|(?:IP(?:[\s_-])?)?Cameras?[\s_]*\d*) ?){1,4}?(?: Login)?&quot;">
     <description>Generic IP Cameras</description>
     <example>Basic realm="camera"</example>
     <example>Basic realm="IPCamera Login"</example>
@@ -175,7 +175,7 @@
     <param pos="0" name="hw.device" value="IP Camera"/>
   </fingerprint>
 
-  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;(DCS-[^&quot;]+)&quot;.*$">
+  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;(DCS-[^&quot;]+)&quot;">
     <description>D-Link DCS IP Cameras</description>
     <example hw.product="DCS-5222LB1">Basic realm="DCS-5222LB1"</example>
     <example hw.product="DCS-2530L">Basic realm="DCS-2530L"</example>
@@ -184,7 +184,7 @@
     <param pos="1" name="hw.product"/>
   </fingerprint>
 
-  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;GoAhead&quot;.*$">
+  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;GoAhead&quot;">
     <description>GoAhead webserver</description>
     <example>Basic realm="GoAhead"</example>
     <param pos="0" name="service.vendor" value="Oracle"/>
@@ -192,14 +192,14 @@
     <param pos="0" name="service.family" value="GoAhead Webserver"/>
   </fingerprint>
 
-  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;Logitech Media Server&quot;.*$">
+  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;Logitech Media Server&quot;">
     <description>Logitech Media server</description>
     <example>Basic realm="Logitech Media Server"</example>
     <param pos="0" name="service.vendor" value="Logitech"/>
     <param pos="0" name="service.product" value="Squeezebox"/>
   </fingerprint>
 
-  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;kubernetes-master&quot;.*$">
+  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;kubernetes-master&quot;">
     <description>Kubernetes master nodes</description>
     <example>Basic realm="kubernetes-master"</example>
     <param pos="0" name="service.vendor" value="Kubernetes"/>
@@ -208,7 +208,7 @@
     <param pos="0" name="service.cpe23" value="cpe:/a:kubernetes:kubernetes:-"/>
   </fingerprint>
 
-  <fingerprint pattern="(?i)^(?:Basic|Digest) realm=&quot;RUIJIE(?:-CPE)?&quot;.*$">
+  <fingerprint pattern="(?i)^(?:Basic|Digest) realm=&quot;RUIJIE(?:-CPE)?&quot;">
     <description>Ruijie Networks generic</description>
     <example>Digest realm="RUIJIE-CPE"</example>
     <param pos="0" name="hw.vendor" value="Ruijie"/>
@@ -279,7 +279,7 @@
     <param pos="2" name="host.mac"/>
   </fingerprint>
 
-  <fingerprint pattern="^(?:Basic|Digest).*realm=&quot;Thomson(?: Gateway)?&quot;.*$">
+  <fingerprint pattern="^(?:Basic|Digest).*realm=&quot;Thomson(?: Gateway)?&quot;">
     <description>Thomson generic devices</description>
     <example>Digest realm="Thomson Gateway"</example>
     <example>Basic realm="Thomson"</example>
@@ -303,7 +303,7 @@
     <param pos="1" name="hw.product"/>
   </fingerprint>
 
-  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;HuaweiHomeGateway&quot;.*$">
+  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;HuaweiHomeGateway&quot;">
     <description>Huawei Home Gateway Routers</description>
     <example>Basic realm="HuaweiHomeGateway"</example>
     <param pos="0" name="hw.vendor" value="Huawei"/>
@@ -311,7 +311,7 @@
     <param pos="0" name="hw.product" value="Home Gateway"/>
   </fingerprint>
 
-  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;EchoLife .*&quot;.*$">
+  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;EchoLife .*&quot;">
     <description>Huawei EchoLife Home Gateways</description>
     <example>Basic realm="EchoLife Portal de Inicio"</example>
     <example>Basic realm="EchoLife Home Gateway"</example>
@@ -361,7 +361,7 @@
     <param pos="1" name="hw.product"/>
   </fingerprint>
 
-  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;TP-LINK.*(?:Access Point|Extender|AP) ([A-Z0-9\-\+]+)&quot;.*$">
+  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;TP-LINK.*(?:Access Point|Extender|AP) ([A-Z0-9\-\+]+)&quot;">
     <description>TP-LINK SoHo Router - verbose variant</description>
     <example os.product="WA801N">Basic realm="TP-LINK Wireless N Access Point WA801N"</example>
     <example hw.product="WA830RE">Basic realm="TP-LINK Wireless Range Extender WA830RE"</example>
@@ -387,7 +387,7 @@
     <param pos="1" name="hw.product"/>
   </fingerprint>
 
-  <fingerprint pattern="(?i)^(?:Basic|Digest).*realm=&quot;TP-LINK (.*Router.*)&quot;.*$">
+  <fingerprint pattern="(?i)^(?:Basic|Digest).*realm=&quot;TP-LINK (.*Router.*)&quot;">
     <description>TP-LINK Routers</description>
     <example>Basic realm="TP-LINK Wireless N Router WR841N"</example>
     <example>Basic realm="TP-LINK Gigabit Broadband VPN Router R600VPN"</example>
@@ -397,21 +397,21 @@
     <param pos="1" name="hw.product"/>
   </fingerprint>
 
-  <fingerprint pattern="(?i)^(?:Basic|Digest).*realm=&quot;TP-LINK IP-Camera&quot;.*$">
+  <fingerprint pattern="(?i)^(?:Basic|Digest).*realm=&quot;TP-LINK IP-Camera&quot;">
     <description>TP-LINK IP-Cameras</description>
     <example>Basic realm="TP-LINK IP-Camera"</example>
     <param pos="0" name="hw.vendor" value="TP-LINK"/>
     <param pos="0" name="hw.device" value="IP Camera"/>
   </fingerprint>
 
-  <fingerprint pattern="(?i)^(?:Basic|Digest) .*realm=&quot;Broadcom Management Service&quot;.*$">
+  <fingerprint pattern="(?i)^(?:Basic|Digest) .*realm=&quot;Broadcom Management Service&quot;">
     <description>Supposedly part of Broadcom Advanced Control Suite 3 (BACS3) or something similar</description>
     <example>Digest qop="auth", realm="Broadcom Management Service", nonce="AAAAAAAAAAAAAP//DwHpMwYy1zc=", algorithm="MD5"</example>
     <param pos="0" name="service.vendor" value="Broadcom"/>
     <param pos="0" name="service.product" value="Management Service"/>
   </fingerprint>
 
-  <fingerprint pattern="^(?:Basic|Digest) .*realm=&quot;SWAT&quot;.*$">
+  <fingerprint pattern="^(?:Basic|Digest) .*realm=&quot;SWAT&quot;">
     <description>Samba Web Administration Tool (SWAT)</description>
     <example>Basic realm="SWAT"</example>
     <param pos="0" name="service.vendor" value="Samba"/>
@@ -419,7 +419,7 @@
     <param pos="0" name="service.product" value="SWAT"/>
   </fingerprint>
 
-  <fingerprint pattern="^.{0,1024}(?:Basic|Digest) realm=&quot;SPIP Configuration&quot;.*$">
+  <fingerprint pattern="^.{0,1000}(?:Basic|Digest) realm=&quot;SPIP Configuration&quot;">
     <description>SPIP publishing system (www.spip.net)</description>
     <example>Basic realm="SPIP Configuration", Digest realm="SPIP Configuration", nonce="116761147", algorithm="MD5"</example>
     <param pos="0" name="service.vendor" value="SPIP"/>
@@ -427,7 +427,7 @@
     <param pos="0" name="service.cpe23" value="cpe:/a:spip:spip:-"/>
   </fingerprint>
 
-  <fingerprint pattern="^.{0,1024}(?:Basic|Digest) .*realm=&quot;HP ISEE @ ([^&quot;]+)&quot;.*$">
+  <fingerprint pattern="^.{0,1000}(?:Basic|Digest) .*realm=&quot;HP ISEE @ ([^&quot;]+)&quot;">
     <description>HP Instant Support Enterprise Edition with a hostname</description>
     <example host.name="blah">Basic realm="HP ISEE @ blah"</example>
     <param pos="0" name="service.vendor" value="HP"/>
@@ -435,7 +435,7 @@
     <param pos="1" name="host.name"/>
   </fingerprint>
 
-  <fingerprint pattern="^.{0,1024}(?:Basic|Digest) .*realm=&quot;BIG-IP&quot;.*$">
+  <fingerprint pattern="^.{0,1000}(?:Basic|Digest) .*realm=&quot;BIG-IP&quot;">
     <description>Generic F5 Big-IP</description>
     <example>Basic realm="BIG-IP"</example>
     <param pos="0" name="service.vendor" value="F5"/>
@@ -467,13 +467,13 @@
     <param pos="1" name="os.product"/>
   </fingerprint>
 
-  <fingerprint pattern="(?i)^(?:Basic|Digest).*realm=&quot;SERCOMM CPE Authentication&quot;.*$">
+  <fingerprint pattern="(?i)^(?:Basic|Digest).*realm=&quot;SERCOMM CPE Authentication&quot;">
     <description>Assorted Sercomm CPE devices</description>
     <example>Digest realm="SERCOMM CPE Authentication"</example>
     <param pos="0" name="hw.vendor" value="Sercomm"/>
   </fingerprint>
 
-  <fingerprint pattern="(?i)^(?:Basic|Digest).*realm=&quot;TiVo DVR&quot;.*$">
+  <fingerprint pattern="(?i)^(?:Basic|Digest).*realm=&quot;TiVo DVR&quot;">
     <description>Tivo DVR</description>
     <example>Digest realm="TiVo DVR"</example>
     <param pos="0" name="hw.vendor" value="Tivo"/>
@@ -481,7 +481,7 @@
     <param pos="0" name="hw.device" value="DVR"/>
   </fingerprint>
 
-  <fingerprint pattern="(?i)^(?:Basic|Digest).*realm=&quot;UBEE&quot;.*$">
+  <fingerprint pattern="(?i)^(?:Basic|Digest).*realm=&quot;UBEE&quot;">
     <description>Ubee Cable Modems</description>
     <example>Digest qop="auth", realm="Ubee", nonce="1544738973"</example>
     <param pos="0" name="hw.vendor" value="Ubee"/>
@@ -496,13 +496,13 @@
     <param pos="0" name="service.family" value="Oracle"/>
   </fingerprint>
 
-  <fingerprint pattern="(?i)^(?:Basic|Digest).*realm=&quot;cpe@zte.com&quot;.*$">
+  <fingerprint pattern="(?i)^(?:Basic|Digest).*realm=&quot;cpe@zte.com&quot;">
     <description>Assorted ZTE CPE devices</description>
     <example>Digest realm="cpe@zte.com"</example>
     <param pos="0" name="hw.vendor" value="ZTE"/>
   </fingerprint>
 
-  <fingerprint pattern="(?i)^(?:Basic|Digest).*realm=&quot;ZXHN (\S+)&quot;.*$">
+  <fingerprint pattern="(?i)^(?:Basic|Digest).*realm=&quot;ZXHN (\S+)&quot;">
     <description>ZTE ZXHN router</description>
     <example>Basic realm="ZXHN H108L"</example>
     <param pos="0" name="hw.vendor" value="ZTE"/>
@@ -511,7 +511,7 @@
     <param pos="1" name="hw.product"/>
   </fingerprint>
 
-  <fingerprint pattern="(?i)^(?:Basic|Digest).*realm=&quot;(ZXV\S* \S+)&quot;.*$">
+  <fingerprint pattern="(?i)^(?:Basic|Digest).*realm=&quot;(ZXV\S* \S+)&quot;">
     <description>ZTE ZXV router</description>
     <example hw.product="ZXV10 W300">Basic realm="ZXV10 W300"</example>
     <param pos="0" name="hw.vendor" value="ZTE"/>
@@ -540,7 +540,7 @@
     <param pos="0" name="os.product" value="Linux"/>
   </fingerprint>
 
-  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;NETGEAR (Orbi(?:-(?:micro|mini))?)&quot;.*$">
+  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;NETGEAR (Orbi(?:-(?:micro|mini))?)&quot;">
     <description>Netgear Orbi</description>
     <example hw.product="Orbi">Basic realm="NETGEAR Orbi"</example>
     <example hw.product="Orbi-micro">Basic realm="NETGEAR Orbi-micro"</example>
@@ -551,7 +551,7 @@
     <param pos="1" name="hw.product"/>
   </fingerprint>
 
-  <fingerprint pattern="(?:Basic|Digest) realm=&quot;NETGEAR ([a-zA-Z0-9\-\+]+)\s*&quot;.*$">
+  <fingerprint pattern="(?:Basic|Digest) realm=&quot;NETGEAR ([a-zA-Z0-9\-\+]+)\s*&quot;">
     <description>Netgear Routers</description>
     <example hw.product="DG834">Basic realm="NETGEAR DG834  "</example>
     <example hw.product="C7000v2">Basic realm="NETGEAR C7000v2"</example>
@@ -563,7 +563,7 @@
 
   <!-- Fallback to the most generic Netgear match -->
 
-  <fingerprint pattern="(?:Basic|Digest) realm=&quot;Netgear&quot;.*$">
+  <fingerprint pattern="(?:Basic|Digest) realm=&quot;Netgear&quot;">
     <description>Netgear Unspecified Router</description>
     <example>Basic realm="Netgear"</example>
     <param pos="0" name="hw.vendor" value="Netgear"/>
@@ -581,7 +581,7 @@
     <param pos="1" name="hw.product"/>
   </fingerprint>
 
-  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;[iI]RMC(?:@(IRMC[0-9a-fA-F]{6}))?&quot;.*$">
+  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;[iI]RMC(?:@(IRMC[0-9a-fA-F]{6}))?&quot;">
     <description>Fujitsu Siemens Primergy with BMC RemoteView on an iRMC card</description>
     <example host.name="IRMCA0EC88">Digest realm="iRMC@IRMCA0EC88", qop="auth", nonce="d569ace4-00029040", opaque="29040", stale="FALSE"</example>
     <param pos="0" name="service.vendor" value="Fujitsu Siemens"/>
@@ -593,6 +593,75 @@
     <param pos="1" name="host.name"/>
   </fingerprint>
 
+  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;DELL \| SonicWALL SonicPoint">
+    <description>SonicWall SonicPoint (non-specific)</description>
+    <example>Basic realm="DELL | SonicWALL SonicPoint ACe/ACi/N2"</example>
+    <param pos="0" name="os.vendor" value="SonicWall"/>
+    <param pos="0" name="os.device" value="WAP"/>
+    <param pos="0" name="os.product" value="SonicOS"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:sonicwall:sonicos:-"/>
+    <param pos="0" name="hw.vendor" value="SonicWall"/>
+    <param pos="0" name="hw.product" value="SonicPoint"/>
+  </fingerprint>
+
+  <fingerprint pattern="(?i)^(?:Basic|Digest).*realm=&quot;rokudev&quot;">
+    <description>Roku Streaming Device</description>
+    <example>Digest qop="auth", realm="rokudev", nonce="1111111111"</example>
+    <param pos="0" name="hw.vendor" value="Roku"/>
+    <param pos="0" name="hw.device" value="Media Server"/>
+  </fingerprint>
+
+  <fingerprint pattern="(?i)^Basic realm=&quot;System Setup&quot;">
+    <description>Patton DSL Router</description>
+    <example>Basic realm="System Setup"</example>
+    <param pos="0" name="hw.vendor" value="Patton"/>
+    <param pos="0" name="hw.device" value="Router"/>
+    <param pos="0" name="hw.product" value="SHDSL Router"/>
+    <param pos="0" name="hw.certainty" value="0.50"/>
+  </fingerprint>
+
+  <fingerprint pattern="(?i)^Digest realm=&quot;Login to ND[0-9]{3,20}&quot;, nonce=">
+    <description>Lorex NR900 Series DVR</description>
+    <example>Digest realm="Login to ND011811000000", nonce="ec3682ef24b2cd9cedefe5cc26110000"</example>
+    <param pos="0" name="hw.vendor" value="Lorex"/>
+    <param pos="0" name="hw.device" value="DVR"/>
+    <param pos="0" name="hw.product" value="NR900"/>
+    <param pos="0" name="hw.certainty" value="0.50"/>
+  </fingerprint>
+
+  <fingerprint pattern="(?i)^Basic realm=&quot;the Access Point&quot;">
+    <description>Psion Teklogix</description>
+    <example>Basic realm="the Access Point"</example>
+    <param pos="0" name="hw.vendor" value="Psion Teklogix"/>
+    <param pos="0" name="hw.device" value="Network Appliance"/>
+    <param pos="0" name="hw.product" value="CommServer"/>
+  </fingerprint>
+
+  <fingerprint pattern="(?i)^Digest realm=&quot;Use 'live' as User Name">
+    <description>Bosch AutoDome IP Camera</description>
+    <example>Digest realm="Use 'live' as User Name",nonce="18e62d241a5358a9650640fa72c1773c",opaque="",stale=FALSE,algorithm=MD5</example>
+    <example>Digest realm="Use 'live' as User Name in order to log in to the respective level",nonce="2e6007092c2b28af7e2516b80b5b4f95",opaque="",stale=FALSE,algorithm=MD5,qop="auth"</example>
+    <param pos="0" name="hw.vendor" value="Bosch"/>
+    <param pos="0" name="hw.device" value="Web Cam"/>
+    <param pos="0" name="hw.product" value="AutoDome"/>
+    <param pos="0" name="hw.certainty" value="0.50"/>
+  </fingerprint>
+
+  <fingerprint pattern="(?i)^Basic realm=&quot;Shelly&quot;">
+    <description>Shelly Smart Device</description>
+    <example>Basic realm="Shelly"</example>
+    <param pos="0" name="hw.vendor" value="Shelly"/>
+    <param pos="0" name="hw.device" value="Device"/>
+  </fingerprint>
+
+  <fingerprint pattern="(?i)^Basic realm=&quot;Eurotherm&quot;">
+    <description>Schneider Electric Eurotherm Device</description>
+    <example>Basic realm="Eurotherm"</example>
+    <param pos="0" name="hw.vendor" value="Schneider Electric"/>
+    <param pos="0" name="hw.device" value="Device"/>
+    <param pos="0" name="hw.family" value="Eurotherm"/>
+  </fingerprint>
+
   <!-- a variety of headers we currently just ignore -->
 
   <fingerprint pattern="(?i)^NTLM$">
@@ -621,13 +690,13 @@
     <example>Basic realm="index.html"</example>
   </fingerprint>
 
-  <fingerprint pattern="^(?:Basic|Digest) .*realm=&quot;(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)&quot;.*$">
+  <fingerprint pattern="^(?:Basic|Digest) .*realm=&quot;(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)&quot;">
     <description>Ignore realms with an IPv4 address</description>
     <example>Basic realm="192.168.0.1"</example>
     <example>Digest qop="auth", realm="172.16.0.1", nonce="AAAAAAAAAAAAAP//DwHpM0IvM78=", algorithm="MD5"</example>
   </fingerprint>
 
-  <fingerprint pattern="^(?:Basic|Digest) .*realm=&quot;config&quot;.*$">
+  <fingerprint pattern="^(?:Basic|Digest) .*realm=&quot;config&quot;">
     <description>Ignore generic 'config' realms</description>
     <example>Digest realm="config", nonce="1155041914", algorithm="MD5", qop="auth"</example>
   </fingerprint>