recog 2.3.12 → 2.3.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (46) hide show
  1. checksums.yaml +4 -4
  2. data/.github/SECURITY.md +35 -0
  3. data/.snyk +10 -0
  4. data/LICENSE +1 -1
  5. data/bin/recog_standardize +2 -2
  6. data/cpe-remap.yaml +46 -14
  7. data/identifiers/hw_device.txt +3 -4
  8. data/identifiers/hw_family.txt +6 -0
  9. data/identifiers/hw_product.txt +17 -6
  10. data/identifiers/os_architecture.txt +0 -10
  11. data/identifiers/os_device.txt +11 -31
  12. data/identifiers/os_family.txt +1 -95
  13. data/identifiers/os_product.txt +9 -117
  14. data/identifiers/service_family.txt +4 -36
  15. data/identifiers/service_product.txt +211 -92
  16. data/identifiers/vendor.txt +46 -194
  17. data/lib/recog/version.rb +1 -1
  18. data/requirements.txt +1 -1
  19. data/update_cpes.py +93 -45
  20. data/xml/dns_versionbind.xml +39 -16
  21. data/xml/favicons.xml +42 -17
  22. data/xml/ftp_banners.xml +39 -24
  23. data/xml/hp_pjl_id.xml +1 -1
  24. data/xml/html_title.xml +72 -22
  25. data/xml/http_cookies.xml +4 -1
  26. data/xml/http_servers.xml +342 -73
  27. data/xml/http_wwwauth.xml +20 -20
  28. data/xml/imap_banners.xml +39 -0
  29. data/xml/ldap_searchresult.xml +9 -6
  30. data/xml/ntp_banners.xml +1 -1
  31. data/xml/operating_system.xml +1 -0
  32. data/xml/pop_banners.xml +55 -2
  33. data/xml/sip_user_agents.xml +3 -3
  34. data/xml/smb_native_os.xml +1 -0
  35. data/xml/smtp_banners.xml +7 -2
  36. data/xml/smtp_help.xml +2 -0
  37. data/xml/smtp_vrfy.xml +2 -1
  38. data/xml/snmp_sysdescr.xml +125 -87
  39. data/xml/ssh_banners.xml +1 -1
  40. data/xml/telnet_banners.xml +155 -15
  41. data/xml/x509_issuers.xml +8 -5
  42. data/xml/x509_subjects.xml +25 -17
  43. metadata +4 -5
  44. data/identifiers/software_class.txt +0 -26
  45. data/identifiers/software_family.txt +0 -91
  46. data/identifiers/software_product.txt +0 -333
data/xml/smtp_vrfy.xml CHANGED
@@ -86,7 +86,8 @@
86
86
  <description>Symantec Mail Security</description>
87
87
  <example>504 &lt;foo&gt;: Recipient address rejected: need fully-qualified address</example>
88
88
  <param pos="0" name="service.vendor" value="Symantec"/>
89
- <param pos="0" name="service.product" value="Symantec Mail Security for SMTP"/>
89
+ <param pos="0" name="service.product" value="Mail Security for SMTP"/>
90
+ <param pos="0" name="service.cpe23" value="cpe:/a:symantec:mail_security_for_smtp:-"/>
90
91
  </fingerprint>
91
92
 
92
93
  <fingerprint pattern="^252 Unable to VRFY &quot;.*&quot;, but will accept message and attempt delivery *$">
data/xml/snmp_sysdescr.xml CHANGED
@@ -932,7 +932,7 @@
932
932
  <example>Monarch M09855 FW Ver 6.2 / 7411 Network Adapter FW Ver CAMO-7.60, 802.11b-g WiFi FW Ver</example>
933
933
  <example>Monarch M09855 FW Ver 6.2 / 7411 Network Adapter FW Ver CAMO-7.60, 802.11b-g WiFi FW Ver / Verifier</example>
934
934
  <param pos="0" name="os.vendor" value="Avery Dennison"/>
935
- <param pos="0" name="os.device" value="Print server"/>
935
+ <param pos="0" name="os.device" value="Print Server"/>
936
936
  <param pos="1" name="os.product"/>
937
937
  </fingerprint>
938
938
 
@@ -985,7 +985,7 @@
985
985
  <example os.product="NPS 550R Printer Server" os.version="4.11">Axis NPS 550R Printer Server V4.11 Mar 1 1994</example>
986
986
  <example os.product="NPS 550RPrint server" os.version="5.22">Axis NPS 550RPrint serverV5.22 Oct 07 1996</example>
987
987
  <param pos="0" name="os.vendor" value="Axis"/>
988
- <param pos="0" name="os.device" value="Print server"/>
988
+ <param pos="0" name="os.device" value="Print Server"/>
989
989
  <param pos="1" name="os.product"/>
990
990
  <param pos="2" name="os.version"/>
991
991
  </fingerprint>
@@ -1001,7 +1001,7 @@
1001
1001
  <example os.product="SG400" os.version="4.1.1.1" os.version.version="22695">Blue Coat SG400, ProxySG Version: SGOS 4.1.1.1, Release id: 22695</example>
