ae/contego
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ensure min byte limit for ecdh exchange

Browse Source
This commit is contained in:
17ms 2023-05-27 16:51:54 +03:00
parent 0fe036b8aa
commit 5ae514fea6
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/crypto.rs
View File

@ -47,9 +47,9 @@ impl Crypto {
if go_first {
handler.send_raw(&msg).await?;
buf = handler.recv_raw().await?;
buf = handler.recv_raw(DH_PBK_SIZE).await?;
} else {
buf = handler.recv_raw().await?;
buf = handler.recv_raw(DH_PBK_SIZE).await?;
handler.send_raw(&msg).await?;
}

21
src/sockets.rs
View File

@ -65,7 +65,7 @@ impl<'a> SocketHandler<'a> {
}
pub async fn recv(&mut self) -> Result<Vec<u8>, Box<dyn Error + Send + Sync>> {
let mut buf = self.recv_raw().await?;
let mut buf = self.recv_raw(1).await?;
buf.pop();
buf = general_purpose::STANDARD_NO_PAD.decode(&buf)?.to_vec();
@ -77,14 +77,25 @@ impl<'a> SocketHandler<'a> {
Ok(data)
}
pub async fn recv_raw(&mut self) -> Result<Vec<u8>, Box<dyn Error + Send + Sync>> {
pub async fn recv_raw(
&mut self,
min_limit: usize,
) -> Result<Vec<u8>, Box<dyn Error + Send + Sync>> {
let mut buf = Vec::new();
let n = self.reader.read_until(b':', &mut buf).await?;
if n == 0 {
return Err("Received 0 bytes from the socket".into());
while buf.len() <= min_limit {
let n = self.reader.read_until(b':', &mut buf).await?;
if n == 0 {
return Err("Received 0 bytes from the socket".into());
}
}
/*
TODO: use min_limit to check whether read_until has reached EOF before reading all the necessary bytes
(e.g. regarding ecdh key exchange) --> loop and read until buf.len() == min_limit
*/
debug!("Received {} bytes from the socket", buf.len());
Ok(buf)