Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 10 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: https://github.com/cmangos/mangos-wotlk/commit/e1b0048f052eda46bb27d20224d0339960816ac2
This commit is contained in:
Warlockbugs authored and Aokromes committed 2018-03-05 14:54:35 +01:00
1 parent ba65f58687
commit 6a8c0df9a8
5 files changed
+48 -34
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/common/Cryptography/HmacHash.cpp
+25 -11
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;
}