vacp2p/nim-libp2p
1
0
Fork 0
mirror of https://github.com/vacp2p/nim-libp2p.git synced 2025-02-26 23:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove noise padding payload (spec removed it) (#222)

Browse Source
This commit is contained in:
Giovanni Petrantoni 2020-06-17 08:34:02 +09:00 committed by GitHub
parent 523eed65ce
commit 224c2613e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libp2p/protocols/secure/noise.nim
View File

@ -286,38 +286,23 @@ proc sendHSMessage(sconn: Connection; buf: seq[byte]) {.async.} =
await sconn.write(outbuf) await sconn.write(outbuf)
proc packNoisePayload(payload: openarray[byte]): seq[byte] = proc packNoisePayload(payload: openarray[byte]): seq[byte] =
var result &= payload.len.uint16.toBytesBE
ns: uint32
if randomBytes(addr ns, 4) != 4:
raise newException(NoiseHandshakeError, "Failed to generate randomBytes")
let
noiselen = int((ns mod (NoiseSize - 2)) + 1)
plen = payload.len.uint16
var
noise = newSeq[byte](noiselen)
if randomBytes(noise) != noiselen:
raise newException(NoiseHandshakeError, "Failed to generate randomBytes")
result &= plen.toBytesBE
result &= payload result &= payload
result &= noise
if result.len > uint16.high.int: if result.len > uint16.high.int:
raise newException(NoiseOversizedPayloadError, "Trying to send an unsupported oversized payload over Noise") raise newException(NoiseOversizedPayloadError, "Trying to send an unsupported oversized payload over Noise")
trace "packed noise payload", inSize = payload.len, outSize = result.len trace "packed noise payload", size = payload.len
proc unpackNoisePayload(payload: var seq[byte]) = proc unpackNoisePayload(payload: var seq[byte]) =
let let
besize = payload[0..1] besize = payload[0..1]
size = uint16.fromBytesBE(besize).int size = uint16.fromBytesBE(besize).int
if size > (payload.len - 2): if size != (payload.len - 2):
raise newException(NoiseOversizedPayloadError, "Received a wrong payload size") raise newException(NoiseOversizedPayloadError, "Received a wrong payload size")
payload = payload[2..^((payload.len - size) - 1)] payload = payload[2..^1]
trace "unpacked noise payload", size = payload.len trace "unpacked noise payload", size = payload.len