recog 2.3.20 → 2.3.23

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>
@@ -289,7 +289,7 @@
 
   <fingerprint pattern="^(?:Basic|Digest) realm=&quot;(?:SmartAX )?(MT\d+[^ ]*)(?: ADSL Router)?&quot;$">
     <description>Huawei xDSL routers</description>
-    <example hw.product="MT882">Basic realm="SmartAX MT882"</example>
+    <example hw.product="MT882" service.product="MT882" os.product="MT882">Basic realm="SmartAX MT882"</example>
     <param pos="0" name="service.vendor" value="Huawei"/>
     <param pos="0" name="service.family" value="MT"/>
     <param pos="1" name="service.product"/>
@@ -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>
@@ -322,10 +322,10 @@
 
   <fingerprint pattern="^(?:Basic|Digest) realm=&quot;(WRT54G\w*)&quot;$">
     <description>Linksys WRT54G wireless access point (dozen of variants of the product)</description>
-    <example hw.product="WRT54G">Basic realm="WRT54G"</example>
-    <example hw.product="WRT54GL">Basic realm="WRT54GL"</example>
-    <example hw.product="WRT54GSV4">Basic realm="WRT54GSV4"</example>
-    <example hw.product="WRT54GCv3">Basic realm="WRT54GCv3"</example>
+    <example hw.product="WRT54G" os.product="WRT54G">Basic realm="WRT54G"</example>
+    <example hw.product="WRT54GL" os.product="WRT54GL">Basic realm="WRT54GL"</example>
+    <example hw.product="WRT54GSV4" os.product="WRT54GSV4">Basic realm="WRT54GSV4"</example>
+    <example hw.product="WRT54GCv3" os.product="WRT54GCv3">Basic realm="WRT54GCv3"</example>
     <param pos="0" name="os.vendor" value="Linksys"/>
     <param pos="0" name="os.device" value="WAP"/>
     <param pos="1" name="os.product"/>
@@ -336,9 +336,9 @@
 
   <fingerprint pattern="^(?:Basic|Digest) realm=&quot;(TD-[VW8][A-Z0-9]+)(?:| \d+\.\d+)&quot;$">
     <description>TP-LINK SoHo Router - dash variant</description>
-    <example os.product="TD-W8901G">Basic realm="TD-W8901G"</example>
-    <example>Basic realm="TD-8840T 2.0"</example>
-    <example hw.product="TD-8811">Basic realm="TD-8811"</example>
+    <example os.product="TD-W8901G" hw.product="TD-W8901G">Basic realm="TD-W8901G"</example>
+    <example os.product="TD-8840T" hw.product="TD-8840T">Basic realm="TD-8840T 2.0"</example>
+    <example hw.product="TD-8811" os.product="TD-8811">Basic realm="TD-8811"</example>
     <param pos="0" name="os.vendor" value="TP-LINK"/>
     <param pos="0" name="os.device" value="Router"/>
     <param pos="1" name="os.product"/>
@@ -349,10 +349,10 @@
 
   <fingerprint pattern="^(?:Basic|Digest) realm=&quot;(TD8[A-Z0-9]+)&quot;$">
     <description>TP-LINK SoHo Router</description>
-    <example os.product="TD854W">Basic realm="TD854W"</example>
-    <example hw.product="TD811">Basic realm="TD811"</example>
-    <example>Basic realm="TD821"</example>
-    <example>Basic realm="TD841"</example>
+    <example os.product="TD854W" hw.product="TD854W">Basic realm="TD854W"</example>
+    <example hw.product="TD811" os.product="TD811">Basic realm="TD811"</example>
+    <example os.product="TD821" hw.product="TD821">Basic realm="TD821"</example>
+    <example os.product="TD841" hw.product="TD841">Basic realm="TD841"</example>
     <param pos="0" name="os.vendor" value="TP-LINK"/>
     <param pos="0" name="os.device" value="Router"/>
     <param pos="1" name="os.product"/>
@@ -361,24 +361,24 @@
     <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>
