recog 2.3.0 → 2.3.1

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 (31) hide show
  1. checksums.yaml +4 -4
  2. data/lib/recog/version.rb +1 -1
  3. data/spec/lib/fingerprint_self_test_spec.rb +17 -0
  4. data/xml/apache_os.xml +4 -4
  5. data/xml/ftp_banners.xml +37 -46
  6. data/xml/h323_callresp.xml +1 -1
  7. data/xml/http_cookies.xml +26 -58
  8. data/xml/http_servers.xml +65 -95
  9. data/xml/http_wwwauth.xml +6 -6
  10. data/xml/imap_banners.xml +12 -5
  11. data/xml/ldap_searchresult.xml +2 -2
  12. data/xml/mysql_banners.xml +3 -3
  13. data/xml/mysql_error.xml +0 -1
  14. data/xml/ntp_banners.xml +2 -2
  15. data/xml/operating_system.xml +0 -1
  16. data/xml/pop_banners.xml +5 -6
  17. data/xml/smb_native_os.xml +4 -4
  18. data/xml/smtp_banners.xml +13 -19
  19. data/xml/smtp_debug.xml +5 -13
  20. data/xml/smtp_ehlo.xml +2 -7
  21. data/xml/smtp_expn.xml +12 -24
  22. data/xml/smtp_help.xml +22 -62
  23. data/xml/smtp_noop.xml +5 -9
  24. data/xml/smtp_quit.xml +3 -7
  25. data/xml/smtp_rcptto.xml +3 -7
  26. data/xml/smtp_vrfy.xml +16 -35
  27. data/xml/snmp_sysdescr.xml +258 -278
  28. data/xml/snmp_sysobjid.xml +3 -3
  29. data/xml/ssh_banners.xml +8 -11
  30. data/xml/x509_subjects.xml +14 -17
  31. metadata +3 -3
data/xml/smtp_help.xml CHANGED
@@ -10,38 +10,29 @@
10
10
  of SMTP related fingerprint databases as described in 'smtp_banners.xml'.
11
11
  -->
12
12
  <fingerprint pattern="^214[ -]This is ArGoSoft Mail Server, Version [^ ]+ \(([^ ]+\.[^ ]+\.[^ ]+\.[^ ]+)\) *$">
13
- <description>
14
- ArgoSoft mail server HELP response
15
- Example: 214-This is ArGoSoft Mail Server, Version 1.4 (1.4.0.3)
16
- </description>
13
+ <description>ArgoSoft mail server HELP response with version</description>
14
+ <example service.version="1.4.0.3">214-This is ArGoSoft Mail Server, Version 1.4 (1.4.0.3)</example>
17
15
  <param pos="0" name="service.vendor" value="ArGoSoft"/>
18
16
  <param pos="0" name="service.family" value="Mail Server"/>
19
17
  <param pos="0" name="service.product" value="Mail Server"/>
20
18
  <param pos="1" name="service.version"/>
21
19
  </fingerprint>
22
20
  <fingerprint pattern="^214[ -].*support@argosoft\.com *$">
23
- <description>
24
- ArgoSoft mail server HELP response
25
- Example: 214-To report bug, send mail to support@argosoft.com
26
- </description>
21
+ <description>ArgoSoft mail server HELP response</description>
22
+ <example>214-To report bug, send mail to support@argosoft.com</example>
27
23
  <param pos="0" name="service.vendor" value="ArGoSoft"/>
28
24
  <param pos="0" name="service.family" value="Mail Server"/>
29
25
  <param pos="0" name="service.product" value="Mail Server"/>
30
26
  </fingerprint>
31
27
  <fingerprint pattern="^500[ -]Syntax error, command &quot;XXXX&quot; unrecognized$">
32
- <description>
33
- Cisco PIX changes the command letters to 'X' before passing
34
- them to the real SMTP server.
35
- </description>
28
+ <description>Cisco PIX - changes the command letters to 'X' before passing them to the real SMTP server</description>
36
29
  <param pos="0" name="os.vendor" value="Cisco"/>
37
30
  <param pos="0" name="os.family" value="PIX"/>
38
31
  <param pos="0" name="os.product" value="PIX"/>
39
32
  <param pos="0" name="os.cpe23" value="cpe:/o:cisco:pix_firewall_software:-"/>
40
33
  </fingerprint>
41
34
  <fingerprint pattern="^500[ -]5.5.1 unrecognised command HELP$">
42
- <description>
43
- Eudora IMS uses the British spelling "unrecognised"
44
- </description>
35
+ <description>Eudora IMS uses the British spelling "unrecognised"</description>
45
36
  <param pos="0" name="service.vendor" value="Eudora"/>
46
37
  <param pos="0" name="service.family" value="Internet Mail Server"/>
47
38
  <param pos="0" name="service.product" value="Internet Mail Server"/>
@@ -62,9 +53,7 @@
62
53
  in smtp_ehlo.xml ? -mrb
63
54
  -->
64
55
  <fingerprint pattern="^214[ -].* XEXCH50 *.*$">
65
- <description>
66
- Microsoft Exchange/IIS server
67
- </description>
56
+ <description>Microsoft Exchange/IIS server</description>
68
57
  <param pos="0" name="service.vendor" value="Microsoft"/>
69
58
  <param pos="0" name="service.family" value="Exchange Server"/>
70
59
  <param pos="0" name="service.product" value="Exchange Server"/>
@@ -75,9 +64,7 @@
75
64
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
76
65
  </fingerprint>
77
66
  <fingerprint pattern="^214[ -]Help system currently inactive\.$">
78
- <description>
79
- 214 Help system currently inactive.
80
- </description>
67
+ <description>Alt-N MDaemon - 214 Help system currently inactive.</description>
81
68
  <param pos="0" name="service.vendor" value="Alt-N"/>
82
69
  <param pos="0" name="service.family" value="MDaemon"/>
83
70
  <param pos="0" name="service.product" value="MDaemon"/>
@@ -89,51 +76,40 @@
89
76
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
90
77
  </fingerprint>
91
78
  <fingerprint pattern="^214[ -].*This is MERAK ([^ ]+\.[^ ]+\.[^ ]+).*$">
92
- <description>
93
- Merak mail server http://www.icewarp.com/merakmail/ (runs on 2000/NT/9x)
94
- </description>
79
+ <description> Merak mail server - http://www.icewarp.com/merakmail/ (runs on 2000/NT/9x)</description>
95
80
  <param pos="0" name="service.vendor" value="Merak"/>
96
81
  <param pos="0" name="service.family" value="Mail Server"/>
97
82
  <param pos="0" name="service.product" value="Mail Server"/>
98
83
  <param pos="1" name="service.version"/>
99
84
  </fingerprint>
100
85
  <fingerprint pattern="^214[ -].*This is Merak ([^ ]+\.[^ ]+\.[^ ]+).*$">
101
- <description>
102
- Merak mail server http://www.icewarp.com/merakmail/ (runs on 2000/NT/9x)
103
- </description>
86
+ <description>Merak mail server - http://www.icewarp.com/merakmail/ (runs on 2000/NT/9x) - variant 1</description>
104
87
  <param pos="0" name="service.vendor" value="Merak"/>
105
88
  <param pos="0" name="service.family" value="Mail Server"/>
106
89
  <param pos="0" name="service.product" value="Mail Server"/>
107
90
  <param pos="1" name="service.version"/>
108
91
  </fingerprint>
109
92
  <fingerprint pattern="^214[ -].*bugs@merakmail\.com.*$">
110
- <description>
111
- Merak mail server http://www.icewarp.com/merakmail/ (runs on 2000/NT/9x)
112
- </description>
93
+ <description>Merak mail server - http://www.icewarp.com/merakmail/ (runs on 2000/NT/9x) - email variant</description>
113
94
  <param pos="0" name="service.vendor" value="Merak"/>
114
95
  <param pos="0" name="service.family" value="Mail Server"/>
115
96
  <param pos="0" name="service.product" value="Mail Server"/>
116
97
  </fingerprint>
117
98
  <fingerprint pattern="^214[ -].*bugs@icewarp\.com.*$">
118
- <description>
119
- Merak mail server http://www.icewarp.com/merakmail/ (runs on 2000/NT/9x)
120
- </description>
99
+ <description>Merak mail server - http://www.icewarp.com/merakmail/ (runs on 2000/NT/9x) - icewarp variant </description>
121
100
  <param pos="0" name="service.vendor" value="Merak"/>
122
101
  <param pos="0" name="service.family" value="Mail Server"/>
123
102
  <param pos="0" name="service.product" value="Mail Server"/>
124
103
  </fingerprint>
125
104
  <fingerprint pattern="^214[ -]qmail home page: http://pobox.com/~djb/qmail.html *$">
126
- <description>
127
- example: 214 qmail home page: http://pobox.com/~djb/qmail.html
128
- </description>
105
+ <description>QMail - help variant</description>
106
+ <example>214 qmail home page: http://pobox.com/~djb/qmail.html</example>
129
107
  <param pos="0" name="service.vendor" value="qmail"/>
130
108
  <param pos="0" name="service.family" value="qmail"/>
131
109
  <param pos="0" name="service.product" value="qmail"/>
132
110
  </fingerprint>
133
111
  <fingerprint pattern="^214[ -].*contact the Digital Customer Support Center at 1-800-354-9000.*$">
134
- <description>
135
- sendmail on Digital OSF UNIX
136
- </description>
112
+ <description>Sendmail on Digital OSF UNIX</description>
137
113
  <param pos="0" name="service.family" value="Sendmail"/>
138
114
  <param pos="0" name="service.product" value="Sendmail"/>
139
115
  <param pos="0" name="service.certainty" value="0.85"/>
@@ -142,54 +118,38 @@
142
118
  <param pos="0" name="os.product" value="OSF/1"/>
143
119
  </fingerprint>
144
120
  <fingerprint pattern="^214[ -]2.0.0 This is [s|S]endmail version ([^ ]+)$">
145
- <description>
146
- sendmail often returns version information for HELP, even when the
147
- greeting is obscured
148
- </description>
121
+ <description>Sendmail often returns version information for HELP, even when the greeting is obscured</description>
149
122
  <param pos="0" name="service.family" value="Sendmail"/>
150
123
  <param pos="0" name="service.product" value="Sendmail"/>
151
124
  <param pos="1" name="service.version"/>
152
125
  </fingerprint>
153
126
  <fingerprint pattern="^214[ -]This is [s|S]endmail version ([^ ]+)$">
154
- <description>
155
- sendmail often returns version information for HELP, even when the
156
- greeting is obscured
157
- </description>
127
+ <description>Sendmail often returns version information for HELP - variant 1</description>
158
128
  <param pos="0" name="service.family" value="Sendmail"/>
159
129
  <param pos="0" name="service.product" value="Sendmail"/>
160
130
  <param pos="1" name="service.version"/>
161
131
  </fingerprint>
162
132
  <fingerprint pattern="^502[ -]5\.3\.0 Sendmail ([^ ]+) -- HELP not implemented$">
163
- <description>
164
- 502 5.3.0 Sendmail 8.11.2 -- HELP not implemented
165
- </description>
133
+ <description>Sendmail - help not implemented variant</description>
134
+ <example>502 5.3.0 Sendmail 8.11.2 -- HELP not implemented</example>
166
135
  <param pos="0" name="service.family" value="Sendmail"/>
167
136
  <param pos="0" name="service.product" value="Sendmail"/>
168
137
  <param pos="1" name="service.version"/>
169
138
  </fingerprint>
170
139
  <fingerprint pattern="^214[ -].*sendmail-bugs@sendmail\.org.*$">
171
- <description>
172
- sendmail often returns version information for HELP, even when the
173
- greeting is obscured
174
- </description>
140
+ <description>Sendmail often returns version information for HELP - email variant</description>
175
141
  <param pos="0" name="service.family" value="Sendmail"/>
176
142
  <param pos="0" name="service.product" value="Sendmail"/>
177
143
  <param pos="0" name="service.certainty" value="0.85"/>
178
144
  </fingerprint>
179
145
  <fingerprint pattern="^241[ -].*$">
180
- <description>
181
- ZMailer versions earlier than 2.99.21 mistakenly return the status
182
- code 241 on some HELP response lines (instead of 214).
183
- </description>
146
+ <description>ZMailer versions earlier than 2.99.21 mistakenly return the status code 241 on some HELP response lines (instead of 214).</description>
184
147
  <param pos="0" name="service.vendor" value="ZMailer"/>
185
148
  <param pos="0" name="service.family" value="ZMailer"/>
186
149
  <param pos="0" name="service.product" value="ZMailer"/>
187
150
  </fingerprint>
188
151
  <fingerprint pattern="^214[ -].*Yoyodyne Propulsion.*$">
189
- <description>
190
- ZMailer has distinctive default HELP text in smtpserver.conf.
191
- See http://www.zmailer.org/zman/zadm-smtpserver.html#ZADM-SMTPSERVER-CONF
192
- </description>
152
+ <description>ZMailer has distinctive default HELP text in smtpserver.conf</description>
193
153
  <param pos="0" name="service.vendor" value="ZMailer"/>
194
154
  <param pos="0" name="service.family" value="ZMailer"/>
195
155
  <param pos="0" name="service.product" value="ZMailer"/>
data/xml/smtp_noop.xml CHANGED
@@ -11,18 +11,15 @@
11
11
 
12
12
  -->
13
13
  <fingerprint pattern="^220 OK.*$">
14
- <description>
15
- CheckPoint FireWall-1 returns code 220 for NOOP command (instead of 250)
16
- </description>
14
+ <description>CheckPoint FireWall-1 returns code 220 for NOOP command (instead of 250)</description>
17
15
  <param pos="0" name="service.vendor" value="Check Point"/>
18
16
  <param pos="0" name="service.family" value="Check Point"/>
19
17
  <param pos="0" name="service.product" value="Firewall-1"/>
20
18
  <param pos="0" name="service.cpe23" value="cpe:/a:checkpoint:firewall-1:-"/>
21
19
  </fingerprint>
22
20
  <fingerprint pattern="^250[ -]2.0.0 doing nothing$">
23
- <description>
24
- Example: 250 2.0.0 doing nothing
25
- </description>
21
+ <description>Eudora IMS - noop variant</description>
22
+ <example>250 2.0.0 doing nothing</example>
26
23
  <param pos="0" name="service.vendor" value="Eudora"/>
27
24
  <param pos="0" name="service.family" value="Internet Mail Server"/>
28
25
  <param pos="0" name="service.product" value="Internet Mail Server"/>
@@ -32,9 +29,8 @@
32
29
  <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os:-"/>
33
30
  </fingerprint>
34
31
  <fingerprint pattern="^250[ -]Why is there an NOOP instruction\?$">
35
- <description>
36
- 250 Why is there an NOOP instruction?
37
- </description>
32
+ <description>Alt-N MDaemon - noop variant</description>
33
+ <example>250 Why is there an NOOP instruction?</example>
38
34
  <param pos="0" name="service.vendor" value="Alt-N"/>
39
35
  <param pos="0" name="service.family" value="MDaemon"/>
40
36
  <param pos="0" name="service.product" value="MDaemon"/>
data/xml/smtp_quit.xml CHANGED
@@ -10,9 +10,7 @@
10
10
  of SMTP related fingerprint databases as described in 'smtp_banners.xml'.
11
11
  -->
12
12
  <fingerprint pattern="^221[ -]See ya in cyberspace$">
13
- <description>
14
- 221 See ya in cyberspace
15
- </description>
13
+ <description>221 See ya in cyberspace</description>
16
14
  <param pos="0" name="service.vendor" value="Alt-N"/>
17
15
  <param pos="0" name="service.family" value="MDaemon"/>
18
16
  <param pos="0" name="service.product" value="MDaemon"/>
@@ -24,10 +22,8 @@
24
22
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
25
23
  </fingerprint>
26
24
  <fingerprint pattern="^503[ -]5\.5\.0 Not accepting any command except QUIT$">
27
- <description>
28
- Raptor Firewall
29
- example: 503 5.5.0 Not accepting any command except QUIT
30
- </description>
25
+ <description>Raptor Firewall</description>
26
+ <example>503 5.5.0 Not accepting any command except QUIT</example>
31
27
  <param pos="0" name="service.product" value="raptor"/>
32
28
  </fingerprint>
33
29
  </fingerprints>
data/xml/smtp_rcptto.xml CHANGED
@@ -2,25 +2,21 @@
2
2
  <fingerprints protocol="smtp" database_type="service">
3
3
  <!--
4
4
  <fingerprint pattern="501[ -]Invalid domain *">
5
- <description>
6
- </description>
5
+ <description> Description here</description>
7
6
  <param pos="0" name="service.vendor" value="Global Technology Associates"/>
8
7
  <param pos="0" name="service.family" value="GNAT Box"/>
9
8
  <param pos="0" name="service.product" value="GNAT Box"/>
10
9
  </fingerprint>
11
10
 
12
11
  <fingerprint pattern="550[ -]System error\. *">
13
- <description>
14
- </description>
12
+ <description>and here</description>
15
13
  <param pos="0" name="service.vendor" value="Global Technology Associates"/>
16
14
  <param pos="0" name="service.family" value="GNAT Box"/>
17
15
  <param pos="0" name="service.product" value="GNAT Box"/>
18
16
  </fingerprint>
19
17
  -->
20
18
  <fingerprint pattern="550[ -]not local host .*, not a gateway *">
21
- <description>
22
- 550 not local host foo.bar, not a gateway
23
- </description>
19
+ <description>550 not local host foo.bar, not a gateway</description>
24
20
  <param pos="0" name="service.vendor" value="Ipswitch"/>
25
21
  <param pos="0" name="service.family" value="IMail Server"/>
26
22
  <param pos="0" name="service.product" value="IMail Server"/>
data/xml/smtp_vrfy.xml CHANGED
@@ -10,10 +10,7 @@
10
10
  of SMTP related fingerprint databases as described in 'smtp_banners.xml'.
11
11
  -->
12
12
  <fingerprint pattern="^500[ -]Syntax error, command &quot;XXXX.*&quot; unrecognized$">
13
- <description>
14
- Cisco PIX changes the command letters to 'X' before passing
15
- them to the real SMTP server.
16
- </description>
13
+ <description>Cisco PIX - changes the command letters to 'X' before passing them to the real SMTP server</description>
17
14
  <param pos="0" name="os.vendor" value="Cisco"/>
18
15
  <param pos="0" name="os.family" value="PIX"/>
19
16
  <param pos="0" name="os.product" value="PIX"/>
@@ -21,49 +18,40 @@
21
18
  </fingerprint>
22
19
  <!-- XXX: Why is EXPN mentionned here ? Is this a mistake ? -->
23
20
  <fingerprint pattern="^550[ -]EXPN not available *$">
24
- <description>
25
- Exim
26
- example: 550 EXPN not available
27
- </description>
21
+ <description>Exim - expn not available variant</description>
22
+ <example>550 EXPN not available</example>
28
23
  <param pos="0" name="service.vendor" value="exim"/>
29
24
  <param pos="0" name="service.family" value="exim"/>
30
25
  <param pos="0" name="service.product" value="exim"/>
31
26
  <param pos="0" name="service.cpe23" value="cpe:/a:exim:exim:-"/>
32
27
  </fingerprint>
33
28
  <fingerprint pattern="^252[ -]VRFY not available *$">
34
- <description>
35
- Exim
36
- example: 252 VRFY not available
37
- </description>
29
+ <description>Exim - vrfy not available variant</description>
30
+ <example>252 VRFY not available</example>
38
31
  <param pos="0" name="service.vendor" value="exim"/>
39
32
  <param pos="0" name="service.family" value="exim"/>
40
33
  <param pos="0" name="service.product" value="exim"/>
41
34
  <param pos="0" name="service.cpe23" value="cpe:/a:exim:exim:-"/>
42
35
  </fingerprint>
43
36
  <fingerprint pattern="^250[ -]&lt;.+&gt; is deliverable *$">
44
- <description>
45
- Exim
46
- example: 250 &lt;root&gt; is deliverable
47
- </description>
37
+ <description>Exim - vrfy variant</description>
38
+ <example>250 &lt;root&gt; is deliverable</example>
48
39
  <param pos="0" name="service.vendor" value="exim"/>
49
40
  <param pos="0" name="service.family" value="exim"/>
50
41
  <param pos="0" name="service.product" value="exim"/>
51
42
  <param pos="0" name="service.cpe23" value="cpe:/a:exim:exim:-"/>
52
43
  </fingerprint>
53
44
  <fingerprint pattern="^550[ -]&lt;.+&gt; is not deliverable *$">
54
- <description>
55
- Exim
56
- example: 250 &lt;root&gt; is not deliverable
57
- </description>
45
+ <description>Exim - not deliverable variant</description>
46
+ <example>550 &lt;root&gt; is not deliverable</example>
58
47
  <param pos="0" name="service.vendor" value="exim"/>
59
48
  <param pos="0" name="service.family" value="exim"/>
60
49
  <param pos="0" name="service.product" value="exim"/>
61
50
  <param pos="0" name="service.cpe23" value="cpe:/a:exim:exim:-"/>
62
51
  </fingerprint>
63
52
  <fingerprint pattern="^502[ -]command is not active$">
64
- <description>
65
- 502 command is not active
66
- </description>
53
+ <description>Alt-N MDaemon - vrfy variant</description>
54
+ <example>502 command is not active</example>
67
55
  <param pos="0" name="service.vendor" value="Alt-N"/>
68
56
  <param pos="0" name="service.family" value="MDaemon"/>
69
57
  <param pos="0" name="service.product" value="MDaemon"/>
@@ -75,32 +63,25 @@
75
63
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
76
64
  </fingerprint>
77
65
  <fingerprint pattern="^557[ -]5\.5\.2 String does not match anything\. *$">
78
- <description>
79
- I've seen this on NTMail 4.30.0012, NTMail 5.06.0016
80
- </description>
66
+ <description>Gordano NTMail - seen this on NTMail 4.30.0012, NTMail 5.06.0016</description>
81
67
  <param pos="0" name="service.vendor" value="Gordano"/>
82
68
  <param pos="0" name="service.family" value="NTMail"/>
83
69
  <param pos="0" name="service.product" value="NTMail"/>
84
70
  </fingerprint>
85
71
  <fingerprint pattern="^252[ -](?:2\.5\.2)? Cannot VRFY user; try RCPT to attempt delivery \(or try finger\) *$">
86
- <description>
87
- sendmail
88
- </description>
72
+ <description>Sendmail - vrfy variant</description>
89
73
  <param pos="0" name="service.family" value="Sendmail"/>
90
74
  <param pos="0" name="service.product" value="Sendmail"/>
