Skip to content

Commit

Permalink
Update CPEs and cleanup whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
@mkienow-r7
mkienow-r7 committed Nov 19, 2021
1 parent 1a97829 commit aeaace2
Show file tree
Hide file tree
Showing 15 changed files with 44 additions and 40 deletions.
2 changes: 1 addition & 1 deletion xml/dhcp_vendor_class.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,4 +203,4 @@
<param pos="0" name="os.family" value="Windows"/>
</fingerprint>

</fingerprints>
</fingerprints>
7 changes: 4 additions & 3 deletions xml/favicons.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1859,6 +1859,7 @@
<param pos="0" name="hw.device" value="Access Control"/>
<param pos="0" name="hw.family" value="iSTAR Door Controllers"/>
<param pos="0" name="hw.product" value="iSTAR Ultra"/>
<param pos="0" name="hw.cpe23" value="cpe:/h:swhouse:istar_ultra:-"/>
</fingerprint>

<fingerprint pattern="^fc83221e4a9e57f2e0b10416de541ca3|e518c347f94a594de49e3f3948b8e6e5$">
Expand Down Expand Up @@ -1890,7 +1891,7 @@
<param pos="0" name="hw.product" value="Novus UPS"/>
</fingerprint>

<fingerprint pattern="^34a1514e6ab88611178ef9bda6e1c752$">
<fingerprint pattern="^34a1514e6ab88611178ef9bda6e1c752$">
<description>ProSoft RadioLinx</description>
<example>34a1514e6ab88611178ef9bda6e1c752</example>
<param pos="0" name="hw.vendor" value="ProSoft Technology"/>
Expand Down Expand Up @@ -1940,10 +1941,10 @@
<example>716417a84b643460167d84e251579491</example>
<param pos="0" name="os.vendor" value="LG"/>
<param pos="0" name="os.product" value="webOS"/>
<param pos="0" name="os.certainty" value="0.5"/>
<param pos="0" name="os.certainty" value="0.5"/>
<param pos="0" name="hw.vendor" value="LG"/>
<param pos="0" name="hw.device" value="Smart TV"/>
<param pos="0" name="hw.certainty" value="0.5"/>
</fingerprint>

</fingerprints>
</fingerprints>
2 changes: 1 addition & 1 deletion xml/ftp_banners.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1809,4 +1809,4 @@ more text</example>
<param pos="0" name="hw.device" value="Printer"/>
</fingerprint>

</fingerprints>
</fingerprints>
27 changes: 13 additions & 14 deletions xml/html_title.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,6 @@
<param pos="0" name="os.vendor" value="MikroTik"/>
<param pos="0" name="os.device" value="Switch"/>
<param pos="0" name="os.product" value="SwOS"/>
<param pos="0" name="os.cpe23" value="cpe:/o:mikrotik:swos:-"/>
<param pos="0" name="hw.vendor" value="MikroTik"/>
<param pos="0" name="hw.device" value="Switch"/>
</fingerprint>
Expand Down Expand Up @@ -797,7 +796,7 @@
<param pos="2" name="host.mac"/>
</fingerprint>

<fingerprint pattern="^Digi Configuration and Management$">
<fingerprint pattern="^Digi Configuration and Management$">
<description>Digi Cellular Routers (Generic)</description>
<example>Digi Configuration and Management</example>
<param pos="0" name="hw.vendor" value="Digi"/>
Expand All @@ -823,7 +822,7 @@
<param pos="1" name="hw.product"/>
</fingerprint>

<fingerprint pattern="^Lantronix WEB-Manager$">
<fingerprint pattern="^Lantronix WEB-Manager$">
<description>Lantronix UDS terminal server</description>
<example>Lantronix WEB-Manager</example>
<param pos="0" name="hw.vendor" value="Lantronix"/>
Expand Down Expand Up @@ -1434,7 +1433,6 @@
<param pos="0" name="service.vendor" value="Cisco"/>
<param pos="0" name="service.product" value="ASDM"/>
<param pos="1" name="service.version"/>
<param pos="0" name="service.cpe23" value="cpe:/a:cisco:asdm:{service.version}"/>
</fingerprint>

<fingerprint pattern="^Duo Access Gateway$">
Expand Down Expand Up @@ -2876,7 +2874,6 @@
<example>Rundeck - Login</example>
<param pos="0" name="service.vendor" value="Rundeck"/>
<param pos="0" name="service.product" value="Rundeck"/>
<param pos="0" name="service.cpe23" value="cpe:/a:rundeck:rundeck:-"/>
</fingerprint>

<fingerprint pattern="^CrushFTP WebInterface$">
Expand Down Expand Up @@ -3406,6 +3403,7 @@
<example>Shelly Color Bulb</example>
<param pos="0" name="os.vendor" value="Cesanta"/>
<param pos="0" name="os.product" value="Mongoose OS"/>
<param pos="0" name="os.cpe23" value="cpe:/o:cesanta:mongoose_os:-"/>
<param pos="0" name="hw.vendor" value="Shelly"/>
<param pos="0" name="hw.device" value="Light Bulb"/>
<param pos="0" name="hw.product" value="Color Bulb"/>
Expand All @@ -3419,6 +3417,7 @@
<example hw.product="Switch">Shelly Switch</example>
<param pos="0" name="os.vendor" value="Cesanta"/>
<param pos="0" name="os.product" value="Mongoose OS"/>
<param pos="0" name="os.cpe23" value="cpe:/o:cesanta:mongoose_os:-"/>
<param pos="0" name="hw.vendor" value="Shelly"/>
<param pos="0" name="hw.device" value="Device"/>
<param pos="1" name="hw.product"/>
Expand All @@ -3430,6 +3429,7 @@
<example hw.product="1L">Shelly1L</example>
<param pos="0" name="os.vendor" value="Cesanta"/>
<param pos="0" name="os.product" value="Mongoose OS"/>
<param pos="0" name="os.cpe23" value="cpe:/o:cesanta:mongoose_os:-"/>
<param pos="0" name="hw.vendor" value="Shelly"/>
<param pos="0" name="hw.device" value="Device"/>
<param pos="1" name="hw.product"/>
Expand Down Expand Up @@ -3471,14 +3471,14 @@
<param pos="0" name="service.vendor" value="Ubiquiti"/>
<param pos="0" name="service.product" value="UniFi"/>
<param pos="0" name="service.device" value="Device"/>
<param pos="0" name="service.cpe23" value="cpe:/a:ui:unifi:-"/>
</fingerprint>

<fingerprint pattern="^Login to AdminDroid Office 365 Reporter$">
<description>AdminDroid Office 365 Reporter Application</description>
<example>Login to AdminDroid Office 365 Reporter</example>
<param pos="0" name="service.vendor" value="AdminDroid"/>
<param pos="0" name="service.product" value="Office 365 Reporter"/>
<param pos="0" name="service.cpe23" value="cpe:/a:admindroid:office_365_reporter:-"/>
</fingerprint>

<fingerprint pattern="^Nanoleaf Firmware Upload$">
Expand Down Expand Up @@ -3589,7 +3589,7 @@
<param pos="1" name="hw.product"/>
</fingerprint>

<fingerprint pattern="^Radio Configuration/Diagnostic Utility$">
<fingerprint pattern="^Radio Configuration/Diagnostic Utility$">
<description>ProSoft RadioLinx</description>
<example>Radio Configuration/Diagnostic Utility</example>
<param pos="0" name="hw.vendor" value="ProSoft Technology"/>
Expand All @@ -3606,12 +3606,11 @@
<param pos="0" name="service.cpe23" value="cpe:/a:ntop:ntopng:-"/>
</fingerprint>

<fingerprint pattern="^FreeNAS$">
<description>FreeNAS</description>
<example>FreeNAS</example>
<param pos="0" name="service.vendor" value="iXsystems"/>
<param pos="0" name="service.product" value="FreeNAS"/>
<param pos="0" name="service.cpe23" value="cpe:/a:ixsystems:freenas:-"/>
<fingerprint pattern="^FreeNAS$">
<description>FreeNAS</description>
<example>FreeNAS</example>
<param pos="0" name="service.vendor" value="iXsystems"/>
<param pos="0" name="service.product" value="FreeNAS"/>
</fingerprint>

<fingerprint pattern="^Xerox (.{1,1000}) - \d+\.\d+\.\d+\.\d+$">
Expand Down Expand Up @@ -3720,4 +3719,4 @@
<param pos="0" name="hw.product" value="Eternus"/>
</fingerprint>

</fingerprints>
</fingerprints>
1 change: 1 addition & 0 deletions xml/http_servers.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4131,6 +4131,7 @@
<param pos="0" name="hw.vendor" value="Roku"/>
<param pos="0" name="hw.product" value="Roku"/>
<param pos="0" name="hw.device" value="Media Server"/>
<param pos="0" name="hw.cpe23" value="cpe:/h:roku:roku:-"/>
<param pos="0" name="service.vendor" value="MiniUPnP Project"/>
<param pos="0" name="service.product" value="MiniUPnPd"/>
<param pos="1" name="service.version"/>
Expand Down
2 changes: 1 addition & 1 deletion xml/http_wwwauth.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,7 @@
<param pos="0" name="hw.product" value="CommServer"/>
</fingerprint>

<fingerprint pattern="(?i)^Digest realm=&quot;Use 'live' as User Name">
<fingerprint pattern="(?i)^Digest realm=&quot;Use 'live' as User Name">
<description>Bosch AutoDome IP Camera</description>
<example>Digest realm="Use 'live' as User Name",nonce="18e62d241a5358a9650640fa72c1773c",opaque="",stale=FALSE,algorithm=MD5</example>
<example>Digest realm="Use 'live' as User Name in order to log in to the respective level",nonce="2e6007092c2b28af7e2516b80b5b4f95",opaque="",stale=FALSE,algorithm=MD5,qop="auth"</example>
Expand Down
8 changes: 4 additions & 4 deletions xml/mdns_device-info_txt.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2084,7 +2084,7 @@
<!-- iPhones - Reference for the following: https://www.theiphonewiki.com/wiki/Category:Devices
and http://phonedb.net/ -->

<fingerprint pattern="^model=(?:D64AP|iPhone14,3)$">
<fingerprint pattern="^model=(?:D64AP|iPhone14,3)$">
<description>iPhone 13 Pro Max</description>
<example>model=D64AP</example>
<example>model=iPhone14,3</example>
Expand All @@ -2098,7 +2098,7 @@
<param pos="0" name="hw.device" value="Mobile Phone"/>
</fingerprint>

<fingerprint pattern="^model=(?:D63AP|iPhone14,2)$">
<fingerprint pattern="^model=(?:D63AP|iPhone14,2)$">
<description>iPhone 13 Pro</description>
<example>model=D63AP</example>
<example>model=iPhone14,2</example>
Expand Down Expand Up @@ -2563,8 +2563,8 @@
<param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone:-"/>
</fingerprint>


<!-- iPod -->

<fingerprint pattern="^model=(?:N112AP|iPod9,1)$">
<description>iPod Touch (7th generation)</description>
<example>model=N112AP</example>
Expand Down Expand Up @@ -2663,4 +2663,4 @@
<param pos="0" name="hw.device" value="Media Player"/>
</fingerprint>

</fingerprints>
</fingerprints>
1 change: 1 addition & 0 deletions xml/operating_system.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,7 @@
<param pos="0" name="os.family" value="Mac OS"/>
<param pos="0" name="os.product" value="Mac OS"/>
<param pos="1" name="os.version"/>
<param pos="0" name="os.cpe23" value="cpe:/o:apple:macos:{os.version}"/>
</fingerprint>

<fingerprint pattern="^(?i:(?:Apple OS X|Apple Mac OS X|Mac OS X|OS X|Mac OS)\s?(\d+?(?:\.\d+?)*?)?)$">
Expand Down
3 changes: 1 addition & 2 deletions xml/sip_user_agents.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
<param pos="2" name="os.version"/>
<param pos="0" name="hw.certainty" value="0.95"/>
<param pos="0" name="os.certainty" value="0.95"/>
<param pos="0" name="os.cpe23" value="cpe:/o:cisco:ios:{os.version}"/>
<param pos="0" name="os.cpe23" value="cpe:/o:cisco:unified_sip_phone_3900_firmware:{os.version}"/>
</fingerprint>

<fingerprint pattern="^Cisco-ATA(\d{3})/([\d.]+)$">
Expand All @@ -156,7 +156,6 @@
<param pos="2" name="os.version"/>
<param pos="0" name="hw.certainty" value="0.9"/>
<param pos="0" name="os.certainty" value="0.9"/>
<param pos="0" name="os.cpe23" value="cpe:/o:cisco:ios:{os.version}"/>
</fingerprint>

<!-- AVM.DE Devices -->
Expand Down
1 change: 1 addition & 0 deletions xml/smtp_banners.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@
<param pos="0" name="os.vendor" value="Apple"/>
<param pos="0" name="os.family" value="Mac OS"/>
<param pos="0" name="os.product" value="Mac OS"/>
<param pos="0" name="os.cpe23" value="cpe:/o:apple:macos:-"/>
<param pos="1" name="host.name"/>
<param pos="2" name="service.version"/>
</fingerprint>
Expand Down
1 change: 1 addition & 0 deletions xml/smtp_help.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
<param pos="0" name="os.vendor" value="Apple"/>
<param pos="0" name="os.family" value="Mac OS"/>
<param pos="0" name="os.product" value="Mac OS"/>
<param pos="0" name="os.cpe23" value="cpe:/o:apple:macos:-"/>
</fingerprint>

<fingerprint pattern="^214[ -]([^ ]+) is running the IBM VM operating system$">
Expand Down
2 changes: 1 addition & 1 deletion xml/smtp_noop.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<param pos="0" name="os.vendor" value="Apple"/>
<param pos="0" name="os.family" value="Mac OS"/>
<param pos="0" name="os.product" value="Mac OS"/>
<param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os:-"/>
<param pos="0" name="os.cpe23" value="cpe:/o:apple:macos:-"/>
</fingerprint>

<fingerprint pattern="^250[ -]Why is there an NOOP instruction\?$">
Expand Down
2 changes: 1 addition & 1 deletion xml/snmp_sysdescr.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7545,4 +7545,4 @@ Copyright (c) 1995-2005 by Cisco Systems
<param pos="0" name="os.device" value="Broadband Router"/>
</fingerprint>

</fingerprints>
</fingerprints>
14 changes: 7 additions & 7 deletions xml/telnet_banners.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2136,7 +2136,7 @@
<param pos="0" name="hw.certainty" value="0.5"/>
</fingerprint>

<fingerprint pattern="(?i)Welcome to (\S+Dome [^\)]+) \d+\.\d+.\d+\.\d+ from">
<fingerprint pattern="(?i)Welcome to (\S+Dome [^\)]+) \d+\.\d+.\d+\.\d+ from">
<description>Bosch Dome IP Cameras</description>
<example hw.product="AutoDome 800 HD">Welcome to AutoDome 800 HD 1.2.3.4 from 5.6.7.8</example>
<example hw.product="FLEXIDOME NDC-455-P">Welcome to FLEXIDOME NDC-455-P 1.2.3.4 from 5.6.7.8</example>
Expand All @@ -2145,7 +2145,7 @@
<param pos="1" name="hw.product"/>
</fingerprint>

<fingerprint pattern="(?:RDL-\d+ Ellipse\s+|Connect-OWS?) .{0,1000} Copyright .{0,1000} Redline Communications Inc">
<fingerprint pattern="(?:RDL-\d+ Ellipse\s+|Connect-OWS?) .{0,1000} Copyright .{0,1000} Redline Communications Inc">
<description>Redline Communication Radios</description>
<example>RDL-3000 Ellipse (c) Copyright 2010-2016 Redline Communications Inc.</example>
<example>Connect-OW (c) Copyright 2010-2016 Redline Communications Inc.</example>
Expand All @@ -2168,19 +2168,19 @@

<fingerprint pattern="\((FL WLAN \S+)\)">
<description>Phoenix Contact Wireless Module</description>
<example hw.product="FL WLAN 510X" >(FL WLAN 510X)</example>
<example hw.product="FL WLAN 510X">(FL WLAN 510X)</example>
<param pos="0" name="hw.vendor" value="Phoenix Contact"/>
<param pos="0" name="hw.device" value="WAP"/>
<param pos="1" name="hw.product" />
<param pos="1" name="hw.product"/>
</fingerprint>

<fingerprint pattern="Welcome to i\.CanDoIt (.{0,1000}) v(\S+)">
<description>Control Solutions i.CanDoIt PLC</description>
<example hw.product="BAS-700 ReMOTE I/O" hw.version="2.47x">Welcome to i.CanDoIt BAS-700 ReMOTE I/O v2.47x</example>
<param pos="0" name="hw.vendor" value="Control Solutions"/>
<param pos="0" name="hw.device" value="PLC"/>
<param pos="1" name="hw.product" />
<param pos="2" name="hw.version" />
<param pos="1" name="hw.product"/>
<param pos="2" name="hw.version"/>
<param pos="0" name="hw.certainty" value="0.75"/>
</fingerprint>

Expand Down Expand Up @@ -2238,7 +2238,7 @@
<param pos="3" name="hw.version"/>
</fingerprint>

<fingerprint pattern="&quot;BeerTemp&quot;:.*&quot;FridgeTemp&quot;:">
<fingerprint pattern="&quot;BeerTemp&quot;:.*&quot;FridgeTemp&quot;:">
<description>Fermentrack Beer Brewing Monitor</description>
<example>T:{"BeerTemp":null,"BeerSet":null,"BeerAnn":null,"FridgeTemp":null,"FridgeSet":null,"FridgeAnn":null,"State":0}</example>
<param pos="0" name="hw.device" value="Device"/>
Expand Down
11 changes: 6 additions & 5 deletions xml/x509_subjects.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1695,6 +1695,7 @@
<param pos="0" name="hw.device" value="Access Control"/>
<param pos="0" name="hw.family" value="iSTAR Door Controllers"/>
<param pos="0" name="hw.product" value="iSTAR Ultra"/>
<param pos="0" name="hw.cpe23" value="cpe:/h:swhouse:istar_ultra:-"/>
</fingerprint>

<fingerprint pattern="^O=SpotteRF - NetworkedIO$">
Expand All @@ -1708,7 +1709,7 @@
<param pos="0" name="hw.product" value="Drone Detector"/>
</fingerprint>

<fingerprint pattern="(?i)^CN=.{0,1000}myboschcam.net,O=Bosch Sicherheitssysteme">
<fingerprint pattern="(?i)^CN=.{0,1000}myboschcam.net,O=Bosch Sicherheitssysteme">
<description>Bosch AutoDome IP Camera</description>
<example>CN=local.myboschcam.net,O=Bosch Sicherheitssysteme GmbH,L=Grasbrunn,ST=Bayern,C=DE</example>
<param pos="0" name="hw.vendor" value="Bosch"/>
Expand All @@ -1717,15 +1718,15 @@
<param pos="0" name="hw.certainty" value="0.50"/>
</fingerprint>

<fingerprint pattern="(?i)CN=(\w+),OU=BWI,O=Redline Communications Inc">
<fingerprint pattern="(?i)CN=(\w+),OU=BWI,O=Redline Communications Inc">
<description>Redline Communication Radios</description>
<example hw.product="an80i">CN=an80i,OU=BWI,O=Redline Communications Inc.,C=CA</example>
<param pos="0" name="hw.vendor" value="Redline"/>
<param pos="0" name="hw.device" value="WAP"/>
<param pos="1" name="hw.product"/>
</fingerprint>

<fingerprint pattern="(?i)CN=Vaddio Device,O=Vaddio,L=Minnetonka,ST=MN,C=US">
<fingerprint pattern="(?i)CN=Vaddio Device,O=Vaddio,L=Minnetonka,ST=MN,C=US">
<description>Vadio DocCom</description>
<example>CN=Vaddio Device,O=Vaddio,L=Minnetonka,ST=MN,C=US</example>
<param pos="0" name="hw.vendor" value="Vaddio"/>
Expand All @@ -1734,7 +1735,7 @@
<param pos="0" name="hw.certainty" value="0.50"/>
</fingerprint>

<fingerprint pattern="(?i)CN=.{0,1000},OU=2N IP Intercoms,O=2N Telekomunikace a.s.,L=Prague,ST=Czech Republic,C=CZ">
<fingerprint pattern="(?i)CN=.{0,1000},OU=2N IP Intercoms,O=2N Telekomunikace a.s.,L=Prague,ST=Czech Republic,C=CZ">
<description>2N IP Intercoms</description>
<example>CN=11111111111d,OU=2N IP Intercoms,O=2N Telekomunikace a.s.,L=Prague,ST=Czech Republic,C=CZ</example>
<param pos="0" name="hw.vendor" value="2N Telekomunikace"/>
Expand All @@ -1754,4 +1755,4 @@
<param pos="0" name="os.product" value="Proxmox"/>
</fingerprint>

</fingerprints>
</fingerprints>

0 comments on commit aeaace2

Please sign in to comment.