PurpleCelloServer
/
mc_protocol
mirror of https://github.com/PurpleCelloServer/mc_protocol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Adjusted ProtocolConnection encryption handling" 

This reverts commit 44ae75fa01.
This commit is contained in:
Kyler 2024-05-31 23:33:11 -06:00
parent 44ae75fa01
commit fed99d43e0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mc_types.rs
View File

@ -67,7 +67,7 @@ pub trait ProtocolWrite {
pub struct ProtocolConnection<'a> { pub struct ProtocolConnection<'a> {
pub stream_read: &'a mut OwnedReadHalf, pub stream_read: &'a mut OwnedReadHalf,
pub stream_write: &'a mut OwnedWriteHalf, pub stream_write: &'a mut OwnedWriteHalf,
rsa_private_key: Option<&'a RsaPrivateKey>, rsa_private_key: Option<RsaPrivateKey>,
rsa_public_key: Option<RsaPublicKey>, rsa_public_key: Option<RsaPublicKey>,
aes_encryption_key: Option<[u8; 16]>, aes_encryption_key: Option<[u8; 16]>,
verify_token: Option<[u8; 16]>, verify_token: Option<[u8; 16]>,
@ -90,12 +90,12 @@ impl<'a> ProtocolConnection<'a> {
pub fn create_encryption_request( pub fn create_encryption_request(
&mut self, &mut self,
private_key: &'a RsaPrivateKey, private_key: RsaPrivateKey,
) -> Result<login::clientbound::EncryptionRequest> { ) -> Result<login::clientbound::EncryptionRequest> {
match self.rsa_private_key { match self.rsa_private_key {
Some(_) => {}, Some(_) => {},
None => { None => {
let public_key = RsaPublicKey::from(private_key); let public_key = RsaPublicKey::from(&private_key);
let mut rng = rand::thread_rng(); let mut rng = rand::thread_rng();
self.rsa_private_key = Some(private_key); self.rsa_private_key = Some(private_key);
self.rsa_public_key = Some(public_key); self.rsa_public_key = Some(public_key);
@ -123,7 +123,7 @@ impl<'a> ProtocolConnection<'a> {
pub fn handle_encryption_request( pub fn handle_encryption_request(
&mut self, &mut self,
request: &login::clientbound::EncryptionRequest, request: login::clientbound::EncryptionRequest,
) -> Result<login::serverbound::EncryptionResponse> { ) -> Result<login::serverbound::EncryptionResponse> {
self.rsa_public_key = Some( self.rsa_public_key = Some(
RsaPublicKey::from_public_key_der(&request.public_key)?); RsaPublicKey::from_public_key_der(&request.public_key)?);
@ -153,7 +153,7 @@ impl<'a> ProtocolConnection<'a> {
pub fn handle_encryption_response( pub fn handle_encryption_response(
&mut self, &mut self,
response: &login::serverbound::EncryptionResponse, response: login::serverbound::EncryptionResponse,
) -> Result<()> { ) -> Result<()> {
match &self.verify_token { match &self.verify_token {
Some (token) => { Some (token) => {