recog 2.3.18 → 2.3.22

data/xml/operating_system.xml

@@ -386,7 +386,7 @@
 
   <fingerprint pattern="^(?i:VMWare Photon(?:\/)?(?:\s?Linux)?\s?(?:v)?(\d+?(?:\.\d+?)*?)?)$">
     <description>Photon Linux</description>
-    <example>VMWare Photon Linux</example>
+    <example>VMware Photon Linux</example>
     <example os.version="1.0">VMWare Photon 1.0</example>
     <param pos="0" name="os.vendor" value="VMware"/>
     <param pos="0" name="os.family" value="Linux"/>
@@ -397,7 +397,7 @@
 
   <!-- Vendor-based distribution catch-call -->
 
-  <fingerprint pattern="^(?i:(.*)\sLinux?\s(.*))$">
+  <fingerprint pattern="(?i)^(\S{0,256})\s{1,8}Linux\s+([\w.-]*)$">
     <description>Vendor-based Linux catch-all</description>
     <example os.vendor="Aurox" os.version="10.2">Aurox Linux 10.2</example>
     <param pos="0" name="os.family" value="Linux"/>
@@ -409,7 +409,7 @@
 
   <!-- Linux catch-all goes at the bottom-->
 
-  <fingerprint pattern="^(?i:.*Linux?\s?(\d+?(?:\.\d+?)*?)?)$">
+  <fingerprint pattern="(?i)^.{0,1000}Linux?\s?(\d+?(?:\.\d+?)*?)?$">
     <description>Linux catch-all</description>
     <example os.version="2.42.6">Linux 2.42.6</example>
     <param pos="0" name="os.vendor" value="Linux"/>
@@ -434,7 +434,7 @@
     <param pos="0" name="os.family" value="Mac OS"/>
     <param pos="0" name="os.product" value="Mac OS"/>
     <param pos="1" name="os.version"/>
-    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os:{os.version}"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:macos:{os.version}"/>
   </fingerprint>
 
   <fingerprint pattern="^(?i:(?:Apple OS X|Apple Mac OS X|Mac OS X|OS X|Mac OS)\s?(\d+?(?:\.\d+?)*?)?)$">
@@ -588,7 +588,7 @@
 
   <!-- BSD begin -->
 
-  <fingerprint pattern="^(?i:(.*?BSD)\s?(\d+?(?:\.\d+?)*?(?:[\-\/_ ]?\w+?)?(?:-[a-z]\d+?)?)?)$">
+  <fingerprint pattern="(?i)^(.{0,256}?BSD)\s?(\d+?(?:\.\d+?)*?(?:[\-\/_ ]?\w+?)?(?:-[a-z]\d+?)?)?$">
     <description>Many BSD family OSes</description>
     <example os.version="10.3-RELEASE" os.product="FreeBSD">FreeBSD 10.3-RELEASE</example>
     <example os.version="10.3-RELEASE-p4" os.product="FreeBSD">FreeBSD 10.3-RELEASE-p4</example>
@@ -605,7 +605,7 @@
 
   <!-- Other Unix-likes begin -->
 
-  <fingerprint pattern="^(?i:(?:Oracle|Sun)?\s?OpenSolaris\s?(\d+?(?:\.\d+?)*?)?)$">
+  <fingerprint pattern="(?i)^(?:Oracle|Sun)?\s?OpenSolaris\s?(\d+?(?:\.\d+?)*?)?$">
     <description>OpenSolaris</description>
     <example os.version="2009.06">OpenSolaris 2009.06</example>
     <param pos="0" name="os.vendor" value="Sun"/>

data/xml/pop_banners.xml

@@ -5,7 +5,7 @@
   matched against these patterns to fingerprint POP3 servers.
   -->
 
-  <fingerprint pattern="^([^ ]+) +Cyrus POP3 v(\d+\.\d+.*)-OS X(?: Server)? ([\d\.]+).* server ready">
+  <fingerprint pattern="^([^ ]{1,512}) +Cyrus POP3 v(\d+\.\d+.*)-OS X(?: Server)? ([\d\.]+).* server ready">
     <description>OSX Cyrus POP</description>
     <example host.domain="8.8.8.8" service.version="2.3.8" os.version="10.5">8.8.8.8 Cyrus POP3 v2.3.8-OS X Server 10.5: 9A562 server ready &lt;1999107648.1324502155@8.8.8.8&gt;</example>
     <param pos="0" name="service.vendor" value="Carnegie Mellon University"/>
@@ -20,7 +20,7 @@
     <param pos="1" name="host.domain"/>
   </fingerprint>
 
-  <fingerprint pattern="^([^ ]+) +Cyrus POP3 v([\d\.]+)">
+  <fingerprint pattern="^([^ ]{1,512}) +Cyrus POP3 v([\d\.]+)">
     <description>CMU Cyrus POP</description>
     <example host.domain="foo" service.version="2.3">foo Cyrus POP3 v2.3</example>
     <example host.domain="foo" service.version="2.3.14">foo Cyrus POP3 v2.3.14 server ready &lt;13087751828270990591.1301068892@foo&gt;</example>
@@ -31,7 +31,7 @@
     <param pos="1" name="host.domain"/>
   </fingerprint>
 
-  <fingerprint pattern="^Lotus Notes POP3 server version X[^ ]+ ready on .*$">
+  <fingerprint pattern="^Lotus Notes POP3 server version X[^ ]+ ready on">
     <description>IBM Lotus Notes/Domino</description>
     <example>Lotus Notes POP3 server version X2.0 ready on foo/bar.</example>
     <param pos="0" name="service.vendor" value="IBM"/>
@@ -40,7 +40,7 @@
     <param pos="0" name="service.cpe23" value="cpe:/a:ibm:lotus_domino:-"/>
   </fingerprint>
 
-  <fingerprint pattern="^Lotus Notes POP3 server version Release ([^ ]+) ready on .*$">
+  <fingerprint pattern="^Lotus Notes POP3 server version Release ([^ ]+) ready on">
     <description>IBM Lotus Notes/Domino - Release variant</description>
     <example service.version="8.5.1FP5">Lotus Notes POP3 server version Release 8.5.1FP5 ready on foo/US.</example>
     <param pos="0" name="service.vendor" value="IBM"/>
@@ -50,7 +50,7 @@
     <param pos="0" name="service.cpe23" value="cpe:/a:ibm:lotus_domino:{service.version}"/>
   </fingerprint>
 
-  <fingerprint pattern="^Qpopper \(version (\d+\.\d+\.\d+), modified by Sphera Technologies\) at (.+) starting\..*$">
+  <fingerprint pattern="^Qpopper \(version (\d+\.\d+\.\d+), modified by Sphera Technologies\) at (.+) starting\.">
     <description>Qpopper with Sphera mods</description>
     <example>Qpopper (version 4.0.3, modified by Sphera Technologies) at domain starting.  &lt;xxx@domain&gt;</example>
     <param pos="0" name="service.vendor" value="Sphera"/>
@@ -60,7 +60,7 @@
     <param pos="2" name="host.domain"/>
   </fingerprint>
 
-  <fingerprint pattern="^Qpopper \(version (\d+\.\d+\.\d+)-mysql-(.+)\) at (.+) starting\..*$">
+  <fingerprint pattern="^Qpopper \(version (\d+\.\d+\.\d+)-mysql-(.+)\) at (.+) starting\.">
     <description>Qpopper with MySQL auth module</description>
     <example>Qpopper (version 4.0.3-mysql-0.13) at domain starting.  &lt;xxx@domain&gt;</example>
     <param pos="0" name="service.vendor" value="Qualcomm"/>
@@ -73,7 +73,7 @@
     <param pos="3" name="host.domain"/>
   </fingerprint>
 
-  <fingerprint pattern="(?i)^Qpop(?:per)? \(version ([\d\.]+)\) at (.+)(?: starting\.)?.*$">
+  <fingerprint pattern="(?i)^Qpop(?:per)? \(version ([\d\.]+)\) at (.+)(?: starting\.)?">
     <description>Qpopper missing version info</description>
     <example>Qpopper (version 4.0.16) at foo.example.com</example>
     <example>QPOP (version 2.53) at domain starting.  &lt;xxx@domain&gt;</example>
@@ -85,7 +85,7 @@
     <param pos="2" name="host.domain"/>
   </fingerprint>
 
-  <fingerprint pattern="^QPOP \(version (.*)\) at (.+) starting\..*$">
+  <fingerprint pattern="^QPOP \(version (.*)\) at (.+) starting\.">
     <description>Qpopper with missing version info</description>
     <example>QPOP (version ?) at domain starting.  &lt;xxx@domain&gt;</example>
     <param pos="0" name="service.vendor" value="Qualcomm"/>
@@ -229,7 +229,7 @@
     <param pos="0" name="hw.product" value="Raspberry Pi"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\S+) Zimbra POP3 server ready\.?$">
+  <fingerprint pattern="^(\S{1,512}) Zimbra POP3 server ready\.?$">
     <description>VMware Zimbra POP</description>
     <example host.name="foo.bar">foo.bar Zimbra POP3 server ready</example>
     <param pos="0" name="service.vendor" value="VMware"/>
@@ -238,7 +238,7 @@
     <param pos="1" name="host.name"/>
   </fingerprint>
 
-  <fingerprint pattern="^(\S+) Zimbra (\S+) POP3 server ready\.?$">
+  <fingerprint pattern="^(\S{1,512}) Zimbra (\S+) POP3 server ready\.?$">
     <description>VMware Zimbra POP with version</description>
     <example host.name="foo.bar">foo.bar Zimbra 7.0.0_GA_3079 POP3 server ready</example>
     <param pos="0" name="service.vendor" value="VMware"/>
@@ -269,7 +269,7 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:{os.version}"/>
   </fingerprint>
 
-  <fingerprint pattern="^TCPIP POP server V\d\.\d\S-\S{3}, OpenVMS V(\d\.\d-\d)(?:\s+\S+)?\s+at\s+(\S+), .*$">
+  <fingerprint pattern="^TCPIP POP server V\d\.\d\S-\S{3}, OpenVMS V(\d\.\d-\d)(?:\s+\S+)?\s+at\s+(\S+),">
     <description>TCP/IP Services for OpenVMS POP server</description>
     <example os.version="7.3-2" host.name="example.com">TCPIP POP server V5.4J-15A, OpenVMS V7.3-2 Alpha at example.com, up since 2015-02-12 08:44:53 20400434.2</example>
     <param pos="0" name="service.family" value="OpenVMS"/>

data/xml/rsh_resp.xml

@@ -41,7 +41,7 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:ibm:aix:-"/>
   </fingerprint>
 
-  <fingerprint pattern="^.rlogind: Host name for your address \([\d.]+\) unknown\..*$" flags="REG_DOT_NEWLINE">
+  <fingerprint pattern="^.rlogind: Host name for your address \([\d.]+\) unknown\." flags="REG_DOT_NEWLINE">
     <description>A/UX rlogind</description>
     <example>xrlogind: Host name for your address (127.0.0.1) unknown.
       </example>
@@ -49,7 +49,7 @@
     <param pos="0" name="os.family" value="A/UX"/>
   </fingerprint>
 
-  <fingerprint pattern="^.rexecd: Login incorrect\..*$" flags="REG_DOT_NEWLINE">
+  <fingerprint pattern="^.rexecd: Login incorrect\." flags="REG_DOT_NEWLINE">
     <description>HP-UX rexecd</description>
     <example>xrexecd: Login incorrect.
       </example>
@@ -59,7 +59,7 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:hp:hp-ux:-"/>
   </fingerprint>
 
-  <fingerprint pattern="^.rexecd: [-\d]+.*$" flags="REG_DOT_NEWLINE">
+  <fingerprint pattern="^.rexecd: [-\d]+" flags="REG_DOT_NEWLINE">
     <description>AIX rexecd</description>
     <example>xrexecd: 0-1 The login is not correct.
       </example>

data/xml/rtsp_servers.xml

@@ -93,4 +93,11 @@
     <param pos="1" name="os.version"/>
   </fingerprint>
 
+  <fingerprint pattern="^Linux/2\.6\.35\.14_nl-xarina\+ Ze-PRO$">
+    <description>Sony Network Camera</description>
+    <example>Linux/2.6.35.14_nl-xarina+ Ze-PRO</example>
+    <param pos="0" name="hw.vendor" value="Sony"/>
+    <param pos="0" name="hw.device" value="IP Camera"/>
+  </fingerprint>
+
 </fingerprints>

data/xml/sip_banners.xml

@@ -60,10 +60,54 @@
     <param pos="2" name="hw.version"/>
   </fingerprint>
 
+  <!-- The next few Linksys fingerprints could be merged but are split to enable CPEs -->
+
+  <fingerprint pattern="^(?:[\dA-F]{1,64} )?Linksys/RT31P2-([\d.]+)\(\w+\)$">
+    <description>Linksys RT31P2</description>
+    <example os.version="3.1.9">Linksys/RT31P2-3.1.9(LId)</example>
+    <example os.version="3.1.6">Linksys/RT31P2-3.1.6(LI)</example>
+    <example os.version="3.1.6">001310E72B51 Linksys/RT31P2-3.1.6(LI)</example>
+    <param pos="0" name="os.vendor" value="Linksys"/>
+    <param pos="0" name="os.product" value="RT31P2 Firmware"/>
+    <param pos="1" name="os.version"/>
+    <param pos="0" name="os.device" value="VoIP"/>
+    <param pos="0" name="hw.vendor" value="Linksys"/>
+    <param pos="0" name="hw.product" value="RT31P2"/>
+    <param pos="0" name="hw.device" value="VoIP"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:linksys:rt31p2:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Cisco/SPA122-([\d.]+)\(\w+\)[\w-]*$">
+    <description>Cisco SPA122</description>
+    <example os.version="1.3.5">Cisco/SPA122-1.3.5(004p)</example>
+    <example os.version="1.3.5">Cisco/SPA122-1.3.5(004p)_BestGo</example>
+    <param pos="0" name="os.vendor" value="Cisco"/>
+    <param pos="0" name="os.product" value="SPA122 Firmware"/>
+    <param pos="1" name="os.version"/>
+    <param pos="0" name="os.device" value="VoIP"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:cisco:spa122_firmware:{os.version}"/>
+    <param pos="0" name="hw.vendor" value="Cisco"/>
+    <param pos="0" name="hw.product" value="SPA122"/>
+    <param pos="0" name="hw.device" value="VoIP"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:cisco:spa122:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Cisco/SPA112-([\d.SR]+)\(\w+\)[\w-]*$">
+    <description>Cisco SPA112</description>
+    <example os.version="1.4.1SR1">Cisco/SPA112-1.4.1SR1(002)d-hisec</example>
+    <param pos="0" name="os.vendor" value="Cisco"/>
+    <param pos="0" name="os.product" value="SPA112 Firmware"/>
+    <param pos="1" name="os.version"/>
+    <param pos="0" name="os.device" value="VoIP"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:cisco:spa112_firmware:{os.version}"/>
+    <param pos="0" name="hw.vendor" value="Cisco"/>
+    <param pos="0" name="hw.product" value="SPA112"/>
+    <param pos="0" name="hw.device" value="VoIP"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:cisco:spa112:-"/>
+  </fingerprint>
+
   <fingerprint pattern="(?:Cisco|Linksys)/(SPA\d+[DG]?\d?)-([\d\.a-zA-Z]+)">
     <description>Cisco/Linksys SPA VoIP Phone</description>
-    <example hw.model="SPA112" hw.version="1.4.1SR1">Cisco/SPA112-1.4.1SR1(002)d-hisec</example>
-    <example hw.model="SPA122" hw.version="1.3.3">Cisco/SPA122-1.3.3(004)</example>
     <example hw.model="SPA922" hw.version="6.1.5">PhoneSystems.net aabbccddeeff Linksys/SPA922-6.1.5(a)</example>
     <example hw.model="SPA232D" hw.version="1.4.1">Cisco/SPA232D-1.4.1(002_282)</example>
     <example hw.model="SPA504G" hw.version="7.5.2">Cisco/SPA504G-7.5.2</example>
@@ -155,6 +199,131 @@
     <param pos="1" name="hw.product"/>
   </fingerprint>
 
+  <!-- NEC -->
+
+  <fingerprint pattern="^NEC SL2100/([\d.]+)$">
+    <description>NEC SL2100 Communications Server</description>
+    <example os.version="2.1">NEC SL2100/2.1</example>
+    <param pos="0" name="os.vendor" value="NEC"/>
+    <param pos="0" name="os.product" value="SL2100 Firmware"/>
+    <param pos="1" name="os.version"/>
+    <param pos="0" name="os.device" value="SIP Gateway"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:nec:sl2100_firmware:{os.version}"/>
+    <param pos="0" name="hw.vendor" value="NEC"/>
+    <param pos="0" name="hw.family" value="SL2100"/>
+    <param pos="0" name="hw.product" value="SL2100"/>
+    <param pos="0" name="hw.device" value="SIP Gateway"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:nec:sl2100:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^NEC (Aspire [WU]X) ([\d.]+)(?:/\d\.\d)?$">
+    <description>NEC UNIVERGE Aspire WX or UX SIP Gateway</description>
+    <example hw.product="Aspire WX" os.version="02.00.00">NEC Aspire WX 02.00.00</example>
+    <example hw.product="Aspire UX" os.version="08.00.00">NEC Aspire UX 08.00.00/2.1</example>
+    <param pos="0" name="os.vendor" value="NEC"/>
+    <param pos="2" name="os.version"/>
+    <param pos="0" name="hw.vendor" value="NEC"/>
+    <param pos="0" name="hw.family" value="UNIVERGE"/>
+    <param pos="1" name="hw.product"/>
+    <param pos="0" name="hw.device" value="SIP Gateway"/>
+  </fingerprint>
+
+  <!-- The next few NEC fingerprints could be merged but are split to enable CPEs -->
+
+  <fingerprint pattern="^NEC(?:-i)? SV9100-(?:NA|GE) ([\d.]+)(?:/\d\.\d)?$">
+    <description>NEC UNIVERGE 9100 SIP Gateway</description>
+    <example os.version="08.00.65">NEC SV9100-NA 08.00.65/2.1</example>
+    <example os.version="09.00.60">NEC SV9100-GE 09.00.60/2.1</example>
+    <param pos="0" name="os.vendor" value="NEC"/>
+    <param pos="0" name="os.product" value="SV9100 Firmware"/>
+    <param pos="1" name="os.version"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:nec:sv9100_firmware:{os.version}"/>
+    <param pos="0" name="hw.vendor" value="NEC"/>
+    <param pos="0" name="hw.family" value="UNIVERGE"/>
+    <param pos="0" name="hw.product" value="SV9100"/>
+    <param pos="0" name="hw.device" value="SIP Gateway"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:nec:sv9100:-"/>
+  </fingerprint>
+
+  <fingerprint pattern="^NEC(?:-i)? SV8100-(?:NA|GE) ([\d.]+)(?:/\d\.\d)?$">
+    <description>NEC UNIVERGE 8100 SIP Gateway</description>
+    <example os.version="08.00.65">NEC SV8100-GE 08.00.65/2.1</example>
+    <example os.version="09.50">NEC-i SV8100-NA 09.50/2.1</example>
+    <example os.version="10.12">NEC SV8100-NA 10.12/2.1</example>
+    <param pos="0" name="os.vendor" value="NEC"/>
+    <param pos="0" name="os.product" value="SV8100 Firmware"/>
+    <param pos="1" name="os.version"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:nec:sv8100_firmware:{os.version}"/>
+    <param pos="0" name="hw.vendor" value="NEC"/>
+    <param pos="0" name="hw.family" value="UNIVERGE"/>
+    <param pos="0" name="hw.product" value="SV8100"/>
+    <param pos="0" name="hw.device" value="SIP Gateway"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:nec:sv8100:-"/>
+  </fingerprint>
+
+  <!-- Grandstream -->
+
+  <!-- The next few fingerprints could be merged but are split to enable CPEs -->
+
+  <fingerprint pattern="^Grandstream UCM6208V(\d\.\d\w) ([\d.]+)$">
+    <description>Grandstream UCM 6208</description>
+    <example hw.version="1.4A" os.version="1.0.16.20">Grandstream UCM6208V1.4A 1.0.16.20</example>
+    <param pos="0" name="os.vendor" value="Grandstream"/>
+    <param pos="0" name="os.product" value="UCM6208 Firmware"/>
+    <param pos="2" name="os.version"/>
+    <param pos="0" name="os.device" value="SIP Gateway"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:grandstream:ucm6208_firmware:{os.version}"/>
+    <param pos="0" name="hw.vendor" value="Grandstream"/>
+    <param pos="0" name="hw.product" value="UCM6208"/>
+    <param pos="1" name="hw.version"/>
+    <param pos="0" name="hw.device" value="SIP Gateway"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:grandstream:ucm6208:{hw.version}"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Grandstream UCM6204V(\d\.\d\w) ([\d.]+)$">
+    <description>Grandstream UCM 6204</description>
+    <example hw.version="1.4A" os.version="1.0.15.16">Grandstream UCM6204V1.4A 1.0.15.16</example>
+    <param pos="0" name="os.vendor" value="Grandstream"/>
+    <param pos="0" name="os.product" value="UCM6204 Firmware"/>
+    <param pos="2" name="os.version"/>
+    <param pos="0" name="os.device" value="SIP Gateway"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:grandstream:ucm6204_firmware:{os.version}"/>
+    <param pos="0" name="hw.vendor" value="Grandstream"/>
+    <param pos="0" name="hw.product" value="UCM6204"/>
+    <param pos="1" name="hw.version"/>
+    <param pos="0" name="hw.device" value="SIP Gateway"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:grandstream:ucm6204:{hw.version}"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Grandstream UCM6202V(\d\.\d\w) ([\d.]+)$">
+    <description>Grandstream UCM 6202</description>
+    <example hw.version="1.4A" os.version="1.0.15.16">Grandstream UCM6202V1.4A 1.0.15.16</example>
+    <param pos="0" name="os.vendor" value="Grandstream"/>
+    <param pos="0" name="os.product" value="UCM6202 Firmware"/>
+    <param pos="2" name="os.version"/>
+    <param pos="0" name="os.device" value="SIP Gateway"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:grandstream:ucm6202_firmware:{os.version}"/>
+    <param pos="0" name="hw.vendor" value="Grandstream"/>
+    <param pos="0" name="hw.product" value="UCM6202"/>
+    <param pos="1" name="hw.version"/>
+    <param pos="0" name="hw.device" value="SIP Gateway"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:grandstream:ucm6202:{hw.version}"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Grandstream (UCM6\d\d\d)V(\d\.\d\w) ([\d.]+)$">
+    <description>Grandstream UCM 6xxx series generic</description>
+    <example hw.product="UCM6102" os.version="1.0.6.10">Grandstream UCM6102V1.5A 1.0.6.10</example>
+    <example hw.product="UCM6302" hw.version="1.2B">Grandstream UCM6302V1.2B 1.0.3.10</example>
+    <example hw.product="UCM6510">Grandstream UCM6510V1.4B 1.0.14.23</example>
+    <param pos="0" name="os.vendor" value="Grandstream"/>
+    <param pos="3" name="os.version"/>
+    <param pos="0" name="os.device" value="SIP Gateway"/>
+    <param pos="0" name="hw.vendor" value="Grandstream"/>
+    <param pos="1" name="hw.product"/>
+    <param pos="2" name="hw.version"/>
+    <param pos="0" name="hw.device" value="SIP Gateway"/>
+  </fingerprint>
+
   <!-- Various -->
 
   <fingerprint pattern="EnGenius_Router$">
@@ -249,7 +418,7 @@
     <param pos="1" name="hw.product"/>
   </fingerprint>
 
-  <fingerprint pattern="^(?:Audiocodes-Sip-Gateway-)?(\S+) FX[A-Z_]+/v.(\S+)$">
+  <fingerprint pattern="^(?:Audiocodes-Sip-Gateway-)?(\S{1,64}) FX[A-Z_]+/v.(\S+)$">
     <description>Audiocodes-Sip-Gateway</description>
     <example hw.product="MP-124" os.version="6.00A.034.003">Audiocodes-Sip-Gateway-MP-124 FXS/v.6.00A.034.003</example>
     <example hw.product="MP-124" os.version="6.60A.342.003">MP-124 FXS/v.6.60A.342.003</example>
@@ -275,6 +444,18 @@
     <param pos="0" name="hw.product" value="SIP Gateway"/>
   </fingerprint>
 
+  <fingerprint pattern="^Wildix GW ([\d.~a-h]+)$">
+    <description>Wildix SIP Gateway - timestamp/build variant</description>
+    <example os.version="20201008.1~a2e84be1">Wildix GW 20201008.1~a2e84be1</example>
+    <param pos="0" name="os.vendor" value="Wildix"/>
+    <param pos="0" name="os.family" value="SIP Gateway"/>
+    <param pos="1" name="os.version"/>
+    <param pos="0" name="hw.vendor" value="Wildix"/>
+    <param pos="0" name="hw.family" value="SIP Gateway"/>
+    <param pos="0" name="hw.device" value="SIP Gateway"/>
+    <param pos="0" name="hw.product" value="SIP Gateway"/>
+  </fingerprint>
+
   <fingerprint pattern="^Wildix GW$">
     <description>Wildix SIP Gateway w/o Version</description>
     <example>Wildix GW</example>
@@ -286,6 +467,18 @@
     <param pos="0" name="hw.product" value="SIP Gateway"/>
   </fingerprint>
 
+  <fingerprint pattern="^PBX-IP Media Gateway/([\d.]+)$">
+    <description>Dialogic Media Gateway w Version</description>
+    <example os.version="2.1">PBX-IP Media Gateway/2.1</example>
+    <param pos="0" name="os.vendor" value="Dialogic"/>
+    <param pos="0" name="os.family" value="SIP Gateway"/>
+    <param pos="1" name="os.version"/>
+    <param pos="0" name="hw.vendor" value="Dialogic"/>
+    <param pos="0" name="hw.family" value="SIP Gateway"/>
+    <param pos="0" name="hw.device" value="SIP Gateway"/>
+    <param pos="0" name="hw.product" value="Media Gateway"/>
+  </fingerprint>
+
   <fingerprint pattern="^Asterisk PBX (\S+)$">
     <description>Asterisk PBX w/ Version</description>
     <example service.version="13.18.0-6.7.1.1.rl.1538157944.1c65507">Asterisk PBX 13.18.0-6.7.1.1.rl.1538157944.1c65507</example>
@@ -314,14 +507,115 @@
     <param pos="1" name="service.version"/>
   </fingerprint>
 
-  <fingerprint pattern="^kamailio \((\S+) \((.*)\)\)$">
-    <description>Kamailio SIP Server</description>
-    <example service.version="4.4.4" kamailio.platform="x86_64/linux">kamailio (4.4.4 (x86_64/linux))</example>
+  <!-- Kamailio seems to be a successor to OpenSER and perhaps OpenSIPS? -->
+
+  <fingerprint pattern="^[Kk]amailio \(([\d.]+)(?:-tls|-notls)? \(x86_64/linux\)\)$">
+    <description>Kamailio Kamailio - Linux on x86_64</description>
+    <example service.version="4.4.4">kamailio (4.4.4 (x86_64/linux))</example>
     <param pos="0" name="service.vendor" value="Kamailio"/>
