recog 2.3.16 → 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 (39) hide show
  1. checksums.yaml +4 -4
  2. data/bin/recog_standardize +2 -2
  3. data/cpe-remap.yaml +44 -14
  4. data/identifiers/hw_device.txt +3 -4
  5. data/identifiers/hw_family.txt +6 -0
  6. data/identifiers/hw_product.txt +17 -6
  7. data/identifiers/os_architecture.txt +0 -10
  8. data/identifiers/os_device.txt +11 -31
  9. data/identifiers/os_family.txt +1 -95
  10. data/identifiers/os_product.txt +9 -117
  11. data/identifiers/service_family.txt +4 -36
  12. data/identifiers/service_product.txt +211 -92
  13. data/identifiers/vendor.txt +46 -194
  14. data/lib/recog/version.rb +1 -1
  15. data/requirements.txt +1 -1
  16. data/update_cpes.py +92 -44
  17. data/xml/dns_versionbind.xml +15 -0
  18. data/xml/favicons.xml +40 -17
  19. data/xml/ftp_banners.xml +19 -18
  20. data/xml/hp_pjl_id.xml +1 -1
  21. data/xml/html_title.xml +42 -22
  22. data/xml/http_cookies.xml +4 -1
  23. data/xml/http_servers.xml +23 -17
  24. data/xml/http_wwwauth.xml +20 -20
  25. data/xml/ldap_searchresult.xml +9 -6
  26. data/xml/ntp_banners.xml +1 -1
  27. data/xml/operating_system.xml +1 -0
  28. data/xml/sip_user_agents.xml +3 -3
  29. data/xml/smb_native_os.xml +1 -0
  30. data/xml/smtp_banners.xml +4 -2
  31. data/xml/smtp_vrfy.xml +2 -1
  32. data/xml/snmp_sysdescr.xml +31 -30
  33. data/xml/telnet_banners.xml +8 -8
  34. data/xml/x509_issuers.xml +4 -3
  35. data/xml/x509_subjects.xml +23 -16
  36. metadata +2 -5
  37. data/identifiers/software_class.txt +0 -26
  38. data/identifiers/software_family.txt +0 -91
  39. data/identifiers/software_product.txt +0 -333
data/xml/http_wwwauth.xml CHANGED
@@ -103,7 +103,7 @@
103
103
  <param pos="0" name="service.vendor" value="APC"/>
104
104
  <param pos="0" name="service.product" value="HTTP"/>
105
105
  <param pos="0" name="os.vendor" value="APC"/>
106
- <param pos="0" name="os.device" value="Power device"/>
106
+ <param pos="0" name="os.device" value="Power Device"/>
107
107
  </fingerprint>
108
108
 
109
109
  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;ADSL\S* (?:Modem|Router|Modem/Router)&quot;.*$">
@@ -118,7 +118,7 @@
118
118
  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;Broadband Router&quot;.*$">
119
119
  <description>Generic Broadband modems/routers</description>
120
120
  <example>Basic realm="Broadband Router"</example>
121
- <param pos="0" name="hw.device" value="Broadband router"/>
121
+ <param pos="0" name="hw.device" value="Broadband Router"/>
122
122
  </fingerprint>
123
123
 
124
124
  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;DSL\S* (?:Modem|Router|Modem/Router)&quot;.*$">
@@ -164,7 +164,7 @@
164
164
  <example>Basic realm="camera"</example>
165
165
  <example>Basic realm="IPCamera Login"</example>
166
166
  <example>Basic realm="Mini Dome IP Camera"</example>
167
- <param pos="0" name="hw.device" value="Web cam"/>
167
+ <param pos="0" name="hw.device" value="IP Camera"/>
168
168
  </fingerprint>
169
169
 
170
170
  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;(DCS-[^&quot;]+)&quot;.*$">
@@ -172,7 +172,7 @@
172
172
  <example hw.product="DCS-5222LB1">Basic realm="DCS-5222LB1"</example>
173
173
  <example hw.product="DCS-2530L">Basic realm="DCS-2530L"</example>
174
174
  <param pos="0" name="hw.vendor" value="D-Link"/>