1002
1002
  <example os.product="SG8100" os.version="4.3.4.1" os.version.version="52168">Blue Coat SG8100 Series, ProxySG Version: SGOS 4.3.4.1, Release id: 52168</example>
1003
1003
  <param pos="0" name="os.vendor" value="Blue Coat"/>
1004
- <param pos="0" name="os.device" value="Web proxy"/>
1004
+ <param pos="0" name="os.device" value="Web Proxy"/>
1005
1005
  <param pos="1" name="os.product"/>
1006
1006
  <param pos="2" name="os.version"/>
1007
1007
  <param pos="3" name="os.version.version"/>
@@ -1011,7 +1011,7 @@
1011
1011
  <description>Blue Coat ProxyAV</description>
1012
1012
  <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
1013
  <param pos="0" name="os.vendor" value="Blue Coat"/>
1014
- <param pos="0" name="os.device" value="Web proxy"/>
1014
+ <param pos="0" name="os.device" value="Web Proxy"/>
1015
1015
  <param pos="1" name="os.product"/>
1016
1016
  <param pos="2" name="os.version"/>
1017
1017
  <param pos="3" name="os.version.version"/>
@@ -1320,7 +1320,7 @@
1320
1320
  <description>Canon Camera</description>
1321
1321
  <example>Canon Network Camera VB-C60</example>
1322
1322
  <param pos="0" name="os.vendor" value="Canon"/>
1323
- <param pos="0" name="os.device" value="Web cam"/>
1323
+ <param pos="0" name="os.device" value="IP Camera"/>
1324
1324
  <param pos="1" name="os.product"/>
1325
1325
  </fingerprint>
1326
1326
 
@@ -1345,7 +1345,7 @@
1345
1345
  <description>Castelle FaxPress</description>
1346
1346
  <param pos="0" name="os.vendor" value="Castelle"/>
1347
1347
  <param pos="0" name="os.product" value="FaxPress"/>
1348
- <param pos="0" name="os.device" value="Fax server"/>
1348
+ <param pos="0" name="os.device" value="Fax Server"/>
1349
1349
  </fingerprint>
1350
1350
 
1351
1351
  <!--======================================================================
@@ -1554,7 +1554,7 @@
1554
1554
  <param pos="0" name="os.vendor" value="Cisco"/>
1555
1555
  <param pos="0" name="os.family" value="760 Series"/>
1556
1556
  <param pos="0" name="os.product" value="761"/>
1557
- <param pos="0" name="os.device" value="Broadband router"/>
1557
+ <param pos="0" name="os.device" value="Broadband Router"/>
1558
1558
  <param pos="1" name="os.version"/>
1559
1559
  </fingerprint>
1560
1560
 
@@ -1807,6 +1807,7 @@ Copyright (c) 1995-2005 by Cisco Systems
1807
1807
  <param pos="0" name="os.product" value="DD OS"/>
1808
1808
  <param pos="0" name="os.device" value="Storage"/>
1809
1809
  <param pos="1" name="os.version"/>
1810
+ <param pos="0" name="os.cpe23" value="cpe:/o:dell:emc_data_domain_os:{os.version}"/>
1810
1811
  </fingerprint>
1811
1812
 
1812
1813
  <!--======================================================================
@@ -1831,7 +1832,7 @@ Copyright (c) 1995-2005 by Cisco Systems
1831
1832
  <example>Datamax Printer</example>
1832
1833
  <param pos="0" name="os.vendor" value="Datamax"/>
1833
1834
  <param pos="0" name="os.device" value="Printer"/>
1834
- <param pos="0" name="os.product" value="Print server"/>
1835
+ <param pos="0" name="os.product" value="Print Server"/>
1835
1836
  </fingerprint>
1836
1837
 
1837
1838
  <!--======================================================================
@@ -2403,7 +2404,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2403
2404
  <param pos="2" name="hw.product"/>
2404
2405
  <param pos="3" name="os.version"/>
2405
2406
  <param pos="4" name="os.version.version"/>
2406
- <param pos="0" name="os.cpe23" value="cpe:/o:hp:tru64:{os.version}"/>
2407
+ <param pos="0" name="os.cpe23" value="cpe:/o:hp:tru64_unix:{os.version}"/>
2407
2408
  </fingerprint>
2408
2409
 
2409
2410
  <fingerprint pattern="^(\S+) (.*?) Digital UNIX V(\S+)\s+\(Rev\. ([^\)]+)\).*TCP/IP$">
@@ -2970,7 +2971,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2970
2971
  <example>HP ETHERNET MULTI-ENVIRONMENT</example>
2971
2972
  <param pos="0" name="os.vendor" value="HP"/>
2972
2973
  <param pos="0" name="os.family" value="JetDirect"/>
2973
- <param pos="0" name="os.device" value="Print server"/>
2974
+ <param pos="0" name="os.device" value="Print Server"/>
2974
2975
  </fingerprint>
2975
2976
 
