Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

crypto: Add support for ECB to the TinyCrypt shim #69479

Closed
wants to merge 3 commits into from
Closed

crypto: Add support for ECB to the TinyCrypt shim #69479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b348fa
drivers: crypto: crypto_tc_shim: Add ECB support
rettichschnidi Feb 26, 2024
837c2be
samples: drivers: crypto: Check test results
rettichschnidi Feb 26, 2024
bf58c93
samples: drivers: crypto: Check TinyCrypt ECB results
rettichschnidi Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions drivers/crypto/crypto_tc_shim.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,46 @@ LOG_MODULE_REGISTER(tinycrypt);

static struct tc_shim_drv_state tc_driver_state[CRYPTO_MAX_SESSION];

static int do_ecb_encrypt(struct cipher_ctx *ctx, struct cipher_pkt *op)
{
struct tc_shim_drv_state *data = ctx->drv_sessn_state;

if (TC_AES_BLOCK_SIZE != op->in_len) {
LOG_ERR("Expecting 16 bytes of input data");
return -EINVAL;
}

if (tc_aes_encrypt(op->out_buf, op->in_buf, &data->session_key) == TC_CRYPTO_FAIL) {
LOG_ERR("TC internal error during ECB encryption");
return -EIO;
}

/* We operate only on 16 byte long blocks */
op->out_len = TC_AES_BLOCK_SIZE;

return 0;
}

static int do_ecb_decrypt(struct cipher_ctx *ctx, struct cipher_pkt *op)
{
struct tc_shim_drv_state *data = ctx->drv_sessn_state;

if (TC_AES_BLOCK_SIZE != op->in_len) {
LOG_ERR("Expecting 16 bytes of input data");
return -EINVAL;
}

if (tc_aes_decrypt(op->out_buf, op->in_buf, &data->session_key) == TC_CRYPTO_FAIL) {
LOG_ERR("Func TC internal error during ECB decryption");
return -EIO;
}

/* We operate only on 16 byte long blocks */
op->out_len = TC_AES_BLOCK_SIZE;

return 0;
}

static int do_cbc_encrypt(struct cipher_ctx *ctx, struct cipher_pkt *op,
uint8_t *iv)
{
Expand Down Expand Up @@ -221,6 +261,9 @@ static int tc_session_setup(const struct device *dev, struct cipher_ctx *ctx,

if (op_type == CRYPTO_CIPHER_OP_ENCRYPT) {
switch (mode) {
case CRYPTO_CIPHER_MODE_ECB:
ctx->ops.block_crypt_hndlr = do_ecb_encrypt;
break;
case CRYPTO_CIPHER_MODE_CBC:
ctx->ops.cbc_crypt_hndlr = do_cbc_encrypt;
break;
Expand All @@ -241,6 +284,9 @@ static int tc_session_setup(const struct device *dev, struct cipher_ctx *ctx,
}
} else {
switch (mode) {
case CRYPTO_CIPHER_MODE_ECB:
ctx->ops.block_crypt_hndlr = do_ecb_decrypt;
break;
case CRYPTO_CIPHER_MODE_CBC:
ctx->ops.cbc_crypt_hndlr = do_cbc_decrypt;
break;
Expand Down Expand Up @@ -273,6 +319,7 @@ static int tc_session_setup(const struct device *dev, struct cipher_ctx *ctx,

data = &tc_driver_state[idx];

/* tc_aes128_set_encrypt_key() also sets the decryption key */
if (tc_aes128_set_encrypt_key(&data->session_key, ctx->key.bit_stream)
== TC_CRYPTO_FAIL) {
LOG_ERR("TC internal error in setting key");
Expand Down
22 changes: 16 additions & 6 deletions samples/drivers/crypto/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,14 @@ tests:
type: multi_line
regex:
- ".*: Cipher Sample"
- ".*: CBC Mode"
- ".*: CTR Mode"
- ".*: CCM Mode"
- ".*: ECB mode ENCRYPT - Match"
- ".*: ECB mode DECRYPT - Match"
- ".*: CBC mode ENCRYPT - Match"
- ".*: CBC mode DECRYPT - Match"
- ".*: CTR mode ENCRYPT - Match"
- ".*: CTR mode DECRYPT - Match"
- ".*: CCM mode ENCRYPT - Match"
- ".*: CCM mode DECRYPT - Match"
- ".*: GCM Mode"
sample.drivers.crypto.mbedtls:
min_flash: 34
Expand All @@ -31,10 +36,15 @@ tests:
type: multi_line
regex:
- ".*: Cipher Sample"
- ".*: CBC Mode"
- ".*: ECB mode ENCRYPT - Match"
- ".*: ECB mode DECRYPT - Match"
- ".*: CBC mode ENCRYPT - Match"
- ".*: CBC mode DECRYPT - Match"
- ".*: CTR Mode"
- ".*: CCM Mode"
- ".*: GCM Mode"
- ".*: CCM mode ENCRYPT - Match"
- ".*: CCM mode DECRYPT - Match"
- ".*: GCM mode ENCRYPT - Match"
- ".*: GCM mode DECRYPT - Match"
sample.drivers.crypto.stm32:
tags: crypto
filter: dt_compat_enabled("st,stm32-aes") or dt_compat_enabled("st,stm32-cryp")
Expand Down
Loading