PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-01-03 13:19:04 +00:00
Code Issues Projects Releases Wiki Activity

Replace concat-loop padding with string.rep

Browse Source
This commit is contained in:
dmiller
2015-02-27 14:55:42 +00:00
parent e275a96c72
commit 4f0518bd93
10 changed files with 16 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nselib/iscsi.lua
View File

@@ -126,8 +126,6 @@ Packet = {
local pad = 4 - ((#kvps + 48) % 4)
pad = ( pad == 4 ) and 0 or pad
for i=1, pad do kvps = kvps .. "\0" end
local len = bit.lshift( self.total_ahs_len, 24 ) + self.data_seg_len
local flags = bit.lshift( ( self.flags.transit or 0 ), 7 )
flags = flags + bit.lshift( ( self.flags.continue or 0 ), 6)
@@ -136,12 +134,12 @@ Packet = {
local opcode = self.opcode + bit.lshift((self.immediate or 0), 6)
local data = bin.pack(">CCCCICSCSSISSIILLA", opcode,
local data = bin.pack(">CCCCICSCSSISSIILLAA", opcode,
flags, self.ver_max, self.ver_min, len,
bit.lshift( self.isid.t, 6 ) + bit.band( self.isid.a, 0x3f),
self.isid.b, self.isid.c, self.isid.d, self.tsih,
self.initiator_task_tag, self.cid, reserved, self.cmdsn,
self.expstatsn, reserved, reserved, kvps )
self.expstatsn, reserved, reserved, kvps, string.rep('\0', pad) )
return data
end
@@ -271,7 +269,7 @@ Packet = {
flags = flags + bit.lshift( (self.flags.continue or 0), 6 )
local kvps = tostring(self.kvp)
for i=1, (#kvps % 2) do kvps = kvps .. "\0" end
kvps = kvps .. string.rep('\0', #kvps % 2)
self.data_seg_len = #kvps
local len = bit.lshift( self.total_ahs_len, 24 ) + self.data_seg_len