recog 2.1.20 → 2.1.21

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 (47) hide show
  1. checksums.yaml +4 -4
  2. data/lib/recog/version.rb +1 -1
  3. data/remap.json +131 -0
  4. data/spec/lib/fingerprint_self_test_spec.rb +16 -1
  5. data/update_cpes.py +202 -0
  6. data/xml/apache_os.xml +29 -5
  7. data/xml/architecture.xml +3 -3
  8. data/xml/dns_versionbind.xml +56 -10
  9. data/xml/ftp_banners.xml +56 -12
  10. data/xml/h323_callresp.xml +4 -4
  11. data/xml/hp_pjl_id.xml +8 -8
  12. data/xml/http_cookies.xml +20 -8
  13. data/xml/http_servers.xml +122 -8
  14. data/xml/http_wwwauth.xml +13 -3
  15. data/xml/imap_banners.xml +19 -1
  16. data/xml/ldap_searchresult.xml +44 -68
  17. data/xml/mdns_device-info_txt.xml +18 -7
  18. data/xml/mdns_workstation_txt.xml +7 -7
  19. data/xml/mysql_banners.xml +159 -13
  20. data/xml/mysql_error.xml +124 -21
  21. data/xml/nntp_banners.xml +10 -4
  22. data/xml/ntp_banners.xml +144 -84
  23. data/xml/operating_system.xml +39 -10
  24. data/xml/pop_banners.xml +32 -12
  25. data/xml/rsh_resp.xml +8 -3
  26. data/xml/sip_banners.xml +4 -3
  27. data/xml/sip_user_agents.xml +4 -3
  28. data/xml/smb_native_lm.xml +9 -4
  29. data/xml/smb_native_os.xml +50 -25
  30. data/xml/smtp_banners.xml +108 -33
  31. data/xml/smtp_debug.xml +11 -8
  32. data/xml/smtp_ehlo.xml +14 -11
  33. data/xml/smtp_expn.xml +17 -11
  34. data/xml/smtp_help.xml +17 -11
  35. data/xml/smtp_mailfrom.xml +4 -3
  36. data/xml/smtp_noop.xml +13 -8
  37. data/xml/smtp_quit.xml +10 -8
  38. data/xml/smtp_rcptto.xml +1 -3
  39. data/xml/smtp_rset.xml +10 -8
  40. data/xml/smtp_turn.xml +10 -8
  41. data/xml/smtp_vrfy.xml +18 -11
  42. data/xml/snmp_sysdescr.xml +157 -451
  43. data/xml/snmp_sysobjid.xml +57 -4
  44. data/xml/ssh_banners.xml +104 -5
  45. data/xml/upnp_banners.xml +16 -1
  46. data/xml/x11_banners.xml +34 -9
  47. metadata +4 -2
data/xml/http_wwwauth.xml CHANGED
@@ -1,6 +1,6 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
- <!-- HTTP WWW-Authenticate headers are matched against these patterns to fingerprint HTTP servers. -->
3
2
  <fingerprints matches="http_header.wwwauth" protocol="http" database_type="service" preference="0.85">
3
+ <!-- HTTP WWW-Authenticate headers are matched against these patterns to fingerprint HTTP servers. -->
4
4
  <fingerprint pattern="^(?:Basic|Digest) realm=.[iI]RMC(?:@(IRMC[0-9a-fA-F]{6}))?..*$">
5
5
  <description>Fujitsu Siemens Primergy with BMC RemoteView on an iRMC card</description>
6
6
  <param pos="0" name="service.vendor" value="Fujitsu Siemens"/>
@@ -18,11 +18,13 @@
18
18
  <param pos="0" name="service.product" value="IOS"/>
19
19
  <param pos="0" name="service.family" value="IOS"/>
20
20
  <param pos="0" name="service.version" value="11"/>
21
+ <param pos="0" name="service.cpe23" value="cpe:/a:cisco:ios:11"/>
21
22
  <param pos="0" name="os.vendor" value="Cisco"/>
22
23
  <param pos="0" name="os.device" value="Router"/>
23
24
  <param pos="0" name="os.family" value="IOS"/>
24
25
  <param pos="0" name="os.product" value="IOS"/>
25
26
  <param pos="0" name="os.version" value="11"/>
27
+ <param pos="0" name="os.cpe23" value="cpe:/o:cisco:ios:11"/>
26
28
  </fingerprint>
27
29
  <fingerprint pattern="^(?:Basic|Digest) realm=.level[ _]15[ _]or[ _]view[ _]access.$">
28
30
  <description>Cisco IOS 12.x</description>
@@ -30,11 +32,13 @@
30
32
  <param pos="0" name="service.product" value="IOS"/>
31
33
  <param pos="0" name="service.family" value="IOS"/>
32
34
  <param pos="0" name="service.version" value="12"/>
35
+ <param pos="0" name="service.cpe23" value="cpe:/a:cisco:ios:12"/>
33
36
  <param pos="0" name="os.vendor" value="Cisco"/>
34
37
  <param pos="0" name="os.device" value="Router"/>
35
38
  <param pos="0" name="os.family" value="IOS"/>
36
39
  <param pos="0" name="os.product" value="IOS"/>
37
40
  <param pos="0" name="os.version" value="12"/>
41
+ <param pos="0" name="os.cpe23" value="cpe:/o:cisco:ios:12"/>
38
42
  </fingerprint>
39
43
  <fingerprint pattern="^(?:Basic|Digest) realm=.level[ _]\d\d?[ _]access.$">
40
44
  <description>Cisco IOS 12.x</description>
@@ -42,17 +46,20 @@
42
46
  <param pos="0" name="service.product" value="IOS"/>
43
47
  <param pos="0" name="service.family" value="IOS"/>
44
48
  <param pos="0" name="service.version" value="12"/>
49
+ <param pos="0" name="service.cpe23" value="cpe:/a:cisco:ios:12"/>
45
50
  <param pos="0" name="os.vendor" value="Cisco"/>
46
51
  <param pos="0" name="os.device" value="Router"/>
47
52
  <param pos="0" name="os.family" value="IOS"/>
48
53
  <param pos="0" name="os.product" value="IOS"/>
49
54
  <param pos="0" name="os.version" value="12"/>
55
+ <param pos="0" name="os.cpe23" value="cpe:/o:cisco:ios:12"/>
50
56
  </fingerprint>
51
57
  <fingerprint pattern="^(?:Basic|Digest) realm=.FW-1. Reason: no user Server .$">
52
58
  <description>Check Point FireWall-1</description>
53
59
  <param pos="0" name="service.vendor" value="Check Point"/>
54
60
  <param pos="0" name="service.product" value="Firewall-1"/>
55
61
  <param pos="0" name="service.family" value="Firewall-1"/>
62
+ <param pos="0" name="service.cpe23" value="cpe:/a:checkpoint:firewall-1:-"/>
56
63
  <param pos="0" name="os.vendor" value="Check Point"/>
57
64
  <param pos="0" name="os.device" value="Firewall"/>
58
65
  <param pos="0" name="os.family" value="Firewall-1"/>
@@ -276,6 +283,7 @@
276
283
  <example>Basic realm="SPIP Configuration", Digest realm="SPIP Configuration", nonce="116761147", algorithm="MD5"</example>
277
284
  <param pos="0" name="service.vendor" value="SPIP"/>
278
285
  <param pos="0" name="service.product" value="SPIP"/>
286
+ <param pos="0" name="service.cpe23" value="cpe:/a:spip:spip:-"/>
279
287
  </fingerprint>
280
288
  <fingerprint pattern="^.*(?:Basic|Digest) .*realm=&quot;HP ISEE @ ([^&quot;]+)&quot;.*$">
281
289
  <description>HP Instant Support Enterprise Edition with a hostname</description>
@@ -287,8 +295,10 @@
287
295
  <fingerprint pattern="^.*(?:Basic|Digest) .*realm=&quot;BIG-IP&quot;.*$">
288
296
  <description>Generic F5 Big-IP</description>
289
297
  <example>Basic realm="BIG-IP"</example>
290
- <param pos="0" name="os.vendor" value="F5"/>
291
- <param pos="0" name="os.product" value="BIG-IP"/>
298
+ <param pos="0" name="service.vendor" value="F5"/>
299
+ <param pos="0" name="service.family" value="BIG-IP"/>
300
+ <param pos="0" name="service.product" value="BIG-IP LTM"/>
301
+ <param pos="0" name="service.cpe23" value="cpe:/a:f5:big-ip_local_traffic_manager:-"/>
292
302
  </fingerprint>
293
303
  <!-- HP ProCurve -->
294
304
  <fingerprint pattern="^(?:Basic|Digest) realm=&quot;(?:HP|ProCurve) (J[3]\d{3}A)&quot;$" flags="REG_ICASE">
data/xml/imap_banners.xml CHANGED
@@ -1,16 +1,18 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
- <!-- IMAP banners are matched against these patterns to fingerprint IMAP servers. -->
3
2
  <fingerprints matches="imap4.banner" protocol="imap" database_type="service" preference="0.90">
3
+ <!-- IMAP banners are matched against these patterns to fingerprint IMAP servers. -->
4
4
  <fingerprint pattern="^Microsoft Exchange IMAP4rev1 server version (5\.5\.\d{4}\.\d+) \((.*)\) ready$">
5
5
  <description>Microsoft Exchange Server 5.5</description>
6
6
  <param pos="0" name="service.vendor" value="Microsoft"/>
7
7
  <param pos="0" name="service.family" value="Exchange Server"/>
8
8
  <param pos="0" name="service.product" value="Exchange Server 5.5"/>
9
9
  <param pos="1" name="service.version"/>
10
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:exchange_server:{service.version}"/>
10
11
  <param pos="0" name="os.vendor" value="Microsoft"/>
11
12
  <param pos="0" name="os.device" value="General"/>
12
13
  <param pos="0" name="os.family" value="Windows"/>
13
14
  <param pos="0" name="os.product" value="Windows"/>
15
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
14
16
  <param pos="2" name="host.name"/>
15
17
  </fingerprint>
16
18
  <fingerprint pattern="^Microsoft Exchange 2000 IMAP4rev1 server version (6\.0\.\d{4}\.\d+) \((.*)\) ready\.$">
@@ -19,10 +21,12 @@
19
21
  <param pos="0" name="service.family" value="Exchange Server"/>
20
22
  <param pos="0" name="service.product" value="Exchange 2000 Server"/>
21
23
  <param pos="1" name="service.version"/>
24
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:exchange_server:{service.version}"/>
22
25
  <param pos="0" name="os.vendor" value="Microsoft"/>
23
26
  <param pos="0" name="os.device" value="General"/>
24
27
  <param pos="0" name="os.family" value="Windows"/>
25
28
  <param pos="0" name="os.product" value="Windows"/>
29
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
26
30
  <param pos="2" name="host.name"/>
27
31
  </fingerprint>
28
32
  <fingerprint pattern="^Microsoft Exchange Server 2003 IMAP4rev1 server version (6\.5\.\d{4}\.\d+) \((.*)\) ready\.$">
@@ -31,10 +35,12 @@
31
35
  <param pos="0" name="service.family" value="Exchange Server"/>
32
36
  <param pos="0" name="service.product" value="Exchange 2003 Server"/>
33
37
  <param pos="1" name="service.version"/>
38
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:exchange_server:{service.version}"/>
34
39
  <param pos="0" name="os.vendor" value="Microsoft"/>
35
40
  <param pos="0" name="os.device" value="General"/>
36
41
  <param pos="0" name="os.family" value="Windows"/>
37
42
  <param pos="0" name="os.product" value="Windows"/>
43
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
38
44
  <param pos="2" name="host.name"/>
39
45
  </fingerprint>
40
46
  <fingerprint pattern="^Der Microsoft Exchange Server 2003 IMAP4rev1-Server, Version (6\.5\.\d{4}\.\d+) \((.*)\),.*$">
@@ -43,10 +49,12 @@
43
49
  <param pos="0" name="service.family" value="Exchange Server"/>
44
50
  <param pos="0" name="service.product" value="Exchange 2003 Server"/>
45
51
  <param pos="1" name="service.version"/>
52
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:exchange_server:{service.version}"/>
46
53
  <param pos="0" name="os.vendor" value="Microsoft"/>
47
54
  <param pos="0" name="os.device" value="General"/>
48
55
  <param pos="0" name="os.family" value="Windows"/>
49
56
  <param pos="0" name="os.product" value="Windows"/>
57
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
50
58
  <param pos="2" name="host.name"/>
51
59
  </fingerprint>
52
60
  <fingerprint pattern="^Microsoft Exchange Server 2007 IMAP4 service ready$">
@@ -54,10 +62,12 @@
54
62
  <param pos="0" name="service.vendor" value="Microsoft"/>
55
63
  <param pos="0" name="service.family" value="Exchange Server"/>
56
64
  <param pos="0" name="service.product" value="Exchange 2007 Server"/>
65
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:exchange_server:-"/>
57
66
  <param pos="0" name="os.vendor" value="Microsoft"/>
58
67
  <param pos="0" name="os.device" value="General"/>
59
68
  <param pos="0" name="os.family" value="Windows"/>
60
69
  <param pos="0" name="os.product" value="Windows"/>
70
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
61
71
  </fingerprint>
62
72
  <fingerprint pattern="^The Microsoft Exchange IMAP4 service is ready\.?$">
63
73
  <description>Microsoft Exchange Server</description>
@@ -65,10 +75,12 @@
65
75
  <param pos="0" name="service.vendor" value="Microsoft"/>
66
76
  <param pos="0" name="service.family" value="Exchange Server"/>
67
77
  <param pos="0" name="service.product" value="Exchange Server"/>
78
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:exchange_server:-"/>
68
79
  <param pos="0" name="os.vendor" value="Microsoft"/>
69
80
  <param pos="0" name="os.device" value="General"/>
70
81
  <param pos="0" name="os.family" value="Windows"/>
71
82
  <param pos="0" name="os.product" value="Windows"/>
83
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
72
84
  </fingerprint>
73
85
  <fingerprint pattern="^Domino IMAP4 Server Release (\d+\.\d+.*) ready (.+)$">
74
86
  <description>IBM Lotus Notes/Domino</description>
@@ -76,6 +88,7 @@
76
88
  <param pos="0" name="service.family" value="Lotus Domino"/>
77
89
  <param pos="0" name="service.product" value="Lotus Domino"/>
78
90
  <param pos="1" name="service.version"/>
91
+ <param pos="0" name="service.cpe23" value="cpe:/a:ibm:lotus_domino:{service.version}"/>
79
92
  <param pos="2" name="host.time"/>
80
93
  </fingerprint>
81
94
  <fingerprint pattern="^Domino IMAP4 Server V\.?(\d+\.\d+.*) ready (.+)$">
@@ -84,6 +97,7 @@
84
97
  <param pos="0" name="service.family" value="Lotus Domino"/>
85
98
  <param pos="0" name="service.product" value="Lotus Domino"/>
86
99
  <param pos="1" name="service.version"/>
100
+ <param pos="0" name="service.cpe23" value="cpe:/a:ibm:lotus_domino:{service.version}"/>
87
101
  <param pos="2" name="host.time"/>
88
102
  </fingerprint>
89
103
  <fingerprint pattern="^[dD]ovecot (?:DA )?ready\.$">
@@ -105,6 +119,7 @@
105
119
  <param pos="0" name="service.vendor" value="Nortel"/>
106
120
  <param pos="0" name="service.product" value="CallPilot"/>
107
121
  <param pos="2" name="service.version"/>
122
+ <param pos="0" name="service.cpe23" value="cpe:/a:nortel:callpilot:{service.version}"/>
108
123
  <param pos="1" name="host.name"/>
109
124
  </fingerprint>
110
125
  <fingerprint pattern="^(\S+) Zimbra IMAP4rev1 server ready\.?$">
@@ -113,6 +128,7 @@
113
128
  <example>dogfood.zimbra.com Zimbra IMAP4rev1 server ready</example>
114
129
  <param pos="0" name="service.vendor" value="VMware"/>
115
130
  <param pos="0" name="service.product" value="Zimbra"/>
131
+ <param pos="0" name="service.cpe23" value="cpe:/a:vmware:zimbra_desktop:-"/>
116
132
  <param pos="1" name="host.name"/>
117
133
  </fingerprint>
118
134
  <fingerprint pattern="^(\S+) Zimbra (\S+) IMAP4rev1 server ready\.?$">
@@ -121,6 +137,7 @@
121
137
  <param pos="0" name="service.vendor" value="VMware"/>
122
138
  <param pos="0" name="service.product" value="Zimbra"/>
123
139
  <param pos="2" name="service.version"/>
140
+ <param pos="0" name="service.cpe23" value="cpe:/a:vmware:zimbra_desktop:{service.version}"/>
124
141
  <param pos="1" name="host.name"/>
125
142
  </fingerprint>
126
143
  <fingerprint pattern="^(.+) Cyrus IMAP4 v(\d+\.\d+.*)-OS X(?: Server)? ([\d\.]+).* server ready$">
@@ -136,6 +153,7 @@
136
153
  <param pos="0" name="os.family" value="Mac OS X"/>
137
154
  <param pos="0" name="os.product" value="Mac OS X"/>
138
155
  <param pos="3" name="os.version"/>
156
+ <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:{os.version}"/>
139
157
  <param pos="1" name="host.name"/>
140
158
  </fingerprint>
141
159
  <fingerprint pattern="^(.+) Cyrus IMAP4? (?:\S+ )?v(\d+\.\d+.*) server ready$">
data/xml/ldap_searchresult.xml CHANGED
@@ -1,10 +1,9 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
- <!--
3
- Notes: Ruby will fail to build the RegExp if it contains \x84 which is a standard
4
- byte in ASN.1 Sequence length fields.
5
- -->
6
2
  <fingerprints matches="ldap.search_result" protocol="ldap" database_type="service" preference=".80">
7
-
3
+ <!--
4
+ Notes: Ruby will fail to build the RegExp if it contains \x84 which is a standard
5
+ byte in ASN.1 Sequence length fields.
6
+ -->
8
7
  <!--
9
8
  Samba - position prior to Windows entries due to regex. When testing new
10
9
  Samba fingerprints make sure you disable the matches for the version of
@@ -20,7 +19,6 @@
20
19
  <param pos="0" name="service.vendor" value="Samba"/>
21
20
  <param pos="0" name="service.product" value="Active Directory Controller"/>
22
21
  </fingerprint>
23
-
24
22
  <fingerprint pattern="(?m:vendorName1.\x04.Samba.*domainFunctionality1.\x04\x0100.\x04\x13forestFunctionality1\x03\x04\x0100)">
25
23
  <description>Samba Active Directory Controller emulating Windows 2000</description>
26
24
  <example _encoding="base64">
@@ -31,8 +29,6 @@
31
29
  <param pos="0" name="service.vendor" value="Samba"/>
32
30
  <param pos="0" name="service.product" value="Active Directory Controller"/>
33
31
  </fingerprint>
34
-
35
-
36
32
  <!--
37
33
  Windows Active Directory and Lightweight Directory Server (ADAM)
38
34
 
@@ -45,7 +41,6 @@
45
41
  1.2.840.113556.1.4.800 = Active Directory Controller
46
42
  1.2.840.113556.1.4.1851 = Lightweight Directory Server / ADAM
47
43
  -->
48
-
49
44
  <!-- Windows 2016 -->
50
45
  <fingerprint pattern="(?im:1.2.840.113556.1.4.800.*domainControllerFunctionality1.{1,5}\x04\x017)">
51
46
  <description>Active Directory Controller on Windows Server 2016</description>
@@ -55,11 +50,12 @@
55
50
  </example>
56
51
  <param pos="0" name="service.vendor" value="Microsoft"/>
57
52
  <param pos="0" name="service.product" value="Active Directory Controller"/>
53
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:active_directory:-"/>
58
54
  <param pos="0" name="os.vendor" value="Microsoft"/>
59
55
  <param pos="0" name="os.family" value="Windows"/>
60
56
  <param pos="0" name="os.product" value="Windows Server 2016"/>
57
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2016:-"/>
61
58
  </fingerprint>
62
-
63
59
  <fingerprint pattern="(?im:1.2.840.113556.1.4.1851.*domainControllerFunctionality1.{1,5}\x04\x017)">
64
60
  <description>Microsoft LDS on Windows Server Server 2016</description>
65
61
  <example _encoding="base64">
@@ -68,11 +64,12 @@
68
64
  </example>
69
65
  <param pos="0" name="service.vendor" value="Microsoft"/>
70
66
  <param pos="0" name="service.product" value="Lightweight Directory Server"/>
67
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:active_directory_lightweight_directory_service:-"/>
71
68
  <param pos="0" name="os.vendor" value="Microsoft"/>
72
69
  <param pos="0" name="os.family" value="Windows"/>
73
70
  <param pos="0" name="os.product" value="Windows Server 2016"/>
71
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2016:-"/>
74
72
  </fingerprint>
75
-
76
73
  <fingerprint pattern="(?im:domainControllerFunctionality1.{1,5}\x04\x017)">
77
74
  <description>Windows Server Server 2016</description>
78
75
  <example _encoding="base64">
@@ -81,10 +78,8 @@
81
78
  <param pos="0" name="os.vendor" value="Microsoft"/>
82
79
  <param pos="0" name="os.family" value="Windows"/>
83
80
  <param pos="0" name="os.product" value="Windows Server 2016"/>
81
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2016:-"/>
84
82
  </fingerprint>
85
-
86
-
87
-
88
83
  <!-- Windows 2012 R2 -->
89
84
  <fingerprint pattern="(?im:1.2.840.113556.1.4.800.*domainControllerFunctionality1.{1,5}\x04\x016)">
90
85
  <description>Active Directory Controller on Windows Server 2012 R2</description>
@@ -94,11 +89,12 @@
94
89
  </example>
95
90
  <param pos="0" name="service.vendor" value="Microsoft"/>
96
91
  <param pos="0" name="service.product" value="Active Directory Controller"/>
92
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:active_directory:-"/>
97
93
  <param pos="0" name="os.vendor" value="Microsoft"/>
98
94
  <param pos="0" name="os.family" value="Windows"/>
99
95
  <param pos="0" name="os.product" value="Windows Server 2012 R2"/>
96
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2012:-"/>
100
97
  </fingerprint>
101
-
102
98
  <fingerprint pattern="(?im:1.2.840.113556.1.4.1851.*domainControllerFunctionality1.{1,5}\x04\x016)">
103
99
  <description>Microsoft LDS on Windows Server Server 2012 R2</description>
104
100
  <example _encoding="base64">
@@ -107,11 +103,12 @@
107
103
  </example>
108
104
  <param pos="0" name="service.vendor" value="Microsoft"/>
109
105
  <param pos="0" name="service.product" value="Lightweight Directory Server"/>
106
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:active_directory_lightweight_directory_service:-"/>
110
107
  <param pos="0" name="os.vendor" value="Microsoft"/>
111
108
  <param pos="0" name="os.family" value="Windows"/>
112
109
  <param pos="0" name="os.product" value="Windows Server 2012 R2"/>
110
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2012:-"/>
113
111
  </fingerprint>
114
-
115
112
  <fingerprint pattern="(?im:domainControllerFunctionality1.{1,5}\x04\x016)">
116
113
  <description>Windows Server Server 2012 R2</description>
117
114
  <example _encoding="base64">
@@ -120,10 +117,8 @@
120
117
  <param pos="0" name="os.vendor" value="Microsoft"/>
121
118
  <param pos="0" name="os.family" value="Windows"/>
122
119
  <param pos="0" name="os.product" value="Windows Server 2012 R2"/>
120
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2012:-"/>
123
121
  </fingerprint>
124
-
125
-
126
-
127
122
  <!-- Windows 2012 -->
128
123
  <fingerprint pattern="(?im:1.2.840.113556.1.4.800.*domainControllerFunctionality1.{1,5}\x04\x015)">
129
124
  <description>Active Directory Controller on Windows Server 2012</description>
@@ -133,11 +128,12 @@
133
128
  </example>
134
129
  <param pos="0" name="service.vendor" value="Microsoft"/>
135
130
  <param pos="0" name="service.product" value="Active Directory Controller"/>
131
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:active_directory:-"/>
136
132
  <param pos="0" name="os.vendor" value="Microsoft"/>
137
133
  <param pos="0" name="os.family" value="Windows"/>
138
134
  <param pos="0" name="os.product" value="Windows Server 2012"/>
135
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2012:-"/>
139
136
  </fingerprint>
140
-
141
137
  <fingerprint pattern="(?im:1.2.840.113556.1.4.1851.*domainControllerFunctionality1.{1,5}\x04\x015)">
142
138
  <description>Microsoft LDS on Windows Server 2012 R2</description>
143
139
  <example _encoding="base64">
@@ -146,11 +142,12 @@
146
142
  </example>
147
143
  <param pos="0" name="service.vendor" value="Microsoft"/>
148
144
  <param pos="0" name="service.product" value="Lightweight Directory Server"/>
145
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:active_directory_lightweight_directory_service:-"/>
149
146
  <param pos="0" name="os.vendor" value="Microsoft"/>
150
147
  <param pos="0" name="os.family" value="Windows"/>
151
148
  <param pos="0" name="os.product" value="Windows Server 2012"/>
149
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2012:-"/>
152
150
  </fingerprint>
153
-
154
151
  <fingerprint pattern="(?im:domainControllerFunctionality1.{1,5}\x04\x015)">
155
152
  <description>Windows Server Server 2012</description>
156
153
  <example _encoding="base64">
@@ -159,8 +156,8 @@
159
156
  <param pos="0" name="os.vendor" value="Microsoft"/>
160
157
  <param pos="0" name="os.family" value="Windows"/>
161
158
  <param pos="0" name="os.product" value="Windows Server 2012"/>
159
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2012:-"/>
162
160
  </fingerprint>
163
-
164
161
  <!-- Windows 2008 R2 -->
165
162
  <fingerprint pattern="(?im:1.2.840.113556.1.4.800.*domainControllerFunctionality1.{1,5}\x04\x014)">
166
163
  <description>Active Directory Controller on Windows Server 2008 R2</description>
@@ -170,11 +167,12 @@
170
167
  </example>
171
168
  <param pos="0" name="service.vendor" value="Microsoft"/>
172
169
  <param pos="0" name="service.product" value="Active Directory Controller"/>
170
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:active_directory:-"/>
173
171
  <param pos="0" name="os.vendor" value="Microsoft"/>
174
172
  <param pos="0" name="os.family" value="Windows"/>
175
173
  <param pos="0" name="os.product" value="Windows Server 2008 R2"/>
174
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2008:-"/>
176
175
  </fingerprint>
177
-
178
176
  <fingerprint pattern="(?im:1.2.840.113556.1.4.1851.*domainControllerFunctionality1.{1,5}\x04\x014)">
179
177
  <description>Microsoft LDS on Windows Server Server 2008 R2</description>
180
178
  <example _encoding="base64">
@@ -183,11 +181,12 @@
183
181
  </example>
184
182
  <param pos="0" name="service.vendor" value="Microsoft"/>
185
183
  <param pos="0" name="service.product" value="Lightweight Directory Server"/>
184
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:active_directory_lightweight_directory_service:-"/>
186
185
  <param pos="0" name="os.vendor" value="Microsoft"/>
187
186
  <param pos="0" name="os.family" value="Windows"/>
188
187
  <param pos="0" name="os.product" value="Windows Server 2008 R2"/>
188
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2008:-"/>
189
189
  </fingerprint>
190
-
191
190
  <!--
192
191
  This generic match for domainControllerFunctionality = 4 will capture
193
192
  current Samba implementations. Disable the fingerprint below when testing Samba
@@ -200,8 +199,8 @@
200
199
  <param pos="0" name="os.vendor" value="Microsoft"/>
201
200
  <param pos="0" name="os.family" value="Windows"/>
202
201
  <param pos="0" name="os.product" value="Windows Server 2008 R2"/>
202
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2008:-"/>
203
203
  </fingerprint>
204
-
205
204
  <!-- Windows 2008 -->
206
205
  <fingerprint pattern="(?im:1.2.840.113556.1.4.800.*domainControllerFunctionality1.{1,5}\x04\x013)">
207
206
  <description>Active Directory Controller on Windows Server 2008</description>
@@ -211,11 +210,12 @@
211
210
  </example>
212
211
  <param pos="0" name="service.vendor" value="Microsoft"/>
213
212
  <param pos="0" name="service.product" value="Active Directory Controller"/>
213
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:active_directory:-"/>
214
214
  <param pos="0" name="os.vendor" value="Microsoft"/>
215
215
  <param pos="0" name="os.family" value="Windows"/>
216
216
  <param pos="0" name="os.product" value="Windows Server 2008"/>
217
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2008:-"/>
217
218
  </fingerprint>
218
-
219
219
  <fingerprint pattern="(?im:1.2.840.113556.1.4.1851.*domainControllerFunctionality1.{1,5}\x04\x013)">
220
220
  <description>Microsoft LDS on Windows Server 2008</description>
221
221
  <example _encoding="base64">
@@ -224,11 +224,12 @@
224
224
  </example>
225
225
  <param pos="0" name="service.vendor" value="Microsoft"/>
226
226
  <param pos="0" name="service.product" value="Lightweight Directory Server"/>
227
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:active_directory_lightweight_directory_service:-"/>
227
228
  <param pos="0" name="os.vendor" value="Microsoft"/>
228
229
  <param pos="0" name="os.family" value="Windows"/>
229
230
  <param pos="0" name="os.product" value="Windows Server 2008"/>
231
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2008:-"/>
230
232
  </fingerprint>
231
-
232
233
  <fingerprint pattern="(?im:domainControllerFunctionality1.{1,5}\x04\x013)">
233
234
  <description>Windows Server Server 2008</description>
234
235
  <example _encoding="base64">
@@ -237,8 +238,8 @@
237
238
  <param pos="0" name="os.vendor" value="Microsoft"/>
238
239
  <param pos="0" name="os.family" value="Windows"/>
239
240
  <param pos="0" name="os.product" value="Windows Server 2008"/>
241
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2008:-"/>
240
242
  </fingerprint>
241
-
242
243
  <!-- Windows 2003 -->
243
244
  <fingerprint pattern="(?im:1.2.840.113556.1.4.800.*domainControllerFunctionality1.{1,5}\x04\x012)">
244
245
  <description>Active Directory Controller on Windows Server 2003</description>
@@ -248,11 +249,12 @@
248
249
  </example>
249
250
  <param pos="0" name="service.vendor" value="Microsoft"/>
250
251
  <param pos="0" name="service.product" value="Active Directory Controller"/>
252
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:active_directory:-"/>
251
253
  <param pos="0" name="os.vendor" value="Microsoft"/>
252
254
  <param pos="0" name="os.family" value="Windows"/>
253
255
  <param pos="0" name="os.product" value="Windows Server 2003"/>
256
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2003:-"/>
254
257
  </fingerprint>
255
-
256
258
  <fingerprint pattern="(?im:1.2.840.113556.1.4.1851.*domainControllerFunctionality1.{1,5}\x04\x012)">
257
259
  <description>Microsoft LDS on Windows Server 2003</description>
258
260
  <example _encoding="base64">
@@ -261,11 +263,12 @@
261
263
  </example>
262
264
  <param pos="0" name="service.vendor" value="Microsoft"/>
263
265
  <param pos="0" name="service.product" value="Lightweight Directory Server"/>
266
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:active_directory_lightweight_directory_service:-"/>
264
267
  <param pos="0" name="os.vendor" value="Microsoft"/>
265
268
  <param pos="0" name="os.family" value="Windows"/>
266
269
  <param pos="0" name="os.product" value="Windows Server 2003"/>
270
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2003:-"/>
267
271
  </fingerprint>
268
-
269
272
  <fingerprint pattern="(?im:domainControllerFunctionality1.{1,5}\x04\x012)">
270
273
  <description>Windows Server Server 2003</description>
271
274
  <example _encoding="base64">
@@ -274,8 +277,8 @@
274
277
  <param pos="0" name="os.vendor" value="Microsoft"/>
275
278
  <param pos="0" name="os.family" value="Windows"/>
276
279
  <param pos="0" name="os.product" value="Windows Server 2003"/>
280
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_server_2003:-"/>
277
281
  </fingerprint>
278
-
279
282
  <!-- Win Server 2000 Service Pack 3 only has two matching supportedCapabilities OIDs, match them and look for explicit end-->
280
283
  <fingerprint pattern="(?im:supportedCapabilities1.{1,5}\x04\x161.2.840.113556.1.4.800\x04\x171.2.840.113556.1.4.17910.{1,5}\x04.(?:supportedControl|isSynchronized))">
281
284
  <description>Active Directory Controller on Windows Server 2000 SP 3</description>
@@ -289,12 +292,13 @@
289
292
  </example>
290
293
  <param pos="0" name="service.vendor" value="Microsoft"/>
291
294
  <param pos="0" name="service.product" value="Active Directory Controller"/>
295
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:active_directory:-"/>
292
296
  <param pos="0" name="os.vendor" value="Microsoft"/>
293
297
  <param pos="0" name="os.family" value="Windows"/>
294
298
  <param pos="0" name="os.product" value="Windows Server 2000"/>
295
299
  <param pos="0" name="os.version" value="Windows Server 2000 SP3"/>
300
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_2000:Windows Server 2000 SP3"/>
296
301
  </fingerprint>
297
-
298
302
  <!-- Win Server 2000 RTM only has a single matching supportedCapabilities OID, match it and look for explicit end-->
299
303
  <fingerprint pattern="(?im:supportedCapabilities1.{1,5}\x04\x161.2.840.113556.1.4.8000.{1,5}\x04.isSynchronized1)">
300
304
  <description>Active Directory Controller on Windows Server 2000</description>
@@ -304,13 +308,13 @@
304
308
  </example>
305
309
  <param pos="0" name="service.vendor" value="Microsoft"/>
306
310
  <param pos="0" name="service.product" value="Active Directory Controller"/>
311
+ <param pos="0" name="service.cpe23" value="cpe:/a:microsoft:active_directory:-"/>
307
312
  <param pos="0" name="os.vendor" value="Microsoft"/>
308
313
  <param pos="0" name="os.family" value="Windows"/>
309
314
  <param pos="0" name="os.product" value="Windows Server 2000"/>
315
+ <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_2000:-"/>
310
316
  </fingerprint>
311
-
312
317
  <!-- End of Microsoft Windows Section -->
313
-
314
318
  <fingerprint pattern="(?im:top\x04..penLDAProotDSE)">
315
319
  <description>OpenLDAP</description>
316
320
  <example _encoding="base64">
@@ -318,8 +322,8 @@
318
322
  </example>
319
323
  <param pos="0" name="service.vendor" value="OpenLDAP"/>
320
324
  <param pos="0" name="service.product" value="OpenLDAP"/>
325
+ <param pos="0" name="service.cpe23" value="cpe:/a:openldap:openldap:-"/>
321
326
  </fingerprint>
322
-
323
327
  <fingerprint pattern="(?i:namingcontexts1.\x04.fn=ContactRoot0.[\x02\x04])">
324
328
  <description>Kerio Connect</description>
325
329
  <example service.product="Connect" _encoding="base64">
@@ -329,7 +333,6 @@
329
333
  <param pos="0" name="service.vendor" value="Kerio"/>
330
334
  <param pos="0" name="service.product" value="Connect"/>
331
335
  </fingerprint>
332
-
333
336
  <fingerprint pattern="(?im:vmwPlatformServicesControllerVersion1.\x04.(\d\.\d\.\d)0.)">
334
337
  <description>VMware Platform Services Controller</description>
335
338
  <example service.version="6.0.0" _encoding="base64">
@@ -339,7 +342,6 @@
339
342
  <param pos="0" name="service.product" value="Platform Services Controller"/>
340
343
  <param pos="1" name="service.version"/>
341
344
  </fingerprint>
342
-
343
345
  <!-- Fedora / 389 Project family -->
344
346
  <!-- http://directory.fedoraproject.org/docs/389ds/FAQ/history.html -->
345
347
  <fingerprint pattern="(?i:vendorname1.\x04.Fedora Project0.\x04\rvendorversion1.\x04.Fedora-Directory/(\d\.\d[\w.]* B\d+\.\d+\.\d+))">
@@ -352,11 +354,10 @@
352
354
  dmVuZG9yTmFtZTEQBA5GZWRvcmEgUHJvamVjdDA4BA12ZW5kb3JWZXJzaW9uMScEJUZlZG9yY
353
355
  S1EaXJlY3RvcnkvMS4wLjQgQjIwMDcuMzA0LjExMzgw
354
356
  </example>
355
- <param pos="0" name="service.vendor" value="Fedora Project"/>
357
+ <param pos="0" name="service.vendor" value="Red Hat"/>
356
358
  <param pos="0" name="service.product" value="Fedora Directory Server"/>
357
359
  <param pos="1" name="service.version"/>
358
360
  </fingerprint>
359
-
360
361
  <fingerprint pattern="(?i:vendorname1.\x04.389 Project0.\x04\rvendorversion1.\x04.389-Directory/(\d\.\d[\w.]* B\d+\.\d+\.\d+))">
361
362
  <description>389 Project 389 Directory Server</description>
362
363
  <example service.version="1.2.11.25 B2013.325.19510" _encoding="base64">
@@ -367,7 +368,6 @@
367
368
  <param pos="0" name="service.product" value="389 Directory Server"/>
368
369
  <param pos="1" name="service.version"/>
369
370
  </fingerprint>
370
-
371
371
  <fingerprint pattern="(?im:vendorName1.\x04.CentOS0.\x04\rvendorVersion1.\x04.CentOS-Directory/(\d\.\d[\w.]* B\d+\.\d+\.\d+).\x04\v)">
372
372
  <description>CentOS CentOS Directory Server</description>
373
373
  <example service.version="8.2.8 B2012.041.12270" _encoding="base64">
@@ -378,7 +378,6 @@
378
378
  <param pos="0" name="service.product" value="CentOS Directory Server"/>
379
379
  <param pos="1" name="service.version"/>
380
380
  </fingerprint>
381
-
382
381
  <fingerprint pattern="(?im:vendorName1.\x04.Red Hat(?:, Inc.)?0.\x04\rvendorVersion1.\x04.Red Hat-Directory/(\d\.\d[\w.]* B\d+\.\d+\.\d+).\x04\v)">
383
382
  <description>Red Hat Red Hat Directory Server</description>
384
383
  <example service.version="8.2.0 B2010.210.0590" _encoding="base64">
@@ -388,8 +387,8 @@
388
387
  <param pos="0" name="service.vendor" value="Red Hat"/>
389
388
  <param pos="0" name="service.product" value="Red Hat Directory Server"/>
390
389
  <param pos="1" name="service.version"/>
390
+ <param pos="0" name="service.cpe23" value="cpe:/a:redhat:directory_server:{service.version}"/>
391
391
  </fingerprint>
392
-
393
392
  <fingerprint pattern="(?i:vendorname1.\x04.Netscape Communications Corp.0.\x04\rvendorversion1.\x04.Netscape-Directory/(\d\.\d[\d.]* B\d+\.\d+\.\d+).\x04\v)">
394
393
  <description>Netscape Directory Server</description>
395
394
  <example service.version="6.11 B2002.281.08530" _encoding="base64">
@@ -404,7 +403,6 @@
404
403
  <param pos="0" name="service.product" value="Netscape Directory Server"/>
405
404
  <param pos="1" name="service.version"/>
406
405
  </fingerprint>
407
-
408
406
  <fingerprint pattern="(?im:IBM Lotus Software0.\x04\rvendorversion1.\x04.Release (\d+\.\d+[\w .]*)0.\x04.dominomajminversion)">
409
407
  <description>IBM (Lotus) Domino LDAP Server</description>
410
408
  <example service.version="8.5.3" _encoding="base64">
@@ -419,7 +417,6 @@
419
417
  <param pos="0" name="service.product" value="Domino LDAP Server"/>
420
418
  <param pos="1" name="service.version"/>
421
419
  </fingerprint>
422
-
423
420
  <fingerprint pattern="(?im:IBM Lotus Software0.\x04\rvendorversion1.\x04.Release (\d+\.\d+[\w .]*)0\f)">
424
421
  <description>IBM (Lotus) Domino LDAP Server</description>
425
422
  <example service.version="9.0.1FP4 HF523" _encoding="base64">
@@ -430,7 +427,6 @@
430
427
  <param pos="0" name="service.product" value="Domino LDAP Server"/>
431
428
  <param pos="1" name="service.version"/>
432
429
  </fingerprint>
433
-
434
430
  <fingerprint pattern="(?im:IBM Lotus Software0.\x04\rvendorversion1.\x04.Build (V[\w .]*)0.\x04.dominomajminversion)">
435
431
  <description>IBM (Lotus) Domino LDAP Server</description>
436
432
  <example service.version="V902_12302013" _encoding="base64">
@@ -441,7 +437,6 @@
441
437
  <param pos="0" name="service.product" value="Domino LDAP Server"/>
442
438
  <param pos="1" name="service.version"/>
443
439
  </fingerprint>
444
-
445
440
  <!-- Attachmate Group (NetIQ) purchased Novell in 2011, and then merged w/ Micro Focus in 2014 -->
446
441
  <fingerprint pattern="(?im:vendorName1\x13\x04\x11NetIQ Corporation0.\x04\rvendorVersion.{4}LDAP Agent for NetIQ eDirectory (\d+\.\d+[\d.]* [\w ]*\([\d.]+\))0.\x04)">
447
442
  <description>NetIQ LDAP Agent for eDirectory</description>
@@ -454,7 +449,6 @@
454
449
  <param pos="0" name="service.product" value="LDAP Agent for eDirectory"/>
455
450
  <param pos="1" name="service.version"/>
456
451
  </fingerprint>
457
-
458
452
  <fingerprint pattern="(?im:vendorName1\x0E\x04\fNovell, Inc.0.\x04\rvendorVersion.{4}LDAP Agent for Novell eDirectory (\d+\.\d+[\d.]* [\w ]*\([\d.]+\))0.\x04)">
459
453
  <description>Novell LDAP Agent for eDirectory</description>
460
454
  <example service.version="8.7.3.8 (10554.99)" _encoding="base64">
@@ -469,7 +463,6 @@
469
463
  <param pos="0" name="service.product" value="LDAP Agent for eDirectory"/>
470
464
  <param pos="1" name="service.version"/>
471
465
  </fingerprint>
472
-
473
466
  <fingerprint pattern="(?im:vendorName1\x0E\x04\fNovell, Inc.0/\x04\rvendorVersion1\x1E\x04\x1CeDirectory v(\d+\.\d+[\d.]* [\w ]*\([\d.]+\))0.\x04)">
474
467
  <description>Novell eDirectory</description>
475
468
  <example service.version="8.6.2 (10350.18)" _encoding="base64">
@@ -479,8 +472,8 @@
479
472
  <param pos="0" name="service.vendor" value="Novell"/>
480
473
  <param pos="0" name="service.product" value="eDirectory"/>
481
474
  <param pos="1" name="service.version"/>
475
+ <param pos="0" name="service.cpe23" value="cpe:/a:novell:edirectory:{service.version}"/>
482
476
  </fingerprint>
483
-
484
477
  <!-- Various iterations of Sun, now Oracle, Directory Server -->
485
478
  <fingerprint pattern="(?i:vendorname1\x18\x04\x16Sun Microsystems, Inc.0.+\x04\rvendorversion1.{1,2}\x04.{1,2}Sun[- ]Java\(tm\)[- ]System[- ]Directory(?: Server)?/(\d\.\d+[\w.]*)0.{1,3}\x04)">
486
479
  <description>Sun Java(TM) System Directory Server</description>
@@ -505,7 +498,6 @@
505
498
  <param pos="0" name="service.product" value="Sun Java System Directory Server"/>
506
499
  <param pos="1" name="service.version"/>
507
500
  </fingerprint>
508
-
509
501
  <fingerprint pattern="(?i:vendorname1\x18\x04\x16Sun Microsystems, Inc.0.\x04\rvendorversion1.\x04.Sun-Directory-Server/([\w.]+)0.{1,3}\x04)">
510
502
  <description>Sun Directory Server</description>
511
503
  <example service.version="7.0" _encoding="base64">
@@ -524,7 +516,6 @@
524
516
  <param pos="0" name="service.product" value="Sun Directory Server"/>
525
517
  <param pos="1" name="service.version"/>
526
518
  </fingerprint>
527
-
528
519
  <fingerprint pattern="(?i:vendorname1\x14\x04\x12Oracle Corporation0.\x04\rvendorversion1.\x04.Sun-Directory-Server/([\w.]+)[0 ].{1,3}\x04)">
529
520
  <description>Oracle Sun Directory Server</description>
530
521
  <example service.version="11.1.1.7.2" _encoding="base64">
@@ -539,7 +530,6 @@
539
530
  <param pos="0" name="service.product" value="Sun Directory Server"/>
540
531
  <param pos="1" name="service.version"/>
541
532
  </fingerprint>
542
-
543
533
  <fingerprint pattern="(?im:vendorName1\x17\x04\x15Sun Microsystems, Inc0.\x04\rvendorVersion1.\x04.Directory Proxy Server ([\w.]+)0.\x04)">
544
534
  <description>Sun Directory Proxy Server</description>
545
535
  <example service.version="11.1.1.7.1" _encoding="base64">
@@ -550,7 +540,6 @@
550
540
  <param pos="0" name="service.product" value="Sun Directory Proxy Server"/>
551
541
  <param pos="1" name="service.version"/>
552
542
  </fingerprint>
553
-
554
543
  <!-- Very old, rare, same family as above. Roll into those? -->
555
544
  <fingerprint pattern="(?i:vendorname1.\x04.Sun Microsystems, Inc.0.\x04\rvendorversion1.\x04.Sun-ONE-Directory/([\w.]+)0.\x04)">
556
545
  <description>Sun ONE Directory Server</description>
@@ -566,9 +555,7 @@
566
555
  <param pos="0" name="service.product" value="Sun ONE Directory Server"/>
567
556
  <param pos="1" name="service.version"/>
568
557
  </fingerprint>
569
-
570
558
  <!-- IBM [Tivoli | Security] Directory Server -->
571
-
572
559
  <fingerprint pattern="(?im:International Business Machines \(IBM\)0.*\x04\rvendorversion1.\x00\x00\x00.\x04.([\d.]+)0.\x00.*ibm-osregistrycontext1.\x00\x00\x00.\x04.OS400-SYS=)">
573
560
  <description>IBM Security Directory Server on OS/400 (IBM i)</description>
574
561
  <example service.version="5.2" _encoding="base64">
@@ -582,8 +569,8 @@
582
569
  <param pos="0" name="service.vendor" value="IBM"/>
583
570
  <param pos="0" name="service.product" value="Security Directory Server"/>
584
571
  <param pos="1" name="service.version"/>
572
+ <param pos="0" name="service.cpe23" value="cpe:/a:ibm:security_directory_server:{service.version}"/>
585
573
  </fingerprint>
586
-
587
574
  <fingerprint pattern="(?im:vendorname1.+?\x04%International Business Machines \(IBM\)0.+?\x04\rvendorversion1.+?\x04.([\d.]+)0.[\x00\x02\x04])">
588
575
  <description>IBM Security Directory Server</description>
589
576
  <example service.version="5.1" _encoding="base64">
@@ -597,8 +584,8 @@
597
584
  <param pos="0" name="service.vendor" value="IBM"/>
598
585
  <param pos="0" name="service.product" value="Security Directory Server"/>
599
586
  <param pos="1" name="service.version"/>
587
+ <param pos="0" name="service.cpe23" value="cpe:/a:ibm:security_directory_server:{service.version}"/>
600
588
  </fingerprint>
601
-
602
589
  <fingerprint pattern="(?im:vendorName1.\x00\x00\x00\v\x04\tMirapoint0.\x00\x00\x00.\x04\rvendorVersion1.\x00\x00\x00.\x04.([\d.]+)0.\x00)">
603
590
  <description>Mirapoint LDAP Server</description>
604
591
  <example service.version="3.2" _encoding="base64">
@@ -609,7 +596,6 @@
609
596
  <param pos="0" name="service.product" value="LDAP Server"/>
610
597
  <param pos="1" name="service.version"/>
611
598
  </fingerprint>
612
-
613
599
  <fingerprint pattern="(?im:orcldirectoryversion1.{1,5}\x04.OID ([\d.]+)0.\x00\x00)">
614
600
  <description>Oracle Internet Directory</description>
615
601
  <example service.version="9.0.4.0.0" _encoding="base64">
@@ -619,7 +605,6 @@
619
605
  <param pos="0" name="service.product" value="Internet Directory Server"/>
620
606
  <param pos="1" name="service.version"/>
621
607
  </fingerprint>
622
-
623
608
  <fingerprint pattern="(?im:orcldirectoryversion1.{1,5}\x04.OVD ([\d.]+)0.\x04)">
624
609
  <description>Oracle Virtual Directory</description>
625
610
  <example service.version="11.1.1.6.0" _encoding="base64">
@@ -629,7 +614,6 @@
629
614
  <param pos="0" name="service.product" value="Virtual Directory Server"/>
630
615
  <param pos="1" name="service.version"/>
631
616
  </fingerprint>
632
-
633
617
  <fingerprint pattern="(?im:metaProductID.*\x04\vmetaVersion1\r\x04.([\d.]+)0.\x04)">
634
618
  <description>estos MetaDirectory</description>
635
619
  <example service.version="3.5.22.4291" _encoding="base64">
@@ -642,7 +626,6 @@
642
626
  <param pos="0" name="os.vendor" value="Microsoft"/>
643
627
  <param pos="0" name="os.family" value="Windows"/>
644
628
  </fingerprint>
645
-
646
629
  <fingerprint pattern="(?im:dsaVersion1.\x04,DC Directory Server v(\d+\.\d+[\d.]* \([\w. ]+\))0.\x04)">
647
630
  <description>Cisco Data Connection Directory</description>
648
631
  <example service.version="8.1.00 (build 20150305)" _encoding="base64">
@@ -653,7 +636,6 @@
653
636
  <param pos="0" name="service.product" value="Data Connection Directory"/>
654
637
  <param pos="1" name="service.version"/>
655
638
  </fingerprint>
656
-
657
639
  <!-- Unbound -->
658
640
  <fingerprint pattern="(?im:vendorName1.\x04.UnboundID Corp.0.\x04\rvendorVersion1.\x04.UnboundID Directory Server ([\d.]+)0\f)">
659
641
  <description>UnboundID Directory Server</description>
@@ -665,7 +647,6 @@
665
647
  <param pos="0" name="service.product" value="UnboundID Directory Server"/>
666
648
  <param pos="1" name="service.version"/>
667
649
  </fingerprint>
668
-
669
650
  <fingerprint pattern="(?im:vendorName1.\x04.UnboundID Corp.0.\x04\rvendorVersion1.\x04.UnboundID Directory Proxy Server ([\d.]+)0\f)">
670
651
  <description>UnboundID Directory Proxy Server</description>
671
652
  <example service.version="4.7.0.7" _encoding="base64">
@@ -676,7 +657,6 @@
676
657
  <param pos="0" name="service.product" value="UnboundID Directory Proxy Server"/>
677
658
  <param pos="1" name="service.version"/>
678
659
  </fingerprint>
679
-
680
660
  <fingerprint pattern="(?im:namingContexts1.\x04.cn=.?pbx.*\x04.ldapServiceName1.\x04.IPVA-\w+-)">
681
661
  <description>innovaphone VoIP Gateway Virtual Appliance</description>
682
662
  <example _encoding="base64">
@@ -687,7 +667,6 @@
687
667
  <param pos="0" name="service.family" value="VoiP Gateway"/>
688
668
  <param pos="0" name="service.product" value="IPVA"/>
689
669
  </fingerprint>
690
-
691
670
  <fingerprint pattern="(?im:namingContexts1.\x04.cn=.?pbx.*\x04.ldapServiceName1.\x04.(IP\d+)-\w+-)">
692
671
  <description>innovaphone VoIP Gateway</description>
693
672
  <example service.product="IP800" _encoding="base64">
@@ -698,7 +677,6 @@
698
677
  <param pos="0" name="service.family" value="VoiP Gateway"/>
699
678
  <param pos="1" name="service.product"/>
700
679
  </fingerprint>
701
-
702
680
  <fingerprint pattern="(?im:namingContexts1.\x04.cn=.?pbx.*\x04.ldapServiceName1.\x04.(IPBS\d*)-\w+-)">
703
681
  <description>Ascom IP-DECT Base Station</description>
704
682
  <example service.product="IPBS2" _encoding="base64">
@@ -709,7 +687,6 @@
709
687
  <param pos="0" name="service.family" value="IP-DECT Base Station"/>
710
688
  <param pos="1" name="service.product"/>
711
689
  </fingerprint>
712
-
713
690
  <fingerprint pattern="(?im:namingContexts1.\x04.cn=.?pbx.*\x04.ldapServiceName1.\x04.(IPBL\d*)-\w+-)">
714
691
  <description>Ascom IP-DECT Gateway</description>
715
692
  <example service.product="IPBL" _encoding="base64">
@@ -720,7 +697,6 @@
720
697
  <param pos="0" name="service.family" value="IP-DECT Gateway"/>
721
698
  <param pos="1" name="service.product"/>
722
699
  </fingerprint>
723
-
724
700
  <fingerprint pattern="(?im:o=Scalix0.\x04.subschemasubentry1.\x04.cn=subSchema,o=Scalix0.\x04.*\x04.xserverversion1.\x04.(\d\d\.\d+\.[\w.-]+)0.\x02)">
725
701
  <description>Scalix LDAP Server</description>
726
702
  <example service.version="11.4.6.13676" _encoding="base64">