RubyGems - recog - Versions diffs - 2.1.39 → 2.1.40 - Mend

recog 2.1.39 → 2.1.40

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 (14) hide show

checksums.yaml +4 -4
data/cpe-remap.yaml +4 -0
data/lib/recog/version.rb +1 -1
data/xml/ftp_banners.xml +2 -1
data/xml/http_cookies.xml +1 -1
data/xml/http_servers.xml +10 -9
data/xml/http_wwwauth.xml +36 -36
data/xml/mdns_device-info_txt.xml +46 -46
data/xml/operating_system.xml +1 -0
data/xml/sip_user_agents.xml +3 -4
data/xml/smtp_banners.xml +2 -0
data/xml/telnet_banners.xml +3 -1
data/xml/upnp_banners.xml +13 -5
metadata +2 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e17c7d1d1caa24d91f05d1f4946ff4ca9a301b8
-  data.tar.gz: 7a26baa5f8983d28c3ffcead5b7cc04ad5a773ab
+  metadata.gz: 4c3f57536919170fc060b3e2ede8e77963b8988a
+  data.tar.gz: '0679248fda6fe98a73ec0afe5cd56a865b0b3b74'
 SHA512:
-  metadata.gz: 02b5816f77d7f1e35dead948071977c0991b78ff1a6984cb296f08cd76c15f72baedcc950d1d59540ebb367652569c4a0da6f491ec6bf9f3099b7697338a0d5f
-  data.tar.gz: ba482452db5b315a064bc869d41488b2c58603e1af8920d295c9cf76b09919d967de6faadfe291d01e27bdb437720bd60e1220fb405c6cdb150c0d2f1d752354
+  metadata.gz: 05e9268a5deb0e76d4ff021a4db9b7a420a632445f5d3b5797dfefe0d47ec1a69874c9a8d0ea3549907312ae92698f166987220437e68e662ada2529dcb96cfe
+  data.tar.gz: 3ccb0957644ad83c3ae199e59faa73ff56781bbc0830141735889c550387c20bf485b0f53ef15e27e7dd4c751f4b2efd9f9d0409cc134aa09bfd4220f1b33db0

data/cpe-remap.yaml CHANGED Viewed

@@ -53,6 +53,10 @@ mappings:
     vendor: linux
     products:
       linux: linux_kernel
+  mailenable:
+    vendor: mailenable
+    products:
+      mail_server: mailenable
   microsoft:
     vendor: microsoft
     products:

data/lib/recog/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Recog
-  VERSION = '2.1.39'
+  VERSION = '2.1.40'
 end

data/xml/ftp_banners.xml CHANGED Viewed

@@ -220,6 +220,7 @@ example.com FTP server (Version:  Mac OS X Server) ready.</example>
     <param pos="0" name="service.family" value="ProFTPD"/>
     <param pos="0" name="service.vendor" value="ProFTPD Project"/>
     <param pos="0" name="service.product" value="ProFTPD"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:proftpd:proftpd:-"/>
     <param pos="0" name="hw.vendor" value="Netgear"/>
     <param pos="0" name="hw.device" value="NAS"/>
     <param pos="0" name="hw.product" value="ReadyNAS"/>
@@ -469,10 +470,10 @@ more text</example>
     <param pos="0" name="service.family" value="Firewall-1"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:checkpoint:firewall-1:-"/>
     <param pos="0" name="os.vendor" value="Check Point"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:checkpoint:gaia_os:-"/>
     <param pos="0" name="os.device" value="Firewall"/>
     <param pos="0" name="os.family" value="Firewall-1"/>
     <param pos="0" name="os.product" value="GAiA OS"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:checkpoint:gaia_os:-"/>
     <param pos="0" name="hw.vendor" value="Check Point"/>
     <param pos="0" name="hw.device" value="Firewall"/>
     <param pos="0" name="hw.family" value="Firewall-1"/>

data/xml/http_cookies.xml CHANGED Viewed

@@ -120,9 +120,9 @@
     <param pos="0" name="os.product" value="VPN"/>
     <param pos="0" name="hw.vendor" value="Cisco"/>
     <param pos="0" name="hw.family" value="Adaptive Security Appliance"/>
-    <param pos="0" name="hw.cpe23" value="cpe:/h:cisco:adaptive_security_appliance:-"/>
     <param pos="0" name="hw.product" value="Adaptive Security Appliance"/>
     <param pos="0" name="hw.device" value="Firewall"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:cisco:adaptive_security_appliance:-"/>
   </fingerprint>
   <fingerprint pattern="^(st8id)=.*">
     <description>Citrix Application Protection System, Enterprise

data/xml/http_servers.xml CHANGED Viewed

@@ -78,6 +78,7 @@
     <param pos="0" name="service.vendor" value="Apache"/>
     <param pos="0" name="service.product" value="CouchDB"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:apache:couchdb:{service.version}"/>
   </fingerprint>
   <fingerprint pattern="^support@arraynetworks.net$">
     <description>Array Networks device</description>
@@ -92,10 +93,10 @@
     <param pos="0" name="service.family" value="Firewall-1"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:checkpoint:firewall-1:-"/>
     <param pos="0" name="os.vendor" value="Check Point"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:checkpoint:gaia_os:-"/>
     <param pos="0" name="os.device" value="Firewall"/>
     <param pos="0" name="os.family" value="Firewall-1"/>
     <param pos="0" name="os.product" value="GAiA OS"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:checkpoint:gaia_os:-"/>
     <param pos="0" name="hw.vendor" value="Check Point"/>
     <param pos="0" name="hw.device" value="Firewall"/>
     <param pos="0" name="hw.family" value="Firewall-1"/>
