recog 2.3.3 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3156a27b14a7ca5bedb824bb3ea9077cde3b2144c3627e02fa346ea0ee69fa0c
-  data.tar.gz: af693b3ff10691b7817096b9c79594815be02fb9a0018f207846896eed0786c2
+  metadata.gz: 8ec1557107119745147470bb27d8ba47d2f402beae96ca50eb068cf5b8d8b485
+  data.tar.gz: 551710099cf2b26e8f748e08fdb8fb5069556e66fb3d8d7644c15de7b20bbb78
 SHA512:
-  metadata.gz: d2c7faf0fe86fbc4d0ed51a1743b4d2872047937a4d76df6b47ab78d622be673cda1501c441d9c0fc49ad197d9f9bbd4b10a3224c3d8fc1ee52fe2d3a8bd5078
-  data.tar.gz: 5300fad8c8d9a238d4dbdf6c70c2ab206a2a0b741a4ffbd6d6c34891701f2ee6491cf9613e2859ddb8923bd384b92daf1f76229a8e02a7b8667adad161803652
+  metadata.gz: 724902965e5c54a700e4275a407dbd47b591de78c15ba34190fb619415c24cb8c45725d07033682cac3bd88bec78f5693a3c3815f5243b09595c6b0dcb7916fe
+  data.tar.gz: b13d3a97755a2a08562538c424344bf2cfcf5d4093f01ca544556a6fb596c8ee6a697d11170ec15f0da2f638915cf6923eaa180706445cf4789fa772ee6a2bec

data/lib/recog/version.rb

@@ -1,3 +1,3 @@
 module Recog
-  VERSION = '2.3.3'
+  VERSION = '2.3.4'
 end

data/xml/ftp_banners.xml

@@ -682,11 +682,12 @@ more text</example>
     <param pos="0" name="hw.device" value="Printer"/>
     <param pos="1" name="hw.product"/>
   </fingerprint>
-  <fingerprint pattern="^(?:Tornado-)?VxWorks \((?:VxWorks)?([^\)]+)\) FTP server(?: ready)?$" flags="REG_ICASE">
+  <fingerprint pattern="^(?:Tornado-)?VxWorks \((?:VxWorks)?([^\)]+)\) FTP server(?: ready)?\.?$" flags="REG_ICASE">
     <description>VxWorks with version information</description>
     <example os.version="5.3.1">VxWorks (5.3.1) FTP server ready</example>
     <example os.version="5.5.1">VxWorks (VxWorks5.5.1) FTP server ready</example>
     <example os.version="5.5.1">Tornado-vxWorks (VxWorks5.5.1) FTP server</example>
+    <example os.version="5.4.2">VxWorks (5.4.2) FTP server ready.</example>
     <param pos="0" name="os.vendor" value="Wind River"/>
     <param pos="0" name="os.product" value="VxWorks"/>
     <param pos="1" name="os.version"/>
@@ -699,6 +700,32 @@ more text</example>
     <param pos="0" name="os.product" value="VxWorks"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:windriver:vxworks:-"/>
   </fingerprint>
