diff --git a/cpe-remap.yaml b/cpe-remap.yaml
index e34e6f82..a7097783 100644
--- a/cpe-remap.yaml
+++ b/cpe-remap.yaml
@@ -1,12 +1,16 @@
mappings:
alpine:
vendor: alpinelinux
+ products:
+ linux: alpine_linux
apache:
products:
httpd: http_server
apple:
products:
ios: iphone_os
+ aprelium_technologies:
+ vendor: aprelium
alt-n:
vendor: altn
bea:
@@ -29,18 +33,34 @@ mappings:
vendor: cisco
products:
adaptive_security_appliance: adaptive_security_appliance_software
+ apic: application_policy_infrastructure_controller
pix: pix_firewall_software
telepresence: telepresence_video_communication_server_software
+ crushftp:
+ products:
+ crushftp_web_interface: crushftp
+ data_domain:
+ vendor: dell
+ products:
+ dd_os: emc_data_domain_os
debian:
products:
linux: debian_linux
+ drupal:
+ products:
+ cms: drupal
embedthis:
products:
goahead_webserver: goahead
+ emc:
+ products:
+ celerra: celerra_network_attached_storage
f5:
products:
big-ip: big-ip_local_traffic_manager
big-ip_ltm: big-ip_local_traffic_manager
+ fedora_project:
+ vendor: fedoraproject
hp:
products:
ilo: integrated_lights_out
@@ -50,6 +70,10 @@ mappings:
lotus_domino: lotus_domino_server
ibm_domino: lotus_domino
os/400: os_400
+ intel:
+ products:
+ intel(r)_active_management_technology: active_management_technology
+ intel(r)_standard_manageability: standard_manageability
jamf:
products:
jamf_pro: jamf
@@ -58,6 +82,9 @@ mappings:
junos_os: junos
kibana:
vendor: elasticsearch
+ kodi:
+ products:
+ media_server: kodi
cz.nic:
vendor: knot-dns
litespeed_technologies:
@@ -65,6 +92,10 @@ mappings:
linux:
products:
linux: linux_kernel
+ lynx_technology:
+ vendor: lynxtechnology
+ products:
+ twonky_media_server: twonky_server
mailenable:
products:
mail_server: mailenable
@@ -96,6 +127,8 @@ mappings:
vendor: modwsgi
mort_bay:
vendor: mortbay
+ munin:
+ vendor: munin-monitoring
nlnet_labs:
vendor: nlnetlabs
products:
@@ -103,6 +136,9 @@ mappings:
net-snmp:
products:
snmp_agent: net-snmp
+ owncloud:
+ products:
+ owncloud_server: owncloud
palo_alto_networks:
vendor: paloaltonetworks
products:
@@ -114,6 +150,11 @@ mappings:
vendor: parallels
proftpd_project:
vendor: proftpd
+ progress:
+ products:
+ openedge_explorer: openedge
+ pulse_secure:
+ vendor: pulsesecure
realvnc_ltd.:
vendor: realvnc
red_hat:
@@ -131,6 +172,8 @@ mappings:
vendor: sun
products:
solaris: sunos
+ swagger:
+ vendor: smartbear
tandberg:
vendor: cisco
tightvnc:
@@ -148,6 +191,7 @@ mappings:
products:
photon_linux: photon_os
zimbra: zimbra_desktop
+ vcenter: vcenter_server
vmware_esx_server: esx
vmware_esxi_server: esxi
wind_river:
diff --git a/xml/favicons.xml b/xml/favicons.xml
index 96ee58c1..60972302 100644
--- a/xml/favicons.xml
+++ b/xml/favicons.xml
@@ -21,6 +21,7 @@
+
@@ -57,6 +58,7 @@
+
@@ -65,6 +67,7 @@
+
@@ -111,8 +114,9 @@
Moodle
135aed33c0a7b8f44f0227a71b9ce345
-
+
+
@@ -146,6 +150,7 @@
+
@@ -168,8 +173,10 @@
Metasploit Pro
08ff173efec0750dd29ac7f44d972427
-
+
+
+
@@ -236,8 +243,9 @@
Swagger UI
f983f318b0f0dff7a9303973f36ec45a
-
+
+
@@ -272,6 +280,7 @@
+
@@ -280,6 +289,7 @@
+
@@ -501,6 +511,7 @@
+
@@ -981,6 +992,10 @@
OpenMediaVault
7da8813873190b6e3d7d8957d798bd1e
31ccf4e22ba33dbec54cc357a43a36d3
+
+
+
+
@@ -1143,6 +1158,10 @@
af13b379bdb4ae7a5e68d9aa4419b2e4
cd844ad9671131f5464458a2ef58b7bc
c32e2dc4d7caedd5cefc9d44cc4f62ec
+
+
+
+
@@ -1676,6 +1695,7 @@
+
diff --git a/xml/ftp_banners.xml b/xml/ftp_banners.xml
index 98c80a8c..1093109c 100644
--- a/xml/ftp_banners.xml
+++ b/xml/ftp_banners.xml
@@ -560,6 +560,7 @@ more text
+
diff --git a/xml/html_title.xml b/xml/html_title.xml
index 0e3ba33b..4f734493 100644
--- a/xml/html_title.xml
+++ b/xml/html_title.xml
@@ -2063,6 +2063,7 @@
+
@@ -2245,6 +2246,7 @@
TwonkyMedia server media browser
+
@@ -2349,6 +2351,9 @@
OpenMediaVault
openmediavault control panel - raspberrypi
OpenMediaVault web administration interface - raspberrypi
+
+
+
@@ -2395,6 +2400,7 @@
+
@@ -2402,6 +2408,7 @@
OpenEdge Explorer
+
@@ -2447,7 +2454,8 @@
Swagger UI
Swagger Editor
-
+
+
@@ -2520,7 +2528,9 @@
Metasploit Pro (and Community Edition Web UI)
Metasploit
-
+
+
+
@@ -2564,6 +2574,7 @@
+
@@ -2593,8 +2604,9 @@
TurnKey Moodle
New Site
-
+
+
@@ -2647,6 +2659,7 @@
Kodi
+
@@ -2657,6 +2670,7 @@
Select an installation profile
+
@@ -2712,10 +2726,13 @@
Pulse Secure VPN
Pulse Connect Secure - SSL
+
+
+
-
+
\ No newline at end of file
diff --git a/xml/http_cookies.xml b/xml/http_cookies.xml
index 75f9db2f..4e112ed9 100644
--- a/xml/http_cookies.xml
+++ b/xml/http_cookies.xml
@@ -156,10 +156,13 @@
Pulse Secure VPN
DSSignInURL=/; path=/; secure
+
+
+
-
+
diff --git a/xml/http_servers.xml b/xml/http_servers.xml
index 2998d366..cdfc9da3 100644
--- a/xml/http_servers.xml
+++ b/xml/http_servers.xml
@@ -1496,6 +1496,7 @@
+
@@ -1508,6 +1509,7 @@
+
@@ -2926,6 +2928,7 @@
+
@@ -2935,6 +2938,7 @@
+
@@ -2945,6 +2949,7 @@
+
diff --git a/xml/ldap_searchresult.xml b/xml/ldap_searchresult.xml
index 1ae0ebbe..10a582aa 100644
--- a/xml/ldap_searchresult.xml
+++ b/xml/ldap_searchresult.xml
@@ -382,7 +382,7 @@
- Fedora Project Fedora Directory Server
+ Fedora Project 389 Directory Server - Old Fedora branding
dmVuZG9yTmFtZTEQBA5GZWRvcmEgUHJvamVjdDA3BA12ZW5kb3JWZXJzaW9uMSYEJEZlZG9yY
S1EaXJlY3RvcnkvMS4wLjQgQjIwMDYuMzEyLjU0NTA=
@@ -391,20 +391,22 @@
dmVuZG9yTmFtZTEQBA5GZWRvcmEgUHJvamVjdDA4BA12ZW5kb3JWZXJzaW9uMScEJUZlZG9yY
S1EaXJlY3RvcnkvMS4wLjQgQjIwMDcuMzA0LjExMzgw
-
-
+
+
+
- 389 Project 389 Directory Server
+ Fedora Project 389 Directory Server
dmVuZG9yTmFtZTENBAszODkgUHJvamVjdDA5BA12ZW5kb3JWZXJzaW9uMSgEJjM4OS1EaXJlY
3RvcnkvMS4yLjExLjI1IEIyMDEzLjMyNS4xOTUxMA==
-
+
+
@@ -441,8 +443,9 @@
XJzaW9uMSgEJk5ldHNjYXBlLURpcmVjdG9yeS82LjExIEIyMDAyLjI4MS4wODUzMC8ECw==
-
+
+
diff --git a/xml/operating_system.xml b/xml/operating_system.xml
index 08bc0352..27b6d96b 100644
--- a/xml/operating_system.xml
+++ b/xml/operating_system.xml
@@ -156,6 +156,7 @@
+
diff --git a/xml/smb_native_os.xml b/xml/smb_native_os.xml
index 87ed9ca8..3c4761cb 100644
--- a/xml/smb_native_os.xml
+++ b/xml/smb_native_os.xml
@@ -529,6 +529,7 @@
+
diff --git a/xml/smtp_banners.xml b/xml/smtp_banners.xml
index 20d0c612..5a9e7b2a 100644
--- a/xml/smtp_banners.xml
+++ b/xml/smtp_banners.xml
@@ -1660,7 +1660,8 @@
Symantec Mail Security for SMTP
foo.bar ESMTP Symantec Mail Security
-
+
+
@@ -1668,7 +1669,8 @@
Symantec Mail Gateway
foo.bar ESMTP Symantec Messaging Gateway
-
+
+
diff --git a/xml/smtp_vrfy.xml b/xml/smtp_vrfy.xml
index e8620c16..28bd65c0 100644
--- a/xml/smtp_vrfy.xml
+++ b/xml/smtp_vrfy.xml
@@ -86,7 +86,8 @@
Symantec Mail Security
504 <foo>: Recipient address rejected: need fully-qualified address
-
+
+
diff --git a/xml/snmp_sysdescr.xml b/xml/snmp_sysdescr.xml
index 88f48945..897c97d7 100644
--- a/xml/snmp_sysdescr.xml
+++ b/xml/snmp_sysdescr.xml
@@ -1807,6 +1807,7 @@ Copyright (c) 1995-2005 by Cisco Systems
+