recog 2.3.15 → 2.3.20

data/xml/http_wwwauth.xml

@@ -2,6 +2,14 @@
 <fingerprints matches="http_header.wwwauth" protocol="http" database_type="service" preference="0.85">
   <!-- HTTP WWW-Authenticate headers are matched against these patterns to fingerprint HTTP servers. -->
 
+  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;monit&quot;$">
+    <description>Minot</description>
+    <example>Basic realm="monit"</example>
+    <param pos="0" name="service.vendor" value="Tildeslash"/>
+    <param pos="0" name="service.product" value="Monit"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:tildeslash:monit:-"/>
+  </fingerprint>
+
   <fingerprint pattern="^(?:Basic|Digest) realm=&quot;access&quot;$">
     <description>Cisco IOS 11.x</description>
     <example>Basic realm="access"</example>
@@ -103,7 +111,7 @@
     <param pos="0" name="service.vendor" value="APC"/>
     <param pos="0" name="service.product" value="HTTP"/>
     <param pos="0" name="os.vendor" value="APC"/>
-    <param pos="0" name="os.device" value="Power device"/>
+    <param pos="0" name="os.device" value="Power Device"/>
   </fingerprint>
 
   <fingerprint pattern="^(?:Basic|Digest) realm=&quot;ADSL\S* (?:Modem|Router|Modem/Router)&quot;.*$">
@@ -118,7 +126,7 @@
   <fingerprint pattern="^(?:Basic|Digest) realm=&quot;Broadband Router&quot;.*$">
     <description>Generic Broadband modems/routers</description>
     <example>Basic realm="Broadband Router"</example>
-    <param pos="0" name="hw.device" value="Broadband router"/>
+    <param pos="0" name="hw.device" value="Broadband Router"/>
   </fingerprint>
 
   <fingerprint pattern="^(?:Basic|Digest) realm=&quot;DSL\S* (?:Modem|Router|Modem/Router)&quot;.*$">
@@ -164,7 +172,7 @@
     <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"/>
+    <param pos="0" name="hw.device" value="IP Camera"/>
   </fingerprint>
 
   <fingerprint pattern="^(?:Basic|Digest) realm=&quot;(DCS-[^&quot;]+)&quot;.*$">
@@ -172,7 +180,7 @@
     <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="0" name="hw.device" value="IP Camera"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
 
@@ -184,10 +192,20 @@
     <param pos="0" name="service.family" value="GoAhead Webserver"/>
   </fingerprint>
 
+  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;Logitech Media Server&quot;.*$">
+    <description>Logitech Media server</description>
+    <example>Basic realm="Logitech Media Server"</example>
+    <param pos="0" name="service.vendor" value="Logitech"/>
+    <param pos="0" name="service.product" value="Squeezebox"/>
+  </fingerprint>
+
   <fingerprint pattern="^(?:Basic|Digest) realm=&quot;kubernetes-master&quot;.*$">
     <description>Kubernetes master nodes</description>
     <example>Basic realm="kubernetes-master"</example>
     <param pos="0" name="service.vendor" value="Kubernetes"/>
+    <param pos="0" name="service.family" value="Kubernetes"/>
+    <param pos="0" name="service.product" value="Kubernetes"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:kubernetes:kubernetes:-"/>
   </fingerprint>
 
   <fingerprint pattern="(?i)^(?:Basic|Digest) realm=&quot;RUIJIE(?:-CPE)?&quot;.*$">
@@ -203,11 +221,11 @@
     <param pos="0" name="service.product" value="SpeedTouch"/>
     <param pos="0" name="service.family" value="SpeedTouch"/>
     <param pos="0" name="os.vendor" value="Thomson"/>
-    <param pos="0" name="os.device" value="Broadband router"/>
+    <param pos="0" name="os.device" value="Broadband Router"/>
     <param pos="0" name="os.family" value="SpeedTouch"/>
     <param pos="0" name="hw.vendor" value="Thomson"/>
     <param pos="0" name="hw.family" value="SpeedTouch"/>
-    <param pos="0" name="hw.device" value="Broadband router"/>
+    <param pos="0" name="hw.device" value="Broadband Router"/>
   </fingerprint>
 
   <fingerprint pattern="^(?:Basic|Digest) realm=&quot;SpeedTouch \(([0-9A-F]{2}-[0-9A-F]{2}-[0-9A-F]{2}-[0-9A-F]{2}-[0-9A-F]{2}-[0-9A-F]{2})\)&quot;$">
@@ -217,12 +235,12 @@
     <param pos="0" name="service.product" value="SpeedTouch"/>
     <param pos="0" name="service.family" value="SpeedTouch"/>
     <param pos="0" name="os.vendor" value="Thomson"/>
-    <param pos="0" name="os.device" value="Broadband router"/>
+    <param pos="0" name="os.device" value="Broadband Router"/>
     <param pos="0" name="os.family" value="SpeedTouch"/>
     <param pos="0" name="os.product" value="SpeedTouch"/>
     <param pos="0" name="hw.vendor" value="Thomson"/>
     <param pos="0" name="hw.family" value="SpeedTouch"/>
-    <param pos="0" name="hw.device" value="Broadband router"/>
+    <param pos="0" name="hw.device" value="Broadband Router"/>
     <param pos="1" name="host.mac"/>
   </fingerprint>
 
@@ -237,12 +255,12 @@
     <param pos="0" name="service.product" value="SpeedTouch"/>
     <param pos="0" name="service.family" value="SpeedTouch"/>
     <param pos="0" name="os.vendor" value="Thomson"/>
-    <param pos="0" name="os.device" value="Broadband router"/>
+    <param pos="0" name="os.device" value="Broadband Router"/>
     <param pos="0" name="os.family" value="SpeedTouch"/>
     <param pos="0" name="os.product" value="SpeedTouch"/>
     <param pos="0" name="hw.vendor" value="Thomson"/>
     <param pos="0" name="hw.family" value="SpeedTouch"/>
-    <param pos="0" name="hw.device" value="Broadband router"/>
+    <param pos="0" name="hw.device" value="Broadband Router"/>
     <param pos="1" name="host.mac"/>
   </fingerprint>
 
@@ -252,11 +270,11 @@
     <param pos="0" name="service.product" value="SpeedTouch"/>
     <param pos="0" name="service.family" value="SpeedTouch"/>
     <param pos="0" name="os.vendor" value="Thomson"/>
-    <param pos="0" name="os.device" value="Broadband router"/>
+    <param pos="0" name="os.device" value="Broadband Router"/>
     <param pos="0" name="os.family" value="SpeedTouch"/>
     <param pos="0" name="hw.vendor" value="Thomson"/>
     <param pos="0" name="hw.family" value="SpeedTouch"/>
-    <param pos="0" name="hw.device" value="Broadband router"/>
+    <param pos="0" name="hw.device" value="Broadband Router"/>
     <param pos="1" name="os.product"/>
     <param pos="2" name="host.mac"/>
   </fingerprint>
@@ -266,7 +284,7 @@
     <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"/>
+    <param pos="0" name="hw.device" value="Broadband Router"/>
   </fingerprint>
 
   <fingerprint pattern="^(?:Basic|Digest) realm=&quot;(?:SmartAX )?(MT\d+[^ ]*)(?: ADSL Router)?&quot;$">
@@ -276,11 +294,11 @@
     <param pos="0" name="service.family" value="MT"/>
     <param pos="1" name="service.product"/>
     <param pos="0" name="os.vendor" value="Huawei"/>
-    <param pos="0" name="os.device" value="Broadband router"/>
+    <param pos="0" name="os.device" value="Broadband Router"/>
     <param pos="0" name="os.family" value="MT"/>
     <param pos="1" name="os.product"/>
     <param pos="0" name="hw.vendor" value="Huawei"/>
-    <param pos="0" name="hw.device" value="Broadband router"/>
+    <param pos="0" name="hw.device" value="Broadband Router"/>
     <param pos="0" name="hw.family" value="MT"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
@@ -289,7 +307,7 @@
     <description>Huawei Home Gateway Routers</description>
     <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.device" value="Broadband Router"/>
     <param pos="0" name="hw.product" value="Home Gateway"/>
   </fingerprint>
 
