From 6a0c3e8219c39b9a064218d5b99dad766546bb6d Mon Sep 17 00:00:00 2001 From: dmiller Date: Fri, 25 Mar 2016 14:02:02 +0000 Subject: [PATCH] Allow ascii values in cert fields (broke in r35714) --- scripts/ssl-cert.nse | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/ssl-cert.nse b/scripts/ssl-cert.nse index 2546692f0..200f4a29d 100644 --- a/scripts/ssl-cert.nse +++ b/scripts/ssl-cert.nse @@ -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