diff --git a/.gitignore b/.gitignore
index e3604593..a5ed67bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,9 @@ pkg/
/Gemfile.lock
+#Python specific
+venv
+
# IDE specific
.vscode/
.idea
diff --git a/cpe-remap.yaml b/cpe-remap.yaml
index 9224e371..0c292fff 100644
--- a/cpe-remap.yaml
+++ b/cpe-remap.yaml
@@ -1,4 +1,6 @@
mappings:
+ alpine:
+ vendor: alpinelinux
apache:
vendor: apache
products:
@@ -45,10 +47,17 @@ mappings:
vendor: ibm
products:
lotus_domino: lotus_domino_server
+ os/400: os_400
+ z/os: z\/os
+ jamf:
+ products:
+ jamf_pro: jamf
juniper:
vendor: juniper
products:
junos_os: junos
+ kibana:
+ vendor: elasticsearch
linux:
vendor: linux
products:
@@ -94,6 +103,11 @@ mappings:
vendor: paloaltonetworks
products:
pa_firewall: pan-os
+ parallels:
+ products:
+ plesk: parallels_plesk_panel
+ plesk:
+ vendor: parallels
proftpd_project:
vendor: proftpd
realvnc_ltd.:
@@ -113,6 +127,13 @@ mappings:
vendor: sun
products:
solaris: sunos
+ tandberg:
+ vendor: cisco
+ tightvnc:
+ products:
+ desktop: tightvnc
+ ubiquiti:
+ vendor: ui
ubuntu:
vendor: canonical
products:
diff --git a/update_cpes.py b/update_cpes.py
index 39babf7e..040593a5 100755
--- a/update_cpes.py
+++ b/update_cpes.py
@@ -67,7 +67,7 @@ def update_cpes(xml_file, cpe_vp_map, r7_vp_map):
if not fp_type in params:
params[fp_type] = {}
if name in params[fp_type]:
- raise ValueError('Duplicated fingerprint named {} in {}'.format(name, fingerprint.attrib['pattern']))
+ raise ValueError('Duplicated fingerprint named {} in fingerprint {} in file {}'.format(name, fingerprint.attrib['pattern'], xml_file))
params[fp_type][name] = param
diff --git a/xml/dns_versionbind.xml b/xml/dns_versionbind.xml
index 4f027707..48cd513d 100644
--- a/xml/dns_versionbind.xml
+++ b/xml/dns_versionbind.xml
@@ -154,7 +154,7 @@
- ISC BIND: Debian Jessie
+ ISC BIND: Debian 8.0 (jessie)
9.9.5-9+deb8u11-Debian
9.9.5-9+deb8u6A~4.2.0.201702281603-Debian
@@ -169,7 +169,7 @@
- ISC BIND: Debian Wheezy
+ ISC BIND: Debian 7.0 (wheezy)
9.9.5-9wheezy1-Debian
@@ -403,7 +403,7 @@
Nominum Vantio CacheServe, with build
- Nominum Vantio 5.4.5.1 (build 114872)
+ Nominum Vantio 5.4.5.1 (build 114872)
@@ -734,14 +734,12 @@
dnsmasq: pi-hole
- dnsmasq-pi-hole-2.80
-
-
-
-
-
-
-
+ dnsmasq-pi-hole-2.80
+
+
+
+
+
Quad9 Resolver
diff --git a/xml/ftp_banners.xml b/xml/ftp_banners.xml
index 872f0b0b..004103c3 100644
--- a/xml/ftp_banners.xml
+++ b/xml/ftp_banners.xml
@@ -323,6 +323,7 @@ example.com FTP server (Version: Mac OS X Server) ready.
+
@@ -763,15 +764,15 @@ more text
-
+
VxWorks on Tenor MultiPath with version information
- Tenor Multipath Switch FTP server (Version VxWorks5.4.2) ready.]]>
+ <38785ca0> Tenor Multipath Switch FTP server (Version VxWorks5.4.2) ready.
-
+
VxWorks with Secure NetLinx
@@ -779,7 +780,7 @@ more text
-
+
ADC iScale
@@ -1549,5 +1550,5 @@ more text
-
+
diff --git a/xml/html_title.xml b/xml/html_title.xml
index a0081ce9..7d3cbbfa 100644
--- a/xml/html_title.xml
+++ b/xml/html_title.xml
@@ -1,8 +1,6 @@
-
-
Apache HTTPD indexes
Index of /
@@ -11,7 +9,6 @@
-
Apache HTTPD default installation on Amazon Linux
Test Page for the Nginx HTTP Server on the Amazon Linux AMI
@@ -24,7 +21,6 @@
-
Apache HTTPD default installation on CentOS
Apache HTTP Server Test Page powered by CentOS
@@ -37,7 +33,6 @@
-
Apache HTTPD default installation on Debian
Apache2 Debian Default Page: It works
@@ -49,7 +44,6 @@
-
Apache HTTPD default installation on Ubuntu
Apache2 Ubuntu Default Page: It works
@@ -61,7 +55,6 @@
-
IBM iSeries Apache Default Page
Sample Home Page for APACHEDFT Server
@@ -74,7 +67,6 @@
-
Apache Tomcat with no version
Apache Tomcat
@@ -83,7 +75,6 @@
-
Apache tomcat with minimal version information
Apache Tomcat/8.0.32
@@ -93,14 +84,12 @@
-
ASUS AiCloud
AiCloud
-
Web server found on DVR and webcam servers sourced from HiSilicon
@@ -111,7 +100,6 @@
-
AVM FRITZ!Box
FRITZ!Box
@@ -119,7 +107,6 @@
-
AVM FRITZ!Powerline
FRITZ!Powerline
@@ -127,7 +114,6 @@
-
FRITZ!WLAN Repeater
FRITZ!WLAN Repeater
@@ -135,7 +121,6 @@
-
cPanel
cPanel Login
@@ -143,7 +128,6 @@
-
cPanel Web Host Manager
WHM Login
@@ -151,16 +135,14 @@
-
Windows CE
Windows CE
-
+
-
Default IIS 7
IIS7
@@ -168,13 +150,12 @@
-
+
-
Default IIS 8
Microsoft Internet Information Services 8
@@ -182,13 +163,12 @@
-
+
-
IIS Detailed Error
IIS 7.0 Detailed Error - 401.2 - Unauthorized
@@ -204,7 +184,6 @@
-
Default IIS
IIS Windows
@@ -212,21 +191,20 @@
+
-
Netia Spot wireless router
Konsola zarzdzania NETIASPOT
NETIASPOT Management Console
-
+
-
Philips Hue Personal Wireless Lighting
hue personal wireless lighting
@@ -234,58 +212,51 @@
-
LANDesk Management Agent
-
-
Plesk web hosting platform with a version
Plesk 12.0.18
Plesk Onyx 17.5.3
Parallels Plesk 12.0.1
Parallels Plesk Panel 11.5.30
-
+
-
+
-
Plesk web hosting platform with a version on Windows
Plesk 12.5.30 for Microsoft Windows
Parallels Plesk Panel 11.5.30 for Microsoft Windows
-
+
-
+
-
Plesk web hosting platform with no version
Default Parallels Plesk Panel Page
Default Parallels Plesk Page
Default PLESK Page
-
+
-
+
-
Samsung DVRs
Web Viewer for Samsung DVR
-
Sonicwall firewalls
SonicWall - Authentication
@@ -293,7 +264,6 @@
-
Synology DiskStation
DiskStation - Synology DiskStation
@@ -307,7 +277,6 @@
-
Synology with WebStation web hosting
Hello! Welcome to Synology Web Station!
@@ -320,7 +289,6 @@
-
Fortinet FortiGate/Fortiguard Web Filter
Web Filter Block Override
@@ -333,14 +301,12 @@
-
Generic products by Ubiquiti Networks
Ubiquiti Networks
-
Ubiquiti Security Gateway
UniFi Security Gateway
@@ -348,20 +314,17 @@
-
Ubiquiti EdgeRouter/EdgeSwitch/etc
EdgeOS
-
Ubiquiti UniFi Cloud Key
CloudKey
-
Ubiquiti airCube WAP
airCube
@@ -369,24 +332,21 @@
-
Various UniFi Video web service
UniFi Video
-
+
-
UniFi NVR for recording from UniFi video cameras
UniFi NVR: Software Portal
-
+
-
Embedded HTTP server used by many vendors and device
types, including APC, 3Com, Andover Controls, Cisco VoIP, D-Link,
@@ -397,7 +357,6 @@
-
MikroTik RouterOS router configuration page
RouterOS router configuration page
@@ -408,7 +367,6 @@
-
Default OS-agnostic nginx
Welcome to nginx!
@@ -418,7 +376,6 @@
-
Default nginx on Fedora
Test Page for the Nginx HTTP Server on Fedora
@@ -431,7 +388,6 @@
-
Default nginx on Debian
Welcome to nginx on Debian!
@@ -443,7 +399,6 @@
-
Eagle Eye Networks to manage IoT cameras home webpage
Eagle Eye Networks (Local)
@@ -456,7 +411,6 @@
-
Netgear Switches
@@ -467,7 +421,6 @@
-
Netgear Routers
NETGEAR Router WNR2000v4
@@ -476,7 +429,6 @@
-
Netgear Prosafe Plus Switch
Netgear Prosafe Plus Switch
@@ -484,7 +436,6 @@
-
Digi Terminal Servers
Digi One SP Configuration and Management
@@ -497,7 +448,6 @@
-
Moxa NPort Terminal Servers
NPort Web Console
@@ -505,7 +455,6 @@
-
Lantronix terminal server
Lantronix SLB882/8824
@@ -515,7 +464,6 @@
-
ATEN KVM over IP
KN4140v - Cover
@@ -524,7 +472,6 @@
-
AVT.pl Ethernet Relay Module
Ethernet Relay Module
@@ -532,7 +479,6 @@
-
Inveo Lantick Ethernet Relay Controller
Inveo Lantick Ethernet Relay Controller
@@ -540,7 +486,6 @@
-
myUTN Device Server
myUTN-50a Control Center
@@ -549,7 +494,6 @@
-
Liebert iCOM Cooling Unit Control Board
iCOM Control Board
@@ -557,7 +501,6 @@
-
Sigma Control 2 Air Compressor Controls
Sigma Control 2
@@ -565,17 +508,12 @@
-
-
-
-
Eltek Power Controller
WebPower
-
Gude Expert Power Control
Expert Power Control NET 2x6 - Rack42
@@ -584,7 +522,6 @@
-
Sentry Switched CDU
Sentry Switched CDU
@@ -592,7 +529,6 @@
-
Emerson Network Power Rack PDU Card
Emerson Network Power Rack PDU Card
@@ -600,7 +536,6 @@
-
Emerson Network Power IntelliSlot Web Card and rebrands
Emerson Network Power IntelliSlot Web Card
@@ -611,7 +546,6 @@
-
ConnectUPS Web/SNMP Card
ConnectUPS Web/SNMP Card
@@ -619,7 +553,6 @@
-
Calient Photonic Switch
Calient Technologies Inc.
@@ -630,7 +563,6 @@
-
Google Fiber Router
Google Fiber Network Box Diagnostics
@@ -638,7 +570,6 @@
-
Fujitsu iRMC BMC
ServerView Remote Management iRMC S3 Web Server
@@ -650,7 +581,6 @@
-
Cisco UCS KVM Direct
Cisco UCS KVM Direct
@@ -661,8 +591,8 @@
+
-
Cisco UCS Manager
Cisco UCS Manager
@@ -673,8 +603,8 @@
+
-
Cisco Integrated Management Controller
Cisco Integrated Management Controller
@@ -688,7 +618,6 @@
-
HPE Virtual Connect Manager
HPE Virtual Connect Manager
@@ -699,7 +628,6 @@
-
HPE BladeSystem Onboard Administrator
HPE BladeSystem Onboard Administrator
@@ -707,7 +635,6 @@
-
HPE System Management Homepage
HPE System Management Homepage
@@ -718,31 +645,30 @@
-
HP Integrated Lights-Out
HP Integrated Lights-Out
+
-
HP Integrated Lights-Out 2
HP Integrated Lights-Out 2
+
-
HP Integrated Lights-Out 3+
iLO 3
@@ -755,7 +681,6 @@
-
HPE SimpliVity OmniStack
HPE SimpliVity OmniStack
@@ -763,7 +688,6 @@
-
HPE StoreEver
HPE StoreEver MSL3040
@@ -771,7 +695,6 @@
-
Dell OpenManage Switch Administrator
Dell OpenManage Switch Administrator
@@ -779,7 +702,6 @@
-
HPE ProCurve Switch w/Hostname
SW1 - ProCurve Switch 4204vl (J8770A)
@@ -789,7 +711,6 @@
-
HPE ProCurve Switch w/o Hostname
ProCurve Switch 2610-24/12PWR (J9086A)
@@ -798,7 +719,6 @@
-
Nokia Siemens FlexiPacket Hub
FlexiPacket Hub
@@ -806,7 +726,6 @@
-
Rohde and Schwarz Remote Instrument (vnc)
R&S Instrument VNC desktop
@@ -816,14 +735,12 @@
-
Rohde and Schwarz Remote Instrument (web admin)
Rohde & Schwarz remote instrument
-
Keysight EXA Signal Analyzer
EXA
@@ -832,7 +749,6 @@
-
Keysight MXA Signal Analyzer
MXA
@@ -841,7 +757,6 @@
-
Calnex Paragon-100G
Paragon-100G
@@ -849,7 +764,6 @@
-
Keysight 33521A Waveform Generator
33521A
@@ -857,7 +771,6 @@
-
Keysight 34972A Data Logger
34972A
@@ -865,7 +778,6 @@
-
Agilent 53230A Frequency Counter
53230A
@@ -873,7 +785,6 @@
-
Agilent 33220A
Agilent 33220A (MY44041111)
@@ -882,7 +793,6 @@
-
Agilent N5172B
Agilent N5172B EXG MY44041111
@@ -891,7 +801,6 @@
-
Polycom IP Phone
Polycom - Configuration Utility
@@ -901,15 +810,12 @@
-
-
Digium Phone Settings
Digium Phone Settings
-
Cisco IP Phone - SPA504G Configuration Utility
SPA504G Configuration Utility
@@ -917,7 +823,6 @@
-
Cisco IP Phone
Cisco SPA Configuration
@@ -925,14 +830,12 @@
-
Cisco IP Camera
Cisco IP Camera
-
Cisco TelePresence MCU - Home page
Cisco TelePresence MCU - Home page
@@ -941,7 +844,6 @@
-
Cisco Nexus Virtual Switch
Cisco Nexus 1000V
@@ -949,7 +851,6 @@
-
Cisco Catalyst Switch
Cisco Catalyst Switch - Home
@@ -958,8 +859,8 @@
+
-
Cisco MDS 9000/Nexus 5000
Cisco MDS 9000 and Nexus 5000 Management Modules 7.3(1)D1(1)
@@ -968,12 +869,13 @@
+
+
-
Stealthwatch Management Console
Stealthwatch Management Console
@@ -984,7 +886,6 @@
-
Cisco vManage SD-WAN
Cisco vManage
@@ -995,7 +896,6 @@
-
Cisco DNA Center Appliance
Login - Cisco DNA Center
@@ -1006,7 +906,6 @@
-
Cisco NFVIS
Cisco NFVIS
@@ -1018,19 +917,16 @@
-
Cisco WLC
Cisco Systems Login
-
-
+
-
+
-
Duo Access Gateway
Duo Access Gateway
@@ -1041,7 +937,6 @@
-
Duo Network Gateway
Login - Duo Network Gateway
@@ -1052,7 +947,6 @@
-
VBrick Rev
VBrick Rev
@@ -1063,7 +957,6 @@
-
LinxVII-5S Data Terminal
LinxVII-5S Remote Access
@@ -1071,14 +964,12 @@
-
Datalogic Mobile Portable
Datalogic Mobile Portable
-
Axis Communications Web Cam
AXIS
@@ -1088,7 +979,6 @@
-
Hanwha Techwin IP Camera
Hanwha Techwin
@@ -1098,7 +988,6 @@
-
WV-NS202A Network Camera
WV-NS202A Network Camera
@@ -1110,7 +999,6 @@
-
KACE Systems Management Appliances
KACE Systems Management Appliance Service Center
@@ -1120,7 +1008,6 @@
-
Bomgar Appliances
Remote Support Portal | Powered by BOMGAR
@@ -1130,7 +1017,6 @@
-
XRoads SD-WAN Network Appliance
XRoads Network Appliance Administration
@@ -1139,7 +1025,6 @@
-
PowerVault 124T Tape Library
@@ -1149,8 +1034,7 @@
-
-
+
Crestron Multiformat Receivers
HD-RX-201-C-E
@@ -1158,8 +1042,7 @@
-
-
+
Lencore Sound Manager 2
Lencore Sound Manager 2
@@ -1168,10 +1051,8 @@
-
-
-
-
+
+
Siemens 257x Ethernet Adapter (CTI Branded)
CTI 2572-A Main Menu
@@ -1179,7 +1060,6 @@
-
Siemens 257x Ethernet Adapter
2572-B Ethernet TCP/IP Module
@@ -1188,7 +1068,6 @@
-
DirectLOGIC DL205 communication module
ECOM100 Main
@@ -1197,7 +1076,6 @@
-
Allen-Bradley 1794-AENTR FLEX Ethernet Adapter
1794-AENTR FLEX Ethernet Adapter
@@ -1206,7 +1084,6 @@
-
Anybus-CC EtherNet/IP
Anybus-CC EtherNet/IP
@@ -1215,7 +1092,6 @@
-
AMAG Technology Symmetry EN-2DBC Access Controller
Symmetry 2DBC STD APP (EN2DBC_00_EF_4F)
@@ -1224,7 +1100,6 @@
-
Allen-Bradley 1747-LXXX SLC 5/05 Controller
1747-L551 Home Page
@@ -1235,7 +1110,6 @@
-
Allen-Bradley 1766-L32BXB PLC
1766-L32BXB B/11.00
@@ -1247,7 +1121,6 @@
-
PLC-5 Ethernet Interface Module
PLC-5 Ethernet Base Page
@@ -1258,7 +1131,6 @@
-
Allen-Bradley Ethernet Module
1761-NET-EN
@@ -1268,7 +1140,6 @@
-
Allen-Bradley 1785 Ethernet Module
1785-ENET Ethernet Base Page
@@ -1277,7 +1148,6 @@
-
NFT DALI S7 Ethernet Module
NFT S7 - DALI-Gateway(Ethernet)
@@ -1286,7 +1156,6 @@
-
IBHsofte IBHLink S7++
IBHLink S7++
@@ -1295,18 +1164,13 @@
-
-
-
Softing Industrial S7/S5 OPC Server
S7/S5 OPC Server
-
-
Nessus
Nessus
@@ -1314,7 +1178,6 @@
-
Tenable Appliance
Tenable Appliance
@@ -1322,7 +1185,6 @@
-
XenServer
Welcome to Citrix XenServer 7.2.0
@@ -1332,40 +1194,33 @@
-
RabbitMQ Management
RabbitMQ Management
-
-
HAProxy Stats Server
Statistics Report for HAProxy
-
-
- Dell Open Manage Admin
+ Dell OpenManage Admin
Open Manage™
-
+
-
TightVNC Web Server
TightVNC desktop [teller01]
-
+
-
noVNC Web Server
noVNC
@@ -1373,7 +1228,6 @@
-
Jenkins Customized Dashboard
Continuous Integrations [Jenkins]
@@ -1382,39 +1236,31 @@
-
Shell In A Box (OSS Project)
Shell In A Box
-
-
Agilent License Manager Service
AgilentLicenseManagerService Service
-
-
Red Hat OpenStack Platform Director
Red Hat OpenStack Platform Director
-
-
Splunk HTTP server used in the web interface, forwarders, indexers and more
splunkd
-
-
+
+
-
VMware Horizon
VMware Horizon
@@ -1422,7 +1268,6 @@
-
VMware SRM
Welcome to VMware Site Recovery Manager
@@ -1433,9 +1278,7 @@
-
-
Graylog Web Interface
Graylog Web Interface
@@ -1443,47 +1286,40 @@
-
-
+
+
Kibana Web Interface
Kibana
-
+
-
-
+
Grafana Web Interface
Grafana
-
Symantec Endpoint Protection Manager
Symantec Endpoint Protection Manager
-
+
-
Kiwi Syslog Web Access
Login Gateway - Kiwi Syslog Web Access
-
-
Hadoop Administration Web Service
Hadoop Administration
-
-
ManageEngine OpManager
ManageEngine OpManager
@@ -1491,7 +1327,6 @@
-
Canon ScanFront
@@ -1503,14 +1338,12 @@
-
CDVI Door Control System
CDVI Update
-
Liebert UPS
Liebert OpenComms Network Interface Card
@@ -1519,7 +1352,6 @@
-
MagTek Excella STX Check Scanner
Excella Main Page
@@ -1530,7 +1362,6 @@
-
Bosch Security Systems Ethernet Module (Alarm Panel)
B426
@@ -1539,7 +1370,6 @@
-
Citrix NetScaler
Citrix Login
@@ -1547,8 +1377,12 @@
+
+
+
+
+
-
HP LaserJet
HP LaserJet M1536dnf MFP 1.1.1.1
@@ -1557,16 +1391,14 @@
-
Jamf Pro
Jamf Pro Login - Jamf Pro v10.14.0-t1563397490
-
-
-
+
+
+
-
Keyper Systems Administration - Login
Keyper Systems Administration - Login
@@ -1574,7 +1406,6 @@
-
FireEye Investigation Analysis System Appliance
FireEye:
@@ -1582,7 +1413,6 @@
-
Gigamon GigaVUE Appliance
GigaVUE-OS
@@ -1590,7 +1420,6 @@
-
Pure Storage Appliance
Pure Storage Login
@@ -1598,7 +1427,6 @@
-
Crestron Video Conferencing
CRESTRON
@@ -1608,7 +1436,6 @@
-
ELAN Smart Home Controller
ELAN Viewer Installation
@@ -1618,7 +1445,6 @@
-
iTach IP2IR
iTach IP2IR Setup and Configuration
@@ -1626,5 +1452,4 @@
-
diff --git a/xml/http_cookies.xml b/xml/http_cookies.xml
index 5a141948..0e0c3f32 100644
--- a/xml/http_cookies.xml
+++ b/xml/http_cookies.xml
@@ -110,7 +110,7 @@
-
+
@@ -131,6 +131,11 @@
+
+
+
+
+
Pulse Secure VPN
@@ -381,9 +386,7 @@
_arachni_webui_session=el2MMEVVcld3Q2dBc3UvSmtQYmlPckpxSE2CMmlwd1Nja2lvUk5tRG5XYTlnRHJuVVVTblVNMTBOdGhrUU02dzC0K1I0Mnk3d1I3SUlCcngwQkliV3Y5VDBnVVZkOWJsS0VGSlYwM1RGMlVzVDNKcXlrdFNQZ0lIM1VBN3RDZFIrZTBrdjZmdSt0YnV2djh1RFE0S1czUmZQcGxNNW9UWVQydXFCZmNHZDRmTlg4cWludE5SUDRYU2JwdWw4Qmk3dEpDV3ZBejRkbU9ueFJKNG1HenplUEJjem9LU09IM0Z6ZHM4YU00aVpKUHJRVzR3SG8rRzBjWG9jclpqZGd2dmp2TnVGbjkvb0lmanZvM3lPZGhXb3c9PS0tR0dXVWppWnorMG1NNjlXTkYvaEswUT09--44b846e66f558667d7503010a726e2388803136f; path=/; HttpOnly
-
-
@@ -188,10 +189,11 @@
+
-
+
Time Capsule
model=AirPort6
model=AirPort6,106
@@ -202,7 +204,6 @@
-
@@ -232,7 +233,7 @@
-
+
MacBook Pro (13-inch, 2018, Four Thunderbolt 3 ports)
model=MacBookPro15,2
@@ -425,7 +426,7 @@
-
+
MacBook Pro (17-inch, Late 2011)
model=MacBookPro8,3
@@ -473,7 +474,7 @@
-
+
MacBook Pro (15-inch, Mid 2010)
model=MacBookPro6,2
@@ -497,7 +498,6 @@
-
MacBook Pro (13-inch, Mid 2009)
model=MacBookPro5,5
@@ -607,7 +607,7 @@
-
+
MacBook Air (Retina, 13-inch, 2019)
model=MacBookAir8,2
@@ -776,7 +776,7 @@
-
+
Mac mini (Late 2014)
model=Macmini7,1
@@ -1358,7 +1358,7 @@
-
+
iPad Air (3rd generation)
@@ -1383,7 +1383,7 @@
-
+
iPad Air
model=J72AP
@@ -1456,6 +1456,7 @@
+
@@ -1465,7 +1466,6 @@
-
@@ -1478,7 +1478,7 @@
-
+
@@ -1490,7 +1490,7 @@
-
+
@@ -1500,11 +1500,11 @@
Apple TV (3rd generation)
model=J33IAP
model=J33iAP
- model=J33AP
+ model=J33AP
-
+
@@ -1516,7 +1516,7 @@
-
+
@@ -1730,6 +1730,7 @@
+
iPhone 4s
@@ -1742,6 +1743,7 @@
+
iPhone 4
@@ -1768,6 +1770,7 @@
+
iPhone 3G
@@ -1792,5 +1795,6 @@
+
diff --git a/xml/mysql_banners.xml b/xml/mysql_banners.xml
index 99fd4551..5b30e46a 100644
--- a/xml/mysql_banners.xml
+++ b/xml/mysql_banners.xml
@@ -207,6 +207,65 @@
+
+ Oracle MySQL on Debian 8.1 (jessie)
+ 5.5.62-0+deb8u1
+ 5.5.49-0+deb8u1-log
+
+
+
+
+
+
+
+
+
+
+
+
+ Oracle MySQL on Debian 8.0 (jessie)
+ 5.6.31-1+jessie
+
+
+
+
+
+
+
+
+
+
+
+
+ Oracle MySQL on Debian 7.2 (wheezy)
+ 5.5.60-0+deb7u2
+ 5.5.60-0+deb7u2-log
+
+
+
+
+
+
+
+
+
+
+
+
+ Oracle MySQL on Debian 7.1 (wheezy)
+ 5.5.60-0+deb7u1
+ 5.5.60-0+deb7u1-log
+
+
+
+
+
+
+
+
+
+
+
Oracle MySQL on Debian 6.0 (squeeze)
5.1.66-0+squeeze1
@@ -223,10 +282,11 @@
-
+
Oracle MySQL on Debian 7.0 (wheezy)
5.5.41-0+wheezy1
5.5.35-0+wheezy1-log
+ 5.5.59-25.23+1wheezy
@@ -607,7 +667,7 @@
- Percona Server (MySQL fork) on Ubuntu 12.04 LTS (Precise Pangolin)
+ Percona Server (MySQL fork) on Ubuntu 12.04 (Precise Pangolin)
5.6.16-64.2-569.precise-log
@@ -821,7 +881,7 @@
- MariaDB MariaDB on Debian Unstable/No version (sid)
+ MariaDB MariaDB on Debian Unstable/No version (sid)
5.5.5-10.0.16-MariaDB-1~sid
@@ -890,7 +950,7 @@
- MariaDB MariaDB on Debian 10 (Buster)
+ MariaDB MariaDB on Debian 10 (buster)
5.5.5-10.3.20-MariaDB-1:10.3.20+maria~buster-log
@@ -901,7 +961,7 @@
-
+
MariaDB MariaDB on Ubuntu 16.10 (Yakkety Yak)
@@ -918,21 +978,22 @@
- MariaDB MariaDB-wsrep on Ubuntu 16.10 (Yakkety Yak)
+ MariaDB MariaDB with Galera Cluster on Ubuntu 16.10 (Yakkety Yak)
5.5.5-10.0.28-MariaDB-1~yakkety-wsrep
+
-
+
- MariaDB MariaDB on Ubuntu 15.10 (wily)
+ MariaDB MariaDB on Ubuntu 15.10 (Wily Werewolf)
5.5.5-10.3.22-MariaDB-1:10.3.22+maria~wily
5.5.5-10.4.12-MariaDB-1:10.4.12+maria~wily-log
5.5.5-10.1.11-MariaDB-1~wily-log
@@ -970,6 +1031,7 @@
+
@@ -979,7 +1041,7 @@
- MariaDB MariaDB on Ubuntu 19.10 (Eoan)
+ MariaDB MariaDB on Ubuntu 19.10 (Eoan Ermine)
5.5.5-10.3.22-MariaDB-1:10.3.22+maria~eoan
5.5.5-10.4.12-MariaDB-1:10.4.12+maria~eoan-log
@@ -994,7 +1056,7 @@
- MariaDB MariaDB on Ubuntu 18.10 (Cosmic)
+ MariaDB MariaDB on Ubuntu 18.10 (Cosmic Cuttlefish)
5.5.5-10.3.17-MariaDB-1:10.3.17+maria~cosmic-log
5.5.5-10.1.20-MariaDB-1:10.3.17+maria~cosmic
@@ -1009,7 +1071,7 @@
- MariaDB MariaDB on Ubuntu 19.04 (Disco)
+ MariaDB MariaDB on Ubuntu 19.04 (Disco Dingo)
5.5.5-10.3.17-MariaDB-1:10.3.17+maria~disco-log
5.5.5-10.1.20-MariaDB-1:10.3.17+maria~disco
@@ -1053,7 +1115,7 @@
- MariaDB MariaDB on Ubuntu 12.04 LTS (Precise Pangolin)
+ MariaDB MariaDB on Ubuntu 12.04 (Precise Pangolin)
5.5.41-MariaDB-1~precise-log
5.5.5-10.0.16-MariaDB-1~precise-log
@@ -1068,7 +1130,7 @@
- MariaDB MariaDB on Ubuntu 8.04 LTS (Hardy Heron)
+ MariaDB MariaDB on Ubuntu 8.04 (Hardy Heron)
5.5.34-MariaDB-mariadb122~hardy-log
@@ -1097,7 +1159,7 @@
- MariaDB MariaDB with Galera Cluster on Debian 8.0 (Jessie)
+ MariaDB MariaDB with Galera Cluster on Debian 8.0 (jessie)
5.5.5-10.0.26-MariaDB-1~jessie-wsrep
5.5.5-10.0.22-MariaDB-1~jessie-wsrep-log
@@ -1159,7 +1221,7 @@
- MariaDB MariaDB with Galera Cluster on Ubuntu 10.04 TLS (Lucid Lynx)
+ MariaDB MariaDB with Galera Cluster on Ubuntu 10.04 (Lucid Lynx)
5.5.34-MariaDB-1~lucid-wsrep-log
@@ -1189,7 +1251,7 @@
-
+
MariaDB MariaDB on Ubuntu 10.04 (Lucid lynx)
5.5.34-MariaDB-1~lucid-log
@@ -1204,7 +1266,7 @@
- MariaDB MariaDB running on a Ubuntu Focal Fossil (20.4)
+ MariaDB MariaDB on Ubuntu 20.04 (Focal Fossa)
5.5.5-10.5.2-MariaDB-1:10.5.2+maria~focal
@@ -1218,7 +1280,7 @@
- MariaDB MariaDB running on a Ubuntu Maverick (10.10)
+ MariaDB MariaDB on Ubuntu 10.10 (Maverick Meerkat)
5.5.29-MariaDB-mariadb1~maverick
@@ -1232,7 +1294,7 @@
- MariaDB MariaDB running on a ALT Linux
+ MariaDB MariaDB on a ALT Linux
5.5.5-10.1.29-MariaDB-alt1.M80P.1
5.5.5-10.2.15-MariaDB-alt2.M80P.3.S1
@@ -1243,7 +1305,6 @@
-
MariaDB Maria DB Enterprise Edition
@@ -1269,7 +1330,7 @@
-
+
MariaDB MariaDB alternate version format
5.7.8-MariaDB-1:10.3.13
@@ -1324,14 +1385,13 @@
- MariaDB MariaDB with Galera Cluster on Ubuntu 17.10 (Artful Ardvark)
+ MariaDB MariaDB on Ubuntu 17.10 (Artful Ardvark)
5.5.5-10.5.12-MariaDB-10.2.12+maria~artful-log
5.5.5-10.3.2-MariaDB-10.2.12+maria~artful
-
@@ -1447,44 +1507,50 @@
- Mariadb MariaDB running on Ubuntu Bionic (18.04)
- 5.5.5-10.2.17-MariaDB-1:10.2.17+maria~bionic
- 5.5.5-10.2.14-MariaDB-1:10.2.14+maria~bionic-log
- 5.5.5-10.1.40-MariaDB-1~bionic
- 5.5.5-10.2.39-MariaDB-1~bionic-log
+ MariaDB MariaDB on Ubuntu 18.04 (Bionic Beaver)
+ 5.5.5-10.2.17-MariaDB-1:10.2.17+maria~bionic
+ 5.5.5-10.2.14-MariaDB-1:10.2.14+maria~bionic-log
+ 5.5.5-10.1.40-MariaDB-1~bionic
+ 5.5.5-10.2.39-MariaDB-1~bionic-log
+
+
- MariaDB MariaDB running on Debian 9.0 (Stretch)
- 5.5.5-10.2.17-MariaDB-1:10.2.17+maria~stretch
- 5.5.5-10.2.25-MariaDB-10.2.25+maria~stretch-log
- 5.5.5-10.1.39-MariaDB-1~stretch
+ MariaDB MariaDB on Debian 9.0 (stretch)
+ 5.5.5-10.2.17-MariaDB-1:10.2.17+maria~stretch
+ 5.5.5-10.2.25-MariaDB-10.2.25+maria~stretch-log
+ 5.5.5-10.1.39-MariaDB-1~stretch
+
+
- MariaDB MariaDB running on Debian 9.1 (Stretch)
+ MariaDB MariaDB on Debian 9.1 (stretch)
5.5.5-10.1.23-MariaDB-9+deb9u1
+
+
diff --git a/xml/ntp_banners.xml b/xml/ntp_banners.xml
index 97dc1700..9f14414d 100644
--- a/xml/ntp_banners.xml
+++ b/xml/ntp_banners.xml
@@ -318,19 +318,27 @@
-
+
ntpd running on Citrix Netscaler, which is based on FreeBSD
-
+
version="ntpd 4.2.6p2@1.2194 Wed Nov 24 15:54:11 UTC 2010 (1)",
processor="i386", system="FreeBSD/6.3-NETSCALER-9.3", leap=00, stratum=3,
-
-
+
+ version="ntpd 4.2.6p3-a (1)", processor="amd64", system="FreeBSD/8.4-NETSCALER-10.5",
+ leap=3, stratum=16, precision=-21, rootdelay=0.000, rootdisp=1264777.230,
+
+
+
+
+
+
+
-
-
+
+
ntpd running on FreeBSD
diff --git a/xml/operating_system.xml b/xml/operating_system.xml
index 95bfe1e7..b77b7884 100644
--- a/xml/operating_system.xml
+++ b/xml/operating_system.xml
@@ -32,6 +32,7 @@
+
Windows Desktop XP and later
diff --git a/xml/rtsp_servers.xml b/xml/rtsp_servers.xml
index 71b49cbd..cf01fe2f 100644
--- a/xml/rtsp_servers.xml
+++ b/xml/rtsp_servers.xml
@@ -5,39 +5,39 @@
Flussonic (http://www.flussonic.com/) 19.04
Flussonic (http://www.flussonic.com/) 20.01
-
-
+
+
Hipcam IP camera running the RealServer RTSP server.
Hipcam RealServer/V1.0
-
-
-
-
+
+
+
+
Dahua IP Camera
Dahua Rtsp Server
-
-
+
+
GStreamer RTSP Server (https://github.com/GStreamer/gst-rtsp-server)
GStreamer RTSP server
-
+
Windows Media Server
WMServer/9.1.1.3862
WMServer/9.5.6001.22609
-
+
-
+
@@ -46,31 +46,31 @@
Wowza Streaming Engine 4.7.7 build20181108145350
Wowza Media Server 3.6.4 build9641
-
-
-
+
+
+
Foscam IP Camera
HiIpcam/V100R003 VodServer/1.0.0
-
-
+
+
Indigo Security IP Camera
Indigo-Security/1.0
-
-
+
+
Cisco MediaSense Media Server (RTSP)
Cisco MediaSense Media Server
-
-
+
+
-
+
diff --git a/xml/sip_banners.xml b/xml/sip_banners.xml
index f86aea6d..5b51d0ac 100644
--- a/xml/sip_banners.xml
+++ b/xml/sip_banners.xml
@@ -3,16 +3,14 @@
-
-
Cisco IOS SIP Gateway w/ Vague Version
Cisco-SIPGateway/IOS-12.x
-
+
@@ -22,7 +20,6 @@
-
Cisco IOS SIP Gateway w/ Full Version
Cisco-SIPGateway/IOS-15.2.4.M3
@@ -34,7 +31,7 @@
-
+
@@ -44,7 +41,6 @@
-
Cisco CP VoIP Phone
Cisco-CP7960G/8.0
@@ -59,7 +55,6 @@
-
Cisco/Linksys SPA VoIP Phone
Cisco/SPA112-1.4.1SR1(002)d-hisec
@@ -77,7 +72,6 @@
-
Cisco/Linksys VoIP / Internet Phone adapter
PhoneSystems.net aabbccddeeff Linksys/PAP2-3.1.22(LS)
@@ -93,7 +87,6 @@
-
Cisco Services Ready Platforms (SRP) Router
Cisco/SRP541-1.2.6(003)
@@ -106,7 +99,6 @@
-
Cisco/Linksys WRP Wireless Router
aabbccddeeff_FinalStage_Linksys/WRP400-2.00.26
@@ -120,7 +112,6 @@
-
Cisco/Tandberg TelePresence w/Cisco Model Name
TANDBERG/528 (TC7.3.7.01c84fd) Cisco-EX60
@@ -130,13 +121,11 @@
-
-
Cisco/Tandberg TelePresence
TANDBERG/519 (TC7.0.2.aecf2d9)
@@ -150,15 +139,12 @@
-
-
-
EnGenius DuraFon IP Phone
EnGenius_Router
@@ -166,7 +152,6 @@
-
Huawei Softswitch
Huawei SoftX3000 V300R006
@@ -175,13 +160,11 @@
-
Huawei generic
SIP/1.0 (Huawei)
-
Media5 Corporation SIP Stack
M5T SIP Stack/4.1.2.2
@@ -192,7 +175,6 @@
-
Tilgin Vood
Tilgin Vood HG238x_ESx000-02_07_03_26
@@ -202,7 +184,6 @@
-
ZTE GPON Router
F620/V3.30.20P5T4S
@@ -213,7 +194,6 @@
-
ZTE ZXDSL router
ZXDSL 931VII/V2.0.00.OTET06
@@ -223,7 +203,6 @@
-
ZTE ZXHN router
ZXHN H218N/V1.02.01_ERS
@@ -237,7 +216,6 @@
-
Aastra IP Phone
Aastra 6865i/4.2.0.2023
@@ -250,7 +228,6 @@
-
Audiocodes-Sip-Gateway
Audiocodes-Sip-Gateway-MP-124 FXS/v.6.00A.034.003
@@ -264,7 +241,6 @@
-
Wildix SIP Gateway
Wildix GW-5.0.3.42145
@@ -276,7 +252,6 @@
-
Wildix SIP Gateway w/o Version
Wildix GW
@@ -287,7 +262,6 @@
-
Asterisk PBX w/ Version
Asterisk PBX 13.18.0-6.7.1.1.rl.1538157944.1c65507
@@ -296,18 +270,14 @@
-
-
Asterisk PBX w/o Version
Asterisk PBX
-
-
FreePBX
FPBX-12.0.70(11.20.0)
@@ -316,9 +286,7 @@
-
-
Kamailio SIP Server
kamailio (4.4.4 (x86_64/linux))
@@ -327,9 +295,7 @@
-
-
Algo SIP Device
@@ -342,7 +308,6 @@
-
Ingate SIParator Firewall
Ingate-Firewall/5.0.10
@@ -355,5 +320,4 @@
-
-
\ No newline at end of file
+
diff --git a/xml/smb_native_os.xml b/xml/smb_native_os.xml
index f9e2953b..a865788d 100644
--- a/xml/smb_native_os.xml
+++ b/xml/smb_native_os.xml
@@ -453,6 +453,7 @@
+
SMB exposed via SMB shared USB disks on Apple devices
diff --git a/xml/smtp_banners.xml b/xml/smtp_banners.xml
index e308b8bb..6438b423 100644
--- a/xml/smtp_banners.xml
+++ b/xml/smtp_banners.xml
@@ -249,7 +249,7 @@
-
+
@@ -265,7 +265,7 @@
-
+
@@ -399,8 +399,8 @@
-
+
FTGate mail server, runs on Windows 9x/NT/2k (http://www.ftgate.com)
@@ -1683,7 +1683,6 @@
-
diff --git a/xml/snmp_sysdescr.xml b/xml/snmp_sysdescr.xml
index 23c73c7a..e9dff1a9 100644
--- a/xml/snmp_sysdescr.xml
+++ b/xml/snmp_sysdescr.xml
@@ -1404,7 +1404,6 @@
-
Cisco 761
Cisco 761 Software Version c760-i.b.NET3 4.2(3) - Aug 21 1998 17:05:41 ISDN Stack Revision NET3 2.10
@@ -1584,7 +1583,6 @@ Copyright (c) 1995-2005 by Cisco Systems
-
-
+
Netscaler Appliance
- NetScaler NS10.0: Build 54.6.nc, Date: Apr 6 2012, 08:00:41
+ NetScaler NS10.0: Build 54.6.nc, Date: Apr 6 2012, 08:00:41
NetScaler NS9.3: Build 57.5.nc, Date: Jun 27 2012, 19:37:56
-
-
+
+
+
@@ -180,7 +180,7 @@
-
+
OpenSSH running on FreeBSD 4.11
@@ -195,7 +195,7 @@
-
+
OpenSSH running on FreeBSD 5.0
@@ -210,7 +210,7 @@
-
+
OpenSSH running on FreeBSD 5.1
@@ -225,7 +225,7 @@
-
+
OpenSSH running on FreeBSD 5.2
@@ -240,7 +240,7 @@
-
+
@@ -256,7 +256,7 @@
-
+
OpenSSH running on FreeBSD 5.5
@@ -271,7 +271,7 @@
-
+
@@ -287,7 +287,7 @@
-
+
@@ -318,7 +318,7 @@
-
+
OpenSSH running on FreeBSD 8.0
@@ -333,7 +333,7 @@
-
+
@@ -349,7 +349,7 @@
-
+
OpenSSH running on FreeBSD 8.3
@@ -364,7 +364,7 @@
-
+
OpenSSH running on FreeBSD 8.4
@@ -379,7 +379,7 @@
-
+
@@ -395,7 +395,7 @@
-
+
OpenSSH running on FreeBSD 9.2
@@ -410,7 +410,7 @@
-
+
@@ -440,7 +440,7 @@
-
+
@@ -470,7 +470,7 @@
-
+
OpenSSH running on FreeBSD 11.1
@@ -485,7 +485,7 @@
-
+
@@ -501,7 +501,7 @@
-
+
OpenSSH running on FreeBSD 12.0
@@ -516,7 +516,7 @@
-
+
OpenSSH running on FreeBSD
@@ -562,7 +562,7 @@
-
+
OpenSSH running on Ubuntu 5.04
@@ -577,7 +577,7 @@
-
+
OpenSSH running on Ubuntu 5.10
@@ -592,7 +592,7 @@
-
+
OpenSSH running on Ubuntu 6.04
@@ -608,7 +608,7 @@
-
+
OpenSSH running on Ubuntu 7.04
@@ -623,7 +623,7 @@
-
+
OpenSSH running on Ubuntu 7.10
@@ -641,7 +641,7 @@
-
+
OpenSSH running on Ubuntu 8.04
@@ -657,7 +657,7 @@
-
+
OpenSSH running on Ubuntu 8.10
@@ -672,7 +672,7 @@
-
+
OpenSSH running on Ubuntu 9.04
@@ -687,7 +687,7 @@
-
+
OpenSSH running on Ubuntu 9.10
@@ -702,7 +702,7 @@
-
+
OpenSSH running on Ubuntu 10.04 (lucid)
@@ -722,7 +722,7 @@
-
+
OpenSSH running on Ubuntu 10.10
@@ -739,7 +739,7 @@
-
+
OpenSSH running on Ubuntu 11.04
@@ -754,7 +754,7 @@
-
+
OpenSSH running on Ubuntu 11.10
@@ -769,7 +769,7 @@
-
+
OpenSSH running on Ubuntu 12.04
@@ -785,7 +785,7 @@
-
+
OpenSSH running on Ubuntu 12.10
@@ -801,7 +801,7 @@
-
+
OpenSSH running on Ubuntu 13.04
@@ -816,7 +816,7 @@
-
+
OpenSSH running on Ubuntu 13.10
@@ -831,7 +831,7 @@
-
+
OpenSSH with HPN patches
@@ -859,7 +859,7 @@
-
+
OpenSSH running on Ubuntu 14.10
@@ -874,7 +874,7 @@
-
+
OpenSSH running on Ubuntu 15.04 (vivid)
@@ -889,7 +889,7 @@
-
+
OpenSSH running on Ubuntu 15.10
@@ -904,7 +904,7 @@
-
+
OpenSSH running on Ubuntu 16.04 (vivid)
@@ -919,7 +919,7 @@
-
+
OpenSSH running on Ubuntu 16.10
@@ -934,7 +934,7 @@
-
+
OpenSSH running on Ubuntu 17.04
@@ -949,7 +949,7 @@
-
+
OpenSSH running on Ubuntu 17.10
@@ -964,7 +964,7 @@
-
+
OpenSSH running on Ubuntu 18.04
@@ -979,7 +979,7 @@
-
+
OpenSSH running on Ubuntu 18.10
@@ -994,7 +994,7 @@
-
+
OpenSSH running on Ubuntu 19.04
@@ -1009,7 +1009,7 @@
-
+
OpenSSH running on Ubuntu 19.10
@@ -1024,7 +1024,7 @@
-
+
OpenSSH running on Ubuntu (unknown release)
@@ -1069,7 +1069,7 @@
-
+
OpenSSH running on Debian 3.1 (sarge)
@@ -1084,7 +1084,7 @@
-
+
OpenSSH running on Debian 4.0 (etch)
@@ -1100,7 +1100,7 @@
-
+
OpenSSH running on Debian 5.0 (also 5.10)
@@ -1115,7 +1115,7 @@
-
+
OpenSSH running on Debian 6.0 (squeeze)
@@ -1132,7 +1132,7 @@
-
+
OpenSSH running on Debian 6.0 (w/o squeeze in banner)
@@ -1147,7 +1147,7 @@
-
+
@@ -1163,7 +1163,7 @@
-
+
OpenSSH running on Debian 7.x (wheezy)
@@ -1179,7 +1179,7 @@
-
+
OpenSSH backport running on Debian 7.x (wheezy)
@@ -1195,7 +1195,7 @@
-
+
OpenSSH running on Debian 8.x (jessie)
@@ -1212,7 +1212,7 @@
-
+
OpenSSH running on Debian 9.x (stretch)
@@ -1228,7 +1228,7 @@
-
+
OpenSSH running on Debian 10.x (buster)
@@ -1244,7 +1244,7 @@
-
+
OpenSSH running on Debian 11.x (bullseye)
@@ -1260,7 +1260,7 @@
-
+
OpenSSH running on Debian (unknown release)
@@ -1412,6 +1412,7 @@
+
DesktopAuthority SSH
@@ -1490,7 +1491,7 @@
-
+
@@ -1652,6 +1653,7 @@
+
Pragma SecureShell
@@ -1941,7 +1943,6 @@
-
WeOnlyDo with version with FIPS mode enabled
@@ -1951,7 +1952,6 @@
-