Skip to content
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.

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

Backport 2.28: move entropy init prior arguments number recognition #8818

Merged
merged 3 commits into from
Feb 14, 2024
Merged

Backport 2.28: move entropy init prior arguments number recognition #8818

merged 3 commits into from
Feb 14, 2024

Conversation

PiotrBzdrega
Copy link
Contributor

@PiotrBzdrega PiotrBzdrega commented Feb 13, 2024

Description

Fix to issue #8809 like in development branch

PR checklist

Please tick as appropriate and edit the reasons (e.g.: "backport: not needed because this is a new feature")

Copy link
Contributor

@gilles-peskine-arm gilles-peskine-arm left a comment

Choose a reason for hiding this comment

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

LGTM

@gilles-peskine-arm gilles-peskine-arm added needs-review Every commit must be reviewed by at least two team members, needs-ci Needs to pass CI tests priority-medium Medium priority - this can be reviewed as time permits size-xs Estimated task size: extra small (a few hours at most) bug component-crypto Crypto primitives and low-level interfaces labels Feb 13, 2024
@tom-cosgrove-arm
Copy link
Contributor

@PiotrBzdrega is this meant to still be draft?

@PiotrBzdrega PiotrBzdrega marked this pull request as ready for review February 13, 2024 16:21
Copy link
Contributor

@tom-cosgrove-arm tom-cosgrove-arm left a comment

Choose a reason for hiding this comment

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

LGTM

@tom-cosgrove-arm
Copy link
Contributor

CI failure is

[2024-02-13T16:25:16.919Z] ******************************************************************
[2024-02-13T16:25:16.919Z] * check_files: Check: file sanity checks (permissions, encodings) 
[2024-02-13T16:25:16.919Z] * Tue Feb 13 16:25:16 UTC 2024
[2024-02-13T16:25:16.919Z] ******************************************************************
[2024-02-13T16:25:23.482Z] Missing newline at end of file:
[2024-02-13T16:25:23.482Z] ChangeLog.d/gen-key-segfault.txt
[2024-02-13T16:25:23.482Z] 
[2024-02-13T16:25:23.482Z] ^^^^check_files: Check: file sanity checks (permissions, encodings): tests/scripts/check_files.py -> 1^^^^

Copy link
Contributor

@tom-cosgrove-arm tom-cosgrove-arm left a comment

Choose a reason for hiding this comment

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

LGTM

@tom-cosgrove-arm
Copy link
Contributor

I do wonder how hard it would be for the assemble-changelog script to add \n if there wasn't one at the end of the .txt file...

@PiotrBzdrega
Copy link
Contributor Author

PiotrBzdrega commented Feb 14, 2024

I do wonder how hard it would be for the assemble-changelog script to add \n if there wasn't one at the end of the .txt file...

That would be nice 🤔, I will try to find a way.

ps. I noticed also that ../scripts/assemble_changelog.py somehow does not take into account:
Each entry starts with three spaces, an asterisk and a space. Continuation lines start with 5 spaces.
since few changelogs from ../ChangeLog.d has shifted asterisks positions

@gilles-peskine-arm gilles-peskine-arm added approved Design and code approved - may be waiting for CI or backports and removed needs-ci Needs to pass CI tests needs-review Every commit must be reviewed by at least two team members, labels Feb 14, 2024
@gilles-peskine-arm
Copy link
Contributor

I do wonder how hard it would be for the assemble-changelog script to add \n if there wasn't one at the end of the .txt file...

Easy. But check_files would complain anyway, so why bother?

I noticed also that ../scripts/assemble_changelog.py somehow does not take into account:
Each entry starts with three spaces, an asterisk and a space. Continuation lines start with 5 spaces.

Doable but not a priority, we usually do minor reformatting when we prepare a release anyway.

It would also be nice to enforce line lengths in the changelog, but we also don't want to reformat lines that were deliberately broken in a certain way.

The three-spaces-asterisk thing is weird and we could get rid of it, but that would require changing already-existing entries and we'd have to address pull requests in flight, so it's a lot of hassle for a minor gain.

@gilles-peskine-arm gilles-peskine-arm added this pull request to the merge queue Feb 14, 2024
Merged via the queue into Mbed-TLS:mbedtls-2.28 with commit 039c903 Feb 14, 2024
4 checks passed
@PiotrBzdrega PiotrBzdrega deleted the mbedtls-2.28 branch February 15, 2024 05:26
@PiotrBzdrega PiotrBzdrega restored the mbedtls-2.28 branch February 15, 2024 05:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Design and code approved - may be waiting for CI or backports bug component-crypto Crypto primitives and low-level interfaces priority-medium Medium priority - this can be reviewed as time permits size-xs Estimated task size: extra small (a few hours at most)
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants