recog 1.0.14 → 1.0.15

Sign up to get free protection for your applications and to get access to all the features.
Files changed (16) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +1 -0
  3. data/Gemfile +1 -0
  4. data/lib/recog/fingerprint.rb +0 -20
  5. data/lib/recog/matcher.rb +5 -18
  6. data/lib/recog/version.rb +1 -1
  7. data/spec/lib/fingerprint_self_test_spec.rb +26 -1
  8. data/xml/h323_callresp.xml +6 -6
  9. data/xml/http_cookies.xml +1 -1
  10. data/xml/pop_banners.xml +15 -14
  11. data/xml/smb_native_os.xml +12 -12
  12. data/xml/smtp_banners.xml +37 -49
  13. data/xml/snmp_sysdescr.xml +118 -157
  14. data/xml/ssh_banners.xml +5 -4
  15. data/xml/upnp_banners.xml +1 -1
  16. metadata +2 -2
data/xml/snmp_sysdescr.xml CHANGED
@@ -188,15 +188,15 @@
188
188
  <param pos="1" name="os.product"/>
189
189
  </fingerprint>
190
190
 
191
- <fingerprint pattern="^3Com (11 Mbps|11a/b/g) (Wireless .*)$">
191
+ <fingerprint pattern="^3Com (?:11 Mbps|11a/b/g) (Wireless .*)$">
192
192
  <description>3COM WAP</description>
193
- <example>3Com 11 Mbps Wireless Building to Building Bridge</example>
194
- <example>3Com 11 Mbps Wireless LAN Access Point 2000</example>
195
- <example>3Com 11 Mbps Wireless LAN Access Point 8000</example>
196
- <example>3Com 11a/b/g Wireless Workgroup Bridge</example>
193
+ <example os.product="Wireless Building to Building Bridge">3Com 11 Mbps Wireless Building to Building Bridge</example>
194
+ <example os.product="Wireless LAN Access Point 2000">3Com 11 Mbps Wireless LAN Access Point 2000</example>
195
+ <example os.product="Wireless LAN Access Point 8000">3Com 11 Mbps Wireless LAN Access Point 8000</example>
196
+ <example os.product="Wireless Workgroup Bridge">3Com 11a/b/g Wireless Workgroup Bridge</example>
197
197
  <param pos="0" name="os.vendor" value="3Com"/>
198
198
  <param pos="0" name="os.device" value="WAP"/>
199
- <param pos="2" name="os.product"/>
199
+ <param pos="1" name="os.product"/>
200
200
  </fingerprint>
201
201
 
202
202
  <fingerprint pattern="^3Com 3Com (?:SuperStack 4 )?Switch (\S+).*Software Version 3Com OS V(\S+)$">
@@ -672,7 +672,7 @@
672
672
  <param pos="2" name="os.product"/>
673
673
  </fingerprint>
674
674
 
675
- <fingerprint pattern="^APC (Environmental (Management System|Manager|Monitoring Unit)|InfraStruXure Manager|.* Rack PDU|NetBotz Rack Access|Web/SNMP Management Card ).*AF1:\s*v?(\S+).*MN:\s*(\S+).*$">
675
+ <fingerprint pattern="^APC (?:Environmental (?:Management System|Manager|Monitoring Unit)|InfraStruXure Manager|.* Rack PDU|NetBotz Rack Access|Web/SNMP Management Card).*AF1:\s*v?(\S+).*MN:\s*(\S+).*$">
676
676
  <description>APC UPS</description>
677
677
  <example>APC Environmental Management System (MB:v3.6.9 PF:v2.6.4 PN:apc_hw02_aos_264.bin AF1:v2.6.7 AN1:apc_hw02_ems_267.bin MN:AP9320 HR:4 SN: ZA0747015277 MD:11/25/2007)</example>
678
678
  <example>APC Environmental Manager (MB:v3.8.0 PF:v3.0.3 PN:apc_hw03_aos_303.bin AF1:v3.0.4 AN1:apc_hw03_mem_304.bin MN:AP9340 HR:05 SN: ZA0739002849 MD:09/25/2007)</example>
@@ -688,8 +688,8 @@
688
688
  <example>APC Web/SNMP Management Card (MB:v3.2.0 PF:v3.0.9.a PN:aos309a.bin AF1:v2.2.5.a AN1:ms225a.bin MN: AP9606 HR: J9 SN: WA0121006888 MD: 12/20/2002)</example>
689
689
  <param pos="0" name="os.vendor" value="APC"/>
690
690
  <param pos="0" name="os.device" value="UPS"/>
691
- <param pos="3" name="os.version"/>
692
- <param pos="4" name="os.product"/>
691
+ <param pos="1" name="os.version"/>
692
+ <param pos="2" name="os.product"/>
693
693
  </fingerprint>
694
694
 
695
695
  <!--
@@ -805,20 +805,15 @@
805
805
  <param pos="2" name="os.version"/>
806
806
  </fingerprint>
807
807
 
808
- <fingerprint pattern="^Avaya (Inc.\s*\-\s*)?([^,]+),.*SW version (\S+).*$">
808
+ <fingerprint pattern="^Avaya (?:Inc\.\s*\-\s*)?([^,]+?)[\s,]*SW version (\S+).*$">
809
809
  <description>Avaya Switch</description>
810
- <example>Avaya Inc. - C360 , SW version 4.3.12 , CS 1.1</example>
811
- <example>Avaya Inc. - C360 , SW version 4.5.14 , CS 1.2</example>
812
- <example>Avaya Inc. - P330 Stackable Switch, SW version 3.12.0</example>
813
- <example>Avaya Inc. - P330 Stackable Switch, SW version 3.12.1</example>
814
- <example>Avaya Inc. - P333R , SW version 3.9.1 , CS 2.4</example>
815
- <example>Avaya Inc.- C360 Stackable Switch, SW version 4.5.14</example>
816
- <example>Avaya Inc.- P330 Stackable Switch, SW version 4.5.8</example>
817
- <example>Avaya P130 workgroup switch, SW version 2.9.2</example>
810
+ <example os.product="C360" os.version="4.3.12">Avaya Inc. - C360 , SW version 4.3.12 , CS 1.1</example>
811
+ <example os.product="C360 Stackable Switch" os.version="4.5.14">Avaya Inc.- C360 Stackable Switch, SW version 4.5.14</example>
812
+ <example os.product="P130 workgroup switch" os.version="2.9.2">Avaya P130 workgroup switch, SW version 2.9.2</example>
818
813
  <param pos="0" name="os.vendor" value="Avaya"/>
819
814
  <param pos="0" name="os.device" value="Switch"/>
