recog 2.3.21 → 2.3.22

Sign up to get free protection for your applications and to get access to all the features.
Files changed (59) hide show
  1. checksums.yaml +4 -4
  2. data/.github/dependabot.yml +8 -0
  3. data/.github/workflows/verify.yml +89 -0
  4. data/CONTRIBUTING.md +6 -0
  5. data/README.md +17 -0
  6. data/bin/recog_standardize +28 -13
  7. data/bin/recog_verify +1 -2
  8. data/cpe-remap.yaml +13 -0
  9. data/features/verify.feature +14 -14
  10. data/identifiers/fields.txt +5 -4
  11. data/identifiers/hw_device.txt +6 -0
  12. data/identifiers/hw_family.txt +8 -0
  13. data/identifiers/hw_product.txt +51 -0
  14. data/identifiers/os_family.txt +1 -0
  15. data/identifiers/os_product.txt +10 -0
  16. data/identifiers/service_product.txt +12 -0
  17. data/identifiers/vendor.txt +49 -0
  18. data/lib/recog/db.rb +2 -1
  19. data/lib/recog/fingerprint.rb +18 -5
  20. data/lib/recog/verifier.rb +5 -5
  21. data/lib/recog/verifier_factory.rb +3 -3
  22. data/lib/recog/verify_reporter.rb +14 -4
  23. data/lib/recog/version.rb +1 -1
  24. data/spec/lib/fingerprint_self_test_spec.rb +1 -0
  25. data/spec/lib/recog/verify_reporter_spec.rb +69 -0
  26. data/tools/dev/hooks/pre-commit +21 -0
  27. data/update_cpes.py +1 -1
  28. data/xml/apache_os.xml +38 -38
  29. data/xml/dhcp_vendor_class.xml +206 -0
  30. data/xml/favicons.xml +148 -42
  31. data/xml/ftp_banners.xml +30 -16
  32. data/xml/h323_callresp.xml +99 -99
  33. data/xml/hp_pjl_id.xml +3 -3
  34. data/xml/html_title.xml +502 -25
  35. data/xml/http_cookies.xml +64 -56
  36. data/xml/http_servers.xml +74 -14
  37. data/xml/http_wwwauth.xml +107 -38
  38. data/xml/imap_banners.xml +3 -3
  39. data/xml/mdns_device-info_txt.xml +389 -26
  40. data/xml/mysql_banners.xml +1 -1
  41. data/xml/nntp_banners.xml +3 -3
  42. data/xml/ntp_banners.xml +64 -64
  43. data/xml/operating_system.xml +3 -3
  44. data/xml/pop_banners.xml +7 -7
  45. data/xml/rsh_resp.xml +3 -3
  46. data/xml/sip_banners.xml +27 -0
  47. data/xml/sip_user_agents.xml +54 -1
  48. data/xml/smtp_banners.xml +15 -15
  49. data/xml/smtp_ehlo.xml +1 -1
  50. data/xml/smtp_help.xml +10 -10
  51. data/xml/smtp_noop.xml +2 -2
  52. data/xml/snmp_sysdescr.xml +325 -200
  53. data/xml/snmp_sysobjid.xml +25 -25
  54. data/xml/ssh_banners.xml +7 -5
  55. data/xml/telnet_banners.xml +155 -20
  56. data/xml/tls_jarm.xml +26 -4
  57. data/xml/x509_issuers.xml +36 -0
  58. data/xml/x509_subjects.xml +136 -35
  59. metadata +7 -3
data/xml/snmp_sysdescr.xml CHANGED
@@ -62,7 +62,7 @@
62
62
  <param pos="1" name="os.version"/>
63
63
  </fingerprint>
64
64
 
65
- <fingerprint pattern="^3Com HomeConnect ADSL Modem V([^,]+),\s+.*$">
65
+ <fingerprint pattern="^3Com HomeConnect ADSL Modem V([^,]+),\s+">
66
66
  <description>3COM ADSL Modem</description>
67
67
  <example>3Com HomeConnect ADSL Modem V1.1.8, Built on May 17 2000 at 18:24:32.</example>
68
68
  <param pos="0" name="os.vendor" value="3Com"/>
@@ -98,7 +98,7 @@
98
98
  <param pos="2" name="os.version"/>
99
99
  </fingerprint>
100
100
 
101
- <fingerprint pattern="^3Com OfficeConnect (Remote ADSL \S+) V([^,]+),.*$">
101
+ <fingerprint pattern="^3Com OfficeConnect (Remote ADSL \S+) V([^,]+),">
102
102
  <description>3COM Cable Modem - build date variant</description>
103
103
  <example>3Com OfficeConnect Remote ADSL 812 V1.0.5, Built on Mar 16 2000 at 17:27:24.</example>
104
104
  <param pos="0" name="os.vendor" value="3Com"/>
@@ -128,7 +128,7 @@
128
128
  <param pos="1" name="os.product"/>
129
129
  </fingerprint>
130
130
 
131
- <fingerprint pattern="^3Com Router Software V([^,]+), SNMP agent for (Router \S+) with.*$">
131
+ <fingerprint pattern="^3Com Router Software V([^,]+), SNMP agent for (Router \S+) with">
132
132
  <description>3COM Router - processor variant</description>
133
133
  <example>3Com Router Software V1.10, SNMP agent for Router 3012 with 1 MPC 860 Processor, Copyright (c) Reserved.</example>
134
134
  <example>3Com Router Software V1.10, SNMP agent for Router 5009 with 1 MPC 8241 Processor, Copyright (c) Reserved.</example>
@@ -217,7 +217,7 @@
217
217
  <param pos="1" name="os.product"/>
218
218
  </fingerprint>
219
219
 
220
- <fingerprint pattern="(?i)^3Com Baseline Switch (\S+ Plus).* Software Version (\d+\.\S+ release \S+).*$">
220
+ <fingerprint pattern="(?i)^3Com Baseline Switch (\S+ Plus).* Software Version (\d+\.\S+ release \S+)">
221
221
  <description>3COM Baseline Switch with software version</description>
222
222
  <example>3Com Baseline Switch 2920-SFP Plus Software Version 5.20 RELEASE 1101 Copyright (c) 2004-2009 3Com Corporation. All rights reserved.</example>
223
223
  <example>3Com Baseline Switch 2920-SFP Plus Software Version 5.20 Release 1101P02 Copyright (c) 2004-2009 3Com Corporation. All rights reserved.</example>
@@ -244,7 +244,7 @@
244
244
  <param pos="2" name="os.version"/>
245
245
  </fingerprint>
246
246
 
247
- <fingerprint pattern="^3Com Corporation HiPer Access Router Card.*$">
247
+ <fingerprint pattern="^3Com Corporation HiPer Access Router Card">
248
248
  <description>3COM HiPer Access Router Card</description>
249
249
  <example>3Com Corporation HiPer Access Router Card Built on Apr 19 2000 at 12:33:01.</example>
250
250
  <param pos="0" name="os.vendor" value="3Com"/>
@@ -278,7 +278,7 @@
278
278
  <param pos="1" name="os.product"/>
279
279
  </fingerprint>
280
280
 
281
- <fingerprint pattern="^3Com Enterprise AP:\s*v(\S+) .*$">
281
+ <fingerprint pattern="^3Com Enterprise AP:\s*v(\S+)">
282
282
  <description>3COM Enterprise AP</description>
283
283
  <example os.version="3.1.00">3Com Enterprise AP: v3.1.00 v3.0.8</example>
284
284
  <example>3Com Enterprise AP: v3.2.0 v3.0.8</example>
@@ -303,7 +303,7 @@
303
303
  <param pos="1" name="hw.product"/>
304
304
  </fingerprint>
305
305
 
306
- <fingerprint pattern="^3Com Router .* Software Release ([^,]+), .*$">
306
+ <fingerprint pattern="^3Com Router .* Software Release ([^,]+),">
307
307
  <description>3COM Router - release variant</description>
308
308
  <example os.version="1910P02">3Com Router OSR6740 Software Release 1910P02, Standard (build V300R003B04D015SP01)</example>
309
309
  <param pos="0" name="os.vendor" value="3Com"/>
@@ -312,7 +312,7 @@
312
312
  <param pos="1" name="os.version"/>
313
313
  </fingerprint>
314
314
 
315
- <fingerprint pattern="^3Com (Router \S+) Software (\S+).*$">
315
+ <fingerprint pattern="^3Com (Router \S+) Software (\S+)">
316
316
  <description>3COM Router</description>
317
317
  <example hw.product="Router 3012" os.version="Extended_V1.30">3Com Router 3012 Software Extended_V1.30</example>
318
318
  <example>3Com Router 3013 Software V1.40.19</example>
@@ -518,7 +518,7 @@
518
518
  <param pos="1" name="os.product"/>
519
519
  </fingerprint>
520
520
 
521
- <fingerprint pattern="^Total Access ([^,\s]+).*Version: ([^,]+), Date: .*$">
521
+ <fingerprint pattern="^Total Access ([^,\s]+).*Version: ([^,]+), Date:">
522
522
  <description>ADTRAN TotalAccess - date variant</description>
523
523
  <example>Total Access 924 (2nd Gen), Version: A1.08.00.E, Date: Tue Apr 28 10:54:58 2009</example>
524
524
  <example>Total Access 904 (1st Gen), Version: A4.02.00.E, Date: Mon Aug 09 13:57:18 2010</example>
@@ -544,7 +544,7 @@
544
544
  <param pos="1" name="os.product"/>
545
545
  </fingerprint>
546
546
 
547
- <fingerprint pattern="^(TA\d\S+) (\d\S+ )?Total Access .*$">
547
+ <fingerprint pattern="^(TA\d\S+) (\d\S+ )?Total Access">
548
548
  <description>ADTRAN TotalAccess - model first variant</description>
549
549
  <example>TA1100F 1179.760 Total Access SFP-Based System</example>
550
550
  <example>TA1200F 1179.660L1 Total Access IP DSLAM System</example>
@@ -568,7 +568,7 @@
568
568
  <param pos="0" name="os.product" value="DSLAM Shelf"/>
569
569
  </fingerprint>
570
570
 
571
- <fingerprint pattern="(?i)^ADTRAN (T3SU-\S+).*$">
571
+ <fingerprint pattern="(?i)^ADTRAN (T3SU-\S+)">
572
572
  <description>ADTRAN DSU/CSU</description>
573
573
  <example>ADTRAN T3SU-300 (1200.217L1)</example>
574
574
  <param pos="0" name="os.device" value="DSU/CSU"/>
@@ -660,11 +660,23 @@
660
660
  <param pos="1" name="os.product"/>
661
661
  </fingerprint>
662
662
 
663
+ <!--======================================================================
664
+ ALLWORX
665
+ =======================================================================-->
666
+
667
+ <fingerprint pattern="^ALLWORX (9\d{3})$">
668
+ <description>Allworx 9XXX IP Phones</description>
669
+ <example hw.product="9308">ALLWORX 9308</example>
670
+ <param pos="0" name="hw.vendor" value="Allworx"/>
671
+ <param pos="0" name="hw.device" value="VoIP"/>
672
+ <param pos="1" name="hw.product"/>
673
+ </fingerprint>
674
+
663
675
  <!--======================================================================
664
676
  APC
665
677
  =======================================================================-->
666
678
 
667
- <fingerprint pattern="^APC - (\d+-port IP KVM) - version: V_(\S+) .*$">
679
+ <fingerprint pattern="^APC - (\d+-port IP KVM) - version: V_(\S+)">
668
680
  <description>APC KVM over IP</description>
669
681
  <example>APC - 16-port IP KVM - version: V_2.0.0-2 (Oct/17/06)</example>
670
682
  <param pos="0" name="os.vendor" value="APC"/>
@@ -674,7 +686,7 @@
674
686
  <param pos="2" name="os.version"/>
675
687
  </fingerprint>
676
688
 
677
- <fingerprint pattern="^APC Embedded PowerNet SNMP Agent \(.*SW v([^,]+),.*M[oO][dD]:\s*([^,]+),.*$">
689
+ <fingerprint pattern="^APC Embedded PowerNet SNMP Agent \(.*SW v([^,]+),.*M[oO][dD]:\s*([^,]+),">
678
690
  <description>APC Embedded PowerNet</description>
679
691
  <example>APC Embedded PowerNet SNMP Agent (FW v3.0.2 SW v2.2.4.a, HW ged~, MOD: AP9605, Mfg: 06/24/1998, SN: X)</example>
680
692
  <example>APC Embedded PowerNet SNMP Agent (SW v2.0.3, HW v2.0B, Mod: AP9206, Mfg 06/22/94, SN: A94063028359)</example>
@@ -684,7 +696,7 @@
684
696
  <param pos="2" name="os.product"/>
685
697
  </fingerprint>
686
698
 
687
- <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+).*$">
699
+ <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+)">
688
700
  <description>APC UPS</description>
689
701
  <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>
690
702
  <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>
@@ -727,7 +739,7 @@
727
739
  <param pos="1" name="os.version"/>
728
740
  </fingerprint>
729
741
 
730
- <fingerprint pattern="^Apple AirPort - Apple (?:Inc\.|Computer).*$">
742
+ <fingerprint pattern="^Apple AirPort - Apple (?:Inc\.|Computer)">
731
743
  <description>Apple Airport Extreme</description>
732
744
  <example>Apple AirPort - Apple Inc., 2006-2009. All rights Reserved.</example>
733
745
  <example>Apple AirPort - Apple Computer, 2006. All rights Reserved</example>
@@ -793,7 +805,7 @@
793
805
  <param pos="1" name="os.version"/>
794
806
  </fingerprint>
795
807
 
796
- <fingerprint pattern="^Avaya (AP-\d+|AP4\-AP5\-AP6|Wireless Outdoor Router|Wireless AP\-3)\s*[vV](\S+).*$">
808
+ <fingerprint pattern="^Avaya (AP-\d+|AP4\-AP5\-AP6|Wireless Outdoor Router|Wireless AP\-3)\s*[vV](\S+)">
797
809
  <description>Avaya WAP</description>
798
810
  <example>Avaya AP-3 v2.5.3(914) SN-02UT44560476 v2.0.10</example>
799
811
  <example>Avaya AP-8 v2.6.0(914) SN-06UT27560151 v3.1.0</example>
@@ -809,7 +821,7 @@
809
821
  <param pos="2" name="os.version"/>
810
822
  </fingerprint>
811
823
 
812
- <fingerprint pattern="^Avaya (?:Inc\.\s*\-\s*)?([^,]+?)[\s,]*SW version (\S+).*$">
824
+ <fingerprint pattern="^Avaya (?:Inc\.\s*\-\s*)?([^,]+?)[\s,]*SW version (\S+)">
813
825
  <description>Avaya Switch</description>
814
826
  <example os.product="C360" os.version="4.3.12">Avaya Inc. - C360 , SW version 4.3.12 , CS 1.1</example>
815
827
  <example os.product="C360 Stackable Switch" os.version="4.5.14">Avaya Inc.- C360 Stackable Switch, SW version 4.5.14</example>
@@ -820,7 +832,7 @@
820
832
  <param pos="2" name="os.version"/>
821
833
  </fingerprint>
822
834
 
823
- <fingerprint pattern="^Avaya Inc\., (.* Media Gateway), SW Version (\S+).*$">
835
+ <fingerprint pattern="^Avaya Inc\., (.* Media Gateway), SW Version (\S+)">
824
836
  <description>Avaya Media Gateway</description>
825
837
  <example>Avaya Inc., G250 Media Gateway, SW Version 25.28.0</example>
826
838
  <example>Avaya Inc., G250-BRI Media Gateway, SW Version 25.28.0</example>
@@ -925,7 +937,7 @@
925
937
  AVERY DENNISON
926
938
  =======================================================================-->
927
939
 
928
- <fingerprint pattern="^Monarch (?:M\d+ FW Ver \d+\.\d / )?(\d+) (?:Print|Network) Adapter.*$">
940
+ <fingerprint pattern="^Monarch (?:M\d+ FW Ver \d+\.\d / )?(\d+) (?:Print|Network) Adapter">
929
941
  <description>Avery Dennison Monarch barcode printers</description>
930
942
  <example>Monarch 7411 Print Adapter</example>
931
943
  <example>Monarch 7410 Print Adapter compatible with an HP JETDIRECT EX</example>
@@ -994,7 +1006,7 @@
994
1006
  BLUE COAT
995
1007
  =======================================================================-->
996
1008
 
997
- <fingerprint pattern="^Blue Coat (SG\S+)(?: Series)?,.*\s+SGOS ([^,]+), Release id:\s*(\S+).*$">
1009
+ <fingerprint pattern="^Blue Coat (SG\S+)(?: Series)?,.*\s+SGOS ([^,]+), Release id:\s*(\S+)">
998
1010
  <description>Blue Coat Proxy SG</description>
999
1011
  <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>
1000
1012
  <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>
@@ -1007,7 +1019,7 @@
1007
1019
  <param pos="3" name="os.version.version"/>
1008
1020
  </fingerprint>
1009
1021
 
1010
- <fingerprint pattern="^Blue Coat (AV\S+)(?: Series)?, ProxyAV Version: ([^,]+). Release id:\s*(\S+).*$">
1022
+ <fingerprint pattern="^Blue Coat (AV\S+)(?: Series)?, ProxyAV Version: ([^,]+). Release id:\s*(\S+)">
1011
1023
  <description>Blue Coat ProxyAV</description>
1012
1024
  <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>
1013
1025
  <param pos="0" name="os.vendor" value="Blue Coat"/>
@@ -1039,7 +1051,7 @@
1039
1051
  <param pos="0" name="os.vendor" value="Brocade"/>
1040
1052
  <param pos="0" name="os.product" value="Fabric OS"/>
1041
1053
  <param pos="0" name="os.device" value="Switch"/>
1042
- <param pos="0" name="os.cpe23" value="cpe:/o:broadcom:fabric_operating_system:-"/>
1054
+ <param pos="0" name="os.cpe23" value="cpe:/o:brocade:fabric_operating_system:-"/>
1043
1055
  <param pos="0" name="hw.vendor" value="Brocade"/>
1044
1056
  <param pos="0" name="hw.device" value="Switch"/>
1045
1057
  </fingerprint>
@@ -1055,7 +1067,7 @@
1055
1067
  <param pos="0" name="hw.vendor" value="Brocade"/>
1056
1068
  </fingerprint>
1057
1069
 
1058
- <fingerprint pattern="^Brocade (?:Communications? Systems, Inc\. )?([^,\(]+)(?: \([^\)]+\))?,(?: Extended route scalability,)? IronWare Version V?(\S+) .*$">
1070
+ <fingerprint pattern="^Brocade (?:Communications? Systems, Inc\. )?([^,\(]+)(?: \([^\)]+\))?,(?: Extended route scalability,)? IronWare Version V?(\S+)">
1059
1071
  <description>Brocade IronWare</description>
1060
1072
  <example>Brocade Communications Systems, Inc. BigIron RX, IronWare Version V2.7.3aT143 Compiled on Jan 07 2011 at 19:37:41 labeled as V2.7.03a</example>
1061
1073
  <example>Brocade Communications Systems, Inc. FESX424-PREM, IronWare Version 07.0.01bT3e3 Compiled on Mar 17 2010 at 23:02:11 labeled as SXR07001b</example>
@@ -1127,7 +1139,7 @@
1127
1139
  BROTHER
1128
1140
  =======================================================================-->
1129
1141
 
1130
- <fingerprint pattern="^SP NC-[^,]+, Firmware Ver\.(\S+).*$">
1142
+ <fingerprint pattern="^SP NC-[^,]+, Firmware Ver\.(\S+)">
1131
1143
  <description>Brother multifunction device</description>
1132
1144
  <example>SP NC-6300h, Firmware Ver.B ,MID 5CS-157</example>
1133
1145
  <example>SP NC-6300h, Firmware Ver.C ,MID 5CS-157</example>
@@ -1137,7 +1149,7 @@
1137
1149
  <param pos="1" name="os.version"/>
1138
1150
  </fingerprint>
1139
1151
 
1140
- <fingerprint pattern="^Brother (NC-\d+\S+),\s*Firmware Ver\.\s?([^\s,]+).*">
1152
+ <fingerprint pattern="^Brother (NC-\d+\S+),\s*Firmware Ver\.\s?([^\s,]+)">
1141
1153
  <description>Brother multifunction device - variant 1</description>
1142
1154
  <example>Brother NC-130h, Firmware Ver.0.09 ,MID 8CA-A17-001</example>
1143
1155
  <example>Brother NC-6800h, Firmware Ver.1.04 (09.05.08),MID 8C5-D61,FID 2</example>
@@ -1396,7 +1408,7 @@
1396
1408
  Computer Associates
1397
1409
  =======================================================================-->
1398
1410
 
1399
- <fingerprint pattern="^(?:Linux )?\s{0,256}SystemEDGE.*$">
1411
+ <fingerprint pattern="^(?:Linux )?\s{0,256}SystemEDGE">
1400
1412
  <description>CA SystemEDGE Management Agent</description>