2976
2977
  <fingerprint pattern="^HP ETHERNET MULTI-ENVIRONMENT,ROM (\S+?),JETDIRECT(?: EX)?,(\w+),EEPROM.*$">
@@ -2981,7 +2982,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2981
2982
  <example>HP ETHERNET MULTI-ENVIRONMENT,ROM B.25.01,JETDIRECT,JD118,EEPROM D.27.02,CIDATE 03/23/2004</example>
2982
2983
  <param pos="0" name="os.vendor" value="HP"/>
2983
2984
  <param pos="0" name="os.family" value="JetDirect"/>
2984
- <param pos="0" name="os.device" value="Print server"/>
2985
+ <param pos="0" name="os.device" value="Print Server"/>
2985
2986
  <param pos="1" name="os.version"/>
2986
2987
  <param pos="2" name="os.product"/>
2987
2988
  </fingerprint>
@@ -3389,7 +3390,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3389
3390
  <param pos="0" name="os.vendor" value="Intel"/>
3390
3391
  <param pos="0" name="os.family" value="NetportExpress"/>
3391
3392
  <param pos="0" name="os.product" value="PRO/100"/>
3392
- <param pos="0" name="os.device" value="Print server"/>
3393
+ <param pos="0" name="os.device" value="Print Server"/>
3393
3394
  </fingerprint>
3394
3395
 
3395
3396
  <!--======================================================================
@@ -3401,7 +3402,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3401
3402
  <example>Intermec CX Terminal</example>
3402
3403
  <param pos="0" name="os.vendor" value="Intermec"/>
3403
3404
  <param pos="0" name="os.product" value="CX Data Collection Terminal"/>
3404
- <param pos="0" name="os.device" value="POS"/>
3405
+ <param pos="0" name="os.device" value="Point of Sale"/>
3405
3406
  </fingerprint>
3406
3407
 
3407
3408
  <fingerprint pattern="^Thermal Label Printer Intermec (\S+)$">
@@ -3848,7 +3849,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3848
3849
  <param pos="0" name="os.certainty" value="1.0"/>
3849
3850
  <param pos="0" name="os.vendor" value="Lexmark"/>
3850
3851
  <param pos="0" name="os.family" value="MarkNet"/>
3851
- <param pos="0" name="os.device" value="Print server"/>
3852
+ <param pos="0" name="os.device" value="Print Server"/>
3852
3853
  <param pos="1" name="os.product"/>
3853
3854
  <param pos="2" name="os.version"/>
3854
3855
  </fingerprint>
@@ -3933,7 +3934,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3933
3934
  <description>Lexmark Printer - print server variant</description>
3934
3935
  <example>Lexmark C500 PS Print Server</example>
3935
3936
  <param pos="0" name="os.vendor" value="Lexmark"/>
3936
- <param pos="0" name="os.device" value="Print server"/>
3937
+ <param pos="0" name="os.device" value="Print Server"/>
3937
3938
  <param pos="1" name="os.product"/>
3938
3939
  </fingerprint>
3939
3940
 
@@ -4740,7 +4741,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4740
4741
  <example>LX Console Manager, s/w version=5.3.9</example>
4741
4742
  <param pos="0" name="os.vendor" value="MRV Communications"/>
4742
4743
  <param pos="0" name="os.product" value="LX"/>
4743
- <param pos="0" name="os.device" value="Remote access server"/>
4744
+ <param pos="0" name="os.device" value="Remote Access Server"/>
4744
4745
  <param pos="1" name="os.version"/>
4745
4746
  </fingerprint>
4746
4747
 
@@ -4753,7 +4754,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4753
4754
  <example>RASExpress Server Version 5.63</example>
4754
4755
  <param pos="0" name="os.vendor" value="MultiTech"/>
4755
4756
  <param pos="0" name="os.product" value="RASExpress"/>
4756
- <param pos="0" name="os.device" value="Remote access server"/>
4757
+ <param pos="0" name="os.device" value="Remote Access Server"/>
4757
4758
  <param pos="1" name="os.version"/>
4758
4759
  </fingerprint>
4759
4760
 
@@ -4784,7 +4785,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4784
4785
  <param pos="0" name="os.vendor" value="NetApp"/>
4785
4786
  <param pos="0" name="os.family" value="Data ONTAP"/>
4786
4787
  <param pos="0" name="os.product" value="Data ONTAP"/>
4787
- <param pos="0" name="os.device" value="File server"/>
4788
+ <param pos="0" name="os.device" value="File Server"/>
4788
4789
  <param pos="1" name="os.version"/>
4789
4790
  <param pos="0" name="os.cpe23" value="cpe:/o:netapp:data_ontap:{os.version}"/>
4790
4791
  </fingerprint>
@@ -4833,7 +4834,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4833
4834
  <example>Netopia R9100 v4.8.2</example>
4834
4835
  <param pos="0" name="os.vendor" value="Netopia"/>
4835
4836
  <param pos="0" name="os.family" value="Netopia"/>
4836
- <param pos="0" name="os.device" value="Broadband router"/>
4837
+ <param pos="0" name="os.device" value="Broadband Router"/>
4837
4838
  <param pos="1" name="os.product"/>
4838
4839
  <param pos="2" name="os.version"/>
4839
4840
  </fingerprint>
@@ -4997,7 +4998,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4997
4998
  <example os.product="2424">Nortel Application Switch 2424</example>
4998
4999
  <param pos="0" name="os.vendor" value="Nortel"/>
4999
5000
  <param pos="0" name="os.family" value="Application Switch"/>
5000
- <param pos="0" name="os.device" value="Load balancer"/>
5001
+ <param pos="0" name="os.device" value="Load Balancer"/>
5001
5002
  <param pos="1" name="os.product"/>
5002
5003
  </fingerprint>
5003
5004
 
@@ -5258,7 +5259,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5258
5259
  <param pos="0" name="os.family" value="NC Series"/>
5259
5260
  <param pos="1" name="os.product"/>
5260
5261
  <param pos="2" name="os.version"/>
5261
- <param pos="0" name="os.device" value="Print server"/>
5262
+ <param pos="0" name="os.device" value="Print Server"/>
5262
5263
  </fingerprint>
5263
5264
 
5264
5265
  <fingerprint pattern="^Oce (im\d+)$">
@@ -5445,7 +5446,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5445
5446
  <example>OKI OkiLAN 6400e Rev. 10/100BASE Ethernet PrintServer: Attached to B720n Rev.7.1b1: (C)2005 OKI DATA CORP</example>
5446
5447
  <example>OKI OkiLAN 6400e Rev. 10/100BASE Ethernet PrintServer: Attached to B930 Rev.3.6: (C)2005 OKI DATA CORP</example>
5447
5448
  <param pos="0" name="os.vendor" value="Oki"/>
5448
- <param pos="0" name="os.device" value="Print server"/>
5449
+ <param pos="0" name="os.device" value="Print Server"/>
5449
5450
  <param pos="1" name="os.product"/>
5450
5451
  </fingerprint>
5451
5452
 
@@ -5454,7 +5455,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5454
5455
  <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>
5455
5456
  <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>
5456
5457
  <param pos="0" name="os.vendor" value="Oki"/>
5457
- <param pos="0" name="os.device" value="Print server"/>
5458
+ <param pos="0" name="os.device" value="Print Server"/>
5458
5459
  <param pos="1" name="os.product"/>
5459
5460
  <param pos="2" name="os.version"/>
5460
5461
  </fingerprint>
@@ -5645,7 +5646,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5645
5646
  <example>Rectifier Technologies Pacific WebCSU 169-412 V1.30</example>
5646
5647
  <param pos="0" name="os.vendor" value="Rectifier Technologies"/>
5647
5648
  <param pos="0" name="os.family" value="RTP Power Controller"/>
5648
- <param pos="0" name="os.device" value="Power device"/>
5649
+ <param pos="0" name="os.device" value="Power Device"/>
5649
5650
  <param pos="1" name="os.product"/>
5650
5651
  <param pos="2" name="os.version"/>
5651
5652
  </fingerprint>
@@ -5655,7 +5656,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5655
5656
  <example>Rectifier SNMP Server</example>
5656
5657
  <param pos="0" name="os.vendor" value="Rectifier Technologies"/>
5657
5658
  <param pos="0" name="os.family" value="RTP Power Controller"/>
5658
- <param pos="0" name="os.device" value="Power device"/>
5659
+ <param pos="0" name="os.device" value="Power Device"/>
5659
5660
  <param pos="0" name="os.product" value="WebCSU"/>
5660
5661
  </fingerprint>
5661
5662
 
@@ -6099,6 +6100,18 @@ Copyright (c) 1995-2005 by Cisco Systems
6099
6100
  <param pos="0" name="os.cpe23" value="cpe:/o:sonicwall:sonicos:{os.version}"/>
6100
6101
  </fingerprint>
6101
6102
 
6103
+ <fingerprint pattern="^SonicWALL (\S+).*?\(SonicOS \S+ ((?:\d\.)+\d+-\d+[a-zA-Z]).*\)">
6104
+ <description>SonicWall - SonicOS Enhanced variant without hardware model</description>
6105
+ <example hw.product="SOHO" os.version="5.9.1.4-4o">SonicWALL SOHO (SonicOS Enhanced 5.9.1.4-4o)</example>
6106
+ <example hw.product="SOHO" os.version="6.2.5.1-26n">SonicWALL SOHO wireless-N (SonicOS Enhanced 6.2.5.1-26n--HF175723-2n)</example>
6107
+ <param pos="0" name="os.vendor" value="SonicWall"/>
6108
+ <param pos="0" name="os.device" value="Firewall"/>
6109
+ <param pos="0" name="os.product" value="SonicOS"/>
6110
+ <param pos="1" name="hw.product"/>
6111
+ <param pos="2" name="os.version"/>
6112
+ <param pos="0" name="os.cpe23" value="cpe:/o:sonicwall:sonicos:{os.version}"/>
6113
+ </fingerprint>
6114
+
6102
6115
  <fingerprint pattern="^SonicWALL (.*?)\s+\(([^\)]+)\)\s*$">
