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

SPAKE2+: Add prover setup and key-share output for SPAKE2+ #820

Open
sigvartmh wants to merge 6 commits from sigvartmh/pr/spake2p-9347-prover-depends-on-9342-9343-9344 into development
pull from: sigvartmh/pr/spake2p-9347-prover-depends-on-9342-9343-9344
merge into: gh-Mbed-TLS:development
Conversation 0 Commits 6 Files changed 25 +3098 -80
sigvartmh commented 2026-06-21 17:19:37 -05:00 (Migrated from github.com)

Description

Prover-only part of SPAKE2+ (RFC 9383): psa_pake_setup() accepts SPAKE2+ key types, and psa_pake_output() produces the PSA_PAKE_STEP_KEY_SHARE message for the client (Prover) role, with the RFC 9383 Appendix C known-answer tests (P-256/P-384/P-521) driven through a MBEDTLS_TEST_HOOKS ephemeral-injection seam, plus negative tests.

This addresses Mbed-TLS issue https://github.com/Mbed-TLS/mbedtls/issues/9347 (part 1 of the split requested there; the verifier part follows in a separate PR).

Depends on https://github.com/Mbed-TLS/TF-PSA-Crypto/pull/817, https://github.com/Mbed-TLS/TF-PSA-Crypto/pull/819 and https://github.com/Mbed-TLS/TF-PSA-Crypto/pull/818 — the branch stacks their commits (public-key import/export, key-pair import/export, psa_pake_set_context) so it builds and tests standalone; once those merge, a rebase drops the shared commits.

Also included per the issue's scope: empty identities accepted for SPAKE2+ (zero-length per the PSA PAKE spec and RFC 9383 — needed for Matter), the verifier role usable with a key pair (the driver derives the registration record w0 ‖ L itself), password-key/cipher-suite consistency checks, key-confirmation setting validation, invalid-point errors mapped to PSA_ERROR_INVALID_ARGUMENT, and per-algorithm compile-time gating of the SPAKE2+ setup arms.

PR checklist

  • changelog provided
  • framework PR provided Mbed-TLS/mbedtls-framework#308
  • TF-PSA-Crypto development PR provided
  • mbedtls development PR not required because: Not targeting mbedtls
  • tests provided
## Description Prover-only part of SPAKE2+ (RFC 9383): `psa_pake_setup()` accepts SPAKE2+ key types, and `psa_pake_output()` produces the PSA_PAKE_STEP_KEY_SHARE message for the client (Prover) role, with the RFC 9383 Appendix C known-answer tests (P-256/P-384/P-521) driven through a MBEDTLS_TEST_HOOKS ephemeral-injection seam, plus negative tests. This addresses Mbed-TLS issue https://github.com/Mbed-TLS/mbedtls/issues/9347 (part 1 of the split requested there; the verifier part follows in a separate PR). Depends on https://github.com/Mbed-TLS/TF-PSA-Crypto/pull/817, https://github.com/Mbed-TLS/TF-PSA-Crypto/pull/819 and https://github.com/Mbed-TLS/TF-PSA-Crypto/pull/818 — the branch stacks their commits (public-key import/export, key-pair import/export, psa_pake_set_context) so it builds and tests standalone; once those merge, a rebase drops the shared commits. Also included per the issue's scope: empty identities accepted for SPAKE2+ (zero-length per the PSA PAKE spec and RFC 9383 — needed for Matter), the verifier role usable with a key pair (the driver derives the registration record w0 ‖ L itself), password-key/cipher-suite consistency checks, key-confirmation setting validation, invalid-point errors mapped to PSA_ERROR_INVALID_ARGUMENT, and per-algorithm compile-time gating of the SPAKE2+ setup arms. ## PR checklist - [X] **changelog** provided - [X] **framework PR** provided Mbed-TLS/mbedtls-framework#308 - [X] **TF-PSA-Crypto development PR** provided - [X] **mbedtls development PR** not required because: Not targeting mbedtls - [X] **tests** provided
This pull request has changes conflicting with the target branch.
  • include/psa/crypto_extra.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 'sigvartmh/pr/spake2p-9347-prover-depends-on-9342-9343-9344:sigvartmh/pr/spake2p-9347-prover-depends-on-9342-9343-9344'
git switch 'sigvartmh/pr/spake2p-9347-prover-depends-on-9342-9343-9344'

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 'sigvartmh/pr/spake2p-9347-prover-depends-on-9342-9343-9344'
git switch 'sigvartmh/pr/spake2p-9347-prover-depends-on-9342-9343-9344'
git rebase 'development'
git switch 'development'
git merge --ff-only 'sigvartmh/pr/spake2p-9347-prover-depends-on-9342-9343-9344'
git switch 'sigvartmh/pr/spake2p-9347-prover-depends-on-9342-9343-9344'
git rebase 'development'
git switch 'development'
git merge --no-ff 'sigvartmh/pr/spake2p-9347-prover-depends-on-9342-9343-9344'
git switch 'development'
git merge --squash 'sigvartmh/pr/spake2p-9347-prover-depends-on-9342-9343-9344'
git switch 'development'
git merge --ff-only 'sigvartmh/pr/spake2p-9347-prover-depends-on-9342-9343-9344'
git switch 'development'
git merge 'sigvartmh/pr/spake2p-9347-prover-depends-on-9342-9343-9344'
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!820
No description provided.