1401
1413
  <example>Linux SystemEDGE Management Agent, Concord Communications, Inc.</example>
1402
1414
  <example>SystemEDGE Management Agent, CA, Inc.</example>
@@ -1591,7 +1603,7 @@
1591
1603
  <param pos="0" name="hw.cpe23" value="cpe:/h:cisco:adaptive_security_appliance:-"/>
1592
1604
  </fingerprint>
1593
1605
 
1594
- <fingerprint pattern="^Cisco 761 Software Version (.*) -.*$">
1606
+ <fingerprint pattern="^Cisco 761 Software Version (.*) -">
1595
1607
  <description>Cisco 761</description>
1596
1608
  <example>Cisco 761 Software Version c760-i.b.NET3 4.2(3) - Aug 21 1998 17:05:41 ISDN Stack Revision NET3 2.10</example>
1597
1609
  <param pos="0" name="os.certainty" value="0.85"/>
@@ -1602,7 +1614,7 @@
1602
1614
  <param pos="1" name="os.version"/>
1603
1615
  </fingerprint>
1604
1616
 
1605
- <fingerprint pattern="^Cisco Systems, Inc\./VPN 3000 Concentrator(?: Series)? Version (\S+) built.*$">
1617
+ <fingerprint pattern="^Cisco Systems, Inc\./VPN 3000 Concentrator(?: Series)? Version (\S+) built">
1606
1618
  <description>Cisco VPN 3000 Concentrator</description>
1607
1619
  <example>Cisco Systems, Inc./VPN 3000 Concentrator Series Version 3.0.2.Rel built by vmurphy on Apr 05 2001 21:41:33</example>
1608
1620
  <example>Cisco Systems, Inc./VPN 3000 Concentrator Version 4.1.3.Rel built by vmurphy on Apr 12 2004 04:06:15</example>
@@ -1770,7 +1782,7 @@ Copyright (c) 1995-2005 by Cisco Systems
1770
1782
  <param pos="2" name="os.version"/>
1771
1783
  </fingerprint>
1772
1784
 
1773
- <fingerprint pattern="^Cisco (NX-OS|SAN-OS)\(tm\) ([^,]+), Software \([^\)]+\), Version ([^\,]+), .* Cisco Systems.*$">
1785
+ <fingerprint pattern="^Cisco (NX-OS|SAN-OS)\(tm\) ([^,]+), Software \([^\)]+\), Version ([^\,]+), .* Cisco Systems">
1774
1786
  <description>Cisco NX-OS/SAN-OS</description>
1775
1787
  <example>Cisco NX-OS(tm) cgr1000, Software (cgr1000-uk9), Version 5.2(1)CG2(1), Interim version 5.2(1)CG2(0.167, RELEASE SOFTWARE Copyright (c) 2002-2011 by Cisco Systems, Inc. Compiled 1/1/2012 1:00:00</example>
1776
1788
  <example>Cisco NX-OS(tm) m9100, Software (m9100-s2ek9-mz), Version 5.0(4), RELEASE SOFTWARE Copyright (c) 2002-2010 by Cisco Systems, Inc. Compiled 7/26/2010 15:00:00</example>
@@ -1794,6 +1806,24 @@ Copyright (c) 1995-2005 by Cisco Systems
1794
1806
  <param pos="0" name="os.product" value="Wireless Controller"/>
1795
1807
  </fingerprint>
1796
1808
 
1809
+ <!--======================================================================
1810
+ Crestron
1811
+ =======================================================================-->
1812
+
1813
+ <fingerprint pattern="^Crestron Electronics (AM-\d+) \(Version ([\d.]+)\)">
1814
+ <description>Crestron AirMedia</description>
1815
+ <example os.version="2.4.2.1" hw.product="AM-100">Crestron Electronics AM-100 (Version 2.4.2.1)</example>
1816
+ <param pos="0" name="os.vendor" value="Crestron"/>
1817
+ <param pos="0" name="os.family" value="Linux"/>
1818
+ <param pos="0" name="os.product" value="Linux"/>
1819
+ <param pos="2" name="os.version"/>
1820
+ <param pos="0" name="os.certainty" value="0.95"/>
1821
+ <param pos="0" name="hw.vendor" value="Crestron"/>
1822
+ <param pos="1" name="hw.product"/>
1823
+ <param pos="0" name="hw.device" value="Video Conferencing"/>
1824
+ <param pos="0" name="hw.certainty" value="0.95"/>
1825
+ </fingerprint>
1826
+
1797
1827
  <!--======================================================================
1798
1828
  Cobox
1799
1829
  =======================================================================-->
@@ -1827,7 +1857,7 @@ Copyright (c) 1995-2005 by Cisco Systems
1827
1857
  Compuprint
1828
1858
  =======================================================================-->
1829
1859
 
1830
- <fingerprint pattern="^(SP\d+)\s.*">
1860
+ <fingerprint pattern="^(SP\d+)\s">
1831
1861
  <description>Compuprint SP series printers</description>
1832
1862
  <example>SP40 </example>
1833
1863
  <param pos="0" name="os.vendor" value="Compuprint"/>
@@ -1881,7 +1911,7 @@ Copyright (c) 1995-2005 by Cisco Systems
1881
1911
  DATAMAX
1882
1912
  =======================================================================-->
1883
1913
 
1884
- <fingerprint pattern="^Datamax Corporation I-Class (\S+) Ver:(\S+) .*$">
1914
+ <fingerprint pattern="^Datamax Corporation I-Class (\S+) Ver:(\S+)">
1885
1915
  <description>Datamax I-Class printer</description>
1886
1916
  <example>Datamax Corporation I-Class 4208 Ver:08.01 01/14/2004 PN:83-2297-08B</example>
1887
1917
  <example>Datamax Corporation I-Class 4208 Ver:08.038 11/16/2004 PN:83-2297-08D8</example>
@@ -1893,7 +1923,7 @@ Copyright (c) 1995-2005 by Cisco Systems
1893
1923
  <param pos="2" name="os.version"/>
1894
1924
  </fingerprint>
1895
1925
 
1896
- <fingerprint pattern="^Datamax (?:Printer|.*Print Server).*$">
1926
+ <fingerprint pattern="^Datamax (?:Printer|.*Print Server)">
1897
1927
  <description>Datamax printer</description>
1898
1928
  <example>Datamax DMXrfNet Print Server compatible with an HP JETDIRECT EX</example>
1899
1929
  <example>Datamax Printer</example>
@@ -1934,7 +1964,7 @@ Copyright (c) 1995-2005 by Cisco Systems
1934
1964
  <param pos="1" name="os.product"/>
1935
1965
  </fingerprint>
1936
1966
 
1937
- <fingerprint pattern="^Dell (\d{4}[cd]?n) (?:Laser )?MFP.*$">
1967
+ <fingerprint pattern="^Dell (\d{4}[cd]?n) (?:Laser )?MFP">
1938
1968
  <description>Dell MFP Laser Printer</description>
1939
1969
  <example>Dell 2135cn MFP; Net 12.10, Controller 200903191302, Engine 03.00.10</example>
1940
1970
  <example>Dell 2335dn MFP; 2.70.03.02;Engine 1.10.65;NIC V4.01.30(2335dn MFP) 02-05-2010;S/N JQF9FG1</example>
@@ -1945,7 +1975,7 @@ Copyright (c) 1995-2005 by Cisco Systems
1945
1975
  <param pos="1" name="os.product"/>
1946
1976
  </fingerprint>
1947
1977
 
1948
- <fingerprint pattern="^Dell(?:.*Laser.*)? (\w*\d{4}cn)(?:.*Net |; V)(\S+)(?:,| ).*$">
1978
+ <fingerprint pattern="^Dell(?:.*Laser.*)? (\w*\d{4}cn)(?:.*Net |; V)(\S+)(?:,| )">
1949
1979
  <description>Dell Color Laser Printer</description>
1950
1980
  <example>Dell Laser Printer 5100cn (Net 6.26, Controller 200408201123, Engine 01.00.04)</example>
1951
1981
  <example>Dell Color Laser 3110cn; Net 8.29, Controller 200604102121, Engine 05.03.00</example>
@@ -1959,7 +1989,7 @@ Copyright (c) 1995-2005 by Cisco Systems
1959
1989
  <param pos="2" name="os.version"/>
1960
1990
  </fingerprint>
1961
1991
 
1962
- <fingerprint pattern="^Dell Laser Printer (\S+) version (\S+).*$">
1992
+ <fingerprint pattern="^Dell Laser Printer (\S+) version (\S+)">
1963
1993
  <description>Dell Laser Printer</description>
1964
1994
  <example>Dell Laser Printer 1720dn version NM.NA.N099 kernel 2.6.10 All-N-1</example>
1965
1995
  <example>Dell Laser Printer 5210n version NS.NP.N212 kernel 2.6.6 All-N-1</example>
@@ -1971,7 +2001,7 @@ Copyright (c) 1995-2005 by Cisco Systems
1971
2001
  <param pos="2" name="os.version"/>
1972
2002
  </fingerprint>
1973
2003
 
1974
- <fingerprint pattern="^Dell (\S+)(?: Mono)? Laser Printer(?:;| version) \S+;?.*$">
2004
+ <fingerprint pattern="^Dell (\S+)(?: Mono)? Laser Printer(?:;| version) \S+;?">
1975
2005
  <description>Dell Laser Printer - variant 1</description>
1976
2006
  <example>Dell 2330dn Laser Printer version NR.APS.N449 kernel 2.6.18.5 All-N-1</example>
1977
2007
  <example>Dell 2350dn Laser Printer version NR.APS.N449 kernel 2.6.18.5 All-N-1</example>
@@ -2016,7 +2046,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2016
2046
  <param pos="2" name="os.version"/>
2017
2047
  </fingerprint>
2018
2048
 
2019
- <fingerprint pattern="^Digi International (PortServer II) v(\S+) .*$">
2049
+ <fingerprint pattern="^Digi International (PortServer II) v(\S+)">
2020
2050
  <description>Digi Serial PortServer II</description>
2021
2051
  <example>Digi International PortServer II v3.1.12 Jan 21 2003</example>
2022
2052
  <param pos="0" name="os.vendor" value="Digi"/>
@@ -2081,7 +2111,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2081
2111
  EATON
2082
2112
  =======================================================================-->
2083
2113
 
2084
- <fingerprint pattern="^(Evolution(?: S )?(?:\s*\d+)?).*$">
2114
+ <fingerprint pattern="^(Evolution(?: S )?(?:\s*\d+)?)">
2085
2115
  <description>Eaton Evolution UPS</description>
2086
2116
  <example>Evolution 1100</example>
2087
2117
  <example>Evolution 1500</example>
@@ -2266,7 +2296,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2266
2296
 
2267
2297
  <!-- Sneaky. The XOS uses both Zero and Oh depending on version -->
2268
2298
 
2269
- <fingerprint pattern="Extreme(?:X[0O]S|Ware X[0O]S) (?:\S+ )?version (\S+) \S+ by \S+ on .*$">
2299
+ <fingerprint pattern="Extreme(?:X[0O]S|Ware X[0O]S) (?:\S+ )?version (\S+) \S+ by \S+ on">
2270
2300
  <description>Extreme Networks Switches</description>
2271
2301
  <example>ExtremeWare X0S version 11.2.0.15 v1120b15 by release-manager on Fri Apr 1 18:40:23 PST 2005</example>
2272
2302
  <example>ExtremeXOS version 11.6.3.5 v1163b5 by release-manager on Sun Sep 9 10:46:16 PDT 2007</example>
@@ -2281,7 +2311,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2281
2311
  Foundry Networks
2282
2312
  =======================================================================-->
2283
2313
 
2284
- <fingerprint pattern="^Foundry Networks, Inc\. ([^,]+), (?:IronWare|Iron Software) Version V?(\S+) Compiled .*$">
2314
+ <fingerprint pattern="^Foundry Networks, Inc\. ([^,]+), (?:IronWare|Iron Software) Version V?(\S+) Compiled">
2285
2315
  <description>Foundry Networks IronWare Switches</description>
2286
2316
  <example>Foundry Networks, Inc. Backbone, IronWare Version 06.6.36T41 Compiled on Jul 20 2001 at 21:38:29 labeled as BIS06636</example>
2287
2317
  <example>Foundry Networks, Inc. BigIron 15000 Router, IronWare Version 08.0.01vT53 Compiled on Feb 26 2010 at 20:07:21 labeled as B2P08001v</example>
@@ -2351,7 +2381,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2351
2381
  FUJI XEROX
2352
2382
  =======================================================================-->
2353
2383
 
2354
- <fingerprint pattern="^FUJI XEROX ((?:Document Centre|DocuCentre-\S+) [^\s;]+).*$">
2384
+ <fingerprint pattern="^FUJI XEROX ((?:Document Centre|DocuCentre-\S+) [^\s;]+)">
2355
2385
  <description>Xerox Document Centre Multi-function System - Fuji variant</description>
2356
2386
  <example>FUJI XEROX Document Centre C360;ESS 1.131.11,IOT 6.6.5,IIT 12.7.0,IIT D12.0.0,ADF 10.3.0,FAX 11.20.50</example>
2357
2387
  <example>FUJI XEROX Document Centre C400 v 2. 0. 6</example>
@@ -2363,7 +2393,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2363
2393
  <param pos="1" name="os.product"/>
2364
2394
  </fingerprint>
2365
2395
 
2366
- <fingerprint pattern="^FUJI XEROX (\S+ [^\s;]+).*$">
2396
+ <fingerprint pattern="^FUJI XEROX (\S+ [^\s;]+)">
2367
2397
  <description>FUJI Xerox default</description>
2368
2398
  <example>FUJI XEROX ApeosPort-II C4300 ;ESS 1.121.8,IOT 3.8.2,IIT 7.6.0,ADF 11.6.3,FAX 11.20.53</example>
2369
2399
  <param pos="0" name="os.vendor" value="Fuji Xerox"/>
@@ -2439,7 +2469,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2439
2469
  <param pos="1" name="hw.product"/>
2440
2470
  </fingerprint>
2441
2471
 
2442
- <fingerprint pattern="^HP-UX (\S+) (\S+) .*$">
2472
+ <fingerprint pattern="^HP-UX (\S+) (\S+)">
2443
2473
  <description>HP-UX</description>
2444
2474
  <example>HP-UX hostname B.10.20 A 9000/820 2006447661</example>
2445
2475
  <param pos="0" name="os.vendor" value="HP"/>
@@ -2450,7 +2480,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2450
2480
  <param pos="0" name="os.cpe23" value="cpe:/o:hp:hp-ux:{os.version}"/>
2451
2481
  </fingerprint>
2452
2482
 
2453
- <fingerprint pattern="^(\S{1,512}) .*OpenVMS V(\S+) .*$">
2483
+ <fingerprint pattern="^(\S{1,512}) .*OpenVMS V(\S+)">
2454
2484
  <description>OpenVMS</description>
2455
2485
  <example host.name="hostname">hostname VAX 4000-200 OpenVMS V7.2 Compaq TCP/IP Services for OpenVMS</example>
2456
2486
  <param pos="0" name="os.vendor" value="HP"/>
@@ -2504,7 +2534,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2504
2534
  <param pos="2" name="os.version"/>
2505
2535
  </fingerprint>
2506
2536
 
2507
- <fingerprint pattern="^HP3000 SERIES ([^,]+), MPE XL version (\S+) NS Transport .*$">
2537
+ <fingerprint pattern="^HP3000 SERIES ([^,]+), MPE XL version (\S+) NS Transport">
2508
2538
  <description>HP3000 MPEi/X</description>
2509
2539
  <example>HP3000 SERIES 918RX, MPE XL version C.75.00 NS Transport version B.07.05</example>
2510
2540
  <example>HP3000 SERIES 928RX, MPE XL version C.60.00 NS Transport version B.06.00</example>
@@ -2532,7 +2562,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2532
2562
  <param pos="2" name="os.version"/>
2533
2563
  </fingerprint>
2534
2564
 
2535
- <fingerprint pattern="^HP Comware Platform Software Comware Software Version ([^\s,]+)[,\s]\s*(?:Release|Alpha|Beta)\s*(\S+) HP (\S+) Router .*$">
2565
+ <fingerprint pattern="^HP Comware Platform Software Comware Software Version ([^\s,]+)[,\s]\s*(?:Release|Alpha|Beta)\s*(\S+) HP (\S+) Router">
2536
2566
  <description>HP Comware</description>
2537
2567
  <example>HP Comware Platform Software Comware Software Version 5.20,Release 2603P08 HP A6602 Router Copyright(c) 2010-2011 Hewlett-Packard Development Company, L.P.</example>
2538
2568
  <example>HP Comware Platform Software Comware Software Version 5.20,Release 2603P08 HP A6608 Router Copyright(c) 2010-2011 Hewlett-Packard Development Company, L.P.</example>
@@ -2545,7 +2575,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2545
2575
  <param pos="2" name="os.version.version"/>
2546
2576
  </fingerprint>
2547
2577
 
2548
- <fingerprint pattern="^HP Series Router (\S+) HP Comware Platform Software Comware Software Version ([^\s,]+)[,\s]\s*Release ([^,\s]+)?[,\s].*Copyright.*$">
2578
+ <fingerprint pattern="^HP Series Router (\S+) HP Comware Platform Software Comware Software Version ([^\s,]+)[,\s]\s*Release ([^,\s]+)?[,\s].*Copyright">
2549
2579
  <description>HP Comware - variant 1</description>
2550
2580
  <example hw.product="A-MSR20-40" os.version="5.20" os.version.version="2209P15">HP Series Router A-MSR20-40 HP Comware Platform Software Comware Software Version 5.20, Release 2209P15, Standard Copyright(c) 2010-2012 Hewlett-Packard Development Company, L.P.</example>
2551
2581
  <example>HP Series Router A-MSR30-20 HP Comware Platform Software Comware Software Version 5.20, Release 2207P41, Standard Copyright(c) 2010 Hewlett-Packard Development Company, L.P.</example>
@@ -2559,7 +2589,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2559
2589
  <param pos="3" name="os.version.version"/>
2560
2590
  </fingerprint>
2561
2591
 
2562
- <fingerprint pattern="^HP Series Router (\S+) HP Comware Platform Software Comware Software Version ([^,]+), (\S+) Copyright.*$">
2592
+ <fingerprint pattern="^HP Series Router (\S+) HP Comware Platform Software Comware Software Version ([^,]+), (\S+) Copyright">
2563
2593
  <description>HP Comware - variant 2</description>
2564
2594
  <example hw.product="A-MSR20-40" os.version="5.20" os.version.version="T2207L16">HP Series Router A-MSR20-40 HP Comware Platform Software Comware Software Version 5.20, T2207L16 Copyright(c) 2010-2011 Hewlett-Packard Development Company, L.P.</example>
2565
2595
  <param pos="0" name="os.vendor" value="HP"/>
@@ -2571,7 +2601,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2571
2601
  <param pos="1" name="hw.product"/>
2572
2602
  </fingerprint>
2573
2603
 
2574
- <fingerprint pattern="^HP Comware Platform Software, Software Version ([^\s,]+)[,\s]\s*(?:Release|Alpha|Beta)\s*(\S+) HP (\S+) (?:SI|EI|Switch|Copyright|v\d) .*$">
2604
+ <fingerprint pattern="^HP Comware Platform Software, Software Version ([^\s,]+)[,\s]\s*(?:Release|Alpha|Beta)\s*(\S+) HP (\S+) (?:SI|EI|Switch|Copyright|v\d)">
2575
2605
  <description>HP Comware - variant 3</description>
2576
2606
  <example>HP Comware Platform Software, Software Version 5.20 Release 2208 HP A5500-24G SI Switch with 2 Interface Slots Copyright (c) 2010-2011 Hewlett-Packard Development Company, L.P.</example>
2577
2607
  <example>HP Comware Platform Software, Software Version 5.20 Release 2208 HP A5500-48G EI Switch with 2 Interface Slots Copyright (c) 2010-2011 Hewlett-Packard Development Company, L.P.</example>
@@ -2622,7 +2652,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2622
2652
  <param pos="1" name="hw.product"/>
2623
2653
  </fingerprint>
2624
2654
 
2625
- <fingerprint pattern="^HP (V1910\S+) (?:\(.*?\) )?Switch Software Version (\S+).? Release (\S+) Copyright.*$">
2655
+ <fingerprint pattern="^HP (V1910\S+) (?:\(.*?\) )?Switch Software Version (\S+).? Release (\S+) Copyright">
2626
2656
  <description>HP Switch</description>
2627
2657
  <example>HP V1910-16G Switch Software Version 5.20 Release 1108 Copyright (c) 2004-2011 Hewlett-Packard Development Company, L.P.</example>
2628
2658
  <example>HP V1910-16G Switch Software Version 5.20, Release 1511 Copyright(c) 2010-2012 HP Tech. Co., Ltd. All rights reserved.</example>
@@ -2643,7 +2673,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2643
2673
  <param pos="3" name="os.version.version"/>
2644
2674
  </fingerprint>
2645
2675
 
2646
- <fingerprint pattern="^HP (V1905\S+) Switch Product Version (\S+) Copyright.*$">
2676
+ <fingerprint pattern="^HP (V1905\S+) Switch Product Version (\S+) Copyright">
2647
2677
  <description>HP Switch - product version variant</description>
2648
2678
  <example>HP V1905-24 Switch Product Version 02.00.01 Copyright (c) 2011 Hewlett-Packard Development Company, L.P All rights Reserved.</example>
2649
2679
  <example>HP V1905-24-PoE Switch Product Version 02.00.01 Copyright (c) 2011 Hewlett-Packard Development Company, L.P All rights Reserved.</example>
@@ -2656,7 +2686,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2656
2686
  <param pos="1" name="hw.product"/>
2657
2687
  </fingerprint>
2658
2688
 
2659
- <fingerprint pattern="^Hewlett-Packard Company (\S+) HP ProCurve Routing Switch.*Software Version (\S+) .*$">
2689
+ <fingerprint pattern="^Hewlett-Packard Company (\S+) HP ProCurve Routing Switch.*Software Version (\S+)">
2660
2690
  <description>HP ProCurve Routing Switch - build data variant</description>
2661
2691
  <example>Hewlett-Packard Company J4139A HP ProCurve Routing Switch 9304M, Software Version 08.0.01kT53 Compiled on Apr 27 2007 at 18:55:59 labeled as H2R08001k</example>
2662
2692
  <param pos="0" name="os.vendor" value="HP"/>
@@ -2666,7 +2696,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2666
2696
  <param pos="2" name="os.version"/>
2667
2697
  </fingerprint>
2668
2698
 
2669
- <fingerprint pattern="^HP (J\S+) ProCurve Switch.*, revision (\S+),.*$">
2699
+ <fingerprint pattern="^HP (J\S+) ProCurve Switch.*, revision (\S+),">
2670
2700
  <description>HP ProCurve Routing Switch</description>
2671
2701
  <example>HP J4813A ProCurve Switch 2524, revision F.05.34, ROM F.02.01 (/sw/code/build/info(s02))</example>
2672
2702
  <example>HP J4121A ProCurve Switch 4000M, revision C.09.28, ROM C.06.01 (/sw/code/build/vgro(c09))</example>
@@ -2677,7 +2707,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2677
2707
  <param pos="2" name="os.version"/>
2678
2708
  </fingerprint>
2679
2709
 
2680
- <fingerprint pattern="^ProCurve (J\S+) Switch.*, revision (\S+),.*$">
2710
+ <fingerprint pattern="^ProCurve (J\S+) Switch.*, revision (\S+),">
2681
2711
  <description>HP ProCurve Switch - HP prefix and build path variant</description>
2682
2712
  <example>ProCurve J4900B Switch 2626, revision H.08.98, ROM H.08.02 (/sw/code/build/fish(ts_08_5))</example>
2683
2713
  <param pos="0" name="os.vendor" value="HP"/>
@@ -2687,7 +2717,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2687
2717
  <param pos="2" name="os.version"/>
2688
2718
  </fingerprint>
2689
2719
 
2690
- <fingerprint pattern="^HP ProCurve (\S+) - \d+ GE, ([A-Z]{1,2}\.[^,]+), .*$">
2720
+ <fingerprint pattern="^HP ProCurve (\S+) - \d+ GE, ([A-Z]{1,2}\.[^,]+),">
2691
2721
  <description>HP ProCurve Switch - HP prefix variant</description>
2692
2722
  <example os.product="1810G" os.version="H.1.2">HP ProCurve 1810G - 8 GE, H.1.2, eCos-2.0</example>
2693
2723
  <example>HP ProCurve 1810G - 24 GE, P.1.14, eCos-2.0</example>
@@ -2699,7 +2729,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2699
2729
  <param pos="2" name="os.version"/>
2700
2730
  </fingerprint>
2701
2731
 
2702
- <fingerprint pattern="^HP V1810\S+ ([A-Z]{1,2}\.[^,]+), .*$">
2732
+ <fingerprint pattern="^HP V1810\S+ ([A-Z]{1,2}\.[^,]+),">
2703
2733
  <description>HP Procurve 1810 Series Switch</description>
2704
2734
  <example os.version="PK.1.4">HP V1810-48G, PK.1.4, eCos-2.0, CFE-3.8</example>
2705
2735
  <param pos="0" name="os.vendor" value="HP"/>
@@ -2709,7 +2739,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2709
2739
  <param pos="1" name="os.version"/>
2710
2740
  </fingerprint>
2711
2741
 
2712
- <fingerprint pattern="^ProCurve (\S+) (.*?) Switch, revision ([^,]+),.*$">
2742
+ <fingerprint pattern="^ProCurve (\S+) (.*?) Switch, revision ([^,]+),">
2713
2743
  <description>HP ProCurve Switch - extended model variant</description>
2714
2744
  <example>ProCurve J9145A 2910al-24G Switch, revision W.14.03, ROM W.14.04 (/sw/code/build/sbm(t4a_RC3))</example>
2715
2745
  <example>ProCurve J9145A 2910al-24G Switch, revision W.14.30, ROM W.14.04 (/sw/code/build/sbm(t4a))</example>
@@ -2721,7 +2751,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2721
2751
  <param pos="1" name="hw.product"/>
2722
2752
  </fingerprint>
2723
2753
 
2724
- <fingerprint pattern="^ProCurve (\S+) Switch ([^,]+), revision ([^,]+),.*$">
2754
+ <fingerprint pattern="^ProCurve (\S+) Switch ([^,]+), revision ([^,]+),">
2725
2755
  <description>HP Switch - build path variant</description>
2726
2756
  <example>ProCurve j9020a Switch 2510-48, revision U.11.04, ROM R.10.06 (/sw/code/build/dosx(ndx))</example>
2727
2757
  <example>ProCurve j9020a Switch 2510-48, revision U.11.08, ROM R.10.06 (/sw/code/build/dosx(ndx))</example>
@@ -2734,7 +2764,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2734
2764
  <param pos="1" name="hw.product"/>
2735
2765
  </fingerprint>
2736
2766
 
2737
- <fingerprint pattern="^HP(\S+) HP ProCurve Switch ([^,]+), revision ([^,]+),.*$">
2767
+ <fingerprint pattern="^HP(\S+) HP ProCurve Switch ([^,]+), revision ([^,]+),">
2738
2768
  <description>HP ProCurve Switch - model first variant</description>
2739
2769
  <example>HPJ3298A HP ProCurve Switch 212M, revision D.05.04, ROM D.05.01 (/sw/code/build/srao(f98))</example>
2740
2770
  <example>HPJ4121A HP ProCurve Switch 4000M, revision C.05.04, ROM C.05.02 (/sw/code/build/vgro(f98))</example>
@@ -2746,7 +2776,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2746
2776
  <param pos="1" name="hw.product"/>
2747
2777
  </fingerprint>
2748
2778
 
2749
- <fingerprint pattern="^HP (\S+) (\S+) Switch, revision ([^,]+),.*$">
2779
+ <fingerprint pattern="^HP (\S+) (\S+) Switch, revision ([^,]+),">
2750
2780
  <description>HP Switch - rom variant</description>
2751
2781
  <example>HP J9145A E2910al-24G Switch, revision W.15.08.0007, ROM W.14.06 (/ws/swbuildm/rel_galt_qaoff/code/build/sbm(rel_galt_qaoff)) (Formerly ProCurve)</example>
2752
2782
  <example>HP J9623A E2620-24 Switch, revision RA.15.05.0006, ROM RA.15.10 (/sw/code/build/xform(RA_15_05)) (Formerly ProCurve)</example>
@@ -2759,7 +2789,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2759
2789
  <param pos="1" name="hw.product"/>
2760
2790
  </fingerprint>
2761
2791
 
2762
- <fingerprint pattern="^HP (\S+) Switch ([^,]+), revision ([^,]+),.*$">
2792
+ <fingerprint pattern="^HP (\S+) Switch ([^,]+), revision ([^,]+),">
2763
2793
  <description>HP Switch - extended model variant</description>
2764
2794
  <example>HP J8692A Switch E3500yl-24G, revision K.15.05.0002, ROM K.15.13 (/sw/code/build/btm(K_15_05)) (Formerly ProCurve)</example>
2765
2795
  <example>HP J8697A Switch E5406zl, revision K.15.06.0006, ROM K.15.19 (/sw/code/build/btm(K_15_06)) (Formerly ProCurve)</example>
@@ -2772,7 +2802,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2772
2802
  <param pos="1" name="hw.product"/>
2773
2803
  </fingerprint>
2774
2804
 
2775
- <fingerprint pattern="^HP(\S+) ProCurve \S+ Hub \d+M+, ROM ([^,]+),.*$">
2805
+ <fingerprint pattern="^HP(\S+) ProCurve \S+ Hub \d+M+, ROM ([^,]+),">
2776
2806
  <description>HP ProCurve Hub</description>
2777
2807
  <example>HPJ3288A ProCurve 10/100 Hub 12M, ROM A.01.00, EEPROM A.01.00, HW A.02.00</example>
2778
2808
  <example>HPJ3289A ProCurve 10/100 Hub 24M, ROM A.01.00, EEPROM A.01.00, HW A.02.00</example>
@@ -2798,7 +2828,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2798
2828
  <param pos="2" name="os.version"/>
2799
2829
  </fingerprint>
2800
2830
 
2801
- <fingerprint pattern="^HP Pro[cC]urve Access Point (\S+): v(\S+).*$">
2831
+ <fingerprint pattern="^HP Pro[cC]urve Access Point (\S+): v(\S+)">
2802
2832
  <description>HP ProCurve Wireless Access Point - serial number variant</description>
2803
2833
  <example>HP ProCurve Access Point 420: v2.1.5 v3.0.6</example>
2804
2834
  <example>HP Procurve Access Point 420: v2.0.38 v1.1.8 SN:TW517QB0VM</example>
@@ -2811,7 +2841,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2811
2841
  <param pos="2" name="os.version"/>
2812
2842
  </fingerprint>
2813
2843
 
2814
- <fingerprint pattern="^HP ProCurve AP (.*?)v(\d[0-9\.]+)\(.*SN-.*$">
2844
+ <fingerprint pattern="^HP ProCurve AP (.*?)v(\d[0-9\.]+)\(.*SN-">
2815
2845
  <description>HP ProCurve Wireless Access Point</description>
2816
2846
  <example>HP ProCurve AP 520wlv2.4.5(758) SN-PG44JL9CWY23 v2.0.10</example>
2817
2847
  <param pos="0" name="os.vendor" value="HP"/>
@@ -2821,7 +2851,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2821
2851
  <param pos="2" name="os.version"/>
2822
2852
  </fingerprint>
2823
2853
 
2824
- <fingerprint pattern="^ProCurve Access Point (\S+(?: \S+)) ([^,]+), revision ([^,]+),.*$">
2854
+ <fingerprint pattern="^ProCurve Access Point (\S+(?: \S+)) ([^,]+), revision ([^,]+),">
2825
2855
  <description>HP ProCurve Wireless Access Point - boot variant</description>
2826
2856
  <example>ProCurve Access Point 10ag WW J9141A, revision WM.01.11, boot version WAB.01.00</example>
2827
2857
  <example>ProCurve Access Point 530 NA J8986A, revision WA.02.15, boot version WAB.01.00</example>
@@ -2838,7 +2868,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2838
2868
  <param pos="2" name="hw.product"/>
2839
2869
  </fingerprint>
2840
2870
 
2841
- <fingerprint pattern="^ProCurve Secure Router ([^,]+), Version: ([^,]+),.*$">
2871
+ <fingerprint pattern="^ProCurve Secure Router ([^,]+), Version: ([^,]+),">
2842
2872
  <description>HP ProCurve Secure Router</description>
2843
2873
  <example>ProCurve Secure Router 7102dl, Version: 03.01, Date: Fri Aug 12 08:41:29 2005</example>
2844
2874
  <example>ProCurve Secure Router 7102dl, Version: 05.02, Date: Mon May 15 09:32:11 2006</example>
@@ -3041,7 +3071,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3041
3071
  <param pos="0" name="os.device" value="Print Server"/>
3042
3072
  </fingerprint>
3043
3073
 
3044
- <fingerprint pattern="^HP ETHERNET MULTI-ENVIRONMENT,ROM (\S+?),JETDIRECT(?: EX)?,(\w+),EEPROM.*$">
3074
+ <fingerprint pattern="^HP ETHERNET MULTI-ENVIRONMENT,ROM (\S+?),JETDIRECT(?: EX)?,(\w+),EEPROM">
3045
3075
  <description>HP JetDirect printer</description>
3046
3076
  <example>HP ETHERNET MULTI-ENVIRONMENT,ROM A.03.15,JETDIRECT,JD24,EEPROM A.04.09</example>
3047
3077
  <example>HP ETHERNET MULTI-ENVIRONMENT,ROM A.05.03,JETDIRECT,JD24,EEPROM A.05.05</example>
@@ -3133,7 +3163,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3133
3163
  IBM
3134
3164
  =======================================================================-->
3135
3165
 
3136
- <fingerprint pattern="^IBM RISC System/6000 .* Base Operating System AIX [^:]+: 03\.02\..*$">
3166
+ <fingerprint pattern="^IBM RISC System/6000 .* Base Operating System AIX [^:]+: 03\.02\.">
3137
3167
  <description>IBM AIX 3.2 on RS/6000</description>
3138
3168
  <example>IBM RISC System/6000 Machine Type: 0x0035 Processor id: 000018593500 The Base Operating System AIX version: 03.02.0000.0000 TCPIP Applications version: 03.02.0000.0000</example>
3139
3169
  <example>IBM RISC System/6000 Machine Type: 0x0100 Processor id: 000125576600 The Base Operating System AIX version: 03.02.0000.0000 TCPIP Applications version: 03.02.0000.0000</example>
@@ -3145,7 +3175,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3145
3175
  <param pos="0" name="os.cpe23" value="cpe:/o:ibm:aix:3.2"/>
3146
3176
  </fingerprint>
3147
3177
 
3148
- <fingerprint pattern="^RISC System/6000 .* Base Operating System Runtime AIX [^:]+: 04\.02\..*$">
3178
+ <fingerprint pattern="^RISC System/6000 .* Base Operating System Runtime AIX [^:]+: 04\.02\.">
3149
3179
  <description>IBM AIX 4.2 on RS/6000</description>
3150
3180
  <example>RISC System/6000 Architecture Machine Type: 0x0800 Processor id: 000148364800 Base Operating System Runtime AIX version: 04.02.0001.0000 TCP/IP Client Support version: 04.02.0001.0000</example>
3151
3181
  <param pos="0" name="os.vendor" value="IBM"/>
@@ -3156,7 +3186,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3156
3186
  <param pos="0" name="os.cpe23" value="cpe:/o:ibm:aix:4.2"/>
3157
3187
  </fingerprint>
3158
3188
 
3159
- <fingerprint pattern="^RISC System/6000 .* Base Operating System Runtime AIX [^:]+: 04\.03\..*$">
3189
+ <fingerprint pattern="^RISC System/6000 .* Base Operating System Runtime AIX [^:]+: 04\.03\.">
3160
3190
  <description>IBM AIX 4.3 on RS/6000</description>
3161
3191
  <example>RISC System/6000 Architecture Machine Type: 0x0400 Processor id: 000033407200 Base Operating System Runtime AIX version: 04.03.0003.0000 TCP/IP Client Support version: 04.03.0003.0000</example>
3162
3192
  <example>RISC System/6000 Architecture Machine Type: 0x0400 Processor id: 000055848900 Base Operating System Runtime AIX version: 04.03.0003.0075 TCP/IP Client Support version: 04.03.0003.0075</example>
@@ -3172,7 +3202,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3172
3202
  <param pos="0" name="os.cpe23" value="cpe:/o:ibm:aix:4.3"/>
3173
3203
  </fingerprint>
3174
3204
 
3175
- <fingerprint pattern="^(?:\S{1,1024} )?(?:Motorola PowerPC|IBM PowerPC|\S+ \S+ PowerPC IBM).*Base Operating System Runtime AIX [^:]+: 04\.02\..*$">
3205
+ <fingerprint pattern="^(?:\S{1,1000} )?(?:Motorola PowerPC|IBM PowerPC|\S+ \S+ PowerPC IBM).*Base Operating System Runtime AIX [^:]+: 04\.02\.">
3176
3206
  <description>IBM AIX 4.2 on PowerPC</description>
3177
3207
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 0040906A4C00 Base Operating System Runtime AIX version: 04.02.0001.0000 TCP/IP Client Support version: 04.02.0001.0000</example>
3178
3208
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 0044B47A4C00 Base Operating System Runtime AIX version: 04.02.0001.0000 TCP/IP Client Support version: 04.02.0001.0000</example>
@@ -3187,7 +3217,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3187
3217
  <param pos="0" name="os.cpe23" value="cpe:/o:ibm:aix:4.2"/>
3188
3218
  </fingerprint>
3189
3219
 
3190
- <fingerprint pattern="^(?:\S{1,1024} )?(?:Motorola PowerPC|IBM PowerPC|\S+ \S+ PowerPC IBM).*Base Operating System Runtime AIX [^:]+: 04\.03\..*$">
3220
+ <fingerprint pattern="^(?:\S{1,1000} )?(?:Motorola PowerPC|IBM PowerPC|\S+ \S+ PowerPC IBM).*Base Operating System Runtime AIX [^:]+: 04\.03\.">
3191
3221
  <description>IBM AIX 4.3 on PowerPC</description>
3192
3222
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 0056BD5A4C00 Base Operating System Runtime AIX version: 04.03.0003.0075 TCP/IP Client Support version: 04.03.0003.0075</example>
3193
3223
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 005A269A4C00 Base Operating System Runtime AIX version: 04.03.0003.0075 TCP/IP Client Support version: 04.03.0003.0075</example>
@@ -3204,7 +3234,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3204
3234
  <param pos="0" name="os.cpe23" value="cpe:/o:ibm:aix:4.3"/>
3205
3235
  </fingerprint>
3206
3236
 
3207
- <fingerprint pattern="^(?:\S{1,1024} )?(?:Motorola PowerPC|IBM PowerPC|\S+ \S+ PowerPC IBM).*Base Operating System Runtime AIX [^:]+: 05\.01\..*$">
3237
+ <fingerprint pattern="^(?:\S{1,1000} )?(?:Motorola PowerPC|IBM PowerPC|\S+ \S+ PowerPC IBM).*Base Operating System Runtime AIX [^:]+: 05\.01\.">
3208
3238
  <description>IBM AIX 5.1 on PowerPC</description>
3209
3239
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 0059B7BA4C00 Base Operating System Runtime AIX version: 05.01.0000.0051 TCP/IP Client Support version: 05.01.0000.0070</example>
3210
3240
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 009F12264C00 Base Operating System Runtime AIX version: 05.01.0000.0050 TCP/IP Client Support version: 05.01.0000.0050</example>
@@ -3227,7 +3257,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3227
3257
  <param pos="0" name="os.cpe23" value="cpe:/o:ibm:aix:5.1"/>
3228
3258
  </fingerprint>
3229
3259
 
3230
- <fingerprint pattern="^(?:\S{1,1024} )?(?:Motorola PowerPC|IBM PowerPC|\S+ \S+ PowerPC IBM).*Operating System Software: AIX version: 5\.1 Networking Software:.*$">
3260
+ <fingerprint pattern="^(?:\S{1,1000} )?(?:Motorola PowerPC|IBM PowerPC|\S+ \S+ PowerPC IBM).*Operating System Software: AIX version: 5\.1 Networking Software:">
3231
3261
  <description>IBM AIX 5.1 on PowerPC - network software variant</description>
3232
3262
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 0008FB8A4C00 Operating System Software: AIX version: 5.1 Networking Software: not available!</example>
3233
3263
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 000BD57F4C00 Operating System Software: AIX version: 5.1 Networking Software: not available!</example>
@@ -3239,7 +3269,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3239
3269
  <param pos="0" name="os.cpe23" value="cpe:/o:ibm:aix:5.1"/>
3240
3270
  </fingerprint>
3241
3271
 
3242
- <fingerprint pattern="^(?:\S{1,1024} )?(?:Motorola PowerPC|IBM PowerPC|\S+ \S+ PowerPC IBM).*Base Operating System Runtime AIX [^:]+: 05\.02\..*$">
3272
+ <fingerprint pattern="^(?:\S{1,1000} )?(?:Motorola PowerPC|IBM PowerPC|\S+ \S+ PowerPC IBM).*Base Operating System Runtime AIX [^:]+: 05\.02\.">
3243
3273
  <description>IBM AIX 5.2 on PowerPC</description>
3244
3274
  <example>IBM PowerPC CHRP Computer.Machine Type: 0x0800004c Processor id: 00C0E53F4C00.Base Operating System Runtime AIX version: 05.02.0000.0105.TCP/IP Client Support version: 05.02.0000.0107</example>
3245
3275
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 00CBEEFA4C00 Base Operating System Runtime AIX version: 05.02.0000.0075 TCP/IP Client Support version: 05.02.0000.0075</example>
@@ -3266,7 +3296,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3266
3296
  <param pos="0" name="os.cpe23" value="cpe:/o:ibm:aix:5.2"/>
3267
3297
  </fingerprint>
3268
3298
 
3269
- <fingerprint pattern="^(?:\S{1,1024} )?(?:Motorola PowerPC|IBM PowerPC|\S+ \S+ PowerPC IBM).*Base Operating System Runtime AIX [^:]+: 05\.03\..*$">
3299
+ <fingerprint pattern="^(?:\S{1,1000} )?(?:Motorola PowerPC|IBM PowerPC|\S+ \S+ PowerPC IBM).*Base Operating System Runtime AIX [^:]+: 05\.03\.">
3270
3300
  <description>IBM AIX 5.3 on PowerPC</description>
3271
3301
  <example>IBM PowerPC CHRP Computer.Machine Type: 0x0800004c Processor id: 000A3CD8D600.Base Operating System Runtime AIX version: 05.03.0000.0060.TCP/IP Client Support version: 05.03.0000.0063</example>
3272
3302
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 00F7BF9F4C00 Base Operating System Runtime AIX version: 05.03.0012.0001 TCP/IP Client Support version: 05.03.0012.0005</example>
@@ -3289,7 +3319,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3289
3319
  <param pos="0" name="os.cpe23" value="cpe:/o:ibm:aix:5.3"/>
3290
3320
  </fingerprint>
3291
3321
 
3292
- <fingerprint pattern="^(?:\S{1,1024} )?(?:Motorola PowerPC|IBM PowerPC|\S+ \S+ PowerPC IBM).*Base Operating System Runtime VIOS [^:]+: 05\.03\..*$">
3322
+ <fingerprint pattern="^(?:\S{1,1000} )?(?:Motorola PowerPC|IBM PowerPC|\S+ \S+ PowerPC IBM).*Base Operating System Runtime VIOS [^:]+: 05\.03\.">
3293
3323
  <description>IBM VIOS 5.3 on PowerPC</description>
3294
3324
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 00018C4AD400 Base Operating System Runtime VIOS version: 05.03.0008.0000 TCP/IP Client Support version: 05.03.0008.0000</example>
3295
3325
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 0002EBDAD700 Base Operating System Runtime VIOS version: 05.03.0008.0000 TCP/IP Client Support version: 05.03.0008.0001</example>
@@ -3303,10 +3333,9 @@ Copyright (c) 1995-2005 by Cisco Systems
3303
3333
  <param pos="0" name="os.version" value="5.3"/>
3304
3334
  <param pos="0" name="os.arch" value="PowerPC"/>
3305
3335
  <param pos="0" name="os.certainty" value="0.9"/>
3306
- <param pos="0" name="os.cpe23" value="cpe:/o:ibm:vios:5.3"/>
3307
3336
  </fingerprint>
3308
3337
 
3309
- <fingerprint pattern="^(?:\S{1,1024} )?(?:Motorola PowerPC|IBM PowerPC|\S+ \S+ PowerPC IBM).*Base Operating System Runtime AIX [^:]+: 06\.01\..*$">
3338
+ <fingerprint pattern="^(?:\S{1,1000} )?(?:Motorola PowerPC|IBM PowerPC|\S+ \S+ PowerPC IBM).*Base Operating System Runtime AIX [^:]+: 06\.01\.">
3310
3339
  <description>IBM AIX 6.1 on PowerPC</description>
3311
3340
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 00F77AEE4C00 Base Operating System Runtime AIX version: 06.01.0006.0015 TCP/IP Client Support version: 06.01.0006.0015</example>
3312
3341
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 00F77C9A4C00 Base Operating System Runtime AIX version: 06.01.0006.0015 TCP/IP Client Support version: 06.01.0006.0015</example>
@@ -3320,17 +3349,16 @@ Copyright (c) 1995-2005 by Cisco Systems
3320
3349
  <param pos="0" name="os.cpe23" value="cpe:/o:ibm:aix:6.1"/>
3321
3350
  </fingerprint>
3322
3351
 
3323
- <fingerprint pattern="^(?:\S{1,1024} )?(?:Motorola PowerPC|IBM PowerPC|\S+ \S+ PowerPC IBM).*Base Operating System Runtime VIOS [^:]+: 06\.01\..*$">
3352
+ <fingerprint pattern="^(?:\S{1,1000} )?(?:Motorola PowerPC|IBM PowerPC|\S+ \S+ PowerPC IBM).*Base Operating System Runtime VIOS [^:]+: 06\.01\.">
3324
3353
  <description>IBM VIOS 6.1 on PowerPC</description>
3325
3354
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 00055539D600 Base Operating System Runtime VIOS version: 06.01.0007.0000 TCP/IP Client Support version: 06.01.0005.0000</example>
3326
3355
  <param pos="0" name="os.vendor" value="IBM"/>
3327
3356
  <param pos="0" name="os.product" value="VIOS"/>
3328
3357
  <param pos="0" name="os.version" value="6.1"/>
3329
3358
  <param pos="0" name="os.arch" value="PowerPC"/>
3330
- <param pos="0" name="os.cpe23" value="cpe:/o:ibm:vios:6.1"/>
3331
3359
  </fingerprint>
3332
3360
 
3333
- <fingerprint pattern="^(?:\S{1,1024} )?(?:Motorola PowerPC|IBM PowerPC|\S+ \S+ PowerPC IBM).*Base Operating System Runtime AIX [^:]+: 07\.01\..*$">
3361
+ <fingerprint pattern="^(?:\S{1,1000} )?(?:Motorola PowerPC|IBM PowerPC|\S+ \S+ PowerPC IBM).*Base Operating System Runtime AIX [^:]+: 07\.01\.">
3334
3362
  <description>IBM AIX 7.1 on PowerPC</description>
3335
3363
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 000B0148D700 Base Operating System Runtime AIX version: 07.01.0000.0015 TCP/IP Client Support version: 07.01.0000.0015</example>
3336
3364
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 00C5433C4C00 Base Operating System Runtime AIX version: 07.01.0001.0000 TCP/IP Client Support version: 07.01.0001.0003</example>
@@ -3343,7 +3371,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3343
3371
  <param pos="0" name="os.cpe23" value="cpe:/o:ibm:aix:7.1"/>
3344
3372
  </fingerprint>
3345
3373
 
3346
- <fingerprint pattern="^(?:\S{1,1024} )?UNIX System Machine Type: not available.*Base Operating System Runtime AIX [^:]+: 05\.01\..*$">
3374
+ <fingerprint pattern="^(?:\S{1,1000} )?UNIX System Machine Type: not available.*Base Operating System Runtime AIX [^:]+: 05\.01\.">
3347
3375
  <description>IBM AIX 5.1 - unknown machine type variant</description>
3348
3376
  <example>UNIX System Machine Type: not available! Processor id: 0001FDAF4C00 Base Operating System Runtime AIX version: 05.01.0000.0051 TCP/IP Client Support version: 05.01.0000.0070</example>
3349
3377
  <param pos="0" name="os.vendor" value="IBM"/>
@@ -3353,7 +3381,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3353
3381
  <param pos="0" name="os.cpe23" value="cpe:/o:ibm:aix:5.1"/>
3354
3382
  </fingerprint>
3355
3383
 
3356
- <fingerprint pattern="^(?:\S{1,1024} )?UNIX System Machine Type: not available.*Base Operating System Runtime AIX [^:]+: 05\.02\..*$">
3384
+ <fingerprint pattern="^(?:\S{1,1000} )?UNIX System Machine Type: not available.*Base Operating System Runtime AIX [^:]+: 05\.02\.">
3357
3385
  <description>IBM AIX 5.2 - unknown machine type variant</description>
3358
3386
  <example>UNIX System Machine Type: not available! Processor id: 0001FDAF4C00 Base Operating System Runtime AIX version: 05.02.0000.0105 TCP/IP Client Support version: 05.02.0000.0107</example>
3359
3387
  <param pos="0" name="os.vendor" value="IBM"/>
@@ -3363,7 +3391,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3363
3391
  <param pos="0" name="os.cpe23" value="cpe:/o:ibm:aix:5.2"/>
3364
3392
  </fingerprint>
3365
3393
 
3366
- <fingerprint pattern="^(?:\S{1,1024} )?UNIX System Machine Type: not available.*Base Operating System Runtime AIX [^:]+: 05\.03\..*$">
3394
+ <fingerprint pattern="^(?:\S{1,1000} )?UNIX System Machine Type: not available.*Base Operating System Runtime AIX [^:]+: 05\.03\.">
3367
3395
  <description>IBM AIX 5.3 - unknown machine type variant</description>
3368
3396
  <example>UNIX System Machine Type: not available! Processor id: 0001FDAF4C00 Base Operating System Runtime AIX version: 05.03.0000.0050 TCP/IP Client Support version: 05.03.0000.0053</example>
3369
3397
  <param pos="0" name="os.vendor" value="IBM"/>
@@ -3373,7 +3401,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3373
3401
  <param pos="0" name="os.cpe23" value="cpe:/o:ibm:aix:5.3"/>
3374
3402
  </fingerprint>
3375
3403
 
3376
- <fingerprint pattern="^(?:\S{1,1024} )?UNIX System Machine Type: not available.*Base Operating System Runtime AIX [^:]+: 06\.01\..*$">
3404
+ <fingerprint pattern="^(?:\S{1,1000} )?UNIX System Machine Type: not available.*Base Operating System Runtime AIX [^:]+: 06\.01\.">
3377
3405
  <description>IBM AIX 6.1 - unknown machine type variant</description>
3378
3406
  <example>UNIX System Machine Type: not available! Processor id: 0001FDAF4C00 Base Operating System Runtime AIX version: 06.01.0007.0000 TCP/IP Client Support version: 06.01.0005.0000</example>
3379
3407
  <param pos="0" name="os.vendor" value="IBM"/>
@@ -3383,7 +3411,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3383
3411
  <param pos="0" name="os.cpe23" value="cpe:/o:ibm:aix:6.1"/>
3384
3412
  </fingerprint>
3385
3413
 
3386
- <fingerprint pattern="^(?:\S{1,1024} )?UNIX System Machine Type: not available.*Base Operating System Runtime AIX [^:]+: 07\.01\..*$">
3414
+ <fingerprint pattern="^(?:\S{1,1000} )?UNIX System Machine Type: not available.*Base Operating System Runtime AIX [^:]+: 07\.01\.">
3387
3415
  <description>IBM AIX 7.1 - unknown machine type variant</description>
3388
3416
  <example>UNIX System Machine Type: not available! Processor id: 0001FDAF4C00 Base Operating System Runtime AIX version: 07.01.0001.0000 TCP/IP Client Support version: 07.01.0001.0002</example>
3389
3417
  <param pos="0" name="os.vendor" value="IBM"/>
@@ -3403,7 +3431,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3403
3431
  <param pos="1" name="os.product"/>
3404
3432
  </fingerprint>
3405
3433
 
3406
- <fingerprint pattern="^IBM 6400 Version (\S+).*$">
3434
+ <fingerprint pattern="^IBM 6400 Version (\S+)">
3407
3435
  <description>IBM 6400 Matrix Printer</description>
3408
3436
  <example>IBM 6400 Version 1.1.41 3-3-3</example>
3409
3437
  <example>IBM 6400 Version 1.1.38.11 3-3-3</example>
@@ -3585,7 +3613,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3585
3613
  <param pos="1" name="os.product"/>
3586
3614
  </fingerprint>
3587
3615
 
3588
- <fingerprint pattern="^Juniper Networks, Inc\. (?:(?:Dell|DELL) )?(\S+) internet router, kernel JUNOS (\S+?),? .*$">
3616
+ <fingerprint pattern="^Juniper Networks, Inc\. (?:(?:Dell|DELL) )?(\S+) internet router, kernel JUNOS (\S+?),? ">
3589
3617
  <description>Juniper Router - build path variant</description>
3590
3618
  <example hw.model="J-EX4200-24T" os.version="11.1R3.5">Juniper Networks, Inc. DELL J-EX4200-24T internet router, kernel JUNOS 11.1R3.5 #0: 2011-06-25 01:18:46 UTC builder@briath.juniper.net:/volume/build/junos/11.1/release/11.1R3.5/obj-powerpc/bsd/kernels/JUNIPER-EX/kernel Build date: 2011-06-25 01:01:37</example>
3591
3619
  <example os.version="11.4R1.6">Juniper Networks, Inc. ex4200-48p internet router, kernel JUNOS 11.4R1.6 #0: 2011-11-15 11:14:01 UTC builder@evenath.juniper.net:/volume/build/junos/11.4/release/11.4R1.6/obj-powerpc/bsd/kernels/JUNIPER-EX/kernel Build date: 2011-11-15 10:35:08 UTC C</example>
@@ -3600,7 +3628,22 @@ Copyright (c) 1995-2005 by Cisco Systems
3600
3628
  <param pos="0" name="os.cpe23" value="cpe:/o:juniper:junos:{os.version}"/>
3601
3629
  </fingerprint>
3602
3630
 
3603
- <fingerprint pattern="^Juniper Networks, Inc\. (\S+) Edge Routing Switch SW Version : \((\S+) (\S+) \[BuildId (\d+)\]\) .*$">
3631
+ <fingerprint pattern="^Juniper Networks, Inc\. (\S+) Ethernet Switch, kernel JUNOS (\S+?),? ">
3632
+ <description>Juniper Ethernet Switch</description>
3633
+ <example hw.product="ex2300-c-12t" os.version="15.1X53-D590.1">Juniper Networks, Inc. ex2300-c-12t Ethernet Switch, kernel JUNOS 15.1X53-D590.1, Build date: 2018-11-14 20:31:32 UTC Copyright (c) 1996-2018 Juniper Networks, Inc.</example>
3634
+ <example hw.product="ex2200-c-12t-2g" os.version="12.3R12-S15">Juniper Networks, Inc. ex2200-c-12t-2g Ethernet Switch, kernel JUNOS 12.3R12-S15, Build date: 2020-02-13 14:27:08 UTC Copyright (c) 1996-2020 Juniper Networks, Inc.</example>
3635
+ <example hw.product="qfx5110-48s-4c" os.version="17.3R3-S1.5">Juniper Networks, Inc. qfx5110-48s-4c Ethernet Switch, kernel JUNOS 17.3R3-S1.5, Build date: 2018-08-31 19:06:08 UTC Copyright (c) 1996-2018 Juniper Networks, Inc.</example>
3636
+ <param pos="0" name="os.vendor" value="Juniper"/>
3637
+ <param pos="0" name="os.device" value="Switch"/>
3638
+ <param pos="0" name="os.product" value="Junos OS"/>
3639
+ <param pos="2" name="os.version"/>
3640
+ <param pos="0" name="os.cpe23" value="cpe:/o:juniper:junos:{os.version}"/>
3641
+ <param pos="0" name="hw.vendor" value="Juniper"/>
3642
+ <param pos="0" name="hw.device" value="Switch"/>
3643
+ <param pos="1" name="hw.product"/>
3644
+ </fingerprint>
3645
+
3646
+ <fingerprint pattern="^Juniper Networks, Inc\. (\S+) Edge Routing Switch SW Version : \((\S+) (\S+) \[BuildId (\d+)\]\)">
3604
3647
  <description>Juniper Edge Routing Switch</description>
3605
3648
  <example>Juniper Networks, Inc. E120 Edge Routing Switch SW Version : (10.1.0 release-0.0 [BuildId 10854]) Build Date : April 22, 2009 02:27 Copyright (c) 1999-2009 Juniper Networks, Inc. All rights reserved.</example>
3606
3649
  <example>Juniper Networks, Inc. E120 Edge Routing Switch SW Version : (10.1.3 release-0.0 [BuildId 12315]) Build Date : July 7, 2010 13:31 Copyright (c) 1999-2010 Juniper Networks, Inc. All rights reserved.</example>
@@ -3622,7 +3665,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3622
3665
  <param pos="2" name="os.version"/>
3623
3666
  </fingerprint>
3624
3667
 
3625
- <fingerprint pattern="^Juniper Networks, Inc\. (\S+) Edge Switch Router SW Version : \((\S+) (\S+) \[BuildId (\d+)\]\) .*$">
3668
+ <fingerprint pattern="^Juniper Networks, Inc\. (\S+) Edge Switch Router SW Version : \((\S+) (\S+) \[BuildId (\d+)\]\)">
3626
3669
  <description>Juniper Edge Routing Switch - variant 1</description>
3627
3670
  <example>Juniper Networks, Inc. RX1400 Edge Switch Router SW Version : (10.3.2 patch-0.2 [BuildId 12841]) Build Date : February 3, 2011 16:26 Copyright (c) 1999, 2001 Juniper Networks, Inc.</example>
3628
3671
  <param pos="0" name="os.vendor" value="Juniper"/>
@@ -3651,11 +3694,24 @@ Copyright (c) 1995-2005 by Cisco Systems
3651
3694
  <param pos="1" name="os.product"/>
3652
3695
  </fingerprint>
3653
3696
 
3697
+ <fingerprint pattern="^Juniper (\S+) Ethernet Switch$">
3698
+ <description>Juniper Ethernet Swtich</description>
3699
+ <example hw.product="EX4200-48PX">Juniper EX4200-48PX Ethernet Switch</example>
3700
+ <example hw.product="EX2200-C-12T-2G">Juniper EX2200-C-12T-2G Ethernet Switch</example>
3701
+ <param pos="0" name="os.vendor" value="Juniper"/>
3702
+ <param pos="0" name="os.device" value="Switch"/>
3703
+ <param pos="0" name="os.product" value="Junos OS"/>
3704
+ <param pos="0" name="os.cpe23" value="cpe:/o:juniper:junos:-"/>
3705
+ <param pos="0" name="hw.vendor" value="Juniper"/>
3706
+ <param pos="0" name="hw.device" value="Switch"/>
3707
+ <param pos="1" name="hw.product"/>
3708
+ </fingerprint>
3709
+
3654
3710
  <!--======================================================================
3655
3711
  LANIER
3656
3712
  =======================================================================-->
3657
3713
 
3658
- <fingerprint pattern="^LANIER (.*) ([0-9.]+) / LANIER.*$">
3714
+ <fingerprint pattern="^LANIER (.*) ([0-9.]+) / LANIER">
3659
3715
  <description>Lanier multifunction device</description>
3660
3716
  <example>LANIER LD145 2.40 / LANIER Network Printer C model / LANIER Network Scanner C model / LANIER Network Facsimile C model</example>
3661
3717
  <example>LANIER LD335c 1.27 / LANIER Network Printer C model / LANIER Network Scanner C model</example>
@@ -3671,7 +3727,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3671
3727
  LANTRONIX
3672
3728
  =======================================================================-->
3673
3729
 
3674
- <fingerprint pattern="^Lantronix ((?:LPS|EPS|MPS)\S+) Version [VB]?([^/\(\s]+)[/\(\s]?.*$">
3730
+ <fingerprint pattern="^Lantronix ((?:LPS|EPS|MPS)\S+) Version [VB]?([^/\(\s]+)[/\(\s]?">
3675
3731
  <description>Lantronix print server</description>
3676
3732
  <example>Lantronix EPS2 Version V3.3/4(950530)</example>
3677
3733
  <example>Lantronix EPS2 Version V3.4/1(960401)</example>
@@ -3701,7 +3757,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3701
3757
 
3702
3758
  <!-- These devices are all some form of device/terminal/serial/console server -->
3703
3759
 
3704
- <fingerprint pattern="^(?i:Lantronix) ((MSS|SCS|LRS|ETS|EDS)\S+) (?:Version |[VB])?([^/\(\s]+)[/\(\s]?.*$">
3760
+ <fingerprint pattern="^(?i:Lantronix) ((MSS|SCS|LRS|ETS|EDS)\S+) (?:Version |[VB])?([^/\(\s]+)[/\(\s]?">
3705
3761
  <description>Lantronix terminal server</description>
3706
3762
  <example>Lantronix MSS100 Version V3.6/9(030114)</example>
3707
3763
  <example>Lantronix EDS8PS V4.1.0.2R17 (03111515KK9H)</example>
@@ -3792,7 +3848,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3792
3848
  <param pos="2" name="os.version"/>
3793
3849
  </fingerprint>
3794
3850
 
3795
- <fingerprint pattern="^Lantronix (MatchPort \S+(?: \S+)?) V(\S+) \(.*$">
3851
+ <fingerprint pattern="^Lantronix (MatchPort \S+(?: \S+)?) V(\S+) \(">
3796
3852
  <description>Lantronix MatchPort serial to ethernet adapter</description>
3797
3853
  <example>Lantronix MatchPort AR V1.1.0.0R1 (07101497G7IJFA)</example>
3798
3854
  <example>Lantronix MatchPort AR V1.1.0.0R6.MC_V3.5 (07100747G7I1DT)</example>
@@ -3853,7 +3909,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3853
3909
  <param pos="3" name="os.version"/>
3854
3910
  </fingerprint>
3855
3911
 
3856
- <fingerprint pattern="^Lantronix ((NTS)\S*) \S+ (\S+) \(.*$">
3912
+ <fingerprint pattern="^Lantronix ((NTS)\S*) \S+ (\S+) \(">
3857
3913
  <description>Lantronix NTS</description>
3858
3914
  <example>Lantronix NTS 0239032 04.4 (010817)</example>
3859
3915
  <example>Lantronix NTS 1145416 04.4 (010817)</example>
@@ -3878,7 +3934,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3878
3934
  LEXMARK
3879
3935
  =======================================================================-->
3880
3936
 
3881
- <fingerprint pattern="^Lexmark C760 version ([\d.]+).*$">
3937
+ <fingerprint pattern="^Lexmark C760 version ([\d.]+)">
3882
3938
  <description>Lexmark C760 Color Laser Printer</description>
3883
3939
  <param pos="0" name="os.certainty" value="1.0"/>
3884
3940
  <param pos="0" name="os.vendor" value="Lexmark"/>
@@ -3887,7 +3943,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3887
3943
  <param pos="1" name="os.version"/>
3888
3944
  </fingerprint>
3889
3945
 
3890
- <fingerprint pattern="^Lexmark (\S+) version (\S+).*$">
3946
+ <fingerprint pattern="^Lexmark (\S+) version (\S+)">
3891
3947
  <description>Lexmark Laser Printer</description>
3892
3948
  <example>Lexmark C524 version NS.NP.N212 kernel 2.6.6 All-N-1</example>
3893
3949
  <example>Lexmark T522 version 54.30.06 kernel 2.4.0-test6 All-N-1</example>
@@ -3906,7 +3962,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3906
3962
  <param pos="2" name="os.version"/>
3907
3963
  </fingerprint>
3908
3964
 
3909
- <fingerprint pattern="^(?:Lexmark )?MarkNet (.*) Version (\S+) Ethernet.*$">
3965
+ <fingerprint pattern="^(?:Lexmark )?MarkNet (.*) Version (\S+) Ethernet">
3910
3966
  <description>Lexmark MarkNet Printer Server</description>
3911
3967
  <example>MarkNet Pro 1 Version 2.10.192 Ethernet 10T.</example>
3912
3968
  <example>MarkNet Pro 1 Version 2.10.192 Ethernet Combo.</example>
@@ -3923,7 +3979,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3923
3979
  <param pos="2" name="os.version"/>
3924
3980
  </fingerprint>
3925
3981
 
3926
- <fingerprint pattern="^Lexmark Optra (\S+(?: \S+)?(?: \S+)?) +Version (\S+).*$">
3982
+ <fingerprint pattern="^Lexmark Optra (\S+(?: \S+)?(?: \S+)?) +Version (\S+)">
3927
3983
  <description>Lexmark Optra Laser Printer</description>
3928
3984
  <example>Lexmark Optra T610 Version 5.15.18 FaxSCSI-Ethernet.</example>
3929
3985
  <example>Lexmark Optra K 1220 Version 1.9.14 Ethernet 10/100.</example>
@@ -3939,7 +3995,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3939
3995
  <param pos="2" name="os.version"/>
3940
3996
  </fingerprint>
3941
3997
 
3942
- <fingerprint pattern="^Lexmark Forms Printer (\S+(?: plus)?) +version (\S+).*$">
3998
+ <fingerprint pattern="^Lexmark Forms Printer (\S+(?: plus)?) +version (\S+)">
3943
3999
  <description>Lexmark Forms Printer</description>
3944
4000
  <example>Lexmark Forms Printer 2580 version LC.CO.N061 kernel 2.6.10 All-N-1</example>
3945
4001
  <example>Lexmark Forms Printer 2580 version LCL.CU.P105 kernel 2.6.10 All-N-1</example>
@@ -3957,7 +4013,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3957
4013
  <param pos="2" name="os.version"/>
3958
4014
  </fingerprint>
3959
4015
 
3960
- <fingerprint pattern="^Lexmark (\S+) Series version (\S+).*$">
4016
+ <fingerprint pattern="^Lexmark (\S+) Series version (\S+)">
3961
4017
  <description>Lexmark Printer</description>
3962
4018
  <example>Lexmark Pro5500 Series version FHN.RB.P1.111006z kernel 2.6.28.10.1 All-N-1</example>
3963
4019
  <example>Lexmark Pro910 Series version FQN.QNL.P1.111026 kernel 2.6.28.10.1 All-N-1</example>
@@ -3969,7 +4025,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3969
4025
  <param pos="2" name="os.version"/>
3970
4026
  </fingerprint>
3971
4027
 
3972
- <fingerprint pattern="^(?:Lexmark|LEXMARK) (\S+) [vV]ersion (\S+).*$">
4028
+ <fingerprint pattern="^(?:Lexmark|LEXMARK) (\S+) [vV]ersion (\S+)">
3973
4029
  <description>Lexmark Printer - no kernel variant</description>
3974
4030
  <example>LEXMARK X204 version NM.APS.N058 kernel 2.6.18.5 All-N-1</example>
3975
4031
  <example>Lexmark C720 Version 3.19.12 Ethernet 10/100.</example>
@@ -4054,7 +4110,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4054
4110
  <param pos="0" name="os.device" value="Printer"/>
4055
4111
  </fingerprint>
4056
4112
 
4057
- <fingerprint pattern="^KYOCERA Printer I/F (IB-.*) Ver .*$">
4113
+ <fingerprint pattern="^KYOCERA Printer I/F (IB-.*) Ver">
4058
4114
  <description>KYOCERA MITA printer - version variant</description>
4059
4115
  <example>KYOCERA Printer I/F IB-23 Ver 1.1.0</example>
4060
4116
  <example>KYOCERA Printer I/F IB-20/21 Ver 1.1.1</example>
@@ -4195,7 +4251,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4195
4251
  <param pos="0" name="os.cpe23" value="cpe:/o:redhat:linux:7.3"/>
4196
4252
  </fingerprint>
4197
4253
 
4198
- <fingerprint pattern="^CentOS release ([\d.]*) .*$">
4254
+ <fingerprint pattern="^CentOS release ([\d.]*)">
4199
4255
  <description>CentOS Linux</description>
4200
4256
  <example>CentOS release 4.9 (Final)</example>
4201
4257
  <param pos="0" name="os.certainty" value="0.9"/>
@@ -4337,7 +4393,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4337
4393
  <param pos="2" name="os.arch"/>
4338
4394
  </fingerprint>
4339
4395
 
4340
- <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+).*$">
4396
+ <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+)">
4341
4397
  <description>Silver Peak Systems</description>
