Core/Crypto: Fixed EVP_PKEY reference counting for copied objects

Closes #27943

3 files changed, 20 insertions, 7 deletions

diff --git a/src/server/game/Server/Packets/AuthenticationPackets.cpp b/src/server/game/Server/Packets/AuthenticationPackets.cpp
index e9004a8f5da..7ba0c8b886d 100644
--- a/src/server/game/Server/Packets/AuthenticationPackets.cpp
+++ b/src/server/game/Server/Packets/AuthenticationPackets.cpp
@@ -247,6 +247,11 @@ bool WorldPackets::Auth::ConnectTo::InitializeEncryption()
     return true;
 }
 
+void WorldPackets::Auth::ConnectTo::ShutdownEncryption()
+{
+    ConnectToRSA.reset();
+}
+
 WorldPackets::Auth::ConnectTo::ConnectTo() : ServerPacket(SMSG_CONNECT_TO, 256 + 1 + 16 + 2 + 4 + 1 + 8)
 {
 }
@@ -274,9 +279,11 @@ WorldPacket const* WorldPackets::Auth::ConnectTo::Write()
     signBuffer.append(whereBuffer);
     signBuffer << uint32(Payload.Where.Type);
     signBuffer << uint16(Payload.Port);
+
+    Trinity::Crypto::RsaSignature rsa(*ConnectToRSA);
     Trinity::Crypto::RsaSignature::SHA256 digestGenerator;
     std::vector<uint8> signature;
-    ConnectToRSA->Sign(signBuffer.contents(), signBuffer.size(), digestGenerator, signature);
+    rsa.Sign(signBuffer.contents(), signBuffer.size(), digestGenerator, signature);
 
     _worldPacket.append(signature.data(), signature.size());
     _worldPacket.append(whereBuffer);
@@ -310,10 +317,11 @@ WorldPacket const* WorldPackets::Auth::EnterEncryptedMode::Write()
     msg[0] = Enabled ? 1 : 0;
     std::copy_n(std::begin(EnableEncryptionSeed), std::size(EnableEncryptionSeed), &msg[1]);
 
+    Trinity::Crypto::RsaSignature rsa(*ConnectToRSA);
     Trinity::Crypto::RsaSignature::HMAC_SHA256 digestGenerator(EncryptionKey, 16);
     std::vector<uint8> signature;
 
-    ConnectToRSA->Sign(msg, digestGenerator, signature);
+    rsa.Sign(msg, digestGenerator, signature);
 
     _worldPacket.append(signature.data(), signature.size());
     _worldPacket.WriteBit(Enabled);
diff --git a/src/server/game/Server/Packets/AuthenticationPackets.h b/src/server/game/Server/Packets/AuthenticationPackets.h
index 017afed87fb..aa4216ec30e 100644
--- a/src/server/game/Server/Packets/AuthenticationPackets.h
+++ b/src/server/game/Server/Packets/AuthenticationPackets.h
@@ -203,13 +203,15 @@ namespace WorldPackets
             WorldAttempt5   = 89
         };
 
-        class ConnectTo final : public ServerPacket
+        class TC_GAME_API ConnectTo final : public ServerPacket
         {
         public:
             static bool InitializeEncryption();
+            static void ShutdownEncryption();
 
             enum AddressType : uint8
             {
+                None = 0,
                 IPv4 = 1,
                 IPv6 = 2,
                 NamedSocket = 3 // not supported by windows client
@@ -217,20 +219,20 @@ namespace WorldPackets
 
             struct SocketAddress
             {
-                AddressType Type;
+                AddressType Type = None;
                 union
                 {
                     std::array<uint8, 4> V4;
                     std::array<uint8, 16> V6;
                     std::array<char, 128> Name;
-                } Address;
+                } Address = { };
             };
 
             struct ConnectPayload
             {
                 SocketAddress Where;
-                uint16 Port;
-                std::array<uint8, 256> Signature;
+                uint16 Port = 0;
+                std::array<uint8, 256> Signature = { };
             };
 
             ConnectTo();
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index 079d4d4102b..e08e9610965 100644
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -22,6 +22,7 @@
 #include "Common.h"
 #include "AppenderDB.h"
 #include "AsyncAcceptor.h"
+#include "AuthenticationPackets.h"
 #include "Banner.h"
 #include "BattlegroundMgr.h"
 #include "BigNumber.h"
@@ -401,6 +402,8 @@ extern int main(int argc, char** argv)
     WorldUpdateLoop();
 
     // Shutdown starts here
+    WorldPackets::Auth::ConnectTo::ShutdownEncryption();
+
     threadPool.reset();
 
     sLog->SetSynchronous();