-    <param pos="0" name="service.family" value="SIP Server"/>
-    <param pos="0" name="service.product" value="SIP Server"/>
+    <param pos="0" name="service.product" value="Kamailio"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:kamailio:kamailio:{service.version}"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.arch" value="x86_64"/>
+  </fingerprint>
+
+  <fingerprint pattern="^[Kk]amailio \(([\d.]+)(?:-tls|-notls)? \(i386/linux\)\)$">
+    <description>Kamailio Kamailio - Linux on x86</description>
+    <example service.version="1.5.2">Kamailio (1.5.2-notls (i386/linux))</example>
+    <param pos="0" name="service.vendor" value="Kamailio"/>
+    <param pos="0" name="service.product" value="Kamailio"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:kamailio:kamailio:{service.version}"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.arch" value="x86"/>
+  </fingerprint>
+
+  <fingerprint pattern="^OpenSIPS \(([\d.]+)(?:-tls|-notls)? \(x86_64/linux\)\)$">
+    <description>OpenSIPS OpenSIPS - Linux on x86_64</description>
+    <example service.version="1.7.2">OpenSIPS (1.7.2-notls (x86_64/linux))</example>
+    <example service.version="1.11.11">OpenSIPS (1.11.11-tls (x86_64/linux))</example>
+    <example service.version="2.2.7">OpenSIPS (2.2.7 (x86_64/linux))</example>
+    <param pos="0" name="service.vendor" value="OpenSIPS"/>
+    <param pos="0" name="service.product" value="OpenSIPS"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:opensips:opensips:{service.version}"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.arch" value="x86_64"/>
+  </fingerprint>
+
+  <fingerprint pattern="^OpenSIPS \(([\d.]+)(?:-tls|-notls)? \(i386/linux\)\)$">
+    <description>OpenSIPS OpenSIPS - Linux on x86</description>
+    <example service.version="1.8.2">OpenSIPS (1.8.2-notls (i386/linux))</example>
+    <example service.version="1.11.3">OpenSIPS (1.11.3-tls (i386/linux))</example>
+    <example service.version="2.3.3">OpenSIPS (2.3.3 (i386/linux))</example>
+    <param pos="0" name="service.vendor" value="OpenSIPS"/>
+    <param pos="0" name="service.product" value="OpenSIPS"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:opensips:opensips:{service.version}"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.arch" value="x86"/>
+  </fingerprint>
+
+  <fingerprint pattern="^OpenSIPS \(([\d.]+)(?:-tls|-notls)? \(arm(?:v4tl|v7l)?/linux\)\)$">
+    <description>OpenSIPS OpenSIPS - Linux on ARM</description>
+    <example service.version="2.2.2">OpenSIPS (2.2.2 (arm/linux))</example>
+    <example service.version="1.6.0">OpenSIPS (1.6.0-notls (armv4tl/linux))</example>
+    <example service.version="1.11.5">OpenSIPS (1.11.5-tls (armv7l/linux))</example>
+    <param pos="0" name="service.vendor" value="OpenSIPS"/>
+    <param pos="0" name="service.product" value="OpenSIPS"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:opensips:opensips:{service.version}"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.arch" value="ARM"/>
+  </fingerprint>
+
+  <fingerprint pattern="(?i)^OpenSER \(([\d.]+)(?:-tls|-notls)? \(sh4/linux\)\)$">
+    <description>OpenSER OpenSER - Linux on Renesas SH4</description>
+    <example service.version="1.3.2">OpenSER (1.3.2-notls (sh4/linux))</example>
+    <param pos="0" name="service.vendor" value="OpenSER"/>
+    <param pos="0" name="service.product" value="OpenSER"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+  </fingerprint>
+
+  <fingerprint pattern="(?i)^OpenSER \(([\d.]+)(?:-tls|-notls)? \(x86_64/linux\)\)$">
+    <description>OpenSER OpenSER - Linux on x86_64</description>
+    <example service.version="1.1.0">OpenSer (1.1.0-notls (x86_64/linux))</example>
+    <param pos="0" name="service.vendor" value="OpenSER"/>
+    <param pos="0" name="service.product" value="OpenSER"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.arch" value="x86_64"/>
+  </fingerprint>
+
+  <fingerprint pattern="(?i)^OpenSER \(([\d.]+)(?:-tls|-notls)? \(i386/linux\)\)$">
+    <description>OpenSER OpenSER - Linux on x86</description>
+    <example service.version="1.3.0">OpenSER (1.3.0-notls (i386/linux))</example>
+    <param pos="0" name="service.vendor" value="OpenSER"/>
+    <param pos="0" name="service.product" value="OpenSER"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.arch" value="x86"/>
+  </fingerprint>
+
+  <fingerprint pattern="(?i)^OpenSER \(([\d.]+)(?:-tls|-notls)? \(arm/linux\)\)$">
+    <description>OpenSER OpenSER - Linux on ARM</description>
+    <example service.version="1.3.2">OpenSER (1.3.2-tls (arm/linux))</example>
+    <param pos="0" name="service.vendor" value="OpenSER"/>
+    <param pos="0" name="service.product" value="OpenSER"/>
     <param pos="1" name="service.version"/>
