coffee/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2026-07-30 16:26:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

TF-PSA-Crypto submodule link fixup

Browse Source 
Signed-off-by: Anton Matkin <anton.matkin@arm.com>
This commit is contained in:
Anton Matkin 2025-03-10 18:51:20 +01:00
parent 5b74c79f00
commit 1b70084bd9
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/ssl_tls.c
View File

@ -1753,12 +1753,11 @@ static psa_status_t mbedtls_ssl_set_hs_ecjpake_password_common(
size_t user_len = 0;
const uint8_t *peer = NULL;
size_t peer_len = 0;
psa_pake_cs_set_algorithm(&cipher_suite, PSA_ALG_JPAKE);
psa_pake_cs_set_algorithm(&cipher_suite, PSA_ALG_JPAKE(PSA_ALG_SHA_256));
psa_pake_cs_set_primitive(&cipher_suite,
PSA_PAKE_PRIMITIVE(PSA_PAKE_PRIMITIVE_TYPE_ECC,
PSA_ECC_FAMILY_SECP_R1,
256));
psa_pake_cs_set_hash(&cipher_suite, PSA_ALG_SHA_256);
status = psa_pake_setup(&ssl->handshake->psa_pake_ctx, pwd, &cipher_suite);
if (status != PSA_SUCCESS) {
@ -1809,7 +1808,7 @@ int mbedtls_ssl_set_hs_ecjpake_password(mbedtls_ssl_context *ssl,
}
psa_set_key_usage_flags(&attributes, PSA_KEY_USAGE_DERIVE);
psa_set_key_algorithm(&attributes, PSA_ALG_JPAKE);
psa_set_key_algorithm(&attributes, PSA_ALG_JPAKE_BASE);
psa_set_key_type(&attributes, PSA_KEY_TYPE_PASSWORD);
status = psa_import_key(&attributes, pw, pw_len,

2
programs/ssl/ssl_client2.c
View File

@ -2059,7 +2059,7 @@ usage:
psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
psa_set_key_usage_flags(&attributes, PSA_KEY_USAGE_DERIVE);
psa_set_key_algorithm(&attributes, PSA_ALG_JPAKE);
psa_set_key_algorithm(&attributes, PSA_ALG_JPAKE_BASE);
psa_set_key_type(&attributes, PSA_KEY_TYPE_PASSWORD);
status = psa_import_key(&attributes,

2
programs/ssl/ssl_server2.c
View File

@ -3336,7 +3336,7 @@ reset:
psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
psa_set_key_usage_flags(&attributes, PSA_KEY_USAGE_DERIVE);
psa_set_key_algorithm(&attributes, PSA_ALG_JPAKE);
psa_set_key_algorithm(&attributes, PSA_ALG_JPAKE_BASE);
psa_set_key_type(&attributes, PSA_KEY_TYPE_PASSWORD);
status = psa_import_key(&attributes,

2
tests/suites/test_suite_ssl.function
View File

@ -3973,7 +3973,7 @@ void ssl_ecjpake_set_password(int use_opaque_arg)
/* First try with an invalid usage */
psa_set_key_usage_flags(&attributes, PSA_KEY_USAGE_SIGN_HASH);
psa_set_key_algorithm(&attributes, PSA_ALG_JPAKE);
psa_set_key_algorithm(&attributes, PSA_ALG_JPAKE_BASE);
psa_set_key_type(&attributes, PSA_KEY_TYPE_PASSWORD);
PSA_ASSERT(psa_import_key(&attributes, pwd_string,

2
tf-psa-crypto

@ -1 +1 @@
Subproject commit 71adc72ae31bd6096741955be12422d41355c5fb
Subproject commit bd17dc8bcc4cbb00c7bd3481a107a2b0e940d277