lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-08-01 10:06:53 +03:00
Code Activity

Adapt pake impl for driver dispatch

Browse Source 
Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
This commit is contained in:
Przemek Stekiel
2022-11-22 14:05:12 +01:00
parent d91bcb7673
commit 6c7644150a
3 changed files with 138 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
library/psa_crypto.c
View File

@ -5072,13 +5072,13 @@ psa_status_t psa_key_derivation_abort(psa_key_derivation_operation_t *operation)
operation->ctx.tls12_prf.label_length); operation->ctx.tls12_prf.label_length);
mbedtls_free(operation->ctx.tls12_prf.label); mbedtls_free(operation->ctx.tls12_prf.label);
} }
#if defined(MBEDTLS_PSA_BUILTIN_ALG_TLS12_PSK_TO_MS)
if (operation->ctx.tls12_prf.other_secret != NULL) { if (operation->ctx.tls12_prf.other_secret != NULL) {
mbedtls_platform_zeroize(operation->ctx.tls12_prf.other_secret, mbedtls_platform_zeroize(operation->ctx.tls12_prf.other_secret,
operation->ctx.tls12_prf.other_secret_length); operation->ctx.tls12_prf.other_secret_length);
mbedtls_free(operation->ctx.tls12_prf.other_secret); mbedtls_free(operation->ctx.tls12_prf.other_secret);
} }
#endif /* MBEDTLS_PSA_BUILTIN_ALG_TLS12_PSK_TO_MS */
status = PSA_SUCCESS; status = PSA_SUCCESS;
/* We leave the fields Ai and output_block to be erased safely by the /* We leave the fields Ai and output_block to be erased safely by the
@ -7163,24 +7163,10 @@ exit:
return status; return status;
} }
#if defined(MBEDTLS_PSA_BUILTIN_PAKE)
psa_status_t psa_pake_setup( psa_status_t psa_pake_setup(
psa_pake_operation_t *operation, psa_pake_operation_t *operation,
const psa_pake_cipher_suite_t *cipher_suite) const psa_pake_cipher_suite_t *cipher_suite)
{ {
/* A context must be freshly initialized before it can be set up. */
if (operation->alg != PSA_ALG_NONE) {
return PSA_ERROR_BAD_STATE;
}
if (cipher_suite == NULL ||
PSA_ALG_IS_PAKE(cipher_suite->algorithm) == 0 ||
(cipher_suite->type != PSA_PAKE_PRIMITIVE_TYPE_ECC &&
cipher_suite->type != PSA_PAKE_PRIMITIVE_TYPE_DH) ||
PSA_ALG_IS_HASH(cipher_suite->hash) == 0) {
return PSA_ERROR_INVALID_ARGUMENT;
}
return psa_driver_wrapper_pake_setup(operation, cipher_suite); return psa_driver_wrapper_pake_setup(operation, cipher_suite);
} }
@ -7189,34 +7175,30 @@ psa_status_t psa_pake_set_password_key(
mbedtls_svc_key_id_t password) mbedtls_svc_key_id_t password)
{ {
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED; psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
psa_key_attributes_t attributes = psa_key_attributes_init(); psa_status_t unlock_status = PSA_ERROR_CORRUPTION_DETECTED;
psa_key_type_t type; psa_key_slot_t *slot = NULL;
psa_key_usage_t usage;
if (operation->alg == PSA_ALG_NONE) { if (operation->id == 0) {
return PSA_ERROR_BAD_STATE; return PSA_ERROR_BAD_STATE;
} }
status = psa_get_key_attributes(password, &attributes); status = psa_get_and_lock_key_slot_with_policy(password, &slot,
PSA_KEY_USAGE_DERIVE,
PSA_ALG_JPAKE);
if (status != PSA_SUCCESS) { if (status != PSA_SUCCESS) {
return status; return status;
} }
type = psa_get_key_type(&attributes); psa_key_attributes_t attributes = {
usage = psa_get_key_usage_flags(&attributes); .core = slot->attr
};
psa_reset_key_attributes(&attributes); status = psa_driver_wrapper_pake_set_password_key(&attributes, operation,
slot->key.data, slot->key.bytes);
if (type != PSA_KEY_TYPE_PASSWORD && unlock_status = psa_unlock_key_slot(slot);
type != PSA_KEY_TYPE_PASSWORD_HASH) {
return PSA_ERROR_INVALID_ARGUMENT;
}
if ((usage & PSA_KEY_USAGE_DERIVE) == 0) { return (status == PSA_SUCCESS) ? unlock_status : status;
return PSA_ERROR_NOT_PERMITTED;
}
return psa_driver_wrapper_pake_set_password_key(operation, password);
} }
psa_status_t psa_pake_set_user( psa_status_t psa_pake_set_user(
@ -7224,7 +7206,7 @@ psa_status_t psa_pake_set_user(
const uint8_t *user_id, const uint8_t *user_id,
size_t user_id_len) size_t user_id_len)
{ {
if (operation->alg == PSA_ALG_NONE) { if (operation->id == 0) {
return PSA_ERROR_BAD_STATE; return PSA_ERROR_BAD_STATE;
} }
@ -7241,7 +7223,7 @@ psa_status_t psa_pake_set_peer(
const uint8_t *peer_id, const uint8_t *peer_id,
size_t peer_id_len) size_t peer_id_len)
{ {
if (operation->alg == PSA_ALG_NONE) { if (operation->id == 0) {
return PSA_ERROR_BAD_STATE; return PSA_ERROR_BAD_STATE;
} }
@ -7257,7 +7239,7 @@ psa_status_t psa_pake_set_role(
psa_pake_operation_t *operation, psa_pake_operation_t *operation,
psa_pake_role_t role) psa_pake_role_t role)
{ {
if (operation->alg == PSA_ALG_NONE) { if (operation->id == 0) {
return PSA_ERROR_BAD_STATE; return PSA_ERROR_BAD_STATE;
} }
@ -7279,7 +7261,7 @@ psa_status_t psa_pake_output(
size_t output_size, size_t output_size,
size_t *output_length) size_t *output_length)
{ {
if (operation->alg == PSA_ALG_NONE) { if (operation->id == 0) {
return PSA_ERROR_BAD_STATE; return PSA_ERROR_BAD_STATE;
} }
@ -7297,7 +7279,7 @@ psa_status_t psa_pake_input(
const uint8_t *input, const uint8_t *input,
size_t input_length) size_t input_length)
{ {
if (operation->alg == PSA_ALG_NONE) { if (operation->id == 0) {
return PSA_ERROR_BAD_STATE; return PSA_ERROR_BAD_STATE;
} }
@ -7313,7 +7295,7 @@ psa_status_t psa_pake_get_implicit_key(
psa_pake_operation_t *operation, psa_pake_operation_t *operation,
psa_key_derivation_operation_t *output) psa_key_derivation_operation_t *output)
{ {
if (operation->alg == PSA_ALG_NONE) { if (operation->id == 0) {
return PSA_ERROR_BAD_STATE; return PSA_ERROR_BAD_STATE;
} }
@ -7323,12 +7305,12 @@ psa_status_t psa_pake_get_implicit_key(
psa_status_t psa_pake_abort( psa_status_t psa_pake_abort(
psa_pake_operation_t *operation) psa_pake_operation_t *operation)
{ {
if (operation->alg == PSA_ALG_NONE) { /* Aborting a non-active operation is allowed */
if (operation->id == 0) {
return PSA_SUCCESS; return PSA_SUCCESS;
} }
return psa_driver_wrapper_pake_abort(operation); return psa_driver_wrapper_pake_abort(operation);
} }
#endif /* MBEDTLS_PSA_BUILTIN_PAKE */
#endif /* MBEDTLS_PSA_CRYPTO_C */ #endif /* MBEDTLS_PSA_CRYPTO_C */

162
library/psa_crypto_pake.c
View File

@ -191,9 +191,26 @@ static psa_status_t mbedtls_ecjpake_to_psa_error(int ret)
#endif #endif
#if defined(MBEDTLS_PSA_BUILTIN_PAKE) #if defined(MBEDTLS_PSA_BUILTIN_PAKE)
psa_status_t mbedtls_psa_pake_setup(psa_pake_operation_t *operation, psa_status_t mbedtls_psa_pake_setup(mbedtls_psa_pake_operation_t *operation,
const psa_pake_cipher_suite_t *cipher_suite) const psa_pake_cipher_suite_t *cipher_suite)
{ {
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
/* A context must be freshly initialized before it can be set up. */
if (operation->alg != PSA_ALG_NONE) {
status = PSA_ERROR_BAD_STATE;
goto error;
}
if (cipher_suite == NULL ||
PSA_ALG_IS_PAKE(cipher_suite->algorithm) == 0 ||
(cipher_suite->type != PSA_PAKE_PRIMITIVE_TYPE_ECC &&
cipher_suite->type != PSA_PAKE_PRIMITIVE_TYPE_DH) ||
PSA_ALG_IS_HASH(cipher_suite->hash) == 0) {
status = PSA_ERROR_INVALID_ARGUMENT;
goto error;
}
#if defined(MBEDTLS_PSA_BUILTIN_ALG_JPAKE) #if defined(MBEDTLS_PSA_BUILTIN_ALG_JPAKE)
if (cipher_suite->algorithm == PSA_ALG_JPAKE) { if (cipher_suite->algorithm == PSA_ALG_JPAKE) {
if (cipher_suite->type != PSA_PAKE_PRIMITIVE_TYPE_ECC || if (cipher_suite->type != PSA_PAKE_PRIMITIVE_TYPE_ECC ||
@ -206,12 +223,14 @@ psa_status_t mbedtls_psa_pake_setup(psa_pake_operation_t *operation,
operation->alg = cipher_suite->algorithm; operation->alg = cipher_suite->algorithm;
mbedtls_ecjpake_init(&operation->ctx.ecjpake); mbedtls_ecjpake_init(&operation->ctx.pake);
operation->state = PSA_PAKE_STATE_SETUP; operation->state = PSA_PAKE_STATE_SETUP;
operation->sequence = PSA_PAKE_SEQ_INVALID; operation->sequence = PSA_PAKE_SEQ_INVALID;
operation->input_step = PSA_PAKE_STEP_X1_X2; operation->input_step = PSA_PAKE_STEP_X1_X2;
operation->output_step = PSA_PAKE_STEP_X1_X2; operation->output_step = PSA_PAKE_STEP_X1_X2;
operation->password_len = 0;
operation->password = NULL;
mbedtls_platform_zeroize(operation->buffer, MBEDTLS_PSA_PAKE_BUFFER_SIZE); mbedtls_platform_zeroize(operation->buffer, MBEDTLS_PSA_PAKE_BUFFER_SIZE);
operation->buffer_length = 0; operation->buffer_length = 0;
@ -230,30 +249,14 @@ error:
return status; return status;
} }
psa_status_t mbedtls_psa_pake_set_password_key(psa_pake_operation_t *operation, psa_status_t mbedtls_psa_pake_set_password_key(const psa_key_attributes_t *attributes,
mbedtls_svc_key_id_t password) mbedtls_psa_pake_operation_t *operation,
uint8_t *password,
size_t password_len)
{ {
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED; psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
psa_key_attributes_t attributes = psa_key_attributes_init(); psa_key_type_t type = psa_get_key_type(attributes);
psa_key_type_t type; psa_key_usage_t usage = psa_get_key_usage_flags(attributes);
psa_key_usage_t usage;
psa_key_slot_t *slot = NULL;
if (operation->alg == PSA_ALG_NONE ||
operation->state != PSA_PAKE_STATE_SETUP) {
status = PSA_ERROR_BAD_STATE;
goto error;
}
status = psa_get_key_attributes(password, &attributes);
if (status != PSA_SUCCESS) {
goto error;
}
type = psa_get_key_type(&attributes);
usage = psa_get_key_usage_flags(&attributes);
psa_reset_key_attributes(&attributes);
if (type != PSA_KEY_TYPE_PASSWORD && if (type != PSA_KEY_TYPE_PASSWORD &&
type != PSA_KEY_TYPE_PASSWORD_HASH) { type != PSA_KEY_TYPE_PASSWORD_HASH) {
@ -266,44 +269,48 @@ psa_status_t mbedtls_psa_pake_set_password_key(psa_pake_operation_t *operation,
goto error; goto error;
} }
if (operation->alg == PSA_ALG_NONE) {
status = PSA_ERROR_BAD_STATE;
goto error;
}
if (operation->state != PSA_PAKE_STATE_SETUP) {
status = PSA_ERROR_BAD_STATE;
goto error;
}
if (operation->password != NULL) { if (operation->password != NULL) {
return PSA_ERROR_BAD_STATE; status = PSA_ERROR_BAD_STATE;
goto error;
} }
status = psa_get_and_lock_key_slot_with_policy(password, &slot, operation->password = mbedtls_calloc(1, password_len);
PSA_KEY_USAGE_DERIVE,
PSA_ALG_JPAKE);
if (status != PSA_SUCCESS) {
return status;
}
operation->password = mbedtls_calloc(1, slot->key.bytes);
if (operation->password == NULL) { if (operation->password == NULL) {
psa_unlock_key_slot(slot);
return PSA_ERROR_INSUFFICIENT_MEMORY; return PSA_ERROR_INSUFFICIENT_MEMORY;
} }
memcpy(operation->password, slot->key.data, slot->key.bytes);
operation->password_len = slot->key.bytes;
status = psa_unlock_key_slot(slot); memcpy(operation->password, password, password_len);
if (status != PSA_SUCCESS) { operation->password_len = password_len;
return status;
}
return PSA_SUCCESS; return PSA_SUCCESS;
error: error:
psa_pake_abort(operation); mbedtls_psa_pake_abort(operation);
return status; return status;
} }
psa_status_t mbedtls_psa_pake_set_user(psa_pake_operation_t *operation, psa_status_t mbedtls_psa_pake_set_user(mbedtls_psa_pake_operation_t *operation,
const uint8_t *user_id, const uint8_t *user_id,
size_t user_id_len) size_t user_id_len)
{ {
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
(void) user_id; (void) user_id;
(void) user_id_len; (void) user_id_len;
if (operation->alg == PSA_ALG_NONE) {
return PSA_ERROR_BAD_STATE;
}
if (operation->state != PSA_PAKE_STATE_SETUP) { if (operation->state != PSA_PAKE_STATE_SETUP) {
status = PSA_ERROR_BAD_STATE; status = PSA_ERROR_BAD_STATE;
goto error; goto error;
@ -316,13 +323,19 @@ error:
return status; return status;
} }
psa_status_t mbedtls_psa_pake_set_peer(psa_pake_operation_t *operation, psa_status_t mbedtls_psa_pake_set_peer(mbedtls_psa_pake_operation_t *operation,
const uint8_t *peer_id, const uint8_t *peer_id,
size_t peer_id_len) size_t peer_id_len)
{ {
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
(void) peer_id; (void) peer_id;
(void) peer_id_len; (void) peer_id_len;
if (operation->alg == PSA_ALG_NONE) {
status = PSA_ERROR_BAD_STATE;
goto error;
}
if (operation->state != PSA_PAKE_STATE_SETUP) { if (operation->state != PSA_PAKE_STATE_SETUP) {
status = PSA_ERROR_BAD_STATE; status = PSA_ERROR_BAD_STATE;
goto error; goto error;
@ -335,9 +348,15 @@ error:
return status; return status;
} }
psa_status_t mbedtls_psa_pake_set_role(psa_pake_operation_t *operation, psa_status_t mbedtls_psa_pake_set_role(mbedtls_psa_pake_operation_t *operation,
psa_pake_role_t role) psa_pake_role_t role)
{ {
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
if (operation->alg == PSA_ALG_NONE) {
status = PSA_ERROR_BAD_STATE;
goto error;
}
if (operation->state != PSA_PAKE_STATE_SETUP) { if (operation->state != PSA_PAKE_STATE_SETUP) {
status = PSA_ERROR_BAD_STATE; status = PSA_ERROR_BAD_STATE;
goto error; goto error;
@ -366,7 +385,7 @@ error:
} }
#if defined(MBEDTLS_PSA_BUILTIN_ALG_JPAKE) #if defined(MBEDTLS_PSA_BUILTIN_ALG_JPAKE)
static psa_status_t psa_pake_ecjpake_setup(psa_pake_operation_t *operation) static psa_status_t psa_pake_ecjpake_setup(mbedtls_psa_pake_operation_t *operation)
{ {
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
mbedtls_ecjpake_role role; mbedtls_ecjpake_role role;
@ -383,7 +402,7 @@ static psa_status_t psa_pake_ecjpake_setup(psa_pake_operation_t *operation)
return PSA_ERROR_BAD_STATE; return PSA_ERROR_BAD_STATE;
} }
ret = mbedtls_ecjpake_setup(&operation->ctx.ecjpake, ret = mbedtls_ecjpake_setup(&operation->ctx.pake,
role, role,
MBEDTLS_MD_SHA256, MBEDTLS_MD_SHA256,
MBEDTLS_ECP_DP_SECP256R1, MBEDTLS_ECP_DP_SECP256R1,
@ -406,7 +425,7 @@ static psa_status_t psa_pake_ecjpake_setup(psa_pake_operation_t *operation)
#endif #endif
static psa_status_t mbedtls_psa_pake_output_internal( static psa_status_t mbedtls_psa_pake_output_internal(
psa_pake_operation_t *operation, mbedtls_psa_pake_operation_t *operation,
psa_pake_step_t step, psa_pake_step_t step,
uint8_t *output, uint8_t *output,
size_t output_size, size_t output_size,
@ -416,6 +435,10 @@ static psa_status_t mbedtls_psa_pake_output_internal(
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED; psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
size_t length; size_t length;
if (operation->alg == PSA_ALG_NONE) {
return PSA_ERROR_BAD_STATE;
}
if (operation->state == PSA_PAKE_STATE_INVALID) { if (operation->state == PSA_PAKE_STATE_INVALID) {
return PSA_ERROR_BAD_STATE; return PSA_ERROR_BAD_STATE;
} }
@ -504,7 +527,7 @@ static psa_status_t mbedtls_psa_pake_output_internal(
/* Initialize & write round on KEY_SHARE sequences */ /* Initialize & write round on KEY_SHARE sequences */
if (operation->state == PSA_PAKE_OUTPUT_X1_X2 && if (operation->state == PSA_PAKE_OUTPUT_X1_X2 &&
operation->sequence == PSA_PAKE_X1_STEP_KEY_SHARE) { operation->sequence == PSA_PAKE_X1_STEP_KEY_SHARE) {
ret = mbedtls_ecjpake_write_round_one(&operation->ctx.ecjpake, ret = mbedtls_ecjpake_write_round_one(&operation->ctx.pake,
operation->buffer, operation->buffer,
MBEDTLS_PSA_PAKE_BUFFER_SIZE, MBEDTLS_PSA_PAKE_BUFFER_SIZE,
&operation->buffer_length, &operation->buffer_length,
@ -517,7 +540,7 @@ static psa_status_t mbedtls_psa_pake_output_internal(
operation->buffer_offset = 0; operation->buffer_offset = 0;
} else if (operation->state == PSA_PAKE_OUTPUT_X2S && } else if (operation->state == PSA_PAKE_OUTPUT_X2S &&
operation->sequence == PSA_PAKE_X1_STEP_KEY_SHARE) { operation->sequence == PSA_PAKE_X1_STEP_KEY_SHARE) {
ret = mbedtls_ecjpake_write_round_two(&operation->ctx.ecjpake, ret = mbedtls_ecjpake_write_round_two(&operation->ctx.pake,
operation->buffer, operation->buffer,
MBEDTLS_PSA_PAKE_BUFFER_SIZE, MBEDTLS_PSA_PAKE_BUFFER_SIZE,
&operation->buffer_length, &operation->buffer_length,
@ -594,7 +617,7 @@ static psa_status_t mbedtls_psa_pake_output_internal(
{ return PSA_ERROR_NOT_SUPPORTED; } { return PSA_ERROR_NOT_SUPPORTED; }
} }
psa_status_t mbedtls_psa_pake_output(psa_pake_operation_t *operation, psa_status_t mbedtls_psa_pake_output(mbedtls_psa_pake_operation_t *operation,
psa_pake_step_t step, psa_pake_step_t step,
uint8_t *output, uint8_t *output,
size_t output_size, size_t output_size,
@ -604,14 +627,14 @@ psa_status_t mbedtls_psa_pake_output(psa_pake_operation_t *operation,
operation, step, output, output_size, output_length); operation, step, output, output_size, output_length);
if (status != PSA_SUCCESS) { if (status != PSA_SUCCESS) {
psa_pake_abort(operation); mbedtls_psa_pake_abort(operation);
} }
return status; return status;
} }
static psa_status_t mbedtls_psa_pake_input_internal( static psa_status_t mbedtls_psa_pake_input_internal(
psa_pake_operation_t *operation, mbedtls_psa_pake_operation_t *operation,
psa_pake_step_t step, psa_pake_step_t step,
const uint8_t *input, const uint8_t *input,
size_t input_length) size_t input_length)
@ -619,6 +642,10 @@ static psa_status_t mbedtls_psa_pake_input_internal(
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED; psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
if (operation->alg == PSA_ALG_NONE) {
return PSA_ERROR_BAD_STATE;
}
if (operation->state == PSA_PAKE_STATE_INVALID) { if (operation->state == PSA_PAKE_STATE_INVALID) {
return PSA_ERROR_BAD_STATE; return PSA_ERROR_BAD_STATE;
} }
@ -746,7 +773,7 @@ static psa_status_t mbedtls_psa_pake_input_internal(
/* Load buffer at each last round ZK_PROOF */ /* Load buffer at each last round ZK_PROOF */
if (operation->state == PSA_PAKE_INPUT_X1_X2 && if (operation->state == PSA_PAKE_INPUT_X1_X2 &&
operation->sequence == PSA_PAKE_X2_STEP_ZK_PROOF) { operation->sequence == PSA_PAKE_X2_STEP_ZK_PROOF) {
ret = mbedtls_ecjpake_read_round_one(&operation->ctx.ecjpake, ret = mbedtls_ecjpake_read_round_one(&operation->ctx.pake,
operation->buffer, operation->buffer,
operation->buffer_length); operation->buffer_length);
@ -758,7 +785,7 @@ static psa_status_t mbedtls_psa_pake_input_internal(
} }
} else if (operation->state == PSA_PAKE_INPUT_X4S && } else if (operation->state == PSA_PAKE_INPUT_X4S &&
operation->sequence == PSA_PAKE_X1_STEP_ZK_PROOF) { operation->sequence == PSA_PAKE_X1_STEP_ZK_PROOF) {
ret = mbedtls_ecjpake_read_round_two(&operation->ctx.ecjpake, ret = mbedtls_ecjpake_read_round_two(&operation->ctx.pake,
operation->buffer, operation->buffer,
operation->buffer_length); operation->buffer_length);
@ -791,7 +818,7 @@ static psa_status_t mbedtls_psa_pake_input_internal(
{ return PSA_ERROR_NOT_SUPPORTED; } { return PSA_ERROR_NOT_SUPPORTED; }
} }
psa_status_t mbedtls_psa_pake_input(psa_pake_operation_t *operation, psa_status_t mbedtls_psa_pake_input(mbedtls_psa_pake_operation_t *operation,
psa_pake_step_t step, psa_pake_step_t step,
const uint8_t *input, const uint8_t *input,
size_t input_length) size_t input_length)
@ -800,19 +827,23 @@ psa_status_t mbedtls_psa_pake_input(psa_pake_operation_t *operation,
operation, step, input, input_length); operation, step, input, input_length);
if (status != PSA_SUCCESS) { if (status != PSA_SUCCESS) {
psa_pake_abort(operation); mbedtls_psa_pake_abort(operation);
} }
return status; return status;
} }
psa_status_t mbedtls_psa_pake_get_implicit_key( psa_status_t mbedtls_psa_pake_get_implicit_key(
psa_pake_operation_t *operation, mbedtls_psa_pake_operation_t *operation,
psa_key_derivation_operation_t *output) psa_key_derivation_operation_t *output)
{ {
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED; psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
if (operation->alg == PSA_ALG_NONE) {
return PSA_ERROR_BAD_STATE;
}
if (operation->input_step != PSA_PAKE_STEP_DERIVE || if (operation->input_step != PSA_PAKE_STEP_DERIVE ||
operation->output_step != PSA_PAKE_STEP_DERIVE) { operation->output_step != PSA_PAKE_STEP_DERIVE) {
status = PSA_ERROR_BAD_STATE; status = PSA_ERROR_BAD_STATE;
@ -821,14 +852,14 @@ psa_status_t mbedtls_psa_pake_get_implicit_key(
#if defined(MBEDTLS_PSA_BUILTIN_ALG_JPAKE) #if defined(MBEDTLS_PSA_BUILTIN_ALG_JPAKE)
if (operation->alg == PSA_ALG_JPAKE) { if (operation->alg == PSA_ALG_JPAKE) {
ret = mbedtls_ecjpake_write_shared_key(&operation->ctx.ecjpake, ret = mbedtls_ecjpake_write_shared_key(&operation->ctx.pake,
operation->buffer, operation->buffer,
MBEDTLS_PSA_PAKE_BUFFER_SIZE, MBEDTLS_PSA_PAKE_BUFFER_SIZE,
&operation->buffer_length, &operation->buffer_length,
mbedtls_psa_get_random, mbedtls_psa_get_random,
MBEDTLS_PSA_RANDOM_STATE); MBEDTLS_PSA_RANDOM_STATE);
if (ret != 0) { if (ret != 0) {
psa_pake_abort(operation); mbedtls_psa_pake_abort(operation);
return mbedtls_ecjpake_to_psa_error(ret); return mbedtls_ecjpake_to_psa_error(ret);
} }
@ -839,7 +870,7 @@ psa_status_t mbedtls_psa_pake_get_implicit_key(
mbedtls_platform_zeroize(operation->buffer, MBEDTLS_PSA_PAKE_BUFFER_SIZE); mbedtls_platform_zeroize(operation->buffer, MBEDTLS_PSA_PAKE_BUFFER_SIZE);
psa_pake_abort(operation); mbedtls_psa_pake_abort(operation);
return status; return status;
} else } else
@ -850,14 +881,19 @@ psa_status_t mbedtls_psa_pake_get_implicit_key(
error: error:
psa_key_derivation_abort(output); psa_key_derivation_abort(output);
psa_pake_abort(operation); mbedtls_psa_pake_abort(operation);
return status; return status;
} }
psa_status_t mbedtls_psa_pake_abort(psa_pake_operation_t *operation) psa_status_t mbedtls_psa_pake_abort(mbedtls_psa_pake_operation_t *operation)
{ {
if (operation->alg == PSA_ALG_NONE) {
return PSA_SUCCESS;
}
#if defined(MBEDTLS_PSA_BUILTIN_ALG_JPAKE) #if defined(MBEDTLS_PSA_BUILTIN_ALG_JPAKE)
if (operation->alg == PSA_ALG_JPAKE) { if (operation->alg == PSA_ALG_JPAKE) {
operation->input_step = PSA_PAKE_STEP_INVALID; operation->input_step = PSA_PAKE_STEP_INVALID;
operation->output_step = PSA_PAKE_STEP_INVALID; operation->output_step = PSA_PAKE_STEP_INVALID;
@ -871,7 +907,7 @@ psa_status_t mbedtls_psa_pake_abort(psa_pake_operation_t *operation)
mbedtls_platform_zeroize(operation->buffer, MBEDTLS_PSA_PAKE_BUFFER_SIZE); mbedtls_platform_zeroize(operation->buffer, MBEDTLS_PSA_PAKE_BUFFER_SIZE);
operation->buffer_length = 0; operation->buffer_length = 0;
operation->buffer_offset = 0; operation->buffer_offset = 0;
mbedtls_ecjpake_free(&operation->ctx.ecjpake); mbedtls_ecjpake_free(&operation->ctx.pake);
} }
#endif #endif

34
library/psa_crypto_pake.h
View File

@ -93,14 +93,15 @@
* It is implementation-dependent whether a failure to initialize * It is implementation-dependent whether a failure to initialize
* results in this error code. * results in this error code.
*/ */
psa_status_t mbedtls_psa_pake_setup(psa_pake_operation_t *operation, psa_status_t mbedtls_psa_pake_setup(mbedtls_psa_pake_operation_t *operation,
const psa_pake_cipher_suite_t *cipher_suite); const psa_pake_cipher_suite_t *cipher_suite);
/** Set the password for a password-authenticated key exchange from key ID. /** Set the password for a password-authenticated key exchange from key ID.
* *
* Call this function when the password, or a value derived from the password, * Call this function when the password, or a value derived from the password,
* is already present in the key store. * is already present in the key store.
* * \param[in] attributes The attributes of the key to use for the
* operation.
* \param[in,out] operation The operation object to set the password for. It * \param[in,out] operation The operation object to set the password for. It
* must have been set up by psa_pake_setup() and * must have been set up by psa_pake_setup() and
* not yet in use (neither psa_pake_output() nor * not yet in use (neither psa_pake_output() nor
@ -108,13 +109,8 @@ psa_status_t mbedtls_psa_pake_setup(psa_pake_operation_t *operation,
* be on operation for which the password hasn't * be on operation for which the password hasn't
* been set yet (psa_pake_set_password_key() * been set yet (psa_pake_set_password_key()
* hasn't been called yet). * hasn't been called yet).
* \param password Identifier of the key holding the password or a * \param password Buffer holding the password
* value derived from the password (eg. by a * \param password_len Password buffer size
* memory-hard function). It must remain valid
* until the operation terminates. It must be of
* type #PSA_KEY_TYPE_PASSWORD or
* #PSA_KEY_TYPE_PASSWORD_HASH. It has to allow
* the usage #PSA_KEY_USAGE_DERIVE.
* *
* \retval #PSA_SUCCESS * \retval #PSA_SUCCESS
* Success. * Success.
@ -142,8 +138,10 @@ psa_status_t mbedtls_psa_pake_setup(psa_pake_operation_t *operation,
* results in this error code. * results in this error code.
*/ */
psa_status_t mbedtls_psa_pake_set_password_key( psa_status_t mbedtls_psa_pake_set_password_key(
psa_pake_operation_t *operation, const psa_key_attributes_t *attributes,
mbedtls_svc_key_id_t password); mbedtls_psa_pake_operation_t *operation,
uint8_t *password,
size_t password_len);
/** Set the user ID for a password-authenticated key exchange. /** Set the user ID for a password-authenticated key exchange.
* *
@ -182,7 +180,7 @@ psa_status_t mbedtls_psa_pake_set_password_key(
* It is implementation-dependent whether a failure to initialize * It is implementation-dependent whether a failure to initialize
* results in this error code. * results in this error code.
*/ */
psa_status_t mbedtls_psa_pake_set_user(psa_pake_operation_t *operation, psa_status_t mbedtls_psa_pake_set_user(mbedtls_psa_pake_operation_t *operation,
const uint8_t *user_id, const uint8_t *user_id,
size_t user_id_len); size_t user_id_len);
@ -224,7 +222,7 @@ psa_status_t mbedtls_psa_pake_set_user(psa_pake_operation_t *operation,
* It is implementation-dependent whether a failure to initialize * It is implementation-dependent whether a failure to initialize
* results in this error code. * results in this error code.
*/ */
psa_status_t mbedtls_psa_pake_set_peer(psa_pake_operation_t *operation, psa_status_t mbedtls_psa_pake_set_peer(mbedtls_psa_pake_operation_t *operation,
const uint8_t *peer_id, const uint8_t *peer_id,
size_t peer_id_len); size_t peer_id_len);
@ -266,7 +264,7 @@ psa_status_t mbedtls_psa_pake_set_peer(psa_pake_operation_t *operation,
* It is implementation-dependent whether a failure to initialize * It is implementation-dependent whether a failure to initialize
* results in this error code. * results in this error code.
*/ */
psa_status_t mbedtls_psa_pake_set_role(psa_pake_operation_t *operation, psa_status_t mbedtls_psa_pake_set_role(mbedtls_psa_pake_operation_t *operation,
psa_pake_role_t role); psa_pake_role_t role);
/** Get output for a step of a password-authenticated key exchange. /** Get output for a step of a password-authenticated key exchange.
@ -324,7 +322,7 @@ psa_status_t mbedtls_psa_pake_set_role(psa_pake_operation_t *operation,
* It is implementation-dependent whether a failure to initialize * It is implementation-dependent whether a failure to initialize
* results in this error code. * results in this error code.
*/ */
psa_status_t mbedtls_psa_pake_output(psa_pake_operation_t *operation, psa_status_t mbedtls_psa_pake_output(mbedtls_psa_pake_operation_t *operation,
psa_pake_step_t step, psa_pake_step_t step,
uint8_t *output, uint8_t *output,
size_t output_size, size_t output_size,
@ -379,7 +377,7 @@ psa_status_t mbedtls_psa_pake_output(psa_pake_operation_t *operation,
* It is implementation-dependent whether a failure to initialize * It is implementation-dependent whether a failure to initialize
* results in this error code. * results in this error code.
*/ */
psa_status_t mbedtls_psa_pake_input(psa_pake_operation_t *operation, psa_status_t mbedtls_psa_pake_input(mbedtls_psa_pake_operation_t *operation,
psa_pake_step_t step, psa_pake_step_t step,
const uint8_t *input, const uint8_t *input,
size_t input_length); size_t input_length);
@ -443,7 +441,7 @@ psa_status_t mbedtls_psa_pake_input(psa_pake_operation_t *operation,
* results in this error code. * results in this error code.
*/ */
psa_status_t mbedtls_psa_pake_get_implicit_key( psa_status_t mbedtls_psa_pake_get_implicit_key(
psa_pake_operation_t *operation, mbedtls_psa_pake_operation_t *operation,
psa_key_derivation_operation_t *output); psa_key_derivation_operation_t *output);
/** Abort a PAKE operation. /** Abort a PAKE operation.
@ -470,6 +468,6 @@ psa_status_t mbedtls_psa_pake_get_implicit_key(
* It is implementation-dependent whether a failure to initialize * It is implementation-dependent whether a failure to initialize
* results in this error code. * results in this error code.
*/ */
psa_status_t mbedtls_psa_pake_abort(psa_pake_operation_t *operation); psa_status_t mbedtls_psa_pake_abort(mbedtls_psa_pake_operation_t *operation);
#endif /* PSA_CRYPTO_PAKE_H */ #endif /* PSA_CRYPTO_PAKE_H */