91
75
  <param pos="0" name="service.certainty" value="0.85"/>
92
76
  </fingerprint>
93
77
  <fingerprint pattern="^504 .*: Recipient address rejected: need fully-qualified address$">
94
- <description>
95
- example: 504 &lt;foo&gt;: Recipient address rejected: need fully-qualified address
96
- </description>
78
+ <description>Symantec Mail Security</description>
79
+ <example>504 &lt;foo&gt;: Recipient address rejected: need fully-qualified address</example>
97
80
  <param pos="0" name="service.vendor" value="Symantec"/>
98
81
  <param pos="0" name="service.product" value="Symantec Mail Security for SMTP"/>
99
82
  </fingerprint>
100
83
  <fingerprint pattern="^252 Unable to VRFY &quot;.*&quot;, but will accept message and attempt delivery *$">
101
- <description>
102
- Lotus Domino
103
- </description>
84
+ <description>Lotus Domino - vrfy variant</description>
104
85
  <param pos="0" name="service.vendor" value="Lotus"/>
105
86
  <param pos="0" name="service.family" value="Lotus Domino"/>
106
87
  <param pos="0" name="service.product" value="Lotus Domino"/>
data/xml/snmp_sysdescr.xml CHANGED
@@ -18,15 +18,15 @@
18
18
  <param pos="1" name="os.product"/>
19
19
  </fingerprint>
20
20
  <fingerprint pattern="^3Com (\S+) Network Jack$">
21
- <description>3Com Intellijack switch</description>
22
- <example>3Com NJ200 Network Jack</example>
21
+ <description>3Com Network Jack switch</description>
22
+ <example os.product="NJ200">3Com NJ200 Network Jack</example>
23
23
  <param pos="0" name="os.vendor" value="3Com"/>
24
24
  <param pos="0" name="os.family" value="IntelliJack"/>
25
25
  <param pos="0" name="os.device" value="Switch"/>
26
26
  <param pos="1" name="os.product"/>
27
27
  </fingerprint>
28
28
  <fingerprint pattern="^3Com-(\S+) - 3CNJ2000 v(\S+)$">
29
- <description>3Com Intellijack switch</description>
29
+ <description>3Com Intellijack switch - variant 1</description>
30
30
  <example>3Com-NJ2000 - 3CNJ2000 v2.00.03</example>
31
31
  <example>3Com-NJ2000 - 3CNJ2000 v2.00.04</example>
32
32
  <param pos="0" name="os.vendor" value="3Com"/>
@@ -36,7 +36,7 @@
36
36
  <param pos="2" name="os.version"/>
37
37
  </fingerprint>
38
38
  <fingerprint pattern="^3COM: (AP\S+): .*11.*Access Point, Software v(\S+), Bootrom v\S+, Hardware \S+$">
39
- <description>3COM WAP</description>
39
+ <description>3COM WAP - software and build variant</description>
40
40
  <example os.product="AP8760" os.version="2.1.13b05_sh">3COM: AP8760: Dual Radio 11a/b/g Access Point, Software v2.1.13b05_sh, Bootrom v1.2.1, Hardware R02</example>
41
41
  <param pos="0" name="os.vendor" value="3Com"/>
42
42
  <param pos="0" name="os.family" value="Access Point"/>
@@ -45,7 +45,7 @@
45
45
  <param pos="2" name="os.version"/>
46
46
  </fingerprint>
47
47
  <fingerprint pattern="^3COM OfficeConnect Cable Modem.*software version:(\S+)$">
48
- <description>3COM Cable Modem</description>
48
+ <description>3COM OfficeConnect Cable Modem</description>
49
49
  <example>3COM OfficeConnect Cable Modem3.1.0L,hardware version:B.2,software version:3.1.0L</example>
50
50
  <example>3COM OfficeConnect Cable Modem3.2.1,hardware version:B.2,software version:3.2.1</example>
51
51
  <param pos="0" name="os.vendor" value="3Com"/>
@@ -74,7 +74,7 @@
74
74
  <param pos="2" name="os.version"/>
75
75
  </fingerprint>
76
76
  <fingerprint pattern="(?i)^3Com MCNS external (\S+(?: \S+)?) Cable Modem,.*SW_VER:\s*(.*)$">
77
- <description>3COM Cable Modem</description>
77
+ <description>3COM Cable Modem - MCNS variant</description>
78
78
  <example>3Com MCNS external 2-way Cable Modem, HW_REV: 2.00 ,SW_VER: 01.03</example>
79
79
  <example>3Com MCNS external 2-way Cable Modem, HW_REV: A01.3 ,SW_VER: 12.30</example>
80
80
  <example>3Com MCNS external 2-way Cable Modem, HW_REV: A01.3 ,SW_VER: 2.09</example>
@@ -88,7 +88,7 @@
88
88
  <param pos="2" name="os.version"/>
89
89
  </fingerprint>
90
90
  <fingerprint pattern="^3Com OfficeConnect (Remote ADSL \S+) V([^,]+),.*$">
91
- <description>3COM Cable Modem</description>
91
+ <description>3COM Cable Modem - build date variant</description>
92
92
  <example>3Com OfficeConnect Remote ADSL 812 V1.0.5, Built on Mar 16 2000 at 17:27:24.</example>
93
93
  <param pos="0" name="os.vendor" value="3Com"/>
94
94
  <param pos="0" name="os.family" value="OfficeConnect"/>
@@ -115,7 +115,7 @@
115
115
  <param pos="1" name="os.product"/>
116
116
  </fingerprint>
117
117
  <fingerprint pattern="^3Com Router Software V([^,]+), SNMP agent for (Router \S+) with.*$">
118
- <description>3COM Router</description>
118
+ <description>3COM Router - processor variant</description>
119
119
  <example>3Com Router Software V1.10, SNMP agent for Router 3012 with 1 MPC 860 Processor, Copyright (c) Reserved.</example>
120
120
  <example>3Com Router Software V1.10, SNMP agent for Router 5009 with 1 MPC 8241 Processor, Copyright (c) Reserved.</example>
121
121
  <example>3Com Router Software V1.10, SNMP agent for Router 5231 with 1 MPC 8240 Processor, Copyright (c) Reserved.</example>
@@ -152,7 +152,7 @@
152
152
  <param pos="2" name="os.version"/>
153
153
  </fingerprint>
154
154
  <fingerprint pattern="^3COM (Superstack II Switch \S+)">
155
- <description>3COM SuperStack II</description>
155
+ <description>3COM SuperStack II - product only variant</description>
156
156
  <example>3COM Superstack II Switch 3800</example>
157
157
  <param pos="0" name="os.vendor" value="3Com"/>
158
158
  <param pos="0" name="os.family" value="Switch"/>
@@ -170,18 +170,8 @@
170
170
  <param pos="0" name="os.device" value="VoIP"/>
171
171
  <param pos="1" name="os.product"/>
172
172
  </fingerprint>
173
- <fingerprint pattern="^3Com (?:11 Mbps|11a/b/g) (Wireless .*)$">
174
- <description>3COM WAP</description>
175
- <example os.product="Wireless Building to Building Bridge">3Com 11 Mbps Wireless Building to Building Bridge</example>
176
- <example os.product="Wireless LAN Access Point 2000">3Com 11 Mbps Wireless LAN Access Point 2000</example>
177
- <example os.product="Wireless LAN Access Point 8000">3Com 11 Mbps Wireless LAN Access Point 8000</example>
178
- <example os.product="Wireless Workgroup Bridge">3Com 11a/b/g Wireless Workgroup Bridge</example>
179
- <param pos="0" name="os.vendor" value="3Com"/>
180
- <param pos="0" name="os.device" value="WAP"/>
181
- <param pos="1" name="os.product"/>
182
- </fingerprint>
183
173
  <fingerprint pattern="^3Com 3Com (?:SuperStack 4 )?Switch (\S+).*Software Version 3Com OS V(\S+)$">
184
- <description>3COM Switch</description>
174
+ <description>3COM SuperStack 4 Switch</description>
185
175
  <example>3Com 3Com SuperStack 4 Switch 5500G-EI 24-Port Software Version 3Com OS V3.02.04s168</example>
186
176
  <example>3Com 3Com SuperStack 4 Switch 5500G-EI 24-Port Software Version 3Com OS V3.02.04s56</example>
187
177
  <example>3Com 3Com SuperStack 4 Switch 5500G-EI SFP 24-Port Software Version 3Com OS V3.02.04s56</example>
@@ -195,7 +185,7 @@
195
185
  <param pos="2" name="os.version"/>
196
186
  </fingerprint>
197
187
  <fingerprint pattern="^3Com Baseline Switch (\S+ \S+)$">
198
- <description>3COM Switch</description>
188
+ <description>3COM Baseline Switch</description>
199
189
  <example>3Com Baseline Switch 2226-SFP Plus</example>
200
190
  <example>3Com Baseline Switch 2426-PWR Plus</example>
201
191
  <example>3Com Baseline Switch 2916-SFP Plus</example>
@@ -208,7 +198,7 @@
208
198
  <param pos="1" name="os.product"/>
209
199
  </fingerprint>
210
200
  <fingerprint pattern="(?i)^3Com Baseline Switch (\S+ Plus).* Software Version (\d+\.\S+ release \S+).*$">
211
- <description>3COM Switch</description>
201
+ <description>3COM Baseline Switch with software version</description>
212
202
  <example>3Com Baseline Switch 2920-SFP Plus Software Version 5.20 RELEASE 1101 Copyright (c) 2004-2009 3Com Corporation. All rights reserved.</example>
213
203
  <example>3Com Baseline Switch 2920-SFP Plus Software Version 5.20 Release 1101P02 Copyright (c) 2004-2009 3Com Corporation. All rights reserved.</example>
214
204
  <example>3Com Baseline Switch 2928-HPWR Plus Software Version 5.20 Release 1101P02 Copyright (c) 2004-2009 3Com Corporation. All rights reserved.</example>
@@ -223,7 +213,7 @@
223
213
  <param pos="2" name="os.version"/>
224
214
  </fingerprint>
225
215
  <fingerprint pattern="^3Com (CoreBuilder\-\S+).*s/w rev:\s*(\S+)$">
226
- <description>3COM Switch</description>
216
+ <description>3COM CoreBuilder Switch</description>
227
217
  <example>3Com CoreBuilder-9000 Enterprise Management Engine (3CB9EME) s/w rev: 3.0.0</example>
228
218
  <example>3Com CoreBuilder-9000 Enterprise Management Engine (3CB9EME) s/w rev: 3.0.5</example>
229
219
  <param pos="0" name="os.vendor" value="3Com"/>
@@ -232,17 +222,29 @@
232
222
  <param pos="1" name="os.product"/>
233
223
  <param pos="2" name="os.version"/>
234
224
  </fingerprint>
235
- <fingerprint pattern="^3Com Corporation (HiPer Access Router Card).*$">
236
- <description>3COM Router</description>
225
+ <fingerprint pattern="^3Com Corporation HiPer Access Router Card.*$">
226
+ <description>3COM HiPer Access Router Card</description>
237
227
  <example>3Com Corporation HiPer Access Router Card Built on Apr 19 2000 at 12:33:01.</example>
238
- <example>3Com Corporation HiPer Access Router Card Built on Apr 25 2000 at 11:21:56.</example>
239
228
  <param pos="0" name="os.vendor" value="3Com"/>
240
229
  <param pos="0" name="os.family" value="Router"/>
241
230
  <param pos="0" name="os.device" value="Router"/>
231
+ <param pos="0" name="hw.vendor" value="3Com"/>
232
+ <param pos="0" name="hw.family" value="Router"/>
233
+ <param pos="0" name="hw.device" value="Router"/>
234
+ <param pos="0" name="hw.product" value="HiPer Access Router Card"/>
235
+ </fingerprint>
236
+ <fingerprint pattern="^3Com (?:11 Mbps|11a/b/g) (Wireless .*)$">
237
+ <description>3COM WAP</description>
238
+ <example os.product="Wireless Building to Building Bridge">3Com 11 Mbps Wireless Building to Building Bridge</example>
239
+ <example os.product="Wireless LAN Access Point 2000">3Com 11 Mbps Wireless LAN Access Point 2000</example>
240
+ <example os.product="Wireless LAN Access Point 8000">3Com 11 Mbps Wireless LAN Access Point 8000</example>
241
+ <example os.product="Wireless Workgroup Bridge">3Com 11a/b/g Wireless Workgroup Bridge</example>
242
+ <param pos="0" name="os.vendor" value="3Com"/>
243
+ <param pos="0" name="os.device" value="WAP"/>
242
244
  <param pos="1" name="os.product"/>
243
245
  </fingerprint>
244
246
  <fingerprint pattern="^3Com (Wireless.*Firewall Router)$">
245
- <description>3COM WAP</description>
247
+ <description>3COM WAP - firewall variant</description>
246
248
  <example>3Com Wireless 108Mbps 11g ADSL Firewall Router</example>
247
249
  <example>3Com Wireless 11g ADSL Firewall Router</example>
248
250
  <example>3Com Wireless 11n ADSL Firewall Router</example>
@@ -251,29 +253,32 @@
251
253
  <param pos="0" name="os.device" value="Router"/>
252
254
  <param pos="1" name="os.product"/>
253
255
  </fingerprint>
254
- <fingerprint pattern="^3Com (Enterprise AP):\s*v(\S+) .*$">
255
- <description>3COM WAP</description>
256
- <example>3Com Enterprise AP: v3.1.00 v3.0.8</example>
256
+ <fingerprint pattern="^3Com Enterprise AP:\s*v(\S+) .*$">
257
+ <description>3COM Enterprise AP</description>
258
+ <example os.version="3.1.00">3Com Enterprise AP: v3.1.00 v3.0.8</example>
257
259
  <example>3Com Enterprise AP: v3.2.0 v3.0.8</example>
258
- <example>3Com Enterprise AP: v3.3.1 v3.0.8</example>
259
260
  <param pos="0" name="os.vendor" value="3Com"/>
260
261
  <param pos="0" name="os.device" value="WAP"/>
261
- <param pos="1" name="os.product"/>
262
- <param pos="2" name="os.version"/>
262
+ <param pos="0" name="os.product" value="Enterprise AP"/>
263
+ <param pos="1" name="os.version"/>
263
264
  </fingerprint>
264
265
  <fingerprint pattern="^3Com (OfficeConnect Managed .*)$">
265
- <description>3COM Switch</description>
266
- <example>3Com OfficeConnect Managed Gb PoE</example>
267
- <example>3Com OfficeConnect Managed Switch 9</example>
268
- <example>3Com OfficeConnect Managed Switch 9 FX</example>
266
+ <description>3COM OfficeConnect Managed Switch</description>
267
+ <example hw.product="OfficeConnect Managed Gb PoE">3Com OfficeConnect Managed Gb PoE</example>
268
+ <example hw.product="OfficeConnect Managed Switch 9">3Com OfficeConnect Managed Switch 9</example>
269
+ <example hw.product="OfficeConnect Managed Switch 9 FX">3Com OfficeConnect Managed Switch 9 FX</example>
269
270
  <param pos="0" name="os.vendor" value="3Com"/>
270
271
  <param pos="0" name="os.family" value="Switch"/>
271
272
  <param pos="0" name="os.device" value="Switch"/>
272
273
  <param pos="1" name="os.product"/>
274
+ <param pos="0" name="hw.vendor" value="3Com"/>
275
+ <param pos="0" name="hw.family" value="Switch"/>
276
+ <param pos="0" name="hw.device" value="Switch"/>
277
+ <param pos="1" name="hw.product"/>
273
278
  </fingerprint>
274
279
  <fingerprint pattern="^3Com Router .* Software Release ([^,]+), .*$">
275
- <description>3COM Router</description>
276
- <example>3Com Router OSR6740 Software Release 1910P02, Standard (build V300R003B04D015SP01)</example>
280
+ <description>3COM Router - release variant</description>
281
+ <example os.version="1910P02">3Com Router OSR6740 Software Release 1910P02, Standard (build V300R003B04D015SP01)</example>
277
282
  <param pos="0" name="os.vendor" value="3Com"/>
278
283
  <param pos="0" name="os.device" value="Router"/>
279
284
  <param pos="0" name="os.product" value="Router"/>
@@ -281,7 +286,7 @@
281
286
  </fingerprint>
282
287
  <fingerprint pattern="^3Com (Router \S+) Software (\S+).*$">
283
288
  <description>3COM Router</description>
284
- <example>3Com Router 3012 Software Extended_V1.30</example>
289
+ <example hw.product="Router 3012" os.version="Extended_V1.30">3Com Router 3012 Software Extended_V1.30</example>
285
290
  <example>3Com Router 3013 Software V1.40.19</example>
286
291
  <example>3Com Router 3016 Software Extended_V1.20</example>
287
292
  <example>3Com Router 3016 Software V1.40.19</example>
@@ -305,9 +310,12 @@
305
310
  <param pos="0" name="os.device" value="Router"/>
306
311
  <param pos="1" name="os.product"/>
307
312
  <param pos="2" name="os.version"/>
313
+ <param pos="0" name="hw.vendor" value="3Com"/>
314
+ <param pos="0" name="hw.device" value="Router"/>
315
+ <param pos="1" name="hw.product"/>
308
316
  </fingerprint>
309
317
  <fingerprint pattern="^3Com (S\S+)$">
310
- <description>3COM Switch</description>
318
+ <description>3COM Switch - bare</description>
311
319
  <example>3Com S7902E</example>
312
320
  <example>3Com S7906E</example>
313
321
  <example>3Com S7910E</example>
@@ -315,29 +323,38 @@
315
323
  <param pos="0" name="os.device" value="Switch"/>
316
324
  <param pos="1" name="os.product"/>
317
325
  </fingerprint>
318
- <fingerprint pattern="^3Com (SuperStack 3)$">
319
- <description>3COM Switch</description>
326
+ <fingerprint pattern="^3Com SuperStack 3$">
327
+ <description>3Com SuperStack 3</description>
320
328
  <example>3Com SuperStack 3</example>
321
329
  <param pos="0" name="os.vendor" value="3Com"/>
322
330
  <param pos="0" name="os.device" value="Switch"/>
323
- <param pos="1" name="os.product"/>
331
+ <param pos="0" name="os.product" value="SuperStack 3"/>
332
+ <param pos="0" name="hw.vendor" value="3Com"/>
333
+ <param pos="0" name="hw.device" value="Switch"/>
334
+ <param pos="0" name="hw.product" value="SuperStack 3"/>
324
335
  </fingerprint>
325
- <fingerprint pattern="^3Com (SuperStack II)$">
326
- <description>3COM Switch</description>
336
+ <fingerprint pattern="^3Com SuperStack II$">
337
+ <description>3COM SuperStack II - no version variant</description>
327
338
  <example>3Com SuperStack II</example>
328
339
  <param pos="0" name="os.vendor" value="3Com"/>
329
340
  <param pos="0" name="os.device" value="Switch"/>
330
- <param pos="1" name="os.product"/>
341
+ <param pos="0" name="os.product" value="SuperStack II"/>
342
+ <param pos="0" name="hw.vendor" value="3Com"/>
343
+ <param pos="0" name="hw.device" value="Switch"/>
344
+ <param pos="0" name="hw.product" value="SuperStack II"/>
331
345
  </fingerprint>
332
- <fingerprint pattern="^3Com (SuperStack 3 Firewall)$">
346
+ <fingerprint pattern="^3Com SuperStack 3 Firewall$">
333
347
  <description>3COM Switch</description>
334
348
  <example>3Com SuperStack 3 Firewall</example>
335
349
  <param pos="0" name="os.vendor" value="3Com"/>
336
350
  <param pos="0" name="os.device" value="Firewall"/>
337
- <param pos="1" name="os.product"/>
351
+ <param pos="0" name="os.product" value="SuperStack 3 Firewall"/>
352
+ <param pos="0" name="hw.vendor" value="3Com"/>
353
+ <param pos="0" name="hw.device" value="Firewall"/>
354
+ <param pos="0" name="hw.product" value="SuperStack 3 Firewall"/>
338
355
  </fingerprint>
339
356
  <fingerprint pattern="^3Com (.*Switch \S+)(?: \d+-port)?$">
340
- <description>3COM Switch</description>
357
+ <description>3COM Superstack Switch</description>
341
358
  <example>3Com SuperStack 3 Switch 3226</example>
342
359
  <example>3Com SuperStack 3 Switch 3250</example>
343
360
  <example>3Com SuperStack 3 Switch 3812 12-port</example>
@@ -353,7 +370,7 @@
353
370
  <param pos="1" name="os.product"/>
354
371
  </fingerprint>
355
372
  <fingerprint pattern="^3Com (.*Switch.*) \d+-Port.*Software Version 3Com OS V(\S+)$">
356
- <description>3COM Switch</description>
373
+ <description>3COM Superstack Switch with port count and os version</description>
357
374
  <example>3Com SuperStack 3 Switch 4500 26-Port Software Version 3Com OS V3.01.00s56</example>
358
375
  <example>3Com SuperStack 4 Switch 5500G-EI 24-Port Software Version 3Com OS V3.03.02s56Mc02</example>
359
376
  <example>3Com Switch 4200G 12-Port Software Version 3Com OS V3.01.00s56</example>
@@ -377,7 +394,7 @@
377
394
  <param pos="2" name="os.version"/>
378
395
  </fingerprint>
379
396
  <fingerprint pattern="^3Com (.*Switch.*) \d+-Port.*Software Version (\d\..*(?:Release|Feature).*)$">
380
- <description>3COM Switch</description>
397
+ <description>3COM Switch with release info</description>
381
398
  <example>3Com Switch 4210 18-Port Software Version 3.10 Release 2212P01</example>
382
399
  <example>3Com Switch 4210 26-Port Software Version 3.10 Release 2212</example>
383
400
  <example>3Com Switch 4210 26-Port Software Version 3.10 Release 2212P01</example>
@@ -458,7 +475,7 @@
458
475
  <param pos="1" name="os.product"/>
459
476
  </fingerprint>
460
477
  <fingerprint pattern="^Total Access ([^,\s]+).*Version: ([^,]+), Date: .*$">
461
- <description>ADTRAN TotalAccess</description>
478
+ <description>ADTRAN TotalAccess - date variant</description>
462
479
  <example>Total Access 924 (2nd Gen), Version: A1.08.00.E, Date: Tue Apr 28 10:54:58 2009</example>
463
480
  <example>Total Access 904 (1st Gen), Version: A4.02.00.E, Date: Mon Aug 09 13:57:18 2010</example>
464
481
  <example>Total Access 904, Version: 16.05.00.E, Date: Thu Feb 28 18:22:04 2008</example>
@@ -474,7 +491,7 @@
474
491
  <param pos="2" name="os.version"/>
475
492
  </fingerprint>
476
493
  <fingerprint pattern="^Total Access (\S+ SCU)$">
477
- <description>ADTRAN TotalAccess</description>
494
+ <description>ADTRAN TotalAccess SCU</description>
478
495
  <example>Total Access 1500 SCU</example>
479
496
  <param pos="0" name="os.device" value="Remote Terminal"/>
480
497
  <param pos="0" name="os.vendor" value="ADTRAN"/>
@@ -482,7 +499,7 @@
482
499
  <param pos="1" name="os.product"/>
483
500
  </fingerprint>
484
501
  <fingerprint pattern="^(TA\d\S+) (\d\S+ )?Total Access .*$">
485
- <description>ADTRAN TotalAccess</description>
502
+ <description>ADTRAN TotalAccess - model first variant</description>
486
503
  <example>TA1100F 1179.760 Total Access SFP-Based System</example>
487
504
  <example>TA1200F 1179.660L1 Total Access IP DSLAM System</example>
488
505
  <example>TA1248 1179.641AL3 Total Access IP DSLAM System</example>
@@ -496,7 +513,7 @@
496
513
  <param pos="2" name="os.version"/>
497
514
  </fingerprint>
498
515
  <fingerprint pattern="^\S+ Total Access series shelf$">
499
- <description>ADTRAN TotalAccess</description>
516
+ <description>ADTRAN TotalAccess shelf</description>
500
517
  <example>UNKNOWN Total Access series shelf</example>
501
518
  <param pos="0" name="os.device" value="Media Gateway"/>
502
519
  <param pos="0" name="os.vendor" value="ADTRAN"/>
@@ -563,7 +580,7 @@
563
580
  <param pos="3" name="os.version.version"/>
564
581
  </fingerprint>
565
582
  <fingerprint pattern="^Allen-Bradley (\S+-ENET) Ethernet Interface Series (\S+) Revision (\S+) \S+ (\S+) \S+$">
566
- <description>Allen-Bradley PLC/SLC Ethernet Interface</description>
583
+ <description>Allen-Bradley PLC/SLC Ethernet Interface - variant 1</description>
567
584
  <example>Allen-Bradley 1785-ENET Ethernet Interface Series E Revision B.0 1785enet 1.35 06-Mar-98</example>
568
585
  <param pos="0" name="os.device" value="PLC"/>
569
586
  <param pos="0" name="os.vendor" value="Rockwell Automation"/>
@@ -600,7 +617,7 @@
600
617
  <param pos="2" name="os.version"/>
601
618
  </fingerprint>
602
619
  <fingerprint pattern="^APC Embedded PowerNet SNMP Agent \(.*SW v([^,]+),.*M[oO][dD]:\s*([^,]+),.*$">
603
- <description>APC UPS</description>
620
+ <description>APC Embedded PowerNet</description>
604
621
  <example>APC Embedded PowerNet SNMP Agent (FW v3.0.2 SW v2.2.4.a, HW ged~, MOD: AP9605, Mfg: 06/24/1998, SN: X)</example>
605
622
  <example>APC Embedded PowerNet SNMP Agent (SW v2.0.3, HW v2.0B, Mod: AP9206, Mfg 06/22/94, SN: A94063028359)</example>
606
623
  <param pos="0" name="os.vendor" value="APC"/>
@@ -667,7 +684,7 @@
667
684
  <param pos="1" name="os.product"/>
668
685
  </fingerprint>
669
686
  <fingerprint pattern="^SNMP-Link (\S+) (\S+) ST\S+$">
670
- <description>Asentria SNMP-Link</description>
687
+ <description>Asentria SNMP-Link - version variant</description>
671
688
  <example>SNMP-Link SL61 1.10 STD</example>
672
689
  <example>SNMP-Link SL81 1.11 STDF</example>
673
690
  <param pos="0" name="os.vendor" value="Asentria"/>
@@ -742,23 +759,23 @@
742
759
  <param pos="2" name="os.version"/>
743
760
  </fingerprint>
744
761
  <fingerprint pattern="Avaya (\S+) Telephony Media Gateway$">
745
- <description>Avaya Media Gateway</description>
762
+ <description>Avaya Telephony Media Gateway</description>
746
763
  <example>Avaya G700 Telephony Media Gateway</example>
747
764
  <param pos="0" name="os.vendor" value="Avaya"/>
748
765
  <param pos="0" name="os.device" value="Media Gateway"/>
749
766
  <param pos="1" name="os.product"/>
750
767
  </fingerprint>
751
- <fingerprint pattern="^Avaya (Cajun Switch) Agent v(\S+)$">
752
- <description>Avaya Switch</description>
753
- <example>Avaya Cajun Switch Agent v5.2.10</example>
768
+ <fingerprint pattern="^Avaya Cajun Switch Agent v(\S+)$">
769
+ <description>Avaya Cajun Switch</description>
770
+ <example os.version="5.2.10">Avaya Cajun Switch Agent v5.2.10</example>
754
771
  <example>Avaya Cajun Switch Agent v5.4.2</example>
755
772
  <param pos="0" name="os.vendor" value="Avaya"/>
756
773
  <param pos="0" name="os.device" value="Switch"/>
757
- <param pos="1" name="os.product"/>
758
- <param pos="2" name="os.version"/>
774
+ <param pos="0" name="os.product" value="Cajun Switch"/>
775
+ <param pos="1" name="os.version"/>
759
776
  </fingerprint>
760
777
  <fingerprint pattern="^(Ethernet Routing Switch.*)\s+HW:.*SW:\s*v?(\S+).*Avaya Networks$">
761
- <description>Avaya Switch</description>
778
+ <description>Avaya Routing Switch</description>
762
779
  <example>Ethernet Routing Switch 2526T HW:04 FW:1.0.0.15 SW:v4.4.0.010 BN:10 (c) Avaya Networks</example>
763
780
  <example>Ethernet Routing Switch 3524GT HW:01 FW:1.0.0.4 SW:v5.0.0.060 BN:60 (c) Avaya Networks</example>
764
781
  <example>Ethernet Routing Switch 4550T-PWR HW:01 FW:5.3.0.3 SW:v5.6.0.008 BN:08 (c) Avaya Networks</example>
@@ -862,7 +879,6 @@
862
879
  <example>ESP-4 MI V3.04</example>
863
880
  <example>ESP-8 MI V3.12b</example>
864
881
  <example>ESP-8 MI V3.13</example>
865
- <example>ESP-8 MI V3.13</example>
866
882
  <example>ESP-8 MI V3.14b</example>
867
883
  <param pos="0" name="os.vendor" value="Avocent"/>
868
884
  <param pos="0" name="os.device" value="Terminal Server"/>
@@ -980,7 +996,7 @@
980
996
  <param pos="1" name="os.version"/>
981
997
  </fingerprint>
982
998
  <fingerprint pattern="^Brother (NC-\d+\S+),\s*Firmware Ver\.\s?([^\s,]+).*">
983
- <description>Brother multifunction device</description>
999
+ <description>Brother multifunction device - variant 1</description>
984
1000
  <example>Brother NC-130h, Firmware Ver.0.09 ,MID 8CA-A17-001</example>
985
1001
  <example>Brother NC-6800h, Firmware Ver.1.04 (09.05.08),MID 8C5-D61,FID 2</example>
986
1002
  <example>Brother NC-6400h, Firmware Ver.1.11 (06.12.20),MID 84UZ92</example>
@@ -1031,7 +1047,7 @@
1031
1047
  <param pos="2" name="os.version"/>
1032
1048
  </fingerprint>
1033
1049
  <fingerprint pattern="^Cabletron (\S+) Version (\S+) \S+$">
1034
- <description>Cabletron Switch</description>
1050
+ <description>Cabletron Switch - time variant</description>
1035
1051
  <example>Cabletron ELS10-26 Version 1.01.02 06/09/98--12:51:12</example>
1036
1052
  <example>Cabletron ELS10-26 Version 1.02.00 04/05/99--14:27:16</example>
1037
1053
  <param pos="0" name="os.vendor" value="Cabletron"/>
@@ -1040,7 +1056,7 @@
1040
1056
  <param pos="2" name="os.version"/>
1041
1057
  </fingerprint>
1042
1058
  <fingerprint pattern="^Cabletron (\S+) (?:Rev\.|SW:)(\S+)$">
1043
- <description>Cabletron Switch</description>
1059
+ <description>Cabletron Switch - software variant</description>
1044
1060
  <example>Cabletron ELS100-16TX Rev.1.02.00</example>
1045
1061
  <example>Cabletron ELS100-24TXG SW:2.01.00</example>
1046
1062
  <example>Cabletron ELS100-24TXG SW:2.2.0.1</example>
@@ -1051,23 +1067,23 @@
1051
1067
  <param pos="1" name="os.product"/>
1052
1068
  <param pos="2" name="os.version"/>
1053
1069
  </fingerprint>
1054
- <fingerprint pattern="^Cabletron (SEHI) Revision (\S+)$">
1055
- <description>Cabletron Switch</description>
1056
- <example>Cabletron SEHI Revision 1.10.04</example>
1070
+ <fingerprint pattern="^Cabletron SEHI Revision (\S+)$">
1071
+ <description>Cabletron SEHI Switch</description>
1072
+ <example os.version="1.10.04">Cabletron SEHI Revision 1.10.04</example>
1057
1073
  <param pos="0" name="os.vendor" value="Cabletron"/>
1058
1074
  <param pos="0" name="os.device" value="Switch"/>
1059
- <param pos="1" name="os.product"/>
1060
- <param pos="2" name="os.version"/>
1075
+ <param pos="0" name="os.product" value="SEHI"/>
1076
+ <param pos="1" name="os.version"/>
1061
1077
  </fingerprint>
1062
1078
  <fingerprint pattern="^Cabletron Smart Switch (\S+ Chassis)$">
1063
- <description>Cabletron Switch</description>
1064
- <example>Cabletron Smart Switch 6000 Chassis</example>
1079
+ <description>Cabletron Smart Switch</description>
1080
+ <example os.product="6000 Chassis">Cabletron Smart Switch 6000 Chassis</example>
1065
1081
  <param pos="0" name="os.vendor" value="Cabletron"/>
1066
1082
  <param pos="0" name="os.device" value="Switch"/>
1067
1083
  <param pos="1" name="os.product"/>
1068
1084
  </fingerprint>
1069
1085
  <fingerprint pattern="^(SSR \S+) - Cabletron Systems, Inc. Firmware Version: (\S+) PROM Version: \S+$">
1070
- <description>Cabletron Switch</description>
1086
+ <description>Cabletron Switch - firmware variant</description>
1071
1087
  <example>SSR 2000 - Cabletron Systems, Inc. Firmware Version: 2.2.0.1 PROM Version: prom-1.1.0.5</example>
1072
1088
  <example>SSR 8000 - Cabletron Systems, Inc. Firmware Version: 3.1.0.0 PROM Version: prom-2.0.1.1</example>
1073
1089
  <param pos="0" name="os.vendor" value="Cabletron"/>
@@ -1084,7 +1100,7 @@
1084
1100
  <param pos="2" name="os.version"/>
1085
1101
  </fingerprint>
1086
1102
  <fingerprint pattern="^Enterasys Networks, Inc\. (.*?) Rev (\S+) .* ofc$">
1087
- <description>Enterasys Switch</description>
1103
+ <description>Enterasys Switch - date variant</description>
1088
1104
  <example>Enterasys Networks, Inc. 1H582-51 Rev 03.05.09.1 07/28/2005--17:47 ofc</example>
1089
1105
  <example>Enterasys Networks, Inc. Matrix N3 Platinum Rev 05.42.04 06/07/2007--17:19 ofc</example>
1090
1106
  <example>Enterasys Networks, Inc. NSA Chassis Rev 07.41.03.0009 01/05/2012--10:33 ofc</example>
@@ -1154,7 +1170,7 @@
1154
1170
  <param pos="1" name="os.product"/>
1155
1171
  </fingerprint>
1156
1172
  <fingerprint pattern="^Canon Inc\., (\S+) Printer(?: /P)?(?: EEPROM \S+)?$">
1157
- <description>Canon printer</description>
1173
+ <description>Canon printer - Inc variant</description>
1158
1174
  <example>Canon Inc., LBP-1760e Printer /P</example>
1159
1175
  <example>Canon Inc., LBP-1760e Printer</example>
1160
1176
  <example>Canon Inc., LBP-3260 Printer /P</example>
@@ -1263,7 +1279,7 @@
1263
1279
  <param pos="0" name="os.product" value="Switch"/>
1264
1280
  </fingerprint>
1265
1281
  <fingerprint pattern="^(\S+) OPTICAL SW:(\S+) .* Ciena \(R\) Corporation$">
1266
- <description>Ciena Optical</description>
1282
+ <description>Ciena Optical - software version variant</description>
1267
1283
  <example>6500 OPTICAL SW:0810 BN:HD (c) Ciena (R) Corporation</example>
1268
1284
  <param pos="0" name="os.vendor" value="Ciena"/>
1269
1285
  <param pos="0" name="os.device" value="Switch"/>
@@ -1272,33 +1288,33 @@
1272
1288
  <param pos="2" name="os.version"/>
1273
1289
  </fingerprint>
1274
1290
  <fingerprint pattern="^CIENA Corporation; Product : Traverse$">
1275
- <description>Ciena Optical</description>
1291
+ <description>Ciena Traverse</description>
1276
1292
  <example>CIENA Corporation; Product : Traverse</example>
1277
1293
  <param pos="0" name="os.vendor" value="Ciena"/>
1278
1294
  <param pos="0" name="os.device" value="Switch"/>
1279
1295
  <param pos="0" name="os.product" value="Traverse"/>
1280
1296
  </fingerprint>
1281
1297
  <fingerprint pattern="^Ciena CN (\S+) V(\S+) \(MIBs \S+\)$">
1282
- <description>Ciena Optical</description>
1298
+ <description>Ciena CN</description>
1283
1299
  <example>Ciena CN 3106 V1.0.4(04) (MIBs V1.6.8)</example>
1284
1300
  <param pos="0" name="os.vendor" value="Ciena"/>
1285
1301
  <param pos="0" name="os.device" value="Switch"/>
1286
1302
  <param pos="1" name="os.product"/>
1287
1303
  <param pos="2" name="os.version"/>
1288
1304
  </fingerprint>
1289
- <fingerprint pattern="^Ciena Distributed Node Product Line (WaveCore) \(tm\) OS Release (\S+)$">
1290
- <description>Ciena Optical</description>
1291
- <example>Ciena Distributed Node Product Line WaveCore (tm) OS Release 07000102.002</example>
1305
+ <fingerprint pattern="^Ciena Distributed Node Product Line WaveCore \(tm\) OS Release (\S+)$">
1306
+ <description>Ciena WaveCorel</description>
1307
+ <example os.version="07000102.002">Ciena Distributed Node Product Line WaveCore (tm) OS Release 07000102.002</example>
1292
1308
  <param pos="0" name="os.vendor" value="Ciena"/>
1293
1309
  <param pos="0" name="os.family" value="WaveCore"/>
1294
- <param pos="1" name="os.product"/>
1295
- <param pos="2" name="os.version"/>
1310
+ <param pos="0" name="os.product" value="WaveCore"/>
1311
+ <param pos="1" name="os.version"/>
1296
1312
  </fingerprint>
1297
1313
  <!--======================================================================
1298
1314
  CISCO
1299
1315
  =======================================================================-->
1300
1316
  <fingerprint pattern="^(?:Cisco|TANDBERG) Codec SoftW: (.*\d+[\.\d+]+)(?:(?: )?Beta\d)? (?:\w* )?MCU: (?:Cisco|TANDBERG) (?:\w* )?(\d+MXP|[A-Z]+\d+) .*?">
1301
- <description>Cisco TelePresence</description>
1317
+ <description>Cisco TelePresence - verbose variant</description>
1302
1318
  <example os.version="TC5.1.0.280662" hw.series="SX20">Cisco Codec SoftW: TC5.1.0.280662 MCU: Cisco TelePresence SX20 Date: 2012-02-14 S/N: FTT16070041 BootSW: Board: 101790-6 [28]</example>
1303
1319
  <example os.version="TC4.2.0.259927" hw.series="MX200">TANDBERG Codec SoftW: TC4.2.0.259927 MCU: Cisco TelePresence MX200 Date: 2011-06-30 S/N: FTT1530000O BootSW: Board: 101770-4 [20]</example>
1304
1320
  <example os.version="TC5.1.3.292001" hw.series="MX300">TANDBERG Codec SoftW: TC5.1.3.292001 MCU: Cisco TelePresence MX300 Date: 2012-06-21 S/N: FTT16030013 BootSW: Board: 101770-5 [22]</example>
@@ -1331,7 +1347,7 @@
1331
1347
  <param pos="1" name="hw.series"/>
1332
1348
  </fingerprint>
1333
1349
  <fingerprint pattern="^Cisco TelePresence (Conductor|Supervisor)(?: (MSE \d+))?">
1334
- <description>Cisco TelePresence</description>
1350
+ <description>Cisco TelePresence Conductor</description>
1335
1351
  <example os.device="Conductor">Cisco TelePresence Conductor</example>
1336
1352
  <example os.device="Supervisor" hw.series="MSE 8050">Cisco TelePresence Supervisor MSE 8050</example>
1337
1353
  <param pos="0" name="os.certainty" value="0.85"/>
@@ -1389,7 +1405,7 @@
1389
1405
  <param pos="0" name="os.cpe23" value="cpe:/o:cisco:vpn_3000_concentrator:{os.version}"/>
1390
1406
  </fingerprint>
1391
1407
  <fingerprint pattern="^(?:Cisco )?Network Analysis Module \(WS-[^\)]+\), Version ([^, ]+)[,\s]?">
1392
- <description>Cisco Catalyst Network Analysis Module</description>
1408
+ <description>Cisco Catalyst Network Analysis Module - version variant</description>
1393
1409
  <example>Network Analysis Module (WS-SVC-NAM-1), Version 3.1(1)
1394
1410
  Copyright (c) 1999-2003 by cisco Systems, Inc.</example>
1395
1411
  <example>Cisco Network Analysis Module (WS-SVC-NAM-2), Version 3.3(0.9)
@@ -1448,7 +1464,7 @@ Copyright (c) 1999-2004 by cisco Systems, Inc.</example>
1448
1464
  <param pos="0" name="os.cpe23" value="cpe:/o:cisco:ios:{os.version}"/>
1449
1465
  </fingerprint>
1450
1466
  <fingerprint pattern="^Cisco Systems, Inc\. \S+[\r\n]+Cisco Catalyst Operating System Software, Version (\S+)[\r\n]+Copyright \(c\)">
1451
- <description>Cisco Catalyst</description>
1467
+ <description>Cisco Catalyst - Inc variant</description>
1452
1468
  <example>Cisco Systems, Inc. WS-C2948
1453
1469
  Cisco Catalyst Operating System Software, Version 6.3(5)
1454
1470
  Copyright (c) 1995-2002 by Cisco Systems, Inc.
@@ -1656,7 +1672,7 @@ Copyright (c) 1995-2005 by Cisco Systems
1656
1672
  <param pos="1" name="os.product"/>
1657
1673
  </fingerprint>
1658
1674
  <fingerprint pattern="^Dell (\d{4}[cd]?n) (?:Laser )?MFP.*$">
1659
- <description>Dell Laser Printer</description>
1675
+ <description>Dell MFP Laser Printer</description>
1660
1676
  <example>Dell 2135cn MFP; Net 12.10, Controller 200903191302, Engine 03.00.10</example>
1661
1677
  <example>Dell 2335dn MFP; 2.70.03.02;Engine 1.10.65;NIC V4.01.30(2335dn MFP) 02-05-2010;S/N JQF9FG1</example>
1662
1678
  <example>Dell 2355dn Laser MFP; V2.70.45.30 May-20-2013;Engine 1.20.25;NIC V4.01.42(2355dn MFP) 4-23-2013;S/N 3DKCJM1</example>
@@ -1690,7 +1706,7 @@ Copyright (c) 1995-2005 by Cisco Systems
1690
1706
  <param pos="2" name="os.version"/>
1691
1707
  </fingerprint>
1692
1708
  <fingerprint pattern="^Dell (\S+)(?: Mono)? Laser Printer(?:;| version) \S+;?.*$">
1693
- <description>Dell Laser Printer</description>
1709
+ <description>Dell Laser Printer - variant 1</description>
1694
1710
  <example>Dell 2330dn Laser Printer version NR.APS.N449 kernel 2.6.18.5 All-N-1</example>
1695
1711
  <example>Dell 2350dn Laser Printer version NR.APS.N449 kernel 2.6.18.5 All-N-1</example>
1696
1712
  <example>Dell 3330dn Laser Printer version NR.APS.N447b2 kernel 2.6.18.5 All-N-1</example>
@@ -1701,7 +1717,7 @@ Copyright (c) 1995-2005 by Cisco Systems
1701
1717
  <param pos="1" name="os.product"/>
1702
1718
  </fingerprint>
1703
1719
  <fingerprint pattern="^Dell (\d{4}d?n) Series$">
1704
- <description>Dell Laser Printer</description>
1720
+ <description>Dell Laser Printer - model only variant</description>
1705
1721
  <example>Dell 1815n Series</example>
1706
1722
  <param pos="0" name="os.vendor" value="Dell"/>
1707
1723
  <param pos="0" name="os.family" value="Laser Printer"/>
@@ -1709,7 +1725,7 @@ Copyright (c) 1995-2005 by Cisco Systems
1709
1725
  <param pos="1" name="os.product"/>
1710
1726
  </fingerprint>
1711
1727
  <fingerprint pattern="^DELL Tape Library Remote Management Card$">
1712
- <description>Dell PowerVault Tape Library</description>
1728
+ <description>Dell PowerVault Tape Library Remote Management Card</description>
1713
1729
  <example>DELL Tape Library Remote Management Card</example>
1714
1730
  <param pos="0" name="os.vendor" value="Dell"/>
1715
1731
  <param pos="0" name="os.family" value="PowerVault"/>
@@ -1794,14 +1810,11 @@ Copyright (c) 1995-2005 by Cisco Systems
1794
1810
  <example>Evolution 2200</example>
1795
1811
  <example>Evolution 3000</example>
1796
1812
  <example>Evolution 650</example>
1797
- <example>Evolution 650</example>
1798
1813
  <example>Evolution 800</example>
1799
1814
  <example>Evolution 850</example>
1800
- <example>Evolution 850</example>
1801
1815
  <example>Evolution S 1750</example>
1802
1816
  <example>Evolution S 2500</example>
1803
1817
  <example>Evolution S 3000</example>
1804
- <example>Evolution S 3000</example>
1805
1818
  <example>Evolution Series - IP</example>
1806
1819
  <example>Evolution Series - METRO</example>
1807
1820
  <example>Evolution Series - XPAND</example>
@@ -1855,7 +1868,7 @@ Copyright (c) 1995-2005 by Cisco Systems
1855
1868
  =======================================================================-->
1856
1869
  <!-- Epson uses the 201207171045 / 02.23.00 version format, but the latter is more consistent -->
1857
1870
  <fingerprint pattern="^EPSON ([A-Z]\S+); Net ([^,]+),ESS (?:[^,]+),IOT (\S+)$">
1858
- <description>Epson Printer</description>
1871
+ <description>Epson Printer - verbose variant</description>
1859
1872
  <example os.product="AL-C1750N" os.version="02.17.00" os.version.version="98.48">EPSON AL-C1750N; Net 98.48,ESS 201103111031,IOT 02.17.00</example>
1860
1873
  <example os.product="AL-C2900" os.version="04.00.00" os.version.version="96.51">EPSON AL-C2900; Net 96.51,ESS 201103101328,IOT 04.00.00</example>
1861
1874
  <example os.product="AL-CX29" os.version="04.00.00" os.version.version="96.55">EPSON AL-CX29; Net 96.55,ESS 201106281159,IOT 04.00.00</example>
@@ -1867,7 +1880,7 @@ Copyright (c) 1995-2005 by Cisco Systems
1867
1880
  <param pos="2" name="os.version.version"/>
1868
1881
  </fingerprint>
1869
1882
  <fingerprint pattern="^EPSON ([A-Z]\S+) (\d+\.\S+)$">
1870
- <description>Epson Printer</description>
1883
+ <description>Epson Printer - model and version</description>
1871
1884
  <example>EPSON AL-C2000 01.00</example>
1872
1885
  <example>EPSON AL-C8500 01.00</example>
1873
1886
  <example>EPSON EPL-N2050+ 01.00</example>
@@ -1883,7 +1896,7 @@ Copyright (c) 1995-2005 by Cisco Systems
1883
1896
  <param pos="2" name="os.version"/>
1884
1897
  </fingerprint>
1885
1898
  <fingerprint pattern="^EPSON ([A-Z]\S+)$">
1886
- <description>Epson Printer</description>
1899
+ <description>Epson Printer - model only</description>
1887
1900
  <example>EPSON LP-M720</example>
1888
1901
  <example>EPSON LP-S820</example>
1889
1902
  <example>EPSON AL-CX28</example>
@@ -1929,7 +1942,7 @@ Copyright (c) 1995-2005 by Cisco Systems
1929
1942
  <param pos="0" name="os.product" value="Printer"/>
1930
1943
  </fingerprint>
1931
1944
  <fingerprint pattern="^Epson ([A-Z][^;]+); ESS (\S+)$">
1932
- <description>Epson Printer</description>
1945
+ <description>Epson Printer - ess variant</description>
1933
1946
  <example>Epson AL-CX17NF; ESS 01.00.07</example>
1934
1947
  <example>Epson AL-CX17NF; ESS 01.00.08</example>
1935
1948
  <example>Epson AL-CX17NF; ESS 01.00.13</example>
@@ -1983,7 +1996,7 @@ Copyright (c) 1995-2005 by Cisco Systems
1983
1996
  <param pos="2" name="os.version"/>
1984
1997
  </fingerprint>
1985
1998
  <fingerprint pattern="^Foundry AP: \S+ v(\S+)$">
1986
- <description>Foundry Networks APs</description>
1999
+ <description>Foundry Networks AP</description>
1987
2000
  <example>Foundry AP: 01.03.04Tw8 v2.0.0</example>
1988
2001
  <example>Foundry AP: 01.03.05Tw8 v3.0.4</example>
1989
2002
  <example>Foundry AP: 02.02.00Tw8 v4.0.0</example>
@@ -1993,7 +2006,7 @@ Copyright (c) 1995-2005 by Cisco Systems
1993
2006
  <param pos="1" name="os.version"/>
1994
2007
  </fingerprint>
1995
2008
  <fingerprint pattern="^Foundry Enterprise Wireless AP$">
1996
- <description>Foundry Networks APs</description>
2009
+ <description>Foundry Networks Enterprise AP</description>
1997
2010
  <example>Foundry Enterprise Wireless AP</example>
1998
2011
  <param pos="0" name="os.vendor" value="Foundry Networks"/>
1999
2012
  <param pos="0" name="os.device" value="WAP"/>
@@ -2033,7 +2046,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2033
2046
  FUJI XEROX
2034
2047
  =======================================================================-->
2035
2048
  <fingerprint pattern="^FUJI XEROX ((?:Document Centre|DocuCentre-\S+) [^\s;]+).*$">
2036
- <description>Xerox Document Centre Multi-function System</description>
2049
+ <description>Xerox Document Centre Multi-function System - Fuji variant</description>
2037
2050
  <example>FUJI XEROX Document Centre C360;ESS 1.131.11,IOT 6.6.5,IIT 12.7.0,IIT D12.0.0,ADF 10.3.0,FAX 11.20.50</example>
2038
2051
  <example>FUJI XEROX Document Centre C400 v 2. 0. 6</example>
2039
2052
  <example>FUJI XEROX Document Centre 405</example>
@@ -2065,7 +2078,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2065
2078
  Gigamon
2066
2079
  =======================================================================-->
2067
2080
  <fingerprint pattern="^Linux (\S+) .*GigaVUE-H-Series ([\d\.]+) .* (\S+)$">
2068
- <description>Garrett DynaStar Industrial Router</description>
2081
+ <description>Gigamon GigaVUE HD</description>
2069
2082
  <example>Linux giga1-hd1-wax 2.6.34-GIGAMONuni-gvhd GigaVUE-H-Series 3.0.06 #1681 2013-11-06 07:42:52 ppc</example>
2070
2083
  <example>Linux GigaVUE-HB1-2 2.6.34-GIGAMONuni-gvhb1 GigaVUE-H-Series 3.0.02 #13 2013-08-22 09:58:43 ppc</example>
2071
2084
  <param pos="0" name="os.vendor" value="Gigamon"/>
@@ -2077,7 +2090,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2077
2090
  <param pos="1" name="host.name"/>
2078
2091
  </fingerprint>
2079
2092
  <fingerprint pattern="^Linux (\S+) .*GigaVUE-TA1 ([\d\.]+) .* (\S+)$">
2080
- <description>Gigamon GigaVue TA</description>
2093
+ <description>Gigamon GigaVUE TA</description>
2081
2094
  <example>Linux GigaVUE-TA1 2.6.34-GIGAMONsmp-gvag GigaVUE-TA1 2.5.02 #5 2013-03-15 18:08:44 SMP ppc</example>
2082
2095
  <param pos="0" name="os.vendor" value="Gigamon"/>
2083
2096
  <param pos="0" name="os.device" value="Monitoring"/>
@@ -2143,7 +2156,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2143
2156
  <param pos="0" name="os.cpe23" value="cpe:/o:hp:tru64:{os.version}"/>
2144
2157
  </fingerprint>
2145
2158
  <fingerprint pattern="^(\S+) (.*?) Digital UNIX V(\S+)\s+\(Rev\. ([^\)]+)\).*TCP/IP$">
2146
- <description>Digital/Compaq/HP Tru64 Unix</description>
2159
+ <description>Digital/Compaq/HP Tru64 Unix - Digital branding variant</description>
2147
2160
  <example host.name="example.com" hw.product="COMPAQ AlphaServer DS10 617 MHz" os.version="4.0F" os.version.version="1229">example.com COMPAQ AlphaServer DS10 617 MHz Digital UNIX V4.0F (Rev. 1229); Wed May 22 13:55:58 CST 2002 TCP/IP</example>
2148
2161
  <example host.name="example.com" hw.product="COMPAQ Professional Workstation XP1000" os.version="4.0F" os.version.version="1229">example.com COMPAQ Professional Workstation XP1000 Digital UNIX V4.0F (Rev. 1229); Wed Jun 30 14:32:53 MET DST 2004 . TCP/IP</example>
2149
2162
  <param pos="0" name="os.vendor" value="HP"/>
@@ -2210,7 +2223,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2210
2223
  <param pos="2" name="os.version.version"/>
2211
2224
  </fingerprint>
2212
2225
  <fingerprint pattern="^HP Series Router (\S+) HP Comware Platform Software Comware Software Version ([^\s,]+)[,\s]\s*Release ([^,\s]+)?[,\s].*Copyright.*$">
2213
- <description>HP Comware</description>
2226
+ <description>HP Comware - variant 1</description>
2214
2227
  <example hw.product="A-MSR20-40" os.version="5.20" os.version.version="2209P15">HP Series Router A-MSR20-40 HP Comware Platform Software Comware Software Version 5.20, Release 2209P15, Standard Copyright(c) 2010-2012 Hewlett-Packard Development Company, L.P.</example>
2215
2228
  <example>HP Series Router A-MSR30-20 HP Comware Platform Software Comware Software Version 5.20, Release 2207P41, Standard Copyright(c) 2010 Hewlett-Packard Development Company, L.P.</example>
2216
2229
  <example>HP Series Router A-MSR900 HP Comware Platform Software Comware Software Version 5.20, Release 2207P41 Copyright(c) 2010 Hewlett-Packard Development Company, L.P.</example>
@@ -2223,7 +2236,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2223
2236
  <param pos="3" name="os.version.version"/>
2224
2237
  </fingerprint>
2225
2238
  <fingerprint pattern="^HP Series Router (\S+) HP Comware Platform Software Comware Software Version ([^,]+), (\S+) Copyright.*$">
2226
- <description>HP Comware</description>
2239
+ <description>HP Comware - variant 2</description>
2227
2240
  <example hw.product="A-MSR20-40" os.version="5.20" os.version.version="T2207L16">HP Series Router A-MSR20-40 HP Comware Platform Software Comware Software Version 5.20, T2207L16 Copyright(c) 2010-2011 Hewlett-Packard Development Company, L.P.</example>
2228
2241
  <param pos="0" name="os.vendor" value="HP"/>
2229
2242
  <param pos="0" name="os.device" value="Router"/>
@@ -2234,7 +2247,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2234
2247
  <param pos="1" name="hw.product"/>
2235
2248
  </fingerprint>
2236
2249
  <fingerprint pattern="^HP Comware Platform Software, Software Version ([^\s,]+)[,\s]\s*(?:Release|Alpha|Beta)\s*(\S+) HP (\S+) (?:SI|EI|Switch|Copyright|v\d) .*$">
2237
- <description>HP Comware</description>
2250
+ <description>HP Comware - variant 3</description>
2238
2251
  <example>HP Comware Platform Software, Software Version 5.20 Release 2208 HP A5500-24G SI Switch with 2 Interface Slots Copyright (c) 2010-2011 Hewlett-Packard Development Company, L.P.</example>
2239
2252
  <example>HP Comware Platform Software, Software Version 5.20 Release 2208 HP A5500-48G EI Switch with 2 Interface Slots Copyright (c) 2010-2011 Hewlett-Packard Development Company, L.P.</example>
2240
2253
  <example>HP Comware Platform Software, Software Version 5.20 Release 2208P01 HP A5500-24G EI Switch with 2 Interface Slots Copyright (c) 2010-2011 Hewlett-Packard Development Company, L.P.</example>
@@ -2301,7 +2314,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2301
2314
  <param pos="3" name="os.version.version"/>
2302
2315
  </fingerprint>
2303
2316
  <fingerprint pattern="^HP (V1905\S+) Switch Product Version (\S+) Copyright.*$">
2304
- <description>HP Switch</description>
2317
+ <description>HP Switch - product version variant</description>
2305
2318
  <example>HP V1905-24 Switch Product Version 02.00.01 Copyright (c) 2011 Hewlett-Packard Development Company, L.P All rights Reserved.</example>
2306
2319
  <example>HP V1905-24-PoE Switch Product Version 02.00.01 Copyright (c) 2011 Hewlett-Packard Development Company, L.P All rights Reserved.</example>
2307
2320
  <example>HP V1905-48 Switch Product Version 02.00.01 Copyright (c) 2011 Hewlett-Packard Development Company, L.P All rights Reserved.</example>
@@ -2313,7 +2326,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2313
2326
  <param pos="1" name="hw.product"/>
2314
2327
  </fingerprint>
2315
2328
  <fingerprint pattern="^Hewlett-Packard Company (\S+) HP ProCurve Routing Switch.*Software Version (\S+) .*$">
2316
- <description>HP ProCurve Routing Switch</description>
2329
+ <description>HP ProCurve Routing Switch - build data variant</description>
2317
2330
  <example>Hewlett-Packard Company J4139A HP ProCurve Routing Switch 9304M, Software Version 08.0.01kT53 Compiled on Apr 27 2007 at 18:55:59 labeled as H2R08001k</example>
2318
2331
  <param pos="0" name="os.vendor" value="HP"/>
2319
2332
  <param pos="0" name="os.family" value="ProCurve"/>
@@ -2332,7 +2345,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2332
2345
  <param pos="2" name="os.version"/>
2333
2346
  </fingerprint>
2334
2347
  <fingerprint pattern="^ProCurve (J\S+) Switch.*, revision (\S+),.*$">
2335
- <description>HP ProCurve Switch</description>
2348
+ <description>HP ProCurve Switch - HP prefix and build path variant</description>
2336
2349
  <example>ProCurve J4900B Switch 2626, revision H.08.98, ROM H.08.02 (/sw/code/build/fish(ts_08_5))</example>
2337
2350
  <param pos="0" name="os.vendor" value="HP"/>
2338
2351
  <param pos="0" name="os.family" value="ProCurve"/>
@@ -2341,7 +2354,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2341
2354
  <param pos="2" name="os.version"/>
2342
2355
  </fingerprint>
2343
2356
  <fingerprint pattern="^HP ProCurve (\S+) - \d+ GE, ([A-Z]{1,2}\.[^,]+), .*$">
2344
- <description>HP ProCurve Switch</description>
2357
+ <description>HP ProCurve Switch - HP prefix variant</description>
2345
2358
  <example os.product="1810G" os.version="H.1.2">HP ProCurve 1810G - 8 GE, H.1.2, eCos-2.0</example>
2346
2359
  <example>HP ProCurve 1810G - 24 GE, P.1.14, eCos-2.0</example>
2347
2360
  <example>HP ProCurve 1810G - 8 GE, P.1.8, eCos-2.0</example>
@@ -2361,7 +2374,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2361
2374
  <param pos="1" name="os.version"/>
2362
2375
  </fingerprint>
2363
2376
  <fingerprint pattern="^ProCurve (\S+) (.*?) Switch, revision ([^,]+),.*$">
2364
- <description>HP ProCurve Switch</description>
2377
+ <description>HP ProCurve Switch - extended model variant</description>
2365
2378
  <example>ProCurve J9145A 2910al-24G Switch, revision W.14.03, ROM W.14.04 (/sw/code/build/sbm(t4a_RC3))</example>
2366
2379
  <example>ProCurve J9145A 2910al-24G Switch, revision W.14.30, ROM W.14.04 (/sw/code/build/sbm(t4a))</example>
2367
2380
  <example>ProCurve 516733-B21 6120XG Blade Switch, revision Z.14.26, ROM Z.14.09 (/sw/code/build/vern(Z_14_zinfip_t4b))</example>
@@ -2372,7 +2385,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2372
2385
  <param pos="1" name="hw.product"/>
2373
2386
  </fingerprint>
2374
2387
  <fingerprint pattern="^ProCurve (\S+) Switch ([^,]+), revision ([^,]+),.*$">
2375
- <description>HP Switch</description>
2388
+ <description>HP Switch - build path variant</description>
2376
2389
  <example>ProCurve j9020a Switch 2510-48, revision U.11.04, ROM R.10.06 (/sw/code/build/dosx(ndx))</example>
2377
2390
  <example>ProCurve j9020a Switch 2510-48, revision U.11.08, ROM R.10.06 (/sw/code/build/dosx(ndx))</example>
2378
2391
  <example>ProCurve j9020a Switch 2510-48, revision U.11.11, ROM R.10.06 (/sw/code/build/dosx(ndx))</example>
@@ -2384,7 +2397,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2384
2397
  <param pos="1" name="hw.product"/>
2385
2398
  </fingerprint>
2386
2399
  <fingerprint pattern="^HP(\S+) HP ProCurve Switch ([^,]+), revision ([^,]+),.*$">
2387
- <description>HP ProCurve Switch</description>
2400
+ <description>HP ProCurve Switch - model first variant</description>
2388
2401
  <example>HPJ3298A HP ProCurve Switch 212M, revision D.05.04, ROM D.05.01 (/sw/code/build/srao(f98))</example>
2389
2402
  <example>HPJ4121A HP ProCurve Switch 4000M, revision C.05.04, ROM C.05.02 (/sw/code/build/vgro(f98))</example>
2390
2403
  <example>HPJ4122A HP ProCurve Switch 2400M, revision C.05.04, ROM C.05.02 (/sw/code/build/vgro(f98))</example>
@@ -2395,7 +2408,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2395
2408
  <param pos="1" name="hw.product"/>
2396
2409
  </fingerprint>
2397
2410
  <fingerprint pattern="^HP (\S+) (\S+) Switch, revision ([^,]+),.*$">
2398
- <description>HP Switch</description>
2411
+ <description>HP Switch - rom variant</description>
2399
2412
  <example>HP J9145A E2910al-24G Switch, revision W.15.08.0007, ROM W.14.06 (/ws/swbuildm/rel_galt_qaoff/code/build/sbm(rel_galt_qaoff)) (Formerly ProCurve)</example>
2400
2413
  <example>HP J9623A E2620-24 Switch, revision RA.15.05.0006, ROM RA.15.10 (/sw/code/build/xform(RA_15_05)) (Formerly ProCurve)</example>
2401
2414
  <example>HP J9625A E2620-24-PoEP Switch, revision RA.15.05.0006, ROM RA.15.10 (/sw/code/build/xform(RA_15_05)) (Formerly ProCurve)</example>
@@ -2407,7 +2420,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2407
2420
  <param pos="1" name="hw.product"/>
2408
2421
  </fingerprint>
2409
2422
  <fingerprint pattern="^HP (\S+) Switch ([^,]+), revision ([^,]+),.*$">
2410
- <description>HP Switch</description>
2423
+ <description>HP Switch - extended model variant</description>
2411
2424
  <example>HP J8692A Switch E3500yl-24G, revision K.15.05.0002, ROM K.15.13 (/sw/code/build/btm(K_15_05)) (Formerly ProCurve)</example>
2412
2425
  <example>HP J8697A Switch E5406zl, revision K.15.06.0006, ROM K.15.19 (/sw/code/build/btm(K_15_06)) (Formerly ProCurve)</example>
2413
2426
  <example>HP J8698A Switch E5412zl, revision K.15.08.0007, ROM K.15.28 (/ws/swbuildm/rel_galt_qaoff/code/build/btm(rel_galt_qaoff)) (Formerly ProCurve)</example>
@@ -2443,7 +2456,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2443
2456
  <param pos="2" name="os.version"/>
2444
2457
  </fingerprint>
2445
2458
  <fingerprint pattern="^HP Pro[cC]urve Access Point (\S+): v(\S+).*$">
2446
- <description>HP ProCurve Wireless Access Point</description>
2459
+ <description>HP ProCurve Wireless Access Point - serial number variant</description>
2447
2460
  <example>HP ProCurve Access Point 420: v2.1.5 v3.0.6</example>
2448
2461
  <example>HP Procurve Access Point 420: v2.0.38 v1.1.8 SN:TW517QB0VM</example>
2449
2462
  <example>HP Procurve Access Point 420: v2.0.38 v1.1.8 SN:TW525QB1T8</example>
@@ -2464,7 +2477,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2464
2477
  <param pos="2" name="os.version"/>
2465
2478
  </fingerprint>
2466
2479
  <fingerprint pattern="^ProCurve Access Point (\S+(?: \S+)) ([^,]+), revision ([^,]+),.*$">
2467
- <description>HP ProCurve Wireless Access Point</description>
2480
+ <description>HP ProCurve Wireless Access Point - boot variant</description>
2468
2481
  <example>ProCurve Access Point 10ag WW J9141A, revision WM.01.11, boot version WAB.01.00</example>
2469
2482
  <example>ProCurve Access Point 530 NA J8986A, revision WA.02.15, boot version WAB.01.00</example>
2470
2483
  <example>ProCurve Access Point 530 NA J8986A, revision WA.02.19, boot version WAB.01.00</example>
@@ -2556,20 +2569,18 @@ Copyright (c) 1995-2005 by Cisco Systems
2556
2569
  <param pos="0" name="os.device" value="Storage"/>
2557
2570
  </fingerprint>
2558
2571
  <fingerprint pattern="^HP StorageWorks (P2000.*)$">
2559
- <description>HP StorageWorks Modular Smart Array</description>
2572
+ <description>HP StorageWorks Modular Smart Array - connection type variant</description>
2560
2573
  <example>HP StorageWorks P2000 G3 FC</example>
2561
2574
  <example>HP StorageWorks P2000 G3 SAS</example>
2562
2575
  <example>HP StorageWorks P2000 G3 iSCSI</example>
2563
2576
  <example>HP StorageWorks P2000G3 FC/iSCSI</example>
2564
- <example>HP StorageWorks P2000G3 FC/iSCSI</example>
2565
2577
  <param pos="0" name="os.vendor" value="HP"/>
2566
2578
  <param pos="0" name="os.family" value="StorageWorks"/>
2567
2579
  <param pos="1" name="os.product"/>
2568
2580
  <param pos="0" name="os.device" value="Storage"/>
2569
2581
  </fingerprint>
2570
2582
  <fingerprint pattern="^HP StorageWorks (\S+) Stackable Single Power Supply Fibre Channel Switch$">
2571
- <description>HP StorageWorks FC Switch</description>
2572
- <example>HP StorageWorks SN6000 Stackable Single Power Supply Fibre Channel Switch</example>
2583
+ <description>HP StorageWorks Stackable FC Switch</description>
2573
2584
  <example>HP StorageWorks SN6000 Stackable Single Power Supply Fibre Channel Switch</example>
2574
2585
  <param pos="0" name="os.vendor" value="HP"/>
2575
2586
  <param pos="0" name="os.family" value="StorageWorks"/>
@@ -2745,7 +2756,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2745
2756
  IBM
2746
2757
  =======================================================================-->
2747
2758
  <fingerprint pattern="^IBM RISC System/6000 .* Base Operating System AIX [^:]+: 03\.02\..*$">
2748
- <description>IBM AIX</description>
2759
+ <description>IBM AIX 3.2 on RS/6000</description>
2749
2760
  <example>IBM RISC System/6000 Machine Type: 0x0035 Processor id: 000018593500 The Base Operating System AIX version: 03.02.0000.0000 TCPIP Applications version: 03.02.0000.0000</example>
2750
2761
  <example>IBM RISC System/6000 Machine Type: 0x0100 Processor id: 000125576600 The Base Operating System AIX version: 03.02.0000.0000 TCPIP Applications version: 03.02.0000.0000</example>
2751
2762
  <param pos="0" name="os.vendor" value="IBM"/>
@@ -2756,7 +2767,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2756
2767
  <param pos="0" name="os.cpe23" value="cpe:/o:ibm:aix:3.2"/>
2757
2768
  </fingerprint>
2758
2769
  <fingerprint pattern="^RISC System/6000 .* Base Operating System Runtime AIX [^:]+: 04\.02\..*$">
2759
- <description>IBM AIX</description>
2770
+ <description>IBM AIX 4.2 on RS/6000</description>
2760
2771
  <example>RISC System/6000 Architecture Machine Type: 0x0800 Processor id: 000148364800 Base Operating System Runtime AIX version: 04.02.0001.0000 TCP/IP Client Support version: 04.02.0001.0000</example>
2761
2772
  <param pos="0" name="os.vendor" value="IBM"/>
2762
2773
  <param pos="0" name="os.product" value="AIX"/>
@@ -2766,7 +2777,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2766
2777
  <param pos="0" name="os.cpe23" value="cpe:/o:ibm:aix:4.2"/>
2767
2778
  </fingerprint>
2768
2779
  <fingerprint pattern="^RISC System/6000 .* Base Operating System Runtime AIX [^:]+: 04\.03\..*$">
2769
- <description>IBM AIX</description>
2780
+ <description>IBM AIX 4.3 on RS/6000</description>
2770
2781
  <example>RISC System/6000 Architecture Machine Type: 0x0400 Processor id: 000033407200 Base Operating System Runtime AIX version: 04.03.0003.0000 TCP/IP Client Support version: 04.03.0003.0000</example>
2771
2782
  <example>RISC System/6000 Architecture Machine Type: 0x0400 Processor id: 000055848900 Base Operating System Runtime AIX version: 04.03.0003.0075 TCP/IP Client Support version: 04.03.0003.0075</example>
2772
2783
  <example>RISC System/6000 Architecture Machine Type: 0x0400 Processor id: 000059987900 Base Operating System Runtime AIX version: 04.03.0003.0000 TCP/IP Client Support version: 04.03.0003.0000</example>
@@ -2781,7 +2792,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2781
2792
  <param pos="0" name="os.cpe23" value="cpe:/o:ibm:aix:4.3"/>
2782
2793
  </fingerprint>
2783
2794
  <fingerprint pattern="^(?:\S+ )?(?:Motorola PowerPC|IBM PowerPC|\S+ \S+ PowerPC IBM).*Base Operating System Runtime AIX [^:]+: 04\.02\..*$">
2784
- <description>IBM AIX</description>
2795
+ <description>IBM AIX 4.2 on PowerPC</description>
2785
2796
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 0040906A4C00 Base Operating System Runtime AIX version: 04.02.0001.0000 TCP/IP Client Support version: 04.02.0001.0000</example>
2786
2797
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 0044B47A4C00 Base Operating System Runtime AIX version: 04.02.0001.0000 TCP/IP Client Support version: 04.02.0001.0000</example>
2787
2798
  <example>IBM PowerPC Personal Computer.Machine Type: 0x0807004c Processor id: 003003334C00.Base Operating System Runtime AIX version: 04.02.0001.0000.TCP/IP Client Support version: 04.02.0001.0000</example>
@@ -2795,7 +2806,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2795
2806
  <param pos="0" name="os.cpe23" value="cpe:/o:ibm:aix:4.2"/>
2796
2807
  </fingerprint>
2797
2808
  <fingerprint pattern="^(?:\S+ )?(?:Motorola PowerPC|IBM PowerPC|\S+ \S+ PowerPC IBM).*Base Operating System Runtime AIX [^:]+: 04\.03\..*$">
2798
- <description>IBM AIX</description>
2809
+ <description>IBM AIX 4.3 on PowerPC</description>
2799
2810
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 0056BD5A4C00 Base Operating System Runtime AIX version: 04.03.0003.0075 TCP/IP Client Support version: 04.03.0003.0075</example>
2800
2811
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 005A269A4C00 Base Operating System Runtime AIX version: 04.03.0003.0075 TCP/IP Client Support version: 04.03.0003.0075</example>
2801
2812
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 005F153A4C00 Base Operating System Runtime AIX version: 04.03.0003.0075 TCP/IP Client Support version: 04.03.0003.0075</example>
@@ -2811,7 +2822,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2811
2822
  <param pos="0" name="os.cpe23" value="cpe:/o:ibm:aix:4.3"/>
2812
2823
  </fingerprint>
2813
2824
  <fingerprint pattern="^(?:\S+ )?(?:Motorola PowerPC|IBM PowerPC|\S+ \S+ PowerPC IBM).*Base Operating System Runtime AIX [^:]+: 05\.01\..*$">
2814
- <description>IBM AIX</description>
2825
+ <description>IBM AIX 5.1 on PowerPC</description>
2815
2826
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 0059B7BA4C00 Base Operating System Runtime AIX version: 05.01.0000.0051 TCP/IP Client Support version: 05.01.0000.0070</example>
2816
2827
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 009F12264C00 Base Operating System Runtime AIX version: 05.01.0000.0050 TCP/IP Client Support version: 05.01.0000.0050</example>
2817
2828
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 009F12284C00 Base Operating System Runtime AIX version: 05.01.0000.0050 TCP/IP Client Support version: 05.01.0000.0050</example>
@@ -2833,7 +2844,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2833
2844
  <param pos="0" name="os.cpe23" value="cpe:/o:ibm:aix:5.1"/>
2834
2845
  </fingerprint>
2835
2846
  <fingerprint pattern="^(?:\S+ )?(?:Motorola PowerPC|IBM PowerPC|\S+ \S+ PowerPC IBM).*Operating System Software: AIX version: 5\.1 Networking Software:.*$">
2836
- <description>IBM AIX</description>
2847
+ <description>IBM AIX 5.1 on PowerPC - network software variant</description>
2837
2848
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 0008FB8A4C00 Operating System Software: AIX version: 5.1 Networking Software: not available!</example>
2838
2849
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 000BD57F4C00 Operating System Software: AIX version: 5.1 Networking Software: not available!</example>
2839
2850
  <param pos="0" name="os.vendor" value="IBM"/>
@@ -2844,7 +2855,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2844
2855
  <param pos="0" name="os.cpe23" value="cpe:/o:ibm:aix:5.1"/>
2845
2856
  </fingerprint>
2846
2857
  <fingerprint pattern="^(?:\S+ )?(?:Motorola PowerPC|IBM PowerPC|\S+ \S+ PowerPC IBM).*Base Operating System Runtime AIX [^:]+: 05\.02\..*$">
2847
- <description>IBM AIX</description>
2858
+ <description>IBM AIX 5.2 on PowerPC</description>
2848
2859
  <example>IBM PowerPC CHRP Computer.Machine Type: 0x0800004c Processor id: 00C0E53F4C00.Base Operating System Runtime AIX version: 05.02.0000.0105.TCP/IP Client Support version: 05.02.0000.0107</example>
2849
2860
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 00CBEEFA4C00 Base Operating System Runtime AIX version: 05.02.0000.0075 TCP/IP Client Support version: 05.02.0000.0075</example>
2850
2861
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 00CC5C524C00 Base Operating System Runtime AIX version: 05.02.0000.0105 TCP/IP Client Support version: 05.02.0000.0115</example>
@@ -2870,7 +2881,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2870
2881
  <param pos="0" name="os.cpe23" value="cpe:/o:ibm:aix:5.2"/>
2871
2882
  </fingerprint>
2872
2883
  <fingerprint pattern="^(?:\S+ )?(?:Motorola PowerPC|IBM PowerPC|\S+ \S+ PowerPC IBM).*Base Operating System Runtime AIX [^:]+: 05\.03\..*$">
2873
- <description>IBM AIX</description>
2884
+ <description>IBM AIX 5.3 on PowerPC</description>
2874
2885
  <example>IBM PowerPC CHRP Computer.Machine Type: 0x0800004c Processor id: 000A3CD8D600.Base Operating System Runtime AIX version: 05.03.0000.0060.TCP/IP Client Support version: 05.03.0000.0063</example>
2875
2886
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 00F7BF9F4C00 Base Operating System Runtime AIX version: 05.03.0012.0001 TCP/IP Client Support version: 05.03.0012.0005</example>
2876
2887
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 00F7BFA04C00 Base Operating System Runtime AIX version: 05.03.0012.0001 TCP/IP Client Support version: 05.03.0012.0005</example>
@@ -2892,7 +2903,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2892
2903
  <param pos="0" name="os.cpe23" value="cpe:/o:ibm:aix:5.3"/>
2893
2904
  </fingerprint>
2894
2905
  <fingerprint pattern="^(?:\S+ )?(?:Motorola PowerPC|IBM PowerPC|\S+ \S+ PowerPC IBM).*Base Operating System Runtime VIOS [^:]+: 05\.03\..*$">
2895
- <description>IBM VIOS</description>
2906
+ <description>IBM VIOS 5.3 on PowerPC</description>
2896
2907
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 00018C4AD400 Base Operating System Runtime VIOS version: 05.03.0008.0000 TCP/IP Client Support version: 05.03.0008.0000</example>
2897
2908
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 0002EBDAD700 Base Operating System Runtime VIOS version: 05.03.0008.0000 TCP/IP Client Support version: 05.03.0008.0001</example>
2898
2909
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 0005EEE5D600 Base Operating System Runtime VIOS version: 05.03.0008.0000 TCP/IP Client Support version: 05.03.0008.0001</example>
@@ -2908,7 +2919,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2908
2919
  <param pos="0" name="os.cpe23" value="cpe:/o:ibm:vios:5.3"/>
2909
2920
  </fingerprint>
2910
2921
  <fingerprint pattern="^(?:\S+ )?(?:Motorola PowerPC|IBM PowerPC|\S+ \S+ PowerPC IBM).*Base Operating System Runtime AIX [^:]+: 06\.01\..*$">
2911
- <description>IBM AIX</description>
2922
+ <description>IBM AIX 6.1 on PowerPC</description>
2912
2923
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 00F77AEE4C00 Base Operating System Runtime AIX version: 06.01.0006.0015 TCP/IP Client Support version: 06.01.0006.0015</example>
2913
2924
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 00F77C9A4C00 Base Operating System Runtime AIX version: 06.01.0006.0015 TCP/IP Client Support version: 06.01.0006.0015</example>
2914
2925
  <example>IBM PowerPC CHRP Computer Machine Type: n ..8204-E8A*SN-n ..65B46C2 Serial Number: not available! Base Operating System Runtime AIX version: 06.01.0001.0000 TCP/IP Client Support version: 06.01.0001.0001</example>
@@ -2921,7 +2932,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2921
2932
  <param pos="0" name="os.cpe23" value="cpe:/o:ibm:aix:6.1"/>
2922
2933
  </fingerprint>
2923
2934
  <fingerprint pattern="^(?:\S+ )?(?:Motorola PowerPC|IBM PowerPC|\S+ \S+ PowerPC IBM).*Base Operating System Runtime VIOS [^:]+: 06\.01\..*$">
2924
- <description>IBM VIOS</description>
2935
+ <description>IBM VIOS 6.1 on PowerPC</description>
2925
2936
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 00055539D600 Base Operating System Runtime VIOS version: 06.01.0007.0000 TCP/IP Client Support version: 06.01.0005.0000</example>
2926
2937
  <param pos="0" name="os.vendor" value="IBM"/>
2927
2938
  <param pos="0" name="os.product" value="VIOS"/>
@@ -2930,7 +2941,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2930
2941
  <param pos="0" name="os.cpe23" value="cpe:/o:ibm:vios:6.1"/>
2931
2942
  </fingerprint>
2932
2943
  <fingerprint pattern="^(?:\S+ )?(?:Motorola PowerPC|IBM PowerPC|\S+ \S+ PowerPC IBM).*Base Operating System Runtime AIX [^:]+: 07\.01\..*$">
2933
- <description>IBM AIX</description>
2944
+ <description>IBM AIX 7.1 on PowerPC</description>
2934
2945
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 000B0148D700 Base Operating System Runtime AIX version: 07.01.0000.0015 TCP/IP Client Support version: 07.01.0000.0015</example>
2935
2946
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 00C5433C4C00 Base Operating System Runtime AIX version: 07.01.0001.0000 TCP/IP Client Support version: 07.01.0001.0003</example>
2936
2947
  <example>IBM PowerPC CHRP Computer Machine Type: 0x0800004c Processor id: 00F6FDC74C00 Base Operating System Runtime AIX version: 07.01.0001.0000 TCP/IP Client Support version: 07.01.0001.0002</example>
@@ -2942,7 +2953,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2942
2953
  <param pos="0" name="os.cpe23" value="cpe:/o:ibm:aix:7.1"/>
2943
2954
  </fingerprint>
2944
2955
  <fingerprint pattern="^(?:\S+ )?UNIX System Machine Type: not available.*Base Operating System Runtime AIX [^:]+: 05\.01\..*$">
2945
- <description>IBM AIX</description>
2956
+ <description>IBM AIX 5.1 - unknown machine type variant</description>
2946
2957
  <example>UNIX System Machine Type: not available! Processor id: 0001FDAF4C00 Base Operating System Runtime AIX version: 05.01.0000.0051 TCP/IP Client Support version: 05.01.0000.0070</example>
2947
2958
  <param pos="0" name="os.vendor" value="IBM"/>
2948
2959
  <param pos="0" name="os.product" value="AIX"/>
@@ -2951,7 +2962,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2951
2962
  <param pos="0" name="os.cpe23" value="cpe:/o:ibm:aix:5.1"/>
2952
2963
  </fingerprint>
2953
2964
  <fingerprint pattern="^(?:\S+ )?UNIX System Machine Type: not available.*Base Operating System Runtime AIX [^:]+: 05\.02\..*$">
2954
- <description>IBM AIX</description>
2965
+ <description>IBM AIX 5.2 - unknown machine type variant</description>
2955
2966
  <example>UNIX System Machine Type: not available! Processor id: 0001FDAF4C00 Base Operating System Runtime AIX version: 05.02.0000.0105 TCP/IP Client Support version: 05.02.0000.0107</example>
2956
2967
  <param pos="0" name="os.vendor" value="IBM"/>
2957
2968
  <param pos="0" name="os.product" value="AIX"/>
@@ -2960,7 +2971,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2960
2971
  <param pos="0" name="os.cpe23" value="cpe:/o:ibm:aix:5.2"/>
2961
2972
  </fingerprint>
2962
2973
  <fingerprint pattern="^(?:\S+ )?UNIX System Machine Type: not available.*Base Operating System Runtime AIX [^:]+: 05\.03\..*$">
2963
- <description>IBM AIX</description>
2974
+ <description>IBM AIX 5.3 - unknown machine type variant</description>
2964
2975
  <example>UNIX System Machine Type: not available! Processor id: 0001FDAF4C00 Base Operating System Runtime AIX version: 05.03.0000.0050 TCP/IP Client Support version: 05.03.0000.0053</example>
2965
2976
  <param pos="0" name="os.vendor" value="IBM"/>
2966
2977
  <param pos="0" name="os.product" value="AIX"/>
@@ -2969,7 +2980,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2969
2980
  <param pos="0" name="os.cpe23" value="cpe:/o:ibm:aix:5.3"/>
2970
2981
  </fingerprint>
2971
2982
  <fingerprint pattern="^(?:\S+ )?UNIX System Machine Type: not available.*Base Operating System Runtime AIX [^:]+: 06\.01\..*$">
2972
- <description>IBM AIX</description>
2983
+ <description>IBM AIX 6.1 - unknown machine type variant</description>
2973
2984
  <example>UNIX System Machine Type: not available! Processor id: 0001FDAF4C00 Base Operating System Runtime AIX version: 06.01.0007.0000 TCP/IP Client Support version: 06.01.0005.0000</example>
2974
2985
  <param pos="0" name="os.vendor" value="IBM"/>
2975
2986
  <param pos="0" name="os.product" value="AIX"/>
@@ -2978,7 +2989,7 @@ Copyright (c) 1995-2005 by Cisco Systems
2978
2989
  <param pos="0" name="os.cpe23" value="cpe:/o:ibm:aix:6.1"/>
2979
2990
  </fingerprint>
2980
2991
  <fingerprint pattern="^(?:\S+ )?UNIX System Machine Type: not available.*Base Operating System Runtime AIX [^:]+: 07\.01\..*$">
2981
- <description>IBM AIX</description>
2992
+ <description>IBM AIX 7.1 - unknown machine type variant</description>
2982
2993
  <example>UNIX System Machine Type: not available! Processor id: 0001FDAF4C00 Base Operating System Runtime AIX version: 07.01.0001.0000 TCP/IP Client Support version: 07.01.0001.0002</example>
2983
2994
  <param pos="0" name="os.vendor" value="IBM"/>
2984
2995
  <param pos="0" name="os.product" value="AIX"/>
@@ -3089,7 +3100,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3089
3100
  <param pos="2" name="os.version"/>
3090
3101
  </fingerprint>
3091
3102
  <fingerprint pattern="^Juniper Networks,Inc,([^,]+),([^,]+) \(build (\d+)\)$">
3092
- <description>Juniper Router</description>
3103
+ <description>Juniper Router - build variant</description>
3093
3104
  <example>Juniper Networks,Inc,MAG-4610,7.1R6 (build 20169)</example>
3094
3105
  <example>Juniper Networks,Inc,MAG-4610,7.1R7:HF2 (build 21415)</example>
3095
3106
  <example>Juniper Networks,Inc,MAG-4610,7.3R1:B2 (build 21317)</example>
@@ -3137,7 +3148,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3137
3148
  <param pos="1" name="os.product"/>
3138
3149
  </fingerprint>
3139
3150
  <fingerprint pattern="^Juniper Networks, Inc\. (?:(?:Dell|DELL) )?(\S+) internet router, kernel JUNOS (\S+?),? .*$">
3140
- <description>Juniper Router</description>
3151
+ <description>Juniper Router - build path variant</description>
3141
3152
  <example hw.model="J-EX4200-24T" os.version="11.1R3.5">Juniper Networks, Inc. DELL J-EX4200-24T internet router, kernel JUNOS 11.1R3.5 #0: 2011-06-25 01:18:46 UTC builder@briath.juniper.net:/volume/build/junos/11.1/release/11.1R3.5/obj-powerpc/bsd/kernels/JUNIPER-EX/kernel Build date: 2011-06-25 01:01:37</example>
3142
3153
  <example os.version="11.4R1.6">Juniper Networks, Inc. ex4200-48p internet router, kernel JUNOS 11.4R1.6 #0: 2011-11-15 11:14:01 UTC builder@evenath.juniper.net:/volume/build/junos/11.4/release/11.4R1.6/obj-powerpc/bsd/kernels/JUNIPER-EX/kernel Build date: 2011-11-15 10:35:08 UTC C</example>
3143
3154
  <example os.version="9.2R4.4">Juniper Networks, Inc. t640 internet router, kernel JUNOS 9.2R4.4 #0: 2009-05-27 07:54:10 UTC builder@amalath.juniper.net:/volume/build/junos/9.2/release/9.2R4.4/obj-i386/sys/compile/JUNIPER Build date: 2009-05-27 08:11:51 UTC Copyright (c) 1996-2009</example>
@@ -3171,7 +3182,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3171
3182
  <param pos="2" name="os.version"/>
3172
3183
  </fingerprint>
3173
3184
  <fingerprint pattern="^Juniper Networks, Inc\. (\S+) Edge Switch Router SW Version : \((\S+) (\S+) \[BuildId (\d+)\]\) .*$">
3174
- <description>Juniper Edge Routing Switch</description>
3185
+ <description>Juniper Edge Routing Switch - variant 1</description>
3175
3186
  <example>Juniper Networks, Inc. RX1400 Edge Switch Router SW Version : (10.3.2 patch-0.2 [BuildId 12841]) Build Date : February 3, 2011 16:26 Copyright (c) 1999, 2001 Juniper Networks, Inc.</example>
3176
3187
  <param pos="0" name="os.vendor" value="Juniper"/>
3177
3188
  <param pos="0" name="os.device" value="Switch"/>
@@ -3189,7 +3200,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3189
3200
  <param pos="2" name="os.version"/>
3190
3201
  </fingerprint>
3191
3202
  <fingerprint pattern="^Juniper Networks, Inc. SRC-PE (C\d+)$">
3192
- <description>Juniper Edge Routing Switch</description>
3203
+ <description>Juniper Edge Routing Switch - SRC-PE</description>
3193
3204
  <example>Juniper Networks, Inc. SRC-PE C2000</example>
3194
3205
  <example>Juniper Networks, Inc. SRC-PE C4000</example>
3195
3206
  <param pos="0" name="os.vendor" value="Juniper"/>
@@ -3241,13 +3252,14 @@ Copyright (c) 1995-2005 by Cisco Systems
3241
3252
  <param pos="1" name="os.product"/>
3242
3253
  </fingerprint>
3243
3254
  <!-- These devices are all some form of device/terminal/serial/console server -->
3244
- <fingerprint pattern="^Lantronix ((MSS|SCS|LRS|ETS|EDS)\S+) (?:Version |[VB])?([^/\(\s]+)[/\(\s]?.*$">
3255
+ <fingerprint pattern="^(?i:Lantronix) ((MSS|SCS|LRS|ETS|EDS)\S+) (?:Version |[VB])?([^/\(\s]+)[/\(\s]?.*$">
3245
3256
  <description>Lantronix terminal server</description>
3246
3257
  <example>Lantronix MSS100 Version V3.6/9(030114)</example>
3247
3258
  <example>Lantronix EDS8PS V4.1.0.2R17 (03111515KK9H)</example>
3248
3259
  <example>Lantronix ETS8P Version V3.6/4(000712)</example>
3249
3260
  <example>Lantronix SCS400 Version B2.0/504(040415)</example>
3250
3261
  <example>Lantronix LRS2 Version V1.3/4(980529)</example>
3262
+ <example>LANTRONIX ETS-16 Version V2.2/45(940822)</example>
3251
3263
  <param pos="0" name="os.vendor" value="Lantronix"/>
3252
3264
  <param pos="0" name="os.device" value="Terminal Server"/>
3253
3265
  <param pos="1" name="os.product"/>
@@ -3255,22 +3267,13 @@ Copyright (c) 1995-2005 by Cisco Systems
3255
3267
  <param pos="3" name="os.version"/>
3256
3268
  </fingerprint>
3257
3269
  <fingerprint pattern="^Lantronix ((EDS)\S+)$">
3258
- <description>Lantronix terminal server</description>
3270
+ <description>Lantronix terminal server - model only variant</description>
3259
3271
  <example>Lantronix EDS16PR</example>
3260
3272
  <param pos="0" name="os.vendor" value="Lantronix"/>
3261
3273
  <param pos="0" name="os.device" value="Terminal Server"/>
3262
3274
  <param pos="1" name="os.product"/>
3263
3275
  <param pos="2" name="os.family"/>
3264
3276
  </fingerprint>
3265
- <fingerprint pattern="^LANTRONIX ((ETS)\S+) Version [VB]?([^/\(\s]+)[/\(\s]?.*$">
3266
- <description>Lantronix terminal server</description>
3267
- <example>LANTRONIX ETS-16 Version V2.2/45(940822)</example>
3268
- <param pos="0" name="os.vendor" value="Lantronix"/>
3269
- <param pos="0" name="os.device" value="Terminal Server"/>
3270
- <param pos="1" name="os.product"/>
3271
- <param pos="2" name="os.family"/>
3272
- <param pos="3" name="os.version"/>
3273
- </fingerprint>
3274
3277
  <fingerprint pattern="^Lantronix Inc\. - (Modbus Bridge)$">
3275
3278
  <description>Lantronix modbus bridge</description>
3276
3279
  <example>Lantronix Inc. - Modbus Bridge</example>
@@ -3299,7 +3302,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3299
3302
  <param pos="1" name="os.product"/>
3300
3303
  </fingerprint>
3301
3304
  <fingerprint pattern="^Lantronix (X[pP]ort \S+) V(\S+) \(.*\)\s*$">
3302
- <description>Lantronix XPort serial to ethernet adapter</description>
3305
+ <description>Lantronix XPort serial to ethernet adapter - version and serial variant</description>
3303
3306
  <example>Lantronix XPort AR V4.0.0.0R16 (0)</example>
3304
3307
  <example>Lantronix XPort AR V4.0.0.0R16 (064907012804)</example>
3305
3308
  <example>Lantronix XPort AR V4.0.0.0R16 (070407018581)</example>
@@ -3400,7 +3403,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3400
3403
  <param pos="3" name="os.version"/>
3401
3404
  </fingerprint>
3402
3405
  <fingerprint pattern="^Lantronix ((NTS)\S*) V(\S+)$">
3403
- <description>Lantronix NTS</description>
3406
+ <description>Lantronix NTS - variant 1</description>
3404
3407
  <example>Lantronix NTS1536-076 V3.8</example>
3405
3408
  <param pos="0" name="os.vendor" value="Lantronix"/>
3406
3409
  <param pos="0" name="os.device" value="Terminal Server"/>
@@ -3469,8 +3472,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3469
3472
  <param pos="2" name="os.version"/>
3470
3473
  </fingerprint>
3471
3474
  <fingerprint pattern="^Lexmark Forms Printer (\S+(?: plus)?) +version (\S+).*$">
3472
- <description>Lexmark Optra Laser Printer</description>
3473
- <example>Lexmark Forms Printer 2580 version LC.CO.N061 kernel 2.6.10 All-N-1</example>
3475
+ <description>Lexmark Forms Printer</description>
3474
3476
  <example>Lexmark Forms Printer 2580 version LC.CO.N061 kernel 2.6.10 All-N-1</example>
3475
3477
  <example>Lexmark Forms Printer 2580 version LCL.CU.P105 kernel 2.6.10 All-N-1</example>
3476
3478
  <example>Lexmark Forms Printer 2581 version LCL.CU.P105 kernel 2.6.10 All-N-1</example>
@@ -3479,7 +3481,6 @@ Copyright (c) 1995-2005 by Cisco Systems
3479
3481
  <example>Lexmark Forms Printer 2590 version LCL.CU.P105 kernel 2.6.10 All-N-1</example>
3480
3482
  <example>Lexmark Forms Printer 2591 version LCL.CU.P103 kernel 2.6.10 All-N-1</example>
3481
3483
  <example>Lexmark Forms Printer 4227 plus version LC.CO.N061 kernel 2.6.10 All-N-1</example>
3482
- <example>Lexmark Forms Printer 4227 plus version LC.CO.N061 kernel 2.6.10 All-N-1</example>
3483
3484
  <param pos="0" name="os.certainty" value="1.0"/>
3484
3485
  <param pos="0" name="os.vendor" value="Lexmark"/>
3485
3486
  <param pos="0" name="os.family" value="Forms Printer"/>
@@ -3499,7 +3500,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3499
3500
  <param pos="2" name="os.version"/>
3500
3501
  </fingerprint>
3501
3502
  <fingerprint pattern="^(?:Lexmark|LEXMARK) (\S+) [vV]ersion (\S+).*$">
3502
- <description>Lexmark Printer</description>
3503
+ <description>Lexmark Printer - no kernel variant</description>
3503
3504
  <example>LEXMARK X204 version NM.APS.N058 kernel 2.6.18.5 All-N-1</example>
3504
3505
  <example>Lexmark C720 Version 3.19.12 Ethernet 10/100.</example>
3505
3506
  <example>Lexmark C720 Version 3.20.11 Ethernet 10/100.</example>
@@ -3517,7 +3518,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3517
3518
  <param pos="2" name="os.version"/>
3518
3519
  </fingerprint>
3519
3520
  <fingerprint pattern="^Lexmark ([^;]+); Net.*ESS ([^,]+),IOT (\S+)$">
3520
- <description>Lexmark Printer</description>
3521
+ <description>Lexmark Printer - net variant</description>
3521
3522
  <example>Lexmark X560n; Net 11.73,ESS 200709260947,IOT 05.10.00</example>
3522
3523
  <example>Lexmark X560n; Net 11.77,ESS 200805220849,IOT 05.10.00</example>
3523
3524
  <param pos="0" name="os.vendor" value="Lexmark"/>
@@ -3527,14 +3528,14 @@ Copyright (c) 1995-2005 by Cisco Systems
3527
3528
  <param pos="2" name="os.version.version"/>
3528
3529
  </fingerprint>
3529
3530
  <fingerprint pattern="^Lexmark (\S+(?: \S+)?) Print Server$">
3530
- <description>Lexmark Printer</description>
3531
+ <description>Lexmark Printer - print server variant</description>
3531
3532
  <example>Lexmark C500 PS Print Server</example>
3532
3533
  <param pos="0" name="os.vendor" value="Lexmark"/>
3533
3534
  <param pos="0" name="os.device" value="Print Server"/>
3534
3535
  <param pos="1" name="os.product"/>
3535
3536
  </fingerprint>
3536
3537
  <fingerprint pattern="^Lexmark (\S+) Series$">
3537
- <description>Lexmark Printer</description>
3538
+ <description>Lexmark Printer - no software version variant</description>
3538
3539
  <example>Lexmark X500 Series</example>
3539
3540
  <param pos="0" name="os.vendor" value="Lexmark"/>
3540
3541
  <param pos="0" name="os.device" value="Printer"/>
@@ -3575,7 +3576,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3575
3576
  <param pos="0" name="os.device" value="Printer"/>
3576
3577
  </fingerprint>
3577
3578
  <fingerprint pattern="^KYOCERA Printer I/F (IB-.*) Ver .*$">
3578
- <description>KYOCERA MITA printer</description>
3579
+ <description>KYOCERA MITA printer - version variant</description>
3579
3580
  <example>KYOCERA Printer I/F IB-23 Ver 1.1.0</example>
3580
3581
  <example>KYOCERA Printer I/F IB-20/21 Ver 1.1.1</example>
3581
3582
  <param pos="0" name="os.certainty" value="0.5"/>
@@ -3801,7 +3802,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3801
3802
  address.
3802
3803
  -->
3803
3804
  <fingerprint pattern="^Linux (?:SUNSP00144F\S+) (\S*).* (\S+)$">
3804
- <description>Ubuntu Linux 7.04</description>
3805
+ <description>Yellow Dog (Sun) Linux</description>
3805
3806
  <example os.arch="ppc" linux.kernel.version="2.4.22">Linux SUNSP00144F9E0508 2.4.22 #1 Sat Apr 21 11:28:21 PDT 2007 ppc</example>
3806
3807
  <param pos="0" name="os.certainty" value="0.9"/>
3807
3808
  <param pos="0" name="os.family" value="Linux"/>
@@ -3829,7 +3830,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3829
3830
  specific pattern available.
3830
3831
  -->
3831
3832
  <fingerprint pattern="^Linux (.*?) ([0-9]+\.[0-9]+\.[0-9]+\S*).* (?:[0-9]{4}|[A-Z][A-Z][A-Z]{1,2}|\+[0-9]+|Local time.*(?:manual|zic|m\S*)) (\S+).*$">
3832
- <description>Linux Generic</description>
3833
+ <description>Linux x86_64 Generic - hostname variant</description>
3833
3834
  <example os.arch="x86_64" os.version="2.6.9" linux.kernel.version="2.6.9" host.name="hostname">Linux hostname 2.6.9 #2 SMP Tue Jun 26 16:10:49 EDT 2012 x86_64</example>
3834
3835
  <param pos="0" name="os.certainty" value="0.5"/>
3835
3836
  <param pos="0" name="os.family" value="Linux"/>
@@ -3850,7 +3851,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3850
3851
  <param pos="2" name="os.arch"/>
3851
3852
  </fingerprint>
3852
3853
  <fingerprint pattern="^Linux (.*?) ([0-9]+\.[0-9]+\.[0-9]+\S*) (\S+)$">
3853
- <description>Linux Generic</description>
3854
+ <description>Linux Generic - hostname/kernel/arch variant</description>
3854
3855
  <example>Linux hostname 2.6.9 x86_64</example>
3855
3856
  <param pos="0" name="os.certainty" value="0.5"/>
3856
3857
  <param pos="0" name="os.family" value="Linux"/>
@@ -3861,7 +3862,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3861
3862
  <param pos="3" name="os.arch"/>
3862
3863
  </fingerprint>
3863
3864
  <fingerprint pattern="^Linux ([0-9]+\.[0-9]+\.[0-9]+\S*) (\S+)$">
3864
- <description>Linux Generic</description>
3865
+ <description>Linux Generic - kernel/arch variant</description>
3865
3866
  <example>Linux 2.6.9 x86_64</example>
3866
3867
  <param pos="0" name="os.certainty" value="0.5"/>
3867
3868
  <param pos="0" name="os.family" value="Linux"/>
@@ -3871,7 +3872,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3871
3872
  <param pos="2" name="os.arch"/>
3872
3873
  </fingerprint>
3873
3874
  <fingerprint pattern="^Linux (.*?) ([0-9]+\.[0-9]+\.[0-9]+\S*)$">
3874
- <description>Linux Generic</description>
3875
+ <description>Linux Generic - hostname/kernel variant</description>
3875
3876
  <example>Linux hostname 2.6.9</example>
3876
3877
  <param pos="0" name="os.certainty" value="0.5"/>
3877
3878
  <param pos="0" name="os.family" value="Linux"/>
@@ -3881,7 +3882,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3881
3882
  <param pos="2" name="linux.kernel.version"/>
3882
3883
  </fingerprint>
3883
3884
  <fingerprint pattern="^Linux ([0-9]+\.[0-9]+\.[0-9]+\S*)$">
3884
- <description>Linux Generic</description>
3885
+ <description>Linux Generic - kernel variant</description>
3885
3886
  <example>Linux 2.6.9</example>
3886
3887
  <param pos="0" name="os.certainty" value="0.5"/>
3887
3888
  <param pos="0" name="os.family" value="Linux"/>
@@ -3890,7 +3891,7 @@ Copyright (c) 1995-2005 by Cisco Systems
3890
3891
  <param pos="1" name="linux.kernel.version"/>
3891
3892
  </fingerprint>
3892
3893
  <fingerprint pattern="^Linux (\S+)$">
3893
- <description>Linux Generic</description>
3894
+ <description>Linux Generic - hostname variant</description>
3894
3895
  <example>Linux hostname</example>
3895
3896
  <param pos="0" name="os.certainty" value="0.5"/>
3896
3897
  <param pos="0" name="os.family" value="Linux"/>
@@ -4166,7 +4167,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4166
4167
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_7:-"/>
4167
4168
  </fingerprint>
4168
4169
  <fingerprint pattern="^Hardware: x86.*Software: Windows Version 6.1 \(Build 7601.*$">
4169
- <description>Windows 7 on x86</description>
4170
+ <description>Windows 7 SP1 on x86</description>
4170
4171
  <example>Hardware: x86 Family 15 Model 2 Stepping 5 AT/AT COMPATIBLE - Software: Windows Version 6.1 (Build 7601 Multiprocessor Free)</example>
4171
4172
  <param pos="0" name="os.vendor" value="Microsoft"/>
4172
4173
  <param pos="0" name="os.family" value="Windows"/>
@@ -4176,7 +4177,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4176
4177
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_7:SP1"/>
4177
4178
  </fingerprint>
4178
4179
  <fingerprint pattern="^Hardware: \S+64.*Software: Windows Version 6.1 \(Build 7601.*$">
4179
- <description>Windows 7 on x86_64</description>
4180
+ <description>Windows 7 SP1 on x86_64</description>
4180
4181
  <example>Hardware: AMD64 Family 16 Model 2 Stepping 3 AT/AT COMPATIBLE - Software: Windows Version 6.1 (Build 7601 Multiprocessor Free)</example>
4181
4182
  <example>Hardware: Intel64 Family 15 Model 2 Stepping 5 AT/AT COMPATIBLE - Software: Windows Version 6.1 (Build 7601 Multiprocessor Free)</example>
4182
4183
  <param pos="0" name="os.vendor" value="Microsoft"/>
@@ -4205,7 +4206,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4205
4206
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_8:-"/>
4206
4207
  </fingerprint>
4207
4208
  <fingerprint pattern="^Hardware: \S+64.*Software: Windows Version 6.3 \(Build 9600">
4208
- <description>Windows 8 on x86_64</description>
4209
+ <description>Windows 8.1 on x86_64</description>
4209
4210
  <example>Hardware: AMD64 Family 21 Model 0 Stepping 2 AT/AT COMPATIBLE - Software: Windows Version 6.3 (Build 9600 Multiprocessor Free)</example>
4210
4211
  <param pos="0" name="os.vendor" value="Microsoft"/>
4211
4212
  <param pos="0" name="os.family" value="Windows"/>
@@ -4214,7 +4215,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4214
4215
  <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_8.1:-"/>
4215
4216
  </fingerprint>
4216
4217
  <fingerprint pattern="^Hardware: x86.*Software: Windows Version 6.3 \(Build 9600">
4217
- <description>Windows 8 on x86</description>
4218
+ <description>Windows 8.1 on x86</description>
4218
4219
  <example>Hardware: x86 Family 21 Model 0 Stepping 2 AT/AT COMPATIBLE - Software: Windows Version 6.3 (Build 9600 Multiprocessor Free)</example>
4219
4220
  <param pos="0" name="os.vendor" value="Microsoft"/>
4220
4221
  <param pos="0" name="os.family" value="Windows"/>
@@ -4258,7 +4259,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4258
4259
  Neoscale
4259
4260
  =======================================================================-->
4260
4261
  <fingerprint pattern="^Neoscale CryptoStore\(TM\) (\S+)$">
4261
- <description>NetApp filer</description>
4262
+ <description>Neoscale CryptoStore</description>
4262
4263
  <example>Neoscale CryptoStore(TM) neoaht2</example>
4263
4264
  <example>Neoscale CryptoStore(TM) neoaht3</example>
4264
4265
  <param pos="0" name="os.vendor" value="Neoscale"/>
@@ -4364,7 +4365,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4364
4365
  <param pos="2" name="os.version"/>
4365
4366
  </fingerprint>
4366
4367
  <fingerprint pattern="^Ethernet Switch (\S+).*SW:v([\d.]+).*$">
4367
- <description>Nortel BayStack switch</description>
4368
+ <description>Nortel BayStack switch - variant 1</description>
4368
4369
  <example>Ethernet Switch 470-48T HW:#05 FW:3.6.0.6 SW:v3.6.2.04 BN:4 ISVN:2 (c) Nortel Networks</example>
4369
4370
  <param pos="0" name="os.certainty" value="1.0"/>
4370
4371
  <param pos="0" name="os.vendor" value="Nortel"/>
@@ -4374,7 +4375,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4374
4375
  <param pos="2" name="os.version"/>
4375
4376
  </fingerprint>
4376
4377
  <fingerprint pattern="^Bay Networks, Inc\. BayStack (\S+) Ethernet Switch Rev: (.+)$">
4377
- <description>Nortel BayStack switch</description>
4378
+ <description>Nortel BayStack switch - variant 2</description>
4378
4379
  <example>Bay Networks, Inc. BayStack 303 Ethernet Switch Rev: 2.2.32.19-2.1.4.16</example>
4379
4380
  <param pos="0" name="os.vendor" value="Nortel"/>
4380
4381
  <param pos="0" name="os.family" value="BayStack"/>
@@ -4383,7 +4384,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4383
4384
  <param pos="2" name="os.version"/>
4384
4385
  </fingerprint>
4385
4386
  <fingerprint pattern="^BayStack (\S+), version (\S+) \(.*\)$">
4386
- <description>Nortel BayStack switch</description>
4387
+ <description>Nortel BayStack switch - variant 3</description>
4387
4388
  <example>BayStack 301, version 1.0.0 (96120629)</example>
4388
4389
  <param pos="0" name="os.vendor" value="Nortel"/>
4389
4390
  <param pos="0" name="os.family" value="BayStack"/>
@@ -4522,10 +4523,10 @@ Copyright (c) 1995-2005 by Cisco Systems
4522
4523
  Novell Netware has two different version numbers. Luckily, Novell
4523
4524
  has provided us with a version decoder ring, located here:
4524
4525
 
4525
- http://wiki.novell.com/index.php/Version_Decoder_Ring
4526
+ https://wiki.microfocus.com/index.php/Version_Decoder_Ring
4526
4527
  -->
4527
4528
  <fingerprint pattern="^Novell NetWare v3\.12.*8/12/93$">
4528
- <description>Novell NetWare</description>
4529
+ <description>Novell NetWare 3.12</description>
4529
4530
  <example>Novell NetWare v3.12 (100 user) 8/12/93</example>
4530
4531
  <param pos="0" name="os.certainty" value="1.0"/>
4531
4532
  <param pos="0" name="os.vendor" value="Novell"/>
@@ -4535,7 +4536,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4535
4536
  <param pos="0" name="os.cpe23" value="cpe:/o:novell:netware:3.12"/>
4536
4537
  </fingerprint>
4537
4538
  <fingerprint pattern="^Novell NetWare 5\.00\.09 *September 21, 2000$">
4538
- <description>Novell NetWare</description>
4539
+ <description>Novell NetWare 5.1 SP2</description>
4539
4540
  <example>Novell NetWare 5.00.09 September 21, 2000</example>
4540
4541
  <param pos="0" name="os.certainty" value="1.0"/>
4541
4542
  <param pos="0" name="os.vendor" value="Novell"/>
@@ -4545,7 +4546,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4545
4546
  <param pos="0" name="os.cpe23" value="cpe:/o:novell:netware:5.1 SP2"/>
4546
4547
  </fingerprint>
4547
4548
  <fingerprint pattern="^Novell NetWare 5\.00\.10 *July 10, 2002$">
4548
- <description>Novell NetWare</description>
4549
+ <description>Novell NetWare 5.1 SP5</description>
4549
4550
  <example>Novell NetWare 5.00.10 July 10, 2002</example>
4550
4551
  <param pos="0" name="os.certainty" value="1.0"/>
4551
4552
  <param pos="0" name="os.vendor" value="Novell"/>
@@ -4555,7 +4556,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4555
4556
  <param pos="0" name="os.cpe23" value="cpe:/o:novell:netware:5.1 SP5"/>
4556
4557
  </fingerprint>
4557
4558
  <fingerprint pattern="^Novell NetWare 5\.00\.10 *December 9, 2003$">
4558
- <description>Novell NetWare</description>
4559
+ <description>Novell NetWare 5.1 SP7</description>
4559
4560
  <example>Novell NetWare 5.00.10 December 9, 2003</example>
4560
4561
  <param pos="0" name="os.certainty" value="1.0"/>
4561
4562
  <param pos="0" name="os.vendor" value="Novell"/>
@@ -4565,7 +4566,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4565
4566
  <param pos="0" name="os.cpe23" value="cpe:/o:novell:netware:5.1 SP7"/>
4566
4567
  </fingerprint>
4567
4568
  <fingerprint pattern="^Novell NetWare 5\.00\.11 *January 19, 2005$">
4568
- <description>Novell NetWare</description>
4569
+ <description>Novell NetWare 5.1 SP8</description>
4569
4570
  <example>Novell NetWare 5.00.11 January 19, 2005</example>
4570
4571
  <param pos="0" name="os.certainty" value="1.0"/>
4571
4572
  <param pos="0" name="os.vendor" value="Novell"/>
@@ -4575,7 +4576,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4575
4576
  <param pos="0" name="os.cpe23" value="cpe:/o:novell:netware:5.1 SP8"/>
4576
4577
  </fingerprint>
4577
4578
  <fingerprint pattern="^Novell NetWare 5\.60\.03 *March 27, 2003$">
4578
- <description>Novell NetWare</description>
4579
+ <description>Novell NetWare 6.0 SP3</description>
4579
4580
  <example>Novell NetWare 5.60.03 March 27, 2003</example>
4580
4581
  <param pos="0" name="os.certainty" value="1.0"/>
4581
4582
  <param pos="0" name="os.vendor" value="Novell"/>
@@ -4585,7 +4586,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4585
4586
  <param pos="0" name="os.cpe23" value="cpe:/o:novell:netware:6.0 SP3"/>
4586
4587
  </fingerprint>
4587
4588
  <fingerprint pattern="^Novell NetWare 5\.60\.05 *May 27, 2004$">
