mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2026-10-01 22:47:23 +00:00
Merge pull request #10077 from amtkarm1/iss9320
Combine psa_pake_set_password_key() with psa_pake_setup()
This commit is contained in:
+1
-6
@@ -1827,7 +1827,7 @@ static psa_status_t mbedtls_ssl_set_hs_ecjpake_password_common(
|
|||||||
256));
|
256));
|
||||||
psa_pake_cs_set_hash(&cipher_suite, PSA_ALG_SHA_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) {
|
if (status != PSA_SUCCESS) {
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
@@ -1854,11 +1854,6 @@ static psa_status_t mbedtls_ssl_set_hs_ecjpake_password_common(
|
|||||||
return status;
|
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;
|
ssl->handshake->psa_pake_ctx_is_ok = 1;
|
||||||
|
|
||||||
return PSA_SUCCESS;
|
return PSA_SUCCESS;
|
||||||
|
|||||||
+1
-1
Submodule tf-psa-crypto updated: 5df033ee3c...fc1dca6195
Reference in New Issue
Block a user