codex-storage
/
nim-libp2p
mirror of https://github.com/codex-storage/nim-libp2p.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Hotfix noise read usage, replace with readExactly

This commit is contained in:
Giovanni Petrantoni 2020-04-22 23:36:59 +09:00
parent d96372f820
commit 6ae92eb21a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -270,7 +270,9 @@ proc receiveHSMessage(sconn: Connection): Future[seq[byte]] {.async.} =
await sconn.readExactly(addr besize[0], 2) await sconn.readExactly(addr besize[0], 2)
let size = uint16.fromBytesBE(besize).int let size = uint16.fromBytesBE(besize).int
trace "receiveHSMessage", size trace "receiveHSMessage", size
return await sconn.read(size) var buffer = newSeq[byte](size)
await sconn.readExactly(addr buffer[0], size)
return buffer
proc sendHSMessage(sconn: Connection; buf: seq[byte]) {.async.} = proc sendHSMessage(sconn: Connection; buf: seq[byte]) {.async.} =
var var
@ -422,9 +424,9 @@ method readMessage(sconn: NoiseConnection): Future[seq[byte]] {.async.} =
trace "receiveEncryptedMessage", size, peer = $sconn.peerInfo trace "receiveEncryptedMessage", size, peer = $sconn.peerInfo
if size == 0: if size == 0:
return @[] return @[]
let var buffer = newSeq[byte](size)
cipher = await sconn.read(size) await sconn.readExactly(addr buffer[0], size)
var plain = sconn.readCs.decryptWithAd([], cipher) var plain = sconn.readCs.decryptWithAd([], buffer)
unpackNoisePayload(plain) unpackNoisePayload(plain)
return plain return plain
except LPStreamIncompleteError: except LPStreamIncompleteError: