1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-30 03:19:02 +00:00

Fixed a bug in the sslcert.lua library that was triggered against certain services when version detection was used.

http://seclists.org/nmap-dev/2014/q4/110
This commit is contained in:
tomsellers
2014-10-25 18:38:17 +00:00
parent 9cb2800c97
commit ea749d785b
2 changed files with 9 additions and 0 deletions

View File

@@ -1,5 +1,8 @@
# Nmap Changelog ($Id$); -*-text-*-
o [NSE] Fixed a bug in the sslcert.lua library that was triggered against
certain services when version detection was used. [Tom Sellers]
o [NSE] Added ssl-poodle to detect CVE-2014-3566 [Daniel Miller]
o [NSE] vulns.Report:make_output() now generates XML structured output

View File

@@ -418,6 +418,9 @@ local SPECIALIZED_PREPARE_TLS_WITHOUT_RECONNECT = {
-- @param port A port table with 'number' and 'service' keys
-- @return A STARTTLS function or nil
function getPrepareTLSWithoutReconnect(port)
if ( port.version and port.version.service_tunnel == 'ssl') then
return nil
end
return (SPECIALIZED_PREPARE_TLS_WITHOUT_RECONNECT[port.number] or
SPECIALIZED_PREPARE_TLS_WITHOUT_RECONNECT[port.service])
end
@@ -429,6 +432,9 @@ end
-- @param port A port table with 'number' and 'service' keys
-- @return A STARTTLS function or nil
function isPortSupported(port)
if ( port.version and port.version.service_tunnel == 'ssl') then
return nil
end
return (SPECIALIZED_PREPARE_TLS[port.number] or
SPECIALIZED_PREPARE_TLS[port.service])
end