-    <param pos="2" name="kamailio.platform"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux"/>
+    <param pos="0" name="os.arch" value="ARM"/>
   </fingerprint>
 
   <!-- This match covers multiple product families and should be split up further -->
@@ -351,4 +645,75 @@
     <param pos="0" name="hw.product" value="SIParator Firewall"/>
   </fingerprint>
 
+  <fingerprint pattern="^CommuniGatePro/(\d\.[\w.]+)$">
+    <description>Communigate Pro</description>
+    <example service.version="6.2.14">CommuniGatePro/6.2.14</example>
+    <example service.version="6.3c1m">CommuniGatePro/6.3c1m</example>
+    <param pos="0" name="service.vendor" value="Communigate"/>
+    <param pos="0" name="service.family" value="Pro"/>
+    <param pos="0" name="service.product" value="Communigate Pro"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:communigate:communigate_pro:{service.version}"/>
+  </fingerprint>
+
+  <fingerprint pattern="^STARFACE PBX$">
+    <description>STARFACE GmhH STARFACE PBX</description>
+    <example>STARFACE PBX</example>
+    <param pos="0" name="service.vendor" value="STARFACE GmhH"/>
+    <param pos="0" name="service.family" value="SIP Server"/>
+    <param pos="0" name="service.product" value="STARFACE PBX"/>
+  </fingerprint>
+
+  <fingerprint pattern="^FortiVoice-([\w-]+)$">
+    <description>Fortinet FortiVoice</description>
+    <example hw.product="200D">FortiVoice-200D</example>
+    <example hw.product="VM-Azure">FortiVoice-VM-Azure</example>
+    <example>FortiVoice-1000E</example>
+    <param pos="0" name="service.vendor" value="Fortinet"/>
+    <param pos="0" name="service.product" value="FortiVoice"/>
+    <param pos="0" name="service.device" value="SIP Gateway"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:fortinet:fortivoice:-"/>
+    <param pos="0" name="hw.vendor" value="Fortinet"/>
+    <param pos="0" name="hw.family" value="FortiVoice"/>
+    <param pos="1" name="hw.product"/>
+    <param pos="0" name="hw.device" value="SIP Gateway"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Freeswitch ([\d.]+)$">
+    <description>FreeSWITCH FreeSWITCH</description>
+    <example service.version="2.0.0">Freeswitch 2.0.0</example>
+    <param pos="0" name="service.vendor" value="FreeSWITCH"/>
+    <param pos="0" name="service.product" value="FreeSWITCH"/>
+    <param pos="1" name="service.version"/>
+    <param pos="0" name="service.device" value="SIP Gateway"/>
+    <param pos="0" name="service.cpe23" value="cpe:/a:freeswitch:freeswitch:{service.version}"/>
+  </fingerprint>
+
+  <fingerprint pattern="^(OpenStage|OpenScape)_(\d+)_(V\d \S+) ">
+    <description>Unify OpenStage VoIP Phone 1</description>
+    <example hw.family="OpenStage" unify.model="40" os.version="V3 R5.13.0">OpenStage_40_V3 R5.13.0      SIP  190111</example>
+    <param pos="0" name="os.vendor" value="Unify"/>
+    <param pos="0" name="os.product" value="{hw.family} {unify.model} Firmware"/>
+    <param pos="0" name="hw.vendor" value="Unify"/>
+    <param pos="0" name="hw.product" value="{hw.family} {unify.model}"/>
+    <param pos="0" name="hw.device" value="VoIP"/>
+    <param pos="1" name="hw.family"/>
+    <param pos="2" name="unify.model"/>
+    <param pos="3" name="os.version"/>
+  </fingerprint>
+
+  <fingerprint pattern="^Desk_Phone_IP_(CP\d+[EXT]?)_(V\d \S+) ">
+    <description>Unify OpenStage VoIP Phone 2</description>
+    <example unify.model="CP200" os.version="V1 R6.14.0">Desk_Phone_IP_CP200_V1 R6.14.0      SIP  190802</example>
+    <example unify.model="CP400" os.version="V1 R6.14.0">Desk_Phone_IP_CP400_V1 R6.14.0      SIP  190802</example>
+    <example unify.model="CP600" os.version="V1 R6.14.0">Desk_Phone_IP_CP600_V1 R6.14.0      SIP  190802</example>
+    <param pos="0" name="os.vendor" value="Unify"/>
+    <param pos="0" name="hw.vendor" value="Unify"/>
+    <param pos="0" name="hw.family" value="OpenScape Desk Phone"/>
+    <param pos="0" name="hw.product" value="{hw.family} {unify.model}"/>
+    <param pos="0" name="hw.device" value="VoIP"/>
+    <param pos="1" name="unify.model"/>
+    <param pos="2" name="os.version"/>
+  </fingerprint>
+
 </fingerprints>