@@ -298,7 +316,7 @@
     <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.device" value="Broadband Router"/>
     <param pos="0" name="hw.product" value="EchoLife Home Gateway"/>
   </fingerprint>
 
@@ -318,29 +336,35 @@
 
   <fingerprint pattern="^(?:Basic|Digest) realm=&quot;(TD-[VW8][A-Z0-9]+)(?:| \d+\.\d+)&quot;$">
     <description>TP-LINK SoHo Router - dash variant</description>
-    <example>Basic realm="TD-W8901G"</example>
+    <example os.product="TD-W8901G">Basic realm="TD-W8901G"</example>
     <example>Basic realm="TD-8840T 2.0"</example>
-    <example>Basic realm="TD-8811"</example>
+    <example hw.product="TD-8811">Basic realm="TD-8811"</example>
     <param pos="0" name="os.vendor" value="TP-LINK"/>
     <param pos="0" name="os.device" value="Router"/>
     <param pos="1" name="os.product"/>
+    <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="^(?:Basic|Digest) realm=&quot;(TD8[A-Z0-9]+)&quot;$">
     <description>TP-LINK SoHo Router</description>
-    <example>Basic realm="TD854W"</example>
-    <example>Basic realm="TD811"</example>
+    <example os.product="TD854W">Basic realm="TD854W"</example>
+    <example hw.product="TD811">Basic realm="TD811"</example>
     <example>Basic realm="TD821"</example>
     <example>Basic realm="TD841"</example>
     <param pos="0" name="os.vendor" value="TP-LINK"/>
     <param pos="0" name="os.device" value="Router"/>
     <param pos="1" name="os.product"/>
+    <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="^(?:Basic|Digest) realm=&quot;TP-LINK.*(?:Access Point|Extender|AP) ([A-Z0-9\-\+]+)&quot;.*$">
     <description>TP-LINK SoHo Router - verbose variant</description>
-    <example>Basic realm="TP-LINK Wireless N Access Point WA801N"</example>
-    <example>Basic realm="TP-LINK Wireless Range Extender WA830RE"</example>
+    <example os.product="WA801N">Basic realm="TP-LINK Wireless N Access Point WA801N"</example>
+    <example hw.product="WA830RE">Basic realm="TP-LINK Wireless Range Extender WA830RE"</example>
     <example>Basic realm="TP-LINK Wireless Range Extender WA850RE"</example>
     <example>Basic realm="TP-LINK Wireless AP WA501G"</example>
     <example>Basic realm="TP-LINK Wireless N Access Point WA701ND"</example>
@@ -358,6 +382,9 @@
     <param pos="0" name="os.vendor" value="TP-LINK"/>
     <param pos="0" name="os.device" value="WAP"/>
     <param pos="1" name="os.product"/>
+    <param pos="0" name="hw.vendor" value="TP-LINK"/>
+    <param pos="0" name="hw.device" value="WAP"/>
+    <param pos="1" name="hw.product"/>
   </fingerprint>
 
   <fingerprint pattern="(?i)^(?:Basic|Digest).*realm=&quot;TP-LINK (.*Router.*)&quot;.*$">
@@ -374,7 +401,7 @@
     <description>TP-LINK IP-Cameras</description>
     <example>Basic realm="TP-LINK IP-Camera"</example>
     <param pos="0" name="hw.vendor" value="TP-LINK"/>
-    <param pos="0" name="hw.device" value="Web cam"/>
+    <param pos="0" name="hw.device" value="IP Camera"/>
   </fingerprint>
 
   <fingerprint pattern="(?i)^(?:Basic|Digest) .*realm=&quot;Broadcom Management Service&quot;.*$">
@@ -458,7 +485,7 @@
     <description>Ubee Cable Modems</description>
     <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"/>
+    <param pos="0" name="hw.device" value="Broadband Router"/>
   </fingerprint>
 
   <fingerprint pattern="^(?:Basic|Digest) realm=&quot;XDB&quot;$">
@@ -506,7 +533,7 @@
     <description>Steinsvik Orbit 351 IP Camera (Truen TCAM Rebrand)</description>
     <example hw.product="Orbit-351">Digest realm="Orbit-351", nonce="0000040dY892418598785d2a2304a74adf22f6098f2792", stale=FALSE</example>
     <param pos="0" name="hw.vendor" value="Steinsvik"/>