6103
6116
  <description>SonicWall</description>
6104
6117
  <example>SonicWALL StrongARM / 233 Mhz (PRO 200)</example>
@@ -6314,96 +6327,121 @@ Copyright (c) 1995-2005 by Cisco Systems
6314
6327
 
6315
6328
  <fingerprint pattern="^Siemens, SIMATIC HMI, ([^,]+),.*FW:\s*V([^,]+).*$">
6316
6329
  <description>Siemens HMI - firmware variant</description>
6317
- <example>Siemens, SIMATIC HMI, KTP1000 Basic PN, 6AV6 647-0AF11-3AX0, HW: 1, FW: V01.06.00, Revision: 1</example>
6318
- <example>Siemens, SIMATIC HMI, KTP600 Basic Mono PN, 6AV6647-0AB11-3AX0, HW:1, FW:V01.06.00</example>
6330
+ <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>
6331
+ <example hw.version="01.06.00">Siemens, SIMATIC HMI, KTP600 Basic Mono PN, 6AV6647-0AB11-3AX0, HW:1, FW:V01.06.00</example>
6319
6332
  <example>Siemens, SIMATIC HMI, KTP600 Basic color PN, 6AV6 647-0AD11-3AX0, HW:1, FW:V11.00.02.00</example>
6320
- <param pos="0" name="os.vendor" value="Siemens"/>
6321
- <param pos="0" name="os.device" value="Monitoring"/>
6322
- <param pos="0" name="os.family" value="Simatic HMI"/>
6323
- <param pos="1" name="os.product"/>
6324
- <param pos="2" name="os.version"/>
6333
+ <param pos="0" name="os.vendor" value="Microsoft"/>
6334
+ <param pos="0" name="os.device" value="HMI Controller"/>
6335
+ <param pos="0" name="os.family" value="Windows"/>
6336
+ <param pos="0" name="os.product" value="Windows CE"/>
6337
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_ce:-"/>
6338
+ <param pos="0" name="hw.vendor" value="Siemens"/>
6339
+ <param pos="0" name="hw.family" value="Simatic HMI"/>
6340
+ <param pos="0" name="hw.device" value="HMI Controller"/>
6341
+ <param pos="1" name="hw.product"/>
6342
+ <param pos="2" name="hw.version"/>
6325
6343
  </fingerprint>
6326
6344
 
6327
6345
  <fingerprint pattern="^Siemens, SIMATIC HMI, ([^,]+),.*SW:\s*V\s*(\d+ \d+ \d+).*$">
6328
6346
  <description>Siemens HMI</description>
6329
- <example>Siemens, SIMATIC HMI, MP177, 6AV6 642-0EA01-3AX0, HW: 0, SW: V 1 0 0</example>
6330
- <example>Siemens, SIMATIC HMI, TP177B, 6AV6 642-0BD01-3AX0, HW: 0, SW: V 1 0 2</example>
6347
+ <example hw.product="MP177">Siemens, SIMATIC HMI, MP177, 6AV6 642-0EA01-3AX0, HW: 0, SW: V 1 0 0</example>
6348
+ <example hw.version="1 0 2">Siemens, SIMATIC HMI, TP177B, 6AV6 642-0BD01-3AX0, HW: 0, SW: V 1 0 2</example>
6331
6349
  <example>Siemens, SIMATIC HMI, XP277, 6AV6 643-0CB01-1AX0, HW: 0, SW: V 1 1 2</example>
6332
6350
  <example>Siemens, SIMATIC HMI, unknown, 6AV2 124-0GC01-0AX0, HW: 0, SW: V 11 0 2</example>
6333
6351
  <example>Siemens, SIMATIC HMI, unknown, 6AV2 124-0JC01-0AX0, HW: 0, SW: V 11 0 0</example>
6334
- <param pos="0" name="os.vendor" value="Siemens"/>
6335
- <param pos="0" name="os.device" value="Monitoring"/>
6336
- <param pos="0" name="os.family" value="Simatic HMI"/>
6337
- <param pos="1" name="os.product"/>
6338
- <param pos="2" name="os.version"/>
6352
+ <param pos="0" name="os.vendor" value="Microsoft"/>
6353
+ <param pos="0" name="os.device" value="HMI Controller"/>
6354
+ <param pos="0" name="os.family" value="Windows"/>
6355
+ <param pos="0" name="os.product" value="Windows CE"/>
6356
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_ce:-"/>
6357
+ <param pos="0" name="hw.vendor" value="Siemens"/>
6358
+ <param pos="0" name="hw.family" value="Simatic HMI"/>
6359
+ <param pos="0" name="hw.device" value="HMI Controller"/>
6360
+ <param pos="1" name="hw.product"/>
6361
+ <param pos="2" name="hw.version"/>
6339
6362
  </fingerprint>
6340
6363
 
