mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-23 11:42:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

block_cipher: remove psa_key_type from mbedtls_block_cipher_context_t

Browse Source 
This information was redundant with the already existing mbedtls_block_cipher_id_t.

Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
This commit is contained in:
Valerio Setti 2023-12-15 16:10:52 +01:00
parent 52ab8fa565
commit 4ff405cf80
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/mbedtls/block_cipher.h
View File

@ -53,7 +53,6 @@ typedef struct {
mbedtls_block_cipher_id_t MBEDTLS_PRIVATE(id); mbedtls_block_cipher_id_t MBEDTLS_PRIVATE(id);
#if defined(MBEDTLS_BLOCK_CIPHER_SOME_PSA) #if defined(MBEDTLS_BLOCK_CIPHER_SOME_PSA)
mbedtls_block_cipher_engine_t MBEDTLS_PRIVATE(engine); mbedtls_block_cipher_engine_t MBEDTLS_PRIVATE(engine);
psa_key_type_t MBEDTLS_PRIVATE(psa_key_type);
mbedtls_svc_key_id_t MBEDTLS_PRIVATE(psa_key_id); mbedtls_svc_key_id_t MBEDTLS_PRIVATE(psa_key_id);
#endif #endif
union { union {

33
library/block_cipher.c
View File

@ -22,19 +22,19 @@
#if defined(MBEDTLS_BLOCK_CIPHER_C) #if defined(MBEDTLS_BLOCK_CIPHER_C)
#if defined(MBEDTLS_BLOCK_CIPHER_SOME_PSA) #if defined(MBEDTLS_BLOCK_CIPHER_SOME_PSA)
static psa_key_type_t psa_key_type_from_cipher_id(mbedtls_cipher_id_t cipher_id) static psa_key_type_t psa_key_type_from_block_cipher_id(mbedtls_block_cipher_id_t cipher_id)
{ {
switch (cipher_id) { switch (cipher_id) {
#if defined(MBEDTLS_BLOCK_CIPHER_AES_VIA_PSA) #if defined(MBEDTLS_BLOCK_CIPHER_AES_VIA_PSA)
case MBEDTLS_CIPHER_ID_AES: case MBEDTLS_BLOCK_CIPHER_ID_AES:
return PSA_KEY_TYPE_AES; return PSA_KEY_TYPE_AES;
#endif #endif
#if defined(MBEDTLS_BLOCK_CIPHER_ARIA_VIA_PSA) #if defined(MBEDTLS_BLOCK_CIPHER_ARIA_VIA_PSA)
case MBEDTLS_CIPHER_ID_ARIA: case MBEDTLS_BLOCK_CIPHER_ID_ARIA:
return PSA_KEY_TYPE_ARIA; return PSA_KEY_TYPE_ARIA;
#endif #endif
#if defined(MBEDTLS_BLOCK_CIPHER_CAMELLIA_VIA_PSA) #if defined(MBEDTLS_BLOCK_CIPHER_CAMELLIA_VIA_PSA)
case MBEDTLS_CIPHER_ID_CAMELLIA: case MBEDTLS_BLOCK_CIPHER_ID_CAMELLIA:
return PSA_KEY_TYPE_CAMELLIA; return PSA_KEY_TYPE_CAMELLIA;
#endif #endif
default: default:
@ -82,37 +82,38 @@ void mbedtls_block_cipher_free(mbedtls_block_cipher_context_t *ctx)
int mbedtls_block_cipher_setup(mbedtls_block_cipher_context_t *ctx, int mbedtls_block_cipher_setup(mbedtls_block_cipher_context_t *ctx,
mbedtls_cipher_id_t cipher_id) mbedtls_cipher_id_t cipher_id)
{ {
ctx->id = (cipher_id == MBEDTLS_CIPHER_ID_AES) ? MBEDTLS_BLOCK_CIPHER_ID_AES :
(cipher_id == MBEDTLS_CIPHER_ID_ARIA) ? MBEDTLS_BLOCK_CIPHER_ID_ARIA :
(cipher_id == MBEDTLS_CIPHER_ID_CAMELLIA) ? MBEDTLS_BLOCK_CIPHER_ID_CAMELLIA :
MBEDTLS_BLOCK_CIPHER_ID_NONE;
#if defined(MBEDTLS_BLOCK_CIPHER_SOME_PSA) #if defined(MBEDTLS_BLOCK_CIPHER_SOME_PSA)
if (psa_can_do_cipher(cipher_id)) { if (psa_can_do_cipher(cipher_id) &&
ctx->psa_key_type = psa_key_type_from_cipher_id(cipher_id); (psa_key_type_from_block_cipher_id(ctx->id) != PSA_KEY_TYPE_NONE)) {
if (ctx->psa_key_type != PSA_KEY_TYPE_NONE) {
ctx->engine = MBEDTLS_BLOCK_CIPHER_ENGINE_PSA; ctx->engine = MBEDTLS_BLOCK_CIPHER_ENGINE_PSA;
return 0; return 0;
} }
}
ctx->engine = MBEDTLS_BLOCK_CIPHER_ENGINE_LEGACY; ctx->engine = MBEDTLS_BLOCK_CIPHER_ENGINE_LEGACY;
#endif #endif
switch (cipher_id) { switch (ctx->id) {
#if defined(MBEDTLS_AES_C) #if defined(MBEDTLS_AES_C)
case MBEDTLS_CIPHER_ID_AES: case MBEDTLS_BLOCK_CIPHER_ID_AES:
ctx->id = MBEDTLS_BLOCK_CIPHER_ID_AES;
mbedtls_aes_init(&ctx->ctx.aes); mbedtls_aes_init(&ctx->ctx.aes);
return 0; return 0;
#endif #endif
#if defined(MBEDTLS_ARIA_C) #if defined(MBEDTLS_ARIA_C)
case MBEDTLS_CIPHER_ID_ARIA: case MBEDTLS_BLOCK_CIPHER_ID_ARIA:
ctx->id = MBEDTLS_BLOCK_CIPHER_ID_ARIA;
mbedtls_aria_init(&ctx->ctx.aria); mbedtls_aria_init(&ctx->ctx.aria);
return 0; return 0;
#endif #endif
#if defined(MBEDTLS_CAMELLIA_C) #if defined(MBEDTLS_CAMELLIA_C)
case MBEDTLS_CIPHER_ID_CAMELLIA: case MBEDTLS_BLOCK_CIPHER_ID_CAMELLIA:
ctx->id = MBEDTLS_BLOCK_CIPHER_ID_CAMELLIA;
mbedtls_camellia_init(&ctx->ctx.camellia); mbedtls_camellia_init(&ctx->ctx.camellia);
return 0; return 0;
#endif #endif
default: default:
ctx->id = MBEDTLS_BLOCK_CIPHER_ID_NONE;
return MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA; return MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA;
} }
} }
@ -126,7 +127,7 @@ int mbedtls_block_cipher_setkey(mbedtls_block_cipher_context_t *ctx,
psa_key_attributes_t key_attr = PSA_KEY_ATTRIBUTES_INIT; psa_key_attributes_t key_attr = PSA_KEY_ATTRIBUTES_INIT;
psa_status_t status; psa_status_t status;
psa_set_key_type(&key_attr, ctx->psa_key_type); psa_set_key_type(&key_attr, psa_key_type_from_block_cipher_id(ctx->id));
psa_set_key_bits(&key_attr, key_bitlen); psa_set_key_bits(&key_attr, key_bitlen);
psa_set_key_algorithm(&key_attr, PSA_ALG_ECB_NO_PADDING); psa_set_key_algorithm(&key_attr, PSA_ALG_ECB_NO_PADDING);
psa_set_key_usage_flags(&key_attr, PSA_KEY_USAGE_ENCRYPT); psa_set_key_usage_flags(&key_attr, PSA_KEY_USAGE_ENCRYPT);