lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-29 11:41:15 +03:00
Code Activity

Use local macros for j-pake slient/server strings

Browse Source 
Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
This commit is contained in:
Przemek Stekiel
2023-03-06 15:40:35 +01:00
parent aa1834254e
commit 18cd6c908c
5 changed files with 49 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
library/psa_crypto.c
View File

@ -91,6 +91,10 @@
#define BUILTIN_ALG_ANY_HKDF 1
#endif
/* JPAKE user/peer ids. */
#define JPAKE_SERVER_ID "server"
#define JPAKE_CLIENT_ID "client"
/****************************************************************/
/* Global data, support functions and library management */
/****************************************************************/
@ -7402,8 +7406,8 @@ psa_status_t psa_pake_set_user(
}
/* Allow only "client" or "server" values (temporary restriction). */
if (memcmp(peer_id, PSA_JPAKE_SERVER_ID, peer_id_len) != 0 &&
memcmp(peer_id, PSA_JPAKE_CLIENT_ID, peer_id_len) != 0) {
if (memcmp(user_id, JPAKE_SERVER_ID, user_id_len) != 0 &&
memcmp(user_id, JPAKE_CLIENT_ID, user_id_len) != 0) {
status = PSA_ERROR_NOT_SUPPORTED;
goto exit;
}
@ -7446,8 +7450,8 @@ psa_status_t psa_pake_set_peer(
}
/* Allow only "client" or "server" values (temporary restriction). */
if (memcmp(user_id, PSA_JPAKE_SERVER_ID, user_id_len) != 0 &&
memcmp(user_id, PSA_JPAKE_CLIENT_ID, user_id_len) != 0) {
if (memcmp(peer_id, JPAKE_SERVER_ID, peer_id_len) != 0 &&
memcmp(peer_id, JPAKE_CLIENT_ID, peer_id_len) != 0) {
status = PSA_ERROR_NOT_SUPPORTED;
goto exit;
}
@ -7568,12 +7572,12 @@ static psa_status_t psa_pake_complete_inputs(
}
if (operation->alg == PSA_ALG_JPAKE) {
if (memcmp(inputs.user, PSA_JPAKE_CLIENT_ID, inputs.user_len) == 0 &&
memcmp(inputs.peer, PSA_JPAKE_SERVER_ID, inputs.peer_len) == 0) {
if (memcmp(inputs.user, JPAKE_CLIENT_ID, inputs.user_len) == 0 &&
memcmp(inputs.peer, JPAKE_SERVER_ID, inputs.peer_len) == 0) {
inputs.role = PSA_PAKE_ROLE_CLIENT;
} else
if (memcmp(inputs.user, PSA_JPAKE_SERVER_ID, inputs.user_len) == 0 &&
memcmp(inputs.peer, PSA_JPAKE_CLIENT_ID, inputs.peer_len) == 0) {
if (memcmp(inputs.user, JPAKE_SERVER_ID, inputs.user_len) == 0 &&
memcmp(inputs.peer, JPAKE_CLIENT_ID, inputs.peer_len) == 0) {
inputs.role = PSA_PAKE_ROLE_SERVER;
}

20
library/ssl_tls.c
View File

@ -61,6 +61,10 @@
psa_generic_status_to_mbedtls)
#endif
/* JPAKE user/peer ids. */
#define JPAKE_SERVER_ID "server"
#define JPAKE_CLIENT_ID "client"
#if defined(MBEDTLS_TEST_HOOKS)
static mbedtls_ssl_chk_buf_ptr_args chk_buf_ptr_fail_args;
@ -1972,15 +1976,15 @@ static psa_status_t mbedtls_ssl_set_hs_ecjpake_password_common(
}
if (ssl->conf->endpoint == MBEDTLS_SSL_IS_SERVER) {
user = (uint8_t *) PSA_JPAKE_SERVER_ID;
user_len = strlen(PSA_JPAKE_SERVER_ID);
peer = (uint8_t *) PSA_JPAKE_CLIENT_ID;
peer_len = strlen(PSA_JPAKE_CLIENT_ID);
user = (uint8_t *) JPAKE_SERVER_ID;
user_len = strlen(JPAKE_SERVER_ID);
peer = (uint8_t *) JPAKE_CLIENT_ID;
peer_len = strlen(JPAKE_CLIENT_ID);
} else {
user = (uint8_t *) PSA_JPAKE_CLIENT_ID;
user_len = strlen(PSA_JPAKE_CLIENT_ID);
peer = (uint8_t *) PSA_JPAKE_SERVER_ID;
peer_len = strlen(PSA_JPAKE_SERVER_ID);
user = (uint8_t *) JPAKE_CLIENT_ID;
user_len = strlen(JPAKE_CLIENT_ID);
peer = (uint8_t *) JPAKE_SERVER_ID;
peer_len = strlen(JPAKE_SERVER_ID);
}
status = psa_pake_set_user(&ssl->handshake->psa_pake_ctx, user, user_len);