4342
4398
  <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>
4343
4399
  <param pos="0" name="os.certainty" value="0.9"/>
@@ -4356,7 +4412,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4356
4412
  specific pattern available.
4357
4413
  -->
4358
4414
 
4359
- <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+).*$">
4415
+ <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+)">
4360
4416
  <description>Linux x86_64 Generic - hostname variant</description>
4361
4417
  <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>
4362
4418
  <param pos="0" name="os.certainty" value="0.5"/>
@@ -4368,7 +4424,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4368
4424
  <param pos="3" name="os.arch"/>
4369
4425
  </fingerprint>
4370
4426
 
4371
- <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+).*$">
4427
+ <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+)">
4372
4428
  <description>Linux Generic</description>
4373
4429
  <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>
4374
4430
  <param pos="0" name="os.certainty" value="0.5"/>
@@ -4556,7 +4612,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4556
4612
  These are baseline patterns that only use sysDesc. We use these if we are unable to fingerprint the sysObjectID.
4557
4613
  -->
4558
4614
 
4559
- <fingerprint pattern="^Hardware: x86.*Software: Windows NT Version 4\.0.*$">
4615
+ <fingerprint pattern="^Hardware: x86.*Software: Windows NT Version 4\.0">
4560
4616
  <description>Windows NT 4 on x86</description>
