vincenzopalazzo
/
arti
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix two bugs related to incomplete read/write 

Discovered by clippy
This commit is contained in:
Ian Jackson 2022-01-19 17:17:56 +00:00
parent 5e16a52e1c
commit 1d5a480f79
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/tor-proto/src/channel/handshake.rs
View File

@ -106,7 +106,7 @@ impl<T: AsyncRead + AsyncWrite + Send + Unpin + 'static> OutboundClientHandshake
// Send versions cell
{
let my_versions = msg::Versions::new(LINK_PROTOCOLS)?;
self.tls.write(&my_versions.encode_for_handshake()).await?;
self.tls.write_all(&my_versions.encode_for_handshake()).await?;
self.tls.flush().await?;
}
@ -115,8 +115,8 @@ impl<T: AsyncRead + AsyncWrite + Send + Unpin + 'static> OutboundClientHandshake
let their_versions: msg::Versions = {
// TODO: this could be turned into another function, I suppose.
let mut hdr = [0_u8; 5];
self.tls.read(&mut hdr).await?;
if hdr[0..3] != [0, 0, ChanCmd::VERSIONS.into()] {
let len = self.tls.read(&mut hdr).await?;
if len != hdr.len() || hdr[0..3] != [0, 0, ChanCmd::VERSIONS.into()] {
return Err(Error::ChanProto("Doesn't seem to be a tor relay".into()));
}
let msglen = u16::from_be_bytes(*array_ref![hdr, 3, 2]);