recog 2.3.14 → 2.3.19

Sign up to get free protection for your applications and to get access to all the features.
Files changed (50) hide show
  1. checksums.yaml +4 -4
  2. data/.github/SECURITY.md +35 -0
  3. data/.github/workflows/ci.yml +26 -0
  4. data/.snyk +10 -0
  5. data/LICENSE +1 -1
  6. data/bin/recog_standardize +2 -2
  7. data/cpe-remap.yaml +55 -14
  8. data/identifiers/hw_device.txt +5 -4
  9. data/identifiers/hw_family.txt +12 -0
  10. data/identifiers/hw_product.txt +76 -6
  11. data/identifiers/os_architecture.txt +0 -10
  12. data/identifiers/os_device.txt +13 -31
  13. data/identifiers/os_family.txt +2 -95
  14. data/identifiers/os_product.txt +34 -117
  15. data/identifiers/service_family.txt +7 -36
  16. data/identifiers/service_product.txt +238 -92
  17. data/identifiers/vendor.txt +78 -193
  18. data/lib/recog/version.rb +1 -1
  19. data/requirements.txt +1 -1
  20. data/update_cpes.py +96 -48
  21. data/xml/dns_versionbind.xml +39 -16
  22. data/xml/favicons.xml +150 -17
  23. data/xml/ftp_banners.xml +21 -19
  24. data/xml/hp_pjl_id.xml +1 -1
  25. data/xml/html_title.xml +200 -23
  26. data/xml/http_cookies.xml +89 -1
  27. data/xml/http_servers.xml +144 -18
  28. data/xml/http_wwwauth.xml +28 -20
  29. data/xml/ldap_searchresult.xml +9 -6
  30. data/xml/mdns_device-info_txt.xml +308 -10
  31. data/xml/ntp_banners.xml +9 -1
  32. data/xml/operating_system.xml +1 -0
  33. data/xml/rtsp_servers.xml +7 -0
  34. data/xml/sip_banners.xml +344 -8
  35. data/xml/sip_user_agents.xml +320 -7
  36. data/xml/smb_native_lm.xml +32 -1
  37. data/xml/smb_native_os.xml +158 -33
  38. data/xml/smtp_banners.xml +7 -2
  39. data/xml/smtp_help.xml +2 -0
  40. data/xml/smtp_vrfy.xml +2 -1
  41. data/xml/snmp_sysdescr.xml +252 -86
  42. data/xml/ssh_banners.xml +118 -11
  43. data/xml/telnet_banners.xml +34 -9
  44. data/xml/tls_jarm.xml +139 -0
  45. data/xml/x509_issuers.xml +24 -5
  46. data/xml/x509_subjects.xml +97 -17
  47. metadata +6 -5
  48. data/identifiers/software_class.txt +0 -26
  49. data/identifiers/software_family.txt +0 -91
  50. data/identifiers/software_product.txt +0 -333
data/xml/smb_native_lm.xml CHANGED
@@ -40,7 +40,7 @@
40
40
  <fingerprint pattern="^Samba (\d\.\d+.\d+\w*)">
41
41
  <description>Samba</description>
42
42
  <example>Samba 3.0.24</example>
43
- <example>Samba 3.0.28a</example>
43
+ <example service.version="3.0.28a">Samba 3.0.28a</example>
44
44
  <example>Samba 3.0.32-0.2-2210-SUSE-SL10.3</example>
45
45
  <example>Samba 3.6.3</example>
46
46
  <example>Samba 3.6.6</example>
@@ -51,6 +51,20 @@
51
51
  <param pos="0" name="service.cpe23" value="cpe:/a:samba:samba:{service.version}"/>
52
52
  </fingerprint>
53
53
 
54
+ <fingerprint pattern="^Samba (?:Samba )?for GuardianOS v\.?(\d\.[\d.]+)$">
55
+ <description>Samba on a SnapServer appliance</description>
56
+ <example os.version="4.3.007.200609131215">Samba Samba for GuardianOS v4.3.007.200609131215</example>
57
+ <example os.version="5.0.133.200807301131">Samba Samba for GuardianOS v5.0.133.200807301131</example>
58
+ <example os.version="7.7.220">Samba for GuardianOS v.7.7.220</example>
59
+ <param pos="0" name="service.vendor" value="Samba"/>
60
+ <param pos="0" name="service.product" value="Samba"/>
61
+ <param pos="0" name="service.cpe23" value="cpe:/a:samba:samba:-"/>
62
+ <param pos="0" name="os.vendor" value="SnapServer"/>
63
+ <param pos="0" name="os.family" value="Linux"/>
64
+ <param pos="0" name="os.product" value="GuardianOS"/>
65
+ <param pos="1" name="os.version"/>
66
+ </fingerprint>
67
+
54
68
  <fingerprint pattern="^Netreon LANMAN 1.0$">
55
69
  <description>Netreon SAN software</description>
56
70
  <example>Netreon LANMAN 1.0</example>
@@ -67,4 +81,21 @@
67
81
  <param pos="0" name="os.cpe23" value="cpe:/o:mikrotik:routeros:-"/>
68
82
  </fingerprint>
69
83
 
84
+ <fingerprint pattern="^NQ (\d\.\d+)$">
85
+ <description>Visuality Systems NQ Enterprise Storage SMB stack</description>
86
+ <example service.version="7.3">NQ 7.3</example>
87
+ <example service.version="4.32">NQ 4.32</example>
88
+ <param pos="0" name="service.vendor" value="Visuality Systems"/>
89
+ <param pos="0" name="service.product" value="NQ"/>
90
+ <param pos="1" name="service.version"/>
91
+ </fingerprint>
92
+
93
+ <fingerprint pattern="^YNQ (\d\.[\d.]+)$">
94
+ <description>Visuality Systems YNQ Storage SMB stack</description>
95
+ <example service.version="1.2.1">YNQ 1.2.1</example>
96
+ <param pos="0" name="service.vendor" value="Visuality Systems"/>
97
+ <param pos="0" name="service.product" value="YNQ"/>
98
+ <param pos="1" name="service.version"/>
99
+ </fingerprint>
100
+
70
101
  </fingerprints>
data/xml/smb_native_os.xml CHANGED
@@ -2,6 +2,9 @@
2
2
  <fingerprints matches="smb.native_os" protocol="smb" database_type="util.os">
3
3
  <!--
4
4
  SMB fingerprints obtained from the Native OS field of SMB negotations
5
+ NOTE: os.version is used to capture Service Pack for Microsoft Windows.
6
+ This is inconsistent with other OSs and CPE generation and should
7
+ be reviewed for correction.
5
8
  -->
6
9
 
7
10
  <fingerprint pattern="^(Windows NT \d\.\d+)$">
@@ -39,6 +42,11 @@
39
42
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_xp:-"/>
40
43
  </fingerprint>
41
44
 
45
+ <fingerprint pattern="^Windows 6.1$">
46
+ <description>Spoofed value often used by Samba -- assert nothing.</description>
47
+ <example>Windows 6.1</example>
48
+ </fingerprint>
49
+
42
50
  <fingerprint pattern="^Windows XP (\d+) (Service Pack \d+)$">
43
51
  <description>Windows XP with Service Pack</description>
44
52
  <example os.build="2600" os.version="Service Pack 1">Windows XP 2600 Service Pack 1</example>
@@ -195,7 +203,7 @@
195
203
  <!-- TODO: Need an example string -->
196
204
 
197
205
  <fingerprint pattern="^Windows \(R\) Storage Server 2008 (?:\w+|\w+ \w+|\w+ \w+ \w+) (\d+)$">
198
- <description>Windows Web Server 2008 Storage</description>
206
+ <description>Windows Server 2008 Storage</description>
199
207
  <param pos="0" name="os.certainty" value="1.0"/>
200
208
  <param pos="0" name="os.vendor" value="Microsoft"/>
201
209
  <param pos="0" name="os.product" value="Windows Server 2008"/>
@@ -216,8 +224,6 @@
216
224
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2008:{os.version}"/>
217
225
  </fingerprint>
218
226
 
219
- <!-- TODO: Need an example string -->
220
-
221
227
  <fingerprint pattern="^Windows Server 2008 HPC Edition (\d+)$">
222
228
  <description>Windows Web Server 2008 HPC</description>
223
229
  <example>Windows Server 2008 HPC Edition 7600</example>
@@ -257,30 +263,6 @@
257
263
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2008:-"/>
258
264
  </fingerprint>
259
265
 
260
- <fingerprint pattern="^Windows Server 2016(?: Technical Preview \d+)? (\w+|\w+ \w+|\w+ \w+ \w+)(?: Evaluation)? (\d+)$">
261
- <description>Windows Server 2016 with a build, without service pack</description>
262
- <example os.edition="Datacenter" os.build="14393">Windows Server 2016 Datacenter 14393</example>
263
- <example os.edition="Standard" os.build="14393">Windows Server 2016 Standard Evaluation 14393</example>
264
- <example os.edition="Essentials" os.build="10586">Windows Server 2016 Technical Preview 4 Essentials 10586</example>
265
- <param pos="0" name="os.certainty" value="1.0"/>
266
- <param pos="0" name="os.vendor" value="Microsoft"/>
267
- <param pos="0" name="os.product" value="Windows Server 2016"/>
268
- <param pos="1" name="os.edition"/>
269
- <param pos="2" name="os.build"/>
270
- <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2016:-"/>
271
- </fingerprint>
272
-
273
- <fingerprint pattern="^Windows Storage Server 2016 (?:\w+|\w+ \w+|\w+ \w+ \w+) (\d+)$">
274
- <description>Windows Server 2016 Storage</description>
275
- <example os.build="14393">Windows Storage Server 2016 Standard 14393</example>
276
- <param pos="0" name="os.certainty" value="1.0"/>
277
- <param pos="0" name="os.vendor" value="Microsoft"/>
278
- <param pos="0" name="os.product" value="Windows Server 2016"/>
279
- <param pos="0" name="os.edition" value="Storage"/>
280
- <param pos="1" name="os.build"/>
281
- <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2016:-"/>
282
- </fingerprint>
283
-
284
266
  <fingerprint pattern="^Windows Web Server 2008 R2 (\d+) (Service Pack \d+)$">
285
267
  <description>Windows Server 2008 R2 Web</description>
286
268
  <example os.version="Service Pack 1">Windows Web Server 2008 R2 7601 Service Pack 1</example>
@@ -316,6 +298,81 @@
316
298
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2008:{os.version}"/>
317
299
  </fingerprint>
318
300
 
301
+ <fingerprint pattern="^Hyper-V Server 7601 Service Pack 1$">
302
+ <description>Windows Server 2008 R2 Hyper-V</description>
303
+ <example>Hyper-V Server 7601 Service Pack 1</example>
304
+ <param pos="0" name="os.certainty" value="1.0"/>
305
+ <param pos="0" name="os.vendor" value="Microsoft"/>
306
+ <param pos="0" name="os.product" value="Windows Server 2008 R2"/>
307
+ <param pos="0" name="os.edition" value="Hyper-V"/>
308
+ <param pos="0" name="os.build" value="7601"/>
309
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2008:-"/>
310
+ </fingerprint>
311
+
312
+ <!-- Windows 2019 -->
313
+
314
+ <fingerprint pattern="^Windows Server 2019 (\w+|\w+ \w+|\w+ \w+ \w+)(?: Evaluation)? (\d+)$">
315
+ <description>Windows Server 2019 with a build, without service pack</description>
316
+ <example os.build="17763" os.edition="Standard">Windows Server 2019 Standard 17763</example>
317
+ <example os.build="17763" os.edition="Standard">Windows Server 2019 Standard Evaluation 17763</example>
318
+ <example os.build="17763" os.edition="Datacenter">Windows Server 2019 Datacenter 17763</example>
319
+ <example os.build="17763" os.edition="Essentials">Windows Server 2019 Essentials 17763</example>
320
+ <param pos="0" name="os.certainty" value="1.0"/>
321
+ <param pos="0" name="os.vendor" value="Microsoft"/>
322
+ <param pos="0" name="os.product" value="Windows Server 2019"/>
323
+ <param pos="1" name="os.edition"/>
324
+ <param pos="2" name="os.build"/>
325
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2019:-"/>
326
+ </fingerprint>
327
+
328
+ <fingerprint pattern="^Hyper-V Server 2019 (\d+)$">
329
+ <description>Windows Server 2019 Hyper-V</description>
330
+ <example os.build="17763">Hyper-V Server 2019 17763</example>
331
+ <param pos="0" name="os.certainty" value="1.0"/>
332
+ <param pos="0" name="os.vendor" value="Microsoft"/>
333
+ <param pos="0" name="os.product" value="Windows Server 2019"/>
334
+ <param pos="0" name="os.edition" value="Hyper-V"/>
335
+ <param pos="1" name="os.build"/>
336
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2019:-"/>
337
+ </fingerprint>
338
+
339
+ <!-- Windows 2016 -->
340
+
341
+ <fingerprint pattern="^Windows Server 2016(?: Technical Preview \d+)? (\w+|\w+ \w+|\w+ \w+ \w+)(?: Evaluation)? (\d+)$">
342
+ <description>Windows Server 2016 with a build, without service pack</description>
343
+ <example os.edition="Datacenter" os.build="14393">Windows Server 2016 Datacenter 14393</example>
344
+ <example os.edition="Standard" os.build="14393">Windows Server 2016 Standard Evaluation 14393</example>
345
+ <example os.edition="Essentials" os.build="10586">Windows Server 2016 Technical Preview 4 Essentials 10586</example>
346
+ <param pos="0" name="os.certainty" value="1.0"/>
347
+ <param pos="0" name="os.vendor" value="Microsoft"/>
348
+ <param pos="0" name="os.product" value="Windows Server 2016"/>
349
+ <param pos="1" name="os.edition"/>
350
+ <param pos="2" name="os.build"/>
351
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2016:-"/>
352
+ </fingerprint>
353
+
354
+ <fingerprint pattern="^Windows Storage Server 2016 (?:\w+|\w+ \w+|\w+ \w+ \w+) (\d+)$">
355
+ <description>Windows Server 2016 Storage</description>
356
+ <example os.build="14393">Windows Storage Server 2016 Standard 14393</example>
357
+ <param pos="0" name="os.certainty" value="1.0"/>
358
+ <param pos="0" name="os.vendor" value="Microsoft"/>
359
+ <param pos="0" name="os.product" value="Windows Server 2016"/>
360
+ <param pos="0" name="os.edition" value="Storage"/>
361
+ <param pos="1" name="os.build"/>
362
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2016:-"/>
363
+ </fingerprint>
364
+
365
+ <fingerprint pattern="^Hyper-V Server 2016 (\d+)$">
366
+ <description>Windows Server 2016 Hyper-V</description>
367
+ <example os.build="14393">Hyper-V Server 2016 14393</example>
368
+ <param pos="0" name="os.certainty" value="1.0"/>
369
+ <param pos="0" name="os.vendor" value="Microsoft"/>
370
+ <param pos="0" name="os.product" value="Windows Server 2016"/>
371
+ <param pos="0" name="os.edition" value="Hyper-V"/>
372
+ <param pos="1" name="os.build"/>
373
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2016:-"/>
374
+ </fingerprint>
375
+
319
376
  <fingerprint pattern="^Windows Vista \(TM\) (\w+|\w+ \w+|\w+ \w+ \w+) (\d+) (Service Pack \d+)$">
320
377
  <description>Windows Vista (SP)</description>
321
378
  <example os.edition="Home Premium" os.version="Service Pack 2">Windows Vista (TM) Home Premium 6002 Service Pack 2</example>
@@ -385,10 +442,9 @@
385
442
 
386
443
  <!-- Windows 2012 R2 matches go first to simplify the regular expressions -->
387
444
 
388
- <!-- TODO: Need an example string -->
389
-
390
445
  <fingerprint pattern="^Windows Server 2012 R2 (\w+|\w+ \w+|\w+ \w+ \w+) (\d+) (Service Pack \d+)$">
391
446
  <description>Windows Server 2012 R2 (SP)</description>
447
+ <example os.build="9600" os.edition="Standard" os.version="Service Pack 1">Windows Server 2012 R2 Standard 9600 Service Pack 1</example>
392
448
  <param pos="0" name="os.certainty" value="1.0"/>
393
449
  <param pos="0" name="os.vendor" value="Microsoft"/>
394
450
  <param pos="0" name="os.product" value="Windows Server 2012 R2"/>