@@ -705,9 +706,9 @@
     <param pos="0" name="service.vendor" value="MikroTik"/>
     <param pos="0" name="service.product" value="HttpProxy"/>
     <param pos="0" name="os.vendor" value="MikroTik"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:mikrotik:routeros:-"/>
     <param pos="0" name="os.device" value="Router"/>
     <param pos="0" name="os.product" value="RouterOS"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:mikrotik:routeros:-"/>
     <param pos="0" name="hw.vendor" value="MikroTik"/>
     <param pos="0" name="hw.device" value="Router"/>
   </fingerprint>
@@ -1072,9 +1073,9 @@
     <example>squid/2.6.STABLE13</example>
     <param pos="0" name="service.vendor" value="Squid Cache"/>
     <param pos="0" name="service.product" value="Squid"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:squid-cache:squid:{service.version}"/>
     <param pos="0" name="service.family" value="Squid"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:squid-cache:squid:{service.version}"/>
   </fingerprint>
   <fingerprint pattern="^(?i)squid$">
     <description>Squid Web Proxy without a version</description>
@@ -1082,8 +1083,8 @@
     <example>squid</example>
     <param pos="0" name="service.vendor" value="Squid Cache"/>
     <param pos="0" name="service.product" value="Squid"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:squid-cache:squid:-"/>
     <param pos="0" name="service.family" value="Squid"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:squid-cache:squid:-"/>
   </fingerprint>
   <fingerprint pattern="^thttpd/(\d\.[\w.]+)-MX\s*.*$">
     <description>thttpd with SSL support</description>
@@ -1527,9 +1528,9 @@
     <param pos="0" name="os.product" value="VPN"/>
     <param pos="0" name="hw.vendor" value="Cisco"/>
     <param pos="0" name="hw.family" value="Adaptive Security Appliance"/>
-    <param pos="0" name="hw.cpe23" value="cpe:/h:cisco:adaptive_security_appliance:-"/>
     <param pos="0" name="hw.product" value="Adaptive Security Appliance"/>
     <param pos="0" name="hw.device" value="Firewall"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:cisco:adaptive_security_appliance:-"/>
   </fingerprint>
   <fingerprint pattern="^CradlepointHTTPService/([\d\.]+)$">
     <description>Cradlepoint HTTP service</description>
@@ -1800,9 +1801,9 @@
     <example>TornadoServer/4.0.2</example>
     <param pos="0" name="service.vendor" value="TornadoWeb"/>
     <param pos="0" name="service.product" value="Tornado"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:tornadoweb:tornado:{service.version}"/>
     <param pos="0" name="service.family" value="Tornado"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:tornadoweb:tornado:{service.version}"/>
   </fingerprint>
   <fingerprint pattern="(?i)^SimpleHTTP/((?:\d+\.)*\d+)\s*Python/((?:\d+\.)*\d+)$">
     <description>SimpleHTTPRequestHandler Python class is a simple HTTP request handler.</description>
@@ -1890,9 +1891,9 @@
     <example service.version="4.0.0">Embedthis-http/4.0.0</example>
     <param pos="0" name="service.vendor" value="Embedthis"/>
     <param pos="0" name="service.product" value="Appweb"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:embedthis:appweb:{service.version}"/>
     <param pos="0" name="service.family" value="Appweb"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:embedthis:appweb:{service.version}"/>
   </fingerprint>
   <fingerprint pattern="^Avaya CMBE/((?:\d+\.)*\d+)$">
     <description>Web server for Avaya Aura Communication Manager Branch, a SIP-based communications platform.</description>
@@ -2291,9 +2292,9 @@
     <param pos="0" name="hw.product" value="WebBox"/>
     <param pos="0" name="hw.device" value="Power device"/>
     <param pos="0" name="os.vendor" value="Microsoft"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_ce:-"/>
     <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:-"/>
   </fingerprint>
   <fingerprint pattern="^EnergyICT RTU \d+-\w+-\d+$">
     <description>EnergyICT RTU</description>
@@ -2347,9 +2348,9 @@
     <example service.version="11.50.29">Microsoft WinCE Fidelix v11.50.29</example>
     <param pos="0" name="os.certainty" value="0.9"/>
     <param pos="0" name="os.vendor" value="Microsoft"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_ce:-"/>
     <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="service.vendor" value="Fidelix"/>
     <param pos="0" name="service.product" value="Web Server"/>
     <param pos="1" name="service.version"/>

data/xml/http_wwwauth.xml CHANGED Viewed

@@ -55,7 +55,7 @@
   </fingerprint>
   <fingerprint pattern="^(?:Basic|Digest) realm=&quot;Cisco_CCSP_CWMP_TCPCR&quot;.*$">
     <description>Generic Cisco CWMP/CPE equipment</description>
-    <example>Basic realm=&quot;Cisco_CCSP_CWMP_TCPCR&quot;</example>
+    <example>Basic realm="Cisco_CCSP_CWMP_TCPCR"</example>
     <param pos="0" name="hw.vendor" value="Cisco"/>
   </fingerprint>
   <fingerprint pattern="^(?:Basic|Digest) realm=.FW-1.      Reason: no user      Server .$">
@@ -71,7 +71,7 @@
   </fingerprint>
   <fingerprint pattern="(?i)^(?:Basic|Digest).*realm=&quot;cpanel&quot;.*">
     <description>cPanel</description>
-    <example>Basic realm=&quot;cPanel&quot;</example>
+    <example>Basic realm="cPanel"</example>
     <param pos="0" name="service.vendor" value="cPanel"/>
     <param pos="0" name="service.product" value="cPanel"/>
   </fingerprint>
@@ -84,31 +84,31 @@
   </fingerprint>
   <fingerprint pattern="^(?:Basic|Digest) realm=&quot;ADSL\S* (?:Modem|Router|Modem/Router)&quot;.*$">
     <description>Generic ADSL modems/routers</description>