-    <example>Basic realm="TP-LINK Wireless Range Extender WA850RE"</example>
-    <example>Basic realm="TP-LINK Wireless AP WA501G"</example>
-    <example>Basic realm="TP-LINK Wireless N Access Point WA701ND"</example>
-    <example>Basic realm="TP-LINK Wireless N Access Point WA901ND"</example>
-    <example>Basic realm="TP-LINK Wireless AP WA601G"</example>
-    <example>Basic realm="TP-LINK Wireless AP WR710N"</example>
-    <example>Basic realm="TP-LINK Wireless AP WR700N"</example>
-    <example>Basic realm="TP-LINK Wireless Range Extender WA750RE"</example>
-    <example>Basic realm="TP-LINK Wireless AP WR702N"</example>
-    <example>Basic realm="TP-LINK Wireless AP WR800N"</example>
-    <example>Basic realm="TP-LINK Wireless Range Extender WA730RE"</example>
-    <example>Basic realm="TP-LINK Wireless N Access Point WA805N"</example>
-    <example>Basic realm="TP-LINK Wireless N Access Point WA701N"</example>
-    <example>Basic realm="TP-LINK Wireless AP WR706N"</example>
+    <example os.product="WA801N" hw.product="WA801N">Basic realm="TP-LINK Wireless N Access Point WA801N"</example>
+    <example hw.product="WA830RE" os.product="WA830RE">Basic realm="TP-LINK Wireless Range Extender WA830RE"</example>
+    <example os.product="WA850RE" hw.product="WA850RE">Basic realm="TP-LINK Wireless Range Extender WA850RE"</example>
+    <example os.product="WA501G" hw.product="WA501G">Basic realm="TP-LINK Wireless AP WA501G"</example>
+    <example os.product="WA701ND" hw.product="WA701ND">Basic realm="TP-LINK Wireless N Access Point WA701ND"</example>
+    <example os.product="WA901ND" hw.product="WA901ND">Basic realm="TP-LINK Wireless N Access Point WA901ND"</example>
+    <example os.product="WA601G" hw.product="WA601G">Basic realm="TP-LINK Wireless AP WA601G"</example>
+    <example os.product="WR710N" hw.product="WR710N">Basic realm="TP-LINK Wireless AP WR710N"</example>
+    <example os.product="WR700N" hw.product="WR700N">Basic realm="TP-LINK Wireless AP WR700N"</example>
+    <example os.product="WA750RE" hw.product="WA750RE">Basic realm="TP-LINK Wireless Range Extender WA750RE"</example>
+    <example os.product="WR702N" hw.product="WR702N">Basic realm="TP-LINK Wireless AP WR702N"</example>
+    <example os.product="WR800N" hw.product="WR800N">Basic realm="TP-LINK Wireless AP WR800N"</example>
+    <example os.product="WA730RE" hw.product="WA730RE">Basic realm="TP-LINK Wireless Range Extender WA730RE"</example>
+    <example os.product="WA805N" hw.product="WA805N">Basic realm="TP-LINK Wireless N Access Point WA805N"</example>
+    <example os.product="WA701N" hw.product="WA701N">Basic realm="TP-LINK Wireless N Access Point WA701N"</example>
+    <example os.product="WR706N" hw.product="WR706N">Basic realm="TP-LINK Wireless AP WR706N"</example>
     <param pos="0" name="os.vendor" value="TP-LINK"/>
     <param pos="0" name="os.device" value="WAP"/>
     <param pos="1" name="os.product"/>
@@ -387,31 +387,31 @@
     <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>
-    <example>Basic realm="TP-LINK Wireless Lite N Router WR740N/WR741ND"</example>
+    <example hw.product="Wireless N Router WR841N">Basic realm="TP-LINK Wireless N Router WR841N"</example>
+    <example hw.product="Gigabit Broadband VPN Router R600VPN">Basic realm="TP-LINK Gigabit Broadband VPN Router R600VPN"</example>
+    <example hw.product="Wireless Lite N Router WR740N/WR741ND">Basic realm="TP-LINK Wireless Lite N Router WR740N/WR741ND"</example>
     <param pos="0" name="hw.vendor" value="TP-LINK"/>
     <param pos="0" name="hw.device" value="Router"/>
     <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="^.*(?: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="^.*(?: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="^.*(?: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,22 +496,22 @@
     <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>
+    <example hw.product="H108L">Basic realm="ZXHN H108L"</example>
     <param pos="0" name="hw.vendor" value="ZTE"/>
     <param pos="0" name="hw.device" value="Router"/>
     <param pos="0" name="hw.family" value="ZXHN"/>
     <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,17 +593,110 @@
     <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>
+
+  <fingerprint pattern="(?i)^Basic realm=&quot;TomatoUSB&quot;">
+    <description>TomatoUSB Router Firmware</description>
+    <example>Basic realm="TomatoUSB"</example>
+    <param pos="0" name="os.vendor" value="TomatoUSB"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="TomatoUSB"/>
+    <param pos="0" name="os.device" value="Router"/>
+  </fingerprint>
+
+  <fingerprint pattern="(?i)^Basic realm=&quot;FreshTomato&quot;">
+    <description>FreshTomato Router Firmware</description>
+    <example>Basic realm="FreshTomato"</example>
+    <param pos="0" name="os.vendor" value="FreshTomato"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="FreshTomato"/>
+    <param pos="0" name="os.device" value="Router"/>
+  </fingerprint>
+
   <!-- a variety of headers we currently just ignore -->
 
   <fingerprint pattern="(?i)^NTLM$">
-    <description>Ignore NTLM-only</description>
+    <description>Ignore NTLM-only -- assert nothing</description>
     <example>NTLM</example>
     <example>Ntlm</example>
+    <param pos="0" name="hw.certainty" value="0.0"/>
+    <param pos="0" name="os.certainty" value="0.0"/>
+    <param pos="0" name="service.certainty" value="0.0"/>
   </fingerprint>
 
   <fingerprint pattern="^Negotiate$">
-    <description>Ignore Negotiate-only</description>
+    <description>Ignore Negotiate-only -- assert nothing</description>
     <example>Negotiate</example>
+    <param pos="0" name="hw.certainty" value="0.0"/>
+    <param pos="0" name="os.certainty" value="0.0"/>
+    <param pos="0" name="service.certainty" value="0.0"/>
   </fingerprint>
 
   <!--
@@ -612,24 +705,33 @@
   -->
 
   <fingerprint pattern="^(?:Basic|Digest) .*realm=['&quot;](?:\/|\.|null|\/?index.html?)?['&quot;]">
-    <description>Ignore null/empty/period/index.</description>
+    <description>Ignore null/empty/period/index -- assert nothing</description>
     <example>Basic realm="null"</example>
     <example>Basic realm="."</example>
     <example>Basic realm=""</example>
     <example>Basic realm="/"</example>
     <example>Basic realm='/'</example>
     <example>Basic realm="index.html"</example>
+    <param pos="0" name="hw.certainty" value="0.0"/>
+    <param pos="0" name="os.certainty" value="0.0"/>
+    <param pos="0" name="service.certainty" value="0.0"/>
   </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;.*$">
-    <description>Ignore realms with an IPv4 address</description>
+  <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 -- assert nothing</description>
     <example>Basic realm="192.168.0.1"</example>
     <example>Digest qop="auth", realm="172.16.0.1", nonce="AAAAAAAAAAAAAP//DwHpM0IvM78=", algorithm="MD5"</example>
+    <param pos="0" name="hw.certainty" value="0.0"/>
+    <param pos="0" name="os.certainty" value="0.0"/>
+    <param pos="0" name="service.certainty" value="0.0"/>
   </fingerprint>
 
-  <fingerprint pattern="^(?:Basic|Digest) .*realm=&quot;config&quot;.*$">
-    <description>Ignore generic 'config' realms</description>
+  <fingerprint pattern="^(?:Basic|Digest) .*realm=&quot;config&quot;">
+    <description>Ignore generic 'config' realms -- assert nothing</description>
     <example>Digest realm="config", nonce="1155041914", algorithm="MD5", qop="auth"</example>
+    <param pos="0" name="hw.certainty" value="0.0"/>
+    <param pos="0" name="os.certainty" value="0.0"/>
+    <param pos="0" name="service.certainty" value="0.0"/>
   </fingerprint>
 
   <!--

data/xml/imap_banners.xml

@@ -47,7 +47,7 @@
     <param pos="2" name="host.name"/>
   </fingerprint>
 
-  <fingerprint pattern="^Der Microsoft Exchange Server 2003 IMAP4rev1-Server, Version (6\.5\.\d{4}\.\d+) \((.*)\),.*$">
+  <fingerprint pattern="^Der Microsoft Exchange Server 2003 IMAP4rev1-Server, Version (6\.5\.\d{4}\.\d+) \((.*)\),">
     <description>Microsoft Exchange Server 2003, German</description>
     <example service.version="6.5.7638.1" host.name="foo.bar">Der Microsoft Exchange Server 2003 IMAP4rev1-Server, Version 6.5.7638.1 (foo.bar), steht zur Verfgung.</example>
     <param pos="0" name="service.vendor" value="Microsoft"/>
@@ -166,10 +166,10 @@
     <param pos="0" name="service.product" value="Courier IMAP"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\S+) CallPilot IMAP4rev1 v(\S+) server ready\.?$">
+  <fingerprint pattern="^(\S{1,512}) CallPilot IMAP4rev1 v(\S+) server ready\.?$">
     <description>Nortel CallPilot</description>
