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

fix: Zero out stack-allocated secret key before return. #2661

Merged
merged 1 commit into from
Feb 9, 2024
Merged

fix: Zero out stack-allocated secret key before return. #2661

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 toxcore/group_chats.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4029,6 +4029,10 @@
memcpy(response + 1, new_session_pk, ENC_PUBLIC_KEY_SIZE);

if (!send_lossless_group_packet(chat, gconn, response, sizeof(response), GP_KEY_ROTATION)) {
// Don't really care about zeroing the secret key here, because we failed, but
// we're doing it anyway for symmetry with the memzero+munlock below, where we
// really do care about it.
crypto_memzero(new_session_sk, sizeof(new_session_sk));

Check warning on line 4035 in toxcore/group_chats.c

View check run for this annotation

Codecov / codecov/patch

toxcore/group_chats.c#L4035 

Added line #L4035 was not covered by tests
return -3;
}

Expand All @@ -4038,6 +4042,7 @@

gcc_make_session_shared_key(gconn, sender_public_session_key);

crypto_memzero(new_session_sk, sizeof(new_session_sk));

Check warning on line 4045 in toxcore/group_chats.c

View check run for this annotation

Codecov / codecov/patch

toxcore/group_chats.c#L4045 

Added line #L4045 was not covered by tests
crypto_memunlock(new_session_sk, sizeof(new_session_sk));

gconn->last_key_rotation = mono_time_get(chat->mono_time);
Expand Down
Loading