Fix build for openssl 1.0

TrinityCore · Jul 14, 2019 · ce1091c · ce1091c
1 parent d2fe302
commit ce1091c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/common/Cryptography/AES.cpp b/src/common/Cryptography/AES.cpp
@@ -17,10 +17,10 @@
 
 #include "AES.h"
 
-Trinity::Crypto::AES::AES(bool encrypting) : _ctx(EVP_CIPHER_CTX_new())
+Trinity::Crypto::AES::AES(bool encrypting) : _ctx(EVP_CIPHER_CTX_new()), _encrypting(encrypting)
 {
     EVP_CIPHER_CTX_init(_ctx);
-    EVP_CipherInit_ex(_ctx, EVP_aes_128_gcm(), nullptr, nullptr, nullptr, encrypting ? 1 : 0);
+    EVP_CipherInit_ex(_ctx, EVP_aes_128_gcm(), nullptr, nullptr, nullptr, _encrypting ? 1 : 0);
 }
 
 Trinity::Crypto::AES::~AES()
@@ -42,13 +42,13 @@ bool Trinity::Crypto::AES::Process(uint8 const* iv, uint8* data, std::size_t len
     if (!EVP_CipherUpdate(_ctx, data, &outLen, data, length))
         return false;
 
-    if (!EVP_CIPHER_CTX_encrypting(_ctx) && !EVP_CIPHER_CTX_ctrl(_ctx, EVP_CTRL_GCM_SET_TAG, 12, tag))
+    if (!_encrypting && !EVP_CIPHER_CTX_ctrl(_ctx, EVP_CTRL_GCM_SET_TAG, 12, tag))
         return false;
 
     if (!EVP_CipherFinal_ex(_ctx, data + outLen, &outLen))
         return false;
 
-    if (EVP_CIPHER_CTX_encrypting(_ctx) && !EVP_CIPHER_CTX_ctrl(_ctx, EVP_CTRL_GCM_GET_TAG, 12, tag))
+    if (_encrypting && !EVP_CIPHER_CTX_ctrl(_ctx, EVP_CTRL_GCM_GET_TAG, 12, tag))
         return false;
 
     return true;

diff --git a/src/common/Cryptography/AES.h b/src/common/Cryptography/AES.h
@@ -37,6 +37,7 @@ class TC_COMMON_API AES
 
 private:
     EVP_CIPHER_CTX* _ctx;
+    bool _encrypting;
 };
 }
 }