Skip to content

fix: zero-initialize s2n_tls13_keys in PSK binder functions #6048

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
jouho wants to merge 1 commit into
base: main
Choose a base branch
from
+2 −2
Open

fix: zero-initialize s2n_tls13_keys in PSK binder functions #6048

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
4 changes: 2 additions & 2 deletions tls/s2n_psk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ int s2n_psk_calculate_binder(struct s2n_psk *psk, const struct s2n_blob *binder_
POSIX_ENSURE_REF(binder_hash);
POSIX_ENSURE_REF(output_binder);

DEFER_CLEANUP(struct s2n_tls13_keys psk_keys, s2n_tls13_keys_free);
DEFER_CLEANUP(struct s2n_tls13_keys psk_keys = { 0 }, s2n_tls13_keys_free);
POSIX_GUARD(s2n_tls13_keys_init(&psk_keys, psk->hmac_alg));
POSIX_ENSURE_EQ(binder_hash->size, psk_keys.size);
POSIX_ENSURE_EQ(output_binder->size, psk_keys.size);
Expand All @@ -447,7 +447,7 @@ int s2n_psk_verify_binder(struct s2n_connection *conn, struct s2n_psk *psk,
POSIX_ENSURE_REF(psk);
POSIX_ENSURE_REF(binder_to_verify);

DEFER_CLEANUP(struct s2n_tls13_keys psk_keys, s2n_tls13_keys_free);
DEFER_CLEANUP(struct s2n_tls13_keys psk_keys = { 0 }, s2n_tls13_keys_free);
POSIX_GUARD(s2n_tls13_keys_init(&psk_keys, psk->hmac_alg));
POSIX_ENSURE_EQ(binder_to_verify->size, psk_keys.size);

Expand Down
Loading