RubyGems - recog - Versions diffs - 2.1.31 → 2.1.32 - Mend

recog 2.1.31 → 2.1.32

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

checksums.yaml +4 -4
data/cpe-remap.yaml +3 -0
data/lib/recog/version.rb +1 -1
data/xml/hp_pjl_id.xml +15 -15
data/xml/http_cookies.xml +3 -3
data/xml/http_servers.xml +8 -8
data/xml/http_wwwauth.xml +4 -4
data/xml/mdns_device-info_txt.xml +373 -12
data/xml/pop_banners.xml +1 -1
data/xml/snmp_sysdescr.xml +47 -24
data/xml/upnp_banners.xml +26 -26
metadata +2 -2

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fb647b8dce9140b89435e2a35cd6c8c0b64a81b
-  data.tar.gz: 64d93512efadf54166c0085897893df4c35fae12
+  metadata.gz: 541810a5f2585b6cafec8c63bb9f0494d8187e08
+  data.tar.gz: aa057ba57c4a5af3bc159598ad22d91313b8a850
 SHA512:
-  metadata.gz: d8aab406e7fe73c914d3544673ca03693b6d9383ab4c5114266058ee9392c9baa6d3d6414665b0646ee36254fe56e7a60832639873f1c518bf4024922271b54b
-  data.tar.gz: 32b32a8ee42027e23547b4ee179606d336c8359c0d3bc4ca8fcc6f2d1096e295ab88de6880ce6c0162467f2c65e10f712a9f5466bd08b0dfb006d47d30bef47c
+  metadata.gz: 9ceaad21d56c99e5b079ef18132800b71d6d940f4dccaaa08a66fae48650c27d6988c4032122d8a05acb3aa8ab7e839d142f2b434ea797f0c1309b203f00317c
+  data.tar.gz: ea7e1b16a0b12bc229b8ac3e16dc91b059343c32ebde666dd8956ec3fc95e1136012a94fc01a33006fcf4c8461e9837c45a5aee2b912cd1bf9f3232d7a0ff5b9

data/cpe-remap.yaml CHANGED

@@ -3,6 +3,9 @@ mappings:
     vendor: apache
     products:
       httpd: http_server
+  apple:
+    products:
+      ios: iphone_os
   alt-n:
     vendor: altn
   bea:

data/lib/recog/version.rb CHANGED

@@ -1,3 +1,3 @@
 module Recog
-  VERSION = '2.1.31'
+  VERSION = '2.1.32'
 end

data/xml/hp_pjl_id.xml CHANGED

@@ -12,7 +12,7 @@
    LaserJet and Designjet are registered trademarks of HP. Therefore matching for the keywords
    is sufficient for asserting all relevant information
    -->
-  <fingerprint pattern="laserjet (.*)(?: series)?" flags="REG_ICASE">
+  <fingerprint pattern="(?i)laserjet (.*)(?: series)?">
     <description>HP JetDirect Printer</description>
     <example>HP LaserJet 4100 Series</example>
     <example>HP LaserJet 2200</example>
@@ -27,7 +27,7 @@
     <param pos="0" name="os.family" value="LaserJet"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
-  <fingerprint pattern="(designjet \S+)" flags="REG_ICASE">
+  <fingerprint pattern="(?i)(designjet \S+)">
     <description>HP Designjet printer</description>
     <example>hp designjet 110plus</example>
     <example>DESIGNJET 1050C</example>
@@ -156,7 +156,7 @@
     <param pos="0" name="os.device" value="Printer"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
-  <fingerprint pattern="^Oce (fx[^\s:]+):.*$" flags="REG_ICASE">
+  <fingerprint pattern="(?i)^Oce (fx[^\s:]+):.*$">
     <description>Oce FX series multifunction device</description>
     <example os.product="fx3000">Oce fx3000:8C5-B29:Ver.D:U0707161719:B0601271355</example>
     <param pos="0" name="os.vendor" value="Oce"/>
@@ -164,7 +164,7 @@
     <param pos="0" name="os.device" value="Multifunction Device"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
-  <fingerprint pattern="^Oce (VL\S+):.*$" flags="REG_ICASE">
+  <fingerprint pattern="(?i)^Oce (VL\S+):.*$">
     <description>Oce VarioLink multifunction device</description>
     <example>Oce VL3200:8C5-D92:Ver.B</example>
     <param pos="0" name="os.vendor" value="Oce"/>
@@ -174,7 +174,7 @@
   </fingerprint>
   <!-- IGI is Imagistics International, which was acquired by Oce.
         I can't find MX-MBX3 or any variant online. -->
-  <fingerprint pattern="^OceIGI MX-\S+" flags="REG_ICASE">
+  <fingerprint pattern="(?i)^OceIGI MX-\S+">
     <description>Oce-acquired IGI printer</description>
     <example>OceIGI MX-NBX3 02-Jul-07 14:47</example>
     <param pos="0" name="os.vendor" value="Oce"/>
@@ -182,7 +182,7 @@
   </fingerprint>
   <!-- im3510/4510 is actually a range of model numbers, but asserting a range
         of models as a product is preferableto asserting nothing. -->
-  <fingerprint pattern="^Imagistics (im\S+) (.+)" flags="REG_ICASE">
+  <fingerprint pattern="(?i)^Imagistics (im\S+) (.+)">
     <description>Oce IM series multifunction device</description>
     <example>Imagistics im3510/4510 02-Aug-04 10:56</example>
     <param pos="0" name="os.vendor" value="Oce"/>
@@ -209,7 +209,7 @@
     <param pos="0" name="os.device" value="Multifunction Device"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
-  <fingerprint pattern="^RICOH ((?:Aficio|MP|SP) .*)$" flags="REG_ICASE">
+  <fingerprint pattern="(?i)^RICOH ((?:Aficio|MP|SP) .*)$">
     <description>Ricoh Aficio Printer</description>
     <example>RICOH Aficio 2075</example>
     <example>RICOH Aficio AP610N</example>
@@ -222,7 +222,7 @@
   </fingerprint>
   <!-- NRG was acquired by Ricoh; classify NRG printers as such.
          Be consistent with snmp_sysdescr.xml. -->
-  <fingerprint pattern="^NRG ([MS]P \S+)$" flags="REG_ICASE">
+  <fingerprint pattern="(?i)^NRG ([MS]P \S+)$">
     <description>Ricoh NRG printer</description>
     <example>NRG MP 171</example>
     <example>NRG MP 3350</example>
@@ -238,28 +238,28 @@
   </fingerprint>
   <!-- Gestetner == NRG, and was acquired by Ricoh.
          Assert the range of products as os.product. -->
-  <fingerprint pattern="^Gestetner (MP\S+/DSc\S+)$" flags="REG_ICASE">
+  <fingerprint pattern="(?i)^Gestetner (MP\S+/DSc\S+)$">
     <description>Ricoh Gestetner multifunction device</description>
     <example>Gestetner MPC2500/DSc525</example>
     <param pos="0" name="os.vendor" value="Ricoh"/>
     <param pos="0" name="os.device" value="Multifunction Device"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
-  <fingerprint pattern="^HYDRA$" flags="REG_ICASE">
+  <fingerprint pattern="(?i)^HYDRA$">
     <description>RSI Hydra printer</description>
     <example>HYDRA</example>
     <param pos="0" name="os.vendor" value="RSI"/>
     <param pos="0" name="os.device" value="Printer"/>
     <param pos="0" name="os.product" value="Hydra"/>
   </fingerprint>
-  <fingerprint pattern="^Savin (\S+)$" flags="REG_ICASE">
+  <fingerprint pattern="(?i)^Savin (\S+)$">
     <description>Savin Printer</description>
     <example>SAVIN 4075</example>
     <param pos="0" name="os.vendor" value="Savin"/>
     <param pos="0" name="os.device" value="Printer"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
-  <fingerprint pattern="^Samsung ((?:SCX|CLX)-\S+) Series$" flags="REG_ICASE">
+  <fingerprint pattern="(?i)^Samsung ((?:SCX|CLX)-\S+) Series$">
     <description>Samsung multifunction device</description>
     <example>Samsung SCX-5835_5935 Series</example>
     <example>Samsung CLX-4195 Series</example>
@@ -267,7 +267,7 @@
     <param pos="0" name="os.device" value="Multifunction Device"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
-  <fingerprint pattern="^Samsung ((?:ML|CLP)-\S+) Series$" flags="REG_ICASE">
+  <fingerprint pattern="(?i)^Samsung ((?:ML|CLP)-\S+) Series$">
     <description>Samsung printer</description>
     <example>Samsung CLP-680 Series</example>
     <example>Samsung ML-5012_5512 Series</example>