@@ -400,7 +456,7 @@
400
456
 
401
457
  <fingerprint pattern="^Windows Server 2012 R2 (\w+|\w+ \w+|\w+ \w+ \w+) (\d+)$">
402
458
  <description>Windows Server 2012 R2</description>
403
- <example os.edition="Standard">Windows Server 2012 R2 Standard 9600</example>
459
+ <example os.build="9600" os.edition="Standard">Windows Server 2012 R2 Standard 9600</example>
404
460
  <param pos="0" name="os.certainty" value="1.0"/>
405
461
  <param pos="0" name="os.vendor" value="Microsoft"/>
406
462
  <param pos="0" name="os.product" value="Windows Server 2012 R2"/>
@@ -409,10 +465,35 @@
409
465
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2012:-"/>
410
466
  </fingerprint>
411
467
 
412
- <!-- TODO: Need an example string -->
468
+ <fingerprint pattern="^Windows Storage Server 2012 R2 (\w+|\w+ \w+|\w+ \w+ \w+) (\d+)$">
469
+ <description>Windows Server 2012 R2 Storage</description>
470
+ <example os.build="9600" os.edition="Standard">Windows Storage Server 2012 R2 Standard 9600</example>
471
+ <example os.build="9600" os.edition="Workgroup">Windows Storage Server 2012 R2 Workgroup 9600</example>
472
+ <example os.build="9600" os.edition="Essentials">Windows Storage Server 2012 R2 Essentials 9600</example>
473
+ <param pos="0" name="os.certainty" value="1.0"/>
474
+ <param pos="0" name="os.vendor" value="Microsoft"/>
475
+ <param pos="0" name="os.product" value="Windows Server 2012 R2"/>
476
+ <param pos="1" name="os.edition"/>
477
+ <param pos="2" name="os.build"/>
478
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2012:-"/>
479
+ </fingerprint>
480
+
481
+ <fingerprint pattern="^Hyper-V Server 2012 R2 (\d+)$">
482
+ <description>Windows Server 2012 R2 Hyper-V</description>
483
+ <example os.build="9600">Hyper-V Server 2012 R2 9600</example>
484
+ <param pos="0" name="os.certainty" value="1.0"/>
485
+ <param pos="0" name="os.vendor" value="Microsoft"/>
486
+ <param pos="0" name="os.product" value="Windows Server 2012 R2"/>
487
+ <param pos="0" name="os.edition" value="Hyper-V"/>
488
+ <param pos="1" name="os.build"/>
489
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2012:-"/>
490
+ </fingerprint>
491
+
492
+ <!-- Windows 2012 -->
413
493
 
414
494
  <fingerprint pattern="^Windows Server 2012 (\w+|\w+ \w+|\w+ \w+ \w+) (\d+) (Service Pack \d+)$">
415
495
  <description>Windows Server 2012 (SP)</description>
496
+ <example os.build="9200" os.edition="Standard" os.version="Service Pack 1">Windows Server 2012 Standard 9200 Service Pack 1</example>
416
497
  <param pos="0" name="os.certainty" value="1.0"/>
417
498
  <param pos="0" name="os.vendor" value="Microsoft"/>
418
499
  <param pos="0" name="os.product" value="Windows Server 2012"/>
@@ -433,6 +514,29 @@
433
514
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2012:-"/>
434
515
  </fingerprint>
435
516
 
517
+ <fingerprint pattern="^Windows Storage Server 2012 (\w+|\w+ \w+|\w+ \w+ \w+) (\d+)$">
518
+ <description>Windows Server 2012 Storage</description>
519
+ <example os.build="9200" os.edition="Standard">Windows Storage Server 2012 Standard 9200</example>
520
+ <example os.build="9200" os.edition="Workgroup">Windows Storage Server 2012 Workgroup 9200</example>
521
+ <param pos="0" name="os.certainty" value="1.0"/>
522
+ <param pos="0" name="os.vendor" value="Microsoft"/>
523
+ <param pos="0" name="os.product" value="Windows Server 2012"/>
524
+ <param pos="1" name="os.edition"/>
525
+ <param pos="2" name="os.build"/>
526
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2012:-"/>
527
+ </fingerprint>
528
+
529
+ <fingerprint pattern="^Hyper-V Server 2012 (\d+)$">
530
+ <description>Windows Server 2012 Hyper-V</description>
531
+ <example os.build="9200">Hyper-V Server 2012 9200</example>
532
+ <param pos="0" name="os.certainty" value="1.0"/>
533
+ <param pos="0" name="os.vendor" value="Microsoft"/>
534
+ <param pos="0" name="os.product" value="Windows Server 2012"/>
535
+ <param pos="0" name="os.edition" value="Hyper-V"/>
536
+ <param pos="1" name="os.build"/>
537
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2012:-"/>
538
+ </fingerprint>
539
+
436
540
  <fingerprint pattern="^Windows MultiPoint Server 2012 (?:\w+|\w+ \w+|\w+ \w+ \w+) (\d+) (Service Pack \d+)$">
437
541
  <description>Windows MultiPoint Server 2012 (SP)</description>
438
542
  <example os.build="9201" os.version="Service Pack 1">Windows MultiPoint Server 2012 Premium 9201 Service Pack 1</example>
@@ -487,7 +591,7 @@
487
591
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_10:-"/>
488
592
  </fingerprint>
489
593
 
490
- <fingerprint pattern="^VxWorks">
594
+ <fingerprint pattern="^VxWorks$">
491
595
  <description>VxWorks</description>
492
596
  <example>VxWorks</example>
493
597
  <param pos="0" name="os.certainty" value="0.5"/>
@@ -498,9 +602,10 @@
498
602
  <param pos="0" name="service.product" value="VxWorks CIFS"/>
499
603
  </fingerprint>
500
604
 
501
- <fingerprint pattern="^OS/400 \D(\d+)\D(\d+)\D(\d+)">
605
+ <fingerprint pattern="^OS/?400 \D(\d+)\D(\d+)\D(\d+)$">
502
606
  <description>OS/400</description>
503
607
  <example os.version="4" os.version.version="5" os.version.version.version="0">OS/400 V4R5M0</example>
608
+ <example os.version="5" os.version.version="4" os.version.version.version="5">OS400 V5R4M5</example>
504
609
  <param pos="0" name="os.vendor" value="IBM"/>
505
610
  <param pos="0" name="os.product" value="OS/400"/>
506
611
  <param pos="1" name="os.version"/>
@@ -509,6 +614,17 @@
509
614
  <param pos="0" name="os.cpe23" value="cpe:/o:ibm:os_400:{os.version}"/>
510
615
  </fingerprint>
511
616
 
617
+ <fingerprint pattern="^I5OS \D(\d+)\D(\d+)\D(\d+)$">
618
+ <description>IBM i5/OS</description>
619
+ <example os.version="6" os.version.version="1" os.version.version.version="1">I5OS V6R1M1</example>
620
+ <param pos="0" name="os.vendor" value="IBM"/>
621
+ <param pos="0" name="os.product" value="i5/OS"/>
622
+ <param pos="1" name="os.version"/>
623
+ <param pos="2" name="os.version.version"/>
624
+ <param pos="3" name="os.version.version.version"/>
625
+ <param pos="0" name="os.cpe23" value="cpe:/o:ibm:i5os:{os.version}"/>
626
+ </fingerprint>
627
+
512
628
  <fingerprint pattern="^Apple Base Station$">
513
629
  <description>SMB exposed via SMB shared USB disks on Apple devices</description>
514
630
  <example>Apple Base Station</example>
@@ -529,6 +645,7 @@
529
645
  <param pos="0" name="hw.vendor" value="EMC"/>
530
646
  <param pos="0" name="hw.device" value="Storage"/>
531
647
  <param pos="0" name="hw.product" value="Celerra"/>
648
+ <param pos="0" name="hw.cpe23" value="cpe:/h:emc:celerra_network_attached_storage:-"/>
532
649
  </fingerprint>
533
650
 
534
651
  <fingerprint pattern="^Netreon OS 1.0$">
@@ -537,6 +654,14 @@
537
654
  <param pos="0" name="service.vendor" value="Netreon"/>
538
655
  </fingerprint>
539
656
 
