Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HPCC-33157 Std.Crypto.SymmetricEncryption() crash on empty ciphertext #19376

Merged
merged 1 commit into from
Jan 9, 2025
Merged

HPCC-33157 Std.Crypto.SymmetricEncryption() crash on empty ciphertext #19376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ecllibrary/teststd/Crypto/TestCrypto_SKE.ecl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,10 @@ EXPORT TestCrypto_SKE := MODULE
EXPORT DATA dat2 := mod.Encrypt( (DATA)'0123456789~`!@#$%^&*()-_=+|][}{;:?.>,<');
EXPORT TS05 := ASSERT(mod.Decrypt(dat2) = (DATA)'0123456789~`!@#$%^&*()-_=+|][}{;:?.>,<');
END;

EXPORT TestSKE05 := MODULE // HPCC-33157
EXPORT mod := Std.Crypto.SymmetricEncryption('aes-256-cbc', '01234567890123456789012345678901');
EXPORT TS05 := ASSERT(mod.Decrypt((DATA)'') = (DATA)'');
END;
END;

65 changes: 43 additions & 22 deletions plugins/cryptolib/cryptolib.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,22 +132,36 @@ CRYPTOLIB_API void CRYPTOLIB_CALL clSupportedSymmetricCipherAlgorithms(bool & __
//Helpers to build the DATA buffer returned from clSymmetricEncrypt, and sent to clSymmetricDecrypt
//Buffer is structured as:
// (size32_t)lenIV, IV excluding NULL, (size32_t)LenPlainText excluding NULL, (size32_t)LenCipher, Cipher
static void symmDeserialize(const void * pBuffer, StringBuffer & sbIV, StringBuffer & sbCipher, size32_t * lenPlainText)
static void symmDeserialize(size32_t lenPBuffer, const void * pBuffer, StringBuffer & sbIV, StringBuffer & sbCipher, size32_t * lenPlainText)
{
size32_t len;
const char * finger = (const char *)pBuffer;

memcpy(&len, finger, sizeof(size32_t));//extract IV
finger += sizeof(size32_t);
sbIV.append(len, finger);

finger += len;
memcpy(lenPlainText, finger, sizeof(size32_t));//extract length of plain text

finger += sizeof(size32_t);
memcpy(&len, finger, sizeof(size32_t));//extract cipher
finger += sizeof(size32_t);
sbCipher.append(len, finger);
// It is okay to pass an empty encrypted buffer; we just do nothing
if (pBuffer && lenPBuffer > 0)
{
if (lenPBuffer < (sizeof(size32_t) + sizeof(size32_t) + sizeof(size32_t))) // size of IV + size of plaintext + size of cipher name
throw makeStringExceptionV(-1, "Invalid encrypted data length (%d) while deserializing ciphertext", lenPBuffer);

size32_t len;
const char * finger = (const char *)pBuffer;

memcpy(&len, finger, sizeof(size32_t));//extract IV
finger += sizeof(size32_t);
sbIV.append(len, finger);

finger += len;
memcpy(lenPlainText, finger, sizeof(size32_t));//extract length of plain text

finger += sizeof(size32_t);
memcpy(&len, finger, sizeof(size32_t));//extract length of cipher name
finger += sizeof(size32_t);
if ((finger + len) > (finger + lenPBuffer))
throw makeStringExceptionV(-1, "Invalid cipher name length (%d) while deserializing ciphertext", len);

sbCipher.append(len, finger);//extract cipher name
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lenPlainText is uninitialised in the caller.

else
    *lenPlainText = 0;

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

else
{
*lenPlainText = 0;
}
}

static void symmSerialize(void * & result, size32_t & lenResult, const char * pIV, size32_t lenIV, size32_t lenPlainText, size32_t lenCipherBuff, const void * pCipherBuff)
Expand All @@ -167,7 +181,7 @@ static void symmSerialize(void * & result, size32_t & lenResult, const char * pI
pRes += sizeof(size32_t);
memcpy(pRes, &lenCipherBuff, sizeof(size32_t));
pRes += sizeof(size32_t);
memcpy(pRes, pCipherBuff, lenCipherBuff);
memcpy_iflen(pRes, pCipherBuff, lenCipherBuff);
}

//-------------------------------------------------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -225,14 +239,21 @@ CRYPTOLIB_API void CRYPTOLIB_CALL clSymmDecrypt(size32_t & __lenResult,void * &
StringBuffer sbIV;
StringBuffer sbCipher;
size32_t lenPlainText;
symmDeserialize(encrypteddata, sbIV, sbCipher, &lenPlainText);

__result = (char *)CTXMALLOC(parentCtx, lenPlainText);
__lenResult = lenPlainText;
__result = nullptr;
__lenResult = 0;

symmDeserialize(lenEncrypteddata, encrypteddata, sbIV, sbCipher, &lenPlainText);

MemoryBuffer decrypted;
size32_t len = aesDecrypt(decrypted, sbCipher.length(), sbCipher.str(), lenKey, (const char *)key, sbIV.str());
memcpy(__result, decrypted.toByteArray(), __lenResult);
if (lenPlainText > 0)
{
__result = (char *)CTXMALLOC(parentCtx, lenPlainText);
__lenResult = lenPlainText;

MemoryBuffer decrypted;
size32_t len = aesDecrypt(decrypted, sbCipher.length(), sbCipher.str(), lenKey, (const char *)key, sbIV.str());
memcpy(__result, decrypted.toByteArray(), __lenResult);
}
}

CRYPTOLIB_API void CRYPTOLIB_CALL clSymmetricEncrypt(size32_t & __lenResult, void * & __result,
Expand Down
Loading