-    <param pos="0" name="hw.device" value="Web cam"/>
+    <param pos="0" name="hw.device" value="IP Camera"/>
     <param pos="1" name="hw.product"/>
     <param pos="0" name="os.vendor" value="Steinsvik"/>
     <param pos="0" name="os.family" value="Linux"/>

data/xml/ldap_searchresult.xml

@@ -365,6 +365,7 @@
     </example>
     <param pos="0" name="service.vendor" value="Kerio"/>
     <param pos="0" name="service.product" value="Connect"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:kerio:connect:-"/>
   </fingerprint>
 
   <fingerprint pattern="(?im:vmwPlatformServicesControllerVersion1.\x04.(\d\.\d\.\d)0.)">
@@ -382,7 +383,7 @@
   <!--  http://directory.fedoraproject.org/docs/389ds/FAQ/history.html  -->
 
   <fingerprint pattern="(?i:vendorname1.\x04.Fedora Project0.\x04\rvendorversion1.\x04.Fedora-Directory/(\d\.\d[\w.]* B\d+\.\d+\.\d+))">
-    <description>Fedora Project Fedora Directory Server</description>
+    <description>Fedora Project 389 Directory Server - Old Fedora branding</description>
     <example service.version="1.0.4 B2006.312.5450" _encoding="base64">
       dmVuZG9yTmFtZTEQBA5GZWRvcmEgUHJvamVjdDA3BA12ZW5kb3JWZXJzaW9uMSYEJEZlZG9yY
       S1EaXJlY3RvcnkvMS4wLjQgQjIwMDYuMzEyLjU0NTA=
@@ -391,20 +392,22 @@
       dmVuZG9yTmFtZTEQBA5GZWRvcmEgUHJvamVjdDA4BA12ZW5kb3JWZXJzaW9uMScEJUZlZG9yY
       S1EaXJlY3RvcnkvMS4wLjQgQjIwMDcuMzA0LjExMzgw
     </example>
-    <param pos="0" name="service.vendor" value="Red Hat"/>
-    <param pos="0" name="service.product" value="Fedora Directory Server"/>
+    <param pos="0" name="service.vendor" value="Fedora Project"/>
+    <param pos="0" name="service.product" value="389 Directory Server"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:fedoraproject:389_directory_server:{service.version}"/>
   </fingerprint>
 
   <fingerprint pattern="(?i:vendorname1.\x04.389 Project0.\x04\rvendorversion1.\x04.389-Directory/(\d\.\d[\w.]* B\d+\.\d+\.\d+))">
-    <description>389 Project 389 Directory Server</description>
+    <description>Fedora Project 389 Directory Server</description>
     <example service.version="1.2.11.25 B2013.325.19510" _encoding="base64">
       dmVuZG9yTmFtZTENBAszODkgUHJvamVjdDA5BA12ZW5kb3JWZXJzaW9uMSgEJjM4OS1EaXJlY
       3RvcnkvMS4yLjExLjI1IEIyMDEzLjMyNS4xOTUxMA==
     </example>
-    <param pos="0" name="service.vendor" value="389 Project"/>
+    <param pos="0" name="service.vendor" value="Fedora Project"/>
     <param pos="0" name="service.product" value="389 Directory Server"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:fedoraproject:389_directory_server:{service.version}"/>
   </fingerprint>
 
   <fingerprint pattern="(?im:vendorName1.\x04.CentOS0.\x04\rvendorVersion1.\x04.CentOS-Directory/(\d\.\d[\w.]* B\d+\.\d+\.\d+).\x04\v)">
@@ -441,8 +444,9 @@
       XJzaW9uMSgEJk5ldHNjYXBlLURpcmVjdG9yeS82LjExIEIyMDAyLjI4MS4wODUzMC8ECw==
     </example>
     <param pos="0" name="service.vendor" value="Netscape"/>
-    <param pos="0" name="service.product" value="Netscape Directory Server"/>
+    <param pos="0" name="service.product" value="Directory Server"/>
     <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:netscape:directory_server:{service.version}"/>
   </fingerprint>
 
   <fingerprint pattern="(?im:IBM Lotus Software0.\x04\rvendorversion1.\x04.Release (\d+\.\d+[\w .]*)0.\x04.dominomajminversion)">

data/xml/mdns_device-info_txt.xml

@@ -14,6 +14,16 @@
      version of OS X plus 4. E.g. osxvers=13 means OS X 10.9
    -->
 
+  <fingerprint pattern="^osxvers=20">
+    <description>OS X 11.0 (Big Sur)</description>
+    <example>osxvers=20</example>
+    <param pos="0" name="os.vendor" value="Apple"/>
+    <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="11.0"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:11.0"/>
+  </fingerprint>
+
   <fingerprint pattern="^osxvers=19">
     <description>OS X 10.15 (Catalina)</description>
     <example>osxvers=19</example>
@@ -238,6 +248,46 @@
 
   <!-- MacBookPro - Reference for the following: https://support.apple.com/en-us/HT201300 -->
 
+  <fingerprint pattern="^model=MacBookPro17,1$">
+    <description>MacBook Pro (13-inch, M1, 2020)</description>
+    <example>model=MacBookPro17,1</example>
+    <param pos="0" name="os.vendor" value="Apple"/>
+    <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, M1, 2020)"/>
+    <param pos="0" name="hw.device" value="Laptop"/>
+  </fingerprint>
+
+  <fingerprint pattern="^model=MacBookPro16,1$">
+    <description>MacBook Pro (16-inch, 2019)</description>
+    <example>model=MacBookPro16,1</example>
+    <param pos="0" name="os.vendor" value="Apple"/>
+    <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 (16-inch, 2019)"/>
+    <param pos="0" name="hw.device" value="Laptop"/>
+  </fingerprint>
+
+  <fingerprint pattern="^model=MacBookPro16,[23]$">
+    <description>MacBook Pro (13-inch, 2020)</description>
+    <example>model=MacBookPro16,2</example>
+    <example>model=MacBookPro16,3</example>
+    <param pos="0" name="os.vendor" value="Apple"/>
+    <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, 2020)"/>
+    <param pos="0" name="hw.device" value="Laptop"/>
+  </fingerprint>
+
   <fingerprint pattern="^model=MacBookPro15,4$">
     <description>MacBook Pro (13-inch, 2019, Two Thunderbolt 3 ports)</description>
     <example>model=MacBookPro15,4</example>
@@ -381,9 +431,10 @@
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
 
-  <fingerprint pattern="^model=MacBookPro11,4$">
+  <fingerprint pattern="^model=MacBookPro11,[45]$">
     <description>MacBook Pro (Retina, 15-inch, Mid 2015)</description>
     <example>model=MacBookPro11,4</example>
+    <example>model=MacBookPro11,5</example>
     <param pos="0" name="os.vendor" value="Apple"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
     <param pos="0" name="os.product" value="Mac OS X"/>
@@ -472,6 +523,19 @@
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
 
+  <fingerprint pattern="^model=MacBookPro9,1$">
+    <description>MacBook Pro (15-inch, Mid 2012)</description>
+    <example>model=MacBookPro9,1</example>
+    <param pos="0" name="os.vendor" value="Apple"/>
+    <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, Mid 2012)"/>
+    <param pos="0" name="hw.device" value="Laptop"/>
+  </fingerprint>
+
   <fingerprint pattern="^model=MacBookPro8,3$">
     <description>MacBook Pro (17-inch, Late 2011)</description>
     <example>model=MacBookPro8,3</example>
@@ -671,6 +735,32 @@
 
   <!-- MacBookAir - Reference for the following: https://support.apple.com/en-us/HT201862 -->
 
+  <fingerprint pattern="^model=MacBookAir10,1$">
+    <description>MacBook Air (M1, 2020)</description>
+    <example>model=MacBookAir10,1</example>
+    <param pos="0" name="os.vendor" value="Apple"/>
+    <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 Air (M1, 2020)"/>
+    <param pos="0" name="hw.device" value="Laptop"/>
+  </fingerprint>
+
+  <fingerprint pattern="^model=MacBookAir9,1$">
+    <description>MacBook Air (Retina, 13-inch, 2020)</description>
+    <example>model=MacBookAir9,1</example>
+    <param pos="0" name="os.vendor" value="Apple"/>
+    <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 Air (Retina, 13-inch, 2020)"/>
+    <param pos="0" name="hw.device" value="Laptop"/>
+  </fingerprint>
+
   <fingerprint pattern="^model=MacBookAir8,2$">
     <description>MacBook Air (Retina, 13-inch, 2019)</description>
     <example>model=MacBookAir8,2</example>
@@ -842,6 +932,19 @@
 
   <!-- MacMini - Reference for the following: https://support.apple.com/en-us/HT201894 -->
 
+  <fingerprint pattern="^model=Macmini9,1$">
+    <description>Mac mini (M1, 2020)</description>
+    <example>model=Macmini9,1</example>
+    <param pos="0" name="os.vendor" value="Apple"/>
+    <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 (M1, 2020)"/>
+    <param pos="0" name="hw.device" value="Desktop"/>
+  </fingerprint>
+
   <fingerprint pattern="^model=Macmini8,1$">
     <description>Mac mini (Late 2018)</description>
     <example>model=Macmini8,1</example>
@@ -1122,6 +1225,19 @@
 
   <!-- iMAC - Reference for the following: https://support.apple.com/en-us/HT201634 -->
 
+  <fingerprint pattern="^model=iMac20,1$">
+    <description>iMac (Retina 5K, 27-inch, 2020)</description>
+    <example>model=iMac20,1</example>
+    <param pos="0" name="os.vendor" value="Apple"/>
+    <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="iMac"/>
+    <param pos="0" name="hw.product" value="iMac (Retina 5K, 27-inch, 2020)"/>
+    <param pos="0" name="hw.device" value="Desktop"/>
+  </fingerprint>
+
   <fingerprint pattern="^model=iMac19,1$">
     <description>iMac (Retina 5K, 27-inch, 2019)</description>
     <example>model=iMac19,1</example>
@@ -1369,8 +1485,21 @@
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
 
+  <fingerprint pattern="^model=iMac11,1$">
+    <description>iMac 10 (27-inch, Late 2009)</description>
+    <example>model=iMac11,1</example>
+    <param pos="0" name="os.vendor" value="Apple"/>
+    <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="iMac"/>
+    <param pos="0" name="hw.product" value="iMac (27-inch, Late 2009)"/>
+    <param pos="0" name="hw.device" value="Desktop"/>
+  </fingerprint>
+
   <fingerprint pattern="^model=iMac10,1$">
-    <description>iMac (27-inch, Late 2009)</description>
+    <description>iMac 11 (27-inch, Late 2009)</description>
     <example>model=iMac10,1</example>
     <param pos="0" name="os.vendor" value="Apple"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
@@ -1395,10 +1524,50 @@
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
 
+  <fingerprint pattern="^model=iMac8,1$">
+    <description>iMac (20/24-inch, Early 2008)</description>
+    <example>model=iMac8,1</example>
+    <param pos="0" name="os.vendor" value="Apple"/>
+    <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="iMac"/>
+    <param pos="0" name="hw.product" value="iMac (20/24-inch, Early 2008)"/>
+    <param pos="0" name="hw.device" value="Desktop"/>
+  </fingerprint>
+
   <!-- iPad Pro - Reference for the following: https://www.theiphonewiki.com/ -->
 
+  <fingerprint pattern="^model=J42[01]AP$">
+    <description>iPad Pro (12.9-inch, 4th generation)</description>
+    <example>model=J420AP</example>
+    <example>model=J421AP</example>
+    <param pos="0" name="os.vendor" value="Apple"/>
+    <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, 4th generation)"/>
+    <param pos="0" name="hw.device" value="Tablet"/>
+  </fingerprint>
+
+  <fingerprint pattern="^model=J41[78]AP$">
+    <description>iPad Pro (11-inch, 2nd generation)</description>
+    <example>model=J417AP</example>
+    <param pos="0" name="os.vendor" value="Apple"/>
+    <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 (11-inch, 2nd generation)"/>
+    <param pos="0" name="hw.device" value="Tablet"/>
+  </fingerprint>
+
   <fingerprint pattern="^model=J32[01]x?AP$">
