aboutsummaryrefslogtreecommitdiff
path: root/azalea-protocol/src/read.rs
diff options
context:
space:
mode:
authormat <github@matdoes.dev>2022-04-29 20:22:26 -0500
committermat <github@matdoes.dev>2022-04-29 20:22:26 -0500
commitbaaa7658b58adfe72f0ea96d629dc76298ddf5dc (patch)
treee07fd96cc07484ef771b1b5472d5dd7e1a92c847 /azalea-protocol/src/read.rs
parent3bd32cfa00e8b50b47267ab75a4ff8892ae89d54 (diff)
parent8317b5b28153794770a8c7b84a1b6dd50eaa3f80 (diff)
downloadazalea-drasl-baaa7658b58adfe72f0ea96d629dc76298ddf5dc.tar.xz
Merge branch 'main' into chunk-packets
Diffstat (limited to 'azalea-protocol/src/read.rs')
-rwxr-xr-xazalea-protocol/src/read.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/azalea-protocol/src/read.rs b/azalea-protocol/src/read.rs
index 1e308cfb..88fe95cf 100755
--- a/azalea-protocol/src/read.rs
+++ b/azalea-protocol/src/read.rs
@@ -2,7 +2,7 @@ use std::{cell::Cell, pin::Pin};
use crate::{connect::PacketFlow, mc_buf::Readable, packets::ProtocolPacket};
use async_compression::tokio::bufread::ZlibDecoder;
-use azalea_auth::encryption::Aes128Cfb;
+use azalea_auth::encryption::Aes128CfbDec;
use tokio::io::{AsyncRead, AsyncReadExt};
async fn frame_splitter<R: ?Sized>(mut stream: &mut R) -> Result<Vec<u8>, String>
@@ -97,7 +97,7 @@ struct EncryptedStream<'a, R>
where
R: AsyncRead + std::marker::Unpin + std::marker::Send,
{
- cipher: Cell<&'a mut Option<Aes128Cfb>>,
+ cipher: Cell<&'a mut Option<Aes128CfbDec>>,
stream: &'a mut Pin<&'a mut R>,
}
@@ -133,7 +133,7 @@ pub async fn read_packet<'a, P: ProtocolPacket, R>(
flow: &PacketFlow,
stream: &'a mut R,
compression_threshold: Option<u32>,
- cipher: &mut Option<Aes128Cfb>,
+ cipher: &mut Option<Aes128CfbDec>,
) -> Result<P, String>
where
R: AsyncRead + std::marker::Unpin + std::marker::Send + std::marker::Sync,