Update default-category scripts to use bitwise operators instead of bit.lua

scripts/address-info.nse

@@ -1,4 +1,3 @@
-local bit = require "bit"
 local datafiles = require "datafiles"
 local nmap = require "nmap"
 local stdnse = require "stdnse"
@@ -180,7 +179,7 @@ end
 -- EUI-64 from MAC, RFC 4291.
 local function decode_eui_64(eui_64)
   if eui_64[4] == 0xff and eui_64[5] == 0xfe then
-    return { bit.bxor(eui_64[1], 0x02),
+    return { (eui_64[1] ~ 0x02),
       eui_64[2], eui_64[3], eui_64[6], eui_64[7], eui_64[8] }
   end
 end
@@ -212,12 +211,12 @@ local function do_ipv6(addr)
     local port, client_ipv4
 
     -- Invert obs_port.
-    port = bit.bxor(obs_port, 0xffff)
+    port = obs_port ~ 0xffff
 
     -- Invert obs_client_ipv4.
     client_ipv4 = {}
     for _, octet in ipairs(obs_client_ipv4) do
-      client_ipv4[#client_ipv4 + 1] = bit.bxor(octet, 0xff)
+      client_ipv4[#client_ipv4 + 1] = octet ~ 0xff
     end
 
     output["Server IPv4 address"] = format_ipv4(server_ipv4)

scripts/dns-recursion.nse

@@ -1,4 +1,3 @@
-local bit = require "bit"
 local comm = require "comm"
 local nmap = require "nmap"
 local shortport = require "shortport"
@@ -49,8 +48,8 @@ action = function(host, port)
     nmap.set_port_state(host, port, "open")
 
     -- parse response for dns flags
-    if (bit.band(string.byte(result,3), 0x80) == 0x80
+    if (string.byte(result,3) & 0x80) == 0x80
-        and bit.band(string.byte(result,4), 0x85) == 0x80)
+        and (string.byte(result,4) & 0x85) == 0x80
     then
         return "Recursion appears to be enabled"
     end

scripts/freelancer-info.nse

@@ -2,7 +2,6 @@ local comm = require "comm"
 local nmap = require "nmap"
 local shortport = require "shortport"
 local string = require "string"
-local bit = require "bit"
 local stdnse = require "stdnse"
 
 description = [[
@@ -76,7 +75,7 @@ action = function(host, port)
   o["max. players"] = maxplayers:byte(1) - 1
 
   passwordbyte = passwordbyte:byte(1)
-  if bit.band(passwordbyte, 128) ~= 0 then
+  if passwordbyte & 128 ~= 0 then
     o["password"] = "yes"
   else
     o["password"] = "no"

scripts/ipv6-node-info.nse

@@ -1,5 +1,4 @@
 local bin = require "bin"
-local bit = require "bit"
 local dns = require "dns"
 local ipOps = require "ipOps"
 local nmap = require "nmap"
@@ -197,7 +196,7 @@ local function stringify_nodeaddresses(flags, data)
     return
   end
 
-  if bit.band(flags, 0x01) ~= 0 then
+  if (flags & 0x01) ~= 0 then
     addrs[#addrs+1] = "(more omitted for space reasons)"
   end
 
@@ -239,7 +238,7 @@ local function stringify_nodeipv4addresses(flags, data)
     return
   end
 
-  if bit.band(flags, 0x01) ~= 0 then
+  if (flags & 0x01) ~= 0 then
     addrs[#addrs+1] = "(more omitted for space reasons)"
   end
 

scripts/knx-gateway-info.nse

@@ -1,7 +1,6 @@
 local nmap = require "nmap"
 local shortport = require "shortport"
 local bin = require "bin"
-local bit = require "bit"
 local ipOps = require "ipOps"
 local stdnse = require "stdnse"
 
@@ -81,9 +80,9 @@ end
 -- Parse a KNX address from raw bytes
 -- @param addr Unpacked 2 bytes
 local parseKnxAddress = function(addr)
-  local a = bit.rshift(bit.band(addr, 0xf000),12)
+  local a = (addr & 0xf000) >> 12
-  local b = bit.rshift(bit.band(addr, 0x0f00), 8)
+  local b = (addr & 0x0f00) >>  8
-  local c = bit.band(addr, 0xff)
+  local c = addr & 0xff
   return a..'.'..b..'.'..c
 end
 

scripts/mysql-info.nse

@@ -1,4 +1,3 @@
-local bit = require "bit"
 local mysql = require "mysql"
 local nmap = require "nmap"
 local stdnse = require "stdnse"
@@ -53,7 +52,7 @@ local bitset = function(num, lookup)
   local caps = {}
 
   for k, v in pairs(lookup) do
-    if bit.band(num, v) > 0 then
+    if num & v > 0 then
       caps[#caps+1] = k
     end
   end

scripts/p2p-conficker.nse

@@ -1,5 +1,4 @@
 local bin = require "bin"
-local bit = require "bit"
 local ipOps = require "ipOps"
 local math = require "math"
 local nmap = require "nmap"
@@ -96,15 +95,15 @@ local MAX_PACKET = 0x2000
 -- Flags
 local mode_flags =
 {
-  FLAG_MODE              = bit.lshift(1, 0),
+  FLAG_MODE              = 1 << 0,
-  FLAG_LOCAL_ACK         = bit.lshift(1, 1),
+  FLAG_LOCAL_ACK         = 1 << 1,
-  FLAG_IS_TCP            = bit.lshift(1, 2),
+  FLAG_IS_TCP            = 1 << 2,
-  FLAG_IP_INCLUDED       = bit.lshift(1, 3),
+  FLAG_IP_INCLUDED       = 1 << 3,
-  FLAG_UNKNOWN0_INCLUDED = bit.lshift(1, 4),
+  FLAG_UNKNOWN0_INCLUDED = 1 << 4,
-  FLAG_UNKNOWN1_INCLUDED = bit.lshift(1, 5),
+  FLAG_UNKNOWN1_INCLUDED = 1 << 5,
-  FLAG_DATA_INCLUDED     = bit.lshift(1, 6),
+  FLAG_DATA_INCLUDED     = 1 << 6,
-  FLAG_SYSINFO_INCLUDED  = bit.lshift(1, 7),
+  FLAG_SYSINFO_INCLUDED  = 1 << 7,
-  FLAG_ENCODED           = bit.lshift(1, 15)
+  FLAG_ENCODED           = 1 << 15,
 }
 
 ---For a hostrule, simply use the 'smb' ports as an indicator, unless the user overrides it
@@ -140,12 +139,12 @@ local function mul64(u, v)
   --       = 2**32 u1 v1 + 2**16 (u0 v1 + u1 v0) + u0 v0
   assert(0 <= u and u <= 0xFFFFFFFF)
   assert(0 <= v and v <= 0xFFFFFFFF)
-  local u0, u1 = bit.band(u, 0xFFFF), bit.rshift(u, 16)
+  local u0, u1 = (u & 0xFFFF), (u >> 16)
-  local v0, v1 = bit.band(v, 0xFFFF), bit.rshift(v, 16)
+  local v0, v1 = (v & 0xFFFF), (v >> 16)
   -- t uses at most 49 bits, which is within the range of exact integer
   -- precision of a Lua number.
   local t = u0 * v0 + (u0 * v1 + u1 * v0) * 65536
-  return bit.band(t, 0xFFFFFFFF), u1 * v1 + bit.rshift(t, 32)
+  return (t & 0xFFFFFFFF), u1 * v1 + (t >> 32)
 end
 
 ---Rotates the 64-bit integer defined by h:l left by one bit.
@@ -159,16 +158,16 @@ local function rot64(h, l)
   assert(0 <= h and h <= 0xFFFFFFFF)
   assert(0 <= l and l <= 0xFFFFFFFF)
 
-  local tmp = bit.band(h, 0x80000000)     -- tmp  = h & 0x80000000
+  local tmp = h & 0x80000000
-  h = bit.lshift(h, 1)                    -- h = h << 1
+  h = h << 1
-  h = bit.bor(h, bit.rshift(l, 31))       -- h = h | (l >> 31)
+  h = h | (l >> 31)
-  l = bit.lshift(l, 1)
+  l = l << 1
-  if(tmp ~= 0) then
+  if tmp ~= 0 then
-    l = bit.bor(l, 1)
+    l = l | 1
   end
 
-  h = bit.band(h, 0xFFFFFFFF)
+  h = h & 0xFFFFFFFF
-  l = bit.band(l, 0xFFFFFFFF)
+  l = l & 0xFFFFFFFF
 
   return h, l
 end
@@ -199,11 +198,11 @@ local function is_blacklisted_port(port)
     0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x80000000,
   }
 
-  r = bit.rshift(port, 5)
+  r = port >> 5
-  l = bit.lshift(1, bit.band(r, 0x1f))
+  l = 1 << (r & 0x1f)
-  r = bit.rshift(r, 5)
+  r = r >> 5
 
-  return (bit.band(blacklist[r + 1], l) ~= 0)
+  return blacklist[r + 1] & l ~= 0
 end
 
 ---Generates the four random ports that Conficker uses, based on the current time and the IP address.
@@ -224,7 +223,7 @@ local function prng_generate_ports(ip, seed)
   repeat
     -- Loop 10 times to generate the first pair of ports
     for i = 0, 9, 1 do
-      v1, v2 = mul64(bit.band(v1, 0xFFFFFFFF), bit.band(magic, 0xFFFFFFFF))
+      v1, v2 = mul64(v1 & 0xFFFFFFFF, magic & 0xFFFFFFFF)
 
       -- Add 1 to v1, handling overflows
       if(v1 ~= 0xFFFFFFFF) then
@@ -234,19 +233,19 @@ local function prng_generate_ports(ip, seed)
         v2 = v2 + 1
       end
 
-      v2 = bit.rshift(v2, i)
+      v2 = v2 >> i
 
-      ports[(i % 2) + 1] = bit.bxor(bit.band(v2, 0xFFFF), ports[(i % 2) + 1])
+      ports[(i % 2) + 1] = (v2 & 0xFFFF) ~ ports[(i % 2) + 1]
     end
   until(is_blacklisted_port(ports[1]) == false and is_blacklisted_port(ports[2]) == false and ports[1] ~= ports[2])
 
   -- Update the accumulator with the seed
-  v1 = bit.bxor(v1, seed)
+  v1 = v1 ~ seed
 
   -- Loop 10 more times to generate the second pair of ports
   repeat
     for i = 0, 9, 1 do
-      v1, v2 = mul64(bit.band(v1, 0xFFFFFFFF), bit.band(magic, 0xFFFFFFFF))
+      v1, v2 = mul64(v1 & 0xFFFFFFFF, magic & 0xFFFFFFFF)
 
       -- Add 1 to v1, handling overflows
       if(v1 ~= 0xFFFFFFFF) then
@@ -256,9 +255,9 @@ local function prng_generate_ports(ip, seed)
         v2 = v2 + 1
       end
 
-      v2 = bit.rshift(v2, i)
+      v2 = v2 >> i
 
-      ports[(i % 2) + 3] = bit.bxor(bit.band(v2, 0xFFFF), ports[(i % 2) + 3])
+      ports[(i % 2) + 3] = (v2 & 0xFFFF) ~ ports[(i % 2) + 3]
     end
   until(is_blacklisted_port(ports[3]) == false and is_blacklisted_port(ports[4]) == false and ports[3] ~= ports[4])
 
@@ -279,10 +278,10 @@ local function p2p_checksum(data)
   -- Get the first character
   pos, i = bin.unpack("<C", data)
   while i ~= nil do
-    local h = bit.bxor(hash, i)
+    local h = hash ~ i
     -- Incorporate the current character into the checksum
-    hash = bit.bor((h + h), bit.rshift(h, 31))
+    hash = (h + h) | (h >> 31)
-    hash = bit.band(hash, 0xFFFFFFFF)
+    hash = hash & 0xFFFFFFFF
 
     -- Get the next character
     pos, i = bin.unpack("<C", data, pos)
@@ -308,18 +307,18 @@ local function p2p_cipher(packet, key1, key2)
     key2, key1 = rot64(key2, key1)
 
     -- Generate the key (the right-most byte)
-    local k = bit.band(key1, 0x0FF)
+    local k = key1 & 0x0FF
 
     -- Xor the current character and add it to the encrypted buffer
-    buf[i] = string.char(bit.bxor(string.byte(packet, i), k))
+    buf[i] = string.char(string.byte(packet, i) ~ k)
 
     -- Update the key with 'k'
     key1 = key1 + k
     if(key1 > 0xFFFFFFFF) then
       -- Handle overflows
-      key2 = key2 + (bit.rshift(key1, 32))
+      key2 = key2 + (key1 >> 32)
-      key2 = bit.band(key2, 0xFFFFFFFF)
+      key2 = key2 & 0xFFFFFFFF
-      key1 = bit.band(key1, 0xFFFFFFFF)
+      key1 = key1 & 0xFFFFFFFF
     end
   end
 
@@ -354,7 +353,7 @@ function p2p_parse(packet)
   end
 
   -- Get the IP, if it's present
-  if(bit.band(data['flags'], mode_flags.FLAG_IP_INCLUDED) ~= 0) then
+  if(data['flags'] & mode_flags.FLAG_IP_INCLUDED) ~= 0 then
     pos, data['ip'], data['port'] = bin.unpack("<IS", packet, pos)
     if(data['ip'] == nil) then
       return false, "Packet was too short [3]"
@@ -362,7 +361,7 @@ function p2p_parse(packet)
   end
 
   -- Read the first unknown value, if present
-  if(bit.band(data['flags'], mode_flags.FLAG_UNKNOWN0_INCLUDED) ~= 0) then
+  if(data['flags'] & mode_flags.FLAG_UNKNOWN0_INCLUDED) ~= 0 then
     pos, data['unknown0'] = bin.unpack("<I", packet, pos)
     if(data['unknown0'] == nil) then
       return false, "Packet was too short [3]"
@@ -370,7 +369,7 @@ function p2p_parse(packet)
   end
 
   -- Read the second unknown value, if present
-  if(bit.band(data['flags'], mode_flags.FLAG_UNKNOWN1_INCLUDED) ~= 0) then
+  if(data['flags'] & mode_flags.FLAG_UNKNOWN1_INCLUDED) ~= 0 then
     pos, data['unknown1'] = bin.unpack("<I", packet, pos)
     if(data['unknown1'] == nil) then
       return false, "Packet was too short [4]"
@@ -378,7 +377,7 @@ function p2p_parse(packet)
   end
 
   -- Read the data, if present
-  if(bit.band(data['flags'], mode_flags.FLAG_DATA_INCLUDED) ~= 0) then
+  if(data['flags'] & mode_flags.FLAG_DATA_INCLUDED) ~= 0 then
     pos, data['data_flags'], data['data_length'] = bin.unpack("<CS", packet, pos)
     if(data['data_length'] == nil) then
       return false, "Packet was too short [5]"
@@ -390,7 +389,7 @@ function p2p_parse(packet)
   end
 
   -- Read the sysinfo, if present
-  if(bit.band(data['flags'], mode_flags.FLAG_SYSINFO_INCLUDED) ~= 0) then
+  if(data['flags'] & mode_flags.FLAG_SYSINFO_INCLUDED) ~= 0 then
     pos, data['sysinfo_systemtestflags'],
     data['sysinfo_os_major'],
     data['sysinfo_os_minor'],
@@ -448,12 +447,12 @@ local function p2p_create_packet(protocol, do_encryption)
   local flags = 0
 
   -- Set a couple flags that we need (we don't send any optional data)
-  flags = bit.bor(flags, mode_flags.FLAG_MODE)
+  flags = flags | mode_flags.FLAG_MODE
-  flags = bit.bor(flags, mode_flags.FLAG_ENCODED)
+  flags = flags | mode_flags.FLAG_ENCODED
-  --  flags = bit.bor(flags, mode_flags.FLAG_LOCAL_ACK)
+  --  flags = flags | mode_flags.FLAG_LOCAL_ACK)
   -- Set the special TCP flag
   if(protocol == "tcp") then
-    flags = bit.bor(flags, mode_flags.FLAG_IS_TCP)
+    flags = flags | mode_flags.FLAG_IS_TCP
   end
 
   -- Add the key and flags that are always present (and skip over the boring stuff)

scripts/quake1-info.nse

@@ -1,5 +1,4 @@
 local bin = require "bin"
-local bit = require "bit"
 local comm = require "comm"
 local nmap = require "nmap"
 local stdnse = require "stdnse"
@@ -166,8 +165,8 @@ local function get_player_info(host, port, id)
   player_info.client_address = client_address
   player_info.connect_time = string.format("%d secs", connect_time)
   player_info.frags = frags
-  player_info.shirt = color_codes[bit.rshift(colors, 4)] or "INVALID"
+  player_info.shirt = color_codes[colors >> 4] or "INVALID"
-  player_info.pants = color_codes[bit.band(colors, 0x0f)] or "INVALID"
+  player_info.pants = color_codes[colors & 0x0f] or "INVALID"
   return player_info
 end
 

scripts/smb-security-mode.nse

@@ -1,4 +1,3 @@
-local bit = require "bit"
 local os = require "os"
 local datetime = require "datetime"
 local smb = require "smb"
@@ -121,7 +120,7 @@ action = function(host)
 
   local warnings = {}
   -- User-level authentication or share-level authentication
-  if(bit.band(security_mode, 1) == 1) then
+  if(security_mode & 1) == 1 then
     response.authentication_level = "user"
   else
     response.authentication_level = "share"
@@ -129,7 +128,7 @@ action = function(host)
   end
 
   -- Challenge/response supported?
-  if(bit.band(security_mode, 2) == 0) then
+  if(security_mode & 2) == 0 then
     response.challenge_response = "plaintext-only"
     warnings.challenge_response = "dangerous"
   else
@@ -137,9 +136,9 @@ action = function(host)
   end
 
   -- Message signing supported/required?
-  if(bit.band(security_mode, 8) == 8) then
+  if(security_mode & 8) == 8 then
     response.message_signing = "required"
-  elseif(bit.band(security_mode, 4) == 4) then
+  elseif(security_mode & 4) == 4 then
     response.message_signing = "supported"
   else
     response.message_signing = "disabled"

scripts/ventrilo-info.nse

@@ -1,4 +1,3 @@
-local bit = require "bit"
 local stdnse = require "stdnse"
 local math = require "math"
 local nmap = require "nmap"
@@ -287,21 +286,21 @@ local dec_head = function(str)
   local a2 = head[2]
 
   for i = 3,20 do
-    head[i] = bit.band(head[i] - (crypt_head[a2 + 1] + ((i - 3) % 5)), 0xFF)
+    head[i] = head[i] - (crypt_head[a2 + 1] + ((i - 3) % 5)) & 0xFF
-    a2 = bit.band(a2 + a1, 0xFF)
+    a2 = (a2 + a1) & 0xFF
   end
 
   for i = 3,19,2 do
     head[i], head[i + 1] = head[i + 1], head[i]
   end
 
-  local id = head[7] + bit.lshift(head[8], 8)
+  local id = head[7] + (head[8] << 8)
-  local totlen = head[9] + bit.lshift(head[10], 8)
+  local totlen = head[9] + (head[10] << 8)
-  local len = head[11] + bit.lshift(head[12], 8)
+  local len = head[11] + (head[12] << 8)
-  local totpck = head[13] + bit.lshift(head[14], 8)
+  local totpck = head[13] + (head[14] << 8)
-  local pck = head[15] + bit.lshift(head[16], 8)
+  local pck = head[15] + (head[16] << 8)
-  local key = head[17] + bit.lshift(head[18], 8)
+  local key = head[17] + (head[18] << 8)
-  local crc_sum = head[19] + bit.lshift(head[20], 8)
+  local crc_sum = head[19] + (head[20] << 8)
 
   return id, len, totlen, pck, totpck, key, crc_sum
 end
@@ -314,15 +313,15 @@ local dec_data = function(str, len, key)
   -- skip the header (first 20 bytes)
   local data = { string.byte(str, 21, 20 + len) }
 
-  local a1 = bit.band(key, 0xFF)
+  local a1 = key & 0xFF
   if a1 == 0 then
     return table.concat(data)
   end
-  local a2 = bit.rshift(key, 8)
+  local a2 = key >> 8
 
   for i = 1,len do
-    data[i] = bit.band(data[i] - (crypt_data[a2 + 1] + ((i - 1) % 72)), 0xFF)
+    data[i] = data[i] - (crypt_data[a2 + 1] + ((i - 1) % 72)) & 0xFF
-    a2 = bit.band(a2 + a1, 0xFF)
+    a2 = (a2 + a1) & 0xFF
   end
 
   return string.char(table.unpack(data))
@@ -348,8 +347,7 @@ end
 local crc = function(data)
   local sum = 0
   for i = 1,#data do
-    sum = bit.band(bit.bxor(crypt_crc[bit.rshift(sum, 8) + 1],
+    sum = (crypt_crc[(sum >> 8) + 1] ~ data:byte(i) ~ (sum << 8)) & 0xFFFF
-      data:byte(i), bit.lshift(sum, 8)), 0xFFFF)
   end
   return sum
 end