-    <description>iPad Pro (12.9-inch)</description>
+    <description>iPad Pro (12.9-inch, 3rd generation)</description>
     <example>model=J320AP</example>
     <example>model=J321xAP</example>
     <param pos="0" name="os.vendor" value="Apple"/>
@@ -1407,7 +1576,7 @@
     <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)"/>
+    <param pos="0" name="hw.product" value="iPad Pro (12.9-inch, 3rd generation)"/>
     <param pos="0" name="hw.device" value="Tablet"/>
   </fingerprint>
 
@@ -1428,6 +1597,7 @@
   <fingerprint pattern="^model=J20[78]AP$">
     <description>iPad Pro (10.5-inch)</description>
     <example>model=J207AP</example>
+    <example>model=J208AP</example>
     <param pos="0" name="os.vendor" value="Apple"/>
     <param pos="0" name="os.family" value="iOS"/>
     <param pos="0" name="os.product" value="iOS"/>
@@ -1451,10 +1621,38 @@
     <param pos="0" name="hw.device" value="Tablet"/>
   </fingerprint>
 
+  <fingerprint pattern="^model=J12[01]AP$">
+    <description>iPad Pro (12.9-inch, 2nd generation)</description>
+    <example>model=J120AP</example>
+    <example>model=J121AP</example>
+    <param pos="0" name="os.vendor" value="Apple"/>
+    <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, 2nd generation)"/>
+    <param pos="0" name="hw.device" value="Tablet"/>
+  </fingerprint>
+
+  <fingerprint pattern="^model=J9[89]aAP$">
+    <description>iPad Pro (12.9-inch)</description>
+    <example>model=J98aAP</example>
+    <example>model=J99aAP</example>
+    <param pos="0" name="os.vendor" value="Apple"/>
+    <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)"/>
+    <param pos="0" name="hw.device" value="Tablet"/>
+  </fingerprint>
+
   <!-- iPad -->
 
   <fingerprint pattern="^model=J7[12]bAP$">
-    <description>iPad 6th generation)</description>
+    <description>iPad (6th generation)</description>
     <example>model=J72bAP</example>
     <example>model=J71bAP</example>
     <param pos="0" name="os.vendor" value="Apple"/>
@@ -1619,9 +1817,10 @@
 
   <!-- Apple TV -->
 
-  <fingerprint pattern="^model=J105aAP$">
+  <fingerprint pattern="^model=(?:J105aAP|AppleTV6,2)$">
     <description>Apple TV 4K</description>
     <example>model=J105aAP</example>
+    <example>model=AppleTV6,2</example>
     <param pos="0" name="os.vendor" value="Apple"/>
     <param pos="0" name="os.family" value="tvOS"/>
     <param pos="0" name="os.product" value="tvOS"/>
@@ -1632,9 +1831,10 @@
     <param pos="0" name="hw.device" value="Media Server"/>
   </fingerprint>
 
-  <fingerprint pattern="^model=J42dAP$">
+  <fingerprint pattern="^model=(?:J42dAP|AppleTV5,3)$">
     <description>Apple TV (4th generation)</description>
     <example>model=J42dAP</example>
+    <example>model=AppleTV5,3</example>
     <param pos="0" name="os.vendor" value="Apple"/>
     <param pos="0" name="os.family" value="tvOS"/>
     <param pos="0" name="os.product" value="tvOS"/>
@@ -1645,11 +1845,13 @@
     <param pos="0" name="hw.device" value="Media Server"/>
   </fingerprint>
 
-  <fingerprint pattern="^model=J33[Ii]?AP$">
+  <fingerprint pattern="^model=(?:J33[Ii]?AP|AppleTV3,[21])$">
     <description>Apple TV (3rd generation)</description>
     <example>model=J33IAP</example>
     <example>model=J33iAP</example>
     <example>model=J33AP</example>
+    <example>model=AppleTV3,2</example>
+    <example>model=AppleTV3,1</example>
     <param pos="0" name="os.vendor" value="Apple"/>
     <param pos="0" name="os.family" value="tvOS"/>
     <param pos="0" name="os.product" value="tvOS"/>
@@ -1660,9 +1862,10 @@
     <param pos="0" name="hw.device" value="Media Server"/>
   </fingerprint>
 