175
- <param pos="0" name="hw.device" value="Web cam"/>
175
+ <param pos="0" name="hw.device" value="IP Camera"/>
176
176
  <param pos="1" name="hw.product"/>
177
177
  </fingerprint>
178
178
 
@@ -203,11 +203,11 @@
203
203
  <param pos="0" name="service.product" value="SpeedTouch"/>
204
204
  <param pos="0" name="service.family" value="SpeedTouch"/>
205
205
  <param pos="0" name="os.vendor" value="Thomson"/>
206
- <param pos="0" name="os.device" value="Broadband router"/>
206
+ <param pos="0" name="os.device" value="Broadband Router"/>
207
207
  <param pos="0" name="os.family" value="SpeedTouch"/>
208
208
  <param pos="0" name="hw.vendor" value="Thomson"/>
209
209
  <param pos="0" name="hw.family" value="SpeedTouch"/>
210
- <param pos="0" name="hw.device" value="Broadband router"/>
210
+ <param pos="0" name="hw.device" value="Broadband Router"/>
211
211
  </fingerprint>
212
212
 
213
213
  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;SpeedTouch \(([0-9A-F]{2}-[0-9A-F]{2}-[0-9A-F]{2}-[0-9A-F]{2}-[0-9A-F]{2}-[0-9A-F]{2})\)&quot;$">
@@ -217,12 +217,12 @@
217
217
  <param pos="0" name="service.product" value="SpeedTouch"/>
218
218
  <param pos="0" name="service.family" value="SpeedTouch"/>
219
219
  <param pos="0" name="os.vendor" value="Thomson"/>
220
- <param pos="0" name="os.device" value="Broadband router"/>
220
+ <param pos="0" name="os.device" value="Broadband Router"/>
221
221
  <param pos="0" name="os.family" value="SpeedTouch"/>
222
222
  <param pos="0" name="os.product" value="SpeedTouch"/>
223
223
  <param pos="0" name="hw.vendor" value="Thomson"/>
224
224
  <param pos="0" name="hw.family" value="SpeedTouch"/>
225
- <param pos="0" name="hw.device" value="Broadband router"/>
225
+ <param pos="0" name="hw.device" value="Broadband Router"/>
226
226
  <param pos="1" name="host.mac"/>
227
227
  </fingerprint>
228
228
 
@@ -237,12 +237,12 @@
237
237
  <param pos="0" name="service.product" value="SpeedTouch"/>
238
238
  <param pos="0" name="service.family" value="SpeedTouch"/>
239
239
  <param pos="0" name="os.vendor" value="Thomson"/>
240
- <param pos="0" name="os.device" value="Broadband router"/>
240
+ <param pos="0" name="os.device" value="Broadband Router"/>
241
241
  <param pos="0" name="os.family" value="SpeedTouch"/>
242
242
  <param pos="0" name="os.product" value="SpeedTouch"/>
243
243
  <param pos="0" name="hw.vendor" value="Thomson"/>
244
244
  <param pos="0" name="hw.family" value="SpeedTouch"/>
245
- <param pos="0" name="hw.device" value="Broadband router"/>
245
+ <param pos="0" name="hw.device" value="Broadband Router"/>
246
246
  <param pos="1" name="host.mac"/>
247
247
  </fingerprint>
248
248
 
@@ -252,11 +252,11 @@
252
252
  <param pos="0" name="service.product" value="SpeedTouch"/>
253
253
  <param pos="0" name="service.family" value="SpeedTouch"/>
254
254
  <param pos="0" name="os.vendor" value="Thomson"/>
255
- <param pos="0" name="os.device" value="Broadband router"/>
255
+ <param pos="0" name="os.device" value="Broadband Router"/>
256
256
  <param pos="0" name="os.family" value="SpeedTouch"/>
257
257
  <param pos="0" name="hw.vendor" value="Thomson"/>
258
258
  <param pos="0" name="hw.family" value="SpeedTouch"/>
259
- <param pos="0" name="hw.device" value="Broadband router"/>
259
+ <param pos="0" name="hw.device" value="Broadband Router"/>
260
260
  <param pos="1" name="os.product"/>
261
261
  <param pos="2" name="host.mac"/>
262
262
  </fingerprint>
