recog 3.1.1 → 3.1.2

data/recog/xml/mdns_device-info_txt.xml

@@ -381,6 +381,7 @@
     <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"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:macbook_pro:-"/>
   </fingerprint>
 
   <fingerprint pattern="^model=MacBookPro14,1$">
@@ -394,6 +395,7 @@
     <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"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:macbook_pro:-"/>
   </fingerprint>
 
   <fingerprint pattern="^model=MacBookPro13,3$">
@@ -433,6 +435,7 @@
     <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"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:macbook_pro:-"/>
   </fingerprint>
 
   <fingerprint pattern="^model=MacBookPro12,1$">
@@ -1357,6 +1360,7 @@
     <param pos="0" name="hw.family" value="iMac"/>
     <param pos="0" name="hw.product" value="iMac (Retina 4K, 21.5-inch, 2017)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:imac:-"/>
   </fingerprint>
 
   <fingerprint pattern="^model=iMac18,1$">
@@ -1396,6 +1400,7 @@
     <param pos="0" name="hw.family" value="iMac"/>
     <param pos="0" name="hw.product" value="iMac (Retina 4K, 21.5-inch, Late 2015)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:imac:-"/>
   </fingerprint>
 
   <fingerprint pattern="^model=iMac16,1$">
@@ -2096,6 +2101,7 @@
     <param pos="0" name="hw.family" value="iPhone"/>
     <param pos="0" name="hw.product" value="iPhone 13 Pro Max"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone_13_pro_max:-"/>
   </fingerprint>
 
   <fingerprint pattern="^model=(?:D63AP|iPhone14,2)$">
@@ -2110,6 +2116,7 @@
     <param pos="0" name="hw.family" value="iPhone"/>
     <param pos="0" name="hw.product" value="iPhone 13 Pro"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone_13_pro:-"/>
   </fingerprint>
 
   <fingerprint pattern="^model=(?:D16AP|iPhone14,4)$">
@@ -2124,6 +2131,7 @@
     <param pos="0" name="hw.family" value="iPhone"/>
     <param pos="0" name="hw.product" value="iPhone 13 mini"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone_13_mini:-"/>
   </fingerprint>
 
   <fingerprint pattern="^model=(?:D17AP|iPhone14,5)$">
@@ -2138,10 +2146,11 @@
     <param pos="0" name="hw.family" value="iPhone"/>
     <param pos="0" name="hw.product" value="iPhone 13"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone_13:-"/>
   </fingerprint>
 
   <fingerprint pattern="^model=(?:D79AP|iPhone12,8)$">
-    <description>iPhone SE (2020)</description>
+    <description>iPhone SE (2nd generation)</description>
     <example>model=D79AP</example>
     <example>model=iPhone12,8</example>
     <param pos="0" name="os.vendor" value="Apple"/>
@@ -2150,12 +2159,13 @@
     <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.product" value="iPhone SE (2nd generation)"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone_se_%282nd_generation%29:-"/>
   </fingerprint>
 
   <fingerprint pattern="^model=(?:D54pAP|iPhone13,4)$">
-    <description>iPhone 12 Pro Max 5G</description>
+    <description>iPhone 12 Pro Max</description>
     <example>model=D54pAP</example>
     <example>model=iPhone13,4</example>
     <param pos="0" name="os.vendor" value="Apple"/>
@@ -2164,12 +2174,13 @@
     <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.product" value="iPhone 12 Pro Max"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone_12_pro_max:-"/>
   </fingerprint>
 
   <fingerprint pattern="^model=(?:D53pAP|iPhone13,3)$">
-    <description>iPhone 12 Pro 5G</description>
+    <description>iPhone 12 Pro</description>
     <example>model=D53pAP</example>
     <example>model=iPhone13,3</example>
     <param pos="0" name="os.vendor" value="Apple"/>
@@ -2178,12 +2189,13 @@
     <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.product" value="iPhone 12 Pro"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone_12_pro:-"/>
   </fingerprint>
 
   <fingerprint pattern="^model=(?:D53gAP|iPhone13,2)$">
-    <description>iPhone 12 5G</description>
+    <description>iPhone 12</description>
     <example>model=D53gAP</example>
     <example>model=iPhone13,2</example>
     <param pos="0" name="os.vendor" value="Apple"/>
@@ -2192,12 +2204,13 @@
     <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.product" value="iPhone 12"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone_12:-"/>
   </fingerprint>
 
   <fingerprint pattern="^model=(?:D52g?AP|Phone13,1)$">
-    <description>iPhone 12 Mini 5G</description>
+    <description>iPhone 12 Mini</description>
     <example>model=D52gAP</example>
     <example>model=D52AP</example>
     <example>model=Phone13,1</example>
@@ -2207,8 +2220,9 @@
     <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.product" value="iPhone 12 Mini"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone_12_mini:-"/>
   </fingerprint>
 
   <fingerprint pattern="^model=(?:D431p?AP|iPhone12,5)$">
@@ -2224,6 +2238,7 @@
     <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"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone_11_pro_max:-"/>
   </fingerprint>
 
   <fingerprint pattern="^model=(?:D421p?AP|iPhone12,3)$">
@@ -2239,6 +2254,7 @@
     <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"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone_11_pro:-"/>
   </fingerprint>
 
   <fingerprint pattern="^model=(?:N104AP|iPhone12,1)$">
@@ -2253,6 +2269,7 @@
     <param pos="0" name="hw.family" value="iPhone"/>
     <param pos="0" name="hw.product" value="iPhone 11"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone_11:-"/>
   </fingerprint>
 
   <fingerprint pattern="^model=(?:D331p?AP|iPhone11,[46])$">
@@ -2269,6 +2286,7 @@
     <param pos="0" name="hw.family" value="iPhone"/>
     <param pos="0" name="hw.product" value="iPhone XS Max"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone_xs_max:-"/>
   </fingerprint>
 
   <fingerprint pattern="^model=(?:D321AP|iPhone11,2)$">
@@ -2283,6 +2301,7 @@
     <param pos="0" name="hw.family" value="iPhone"/>
     <param pos="0" name="hw.product" value="iPhone XS"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone_xs:-"/>
   </fingerprint>
 
   <fingerprint pattern="^model=(?:N841AP|iPhone11,8)$">
@@ -2297,6 +2316,7 @@
     <param pos="0" name="hw.family" value="iPhone"/>
     <param pos="0" name="hw.product" value="iPhone XR"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone_xr:-"/>
   </fingerprint>
 
   <fingerprint pattern="^model=(?:D221?AP|iPhone10,[36])$">
@@ -2313,6 +2333,7 @@
     <param pos="0" name="hw.family" value="iPhone"/>
     <param pos="0" name="hw.product" value="iPhone X"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone_x:-"/>
   </fingerprint>
 
   <fingerprint pattern="^model=(?:D211?A?AP|iPhone10,[25])$">
@@ -2331,6 +2352,7 @@
     <param pos="0" name="hw.family" value="iPhone"/>
     <param pos="0" name="hw.product" value="iPhone 8 Plus"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone_8_plus:-"/>
   </fingerprint>
 
   <fingerprint pattern="^model=(?:D201?A?AP|iPhone10,[14])$">
@@ -2349,6 +2371,7 @@
     <param pos="0" name="hw.family" value="iPhone"/>
     <param pos="0" name="hw.product" value="iPhone 8"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone_8:-"/>
   </fingerprint>
 
   <fingerprint pattern="^model=(?:D111?AP|iPhone9,[24])$">
@@ -2365,6 +2388,7 @@
     <param pos="0" name="hw.family" value="iPhone"/>
     <param pos="0" name="hw.product" value="iPhone 7 Plus"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone_7_plus:-"/>
   </fingerprint>
 
   <fingerprint pattern="^model=(?:D101?AP$|iPhone9,3)">
@@ -2380,10 +2404,11 @@
     <param pos="0" name="hw.family" value="iPhone"/>
     <param pos="0" name="hw.product" value="iPhone 7"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone_7:-"/>
   </fingerprint>
 
   <fingerprint pattern="^model=N69u?AP$">
-    <description>iPhone SE</description>
+    <description>iPhone SE (1st generation)</description>
     <example>model=N69AP</example>
     <example>model=N69uAP</example>
     <param pos="0" name="os.vendor" value="Apple"/>
@@ -2392,8 +2417,9 @@
     <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"/>
+    <param pos="0" name="hw.product" value="iPhone SE (1st generation)"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone_se_%281st_generation%29:-"/>
   </fingerprint>
 
   <fingerprint pattern="^model=N66m?AP$">
@@ -2408,6 +2434,7 @@
     <param pos="0" name="hw.family" value="iPhone"/>
     <param pos="0" name="hw.product" value="iPhone 6s Plus"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone_6s_plus:-"/>
   </fingerprint>
 
   <fingerprint pattern="^model=N71m?AP$">
@@ -2422,6 +2449,7 @@
     <param pos="0" name="hw.family" value="iPhone"/>
     <param pos="0" name="hw.product" value="iPhone 6s"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone_6s:-"/>
   </fingerprint>
 
   <fingerprint pattern="^model=N56AP$">
@@ -2435,6 +2463,7 @@
     <param pos="0" name="hw.family" value="iPhone"/>
     <param pos="0" name="hw.product" value="iPhone 6 Plus"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone_6_plus:-"/>
   </fingerprint>
 
   <fingerprint pattern="^model=N61AP$">
@@ -2448,6 +2477,7 @@
     <param pos="0" name="hw.family" value="iPhone"/>
     <param pos="0" name="hw.product" value="iPhone 6"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone_6:-"/>
   </fingerprint>
 
   <fingerprint pattern="^model=N5[13]AP$">
@@ -2462,6 +2492,7 @@
     <param pos="0" name="hw.family" value="iPhone"/>
     <param pos="0" name="hw.product" value="iPhone 5s"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone_5s:-"/>
   </fingerprint>
 
   <fingerprint pattern="^model=N4[89]AP$">
@@ -2476,6 +2507,7 @@
     <param pos="0" name="hw.family" value="iPhone"/>
     <param pos="0" name="hw.product" value="iPhone 5c"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone_5c:-"/>
   </fingerprint>
 
   <fingerprint pattern="^model=N4[12]AP$">
@@ -2520,6 +2552,7 @@
     <param pos="0" name="hw.family" value="iPhone"/>
     <param pos="0" name="hw.product" value="iPhone 4"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone_4:-"/>
   </fingerprint>
 
   <fingerprint pattern="^model=N88AP$">
@@ -2547,10 +2580,11 @@
     <param pos="0" name="hw.family" value="iPhone"/>
     <param pos="0" name="hw.product" value="iPhone 3G"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone_3g:-"/>
   </fingerprint>
 
   <fingerprint pattern="^model=M68AP$">
-    <description>iPhone</description>
+    <description>iPhone (1st generation)</description>
     <example>model=M68AP</example>
     <param pos="0" name="os.vendor" value="Apple"/>
     <param pos="0" name="os.family" value="iOS"/>
@@ -2558,9 +2592,9 @@
     <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"/>
+    <param pos="0" name="hw.product" value="iPhone (1st generation)"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
-    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone:-"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone_%281st_generation%29:-"/>
   </fingerprint>
 
   <!-- iPod -->

data/recog/xml/sip_banners.xml

@@ -12,7 +12,6 @@
     <param pos="0" name="service.vendor" value="Cisco"/>
     <param pos="0" name="service.family" value="IOS"/>
     <param pos="0" name="service.product" value="IOS"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:cisco:ios:-"/>
     <param pos="0" name="os.vendor" value="Cisco"/>
     <param pos="0" name="os.family" value="IOS"/>
     <param pos="0" name="os.product" value="IOS"/>
@@ -34,7 +33,6 @@
     <param pos="0" name="service.vendor" value="Cisco"/>
     <param pos="0" name="service.family" value="IOS"/>
     <param pos="0" name="service.product" value="IOS"/>
-    <param pos="0" name="service.cpe23" value="cpe:/a:cisco:ios:-"/>
     <param pos="0" name="os.vendor" value="Cisco"/>
     <param pos="0" name="os.family" value="IOS"/>
     <param pos="0" name="os.product" value="IOS"/>

data/recog/xml/sip_user_agents.xml

@@ -165,7 +165,7 @@
     <example>FRITZ!OS</example>
     <param pos="0" name="os.vendor" value="AVM"/>
     <param pos="0" name="os.product" value="FRITZ!OS"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:avm:fritz\!os:-"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:avm:fritz%21os:-"/>
     <param pos="0" name="hw.vendor" value="AVM"/>
   </fingerprint>
 

data/recog/xml/snmp_sysdescr.xml

@@ -1610,7 +1610,6 @@
     <param pos="0" name="os.product" value="Adaptive Security Appliance"/>
     <param pos="0" name="os.device" value="Firewall"/>
     <param pos="1" name="os.version"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:cisco:adaptive_security_appliance_software:{os.version}"/>
     <param pos="0" name="hw.vendor" value="Cisco"/>
     <param pos="0" name="hw.family" value="Adaptive Security Appliance"/>
     <param pos="0" name="hw.product" value="Adaptive Security Appliance"/>
@@ -3466,7 +3465,7 @@ Copyright (c) 1995-2005 by Cisco Systems
     <param pos="0" name="os.vendor" value="IBM"/>
     <param pos="0" name="os.family" value="z/OS"/>
     <param pos="0" name="os.product" value="z/OS"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:ibm:z\/os:-"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:ibm:z%2fos:-"/>
   </fingerprint>
 
   <fingerprint pattern="^BladeCenter Management Module$">

data/recog/xml/ssh_banners.xml

@@ -1876,6 +1876,14 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
   </fingerprint>
 
+  <fingerprint pattern="^MOVEit Transfer SFTP$">
+    <description>Progress MOVEit Transfer (formerly MOVEit DMZ, MOVEit File Transfer)</description>
+    <example>MOVEit Transfer SFTP</example>
+    <param pos="0" name="service.vendor" value="Progress"/>
+    <param pos="0" name="service.product" value="MOVEit Transfer"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:progress:moveit_transfer:-"/>
+  </fingerprint>
+
   <fingerprint pattern="^paramiko_([\d\.]+)">
     <description>Paramiko</description>
     <example service.version="2.1.3">paramiko_2.1.3 501 command not implemented ERROR</example>

data/recog/xml/telnet_banners.xml

@@ -1068,8 +1068,8 @@
     <param pos="0" name="os.vendor" value="Moxa"/>
     <param pos="0" name="os.family" value="EDR"/>
     <param pos="0" name="os.device" value="Router"/>
-    <param pos="0" name="os.product" value="EDR G903 Firmware"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:moxa:edr_g903_firmware:-"/>
+    <param pos="0" name="os.product" value="EDR-G903 Firmware"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:moxa:edr-g903_firmware:-"/>
   </fingerprint>
 
   <fingerprint pattern="^EDR-G902 login:">
@@ -1097,6 +1097,7 @@
     <param pos="0" name="os.family" 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:redhat:linux:{os.version}"/>
   </fingerprint>
 
   <fingerprint pattern="(?m)^Red Hat Enterprise Linux ES release (.*) \(.*\).*Kernel (.*) on a[^ ]* ([^ ]*\d)" flags="REG_MULTILINE">

data/recog/xml/tls_jarm.xml

@@ -92,7 +92,7 @@
     <example>06d06d07d06d06d06c06d06d06d06d7991b0b1ad2cbf06082e3b1a9dcaaa8d</example>
     <param pos="0" name="hw.vendor" value="D-Link"/>
     <param pos="0" name="hw.product" value="DCS-825L"/>
-    <param pos="0" name="hw.cpe23" value="cpe:/h:d-link:dcs-825l:-"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:dlink:dcs-825l:-"/>
   </fingerprint>
 
   <fingerprint pattern="^0ed3dd16d25d00000042d43d000000e9435856b7ee99e87c06831602602f2d$">

data/recog/xml/x11_banners.xml

@@ -183,6 +183,7 @@
     <param pos="0" name="service.product" value="SCO X server"/>
     <param pos="0" name="os.product" value="SCO UNIX"/>
     <param pos="0" name="os.family" value="SCO UNIX"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:sco:sco_unix:-"/>
   </fingerprint>
 
   <fingerprint pattern="^StarNet Communications Corp\.$">

data/recog/xml/x509_issuers.xml

@@ -216,7 +216,6 @@
     <param pos="0" name="os.vendor" value="Cisco"/>
     <param pos="0" name="os.family" value="Adaptive Security Appliance"/>
     <param pos="0" name="os.product" value="Adaptive Security Appliance"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:cisco:adaptive_security_appliance_software:-"/>
     <param pos="0" name="hw.vendor" value="Cisco"/>
     <param pos="0" name="hw.family" value="Adaptive Security Appliance"/>
     <param pos="0" name="hw.product" value="Adaptive Security Appliance"/>
@@ -383,6 +382,7 @@
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="FreshTomato"/>
     <param pos="0" name="os.device" value="Router"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:freshtomato:freshtomato:-"/>
   </fingerprint>
 
   <fingerprint pattern="(?i)^SERIALNUMBER=(\d+),CN=(\S+),OU=ST-VS,O=Bosch Sicherheitssysteme GmbH,L=Grasbrunn,C=DE">

data/recog/xml/x509_subjects.xml

@@ -398,7 +398,6 @@
     <param pos="0" name="os.vendor" value="Cisco"/>
     <param pos="0" name="os.family" value="Adaptive Security Appliance"/>
     <param pos="0" name="os.product" value="Adaptive Security Appliance"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:cisco:adaptive_security_appliance_software:-"/>
     <param pos="0" name="hw.vendor" value="Cisco"/>
     <param pos="0" name="hw.family" value="Adaptive Security Appliance"/>
     <param pos="0" name="hw.product" value="Adaptive Security Appliance"/>

data/recog.gemspec

@@ -1,33 +1,34 @@
-# -*- encoding: utf-8 -*-
-$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
 require 'recog/version'
 
 Gem::Specification.new do |s|
   s.name        = 'recog'
   s.version     = Recog::VERSION
-  s.required_ruby_version = '>= 2.1'
-  s.authors     = [
-      'Rapid7 Research'
+  s.required_ruby_version = '>= 2.5'
+  s.authors = [
+    'Rapid7 Research'
   ]
-  s.email       = [
-      'research@rapid7.com'
+  s.email = [
+    'research@rapid7.com'
   ]
-  s.homepage    = "https://www.github.com/rapid7/recog-ruby"
-  s.summary     = %q{Network service fingerprint database, classes, and utilities}
-  s.description = %q{
+  s.homepage    = 'https://www.github.com/rapid7/recog-ruby'
+  s.summary     = 'Network service fingerprint database, classes, and utilities'
+  s.description = '
     Recog is a framework for identifying products, services, operating systems, and hardware by matching
     fingerprints against data returned from various network probes. Recog makes it simply to extract useful
     information from web server banners, snmp system description fields, and a whole lot more.
-  }.gsub(/\s+/, ' ').strip
+  '.gsub(/\s+/, ' ').strip
 
   s.bindir        = 'recog/bin'
-  s.files         = %w(Gemfile Rakefile COPYING LICENSE README.md recog.gemspec .yardopts) +
+  s.files         = %w[Gemfile Rakefile COPYING LICENSE README.md recog.gemspec .yardopts] +
                     Dir.glob('lib/**/*.rb') +
                     Dir.glob('spec/**/*') +
                     Dir.glob('recog/xml/*') +
                     Dir.glob('recog/bin/recog_match')
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
-  s.executables   = s.files.grep(%r{^recog/bin/}).map{ |f| File.basename(f) }
+  s.executables   = s.files.grep(%r{^recog/bin/}).map { |f| File.basename(f) }
   s.require_paths = ['lib']
 
   # ---- Dependencies ----