kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-16 10:03:50 +01:00
Code Releases Activity

pkg/driver_cryptocell_310: allow data to be in ROM on hash update

Browse Source
This commit is contained in:
lulu254b 2025-02-14 14:11:02 +01:00 committed by Lukas-Luger
parent a50055a911
commit daf814e9f9
3 changed files with 40 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/advanced/psa_crypto/example_hash.c
View File

@ -22,10 +22,8 @@
#include "psa/crypto.h" #include "psa/crypto.h"
/* certain PSA backends require the data to be in RAM rather than ROM static const uint8_t msg[] = "Hello World!";
* so these values cannot be `const` */ static const size_t msg_len = sizeof(msg)-1; // exclude NULL-byte
static uint8_t msg[] = "Hello World!";
static size_t msg_len = sizeof(msg)-1; // exclude NULL-byte
static const uint8_t hash_sha224[] = { static const uint8_t hash_sha224[] = {
0x45, 0x75, 0xbb, 0x4e, 0xc1, 0x29, 0xdf, 0x63, 0x80, 0xce, 0xdd, 0xe6, 0xd7, 0x45, 0x75, 0xbb, 0x4e, 0xc1, 0x29, 0xdf, 0x63, 0x80, 0xce, 0xdd, 0xe6, 0xd7,

41
pkg/driver_cryptocell_310/psa_cryptocell_310/hashes_common.c
View File

@ -40,7 +40,7 @@ psa_status_t cryptocell_310_common_hash_setup(CRYS_HASHUserContext_t *ctx,
return PSA_SUCCESS; return PSA_SUCCESS;
} }
psa_status_t cryptocell_310_common_hash_update(CRYS_HASHUserContext_t *ctx, static psa_status_t _hash_update_from_ram(CRYS_HASHUserContext_t *ctx,
const uint8_t *input, const uint8_t *input,
size_t input_length) size_t input_length)
{ {
@ -48,11 +48,6 @@ psa_status_t cryptocell_310_common_hash_update(CRYS_HASHUserContext_t *ctx,
size_t offset = 0; size_t offset = 0;
size_t size; size_t size;
if (!cryptocell_310_data_within_ram(input)) {
DEBUG("%s : cryptocell_310 data required to be in RAM.\n", RIOT_FILE_RELATIVE);
return PSA_ERROR_DATA_INVALID;
}
do { do {
if (input_length > CC310_MAX_HASH_INPUT_BLOCK) { if (input_length > CC310_MAX_HASH_INPUT_BLOCK) {
size = CC310_MAX_HASH_INPUT_BLOCK; size = CC310_MAX_HASH_INPUT_BLOCK;
@ -70,6 +65,40 @@ psa_status_t cryptocell_310_common_hash_update(CRYS_HASHUserContext_t *ctx,
offset += size; offset += size;
} while ((input_length > 0) && (ret == CRYS_OK)); } while ((input_length > 0) && (ret == CRYS_OK));
return ret;
}
psa_status_t cryptocell_310_common_hash_update(CRYS_HASHUserContext_t *ctx,
const uint8_t *input,
size_t input_length)
{
CRYSError_t ret = 0;
if (!cryptocell_310_data_within_ram(input)) {
/* copy input chuckwise into RAM until the end of input is reached */
uint8_t input_buf[PSA_HASH_MAX_SIZE];
size_t buf_size;
size_t offset = 0;
do {
memset(&input_buf, 0, PSA_HASH_MAX_SIZE);
buf_size = input_length - offset;
buf_size = buf_size < PSA_HASH_MAX_SIZE ? buf_size : PSA_HASH_MAX_SIZE;
memcpy(&input_buf, input + offset, buf_size);
ret = _hash_update_from_ram(ctx, input_buf, buf_size);
offset += PSA_HASH_MAX_SIZE;
} while ((offset < input_length) && (ret == CRYS_OK));
}
else {
ret = _hash_update_from_ram(ctx, input, input_length);
}
if (ret != CRYS_OK) { if (ret != CRYS_OK) {
DEBUG("CRYS_HASH_Update failed with %s\n", cryptocell310_status_to_humanly_readable(ret)); DEBUG("CRYS_HASH_Update failed with %s\n", cryptocell310_status_to_humanly_readable(ret));
return CRYS_to_psa_error(ret); return CRYS_to_psa_error(ret);

8
tests/sys/psa_crypto_hashes/example_hash.c
View File

@ -25,10 +25,8 @@
#include "psa/crypto.h" #include "psa/crypto.h"
/* certain PSA backends require the data to be in RAM rather than ROM static const uint8_t msg[] = "Hello World!";
* so these values cannot be `const` */ static const size_t msg_len = sizeof(msg)-1; // exclude NULL-byte
static uint8_t msg[] = "Hello World!";
static size_t msg_len = sizeof(msg)-1; // exclude NULL-byte
static const uint8_t hash_sha224[] = { static const uint8_t hash_sha224[] = {
0x45, 0x75, 0xbb, 0x4e, 0xc1, 0x29, 0xdf, 0x63, 0x80, 0xce, 0xdd, 0xe6, 0xd7, 0x45, 0x75, 0xbb, 0x4e, 0xc1, 0x29, 0xdf, 0x63, 0x80, 0xce, 0xdd, 0xe6, 0xd7,
@ -63,7 +61,7 @@ static const uint8_t hash_sha512_256[] = {
0x72, 0x3a, 0x26, 0x71, 0x0e, 0x46, 0x76, 0x13, 0x01, 0xc8, 0xb5, 0x4c, 0x56, 0x72, 0x3a, 0x26, 0x71, 0x0e, 0x46, 0x76, 0x13, 0x01, 0xc8, 0xb5, 0x4c, 0x56,
0xfa, 0x72, 0x22, 0x67, 0x58, 0x1a}; 0xfa, 0x72, 0x22, 0x67, 0x58, 0x1a};
static uint8_t msg_long[] = { static const uint8_t msg_long[] = {
0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,