Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 08:28:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Crypto: Transitional Cryptography update for OpenSSL 1.1 (#21534)

Browse Source 
Support for both OpenSSL 1.0 LTS and OpenSSL 1.1 versions.

Many Linux distributions are still on 1.0 and will stay on LTS for quite
some time.

Port of CMaNGOS commit: e1b0048f05
This commit is contained in:
Warlockbugs
2018-03-04 17:26:08 +03:00
committed by Aokromes
parent ba65f58687
commit 6a8c0df9a8
5 changed files with 48 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/macros/FindOpenSSL.cmake
View File

@@ -26,7 +26,7 @@
# http://www.slproweb.com/products/Win32OpenSSL.html
set(OPENSSL_EXPECTED_VERSION "1.0")
set(OPENSSL_MAX_VERSION "1.1")
set(OPENSSL_MAX_VERSION "1.2")
SET(_OPENSSL_ROOT_HINTS
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]"

30
src/common/Cryptography/ARC4.cpp
View File

@@ -18,34 +18,34 @@
#include "ARC4.h"
ARC4::ARC4(uint32 len) : m_ctx()
ARC4::ARC4(uint32 len) : m_ctx(EVP_CIPHER_CTX_new())
{
EVP_CIPHER_CTX_init(&m_ctx);
EVP_EncryptInit_ex(&m_ctx, EVP_rc4(), NULL, NULL, NULL);
EVP_CIPHER_CTX_set_key_length(&m_ctx, len);
EVP_CIPHER_CTX_init(m_ctx);
EVP_EncryptInit_ex(m_ctx, EVP_rc4(), nullptr, nullptr, nullptr);
EVP_CIPHER_CTX_set_key_length(m_ctx, len);
}
ARC4::ARC4(uint8 *seed, uint32 len) : m_ctx()
ARC4::ARC4(uint8* seed, uint32 len) : m_ctx(EVP_CIPHER_CTX_new())
{
EVP_CIPHER_CTX_init(&m_ctx);
EVP_EncryptInit_ex(&m_ctx, EVP_rc4(), NULL, NULL, NULL);
EVP_CIPHER_CTX_set_key_length(&m_ctx, len);
EVP_EncryptInit_ex(&m_ctx, NULL, NULL, seed, NULL);
EVP_CIPHER_CTX_init(m_ctx);
EVP_EncryptInit_ex(m_ctx, EVP_rc4(), nullptr, nullptr, nullptr);
EVP_CIPHER_CTX_set_key_length(m_ctx, len);
EVP_EncryptInit_ex(m_ctx, nullptr, nullptr, seed, nullptr);
}
ARC4::~ARC4()
{
EVP_CIPHER_CTX_cleanup(&m_ctx);
EVP_CIPHER_CTX_free(m_ctx);
}
void ARC4::Init(uint8 *seed)
void ARC4::Init(uint8* seed)
{
EVP_EncryptInit_ex(&m_ctx, NULL, NULL, seed, NULL);
EVP_EncryptInit_ex(m_ctx, nullptr, nullptr, seed, nullptr);
}
void ARC4::UpdateData(int len, uint8 *data)
void ARC4::UpdateData(int len, uint8* data)
{
int outlen = 0;
EVP_EncryptUpdate(&m_ctx, data, &outlen, data, len);
EVP_EncryptFinal_ex(&m_ctx, data, &outlen);
EVP_EncryptUpdate(m_ctx, data, &outlen, data, len);
EVP_EncryptFinal_ex(m_ctx, data, &outlen);
}

10
src/common/Cryptography/ARC4.h
View File

@@ -19,19 +19,19 @@
#ifndef _AUTH_SARC4_H
#define _AUTH_SARC4_H
#include <openssl/evp.h>
#include "Define.h"
#include <openssl/evp.h>
class TC_COMMON_API ARC4
{
public:
ARC4(uint32 len);
ARC4(uint8 *seed, uint32 len);
ARC4(uint8* seed, uint32 len);
~ARC4();
void Init(uint8 *seed);
void UpdateData(int len, uint8 *data);
void Init(uint8* seed);
void UpdateData(int len, uint8* data);
private:
EVP_CIPHER_CTX m_ctx;
EVP_CIPHER_CTX* m_ctx;
};
#endif

36
src/common/Cryptography/HmacHash.cpp
View File

@@ -20,44 +20,58 @@
#include "BigNumber.h"
#include "Common.h"
template<HashCreateFn HashCreator, uint32 DigestLength>
HmacHash<HashCreator, DigestLength>::HmacHash(uint32 len, uint8 *seed)
#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x10100000L
HMAC_CTX* HMAC_CTX_new()
{
HMAC_CTX_init(&_ctx);
HMAC_Init_ex(&_ctx, seed, len, HashCreator(), NULL);
HMAC_CTX *ctx = new HMAC_CTX();
HMAC_CTX_init(ctx);
return ctx;
}
void HMAC_CTX_free(HMAC_CTX* ctx)
{
HMAC_CTX_cleanup(ctx);
delete ctx;
}
#endif
template<HashCreateFn HashCreator, uint32 DigestLength>
HmacHash<HashCreator, DigestLength>::HmacHash(uint32 len, uint8 const* seed) : _ctx(HMAC_CTX_new())
{
HMAC_Init_ex(_ctx, seed, len, HashCreator(), nullptr);
memset(_digest, 0, DigestLength);
}
template<HashCreateFn HashCreator, uint32 DigestLength>
HmacHash<HashCreator, DigestLength>::~HmacHash()
{
HMAC_CTX_cleanup(&_ctx);
HMAC_CTX_free(_ctx);
}
template<HashCreateFn HashCreator, uint32 DigestLength>
void HmacHash<HashCreator, DigestLength>::UpdateData(const std::string &str)
void HmacHash<HashCreator, DigestLength>::UpdateData(std::string const& str)
{
HMAC_Update(&_ctx, (uint8 const*)str.c_str(), str.length());
HMAC_Update(_ctx, reinterpret_cast<uint8 const*>(str.c_str()), str.length());
}
template<HashCreateFn HashCreator, uint32 DigestLength>
void HmacHash<HashCreator, DigestLength>::UpdateData(const uint8* data, size_t len)
void HmacHash<HashCreator, DigestLength>::UpdateData(uint8 const* data, size_t len)
{
HMAC_Update(&_ctx, data, len);
HMAC_Update(_ctx, data, len);
}
template<HashCreateFn HashCreator, uint32 DigestLength>
void HmacHash<HashCreator, DigestLength>::Finalize()
{
uint32 length = 0;
HMAC_Final(&_ctx, _digest, &length);
HMAC_Final(_ctx, _digest, &length);
ASSERT(length == DigestLength);
}
template<HashCreateFn HashCreator, uint32 DigestLength>
uint8* HmacHash<HashCreator, DigestLength>::ComputeHash(BigNumber* bn)
{
HMAC_Update(&_ctx, bn->AsByteArray().get(), bn->GetNumBytes());
HMAC_Update(_ctx, bn->AsByteArray().get(), bn->GetNumBytes());
Finalize();
return _digest;
}

4
src/common/Cryptography/HmacHash.h
View File

@@ -34,7 +34,7 @@ template<HashCreateFn HashCreator, uint32 DigestLength>
class TC_COMMON_API HmacHash
{
public:
HmacHash(uint32 len, uint8 *seed);
HmacHash(uint32 len, uint8 const* seed);
~HmacHash();
void UpdateData(std::string const& str);
void UpdateData(uint8 const* data, size_t len);
@@ -43,7 +43,7 @@ class TC_COMMON_API HmacHash
uint8* GetDigest() { return _digest; }
uint32 GetLength() const { return DigestLength; }
private:
HMAC_CTX _ctx;
HMAC_CTX* _ctx;
uint8 _digest[DigestLength];
};