-  <fingerprint pattern="^model=K66AP$">
+  <fingerprint pattern="^model=(?:K66AP|AppleTV2,1)$">
     <description>Apple TV (2nd generation)</description>
     <example>model=K66AP</example>
+    <example>model=AppleTV2,1</example>
     <param pos="0" name="os.vendor" value="Apple"/>
     <param pos="0" name="os.family" value="tvOS"/>
     <param pos="0" name="os.product" value="tvOS"/>
@@ -1673,7 +1876,102 @@
     <param pos="0" name="hw.device" value="Media Server"/>
   </fingerprint>
 
-  <!-- iPad Pro - Reference for the following: https://www.theiphonewiki.com/ -->
+  <!-- iPhones - Reference for the following: https://www.theiphonewiki.com/wiki/Category:Devices
+   and http://phonedb.net/ -->
+
+  <fingerprint pattern="^model=D79AP$">
+    <description>iPhone SE (2020)</description>
+    <example>model=D79AP</example>
+    <param pos="0" name="os.vendor" value="Apple"/>
+    <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="iPhone"/>
+    <param pos="0" name="hw.product" value="iPhone SE (2020)"/>
+    <param pos="0" name="hw.device" value="Mobile Phone"/>
+  </fingerprint>
+
+  <fingerprint pattern="^model=D54pAP$">
+    <description>iPhone 12 Pro Max 5G</description>
+    <example>model=D54pAP</example>
+    <param pos="0" name="os.vendor" value="Apple"/>
+    <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="iPhone"/>
+    <param pos="0" name="hw.product" value="iPhone 12 Pro Max 5G"/>
+    <param pos="0" name="hw.device" value="Mobile Phone"/>
+  </fingerprint>
+
+  <fingerprint pattern="^model=D53pAP$">
+    <description>iPhone 12 Pro 5G</description>
+    <example>model=D53pAP</example>
+    <param pos="0" name="os.vendor" value="Apple"/>
+    <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="iPhone"/>
+    <param pos="0" name="hw.product" value="iPhone 12 Pro 5G"/>
+    <param pos="0" name="hw.device" value="Mobile Phone"/>
+  </fingerprint>
+
+  <fingerprint pattern="^model=D53gAP$">
+    <description>iPhone 12 5G</description>
+    <example>model=D53gAP</example>
+    <param pos="0" name="os.vendor" value="Apple"/>
+    <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="iPhone"/>
+    <param pos="0" name="hw.product" value="iPhone 12 5G"/>
+    <param pos="0" name="hw.device" value="Mobile Phone"/>
+  </fingerprint>
+
+  <fingerprint pattern="^model=D52g?AP$">
+    <description>iPhone 12 Mini 5G</description>
+    <example>model=D52gAP</example>
+    <example>model=D52AP</example>
+    <param pos="0" name="os.vendor" value="Apple"/>
+    <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="iPhone"/>
+    <param pos="0" name="hw.product" value="iPhone 12 Mini 5G"/>
+    <param pos="0" name="hw.device" value="Mobile Phone"/>
+  </fingerprint>
+
+  <fingerprint pattern="^model=D431p?AP$">
+    <description>iPhone 11 Pro Max</description>
+    <example>model=D431pAP</example>
+    <example>model=D431AP</example>
+    <param pos="0" name="os.vendor" value="Apple"/>
+    <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="iPhone"/>
+    <param pos="0" name="hw.product" value="iPhone 11 Pro Max"/>
+    <param pos="0" name="hw.device" value="Mobile Phone"/>
+  </fingerprint>
+
+  <fingerprint pattern="^model=D421p?AP$">
+    <description>iPhone 11 Pro</description>
+    <example>model=D421pAP</example>
+    <example>model=D421AP</example>
+    <param pos="0" name="os.vendor" value="Apple"/>
+    <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="iPhone"/>
+    <param pos="0" name="hw.product" value="iPhone 11 Pro"/>
+    <param pos="0" name="hw.device" value="Mobile Phone"/>
+  </fingerprint>
 
   <fingerprint pattern="^model=D331p?AP$">
     <description>iPhone XS Max</description>