Merge pull request #10077 from amtkarm1/iss9320

Combine psa_pake_set_password_key() with psa_pake_setup()
This commit is contained in:
Manuel Pégourié-Gonnard 2025-08-01 11:59:51 +02:00 committed by GitHub
commit 362174105c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 7 deletions

View File

@ -1827,7 +1827,7 @@ static psa_status_t mbedtls_ssl_set_hs_ecjpake_password_common(
256));
psa_pake_cs_set_hash(&cipher_suite, PSA_ALG_SHA_256);
status = psa_pake_setup(&ssl->handshake->psa_pake_ctx, &cipher_suite);
status = psa_pake_setup(&ssl->handshake->psa_pake_ctx, pwd, &cipher_suite);
if (status != PSA_SUCCESS) {
return status;
}
@ -1854,11 +1854,6 @@ static psa_status_t mbedtls_ssl_set_hs_ecjpake_password_common(
return status;
}
status = psa_pake_set_password_key(&ssl->handshake->psa_pake_ctx, pwd);
if (status != PSA_SUCCESS) {
return status;
}
ssl->handshake->psa_pake_ctx_is_ok = 1;
return PSA_SUCCESS;

@ -1 +1 @@
Subproject commit 5df033ee3cb9e0c05262bc57b821ca20b9483b54
Subproject commit fc1dca61954ee58701a47ba24cc27004e05440b2