Skip to content
Merged
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions tsk/util/Bitlocker/MetadataValueAesCcmEncryptedKey.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,15 @@ BITLOCKER_STATUS MetadataValueAesCcmEncryptedKey::decrypt(uint8_t* key, size_t k
// Decrypt the key entry
BITLOCKER_STATUS ret = decryptKey(key, keyLen, m_encryptedData, m_encryptedDataLen, decryptedData);
if (ret != BITLOCKER_STATUS::SUCCESS) {
memset(decryptedData, 0, m_encryptedDataLen);
std::fill_n<volatile uint8_t*>(decryptedData, m_encryptedDataLen, 0);
free(decryptedData);
decryptedData = nullptr;
return ret; // Propagate the return value in case it indicates an incorrect password
}

// Try to create the key entry
*keyEntry = MetadataEntry::createMetadataEntry(&(decryptedData[BITLOCKER_KEY_MAC_LEN]), m_encryptedDataLen);
memset(decryptedData, 0, m_encryptedDataLen);
std::fill_n<volatile uint8_t*>(decryptedData, m_encryptedDataLen, 0);
free(decryptedData);
decryptedData = nullptr;

Expand Down
Loading