657
+ <fingerprint pattern="^QTS$">
658
+ <description>QNAP QTS</description>
659
+ <example>QTS</example>
660
+ <param pos="0" name="os.vendor" value="QNAP"/>
661
+ <param pos="0" name="os.product" value="QTS"/>
662
+ <param pos="0" name="os.cpe23" value="cpe:/o:qnap:qts:-"/>
663
+ </fingerprint>
664
+
540
665
  <!-- VisionFS -->
541
666
 
542
667
  <fingerprint pattern="^(?:ax|i3|m8|mp|pa|pp|rs|sp)ai(\d{4})">
data/xml/smtp_banners.xml CHANGED
@@ -77,6 +77,7 @@
77
77
  <param pos="0" name="service.family" value="Mail Server"/>
78
78
  <param pos="0" name="service.product" value="Mail Server"/>
79
79
  <param pos="1" name="service.version"/>
80
+ <param pos="0" name="service.cpe23" value="cpe:/a:argosoft:mail_server:{service.version}"/>
80
81
  </fingerprint>
81
82
 
82
83
  <fingerprint pattern="^^(?:(\S+) +)?ArGoSoft Mail Server Freeware, Version [^ ]+ \(([^ ]+\.[^ ]+\.[^ ]+\.[^ ]+)\) *$">
@@ -91,6 +92,7 @@
91
92
  <param pos="0" name="service.family" value="Mail Server"/>
92
93
  <param pos="0" name="service.product" value="Mail Server"/>
93
94
  <param pos="2" name="service.version"/>
95
+ <param pos="0" name="service.cpe23" value="cpe:/a:argosoft:mail_server:{service.version}"/>
94
96
  <param pos="1" name="host.name"/>
95
97
  </fingerprint>
96
98
 
@@ -108,6 +110,7 @@
108
110
  <param pos="0" name="service.product" value="Mail Server"/>
109
111
  <param pos="1" name="host.name"/>
110
112
  <param pos="2" name="service.version"/>
113
+ <param pos="0" name="service.cpe23" value="cpe:/a:argosoft:mail_server:{service.version}"/>
111
114
  </fingerprint>
112
115
 
113
116
  <fingerprint pattern="^([^ ]+) +AppleShare IP Mail Server ([^ ]+\.[\d.]+) SMTP Server Ready *$">
@@ -1657,7 +1660,8 @@
1657
1660
  <description>Symantec Mail Security for SMTP</description>
1658
1661
  <example host.name="foo.bar">foo.bar ESMTP Symantec Mail Security</example>
1659
1662
  <param pos="0" name="service.vendor" value="Symantec"/>
1660
- <param pos="0" name="service.product" value="Symantec Mail Security for SMTP"/>
1663
+ <param pos="0" name="service.product" value="Mail Security for SMTP"/>
1664
+ <param pos="0" name="service.cpe23" value="cpe:/a:symantec:mail_security_for_smtp:-"/>
1661
1665
  <param pos="1" name="host.name"/>
1662
1666
  </fingerprint>
1663
1667
 
@@ -1665,7 +1669,8 @@
1665
1669
  <description>Symantec Mail Gateway</description>
1666
1670
  <example host.name="foo.bar">foo.bar ESMTP Symantec Messaging Gateway</example>
1667
1671
  <param pos="0" name="service.vendor" value="Symantec"/>
1668
- <param pos="0" name="service.product" value="Symantec Messaging Gateway"/>
1672
+ <param pos="0" name="service.product" value="Messaging Gateway"/>
1673
+ <param pos="0" name="service.cpe23" value="cpe:/a:symantec:messaging_gateway:-"/>
1669
1674
  <param pos="1" name="host.name"/>
1670
1675
  </fingerprint>
1671
1676
 
data/xml/smtp_help.xml CHANGED
@@ -15,6 +15,7 @@
15
15
  <param pos="0" name="service.family" value="Mail Server"/>
16
16
  <param pos="0" name="service.product" value="Mail Server"/>
17
17
  <param pos="1" name="service.version"/>
18
+ <param pos="0" name="service.cpe23" value="cpe:/a:argosoft:mail_server:{service.version}"/>
18
19
  </fingerprint>
19
20
 
20
21
  <fingerprint pattern="^214[ -].*support@argosoft\.com *$">
@@ -23,6 +24,7 @@
23
24
  <param pos="0" name="service.vendor" value="ArGoSoft"/>
24
25
  <param pos="0" name="service.family" value="Mail Server"/>
25
26
  <param pos="0" name="service.product" value="Mail Server"/>
27
+ <param pos="0" name="service.cpe23" value="cpe:/a:argosoft:mail_server:-"/>
26
28
  </fingerprint>
27
29
 
28
30
  <fingerprint pattern="^500[ -]Syntax error, command &quot;XXXX&quot; unrecognized$">
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"/>
@@ -1040,6 +1040,8 @@
1040
1040
  <param pos="0" name="os.product" value="Fabric OS"/>
1041
1041
  <param pos="0" name="os.device" value="Switch"/>
1042
1042
  <param pos="0" name="os.cpe23" value="cpe:/o:brocade:fabric_os:-"/>
1043
+ <param pos="0" name="hw.vendor" value="Brocade"/>
1044
+ <param pos="0" name="hw.device" value="Switch"/>
1043
1045
  </fingerprint>
1044
1046
 
1045
1047
  <fingerprint pattern="^Brocade ((?:\S+ )?SAN Switch) Module for IBM eServer BladeCenter$">
@@ -1050,6 +1052,7 @@
1050
1052
  <param pos="0" name="os.vendor" value="Brocade"/>
1051
1053
  <param pos="0" name="os.device" value="Switch"/>
1052
1054
  <param pos="1" name="os.product"/>
1055
+ <param pos="0" name="hw.vendor" value="Brocade"/>
1053
1056
  </fingerprint>
1054
1057
 
1055
1058
  <fingerprint pattern="^Brocade (?:Communications? Systems, Inc\. )?([^,\(]+)(?: \([^\)]+\))?,(?: Extended route scalability,)? IronWare Version V?(\S+) .*$">
@@ -1079,6 +1082,47 @@
1079
1082
  <param pos="2" name="os.version"/>
1080
1083
  </fingerprint>
1081
1084
 
1085
+ <fingerprint pattern="^Brocade VDX Switch, BR-(\S+), Network Operating System Software Version (\S+)\.$">
1086
+ <description>Brocade VDX Switch</description>
1087
+ <example hw.product="VDX6740" os.version="7.0.2b">Brocade VDX Switch, BR-VDX6740, Network Operating System Software Version 7.0.2b.</example>
1088
+ <param pos="0" name="os.vendor" value="Brocade"/>
1089
+ <param pos="0" name="os.device" value="Switch"/>
1090
+ <param pos="0" name="os.family" value="NetworkOS"/>
1091
+ <param pos="2" name="os.version"/>
1092
+ <param pos="0" name="hw.vendor" value="Brocade"/>
1093
+ <param pos="0" name="hw.family" value="VDX"/>
1094
+ <param pos="1" name="hw.product"/>
1095
+ <param pos="0" name="hw.device" value="Switch"/>
1096
+ </fingerprint>
1097
+
1098
+ <fingerprint pattern="^([^,]+), (VDX\S+), Network Operating System Software Version (\S+)\.$">
1099
+ <description>Brocade VDX Switch w/Hostname</description>
1100
+ <example host.name="core02" hw.product="VDX6740T-1G" os.version="7.0.1b">core02, VDX6740T-1G, Network Operating System Software Version 7.0.1b.</example>
1101
+ <param pos="0" name="os.vendor" value="Brocade"/>
1102
+ <param pos="0" name="os.device" value="Switch"/>
1103
+ <param pos="0" name="os.family" value="NetworkOS"/>
1104
+ <param pos="3" name="os.version"/>
1105
+ <param pos="0" name="hw.vendor" value="Brocade"/>
1106
+ <param pos="0" name="hw.family" value="VDX"/>
1107
+ <param pos="2" name="hw.product"/>
1108
+ <param pos="0" name="hw.device" value="Switch"/>
1109
+ <param pos="1" name="host.name"/>
1110
+ </fingerprint>
1111
+
1112
+ <fingerprint pattern="^([^,]+), BR-(\S+), Network Operating System Software Version (\S+)\.$">
1113
+ <description>Brocade VDX Switch w/Hostname and BR prefix</description>
1114
+ <example host.name="core01" hw.product="VDX6740" os.version="7.0.2b">core01, BR-VDX6740, Network Operating System Software Version 7.0.2b.</example>
1115
+ <param pos="0" name="os.vendor" value="Brocade"/>
1116
+ <param pos="0" name="os.device" value="Switch"/>
1117
+ <param pos="0" name="os.family" value="NetworkOS"/>
1118
+ <param pos="3" name="os.version"/>
1119
+ <param pos="0" name="hw.vendor" value="Brocade"/>
1120
+ <param pos="0" name="hw.family" value="VDX"/>
1121
+ <param pos="2" name="hw.product"/>
1122
+ <param pos="0" name="hw.device" value="Switch"/>
1123
+ <param pos="1" name="host.name"/>
1124
+ </fingerprint>
1125
+
1082
1126
  <!--======================================================================
