mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-27 10:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implement OpenSSL 1.1.x support

Browse source
This commit is contained in:
H0zen 2018-04-12 20:19:47 +01:00 • committed by Antz
parent bad84c407e
commit 738f332015
9 changed files with 68 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/shared/Auth/ARC4.cpp
View file

@ -27,32 +27,32 @@
ARC4::ARC4(uint8 len) : m_ctx()
{
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);
m_ctx = EVP_CIPHER_CTX_new();
EVP_EncryptInit_ex(m_ctx, EVP_rc4(), NULL, NULL, NULL);
EVP_CIPHER_CTX_set_key_length(m_ctx, len);
}
ARC4::ARC4(uint8 *seed, uint8 len) : m_ctx()
{
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);
m_ctx = EVP_CIPHER_CTX_new();
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);
}
ARC4::~ARC4()
{
EVP_CIPHER_CTX_cleanup(&m_ctx);
EVP_CIPHER_CTX_free(m_ctx);
}
void ARC4::Init(uint8 *seed)
{
EVP_EncryptInit_ex(&m_ctx, NULL, NULL, seed, NULL);
EVP_EncryptInit_ex(m_ctx, NULL, NULL, seed, NULL);
}
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);
}

2
src/shared/Auth/ARC4.h
View file

@ -38,7 +38,7 @@ class ARC4
void Init(uint8 *seed);
void UpdateData(int len, uint8 *data);
private:
EVP_CIPHER_CTX m_ctx;
EVP_CIPHER_CTX* m_ctx;
};
#endif

23
src/shared/Auth/HMACSHA1.cpp
View file

@ -27,13 +27,22 @@
HMACSHA1::HMACSHA1(uint32 len, uint8 *seed)
{
#if OPENSSL_VERSION_NUMBER < 0x10100000L
HMAC_CTX_init(&m_ctx);
HMAC_Init_ex(&m_ctx, seed, len, EVP_sha1(), NULL);
#else
m_ctx = HMAC_CTX_new();
HMAC_Init_ex(m_ctx, seed, len, EVP_sha1(), NULL);
#endif
}
HMACSHA1::~HMACSHA1()
{
#if OPENSSL_VERSION_NUMBER < 0x10100000L
HMAC_CTX_cleanup(&m_ctx);
#else
HMAC_CTX_free(m_ctx);
#endif
}
void HMACSHA1::UpdateBigNumber(BigNumber *bn)
@ -43,7 +52,11 @@ void HMACSHA1::UpdateBigNumber(BigNumber *bn)
void HMACSHA1::UpdateData(const uint8 *data, int length)
{
#if OPENSSL_VERSION_NUMBER < 0x10100000L
HMAC_Update(&m_ctx, data, length);
#else
HMAC_Update(m_ctx, data, length);
#endif
}
void HMACSHA1::UpdateData(const std::string &str)
@ -54,13 +67,21 @@ void HMACSHA1::UpdateData(const std::string &str)
void HMACSHA1::Finalize()
{
uint32 length = 0;
#if OPENSSL_VERSION_NUMBER < 0x10100000L
HMAC_Final(&m_ctx, (uint8*)m_digest, &length);
#else
HMAC_Final(m_ctx, (uint8*)m_digest, &length);
#endif
MANGOS_ASSERT(length == SHA_DIGEST_LENGTH);
}
uint8 *HMACSHA1::ComputeHash(BigNumber *bn)
{
#if OPENSSL_VERSION_NUMBER < 0x10100000L
HMAC_Update(&m_ctx, bn->AsByteArray(), bn->GetNumBytes());
#else
HMAC_Update(m_ctx, bn->AsByteArray(), bn->GetNumBytes());
#endif
Finalize();
return (uint8*)m_digest;
}
}

6
src/shared/Auth/HMACSHA1.h
View file

@ -46,7 +46,11 @@ public:
uint8 *GetDigest() { return (uint8*)m_digest; }
int GetLength() { return SHA_DIGEST_LENGTH; }
private:
#if OPENSSL_VERSION_NUMBER < 0x10100000L
HMAC_CTX m_ctx;
#else
HMAC_CTX* m_ctx;
#endif
uint8 m_digest[SHA_DIGEST_LENGTH];
};
#endif
#endif