+  <fingerprint pattern="^[\w\-\.]* FTP server \((?:VxWorks\s?)+([\d\.]+)\) ready.$" flags="REG_ICASE">
+    <description>VxWorks 6 with version information</description>
+    <example os.version="6.6">NanoDAC FTP server (VxWorks VxWorks 6.6) ready.</example>
+    <example os.version="6.4">BVS-MR-BSC2 FTP server (VxWorks 6.4) ready.</example>
+    <param pos="0" name="os.vendor" value="Wind River"/>
+    <param pos="0" name="os.product" value="VxWorks"/>
+    <param pos="1" name="os.version"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:windriver:vxworks:-{os.version}"/>
+  </fingerprint>
+  <fingerprint pattern="^[\w&lt;&gt;]+\s*Tenor Multipath Switch FTP server \(Version VxWorks([\d\.]+)\) ready\.$" flags="REG_ICASE">
+    <description>VxWorks on Tenor MultiPath with version information</description>
+    <example os.version="5.4.2"><![CDATA[<38785ca0>  Tenor Multipath Switch FTP server (Version VxWorks5.4.2) ready.]]></example>
+    <param pos="0" name="os.vendor" value="Wind River"/>
+    <param pos="0" name="os.product" value="VxWorks"/>
+    <param pos="1" name="os.version"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:windriver:vxworks:-{os.version}"/>
+  </fingerprint>
+  <fingerprint pattern="^VxWorks FTP server \(VxWorks ([\d\.]+) - Secure NetLinx version \([\d\.]+\)\) ready.$">
+    <description>VxWorks with Secure NetLinx</description>
+    <example os.version="5.3.1">VxWorks FTP server (VxWorks 5.3.1 - Secure NetLinx version (1.0)) ready.</example>
+    <param pos="0" name="os.vendor" value="Wind River"/>
+    <param pos="0" name="os.product" value="VxWorks"/>
+    <param pos="1" name="os.version"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:windriver:vxworks:-{os.version}"/>
+  </fingerprint>
+
   <fingerprint pattern="^ADC iScale$">
     <description>ADC iScale</description>
     <example>ADC iScale</example>

data/xml/snmp_sysdescr.xml

@@ -5452,16 +5452,18 @@ Copyright (c) 1995-2005 by Cisco Systems
   <!--======================================================================
                               SonicWall
    =======================================================================-->
-  <fingerprint pattern="^SonicWALL (.*?)\s+\(SonicOS \S+ (\d[^\)]+)\)\s*$">
+  <fingerprint pattern="^SonicWALL (\S+)\s*(\d+).*?\(SonicOS \S+ (\d[^\)]+)\)\s*$">
     <description>SonicWall - SonicOS Enhanced variant</description>
-    <example>SonicWALL NSA 220 (SonicOS Enhanced 5.8.1.2-20o)</example>
-    <example>SonicWALL TZ 215 wireless-N (SonicOS Enhanced 5.8.1.2-6o)</example>
+    <example hw.product="NSA" hw.model="220" os.version="5.8.1.2-20o">SonicWALL NSA 220 (SonicOS Enhanced 5.8.1.2-20o)</example>
+    <example hw.product="TZ" hw.model="215" os.version="5.8.1.2-6o">SonicWALL TZ 215 wireless-N (SonicOS Enhanced 5.8.1.2-6o)</example>
     <example>SonicWALL TZ190 Enhanced (SonicOS Enhanced 3.6.0.4-30e)</example>
+    <example hw.product="SuperMassive" hw.model="9200" os.version="6.2.5.3-35n">SonicWALL SuperMassive 9200 (SonicOS Enhanced 6.2.5.3-35n)</example>
     <param pos="0" name="os.vendor" value="SonicWall"/>
     <param pos="0" name="os.device" value="Firewall"/>
-    <param pos="0" name="os.family" value="SonicOS"/>
-    <param pos="1" name="os.product"/>
-    <param pos="2" name="os.version"/>
+    <param pos="0" name="os.product" value="SonicOS"/>
+    <param pos="1" name="hw.product"/>
+    <param pos="2" name="hw.model"/>
+    <param pos="3" name="os.version"/>
   </fingerprint>
   <fingerprint pattern="^SonicWALL (.*?)\s+\(([^\)]+)\)\s*$">
     <description>SonicWall</description>
@@ -5475,7 +5477,7 @@ Copyright (c) 1995-2005 by Cisco Systems
     <example>SonicWALL I80X86 / 800 Mhz (PRO 2040 Standa)</example>
     <param pos="0" name="os.vendor" value="SonicWall"/>
     <param pos="0" name="os.device" value="Firewall"/>
-    <param pos="0" name="os.family" value="SonicOS"/>
+    <param pos="0" name="os.product" value="SonicOS"/>
     <param pos="1" name="hw.product"/>
     <param pos="2" name="os.product"/>
   </fingerprint>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recog
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.3.4
 platform: ruby
 authors:
 - Rapid7 Research
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-23 00:00:00.000000000 Z
+date: 2019-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec