Skip to content

Backport 3.6: Move some scripts to the framework#10629

Merged
gilles-peskine-arm merged 5 commits into
Mbed-TLS:mbedtls-3.6from
gilles-peskine-arm:audit_validity_dates-move-to-framework-3.6
Mar 19, 2026
Merged

Backport 3.6: Move some scripts to the framework#10629
gilles-peskine-arm merged 5 commits into
Mbed-TLS:mbedtls-3.6from
gilles-peskine-arm:audit_validity_dates-move-to-framework-3.6

Conversation

@gilles-peskine-arm

@gilles-peskine-arm gilles-peskine-arm commented Mar 3, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor
  1. Adapt scripts that differ in development. For all of them, the development version works for 3.6.
  2. Remove the files added to the framework in Move some scripts from mbedtls mbedtls-framework#283. Note that all the files that are removed in development have identical content at this point here.
  3. Adapt build scripts accordingly.

PR checklist

@gilles-peskine-arm gilles-peskine-arm added the needs-backports Backports are missing or are pending review and approval. label Mar 3, 2026
@gilles-peskine-arm gilles-peskine-arm added needs-ci Needs to pass CI tests priority-high High priority - will be reviewed soon size-xs Estimated task size: extra small (a few hours at most) labels Mar 3, 2026
This was referenced Mar 3, 2026
Merged
Merged
@gilles-peskine-arm gilles-peskine-arm added needs-preceding-pr Requires another PR to be merged first needs-review Every commit must be reviewed by at least two team members, needs-reviewer This PR needs someone to pick it up for review and removed needs-ci Needs to pass CI tests labels Mar 3, 2026
@gilles-peskine-arm gilles-peskine-arm force-pushed the audit_validity_dates-move-to-framework-3.6 branch from c2919d2 to 4268795 Compare March 9, 2026 09:41
@gilles-peskine-arm

gilles-peskine-arm commented Mar 9, 2026

Copy link
Copy Markdown
Contributor Author

I rebased due to a framework conflict, but I messed up so I'm going to force-push again.

@gilles-peskine-arm gilles-peskine-arm force-pushed the audit_validity_dates-move-to-framework-3.6 branch from 4268795 to ad5ee4c Compare March 9, 2026 09:54
@gilles-peskine-arm

gilles-peskine-arm commented Mar 9, 2026

Copy link
Copy Markdown
Contributor Author

I'm done rebasing, all branches should do the right thing now. As usual there will have to be a final update of the framework update commits once the framework pull request is merge.

valeriosetti
valeriosetti previously approved these changes Mar 9, 2026
View reviewed changes

@valeriosetti valeriosetti left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Comparing this PR to the changes introduced by Mbed-TLS/mbedtls-framework#283, all seems fine to me.
I will reapprove once Mbed-TLS/mbedtls-framework#283 is merged.

@gilles-peskine-arm gilles-peskine-arm force-pushed the audit_validity_dates-move-to-framework-3.6 branch from ad5ee4c to 4dc4580 Compare March 12, 2026 09:17
@gilles-peskine-arm

gilles-peskine-arm commented Mar 12, 2026

Copy link
Copy Markdown
Contributor Author

I amended the framework update commit to go directly to main after merging the prerequisite.

valeriosetti
valeriosetti previously approved these changes Mar 12, 2026
View reviewed changes
@gilles-peskine-arm gilles-peskine-arm removed needs-preceding-pr Requires another PR to be merged first needs-reviewer This PR needs someone to pick it up for review labels Mar 12, 2026
valeriosetti
valeriosetti previously approved these changes Mar 12, 2026
View reviewed changes
bjwtaylor
bjwtaylor previously approved these changes Mar 13, 2026
View reviewed changes
@github-project-automation github-project-automation Bot moved this from In Development to Has Approval in Roadmap pull requests (new board) Mar 13, 2026
@gilles-peskine-arm gilles-peskine-arm added approved Design and code approved - may be waiting for CI or backports and removed needs-review Every commit must be reviewed by at least two team members, labels Mar 16, 2026
@gilles-peskine-arm
Align some scripts with development
c7d600f 
The changes made between 3.6 and 4.0+ are useless but harmless in 3.6.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
@gilles-peskine-arm
Update framework with moved scripts
8271269 
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
@gilles-peskine-arm
Move requirements to the framework for scripts in the framework
401751b 
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
@gilles-peskine-arm
Update paths after moving some scripts to the framework
f3c1f8d 
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
@gilles-peskine-arm
Update massif_max.pl location
e489260 
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
@gilles-peskine-arm gilles-peskine-arm force-pushed the audit_validity_dates-move-to-framework-3.6 branch from 95ea3f2 to e489260 Compare March 19, 2026 12:20
@gilles-peskine-arm gilles-peskine-arm added needs-review Every commit must be reviewed by at least two team members, and removed approved Design and code approved - may be waiting for CI or backports labels Mar 19, 2026
@gilles-peskine-arm

gilles-peskine-arm commented Mar 19, 2026

Copy link
Copy Markdown
Contributor Author

I have rebased once again due to a submodule conflict.

@gilles-peskine-arm gilles-peskine-arm added approved Design and code approved - may be waiting for CI or backports and removed needs-review Every commit must be reviewed by at least two team members, labels Mar 19, 2026
@gilles-peskine-arm gilles-peskine-arm added this pull request to the merge queue Mar 19, 2026
Merged via the queue into Mbed-TLS:mbedtls-3.6 with commit d5e35a3 Mar 19, 2026
4 checks passed
@github-project-automation github-project-automation Bot moved this from Has Approval to Done in Roadmap pull requests (new board) Mar 19, 2026
@gilles-peskine-arm gilles-peskine-arm mentioned this pull request Mar 25, 2026
Merged
5 tasks
gilles-peskine-arm
gilles-peskine-arm commented Mar 25, 2026
View reviewed changes
Comment thread scripts/memory.sh
wait $SRV_PID

scripts/massif_max.pl massif.out.*
framework/scripts/massif_max.pl massif.out.*

@gilles-peskine-arm gilles-peskine-arm Mar 25, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I forgot to cherry-pick the commit that actually removes the “moved” files in 3.6! Done in #10658 .

@gilles-peskine-arm gilles-peskine-arm mentioned this pull request Mar 26, 2026
Merged
7 tasks
@gilles-peskine-arm gilles-peskine-arm mentioned this pull request Apr 9, 2026
Merged
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bjwtaylor bjwtaylor bjwtaylor approved these changes

@valeriosetti valeriosetti valeriosetti approved these changes

Assignees

No one assigned

Labels

approved Design and code approved - may be waiting for CI or backports needs-backports Backports are missing or are pending review and approval. priority-high High priority - will be reviewed soon size-xs Estimated task size: extra small (a few hours at most)

Projects

Roadmap pull requests (new board)
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@gilles-peskine-arm @bjwtaylor @valeriosetti