4561
4617
  <example>Hardware: x86 Family 6 Model 8 Stepping 3 AT/AT COMPATIBLE - Software: Windows NT Version 4.0 (Build Number: 1381 Uniprocessor Free )</example>
4562
4618
  <param pos="0" name="os.vendor" value="Microsoft"/>
@@ -4566,7 +4622,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4566
4622
  <param pos="0" name="os.arch" value="x86"/>
4567
4623
  </fingerprint>
4568
4624
 
4569
- <fingerprint pattern="^Hardware: x86.*Software: Windows 2000 Version 5\.0.*$">
4625
+ <fingerprint pattern="^Hardware: x86.*Software: Windows 2000 Version 5\.0">
4570
4626
  <description>Windows 2000 on x86</description>
4571
4627
  <example>Hardware: x86 Family 15 Model 4 Stepping 8 AT/AT COMPATIBLE - Software: Windows 2000 Version 5.0 (Build 2195 Uniprocessor Free)</example>
4572
4628
  <param pos="0" name="os.vendor" value="Microsoft"/>
@@ -4576,7 +4632,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4576
4632
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_2000:-"/>
4577
4633
  </fingerprint>
4578
4634
 
4579
- <fingerprint pattern="^Hardware: x86.*Software: Windows 2000 Version 5\.1.*$">
4635
+ <fingerprint pattern="^Hardware: x86.*Software: Windows 2000 Version 5\.1">
4580
4636
  <description>Windows XP on x86</description>
4581
4637
  <example>Hardware: x86 Family 15 Model 75 Stepping 2 AT/AT COMPATIBLE - Software: Windows 2000 Version 5.1 (Build 2600 Uniprocessor Free)</example>
4582
4638
  <param pos="0" name="os.vendor" value="Microsoft"/>
@@ -4586,7 +4642,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4586
4642
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_xp:-"/>
4587
4643
  </fingerprint>
4588
4644
 
4589
- <fingerprint pattern="^Hardware: x86.*Software: Windows Version 5\.2.*$">
4645
+ <fingerprint pattern="^Hardware: x86.*Software: Windows Version 5\.2">
4590
4646
  <description>Windows Server 2003 on x86</description>
4591
4647
  <example>Hardware: x86 Family 6 Model 15 Stepping 6 AT/AT COMPATIBLE - Software: Windows Version 5.2 (Build 3790 Multiprocessor Free)</example>
4592
4648
  <param pos="0" name="os.vendor" value="Microsoft"/>
@@ -4596,7 +4652,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4596
4652
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2003:-"/>
4597
4653
  </fingerprint>
4598
4654
 
4599
- <fingerprint pattern="^Hardware: \S+64.*Software: Windows Version 5\.2.*$">
4655
+ <fingerprint pattern="^Hardware: \S+64.*Software: Windows Version 5\.2">
4600
4656
  <description>Windows Server 2003 on x86_64</description>
4601
4657
  <example>Hardware: AMD64 Family 15 Model 4 Stepping 3 AT/AT COMPATIBLE - Software: Windows Version 5.2 (Build 3790 Multiprocessor Free)</example>
4602
4658
  <example>Hardware: Intel64 Family 6 Model 15 Stepping 6 AT/AT COMPATIBLE - Software: Windows Version 5.2 (Build 3790 Multiprocessor Free)</example>
@@ -4607,7 +4663,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4607
4663
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2003:-"/>
4608
4664
  </fingerprint>
4609
4665
 
4610
- <fingerprint pattern="^Windows_NT Microsoft Windows Server 2003 5.2 3790 Service Pack 2, GenuineIntel \S+64.*$">
4666
+ <fingerprint pattern="^Windows_NT Microsoft Windows Server 2003 5.2 3790 Service Pack 2, GenuineIntel \S+64">
4611
4667
  <description>Rare Windows 2003 SP2 sysDescr, x64</description>
4612
4668
  <example>Windows_NT Microsoft Windows Server 2003 5.2 3790 Service Pack 2, GenuineIntel EM64T Family 6 Model 23 Stepping 6</example>
4613
4669
  <param pos="0" name="os.vendor" value="Microsoft"/>
@@ -4618,7 +4674,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4618
4674
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2003:SP1"/>
4619
4675
  </fingerprint>
4620
4676
 
4621
- <fingerprint pattern="^Windows_NT Microsoft Windows Server 2003 5.2 3790 Service Pack 2, GenuineIntel x86.*$">
4677
+ <fingerprint pattern="^Windows_NT Microsoft Windows Server 2003 5.2 3790 Service Pack 2, GenuineIntel x86">
4622
4678
  <description>Rare Windows 2003 SP2 sysDescr, x86</description>
4623
4679
  <example>Windows_NT Microsoft Windows Server 2003 5.2 3790 Service Pack 2, GenuineIntel x86 Family 6 Model 23 Stepping 6</example>
4624
4680
  <param pos="0" name="os.vendor" value="Microsoft"/>
@@ -4629,7 +4685,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4629
4685
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2003:SP1"/>
4630
4686
  </fingerprint>
4631
4687
 
4632
- <fingerprint pattern="^Microsoft Windows CE Version ([\d.]+).*$">
4688
+ <fingerprint pattern="^Microsoft Windows CE Version ([\d.]+)">
4633
4689
  <description>Windows CE</description>
4634
4690
  <example>Microsoft Windows CE Version 4.20 (Build 0)</example>
4635
4691
  <example>Microsoft Windows CE Version 4.20 (Build 1088)</example>
@@ -4640,7 +4696,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4640
4696
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_ce:{os.version}"/>
4641
4697
  </fingerprint>
4642
4698
 
4643
- <fingerprint pattern="^Hardware: x86.*Software: Windows Version 6.0 \(Build 6000.*$">
4699
+ <fingerprint pattern="^Hardware: x86.*Software: Windows Version 6.0 \(Build 6000">
4644
4700
  <description>Windows Vista on x86</description>
4645
4701
  <example>Hardware: x86 Family 15 Model 2 Stepping 5 AT/AT COMPATIBLE - Software: Windows Version 6.0 (Build 6000 Multiprocessor Free)</example>
4646
4702
  <param pos="0" name="os.vendor" value="Microsoft"/>
@@ -4650,7 +4706,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4650
4706
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_vista:-"/>
4651
4707
  </fingerprint>
4652
4708
 
4653
- <fingerprint pattern="^Hardware: \S+64.*Software: Windows Version 6.0 \(Build 6000.*$">
4709
+ <fingerprint pattern="^Hardware: \S+64.*Software: Windows Version 6.0 \(Build 6000">
4654
4710
  <description>Windows Vista on x86_64</description>
4655
4711
  <example>Hardware: Intel64 Family 15 Model 2 Stepping 5 AT/AT COMPATIBLE - Software: Windows Version 6.0 (Build 6000 Multiprocessor Free)</example>
4656
4712
  <param pos="0" name="os.vendor" value="Microsoft"/>
@@ -4660,7 +4716,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4660
4716
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_vista:-"/>
4661
4717
  </fingerprint>
4662
4718
 
4663
- <fingerprint pattern="^Hardware: x86.*Software: Windows Version 6.0 \(Build 6001.*$">
4719
+ <fingerprint pattern="^Hardware: x86.*Software: Windows Version 6.0 \(Build 6001">
4664
4720
  <description>Windows Vista SP1 on x86</description>
4665
4721
  <example>Hardware: x86 Family 15 Model 2 Stepping 5 AT/AT COMPATIBLE - Software: Windows Version 6.0 (Build 6001 Multiprocessor Free)</example>
4666
4722
  <param pos="0" name="os.vendor" value="Microsoft"/>
@@ -4671,7 +4727,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4671
4727
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_vista:SP1"/>
4672
4728
  </fingerprint>
4673
4729
 
4674
- <fingerprint pattern="^Hardware: \S+64.*Software: Windows Version 6.0 \(Build 6001.*$">
4730
+ <fingerprint pattern="^Hardware: \S+64.*Software: Windows Version 6.0 \(Build 6001">
4675
4731
  <description>Windows Vista SP1 on x86_64</description>
4676
4732
  <example>Hardware: AMD64 Family 16 Model 2 Stepping 3 AT/AT COMPATIBLE - Software: Windows Version 6.0 (Build 6001 Multiprocessor Free)</example>
4677
4733
  <example>Hardware: Intel64 Family 15 Model 2 Stepping 5 AT/AT COMPATIBLE - Software: Windows Version 6.0 (Build 6001 Multiprocessor Free)</example>
@@ -4683,7 +4739,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4683
4739
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_vista:SP1"/>
4684
4740
  </fingerprint>
4685
4741
 
4686
- <fingerprint pattern="^Hardware: x86.*Software: Windows Version 6.0 \(Build 6002.*$">
4742
+ <fingerprint pattern="^Hardware: x86.*Software: Windows Version 6.0 \(Build 6002">
4687
4743
  <description>Windows Vista SP2 on x86</description>
4688
4744
  <example>Hardware: x86 Family 15 Model 2 Stepping 5 AT/AT COMPATIBLE - Software: Windows Version 6.0 (Build 6002 Multiprocessor Free)</example>
4689
4745
  <param pos="0" name="os.vendor" value="Microsoft"/>
@@ -4694,7 +4750,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4694
4750
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_vista:SP2"/>
4695
4751
  </fingerprint>
4696
4752
 
4697
- <fingerprint pattern="^Hardware: \S+64.*Software: Windows Version 6.0 \(Build 6002.*$">
4753
+ <fingerprint pattern="^Hardware: \S+64.*Software: Windows Version 6.0 \(Build 6002">
4698
4754
  <description>Windows Vista SP2 on x86_64</description>
4699
4755
  <example>Hardware: AMD64 Family 16 Model 2 Stepping 3 AT/AT COMPATIBLE - Software: Windows Version 6.0 (Build 6002 Multiprocessor Free)</example>
4700
4756
  <example>Hardware: Intel64 Family 15 Model 2 Stepping 5 AT/AT COMPATIBLE - Software: Windows Version 6.0 (Build 6002 Multiprocessor Free)</example>
@@ -4706,7 +4762,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4706
4762
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_vista:SP2"/>
4707
4763
  </fingerprint>
4708
4764
 
4709
- <fingerprint pattern="^Hardware: x86.*Software: Windows Version 6.1 \(Build 7600.*$">
4765
+ <fingerprint pattern="^Hardware: x86.*Software: Windows Version 6.1 \(Build 7600">
4710
4766
  <description>Windows 7 on x86</description>
4711
4767
  <example>Hardware: x86 Family 15 Model 2 Stepping 5 AT/AT COMPATIBLE - Software: Windows Version 6.1 (Build 7600 Multiprocessor Free)</example>
4712
4768
  <param pos="0" name="os.vendor" value="Microsoft"/>
@@ -4716,7 +4772,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4716
4772
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_7:-"/>
4717
4773
  </fingerprint>
4718
4774
 
4719
- <fingerprint pattern="^Hardware: \S+64.*Software: Windows Version 6.1 \(Build 7600.*$">
4775
+ <fingerprint pattern="^Hardware: \S+64.*Software: Windows Version 6.1 \(Build 7600">
4720
4776
  <description>Windows 7 on x86_64</description>
4721
4777
  <example>Hardware: AMD64 Family 16 Model 2 Stepping 3 AT/AT COMPATIBLE - Software: Windows Version 6.1 (Build 7600 Multiprocessor Free)</example>
4722
4778
  <example>Hardware: Intel64 Family 15 Model 2 Stepping 5 AT/AT COMPATIBLE - Software: Windows Version 6.1 (Build 7600 Multiprocessor Free)</example>
@@ -4727,7 +4783,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4727
4783
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_7:-"/>
4728
4784
  </fingerprint>
4729
4785
 
4730
- <fingerprint pattern="^Hardware: x86.*Software: Windows Version 6.1 \(Build 7601.*$">
4786
+ <fingerprint pattern="^Hardware: x86.*Software: Windows Version 6.1 \(Build 7601">
4731
4787
  <description>Windows 7 SP1 on x86</description>
4732
4788
  <example>Hardware: x86 Family 15 Model 2 Stepping 5 AT/AT COMPATIBLE - Software: Windows Version 6.1 (Build 7601 Multiprocessor Free)</example>
4733
4789
  <param pos="0" name="os.vendor" value="Microsoft"/>
@@ -4738,7 +4794,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4738
4794
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_7:SP1"/>
4739
4795
  </fingerprint>
4740
4796
 
4741
- <fingerprint pattern="^Hardware: \S+64.*Software: Windows Version 6.1 \(Build 7601.*$">
4797
+ <fingerprint pattern="^Hardware: \S+64.*Software: Windows Version 6.1 \(Build 7601">
4742
4798
  <description>Windows 7 SP1 on x86_64</description>
4743
4799
  <example>Hardware: AMD64 Family 16 Model 2 Stepping 3 AT/AT COMPATIBLE - Software: Windows Version 6.1 (Build 7601 Multiprocessor Free)</example>
4744
4800
  <example>Hardware: Intel64 Family 15 Model 2 Stepping 5 AT/AT COMPATIBLE - Software: Windows Version 6.1 (Build 7601 Multiprocessor Free)</example>
@@ -4790,7 +4846,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4790
4846
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_8.1:-"/>
4791
4847
  </fingerprint>
4792
4848
 
4793
- <fingerprint pattern="Windows\s\S+\s(6\.2\.\d+)\s+Server\s[\d\.]+\s(\w+).*">
4849
+ <fingerprint pattern="Windows\s\S+\s(6\.2\.\d+)\s+Server\s[\d\.]+\s(\w+)">
4794
4850
  <description>Windows Server 2012</description>
4795
4851
  <example>Windows w12-srv-snmp 6.2.9200 Server 4.0 Intel64 Family 6 Model 26 Stepping 4</example>
4796
4852
  <param pos="0" name="os.vendor" value="Microsoft"/>
@@ -4845,7 +4901,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4845
4901
  NETAPP
4846
4902
  =======================================================================-->
4847
4903
 
4848
- <fingerprint pattern="^(?:NetApp|Data ONTAP) Release (\S+):? .*$">
4904
+ <fingerprint pattern="^(?:NetApp|Data ONTAP) Release (\S+):?">
4849
4905
  <description>NetApp filer</description>
4850
4906
  <example>Data ONTAP Release 7.2.3: Thu Jul 5 10:42:49 PDT 2007 (IBM)</example>
4851
4907
  <example>NetApp Release 7.2.4: Fri Nov 16 00:34:57 PST 2007</example>
@@ -4863,7 +4919,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4863
4919
  NETBOTZ
4864
4920
  =======================================================================-->
4865
4921
 
4866
- <fingerprint pattern="^NetBotz RackBotz (\S+) Appliance; FV: ([^,]+), HR: .*$">
4922
+ <fingerprint pattern="^NetBotz RackBotz (\S+) Appliance; FV: ([^,]+), HR:">
4867
4923
  <description>NetBotz RackBotz monitoring device</description>
4868
4924
  <example>NetBotz RackBotz 400C Appliance; FV: A1_3_71_136-20021216P, HR: REV A13, MD: 11/04/2003; MC: TEX</example>
4869
4925
  <example>NetBotz RackBotz 400C Appliance; FV: A1_3_90_168-20040908P, HR: REV A13, MD: 11/03/2003; MC: TEX</example>
@@ -4912,7 +4968,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4912
4968
  Netscaler
4913
4969
  =======================================================================-->
4914
4970
 
4915
- <fingerprint pattern="^NetScaler NS([^:]+): Build ([^,]+), Date: .*$">
4971
+ <fingerprint pattern="^NetScaler NS([^:]+): Build ([^,]+), Date:">
4916
4972
  <description>Netscaler Appliance</description>
4917
4973
  <example os.version="10.0" os.version.version="54.6.nc">NetScaler NS10.0: Build 54.6.nc, Date: Apr 6 2012, 08:00:41 </example>
4918
4974
  <example>NetScaler NS9.3: Build 57.5.nc, Date: Jun 27 2012, 19:37:56 </example>
@@ -4929,7 +4985,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4929
4985
  NORTEL
4930
4986
  =======================================================================-->
4931
4987
 
4932
- <fingerprint pattern="^Business Policy Switch 2000.* SW:v([\d.]+) .*$">
4988
+ <fingerprint pattern="^Business Policy Switch 2000.* SW:v([\d.]+)">
4933
4989
  <description>Nortel Business Policy Switch 2000</description>
4934
4990
  <example>Business Policy Switch 2000 HW:10 FW:3.6.0.1 SW:v3.1.6.02 ISVN:2</example>
4935
4991
  <param pos="0" name="os.certainty" value="1.0"/>
@@ -4940,7 +4996,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4940
4996
  <param pos="1" name="os.version"/>
4941
4997
  </fingerprint>
4942
4998
 
4943
- <fingerprint pattern="^BayStack (\S+).*SW:[vV](\S+).*$">
4999
+ <fingerprint pattern="^BayStack (\S+).*SW:[vV](\S+)">
4944
5000
  <description>Nortel BayStack switch</description>
4945
5001
  <example>BayStack 420 HW:#02 FW:3.0.0.3 SW:v3.0.0.46</example>
4946
5002
  <example>BayStack 450-24T HW:RevB FW:V1.02 SW:V1.0.0.8</example>
@@ -4954,7 +5010,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4954
5010
  <param pos="2" name="os.version"/>
4955
5011
  </fingerprint>
4956
5012
 
4957
- <fingerprint pattern="^Ethernet Switch (\S+).*SW:v([\d.]+).*$">
5013
+ <fingerprint pattern="^Ethernet Switch (\S+).*SW:v([\d.]+)">
4958
5014
  <description>Nortel BayStack switch - variant 1</description>
4959
5015
  <example>Ethernet Switch 470-48T HW:#05 FW:3.6.0.6 SW:v3.6.2.04 BN:4 ISVN:2 (c) Nortel Networks</example>
4960
5016
  <param pos="0" name="os.certainty" value="1.0"/>
@@ -5083,7 +5139,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5083
5139
  <param pos="2" name="os.version"/>
5084
5140
  </fingerprint>
5085
5141
 
5086
- <fingerprint pattern="^Nortel SR ([^,\s]+).*Software Version = ([^,]+),.*$">
5142
+ <fingerprint pattern="^Nortel SR ([^,\s]+).*Software Version = ([^,]+),">
5087
5143
  <description>Nortel Secure Router</description>
5088
5144
  <example>Nortel SR 1001, Software Version = r8.3.5, Boot Version = J1100_031805</example>
5089
5145
  <example>Nortel SR 1004, Software Version = r8.4.4, Boot Version = T1k031605</example>
@@ -5096,7 +5152,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5096
5152
  <param pos="2" name="os.version"/>
5097
5153
  </fingerprint>
5098
5154
 
5099
- <fingerprint pattern="^Image: rel/([^/\s]+)/? Created on .*$">
5155
+ <fingerprint pattern="^Image: rel/([^/\s]+)/? Created on">
5100
5156
  <description>Bay Networks Router</description>
5101
5157
  <example>Image: rel/10.00 Created on Fri Mar 1 23:18:04 EST 1996.</example>
5102
5158
  <example>Image: rel/10.01 Created on Thu Jul 18 11:31:53 EDT 1996.</example>
@@ -5113,7 +5169,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5113
5169
  <param pos="1" name="os.version"/>
5114
5170
  </fingerprint>
5115
5171
 
5116
- <fingerprint pattern="^Nortel (Layer2-3 GbE Switch Module).*$">
5172
+ <fingerprint pattern="^Nortel (Layer2-3 GbE Switch Module)">
5117
5173
  <description>Nortel Switch Module</description>
5118
5174
  <example>Nortel Layer2-3 GbE Switch Module(Copper)</example>
5119
5175
  <param pos="0" name="os.vendor" value="Nortel"/>
@@ -5296,7 +5352,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5296
5352
  <param pos="0" name="os.cpe23" value="cpe:/o:novell:netware:6.5 SP7"/>
5297
5353
  </fingerprint>
5298
5354
 
5299
- <fingerprint pattern="^Novell NetWare ([\d.]+).*$">
5355
+ <fingerprint pattern="^Novell NetWare ([\d.]+)">
5300
5356
  <description>Novell NetWare - version capture variant</description>
5301
5357
  <example os.version="5.70.08">Novell NetWare 5.70.08 October 3, 2008</example>
5302
5358
  <param pos="0" name="os.certainty" value="0.85"/>
@@ -5321,7 +5377,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5321
5377
  OCE
5322
5378
  ========================================================================-->
5323
5379
 
5324
- <fingerprint pattern="^Oce (NC-\d+h), Firmware Ver.(\d+.\d+)\s+\(\d{1,2}.\d{1,2}.\d{1,2}\),.*$">
5380
+ <fingerprint pattern="^Oce (NC-\d+h), Firmware Ver.(\d+.\d+)\s+\(\d{1,2}.\d{1,2}.\d{1,2}\),">
5325
5381
  <description>Oce NC Series of Print Servers</description>
5326
5382
  <example>Oce NC-6800h, Firmware Ver.1.01 (10.01.08),MID 8C5-D92,FID 2</example>
5327
5383
  <example>Oce NC-6400h, Firmware Ver.1.03 (07.02.27),MID 8C5-B29,FID 2</example>
@@ -5381,7 +5437,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5381
5437
  <param pos="0" name="os.device" value="Multifunction Device"/>
5382
5438
  </fingerprint>
5383
5439
 
5384
- <fingerprint pattern="^Oce, DS60 ([^,]+),.*$">
5440
+ <fingerprint pattern="^Oce, DS60 ([^,]+),">
5385
5441
  <description>Oce DS60 multifunction device</description>
5386
5442
  <example>Oce, DS60 R1.2.0, Smart Imager R8.5.3.22</example>
5387
5443
  <param pos="0" name="os.vendor" value="Oce"/>
@@ -5391,7 +5447,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5391
5447
  <param pos="0" name="os.device" value="Multifunction Device"/>
5392
5448
  </fingerprint>
5393
5449
 
5394
- <fingerprint pattern="^Oce, TDS750 ([^,]+),.*$">
5450
+ <fingerprint pattern="^Oce, TDS750 ([^,]+),">
5395
5451
  <description>Oce TDS750 multifunction device</description>
5396
5452
  <example>Oce, TDS750 R1.1, Power Logic Controller R14.8.1.0_12010481</example>
5397
5453
  <param pos="0" name="os.vendor" value="Oce"/>
@@ -5401,7 +5457,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5401
5457
  <param pos="0" name="os.device" value="Multifunction Device"/>
5402
5458
  </fingerprint>
5403
5459
 
5404
- <fingerprint pattern="^Oce, (ColorWave\S+) ([^,]+),.*$">
5460
+ <fingerprint pattern="^Oce, (ColorWave\S+) ([^,]+),">
5405
5461
  <description>Oce ColorWave multifunction device</description>
5406
5462
  <example>Oce, ColorWave650 R2.0, EmCon R2.0, Network interface</example>
5407
5463
  <param pos="0" name="os.vendor" value="Oce"/>
@@ -5411,7 +5467,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5411
5467
  <param pos="0" name="os.device" value="Multifunction Device"/>
5412
5468
  </fingerprint>
5413
5469
 
5414
- <fingerprint pattern="^Oce, (VarioPrint \S+) ([^,]+),.*$">
5470
+ <fingerprint pattern="^Oce, (VarioPrint \S+) ([^,]+),">
5415
5471
  <description>Oce VarioPrint multifunction device - detailed variant</description>
5416
5472
  <example>Oce, VarioPrint 135 R2.1.0.0, PRISMAsync R13.4.42.7</example>
5417
5473
  <example>Oce, VarioPrint 2045 R3.2, Controller R8.2.15</example>
@@ -5432,7 +5488,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5432
5488
  <param pos="0" name="os.device" value="Multifunction Device"/>
5433
5489
  </fingerprint>
5434
5490
 
5435
- <fingerprint pattern="^Oce (CS\S+).*$">
5491
+ <fingerprint pattern="^Oce (CS\S+)">
5436
5492
  <description>Oce CS Series</description>
5437
5493
  <example>Oce CS2344 /P</example>
5438
5494
  <param pos="0" name="os.vendor" value="Oce"/>
@@ -5441,7 +5497,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5441
5497
  <param pos="0" name="os.device" value="Multifunction Device"/>
5442
5498
  </fingerprint>
5443
5499
 
5444
- <fingerprint pattern="^Oce (\d+\S*).*$">
5500
+ <fingerprint pattern="^Oce (\d+\S*)">
5445
5501
  <description>Oce Device</description>
5446
5502
  <example>Oce 1000C</example>
5447
5503
  <param pos="0" name="os.vendor" value="Oce"/>
@@ -5463,7 +5519,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5463
5519
  NRG
5464
5520
  =======================================================================-->
5465
5521
 
5466
- <fingerprint pattern="^NRG ((?:MP|SP )?\S+|DSm\d+) (?:V|v)?\.?(\S+).*$">
5522
+ <fingerprint pattern="^NRG ((?:MP|SP )?\S+|DSm\d+) (?:V|v)?\.?(\S+)">
5467
5523
  <description>Ricoh NRG network multifunction device</description>
5468
5524
  <example hw.product="SP C312DN" os.version="1.03">NRG SP C312DN V1.03 / NRG Network Printer C model</example>
5469
5525
  <example>NRG MP 3350 1.10 / NRG Network Printer C model / NRG Network Scanner C model</example>
@@ -5509,7 +5565,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5509
5565
  Oki Data
5510
5566
  =======================================================================-->
5511
5567
 
5512
- <fingerprint pattern="^OKI (\S+(?: \S+)?(?: \S+)?) Rev\. \S+ .*Print\s*Server.*$">
5568
+ <fingerprint pattern="^OKI (\S+(?: \S+)?(?: \S+)?) Rev\. \S+ .*Print\s*Server">
5513
5569
  <description>OKI Print Server - rev space variant</description>
5514
5570
  <example>OKI OkiLAN 6400e Rev. 10/100BASE Ethernet PrintServer: Attached to B6250 Rev.8.1: (C)2005 OKI DATA CORP</example>
5515
5571
  <example>OKI OkiLAN 6400e Rev. 10/100BASE Ethernet PrintServer: Attached to B6500 Rev.2.19 C1: (C)2005 OKI DATA CORP</example>
@@ -5520,7 +5576,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5520
5576
  <param pos="1" name="os.product"/>
5521
5577
  </fingerprint>
5522
5578
 
5523
- <fingerprint pattern="^OKI (\S+(?: \S+)?(?: \S+)?) Rev\.(\S+) .*Print\s*Server.*$">
5579
+ <fingerprint pattern="^OKI (\S+(?: \S+)?(?: \S+)?) Rev\.(\S+) .*Print\s*Server">
5524
5580
  <description>OKI Print Server</description>
5525
5581
  <example>OKI FastEther8450e Rev.01.08 10/100BASE Ethernet PrintServer: Attached to B430 Rev.C2.00 : Copyright (c) 2008 Oki Data Corporation. All rights reserved.</example>
5526
5582
  <example>OKI FastEther8450e Rev.08.01 10/100BASE Ethernet PrintServer: Attached to C5650 Rev.M1.02 : Copyright (c) 2007 Oki Data Corporation. All rights reserved.</example>
@@ -5615,7 +5671,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5615
5671
  PARADYNE
5616
5672
  =======================================================================-->
5617
5673
 
5618
- <fingerprint pattern="^PARADYNE T1 DSU/CSU; model: ([^;]+); S/W Release: ([^;]+); .*$">
5674
+ <fingerprint pattern="^PARADYNE T1 DSU/CSU; model: ([^;]+); S/W Release: ([^;]+);">
5619
5675
  <description>Paradyne CSU/DSU</description>
5620
5676
  <example>PARADYNE T1 DSU/CSU; model: 3165-A4-210; S/W Release: 05.01.16; H/W CCA1: 3996-82C; Serial number: 5796841</example>
5621
5677
  <param pos="0" name="os.certainty" value="1.0"/>
@@ -5625,7 +5681,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5625
5681
  <param pos="2" name="os.version"/>
5626
5682
  </fingerprint>
5627
5683
 
5628
- <fingerprint pattern="^PARADYNE (BitStorm \S+);.*S/W Release: ([^;]+);.*$">
5684
+ <fingerprint pattern="^PARADYNE (BitStorm \S+);.*S/W Release: ([^;]+);">
5629
5685
  <description>Paradyne BitStorm DSLAM</description>
5630
5686
  <example>PARADYNE BitStorm 2600; S/W Release: 02.05.07;</example>
5631
5687
  <example>PARADYNE BitStorm 4800; S/W Release: 01.00.09;</example>
@@ -5637,7 +5693,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5637
5693
  <param pos="2" name="os.version"/>
5638
5694
  </fingerprint>
5639
5695
 
5640
- <fingerprint pattern="^PARADYNE (GranDSLAM \S+);.*S/W Release: ([^;]+);.*$">
5696
+ <fingerprint pattern="^PARADYNE (GranDSLAM \S+);.*S/W Release: ([^;]+);">
5641
5697
  <description>Paradyne GranDSLAM</description>
5642
5698
  <example>PARADYNE GranDSLAM 4200; S/W Release: 02.05.23;</example>
5643
5699
  <param pos="0" name="os.certainty" value="1.0"/>
@@ -5648,7 +5704,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5648
5704
  <param pos="2" name="os.version"/>
5649
5705
  </fingerprint>
5650
5706
 
5651
- <fingerprint pattern="^PARADYNE SHDSL FrameSaver DSL; Model: ([^;]+); S/W Release: ([^;]+);.*$">
5707
+ <fingerprint pattern="^PARADYNE SHDSL FrameSaver DSL; Model: ([^;]+); S/W Release: ([^;]+);">
5652
5708
  <description>Paradyne Frame Relay</description>
5653
5709
  <example>PARADYNE SHDSL FrameSaver DSL; Model: 9788; S/W Release: 02.00.06; NAM CCA number: 4814-80C; Serial number: 6658952</example>
5654
5710
  <param pos="0" name="os.certainty" value="1.0"/>
@@ -5659,7 +5715,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5659
5715
  <param pos="2" name="os.version"/>
5660
5716
  </fingerprint>
5661
5717
 
5662
- <fingerprint pattern="^Paradyne (ATM (?:ReachDSL|ADSL) Unit); Model: ([^;]+);.*S/W Release: ([^;]+);.*$">
5718
+ <fingerprint pattern="^Paradyne (ATM (?:ReachDSL|ADSL) Unit); Model: ([^;]+);.*S/W Release: ([^;]+);">
5663
5719
  <description>Paradyne ATM DSL Unit</description>
5664
5720
  <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>
5665
5721
  <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>
@@ -5671,7 +5727,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5671
5727
  <param pos="3" name="os.version"/>
5672
5728
  </fingerprint>
5673
5729
 
5674
- <fingerprint pattern="^Paradyne (?:Hot[wW]ire [^;]+); Model: ([^;]+);.*S/W Release: ([^;]+);.*$">
5730
+ <fingerprint pattern="^Paradyne (?:Hot[wW]ire [^;]+); Model: ([^;]+);.*S/W Release: ([^;]+);">
5675
5731
  <description>Paradyne HotWire</description>
5676
5732
  <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>
5677
5733
  <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>
@@ -5804,7 +5860,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5804
5860
  RedBack Networks
5805
5861
  =======================================================================-->
5806
5862
 
5807
- <fingerprint pattern="^Red[bB]ack Networks AOS Release (\S+) .* Copyright.*$">
5863
+ <fingerprint pattern="^Red[bB]ack Networks AOS Release (\S+) .* Copyright">
5808
5864
  <description>Redback networks AOS</description>
5809
5865
  <example>RedBack Networks AOS Release 3.1.6.18 PRODUCTION MAINTENANCE RELEASE Copyright (c) 1997-2001 by RedBack Networks, Inc. Compiled 2001-Oct-24 19:56:11 GMT by wheatley</example>
5810
5866
  <example>Redback Networks AOS Release 5.0.6.10 MAINTENANCE RELEASE Copyright (c) 1997-2002 by Redback Networks, Inc. Compiled 2002-Sep-20 20:53:18 GMT by wheatley</example>
@@ -5821,7 +5877,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5821
5877
  <param pos="1" name="os.version"/>
5822
5878
  </fingerprint>
5823
5879
 
5824
- <fingerprint pattern="^Redback Networks SmartEdge OS Version SEOS-(.*?) Built by .*$">
5880
+ <fingerprint pattern="^Redback Networks SmartEdge OS Version SEOS-(.*?) Built by">
5825
5881
  <description>Redback SmartEdge</description>
5826
5882
  <example>Redback Networks SmartEdge OS Version SEOS-11.1.2.3p1-Release Built by sysbuild@SWB-node04 Fri Dec 23 11:47:30 PST 2011 Copyright (C) 1998-2011, Redback Networks Inc. All rights reserved.</example>
5827
5883
  <example>Redback Networks SmartEdge OS Version SEOS-11.1.2.3p3-Release Built by sysbuild@SWB-node06 Thu Feb 16 16:39:21 PST 2012 Copyright (C) 1998-2012, Redback Networks Inc. All rights reserved.</example>
@@ -5837,7 +5893,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5837
5893
  RICOH
5838
5894
  =======================================================================-->
5839
5895
 
5840
- <fingerprint pattern="^RICOH Aficio ((?:[MS]P )?\S+) ([0-9\.a-zA-Z]+) .*$">
5896
+ <fingerprint pattern="^RICOH Aficio ((?:[MS]P )?\S+) ([0-9\.a-zA-Z]+) ">
5841
5897
  <description>Ricoh Aficio multifunction device</description>
5842
5898
  <example>RICOH Aficio 1022 5.20 / RICOH Network Printer C model / RICOH Network Facsimile C model</example>
5843
5899
  <example>RICOH Aficio 1232C 2.07.2 / RICOH Network Printer C model / RICOH Network Scanner C model / RICOH Network Facsimile C model</example>
@@ -5882,7 +5938,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5882
5938
  <param pos="1" name="os.product"/>