@@ -275,7 +275,7 @@
     <param pos="0" name="os.device" value="Printer"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
-  <fingerprint pattern="^SHARP (\S+-\S+) .*$" flags="REG_ICASE">
+  <fingerprint pattern="(?i)^SHARP (\S+-\S+) .*$">
     <description>Sharp Printer</description>
     <example>Sharp MX-NBX3 18-Mar-08 10:22</example>
     <example>Sharp AR-P17 24-Mar-04 19:55</example>
@@ -283,7 +283,7 @@
     <param pos="0" name="os.device" value="Printer"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
-  <fingerprint pattern="^Source Technologies (\S+)$" flags="REG_ICASE">
+  <fingerprint pattern="(?i)^Source Technologies (\S+)$">
     <description>Source Technologies Printer</description>
     <example>Source Technologies ST-9620</example>
     <param pos="0" name="os.vendor" value="Source Technologies"/>

data/xml/http_cookies.xml CHANGED

@@ -397,20 +397,20 @@
         a similar cookie name, you must ensure that it is located prior to
         these and this is enforced by rspec.
     -->
-  <fingerprint pattern="^JSESSIONID(?:\.[^=]+)?=[^;]+;.*$" flags="REG_ICASE">
+  <fingerprint pattern="(?i)^JSESSIONID(?:\.[^=]+)?=[^;]+;.*$">
     <description>Ignore simple JSESSIONID and related cookies</description>
     <example>JSESSIONID=6ooov35i4l3n36qtaf8csvg0;Path=/</example>
     <example>jsessionid=6nkp66iogcdc92720%2Dc6e4%2D4989%2Db7b2%2D5021624cfdff;Path=/;secure</example>
     <example>JSESSIONID.c00a9623=v216643eijh19p9duve5srgf;Path=/;HttpOnly</example>
   </fingerprint>
-  <fingerprint pattern="^_?SESSION_?ID\s*=\s*[^;]+;.*$" flags="REG_ICASE">
+  <fingerprint pattern="(?i)^_?SESSION_?ID\s*=\s*[^;]+;.*$">
     <description>Ignore simple SESSIONID and related cookies</description>
     <example>sessionId=7dba3249cfcd4b59854055311099a294; path=/;</example>
     <example>_session_id=7fe933db0fea13e9c872103ba2d142db; path=/; HttpOnly</example>
     <example>sessionId =0VrS6Ro6uC5QPXKgNdqGvyUgUFtUOVwv6OWAEWcWQ3jLRtAk2TVAgAApN9yTWVz;postId=; path=/;</example>
     <example>_session_id=18b3e173aa11db0533fd01752e81f583; path=/; HttpOnly</example>
   </fingerprint>
-  <fingerprint pattern="^sid=[^;]+;.*$" flags="REG_ICASE">
+  <fingerprint pattern="(?i)^sid=[^;]+;.*$">
     <description>Ignore simple SID and related cookies</description>
     <example>sid=sfd10bf73-654458f687aa3c68b3874915f651e0ca;path=/;"</example>
   </fingerprint>

data/xml/http_servers.xml CHANGED

@@ -22,7 +22,7 @@
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:redhat:linux:-"/>
   </fingerprint>
-  <fingerprint pattern="^Apache/\d$" flags="REG_ICASE">
+  <fingerprint pattern="(?i)^Apache/\d$">
     <description>Apache returning only its major version number</description>
     <example>Apache/1</example>
     <example>Apache/2</example>
@@ -31,7 +31,7 @@
     <param pos="0" name="service.family" value="Apache"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:apache:http_server:-"/>
   </fingerprint>
-  <fingerprint pattern="^Apache$" flags="REG_ICASE">
+  <fingerprint pattern="(?i)^Apache$">
     <description>Apache returning no version information</description>
     <example>Apache</example>
     <example>apache</example>
@@ -40,7 +40,7 @@
     <param pos="0" name="service.family" value="Apache"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:apache:http_server:-"/>
   </fingerprint>