820
- <param pos="2" name="os.product"/>
821
- <param pos="3" name="os.version"/>
815
+ <param pos="1" name="os.product"/>
816
+ <param pos="2" name="os.version"/>
822
817
  </fingerprint>
823
818
 
824
819
  <fingerprint pattern="^Avaya Inc\., (.* Media Gateway), SW Version (\S+).*$">
@@ -972,28 +967,25 @@
972
967
  <param pos="1" name="os.product"/>
973
968
  <param pos="2" name="os.version"/>
974
969
  </fingerprint>
970
+
975
971
  <!--======================================================================
976
972
  AXIS
977
973
  =======================================================================-->
978
974
 
979
- <fingerprint pattern="^AXIS (.*server)\s*.*?(v|Version:\s*)(\S+).*$" flags="REG_ICASE">
975
+ <fingerprint pattern="^AXIS (.*server).*(?:v|Version:\s*)([\d\.]+)" flags="REG_ICASE">
980
976
  <description>AXIS Network Print Server</description>
981
- <example>AXIS 5470e Network Print Server V6.21 Dec 5 2000</example>
982
- <example>AXIS 70U Network Document Server,Version: 1.08</example>
983
- <example>AXIS 540/542 Print Server V5.43 Feb 2 1998</example>
984
- <example>AXIS 540/542 Print Server V5.48 Dec 14 1998</example>
985
- <example>AXIS 560Print serverV5.36 Jul 7 1997</example>
986
- <example>AXIS OfficeBasic Parallel Network Print Server V6.43 Sep 4 2003</example>
987
- <example>AXIS OfficeBasic Parallel Network Print Server V7.06 Nov 3 2005</example>
988
- <example>AXIS OfficeBasic USB Network Print Server V6.43 Sep 4 2003</example>
989
- <example>AXIS OfficeBasic USB Network Print Server V7.03 Feb 14 2005</example>
990
- <example>AXIS PrintPoint 560/100 Print server V5.39 Dec 12 1997</example>
991
- <example>Axis NPS 550R Printer Server V4.11 Mar 1 1994</example>
992
- <example>Axis NPS 550RPrint serverV5.22 Oct 07 1996</example>
977
+ <example os.product="5470e Network Print Server" os.version="6.21">AXIS 5470e Network Print Server V6.21 Dec 5 2000</example>
978
+ <example os.product="70U Network Document Server" os.version="1.08">AXIS 70U Network Document Server,Version: 1.08</example>
979
+ <example os.product="540/542 Print Server" os.version="5.43">AXIS 540/542 Print Server V5.43 Feb 2 1998</example>
980
+ <example os.product="560Print server" os.version="5.36">AXIS 560Print serverV5.36 Jul 7 1997</example>
981
+ <example os.product="OfficeBasic USB Network Print Server" os.version="7.03">AXIS OfficeBasic USB Network Print Server V7.03 Feb 14 2005</example>
982
+ <example os.product="PrintPoint 560/100 Print server" os.version="5.39">AXIS PrintPoint 560/100 Print server V5.39 Dec 12 1997</example>
983
+ <example os.product="NPS 550R Printer Server" os.version="4.11">Axis NPS 550R Printer Server V4.11 Mar 1 1994</example>
984
+ <example os.product="NPS 550RPrint server" os.version="5.22">Axis NPS 550RPrint serverV5.22 Oct 07 1996</example>
993
985
  <param pos="0" name="os.vendor" value="Axis"/>
994
986
  <param pos="0" name="os.device" value="Print Server"/>
995
987
  <param pos="1" name="os.product"/>
996
- <param pos="3" name="os.version"/>
988
+ <param pos="2" name="os.version"/>
997
989
  </fingerprint>
998
990
 
999
991
 
@@ -1001,33 +993,27 @@
1001
993
  BLUE COAT
1002
994
  =======================================================================-->
1003
995
 
1004
- <fingerprint pattern="^Blue Coat (SG\S+)( Series)?,.*\s+SGOS ([^,]+), Release id:\s*(\S+).*$">
996
+ <fingerprint pattern="^Blue Coat (SG\S+)(?: Series)?,.*\s+SGOS ([^,]+), Release id:\s*(\S+).*$">
1005
997
  <description>Blue Coat Proxy SG</description>
1006
- <example>Blue Coat SG400 Series, Version: SGOS 5.2.4.8, Release id: 35838 Proxy Edition</example>
1007
- <example>Blue Coat SG200 Series, ProxySG Version: SGOS 4.3.2.3, Release id: 37535</example>
1008
- <example>Blue Coat SG400, ProxySG Version: SGOS 4.1.1.1, Release id: 22695</example>
1009
- <example>Blue Coat SG510 Series, ProxySG Version: SGOS 4.2.3.12, Release id: 28131</example>
1010
- <example>Blue Coat SG6000 Series, ProxySG Version: SGOS 3.2.4.8, Release id: 22001</example>
1011
- <example>Blue Coat SG800 Series, ProxySG Version: SGOS 4.3.3.1, Release id: 39753</example>
1012
- <example>Blue Coat SG800 Series, Security-Gateway Version: SGOS 2.1.6044, Release id: 19480 Service Pack 4</example>
1013
- <example>Blue Coat SG810 Series, ProxySG Version: SGOS 4.3.3.1, Release id: 39753</example>
1014
- <example>Blue Coat SG8100 Series, ProxySG Version: SGOS 4.3.3.16, Release id: 50237</example>
1015
- <example>Blue Coat SG8100 Series, ProxySG Version: SGOS 4.3.4.1, Release id: 52168</example>
998
+ <example os.product="SG400" os.version="5.2.4.8" os.version.version="35838">Blue Coat SG400 Series, Version: SGOS 5.2.4.8, Release id: 35838 Proxy Edition</example>
999
+ <example os.product="SG800" os.version="2.1.6044" os.version.version="19480">Blue Coat SG800 Series, Security-Gateway Version: SGOS 2.1.6044, Release id: 19480 Service Pack 4</example>
1000
+ <example os.product="SG400" os.version="4.1.1.1" os.version.version="22695">Blue Coat SG400, ProxySG Version: SGOS 4.1.1.1, Release id: 22695</example>
1001
+ <example os.product="SG8100" os.version="4.3.4.1" os.version.version="52168">Blue Coat SG8100 Series, ProxySG Version: SGOS 4.3.4.1, Release id: 52168</example>
1016
1002
  <param pos="0" name="os.vendor" value="Blue Coat"/>
1017
1003
  <param pos="0" name="os.device" value="Web proxy"/>
1018
1004
  <param pos="1" name="os.product"/>
1019
- <param pos="3" name="os.version"/>
1020
- <param pos="4" name="os.version.version"/>
1005
+ <param pos="2" name="os.version"/>
1006
+ <param pos="3" name="os.version.version"/>
1021
1007
  </fingerprint>
1022
1008
 
1023
- <fingerprint pattern="^Blue Coat (AV\S+)( Series)?, ProxyAV Version: ([^,]+). Release id:\s*(\S+).*$">
1009
+ <fingerprint pattern="^Blue Coat (AV\S+)(?: Series)?, ProxyAV Version: ([^,]+). Release id:\s*(\S+).*$">
1024
1010
  <description>Blue Coat ProxyAV</description>
1025
- <example>Blue Coat AV1200 Series, ProxyAV Version: 3.2.6.1, Release id: 51482</example>
1011
+ <example os.product="AV1200" os.version="3.2.6.1" os.version.version="51482">Blue Coat AV1200 Series, ProxyAV Version: 3.2.6.1, Release id: 51482</example>
1026
1012
  <param pos="0" name="os.vendor" value="Blue Coat"/>
1027
1013
  <param pos="0" name="os.device" value="Web proxy"/>
1028
1014
  <param pos="1" name="os.product"/>
1029
- <param pos="3" name="os.version"/>
1030
- <param pos="4" name="os.version.version"/>
1015
+ <param pos="2" name="os.version"/>
1016
+ <param pos="3" name="os.version.version"/>
1031
1017
  </fingerprint>
1032
1018
 
1033
1019
  <fingerprint pattern="^Blue Coat PacketShaper (\S+)$">
@@ -2216,25 +2202,17 @@ Copyright (c) 1995-2005 by Cisco Systems
2216
2202
 
2217
2203
 
2218
2204
  <!-- Epson uses the 201207171045 / 02.23.00 version format, but the latter is more consistent -->
2219
- <fingerprint pattern="^EPSON ([A-Z]\S+); Net ([^,]+),ESS ([^,]+),IOT (\S+)$">
2205
+ <fingerprint pattern="^EPSON ([A-Z]\S+); Net ([^,]+),ESS (?:[^,]+),IOT (\S+)$">
2220
2206
  <description>Epson Printer</description>
2221
- <example>EPSON AL-C1750N; Net 98.48,ESS 201103111031,IOT 02.17.00</example>
2222
- <example>EPSON AL-C1750N; Net 98.49,ESS 201107271418,IOT 02.17.00</example>
2223
- <example>EPSON AL-C1750N; Net 98.49,ESS 201107271418,IOT 02.17.02</example>
2224
- <example>EPSON AL-C1750N; Net 98.49,ESS 201107271418,IOT 02.17.04</example>
2225
- <example>EPSON AL-C1750W; Net 98.49,ESS 201107271419,IOT 02.17.00</example>
2226
- <example>EPSON AL-C1750W; Net 98.49,ESS 201107271419,IOT 02.17.02</example>
2227
- <example>EPSON AL-C1750W; Net 98.49,ESS 201107271419,IOT 02.17.04</example>
2228
- <example>EPSON AL-C2900; Net 96.51,ESS 201103101328,IOT 04.00.00</example>
2229
- <example>EPSON AL-C2900; Net 96.55,ESS 201108091219,IOT 04.00.01</example>
2230
- <example>EPSON AL-CX29; Net 96.55,ESS 201106281159,IOT 04.00.00</example>
2231
- <example>EPSON AL-CX29; Net 96.55,ESS 201110211025,IOT 04.00.01</example>
2232
- <example>EPSON LP-S620; Net 98.48,ESS 201103111031,IOT 02.17.02</example>
2207
+ <example os.product="AL-C1750N" os.version="02.17.00" os.version.version="98.48">EPSON AL-C1750N; Net 98.48,ESS 201103111031,IOT 02.17.00</example>
2208
+ <example os.product="AL-C2900" os.version="04.00.00" os.version.version="96.51">EPSON AL-C2900; Net 96.51,ESS 201103101328,IOT 04.00.00</example>
2209
+ <example os.product="AL-CX29" os.version="04.00.00" os.version.version="96.55">EPSON AL-CX29; Net 96.55,ESS 201106281159,IOT 04.00.00</example>
2210
+ <example os.product="LP-S620" os.version="02.17.02" os.version.version="98.48">EPSON LP-S620; Net 98.48,ESS 201103111031,IOT 02.17.02</example>
2233
2211
  <param pos="0" name="os.vendor" value="Epson"/>
2234
2212
  <param pos="0" name="os.device" value="Printer"/>
2235
2213
  <param pos="1" name="os.product"/>
2236
- <param pos="4" name="os.version"/>
2237
- <param pos="3" name="os.version.version"/>
2214
+ <param pos="3" name="os.version"/>
2215
+ <param pos="2" name="os.version.version"/>
2238
2216
  </fingerprint>
2239
2217
 
2240
2218
  <fingerprint pattern="^EPSON ([A-Z]\S+) (\d+\.\S+)$">
@@ -4992,23 +4970,21 @@ Copyright (c) 1995-2005 by Cisco Systems
4992
4970
  Note: The "hostname" is not really a hostname in this case, it is the MAC
4993
4971
  address.
4994
4972
  -->
4995
- <fingerprint pattern="^Linux (SUNSP00144F\S+) (2\.4\.22).* (\S+)$">
4973
+ <fingerprint pattern="^Linux (?:SUNSP00144F\S+) (\S*).* (\S+)$">
4996
4974
  <description>Ubuntu Linux 7.04</description>
4997
- <example>Linux SUNSP00144F9E0508 2.4.22 #1 Sat Apr 21 11:28:21 PDT 2007 ppc</example>
4998
- <example>Linux SUNSP00144F794047 2.4.22 #1 Tue Feb 27 19:45:33 PST 2007 ppc</example>
4999
- <example>Linux SUNSP00144F8E3F54 2.4.22 #1 Tue Feb 27 19:45:33 PST 2007 ppc</example>
4975
+ <example os.arch="ppc" linux.kernel.version="2.4.22">Linux SUNSP00144F9E0508 2.4.22 #1 Sat Apr 21 11:28:21 PDT 2007 ppc</example>
5000
4976
  <param pos="0" name="os.certainty" value="0.9"/>
5001
4977
  <param pos="0" name="os.family" value="Linux"/>
5002
4978
  <param pos="0" name="os.vendor" value="Sun"/>
5003
4979
  <param pos="0" name="os.product" value="Integrated Lights Out Manager"/>
5004
4980
  <param pos="0" name="os.device" value="Lights Out Management"/>
