Skip to content

Commit 07d523c

Browse files
committed
Change PSA_MAX_NONCE_SIZE to PSA_AEAD_MAX_NONCE_SIZE
1 parent 0c6f741 commit 07d523c

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

components/TARGET_PSA/services/crypto/COMPONENT_PSA_SRV_IPC/crypto_platform_spe.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ typedef struct psa_key_mng_ipc_s
141141
*/
142142

143143
// Max length supported for nonce is 16 bytes.
144-
#define PSA_MAX_NONCE_SIZE 16
144+
#define PSA_AEAD_MAX_NONCE_SIZE 16
145145
typedef struct psa_crypto_ipc_aead_s
146146
{
147147
psa_sec_function_t func;
@@ -150,7 +150,7 @@ typedef struct psa_crypto_ipc_aead_s
150150
uint16_t nonce_size;
151151
size_t additional_data_length;
152152
size_t input_length;
153-
uint8_t nonce[PSA_MAX_NONCE_SIZE];
153+
uint8_t nonce[PSA_AEAD_MAX_NONCE_SIZE];
154154
} psa_crypto_ipc_aead_t;
155155

156156
/** psa_crypto_ipc_asymmetric_s struct used for asymmetric

components/TARGET_PSA/services/crypto/COMPONENT_PSA_SRV_IPC/psa_crypto_spm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ psa_status_t psa_aead_encrypt( psa_key_slot_t key,
351351
psa_crypto_ipc.additional_data_length = additional_data_length;
352352
psa_crypto_ipc.input_length = plaintext_length;
353353

354-
if( nonce_length > PSA_MAX_NONCE_SIZE )
354+
if( nonce_length > PSA_AEAD_MAX_NONCE_SIZE )
355355
return( PSA_ERROR_INVALID_ARGUMENT );
356356

357357
psa_crypto_ipc.nonce_size = nonce_length;
@@ -412,7 +412,7 @@ psa_status_t psa_aead_decrypt( psa_key_slot_t key,
412412
psa_crypto_ipc.additional_data_length = additional_data_length;
413413
psa_crypto_ipc.input_length = ciphertext_length;
414414

415-
if( nonce_length > PSA_MAX_NONCE_SIZE )
415+
if( nonce_length > PSA_AEAD_MAX_NONCE_SIZE )
416416
return( PSA_ERROR_INVALID_ARGUMENT );
417417

418418
psa_crypto_ipc.nonce_size = nonce_length;

components/TARGET_PSA/services/crypto/COMPONENT_SPE/psa_crypto_partition.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -773,7 +773,7 @@ static void psa_symmetric_operation( void )
773773
{
774774
size_t iv_length = 0;
775775
size_t iv_size = msg.out_size[0];
776-
unsigned char iv[PSA_MAX_NONCE_SIZE] = { 0 };
776+
unsigned char iv[PSA_AEAD_MAX_NONCE_SIZE] = { 0 };
777777

778778
status = psa_cipher_generate_iv( msg.rhandle, iv,
779779
iv_size, &iv_length );
@@ -788,7 +788,7 @@ static void psa_symmetric_operation( void )
788788
case PSA_CIPHER_SET_IV:
789789
{
790790
size_t iv_length = msg.in_size[1];
791-
unsigned char iv[PSA_MAX_NONCE_SIZE] = { 0 };
791+
unsigned char iv[PSA_AEAD_MAX_NONCE_SIZE] = { 0 };
792792

793793
bytes_read = psa_read( msg.handle, 1, iv, iv_length );
794794
if( bytes_read != iv_length )

0 commit comments

Comments
 (0)