yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Code optimizations and documentation fixes

Browse source 
Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
This commit is contained in:
Przemek Stekiel 2023-03-13 16:06:09 +01:00
parent a11c1d141e
commit fde112830f
5 changed files with 56 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/psa/crypto_extra.h
View file

@ -1562,7 +1562,7 @@ psa_status_t psa_pake_set_password_key(psa_pake_operation_t *operation,
* been set (psa_pake_set_user() hasn't been * been set (psa_pake_set_user() hasn't been
* called yet). * called yet).
* \param[in] user_id The user ID to authenticate with. * \param[in] user_id The user ID to authenticate with.
* ("client" or "server") * (temporary limitation: "client" or "server" only)
* \param user_id_len Size of the \p user_id buffer in bytes. * \param user_id_len Size of the \p user_id buffer in bytes.
* *
* \retval #PSA_SUCCESS * \retval #PSA_SUCCESS
@ -1604,7 +1604,7 @@ psa_status_t psa_pake_set_user(psa_pake_operation_t *operation,
* been set (psa_pake_set_peer() hasn't been * been set (psa_pake_set_peer() hasn't been
* called yet). * called yet).
* \param[in] peer_id The peer's ID to authenticate. * \param[in] peer_id The peer's ID to authenticate.
* ("client" or "server") * (temporary limitation: "client" or "server" only)
* \param peer_id_len Size of the \p peer_id buffer in bytes. * \param peer_id_len Size of the \p peer_id buffer in bytes.
* *
* \retval #PSA_SUCCESS * \retval #PSA_SUCCESS

35
library/psa_crypto.c
View file

