diff options
| author | Shauren <shauren.trinity@gmail.com> | 2019-07-14 19:32:31 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2019-07-14 19:32:31 +0200 |
| commit | ce1091cf880d449ab41e171724680b8112b9319a (patch) | |
| tree | d757c8a9b4c6a2bd3a9c9fca591245a554cec72f | |
| parent | d2fe302d1473af0419eafcbe76ec3521aeafd748 (diff) | |
Fix build for openssl 1.0
| -rw-r--r-- | src/common/Cryptography/AES.cpp | 8 | ||||
| -rw-r--r-- | src/common/Cryptography/AES.h | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/common/Cryptography/AES.cpp b/src/common/Cryptography/AES.cpp index cd9ff29f79f..a7ad707e3be 100644 --- 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 index edb096ae69e..c091ef670dc 100644 --- a/src/common/Cryptography/AES.h +++ b/src/common/Cryptography/AES.h @@ -37,6 +37,7 @@ public: private: EVP_CIPHER_CTX* _ctx; + bool _encrypting; }; } } |