6341
6364
  <fingerprint pattern="^Siemens, SIMATIC NET, ([^,]+),.*FW:\s*(?:Version )?V?([^,]+).*$">
6342
6365
  <description>Siemens NET - verbose variant</description>
6343
- <example os.product="CP 343-1 Advanced" os.version="1.2.3">Siemens, SIMATIC NET, CP 343-1 Advanced, 6GK7 343-1GX30-0XE0, HW: Version 3, FW: Version V1.2.3, VPB9502953</example>
6344
- <example os.product="CP 343-1 Lean" os.version="2.6.0">Siemens, SIMATIC NET, CP 343-1 Lean, 6GK7 343-1CX10-0XE0, HW: Version 6, FW: Version V2.6.0, VPC3513639</example>
6345
- <example os.product="CP 343-1" os.version="2.2.20">Siemens, SIMATIC NET, CP 343-1, 6GK7 343-1EX30-0XE0, HW: Version 3, FW: Version V2.2.20, VPXN545808</example>
6346
- <example os.product="SCALANCE X204-2" os.version="4.01">Siemens, SIMATIC NET, SCALANCE X204-2, 6GK5 204-2BB10-2AA3, HW: 4, FW: V4.01</example>
6347
- <example os.product="Scalance S612" os.version="T03.00.00.00_25.00.00.01">Siemens, SIMATIC NET, Scalance S612, 6GK56120BA102AA3, HW: Version 6, FW: Version T03.00.00.00_25.00.00.01, VPB9542952</example>
6348
- <param pos="0" name="os.vendor" value="Siemens"/>
6349
- <param pos="0" name="os.device" value="Monitoring"/>
6350
- <param pos="0" name="os.family" value="Simatic NET"/>
6351
- <param pos="1" name="os.product"/>
6352
- <param pos="2" name="os.version"/>
6366
+ <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>
6367
+ <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>
6368
+ <example hw.product="CP 343-1" hw.version="2.2.20">Siemens, SIMATIC NET, CP 343-1, 6GK7 343-1EX30-0XE0, HW: Version 3, FW: Version V2.2.20, VPXN545808</example>
6369
+ <example hw.product="SCALANCE X204-2" hw.version="4.01">Siemens, SIMATIC NET, SCALANCE X204-2, 6GK5 204-2BB10-2AA3, HW: 4, FW: V4.01</example>
6370
+ <example hw.product="Scalance S612" hw.version="T03.00.00.00_25.00.00.01">Siemens, SIMATIC NET, Scalance S612, 6GK56120BA102AA3, HW: Version 6, FW: Version T03.00.00.00_25.00.00.01, VPB9542952</example>
6371
+ <param pos="0" name="os.vendor" value="Microsoft"/>
6372
+ <param pos="0" name="os.family" value="Windows"/>
6373
+ <param pos="0" name="os.product" value="Windows 7"/>
6374
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_7:-"/>
6375
+ <param pos="0" name="hw.vendor" value="Siemens"/>
6376
+ <param pos="0" name="hw.family" value="Simatic NET"/>
6377
+ <param pos="0" name="hw.device" value="Monitoring"/>
6378
+ <param pos="1" name="hw.product"/>
6379
+ <param pos="2" name="hw.version"/>
6353
6380
  </fingerprint>
6354
6381
 
6355
6382
  <fingerprint pattern="^Siemens, SIMATIC NET (\S+) FW V (\S+)$">
6356
6383
  <description>Siemens NET</description>
6357
- <example>Siemens, SIMATIC NET CP1613 FW V 06.33</example>
6358
- <param pos="0" name="os.vendor" value="Siemens"/>
6359
- <param pos="0" name="os.device" value="Monitoring"/>
6360
- <param pos="0" name="os.family" value="Simatic NET"/>
6361
- <param pos="1" name="os.product"/>
6362
- <param pos="2" name="os.version"/>
6384
+ <example hw.product="CP1613" hw.version="06.33">Siemens, SIMATIC NET CP1613 FW V 06.33</example>
6385
+ <param pos="0" name="os.vendor" value="Microsoft"/>
6386
+ <param pos="0" name="os.family" value="Windows"/>
6387
+ <param pos="0" name="os.product" value="Windows 7"/>
6388
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_7:-"/>
6389
+ <param pos="0" name="hw.vendor" value="Siemens"/>
6390
+ <param pos="0" name="hw.family" value="Simatic NET"/>
6391
+ <param pos="0" name="hw.device" value="Monitoring"/>
6392
+ <param pos="1" name="hw.product"/>
6393
+ <param pos="2" name="hw.version"/>
6363
6394
  </fingerprint>
6364
6395
 
6365
6396
  <fingerprint pattern="^Siemens, SIMATIC S7, ([^,]+), .*?FW: (?:Version )?V?\.?([^,]+).*$">
6366
6397
  <description>Siemens S7</description>
6367
- <example os.product="CPU-1200" os.version="2.0.2">Siemens, SIMATIC S7, CPU-1200, 6ES7 211-1BD30-0XB0, HW: 1, FW: V.2.0.2, SZVX8YU9000553</example>
6368
- <example os.product="CPU315-2 PN/DP" os.version="2.5.0">Siemens, SIMATIC S7, CPU315-2 PN/DP, 6ES7 315-2EH13-0AB0 , HW: 3, FW: V2.5.0, S C-V4P07826200</example>
6369
- <example os.product="IM151-8" os.version="3.2.3">Siemens, SIMATIC S7, IM151-8, 6ES7 151-8AB01-0AB0 , HW: 2, FW: V3.2.3, S C-B3UC78192011</example>
6370
- <param pos="0" name="os.vendor" value="Siemens"/>
6371
- <param pos="0" name="os.device" value="Monitoring"/>
6372
- <param pos="0" name="os.family" value="Simatic S7"/>
6373
- <param pos="1" name="os.product"/>
6374
- <param pos="2" name="os.version"/>
6398
+ <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>
6399
+ <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>
6400
+ <example hw.product="IM151-8" hw.version="3.2.3">Siemens, SIMATIC S7, IM151-8, 6ES7 151-8AB01-0AB0 , HW: 2, FW: V3.2.3, S C-B3UC78192011</example>
6401
+ <param pos="0" name="os.vendor" value="Microsoft"/>
6402
+ <param pos="0" name="os.family" value="Windows"/>
6403
+ <param pos="0" name="hw.vendor" value="Siemens"/>
6404
+ <param pos="0" name="hw.family" value="Simatic S7"/>
6405
+ <param pos="1" name="hw.product"/>
6406
+ <param pos="2" name="hw.version"/>
6375
6407
  </fingerprint>
6376
6408
 
6377
6409
  <fingerprint pattern="^Siemens, SIMATIC S7, ([^,]+), .*?, V\.([^,]+).*$">
6378
6410
  <description>Siemens S7 - variant 1</description>
6379
- <example>Siemens, SIMATIC S7, CPU-1200, 6ES7 212-1BD30-0XB0 SZVA1YU6008610 , 1, V.1.0.1, SZVA1YU6008610</example>
6380
- <example>Siemens, SIMATIC S7, CPU-1200, 6ES7 212-1HD30-0XB0 SZVA3YU7002312 , 1, V.1.0.1, SZVA3YU7002312</example>
6411
+ <example hw.product="CPU-1200">Siemens, SIMATIC S7, CPU-1200, 6ES7 212-1BD30-0XB0 SZVA1YU6008610 , 1, V.1.0.1, SZVA1YU6008610</example>
6412
+ <example hw.version="1.0.1">Siemens, SIMATIC S7, CPU-1200, 6ES7 212-1HD30-0XB0 SZVA3YU7002312 , 1, V.1.0.1, SZVA3YU7002312</example>
6381
6413
  <example>Siemens, SIMATIC S7, CPU-1200, 6ES7 214-1BE30-0XB0 SZVA2YYY007305 , 1, V.1.0.2, SZVA2YYY007305</example>
6382
- <param pos="0" name="os.vendor" value="Siemens"/>
6383
- <param pos="0" name="os.device" value="Monitoring"/>
6384
- <param pos="0" name="os.family" value="Simatic S7"/>
6385
- <param pos="1" name="os.product"/>
6386
- <param pos="2" name="os.version"/>
6414
+ <param pos="0" name="os.vendor" value="Microsoft"/>
6415
+ <param pos="0" name="os.family" value="Windows"/>
6416
+ <param pos="0" name="hw.vendor" value="Siemens"/>
6417
+ <param pos="0" name="hw.family" value="Simatic S7"/>
6418
+ <param pos="1" name="hw.product"/>
6419
+ <param pos="2" name="hw.version"/>
6387
6420
  </fingerprint>
6388
6421
 
6389
6422
  <fingerprint pattern="^Siemens, SIMATIC, (\S+)$">
6390
6423
  <description>Siemens S7 - model only variant</description>
6391
- <example>Siemens, SIMATIC, S7-300</example>
6392
- <param pos="0" name="os.vendor" value="Siemens"/>
6393
- <param pos="0" name="os.device" value="Monitoring"/>
6394
- <param pos="0" name="os.family" value="Simatic S7"/>
6395
- <param pos="1" name="os.product"/>
6424
+ <example hw.product="S7-300">Siemens, SIMATIC, S7-300</example>
6425
+ <param pos="0" name="os.vendor" value="Microsoft"/>
6426
+ <param pos="0" name="os.family" value="Windows"/>
6427
+ <param pos="0" name="hw.vendor" value="Siemens"/>
6428
+ <param pos="0" name="hw.family" value="Simatic S7"/>
6429
+ <param pos="1" name="hw.product"/>
6396
6430
  </fingerprint>
6397
6431
 
6398
6432
  <fingerprint pattern="^Siemens, SINUMERIK, solution line ([^,]+),.*?FW:V([^,]+).*$">
6399
6433
  <description>Siemens Sinumerik Solution Line</description>
6400
- <example>Siemens, SINUMERIK, solution line PCU50, , HW:1, FW:V00.00.00,</example>
6401
- <example>Siemens, SINUMERIK, solution line PCU50.3B-P 1GB XP, 6FC5210-0DF33-2AB0, HW:A, FW:V00.00.00, ST-BN2040231</example>
6402
- <param pos="0" name="os.vendor" value="Siemens"/>
6434
+ <example hw.product="PCU50">Siemens, SINUMERIK, solution line PCU50, , HW:1, FW:V00.00.00,</example>
6435
+ <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>
6436
+ <param pos="0" name="os.vendor" value="Microsoft"/>
6403
6437
  <param pos="0" name="os.device" value="Monitoring"/>
6404
- <param pos="0" name="os.family" value="Simatic Sinumerik"/>
6405
- <param pos="1" name="os.product"/>
6406
- <param pos="2" name="os.version"/>
6438
+ <param pos="0" name="os.family" value="Windows"/>
6439
+ <param pos="0" name="os.product" value="Windows 10"/>
6440
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_10:-"/>
6441
+ <param pos="0" name="hw.vendor" value="Siemens"/>
6442
+ <param pos="0" name="hw.family" value="Simatic Sinumerik"/>
6443
+ <param pos="1" name="hw.product"/>
6444
+ <param pos="2" name="hw.version"/>
6407
6445
  </fingerprint>
6408
6446
 
6409
6447
  <fingerprint pattern="^Name:(ReliantUNIX)-. release:(\S+) version:(\S+) machine:(\S+)$">
@@ -6867,7 +6905,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6867
6905
  <example>silex PocketPro 100s</example>
6868
6906
  <example>silex PocketPro 100s compatible with an HP JETDIRECT EX</example>
6869
6907
  <param pos="0" name="os.vendor" value="Troy"/>
6870
- <param pos="0" name="os.device" value="Print server"/>
6908
+ <param pos="0" name="os.device" value="Print Server"/>
6871
6909
  <param pos="0" name="os.product" value="PocketPro"/>
6872
6910
  </fingerprint>
6873
6911
 
@@ -7150,7 +7188,7 @@ Copyright (c) 1995-2005 by Cisco Systems
7150
7188
  <example>ZebraNet PrintServer</example>
7151
7189
  <param pos="0" name="os.vendor" value="ZebraNet"/>
7152
7190
  <param pos="0" name="os.product" value="PrintServer"/>
7153
- <param pos="0" name="os.device" value="Print server"/>
7191
+ <param pos="0" name="os.device" value="Print Server"/>
7154
7192
  </fingerprint>
7155
7193
 
7156
7194
  <!--======================================================================
@@ -7162,7 +7200,7 @@ Copyright (c) 1995-2005 by Cisco Systems
7162
7200
  <example>Prestige 645</example>
7163
7201
  <param pos="0" name="os.vendor" value="Zyxel"/>
7164
7202
  <param pos="0" name="os.product" value="Prestige 645"/>
7165
- <param pos="0" name="os.device" value="Broadband router"/>
7203
+ <param pos="0" name="os.device" value="Broadband Router"/>
7166
7204
  </fingerprint>
7167
7205
 
7168
7206
  <fingerprint pattern="^Prestige 660HW-61$">
@@ -7194,7 +7232,7 @@ Copyright (c) 1995-2005 by Cisco Systems
7194
7232
  <example>Prestige 642R-13</example>
7195
7233
  <param pos="0" name="os.vendor" value="Zyxel"/>
7196
7234
  <param pos="0" name="os.product" value="Prestige 642R-13"/>
7197
- <param pos="0" name="os.device" value="Broadband router"/>
7235
+ <param pos="0" name="os.device" value="Broadband Router"/>
7198
7236
  </fingerprint>
7199
7237
 
7200
7238
  <fingerprint pattern="^Prestige 660ME-61$">
@@ -7202,7 +7240,7 @@ Copyright (c) 1995-2005 by Cisco Systems
7202
7240
  <example>Prestige 660ME-61</example>
7203
7241
  <param pos="0" name="os.vendor" value="Zyxel"/>
7204
7242
  <param pos="0" name="os.product" value="Prestige 660ME-61"/>
7205
- <param pos="0" name="os.device" value="Broadband router"/>
7243
+ <param pos="0" name="os.device" value="Broadband Router"/>
7206
7244
  </fingerprint>
7207
7245
 
7208
7246
  <fingerprint pattern="^Prestige 650R-T3$">
@@ -7210,7 +7248,7 @@ Copyright (c) 1995-2005 by Cisco Systems
7210
7248
  <example>Prestige 650R-T3</example>
7211
7249
  <param pos="0" name="os.vendor" value="Zyxel"/>
7212
7250
  <param pos="0" name="os.product" value="Prestige 650R-T3"/>
7213
- <param pos="0" name="os.device" value="Broadband router"/>
7251
+ <param pos="0" name="os.device" value="Broadband Router"/>
7214
7252
  </fingerprint>
7215
7253
 
7216
7254
  </fingerprints>