Server/Crypto: Load Provider

ProjectSkyfire · Jan 7, 2024 · da7a5fe · da7a5fe · Rosley · Feb 9, 2024
1 parent 1ee55f5
commit da7a5fe
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -48,7 +48,7 @@ endif()
 
 include(CheckPlatform)
 
-set(OPENSSL_EXPECTED_VERSION 1.1.1)
+set(OPENSSL_EXPECTED_VERSION 3.3.0)
 set(ACE_EXPECTED_VERSION 6.4.5)
 
 find_package(PCHSupport)

diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp
@@ -10,7 +10,7 @@
 * This file contains the main program for the
 * authentication server
 */
-
+#pragma comment (lib, "Crypt32")
 #include <ace/Dev_Poll_Reactor.h>
 #include <ace/TP_Reactor.h>
 #include <ace/ACE.h>

diff --git a/src/server/shared/Cryptography/ARC4.cpp b/src/server/shared/Cryptography/ARC4.cpp
@@ -5,16 +5,25 @@
 
 #include "ARC4.h"
 #include <openssl/sha.h>
+#include <openssl/provider.h>
 
 ARC4::ARC4() : m_ctx(EVP_CIPHER_CTX_new())
 {
+#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) && (OPENSSL_VERSION_MINOR >= 3)
+    OSSL_PROVIDER_load(NULL, "legacy");
+#endif
+
+#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) && (OPENSSL_VERSION_MINOR < 3)
+#error "UNSUPORTED OPENSSL VERSION, SKYFIRE REQUIRES 3.3 or newer."
+#endif
+
     EVP_CIPHER_CTX_reset(m_ctx);
     EVP_EncryptInit_ex(m_ctx, EVP_rc4(), NULL, NULL, NULL);
 }
 
 ARC4::~ARC4()
 {
-    EVP_CIPHER_CTX_reset(m_ctx);
+    EVP_CIPHER_CTX_free(m_ctx);
 }
 
 void ARC4::Init(uint8* seed, uint32 len)

diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
@@ -6,7 +6,7 @@
 /// \addtogroup Trinityd Skyfire Daemon
 /// @{
 /// \file
-
+#pragma comment (lib, "Crypt32")
 #include <openssl/opensslv.h>
 #include <openssl/crypto.h>
 #include <ace/Version.h>