Skip to content

Avoid modifying context in key exchange dup functions #374

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
ColtonWilley merged 1 commit into from
Mar 17, 2026
Merged

Avoid modifying context in key exchange dup functions #374

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
12 changes: 7 additions & 5 deletions src/wp_dh_exch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,11 +131,13 @@ static wp_DhCtx* wp_dh_dupctx(wp_DhCtx* src)
dst->key = src->key;
}
/* Copy peer's key by up referencing and copying pointer. */
if (ok && (src->peer != NULL) && (!wp_dh_up_ref(src->peer))) {
ok = 0;
}
else {
dst->peer = src->peer;
if (ok) {
if ((src->peer != NULL) && (!wp_dh_up_ref(src->peer))) {
ok = 0;
}
else {
dst->peer = src->peer;
}
}
/* Copy User Keying Material. */
if (ok && (src->ukm != NULL) && (src->ukmLen > 0)) {
Expand Down
12 changes: 7 additions & 5 deletions src/wp_ecdh_exch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,13 @@ static wp_EcdhCtx* wp_ecdh_dup(wp_EcdhCtx* src)
dst->key = src->key;
}
/* Copy peer's key by up referencing and copying pointer. */
if (ok && (src->peer != NULL) && (!wp_ecc_up_ref(src->peer))) {
ok = 0;
}
else {
dst->peer = src->peer;
if (ok) {
if ((src->peer != NULL) && (!wp_ecc_up_ref(src->peer))) {
ok = 0;
}
else {
dst->peer = src->peer;
}
}
/* Copy User Keying Material. */
if (ok && (src->ukm != NULL) && (src->ukmLen > 0)) {
Expand Down
12 changes: 7 additions & 5 deletions src/wp_ecx_exch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,13 @@ static wp_EcxCtx* wp_ecx_dupctx(wp_EcxCtx* src)
else {
dst->key = src->key;
}
if (ok && (src->peer != NULL) && (!wp_ecx_up_ref(src->peer))) {
ok = 0;
}
else {
dst->peer = src->peer;
if (ok) {
if ((src->peer != NULL) && (!wp_ecx_up_ref(src->peer))) {
ok = 0;
}
else {
dst->peer = src->peer;
}
}
if (!ok) {
wp_ecx_free(dst->key);
Expand Down
Loading