From dc689d0f70ea3b9d7585987ef1cf61e33e47f1e9 Mon Sep 17 00:00:00 2001
From: Matt Johnston <matt@ucc.asn.au>
Date: Wed, 12 Apr 2023 23:37:33 +0800
Subject: [PATCH] decrypt_first_block() returns usize
---
src/encrypt.rs | 8 ++++----
src/traffic.rs | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/encrypt.rs b/src/encrypt.rs
index d45e114..4ddadef 100644
--- a/src/encrypt.rs
+++ b/src/encrypt.rs
@@ -73,7 +73,7 @@ impl KeyState {
}
/// Decrypts the first block in the buffer, returning the length.
- pub fn decrypt_first_block(&mut self, buf: &mut [u8]) -> Result<u32, Error> {
+ pub fn decrypt_first_block(&mut self, buf: &mut [u8]) -> Result<usize, Error> {
self.keys.decrypt_first_block(buf, self.seq_decrypt.0)
}
@@ -223,7 +223,7 @@ impl Keys {
/// handled later by [`decrypt`]. Bytes `buf[0..4]` may be left unmodified.
fn decrypt_first_block(
&mut self, buf: &mut [u8], seq: u32,
- ) -> Result<u32, Error> {
+ ) -> Result<usize, Error> {
if buf.len() < self.dec.size_block() {
return Err(Error::bug());
}
@@ -244,7 +244,7 @@ impl Keys {
.ok_or(Error::BadDecrypt)?;
trace!("len {len:?} total {total_len:?}");
- Ok(total_len)
+ Ok(total_len as usize)
}
/// Decrypt the whole packet buffer and validate AEAD Tag or MAC.
@@ -659,7 +659,7 @@ mod tests {
v[SSH_PAYLOAD_START] ^= 4;
}
- let l = keys_dec.decrypt_first_block(v.as_mut_slice()).unwrap() as usize;
+ let l = keys_dec.decrypt_first_block(v.as_mut_slice()).unwrap();
assert_eq!(l, v.len());
let dec = keys_dec.decrypt(v.as_mut_slice());
diff --git a/src/traffic.rs b/src/traffic.rs
index eee1778..f5726d6 100644
--- a/src/traffic.rs
+++ b/src/traffic.rs
@@ -185,7 +185,7 @@ impl<'a> TrafIn<'a> {
if let RxState::ReadInitial { idx } = self.state {
if idx >= size_block {
let w = &mut self.buf[..size_block];
- let total_len = keys.decrypt_first_block(w)? as usize;
+ let total_len = keys.decrypt_first_block(w)?;
if total_len > self.buf.len() {
// TODO: Or just BadDecrypt could make more sense if
// it were packet corruption/decryption failure
--
GitLab