From fed99d43e0ad0bf98150a46d81be1751d404429c Mon Sep 17 00:00:00 2001
From: Kyler <59854022+KylerOlsen@users.noreply.github.com>
Date: Fri, 31 May 2024 23:33:11 -0600
Subject: [PATCH] Revert "Adjusted ProtocolConnection encryption handling"

This reverts commit 44ae75fa0115c19918af43d561cb16b541141e05.
---
 src/mc_types.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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