5883
5939
  </fingerprint>
5884
5940
 
5885
- <fingerprint pattern="^RICOH Aficio (\S+) /.*$">
5941
+ <fingerprint pattern="^RICOH Aficio (\S+) /">
5886
5942
  <description>Generic Ricoh Aficio multifunction device - variant 2</description>
5887
5943
  <example>RICOH Aficio 1013 / RICOH Network Printer D model</example>
5888
5944
  <param pos="0" name="os.vendor" value="Ricoh"/>
@@ -5891,7 +5947,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5891
5947
  <param pos="1" name="os.product"/>
5892
5948
  </fingerprint>
5893
5949
 
5894
- <fingerprint pattern="^RICOH imagio (\S+ \S+|\S+) (\d+\S+) /.*$">
5950
+ <fingerprint pattern="^RICOH imagio (\S+ \S+|\S+) (\d+\S+) /">
5895
5951
  <description>Generic Ricoh Imagio multifunction device</description>
5896
5952
  <example>RICOH imagio MP C6001 1.04 / RICOH Network Printer C model / RICOH Network Scanner C model</example>
5897
5953
  <example>RICOH imagio MP C6001 1.05.1 / RICOH Network Printer C model / RICOH Network Scanner C model</example>
@@ -5905,7 +5961,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5905
5961
  <param pos="2" name="os.version"/>
5906
5962
  </fingerprint>
5907
5963
 
5908
- <fingerprint pattern="^RICOH IPS[Ii]O (\S+) (\S+) /.*$">
5964
+ <fingerprint pattern="^RICOH IPS[Ii]O (\S+) (\S+) /">
5909
5965
  <description>Generic Ricoh IPSIO multifunction device</description>
5910
5966
  <example>RICOH IPSiO NX96e 1.01 / RICOH Network Printer C model</example>
5911
5967
  <param pos="0" name="os.vendor" value="Ricoh"/>
@@ -5915,7 +5971,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5915
5971
  <param pos="2" name="os.version"/>
5916
5972
  </fingerprint>
5917
5973
 
5918
- <fingerprint pattern="^RICOH IPS[Ii]O (\S+ \S+) (?:Ver )?[Vv]?(\S+) /.*$">
5974
+ <fingerprint pattern="^RICOH IPS[Ii]O (\S+ \S+) (?:Ver )?[Vv]?(\S+) /">
5919
5975
  <description>Generic Ricoh IPSIO multifunction device - variant 1</description>
5920
5976
  <example os.product="SP C301SF" os.version="1.26">RICOH IPSiO SP C301SF v1.26 / RICOH Network Printer C model /RICOH Network Scanner C model /RICOH Network Facsimile C model</example>
5921
5977
  <example os.product="SP C310" os.version="1.00">RICOH IPSiO SP C310 1.00 / RICOH Network Printer C model</example>
@@ -5927,7 +5983,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5927
5983
  <param pos="2" name="os.version"/>
5928
5984
  </fingerprint>
5929
5985
 
5930
- <fingerprint pattern="^RICOH Pro (\S+) (\S+) /.*$">
5986
+ <fingerprint pattern="^RICOH Pro (\S+) (\S+) /">
5931
5987
  <description>Generic Ricoh Pro multifunction device</description>
5932
5988
  <example>RICOH Pro 907EX 1.02 / RICOH Network Printer C model / RICOH Network Scanner C model</example>
5933
5989
  <param pos="0" name="os.vendor" value="Ricoh"/>
@@ -6019,7 +6075,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6019
6075
  SINDORICOH MF 4550_5550 version NR2.APS.N016 kernel 2.6.18.5 All-N-1
6020
6076
  -->
6021
6077
 
6022
- <fingerprint pattern="^Gestetner (\S+) (\S+) / Gestetner Network Printer.*$">
6078
+ <fingerprint pattern="^Gestetner (\S+) (\S+) / Gestetner Network Printer">
6023
6079
  <description>Gestetner Network Printer</description>
6024
6080
  <example>Gestetner C7640nD 1.01 / Gestetner Network Printer C model</example>
6025
6081
  <param pos="0" name="os.vendor" value="Ricoh"/>
@@ -6059,7 +6115,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6059
6115
  <param pos="1" name="os.product"/>
6060
6116
  </fingerprint>
6061
6117
 
6062
- <fingerprint pattern="^(?:IBM )?InfoPrint (?:\(v\d+\) )?(\d+\S+).*$">
6118
+ <fingerprint pattern="^(?:IBM )?InfoPrint (?:\(v\d+\) )?(\d+\S+)">
6063
6119
  <description>IBM Infoprint Printer</description>
6064
6120
  <example>IBM InfoPrint (v1) 21</example>
6065
6121
  <example>InfoPrint 4247-Z03</example>
@@ -6107,6 +6163,34 @@ Copyright (c) 1995-2005 by Cisco Systems
6107
6163
  <param pos="0" name="os.device" value="Router"/>
6108
6164
  </fingerprint>
6109
6165
 
6166
+ <fingerprint pattern="^(CSS\S+) SwOS v(\S+)$">
6167
+ <description>MikroTik Swtich</description>
6168
+ <example hw.product="CSS326-24G-2S+" os.version="2.13">CSS326-24G-2S+ SwOS v2.13</example>
6169
+ <param pos="0" name="os.vendor" value="MikroTik"/>
6170
+ <param pos="0" name="os.device" value="Switch"/>
6171
+ <param pos="0" name="os.product" value="SwOS"/>
6172
+ <param pos="0" name="hw.vendor" value="MikroTik"/>
6173
+ <param pos="0" name="hw.device" value="Switch"/>
6174
+ <param pos="1" name="hw.product"/>
6175
+ <param pos="2" name="os.version"/>
6176
+ </fingerprint>
6177
+
6178
+ <!--======================================================================
6179
+ NVIDIA
6180
+ =======================================================================-->
6181
+
6182
+ <fingerprint pattern="^Onyx,(MSN\S+),SWv(\S+)$">
6183
+ <description>NVIDIA MSN Switch</description>
6184
+ <example hw.product="MSN2700" os.version="3.9.3202">Onyx,MSN2700,SWv3.9.3202</example>
6185
+ <param pos="0" name="os.vendor" value="NVIDIA"/>
6186
+ <param pos="0" name="os.product" value="Onyx"/>
6187
+ <param pos="0" name="os.device" value="Switch"/>
6188
+ <param pos="0" name="hw.vendor" value="NVIDIA"/>
6189
+ <param pos="0" name="hw.device" value="Switch"/>
6190
+ <param pos="1" name="hw.product"/>
6191
+ <param pos="2" name="os.version"/>
6192
+ </fingerprint>
6193
+
6110
6194
  <!--======================================================================
6111
6195
  SAVIN
6112
6196
  =======================================================================-->
@@ -6121,7 +6205,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6121
6205
  <param pos="1" name="os.product"/>
6122
6206
  </fingerprint>
6123
6207
 
6124
- <fingerprint pattern="^SAVIN ((?:\S+ )?\S+) (\d\S+) / .*$">
6208
+ <fingerprint pattern="^SAVIN ((?:\S+ )?\S+) (\d\S+) /">
6125
6209
  <description>Savin Printer - version variant</description>
6126
6210
  <example>SAVIN 2522 5.20 / SAVIN Network Printer C model / SAVIN Network Scanner C model / SAVIN Network Facsimile C model</example>
6127
6211
  <example>SAVIN 9922DP 1.4.9 / RICOH Network Printer C model</example>
@@ -6137,7 +6221,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6137
6221
  Samsung
6138
6222
  =======================================================================-->
6139
6223
 
6140
- <fingerprint pattern="^Samsung(?: Samsung)? ([^;\s]+)(?: \d\S+)?(?: Series)?(?: Series)?;?\s*(?:OS )?V?([^\;\s]+)\s?.*?;.*Engine.*$">
6224
+ <fingerprint pattern="^Samsung(?: Samsung)? ([^;\s]+)(?: \d\S+)?(?: Series)?(?: Series)?;?\s*(?:OS )?V?([^\;\s]+)\s?.*?;.*Engine">
6141
6225
  <description>Samsung Printer</description>
6142
6226
  <example>Samsung CLP-300; CLP300N_V1.01.02.01 11-15-2006;Engine 1.01.57;NIC V4.01.06(CLP-300) 11-03-2006;S/N XXXXXXXXXXXXXXXX</example>
6143
6227
  <example>Samsung Samsung SCX-470x Series; V3.00.01.04 SEP-16-2011;Engine V1.02.05 09-02-2011;NIC V6.01.00;S/N XXXXXXXXXXXXXXXX</example>
@@ -6157,7 +6241,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6157
6241
  <param pos="1" name="os.product"/>
6158
6242
  </fingerprint>
6159
6243
 
6160
- <fingerprint pattern="^Samsung (CLP-705) Series; ; S/N.*$">
6244
+ <fingerprint pattern="^Samsung (CLP-705) Series; ; S/N">
6161
6245
  <description>Samsung Printer - serial number variant</description>
6162
6246
  <example>Samsung CLP-705 Series; ; S/N XXXXXXXXXXXXXXXX</example>
6163
6247
  <param pos="0" name="os.vendor" value="Samsung"/>
@@ -6265,7 +6349,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6265
6349
  SGI
6266
6350
  =======================================================================-->
6267
6351
 
6268
- <fingerprint pattern="^.{0,256} IRIX (?:version )?(\d+\S+).*$">
6352
+ <fingerprint pattern="^.{0,256} IRIX (?:version )?(\d+\S+)">
6269
6353
  <description>SGI IRIX</description>
6270
6354
  <example os.version="6.5">Silicon Graphics IRIS Indigo2 running IRIX version 6.5</example>
6271
6355
  <example os.version="5.3">Silicon Graphics IRIS Indigo2 Elan running IRIX 5.3</example>
@@ -6280,7 +6364,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6280
6364
  <param pos="0" name="os.cpe23" value="cpe:/o:sgi:irix:{os.version}"/>
6281
6365
  </fingerprint>
6282
6366
 
6283
- <fingerprint pattern="^.{0,256} IRIX64 (?:version )?(\d+\S+).*$">
6367
+ <fingerprint pattern="^.{0,256} IRIX64 (?:version )?(\d+\S+)">
6284
6368
  <description>SGI IRIX64</description>
6285
6369
  <example os.version="6.5">Silicon Graphics Challenge/1 running IRIX64 6.5</example>
6286
6370
  <example os.version="6.5">Silicon Graphics Fuel running IRIX64 version 6.5</example>
@@ -6388,7 +6472,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6388
6472
  <param pos="1" name="os.product"/>
6389
6473
  </fingerprint>
6390
6474
 
6391
- <fingerprint pattern="^Siemens (\S+)\s+(.*?Router) \(([^\)]+)\) v?(\S+)\s*.*$">
6475
+ <fingerprint pattern="^Siemens (\S+)\s+(.*?Router) \(([^\)]+)\) v?(\S+)\s*">
6392
6476
  <description>Siemens Router</description>
6393
6477
  <example>Siemens 5830 DMT Router (5830-001) v6.1.120 Copyright (C) 2004 Siemens Subscriber Networks, Inc. All Rights Reserved</example>
6394
6478
  <example>Siemens 5851 SDSL [ATM] Router (5851-648) v6.1.140 Copyright (C) 2004 Siemens Subscriber Networks, Inc. All Rights Reserved</example>
@@ -6401,7 +6485,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6401
6485
  <param pos="3" name="siemens.model"/>
6402
6486
  </fingerprint>
6403
6487
 
6404
- <fingerprint pattern="^Siemens (\S+)\s+(.*?)\s+\(([^\)]+)\) Router .*?v(\d+\S+)\s+.*$">
6488
+ <fingerprint pattern="^Siemens (\S+)\s+(.*?)\s+\(([^\)]+)\) Router .*?v(\d+\S+)\s+">
6405
6489
  <description>Siemens Router - variant 1</description>
6406
6490
  <example>Siemens 7950 G.SHDSL [ATM] (7950-001) Router with ISDN Voice v6.1.077 All Rights Reserved</example>
6407
6491
  <param pos="0" name="os.vendor" value="Siemens"/>
@@ -6412,7 +6496,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6412
6496
  <param pos="3" name="siemens.model"/>
6413
6497
  </fingerprint>
6414
6498
 
6415
- <fingerprint pattern="^Siemens, SIMATIC HMI, ([^,]+),.*FW:\s*V([^,]+).*$">
6499
+ <fingerprint pattern="^Siemens, SIMATIC HMI, ([^,]+),.*FW:\s*V([^,]+)">
6416
6500
  <description>Siemens HMI - firmware variant</description>
6417
6501
  <example hw.product="KTP1000 Basic PN">Siemens, SIMATIC HMI, KTP1000 Basic PN, 6AV6 647-0AF11-3AX0, HW: 1, FW: V01.06.00, Revision: 1</example>
6418
6502
  <example hw.version="01.06.00">Siemens, SIMATIC HMI, KTP600 Basic Mono PN, 6AV6647-0AB11-3AX0, HW:1, FW:V01.06.00</example>
@@ -6429,7 +6513,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6429
6513
  <param pos="2" name="hw.version"/>
6430
6514
  </fingerprint>
6431
6515
 
6432
- <fingerprint pattern="^Siemens, SIMATIC HMI, ([^,]+),.*SW:\s*V\s*(\d+ \d+ \d+).*$">
6516
+ <fingerprint pattern="^Siemens, SIMATIC HMI, ([^,]+),.*SW:\s*V\s*(\d+ \d+ \d+)">
6433
6517
  <description>Siemens HMI</description>
6434
6518
  <example hw.product="MP177">Siemens, SIMATIC HMI, MP177, 6AV6 642-0EA01-3AX0, HW: 0, SW: V 1 0 0</example>
6435
6519
  <example hw.version="1 0 2">Siemens, SIMATIC HMI, TP177B, 6AV6 642-0BD01-3AX0, HW: 0, SW: V 1 0 2</example>
@@ -6448,7 +6532,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6448
6532
  <param pos="2" name="hw.version"/>
6449
6533
  </fingerprint>
6450
6534
 
6451
- <fingerprint pattern="^Siemens, SIMATIC NET, ([^,]+),.*FW:\s*(?:Version )?V?([^,]+).*$">
6535
+ <fingerprint pattern="^Siemens, SIMATIC NET, ([^,]+),.*FW:\s*(?:Version )?V?([^,]+)">
6452
6536
  <description>Siemens NET - verbose variant</description>
6453
6537
  <example hw.product="CP 343-1 Advanced" hw.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>
6454
6538
  <example hw.product="CP 343-1 Lean" hw.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>
@@ -6480,7 +6564,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6480
6564
  <param pos="2" name="hw.version"/>
6481
6565
  </fingerprint>
6482
6566
 
6483
- <fingerprint pattern="^Siemens, SIMATIC S7, ([^,]+), .*?FW: (?:Version )?V?\.?([^,]+).*$">
6567
+ <fingerprint pattern="^Siemens, SIMATIC S7, ([^,]+), .*?FW: (?:Version )?V?\.?([^,]+)">
6484
6568
  <description>Siemens S7</description>
6485
6569
  <example hw.product="CPU-1200" hw.version="2.0.2">Siemens, SIMATIC S7, CPU-1200, 6ES7 211-1BD30-0XB0, HW: 1, FW: V.2.0.2, SZVX8YU9000553</example>
6486
6570
  <example hw.product="CPU315-2 PN/DP" hw.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>
@@ -6493,7 +6577,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6493
6577
  <param pos="2" name="hw.version"/>
6494
6578
  </fingerprint>
6495
6579
 
6496
- <fingerprint pattern="^Siemens, SIMATIC S7, ([^,]+), .*?, V\.([^,]+).*$">
6580
+ <fingerprint pattern="^Siemens, SIMATIC S7, ([^,]+), .*?, V\.([^,]+)">
6497
6581
  <description>Siemens S7 - variant 1</description>
6498
6582
  <example hw.product="CPU-1200">Siemens, SIMATIC S7, CPU-1200, 6ES7 212-1BD30-0XB0 SZVA1YU6008610 , 1, V.1.0.1, SZVA1YU6008610</example>
6499
6583
  <example hw.version="1.0.1">Siemens, SIMATIC S7, CPU-1200, 6ES7 212-1HD30-0XB0 SZVA3YU7002312 , 1, V.1.0.1, SZVA3YU7002312</example>
@@ -6516,7 +6600,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6516
6600
  <param pos="1" name="hw.product"/>
6517
6601
  </fingerprint>
6518
6602
 
6519
- <fingerprint pattern="^Siemens, SINUMERIK, solution line ([^,]+),.*?FW:V([^,]+).*$">
6603
+ <fingerprint pattern="^Siemens, SINUMERIK, solution line ([^,]+),.*?FW:V([^,]+)">
6520
6604
  <description>Siemens Sinumerik Solution Line</description>
6521
6605
  <example hw.product="PCU50">Siemens, SINUMERIK, solution line PCU50, , HW:1, FW:V00.00.00,</example>
6522
6606
  <example hw.version="00.00.00">Siemens, SINUMERIK, solution line PCU50.3B-P 1GB XP, 6FC5210-0DF33-2AB0, HW:A, FW:V00.00.00, ST-BN2040231</example>
@@ -6759,7 +6843,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6759
6843
  <param pos="0" name="os.cpe23" value="cpe:/o:sun:solaris:-"/>
6760
6844
  </fingerprint>
6761
6845
 
6762
- <fingerprint pattern="^Sun SNMP Agent,.*$">
6846
+ <fingerprint pattern="^Sun SNMP Agent,">
6763
6847
  <description>Sun SNMP agent on unknown Sun hardware</description>
6764
6848
  <example>Sun SNMP Agent, Ultra-whatever</example>
6765
6849
  <example>Sun SNMP Agent,</example>
@@ -6779,7 +6863,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6779
6863
  <param pos="0" name="os.device" value="Storage"/>
6780
6864
  </fingerprint>
6781
6865
 
6782
- <fingerprint pattern="^SunOS 5\.([789]|10) (\S+) sparc SUNW,([^,]+),.*$">
6866
+ <fingerprint pattern="^SunOS 5\.([789]|10) (\S+) sparc SUNW,([^,]+),">
6783
6867
  <description>SunOS/Solaris 5.7-5.10 - Call Manager variant</description>
6784
6868
  <example os.version="10" os.arch="sun4u" hw.product="Sun-Fire-V210">SunOS 5.10 sun4u sparc SUNW,Sun-Fire-V210, Class 4 Call Manager</example>
6785
6869
  <example>SunOS 5.10 sun4u sparc SUNW,Sun-Fire-V210, Class 5 Call Manager</example>
@@ -6801,7 +6885,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6801
6885
  <param pos="3" name="hw.product"/>
6802
6886
  </fingerprint>
6803
6887
 
6804
- <fingerprint pattern="^SunOS 5\.(1[1-9]) (\S+) sparc SUNW,([^,]+),.*$">
6888
+ <fingerprint pattern="^SunOS 5\.(1[1-9]) (\S+) sparc SUNW,([^,]+),">
6805
6889
  <description>Oracle/Solaris 5.11 and upwards - Call Manager variant</description>
6806
6890
  <example os.version="11" os.arch="sun4u" hw.product="Sun-Fire-V210">SunOS 5.11 sun4u sparc SUNW,Sun-Fire-V210, Class 4 Call Manager</example>
6807
6891
  <example os.version="12" os.arch="sun4u" hw.product="Sun-Fire-V210">SunOS 5.12 sun4u sparc SUNW,Sun-Fire-V210, Class 4 Call Manager</example>
@@ -6815,7 +6899,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6815
6899
  <param pos="3" name="hw.product"/>
6816
6900
  </fingerprint>
6817
6901
 
6818
- <fingerprint pattern="^SunOS (\S+) 5\.([789]|10) \S+ (\S+) \S+ SUNW,([^,]+).*$">
6902
+ <fingerprint pattern="^SunOS (\S+) 5\.([789]|10) \S+ (\S+) \S+ SUNW,([^,]+)">
6819
6903
  <description>SunOS/Solaris 5.7-5.10 - SUNW variant</description>
6820
6904
  <example host.name="integra01" os.version="10" os.arch="sun4v" hw.product="T5240">SunOS integra01 5.10 Generic_127127-11 sun4v sparc SUNW,T5240</example>
6821
6905
  <example>SunOS integra02 5.10 Generic_127127-11 sun4v sparc SUNW,T5240</example>
@@ -6835,7 +6919,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6835
6919
  <param pos="4" name="hw.product"/>
6836
6920
  </fingerprint>
6837
6921
 
6838
- <fingerprint pattern="^SunOS (\S+) 5\.(1[1-9]) \S+ (\S+) \S+ SUNW,([^,]+).*$">
6922
+ <fingerprint pattern="^SunOS (\S+) 5\.(1[1-9]) \S+ (\S+) \S+ SUNW,([^,]+)">
6839
6923
  <description>Oracle/Solaris 5.11 and upwards - SUNW variant</description>
6840
6924
  <example host.name="integra01" os.version="11" os.arch="sun4v" hw.product="T5240">SunOS integra01 5.11 Generic_127127-11 sun4v sparc SUNW,T5240</example>
6841
6925
  <example host.name="integra01" os.version="12" os.arch="sun4v" hw.product="T5240">SunOS integra01 5.12 Generic_127127-11 sun4v sparc SUNW,T5240</example>
@@ -6941,7 +7025,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6941
7025
  <param pos="0" name="os.device" value="WAP"/>
6942
7026
  </fingerprint>
6943
7027
 
6944
- <fingerprint pattern="^Symbol ((?:Spectrum24 (?:FHSS|Ethernet) )?Access Point)[,-].*S/W rev:\s*(\S+).*$">
7028
+ <fingerprint pattern="^Symbol ((?:Spectrum24 (?:FHSS|Ethernet) )?Access Point)[,-].*S/W rev:\s*(\S+)">
6945
7029
  <description>Symbol Access Point - detailed variant</description>
6946
7030
  <example os.product="Access Point" os.version="02.70-06">Symbol Access Point, S/W rev:- S/W rev: 02.70-06</example>
6947
7031
  <example os.product="Access Point" os.version="02.21-01">Symbol Access Point, S/W rev:02.21-01</example>
@@ -6953,7 +7037,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6953
7037
  <param pos="2" name="os.version"/>
6954
7038
  </fingerprint>
6955
7039
 
6956
- <fingerprint pattern="^Symbol (AP\S+|WS\S+) .* SW=(\S+) .*$">
7040
+ <fingerprint pattern="^Symbol (AP\S+|WS\S+) .* SW=(\S+)">
6957
7041
  <description>Symbol Access Point - abreviated variant</description>
6958
7042
  <example>Symbol AP-7131 HW=E SW=4.0.3.0-010R MIB=01h18</example>
6959
7043
  <example>Symbol AP5131 HW=A SW=0.0-045R MIB=01b15</example>
@@ -6983,7 +7067,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6983
7067
  Troy
6984
7068
  =======================================================================-->
6985
7069
 
6986
- <fingerprint pattern="^(?:\S+ )?PocketPro.*$">
7070
+ <fingerprint pattern="^(?:\S+ )?PocketPro">
6987
7071
  <description>Troy PocketPro Print Server</description>
6988
7072
  <example>PocketPro</example>
6989
7073
  <example>PocketPro 100</example>
@@ -7010,6 +7094,31 @@ Copyright (c) 1995-2005 by Cisco Systems
7010
7094
  <param pos="0" name="os.device" value="Multifunction Device"/>
7011
7095
  </fingerprint>
7012
7096
 
7097
+ <fingerprint pattern="^TOSHIBA TEC (B\S+)$">
7098
+ <description>Toshiba TEC Printer</description>
7099
+ <example>TOSHIBA TEC B-FV4</example>
7100
+ <param pos="0" name="hw.vendor" value="Toshiba"/>
7101
+ <param pos="0" name="hw.device" value="Printer"/>
7102
+ <param pos="1" name="hw.product"/>
7103
+ </fingerprint>
7104
+
7105
+ <!--======================================================================
7106
+ TRUENAS / FREENAS
7107
+ =======================================================================-->
7108
+
7109
+ <fingerprint pattern="^(TrueNAS|FreeNAS)-(\S+) \((?:\S+)\)\. Hardware: (\S+) ">
7110
+ <description>TrueNAS/FreeNAS Device</description>
7111
+ <example os.product="FreeNAS" os.version="11.3-U3.2">FreeNAS-11.3-U3.2 (1e9dd3b3e2). Hardware: amd64 Intel(R) Xeon(R) CPU E3-1230 v6 @ 3.50GHz running at 3504. Software: FreeBSD 11.3-RELEASE-p9 (revision 199506)</example>
7112
+ <example os.product="TrueNAS" os.version="12.0-U4.1">TrueNAS-12.0-U4.1 (fb0389beb0). Hardware: amd64 Intel(R) Xeon(R) CPU E5-1620 v3 @ 3.50GHz running at 3491 MHz. Software: FreeBSD 12.2-RELEASE-p6 (revision 199506)</example>
7113
+ <param pos="0" name="os.certainty" value="0.9"/>
7114
+ <param pos="0" name="os.vendor" value="iXsystems"/>
7115
+ <param pos="0" name="os.device" value="NAS"/>
7116
+ <param pos="0" name="hw.device" value="NAS"/>
7117
+ <param pos="1" name="os.product"/>
7118
+ <param pos="2" name="os.version"/>
7119
+ <param pos="3" name="os.arch"/>
7120
+ </fingerprint>
7121
+
7013
7122
  <!--======================================================================
7014
7123
  UBIQUITI
7015
7124
  =======================================================================-->
@@ -7052,9 +7161,10 @@ Copyright (c) 1995-2005 by Cisco Systems
7052
7161
  <param pos="0" name="os.device" value="Switch"/>
7053
7162
  </fingerprint>
7054
7163
 
7055
- <fingerprint pattern="^(USW-[^\s]+), ([0-9][.a-zA-Z0-9\-]+), Linux ([0-9][.a-zA-Z0-9\-]+)$">
7164
+ <fingerprint pattern="^(US[W]?-[^\s]+), ([0-9][.a-zA-Z0-9\-]+), Linux ([0-9][.a-zA-Z0-9\-]+)$">
7056
7165
  <description>Ubiquiti Switch w/Version and Linux version</description>
7057
7166
  <example hw.product="USW-8P-60" hw.version="4.3.20.11298" os.version="3.6.5">USW-8P-60, 4.3.20.11298, Linux 3.6.5</example>
7167
+ <example hw.product="US-24-500W" hw.version="5.43.36.12724" os.version="3.6.5">US-24-500W, 5.43.36.12724, Linux 3.6.5</example>
7058
7168
  <param pos="0" name="hw.vendor" value="Ubiquiti"/>
7059
7169
  <param pos="0" name="hw.device" value="Switch"/>
7060
7170
  <param pos="1" name="hw.product"/>
@@ -7065,9 +7175,10 @@ Copyright (c) 1995-2005 by Cisco Systems
7065
7175
  <param pos="3" name="os.version"/>
7066
7176
  </fingerprint>
7067
7177
 
7068
- <fingerprint pattern="^(USW-[^\s]+), ([0-9][.a-zA-Z0-9\-]+)$">
7178
+ <fingerprint pattern="^(USW-[^\s,]+)(?:,)? ([0-9][.a-zA-Z0-9\-]+)$">
7069
7179
  <description>Ubiquiti Switch w/Version (no Linux version)</description>
7070
7180
  <example hw.product="USW-5-Flex" hw.version="4.0.80.10875">USW-5-Flex, 4.0.80.10875</example>
7181
+ <example hw.product="USW-Flex" hw.version="5.64.8.13083">USW-Flex 5.64.8.13083</example>
7071
7182
  <param pos="0" name="hw.vendor" value="Ubiquiti"/>
7072
7183
  <param pos="0" name="hw.device" value="Switch"/>
7073
7184
  <param pos="1" name="hw.product"/>
@@ -7081,7 +7192,7 @@ Copyright (c) 1995-2005 by Cisco Systems
7081
7192
  UNISYS
7082
7193
  =======================================================================-->
7083
7194
 
7084
- <fingerprint pattern="^Unisys (\S+) version (\S+) kernel .*$">
7195
+ <fingerprint pattern="^Unisys (\S+) version (\S+) kernel">
7085
7196
  <description>Unisys printer</description>
7086
7197
  <example>Unisys UDS544 version NS.NP.N219 kernel 2.6.6 All-N-1</example>
7087
7198
  <param pos="0" name="os.vendor" value="Unisys"/>
@@ -7098,6 +7209,20 @@ Copyright (c) 1995-2005 by Cisco Systems
7098
7209
  <param pos="0" name="os.cpe23" value="cpe:/o:windriver:vxworks:-"/>
7099
7210
  </fingerprint>
7100
7211
 
7212
+ <!--======================================================================
7213
+ VBrick
7214
+ =======================================================================-->
7215
+
7216
+ <fingerprint pattern="^VBrick Systems Inc., Model (\d+) Serial (\d+)$">
7217
+ <description>VBrick Video Encoder</description>
7218
+ <example hw.model="4300" hw.serial_number="01010101010">VBrick Systems Inc., Model 4300 Serial 01010101010</example>
7219
+ <param pos="0" name="hw.vendor" value="VBrick"/>
7220
+ <param pos="0" name="hw.device" value="Video Encoder"/>
7221
+ <param pos="1" name="hw.model"/>
7222
+ <param pos="0" name="hw.product" value="{hw.device} {hw.model}"/>
7223
+ <param pos="2" name="hw.serial_number"/>
7224
+ </fingerprint>
7225
+
7101
7226
  <!--======================================================================
7102
7227
  VMware
7103
7228
  =======================================================================-->
@@ -7140,7 +7265,7 @@ Copyright (c) 1995-2005 by Cisco Systems
7140
7265
  XEROX
7141
7266
  =======================================================================-->
7142
7267
 
7143
- <fingerprint pattern="^Xerox Phaser ([^;]+);\sOS\s(\d+\.\d+\.\d+\.\d+).*$" certainty="1.0">
7268
+ <fingerprint pattern="^Xerox Phaser ([^;]+);\sOS\s(\d+\.\d+\.\d+\.\d+)" certainty="1.0">
7144
7269
  <description>Xerox Phaser 3000MFP Series </description>
7145
7270
  <example hw.product="3300MFP" os.version="1.50.00.17">Xerox Phaser 3300MFP; OS 1.50.00.17 05-07-2013, Engine 1.05.44, NIC V4.03.01(P3300MFP), PCL5e 6.08.01 11-10-2009, PCL6 5.98 09-23-2009, PS3 V2.19.06 12-15-2010, SPL 5.24 03-27-2006, PDF V1.00.32 02-25-2006, IBM/EPSON 5.22 09-24-2009</example>
7146
7271
  <example hw.product="3300MFP" os.version="1.50.00.14">Xerox Phaser 3300MFP; OS 1.50.00.14 07-16-2009, Engine 1.05.44, NIC V4.02.06(P3300MFP) 07-16-2009, PCL5e 5.93 03-19-2009, PCL6 5.94 05-11-2009, PS3 V1.99.06 04-09-2009, SPL 5.24 03-27-2006, PDF V1.00.32 02-25-2006, IBM/EPSON 5.20 02-03-2009</example>
@@ -7154,7 +7279,7 @@ Copyright (c) 1995-2005 by Cisco Systems
7154
7279
  <param pos="2" name="os.version"/>
7155
7280
  </fingerprint>
7156
7281
 
7157
- <fingerprint pattern="^Xerox WorkCentre ([^;]+);\s+SS\s+(\d+\.\d+\.\d+\.\d+).*$" certainty="1.0">
7282
+ <fingerprint pattern="^Xerox WorkCentre ([^;]+);\s+SS\s+(\d+\.\d+\.\d+\.\d+)" certainty="1.0">
7158
7283
  <description>Xerox WorkCentre 3345/3335 Printers</description>
7159
7284
  <example hw.product="3335" os.version="60.004.00.000">Xerox WorkCentre 3335; SS 60.004.00.000, NC 4.00.50.73, UI V5.51.00.31.00_17030801, ME V0.00.39, CCOS 6.9.P</example>
7160
7285
  <example hw.product="3345" os.version="60.001.01.000">Xerox WorkCentre 3345; SS 60.001.01.000, NC 4.00.50.46, UI V5.51.00.29.00_16052717, ME V0.00.37, CCOS 6.9.P</example>
@@ -7168,7 +7293,7 @@ Copyright (c) 1995-2005 by Cisco Systems
7168
7293
  <param pos="2" name="os.version"/>
7169
7294
  </fingerprint>
7170
7295
 
7171
- <fingerprint pattern="^Xerox (B\d+) Multifunction Printer; SS\s+(\d+\.\d+\.\d+\.\d+).*$" certainty="1.0">
7296
+ <fingerprint pattern="^Xerox (B\d+) Multifunction Printer; SS\s+(\d+\.\d+\.\d+\.\d+)" certainty="1.0">
7172
7297
  <description>Xerox B series Multfunction Printer</description>
7173
7298
  <example hw.product="B1025" os.version="75.000.77.000">Xerox B1025 Multifunction Printer; SS 75.000.77.000, NC V4.00.50, UI V5.52.00.08.00_18032319, ME V0.00.25 03-20-2018, CCOS 6.9.P</example>
7174
7299
  <param pos="0" name="os.vendor" value="Xerox"/>
@@ -7181,7 +7306,7 @@ Copyright (c) 1995-2005 by Cisco Systems
7181
7306
  <param pos="2" name="os.version"/>
7182
7307
  </fingerprint>
7183
7308
 
7184
- <fingerprint pattern="^Xerox (Phaser [^;]+).*[, ]OS ([^;,]+).*$" certainty="1.0">
7309
+ <fingerprint pattern="^Xerox (Phaser [^;]+).*[, ]OS ([^;,]+)" certainty="1.0">
7185
7310
  <description>Xerox Phaser Laser Printer - OS variant</description>
7186
7311
  <example>Xerox Phaser 5500DN;PS G02.10,Net 22.42.11.22.2004,Eng 11.42.00,OS 4.46;SN RET570148</example>
7187
7312
  <example>Xerox Phaser 6350DP;PS 5.0.0,Net 24.98.07.15.2005,Eng 3.2.0,OS 5.98</example>
@@ -7201,7 +7326,7 @@ Copyright (c) 1995-2005 by Cisco Systems
7201
7326
  <param pos="2" name="os.version"/>
7202
7327
  </fingerprint>
7203
7328
 
7204
- <fingerprint pattern="^Xerox (Phaser .+) v\(.*/([^/]+)\).*$" certainty="1.0">
7329
+ <fingerprint pattern="^Xerox (Phaser .+) v\(.*/([^/]+)\)" certainty="1.0">
7205
7330
  <description>Xerox Phaser Laser Printer - memory variant</description>
7206
7331
  <example>Xerox Phaser 6200 DX v(2.12/14.66.02.22.2002/1.6.7/4.26) Printer 256MB LPH130287</example>
7207
7332
  <param pos="0" name="os.vendor" value="Xerox"/>
@@ -7214,7 +7339,7 @@ Copyright (c) 1995-2005 by Cisco Systems
7214
7339
  <param pos="2" name="os.version"/>
7215
7340
  </fingerprint>
7216
7341
 
7217
- <fingerprint pattern="^Xerox (Phaser [^;]+);.*$" certainty="1.0">
7342
+ <fingerprint pattern="^Xerox (Phaser [^;]+);" certainty="1.0">
7218
7343
  <description>Xerox Phaser Laser Printer</description>
7219
7344
  <example>Xerox Phaser 6140N; NIC 14.31,ESS 200905190951,IOT 02.01.00,Boot 200809191035</example>
7220
7345
  <example>Xerox Phaser 6180MFP-D; Net 11.74,ESS 200802151717,IOT 05.09.00,Boot 200706151125</example>
@@ -7228,7 +7353,7 @@ Copyright (c) 1995-2005 by Cisco Systems
7228
7353
  <param pos="1" name="os.product"/>
7229
7354
  </fingerprint>
7230
7355
 
7231
- <fingerprint pattern="^Xerox Document Centre Multi-function System.*$">
7356
+ <fingerprint pattern="^Xerox Document Centre Multi-function System">
7232
7357
  <description>Xerox Document Centre Multi-function System</description>
7233
7358
  <example>Xerox Document Centre Multi-function System, ESS 0.19.12.011.1, IOT 28.52.0, UI 0.10.27.31, Finisher 7.95.0</example>
7234
7359
  <example>Xerox Document Centre Multi-function System, ESS 0.19.02.503.6, IOT 0.19.2.503, UI 0.19.2.503</example>
@@ -7255,7 +7380,7 @@ Copyright (c) 1995-2005 by Cisco Systems
7255
7380
  <param pos="2" name="os.version"/>
7256
7381
  </fingerprint>
7257
7382
 
7258
- <fingerprint pattern="^Xerox WorkCentre Pro Multifunction System[,;] .*$" certainty="1.0">
7383
+ <fingerprint pattern="^Xerox WorkCentre Pro Multifunction System[,;]" certainty="1.0">
7259
7384
  <description>Xerox WorkCentre Pro Laser Printer</description>
7260
7385
  <example>Xerox WorkCentre Pro Multifunction System, ESS 0.C03.04.510.01, IOT 9.0.3, UI 0.1.4.509, Scanner 1.4.0</example>
7261
7386
  <example>Xerox WorkCentre Pro Multifunction System, ESS 0.C03.04.510.01, IOT 9.0.3, UI 0.1.4.509, Finisher 3.8.0, Scanner 1.4.0</example>
@@ -7269,7 +7394,7 @@ Copyright (c) 1995-2005 by Cisco Systems
7269
7394
  <param pos="0" name="hw.device" value="Printer"/>
7270
7395
  </fingerprint>
7271
7396
 
7272
- <fingerprint pattern="^Xerox (WorkCentre [^\s;]+).*$" certainty="1.0">
7397
+ <fingerprint pattern="^Xerox (WorkCentre [^\s;]+)" certainty="1.0">
7273
7398
  <description>Xerox WorkCentre</description>
7274
7399
  <example>Xerox WorkCentre 5665 v1 Multifunction System; System Software 000.000.000.00000, ESS</example>
7275
7400
  <example>Xerox WorkCentre 7132;ESS PS1.202.1,IOT 10.5.0,FIN B12.12.0,IIT 7.5.0,ADF 11.6.3,FAX 1.30.50</example>
@@ -7282,7 +7407,7 @@ Copyright (c) 1995-2005 by Cisco Systems
7282
7407
  <param pos="0" name="hw.device" value="Printer"/>
7283
7408
  </fingerprint>
7284
7409
 
7285
- <fingerprint pattern="^Xerox (\S+ [^\s;]+).*$" certainty="1.0">
7410
+ <fingerprint pattern="^Xerox (\S+ [^\s;]+)" certainty="1.0">
7286
7411
  <description>Xerox Default</description>
7287
7412
  <example>Xerox ColorQube 9203; System Software 000.000.000.00000, ESS</example>
7288
7413
  <example>Xerox DocuTech 6115; DocuSP CP.4205.90</example>
@@ -7294,7 +7419,7 @@ Copyright (c) 1995-2005 by Cisco Systems
7294
7419
  <param pos="0" name="hw.device" value="Printer"/>
7295
7420
  </fingerprint>
7296
7421
 
7297
- <fingerprint pattern="^XEROX (\d{4} WIDE FORMAT) PRINTER; ACCXES (\d+.\d+) \d+, IOT .*$" certainty="1.0">
7422
+ <fingerprint pattern="^XEROX (\d{4} WIDE FORMAT) PRINTER; ACCXES (\d+.\d+) \d+, IOT" certainty="1.0">
7298
7423
  <description>Xerox Wide Format Printer</description>
7299
7424
  <example>XEROX 6204 WIDE FORMAT PRINTER; ACCXES 15.0 136, IOT 01.01.07</example>
7300
7425
  <param pos="0" name="os.vendor" value="Xerox"/>
@@ -7306,7 +7431,7 @@ Copyright (c) 1995-2005 by Cisco Systems
7306
7431
  <param pos="2" name="os.version"/>
7307
7432
  </fingerprint>
7308
7433
 
7309
- <fingerprint pattern="^XEROX (WIDE FORMAT \d{4}) PRINTER; ACCXES (\d+.\d+) \d+, IOT .*$" certainty="1.0">
7434
+ <fingerprint pattern="^XEROX (WIDE FORMAT \d{4}) PRINTER; ACCXES (\d+.\d+) \d+, IOT" certainty="1.0">
7310
7435
  <description>Xerox Wide Format Printer - variant 1</description>
7311
7436
  <example>XEROX WIDE FORMAT 6605 PRINTER; ACCXES 14.0 142, IOT 01.01.04XXXXXX</example>
7312
7437
  <example>XEROX WIDE FORMAT 6604 PRINTER; ACCXES 14.0 142, IOT 01.01.04XXXXXX</example>
@@ -7324,7 +7449,7 @@ Copyright (c) 1995-2005 by Cisco Systems
7324
7449
  Xyplex
7325
7450
  =======================================================================-->
7326
7451
 
7327
- <fingerprint pattern="^.*Xyplex hardware (\S+) .*Xyplex software Terminal Server V(\S+)\s*$">
7452
+ <fingerprint pattern="Xyplex hardware (\S+) .*Xyplex software Terminal Server V(\S+)\s*$">
7328
7453
  <description>Xyplex Terminal Server</description>
7329
7454
  <example>- Netlink-Xyplex Xyplex hardware MX-1600 00.00.00 Rom 470000 Xyplex software Terminal Server V6.0S91 </example>
7330
7455
  <example>- WTF? Xyplex hardware CSERV-20 00.00.00 Rom 470000 Xyplex software Terminal Server V6.0.3 </example>