@@ -266,7 +266,7 @@
266
266
  <example>Digest realm="Thomson Gateway"</example>
267
267
  <example>Basic realm="Thomson"</example>
268
268
  <param pos="0" name="hw.vendor" value="Thomson"/>
269
- <param pos="0" name="hw.device" value="Broadband router"/>
269
+ <param pos="0" name="hw.device" value="Broadband Router"/>
270
270
  </fingerprint>
271
271
 
272
272
  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;(?:SmartAX )?(MT\d+[^ ]*)(?: ADSL Router)?&quot;$">
@@ -276,11 +276,11 @@
276
276
  <param pos="0" name="service.family" value="MT"/>
277
277
  <param pos="1" name="service.product"/>
278
278
  <param pos="0" name="os.vendor" value="Huawei"/>
279
- <param pos="0" name="os.device" value="Broadband router"/>
279
+ <param pos="0" name="os.device" value="Broadband Router"/>
280
280
  <param pos="0" name="os.family" value="MT"/>
281
281
  <param pos="1" name="os.product"/>
282
282
  <param pos="0" name="hw.vendor" value="Huawei"/>
283
- <param pos="0" name="hw.device" value="Broadband router"/>
283
+ <param pos="0" name="hw.device" value="Broadband Router"/>
284
284
  <param pos="0" name="hw.family" value="MT"/>
285
285
  <param pos="1" name="hw.product"/>
286
286
  </fingerprint>
@@ -289,7 +289,7 @@
289
289
  <description>Huawei Home Gateway Routers</description>
290
290
  <example>Basic realm="HuaweiHomeGateway"</example>
291
291
  <param pos="0" name="hw.vendor" value="Huawei"/>
292
- <param pos="0" name="hw.device" value="Broadband router"/>
292
+ <param pos="0" name="hw.device" value="Broadband Router"/>
293
293
  <param pos="0" name="hw.product" value="Home Gateway"/>
294
294
  </fingerprint>
295
295
 
@@ -298,7 +298,7 @@
298
298
  <example>Basic realm="EchoLife Portal de Inicio"</example>
299
299
  <example>Basic realm="EchoLife Home Gateway"</example>
300
300
  <param pos="0" name="hw.vendor" value="Huawei"/>
301
- <param pos="0" name="hw.device" value="Broadband router"/>
301
+ <param pos="0" name="hw.device" value="Broadband Router"/>
302
302
  <param pos="0" name="hw.product" value="EchoLife Home Gateway"/>
303
303
  </fingerprint>
304
304
 
@@ -374,7 +374,7 @@
374
374
  <description>TP-LINK IP-Cameras</description>
375
375
  <example>Basic realm="TP-LINK IP-Camera"</example>
376
376
  <param pos="0" name="hw.vendor" value="TP-LINK"/>
377
- <param pos="0" name="hw.device" value="Web cam"/>
377
+ <param pos="0" name="hw.device" value="IP Camera"/>
378
378
  </fingerprint>
379
379
 
380
380
  <fingerprint pattern="(?i)^(?:Basic|Digest) .*realm=&quot;Broadcom Management Service&quot;.*$">
@@ -458,7 +458,7 @@
458
458
  <description>Ubee Cable Modems</description>
459
459
  <example>Digest qop="auth", realm="Ubee", nonce="1544738973"</example>
460
460
  <param pos="0" name="hw.vendor" value="Ubee"/>
461
- <param pos="0" name="hw.device" value="Broadband router"/>
461
+ <param pos="0" name="hw.device" value="Broadband Router"/>
462
462
  </fingerprint>
463
463
 
464
464
  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;XDB&quot;$">
@@ -506,7 +506,7 @@
506
506
  <description>Steinsvik Orbit 351 IP Camera (Truen TCAM Rebrand)</description>
507
507
  <example hw.product="Orbit-351">Digest realm="Orbit-351", nonce="0000040dY892418598785d2a2304a74adf22f6098f2792", stale=FALSE</example>
508
508
  <param pos="0" name="hw.vendor" value="Steinsvik"/>
509
- <param pos="0" name="hw.device" value="Web cam"/>
509
+ <param pos="0" name="hw.device" value="IP Camera"/>
510
510
  <param pos="1" name="hw.product"/>
511
511
  <param pos="0" name="os.vendor" value="Steinsvik"/>
512
512
  <param pos="0" name="os.family" value="Linux"/>
data/xml/ldap_searchresult.xml CHANGED
@@ -382,7 +382,7 @@
382
382
  <!-- http://directory.fedoraproject.org/docs/389ds/FAQ/history.html -->
383
383
 
384
384
  <fingerprint pattern="(?i:vendorname1.\x04.Fedora Project0.\x04\rvendorversion1.\x04.Fedora-Directory/(\d\.\d[\w.]* B\d+\.\d+\.\d+))">
385
- <description>Fedora Project Fedora Directory Server</description>
385
+ <description>Fedora Project 389 Directory Server - Old Fedora branding</description>
386
386
  <example service.version="1.0.4 B2006.312.5450" _encoding="base64">
387
387
  dmVuZG9yTmFtZTEQBA5GZWRvcmEgUHJvamVjdDA3BA12ZW5kb3JWZXJzaW9uMSYEJEZlZG9yY
388
388
  S1EaXJlY3RvcnkvMS4wLjQgQjIwMDYuMzEyLjU0NTA=
@@ -391,20 +391,22 @@
391
391
  dmVuZG9yTmFtZTEQBA5GZWRvcmEgUHJvamVjdDA4BA12ZW5kb3JWZXJzaW9uMScEJUZlZG9yY
392
392
  S1EaXJlY3RvcnkvMS4wLjQgQjIwMDcuMzA0LjExMzgw
393
393
  </example>
394
- <param pos="0" name="service.vendor" value="Red Hat"/>
395
- <param pos="0" name="service.product" value="Fedora Directory Server"/>
394
+ <param pos="0" name="service.vendor" value="Fedora Project"/>
395
+ <param pos="0" name="service.product" value="389 Directory Server"/>
396
396
  <param pos="1" name="service.version"/>
397
+ <param pos="0" name="service.cpe23" value="cpe:/a:fedoraproject:389_directory_server:{service.version}"/>
397
398
  </fingerprint>
398
399
 
399
400
  <fingerprint pattern="(?i:vendorname1.\x04.389 Project0.\x04\rvendorversion1.\x04.389-Directory/(\d\.\d[\w.]* B\d+\.\d+\.\d+))">
400
- <description>389 Project 389 Directory Server</description>
401
+ <description>Fedora Project 389 Directory Server</description>
401
402
  <example service.version="1.2.11.25 B2013.325.19510" _encoding="base64">
402
403
  dmVuZG9yTmFtZTENBAszODkgUHJvamVjdDA5BA12ZW5kb3JWZXJzaW9uMSgEJjM4OS1EaXJlY
403
404
  3RvcnkvMS4yLjExLjI1IEIyMDEzLjMyNS4xOTUxMA==
404
405
  </example>
405
- <param pos="0" name="service.vendor" value="389 Project"/>
406
+ <param pos="0" name="service.vendor" value="Fedora Project"/>
406
407
  <param pos="0" name="service.product" value="389 Directory Server"/>
407
408
  <param pos="1" name="service.version"/>
409
+ <param pos="0" name="service.cpe23" value="cpe:/a:fedoraproject:389_directory_server:{service.version}"/>
408
410
  </fingerprint>
409
411
 
410
412
  <fingerprint pattern="(?im:vendorName1.\x04.CentOS0.\x04\rvendorVersion1.\x04.CentOS-Directory/(\d\.\d[\w.]* B\d+\.\d+\.\d+).\x04\v)">
@@ -441,8 +443,9 @@
441
443
  XJzaW9uMSgEJk5ldHNjYXBlLURpcmVjdG9yeS82LjExIEIyMDAyLjI4MS4wODUzMC8ECw==
442
444
  </example>
443
445
  <param pos="0" name="service.vendor" value="Netscape"/>
444
- <param pos="0" name="service.product" value="Netscape Directory Server"/>
446
+ <param pos="0" name="service.product" value="Directory Server"/>
445
447
  <param pos="1" name="service.version"/>
448
+ <param pos="0" name="service.cpe23" value="cpe:/a:netscape:directory_server:{service.version}"/>
446
449
  </fingerprint>
