1
0
mirror of https://github.com/nmap/nmap.git synced 2026-01-20 13:19:01 +00:00

Allow ascii values in cert fields (broke in r35714)

This commit is contained in:
dmiller
2016-03-25 14:02:02 +00:00
parent 85e3f3cfe3
commit 6a0c3e8219

View File

@@ -161,6 +161,8 @@ local function maybe_decode(str)
elseif str:byte(1) == 0 and str:byte(2) > 0 then
-- big-endian UTF-16
return unicode.transcode(str, unicode.utf16_dec, unicode.utf8_enc, true, nil)
else
return str
end
end
@@ -173,7 +175,7 @@ function stringify_name(name)
for _, k in ipairs(NON_VERBOSE_FIELDS) do
v = name[k]
if v then
fields[#fields + 1] = string.format("%s=%s", k, maybe_decode(v))
fields[#fields + 1] = string.format("%s=%s", k, maybe_decode(v) or '')
end
end
if nmap.verbosity() > 1 then
@@ -183,7 +185,7 @@ function stringify_name(name)
if type(k) == "table" then
k = stdnse.strjoin(".", k)
end
fields[#fields + 1] = string.format("%s=%s", k, maybe_decode(v))
fields[#fields + 1] = string.format("%s=%s", k, maybe_decode(v) or '')
end
end
end