CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-10-20 19:01:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Make tls.record_read more strict about protocol correctness

Browse source
This commit is contained in:
dmiller 2014-04-17 02:15:03 +00:00
parent 91e1d21cc1
commit 9ca584d0b8
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
nselib/tls.lua
View file

@ -602,7 +602,7 @@ end
-- @return The current position in the buffer
-- @return The record that was read, as a table
function record_read(buffer, i)
local b, h, j, len
local b, h, len
------------
-- Header --
@ -615,8 +615,20 @@ function record_read(buffer, i)
-- Parse header.
h = {}
j, h["type"] = bin.unpack("C", buffer, i)
j, h["protocol"] = bin.unpack(">S", buffer, j)
local j, typ, proto = bin.unpack(">CS", buffer, i)
local name = find_key(TLS_CONTENTTYPE_REGISTRY, typ)
if name == nil then
stdnse.print_debug("Unknown TLS ContentType: %d", typ)
return j, nil
end
h["type"] = name
name = find_key(PROTOCOLS, proto)
if name == nil then
stdnse.print_debug("Unknown TLS Protocol: 0x%x", typ)
return j, nil
end
h["protocol"] = name
j, h["length"] = bin.unpack(">S", buffer, j)
-- Ensure we have enough data for the body.
@ -626,8 +638,6 @@ function record_read(buffer, i)
end
-- Convert to human-readable form.
h["type"] = find_key(TLS_CONTENTTYPE_REGISTRY, h["type"])
h["protocol"] = find_key(PROTOCOLS, h["protocol"])
----------
-- Body --