Skip to content

fix: null-check cert_and_key fields in load helpers #5932

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 4 commits into
base: main
Choose a base branch
from
+5 −0
Open

fix: null-check cert_and_key fields in load helpers #5932

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6441def
fix: null-check cert_and_key fields in load helpers
jouho Jun 12, 2026
8e767d1
Revert "fix: null-check cert_and_key fields in load helpers"
jouho Jun 12, 2026
1c807fc
fix: null-check cert_and_key fields in load helpers
jouho Jun 12, 2026
5272fc9
Merge branch 'main' into fix/cert-chain-key-helpers-null-check
jouho Jun 12, 2026
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 crypto/s2n_certificate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ int s2n_create_cert_chain_from_stuffer(struct s2n_cert_chain *cert_chain_out, st

int s2n_cert_chain_and_key_set_cert_chain_from_stuffer(struct s2n_cert_chain_and_key *cert_and_key, struct s2n_stuffer *chain_in_stuffer)
{
POSIX_ENSURE_REF(cert_and_key);
POSIX_ENSURE_REF(cert_and_key->cert_chain);
return s2n_create_cert_chain_from_stuffer(cert_and_key->cert_chain, chain_in_stuffer);
}

Expand Down Expand Up @@ -102,6 +104,9 @@ int s2n_cert_chain_and_key_set_cert_chain(struct s2n_cert_chain_and_key *cert_an
int s2n_cert_chain_and_key_set_private_key_from_stuffer(struct s2n_cert_chain_and_key *cert_and_key,
struct s2n_stuffer *key_in_stuffer, struct s2n_stuffer *key_out_stuffer)
{
POSIX_ENSURE_REF(cert_and_key);
POSIX_ENSURE_REF(cert_and_key->private_key);

struct s2n_blob key_blob = { 0 };

POSIX_GUARD(s2n_pkey_zero_init(cert_and_key->private_key));
Expand Down
Loading