Skip to content

Commit d61c708

Browse files
committed
OpenSSL: Drop legacy 1.1.1 support in the source files
Following the package base of majority of maintained LTS Linux distros, 1.1.1 is retired
1 parent 0313b22 commit d61c708

File tree

5 files changed

+3
-42
lines changed

5 files changed

+3
-42
lines changed

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,10 +260,10 @@ if(UNIX AND (BUILD_GAME_SERVER OR BUILD_LOGIN_SERVER OR BUILD_EXTRACTORS))
260260
find_package(OpenSSL REQUIRED)
261261

262262
message(STATUS "Found OpenSSL libraries: ${OPENSSL_LIBRARIES}")
263-
if(OPENSSL_VERSION VERSION_LESS 1.1)
264-
message(SEND_ERROR "OpenSSL: This project requires OpenSSL version 1.1.0 or higher")
263+
if(OPENSSL_VERSION VERSION_LESS 3.0)
264+
message(SEND_ERROR "OpenSSL: This project requires OpenSSL version 3.0 or higher")
265265
endif()
266-
if(OPENSSL_VERSION VERSION_LESS 1.1.1 OR (OPENSSL_VERSION VERSION_GREATER 3.0 AND OPENSSL_VERSION VERSION_LESS 3.0.7))
266+
if(OPENSSL_VERSION VERSION_GREATER 3.0 AND OPENSSL_VERSION VERSION_LESS 3.0.14)
267267
message(WARNING "OpenSSL: Your OpenSSL version is critically vulnerable or no longer being maintained, consider upgrading")
268268
endif()
269269
endif()

src/mangosd/Main.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@
3232

3333
#include <openssl/opensslv.h>
3434
#include <openssl/crypto.h>
35-
#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
3635
#include <openssl/provider.h>
37-
#endif
3836

3937
#include <boost/program_options.hpp>
4038
#include <boost/version.hpp>
@@ -180,7 +178,6 @@ int main(int argc, char* argv[])
180178
sLog.outString("Using configuration file %s.", configFile.c_str());
181179

182180
DETAIL_LOG("%s (Library: %s)", OPENSSL_VERSION_TEXT, OpenSSL_version(OPENSSL_VERSION));
183-
#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
184181
// Load OpenSSL 3.0+ providers
185182
OSSL_PROVIDER* openssl_legacy = OSSL_PROVIDER_load(nullptr, "legacy");
186183
if (!openssl_legacy)
@@ -195,7 +192,6 @@ int main(int argc, char* argv[])
195192
OSSL_PROVIDER_unload(openssl_legacy);
196193
return 1;
197194
}
198-
#endif
199195

200196
DETAIL_LOG("Using Boost: %s", BOOST_LIB_VERSION);
201197

src/realmd/Main.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@
3535

3636
#include <openssl/opensslv.h>
3737
#include <openssl/crypto.h>
38-
#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
3938
#include <openssl/provider.h>
40-
#endif
4139

4240
#include <boost/program_options.hpp>
4341
#include <boost/version.hpp>
@@ -178,7 +176,6 @@ int main(int argc, char* argv[])
178176
}
179177

180178
DETAIL_LOG("%s (Library: %s)", OPENSSL_VERSION_TEXT, OpenSSL_version(OPENSSL_VERSION));
181-
#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
182179
// Load OpenSSL 3.0+ providers
183180
OSSL_PROVIDER* openssl_legacy = OSSL_PROVIDER_load(nullptr, "legacy");
184181
if (!openssl_legacy)
@@ -193,7 +190,6 @@ int main(int argc, char* argv[])
193190
OSSL_PROVIDER_unload(openssl_legacy);
194191
return 1;
195192
}
196-
#endif
197193

198194
sLog.outString();
199195
sLog.outString("<Ctrl-C> to stop.");