1083
1127
  BROTHER
1084
1128
  =======================================================================-->
@@ -1320,7 +1364,7 @@
1320
1364
  <description>Canon Camera</description>
1321
1365
  <example>Canon Network Camera VB-C60</example>
1322
1366
  <param pos="0" name="os.vendor" value="Canon"/>
1323
- <param pos="0" name="os.device" value="Web cam"/>
1367
+ <param pos="0" name="os.device" value="IP Camera"/>
1324
1368
  <param pos="1" name="os.product"/>
1325
1369
  </fingerprint>
1326
1370
 
@@ -1345,7 +1389,7 @@
1345
1389
  <description>Castelle FaxPress</description>
1346
1390
  <param pos="0" name="os.vendor" value="Castelle"/>
1347
1391
  <param pos="0" name="os.product" value="FaxPress"/>
1348
- <param pos="0" name="os.device" value="Fax server"/>
1392
+ <param pos="0" name="os.device" value="Fax Server"/>
1349
1393
  </fingerprint>
1350
1394
 
1351
1395
  <!--======================================================================
@@ -1554,7 +1598,7 @@
1554
1598
  <param pos="0" name="os.vendor" value="Cisco"/>
1555
1599
  <param pos="0" name="os.family" value="760 Series"/>
1556
1600
  <param pos="0" name="os.product" value="761"/>
1557
- <param pos="0" name="os.device" value="Broadband router"/>
1601
+ <param pos="0" name="os.device" value="Broadband Router"/>
1558
1602
  <param pos="1" name="os.version"/>
1559
1603
  </fingerprint>
1560
1604
 
@@ -1796,6 +1840,21 @@ Copyright (c) 1995-2005 by Cisco Systems
1796
1840
  <param pos="1" name="os.version"/>
1797
1841
  </fingerprint>
1798
1842
 
1843
+ <!--======================================================================
1844
+ Cumulus
1845
+ =======================================================================-->
1846
+
1847
+ <fingerprint pattern="^Cumulus Linux (\S+) \(Linux Kernel ([^\)]+)\)">
1848
+ <description>Cumulus Linux</description>
1849
+ <example os.version="3.7.2" os.version.version="4.1.33-1+cl3u17">Cumulus Linux 3.7.2 (Linux Kernel 4.1.33-1+cl3u17)</example>
1850
+ <param pos="0" name="os.vendor" value="Cumulus"/>
1851
+ <param pos="0" name="os.device" value="Switch"/>
1852
+ <param pos="0" name="os.product" value="Cumulus Linux"/>
1853
+ <param pos="1" name="os.version"/>
1854
+ <param pos="2" name="os.version.version"/>
1855
+ <param pos="0" name="os.cpe23" value="cpe:/o:cumulusnetworks:cumulus_linux:{os.version}"/>
1856
+ </fingerprint>
1857
+
1799
1858
  <!--======================================================================
1800
1859
  DATA DOMAIN
1801
1860
  =======================================================================-->
@@ -1807,6 +1866,7 @@ Copyright (c) 1995-2005 by Cisco Systems
1807
1866
  <param pos="0" name="os.product" value="DD OS"/>
1808
1867
  <param pos="0" name="os.device" value="Storage"/>
1809
1868
  <param pos="1" name="os.version"/>
1869
+ <param pos="0" name="os.cpe23" value="cpe:/o:dell:emc_data_domain_os:{os.version}"/>
1810
1870
  </fingerprint>
1811
1871
 
1812
1872
  <!--======================================================================
@@ -1831,7 +1891,7 @@ Copyright (c) 1995-2005 by Cisco Systems
1831
1891
  <example>Datamax Printer</example>
1832
1892
  <param pos="0" name="os.vendor" value="Datamax"/>
1833
1893
  <param pos="0" name="os.device" value="Printer"/>
1834
- <param pos="0" name="os.product" value="Print server"/>
1894
+ <param pos="0" name="os.product" value="Print Server"/>
1835
1895
  </fingerprint>
1836
1896
 
1837
1897
  <!--======================================================================
@@ -2970,7 +3030,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2970
3030
  <example>HP ETHERNET MULTI-ENVIRONMENT</example>
2971
3031
  <param pos="0" name="os.vendor" value="HP"/>
2972
3032
  <param pos="0" name="os.family" value="JetDirect"/>
2973
- <param pos="0" name="os.device" value="Print server"/>
3033
+ <param pos="0" name="os.device" value="Print Server"/>
2974
3034
  </fingerprint>
2975
3035
 
2976
3036
  <fingerprint pattern="^HP ETHERNET MULTI-ENVIRONMENT,ROM (\S+?),JETDIRECT(?: EX)?,(\w+),EEPROM.*$">
@@ -2981,7 +3041,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2981
3041
  <example>HP ETHERNET MULTI-ENVIRONMENT,ROM B.25.01,JETDIRECT,JD118,EEPROM D.27.02,CIDATE 03/23/2004</example>
2982
3042
  <param pos="0" name="os.vendor" value="HP"/>
2983
3043
  <param pos="0" name="os.family" value="JetDirect"/>
2984
- <param pos="0" name="os.device" value="Print server"/>
3044
+ <param pos="0" name="os.device" value="Print Server"/>
2985
3045
  <param pos="1" name="os.version"/>
2986
3046
  <param pos="2" name="os.product"/>
2987
3047
  </fingerprint>
@@ -3389,7 +3449,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3389
3449
  <param pos="0" name="os.vendor" value="Intel"/>
3390
3450
  <param pos="0" name="os.family" value="NetportExpress"/>
3391
3451
  <param pos="0" name="os.product" value="PRO/100"/>
3392
- <param pos="0" name="os.device" value="Print server"/>
3452
+ <param pos="0" name="os.device" value="Print Server"/>
3393
3453
  </fingerprint>
3394
3454
 
3395
3455
  <!--======================================================================
@@ -3401,7 +3461,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3401
3461
  <example>Intermec CX Terminal</example>
3402
3462
  <param pos="0" name="os.vendor" value="Intermec"/>
3403
3463
  <param pos="0" name="os.product" value="CX Data Collection Terminal"/>
3404
- <param pos="0" name="os.device" value="POS"/>
3464
+ <param pos="0" name="os.device" value="Point of Sale"/>
3405
3465
  </fingerprint>
3406
3466
 
3407
3467
  <fingerprint pattern="^Thermal Label Printer Intermec (\S+)$">
@@ -3848,7 +3908,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3848
3908
  <param pos="0" name="os.certainty" value="1.0"/>
3849
3909
  <param pos="0" name="os.vendor" value="Lexmark"/>
3850
3910
  <param pos="0" name="os.family" value="MarkNet"/>
3851
- <param pos="0" name="os.device" value="Print server"/>
3911
+ <param pos="0" name="os.device" value="Print Server"/>
3852
3912
  <param pos="1" name="os.product"/>
3853
3913
  <param pos="2" name="os.version"/>
3854
3914
  </fingerprint>
@@ -3933,7 +3993,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3933
3993
  <description>Lexmark Printer - print server variant</description>
3934
3994
  <example>Lexmark C500 PS Print Server</example>
3935
3995
  <param pos="0" name="os.vendor" value="Lexmark"/>
3936
- <param pos="0" name="os.device" value="Print server"/>
3996
+ <param pos="0" name="os.device" value="Print Server"/>
3937
3997
  <param pos="1" name="os.product"/>
3938
3998
  </fingerprint>
3939
3999
 
@@ -4740,7 +4800,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4740
4800
  <example>LX Console Manager, s/w version=5.3.9</example>
4741
4801
  <param pos="0" name="os.vendor" value="MRV Communications"/>
4742
4802
  <param pos="0" name="os.product" value="LX"/>
4743
- <param pos="0" name="os.device" value="Remote access server"/>
4803
+ <param pos="0" name="os.device" value="Remote Access Server"/>
4744
4804
  <param pos="1" name="os.version"/>
4745
4805
  </fingerprint>
4746
4806
 
@@ -4753,7 +4813,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4753
4813
  <example>RASExpress Server Version 5.63</example>
4754
4814
  <param pos="0" name="os.vendor" value="MultiTech"/>
4755
4815
  <param pos="0" name="os.product" value="RASExpress"/>
4756
- <param pos="0" name="os.device" value="Remote access server"/>
4816
+ <param pos="0" name="os.device" value="Remote Access Server"/>
4757
4817
  <param pos="1" name="os.version"/>
4758
4818
  </fingerprint>
4759
4819
 
@@ -4784,7 +4844,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4784
4844
  <param pos="0" name="os.vendor" value="NetApp"/>
4785
4845
  <param pos="0" name="os.family" value="Data ONTAP"/>
4786
4846
  <param pos="0" name="os.product" value="Data ONTAP"/>
4787
- <param pos="0" name="os.device" value="File server"/>
4847
+ <param pos="0" name="os.device" value="NAS"/>
4788
4848
  <param pos="1" name="os.version"/>
4789
4849
  <param pos="0" name="os.cpe23" value="cpe:/o:netapp:data_ontap:{os.version}"/>
4790
4850
  </fingerprint>
@@ -4833,7 +4893,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4833
4893
  <example>Netopia R9100 v4.8.2</example>
4834
4894
  <param pos="0" name="os.vendor" value="Netopia"/>
4835
4895
  <param pos="0" name="os.family" value="Netopia"/>
4836
- <param pos="0" name="os.device" value="Broadband router"/>
4896
+ <param pos="0" name="os.device" value="Broadband Router"/>
4837
4897
  <param pos="1" name="os.product"/>
4838
4898
  <param pos="2" name="os.version"/>
4839
4899
  </fingerprint>
@@ -4997,7 +5057,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4997
5057
  <example os.product="2424">Nortel Application Switch 2424</example>
4998
5058
  <param pos="0" name="os.vendor" value="Nortel"/>
4999
5059
  <param pos="0" name="os.family" value="Application Switch"/>
5000
- <param pos="0" name="os.device" value="Load balancer"/>
5060
+ <param pos="0" name="os.device" value="Load Balancer"/>
5001
5061
  <param pos="1" name="os.product"/>
5002
5062
  </fingerprint>
5003
5063
 
@@ -5258,7 +5318,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5258
5318
  <param pos="0" name="os.family" value="NC Series"/>
5259
5319
  <param pos="1" name="os.product"/>
5260
5320
  <param pos="2" name="os.version"/>
5261
- <param pos="0" name="os.device" value="Print server"/>
5321
+ <param pos="0" name="os.device" value="Print Server"/>
5262
5322
  </fingerprint>
5263
5323
 
5264
5324
  <fingerprint pattern="^Oce (im\d+)$">
@@ -5445,7 +5505,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5445
5505
  <example>OKI OkiLAN 6400e Rev. 10/100BASE Ethernet PrintServer: Attached to B720n Rev.7.1b1: (C)2005 OKI DATA CORP</example>
5446
5506
  <example>OKI OkiLAN 6400e Rev. 10/100BASE Ethernet PrintServer: Attached to B930 Rev.3.6: (C)2005 OKI DATA CORP</example>
5447
5507
  <param pos="0" name="os.vendor" value="Oki"/>
5448
- <param pos="0" name="os.device" value="Print server"/>
5508
+ <param pos="0" name="os.device" value="Print Server"/>
5449
5509
  <param pos="1" name="os.product"/>
5450
5510
  </fingerprint>
5451
5511
 
@@ -5454,7 +5514,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5454
5514
  <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
5515
  <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
5516
  <param pos="0" name="os.vendor" value="Oki"/>
5457
- <param pos="0" name="os.device" value="Print server"/>
5517
+ <param pos="0" name="os.device" value="Print Server"/>
5458
5518
  <param pos="1" name="os.product"/>
5459
5519
  <param pos="2" name="os.version"/>
5460
5520
  </fingerprint>
@@ -5645,7 +5705,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5645
5705
  <example>Rectifier Technologies Pacific WebCSU 169-412 V1.30</example>
5646
5706
  <param pos="0" name="os.vendor" value="Rectifier Technologies"/>
5647
5707
  <param pos="0" name="os.family" value="RTP Power Controller"/>
5648
- <param pos="0" name="os.device" value="Power device"/>
5708
+ <param pos="0" name="os.device" value="Power Device"/>
5649
5709
  <param pos="1" name="os.product"/>
5650
5710
  <param pos="2" name="os.version"/>
5651
5711
  </fingerprint>
@@ -5655,7 +5715,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5655
5715
  <example>Rectifier SNMP Server</example>
5656
5716
  <param pos="0" name="os.vendor" value="Rectifier Technologies"/>
5657
5717
  <param pos="0" name="os.family" value="RTP Power Controller"/>
5658
- <param pos="0" name="os.device" value="Power device"/>
5718
+ <param pos="0" name="os.device" value="Power Device"/>
5659
5719
  <param pos="0" name="os.product" value="WebCSU"/>
5660
5720
  </fingerprint>
5661
5721
 
@@ -6099,6 +6159,18 @@ Copyright (c) 1995-2005 by Cisco Systems
6099
6159
  <param pos="0" name="os.cpe23" value="cpe:/o:sonicwall:sonicos:{os.version}"/>
6100
6160
  </fingerprint>
6101
6161
 
6162
+ <fingerprint pattern="^SonicWALL (\S+).*?\(SonicOS \S+ ((?:\d\.)+\d+-\d+[a-zA-Z]).*\)">
6163
+ <description>SonicWall - SonicOS Enhanced variant without hardware model</description>
6164
+ <example hw.product="SOHO" os.version="5.9.1.4-4o">SonicWALL SOHO (SonicOS Enhanced 5.9.1.4-4o)</example>
6165
+ <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>
6166
+ <param pos="0" name="os.vendor" value="SonicWall"/>
6167
+ <param pos="0" name="os.device" value="Firewall"/>
6168
+ <param pos="0" name="os.product" value="SonicOS"/>
6169
+ <param pos="1" name="hw.product"/>
6170
+ <param pos="2" name="os.version"/>
6171
+ <param pos="0" name="os.cpe23" value="cpe:/o:sonicwall:sonicos:{os.version}"/>
6172
+ </fingerprint>
6173
+
6102
6174
  <fingerprint pattern="^SonicWALL (.*?)\s+\(([^\)]+)\)\s*$">
6103
6175
  <description>SonicWall</description>
6104
6176
  <example>SonicWALL StrongARM / 233 Mhz (PRO 200)</example>
@@ -6314,96 +6386,121 @@ Copyright (c) 1995-2005 by Cisco Systems
6314
6386
 
6315
6387
  <fingerprint pattern="^Siemens, SIMATIC HMI, ([^,]+),.*FW:\s*V([^,]+).*$">
6316
6388
  <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>
6389
+ <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>
6390
+ <example hw.version="01.06.00">Siemens, SIMATIC HMI, KTP600 Basic Mono PN, 6AV6647-0AB11-3AX0, HW:1, FW:V01.06.00</example>
6319
6391
  <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"/>
6392
+ <param pos="0" name="os.vendor" value="Microsoft"/>
6393
+ <param pos="0" name="os.device" value="HMI Controller"/>
6394
+ <param pos="0" name="os.family" value="Windows"/>
6395
+ <param pos="0" name="os.product" value="Windows CE"/>
6396
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_ce:-"/>
6397
+ <param pos="0" name="hw.vendor" value="Siemens"/>
6398
+ <param pos="0" name="hw.family" value="Simatic HMI"/>
6399
+ <param pos="0" name="hw.device" value="HMI Controller"/>
6400
+ <param pos="1" name="hw.product"/>
6401
+ <param pos="2" name="hw.version"/>
6325
6402
  </fingerprint>
6326
6403
 
6327
6404
  <fingerprint pattern="^Siemens, SIMATIC HMI, ([^,]+),.*SW:\s*V\s*(\d+ \d+ \d+).*$">
6328
6405
  <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>
6406
+ <example hw.product="MP177">Siemens, SIMATIC HMI, MP177, 6AV6 642-0EA01-3AX0, HW: 0, SW: V 1 0 0</example>
6407
+ <example hw.version="1 0 2">Siemens, SIMATIC HMI, TP177B, 6AV6 642-0BD01-3AX0, HW: 0, SW: V 1 0 2</example>
6331
6408
  <example>Siemens, SIMATIC HMI, XP277, 6AV6 643-0CB01-1AX0, HW: 0, SW: V 1 1 2</example>
6332
6409
  <example>Siemens, SIMATIC HMI, unknown, 6AV2 124-0GC01-0AX0, HW: 0, SW: V 11 0 2</example>
6333
6410
  <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"/>
6411
+ <param pos="0" name="os.vendor" value="Microsoft"/>
6412
+ <param pos="0" name="os.device" value="HMI Controller"/>
6413
+ <param pos="0" name="os.family" value="Windows"/>
6414
+ <param pos="0" name="os.product" value="Windows CE"/>
6415
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_ce:-"/>
6416
+ <param pos="0" name="hw.vendor" value="Siemens"/>
6417
+ <param pos="0" name="hw.family" value="Simatic HMI"/>
6418
+ <param pos="0" name="hw.device" value="HMI Controller"/>
6419
+ <param pos="1" name="hw.product"/>
6420
+ <param pos="2" name="hw.version"/>
6339
6421
  </fingerprint>
6340
6422
 
6341
6423
  <fingerprint pattern="^Siemens, SIMATIC NET, ([^,]+),.*FW:\s*(?:Version )?V?([^,]+).*$">
6342
6424
  <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"/>
6425
+ <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>
6426
+ <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>
6427
+ <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>
6428
+ <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>
6429
+ <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>
6430
+ <param pos="0" name="os.vendor" value="Microsoft"/>
6431
+ <param pos="0" name="os.family" value="Windows"/>
6432
+ <param pos="0" name="os.product" value="Windows 7"/>
6433
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_7:-"/>
6434
+ <param pos="0" name="hw.vendor" value="Siemens"/>
6435
+ <param pos="0" name="hw.family" value="Simatic NET"/>
6436
+ <param pos="0" name="hw.device" value="Monitoring"/>
6437
+ <param pos="1" name="hw.product"/>
6438
+ <param pos="2" name="hw.version"/>
6353
6439
  </fingerprint>
6354
6440
 
6355
6441
  <fingerprint pattern="^Siemens, SIMATIC NET (\S+) FW V (\S+)$">
6356
6442
  <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"/>
6443
+ <example hw.product="CP1613" hw.version="06.33">Siemens, SIMATIC NET CP1613 FW V 06.33</example>
6444
+ <param pos="0" name="os.vendor" value="Microsoft"/>
6445
+ <param pos="0" name="os.family" value="Windows"/>
6446
+ <param pos="0" name="os.product" value="Windows 7"/>
6447
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_7:-"/>
6448
+ <param pos="0" name="hw.vendor" value="Siemens"/>
6449
+ <param pos="0" name="hw.family" value="Simatic NET"/>
6450
+ <param pos="0" name="hw.device" value="Monitoring"/>
6451
+ <param pos="1" name="hw.product"/>
6452
+ <param pos="2" name="hw.version"/>
6363
6453
  </fingerprint>
6364
6454
 
6365
6455
  <fingerprint pattern="^Siemens, SIMATIC S7, ([^,]+), .*?FW: (?:Version )?V?\.?([^,]+).*$">
6366
6456
  <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"/>
6457
+ <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>
6458
+ <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>
6459
+ <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>
6460
+ <param pos="0" name="os.vendor" value="Microsoft"/>
6461
+ <param pos="0" name="os.family" value="Windows"/>
6462
+ <param pos="0" name="hw.vendor" value="Siemens"/>
6463
+ <param pos="0" name="hw.family" value="Simatic S7"/>
6464
+ <param pos="1" name="hw.product"/>
6465
+ <param pos="2" name="hw.version"/>
6375
6466
  </fingerprint>
6376
6467
 
6377
6468
  <fingerprint pattern="^Siemens, SIMATIC S7, ([^,]+), .*?, V\.([^,]+).*$">
6378
6469
  <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>
6470
+ <example hw.product="CPU-1200">Siemens, SIMATIC S7, CPU-1200, 6ES7 212-1BD30-0XB0 SZVA1YU6008610 , 1, V.1.0.1, SZVA1YU6008610</example>
6471
+ <example hw.version="1.0.1">Siemens, SIMATIC S7, CPU-1200, 6ES7 212-1HD30-0XB0 SZVA3YU7002312 , 1, V.1.0.1, SZVA3YU7002312</example>
6381
6472
  <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"/>
6473
+ <param pos="0" name="os.vendor" value="Microsoft"/>
6474
+ <param pos="0" name="os.family" value="Windows"/>
6475
+ <param pos="0" name="hw.vendor" value="Siemens"/>
6476
+ <param pos="0" name="hw.family" value="Simatic S7"/>
6477
+ <param pos="1" name="hw.product"/>
6478
+ <param pos="2" name="hw.version"/>
6387
6479
  </fingerprint>
6388
6480
 
6389
6481
  <fingerprint pattern="^Siemens, SIMATIC, (\S+)$">
6390
6482
  <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"/>
6483
+ <example hw.product="S7-300">Siemens, SIMATIC, S7-300</example>
6484
+ <param pos="0" name="os.vendor" value="Microsoft"/>
6485
+ <param pos="0" name="os.family" value="Windows"/>
6486
+ <param pos="0" name="hw.vendor" value="Siemens"/>
6487
+ <param pos="0" name="hw.family" value="Simatic S7"/>
6488
+ <param pos="1" name="hw.product"/>
6396
6489
  </fingerprint>
6397
6490
 
6398
6491
  <fingerprint pattern="^Siemens, SINUMERIK, solution line ([^,]+),.*?FW:V([^,]+).*$">
6399
6492
  <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"/>
6493
+ <example hw.product="PCU50">Siemens, SINUMERIK, solution line PCU50, , HW:1, FW:V00.00.00,</example>
6494
+ <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>
6495
+ <param pos="0" name="os.vendor" value="Microsoft"/>
6403
6496
  <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"/>
6497
+ <param pos="0" name="os.family" value="Windows"/>
6498
+ <param pos="0" name="os.product" value="Windows 10"/>
6499
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_10:-"/>
6500
+ <param pos="0" name="hw.vendor" value="Siemens"/>
6501
+ <param pos="0" name="hw.family" value="Simatic Sinumerik"/>
6502
+ <param pos="1" name="hw.product"/>
6503
+ <param pos="2" name="hw.version"/>
6407
6504
  </fingerprint>
6408
6505
 
6409
6506
  <fingerprint pattern="^Name:(ReliantUNIX)-. release:(\S+) version:(\S+) machine:(\S+)$">
@@ -6867,7 +6964,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6867
6964
  <example>silex PocketPro 100s</example>
6868
6965
  <example>silex PocketPro 100s compatible with an HP JETDIRECT EX</example>
6869
6966
  <param pos="0" name="os.vendor" value="Troy"/>
6870
- <param pos="0" name="os.device" value="Print server"/>
6967
+ <param pos="0" name="os.device" value="Print Server"/>
6871
6968
  <param pos="0" name="os.product" value="PocketPro"/>
6872
6969
  </fingerprint>
6873
6970
 
@@ -6885,6 +6982,73 @@ Copyright (c) 1995-2005 by Cisco Systems
6885
6982
  <param pos="0" name="os.device" value="Multifunction Device"/>
6886
6983
  </fingerprint>
6887
6984
 