-  <fingerprint pattern="^Apache(?:-AdvancedExtranetServer)?(?:/([012][\d.]*)\s*(.*))?$" flags="REG_ICASE">
+  <fingerprint pattern="(?i)^Apache(?:-AdvancedExtranetServer)?(?:/([012][\d.]*)\s*(.*))?$">
     <description>Apache</description>
     <example>Apache-AdvancedExtranetServer/2.0.44 (Mandrake Linux/11mdk) mod_perl/1.99_08 Perl/v5.8.0 mod_ssl/2.0.44 OpenSSL/0.9.7a PHP/4.3.1 mod_jk2/2.0.0</example>
     <example>Apache-AdvancedExtranetServer/2.0.47 (Mandrake Linux/6.12.92mdk) mod_perl/1.99_09 Perl/v5.8.1 mod_ssl/2.0.47 OpenSSL/0.9.7b PHP/4.3.2</example>
@@ -517,7 +517,7 @@
     <param pos="0" name="service.family" value="SMH"/>
     <param pos="0" name="service.product" value="SMH"/>
   </fingerprint>
-  <fingerprint pattern="^eHTTP[/ ]v?(\d+\.\d+)" flags="REG_ICASE">
+  <fingerprint pattern="(?i)^eHTTP[/ ]v?(\d+\.\d+)">
     <description>HTTP Server present on seemingly only HP ProCurve network devices</description>
     <example service.version="1.1">EHTTP/1.1</example>
     <example service.version="2.0">eHTTP v2.0</example>
@@ -832,7 +832,7 @@
     <param pos="0" name="apache.variant" value="IBM"/>
     <param pos="1" name="apache.variant.version"/>
   </fingerprint>
-  <fingerprint pattern="^(?:IBM_HTTP_SERVER|IBM-HTTP-SERVER)/(\S+)(?: \(\S+\))?$" flags="REG_ICASE">
+  <fingerprint pattern="(?i)^(?:IBM_HTTP_SERVER|IBM-HTTP-SERVER)/(\S+)(?: \(\S+\))?$">
     <description>IBM HTTP Server with hardly useful version info</description>
     <example>IBM-HTTP-Server/1.0</example>
     <example>IBM_HTTP_Server/7.0.0.9 (Unix)</example>
@@ -843,7 +843,7 @@
     <param pos="0" name="apache.variant" value="IBM"/>
     <param pos="1" name="apache.variant.version"/>
   </fingerprint>
-  <fingerprint pattern="^(?:IBM_HTTP_SERVER|IBM-HTTP-SERVER)$" flags="REG_ICASE">
+  <fingerprint pattern="(?i)^(?:IBM_HTTP_SERVER|IBM-HTTP-SERVER)$">
     <description>IBM HTTP Server with no version info</description>
     <example>IBM_HTTP_SERVER</example>
     <example>IBM_HTTP_Server</example>
@@ -1748,7 +1748,7 @@
     <param pos="1" name="service.version"/>
     <param pos="0" name="service.cpe23" value="cpe:/a:cherrypy:cherrypy:{service.version}"/>
   </fingerprint>
-  <fingerprint pattern="^TornadoServer/((?:\d+\.)*\d+)$" flags="REG_ICASE">
+  <fingerprint pattern="(?i)^TornadoServer/((?:\d+\.)*\d+)$">
     <description>Tornado Python web framework and asynchronous networking library.</description>
     <example>TornadoServer/4.0.2</example>
     <param pos="0" name="service.vendor" value="TornadoWeb"/>
@@ -1757,7 +1757,7 @@
     <param pos="0" name="service.family" value="Tornado"/>
     <param pos="1" name="service.version"/>
   </fingerprint>
-  <fingerprint pattern="^SimpleHTTP/((?:\d+\.)*\d+)\s*Python/((?:\d+\.)*\d+)$" flags="REG_ICASE">
+  <fingerprint pattern="(?i)^SimpleHTTP/((?:\d+\.)*\d+)\s*Python/((?:\d+\.)*\d+)$">
     <description>SimpleHTTPRequestHandler Python class is a simple HTTP request handler.</description>
     <example>SimpleHTTP/0.6 Python/2.7.6</example>
     <example>SimpleHTTP/0.6 Python/3.4.0</example>

data/xml/http_wwwauth.xml CHANGED

@@ -171,7 +171,7 @@
     <param pos="0" name="os.device" value="WAP"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
-  <fingerprint pattern="^(?:Basic|Digest) .*realm=&quot;Broadcom Management Service&quot;.*$" flags="REG_ICASE">
+  <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"/>
@@ -207,7 +207,7 @@
     <param pos="0" name="service.cpe23" value="cpe:/a:f5:big-ip_local_traffic_manager:-"/>
   </fingerprint>
   <!-- HP ProCurve -->
-  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;(?:HP|ProCurve) (J[3]\d{3}A)&quot;$" flags="REG_ICASE">
+  <fingerprint pattern="(?i)^(?:Basic|Digest) realm=&quot;(?:HP|ProCurve) (J[3]\d{3}A)&quot;$">
     <description>HP ProCurve Hubs</description>
     <example os.product="J3295A">Basic realm="HP J3295A"</example>
     <param pos="0" name="os.vendor" value="HP"/>
@@ -215,7 +215,7 @@
     <param pos="0" name="os.device" value="Hub"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
-  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;(?:HP|ProCurve) (J[489]\d{3}A)&quot;$" flags="REG_ICASE">
+  <fingerprint pattern="(?i)^(?:Basic|Digest) realm=&quot;(?:HP|ProCurve) (J[489]\d{3}A)&quot;$">
     <description>HP ProCurve Switches</description>
     <example os.product="J4110A">Basic realm="HP J4110A"</example>
     <example os.product="J8164A">Basic realm="ProCurve J8164A"</example>
@@ -234,7 +234,7 @@
     <param pos="0" name="service.family" value="Oracle"/>
   </fingerprint>
   <!-- a variety of headers we currently just ignore -->
-  <fingerprint pattern="^NTLM$" flags="REG_ICASE">
+  <fingerprint pattern="(?i)^NTLM$">
     <description>Ignore NTLM-only</description>
     <example>NTLM</example>
     <example>Ntlm</example>

data/xml/mdns_device-info_txt.xml CHANGED

@@ -12,110 +12,471 @@
      The number specified after osxvers= is equivalent to the major
      version of OS X plus 4. E.g. osxvers=13 means OS X 10.9
    -->
+   <fingerprint pattern="^osxvers=18">
+    <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"/>
+  </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"/>
+  </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"/>
+  </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"/>
+  </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"/>
+    <param pos="0" name="os.product" value="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"/>
+    <param pos="0" name="hw.device" value="WAP"/>
+  </fingerprint>
+  <!-- MacBookPro - Reference for the following: https://support.apple.com/en-us/HT201300 -->
+  <fingerprint pattern="^model=MacBookPro15,2$">
+    <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="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)"/>
+    <param pos="0" name="hw.device" value="Laptop"/>
+  </fingerprint>
+  <fingerprint pattern="^model=MacBookPro15,1$">
+    <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="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)"/>
+    <param pos="0" name="hw.device" value="Laptop"/>
+  </fingerprint>
+  <fingerprint pattern="^model=MacBookPro14,3$">
+    <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="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)"/>
+    <param pos="0" name="hw.device" value="Laptop"/>
+  </fingerprint>
+  <fingerprint pattern="^model=MacBookPro14,2$">
+    <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="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)"/>
+    <param pos="0" name="hw.device" value="Laptop"/>
+  </fingerprint>
+  <fingerprint pattern="^model=MacBookPro14,1$">
+    <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="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)"/>
+    <param pos="0" name="hw.device" value="Laptop"/>
+  </fingerprint>
+  <fingerprint pattern="^model=MacBookPro13,3$">
+    <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="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)"/>
+    <param pos="0" name="hw.device" value="Laptop"/>
+  </fingerprint>
+  <fingerprint pattern="^model=MacBookPro13,2$">
+    <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="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)"/>
+    <param pos="0" name="hw.device" value="Laptop"/>
+  </fingerprint>
+  <fingerprint pattern="^model=MacBookPro13,1$">
+    <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="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)"/>
+    <param pos="0" name="hw.device" value="Laptop"/>
+  </fingerprint>
+  <fingerprint pattern="^model=MacBookPro11,4$">
+    <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="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)"/>
+    <param pos="0" name="hw.device" value="Laptop"/>
+  </fingerprint>
+  <fingerprint pattern="^model=MacBookPro11,3$">
+    <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="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)"/>
+    <param pos="0" name="hw.device" value="Laptop"/>
+  </fingerprint>
+  <fingerprint pattern="^model=MacBookPro11,2$">
+    <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="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)"/>
+    <param pos="0" name="hw.device" value="Laptop"/>
+  </fingerprint>
+  <fingerprint pattern="^model=MacBookPro11,1$">
+    <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="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)"/>
+    <param pos="0" name="hw.device" value="Laptop"/>
+  </fingerprint>
+  <fingerprint pattern="^model=MacBookPro10,2$">
+    <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="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)"/>
+    <param pos="0" name="hw.device" value="Laptop"/>
+  </fingerprint>
+  <fingerprint pattern="^model=MacBookPro10,1$">
+    <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="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)"/>
+    <param pos="0" name="hw.device" value="Laptop"/>
+  </fingerprint>
+  <!-- MacBook - Reference for the following: https://support.apple.com/en-us/HT201608 -->
+  <fingerprint pattern="^model=MacBook10,1$">
+    <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="hw.vendor" value="Apple"/>
+    <param pos="0" name="hw.family" value="MacBook"/>
+    <param pos="0" name="hw.product" value="MacBook (Retina, 12-inch, 2017)"/>
+    <param pos="0" name="hw.device" value="Laptop"/>
+  </fingerprint>
+  <fingerprint pattern="^model=MacBook9,1$">
+    <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="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)"/>
+    <param pos="0" name="hw.device" value="Laptop"/>
+  </fingerprint>
+  <fingerprint pattern="^model=MacBook8,1$">
+    <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="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)"/>
+    <param pos="0" name="hw.device" value="Laptop"/>
+  </fingerprint>
+  <fingerprint pattern="^model=MacBook7,1$">
+    <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="hw.vendor" value="Apple"/>
+    <param pos="0" name="hw.family" value="MacBook"/>
+    <param pos="0" name="hw.product" value="MacBook (13-inch, Mid 2010)"/>
+    <param pos="0" name="hw.device" value="Laptop"/>
+  </fingerprint>
+  <!-- MacMini - Reference for the following: https://support.apple.com/en-us/HT201894 -->
+  <fingerprint pattern="^model=Macmini7,1$">
+    <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="hw.vendor" value="Apple"/>
+    <param pos="0" name="hw.family" value="Mac mini"/>
+    <param pos="0" name="hw.product" value="Mac mini (Late 2014)"/>
+    <param pos="0" name="hw.device" value="Desktop"/>
+  </fingerprint>
+  <fingerprint pattern="^model=Macmini6,2$">
+    <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="hw.vendor" value="Apple"/>
+    <param pos="0" name="hw.family" value="Mac mini"/>
+    <param pos="0" name="hw.product" value="Mac mini (Late 2012)"/>
+    <param pos="0" name="hw.device" value="Desktop"/>
+  </fingerprint>
+  <fingerprint pattern="^model=Macmini6,1$">
+    <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="hw.vendor" value="Apple"/>
+    <param pos="0" name="hw.family" value="Mac mini"/>
+    <param pos="0" name="hw.product" value="Mac mini (Late 2012)"/>
+    <param pos="0" name="hw.device" value="Desktop"/>
+  </fingerprint>
+  <!-- iPad Pro - Reference for the following: https://www.theiphonewiki.com/ -->
+  <fingerprint pattern="^model=J20[78]AP$">
+    <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="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)"/>
+    <param pos="0" name="hw.device" value="Tablet"/>
+  </fingerprint>
+  <fingerprint pattern="^model=J12[78]AP$">
+    <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="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)"/>
+    <param pos="0" name="hw.device" value="Tablet"/>
+  </fingerprint>
+  <!-- iPad -->
+  <fingerprint pattern="^model=J71[ts]AP$">
+    <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="hw.vendor" value="Apple"/>
+    <param pos="0" name="hw.family" value="iPad"/>
+    <param pos="0" name="hw.product" value="iPad (5th generation)"/>
+    <param pos="0" name="hw.device" value="Tablet"/>
+  </fingerprint>
+  <!-- iPad Air -->
+  <fingerprint pattern="^model=J7[123]AP$">
+    <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="hw.vendor" value="Apple"/>
+    <param pos="0" name="hw.family" value="iPad Air"/>
+    <param pos="0" name="hw.product" value="iPad Air"/>
+    <param pos="0" name="hw.device" value="Tablet"/>
+  </fingerprint>
+  <!-- iPad mini -->
+  <fingerprint pattern="^model=J8[567]AP$">
+    <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="hw.vendor" value="Apple"/>
+    <param pos="0" name="hw.family" value="iPad mini"/>
+    <param pos="0" name="hw.product" value="iPad mini 2"/>
+    <param pos="0" name="hw.device" value="Tablet"/>
   </fingerprint>
 </fingerprints>