Skip to content

Conversation

vdukhovni
Copy link

@vdukhovni vdukhovni commented Mar 27, 2025

Trimmed to just the reported issue.

@vdukhovni vdukhovni added branch: master Merge to master branch triaged: bug The issue/pr is/fixes a bug branch: 3.5 Merge to openssl-3.5 labels Mar 27, 2025
@vdukhovni vdukhovni added this to the 3.5.0 Release Blocker milestone Mar 27, 2025
@vdukhovni vdukhovni requested review from t-j-h, t8m and mattcaswell and removed request for t8m March 27, 2025 01:39
@github-actions github-actions bot added the severity: fips change The pull request changes FIPS provider sources label Mar 27, 2025
t-j-h
t-j-h previously approved these changes Mar 27, 2025
Copy link
Member

@t-j-h t-j-h left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay for 3.5 backfit

@t-j-h t-j-h added the approval: review pending This pull request needs review by a committer label Mar 27, 2025
@t8m t8m added the tests: exempted The PR is exempt from requirements for testing label Mar 27, 2025
@t8m
Copy link
Member

t8m commented Mar 27, 2025

@vdukhovni Could you please amend the commit message to mention the reporter? I think it is deserved.

Issue reported by Apple Inc on 2025-03-26.
@mattcaswell
Copy link
Member

Ok for 3.5

@t8m t8m added approval: done This pull request has the required number of approvals severity: important Important bugs affecting a released version and removed approval: review pending This pull request needs review by a committer labels Mar 27, 2025
|| (ret = OPENSSL_memdup(key, sizeof(*ret))) == NULL)
return NULL;

if (ret->propq != NULL
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

General what I would do here is set all fields that still need to be copied to NULL right after the memdup. This avoids any issues if returning early and is simple to understand. The MLX_KEY structure should also have a comment on it saying to check the mlx_kem_dup() if any fields are added.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is approved & ready to merge, can we do these changes in a subsequent PR?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's my preference, any refactoring can go in later. With a few different choices available.

@openssl-machine openssl-machine added approval: ready to merge The 24 hour grace period has passed, ready to merge and removed approval: done This pull request has the required number of approvals labels Mar 28, 2025
@openssl-machine
Copy link
Collaborator

This pull request is ready to merge

openssl-machine pushed a commit that referenced this pull request Mar 28, 2025
Issue reported by Apple Inc on 2025-03-26.

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from #27173)

(cherry picked from commit 02cada2)
openssl-machine pushed a commit that referenced this pull request Mar 28, 2025
Issue reported by Apple Inc on 2025-03-26.

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from #27173)
@t8m
Copy link
Member

t8m commented Mar 28, 2025

Merged to the master and 3.5 branches. Thank you.

@t8m t8m closed this Mar 28, 2025
DDvO pushed a commit to siemens/openssl that referenced this pull request Jun 16, 2025
Issue reported by Apple Inc on 2025-03-26.

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from openssl#27173)
MichaelA-Fireblocks pushed a commit to MichaelA-Fireblocks/openssl that referenced this pull request Jul 15, 2025
Issue reported by Apple Inc on 2025-03-26.

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from openssl#27173)
MichaelA-Fireblocks pushed a commit to MichaelA-Fireblocks/openssl that referenced this pull request Jul 15, 2025
Issue reported by Apple Inc on 2025-03-26.

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from openssl#27173)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approval: ready to merge The 24 hour grace period has passed, ready to merge branch: master Merge to master branch branch: 3.5 Merge to openssl-3.5 severity: fips change The pull request changes FIPS provider sources severity: important Important bugs affecting a released version tests: exempted The PR is exempt from requirements for testing triaged: bug The issue/pr is/fixes a bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants