recog 2.3.18 → 2.3.22

Sign up to get free protection for your applications and to get access to all the features.
Files changed (73) hide show
  1. checksums.yaml +4 -4
  2. data/.github/dependabot.yml +8 -0
  3. data/.github/workflows/ci.yml +26 -0
  4. data/.github/workflows/verify.yml +89 -0
  5. data/CONTRIBUTING.md +6 -0
  6. data/README.md +17 -0
  7. data/bin/recog_standardize +33 -12
  8. data/bin/recog_verify +1 -2
  9. data/cpe-remap.yaml +355 -200
  10. data/features/verify.feature +14 -14
  11. data/identifiers/README.md +24 -10
  12. data/identifiers/fields.txt +105 -0
  13. data/identifiers/hw_device.txt +8 -0
  14. data/identifiers/hw_family.txt +19 -0
  15. data/identifiers/hw_product.txt +122 -0
  16. data/identifiers/os_device.txt +2 -1
  17. data/identifiers/os_family.txt +3 -0
  18. data/identifiers/os_product.txt +46 -8
  19. data/identifiers/service_family.txt +10 -1
  20. data/identifiers/service_product.txt +90 -2
  21. data/identifiers/vendor.txt +104 -0
  22. data/lib/recog/db.rb +2 -1
  23. data/lib/recog/fingerprint.rb +18 -5
  24. data/lib/recog/nizer.rb +1 -82
  25. data/lib/recog/verifier.rb +5 -5
  26. data/lib/recog/verifier_factory.rb +3 -3
  27. data/lib/recog/verify_reporter.rb +14 -4
  28. data/lib/recog/version.rb +1 -1
  29. data/requirements.txt +1 -1
  30. data/spec/lib/fingerprint_self_test_spec.rb +1 -0
  31. data/spec/lib/recog/verify_reporter_spec.rb +69 -0
  32. data/tools/dev/hooks/pre-commit +21 -0
  33. data/update_cpes.py +19 -6
  34. data/xml/apache_modules.xml +60 -0
  35. data/xml/apache_os.xml +38 -38
  36. data/xml/dhcp_vendor_class.xml +206 -0
  37. data/xml/dns_versionbind.xml +11 -1
  38. data/xml/favicons.xml +270 -45
  39. data/xml/ftp_banners.xml +89 -64
  40. data/xml/h323_callresp.xml +99 -99
  41. data/xml/hp_pjl_id.xml +3 -3
  42. data/xml/html_title.xml +1051 -62
  43. data/xml/http_cookies.xml +294 -85
  44. data/xml/http_servers.xml +551 -122
  45. data/xml/http_wwwauth.xml +139 -43
  46. data/xml/imap_banners.xml +8 -8
  47. data/xml/ldap_searchresult.xml +1 -0
  48. data/xml/mdns_device-info_txt.xml +720 -27
  49. data/xml/mysql_banners.xml +3 -2
  50. data/xml/nntp_banners.xml +4 -4
  51. data/xml/ntp_banners.xml +79 -65
  52. data/xml/operating_system.xml +6 -6
  53. data/xml/pop_banners.xml +11 -11
  54. data/xml/rsh_resp.xml +3 -3
  55. data/xml/rtsp_servers.xml +7 -0
  56. data/xml/sip_banners.xml +374 -9
  57. data/xml/sip_user_agents.xml +377 -5
  58. data/xml/smb_native_lm.xml +32 -1
  59. data/xml/smb_native_os.xml +160 -33
  60. data/xml/smtp_banners.xml +168 -129
  61. data/xml/smtp_ehlo.xml +1 -1
  62. data/xml/smtp_expn.xml +1 -0
  63. data/xml/smtp_help.xml +10 -10
  64. data/xml/smtp_noop.xml +2 -2
  65. data/xml/smtp_vrfy.xml +1 -0
  66. data/xml/snmp_sysdescr.xml +508 -214
  67. data/xml/snmp_sysobjid.xml +25 -25
  68. data/xml/ssh_banners.xml +145 -29
  69. data/xml/telnet_banners.xml +240 -61
  70. data/xml/tls_jarm.xml +162 -0
  71. data/xml/x509_issuers.xml +237 -2
  72. data/xml/x509_subjects.xml +369 -49
  73. metadata +10 -3
data/xml/ntp_banners.xml CHANGED
@@ -4,7 +4,7 @@
4
4
  NTP "banners", taken from a readvar response
5
5
  -->
6
6
 
7
- <fingerprint pattern="^.*version=Domain Time II (\S+),hostname=([^,]+),.*system=Win2003.*,processor=(\S+)" flags="REG_DOT_NEWLINE,REG_ICASE">
7
+ <fingerprint pattern="version=Domain Time II (\S+),hostname=([^,]+),.*system=Win2003.*,processor=(\S+)" flags="REG_DOT_NEWLINE,REG_ICASE">
8
8
  <description>Greyware Automation Products, Inc. Domain Time II on Windows Server 2003</description>
9
9
  <example service.version="5.1.b.20100331R" os.arch="x64" host.name="blah">
10
10
  version=Domain Time II 5.1.b.20100331R,hostname=blah,domain=,flat=WORKGROUP,system=Win2003 x64,processor=x64
@@ -23,7 +23,7 @@
23
23
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2003:-"/>
24
24
  </fingerprint>
25
25
 
26
- <fingerprint pattern="^.*version=Domain Time II (\S+),hostname=([^,]+),.*system=Win2008R2.*,processor=(\S+)" flags="REG_DOT_NEWLINE,REG_ICASE">
26
+ <fingerprint pattern="version=Domain Time II (\S+),hostname=([^,]+),.*system=Win2008R2.*,processor=(\S+)" flags="REG_DOT_NEWLINE,REG_ICASE">
27
27
  <description>Greyware Automation Products, Inc. Domain Time II on Windows Server 2008 R2</description>
28
28
  <example service.version="5.2.b.20120215R" os.arch="x64" host.name="blah">
29
29
  version=Domain Time II 5.2.b.20120215R,hostname=blah,domain=blah,flat=blah,system=Win2008R2 x64,processor=x64
@@ -39,7 +39,7 @@
39
39
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2008:-"/>
40
40
  </fingerprint>
41
41
 
42
- <fingerprint pattern="^.*version=Domain Time II (\S+),hostname=([^,]+),.*system=Win2008.*,processor=(\S+)" flags="REG_DOT_NEWLINE,REG_ICASE">
42
+ <fingerprint pattern="version=Domain Time II (\S+),hostname=([^,]+),.*system=Win2008.*,processor=(\S+)" flags="REG_DOT_NEWLINE,REG_ICASE">
43
43
  <description>Greyware Automation Products, Inc. Domain Time II on Windows 2008</description>
44
44
  <example service.version="5.2.b.20140303R" os.arch="x86" host.name="blah">
45
45
  version=Domain Time II 5.2.b.20140303R,hostname=blah,domain=blah,flat=blah,system=Win2008,processor=x86
@@ -58,7 +58,7 @@
58
58
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2008:-"/>
59
59
  </fingerprint>
60
60
 
61
- <fingerprint pattern="^.*version=Domain Time II (\S+),hostname=([^,]+),.*system=Win2012.*,processor=(\S+)" flags="REG_DOT_NEWLINE,REG_ICASE">
61
+ <fingerprint pattern="version=Domain Time II (\S+),hostname=([^,]+),.*system=Win2012.*,processor=(\S+)" flags="REG_DOT_NEWLINE,REG_ICASE">
62
62
  <description>Greyware Automation Products, Inc. Domain Time II on Windows Server 2012</description>
63
63
  <example service.version="5.2.b.20140101R" os.arch="x64" host.name="blah">
64
64
  version=Domain Time II 5.2.b.20140101R,hostname=blah,domain=blah,flat=blah,system=Win2012 x64,processor=x64
@@ -74,7 +74,7 @@
74
74
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2012:-"/>
75
75
  </fingerprint>
76
76
 
77
- <fingerprint pattern="^.*version=Domain Time II (\S+),hostname=([^,]+),.*system=Win7.*,processor=(\S+)" flags="REG_DOT_NEWLINE,REG_ICASE">
77
+ <fingerprint pattern="version=Domain Time II (\S+),hostname=([^,]+),.*system=Win7.*,processor=(\S+)" flags="REG_DOT_NEWLINE,REG_ICASE">
78
78
  <description>Greyware Automation Products, Inc. Domain Time II on Windows 7</description>
79
79
  <example service.version="5.2.b.20130405R" os.arch="x64" host.name="blah">
80
80
  version=Domain Time II 5.2.b.20130405R,hostname=blah,domain=,flat=WORKGROUP,system=Win7 x64,processor=x64
@@ -90,7 +90,7 @@
90
90
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_7:-"/>
91
91
  </fingerprint>
92
92
 
93
- <fingerprint pattern="^.*version=&quot;ntpd (\S+)[^&quot;]+&quot;,.*system=&quot;Equallogic \(R\) storage array&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
93
+ <fingerprint pattern="version=&quot;ntpd (\S+)[^&quot;]+&quot;,.*system=&quot;Equallogic \(R\) storage array&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
94
94
  <description>ntpd running on an EqualLogic Storage Array that includes the NTP version</description>
95
95
  <example>
96
96
  version="ntpd 4.2.0-r Fri Feb 5 15:18:30 EST 2010 (1)",
@@ -107,7 +107,7 @@
107
107
  <param pos="0" name="os.product" value="Storage Array"/>
108
108
  </fingerprint>
109
109
 
110
- <fingerprint pattern="^.*system=&quot;Equallogic \(R\) storage array&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
110
+ <fingerprint pattern="system=&quot;Equallogic \(R\) storage array&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
111
111
  <description>ntpd running on an EqualLogic Storage Array that does not include the NTP version</description>
112
112
  <example>
113
113
  processor="Working", system="Equallogic (R) storage array", leap=3,
@@ -120,7 +120,7 @@
120
120
  <param pos="0" name="os.product" value="Storage Array"/>
121
121
  </fingerprint>
122
122
 
123
- <fingerprint pattern="^.*version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;Linux/(?:[^ ]+\.ESX)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
123
+ <fingerprint pattern="version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;Linux/(?:[^ ]+\.ESX)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
124
124
  <description>ntpd running on VMware ESX</description>
125
125
  <example service.version="4.2.2p1@1.1570-o" os.arch="x86_64">
126
126
  version="ntpd 4.2.2p1@1.1570-o Thu Nov 26 11:34:34 UTC 2009 (1)",
@@ -133,10 +133,12 @@
133
133
  <param pos="0" name="os.family" value="VMware ESX/ESXi"/>
134
134
  <param pos="0" name="os.product" value="VMware ESX Server"/>
135
135
  <param pos="2" name="os.arch"/>
136
+ <param pos="0" name="os.device" value="Hypervisor"/>
136
137
  <param pos="0" name="os.cpe23" value="cpe:/o:vmware:esx:-"/>
138
+ <param pos="0" name="hw.device" value="Hypervisor"/>
137
139
  </fingerprint>
138
140
 
139
- <fingerprint pattern="^.*version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;Linux/?([^ ]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
141
+ <fingerprint pattern="version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;Linux/?([^ ]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
140
142
  <description>ntpd running on Linux</description>
141
143
  <example>
142
144
  version="ntpd 4.2.4p3@1.1502-o Wed Jul 18 11:45:01 UTC 2007 (1)",
@@ -153,7 +155,7 @@
153
155
  <param pos="0" name="os.cpe23" value="cpe:/o:linux:linux_kernel:{os.version}"/>
154
156
  </fingerprint>
155
157
 
156
- <fingerprint pattern="^.*version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^&quot;]+)&quot;,.*system=&quot;Darwin/?6\.([^&quot;]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
158
+ <fingerprint pattern="version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^&quot;]+)&quot;,.*system=&quot;Darwin/?6\.([^&quot;]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
157
159
  <description>ntpd running on Mac OSX 10.2/Jaguar</description>
158
160
  <example service.version="4.1.1@1.786" os.version.version="8">
159
161
  version="ntpd 4.1.1@1.786 Tue Nov 12 09:30:41 PST 2002 (1)", processor="Power Macintosh", system="Darwin6.8",
@@ -171,7 +173,7 @@
171
173
  <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.2"/>
172
174
  </fingerprint>
173
175
 
174
- <fingerprint pattern="^.*version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^&quot;]+)&quot;,.*system=&quot;Darwin/?7\.([^&quot;]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
176
+ <fingerprint pattern="version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^&quot;]+)&quot;,.*system=&quot;Darwin/?7\.([^&quot;]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
175
177
  <description>ntpd running on Mac OSX 10.3/Panther</description>
176
178
  <param pos="0" name="service.family" value="NTP"/>
177
179
  <param pos="0" name="service.product" value="NTP"/>
@@ -186,7 +188,7 @@
186
188
  <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.3"/>
187
189
  </fingerprint>
188
190
 
189
- <fingerprint pattern="^.*version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^&quot;]+)&quot;,.*system=&quot;Darwin/?8\.([^&quot;]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
191
+ <fingerprint pattern="version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^&quot;]+)&quot;,.*system=&quot;Darwin/?8\.([^&quot;]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
190
192
  <description>ntpd running on Mac OSX 10.4/Tiger</description>
191
193
  <example>
192
194
  version="ntpd 4.2.0@1.1161-r Fri Jan 13 11:36:23 PST 2006 (1)",
@@ -205,7 +207,7 @@
205
207
  <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.4"/>
206
208
  </fingerprint>
207
209
 
208
- <fingerprint pattern="^.*version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^&quot;]+)&quot;,.*system=&quot;Darwin/?9\.([^&quot;]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
210
+ <fingerprint pattern="version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^&quot;]+)&quot;,.*system=&quot;Darwin/?9\.([^&quot;]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
209
211
  <description>ntpd running on Mac OSX 10.5/Leopard</description>
210
212
  <example>
211
213
  version="ntpd 4.2.2@1.1532-o Mon Sep 24 01:42:27 UTC 2007 (1)",
@@ -224,7 +226,7 @@
224
226
  <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.5"/>
225
227
  </fingerprint>
226
228
 
227
- <fingerprint pattern="^.*version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^&quot;]+)&quot;,.*system=&quot;Darwin/?10\.([^&quot;]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
229
+ <fingerprint pattern="version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^&quot;]+)&quot;,.*system=&quot;Darwin/?10\.([^&quot;]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
228
230
  <description>ntpd running on Mac OSX 10.6/Snow Leopard</description>
229
231
  <example>
230
232
  version="ntpd 4.2.4p4@1.1520-o Mon May 18 19:38:25 UTC 2009 (1)",
@@ -243,7 +245,7 @@
243
245
  <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.6"/>
244
246
  </fingerprint>
245
247
 
246
- <fingerprint pattern="^.*processor=&quot;([^&quot;]+)&quot;.*system=&quot;BSD/OS([\d.]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
248
+ <fingerprint pattern="processor=&quot;([^&quot;]+)&quot;.*system=&quot;BSD/OS([\d.]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
247
249
  <description>BSD/OS with a version and arch</description>
248
250
  <example os.arch="i386" os.version="4.3.1">
249
251
  processor="i386", system="BSD/OS4.3.1", leap=0, stratum=2
@@ -254,7 +256,7 @@
254
256
  <param pos="2" name="os.version"/>
255
257
  </fingerprint>
256
258
 
257
- <fingerprint pattern="^.*system=&quot;BSD/OS&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
259
+ <fingerprint pattern="system=&quot;BSD/OS&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
258
260
  <description>BSD/OS without a version or arch</description>
259
261
  <example>
260
262
  system="BSD/OS", leap=3, stratum=16, rootdelay=0.00
@@ -263,7 +265,7 @@
263
265
  <param pos="0" name="os.product" value="BSD/OS"/>
264
266
  </fingerprint>
265
267
 
266
- <fingerprint pattern="^.*version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^&quot;]+)&quot;,.*system=&quot;Darwin/?11\.([^&quot;]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
268
+ <fingerprint pattern="version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^&quot;]+)&quot;,.*system=&quot;Darwin/?11\.([^&quot;]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
267
269
  <description>ntpd running on Mac OSX 10.7/Lion</description>
268
270
  <example>
269
271
  version="ntpd 4.2.6@1.2089-o Fri May 28 01:20:53 UTC 2010 (1)",
@@ -282,7 +284,7 @@
282
284
  <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.7"/>
283
285
  </fingerprint>
284
286
 
285
- <fingerprint pattern="^.*version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^&quot;]+)&quot;,.*system=&quot;Darwin/?12\.([^&quot;]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
287
+ <fingerprint pattern="version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^&quot;]+)&quot;,.*system=&quot;Darwin/?12\.([^&quot;]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
286
288
  <description>ntpd running on Mac OSX 10.8/Mountain Lion</description>
287
289
  <example service.version="4.2.6@1.2089-o" os.arch="x86_64" os.version.version="1.0">
288
290
  version="ntpd 4.2.6@1.2089-o Fri May 28 01:20:53 UTC 2010 (1)",
@@ -301,7 +303,7 @@
301
303
  <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.8"/>
302
304
  </fingerprint>
303
305
 
304
- <fingerprint pattern="^.*version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^&quot;]+)&quot;,.*system=&quot;Darwin/?13\.([^&quot;]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
306
+ <fingerprint pattern="version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^&quot;]+)&quot;,.*system=&quot;Darwin/?13\.([^&quot;]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
305
307
  <description>ntpd running on Mac OSX 10.9/Mavericks</description>
306
308
  <example service.version="4.2.6@1.2089-o" os.arch="x86_64" os.version.version="4.0">
307
309
  version="ntpd 4.2.6@1.2089-o Fri May 28 01:20:53 UTC 2010 (1)",
@@ -320,7 +322,7 @@
320
322
  <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.9"/>
321
323
  </fingerprint>
322
324
 
323
- <fingerprint pattern="^.*version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^&quot;]+)&quot;,.*system=&quot;Darwin/?14\.([^&quot;]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
325
+ <fingerprint pattern="version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^&quot;]+)&quot;,.*system=&quot;Darwin/?14\.([^&quot;]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
324
326
  <description>ntpd running on Mac OSX 10.10/Yosemite</description>
325
327
  <example service.version="4.2.6@1.2089-o" os.arch="x86_64" os.version.version="3.0">
326
328
  version="ntpd 4.2.6@1.2089-o Fri May 28 01:20:53 UTC 2010 (1)",
@@ -339,7 +341,7 @@
339
341
  <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.10"/>
340
342
  </fingerprint>
341
343
 
342
- <fingerprint pattern="^.*version=&quot;ntpd ([^ p]+)(:?p[^ &quot;]+)?[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;FreeBSD/?(?:[^ ]+-NETSCALER-([^ ]+))&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
344
+ <fingerprint pattern="version=&quot;ntpd ([^ p]+)(p[^ &quot;]+)?[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;FreeBSD/?(?:[^ ]+-NETSCALER-([^ ]+))&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
343
345
  <description>ntpd running on Citrix Netscaler, which is based on FreeBSD</description>
344
346
  <example service.version="4.2.6" service.version.version="p2@1.2194" os.arch="i386" os.version="9.3">
345
347
  version="ntpd 4.2.6p2@1.2194 Wed Nov 24 15:54:11 UTC 2010 (1)",
@@ -360,9 +362,10 @@
360
362
  <param pos="0" name="os.product" value="NetScaler"/>
361
363
  <param pos="3" name="os.arch"/>
362
364
  <param pos="4" name="os.version"/>
365
+ <param pos="0" name="os.cpe23" value="cpe:/o:citrix:netscaler_firmware:{os.version}"/>
363
366
  </fingerprint>
364
367
 
365
- <fingerprint pattern="^.*version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;FreeBSD/?([^ ]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
368
+ <fingerprint pattern="version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;FreeBSD/?([^ ]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
366
369
  <description>ntpd running on FreeBSD</description>
367
370
  <example>
368
371
  version="ntpd 4.2.6p2@1.2194 Wed Nov 24 15:54:11 UTC 2010 (1)",
@@ -379,7 +382,7 @@
379
382
  <param pos="0" name="os.cpe23" value="cpe:/o:freebsd:freebsd:{os.version}"/>
380
383
  </fingerprint>
381
384
 
382
- <fingerprint pattern="^.*processor=&quot;([^ ]+)&quot;,.*system=&quot;FreeBSD/?([^ ]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
385
+ <fingerprint pattern="processor=&quot;([^ ]+)&quot;,.*system=&quot;FreeBSD/?([^ ]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
383
386
  <description>ntp without a version on FreeBSD</description>
384
387
  <example os.arch="i386" os.version="4.1-RELEASE">
385
388
  processor="i386", system="FreeBSD4.1-RELEASE"
@@ -395,7 +398,7 @@
395
398
  <param pos="0" name="os.cpe23" value="cpe:/o:freebsd:freebsd:{os.version}"/>
396
399
  </fingerprint>
397
400
 
398
- <fingerprint pattern="^.*version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;NetBSD/?([^ ]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
401
+ <fingerprint pattern="version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;NetBSD/?([^ ]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
399
402
  <description>ntpd running on NetBSD</description>
400
403
  <example>
401
404
  version="ntpd 4.2.4p6-o Thu Jan 8 21:02:40 MET 2009 (import)",
@@ -412,7 +415,7 @@
412
415
  <param pos="0" name="os.cpe23" value="cpe:/o:netbsd:netbsd:{os.version}"/>
413
416
  </fingerprint>
414
417
 
415
- <fingerprint pattern="^.*processor=&quot;([^ ]+)&quot;,.*system=&quot;NetBSD/?([^ ]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
418
+ <fingerprint pattern="processor=&quot;([^ ]+)&quot;,.*system=&quot;NetBSD/?([^ ]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
416
419
  <description>ntpd running on NetBSD - variant 2</description>
417
420
  <example os.arch="i386" os.version="1.5.3">
418
421
  processor="i386", system="NetBSD1.5.3"
@@ -455,7 +458,7 @@
455
458
  <param pos="0" name="os.cpe23" value="cpe:/o:netbsd:netbsd:{os.version}"/>
456
459
  </fingerprint>
457
460
 
458
- <fingerprint pattern="^.*system=&quot;NetWare&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
461
+ <fingerprint pattern="system=&quot;NetWare&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
459
462
  <description>NetWare</description>
460
463
  <example>
461
464
  system="NetWare", leap=0, stratum=2, rootdelay=0.12
@@ -466,7 +469,7 @@
466
469
  <param pos="0" name="os.cpe23" value="cpe:/o:novell:netware:-"/>
467
470
  </fingerprint>
468
471
 
469
- <fingerprint pattern="^.*version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.0&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
472
+ <fingerprint pattern="version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.0&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
470
473
  <description>ntpd running on Solaris 2.0 (SunOS/5.0) </description>
471
474
  <example service.version="4.2.0@1.1161-r" os.arch="sun4u">
472
475
  version="ntpd 4.2.0@1.1161-r Wed Apr 20 11:28:05 EDT 2005 (1)",
@@ -487,7 +490,7 @@
487
490
  <param pos="0" name="os.cpe23" value="cpe:/o:sun:solaris:2.0"/>
488
491
  </fingerprint>
489
492
 
490
- <fingerprint pattern="^.*version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.1&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
493
+ <fingerprint pattern="version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.1&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
491
494
  <description> ntpd running on Solaris 2.1 (SunOS/5.1) </description>
492
495
  <example service.version="4.2.0@1.1161-r" os.arch="sun4u">
493
496
  version="ntpd 4.2.0@1.1161-r Wed Apr 20 11:28:05 EDT 2005 (1)",
@@ -508,7 +511,7 @@
508
511
  <param pos="0" name="os.cpe23" value="cpe:/o:sun:solaris:2.1"/>
509
512
  </fingerprint>
510
513
 
511
- <fingerprint pattern="^.*version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.2&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
514
+ <fingerprint pattern="version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.2&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
512
515
  <description> ntpd running on Solaris 2.2 (SunOS/5.2) </description>
513
516
  <example service.version="4.2.0@1.1161-r" os.arch="sun4u">
514
517
  version="ntpd 4.2.0@1.1161-r Wed Apr 20 11:28:05 EDT 2005 (1)",
@@ -529,7 +532,7 @@
529
532
  <param pos="0" name="os.cpe23" value="cpe:/o:sun:solaris:2.2"/>
530
533
  </fingerprint>
531
534
 
532
- <fingerprint pattern="^.*version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.3&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
535
+ <fingerprint pattern="version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.3&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
533
536
  <description> ntpd running on Solaris 2.3 (SunOS/5.3) </description>
534
537
  <example service.version="4.2.0@1.1161-r" os.arch="sun4u">
535
538
  version="ntpd 4.2.0@1.1161-r Wed Apr 20 11:28:05 EDT 2005 (1)",
@@ -550,7 +553,7 @@
550
553
  <param pos="0" name="os.cpe23" value="cpe:/o:sun:solaris:2.3"/>
551
554
  </fingerprint>
552
555
 
553
- <fingerprint pattern="^.*version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.4&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
556
+ <fingerprint pattern="version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.4&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
554
557
  <description>ntpd running on Solaris 2.4 (SunOS/5.4) </description>
555
558
  <example service.version="4.2.0@1.1161-r" os.arch="sun4u">
556
559
  version="ntpd 4.2.0@1.1161-r Wed Apr 20 11:28:05 EDT 2005 (1)",
@@ -571,7 +574,7 @@
571
574
  <param pos="0" name="os.cpe23" value="cpe:/o:sun:solaris:2.4"/>
572
575
  </fingerprint>
573
576
 
574
- <fingerprint pattern="^.*version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.5&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
577
+ <fingerprint pattern="version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.5&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
575
578
  <description>ntpd running on Solaris 2.5 (SunOS/5.5) </description>
576
579
  <example service.version="4.2.0@1.1161-r" os.arch="sun4u">
577
580
  version="ntpd 4.2.0@1.1161-r Wed Apr 20 11:28:05 EDT 2005 (1)",
@@ -592,7 +595,7 @@
592
595
  <param pos="0" name="os.cpe23" value="cpe:/o:sun:solaris:2.5"/>
593
596
  </fingerprint>
594
597
 
595
- <fingerprint pattern="^.*version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.6&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
598
+ <fingerprint pattern="version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.6&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
596
599
  <description>ntpd running on Solaris 2.6 (SunOS/5.6) </description>
597
600
  <example service.version="4.2.0@1.1161-r" os.arch="sun4u">
598
601
  version="ntpd 4.2.0@1.1161-r Wed Apr 20 11:28:05 EDT 2005 (1)",
@@ -613,7 +616,7 @@
613
616
  <param pos="0" name="os.cpe23" value="cpe:/o:sun:solaris:2.6"/>
614
617
  </fingerprint>
615
618
 
616
- <fingerprint pattern="^.*version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.(1[1-9])&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
619
+ <fingerprint pattern="version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.(1[1-9])&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
617
620
  <description>ntpd running on Solaris 11 or above (SunOS/5.11 and above) </description>
618
621
  <example service.version="4.2.0@1.1161-r" os.arch="sun4u" os.version="11">
619
622
  version="ntpd 4.2.0@1.1161-r Wed Apr 20 11:28:05 EDT 2005 (1)",
@@ -634,7 +637,7 @@
634
637
  <param pos="0" name="os.cpe23" value="cpe:/o:oracle:solaris:{os.version}"/>
635
638
  </fingerprint>
636
639
 
637
- <fingerprint pattern="^.*version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.([789]|10)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
640
+ <fingerprint pattern="version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.([789]|10)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
638
641
  <description>ntpd running on Solaris 7-Solaris 10 (SunOS/5.7 - SunOS/5.10) </description>
639
642
  <example service.version="4.2.0@1.1161-r" os.arch="sun4u" os.version="7">
640
643
  version="ntpd 4.2.0@1.1161-r Wed Apr 20 11:28:05 EDT 2005 (1)",
@@ -663,7 +666,7 @@
663
666
  <param pos="0" name="os.cpe23" value="cpe:/o:sun:solaris:{os.version}"/>
664
667
  </fingerprint>
665
668
 
666
- <fingerprint pattern="^.*processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.0&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
669
+ <fingerprint pattern="processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.0&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
667
670
  <description>Solaris 2.0 (SunOS/5.0) with no ntp version</description>
668
671
  <example os.arch="sun4m">
669
672
  processor="sun4m", system="SunOS/5.0"
@@ -679,7 +682,7 @@
679
682
  <param pos="0" name="os.cpe23" value="cpe:/o:sun:solaris:2.0"/>
680
683
  </fingerprint>
681
684
 
682
- <fingerprint pattern="^.*processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.1&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
685
+ <fingerprint pattern="processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.1&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
683
686
  <description>Solaris 2.1 (SunOS/5.1) with no ntp version</description>
684
687
  <example os.arch="sun4m">
685
688
  processor="sun4m", system="SunOS/5.1"
@@ -695,7 +698,7 @@
695
698
  <param pos="0" name="os.cpe23" value="cpe:/o:sun:solaris:2.1"/>
696
699
  </fingerprint>
697
700
 
698
- <fingerprint pattern="^.*processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.2&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
701
+ <fingerprint pattern="processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.2&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
699
702
  <description>Solaris 2.2 (SunOS/5.2) with no ntp version</description>
700
703
  <example os.arch="sun4m">
701
704
  processor="sun4m", system="SunOS/5.2"
@@ -711,7 +714,7 @@
711
714
  <param pos="0" name="os.cpe23" value="cpe:/o:sun:solaris:2.2"/>
712
715
  </fingerprint>
713
716
 
714
- <fingerprint pattern="^.*processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.3&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
717
+ <fingerprint pattern="processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.3&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
715
718
  <description>Solaris 2.3 (SunOS/5.3) with no ntp version</description>
716
719
  <example os.arch="sun4m">
717
720
  processor="sun4m", system="SunOS/5.3"
@@ -727,7 +730,7 @@
727
730
  <param pos="0" name="os.cpe23" value="cpe:/o:sun:solaris:2.3"/>
728
731
  </fingerprint>
729
732
 
730
- <fingerprint pattern="^.*processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.4&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
733
+ <fingerprint pattern="processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.4&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
731
734
  <description>Solaris 2.4 (SunOS/5.4) with no ntp version</description>
732
735
  <example os.arch="sun4m">
733
736
  processor="sun4m", system="SunOS/5.4"
@@ -743,7 +746,7 @@
743
746
  <param pos="0" name="os.cpe23" value="cpe:/o:sun:solaris:2.4"/>
744
747
  </fingerprint>
745
748
 
746
- <fingerprint pattern="^.*processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.5&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
749
+ <fingerprint pattern="processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.5&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
747
750
  <description>Solaris 2.5 (SunOS/5.5) with no ntp version</description>
748
751
  <example os.arch="sun4m">
749
752
  processor="sun4m", system="SunOS/5.5"
@@ -759,7 +762,7 @@
759
762
  <param pos="0" name="os.cpe23" value="cpe:/o:sun:solaris:2.5"/>
760
763
  </fingerprint>
761
764
 
762
- <fingerprint pattern="^.*processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.6&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
765
+ <fingerprint pattern="processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.6&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
763
766
  <description>Solaris 2.6 (SunOS/5.6) with no ntp version</description>
764
767
  <example os.arch="sun4m">
765
768
  processor="sun4m", system="SunOS/5.6"
@@ -775,7 +778,7 @@
775
778
  <param pos="0" name="os.cpe23" value="cpe:/o:sun:solaris:2.6"/>
776
779
  </fingerprint>
777
780
 
778
- <fingerprint pattern="^.*processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.([789]|10)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
781
+ <fingerprint pattern="processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.([789]|10)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
779
782
  <description>Solaris 7-10 (SunOS/5.7 - SunOS/5.10) with no ntp version</description>
780
783
  <example os.arch="sun4m" os.version="7">
781
784
  processor="sun4m", system="SunOS/5.7"
@@ -797,7 +800,7 @@
797
800
  <param pos="0" name="os.cpe23" value="cpe:/o:sun:solaris:{os.version}"/>
798
801
  </fingerprint>
799
802
 
800
- <fingerprint pattern="^.*processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.(1[1-9])&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
803
+ <fingerprint pattern="processor=&quot;([^ ]+)&quot;,.*system=&quot;SunOS/?5.(1[1-9])&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
801
804
  <description>Solaris 11 and up with no ntp version</description>
802
805
  <example os.arch="sun4m" os.version="11">
803
806
  processor="sun4m", system="SunOS/5.11"
@@ -813,7 +816,7 @@
813
816
  <param pos="0" name="os.cpe23" value="cpe:/o:oracle:solaris:{os.version}"/>
814
817
  </fingerprint>
815
818
 
816
- <fingerprint pattern="^.*system=&quot;UNIX/SunOS ([^ ]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
819
+ <fingerprint pattern="system=&quot;UNIX/SunOS ([^ ]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
817
820
  <description>SunOS with no ntp version</description>
818
821
  <example>
819
822
  system="UNIX/SunOS 4.x",
@@ -825,7 +828,7 @@
825
828
  <param pos="0" name="os.cpe23" value="cpe:/o:sun:solaris:{os.version}"/>
826
829
  </fingerprint>
827
830
 
828
- <fingerprint pattern="^.*version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;JUNOS/?([^ ]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
831
+ <fingerprint pattern="version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;JUNOS/?([^ ]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
829
832
  <description>ntpd running on Juniper/Netscreen JunOS</description>
830
833
  <example>
831
834
  version="ntpd 4.2.0-a Wed Aug 12 04:22:47 UTC 2009 (1)",
@@ -855,7 +858,7 @@
855
858
  <param pos="0" name="os.cpe23" value="cpe:/o:juniper:junos:{os.version}"/>
856
859
  </fingerprint>
857
860
 
858
- <fingerprint pattern="^.*version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;Windows/?([^ ]+)?&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
861
+ <fingerprint pattern="version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;Windows/?([^ ]+)?&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
859
862
  <description>ntpd running on Windows</description>
860
863
  <example>
861
864
  version="ntpd 4.2.4p7@copenhagen-o May 22 11:25:36 (UTC+02:00) 2009 (3)",
@@ -876,7 +879,7 @@
876
879
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:{os.version}"/>
877
880
  </fingerprint>
878
881
 
879
- <fingerprint pattern="^.*version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;HP-UX/?([^ ]+)?&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
882
+ <fingerprint pattern="version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;HP-UX/?([^ ]+)?&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
880
883
  <description>ntpd running on HP-UX</description>
881
884
  <example>
882
885
  version="ntpd 4.2.2@1.1532-o Wed Sep 6 16:49:43 EDT 2006 (2)",
@@ -893,7 +896,7 @@
893
896
  <param pos="0" name="os.cpe23" value="cpe:/o:hp:hp-ux:{os.version}"/>
894
897
  </fingerprint>
895
898
 
896
- <fingerprint pattern="^.*version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=,.*system=&quot;HP-UX/&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
899
+ <fingerprint pattern="version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=,.*system=&quot;HP-UX/&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
897
900
  <description>ntpd running on HP-UX with an empty processor</description>
898
901
  <example service.version="4.2.6">
899
902
  version="ntpd 4.2.6 Revision 0.0 Tue Nov 5 14:21:22 UTC 2012",
@@ -908,7 +911,7 @@
908
911
  <param pos="0" name="os.cpe23" value="cpe:/o:hp:hp-ux:-"/>
909
912
  </fingerprint>
910
913
 
911
- <fingerprint pattern="^.*version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;[^ ]+&quot;,.*system=&quot;([^ ]+)-hp-hpux([^ ]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
914
+ <fingerprint pattern="version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;[^ ]+&quot;,.*system=&quot;([^ ]+)-hp-hpux([^ ]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
912
915
  <description>ntpd running on HP-UX, where the processor is in the 'system' variable</description>
913
916
  <example>
914
917
  version="ntpd 4.2.5p154@1.1802 Tue Mar 22 22:09:00 UTC 2011 (39)",
@@ -925,7 +928,12 @@
925
928
  <param pos="0" name="os.cpe23" value="cpe:/o:hp:hp-ux:{os.version}"/>
926
929
  </fingerprint>
927
930
 
928
- <fingerprint pattern="^.*version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;VMkernel/?([^ ]+)?&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
931
+ <!--
932
+ This may need to be split into ESX and ESXi. ESXi started w/ version 4.1 and
933
+ all versions 5.x were ESXi only.
934
+ -->
935
+
936
+ <fingerprint pattern="version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*processor=&quot;([^ ]+)&quot;,.*system=&quot;VMkernel/?([^ ]+)?&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
929
937
  <description>ntpd running on VMware ESXi</description>
930
938
  <example>
931
939
  version="ntpd 4.2.4p6@1.1495 Wed Sep 22 02:33:15 UTC 2010 (1)",
@@ -939,10 +947,12 @@
939
947
  <param pos="0" name="os.product" value="VMware ESXi Server"/>
940
948
  <param pos="2" name="os.arch"/>
941
949
  <param pos="3" name="os.version"/>
950
+ <param pos="0" name="os.device" value="Hypervisor"/>
942
951
  <param pos="0" name="os.cpe23" value="cpe:/o:vmware:esxi:{os.version}"/>
952
+ <param pos="0" name="hw.device" value="Hypervisor"/>
943
953
  </fingerprint>
944
954
 
945
- <fingerprint pattern=".*processor=&quot;([^ ]+)&quot;,.*system=&quot;OSF1[/V]?([^ ]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
955
+ <fingerprint pattern="processor=&quot;([^ ]+)&quot;,.*system=&quot;OSF1[/V]?([^ ]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
946
956
  <description>ntpd running on OSF/1</description>
947
957
  <example os.arch="alpha" os.version="4.0">
948
958
  processor="alpha", system="OSF1V4.0", leap=00, stratum=1, precision=-18,
@@ -955,7 +965,7 @@
955
965
  <param pos="1" name="os.arch"/>
956
966
  </fingerprint>
957
967
 
958
- <fingerprint pattern=".*system=&quot;UNIX/DECOSF1&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
968
+ <fingerprint pattern="system=&quot;UNIX/DECOSF1&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
959
969
  <description>DEC OSF/1</description>
960
970
  <example>
961
971
  system="UNIX/DECOSF1", leap=0, stratum=3, rootdelay=18.14,
@@ -964,7 +974,7 @@
964
974
  <param pos="0" name="os.product" value="OSF/1"/>
965
975
  </fingerprint>
966
976
 
967
- <fingerprint pattern="^.*system=&quot;Linux&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
977
+ <fingerprint pattern="system=&quot;Linux&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
968
978
  <description>Linux with NTP enabled, no processor/version</description>
969
979
  <example>
970
980
  system="Linux", leap=00, stratum=2, rootdelay=6.480,
@@ -977,7 +987,7 @@
977
987
  <param pos="0" name="service.product" value="NTP"/>
978
988
  </fingerprint>
979
989
 
980
- <fingerprint pattern="^.*system=&quot;UNIX/AIX&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
990
+ <fingerprint pattern="system=&quot;UNIX/AIX&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
981
991
  <description>AIX with NTP enabled, no processor/version</description>
982
992
  <example>
983
993
  system="UNIX/AIX", leap=00, stratum=3, rootdelay=2.000,
@@ -991,7 +1001,7 @@
991
1001
  <param pos="0" name="service.vendor" value="IBM"/>
992
1002
  </fingerprint>
993
1003
 
994
- <fingerprint pattern="^.*system=&quot;SunOS&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
1004
+ <fingerprint pattern="system=&quot;SunOS&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
995
1005
  <description>Solaris with NTP enabled, no processor/version</description>
996
1006
  <example>
997
1007
  system="SunOS", leap=00, stratum=1, rootdelay=0.000,
@@ -1005,7 +1015,7 @@
1005
1015
  <param pos="0" name="service.vendor" value="Sun"/>
1006
1016
  </fingerprint>
1007
1017
 
1008
- <fingerprint pattern="^.*system=&quot;cisco&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
1018
+ <fingerprint pattern="system=&quot;cisco&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
1009
1019
  <description>Cisco IOS with NTP enabled</description>
1010
1020
  <example>
1011
1021
  system="cisco", leap=00, stratum=2, rootdelay=39.900,
@@ -1019,7 +1029,7 @@
1019
1029
  <param pos="0" name="service.vendor" value="Cisco"/>
1020
1030
  </fingerprint>
1021
1031
 
1022
- <fingerprint pattern="^.*system=&quot;Data ONTAP/+(\S+)&quot;.*$" flags="REG_DOT_NEWLINE,REG_ICASE">
1032
+ <fingerprint pattern="system=&quot;Data ONTAP/+(\S+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
1023
1033
  <description>NetApp file servers</description>
1024
1034
  <example>
1025
1035
  system="Data ONTAP/8.1RC2"
@@ -1027,9 +1037,13 @@
1027
1037
  <param pos="0" name="os.vendor" value="NetApp"/>
1028
1038
  <param pos="0" name="os.family" value="Data ONTAP"/>
1029
1039
  <param pos="0" name="os.product" value="Data ONTAP"/>
1030
- <param pos="0" name="os.device" value="File Server"/>
1031
1040
  <param pos="1" name="os.version"/>
1041
+ <param pos="0" name="os.device" value="NAS"/>
1032
1042
  <param pos="0" name="os.cpe23" value="cpe:/o:netapp:data_ontap:{os.version}"/>
1043
+ <param pos="0" name="hw.vendor" value="NetApp"/>
1044
+ <param pos="0" name="hw.device" value="NAS"/>
1045
+ <param pos="0" name="hw.family" value="Data ONTAP"/>
1046
+ <param pos="0" name="hw.product" value="Data ONTAP"/>
1033
1047
  </fingerprint>
1034
1048
 
1035
1049
  <fingerprint pattern="system=&quot;UNIX/HPUX&quot;" flags="REG_ICASE">
@@ -1107,7 +1121,7 @@
1107
1121
  <param pos="1" name="os.product"/>
1108
1122
  </fingerprint>
1109
1123
 
1110
- <fingerprint pattern="^.*processor=&quot;([^&quot;]+)&quot;, system=&quot;SCO_SV([\d\.]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
1124
+ <fingerprint pattern="processor=&quot;([^&quot;]+)&quot;, system=&quot;SCO_SV([\d\.]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
1111
1125
  <description>SCO Unixware NTP - SCO_SV variant</description>
1112
1126
  <example os.version="3.2" os.arch="i386">
1113
1127
  processor="i386", system="SCO_SV3.2", leap=0, stratum=2, precision=-18
@@ -1118,7 +1132,7 @@
1118
1132
  <param pos="2" name="os.version"/>
1119
1133
  </fingerprint>
1120
1134
 
1121
- <fingerprint pattern="^.*version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*\s*processor=&quot;([^ ]+)&quot;,.*system=&quot;SecureOS/([^ ]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
1135
+ <fingerprint pattern="version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,.*\s*processor=&quot;([^ ]+)&quot;,.*system=&quot;SecureOS/([^ ]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
1122
1136
  <description>McAfee Network Firewall Enterprise NTP (SecureOS)</description>
1123
1137
  <example>
1124
1138
  version="ntpd 4.2.0-r Thu Aug 11 12:41:19 CDT 2005 (1)",
@@ -1145,7 +1159,7 @@
1145
1159
  <param pos="3" name="os.version"/>
1146
1160
  </fingerprint>
1147
1161
 
1148
- <fingerprint pattern="^.*processor=&quot;([^ ]+)&quot;.*system=&quot;Linux([^ ]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
1162
+ <fingerprint pattern="processor=&quot;([^ ]+)&quot;.*system=&quot;Linux([^ ]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
1149
1163
  <description>ntpd running on linux</description>
1150
1164
  <example>
1151
1165
  processor="i686", system="Linux2.6.10", leap=0, stratum=2,
@@ -1172,7 +1186,7 @@
1172
1186
  <param pos="0" name="os.cpe23" value="cpe:/o:linux:linux_kernel:{os.version}"/>
1173
1187
  </fingerprint>
1174
1188
 
1175
- <fingerprint pattern=".*version=&quot;ntpd (\S+)[^&quot;]+&quot;,.*\s*processor=&quot;([^ ]+)&quot;.*system=&quot;Isilon OneFS/v([^ ]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
1189
+ <fingerprint pattern="version=&quot;ntpd (\S+)[^&quot;]+&quot;,.*\s*processor=&quot;([^ ]+)&quot;.*system=&quot;Isilon OneFS/v([^ ]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
1176
1190
  <description>Isilon OneFS NTP Server</description>
1177
1191
  <example>
1178
1192
  version="ntpd 4.2.4p4-o Thu Feb 4 20:43:00 UTC 2010 (1)",
@@ -1275,7 +1289,7 @@
1275
1289
  <param pos="0" name="os.arch" value="Alpha"/>
1276
1290
  </fingerprint>
1277
1291
 
1278
- <fingerprint pattern=".*version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,\s*processor=&quot;([^ ]+)&quot;,\s*system=&quot;BIG-IPBIG-IP\s+([^&quot;]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
1292
+ <fingerprint pattern="version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,\s*processor=&quot;([^ ]+)&quot;,\s*system=&quot;BIG-IPBIG-IP\s+([^&quot;]+)&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
1279
1293
  <description>F5 Big-IP Load Balancers NTP</description>
1280
1294
  <example service.version="4.1.1a@1.791" os.arch="i386" os.version="4.5PTF-0">
1281
1295
  version="ntpd 4.1.1a@1.791 Fri Aug 8 04:08:19 PDT 2003 (1)",
@@ -1294,7 +1308,7 @@
1294
1308
  <param pos="3" name="os.version"/>
1295
1309
  </fingerprint>
1296
1310
 
1297
- <fingerprint pattern=".*version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,\s*processor,\s*system=&quot;/&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
1311
+ <fingerprint pattern="version=&quot;ntpd ([^ ]+)[^&quot;]+&quot;,\s*processor,\s*system=&quot;/&quot;" flags="REG_DOT_NEWLINE,REG_ICASE">
1298
1312
  <description>NTP on an unknown system</description>
1299
1313
  <example service.version="4.2.6p2-RC4@1.2180-o">
1300
1314
  version="ntpd 4.2.6p2-RC4@1.2180-o Sun Jun 13 02:56:12 UTC 2010 (2)", processor, system="/"