4588
- <description>Novell NetWare</description>
4589
+ <description>Novell NetWare 6.0 SP5</description>
4589
4590
  <example>Novell NetWare 5.60.05 May 27, 2004</example>
4590
4591
  <param pos="0" name="os.certainty" value="1.0"/>
4591
4592
  <param pos="0" name="os.vendor" value="Novell"/>
@@ -4595,7 +4596,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4595
4596
  <param pos="0" name="os.cpe23" value="cpe:/o:novell:netware:6.0 SP5"/>
4596
4597
  </fingerprint>
4597
4598
  <fingerprint pattern="^Novell NetWare 5\.70\.02 *June 11, 2004$">
4598
- <description>Novell NetWare</description>
4599
+ <description>Novell NetWare 6.5 SP2</description>
4599
4600
  <example>Novell NetWare 5.70.02 June 11, 2004</example>
4600
4601
  <param pos="0" name="os.certainty" value="1.0"/>
4601
4602
  <param pos="0" name="os.vendor" value="Novell"/>
@@ -4605,7 +4606,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4605
4606
  <param pos="0" name="os.cpe23" value="cpe:/o:novell:netware:6.5 SP2"/>
4606
4607
  </fingerprint>
4607
4608
  <fingerprint pattern="^Novell NetWare 5\.70\.03 *January 20, 2005$">
4608
- <description>Novell NetWare</description>
4609
+ <description>Novell NetWare 6.5 SP3</description>
4609
4610
  <example>Novell NetWare 5.70.03 January 20, 2005</example>
4610
4611
  <param pos="0" name="os.certainty" value="1.0"/>
4611
4612
  <param pos="0" name="os.vendor" value="Novell"/>
@@ -4615,7 +4616,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4615
4616
  <param pos="0" name="os.cpe23" value="cpe:/o:novell:netware:6.5 SP3"/>
4616
4617
  </fingerprint>
4617
4618
  <fingerprint pattern="^Novell NetWare 5\.70\.03 *May 23, 2005$">
4618
- <description>Novell NetWare</description>
4619
+ <description>Novell NetWare 6.5 SP3 CPR</description>
4619
4620
  <example>Novell NetWare 5.70.03 May 23, 2005</example>
4620
4621
  <param pos="0" name="os.certainty" value="1.0"/>
4621
4622
  <param pos="0" name="os.vendor" value="Novell"/>
@@ -4625,7 +4626,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4625
4626
  <param pos="0" name="os.cpe23" value="cpe:/o:novell:netware:6.5 SP3 CPR"/>
4626
4627
  </fingerprint>
4627
4628
  <fingerprint pattern="^Novell NetWare 5\.70\.04 *August 15, 2005$">
4628
- <description>Novell NetWare</description>
4629
+ <description>Novell NetWare 6.5 SP4</description>
4629
4630
  <example>Novell NetWare 5.70.04 August 15, 2005</example>
4630
4631
  <param pos="0" name="os.certainty" value="1.0"/>
4631
4632
  <param pos="0" name="os.vendor" value="Novell"/>
@@ -4635,7 +4636,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4635
4636
  <param pos="0" name="os.cpe23" value="cpe:/o:novell:netware:6.5 SP4"/>
4636
4637
  </fingerprint>
4637
4638
  <fingerprint pattern="^Novell NetWare 5\.70\.05 *December 16, 2005$">
4638
- <description>Novell NetWare</description>
4639
+ <description>Novell NetWare 6.5 SP5</description>
4639
4640
  <example>Novell NetWare 5.70.05 December 16, 2005</example>
4640
4641
  <param pos="0" name="os.certainty" value="1.0"/>
4641
4642
  <param pos="0" name="os.vendor" value="Novell"/>
@@ -4645,7 +4646,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4645
4646
  <param pos="0" name="os.cpe23" value="cpe:/o:novell:netware:6.5 SP5"/>
4646
4647
  </fingerprint>
4647
4648
  <fingerprint pattern="^Novell NetWare 5\.70\.05 *April 11, 2006$">
4648
- <description>Novell NetWare</description>
4649
+ <description>Novell NetWare 6.5 SP5 CPR</description>
4649
4650
  <example>Novell NetWare 5.70.05 April 11, 2006</example>
4650
4651
  <param pos="0" name="os.certainty" value="1.0"/>
4651
4652
  <param pos="0" name="os.vendor" value="Novell"/>
@@ -4655,7 +4656,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4655
4656
  <param pos="0" name="os.cpe23" value="cpe:/o:novell:netware:6.5 SP5 CPR"/>
4656
4657
  </fingerprint>
4657
4658
  <fingerprint pattern="^Novell NetWare 5\.70\.06 *October 26, 2006$">
4658
- <description>Novell NetWare</description>
4659
+ <description>Novell NetWare 6.5 SP6</description>
4659
4660
  <example>Novell NetWare 5.70.06 October 26, 2006</example>
4660
4661
  <param pos="0" name="os.certainty" value="1.0"/>
4661
4662
  <param pos="0" name="os.vendor" value="Novell"/>
@@ -4665,7 +4666,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4665
4666
  <param pos="0" name="os.cpe23" value="cpe:/o:novell:netware:6.5 SP6"/>
4666
4667
  </fingerprint>
4667
4668
  <fingerprint pattern="^Novell NetWare 5\.70\.07 *September 18, 2007$">
4668
- <description>Novell NetWare</description>
4669
+ <description>Novell NetWare 6.5 SP7</description>
4669
4670
  <example>Novell NetWare 5.70.07 September 18, 2007</example>
4670
4671
  <param pos="0" name="os.certainty" value="1.0"/>
4671
4672
  <param pos="0" name="os.vendor" value="Novell"/>
@@ -4675,8 +4676,8 @@ Copyright (c) 1995-2005 by Cisco Systems
4675
4676
  <param pos="0" name="os.cpe23" value="cpe:/o:novell:netware:6.5 SP7"/>
4676
4677
  </fingerprint>
4677
4678
  <fingerprint pattern="^Novell NetWare ([\d.]+).*$">
4678
- <description>Novell NetWare</description>
4679
- <example>Novell NetWare 5.70.08 October 3, 2008</example>
4679
+ <description>Novell NetWare - version capture variant</description>
4680
+ <example os.version="5.70.08">Novell NetWare 5.70.08 October 3, 2008</example>
4680
4681
  <param pos="0" name="os.certainty" value="0.85"/>
4681
4682
  <param pos="0" name="os.vendor" value="Novell"/>
4682
4683
  <param pos="0" name="os.family" value="NetWare"/>
@@ -4686,7 +4687,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4686
4687
  </fingerprint>
4687
4688
  <fingerprint pattern="^Novell UnixWare v(\S+)$">
4688
4689
  <description>Novell UnixWare</description>
4689
- <example>Novell UnixWare v2.1</example>
4690
+ <example os.version="2.1">Novell UnixWare v2.1</example>
4690
4691
  <param pos="0" name="os.vendor" value="Novell"/>
4691
4692
  <param pos="0" name="os.family" value="UnixWare"/>
4692
4693
  <param pos="0" name="os.product" value="UnixWare"/>
@@ -4733,7 +4734,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4733
4734
  <param pos="0" name="os.device" value="Multifunction Device"/>
4734
4735
  </fingerprint>
4735
4736
  <fingerprint pattern="^Oce digital 3165 (R\S+)$">
4736
- <description>Oce 3165 multifunction device</description>
4737
+ <description>Oce 3165 multifunction device - variant 1</description>
4737
4738
  <example>Oce digital 3165 R5.3</example>
4738
4739
  <param pos="0" name="os.vendor" value="Oce"/>
4739
4740
  <param pos="0" name="os.family" value="3165 Series"/>
@@ -4742,7 +4743,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4742
4743
  <param pos="0" name="os.device" value="Multifunction Device"/>
4743
4744
  </fingerprint>
4744
4745
  <fingerprint pattern="^Oce, 3165 ([^,]+), Controller \S+$">
4745
- <description>Oce 3165 multifunction device</description>
4746
+ <description>Oce 3165 multifunction device - variant 2</description>
4746
4747
  <example>Oce, 3165 R8.2, Controller R10.2.8</example>
4747
4748
  <param pos="0" name="os.vendor" value="Oce"/>
4748
4749
  <param pos="0" name="os.family" value="3165 Series"/>
@@ -4778,7 +4779,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4778
4779
  <param pos="0" name="os.device" value="Multifunction Device"/>
4779
4780
  </fingerprint>
4780
4781
  <fingerprint pattern="^Oce, (VarioPrint \S+) ([^,]+),.*$">
4781
- <description>Oce VarioPrint multifunction device</description>
4782
+ <description>Oce VarioPrint multifunction device - detailed variant</description>
4782
4783
  <example>Oce, VarioPrint 135 R2.1.0.0, PRISMAsync R13.4.42.7</example>
4783
4784
  <example>Oce, VarioPrint 2045 R3.2, Controller R8.2.15</example>
4784
4785
  <param pos="0" name="os.vendor" value="Oce"/>
@@ -4823,43 +4824,32 @@ Copyright (c) 1995-2005 by Cisco Systems
4823
4824
  <!--======================================================================
4824
4825
  NRG
4825
4826
  =======================================================================-->
4826
- <fingerprint pattern="^NRG ((?:MP|SP) \S+|DSm\d+) (?:V|v)?(\S+).*$">
4827
+ <fingerprint pattern="^NRG ((?:MP|SP )?\S+|DSm\d+) (?:V|v)?\.?(\S+).*$">
4827
4828
  <description>Ricoh NRG network multifunction device</description>
4828
- <example>NRG SP C312DN V1.03 / NRG Network Printer C model</example>
4829
+ <example hw.product="SP C312DN" os.version="1.03">NRG SP C312DN V1.03 / NRG Network Printer C model</example>
4829
4830
  <example>NRG MP 3350 1.10 / NRG Network Printer C model / NRG Network Scanner C model</example>
4830
4831
  <example>NRG MP C3500 1.67 / NRG Network Printer C model / NRG Network Scanner C model</example>
4831
4832
  <example>NRG DSm415 0.29.01 / NRG Network Printer C model / NRG Network Scanner C model</example>
4832
- <example>NRG DSm415 0.29.01 / NRG Network Printer C model / NRG Network Scanner C model</example>
4833
4833
  <example>NRG MP 171 1.00.1 / NRG Network Printer C model / NRG Network Scanner C model / NRG Network Facsimile C model</example>
4834
4834
  <example>NRG SP C231SF v1.14a / NRG Network Printer C model / NRG Network Scanner C model / NRG Network Facsimile C model</example>
4835
4835
  <example>NRG DSm622 1.05 / NRG Network Printer C model / NRG Network Scanner C model / NRG Network Facsimile C model</example>
4836
- <example>NRG MP 3350 1.10 / NRG Network Printer C model / NRG Network Scanner C model</example>
4837
4836
  <example>NRG MP C2550 1.14 / NRG Network Printer C model / NRG Network Scanner C model / NRG Network Facsimile C model</example>
4838
- <example>NRG MP C3500 1.67 / NRG Network Printer C model / NRG Network Scanner C model</example>
4839
4837
  <example>NRG MP C3500 1.70 / NRG Network Printer C model / NRG Network Scanner C model</example>
4840
4838
  <example>NRG MP C4000 1.24 / NRG Network Printer C model / NRG Network Scanner C model / NRG Network Facsimile C model</example>
4841
4839
  <example>NRG MP C4500 1.65 / NRG Network Printer C model / NRG Network Scanner C model</example>
4842
- <example>NRG SP C312DN V1.03 / NRG Network Printer C model</example>
4843
- <param pos="0" name="os.vendor" value="Ricoh"/>
4844
- <param pos="0" name="os.device" value="Printer"/>
4845
- <param pos="1" name="os.product"/>
4846
- <param pos="2" name="os.version"/>
4847
- </fingerprint>
4848
- <fingerprint pattern="^NRG (\S+) (\d+\.\S+).*$">
4849
- <description>Ricoh NRG network multifunction device</description>
4850
- <example>NRG 4525/4508/4502 5.23 / NRG Network Printer C model / NRG Network Scanner C model</example>
4851
4840
  <example>NRG 4525/4508/4502 5.25 / NRG Network Printer C model / NRG Network Scanner C model</example>
4852
4841
  <example>NRG 6002/6005/6008 1.12.3 / NRG Network Printer C model / NRG Network Scanner C model</example>
4853
- <example>NRG 6002/6005/6008 3.52 / NRG Network Printer C model / NRG Network Scanner C model</example>
4854
4842
  <example>NRG C7417 1.00 / NRG Network Printer C model</example>
4855
- <example>NRG C7417 1.01 / NRG Network Printer C model</example>
4856
- <example>NRG C7425dn 1.03 / NRG Network Printer C model</example>
4857
4843
  <example>NRG C7425dn 1.10 / NRG Network Printer C model</example>
4858
4844
  <example>NRG C7435n 1.05 / NRG Network Printer C model</example>
4845
+ <example hw.product="DSc38" os.version="2.13">NRG DSc38 V.2.13 / NRG Network Printer C model</example>
4859
4846
  <param pos="0" name="os.vendor" value="Ricoh"/>
4860
- <param pos="0" name="os.device" value="Multifunction Device"/>
4847
+ <param pos="0" name="os.device" value="Printer"/>
4861
4848
  <param pos="1" name="os.product"/>
4862
4849
  <param pos="2" name="os.version"/>
4850
+ <param pos="0" name="hw.vendor" value="Ricoh"/>
4851
+ <param pos="0" name="hw.device" value="Printer"/>
4852
+ <param pos="1" name="hw.product"/>
4863
4853
  </fingerprint>
4864
4854
  <!--
4865
4855
  Currently unmatched examples:
@@ -4871,7 +4861,6 @@ Copyright (c) 1995-2005 by Cisco Systems
4871
4861
  NRG D435/2835/3235
4872
4862
  NRG D445/2845/3245
4873
4863
  NRG D465/2865/3265
4874
- NRG DSc38 V.2.13 / NRG Network Printer C model
4875
4864
  NRG MP C2500
4876
4865
  NRG MP C4500
4877
4866
  -->
@@ -4879,7 +4868,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4879
4868
  Oki Data
4880
4869
  =======================================================================-->
4881
4870
  <fingerprint pattern="^OKI (\S+(?: \S+)?(?: \S+)?) Rev\. \S+ .*Print\s*Server.*$">
4882
- <description>OKI Print Server</description>
4871
+ <description>OKI Print Server - rev space variant</description>
4883
4872
  <example>OKI OkiLAN 6400e Rev. 10/100BASE Ethernet PrintServer: Attached to B6250 Rev.8.1: (C)2005 OKI DATA CORP</example>
4884
4873
  <example>OKI OkiLAN 6400e Rev. 10/100BASE Ethernet PrintServer: Attached to B6500 Rev.2.19 C1: (C)2005 OKI DATA CORP</example>
4885
4874
  <example>OKI OkiLAN 6400e Rev. 10/100BASE Ethernet PrintServer: Attached to B720n Rev.7.1b1: (C)2005 OKI DATA CORP</example>
@@ -4909,7 +4898,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4909
4898
  <param pos="0" name="os.device" value="Storage"/>
4910
4899
  </fingerprint>
4911
4900
  <fingerprint pattern="^Overland Agent Version (\S+)$">
4912
- <description>Overland NEO tape library</description>
4901
+ <description>Overland NEO tape library - agent variant</description>
4913
4902
  <example>Overland Agent Version 1.1</example>
4914
4903
  <param pos="0" name="os.vendor" value="Overland"/>
4915
4904
  <param pos="0" name="os.family" value="NEO"/>
@@ -4967,7 +4956,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4967
4956
  <param pos="2" name="os.version"/>
4968
4957
  </fingerprint>
4969
4958
  <fingerprint pattern="^PARADYNE (BitStorm \S+);.*S/W Release: ([^;]+);.*$">
4970
- <description>Paradyne DSLAM</description>
4959
+ <description>Paradyne BitStorm DSLAM</description>
4971
4960
  <example>PARADYNE BitStorm 2600; S/W Release: 02.05.07;</example>
4972
4961
  <example>PARADYNE BitStorm 4800; S/W Release: 01.00.09;</example>
4973
4962
  <param pos="0" name="os.certainty" value="1.0"/>
@@ -4978,7 +4967,7 @@ Copyright (c) 1995-2005 by Cisco Systems
4978
4967
  <param pos="2" name="os.version"/>
4979
4968
  </fingerprint>
4980
4969
  <fingerprint pattern="^PARADYNE (GranDSLAM \S+);.*S/W Release: ([^;]+);.*$">
4981
- <description>Paradyne DSLAM</description>
4970
+ <description>Paradyne GranDSLAM</description>
4982
4971
  <example>PARADYNE GranDSLAM 4200; S/W Release: 02.05.23;</example>
4983
4972
  <param pos="0" name="os.certainty" value="1.0"/>
4984
4973
  <param pos="0" name="os.vendor" value="Paradyne"/>
@@ -5056,7 +5045,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5056
5045
  Rectifier
5057
5046
  =======================================================================-->
5058
5047
  <fingerprint pattern="^Rectifier Technologies Pacific (WebCSU \S+) V(\S+)$">
5059
- <description>Rectifier Technologies Pacific WebCSU</description>
5048
+ <description>Rectifier Technologies Pacific WebCSU - version variant</description>
5060
5049
  <example>Rectifier Technologies Pacific WebCSU 169-412 V1.15</example>
5061
5050
  <example>Rectifier Technologies Pacific WebCSU 169-412 V1.28</example>
5062
5051
  <example>Rectifier Technologies Pacific WebCSU 169-412 V1.30</example>
@@ -5098,7 +5087,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5098
5087
  <param pos="0" name="os.product" value="IPReach"/>
5099
5088
  </fingerprint>
5100
5089
  <fingerprint pattern="^Raritan Computer; (CommandCenter Secure Gateway); Version ([^;]+); (\S+) HW\s*$">
5101
- <description>Redback networks AOS</description>
5090
+ <description>Redback CommandCenter Secure Gateway</description>
5102
5091
  <example>Raritan Computer; CommandCenter Secure Gateway; Version 3.1.1.5.2; CC-SG-G1 HW</example>
5103
5092
  <example>Raritan Computer; CommandCenter Secure Gateway; Version 3.1.1.5.2; CC-SG-V1 HW</example>
5104
5093
  <example>Raritan Computer; CommandCenter Secure Gateway; Version 3.2.1.5.1; CC-SG-E1 HW</example>
@@ -5142,7 +5131,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5142
5131
  <param pos="1" name="os.version"/>
5143
5132
  </fingerprint>
5144
5133
  <fingerprint pattern="^Redback Networks SmartEdge OS Version SEOS-(.*?) Built by .*$">
5145
- <description>Redback networks AOS</description>
5134
+ <description>Redback SmartEdge</description>
5146
5135
  <example>Redback Networks SmartEdge OS Version SEOS-11.1.2.3p1-Release Built by sysbuild@SWB-node04 Fri Dec 23 11:47:30 PST 2011 Copyright (C) 1998-2011, Redback Networks Inc. All rights reserved.</example>
5147
5136
  <example>Redback Networks SmartEdge OS Version SEOS-11.1.2.3p3-Release Built by sysbuild@SWB-node06 Thu Feb 16 16:39:21 PST 2012 Copyright (C) 1998-2012, Redback Networks Inc. All rights reserved.</example>
5148
5137
  <example>Redback Networks SmartEdge OS Version SEOS-11.1.2.4-Release Built by sysbuild@SWB-node01 Sat Mar 3 16:15:16 PST 2012 Copyright (C) 1998-2012, Redback Networks Inc. All rights reserved.</example>
@@ -5171,7 +5160,6 @@ Copyright (c) 1995-2005 by Cisco Systems
5171
5160
  <example>RICOH Aficio MP 5500 2.04 / RICOH Network Printer C model / RICOH Network Scanner C model / RICOH Network Facsimile C model</example>
5172
5161
  <example>RICOH Aficio MP C2500 1.62.1 / RICOH Network Printer C model / RICOH Network Scanner C model / RICOH Network Facsimile C model</example>
5173
5162
  <example>RICOH Aficio MP C2500 1.66 / RICOH Network Printer C model / RICOH Network Scanner C model / RICOH Network Facsimile C model</example>
5174
- <example>RICOH Aficio 2035e 2.40 / RICOH Network Printer C model / RICOH Network Scanner C model / RICOH Network Facsimile C model</example>
5175
5163
  <example>RICOH Aficio MP C3000 1.70 / RICOH Network Printer C model / RICOH Network Scanner C model / RICOH Network Facsimile C model</example>
5176
5164
  <example>RICOH Aficio 2045 1.06s / RICOH Network Printer C model / RICOH Network Scanner C model</example>
5177
5165
  <example>RICOH Aficio SP C411DN 1.01 / RICOH Network Printer C model</example>
@@ -5191,7 +5179,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5191
5179
  <param pos="1" name="os.product"/>
5192
5180
  </fingerprint>
5193
5181
  <fingerprint pattern="^RICOH Aficio (\S+ \S+)$">
5194
- <description>Generic Ricoh Aficio multifunction device</description>
5182
+ <description>Generic Ricoh Aficio multifunction device - variant 1</description>
5195
5183
  <example>RICOH Aficio MP C2500</example>
5196
5184
  <param pos="0" name="os.vendor" value="Ricoh"/>
5197
5185
  <param pos="0" name="os.family" value="Aficio"/>
@@ -5199,7 +5187,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5199
5187
  <param pos="1" name="os.product"/>
5200
5188
  </fingerprint>
5201
5189
  <fingerprint pattern="^RICOH Aficio (\S+) /.*$">
5202
- <description>Generic Ricoh Aficio multifunction device</description>
5190
+ <description>Generic Ricoh Aficio multifunction device - variant 2</description>
5203
5191
  <example>RICOH Aficio 1013 / RICOH Network Printer D model</example>
5204
5192
  <param pos="0" name="os.vendor" value="Ricoh"/>
5205
5193
  <param pos="0" name="os.family" value="Aficio"/>
@@ -5228,19 +5216,11 @@ Copyright (c) 1995-2005 by Cisco Systems
5228
5216
  <param pos="1" name="os.product"/>
5229
5217
  <param pos="2" name="os.version"/>
5230
5218
  </fingerprint>
5231
- <fingerprint pattern="^RICOH IPS[Ii]O (\S+ \S+) [Vv]?(\S+) /.*$">
5232
- <description>Generic Ricoh IPSIO multifunction device</description>
5233
- <example>RICOH IPSiO SP C301SF v1.26 / RICOH Network Printer C model /RICOH Network Scanner C model /RICOH Network Facsimile C model</example>
5234
- <example>RICOH IPSiO SP C310 1.00 / RICOH Network Printer C model</example>
5235
- <param pos="0" name="os.vendor" value="Ricoh"/>
5236
- <param pos="0" name="os.family" value="IPSIO"/>
5237
- <param pos="0" name="os.device" value="Printer"/>
5238
- <param pos="1" name="os.product"/>
5239
- <param pos="2" name="os.version"/>
5240
- </fingerprint>
5241
- <fingerprint pattern="^RICOH IPS[Ii]O (\S+ \S+) Ver [Vv]?(\S+) /.*$">
5242
- <description>Generic Ricoh IPSIO multifunction device</description>
5243
- <example>RICOH IPSiO GX e3300 Ver 1.02 / RICOH Network Printer C model</example>
5219
+ <fingerprint pattern="^RICOH IPS[Ii]O (\S+ \S+) (?:Ver )?[Vv]?(\S+) /.*$">
5220
+ <description>Generic Ricoh IPSIO multifunction device - variant 1</description>
5221
+ <example os.product="SP C301SF" os.version="1.26">RICOH IPSiO SP C301SF v1.26 / RICOH Network Printer C model /RICOH Network Scanner C model /RICOH Network Facsimile C model</example>
5222
+ <example os.product="SP C310" os.version="1.00">RICOH IPSiO SP C310 1.00 / RICOH Network Printer C model</example>
5223
+ <example os.product="GX e3300" os.version="1.02">RICOH IPSiO GX e3300 Ver 1.02 / RICOH Network Printer C model</example>
5244
5224
  <param pos="0" name="os.vendor" value="Ricoh"/>
5245
5225
  <param pos="0" name="os.family" value="IPSIO"/>
5246
5226
  <param pos="0" name="os.device" value="Printer"/>
@@ -5350,7 +5330,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5350
5330
  IBM Printers
5351
5331
  =======================================================================-->
5352
5332
  <fingerprint pattern="(?i)^(?:IBM )?InfoPrint(?: Color)? (\S+)(?: MFP)? Version (\S+)">
5353
- <description>IBM Infoprint Printer</description>
5333
+ <description>IBM Infoprint Printer - verbose variant</description>
5354
5334
  <example>IBM Infoprint 1332 version 55.00.39 kernel 2.4.0-test6 All-N-1</example>
5355
5335
  <example>IBM Infoprint 1372 version 55.10.19 kernel 2.4.0-test6 All-N-1</example>
5356
5336
  <example>IBM Infoprint Color 1354 version 86.01.01 kernel 2.4.0-test6 All-N-1</example>
@@ -5367,7 +5347,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5367
5347
  <param pos="2" name="os.version"/>
5368
5348
  </fingerprint>
5369
5349
  <fingerprint pattern="^(?:IBM )InfoPrint (\d+)\s*$">
5370
- <description>IBM Infoprint Printer</description>
5350
+ <description>IBM Infoprint Printer - simple variant</description>
5371
5351
  <example>IBM InfoPrint 40 </example>
5372
5352
  <param pos="0" name="os.vendor" value="Ricoh"/>
5373
5353
  <param pos="0" name="os.family" value="Infoprint"/>
@@ -5387,7 +5367,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5387
5367
  MikroTik
5388
5368
  =======================================================================-->
5389
5369
  <fingerprint pattern="^RouterOS (RB.*)$">
5390
- <description>Miktorik RouterOS</description>
5370
+ <description>Miktorik RouterOS - model variant</description>
5391
5371
  <example>RouterOS RB Crossroads</example>
5392
5372
  <example>RouterOS RB Groove A-5Hn</example>
5393
5373
  <example>RouterOS RB MetaROUTER</example>
@@ -5431,7 +5411,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5431
5411
  <param pos="1" name="os.product"/>
5432
5412
  </fingerprint>
5433
5413
  <fingerprint pattern="^SAVIN ((?:\S+ )?\S+) (\d\S+) / .*$">
5434
- <description>Savin Printer</description>
5414
+ <description>Savin Printer - version variant</description>
5435
5415
  <example>SAVIN 2522 5.20 / SAVIN Network Printer C model / SAVIN Network Scanner C model / SAVIN Network Facsimile C model</example>
5436
5416
  <example>SAVIN 9922DP 1.4.9 / RICOH Network Printer C model</example>
5437
5417
  <example>SAVIN SLP38c 2.22 / SAVIN Network Printer C model</example>
@@ -5454,7 +5434,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5454
5434
  <param pos="2" name="os.version"/>
5455
5435
  </fingerprint>
5456
5436
  <fingerprint pattern="^Samsung (CLX-\S+)$">
5457
- <description>Samsung Printer</description>
5437
+ <description>Samsung Printer - model only variant</description>
5458
5438
  <example>Samsung CLX-7285</example>
5459
5439
  <example>Samsung CLX-7355</example>
5460
5440
  <example>Samsung CLX-7455</example>
@@ -5463,7 +5443,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5463
5443
  <param pos="1" name="os.product"/>
5464
5444
  </fingerprint>
5465
5445
  <fingerprint pattern="^Samsung (CLP-705) Series; ; S/N.*$">
5466
- <description>Samsung Printer</description>
5446
+ <description>Samsung Printer - serial number variant</description>
5467
5447
  <example>Samsung CLP-705 Series; ; S/N XXXXXXXXXXXXXXXX</example>
5468
5448
  <param pos="0" name="os.vendor" value="Samsung"/>
5469
5449
  <param pos="0" name="os.device" value="Printer"/>
@@ -5473,7 +5453,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5473
5453
  SonicWall
5474
5454
  =======================================================================-->
5475
5455
  <fingerprint pattern="^SonicWALL (.*?)\s+\(SonicOS \S+ (\d[^\)]+)\)\s*$">
5476
- <description>SonicWall</description>
5456
+ <description>SonicWall - SonicOS Enhanced variant</description>
5477
5457
  <example>SonicWALL NSA 220 (SonicOS Enhanced 5.8.1.2-20o)</example>
5478
5458
  <example>SonicWALL TZ 215 wireless-N (SonicOS Enhanced 5.8.1.2-6o)</example>
5479
5459
  <example>SonicWALL TZ190 Enhanced (SonicOS Enhanced 3.6.0.4-30e)</example>
@@ -5555,7 +5535,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5555
5535
  <param pos="0" name="os.cpe23" value="cpe:/o:sgi:irix:{os.version}"/>
5556
5536
  </fingerprint>
5557
5537
  <fingerprint pattern="^.* IRIX64 (?:version )?(\d+\S+).*$">
5558
- <description>SGI IRIX</description>
5538
+ <description>SGI IRIX64</description>
5559
5539
  <example os.version="6.5">Silicon Graphics Challenge/1 running IRIX64 6.5</example>
5560
5540
  <example os.version="6.5">Silicon Graphics Fuel running IRIX64 version 6.5</example>
5561
5541
  <example os.version="6.5">Silicon Graphics IRIS Octane running IRIX64 version 6.5</example>
@@ -5635,7 +5615,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5635
5615
  <param pos="2" name="os.version"/>
5636
5616
  </fingerprint>
5637
5617
  <fingerprint pattern="^HiPath (optiPoint \S+ \S+) HFA$">
5638
- <description>Siemens Scalance Industrial Wireless Access Point</description>
5618
+ <description>Siemens HiPath optiPoint</description>
5639
5619
  <example>HiPath optiPoint 400 Economy HFA</example>
5640
5620
  <example>HiPath optiPoint 400 Standard HFA</example>
5641
5621
  <param pos="0" name="os.vendor" value="Siemens"/>
@@ -5665,7 +5645,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5665
5645
  <param pos="3" name="siemens.model"/>
5666
5646
  </fingerprint>
5667
5647
  <fingerprint pattern="^Siemens (\S+)\s+(.*?)\s+\(([^\)]+)\) Router .*?v(\d+\S+)\s+.*$">
5668
- <description>Siemens Router</description>
5648
+ <description>Siemens Router - variant 1</description>
5669
5649
  <example>Siemens 7950 G.SHDSL [ATM] (7950-001) Router with ISDN Voice v6.1.077 All Rights Reserved</example>
5670
5650
  <param pos="0" name="os.vendor" value="Siemens"/>
5671
5651
  <param pos="0" name="os.device" value="Router"/>
@@ -5675,7 +5655,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5675
5655
  <param pos="3" name="siemens.model"/>
5676
5656
  </fingerprint>
5677
5657
  <fingerprint pattern="^Siemens, SIMATIC HMI, ([^,]+),.*FW:\s*V([^,]+).*$">
5678
- <description>Siemens HMI</description>
5658
+ <description>Siemens HMI - firmware variant</description>
5679
5659
  <example>Siemens, SIMATIC HMI, KTP1000 Basic PN, 6AV6 647-0AF11-3AX0, HW: 1, FW: V01.06.00, Revision: 1</example>
5680
5660
  <example>Siemens, SIMATIC HMI, KTP600 Basic Mono PN, 6AV6647-0AB11-3AX0, HW:1, FW:V01.06.00</example>
5681
5661
  <example>Siemens, SIMATIC HMI, KTP600 Basic color PN, 6AV6 647-0AD11-3AX0, HW:1, FW:V11.00.02.00</example>
@@ -5699,7 +5679,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5699
5679
  <param pos="2" name="os.version"/>
5700
5680
  </fingerprint>
5701
5681
  <fingerprint pattern="^Siemens, SIMATIC NET, ([^,]+),.*FW:\s*(?:Version )?V?([^,]+).*$">
5702
- <description>Siemens NET</description>
5682
+ <description>Siemens NET - verbose variant</description>
5703
5683
  <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>
5704
5684
  <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>
5705
5685
  <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>
@@ -5732,7 +5712,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5732
5712
  <param pos="2" name="os.version"/>
5733
5713
  </fingerprint>
5734
5714
  <fingerprint pattern="^Siemens, SIMATIC S7, ([^,]+), .*?, V\.([^,]+).*$">
5735
- <description>Siemens S7</description>
5715
+ <description>Siemens S7 - variant 1</description>
5736
5716
  <example>Siemens, SIMATIC S7, CPU-1200, 6ES7 212-1BD30-0XB0 SZVA1YU6008610 , 1, V.1.0.1, SZVA1YU6008610</example>
5737
5717
  <example>Siemens, SIMATIC S7, CPU-1200, 6ES7 212-1HD30-0XB0 SZVA3YU7002312 , 1, V.1.0.1, SZVA3YU7002312</example>
5738
5718
  <example>Siemens, SIMATIC S7, CPU-1200, 6ES7 214-1BE30-0XB0 SZVA2YYY007305 , 1, V.1.0.2, SZVA2YYY007305</example>
@@ -5743,7 +5723,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5743
5723
  <param pos="2" name="os.version"/>
5744
5724
  </fingerprint>
5745
5725
  <fingerprint pattern="^Siemens, SIMATIC, (\S+)$">
5746
- <description>Siemens S7</description>
5726
+ <description>Siemens S7 - model only variant</description>
5747
5727
  <example>Siemens, SIMATIC, S7-300</example>
5748
5728
  <param pos="0" name="os.vendor" value="Siemens"/>
5749
5729
  <param pos="0" name="os.device" value="Monitoring"/>
@@ -5821,7 +5801,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5821
5801
  <param pos="0" name="os.cpe23" value="cpe:/o:oracle:solaris:{os.version}"/>
5822
5802
  </fingerprint>
5823
5803
  <fingerprint pattern="^SunOS (\S+) 5\.([789]|10) \S+ (\S+)$">
5824
- <description>SunOS/Solaris 5.7-5.10</description>
5804
+ <description>SunOS/Solaris 5.7-5.10 - hostname variant</description>
5825
5805
  <example host.name="sysname" os.arch="sun4u" os.version="10">SunOS sysname 5.10 Generic_118833-33 sun4u</example>
5826
5806
  <example host.name="sysname" os.arch="sun4u" os.version="7">SunOS sysname 5.7 Generic_118833-33 sun4u</example>
5827
5807
  <param pos="0" name="os.vendor" value="Sun"/>
@@ -5906,7 +5886,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5906
5886
  <param pos="0" name="os.cpe23" value="cpe:/o:sun:solaris:-"/>
5907
5887
  </fingerprint>
5908
5888
  <fingerprint pattern="^Sun SNMP Agent, Netra-T12$">
5909
- <description>Sun SNMP agent on a Sun-Fire-V240</description>
5889
+ <description>Sun SNMP agent on a Netra-T12</description>
5910
5890
  <example>Sun SNMP Agent, Netra-T12</example>
5911
5891
  <param pos="0" name="os.certainty" value="0.5"/>
5912
5892
  <param pos="0" name="os.vendor" value="Sun"/>
@@ -5985,7 +5965,7 @@ Copyright (c) 1995-2005 by Cisco Systems
5985
5965
  <param pos="0" name="os.device" value="Storage"/>
5986
5966
  </fingerprint>
5987
5967
  <fingerprint pattern="^SunOS 5\.([789]|10) (\S+) sparc SUNW,([^,]+),.*$">
5988
- <description>SunOS/Solaris 5.7-5.10</description>
5968
+ <description>SunOS/Solaris 5.7-5.10 - Call Manager variant</description>
5989
5969
  <example os.version="10" os.arch="sun4u" hw.product="Sun-Fire-V210">SunOS 5.10 sun4u sparc SUNW,Sun-Fire-V210, Class 4 Call Manager</example>
5990
5970
  <example>SunOS 5.10 sun4u sparc SUNW,Sun-Fire-V210, Class 5 Call Manager</example>
5991
5971
  <example>SunOS 5.10 sun4u sparc SUNW,Sun-Fire-V215, CommandCenter</example>
@@ -6006,7 +5986,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6006
5986
  <param pos="3" name="hw.product"/>
6007
5987
  </fingerprint>
6008
5988
  <fingerprint pattern="^SunOS 5\.(1[1-9]) (\S+) sparc SUNW,([^,]+),.*$">
6009
- <description>Oracle/Solaris 5.11 and upwards</description>
5989
+ <description>Oracle/Solaris 5.11 and upwards - Call Manager variant</description>
6010
5990
  <example os.version="11" os.arch="sun4u" hw.product="Sun-Fire-V210">SunOS 5.11 sun4u sparc SUNW,Sun-Fire-V210, Class 4 Call Manager</example>
6011
5991
  <example os.version="12" os.arch="sun4u" hw.product="Sun-Fire-V210">SunOS 5.12 sun4u sparc SUNW,Sun-Fire-V210, Class 4 Call Manager</example>
6012
5992
  <param pos="0" name="os.vendor" value="Oracle"/>
@@ -6019,7 +5999,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6019
5999
  <param pos="3" name="hw.product"/>
6020
6000
  </fingerprint>
6021
6001
  <fingerprint pattern="^SunOS (\S+) 5\.([789]|10) \S+ (\S+) \S+ SUNW,([^,]+).*$">
6022
- <description>SunOS/Solaris 5.7-5.10</description>
6002
+ <description>SunOS/Solaris 5.7-5.10 - SUNW variant</description>
6023
6003
  <example host.name="integra01" os.version="10" os.arch="sun4v" hw.product="T5240">SunOS integra01 5.10 Generic_127127-11 sun4v sparc SUNW,T5240</example>
6024
6004
  <example>SunOS integra02 5.10 Generic_127127-11 sun4v sparc SUNW,T5240</example>
6025
6005
  <example>SunOS magppg01 5.10 Generic_127127-11 sun4v sparc SUNW,T5240</example>
@@ -6038,7 +6018,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6038
6018
  <param pos="4" name="hw.product"/>
6039
6019
  </fingerprint>
6040
6020
  <fingerprint pattern="^SunOS (\S+) 5\.(1[1-9]) \S+ (\S+) \S+ SUNW,([^,]+).*$">
6041
- <description>Oracle/Solaris 5.11 and upwards</description>
6021
+ <description>Oracle/Solaris 5.11 and upwards - SUNW variant</description>
6042
6022
  <example host.name="integra01" os.version="11" os.arch="sun4v" hw.product="T5240">SunOS integra01 5.11 Generic_127127-11 sun4v sparc SUNW,T5240</example>
6043
6023
  <example host.name="integra01" os.version="12" os.arch="sun4v" hw.product="T5240">SunOS integra01 5.12 Generic_127127-11 sun4v sparc SUNW,T5240</example>
6044
6024
  <param pos="0" name="os.vendor" value="Oracle"/>
@@ -6052,7 +6032,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6052
6032
  <param pos="4" name="hw.product"/>
6053
6033
  </fingerprint>
6054
6034
  <fingerprint pattern="^SunOS 5\.([789]|10) \S+ (\S+)$">
6055
- <description>SunOS/Solaris 5.7-5.10</description>
6035
+ <description>SunOS/Solaris 5.7-5.10 - generic version</description>
6056
6036
  <example os.version="10" os.arch="sun4u">SunOS 5.10 Generic sun4u</example>
6057
6037
  <example>SunOS 5.10 Generic_137111-07 sun4v</example>
6058
6038
  <example>SunOS 5.10 Generic_142900-11 sun4v</example>
@@ -6072,7 +6052,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6072
6052
  <param pos="0" name="os.cpe23" value="cpe:/o:sun:solaris:{os.version}"/>
6073
6053
  </fingerprint>
6074
6054
  <fingerprint pattern="^SunOS 5\.(1[1-9]) \S+ (\S+)$">
6075
- <description>Oracle/Solaris 5.11 and upwards</description>
6055
+ <description>Oracle/Solaris 5.11 and upwards - generic version</description>
6076
6056
  <example os.version="11" os.arch="sun4u">SunOS 5.11 Generic sun4u</example>
6077
6057
  <example os.version="12" os.arch="sun4u">SunOS 5.12 Generic sun4u</example>
6078
6058
  <param pos="0" name="os.vendor" value="Oracle"/>
@@ -6127,15 +6107,15 @@ Copyright (c) 1995-2005 by Cisco Systems
6127
6107
  <!--======================================================================
6128
6108
  SYMBOL
6129
6109
  =======================================================================-->
6130
- <fingerprint pattern="^Symbol (Spectrum24 Ethernet Access Point)$">
6110
+ <fingerprint pattern="^Symbol Spectrum24 Ethernet Access Point$">
6131
6111
  <description>Symbol Access Point</description>
6132
6112
  <example>Symbol Spectrum24 Ethernet Access Point</example>
6133
6113
  <param pos="0" name="os.vendor" value="Symbol"/>
6134
- <param pos="1" name="os.product"/>
6114
+ <param pos="0" name="os.product" value="Spectrum24 Ethernet Access Point"/>
6135
6115
  <param pos="0" name="os.device" value="WAP"/>
6136
6116
  </fingerprint>
6137
6117
  <fingerprint pattern="^Symbol ((?:Spectrum24 (?:FHSS|Ethernet) )?Access Point)[,-].*S/W rev:\s*(\S+).*$">
6138
- <description>Symbol Access Point</description>
6118
+ <description>Symbol Access Point - detailed variant</description>
6139
6119
  <example os.product="Access Point" os.version="02.70-06">Symbol Access Point, S/W rev:- S/W rev: 02.70-06</example>
6140
6120
  <example os.product="Access Point" os.version="02.21-01">Symbol Access Point, S/W rev:02.21-01</example>
6141
6121
  <example os.product="Spectrum24 FHSS Access Point" os.version="04.02-12">Symbol Spectrum24 FHSS Access Point, S/W rev: 04.02-12</example>
@@ -6146,7 +6126,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6146
6126
  <param pos="2" name="os.version"/>
6147
6127
  </fingerprint>
6148
6128
  <fingerprint pattern="^Symbol (AP\S+|WS\S+) .* SW=(\S+) .*$">
6149
- <description>Symbol Access Point</description>
6129
+ <description>Symbol Access Point - abreviated variant</description>
6150
6130
  <example>Symbol AP-7131 HW=E SW=4.0.3.0-010R MIB=01h18</example>
6151
6131
  <example>Symbol AP5131 HW=A SW=0.0-045R MIB=01b15</example>
6152
6132
  <example>Symbol WS2000 HW=R04 SW=0.0-035R MIB=08c12</example>
@@ -6237,7 +6217,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6237
6217
  XEROX
6238
6218
  =======================================================================-->
6239
6219
  <fingerprint pattern="^Xerox (Phaser [^;]+).*[, ]OS ([^;,]+).*$" certainty="1.0">
6240
- <description>Xerox Phaser Laser Printer</description>
6220
+ <description>Xerox Phaser Laser Printer - OS variant</description>
6241
6221
  <example>Xerox Phaser 5500DN;PS G02.10,Net 22.42.11.22.2004,Eng 11.42.00,OS 4.46;SN RET570148</example>
6242
6222
  <example>Xerox Phaser 6350DP;PS 5.0.0,Net 24.98.07.15.2005,Eng 3.2.0,OS 5.98</example>
6243
6223
  <example>Xerox Phaser 6250DP;PS 4.8.0,Net 18.02.08.01.2003,Eng 1.1.1,OS 4.82;SN PWG464781</example>
@@ -6253,7 +6233,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6253
6233
  <param pos="2" name="os.version"/>
6254
6234
  </fingerprint>
6255
6235
  <fingerprint pattern="^Xerox (Phaser .+) v\(.*/([^/]+)\).*$" certainty="1.0">
6256
- <description>Xerox Phaser Laser Printer</description>
6236
+ <description>Xerox Phaser Laser Printer - memory variant</description>
6257
6237
  <example>Xerox Phaser 6200 DX v(2.12/14.66.02.22.2002/1.6.7/4.26) Printer 256MB LPH130287</example>
6258
6238
  <param pos="0" name="os.vendor" value="Xerox"/>
6259
6239
  <param pos="0" name="os.family" value="Phaser"/>
@@ -6331,7 +6311,7 @@ Copyright (c) 1995-2005 by Cisco Systems
6331
6311
  <param pos="2" name="os.version"/>
6332
6312
  </fingerprint>
6333
6313
  <fingerprint pattern="^XEROX (WIDE FORMAT \d{4}) PRINTER; ACCXES (\d+.\d+) \d+, IOT .*$" certainty="1.0">
6334
- <description>Xerox Wide Format Printer</description>
6314
+ <description>Xerox Wide Format Printer - variant 1</description>
6335
6315
  <example>XEROX WIDE FORMAT 6605 PRINTER; ACCXES 14.0 142, IOT 01.01.04XXXXXX</example>
6336
6316
  <example>XEROX WIDE FORMAT 6604 PRINTER; ACCXES 14.0 142, IOT 01.01.04XXXXXX</example>
6337
6317
  <param pos="0" name="os.vendor" value="Xerox"/>