Remove useless bin.pack('A') calls (equivalent to tostring)

nselib/dhcp.lua

@@ -428,7 +428,7 @@ function dhcp_build(request_type, ip_address, mac_address, options, request_opti
   packet = packet .. bin.pack(">CCCC", overrides['op'] or 1, overrides['htype'] or 1, overrides['hlen'] or 6, overrides['hops'] or 0)  -- BOOTREQUEST, 10mb ethernet, 6 bytes long, 0 hops
   packet = packet .. ( overrides['xid'] or transaction_id )                                                         -- Transaction ID =
   packet = packet .. bin.pack(">SS", overrides['secs'] or 0, overrides['flags'] or 0x0000)     -- Secs, flags
-  packet = packet .. bin.pack("A", ip_address)                                                 -- Client address
+  packet = packet .. ip_address                                                 -- Client address
   packet = packet .. bin.pack("<I", overrides['yiaddr'] or 0)                                  -- yiaddr
   packet = packet .. bin.pack("<I", overrides['siaddr'] or 0)                                  -- siaddr
   packet = packet .. bin.pack("<I", overrides['giaddr'] or 0)                                  -- giaddr

nselib/eap.lua

@@ -162,7 +162,7 @@ local make_eapol = function (arg)
   p.mac_dst = packet.mactobin(ETHER_BROADCAST)
   p.ether_type = ETHER_TYPE_EAPOL
 
-  local bin_payload = bin.pack(">A",arg.payload)
+  local bin_payload = arg.payload
   p.buf = bin.pack("C",arg.version) .. bin.pack("C",arg.type) .. bin.pack(">S",bin_payload:len()).. bin_payload
   p:build_ether_frame()
   return p.frame_buf
@@ -176,7 +176,7 @@ local make_eap = function (arg)
   if not arg.payload then arg.payload = "" end
   if not arg.header then return nil end
 
-  local bin_payload = bin.pack(">A",arg.payload)
+  local bin_payload = arg.payload
   arg.header.payload = bin.pack("C",arg.code) .. bin.pack("C",arg.id) .. bin.pack(">S",bin_payload:len() + EAP_HEADER_SIZE).. bin.pack("C",arg.type) .. bin_payload
 
   local v = make_eapol(arg.header)

nselib/msrpctypes.lua

@@ -372,7 +372,7 @@ local function marshall_basetype(location, func, args)
   stdnse.debug4("MSRPC: Entering marshall_basetype()")
 
   if(location == HEAD or location == ALL) then
-    result = bin.pack("<A", func(table.unpack(args)))
+    result = func(table.unpack(args))
   else
     result = ""
   end
@@ -1702,7 +1702,7 @@ local function marshall_lsa_String_internal(location, str, max_length, do_null)
   end
 
   if(location == BODY or location == ALL) then
-    result = result .. bin.pack("<A", marshall_ptr(BODY, marshall_unicode, {str, do_null, max_length}, str))
+    result = result .. marshall_ptr(BODY, marshall_unicode, {str, do_null, max_length}, str)
   end
 
   stdnse.debug4("MSRPC: Leaving marshall_lsa_String_internal()")

nselib/mssql.lua

@@ -1884,7 +1884,7 @@ LoginPacket =
     offset = offset + self.database:len() * 2
 
     -- client MAC address, hardcoded to 00:00:00:00:00:00
-    data = data .. bin.pack("A", self.MAC)
+    data = data .. self.MAC
 
     -- offset to auth info
     data = data .. bin.pack("<S", offset)
@@ -1896,16 +1896,16 @@ LoginPacket =
     data = data .. bin.pack("<S", 0)
 
     -- Auth info wide strings
-    data = data .. bin.pack("A", Util.ToWideChar(self.client) )
+    data = data .. Util.ToWideChar(self.client)
     if ( not(ntlmAuth) ) then
-      data = data .. bin.pack("A", Util.ToWideChar(self.username) )
-      data = data .. bin.pack("A", Auth.TDS7CryptPass(self.password) )
+      data = data .. Util.ToWideChar(self.username)
+      data = data .. Auth.TDS7CryptPass(self.password)
     end
-    data = data .. bin.pack("A", Util.ToWideChar(self.app) )
-    data = data .. bin.pack("A", Util.ToWideChar(self.server) )
-    data = data .. bin.pack("A", Util.ToWideChar(self.library) )
-    data = data .. bin.pack("A", Util.ToWideChar(self.locale) )
-    data = data .. bin.pack("A", Util.ToWideChar(self.database) )
+    data = data .. Util.ToWideChar(self.app)
+    data = data .. Util.ToWideChar(self.server)
+    data = data .. Util.ToWideChar(self.library)
+    data = data .. Util.ToWideChar(self.locale)
+    data = data .. Util.ToWideChar(self.database)
 
     if ( ntlmAuth ) then
       local NTLMSSP_NEGOTIATE = 1
@@ -1916,7 +1916,7 @@ LoginPacket =
       data = data .. bin.pack("<II", NTLMSSP_NEGOTIATE, flags)
       data = data .. bin.pack("<SSI", #self.domain, #self.domain, 32)
       data = data .. bin.pack("<SSI", #workstation, #workstation, 32)
-      data = data .. bin.pack("A", self.domain:upper())
+      data = data .. self.domain:upper()
     end
 
     return PacketType.Login, data
@@ -1961,8 +1961,8 @@ NTAuthenticationPacket = {
     .. bin.pack("<SSI", #hostname, #hostname, hostname_offset)
     .. bin.pack("<SSI", #sessionkey, #sessionkey, sessionkey_offset)
     .. bin.pack("<I", flags)
-    .. bin.pack("A", domain)
-    .. bin.pack("A", user )
+    .. domain
+    .. user
     .. lm_response .. ntlm_response
 
     return PacketType.NTAuthentication, data

nselib/rpc.lua

@@ -3100,7 +3100,7 @@ Util =
   end,
 
   marshall_opaque = function(data)
-    return bin.pack(">A", data) .. string.rep("\0", Util.CalcFillBytes(data:len()))
+    return data .. string.rep("\0", Util.CalcFillBytes(data:len()))
   end,
 
   unmarshall_opaque = function(len, data, pos)
@@ -3110,7 +3110,7 @@ Util =
   marshall_vopaque = function(data)
     local l = data:len()
     return (
-      Util.marshall_uint32(l) .. bin.pack(">A", data) ..
+      Util.marshall_uint32(l) .. data ..
       string.rep("\0", Util.CalcFillBytes(l))
       )
   end,