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-31120 Add cipher text length to aes decryption errors #18216

Closed
wants to merge 2 commits into from
Closed

HPCC-31120 Add cipher text length to aes decryption errors #18216

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d892a5
HPCC-31120 Add cipher text length to aes decryption errors
ghalliday Jan 12, 2024
7a574d6
Add information about the last block
ghalliday Jan 13, 2024
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
38 changes: 24 additions & 14 deletions system/jlib/jencrypt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1771,6 +1771,22 @@ inline const char *getAesErrorText(int err)
return (err<0 && abs(err)<8) ? aesErrorText[abs(err)] : "unknown";
}

static void decryptError(const char *what, size_t len=0, const void * data=nullptr, int error=0)
{
VStringBuffer s("openssl::aesDecrypt: unexpected failure in %s", what);
if (error)
s.appendf(" error: %d", error);
if (len)
s.appendf(" len: %zu", len);
if (len >= 16)
{
s.append(" data: ...");
for (size_t i=0; i < 16; i++)
s.appendf("%02x ", ((const byte *)data)[len - 16 + i]);
}
throw makeStringException(0, s.str());
}

inline Rijndael::KeyLength getAesKeyType(size_t keylen)
{
if (keylen==16)
Expand Down Expand Up @@ -1814,7 +1830,7 @@ MemoryBuffer &aesDecrypt(const void *key, size_t keylen, const void *input, size
if(len >= 0)
output.setLength(origLen+len);
else
throw MakeStringException(-1,"AES Decryption error: %d, %s", len, getAesErrorText(len));
decryptError(getAesErrorText(len), inlen, input, len);
return output;
}

Expand All @@ -1827,7 +1843,7 @@ size_t aesDecryptInPlace(const void *key, size_t keylen, void *data, size_t inle
size32_t truncInLen = (size32_t)inlen;
int len = rin.padDecrypt((const UINT8 *)data, truncInLen, (UINT8 *) data, inlen);
if(len < 0)
throw MakeStringException(-1,"AES Decryption error: %d, %s", len, getAesErrorText(len));
decryptError(getAesErrorText(len), inlen, input, len);
return len;
}

Expand Down Expand Up @@ -1890,12 +1906,6 @@ MemoryBuffer &aesEncrypt(const void *key, size_t keylen, const void *plaintext,
}
}

static void decryptError(const char *what)
{
VStringBuffer s("openssl::aesDecrypt: unexpected failure in %s", what);
throw makeStringException(0, s.str());
}

MemoryBuffer &aesDecrypt(const void *key, size_t keylen, const void *ciphertext, size_t ciphertext_len, MemoryBuffer &output)
{
if (!ciphertext || !ciphertext_len)
Expand Down Expand Up @@ -1925,16 +1935,16 @@ MemoryBuffer &aesDecrypt(const void *key, size_t keylen, const void *ciphertext,
decryptError("Failed to initialize context");
break;
default:
decryptError("Unsupported key length");
decryptError("Unsupported key length", keylen);
break;
}
byte *plaintext = (byte *) output.reserve(ciphertext_len);
if(1 != EVP_DecryptUpdate(ctx, plaintext, &thislen, (const unsigned char *) ciphertext, ciphertext_len))
decryptError("Error in EVP_DecryptUpdate");
decryptError("Error in EVP_DecryptUpdate", ciphertext_len, ciphertext, 1);
plaintext_len += thislen;

if(1 != EVP_DecryptFinal_ex(ctx, plaintext + plaintext_len, &thislen))
decryptError("Error in EVP_DecryptFinal_ex");
decryptError("Error in EVP_DecryptUpdate", ciphertext_len, ciphertext, 2);
plaintext_len += thislen;
output.setLength(plaintext_len);
EVP_CIPHER_CTX_free(ctx);
Expand Down Expand Up @@ -1977,16 +1987,16 @@ size_t aesDecryptInPlace(const void *key, size_t keylen, void *ciphertext, size_
decryptError("Failed to initialize context");
break;
default:
decryptError("Unsupported key length");
decryptError("Unsupported key length", keylen);
break;
}
byte *plaintext = (byte *) ciphertext;
if(1 != EVP_DecryptUpdate(ctx, plaintext, &thislen, (const unsigned char *) ciphertext, ciphertext_len))
decryptError("Error in EVP_DecryptUpdate");
decryptError("Error in EVP_DecryptUpdate", ciphertext_len);
plaintext_len += thislen;

if(1 != EVP_DecryptFinal_ex(ctx, plaintext + plaintext_len, &thislen))
decryptError("Error in EVP_DecryptFinal_ex");
decryptError("Error in EVP_DecryptFinal_ex", ciphertext_len);
plaintext_len += thislen;
assertex(plaintext_len <= ciphertext_len);
EVP_CIPHER_CTX_free(ctx);
Expand Down
Loading