6985
+ <!--======================================================================
6986
+ UBIQUITI
6987
+ =======================================================================-->
6988
+
6989
+ <fingerprint pattern="^(UAP-[^\s]+) ([0-9][.a-zA-Z0-9\-]+)$">
6990
+ <description>Ubiquiti Wireless UAP</description>
6991
+ <example hw.product="UAP-AC-Mesh-Pro" hw.version="4.3.20.11298">UAP-AC-Mesh-Pro 4.3.20.11298</example>
6992
+ <param pos="0" name="hw.vendor" value="Ubiquiti"/>
6993
+ <param pos="0" name="hw.device" value="WAP"/>
6994
+ <param pos="1" name="hw.product"/>
6995
+ <param pos="2" name="hw.version"/>
6996
+ <param pos="0" name="os.vendor" value="Ubiquiti"/>
6997
+ <param pos="0" name="os.family" value="Linux"/>
6998
+ <param pos="0" name="os.device" value="WAP"/>
6999
+ </fingerprint>
7000
+
7001
+ <fingerprint pattern="^(EdgeSwitch [^,]+), ([0-9][.a-zA-Z0-9\-]+), Linux ([0-9][.a-zA-Z0-9\-]+)">
7002
+ <description>Ubiquiti EdgeSwitch w/Version and Linux version</description>
7003
+ <example hw.product="EdgeSwitch 48-Port Lite" hw.version="1.8.1.5145168" os.version="3.6.5-1b505fb7">EdgeSwitch 48-Port Lite, 1.8.1.5145168, Linux 3.6.5-1b505fb7, 1.1.0.5102011</example>
7004
+ <param pos="0" name="hw.vendor" value="Ubiquiti"/>
7005
+ <param pos="0" name="hw.device" value="Switch"/>
7006
+ <param pos="1" name="hw.product"/>
7007
+ <param pos="2" name="hw.version"/>
7008
+ <param pos="0" name="os.vendor" value="Ubiquiti"/>
7009
+ <param pos="0" name="os.family" value="Linux"/>
7010
+ <param pos="0" name="os.device" value="Switch"/>
7011
+ <param pos="3" name="os.version"/>
7012
+ </fingerprint>
7013
+
7014
+ <fingerprint pattern="^(USW GigaBit Ethernet Switch), firmware v?([0-9][.a-zA-Z0-9\-]+)$">
7015
+ <description>Ubiquiti GigaBit Ethernet Switch w/Version</description>
7016
+ <example hw.product="USW GigaBit Ethernet Switch" hw.version="5.34.0.12180">USW GigaBit Ethernet Switch, firmware 5.34.0.12180</example>
7017
+ <example hw.product="USW GigaBit Ethernet Switch" hw.version="4.3.20.1129">USW GigaBit Ethernet Switch, firmware v4.3.20.1129</example>
7018
+ <param pos="0" name="hw.vendor" value="Ubiquiti"/>
7019
+ <param pos="0" name="hw.device" value="Switch"/>
7020
+ <param pos="1" name="hw.product"/>
7021
+ <param pos="2" name="hw.version"/>
7022
+ <param pos="0" name="os.vendor" value="Ubiquiti"/>
7023
+ <param pos="0" name="os.family" value="Linux"/>
7024
+ <param pos="0" name="os.device" value="Switch"/>
7025
+ </fingerprint>
7026
+
7027
+ <fingerprint pattern="^(USW-[^\s]+), ([0-9][.a-zA-Z0-9\-]+), Linux ([0-9][.a-zA-Z0-9\-]+)$">
7028
+ <description>Ubiquiti Switch w/Version and Linux version</description>
7029
+ <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>
7030
+ <param pos="0" name="hw.vendor" value="Ubiquiti"/>
7031
+ <param pos="0" name="hw.device" value="Switch"/>
7032
+ <param pos="1" name="hw.product"/>
7033
+ <param pos="2" name="hw.version"/>
7034
+ <param pos="0" name="os.vendor" value="Ubiquiti"/>
7035
+ <param pos="0" name="os.family" value="Linux"/>
7036
+ <param pos="0" name="os.device" value="Switch"/>
7037
+ <param pos="3" name="os.version"/>
7038
+ </fingerprint>
7039
+
7040
+ <fingerprint pattern="^(USW-[^\s]+), ([0-9][.a-zA-Z0-9\-]+)$">
7041
+ <description>Ubiquiti Switch w/Version (no Linux version)</description>
7042
+ <example hw.product="USW-5-Flex" hw.version="4.0.80.10875">USW-5-Flex, 4.0.80.10875</example>
7043
+ <param pos="0" name="hw.vendor" value="Ubiquiti"/>
7044
+ <param pos="0" name="hw.device" value="Switch"/>
7045
+ <param pos="1" name="hw.product"/>
7046
+ <param pos="2" name="hw.version"/>
7047
+ <param pos="0" name="os.vendor" value="Ubiquiti"/>
7048
+ <param pos="0" name="os.family" value="Linux"/>
7049
+ <param pos="0" name="os.device" value="Switch"/>
7050
+ </fingerprint>
7051
+
6888
7052
  <!--======================================================================
6889
7053
  UNISYS
6890
7054
  =======================================================================-->
@@ -6919,6 +7083,8 @@ Copyright (c) 1995-2005 by Cisco Systems
6919
7083
  <param pos="1" name="os.product"/>
6920
7084
  <param pos="2" name="os.version"/>
6921
7085
  <param pos="3" name="os.arch"/>
7086
+ <param pos="0" name="os.device" value="Hypervisor"/>
7087
+ <param pos="0" name="hw.device" value="Hypervisor"/>
6922
7088
  </fingerprint>
6923
7089
 
6924
7090
  <fingerprint pattern="^&quot;vSphere Management Assistant ([\d\.]+)&quot;$">
@@ -7150,7 +7316,7 @@ Copyright (c) 1995-2005 by Cisco Systems
7150
7316
  <example>ZebraNet PrintServer</example>
7151
7317
  <param pos="0" name="os.vendor" value="ZebraNet"/>
7152
7318
  <param pos="0" name="os.product" value="PrintServer"/>
7153
- <param pos="0" name="os.device" value="Print server"/>
7319
+ <param pos="0" name="os.device" value="Print Server"/>
7154
7320
  </fingerprint>
7155
7321
 
7156
7322
  <!--======================================================================
@@ -7162,7 +7328,7 @@ Copyright (c) 1995-2005 by Cisco Systems
7162
7328
  <example>Prestige 645</example>
7163
7329
  <param pos="0" name="os.vendor" value="Zyxel"/>
7164
7330
  <param pos="0" name="os.product" value="Prestige 645"/>
7165
- <param pos="0" name="os.device" value="Broadband router"/>
7331
+ <param pos="0" name="os.device" value="Broadband Router"/>
7166
7332
  </fingerprint>
7167
7333
 
7168
7334
  <fingerprint pattern="^Prestige 660HW-61$">
@@ -7194,7 +7360,7 @@ Copyright (c) 1995-2005 by Cisco Systems
7194
7360
  <example>Prestige 642R-13</example>
7195
7361
  <param pos="0" name="os.vendor" value="Zyxel"/>
7196
7362
  <param pos="0" name="os.product" value="Prestige 642R-13"/>
7197
- <param pos="0" name="os.device" value="Broadband router"/>
7363
+ <param pos="0" name="os.device" value="Broadband Router"/>
7198
7364
  </fingerprint>
7199
7365
 
7200
7366
  <fingerprint pattern="^Prestige 660ME-61$">
@@ -7202,7 +7368,7 @@ Copyright (c) 1995-2005 by Cisco Systems
7202
7368
  <example>Prestige 660ME-61</example>
7203
7369
  <param pos="0" name="os.vendor" value="Zyxel"/>
7204
7370
  <param pos="0" name="os.product" value="Prestige 660ME-61"/>
7205
- <param pos="0" name="os.device" value="Broadband router"/>
7371
+ <param pos="0" name="os.device" value="Broadband Router"/>
7206
7372
  </fingerprint>
7207
7373
 
7208
7374
  <fingerprint pattern="^Prestige 650R-T3$">
@@ -7210,7 +7376,7 @@ Copyright (c) 1995-2005 by Cisco Systems
7210
7376
  <example>Prestige 650R-T3</example>
7211
7377
  <param pos="0" name="os.vendor" value="Zyxel"/>
7212
7378
  <param pos="0" name="os.product" value="Prestige 650R-T3"/>
7213
- <param pos="0" name="os.device" value="Broadband router"/>
7379
+ <param pos="0" name="os.device" value="Broadband Router"/>
7214
7380
  </fingerprint>
7215
7381
 
7216
7382
  </fingerprints>