yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Explicitly check non-boolean values against zero

Browse source 
Signed-off-by: Bence Szépkúti <bence.szepkuti@arm.com>
This commit is contained in:
Bence Szépkúti 2021-04-21 10:13:08 +02:00
parent 359411fd07
commit f5a1fe9392
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
include/psa/crypto_sizes.h
View file

@ -139,7 +139,7 @@
* return 0. * return 0.
*/ */
#define PSA_AEAD_TAG_LENGTH(key_type, key_bits, alg) \ #define PSA_AEAD_TAG_LENGTH(key_type, key_bits, alg) \
(PSA_AEAD_NONCE_LENGTH(key_type, alg) ? \ (PSA_AEAD_NONCE_LENGTH(key_type, alg) != 0 ? \
PSA_ALG_AEAD_GET_TAG_LENGTH(alg) : \ PSA_ALG_AEAD_GET_TAG_LENGTH(alg) : \
((void) (key_bits), 0)) ((void) (key_bits), 0))
@ -270,7 +270,7 @@
* return 0. * return 0.
*/ */
#define PSA_AEAD_ENCRYPT_OUTPUT_SIZE(key_type, alg, plaintext_length) \ #define PSA_AEAD_ENCRYPT_OUTPUT_SIZE(key_type, alg, plaintext_length) \
(PSA_AEAD_NONCE_LENGTH(key_type, alg) ? \ (PSA_AEAD_NONCE_LENGTH(key_type, alg) != 0 ? \
(plaintext_length) + PSA_ALG_AEAD_GET_TAG_LENGTH(alg) : \ (plaintext_length) + PSA_ALG_AEAD_GET_TAG_LENGTH(alg) : \
0) 0)
@ -323,7 +323,7 @@
* return 0. * return 0.
*/ */
#define PSA_AEAD_DECRYPT_OUTPUT_SIZE(key_type, alg, ciphertext_length) \ #define PSA_AEAD_DECRYPT_OUTPUT_SIZE(key_type, alg, ciphertext_length) \
(PSA_AEAD_NONCE_LENGTH(key_type, alg) ? \ (PSA_AEAD_NONCE_LENGTH(key_type, alg) != 0 ? \
(ciphertext_length) - PSA_ALG_AEAD_GET_TAG_LENGTH(alg) : \ (ciphertext_length) - PSA_ALG_AEAD_GET_TAG_LENGTH(alg) : \
0) 0)
@ -426,7 +426,7 @@
* capable of this. So for modes based on a block cipher, allow the * capable of this. So for modes based on a block cipher, allow the
* implementation to delay the output until it has a full block. */ * implementation to delay the output until it has a full block. */
#define PSA_AEAD_UPDATE_OUTPUT_SIZE(key_type, alg, input_length) \ #define PSA_AEAD_UPDATE_OUTPUT_SIZE(key_type, alg, input_length) \
(PSA_AEAD_NONCE_LENGTH(key_type, alg) ? \ (PSA_AEAD_NONCE_LENGTH(key_type, alg) != 0 ? \
PSA_ALG_IS_AEAD_ON_BLOCK_CIPHER(alg) ? \ PSA_ALG_IS_AEAD_ON_BLOCK_CIPHER(alg) ? \
PSA_ROUND_UP_TO_MULTIPLE(PSA_BLOCK_CIPHER_BLOCK_LENGTH(key_type), (input_length)) : \ PSA_ROUND_UP_TO_MULTIPLE(PSA_BLOCK_CIPHER_BLOCK_LENGTH(key_type), (input_length)) : \
(input_length) : \ (input_length) : \
@ -466,9 +466,10 @@
* recognized, or the parameters are incompatible, * recognized, or the parameters are incompatible,
* return 0. * return 0.
*/ */
#define PSA_AEAD_FINISH_OUTPUT_SIZE(key_type, alg) \ #define PSA_AEAD_FINISH_OUTPUT_SIZE(key_type, alg) \
(PSA_AEAD_NONCE_LENGTH(key_type, alg) && PSA_ALG_IS_AEAD_ON_BLOCK_CIPHER(alg) ? \ (PSA_AEAD_NONCE_LENGTH(key_type, alg) != 0 && \
PSA_BLOCK_CIPHER_BLOCK_LENGTH(key_type) : \ PSA_ALG_IS_AEAD_ON_BLOCK_CIPHER(alg) ? \
PSA_BLOCK_CIPHER_BLOCK_LENGTH(key_type) : \
0) 0)
/** A sufficient ciphertext buffer size for psa_aead_finish(), for any of the /** A sufficient ciphertext buffer size for psa_aead_finish(), for any of the
@ -499,9 +500,10 @@
* recognized, or the parameters are incompatible, * recognized, or the parameters are incompatible,
* return 0. * return 0.
*/ */
#define PSA_AEAD_VERIFY_OUTPUT_SIZE(key_type, alg) \ #define PSA_AEAD_VERIFY_OUTPUT_SIZE(key_type, alg) \
(PSA_AEAD_NONCE_LENGTH(key_type, alg) && PSA_ALG_IS_AEAD_ON_BLOCK_CIPHER(alg) ? \ (PSA_AEAD_NONCE_LENGTH(key_type, alg) != 0 && \
PSA_BLOCK_CIPHER_BLOCK_LENGTH(key_type) : \ PSA_ALG_IS_AEAD_ON_BLOCK_CIPHER(alg) ? \
PSA_BLOCK_CIPHER_BLOCK_LENGTH(key_type) : \
0) 0)
/** A sufficient plaintext buffer size for psa_aead_verify(), for any of the /** A sufficient plaintext buffer size for psa_aead_verify(), for any of the