5005
- <param pos="2" name="linux.kernel.version"/>
5006
- <param pos="3" name="os.arch"/>
4981
+ <param pos="1" name="linux.kernel.version"/>
4982
+ <param pos="2" name="os.arch"/>
5007
4983
  </fingerprint>
5008
4984
 
5009
- <fingerprint pattern="^Silver Peak Systems, Inc\. (\S+) Linux (.*?) ([0-9]+\.[0-9]+\.[0-9]+\S*).* ([0-9]{4}|[A-Z][A-Z][A-Z]{1,2}|\+[0-9]+|Local time.*(manual|zic|m\S*)) (\S+).*$">
4985
+ <fingerprint pattern="^Silver Peak Systems, Inc\. (\S+) Linux (.*?) ([0-9]+\.[0-9]+\.[0-9]+\S*).* (?:[0-9]{4}|[A-Z][A-Z][A-Z]{1,2}|\+[0-9]+|Local time.*(?:manual|zic|m\S*)) (\S+).*$">
5010
4986
  <description>Silver Peak Systems</description>
5011
- <example>Silver Peak Systems, Inc. NX7600 Linux Baghdad1C 2.6.22.14 hidalgo 3.3.0.0_32549 #1 2010-07-20 04:25:08 SMP x86_64</example>
4987
+ <example os.product="NX7600" host.name="foo" os.version="2.6.22.14" os.arch="x86_64">Silver Peak Systems, Inc. NX7600 Linux foo 2.6.22.14 hidalgo 3.3.0.0_32549 #1 2010-07-20 04:25:08 SMP x86_64</example>
5012
4988
  <param pos="0" name="os.certainty" value="0.9"/>
5013
4989
  <param pos="0" name="os.family" value="Linux"/>
5014
4990
  <param pos="0" name="os.device" value="WAN Accelerator"/>
@@ -5017,7 +4993,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5017
4993
  <param pos="3" name="os.version"/>
5018
4994
  <param pos="2" name="host.name"/>
5019
4995
  <param pos="3" name="linux.kernel.version"/>
5020
- <param pos="6" name="os.arch"/>
4996
+ <param pos="4" name="os.arch"/>
5021
4997
  </fingerprint>
5022
4998
 
5023
4999
  <!--
@@ -5025,9 +5001,9 @@ Copyright (c) 1995-2005 by Cisco Systems
5025
5001
  specific pattern available.
5026
5002
  -->
5027
5003
 
5028
- <fingerprint pattern="^Linux (.*?) ([0-9]+\.[0-9]+\.[0-9]+\S*).* ([0-9]{4}|[A-Z][A-Z][A-Z]{1,2}|\+[0-9]+|Local time.*(manual|zic|m\S*)) (\S+).*$">
5004
+ <fingerprint pattern="^Linux (.*?) ([0-9]+\.[0-9]+\.[0-9]+\S*).* (?:[0-9]{4}|[A-Z][A-Z][A-Z]{1,2}|\+[0-9]+|Local time.*(?:manual|zic|m\S*)) (\S+).*$">
5029
5005
  <description>Linux Generic</description>
5030
- <example>Linux hostname 2.6.9 #2 SMP Tue Jun 26 16:10:49 EDT 2012 x86_64</example>
5006
+ <example os.arch="x86_64" os.version="2.6.9" linux.kernel.version="2.6.9" host.name="hostname">Linux hostname 2.6.9 #2 SMP Tue Jun 26 16:10:49 EDT 2012 x86_64</example>
5031
5007
  <param pos="0" name="os.certainty" value="0.5"/>
5032
5008
  <param pos="0" name="os.family" value="Linux"/>
5033
5009
  <param pos="0" name="os.product" value="Linux"/>
@@ -5035,19 +5011,19 @@ Copyright (c) 1995-2005 by Cisco Systems
5035
5011
  <param pos="2" name="os.version"/>
5036
5012
  <param pos="1" name="host.name"/>
5037
5013
  <param pos="2" name="linux.kernel.version"/>
5038
- <param pos="5" name="os.arch"/>
5014
+ <param pos="3" name="os.arch"/>
5039
5015
  </fingerprint>
5040
5016
 
5041
- <fingerprint pattern="^Linux ([0-9]+\.[0-9]+\.[0-9]+\S*).* ([0-9]{4}|[A-Z][A-Z][A-Z]{1,2}|\+[0-9]+|Local time.*(manual|zic|m\S*)) (\S+).*$">
5017
+ <fingerprint pattern="^Linux ([0-9]+\.[0-9]+\.[0-9]+\S*).* (?:[0-9]{4}|[A-Z][A-Z][A-Z]{1,2}|\+[0-9]+|Local time.*(?:manual|zic|m\S*)) (\S+).*$">
5042
5018
  <description>Linux Generic</description>
5043
- <example>Linux 2.6.9 #2 SMP Tue Jun 26 16:10:49 EDT 2012 x86_64</example>
5019
+ <example os.version="2.6.9" linux.kernel.version="2.6.9" os.arch="x86_64">Linux 2.6.9 #2 SMP Tue Jun 26 16:10:49 EDT 2012 x86_64</example>
5044
5020
  <param pos="0" name="os.certainty" value="0.5"/>
5045
5021
  <param pos="0" name="os.family" value="Linux"/>
5046
5022
  <param pos="0" name="os.product" value="Linux"/>
5047
5023
  <param pos="0" name="os.device" value="General"/>
5048
5024
  <param pos="1" name="os.version"/>
5049
5025
  <param pos="1" name="linux.kernel.version"/>
5050
- <param pos="4" name="os.arch"/>
5026
+ <param pos="2" name="os.arch"/>
5051
5027
  </fingerprint>
5052
5028
 
5053
5029
  <fingerprint pattern="^Linux (.*?) ([0-9]+\.[0-9]+\.[0-9]+\S*) (\S+)$">
@@ -5611,15 +5587,15 @@ Copyright (c) 1995-2005 by Cisco Systems
5611
5587
  <param pos="1" name="os.version"/>
5612
5588
  </fingerprint>
5613
5589
 
5614
- <fingerprint pattern="^Nortel( Networks|), CS 1000 Signaling Server, Software Release (\S+)$">
5590
+ <fingerprint pattern="^Nortel(?: Networks)?, CS 1000 Signaling Server, Software Release (\S+)$">
5615
5591
  <description>Nortel CS 1000</description>
5616
- <example>Nortel, CS 1000 Signaling Server, Software Release sse-4.50.88</example>
5617
- <example>Nortel Networks, CS 1000 Signaling Server, Software Release sse-4.00.55</example>
5592
+ <example os.version="sse-4.50.88">Nortel, CS 1000 Signaling Server, Software Release sse-4.50.88</example>
5593
+ <example os.version="sse-4.00.55">Nortel Networks, CS 1000 Signaling Server, Software Release sse-4.00.55</example>
5618
5594
  <param pos="0" name="os.vendor" value="Nortel"/>
5619
5595
  <param pos="0" name="os.family" value="CS 1000"/>
5620
5596
  <param pos="0" name="os.device" value="VoIP"/>
5621
5597
  <param pos="0" name="os.product" value="CS 1000 Signaling Server"/>
5622
- <param pos="2" name="os.version"/>
5598
+ <param pos="1" name="os.version"/>
5623
5599
  </fingerprint>
5624
5600
 
5625
5601
  <fingerprint pattern="^Nortel, CS 1000 VGMC, Software Release (\S+)$">
@@ -5656,17 +5632,17 @@ Copyright (c) 1995-2005 by Cisco Systems
5656
5632
  <param pos="1" name="os.version.version.version"/>
5657
5633
  </fingerprint>
5658
5634
 
5659
- <fingerprint pattern="^Nortel( Networks|), Meridian 1 Call Server, System (\S+), Release (\S+), Issue (\S+)$">
5635
+ <fingerprint pattern="^Nortel(?: Networks)?, Meridian 1 Call Server, System (\S+), Release (\S+), Issue (\S+)$">
5660
5636
  <description>Nortel Networks Meridian 1 Call Server</description>
5661
- <example>Nortel Networks, Meridian 1 Call Server, System 2121, Release 4, Issue 0</example>
5662
- <example>Nortel, Meridian 1 Call Server, System 2121, Release 4, Issue 50</example>
5637
+ <example os.version.version.version="2121" os.version="4" os.version.version="0">Nortel Networks, Meridian 1 Call Server, System 2121, Release 4, Issue 0</example>
5638
+ <example os.version.version.version="2121" os.version="4" os.version.version="50">Nortel, Meridian 1 Call Server, System 2121, Release 4, Issue 50</example>
5663
5639
  <param pos="0" name="os.vendor" value="Nortel"/>
5664
5640
  <param pos="0" name="os.family" value="Meridian 1"/>
5665
5641
  <param pos="0" name="os.device" value="VoIP"/>
5666
5642
  <param pos="0" name="os.product" value="Meridian 1 Call Server"/>
5667
- <param pos="3" name="os.version"/>
5668
- <param pos="4" name="os.version.version"/>
5669
- <param pos="2" name="os.version.version.version"/>
5643
+ <param pos="2" name="os.version"/>
5644
+ <param pos="3" name="os.version.version"/>
5645
+ <param pos="1" name="os.version.version.version"/>
5670
5646
  </fingerprint>
5671
5647
 
5672
5648
  <fingerprint pattern="^Nortel Application Switch (\S+)(?:\s+\S+|)$">
@@ -5678,15 +5654,15 @@ Copyright (c) 1995-2005 by Cisco Systems
5678
5654
  <param pos="1" name="os.product"/>
5679
5655
  </fingerprint>
5680
5656
 
5681
- <fingerprint pattern="^Ethernet Routing Switch (\S+)\s+(\(Stack Enabled\)\s+|)HW:.*FW:.*SW:(\S+).*\(c\) Nortel Networks$">
5657
+ <fingerprint pattern="^Ethernet Routing Switch (\S+)\s+(?:\(Stack Enabled\)\s+)?HW:.*FW:.*SW:(\S+).*\(c\) Nortel Networks$">
5682
5658
  <description>Nortel Ethernet switch</description>
5683
- <example>Ethernet Routing Switch 5520-48T-PWR HW:32 FW:5.0.0.3 SW:v5.0.4.011 BN:00 (c) Nortel Networks</example>
5684
- <example>Ethernet Routing Switch 2526T (Stack Enabled) HW:01 FW:1.0.0.13 SW:v4.1.0.000 BN:00 (c) Nortel Networks</example>
5659
+ <example os.product="5520-48T-PWR" os.version="v5.0.4.011">Ethernet Routing Switch 5520-48T-PWR HW:32 FW:5.0.0.3 SW:v5.0.4.011 BN:00 (c) Nortel Networks</example>
5660
+ <example os.product="2526T" os.version="v4.1.0.000">Ethernet Routing Switch 2526T (Stack Enabled) HW:01 FW:1.0.0.13 SW:v4.1.0.000 BN:00 (c) Nortel Networks</example>
5685
5661
  <param pos="0" name="os.vendor" value="Nortel"/>
5686
5662
  <param pos="0" name="os.family" value="Ethernet Routing Switch"/>
5687
5663
  <param pos="0" name="os.device" value="Switch"/>
5688
5664
  <param pos="1" name="os.product"/>
5689
- <param pos="3" name="os.version"/>
5665
+ <param pos="2" name="os.version"/>
5690
5666
  </fingerprint>
5691
5667
 
5692
5668
  <fingerprint pattern="^Nortel SR ([^,\s]+).*Software Version = ([^,]+),.*$">
@@ -6298,28 +6274,28 @@ Copyright (c) 1995-2005 by Cisco Systems
6298
6274
  <param pos="2" name="os.version"/>
6299
6275
  </fingerprint>
6300
6276
 
6301
- <fingerprint pattern="^Paradyne (ATM (ReachDSL|ADSL) Unit); Model: ([^;]+);.*S/W Release: ([^;]+);.*$">
6277
+ <fingerprint pattern="^Paradyne (ATM (?:ReachDSL|ADSL) Unit); Model: ([^;]+);.*S/W Release: ([^;]+);.*$">
6302
6278
  <description>Paradyne ATM DSL Unit</description>
6303
- <example>Paradyne ATM ADSL Unit; Model: 4223-A1-532; CCA: 868-5969-8200; S/W Release: 02.03.08; Hardware Revision: 5969-82A; Serial number: 6963727 ;</example>
6304
- <example>Paradyne ATM ReachDSL Unit; Model: 4211-A1-530; CCA: 868-5315-8200; S/W Release: 02.03.04; Hardware Revision: 5315-82G; Serial number: 6066448 ;</example>
6279
+ <example os.family="ATM ADSL Unit" os.product="4223-A1-532" os.version="02.03.08">Paradyne ATM ADSL Unit; Model: 4223-A1-532; CCA: 868-5969-8200; S/W Release: 02.03.08; Hardware Revision: 5969-82A; Serial number: 6963727 ;</example>
6280
+ <example os.family="ATM ReachDSL Unit" os.product="4211-A1-530" os.version="02.03.04">Paradyne ATM ReachDSL Unit; Model: 4211-A1-530; CCA: 868-5315-8200; S/W Release: 02.03.04; Hardware Revision: 5315-82G; Serial number: 6066448 ;</example>
6305
6281
  <param pos="0" name="os.certainty" value="1.0"/>
6306
6282
  <param pos="0" name="os.vendor" value="Paradyne"/>
6307
6283
  <param pos="0" name="os.device" value="ATM DSL Unit"/>
6308
6284
  <param pos="1" name="os.family"/>
6309
- <param pos="3" name="os.product"/>
6310
- <param pos="4" name="os.version"/>
6285
+ <param pos="2" name="os.product"/>
6286
+ <param pos="3" name="os.version"/>
6311
6287
  </fingerprint>
6312
6288
 
6313
- <fingerprint pattern="^Paradyne (Hot[wW]ire [^;]+); Model: ([^;]+);.*S/W Release: ([^;]+);.*$">
6289
+ <fingerprint pattern="^Paradyne (?:Hot[wW]ire [^;]+); Model: ([^;]+);.*S/W Release: ([^;]+);.*$">
6314
6290
  <description>Paradyne HotWire</description>
6315
- <example>Paradyne Hotwire DSL4; Model: 8546-B1-000; Card: R4IP; S/W Release: 02.03.15; H/W Revision: 1004-80A; Serial number: 7HMOC</example>
6316
- <example>Paradyne HotWire MCC; Model: 8000-B1-000; Card: MC-M; S/W Release: 02.00.22; H/W Revision: 1010-80A; Serial number: 7HHJR</example>
6291
+ <example os.product="8546-B1-000" os.version="02.03.15">Paradyne Hotwire DSL4; Model: 8546-B1-000; Card: R4IP; S/W Release: 02.03.15; H/W Revision: 1004-80A; Serial number: 7HMOC</example>
6292
+ <example os.product="8000-B1-000" os.version="02.00.22">Paradyne HotWire MCC; Model: 8000-B1-000; Card: MC-M; S/W Release: 02.00.22; H/W Revision: 1010-80A; Serial number: 7HHJR</example>
6317
6293
  <param pos="0" name="os.certainty" value="1.0"/>
6318
6294
  <param pos="0" name="os.vendor" value="Paradyne"/>
6319
6295
  <param pos="0" name="os.device" value="DSL Modem"/>
6320
6296
  <param pos="0" name="os.family" value="HotWire"/>
6321
- <param pos="2" name="os.product"/>
6322
- <param pos="3" name="os.version"/>
6297
+ <param pos="1" name="os.product"/>
6298
+ <param pos="2" name="os.version"/>
6323
6299
  </fingerprint>
6324
6300
 
6325
6301
  <!--
@@ -7164,38 +7140,38 @@ Copyright (c) 1995-2005 by Cisco Systems
7164
7140
  SGI
7165
7141
  =======================================================================-->
7166
7142
 
7167
- <fingerprint pattern="^.* IRIX (version )?(\d+\S+).*$">
7143
+ <fingerprint pattern="^.* IRIX (?:version )?(\d+\S+).*$">
7168
7144
  <description>SGI IRIX</description>
7169
- <example>Silicon Graphics IRIS Indigo2 running IRIX version 6.5</example>
7170
- <example>Silicon Graphics IRIS Indigo2 Elan running IRIX 5.3</example>
7171
- <example>Silicon Graphics IRIS Indigo2 running IRIX 5.3</example>
7172
- <example>Silicon Graphics IRIS O2 CRM running IRIX 6.3</example>
7145
+ <example os.version="6.5">Silicon Graphics IRIS Indigo2 running IRIX version 6.5</example>
7146
+ <example os.version="5.3">Silicon Graphics IRIS Indigo2 Elan running IRIX 5.3</example>
7147
+ <example os.version="5.3">Silicon Graphics IRIS Indigo2 running IRIX 5.3</example>
7148
+ <example os.version="6.3">Silicon Graphics IRIS O2 CRM running IRIX 6.3</example>
7173
7149
  <param pos="0" name="os.certainty" value="0.9"/>
7174
7150
  <param pos="0" name="os.vendor" value="SGI"/>
7175
7151
  <param pos="0" name="os.family" value="IRIX"/>
7176
7152
  <param pos="0" name="os.product" value="IRIX"/>
7177
7153
  <param pos="0" name="os.device" value="General"/>
7178
7154
  <param pos="0" name="os.arch" value="MIPS"/> <!-- We should differentiate Indigo2 vs. Indigo -->
7179
- <param pos="2" name="os.version"/>
7155
+ <param pos="1" name="os.version"/>
7180
7156
  </fingerprint>
7181
7157
 
7182
- <fingerprint pattern="^.* IRIX64 (version )?(\d+\S+).*$">
7158
+ <fingerprint pattern="^.* IRIX64 (?:version )?(\d+\S+).*$">
7183
7159
  <description>SGI IRIX</description>
7184
- <example>Silicon Graphics Challenge/1 running IRIX64 6.5</example>
7185
- <example>Silicon Graphics Fuel running IRIX64 version 6.5</example>
7186
- <example>Silicon Graphics IRIS Octane running IRIX64 version 6.5</example>
7187
- <example>Silicon Graphics Octane2 running IRIX64 version 6.5</example>
7188
- <example>Silicon Graphics Onyx2 running IRIX64 version 6.5</example>
7189
- <example>Silicon Graphics Origin 200 running IRIX64 version 6.5</example>
7190
- <example>Silicon Graphics Origin 2000 running IRIX64 version 6.5</example>
7191
- <example>Silicon Graphics Origin 3000 running IRIX64 version 6.5</example>
7160
+ <example os.version="6.5">Silicon Graphics Challenge/1 running IRIX64 6.5</example>
7161
+ <example os.version="6.5">Silicon Graphics Fuel running IRIX64 version 6.5</example>
7162
+ <example os.version="6.5">Silicon Graphics IRIS Octane running IRIX64 version 6.5</example>
7163
+ <example os.version="6.5">Silicon Graphics Octane2 running IRIX64 version 6.5</example>
7164
+ <example os.version="6.5">Silicon Graphics Onyx2 running IRIX64 version 6.5</example>
7165
+ <example os.version="6.5">Silicon Graphics Origin 200 running IRIX64 version 6.5</example>
7166
+ <example os.version="6.5">Silicon Graphics Origin 2000 running IRIX64 version 6.5</example>
7167
+ <example os.version="6.5">Silicon Graphics Origin 3000 running IRIX64 version 6.5</example>
7192
7168
  <param pos="0" name="os.certainty" value="0.9"/>
