diff --git a/xml/dns_versionbind.xml b/xml/dns_versionbind.xml
index ff94750c..94f38773 100644
--- a/xml/dns_versionbind.xml
+++ b/xml/dns_versionbind.xml
@@ -17,30 +17,40 @@
empty string -- assert nothing.
+
+
bare 'none' -- assert nothing.
none
+
+
bare 'null' -- assert nothing.
null
+
+
bare 'unknown' -- assert nothing.
unknown
+
+
bare 'no version' -- assert nothing.
no version
+
+
diff --git a/xml/ftp_banners.xml b/xml/ftp_banners.xml
index 1926c02c..49b92bd5 100644
--- a/xml/ftp_banners.xml
+++ b/xml/ftp_banners.xml
@@ -443,6 +443,9 @@ more text
Common FTP banner modification to look like Serv-U -- assert nothing.
Welcom to Serv-U FTP Server
+
+
+
@@ -1314,6 +1317,9 @@ more text
host.example.com FTP server (Version 4.1 Sat Sep 7 14:31:53 CDT 2002) ready.
host.example.com FTP server (Version 5.3 Sat Jan 10 14:01:03 CDT 2012) ready
+
+
+
@@ -1648,6 +1654,9 @@ more text
Generic FTP fingerprint with a hostname
example.com FTP server ready.
+
+
+
@@ -1666,6 +1675,9 @@ more text
FTP-Server
FTP Server
FTP service ready.
+
+
+
diff --git a/xml/html_title.xml b/xml/html_title.xml
index de85c5b1..150592c5 100644
--- a/xml/html_title.xml
+++ b/xml/html_title.xml
@@ -1,41 +1,62 @@
-
+
301 Moved Permanently - generic -- assert nothing.
301 Moved Permanently
+
+
+
302 Found - generic -- assert nothing.
302 Found
+
+
+
400 Bad Request - generic -- assert nothing.
400 Bad Request
+
+
+
401 Unauthorized - generic -- assert nothing.
401 Unauthorized
+
+
+
403 Forbidden - generic -- assert nothing.
403 Forbidden
+
+
+
404 Not Found - generic -- assert nothing.
404 Not Found
Not Found
+
+
+
Invalid URL - generic -- assert nothing.
Invalid URL
+
+
+
diff --git a/xml/http_servers.xml b/xml/http_servers.xml
index 46a5cdb4..1fe068b5 100644
--- a/xml/http_servers.xml
+++ b/xml/http_servers.xml
@@ -2965,29 +2965,28 @@
-
-
A banner consisting of an IPv4 address and port -- assert nothing.
192.168.0.4:9999
+
+
+
Obfuscated web server -- assert nothing.
Web-Server/3.0
+
+
+
httpd - generic -- assert nothing.
httpd
+
+
+
diff --git a/xml/sip_user_agents.xml b/xml/sip_user_agents.xml
index 14e79fdc..43152404 100644
--- a/xml/sip_user_agents.xml
+++ b/xml/sip_user_agents.xml
@@ -9,6 +9,9 @@
Generic SIP/2.0 response -- assert nothing.
SIP/2.0
+
+
+
diff --git a/xml/smb_native_os.xml b/xml/smb_native_os.xml
index 8027b7f7..fba20f96 100644
--- a/xml/smb_native_os.xml
+++ b/xml/smb_native_os.xml
@@ -45,6 +45,9 @@
Spoofed value often used by Samba -- assert nothing.
Windows 6.1
+
+
+
diff --git a/xml/telnet_banners.xml b/xml/telnet_banners.xml
index 434eadf8..4e888cef 100644
--- a/xml/telnet_banners.xml
+++ b/xml/telnet_banners.xml
@@ -20,27 +20,42 @@
bare 'login:' -- assert nothing.
login:
+
+
+
bare 'Username:' -- assert nothing.
Username:
User:
+
+
+
bare 'Password:' -- assert nothing.
Password:
+
+
+
bare 'Account:' -- assert nothing.
Account:
+
+
+
bare 'Connection refused' -- assert nothing.
Connection refused
+
+
+
diff --git a/xml/x509_issuers.xml b/xml/x509_issuers.xml
index 873e04ce..08564df5 100644
--- a/xml/x509_issuers.xml
+++ b/xml/x509_issuers.xml
@@ -13,54 +13,84 @@
Lets Encrypt R3 - generic -- assert nothing.
CN=R3,O=Let's Encrypt,C=US
+
+
+
Lets Encrypt X3 - generic -- assert nothing.
CN=Let's Encrypt Authority X3,O=Let's Encrypt,C=US
+
+
+
Amazon AWS Server CA 1B - generic -- assert nothing.
CN=Amazon,OU=Server CA 1B,O=Amazon,C=US
+
+
+
DigiCert SHA2 - generic -- assert nothing.
CN=DigiCert SHA2 Secure Server CA,O=DigiCert Inc,C=US
+
+
+
DigiCert SHA256 2020 CA1 - generic -- assert nothing.
CN=DigiCert TLS RSA SHA256 2020 CA1,O=DigiCert Inc,C=US
CN=DigiCert TLS Hybrid ECC SHA384 2020 CA1,O=DigiCert Inc,C=US
+
+
+
DigiCert ECC CA-1 - generic -- assert nothing.
CN=DigiCert Secure Site ECC CA-1,OU=www.digicert.com,O=DigiCert Inc,C=US
+
+
+
DigiCert SHA2 EV - generic -- assert nothing.
CN=DigiCert SHA2 Extended Validation Server CA,OU=www.digicert.com,O=DigiCert Inc,C=US
CN=DigiCert SHA2 High Assurance Server CA,OU=www.digicert.com,O=DigiCert Inc,C=US
+
+
+
Sectigo RSA - generic -- assert nothing.
CN=Sectigo RSA Domain Validation Secure Server CA,O=Sectigo Limited,L=Salford,ST=Greater Manchester,C=GB
CN=Sectigo RSA Organization Validation Secure Server CA,O=Sectigo Limited,L=Salford,ST=Greater Manchester,C=GB
+
+
+
GeoTrust RSA CA 2018 - generic -- assert nothing.
CN=GeoTrust RSA CA 2018,OU=www.digicert.com,O=DigiCert Inc,C=US
+
+
+
Go Daddy G2 - generic -- assert nothing.
CN=Go Daddy Secure Certificate Authority - G2,OU=http://certs.godaddy.com/repository/,O=GoDaddy.com\, Inc.,L=Scottsdale,ST=Arizona,C=US
+
+
+