Skip to content

Use direct burn in BufferPtr::Erase and guard token keyfile data #1816

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

Open
damianrickard wants to merge 1 commit into
base: master
Choose a base branch
from
+31 −5
Open

Use direct burn in BufferPtr::Erase and guard token keyfile data #1816

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
15 changes: 13 additions & 2 deletions src/Main/Forms/SecurityTokenKeyfilesDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,17 @@ namespace VeraCrypt
wxBusyCursor busy;

vector <uint8> keyfileData;
finally_do_arg (
vector <uint8> *, &keyfileData,
{ if (!finally_arg->empty()) burn (&finally_arg->front(), finally_arg->size()); }
);

keyfile->GetKeyfileData (keyfileData);

if (keyfileData.empty())
throw InsufficientData (SRC_POS);

BufferPtr keyfileDataBuf (&keyfileData.front(), keyfileData.size());
finally_do_arg (BufferPtr, keyfileDataBuf, { finally_arg.Erase(); });

File keyfile;
keyfile.Open (*files.front(), File::CreateWrite);
Expand Down Expand Up @@ -142,10 +149,14 @@ namespace VeraCrypt
if (keyfile.Length() > 0)
{
vector <uint8> keyfileData (keyfile.Length());
finally_do_arg (
vector <uint8> *, &keyfileData,
{ if (!finally_arg->empty()) burn (&finally_arg->front(), finally_arg->size()); }
);

BufferPtr keyfileDataBuf (&keyfileData.front(), keyfileData.size());

keyfile.ReadCompleteBuffer (keyfileDataBuf);
finally_do_arg (BufferPtr, keyfileDataBuf, { finally_arg.Erase(); });

NewSecurityTokenKeyfileDialog newKeyfileDialog (this, keyfilePath.ToBaseName());

Expand Down
15 changes: 13 additions & 2 deletions src/Main/TextUserInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1269,10 +1269,17 @@ namespace VeraCrypt
shared_ptr<TokenKeyfile> tokenKeyfile = Token::getTokenKeyfile(keyfilePath);

vector <uint8> keyfileData;
finally_do_arg (
vector <uint8> *, &keyfileData,
{ if (!finally_arg->empty()) burn (&finally_arg->front(), finally_arg->size()); }
);

tokenKeyfile->GetKeyfileData (keyfileData);

if (keyfileData.empty())
throw InsufficientData (SRC_POS);

BufferPtr keyfileDataBuf (&keyfileData.front(), keyfileData.size());
finally_do_arg (BufferPtr, keyfileDataBuf, { finally_arg.Erase(); });

FilePath exportFilePath = AskFilePath();

Expand Down Expand Up @@ -1336,10 +1343,14 @@ namespace VeraCrypt
if (keyfile.Length() > 0)
{
vector <uint8> keyfileData (keyfile.Length());
finally_do_arg (
vector <uint8> *, &keyfileData,
{ if (!finally_arg->empty()) burn (&finally_arg->front(), finally_arg->size()); }
);

BufferPtr keyfileDataBuf (&keyfileData.front(), keyfileData.size());

keyfile.ReadCompleteBuffer (keyfileDataBuf);
finally_do_arg (BufferPtr, keyfileDataBuf, { finally_arg.Erase(); });

SecurityToken::CreateKeyfile (slotId, keyfileData, string (FilePath (keyfilePath).ToBaseName()));
}
Expand Down
6 changes: 5 additions & 1 deletion src/Platform/Buffer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,11 @@ namespace VeraCrypt

operator uint8 * () const { return DataPtr; }
void CopyFrom (const ConstBufferPtr &bufferPtr) const;
void Erase () const { Zero(); }
void Erase () const
{
if (DataSize > 0)
burn (DataPtr, DataSize);
}
uint8 *Get () const { return DataPtr; }
BufferPtr GetRange (size_t offset, size_t size) const;
void Set (uint8 *data, size_t size) { DataPtr = data; DataSize = size; }
Expand Down
Loading