Skip to content

Commit

Permalink
nrf_security: cracen: Remove redundant aes_countermeasures field.
Browse files Browse the repository at this point in the history 
Remove the aes_countermeasures field as it is no longer needed.

Signed-off-by: Markus Rekdal <[email protected]>
  • Loading branch information
@nordic-mare @nordicjm
nordic-mare authored and nordicjm committed Aug 15, 2024
1 parent dd91b29 commit 86662b8
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 43 deletions.
5 changes: 0 additions & 5 deletions subsys/nrf_security/src/drivers/cracen/sxsymcrypt/include/sxsymcrypt/internal.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ extern "C" {
/** Mode Register value for context saving */
#define BA417_MODEID_CTX_SAVE (1u << 6)

#define BA411_AES_COUNTERMEASURES_ENABLE (true)
#define BA411_AES_COUNTERMEASURES_DISABLE (false)

struct sx_blkcipher_cmdma_cfg;
struct sx_aead_cmdma_cfg;
struct sxhashalg;
Expand Down Expand Up @@ -98,7 +95,6 @@ struct sxaead {
uint8_t tagsz;
bool is_in_ctx;
uint8_t ctxsz;
bool aes_countermeasures;
const struct sxkeyref *key;
struct sx_dmactl dma;
struct sxdesc allindescs[7];
Expand All @@ -117,7 +113,6 @@ struct sxblkcipher {
size_t inminsz;
size_t granularity;
uint32_t mode;
bool aes_countermeasures;
struct sxkeyref key;
struct sx_dmactl dma;
struct sxdesc allindescs[5];
Expand Down
20 changes: 6 additions & 14 deletions subsys/nrf_security/src/drivers/cracen/sxsymcrypt/src/aead.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,20 +106,16 @@ static int sx_aead_hw_reserve(struct sxaead *c)
int err = SX_OK;
uint32_t prng_value;

if (c->aes_countermeasures == BA411_AES_COUNTERMEASURES_ENABLE) {
err = cracen_prng_value_from_pool(&prng_value);
if (err != SX_OK) {
return err;
}
err = cracen_prng_value_from_pool(&prng_value);
if (err != SX_OK) {
return err;
}

sx_hw_reserve(&c->dma);

if (c->aes_countermeasures == BA411_AES_COUNTERMEASURES_ENABLE) {
err = sx_cm_load_mask(prng_value);
if (err != SX_OK) {
goto exit;
}
err = sx_cm_load_mask(prng_value);
if (err != SX_OK) {
goto exit;
}

if (c->key->prepare_key) {
Expand Down Expand Up @@ -186,7 +182,6 @@ int sx_aead_create_aesgcm_enc(struct sxaead *c, const struct sxkeyref *key, cons
{
int r;

c->aes_countermeasures = BA411_AES_COUNTERMEASURES_ENABLE;
r = sx_aead_create_aesgcm(c, key, iv, tagsz);
if (r) {
return r;
Expand All @@ -202,7 +197,6 @@ int sx_aead_create_aesgcm_dec(struct sxaead *c, const struct sxkeyref *key, cons
{
int r;

c->aes_countermeasures = BA411_AES_COUNTERMEASURES_ENABLE;
r = sx_aead_create_aesgcm(c, key, iv, tagsz);
if (r) {
return r;
Expand Down Expand Up @@ -280,15 +274,13 @@ static int sx_aead_create_aesccm(struct sxaead *c, const struct sxkeyref *key, c
int sx_aead_create_aesccm_enc(struct sxaead *c, const struct sxkeyref *key, const char *nonce,
size_t noncesz, size_t tagsz, size_t aadsz, size_t datasz)
{
c->aes_countermeasures = BA411_AES_COUNTERMEASURES_ENABLE;
return sx_aead_create_aesccm(c, key, nonce, noncesz, tagsz, aadsz, datasz,
ba411ccmcfg.encr);
}

int sx_aead_create_aesccm_dec(struct sxaead *c, const struct sxkeyref *key, const char *nonce,
size_t noncesz, size_t tagsz, size_t aadsz, size_t datasz)
{
c->aes_countermeasures = BA411_AES_COUNTERMEASURES_ENABLE;
return sx_aead_create_aesccm(c, key, nonce, noncesz, tagsz, aadsz, datasz,
ba411ccmcfg.decr);
}
Expand Down
26 changes: 6 additions & 20 deletions subsys/nrf_security/src/drivers/cracen/sxsymcrypt/src/blkcipher.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,20 +67,16 @@ static int sx_blkcipher_hw_reserve(struct sxblkcipher *c)

uint32_t prng_value;

if (c->aes_countermeasures == BA411_AES_COUNTERMEASURES_ENABLE) {
err = cracen_prng_value_from_pool(&prng_value);
if (err != SX_OK) {
return err;
}
err = cracen_prng_value_from_pool(&prng_value);
if (err != SX_OK) {
return err;
}

sx_hw_reserve(&c->dma);

if (c->aes_countermeasures == BA411_AES_COUNTERMEASURES_ENABLE) {
err = sx_cm_load_mask(prng_value);
if (err != SX_OK) {
goto exit;
}
err = sx_cm_load_mask(prng_value);
if (err != SX_OK) {
goto exit;
}

if (c->key.prepare_key) {
Expand Down Expand Up @@ -214,7 +210,6 @@ int sx_blkcipher_create_aesctr_enc(struct sxblkcipher *c, const struct sxkeyref
{
c->inminsz = 1;
c->granularity = 1;
c->aes_countermeasures = BA411_AES_COUNTERMEASURES_ENABLE;
return sx_blkcipher_create_aes_ba411(c, key, iv, BLKCIPHER_MODEID_CTR, ba411cfg.encr);
}

Expand All @@ -223,7 +218,6 @@ int sx_blkcipher_create_aesctr_dec(struct sxblkcipher *c, const struct sxkeyref
{
c->inminsz = 1;
c->granularity = 1;
c->aes_countermeasures = BA411_AES_COUNTERMEASURES_ENABLE;
return sx_blkcipher_create_aes_ba411(c, key, iv, BLKCIPHER_MODEID_CTR, ba411cfg.decr);
}

Expand All @@ -232,15 +226,13 @@ int sx_blkcipher_create_aesecb_enc(struct sxblkcipher *c, const struct sxkeyref
{
c->inminsz = 16;
c->granularity = 16;
c->aes_countermeasures = BA411_AES_COUNTERMEASURES_ENABLE;
return sx_blkcipher_create_aes_ba411(c, key, NULL, BLKCIPHER_MODEID_ECB, ba411cfg.encr);
}

int sx_blkcipher_create_aesecb_dec(struct sxblkcipher *c, const struct sxkeyref *key)
{
c->inminsz = 16;
c->granularity = 16;
c->aes_countermeasures = BA411_AES_COUNTERMEASURES_ENABLE;
return sx_blkcipher_create_aes_ba411(c, key, NULL, BLKCIPHER_MODEID_ECB, ba411cfg.decr);
}

Expand All @@ -249,7 +241,6 @@ int sx_blkcipher_create_aescbc_enc(struct sxblkcipher *c, const struct sxkeyref
{
c->inminsz = 16;
c->granularity = 16;
c->aes_countermeasures = BA411_AES_COUNTERMEASURES_ENABLE;
return sx_blkcipher_create_aes_ba411(c, key, iv, BLKCIPHER_MODEID_CBC, ba411cfg.encr);
}

Expand All @@ -258,7 +249,6 @@ int sx_blkcipher_create_aescbc_dec(struct sxblkcipher *c, const struct sxkeyref
{
c->inminsz = 16;
c->granularity = 16;
c->aes_countermeasures = BA411_AES_COUNTERMEASURES_ENABLE;
return sx_blkcipher_create_aes_ba411(c, key, iv, BLKCIPHER_MODEID_CBC, ba411cfg.decr);
}

Expand All @@ -267,7 +257,6 @@ int sx_blkcipher_create_aescfb_enc(struct sxblkcipher *c, const struct sxkeyref
{
c->inminsz = 16;
c->granularity = 16;
c->aes_countermeasures = BA411_AES_COUNTERMEASURES_ENABLE;
return sx_blkcipher_create_aes_ba411(c, key, iv, BLKCIPHER_MODEID_CFB, ba411cfg.encr);
}

Expand All @@ -276,7 +265,6 @@ int sx_blkcipher_create_aescfb_dec(struct sxblkcipher *c, const struct sxkeyref
{
c->inminsz = 16;
c->granularity = 16;
c->aes_countermeasures = BA411_AES_COUNTERMEASURES_ENABLE;
return sx_blkcipher_create_aes_ba411(c, key, iv, BLKCIPHER_MODEID_CFB, ba411cfg.decr);
}

Expand All @@ -285,7 +273,6 @@ int sx_blkcipher_create_aesofb_enc(struct sxblkcipher *c, const struct sxkeyref
{
c->inminsz = 1;
c->granularity = 1;
c->aes_countermeasures = BA411_AES_COUNTERMEASURES_ENABLE;
return sx_blkcipher_create_aes_ba411(c, key, iv, BLKCIPHER_MODEID_OFB, ba411cfg.encr);
}

Expand All @@ -294,7 +281,6 @@ int sx_blkcipher_create_aesofb_dec(struct sxblkcipher *c, const struct sxkeyref
{
c->inminsz = 1;
c->granularity = 1;
c->aes_countermeasures = BA411_AES_COUNTERMEASURES_ENABLE;
return sx_blkcipher_create_aes_ba411(c, key, iv, BLKCIPHER_MODEID_OFB, ba411cfg.decr);
}

Expand Down
4 changes: 0 additions & 4 deletions subsys/nrf_security/src/drivers/cracen/sxsymcrypt/src/chachapoly.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,27 +160,23 @@ static int sx_blkcipher_create_chacha20(struct sxblkcipher *c, const struct sxke
int sx_aead_create_chacha20poly1305_enc(struct sxaead *c, const struct sxkeyref *key,
const char *nonce, size_t tagsz)
{
c->aes_countermeasures = BA411_AES_COUNTERMEASURES_DISABLE;
return sx_aead_create_chacha20poly1305(c, key, nonce, ba417chachapolycfg.encr, tagsz);
}

int sx_aead_create_chacha20poly1305_dec(struct sxaead *c, const struct sxkeyref *key,
const char *nonce, size_t tagsz)
{
c->aes_countermeasures = BA411_AES_COUNTERMEASURES_DISABLE;
return sx_aead_create_chacha20poly1305(c, key, nonce, ba417chachapolycfg.decr, tagsz);
}

int sx_blkcipher_create_chacha20_enc(struct sxblkcipher *c, const struct sxkeyref *key,
const char *counter, const char *nonce)
{
c->aes_countermeasures = BA411_AES_COUNTERMEASURES_DISABLE;
return sx_blkcipher_create_chacha20(c, key, nonce, counter, ba417chacha20cfg.encr);
}

int sx_blkcipher_create_chacha20_dec(struct sxblkcipher *c, const struct sxkeyref *key,
const char *counter, const char *nonce)
{
c->aes_countermeasures = BA411_AES_COUNTERMEASURES_DISABLE;
return sx_blkcipher_create_chacha20(c, key, nonce, counter, ba417chacha20cfg.decr);
}

0 comments on commit 86662b8

Please sign in to comment.