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

add additional error checks on encryption of the toxsave file #577

Merged
merged 1 commit into from
Jan 9, 2025
Merged

add additional error checks on encryption of the toxsave file #577

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
14 changes: 10 additions & 4 deletions jni-c-toxcore/jni-c-toxcore.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,12 +858,11 @@ void update_savedata_file(const Tox *tox, const uint8_t *passphrase, size_t pass
// dbg(9, "update_savedata_file:savedata_enc=%p", savedata_enc);
TOX_ERR_ENCRYPTION error;
tox_pass_encrypt((const uint8_t *)savedata, size, passphrase, passphrase_len, savedata_enc, &error);
dbg(9, "update_savedata_file:tox_pass_encrypt:%d", (int)error);
bool res = false;
// dbg(9, "update_savedata_file:tox_pass_encrypt:%d", (int)error);

if ((size_enc < TOX_PASS_ENCRYPTION_EXTRA_LENGTH) || (error != TOX_ERR_ENCRYPTION_OK))
{
dbg(9, "update_savedata_file:ERROR:size_enc < TOX_PASS_ENCRYPTION_EXTRA_LENGTH or error != TOX_ERR_ENCRYPTION_OK");
dbg(9, "update_savedata_file:ERROR:size_enc < TOX_PASS_ENCRYPTION_EXTRA_LENGTH or error != TOX_ERR_ENCRYPTION_OK: error=%d", (int)error);
if(savedata)
{
free(savedata);
Expand All @@ -876,10 +875,17 @@ void update_savedata_file(const Tox *tox, const uint8_t *passphrase, size_t pass
}
else
{
bool res = false;
res = tox_is_data_encrypted((const uint8_t *)savedata_enc);
if (!res)
{
dbg(9, "update_savedata_file:ERROR:savedata_enc is corrupted");
free(savedata);
free(savedata_enc);
return;
}
}

// dbg(9, "update_savedata_file:tox_is_data_encrypted=%d", (int)res);
FILE *f = fopen(full_path_filename_tmp, "wb");
fwrite((const void *)savedata_enc, size_enc, 1, f);
fseek(f, 0, SEEK_END);
Expand Down
Loading