Skip to content

Fix string length check in dh/ecdh #366

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

Draft
padelsbach wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fix string length check in dh/ecdh #366

Show file tree
Hide file tree
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: 3 additions & 1 deletion src/wp_dh_exch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,8 +512,10 @@ static int wp_dh_set_param_kdf_digest(wp_DhCtx* ctx, const OSSL_PARAM params[])
}
if (ok && (mdName != NULL)) {
const char* mdProps = NULL;
size_t mdNameLen = OPENSSL_strnlen(mdName, sizeof(ctx->kdfMdName) - 1);

XMEMCPY(ctx->kdfMdName, mdName, XSTRLEN(mdName) + 1);
XMEMCPY(ctx->kdfMdName, mdName, mdNameLen);
ctx->kdfMdName[mdNameLen] = '\0';
if (!wp_params_get_utf8_string_ptr(params,
OSSL_EXCHANGE_PARAM_KDF_DIGEST_PROPS, &mdProps)) {
ok = 0;
Expand Down
4 changes: 3 additions & 1 deletion src/wp_ecdh_exch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,8 +460,10 @@ static int wp_ecdh_set_param_kdf_digest(wp_EcdhCtx* ctx,
}
if (ok && (mdName != NULL)) {
const char* mdProps = NULL;
size_t mdNameLen = OPENSSL_strnlen(mdName, sizeof(ctx->kdfMdName) - 1);

XMEMCPY(ctx->kdfMdName, mdName, XSTRLEN(mdName) + 1);
XMEMCPY(ctx->kdfMdName, mdName, mdNameLen);
ctx->kdfMdName[mdNameLen] = '\0';
if (!wp_params_get_utf8_string_ptr(params,
OSSL_EXCHANGE_PARAM_KDF_DIGEST_PROPS, &mdProps)) {
ok = 0;
Expand Down
Loading