-    <example>nottest.localdomain CallPilot IMAP4rev1 v42.02.05.22 server ready.</example>
-    <example>test.localdomain CallPilot IMAP4rev1 v43.03.19.22 server ready.</example>
+    <example service.version="42.02.05.22" host.name="nottest.localdomain">nottest.localdomain CallPilot IMAP4rev1 v42.02.05.22 server ready.</example>
+    <example service.version="43.03.19.22" host.name="test.localdomain">test.localdomain CallPilot IMAP4rev1 v43.03.19.22 server ready.</example>
     <param pos="0" name="service.vendor" value="Nortel"/>
     <param pos="0" name="service.product" value="CallPilot"/>
     <param pos="2" name="service.version"/>
@@ -177,7 +177,7 @@
     <param pos="1" name="host.name"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\S+) Zimbra IMAP4rev1 server ready\.?$">
+  <fingerprint pattern="^(\S{1,512}) Zimbra IMAP4rev1 server ready\.?$">
     <description>VMware Zimbra IMAP</description>
     <example host.name="foo.bar">foo.bar Zimbra IMAP4rev1 server ready</example>
     <param pos="0" name="service.vendor" value="VMware"/>
@@ -186,7 +186,7 @@
     <param pos="1" name="host.name"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\S+) Zimbra (\S+) IMAP4rev1 server ready\.?$">
+  <fingerprint pattern="^(\S{1,512}) Zimbra (\S+) IMAP4rev1 server ready\.?$">
     <description>VMware Zimbra IMAP with service version</description>
     <example host.name="foo.bar" service.version="7.0.0_GA_3079">foo.bar Zimbra 7.0.0_GA_3079 IMAP4rev1 server ready</example>
     <param pos="0" name="service.vendor" value="VMware"/>
@@ -196,7 +196,7 @@
     <param pos="1" name="host.name"/>
   </fingerprint>
 
-  <fingerprint pattern="^(.+) Cyrus IMAP4 v(\d+\.\d+.*)-OS X(?: Server)? ([\d\.]+).* server ready$">
+  <fingerprint pattern="^(\S{1,512}) Cyrus IMAP4 v(\d+\.\d+.*)-OS X(?: Server)? ([\d\.]+).* server ready$">
     <description>CMU Cyrus IMAP on Mac OS X</description>
     <example host.name="example.com" service.version="2.2.12" os.version="10.4.0">example.com Cyrus IMAP4 v2.2.12-OS X 10.4.0 server ready</example>
     <example host.name="example.com" service.version="2.3.8" os.version="10.5">example.com Cyrus IMAP4 v2.3.8-OS X Server 10.5: 9A562 server ready</example>
@@ -213,7 +213,7 @@
     <param pos="1" name="host.name"/>
   </fingerprint>
 
-  <fingerprint pattern="^(.+) Cyrus IMAP4? (?:\S+ )?v(\d+\.\d+.*) server ready$">
+  <fingerprint pattern="^(\S{1,512}) Cyrus IMAP4? (?:\S+ )?v(\d+\.\d+.*) server ready$">
     <description>CMU Cyrus IMAP</description>
     <example host.name="example.com" service.version="2.3.7">example.com Cyrus IMAP4 v2.3.7 server ready</example>
     <example host.name="example.com" service.version="2.4.8-Invoca-RPM-2.4.8-1">example.com Cyrus IMAP Murder v2.4.8-Invoca-RPM-2.4.8-1 server ready</example>
@@ -253,7 +253,7 @@
       // * OK xxx PMDF IMAP4rev1 V6.0-24 (Message store V6.0-24)
       // * OK xxx PMDF IMAP4rev1 V6.0-9
       IMAP_FP_PARSERS[5] = new PatternParser(
-         "^([^\\s]+) PMDF IMAP4rev1 V([^\\s]+).*$");
+         "^([^\\s]+) PMDF IMAP4rev1 V([^\\s]+)");
       IMAP_FP_PARSERS[5].addConstantParam("product", "PMDF");
       IMAP_FP_PARSERS[5].addParamSpec(1, "hostname");
       IMAP_FP_PARSERS[5].addParamSpec(2, "version");
@@ -265,7 +265,7 @@
       IMAP_FP_PARSERS[6].addParamSpec(2, "server-time");
       // Eudora Internet Mail Server
       IMAP_FP_PARSERS[7] = new PatternParser(
-         "^Eudora Internet Mail Server (.*) .*$");
+         "^Eudora Internet Mail Server (.*) ");
       IMAP_FP_PARSERS[7].addConstantParam("product", "eudoraims");
       IMAP_FP_PARSERS[7].addParamSpec(1, "version");
       // Eudora Qualcomm WorldMail