-    <example>Basic realm=&quot;ADSL Modem&quot;</example>
-    <example>Basic realm=&quot;ADSL Modem/Router&quot;</example>
-    <example>Basic realm=&quot;ADSL Router&quot;</example>
-    <example>Basic realm=&quot;ADSL2+ Router&quot;</example>
+    <example>Basic realm="ADSL Modem"</example>
+    <example>Basic realm="ADSL Modem/Router"</example>
+    <example>Basic realm="ADSL Router"</example>
+    <example>Basic realm="ADSL2+ Router"</example>
     <param pos="0" name="hw.device" value="ADSL Modem"/>
   </fingerprint>
   <fingerprint pattern="^(?:Basic|Digest) realm=&quot;Broadband Router&quot;.*$">
     <description>Generic Broadband modems/routers</description>
-    <example>Basic realm=&quot;Broadband Router&quot;</example>
+    <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;.*$">
     <description>Generic DSL modems/routers</description>
-    <example>Basic realm=&quot;DSL Modem&quot;</example>
+    <example>Basic realm="DSL Modem"</example>
     <param pos="0" name="hw.device" value="DSL Modem"/>
   </fingerprint>
   <fingerprint pattern="^(?:Basic|Digest) realm=&quot;DVR&quot;.*$">
     <description>Generic DVR</description>
-    <example>Basic realm=&quot;DVR&quot;</example>
+    <example>Basic realm="DVR"</example>
     <param pos="0" name="hw.device" value="DVR"/>
   </fingerprint>
   <!-- Hikvision is OEMd by a number of DVR manufacturers -->
   <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=&quot;hikvision&quot;</example>
+    <example>Basic realm="hikvision"</example>
     <param pos="0" name="service.vendor" value="Hikvision"/>
     <param pos="0" name="service.product" value="Hikvision Web Server"/>
     <param pos="0" name="os.vendor" value="Hikvision"/>
@@ -117,46 +117,46 @@
   </fingerprint>
   <fingerprint pattern="^(?:Basic|Digest) realm=&quot;Merit LILIN Ent\. Co\., Ltd.&quot;.*$">
     <description>Merit LILIN generic device</description>
-    <example>Basic realm=&quot;Merit LILIN Ent. Co., Ltd,&quot;</example>
-    <example>Basic realm=&quot;Merit LILIN Ent. Co., Ltd.&quot;</example>
+    <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;.*$">
     <description>Generic WAP</description>
-    <example>Basic realm=&quot;Wireless Access Point&quot;</example>
+    <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;.*$">
     <description>Generic IP Cameras</description>
-    <example>Basic realm=&quot;camera&quot;</example>
-    <example>Basic realm=&quot;IPCamera Login&quot;</example>
-    <example>Basic realm=&quot;Mini Dome IP Camera&quot;</example>
+    <example>Basic realm="camera"</example>
+    <example>Basic realm="IPCamera Login"</example>
+    <example>Basic realm="Mini Dome IP Camera"</example>
     <param pos="0" name="hw.device" value="Web cam"/>
   </fingerprint>
   <fingerprint pattern="^(?:Basic|Digest) realm=&quot;(DCS-[^&quot;]+)&quot;.*$">
     <description>D-Link DCS IP Cameras</description>
-    <example hw.product="DCS-5222LB1">Basic realm=&quot;DCS-5222LB1&quot;</example>
-    <example hw.product="DCS-2530L">Basic realm=&quot;DCS-2530L&quot;</example>
+    <example hw.product="DCS-5222LB1">Basic realm="DCS-5222LB1"</example>
+    <example hw.product="DCS-2530L">Basic realm="DCS-2530L"</example>
     <param pos="0" name="hw.vendor" value="D-Link"/>
     <param pos="0" name="hw.device" value="Web cam"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
   <fingerprint pattern="^(?:Basic|Digest) realm=&quot;GoAhead&quot;.*$">
     <description>GoAhead webserver</description>
-    <example>Basic realm=&quot;GoAhead&quot;</example>
+    <example>Basic realm="GoAhead"</example>
     <param pos="0" name="service.vendor" value="Oracle"/>
     <param pos="0" name="service.product" value="GoAhead Webserver"/>
     <param pos="0" name="service.family" value="GoAhead Webserver"/>
   </fingerprint>
   <fingerprint pattern="^(?:Basic|Digest) realm=&quot;kubernetes-master&quot;.*$">
     <description>Kubernetes master nodes</description>
-    <example>Basic realm=&quot;kubernetes-master&quot;</example>
+    <example>Basic realm="kubernetes-master"</example>
     <param pos="0" name="service.vendor" value="Kubernetes"/>
   </fingerprint>
   <fingerprint pattern="^(?:Basic|Digest) realm=&quot;NETGEAR (Orbi(?:-(?:micro|mini))?)&quot;.*$">
     <description>Netgear Orbi</description>
-    <example hw.product="Orbi">Basic realm=&quot;NETGEAR Orbi&quot;</example>
-    <example hw.product="Orbi-micro">Basic realm=&quot;NETGEAR Orbi-micro&quot;</example>
+    <example hw.product="Orbi">Basic realm="NETGEAR Orbi"</example>
+    <example hw.product="Orbi-micro">Basic realm="NETGEAR Orbi-micro"</example>
     <param pos="0" name="hw.vendor" value="Netgear"/>
     <param pos="0" name="hw.device" value="WAP"/>
     <param pos="0" name="hw.family" value="Orbi"/>
@@ -197,8 +197,8 @@
   </fingerprint>
   <fingerprint pattern="^(?:Basic|Digest).*realm=&quot;Thomson(?: Gateway)?&quot;.*$">
     <description>Thomson generic devices</description>
-    <example>Digest realm=&quot;Thomson Gateway&quot;</example>
-    <example>Basic realm=&quot;Thomson&quot;</example>
+    <example>Digest realm="Thomson Gateway"</example>
+    <example>Basic realm="Thomson"</example>
     <param pos="0" name="hw.vendor" value="Thomson"/>
     <param pos="0" name="hw.device" value="Broadband router"/>
   </fingerprint>