@ -91,9 +91,9 @@
#define BUILTIN_ALG_ANY_HKDF 1 #define BUILTIN_ALG_ANY_HKDF 1
#endif #endif
/* JPAKE user/peer ids. */ /* The only two JPAKE user/peer identifiers supported for the time being. */
#define JPAKE_SERVER_ID "server" static const uint8_t jpake_server_id[] = { 's', 'e', 'r', 'v', 'e', 'r' };
#define JPAKE_CLIENT_ID "client" static const uint8_t jpake_client_id[] = { 'c', 'l', 'i', 'e', 'n', 't' };
/****************************************************************/ /****************************************************************/
/* Global data, support functions and library management */ /* Global data, support functions and library management */
@ -7406,8 +7406,10 @@ psa_status_t psa_pake_set_user(
} }
/* Allow only "client" or "server" values (temporary restriction). */ /* Allow only "client" or "server" values (temporary restriction). */
if (memcmp(user_id, JPAKE_SERVER_ID, user_id_len) != 0 && if ((user_id_len != sizeof(jpake_server_id) ||
memcmp(user_id, JPAKE_CLIENT_ID, user_id_len) != 0) { memcmp(user_id, jpake_server_id, user_id_len) != 0) &&
(user_id_len != sizeof(jpake_client_id) ||
memcmp(user_id, jpake_client_id, user_id_len) != 0)) {
status = PSA_ERROR_NOT_SUPPORTED; status = PSA_ERROR_NOT_SUPPORTED;
goto exit; goto exit;
} }
@ -7450,8 +7452,10 @@ psa_status_t psa_pake_set_peer(
} }
/* Allow only "client" or "server" values (temporary restriction). */ /* Allow only "client" or "server" values (temporary restriction). */
if (memcmp(peer_id, JPAKE_SERVER_ID, peer_id_len) != 0 && if ((peer_id_len != sizeof(jpake_server_id) ||
memcmp(peer_id, JPAKE_CLIENT_ID, peer_id_len) != 0) { memcmp(peer_id, jpake_server_id, peer_id_len) != 0) &&
(peer_id_len != sizeof(jpake_client_id) ||
memcmp(peer_id, jpake_client_id, peer_id_len) != 0)) {
status = PSA_ERROR_NOT_SUPPORTED; status = PSA_ERROR_NOT_SUPPORTED;
goto exit; goto exit;
} }
@ -7565,19 +7569,20 @@ static psa_status_t psa_pake_complete_inputs(
with the driver context which will be setup by the driver. */ with the driver context which will be setup by the driver. */
psa_crypto_driver_pake_inputs_t inputs = operation->data.inputs; psa_crypto_driver_pake_inputs_t inputs = operation->data.inputs;
if (inputs.password_len == 0 || if (inputs.password_len == 0) {
inputs.user_len == 0 ||
inputs.peer_len == 0) {
return PSA_ERROR_BAD_STATE; return PSA_ERROR_BAD_STATE;
} }
if (operation->alg == PSA_ALG_JPAKE) { if (operation->alg == PSA_ALG_JPAKE) {
if (memcmp(inputs.user, JPAKE_CLIENT_ID, inputs.user_len) == 0 && if (inputs.user_len == 0 || inputs.peer_len == 0) {
memcmp(inputs.peer, JPAKE_SERVER_ID, inputs.peer_len) == 0) { return PSA_ERROR_BAD_STATE;
}
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; inputs.role = PSA_PAKE_ROLE_CLIENT;
} else } else
if (memcmp(inputs.user, JPAKE_SERVER_ID, inputs.user_len) == 0 && if (memcmp(inputs.user, jpake_server_id, inputs.user_len) == 0 &&
memcmp(inputs.peer, JPAKE_CLIENT_ID, inputs.peer_len) == 0) { memcmp(inputs.peer, jpake_client_id, inputs.peer_len) == 0) {
inputs.role = PSA_PAKE_ROLE_SERVER; inputs.role = PSA_PAKE_ROLE_SERVER;
} }
@ -7599,8 +7604,6 @@ static psa_status_t psa_pake_complete_inputs(
/* User and peer are translated to role. */ /* User and peer are translated to role. */
mbedtls_free(inputs.user); mbedtls_free(inputs.user);
mbedtls_free(inputs.peer); mbedtls_free(inputs.peer);
inputs.user = NULL; inputs.user_len = 0;
inputs.peer = NULL; inputs.peer_len = 0;
if (status == PSA_SUCCESS) { if (status == PSA_SUCCESS) {
#if defined(PSA_WANT_ALG_JPAKE) #if defined(PSA_WANT_ALG_JPAKE)

28
library/ssl_tls.c
View file

@ -61,10 +61,6 @@
psa_generic_status_to_mbedtls) psa_generic_status_to_mbedtls)
#endif #endif
/* JPAKE user/peer ids. */
#define JPAKE_SERVER_ID "server"
#define JPAKE_CLIENT_ID "client"
#if defined(MBEDTLS_TEST_HOOKS) #if defined(MBEDTLS_TEST_HOOKS)
static mbedtls_ssl_chk_buf_ptr_args chk_buf_ptr_fail_args; static mbedtls_ssl_chk_buf_ptr_args chk_buf_ptr_fail_args;
@ -1953,15 +1949,19 @@ void mbedtls_ssl_set_verify(mbedtls_ssl_context *ssl,
#if defined(MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED) #if defined(MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED)
#if defined(MBEDTLS_USE_PSA_CRYPTO) #if defined(MBEDTLS_USE_PSA_CRYPTO)
/* The only two JPAKE user/peer identifiers supported for the time being. */
static const uint8_t jpake_server_id[] = { 's', 'e', 'r', 'v', 'e', 'r' };
static const uint8_t jpake_client_id[] = { 'c', 'l', 'i', 'e', 'n', 't' };
static psa_status_t mbedtls_ssl_set_hs_ecjpake_password_common( static psa_status_t mbedtls_ssl_set_hs_ecjpake_password_common(
mbedtls_ssl_context *ssl, mbedtls_ssl_context *ssl,
mbedtls_svc_key_id_t pwd) mbedtls_svc_key_id_t pwd)
{ {
psa_status_t status; psa_status_t status;
psa_pake_cipher_suite_t cipher_suite = psa_pake_cipher_suite_init(); psa_pake_cipher_suite_t cipher_suite = psa_pake_cipher_suite_init();
uint8_t *user = NULL; const uint8_t *user = NULL;
size_t user_len = 0; size_t user_len = 0;
uint8_t *peer = NULL; const uint8_t *peer = NULL;
size_t peer_len = 0; 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_pake_cs_set_primitive(&cipher_suite, psa_pake_cs_set_primitive(&cipher_suite,
@ -1976,15 +1976,15 @@ static psa_status_t mbedtls_ssl_set_hs_ecjpake_password_common(
} }
if (ssl->conf->endpoint == MBEDTLS_SSL_IS_SERVER) { if (ssl->conf->endpoint == MBEDTLS_SSL_IS_SERVER) {
user = (uint8_t *) JPAKE_SERVER_ID; user = jpake_server_id;
user_len = strlen(JPAKE_SERVER_ID); user_len = sizeof(jpake_server_id);
peer = (uint8_t *) JPAKE_CLIENT_ID; peer = jpake_client_id;
peer_len = strlen(JPAKE_CLIENT_ID); peer_len = sizeof(jpake_client_id);
} else { } else {
user = (uint8_t *) JPAKE_CLIENT_ID; user = jpake_client_id;
user_len = strlen(JPAKE_CLIENT_ID); user_len = sizeof(jpake_client_id);
peer = (uint8_t *) JPAKE_SERVER_ID; peer = jpake_server_id;
peer_len = strlen(JPAKE_SERVER_ID); peer_len = sizeof(jpake_server_id);
} }
status = psa_pake_set_user(&ssl->handshake->psa_pake_ctx, user, user_len); status = psa_pake_set_user(&ssl->handshake->psa_pake_ctx, user, user_len);

26
tests/suites/test_suite_psa_crypto_driver_wrappers.function
View file

@ -6,9 +6,9 @@
size_t pake_expected_hit_count = 0; size_t pake_expected_hit_count = 0;
int pake_in_driver = 0; int pake_in_driver = 0;
/* JPAKE user/peer ids. */ /* The only two JPAKE user/peer identifiers supported for the time being. */
#define JPAKE_SERVER_ID "server" static const uint8_t jpake_server_id[] = { 's', 'e', 'r', 'v', 'e', 'r' };
#define JPAKE_CLIENT_ID "client" static const uint8_t jpake_client_id[] = { 'c', 'l', 'i', 'e', 'n', 't' };
#if defined(PSA_WANT_ALG_JPAKE) && defined(PSA_WANT_KEY_TYPE_ECC_KEY_PAIR) && \ #if defined(PSA_WANT_ALG_JPAKE) && defined(PSA_WANT_KEY_TYPE_ECC_KEY_PAIR) && \
defined(PSA_WANT_ECC_SECP_R1_256) && defined(PSA_WANT_ALG_SHA_256) defined(PSA_WANT_ECC_SECP_R1_256) && defined(PSA_WANT_ALG_SHA_256)
@ -2999,10 +2999,6 @@ void pake_operations(data_t *pw_data, int forced_status_setup_arg, int forced_st
PSA_ECC_FAMILY_SECP_R1, 256); PSA_ECC_FAMILY_SECP_R1, 256);
psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT; psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
unsigned char *input_buffer = NULL; unsigned char *input_buffer = NULL;
const uint8_t server_id[] = JPAKE_SERVER_ID;
const uint8_t client_id[] = JPAKE_CLIENT_ID;
const size_t server_id_len = strlen(JPAKE_SERVER_ID);
const size_t client_id_len = strlen(JPAKE_CLIENT_ID);
const size_t size_key_share = PSA_PAKE_INPUT_SIZE(PSA_ALG_JPAKE, primitive, const size_t size_key_share = PSA_PAKE_INPUT_SIZE(PSA_ALG_JPAKE, primitive,
PSA_PAKE_STEP_KEY_SHARE); PSA_PAKE_STEP_KEY_SHARE);
unsigned char *output_buffer = NULL; unsigned char *output_buffer = NULL;
@ -3044,8 +3040,8 @@ void pake_operations(data_t *pw_data, int forced_status_setup_arg, int forced_st
TEST_EQUAL(psa_pake_setup(&operation, &cipher_suite), TEST_EQUAL(psa_pake_setup(&operation, &cipher_suite),
PSA_SUCCESS); PSA_SUCCESS);
PSA_ASSERT(psa_pake_set_user(&operation, server_id, server_id_len)); PSA_ASSERT(psa_pake_set_user(&operation, jpake_server_id, sizeof(jpake_server_id)));
PSA_ASSERT(psa_pake_set_peer(&operation, client_id, client_id_len)); PSA_ASSERT(psa_pake_set_peer(&operation, jpake_client_id, sizeof(jpake_client_id)));
TEST_EQUAL(psa_pake_set_password_key(&operation, key), TEST_EQUAL(psa_pake_set_password_key(&operation, key),
PSA_SUCCESS); PSA_SUCCESS);
@ -3193,10 +3189,6 @@ void ecjpake_rounds(int alg_arg, int primitive_arg, int hash_arg,
PSA_KEY_DERIVATION_OPERATION_INIT; PSA_KEY_DERIVATION_OPERATION_INIT;
psa_key_derivation_operation_t client_derive = psa_key_derivation_operation_t client_derive =
PSA_KEY_DERIVATION_OPERATION_INIT; PSA_KEY_DERIVATION_OPERATION_INIT;
const uint8_t server_id[] = JPAKE_SERVER_ID;
const uint8_t client_id[] = JPAKE_CLIENT_ID;
const size_t server_id_len = strlen(JPAKE_SERVER_ID);
const size_t client_id_len = strlen(JPAKE_CLIENT_ID);
pake_in_driver = in_driver; pake_in_driver = in_driver;
/* driver setup is called indirectly through pake_output/pake_input */ /* driver setup is called indirectly through pake_output/pake_input */
if (pake_in_driver) { if (pake_in_driver) {
@ -3242,11 +3234,11 @@ void ecjpake_rounds(int alg_arg, int primitive_arg, int hash_arg,
TEST_EQUAL(mbedtls_test_driver_pake_hooks.hits.total, 0); TEST_EQUAL(mbedtls_test_driver_pake_hooks.hits.total, 0);
PSA_ASSERT(psa_pake_set_user(&server, server_id, server_id_len)); PSA_ASSERT(psa_pake_set_user(&server, jpake_server_id, sizeof(jpake_server_id)));
PSA_ASSERT(psa_pake_set_peer(&server, client_id, client_id_len)); PSA_ASSERT(psa_pake_set_peer(&server, jpake_client_id, sizeof(jpake_client_id)));
TEST_EQUAL(mbedtls_test_driver_pake_hooks.hits.total, 0); TEST_EQUAL(mbedtls_test_driver_pake_hooks.hits.total, 0);
PSA_ASSERT(psa_pake_set_user(&client, client_id, client_id_len)); PSA_ASSERT(psa_pake_set_user(&client, jpake_client_id, sizeof(jpake_client_id)));
PSA_ASSERT(psa_pake_set_peer(&client, server_id, server_id_len)); PSA_ASSERT(psa_pake_set_peer(&client, jpake_server_id, sizeof(jpake_server_id)));
TEST_EQUAL(mbedtls_test_driver_pake_hooks.hits.total, 0); TEST_EQUAL(mbedtls_test_driver_pake_hooks.hits.total, 0);
PSA_ASSERT(psa_pake_set_password_key(&server, key)); PSA_ASSERT(psa_pake_set_password_key(&server, key));
TEST_EQUAL(mbedtls_test_driver_pake_hooks.hits.total, 0); TEST_EQUAL(mbedtls_test_driver_pake_hooks.hits.total, 0);

32
tests/suites/test_suite_psa_crypto_pake.function
View file

@ -53,9 +53,9 @@ typedef enum {
PAKE_ROUND_TWO PAKE_ROUND_TWO
} pake_round_t; } pake_round_t;
/* JPAKE user/peer ids. */ /* The only two JPAKE user/peer identifiers supported for the time being. */
#define JPAKE_SERVER_ID "server" static const uint8_t jpake_server_id[] = { 's', 'e', 'r', 'v', 'e', 'r' };
#define JPAKE_CLIENT_ID "client" static const uint8_t jpake_client_id[] = { 'c', 'l', 'i', 'e', 'n', 't' };
/* /*
* Inject an error on the specified buffer ONLY it this is the correct stage. * Inject an error on the specified buffer ONLY it this is the correct stage.
@ -737,10 +737,6 @@ void ecjpake_rounds_inject(int alg_arg, int primitive_arg, int hash_arg,
mbedtls_svc_key_id_t key = MBEDTLS_SVC_KEY_ID_INIT; mbedtls_svc_key_id_t key = MBEDTLS_SVC_KEY_ID_INIT;
psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT; psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
ecjpake_error_stage_t err_stage = err_stage_arg; ecjpake_error_stage_t err_stage = err_stage_arg;
const uint8_t server_id[] = JPAKE_SERVER_ID;
const uint8_t client_id[] = JPAKE_CLIENT_ID;
const size_t server_id_len = strlen(JPAKE_SERVER_ID);
const size_t client_id_len = strlen(JPAKE_CLIENT_ID);
PSA_INIT(); PSA_INIT();
@ -758,10 +754,10 @@ void ecjpake_rounds_inject(int alg_arg, int primitive_arg, int hash_arg,
PSA_ASSERT(psa_pake_setup(&server, &cipher_suite)); PSA_ASSERT(psa_pake_setup(&server, &cipher_suite));
PSA_ASSERT(psa_pake_setup(&client, &cipher_suite)); PSA_ASSERT(psa_pake_setup(&client, &cipher_suite));
PSA_ASSERT(psa_pake_set_user(&server, server_id, server_id_len)); PSA_ASSERT(psa_pake_set_user(&server, jpake_server_id, sizeof(jpake_server_id)));
PSA_ASSERT(psa_pake_set_peer(&server, client_id, client_id_len)); PSA_ASSERT(psa_pake_set_peer(&server, jpake_client_id, sizeof(jpake_client_id)));
PSA_ASSERT(psa_pake_set_user(&client, client_id, client_id_len)); PSA_ASSERT(psa_pake_set_user(&client, jpake_client_id, sizeof(jpake_client_id)));
PSA_ASSERT(psa_pake_set_peer(&client, server_id, server_id_len)); PSA_ASSERT(psa_pake_set_peer(&client, jpake_server_id, sizeof(jpake_server_id)));
PSA_ASSERT(psa_pake_set_password_key(&server, key)); PSA_ASSERT(psa_pake_set_password_key(&server, key));
PSA_ASSERT(psa_pake_set_password_key(&client, key)); PSA_ASSERT(psa_pake_set_password_key(&client, key));
@ -805,10 +801,6 @@ void ecjpake_rounds(int alg_arg, int primitive_arg, int hash_arg,
psa_key_derivation_operation_t client_derive = psa_key_derivation_operation_t client_derive =
PSA_KEY_DERIVATION_OPERATION_INIT; PSA_KEY_DERIVATION_OPERATION_INIT;
ecjpake_error_stage_t err_stage = err_stage_arg; ecjpake_error_stage_t err_stage = err_stage_arg;
const uint8_t server_id[] = JPAKE_SERVER_ID;
const uint8_t client_id[] = JPAKE_CLIENT_ID;
const size_t server_id_len = strlen(JPAKE_SERVER_ID);
const size_t client_id_len = strlen(JPAKE_CLIENT_ID);
PSA_INIT(); PSA_INIT();
@ -839,10 +831,10 @@ void ecjpake_rounds(int alg_arg, int primitive_arg, int hash_arg,
PSA_ASSERT(psa_pake_setup(&server, &cipher_suite)); PSA_ASSERT(psa_pake_setup(&server, &cipher_suite));
PSA_ASSERT(psa_pake_setup(&client, &cipher_suite)); PSA_ASSERT(psa_pake_setup(&client, &cipher_suite));
PSA_ASSERT(psa_pake_set_user(&server, server_id, server_id_len)); PSA_ASSERT(psa_pake_set_user(&server, jpake_server_id, sizeof(jpake_server_id)));
PSA_ASSERT(psa_pake_set_peer(&server, client_id, client_id_len)); PSA_ASSERT(psa_pake_set_peer(&server, jpake_client_id, sizeof(jpake_client_id)));
PSA_ASSERT(psa_pake_set_user(&client, client_id, client_id_len)); PSA_ASSERT(psa_pake_set_user(&client, jpake_client_id, sizeof(jpake_client_id)));
PSA_ASSERT(psa_pake_set_peer(&client, server_id, server_id_len)); PSA_ASSERT(psa_pake_set_peer(&client, jpake_server_id, sizeof(jpake_server_id)));
PSA_ASSERT(psa_pake_set_password_key(&server, key)); PSA_ASSERT(psa_pake_set_password_key(&server, key));
PSA_ASSERT(psa_pake_set_password_key(&client, key)); PSA_ASSERT(psa_pake_set_password_key(&client, key));
@ -1056,7 +1048,7 @@ void pake_input_getters_role()
PSA_ERROR_BAD_STATE); PSA_ERROR_BAD_STATE);
/* Role can not be set directly using psa_pake_set_role(). It is set by the core /* Role can not be set directly using psa_pake_set_role(). It is set by the core
based on given user/peer. Simulate that Role is already set. */ based on given user/peer identifiers. Simulate that Role is already set. */
operation.data.inputs.role = PSA_PAKE_ROLE_SERVER; operation.data.inputs.role = PSA_PAKE_ROLE_SERVER;
TEST_EQUAL(psa_crypto_driver_pake_get_role(&operation.data.inputs, &role_ret), TEST_EQUAL(psa_crypto_driver_pake_get_role(&operation.data.inputs, &role_ret),
PSA_SUCCESS); PSA_SUCCESS);