7193
7169
  <param pos="0" name="os.vendor" value="SGI"/>
7194
7170
  <param pos="0" name="os.family" value="IRIX"/>
7195
7171
  <param pos="0" name="os.product" value="IRIX"/>
7196
7172
  <param pos="0" name="os.device" value="General"/>
7197
7173
  <param pos="0" name="os.arch" value="MIPS64"/>
7198
- <param pos="2" name="os.version"/>
7174
+ <param pos="1" name="os.version"/>
7199
7175
  </fingerprint>
7200
7176
 
7201
7177
 
@@ -7250,9 +7226,9 @@ Copyright (c) 1995-2005 by Cisco Systems
7250
7226
  <param pos="1" name="os.product"/>
7251
7227
  </fingerprint>
7252
7228
 
7253
- <fingerprint pattern="^HiPath Wireless Access Controller - (\S+( \S+)?)\s*, System Version (V\d+ )?(\S+)$">
7229
+ <fingerprint pattern="^HiPath Wireless Access Controller - ([^,]+)\s*, System Version ((?:V\d+ )?\S+)$">
7254
7230
  <description>Siemens HiPath Wireless Access Point</description>
7255
- <example>HiPath Wireless Access Controller - C20 Office, System Version V6R1.10507.0</example>
7231
+ <example os.product="C20 Office" os.version="V6R1.10507.0">HiPath Wireless Access Controller - C20 Office, System Version V6R1.10507.0</example>
7256
7232
  <example>HiPath Wireless Access Controller - C2400 Enterprise, System Version 07.41.01.0192</example>
7257
7233
  <example>HiPath Wireless Access Controller - C2400 Enterprise, System Version 07.41.03.0006</example>
7258
7234
  <example>HiPath Wireless Access Controller - C25, System Version 07.41.02.0009</example>
@@ -7266,7 +7242,7 @@ Copyright (c) 1995-2005 by Cisco Systems
7266
7242
  <param pos="0" name="os.device" value="HiPath"/>
7267
7243
  <param pos="0" name="os.family" value="WAP"/>
7268
7244
  <param pos="1" name="os.product"/>
7269
- <param pos="4" name="os.version"/>
7245
+ <param pos="2" name="os.version"/>
7270
7246
  </fingerprint>
7271
7247
 
7272
7248
  <fingerprint pattern="^HiPath (optiPoint \S+ \S+) HFA$">
@@ -7386,28 +7362,18 @@ Copyright (c) 1995-2005 by Cisco Systems
7386
7362
  <param pos="2" name="os.version"/>
7387
7363
  </fingerprint>
7388
7364
 
7389
- <fingerprint pattern="^Siemens, SIMATIC NET, ([^,]+),.*FW:\s*(Version )?V?([^,]+).*$">
7365
+ <fingerprint pattern="^Siemens, SIMATIC NET, ([^,]+),.*FW:\s*(?:Version )?V?([^,]+).*$">
7390
7366
  <description>Siemens NET</description>
7391
- <example>Siemens, SIMATIC NET, CP 343-1 Advanced, 6GK7 343-1GX30-0XE0, HW: Version 3, FW: Version V1.2.3, VPB9502953</example>
7392
- <example>Siemens, SIMATIC NET, CP 343-1 Lean, 6GK7 343-1CX10-0XE0, HW: Version 6, FW: Version V2.6.0, VPC3513639</example>
7393
- <example>Siemens, SIMATIC NET, CP 343-1, 6GK7 343-1EX30-0XE0, HW: Version 3, FW: Version V2.2.20, VPXN545808</example>
7394
- <example>Siemens, SIMATIC NET, CP 343-1, 6GK7 343-1EX30-0XE0, HW: Version 6, FW: Version V2.6.0, VPC3523329</example>
7395
- <example>Siemens, SIMATIC NET, CP 443-1 Advanced, 6GK7 443-1GX20-0XE0, HW: Version 4, FW: Version V2.1.12, VPAO470672</example>
7396
- <example>Siemens, SIMATIC NET, CP343-1 Advanced, 6GK7 343-1GX30-0XE0, HW: Version 2, FW: Version V1.0.23, VPX1507972</example>
7397
- <example>Siemens, SIMATIC NET, CP343-1, 6GK7 343-1CX10-0XE0, HW: Version 2, FW: Version V2.0.16, VPV2516052</example>
7398
- <example>Siemens, SIMATIC NET, CP443-1 Advanced, 6GK7 443-1GX20-0XE0, HW: Version 3, FW: Version V2.0.49, VPA2470202</example>
7399
- <example>Siemens, SIMATIC NET, CP443-1, 6GK7 443-1EX20-0XE0, HW: Version 2, FW: Version V1.0.26, VPW6470099</example>
7400
- <example>Siemens, SIMATIC NET, SCALANCE X204-2, 6GK5 204-2BB10-2AA3, HW: 4, FW: V4.01</example>
7401
- <example>Siemens, SIMATIC NET, SCALANCE X204-2, 6GK5 204-2BB10-2AA3, HW: 7, FW: V4.03</example>
7402
- <example>Siemens, SIMATIC NET, SCALANCE X208, 6GK5 208-0BA10-2AA3, HW: 2, FW: V4.00</example>
7403
- <example>Siemens, SIMATIC NET, SCALANCE X208, 6GK5 208-0BA10-2AA3, HW: 5, FW: V4.02</example>
7404
- <example>Siemens, SIMATIC NET, Scalance S612, 6GK56120BA102AA3, HW: Version 6, FW: Version S03.01.00.00_01.00.00.01, VPB9542952</example>
7405
- <example>Siemens, SIMATIC NET, Scalance S612, 6GK56120BA102AA3, HW: Version 6, FW: Version T03.00.00.00_25.00.00.01, VPB9542952</example>
7367
+ <example os.product="CP 343-1 Advanced" os.version="1.2.3">Siemens, SIMATIC NET, CP 343-1 Advanced, 6GK7 343-1GX30-0XE0, HW: Version 3, FW: Version V1.2.3, VPB9502953</example>
7368
+ <example os.product="CP 343-1 Lean" os.version="2.6.0">Siemens, SIMATIC NET, CP 343-1 Lean, 6GK7 343-1CX10-0XE0, HW: Version 6, FW: Version V2.6.0, VPC3513639</example>
7369
+ <example os.product="CP 343-1" os.version="2.2.20">Siemens, SIMATIC NET, CP 343-1, 6GK7 343-1EX30-0XE0, HW: Version 3, FW: Version V2.2.20, VPXN545808</example>
7370
+ <example os.product="SCALANCE X204-2" os.version="4.01">Siemens, SIMATIC NET, SCALANCE X204-2, 6GK5 204-2BB10-2AA3, HW: 4, FW: V4.01</example>
7371
+ <example os.product="Scalance S612" os.version="T03.00.00.00_25.00.00.01">Siemens, SIMATIC NET, Scalance S612, 6GK56120BA102AA3, HW: Version 6, FW: Version T03.00.00.00_25.00.00.01, VPB9542952</example>
7406
7372
  <param pos="0" name="os.vendor" value="Siemens"/>
