gh-Mbed-TLS/mbedtls-framework
Watch
1
0
Fork
You've already forked mbedtls-framework
 0
Code Issues 39 Pull requests 42 Releases Activity

Framework support for SHAKE128/256 and SHAKE256/512 #267

Open
gilles-peskine-arm wants to merge 2 commits from gilles-peskine-arm/sha3-shake-builtin-framework into main
pull from: gilles-peskine-arm/sha3-shake-builtin-framework
merge into: gh-Mbed-TLS:main
Conversation 0 Commits 2 Files changed 4 +251
gilles-peskine-arm commented 2026-01-09 11:29:53 -06:00 (Migrated from github.com)

Support for an earlier version of https://github.com/Mbed-TLS/TF-PSA-Crypto/pull/648, but not needed after all.

Includes acvp_parser.py.

PR checklist

Support for an earlier version of https://github.com/Mbed-TLS/TF-PSA-Crypto/pull/648, but not needed after all. Includes `acvp_parser.py.` ## PR checklist - [x] **TF-PSA-Crypto PR** provided https://github.com/Mbed-TLS/TF-PSA-Crypto/pull/648 - [x] **development PR** not required because: crypto only - [x] **3.6 PR** not required because: new feature
This pull request has changes conflicting with the target branch.
  • scripts/mbedtls_framework/crypto_data_tests.py
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 'gilles-peskine-arm/sha3-shake-builtin-framework:gilles-peskine-arm/sha3-shake-builtin-framework'
git switch 'gilles-peskine-arm/sha3-shake-builtin-framework'

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch 'main'
git merge --no-ff 'gilles-peskine-arm/sha3-shake-builtin-framework'
git switch 'gilles-peskine-arm/sha3-shake-builtin-framework'
git rebase 'main'
git switch 'main'
git merge --ff-only 'gilles-peskine-arm/sha3-shake-builtin-framework'
git switch 'gilles-peskine-arm/sha3-shake-builtin-framework'
git rebase 'main'
git switch 'main'
git merge --no-ff 'gilles-peskine-arm/sha3-shake-builtin-framework'
git switch 'main'
git merge --squash 'gilles-peskine-arm/sha3-shake-builtin-framework'
git switch 'main'
git merge --ff-only 'gilles-peskine-arm/sha3-shake-builtin-framework'
git switch 'main'
git merge 'gilles-peskine-arm/sha3-shake-builtin-framework'
git push origin 'main'
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
approved
Design and code approved - may be waiting for CI or backports

  
bug
Something isn't working

  
dependencies
Pull requests that update a dependency file

  
DO-NOT-MERGE

   
enhancement
New feature or request

  
good-first-issue
Good for newcomers

  
help-wanted
This issue is not being actively worked on, but PRs welcome.

  
historical-reviewed
Reviewed & agreed to keep legacy PR/issue

  
historical-reviewing
Currently reviewing (for legacy PR/issues)

  
needs-adoption
stalled PR that someone should pick up and complete

  
needs-ci
Needs to pass CI tests

  
needs-design-approval

   
needs-info
An issue or PR which needs further info from the reporter / author

  
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

  
needs-work

   
priority-high
High priority - will be reviewed soon

  
priority-low
Low priority - this may not receive review soon

  
priority-medium
Medium priority - this can be reviewed as time permits

  
priority-scheduled
This PR is big - it will require time to be scheduled for review

  
priority-very-high
Highest priority - prioritise this over other review work

  
single-reviewer
This PR qualifies for having only one reviewer

  
size-l
Estimated task size: large (2w+)

  
size-m
Estimated task size: medium (~1w)

  
size-s
Estimated task size: small (~2d)

  
size-xs
Estimated task size: extra small (a few hours at most)

No labels
approved
bug
dependencies
DO-NOT-MERGE
enhancement
good-first-issue
help-wanted
historical-reviewed
historical-reviewing
needs-adoption
needs-ci
needs-design-approval
needs-info
needs-preceding-pr
needs-review
needs-reviewer
needs-work
priority-high
priority-low
priority-medium
priority-scheduled
priority-very-high
single-reviewer
size-l
size-m
size-s
size-xs
Milestone
Clear milestone
No items
No milestone
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
gh-Mbed-TLS/mbedtls-framework!267
No description provided.