Skip to content

Fix privSz for wp_dh_get_params #251

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

Merged
padelsbach merged 2 commits into from
Aug 7, 2025
Merged

Fix privSz for wp_dh_get_params #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7728cf8
Fix privSz for wp_dh_get_params
aidangarske Aug 6, 2025
575eae3
Fix DH priv key size query
aidangarske Aug 6, 2025
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: 10 additions & 4 deletions src/wp_dh_kmgmt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,7 +807,7 @@ static int wp_dh_get_params(wp_Dh* dh, OSSL_PARAM params[])
p = OSSL_PARAM_locate(params, OSSL_PKEY_PARAM_PRIV_KEY);
if (p != NULL) {
if (p->data == NULL) {
p->return_size = dh->pubSz;
p->return_size = dh->privSz;
}
else if (p->data_type == OSSL_PARAM_UNSIGNED_INTEGER) {
if (p->data_size < dh->privSz) {
Expand All @@ -826,9 +826,15 @@ static int wp_dh_get_params(wp_Dh* dh, OSSL_PARAM params[])
}
}
}
if (ok && (!wp_params_set_octet_string_be(params, OSSL_PKEY_PARAM_PRIV_KEY,
dh->priv, dh->privSz))) {
ok = 0;
if (ok) {
/* Only call if we haven't already handled OSSL_PKEY_PARAM_PRIV_KEY */
p = OSSL_PARAM_locate(params, OSSL_PKEY_PARAM_PRIV_KEY);
if (p == NULL || p->data != NULL) {
if (!wp_params_set_octet_string_be(params, OSSL_PKEY_PARAM_PRIV_KEY,
dh->priv, dh->privSz)) {
ok = 0;
}
}
}
if (ok && (!wp_dh_get_params_encoded_public_key(dh, params))) {
ok = 0;
Expand Down
3 changes: 3 additions & 0 deletions test/test_dh.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,9 @@ int test_dh_get_params(void *data)
for (int j = 0; j < 2; j++) {
if (j == 0) {
mode = "Null data";
paramsWolfProvider[0] = gettableParams[i];
paramsWolfProvider[0].data = NULL;
paramsWolfProvider[0].data_size = 0;
}
else {
mode = "Buffer data";
Expand Down
Loading