447
450
 
448
451
  <fingerprint pattern="(?im:IBM Lotus Software0.\x04\rvendorversion1.\x04.Release (\d+\.\d+[\w .]*)0.\x04.dominomajminversion)">
data/xml/ntp_banners.xml CHANGED
@@ -1027,7 +1027,7 @@
1027
1027
  <param pos="0" name="os.vendor" value="NetApp"/>
1028
1028
  <param pos="0" name="os.family" value="Data ONTAP"/>
1029
1029
  <param pos="0" name="os.product" value="Data ONTAP"/>
1030
- <param pos="0" name="os.device" value="File server"/>
1030
+ <param pos="0" name="os.device" value="File Server"/>
1031
1031
  <param pos="1" name="os.version"/>
1032
1032
  <param pos="0" name="os.cpe23" value="cpe:/o:netapp:data_ontap:{os.version}"/>
1033
1033
  </fingerprint>
data/xml/operating_system.xml CHANGED
@@ -156,6 +156,7 @@
156
156
  <param pos="0" name="os.family" value="Linux"/>
157
157
  <param pos="0" name="os.product" value="Linux"/>
158
158
  <param pos="1" name="os.version"/>
159
+ <param pos="0" name="os.cpe23" value="cpe:/o:alpinelinux:alpine_linux:{os.version}"/>
159
160
  </fingerprint>
160
161
 
161
162
  <!-- Arch uses rolling releases where the version name just the date of an ISO release. -->
data/xml/sip_user_agents.xml CHANGED
@@ -10,7 +10,7 @@
10
10
  <description>Axis Network Video Door stations, which have voice</description>
11
11
  <example hw.product="A8105-E">AXIS A8105-E Network Video Door Station</example>
12
12
  <param pos="0" name="hw.vendor" value="Axis"/>
13
- <param pos="0" name="hw.device" value="Web cam"/>
13
+ <param pos="0" name="hw.device" value="IP Camera"/>
14
14
  <param pos="0" name="hw.family" value="Network Video Door Station"/>
15
15
  <param pos="1" name="hw.product"/>
16
16
  <param pos="0" name="os.vendor" value="AXIS"/>
@@ -100,7 +100,7 @@
100
100
  <description>Huawei Home Gateway</description>
101
101
  <example>Huawei-HomeGateway/V100R001</example>
102
102
  <param pos="0" name="hw.vendor" value="Huawei"/>
103
- <param pos="0" name="hw.device" value="Broadband router"/>
103
+ <param pos="0" name="hw.device" value="Broadband Router"/>
104
104
  <param pos="0" name="hw.product" value="Home Gateway"/>
105
105
  </fingerprint>
106
106
 
@@ -108,7 +108,7 @@
108
108
  <description>Huawei EchoLife Home Gateway</description>
109
109
  <example hw.model="HG8121H">HUAWEI-EchoLife HG8121H/V3R018C00S110</example>
110
110
  <param pos="0" name="hw.vendor" value="Huawei"/>
111
- <param pos="0" name="hw.device" value="Broadband router"/>
111
+ <param pos="0" name="hw.device" value="Broadband Router"/>
112
112
  <param pos="0" name="hw.product" value="EchoLife Home Gateway"/>
113
113
  <param pos="1" name="hw.model"/>
114
114
  </fingerprint>
data/xml/smb_native_os.xml CHANGED
@@ -529,6 +529,7 @@
529
529
  <param pos="0" name="hw.vendor" value="EMC"/>
530
530
  <param pos="0" name="hw.device" value="Storage"/>
531
531
  <param pos="0" name="hw.product" value="Celerra"/>
532
+ <param pos="0" name="hw.cpe23" value="cpe:/h:emc:celerra_network_attached_storage:-"/>
532
533
  </fingerprint>
533
534
 
534
535
  <fingerprint pattern="^Netreon OS 1.0$">
data/xml/smtp_banners.xml CHANGED
@@ -1660,7 +1660,8 @@
1660
1660
  <description>Symantec Mail Security for SMTP</description>
1661
1661
  <example host.name="foo.bar">foo.bar ESMTP Symantec Mail Security</example>
1662
1662
  <param pos="0" name="service.vendor" value="Symantec"/>
1663
- <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:-"/>
1664
1665
  <param pos="1" name="host.name"/>
1665
1666
  </fingerprint>
1666
1667
 
@@ -1668,7 +1669,8 @@
1668
1669
  <description>Symantec Mail Gateway</description>
1669
1670
  <example host.name="foo.bar">foo.bar ESMTP Symantec Messaging Gateway</example>
1670
1671
  <param pos="0" name="service.vendor" value="Symantec"/>
1671
- <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:-"/>
1672
1674
  <param pos="1" name="host.name"/>
1673
1675
  </fingerprint>
1674
1676
 
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
  <!--======================================================================
@@ -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
 
@@ -6904,7 +6905,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6904
6905
  <example>silex PocketPro 100s</example>
6905
6906
  <example>silex PocketPro 100s compatible with an HP JETDIRECT EX</example>
6906
6907
  <param pos="0" name="os.vendor" value="Troy"/>
6907
- <param pos="0" name="os.device" value="Print server"/>
6908
+ <param pos="0" name="os.device" value="Print Server"/>
6908
6909
  <param pos="0" name="os.product" value="PocketPro"/>
6909
6910
  </fingerprint>
6910
6911
 
@@ -7187,7 +7188,7 @@ Copyright (c) 1995-2005 by Cisco Systems
7187
7188
  <example>ZebraNet PrintServer</example>
7188
7189
  <param pos="0" name="os.vendor" value="ZebraNet"/>
7189
7190
  <param pos="0" name="os.product" value="PrintServer"/>
7190
- <param pos="0" name="os.device" value="Print server"/>
7191
+ <param pos="0" name="os.device" value="Print Server"/>
7191
7192
  </fingerprint>
7192
7193
 
7193
7194
  <!--======================================================================
@@ -7199,7 +7200,7 @@ Copyright (c) 1995-2005 by Cisco Systems
7199
7200
  <example>Prestige 645</example>
7200
7201
  <param pos="0" name="os.vendor" value="Zyxel"/>
7201
7202
  <param pos="0" name="os.product" value="Prestige 645"/>
7202
- <param pos="0" name="os.device" value="Broadband router"/>
7203
+ <param pos="0" name="os.device" value="Broadband Router"/>
7203
7204
  </fingerprint>
7204
7205
 
7205
7206
  <fingerprint pattern="^Prestige 660HW-61$">
@@ -7231,7 +7232,7 @@ Copyright (c) 1995-2005 by Cisco Systems
7231
7232
  <example>Prestige 642R-13</example>
7232
7233
  <param pos="0" name="os.vendor" value="Zyxel"/>
7233
7234
  <param pos="0" name="os.product" value="Prestige 642R-13"/>
7234
- <param pos="0" name="os.device" value="Broadband router"/>
7235
+ <param pos="0" name="os.device" value="Broadband Router"/>
7235
7236
  </fingerprint>
7236
7237
 
7237
7238
  <fingerprint pattern="^Prestige 660ME-61$">
@@ -7239,7 +7240,7 @@ Copyright (c) 1995-2005 by Cisco Systems
7239
7240
  <example>Prestige 660ME-61</example>
7240
7241
  <param pos="0" name="os.vendor" value="Zyxel"/>
7241
7242
  <param pos="0" name="os.product" value="Prestige 660ME-61"/>
7242
- <param pos="0" name="os.device" value="Broadband router"/>
7243
+ <param pos="0" name="os.device" value="Broadband Router"/>
7243
7244
  </fingerprint>
7244
7245
 
7245
7246
  <fingerprint pattern="^Prestige 650R-T3$">
@@ -7247,7 +7248,7 @@ Copyright (c) 1995-2005 by Cisco Systems
7247
7248
  <example>Prestige 650R-T3</example>
7248
7249
  <param pos="0" name="os.vendor" value="Zyxel"/>
7249
7250
  <param pos="0" name="os.product" value="Prestige 650R-T3"/>
7250
- <param pos="0" name="os.device" value="Broadband router"/>
7251
+ <param pos="0" name="os.device" value="Broadband Router"/>
7251
7252
  </fingerprint>
7252
7253
 
7253
7254
  </fingerprints>