src/shared/Auth/HMACSHA1.cpp

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
HMACSHA1::HMACSHA1(uint32 len, uint8 const* seed)
2323
{
2424
memcpy(&m_key, seed, len);
25-
#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
2625
m_mac = EVP_MAC_fetch(nullptr, "HMAC", nullptr);
2726
m_ctx = EVP_MAC_CTX_new(m_mac);
2827

@@ -31,15 +30,10 @@ HMACSHA1::HMACSHA1(uint32 len, uint8 const* seed)
3130
params[1] = OSSL_PARAM_construct_end();
3231

3332
EVP_MAC_init(m_ctx, m_key, len, params);
34-
#else
35-
m_ctx = HMAC_CTX_new();
36-
HMAC_Init_ex(m_ctx, &m_key, len, EVP_sha1(), nullptr);
37-
#endif
3833
}
3934

4035
HMACSHA1::HMACSHA1(uint32 len, uint8 const* seed, bool) // to get over the default constructor
4136
{
42-
#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
4337
m_mac = EVP_MAC_fetch(nullptr, "HMAC", nullptr);
4438
m_ctx = EVP_MAC_CTX_new(m_mac);
4539

@@ -48,21 +42,13 @@ HMACSHA1::HMACSHA1(uint32 len, uint8 const* seed, bool) // to get over the defau
4842
params[1] = OSSL_PARAM_construct_end();
4943

5044
EVP_MAC_init(m_ctx, seed, len, params);
51-
#else
52-
m_ctx = HMAC_CTX_new();
53-
HMAC_Init_ex(m_ctx, seed, len, EVP_sha1(), nullptr);
54-
#endif
5545
}
5646

5747
HMACSHA1::~HMACSHA1()
5848
{
5949
memset(&m_key, 0x00, SEED_KEY_SIZE);
60-
#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
6150
EVP_MAC_CTX_free(m_ctx);
6251
EVP_MAC_free(m_mac);
63-
#else
64-
HMAC_CTX_free(m_ctx);
65-
#endif
6652
}
6753

6854
void HMACSHA1::UpdateBigNumber(BigNumber* bn)
@@ -72,11 +58,7 @@ void HMACSHA1::UpdateBigNumber(BigNumber* bn)
7258

7359
void HMACSHA1::UpdateData(const uint8* data, int length)
7460
{
75-
#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
7661
EVP_MAC_update(m_ctx, data, length);
77-
#else
78-
HMAC_Update(m_ctx, data, length);
79-
#endif
8062
}
8163

8264
void HMACSHA1::UpdateData(const std::string& str)
@@ -86,26 +68,17 @@ void HMACSHA1::UpdateData(const std::string& str)
8668

8769
void HMACSHA1::Initialize()
8870
{
89-
#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
9071
OSSL_PARAM params[2];
9172
params[0] = OSSL_PARAM_construct_utf8_string("digest", const_cast<char*>("SHA1"), 0);
9273
params[1] = OSSL_PARAM_construct_end();
9374

9475
EVP_MAC_init(m_ctx, m_key, SEED_KEY_SIZE, params);
95-
#else
96-
HMAC_Init_ex(m_ctx, &m_key, SEED_KEY_SIZE, EVP_sha1(), NULL);
97-
#endif
9876
}
9977

10078
void HMACSHA1::Finalize()
10179
{
102-
#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
10380
size_t length = 0;
10481
EVP_MAC_final(m_ctx, m_digest, &length, sizeof(m_digest));
105-
#else
106-
uint32 length = 0;
107-
HMAC_Final(m_ctx, (uint8*)m_digest, &length);
108-
#endif
10982
MANGOS_ASSERT(length == SHA_DIGEST_LENGTH);
11083
}
11184

src/shared/Auth/HMACSHA1.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,8 @@ class HMACSHA1
4242
uint8* GetDigest() { return m_digest; }
4343
static int GetLength() { return SHA_DIGEST_LENGTH; }
4444
private:
45-
#if defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3)
4645
EVP_MAC* m_mac;
4746
EVP_MAC_CTX* m_ctx;
48-
#else
49-
HMAC_CTX* m_ctx;
50-
#endif
5147
uint8 m_key[SEED_KEY_SIZE];
5248
uint8 m_digest[SHA_DIGEST_LENGTH];
5349
};

0 commit comments

Comments
 (0)