Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 09:32:12 +01:00
Code Releases Activity

Fixed compilation for Openssl 1.1.0

Browse Source 
Most of libcrypto and libssl internal structures were made
opaque in this version not allowing to instatiate them in
the stack.

More info:
    * https://www.openssl.org/news/openssl-1.1.0-notes.html
    * https://github.com/openssl/openssl/issues/962#issuecomment-208792020
This commit is contained in:
Jose Rios 2017-05-01 02:12:26 +01:00 committed by David Rosca
parent 5e12180377
commit efc4725e91
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/lib/tools/aesinterface.cpp
View File

@ -39,14 +39,18 @@ AesInterface::AesInterface(QObject* parent)
: QObject(parent) : QObject(parent)
, m_ok(false) , m_ok(false)
{ {
EVP_CIPHER_CTX_init(&m_encodeCTX); m_encodeCTX = EVP_CIPHER_CTX_new();
EVP_CIPHER_CTX_init(&m_decodeCTX); m_decodeCTX = EVP_CIPHER_CTX_new();
EVP_CIPHER_CTX_init(m_encodeCTX);
EVP_CIPHER_CTX_init(m_decodeCTX);
} }
AesInterface::~AesInterface() AesInterface::~AesInterface()
{ {
EVP_CIPHER_CTX_cleanup(&m_encodeCTX); EVP_CIPHER_CTX_cleanup(m_encodeCTX);
EVP_CIPHER_CTX_cleanup(&m_decodeCTX); EVP_CIPHER_CTX_cleanup(m_decodeCTX);
EVP_CIPHER_CTX_free(m_encodeCTX);
EVP_CIPHER_CTX_free(m_decodeCTX);
} }
bool AesInterface::isOk() bool AesInterface::isOk()
@ -78,10 +82,10 @@ bool AesInterface::init(int evpMode, const QByteArray &password, const QByteArra
int result = 0; int result = 0;
if (evpMode == EVP_PKEY_MO_ENCRYPT) { if (evpMode == EVP_PKEY_MO_ENCRYPT) {
m_iVector = createRandomData(EVP_MAX_IV_LENGTH); m_iVector = createRandomData(EVP_MAX_IV_LENGTH);
result = EVP_EncryptInit_ex(&m_encodeCTX, EVP_aes_256_cbc(), NULL, key, (uchar*)m_iVector.constData()); result = EVP_EncryptInit_ex(m_encodeCTX, EVP_aes_256_cbc(), NULL, key, (uchar*)m_iVector.constData());
} }
else if (evpMode == EVP_PKEY_MO_DECRYPT) { else if (evpMode == EVP_PKEY_MO_DECRYPT) {
result = EVP_DecryptInit_ex(&m_decodeCTX, EVP_aes_256_cbc(), NULL, key, (uchar*)iVector.constData()); result = EVP_DecryptInit_ex(m_decodeCTX, EVP_aes_256_cbc(), NULL, key, (uchar*)iVector.constData());
} }
if (result == 0) { if (result == 0) {
@ -106,14 +110,14 @@ QByteArray AesInterface::encrypt(const QByteArray &plainData, const QByteArray &
uchar* ciphertext = (uchar*)malloc(cipherlength); uchar* ciphertext = (uchar*)malloc(cipherlength);
// allows reusing of 'm_encodeCTX' for multiple encryption cycles // allows reusing of 'm_encodeCTX' for multiple encryption cycles
EVP_EncryptInit_ex(&m_encodeCTX, NULL, NULL, NULL, NULL); EVP_EncryptInit_ex(m_encodeCTX, NULL, NULL, NULL, NULL);
// update ciphertext, c_len is filled with the length of ciphertext generated, // update ciphertext, c_len is filled with the length of ciphertext generated,
// dataLength is the size of plaintext in bytes // dataLength is the size of plaintext in bytes
EVP_EncryptUpdate(&m_encodeCTX, ciphertext, &cipherlength, (uchar*)plainData.data(), dataLength); EVP_EncryptUpdate(m_encodeCTX, ciphertext, &cipherlength, (uchar*)plainData.data(), dataLength);
// update ciphertext with the final remaining bytes // update ciphertext with the final remaining bytes
EVP_EncryptFinal_ex(&m_encodeCTX, ciphertext + cipherlength, &finalLength); EVP_EncryptFinal_ex(m_encodeCTX, ciphertext + cipherlength, &finalLength);
dataLength = cipherlength + finalLength; dataLength = cipherlength + finalLength;
QByteArray out((char*)ciphertext, dataLength); QByteArray out((char*)ciphertext, dataLength);
@ -163,9 +167,9 @@ QByteArray AesInterface::decrypt(const QByteArray &cipherData, const QByteArray
// because we have padding ON, we must allocate an extra cipher block size of memory // because we have padding ON, we must allocate an extra cipher block size of memory
uchar* plainText = (uchar*)malloc(plainTextLength + AES_BLOCK_SIZE); uchar* plainText = (uchar*)malloc(plainTextLength + AES_BLOCK_SIZE);
EVP_DecryptInit_ex(&m_decodeCTX, NULL, NULL, NULL, NULL); EVP_DecryptInit_ex(m_decodeCTX, NULL, NULL, NULL, NULL);
EVP_DecryptUpdate(&m_decodeCTX, plainText, &plainTextLength, cipherText, cipherLength); EVP_DecryptUpdate(m_decodeCTX, plainText, &plainTextLength, cipherText, cipherLength);
int success = EVP_DecryptFinal_ex(&m_decodeCTX, plainText + plainTextLength, &finalLength); int success = EVP_DecryptFinal_ex(m_decodeCTX, plainText + plainTextLength, &finalLength);
cipherLength = plainTextLength + finalLength; cipherLength = plainTextLength + finalLength;

4
src/lib/tools/aesinterface.h
View File

@ -50,8 +50,8 @@ public:
private: private:
bool init(int evpMode, const QByteArray &password, const QByteArray &iVector = QByteArray()); bool init(int evpMode, const QByteArray &password, const QByteArray &iVector = QByteArray());
EVP_CIPHER_CTX m_encodeCTX; EVP_CIPHER_CTX* m_encodeCTX;
EVP_CIPHER_CTX m_decodeCTX; EVP_CIPHER_CTX* m_decodeCTX;
bool m_ok; bool m_ok;
QByteArray m_iVector; QByteArray m_iVector;