Skip to content

Update len check in wh_Client_CertReadTrustedResponse #390

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

Update len check in wh_Client_CertReadTrustedResponse #390

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: 9 additions & 5 deletions src/wh_client_cert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,17 +327,21 @@ int wh_Client_CertReadTrustedResponse(whClientContext* c, uint8_t* cert,
}

if (resp->rc == WH_ERROR_OK) {
/* Copy certificate data if buffer is large enough */
if (*cert_len >= resp->cert_len) {
memcpy(cert, payload, resp->cert_len);
*cert_len = resp->cert_len;
/* Check that cert_len does not exceed the received data size */
if (resp->cert_len > size - sizeof(*resp)) {
rc = WH_ERROR_ABORTED;
}
else {
/* Check that caller buffer is large enough for the cert */
else if (*cert_len < resp->cert_len) {
*cert_len = resp->cert_len;
if (out_rc != NULL) {
*out_rc = WH_ERROR_BUFFER_SIZE;
}
}
else {
memcpy(cert, payload, resp->cert_len);
*cert_len = resp->cert_len;
}
}
}
}
Expand Down
Loading