7407
7373
  <param pos="0" name="os.device" value="General"/>
7408
7374
  <param pos="0" name="os.family" value="Simatic NET"/>
7409
7375
  <param pos="1" name="os.product"/>
7410
- <param pos="3" name="os.version"/>
7376
+ <param pos="2" name="os.version"/>
7411
7377
  </fingerprint>
7412
7378
 
7413
7379
  <fingerprint pattern="^Siemens, SIMATIC NET (\S+) FW V (\S+)$">
@@ -7420,21 +7386,16 @@ Copyright (c) 1995-2005 by Cisco Systems
7420
7386
  <param pos="2" name="os.version"/>
7421
7387
  </fingerprint>
7422
7388
 
7423
- <fingerprint pattern="^Siemens, SIMATIC S7, ([^,]+), .*?FW: (Version )?V?\.?([^,]+).*$">
7389
+ <fingerprint pattern="^Siemens, SIMATIC S7, ([^,]+), .*?FW: (?:Version )?V?\.?([^,]+).*$">
7424
7390
  <description>Siemens S7</description>
7425
- <example>Siemens, SIMATIC S7, CPU-1200, 6ES7 211-1BD30-0XB0, HW: 1, FW: V.2.0.2, SZVX8YU9000553</example>
7426
- <example>Siemens, SIMATIC S7, CPU-1200, 6ES7 212-1BD30-0XB0, HW: 1, FW: V.2.0.2, SZVB5YU6023612</example>
7427
- <example>Siemens, SIMATIC S7, CPU-1200, 6ES7 214-1AE30-0XB0, HW: 1, FW: V.2.0.2, SZVB5YYW030600</example>
7428
- <example>Siemens, SIMATIC S7, CPU-1200, 6ES7 214-1BE30-0XB0, HW: 1, FW: V.2.0.2, SZVB5YYY021744</example>
7429
- <example>Siemens, SIMATIC S7, CPU314C-2 PN/DP, 6ES7 314-6EH04-0AB0 , HW: 1, FW: V3.3.6, S C-C2TP66392012</example>
7430
- <example>Siemens, SIMATIC S7, CPU315-2 PN/DP, 6ES7 315-2EH13-0AB0 , HW: 3, FW: V2.5.0, S C-V4P07826200</example>
7431
- <example>Siemens, SIMATIC S7, IM151-8, 6ES7 151-8AB00-0AB0 , HW: 2, FW: V2.7.1, S C-X7UR7434200</example>
7432
- <example>Siemens, SIMATIC S7, IM151-8, 6ES7 151-8AB01-0AB0 , HW: 2, FW: V3.2.3, S C-B3UC78192011</example>
7391
+ <example os.product="CPU-1200" os.version="2.0.2">Siemens, SIMATIC S7, CPU-1200, 6ES7 211-1BD30-0XB0, HW: 1, FW: V.2.0.2, SZVX8YU9000553</example>
7392
+ <example os.product="CPU315-2 PN/DP" os.version="2.5.0">Siemens, SIMATIC S7, CPU315-2 PN/DP, 6ES7 315-2EH13-0AB0 , HW: 3, FW: V2.5.0, S C-V4P07826200</example>
7393
+ <example os.product="IM151-8" os.version="3.2.3">Siemens, SIMATIC S7, IM151-8, 6ES7 151-8AB01-0AB0 , HW: 2, FW: V3.2.3, S C-B3UC78192011</example>
7433
7394
  <param pos="0" name="os.vendor" value="Siemens"/>
7434
7395
  <param pos="0" name="os.device" value="General"/>
7435
7396
  <param pos="0" name="os.family" value="Simatic S7"/>
7436
7397
  <param pos="1" name="os.product"/>
7437
- <param pos="3" name="os.version"/>
7398
+ <param pos="2" name="os.version"/>
7438
7399
  </fingerprint>
7439
7400
 
7440
7401
  <fingerprint pattern="^Siemens, SIMATIC S7, ([^,]+), .*?, V\.([^,]+).*$">
@@ -7810,16 +7771,16 @@ Copyright (c) 1995-2005 by Cisco Systems
7810
7771
  <param pos="0" name="os.device" value="WAP"/>
7811
7772
  </fingerprint>
7812
7773
 
7813
- <fingerprint pattern="^Symbol ((Spectrum24 (FHSS|Ethernet) )?Access Point)[,-].*S/W rev:\s*(\S+).*$">
7774
+ <fingerprint pattern="^Symbol ((?:Spectrum24 (?:FHSS|Ethernet) )?Access Point)[,-].*S/W rev:\s*(\S+).*$">
7814
7775
  <description>Symbol Access Point</description>
7815
- <example>Symbol Access Point, S/W rev:- S/W rev: 02.70-06</example>
7816
- <example>Symbol Access Point, S/W rev:02.21-01</example>
7817
- <example>Symbol Spectrum24 FHSS Access Point, S/W rev: 04.02-12</example>
7818
- <example>Symbol Access Point- S/W rev: 03.50-26</example>
7776
+ <example os.product="Access Point" os.version="02.70-06">Symbol Access Point, S/W rev:- S/W rev: 02.70-06</example>
7777
+ <example os.product="Access Point" os.version="02.21-01">Symbol Access Point, S/W rev:02.21-01</example>
7778
+ <example os.product="Spectrum24 FHSS Access Point" os.version="04.02-12">Symbol Spectrum24 FHSS Access Point, S/W rev: 04.02-12</example>
7779
+ <example os.product="Access Point" os.version="03.50-26">Symbol Access Point- S/W rev: 03.50-26</example>
7819
7780
  <param pos="0" name="os.vendor" value="Symbol"/>
7820
7781
  <param pos="1" name="os.product"/>
7821
7782
  <param pos="0" name="os.device" value="WAP"/>
7822
- <param pos="4" name="os.version"/>
7783
+ <param pos="2" name="os.version"/>
7823
7784
  </fingerprint>
7824
7785
 
7825
7786
  <fingerprint pattern="^Symbol (AP\S+|WS\S+) .* SW=(\S+) .*$">