gh-Mbed-TLS/TF-PSA-Crypto
Watch
1
0
Fork
You've already forked TF-PSA-Crypto
 0
Code Issues 167 Pull requests 92 Releases 5 Activity

Add support for AES-XTS #538

Open
ruiliio wants to merge 2 commits from ruiliio/psa_xts into development
pull from: ruiliio/psa_xts
merge into: gh-Mbed-TLS:development
Conversation 10 Commits 2 Files changed 19 +424 -20
ruiliio commented 2025-10-20 16:46:50 -05:00 (Migrated from github.com)

Description

Add support for AES-XTS / PSA_ALG_XTS cipher in PSA: AES-128-XTS with a 256-bit key, AES-256-XTS with a 512-bit key. The changes include:

  • Enable generation and import of the double-length AES-XTS keys (256/512-bit) via a new helper psa_xts_adjust_key_bits() that halves the key size for validation.
  • Add a flag xts_unit_done to the cipher context to enforce one update call per operation, preventing a second call from reusing the tweak and producing wrong output.

Fix https://github.com/Mbed-TLS/mbedtls/issues/6384

PR checklist

## Description Add support for AES-XTS / `PSA_ALG_XTS` cipher in PSA: AES-128-XTS with a 256-bit key, AES-256-XTS with a 512-bit key. The changes include: - Enable generation and import of the double-length AES-XTS keys (256/512-bit) via a new helper `psa_xts_adjust_key_bits()` that halves the key size for validation. - Add a flag `xts_unit_done` to the cipher context to enforce one update call per operation, preventing a second call from reusing the tweak and producing wrong output. Fix https://github.com/Mbed-TLS/mbedtls/issues/6384 ## PR checklist - [x] **changelog** provided - [x] **framework PR** provided Mbed-TLS/mbedtls-framework# https://github.com/Mbed-TLS/mbedtls-framework/pull/228 - [x] **mbedtls development PR** not required because: no changes - [x] **mbedtls 3.6 PR** not required because: no backport - **tests** provided
davidhorstmann-arm commented 2026-01-14 04:58:13 -06:00 (Migrated from github.com)

Thanks for this contribution!

This is on the larger side of size-s. Luckily it's mostly plumbing to the existing legacy implementation rather than a new implementation, so that should make it easier to review. It looks well-tested which is great!

Thanks for this contribution! This is on the larger side of size-s. Luckily it's mostly plumbing to the existing legacy implementation rather than a new implementation, so that should make it easier to review. It looks well-tested which is great!
ruiliio commented 2026-02-04 15:24:14 -06:00 (Migrated from github.com)

Thanks for your feedback. I've fixed the previous CI errors. This is ready for review now.

Thanks for your feedback. I've fixed the previous CI errors. This is ready for review now.
ruiliio commented 2026-02-22 18:38:31 -06:00 (Migrated from github.com)

I have pushed additional CI fixes. Ready for another run whenever you get a chance. Thank you.

I have pushed additional CI fixes. Ready for another run whenever you get a chance. Thank you.
ruiliio commented 2026-02-23 22:07:22 -06:00 (Migrated from github.com)

Rebased and ready for another CI run. Thank you very much.

Rebased and ready for another CI run. Thank you very much.
dbuenzli commented 2026-05-20 14:34:03 -05:00 (Migrated from github.com)

Is there a version ETA on this getting merged?

Is there a version ETA on this getting merged?
bjwtaylor (Migrated from github.com) reviewed 2026-07-08 04:12:43 -05:00
bjwtaylor (Migrated from github.com) left a comment

Some initial comments

Some initial comments
ChangeLog.d/psa-aes-xts.txt
@ -0,0 +1,3 @@
Features
bjwtaylor (Migrated from github.com) commented 2026-07-07 07:40:56 -05:00

Putting this at the beginning as the file isn't modified. include/psa/crypto_sizes.h:1089-1095` still says XTS is unsupported. The size is also too small to support the 64 bit keys.

Putting this at the beginning as the file isn't modified. include/psa/crypto_sizes.h:1089`-`1095` still says XTS is unsupported. The size is also too small to support the 64 bit keys.
drivers/builtin/src/psa_crypto_cipher.c
bjwtaylor (Migrated from github.com) commented 2026-07-08 04:12:25 -05:00

Will this combined with drivers/builtin/src/psa_crypto_cipher.c:111 mean that more alg type key type combinations than are currently supported are advertised. Such as?
PSA_ALG_XTS + PSA_KEY_TYPE_AES -> AES, XTS
PSA_ALG_XTS + PSA_KEY_TYPE_ARIA -> ARIA, XTS
PSA_ALG_XTS + PSA_KEY_TYPE_CAMELLIA -> CAMELLIA, XTS

Will this combined with drivers/builtin/src/psa_crypto_cipher.c:111 mean that more alg type key type combinations than are currently supported are advertised. Such as? PSA_ALG_XTS + PSA_KEY_TYPE_AES -> AES, XTS PSA_ALG_XTS + PSA_KEY_TYPE_ARIA -> ARIA, XTS PSA_ALG_XTS + PSA_KEY_TYPE_CAMELLIA -> CAMELLIA, XTS
bjwtaylor (Migrated from github.com) reviewed 2026-07-08 04:13:45 -05:00
bjwtaylor (Migrated from github.com) left a comment

Also the Ci is currently failing and this will require resolution

Also the Ci is currently failing and this will require resolution
ruiliio (Migrated from github.com) reviewed 2026-07-15 17:55:04 -05:00
ChangeLog.d/psa-aes-xts.txt
@ -0,0 +1,3 @@
Features
ruiliio (Migrated from github.com) commented 2026-07-15 17:55:03 -05:00

Thanks for pointing it out. Fixed in the new commits. PSA_CIPHER_MAX_KEY_LENGTH is now raised to 64 bytes when XTS is enabled.

Thanks for pointing it out. Fixed in the new commits. `PSA_CIPHER_MAX_KEY_LENGTH` is now raised to 64 bytes when XTS is enabled.
ruiliio (Migrated from github.com) reviewed 2026-07-15 17:56:15 -05:00
drivers/builtin/src/psa_crypto_cipher.c
ruiliio (Migrated from github.com) commented 2026-07-15 17:56:14 -05:00

Yes. Changed to only advertise AES-XTS.

Yes. Changed to only advertise AES-XTS.
ruiliio commented 2026-08-03 18:01:08 -05:00 (Migrated from github.com)

@bjwtaylor Thanks for the review. Rebased and ready for a CI run when you get a chance.

@bjwtaylor Thanks for the review. Rebased and ready for a CI run when you get a chance.
This pull request has changes conflicting with the target branch.
  • configs/crypto-config-symmetric-only.h
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 'ruiliio/psa_xts:ruiliio/psa_xts'
git switch 'ruiliio/psa_xts'

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 'development'
git merge --no-ff 'ruiliio/psa_xts'
git switch 'ruiliio/psa_xts'
git rebase 'development'
git switch 'development'
git merge --ff-only 'ruiliio/psa_xts'
git switch 'ruiliio/psa_xts'
git rebase 'development'
git switch 'development'
git merge --no-ff 'ruiliio/psa_xts'
git switch 'development'
git merge --squash 'ruiliio/psa_xts'
git switch 'development'
git merge --ff-only 'ruiliio/psa_xts'
git switch 'development'
git merge 'ruiliio/psa_xts'
git push origin 'development'
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
api-break
This issue/PR breaks the API and must wait for a new major version

  
approved
Design and code approved - may be waiting for CI or backports

  
bug
Something isn't working

  
component-docs
Docs / website issues filed here for tracking

  
component-platform
Portability layer and build scripts

  
component-test
Test framework and CI scripts

  
dependencies
Pull requests that update a dependency file

  
deprecation
needs deprecation announcement

  
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.

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

  
needs-backports
Backports are missing or are pending review and approval.

  
needs-ci
Needs to pass CI tests

  
needs-design-approval
Needs design discussion / 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

  
resolved-after-1.1
The issue is resolved in development, but still present in 1.1 LTS.

  
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-optimisation

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

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

No labels
api-break
approved
bug
component-docs
component-platform
component-test
dependencies
deprecation
DO-NOT-MERGE
enhancement
good first issue
help wanted
needs-adoption
needs-backports
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
resolved-after-1.1
single-reviewer
size-l
size-m
size-optimisation
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/TF-PSA-Crypto!538
No description provided.