@@ -214,15 +214,15 @@
   </fingerprint>
   <fingerprint pattern="^(?:Basic|Digest) realm=&quot;HuaweiHomeGateway&quot;.*$">
     <description>Huawei Home Gateway Routers</description>
-    <example>Basic realm=&quot;HuaweiHomeGateway&quot;</example>
+    <example>Basic realm="HuaweiHomeGateway"</example>
     <param pos="0" name="hw.vendor" value="Huawei"/>
     <param pos="0" name="hw.device" value="Broadband router"/>
     <param pos="0" name="hw.product" value="Home Gateway"/>
   </fingerprint>
   <fingerprint pattern="^(?:Basic|Digest) realm=&quot;EchoLife .*&quot;.*$">
     <description>Huawei EchoLife Home Gateways</description>
-    <example>Basic realm=&quot;EchoLife Portal de Inicio&quot;</example>
-    <example>Basic realm=&quot;EchoLife Home Gateway&quot;</example>
+    <example>Basic realm="EchoLife Portal de Inicio"</example>
+    <example>Basic realm="EchoLife Home Gateway"</example>
     <param pos="0" name="hw.vendor" value="Huawei"/>
     <param pos="0" name="hw.device" value="Broadband router"/>
     <param pos="0" name="hw.product" value="EchoLife Home Gateway"/>
@@ -277,16 +277,16 @@
   </fingerprint>
   <fingerprint pattern="(?i)^(?:Basic|Digest).*realm=&quot;TP-LINK (.*Router.*)&quot;.*$">
     <description>TP-LINK Routers</description>
-    <example>Basic realm=&quot;TP-LINK Wireless N Router WR841N&quot;</example>
-    <example>Basic realm=&quot;TP-LINK Gigabit Broadband VPN Router R600VPN&quot;</example>
-    <example>Basic realm=&quot;TP-LINK Wireless Lite N Router WR740N/WR741ND&quot;</example>
+    <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>
     <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;.*$">
     <description>TP-LINK IP-Cameras</description>
-    <example>Basic realm=&quot;TP-LINK IP-Camera&quot;</example>
+    <example>Basic realm="TP-LINK IP-Camera"</example>
     <param pos="0" name="hw.vendor" value="TP-Link"/>
     <param pos="0" name="hw.device" value="Web cam"/>
   </fingerprint>
@@ -352,14 +352,14 @@
   </fingerprint>
   <fingerprint pattern="(?i)^(?:Basic|Digest).*realm=&quot;TiVo DVR&quot;.*$">
     <description>Tivo DVR</description>
-    <example>Digest realm=&quot;TiVo DVR&quot;</example>
+    <example>Digest realm="TiVo DVR"</example>
     <param pos="0" name="hw.vendor" value="Tivo"/>
     <param pos="0" name="hw.family" value="DVR"/>
     <param pos="0" name="hw.device" value="DVR"/>
   </fingerprint>
   <fingerprint pattern="(?i)^(?:Basic|Digest).*realm=&quot;UBEE&quot;.*$">
     <description>Ubee Cable Modems</description>
-    <example>Digest qop=&quot;auth&quot;, realm=&quot;Ubee&quot;, nonce=&quot;1544738973&quot;</example>
+    <example>Digest qop="auth", realm="Ubee", nonce="1544738973"</example>
     <param pos="0" name="hw.vendor" value="Ubee"/>
     <param pos="0" name="hw.device" value="Broadband router"/>
   </fingerprint>
@@ -372,12 +372,12 @@
   </fingerprint>
   <fingerprint pattern="(?i)^(?:Basic|Digest).*realm=&quot;cpe@zte.com&quot;.*$">
     <description>Assorted ZTE CPE devices</description>
-    <example>Digest realm=&quot;cpe@zte.com&quot;</example>
+    <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;.*$">
     <description>ZTE ZXHN router</description>
-    <example>Basic realm=&quot;ZXHN H108L&quot;</example>
+    <example>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"/>
@@ -385,7 +385,7 @@
   </fingerprint>
   <fingerprint pattern="(?i)^(?:Basic|Digest).*realm=&quot;(ZXV\S* \S+)&quot;.*$">
     <description>ZTE ZXV router</description>
-    <example hw.product="ZXV10 W300">Basic realm=&quot;ZXV10 W300&quot;</example>
+    <example hw.product="ZXV10 W300">Basic realm="ZXV10 W300"</example>
     <param pos="0" name="hw.vendor" value="ZTE"/>
     <param pos="0" name="hw.device" value="Router"/>
     <param pos="0" name="hw.family" value="ZXV"/>

data/xml/mdns_device-info_txt.xml CHANGED Viewed

@@ -16,145 +16,145 @@
     <description>OS X 10.14 (Mojave)</description>
     <example>osxvers=18</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.14"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
     <param pos="0" name="os.version" value="10.14"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.14"/>
   </fingerprint>
   <fingerprint pattern="^osxvers=17">
     <description>OS X 10.13 (High Sierra)</description>
     <example>osxvers=17</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.13"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
     <param pos="0" name="os.version" value="10.13"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.13"/>
   </fingerprint>
   <fingerprint pattern="^osxvers=16">
     <description>OS X 10.12 (Sierra)</description>
     <example>osxvers=16</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.12"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
     <param pos="0" name="os.version" value="10.12"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.12"/>
   </fingerprint>
   <fingerprint pattern="^osxvers=15">
     <description>OS X 10.11 (El Capitan)</description>
     <example>osxvers=15</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.11"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
     <param pos="0" name="os.version" value="10.11"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.11"/>
   </fingerprint>
   <fingerprint pattern="^osxvers=14">
     <description>OS X 10.10 (Yosemite)</description>
     <example>osxvers=14</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.10"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
     <param pos="0" name="os.version" value="10.10"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.10"/>
   </fingerprint>
   <fingerprint pattern="^osxvers=13">
     <description>OS X 10.9 (Mavericks)</description>
     <example>osxvers=13</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.9"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
     <param pos="0" name="os.version" value="10.9"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.9"/>
   </fingerprint>
   <fingerprint pattern="^osxvers=12">
     <description>OS X 10.8 (Mountain Lion)</description>
     <example>osxvers=12</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.8"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
     <param pos="0" name="os.version" value="10.8"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.8"/>
   </fingerprint>
   <fingerprint pattern="^osxvers=11">
     <description>Mac OS X 10.7 (Lion)</description>
     <example>osxvers=11</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.7"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
     <param pos="0" name="os.version" value="10.7"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.7"/>
   </fingerprint>
   <fingerprint pattern="^osxvers=10">
     <description>Mac OS X 10.6 (Snow Leopard)</description>
     <example>osxvers=10</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.6"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
     <param pos="0" name="os.version" value="10.6"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.6"/>
   </fingerprint>
   <fingerprint pattern="^osxvers=9">
     <description>Mac OS X 10.5 (Leopard)</description>
     <example>osxvers=9</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.5"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
     <param pos="0" name="os.version" value="10.5"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.5"/>
   </fingerprint>
   <fingerprint pattern="^osxvers=8">
     <description>Mac OS X 10.4 (Tiger)</description>
     <example>osxvers=8</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.4"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
     <param pos="0" name="os.version" value="10.4"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.4"/>
   </fingerprint>
   <fingerprint pattern="^osxvers=7">
     <description>Mac OS X 10.3 (Panther)</description>
     <example>osxvers=7</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.3"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
     <param pos="0" name="os.version" value="10.3"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.3"/>
   </fingerprint>
   <fingerprint pattern="^osxvers=6">
     <description>Mac OS X 10.2 (Jaguar)</description>
     <example>osxvers=6</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.2"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
     <param pos="0" name="os.version" value="10.2"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.2"/>
   </fingerprint>
   <fingerprint pattern="^osxvers=5">
     <description>Mac OS X 10.1 (Puma)</description>
     <example>osxvers=5</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.1"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
     <param pos="0" name="os.version" value="10.1"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.1"/>
   </fingerprint>
   <fingerprint pattern="^osxvers=4">
     <description>Mac OS X 10.0 (Cheetah)</description>
     <example>osxvers=4</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.0"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
     <param pos="0" name="os.version" value="10.0"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.0"/>
   </fingerprint>
   <!-- The entry below is very likely an AirPort Extreme but I can't find a reference. -->
   <fingerprint pattern="^model=AirPort.*$">
     <description>AirPort</description>
     <example>model=AirPort5,114</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:airport_base_station_firmware:-"/>
     <param pos="0" name="os.family" value="AirPort"/>
     <param pos="0" name="os.product" value="AirPort Base Station Firmware"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:airport_base_station_firmware:-"/>
     <param pos="0" name="hw.vendor" value="Apple"/>
     <param pos="0" name="hw.family" value="AirPort"/>
     <param pos="0" name="hw.product" value="AirPort"/>
@@ -165,9 +165,9 @@
     <description>MacBook Pro (13-inch, 2018, Four Thunderbolt 3 ports)</description>
     <example>model=MacBookPro15,2</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="hw.vendor" value="Apple"/>
     <param pos="0" name="hw.family" value="MacBook Pro"/>
     <param pos="0" name="hw.product" value="MacBook Pro (13-inch, 2018, Four Thunderbolt 3 ports)"/>
@@ -177,9 +177,9 @@
     <description>MacBook Pro (15-inch, 2018)</description>
     <example>model=MacBookPro15,1</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="hw.vendor" value="Apple"/>
     <param pos="0" name="hw.family" value="MacBook Pro"/>
     <param pos="0" name="hw.product" value="MacBook Pro (15-inch, 2018)"/>
@@ -189,9 +189,9 @@
     <description>MacBook Pro (15-inch, 2017)</description>
     <example>model=MacBookPro14,3</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="hw.vendor" value="Apple"/>
     <param pos="0" name="hw.family" value="MacBook Pro"/>
     <param pos="0" name="hw.product" value="MacBook Pro (15-inch, 2017)"/>
@@ -201,9 +201,9 @@
     <description>MacBook Pro (13-inch, 2017, Four Thunderbolt 3 ports)</description>
     <example>model=MacBookPro14,2</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="hw.vendor" value="Apple"/>
     <param pos="0" name="hw.family" value="MacBook Pro"/>
     <param pos="0" name="hw.product" value="MacBook Pro (13-inch, 2017, Four Thunderbolt 3 ports)"/>
@@ -213,9 +213,9 @@
     <description>MacBook Pro (13-inch, 2017, Two Thunderbolt 3 ports)</description>
     <example>model=MacBookPro14,1</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="hw.vendor" value="Apple"/>
     <param pos="0" name="hw.family" value="MacBook Pro"/>
     <param pos="0" name="hw.product" value="MacBook Pro (13-inch, 2017, Two Thunderbolt 3 ports)"/>
@@ -225,9 +225,9 @@
     <description>MacBook Pro (15-inch, 2016)</description>
     <example>model=MacBookPro13,3</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="hw.vendor" value="Apple"/>
     <param pos="0" name="hw.family" value="MacBook Pro"/>
     <param pos="0" name="hw.product" value="MacBook Pro (15-inch, 2016)"/>
@@ -237,9 +237,9 @@
     <description>MacBook Pro (13-inch, 2016, Four Thunderbolt 3 ports)</description>
     <example>model=MacBookPro13,2</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="hw.vendor" value="Apple"/>
     <param pos="0" name="hw.family" value="MacBook Pro"/>
     <param pos="0" name="hw.product" value="MacBook Pro (13-inch, 2016, Four Thunderbolt 3 ports)"/>
@@ -249,9 +249,9 @@
     <description>MacBook Pro (13-inch, 2016, Two Thunderbolt 3 ports)</description>
     <example>model=MacBookPro13,1</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="hw.vendor" value="Apple"/>
     <param pos="0" name="hw.family" value="MacBook Pro"/>
     <param pos="0" name="hw.product" value="MacBook Pro (13-inch, 2016, Two Thunderbolt 3 ports)"/>
@@ -261,9 +261,9 @@
     <description>MacBook Pro (Retina, 13-inch, Early 2015)</description>
     <example>model=MacBookPro12,1</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="hw.vendor" value="Apple"/>
     <param pos="0" name="hw.family" value="MacBook Pro"/>
     <param pos="0" name="hw.product" value="MacBook Pro (Retina, 13-inch, Early 2015)"/>
@@ -273,9 +273,9 @@
     <description>MacBook Pro (Retina, 15-inch, Mid 2015)</description>
     <example>model=MacBookPro11,4</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="hw.vendor" value="Apple"/>
     <param pos="0" name="hw.family" value="MacBook Pro"/>
     <param pos="0" name="hw.product" value="MacBook Pro (Retina, 15-inch, Mid 2015)"/>
@@ -285,9 +285,9 @@
     <description>MacBook Pro (Retina, 15-inch, Late 2013) - rev 2</description>
     <example>model=MacBookPro11,3</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="hw.vendor" value="Apple"/>
     <param pos="0" name="hw.family" value="MacBook Pro"/>
     <param pos="0" name="hw.product" value="MacBook Pro (Retina, 15-inch, Late 2013)"/>
@@ -297,9 +297,9 @@
     <description>MacBook Pro (Retina, 15-inch, Late 2013)</description>
     <example>model=MacBookPro11,2</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="hw.vendor" value="Apple"/>
     <param pos="0" name="hw.family" value="MacBook Pro"/>
     <param pos="0" name="hw.product" value="MacBook Pro (Retina, 15-inch, Late 2013)"/>
@@ -309,9 +309,9 @@
     <description>MacBook Pro (Retina, 13-inch, Late 2013)</description>
     <example>model=MacBookPro11,1</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="hw.vendor" value="Apple"/>
     <param pos="0" name="hw.family" value="MacBook Pro"/>
     <param pos="0" name="hw.product" value="MacBook Pro (Retina, 13-inch, Late 2013)"/>
@@ -321,9 +321,9 @@
     <description>MacBook Pro (Retina, 13-inch, Early 2013)</description>
     <example>model=MacBookPro10,2</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="hw.vendor" value="Apple"/>
     <param pos="0" name="hw.family" value="MacBook Pro"/>
     <param pos="0" name="hw.product" value="MacBook Pro (Retina, 13-inch, Early 2013)"/>
@@ -333,9 +333,9 @@
     <description>MacBook Pro (Retina, 15-inch, Early 2013)</description>
     <example>model=MacBookPro10,1</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="hw.vendor" value="Apple"/>
     <param pos="0" name="hw.family" value="MacBook Pro"/>
     <param pos="0" name="hw.product" value="MacBook Pro (Retina, 15-inch, Early 2013)"/>
@@ -346,9 +346,9 @@
     <description>MacBook (Retina, 12-inch, 2017)</description>
     <example>model=MacBook10,1</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="hw.vendor" value="Apple"/>
     <param pos="0" name="hw.family" value="MacBook"/>
     <param pos="0" name="hw.product" value="MacBook (Retina, 12-inch, 2017)"/>
@@ -358,9 +358,9 @@
     <description>MacBook Pro (13-inch, Mid 2012)</description>
     <example>model=MacBookPro9,2</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="hw.vendor" value="Apple"/>
     <param pos="0" name="hw.family" value="MacBook Pro"/>
     <param pos="0" name="hw.product" value="MacBook Pro (13-inch, Mid 2012)"/>
@@ -370,9 +370,9 @@
     <description>MacBook (Retina, 12-inch, Early 2016)</description>
     <example>model=MacBook9,1</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="hw.vendor" value="Apple"/>
     <param pos="0" name="hw.family" value="MacBook"/>
     <param pos="0" name="hw.product" value="MacBook (Retina, 12-inch, Early 2016)"/>
@@ -382,9 +382,9 @@
     <description>MacBook (Retina, 12-inch, Early 2015)</description>
     <example>model=MacBook8,1</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="hw.vendor" value="Apple"/>
     <param pos="0" name="hw.family" value="MacBook"/>
     <param pos="0" name="hw.product" value="MacBook (Retina, 12-inch, Early 2015)"/>
@@ -394,9 +394,9 @@
     <description>MacBook (13-inch, Mid 2010)</description>
     <example>model=MacBook7,1</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="hw.vendor" value="Apple"/>
     <param pos="0" name="hw.family" value="MacBook"/>
     <param pos="0" name="hw.product" value="MacBook (13-inch, Mid 2010)"/>
@@ -407,9 +407,9 @@
     <description>Mac mini (Late 2014)</description>
     <example>model=Macmini7,1</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="hw.vendor" value="Apple"/>
     <param pos="0" name="hw.family" value="Mac mini"/>
     <param pos="0" name="hw.product" value="Mac mini (Late 2014)"/>
@@ -419,9 +419,9 @@
     <description>Mac mini (Late 2012) - rev 2</description>
     <example>model=Macmini6,2</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="hw.vendor" value="Apple"/>
     <param pos="0" name="hw.family" value="Mac mini"/>
     <param pos="0" name="hw.product" value="Mac mini (Late 2012)"/>
@@ -431,9 +431,9 @@
     <description>Mac mini (Late 2012)</description>
     <example>model=Macmini6,1</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="hw.vendor" value="Apple"/>
     <param pos="0" name="hw.family" value="Mac mini"/>
     <param pos="0" name="hw.product" value="Mac mini (Late 2012)"/>
@@ -444,9 +444,9 @@
     <description>iPad Pro (10.5-inch)</description>
     <example>model=J207AP</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:iphone_os:-"/>
     <param pos="0" name="os.family" value="iOS"/>
     <param pos="0" name="os.product" value="iOS"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:iphone_os:-"/>
     <param pos="0" name="hw.vendor" value="Apple"/>
     <param pos="0" name="hw.family" value="iPad Pro"/>
     <param pos="0" name="hw.product" value="iPad Pro (10.5-inch)"/>
@@ -456,9 +456,9 @@
     <description>iPad Pro (9.7-inch)</description>
     <example>model=J127AP</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:iphone_os:-"/>
     <param pos="0" name="os.family" value="iOS"/>
     <param pos="0" name="os.product" value="iOS"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:iphone_os:-"/>
     <param pos="0" name="hw.vendor" value="Apple"/>
     <param pos="0" name="hw.family" value="iPad Pro"/>
     <param pos="0" name="hw.product" value="iPad Pro (9.7-inch)"/>
@@ -468,9 +468,9 @@
     <description>iPad Pro (12.9-inch)</description>
     <example>model=J121AP</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:iphone_os:-"/>
     <param pos="0" name="os.family" value="iOS"/>
     <param pos="0" name="os.product" value="iOS"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:iphone_os:-"/>
     <param pos="0" name="hw.vendor" value="Apple"/>
     <param pos="0" name="hw.family" value="iPad Pro"/>
     <param pos="0" name="hw.product" value="iPad Pro (12.9-inch)"/>
@@ -481,9 +481,9 @@
     <description>iPad (5th generation)</description>
     <example>model=J71tAP</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:iphone_os:-"/>
     <param pos="0" name="os.family" value="iOS"/>
     <param pos="0" name="os.product" value="iOS"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:iphone_os:-"/>
     <param pos="0" name="hw.vendor" value="Apple"/>
     <param pos="0" name="hw.family" value="iPad"/>
     <param pos="0" name="hw.product" value="iPad (5th generation)"/>
@@ -494,9 +494,9 @@
     <description>iPad Air</description>
     <example>model=J72AP</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:iphone_os:-"/>
     <param pos="0" name="os.family" value="iOS"/>
     <param pos="0" name="os.product" value="iOS"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:iphone_os:-"/>
     <param pos="0" name="hw.vendor" value="Apple"/>
     <param pos="0" name="hw.family" value="iPad Air"/>
     <param pos="0" name="hw.product" value="iPad Air"/>
@@ -506,9 +506,9 @@
     <description>iPad Air 2</description>
     <example>model=J81AP</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:iphone_os:-"/>
     <param pos="0" name="os.family" value="iOS"/>
     <param pos="0" name="os.product" value="iOS"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:iphone_os:-"/>
     <param pos="0" name="hw.vendor" value="Apple"/>
     <param pos="0" name="hw.family" value="iPad Air"/>
     <param pos="0" name="hw.product" value="iPad Air 2"/>
@@ -519,9 +519,9 @@
     <description>iPad mini 2</description>
     <example>model=J85AP</example>
     <param pos="0" name="os.vendor" value="Apple"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:iphone_os:-"/>
     <param pos="0" name="os.family" value="iOS"/>
     <param pos="0" name="os.product" value="iOS"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:iphone_os:-"/>
     <param pos="0" name="hw.vendor" value="Apple"/>
     <param pos="0" name="hw.family" value="iPad mini"/>
     <param pos="0" name="hw.product" value="iPad mini 2"/>

data/xml/operating_system.xml CHANGED Viewed

@@ -513,6 +513,7 @@
     <param pos="0" name="os.product" value="iOS"/>
     <param pos="1" name="os.version"/>
     <param pos="0" name="os.device" value="Mobile"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:iphone_os:{os.version}"/>
   </fingerprint>
   <!-- Mac end -->
   <!-- BSD begin -->

data/xml/sip_user_agents.xml CHANGED Viewed

@@ -14,9 +14,9 @@
   </fingerprint>
   <fingerprint pattern="(?i)^AXIS (\S+) Network (?:Audio Bridge|(?:Cabinet|Horn) Speaker)$">
     <description>Axis Network audio devices</description>
-      <example hw.product="C3003-E">AXIS C3003-E Network Horn Speaker</example>
-      <example hw.product="C8033">AXIS C8033 Network Audio Bridge</example>
-      <example hw.product="C1004-E">AXIS C1004-E Network Cabinet Speaker</example>
+    <example hw.product="C3003-E">AXIS C3003-E Network Horn Speaker</example>
+    <example hw.product="C8033">AXIS C8033 Network Audio Bridge</example>
+    <example hw.product="C1004-E">AXIS C1004-E Network Cabinet Speaker</example>
     <param pos="0" name="hw.vendor" value="Axis"/>
     <param pos="0" name="hw.family" value="Network Audio"/>
     <param pos="1" name="hw.product"/>
@@ -133,7 +133,6 @@
   </fingerprint>
   <fingerprint pattern="^PolycomRealPresenceGroup(\d+)/([\d\._]+)+$">
     <description>Polycom RealPresence Group Video Conferencing</description>
-    PolycomRealPresenceGroup700/6.2.0
     <example hw.model="700" hw.product="RealPresence Group 700" hw.version="6.2.0">PolycomRealPresenceGroup700/6.2.0</example>
     <param pos="0" name="hw.vendor" value="Polycom"/>
     <param pos="0" name="hw.family" value="RealPresence Group"/>

data/xml/smtp_banners.xml CHANGED Viewed

@@ -461,6 +461,7 @@
     <param pos="0" name="service.product" value="Mail Server"/>
     <param pos="1" name="host.name"/>
     <param pos="2" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:mailenable:mailenable:{service.version}"/>
   </fingerprint>
   <!-- MailEnable has an odd, three version string. Not sure about the meaning the second and third version #s. -->
   <fingerprint pattern="^(?:(\S+) +)?ESMTP MailEnable Service, Version: (?:([\d.]+))?-[\d.]*-[\d.]* (?:ready|denied access) at (\d{2}/\d{2}/\d{2} \d{2}:\d{2}:\d{2})$">
@@ -479,6 +480,7 @@
     <param pos="0" name="system.time.format" value="MM/dd/yy HH:mm:ss"/>
     <param pos="1" name="host.name"/>
     <param pos="2" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:mailenable:mailenable:{service.version}"/>
     <param pos="3" name="system.time"/>
   </fingerprint>
   <fingerprint pattern="^([^ ]+) \(Mail-Max Version (\d+\.[\d\.]+), (.+, .+)\) ESMTP Mail Server Ready. *$">

data/xml/telnet_banners.xml CHANGED Viewed

@@ -679,7 +679,8 @@
   <fingerprint pattern="^(?:\r|\n)*Ruijie login:\s*$">
     <description>Ruijie device (likely router/switch)</description>
     <example>Ruijie login:</example>
-    <param pos="0" name="hw.vendor" value="Ruijie"/></fingerprint>
+    <param pos="0" name="hw.vendor" value="Ruijie"/>
+  </fingerprint>
   <fingerprint pattern="^Welcome to Microsoft Telnet Service \r\n\n\rlogin:\s*$">
     <description>Microsoft Windows</description>
     <!-- Welcome to Microsoft Telnet Service \r\n\n\rlogin: -->
@@ -687,6 +688,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>
   <!-- The following fingerprints are for generic Broadcom hardware where the
        vendor has left the default banner in place. These could be rebadged by

data/xml/upnp_banners.xml CHANGED Viewed

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- UPnP Server headers are matched against these patterns to fingerprint UPnP servers. -->
 <fingerprints matches="ssdp_header.server" protocol="ssdp" database_type="service" preference="0.70">
+  <!-- UPnP Server headers are matched against these patterns to fingerprint UPnP servers. -->
   <fingerprint pattern="(?i)^(.*) UPnP/[\d\.]+\s+AVM FRITZ!(.*) ([\d\.]+)$">
     <description>AVM FRITZ! devices of various types</description>
     <example host.name="some thing" os.product="WLAN Repeater 1750E" os.version="134.07.01">some thing UPnP/1.0 AVM FRITZ!WLAN Repeater 1750E 134.07.01</example>
@@ -20,6 +20,7 @@
     <param pos="0" name="os.vendor" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="1" name="os.version"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:linux:linux_kernel:{os.version}"/>
   </fingerprint>
   <fingerprint pattern="^Tomato UPnP/\S+ MiniUPnPd/(\S+)$">
     <description>Tomato UPnP Server</description>
@@ -289,12 +290,15 @@
     <param pos="1" name="os.version"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:linux:linux_kernel:{os.version}"/>
   </fingerprint>
-  <fingerprint pattern="(?i)^SmoothWall Express/\S+ UPnP/\S+ miniupnpd/(\S+)$">
+  <fingerprint pattern="(?i)^SmoothWall Express/(\S+) UPnP/\S+ miniupnpd/(\S+)$">
     <description>Smoothwall Express UPnP Server</description>
-    <example>SmoothWall Express/3.0 UPnP/1.0 miniupnpd/1.0</example>
-    <param pos="0" name="service.vendor" value="Smoothwall"/>
+    <example os.version="3.0" service.version="1.0">SmoothWall Express/3.0 UPnP/1.0 miniupnpd/1.0</example>
+    <param pos="0" name="os.vendor" value="Smoothwall"/>
+    <param pos="0" name="os.product" value="Smoothwall"/>
+    <param pos="1" name="os.version"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:smoothwall:smoothwall:{os.version}"/>
     <param pos="0" name="service.product" value="MiniUPnP"/>
-    <param pos="1" name="service.version"/>
+    <param pos="2" name="service.version"/>
   </fingerprint>
   <fingerprint pattern="^(\S+) \d+/Service Pack \d+, UPnP/[\d\.]+, TVersity Media Server$">
     <description>TVersity Media Server UPnP Server</description>
@@ -502,6 +506,7 @@
     <param pos="0" name="os.vendor" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="1" name="os.version"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:linux:linux_kernel:{os.version}"/>
   </fingerprint>
   <fingerprint pattern="^Linux/(\S+) UPnP/[\d\.]+ DLNADOC/[\d\.]+ Portable SDK for UPnP devices/(\S+)$">
     <description>DLNADOC Portable SDK for UPnP Server</description>
@@ -512,6 +517,7 @@
     <param pos="0" name="os.vendor" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="1" name="os.version"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:linux:linux_kernel:{os.version}"/>
   </fingerprint>
   <fingerprint pattern="^Linux/(\S+), UPnP/[\d\.]+, Intel SDK for UPnP devices ?/(\S+)$">
     <description>Intel SDK for UPnP Server</description>
@@ -522,6 +528,7 @@
     <param pos="0" name="os.vendor" value="Linux"/>
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="1" name="os.version"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:linux:linux_kernel:{os.version}"/>
   </fingerprint>
   <fingerprint pattern="^Linux, UPnP/[\d\.]+, Intel SDK for UPnP devices ?/(\S+)$">
     <description>Intel SDK for UPnP Server</description>
@@ -555,6 +562,7 @@
     <param pos="0" name="os.family" value="RouterOS"/>
     <param pos="0" name="os.product" value="RouterOS"/>
     <param pos="1" name="os.version"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:mikrotik:routeros:{os.version}"/>
   </fingerprint>
   <fingerprint pattern="^Roku UPnP/\S+ Roku/(\S+)$">
     <description>Roku with a version</description>

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recog
 version: !ruby/object:Gem::Version
-  version: 2.1.39
+  version: 2.1.40
 platform: ruby
 authors:
 - Rapid7 Research
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-22 00:00:00.000000000 Z
+date: 2018-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec