From 2f7f6c7b6a0483c6343ed82bb87cfbbbccc704d8 Mon Sep 17 00:00:00 2001 From: dmiller Date: Thu, 27 Jun 2019 19:13:41 +0000 Subject: [PATCH] Remove unused requires --- nselib/cassandra.lua | 1 - nselib/json.lua | 1 - nselib/packet.lua | 2 -- nselib/proxy.lua | 1 - nselib/sip.lua | 1 - nselib/smb2.lua | 1 - scripts/cics-info.nse | 1 - scripts/clock-skew.nse | 20 +++++++++++++------- scripts/cvs-brute-repository.nse | 1 - scripts/cvs-brute.nse | 1 - scripts/deluge-rpc-brute.nse | 1 - scripts/ganglia-info.nse | 1 - scripts/hddtemp-info.nse | 1 - scripts/http-avaya-ipoffice-users.nse | 1 - scripts/http-cors.nse | 1 - scripts/http-domino-enum-passwords.nse | 1 - scripts/http-generator.nse | 1 - scripts/http-headers.nse | 1 - scripts/http-title.nse | 1 - scripts/http-vuln-cve2013-6786.nse | 1 - scripts/http-vuln-cve2017-5689.nse | 1 - scripts/ipmi-brute.nse | 2 -- scripts/ipv6-ra-flood.nse | 1 - scripts/metasploit-xmlrpc-brute.nse | 1 - scripts/nessus-brute.nse | 1 - scripts/nje-pass-brute.nse | 1 - scripts/openvas-otp-brute.nse | 1 - scripts/pcanywhere-brute.nse | 1 - scripts/rexec-brute.nse | 1 - scripts/sip-enum-users.nse | 1 - scripts/smb-vuln-ms06-025.nse | 1 - scripts/smb-vuln-ms07-029.nse | 1 - scripts/smb-vuln-ms08-067.nse | 1 - scripts/smb-vuln-regsvc-dos.nse | 1 - scripts/ssl-date.nse | 1 - 35 files changed, 13 insertions(+), 43 deletions(-) diff --git a/nselib/cassandra.lua b/nselib/cassandra.lua index df67e51b4..3d559b9ad 100644 --- a/nselib/cassandra.lua +++ b/nselib/cassandra.lua @@ -7,7 +7,6 @@ -- Version 0.1 -- -local nmap = require "nmap" local stdnse = require "stdnse" local string = require "string" _ENV = stdnse.module("cassandra", stdnse.seeall) diff --git a/nselib/json.lua b/nselib/json.lua index ec0ea8dfb..64998fed9 100644 --- a/nselib/json.lua +++ b/nselib/json.lua @@ -20,7 +20,6 @@ -- Modified 02/27/2010 - v0.4 Added unicode handling (written by David Fifield). Renamed toJson -- and fromJson into generate() and parse(), implemented more proper numeric parsing and added some more error checking. -local nmap = require "nmap" local stdnse = require "stdnse" local string = require "string" local table = require "table" diff --git a/nselib/packet.lua b/nselib/packet.lua index 1509da7c1..c01e3ea16 100644 --- a/nselib/packet.lua +++ b/nselib/packet.lua @@ -5,10 +5,8 @@ -- @copyright Same as Nmap--See https://nmap.org/book/man-legal.html local ipOps = require "ipOps" -local nmap = require "nmap" local stdnse = require "stdnse" local string = require "string" -local table = require "table" _ENV = stdnse.module("packet", stdnse.seeall) diff --git a/nselib/proxy.lua b/nselib/proxy.lua index ef2a56657..8a0fba8f1 100644 --- a/nselib/proxy.lua +++ b/nselib/proxy.lua @@ -13,7 +13,6 @@ local nmap = require "nmap" local stdnse = require "stdnse" local string = require "string" local stringaux = require "stringaux" -local table = require "table" _ENV = stdnse.module("proxy", stdnse.seeall) -- Start of local functions diff --git a/nselib/sip.lua b/nselib/sip.lua index 370ade1f6..243dc6228 100644 --- a/nselib/sip.lua +++ b/nselib/sip.lua @@ -38,7 +38,6 @@ local nmap = require "nmap" local os = require "os" local stdnse = require "stdnse" local openssl = stdnse.silent_require "openssl" -local string = require "string" local stringaux = require "stringaux" local table = require "table" local rand = require "rand" diff --git a/nselib/smb2.lua b/nselib/smb2.lua index e84534b58..5aff1ea9a 100644 --- a/nselib/smb2.lua +++ b/nselib/smb2.lua @@ -14,7 +14,6 @@ local datetime = require "datetime" local string = require "string" local stdnse = require "stdnse" -local nmap = require "nmap" local table = require "table" local tableaux = require "tableaux" local match = require "match" diff --git a/scripts/cics-info.nse b/scripts/cics-info.nse index f9c1144df..44e41c224 100644 --- a/scripts/cics-info.nse +++ b/scripts/cics-info.nse @@ -1,4 +1,3 @@ -local nmap = require "nmap" local stdnse = require "stdnse" local shortport = require "shortport" local stringaux = require "stringaux" diff --git a/scripts/clock-skew.nse b/scripts/clock-skew.nse index 3344cc329..33701cb7d 100644 --- a/scripts/clock-skew.nse +++ b/scripts/clock-skew.nse @@ -94,19 +94,25 @@ local function record_stats(host, mean, stddev, median) end hostaction = function(host) - local mean, stddev = formulas.mean_stddev(host.registry.datetime_skew) - local median = formulas.median(host.registry.datetime_skew) + local skews = host.registry.datetime_skew + if not skews or #skews < 1 then + return nil + end + local mean, stddev = formulas.mean_stddev(skews) + local median = formulas.median(skews) -- truncate to integers; we don't care about fractional seconds) mean = math.modf(mean) stddev = math.modf(stddev) median = math.modf(median) record_stats(host, mean, stddev, median) if mean ~= 0 or stddev ~= 0 or nmap.verbosity() > 1 then - local out = {mean = mean, stddev = stddev, median = median} - return out, ("mean: %s, deviation: %s, median: %s"):format( - datetime.format_time(mean), - datetime.format_time(stddev), - datetime.format_time(median) + local out = {count = #skews, mean = mean, stddev = stddev, median = median} + return out, (#skews == 1 and datetime.format_time(mean) + or ("mean: %s, deviation: %s, median: %s"):format( + datetime.format_time(mean), + datetime.format_time(stddev), + datetime.format_time(median) + ) ) end end diff --git a/scripts/cvs-brute-repository.nse b/scripts/cvs-brute-repository.nse index e9b0fda4f..f0b678ab2 100644 --- a/scripts/cvs-brute-repository.nse +++ b/scripts/cvs-brute-repository.nse @@ -3,7 +3,6 @@ local coroutine = require "coroutine" local creds = require "creds" local cvs = require "cvs" local io = require "io" -local nmap = require "nmap" local shortport = require "shortport" local stdnse = require "stdnse" local table = require "table" diff --git a/scripts/cvs-brute.nse b/scripts/cvs-brute.nse index 3cb57455b..1d55bdbce 100644 --- a/scripts/cvs-brute.nse +++ b/scripts/cvs-brute.nse @@ -1,7 +1,6 @@ local brute = require "brute" local creds = require "creds" local cvs = require "cvs" -local nmap = require "nmap" local shortport = require "shortport" local stdnse = require "stdnse" diff --git a/scripts/deluge-rpc-brute.nse b/scripts/deluge-rpc-brute.nse index ea6c726a7..64fb1a2ac 100644 --- a/scripts/deluge-rpc-brute.nse +++ b/scripts/deluge-rpc-brute.nse @@ -1,6 +1,5 @@ local brute = require "brute" local creds = require "creds" -local nmap = require "nmap" local shortport = require "shortport" local string = require "string" diff --git a/scripts/ganglia-info.nse b/scripts/ganglia-info.nse index 30d6c9ca7..6dde00ee7 100644 --- a/scripts/ganglia-info.nse +++ b/scripts/ganglia-info.nse @@ -1,5 +1,4 @@ local comm = require "comm" -local nmap = require "nmap" local shortport = require "shortport" local slaxml = require "slaxml" local stdnse = require "stdnse" diff --git a/scripts/hddtemp-info.nse b/scripts/hddtemp-info.nse index 9025ab473..86dee8319 100644 --- a/scripts/hddtemp-info.nse +++ b/scripts/hddtemp-info.nse @@ -1,7 +1,6 @@ local comm = require "comm" local math = require "math" local shortport = require "shortport" -local stdnse = require "stdnse" local string = require "string" local stringaux = require "stringaux" local table = require "table" diff --git a/scripts/http-avaya-ipoffice-users.nse b/scripts/http-avaya-ipoffice-users.nse index af86b8ffc..8aed21451 100644 --- a/scripts/http-avaya-ipoffice-users.nse +++ b/scripts/http-avaya-ipoffice-users.nse @@ -29,7 +29,6 @@ license = "Same as Nmap--See https://nmap.org/book/man-legal.html" categories = {"exploit","vuln"} local http = require "http" -local nmap = require "nmap" local shortport = require "shortport" local string = require "string" local vulns = require "vulns" diff --git a/scripts/http-cors.nse b/scripts/http-cors.nse index 11493b962..e766a3a30 100644 --- a/scripts/http-cors.nse +++ b/scripts/http-cors.nse @@ -1,7 +1,6 @@ local http = require "http" local nmap = require "nmap" local shortport = require "shortport" -local stdnse = require "stdnse" local stringaux = require "stringaux" local table = require "table" diff --git a/scripts/http-domino-enum-passwords.nse b/scripts/http-domino-enum-passwords.nse index 0f9973ed4..81be8feb4 100644 --- a/scripts/http-domino-enum-passwords.nse +++ b/scripts/http-domino-enum-passwords.nse @@ -1,7 +1,6 @@ local creds = require "creds" local http = require "http" local io = require "io" -local nmap = require "nmap" local shortport = require "shortport" local stdnse = require "stdnse" local stringaux = require "stringaux" diff --git a/scripts/http-generator.nse b/scripts/http-generator.nse index 8c6e292a3..649749bd0 100644 --- a/scripts/http-generator.nse +++ b/scripts/http-generator.nse @@ -1,7 +1,6 @@ local http = require "http" local shortport = require "shortport" local stdnse = require "stdnse" -local string = require "string" local stringaux = require "stringaux" description = [[ diff --git a/scripts/http-headers.nse b/scripts/http-headers.nse index 92b658bb0..420c25a6a 100644 --- a/scripts/http-headers.nse +++ b/scripts/http-headers.nse @@ -1,5 +1,4 @@ local http = require "http" -local nmap = require "nmap" local shortport = require "shortport" local stdnse = require "stdnse" local table = require "table" diff --git a/scripts/http-title.nse b/scripts/http-title.nse index 20507dfa8..87a14c35d 100644 --- a/scripts/http-title.nse +++ b/scripts/http-title.nse @@ -1,5 +1,4 @@ local http = require "http" -local nmap = require "nmap" local shortport = require "shortport" local stdnse = require "stdnse" local string = require "string" diff --git a/scripts/http-vuln-cve2013-6786.nse b/scripts/http-vuln-cve2013-6786.nse index 1f0953a16..851e6b0f2 100644 --- a/scripts/http-vuln-cve2013-6786.nse +++ b/scripts/http-vuln-cve2013-6786.nse @@ -35,7 +35,6 @@ license = "Same as Nmap--See https://nmap.org/book/man-legal.html" categories = {"exploit","vuln"} local http = require "http" -local nmap = require "nmap" local shortport = require "shortport" local vulns = require "vulns" local stdnse = require "stdnse" diff --git a/scripts/http-vuln-cve2017-5689.nse b/scripts/http-vuln-cve2017-5689.nse index e4fa930cb..e9c46866e 100644 --- a/scripts/http-vuln-cve2017-5689.nse +++ b/scripts/http-vuln-cve2017-5689.nse @@ -13,7 +13,6 @@ local string = require "string" local http = require "http" local shortport = require "shortport" local vulns = require "vulns" -local stdnse = require "stdnse" local rand = require "rand" --- diff --git a/scripts/ipmi-brute.nse b/scripts/ipmi-brute.nse index fd0509d20..11621f0da 100644 --- a/scripts/ipmi-brute.nse +++ b/scripts/ipmi-brute.nse @@ -1,9 +1,7 @@ local brute = require "brute" local creds = require "creds" local ipmi = require "ipmi" -local nmap = require "nmap" local shortport = require "shortport" -local stdnse = require "stdnse" local rand = require "rand" description = [[ diff --git a/scripts/ipv6-ra-flood.nse b/scripts/ipv6-ra-flood.nse index 582f24ccd..9737b46ac 100644 --- a/scripts/ipv6-ra-flood.nse +++ b/scripts/ipv6-ra-flood.nse @@ -2,7 +2,6 @@ local ipOps = require "ipOps" local nmap = require "nmap" local packet = require "packet" local stdnse = require "stdnse" -local math = require "math" local string = require "string" local os = require "os" local rand = require "rand" diff --git a/scripts/metasploit-xmlrpc-brute.nse b/scripts/metasploit-xmlrpc-brute.nse index 5413440d8..4efb9f60e 100644 --- a/scripts/metasploit-xmlrpc-brute.nse +++ b/scripts/metasploit-xmlrpc-brute.nse @@ -2,7 +2,6 @@ local brute = require "brute" local comm = require "comm" local creds = require "creds" local match = require "match" -local nmap = require "nmap" local shortport = require "shortport" local stdnse = require "stdnse" local string = require "string" diff --git a/scripts/nessus-brute.nse b/scripts/nessus-brute.nse index 2e43d9cd9..409fba47a 100644 --- a/scripts/nessus-brute.nse +++ b/scripts/nessus-brute.nse @@ -1,7 +1,6 @@ local brute = require "brute" local creds = require "creds" local match = require "match" -local nmap = require "nmap" local shortport = require "shortport" description=[[ diff --git a/scripts/nje-pass-brute.nse b/scripts/nje-pass-brute.nse index ad3aa5354..5cb29f60f 100644 --- a/scripts/nje-pass-brute.nse +++ b/scripts/nje-pass-brute.nse @@ -1,5 +1,4 @@ local string = require "string" -local nmap = require "nmap" local stdnse = require "stdnse" local shortport = require "shortport" local brute = require "brute" diff --git a/scripts/openvas-otp-brute.nse b/scripts/openvas-otp-brute.nse index 6556db306..6cca909f9 100644 --- a/scripts/openvas-otp-brute.nse +++ b/scripts/openvas-otp-brute.nse @@ -1,7 +1,6 @@ local brute = require "brute" local creds = require "creds" local match = require "match" -local nmap = require "nmap" local shortport = require "shortport" local stdnse = require "stdnse" local string = require "string" diff --git a/scripts/pcanywhere-brute.nse b/scripts/pcanywhere-brute.nse index 17607d577..b85e85e22 100644 --- a/scripts/pcanywhere-brute.nse +++ b/scripts/pcanywhere-brute.nse @@ -1,6 +1,5 @@ local brute = require "brute" local creds = require "creds" -local nmap = require "nmap" local shortport = require "shortport" local stdnse = require "stdnse" local string = require "string" diff --git a/scripts/rexec-brute.nse b/scripts/rexec-brute.nse index 64062b0e8..4e09e8309 100644 --- a/scripts/rexec-brute.nse +++ b/scripts/rexec-brute.nse @@ -1,6 +1,5 @@ local brute = require "brute" local creds = require "creds" -local nmap = require "nmap" local shortport = require "shortport" local stdnse = require "stdnse" diff --git a/scripts/sip-enum-users.nse b/scripts/sip-enum-users.nse index 704d93539..04faad9fc 100644 --- a/scripts/sip-enum-users.nse +++ b/scripts/sip-enum-users.nse @@ -4,7 +4,6 @@ local string = require "string" local shortport = require "shortport" local sip = require "sip" local stdnse = require "stdnse" -local table = require "table" local math = require "math" local brute = require "brute" local creds = require "creds" diff --git a/scripts/smb-vuln-ms06-025.nse b/scripts/smb-vuln-ms06-025.nse index 02906c37a..1da09615c 100644 --- a/scripts/smb-vuln-ms06-025.nse +++ b/scripts/smb-vuln-ms06-025.nse @@ -1,5 +1,4 @@ local msrpc = require "msrpc" -local nmap = require "nmap" local smb = require "smb" local stdnse = require "stdnse" local vulns = require "vulns" diff --git a/scripts/smb-vuln-ms07-029.nse b/scripts/smb-vuln-ms07-029.nse index 97dad83cd..0c725559a 100644 --- a/scripts/smb-vuln-ms07-029.nse +++ b/scripts/smb-vuln-ms07-029.nse @@ -1,5 +1,4 @@ local msrpc = require "msrpc" -local nmap = require "nmap" local smb = require "smb" local stdnse = require "stdnse" local string = require "string" diff --git a/scripts/smb-vuln-ms08-067.nse b/scripts/smb-vuln-ms08-067.nse index 6b928c644..74ab3279e 100644 --- a/scripts/smb-vuln-ms08-067.nse +++ b/scripts/smb-vuln-ms08-067.nse @@ -1,5 +1,4 @@ local msrpc = require "msrpc" -local nmap = require "nmap" local smb = require "smb" local string = require "string" local vulns = require "vulns" diff --git a/scripts/smb-vuln-regsvc-dos.nse b/scripts/smb-vuln-regsvc-dos.nse index 3e9a622ff..4b523e725 100644 --- a/scripts/smb-vuln-regsvc-dos.nse +++ b/scripts/smb-vuln-regsvc-dos.nse @@ -1,5 +1,4 @@ local msrpc = require "msrpc" -local nmap = require "nmap" local smb = require "smb" local vulns = require "vulns" diff --git a/scripts/ssl-date.nse b/scripts/ssl-date.nse index 83e208a3e..2f4db4570 100644 --- a/scripts/ssl-date.nse +++ b/scripts/ssl-date.nse @@ -1,6 +1,5 @@ local shortport = require "shortport" local stdnse = require "stdnse" -local table = require "table" local math = require "math" local nmap = require "nmap" local os = require "os"