diff --git a/nselib/dhcp.lua b/nselib/dhcp.lua index e2f70e8a3..c89704628 100644 --- a/nselib/dhcp.lua +++ b/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("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) diff --git a/nselib/msrpctypes.lua b/nselib/msrpctypes.lua index f20502a0d..2ae2f64d3 100644 --- a/nselib/msrpctypes.lua +++ b/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", 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,